diff --git a/.cargo/config.toml b/.cargo/config.toml
index acebfe9f..30d819a2 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -3,5 +3,13 @@
 [env]
 CRAFT_FONTS_DIR = { value = "../craft-fonts", relative = true }
 
+# The Windows UI Automation adapter can be asked about a node that disappeared in the
+# same frame. On MinGW, converting that HRESULT through windows-result's thread COM
+# error-info path has crashed in GetErrorInfo. Keep the HRESULT without that extra
+# COM lookup; this leaves the AccessKit tree and screen-reader support enabled. Every Windows GNU
+# target (x86_64, i686, the gnullvm ones) gets it, as the check in apps/figcraft/src/main.rs asks.
+[target.'cfg(all(windows, target_env = "gnu"))']
+rustflags = ["--cfg=windows_slim_errors"]
+
 [alias]
 xtask = "run -q -p xtask --"
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
new file mode 100644
index 00000000..2408084c
--- /dev/null
+++ b/.coderabbit.yaml
@@ -0,0 +1,6 @@
+# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
+reviews:
+  auto_review:
+    # Dependabot bumps are checked by CI; skip CodeRabbit reviews on them.
+    ignore_usernames:
+      - "dependabot[bot]"
diff --git a/.config/nextest.toml b/.config/nextest.toml
new file mode 100644
index 00000000..2a4cd2cb
--- /dev/null
+++ b/.config/nextest.toml
@@ -0,0 +1,3 @@
+# Minimum cargo-nextest for this repository: GHSA-vc25-qg58-w57c is fixed in 0.9.150 and CI
+# installs exactly that version, so an older nextest refuses to run (exit 92 REQUIRED_VERSION_NOT_MET).
+nextest-version = "0.9.150"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..d39962e1
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,32 @@
+version: 2
+updates:
+  # Maintain Rust / Cargo dependencies
+  - package-ecosystem: "cargo"
+    directories:
+      - "/"
+      - "/plugins"
+    schedule:
+      interval: "daily"
+      time: "06:00"
+      timezone: "America/New_York"
+    # Consolidate updates into a single PR rather than one PR per crate
+    groups:
+      cargo-dependencies:
+        patterns:
+          - "*"
+    commit-message:
+      prefix: "chore(deps)"
+
+  # Maintain GitHub Actions workflows
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "06:00"
+      timezone: "America/New_York"
+    groups:
+      actions:
+        patterns:
+          - "*"
+    commit-message:
+      prefix: "ci(deps)"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e613617a..b79af502 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,7 @@
-# CI for pull requests and main: format, clippy, tests, dependency layering, asset attribution and
-# the wasm32 check (the same gates as `cargo xtask ci`). Linux only: macOS is built and tested only
-# by release.yml (the org's macOS runners are kept for releases; craftrules release/playbook.md),
-# and Windows/FreeBSD packaging have their own workflows.
 name: CI
 
+# Quality gates for every push to main and every pull request (`cargo xtask ci`), through the
+# suite's shared gate workflow in craft-common-actions.
 on:
   push:
     branches: [main]
@@ -13,76 +11,20 @@ on:
 permissions:
   contents: read
 
-env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
-  RUST_BACKTRACE: 1
-  # Debug and test builds keep line tables (file:line in panic backtraces) but drop the rest of the
-  # debug info: faster codegen and links, and a smaller target dir.
-  CARGO_PROFILE_DEV_DEBUG: line-tables-only
-
-# A newer push to a PR branch cancels its older run. Runs on main are never cancelled, so every
-# main state that gets a run is checked to the end.
+# A newer push to a PR branch cancels its older run; every push to main runs to the end.
 concurrency:
-  group: ci-${{ github.ref }}
+  group: ci-${{ github.event_name == 'pull_request' && github.ref || github.run_id }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
-  test:
-    timeout-minutes: 35
-    name: test (ubuntu-latest)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Linux system dependencies (egui/winit/rfd)
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
-            libxkbcommon-dev libwayland-dev libx11-dev libxrandr-dev libxi-dev \
-            libgl1-mesa-dev libgtk-3-dev
-
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          components: clippy, rustfmt
-
-      # Only main saves caches; PRs restore main's, so PR caches don't evict main's.
-      - uses: Swatinem/rust-cache@v2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-on-failure: true
-
-      - name: Format
-        run: cargo fmt --all -- --check
-
-      - name: Clippy
-        run: cargo clippy --workspace --all-targets --locked -- -D warnings
-
-      # Without craft-fonts (the optional CRAFT_FONTS_DIR input, which .cargo/config.toml points at
-      # a sibling checkout that CI doesn't have): everything must build and pass without it.
-      - name: Test
-        run: cargo test --workspace --locked
-
-      - name: Dependency layering
-        run: cargo run --locked -q -p xtask -- layers
-
-      - name: Asset attribution
-        run: cargo run --locked -q -p xtask -- assets
-
-  wasm:
-    timeout-minutes: 30
-    name: wasm32 check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: wasm32-unknown-unknown
-      - uses: Swatinem/rust-cache@v2
-        with:
-          key: wasm32
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-on-failure: true
-      # The engine, the UI crate and apps/figcraft-web must keep compiling for the browser.
-      - name: Check wasm-safe crates
-        run: cargo run --locked -q -p xtask -- wasm
+  gate:
+    # Tracks @main so suite-wide CI fixes reach every app without a PR in each repository.
+    uses: storytold/craft-common-actions/.github/workflows/gate.yml@main
+    with:
+      # Combined Latin presentation and core UI catalog. Required web builds enforce
+      # Inter Regular/SemiBold and Noto Sans Georgian Regular after asset-policy filtering.
+      craft-fonts-ref: 37827adc41fd165f9a9234ac40f94dbad353aa69
+      require-craft-fonts: true
+      packages: >-
+        libxkbcommon-dev libwayland-dev libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev
+        libgtk-3-dev
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index ca0cd49f..80adf16a 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -4,12 +4,10 @@
 # before it can fail a release. Nothing is uploaded and no secrets are used.
 name: FreeBSD
 
-# The VM build takes one to several hours, so it runs nightly on main rather than on every push
-# or dependency change: a drifted dependency still shows up within a day. PRs that change the
-# FreeBSD packaging itself still run it.
+# The VM build is slow, so it runs nightly on main and on pushes to `release`, not on every pull
+# request: a drifted dependency still shows up within a day, and always before a release ships.
+# PRs that change the FreeBSD workflow or packaging itself still run it.
 on:
-  schedule:
-    - cron: "17 2 * * *"
   push:
     branches: [release]
   pull_request:
@@ -17,6 +15,8 @@ on:
       - .github/workflows/freebsd.yml
       - packaging/freebsd/**
       - packaging/env.sh
+  schedule:
+    - cron: "17 2 * * *"
   workflow_dispatch:
 
 concurrency:
@@ -31,6 +31,5 @@ jobs:
     # Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.
     uses: storytold/craft-common-actions/.github/workflows/freebsd.yml@main
     with:
-      freebsd-release: "14.3"
       run-package-check: true
-      craft-fonts-ref: 43913056ce82a3fdad0ef69f6b88d1dc922a8104
+      craft-fonts-ref: 37827adc41fd165f9a9234ac40f94dbad353aa69
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 18392587..01cb9cd6 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -18,16 +18,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  eval:
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - uses: cachix/install-nix-action@13d8dd58da0234aa297dedd986986ccb8e7f3e24 # v31.11.1
-      - name: nix flake check --no-build
-        run: |
-          if [ -f flake.nix ]; then
-            nix flake check --no-build --all-systems
-          else
-            echo "No flake.nix present in this repository; skipping check."
-          fi
+  nix:
+    # Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.
+    uses: storytold/craft-common-actions/.github/workflows/nix.yml@main
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 75f7a5fa..f93219fa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,8 +24,13 @@ jobs:
     with:
       app-name: figcraft
       app-title: FigCraft
-      craft-fonts-ref: 43913056ce82a3fdad0ef69f6b88d1dc922a8104
+      # Combined Latin presentation and core UI catalog. Required web builds enforce
+      # Inter Regular/SemiBold and Noto Sans Georgian Regular after asset-policy filtering.
+      craft-fonts-ref: 37827adc41fd165f9a9234ac40f94dbad353aa69
       has-server: true
+      # The browser has no system fonts: without craft-fonts the web build can't draw text (#885).
+      # crates/text/build.rs keeps the web allowlist small (Inter and Georgian).
+      web-craft-fonts: true
       version: ${{ inputs.version }}
     secrets:
       APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
new file mode 100644
index 00000000..e78fe1ea
--- /dev/null
+++ b/.github/workflows/sonarcloud.yml
@@ -0,0 +1,21 @@
+name: SonarCloud
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+permissions:
+  contents: read
+
+concurrency:
+  group: sonarcloud-${{ github.ref }}
+  # A push to main is the run that publishes coverage; superseded runs there would never finish.
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  sonarcloud:
+    # Tracked at @main so org-wide CI improvements propagate without PR churn.
+    uses: storytold/craft-common-actions/.github/workflows/sonarcloud.yml@main
+    secrets: inherit
diff --git a/AGENTS.md b/AGENTS.md
index 708da805..b2384311 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -81,6 +81,7 @@ code.
   L6 depends on egui/eframe/rfd/winit. **The UI crate is swappable.**
 - **The UI is thin**: panels read engine state and act through `app.run(id, params)` /
   `app.set_props(ids, props)`. Colours come from `theme::Tokens`.
+- **Time goes through `chrono`** (workspace dependency). Never hand-roll UTC/calendar conversion (days-to-date algorithms, leap-year math); a crate owns only its output format string. The one exception is range extension: past the years chrono can represent, shift the date by whole 400-year Gregorian cycles (146,097 days, after which the calendar repeats), let chrono compute the month and day, and add the cycles back to the year (splitting seconds into hours, minutes and seconds is plain arithmetic).
 - **Rust only** (no handwritten JS/TS). **Never break wasm** (`cargo xtask wasm`).
 
 ### Quality gates (before every commit)
diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md
index 1f72aeb7..46b789a8 100644
--- a/ATTRIBUTION.md
+++ b/ATTRIBUTION.md
@@ -25,8 +25,18 @@ Release builds embed fonts from the optional craft-fonts build input
 | Family | Licence | Upstream |
 |---|---|---|
 | Inter | SIL Open Font License 1.1 | https://github.com/rsms/inter |
-| Roboto, Montserrat, Lato, Open Sans, Poppins, Nunito Sans, Merriweather, Playfair Display, Source Sans 3, Source Serif 4, Carlito, Caladea | SIL Open Font License 1.1 | Google Fonts / upstream repositories (see craft-fonts) |
+| Archivo | SIL Open Font License 1.1 | [Google Fonts / Archivo](https://github.com/google/fonts/tree/6c70c829f09ea345d3590406693220ea35c6553f/ofl/archivo) |
+| Roboto, Montserrat, Lato, Open Sans, Poppins, Nunito Sans, Merriweather, Playfair Display, Carlito, Caladea | SIL Open Font License 1.1 | Google Fonts / upstream repositories (see craft-fonts) |
 | Liberation Sans, Serif, Mono | SIL Open Font License 1.1 | https://github.com/liberationfonts |
-| BIZ UDPGothic, BIZ UDMincho, Shippori Mincho, Noto Sans Arabic | SIL Open Font License 1.1 | Google Fonts (see craft-fonts) |
+| BIZ UDPGothic, BIZ UDMincho, Shippori Mincho, Noto Sans Arabic, Noto Sans Georgian | SIL Open Font License 1.1 | Google Fonts (see craft-fonts) |
+
+The central catalog also contains Adobe-authored Source Sans 3 and Source Serif 4.
+FigCraft filters both families from every build in accordance with its asset policy.
 
 egui's default fonts (compiled into the `egui`/`epaint` crates) keep their own licences (OFL / Apache-2.0 / Ubuntu Font Licence); see those crates.
+
+## egui dependency font icons
+
+| Asset | Author | Source | Licence | Use |
+|---|---|---|---|---|
+| `epaint_default_fonts::EGUI_ICONS`, `epaint_default_fonts::EMOJI_ICON` (dependency font inputs) | John Slegers | [egui 6d518fc7](https://github.com/storytold/egui/tree/6d518fc799681571963842f95b55a6b68431b15a/crates/epaint_default_fonts/fonts), [emoji-icon-font](https://github.com/jslegers/emoji-icon-font) | MIT (Copyright (c) 2014 John Slegers; full upstream text in `NOTICE`) | egui-icons.ttf is the five-glyph subset, included by default_fonts independently of monochrome_emoji_fonts; emoji-icon-font.ttf is the full monochrome fallback. Dependency assets unmodified here; no font file copied into this repository. |
diff --git a/CLAUDE.md b/CLAUDE.md
index 708da805..b2384311 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -81,6 +81,7 @@ code.
   L6 depends on egui/eframe/rfd/winit. **The UI crate is swappable.**
 - **The UI is thin**: panels read engine state and act through `app.run(id, params)` /
   `app.set_props(ids, props)`. Colours come from `theme::Tokens`.
+- **Time goes through `chrono`** (workspace dependency). Never hand-roll UTC/calendar conversion (days-to-date algorithms, leap-year math); a crate owns only its output format string. The one exception is range extension: past the years chrono can represent, shift the date by whole 400-year Gregorian cycles (146,097 days, after which the calendar repeats), let chrono compute the month and day, and add the cycles back to the year (splitting seconds into hours, minutes and seconds is plain arithmetic).
 - **Rust only** (no handwritten JS/TS). **Never break wasm** (`cargo xtask wasm`).
 
 ### Quality gates (before every commit)
diff --git a/Cargo.lock b/Cargo.lock
index aead39d1..413011ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,21 +4,21 @@ version = 4
 
 [[package]]
 name = "accesskit"
-version = "0.24.1"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320"
+checksum = "4e883d1d28c5fd5568c79ed2d2bd48d9f2fd3945c8974ed0f53690ceddb051be"
 dependencies = [
  "uuid",
 ]
 
 [[package]]
 name = "accesskit_atspi_common"
-version = "0.18.1"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8c61bee90b42a772d39d06a740207dc71a4e780004ace1db8d99fb1baaa954"
+checksum = "24f5baf62e34a4a6c30e3d697e4782f821a7337049c44c3b40576a27dfbb580d"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.36.0",
+ "accesskit_consumer",
  "atspi-common",
  "phf",
  "serde",
@@ -27,43 +27,37 @@ dependencies = [
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.35.0"
+version = "0.39.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53cf47daed85312e763fbf85ceca136e0d7abc68e0a7e12abe11f48172bc3b10"
+checksum = "f3da8f27636015191b2264ee1df681503170a632cafd832fdc1edfdd4e3a2fd3"
 dependencies = [
  "accesskit",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.1",
 ]
 
 [[package]]
-name = "accesskit_consumer"
-version = "0.36.0"
+name = "accesskit_ios"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e0d7e25d06f4dc21d1774d67146e9e80d6789216cbd4d1e88185b0095dba60"
+checksum = "a5280724673bbfa8b30a838c013500b719392989be3b97c5a9964062c252c232"
 dependencies = [
  "accesskit",
- "hashbrown 0.16.1",
-]
-
-[[package]]
-name = "accesskit_consumer"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d10a236f96f87d70732e44520046785431ef01d5bcd6b041317bfadd2f88245"
-dependencies = [
- "accesskit",
- "hashbrown 0.16.1",
+ "accesskit_consumer",
+ "hashbrown 0.17.1",
+ "objc2 0.5.3",
+ "objc2-foundation 0.2.2",
+ "objc2-ui-kit 0.2.2",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.26.3"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce02dc63b43f0c9296af9ac946312a2dc8814427d7a64d2d600971dac55b6076"
+checksum = "123828ceeec755b05255e3976cb0852993202de98a0626c97dd8d34246991f84"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.38.0",
- "hashbrown 0.16.1",
+ "accesskit_consumer",
+ "hashbrown 0.17.1",
  "objc2 0.5.3",
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
@@ -71,9 +65,9 @@ dependencies = [
 
 [[package]]
 name = "accesskit_unix"
-version = "0.21.1"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b016ca8db0ea0ea2ceff29a9d6240391492d960716aa471967c00e8cc8cb197c"
+checksum = "30d5192871228c54f1b0fb4a85cef000e11a3804f25d2165f14afa0daa67f3f6"
 dependencies = [
  "accesskit",
  "accesskit_atspi_common",
@@ -89,13 +83,13 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.32.1"
+version = "0.35.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff7009f1a532e917d66970a1e80c965140c6cfbbabbdde3d64e5431e6c78e21"
+checksum = "498668b90da9995302a0055aaecad4756932333da2ddef6baee1c00844c430fc"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.35.0",
- "hashbrown 0.16.1",
+ "accesskit_consumer",
+ "hashbrown 0.17.1",
  "static_assertions",
  "windows",
  "windows-core",
@@ -103,11 +97,12 @@ dependencies = [
 
 [[package]]
 name = "accesskit_winit"
-version = "0.32.2"
+version = "0.34.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe9a94394896352cc4660ca2288bd4ef883d83238853c038b44070c8f134313"
+checksum = "cd4ab4437b520ff03088fbe48676a11e7d44a929535e64b31432c1073e48dbcc"
 dependencies = [
  "accesskit",
+ "accesskit_ios",
  "accesskit_macos",
  "accesskit_unix",
  "accesskit_windows",
@@ -244,9 +239,9 @@ dependencies = [
 
 [[package]]
 name = "arboard"
-version = "3.6.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"
+checksum = "aeb9553e62312c8756a5979254fc6d7da8bbeb5986a1e17037fab932f7037917"
 dependencies = [
  "clipboard-win",
  "image",
@@ -258,7 +253,8 @@ dependencies = [
  "objc2-foundation 0.3.2",
  "parking_lot",
  "percent-encoding",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
+ "wl-clipboard-rs",
  "x11rb",
 ]
 
@@ -391,7 +387,7 @@ checksum = "4f8abc12baad266b1c8cec146854c195b5864b4221d4b2ca7296a7ae82d9e451"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -426,7 +422,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -490,15 +486,6 @@ version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
 
-[[package]]
-name = "bit-set"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
-dependencies = [
- "bit-vec 0.8.0",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.10.0"
@@ -509,10 +496,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "bit-vec"
-version = "0.8.0"
+name = "bit-set"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+checksum = "56d87354e4229f54a44f7bf2435906a4656dba36026ab6eaca629a2c436a691c"
+dependencies = [
+ "bit-vec 0.10.1",
+]
 
 [[package]]
 name = "bit-vec"
@@ -520,6 +510,16 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"
 
+[[package]]
+name = "bit-vec"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269"
+dependencies = [
+ "borsh",
+ "serde",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -581,6 +581,30 @@ dependencies = [
  "piper",
 ]
 
+[[package]]
+name = "borsh"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a"
+dependencies = [
+ "borsh-derive",
+ "bytes",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.20.3"
@@ -604,7 +628,7 @@ checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -671,9 +695,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.6.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f74872d07caf508b30a21f6836e7d7016a2eaf7d9ff4f48deaa58cd8a0407630"
+checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -714,10 +738,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "clipboard-win"
-version = "5.4.1"
+name = "chrono"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "clipboard-win"
+version = "5.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "052af7878466feccda12ba7a6a67d019d712f296809559b47c12c8cc196d3a9a"
 dependencies = [
  "error-code",
 ]
@@ -765,9 +798,9 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
 
 [[package]]
 name = "combine"
-version = "4.6.8"
+version = "4.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e"
+checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92"
 dependencies = [
  "bytes",
  "memchr",
@@ -798,6 +831,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -811,8 +854,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
- "core-graphics-types",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97"
+dependencies = [
+ "bitflags 2.13.2",
+ "core-foundation 0.10.1",
+ "core-graphics-types 0.2.0",
  "foreign-types",
  "libc",
 ]
@@ -824,10 +880,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "libc",
 ]
 
+[[package]]
+name = "core-graphics-types"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
+dependencies = [
+ "bitflags 2.13.2",
+ "core-foundation 0.10.1",
+ "libc",
+]
+
+[[package]]
+name = "core-text"
+version = "22.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "333dab512ce710ca2d08574c373d246dbeac8b22769e47da4c0e72730ce442b7"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-graphics 0.25.0",
+ "foreign-types",
+]
+
+[[package]]
+name = "core_detect"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f8f80099a98041a3d1622845c271458a2d73e688351bf3cb999266764b81d48"
+
 [[package]]
 name = "core_maths"
 version = "0.1.1"
@@ -855,11 +939,49 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "craft-docpath"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=495e5971bc024aa96e6ed318cb6e7cd3a0103184#495e5971bc024aa96e6ed318cb6e7cd3a0103184"
+
+[[package]]
+name = "craft-update"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=495e5971bc024aa96e6ed318cb6e7cd3a0103184#495e5971bc024aa96e6ed318cb6e7cd3a0103184"
+dependencies = [
+ "chrono",
+ "dunce",
+ "egui",
+ "flate2",
+ "getrandom 0.3.4",
+ "log",
+ "plist",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tar",
+ "tempfile",
+ "ureq",
+ "verifysign",
+ "winreg",
+ "winsafe",
+ "zip 9.1.1",
+]
+
+[[package]]
+name = "craft-window"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=495e5971bc024aa96e6ed318cb6e7cd3a0103184#495e5971bc024aa96e6ed318cb6e7cd3a0103184"
+dependencies = [
+ "wayland-client",
+]
+
 [[package]]
 name = "crc32fast"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78"
+checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055"
 dependencies = [
  "cfg-if",
 ]
@@ -945,9 +1067,9 @@ checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
 
 [[package]]
 name = "defmt"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1"
+checksum = "e4a0795ac740cb54d7b3775c9c17345f6aaecf884c01733b39d6017738e0e3e1"
 dependencies = [
  "bitflags 1.3.2",
  "defmt-macros",
@@ -955,25 +1077,31 @@ dependencies = [
 
 [[package]]
 name = "defmt-macros"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8"
+checksum = "840bb056bd99c495c9188198a258ab787c79f306d864db3e6e8451442d6d8366"
 dependencies = [
  "defmt-parser",
  "proc-macro2",
  "quote",
- "syn 2.0.119",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "defmt-parser"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e"
+checksum = "71958f69fb2de856c5dd51ac9377e986ca1aa5919f931bf5395a807277f889a0"
 dependencies = [
  "thiserror 2.0.21",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e"
+
 [[package]]
 name = "derive_arbitrary"
 version = "1.5.0"
@@ -982,9 +1110,15 @@ checksum = "1b034bd7d5f032402a2479444dcc6f74e36a03f31854d41680fb240ef682a1ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
+[[package]]
+name = "deunicode"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04"
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1032,7 +1166,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1066,10 +1200,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
-name = "ecolor"
-version = "0.36.2"
+name = "dunce"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0656a7530b9e2841ee7a5f983965bdd9840c32f4012f759cfd44b912cced6b34"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "ecolor"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "bytemuck",
  "emath",
@@ -1077,9 +1216,8 @@ dependencies = [
 
 [[package]]
 name = "eframe"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ad41fac6e3149abb4866e93df37dbd33baa95db525c3368c944584e95a5dc2"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1101,6 +1239,7 @@ dependencies = [
  "pollster 1.0.1",
  "profiling",
  "raw-window-handle",
+ "send_wrapper",
  "static_assertions",
  "wasm-bindgen",
  "web-sys",
@@ -1112,9 +1251,8 @@ dependencies = [
 
 [[package]]
 name = "egui"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc938cc27cd911415e1e4d151bc56ff9df063d8db081374e87aeb805ea74b2ba"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "accesskit",
  "ahash",
@@ -1132,9 +1270,8 @@ dependencies = [
 
 [[package]]
 name = "egui-wgpu"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cef1f6d1bba40b09a4d0d62cb822b81030922cfbf65c5373398c3a3caafc5bd"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1152,30 +1289,33 @@ dependencies = [
 
 [[package]]
 name = "egui-winit"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98466000559d66ba4db786a30448b01483946add4188e7f10f522a27b4fb89cc"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "accesskit_winit",
  "arboard",
+ "block2 0.6.2",
  "bytemuck",
  "egui",
+ "image",
  "log",
  "objc2 0.6.5",
+ "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
  "objc2-ui-kit 0.3.2",
+ "parking_lot",
  "profiling",
  "raw-window-handle",
  "smithay-clipboard",
  "web-time",
+ "windows-sys 0.61.2",
  "winit",
 ]
 
 [[package]]
 name = "egui_extras"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05cbdc785020861553f230f23d330ba1fb72613b9d8e0e457f3bdc8ba6db6dcf"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "ahash",
  "egui",
@@ -1187,9 +1327,8 @@ dependencies = [
 
 [[package]]
 name = "egui_glow"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "606ed4167daf341e5753d703285c4c1d562324b2c07aa8f405cd7d066fe58f3b"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1207,9 +1346,8 @@ checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be"
 
 [[package]]
 name = "emath"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52c8d4141cf0f60fb2f7aefaf352d3ffa5171ef0ab09731c64391801e95e48f1"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "bytemuck",
 ]
@@ -1234,22 +1372,22 @@ checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
 
 [[package]]
 name = "enum-map"
-version = "2.7.3"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9"
+checksum = "d4532960034c15ba2f55e9eee631040ecc473c32e6c4b200828c759840f13a06"
 dependencies = [
  "enum-map-derive",
 ]
 
 [[package]]
 name = "enum-map-derive"
-version = "0.17.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
+checksum = "7127272f64b3e098f7d81f350d672081b879bff896d219c42370dc858b1af9ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.119",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1298,16 +1436,15 @@ dependencies = [
 
 [[package]]
 name = "epaint"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0ec0308dc23130fc1a7d4623a8534c2ed069c6dc84e258ee4f3de99615aa1a3"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "ahash",
  "bytemuck",
  "ecolor",
  "emath",
  "epaint_default_fonts",
- "font-types 0.12.6",
+ "font-types 0.12.7",
  "harfrust 0.12.0",
  "log",
  "nohash-hasher",
@@ -1316,22 +1453,23 @@ dependencies = [
  "self_cell",
  "skrifa 0.44.0",
  "smallvec",
+ "unicode-bidi",
  "unicode-general-category",
+ "unicode-properties",
  "unicode-segmentation",
  "vello_cpu",
 ]
 
 [[package]]
 name = "epaint_default_fonts"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773fa9c96dd0dbef887e39d0ed6177f141cce4d68e6041df77570aa3702dfa13"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
 
 [[package]]
 name = "errno"
@@ -1340,7 +1478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1407,9 +1545,11 @@ checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693"
 
 [[package]]
 name = "figcraft"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "arboard",
+ "craft-update",
+ "craft-window",
  "eframe",
  "egui",
  "env_logger",
@@ -1426,12 +1566,14 @@ dependencies = [
  "wat",
  "webbrowser",
  "windows",
+ "winit",
  "winresource",
+ "zbus",
 ]
 
 [[package]]
 name = "figcraft-cli"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "figcraft-doc",
  "figcraft-engine",
@@ -1445,9 +1587,10 @@ dependencies = [
 
 [[package]]
 name = "figcraft-collab"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "base64 0.22.1",
+ "chrono",
  "figcraft-color",
  "figcraft-doc",
  "figcraft-geom",
@@ -1460,7 +1603,7 @@ dependencies = [
 
 [[package]]
 name = "figcraft-collab-net"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "base64 0.22.1",
  "figcraft-collab",
@@ -1483,7 +1626,7 @@ dependencies = [
 
 [[package]]
 name = "figcraft-color"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "kurbo",
  "serde",
@@ -1492,7 +1635,7 @@ dependencies = [
 
 [[package]]
 name = "figcraft-doc"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "figcraft-color",
  "figcraft-geom",
@@ -1504,9 +1647,11 @@ dependencies = [
 
 [[package]]
 name = "figcraft-engine"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "base64 0.22.1",
+ "craft-docpath",
+ "deunicode",
  "figcraft-collab",
  "figcraft-color",
  "figcraft-doc",
@@ -1519,19 +1664,22 @@ dependencies = [
  "figcraft-render",
  "figcraft-svg",
  "figcraft-text",
+ "figcraft-vectordrawable",
  "image",
  "log",
  "regex",
+ "same-file",
  "serde",
  "serde_json",
  "thiserror 2.0.21",
  "wat",
  "web-time",
+ "zip 2.6.1",
 ]
 
 [[package]]
 name = "figcraft-format"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "figcraft-doc",
  "figcraft-pathops",
@@ -1540,13 +1688,14 @@ dependencies = [
  "ruzstd",
  "serde",
  "serde_json",
+ "sha1",
  "sha2",
- "zip",
+ "zip 2.6.1",
 ]
 
 [[package]]
 name = "figcraft-geom"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "kurbo",
  "serde",
@@ -1554,7 +1703,7 @@ dependencies = [
 
 [[package]]
 name = "figcraft-layout"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "figcraft-doc",
  "figcraft-geom",
@@ -1562,7 +1711,7 @@ dependencies = [
 
 [[package]]
 name = "figcraft-mcp"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "base64 0.22.1",
  "figcraft-collab-net",
@@ -1578,7 +1727,7 @@ dependencies = [
 
 [[package]]
 name = "figcraft-pathops"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "figcraft-doc",
  "figcraft-geom",
@@ -1587,7 +1736,7 @@ dependencies = [
 
 [[package]]
 name = "figcraft-pdf"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "figcraft-color",
  "figcraft-doc",
@@ -1599,12 +1748,12 @@ dependencies = [
  "krilla",
  "log",
  "thiserror 2.0.21",
- "tiny-skia",
+ "tiny-skia 0.12.0",
 ]
 
 [[package]]
 name = "figcraft-plugin"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "figcraft-color",
  "serde",
@@ -1617,7 +1766,7 @@ dependencies = [
 
 [[package]]
 name = "figcraft-render"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "crc32fast",
  "figcraft-color",
@@ -1630,12 +1779,12 @@ dependencies = [
  "moxcms",
  "png",
  "rayon",
- "tiny-skia",
+ "tiny-skia 0.12.0",
 ]
 
 [[package]]
 name = "figcraft-server"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "crc32fast",
  "ctrlc",
@@ -1654,12 +1803,12 @@ dependencies = [
  "toml",
  "tungstenite",
  "wat",
- "zip",
+ "zip 2.6.1",
 ]
 
 [[package]]
 name = "figcraft-svg"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "base64 0.22.1",
  "figcraft-color",
@@ -1675,12 +1824,14 @@ dependencies = [
 
 [[package]]
 name = "figcraft-text"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
+ "core-text",
  "figcraft-doc",
  "figcraft-geom",
  "harfrust 0.13.3",
  "log",
+ "objc2 0.6.5",
  "png",
  "skrifa 0.47.0",
  "unicode-bidi",
@@ -1689,9 +1840,11 @@ dependencies = [
 
 [[package]]
 name = "figcraft-ui-egui"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "base64 0.22.1",
+ "chrono",
+ "craft-update",
  "egui",
  "egui_extras",
  "figcraft-color",
@@ -1713,9 +1866,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "figcraft-web"
-version = "0.6.0"
+name = "figcraft-vectordrawable"
+version = "0.11.2"
 dependencies = [
+ "figcraft-color",
+ "figcraft-doc",
+ "figcraft-geom",
+ "figcraft-pathops",
+ "figcraft-render",
+ "figcraft-text",
+ "roxmltree 0.21.2",
+ "thiserror 2.0.21",
+]
+
+[[package]]
+name = "figcraft-web"
+version = "0.11.2"
+dependencies = [
+ "base64 0.22.1",
  "eframe",
  "egui",
  "figcraft-collab-net",
@@ -1723,16 +1891,33 @@ dependencies = [
  "figcraft-ui-egui",
  "js-sys",
  "log",
+ "serde_json",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
 ]
 
 [[package]]
-name = "find-msvc-tools"
-version = "0.1.14"
+name = "filetime"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"
+checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759"
+dependencies = [
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48"
+
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
@@ -1794,9 +1979,9 @@ dependencies = [
 
 [[package]]
 name = "font-types"
-version = "0.12.6"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c92d9081c7ab3bd83ef1eecdfad090f3d966e3ce74106779664114cfe1a6274"
+checksum = "835ae9d781464a79026cde387f9cbc650c9a4909d7cf7e658b127e3c35d2f35d"
 dependencies = [
  "bytemuck",
 ]
@@ -1841,7 +2026,7 @@ checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1892,7 +2077,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1964,9 +2149,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi 6.0.0",
  "rand_core 0.10.1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1992,9 +2179,9 @@ dependencies = [
 
 [[package]]
 name = "glifo"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed4a1bb24121291d27230c1b1b44e07d6a9b28cefdb32fe1581dfb84e14f940a"
+checksum = "282a26c1e23de04bdab3e34a21b6f877a479b96737792516b9b8b8f69b6661be"
 dependencies = [
  "bytemuck",
  "foldhash 0.2.0",
@@ -2212,9 +2399,9 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513"
+checksum = "fe090a42a0d3140fed8c63263ed1fecc02422cb2f4bfe55cd8de2de1b8e105dd"
 dependencies = [
  "displaydoc",
  "potential_utf",
@@ -2226,9 +2413,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb"
+checksum = "25d29b57c17c6528d0dc4c2141cfa2d08200465acb537a3909c8b9b8a4a984c0"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -2239,9 +2426,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f"
+checksum = "404a3b8c486f205c87fe7f23ab6894d84a4ad76d6e4671ae1981ba7def87c599"
 dependencies = [
  "icu_collections",
  "icu_normalizer_data",
@@ -2253,15 +2440,15 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0"
+checksum = "20f0088bfb7441f7a37fa0c9e20cb1e9cba1cac6b9ce8cd2a6dc44294f8e8cbc"
 
 [[package]]
 name = "icu_properties"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148"
+checksum = "2ea83d991c56158f7cf898bf86436c1dfe7c07ee82fe88951f2695c9f37a379f"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -2274,15 +2461,15 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa"
+checksum = "b98f29af82d02b163fe50161388350e743bb3107cc8e8c2f7314cb505faddfcf"
 
 [[package]]
 name = "icu_provider"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73"
+checksum = "413099315636c588ee8f011190b329b971a09a8fae9d157e01dcae8379468514"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
@@ -2544,8 +2731,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 [[package]]
 name = "krilla"
 version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27da593198b20eeba65caeb73c2bbeec3e53ab08fa549898312ce81c4fce5e33"
+source = "git+https://github.com/storytold/craft-libs?rev=495e5971bc024aa96e6ed318cb6e7cd3a0103184#495e5971bc024aa96e6ed318cb6e7cd3a0103184"
 dependencies = [
  "base64 0.22.1",
  "bumpalo",
@@ -2563,7 +2749,7 @@ dependencies = [
  "skrifa 0.42.1",
  "smallvec",
  "subsetter",
- "tiny-skia-path",
+ "tiny-skia-path 0.12.0",
  "xmp-writer",
  "yoke",
  "zune-jpeg",
@@ -2590,9 +2776,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "libc"
-version = "0.2.190"
+version = "0.2.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
 
 [[package]]
 name = "libloading"
@@ -2619,7 +2805,7 @@ dependencies = [
  "bitflags 2.13.2",
  "libc",
  "plain",
- "redox_syscall 0.9.4",
+ "redox_syscall 0.9.5",
 ]
 
 [[package]]
@@ -2661,9 +2847,9 @@ checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae"
 
 [[package]]
 name = "litrs"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
+checksum = "4744e383959f0db86ede514b809b1c53251889093803c05267acc7d4e7030d70"
 
 [[package]]
 name = "lock_api"
@@ -2688,9 +2874,9 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
 [[package]]
 name = "memmap2"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
+checksum = "6b0ca1155a9ecc25aa12e8313a119f32edf0255fea2f44839c4ac0a12b2ac157"
 dependencies = [
  "libc",
 ]
@@ -2820,6 +3006,21 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -3175,6 +3376,12 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
+[[package]]
+name = "openssl-probe"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
+
 [[package]]
 name = "orbclient"
 version = "0.3.55"
@@ -3187,9 +3394,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "5.5.0"
+version = "5.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c7c9e0d9b23589f26070720bac724174bfec1083e82f7854cdd0267518343c0"
+checksum = "7f59006ce1e204c30956638535b74d317bca99477b9356dfaec54c37f6f600ab"
 dependencies = [
  "num-traits",
 ]
@@ -3204,6 +3411,16 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "os_pipe"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -3265,10 +3482,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
-name = "phf"
-version = "0.13.1"
+name = "petgraph"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
+dependencies = [
+ "fixedbitset",
+ "hashbrown 0.15.5",
+ "indexmap",
+]
+
+[[package]]
+name = "phf"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6"
 dependencies = [
  "phf_macros",
  "phf_shared",
@@ -3277,9 +3505,9 @@ dependencies = [
 
 [[package]]
 name = "phf_generator"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
+checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100"
 dependencies = [
  "fastrand",
  "phf_shared",
@@ -3287,9 +3515,9 @@ dependencies = [
 
 [[package]]
 name = "phf_macros"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
+checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085"
 dependencies = [
  "phf_generator",
  "phf_shared",
@@ -3300,9 +3528,9 @@ dependencies = [
 
 [[package]]
 name = "phf_shared"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89"
 dependencies = [
  "siphasher",
 ]
@@ -3362,6 +3590,19 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
+[[package]]
+name = "plist"
+version = "1.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327a4cb2ad49dc48adfdc9da89e22c64d488b508c67a044d71ba729e4521a285"
+dependencies = [
+ "base64 0.23.1",
+ "indexmap",
+ "quick-xml 0.42.0",
+ "serde",
+ "time",
+]
+
 [[package]]
 name = "png"
 version = "0.18.1"
@@ -3447,13 +3688,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "ppv-lite86"
-version = "0.2.21"
+name = "powerfmt"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
+checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958"
 
 [[package]]
 name = "presser"
@@ -3487,16 +3725,17 @@ checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
 
 [[package]]
 name = "proptest"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744"
+checksum = "b8530004ccb15eae51c7e40009fbe317f341f804db54dc033eec1c50be28cfa0"
 dependencies = [
- "bit-set 0.8.0",
- "bit-vec 0.8.0",
+ "bit-set 0.11.1",
+ "bit-vec 0.10.1",
  "bitflags 2.13.2",
+ "chacha20",
+ "core_detect",
  "num-traits",
- "rand 0.9.5",
- "rand_chacha",
+ "rand",
  "rand_xorshift",
  "regex-syntax",
  "rusty-fork",
@@ -3531,6 +3770,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41b1177fdf999d2321d3fb46ff47159d9c1fb9ad66a4879f8c50a0b504615e9b"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.47"
@@ -3552,16 +3800,6 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
-[[package]]
-name = "rand"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
-dependencies = [
- "rand_chacha",
- "rand_core 0.9.5",
-]
-
 [[package]]
 name = "rand"
 version = "0.10.3"
@@ -3573,24 +3811,11 @@ dependencies = [
  "rand_core 0.10.1",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.9.5",
-]
-
 [[package]]
 name = "rand_core"
 version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
-dependencies = [
- "getrandom 0.3.4",
-]
 
 [[package]]
 name = "rand_core"
@@ -3600,11 +3825,11 @@ checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
 [[package]]
 name = "rand_xorshift"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
+checksum = "60aa6af80be32871323012e02e6e65f8a7cc7890931ae421d217ad8fe0df2ccf"
 dependencies = [
- "rand_core 0.9.5",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -3677,7 +3902,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709"
 dependencies = [
  "bytemuck",
- "font-types 0.12.6",
+ "font-types 0.12.7",
  "once_cell",
 ]
 
@@ -3688,7 +3913,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "005c8acf251756c478b0bf402885bfd88a1476020c4c7e6060edc1aa68da38ea"
 dependencies = [
  "bytemuck",
- "font-types 0.12.6",
+ "font-types 0.12.7",
  "once_cell",
 ]
 
@@ -3699,7 +3924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5a0cf4bb6cbce4c29756270d189a5e400ac05e91192161d83a0bcb6e68492e8"
 dependencies = [
  "bytemuck",
- "font-types 0.12.6",
+ "font-types 0.12.7",
  "once_cell",
 ]
 
@@ -3723,9 +3948,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "737970939a87c6fa31e7acad13307bccbb017a073b695b6089a2c484f929e20e"
+checksum = "580c875845b41ecb1564ad1ae4703044cef774145e3d7a94dc2b3fa7c97868fd"
 dependencies = [
  "bitflags 2.13.2",
 ]
@@ -3814,9 +4039,9 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
 
 [[package]]
 name = "roxmltree"
-version = "0.21.1"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1964b10c76125c36f8afe190065a4bf9a87bf324842c05701330bba9f1cacbb"
+checksum = "9da7f59328b09405b181fee1018925fad50f157afb43c0c0f5c522c256dd5907"
 dependencies = [
  "memchr",
 ]
@@ -3865,14 +4090,14 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.45"
+version = "0.23.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634"
+checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf"
 dependencies = [
  "log",
  "once_cell",
@@ -3883,6 +4108,18 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a073f5dc7469f984c52ad2752b63b0807745133b6de880b7b64c1ac4c48aec4"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
 [[package]]
 name = "rustls-pki-types"
 version = "1.15.1"
@@ -3893,10 +4130,37 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustls-webpki"
-version = "0.103.15"
+name = "rustls-platform-verifier"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2"
+checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3969,6 +4233,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "schannel"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cb23c424d8ee841bb4d813677ca237e2a610067d594fec130f87d6093495ab5"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -3981,6 +4254,40 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "sctk-adwaita"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec"
+dependencies = [
+ "log",
+ "smithay-client-toolkit 0.19.2",
+ "tiny-skia 0.11.4",
+]
+
+[[package]]
+name = "security-framework"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
+dependencies = [
+ "bitflags 2.13.2",
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "self_cell"
 version = "1.3.0"
@@ -3992,6 +4299,16 @@ name = "semver"
 version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
@@ -4020,14 +4337,14 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.151"
+version = "1.0.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
 dependencies = [
  "itoa",
  "memchr",
@@ -4044,7 +4361,7 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -4178,9 +4495,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.16.2"
+version = "1.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e"
+checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
 dependencies = [
  "serde",
 ]
@@ -4344,9 +4661,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.6"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4361,7 +4678,17 @@ checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
+]
+
+[[package]]
+name = "tar"
+version = "0.4.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840"
+dependencies = [
+ "filetime",
+ "libc",
 ]
 
 [[package]]
@@ -4371,10 +4698,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.4.3",
+ "getrandom 0.3.4",
  "once_cell",
  "rustix 1.1.5",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4423,7 +4750,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -4440,6 +4767,50 @@ dependencies = [
  "zune-jpeg",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde_core",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
+
+[[package]]
+name = "time-macros"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tiny-skia"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "bytemuck",
+ "cfg-if",
+ "log",
+ "tiny-skia-path 0.11.4",
+]
+
 [[package]]
 name = "tiny-skia"
 version = "0.12.0"
@@ -4452,7 +4823,18 @@ dependencies = [
  "cfg-if",
  "log",
  "png",
- "tiny-skia-path",
+ "tiny-skia-path 0.12.0",
+]
+
+[[package]]
+name = "tiny-skia-path"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
 ]
 
 [[package]]
@@ -4468,9 +4850,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643"
+checksum = "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -4484,9 +4866,9 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee"
 
 [[package]]
 name = "tokio"
-version = "1.53.2"
+version = "1.54.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e95f91fcc7a621e8b030f6aa23c71fe9838ae2fb4d8118b75602a328f5144044"
+checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3"
 dependencies = [
  "pin-project-lite",
 ]
@@ -4574,6 +4956,17 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "tree_magic_mini"
+version = "3.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"
+dependencies = [
+ "memchr",
+ "nom",
+ "petgraph",
+]
+
 [[package]]
 name = "ttf-parser"
 version = "0.25.1"
@@ -4594,7 +4987,7 @@ dependencies = [
  "http",
  "httparse",
  "log",
- "rand 0.10.3",
+ "rand",
  "sha1",
  "thiserror 2.0.21",
 ]
@@ -4608,6 +5001,12 @@ dependencies = [
  "rustc-hash 2.1.3",
 ]
 
+[[package]]
+name = "typed-path"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce898823d8cd0f028662d2f349694b1af0a5cc9be83f1d213a00d3147445e1e"
+
 [[package]]
 name = "typenum"
 version = "1.20.1"
@@ -4657,9 +5056,9 @@ checksum = "0b993bddc193ae5bd0d623b49ec06ac3e9312875fdae725a975c51db1cc1677f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
 
 [[package]]
 name = "unicode-properties"
@@ -4697,6 +5096,35 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
+[[package]]
+name = "ureq"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde93ff05758a36a851a398a772b0b79a82fbe3c186a46f2696baaeaf84c966b"
+dependencies = [
+ "base64 0.23.1",
+ "flate2",
+ "log",
+ "percent-encoding",
+ "rustls",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
+ "ureq-proto",
+ "utf8-zero",
+]
+
+[[package]]
+name = "ureq-proto"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841583fc36089d7d59419568ae157f43a5a03a2e5a81ba87c77d1596ef46e922"
+dependencies = [
+ "base64 0.23.1",
+ "http",
+ "httparse",
+ "log",
+]
+
 [[package]]
 name = "url"
 version = "2.5.8"
@@ -4724,19 +5152,25 @@ dependencies = [
  "kurbo",
  "log",
  "pico-args",
- "roxmltree 0.21.1",
+ "roxmltree 0.21.2",
  "simplecss",
  "siphasher",
  "skrifa 0.44.0",
  "strict-num",
  "svgtypes",
- "tiny-skia-path",
+ "tiny-skia-path 0.12.0",
  "unicode-bidi",
  "unicode-script",
  "unicode-vo",
  "xmlwriter",
 ]
 
+[[package]]
+name = "utf8-zero"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e"
+
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -4751,9 +5185,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.27.0"
+version = "1.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97277d36b9c3ace13e58fa6e753f8b0bbbf302a18dd193240d70f9e29681059a"
+checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514"
 dependencies = [
  "js-sys",
  "serde_core",
@@ -4762,9 +5196,9 @@ dependencies = [
 
 [[package]]
 name = "vello_common"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e9aed918117e8152c9eddfd8362d73c465c23f26c44786aa331707b8a64fa2"
+checksum = "bbb2141a2bca6e6d598e471fd4d1d7eed8e020aad6a28187edda07f091a325dd"
 dependencies = [
  "bytemuck",
  "fearless_simd",
@@ -4777,9 +5211,9 @@ dependencies = [
 
 [[package]]
 name = "vello_cpu"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac7349e1f55f6b801c7c277958df4ea53e7f20f21e8014910ad888b2ecda93ea"
+checksum = "ace506ca414548966fcf3c283be94eb1cad8254de488791ee698bf438b0890a9"
 dependencies = [
  "bytemuck",
  "glifo",
@@ -4787,6 +5221,16 @@ dependencies = [
  "vello_common",
 ]
 
+[[package]]
+name = "verifysign"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6acfcc42a8d44f340d001193d97ef56bf33210b51ad760ae8308c97d5241ca51"
+dependencies = [
+ "core-foundation 0.10.1",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -4870,7 +5314,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "wasm-bindgen-shared",
 ]
 
@@ -4885,12 +5329,12 @@ dependencies = [
 
 [[package]]
 name = "wasm-encoder"
-version = "0.261.0"
+version = "0.262.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2608e8bb6d67fd68f5a8d0eb1363d6e7bcbc1f8ded5a0bd3a1e382462b876b22"
+checksum = "4495a6f85dd94c411c749303efcbc5defade0b0cbdbc0541495241ab917a9b5a"
 dependencies = [
  "leb128fmt",
- "wasmparser 0.261.0",
+ "wasmparser 0.262.0",
 ]
 
 [[package]]
@@ -4945,9 +5389,9 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.261.0"
+version = "0.262.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f20f20e44f7e8aeb6744823ea9d869ede51e51be4fdaedede2852282e54d2d8"
+checksum = "974d643b125b272607e2fff8012ea14a8328acd7621e4bafa7afb32500052b1b"
 dependencies = [
  "bitflags 2.13.2",
  "indexmap",
@@ -4956,9 +5400,9 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "261.0.0"
+version = "262.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "776443145731a4062e5b0d392892a2005909b6ab72d9fdc3cad53dd1a714e44a"
+checksum = "30612a0c29249b5f185888a107e8a519d920226b7d07f9d351fd094e9f75eb23"
 dependencies = [
  "bumpalo",
  "leb128fmt",
@@ -4969,9 +5413,9 @@ dependencies = [
 
 [[package]]
 name = "wat"
-version = "1.261.0"
+version = "1.262.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7b4d1a49ea73a8f3326e74e3a05db667001b16bd1035ed3356fc1a0ed05ca7f"
+checksum = "e228027f2b07bbaf946980ebbe2437fca73be6f54c40c2a8d4f42f277075f8d1"
 dependencies = [
  "wast",
 ]
@@ -5095,7 +5539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"
 dependencies = [
  "proc-macro2",
- "quick-xml",
+ "quick-xml 0.41.0",
  "quote",
 ]
 
@@ -5133,9 +5577,9 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "1.2.4"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62c35be770821a214dbc362fc26908c853e776c0004294d0b10b8a6bad582f94"
+checksum = "d2c8ddfbbf66e501434657400268cefe51b95140a0266236415cda7627732df7"
 dependencies = [
  "jni",
  "log",
@@ -5148,10 +5592,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "webpki-roots"
-version = "1.0.9"
+name = "webpki-root-certs"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a"
+checksum = "e49d0e65abc00c142e8f9428da991da9f1a250c39be97459901eb12b9b49f62a"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -5361,7 +5814,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5482,7 +5935,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
@@ -5491,16 +5944,7 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.5",
+ "windows-targets",
 ]
 
 [[package]]
@@ -5518,31 +5962,14 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
-dependencies = [
- "windows-link",
- "windows_aarch64_gnullvm 0.53.1",
- "windows_aarch64_msvc 0.53.1",
- "windows_i686_gnu 0.53.1",
- "windows_i686_gnullvm 0.53.1",
- "windows_i686_msvc 0.53.1",
- "windows_x86_64_gnu 0.53.1",
- "windows_x86_64_gnullvm 0.53.1",
- "windows_x86_64_msvc 0.53.1",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
 [[package]]
@@ -5560,101 +5987,52 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
-
 [[package]]
 name = "winit"
 version = "0.30.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6755fa58a9f8350bd1e472d4c3fcc25f824ec358933bba33306d0b63df5978d"
+source = "git+https://github.com/storytold/winit.git?rev=a517b3846ee8457d84ee4975110bfda6797c44dc#a517b3846ee8457d84ee4975110bfda6797c44dc"
 dependencies = [
  "ahash",
  "android-activity",
@@ -5665,8 +6043,8 @@ dependencies = [
  "calloop 0.13.0",
  "cfg_aliases",
  "concurrent-queue",
- "core-foundation",
- "core-graphics",
+ "core-foundation 0.9.4",
+ "core-graphics 0.23.2",
  "cursor-icon",
  "dpi",
  "js-sys",
@@ -5683,6 +6061,7 @@ dependencies = [
  "raw-window-handle",
  "redox_syscall 0.4.1",
  "rustix 0.38.44",
+ "sctk-adwaita",
  "smithay-client-toolkit 0.19.2",
  "smol_str",
  "tracing",
@@ -5711,21 +6090,55 @@ dependencies = [
 ]
 
 [[package]]
-name = "winresource"
-version = "0.1.31"
+name = "winreg"
+version = "0.55.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0986a8b1d586b7d3e4fe3d9ea39fb451ae22869dcea4aa109d287a374d866087"
+checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winresource"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bc6d36480b829272a5bdabf08e6dca8004761c1da7e35efef800540c66221b"
 dependencies = [
  "toml",
  "version_check",
 ]
 
+[[package]]
+name = "winsafe"
+version = "0.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ef0ffc427f045c0cc9ebffd6f4f91153dcd2a1547b5c3c29ee3f541e16e95c6"
+
 [[package]]
 name = "wit-bindgen"
 version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
+[[package]]
+name = "wl-clipboard-rs"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d7888ccd4896447b2d14d3a9350a85df2aeb6f181e2e7a31349d104ac46cac1"
+dependencies = [
+ "libc",
+ "log",
+ "os_pipe",
+ "rustix 1.1.5",
+ "thiserror 2.0.21",
+ "tree_magic_mini",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+]
+
 [[package]]
 name = "write-fonts"
 version = "0.48.1"
@@ -5822,7 +6235,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee"
 
 [[package]]
 name = "xtask"
-version = "0.6.0"
+version = "0.11.2"
 dependencies = [
  "figcraft-engine",
  "serde_json",
@@ -5830,9 +6243,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
+checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",
@@ -5847,7 +6260,7 @@ checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "synstructure",
 ]
 
@@ -5919,7 +6332,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "zbus_names",
  "zvariant",
  "zvariant_utils",
@@ -5927,9 +6340,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.3.4"
+version = "4.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e"
+checksum = "812a12be4ead7a59e18ea8f047d08add0066b73bc62fc1467066a2472ae088dd"
 dependencies = [
  "serde",
  "winnow",
@@ -5959,18 +6372,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.62"
+version = "0.8.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86502bf56ac7c77571a32e2647bb2a15894565e981fb2a48d7bde2d91c965a9d"
+checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.62"
+version = "0.8.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5457206954b06561e2608c7e19cf58b1926586d999c246eebe4502f7e2039d1a"
+checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5994,7 +6407,7 @@ checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "synstructure",
 ]
 
@@ -6017,9 +6430,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8"
+checksum = "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -6028,29 +6441,44 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.6"
+version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da"
+checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "zip"
-version = "2.4.2"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50"
+checksum = "1dcb24d0152526ae49b9b96c1dcf71850ca1e0b882e4e28ed898a93c41334744"
 dependencies = [
  "arbitrary",
  "crc32fast",
  "crossbeam-utils",
- "displaydoc",
  "flate2",
  "indexmap",
  "memchr",
- "thiserror 2.0.21",
+ "zopfli",
+]
+
+[[package]]
+name = "zip"
+version = "9.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "518b847fd864440c379748ad684c449f293af68978a485a4ff16f7c901c1f7c4"
+dependencies = [
+ "crc32fast",
+ "flate2",
+ "getrandom 0.4.3",
+ "indexmap",
+ "memchr",
+ "nix",
+ "typed-path",
+ "windows-sys 0.61.2",
  "zopfli",
 ]
 
@@ -6068,9 +6496,9 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
 
 [[package]]
 name = "zopfli"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
+checksum = "aaf7fc5d30c28483d93805c4a5e12b05bbb52407fa67c5f8bd552374cd01fb11"
 dependencies = [
  "bumpalo",
  "crc32fast",
@@ -6095,9 +6523,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.15.0"
+version = "5.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1d34c27cc6cdd1f458427519dd6b8612f7b7e3f7b9a0b2355d041dda9869147"
+checksum = "80bf6d6cd6a4b601acb64cfb8284cdc643fcfa75ef26ae3c46ec8aa4e8a1fbb7"
 dependencies = [
  "endi",
  "enumflags2",
@@ -6110,14 +6538,14 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.15.0"
+version = "5.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864155e69b4352db0c7f374917bf45d1e0c8d17659c8b3dbf9795f3673f8c497"
+checksum = "ef2672456ba1cb54b5eaec136e63135b3c7495fb938e53b28a62e633496d486d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "zvariant_utils",
 ]
 
@@ -6130,6 +6558,26 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 3.0.6",
+ "syn 3.0.9",
  "winnow",
 ]
+
+[[patch.unused]]
+name = "egui_demo_lib"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
+
+[[patch.unused]]
+name = "egui_inspection"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
+
+[[patch.unused]]
+name = "egui_kittest"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
+
+[[patch.unused]]
+name = "egui_system_font_provider"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
diff --git a/Cargo.toml b/Cargo.toml
index 8f125ac3..f6fca285 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ exclude = ["plugins"]
 # default-members = ["crates/*", "apps/figcraft", "apps/figcraft-cli", "xtask"]
 
 [workspace.package]
-version = "0.6.0"
+version = "0.11.2"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.95"
@@ -23,6 +23,7 @@ figcraft-pathops = { path = "crates/pathops" }
 figcraft-render = { path = "crates/render" }
 figcraft-svg = { path = "crates/svg" }
 figcraft-pdf = { path = "crates/pdf" }
+figcraft-vectordrawable = { path = "crates/vectordrawable" }
 figcraft-format = { path = "crates/format" }
 figcraft-tools = { path = "crates/tools" }
 figcraft-collab = { path = "crates/collab" }
@@ -32,6 +33,16 @@ figcraft-mcp = { path = "crates/mcp" }
 figcraft-collab-net = { path = "crates/collab-net" }
 figcraft-plugin = { path = "crates/plugin" }
 
+# craft-libs crates all pin one rev (craftrules standards/shared-libraries.md): bump them together.
+# Which paths stored in a document may be followed (craft-libs).
+craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184" }
+# Who draws the window frame on Linux — the compositor or the app — so every Craft app shows the
+# same native titlebar per desktop (craft-libs). FigCraft only reads the probe result and maps it
+# to its own `TitleBar`, so it does not enable craft-window's optional `egui` helpers (which would
+# pull a second egui family version).
+craft-window = { git = "https://github.com/storytold/craft-libs", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184" }
+craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184", features = ["egui"] }
+
 # foundation
 kurbo = { version = "0.13", features = ["serde"] }
 thiserror = "2"
@@ -39,6 +50,9 @@ serde = { version = "1", features = ["derive", "rc"] }
 serde_json = { version = "1", features = ["float_roundtrip"] }
 regex = "1.13"
 log = "0.4"
+same-file = "1.0.6"
+# All date/time conversion goes through chrono (no hand-rolled calendar code beyond the 400-year range extension; AGENTS.md).
+chrono = { version = "0.4.45", default-features = false, features = ["std"] }
 proptest = "1"
 imbl = { version = "7", features = ["serde"] }
 postcard = { version = "1", default-features = false, features = ["alloc"] }
@@ -55,11 +69,15 @@ skrifa = "0.47"
 harfrust = "0.13"
 unicode-bidi = "0.3"
 unicode-segmentation = "1.13"
+# Code export: layer names transliterated into ASCII identifiers (pure Rust data tables, zero
+# dependencies, BSD-3-Clause, no_std so the web build keeps it too).
+deunicode = "1.6"
 linesweeper = "0.4"
 zip = { version = "2", default-features = false, features = ["deflate"] }
 # `.fig` import: raw deflate chunks (already built for zip) and zstd chunks (pure Rust, MIT, wasm-safe).
 flate2 = { version = "1", default-features = false, features = ["rust_backend"] }
 ruzstd = { version = "0.9.1", default-features = false, features = ["std"] }
+sha1 = "0.11"
 sha2 = "0.10"
 base64 = "0.22"
 crc32fast = "1"
@@ -71,9 +89,9 @@ wasmi = { version = "2", default-features = false, features = ["std", "stable",
 wat = "1.261"
 
 # ui
-egui = "0.36"
-egui_extras = { version = "0.36", default-features = false }
-eframe = { version = "0.36", default-features = false }
+egui = "0.37"
+egui_extras = { version = "0.37", default-features = false }
+eframe = { version = "0.37", default-features = false }
 rfd = "0.17"
 arboard = { version = "3.6", default-features = false }
 webbrowser = "1"
@@ -95,11 +113,15 @@ todo = "deny"
 unimplemented = "deny"
 unreachable = "deny"
 
-[profile.dev.package."*"]
-opt-level = 2
-
+# Workspace crates keep file:line in panic backtraces; dependencies carry no debug info. Both make
+# the test build faster and the target dir smaller.
 [profile.dev]
 opt-level = 1
+debug = "line-tables-only"
+
+[profile.dev.package."*"]
+opt-level = 2
+debug = false
 
 [profile.release]
 lto = "thin"
@@ -110,9 +132,32 @@ codegen-units = 4
 # wasm32-unknown-unknown always aborts on panic, so panic = "abort" changes nothing there.
 [profile.web-release]
 inherits = "release"
-opt-level = "s"
+# "z", not "s": 1.9 MB smaller (24.0 MiB -> 22.2 MiB after wasm-opt, 0.11.1), back under the gate.
+opt-level = "z"
 lto = "fat"
 codegen-units = 1
 debug = false
 strip = true
 panic = "abort"
+
+# Keep the complete egui family and native event bridge on reviewed fork commits.
+[patch.crates-io]
+ecolor = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+emath = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+epaint = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+epaint_default_fonts = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui-winit = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui-wgpu = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_glow = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_extras = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_kittest = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_system_font_provider = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+eframe = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_demo_lib = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_inspection = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" }
+
+# craft-libs' vendored krilla 0.8.2: decoded PNGs are capped at 1 GiB and reserved fallibly, and a
+# panic while drawing unwinds without aborting.
+krilla = { git = "https://github.com/storytold/craft-libs", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184" }
diff --git a/NOTICE b/NOTICE
index 9aaba825..9970631d 100644
--- a/NOTICE
+++ b/NOTICE
@@ -20,3 +20,51 @@ licence texts.
 Rust crate dependencies keep their own licenses (MIT, Apache-2.0, BSD, ISC, Zlib, OFL for egui's
 default fonts, CDLA-Permissive-2.0 for the root certificate list webpki-roots compiles in, and
 similar permissive licenses); see each crate's metadata.
+
+Linux Wayland window decorations
+-------------------------------
+sctk-adwaita 0.10.1 (https://github.com/PolyMeilex/sctk-adwaita,
+commit d5f343c45c04d4a026db57f76760819b7325db00) is used by winit on Linux
+for vector window controls. Its title-font features are disabled: no Cantarell
+font is embedded by this dependency and no font file is added to this repo.
+
+sctk-adwaita's MIT licence:
+
+MIT License
+
+Copyright (c) 2022 Bartłomiej Maryńczak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+egui icon font subset (dependency asset)
+----------------------------------------
+epaint_default_fonts 0.37 embeds egui-icons.ttf, a five-glyph subset of
+emoji-icon-font by John Slegers. The full monochrome emoji-icon-font fallback
+uses the same MIT license. Upstream license text follows unchanged.
+
+MIT License
+
+Copyright (c) 2014 John Slegers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index 96bef198..75328de1 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,14 @@
   </a>
 </p>
 
+<p align="center">
+  <img src="assets/app-icon/hicolor/256x256/apps/ai.storyteller.figcraft.png" width="128" height="128" alt="FigCraft icon: an engraved chameleon on a mint-green tile">
+</p>
+
 <h1 align="center">FigCraft</h1>
 
 <p align="center">
-  <b>Interface design; an open-source, clean-room reimplementation of Figma, rebuilt in pure Rust.</b><br>
+  <b>Interface design and prototyping: open source, collaborative and built in pure Rust.</b><br>
   Frames, auto layout, components and variants, vector networks, styles, variables and prototypes,<br>
   in a native app that opens instantly and works offline. Open source, and yours.
 </p>
@@ -20,6 +24,9 @@
   <img alt="macOS · Windows · Linux · FreeBSD · Web" src="https://img.shields.io/badge/macOS%20%C2%B7%20Windows%20%C2%B7%20Linux%20%C2%B7%20FreeBSD%20%C2%B7%20Web-native-0EA5C6?style=flat-square">
   <img alt="License: MIT OR Apache-2.0" src="https://img.shields.io/badge/license-MIT%20%2F%20Apache--2.0-3a3a3a?style=flat-square">
   <img alt="Status: early alpha" src="https://img.shields.io/badge/status-early%20alpha-d69e2e?style=flat-square">
+  <br>
+  <a href="https://sonarcloud.io/project/overview?id=storytold_figcraft"><img alt="Scanned by SonarCloud" src="https://img.shields.io/badge/Scanned_by-SonarCloud-4b9fd5?style=flat-square&logo=sonarqubecloud&logoColor=white"></a>
+  <a href="https://coderabbit.ai"><img alt="Reviewed by CodeRabbit" src="https://img.shields.io/coderabbit/prs/github/storytold/figcraft?style=flat-square&label=Reviewed%20by%20CodeRabbit&logo=coderabbit"></a>
 </p>
 
 <p align="center">
@@ -62,7 +69,7 @@
   <tr>
     <td width="25%" valign="top">
       <h3>🎛️ Familiar by design</h3>
-      The toolbar, layers panel, Design panel, menus and shortcuts sit where your hands expect them. If you know Figma, you already know FigCraft.
+      The toolbar, layers panel, Design panel, menus and shortcuts sit right where your hands expect them.
     </td>
     <td width="25%" valign="top">
       <h3>⚡ Native and fast</h3>
@@ -114,6 +121,16 @@
   <p align="center"><sub><b>Live sessions</b>: three apps on one <code>figcraft-server</code> file, with cursors, selections, cursor chat and spotlight</sub></p>
 </td>
 </tr>
+<tr>
+<td width="50%" valign="top">
+  <img src="docs/images/shot-8-board.png" alt="A board file named Sprint retro on a dot grid: a Sprint 14 retro made from the retrospective template, with Went well, To improve and Next steps sections of sticky notes, vote counts of 3, 2, 1 and 1 on four stickies after a vote has ended, and below it a pull request flow chart from the flow chart template whose shapes are joined by straight and elbow connectors with Yes and No labels; a timer pill in the top right shows 4:30 left with pause, add a minute, stop and Results buttons" width="100%">
+  <p align="center"><sub><b>Boards</b>: a whiteboard file kind with sticky notes, templates, connectors, a shared timer and voting, in the same live sessions</sub></p>
+</td>
+<td width="50%" valign="top">
+  <img src="docs/images/shot-9-devmode-measure.png" alt="Dev Mode on the Ridgeline home screen with the featured trail card selected: red redlines kept on the canvas show 118.3 from the card to the search field, 62.1 from the card to the first trail row and 256.3 along the card's left side, and the Inspect panel's Measurements section lists the three with their values under an Add measurement menu" width="100%">
+  <p align="center"><sub><b>Dev Mode measurements</b>: redlines placed between layers or along a side, saved in the file and following the layers · <code>examples/ridgeline-app.figcraft</code></sub></p>
+</td>
+</tr>
 </table>
 
 ## Made in FigCraft
@@ -191,7 +208,7 @@ exposes to agents, and exported at 2x by FigCraft's own renderer. The source fil
     </td>
     <td width="50%" valign="top">
       <h3>Prototype and hand off</h3>
-      Connections, triggers, actions and Smart Animate-style transitions, variables with conditionals (if / else if / else built in the interaction editor, expressions like <code>count + 1</code>), flows, a presentation view with device frames, hotspot hints and an Inspect panel, and a live preview pane. Alt to measure distances and padding on the canvas, Inspect mode with measurements, annotations in colour-coded categories, a ready-for-dev list with a focus view and Compare changes (before / after with property-level diffs since a frame was marked ready), and code (CSS, HTML, React, Leptos, SwiftUI, Compose, Flutter) where components take their properties as parameters, comment threads pinned to frames (replies, @mentions, reactions, read state) and named version history. Export any layer at any scale to PNG, JPG, WebP, SVG or PDF.
+      Connections, triggers, actions and Smart Animate-style transitions, variables with conditionals (if / else if / else built in the interaction editor, expressions like <code>count + 1</code>), flows, a presentation view with device frames, hotspot hints and an Inspect panel, and a live preview pane. Alt to measure distances and padding on the canvas, Inspect mode with measurements, annotations in colour-coded categories, a ready-for-dev list with a focus view and Compare changes (before / after with property-level diffs since a frame was marked ready), and code (CSS, HTML, React, Vue, Leptos, SwiftUI, Compose, ArkUI, Flutter) where components take their properties as parameters, comment threads pinned to frames (replies, @mentions, reactions, read state) and named version history. Export any layer at any scale to PNG, JPG, WebP, SVG or PDF.
     </td>
   </tr>
 </table>
@@ -227,8 +244,8 @@ The desktop app also offers a loopback-only control channel (`figcraft --control
 - **Its own renderer:** tiny-skia on every core for the canvas and exports, with layer blending, effects and masks; booleans from linesweeper, geometry from kurbo, text from skrifa and HarfRust.
 - **Runs in the browser:** the whole engine and UI compile to WebAssembly.
 - **Accessible:** screen readers get names, roles, values and states for the tools, layer rows, fields, dropdowns, tabs and menus (AccessKit on desktop), F6 moves the keyboard between the toolbar, layers, canvas and properties (Tab within them, Escape back to the canvas), the system's reduce-motion setting is honoured, and panel text meets WCAG AA contrast in both themes.
-- **Languages:** English, Russian and Turkish (reviewed by native speakers), and Spanish, French, German, Brazilian Portuguese, Japanese, Korean, Simplified Chinese, Czech and Indonesian drafts, picked in Preferences or taken from the system or browser and switched live; adding a language is one catalog file ([`docs/translating.md`](docs/translating.md)).
-- **Plugins:** sandboxed WebAssembly plugins (a metered, pure-Rust interpreter with a memory cap and no file or network access, in the browser too) that act through the same commands, each run one undo step, within the permissions their manifest asks for. A Rust SDK and two example plugins are in [`plugins/`](plugins); see [`docs/plugins.md`](docs/plugins.md).
+- **Languages:** English, Russian and Turkish (reviewed by native speakers), and Spanish, French, German, Brazilian Portuguese, Japanese, Korean, Simplified Chinese, Czech, Indonesian, Georgian and Vietnamese drafts, picked in Preferences or taken from the system or browser and switched live; adding a language is one catalog file ([`docs/translating.md`](docs/translating.md)).
+- **Plugins:** sandboxed WebAssembly plugins (a metered, pure-Rust interpreter with a memory cap and no file or network access, in the browser too) that act through the same commands, each run one undo step, within the permissions their manifest asks for. A Rust SDK and four example plugins are in [`plugins/`](plugins); see [`docs/plugins.md`](docs/plugins.md).
 - **Live sessions (preview):** share the open file from the app (Share ▸ Start sharing: online through a server, or on your local network), give the others the short join code it shows (or the invite link), and edit it together: everyone's changes sync live, with cursors, selections, avatars and follow, and undo takes back only your own changes. Others join from the desktop app (invite links open it) or from the browser build. See [`docs/collab-protocol.md`](docs/collab-protocol.md).
 - **A server of your own (preview):** `figcraft-server` keeps a team's files, publishes them from the app (File ▸ Publish to server…, or Share ▸ Online with your server in Preferences) and hands out share links and join codes that let people edit or only view; files survive restarts and apps reconnect where they were. No accounts yet: links are the access. Releases ship it for Linux, and the desktop app joins over `wss://`; [hosting it on a rented Linux server](docs/server.md#deploy-on-a-linux-server) takes a systemd unit and Caddy or nginx (or Docker). See [`docs/server.md`](docs/server.md).
 - **Never crashes:** no `unwrap`, `expect` or `panic` in shipped code, enforced by clippy; commands run behind a guard so a bug fails one action, not your session.
@@ -262,7 +279,7 @@ New contributors and AI agents: start with [`AGENTS.md`](AGENTS.md), then [`docs
 Installers for macOS (universal, signed and notarized), Windows (x64, x86 and arm64), Linux (AppImage, `.deb`, `.rpm`, Flatpak and tarball), FreeBSD and the web are attached to each [GitHub release](https://github.com/storytold/figcraft/releases). Maintainers: [`docs/releasing.md`](docs/releasing.md) explains how releases are built, signed and published.
 
 > [!IMPORTANT]
-> **Status:** FigCraft is in **alpha**: about 49% of the way to replacing Figma for real work, by our own estimate. Nearly all of Figma's main menu is wired ([`docs/parity-checklist.md`](docs/parity-checklist.md)) and the core editor works end to end, but FigCraft opens `.fig` files only best effort, has only a first preview of multiplayer (live sessions hosted from the app or a self-hosted server, with per-person undo and share links to edit or to view; no accounts, teams or cloud yet), runs its own WebAssembly plugins rather than Figma's, and hasn't been checked against real Figma documents. The honest, area-by-area picture is in the [roadmap](ROADMAP.md) and [`docs/target-app-parity.md`](docs/target-app-parity.md). Expect rough edges and please file issues, or tell us what broke on [Discord](https://discord.gg/artcraft).
+> **Status:** FigCraft is in **alpha**: about 49% of the way to replacing proprietary tools for real work, by our own estimate. Nearly all tracked interface design actions in the menu checklist are wired ([`docs/parity-checklist.md`](docs/parity-checklist.md)) and the core editor works end to end, but FigCraft opens `.fig` files only best effort, has only a first preview of multiplayer (live sessions hosted from the app or a self-hosted server, with per-person undo and share links to edit or to view; no accounts, teams or cloud yet), runs its own WebAssembly plugins, and hasn't been checked against real design documents. The honest, area-by-area picture is in the [roadmap](ROADMAP.md) and [`docs/target-app-parity.md`](docs/target-app-parity.md). Expect rough edges and please file issues, or tell us what broke on [Discord](https://discord.gg/artcraft).
 
 ## Privacy and online sharing
 
@@ -348,8 +365,6 @@ ArtCraft Team and are not covered by this license. They may be used only unmodif
 part of this repository and FigCraft, under [`docs/brand/LICENSE-brand.txt`](docs/brand/LICENSE-brand.txt).
 Forks and modified versions must remove them.
 
-<sub>Figma is a trademark of Figma, Inc. FigCraft is an independent, open-source project and is not affiliated with, sponsored by or endorsed by Figma, Inc.; the name is used only to describe the workflows FigCraft is compatible with.</sub>
-
 <p align="center">
   <a href="https://getartcraft.com/"><img alt="ArtCraft" src="https://raw.githubusercontent.com/storytold/vectorcraft/main/docs/brand/artcraft-mark.png" width="28"></a><br>
   <sub>Made by the <a href="https://getartcraft.com/">ArtCraft</a> team and community.</sub>
diff --git a/ROADMAP.md b/ROADMAP.md
index 9a3fe224..30a2caf7 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -2,7 +2,7 @@
 
 **Stage: alpha** · next: beta, ~26 points and ~162–292 h away (one Opus 5.5 agent; ~33–67 h wall-clock with 5 agents)
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-16 · **Change:** minor (Flutter code generation; bounded canvas pan overscan; community fixes from #478 up and a control-channel fix (#589); bounded canvas pan overscan; Typography spacing icons support scrubbing (#373); font scans skip named pipes; system theme on first run; recent files as cards with thumbnails on the home screen; community fixes: lost images reported on loading (#207), SVG import budgets (#190), Leptos code (#223), full screen (#227), server snapshots readable again (#188), owner-only preferences (#200), ruzstd 0.9.1 (#182), layer cycle repair (#205), batch rollback, Direct3D 12 on Windows, plugin metering (#192); vector edit mode regions: hover hatch, selection and drag; SVG/PDF exports refuse over-depth documents (#208); bounded MCP/control framing, connections and queues (#201); plugin log limits (#191); live-session revert guard (#198); attached MCP no longer replays after a lost reply (#194); repeat command recursion fix; the Layout panel's constrain-proportions link scales the other side, #220; core editor leftovers: component playground, auto gap handles, variables inside styles, inner shadows and background blur on groups, command-made text readable on dark pages, a one-step frame/group convert, delays on mouse triggers and manual overlay offsets, wrapped-line alignment; `.fig` export: instance sizes, variables with modes, shared styles, variable-width strokes; starter templates, a Templates tab and Getting started tips on the home screen; your online files; everyday editing partials: number fields, outline options, Hide when publishing, cursors, panel widths, dark pages; sharing with a join code; text box sizes measured against documents re-saved by other software; live sessions per document; .fig export checked by opening written files in other software; a public figcraft-server: open hosting, owner tokens, per-address limits, idle expiry, moderation, install.sh; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; headline percentages recomputed from the area table: feature breadth ~84%, core ~94%, mainstream ~50%; text lists, hanging punctuation and decoration styles; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; export and inspect behaviour suite and fixes; .fig import: editable vector networks and more layer kinds; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; styles and variables behaviour suite and fixes; prototyping behaviour suite and fixes; components behaviour suite and fixes; embedded image colour profiles; layers panel keyboard: F2 rename, Shift+F10 context menu, keyboard box selection, 10k-layer QA; per-side stroke weight variables; text behaviour suite: CJK line breaking, metrics, vertical trim; selection and transform behaviour suite and fixes; `.fig` import, best effort; Windows QA pass with eight fixes; auto layout behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings; feature breadth ~80%; ready ~49%) · **Target:** Figma Design (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-26 · **Change:** minor (colour picker LCH and OKLCH models; non-ASCII layer names transliterate in code export (#1235); branches in live sessions and branch history entries, gap 17; plugin widgets take text input and a property menu (plugin API 4); boards: templates and tables; boards: a shared timer and voting sessions; boards: the dot grid, connector ends dragged to re-attach, curved connectors; Installed weights of an embedded font family (#1246); `.sketch` import, best effort (Sketch 48 and newer); CJK line breaking: JIS X 4051's line-start and line-end sets completed with the halfwidth small kana, the halfwidth and spacing (semi-)voiced sound marks, the iteration marks 〱–〵 and the halfwidth parentheses, with behaviour cases for each; Adobe Fonts found on macOS (#298); egui 0.37 hidden-capture deadline contract; Dev Mode measurements kept on the canvas and a read-only layers panel; boards: a board area row and progress entry; community fixes in #507, #510, #529 and #530: auto-save, a text box by dragging, batch step references, removing someone from a live session, Russian and Turkish catalogs reviewed, Czech and Indonesian drafts, the Japanese draft completed, zoom previews, the web clipboard, Alt-drag snapping and Cmd+D repeat, recovery copies, crash and rollback fixes, colour emoji, `.fig` import fixes; earlier changes are in the revision history below) · **Target:** Figma Design (desktop app 126.10.7)
 
 FigCraft is a clean-room, open-source, pure-Rust reimplementation of the Figma design workflow,
 native on macOS, Windows, Linux and FreeBSD and in the browser, fully drivable by agents through
@@ -13,19 +13,19 @@ start with [`docs/gaps.md`](docs/gaps.md).
 
 | | Value | Kind |
 |---|---|---|
-| Menu/command breadth | **100%** (211 / 211) | measured, [`docs/parity-checklist.md`](docs/parity-checklist.md) (`cargo xtask parity`) |
+| Menu/command breadth | **100%** (212 / 212) | measured, [`docs/parity-checklist.md`](docs/parity-checklist.md) (`cargo xtask parity`) |
 | Feature breadth | **~85%** (core editor ~94%) | estimated, [`docs/target-app-parity.md`](docs/target-app-parity.md) |
 | Ready for real work | **~53%** | estimated, same doc (written dimension weights and scores) |
 | Essentials user | **~59%** | estimated: core features 77.8% × 0.92 launch/stability × 0.94 discoverability × 0.88 opening files people send ([method](docs/target-app-parity.md#essentials-user)) |
 | Mainstream practitioner | **~50%** | estimated: weekly areas 72.7% × 0.9 interaction × 0.9 stability × 0.85 file exchange with Figma users ([method](docs/target-app-parity.md#mainstream-practitioner)) |
 | Remaining to beta | **~155–280 h** one agent | estimated |
-| Remaining to full parity | **~262–519 h** one agent (~83–145 h wall-clock with 5 agents) | estimated |
+| Remaining to full parity | **~260–515 h** one agent (~83–145 h wall-clock with 5 agents) | estimated |
 
 ### Readiness by audience
 
 | Audience | Ready % | Opus 5.5 agent wall-clock hours to ~95% | Work that dominates |
 |---|---|---|---|
-| Full target (ready for real work) | ~53% | ~268–522 h | multiplayer (42–84), localization (29–51), plugins (8–26), the interaction pass (40–60), GPU canvas (30–60), AI (30–60), the `.fig` import's tail (5–10) |
+| Full target (ready for real work) | ~53% | ~266–518 h | multiplayer (42–84), localization (29–51), plugins (6–22), the interaction pass (40–60), GPU canvas (30–60), AI (30–60), the `.fig` import's tail (5–10) |
 | Mainstream practitioner | ~50% | ~120–229 h | core editor depth incl. the `.fig` import's tail (49–98), the interaction pass (40–60), real-file corpus and platform QA (25–50), checking the rest of the experimental `.fig` export elsewhere: effects, images, prototypes, real files (5–15) |
 | Essentials user | ~59% | ~55–100 h | the `.fig` import's tail so the files people send open well (5–10), core tool polish (25–45), interaction pass on the core tools (15–25), stability QA (10–20) |
 
@@ -50,7 +50,7 @@ against real Figma documents. Ready-for-real-work is ~53%, inside alpha's ~40–
 ~75% **and** reliable `.fig` import: the `.fig` import's tail (5–10 h), a real-file corpus with measured
 fidelity (15–30 h), the interaction pass (25–40 h of the 40–60), core depth to ~80% (40–75 h),
 basic multiplayer on the landed core (30–55 h), stability and platform QA (20–40 h), a partial GPU path (15–30 h);
-native speakers' reviews of the six language drafts need people.
+native speakers' reviews of the nine language drafts need people.
 
 ## By dimension
 
@@ -63,9 +63,9 @@ native speakers' reviews of the six language drafts need people.
 | Stability | 55% | 20–40 | [gaps](docs/gaps.md) |
 | Performance | 60% | 30–60 | [hardware-parity](docs/hardware-parity.md) |
 | Hardware | 60% | 10–21 | [hardware-parity](docs/hardware-parity.md) |
-| Localization | 39% (layer; English; Spanish with a Latin American overlay, French, German, Brazilian Portuguese, Japanese, Korean, Simplified Chinese drafts; CJK UI fonts) | 29–51 | [localization-parity](docs/localization-parity.md) |
+| Localization | 39% (layer; English; Russian and Turkish reviewed by native speakers; Spanish with a Latin American overlay, French, German, Brazilian Portuguese, Japanese, Korean, Simplified Chinese, Indonesian and Czech drafts; CJK UI fonts) | 29–51 | [localization-parity](docs/localization-parity.md) |
 | Platforms | 75% | 10–20 | [hardware-parity](docs/hardware-parity.md) |
-| Ecosystem / plugins | 38% (own WASM plugins with panels, settings and widgets; a self-hosted plugin directory) | 8–26 | [gaps](docs/gaps.md) |
+| Ecosystem / plugins | 40% (own WASM plugins with panels, settings and widgets that take clicks, text and a property menu; a self-hosted plugin directory) | 6–22 | [gaps](docs/gaps.md) |
 | AI features | 0% | 30–60 | [gaps](docs/gaps.md) |
 
 ## Features
@@ -86,38 +86,39 @@ native speakers' reviews of the six language drafts need people.
 | Styles & variables | 95% | 76% | 2–4 | [components-parity](docs/components-parity.md) |
 | Prototyping | 92% | 74% | 2–5 | [prototyping-parity](docs/prototyping-parity.md) |
 | Import/export | 86% | 58% | 5–10 | [file-format-parity](docs/file-format-parity.md) |
-| Dev Mode / inspect | 96% | 72% | 0–1 | [dev-mode-parity](docs/dev-mode-parity.md) |
+| Dev Mode / inspect | 98% | 78% | 1–2 | [dev-mode-parity](docs/dev-mode-parity.md) |
 | Comments, versions, misc | 87% | 63% | 1–3 | [collaboration-parity](docs/collaboration-parity.md) |
 | Multiplayer & sharing | 17% | 5% | 42–84 | [collaboration-parity](docs/collaboration-parity.md) |
-| Plugins & widgets | 60% | 35% | 8–26 | [plugins](docs/plugins.md) |
+| Plugins & widgets | 65% | 38% | 6–22 | [plugins](docs/plugins.md) |
 | Team libraries | 70% | 40% | 4–8 | [components-parity](docs/components-parity.md) |
 | Figma Draw extras | 88% | 60% | 1–3 | [gaps](docs/gaps.md) |
 | AI features | 0% | 0% | 30–60 | [gaps](docs/gaps.md) |
+| Boards (whiteboarding; not in the weighted numbers) | ~47% | ~29% | 20–44 | [boards-parity](docs/boards-parity.md) |
 
 ## Languages
 
 | Language | Code | Strings | Status |
 |---|---|---|---|
 | English | en | 100% | full |
-| Simplified Chinese | zh-Hans | 100% | draft (needs native review) |
-| Spanish | es, es-419 | 100% (es-419: an overlay of 98 entries) | draft (needs native review) |
+| Simplified Chinese | zh-Hans | 95% | draft (needs native review) |
+| Spanish | es, es-419 | 100% (es-419: an overlay of 101 entries) | draft (needs native review) |
 | Hindi | hi | 0% | none |
 | Arabic | ar | 0% | none |
-| French | fr | 100% | draft (needs native review) |
-| Portuguese (Brazil) | pt-BR | 100% | draft (needs native review) |
-| Indonesian | id | 0% | none |
-| Japanese | ja | 100% | draft (needs native review) |
-| German | de | 100% | draft (needs native review) |
-| Korean | ko | 100% | draft (needs native review) |
-| Vietnamese | vi | 0% | none |
+| French | fr | 95% | draft (needs native review) |
+| Portuguese (Brazil) | pt-BR | 95% | draft (needs native review) |
+| Indonesian | id | 99% | draft (needs native review) |
+| Japanese | ja | 99% | draft (needs native review) |
+| German | de | 96% | draft (needs native review) |
+| Korean | ko | 95% | draft (needs native review) |
+| Vietnamese | vi | 100% | draft (needs native review) |
 
-Also shipped: Swedish (`sv`: every UI string, 120 of 588 command labels and menu wordings; native review welcome). Figma ships English, Japanese, Korean, French, German, Spanish and Portuguese
+Percentages measured 2026-10-17 over 2,272 entries (strings added since a draft show English). Also shipped: Russian (`ru`, 99%, reviewed by VanTan), Swedish (`sv`, 99.6%, command labels since 2026-10-17; native review welcome), Turkish (`tr`, 99%) and Czech (`cs`, 99%, draft). Figma ships English, Japanese, Korean, French, German, Spanish and Portuguese
 (Brazil); FigCraft has the localization layer, English and Spanish (Spain and Latin America),
-French, German, Brazilian Portuguese, Japanese, Korean and Simplified Chinese drafts (Preferences ▸
+French, German, Brazilian Portuguese, Japanese, Korean, Simplified Chinese, Indonesian and Vietnamese drafts (Preferences ▸
 Language; Traditional Chinese has no catalog; CJK UI
 text uses an installed CJK font, loaded only when needed; adding a language:
 [`docs/translating.md`](docs/translating.md)). Document text in any script (bidi, Arabic shaping,
-IME) already works. Detail: [`docs/localization-parity.md`](docs/localization-parity.md).
+IME) already works (macOS IME composition fixed for #747, not yet checked on a Mac). Detail: [`docs/localization-parity.md`](docs/localization-parity.md).
 
 ## Upcoming
 
@@ -126,11 +127,45 @@ Ranked; detail and milestones in [`docs/roadmap.md`](docs/roadmap.md).
 1. `.fig` import's tail: fixes from real files, connector labels, table cells, filled areas with their own fills (the best-effort import, editable vector networks, the other layer kinds and variable prototype actions landed 2026-10-11): 5–10 h; then checking the rest of the experimental `.fig` export (landed 2026-10-12; written files open and draw in other software) on effects, images, prototypes and real files: 5–15 h.
 2. Real-file corpus and measured fidelity: 15–30 h.
 3. Tool-by-tool interaction pass against Figma: 40–60 h.
-4. Languages: native reviews of the es, fr, de, pt-BR, ja and ko drafts (people), Latin American Spanish (1–2 h), then Simplified Chinese (3–5 h).
+4. Languages: native reviews of the es (with es-419), fr, de, pt-BR, ja, ko, zh-Hans, id and cs drafts (people), the entries added since each catalog was written, then Hindi, Vietnamese and Arabic ([localization-parity](docs/localization-parity.md)).
 5. Multiplayer (M9): accounts and teams on top of the live sessions and the standalone server (transport, hosting, invite links that open the app, document sync, presence with remote text carets, cursor chat and spotlight, per-user undo, reconnect with offline edits, collision-free ids for styles, variables and comments, the browser client, `figcraft-server` with persistence and share links to edit or view, team libraries on the server landed): 42–84 h.
 
 ## Progress log
 
+- **2026-10-26** · Non-ASCII layer names transliterate in code export (M6, #1235): `class_name` runs the name through `deunicode` before its ASCII filter, so 로그인 화면 → `rogeuin-hwamyeon`, кнопка → `knopka`, über → `uber` in the HTML/CSS/React/Leptos class names, component roots and `data-*` variant attributes (SwiftUI/Compose type names unchanged); a name left with nothing (symbols only) takes the node's kind (`.text`, `.frame`) instead of `layer-`, and the 40-character cut lands on a word boundary. New dependency: deunicode (pure Rust tables, zero deps, BSD-3-Clause, the `slug` crate's base). `html_codegen_tests`. Numbers unchanged.
+- **2026-10-25** · egui 0.37 capture lifecycle: screenshots with hidden or unknown visibility queue, request a hidden paint, and expire after 60 seconds if no capture arrives (headless-tested contract). Logic-only edits, saves and inspection continue while hidden. Native visible GUI and forced hidden-window paint, browser and Wayland behavior remain unqualified; parity percentages are unchanged.
+- **2026-10-24** · Open, Save and the folder dialogs start in the folder of the last file or folder picked in the run (#1290): the Linux portal does not remember it between dialogs as the macOS and Windows panels do. A folder deleted since falls back to the system's choice. No numbers change.
+- **2026-10-24** · Boards (M12): board pages get a dot grid under their layers (drawn by the canvas render after the page colour, thinned out when zoomed out); a selected connector shows its ends as handles, and dragging one onto another object re-attaches it there, onto empty canvas leaves it free (`board.reattach`, one undo step, also over MCP); connectors can be curved, and elbows go around the objects they join when the short way would cross them. Checked in the app, through MCP and in the web build ([boards-parity](docs/boards-parity.md)).
+- **2026-10-24** · Installed weights of an embedded font family (M7, #1246): release builds embed some families with only a few styles (Poppins Regular, Italic and Bold), and the first font scan dropped every installed face of such a family, so an installed Poppins SemiBold or Medium was never offered (a rescan did offer them). The first scan now keeps the embedded faces, which still win for the styles they cover, and offers the installed styles they lack beside them. Regression test in the font database tests. Numbers unchanged.
+- **2026-10-24** · Dev Mode tail (M6, gap 16): Measurements kept on the canvas (gap 16): `devMode.addMeasurement {from?, to?, side?}` places one between two layers, along one side of a layer or (neither) to the layer around it, stored on the layer it starts from (saved in `.figcraft`, synced, undoable; old files open without them); Dev Mode draws them as labelled redlines that follow the layers, the Inspect tab lists them (those of the selected layer, or every one on the page), places and removes them; `devMode.removeMeasurement` and `devMode.measurements` remove and list them; a copy keeps those to layers copied with it. The layers panel is read-only in Dev Mode: rows select and expand, but don't rename, reorder, hide or lock. Dev Mode 98% / 78%.
+- **2026-10-24** · Board facilitation (M12): a timer everyone on a board sees (presets or any minutes, pause, resume, a minute more, stop; synced as its end time, so nothing ticks over the network) and voting sessions (votes per person, on everything, on sticky notes or on the selection; a click votes, your badge takes it back; your votes show while it runs, everyone's with a ranked list once it ends; clear results), in a pill at the top right of the board. `board.timer`, `board.timerState`, `board.vote`, `board.voteResults`; ballots sync per voter. Checked in the app, with two app instances in one live session through a local `figcraft-server`, and through MCP; the web build compiles ([boards-parity](docs/boards-parity.md)).
+- **2026-10-24** · Board templates and tables (M12): a templates picker in the board toolbar places a retrospective, a brainstorm, a weekly planner, a flow chart or a kanban board (`board.template`, all FigCraft's own) as ordinary board objects in one undo step; `board.table` makes a table of auto layout frames (up to 50 × 20) whose rows grow with their text, edited by row and column from the bar over the selection or `board.tableEdit`, typed into with a double-click. Boards ~35% → ~40% breadth, 30–60 h → 26–54 h; the weighted numbers are unchanged.
+- **2026-10-24** · Plugin widgets take text input and a property menu (M11, gap 6, plugin API 4; older plugins run
+  unchanged): a double-click on a widget's editable field edits it like any text, and when editing ends the value goes
+  into the widget's state and its plugin redraws it, one undo step (`widget.setText` from scripts and MCP); a widget
+  can carry a few actions, toggles and colour choices, shown in a small bar over it while it's selected
+  (`widget.menu`). The Counter example has a label field and a menu (reset, steps of ten, a colour). Plugins & widgets
+  65%.
+- **2026-10-24** · Boards (M12): File ▸ New board makes a board, a file kind of its own saved in `.figcraft` and carried to people joining a live session. Sticky notes (8 colours, text that shrinks as the note grows, the author's name, Shift+Cmd/Ctrl+Enter for the next one), shapes with text (7 outlines), connectors that re-route when what they join moves (computed in the engine's normalize pass, so local edits, undo and others' edits agree), marker, highlighter and eraser, stamps with the placer's name on hover; a board toolbar, a contextual bar over the selection and the Design panel hidden until asked for; prototyping and Dev Mode refuse on boards. Design files and boards have their own marks (a pen nib, a note) on tabs, the home screen and the Open files list. Checked in the app, with two app instances in one live session, and through MCP; the web build compiles ([boards-parity](docs/boards-parity.md)).
+- **2026-10-22** · CJK line breaking completes JIS X 4051's kinsoku (M4): the line-start set now also has the halfwidth small kana ｧ–ｯ and small tsu, the halfwidth (semi-)voiced sound marks ﾞﾟ, the spacing (semi-)voiced sound marks ゛゜, the kana iteration marks 〱–〵 and the halfwidth closing parenthesis ｠; the line-end set has the halfwidth opening parenthesis ｟. Text layers, auto layout and the canvas otherwise wrap Japanese as before: ideographs break anywhere and the behaviour suite pins every category plus that a manual newline may still start a line with a prohibited character. Numbers unchanged.
+- **2026-10-15** · Auto-save (M1, #305): Preferences ▸ Save files automatically (`pref.autoSave`, off by default, desktop only) saves each open file that has a path 3 s after its last change, never during a gesture, a live text preview or while a version is shown; the file is encoded off the UI thread, a failed save says why and is tried again a minute later. Numbers unchanged.
+- **2026-10-15** · A text box by dragging (M1, #363): a drag with the Text tool makes a fixed-size text box the size of the drag; a click still makes auto-width text. Numbers unchanged.
+- **2026-10-15** · Batch step references (M0.9, #400): a `command.batch` step can use the id an earlier step made (`{"$step": n}`, a reserved key), so a nested tree takes one call and one undo step. Numbers unchanged.
+- **2026-10-15** · Removing someone from a live session (M9, #338): the host or the file's owner removes a person from the avatar's menu or with `collab.removePerson`; they keep their copy and can't rejoin while the session runs. Numbers unchanged.
+- **2026-10-15** · Languages (M10, #257, #263, #469, #477, #288): Russian (one/few/many plurals) and Turkish catalogs reviewed by native speakers, Czech and Indonesian drafts, the Japanese draft completed; Preferences ▸ Language lists 12 languages and Latin American Spanish. Numbers unchanged.
+- **2026-10-15** · Zoom previews (M8, #312): when renders from scratch are slow, a new zoom shows the whole view coarsely first, then refines it. Numbers unchanged.
+- **2026-10-15** · Web clipboard (M1, #375): copy and paste in the browser go through the system clipboard. Numbers unchanged.
+- **2026-10-15** · Alt-drag copies snap to their original and Duplicate (Cmd+D) repeats the last copy's offset (M1, #283). Numbers unchanged.
+- **2026-10-22** · `fill` and `stroke` props accept `"none"` and `null` (M1, #1036): `node.create`, `node.set` and the other prop appliers map them to an empty fills/strokes list, as `fills: []` already did, so an outline-only shape is one call (agents write `"none"` for no paint; the empty-list form was undocumented). The parameter docs (`KEYS`, shown by `list_commands` and the CLI) and `docs/mcp.md` say so, and the error message names the accepted forms. `fill_none_tests` covers create, set, undo, text and the error. Numbers unchanged.
+- **2026-10-20** · CLI option terminator (M0.9): `--` ends option parsing, so dash-prefixed
+  filenames open normally; the global `--no-system-fonts` flag also respects the terminator.
+  Binary regression coverage opens five such native files and checks their JSON info.
+
+- **2026-10-17** · Control channel while the window is minimised (M8, #720): a minimised or covered window answers every request that acts on the app's state (edits, `ui.inspect`, `ui.pointer`, `ui.key`, `ui.type`, `ui.set`, `app.quit`…) without drawing, and what needs a drawn frame (`ui.screenshot`, `ui.input`, `window.new`) is an error at once; before, those waited up to 60 s and held up every later request on the connection (an attached agent's `inspect_ui` or window screenshot stalled until the window came back). Measured on Windows 11, minimised: requests ~100 ms each (eframe wakes a minimised window at most ten times a second; ~2 ms on screen), a window screenshot fails in ~100 ms instead of 60 s, idle CPU 0. Numbers unchanged.
+- **2026-10-17** · Number variables on text content (M3, #629): the Typography section's variable picker also lists number variables for a text layer's content, as the engine already accepted (the text shows the number, e.g. 42.5, and follows the variable). Other text fields keep their own types. Numbers unchanged.
+- **2026-10-17** · Frames and sections convert into each other (M1, #719): `object.convertToSection` turns a frame on the page or in a section into a section in place (same box, name, fill and layers, which stay where they are; what only a frame has goes: auto layout, clipping, layout grids, guides, scrolling), and `object.convertToFrame` now also turns a section into a frame that keeps its fill and doesn't clip, so the look stays. Nested frames, instances, main components and sections holding sections are refused with the reason; one undo step each. Both are in the canvas context menu (Convert to section / Convert to frame) and in Spanish. Numbers unchanged.
+- **2026-10-16** · Adobe Fonts found on macOS (M7, #298): fonts activated through Adobe Fonts rendered in the fallback font without a warning, because Creative Cloud keeps them in its own folder as hidden files named by number, which the font scan never read. The macOS scan now includes `~/Library/Application Support/Adobe/CoreSync/plugins/livetype`, and files without an extension are indexed when they start with a font signature. Fonts are read in place. Regression test in the font database tests; docs/cli.md lists the folder. Numbers unchanged.
+- **2026-10-15** · Dev Mode tail (M6, gap 16): generated layer trees start with the import lines of the connected components they call, once each per language; Compare changes takes any saved version as the before; a behaviour suite made the Dev Mode canvas inspect-only (no moving, resizing, drawing or editing; menus and shortcuts refuse design edits with a note), added Changed to the ready list and refused statuses on layers inside frames; read-only plugins show their panels from the Inspect tab. Dev Mode 97% / 76%.
 - **2026-10-14** · Corner handles win over the corner-radius handles (M1, #292): a press on the inner half of a corner handle's square picked the radius handle 10 px in, so the drag neither resized nor (dragging outward) rounded anything. Inside the drawn square the corner now resizes both sides (in ratio with Shift or the link); further in the radius handle still answers. Regression test in the transform behaviour suite. Numbers unchanged.
 - **2026-10-14** · Home screen recent files as cards (M7): each card shows the picture its file carries on its first page's colour, the file's icon, name and "Edited ... ago"; sort by name, creation or last change either way; a table view; a click selects, a double-click or Enter opens, arrow keys move; Open, Show in folder and Remove from recents on right-click. Numbers unchanged.
 - **2026-10-13** · Vector edit mode regions (M4): with the Move tool, the filled area under the pointer is hatched with "/" lines in the selection colour, clipped by the area's own fill rule so holes stay clear; the hatch goes near points (3.5 px) and segments (2 px), and its spacing follows octave folding (8 px at every power-of-two zoom), fixed to the shape. A click selects the area with its points (they move with it but keep the unselected look), Shift adds or removes one, a press on a selected area drags the whole selection as one undo step, and a click on an empty spot clears the areas and stays in edit mode. `vector.edit.select {regions}` and `vector.edit.state` (`regions`, `regionVertices`, `regionHover`); `vector_regions_tests` and `regions_tests`. Numbers unchanged.
@@ -313,11 +348,89 @@ Ranked; detail and milestones in [`docs/roadmap.md`](docs/roadmap.md).
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-26 | minor | Non-ASCII layer names transliterate in code export (M6, #1235): `class_name` transliterates through the new `deunicode` dependency (pure Rust tables, zero deps, BSD-3-Clause), so Korean, Cyrillic, Latin-diacritic and CJK names become readable ASCII classes (`rogeuin-hwamyeon`, `knopka`, `uber`, `an-niu`) in HTML/CSS/React/Leptos output, component roots and `data-*` variant attributes; symbols-only names take the node's kind (`.text`) instead of `layer-`, and the 40-character cut lands on a word boundary. `html_codegen_tests` updated and extended. Numbers unchanged |
+| 2026-10-25 | minor | egui 0.37 capture lifecycle: screenshots with hidden or unknown visibility queue, request a hidden paint, and expire after 60 seconds if no capture arrives (headless-tested contract). Logic-only edits, saves and inspection continue while hidden. Native visible GUI and forced hidden-window paint, browser and Wayland behavior remain unqualified; parity percentages are unchanged. |
+| 2026-10-24 | minor | Server memory (#1134): when the last person leaves a file nobody edited, figcraft-server keeps the client ids it issued in the log instead of rewriting the snapshot (compaction still follows `compact_after`/`compact_mb` and edits), and a snapshot is encoded straight into its file buffer, without a second copy of the body; the file format is unchanged. Numbers unchanged |
+| 2026-10-24 | minor | Boards (M12): a dot grid on board pages under the layers, connector ends dragged onto other objects or empty canvas (`board.reattach`), curved connectors, elbows that go around what they join. Boards row ~35% → ~37%, ~20% → ~21%, 30–60 h → 28–56 h; headline numbers unchanged (boards are outside the weighted sum) |
+| 2026-10-24 | minor | Installed weights of an embedded font family (M7, #1246): release builds embed some families with only a few styles (Poppins Regular, Italic and Bold), and the first font scan dropped every installed face of such a family, so an installed Poppins SemiBold or Medium was never offered (a rescan did offer them). The first scan now keeps the embedded faces, which still win for the styles they cover, and offers the installed styles they lack beside them. Regression test in the font database tests. Numbers unchanged |
+| 2026-10-24 | minor | Dev Mode tail (M6, gap 16): Measurements kept on the canvas (gap 16): `devMode.addMeasurement {from?, to?, side?}` places one between two layers, along one side of a layer or (neither) to the layer around it, stored on the layer it starts from (saved in `.figcraft`, synced, undoable; old files open without them); Dev Mode draws them as labelled redlines that follow the layers, the Inspect tab lists them (those of the selected layer, or every one on the page), places and removes them; `devMode.removeMeasurement` and `devMode.measurements` remove and list them; a copy keeps those to layers copied with it. The layers panel is read-only in Dev Mode: rows select and expand, but don't rename, reorder, hide or lock. Dev Mode 97% → 98% breadth, 76% → 78% ready, 2–4 h → 1–2 h; headline numbers unchanged at this rounding |
+| 2026-10-24 | minor | Board facilitation (M12): a shared timer and voting sessions (`board.timer`, `board.vote` and their queries; timer and vote sync as document state, ballots per voter; neither is an undo step). Boards row ~35%/~20% → ~40%/~24%, 30–60 h → 26–54 h; headline numbers unchanged (boards are outside the weighted sum) |
+| 2026-10-24 | minor | Board templates and tables (M12): five built-in templates (`board.template`, `board.templates`, a toolbar picker with pictures) and tables (`board.table`, `board.tableEdit`; rows and columns from the bar over the selection). Boards row ~35%/~20% → ~40%/~24%, 30–60 h → 26–54 h; headline numbers unchanged (boards are outside the weighted sum) |
+| 2026-10-24 | minor | Plugin widgets take text input and a property menu (gap 6, plugin API 4; API 1–3 plugins and existing widgets unchanged): a widget's text layer can be an editable field, edited on the canvas with a double-click like any text (or `widget.setText`), its value cleaned and capped at 1,000 characters, written into the widget's state under the field's name and the field's text, and the plugin called back to redraw, all as one undo step that syncs in live sessions; a widget can carry a property menu of up to 8 actions, toggles and colour choices (up to 8 colours each), shown in a small bar over the widget while it is selected and driven with `widget.menu`; descriptions, values and menus read back from files are checked, an API 3 plugin that draws a field or a menu is refused, and older FigCraft builds refuse API 4 manifests. The Counter example gained a label field and a menu (reset, steps of ten, a colour); the SDK reads the new events. Hover and timers are still missing. Plugins & widgets 60%/35% → 65%/38%, 8–26 h → 6–22 h; Ecosystem dimension 38% → 40%; weighted totals unchanged at this rounding; full parity ~262–519 h → ~260–515 h |
+| 2026-10-24 | minor | Branches in live sessions (gap 17): create, edit, review, update from main and merge while the file is in a session; the branch stays with its author (ids in their own client space, far above the main file's), merging is one synced edit and one undo step, peers' edits merge against the branch's own base and conflicts resolve as offline, a view link refuses merging, a branch made outside the session that adds layers is refused with a reason; a branch's history gets entries for its creation and updates from main; no wire format change. Left: branches others in the session can see, text runs item by item. Numbers unchanged |
+| 2026-10-24 | minor | Boards (M12): a file kind of its own (`file.newBoard`, saved in `.figcraft`, carried to live-session joiners) with sticky notes, shapes with text, connectors that re-route when what they join moves (an engine recompute, the same for local edits, undo and others' edits), marker, highlighter and eraser, stamps with the placer's name, a board toolbar and a contextual bar; prototyping and Dev Mode refuse on boards; design files and boards have their own marks on tabs and file rows. Boards row added outside the weighted numbers; headline numbers unchanged at this rounding |
+| 2026-10-21 | minor | Best-effort `.sketch` import (Sketch 48 and newer): open, import, drop, CLI and MCP; symbols become live components and instances, shared styles and Color Variables come across, Sketch 2025 frames, stacks (as auto layout) and tints too, text placed as Sketch places it; checked on three real files against Sketch's own renders ([file-format-parity](docs/file-format-parity.md)). Headline numbers unchanged |
+| 2026-10-22 | minor | CJK line breaking: JIS X 4051 line-start/line-end sets completed (halfwidth small kana, halfwidth and spacing voiced sound marks, iteration marks 〱–〵, halfwidth parentheses) with behaviour cases; numbers unchanged |
+| 2026-10-18 | minor | Colour picker models LCH and OKLCH beside Hex, RGB, HSL, HSB and CSS (desktop and web): lightness, chroma and hue fields (OKLCH lightness in percent, chroma to two places), an edit keeps lightness and hue and lowers chroma until the colour fits sRGB, as CSS gamut mapping does; the CSS field reads `lch()` and `oklch()` too. Values read the stored channels as sRGB, like the other models (a Display P3 file's colours aren't converted first). Conversions checked against the CSS Color 4 and OKLab reference values; checked in the desktop app over the control channel. Numbers unchanged |
+| 2026-10-15 | minor | Auto-save (#305, #296): Preferences ▸ Save files automatically (`pref.autoSave`, off by default; desktop only, the browser has no files to save to) saves each open file that has a path 3 s after its last change, so steady editing doesn't save every few seconds, and never during a gesture, a live text preview or while a version is shown. The file is encoded on a thread of its own and written as of that moment (edits made meanwhile stay unsaved); a failed save says why in a toast and is tried again a minute later, and version history checkpoints keep coming with it on. Numbers unchanged |
+| 2026-10-15 | minor | A text box by dragging (#363, #360): a drag with the Text tool makes a fixed-size text box the size of the drag (at least one line tall); a click, or a drag shorter than the drag threshold, still makes auto-width text. Numbers unchanged |
+| 2026-10-15 | minor | Batch step references (#400): inside `command.batch` (MCP `batch`), `{"$step": n}` anywhere in a step's params stands for the `id` step n returned (`{"$step": n, "field": …}` for another field; `$step` is a reserved key), so a frame with its children takes one batch and one undo step; a malformed reference fails the batch, which rolls back, and a nested batch keeps references to its own steps. Numbers unchanged |
+| 2026-10-15 | minor | Removing someone from a live session (#338): right-click a person's avatar ▸ Remove *name* from session, or `collab.removePerson {client}`, when you host the session or own the file on a server; the session ends for them (they keep their copy), the code or link they hold no longer gets them back in while it runs, and everyone else stays. Numbers unchanged |
+| 2026-10-15 | minor | Pages list (#272, #258): a long pages list scrolls in its own area, so the layers below stay in view; page and layer drops count only inside the list's visible rows. Numbers unchanged |
+| 2026-10-15 | minor | Variables export in the browser (#368): Export… ▸ Variables JSON / CSS custom properties did nothing in the web build and now arrives as a download; importing there still needs a file picker. Numbers unchanged |
+| 2026-10-15 | minor | Font picker keys (#352, #345): Up and Down step through the font families from the current one, keeping the highlight in view and previewing it on the canvas; Enter applies it, Escape leaves the text as it was. Numbers unchanged |
+| 2026-10-15 | minor | Leaving Design ends the pen path (#308, #307): switching to Prototype or Inspect while the Pen draws ends the path and goes back to Move (pressing Design again keeps drawing), and a click on the toolbar no longer reaches the canvas under it. Numbers unchanged |
+| 2026-10-15 | minor | Vector edit mode keeps the canvas still (#322): the edit mode hints in the Design panel wrap, so entering edit mode and picking a region no longer shift the canvas by about 25 points in the middle of the click (which dragged the region picked). Numbers unchanged |
+| 2026-10-15 | minor | Drop shadows under a background blur (#317, #255): a layer with both casts its shadows from what it paints (a translucent fill casts a lighter shadow than an opaque one) and reads the backdrop only after drawing them, so a shadow shown behind transparent areas is seen through the blur. Numbers unchanged |
+| 2026-10-15 | minor | When the window can't open (#306, #261): Windows release builds have no console, so a graphics failure at start quit without a word; the error is now logged and shown in a message box in the interface language, with what to try (unset `WGPU_BACKEND`, update the driver, OpenGL) and where to report it, skipped with `--control`. Numbers unchanged |
+| 2026-10-15 | minor | Crashes on Windows (#271, #314, #337; #224 and two more): a text field focused before it was drawn aborted the screen-reader layer; double-clicking a page, creating a variable collection and renaming a style folder no longer close the app. Numbers unchanged |
+| 2026-10-15 | minor | Deeply nested layers (#330, #210): one depth guard (256) on the three recursive layout paths, so a deep file can't run the layout out of stack. Numbers unchanged |
+| 2026-10-15 | minor | Image memory budgets (#326; #203, #189): decoded images and a file's images have budgets; the decode cache evicts its least recently used entries. Numbers unchanged |
+| 2026-10-15 | minor | macOS file dialogs (#253, #250) no longer re-enter the event loop; a dialog's result goes to the file and window it was opened for, and dialogs are parented to the main window. Numbers unchanged |
+| 2026-10-15 | minor | Recovery copies (#297, #303, #331, #336; #202, #185, #187): a copy counts only after its write succeeds and a failed one is retried; saves and closes wait for the write in flight; copies keep version history and branches; a recovered copy stays until this run has its own. Numbers unchanged |
+| 2026-10-15 | minor | Text edits (#280, #278) no longer roll back earlier changes; a drag released off the canvas ends at the pointer's last canvas position. Numbers unchanged |
+| 2026-10-15 | minor | Rollback (#282, #301; #196): a failed command rolls back during a drag or other gesture too; a failed batch keeps the redo steps. Numbers unchanged |
+| 2026-10-15 | minor | Atomic save and export (#284): staging files are uniquely named and created exclusively, so a file or link already at the old fixed staging name is never written through, and two writers of one file no longer share one. Numbers unchanged |
+| 2026-10-15 | minor | Alt-drag copies (#283) snap to their original, and Duplicate (Cmd+D) then repeats the last copy's offset. Numbers unchanged |
+| 2026-10-15 | minor | The pen (#277) shows its Bezier handles while a point is dragged out. Numbers unchanged |
+| 2026-10-15 | minor | Corner handles (#293, #292): a press on a corner handle resizes instead of picking the corner-radius handle. Numbers unchanged |
+| 2026-10-15 | minor | New text (#372, #362) takes a readable colour from the frame it is drawn in, not only the page (text drawn in a white frame on a dark page was white). Numbers unchanged |
+| 2026-10-15 | minor | Outline stroke (#386) works on every selected layer. Numbers unchanged |
+| 2026-10-15 | minor | Send to back (#444) counts per parent when the selection spans frames. Numbers unchanged |
+| 2026-10-15 | minor | Align buttons (#276) are off when the selection has nothing to align to. Numbers unchanged |
+| 2026-10-15 | minor | Gradient type icons (#275) show their gradient. Numbers unchanged |
+| 2026-10-15 | minor | Corner resize cursors (#388) stay diagonal at any proportions; the text selection highlight (#390) stays inside the box on the last line. Numbers unchanged |
+| 2026-10-15 | minor | New pages (#311, #295) take the current page's background; the theme still decides a new file's page. Numbers unchanged |
+| 2026-10-15 | minor | A slice's export preview (#265) shows the content under it. Numbers unchanged |
+| 2026-10-15 | minor | SVG export (#327, #325) keeps a nested frame's fill and stroke inside its parent's clip. Numbers unchanged |
+| 2026-10-15 | minor | Home screen (#318, #324): recent files notice files deleted while it is open; a long path no longer draws over the file name. Numbers unchanged |
+| 2026-10-15 | minor | The Small caps sample in Type settings (#355) draws from capitals, no longer a box where the UI font lacks the small-capital letter. Numbers unchanged |
+| 2026-10-15 | minor | Web clipboard (#375): copy and paste in the browser go through the system clipboard, so a paste after a copy brings the copied layers instead of whatever text the clipboard held. Numbers unchanged |
+| 2026-10-15 | minor | Zoom previews (#312): when renders from scratch are slow, a new zoom first shows the whole view coarsely instead of the page colour, then the refined image; images of another file or page never show. Numbers unchanged |
+| 2026-10-15 | minor | Hidden windows (#313, #332; #269): a minimised or covered window answers control and MCP requests (commands, inspection, `ui.render`) at once, each window on its own; screenshots and input still wait for it to be on screen. Numbers unchanged |
+| 2026-10-15 | minor | Server (#340, #302): a compaction cut short closes the file instead of confirming lost edits (#183); each team library version is kept in its own file (#206). Numbers unchanged |
+| 2026-10-15 | minor | Counters (#343, #344, #353; #309): collab sequence numbers, layer name counters and opacity digits can't overflow. Numbers unchanged |
+| 2026-10-15 | minor | Commands refuse bad indexes and ids (#475, #384, #310): `page.select` and `doc.switch`, `effect.set` and `export.update` / `export.remove`, `page.move` with a non-page id. Numbers unchanged |
+| 2026-10-15 | minor | Find and replace (#358, #361) changes every occurrence, case-insensitively, also when the replacement contains the search text. Numbers unchanged |
+| 2026-10-15 | minor | The gradient shorthand (#254, #252) is read by the engine, so the CLI, control channel and MCP share it. Numbers unchanged |
+| 2026-10-15 | minor | .fig import (#279, #281): resized instances lay out their layers by their constraints (#266); explicit variable modes whose collection is named by its asset key, as library collections are, come across (#267). Numbers unchanged |
+| 2026-10-15 | minor | Colour emoji (#300, #268) draw from their own colour tables (sbix and CBDT/EBDT bitmap strikes, COLR v0 layers), a colour face tried first; COLR v1 still draws outlines. Numbers unchanged |
+| 2026-10-15 | minor | macOS (#290, #289): `.figcraft` files open from Finder, Open With and the Dock. Numbers unchanged |
+| 2026-10-15 | minor | Windows (#294, #291): the first preferred language alone picks the UI language. Numbers unchanged |
+| 2026-10-15 | minor | Unix font discovery (#474) follows `XDG_DATA_HOME`. Numbers unchanged |
+| 2026-10-15 | minor | Linux packaging (#346, #328): the window id matches the desktop entry (FreeBSD keeps its class); the RPM requires glibc 2.35. Numbers unchanged |
+| 2026-10-15 | minor | Tests (#472, #471, #339): the rename shortcut test, the hanging punctuation test and the font-scanning tests no longer depend on the platform, font or test order. Numbers unchanged |
+| 2026-10-15 | minor | Languages (#257, #263, #469, #477, #288): Russian (with one/few/many plural forms) and Turkish catalogs, reviewed by native speakers; Czech and Indonesian drafts; the Japanese draft completed. 2,177 entries now (1,587 UI strings, 559 command labels, 31 menu wordings); strings added since a catalog was written read English there. Localization 39% and 29–51 h unchanged at this rounding (Indonesian is now a draft, while the five older drafts lack 88 newer entries) |
+| 2026-10-22 | minor | Type settings keeps its width (#1029): in languages whose labels run past the 110 px label column (French "Retrait de paragraphe", "Espacement de liste"), the List spacing, Paragraph indent, Max lines and decoration rows were wider than the popover, which then widened every frame while open. Those fields now take the width left after their label; English is unchanged. Regression test in `type_settings_tests`. Numbers unchanged. |
+| 2026-10-22 | minor | `fill`/`stroke` props accept `"none"` (either case) and `null` as no paint (M1, #1036): mapped to an empty fills/strokes list, as `fills: []` already did (undocumented), so an outline-only shape is one call; `KEYS` and `docs/mcp.md` document it, the error names the accepted forms, `fill_none_tests` covers create, set, undo, text and the error. Numbers unchanged |
+| 2026-10-20 | minor | A document dropped on the canvas opens (#916): a `.figcraft`, `.fig` or file JSON dropped on the canvas opens as a file of its own, as on the home screen, in the browser too; it used to add its pages to the file in front. Images and SVG still import at the drop point, File ▸ Import still adds pages, and dragging only documents over the canvas says "Drop to open" (not in the browser, which names no file until the drop). Numbers unchanged |
+| 2026-10-20 | minor | Duplicating a main component makes an instance (#892): Duplicate and Alt-drag copied a main component as a second main; within its file the copy is now an instance of it, as Copy then Paste already was (a variant duplicated in its set stays a variant). Numbers unchanged. |
+| 2026-10-20 | minor | Readable disabled and selected text (#890): the dim text colour (disabled buttons, placeholders, hints) is at least 3:1 against panels, fields and selected rows in both themes (it was 2.1:1 in the light theme), a disabled button is grey with that text instead of fading to 40%, and selected text (renaming a page or layer, any text box) takes the theme's readable green on the highlight (1.4:1 in the dark theme before, now 4.2:1 or more); checked with the colour contrast helper (`theme::tests`). Numbers unchanged |
+| 2026-10-20 | minor | Layer data reads back (#879): `node.get` (the command, the control method and MCP `get_node`) and `document.inspect` report a layer's or page's `pluginData` as `{key: value}` when it has any, so a tool that keeps state in a file with `node.set {props: {pluginData}}` can read it on its next run (`plugin_data_tests`). Numbers unchanged |
+| 2026-10-20 | minor | Measuring while nudging (#894): with Alt held over another layer, the arrows nudge the selection (Shift: the big step) and the distances follow every nudge (Alt+arrows used to do nothing); while measuring, the selection's handles and size label hide and both layers keep their outlines (`measure_nudge_tests`). Numbers unchanged |
+| 2026-10-20 | minor | Release fonts (#885): the web release embeds craft-fonts again (Inter), so the browser version draws text and lists fonts; it had none since releases moved to the shared workflow. The craft-fonts pin goes back to the commit with the Latin manifest (the Georgian change had moved it to one without Inter, which would have failed the next release). Numbers unchanged. |
+| 2026-10-17 | minor | Community batch #753 (10 PRs): Selection colors for mixed selections (#403); smart-selection spacing fields and canvas handles (#402); a Present tab with device and scale controls (#537); adding auto layout to an empty frame keeps its size (#369); `node.set` applies auto layout keys to frames only and warns about font styles a family lacks (#603); canvas images on whole device pixels (#359); Adwaita window controls on Wayland without server decorations (#592, not run on GNOME or KDE by the maintainers); the keyboard shortcuts panel closes on the home screen (#548); macOS paste modifiers in tests (#750); credits column tests (#347). `cargo xtask parity` re-run: 212 / 212 menu items (100%; the catalog gained View ▸ Full screen with #227 on 2026-10-14), 561 commands. Language table re-measured from the catalogs (2,272 entries): the drafts read 95–99% (strings added since 2026-10-12 show English), Indonesian has a draft (99%; it read none), and Russian, Swedish (its command labels from #599), Turkish and Czech are listed with their counts. Per-area parity rows for the day's landings in `docs/gaps.md`, `target-app-parity.md` and the area docs. Numbers unchanged |
+| 2026-10-17 | minor | Control channel while the window is minimised (M8, #720): a minimised or covered window answers every request that acts on the app's state (edits, `ui.inspect`, `ui.pointer`, `ui.key`, `ui.type`, `ui.set`, `app.quit`…) without drawing, and what needs a drawn frame (`ui.screenshot`, `ui.input`, `window.new`) is an error at once; before, those waited up to 60 s and held up every later request on the connection (an attached agent's `inspect_ui` or window screenshot stalled until the window came back). Measured on Windows 11, minimised: requests ~100 ms each (eframe wakes a minimised window at most ten times a second; ~2 ms on screen), a window screenshot fails in ~100 ms instead of 60 s, idle CPU 0. Numbers unchanged. |
+| 2026-10-17 | minor | Community fixes from #524 up (batches #727, #728, #733, #735, #736 and #729; 55 PRs) and a crash guard. `.fig` import: explicit instance identity, overrides by key, text style precedence, grid track sizes, slot content, connector labels, skip ink, paragraph options and hanging lists, list start numbers, vertical trim, per-point stroke joins, text on a path, image adjustments and embedded images; large files open within budgets from the file's own size; an import report after opening; imported bytes stay out of the command journal. Files and paste: save a copy as `.fig`; Cmd/Ctrl+V pastes images copied in other apps and layers copied from another design app (`edit.pasteDesignLayers`); paste over and paste properties; clipboard reads on Linux and the BSDs time out after 2 s. Editor: live font preview on hover; Shift+I and Resources open Assets; Shift-drag moves the selection; thin strokes take a nearby double-click; dropped points merge; Flatten keeps open paths; the Actions palette gets tabs, ranked search, a keyboard highlight and recents; the colour picker opens on a new fill or stroke; text strokes follow their alignment; selection highlights after line breaks; a draggable pages/layers divider; variant properties reorder by drag; submenus keep their hover with a safe triangle; menu actions that need a value ask for it; File ▸ Rename edits the name in place. Engine: bad paint indexes, non-finite geometry and pages in copy/cut are refused; a param naming a layer says so when it isn't one; a CLI script is one undo step and resolves `$step`. Server and collaboration: message limits follow `max_file_mb` (client capped at 1 GiB); a damaged generation field no longer drops flushed edits; the web build joins a session from a `#join=` link. Also Swedish command labels, Nix CI through the shared workflow, paint bounds once per render, and a guard that turns a panic inside the boolean-op library into bad input (the stroke draws unclipped). Numbers unchanged. |
+| 2026-10-17 | minor | Number variables on text content (M3, #629): the Typography section's variable picker also lists number variables for a text layer's content, as the engine already accepted (the text shows the number, e.g. 42.5, and follows the variable). Other text fields keep their own types. Numbers unchanged. |
+| 2026-10-17 | minor | Frames and sections convert into each other (M1, #719): `object.convertToSection` turns a frame on the page or in a section into a section in place (same box, name, fill and layers, which stay where they are; what only a frame has goes: auto layout, clipping, layout grids, guides, scrolling), and `object.convertToFrame` now also turns a section into a frame that keeps its fill and doesn't clip, so the look stays. Nested frames, instances, main components and sections holding sections are refused with the reason; one undo step each. Both are in the canvas context menu (Convert to section / Convert to frame) and in Spanish. Numbers unchanged. |
 | 2026-10-16 | minor | Flutter code (ours; the incumbent generates CSS, iOS and Android only): `inspect.code`, `inspect.componentCode` and `codeConnect.set` take `language: flutter` (`dart` is an alias): a `StatelessWidget` for a component (properties as constructor parameters with their defaults, instances as calls, variants as a Dart enum, swaps a `Widget`, slots a `List<Widget>?`) and a Dart widget tree for a layer (`Container` with a `BoxDecoration`, `Row`/`Column` with `spacing`, `Expanded`, `Stack` + `Positioned`, `Text` with a `TextStyle`, `Image.asset`, `Opacity`), plus Dart `import '…';` lines in Code Connect. The Dev Mode language list includes it. Numbers unchanged |
+| 2026-10-16 | minor | Adobe Fonts found on macOS (M7, #298): fonts activated through Adobe Fonts rendered in the fallback font without a warning, because Creative Cloud keeps them in its own folder as hidden files named by number, which the font scan never read. The macOS scan now includes `~/Library/Application Support/Adobe/CoreSync/plugins/livetype`, and files without an extension are indexed when they start with a font signature. Fonts are read in place. Regression test in the font database tests; docs/cli.md lists the folder. Numbers unchanged |
 | 2026-10-16 | minor | Community fixes from #478 up (batches #591, #598, #602; 69 PRs) and a control-channel fix: a line that isn't JSON now ends a `--control` connection, so a web page can't drive the app through a browser request (#589). Highlights: page copies keep navigation, flows, prototype settings and guides; Find and Replace keeps line endings and case-insensitive matches; text hyperlinks survive import and export; recent colours record only what was picked; MCP screenshots respect `maxSize`; Swedish catalog (UI strings), Czech plurals; bounded canvas overscan while panning; Korean fallback at the run's weight; many vector-edit, guide, page and .fig round-trip fixes. Numbers unchanged |
 | 2026-10-15 | minor | Drop files anywhere to open them (M7): dragging files over the window shows a "Drop to open" (home) or "Drop to import" (canvas) overlay. On the home screen each supported file opens as a document of its own and other files are turned away with a toast; on the canvas the files import at the drop point. Both wait behind a small card that is on screen before a large file blocks the window. A canvas import stays with the document and page that received the drop even if the tab or page changes meanwhile, and is cancelled with a message if that document or page is gone. Numbers unchanged. |
 | 2026-10-15 | minor | M7: system font discovery skips entries observed as non-regular files before opening them, avoiding the reproduced named-pipe stall. Regular-file symlinks remain supported; directory depth, font limits and priorities are unchanged. Numbers unchanged. |
 | 2026-10-15 | minor | Canvas retains a bounded margin while panning so newly exposed strips can reuse the previous render. Numbers unchanged. |
+| 2026-10-15 | minor | Dev Mode tail (M6, gap 16): import lines for connected components inside generated layer trees (definitions, slots and swapped-in instances too); `dev.compare {version}` and the compare view's Compare with menu compare with any saved version; behaviour suite (5 tests; 4 failed before the fixes): an inspect-only Dev Mode canvas with menus, shortcuts, nudges, opacity keys and paste refusing design edits, toolbar drawing tools returning to the design, Changed in the ready list (`inspect.readyForDev {status: changed}`), statuses only on sections and top-level frames; read-only plugins' panels from the Inspect tab. Dev Mode 96%/72% → 97%/76%, 0–1 h → 2–4 h (measurements kept on the canvas and a read-only layers panel counted as missing); header totals not recomputed |
 | 2026-10-15 | minor | Typography spacing icons scrub with the shared number-field gesture, modifier rates and one Undo step per drag (#373). Units and selected-character targeting are preserved. Numbers unchanged. |
 | 2026-10-14 | minor | System theme on first run (M7): preferences without a theme default to System; the first frame reads the OS appearance directly, including when returning from a manual theme. Saved Light/Dark choices stay explicit; unavailable OS appearance falls back to Light. Numbers unchanged. |
 | 2026-10-14 | minor | Home screen recent files as cards (M7): each card shows the picture its file carries on its first page's colour, the file's icon, name and "Edited ... ago"; sort by name, creation or last change either way; a table view; a click selects, a double-click or Enter opens, arrow keys move; Open, Show in folder and Remove from recents on right-click. Numbers unchanged. |
diff --git a/apps/figcraft-cli/src/args.rs b/apps/figcraft-cli/src/args.rs
index 372082c2..740e885b 100644
--- a/apps/figcraft-cli/src/args.rs
+++ b/apps/figcraft-cli/src/args.rs
@@ -1,5 +1,6 @@
 //! Minimal std-only argument parsing: positionals, `--key value` / `--key=value` / `-o value`
-//! options, and boolean `--flag`s. Unknown options are usage errors.
+//! options (given again: the last counts, or all with [`Args::values`]), and boolean `--flag`s.
+//! Unknown options are usage errors; `--help` or `-h` is [`CliError::Help`].
 
 use std::collections::BTreeMap;
 
@@ -8,15 +9,21 @@ use crate::{CliError, CliResult};
 #[derive(Debug, Default)]
 pub struct Args {
     pub positional: Vec<String>,
-    values: BTreeMap<String, String>,
+    values: BTreeMap<String, Vec<String>>,
     flags: Vec<String>,
 }
 
 impl Args {
     pub fn parse(argv: &[String], valued: &[&str], flags: &[&str]) -> CliResult<Self> {
         let mut a = Args::default();
+        // The first bad option, reported once the rest of the line is checked for `--help`.
+        let mut bad: Option<CliError> = None;
         let mut it = argv.iter();
         while let Some(arg) = it.next() {
+            if arg == "--" {
+                a.positional.extend(it.cloned());
+                break;
+            }
             let name = if let Some(n) = arg.strip_prefix("--") {
                 n
             } else if let Some(n) = arg.strip_prefix('-').filter(|n| n.len() == 1 && !n.starts_with(|c: char| c.is_ascii_digit())) {
@@ -29,23 +36,36 @@ impl Args {
                 Some((n, v)) => (n, Some(v.to_string())),
                 None => (name, None),
             };
+            // `--help` / `-h` anywhere among the options (not as an option's value) asks for help.
+            if inline.is_none() && matches!(name, "help" | "h") {
+                return Err(CliError::Help);
+            }
             if valued.contains(&name) {
-                let v = match inline {
-                    Some(v) => v,
-                    None => it.next().cloned().ok_or_else(|| CliError::Usage(format!("`{arg}` needs a value")))?,
-                };
-                a.values.insert(name.to_string(), v);
+                match inline.or_else(|| it.next().cloned()) {
+                    Some(v) => a.values.entry(name.to_string()).or_default().push(v),
+                    None => {
+                        bad.get_or_insert(CliError::Usage(format!("`{arg}` needs a value")));
+                    }
+                }
             } else if flags.contains(&name) && inline.is_none() {
                 a.flags.push(name.to_string());
             } else {
-                return Err(CliError::Usage(format!("unknown option `{arg}`")));
+                bad.get_or_insert(CliError::Usage(format!("unknown option `{arg}`")));
             }
         }
-        Ok(a)
+        match bad {
+            Some(e) => Err(e),
+            None => Ok(a),
+        }
     }
 
     pub fn value(&self, k: &str) -> Option<String> {
-        self.values.get(k).cloned()
+        self.values.get(k).and_then(|v| v.last()).cloned()
+    }
+
+    /// Every value of an option that may be given more than once, in order.
+    pub fn values(&self, k: &str) -> &[String] {
+        self.values.get(k).map_or(&[], Vec::as_slice)
     }
 
     pub fn flag(&self, k: &str) -> bool {
@@ -62,17 +82,26 @@ impl Args {
     /// PDF print options: `--bleed LENGTH` (points, or "3mm", "0.125in"), `--crop-marks`,
     /// `--bleed-marks`, `--cmyk`.
     pub fn print(&self) -> CliResult<figcraft_doc::PrintSettings> {
-        let bleed = match self.values.get("bleed") {
+        let bleed = match self.value("bleed") {
             None => 0.0,
-            Some(s) => figcraft_doc::PrintSettings::parse_length(s)
+            Some(s) => figcraft_doc::PrintSettings::parse_length(&s)
                 .filter(|b| *b <= figcraft_doc::PrintSettings::MAX_BLEED)
                 .ok_or_else(|| CliError::Usage(format!("--bleed takes points or a length like 3mm or 0.125in (up to 2in), got `{s}`")))?,
         };
         Ok(figcraft_doc::PrintSettings { bleed, crop_marks: self.flag("crop-marks"), bleed_marks: self.flag("bleed-marks"), cmyk: self.flag("cmyk") })
     }
 
+    /// `--vd-compat bestEffort|exact|ignore` (Android Vector Drawable exports; default bestEffort).
+    pub fn vd_compat(&self) -> CliResult<figcraft_doc::VdCompat> {
+        match self.value("vd-compat") {
+            None => Ok(figcraft_doc::VdCompat::default()),
+            Some(s) => figcraft_doc::VdCompat::from_key(&s)
+                .ok_or_else(|| CliError::Usage(format!("--vd-compat takes bestEffort, exact or ignore, got `{s}`"))),
+        }
+    }
+
     pub fn scale(&self) -> CliResult<f64> {
-        match self.values.get("scale") {
+        match self.value("scale") {
             None => Ok(1.0),
             Some(s) => s
                 .trim_end_matches('x')
@@ -85,7 +114,7 @@ impl Args {
 
     /// A comma-separated list of whole numbers (`--layers 1000,10_000`).
     pub fn usizes(&self, k: &str, default: &[usize]) -> CliResult<Vec<usize>> {
-        match self.values.get(k) {
+        match self.value(k) {
             None => Ok(default.to_vec()),
             Some(s) => s
                 .split(',')
@@ -110,6 +139,10 @@ mod tests {
         assert_eq!(a.value("o").as_deref(), Some("out"));
         assert_eq!(a.scale().unwrap(), 2.0);
         assert!(a.flag("json"));
+        let a = Args::parse(&v(&["--root", "a", "--root=b"]), &["root"], &[]).unwrap();
+        assert_eq!(a.values("root"), ["a", "b"]);
+        assert_eq!(a.value("root").as_deref(), Some("b"));
+        assert!(a.values("none").is_empty());
     }
 
     #[test]
@@ -125,4 +158,18 @@ mod tests {
         let a = Args::parse(&v(&["-5"]), &[], &[]).unwrap();
         assert_eq!(a.positional, ["-5"]);
     }
+
+    #[test]
+    fn help_is_asked_for_anywhere_but_as_a_value() {
+        // Also after a bad option: help wins over the usage error (#1161 review).
+        for argv in
+            [&["--help"][..], &["-h"], &["in.figcraft", "-o", "out", "--help"], &["--json", "-h"], &["--bogus", "--help"], &["--json=1", "-h"]]
+        {
+            assert!(matches!(Args::parse(&v(argv), &["o"], &["json"]), Err(CliError::Help)), "{argv:?}");
+        }
+        let a = Args::parse(&v(&["--filter", "--help", "-o", "-h"]), &["filter", "o"], &[]).unwrap();
+        assert_eq!((a.value("filter").as_deref(), a.value("o").as_deref()), (Some("--help"), Some("-h")));
+        // `--help=x` is no request for help, just an unknown option.
+        assert!(matches!(Args::parse(&v(&["--help=x"]), &[], &[]), Err(CliError::Usage(_))));
+    }
 }
diff --git a/apps/figcraft-cli/src/files.rs b/apps/figcraft-cli/src/files.rs
index 4fb485e1..1ba9d60a 100644
--- a/apps/figcraft-cli/src/files.rs
+++ b/apps/figcraft-cli/src/files.rs
@@ -1,10 +1,11 @@
 //! The file subcommands: info, export, convert, render and run.
 
+use std::ffi::OsStr;
 use std::path::Path;
 use std::process::ExitCode;
 
-use figcraft_doc::{Document, ExportFormat, ExportSetting, NodeId, NodeKind, PrintSettings};
-use figcraft_engine::Session;
+use figcraft_doc::{Document, ExportFormat, ExportSetting, NodeId, NodeKind, PrintSettings, VdCompat};
+use figcraft_engine::{BatchScope, BatchStep, Session};
 use serde_json::{Value, json};
 
 use crate::{CliError, CliResult};
@@ -19,19 +20,30 @@ fn load_noted(path: &str) -> CliResult<(Document, Vec<String>)> {
 }
 
 fn ext(path: &str) -> String {
-    Path::new(path).extension().and_then(|e| e.to_str()).unwrap_or("").to_ascii_lowercase()
+    Path::new(path).extension().and_then(OsStr::to_str).unwrap_or("").to_ascii_lowercase()
 }
 
 fn image_format(e: &str) -> Option<ExportFormat> {
     match e {
-        "png" | "jpg" | "jpeg" | "svg" | "webp" | "pdf" => ExportFormat::from_ext(e),
+        "png" | "jpg" | "jpeg" | "svg" | "webp" | "pdf" | "xml" => ExportFormat::from_ext(e),
         _ => None,
     }
 }
 
+/// Writes through [`figcraft_engine::file_access`] when automation roots are in force, so a
+/// confined run can only write inside a write root (#833).
+///
+/// Unconfined it writes with `std::fs::write`, as it always did. `file_access::write` stages the
+/// bytes and renames them into place, which **replaces** a symbolic link at `path` instead of
+/// writing through it to its target -- a change of behaviour for anyone whose output path is a
+/// link, and nothing to do with confinement. Inside a root the staged write is the right one:
+/// `Roots::check` has already refused a link that leads out of the root.
 fn write(path: &str, bytes: &[u8]) -> CliResult<()> {
     if let Some(dir) = Path::new(path).parent().filter(|d| !d.as_os_str().is_empty()) {
-        std::fs::create_dir_all(dir).map_err(|e| CliError::Failed(format!("{}: {e}", dir.display())))?;
+        figcraft_engine::file_access::create_dir_all(dir).map_err(|e| CliError::Failed(e.to_string()))?;
+    }
+    if figcraft_engine::file_access::current().is_some() {
+        return figcraft_engine::file_access::write(path, bytes).map_err(|e| CliError::Failed(e.to_string()));
     }
     std::fs::write(path, bytes).map_err(|e| CliError::Failed(format!("{path}: {e}")))
 }
@@ -155,6 +167,7 @@ pub fn info(path: &str, as_json: bool) -> CliResult<ExitCode> {
             Some(json!({"id": p, "name": pn.name, "nodes": nodes, "topLevel": pn.children.len(), "frames": frames}))
         })
         .collect();
+    let missing = figcraft_engine::fonts::missing(&doc);
     let v = json!({
         "file": path,
         "name": doc.name,
@@ -164,6 +177,7 @@ pub fn info(path: &str, as_json: bool) -> CliResult<ExitCode> {
         "variables": doc.variables.variables.len(),
         "images": doc.images.len(),
         "notes": notes,
+        "missingFonts": missing.iter().map(|m| json!({"family": m.family, "layers": m.layers})).collect::<Vec<_>>(),
     });
     if as_json {
         println!("{}", serde_json::to_string_pretty(&v).unwrap_or_default());
@@ -187,13 +201,20 @@ pub fn info(path: &str, as_json: bool) -> CliResult<ExitCode> {
             println!("  {} {} \"{}\" {}×{}", f["id"], f["type"].as_str().unwrap_or(""), f["name"].as_str().unwrap_or(""), f["width"], f["height"]);
         }
     }
+    for m in &missing {
+        let layers = if m.layers == 1 { "text layer" } else { "text layers" };
+        println!("missing font \"{}\": {} {layers} (drawn in a fallback font)", m.family, m.layers);
+    }
     Ok(ExitCode::SUCCESS)
 }
 
+/// The file name a layer exports to: the app's rule ([`figcraft_engine::cmd::file::safe_file_name`],
+/// so `/` becomes `_` too), without leading or trailing spaces and dots, at most 100 characters
+/// and 200 bytes (file systems allow 255, and a number and the extension still fit).
 fn sanitize(name: &str) -> String {
-    let s: String = name.chars().map(|c| if c.is_alphanumeric() || matches!(c, '-' | '_' | ' ' | '.') { c } else { '_' }).collect();
-    let s = s.trim().trim_matches('.').to_string();
-    if s.is_empty() { "layer".into() } else { s.chars().take(100).collect() }
+    let s = figcraft_engine::cmd::file::safe_file_name(name);
+    let s = s.trim_matches(|c: char| c == '.' || c.is_whitespace());
+    if s.is_empty() { "layer".into() } else { s.char_indices().take(100).take_while(|(i, c)| i + c.len_utf8() <= 200).map(|(_, c)| c).collect() }
 }
 
 /// What `export` exports and how.
@@ -204,6 +225,8 @@ pub struct Target {
     pub node: Option<String>,
     /// PDF only.
     pub print: PrintSettings,
+    /// Android Vector Drawable (XML) only.
+    pub vd_compat: VdCompat,
 }
 
 pub fn export(file: &str, out: &str, t: &Target) -> CliResult<ExitCode> {
@@ -218,15 +241,20 @@ pub fn export(file: &str, out: &str, t: &Target) -> CliResult<ExitCode> {
     let (scale, node, print) = (t.scale, t.node.as_deref(), &t.print);
     let fmt = match t.format.as_deref() {
         Some(f) => {
-            image_format(&f.to_ascii_lowercase()).ok_or_else(|| CliError::Usage(format!("unknown --format `{f}` (png|jpg|svg|webp|pdf|fig)")))?
+            image_format(&f.to_ascii_lowercase()).ok_or_else(|| CliError::Usage(format!("unknown --format `{f}` (png|jpg|svg|webp|pdf|xml|fig)")))?
         }
         None => image_format(&ext(out)).unwrap_or(ExportFormat::Png),
     };
     let target = node.map(|q| find_node(&doc, page, q)).transpose()?;
     let single = image_format(&ext(out)).is_some();
     let bytes_of = |ids: &[NodeId]| {
-        let setting = ExportSetting { format: fmt, print: *print, ..Default::default() };
-        figcraft_engine::cmd::file::export_bytes_with(&doc, ids, &setting, scale).map_err(|e| CliError::Failed(e.to_string()))
+        let setting = ExportSetting { format: fmt, print: *print, vd_compat: t.vd_compat, ..Default::default() };
+        let (bytes, warnings) = figcraft_engine::cmd::file::export_file(&doc, ids, &setting, scale).map_err(|e| CliError::Failed(e.to_string()))?;
+        // What an Android Vector Drawable changed or left out, like the .fig notes.
+        for w in warnings {
+            eprintln!("note: {w}");
+        }
+        Ok::<_, CliError>(bytes)
     };
     if single {
         let bytes = match target {
@@ -238,7 +266,7 @@ pub fn export(file: &str, out: &str, t: &Target) -> CliResult<ExitCode> {
         println!("{out}");
         return Ok(ExitCode::SUCCESS);
     }
-    std::fs::create_dir_all(out).map_err(|e| CliError::Failed(format!("{out}: {e}")))?;
+    figcraft_engine::file_access::create_dir_all(out).map_err(|e| CliError::Failed(e.to_string()))?;
     let ids = match target {
         Some(t) => vec![t],
         None => {
@@ -251,14 +279,19 @@ pub fn export(file: &str, out: &str, t: &Target) -> CliResult<ExitCode> {
         return Err(CliError::Failed("the page is empty: nothing to export".into()));
     }
     let mut used = std::collections::BTreeSet::new();
+    let mut next_suffix: std::collections::HashMap<String, usize> = std::collections::HashMap::new();
     for id in ids {
         let base = sanitize(doc.node(id).map(|n| n.name.as_str()).unwrap_or("layer"));
-        let mut name = base.clone();
-        let mut k = 2;
-        while !used.insert(name.to_lowercase()) {
-            name = format!("{base} {k}");
-            k += 1;
-        }
+        let base_lower = base.to_lowercase();
+        let next = next_suffix.entry(base_lower).or_insert(1);
+        let name = loop {
+            let k = *next;
+            *next += 1;
+            let candidate = if k == 1 { base.clone() } else { format!("{base} {k}") };
+            if used.insert(candidate.to_lowercase()) {
+                break candidate;
+            }
+        };
         let path = Path::new(out).join(format!("{name}.{}", fmt.ext())).to_string_lossy().into_owned();
         write(&path, &bytes_of(&[id])?)?;
         println!("{path}");
@@ -266,8 +299,29 @@ pub fn export(file: &str, out: &str, t: &Target) -> CliResult<ExitCode> {
     Ok(ExitCode::SUCCESS)
 }
 
+fn refuse_dropping_images(input: &str, out: &str, images_left_out: usize) -> CliResult<()> {
+    if images_left_out > 0 && figcraft_engine::file_access::same_file(input, out) {
+        return Err(CliError::Failed(format!(
+            "{out} wasn't written: {images_left_out} of its images weren't loaded (together they pass what FigCraft reads from one file), and writing over it would delete them. Write to another path; {input} keeps them."
+        )));
+    }
+    Ok(())
+}
+
+fn refuse_dropping_images_from_script(input: Option<(&str, usize)>, active: &figcraft_engine::DocState, out: &str) -> CliResult<()> {
+    if let Some((input, images_left_out)) = input {
+        refuse_dropping_images(input, out, images_left_out)?;
+    }
+    if let Some(images_left_out) = active.images_lost_saving_to(out) {
+        refuse_dropping_images(out, out, images_left_out)?;
+    }
+    Ok(())
+}
+
 pub fn convert(input: &str, out: &str) -> CliResult<ExitCode> {
-    let doc = load(input)?;
+    let (loaded, _) = figcraft_engine::cmd::file::load_path(input, None).map_err(|e| CliError::Failed(format!("can't open {input}: {e}")))?;
+    refuse_dropping_images(input, out, loaded.images_past_budget)?;
+    let doc = loaded.doc;
     let page = doc
         .current_page
         .filter(|p| doc.pages.contains(p))
@@ -292,7 +346,7 @@ pub fn render(file: &str, out: &str, scale: f64, page: Option<&str>) -> CliResul
 }
 
 /// Parse a script: a JSON array of steps, `{"commands": [...]}`, or JSON lines.
-pub fn parse_script(text: &str) -> Result<Vec<(String, Value)>, String> {
+pub fn parse_script(text: &str) -> Result<Vec<BatchStep>, String> {
     let steps: Vec<Value> = match serde_json::from_str::<Value>(text) {
         Ok(Value::Array(a)) => a,
         Ok(Value::Object(o)) if o.contains_key("commands") => {
@@ -317,36 +371,54 @@ pub fn parse_script(text: &str) -> Result<Vec<(String, Value)>, String> {
                 Some(p @ Value::Object(_)) => p.clone(),
                 Some(_) => return Err(format!("step {i} ({cmd}): `params` must be an object")),
             };
-            Ok((cmd.to_string(), params))
+            let name = figcraft_engine::batch::step_name(i, &s).map_err(|e| e.to_string())?;
+            Ok(BatchStep { name, ..BatchStep::new(cmd, params) })
         })
         .collect()
 }
 
 pub fn run_script(script: &str, input: Option<&str>, out: Option<&str>) -> CliResult<ExitCode> {
-    let text = std::fs::read_to_string(script).map_err(|e| CliError::Failed(format!("{script}: {e}")))?;
+    let bytes = figcraft_engine::file_access::read(script).map_err(|e| CliError::Failed(e.to_string()))?;
+    let text = String::from_utf8(bytes).map_err(|_| CliError::Failed(format!("{script}: not UTF-8")))?;
     let steps = parse_script(&text).map_err(|e| CliError::Failed(format!("{script}: {e}")))?;
-    let mut s = match input {
+    let (mut s, input_images_left_out) = match input {
         Some(path) => {
             let mut s = Session::empty();
             s.execute("file.open", &json!({"path": path})).map_err(|e| CliError::Failed(format!("can't open {path}: {e}")))?;
-            s
+            let left_out = s.ds().map_err(|e| CliError::Failed(e.to_string()))?.images_lost_saving_to(path).unwrap_or(0);
+            (s, left_out)
         }
-        None => Session::new(),
+        None => (Session::new(), 0),
     };
-    for (i, (cmd, params)) in steps.iter().enumerate() {
-        let r = s.execute(cmd, params);
-        s.ui_requests.clear();
-        match r {
-            Ok(v) => println!("{}", json!({"step": i, "command": cmd, "ok": true, "result": v})),
-            Err(e) => {
-                println!("{}", json!({"step": i, "command": cmd, "ok": false, "error": e.to_string()}));
-                eprintln!("error: step {i} ({cmd}) failed: {e}");
-                return Ok(ExitCode::from(1));
-            }
+    // One undo step and all-or-nothing, the way the same commands behave through `command.batch`
+    // (MCP, the control channel, plugins): `{"$step": n}` and `{"$ref": "name"}` resolve against the
+    // steps before it, and a step that fails takes the whole script back instead of leaving the
+    // earlier steps applied. The result lines are held back until the script is through, so none of
+    // them reports work that was rolled back.
+    let mut scope = BatchScope::new(&steps).map_err(|e| CliError::Failed(format!("{script}: {e}")))?;
+    let mut failed_at = 0;
+    let outcome = s.grouped(&format!("run {script}"), |s| {
+        for (i, step) in steps.iter().enumerate() {
+            failed_at = i;
+            s.batch_step(&mut scope, &step.command, &step.params)?;
+            s.ui_requests.clear();
         }
+        Ok(())
+    });
+    if let Err(e) = outcome {
+        let cmd = steps.get(failed_at).map_or("", |step| step.command.as_str());
+        let i = failed_at;
+        println!("{}", json!({"step": i, "command": cmd, "ok": false, "error": e.to_string(), "rolledBack": true}));
+        eprintln!("error: step {i} ({cmd}) failed: {e}");
+        eprintln!("the script's document changes were rolled back");
+        return Ok(ExitCode::from(1));
+    }
+    for (i, (step, v)) in steps.iter().zip(scope.results()).enumerate() {
+        println!("{}", json!({"step": i, "command": step.command, "ok": true, "result": v}));
     }
     if let Some(out) = out {
         let ds = s.ds().map_err(|e| CliError::Failed(e.to_string()))?;
+        refuse_dropping_images_from_script(input.map(|input| (input, input_images_left_out)), ds, out)?;
         if ext(out) == "figcraft" {
             // Through the engine, so the version history is kept.
             write(out, &figcraft_engine::cmd::file::file_bytes(ds).map_err(|e| CliError::Failed(e.to_string()))?)?;
@@ -378,6 +450,14 @@ mod tests {
         assert_eq!(sanitize("Home / Hero"), "Home _ Hero");
         assert_eq!(sanitize("../.."), "_");
         assert_eq!(sanitize(""), "layer");
+        // The same characters the app's export keeps (#1154): only what file systems refuse goes.
+        assert_eq!(sanitize("Homepage - desktop (live + verbeteringen)"), "Homepage - desktop (live + verbeteringen)");
+        assert_eq!(sanitize("Q&A, 50% #1 [v2] {x} ~é"), "Q&A, 50% #1 [v2] {x} ~é");
+        assert_eq!(sanitize("a\\b:c*d?e\"f<g>h|i\tj"), "a_b_c_d_e_f_g_h_i_j");
+        assert_eq!(sanitize(" .hidden. "), "hidden");
+        assert_eq!(sanitize(" . .name. . "), "name", "spaces and dots at the edges, mixed");
+        assert_eq!(sanitize(&"x".repeat(300)).chars().count(), 100);
+        assert_eq!(sanitize(&"\u{1F600}".repeat(100)), "\u{1F600}".repeat(50), "at most 200 bytes, whole characters");
     }
 
     #[test]
@@ -422,4 +502,119 @@ mod tests {
         assert_eq!(std::fs::read_dir(&dir).unwrap().count(), 2);
         std::fs::remove_dir_all(dir).unwrap();
     }
+
+    fn temp_dir(tag: &str) -> std::path::PathBuf {
+        let stamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+        let dir = std::env::temp_dir().join(format!("figcraft-cli-{tag}-{}-{stamp}", std::process::id()));
+        std::fs::create_dir(&dir).unwrap();
+        dir
+    }
+
+    /// A script resolves `{"$step": n}` like the same commands through `command.batch`. Each step
+    /// used to run on its own, so the reference reached `parent` unresolved, `node.create` read it
+    /// as "no parent" and the layer landed on the page — with every step reporting success.
+    #[test]
+    fn a_script_puts_a_layer_in_a_layer_an_earlier_step_made() {
+        let dir = temp_dir("run-step");
+        let script = dir.join("script.json");
+        std::fs::write(
+            &script,
+            r#"[
+                {"command": "node.create", "params": {"type": "frame", "name": "Card", "x": 0, "y": 0, "width": 200, "height": 100}},
+                {"command": "node.create", "params": {"type": "rectangle", "name": "child", "parent": {"$step": 0}, "x": 10, "y": 10, "width": 20, "height": 20}}
+            ]"#,
+        )
+        .unwrap();
+        let out = dir.join("out.figcraft");
+        run_script(script.to_str().unwrap(), None, Some(out.to_str().unwrap())).unwrap();
+
+        let mut s = Session::empty();
+        s.execute("file.open", &json!({"path": out.to_str().unwrap()})).unwrap();
+        let doc = s.doc().unwrap();
+        let page = s.page().unwrap();
+        let top = doc.node(page).unwrap().children.clone();
+        assert_eq!(top.len(), 1, "only the frame is top level, not the rectangle too");
+        assert_eq!(doc.node(top[0]).unwrap().name, "Card");
+        let inner = doc.node(top[0]).unwrap().children.clone();
+        assert_eq!(inner.len(), 1, "the rectangle went inside the frame");
+        assert_eq!(doc.node(inner[0]).unwrap().name, "child");
+        std::fs::remove_dir_all(dir).unwrap();
+    }
+
+    /// A script names its steps with `as` and reads paths into their results, like `command.batch`.
+    #[test]
+    fn a_script_refers_to_named_steps_and_paths() {
+        let dir = temp_dir("run-ref");
+        let script = dir.join("script.json");
+        std::fs::write(
+            &script,
+            r#"[
+                {"command": "node.create", "as": "card", "params": {"type": "frame", "name": "Card", "x": 0, "y": 0, "width": 200, "height": 100}},
+                {"command": "edit.duplicate", "as": "copy", "params": {"ids": [{"$ref": "card"}]}},
+                {"command": "node.set", "params": {"ids": [{"$ref": "copy", "field": "ids/0"}], "props": {"name": "Copy"}}}
+            ]"#,
+        )
+        .unwrap();
+        let out = dir.join("out.figcraft");
+        run_script(script.to_str().unwrap(), None, Some(out.to_str().unwrap())).unwrap();
+
+        let mut s = Session::empty();
+        s.execute("file.open", &json!({"path": out.to_str().unwrap()})).unwrap();
+        let doc = s.doc().unwrap();
+        let top = doc.node(s.page().unwrap()).unwrap().children.clone();
+        let names: Vec<_> = top.iter().map(|id| doc.node(*id).unwrap().name.clone()).collect();
+        assert_eq!(names, ["Card", "Copy"]);
+        std::fs::remove_dir_all(dir).unwrap();
+    }
+
+    /// Two steps with one name fail before anything runs.
+    #[test]
+    fn a_script_with_a_name_twice_runs_nothing() {
+        let dir = temp_dir("run-dup-name");
+        let script = dir.join("script.json");
+        std::fs::write(&script, r#"[{"command": "select.none", "as": "a"}, {"command": "select.none", "as": "a"}]"#).unwrap();
+        let Err(CliError::Failed(e)) = run_script(script.to_str().unwrap(), None, None) else { panic!("a name twice must fail") };
+        assert!(e.contains("step 1: `as` \"a\" is already step 0's name"), "{e}");
+        std::fs::remove_dir_all(dir).unwrap();
+    }
+
+    /// A step that fails takes the whole script back: nothing is written, and the failure says so.
+    #[test]
+    fn a_failed_step_leaves_no_output() {
+        let dir = temp_dir("run-rollback");
+        let script = dir.join("script.json");
+        std::fs::write(
+            &script,
+            r#"[
+                {"command": "node.create", "params": {"type": "frame", "name": "Card", "x": 0, "y": 0, "width": 200, "height": 100}},
+                {"command": "node.set", "params": {"ids": [99999], "props": {"name": "nope"}}}
+            ]"#,
+        )
+        .unwrap();
+        let out = dir.join("out.figcraft");
+        // The failure is the script's, not the call's: the CLI reports it and exits non-zero.
+        run_script(script.to_str().unwrap(), None, Some(out.to_str().unwrap())).unwrap();
+        assert!(!out.exists(), "a script that failed writes nothing");
+        std::fs::remove_dir_all(dir).unwrap();
+    }
+
+    #[test]
+    fn a_script_output_over_its_input_is_refused_whichever_tab_the_script_left_active() {
+        let dir = temp_dir("script-images-left-out");
+        let input = dir.join("big.figcraft");
+        std::fs::write(&input, b"kept").unwrap();
+        let link = dir.join("link.figcraft");
+        std::fs::hard_link(&input, &link).unwrap();
+        let (input, link, other) = (input.to_str().unwrap(), link.to_str().unwrap(), dir.join("other.figcraft"));
+        let duplicate = Session::new();
+        let active = duplicate.ds().unwrap();
+
+        for out in [input, link] {
+            let refused = refuse_dropping_images_from_script(Some((input, 3)), active, out);
+            assert!(matches!(&refused, Err(CliError::Failed(m)) if m.contains("3 of its images")), "{out}");
+        }
+        assert!(refuse_dropping_images_from_script(Some((input, 3)), active, other.to_str().unwrap()).is_ok());
+        assert!(refuse_dropping_images_from_script(Some((input, 0)), active, input).is_ok());
+        std::fs::remove_dir_all(dir).unwrap();
+    }
 }
diff --git a/apps/figcraft-cli/src/main.rs b/apps/figcraft-cli/src/main.rs
index 590b50f1..971b3905 100644
--- a/apps/figcraft-cli/src/main.rs
+++ b/apps/figcraft-cli/src/main.rs
@@ -17,37 +17,68 @@ pub const USAGE: &str = "figcraft-cli — FigCraft without a window
 
 USAGE:
   figcraft-cli info <file> [--json]
-  figcraft-cli export <file> -o <out> [--format png|jpg|svg|webp|pdf|fig] [--scale N] [--page NAME] [--node ID|NAME]
-                      [--bleed LENGTH] [--crop-marks] [--bleed-marks] [--cmyk]
+  figcraft-cli export <file> -o <out> [--format png|jpg|svg|webp|pdf|xml|fig] [--scale N] [--page NAME] [--node ID|NAME]
+                      [--bleed LENGTH] [--crop-marks] [--bleed-marks] [--cmyk] [--vd-compat bestEffort|exact|ignore]
   figcraft-cli convert <in> <out>
   figcraft-cli render <file> -o <out.png> [--scale N] [--page NAME]
   figcraft-cli run <script.json|script.jsonl> [--in <file>] [--out <file>]
+  (info, export, convert, render and run also take --automation-read-root DIR / --automation-write-root DIR)
   figcraft-cli commands [--json] [--filter TEXT]
-  figcraft-cli mcp [--attach PORT]
+  figcraft-cli mcp [--attach PORT] [--automation-read-root DIR]... [--automation-write-root DIR]...
   figcraft-cli plugin publish <folder> --server ws://host:port/[?key=KEY]
   figcraft-cli perf [--layers N[,N...]] [--instances N[,N...]]
-  figcraft-cli help | --help | --version
+  figcraft-cli help | --help | --version   (a subcommand followed by --help or -h prints this too)
 
 Every subcommand takes --no-system-fonts (or set FIGCRAFT_NO_SYSTEM_FONTS=1): text uses only the
 fonts built into FigCraft, for renders that match on every machine. Otherwise installed fonts are
 indexed the first time text is laid out, as in the app.
 
 Files: .figcraft (native), .json (FigCraft or REST API file JSON), .fig (best effort; `info` lists what
-wasn't imported), .svg, .png/.jpg/.webp/.gif/.bmp (open as an image layer). `export` writes one file
-per top-level frame into the <out> directory, or one file when <out> has an image extension or --node
-is given (`fig`, or an <out> ending in .fig: the whole file as .fig, experimental; other apps may
+wasn't imported), .sketch (Sketch 48 or newer, best effort), .svg, .png/.jpg/.webp/.gif/.bmp (open as an
+image layer). `export` writes one file per top-level frame into the <out> directory, or one file when
+<out> has an image extension or --node is given (`fig`, or an <out> ending in .fig: the whole file as .fig, experimental; other apps may
 not open every file); PDFs take print options (a bleed like 3mm or 0.125in,
 crop and bleed marks, CMYK colour). `run` executes a JSON array (or JSON lines) of
 {\"command\": id, \"params\": {...}} in a headless session and prints one JSON result line per step.
 `plugin publish` sends a plugin folder (figcraft-plugin.json, its module, an optional assets/ folder)
 to a figcraft-server's plugin directory as a new version; the server's key comes from the address or
 the FIGCRAFT_SERVER_KEY environment variable (which keeps it out of the shell history).
+`--automation-read-root DIR` / `--automation-write-root DIR` (each may be repeated; the folders
+must exist) confine the files a subcommand touches: reads only inside a read or write root, writes
+only inside a write root, everything else refused -- so giving no write root denies writing
+altogether. They reach the headless side only: `mcp` takes them to confine the agent's commands,
+and `info`, `export`, `convert`, `render` and `run` to confine that one run; without them a
+subcommand reads and writes as the user who started it, as before. A `mcp --attach` server is
+confined by the app it attaches to, not by flags passed to the CLI: start that app with
+`figcraft --control PORT` and the same roots (`--attach` refuses them).
 See docs/cli.md and docs/mcp.md.";
 
+/// The automation roots a file subcommand was given, if any. Omitting both leaves the run
+/// unconfined, as before; giving either confines every file the subcommand touches (#833).
+const ROOT_FLAGS: [&str; 2] = ["automation-read-root", "automation-write-root"];
+
+fn roots_of(a: &Args) -> CliResult<Option<figcraft_engine::file_access::Roots>> {
+    let (read, write) = (a.values("automation-read-root"), a.values("automation-write-root"));
+    if read.is_empty() && write.is_empty() {
+        return Ok(None);
+    }
+    Ok(Some(figcraft_engine::file_access::Roots::new(read, write).map_err(CliError::Failed)?))
+}
+
+/// Runs `f` confined to the roots `a` carries.
+fn confined<R>(a: &Args, f: impl FnOnce() -> CliResult<R>) -> CliResult<R> {
+    let roots = roots_of(a)?.map(std::sync::Arc::new);
+    figcraft_engine::file_access::confined(roots.as_ref(), f)
+}
+
 fn main() -> ExitCode {
     let argv: Vec<String> = std::env::args().skip(1).collect();
     match run(&argv) {
         Ok(code) => code,
+        Err(CliError::Help) => {
+            println!("{USAGE}");
+            ExitCode::SUCCESS
+        }
         Err(CliError::Usage(msg)) => {
             eprintln!("error: {msg}\n\n{USAGE}");
             ExitCode::from(2)
@@ -61,6 +92,8 @@ fn main() -> ExitCode {
 
 #[derive(Debug)]
 pub enum CliError {
+    /// `--help` or `-h` after a subcommand: usage on stdout, exit code 0.
+    Help,
     /// Bad arguments: usage is printed, exit code 2.
     Usage(String),
     /// The operation failed: exit code 1.
@@ -75,15 +108,27 @@ impl From<String> for CliError {
 
 pub type CliResult<T> = Result<T, CliError>;
 
-fn run(argv: &[String]) -> CliResult<ExitCode> {
-    let system_fonts = !argv.iter().any(|a| a == "--no-system-fonts");
-    let argv: Vec<String> = argv.iter().filter(|a| *a != "--no-system-fonts").cloned().collect();
-    if system_fonts {
+fn parse_args(argv: &[String], valued: &[&str], flags: &[&str]) -> CliResult<Args> {
+    let flags = [flags, &["no-system-fonts"]].concat();
+    let args = Args::parse(argv, valued, &flags)?;
+    if !args.flag("no-system-fonts") {
         // Text lays out with the installed fonts, like the desktop app, so headless renders and
         // auto layout sizes match what users see.
         figcraft_text::scan_system_fonts_on_demand();
+    } else {
+        // Nothing scans them then, not even a `.sketch` import matching its fonts.
+        figcraft_text::opt_out_of_system_fonts();
     }
-    let Some((cmd, rest)) = argv.split_first() else { return Err(CliError::Usage("missing subcommand".into())) };
+    Ok(args)
+}
+
+fn run(argv: &[String]) -> CliResult<ExitCode> {
+    let Some(command_index) = argv.iter().position(|a| a != "--no-system-fonts") else {
+        return Err(CliError::Usage("missing subcommand".into()));
+    };
+    let cmd = argv.get(command_index).ok_or_else(|| CliError::Usage("missing subcommand".into()))?;
+    // Keep leading global flags with the subcommand's options, where values and `--` are parsed.
+    let rest: Vec<String> = argv.iter().enumerate().filter(|(i, _)| *i != command_index).map(|(_, a)| a.clone()).collect();
     match cmd.as_str() {
         "help" | "--help" | "-h" => {
             println!("{USAGE}");
@@ -94,38 +139,47 @@ fn run(argv: &[String]) -> CliResult<ExitCode> {
             Ok(ExitCode::SUCCESS)
         }
         "info" => {
-            let a = Args::parse(rest, &[], &["json"])?;
+            let a = parse_args(&rest, &ROOT_FLAGS, &["json"])?;
             let file = a.one_positional("info <file>")?;
-            files::info(&file, a.flag("json"))
+            confined(&a, || files::info(&file, a.flag("json")))
         }
         "export" => {
-            let a = Args::parse(rest, &["format", "scale", "page", "node", "o", "out", "bleed"], &["crop-marks", "bleed-marks", "cmyk"])?;
+            let valued = [&["format", "scale", "page", "node", "o", "out", "bleed", "vd-compat"][..], &ROOT_FLAGS[..]].concat();
+            let a = parse_args(&rest, &valued, &["crop-marks", "bleed-marks", "cmyk"])?;
             let file = a.one_positional("export <file> -o <out>")?;
             let out = a.value("o").or_else(|| a.value("out")).ok_or_else(|| CliError::Usage("export needs -o <out>".into()))?;
-            let target =
-                files::Target { format: a.value("format"), scale: a.scale()?, page: a.value("page"), node: a.value("node"), print: a.print()? };
-            files::export(&file, &out, &target)
+            let target = files::Target {
+                format: a.value("format"),
+                scale: a.scale()?,
+                page: a.value("page"),
+                node: a.value("node"),
+                print: a.print()?,
+                vd_compat: a.vd_compat()?,
+            };
+            confined(&a, || files::export(&file, &out, &target))
         }
         "convert" => {
-            let a = Args::parse(rest, &[], &[])?;
+            let a = parse_args(&rest, &ROOT_FLAGS, &[])?;
             match a.positional.as_slice() {
-                [i, o] => files::convert(i, o),
+                [i, o] => confined(&a, || files::convert(i, o)),
                 _ => Err(CliError::Usage("convert <in> <out>".into())),
             }
         }
         "render" => {
-            let a = Args::parse(rest, &["o", "out", "scale", "page"], &[])?;
+            let valued = [&["o", "out", "scale", "page"][..], &ROOT_FLAGS[..]].concat();
+            let a = parse_args(&rest, &valued, &[])?;
             let file = a.one_positional("render <file> -o <out.png>")?;
             let out = a.value("o").or_else(|| a.value("out")).ok_or_else(|| CliError::Usage("render needs -o <out.png>".into()))?;
-            files::render(&file, &out, a.scale()?, a.value("page").as_deref())
+            confined(&a, || files::render(&file, &out, a.scale()?, a.value("page").as_deref()))
         }
         "run" => {
-            let a = Args::parse(rest, &["in", "out"], &[])?;
+            let valued = [&["in", "out"][..], &ROOT_FLAGS[..]].concat();
+            let a = parse_args(&rest, &valued, &[])?;
             let script = a.one_positional("run <script.json|.jsonl>")?;
-            files::run_script(&script, a.value("in").as_deref(), a.value("out").as_deref())
+            confined(&a, || files::run_script(&script, a.value("in").as_deref(), a.value("out").as_deref()))
         }
         "commands" => {
-            let a = Args::parse(rest, &["filter"], &["json"])?;
+            let a = parse_args(&rest, &["filter"], &["json"])?;
             if !a.positional.is_empty() {
                 return Err(CliError::Usage("commands takes no positional arguments".into()));
             }
@@ -133,14 +187,23 @@ fn run(argv: &[String]) -> CliResult<ExitCode> {
             Ok(ExitCode::SUCCESS)
         }
         "mcp" => {
-            let a = Args::parse(rest, &["attach"], &[])?;
+            let valued = [&["attach"][..], &ROOT_FLAGS[..]].concat();
+            let a = parse_args(&rest, &valued, &[])?;
             if !a.positional.is_empty() {
                 return Err(CliError::Usage("mcp takes no positional arguments".into()));
             }
-            mcp(a.value("attach").as_deref())
+            let attach = a.value("attach");
+            // The app runs the commands: only its own roots can confine them.
+            if attach.is_some() && ROOT_FLAGS.iter().any(|f| !a.values(f).is_empty()) {
+                return Err(CliError::Usage(
+                    "--attach can't take automation roots: start the app with them instead (`figcraft --control PORT --automation-read-root DIR ...`)"
+                        .into(),
+                ));
+            }
+            mcp(attach.as_deref(), roots_of(&a)?)
         }
         "plugin" => {
-            let a = Args::parse(rest, &["server"], &[])?;
+            let a = parse_args(&rest, &["server"], &[])?;
             match a.positional.as_slice() {
                 [verb, folder] if verb == "publish" => {
                     let server = a.value("server").ok_or_else(|| CliError::Usage("plugin publish needs --server ws://host:port/".into()))?;
@@ -150,10 +213,10 @@ fn run(argv: &[String]) -> CliResult<ExitCode> {
             }
         }
         "perf" => {
-            let a = Args::parse(rest, &["layers", "instances"], &[])?;
+            let a = parse_args(&rest, &["layers", "instances"], &[])?;
             let sizes: Vec<usize> = a.usizes("layers", &[1000, 10_000])?.into_iter().map(|n| n.clamp(10, 2_000_000)).collect();
             let instances: Vec<usize> = a.usizes("instances", &[2000])?.into_iter().filter(|n| *n > 0).map(|n| n.min(100_000)).collect();
-            perf::run(&sizes, &instances, system_fonts)
+            perf::run(&sizes, &instances, !a.flag("no-system-fonts"))
         }
         other => Err(CliError::Usage(format!("unknown subcommand `{other}`"))),
     }
@@ -205,7 +268,7 @@ fn publish_plugin(folder: &str, server: &str) -> CliResult<ExitCode> {
     Ok(ExitCode::SUCCESS)
 }
 
-fn mcp(attach: Option<&str>) -> CliResult<ExitCode> {
+fn mcp(attach: Option<&str>, roots: Option<figcraft_engine::file_access::Roots>) -> CliResult<ExitCode> {
     let backend: Box<dyn figcraft_mcp::Backend> = match attach {
         Some(p) => {
             let addr = if p.contains(':') {
@@ -220,7 +283,10 @@ fn mcp(attach: Option<&str>) -> CliResult<ExitCode> {
         None => Box::new(figcraft_mcp::Headless::new()),
     };
     eprintln!("figcraft MCP server ({}) on stdio", backend.describe());
-    let mut server = figcraft_mcp::Server::new(backend);
+    if let Some(r) = &roots {
+        eprintln!("file access confined to {}", r.to_json());
+    }
+    let mut server = figcraft_mcp::Server::new(backend).with_roots(roots);
     let stdin = std::io::stdin();
     let stdout = std::io::stdout();
     server.serve(stdin.lock(), stdout.lock()).map_err(|e| format!("stdio: {e}"))?;
diff --git a/apps/figcraft-cli/tests/cli.rs b/apps/figcraft-cli/tests/cli.rs
deleted file mode 100644
index 9dd52203..00000000
--- a/apps/figcraft-cli/tests/cli.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-//! The binary end to end.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
-
-use std::io::Write;
-use std::process::{Command, Stdio};
-
-fn bin() -> Command {
-    Command::new(env!("CARGO_BIN_EXE_figcraft-cli"))
-}
-
-fn tmp(name: &str) -> std::path::PathBuf {
-    let d = std::env::temp_dir().join(format!("figcraft-cli-test-{}-{name}", std::process::id()));
-    std::fs::create_dir_all(&d).unwrap();
-    d
-}
-
-#[test]
-fn bad_arguments_exit_2_without_panicking() {
-    for args in [
-        &[][..],
-        &["bogus"],
-        &["export"],
-        &["export", "x.figcraft"],
-        &["info", "--nope"],
-        &["render", "a", "-o"],
-        &["perf", "--shapes", "lots"],
-        &["mcp", "--attach", "notaport"],
-        &["convert", "a"],
-    ] {
-        let out = bin().args(args).output().unwrap();
-        assert_eq!(out.status.code(), Some(2), "{args:?}: {}", String::from_utf8_lossy(&out.stderr));
-        let err = String::from_utf8_lossy(&out.stderr);
-        assert!(err.contains("USAGE"), "{args:?}");
-        assert!(!err.contains("panicked"));
-    }
-    let out = bin().args(["info", "/no/such/file.figcraft"]).output().unwrap();
-    assert_eq!(out.status.code(), Some(1));
-}
-
-#[test]
-fn run_export_info_convert() {
-    let d = tmp("run");
-    let script = d.join("s.jsonl");
-    std::fs::write(&script, "{\"command\":\"frame.create\",\"params\":{\"x\":0,\"y\":0,\"width\":100,\"height\":50,\"name\":\"A\",\"props\":{\"fill\":\"#ff0000\"}}}\n{\"command\":\"frame.create\",\"params\":{\"x\":200,\"y\":0,\"width\":30,\"height\":30,\"name\":\"B\"}}\n").unwrap();
-    let file = d.join("doc.figcraft");
-    let out = bin().arg("run").arg(&script).arg("--out").arg(&file).output().unwrap();
-    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
-    let lines: Vec<serde_json::Value> = String::from_utf8_lossy(&out.stdout).lines().map(|l| serde_json::from_str(l).unwrap()).collect();
-    assert_eq!(lines.len(), 2);
-    assert!(lines.iter().all(|l| l["ok"] == true));
-
-    let info = bin().args(["info", "--json"]).arg(&file).output().unwrap();
-    let v: serde_json::Value = serde_json::from_slice(&info.stdout).unwrap();
-    assert_eq!(v["pages"][0]["frames"].as_array().unwrap().len(), 2);
-
-    let dir = d.join("png");
-    assert!(bin().arg("export").arg(&file).arg("-o").arg(&dir).args(["--scale", "2"]).status().unwrap().success());
-    let a = std::fs::read(dir.join("A.png")).unwrap();
-    assert_eq!(&a[16..24], &[0, 0, 0, 200, 0, 0, 0, 100]);
-    assert!(dir.join("B.png").exists());
-
-    let svg = d.join("b.svg");
-    assert!(bin().arg("export").arg(&file).arg("-o").arg(&svg).args(["--node", "B"]).status().unwrap().success());
-    assert!(std::fs::read_to_string(&svg).unwrap().contains("<svg"));
-
-    let json = d.join("doc.json");
-    assert!(bin().arg("convert").arg(&file).arg(&json).status().unwrap().success());
-    let png = d.join("doc.png");
-    assert!(bin().arg("convert").arg(&json).arg(&png).status().unwrap().success());
-    assert!(std::fs::read(&png).unwrap().starts_with(b"\x89PNG"));
-
-    // A failing step: nonzero exit, error line printed.
-    let bad = d.join("bad.json");
-    std::fs::write(&bad, r#"[{"command":"select.all"},{"command":"nope"}]"#).unwrap();
-    let out = bin().arg("run").arg(&bad).output().unwrap();
-    assert_eq!(out.status.code(), Some(1));
-    assert!(String::from_utf8_lossy(&out.stdout).contains("\"ok\":false"));
-    std::fs::remove_dir_all(&d).ok();
-}
-
-#[test]
-fn run_takes_the_documented_gradient_shorthand() {
-    // #252: only MCP used to accept it; `run` said "`fills` must be paints or colours".
-    let d = tmp("gradient");
-    let script = d.join("s.json");
-    std::fs::write(
-        &script,
-        r##"[{"command":"shape.rectangle","params":{"x":0,"y":0,"width":200,"height":100}},
-            {"command":"node.set","params":{"ids":[2],"fills":[{"type":"linearGradient","stops":["#ff0000","#0000ff"],"from":[0,0.5],"to":[1,0.5]}]}}]"##,
-    )
-    .unwrap();
-    let file = d.join("g.figcraft");
-    let out = bin().arg("run").arg(&script).arg("--out").arg(&file).output().unwrap();
-    assert!(out.status.success(), "{}{}", String::from_utf8_lossy(&out.stdout), String::from_utf8_lossy(&out.stderr));
-    let json = d.join("g.json");
-    assert!(bin().arg("convert").arg(&file).arg(&json).status().unwrap().success());
-    let doc = std::fs::read_to_string(&json).unwrap();
-    assert!(doc.contains("\"kind\":\"linear\"") || doc.contains("\"kind\": \"linear\""), "{doc}");
-    std::fs::remove_dir_all(&d).ok();
-}
-
-#[test]
-fn mcp_over_stdio() {
-    let mut child = bin().arg("mcp").stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::null()).spawn().unwrap();
-    {
-        let stdin = child.stdin.as_mut().unwrap();
-        writeln!(stdin, r#"{{"jsonrpc":"2.0","id":1,"method":"initialize","params":{{"protocolVersion":"2025-06-18"}}}}"#).unwrap();
-        writeln!(stdin, r#"{{"jsonrpc":"2.0","method":"notifications/initialized"}}"#).unwrap();
-        writeln!(stdin, "garbage").unwrap();
-        writeln!(stdin, r#"{{"jsonrpc":"2.0","id":2,"method":"tools/call","params":{{"name":"create_node","arguments":{{"type":"ellipse"}}}}}}"#)
-            .unwrap();
-    }
-    drop(child.stdin.take());
-    let out = child.wait_with_output().unwrap();
-    assert!(out.status.success());
-    let lines: Vec<serde_json::Value> = String::from_utf8_lossy(&out.stdout).lines().map(|l| serde_json::from_str(l).unwrap()).collect();
-    assert_eq!(lines.len(), 3);
-    assert_eq!(lines[0]["result"]["protocolVersion"], "2025-06-18");
-    assert_eq!(lines[1]["error"]["code"], -32700);
-    assert_eq!(lines[2]["result"]["isError"], false);
-}
-
-#[test]
-fn commands_json_lists_everything() {
-    let out = bin().args(["commands", "--json"]).output().unwrap();
-    let v: serde_json::Value = serde_json::from_slice(&out.stdout).unwrap();
-    assert!(v.as_array().unwrap().len() > 200);
-}
diff --git a/apps/figcraft-cli/tests/fonts.rs b/apps/figcraft-cli/tests/fonts.rs
deleted file mode 100644
index c5901ac5..00000000
--- a/apps/figcraft-cli/tests/fonts.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-//! Headless runs lay text out with the installed fonts, like the desktop app, unless
-//! `--no-system-fonts` or `FIGCRAFT_NO_SYSTEM_FONTS=1` opts out.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
-
-use std::process::Command;
-
-use serde_json::{Value, json};
-
-/// The result of one `figcraft-cli run` step (script file `name`); `opt_out` sets the environment
-/// variable.
-fn run_one(name: &str, step: Value, args: &[&str], opt_out: bool) -> Value {
-    let d = std::env::temp_dir().join(format!("figcraft-cli-fonts-{}", std::process::id()));
-    std::fs::create_dir_all(&d).unwrap();
-    let script = d.join(format!("{name}.json"));
-    std::fs::write(&script, json!([step]).to_string()).unwrap();
-    let mut cmd = Command::new(env!("CARGO_BIN_EXE_figcraft-cli"));
-    cmd.arg("run").arg(&script).args(args);
-    if opt_out {
-        cmd.env("FIGCRAFT_NO_SYSTEM_FONTS", "1");
-    } else {
-        cmd.env_remove("FIGCRAFT_NO_SYSTEM_FONTS");
-    }
-    let out = cmd.output().unwrap();
-    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
-    let line: Value = serde_json::from_slice(&out.stdout).unwrap();
-    line["result"].clone()
-}
-
-fn families(args: &[&str], opt_out: bool) -> Vec<String> {
-    serde_json::from_value(run_one("families", json!({"command": "text.fonts"}), args, opt_out)).unwrap()
-}
-
-#[test]
-fn headless_runs_resolve_installed_families_unless_opted_out() {
-    let built_in = families(&["--no-system-fonts"], false);
-    assert_eq!(families(&[], true), built_in, "FIGCRAFT_NO_SYSTEM_FONTS=1 opts out like the flag");
-    // Any family this machine adds (scanned here, in the test); none (CI): nothing to check.
-    figcraft_text::scan_system_fonts();
-    let Some(installed) = figcraft_text::family_names().into_iter().find(|f| !built_in.contains(f)) else {
-        eprintln!("skipped: no installed fonts beyond the built-in ones");
-        return;
-    };
-    assert!(families(&[], false).contains(&installed), "headless runs list {installed}");
-    let face = json!({"command": "text.fonts", "params": {"family": installed, "axes": true}});
-    assert_eq!(run_one("face", face.clone(), &[], false)["family"], json!(installed), "text uses the installed family");
-    assert_ne!(run_one("face", face, &["--no-system-fonts"], false)["family"], json!(installed), "opted out, it falls back");
-}
diff --git a/apps/figcraft-cli/tests/it/cli.rs b/apps/figcraft-cli/tests/it/cli.rs
new file mode 100644
index 00000000..1db451ba
--- /dev/null
+++ b/apps/figcraft-cli/tests/it/cli.rs
@@ -0,0 +1,358 @@
+//! The binary end to end.
+
+use std::io::Write;
+use std::process::{Command, Stdio};
+
+fn bin() -> Command {
+    Command::new(env!("CARGO_BIN_EXE_figcraft-cli"))
+}
+
+fn tmp(name: &str) -> std::path::PathBuf {
+    let d = std::env::temp_dir().join(format!("figcraft-cli-test-{}-{name}", std::process::id()));
+    std::fs::create_dir_all(&d).unwrap();
+    d
+}
+
+#[test]
+fn option_terminator_allows_dash_prefixed_filenames() {
+    let dir = tmp("option-terminator");
+    let doc = figcraft_doc::Document::new("Dash-prefixed file");
+    let bytes = figcraft_format::save_bytes(&doc, None).unwrap();
+    for name in ["--drawing.figcraft", "-h", "--json", "--no-system-fonts", "--"] {
+        std::fs::write(dir.join(name), &bytes).unwrap();
+        let output = bin().current_dir(&dir).args(["info", "--json", "--no-system-fonts", "--", name]).output().unwrap();
+        assert!(output.status.success(), "{name}: {}", String::from_utf8_lossy(&output.stderr));
+        let info: serde_json::Value = serde_json::from_slice(&output.stdout).unwrap();
+        assert_eq!(info["file"], name);
+        assert_eq!(info["name"], "Dash-prefixed file");
+    }
+    std::fs::remove_dir_all(dir).unwrap();
+}
+
+#[test]
+fn global_font_flag_respects_option_values() {
+    for filter in ["--", "--no-system-fonts"] {
+        let output = bin().args(["commands", "--filter", filter, "--no-system-fonts", "--json"]).output().unwrap();
+        assert!(output.status.success(), "{filter}: {}", String::from_utf8_lossy(&output.stderr));
+        assert!(serde_json::from_slice::<serde_json::Value>(&output.stdout).unwrap().is_array());
+    }
+}
+
+#[test]
+fn global_font_flag_can_precede_the_subcommand() {
+    let output = bin().args(["--no-system-fonts", "commands", "--json"]).output().unwrap();
+    assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
+    assert!(!serde_json::from_slice::<Vec<serde_json::Value>>(&output.stdout).unwrap().is_empty());
+}
+
+#[test]
+fn bad_arguments_exit_2_without_panicking() {
+    for args in [
+        &[][..],
+        &["bogus"],
+        &["export"],
+        &["export", "x.figcraft"],
+        &["info", "--nope"],
+        &["render", "a", "-o"],
+        &["perf", "--shapes", "lots"],
+        &["mcp", "--attach", "notaport"],
+        // An attached app confines itself: roots go to `figcraft --control`.
+        &["mcp", "--attach", "7979", "--automation-read-root", "."],
+        &["mcp", "--automation-write-root"],
+        &["convert", "a"],
+    ] {
+        let out = bin().args(args).output().unwrap();
+        assert_eq!(out.status.code(), Some(2), "{args:?}: {}", String::from_utf8_lossy(&out.stderr));
+        let err = String::from_utf8_lossy(&out.stderr);
+        assert!(err.contains("USAGE"), "{args:?}");
+        assert!(!err.contains("panicked"));
+    }
+    let out = bin().args(["info", "/no/such/file.figcraft"]).output().unwrap();
+    assert_eq!(out.status.code(), Some(1));
+}
+
+/// `--help` / `-h` after a subcommand prints the usage on stdout and exits 0, as it does first
+/// (#1155), whatever else is on the line; nothing runs.
+#[test]
+fn help_after_a_subcommand_prints_the_usage() {
+    for args in [
+        &["--help"][..],
+        &["-h"],
+        &["help"],
+        &["mcp", "--help"],
+        &["mcp", "-h"],
+        &["info", "--help"],
+        &["export", "--help"],
+        &["export", "x.figcraft", "-o", "out", "--help"],
+        &["convert", "-h"],
+        &["render", "--help"],
+        &["run", "--help"],
+        &["commands", "--help"],
+        &["plugin", "publish", "--help"],
+        &["perf", "--help"],
+        &["mcp", "--attach", "notaport", "--help"],
+        &["mcp", "--bogus", "--help"],
+    ] {
+        let out = bin().args(args).stdin(Stdio::null()).output().unwrap();
+        assert_eq!(out.status.code(), Some(0), "{args:?}: {}", String::from_utf8_lossy(&out.stderr));
+        let text = String::from_utf8_lossy(&out.stdout);
+        assert!(text.contains("USAGE") && text.contains("figcraft-cli mcp"), "{args:?}: {text}");
+        assert!(out.stderr.is_empty(), "{args:?}: nothing on stderr, got {}", String::from_utf8_lossy(&out.stderr));
+    }
+    // A value that happens to be `-h` is still a value, not a request for help.
+    let out = bin().args(["commands", "--filter", "--help"]).output().unwrap();
+    assert_eq!(out.status.code(), Some(0));
+    assert!(!String::from_utf8_lossy(&out.stdout).contains("USAGE"), "--filter took `--help` as its text");
+}
+
+#[test]
+fn run_export_info_convert() {
+    let d = tmp("run");
+    let script = d.join("s.jsonl");
+    std::fs::write(&script, "{\"command\":\"frame.create\",\"params\":{\"x\":0,\"y\":0,\"width\":100,\"height\":50,\"name\":\"A\",\"props\":{\"fill\":\"#ff0000\"}}}\n{\"command\":\"frame.create\",\"params\":{\"x\":200,\"y\":0,\"width\":30,\"height\":30,\"name\":\"B\"}}\n").unwrap();
+    let file = d.join("doc.figcraft");
+    let out = bin().arg("run").arg(&script).arg("--out").arg(&file).output().unwrap();
+    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+    let lines: Vec<serde_json::Value> = String::from_utf8_lossy(&out.stdout).lines().map(|l| serde_json::from_str(l).unwrap()).collect();
+    assert_eq!(lines.len(), 2);
+    assert!(lines.iter().all(|l| l["ok"] == true));
+
+    let info = bin().args(["info", "--json"]).arg(&file).output().unwrap();
+    let v: serde_json::Value = serde_json::from_slice(&info.stdout).unwrap();
+    assert_eq!(v["pages"][0]["frames"].as_array().unwrap().len(), 2);
+
+    let dir = d.join("png");
+    assert!(bin().arg("export").arg(&file).arg("-o").arg(&dir).args(["--scale", "2"]).status().unwrap().success());
+    let a = std::fs::read(dir.join("A.png")).unwrap();
+    assert_eq!(&a[16..24], &[0, 0, 0, 200, 0, 0, 0, 100]);
+    assert!(dir.join("B.png").exists());
+
+    let svg = d.join("b.svg");
+    assert!(bin().arg("export").arg(&file).arg("-o").arg(&svg).args(["--node", "B"]).status().unwrap().success());
+    assert!(std::fs::read_to_string(&svg).unwrap().contains("<svg"));
+
+    let json = d.join("doc.json");
+    assert!(bin().arg("convert").arg(&file).arg(&json).status().unwrap().success());
+    let png = d.join("doc.png");
+    assert!(bin().arg("convert").arg(&json).arg(&png).status().unwrap().success());
+    assert!(std::fs::read(&png).unwrap().starts_with(b"\x89PNG"));
+
+    // A failing step: nonzero exit, error line printed.
+    let bad = d.join("bad.json");
+    std::fs::write(&bad, r#"[{"command":"select.all"},{"command":"nope"}]"#).unwrap();
+    let out = bin().arg("run").arg(&bad).output().unwrap();
+    assert_eq!(out.status.code(), Some(1));
+    assert!(String::from_utf8_lossy(&out.stdout).contains("\"ok\":false"));
+    std::fs::remove_dir_all(&d).ok();
+}
+
+/// `export` into a folder names the files as the app's export does (#1154): brackets, `+`, `&`,
+/// `%`, `#` and commas stay, what file systems refuse becomes `_`.
+#[test]
+fn export_file_names_keep_what_the_app_keeps() {
+    let d = tmp("names");
+    let script = d.join("s.json");
+    let names = ["Homepage - desktop (live + verbeteringen)", "Q&A, 50% #1 [v2]", "a:b*c?d|e"];
+    let steps: Vec<serde_json::Value> = names
+        .iter()
+        .enumerate()
+        .map(|(i, n)| serde_json::json!({"command": "frame.create", "params": {"x": i * 200, "y": 0, "width": 20, "height": 20, "name": n}}))
+        .collect();
+    std::fs::write(&script, serde_json::to_string(&steps).unwrap()).unwrap();
+    let file = d.join("doc.figcraft");
+    assert!(bin().arg("run").arg(&script).arg("--out").arg(&file).output().unwrap().status.success());
+    let dir = d.join("out");
+    let out = bin().arg("export").arg(&file).arg("-o").arg(&dir).output().unwrap();
+    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+    for want in ["Homepage - desktop (live + verbeteringen).png", "Q&A, 50% #1 [v2].png", "a_b_c_d_e.png"] {
+        assert!(dir.join(want).is_file(), "{want} in {:?}", std::fs::read_dir(&dir).unwrap().flatten().map(|e| e.file_name()).collect::<Vec<_>>());
+    }
+    std::fs::remove_dir_all(&d).ok();
+}
+
+#[test]
+fn run_takes_the_documented_gradient_shorthand() {
+    // #252: only MCP used to accept it; `run` said "`fills` must be paints or colours".
+    let d = tmp("gradient");
+    let script = d.join("s.json");
+    std::fs::write(
+        &script,
+        r##"[{"command":"shape.rectangle","params":{"x":0,"y":0,"width":200,"height":100}},
+            {"command":"node.set","params":{"ids":[2],"fills":[{"type":"linearGradient","stops":["#ff0000","#0000ff"],"from":[0,0.5],"to":[1,0.5]}]}}]"##,
+    )
+    .unwrap();
+    let file = d.join("g.figcraft");
+    let out = bin().arg("run").arg(&script).arg("--out").arg(&file).output().unwrap();
+    assert!(out.status.success(), "{}{}", String::from_utf8_lossy(&out.stdout), String::from_utf8_lossy(&out.stderr));
+    let json = d.join("g.json");
+    assert!(bin().arg("convert").arg(&file).arg(&json).status().unwrap().success());
+    let doc = std::fs::read_to_string(&json).unwrap();
+    assert!(doc.contains("\"kind\":\"linear\"") || doc.contains("\"kind\": \"linear\""), "{doc}");
+    std::fs::remove_dir_all(&d).ok();
+}
+
+#[test]
+fn mcp_over_stdio() {
+    let mut child = bin().arg("mcp").stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::null()).spawn().unwrap();
+    {
+        let stdin = child.stdin.as_mut().unwrap();
+        writeln!(stdin, r#"{{"jsonrpc":"2.0","id":1,"method":"initialize","params":{{"protocolVersion":"2025-06-18"}}}}"#).unwrap();
+        writeln!(stdin, r#"{{"jsonrpc":"2.0","method":"notifications/initialized"}}"#).unwrap();
+        writeln!(stdin, "garbage").unwrap();
+        writeln!(stdin, r#"{{"jsonrpc":"2.0","id":2,"method":"tools/call","params":{{"name":"create_node","arguments":{{"type":"ellipse"}}}}}}"#)
+            .unwrap();
+    }
+    drop(child.stdin.take());
+    let out = child.wait_with_output().unwrap();
+    assert!(out.status.success());
+    let lines: Vec<serde_json::Value> = String::from_utf8_lossy(&out.stdout).lines().map(|l| serde_json::from_str(l).unwrap()).collect();
+    assert_eq!(lines.len(), 3);
+    assert_eq!(lines[0]["result"]["protocolVersion"], "2025-06-18");
+    assert_eq!(lines[1]["error"]["code"], -32700);
+    assert_eq!(lines[2]["result"]["isError"], false);
+}
+
+#[test]
+fn mcp_over_stdio_confined_to_automation_roots() {
+    let d = tmp("roots");
+    for sub in ["in", "out", "outside"] {
+        std::fs::create_dir_all(d.join(sub)).unwrap();
+    }
+    let p = |rel: &str| d.join(rel).to_string_lossy().into_owned();
+    // A root that isn't a folder stops the server before it serves.
+    let out = bin().args(["mcp", "--automation-read-root", &p("missing")]).output().unwrap();
+    assert_eq!(out.status.code(), Some(1));
+    assert!(String::from_utf8_lossy(&out.stderr).contains("--automation-read-root"));
+    let mut child = bin()
+        .args(["mcp", "--automation-read-root", &p("in"), "--automation-write-root", &p("out")])
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::null())
+        .spawn()
+        .unwrap();
+    {
+        let stdin = child.stdin.as_mut().unwrap();
+        let call = |id: u32, tool: &str, args: serde_json::Value| {
+            serde_json::json!({"jsonrpc": "2.0", "id": id, "method": "tools/call", "params": {"name": tool, "arguments": args}}).to_string()
+        };
+        writeln!(stdin, r#"{{"jsonrpc":"2.0","id":1,"method":"initialize","params":{{"protocolVersion":"2025-06-18"}}}}"#).unwrap();
+        writeln!(stdin, "{}", call(2, "create_node", serde_json::json!({"type": "ellipse"}))).unwrap();
+        writeln!(stdin, "{}", call(3, "save_file", serde_json::json!({"path": p("outside/a.figcraft")}))).unwrap();
+        writeln!(stdin, "{}", call(4, "save_file", serde_json::json!({"path": p("out/a.figcraft")}))).unwrap();
+        writeln!(stdin, "{}", call(5, "open_file", serde_json::json!({"path": p("outside/a.figcraft")}))).unwrap();
+        writeln!(stdin, "{}", call(6, "open_file", serde_json::json!({"path": p("out/a.figcraft")}))).unwrap();
+    }
+    drop(child.stdin.take());
+    let out = child.wait_with_output().unwrap();
+    assert!(out.status.success());
+    let lines: Vec<serde_json::Value> = String::from_utf8_lossy(&out.stdout).lines().map(|l| serde_json::from_str(l).unwrap()).collect();
+    assert_eq!(lines.len(), 6);
+    assert!(lines[0]["result"]["instructions"].as_str().unwrap().contains("only these folders may be read"));
+    let error = |i: usize| lines[i]["result"]["isError"] == true;
+    assert!(!error(1) && error(2) && !error(3) && error(4) && !error(5), "{lines:?}");
+    assert!(lines[2]["result"]["content"][0]["text"].as_str().unwrap().contains("automation path rejected"));
+    assert!(d.join("out/a.figcraft").is_file() && !d.join("outside/a.figcraft").exists());
+    let _ = std::fs::remove_dir_all(&d);
+}
+
+#[test]
+fn commands_json_lists_everything() {
+    let out = bin().args(["commands", "--json"]).output().unwrap();
+    let v: serde_json::Value = serde_json::from_slice(&out.stdout).unwrap();
+    assert!(v.as_array().unwrap().len() > 200);
+}
+
+/// The automation roots confine the file subcommands too, not just `mcp` (#833): a read outside a
+/// root, and a write outside a write root, are refused and leave no file behind. Without the flags
+/// the same commands behave as they always did.
+#[test]
+fn file_subcommands_are_confined_to_automation_roots() {
+    let d = tmp("file-roots");
+    let _ = std::fs::remove_dir_all(&d);
+    for sub in ["in", "out"] {
+        std::fs::create_dir_all(d.join(sub)).unwrap();
+    }
+    let p = |rel: &str| d.join(rel).to_string_lossy().into_owned();
+    let out_of = |o: &std::process::Output| String::from_utf8_lossy(&o.stderr).into_owned();
+
+    // A document to work on, made unconfined.
+    std::fs::write(d.join("in/make.json"), br#"[{"command":"shape.rectangle","params":{"x":0,"y":0,"width":40,"height":20}}]"#).unwrap();
+    let made = bin().args(["run", &p("in/make.json"), "--out", &p("in/doc.figcraft")]).output().unwrap();
+    assert!(made.status.success(), "{}", out_of(&made));
+
+    // Inside the roots: renders as usual.
+    let ok = bin()
+        .args(["render", &p("in/doc.figcraft"), "-o", &p("out/ok.png"), "--automation-read-root", &p("in"), "--automation-write-root", &p("out")])
+        .output()
+        .unwrap();
+    assert!(ok.status.success(), "{}", out_of(&ok));
+    assert!(d.join("out/ok.png").is_file());
+
+    // A write outside the write root is refused, and nothing is written.
+    let escaped = d.join("escaped.png");
+    let refused = bin()
+        .args([
+            "render",
+            &p("in/doc.figcraft"),
+            "-o",
+            &escaped.to_string_lossy(),
+            "--automation-read-root",
+            &p("in"),
+            "--automation-write-root",
+            &p("out"),
+        ])
+        .output()
+        .unwrap();
+    assert!(!refused.status.success());
+    assert!(out_of(&refused).contains("may be written"), "{}", out_of(&refused));
+    assert!(!escaped.exists(), "the refused render wrote a file anyway");
+
+    // No write root at all: writing is refused outright, reading still works.
+    let no_write = bin().args(["render", &p("in/doc.figcraft"), "-o", &p("out/no.png"), "--automation-read-root", &p("in")]).output().unwrap();
+    assert!(!no_write.status.success());
+    assert!(out_of(&no_write).contains("no folder may be written"), "{}", out_of(&no_write));
+
+    // A read outside every root is refused: `info` on the document with only `out` readable.
+    let read_refused = bin().args(["info", &p("in/doc.figcraft"), "--automation-read-root", &p("out")]).output().unwrap();
+    assert!(!read_refused.status.success());
+    assert!(out_of(&read_refused).contains("may be read"), "{}", out_of(&read_refused));
+
+    // `convert` and `run` take them as well, and a root that is not a folder is refused.
+    let missing = bin().args(["convert", &p("in/doc.figcraft"), &p("out/c.svg"), "--automation-read-root", &p("missing")]).output().unwrap();
+    assert!(!missing.status.success());
+    assert!(out_of(&missing).contains("automation-read-root"), "{}", out_of(&missing));
+
+    // Unconfined, the same render still writes wherever it is told.
+    let plain = bin().args(["render", &p("in/doc.figcraft"), "-o", &escaped.to_string_lossy()]).output().unwrap();
+    assert!(plain.status.success(), "{}", out_of(&plain));
+    assert!(escaped.is_file());
+    let _ = std::fs::remove_dir_all(&d);
+}
+
+/// An output path that is a symbolic link is written through, to its target, as `std::fs::write`
+/// always did. Routing the CLI's writes through `file_access` for #833 would otherwise have
+/// replaced the link with a regular file, because that write stages the bytes and renames them
+/// into place.
+#[cfg(unix)]
+#[test]
+fn an_unconfined_write_follows_a_symbolic_link() {
+    let d = tmp("symlink-out");
+    let _ = std::fs::remove_dir_all(&d);
+    std::fs::create_dir_all(d.join("real")).unwrap();
+    let p = |rel: &str| d.join(rel).to_string_lossy().into_owned();
+    std::fs::write(d.join("in.json"), br#"[{"command":"shape.rectangle","params":{"x":0,"y":0,"width":40,"height":20}}]"#).unwrap();
+    let made = bin().args(["run", &p("in.json"), "--out", &p("doc.figcraft")]).output().unwrap();
+    assert!(made.status.success(), "{}", String::from_utf8_lossy(&made.stderr));
+
+    let target = d.join("real/target.png");
+    std::fs::write(&target, b"placeholder").unwrap();
+    let link = d.join("link.png");
+    std::os::unix::fs::symlink(&target, &link).unwrap();
+
+    let out = bin().args(["render", &p("doc.figcraft"), "-o", &link.to_string_lossy()]).output().unwrap();
+    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+    assert!(std::fs::symlink_metadata(&link).unwrap().file_type().is_symlink(), "the link is still a link");
+    let written = std::fs::read(&target).unwrap();
+    assert!(written.starts_with(b"\x89PNG"), "the target holds the render, not the placeholder");
+    let _ = std::fs::remove_dir_all(&d);
+}
diff --git a/apps/figcraft-cli/tests/export_depth.rs b/apps/figcraft-cli/tests/it/export_depth.rs
similarity index 97%
rename from apps/figcraft-cli/tests/export_depth.rs
rename to apps/figcraft-cli/tests/it/export_depth.rs
index d8b3ef36..37350c1e 100644
--- a/apps/figcraft-cli/tests/export_depth.rs
+++ b/apps/figcraft-cli/tests/it/export_depth.rs
@@ -1,5 +1,4 @@
 //! Depth refusal through the actual CLI, including its exit status and destination writes.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use figcraft_doc::color::{Color, Paint};
 use figcraft_doc::{Document, NodeKind};
diff --git a/apps/figcraft-cli/tests/it/fonts.rs b/apps/figcraft-cli/tests/it/fonts.rs
new file mode 100644
index 00000000..998665c4
--- /dev/null
+++ b/apps/figcraft-cli/tests/it/fonts.rs
@@ -0,0 +1,94 @@
+//! Headless runs lay text out with the installed fonts, like the desktop app, unless
+//! `--no-system-fonts` or `FIGCRAFT_NO_SYSTEM_FONTS=1` opts out.
+
+use std::process::Command;
+
+use serde_json::{Value, json};
+
+/// The result of one `figcraft-cli run` step (script file `name`); `opt_out` sets the environment
+/// variable.
+fn run_one(name: &str, step: Value, args: &[&str], opt_out: bool) -> Value {
+    let d = std::env::temp_dir().join(format!("figcraft-cli-fonts-{}", std::process::id()));
+    std::fs::create_dir_all(&d).unwrap();
+    let script = d.join(format!("{name}.json"));
+    std::fs::write(&script, json!([step]).to_string()).unwrap();
+    let mut cmd = Command::new(env!("CARGO_BIN_EXE_figcraft-cli"));
+    cmd.arg("run").arg(&script).args(args);
+    if opt_out {
+        cmd.env("FIGCRAFT_NO_SYSTEM_FONTS", "1");
+    } else {
+        cmd.env_remove("FIGCRAFT_NO_SYSTEM_FONTS");
+    }
+    let out = cmd.output().unwrap();
+    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+    let line: Value = serde_json::from_slice(&out.stdout).unwrap();
+    line["result"].clone()
+}
+
+fn families(args: &[&str], opt_out: bool) -> Vec<String> {
+    serde_json::from_value(run_one("families", json!({"command": "text.fonts"}), args, opt_out)).unwrap()
+}
+
+#[test]
+fn headless_runs_resolve_installed_families_unless_opted_out() {
+    let built_in = families(&["--no-system-fonts"], false);
+    assert_eq!(families(&[], true), built_in, "FIGCRAFT_NO_SYSTEM_FONTS=1 opts out like the flag");
+    // Any family this machine adds (scanned here, in the test); none (CI): nothing to check.
+    figcraft_text::scan_system_fonts();
+    let Some(installed) = figcraft_text::family_names().into_iter().find(|f| !built_in.contains(f)) else {
+        eprintln!("skipped: no installed fonts beyond the built-in ones");
+        return;
+    };
+    assert!(families(&[], false).contains(&installed), "headless runs list {installed}");
+    let face = json!({"command": "text.fonts", "params": {"family": installed, "axes": true}});
+    assert_eq!(run_one("face", face.clone(), &[], false)["family"], json!(installed), "text uses the installed family");
+    assert_ne!(run_one("face", face, &["--no-system-fonts"], false)["family"], json!(installed), "opted out, it falls back");
+}
+
+#[test]
+fn info_lists_the_fonts_a_file_uses_that_are_missing() {
+    let d = std::env::temp_dir().join(format!("figcraft-cli-missing-{}", std::process::id()));
+    std::fs::create_dir_all(&d).unwrap();
+    let (script, file) = (d.join("make.json"), d.join("doc.figcraft"));
+    let text =
+        |family: &str| json!({"command": "text.create", "params": {"text": "Hamburgefonstiv", "x": 0, "y": 0, "props": {"fontFamily": family}}});
+    std::fs::write(&script, json!([text("FigCraft Missing CLI"), text("FigCraft Missing CLI")]).to_string()).unwrap();
+    let cli = || Command::new(env!("CARGO_BIN_EXE_figcraft-cli"));
+    let made = cli().arg("run").arg(&script).arg("--out").arg(&file).output().unwrap();
+    assert!(made.status.success(), "{}", String::from_utf8_lossy(&made.stderr));
+
+    let out = cli().arg("info").arg(&file).arg("--json").output().unwrap();
+    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+    let v: Value = serde_json::from_slice(&out.stdout).unwrap();
+    assert_eq!(v["missingFonts"], json!([{"family": "FigCraft Missing CLI", "layers": 2}]));
+
+    let out = cli().arg("info").arg(&file).output().unwrap();
+    let shown = String::from_utf8_lossy(&out.stdout);
+    assert!(shown.contains("missing font \"FigCraft Missing CLI\": 2 text layers"), "{shown}");
+}
+
+/// A synthetic `.sketch` file: one page with one Helvetica text.
+const SKETCH: &str = "UEsDBBQAAAAIAOFFVl2B8d55RwAAAFcAAAANAAAAZG9jdW1lbnQuanNvbqtWik/OSSwuVrJSUErJTy7NTc0rUdJRUCpITE8FCUZXIynwDfYK9vdzy8xJDUpNSy1KzUtOBamNL0pNA0mD9egHKNXG1gIAUEsDBBQAAAAIAOFFVl0B3thgPQAAAEkAAAAJAAAAbWV0YS5qc29uq1ZKLChQslJQSs7P1UvKz0jNzUzMS85PycxL1yvOTi1JzjBW0lEAKQpLLSrOzM8DqTUzAYmVwQUMjUxrAVBLAwQUAAAACADhRVZdo5nc2bkAAABnAQAADAAAAHBhZ2VzL1AuanNvbm1PQQrCMBD8StmzB1voxZsgUg+CUG8iJU3XNhITaVZtLf27SWylFEPIzgyzs5sOMi6ZMbAK4M5KhEUAhc50fkVOu42TD05T7IaeDB7JWqxd16mbJBA29CfhOE3w5FJ/WQeNfZdWaYf6EgVVFseOVCjKiiwL495SRlSL/EFYpBao0geYEUIiYGoatpOaMxJaDfkSVekHRHNvB/t0PZuw1Yp+mvfMWsZfJSifSIIzt4IRbyeGUW/P2d0PUEsBAhQDFAAAAAgA4UVWXYHx3nlHAAAAVwAAAA0AAAAAAAAAAAAAAIABAAAAAGRvY3VtZW50Lmpzb25QSwECFAMUAAAACADhRVZdAd7YYD0AAABJAAAACQAAAAAAAAAAAAAAgAFyAAAAbWV0YS5qc29uUEsBAhQDFAAAAAgA4UVWXaOZ3Nm5AAAAZwEAAAwAAAAAAAAAAAAAAIAB1gAAAHBhZ2VzL1AuanNvblBLBQYAAAAAAwADAKwAAAC5AQAAAAA=";
+
+/// Opening a `.sketch` file (whose import matches fonts against the installed ones) keeps to
+/// `--no-system-fonts` too: the run still knows only the built-in families.
+#[test]
+fn sketch_imports_keep_to_no_system_fonts() {
+    let d = std::env::temp_dir().join(format!("figcraft-cli-fonts-sketch-{}", std::process::id()));
+    std::fs::create_dir_all(&d).unwrap();
+    let script = d.join("open.json");
+    let steps = json!([{"command": "file.open", "params": {"data": SKETCH, "name": "x.sketch"}}, {"command": "text.fonts"}]);
+    std::fs::write(&script, steps.to_string()).unwrap();
+    let out = Command::new(env!("CARGO_BIN_EXE_figcraft-cli"))
+        .arg("run")
+        .arg(&script)
+        .arg("--no-system-fonts")
+        .env_remove("FIGCRAFT_NO_SYSTEM_FONTS")
+        .output()
+        .unwrap();
+    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+    let lines: Vec<Value> = String::from_utf8_lossy(&out.stdout).lines().map(|l| serde_json::from_str(l).unwrap()).collect();
+    assert_eq!(lines[0]["ok"], json!(true), "{lines:?}");
+    let fonts: Vec<String> = serde_json::from_value(lines[1]["result"].clone()).unwrap();
+    assert_eq!(fonts, families(&["--no-system-fonts"], false), "the import didn't scan the system fonts");
+}
diff --git a/apps/figcraft-cli/tests/it/main.rs b/apps/figcraft-cli/tests/it/main.rs
new file mode 100644
index 00000000..2e628773
--- /dev/null
+++ b/apps/figcraft-cli/tests/it/main.rs
@@ -0,0 +1,14 @@
+//! The crate's integration tests, built as one test binary.
+
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod cli;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod export_depth;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod fonts;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod pdf;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod pdf_print;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod vector_drawable;
diff --git a/apps/figcraft-cli/tests/pdf.rs b/apps/figcraft-cli/tests/it/pdf.rs
similarity index 97%
rename from apps/figcraft-cli/tests/pdf.rs
rename to apps/figcraft-cli/tests/it/pdf.rs
index 28d5ca6c..185d5b60 100644
--- a/apps/figcraft-cli/tests/pdf.rs
+++ b/apps/figcraft-cli/tests/it/pdf.rs
@@ -1,5 +1,4 @@
 //! `figcraft-cli export --format pdf` and `convert … .pdf` end to end.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use std::process::Command;
 
diff --git a/apps/figcraft-cli/tests/pdf_print.rs b/apps/figcraft-cli/tests/it/pdf_print.rs
similarity index 97%
rename from apps/figcraft-cli/tests/pdf_print.rs
rename to apps/figcraft-cli/tests/it/pdf_print.rs
index b2ce3c9a..f12725ed 100644
--- a/apps/figcraft-cli/tests/pdf_print.rs
+++ b/apps/figcraft-cli/tests/it/pdf_print.rs
@@ -1,5 +1,4 @@
 //! `figcraft-cli export` with PDF print options: bleed, marks, CMYK; bad lengths are usage errors.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use std::process::Command;
 
diff --git a/apps/figcraft-cli/tests/it/vector_drawable.rs b/apps/figcraft-cli/tests/it/vector_drawable.rs
new file mode 100644
index 00000000..b99c32cd
--- /dev/null
+++ b/apps/figcraft-cli/tests/it/vector_drawable.rs
@@ -0,0 +1,41 @@
+//! `figcraft-cli export … -o out.xml` (Android Vector Drawable) end to end.
+
+use std::process::Command;
+
+fn bin() -> Command {
+    Command::new(env!("CARGO_BIN_EXE_figcraft-cli"))
+}
+
+#[test]
+fn xml_export_writes_a_drawable_and_prints_its_notes() {
+    let d = std::env::temp_dir().join(format!("figcraft-cli-vd-{}", std::process::id()));
+    std::fs::create_dir_all(&d).unwrap();
+    let script = d.join("s.jsonl");
+    std::fs::write(
+        &script,
+        r##"{"command":"shape.rectangle","params":{"x":0,"y":0,"width":24,"height":24,"name":"Dot","props":{"fill":"#ff0000","effects":[{"type":"dropShadow"}]}}}"##,
+    )
+    .unwrap();
+    let file = d.join("doc.figcraft");
+    let out = bin().arg("run").arg(&script).arg("--out").arg(&file).output().unwrap();
+    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+
+    let xml = d.join("icon.xml");
+    let out = bin().arg("export").arg(&file).arg("-o").arg(&xml).output().unwrap();
+    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+    let text = std::fs::read_to_string(&xml).unwrap();
+    assert!(text.contains("<vector") && text.contains("android:fillColor=\"#FF0000\""), "{text}");
+    assert!(String::from_utf8_lossy(&out.stderr).contains("note: drop shadows were left out (Dot)"));
+
+    // --format xml into a folder; --vd-compat ignore prints nothing.
+    let dir = d.join("out");
+    let out = bin().arg("export").arg(&file).arg("-o").arg(&dir).args(["--format", "xml", "--vd-compat", "ignore"]).output().unwrap();
+    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+    assert!(dir.join("Dot.xml").exists());
+    assert!(!String::from_utf8_lossy(&out.stderr).contains("note:"));
+
+    let out = bin().arg("export").arg(&file).arg("-o").arg(&xml).args(["--vd-compat", "sloppy"]).output().unwrap();
+    assert!(!out.status.success());
+    assert!(String::from_utf8_lossy(&out.stderr).contains("--vd-compat"));
+    let _ = std::fs::remove_dir_all(&d);
+}
diff --git a/apps/figcraft-server/src/abuse.rs b/apps/figcraft-server/src/abuse.rs
index baf1882b..2ea939c3 100644
--- a/apps/figcraft-server/src/abuse.rs
+++ b/apps/figcraft-server/src/abuse.rs
@@ -120,15 +120,15 @@ impl Abuse {
         open
     }
 
-    /// `ip` tried a join code that was right (`ok`) or wrong: a right one forgives the wrong ones
-    /// before it; enough wrong ones in a row lock the address out.
+    /// `ip` tried a join code that was right (`ok`) or wrong: a right one doesn't forgive the wrong
+    /// ones before it (they only decay with time); enough wrong ones lock the address out.
     pub fn code_tried(&mut self, ip: IpAddr, ok: bool, now: Instant) {
         if !ok {
             self.wrong_codes.take(now);
         }
         for (k, times) in ip_blocks(ip) {
             let a = self.address(k, f64::from(times), now);
-            if ok || now.saturating_duration_since(a.wrong_at) > CODE_LOCKOUT {
+            if now.saturating_duration_since(a.wrong_at) > CODE_LOCKOUT {
                 a.wrong = 0;
             }
             if !ok {
diff --git a/apps/figcraft-server/src/cli_tests.rs b/apps/figcraft-server/src/cli_tests.rs
index 7b77f71e..7d6a6b9e 100644
--- a/apps/figcraft-server/src/cli_tests.rs
+++ b/apps/figcraft-server/src/cli_tests.rs
@@ -11,7 +11,7 @@ use crate::store::Store;
 use crate::test_util::{TempDir, config};
 
 fn args(s: &[&str]) -> Vec<String> {
-    s.iter().map(|a| a.to_string()).collect()
+    s.iter().map(ToString::to_string).collect()
 }
 
 fn run(dir: &std::path::Path, command: Command) -> Result<String, String> {
diff --git a/apps/figcraft-server/src/codes_tests.rs b/apps/figcraft-server/src/codes_tests.rs
index 6392e552..1e440a32 100644
--- a/apps/figcraft-server/src/codes_tests.rs
+++ b/apps/figcraft-server/src/codes_tests.rs
@@ -262,17 +262,21 @@ fn the_limits_on_codes_over_time() {
     let t0 = Instant::now();
     let me = ip("198.51.100.9");
     let mut abuse = Abuse::new(AbuseConfig { open: false, connects_per_minute: 30, publishes_per_hour: 10, messages_per_second: 200 });
-    // A right code forgives the wrong ones before it.
+    // A right code, even from a neighbour in the same /64, doesn't forgive the wrong ones.
+    let a = ip("2001:db8:1:2::1");
+    let b = ip("2001:db8:1:2::2");
     for _ in 0..WRONG_CODES - 1 {
+        abuse.code_tried(a, false, t0);
+    }
+    abuse.code_tried(b, true, t0);
+    abuse.code_tried(a, true, t0);
+    assert_eq!(abuse.code_locked(a, t0), None);
+    abuse.code_tried(a, false, t0);
+    assert_eq!(abuse.code_locked(a, t0), Some(CODE_LOCKOUT));
+    // Wrong codes: locked for the lockout, then free again.
+    for _ in 0..WRONG_CODES {
         abuse.code_tried(me, false, t0);
     }
-    abuse.code_tried(me, true, t0);
-    for _ in 0..WRONG_CODES - 1 {
-        abuse.code_tried(me, false, t0);
-    }
-    assert_eq!(abuse.code_locked(me, t0), None);
-    // One more: locked for the lockout, then free again.
-    abuse.code_tried(me, false, t0);
     assert_eq!(abuse.code_locked(me, t0), Some(CODE_LOCKOUT));
     assert!(abuse.code_locked(me, t0 + CODE_LOCKOUT - Duration::from_secs(1)).is_some());
     assert_eq!(abuse.code_locked(me, t0 + CODE_LOCKOUT), None);
diff --git a/apps/figcraft-server/src/config.rs b/apps/figcraft-server/src/config.rs
index bd587b76..d5f4f761 100644
--- a/apps/figcraft-server/src/config.rs
+++ b/apps/figcraft-server/src/config.rs
@@ -135,9 +135,23 @@ impl Config {
     /// abuse contact, or one whose clients would all count as its proxy).
     pub fn warnings(&self) -> Vec<String> {
         let mut out = Vec::new();
+        let client_max = NetLimits::default().max_server_message >> 20;
+        if usize::try_from(self.file_mb()).is_ok_and(|mb| mb >= client_max) {
+            out.push(format!(
+                "max_file_mb is {}: the app opens files of up to {} MiB, so a file that large can't be opened",
+                self.file_mb(),
+                client_max - 1
+            ));
+        }
         if !self.open_publish {
             return out;
         }
+        if self.file_mb() > 64 {
+            out.push(format!(
+                "open_publish is on with max_file_mb = {}: anyone may send messages that large, and the memory set aside for reading and queueing them grows to eight times it; keep it at 64 or less on a public server",
+                self.file_mb()
+            ));
+        }
         if self.operator_contact.trim().is_empty() {
             out.push("open_publish is on but operator_contact is empty: people can't reach you about abuse; set it (and terms_url)".into());
         }
@@ -168,7 +182,7 @@ impl Config {
             return Err("`idle_days` must be from 0 to 3650".into());
         }
         let terms = self.terms_url.trim();
-        if !terms.is_empty() && !(terms.starts_with("https://") || terms.starts_with("http://")) || terms.contains(char::is_whitespace) {
+        if !(terms.is_empty() || terms.starts_with("https://") || terms.starts_with("http://")) || terms.contains(char::is_whitespace) {
             return Err("`terms_url` must be a web address (https://…)".into());
         }
         if self.operator_contact.chars().count() > 120 || self.operator_contact.chars().any(char::is_control) || terms.len() > 500 {
@@ -253,8 +267,9 @@ impl Config {
         }
     }
 
-    /// Largest message a client may send when open to the public: a whole file (or plugin bundle)
-    /// and a margin, not the core's 64 MiB.
+    /// Largest message a client may send: a whole file (or plugin bundle) and a margin. Open to the
+    /// public this is also the cap (strangers' files stay small); a private server never goes below
+    /// the core's 64 MiB, and a `max_file_mb` above it raises the cap with it.
     fn open_message(&self) -> usize {
         usize::try_from(self.file_mb().max(self.max_plugin_mb).saturating_add(1).saturating_mul(1 << 20)).unwrap_or(usize::MAX)
     }
@@ -265,9 +280,9 @@ impl Config {
     fn core(&self) -> figcraft_collab::Limits {
         let base = figcraft_collab::Limits { max_peers: self.max_people, ..figcraft_collab::Limits::default() };
         if !self.open_publish {
-            return base;
+            return figcraft_collab::Limits { max_message_bytes: base.max_message_bytes.max(self.open_message()), ..base };
         }
-        let max = self.open_message().min(base.max_message_bytes);
+        let max = self.open_message();
         let file = usize::try_from(self.file_mb().saturating_mul(1 << 20)).unwrap_or(usize::MAX);
         figcraft_collab::Limits { max_message_bytes: max, max_log_bytes: (file / 4).max(256 << 10), ..base }
     }
@@ -279,21 +294,24 @@ impl Config {
     pub fn net(&self) -> NetLimits {
         let base = NetLimits { max_connections: self.max_connections, trusted_proxy: self.proxy().ok().flatten(), ..NetLimits::default() };
         if !self.open_publish {
-            return base;
+            let max = base.max_client_message.max(self.open_message());
+            return NetLimits { max_client_message: max, max_queued_bytes: base.max_queued_bytes.max(max.saturating_add(1 << 20)), ..base };
         }
-        let max = self.open_message().min(base.max_client_message);
+        let max = self.open_message();
         // Shared budgets: one block of addresses (an IPv4 address, an IPv6 /48) gets at most an
-        // eighth of each, and its biggest consumers are dropped first.
-        let (queued, reading) = (256usize << 20, 192usize << 20);
+        // eighth of each, and its biggest consumers are dropped first. Each still fits one whole
+        // message, or a file as large as `max_file_mb` could never arrive.
+        let one = max.saturating_add(1 << 20);
+        let (queued, reading) = ((256usize << 20).max(one.saturating_mul(8)), (192usize << 20).max(one.saturating_mul(8)));
         NetLimits {
             max_per_address: self.max_connections_per_ip,
             max_client_message: max,
-            max_queued_bytes: max.saturating_add(1 << 20),
+            max_queued_bytes: one,
             max_queued_block: queued / 8,
             max_queued_total: queued,
-            max_reading_block: max.saturating_add(1 << 20).min(reading / 8),
+            max_reading_block: one.min(reading / 8),
             max_reading_total: reading,
-            max_in_flight: 128 << 20,
+            max_in_flight: (128usize << 20).max(one),
             reserve_for_sessions: self.max_connections / 8,
             request_idle: std::time::Duration::from_secs(20),
             ..base
diff --git a/apps/figcraft-server/src/disk.rs b/apps/figcraft-server/src/disk.rs
index f58f25b2..312b4aea 100644
--- a/apps/figcraft-server/src/disk.rs
+++ b/apps/figcraft-server/src/disk.rs
@@ -8,9 +8,12 @@
 //!   length (u32 LE), CRC-32 (u32 LE), one [`Journal`] entry in the wire encoding.
 //!
 //! Compaction writes the next generation's snapshot, then an empty log of that generation. A log
-//! whose generation isn't the snapshot's is from before a compaction that was cut short: what it
-//! holds is in the snapshot already. A log ends at its first damaged record (a write cut short).
+//! whose generation isn't the snapshot's is usually from before a compaction that was cut short
+//! (what it holds is in the snapshot already), but no checksum covers either generation, so the
+//! store replays such a log anyway and reports any change the snapshot lacked. A log ends at its
+//! first damaged record (a write cut short).
 
+use std::ffi::OsStr;
 use std::fs::{self, File};
 use std::io::{self, Read, Write};
 use std::path::{Path, PathBuf};
@@ -47,7 +50,7 @@ pub fn free_bytes(path: &Path) -> Option<u64> {
 
 /// `path` with `.tmp` added: where its next version is written first.
 pub fn temp_of(path: &Path) -> PathBuf {
-    let mut name = path.file_name().map(|n| n.to_os_string()).unwrap_or_default();
+    let mut name = path.file_name().map(OsStr::to_os_string).unwrap_or_default();
     name.push(".tmp");
     path.with_file_name(name)
 }
@@ -125,13 +128,14 @@ fn u64_at(b: &[u8], at: usize) -> Option<u64> {
 
 /// A snapshot file's bytes.
 pub fn encode_snapshot(generation: u64, state: &SessionState) -> Result<Vec<u8>, String> {
-    let body = message::encode(state).map_err(|e| e.to_string())?;
-    let mut out = Vec::with_capacity(SNAP_HEADER + body.len());
+    let mut out = Vec::with_capacity(SNAP_HEADER);
     out.extend_from_slice(SNAP_MAGIC);
     out.push(FORMAT);
     out.extend_from_slice(&generation.to_le_bytes());
-    out.extend_from_slice(&crc(&body).to_le_bytes());
-    out.extend_from_slice(&body);
+    out.extend_from_slice(&0u32.to_le_bytes());
+    let mut out = message::encode_into(state, out).map_err(|e| e.to_string())?;
+    let sum = crc(&out[SNAP_HEADER..]);
+    out[SNAP_HEADER - 4..SNAP_HEADER].copy_from_slice(&sum.to_le_bytes());
     Ok(out)
 }
 
diff --git a/apps/figcraft-server/src/hardening_tests.rs b/apps/figcraft-server/src/hardening_tests.rs
index 086539ca..92b17710 100644
--- a/apps/figcraft-server/src/hardening_tests.rs
+++ b/apps/figcraft-server/src/hardening_tests.rs
@@ -838,3 +838,25 @@ fn a_library_publish_that_fails_keeps_serving_the_old_version() {
     assert_eq!(served(fetch(&mut store)), (2, v2));
     assert!(!files.join(crate::store::library_name(1)).exists(), "the old version is deleted");
 }
+
+#[test]
+fn a_library_publish_cannot_claim_the_highest_version() {
+    let dir = TempDir::new("libmax");
+    let mut store = Store::open(dir.path(), config(dir.path()).store()).unwrap();
+    let (file, ..) = store.publish("Library", &snapshot("Library")).unwrap();
+    let mut s = Session::new();
+    let f = s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 50, "height": 20, "name": "Button"})).unwrap()["id"].as_u64().unwrap();
+    s.execute("component.create", &json!({"ids": [f]})).unwrap();
+    s.execute("library.publish", &json!({})).unwrap();
+    let mut lib = s.doc().unwrap().published.clone().unwrap().as_ref().clone();
+    let mut archive = |version: u64| {
+        lib.manifest.version = version;
+        figcraft_engine::library_server::archive(&lib).unwrap()
+    };
+    let high = 1u64 << 32;
+    assert!(store.publish_library(&file.id, &archive(u64::MAX)).is_err(), "a first publish can't claim the highest version");
+    assert_eq!(store.publish_library(&file.id, &archive(high)).unwrap(), high, "the highest accepted first version goes in");
+    assert_eq!(store.publish_library(&file.id, &archive(high + 1)).unwrap(), high + 1, "and a newer one still follows it");
+    assert!(store.publish_library(&file.id, &archive(u64::MAX)).is_err(), "a jump to the highest version is refused");
+    assert_eq!(store.publish_library(&file.id, &archive(high + 2)).unwrap(), high + 2, "later versions still go in");
+}
diff --git a/apps/figcraft-server/src/public_tests.rs b/apps/figcraft-server/src/public_tests.rs
index fea2667e..dc86d123 100644
--- a/apps/figcraft-server/src/public_tests.rs
+++ b/apps/figcraft-server/src/public_tests.rs
@@ -164,6 +164,64 @@ fn caps_per_address_and_for_everyone() {
     assert_eq!(store.publish_open(ip("198.51.100.8"), "No", &snapshot("No")).unwrap_err(), KEY_ONLY);
 }
 
+#[test]
+fn caps_per_address_count_the_wider_ipv6_blocks() {
+    let dir = TempDir::new("block-caps");
+    let mut c = open(dir.path());
+    c.max_files_per_ip = 1;
+    c.publishes_per_hour = 1000;
+    let mut store = Store::open(dir.path(), c.store()).unwrap();
+    // A /48 keeps 4 times one address's files: /64s in different /56s of it.
+    for i in 0..4 {
+        store.publish_open(ip(&format!("2001:db8:1:{:x}::1", i << 8)), "One", &snapshot("One")).unwrap();
+    }
+    let e = store.publish_open(ip("2001:db8:1:400::1"), "Five", &snapshot("Five")).unwrap_err();
+    assert!(e.contains("files on this server already"), "{e}");
+    // A /56 keeps twice one address's files.
+    store.publish_open(ip("2001:db8:2:1::1"), "One", &snapshot("One")).unwrap();
+    store.publish_open(ip("2001:db8:2:2::1"), "Two", &snapshot("Two")).unwrap();
+    let e = store.publish_open(ip("2001:db8:2:3::1"), "Three", &snapshot("Three")).unwrap_err();
+    assert!(e.contains("files on this server already"), "{e}");
+    drop(store);
+    // Bytes: one address keeps one file's worth, so a /48 keeps 4 files.
+    let probe = TempDir::new("block-caps-probe");
+    let mut p = Store::open(probe.path(), open(probe.path()).store()).unwrap();
+    let size = p.publish_open(ip("203.0.113.1"), "One", &snapshot("One")).unwrap().0.bytes;
+    let dir = TempDir::new("block-caps-bytes");
+    let mut s = open(dir.path()).store();
+    s.hosting.max_files_per_ip = 100;
+    s.hosting.max_bytes_per_ip = size;
+    let mut store = Store::open(dir.path(), s).unwrap();
+    for i in 0..4 {
+        store.publish_open(ip(&format!("2001:db8:3:{:x}::1", i << 8)), "One", &snapshot("One")).unwrap();
+    }
+    let e = store.publish_open(ip("2001:db8:3:400::1"), "One", &snapshot("One")).unwrap_err();
+    assert!(e.contains("MiB it may keep"), "{e}");
+}
+
+#[test]
+fn edits_count_the_wider_ipv6_blocks_too() {
+    use figcraft_collab_net::hub::Backend;
+    let probe = TempDir::new("block-room-probe");
+    let mut p = Store::open(probe.path(), open(probe.path()).store()).unwrap();
+    let size = p.publish_open(ip("203.0.113.1"), "One", &snapshot("One")).unwrap().0.bytes;
+    let dir = TempDir::new("block-room");
+    let mut s = open(dir.path()).store();
+    s.hosting.max_files_per_ip = 100;
+    // One address keeps 2.25 files' worth, so its /56 keeps 4.5.
+    s.hosting.max_bytes_per_ip = size * 2 + size / 4;
+    let mut store = Store::open(dir.path(), s).unwrap();
+    let mut ids = Vec::new();
+    for i in 0..4 {
+        ids.push(store.publish_open(ip(&format!("2001:db8:4:{i:x}::1")), "One", &snapshot("One")).unwrap().0.id);
+    }
+    let server = Backend::open(&mut store, &ids[0]).unwrap();
+    // Its own /64 has room for this, but its /56 doesn't.
+    let e = Backend::room(&mut store, &ids[0], &server, (size * 3 / 4) as usize).unwrap_err();
+    assert!(e.contains("have reached their"), "{e}");
+    Backend::room(&mut store, &ids[0], &server, (size / 4) as usize).unwrap();
+}
+
 #[test]
 fn idle_files_published_without_the_key_expire() {
     let dir = TempDir::new("expiry");
@@ -196,6 +254,22 @@ fn idle_files_published_without_the_key_expire() {
     assert!(store.listing(&|_| None).iter().all(|r| r.info.id != fresh.id));
 }
 
+#[test]
+fn offline_commands_do_not_sweep_idle_files() {
+    let dir = TempDir::new("offline-sweep");
+    let mut c = open(dir.path());
+    c.idle_days = 30.0;
+    let mut store = Store::open(dir.path(), c.store()).unwrap();
+    let (public, ..) = store.publish_open(ip("203.0.113.9"), "Public", &snapshot("Public")).unwrap();
+    store.age(&public.id, 31 * 86_400);
+    drop(store);
+    let store = Store::try_open(dir.path(), c.store()).unwrap().unwrap();
+    drop(store);
+    assert!(dir.path().join("files").join(&public.id).exists(), "a command deleted an idle file");
+    let _serving = Store::open(dir.path(), c.store()).unwrap();
+    assert!(!dir.path().join("files").join(&public.id).exists());
+}
+
 #[test]
 fn rate_limits_and_blocks_refuse_with_a_reason() {
     let dir = TempDir::new("limits");
@@ -413,7 +487,7 @@ fn open_mode_has_safe_defaults_and_warns_the_operator() {
     assert_eq!(open.net().request_idle, Duration::from_secs(20), "idle one-shot requests go quickly");
     assert_eq!(open.net().reserve_for_sessions, 512 / 8);
     assert_eq!(open.net().max_client_message, 17 << 20);
-    assert_eq!(private.net().max_client_message, NetLimits::default().max_client_message, "unchanged when private");
+    assert_eq!(private.net().max_client_message, 65 << 20, "private: a 64 MiB file and a margin");
     let w = open.warnings().join("\n");
     assert!(w.contains("operator_contact is empty") && w.contains("trusted_proxy"), "{w}");
     let set = Config { operator_contact: "abuse@example.com".into(), trusted_proxy: Some("127.0.0.1".into()), max_file_mb: Some(8), ..open };
@@ -493,3 +567,34 @@ fn open_connections_never_reach_what_needs_the_key() {
     assert!(!format!("{info:?}").contains(&k));
     server.stop();
 }
+
+#[test]
+fn files_above_64_mib_fit_every_limit() {
+    // `max_file_mb` may go up to 4096: every cap a whole file's message meets on its way in must
+    // follow it, or the upload is dropped by the transport before the server can say why.
+    for open_publish in [false, true] {
+        let cfg = Config { open_publish, max_file_mb: Some(256), public_url: Some("wss://figcraft.example.com/".into()), ..Config::default() };
+        let (net, core, file) = (cfg.net(), cfg.store().core, 256usize << 20);
+        assert!(net.max_client_message > file, "open={open_publish}: {}", net.max_client_message);
+        assert!(net.max_queued_bytes > file && net.max_reading_block > file && net.max_in_flight > file, "open={open_publish}: {net:?}");
+        assert!(net.max_reading_total >= net.max_reading_block && net.max_queued_total >= net.max_queued_block);
+        assert!(core.max_message_bytes > file, "open={open_publish}: {}", core.max_message_bytes);
+    }
+    // A client takes such a file too, but caps what any server may make it buffer at 1 GiB.
+    assert_eq!(NetLimits::default().max_server_message, 1 << 30);
+}
+
+#[test]
+fn large_files_warn_the_operator() {
+    let public_url = Some("wss://figcraft.example.com/".into());
+    let warns = |open_publish, mb| {
+        Config { open_publish, max_file_mb: Some(mb), public_url: public_url.clone(), ..Config::default() }.warnings().join(
+            "
+",
+        )
+    };
+    assert!(!warns(true, 64).contains("max_file_mb"), "{}", warns(true, 64));
+    assert!(warns(true, 65).contains("open_publish is on with max_file_mb = 65"), "{}", warns(true, 65));
+    assert!(!warns(false, 1023).contains("max_file_mb"), "{}", warns(false, 1023));
+    assert!(warns(false, 1024).contains("can't be opened"), "{}", warns(false, 1024));
+}
diff --git a/apps/figcraft-server/src/server_tests.rs b/apps/figcraft-server/src/server_tests.rs
index 153bb5ab..f60150da 100644
--- a/apps/figcraft-server/src/server_tests.rs
+++ b/apps/figcraft-server/src/server_tests.rs
@@ -261,7 +261,9 @@ fn fuzzed_frames_dont_hurt_the_server() {
                 break;
             }
         }
-        let _ = ws.read();
+        // read() returns Result<Message>, not a lock guard; the fuzz loop ends here on purpose and
+        // the close frame from the server is not interesting.
+        let _ = ws.read(); // NOSONAR
     }
     // Still serving, the file intact.
     let mut b = join(&p.edit, "Bo");
diff --git a/apps/figcraft-server/src/store.rs b/apps/figcraft-server/src/store.rs
index 538adeff..90fce92b 100644
--- a/apps/figcraft-server/src/store.rs
+++ b/apps/figcraft-server/src/store.rs
@@ -42,7 +42,7 @@ use figcraft_collab::message::{
     PluginReply, PluginReq, ReportInfo, Usage,
 };
 use figcraft_collab::{Change, Replica, Server, same_secret};
-use figcraft_collab_net::hub::{Admission, Backend, Closing, Handled, OpenFile, ip_key};
+use figcraft_collab_net::hub::{Admission, Backend, Closing, Handled, OpenFile, ip_blocks, ip_key};
 use figcraft_collab_net::token;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
@@ -52,6 +52,14 @@ use crate::codes::{self, Sealed};
 use crate::directory::{Directory, DirectoryConfig};
 use crate::disk::{self, LIBRARY, LINKS, LOG, LOG_HEADER, META, SNAPSHOT, USAGE};
 
+mod backend;
+mod files;
+mod journal;
+mod library;
+mod links;
+
+pub use library::library_name;
+
 pub const LOCK: &str = "LOCK";
 pub const KEY: &str = "server.key";
 pub const FILES: &str = "files";
@@ -291,7 +299,18 @@ fn valid_id(s: &str) -> bool {
 
 /// A name others may see: trimmed, no control characters, at most 256 characters.
 fn clean_name(s: &str) -> String {
-    s.trim().chars().filter(|c| !c.is_control()).take(256).collect()
+    s.trim().chars().filter(|c| !c.is_control() && !is_bidi_control(*c)).take(256).collect()
+}
+
+/// A report's reason: trimmed, control and bidi characters turned into spaces, at most `MAX_REASON` characters.
+fn clean_reason(s: &str) -> String {
+    let s: String = s.chars().map(|c| if c.is_control() || is_bidi_control(c) { ' ' } else { c }).collect();
+    s.trim().chars().take(MAX_REASON).collect()
+}
+
+/// Bidirectional format characters, which could reorder what a terminal shows.
+fn is_bidi_control(c: char) -> bool {
+    matches!(c, '\u{61C}' | '\u{200E}' | '\u{200F}' | '\u{202A}'..='\u{202E}' | '\u{2066}'..='\u{2069}')
 }
 
 /// Take the data directory's lock: `None` when someone else holds it.
@@ -302,6 +321,10 @@ pub fn lock(root: &Path) -> Result<Option<File>, String> {
     #[cfg(unix)]
     std::os::unix::fs::DirBuilderExt::mode(&mut dirs, 0o700);
     dirs.create(root).map_err(|e| format!("can't create the data directory {}: {e}", root.display()))?;
+    // `DirBuilder` only applies the mode to directories it creates; tighten an existing one too.
+    #[cfg(unix)]
+    fs::set_permissions(root, std::os::unix::fs::PermissionsExt::from_mode(0o700))
+        .map_err(|e| format!("can't restrict the data directory {}: {e}", root.display()))?;
     let f = OpenOptions::new()
         .create(true)
         .truncate(false)
@@ -334,16 +357,27 @@ fn write_key(root: &Path) -> Result<String, String> {
     Ok(key)
 }
 
+/// The highest version a file's first library publish may claim. Publishing counts up by one (a
+/// library carried over from another server keeps its number), so no real history gets near it.
+/// Later publishes may go one past the version on the server, so there is always a next one.
+const MAX_FIRST_LIBRARY_VERSION: u64 = 1 << 32;
+
 impl Store {
     /// Use the data directory `root` (made if missing). Fails when another server or command holds
     /// it. Files that can't be read are skipped and listed in [`problems`](Self::problems).
     pub fn open(root: &Path, cfg: StoreConfig) -> Result<Store, String> {
-        Self::try_open(root, cfg)?.ok_or_else(|| format!("another figcraft-server (or a command) is using {}", root.display()))
+        let mut store = Self::try_open(root, cfg)?.ok_or_else(|| format!("another figcraft-server (or a command) is using {}", root.display()))?;
+        store.sweep();
+        Ok(store)
     }
 
-    /// [`open`](Self::open), or `None` when someone else holds the directory.
+    /// [`open`](Self::open) without the expiry sweep (for commands that only look or edit), or
+    /// `None` when someone else holds the directory.
     pub fn try_open(root: &Path, cfg: StoreConfig) -> Result<Option<Store>, String> {
         let Some(lock) = lock(root)? else { return Ok(None) };
+        for name in [KEY, BLOCKED, REPORTS] {
+            let _ = fs::remove_file(disk::temp_of(&root.join(name)));
+        }
         let key = load_key(root)?;
         let dir = root.join(FILES);
         fs::create_dir_all(&dir).map_err(|e| format!("can't create {}: {e}", dir.display()))?;
@@ -374,7 +408,6 @@ impl Store {
         store.scan(&dir);
         store.blocked = store.read_list::<String>(BLOCKED).iter().filter_map(|s| s.parse().ok()).map(ip_key).collect();
         store.reports = store.read_list(REPORTS);
-        store.sweep();
         Ok(Some(store))
     }
 
@@ -425,12 +458,20 @@ impl Store {
     /// A file folder's description and links, after checking its snapshot and log. Leftover
     /// temporary files (writes cut short) are removed.
     fn check(&self, path: &Path) -> Result<Entry, String> {
-        for name in [SNAPSHOT, LOG, META, LINKS] {
+        for name in [SNAPSHOT, LOG, META, LINKS, USAGE] {
             let tmp = disk::temp_of(&path.join(name));
             if tmp.exists() {
                 let _ = fs::remove_file(&tmp);
             }
         }
+        if let Ok(entries) = fs::read_dir(path) {
+            for e in entries.flatten() {
+                let name = e.file_name().to_string_lossy().into_owned();
+                if name.starts_with("library-") && name.ends_with(".bin.tmp") {
+                    let _ = fs::remove_file(e.path());
+                }
+            }
+        }
         let meta: Meta = serde_json::from_slice(&disk::read_capped(&path.join(META), 1 << 20)?).map_err(|e| format!("{META} is damaged ({e})"))?;
         let links: Vec<Link> =
             serde_json::from_slice(&disk::read_capped(&path.join(LINKS), 16 << 20)?).map_err(|e| format!("{LINKS} is damaged ({e})"))?;
@@ -440,7 +481,7 @@ impl Store {
             && let Ok(log) = disk::read_log(&bytes)
             && log.generation != generation
         {
-            log::info!("file at {}: its log predates the last compaction; it is ignored", path.display());
+            log::info!("file at {}: its log isn't of its snapshot's generation; it is replayed over it when the file opens", path.display());
         }
         let bytes = [SNAPSHOT, LOG].iter().filter_map(|n| fs::metadata(path.join(n)).ok()).map(|m| m.len()).sum();
         Ok(Entry { meta, links, log: None, bytes, forced: 0 })
@@ -508,758 +549,6 @@ impl Store {
             people: open.map_or(0, |o| o.people),
         }
     }
-
-    /// Keep a document (its snapshot) as a new file with an edit link and a view link.
-    pub fn publish(&mut self, name: &str, snapshot: &[Change]) -> Result<(FileInfo, NewLink, NewLink), String> {
-        self.keep(name, snapshot, None, &|_| Ok(())).map(|(info, edit, view, _)| (info, edit, view))
-    }
-
-    /// Keep a document published without the key from `ip`, within the caps on what one address
-    /// and everyone may keep: the file, its links and its owner token.
-    pub fn publish_open(&mut self, ip: IpAddr, name: &str, snapshot: &[Change]) -> Result<(FileInfo, NewLink, NewLink, String), String> {
-        let h = &self.cfg.hosting;
-        let (open, max_files, max_ip, max_all) = (h.open, h.max_files_per_ip, h.max_bytes_per_ip, h.max_total_bytes);
-        if !open {
-            return Err(KEY_ONLY.into());
-        }
-        if !self.abuse.allow(ip, Action::Publish, Instant::now()) {
-            return Err("too many files published from your address lately: try again in an hour".into());
-        }
-        let ip_text = ip.to_string();
-        let mine: Vec<&String> = self.files.iter().filter(|(_, e)| e.meta.ip.as_deref() == Some(ip_text.as_str())).map(|(id, _)| id).collect();
-        if mine.len() >= max_files {
-            return Err(format!(
-                "your address keeps {} files on this server already, the most it may: remove one (with its owner token) or wait until one expires",
-                mine.len()
-            ));
-        }
-        let used_ip: u64 = mine.iter().map(|id| self.bytes(id)).sum();
-        let used_all: u64 = self.files.keys().map(|id| self.bytes(id)).sum();
-        let fits = |n: u64| {
-            if used_ip.saturating_add(n) > max_ip {
-                return Err(format!("your address's files would take more than the {} MiB it may keep here: remove one first", max_ip >> 20));
-            }
-            if used_all.saturating_add(n) > max_all {
-                return Err("this server is full: it takes no more files for now (try again later, or another server)".into());
-            }
-            Ok(())
-        };
-        let (info, edit, view, owner) = self.keep(name, snapshot, Some(ip), &fits)?;
-        Ok((info, edit, view, owner.unwrap_or_default()))
-    }
-
-    /// Keep a document as a new file: published without the key from `ip` (it gets an owner
-    /// token), else by the operator. `fits` checks its size against the caps that apply.
-    fn keep(
-        &mut self,
-        name: &str,
-        snapshot: &[Change],
-        ip: Option<IpAddr>,
-        fits: &dyn Fn(u64) -> Result<(), String>,
-    ) -> Result<(FileInfo, NewLink, NewLink, Option<String>), String> {
-        if self.files.len() >= self.cfg.max_files {
-            return Err(format!("the server keeps at most {} files", self.cfg.max_files));
-        }
-        if let Some(why) = self.low_disk() {
-            return Err(why);
-        }
-        let replica = Replica::from_snapshot(snapshot).map_err(|e| format!("the file couldn't be read: {e}"))?;
-        if replica.document().node_count() > self.cfg.core.max_nodes {
-            return Err(format!("the file has more than {} layers", self.cfg.core.max_nodes));
-        }
-        let mut doc = replica.document().clone();
-        let name = match clean_name(name) {
-            n if n.is_empty() => doc.name.clone(),
-            n => n,
-        };
-        doc.name = name.clone();
-        let server = Server::new(doc, "", self.cfg.core);
-        let state = server.state().map_err(|e| e.to_string())?;
-        let bytes = disk::encode_snapshot(1, &state)?;
-        if bytes.len() as u64 > self.cfg.max_file_bytes {
-            return Err(format!("the file is {} MiB; this server keeps files up to {} MiB", bytes.len() >> 20, self.cfg.max_file_bytes >> 20));
-        }
-        fits(bytes.len() as u64)?;
-        let id = loop {
-            let id = token::file_id()?;
-            if !self.files.contains_key(&id) && !self.dir(&id).exists() {
-                break id;
-            }
-        };
-        let t = now();
-        let (edit, edit_token) = new_link(Access::Edit, "Published (edit)", t)?;
-        let (view, view_token) = new_link(Access::View, "Published (view)", t)?;
-        let owner = ip.map(|_| token::secret()).transpose()?;
-        let meta =
-            Meta { name, created: t, updated: t, seq: 0, library: None, owner: owner.as_deref().map(hash), ip: ip.map(|i| i.to_string()), opened: 0 };
-        let dir = self.dir(&id);
-        let written = fs::create_dir_all(&dir)
-            .map_err(|e| e.to_string())
-            .and_then(|()| disk::write_atomic(&dir.join(SNAPSHOT), &bytes).map_err(|e| e.to_string()))
-            .and_then(|()| disk::write_atomic(&dir.join(LOG), &disk::log_header(1)).map_err(|e| e.to_string()))
-            .and_then(|()| write_json(&dir.join(LINKS), &[edit.clone(), view.clone()]))
-            // Last: a folder without its description is an upload cut short.
-            .and_then(|()| write_json(&dir.join(META), &meta));
-        if let Err(e) = written {
-            let _ = fs::remove_dir_all(&dir);
-            return Err(format!("couldn't keep the file: {e}"));
-        }
-        let entry = Entry { meta, links: vec![edit.clone(), view.clone()], log: None, bytes: (bytes.len() + LOG_HEADER) as u64, forced: 0 };
-        self.files.insert(id.clone(), entry);
-        let info = self.files.get(&id).map(|e| self.info(&id, e, None)).ok_or("the file vanished")?;
-        match ip {
-            Some(ip) => log::info!("event=published file={id} bytes={} ip={ip} by=public", bytes.len()),
-            None => log::info!("event=published file={id} bytes={} by=key", bytes.len()),
-        }
-        Ok((info, NewLink { link: edit.info(&id), token: edit_token }, NewLink { link: view.info(&id), token: view_token }, owner))
-    }
-
-    /// The files kept, with what the operator moderates by.
-    pub fn listing(&self, open: &dyn Fn(&str) -> Option<OpenFile>) -> Vec<FileRow> {
-        self.files
-            .iter()
-            .map(|(id, e)| FileRow {
-                info: self.info(id, e, open(id)),
-                opened: e.meta.opened,
-                expires: self.expires(&e.meta),
-                open: e.meta.owner.is_some(),
-                ip: e.meta.ip.clone().unwrap_or_default(),
-                reports: u32::try_from(self.reports.iter().filter(|r| r.file == *id).count()).unwrap_or(u32::MAX),
-            })
-            .collect()
-    }
-
-    /// Owner token `owner` manages file `file` (one published without the key).
-    fn owns(&self, file: &str, owner: &str) -> bool {
-        let presented = hash(owner);
-        self.files.get(file).and_then(|e| e.meta.owner.as_deref()).is_some_and(|h| same_secret(&presented, h))
-    }
-
-    /// What became of the files these `(file id, owner token)` pairs own: each one's name, links
-    /// and expiry, or `None` when that token manages no file of that id here (which doesn't say
-    /// whether the id exists). Asking opens nothing: it doesn't count as using a file.
-    pub fn owned(&self, files: &[(String, String)]) -> AdminReply {
-        if files.len() > MAX_OWNED {
-            return AdminReply::Failed { reason: format!("ask about at most {MAX_OWNED} files at a time") };
-        }
-        let one = |(file, owner): &(String, String)| {
-            let e = self.files.get(file).filter(|_| self.owns(file, owner))?;
-            Some(OwnedFile { name: e.meta.name.clone(), links: e.links.iter().map(|l| l.id.clone()).collect(), expires: self.expires(&e.meta) })
-        };
-        AdminReply::Owned(files.iter().map(one).collect())
-    }
-
-    /// Rename a file (its listing; the document inside keeps its own name).
-    pub fn rename(&mut self, file: &str, name: &str) -> Result<(), String> {
-        let name = clean_name(name);
-        if name.is_empty() {
-            return Err("give the file a name".into());
-        }
-        let path = self.dir(file).join(META);
-        let entry = self.entry(file)?;
-        let before = std::mem::replace(&mut entry.meta.name, name);
-        if let Err(e) = write_json(&path, &entry.meta) {
-            entry.meta.name = before;
-            return Err(format!("couldn't rename the file: {e}"));
-        }
-        Ok(())
-    }
-
-    /// Delete the files published without the key that nobody opened for the idle time (not
-    /// those open now); their ids.
-    pub fn sweep(&mut self) -> Vec<String> {
-        let t = now();
-        self.next_sweep = t.saturating_add(SWEEP_EVERY);
-        let due: Vec<String> =
-            self.files.iter().filter(|(_, e)| e.log.is_none() && self.expires(&e.meta).is_some_and(|x| x <= t)).map(|(id, _)| id.clone()).collect();
-        for id in &due {
-            match self.remove(id) {
-                Ok(()) => log::info!("event=expired file={id}"),
-                Err(e) => log::warn!("event=expire_failed file={id} reason={e:?}"),
-            }
-        }
-        due
-    }
-
-    /// Make a file look unused for `secs` more (tests: expiry without waiting).
-    #[cfg(test)]
-    pub fn age(&mut self, file: &str, secs: u64) {
-        let path = self.dir(file).join(META);
-        if let Some(e) = self.files.get_mut(file) {
-            let m = &mut e.meta;
-            (m.created, m.updated, m.opened) = (m.created.saturating_sub(secs), m.updated.saturating_sub(secs), m.opened.saturating_sub(secs));
-            let _ = write_json(&path, m);
-        }
-    }
-
-    /// Make an open file's log refuse writes (tests: a full or failing disk).
-    #[cfg(test)]
-    pub fn break_log(&mut self, file: &str) {
-        let path = self.dir(file).join(LOG);
-        if let Some(log) = self.files.get_mut(file).and_then(|e| e.log.as_mut())
-            && let Ok(f) = File::open(path)
-        {
-            log.file = f;
-        }
-    }
-
-    /// Note that a file was opened now (it is used: it doesn't expire).
-    fn touch(&mut self, file: &str) {
-        let path = self.dir(file).join(META);
-        if let Some(e) = self.files.get_mut(file) {
-            e.meta.opened = now();
-            if let Err(err) = write_json(&path, &e.meta) {
-                log::warn!("file {file}: couldn't update {META}: {err}");
-            }
-        }
-    }
-
-    /// What the server says about its hosting (with `file`'s expiry).
-    fn host_info(&self, file: Option<&str>) -> HostInfo {
-        let h = &self.cfg.hosting;
-        let expires = file.and_then(|f| self.files.get(f)).and_then(|e| self.expires(&e.meta));
-        HostInfo { open: h.open, operator: h.operator.clone(), terms: h.terms.clone(), idle_secs: h.idle_secs, max_file_mb: h.max_file_mb, expires }
-    }
-
-    /// Block or unblock an address (an IPv6 address: its /64); the address as kept.
-    pub fn block(&mut self, ip: &str, on: bool) -> Result<IpAddr, String> {
-        let ip = ip_key(ip.trim().parse::<IpAddr>().map_err(|_| format!("`{}` isn't an IP address", ip.trim()))?);
-        if on && !self.blocked.contains(&ip) && self.blocked.len() >= MAX_BLOCKED {
-            return Err(format!("at most {MAX_BLOCKED} addresses can be blocked"));
-        }
-        let changed = if on { self.blocked.insert(ip) } else { self.blocked.remove(&ip) };
-        if changed {
-            let list: Vec<String> = self.blocked.iter().map(IpAddr::to_string).collect();
-            write_json(&self.root.join(BLOCKED), &list).map_err(|e| format!("couldn't keep the blocked addresses: {e}"))?;
-            log::info!("event={} ip={ip}", if on { "blocked" } else { "unblocked" });
-        }
-        Ok(ip)
-    }
-
-    /// The blocked addresses.
-    pub fn blocked(&self) -> Vec<String> {
-        self.blocked.iter().map(IpAddr::to_string).collect()
-    }
-
-    /// The reports kept, oldest first.
-    pub fn reports(&self) -> &[ReportInfo] {
-        &self.reports
-    }
-
-    /// Keep a report about `file` (from someone who joined it with `link`, at `ip`).
-    pub fn keep_report(&mut self, file: &str, link: Option<&str>, ip: IpAddr, reason: &str) -> Result<(), String> {
-        let reason: String = reason.trim().chars().map(|c| if c.is_control() { ' ' } else { c }).take(MAX_REASON).collect();
-        if reason.is_empty() {
-            return Err("say what is wrong with the file".into());
-        }
-        let name = self.entry(file)?.meta.name.clone();
-        if !self.abuse.allow(ip, Action::Report, Instant::now()) {
-            return Err("too many reports from your address lately: try again in an hour".into());
-        }
-        self.reports.push(ReportInfo {
-            at: now(),
-            file: file.to_string(),
-            name,
-            link: link.unwrap_or_default().to_string(),
-            ip: ip.to_string(),
-            reason,
-        });
-        if self.reports.len() > MAX_REPORTS {
-            let extra = self.reports.len() - MAX_REPORTS;
-            self.reports.drain(..extra);
-        }
-        write_json(&self.root.join(REPORTS), &self.reports).map_err(|e| format!("couldn't keep the report: {e}"))?;
-        log::info!("event=report file={file} ip={ip}");
-        Ok(())
-    }
-
-    /// The files kept.
-    pub fn list(&self, open: &dyn Fn(&str) -> Option<OpenFile>) -> Vec<FileInfo> {
-        self.files.iter().map(|(id, e)| self.info(id, e, open(id))).collect()
-    }
-
-    /// A file's links.
-    pub fn links(&mut self, file: &str) -> Result<Vec<LinkInfo>, String> {
-        Ok(self.entry(file)?.links.iter().map(|l| l.info(file)).collect())
-    }
-
-    /// A new link to a file.
-    pub fn create_link(&mut self, file: &str, access: Access, label: &str) -> Result<NewLink, String> {
-        let max = self.cfg.max_links;
-        let path = self.dir(file).join(LINKS);
-        let entry = self.entry(file)?;
-        if entry.links.len() >= max {
-            return Err(format!("a file has at most {max} links: revoke one first"));
-        }
-        let (link, token) = new_link(access, &clean_name(label), now())?;
-        entry.links.push(link.clone());
-        if let Err(e) = write_json(&path, &entry.links) {
-            entry.links.pop();
-            return Err(format!("couldn't keep the link: {e}"));
-        }
-        Ok(NewLink { link: link.info(file), token })
-    }
-
-    /// The link of `entry` whose token `token` is (every link is compared, in constant time, so
-    /// timing doesn't tell which one matched).
-    fn link_of(entry: &Entry, token: &str) -> Option<usize> {
-        let presented = hash(token);
-        let mut found = None;
-        for (i, l) in entry.links.iter().enumerate() {
-            if same_secret(&presented, &l.hash) {
-                found = Some(i);
-            }
-        }
-        found
-    }
-
-    /// These join codes no longer open anything: typing one says so.
-    fn forget_codes(&mut self, codes: impl IntoIterator<Item = Sealed>) {
-        self.gone_codes.extend(codes.into_iter().map(|c| c.hash));
-        let extra = self.gone_codes.len().saturating_sub(MAX_GONE_CODES);
-        self.gone_codes.drain(..extra);
-    }
-
-    /// Where the link with the join code `key` is: its file, its place among the file's links
-    /// and its token (every code is compared, so timing doesn't tell which one matched).
-    fn find_code(&self, key: &codes::Key) -> Option<(String, usize, String)> {
-        let mut found = None;
-        for (id, e) in &self.files {
-            for (i, l) in e.links.iter().enumerate() {
-                if let Some(token) = l.code.as_ref().and_then(|c| key.open(c)) {
-                    found = Some((id.clone(), i, token));
-                }
-            }
-        }
-        found
-    }
-
-    /// A new join code for the link of `file` whose token is `token` (it takes the place of the
-    /// link's earlier code): the code, shown this once.
-    pub fn set_code(&mut self, file: &str, token: &str) -> Result<String, String> {
-        let at = Self::link_of(self.entry(file)?, token).ok_or("that token isn't one of this file's links (it may have been revoked)")?;
-        // 45 random bits: one already in use is all but impossible, and never handed out twice.
-        let (code, key) = loop {
-            let code = codes::new_code()?;
-            let key = codes::Key::new(&code);
-            if self.find_code(&key).is_none() {
-                break (code, key);
-            }
-        };
-        let sealed = key.seal(token)?;
-        let path = self.dir(file).join(LINKS);
-        let entry = self.entry(file)?;
-        let link = entry.links.get_mut(at).ok_or("that file has no such link")?;
-        let before = link.code.replace(sealed);
-        let id = link.id.clone();
-        if let Err(e) = write_json(&path, &entry.links) {
-            if let Some(l) = entry.links.get_mut(at) {
-                l.code = before;
-            }
-            return Err(format!("couldn't keep the join code: {e}"));
-        }
-        self.forget_codes(before);
-        log::info!("event=code file={file} link={id}");
-        Ok(code)
-    }
-
-    /// The file a join code typed at `ip` opens, and its link's token; wrong codes count against
-    /// the address (see `abuse`), and nothing is looked up for an address that is locked out.
-    pub fn resolve_code(&mut self, ip: IpAddr, typed: &str) -> Result<(String, String), String> {
-        let now = Instant::now();
-        if let Some(left) = self.abuse.code_locked(ip, now) {
-            return Err(format!(
-                "Too many wrong codes from your address: try again in {} minutes, or join with the invite link",
-                left.as_secs() / 60 + 1
-            ));
-        }
-        if !self.abuse.allow(ip, Action::Code, now) {
-            return Err("Too many codes tried from your address: wait a minute and try again".into());
-        }
-        if !self.abuse.codes_open(now) {
-            return Err(CODES_BUSY.into());
-        }
-        // Anything that isn't a code's symbols is a wrong code too (and costs no hashing).
-        let key = figcraft_collab::code::normalize(typed).ok().filter(|c| c.len() == figcraft_collab::code::ONLINE_LEN).map(|c| codes::Key::new(&c));
-        let found = key.as_ref().and_then(|k| self.find_code(k));
-        self.abuse.code_tried(ip, found.is_some(), now);
-        match found {
-            Some((file, _, token)) => {
-                log::info!("event=code_used file={file} ip={ip}");
-                Ok((file, token))
-            }
-            None => {
-                let gone = key.is_some_and(|k| self.gone_codes.iter().any(|g| g == k.hash()));
-                Err(if gone { CODE_GONE } else { NO_CODE }.into())
-            }
-        }
-    }
-
-    /// Revoke a link.
-    pub fn revoke(&mut self, file: &str, link: &str) -> Result<(), String> {
-        let path = self.dir(file).join(LINKS);
-        let entry = self.entry(file)?;
-        let at = entry.links.iter().position(|l| l.id == link).ok_or("that file has no such link")?;
-        let gone = entry.links.remove(at);
-        if let Err(e) = write_json(&path, &entry.links) {
-            entry.links.insert(at, gone);
-            return Err(format!("couldn't revoke the link: {e}"));
-        }
-        log::info!("revoked link {link} of file {file}");
-        self.forget_codes(gone.code);
-        Ok(())
-    }
-
-    /// Remove a file and its links for good. `Err` when its folder couldn't be deleted (it is no
-    /// longer served either way).
-    pub fn remove(&mut self, file: &str) -> Result<(), String> {
-        // Closed first: an open log would keep the folder from being deleted on Windows.
-        let entry = self.files.remove(file).ok_or("this file isn't on the server (it may have been removed)")?;
-        self.forget_codes(entry.links.iter().filter_map(|l| l.code.clone()));
-        drop(entry);
-        let dir = self.dir(file);
-        fs::remove_dir_all(&dir)
-            .map_err(|e| format!("it is no longer served, but its folder {} couldn't be deleted ({e}); delete it by hand", dir.display()))?;
-        log::info!("removed file {file}");
-        Ok(())
-    }
-
-    /// A file's team library for `ip`, unless its version is `have`; within what one address and
-    /// everyone may download (the size is known before anything is read).
-    fn fetch_library(&mut self, ip: IpAddr, file: &str, have: Option<u64>) -> Result<LibraryReply, String> {
-        let (dir, max) = (self.dir(file), self.cfg.max_file_bytes);
-        let Some(lib) = self.entry(file)?.meta.library.clone() else { return Ok(LibraryReply::Empty) };
-        if have == Some(lib.version) {
-            return Ok(LibraryReply::Unchanged { version: lib.version });
-        }
-        let path = library_file(&dir, lib.version);
-        let size = fs::metadata(&path).map_or(0, |m| m.len());
-        let now = Instant::now();
-        if !self.abuse.allow(ip, Action::Download(usize::try_from(size).unwrap_or(usize::MAX)), now) || !self.served.take_n(now, size as f64) {
-            return Err(BUSY_DOWNLOADS.into());
-        }
-        Ok(LibraryReply::Library { version: lib.version, archive: disk::read_capped(&path, max)? })
-    }
-
-    /// Keep `archive` as a file's team library: it must read as a library (with the limits files
-    /// using it read it with), be the file's library if it has one, and be a newer version.
-    // shortcut: the archive is checked on the hub thread (other files' sessions wait meanwhile);
-    // move it to a worker if large libraries make that noticeable.
-    pub fn publish_library(&mut self, file: &str, archive: &[u8]) -> Result<u64, String> {
-        let max = self.cfg.max_file_bytes;
-        if self.cfg.hosting.open && self.entry(file)?.meta.owner.is_some() {
-            return Err(NO_PUBLIC_LIBRARY.into());
-        }
-        if archive.len() as u64 > max {
-            return Err(format!("the library is {} MiB; this server keeps files up to {} MiB", archive.len() >> 20, max >> 20));
-        }
-        // Everything it unpacks to counts against the same cap, so a small archive can't expand
-        // into a large library in memory.
-        let lib = match figcraft_format::read_library_within(Cursor::new(archive), max) {
-            Ok(Some(lib)) => lib,
-            Ok(None) => return Err("that isn't a published library".into()),
-            Err(e) => return Err(format!("the library can't be read: {e}")),
-        };
-        if lib.doc.node_count() > self.cfg.core.max_nodes {
-            return Err(format!("the library has more than {} layers", self.cfg.core.max_nodes));
-        }
-        let m = &lib.manifest;
-        let dir = self.dir(file);
-        let entry = self.entry(file)?;
-        if let Some(old) = &entry.meta.library {
-            if old.id != m.id {
-                return Err(format!("this file's library on the server is another one (\"{}\")", old.name));
-            }
-            if m.version <= old.version {
-                return Err(format!("version {} is on the server already: publish again to follow it", old.version));
-            }
-        }
-        // Each version has a file of its own, written before the description names it: a failed
-        // description write or a crash in between leaves the previous version served whole, never
-        // the new bytes under the old number.
-        let path = dir.join(library_name(m.version));
-        disk::write_atomic(&path, archive).map_err(|e| format!("couldn't keep the library: {e}"))?;
-        let before = entry.meta.library.replace(LibraryMeta { id: m.id.clone(), name: m.name.clone(), version: m.version });
-        if let Err(e) = write_json(&dir.join(META), &entry.meta) {
-            // Never served (the description doesn't name it); the next publish of it replaces it.
-            if let Err(r) = fs::remove_file(&path) {
-                log::warn!("file {file}: an unpublished library version couldn't be deleted: {r}");
-            }
-            entry.meta.library = before;
-            return Err(format!("couldn't keep the library: {e}"));
-        }
-        // The previous version isn't served any more.
-        if let Some(Err(e)) = before.map(|old| fs::remove_file(library_file(&dir, old.version))) {
-            log::warn!("file {file}: the previous library version couldn't be deleted: {e}");
-        }
-        log::info!("file {file}: published library version {} ({} bytes)", m.version, archive.len());
-        Ok(m.version)
-    }
-
-    /// A library's usage reports in memory (read from disk the first time; a damaged list starts
-    /// over: it is only statistics). `None` when the file has no library.
-    fn usage_of(&mut self, file: &str) -> Result<Option<&mut UsageCache>, String> {
-        if self.entry(file)?.meta.library.is_none() {
-            return Ok(None);
-        }
-        if !self.usage.contains_key(file) {
-            let path = self.dir(file).join(USAGE);
-            let list = if path.exists() {
-                disk::read_capped(&path, MAX_USAGE_FILE).ok().and_then(|b| serde_json::from_slice(&b).ok()).unwrap_or_default()
-            } else {
-                Vec::new()
-            };
-            self.usage.insert(file.to_string(), UsageCache { list, dirty: false, written: now() });
-        }
-        Ok(self.usage.get_mut(file))
-    }
-
-    /// The usage reports kept for a file's library (none when it has no library).
-    pub fn library_usage(&mut self, file: &str) -> Result<Vec<FileUsage>, String> {
-        Ok(self.usage_of(file)?.map(|u| u.list.clone()).unwrap_or_default())
-    }
-
-    /// Keep how one file uses a file's library (in memory; written when it changed, at most every
-    /// [`USAGE_WRITE_EVERY`] seconds).
-    pub fn report_usage(&mut self, file: &str, usage: Usage) -> Result<(), String> {
-        let name = clean_name(&usage.file);
-        if name.is_empty() {
-            return Ok(());
-        }
-        let mut components: Vec<_> = usage.components.into_iter().filter(|(_, n)| *n > 0).take(MAX_REPORTED * 4).collect();
-        components.sort();
-        components.dedup_by_key(|c| c.0);
-        components.truncate(MAX_REPORTED);
-        let Some(u) = self.usage_of(file)? else { return Ok(()) };
-        match u.list.iter_mut().find(|f| f.usage.file == name) {
-            Some(f) if f.usage.components == components => return Ok(()),
-            Some(f) => {
-                f.usage.components = components;
-                f.updated = now();
-            }
-            None => u.list.push(FileUsage { usage: Usage { file: name, components }, updated: now() }),
-        }
-        if u.list.len() > MAX_USERS {
-            u.list.sort_by_key(|f| std::cmp::Reverse(f.updated));
-            u.list.truncate(MAX_USERS);
-        }
-        u.dirty = true;
-        if now() >= u.written.saturating_add(USAGE_WRITE_EVERY) {
-            self.write_usage(false);
-        }
-        Ok(())
-    }
-
-    /// Write the usage reports that changed (`all`: whenever they were last written).
-    fn write_usage(&mut self, all: bool) {
-        let t = now();
-        let root = self.root.join(FILES);
-        for (file, u) in &mut self.usage {
-            if u.dirty && (all || t >= u.written.saturating_add(USAGE_WRITE_EVERY)) {
-                if let Err(e) = write_json(&root.join(file).join(USAGE), &u.list) {
-                    log::warn!("file {file}: library usage couldn't be kept: {e}");
-                }
-                (u.dirty, u.written) = (false, t);
-            }
-        }
-    }
-
-    /// Whether `file` has room for about `n` more bytes: its cap, and for a file published
-    /// without the key its address's share and everyone's. A log that took it over its cap is
-    /// compacted first (the state may be smaller than its history).
-    fn room_for(&mut self, file: &str, server: &Server, n: u64) -> Result<(), String> {
-        if let Some(why) = self.low_disk() {
-            return Err(why);
-        }
-        let max = self.cfg.max_file_bytes;
-        let over = |s: &Store| s.bytes(file).saturating_add(n) > max;
-        // A compaction to make room at most once a minute per file (it rewrites the whole file).
-        let t = now();
-        let may_compact = self.files.get(file).is_some_and(|e| {
-            t >= e.forced.saturating_add(FORCED_COMPACTION_EVERY) && e.log.as_ref().is_some_and(|l| l.entries > 0 || !l.pending.is_empty())
-        });
-        if over(self) && may_compact {
-            if let Some(e) = self.files.get_mut(file) {
-                e.forced = t;
-            }
-            self.compact(file, server);
-        }
-        if over(self) {
-            return Err(format!("this file has reached the server's limit of {} MiB: that change wasn't kept", max >> 20));
-        }
-        let h = &self.cfg.hosting;
-        let Some(ip) = self.files.get(file).filter(|e| e.meta.owner.is_some()).and_then(|e| e.meta.ip.clone()) else { return Ok(()) };
-        let (max_ip, max_all) = (h.max_bytes_per_ip, h.max_total_bytes);
-        let used_ip: u64 = self.files.iter().filter(|(_, e)| e.meta.ip.as_deref() == Some(ip.as_str())).map(|(id, _)| self.bytes(id)).sum();
-        if used_ip.saturating_add(n) > max_ip {
-            return Err(format!("the files published from this file's address have reached their {} MiB: that change wasn't kept", max_ip >> 20));
-        }
-        let used_all: u64 = self.files.keys().map(|id| self.bytes(id)).sum();
-        if used_all.saturating_add(n) > max_all {
-            return Err("this server is full: that change wasn't kept".into());
-        }
-        Ok(())
-    }
-
-    /// Load a file's session: its snapshot, then its log (a damaged end is dropped and reported).
-    fn load(&mut self, file: &str) -> Result<Server, String> {
-        self.touch(file);
-        let dir = self.dir(file);
-        let (generation, state) = disk::decode_snapshot(&disk::read_capped(&dir.join(SNAPSHOT), self.snapshot_cap())?)?;
-        let mut server = Server::restore(state, "", self.cfg.core).map_err(|e| format!("the snapshot can't be used: {e}"))?;
-        let mut issues = Vec::new();
-        let mut fresh_log = true;
-        let mut kept = 0;
-        match disk::read_capped(&dir.join(LOG), self.cfg.max_file_bytes).and_then(|b| disk::read_log(&b)) {
-            Ok(log) if log.generation == generation => {
-                fresh_log = false;
-                for entry in log.entries {
-                    if let Err(e) = server.replay(entry) {
-                        issues.push(format!("file {file}: its log stops making sense after {kept} entries ({e}); the rest was dropped"));
-                        fresh_log = true;
-                        break;
-                    }
-                    kept += 1;
-                }
-                if let Some(why) = log.damaged {
-                    issues.push(format!("file {file}: its log ended with {why}; that part was dropped"));
-                    fresh_log = true;
-                }
-            }
-            // From before a compaction that was cut short: the snapshot has it all.
-            Ok(_) => {}
-            Err(why) => issues.push(format!("file {file}: {why}; starting a new log")),
-        }
-        for i in issues {
-            log::warn!("{i}");
-            self.note(i);
-        }
-        server.journaling(true);
-        let file_handle = OpenOptions::new().append(true).open(dir.join(LOG));
-        let log = match (fresh_log, file_handle) {
-            (false, Ok(f)) => {
-                let bytes = f.metadata().map_or(LOG_HEADER as u64, |m| m.len());
-                // Replayed entries make it worth compacting once everyone has left.
-                Log { generation, file: f, pending: Vec::new(), entries: kept, bytes, dirty: kept > 0 }
-            }
-            // A new snapshot and log of the next generation, so appends start clean.
-            _ => self.rewrite(file, generation + 1, &server).map_err(|e| e.why)?,
-        };
-        self.entry(file)?.log = Some(log);
-        Ok(server)
-    }
-
-    /// The largest snapshot read back: a file's cap plus room for what its state keeps beside the
-    /// document (recent batches for reconnecting clients, deletions), which may take it over.
-    fn snapshot_cap(&self) -> u64 {
-        self.cfg.max_file_bytes.saturating_mul(2)
-    }
-
-    /// Write `server`'s state as snapshot `generation` and start an empty log of it.
-    fn rewrite(&mut self, file: &str, generation: u64, server: &Server) -> Result<Log, RewriteError> {
-        let dir = self.dir(file);
-        let kept = |why: String| RewriteError { why, snapshot_replaced: false };
-        let state = server.state().map_err(|e| kept(e.to_string()))?;
-        let bytes = disk::encode_snapshot(generation, &state).map_err(kept)?;
-        // Never replace a readable snapshot with one that can't be opened again: the old snapshot
-        // and log still hold everything.
-        if bytes.len() as u64 > self.snapshot_cap() {
-            return Err(kept(format!("the snapshot would be {} MiB, more than can be opened again", bytes.len() >> 20)));
-        }
-        if bytes.len() as u64 > self.cfg.max_file_bytes {
-            log::warn!("file {file} is {} MiB, over the {} MiB cap (kept anyway)", bytes.len() >> 20, self.cfg.max_file_bytes >> 20);
-        }
-        disk::write_atomic(&dir.join(SNAPSHOT), &bytes).map_err(|e| kept(format!("couldn't write the snapshot: {e}")))?;
-        // From here the old log no longer goes with the snapshot on disk.
-        let replaced = |why: String| RewriteError { why, snapshot_replaced: true };
-        disk::write_atomic(&dir.join(LOG), &disk::log_header(generation)).map_err(|e| replaced(format!("couldn't start the log: {e}")))?;
-        let f = OpenOptions::new().append(true).open(dir.join(LOG)).map_err(|e| replaced(format!("couldn't open the log: {e}")))?;
-        if let Ok(e) = self.entry(file) {
-            e.bytes = (bytes.len() + LOG_HEADER) as u64;
-            e.meta.seq = server.seq();
-            let meta = e.meta.clone();
-            if let Err(err) = write_json(&dir.join(META), &meta) {
-                log::warn!("file {file}: couldn't update {META}: {err}");
-            }
-        }
-        Ok(Log { generation, file: f, pending: Vec::new(), entries: 0, bytes: LOG_HEADER as u64, dirty: false })
-    }
-
-    /// Compactions so far.
-    pub fn compactions(&self) -> u64 {
-        self.compactions
-    }
-
-    /// Why nothing more may be written when the data directory's disk is nearly full (less free
-    /// than [`StoreConfig::min_free_bytes`]); looked up at most once a second. Where the free space
-    /// can't be told, nothing is refused.
-    fn low_disk(&mut self) -> Option<String> {
-        let now = Instant::now();
-        let free = match self.free {
-            Some((at, free)) if now.saturating_duration_since(at) < std::time::Duration::from_secs(1) => free,
-            _ => {
-                let free = disk::free_bytes(&self.root);
-                self.free = Some((now, free));
-                free
-            }
-        };
-        free.filter(|f| *f < self.cfg.min_free_bytes)
-            .map(|_| "the server's disk is nearly full: it takes no changes or new files for now (tell its operator)".to_string())
-    }
-
-    /// Note a problem for the operator (logged too); only the latest [`MAX_PROBLEMS`] are kept.
-    fn note(&mut self, problem: String) {
-        if self.problems.len() >= MAX_PROBLEMS {
-            self.problems.remove(0);
-        }
-        self.problems.push(problem);
-    }
-
-    /// Compact an open file: its state as the next snapshot, an empty log.
-    fn compact(&mut self, file: &str, server: &Server) {
-        self.compactions += 1;
-        let Some(generation) = self.files.get(file).and_then(|e| e.log.as_ref()).map(|l| l.generation) else { return };
-        match self.rewrite(file, generation + 1, server) {
-            Ok(log) => {
-                if let Ok(e) = self.entry(file) {
-                    e.log = Some(log);
-                }
-                log::debug!("compacted file {file}");
-            }
-            // The new snapshot holds everything, but a restart would drop whatever is appended to
-            // the old log now (its generation no longer matches): the file closes, the hub hears
-            // it at the next flush, and it opens again from the new snapshot.
-            Err(RewriteError { why, snapshot_replaced: true }) => {
-                self.note(format!("file {file}: compaction was cut short ({why}); it was closed"));
-                log::error!("file {file}: compaction was cut short: {why}");
-                if let Some(e) = self.files.get_mut(file) {
-                    e.log = None;
-                }
-                self.cut_short.push(file.to_string());
-            }
-            // The old snapshot and log still hold everything: carry on appending.
-            Err(RewriteError { why, .. }) => log::error!("file {file}: compaction failed: {why}"),
-        }
-    }
-
-    /// Write and sync what's pending in every open log; the files whose log couldn't be written.
-    /// Those are closed here (their pending records dropped: nobody was told of them) and open
-    /// again from what is on disk.
-    fn flush_all(&mut self) -> Vec<String> {
-        let mut failed = std::mem::take(&mut self.cut_short);
-        for (id, e) in &mut self.files {
-            if let Some(log) = e.log.as_mut() {
-                match flush_log(id, log) {
-                    Ok(n) => e.bytes += n,
-                    Err(()) => {
-                        e.log = None;
-                        failed.push(id.clone());
-                    }
-                }
-            }
-        }
-        failed
-    }
 }
 
 /// Why a snapshot and log couldn't be rewritten, and whether the snapshot on disk was replaced
@@ -1269,38 +558,6 @@ struct RewriteError {
     snapshot_replaced: bool,
 }
 
-/// Write and sync a log's pending records: the bytes written, or `Err` when that failed (the log
-/// can't be trusted to hold them).
-fn flush_log(id: &str, log: &mut Log) -> Result<u64, ()> {
-    if log.pending.is_empty() {
-        return Ok(0);
-    }
-    match log.file.write_all(&log.pending).and_then(|()| log.file.sync_data()) {
-        Ok(()) => {
-            let n = log.pending.len() as u64;
-            log.bytes += n;
-            log.pending.clear();
-            Ok(n)
-        }
-        Err(e) => {
-            log::error!("file {id}: couldn't write its log: {e}");
-            Err(())
-        }
-    }
-}
-
-/// The name of the file holding version `version` of a file's team library.
-pub fn library_name(version: u64) -> String {
-    format!("library-{version}.bin")
-}
-
-/// Where version `version` of the team library in `dir` is: its own file, or `library.bin` for a
-/// version published before each version had one.
-fn library_file(dir: &Path, version: u64) -> PathBuf {
-    let path = dir.join(library_name(version));
-    if path.exists() { path } else { dir.join(LIBRARY) }
-}
-
 fn write_json<T: Serialize + ?Sized>(path: &Path, value: &T) -> Result<(), String> {
     let text = serde_json::to_vec_pretty(value).map_err(|e| e.to_string())?;
     disk::write_atomic(path, &text).map_err(|e| e.to_string())
@@ -1311,239 +568,3 @@ fn new_link(access: Access, label: &str, created: u64) -> Result<(Link, String),
     let token = token::secret()?;
     Ok((Link { id: token::file_id()?, access, label: label.to_string(), created, hash: hash(&token), code: None }, token))
 }
-
-impl Backend for Store {
-    fn admit(&mut self, file: &str, token: &str) -> Result<Admission, String> {
-        let entry = self.entry(file)?;
-        let link = Self::link_of(entry, token).and_then(|i| entry.links.get(i));
-        link.map(|l| Admission { access: l.access, link: Some(l.id.clone()) })
-            .ok_or_else(|| "this link isn't valid (it may have been revoked)".to_string())
-    }
-
-    fn open(&mut self, file: &str) -> Result<Server, String> {
-        self.load(file).map_err(|e| {
-            let why = format!("file {file} can't be opened: {e}");
-            log::error!("{why}");
-            self.note(why);
-            "this file can't be opened on the server (its data is damaged); tell the server's owner".to_string()
-        })
-    }
-
-    fn changed(&mut self, file: &str, server: &mut Server) {
-        let journal = server.take_journal();
-        if journal.is_empty() {
-            return;
-        }
-        let (after, max_bytes) = (self.cfg.compact_after, self.cfg.compact_bytes);
-        let Some(e) = self.files.get_mut(file) else { return };
-        let Some(log) = e.log.as_mut() else { return };
-        for j in &journal {
-            match disk::record(j) {
-                Ok(r) => log.pending.extend(r),
-                Err(err) => log::error!("file {file}: a change couldn't be logged: {err}"),
-            }
-        }
-        log.entries += journal.len();
-        log.dirty = true;
-        e.meta.updated = now();
-        if log.entries >= after || log.bytes + log.pending.len() as u64 >= max_bytes {
-            // The snapshot holds what's pending too.
-            self.compact(file, server);
-        }
-    }
-
-    fn flush(&mut self) -> Vec<String> {
-        self.flush_all()
-    }
-
-    fn room(&mut self, file: &str, server: &Server, bytes: usize) -> Result<(), String> {
-        self.room_for(file, server, bytes as u64)
-    }
-
-    fn idle(&mut self, file: &str, server: &mut Server) -> bool {
-        let dirty = self.files.get_mut(file).and_then(|e| e.log.as_mut()).is_some_and(|log| {
-            let _ = flush_log(file, log);
-            log.dirty
-        });
-        if dirty {
-            self.compact(file, server);
-        }
-        // It closes anyway, everything in its snapshot: a compaction cut short needs no report.
-        self.cut_short.retain(|f| f != file);
-        if let Some(e) = self.files.get_mut(file) {
-            e.log = None;
-        }
-        // Everyone just left: idle time counts from now.
-        self.touch(file);
-        true
-    }
-
-    fn stop(&mut self, open: Vec<(&str, &mut Server)>) {
-        self.write_usage(true);
-        self.flush_all();
-        for (file, server) in open {
-            if self.files.get(file).and_then(|e| e.log.as_ref()).is_some_and(|l| l.dirty) {
-                self.compact(file, server);
-            }
-        }
-    }
-
-    fn manage(&mut self, key: &str) -> Result<(), String> {
-        match same_secret(key, &self.key) {
-            true => Ok(()),
-            false if self.cfg.hosting.open => {
-                Err("wrong server key (this server is open to the public: publish without a key, with an up-to-date FigCraft)".into())
-            }
-            false => Err("wrong server key".into()),
-        }
-    }
-
-    fn connect(&mut self, ip: IpAddr) -> Result<(), String> {
-        if now() >= self.next_sweep {
-            self.sweep();
-            self.write_usage(false);
-        }
-        if self.blocked.contains(&ip) {
-            return Err("this server doesn't accept connections from your address".into());
-        }
-        if !self.abuse.allow(ip, Action::Connect, Instant::now()) {
-            return Err("too many connections from your address lately: wait a minute and try again".into());
-        }
-        Ok(())
-    }
-
-    fn message(&mut self, ip: IpAddr, msg: &ClientMsg) -> bool {
-        // Cursors and cursor chat (many people behind one address each send ~30 a second while
-        // they move) have a budget of their own, beside everything else.
-        let what = if matches!(msg, ClientMsg::Presence(_) | ClientMsg::Signal(_) | ClientMsg::Ping) { Action::Presence } else { Action::Message };
-        self.abuse.allow(ip, what, Instant::now())
-    }
-
-    fn hosting(&mut self, file: &str) -> Option<HostInfo> {
-        Some(self.host_info(Some(file)))
-    }
-
-    fn open_hosting(&mut self, _ip: IpAddr, file: &str, owner: &str) -> Result<HostInfo, String> {
-        if file.is_empty() && owner.is_empty() {
-            return Ok(self.host_info(None));
-        }
-        if !self.owns(file, owner) {
-            return Err("that owner token doesn't manage a file of that id here (it may have been removed or expired)".into());
-        }
-        Ok(self.host_info(Some(file)))
-    }
-
-    fn hosted(&mut self, ip: IpAddr, owns: Option<&str>, req: Admin, open: &dyn Fn(&str) -> Option<OpenFile>) -> Handled {
-        let failed = |reason: &str| Handled::from(AdminReply::Failed { reason: reason.to_string() });
-        let file = match &req {
-            Admin::Publish { name, snapshot } => {
-                return match self.publish_open(ip, name, snapshot) {
-                    Ok((file, edit, view, owner)) => {
-                        let expires = self.files.get(&file.id).and_then(|e| self.expires(&e.meta));
-                        AdminReply::Hosted { file, edit, view, owner, expires }.into()
-                    }
-                    Err(e) => {
-                        log::info!("event=publish_refused ip={ip} reason={e:?}");
-                        Handled::from(AdminReply::Failed { reason: e })
-                    }
-                };
-            }
-            Admin::Owned { files } => return self.owned(files).into(),
-            Admin::Links { file }
-            | Admin::CreateLink { file, .. }
-            | Admin::Revoke { file, .. }
-            | Admin::Rename { file, .. }
-            | Admin::Code { file, .. }
-            | Admin::Remove { file } => file,
-            _ => return failed("that needs the server key"),
-        };
-        if owns != Some(file.as_str()) {
-            return failed("an owner token manages only its own file");
-        }
-        self.admin(req, open)
-    }
-
-    fn report(&mut self, file: &str, link: Option<&str>, ip: IpAddr, reason: &str) -> Result<(), String> {
-        self.keep_report(file, link, ip, reason)
-    }
-
-    fn admin(&mut self, req: Admin, open: &dyn Fn(&str) -> Option<OpenFile>) -> Handled {
-        let failed = |reason: String| Handled::from(AdminReply::Failed { reason });
-        match req {
-            Admin::Publish { name, snapshot } => match self.publish(&name, &snapshot) {
-                Ok((file, edit, view)) => AdminReply::Published { file, edit, view }.into(),
-                Err(e) => failed(e),
-            },
-            Admin::Files => AdminReply::Files(self.list(open)).into(),
-            Admin::Links { file } => self.links(&file).map_or_else(failed, |l| AdminReply::Links(l).into()),
-            Admin::CreateLink { file, access, label } => self.create_link(&file, access, &label).map_or_else(failed, |l| AdminReply::Link(l).into()),
-            Admin::Revoke { file, link } => match self.revoke(&file, &link) {
-                Ok(()) => Handled { reply: AdminReply::Done, revoked: Some((file, link)), removed: None, blocked: None },
-                Err(e) => failed(e),
-            },
-            Admin::Rename { file, name } => self.rename(&file, &name).map_or_else(failed, |()| AdminReply::Done.into()),
-            Admin::Listing => AdminReply::Listing(self.listing(open)).into(),
-            Admin::Reports => AdminReply::Reports(self.reports.clone()).into(),
-            Admin::Block { ip } => match self.block(&ip, true) {
-                Ok(ip) => Handled { reply: AdminReply::Done, revoked: None, removed: None, blocked: Some(ip) },
-                Err(e) => failed(e),
-            },
-            Admin::Unblock { ip } => self.block(&ip, false).map_or_else(failed, |_| AdminReply::Done.into()),
-            Admin::Blocked => AdminReply::Blocked(self.blocked()).into(),
-            Admin::Code { file, token } => self.set_code(&file, &token).map_or_else(failed, |code| AdminReply::Code { code }.into()),
-            Admin::Owned { files } => self.owned(&files).into(),
-            // The hub removes people itself (it knows who is connected); it never asks the store.
-            Admin::RemovePeer { .. } => failed("removing someone from a file is done by the server's hub".into()),
-            Admin::Remove { file } => {
-                if !self.files.contains_key(&file) {
-                    return failed("this file isn't on the server (it may have been removed)".into());
-                }
-                let reply = match self.remove(&file) {
-                    Ok(()) => AdminReply::Done,
-                    Err(reason) => AdminReply::Failed { reason },
-                };
-                Handled { reply, revoked: None, removed: Some(file), blocked: None }
-            }
-        }
-    }
-
-    fn library(&mut self, ip: IpAddr, file: &str, access: Access, req: LibraryReq) -> LibraryReply {
-        let failed = |reason: String| LibraryReply::Failed { reason };
-        match req {
-            LibraryReq::Fetch { have, usage } => {
-                if let Some(u) = usage
-                    && let Err(e) = self.report_usage(file, u)
-                {
-                    log::warn!("file {file}: a library usage report couldn't be kept: {e}");
-                }
-                self.fetch_library(ip, file, have).unwrap_or_else(failed)
-            }
-            LibraryReq::Publish { .. } if access != Access::Edit => {
-                failed("you can only view this file: publishing its library needs an edit link".into())
-            }
-            LibraryReq::Publish { archive } => {
-                self.publish_library(file, &archive).map_or_else(failed, |version| LibraryReply::Published { version })
-            }
-            LibraryReq::Usage => self.library_usage(file).map_or_else(failed, LibraryReply::Usage),
-        }
-    }
-
-    fn plugins(&mut self, ip: IpAddr, publisher: bool, req: PluginReq) -> PluginReply {
-        // One address's share first (before everyone's budget is spent or anything is read).
-        if let PluginReq::Fetch { id, version } = &req
-            && let Some(size) = self.directory.size_of(id, version.as_deref())
-            && !self.abuse.allow(ip, Action::Download(usize::try_from(size).unwrap_or(usize::MAX)), Instant::now())
-        {
-            return PluginReply::Failed { reason: BUSY_DOWNLOADS.into() };
-        }
-        self.directory.handle(publisher, req)
-    }
-
-    fn resolve(&mut self, ip: IpAddr, code: &str) -> Result<(String, String), String> {
-        self.resolve_code(ip, code)
-    }
-
-    fn closing(&self) -> Closing {
-        Closing::Restarting
-    }
-}
diff --git a/apps/figcraft-server/src/store/backend.rs b/apps/figcraft-server/src/store/backend.rs
new file mode 100644
index 00000000..af9b8bbb
--- /dev/null
+++ b/apps/figcraft-server/src/store/backend.rs
@@ -0,0 +1,242 @@
+use super::journal::flush_log;
+use super::*;
+
+impl Backend for Store {
+    fn admit(&mut self, file: &str, token: &str) -> Result<Admission, String> {
+        let entry = self.entry(file)?;
+        let link = Self::link_of(entry, token).and_then(|i| entry.links.get(i));
+        link.map(|l| Admission { access: l.access, link: Some(l.id.clone()) })
+            .ok_or_else(|| "this link isn't valid (it may have been revoked)".to_string())
+    }
+
+    fn open(&mut self, file: &str) -> Result<Server, String> {
+        self.load(file).map_err(|e| {
+            let why = format!("file {file} can't be opened: {e}");
+            log::error!("{why}");
+            self.note(why);
+            "this file can't be opened on the server (its data is damaged); tell the server's owner".to_string()
+        })
+    }
+
+    fn changed(&mut self, file: &str, server: &mut Server) {
+        let journal = server.take_journal();
+        if journal.is_empty() {
+            return;
+        }
+        let (after, max_bytes) = (self.cfg.compact_after, self.cfg.compact_bytes);
+        let Some(e) = self.files.get_mut(file) else { return };
+        let Some(log) = e.log.as_mut() else { return };
+        for j in &journal {
+            match disk::record(j) {
+                Ok(r) => log.pending.extend(r),
+                Err(err) => log::error!("file {file}: a change couldn't be logged: {err}"),
+            }
+        }
+        log.entries += journal.len();
+        log.dirty = true;
+        e.meta.updated = now();
+        if log.entries >= after || log.bytes + log.pending.len() as u64 >= max_bytes {
+            // The snapshot holds what's pending too.
+            self.compact(file, server);
+        }
+    }
+
+    fn flush(&mut self) -> Vec<String> {
+        self.flush_all()
+    }
+
+    fn room(&mut self, file: &str, server: &Server, bytes: usize) -> Result<(), String> {
+        self.room_for(file, server, bytes as u64)
+    }
+
+    fn idle(&mut self, file: &str, server: &mut Server) -> bool {
+        let compact = self.files.get_mut(file).is_some_and(|entry| {
+            let snapshot_seq = entry.meta.seq;
+            entry.log.as_mut().is_some_and(|log| {
+                // Issued client ids and refusals are durable in the log; only edits need a
+                // new image-bearing snapshot. Still try a snapshot if syncing the log failed.
+                flush_log(file, log).is_err() || (log.dirty && server.seq() > snapshot_seq)
+            })
+        });
+        if compact {
+            self.compact(file, server);
+        }
+        // It closes anyway, with its state in the snapshot and durable log.
+        self.cut_short.retain(|f| f != file);
+        if let Some(e) = self.files.get_mut(file) {
+            e.log = None;
+        }
+        // Everyone just left: idle time counts from now.
+        self.touch(file);
+        true
+    }
+
+    fn stop(&mut self, open: Vec<(&str, &mut Server)>) {
+        self.write_usage(true);
+        self.flush_all();
+        for (file, server) in open {
+            if self.files.get(file).and_then(|e| e.log.as_ref()).is_some_and(|l| l.dirty) {
+                self.compact(file, server);
+            }
+        }
+    }
+
+    fn manage(&mut self, key: &str) -> Result<(), String> {
+        match same_secret(key, &self.key) {
+            true => Ok(()),
+            false if self.cfg.hosting.open => {
+                Err("wrong server key (this server is open to the public: publish without a key, with an up-to-date FigCraft)".into())
+            }
+            false => Err("wrong server key".into()),
+        }
+    }
+
+    fn connect(&mut self, ip: IpAddr) -> Result<(), String> {
+        if now() >= self.next_sweep {
+            self.sweep();
+            self.write_usage(false);
+        }
+        if self.blocked.contains(&ip) {
+            return Err("this server doesn't accept connections from your address".into());
+        }
+        if !self.abuse.allow(ip, Action::Connect, Instant::now()) {
+            return Err("too many connections from your address lately: wait a minute and try again".into());
+        }
+        Ok(())
+    }
+
+    fn message(&mut self, ip: IpAddr, msg: &ClientMsg) -> bool {
+        // Cursors and cursor chat (many people behind one address each send ~30 a second while
+        // they move) have a budget of their own, beside everything else.
+        let what = if matches!(msg, ClientMsg::Presence(_) | ClientMsg::Signal(_) | ClientMsg::Ping) { Action::Presence } else { Action::Message };
+        self.abuse.allow(ip, what, Instant::now())
+    }
+
+    fn hosting(&mut self, file: &str) -> Option<HostInfo> {
+        Some(self.host_info(Some(file)))
+    }
+
+    fn open_hosting(&mut self, _ip: IpAddr, file: &str, owner: &str) -> Result<HostInfo, String> {
+        if file.is_empty() && owner.is_empty() {
+            return Ok(self.host_info(None));
+        }
+        if !self.owns(file, owner) {
+            return Err("that owner token doesn't manage a file of that id here (it may have been removed or expired)".into());
+        }
+        Ok(self.host_info(Some(file)))
+    }
+
+    fn hosted(&mut self, ip: IpAddr, owns: Option<&str>, req: Admin, open: &dyn Fn(&str) -> Option<OpenFile>) -> Handled {
+        let failed = |reason: &str| Handled::from(AdminReply::Failed { reason: reason.to_string() });
+        let file = match &req {
+            Admin::Publish { name, snapshot } => {
+                return match self.publish_open(ip, name, snapshot) {
+                    Ok((file, edit, view, owner)) => {
+                        let expires = self.files.get(&file.id).and_then(|e| self.expires(&e.meta));
+                        AdminReply::Hosted { file, edit, view, owner, expires }.into()
+                    }
+                    Err(e) => {
+                        log::info!("event=publish_refused ip={ip} reason={e:?}");
+                        Handled::from(AdminReply::Failed { reason: e })
+                    }
+                };
+            }
+            Admin::Owned { files } => return self.owned(files).into(),
+            Admin::Links { file }
+            | Admin::CreateLink { file, .. }
+            | Admin::Revoke { file, .. }
+            | Admin::Rename { file, .. }
+            | Admin::Code { file, .. }
+            | Admin::Remove { file } => file,
+            _ => return failed("that needs the server key"),
+        };
+        if owns != Some(file.as_str()) {
+            return failed("an owner token manages only its own file");
+        }
+        self.admin(req, open)
+    }
+
+    fn report(&mut self, file: &str, link: Option<&str>, ip: IpAddr, reason: &str) -> Result<(), String> {
+        self.keep_report(file, link, ip, reason)
+    }
+
+    fn admin(&mut self, req: Admin, open: &dyn Fn(&str) -> Option<OpenFile>) -> Handled {
+        let failed = |reason: String| Handled::from(AdminReply::Failed { reason });
+        match req {
+            Admin::Publish { name, snapshot } => match self.publish(&name, &snapshot) {
+                Ok((file, edit, view)) => AdminReply::Published { file, edit, view }.into(),
+                Err(e) => failed(e),
+            },
+            Admin::Files => AdminReply::Files(self.list(open)).into(),
+            Admin::Links { file } => self.links(&file).map_or_else(failed, |l| AdminReply::Links(l).into()),
+            Admin::CreateLink { file, access, label } => self.create_link(&file, access, &label).map_or_else(failed, |l| AdminReply::Link(l).into()),
+            Admin::Revoke { file, link } => match self.revoke(&file, &link) {
+                Ok(()) => Handled { reply: AdminReply::Done, revoked: Some((file, link)), removed: None, blocked: None },
+                Err(e) => failed(e),
+            },
+            Admin::Rename { file, name } => self.rename(&file, &name).map_or_else(failed, |()| AdminReply::Done.into()),
+            Admin::Listing => AdminReply::Listing(self.listing(open)).into(),
+            Admin::Reports => AdminReply::Reports(self.reports.clone()).into(),
+            Admin::Block { ip } => match self.block(&ip, true) {
+                Ok(ip) => Handled { reply: AdminReply::Done, revoked: None, removed: None, blocked: Some(ip) },
+                Err(e) => failed(e),
+            },
+            Admin::Unblock { ip } => self.block(&ip, false).map_or_else(failed, |_| AdminReply::Done.into()),
+            Admin::Blocked => AdminReply::Blocked(self.blocked()).into(),
+            Admin::Code { file, token } => self.set_code(&file, &token).map_or_else(failed, |code| AdminReply::Code { code }.into()),
+            Admin::Owned { files } => self.owned(&files).into(),
+            // The hub removes people itself (it knows who is connected); it never asks the store.
+            Admin::RemovePeer { .. } => failed("removing someone from a file is done by the server's hub".into()),
+            Admin::Remove { file } => {
+                if !self.files.contains_key(&file) {
+                    return failed("this file isn't on the server (it may have been removed)".into());
+                }
+                let reply = match self.remove(&file) {
+                    Ok(()) => AdminReply::Done,
+                    Err(reason) => AdminReply::Failed { reason },
+                };
+                Handled { reply, revoked: None, removed: Some(file), blocked: None }
+            }
+        }
+    }
+
+    fn library(&mut self, ip: IpAddr, file: &str, access: Access, req: LibraryReq) -> LibraryReply {
+        let failed = |reason: String| LibraryReply::Failed { reason };
+        match req {
+            LibraryReq::Fetch { have, usage } => {
+                if let Some(u) = usage
+                    && let Err(e) = self.report_usage(file, u)
+                {
+                    log::warn!("file {file}: a library usage report couldn't be kept: {e}");
+                }
+                self.fetch_library(ip, file, have).unwrap_or_else(failed)
+            }
+            LibraryReq::Publish { .. } if access != Access::Edit => {
+                failed("you can only view this file: publishing its library needs an edit link".into())
+            }
+            LibraryReq::Publish { archive } => {
+                self.publish_library(file, &archive).map_or_else(failed, |version| LibraryReply::Published { version })
+            }
+            LibraryReq::Usage => self.library_usage(file).map_or_else(failed, LibraryReply::Usage),
+        }
+    }
+
+    fn plugins(&mut self, ip: IpAddr, publisher: bool, req: PluginReq) -> PluginReply {
+        // One address's share first (before everyone's budget is spent or anything is read).
+        if let PluginReq::Fetch { id, version } = &req
+            && let Some(size) = self.directory.size_of(id, version.as_deref())
+            && !self.abuse.allow(ip, Action::Download(usize::try_from(size).unwrap_or(usize::MAX)), Instant::now())
+        {
+            return PluginReply::Failed { reason: BUSY_DOWNLOADS.into() };
+        }
+        self.directory.handle(publisher, req)
+    }
+
+    fn resolve(&mut self, ip: IpAddr, code: &str) -> Result<(String, String), String> {
+        self.resolve_code(ip, code)
+    }
+
+    fn closing(&self) -> Closing {
+        Closing::Restarting
+    }
+}
diff --git a/apps/figcraft-server/src/store/files.rs b/apps/figcraft-server/src/store/files.rs
new file mode 100644
index 00000000..53ae9c87
--- /dev/null
+++ b/apps/figcraft-server/src/store/files.rs
@@ -0,0 +1,300 @@
+use super::*;
+
+impl Store {
+    /// Keep a document (its snapshot) as a new file with an edit link and a view link.
+    pub fn publish(&mut self, name: &str, snapshot: &[Change]) -> Result<(FileInfo, NewLink, NewLink), String> {
+        self.keep(name, snapshot, None, &|_| Ok(())).map(|(info, edit, view, _)| (info, edit, view))
+    }
+
+    /// For each block the address `ip` counts in ([`ip_blocks`]), how many times one address's
+    /// caps it gets, and the files and bytes kept by the files published from addresses in it. An
+    /// address that doesn't parse counts as itself only, ×1, by its exact text.
+    pub(super) fn per_block(&self, ip: &str) -> Vec<(u32, usize, u64)> {
+        let blocks_of = |text: &str| text.parse::<IpAddr>().map(|a| ip_blocks(ip_key(a))).unwrap_or_default();
+        let kept: Vec<(&str, Vec<_>, u64)> = self
+            .files
+            .iter()
+            .filter_map(|(id, e)| {
+                let from = e.meta.ip.as_deref()?;
+                Some((from, blocks_of(from).into_iter().map(|(b, _)| b).collect(), self.bytes(id)))
+            })
+            .collect();
+        let sum = |mine: &mut dyn Iterator<Item = &(&str, Vec<_>, u64)>| mine.fold((0, 0u64), |(f, b), (_, _, n)| (f + 1, b.saturating_add(*n)));
+        let blocks = blocks_of(ip);
+        if blocks.is_empty() {
+            let (files, bytes) = sum(&mut kept.iter().filter(|(from, _, _)| *from == ip));
+            return vec![(1, files, bytes)];
+        }
+        blocks
+            .into_iter()
+            .map(|(block, times)| {
+                let (files, bytes) = sum(&mut kept.iter().filter(|(_, blocks, _)| blocks.contains(&block)));
+                (times, files, bytes)
+            })
+            .collect()
+    }
+
+    /// Keep a document published without the key from `ip`, within the caps on what one address
+    /// and everyone may keep: the file, its links and its owner token.
+    pub fn publish_open(&mut self, ip: IpAddr, name: &str, snapshot: &[Change]) -> Result<(FileInfo, NewLink, NewLink, String), String> {
+        let h = &self.cfg.hosting;
+        let (open, max_files, max_ip, max_all) = (h.open, h.max_files_per_ip, h.max_bytes_per_ip, h.max_total_bytes);
+        if !open {
+            return Err(KEY_ONLY.into());
+        }
+        if !self.abuse.allow(ip, Action::Publish, Instant::now()) {
+            return Err("too many files published from your address lately: try again in an hour".into());
+        }
+        let blocks = self.per_block(&ip.to_string());
+        for &(times, files, _) in &blocks {
+            if files >= max_files.saturating_mul(times as usize) {
+                return Err(format!(
+                    "your address keeps {files} files on this server already, the most it may: remove one (with its owner token) or wait until one expires"
+                ));
+            }
+        }
+        let used_all: u64 = self.files.keys().map(|id| self.bytes(id)).sum();
+        let fits = |n: u64| {
+            for &(times, _, used) in &blocks {
+                let cap = max_ip.saturating_mul(u64::from(times));
+                if used.saturating_add(n) > cap {
+                    return Err(format!("your address's files would take more than the {} MiB it may keep here: remove one first", cap >> 20));
+                }
+            }
+            if used_all.saturating_add(n) > max_all {
+                return Err("this server is full: it takes no more files for now (try again later, or another server)".into());
+            }
+            Ok(())
+        };
+        let (info, edit, view, owner) = self.keep(name, snapshot, Some(ip), &fits)?;
+        Ok((info, edit, view, owner.unwrap_or_default()))
+    }
+
+    /// Keep a document as a new file: published without the key from `ip` (it gets an owner
+    /// token), else by the operator. `fits` checks its size against the caps that apply.
+    fn keep(
+        &mut self,
+        name: &str,
+        snapshot: &[Change],
+        ip: Option<IpAddr>,
+        fits: &dyn Fn(u64) -> Result<(), String>,
+    ) -> Result<(FileInfo, NewLink, NewLink, Option<String>), String> {
+        if self.files.len() >= self.cfg.max_files {
+            return Err(format!("the server keeps at most {} files", self.cfg.max_files));
+        }
+        if let Some(why) = self.low_disk() {
+            return Err(why);
+        }
+        let replica = Replica::from_snapshot(snapshot).map_err(|e| format!("the file couldn't be read: {e}"))?;
+        if replica.document().node_count() > self.cfg.core.max_nodes {
+            return Err(format!("the file has more than {} layers", self.cfg.core.max_nodes));
+        }
+        let mut doc = replica.document().clone();
+        let name = match clean_name(name) {
+            n if n.is_empty() => doc.name.clone(),
+            n => n,
+        };
+        doc.name = name.clone();
+        let server = Server::new(doc, "", self.cfg.core);
+        let state = server.state().map_err(|e| e.to_string())?;
+        let bytes = disk::encode_snapshot(1, &state)?;
+        if bytes.len() as u64 > self.cfg.max_file_bytes {
+            return Err(format!("the file is {} MiB; this server keeps files up to {} MiB", bytes.len() >> 20, self.cfg.max_file_bytes >> 20));
+        }
+        fits(bytes.len() as u64)?;
+        let id = loop {
+            let id = token::file_id()?;
+            if !self.files.contains_key(&id) && !self.dir(&id).exists() {
+                break id;
+            }
+        };
+        let t = now();
+        let (edit, edit_token) = new_link(Access::Edit, "Published (edit)", t)?;
+        let (view, view_token) = new_link(Access::View, "Published (view)", t)?;
+        let owner = ip.map(|_| token::secret()).transpose()?;
+        let meta =
+            Meta { name, created: t, updated: t, seq: 0, library: None, owner: owner.as_deref().map(hash), ip: ip.map(|i| i.to_string()), opened: 0 };
+        let dir = self.dir(&id);
+        let written = fs::create_dir_all(&dir)
+            .map_err(|e| e.to_string())
+            .and_then(|()| {
+                disk::sync_dir(Some(&self.root.join(FILES)));
+                disk::write_atomic(&dir.join(SNAPSHOT), &bytes).map_err(|e| e.to_string())
+            })
+            .and_then(|()| disk::write_atomic(&dir.join(LOG), &disk::log_header(1)).map_err(|e| e.to_string()))
+            .and_then(|()| write_json(&dir.join(LINKS), &[edit.clone(), view.clone()]))
+            // Last: a folder without its description is an upload cut short.
+            .and_then(|()| write_json(&dir.join(META), &meta));
+        if let Err(e) = written {
+            let _ = fs::remove_dir_all(&dir);
+            return Err(format!("couldn't keep the file: {e}"));
+        }
+        let entry = Entry { meta, links: vec![edit.clone(), view.clone()], log: None, bytes: (bytes.len() + LOG_HEADER) as u64, forced: 0 };
+        self.files.insert(id.clone(), entry);
+        let info = self.files.get(&id).map(|e| self.info(&id, e, None)).ok_or("the file vanished")?;
+        match ip {
+            Some(ip) => log::info!("event=published file={id} bytes={} ip={ip} by=public", bytes.len()),
+            None => log::info!("event=published file={id} bytes={} by=key", bytes.len()),
+        }
+        Ok((info, NewLink { link: edit.info(&id), token: edit_token }, NewLink { link: view.info(&id), token: view_token }, owner))
+    }
+
+    /// The files kept, with what the operator moderates by.
+    pub fn listing(&self, open: &dyn Fn(&str) -> Option<OpenFile>) -> Vec<FileRow> {
+        self.files
+            .iter()
+            .map(|(id, e)| FileRow {
+                info: self.info(id, e, open(id)),
+                opened: e.meta.opened,
+                expires: self.expires(&e.meta),
+                open: e.meta.owner.is_some(),
+                ip: e.meta.ip.clone().unwrap_or_default(),
+                reports: u32::try_from(self.reports.iter().filter(|r| r.file == *id).count()).unwrap_or(u32::MAX),
+            })
+            .collect()
+    }
+
+    /// Owner token `owner` manages file `file` (one published without the key).
+    pub(super) fn owns(&self, file: &str, owner: &str) -> bool {
+        let presented = hash(owner);
+        self.files.get(file).and_then(|e| e.meta.owner.as_deref()).is_some_and(|h| same_secret(&presented, h))
+    }
+
+    /// What became of the files these `(file id, owner token)` pairs own: each one's name, links
+    /// and expiry, or `None` when that token manages no file of that id here (which doesn't say
+    /// whether the id exists). Asking opens nothing: it doesn't count as using a file.
+    pub fn owned(&self, files: &[(String, String)]) -> AdminReply {
+        if files.len() > MAX_OWNED {
+            return AdminReply::Failed { reason: format!("ask about at most {MAX_OWNED} files at a time") };
+        }
+        let one = |(file, owner): &(String, String)| {
+            let e = self.files.get(file).filter(|_| self.owns(file, owner))?;
+            Some(OwnedFile { name: e.meta.name.clone(), links: e.links.iter().map(|l| l.id.clone()).collect(), expires: self.expires(&e.meta) })
+        };
+        AdminReply::Owned(files.iter().map(one).collect())
+    }
+
+    /// Rename a file (its listing; the document inside keeps its own name).
+    pub fn rename(&mut self, file: &str, name: &str) -> Result<(), String> {
+        let name = clean_name(name);
+        if name.is_empty() {
+            return Err("give the file a name".into());
+        }
+        let path = self.dir(file).join(META);
+        let entry = self.entry(file)?;
+        let before = std::mem::replace(&mut entry.meta.name, name);
+        if let Err(e) = write_json(&path, &entry.meta) {
+            entry.meta.name = before;
+            return Err(format!("couldn't rename the file: {e}"));
+        }
+        Ok(())
+    }
+
+    /// Delete the files published without the key that nobody opened for the idle time (not
+    /// those open now); their ids.
+    pub fn sweep(&mut self) -> Vec<String> {
+        let t = now();
+        self.next_sweep = t.saturating_add(SWEEP_EVERY);
+        let due: Vec<String> =
+            self.files.iter().filter(|(_, e)| e.log.is_none() && self.expires(&e.meta).is_some_and(|x| x <= t)).map(|(id, _)| id.clone()).collect();
+        for id in &due {
+            match self.remove(id) {
+                Ok(()) => log::info!("event=expired file={id}"),
+                Err(e) => log::warn!("event=expire_failed file={id} reason={e:?}"),
+            }
+        }
+        due
+    }
+
+    /// Make a file look unused for `secs` more (tests: expiry without waiting).
+    #[cfg(test)]
+    pub fn age(&mut self, file: &str, secs: u64) {
+        let path = self.dir(file).join(META);
+        if let Some(e) = self.files.get_mut(file) {
+            let m = &mut e.meta;
+            (m.created, m.updated, m.opened) = (m.created.saturating_sub(secs), m.updated.saturating_sub(secs), m.opened.saturating_sub(secs));
+            let _ = write_json(&path, m);
+        }
+    }
+
+    /// Make an open file's log refuse writes (tests: a full or failing disk).
+    #[cfg(test)]
+    pub fn break_log(&mut self, file: &str) {
+        let path = self.dir(file).join(LOG);
+        if let Some(log) = self.files.get_mut(file).and_then(|e| e.log.as_mut())
+            && let Ok(f) = File::open(path)
+        {
+            log.file = f;
+        }
+    }
+
+    /// Note that a file was opened now (it is used: it doesn't expire).
+    pub(super) fn touch(&mut self, file: &str) {
+        let path = self.dir(file).join(META);
+        if let Some(e) = self.files.get_mut(file) {
+            e.meta.opened = now();
+            if let Err(err) = write_json(&path, &e.meta) {
+                log::warn!("file {file}: couldn't update {META}: {err}");
+            }
+        }
+    }
+
+    /// What the server says about its hosting (with `file`'s expiry).
+    pub(super) fn host_info(&self, file: Option<&str>) -> HostInfo {
+        let h = &self.cfg.hosting;
+        let expires = file.and_then(|f| self.files.get(f)).and_then(|e| self.expires(&e.meta));
+        HostInfo { open: h.open, operator: h.operator.clone(), terms: h.terms.clone(), idle_secs: h.idle_secs, max_file_mb: h.max_file_mb, expires }
+    }
+
+    /// Block or unblock an address (an IPv6 address: its /64); the address as kept.
+    pub fn block(&mut self, ip: &str, on: bool) -> Result<IpAddr, String> {
+        let ip = ip_key(ip.trim().parse::<IpAddr>().map_err(|_| format!("`{}` isn't an IP address", ip.trim()))?);
+        if on && !self.blocked.contains(&ip) && self.blocked.len() >= MAX_BLOCKED {
+            return Err(format!("at most {MAX_BLOCKED} addresses can be blocked"));
+        }
+        let changed = if on { self.blocked.insert(ip) } else { self.blocked.remove(&ip) };
+        if changed {
+            let list: Vec<String> = self.blocked.iter().map(IpAddr::to_string).collect();
+            write_json(&self.root.join(BLOCKED), &list).map_err(|e| format!("couldn't keep the blocked addresses: {e}"))?;
+            log::info!("event={} ip={ip}", if on { "blocked" } else { "unblocked" });
+        }
+        Ok(ip)
+    }
+
+    /// The blocked addresses.
+    pub fn blocked(&self) -> Vec<String> {
+        self.blocked.iter().map(IpAddr::to_string).collect()
+    }
+
+    /// The reports kept, oldest first.
+    pub fn reports(&self) -> &[ReportInfo] {
+        &self.reports
+    }
+
+    /// Keep a report about `file` (from someone who joined it with `link`, at `ip`).
+    pub fn keep_report(&mut self, file: &str, link: Option<&str>, ip: IpAddr, reason: &str) -> Result<(), String> {
+        let reason = clean_reason(reason);
+        if reason.is_empty() {
+            return Err("say what is wrong with the file".into());
+        }
+        let name = self.entry(file)?.meta.name.clone();
+        if !self.abuse.allow(ip, Action::Report, Instant::now()) {
+            return Err("too many reports from your address lately: try again in an hour".into());
+        }
+        self.reports.push(ReportInfo {
+            at: now(),
+            file: file.to_string(),
+            name,
+            link: link.unwrap_or_default().to_string(),
+            ip: ip.to_string(),
+            reason,
+        });
+        if self.reports.len() > MAX_REPORTS {
+            let extra = self.reports.len() - MAX_REPORTS;
+            self.reports.drain(..extra);
+        }
+        write_json(&self.root.join(REPORTS), &self.reports).map_err(|e| format!("couldn't keep the report: {e}"))?;
+        log::info!("event=report file={file} ip={ip}");
+        Ok(())
+    }
+}
diff --git a/apps/figcraft-server/src/store/journal.rs b/apps/figcraft-server/src/store/journal.rs
new file mode 100644
index 00000000..e3983543
--- /dev/null
+++ b/apps/figcraft-server/src/store/journal.rs
@@ -0,0 +1,270 @@
+use super::*;
+
+impl Store {
+    /// Whether `file` has room for about `n` more bytes: its cap, and for a file published
+    /// without the key its address's share and everyone's. A log that took it over its cap is
+    /// compacted first (the state may be smaller than its history).
+    pub(super) fn room_for(&mut self, file: &str, server: &Server, n: u64) -> Result<(), String> {
+        if let Some(why) = self.low_disk() {
+            return Err(why);
+        }
+        let max = self.cfg.max_file_bytes;
+        let over = |s: &Store| s.bytes(file).saturating_add(n) > max;
+        // A compaction to make room at most once a minute per file (it rewrites the whole file).
+        let t = now();
+        let may_compact = self.files.get(file).is_some_and(|e| {
+            t >= e.forced.saturating_add(FORCED_COMPACTION_EVERY) && e.log.as_ref().is_some_and(|l| l.entries > 0 || !l.pending.is_empty())
+        });
+        if over(self) && may_compact {
+            if let Some(e) = self.files.get_mut(file) {
+                e.forced = t;
+            }
+            self.compact(file, server);
+        }
+        if over(self) {
+            return Err(format!("this file has reached the server's limit of {} MiB: that change wasn't kept", max >> 20));
+        }
+        let h = &self.cfg.hosting;
+        let Some(ip) = self.files.get(file).filter(|e| e.meta.owner.is_some()).and_then(|e| e.meta.ip.clone()) else { return Ok(()) };
+        let (max_ip, max_all) = (h.max_bytes_per_ip, h.max_total_bytes);
+        for (times, _, used) in self.per_block(&ip) {
+            let cap = max_ip.saturating_mul(u64::from(times));
+            if used.saturating_add(n) > cap {
+                return Err(format!("the files published from this file's address have reached their {} MiB: that change wasn't kept", cap >> 20));
+            }
+        }
+        let used_all: u64 = self.files.keys().map(|id| self.bytes(id)).sum();
+        if used_all.saturating_add(n) > max_all {
+            return Err("this server is full: that change wasn't kept".into());
+        }
+        Ok(())
+    }
+
+    /// Load a file's session: its snapshot, then its log (a damaged end is dropped and reported).
+    pub(super) fn load(&mut self, file: &str) -> Result<Server, String> {
+        self.touch(file);
+        let dir = self.dir(file);
+        let (generation, state) = disk::decode_snapshot(&disk::read_capped(&dir.join(SNAPSHOT), self.snapshot_cap())?)?;
+        let mut server = Server::restore(state, "", self.cfg.core).map_err(|e| format!("the snapshot can't be used: {e}"))?;
+        let mut issues = Vec::new();
+        let mut fresh_log = true;
+        let mut kept = 0;
+        let log_path = dir.join(LOG);
+        // A log that's there but can't be read (an IO error, or over a lowered cap) may hold
+        // confirmed edits: the file isn't opened, and the log is left as it is for another try.
+        let read = match disk::read_capped(&log_path, self.cfg.max_file_bytes) {
+            Err(why) if log_path.exists() => return Err(format!("its log can't be read ({why}); it was left as it is")),
+            r => r,
+        };
+        // One that isn't a log is moved aside before a new one replaces it (or the file isn't opened).
+        let read = match read.map(|b| disk::read_log(&b)) {
+            Ok(Err(why)) => {
+                let aside = dir.join(format!("{LOG}.unreadable-{generation}-{}", now()));
+                fs::rename(&log_path, &aside).map_err(|e| format!("{why}, and it couldn't be moved aside ({e})"))?;
+                Err(format!("{why}; it was moved aside to {}", aside.display()))
+            }
+            Ok(Ok(log)) => Ok(log),
+            Err(why) => Err(why),
+        };
+        match read {
+            Ok(log) if log.generation == generation => {
+                fresh_log = false;
+                for entry in log.entries {
+                    if let Err(e) = server.replay(entry) {
+                        issues.push(format!("file {file}: its log stops making sense after {kept} entries ({e}); the rest was dropped"));
+                        fresh_log = true;
+                        break;
+                    }
+                    kept += 1;
+                }
+                if let Some(why) = log.damaged {
+                    issues.push(format!("file {file}: its log ended with {why}; that part was dropped"));
+                    fresh_log = true;
+                }
+            }
+            // From before a compaction that was cut short, the snapshot has it all; or a generation
+            // field damaged, which no checksum covers. Replaying tells them apart without trusting
+            // it: entries the snapshot holds are skipped, so only edits it lacks change anything.
+            Ok(log) => {
+                let before = server.seq();
+                let mut stopped = None;
+                for entry in log.entries {
+                    if let Err(e) = server.replay(entry) {
+                        stopped = Some(e);
+                        break;
+                    }
+                }
+                let (snap, found, recovered) = (generation, log.generation, server.seq().saturating_sub(before));
+                if recovered > 0 {
+                    issues.push(format!(
+                        "file {file}: its log's generation ({found}) doesn't match its snapshot's ({snap}), but it held \
+                         {recovered} changes the snapshot didn't; they were recovered"
+                    ));
+                }
+                if let Some(e) = stopped {
+                    issues.push(format!(
+                        "file {file}: its log's generation ({found}) doesn't match its snapshot's ({snap}) and it stops \
+                         making sense after {recovered} newer changes ({e}); the rest was dropped"
+                    ));
+                }
+            }
+            Err(why) => issues.push(format!("file {file}: {why}; starting a new log")),
+        }
+        for i in issues {
+            log::warn!("{i}");
+            self.note(i);
+        }
+        server.journaling(true);
+        let file_handle = OpenOptions::new().append(true).open(dir.join(LOG));
+        let log = match (fresh_log, file_handle) {
+            (false, Ok(f)) => {
+                let bytes = f.metadata().map_or(LOG_HEADER as u64, |m| m.len());
+                // Replayed entries make it worth compacting once everyone has left.
+                Log { generation, file: f, pending: Vec::new(), entries: kept, bytes, dirty: kept > 0 }
+            }
+            // A new snapshot and log of the next generation, so appends start clean.
+            _ => {
+                let next = generation.checked_add(1).ok_or("the file's generation can't go any higher")?;
+                self.rewrite(file, next, &server).map_err(|e| e.why)?
+            }
+        };
+        self.entry(file)?.log = Some(log);
+        Ok(server)
+    }
+
+    /// The largest snapshot read back: a file's cap plus room for what its state keeps beside the
+    /// document (recent batches for reconnecting clients, deletions), which may take it over.
+    pub(super) fn snapshot_cap(&self) -> u64 {
+        self.cfg.max_file_bytes.saturating_mul(2)
+    }
+
+    /// Write `server`'s state as snapshot `generation` and start an empty log of it.
+    fn rewrite(&mut self, file: &str, generation: u64, server: &Server) -> Result<Log, RewriteError> {
+        let dir = self.dir(file);
+        let kept = |why: String| RewriteError { why, snapshot_replaced: false };
+        let state = server.state().map_err(|e| kept(e.to_string()))?;
+        let bytes = disk::encode_snapshot(generation, &state).map_err(kept)?;
+        // Never replace a readable snapshot with one that can't be opened again: the old snapshot
+        // and log still hold everything.
+        if bytes.len() as u64 > self.snapshot_cap() {
+            return Err(kept(format!("the snapshot would be {} MiB, more than can be opened again", bytes.len() >> 20)));
+        }
+        if bytes.len() as u64 > self.cfg.max_file_bytes {
+            log::warn!("file {file} is {} MiB, over the {} MiB cap (kept anyway)", bytes.len() >> 20, self.cfg.max_file_bytes >> 20);
+        }
+        disk::write_atomic(&dir.join(SNAPSHOT), &bytes).map_err(|e| kept(format!("couldn't write the snapshot: {e}")))?;
+        // From here the old log no longer goes with the snapshot on disk.
+        let replaced = |why: String| RewriteError { why, snapshot_replaced: true };
+        disk::write_atomic(&dir.join(LOG), &disk::log_header(generation)).map_err(|e| replaced(format!("couldn't start the log: {e}")))?;
+        let f = OpenOptions::new().append(true).open(dir.join(LOG)).map_err(|e| replaced(format!("couldn't open the log: {e}")))?;
+        if let Ok(e) = self.entry(file) {
+            e.bytes = (bytes.len() + LOG_HEADER) as u64;
+            e.meta.seq = server.seq();
+            let meta = e.meta.clone();
+            if let Err(err) = write_json(&dir.join(META), &meta) {
+                log::warn!("file {file}: couldn't update {META}: {err}");
+            }
+        }
+        Ok(Log { generation, file: f, pending: Vec::new(), entries: 0, bytes: LOG_HEADER as u64, dirty: false })
+    }
+
+    /// Compactions so far.
+    pub fn compactions(&self) -> u64 {
+        self.compactions
+    }
+
+    /// Why nothing more may be written when the data directory's disk is nearly full (less free
+    /// than [`StoreConfig::min_free_bytes`]); looked up at most once a second. Where the free space
+    /// can't be told, nothing is refused.
+    pub(super) fn low_disk(&mut self) -> Option<String> {
+        let now = Instant::now();
+        let free = match self.free {
+            Some((at, free)) if now.saturating_duration_since(at) < std::time::Duration::from_secs(1) => free,
+            _ => {
+                let free = disk::free_bytes(&self.root);
+                self.free = Some((now, free));
+                free
+            }
+        };
+        free.filter(|f| *f < self.cfg.min_free_bytes)
+            .map(|_| "the server's disk is nearly full: it takes no changes or new files for now (tell its operator)".to_string())
+    }
+
+    /// Note a problem for the operator (logged too); only the latest [`MAX_PROBLEMS`] are kept.
+    pub(super) fn note(&mut self, problem: String) {
+        if self.problems.len() >= MAX_PROBLEMS {
+            self.problems.remove(0);
+        }
+        self.problems.push(problem);
+    }
+
+    /// Compact an open file: its state as the next snapshot, an empty log.
+    pub(super) fn compact(&mut self, file: &str, server: &Server) {
+        self.compactions += 1;
+        let Some(generation) = self.files.get(file).and_then(|e| e.log.as_ref()).map(|l| l.generation) else { return };
+        let Some(next) = generation.checked_add(1) else {
+            log::error!("file {file}: compaction failed: the file's generation can't go any higher");
+            return;
+        };
+        match self.rewrite(file, next, server) {
+            Ok(log) => {
+                if let Ok(e) = self.entry(file) {
+                    e.log = Some(log);
+                }
+                log::debug!("compacted file {file}");
+            }
+            // The new snapshot holds everything, but a restart would drop whatever is appended to
+            // the old log now (its generation no longer matches): the file closes, the hub hears
+            // it at the next flush, and it opens again from the new snapshot.
+            Err(RewriteError { why, snapshot_replaced: true }) => {
+                self.note(format!("file {file}: compaction was cut short ({why}); it was closed"));
+                log::error!("file {file}: compaction was cut short: {why}");
+                if let Some(e) = self.files.get_mut(file) {
+                    e.log = None;
+                }
+                self.cut_short.push(file.to_string());
+            }
+            // The old snapshot and log still hold everything: carry on appending.
+            Err(RewriteError { why, .. }) => log::error!("file {file}: compaction failed: {why}"),
+        }
+    }
+
+    /// Write and sync what's pending in every open log; the files whose log couldn't be written.
+    /// Those are closed here (their pending records dropped: nobody was told of them) and open
+    /// again from what is on disk.
+    pub(super) fn flush_all(&mut self) -> Vec<String> {
+        let mut failed = std::mem::take(&mut self.cut_short);
+        for (id, e) in &mut self.files {
+            if let Some(log) = e.log.as_mut() {
+                match flush_log(id, log) {
+                    Ok(n) => e.bytes += n,
+                    Err(()) => {
+                        e.log = None;
+                        failed.push(id.clone());
+                    }
+                }
+            }
+        }
+        failed
+    }
+}
+
+/// Write and sync a log's pending records: the bytes written, or `Err` when that failed (the log
+/// can't be trusted to hold them).
+pub(super) fn flush_log(id: &str, log: &mut Log) -> Result<u64, ()> {
+    if log.pending.is_empty() {
+        return Ok(0);
+    }
+    match log.file.write_all(&log.pending).and_then(|()| log.file.sync_data()) {
+        Ok(()) => {
+            let n = log.pending.len() as u64;
+            log.bytes += n;
+            log.pending.clear();
+            Ok(n)
+        }
+        Err(e) => {
+            log::error!("file {id}: couldn't write its log: {e}");
+            Err(())
+        }
+    }
+}
diff --git a/apps/figcraft-server/src/store/library.rs b/apps/figcraft-server/src/store/library.rs
new file mode 100644
index 00000000..adb592db
--- /dev/null
+++ b/apps/figcraft-server/src/store/library.rs
@@ -0,0 +1,161 @@
+use super::*;
+
+impl Store {
+    /// A file's team library for `ip`, unless its version is `have`; within what one address and
+    /// everyone may download (the size is known before anything is read).
+    pub(super) fn fetch_library(&mut self, ip: IpAddr, file: &str, have: Option<u64>) -> Result<LibraryReply, String> {
+        let (dir, max) = (self.dir(file), self.cfg.max_file_bytes);
+        let Some(lib) = self.entry(file)?.meta.library.clone() else { return Ok(LibraryReply::Empty) };
+        if have == Some(lib.version) {
+            return Ok(LibraryReply::Unchanged { version: lib.version });
+        }
+        let path = library_file(&dir, lib.version);
+        let size = fs::metadata(&path).map_or(0, |m| m.len());
+        let now = Instant::now();
+        if !self.abuse.allow(ip, Action::Download(usize::try_from(size).unwrap_or(usize::MAX)), now) || !self.served.take_n(now, size as f64) {
+            return Err(BUSY_DOWNLOADS.into());
+        }
+        Ok(LibraryReply::Library { version: lib.version, archive: disk::read_capped(&path, max)? })
+    }
+
+    /// Keep `archive` as a file's team library: it must read as a library (with the limits files
+    /// using it read it with), be the file's library if it has one, and be a newer version.
+    // shortcut: the archive is checked on the hub thread (other files' sessions wait meanwhile);
+    // move it to a worker if large libraries make that noticeable.
+    pub fn publish_library(&mut self, file: &str, archive: &[u8]) -> Result<u64, String> {
+        let max = self.cfg.max_file_bytes;
+        if self.cfg.hosting.open && self.entry(file)?.meta.owner.is_some() {
+            return Err(NO_PUBLIC_LIBRARY.into());
+        }
+        if archive.len() as u64 > max {
+            return Err(format!("the library is {} MiB; this server keeps files up to {} MiB", archive.len() >> 20, max >> 20));
+        }
+        // Everything it unpacks to counts against the same cap, so a small archive can't expand
+        // into a large library in memory.
+        let lib = match figcraft_format::read_library_within(Cursor::new(archive), max) {
+            Ok(Some(lib)) => lib,
+            Ok(None) => return Err("that isn't a published library".into()),
+            Err(e) => return Err(format!("the library can't be read: {e}")),
+        };
+        if lib.doc.node_count() > self.cfg.core.max_nodes {
+            return Err(format!("the library has more than {} layers", self.cfg.core.max_nodes));
+        }
+        let m = &lib.manifest;
+        let dir = self.dir(file);
+        let entry = self.entry(file)?;
+        if let Some(old) = &entry.meta.library {
+            if old.id != m.id {
+                return Err(format!("this file's library on the server is another one (\"{}\")", old.name));
+            }
+            if m.version <= old.version {
+                return Err(format!("version {} is on the server already: publish again to follow it", old.version));
+            }
+            // A jump would let a client use up the numbers and leave no newer version to publish.
+            if m.version > old.version.saturating_add(1) {
+                return Err(format!("version {} is too high: the next one after {} is {}", m.version, old.version, old.version.saturating_add(1)));
+            }
+        } else if m.version > MAX_FIRST_LIBRARY_VERSION {
+            return Err(format!("version {} is too high: a first publish goes up to {MAX_FIRST_LIBRARY_VERSION}", m.version));
+        }
+        // Each version has a file of its own, written before the description names it: a failed
+        // description write or a crash in between leaves the previous version served whole, never
+        // the new bytes under the old number.
+        let path = dir.join(library_name(m.version));
+        disk::write_atomic(&path, archive).map_err(|e| format!("couldn't keep the library: {e}"))?;
+        let before = entry.meta.library.replace(LibraryMeta { id: m.id.clone(), name: m.name.clone(), version: m.version });
+        if let Err(e) = write_json(&dir.join(META), &entry.meta) {
+            // Never served (the description doesn't name it); the next publish of it replaces it.
+            if let Err(r) = fs::remove_file(&path) {
+                log::warn!("file {file}: an unpublished library version couldn't be deleted: {r}");
+            }
+            entry.meta.library = before;
+            return Err(format!("couldn't keep the library: {e}"));
+        }
+        // The previous version isn't served any more.
+        if let Some(Err(e)) = before.map(|old| fs::remove_file(library_file(&dir, old.version))) {
+            log::warn!("file {file}: the previous library version couldn't be deleted: {e}");
+        }
+        log::info!("file {file}: published library version {} ({} bytes)", m.version, archive.len());
+        Ok(m.version)
+    }
+
+    /// A library's usage reports in memory (read from disk the first time; a damaged list starts
+    /// over: it is only statistics). `None` when the file has no library.
+    fn usage_of(&mut self, file: &str) -> Result<Option<&mut UsageCache>, String> {
+        if self.entry(file)?.meta.library.is_none() {
+            return Ok(None);
+        }
+        if !self.usage.contains_key(file) {
+            let path = self.dir(file).join(USAGE);
+            let list = if path.exists() {
+                disk::read_capped(&path, MAX_USAGE_FILE).ok().and_then(|b| serde_json::from_slice(&b).ok()).unwrap_or_default()
+            } else {
+                Vec::new()
+            };
+            self.usage.insert(file.to_string(), UsageCache { list, dirty: false, written: now() });
+        }
+        Ok(self.usage.get_mut(file))
+    }
+
+    /// The usage reports kept for a file's library (none when it has no library).
+    pub fn library_usage(&mut self, file: &str) -> Result<Vec<FileUsage>, String> {
+        Ok(self.usage_of(file)?.map(|u| u.list.clone()).unwrap_or_default())
+    }
+
+    /// Keep how one file uses a file's library (in memory; written when it changed, at most every
+    /// [`USAGE_WRITE_EVERY`] seconds).
+    pub fn report_usage(&mut self, file: &str, usage: Usage) -> Result<(), String> {
+        let name = clean_name(&usage.file);
+        if name.is_empty() {
+            return Ok(());
+        }
+        let mut components: Vec<_> = usage.components.into_iter().filter(|(_, n)| *n > 0).take(MAX_REPORTED * 4).collect();
+        components.sort();
+        components.dedup_by_key(|c| c.0);
+        components.truncate(MAX_REPORTED);
+        let Some(u) = self.usage_of(file)? else { return Ok(()) };
+        match u.list.iter_mut().find(|f| f.usage.file == name) {
+            Some(f) if f.usage.components == components => return Ok(()),
+            Some(f) => {
+                f.usage.components = components;
+                f.updated = now();
+            }
+            None => u.list.push(FileUsage { usage: Usage { file: name, components }, updated: now() }),
+        }
+        if u.list.len() > MAX_USERS {
+            u.list.sort_by_key(|f| std::cmp::Reverse(f.updated));
+            u.list.truncate(MAX_USERS);
+        }
+        u.dirty = true;
+        if now() >= u.written.saturating_add(USAGE_WRITE_EVERY) {
+            self.write_usage(false);
+        }
+        Ok(())
+    }
+
+    /// Write the usage reports that changed (`all`: whenever they were last written).
+    pub(super) fn write_usage(&mut self, all: bool) {
+        let t = now();
+        let root = self.root.join(FILES);
+        for (file, u) in &mut self.usage {
+            if u.dirty && (all || t >= u.written.saturating_add(USAGE_WRITE_EVERY)) {
+                if let Err(e) = write_json(&root.join(file).join(USAGE), &u.list) {
+                    log::warn!("file {file}: library usage couldn't be kept: {e}");
+                }
+                (u.dirty, u.written) = (false, t);
+            }
+        }
+    }
+}
+
+/// The name of the file holding version `version` of a file's team library.
+pub fn library_name(version: u64) -> String {
+    format!("library-{version}.bin")
+}
+
+/// Where version `version` of the team library in `dir` is: its own file, or `library.bin` for a
+/// version published before each version had one.
+fn library_file(dir: &Path, version: u64) -> PathBuf {
+    let path = dir.join(library_name(version));
+    if path.exists() { path } else { dir.join(LIBRARY) }
+}
diff --git a/apps/figcraft-server/src/store/links.rs b/apps/figcraft-server/src/store/links.rs
new file mode 100644
index 00000000..ad30f458
--- /dev/null
+++ b/apps/figcraft-server/src/store/links.rs
@@ -0,0 +1,154 @@
+use super::*;
+
+impl Store {
+    /// The files kept.
+    pub fn list(&self, open: &dyn Fn(&str) -> Option<OpenFile>) -> Vec<FileInfo> {
+        self.files.iter().map(|(id, e)| self.info(id, e, open(id))).collect()
+    }
+
+    /// A file's links.
+    pub fn links(&mut self, file: &str) -> Result<Vec<LinkInfo>, String> {
+        Ok(self.entry(file)?.links.iter().map(|l| l.info(file)).collect())
+    }
+
+    /// A new link to a file.
+    pub fn create_link(&mut self, file: &str, access: Access, label: &str) -> Result<NewLink, String> {
+        let max = self.cfg.max_links;
+        let path = self.dir(file).join(LINKS);
+        let entry = self.entry(file)?;
+        if entry.links.len() >= max {
+            return Err(format!("a file has at most {max} links: revoke one first"));
+        }
+        let (link, token) = new_link(access, &clean_name(label), now())?;
+        entry.links.push(link.clone());
+        if let Err(e) = write_json(&path, &entry.links) {
+            entry.links.pop();
+            return Err(format!("couldn't keep the link: {e}"));
+        }
+        Ok(NewLink { link: link.info(file), token })
+    }
+
+    /// The link of `entry` whose token `token` is (every link is compared, in constant time, so
+    /// timing doesn't tell which one matched).
+    pub(super) fn link_of(entry: &Entry, token: &str) -> Option<usize> {
+        let presented = hash(token);
+        let mut found = None;
+        for (i, l) in entry.links.iter().enumerate() {
+            if same_secret(&presented, &l.hash) {
+                found = Some(i);
+            }
+        }
+        found
+    }
+
+    /// These join codes no longer open anything: typing one says so.
+    fn forget_codes(&mut self, codes: impl IntoIterator<Item = Sealed>) {
+        self.gone_codes.extend(codes.into_iter().map(|c| c.hash));
+        let extra = self.gone_codes.len().saturating_sub(MAX_GONE_CODES);
+        self.gone_codes.drain(..extra);
+    }
+
+    /// Where the link with the join code `key` is: its file, its place among the file's links
+    /// and its token (every code is compared, so timing doesn't tell which one matched).
+    fn find_code(&self, key: &codes::Key) -> Option<(String, usize, String)> {
+        let mut found = None;
+        for (id, e) in &self.files {
+            for (i, l) in e.links.iter().enumerate() {
+                if let Some(token) = l.code.as_ref().and_then(|c| key.open(c)) {
+                    found = Some((id.clone(), i, token));
+                }
+            }
+        }
+        found
+    }
+
+    /// A new join code for the link of `file` whose token is `token` (it takes the place of the
+    /// link's earlier code): the code, shown this once.
+    pub fn set_code(&mut self, file: &str, token: &str) -> Result<String, String> {
+        let at = Self::link_of(self.entry(file)?, token).ok_or("that token isn't one of this file's links (it may have been revoked)")?;
+        // 45 random bits: one already in use is all but impossible, and never handed out twice.
+        let (code, key) = loop {
+            let code = codes::new_code()?;
+            let key = codes::Key::new(&code);
+            if self.find_code(&key).is_none() {
+                break (code, key);
+            }
+        };
+        let sealed = key.seal(token)?;
+        let path = self.dir(file).join(LINKS);
+        let entry = self.entry(file)?;
+        let link = entry.links.get_mut(at).ok_or("that file has no such link")?;
+        let before = link.code.replace(sealed);
+        let id = link.id.clone();
+        if let Err(e) = write_json(&path, &entry.links) {
+            if let Some(l) = entry.links.get_mut(at) {
+                l.code = before;
+            }
+            return Err(format!("couldn't keep the join code: {e}"));
+        }
+        self.forget_codes(before);
+        log::info!("event=code file={file} link={id}");
+        Ok(code)
+    }
+
+    /// The file a join code typed at `ip` opens, and its link's token; wrong codes count against
+    /// the address (see `abuse`), and nothing is looked up for an address that is locked out.
+    pub fn resolve_code(&mut self, ip: IpAddr, typed: &str) -> Result<(String, String), String> {
+        let now = Instant::now();
+        if let Some(left) = self.abuse.code_locked(ip, now) {
+            return Err(format!(
+                "Too many wrong codes from your address: try again in {} minutes, or join with the invite link",
+                left.as_secs() / 60 + 1
+            ));
+        }
+        if !self.abuse.allow(ip, Action::Code, now) {
+            return Err("Too many codes tried from your address: wait a minute and try again".into());
+        }
+        if !self.abuse.codes_open(now) {
+            return Err(CODES_BUSY.into());
+        }
+        // Anything that isn't a code's symbols is a wrong code too (and costs no hashing).
+        let key = figcraft_collab::code::normalize(typed).ok().filter(|c| c.len() == figcraft_collab::code::ONLINE_LEN).map(|c| codes::Key::new(&c));
+        let found = key.as_ref().and_then(|k| self.find_code(k));
+        self.abuse.code_tried(ip, found.is_some(), now);
+        match found {
+            Some((file, _, token)) => {
+                log::info!("event=code_used file={file} ip={ip}");
+                Ok((file, token))
+            }
+            None => {
+                let gone = key.is_some_and(|k| self.gone_codes.iter().any(|g| g == k.hash()));
+                Err(if gone { CODE_GONE } else { NO_CODE }.into())
+            }
+        }
+    }
+
+    /// Revoke a link.
+    pub fn revoke(&mut self, file: &str, link: &str) -> Result<(), String> {
+        let path = self.dir(file).join(LINKS);
+        let entry = self.entry(file)?;
+        let at = entry.links.iter().position(|l| l.id == link).ok_or("that file has no such link")?;
+        let gone = entry.links.remove(at);
+        if let Err(e) = write_json(&path, &entry.links) {
+            entry.links.insert(at, gone);
+            return Err(format!("couldn't revoke the link: {e}"));
+        }
+        log::info!("revoked link {link} of file {file}");
+        self.forget_codes(gone.code);
+        Ok(())
+    }
+
+    /// Remove a file and its links for good. `Err` when its folder couldn't be deleted (it is no
+    /// longer served either way).
+    pub fn remove(&mut self, file: &str) -> Result<(), String> {
+        // Closed first: an open log would keep the folder from being deleted on Windows.
+        let entry = self.files.remove(file).ok_or("this file isn't on the server (it may have been removed)")?;
+        self.forget_codes(entry.links.iter().filter_map(|l| l.code.clone()));
+        drop(entry);
+        let dir = self.dir(file);
+        fs::remove_dir_all(&dir)
+            .map_err(|e| format!("it is no longer served, but its folder {} couldn't be deleted ({e}); delete it by hand", dir.display()))?;
+        log::info!("removed file {file}");
+        Ok(())
+    }
+}
diff --git a/apps/figcraft-server/src/store_tests.rs b/apps/figcraft-server/src/store_tests.rs
index f380568c..93a872ee 100644
--- a/apps/figcraft-server/src/store_tests.rs
+++ b/apps/figcraft-server/src/store_tests.rs
@@ -127,6 +127,34 @@ fn a_file_survives_a_crash_and_compacts() {
     assert_eq!(store.list(&|_| None)[0].seq, seq, "the description follows");
 }
 
+#[test]
+fn read_only_sessions_keep_client_ids_without_rewriting_the_snapshot() {
+    let dir = TempDir::new("read-only-reconnects");
+    let c = StoreConfig { compact_after: 1000, ..cfg(dir.path()) };
+    let (id, original) = {
+        let mut store = Store::open(dir.path(), c.clone()).unwrap();
+        let (id, _, _) = publish(&mut store, "Read only");
+        let bytes = fs::read(dir.path().join(FILES).join(&id).join(SNAPSHOT)).unwrap();
+        (id, bytes)
+    };
+    let mut last_client = 0;
+    for _ in 0..6 {
+        let mut store = Store::open(dir.path(), c.clone()).unwrap();
+        let mut server = store.open(&id).unwrap();
+        let client = join(&mut server, Access::View);
+        assert!(client.id() > last_client, "issued ids survive closing and reopening the store");
+        last_client = client.id();
+        store.changed(&id, &mut server);
+        // Idle must sync even if no periodic flush ran before the connection closed.
+        assert!(store.idle(&id, &mut server));
+        assert_eq!(store.compactions(), 0, "a client id does not require rebuilding the image-bearing snapshot");
+        assert_eq!(fs::read(dir.path().join(FILES).join(&id).join(SNAPSHOT)).unwrap(), original);
+        let log = disk::read_log(&fs::read(dir.path().join(FILES).join(&id).join(LOG)).unwrap()).unwrap();
+        assert!(!log.entries.is_empty());
+        assert_eq!(server.seq(), 0);
+    }
+}
+
 #[test]
 fn a_long_log_is_compacted_while_open() {
     let dir = TempDir::new("compact");
@@ -229,6 +257,17 @@ fn one_server_per_data_directory() {
     assert_eq!(again.key(), key, "the key is kept");
 }
 
+#[cfg(unix)]
+#[test]
+fn an_existing_data_directory_is_made_private() {
+    use std::os::unix::fs::PermissionsExt;
+    let dir = TempDir::new("perms");
+    fs::set_permissions(dir.path(), fs::Permissions::from_mode(0o755)).unwrap();
+    assert!(crate::store::lock(dir.path()).unwrap().is_some());
+    let mode = fs::metadata(dir.path()).unwrap().permissions().mode() & 0o777;
+    assert_eq!(mode, 0o700);
+}
+
 #[test]
 fn temporary_directories_are_removed() {
     let path = {
@@ -241,6 +280,19 @@ fn temporary_directories_are_removed() {
     assert!(!path.exists());
 }
 
+#[test]
+fn snapshot_encoding_keeps_the_existing_framing_and_checksum() {
+    let state = Server::new(doc("Snapshot framing"), "", figcraft_collab::Limits::default()).state().unwrap();
+    let body = figcraft_collab::message::encode(&state).unwrap();
+    let mut legacy = b"FCSN\x01".to_vec();
+    legacy.extend_from_slice(&37u64.to_le_bytes());
+    legacy.extend_from_slice(&crc32fast::hash(&body).to_le_bytes());
+    legacy.extend_from_slice(&body);
+    let encoded = disk::encode_snapshot(37, &state).unwrap();
+    assert_eq!(encoded, legacy);
+    assert_eq!(disk::decode_snapshot(&encoded).unwrap(), (37, state));
+}
+
 #[test]
 fn random_bytes_never_panic_the_readers() {
     let mut rng = Rng::new(7);
@@ -313,3 +365,129 @@ fn edits_confirmed_after_a_compaction_cut_short_survive_a_restart() {
     let name = page_name(&restored);
     assert!(at(&name) >= at(&confirmed), "restored {name:?}, confirmed {confirmed:?}");
 }
+
+#[test]
+fn a_log_that_cant_be_read_is_never_overwritten() {
+    let dir = TempDir::new("unreadlog");
+    let c = StoreConfig { compact_after: 1000, ..cfg(dir.path()) };
+    let log_path = dir.path().join(FILES);
+    let last = "Confirmed page name number 39 with some padding";
+    let id = {
+        let mut store = Store::open(dir.path(), c.clone()).unwrap();
+        let (id, _, _) = publish(&mut store, "Busy");
+        let mut server = store.open(&id).unwrap();
+        let mut a = join(&mut server, Access::Edit);
+        store.changed(&id, &mut server);
+        for i in 0..40 {
+            rename(&mut server, &mut a, &format!("Confirmed page name number {i} with some padding"));
+            store.changed(&id, &mut server);
+        }
+        assert!(store.flush().is_empty());
+        id
+    };
+    let log_path = log_path.join(&id).join(LOG);
+    let before = fs::read(&log_path).unwrap();
+    // The cap lowered just under the log: it can't be read now, but it must still be there after.
+    let lowered = StoreConfig { max_file_bytes: before.len() as u64 - 1, ..c.clone() };
+    {
+        let mut store = Store::open(dir.path(), lowered).unwrap();
+        let opened = store.open(&id);
+        assert!(opened.is_err(), "the file isn't opened without its log");
+        assert!(!store.problems().is_empty(), "the problem is reported");
+        assert_eq!(fs::read(&log_path).unwrap(), before, "the log is left as it was");
+    }
+    let mut store = Store::open(dir.path(), c).unwrap();
+    let server = store.open(&id).unwrap();
+    assert_eq!(page_name(&server), last, "every confirmed edit comes back");
+}
+
+#[test]
+fn a_log_that_isnt_one_is_moved_aside() {
+    let dir = TempDir::new("badlog");
+    let mut store = Store::open(dir.path(), cfg(dir.path())).unwrap();
+    let (id, _, _) = publish(&mut store, "Busy");
+    let folder = dir.path().join(FILES).join(&id);
+    let junk = b"not a log at all, but maybe worth keeping".to_vec();
+    fs::write(folder.join(LOG), &junk).unwrap();
+    drop(store);
+    let mut store = Store::open(dir.path(), cfg(dir.path())).unwrap();
+    store.open(&id).unwrap();
+    assert!(store.problems().iter().any(|p| p.contains("moved aside")), "{:?}", store.problems());
+    let kept = fs::read_dir(&folder).unwrap().filter_map(|e| e.ok()).any(|e| fs::read(e.path()).is_ok_and(|b| b == junk));
+    assert!(kept, "the old log's bytes are kept beside the file");
+}
+
+const BIDI: [char; 12] =
+    ['\u{61C}', '\u{200E}', '\u{200F}', '\u{202A}', '\u{202B}', '\u{202C}', '\u{202D}', '\u{202E}', '\u{2066}', '\u{2067}', '\u{2068}', '\u{2069}'];
+
+#[test]
+fn names_and_report_reasons_lose_bidi_controls() {
+    let dir = TempDir::new("bidi");
+    let mut store = Store::open(dir.path(), cfg(dir.path())).unwrap();
+    for (n, m) in BIDI.into_iter().enumerate() {
+        let ip: std::net::IpAddr = format!("192.0.2.{}", n + 1).parse().unwrap();
+        let (id, _, _) = publish(&mut store, &format!("a{m}b"));
+        assert_eq!(store.list(&|_| None)[0].name, "ab", "name U+{:04X}", m as u32);
+        store.keep_report(&id, None, ip, &format!("a{m}b")).unwrap();
+        assert_eq!(store.reports().last().unwrap().reason, "a b", "reason U+{:04X}", m as u32);
+        store.remove(&id).unwrap();
+    }
+    // A reason that is only control characters says nothing.
+    let (id, _, _) = publish(&mut store, "blank");
+    for blank in ["\0", "\u{202E}", " \0\t\u{2066} "] {
+        assert!(store.keep_report(&id, None, "192.0.2.99".parse().unwrap(), blank).is_err(), "{blank:?}");
+    }
+}
+
+#[test]
+fn a_maxed_out_generation_does_not_wrap() {
+    let dir = TempDir::new("maxgen");
+    let c = StoreConfig { compact_after: 3, ..cfg(dir.path()) };
+    let mut store = Store::open(dir.path(), c.clone()).unwrap();
+    let (id, _, _) = publish(&mut store, "Max");
+    let path = dir.path().join(FILES).join(&id);
+    let (_, state) = disk::decode_snapshot(&fs::read(path.join(SNAPSHOT)).unwrap()).unwrap();
+    // Loading: no log goes with the snapshot, so the next generation would overflow.
+    fs::write(path.join(SNAPSHOT), disk::encode_snapshot(u64::MAX, &state).unwrap()).unwrap();
+    fs::remove_file(path.join(LOG)).unwrap();
+    assert!(store.open(&id).is_err());
+    // Compacting: the open log is at the largest generation.
+    fs::write(path.join(SNAPSHOT), disk::encode_snapshot(u64::MAX - 1, &state).unwrap()).unwrap();
+    let _ = fs::remove_file(path.join(LOG));
+    let mut server = store.open(&id).unwrap();
+    let mut a = join(&mut server, Access::Edit);
+    store.changed(&id, &mut server);
+    for i in 0..4 {
+        rename(&mut server, &mut a, &format!("P{i}"));
+        store.changed(&id, &mut server);
+        store.flush();
+    }
+    let snap = disk::check_snapshot(&fs::read(path.join(SNAPSHOT)).unwrap()).unwrap();
+    assert_eq!(snap, u64::MAX);
+}
+
+#[test]
+fn every_leftover_temporary_file_is_removed_at_startup() {
+    let dir = TempDir::new("leftovers");
+    let id = {
+        let mut store = Store::open(dir.path(), cfg(dir.path())).unwrap();
+        let id = publish(&mut store, "A").0;
+        store.flush();
+        id
+    };
+    let folder = dir.path().join(FILES).join(&id);
+    let leftovers = [
+        dir.path().join("blocked.json.tmp"),
+        dir.path().join("reports.json.tmp"),
+        dir.path().join("server.key.tmp"),
+        folder.join("usage.json.tmp"),
+        folder.join("library-1.bin.tmp"),
+    ];
+    for path in &leftovers {
+        fs::write(path, b"half").unwrap();
+    }
+    let _store = Store::open(dir.path(), cfg(dir.path())).unwrap();
+    for path in &leftovers {
+        assert!(!path.exists(), "leftover not cleaned at startup: {}", path.display());
+    }
+}
diff --git a/apps/figcraft-server/tests/it/header_recovery.rs b/apps/figcraft-server/tests/it/header_recovery.rs
new file mode 100644
index 00000000..bb0be1d0
--- /dev/null
+++ b/apps/figcraft-server/tests/it/header_recovery.rs
@@ -0,0 +1,138 @@
+//! A generation field damaged after an abrupt stop must not make the server drop a log that still
+//! holds confirmed edits (#408): the log is replayed over the snapshot, which only the changes the
+//! snapshot lacks survive, and the damage is reported. A genuine leftover of a compaction cut short
+//! still restores silently.
+
+use figcraft_collab::message::{Access, ClientMsg};
+use figcraft_collab::{Client, Outgoing, Replica, Server};
+use figcraft_collab_net::hub::Backend;
+use figcraft_doc::Document;
+use figcraft_server::config::Config;
+use figcraft_server::disk::{self, LOG, SNAPSHOT};
+use figcraft_server::store::{FILES, Store};
+use std::fs;
+use std::path::{Path, PathBuf};
+
+struct Fixture(PathBuf);
+
+impl Fixture {
+    fn new() -> Self {
+        let path = std::env::temp_dir().join(format!("figcraft-header-recovery-{}", figcraft_collab_net::token::file_id().unwrap()));
+        fs::create_dir(&path).unwrap();
+        Self(path)
+    }
+}
+
+impl Drop for Fixture {
+    fn drop(&mut self) {
+        let _ = fs::remove_dir_all(&self.0);
+    }
+}
+
+fn page_name(server: &Server) -> String {
+    let doc = server.document();
+    doc.node(doc.first_page().unwrap()).unwrap().name.clone()
+}
+
+/// A published file whose first page was renamed "Kept", flushed to its log (not compacted), then
+/// the store dropped without stopping (an abrupt stop). Returns the file id and the final state.
+fn renamed_and_stopped(data: &Path) -> (String, Server) {
+    let mut store = Store::open(data, Config::default().store()).unwrap();
+    let snapshot = Replica::new(Document::new("Fixture")).snapshot().unwrap();
+    let (info, _, _) = store.publish("Fixture", &snapshot).unwrap();
+    let id = info.id;
+    let mut server = store.open(&id).unwrap();
+    let ClientMsg::Hello(hello) = Client::hello("f", "", "Editor", "#FF8800") else { panic!("not a hello") };
+    let (_, messages) = server.join_as(hello, Access::Edit).unwrap();
+    let Some(Outgoing::To(_, welcome)) = messages.into_iter().next() else { panic!("no welcome") };
+    let mut client = Client::join(welcome).unwrap();
+    store.changed(&id, &mut server);
+    let mut edited = client.document().clone();
+    let page = edited.first_page().unwrap();
+    edited.node_mut(page).unwrap().name = "Kept".into();
+    let change = client.edit(&edited).unwrap().unwrap();
+    assert!(!server.receive(client.id(), change).is_empty());
+    store.changed(&id, &mut server);
+    assert!(store.flush().is_empty(), "the edit must reach disk");
+    assert_eq!(page_name(&server), "Kept");
+    let dir = data.join(FILES).join(&id);
+    assert!(!disk::read_log(&fs::read(dir.join(LOG)).unwrap()).unwrap().entries.is_empty());
+    assert_eq!(disk::decode_snapshot(&fs::read(dir.join(SNAPSHOT)).unwrap()).unwrap().1.seq, 0, "the rename is only in the log");
+    drop(store);
+    (id, server)
+}
+
+/// Reopen the data directory: the file's first page name and the problems reported.
+fn reopen(data: &Path, id: &str) -> (String, Vec<String>) {
+    let mut store = Store::open(data, Config::default().store()).unwrap();
+    let server = store.open(id).unwrap();
+    (page_name(&server), store.problems().to_vec())
+}
+
+fn flip(path: &Path, at: usize) {
+    let mut bytes = fs::read(path).unwrap();
+    bytes[at] ^= 1;
+    fs::write(path, bytes).unwrap();
+}
+
+/// The generation field's first byte in both headers (after the magic and the format byte).
+const GENERATION_AT: usize = 5;
+
+#[test]
+fn an_intact_log_restores_its_edits_without_a_report() {
+    let fixture = Fixture::new();
+    let (id, _) = renamed_and_stopped(&fixture.0);
+    let (name, problems) = reopen(&fixture.0, &id);
+    assert_eq!(name, "Kept");
+    assert!(problems.is_empty(), "{problems:?}");
+}
+
+#[test]
+fn a_damaged_log_generation_keeps_the_edits_and_is_reported() {
+    let fixture = Fixture::new();
+    let (id, _) = renamed_and_stopped(&fixture.0);
+    let log = fixture.0.join(FILES).join(&id).join(LOG);
+    flip(&log, GENERATION_AT);
+    // The records themselves still read: only the header's generation changed.
+    let read = disk::read_log(&fs::read(&log).unwrap()).unwrap();
+    assert!(read.damaged.is_none() && !read.entries.is_empty());
+    let (name, problems) = reopen(&fixture.0, &id);
+    assert_eq!(name, "Kept", "the flushed rename must survive");
+    assert!(problems.iter().any(|p| p.contains(&id) && p.contains("generation")), "{problems:?}");
+    // And it stays: the recovered edit is now in the file's snapshot.
+    assert_eq!(reopen(&fixture.0, &id).0, "Kept");
+}
+
+#[test]
+fn a_damaged_snapshot_generation_keeps_the_edits_and_is_reported() {
+    let fixture = Fixture::new();
+    let (id, _) = renamed_and_stopped(&fixture.0);
+    let snapshot = fixture.0.join(FILES).join(&id).join(SNAPSHOT);
+    flip(&snapshot, GENERATION_AT);
+    assert!(disk::check_snapshot(&fs::read(&snapshot).unwrap()).is_ok(), "the generation is outside the checksum");
+    let (name, problems) = reopen(&fixture.0, &id);
+    assert_eq!(name, "Kept", "the flushed rename must survive");
+    assert!(problems.iter().any(|p| p.contains(&id) && p.contains("generation")), "{problems:?}");
+    assert_eq!(reopen(&fixture.0, &id).0, "Kept");
+}
+
+#[test]
+fn a_damaged_log_format_is_still_reported() {
+    let fixture = Fixture::new();
+    let (id, _) = renamed_and_stopped(&fixture.0);
+    flip(&fixture.0.join(FILES).join(&id).join(LOG), 4);
+    let (_, problems) = reopen(&fixture.0, &id);
+    assert!(problems.iter().any(|p| p.contains(&id) && p.contains("format")), "{problems:?}");
+}
+
+#[test]
+fn a_log_left_by_a_compaction_cut_short_restores_without_a_report() {
+    let fixture = Fixture::new();
+    let (id, server) = renamed_and_stopped(&fixture.0);
+    // The next snapshot was written (it holds the rename); the old log wasn't replaced yet.
+    let bytes = disk::encode_snapshot(2, &server.state().unwrap()).unwrap();
+    fs::write(fixture.0.join(FILES).join(&id).join(SNAPSHOT), bytes).unwrap();
+    let (name, problems) = reopen(&fixture.0, &id);
+    assert_eq!(name, "Kept");
+    assert!(problems.is_empty(), "a leftover log is expected, not damage: {problems:?}");
+}
diff --git a/apps/figcraft-server/tests/it/main.rs b/apps/figcraft-server/tests/it/main.rs
new file mode 100644
index 00000000..3027ed99
--- /dev/null
+++ b/apps/figcraft-server/tests/it/main.rs
@@ -0,0 +1,5 @@
+//! The crate's integration tests, built as one test binary.
+
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod header_recovery;
+mod problem_retention;
diff --git a/apps/figcraft-server/tests/problem_retention.rs b/apps/figcraft-server/tests/it/problem_retention.rs
similarity index 100%
rename from apps/figcraft-server/tests/problem_retention.rs
rename to apps/figcraft-server/tests/it/problem_retention.rs
diff --git a/apps/figcraft-web/Cargo.toml b/apps/figcraft-web/Cargo.toml
index 2f1a8190..aa0fdffb 100644
--- a/apps/figcraft-web/Cargo.toml
+++ b/apps/figcraft-web/Cargo.toml
@@ -24,6 +24,8 @@ log = { workspace = true }
 # `wgpu` pulls egui-wgpu's defaults: WebGPU plus the WebGL2 fallback.
 eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit"] }
 wasm-bindgen = "0.2"
+base64 = { workspace = true }
+serde_json = { workspace = true }
 js-sys = "0.3"
 wasm-bindgen-futures = "0.4"
-web-sys = { version = "0.3", features = ["Window", "Document", "Element", "HtmlCanvasElement", "HtmlElement", "HtmlAnchorElement", "Node", "Blob", "BlobPropertyBag", "Url", "Location", "MediaQueryList", "Navigator", "Gamepad", "GamepadButton", "GamepadMappingType"] }
+web-sys = { version = "0.3", features = ["Window", "Document", "Element", "HtmlCanvasElement", "HtmlElement", "HtmlAnchorElement", "Node", "Blob", "BlobPropertyBag", "File", "FileList", "HtmlInputElement", "EventTarget", "Url", "Location", "MediaQueryList", "Navigator", "Gamepad", "GamepadButton", "GamepadMappingType"] }
diff --git a/apps/figcraft-web/index.html b/apps/figcraft-web/index.html
index 1a9969d5..f610aa81 100644
--- a/apps/figcraft-web/index.html
+++ b/apps/figcraft-web/index.html
@@ -2,12 +2,12 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+  <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, viewport-fit=cover">
   <title>FigCraft</title>
   <link data-trunk rel="rust" data-bin="figcraft-web" data-cargo-profile="web-release" data-wasm-opt="z" data-wasm-opt-params="--enable-bulk-memory --enable-bulk-memory-opt --enable-nontrapping-float-to-int --enable-sign-ext --enable-reference-types --enable-multivalue" data-weak-refs />
   <style>
-    html, body { margin: 0; padding: 0; width: 100%; height: 100%; overflow: hidden; background: #f5f5f5; }
-    #figcraft_canvas { position: absolute; inset: 0; width: 100%; height: 100%; display: block; }
+    html, body { margin: 0; padding: 0; width: 100%; height: 100%; overflow: hidden; overscroll-behavior: none; background: #f5f5f5; }
+    #figcraft_canvas { position: absolute; inset: 0; width: 100%; height: 100%; display: block; touch-action: none; }
     #figcraft_loading { position: absolute; inset: 0; display: flex; flex-direction: column; align-items: center; justify-content: center;
       color: #6b6b6b; font: 14px system-ui, sans-serif; pointer-events: none; }
     @media (prefers-color-scheme: dark) {
diff --git a/apps/figcraft-web/src/api.rs b/apps/figcraft-web/src/api.rs
new file mode 100644
index 00000000..621925cf
--- /dev/null
+++ b/apps/figcraft-web/src/api.rs
@@ -0,0 +1,172 @@
+//! `window.figcraft`: the control channel for the page, as promises.
+//!
+//! The same JSON methods as the desktop control server (`docs/control-protocol.md`), so an agent
+//! driving FigCraft in a browser tab (or an `<iframe>` in another app) uses the same commands as
+//! the CLI and the MCP server:
+//!
+//! ```js
+//! await figcraft.execute("node.create", {kind: "frame", name: "Home"})  // engine command → its result
+//! await figcraft.request("document.inspect")                            // control method → its result
+//! await figcraft.commands()                                             // command list
+//! const {base64} = await figcraft.screenshot()                          // the canvas as PNG (base64)
+//! await figcraft.openFile("home.fig", bytes)                            // `file.open` with the bytes
+//! figcraft.captureDownloads(true)                                       // saves stay in the page…
+//! figcraft.files(); await figcraft.readFile("home.figcraft")            // …to be read back
+//! ```
+//!
+//! Results resolve with the method's `result`; errors reject with an `Error`.
+
+use std::cell::{Cell, RefCell};
+use std::sync::mpsc::{Receiver, TryRecvError};
+
+use base64::Engine as _;
+use figcraft_ui_egui::{ControlReply, ControlRequest};
+use serde_json::{Value, json};
+use wasm_bindgen::prelude::*;
+
+use crate::saved_files::SavedFiles;
+
+type Waiting = (Receiver<ControlReply>, js_sys::Function, js_sys::Function);
+
+thread_local! {
+    static QUEUE: RefCell<Vec<ControlRequest>> = const { RefCell::new(Vec::new()) };
+    static WAITING: RefCell<Vec<Waiting>> = const { RefCell::new(Vec::new()) };
+    static NEXT_ID: Cell<u64> = const { Cell::new(0) };
+    static CTX: RefCell<Option<egui::Context>> = const { RefCell::new(None) };
+    static CAPTURE: Cell<bool> = const { Cell::new(false) };
+    static SAVED: RefCell<SavedFiles> = RefCell::new(SavedFiles::default());
+}
+
+pub fn connect(ctx: egui::Context) {
+    CTX.with(|c| *c.borrow_mut() = Some(ctx));
+}
+
+/// The page's requests since the last frame, for the app's control queue.
+pub fn take_requests() -> Vec<ControlRequest> {
+    QUEUE.with(|q| std::mem::take(&mut *q.borrow_mut()))
+}
+
+/// Keep a save instead of downloading it, when the page asked for that. True when kept.
+pub fn capture(name: &str, bytes: &[u8]) -> bool {
+    if !CAPTURE.with(Cell::get) {
+        return false;
+    }
+    SAVED.with(|s| s.borrow_mut().keep(name, bytes));
+    true
+}
+
+fn to_js(v: &Value) -> JsValue {
+    js_sys::JSON::parse(&v.to_string()).unwrap_or(JsValue::NULL)
+}
+
+fn from_js(v: &JsValue) -> Value {
+    if v.is_undefined() || v.is_null() {
+        return json!({});
+    }
+    js_sys::JSON::stringify(v).ok().and_then(|s| s.as_string()).and_then(|s| serde_json::from_str(&s).ok()).unwrap_or(json!({}))
+}
+
+/// Settle the promises of answered requests (called every frame).
+pub fn poll_replies() {
+    WAITING.with(|w| {
+        w.borrow_mut().retain(|(rx, resolve, reject)| match rx.try_recv() {
+            Ok(ControlReply { result: Ok(v), .. }) => {
+                let _ = resolve.call1(&JsValue::NULL, &to_js(&v));
+                false
+            }
+            Ok(ControlReply { result: Err(e), .. }) => {
+                let _ = reject.call1(&JsValue::NULL, &js_sys::Error::new(&e));
+                false
+            }
+            Err(TryRecvError::Empty) => true,
+            Err(TryRecvError::Disconnected) => {
+                let _ = reject.call1(&JsValue::NULL, &js_sys::Error::new("request dropped"));
+                false
+            }
+        });
+    });
+}
+
+fn request(method: &str, params: Value) -> js_sys::Promise {
+    let method = method.to_string();
+    let p = js_sys::Promise::new(&mut |resolve, reject| {
+        let (reply, rx) = std::sync::mpsc::channel();
+        let id = NEXT_ID.with(|n| {
+            n.set(n.get() + 1);
+            n.get()
+        });
+        let req = ControlRequest { id: json!(id), method: method.clone(), params: params.clone(), reply, state: Default::default() };
+        QUEUE.with(|q| q.borrow_mut().push(req));
+        WAITING.with(|w| w.borrow_mut().push((rx, resolve, reject)));
+    });
+    CTX.with(|c| {
+        if let Some(ctx) = c.borrow().as_ref() {
+            ctx.request_repaint();
+        }
+    });
+    p
+}
+
+fn set_fn(obj: &js_sys::Object, name: &str, f: JsValue) -> Result<(), JsValue> {
+    js_sys::Reflect::set(obj, &name.into(), &f).map(|_| ())
+}
+
+/// Install `window.figcraft`.
+pub fn install() -> Result<(), JsValue> {
+    let obj = js_sys::Object::new();
+    set_fn(
+        &obj,
+        "request",
+        Closure::<dyn Fn(String, JsValue) -> js_sys::Promise>::new(|method: String, params: JsValue| request(&method, from_js(&params)))
+            .into_js_value(),
+    )?;
+    set_fn(
+        &obj,
+        "execute",
+        Closure::<dyn Fn(String, JsValue) -> js_sys::Promise>::new(|command: String, params: JsValue| {
+            request("engine.execute", json!({"command": command, "params": from_js(&params)}))
+        })
+        .into_js_value(),
+    )?;
+    set_fn(&obj, "commands", Closure::<dyn Fn() -> js_sys::Promise>::new(|| request("engine.commands", json!({}))).into_js_value())?;
+    set_fn(&obj, "inspect", Closure::<dyn Fn() -> js_sys::Promise>::new(|| request("document.inspect", json!({}))).into_js_value())?;
+    set_fn(
+        &obj,
+        "screenshot",
+        Closure::<dyn Fn(JsValue) -> js_sys::Promise>::new(|params: JsValue| request("ui.screenshot", from_js(&params))).into_js_value(),
+    )?;
+    set_fn(
+        &obj,
+        "openFile",
+        Closure::<dyn Fn(String, js_sys::Uint8Array) -> js_sys::Promise>::new(|name: String, bytes: js_sys::Uint8Array| {
+            let data = base64::engine::general_purpose::STANDARD.encode(bytes.to_vec());
+            request("engine.execute", json!({"command": "file.open", "params": {"name": name, "data": data}}))
+        })
+        .into_js_value(),
+    )?;
+    set_fn(&obj, "captureDownloads", Closure::<dyn Fn(bool)>::new(|on: bool| CAPTURE.with(|c| c.set(on))).into_js_value())?;
+    set_fn(
+        &obj,
+        "files",
+        Closure::<dyn Fn() -> JsValue>::new(|| {
+            SAVED.with(|s| to_js(&Value::Array(s.borrow().list().map(|(n, size)| json!({"path": n, "size": size})).collect())))
+        })
+        .into_js_value(),
+    )?;
+    set_fn(
+        &obj,
+        "readFile",
+        Closure::<dyn Fn(String) -> Result<JsValue, JsValue>>::new(|name: String| {
+            SAVED.with(|s| {
+                s.borrow()
+                    .get(&name)
+                    .map(|b| js_sys::Uint8Array::from(b).into())
+                    .ok_or_else(|| js_sys::Error::new(&format!("{name}: not found")).into())
+            })
+        })
+        .into_js_value(),
+    )?;
+    let w = web_sys::window().ok_or("no window")?;
+    js_sys::Reflect::set(&w, &"figcraft".into(), &obj)?;
+    Ok(())
+}
diff --git a/apps/figcraft-web/src/main.rs b/apps/figcraft-web/src/main.rs
index 587fd60b..063a501e 100644
--- a/apps/figcraft-web/src/main.rs
+++ b/apps/figcraft-web/src/main.rs
@@ -13,8 +13,22 @@
 //!   (browsers block `ws://` from secure pages); serve it over `http://` on a trusted network to
 //!   join from other machines.
 //!
-//! URL query flag: `?webgl` forces the WebGL2 backend instead of WebGPU.
+//! URL query flags: `?webgl` forces the WebGL2 backend instead of WebGPU; `?control` installs
+//! `window.figcraft`, the page's control channel (`api.rs`), which is off without it.
+//!
+//! URL fragment: `#join=<invite link or join code>` joins that live session once the page has
+//! loaded, so a bookmark opens a shared file. `join` takes the rest of the fragment: put it last.
+//! The link carries the session's secret; a fragment is never sent to the web host, but the address
+//! bar and the browser history keep it, so the URL is as private as the link itself.
 
+#[cfg(target_arch = "wasm32")]
+mod api;
+#[cfg(any(target_arch = "wasm32", test))]
+mod query;
+#[cfg(test)]
+mod query_tests;
+#[cfg(any(target_arch = "wasm32", test))]
+mod saved_files;
 #[cfg(target_arch = "wasm32")]
 mod web;
 
diff --git a/apps/figcraft-web/src/query.rs b/apps/figcraft-web/src/query.rs
new file mode 100644
index 00000000..88a03b2b
--- /dev/null
+++ b/apps/figcraft-web/src/query.rs
@@ -0,0 +1,22 @@
+//! The page's URL: the invite link its fragment names, and the flags its query sets.
+
+/// The invite link in `#join=<link>` (`fragment` is `location.hash`, with or without its `#`), still
+/// escaped. The fragment, unlike the query, never leaves the browser, so the link's secret stays out
+/// of the web host's logs and `Referer` headers. `join` takes the rest of the fragment, so a pasted
+/// `figcraft://join?host=…&file=…&token=…` keeps its own `&`s. Anything longer than an escaped invite
+/// link can be is ignored; what is left is checked by `collab.join` like a link the desktop app is
+/// opened with.
+pub fn join_link(fragment: &str) -> Option<&str> {
+    // An invite link is at most 2 KiB; every byte of it escaped is three.
+    const MAX: usize = 3 * 2048;
+    let fragment = fragment.strip_prefix('#').unwrap_or(fragment);
+    let start = if fragment.starts_with("join=") { 0 } else { fragment.find("&join=")? + 1 };
+    fragment.get(start + "join=".len()..).filter(|link| !link.is_empty() && link.len() <= MAX)
+}
+
+/// Whether `search` (`location.search`, with or without its `?`) has a `control` entry (`?control`,
+/// or `?control=…` with any value): the page's control channel, `window.figcraft`, is installed only
+/// when it is asked for.
+pub fn control(search: &str) -> bool {
+    search.strip_prefix('?').unwrap_or(search).split('&').any(|entry| entry.split('=').next() == Some("control"))
+}
diff --git a/apps/figcraft-web/src/query_tests.rs b/apps/figcraft-web/src/query_tests.rs
new file mode 100644
index 00000000..6113c0ca
--- /dev/null
+++ b/apps/figcraft-web/src/query_tests.rs
@@ -0,0 +1,40 @@
+//! `#join=` and `?control` in the page's URL.
+
+use crate::query::{control, join_link};
+
+#[test]
+fn join_takes_the_rest_of_the_fragment() {
+    let link = "figcraft://join?host=192.168.1.20:47900&file=abc&token=AbCdEfGhIjKlMnOpQrStUv";
+    assert_eq!(join_link(&format!("#join={link}")), Some(link), "a pasted link keeps its own &s");
+    assert_eq!(join_link(&format!("#x=1&join={link}")), Some(link), "after other entries");
+    assert_eq!(join_link("#join=figcraft%3A%2F%2Fjoin%3Fhost%3Dh"), Some("figcraft%3A%2F%2Fjoin%3Fhost%3Dh"), "escaped, decoded later");
+    assert_eq!(join_link("join=K7M-2QX-9TD"), Some("K7M-2QX-9TD"), "a join code, no leading #");
+}
+
+#[test]
+fn no_join_without_the_entry() {
+    assert_eq!(join_link(""), None);
+    assert_eq!(join_link("#"), None);
+    assert_eq!(join_link("#join="), None);
+    assert_eq!(join_link("#rejoin=x"), None, "only the whole entry name");
+    assert_eq!(join_link("#xjoin=x&a=1"), None);
+    assert_eq!(join_link("?join=x"), None, "the query isn't read: it goes to the web host");
+}
+
+#[test]
+fn an_overlong_link_is_ignored() {
+    let long = format!("#join=figcraft://join?host=h&file=f&token={}", "a".repeat(7000));
+    assert_eq!(join_link(&long), None);
+    assert_eq!(join_link(&format!("#join={}", "é".repeat(4000))), None, "length counts bytes");
+}
+
+#[test]
+fn control_is_opt_in() {
+    assert!(control("?control"));
+    assert!(control("?webgl&control=1"), "after other entries, with a value");
+    assert!(control("control"), "no leading ?");
+    assert!(!control(""));
+    assert!(!control("?"));
+    assert!(!control("?webgl"));
+    assert!(!control("?nocontrol&controls"), "only the whole entry name");
+}
diff --git a/apps/figcraft-web/src/saved_files.rs b/apps/figcraft-web/src/saved_files.rs
new file mode 100644
index 00000000..7cd88637
--- /dev/null
+++ b/apps/figcraft-web/src/saved_files.rs
@@ -0,0 +1,70 @@
+//! What the page keeps of the app's saves (`api.rs`): `readFile` reads them back.
+
+/// Saved files kept (the oldest go first).
+pub const MAX_SAVED: usize = 16;
+
+/// The last component of a `/` or `\` path.
+fn file_name(path: &str) -> &str {
+    path.rsplit(['/', '\\']).next().filter(|n| !n.is_empty()).unwrap_or(path)
+}
+
+/// Files by name, newest last: saving a name again replaces it.
+#[derive(Default)]
+pub struct SavedFiles(Vec<(String, Vec<u8>)>);
+
+impl SavedFiles {
+    /// Keep `bytes` under the last component of `path`.
+    pub fn keep(&mut self, path: &str, bytes: &[u8]) {
+        let name = file_name(path).to_string();
+        self.0.retain(|(n, _)| *n != name);
+        self.0.push((name, bytes.to_vec()));
+        let extra = self.0.len().saturating_sub(MAX_SAVED);
+        self.0.drain(..extra);
+    }
+
+    /// A kept file by its name, or by a path ending in it.
+    pub fn get(&self, name: &str) -> Option<&[u8]> {
+        let wanted = file_name(name);
+        self.0.iter().find(|(n, _)| n == wanted).map(|(_, b)| b.as_slice())
+    }
+
+    /// `(name, size)` of each kept file, oldest first.
+    pub fn list(&self) -> impl Iterator<Item = (&str, usize)> {
+        self.0.iter().map(|(n, b)| (n.as_str(), b.len()))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn keeps_by_name_replaces_and_reads_back_by_path() {
+        let mut s = SavedFiles::default();
+        s.keep("exports/poster.png", b"one");
+        s.keep(r"C:\out\poster.png", b"two");
+        s.keep("notes.txt", b"three");
+        assert_eq!(s.list().collect::<Vec<_>>(), vec![("poster.png", 3), ("notes.txt", 5)]);
+        assert_eq!(s.get("poster.png"), Some(&b"two"[..]));
+        assert_eq!(s.get("/exports/poster.png"), Some(&b"two"[..]));
+        assert_eq!(s.get("missing.png"), None);
+    }
+
+    #[test]
+    fn drops_the_oldest_past_the_cap() {
+        let mut s = SavedFiles::default();
+        for i in 0..MAX_SAVED + 3 {
+            s.keep(&format!("f{i}.png"), &[0]);
+        }
+        assert_eq!(s.list().count(), MAX_SAVED);
+        assert_eq!(s.get("f0.png"), None);
+        assert!(s.get(&format!("f{}.png", MAX_SAVED + 2)).is_some());
+    }
+
+    #[test]
+    fn a_trailing_separator_keeps_the_whole_name() {
+        let mut s = SavedFiles::default();
+        s.keep("odd/", b"x");
+        assert_eq!(s.get("odd/"), Some(&b"x"[..]));
+    }
+}
diff --git a/apps/figcraft-web/src/web.rs b/apps/figcraft-web/src/web.rs
index 8cadb013..de17cc36 100644
--- a/apps/figcraft-web/src/web.rs
+++ b/apps/figcraft-web/src/web.rs
@@ -1,7 +1,7 @@
 //! The browser shell: web `Services` and the eframe web runner.
 
 use figcraft_engine::Session;
-use figcraft_ui_egui::{FigApp, Services};
+use figcraft_ui_egui::{ContentsFuture, FigApp, Services};
 use wasm_bindgen::JsCast as _;
 
 const CANVAS_ID: &str = "figcraft_canvas";
@@ -40,7 +40,20 @@ pub fn start() {
                     // on the socket wakes the page for a frame.
                     let ctx = cc.egui_ctx.clone();
                     session.live.install(Box::new(figcraft_collab_net::NetLink::new(std::sync::Arc::new(move || ctx.request_repaint()))));
-                    let fig = FigApp::new(session, Box::new(WebServices { reduce_motion, ctx: cc.egui_ctx.clone() }));
+                    let mut fig = FigApp::new(session, Box::new(WebServices { reduce_motion, ctx: cc.egui_ctx.clone() }));
+                    // `#join=<link>`: join that session, as opening an invite link does on the desktop.
+                    let hash = web_sys::window().and_then(|w| w.location().hash().ok()).unwrap_or_default();
+                    if let Some(link) = crate::query::join_link(&hash) {
+                        let link = js_sys::decode_uri_component(link).ok().and_then(|s| s.as_string()).unwrap_or_else(|| link.to_string());
+                        figcraft_ui_egui::live::open_invite(&mut fig, &link);
+                    }
+                    // `?control`: `window.figcraft`, the page's control channel (crate::api), opt-in.
+                    if crate::query::control(&query()) {
+                        crate::api::connect(cc.egui_ctx.clone());
+                        if let Err(e) = crate::api::install() {
+                            log::error!("couldn't install window.figcraft: {e:?}");
+                        }
+                    }
                     Ok(Box::new(WebShell { fig }))
                 }),
             )
@@ -63,15 +76,26 @@ struct WebShell {
 }
 
 impl eframe::App for WebShell {
-    // `FigApp::ui` runs its own per-frame logic first (fonts, theme), like the desktop app.
+    // eframe runs `logic` for visible tabs and, with only `run_logic`, for hidden ones: keep
+    // autosave/live/control deadlines moving without a paint. `FigApp::ui` does not repeat it.
+    /// Run the browser shell's eframe logic callback: guard `background_tick` so hidden tabs
+    /// still advance autosave, live and control deadlines without painting. `FigApp::ui` does
+    /// not repeat it.
+    fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
+        figcraft_ui_egui::windows::guard(&mut self.fig, ctx, |fig| fig.background_tick(ctx));
+    }
+
     fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        self.fig.control_queue.extend(crate::api::take_requests());
         self.fig.ui(ui);
+        crate::api::poll_replies();
     }
 }
 
-/// Browser services. Open dialogs return nothing for now (the trait's defaults); files are saved
-/// as downloads. Copies go to the system clipboard through egui's output; pastes arrive as paste
-/// events with their text (a page can't read the clipboard when it likes).
+/// Browser services. Files are opened and imported through the browser's file picker, which hands
+/// over their contents (pickers that need a path return nothing, the trait's defaults); files are
+/// saved as downloads. Copies go to the system clipboard through egui's output; pastes arrive as
+/// paste events with their text (a page can't read the clipboard when it likes).
 struct WebServices {
     /// `prefers-reduced-motion: reduce` (it follows the setting while the page is open).
     reduce_motion: Option<web_sys::MediaQueryList>,
@@ -79,11 +103,24 @@ struct WebServices {
 }
 
 impl Services for WebServices {
+    /// An `<input type="file">` taking `exts`, clicked; its file is read once picked.
+    fn pick_open_contents(&mut self, _title: &str, exts: &[&str]) -> Option<ContentsFuture> {
+        let accept = exts.iter().map(|e| format!(".{e}")).collect::<Vec<_>>().join(",");
+        Some(Box::pin(async move {
+            pick_file(&accept).await.unwrap_or_else(|e| {
+                log::error!("couldn't open a file: {e:?}");
+                None
+            })
+        }))
+    }
     fn downloads(&self) -> bool {
         true
     }
     /// A Blob behind a temporary `<a download>` link, clicked and removed.
     fn download(&mut self, name: &str, bytes: &[u8]) -> bool {
+        if crate::api::capture(name, bytes) {
+            return true;
+        }
         match download(name, bytes) {
             Ok(()) => true,
             Err(e) => {
@@ -100,7 +137,7 @@ impl Services for WebServices {
     }
     fn open_url(&mut self, url: &str) {
         let Some(window) = web_sys::window() else { return };
-        if let Err(e) = window.open_with_url_and_target(url, "_blank") {
+        if let Err(e) = window.open_with_url_and_target_and_features(url, "_blank", "noopener,noreferrer") {
             log::error!("couldn't open {url}: {e:?}");
         }
     }
@@ -130,6 +167,90 @@ impl Services for WebServices {
     }
 }
 
+/// The file picked in the browser's file picker (`accept`: the extensions it offers), with its
+/// name; `None` when the picker is cancelled, `Some(Err)` with what to tell the user when the file
+/// can't be read.
+async fn pick_file(accept: &str) -> Result<Option<Result<(String, Vec<u8>), String>>, wasm_bindgen::JsValue> {
+    let window = web_sys::window().ok_or("no window")?;
+    let document = window.document().ok_or("no document")?;
+    let body = document.body().ok_or("no body")?;
+    let input: web_sys::HtmlInputElement = document.create_element("input")?.dyn_into()?;
+    input.set_type("file");
+    input.set_accept(accept);
+    input.set_hidden(true);
+    // Some browsers (older Safari) open the picker only for an input in the page.
+    body.append_child(&input)?;
+    let (closed, picker) = PickerClosed::new(&window, input.clone());
+    input.click();
+    let result = wasm_bindgen_futures::JsFuture::from(closed).await;
+    let file = input.files().and_then(|files| files.get(0));
+    drop(picker);
+    result?;
+    let Some(file) = file else { return Ok(None) };
+    let name = file.name();
+    if let Err(why) = figcraft_ui_egui::browser_can_read(&name, file.size()) {
+        return Ok(Some(Err(why)));
+    }
+    Ok(Some(match wasm_bindgen_futures::JsFuture::from(file.array_buffer()).await {
+        Ok(buffer) => Ok((name, js_sys::Uint8Array::new(&buffer).to_vec())),
+        Err(e) => {
+            log::error!("couldn't read {name}: {e:?}");
+            Err(figcraft_ui_egui::unreadable(&name))
+        }
+    }))
+}
+
+/// How long after the page gets focus back the file picker counts as closed (milliseconds): a
+/// picked file's `change` can come just after the focus, and must win. A `change` later than this
+/// (a slow cloud-backed file in a browser that never sends `cancel`) counts as a cancel.
+const PICKER_FOCUS_SETTLE_MS: i32 = 1_000;
+
+/// Settles a file picker's promise once: on `change` (a file was picked), on `cancel` (closed
+/// without one) or shortly after the page gets focus back, for browsers that never send `cancel`
+/// (Safari before 16.4), where the pick would otherwise stay pending and block every later one.
+/// Dropping it (also when the pick is abandoned) removes the input, the focus listener and its timer.
+struct PickerClosed {
+    window: web_sys::Window,
+    input: web_sys::HtmlInputElement,
+    _settle: wasm_bindgen::closure::Closure<dyn FnMut()>,
+    on_focus: wasm_bindgen::closure::Closure<dyn FnMut()>,
+    timer: std::rc::Rc<std::cell::Cell<Option<i32>>>,
+}
+
+impl PickerClosed {
+    fn new(window: &web_sys::Window, input: web_sys::HtmlInputElement) -> (js_sys::Promise, Self) {
+        let resolve = std::rc::Rc::new(std::cell::RefCell::new(None::<js_sys::Function>));
+        let slot = resolve.clone();
+        let closed = js_sys::Promise::new(&mut |res, _rej| *slot.borrow_mut() = Some(res));
+        let settle = wasm_bindgen::closure::Closure::<dyn FnMut()>::new(move || {
+            if let Some(res) = resolve.borrow_mut().take() {
+                let _ = res.call0(&wasm_bindgen::JsValue::NULL);
+            }
+        });
+        let _ = input.add_event_listener_with_callback("change", settle.as_ref().unchecked_ref());
+        let _ = input.add_event_listener_with_callback("cancel", settle.as_ref().unchecked_ref());
+        let timer = std::rc::Rc::new(std::cell::Cell::new(None));
+        let (w, t, f) = (window.clone(), timer.clone(), settle.as_ref().unchecked_ref::<js_sys::Function>().clone());
+        let on_focus = wasm_bindgen::closure::Closure::<dyn FnMut()>::new(move || {
+            if t.get().is_none() {
+                t.set(w.set_timeout_with_callback_and_timeout_and_arguments_0(&f, PICKER_FOCUS_SETTLE_MS).ok());
+            }
+        });
+        let _ = window.add_event_listener_with_callback("focus", on_focus.as_ref().unchecked_ref());
+        (closed, Self { window: window.clone(), input, _settle: settle, on_focus, timer })
+    }
+}
+
+impl Drop for PickerClosed {
+    fn drop(&mut self) {
+        if let Some(t) = self.timer.take() {
+            self.window.clear_timeout_with_handle(t);
+        }
+        let _ = self.window.remove_event_listener_with_callback("focus", self.on_focus.as_ref().unchecked_ref());
+        self.input.remove();
+    }
+}
+
 fn download(name: &str, bytes: &[u8]) -> Result<(), wasm_bindgen::JsValue> {
     let window = web_sys::window().ok_or("no window")?;
     let document = window.document().ok_or("no document")?;
diff --git a/apps/figcraft/Cargo.toml b/apps/figcraft/Cargo.toml
index bafb6da1..bd8c09c8 100644
--- a/apps/figcraft/Cargo.toml
+++ b/apps/figcraft/Cargo.toml
@@ -16,12 +16,16 @@ figcraft-ui-egui = { workspace = true }
 figcraft-collab-net = { workspace = true }
 figcraft-format = { workspace = true }
 figcraft-text = { workspace = true }
+# Shared decision of who draws the window frame on Linux (compositor vs. app), replacing the
+# bespoke Wayland xdg-decoration probe. See `[workspace.dependencies]`: pinned to the unmerged
+# craft-libs#217 branch and must be repointed to a merged `rev` before this PR is mergeable.
+craft-window = { workspace = true }
 egui = { workspace = true }
-eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "wayland", "x11"] }
+eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "clipboard", "wayland", "x11"] }
 serde_json = { workspace = true }
 log = { workspace = true }
 rfd = { workspace = true }
-arboard = { workspace = true, features = ["image-data"] }
+arboard = { workspace = true, features = ["image-data", "wayland-data-control"] }
 webbrowser = { workspace = true }
 image = { workspace = true }
 env_logger = { version = "0.11", default-features = false, features = ["auto-color", "humantime"] }
@@ -29,8 +33,15 @@ env_logger = { version = "0.11", default-features = false, features = ["auto-col
 # The system's reduce-motion setting (UISettings.AnimationsEnabled), interface language
 # (GlobalizationPreferences.Languages) and controllers for prototypes (Gaming.Input.Gamepad).
 [target.'cfg(windows)'.dependencies]
+craft-update = { workspace = true }
 windows = { version = "0.62", default-features = false, features = ["UI_ViewManagement", "System_UserProfile", "Foundation_Collections", "Gaming_Input"] }
 
+# The system colour scheme (org.freedesktop.portal.Settings): winit reports no theme on Linux and
+# the BSDs, so the interface's "system" mode follows the portal's instead. zbus comes in through
+# accesskit already; this only makes it direct.
+[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
+zbus = { version = "5", default-features = false, features = ["async-io", "blocking-api"] }
+
 # Finder double-clicks, Open With, Dock drops and `open -a FigCraft file.figcraft` arrive as a
 # kAEOpenDocuments Apple event, which winit 0.30 doesn't handle. This crate (also used by GridCraft,
 # EffectCraft and PhotoCraft) registers the handler behind a safe API (Objective-C interop needs
@@ -43,3 +54,8 @@ wat = { workspace = true }
 
 [build-dependencies]
 winresource = "0.1"
+
+[target.'cfg(target_os = "linux")'.dependencies]
+# Use vector window controls without a title-font renderer or embedded Cantarell. The compositor
+# probe that used to need raw-window-handle and wayland-client here now lives in craft-window.
+winit = { version = "0.30", default-features = false, features = ["wayland-csd-adwaita-notitle"] }
diff --git a/apps/figcraft/build.rs b/apps/figcraft/build.rs
index 64f97835..6ed8a047 100644
--- a/apps/figcraft/build.rs
+++ b/apps/figcraft/build.rs
@@ -1,6 +1,7 @@
 //! Windows: embed the icon and version info in figcraft.exe and size its main thread's stack
 //! (no-op elsewhere).
 fn main() {
+    println!("cargo::rustc-check-cfg=cfg(windows_slim_errors)");
     println!("cargo::rerun-if-changed=../../assets/app-icon/figcraft.ico");
     let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
     if target_os == "windows" {
diff --git a/apps/figcraft/src/apple_events.rs b/apps/figcraft/src/apple_events.rs
index 6b792094..41ae5cc3 100644
--- a/apps/figcraft/src/apple_events.rs
+++ b/apps/figcraft/src/apple_events.rs
@@ -50,7 +50,7 @@ pub fn poll(inbox: &Inbox, fig: &mut FigApp, ctx: &egui::Context) {
 /// Open `paths` as File › Open does; a file that fails shows its error and the others still open.
 pub fn open_documents(fig: &mut FigApp, paths: Vec<PathBuf>) {
     for p in paths {
-        if fig.run("file.open", json!({"path": p.to_string_lossy()})).is_some() {
+        if fig.run_user("file.open", json!({"path": p.to_string_lossy()})).is_some() {
             fig.ui.home = false;
         }
     }
diff --git a/apps/figcraft/src/args.rs b/apps/figcraft/src/args.rs
index 2e3099cb..436df61f 100644
--- a/apps/figcraft/src/args.rs
+++ b/apps/figcraft/src/args.rs
@@ -1,16 +1,26 @@
-//! The command line: `figcraft [--control <port>] [files…] [figcraft://join?…]`. An invite link
+//! The command line: `figcraft [--control <port>] [--automation-read-root <dir>]…
+//! [--automation-write-root <dir>]… [files…] [figcraft://join?…]`. An invite link
 //! (what the system passes when a `figcraft://` link is opened) joins that session once the window
 //! is up; everything else that isn't a flag is a file to open, as a path or a `file://` URL (the
-//! Linux desktop entry passes URLs, `%U`, so that it can also hand over invite links).
+//! Linux desktop entry passes URLs, `%U`, so that it can also hand over invite links). Any other
+//! `--flag` is unknown and stops the app at startup (#836): a mistyped root flag must never leave
+//! the app running unconfined. After a bare `--`, every argument is a file.
 
 /// What the app was started with.
 #[derive(Debug, Default, PartialEq, Eq)]
 pub struct Args {
-    /// `--control <port>`: the JSON-lines control server.
+    /// `--control <port>` (or `--control=<port>`): the JSON-lines control server.
     pub control: Option<u16>,
     pub files: Vec<String>,
     /// The last invite link given.
     pub join: Option<String>,
+    /// `--automation-read-root <dir>` / `--automation-write-root <dir>` (each repeatable; `=` works
+    /// too): the folders the app's file access is confined to. A flag without a value gives `""`,
+    /// which is refused at startup.
+    pub read_roots: Vec<String>,
+    pub write_roots: Vec<String>,
+    /// `--flags` the app doesn't know, as given.
+    pub unknown: Vec<String>,
 }
 
 /// An invite link rather than a file (`figcraft:` links, in any case).
@@ -49,13 +59,27 @@ pub fn parse(args: &[String]) -> Args {
     let mut out = Args::default();
     let mut it = args.iter();
     while let Some(a) = it.next() {
-        if a == "--control" {
-            out.control = it.next().and_then(|p| p.parse().ok());
+        if a == "--" {
+            out.files.extend(it.by_ref().cloned());
+            break;
+        }
+        let (flag, inline) = a.split_once('=').map_or((a.as_str(), None), |(f, v)| (f, Some(v.to_string())));
+        let roots = match flag {
+            "--automation-read-root" => Some(&mut out.read_roots),
+            "--automation-write-root" => Some(&mut out.write_roots),
+            _ => None,
+        };
+        if let Some(roots) = roots {
+            roots.push(inline.or_else(|| it.next().cloned()).unwrap_or_default());
+        } else if flag == "--control" {
+            out.control = inline.or_else(|| it.next().cloned()).and_then(|p| p.parse().ok());
         } else if is_invite(a) {
             out.join = Some(a.clone());
         } else if let Some(path) = file_url_path(a) {
             out.files.push(path);
-        } else if !a.starts_with("--") {
+        } else if a.starts_with("--") {
+            out.unknown.push(a.clone());
+        } else {
             out.files.push(a.clone());
         }
     }
diff --git a/apps/figcraft/src/args_tests.rs b/apps/figcraft/src/args_tests.rs
index 0ed404c8..04229e51 100644
--- a/apps/figcraft/src/args_tests.rs
+++ b/apps/figcraft/src/args_tests.rs
@@ -3,19 +3,50 @@
 use crate::args::{Args, file_url_path, is_invite, parse};
 
 fn args(a: &[&str]) -> Vec<String> {
-    a.iter().map(|s| s.to_string()).collect()
+    a.iter().map(ToString::to_string).collect()
 }
 
 #[test]
 fn files_and_the_control_port() {
     assert_eq!(parse(&args(&[])), Args::default());
-    let a = parse(&args(&["--control", "4242", "a.figcraft", "--verbose", "b.svg"]));
-    assert_eq!(a, Args { control: Some(4242), files: args(&["a.figcraft", "b.svg"]), join: None });
+    let a = parse(&args(&["--control", "4242", "a.figcraft", "b.svg"]));
+    assert_eq!(a, Args { control: Some(4242), files: args(&["a.figcraft", "b.svg"]), ..Args::default() });
     // A missing or bad port is ignored, not taken as a file.
     assert_eq!(parse(&args(&["--control"])), Args::default());
     assert_eq!(parse(&args(&["--control", "nope"])).control, None);
 }
 
+#[test]
+fn the_control_port_accepts_the_equals_form() {
+    let a = parse(&args(&["--control=7980", "a.figcraft"]));
+    assert_eq!(a, Args { control: Some(7980), files: args(&["a.figcraft"]), ..Args::default() });
+    // A bad port is ignored, not taken as a file.
+    assert_eq!(parse(&args(&["--control=nope"])), Args::default());
+}
+
+#[test]
+fn automation_roots_repeat_and_are_never_files() {
+    let a = parse(&args(&["--automation-read-root", "in", "--automation-write-root=out", "--automation-read-root=more", "a.figcraft"]));
+    assert_eq!(a.read_roots, args(&["in", "more"]));
+    assert_eq!(a.write_roots, args(&["out"]));
+    assert_eq!(a.files, args(&["a.figcraft"]));
+    // A flag without its folder is kept as an empty one, which startup refuses.
+    assert_eq!(parse(&args(&["--automation-write-root"])).write_roots, args(&[""]));
+}
+
+#[test]
+fn unknown_flags_are_refused_never_ignored() {
+    // #836: a mistyped root flag (or one an older release lacks) must stop the app, not start it
+    // unconfined. Both forms, with and without `=`.
+    let a = parse(&args(&["--automation-write-roots", "out", "--automation-write-dir=out", "--verbose", "a.figcraft"]));
+    assert_eq!(a.unknown, args(&["--automation-write-roots", "--automation-write-dir=out", "--verbose"]));
+    assert!(a.write_roots.is_empty());
+    // Single-dash arguments are left as they were (files); after `--` everything is a file.
+    let a = parse(&args(&["--control", "1", "--", "--odd.figcraft", "--automation-write-root=x"]));
+    assert_eq!(a.files, args(&["--odd.figcraft", "--automation-write-root=x"]));
+    assert!(a.unknown.is_empty() && a.write_roots.is_empty());
+}
+
 #[test]
 fn invite_links_join_instead_of_opening() {
     let link = "figcraft://join?host=192.168.1.20:47900&file=abc&token=AbCdEfGhIjKlMnOpQrStUv";
diff --git a/apps/figcraft/src/control_server.rs b/apps/figcraft/src/control_server.rs
index 1c91840f..ada44c0f 100644
--- a/apps/figcraft/src/control_server.rs
+++ b/apps/figcraft/src/control_server.rs
@@ -6,7 +6,7 @@ use std::net::{TcpListener, TcpStream};
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
-use figcraft_ui_egui::ControlRequest;
+use figcraft_ui_egui::{ControlReply, ControlRequest, RequestGate, RequestState};
 use serde_json::{Value, json};
 
 type Queue = Arc<Mutex<Vec<ControlRequest>>>;
@@ -16,6 +16,38 @@ const MAX_LINE: usize = 32 * 1024 * 1024;
 const MAX_CONNECTIONS: usize = 8;
 const MAX_QUEUED_REQUESTS: usize = 8;
 const TIMEOUT: Duration = Duration::from_secs(60);
+/// How long the accepting thread waits after a failed accept. Accepting can keep failing, for
+/// example while the process has no file descriptors left, and retrying at once would keep a
+/// core busy until it recovers.
+const ACCEPT_RETRY: Duration = Duration::from_millis(100);
+
+/// Why a request's transport wait ended without a control reply.
+#[derive(Debug, PartialEq, Eq)]
+enum WaitFailure {
+    Timeout,
+    /// The UI side dropped its sender before replying (the app is closing).
+    Disconnected,
+}
+
+/// Wait for the UI's reply, and settle a timeout under the same gate the UI's final commit uses.
+/// A commit that got the gate first has already queued its reply: consume that reply instead of
+/// reporting a timeout. If the gate is still open, cancel it so the UI writes nothing.
+fn wait_for_reply(rx: &std::sync::mpsc::Receiver<ControlReply>, gate: &RequestGate, timeout: Duration) -> Result<ControlReply, WaitFailure> {
+    match rx.recv_timeout(timeout) {
+        Ok(reply) => Ok(reply),
+        Err(std::sync::mpsc::RecvTimeoutError::Timeout) => after_timeout(rx, gate),
+        Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => Err(WaitFailure::Disconnected),
+    }
+}
+
+/// The timeout branch of [`wait_for_reply`]. Kept separate so it can be tested deterministically
+/// against a gate whose commit already happened.
+fn after_timeout(rx: &std::sync::mpsc::Receiver<ControlReply>, gate: &RequestGate) -> Result<ControlReply, WaitFailure> {
+    match gate.cancel_if_open() {
+        RequestState::Replied => rx.try_recv().map_err(|_| WaitFailure::Disconnected),
+        RequestState::Open | RequestState::Cancelled => Err(WaitFailure::Timeout),
+    }
+}
 
 /// Deferred requests for a hidden window must not make the UI's queue grow without a bound.
 pub fn drain_queue(queue: &Queue, target: &mut Vec<ControlRequest>) {
@@ -38,7 +70,7 @@ pub fn start(port: u16, queue: Queue, ctx: CtxSlot) {
     eprintln!("FigCraft control server listening on 127.0.0.1:{port}");
     let spawned = std::thread::Builder::new().name("figcraft-control".into()).spawn(move || {
         let mut workers = Vec::new();
-        for stream in listener.incoming().flatten() {
+        for stream in accepted(listener.incoming(), || std::thread::sleep(ACCEPT_RETRY)) {
             spawn_connection(stream, queue.clone(), ctx.clone(), &mut workers, TIMEOUT);
         }
     });
@@ -47,6 +79,11 @@ pub fn start(port: u16, queue: Queue, ctx: CtxSlot) {
     }
 }
 
+/// The connections `incoming` accepts, calling `wait` after each failed accept.
+fn accepted<T>(incoming: impl Iterator<Item = std::io::Result<T>>, mut wait: impl FnMut()) -> impl Iterator<Item = T> {
+    incoming.filter_map(move |stream| stream.map_err(|_| wait()).ok())
+}
+
 fn spawn_connection(stream: TcpStream, queue: Queue, ctx: CtxSlot, workers: &mut Vec<std::thread::JoinHandle<()>>, timeout: Duration) {
     workers.retain(|worker| !worker.is_finished());
     if workers.len() >= MAX_CONNECTIONS {
@@ -60,6 +97,9 @@ fn spawn_connection(stream: TcpStream, queue: Queue, ctx: CtxSlot, workers: &mut
     }
 }
 
+/// Serve one control connection: read bounded JSON lines, reject oversized frames and a
+/// full queue, queue one request, wait under its gate, and write one reply. Non-JSON input
+/// answers with an error and closes the connection so HTTP body lines cannot become commands.
 fn serve(mut out: TcpStream, queue: Queue, ctx: CtxSlot, timeout: Duration) -> std::io::Result<()> {
     out.set_read_timeout(Some(timeout))?;
     out.set_write_timeout(Some(timeout))?;
@@ -87,7 +127,7 @@ fn serve(mut out: TcpStream, queue: Queue, ctx: CtxSlot, timeout: Duration) -> s
                 let method = v.get("method").and_then(Value::as_str).unwrap_or("").to_string();
                 let params = v.get("params").cloned().unwrap_or(json!({}));
                 let (tx, rx) = std::sync::mpsc::channel();
-                let cancelled = Arc::new(std::sync::atomic::AtomicBool::new(false));
+                let gate = RequestGate::new();
                 let mut pending = queue.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
                 pending.retain(|request| !request.is_cancelled());
                 if pending.len() >= MAX_QUEUED_REQUESTS {
@@ -95,20 +135,22 @@ fn serve(mut out: TcpStream, queue: Queue, ctx: CtxSlot, timeout: Duration) -> s
                     writeln!(out, "{}", json!({"id": id, "ok": false, "error": "control request queue is full"}))?;
                     continue;
                 }
-                pending.push(ControlRequest { id: id.clone(), method, params, reply: tx, cancelled: cancelled.clone() });
+                pending.push(ControlRequest { id: id.clone(), method, params, reply: tx, state: gate.clone() });
                 drop(pending);
                 if let Some(c) = ctx.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref() {
                     c.request_repaint();
                 }
-                match rx.recv_timeout(timeout) {
+                match wait_for_reply(&rx, &gate, timeout) {
                     Ok(r) => match r.result {
                         Ok(res) => json!({"id": r.id, "ok": true, "result": res}),
                         Err(e) => json!({"id": r.id, "ok": false, "error": e}),
                     },
-                    Err(_) => {
-                        cancelled.store(true, std::sync::atomic::Ordering::Relaxed);
+                    Err(WaitFailure::Timeout) => {
                         json!({"id": id, "ok": false, "error": "timed out waiting for the UI: screenshots and input need the FigCraft window on screen (is it minimised or covered?)"})
                     }
+                    Err(WaitFailure::Disconnected) => {
+                        json!({"id": id, "ok": false, "error": "the FigCraft window closed before answering"})
+                    }
                 }
             }
             Err(e) => {
diff --git a/apps/figcraft/src/control_server_tests.rs b/apps/figcraft/src/control_server_tests.rs
index d243fb91..f29a7773 100644
--- a/apps/figcraft/src/control_server_tests.rs
+++ b/apps/figcraft/src/control_server_tests.rs
@@ -28,8 +28,9 @@ fn reply(reader: &mut BufReader<TcpStream>) -> Value {
     serde_json::from_str(&line).unwrap()
 }
 
+/// Build a `ui.inspect` control request with a throwaway reply channel.
 fn request() -> ControlRequest {
-    ControlRequest { id: json!(0), method: "ui.inspect".into(), params: json!({}), reply: mpsc::channel().0, cancelled: Default::default() }
+    ControlRequest { id: json!(0), method: "ui.inspect".into(), params: json!({}), reply: mpsc::channel().0, state: Default::default() }
 }
 
 #[test]
@@ -115,6 +116,52 @@ fn full_queue_rejects_before_dispatch_and_ui_queue_stays_bounded() {
     worker.join().unwrap().unwrap();
 }
 
+/// Asserts a commit that writes the file and queues its reply wins the gate: the transport's
+/// timeout branch consumes that reply and leaves the state `Replied`.
+#[test]
+fn a_committed_reply_wins_over_the_transport_timeout() {
+    let dir = std::env::temp_dir().join(format!("figcraft-control-commit-{}", std::process::id()));
+    let path = dir.join("shot.png");
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    let gate = RequestGate::new();
+    let (tx, rx) = mpsc::channel();
+    // The UI's final commit gets the gate first: the file and reply are both committed before the
+    // transport's timeout branch can look at the gate.
+    let committed = gate.commit(|| {
+        std::fs::write(&path, b"png").unwrap();
+        tx.send(ControlReply { id: json!(7), result: Ok(json!({"path": path.to_string_lossy()})) }).unwrap();
+    });
+    assert!(committed.is_some());
+    assert!(path.is_file());
+    let reply = after_timeout(&rx, &gate).expect("the queued commit is consumed");
+    assert_eq!(reply.id, json!(7));
+    assert!(reply.result.is_ok());
+    assert_eq!(gate.state(), RequestState::Replied, "the timeout must not overwrite a commit");
+    assert!(path.is_file(), "a winning commit keeps its file");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// Asserts a zero-duration wait reports `Timeout` and cancels the open gate.
+#[test]
+fn a_timeout_cancels_an_open_request() {
+    let gate = RequestGate::new();
+    let (_tx, rx) = mpsc::channel::<ControlReply>();
+    assert!(matches!(wait_for_reply(&rx, &gate, Duration::ZERO), Err(WaitFailure::Timeout)));
+    assert_eq!(gate.state(), RequestState::Cancelled, "nothing may write after the timeout");
+}
+
+/// Asserts a closed reply channel reports `Disconnected` and leaves the gate `Open`, not
+/// cancelled.
+#[test]
+fn a_disconnected_reply_channel_is_not_reported_as_a_timeout() {
+    let gate = RequestGate::new();
+    let (tx, rx) = mpsc::channel::<ControlReply>();
+    drop(tx);
+    assert!(matches!(wait_for_reply(&rx, &gate, Duration::from_secs(1)), Err(WaitFailure::Disconnected)));
+    assert_eq!(gate.state(), RequestState::Open, "a closed app is not a cancel decision");
+}
+
 #[test]
 fn idle_and_partial_frame_connections_expire() {
     for bytes in [b"".as_slice(), b"{\"id\":"] {
@@ -131,6 +178,18 @@ fn idle_and_partial_frame_connections_expire() {
     }
 }
 
+/// A failed accept is followed by a wait before the next one, so a listener that keeps failing
+/// does not spin, and the connections around the failures still come through.
+#[test]
+fn a_failed_accept_waits_before_the_next() {
+    let failed = || Err(std::io::Error::other("no file descriptors left"));
+    let incoming = vec![failed(), Ok(1), failed(), failed(), Ok(2)];
+    let mut waits = 0;
+    let connections: Vec<i32> = accepted(incoming.into_iter(), || waits += 1).collect();
+    assert_eq!(connections, [1, 2]);
+    assert_eq!(waits, 3, "one wait per failed accept");
+}
+
 #[test]
 fn connection_limit_rejects_excess_clients_and_reuses_finished_slots() {
     let pending = queue();
@@ -160,7 +219,11 @@ fn connection_limit_rejects_excess_clients_and_reuses_finished_slots() {
     assert_eq!(workers.len(), 1);
     client.write_all(b"invalid\n").unwrap();
     assert_eq!(reply(&mut BufReader::new(client.try_clone().unwrap()))["ok"], false);
-    client.shutdown(Shutdown::Both).unwrap();
+    // The server closes this connection after answering an invalid request, and shutting down
+    // a socket whose peer has already closed is ENOTCONN on macOS and the BSDs where Linux
+    // returns Ok. Closing the client is what the worker is waiting for, so the result is moot:
+    // the other shutdowns in this file run while the peer is still open and stay checked.
+    let _ = client.shutdown(Shutdown::Both);
     workers.pop().unwrap().join().unwrap();
 }
 
@@ -211,6 +274,9 @@ fn a_limit_sized_frame_is_accepted_at_eof() {
     worker.join().unwrap().unwrap();
 }
 
+/// Asserts expired requests stop occupying the UI queue cap, a later request is admitted
+/// and answered, and a window that finally draws discards its expired command before
+/// dispatch.
 #[test]
 fn timed_out_requests_release_a_full_deferred_ui_queue() {
     use figcraft_ui_egui::{FigApp, NoServices, control, windows};
@@ -246,7 +312,7 @@ fn timed_out_requests_release_a_full_deferred_ui_queue() {
     // Include expired requests in the socket queue, too: admission must reclaim their slots.
     pending.lock().unwrap().extend((0..MAX_QUEUED_REQUESTS).map(|_| {
         let r = request();
-        r.cancelled.store(true, std::sync::atomic::Ordering::Relaxed);
+        r.state.cancel_if_open();
         r
     }));
     let (mut client, server) = pair();
diff --git a/apps/figcraft/src/main.rs b/apps/figcraft/src/main.rs
index fdcc66f9..a3cd21bf 100644
--- a/apps/figcraft/src/main.rs
+++ b/apps/figcraft/src/main.rs
@@ -6,9 +6,20 @@
 //! `--control <port>` (or `FIGCRAFT_CONTROL_PORT`) starts a localhost JSON-lines control server:
 //! `{"id":1,"method":"engine.execute","params":{"command":"shape.rectangle","params":{"x":0,"y":0,"width":100,"height":100}}}`
 //! → `{"id":1,"ok":true,"result":{…}}`. Methods: `figcraft_ui_egui::control`.
+//!
+//! `--automation-read-root <dir>` / `--automation-write-root <dir>` (each repeatable) confine the
+//! files the window and the control channel read and write (`figcraft_engine::file_access`); the
+//! app's own folders (settings, recovery copies, installed plugins) and opening the files given on
+//! the command line are not. A root that isn't an existing folder stops the app at startup, and so
+//! does any flag the app doesn't know (a mistyped root flag must not start the app unconfined).
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
 #![cfg_attr(all(target_os = "windows", not(debug_assertions)), windows_subsystem = "windows")]
 
+// A missing Windows GNU flag re-enables the COM error-info lookup that crashes while AccessKit
+// reports a removed UI Automation node. Catch build configurations that drop the workaround.
+#[cfg(all(target_os = "windows", target_env = "gnu", not(windows_slim_errors)))]
+compile_error!("Windows GNU builds must set windows_slim_errors to keep UI Automation responsive");
+
 #[cfg(target_os = "macos")]
 mod apple_events;
 mod args;
@@ -56,6 +67,9 @@ struct App {
 }
 
 impl eframe::App for App {
+    /// Native eframe logic callback: store the first context, drain control requests, run
+    /// guarded background work, poll macOS open events, handle close requests and title
+    /// changes, and schedule recovery repaints on the app clock.
     fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
         {
             let mut slot = self.ctx_slot.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
@@ -65,7 +79,9 @@ impl eframe::App for App {
         }
         let title = with_app(|fig| {
             control_server::drain_queue(&self.queue, &mut fig.control_queue);
-            figcraft_ui_egui::control::drain_hidden(fig, ctx);
+            // Phase-safe background work: control queues, autosave/recovery deadlines, live polling.
+            // It runs on logic-only callbacks too, so it never reads UI input.
+            figcraft_ui_egui::windows::guard(fig, ctx, |fig| fig.background_tick(ctx));
             #[cfg(target_os = "macos")]
             apple_events::poll(&self.apple_events, fig, ctx);
             // Closing the window asks about unsaved changes (and keeps the app running while other
@@ -80,8 +96,14 @@ impl eframe::App for App {
             ctx.send_viewport_cmd(egui::ViewportCommand::Title(title.clone()));
             self.title = title;
         }
-        let now = ctx.input(|i| i.time);
-        if let Some(wait) = with_app(|fig| recovery::lock(&self.recovery).as_mut().and_then(|r| r.tick(&fig.session, now))).flatten() {
+        // Recovery deadlines use the same monotonic clock as the app's background work: a
+        // logic-only tick leaves `ctx.input(i.time)` stale.
+        if let Some(wait) = with_app(|fig| {
+            let now = fig.now_secs();
+            recovery::lock(&self.recovery).as_mut().and_then(|r| r.tick(&fig.session, now))
+        })
+        .flatten()
+        {
             ctx.request_repaint_after(std::time::Duration::from_secs_f64(wait));
         }
     }
@@ -100,14 +122,22 @@ impl eframe::App for App {
     }
 
     fn on_exit(&mut self) {
-        with_app(|fig| services::save_state(fig));
-        if let Some(r) = recovery::lock(&self.recovery).take() {
-            r.finish();
-        }
+        // With the app out of reach (busy), its recovery copies stay for the next start.
+        let copies = recovery::lock(&self.recovery).take();
+        with_app(|fig| services::shutdown(fig, services::config_dir().as_deref(), copies));
+        // Everything is kept: end before the windows' teardown, where AppKit's Touch Bar support
+        // throws on the content view AccessKit restores (craft-libs#3, #781).
+        #[cfg(target_os = "macos")]
+        std::process::exit(0);
     }
 }
 
 fn main() -> eframe::Result {
+    // Windows: the update helper is a copy of this program started with `--finish-update`.
+    #[cfg(windows)]
+    if let Some(result) = craft_update::self_update::finish(&craft_update::suite::FIGCRAFT, &std::env::args_os().skip(1).collect::<Vec<_>>()) {
+        std::process::exit(i32::from(result.is_err()));
+    }
     env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("warn")).init();
     let args: Vec<String> = std::env::args().skip(1).collect();
     if args.iter().any(|a| a == "--version" || a == "-V") {
@@ -119,35 +149,56 @@ fn main() -> eframe::Result {
         return Ok(());
     }
     let args = args::parse(&args);
+    if let Some(flag) = args.unknown.first() {
+        eprintln!(
+            "FigCraft: unknown option {flag}\nUsage: figcraft [--control PORT] [--automation-read-root DIR]... [--automation-write-root DIR]... [FILE | figcraft://join?...]..."
+        );
+        std::process::exit(2);
+    }
+    let roots = match (
+        args.read_roots.is_empty() && args.write_roots.is_empty(),
+        figcraft_engine::file_access::Roots::new(&args.read_roots, &args.write_roots),
+    ) {
+        (true, _) => None,
+        (false, Ok(r)) => Some(Arc::new(r)),
+        (false, Err(e)) => {
+            eprintln!("FigCraft: {e}");
+            std::process::exit(2);
+        }
+    };
     let port = args.control.or_else(|| std::env::var("FIGCRAFT_CONTROL_PORT").ok().and_then(|p| p.parse().ok()));
     // System fonts: index them in the background, then wake the UI (an idle window draws no frames)
     // to lay text out again with them.
     let ctx_slot: Arc<Mutex<Option<egui::Context>>> = Arc::new(Mutex::new(None));
-    let fonts_slot = ctx_slot.clone();
+    // Wakes the window (once it is there) from another thread.
+    let wake = |slot: &Arc<Mutex<Option<egui::Context>>>| {
+        let slot = slot.clone();
+        move || {
+            if let Some(c) = slot.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref() {
+                c.request_repaint();
+            }
+        }
+    };
+    let fonts_wake = wake(&ctx_slot);
     std::thread::spawn(move || {
         figcraft_text::scan_system_fonts();
-        if let Some(c) = fonts_slot.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref() {
-            c.request_repaint();
-        }
+        fonts_wake();
     });
     let mut session = Session::empty();
     // Live sessions: the network threads wake the window when something arrives.
-    let wake_slot = ctx_slot.clone();
-    session.live.install(Box::new(figcraft_collab_net::NetLink::new(Arc::new(move || {
-        if let Some(c) = wake_slot.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref() {
-            c.request_repaint();
-        }
-    }))));
+    session.live.install(Box::new(figcraft_collab_net::NetLink::new(Arc::new(wake(&ctx_slot)))));
     for f in &args.files {
         if let Err(e) = session.execute("file.open", &json!({"path": f})) {
             log::error!("{f}: {e}");
         }
     }
+    let opened: Vec<u64> = session.docs.iter().map(|d| d.uid).collect();
     // Documents a crashed or killed run left unsaved come back; this run keeps its own copies.
     let recovery_root = services::config_dir().map(|d| d.join("Recovery"));
     // The preferences first: they hold the online files a recovered document may be one of.
     let recovery = recovery::Shared::default();
     let svc = services::Desktop::load(recovery.clone());
+    svc.follow_system_dark(wake(&ctx_slot));
     if let Some(prefs) = svc.prefs.clone() {
         session.prefs = prefs;
     }
@@ -164,17 +215,19 @@ fn main() -> eframe::Result {
     // default, never a build from source unless asked).
     session.live.links = figcraft_collab_net::links::system();
     session.invite_links_startup();
-    // A first run (no settings kept yet, nothing to open) starts on the home screen, with its
-    // tips and templates; later runs start in a new file.
     let first_run = svc.prefs.is_none() && args.join.is_none();
-    if session.docs.is_empty() && !first_run {
+    if session.docs.is_empty() && opens_new_file(first_run, session.prefs.start_on_home, port.is_some()) {
         let _ = session.execute("file.new", &json!({}));
     }
     // The interface language from the first frame on, and for the message when the window can't
     // open (no frame then).
     figcraft_ui_egui::i18n::set(&session.prefs.language, figcraft_ui_egui::Services::system_language(&svc).as_deref());
     let mut fig = FigApp::new(session, Box::new(svc));
+    fig.set_startup_update_check(true);
+    fig.automation_roots = roots;
     fig.ui.home = false;
+    // Files named on the command line are the user's too: their missing fonts are listed.
+    fig.ui.font_checks = opened;
     fig.note_recovered(recovered.copies);
     if let Some(link) = &args.join {
         figcraft_ui_egui::live::open_invite(&mut fig, link);
@@ -192,15 +245,15 @@ fn main() -> eframe::Result {
         .with_inner_size([1440.0, 900.0])
         .with_min_inner_size([800.0, 500.0])
         .with_drag_and_drop(true);
-    // The tab strip is the title bar: macOS keeps its window buttons inset into it; elsewhere the
-    // window is frameless and FigCraft draws the buttons and resize edges.
-    if cfg!(target_os = "macos") {
-        viewport = viewport.with_fullsize_content_view(true).with_titlebar_shown(false).with_title_shown(false);
-        fig.ui.title_bar = figcraft_ui_egui::TitleBar::Inset;
-    } else {
-        viewport = viewport.with_decorations(false);
-        fig.ui.title_bar = figcraft_ui_egui::TitleBar::Custom;
-    }
+    // Who draws the window frame is decided once, before the viewport is built, by the shared
+    // craft-window crate (the rest of the Craft suite uses it too). On macOS the system frame is
+    // kept with FigCraft's inset traffic lights; on Windows it is the system frame; on Linux the
+    // decision follows the desktop: a Wayland compositor with server-side decorations (KDE, Sway,
+    // Hyprland, COSMIC) or an X11 window manager keeps the native frame, while GNOME's Mutter —
+    // which draws no server-side frame — leaves it to the app's own custom title bar. This replaces
+    // the old bespoke xdg-decoration probe that always drew FigCraft's custom title bar on KDE.
+    fig.ui.title_bar = desktop_title_bar();
+    viewport = window_chrome(viewport, fig.ui.title_bar);
     if let Some(icon) = icon {
         viewport = viewport.with_icon(icon);
     }
@@ -216,14 +269,15 @@ fn main() -> eframe::Result {
     let result = eframe::run_native(
         "FigCraft",
         options,
-        Box::new(move |_cc| {
+        Box::new(move |cc| {
+            with_app(|fig| fig.services.set_egui_context(&cc.egui_ctx));
             Ok(Box::new(App {
                 queue,
                 ctx_slot,
                 title: String::new(),
                 recovery,
                 #[cfg(target_os = "macos")]
-                apple_events: apple_events.connect(&_cc.egui_ctx),
+                apple_events: apple_events.connect(&cc.egui_ctx),
             }))
         }),
     );
@@ -233,3 +287,115 @@ fn main() -> eframe::Result {
     }
     result
 }
+
+/// With nothing to open, whether the window starts in a new file rather than on the home screen.
+/// A first run (no settings kept yet) shows the home screen's tips and templates, and later runs
+/// start in a new file unless the preference asks for Home, which `--control` overrides: its
+/// callers expect a document to act on.
+fn opens_new_file(first_run: bool, start_on_home: bool, control: bool) -> bool {
+    !first_run && (!start_on_home || control)
+}
+
+/// The title bar FigCraft starts with, decided by the shared craft-window crate so every Craft app
+/// agrees on who draws the frame per desktop. The override variable is `FIGCRAFT_TITLEBAR`
+/// (`app` / `system`). macOS keeps its inset traffic lights unchanged (craft-window returns the
+/// desktop frame there); Windows keeps the system frame; on Linux the compositor/window manager
+/// decides (KDE/Sway/Hyprland/COSMIC and X11 keep the native frame, GNOME gets the custom one).
+fn desktop_title_bar() -> figcraft_ui_egui::TitleBar {
+    let choice = craft_window::Choice::probe(craft_window::Prefix::new("FIGCRAFT"));
+    title_bar_for(choice.into_frame())
+}
+
+/// Map craft-window's [`craft_window::Frame`] onto FigCraft's own [`figcraft_ui_egui::TitleBar`].
+///
+/// `Frame::App` means the app draws its own frame — FigCraft's custom title bar. `Frame::Desktop`
+/// means the desktop draws it, but FigCraft keeps each platform's existing look there:
+/// - macOS: the inset title bar with its traffic lights (`TitleBar::Inset`), unchanged.
+/// - Windows: FigCraft's own custom title bar (`TitleBar::Custom`), unchanged — Windows never used
+///   the plain native frame, and craft-window returning `Desktop` on Windows must not change that.
+/// - Linux and the BSDs: the compositor's native frame (`TitleBar::Native`). This is the only
+///   behaviour change: KDE and the other server-side-decoration compositors now keep their frame.
+fn title_bar_for(frame: craft_window::Frame) -> figcraft_ui_egui::TitleBar {
+    use figcraft_ui_egui::TitleBar;
+    match frame {
+        craft_window::Frame::Desktop if cfg!(target_os = "macos") => TitleBar::Inset,
+        // Windows kept FigCraft's own title bar before this change; keep it.
+        craft_window::Frame::Desktop if cfg!(target_os = "windows") => TitleBar::Custom,
+        craft_window::Frame::Desktop => TitleBar::Native,
+        // The app draws the frame (GNOME's Wayland session, or a `FIGCRAFT_TITLEBAR=app` override).
+        craft_window::Frame::App(_) => TitleBar::Custom,
+    }
+}
+
+fn window_chrome(viewport: egui::ViewportBuilder, title_bar: figcraft_ui_egui::TitleBar) -> egui::ViewportBuilder {
+    use figcraft_ui_egui::TitleBar;
+    match title_bar {
+        TitleBar::Inset => viewport.with_fullsize_content_view(true).with_titlebar_shown(false).with_title_shown(false),
+        TitleBar::Native => viewport.with_decorations(true),
+        TitleBar::Custom => viewport.with_decorations(false),
+    }
+}
+
+#[cfg(test)]
+mod title_bar_tests {
+    use figcraft_ui_egui::TitleBar;
+
+    /// craft-window's app frame (GNOME's Wayland session, or a `FIGCRAFT_TITLEBAR=app` override)
+    /// becomes FigCraft's custom title bar on every platform, and `window_chrome` then drops the
+    /// decorations so FigCraft draws its own.
+    #[test]
+    fn the_app_frame_maps_to_the_custom_title_bar() {
+        let layout = craft_window::Layout::default();
+        let bar = super::title_bar_for(craft_window::Frame::App(layout));
+        assert_eq!(bar, TitleBar::Custom);
+        let viewport = super::window_chrome(egui::ViewportBuilder::default(), bar);
+        assert_eq!(viewport.decorations, Some(false));
+    }
+
+    /// craft-window's desktop frame keeps each platform's existing look: macOS its inset traffic
+    /// lights, Windows FigCraft's own custom title bar (unchanged), and Linux/BSD the compositor's
+    /// native frame. The Linux case is the only behaviour change: KDE and the other
+    /// server-side-decoration compositors now keep their native frame.
+    #[test]
+    fn the_desktop_frame_is_mapped_per_platform() {
+        let bar = super::title_bar_for(craft_window::Frame::Desktop);
+        if cfg!(target_os = "macos") {
+            assert_eq!(bar, TitleBar::Inset);
+        } else if cfg!(target_os = "windows") {
+            // Windows kept its own title bar before and must keep it now.
+            assert_eq!(bar, TitleBar::Custom);
+            let viewport = super::window_chrome(egui::ViewportBuilder::default(), bar);
+            assert_eq!(viewport.decorations, Some(false));
+        } else {
+            assert_eq!(bar, TitleBar::Native);
+            let viewport = super::window_chrome(egui::ViewportBuilder::default(), bar);
+            assert_eq!(viewport.decorations, Some(true));
+        }
+    }
+
+    /// macOS is untouched by this change: its inset title bar with the system traffic lights stays,
+    /// and `window_chrome` still asks for the full-size content view rather than toggling the
+    /// window decorations.
+    #[test]
+    #[cfg(target_os = "macos")]
+    fn macos_keeps_its_inset_title_bar() {
+        let bar = super::desktop_title_bar();
+        assert_eq!(bar, TitleBar::Inset);
+        let viewport = super::window_chrome(egui::ViewportBuilder::default(), bar);
+        assert_eq!(viewport.fullsize_content_view, Some(true));
+        assert_eq!(viewport.title_shown, Some(false));
+    }
+}
+
+#[cfg(test)]
+mod start_tests {
+    use super::opens_new_file;
+
+    #[test]
+    fn the_home_preference_starts_on_home_except_for_control_callers() {
+        assert!(opens_new_file(false, false, false), "a new file by default");
+        assert!(!opens_new_file(false, true, false), "Home when the preference asks");
+        assert!(opens_new_file(false, true, true), "--control still starts with a document");
+        assert!(!opens_new_file(true, false, false), "a first run shows the home screen");
+    }
+}
diff --git a/apps/figcraft/src/recovery.rs b/apps/figcraft/src/recovery.rs
index b2614598..605a04ca 100644
--- a/apps/figcraft/src/recovery.rs
+++ b/apps/figcraft/src/recovery.rs
@@ -120,8 +120,7 @@ impl Recovery {
         (0..10).find_map(|n| {
             let dir = root.join(if n == 0 { pid.to_string() } else { format!("{pid}-{n}") });
             std::fs::create_dir_all(&dir).ok()?;
-            let lock = File::options().write(true).create(true).truncate(false).open(dir.join(LOCK)).ok()?;
-            lock.try_lock().ok()?;
+            let lock = lock_folder(&dir).ok()?;
             Some(Self { dir, _lock: lock, written: HashMap::new(), next: 0.0, waiting: Vec::new() })
         })
     }
@@ -207,10 +206,12 @@ impl Recovery {
             let doc = d.doc.clone();
             let (versions, branches) = (d.versions.clone(), figcraft_engine::branches::current(s, d.uid));
             // Which online file it is and what of the server's this very copy has (a line each:
-            // the server, the file's id, then the session, client id and last change), while it
+            // the server, the file's id, then the session, client id, last change and the secret the
+            // client id resumes with), while it
             // is one. Written after the copy, never before: a note must not promise more of the
             // server's changes than its copy holds.
-            let online = s.online_of(d.uid).map(|(server, file, at)| format!("{server}\n{file}\n{} {} {}", at.session, at.client_id, at.seq));
+            let online =
+                s.online_of(d.uid).map(|(server, file, at)| format!("{server}\n{file}\n{} {} {} {}", at.session, at.client_id, at.seq, at.secret));
             let job = move || {
                 if !write_atomic(&path, &doc, &versions, &branches) {
                     return false;
@@ -250,6 +251,17 @@ impl Recovery {
         self.written.insert(uid, Copy { done: None, flight: Some((vec![revision], writer)) });
     }
 
+    /// Quitting: a normal quit ([`finish`](Self::finish)) when the unsaved-changes question was
+    /// `asked` or nothing is unsaved. Otherwise (macOS's Quit menu ends the app without asking) the
+    /// unsaved documents are copied and the copies stay for the next start, as after a crash.
+    pub fn quit(mut self, s: &Session, asked: bool) {
+        if asked || !s.docs.iter().any(|d| needs_copy(s, d)) {
+            return self.finish();
+        }
+        self.write(s, true);
+        self.settle(s);
+    }
+
     /// A normal quit: the documents were saved or their changes discarded on purpose. (Earlier
     /// runs' copies still waiting for their outcome stay for the next start.)
     pub fn finish(self) {
@@ -282,6 +294,17 @@ fn remove_kept(w: Waiting) {
 /// The extension of the note beside the copy of a document that is one of your online files.
 const ONLINE: &str = "online";
 
+/// How long the startup waits, once, for folder locks that may free themselves (#334).
+#[cfg(unix)]
+const LOCK_WAIT: std::time::Duration = std::time::Duration::from_millis(100);
+
+/// Lock the folder `dir` (`WouldBlock` while another process holds it).
+fn lock_folder(dir: &Path) -> Result<File, std::fs::TryLockError> {
+    let lock = File::options().write(true).create(true).truncate(false).open(dir.join(LOCK)).map_err(std::fs::TryLockError::Error)?;
+    lock.try_lock()?;
+    Ok(lock)
+}
+
 /// The copy at `file` is of one of your online files: join that file again as its owner, keeping
 /// the copy to compare with what arrives. The session, or `None` when the copy isn't one (or its
 /// file isn't recorded any more, or is open already): then it opens as any other copy.
@@ -291,7 +314,10 @@ fn rejoin_online(file: &Path, s: &mut Session) -> Option<u64> {
     let (server, id, at) = (lines.next()?, lines.next()?, lines.next()?);
     let mut at = at.split(' ').map(|n| n.parse::<u64>().ok());
     let (session, client, seq) = (at.next()??, at.next()??, at.next()??);
-    let params = json!({"path": file.to_string_lossy(), "server": server, "file": id, "session": session, "client": client, "seq": seq});
+    // Absent in notes written before ids had secrets.
+    let secret = at.next().flatten().unwrap_or(0);
+    let params =
+        json!({"path": file.to_string_lossy(), "server": server, "file": id, "session": session, "client": client, "seq": seq, "secret": secret});
     s.execute("collab.recoverFile", &params).ok()?.get("session")?.as_u64()
 }
 
@@ -317,7 +343,24 @@ fn stamp(s: &Session, d: &DocState) -> Vec<u64> {
 fn write_atomic(path: &Path, doc: &figcraft_engine::doc::Document, versions: &[Version], branches: &[Branch]) -> bool {
     let Ok(bytes) = figcraft_format::save_bytes_with_history(doc, None, versions, branches) else { return false };
     let tmp = path.with_extension("tmp");
-    std::fs::write(&tmp, bytes).is_ok() && std::fs::rename(&tmp, path).is_ok()
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::OpenOptionsExt;
+        let mut opts = std::fs::OpenOptions::new();
+        opts.write(true).create(true).truncate(true).mode(0o600);
+        let Ok(mut f) = opts.open(&tmp) else { return false };
+        if std::io::Write::write_all(&mut f, &bytes).is_err() {
+            let _ = std::fs::remove_file(&tmp);
+            return false;
+        }
+    }
+    #[cfg(not(unix))]
+    {
+        if std::fs::write(&tmp, bytes).is_err() {
+            return false;
+        }
+    }
+    std::fs::rename(&tmp, path).is_ok()
 }
 
 /// [`recover_all`], for a start that keeps nothing waiting: how many documents came back as
@@ -351,6 +394,7 @@ pub fn recover_all(root: &Path, s: &mut Session) -> Recovered {
             }
         }
     };
+    let (mut free, mut held) = (Vec::new(), Vec::new());
     for e in entries.flatten() {
         let path = e.path();
         if !path.is_dir() {
@@ -358,10 +402,22 @@ pub fn recover_all(root: &Path, s: &mut Session) -> Recovered {
             continue;
         }
         // Still running (another window of the app), or not ours to take.
-        let Ok(lock) = File::options().write(true).create(true).truncate(false).open(path.join(LOCK)) else { continue };
-        if lock.try_lock().is_err() {
-            continue;
+        match lock_folder(&path) {
+            Ok(lock) => free.push((path, lock)),
+            Err(std::fs::TryLockError::WouldBlock) => held.push(path),
+            Err(_) => {}
         }
+    }
+    // A child between its `fork` and its `exec` shares the run's open descriptors, and a `flock`
+    // lasts while any of them is open, so an ended run's folder can look held for a moment. Wait
+    // once, however many folders are held, and try those again (#334). Windows doesn't pass the
+    // lock to child processes.
+    #[cfg(unix)]
+    if !held.is_empty() {
+        std::thread::sleep(LOCK_WAIT);
+        free.extend(held.into_iter().filter_map(|path| lock_folder(&path).ok().map(|lock| (path, lock))));
+    }
+    for (path, lock) in free {
         let lock = Arc::new(lock);
         let files: Vec<PathBuf> = std::fs::read_dir(&path).into_iter().flatten().flatten().map(|f| f.path()).collect();
         for f in &files {
diff --git a/apps/figcraft/src/recovery_online_tests.rs b/apps/figcraft/src/recovery_online_tests.rs
index c9036773..f877a0d4 100644
--- a/apps/figcraft/src/recovery_online_tests.rs
+++ b/apps/figcraft/src/recovery_online_tests.rs
@@ -193,7 +193,7 @@ fn a_copy_ahead_of_the_server_has_its_edits_applied_and_sent() {
     let left = crash(&s, &root);
     let note = std::fs::read_to_string(left.join(format!("{}.online", s.docs[0].uid))).unwrap();
     let at = s.online_of(s.docs[0].uid).unwrap().2;
-    assert_eq!(note, format!("{SERVER}\nf1\n{} {} {}", at.session, at.client_id, at.seq), "which file, who the app was, what it had");
+    assert_eq!(note, format!("{SERVER}\nf1\n{} {} {} {}", at.session, at.client_id, at.seq, at.secret), "which file, who the app was, what it had");
     assert!(!note.contains(OWNER) && !note.contains("token="), "never a secret");
     let (mut next, script, mut r, opened) = restart(&s, &root);
     assert_eq!(opened, 0, "nothing comes back as a plain copy");
diff --git a/apps/figcraft/src/recovery_tests.rs b/apps/figcraft/src/recovery_tests.rs
index a3d608f9..0322e237 100644
--- a/apps/figcraft/src/recovery_tests.rs
+++ b/apps/figcraft/src/recovery_tests.rs
@@ -167,6 +167,23 @@ fn a_normal_quit_removes_the_recovered_copies_it_took_over() {
     let _ = std::fs::remove_dir_all(&root);
 }
 
+#[test]
+fn quitting_without_the_unsaved_question_keeps_copies_for_the_next_start() {
+    let root = root("quitunasked");
+    // macOS's Quit menu: nothing asked, so the unsaved document comes back next time.
+    let s = edited();
+    Recovery::start(&root).unwrap().quit(&s, false);
+    let mut next = Session::empty();
+    assert_eq!(recover(&root, &mut next), 1);
+    let _ = std::fs::remove_dir_all(&root);
+    // Asked (saved or discarded on purpose), or nothing unsaved: nothing is left.
+    for (s, asked) in [(edited(), true), (Session::new(), false)] {
+        Recovery::start(&root).unwrap().quit(&s, asked);
+        assert!(std::fs::read_dir(&root).unwrap().next().is_none(), "asked: {asked}");
+    }
+    let _ = std::fs::remove_dir_all(&root);
+}
+
 #[test]
 fn a_run_whose_folder_name_is_still_held_takes_another() {
     let root = root("pidreuse");
@@ -186,6 +203,29 @@ fn a_run_whose_folder_name_is_still_held_takes_another() {
     let _ = std::fs::remove_dir_all(&root);
 }
 
+/// #334: a lock that frees itself is not a run that is still going. A child between its `fork` and
+/// its `exec` inherits the run's open descriptors and a `flock` lasts while any descriptor for the
+/// file is open, so a crashed run's copies must still come back once that child has exec'd.
+#[cfg(unix)]
+#[test]
+fn a_lock_freed_a_moment_later_is_not_a_run_that_is_still_going() {
+    let root = root("fork-window");
+    crashed(&edited(), &root);
+    // Hold the crashed run's folder lock on a second descriptor, the way a child forked before its
+    // exec holds it, and free it shortly after.
+    let lock = std::fs::File::options().write(true).create(true).truncate(false).open(root.join("crashed").join("lock")).unwrap();
+    lock.try_lock().unwrap();
+    let freed = std::thread::spawn(move || {
+        std::thread::sleep(std::time::Duration::from_millis(10));
+        drop(lock);
+    });
+    // The next start waits for that lock rather than reading the run as still going.
+    let mut next = Session::empty();
+    assert_eq!(recover(&root, &mut next), 1, "the copies come back once the lock frees itself");
+    freed.join().unwrap();
+    let _ = std::fs::remove_dir_all(&root);
+}
+
 /// The rectangles in `doc`.
 fn rectangles(doc: &figcraft_engine::doc::Document) -> usize {
     doc.nodes().filter(|n| matches!(n.kind, figcraft_engine::doc::NodeKind::Rectangle)).count()
diff --git a/apps/figcraft/src/services.rs b/apps/figcraft/src/services.rs
index bd8a4204..b83a2664 100644
--- a/apps/figcraft/src/services.rs
+++ b/apps/figcraft/src/services.rs
@@ -2,8 +2,8 @@
 
 use std::cell::RefCell;
 use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU8, Ordering};
+use std::sync::{Arc, Mutex};
 
 use figcraft_engine::{Prefs, Session};
 use figcraft_ui_egui::{DialogFuture, FigApp, Services};
@@ -11,15 +11,20 @@ use serde_json::{Value, json};
 
 pub struct Desktop {
     clipboard: Option<arboard::Clipboard>,
+    egui_ctx: Option<egui::Context>,
     /// Where the preferences live ([`config_dir`]).
     dir: Option<PathBuf>,
     pub prefs: Option<Prefs>,
     /// The system's reduce-motion setting (read in the background at startup).
     reduce_motion: Arc<AtomicBool>,
+    /// The system's colour scheme ([`watch_system_dark`]): 0 unknown, 1 dark, 2 light.
+    dark: Arc<AtomicU8>,
     /// The system's interface language (read at startup).
     language: Option<String>,
     /// Recovery copies of unsaved files (written at once after a panic).
     recovery: crate::recovery::Shared,
+    /// The folder of the last file or folder a dialog picked, where the next one starts.
+    last_folder: Arc<Mutex<Option<PathBuf>>>,
 }
 
 pub fn config_dir() -> Option<PathBuf> {
@@ -54,7 +59,33 @@ impl Desktop {
         let reduce_motion = Arc::new(AtomicBool::new(false));
         let flag = reduce_motion.clone();
         std::thread::spawn(move || flag.store(system_reduce_motion(), Ordering::Relaxed));
-        Self { clipboard: arboard::Clipboard::new().ok(), dir, prefs, reduce_motion, language: system_language(), recovery }
+        let dark = Arc::new(AtomicU8::new(DARK_UNKNOWN));
+        Self {
+            clipboard: arboard::Clipboard::new().ok(),
+            egui_ctx: None,
+            dir,
+            prefs,
+            reduce_motion,
+            dark,
+            language: system_language(),
+            recovery,
+            last_folder: Arc::default(),
+        }
+    }
+
+    /// winit reports no system theme on Linux and the BSDs: there the freedesktop colour scheme
+    /// answers instead, read once and then watched in the background, calling `wake` when it
+    /// changes (an idle window draws no frames). Elsewhere this does nothing.
+    pub fn follow_system_dark(&self, wake: impl Fn() + Send + 'static) {
+        #[cfg(all(unix, not(target_os = "macos")))]
+        if let Err(e) = std::thread::Builder::new().name("figcraft-theme".into()).spawn({
+            let dark = self.dark.clone();
+            move || watch_system_dark(&dark, &wake)
+        }) {
+            log::info!("colour scheme: can't start the watcher: {e}");
+        }
+        #[cfg(not(all(unix, not(target_os = "macos"))))]
+        let _ = wake;
     }
 }
 
@@ -136,6 +167,71 @@ fn command_says(program: &str, args: &[&str], want: &str) -> bool {
         .is_some_and(|o| String::from_utf8_lossy(&o.stdout).trim() == want)
 }
 
+/// [`Desktop::dark`]: the colour scheme is unknown, dark, or light.
+const DARK_UNKNOWN: u8 = 0;
+const DARK_DARK: u8 = 1;
+const DARK_LIGHT: u8 = 2;
+
+/// The desktop's colour scheme through the freedesktop settings portal
+/// (`org.freedesktop.appearance` / `color-scheme`: 1 dark, 2 light, 0 no preference, which is
+/// light), read once and then watched for changes, each one calling `wake`. Without a session bus
+/// or a portal the scheme stays unknown and the UI keeps its light fallback.
+#[cfg(all(unix, not(target_os = "macos")))]
+fn watch_system_dark(dark: &AtomicU8, wake: &dyn Fn()) {
+    use zbus::zvariant::Value;
+    const PORTAL: &str = "org.freedesktop.portal.Desktop";
+    const SETTINGS: &str = "org.freedesktop.portal.Settings";
+    const APPEARANCE: &str = "org.freedesktop.appearance";
+    // `Read` (portals before 1.17, which lack `ReadOne`) wraps the value in one more variant.
+    let scheme = |v: &Value| match v {
+        Value::U32(x) => *x,
+        Value::Value(inner) => match **inner {
+            Value::U32(x) => x,
+            _ => 0,
+        },
+        _ => 0,
+    };
+    let store = |v: u32| {
+        let new = match v {
+            1 => DARK_DARK,
+            2 => DARK_LIGHT,
+            _ => DARK_UNKNOWN,
+        };
+        if dark.swap(new, Ordering::Relaxed) != new {
+            wake();
+        }
+    };
+    let Ok(conn) = zbus::blocking::connection::Builder::session().and_then(|b| b.build()) else {
+        log::info!("colour scheme: no session bus: the system theme isn't followed");
+        return;
+    };
+    let read = |method: &str| -> zbus::Result<u32> {
+        let reply = conn.call_method(Some(PORTAL), "/org/freedesktop/portal/desktop", Some(SETTINGS), method, &(APPEARANCE, "color-scheme"))?;
+        let body = reply.body();
+        Ok(scheme(&body.deserialize::<Value>()?))
+    };
+    match read("ReadOne").or_else(|_| read("Read")) {
+        Ok(v) => store(v),
+        Err(e) => log::info!("colour scheme: can't read the system setting: {e}"),
+    }
+    let watch = || -> zbus::Result<()> {
+        let rule =
+            zbus::MatchRule::builder().msg_type(zbus::message::Type::Signal).sender(PORTAL)?.interface(SETTINGS)?.member("SettingChanged")?.build();
+        for msg in zbus::blocking::MessageIterator::for_match_rule(rule, &conn, Some(8))? {
+            let msg = msg?;
+            let body = msg.body();
+            let Ok((namespace, key, value)) = body.deserialize::<(String, String, Value<'_>)>() else { continue };
+            if namespace == APPEARANCE && key == "color-scheme" {
+                store(scheme(&value));
+            }
+        }
+        Ok(())
+    };
+    if let Err(e) = watch() {
+        log::info!("colour scheme: can't watch the system setting: {e}");
+    }
+}
+
 /// Show `path` in the file manager: selected in Finder and Explorer, its folder elsewhere.
 fn reveal(path: &Path) -> std::io::Result<()> {
     #[cfg(target_os = "macos")]
@@ -167,10 +263,18 @@ fn reveal(path: &Path) -> std::io::Result<()> {
 /// The preferences' file in the config folder.
 const STATE: &str = "state.json";
 
-pub fn save_state(app: &FigApp) {
-    if let Some(dir) = config_dir() {
-        write_prefs(&dir, &app.session.prefs);
+/// Everything quitting keeps, all done when it returns (macOS then ends the process): the
+/// preferences in `dir`, this run's recovery copies ([`Recovery::quit`](crate::recovery::Recovery::quit))
+/// and the live sessions' ends (one this app hosts tells everyone and stops; a joined one leaves).
+pub fn shutdown(app: &mut FigApp, dir: Option<&Path>, recovery: Option<crate::recovery::Recovery>) {
+    if let Some(dir) = dir {
+        write_prefs(dir, &app.session.prefs);
     }
+    // Before the sessions end: a recovered online file's copy waits for its session's outcome.
+    if let Some(r) = recovery {
+        r.quit(&app.session, app.ui.quit);
+    }
+    drop(std::mem::take(&mut app.session.live));
 }
 
 /// Write `prefs` to `dir` atomically (a temporary file renamed over the old one: a crash leaves
@@ -223,23 +327,102 @@ fn picked(pick: impl Future<Output = Option<rfd::FileHandle>> + 'static) -> Dial
     Box::pin(async move { pick.await.map(|f| f.path().to_path_buf()) })
 }
 
-impl Services for Desktop {
-    fn pick_open(&mut self, title: &str, exts: &[&str]) -> DialogFuture {
-        picked(dialog(title).add_filter("Supported files", exts).pick_file())
+/// How long a clipboard read may wait on the app that copied (Linux and the BSDs).
+#[cfg(all(unix, not(target_os = "macos")))]
+const CLIPBOARD_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(2);
+
+/// Read the clipboard. On Linux and the BSDs the read runs on a helper thread with its own handle
+/// and gives up after [`CLIPBOARD_TIMEOUT`]: a Wayland read waits on the app that copied with no
+/// timeout of its own, so an app that hangs must not hang the window too.
+#[cfg(all(unix, not(target_os = "macos")))]
+fn read_clipboard<T: Send + 'static>(_: &mut arboard::Clipboard, read: fn(&mut arboard::Clipboard) -> Option<T>) -> Option<T> {
+    let (tx, rx) = std::sync::mpsc::channel();
+    std::thread::spawn(move || {
+        let _ = tx.send(arboard::Clipboard::new().ok().and_then(|mut c| read(&mut c)));
+    });
+    rx.recv_timeout(CLIPBOARD_TIMEOUT).ok().flatten()
+}
+
+/// Read the clipboard (the system's own reads don't wait on the app that copied).
+#[cfg(not(all(unix, not(target_os = "macos"))))]
+fn read_clipboard<T>(c: &mut arboard::Clipboard, read: fn(&mut arboard::Clipboard) -> Option<T>) -> Option<T> {
+    read(c)
+}
+
+/// Native Save as filters; other callers keep their existing combined filter.
+fn save_filters<'a>(exts: &'a [&'a str]) -> Vec<(&'static str, &'a [&'a str])> {
+    if exts == ["figcraft", "fig"] {
+        vec![("FigCraft (.figcraft)", &exts[..1]), (figcraft_ui_egui::i18n::tr(".fig (experimental)"), &exts[1..])]
+    } else {
+        vec![("File", exts)]
     }
-    fn pick_save(&mut self, title: &str, name: &str, exts: &[&str]) -> DialogFuture {
-        picked(dialog(title).set_file_name(name).add_filter("File", exts).save_file())
-    }
-    fn pick_folder(&mut self, title: &str) -> DialogFuture {
-        picked(dialog(title).pick_folder())
-    }
-    fn clipboard_set_text(&mut self, s: &str) {
-        if let Some(c) = self.clipboard.as_mut() {
-            let _ = c.set_text(s.to_string());
+}
+
+/// The folder to start the next dialog in once `path` was picked: the file's folder, or the folder
+/// picked itself.
+pub(crate) fn folder_to_remember(path: &Path, is_folder: bool) -> Option<PathBuf> {
+    let folder = if is_folder { Some(path) } else { path.parent() };
+    folder.filter(|f| !f.as_os_str().is_empty()).map(Path::to_path_buf)
+}
+
+/// The remembered folder, unless it is gone since: then the system's own choice.
+pub(crate) fn start_folder(last: Option<PathBuf>) -> Option<PathBuf> {
+    last.filter(|f| f.is_dir())
+}
+
+impl Desktop {
+    /// A dialog that starts in the last folder used. The Linux portal does not remember it between
+    /// dialogs as macOS and Windows do.
+    fn dialog_in_last_folder(&self, title: &str) -> rfd::AsyncFileDialog {
+        let dialog = dialog(title);
+        match start_folder(self.last_folder.lock().ok().and_then(|l| l.clone())) {
+            Some(folder) => dialog.set_directory(folder),
+            None => dialog,
         }
     }
+}
+
+/// `pick`, with the folder of what it picks kept in `last` for the next dialog.
+pub(crate) fn remembering(last: Arc<Mutex<Option<PathBuf>>>, pick: DialogFuture, is_folder: bool) -> DialogFuture {
+    Box::pin(async move {
+        let path = pick.await?;
+        if let (Some(folder), Ok(mut last)) = (folder_to_remember(&path, is_folder), last.lock()) {
+            *last = Some(folder);
+        }
+        Some(path)
+    })
+}
+
+impl Services for Desktop {
+    fn pick_open(&mut self, title: &str, exts: &[&str]) -> DialogFuture {
+        let pick = picked(self.dialog_in_last_folder(title).add_filter("Supported files", exts).pick_file());
+        remembering(self.last_folder.clone(), pick, false)
+    }
+    fn pick_save(&mut self, title: &str, name: &str, exts: &[&str]) -> DialogFuture {
+        let mut dialog = self.dialog_in_last_folder(title).set_file_name(name);
+        for (label, extensions) in save_filters(exts) {
+            dialog = dialog.add_filter(label, extensions);
+        }
+        let pick = picked(dialog.save_file());
+        remembering(self.last_folder.clone(), pick, false)
+    }
+    fn pick_folder(&mut self, title: &str) -> DialogFuture {
+        let pick = picked(self.dialog_in_last_folder(title).pick_folder());
+        remembering(self.last_folder.clone(), pick, true)
+    }
+    fn clipboard_set_text(&mut self, s: &str) {
+        if let Some(ctx) = &self.egui_ctx {
+            ctx.copy_text(s.to_string());
+        }
+    }
+    fn set_egui_context(&mut self, ctx: &egui::Context) {
+        self.egui_ctx = Some(ctx.clone());
+    }
     fn clipboard_get_text(&mut self) -> Option<String> {
-        self.clipboard.as_mut()?.get_text().ok()
+        read_clipboard(self.clipboard.as_mut()?, |c| c.get_text().ok())
+    }
+    fn clipboard_get_html(&mut self) -> Option<String> {
+        read_clipboard(self.clipboard.as_mut()?, |c| c.get().html().ok())
     }
     fn clipboard_set_png(&mut self, w: u32, h: u32, rgba: &[u8]) {
         if let Some(c) = self.clipboard.as_mut() {
@@ -247,7 +430,7 @@ impl Services for Desktop {
         }
     }
     fn clipboard_get_image(&mut self) -> Option<(u32, u32, Vec<u8>)> {
-        let img = self.clipboard.as_mut()?.get_image().ok()?;
+        let img = read_clipboard(self.clipboard.as_mut()?, |c| c.get_image().ok())?;
         let (w, h) = (u32::try_from(img.width).ok()?, u32::try_from(img.height).ok()?);
         // Refuse absurd sizes (and mismatched buffers) rather than allocate.
         if w == 0 || h == 0 || u64::from(w) * u64::from(h) > 100_000_000 || img.bytes.len() != (w as usize) * (h as usize) * 4 {
@@ -278,6 +461,13 @@ impl Services for Desktop {
     fn reduce_motion(&self) -> bool {
         self.reduce_motion.load(Ordering::Relaxed)
     }
+    fn system_dark(&self) -> Option<bool> {
+        match self.dark.load(Ordering::Relaxed) {
+            DARK_DARK => Some(true),
+            DARK_LIGHT => Some(false),
+            _ => None,
+        }
+    }
     fn gamepad_held(&mut self) -> u32 {
         crate::gamepad::held()
     }
@@ -297,3 +487,24 @@ pub fn window_icon() -> Option<egui::IconData> {
     let (w, h) = img.dimensions();
     Some(egui::IconData { rgba: img.into_raw(), width: w, height: h })
 }
+
+#[cfg(test)]
+mod save_filter_tests {
+    use super::save_filters;
+
+    #[test]
+    fn native_and_fig_save_filters_are_separate_with_native_first() {
+        let extensions = ["figcraft", "fig"];
+        assert_eq!(
+            save_filters(&extensions),
+            vec![("FigCraft (.figcraft)", &extensions[..1]), (figcraft_ui_egui::i18n::tr(".fig (experimental)"), &extensions[1..])]
+        );
+    }
+
+    #[test]
+    fn other_save_filters_keep_one_combined_group() {
+        for extensions in [&["figcraft"][..], &["fig"][..], &["png"][..], &["png", "jpg", "webp"][..], &[][..]] {
+            assert_eq!(save_filters(extensions), vec![("File", extensions)]);
+        }
+    }
+}
diff --git a/apps/figcraft/src/services_tests.rs b/apps/figcraft/src/services_tests.rs
index 2390b92f..970f1729 100644
--- a/apps/figcraft/src/services_tests.rs
+++ b/apps/figcraft/src/services_tests.rs
@@ -82,3 +82,63 @@ fn preferences_are_readable_by_their_owner_only() {
     assert_eq!(mode(&dir.join("state.json")), 0o600);
     let _ = std::fs::remove_dir_all(&dir);
 }
+
+/// A live link that only records the sessions it was told to leave.
+struct Leaves(Arc<Mutex<Vec<u64>>>);
+
+impl figcraft_engine::live::LiveLink for Leaves {
+    fn host(&mut self, _: u64, _: figcraft_engine::live::HostOptions) -> Result<figcraft_engine::live::SessionInfo, String> {
+        Err("not in this test".into())
+    }
+    fn join(&mut self, _: u64, _: &str, _: &str) -> Result<(), String> {
+        Ok(())
+    }
+    fn leave(&mut self, session: u64) {
+        self.0.lock().unwrap().push(session);
+    }
+    fn presence(&mut self, _: u64, _: &figcraft_engine::live::Presence) {}
+    fn send(&mut self, _: u64, _: figcraft_engine::figcraft_collab::message::ClientMsg) {}
+    fn poll(&mut self) -> Vec<(u64, figcraft_engine::live::Event)> {
+        Vec::new()
+    }
+}
+
+#[test]
+fn quitting_keeps_the_preferences_and_ends_the_live_sessions() {
+    let dir = root("shutdown");
+    let mut fig = start(&dir);
+    let left = Arc::new(Mutex::new(Vec::new()));
+    fig.session.live.install(Box::new(Leaves(left.clone())));
+    let joined = fig.run("collab.join", json!({"link": "ws://127.0.0.1:9/?file=f1&token=EditSecretEditSecret00"})).unwrap();
+    fig.session.prefs.user_name = "Ada".into();
+    crate::services::shutdown(&mut fig, Some(&dir), None);
+    assert_eq!(*left.lock().unwrap(), [joined["session"].as_u64().unwrap()], "the session was left");
+    assert!(!fig.session.live.available(), "nothing is left to send on");
+    assert_eq!(start(&dir).session.prefs.user_name, "Ada", "the preferences were kept");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// #1290: the Linux portal opens every dialog where it likes, so the app keeps the folder itself.
+#[test]
+fn the_next_dialog_starts_in_the_folder_of_the_last_pick() {
+    use crate::services::{folder_to_remember, remembering, start_folder};
+    use std::path::PathBuf;
+    let dir = root("last-folder");
+    let file = dir.join("Poster.figcraft");
+    assert_eq!(folder_to_remember(&file, false), Some(dir.clone()), "a file: its folder");
+    assert_eq!(folder_to_remember(&dir, true), Some(dir.clone()), "a folder pick: the folder itself");
+    assert_eq!(folder_to_remember(std::path::Path::new("Poster.figcraft"), false), None, "a bare name has no folder");
+
+    let last = Arc::new(Mutex::new(None::<PathBuf>));
+    let mut pick = remembering(last.clone(), Box::pin(std::future::ready(Some(file.clone()))), false);
+    let mut cx = std::task::Context::from_waker(std::task::Waker::noop());
+    assert_eq!(pick.as_mut().poll(&mut cx), std::task::Poll::Ready(Some(file)));
+    assert_eq!(*last.lock().unwrap(), Some(dir.clone()), "a pick is remembered");
+    let mut cancelled = remembering(last.clone(), Box::pin(std::future::ready(None)), false);
+    assert_eq!(cancelled.as_mut().poll(&mut cx), std::task::Poll::Ready(None));
+    assert_eq!(*last.lock().unwrap(), Some(dir.clone()), "a cancelled dialog keeps the folder");
+
+    assert_eq!(start_folder(Some(dir.clone())), Some(dir.clone()));
+    let _ = std::fs::remove_dir_all(&dir);
+    assert_eq!(start_folder(Some(dir)), None, "a folder deleted since: the system's own");
+}
diff --git a/apps/figcraft/src/startup_tests.rs b/apps/figcraft/src/startup_tests.rs
index 0c92bd19..20910309 100644
--- a/apps/figcraft/src/startup_tests.rs
+++ b/apps/figcraft/src/startup_tests.rs
@@ -2,8 +2,15 @@
 //! report it, instead of the app quitting silently (#261).
 
 use figcraft_ui_egui::dialogs::window_failed as message;
+use figcraft_ui_egui::i18n::tr;
 
 const ERROR: &str = "WGPU error: Failed to create surface for any enabled backend: {}";
+const BACKEND_HINT: &str = "WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose.";
+const DRIVER_HINT: &str = if cfg!(windows) {
+    "Updating the graphics driver often helps. To use OpenGL only, start FigCraft from a Command Prompt with:"
+} else {
+    "Updating the graphics driver often helps. WGPU_BACKEND (vulkan, gl, metal) names another graphics API to try."
+};
 
 #[test]
 fn the_message_carries_the_error_and_where_to_report_it() {
@@ -15,9 +22,9 @@ fn the_message_carries_the_error_and_where_to_report_it() {
 #[test]
 fn without_wgpu_backend_it_suggests_the_driver_and_another_graphics_api() {
     let text = message(ERROR, false);
-    assert!(text.contains("graphics driver"), "{text}");
+    assert!(text.contains(tr(DRIVER_HINT)), "{text}");
     assert!(text.contains("WGPU_BACKEND"), "another graphics API to try: {text}");
-    assert!(!text.contains("unsetting"), "{text}");
+    assert!(!text.contains(tr(BACKEND_HINT)), "{text}");
 }
 
 #[cfg(windows)]
@@ -30,6 +37,6 @@ fn on_windows_it_shows_how_to_start_with_opengl() {
 #[test]
 fn with_wgpu_backend_set_it_suggests_unsetting_it() {
     let text = message(ERROR, true);
-    assert!(text.contains("unsetting"), "{text}");
-    assert!(!text.contains("graphics driver"), "the chosen backend is the likelier cause: {text}");
+    assert!(text.contains(tr(BACKEND_HINT)), "{text}");
+    assert!(!text.contains(tr(DRIVER_HINT)), "the chosen backend is the likelier cause: {text}");
 }
diff --git a/contributors/people.toml b/contributors/people.toml
index bc8cf71b..ec2847f0 100644
--- a/contributors/people.toml
+++ b/contributors/people.toml
@@ -24,6 +24,10 @@ display_name = "VanTan"
 real_name = "Tyler Jennings"
 display_name = "tylerjenningsw"
 
+[people.SiadeLucas]
+real_name = "Siade Lucas"
+sync_github_name = true
+
 [people.Silvertree2010]
 display_name = "Netter"
 sync_github_name = false
@@ -37,6 +41,11 @@ real_name = "Justin John"
 
 [people.Losminek]
 
+[people.alrifatsabbir]
+real_name = "Al Rifat Sabbir"
+display_name = "Al Rifat Sabbir"
+sync_github_name = true
+
 [people.RevDonz]
 
 [people.Nael-Nathanael]
@@ -44,3 +53,39 @@ sync_github_name = true
 
 [people.volkovskey]
 real_name = "Andrii Volkov"
+
+[people.marcoarnulfo]
+real_name = "Marco Arnulfo"
+display_name = "Marco Arnulfo"
+sync_github_name = false
+
+[people.krinry]
+display_name = "krinry"
+sync_github_name = true
+
+[people.pechnikov2026-star]
+sync_github_name = true
+
+[people.MortenHusted]
+sync_github_name = true
+
+[people.AganzeFelicite]
+sync_github_name = true
+
+[people.mojtabajafarzadeh]
+real_name = "Mojtaba Jafarzadeh"
+
+[people.switch87]
+real_name = "Gert Pellin"
+display_name = "Gert Pellin"
+sync_github_name = false
+
+[people.dotCooCoo]
+real_name = "Robert Lee"
+sync_github_name = true
+
+[people.leandrodslv]
+sync_github_name = true
+
+[people.mateusvillain]
+sync_github_name = true
diff --git a/crates/collab-net/src/code_tests.rs b/crates/collab-net/src/code_tests.rs
index 4880242f..4cf10f6a 100644
--- a/crates/collab-net/src/code_tests.rs
+++ b/crates/collab-net/src/code_tests.rs
@@ -87,7 +87,10 @@ fn a_local_share_is_joined_by_its_code_and_edits_sync() {
     let mut late = session("Cy");
     late.execute("collab.join", &json!({"code": shown})).unwrap();
     pump(&mut [&mut late], "the refusal", |s| matches!(s[0].live().status, Status::Failed { .. }));
-    assert!(late.live().status.label().contains("Couldn't join"), "{:?}", late.live().status);
+    // The port is free again: another program's host may have taken it, and that host refuses
+    // the code's secret.
+    let label = late.live().status.label();
+    assert!(label.contains("Couldn't join") || label.contains("The host refused"), "{label}");
 }
 
 #[test]
@@ -103,7 +106,10 @@ fn a_local_code_with_the_wrong_secret_or_a_typo_doesnt_join() {
     assert!(host.live().peers.is_empty());
     // A typing mistake is caught before anything connects.
     let mut typo: Vec<char> = local.code().chars().collect();
-    typo[7] = if typo[7] == 'A' { 'B' } else { 'A' };
+    // The last symbol contains only checksum bits. Changing payload bits can collide with
+    // the eight-bit checksum, so it does not guarantee a malformed code.
+    let last = typo.last_mut().unwrap();
+    *last = if *last == 'A' { 'B' } else { 'A' };
     let e = guest.execute("collab.join", &json!({"code": typo.iter().collect::<String>()})).unwrap_err().to_string();
     assert!(e.contains("typing mistake"), "{e}");
     // A view-only code doesn't exist here, and says where it does.
@@ -141,7 +147,9 @@ fn old_server() -> (Endpoint, std::thread::JoinHandle<()>) {
     let t = std::thread::spawn(move || {
         for stream in listener.incoming().take(2).flatten() {
             let Ok(mut ws) = tungstenite::accept(stream) else { continue };
-            let _ = ws.read();
+            // read() returns Result<Message>, not a lock guard; this test server deliberately
+            // ignores whatever the client sent first.
+            let _ = ws.read(); // NOSONAR
             let refused = ServerMsg::Refused { reason: "that message couldn't be read".into() };
             let _ = ws.send(Message::Binary(Bytes::from(message::encode(&refused).unwrap())));
             let _ = ws.close(None);
diff --git a/crates/collab-net/src/driver.rs b/crates/collab-net/src/driver.rs
index b8f6c154..4ebbec15 100644
--- a/crates/collab-net/src/driver.rs
+++ b/crates/collab-net/src/driver.rs
@@ -16,7 +16,7 @@ use figcraft_engine::live::{Event, Status};
 use web_time::Instant;
 
 use crate::inbox::Inbox;
-use crate::join::{GuestConfig, Next, Outcome, Resuming, Seen, Taken, after, closed, hello, resolved, take, unresolved};
+use crate::join::{GuestConfig, Next, Outcome, Resuming, Seen, Taken, after, closed, hello, resolved, take, too_large, unresolved};
 use crate::throttle::{PRESENCE_INTERVAL, Throttle, earliest};
 
 /// A WebSocket the driver opens, writes and closes; what it receives comes back through the
@@ -114,6 +114,9 @@ impl<S: Socket> Driver<S> {
     /// A binary message from the host.
     pub(crate) fn message(&mut self, bytes: &[u8], now: Instant) {
         let Some(c) = self.conn.as_mut() else { return };
+        if bytes.len() > self.cfg.limits.max_server_message {
+            return self.end(too_large(&self.cfg.limits), now);
+        }
         c.last_heard = now;
         let taken = match message::decode::<ServerMsg>(bytes, self.cfg.limits.max_server_message) {
             // The join code's answer: join the file it opens, on a new connection.
diff --git a/crates/collab-net/src/driver_tests.rs b/crates/collab-net/src/driver_tests.rs
index ca6563c5..5e395b98 100644
--- a/crates/collab-net/src/driver_tests.rs
+++ b/crates/collab-net/src/driver_tests.rs
@@ -10,7 +10,7 @@ use std::time::{Duration, Instant};
 use figcraft_collab::message::{self, ClientMsg, Presence, ServerMsg};
 use figcraft_collab::{Client, Limits, Outgoing, Server};
 use figcraft_doc::{Document, NodeId};
-use figcraft_engine::live::{Event, Status};
+use figcraft_engine::live::{Event, Status, TOO_LARGE_TO_JOIN};
 use tungstenite::protocol::WebSocket;
 use tungstenite::{Bytes, Message};
 
@@ -262,6 +262,15 @@ fn refusals_and_the_end_of_the_session_are_final() {
         assert!(d.done());
         assert!(matches!(statuses(&inbox.drain()).last(), Some(Status::Failed { reason }) if reason.starts_with("The host refused")));
     }
+    // A message over the size limit: the file is too large for this app, not refused by the host.
+    let inbox = Inbox::new(Arc::new(|| {}));
+    let mut cfg = GuestConfig::new(invite(), "Ada".into());
+    cfg.limits.max_server_message = 2 << 20;
+    let mut d = Driver::start(Script::default(), cfg, inbox.clone(), t0);
+    d.opened(t0);
+    d.message(&vec![0; (2 << 20) + 1], t0);
+    assert!(d.done());
+    assert!(matches!(statuses(&inbox.drain()).last(), Some(Status::Failed { reason }) if *reason == TOO_LARGE_TO_JOIN.replace("{mb}", "2")));
 }
 
 #[test]
diff --git a/crates/collab-net/src/guest.rs b/crates/collab-net/src/guest.rs
index eb899b8d..2e1d5046 100644
--- a/crates/collab-net/src/guest.rs
+++ b/crates/collab-net/src/guest.rs
@@ -26,7 +26,7 @@ use tungstenite::{Bytes, Message};
 use crate::inbox::Inbox;
 use crate::invite::{Endpoint, Invite};
 pub use crate::join::GuestConfig;
-use crate::join::{Next, Outcome, Resuming, Seen, Taken, after, closed, hello, resolved, take, unresolved};
+use crate::join::{Next, Outcome, Resuming, Seen, Taken, after, closed, hello, resolved, take, too_large, unresolved};
 use crate::manage;
 use crate::net::{Duplex, NetLimits, config, open, shutdown};
 use crate::throttle::{PRESENCE_INTERVAL, Throttle, earliest};
@@ -367,7 +367,7 @@ fn read_loop(mut ws: WebSocket<Duplex>, ctx: &ReaderCtx) {
             Ok(Message::Close(f)) => break f.map_or_else(|| closed(0, ""), |f| closed(f.code.into(), &f.reason)),
             Ok(Message::Text(_)) => break Outcome::Refused("the host sent a text message".into()),
             Ok(_) => {}
-            Err(tungstenite::Error::Capacity(_)) => break Outcome::Refused("the host sent a message over the size limit".into()),
+            Err(tungstenite::Error::Capacity(_)) => break too_large(&ctx.cfg.limits),
             Err(e) => break Outcome::Retry(e.to_string()),
         }
     };
diff --git a/crates/collab-net/src/hub.rs b/crates/collab-net/src/hub.rs
index 5cf3e519..363ecae0 100644
--- a/crates/collab-net/src/hub.rs
+++ b/crates/collab-net/src/hub.rs
@@ -46,1015 +46,27 @@ use crate::join::{ENDED, RESTARTING};
 use crate::net::{Bucket, Duplex, Meter, NetLimits, Readers, config, shutdown};
 use crate::throttle::{PRESENCE_INTERVAL, Throttle, earliest};
 
-/// How long a closing connection waits for the peer to hang up.
-const LINGER: Duration = Duration::from_secs(2);
+mod backend;
+mod conn;
+mod hosting;
+mod limits;
+mod queue;
 
-/// Signals (cursor chat, spotlight) a client may send per second on average, and in a burst;
-/// beyond that they are dropped.
-pub const SIGNAL_RATE: f64 = 20.0;
-pub const SIGNAL_BURST: f64 = 40.0;
+pub use backend::{Backend, Closing, Handled, OpenFile};
+pub use conn::{SIGNAL_BURST, SIGNAL_RATE};
+use conn::{encode, reason, refuse, refused};
+pub use hosting::Hosting;
+pub(crate) use hosting::{Local, clean_name};
+pub use limits::{Admission, Block, ip_blocks, ip_key};
+pub use queue::wide_block;
+#[cfg(test)]
+use queue::{BlockUse, Blocks};
+use queue::{Charges, HubIn, InFlight, Line, Out, Push};
 
 /// Most messages the hub handles before it sends what they produced (bounds the delay a burst
 /// adds).
 const BURST: usize = 256;
 
-/// What a link lets a hello do.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Admission {
-    pub access: Access,
-    /// The link's id, when the backend has several per file (revoking it disconnects whoever
-    /// joined with it).
-    pub link: Option<String>,
-}
-
-/// An admin request's reply, and what the hub must do about connections it affects.
-#[derive(Clone, Debug, PartialEq)]
-pub struct Handled {
-    pub reply: AdminReply,
-    /// A link was revoked: `(file, link)`; whoever joined with it is disconnected.
-    pub revoked: Option<(String, String)>,
-    /// A file was removed: whoever is in it is disconnected and it is closed without saving.
-    pub removed: Option<String>,
-    /// An address was blocked ([`ip_key`]): its connections are dropped.
-    pub blocked: Option<IpAddr>,
-}
-
-impl From<AdminReply> for Handled {
-    fn from(reply: AdminReply) -> Self {
-        Self { reply, revoked: None, removed: None, blocked: None }
-    }
-}
-
-/// The address limits and blocks count a client by: its IPv4 address (an IPv4-mapped IPv6 address
-/// as IPv4), or its IPv6 address's /64 (one subscriber's block: they have billions of addresses).
-pub fn ip_key(ip: IpAddr) -> IpAddr {
-    match ip.to_canonical() {
-        IpAddr::V6(v6) => {
-            let [a, b, c, d, ..] = v6.segments();
-            IpAddr::V6(Ipv6Addr::new(a, b, c, d, 0, 0, 0, 0))
-        }
-        v4 => v4,
-    }
-}
-
-/// What everyone is told when a hub stops.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Closing {
-    /// The session is over (the app stopped hosting): final.
-    Ended,
-    /// The server is restarting: clients reconnect until it is back.
-    Restarting,
-}
-
-/// What the hub knows of an open file (for listings).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub struct OpenFile {
-    /// People connected to it.
-    pub people: u32,
-    /// Its latest sequence number.
-    pub seq: u64,
-}
-
-/// Where a hub's files come from and what it keeps of them (see the module docs). The hub calls it
-/// from its own thread only.
-pub trait Backend: Send + 'static {
-    /// A hello for `file` with `token`: what it may do, or why it may not join (the reason is
-    /// shown to the person joining; never echo the token).
-    fn admit(&mut self, file: &str, token: &str) -> Result<Admission, String>;
-
-    /// The session for a file that isn't open (after [`admit`](Self::admit) let someone in).
-    fn open(&mut self, file: &str) -> Result<Server, String>;
-
-    /// The hub handled a message for an open file: keep what changed (its server's journal).
-    fn changed(&mut self, _file: &str, _server: &mut Server) {}
-
-    /// Make what [`changed`](Self::changed) kept durable; the hub sends the servers' answers
-    /// after this. The files whose changes couldn't be made durable: nobody hears of them, the
-    /// files are closed (the backend forgets their open state) and everyone in them reconnects.
-    fn flush(&mut self) -> Vec<String> {
-        Vec::new()
-    }
-
-    /// Whether `file` has room for a batch of about `bytes` (its size on the wire): why not, and
-    /// the batch is refused.
-    fn room(&mut self, _file: &str, _server: &Server, _bytes: usize) -> Result<(), String> {
-        Ok(())
-    }
-
-    /// Everyone left `file`: save it. True closes it (the next hello opens it again).
-    fn idle(&mut self, _file: &str, _server: &mut Server) -> bool {
-        false
-    }
-
-    /// The hub is stopping: save the open files.
-    fn stop(&mut self, _open: Vec<(&str, &mut Server)>) {}
-
-    /// A managing connection's key: whether it may manage files.
-    fn manage(&mut self, _key: &str) -> Result<(), String> {
-        Err("this session is hosted by an app: it has no files to manage".into())
-    }
-
-    /// A request on a managing connection; `open` tells about a file that is open.
-    fn admin(&mut self, _req: Admin, _open: &dyn Fn(&str) -> Option<OpenFile>) -> Handled {
-        AdminReply::Failed { reason: "nothing to manage here".into() }.into()
-    }
-
-    /// A request on a library connection to `file`, opened with a link of `access` (checked by
-    /// [`admit`](Self::admit)).
-    fn library(&mut self, _ip: IpAddr, _file: &str, _access: Access, _req: LibraryReq) -> LibraryReply {
-        LibraryReply::Failed { reason: "this session is hosted by an app: team libraries live on a figcraft-server".into() }
-    }
-
-    /// A request on a plugin directory connection; `publisher`: it was opened with the right key
-    /// (checked by [`manage`](Self::manage)).
-    fn plugins(&mut self, _ip: IpAddr, _publisher: bool, _req: PluginReq) -> PluginReply {
-        PluginReply::Failed { reason: "this session is hosted by an app: plugin directories live on a figcraft-server".into() }
-    }
-
-    /// A new connection from `ip` ([`ip_key`]): whether it may go on (why not is shown to the
-    /// client).
-    fn connect(&mut self, _ip: IpAddr) -> Result<(), String> {
-        Ok(())
-    }
-
-    /// A message from a connection from `ip`: false disconnects it (that address sends too much).
-    fn message(&mut self, _ip: IpAddr, _msg: &ClientMsg) -> bool {
-        true
-    }
-
-    /// What to tell a client that reads it about the server's hosting, after its welcome to
-    /// `file` (`None`: nothing).
-    fn hosting(&mut self, _file: &str) -> Option<HostInfo> {
-        None
-    }
-
-    /// An open hosting connection from `ip`, with a file's owner token when `file` isn't empty:
-    /// what the server says about its hosting, or why the connection is refused.
-    fn open_hosting(&mut self, _ip: IpAddr, _file: &str, _owner: &str) -> Result<HostInfo, String> {
-        Err("this session is hosted by an app: it doesn't keep files for anyone".into())
-    }
-
-    /// A request on an open hosting connection from `ip`; `owns`: the file whose owner token it
-    /// was opened with.
-    fn hosted(&mut self, _ip: IpAddr, _owns: Option<&str>, _req: Admin, _open: &dyn Fn(&str) -> Option<OpenFile>) -> Handled {
-        AdminReply::Failed { reason: "nothing to manage here".into() }.into()
-    }
-
-    /// Someone in `file` (joined with `link`, from `ip`) reports it to the operator.
-    fn report(&mut self, _file: &str, _link: Option<&str>, _ip: IpAddr, _reason: &str) -> Result<(), String> {
-        Err("this session is hosted by an app: tell the person hosting it".into())
-    }
-
-    /// A join code typed by someone at `ip`: the file it opens and that link's token, or why not
-    /// (shown to them; wrong codes are counted against the address).
-    fn resolve(&mut self, _ip: IpAddr, _code: &str) -> Result<(String, String), String> {
-        Err("this session is hosted by an app: join it with its own code or invite link".into())
-    }
-
-    /// What everyone is told when the hub stops.
-    fn closing(&self) -> Closing;
-}
-
-/// A message for one connection's writer: bytes (with what they count against, released when
-/// they are sent or dropped), or the close.
-enum Out {
-    Bytes(Bytes, Option<Charge>),
-    Close(CloseCode, String),
-}
-
-/// One message's bytes held for one or more connections (a broadcast shares one buffer), counted
-/// once against a shared counter (the server's, or a block's) until the last copy is sent or
-/// dropped.
-struct Held {
-    n: usize,
-    counter: Arc<AtomicUsize>,
-}
-
-impl Held {
-    fn new(n: usize, counter: &Arc<AtomicUsize>) -> Arc<Held> {
-        counter.fetch_add(n, Ordering::Relaxed);
-        Arc::new(Held { n, counter: counter.clone() })
-    }
-}
-
-impl Drop for Held {
-    fn drop(&mut self) {
-        self.counter.fetch_sub(self.n, Ordering::Relaxed);
-    }
-}
-
-/// What one message counts against, made by its first recipient and shared by the others: the
-/// server's budget once, and each recipient block's once (twenty people behind one office's
-/// address cost their block one copy of a broadcast, not twenty).
-#[derive(Default)]
-struct Charges {
-    all: Option<Arc<Held>>,
-    blocks: Vec<(usize, Arc<Held>)>,
-    /// Count it against blocks at all: a welcome isn't (it is bounded by the file's size and each
-    /// connection's cap, and a whole office joining at once must fit).
-    skip_blocks: bool,
-}
-
-/// Bytes waiting in a connection's queue, counted against its cap until dropped (and, through
-/// [`Held`], once against the server's budget and once against its block's).
-struct Charge {
-    n: usize,
-    mine: Arc<AtomicUsize>,
-    _all: Arc<Held>,
-    _block: Option<Arc<Held>>,
-}
-
-impl Drop for Charge {
-    fn drop(&mut self) {
-        self.mine.fetch_sub(self.n, Ordering::Relaxed);
-    }
-}
-
-/// Why a message couldn't be queued.
-#[derive(Debug, PartialEq, Eq)]
-enum Push {
-    /// The connection's or its block's queue is full: it can't keep up.
-    Full,
-    /// The server's budget for queued bytes is used up.
-    Everyone,
-    /// The connection is gone.
-    Gone,
-}
-
-/// One connection's way out: its writer's queue, capped in messages and in bytes (its own, its
-/// block of addresses', and the server's for everyone), so a client that doesn't read can't make
-/// the server hold more than that for it.
-#[derive(Clone)]
-struct Line {
-    tx: SyncSender<Out>,
-    queued: Arc<AtomicUsize>,
-    block: Arc<AtomicUsize>,
-    all: Arc<AtomicUsize>,
-    max: usize,
-    max_block: usize,
-    max_all: usize,
-}
-
-impl Line {
-    /// Queue `b`. One message always fits an empty queue (a welcome as large as the largest file
-    /// gets out). `charges` is what the message counts against, shared by its recipients;
-    /// `over_budget` lets it past the server's budget (the hub just dropped the biggest consumer
-    /// to make room).
-    fn push(&self, b: &Bytes, charges: &mut Charges, over_budget: bool) -> Result<(), Push> {
-        let n = b.len();
-        let mine = self.queued.load(Ordering::Relaxed);
-        if mine > 0 && mine.saturating_add(n) > self.max {
-            return Err(Push::Full);
-        }
-        let key = Arc::as_ptr(&self.block) as usize;
-        let block = if charges.skip_blocks {
-            None
-        } else if let Some((_, h)) = charges.blocks.iter().find(|(k, _)| *k == key) {
-            Some(h.clone())
-        } else {
-            let used = self.block.load(Ordering::Relaxed);
-            if used > 0 && used.saturating_add(n) > self.max_block {
-                return Err(Push::Full);
-            }
-            let h = Held::new(n, &self.block);
-            charges.blocks.push((key, h.clone()));
-            Some(h)
-        };
-        let all = match &charges.all {
-            Some(h) => h.clone(),
-            None => {
-                if !over_budget && self.all.load(Ordering::Relaxed).saturating_add(n) > self.max_all {
-                    return Err(Push::Everyone);
-                }
-                charges.all.insert(Held::new(n, &self.all)).clone()
-            }
-        };
-        self.queued.fetch_add(n, Ordering::Relaxed);
-        let charge = Charge { n, mine: self.queued.clone(), _all: all, _block: block };
-        self.tx.try_send(Out::Bytes(b.clone(), Some(charge))).map_err(|e| match e {
-            TrySendError::Full(_) => Push::Full,
-            TrySendError::Disconnected(_) => Push::Gone,
-        })
-    }
-}
-
-/// What one block of addresses (an IPv4 address, an IPv6 /48: [`wide_block`]) has queued and is
-/// having read, shared by its connections.
-#[derive(Clone, Default)]
-struct BlockUse {
-    queued: Arc<AtomicUsize>,
-    reading: Arc<AtomicUsize>,
-}
-
-/// The blocks with open connections; a block leaves when its last connection ends.
-#[derive(Clone, Default)]
-struct Blocks(Arc<Mutex<HashMap<IpAddr, BlockUse>>>);
-
-impl Blocks {
-    /// Block `key`'s counters; blocks nobody uses any more (only the table holds their counters,
-    /// whose connections' queues and readers are all gone) are forgotten first, so the table
-    /// never holds more than the blocks of open connections.
-    fn get(&self, key: IpAddr) -> BlockUse {
-        let mut t = self.0.lock().unwrap_or_else(PoisonError::into_inner);
-        t.retain(|_, u| Arc::strong_count(&u.queued) > 1 || Arc::strong_count(&u.reading) > 1);
-        t.entry(key).or_default().clone()
-    }
-
-    /// Blocks remembered.
-    fn len(&self) -> usize {
-        self.0.lock().unwrap_or_else(PoisonError::into_inner).len()
-    }
-}
-
-/// The widest block an address counts in for the server's shared budgets: an IPv4 address, or an
-/// IPv6 address's /48.
-pub fn wide_block(key: IpAddr) -> IpAddr {
-    ip_blocks(key).last().map_or(key, |(b, _)| b.0)
-}
-
-/// Messages handed to the hub thread and not handled yet, in bytes: past the budget a reader
-/// drops its connection instead of piling more on a busy hub.
-#[derive(Clone)]
-struct InFlight(Arc<AtomicUsize>);
-
-impl InFlight {
-    fn take(&self, n: usize, max: usize) -> bool {
-        if self.0.fetch_add(n, Ordering::Relaxed).saturating_add(n) > max {
-            self.0.fetch_sub(n, Ordering::Relaxed);
-            return false;
-        }
-        true
-    }
-
-    fn give(&self, n: usize) {
-        self.0.fetch_sub(n, Ordering::Relaxed);
-    }
-}
-
-enum HubIn {
-    /// A connection's first message (`Hello`, `Manage`, `OpenLibrary`, `OpenPlugins`,
-    /// `OpenHosting` or `Resolve`) and its client's address ([`ip_key`]).
-    Open {
-        conn: u64,
-        ip: IpAddr,
-        first: ClientMsg,
-        out: Line,
-        sock: TcpStream,
-        /// Its size (in flight until handled).
-        bytes: usize,
-    },
-    Msg {
-        conn: u64,
-        msg: ClientMsg,
-        bytes: usize,
-    },
-    Gone {
-        conn: u64,
-    },
-    Local(Presence),
-    LocalMsg(ClientMsg),
-    /// The person hosting removes client `id` from their file (app sessions).
-    Remove(u32),
-    /// Cut every connection without a word (tests: a network failure).
-    #[cfg(test)]
-    Cut,
-    Stop,
-}
-
-/// The person hosting an app session: in the file's session without a socket.
-pub(crate) struct Local {
-    pub file: String,
-    pub server: Server,
-    /// Their client id (they joined `server` already).
-    pub id: u32,
-    pub inbox: Inbox,
-}
-
-fn spawn(name: &str, f: impl FnOnce() + Send + 'static) -> io::Result<JoinHandle<()>> {
-    std::thread::Builder::new().name(name.to_string()).spawn(f)
-}
-
-/// A name others may see: trimmed, no control characters, at most [`MAX_NAME`] characters.
-pub(crate) fn clean_name(s: &str) -> String {
-    s.trim().chars().filter(|c| !c.is_control()).take(MAX_NAME).collect()
-}
-
-/// A running hub: its listener, connections and hub thread. Dropping it stops it.
-pub struct Hosting {
-    addr: SocketAddr,
-    hub: Sender<HubIn>,
-    stop: Arc<AtomicBool>,
-    open: Arc<AtomicUsize>,
-    /// Bytes queued for every connection together, and in flight to the hub.
-    queued: Arc<AtomicUsize>,
-    in_flight: InFlight,
-    blocks: Blocks,
-    reading: Arc<AtomicUsize>,
-    hub_thread: Option<JoinHandle<()>>,
-    accept_thread: Option<JoinHandle<()>>,
-}
-
-impl Hosting {
-    /// Serve `backend`'s files on `listener`.
-    pub fn serve<B: Backend>(listener: TcpListener, backend: B, limits: NetLimits) -> io::Result<Hosting> {
-        Self::start(listener, backend, limits, None)
-    }
-
-    pub(crate) fn start<B: Backend>(listener: TcpListener, backend: B, limits: NetLimits, local: Option<Local>) -> io::Result<Hosting> {
-        let addr = listener.local_addr()?;
-        let in_flight = InFlight(Arc::default());
-        let mut hub = Hub {
-            backend,
-            rooms: HashMap::new(),
-            conns: HashMap::new(),
-            local: None,
-            outbox: Vec::new(),
-            in_flight: in_flight.clone(),
-            barred: HashMap::new(),
-        };
-        if let Some(l) = local {
-            let mut room = Room::new(l.server);
-            room.local = Some((l.id, l.inbox));
-            hub.rooms.insert(l.file.clone(), room);
-            hub.local = Some(l.file);
-        }
-        let (hub_tx, hub_rx) = channel();
-        let stop = Arc::new(AtomicBool::new(false));
-        let open = Arc::new(AtomicUsize::new(0));
-        let hub_thread = spawn("live-hub", move || hub.run(&hub_rx))?;
-        let shared = Shared {
-            per_address: PerAddress::default(),
-            queued: Arc::default(),
-            in_flight: in_flight.clone(),
-            blocks: Blocks::default(),
-            reading: Arc::default(),
-            readers: Readers::default(),
-        };
-        let queued = shared.queued.clone();
-        let blocks = shared.blocks.clone();
-        let reading = shared.reading.clone();
-        let accept_thread = {
-            let (hub_tx, stop, open) = (hub_tx.clone(), stop.clone(), open.clone());
-            spawn("live-accept", move || accept(&listener, &hub_tx, &stop, &open, limits, shared))
-        };
-        let accept_thread = match accept_thread {
-            Ok(t) => t,
-            Err(e) => {
-                let _ = hub_tx.send(HubIn::Stop);
-                let _ = hub_thread.join();
-                return Err(e);
-            }
-        };
-        log::info!("live session: listening on {addr}");
-        Ok(Hosting {
-            addr,
-            hub: hub_tx,
-            stop,
-            open,
-            queued,
-            in_flight,
-            blocks,
-            reading,
-            hub_thread: Some(hub_thread),
-            accept_thread: Some(accept_thread),
-        })
-    }
-
-    /// Bytes waiting to be sent to clients, all connections together.
-    pub fn queued_bytes(&self) -> usize {
-        self.queued.load(Ordering::Relaxed)
-    }
-
-    /// Blocks of addresses the server keeps counters for (those of open connections, and any
-    /// whose last connection just ended, until the next connection prunes them).
-    pub fn blocks_remembered(&self) -> usize {
-        self.blocks.len()
-    }
-
-    /// Bytes being read into messages not whole yet, all connections together.
-    pub fn reading_bytes(&self) -> usize {
-        self.reading.load(Ordering::Relaxed)
-    }
-
-    /// Bytes of messages read and not handled by the hub yet.
-    pub fn in_flight_bytes(&self) -> usize {
-        self.in_flight.0.load(Ordering::Relaxed)
-    }
-
-    /// Where it listens.
-    pub fn addr(&self) -> SocketAddr {
-        self.addr
-    }
-
-    /// Open connections (joined or not).
-    pub fn connections(&self) -> usize {
-        self.open.load(Ordering::Relaxed)
-    }
-
-    /// The hosting person's presence (app sessions).
-    pub(crate) fn presence(&self, p: Presence) {
-        let _ = self.hub.send(HubIn::Local(p));
-    }
-
-    /// A message from the hosting person's sync client (their edits).
-    pub(crate) fn send(&self, msg: ClientMsg) {
-        let _ = self.hub.send(HubIn::LocalMsg(msg));
-    }
-
-    /// The hosting person removes client `id` from their file (app sessions; see
-    /// [`HubIn::Remove`]).
-    pub(crate) fn remove(&self, id: u32) {
-        let _ = self.hub.send(HubIn::Remove(id));
-    }
-
-    /// Cut every connection as a network failure would (no close frame).
-    #[cfg(test)]
-    pub(crate) fn cut_connections(&self) {
-        let _ = self.hub.send(HubIn::Cut);
-    }
-
-    /// Stop: the backend saves what's open, everyone is told and disconnected, the port is
-    /// released.
-    pub fn stop(&mut self) {
-        if self.stop.swap(true, Ordering::SeqCst) {
-            return;
-        }
-        let _ = self.hub.send(HubIn::Stop);
-        if let Some(t) = self.hub_thread.take() {
-            let _ = t.join();
-        }
-        // The accept loop checks the flag after each connection: wake it with one.
-        let wake = if self.addr.ip().is_unspecified() { SocketAddr::new(loopback(self.addr), self.addr.port()) } else { self.addr };
-        let woke = TcpStream::connect_timeout(&wake, Duration::from_secs(1)).is_ok();
-        if let Some(t) = self.accept_thread.take() {
-            if woke {
-                let _ = t.join();
-            } else {
-                log::warn!("live session: couldn't wake the accept loop; it ends with the next connection");
-            }
-        }
-        // Readers end once their writers have closed the sockets.
-        let deadline = Instant::now() + Duration::from_secs(2);
-        while self.open.load(Ordering::Relaxed) > 0 && Instant::now() < deadline {
-            std::thread::sleep(Duration::from_millis(5));
-        }
-        log::info!("live session: stopped listening on {}", self.addr);
-    }
-}
-
-impl Drop for Hosting {
-    fn drop(&mut self) {
-        self.stop();
-    }
-}
-
-/// The loopback address of `addr`'s family.
-fn loopback(addr: SocketAddr) -> std::net::IpAddr {
-    if addr.is_ipv6() { std::net::Ipv6Addr::LOCALHOST.into() } else { std::net::Ipv4Addr::LOCALHOST.into() }
-}
-
-/// Counts an open connection until dropped.
-struct Open(Arc<AtomicUsize>);
-
-impl Drop for Open {
-    fn drop(&mut self) {
-        self.0.fetch_sub(1, Ordering::Relaxed);
-    }
-}
-
-/// A block of addresses: its first address and its prefix length (2001:db8:: as a /64 and as a
-/// /48 are different blocks).
-pub type Block = (IpAddr, u8);
-
-/// The blocks a client's address ([`ip_key`]) counts in, with how many times its own limits each
-/// gets: the address itself (an IPv4 /32 or an IPv6 /64, ×1) and, for IPv6, its /56 (×2) and /48
-/// (×4), so a tunnel's free /48 doesn't multiply the limits 65,536 times.
-pub fn ip_blocks(key: IpAddr) -> Vec<(Block, u32)> {
-    let IpAddr::V6(v6) = key else { return vec![((key, 32), 1)] };
-    let [a, b, c, d, ..] = v6.segments();
-    vec![
-        ((IpAddr::V6(Ipv6Addr::new(a, b, c, d, 0, 0, 0, 0)), 64), 1),
-        ((IpAddr::V6(Ipv6Addr::new(a, b, c, d & 0xff00, 0, 0, 0, 0)), 56), 2),
-        ((IpAddr::V6(Ipv6Addr::new(a, b, c, 0, 0, 0, 0, 0)), 48), 4),
-    ]
-}
-
-/// Open connections per client address ([`ip_key`], and its wider IPv6 blocks); an address
-/// leaves when its last one closes, so the table never holds more than the open connections.
-#[derive(Clone, Default)]
-struct PerAddress(Arc<Mutex<HashMap<Block, usize>>>);
-
-/// One connection counted for a block until dropped.
-struct Counted {
-    table: PerAddress,
-    ip: Block,
-}
-
-impl PerAddress {
-    /// Count a connection from block `ip`, unless it has `cap` already (0: no cap).
-    fn enter(&self, ip: Block, cap: usize) -> Option<Counted> {
-        let mut t = self.0.lock().unwrap_or_else(PoisonError::into_inner);
-        let n = t.entry(ip).or_insert(0);
-        if cap > 0 && *n >= cap {
-            if *n == 0 {
-                t.remove(&ip);
-            }
-            return None;
-        }
-        *n += 1;
-        Some(Counted { table: self.clone(), ip })
-    }
-
-    /// Count a connection from `ip` in each of its blocks, unless one of them is full. A wider
-    /// block's cap is its multiple of `cap`, but at most a sixteenth (/56) or an eighth (/48) of
-    /// `all` connections, so no block takes every connection.
-    fn enter_all(&self, ip: IpAddr, cap: usize, all: usize) -> Option<Vec<Counted>> {
-        let mut held = Vec::new();
-        for ((addr, prefix), times) in ip_blocks(ip) {
-            let block_cap = match prefix {
-                56 => cap.saturating_mul(times as usize).min(all / 16).max(1),
-                48 => cap.saturating_mul(times as usize).min(all / 8).max(1),
-                _ => cap,
-            };
-            held.push(self.enter((addr, prefix), if cap == 0 { 0 } else { block_cap })?);
-        }
-        Some(held)
-    }
-}
-
-impl Drop for Counted {
-    fn drop(&mut self) {
-        let mut t = self.table.0.lock().unwrap_or_else(PoisonError::into_inner);
-        if let Some(n) = t.get_mut(&self.ip) {
-            *n = n.saturating_sub(1);
-            if *n == 0 {
-                t.remove(&self.ip);
-            }
-        }
-    }
-}
-
-/// Longest request line an uptime check may have.
-const MAX_CHECK_LINE: usize = 2048;
-
-/// An uptime check: a plain `GET` of a path ending in `/healthz` is answered `200 ok` and closed.
-/// True when it was one (the connection is done). Anything else is only peeked at, so a WebSocket
-/// handshake goes on untouched.
-fn health_check(stream: &mut TcpStream, until: Instant) -> bool {
-    let mut buf = [0u8; MAX_CHECK_LINE];
-    let line = loop {
-        let n = match stream.peek(&mut buf) {
-            Ok(0) | Err(_) => return false,
-            Ok(n) => n,
-        };
-        let seen = buf.get(..n).unwrap_or_default();
-        if !seen.starts_with(b"GET ") && !b"GET ".starts_with(seen) {
-            return false;
-        }
-        if let Some(end) = seen.windows(2).position(|w| w == b"\r\n") {
-            break seen.get(..end).unwrap_or_default().to_vec();
-        }
-        if n == buf.len() || Instant::now() >= until {
-            return false;
-        }
-        // The rest of the line is on its way (it nearly always arrives in one piece).
-        std::thread::sleep(Duration::from_millis(10));
-    };
-    let path = line.split(|b| *b == b' ').nth(1).unwrap_or_default();
-    let path = path.split(|b| *b == b'?').next().unwrap_or_default();
-    if !path.ends_with(b"/healthz") {
-        return false;
-    }
-    // Read the request (its headers end with a blank line), so closing doesn't reset it.
-    let mut req = Vec::new();
-    let mut chunk = [0u8; 1024];
-    while !req.windows(4).any(|w| w == b"\r\n\r\n") && req.len() < 16 << 10 {
-        match stream.read(&mut chunk) {
-            Ok(0) | Err(_) => break,
-            Ok(n) => req.extend_from_slice(chunk.get(..n).unwrap_or_default()),
-        }
-    }
-    let _ = stream
-        .write_all(b"HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 3\r\nCache-Control: no-store\r\nConnection: close\r\n\r\nok\n");
-    let _ = stream.shutdown(std::net::Shutdown::Write);
-    true
-}
-
-/// The client a trusted proxy names: the last address of its last `X-Forwarded-For` (the one the
-/// proxy added; any before it are whatever the client sent).
-fn forwarded_for(req: &Request) -> Option<IpAddr> {
-    let last = req.headers().get_all("x-forwarded-for").iter().next_back()?.to_str().ok()?;
-    let entry = last.rsplit(',').next()?.trim();
-    entry.parse::<IpAddr>().ok().or_else(|| entry.parse::<SocketAddr>().ok().map(|a| a.ip()))
-}
-
-/// What every connection shares: the count per address, the bytes queued for all of them and the
-/// bytes in flight to the hub.
-#[derive(Clone)]
-struct Shared {
-    per_address: PerAddress,
-    queued: Arc<AtomicUsize>,
-    in_flight: InFlight,
-    blocks: Blocks,
-    /// Bytes being read into messages, all connections together, and who is reading them.
-    reading: Arc<AtomicUsize>,
-    readers: Readers,
-}
-
-fn accept(listener: &TcpListener, hub: &Sender<HubIn>, stop: &AtomicBool, open: &Arc<AtomicUsize>, limits: NetLimits, shared: Shared) {
-    let mut next = 0u64;
-    for stream in listener.incoming() {
-        if stop.load(Ordering::SeqCst) {
-            break;
-        }
-        let stream = match stream {
-            Ok(s) => s,
-            Err(e) => {
-                // Out of sockets or similar: don't spin.
-                log::warn!("live session: accept failed: {e}");
-                std::thread::sleep(Duration::from_millis(50));
-                continue;
-            }
-        };
-        if open.load(Ordering::Relaxed) >= limits.max_connections {
-            log::info!("live session: too many connections; refusing one");
-            continue;
-        }
-        open.fetch_add(1, Ordering::Relaxed);
-        let guard = Open(open.clone());
-        next += 1;
-        let (conn, hub, shared) = (next, hub.clone(), shared.clone());
-        if let Err(e) = spawn("live-conn", move || serve(stream, conn, &hub, limits, guard, &shared)) {
-            log::warn!("live session: can't start a connection thread: {e}");
-        }
-    }
-}
-
-/// A close reason that fits a WebSocket close frame (123 bytes).
-fn reason(s: &str) -> String {
-    let mut end = s.len().min(123);
-    while !s.is_char_boundary(end) {
-        end -= 1;
-    }
-    s.get(..end).unwrap_or_default().to_string()
-}
-
-fn encode(msg: &ServerMsg) -> Option<Bytes> {
-    match message::encode(msg) {
-        Ok(b) => Some(Bytes::from(b)),
-        Err(e) => {
-            log::warn!("live session: can't encode a message: {e}");
-            None
-        }
-    }
-}
-
-/// Queue `Refused {reason}` and a close for one connection (small: not counted against its caps).
-fn refuse(out: &Line, why: &str) {
-    if let Some(b) = encode(&ServerMsg::Refused { reason: why.to_string() }) {
-        let _ = out.tx.try_send(Out::Bytes(b, None));
-    }
-    let _ = out.tx.try_send(Out::Close(CloseCode::Policy, reason(why)));
-}
-
-/// What the server tells a client when it is too busy to take more from it.
-const BUSY: &str = "the server is busy: try again in a moment";
-
-/// Read the next binary message (skipping pings) and its size, or why the connection should end.
-fn next_message(ws: &mut WebSocket<Duplex>, max: usize) -> Result<Option<(ClientMsg, usize)>, String> {
-    loop {
-        return match ws.read() {
-            Ok(Message::Binary(b)) => {
-                // Whole now: it counts as in flight from here, no longer as being read.
-                ws.get_mut().read_done();
-                message::decode::<ClientMsg>(&b, max).map(|m| Some((m, b.len()))).map_err(|_| "that message couldn't be read".to_string())
-            }
-            Ok(Message::Text(_)) => Err("only binary messages are spoken here".into()),
-            Ok(Message::Ping(_) | Message::Pong(_) | Message::Frame(_)) => continue,
-            Ok(Message::Close(_)) => Ok(None),
-            Err(tungstenite::Error::Capacity(_)) => Err(too_large(max)),
-            // The reading budget's refusal (see `Meter`).
-            Err(tungstenite::Error::Io(e)) if e.kind() == io::ErrorKind::Other => Err(e.to_string()),
-            Err(_) => Ok(None),
-        };
-    }
-}
-
-/// Why a message over `max` bytes is refused.
-fn too_large(max: usize) -> String {
-    match max >> 20 {
-        0 => format!("message too large: this server takes at most {} KiB at once here", max >> 10),
-        mib => format!("message too large: this server takes at most {mib} MiB at once (a change that big can't be kept here)"),
-    }
-}
-
-/// One connection's reader (the writer runs on its own thread).
-fn serve(mut stream: TcpStream, conn: u64, hub: &Sender<HubIn>, limits: NetLimits, open: Open, shared: &Shared) {
-    let _ = stream.set_nodelay(true);
-    if stream.set_read_timeout(Some(limits.hello_timeout)).is_err() || stream.set_write_timeout(Some(limits.write_timeout)).is_err() {
-        return;
-    }
-    if health_check(&mut stream, Instant::now() + limits.hello_timeout) {
-        return;
-    }
-    let Ok(peer) = stream.peer_addr().map(|a| a.ip().to_canonical()) else { return };
-    let proxied = limits.trusted_proxy.is_some_and(|p| p.to_canonical() == peer);
-    let Ok((rd, wr, sock)) = Duplex::split(stream, None) else { return };
-    let cfg = config(limits.max_client_message);
-    let mut forwarded = None;
-    // The handshake callback's type is tungstenite's (its error is an HTTP response).
-    #[allow(clippy::result_large_err)]
-    let read_client = |req: &Request, resp: Response| -> Result<Response, ErrorResponse> {
-        if proxied {
-            forwarded = forwarded_for(req);
-        }
-        Ok(resp)
-    };
-    let mut ws = match tungstenite::accept_hdr_with_config(rd, read_client, Some(config(limits.max_hello))) {
-        Ok(ws) => ws,
-        Err(e) => {
-            log::debug!("live session: handshake failed: {e}");
-            shutdown(&sock);
-            return;
-        }
-    };
-    if proxied && forwarded.is_none() {
-        log::debug!("live session: connection {conn} came through the proxy without X-Forwarded-For");
-    }
-    let ip = ip_key(forwarded.unwrap_or(peer));
-    let counted = shared.per_address.enter_all(ip, limits.max_per_address, limits.max_connections);
-    let wide = wide_block(ip);
-    let block = shared.blocks.get(wide);
-    ws.get_mut().meter(Meter::new(
-        conn,
-        &sock,
-        &shared.readers,
-        block.reading.clone(),
-        shared.reading.clone(),
-        limits.max_reading_block,
-        limits.max_reading_total,
-    ));
-    let (tx, rx) = sync_channel::<Out>(limits.queue.max(4));
-    let out = Line {
-        tx,
-        queued: Arc::default(),
-        block: block.queued.clone(),
-        all: shared.queued.clone(),
-        max: limits.max_queued_bytes,
-        max_block: limits.max_queued_block,
-        max_all: limits.max_queued_total,
-    };
-    let writer =
-        match sock.try_clone().map(|s| spawn("live-write", move || write_loop(WebSocket::from_raw_socket(wr, Role::Server, Some(cfg)), &rx, &s))) {
-            Ok(Ok(t)) => t,
-            _ => {
-                shutdown(&sock);
-                return;
-            }
-        };
-    let end = |why: Option<&str>| {
-        if let Some(why) = why {
-            refuse(&out, why);
-        } else {
-            let _ = out.tx.try_send(Out::Close(CloseCode::Normal, String::new()));
-        }
-    };
-    if counted.is_none() {
-        log::info!("event=refused ip={ip} reason=connections_per_address");
-        end(Some("too many connections from your address: close some and try again"));
-    } else {
-        match next_message(&mut ws, limits.max_hello) {
-            Ok(Some((
-                first @ (ClientMsg::Hello(_)
-                | ClientMsg::Manage(_)
-                | ClientMsg::OpenLibrary(_)
-                | ClientMsg::OpenPlugins(_)
-                | ClientMsg::OpenHosting(_)
-                | ClientMsg::Resolve(_)),
-                bytes,
-            ))) => {
-                // Sessions and the operator may use the last connections; one-shot requests
-                // (hosting, libraries, browsing plugins) leave them free.
-                let session = matches!(first, ClientMsg::Hello(_) | ClientMsg::Manage(_));
-                let max = match &first {
-                    ClientMsg::OpenPlugins(o) if o.key.is_empty() => limits.max_request,
-                    _ => limits.max_client_message,
-                };
-                let idle = if session { limits.idle_timeout } else { limits.request_idle };
-                let reserved = !session && open.0.load(Ordering::Relaxed) > limits.max_connections.saturating_sub(limits.reserve_for_sessions);
-                // (In flight is only taken when the connection goes on: the hub gives it back.)
-                if reserved || !shared.in_flight.take(bytes, limits.max_in_flight) {
-                    end(Some(BUSY));
-                } else {
-                    ws.set_config(|c| *c = config(max));
-                    let opened = sock.try_clone().is_ok_and(|s| hub.send(HubIn::Open { conn, ip, first, out: out.clone(), sock: s, bytes }).is_ok());
-                    if opened && ws.get_ref().set_read_timeout(Some(idle)).is_ok() {
-                        read_loop(&mut ws, conn, hub, limits, max, &shared.in_flight, &end);
-                        let _ = hub.send(HubIn::Gone { conn });
-                    }
-                }
-            }
-            Ok(Some(_)) => end(Some("say hello first")),
-            Ok(None) => {}
-            Err(why) => end(Some(&why)),
-        }
-    }
-    drop(counted);
-    // The block's counters go with the last handle on them (the table forgets it then).
-    drop(block);
-    linger(&mut ws);
-    drop(out);
-    // The writer closes the socket once it has sent what's queued (a refusal, a close).
-    let _ = writer.join();
-    shutdown(&sock);
-}
-
-fn read_loop(
-    ws: &mut WebSocket<Duplex>,
-    conn: u64,
-    hub: &Sender<HubIn>,
-    limits: NetLimits,
-    max: usize,
-    in_flight: &InFlight,
-    end: &dyn Fn(Option<&str>),
-) {
-    let mut bucket = Bucket::new(limits.rate, limits.burst);
-    let mut signals = Bucket::new(SIGNAL_RATE, SIGNAL_BURST);
-    loop {
-        match next_message(ws, max) {
-            Ok(Some((msg, bytes))) => {
-                let now = Instant::now();
-                if !bucket.take(now) {
-                    log::info!("live session: connection {conn} sends too much; disconnecting it");
-                    return end(Some("too many messages"));
-                }
-                // Typing sends a chat signal per keystroke; more than this is dropped.
-                if matches!(msg, ClientMsg::Signal(_)) && !signals.take(now) {
-                    log::debug!("live session: connection {conn} sends signals too fast; dropping one");
-                    continue;
-                }
-                if !in_flight.take(bytes, limits.max_in_flight) {
-                    log::info!("live session: the hub is behind; dropping connection {conn}");
-                    return end(Some(BUSY));
-                }
-                if hub.send(HubIn::Msg { conn, msg, bytes }).is_err() {
-                    return;
-                }
-            }
-            Ok(None) => return end(None),
-            Err(why) => return end(Some(&why)),
-        }
-    }
-}
-
-fn write_loop(mut ws: WebSocket<Duplex>, rx: &Receiver<Out>, sock: &TcpStream) {
-    let mut close = Some((CloseCode::Normal, String::new()));
-    while let Ok(o) = rx.recv() {
-        match o {
-            Out::Bytes(b, _charge) => {
-                if ws.send(Message::Binary(b)).is_err() {
-                    close = None;
-                    break;
-                }
-            }
-            Out::Close(code, why) => {
-                close = Some((code, why));
-                break;
-            }
-        }
-    }
-    if let Some((code, why)) = close {
-        // Close politely: the close frame, then no more writing; the reader drains what the peer
-        // still sends until it hangs up (closing on unread data would reset the connection and
-        // could lose the close frame), or until the linger runs out.
-        let _ = ws.close(Some(CloseFrame { code, reason: why.into() }));
-        let _ = sock.shutdown(std::net::Shutdown::Write);
-        let until = Instant::now() + LINGER;
-        while let Ok(_) | Err(RecvTimeoutError::Timeout) = rx.recv_timeout(until.saturating_duration_since(Instant::now())) {
-            if Instant::now() >= until {
-                break;
-            }
-        }
-    }
-    shutdown(sock);
-}
-
-/// Read and drop what the peer still sends after the close, until it hangs up (at most
-/// [`LINGER`]). Raw bytes, not frames: after a frame over the size limit the WebSocket's reader
-/// is mid-frame and mustn't be asked for more.
-fn linger(ws: &mut WebSocket<Duplex>) {
-    let until = Instant::now() + LINGER;
-    let mut buf = [0u8; 4096];
-    while Instant::now() < until && ws.get_ref().set_read_timeout(Some(Duration::from_millis(250))).is_ok() {
-        match ws.get_mut().read(&mut buf) {
-            Ok(0) => break,
-            Ok(_) => {}
-            Err(e) if matches!(e.kind(), io::ErrorKind::WouldBlock | io::ErrorKind::TimedOut | io::ErrorKind::Interrupted) => {}
-            Err(_) => break,
-        }
-    }
-}
-
 /// What a connection is for.
 enum Kind {
     /// In `file`'s session as client `id`, through link `link`.
@@ -1074,6 +86,8 @@ struct Pending {
     out: Line,
     sock: TcpStream,
     ip: IpAddr,
+    /// Told when it is taken in.
+    admitted: SyncSender<()>,
 }
 
 /// A connection the hub took in.
@@ -1195,7 +209,7 @@ impl<B: Backend> Hub<B> {
 
     fn handle(&mut self, m: HubIn) {
         match m {
-            HubIn::Open { conn, ip, first, out, sock, bytes } => {
+            HubIn::Open { conn, ip, first, out, sock, bytes, admitted } => {
                 self.in_flight.give(bytes);
                 // The operator (with the server key) gets in from anywhere; everyone else is
                 // checked (blocked addresses, connection rates).
@@ -1204,7 +218,7 @@ impl<B: Backend> Hub<B> {
                     log::info!("event=refused ip={ip} reason={why:?}");
                     return refuse(&out, &why);
                 }
-                let c = Pending { out, sock, ip };
+                let c = Pending { out, sock, ip, admitted };
                 match first {
                     ClientMsg::Hello(hello) => self.join(conn, hello, c),
                     ClientMsg::Manage(m) => self.manage(conn, &m, c),
@@ -1399,6 +413,7 @@ impl<B: Backend> Hub<B> {
                 if let Some(c) = old.and_then(|old| self.conns.remove(&old)) {
                     shutdown(&c.sock);
                 }
+                let _ = c.admitted.try_send(());
                 self.conns
                     .insert(conn, Conn { out: c.out, sock: c.sock, kind: Kind::Joined { file: file.clone(), id, link: admission.link }, ip: c.ip });
                 self.queue(&file, more);
@@ -1429,7 +444,9 @@ impl<B: Backend> Hub<B> {
             barred.insert(c.ip);
         }
         log::info!("event=removed file={file} client={id} ip={}", c.ip);
-        let _ = c.out.tx.try_send(Out::Close(CloseCode::Away, REMOVED.into()));
+        if c.out.tx.try_send(Out::Close(CloseCode::Away, REMOVED.into())).is_err() {
+            shutdown(&c.sock);
+        }
         self.gone(conn);
         Ok(())
     }
@@ -1444,6 +461,7 @@ impl<B: Backend> Hub<B> {
 
     /// Take in connection `c` as `kind` and send it `first`.
     fn take_in(&mut self, conn: u64, c: Pending, kind: Kind, first: &ServerMsg) {
+        let _ = c.admitted.try_send(());
         self.conns.insert(conn, Conn { out: c.out, sock: c.sock, kind, ip: c.ip });
         self.answer(conn, first);
     }
@@ -1543,8 +561,10 @@ impl<B: Backend> Hub<B> {
             // People in the file are told the session is over for them, as when a host stops (they
             // keep their copy; nothing retries); a library request is refused.
             for conn in &people {
-                if let Some(c) = self.conns.get(conn) {
-                    let _ = c.out.tx.try_send(Out::Close(CloseCode::Away, STOPPED.into()));
+                if let Some(c) = self.conns.get(conn)
+                    && c.out.tx.try_send(Out::Close(CloseCode::Away, STOPPED.into())).is_err()
+                {
+                    shutdown(&c.sock);
                 }
                 self.gone(*conn);
             }
@@ -1593,8 +613,10 @@ impl<B: Backend> Hub<B> {
     /// Refuse connections with `why` and drop them at once (nothing more they send counts).
     fn kick(&mut self, conns: &[u64], why: &str) {
         for conn in conns {
-            if let Some(c) = self.conns.get(conn) {
-                refuse(&c.out, why);
+            if let Some(c) = self.conns.get(conn)
+                && !refused(&c.out, why)
+            {
+                shutdown(&c.sock);
             }
             self.gone(*conn);
         }
@@ -1741,9 +763,10 @@ pub(crate) fn to_local(inbox: &Inbox, local: u32, msg: &ServerMsg) {
 }
 
 #[cfg(test)]
-#[path = "queue_tests.rs"]
 mod queue_tests;
 
 #[cfg(test)]
-#[path = "barred_tests.rs"]
 mod barred_tests;
+
+#[cfg(test)]
+mod preauth_tests;
diff --git a/crates/collab-net/src/hub/backend.rs b/crates/collab-net/src/hub/backend.rs
new file mode 100644
index 00000000..04c5363d
--- /dev/null
+++ b/crates/collab-net/src/hub/backend.rs
@@ -0,0 +1,138 @@
+use super::limits::Admission;
+use super::*;
+
+/// An admin request's reply, and what the hub must do about connections it affects.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Handled {
+    pub reply: AdminReply,
+    /// A link was revoked: `(file, link)`; whoever joined with it is disconnected.
+    pub revoked: Option<(String, String)>,
+    /// A file was removed: whoever is in it is disconnected and it is closed without saving.
+    pub removed: Option<String>,
+    /// An address was blocked ([`ip_key`]): its connections are dropped.
+    pub blocked: Option<IpAddr>,
+}
+
+impl From<AdminReply> for Handled {
+    fn from(reply: AdminReply) -> Self {
+        Self { reply, revoked: None, removed: None, blocked: None }
+    }
+}
+
+/// What everyone is told when a hub stops.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Closing {
+    /// The session is over (the app stopped hosting): final.
+    Ended,
+    /// The server is restarting: clients reconnect until it is back.
+    Restarting,
+}
+
+/// What the hub knows of an open file (for listings).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub struct OpenFile {
+    /// People connected to it.
+    pub people: u32,
+    /// Its latest sequence number.
+    pub seq: u64,
+}
+
+/// Where a hub's files come from and what it keeps of them (see the module docs). The hub calls it
+/// from its own thread only.
+pub trait Backend: Send + 'static {
+    /// A hello for `file` with `token`: what it may do, or why it may not join (the reason is
+    /// shown to the person joining; never echo the token).
+    fn admit(&mut self, file: &str, token: &str) -> Result<Admission, String>;
+
+    /// The session for a file that isn't open (after [`admit`](Self::admit) let someone in).
+    fn open(&mut self, file: &str) -> Result<Server, String>;
+
+    /// The hub handled a message for an open file: keep what changed (its server's journal).
+    fn changed(&mut self, _file: &str, _server: &mut Server) {}
+
+    /// Make what [`changed`](Self::changed) kept durable; the hub sends the servers' answers
+    /// after this. The files whose changes couldn't be made durable: nobody hears of them, the
+    /// files are closed (the backend forgets their open state) and everyone in them reconnects.
+    fn flush(&mut self) -> Vec<String> {
+        Vec::new()
+    }
+
+    /// Whether `file` has room for a batch of about `bytes` (its size on the wire): why not, and
+    /// the batch is refused.
+    fn room(&mut self, _file: &str, _server: &Server, _bytes: usize) -> Result<(), String> {
+        Ok(())
+    }
+
+    /// Everyone left `file`: save it. True closes it (the next hello opens it again).
+    fn idle(&mut self, _file: &str, _server: &mut Server) -> bool {
+        false
+    }
+
+    /// The hub is stopping: save the open files.
+    fn stop(&mut self, _open: Vec<(&str, &mut Server)>) {}
+
+    /// A managing connection's key: whether it may manage files.
+    fn manage(&mut self, _key: &str) -> Result<(), String> {
+        Err("this session is hosted by an app: it has no files to manage".into())
+    }
+
+    /// A request on a managing connection; `open` tells about a file that is open.
+    fn admin(&mut self, _req: Admin, _open: &dyn Fn(&str) -> Option<OpenFile>) -> Handled {
+        AdminReply::Failed { reason: "nothing to manage here".into() }.into()
+    }
+
+    /// A request on a library connection to `file`, opened with a link of `access` (checked by
+    /// [`admit`](Self::admit)).
+    fn library(&mut self, _ip: IpAddr, _file: &str, _access: Access, _req: LibraryReq) -> LibraryReply {
+        LibraryReply::Failed { reason: "this session is hosted by an app: team libraries live on a figcraft-server".into() }
+    }
+
+    /// A request on a plugin directory connection; `publisher`: it was opened with the right key
+    /// (checked by [`manage`](Self::manage)).
+    fn plugins(&mut self, _ip: IpAddr, _publisher: bool, _req: PluginReq) -> PluginReply {
+        PluginReply::Failed { reason: "this session is hosted by an app: plugin directories live on a figcraft-server".into() }
+    }
+
+    /// A new connection from `ip` ([`ip_key`]): whether it may go on (why not is shown to the
+    /// client).
+    fn connect(&mut self, _ip: IpAddr) -> Result<(), String> {
+        Ok(())
+    }
+
+    /// A message from a connection from `ip`: false disconnects it (that address sends too much).
+    fn message(&mut self, _ip: IpAddr, _msg: &ClientMsg) -> bool {
+        true
+    }
+
+    /// What to tell a client that reads it about the server's hosting, after its welcome to
+    /// `file` (`None`: nothing).
+    fn hosting(&mut self, _file: &str) -> Option<HostInfo> {
+        None
+    }
+
+    /// An open hosting connection from `ip`, with a file's owner token when `file` isn't empty:
+    /// what the server says about its hosting, or why the connection is refused.
+    fn open_hosting(&mut self, _ip: IpAddr, _file: &str, _owner: &str) -> Result<HostInfo, String> {
+        Err("this session is hosted by an app: it doesn't keep files for anyone".into())
+    }
+
+    /// A request on an open hosting connection from `ip`; `owns`: the file whose owner token it
+    /// was opened with.
+    fn hosted(&mut self, _ip: IpAddr, _owns: Option<&str>, _req: Admin, _open: &dyn Fn(&str) -> Option<OpenFile>) -> Handled {
+        AdminReply::Failed { reason: "nothing to manage here".into() }.into()
+    }
+
+    /// Someone in `file` (joined with `link`, from `ip`) reports it to the operator.
+    fn report(&mut self, _file: &str, _link: Option<&str>, _ip: IpAddr, _reason: &str) -> Result<(), String> {
+        Err("this session is hosted by an app: tell the person hosting it".into())
+    }
+
+    /// A join code typed by someone at `ip`: the file it opens and that link's token, or why not
+    /// (shown to them; wrong codes are counted against the address).
+    fn resolve(&mut self, _ip: IpAddr, _code: &str) -> Result<(String, String), String> {
+        Err("this session is hosted by an app: join it with its own code or invite link".into())
+    }
+
+    /// What everyone is told when the hub stops.
+    fn closing(&self) -> Closing;
+}
diff --git a/crates/collab-net/src/barred_tests.rs b/crates/collab-net/src/hub/barred_tests.rs
similarity index 51%
rename from crates/collab-net/src/barred_tests.rs
rename to crates/collab-net/src/hub/barred_tests.rs
index c9355a5f..7942e766 100644
--- a/crates/collab-net/src/barred_tests.rs
+++ b/crates/collab-net/src/hub/barred_tests.rs
@@ -51,3 +51,47 @@ fn a_closed_file_forgets_whom_it_barred() {
     assert!(!hub.barred.contains_key("f"), "and its barred addresses went with it");
     assert!(hub.barred.contains_key("other"), "another file's stay");
 }
+
+#[test]
+fn a_kicked_connection_with_a_full_queue_is_shut() {
+    use std::io::Read;
+    use std::net::TcpListener;
+    use std::sync::Arc;
+    use std::sync::atomic::AtomicUsize;
+    use std::sync::mpsc::sync_channel;
+    use std::time::Duration;
+
+    use super::{Conn, Kind, Line, Out};
+
+    let listener = TcpListener::bind("127.0.0.1:0").unwrap();
+    let mut client = std::net::TcpStream::connect(listener.local_addr().unwrap()).unwrap();
+    let (server_side, _) = listener.accept().unwrap();
+    client.set_read_timeout(Some(Duration::from_secs(2))).unwrap();
+    // Stands in for the writer thread's handle: it keeps the socket open after the Conn is gone.
+    let _writer = server_side.try_clone().unwrap();
+    let (tx, _rx) = sync_channel(2);
+    while tx.try_send(Out::Bytes(Default::default(), None)).is_ok() {}
+    let out = Line {
+        tx,
+        queued: Arc::default(),
+        block: Arc::new(AtomicUsize::new(0)),
+        all: Arc::new(AtomicUsize::new(0)),
+        max: 1 << 20,
+        max_block: usize::MAX,
+        max_all: usize::MAX,
+    };
+    let ip = IpAddr::V4(Ipv4Addr::LOCALHOST);
+    let mut hub = Hub {
+        in_flight: InFlight(Default::default()),
+        backend: Closes,
+        rooms: HashMap::new(),
+        conns: HashMap::from([(1, Conn { out, sock: server_side, kind: Kind::Managing, ip })]),
+        local: None,
+        outbox: Vec::new(),
+        barred: HashMap::new(),
+    };
+    hub.kick(&[1], "kicked");
+    assert!(hub.conns.is_empty());
+    let mut buf = [0u8; 1];
+    assert_eq!(client.read(&mut buf).ok(), Some(0), "the kicked socket must be shut (client sees EOF)");
+}
diff --git a/crates/collab-net/src/hub/conn.rs b/crates/collab-net/src/hub/conn.rs
new file mode 100644
index 00000000..109dfed9
--- /dev/null
+++ b/crates/collab-net/src/hub/conn.rs
@@ -0,0 +1,404 @@
+use super::hosting::{Open, spawn};
+use super::limits::{PerAddress, ip_key};
+use super::queue::{Blocks, HubIn, InFlight, Line, Out, wide_block};
+use super::*;
+
+/// How long a closing connection waits for the peer to hang up.
+const LINGER: Duration = Duration::from_secs(2);
+
+/// Signals (cursor chat, spotlight) a client may send per second on average, and in a burst;
+/// beyond that they are dropped.
+pub const SIGNAL_RATE: f64 = 20.0;
+
+pub const SIGNAL_BURST: f64 = 40.0;
+
+/// Longest request line an uptime check may have.
+const MAX_CHECK_LINE: usize = 2048;
+
+/// An uptime check: a plain `GET` of a path ending in `/healthz` is answered `200 ok` and closed.
+/// True when it was one (the connection is done). Anything else is only peeked at, so a WebSocket
+/// handshake goes on untouched.
+fn health_check(stream: &mut TcpStream, until: Instant) -> bool {
+    let mut buf = [0u8; MAX_CHECK_LINE];
+    let line = loop {
+        let n = match stream.peek(&mut buf) {
+            Ok(0) | Err(_) => return false,
+            Ok(n) => n,
+        };
+        let seen = buf.get(..n).unwrap_or_default();
+        if !seen.starts_with(b"GET ") && !b"GET ".starts_with(seen) {
+            return false;
+        }
+        if let Some(end) = seen.windows(2).position(|w| w == b"\r\n") {
+            break seen.get(..end).unwrap_or_default().to_vec();
+        }
+        if n == buf.len() || Instant::now() >= until {
+            return false;
+        }
+        // The rest of the line is on its way (it nearly always arrives in one piece).
+        std::thread::sleep(Duration::from_millis(10));
+    };
+    let path = line.split(|b| *b == b' ').nth(1).unwrap_or_default();
+    let path = path.split(|b| *b == b'?').next().unwrap_or_default();
+    if !path.ends_with(b"/healthz") {
+        return false;
+    }
+    // Read the request (its headers end with a blank line), so closing doesn't reset it.
+    let mut req = Vec::new();
+    let mut chunk = [0u8; 1024];
+    while !req.windows(4).any(|w| w == b"\r\n\r\n") && req.len() < 16 << 10 {
+        match stream.read(&mut chunk) {
+            Ok(0) | Err(_) => break,
+            Ok(n) => req.extend_from_slice(chunk.get(..n).unwrap_or_default()),
+        }
+    }
+    let _ = stream
+        .write_all(b"HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 3\r\nCache-Control: no-store\r\nConnection: close\r\n\r\nok\n");
+    let _ = stream.shutdown(std::net::Shutdown::Write);
+    true
+}
+
+/// The client a trusted proxy names: the last address of its last `X-Forwarded-For` (the one the
+/// proxy added; any before it are whatever the client sent).
+fn forwarded_for(req: &Request) -> Option<IpAddr> {
+    let last = req.headers().get_all("x-forwarded-for").iter().next_back()?.to_str().ok()?;
+    let entry = last.rsplit(',').next()?.trim();
+    entry.parse::<IpAddr>().ok().or_else(|| entry.parse::<SocketAddr>().ok().map(|a| a.ip()))
+}
+
+/// What every connection shares: the count per address, the bytes queued for all of them and the
+/// bytes in flight to the hub.
+#[derive(Clone)]
+pub(super) struct Shared {
+    pub(super) per_address: PerAddress,
+    pub(super) queued: Arc<AtomicUsize>,
+    pub(super) in_flight: InFlight,
+    pub(super) blocks: Blocks,
+    /// Bytes being read into messages, all connections together, and who is reading them.
+    pub(super) reading: Arc<AtomicUsize>,
+    pub(super) readers: Readers,
+}
+
+pub(super) fn accept(listener: &TcpListener, hub: &Sender<HubIn>, stop: &AtomicBool, open: &Arc<AtomicUsize>, limits: NetLimits, shared: Shared) {
+    let mut next = 0u64;
+    for stream in listener.incoming() {
+        if stop.load(Ordering::SeqCst) {
+            break;
+        }
+        let stream = match stream {
+            Ok(s) => s,
+            Err(e) => {
+                // Out of sockets or similar: don't spin.
+                log::warn!("live session: accept failed: {e}");
+                std::thread::sleep(Duration::from_millis(50));
+                continue;
+            }
+        };
+        if open.load(Ordering::Relaxed) >= limits.max_connections {
+            log::info!("live session: too many connections; refusing one");
+            continue;
+        }
+        open.fetch_add(1, Ordering::Relaxed);
+        let guard = Open(open.clone());
+        next += 1;
+        let (conn, hub, shared) = (next, hub.clone(), shared.clone());
+        if let Err(e) = spawn("live-conn", move || serve(stream, conn, &hub, limits, guard, &shared)) {
+            log::warn!("live session: can't start a connection thread: {e}");
+        }
+    }
+}
+
+/// A close reason that fits a WebSocket close frame (123 bytes).
+pub(super) fn reason(s: &str) -> String {
+    let mut end = s.len().min(123);
+    while !s.is_char_boundary(end) {
+        end -= 1;
+    }
+    s.get(..end).unwrap_or_default().to_string()
+}
+
+pub(super) fn encode(msg: &ServerMsg) -> Option<Bytes> {
+    match message::encode(msg) {
+        Ok(b) => Some(Bytes::from(b)),
+        Err(e) => {
+            log::warn!("live session: can't encode a message: {e}");
+            None
+        }
+    }
+}
+
+/// Queue `Refused {reason}` and a close for one connection (small: not counted against its caps).
+pub(super) fn refuse(out: &Line, why: &str) {
+    refused(out, why);
+}
+
+/// [`refuse`], and whether the close was queued (it isn't when the queue is full).
+pub(super) fn refused(out: &Line, why: &str) -> bool {
+    if let Some(b) = encode(&ServerMsg::Refused { reason: why.to_string() }) {
+        let _ = out.tx.try_send(Out::Bytes(b, None));
+    }
+    out.tx.try_send(Out::Close(CloseCode::Policy, reason(why))).is_ok()
+}
+
+/// What the server tells a client when it is too busy to take more from it.
+const BUSY: &str = "the server is busy: try again in a moment";
+
+/// Read the next binary message (skipping pings, until `deadline`) and its size, or why the connection should end.
+fn next_message(ws: &mut WebSocket<Duplex>, max: usize, deadline: Option<Instant>) -> Result<Option<(ClientMsg, usize)>, String> {
+    loop {
+        return match ws.read() {
+            Ok(Message::Binary(b)) => {
+                // Whole now: it counts as in flight from here, no longer as being read.
+                ws.get_mut().read_done();
+                message::decode::<ClientMsg>(&b, max).map(|m| Some((m, b.len()))).map_err(|_| "that message couldn't be read".to_string())
+            }
+            Ok(Message::Text(_)) => Err("only binary messages are spoken here".into()),
+            // Pings keep the per-read timeout alive, but not the overall deadline (slowloris), and
+            // a message trickled in is cut off by it (`Duplex::read_until`).
+            Ok(Message::Ping(_) | Message::Pong(_) | Message::Frame(_)) | Err(tungstenite::Error::Io(_))
+                if deadline.is_some_and(|d| Instant::now() >= d) =>
+            {
+                Err("no hello in time".into())
+            }
+            Ok(Message::Ping(_) | Message::Pong(_) | Message::Frame(_)) => continue,
+            Ok(Message::Close(_)) => Ok(None),
+            Err(tungstenite::Error::Capacity(_)) => Err(too_large(max)),
+            // The reading budget's refusal (see `Meter`).
+            Err(tungstenite::Error::Io(e)) if e.kind() == io::ErrorKind::Other => Err(e.to_string()),
+            Err(_) => Ok(None),
+        };
+    }
+}
+
+/// Why a message over `max` bytes is refused.
+fn too_large(max: usize) -> String {
+    match max >> 20 {
+        0 => format!("message too large: this server takes at most {} KiB at once here", max >> 10),
+        mib => format!("message too large: this server takes at most {mib} MiB at once (a change that big can't be kept here)"),
+    }
+}
+
+/// One connection's reader (the writer runs on its own thread).
+fn serve(mut stream: TcpStream, conn: u64, hub: &Sender<HubIn>, limits: NetLimits, open: Open, shared: &Shared) {
+    let _ = stream.set_nodelay(true);
+    let hello_deadline = Instant::now() + limits.hello_timeout;
+    if stream.set_read_timeout(Some(limits.hello_timeout)).is_err() || stream.set_write_timeout(Some(limits.write_timeout)).is_err() {
+        return;
+    }
+    if health_check(&mut stream, Instant::now() + limits.hello_timeout) {
+        return;
+    }
+    let Ok(peer) = stream.peer_addr().map(|a| a.ip().to_canonical()) else { return };
+    let proxied = limits.trusted_proxy.is_some_and(|p| p.to_canonical() == peer);
+    let Ok((mut rd, wr, sock)) = Duplex::split(stream, None) else { return };
+    // The handshake and the hello must be in by the deadline, however slowly they trickle in.
+    rd.read_until(Some(hello_deadline));
+    let cfg = config(limits.max_client_message);
+    let mut forwarded = None;
+    // The handshake callback's type is tungstenite's (its error is an HTTP response).
+    #[allow(clippy::result_large_err)]
+    let read_client = |req: &Request, resp: Response| -> Result<Response, ErrorResponse> {
+        if proxied {
+            forwarded = forwarded_for(req);
+        }
+        Ok(resp)
+    };
+    let mut ws = match tungstenite::accept_hdr_with_config(rd, read_client, Some(config(limits.max_hello))) {
+        Ok(ws) => ws,
+        Err(e) => {
+            log::debug!("live session: handshake failed: {e}");
+            shutdown(&sock);
+            return;
+        }
+    };
+    if proxied && forwarded.is_none() {
+        log::debug!("live session: connection {conn} came through the proxy without X-Forwarded-For");
+    }
+    let ip = ip_key(forwarded.unwrap_or(peer));
+    let counted = shared.per_address.enter_all(ip, limits.max_per_address, limits.max_connections);
+    let wide = wide_block(ip);
+    let block = shared.blocks.get(wide);
+    ws.get_mut().meter(Meter::new(
+        conn,
+        &sock,
+        &shared.readers,
+        block.reading.clone(),
+        shared.reading.clone(),
+        limits.max_reading_block,
+        limits.max_reading_total,
+    ));
+    let (tx, rx) = sync_channel::<Out>(limits.queue.max(4));
+    let out = Line {
+        tx,
+        queued: Arc::default(),
+        block: block.queued.clone(),
+        all: shared.queued.clone(),
+        max: limits.max_queued_bytes,
+        max_block: limits.max_queued_block,
+        max_all: limits.max_queued_total,
+    };
+    let writer =
+        match sock.try_clone().map(|s| spawn("live-write", move || write_loop(WebSocket::from_raw_socket(wr, Role::Server, Some(cfg)), &rx, &s))) {
+            Ok(Ok(t)) => t,
+            _ => {
+                shutdown(&sock);
+                return;
+            }
+        };
+    let end = |why: Option<&str>| {
+        if let Some(why) = why {
+            refuse(&out, why);
+        } else {
+            let _ = out.tx.try_send(Out::Close(CloseCode::Normal, String::new()));
+        }
+    };
+    if counted.is_none() {
+        log::info!("event=refused ip={ip} reason=connections_per_address");
+        end(Some("too many connections from your address: close some and try again"));
+    } else {
+        let hello = next_message(&mut ws, limits.max_hello, Some(hello_deadline));
+        // In time or not, the hello's deadline is over: what's read next has timeouts of its own.
+        ws.get_mut().read_until(None);
+        match hello {
+            Ok(Some((
+                first @ (ClientMsg::Hello(_)
+                | ClientMsg::Manage(_)
+                | ClientMsg::OpenLibrary(_)
+                | ClientMsg::OpenPlugins(_)
+                | ClientMsg::OpenHosting(_)
+                | ClientMsg::Resolve(_)),
+                bytes,
+            ))) => {
+                // Sessions and the operator may use the last connections; one-shot requests
+                // (hosting, libraries, browsing plugins) leave them free.
+                let session = matches!(first, ClientMsg::Hello(_) | ClientMsg::Manage(_));
+                // A publish uploads a whole file; a large one on a slow link takes the server a
+                // while to receive and answer. The manage/hosting connections that carry uploads
+                // wait the longer request-reply timeout, not the short request idle.
+                let idle = match first {
+                    ClientMsg::Manage(_) | ClientMsg::OpenHosting(_) => limits.request_reply_timeout,
+                    ClientMsg::Hello(_) => limits.idle_timeout,
+                    _ => limits.request_idle,
+                };
+                let max = match &first {
+                    ClientMsg::OpenPlugins(o) if o.key.is_empty() => limits.max_request,
+                    _ => limits.max_client_message,
+                };
+                let reserved = !session && open.0.load(Ordering::Relaxed) > limits.max_connections.saturating_sub(limits.reserve_for_sessions);
+                // (In flight is only taken when the connection goes on: the hub gives it back.)
+                if reserved || !shared.in_flight.take(bytes, limits.max_in_flight) {
+                    end(Some(BUSY));
+                } else {
+                    let (admitted, verdict) = sync_channel(1);
+                    let opened =
+                        sock.try_clone().is_ok_and(|s| hub.send(HubIn::Open { conn, ip, first, out: out.clone(), sock: s, bytes, admitted }).is_ok());
+                    // Nothing more is read until the hub took the connection in (its token checked):
+                    // only then may it send messages of the full size.
+                    if opened && verdict.recv().is_ok() && ws.get_ref().set_read_timeout(Some(idle)).is_ok() {
+                        ws.set_config(|c| *c = config(max));
+                        read_loop(&mut ws, conn, hub, limits, max, &shared.in_flight, &end);
+                        let _ = hub.send(HubIn::Gone { conn });
+                    }
+                }
+            }
+            Ok(Some(_)) => end(Some("say hello first")),
+            Ok(None) => {}
+            Err(why) => end(Some(&why)),
+        }
+    }
+    drop(counted);
+    // The block's counters go with the last handle on them (the table forgets it then).
+    drop(block);
+    ws.get_mut().read_until(None);
+    linger(&mut ws);
+    drop(out);
+    // The writer closes the socket once it has sent what's queued (a refusal, a close).
+    let _ = writer.join();
+    shutdown(&sock);
+}
+
+fn read_loop(
+    ws: &mut WebSocket<Duplex>,
+    conn: u64,
+    hub: &Sender<HubIn>,
+    limits: NetLimits,
+    max: usize,
+    in_flight: &InFlight,
+    end: &dyn Fn(Option<&str>),
+) {
+    let mut bucket = Bucket::new(limits.rate, limits.burst);
+    let mut signals = Bucket::new(SIGNAL_RATE, SIGNAL_BURST);
+    loop {
+        match next_message(ws, max, None) {
+            Ok(Some((msg, bytes))) => {
+                let now = Instant::now();
+                if !bucket.take(now) {
+                    log::info!("live session: connection {conn} sends too much; disconnecting it");
+                    return end(Some("too many messages"));
+                }
+                // Typing sends a chat signal per keystroke; more than this is dropped.
+                if matches!(msg, ClientMsg::Signal(_)) && !signals.take(now) {
+                    log::debug!("live session: connection {conn} sends signals too fast; dropping one");
+                    continue;
+                }
+                if !in_flight.take(bytes, limits.max_in_flight) {
+                    log::info!("live session: the hub is behind; dropping connection {conn}");
+                    return end(Some(BUSY));
+                }
+                if hub.send(HubIn::Msg { conn, msg, bytes }).is_err() {
+                    return;
+                }
+            }
+            Ok(None) => return end(None),
+            Err(why) => return end(Some(&why)),
+        }
+    }
+}
+
+fn write_loop(mut ws: WebSocket<Duplex>, rx: &Receiver<Out>, sock: &TcpStream) {
+    let mut close = Some((CloseCode::Normal, String::new()));
+    while let Ok(o) = rx.recv() {
+        match o {
+            Out::Bytes(b, _charge) => {
+                if ws.send(Message::Binary(b)).is_err() {
+                    close = None;
+                    break;
+                }
+            }
+            Out::Close(code, why) => {
+                close = Some((code, why));
+                break;
+            }
+        }
+    }
+    if let Some((code, why)) = close {
+        // Close politely: the close frame, then no more writing; the reader drains what the peer
+        // still sends until it hangs up (closing on unread data would reset the connection and
+        // could lose the close frame), or until the linger runs out.
+        let _ = ws.close(Some(CloseFrame { code, reason: why.into() }));
+        let _ = sock.shutdown(std::net::Shutdown::Write);
+        let until = Instant::now() + LINGER;
+        while let Ok(_) | Err(RecvTimeoutError::Timeout) = rx.recv_timeout(until.saturating_duration_since(Instant::now())) {
+            if Instant::now() >= until {
+                break;
+            }
+        }
+    }
+    shutdown(sock);
+}
+
+/// Read and drop what the peer still sends after the close, until it hangs up (at most
+/// [`LINGER`]). Raw bytes, not frames: after a frame over the size limit the WebSocket's reader
+/// is mid-frame and mustn't be asked for more.
+fn linger(ws: &mut WebSocket<Duplex>) {
+    let until = Instant::now() + LINGER;
+    let mut buf = [0u8; 4096];
+    while Instant::now() < until && ws.get_ref().set_read_timeout(Some(Duration::from_millis(250))).is_ok() {
+        match ws.get_mut().read(&mut buf) {
+            Ok(0) => break,
+            Ok(_) => {}
+            Err(e) if matches!(e.kind(), io::ErrorKind::WouldBlock | io::ErrorKind::TimedOut | io::ErrorKind::Interrupted) => {}
+            Err(_) => break,
+        }
+    }
+}
diff --git a/crates/collab-net/src/hub/hosting.rs b/crates/collab-net/src/hub/hosting.rs
new file mode 100644
index 00000000..8588e56a
--- /dev/null
+++ b/crates/collab-net/src/hub/hosting.rs
@@ -0,0 +1,201 @@
+use super::backend::Backend;
+use super::conn::{Shared, accept};
+use super::limits::{PerAddress, loopback};
+use super::queue::{Blocks, HubIn, InFlight};
+use super::*;
+
+/// The person hosting an app session: in the file's session without a socket.
+pub(crate) struct Local {
+    pub file: String,
+    pub server: Server,
+    /// Their client id (they joined `server` already).
+    pub id: u32,
+    pub inbox: Inbox,
+}
+
+pub(super) fn spawn(name: &str, f: impl FnOnce() + Send + 'static) -> io::Result<JoinHandle<()>> {
+    std::thread::Builder::new().name(name.to_string()).spawn(f)
+}
+
+/// A name others may see: trimmed, no control characters, at most [`MAX_NAME`] characters.
+pub(crate) fn clean_name(s: &str) -> String {
+    s.trim().chars().filter(|c| !c.is_control()).take(MAX_NAME).collect()
+}
+
+/// A running hub: its listener, connections and hub thread. Dropping it stops it.
+pub struct Hosting {
+    addr: SocketAddr,
+    hub: Sender<HubIn>,
+    stop: Arc<AtomicBool>,
+    open: Arc<AtomicUsize>,
+    /// Bytes queued for every connection together, and in flight to the hub.
+    queued: Arc<AtomicUsize>,
+    in_flight: InFlight,
+    blocks: Blocks,
+    reading: Arc<AtomicUsize>,
+    hub_thread: Option<JoinHandle<()>>,
+    accept_thread: Option<JoinHandle<()>>,
+}
+
+impl Hosting {
+    /// Serve `backend`'s files on `listener`.
+    pub fn serve<B: Backend>(listener: TcpListener, backend: B, limits: NetLimits) -> io::Result<Hosting> {
+        Self::start(listener, backend, limits, None)
+    }
+
+    pub(crate) fn start<B: Backend>(listener: TcpListener, backend: B, limits: NetLimits, local: Option<Local>) -> io::Result<Hosting> {
+        let addr = listener.local_addr()?;
+        let in_flight = InFlight(Arc::default());
+        let mut hub = Hub {
+            backend,
+            rooms: HashMap::new(),
+            conns: HashMap::new(),
+            local: None,
+            outbox: Vec::new(),
+            in_flight: in_flight.clone(),
+            barred: HashMap::new(),
+        };
+        if let Some(l) = local {
+            let mut room = Room::new(l.server);
+            room.local = Some((l.id, l.inbox));
+            hub.rooms.insert(l.file.clone(), room);
+            hub.local = Some(l.file);
+        }
+        let (hub_tx, hub_rx) = channel();
+        let stop = Arc::new(AtomicBool::new(false));
+        let open = Arc::new(AtomicUsize::new(0));
+        let hub_thread = spawn("live-hub", move || hub.run(&hub_rx))?;
+        let shared = Shared {
+            per_address: PerAddress::default(),
+            queued: Arc::default(),
+            in_flight: in_flight.clone(),
+            blocks: Blocks::default(),
+            reading: Arc::default(),
+            readers: Readers::default(),
+        };
+        let queued = shared.queued.clone();
+        let blocks = shared.blocks.clone();
+        let reading = shared.reading.clone();
+        let accept_thread = {
+            let (hub_tx, stop, open) = (hub_tx.clone(), stop.clone(), open.clone());
+            spawn("live-accept", move || accept(&listener, &hub_tx, &stop, &open, limits, shared))
+        };
+        let accept_thread = match accept_thread {
+            Ok(t) => t,
+            Err(e) => {
+                let _ = hub_tx.send(HubIn::Stop);
+                let _ = hub_thread.join();
+                return Err(e);
+            }
+        };
+        log::info!("live session: listening on {addr}");
+        Ok(Hosting {
+            addr,
+            hub: hub_tx,
+            stop,
+            open,
+            queued,
+            in_flight,
+            blocks,
+            reading,
+            hub_thread: Some(hub_thread),
+            accept_thread: Some(accept_thread),
+        })
+    }
+
+    /// Bytes waiting to be sent to clients, all connections together.
+    pub fn queued_bytes(&self) -> usize {
+        self.queued.load(Ordering::Relaxed)
+    }
+
+    /// Blocks of addresses the server keeps counters for (those of open connections, and any
+    /// whose last connection just ended, until the next connection prunes them).
+    pub fn blocks_remembered(&self) -> usize {
+        self.blocks.len()
+    }
+
+    /// Bytes being read into messages not whole yet, all connections together.
+    pub fn reading_bytes(&self) -> usize {
+        self.reading.load(Ordering::Relaxed)
+    }
+
+    /// Bytes of messages read and not handled by the hub yet.
+    pub fn in_flight_bytes(&self) -> usize {
+        self.in_flight.0.load(Ordering::Relaxed)
+    }
+
+    /// Where it listens.
+    pub fn addr(&self) -> SocketAddr {
+        self.addr
+    }
+
+    /// Open connections (joined or not).
+    pub fn connections(&self) -> usize {
+        self.open.load(Ordering::Relaxed)
+    }
+
+    /// The hosting person's presence (app sessions).
+    pub(crate) fn presence(&self, p: Presence) {
+        let _ = self.hub.send(HubIn::Local(p));
+    }
+
+    /// A message from the hosting person's sync client (their edits).
+    pub(crate) fn send(&self, msg: ClientMsg) {
+        let _ = self.hub.send(HubIn::LocalMsg(msg));
+    }
+
+    /// The hosting person removes client `id` from their file (app sessions; see
+    /// [`HubIn::Remove`]).
+    pub(crate) fn remove(&self, id: u32) {
+        let _ = self.hub.send(HubIn::Remove(id));
+    }
+
+    /// Cut every connection as a network failure would (no close frame).
+    #[cfg(test)]
+    pub(crate) fn cut_connections(&self) {
+        let _ = self.hub.send(HubIn::Cut);
+    }
+
+    /// Stop: the backend saves what's open, everyone is told and disconnected, the port is
+    /// released.
+    pub fn stop(&mut self) {
+        if self.stop.swap(true, Ordering::SeqCst) {
+            return;
+        }
+        let _ = self.hub.send(HubIn::Stop);
+        if let Some(t) = self.hub_thread.take() {
+            let _ = t.join();
+        }
+        // The accept loop checks the flag after each connection: wake it with one.
+        let wake = if self.addr.ip().is_unspecified() { SocketAddr::new(loopback(self.addr), self.addr.port()) } else { self.addr };
+        let woke = TcpStream::connect_timeout(&wake, Duration::from_secs(1)).is_ok();
+        if let Some(t) = self.accept_thread.take() {
+            if woke {
+                let _ = t.join();
+            } else {
+                log::warn!("live session: couldn't wake the accept loop; it ends with the next connection");
+            }
+        }
+        // Readers end once their writers have closed the sockets.
+        let deadline = Instant::now() + Duration::from_secs(2);
+        while self.open.load(Ordering::Relaxed) > 0 && Instant::now() < deadline {
+            std::thread::sleep(Duration::from_millis(5));
+        }
+        log::info!("live session: stopped listening on {}", self.addr);
+    }
+}
+
+impl Drop for Hosting {
+    fn drop(&mut self) {
+        self.stop();
+    }
+}
+
+/// Counts an open connection until dropped.
+pub(super) struct Open(pub(super) Arc<AtomicUsize>);
+
+impl Drop for Open {
+    fn drop(&mut self) {
+        self.0.fetch_sub(1, Ordering::Relaxed);
+    }
+}
diff --git a/crates/collab-net/src/hub/limits.rs b/crates/collab-net/src/hub/limits.rs
new file mode 100644
index 00000000..333ff165
--- /dev/null
+++ b/crates/collab-net/src/hub/limits.rs
@@ -0,0 +1,99 @@
+use super::*;
+
+/// What a link lets a hello do.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Admission {
+    pub access: Access,
+    /// The link's id, when the backend has several per file (revoking it disconnects whoever
+    /// joined with it).
+    pub link: Option<String>,
+}
+
+/// The address limits and blocks count a client by: its IPv4 address (an IPv4-mapped IPv6 address
+/// as IPv4), or its IPv6 address's /64 (one subscriber's block: they have billions of addresses).
+pub fn ip_key(ip: IpAddr) -> IpAddr {
+    match ip.to_canonical() {
+        IpAddr::V6(v6) => {
+            let [a, b, c, d, ..] = v6.segments();
+            IpAddr::V6(Ipv6Addr::new(a, b, c, d, 0, 0, 0, 0))
+        }
+        v4 => v4,
+    }
+}
+
+/// The loopback address of `addr`'s family.
+pub(super) fn loopback(addr: SocketAddr) -> std::net::IpAddr {
+    if addr.is_ipv6() { std::net::Ipv6Addr::LOCALHOST.into() } else { std::net::Ipv4Addr::LOCALHOST.into() }
+}
+
+/// A block of addresses: its first address and its prefix length (2001:db8:: as a /64 and as a
+/// /48 are different blocks).
+pub type Block = (IpAddr, u8);
+
+/// The blocks a client's address ([`ip_key`]) counts in, with how many times its own limits each
+/// gets: the address itself (an IPv4 /32 or an IPv6 /64, ×1) and, for IPv6, its /56 (×2) and /48
+/// (×4), so a tunnel's free /48 doesn't multiply the limits 65,536 times.
+pub fn ip_blocks(key: IpAddr) -> Vec<(Block, u32)> {
+    let IpAddr::V6(v6) = key else { return vec![((key, 32), 1)] };
+    let [a, b, c, d, ..] = v6.segments();
+    vec![
+        ((IpAddr::V6(Ipv6Addr::new(a, b, c, d, 0, 0, 0, 0)), 64), 1),
+        ((IpAddr::V6(Ipv6Addr::new(a, b, c, d & 0xff00, 0, 0, 0, 0)), 56), 2),
+        ((IpAddr::V6(Ipv6Addr::new(a, b, c, 0, 0, 0, 0, 0)), 48), 4),
+    ]
+}
+
+/// Open connections per client address ([`ip_key`], and its wider IPv6 blocks); an address
+/// leaves when its last one closes, so the table never holds more than the open connections.
+#[derive(Clone, Default)]
+pub(super) struct PerAddress(pub(super) Arc<Mutex<HashMap<Block, usize>>>);
+
+/// One connection counted for a block until dropped.
+pub(super) struct Counted {
+    table: PerAddress,
+    ip: Block,
+}
+
+impl PerAddress {
+    /// Count a connection from block `ip`, unless it has `cap` already (0: no cap).
+    fn enter(&self, ip: Block, cap: usize) -> Option<Counted> {
+        let mut t = self.0.lock().unwrap_or_else(PoisonError::into_inner);
+        let n = t.entry(ip).or_insert(0);
+        if cap > 0 && *n >= cap {
+            if *n == 0 {
+                t.remove(&ip);
+            }
+            return None;
+        }
+        *n += 1;
+        Some(Counted { table: self.clone(), ip })
+    }
+
+    /// Count a connection from `ip` in each of its blocks, unless one of them is full. A wider
+    /// block's cap is its multiple of `cap`, but at most a sixteenth (/56) or an eighth (/48) of
+    /// `all` connections, so no block takes every connection.
+    pub(super) fn enter_all(&self, ip: IpAddr, cap: usize, all: usize) -> Option<Vec<Counted>> {
+        let mut held = Vec::new();
+        for ((addr, prefix), times) in ip_blocks(ip) {
+            let block_cap = match prefix {
+                56 => cap.saturating_mul(times as usize).min(all / 16).max(1),
+                48 => cap.saturating_mul(times as usize).min(all / 8).max(1),
+                _ => cap,
+            };
+            held.push(self.enter((addr, prefix), if cap == 0 { 0 } else { block_cap })?);
+        }
+        Some(held)
+    }
+}
+
+impl Drop for Counted {
+    fn drop(&mut self) {
+        let mut t = self.table.0.lock().unwrap_or_else(PoisonError::into_inner);
+        if let Some(n) = t.get_mut(&self.ip) {
+            *n = n.saturating_sub(1);
+            if *n == 0 {
+                t.remove(&self.ip);
+            }
+        }
+    }
+}
diff --git a/crates/collab-net/src/hub/preauth_tests.rs b/crates/collab-net/src/hub/preauth_tests.rs
new file mode 100644
index 00000000..5ae91665
--- /dev/null
+++ b/crates/collab-net/src/hub/preauth_tests.rs
@@ -0,0 +1,72 @@
+//! A connection whose hello the backend hasn't admitted yet is held to the hello's size limit: it
+//! can't have a message of the full size read while its token is unchecked.
+
+use std::net::{SocketAddr, TcpListener, TcpStream};
+use std::sync::mpsc::{Receiver, channel};
+use std::time::{Duration, Instant};
+
+use figcraft_collab::message::{self, ClientMsg, ServerMsg, Signal};
+use figcraft_collab::{Client, Server};
+use tungstenite::{Bytes, Message};
+
+use super::{Admission, Backend, Closing, Hosting};
+use crate::net::NetLimits;
+
+/// A backend that refuses every hello, once it is told to.
+struct Slow(Receiver<()>);
+
+impl Backend for Slow {
+    fn admit(&mut self, _file: &str, _token: &str) -> Result<Admission, String> {
+        let _ = self.0.recv();
+        Err("wrong token".into())
+    }
+
+    fn open(&mut self, _file: &str) -> Result<Server, String> {
+        Err("no".into())
+    }
+
+    fn closing(&self) -> Closing {
+        Closing::Ended
+    }
+}
+
+fn connect(addr: SocketAddr) -> tungstenite::WebSocket<TcpStream> {
+    let s = TcpStream::connect(addr).unwrap();
+    s.set_read_timeout(Some(Duration::from_secs(10))).unwrap();
+    tungstenite::client::client(format!("ws://{addr}/"), s).unwrap().0
+}
+
+#[test]
+fn an_unadmitted_connection_cant_send_a_large_message() {
+    let limits = NetLimits { hello_timeout: Duration::from_secs(5), ..NetLimits::default() };
+    let (release, wait) = channel();
+    let mut hosting = Hosting::serve(TcpListener::bind("127.0.0.1:0").unwrap(), Slow(wait), limits).unwrap();
+    let addr = hosting.addr();
+    let sender = std::thread::spawn(move || {
+        let mut ws = connect(addr);
+        let hello = message::encode(&Client::hello("0123456789abcdef", "bad", "x", "")).unwrap();
+        ws.send(Message::Binary(Bytes::from(hello))).unwrap();
+        let big = ClientMsg::Signal(Signal { kind: Signal::CHAT.into(), text: "x".repeat(1 << 20) });
+        let _ = ws.send(Message::Binary(Bytes::from(message::encode(&big).unwrap())));
+        let mut refused = None;
+        while let Ok(m) = ws.read() {
+            if let Message::Binary(b) = m
+                && let Ok(ServerMsg::Refused { reason }) = message::decode(&b, 64 << 20)
+            {
+                refused = Some(reason);
+            }
+        }
+        refused
+    });
+    let mut peak = 0;
+    let until = Instant::now() + Duration::from_secs(2);
+    while Instant::now() < until {
+        peak = peak.max(hosting.in_flight_bytes());
+        std::thread::sleep(Duration::from_millis(2));
+    }
+    release.send(()).unwrap();
+    let refused = sender.join().unwrap();
+    hosting.stop();
+    assert!(peak <= limits.max_hello, "a message of {peak} bytes was read before the token was checked");
+    assert_eq!(refused.as_deref(), Some("wrong token"));
+}
diff --git a/crates/collab-net/src/hub/queue.rs b/crates/collab-net/src/hub/queue.rs
new file mode 100644
index 00000000..b6bce39e
--- /dev/null
+++ b/crates/collab-net/src/hub/queue.rs
@@ -0,0 +1,210 @@
+use super::limits::ip_blocks;
+use super::*;
+
+/// A message for one connection's writer: bytes (with what they count against, released when
+/// they are sent or dropped), or the close.
+pub(crate) enum Out {
+    Bytes(Bytes, Option<Charge>),
+    Close(CloseCode, String),
+}
+
+/// One message's bytes held for one or more connections (a broadcast shares one buffer), counted
+/// once against a shared counter (the server's, or a block's) until the last copy is sent or
+/// dropped.
+pub(super) struct Held {
+    n: usize,
+    counter: Arc<AtomicUsize>,
+}
+
+impl Held {
+    fn new(n: usize, counter: &Arc<AtomicUsize>) -> Arc<Held> {
+        counter.fetch_add(n, Ordering::Relaxed);
+        Arc::new(Held { n, counter: counter.clone() })
+    }
+}
+
+impl Drop for Held {
+    fn drop(&mut self) {
+        self.counter.fetch_sub(self.n, Ordering::Relaxed);
+    }
+}
+
+/// What one message counts against, made by its first recipient and shared by the others: the
+/// server's budget once, and each recipient block's once (twenty people behind one office's
+/// address cost their block one copy of a broadcast, not twenty).
+#[derive(Default)]
+pub(crate) struct Charges {
+    pub(super) all: Option<Arc<Held>>,
+    pub(super) blocks: Vec<(usize, Arc<Held>)>,
+    /// Count it against blocks at all: a welcome isn't (it is bounded by the file's size and each
+    /// connection's cap, and a whole office joining at once must fit).
+    pub(crate) skip_blocks: bool,
+}
+
+/// Bytes waiting in a connection's queue, counted against its cap until dropped (and, through
+/// [`Held`], once against the server's budget and once against its block's).
+pub(super) struct Charge {
+    n: usize,
+    mine: Arc<AtomicUsize>,
+    _all: Arc<Held>,
+    _block: Option<Arc<Held>>,
+}
+
+impl Drop for Charge {
+    fn drop(&mut self) {
+        self.mine.fetch_sub(self.n, Ordering::Relaxed);
+    }
+}
+
+/// Why a message couldn't be queued.
+#[derive(Debug, PartialEq, Eq)]
+pub(crate) enum Push {
+    /// The connection's or its block's queue is full: it can't keep up.
+    Full,
+    /// The server's budget for queued bytes is used up.
+    Everyone,
+    /// The connection is gone.
+    Gone,
+}
+
+/// One connection's way out: its writer's queue, capped in messages and in bytes (its own, its
+/// block of addresses', and the server's for everyone), so a client that doesn't read can't make
+/// the server hold more than that for it.
+#[derive(Clone)]
+pub(crate) struct Line {
+    pub(crate) tx: SyncSender<Out>,
+    pub(crate) queued: Arc<AtomicUsize>,
+    pub(crate) block: Arc<AtomicUsize>,
+    pub(crate) all: Arc<AtomicUsize>,
+    pub(crate) max: usize,
+    pub(crate) max_block: usize,
+    pub(crate) max_all: usize,
+}
+
+impl Line {
+    /// Queue `b`. One message always fits an empty queue (a welcome as large as the largest file
+    /// gets out). `charges` is what the message counts against, shared by its recipients;
+    /// `over_budget` lets it past the server's budget (the hub just dropped the biggest consumer
+    /// to make room).
+    pub(crate) fn push(&self, b: &Bytes, charges: &mut Charges, over_budget: bool) -> Result<(), Push> {
+        let n = b.len();
+        let mine = self.queued.load(Ordering::Relaxed);
+        if mine > 0 && mine.saturating_add(n) > self.max {
+            return Err(Push::Full);
+        }
+        let key = Arc::as_ptr(&self.block) as usize;
+        let block = if charges.skip_blocks {
+            None
+        } else if let Some((_, h)) = charges.blocks.iter().find(|(k, _)| *k == key) {
+            Some(h.clone())
+        } else {
+            let used = self.block.load(Ordering::Relaxed);
+            if used > 0 && used.saturating_add(n) > self.max_block {
+                return Err(Push::Full);
+            }
+            let h = Held::new(n, &self.block);
+            charges.blocks.push((key, h.clone()));
+            Some(h)
+        };
+        let all = match &charges.all {
+            Some(h) => h.clone(),
+            None => {
+                if !over_budget && self.all.load(Ordering::Relaxed).saturating_add(n) > self.max_all {
+                    return Err(Push::Everyone);
+                }
+                charges.all.insert(Held::new(n, &self.all)).clone()
+            }
+        };
+        self.queued.fetch_add(n, Ordering::Relaxed);
+        let charge = Charge { n, mine: self.queued.clone(), _all: all, _block: block };
+        self.tx.try_send(Out::Bytes(b.clone(), Some(charge))).map_err(|e| match e {
+            TrySendError::Full(_) => Push::Full,
+            TrySendError::Disconnected(_) => Push::Gone,
+        })
+    }
+}
+
+/// What one block of addresses (an IPv4 address, an IPv6 /48: [`wide_block`]) has queued and is
+/// having read, shared by its connections.
+#[derive(Clone, Default)]
+pub(crate) struct BlockUse {
+    pub(super) queued: Arc<AtomicUsize>,
+    pub(super) reading: Arc<AtomicUsize>,
+}
+
+/// The blocks with open connections; a block leaves when its last connection ends.
+#[derive(Clone, Default)]
+pub(crate) struct Blocks(pub(crate) Arc<Mutex<HashMap<IpAddr, BlockUse>>>);
+
+impl Blocks {
+    /// Block `key`'s counters; blocks nobody uses any more (only the table holds their counters,
+    /// whose connections' queues and readers are all gone) are forgotten first, so the table
+    /// never holds more than the blocks of open connections.
+    pub(crate) fn get(&self, key: IpAddr) -> BlockUse {
+        let mut t = self.0.lock().unwrap_or_else(PoisonError::into_inner);
+        t.retain(|_, u| Arc::strong_count(&u.queued) > 1 || Arc::strong_count(&u.reading) > 1);
+        t.entry(key).or_default().clone()
+    }
+
+    /// Blocks remembered.
+    pub(crate) fn len(&self) -> usize {
+        self.0.lock().unwrap_or_else(PoisonError::into_inner).len()
+    }
+}
+
+/// The widest block an address counts in for the server's shared budgets: an IPv4 address, or an
+/// IPv6 address's /48.
+pub fn wide_block(key: IpAddr) -> IpAddr {
+    ip_blocks(key).last().map_or(key, |(b, _)| b.0)
+}
+
+/// Messages handed to the hub thread and not handled yet, in bytes: past the budget a reader
+/// drops its connection instead of piling more on a busy hub.
+#[derive(Clone)]
+pub(crate) struct InFlight(pub(crate) Arc<AtomicUsize>);
+
+impl InFlight {
+    pub(super) fn take(&self, n: usize, max: usize) -> bool {
+        if self.0.fetch_add(n, Ordering::Relaxed).saturating_add(n) > max {
+            self.0.fetch_sub(n, Ordering::Relaxed);
+            return false;
+        }
+        true
+    }
+
+    pub(super) fn give(&self, n: usize) {
+        self.0.fetch_sub(n, Ordering::Relaxed);
+    }
+}
+
+pub(super) enum HubIn {
+    /// A connection's first message (`Hello`, `Manage`, `OpenLibrary`, `OpenPlugins`,
+    /// `OpenHosting` or `Resolve`) and its client's address ([`ip_key`]).
+    Open {
+        conn: u64,
+        ip: IpAddr,
+        first: ClientMsg,
+        out: Line,
+        sock: TcpStream,
+        /// Its size (in flight until handled).
+        bytes: usize,
+        /// Told when the hub takes the connection in (dropped unsent when it doesn't).
+        admitted: SyncSender<()>,
+    },
+    Msg {
+        conn: u64,
+        msg: ClientMsg,
+        bytes: usize,
+    },
+    Gone {
+        conn: u64,
+    },
+    Local(Presence),
+    LocalMsg(ClientMsg),
+    /// The person hosting removes client `id` from their file (app sessions).
+    Remove(u32),
+    /// Cut every connection without a word (tests: a network failure).
+    #[cfg(test)]
+    Cut,
+    Stop,
+}
diff --git a/crates/collab-net/src/queue_tests.rs b/crates/collab-net/src/hub/queue_tests.rs
similarity index 100%
rename from crates/collab-net/src/queue_tests.rs
rename to crates/collab-net/src/hub/queue_tests.rs
diff --git a/crates/collab-net/src/inbox.rs b/crates/collab-net/src/inbox.rs
index fb505a0a..1ec00e67 100644
--- a/crates/collab-net/src/inbox.rs
+++ b/crates/collab-net/src/inbox.rs
@@ -11,11 +11,18 @@ use figcraft_engine::live::{Event, Presence};
 pub type Waker = Arc<dyn Fn() + Send + Sync>;
 
 /// Most discrete events kept between two drains (joins, leaves, status); the oldest go first.
+/// Document sync events don't count and are never dropped: the sync client treats a missing
+/// batch as a fatal sequence gap, so losing one would end the session.
 const MAX_EVENTS: usize = 10_000;
 
 #[derive(Default)]
 struct State {
-    events: VecDeque<Event>,
+    /// Arrival number of the next event, so [`Inbox::drain`] can merge the two queues in order.
+    next: u64,
+    /// [`Event::Sync`] events, never dropped.
+    syncs: VecDeque<(u64, Event)>,
+    /// Every other event, capped at [`MAX_EVENTS`].
+    others: VecDeque<(u64, Event)>,
     presence: BTreeMap<u32, Presence>,
 }
 
@@ -43,11 +50,17 @@ impl Inbox {
             if let Event::PeerLeft(id) = &e {
                 s.presence.remove(id);
             }
-            if s.events.len() >= MAX_EVENTS {
-                log::warn!("live session: {MAX_EVENTS} events not taken; dropping the oldest");
-                s.events.pop_front();
+            let n = s.next;
+            s.next += 1;
+            if matches!(e, Event::Sync(_)) {
+                s.syncs.push_back((n, e));
+                return;
             }
-            s.events.push_back(e);
+            if s.others.len() >= MAX_EVENTS {
+                log::warn!("live session: {MAX_EVENTS} events not taken; dropping the oldest");
+                s.others.pop_front();
+            }
+            s.others.push_back((n, e));
         });
     }
 
@@ -62,8 +75,70 @@ impl Inbox {
     /// peer.
     pub fn drain(&self) -> Vec<figcraft_engine::live::Event> {
         let mut s = self.state.lock().unwrap_or_else(PoisonError::into_inner);
-        let mut out: Vec<Event> = s.events.drain(..).collect();
+        let mut syncs = std::mem::take(&mut s.syncs).into_iter().peekable();
+        let mut others = std::mem::take(&mut s.others).into_iter().peekable();
+        let mut out = Vec::with_capacity(syncs.len() + others.len() + s.presence.len());
+        loop {
+            let sync_first = match (syncs.peek(), others.peek()) {
+                (Some((a, _)), Some((b, _))) => a < b,
+                (Some(_), None) => true,
+                (None, Some(_)) => false,
+                (None, None) => break,
+            };
+            let next = if sync_first { syncs.next() } else { others.next() };
+            out.extend(next.map(|(_, e)| e));
+        }
         out.extend(std::mem::take(&mut s.presence).into_iter().map(|(id, p)| Event::Presence(id, p)));
         out
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use figcraft_collab::message::ServerMsg;
+
+    fn reject(batch_id: u64) -> Event {
+        Event::Sync(ServerMsg::Reject { batch_id, reason: String::new(), fixes: Vec::new() })
+    }
+
+    fn sync_ids(events: &[Event]) -> Vec<u64> {
+        events
+            .iter()
+            .filter_map(|e| match e {
+                Event::Sync(ServerMsg::Reject { batch_id, .. }) => Some(*batch_id),
+                _ => None,
+            })
+            .collect()
+    }
+
+    #[test]
+    fn a_full_inbox_never_drops_sync_events() {
+        let inbox = Inbox::new(Arc::new(|| {}));
+        inbox.push(reject(1));
+        for _ in 0..MAX_EVENTS {
+            inbox.push(Event::PeerLeft(7));
+        }
+        inbox.push(reject(2));
+        for _ in 0..MAX_EVENTS {
+            inbox.push(Event::PeerLeft(7));
+        }
+        let out = inbox.drain();
+        assert_eq!(sync_ids(&out), vec![1, 2]);
+        assert!(out.len() <= MAX_EVENTS + 2, "{} events kept", out.len());
+    }
+
+    #[test]
+    fn sync_events_past_the_cap_are_all_kept_in_order() {
+        let inbox = Inbox::new(Arc::new(|| {}));
+        let n = MAX_EVENTS as u64 + 5;
+        for id in 0..n {
+            inbox.push(reject(id));
+        }
+        inbox.push(Event::PeerLeft(7));
+        let out = inbox.drain();
+        let ids = sync_ids(&out);
+        assert_eq!(ids.len() as u64, n, "Sync events dropped");
+        assert!(ids.iter().copied().eq(0..n), "Sync events out of order");
+    }
+}
diff --git a/crates/collab-net/src/invite.rs b/crates/collab-net/src/invite.rs
index bfa2e606..e5d86bf2 100644
--- a/crates/collab-net/src/invite.rs
+++ b/crates/collab-net/src/invite.rs
@@ -203,7 +203,7 @@ fn pairs(query: &str) -> Result<Vec<(String, String)>, String> {
 fn with_port(authority: &str, default: u16) -> String {
     let has_port = match authority.rsplit_once(':') {
         // `[v6]` alone has colons inside the brackets only.
-        Some((h, p)) => !(h.starts_with('[') && !h.ends_with(']')) && !p.contains(']'),
+        Some((h, p)) => (!h.starts_with('[') || h.ends_with(']')) && !p.contains(']'),
         None => false,
     };
     if has_port { authority.to_string() } else { format!("{authority}:{default}") }
@@ -220,7 +220,8 @@ fn valid_host(s: &str) -> bool {
         return true;
     }
     let Some((name, port)) = s.rsplit_once(':') else { return false };
-    port.parse::<u16>().is_ok_and(|p| p != 0)
+    port.bytes().all(|b| b.is_ascii_digit())
+        && port.parse::<u16>().is_ok_and(|p| p != 0)
         && (1..=253).contains(&name.len())
         && name.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-' || b == b'.')
         && !name.starts_with(['-', '.'])
@@ -239,6 +240,9 @@ fn percent_decode(s: &str) -> Option<String> {
     while let Some(&b) = bytes.get(i) {
         if b == b'%' {
             let hex = bytes.get(i + 1..i + 3)?;
+            if !hex.iter().all(u8::is_ascii_hexdigit) {
+                return None;
+            }
             out.push(u8::from_str_radix(std::str::from_utf8(hex).ok()?, 16).ok()?);
             i += 3;
         } else {
diff --git a/crates/collab-net/src/invite_tests.rs b/crates/collab-net/src/invite_tests.rs
index 02017517..b7618dc2 100644
--- a/crates/collab-net/src/invite_tests.rs
+++ b/crates/collab-net/src/invite_tests.rs
@@ -123,3 +123,19 @@ proptest! {
         prop_assert_eq!(Invite::parse(&i.url()), Ok(i));
     }
 }
+
+#[test]
+fn plus_or_sign_inside_a_percent_escape_is_broken() {
+    assert!(Endpoint::parse("ws://example.org/a/?key=%41").is_ok());
+    for bad in ["%+1", "%-1", "%1", "%+a"] {
+        assert!(Endpoint::parse(&format!("ws://example.org/a/?key={bad}")).is_err(), "{bad}");
+    }
+}
+
+#[test]
+fn port_must_be_all_digits() {
+    assert!(Endpoint::parse("ws://localhost:80/").is_ok());
+    for bad in ["ws://localhost:+80/", "ws://localhost:-80/", "ws://localhost:/"] {
+        assert!(Endpoint::parse(bad).is_err(), "accepted {bad}");
+    }
+}
diff --git a/crates/collab-net/src/join.rs b/crates/collab-net/src/join.rs
index 81cd2437..43b0b7b8 100644
--- a/crates/collab-net/src/join.rs
+++ b/crates/collab-net/src/join.rs
@@ -7,7 +7,7 @@ use std::time::Duration;
 
 use figcraft_collab::Client;
 use figcraft_collab::message::{ClientMsg, Peer, Resume, ServerMsg};
-use figcraft_engine::live::{Event, Role, SessionInfo, Status};
+use figcraft_engine::live::{Event, Role, SessionInfo, Status, TOO_LARGE_TO_JOIN};
 
 use crate::inbox::Inbox;
 use crate::invite::Invite;
@@ -95,6 +95,12 @@ pub(crate) fn unresolved(cfg: &GuestConfig, outcome: Outcome) -> Outcome {
     })
 }
 
+/// The host sent a message over this app's size limit (the file's welcome, usually): final, and
+/// not the host's doing.
+pub(crate) fn too_large(limits: &NetLimits) -> Outcome {
+    Outcome::Failed(TOO_LARGE_TO_JOIN.replace("{mb}", &(limits.max_server_message >> 20).to_string()))
+}
+
 /// The server's answer to the join code: the invite is whole now.
 pub(crate) fn resolved(cfg: &mut GuestConfig, file: String, token: String) -> Result<(), Outcome> {
     if !crate::invite::valid_id(&file, 1, 64) || !crate::invite::valid_id(&token, 16, 128) {
@@ -183,9 +189,9 @@ pub(crate) enum Taken {
 /// in answer must go out on this connection.
 pub(crate) fn take(m: ServerMsg, cfg: &GuestConfig, inbox: &Inbox, seen: &mut Seen, resume: &Resuming, welcomed: &dyn Fn()) -> Taken {
     match m {
-        ServerMsg::Welcome { session, client_id, seq, ref peers, access, .. } => {
+        ServerMsg::Welcome { session, client_id, seq, ref peers, access, secret, .. } => {
             if let Ok(mut r) = resume.lock() {
-                *r = Some(Resume { session, client_id, seq });
+                *r = Some(Resume { session, client_id, seq, secret });
             }
             // The sync client opens the document (and fills in its name and pages).
             let peers = peers.clone();
diff --git a/crates/collab-net/src/limits.rs b/crates/collab-net/src/limits.rs
index c3111876..0321b36c 100644
--- a/crates/collab-net/src/limits.rs
+++ b/crates/collab-net/src/limits.rs
@@ -12,7 +12,9 @@ pub struct NetLimits {
     /// before: its hello.
     pub max_client_message: usize,
     pub max_hello: usize,
-    /// Largest message a client accepts from the host (a welcome carries the whole document).
+    /// Largest message a client accepts from the host (a welcome carries the whole document): 1 GiB,
+    /// room for any file up to 1023 MiB and well past the servers' defaults, while a hostile server
+    /// (any link can name one) can't make the app or a browser tab buffer more than that.
     pub max_server_message: usize,
     /// Messages a client may send per second on average, and in a burst; beyond that it is
     /// disconnected.
@@ -22,6 +24,12 @@ pub struct NetLimits {
     pub hello_timeout: Duration,
     /// A connection with no traffic for this long is dead.
     pub idle_timeout: Duration,
+    /// How long a one-shot request connection (hosting, a library, a plugin directory — and, most
+    /// importantly, publishing a file) waits for the server's reply before giving up. Publishing
+    /// uploads a whole file and a large one on a slow link takes the server a while to receive and
+    /// answer, so this is longer than `idle_timeout` (a large project on a slow connection can
+    /// easily need several minutes).
+    pub request_reply_timeout: Duration,
     /// A quiet client pings this often (keeps it under `idle_timeout`).
     pub keepalive: Duration,
     /// Messages queued for one client before it counts as stuck and is disconnected.
@@ -61,11 +69,12 @@ impl Default for NetLimits {
             max_connections: 64,
             max_client_message: figcraft_collab::Limits::default().max_message_bytes,
             max_hello: 64 << 10,
-            max_server_message: figcraft_collab::Limits::default().max_message_bytes,
+            max_server_message: 1 << 30,
             rate: 100.0,
             burst: 400.0,
             hello_timeout: Duration::from_secs(10),
             idle_timeout: Duration::from_secs(45),
+            request_reply_timeout: Duration::from_secs(300),
             keepalive: Duration::from_secs(15),
             queue: 1024,
             write_timeout: Duration::from_secs(10),
@@ -83,3 +92,16 @@ impl Default for NetLimits {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn request_reply_wait_is_longer_than_idle() {
+        let d = NetLimits::default();
+        // Publishing uploads a whole file; a slow link must not cut it off at the session idle
+        // timeout. Keep the reply wait comfortably above it.
+        assert!(d.request_reply_timeout > d.idle_timeout);
+    }
+}
diff --git a/crates/collab-net/src/loopback_tests.rs b/crates/collab-net/src/loopback_tests.rs
index 32c86bd0..fe9b4782 100644
--- a/crates/collab-net/src/loopback_tests.rs
+++ b/crates/collab-net/src/loopback_tests.rs
@@ -2,7 +2,7 @@
 //! refusals, presence relay and throttling, leaving and dropping, limits, malformed frames, and
 //! reconnecting. Every test stops its host and closes its sockets.
 
-use std::io::Read;
+use std::io::{Read, Write};
 use std::net::{SocketAddr, TcpStream};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
@@ -10,7 +10,7 @@ use std::time::{Duration, Instant};
 use figcraft_collab::message::{self, ClientMsg, Hello, Presence, ServerMsg, Signal};
 use figcraft_collab::{Client, Limits};
 use figcraft_doc::{Document, NodeId};
-use figcraft_engine::live::{Event, PEOPLE, Status};
+use figcraft_engine::live::{Event, PEOPLE, Status, TOO_LARGE_TO_JOIN};
 use tungstenite::protocol::WebSocket;
 use tungstenite::{Bytes, Message};
 
@@ -488,6 +488,21 @@ fn silent_connections_time_out() {
     host.stop();
 }
 
+#[test]
+fn connections_without_a_hello_are_told_why_they_end() {
+    // A socket's read timeout can end a moment before the hello's deadline; the connection still
+    // gets the refusal. Twelve at once, so that happens to some of them.
+    let (mut host, _hp, invite) = start_with(NetLimits { hello_timeout: Duration::from_secs(1), ..fast_limits() }, Limits::default());
+    let addr: SocketAddr = invite.server.host.parse().unwrap();
+    std::thread::scope(|s| {
+        let waits: Vec<_> = (0..12).map(|_| s.spawn(move || Raw::connect(addr).refusal())).collect();
+        for w in waits {
+            assert_eq!(w.join().unwrap().as_deref(), Some("no hello in time"));
+        }
+    });
+    host.stop();
+}
+
 #[test]
 fn guests_reconnect_after_a_network_failure() {
     let (mut host, mut hp, invite) = start();
@@ -540,7 +555,9 @@ fn quiet_guests_stay_and_silent_connections_are_dropped() {
     let (mut host, mut hp, invite) = start_with(limits, Limits::default());
     let probe = Probe::new();
     let mut cfg = quick(GuestConfig::new(invite.clone(), "Ada".into()));
-    cfg.limits = limits;
+    // The guest pings as often as the host expects. Its own idle timeout stays long: it also bounds
+    // the wait for the welcome, which a loaded machine can take longer than 600 ms to send.
+    cfg.limits.keepalive = limits.keepalive;
     let _g = Guest::start(cfg, probe.inbox.clone()).unwrap();
     let mut gp = probe;
     gp.wait("welcome", welcomed);
@@ -642,3 +659,85 @@ fn the_host_removes_someone_and_they_cant_come_back() {
     host.stop();
     assert_eq!(host.connections(), 0);
 }
+
+#[test]
+fn a_welcome_over_the_size_limit_says_the_file_is_too_large() {
+    let mut doc = Document::new("B".repeat(1 << 20));
+    doc.repair();
+    let probe = Probe::new();
+    let cfg = HostConfig {
+        addr: SocketAddr::from(([127, 0, 0, 1], 0)),
+        any_port_if_taken: false,
+        file: FILE.into(),
+        token: TOKEN.into(),
+        doc,
+        name: "Hana".into(),
+        limits: fast_limits(),
+        core: Limits::default(),
+    };
+    let mut host = Host::start(cfg, probe.inbox.clone()).unwrap();
+    let invite = Invite::new(host.addr().to_string(), FILE, TOKEN);
+
+    let mut guest_cfg = quick(GuestConfig::new(invite, "Ada".into()));
+    guest_cfg.limits = NetLimits { max_server_message: 1 << 20, ..fast_limits() };
+    let mut gp = Probe::new();
+    let _g = Guest::start(guest_cfg, gp.inbox.clone()).unwrap();
+    let too_large = TOO_LARGE_TO_JOIN.replace("{mb}", "1");
+    gp.wait("the file too large to join", |e| e.iter().any(|ev| matches!(ev, Event::Status(Status::Failed { reason }) if *reason == too_large)));
+    assert!(!welcomed(&gp.events));
+    host.stop();
+}
+
+/// How long a connection that never says hello stays open while `poke` sends it something every
+/// 300 ms (told whether it's the first time); `None`: still open after 6 s. A thread of its own
+/// reads the socket and notes when the host ends the stream, so pongs queued ahead of the close
+/// and a slow poke loop don't delay it.
+fn pre_hello_lifetime(mut poke: impl FnMut(&mut Raw, bool) -> bool) -> Option<Duration> {
+    let (mut host, _hp, invite) = start_with(NetLimits { hello_timeout: Duration::from_secs(1), ..fast_limits() }, Limits::default());
+    let addr: SocketAddr = invite.server.host.parse().unwrap();
+    let mut r = Raw::connect(addr);
+    let mut watch = r.0.get_ref().try_clone().unwrap();
+    let t0 = Instant::now();
+    let (ended_tx, ended) = std::sync::mpsc::channel();
+    let reader = std::thread::spawn(move || {
+        let mut buf = [0u8; 1024];
+        let until = Instant::now() + WAIT;
+        loop {
+            match watch.read(&mut buf) {
+                Ok(0) => break,
+                Ok(_) => {}
+                Err(e) if matches!(e.kind(), std::io::ErrorKind::WouldBlock | std::io::ErrorKind::TimedOut) && Instant::now() < until => {}
+                Err(_) => break,
+            }
+        }
+        let _ = ended_tx.send(Instant::now());
+    });
+    let (mut closed, mut first) = (None, true);
+    while t0.elapsed() < Duration::from_secs(6) {
+        if !poke(&mut r, std::mem::take(&mut first)) {
+            closed = Some(t0.elapsed());
+            break;
+        }
+        if let Ok(at) = ended.recv_timeout(Duration::from_millis(300)) {
+            closed = Some(at.saturating_duration_since(t0));
+            break;
+        }
+    }
+    host.stop();
+    let _ = reader.join();
+    closed
+}
+
+#[test]
+fn pings_do_not_keep_a_connection_without_a_hello_alive() {
+    let closed = pre_hello_lifetime(|r, _| r.0.send(Message::Ping(Bytes::new())).is_ok() && r.0.flush().is_ok());
+    assert!(closed.is_some_and(|t| t < Duration::from_secs(3)), "pinged pre-hello connection survived: {closed:?}");
+}
+
+#[test]
+fn a_hello_trickled_in_fragments_does_not_outlast_the_deadline() {
+    // A binary message begun and never finished: one masked byte per frame, each in time for the
+    // read timeout.
+    let closed = pre_hello_lifetime(|r, first| r.0.get_mut().write_all(&[if first { 0x02 } else { 0x00 }, 0x81, 0, 0, 0, 0, b'x']).is_ok());
+    assert!(closed.is_some_and(|t| t < Duration::from_secs(3)), "trickled pre-hello connection survived: {closed:?}");
+}
diff --git a/crates/collab-net/src/manage.rs b/crates/collab-net/src/manage.rs
index 6e995bdb..cfa3dceb 100644
--- a/crates/collab-net/src/manage.rs
+++ b/crates/collab-net/src/manage.rs
@@ -196,19 +196,27 @@ pub fn plugins(server: &Endpoint, key: &str, req: PluginReq, limits: &NetLimits,
     Ok(r)
 }
 
-/// A WebSocket to `server` that waits for answers up to the idle timeout (a large upload takes the
-/// server a while to keep).
+/// A WebSocket to `server` that waits for answers up to the request-reply timeout (a large upload
+/// takes the server a while to keep).
 fn connect(server: &Endpoint, limits: &NetLimits, timeout: Duration) -> Result<Ws, String> {
     let (stream, _, _) = open(server, timeout, limits)?;
     let (ws, _) = tungstenite::client::client_with_config(server.url(), stream, Some(config(limits.max_server_message)))
         .map_err(|e| format!("{} doesn't answer as a FigCraft server: {e}", server.display()))?;
-    ws.get_ref().set_read_timeout(Some(limits.idle_timeout)).map_err(|e| e.to_string())?;
+    // A publish uploads a whole file; a large project on a slow link can take several minutes to
+    // receive and answer. The wait uses `request_reply_timeout`, not the session `idle_timeout`.
+    ws.get_ref().set_read_timeout(Some(limits.request_reply_timeout)).map_err(|e| e.to_string())?;
     Ok(ws)
 }
 
-/// Close politely: read until the server's close arrives (or the socket ends), so it isn't lost.
+/// How long `close` waits for the server's close.
+const CLOSE_DRAIN: Duration = Duration::from_secs(2);
+
+/// Close politely: read until the server's close arrives (or the socket ends), so it isn't lost,
+/// but no longer than [`CLOSE_DRAIN`] (a server that keeps pinging, or goes quiet, would pin the
+/// loop).
 fn close(mut ws: Ws) {
     let _ = ws.close(None);
+    ws.get_mut().read_until(Some(std::time::Instant::now() + CLOSE_DRAIN));
     while ws.read().is_ok() {}
 }
 
@@ -240,3 +248,51 @@ fn reply<T>(ws: &mut Ws, limits: &NetLimits, pick: impl Fn(ServerMsg) -> Option<
         };
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Whether `close` returns within 3 s against a server that never answers the close and does
+    /// `serve` instead, with reads waiting up to `idle`.
+    fn closes_in_time(idle: Duration, serve: impl FnOnce(WebSocket<std::net::TcpStream>) + Send + 'static) -> bool {
+        let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
+        let addr = listener.local_addr().unwrap();
+        std::thread::spawn(move || {
+            let (s, _) = listener.accept().unwrap();
+            if let Ok(ws) = tungstenite::accept(s) {
+                serve(ws);
+            }
+        });
+        let limits = NetLimits { idle_timeout: idle, ..NetLimits::default() };
+        let server = Endpoint { host: addr.to_string(), path: "/".into(), secure: false };
+        let ws = connect(&server, &limits, Duration::from_secs(2)).unwrap();
+        let (tx, rx) = std::sync::mpsc::channel();
+        std::thread::spawn(move || {
+            close(ws);
+            let _ = tx.send(());
+        });
+        rx.recv_timeout(Duration::from_secs(3)).is_ok()
+    }
+
+    /// A server that keeps pinging and never answers the close must not pin `close` forever.
+    #[test]
+    fn close_returns_against_a_server_that_keeps_pinging() {
+        let pinging = closes_in_time(Duration::from_millis(300), |mut ws| {
+            while ws.send(Message::Ping(Bytes::new())).is_ok() {
+                std::thread::sleep(Duration::from_millis(10));
+            }
+        });
+        assert!(pinging, "close() kept draining a pinging server");
+    }
+
+    /// Nor one that goes quiet, however long the idle timeout.
+    #[test]
+    fn close_returns_against_a_silent_server() {
+        let silent = closes_in_time(Duration::from_secs(10), |ws| {
+            std::thread::sleep(Duration::from_secs(5));
+            drop(ws);
+        });
+        assert!(silent, "close() waited out the idle timeout");
+    }
+}
diff --git a/crates/collab-net/src/net.rs b/crates/collab-net/src/net.rs
index 8c841e9c..43e56001 100644
--- a/crates/collab-net/src/net.rs
+++ b/crates/collab-net/src/net.rs
@@ -33,14 +33,16 @@ pub struct Duplex {
     tls: Option<Tls>,
     /// What the bytes read count against (a server's reader), if anything.
     meter: Option<Meter>,
+    /// When reading must be over, however slowly the bytes come ([`Duplex::read_until`]).
+    deadline: Option<Instant>,
 }
 
 impl Duplex {
     /// Two handles on `stream` (for the reader and the writer) and one to shut it down with.
     pub fn split(stream: TcpStream, tls: Option<Tls>) -> io::Result<(Duplex, Duplex, TcpStream)> {
         let write = Arc::new(Mutex::new(stream.try_clone()?));
-        let a = Duplex { read: stream.try_clone()?, write: write.clone(), tls: tls.clone(), meter: None };
-        let b = Duplex { read: stream.try_clone()?, write, tls, meter: None };
+        let a = Duplex { read: stream.try_clone()?, write: write.clone(), tls: tls.clone(), meter: None, deadline: None };
+        let b = Duplex { read: stream.try_clone()?, write, tls, meter: None, deadline: None };
         Ok((a, b, stream))
     }
 
@@ -49,6 +51,12 @@ impl Duplex {
         self.meter = Some(meter);
     }
 
+    /// Reads on this handle fail once `deadline` passes, even when each one gets a few bytes in
+    /// time (a message trickled in can't outlast it). `None`: only the read timeout applies.
+    pub fn read_until(&mut self, deadline: Option<Instant>) {
+        self.deadline = deadline;
+    }
+
     /// What was read so far became a message (handed on): it no longer counts as being read.
     pub fn read_done(&mut self) {
         if let Some(m) = self.meter.as_mut() {
@@ -187,10 +195,25 @@ impl Duplex {
 
 impl Read for Duplex {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        let n = match &self.tls {
-            Some(t) => tls::read(t, &mut self.read, &self.write, buf),
-            None => self.read.read(buf),
-        }?;
+        let n = loop {
+            if let Some(d) = self.deadline {
+                let left = d.saturating_duration_since(Instant::now());
+                if left.is_zero() {
+                    return Err(io::ErrorKind::TimedOut.into());
+                }
+                self.read.set_read_timeout(Some(left))?;
+            }
+            let read = match &self.tls {
+                Some(t) => tls::read(t, &mut self.read, &self.write, buf),
+                None => self.read.read(buf),
+            };
+            match read {
+                // The socket's timeout can run out a moment before the deadline (it counts whole
+                // milliseconds): wait out the rest, so a read times out only once it has passed.
+                Err(e) if self.deadline.is_some() && matches!(e.kind(), io::ErrorKind::WouldBlock | io::ErrorKind::TimedOut) => {}
+                read => break read?,
+            }
+        };
         if let Some(m) = self.meter.as_mut() {
             m.add(n)?;
         }
diff --git a/crates/collab-net/src/sessions_tests.rs b/crates/collab-net/src/sessions_tests.rs
index 27523fce..4a2579f8 100644
--- a/crates/collab-net/src/sessions_tests.rs
+++ b/crates/collab-net/src/sessions_tests.rs
@@ -89,6 +89,9 @@ fn rect(s: &mut Session) -> u64 {
     s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 40, "height": 30})).unwrap()["id"].as_u64().unwrap()
 }
 
+/// Asserts two files are hosted and joined independently: each has its own port, session and
+/// edits, presence stays in its file's session, and closing one file's session leaves the
+/// other live.
 #[test]
 fn two_files_are_hosted_and_joined_independently() {
     let mut host = session("Hana");
@@ -123,8 +126,14 @@ fn two_files_are_hosted_and_joined_independently() {
     host.execute("doc.switch", &json!({"index": 0})).unwrap();
     assert_eq!(host.live_summary()["link"], a["link"]);
     assert_eq!(host.live_summary()["document"], 0);
+    // Each joined file opens in front when its welcome arrives, and the two joins race: the file
+    // whose welcome came last is in front.
+    assert_eq!(guest.ds().unwrap().uid, guest.docs[2].uid, "the file that arrived last is in front");
+    // Concurrent joins may complete in either order. Put B in front explicitly so the following
+    // assertions exercise A's background session independent of network timing.
+    guest.execute("doc.switch", &json!({"index": guest.docs.iter().position(|d| d.uid == gb).unwrap()})).unwrap();
+    assert_eq!(guest.ds().unwrap().uid, gb, "B is in front while A receives edits");
     // An edit in A reaches the guest's copy of A only, while B is in front at the guest.
-    assert_eq!(guest.ds().unwrap().uid, gb, "the file joined last is in front");
     let in_a = rect(&mut host);
     host.execute("doc.switch", &json!({"index": 1})).unwrap();
     let in_b = rect(&mut host);
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 89a79687..ed85201d 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -13,6 +13,7 @@ figcraft-doc = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
+chrono = { workspace = true }
 imbl = { workspace = true }
 base64 = { workspace = true }
 postcard = { workspace = true }
diff --git a/crates/collab/src/board_sync_tests.rs b/crates/collab/src/board_sync_tests.rs
new file mode 100644
index 00000000..3dbff8bb
--- /dev/null
+++ b/crates/collab/src/board_sync_tests.rs
@@ -0,0 +1,45 @@
+//! Boards sync: the file kind reaches joiners in their snapshot, and a layer's board metadata (a
+//! connector's ends, a sticky's author) syncs as one property, through both encodings.
+
+use figcraft_doc::{BoardItem, Connector, Document, End, FileKind, NodeKind, Routing, Side};
+
+use crate::change::{Change, DocProp, Prop};
+use crate::replica::{Mode, Replica};
+use crate::{diff, message};
+
+#[test]
+fn a_boards_kind_and_its_objects_metadata_sync() {
+    let mut doc = Document::new("Board");
+    doc.kind = FileKind::Board;
+    let page = doc.first_page().unwrap();
+    let a = doc.create(page, NodeKind::Frame, "Sticky", 0.0, 0.0, 200.0, 200.0).unwrap();
+    doc.node_mut(a).unwrap().board = Some(BoardItem::Sticky { author: "Ada".into() });
+    let host = Replica::new(doc);
+    // A joiner's copy, built from the snapshot, is a board with the sticky's metadata.
+    let snap = host.snapshot().unwrap();
+    assert!(snap.iter().any(|c| matches!(c, Change::SetDoc { prop: DocProp::Kind, .. })));
+    let joiner = Replica::from_snapshot(&snap).unwrap();
+    assert_eq!(joiner.document().kind, FileKind::Board);
+    assert_eq!(joiner.document().node(a).unwrap().board, host.document().node(a).unwrap().board);
+    // Re-attaching a connector's end is one property write, the same after the wire.
+    let mut edited = host.document().clone();
+    let c = edited.create(page, NodeKind::Vector { network: Default::default() }, "Connector", 0.0, 0.0, 1.0, 1.0).unwrap();
+    edited.node_mut(c).unwrap().board = Some(BoardItem::Connector(Connector {
+        from: End::Node { node: a, side: Side::Auto },
+        to: End::Point { x: 5.0, y: 5.0 },
+        routing: Routing::Elbow,
+    }));
+    let mut r = host.clone();
+    r.apply(&diff(&host, &edited).unwrap().changes, Mode::Strict).unwrap();
+    let mut moved = r.document().clone();
+    moved.node_mut(c).unwrap().board = Some(BoardItem::Connector(Connector {
+        from: End::Node { node: a, side: Side::Top },
+        to: End::Point { x: 9.0, y: 1.0 },
+        routing: Routing::Straight,
+    }));
+    let d = diff(&r, &moved).unwrap();
+    assert!(matches!(d.changes.as_slice(), [Change::Set { prop: Prop::Board, .. }]), "{:?}", d.changes);
+    let wire: Vec<Change> = message::decode(&message::encode(&d.changes).unwrap(), usize::MAX).unwrap();
+    r.apply(&wire, Mode::Strict).unwrap();
+    assert_eq!(r.document(), &moved);
+}
diff --git a/crates/collab/src/change.rs b/crates/collab/src/change.rs
index 32a49184..7977f83a 100644
--- a/crates/collab/src/change.rs
+++ b/crates/collab/src/change.rs
@@ -87,8 +87,9 @@ macro_rules! node_props {
     ($($variant:ident => $field:ident),* $(,)?) => {
         /// A node property: the tree position (`parent`, `position`) or one saved field of
         /// [`Node`]. List-valued fields (fills, text runs, vector networks…) are one property each,
-        /// replaced whole (three-way merges line fills, strokes and effects up item by item, see
-        /// [`merge`](crate::merge)). New properties go at the end (the binary form numbers them).
+        /// replaced whole (three-way merges line the lists whose items stand on their own, such as
+        /// fills, up item by item, see [`merge`](crate::merge)). New properties go at the end (the
+        /// binary form numbers them).
         #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
         #[serde(rename_all = "camelCase")]
         pub enum Prop {
@@ -180,6 +181,8 @@ node_props! {
     Annotations => annotations,
     CodeLinks => code_links,
     DevResources => dev_resources,
+    Measurements => measurements,
+    Board => board,
 }
 
 /// A document-level property. Lists of entries with ids (styles, comments, variable collections,
@@ -218,6 +221,12 @@ pub enum DocProp {
     Variables,
     /// Variable ids in order.
     VariableOrder,
+    /// A design file or a board.
+    Kind,
+    /// A board's countdown (`null`: none).
+    Timer,
+    /// A board's vote (`null`: none); the ballots are [`Entry::Ballot`]s.
+    Vote,
 }
 
 /// A document-level entry, by id.
@@ -237,6 +246,8 @@ pub enum Entry {
     DevSnapshot(NodeId),
     /// An image by content hash (value: `{width, height, bytes}` with the encoded bytes in base64).
     Image(String),
+    /// A voter's ballot in a board's vote (value: the layer ids voted on).
+    Ballot(String),
 }
 
 /// One synced value a change writes: a node property, a document-level property or a
@@ -310,7 +321,7 @@ impl Entry {
             Entry::Variable(id) => Some(id_space(id, VARIABLE_ID_PREFIX)),
             Entry::Collection(id) => Some(id_space(id, COLLECTION_ID_PREFIX)),
             Entry::Comment(id) => Some(space_of(*id)),
-            Entry::DevSnapshot(_) | Entry::Image(_) => None,
+            Entry::DevSnapshot(_) | Entry::Image(_) | Entry::Ballot(_) => None,
         }
     }
 
@@ -323,6 +334,7 @@ impl Entry {
             Entry::Variable(id) => format!("variable {id}"),
             Entry::DevSnapshot(id) => format!("ready-for-dev snapshot of {id}"),
             Entry::Image(hash) => format!("image {hash}"),
+            Entry::Ballot(voter) => format!("ballot of {voter}"),
         }
     }
 
@@ -333,7 +345,7 @@ impl Entry {
             Entry::Comment(_) => Some(Family::Comments),
             Entry::Collection(_) => Some(Family::Collections),
             Entry::Variable(_) => Some(Family::Variables),
-            Entry::DevSnapshot(_) | Entry::Image(_) => None,
+            Entry::DevSnapshot(_) | Entry::Image(_) | Entry::Ballot(_) => None,
         }
     }
 }
diff --git a/crates/collab/src/client.rs b/crates/collab/src/client.rs
index 8f2a9841..a84a4ffd 100644
--- a/crates/collab/src/client.rs
+++ b/crates/collab/src/client.rs
@@ -41,6 +41,8 @@ pub struct Client {
     /// The session joined (see [`ServerMsg::Welcome`]).
     session: u64,
     id: u32,
+    /// What this client resumes its id with (see [`Resume::secret`]).
+    secret: u64,
     /// The server's state as of `seq`.
     confirmed: Replica,
     seq: u64,
@@ -84,7 +86,7 @@ impl Client {
 
     /// Start from the server's `Welcome` (which must carry a snapshot).
     pub fn join(welcome: ServerMsg) -> Result<Client, Error> {
-        let ServerMsg::Welcome { session, client_id, seq, catch_up: CatchUp::Snapshot(snapshot), processed, peers, access } = welcome else {
+        let ServerMsg::Welcome { session, client_id, seq, catch_up: CatchUp::Snapshot(snapshot), processed, peers, access, secret } = welcome else {
             return Err(Error::Protocol("expected a welcome with the document".into()));
         };
         let mut confirmed = Replica::from_snapshot(&snapshot)?;
@@ -93,6 +95,7 @@ impl Client {
         Ok(Client {
             session,
             id: client_id,
+            secret,
             view: confirmed.clone(),
             confirmed,
             seq,
@@ -415,9 +418,10 @@ impl Client {
         ClientMsg::Hello(Hello { resume: Some(self.resume()), ..hello })
     }
 
-    /// What a reconnect resumes with: this client's session, id and last sequence number.
+    /// What a reconnect resumes with: this client's session, id, last sequence number and the
+    /// secret its id was given with.
     pub fn resume(&self) -> Resume {
-        Resume { session: self.session, client_id: self.id, seq: self.seq }
+        Resume { session: self.session, client_id: self.id, seq: self.seq, secret: self.secret }
     }
 
     /// Handle a message from the server. Returns messages to send: batches that were waiting for
@@ -458,10 +462,11 @@ impl Client {
                 Ok(Vec::new())
             }
             ServerMsg::Welcome { .. } if self.online => Err(Error::Protocol("already joined".into())),
-            ServerMsg::Welcome { session, client_id, seq, catch_up, processed, peers, access } => {
+            ServerMsg::Welcome { session, client_id, seq, catch_up, processed, peers, access, secret } => {
                 if session != self.session || client_id != self.id {
-                    return self.restart(ServerMsg::Welcome { session, client_id, seq, catch_up, processed, peers, access });
+                    return self.restart(ServerMsg::Welcome { session, client_id, seq, catch_up, processed, peers, access, secret });
                 }
+                self.secret = secret;
                 self.access = access;
                 self.rejoin(seq, catch_up, &processed, peers, recompute)
             }
diff --git a/crates/collab/src/code.rs b/crates/collab/src/code.rs
index c046682a..6eebe9f7 100644
--- a/crates/collab/src/code.rs
+++ b/crates/collab/src/code.rs
@@ -135,7 +135,7 @@ impl Local {
         let query = link.strip_prefix("figcraft://join?")?;
         let get = |key: &str| query.split('&').find_map(|kv| kv.split_once('=').filter(|(k, _)| *k == key).map(|(_, v)| v));
         let addr: std::net::SocketAddrV4 = get("host")?.parse().ok()?;
-        let hex = get("token")?.strip_prefix(TOKEN_PREFIX).filter(|h| h.len() == 11)?;
+        let hex = get("token")?.strip_prefix(TOKEN_PREFIX).filter(|h| h.len() == 11 && h.bytes().all(|b| b.is_ascii_hexdigit()))?;
         let local = Local { ip: *addr.ip(), port: addr.port(), secret: u64::from_str_radix(hex, 16).ok()? };
         (get("file") == Some(LOCAL_FILE) && local.port != 0).then_some(local)
     }
diff --git a/crates/collab/src/code_tests.rs b/crates/collab/src/code_tests.rs
index 2dd902b3..31bd3488 100644
--- a/crates/collab/src/code_tests.rs
+++ b/crates/collab/src/code_tests.rs
@@ -104,6 +104,7 @@ fn only_local_session_links_have_a_code() {
         "figcraft://join?host=[::1]:47900&file=local&token=local-0123456789a",
         "figcraft://join?host=192.168.1.20:0&file=local&token=local-0123456789a",
         "figcraft://join?host=192.168.1.20:47900&file=local&token=local-0123456789az",
+        "figcraft://join?host=10.0.0.1:47900&file=local&token=local-+0000000001",
         "figcraft://join?server=wss://example.org/&file=local&token=local-0123456789a",
         "ws://192.168.1.20:47900/?file=local&token=local-0123456789a",
         "",
diff --git a/crates/collab/src/codec_tests.rs b/crates/collab/src/codec_tests.rs
index 9f5d12fb..e4b48aac 100644
--- a/crates/collab/src/codec_tests.rs
+++ b/crates/collab/src/codec_tests.rs
@@ -11,6 +11,16 @@ use crate::message::{
 use crate::sim::Rng;
 use crate::{Error, Replica, diff};
 
+#[test]
+fn encoding_into_a_prefix_keeps_the_wire_body() {
+    let msg = moved_layer();
+    let prefix = b"container header".to_vec();
+    let bytes = crate::message::encode_into(&msg, prefix.clone()).unwrap();
+    assert_eq!(&bytes[..prefix.len()], prefix);
+    assert_eq!(&bytes[prefix.len()..], encode(&msg).unwrap());
+    assert_eq!(decode::<ClientMsg>(&bytes[prefix.len()..], bytes.len()).unwrap(), msg);
+}
+
 /// A typical edit: one layer dragged (its transform).
 fn moved_layer() -> ClientMsg {
     let mut doc = Document::new("f");
@@ -38,7 +48,7 @@ fn samples() -> (Vec<ClientMsg>, Vec<ServerMsg>) {
             name: "Ada".into(),
             color: "#FF8800".into(),
             client_version: "0.2.0".into(),
-            resume: Some(Resume { session: 77, client_id: 4, seq: 10 }),
+            resume: Some(Resume { session: 77, client_id: 4, seq: 10, secret: 0x5EC2E7 }),
         }),
         moved_layer(),
         cursor(),
@@ -102,6 +112,7 @@ fn samples() -> (Vec<ClientMsg>, Vec<ServerMsg>) {
             processed: Processed::default(),
             peers: vec![peer.clone()],
             access: Access::Edit,
+            secret: 0x5EC2E7,
         },
         ServerMsg::Welcome {
             session: 77,
@@ -111,6 +122,7 @@ fn samples() -> (Vec<ClientMsg>, Vec<ServerMsg>) {
             processed: Processed { last_batch: 7, refused: vec![3, 6] },
             peers: vec![],
             access: Access::View,
+            secret: 1,
         },
         ServerMsg::Changes(Accepted { seq: 11, author: 4, batch_id: 2, changes: vec![set.clone(), Change::Delete { id: NodeId(5) }] }),
         ServerMsg::Reject { batch_id: 3, reason: "no".into(), fixes: vec![set] },
diff --git a/crates/collab/src/docprops.rs b/crates/collab/src/docprops.rs
index 535c333e..24a604ff 100644
--- a/crates/collab/src/docprops.rs
+++ b/crates/collab/src/docprops.rs
@@ -132,18 +132,15 @@ impl<T: Keyed> List<T> {
         let keys: Vec<T::Key> = value.read("order")?;
         let list = (self.get_mut)(doc);
         let mut slots: Vec<Option<T>> = std::mem::take(list).into_iter().map(Some).collect();
-        let mut at: BTreeMap<T::Key, Vec<usize>> = BTreeMap::new();
+        let mut at: BTreeMap<T::Key, std::collections::VecDeque<usize>> = BTreeMap::new();
         for (i, e) in slots.iter().enumerate() {
             if let Some(e) = e {
-                at.entry(e.key()).or_default().push(i);
+                at.entry(e.key()).or_default().push_back(i);
             }
         }
         for k in keys {
             let Some(idx) = at.get_mut(&k) else { continue };
-            if idx.is_empty() {
-                continue;
-            }
-            let i = idx.remove(0);
+            let Some(i) = idx.pop_front() else { continue };
             if let Some(e) = slots.get_mut(i).and_then(Option::take) {
                 list.push(e);
             }
@@ -213,6 +210,9 @@ doc_scalars! {
     ImagePresets => image_presets,
     AnnotationCategories => annotation_categories,
     Libraries => libraries,
+    Kind => kind,
+    Timer => timer,
+    Vote => vote,
 }
 
 /// Keyed maps (no order): changed and added entries are put, missing ones removed.
@@ -252,7 +252,8 @@ pub(crate) fn diff(a: &Document, b: &Document, out: &mut Vec<Change>) -> Result<
         |k| Entry::Image(k.clone()),
         image_json,
         out,
-    )
+    )?;
+    diff_map(&a.votes, &b.votes, |x, y| x == y, |k| Entry::Ballot(k.clone()), Json::of, out)
 }
 
 /// Apply a document-level change. Returns whether it can change which pages are listed (the
@@ -288,6 +289,9 @@ pub(crate) fn apply(doc: &mut Document, change: &Change) -> Result<bool, Error>
                 let img = image_of(value)?;
                 doc.images.insert(k.clone(), img);
             }
+            Entry::Ballot(k) => {
+                doc.votes.insert(k.clone(), value.read("ballot")?);
+            }
         },
         Change::Remove { entry } => match entry {
             Entry::Style(k) => STYLES.remove(doc, k),
@@ -300,6 +304,9 @@ pub(crate) fn apply(doc: &mut Document, change: &Change) -> Result<bool, Error>
             Entry::Image(k) => {
                 doc.images.remove(k);
             }
+            Entry::Ballot(k) => {
+                doc.votes.remove(k);
+            }
         },
         _ => return Err(Error::Invalid("not a document-level change".into())),
     }
@@ -336,6 +343,7 @@ pub(crate) fn entry_value(doc: &Document, entry: &Entry) -> Result<Option<Json>,
         Entry::Variable(k) => doc.variables.variables.iter().find(|v| v.id == *k).map(Json::of),
         Entry::DevSnapshot(k) => doc.dev_snapshots.get(k).map(|s| Json::of(s.as_ref())),
         Entry::Image(k) => doc.images.get(k).map(image_json),
+        Entry::Ballot(k) => doc.votes.get(k).map(Json::of),
     };
     value.transpose()
 }
@@ -349,6 +357,7 @@ pub(crate) fn has(doc: &Document, entry: &Entry) -> bool {
         Entry::Variable(k) => doc.variables.variables.iter().any(|v| v.id == *k),
         Entry::DevSnapshot(k) => doc.dev_snapshots.contains_key(k),
         Entry::Image(k) => doc.images.contains_key(k),
+        Entry::Ballot(k) => doc.votes.contains_key(k),
     }
 }
 
diff --git a/crates/collab/src/lib.rs b/crates/collab/src/lib.rs
index 2c693bc4..fa271f35 100644
--- a/crates/collab/src/lib.rs
+++ b/crates/collab/src/lib.rs
@@ -123,6 +123,8 @@ impl Recompute for NoRecompute {
     fn recompute(&self, _: &mut Document, _: &Document, _: &BTreeSet<NodeId>) {}
 }
 
+#[cfg(test)]
+mod board_sync_tests;
 #[cfg(test)]
 mod client_tests;
 #[cfg(test)]
diff --git a/crates/collab/src/merge.rs b/crates/collab/src/merge.rs
index bb18e661..9c21a56a 100644
--- a/crates/collab/src/merge.rs
+++ b/crates/collab/src/merge.rs
@@ -4,12 +4,14 @@
 //!
 //! A conflict is the same property (or document-level entry) changed on both sides to different
 //! values, or a layer deleted on one side while the other side edited it or something inside it
-//! (including adding layers to it or moving layers into or out of it). Fills, strokes and effects
-//! merge item by item: both sides changing different items of the list (or one adding items at its
-//! end) is no conflict, only the same item changed both ways or the list shortened on a side
-//! while the other changed it. Nothing that conflicts is
-//! merged until it is resolved: each conflict is resolved for one side, and the other side's
-//! changes to it are left out. Everything else from both sides is kept.
+//! (including adding layers to it or moving layers into or out of it). The layer lists whose items
+//! stand on their own (fills, strokes, effects, layout grids, export settings, guides, prototype
+//! interactions, accessibility annotations, Dev Mode resources and measurements) merge item by
+//! item: both sides changing different items of the list (or one adding items at its end) is no
+//! conflict, only the same item changed both ways or the list shortened on a side while the other
+//! changed it. Nothing that conflicts is merged until it is resolved: each conflict is resolved for
+//! one side, and the other side's changes to it are left out. Everything else from both sides is
+//! kept.
 
 use std::collections::{BTreeMap, BTreeSet};
 use std::fmt;
@@ -90,6 +92,7 @@ impl fmt::Display for Key {
                 Entry::Variable(k) => write!(f, "variable/{k}"),
                 Entry::DevSnapshot(k) => write!(f, "devSnapshot/{k}"),
                 Entry::Image(k) => write!(f, "image/{k}"),
+                Entry::Ballot(k) => write!(f, "ballot/{k}"),
             },
         }
     }
@@ -159,8 +162,24 @@ fn by_key(changes: &[Change]) -> BTreeMap<Key, Vec<usize>> {
     out
 }
 
-/// List properties whose items merge one by one.
-const PER_ITEM: &[Prop] = &[Prop::Fills, Prop::Strokes, Prop::Effects];
+/// List properties whose items merge one by one: the items stand on their own, so both sides
+/// changing different ones (or one side adding at its end) is no conflict. Sets and keyed maps
+/// (`bound`, `varModes`, `overrides`, `propRefs`, `pluginData`) are not here: their items line up
+/// by key, not by position.
+const PER_ITEM: &[Prop] = &[
+    Prop::Fills,
+    Prop::Strokes,
+    Prop::Effects,
+    Prop::Grids,
+    Prop::Exports,
+    Prop::Guides,
+    Prop::Interactions,
+    Prop::Annotations,
+    // Not `CodeLinks`: there is one per language, and lining them up by position could leave two
+    // for one language (the second hidden), so they merge whole.
+    Prop::DevResources,
+    Prop::Measurements,
+];
 
 /// Both sides' writes `b` and `m` of list property `key` merged item by item against the base
 /// (see [`merge_items`]); `None` when `key` isn't such a list or the writes conflict.
diff --git a/crates/collab/src/merge_list_tests.rs b/crates/collab/src/merge_list_tests.rs
index 436e6b6f..e92f6bbb 100644
--- a/crates/collab/src/merge_list_tests.rs
+++ b/crates/collab/src/merge_list_tests.rs
@@ -1,8 +1,10 @@
-//! Fills, strokes and effects merge item by item: different items changed on each side merge,
-//! the same item changed both ways conflicts.
+//! The layer lists whose items stand on their own (fills, strokes, effects, layout grids, export
+//! settings, guides, prototype interactions, accessibility annotations and Dev Mode resources)
+//! merge item by item: different items changed on each side merge, the same item changed both ways
+//! conflicts.
 
 use figcraft_color::{Color, Paint};
-use figcraft_doc::{Document, Effect, NodeId, NodeKind};
+use figcraft_doc::{Document, Effect, LayoutGrid, NodeId, NodeKind, proto};
 use serde_json::{Value, json};
 
 use crate::merge::{Key, Side, merge_items, plan};
@@ -100,19 +102,113 @@ fn the_same_item_changed_both_ways_conflicts() {
 }
 
 #[test]
-fn other_lists_still_conflict_as_a_whole() {
-    // Docs silent: lists other than fills, strokes and effects (export settings here) still
-    // conflict whole when both sides change them.
+fn the_other_item_lists_merge_one_by_one_too() {
+    // Layout grids, export settings, guides, accessibility annotations and Dev Mode resources are
+    // item lists like fills: both sides changing different items merges.
     let (mut base, _, _, r) = files();
     let export = |suffix: &str| figcraft_doc::ExportSetting { suffix: suffix.into(), ..Default::default() };
-    base.get_mut(r).unwrap().exports = vec![export("@1"), export("@2")];
+    let guide = |vertical: bool, offset: f64| figcraft_doc::Guide { vertical, offset };
+    let annot = |label: &str| figcraft_doc::Annotation { label: label.into(), properties: Vec::new(), category: None };
+    let grid = |size: f64| LayoutGrid { size, ..Default::default() };
+    let res = |url: &str| figcraft_doc::DevResource { url: url.into(), name: String::new() };
+    let n = base.get_mut(r).unwrap();
+    n.exports = vec![export("@1"), export("@2")];
+    n.guides = vec![guide(true, 10.0), guide(false, 20.0)];
+    n.annotations = vec![annot("a1"), annot("a2")];
+    n.grids = vec![grid(10.0), grid(20.0)];
+    n.dev_resources = vec![res("https://a.test"), res("https://b.test")];
     let (mut branch, mut main) = (base.clone(), base.clone());
     branch.set_client_id(base.highest_id_space() + 1);
-    branch.get_mut(r).unwrap().exports[0] = export("@b");
-    main.get_mut(r).unwrap().exports[1] = export("@m");
+    // The branch changes the first item of each list; main the second.
+    let b = branch.get_mut(r).unwrap();
+    (b.exports[0].suffix, b.guides[0].offset, b.annotations[0].label, b.grids[0].size, b.dev_resources[0].url) =
+        ("@b".into(), 11.0, "b1".into(), 12.0, "https://branch.test".into());
+    let m = main.get_mut(r).unwrap();
+    (m.exports[1].suffix, m.guides[1].offset, m.annotations[1].label, m.grids[1].size, m.dev_resources[1].url) =
+        ("@m".into(), 22.0, "m2".into(), 24.0, "https://main.test".into());
+    both_ways(&base, &branch, &main, |doc| {
+        let n = doc.node(r).unwrap();
+        let suffixes: Vec<&str> = n.exports.iter().map(|e| e.suffix.as_str()).collect();
+        assert_eq!(suffixes, ["@b", "@m"], "export settings");
+        let offsets: Vec<f64> = n.guides.iter().map(|g| g.offset).collect();
+        assert_eq!(offsets, [11.0, 22.0], "guides");
+        let labels: Vec<&str> = n.annotations.iter().map(|a| a.label.as_str()).collect();
+        assert_eq!(labels, ["b1", "m2"], "annotations");
+        let sizes: Vec<f64> = n.grids.iter().map(|g| g.size).collect();
+        assert_eq!(sizes, [12.0, 24.0], "layout grids");
+        let urls: Vec<&str> = n.dev_resources.iter().map(|d| d.url.as_str()).collect();
+        assert_eq!(urls, ["https://branch.test", "https://main.test"], "dev resources");
+    });
+}
+
+#[test]
+fn the_same_item_of_another_list_changed_both_ways_conflicts() {
+    let (mut base, _, _, r) = files();
+    let link = |language: &str| figcraft_doc::CodeLink { language: language.into(), ..Default::default() };
+    let n = base.get_mut(r).unwrap();
+    n.exports = vec![
+        figcraft_doc::ExportSetting { suffix: "@1".into(), ..Default::default() },
+        figcraft_doc::ExportSetting { suffix: "@2".into(), ..Default::default() },
+    ];
+    n.code_links = vec![link("react"), link("vue")];
+    let (mut branch, mut main) = (base.clone(), base.clone());
+    branch.set_client_id(base.highest_id_space() + 1);
+    branch.get_mut(r).unwrap().exports[0].suffix = "@b".into();
+    main.get_mut(r).unwrap().exports[0].suffix = "@m".into();
+    // Code links are one per language, not an item list: different links changed still conflict.
+    branch.get_mut(r).unwrap().code_links[0].name = "B".into();
+    main.get_mut(r).unwrap().code_links[1].name = "M".into();
     let p = plan(&base, &branch, &main).unwrap();
-    let keys: Vec<String> = p.conflicts.iter().map(|c| c.key.to_string()).collect();
-    assert_eq!(keys, [format!("{r}/exports")]);
+    let mut keys: Vec<String> = p.conflicts.iter().map(|c| c.key.to_string()).collect();
+    keys.sort();
+    let mut want = [format!("{r}/codeLinks"), format!("{r}/exports")];
+    want.sort();
+    assert_eq!(keys, want);
+}
+
+#[test]
+fn interactions_merge_item_by_item() {
+    let ia = |duration_ms: u32| proto::Interaction {
+        trigger: Default::default(),
+        actions: vec![proto::Action::Back],
+        transition: Default::default(),
+        duration_ms,
+        easing: Default::default(),
+        delay_ms: 0,
+    };
+    let durations = |doc: &Document, r: NodeId| doc.node(r).unwrap().interactions.iter().map(|i| i.duration_ms).collect::<Vec<_>>();
+    let (mut base, _, _, r) = files();
+    base.get_mut(r).unwrap().interactions = vec![ia(100), ia(200)];
+    let fork = || {
+        let (mut branch, main) = (base.clone(), base.clone());
+        branch.set_client_id(base.highest_id_space() + 1);
+        (branch, main)
+    };
+    // The branch changes the first interaction and adds one; main changes the second.
+    let (mut branch, mut main) = fork();
+    branch.get_mut(r).unwrap().interactions[0].duration_ms = 150;
+    branch.get_mut(r).unwrap().interactions.push(ia(300));
+    main.get_mut(r).unwrap().interactions[1].duration_ms = 250;
+    both_ways(&base, &branch, &main, |doc| assert_eq!(durations(doc, r), [150, 250, 300]));
+    // The branch deletes one while main leaves them alone.
+    let (mut branch, mut main) = fork();
+    branch.get_mut(r).unwrap().interactions.remove(0);
+    main.get_mut(r).unwrap().fills[0] = red();
+    both_ways(&base, &branch, &main, |doc| assert_eq!(durations(doc, r), [200]));
+    // The same interaction changed both ways, or one deleted while the other side changed the
+    // list, conflicts.
+    for delete in [false, true] {
+        let (mut branch, mut main) = fork();
+        if delete {
+            branch.get_mut(r).unwrap().interactions.remove(0);
+        } else {
+            branch.get_mut(r).unwrap().interactions[1].duration_ms = 220;
+        }
+        main.get_mut(r).unwrap().interactions[1].duration_ms = 250;
+        let p = plan(&base, &branch, &main).unwrap();
+        let keys: Vec<String> = p.conflicts.iter().map(|c| c.key.to_string()).collect();
+        assert_eq!(keys, [format!("{r}/interactions")], "delete: {delete}");
+    }
 }
 
 #[test]
diff --git a/crates/collab/src/message.rs b/crates/collab/src/message.rs
index d035042b..a6346162 100644
--- a/crates/collab/src/message.rs
+++ b/crates/collab/src/message.rs
@@ -94,6 +94,10 @@ pub struct Resume {
     pub client_id: u32,
     /// The last sequence number it applied.
     pub seq: u64,
+    /// The secret the server gave with this client id ([`ServerMsg::Welcome`]'s `secret`): only
+    /// the client the id was given to can resume it (0: none).
+    #[serde(default)]
+    pub secret: u64,
 }
 
 /// Someone in the session.
@@ -635,7 +639,8 @@ pub enum ServerMsg {
     /// Joined: the session's identity (a server that restarted without its saved state is a new
     /// session), this connection's client id, the current sequence number, the document (or the
     /// batches missed since a reconnecting client's last sequence number), what the server did
-    /// with this client's batches so far, who else is here and what this client may do.
+    /// with this client's batches so far, who else is here, what this client may do and the
+    /// secret it resumes its id with ([`Resume::secret`]; only this client is told).
     Welcome {
         session: u64,
         client_id: u32,
@@ -644,6 +649,8 @@ pub enum ServerMsg {
         processed: Processed,
         peers: Vec<Peer>,
         access: Access,
+        #[serde(default)]
+        secret: u64,
     },
     /// Accepted changes, in order, to everyone (the author's own come back as confirmation).
     Changes(Accepted),
@@ -696,31 +703,49 @@ pub enum ServerMsg {
     },
 }
 
+/// (days since 1970-01-01, seconds-of-day, nanos) → (proleptic Gregorian year, the same wall-clock
+/// instant moved into chrono's range by whole 400-year cycles). The calendar repeats every 400
+/// years (146_097 days), so month, day and time of day come from chrono and only the year is
+/// carried, which keeps the result exact for any `i64` day count. This is not hand-rolled calendar
+/// math: chrono still does the date, the cycle count just shifts the year.
+fn utc_parts(days: i64, sod: u32, nanos: u32) -> (i64, chrono::NaiveDateTime) {
+    use chrono::Datelike;
+    let (cycles, rest) = (days.div_euclid(146_097), days.rem_euclid(146_097));
+    // `rest + 719_163` (1970-01-01 is CE day 719_163) is always a valid CE day, and `sod` < 86_400.
+    let date = i32::try_from(rest + 719_163).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+    let time = chrono::NaiveTime::from_num_seconds_from_midnight_opt(sod.min(86_399), nanos.min(999_999_999));
+    match (date, time) {
+        (Some(d), Some(t)) => {
+            let y = i128::from(d.year()) + i128::from(cycles) * 400;
+            (i64::try_from(y).unwrap_or(if y < 0 { i64::MIN } else { i64::MAX }), d.and_time(t))
+        }
+        _ => (1970, chrono::NaiveDateTime::default()), // unreachable
+    }
+}
+
 /// `YYYY-MM-DD HH:MM UTC` for seconds since 1970 (how servers and apps show the times in these
-/// messages).
+/// messages). Years past chrono's own range (262143) keep converting: the instant is moved into
+/// range by whole 400-year cycles and the real year restored, so every `u64` reads as the date the
+/// old hand-rolled conversion produced (e.g. `u64::MAX` → `584554051223-11-09 07:00 UTC`).
 pub fn utc_date(secs: u64) -> String {
-    let days = i64::try_from(secs / 86_400).unwrap_or(0);
-    let (h, m) = ((secs % 86_400) / 3600, (secs % 3600) / 60);
-    // Days to a civil date (proleptic Gregorian).
-    let z = days + 719_468;
-    let era = z.div_euclid(146_097);
-    let doe = z.rem_euclid(146_097);
-    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let d = doy - (153 * mp + 2) / 5 + 1;
-    let mo = if mp < 10 { mp + 3 } else { mp - 9 };
-    let y = yoe + era * 400 + i64::from(mo <= 2);
-    format!("{y:04}-{mo:02}-{d:02} {h:02}:{m:02} UTC")
+    // The day count of any `u64` seconds fits in `i64` (`u64::MAX / 86_400` ≈ 2.1e14), and the
+    // seconds-of-day is < 86_400, so the conversion is always exact (no epoch fallback). Splitting
+    // with `u64` arithmetic (as the old code did) avoids the `i64` seconds overflow near `u64::MAX`.
+    let (days, sod) = (i64::try_from(secs / 86_400).unwrap_or(i64::MAX), (secs % 86_400) as u32);
+    let (y, t) = utc_parts(days, sod, 0);
+    // `{y:04}` rather than `%Y`, which writes a `+` before years past 9999 (the old code did not).
+    format!("{y:04}-{}", t.format("%m-%d %H:%M UTC"))
 }
 
 /// The binary form of `msg`: [`WIRE_VERSION`], then postcard.
 pub fn encode<T: Serialize>(msg: &T) -> Result<Vec<u8>, Error> {
-    let body = postcard::to_allocvec(msg).map_err(|e| Error::Encode(e.to_string()))?;
-    let mut out = Vec::with_capacity(body.len() + 1);
-    out.push(WIRE_VERSION);
-    out.extend(body);
-    Ok(out)
+    encode_into(msg, Vec::new())
+}
+
+/// Append the binary form of `msg` to an owned prefix, without a second payload-sized buffer.
+pub fn encode_into<T: Serialize>(msg: &T, mut prefix: Vec<u8>) -> Result<Vec<u8>, Error> {
+    prefix.push(WIRE_VERSION);
+    postcard::to_extend(msg, prefix).map_err(|e| Error::Encode(e.to_string()))
 }
 
 /// Read a binary message of at most `max_bytes` (untrusted input: never panics, allocates at most
@@ -752,3 +777,25 @@ pub fn decode_json<T: DeserializeOwned>(text: &str, max_bytes: usize) -> Result<
     }
     serde_json::from_str(text).map_err(|e| Error::Decode(e.to_string()))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// `utc_date` keeps the exact `YYYY-MM-DD HH:MM UTC` output the hand-rolled civil-from-days
+    /// code produced (leap days and all).
+    #[test]
+    fn utc_date_formats_seconds_since_1970() {
+        assert_eq!(utc_date(0), "1970-01-01 00:00 UTC");
+        assert_eq!(utc_date(1_000_000), "1970-01-12 13:46 UTC");
+        assert_eq!(utc_date(951_782_400), "2000-02-29 00:00 UTC");
+        assert_eq!(utc_date(1_709_164_800), "2024-02-29 00:00 UTC");
+        assert_eq!(utc_date(1_791_208_980), "2026-10-05 14:03 UTC");
+        // A year past 9999 keeps the plain zero-padded year (no `+`), as the old `{y:04}` did.
+        assert_eq!(utc_date(253_402_300_800), "10000-01-01 00:00 UTC");
+        // Past chrono's own year range (262143) the instant is moved into range by whole 400-year
+        // cycles and the real year restored, so it keeps the old hand-rolled output instead of
+        // falling back to the epoch.
+        assert_eq!(utc_date(u64::MAX), "584554051223-11-09 07:00 UTC");
+    }
+}
diff --git a/crates/collab/src/reconnect_tests.rs b/crates/collab/src/reconnect_tests.rs
index 95ebbb2b..5c7c4205 100644
--- a/crates/collab/src/reconnect_tests.rs
+++ b/crates/collab/src/reconnect_tests.rs
@@ -253,3 +253,22 @@ fn random_drops_and_reconnects_converge() {
     }
     assert!(snapshots > 0, "no reconnect needed a snapshot");
 }
+
+#[test]
+fn resume_needs_the_issued_secret() {
+    let mut s = Server::new(base(), "tok", Limits { max_peers: 2, ..Limits::default() });
+    let mut host = join(&mut s);
+    let guest = join(&mut s);
+    // A participant who knows the (public) session and the host's id can't take that id over,
+    // whether the session is full or not, and with view-only access or not.
+    let forged = message::Resume { client_id: host.id(), ..guest.resume() };
+    assert_eq!(forged.session, host.resume().session);
+    let refused = s.join_as(Hello { resume: Some(forged), ..hello() }, message::Access::View);
+    assert!(matches!(refused, Err(ServerMsg::Refused { .. })), "a forged resume of a live id is refused: {refused:?}");
+    s.leave(guest.id());
+    let (id, _) = s.join_as(Hello { resume: Some(forged), ..hello() }, message::Access::View).unwrap();
+    assert_ne!(id, host.id(), "a forged resume joins as new");
+    // The real client still comes back as itself.
+    let resend = come_back(&mut s, &mut host);
+    assert!(resend.is_empty());
+}
diff --git a/crates/collab/src/server.rs b/crates/collab/src/server.rs
index 38ed3de8..52f112ad 100644
--- a/crates/collab/src/server.rs
+++ b/crates/collab/src/server.rs
@@ -7,7 +7,7 @@ use figcraft_doc::{Document, NodeId};
 use serde::{Deserialize, Serialize};
 
 use crate::change::{Change, Entry, Prop, Target};
-use crate::message::{Accepted, Access, CatchUp, ClientMsg, Hello, PROTOCOL, Peer, Presence, Processed, ServerMsg, Signal, reads_signals};
+use crate::message::{Accepted, Access, CatchUp, ClientMsg, Hello, PROTOCOL, Peer, Presence, Processed, Resume, ServerMsg, Signal, reads_signals};
 use crate::replica::{Mode, Replica, create_change};
 use crate::{Error, Limits, docprops, same_secret};
 
@@ -61,6 +61,9 @@ pub struct Server {
     /// Every client id handed out (a reconnecting client keeps its id) and what was done with
     /// its batches.
     issued: BTreeMap<u32, Processed>,
+    /// The secret each client id resumes with (sent only in that client's welcome). Not saved:
+    /// after a restart, the first to come back for an id that isn't connected sets it.
+    secrets: BTreeMap<u32, u64>,
     /// The latest accepted batches, oldest first (a reconnecting client gets what it missed).
     log: VecDeque<Accepted>,
     /// Changes in `log`, and about how many bytes it holds ([`weight`]).
@@ -116,6 +119,7 @@ impl Server {
             deleted: BTreeSet::new(),
             removed: BTreeSet::new(),
             issued: BTreeMap::new(),
+            secrets: BTreeMap::new(),
             log: VecDeque::new(),
             log_changes: 0,
             log_bytes: 0,
@@ -219,6 +223,7 @@ impl Server {
             && let Some(old) = self.issued.keys().copied().find(|k| !self.peers.contains_key(k))
         {
             self.issued.remove(&old);
+            self.secrets.remove(&old);
         }
     }
 
@@ -266,7 +271,7 @@ impl Server {
         if !same_secret(&hello.token, &self.token) {
             return Err(refuse("wrong session token"));
         }
-        let resume = hello.resume.filter(|r| r.session == self.session && self.issued.contains_key(&r.client_id));
+        let resume = hello.resume.filter(|r| r.session == self.session && self.issued.contains_key(&r.client_id) && self.may_resume(r));
         if self.peers.len() >= self.limits.max_peers && resume.is_none_or(|r| !self.peers.contains_key(&r.client_id)) {
             return Err(refuse("the session is full"));
         }
@@ -282,15 +287,17 @@ impl Server {
             Some(r) if r.seq <= self.seq && r.seq >= floor => CatchUp::Delta(self.log.iter().filter(|a| a.seq > r.seq).cloned().collect()),
             _ => CatchUp::Snapshot(self.state.snapshot().map_err(|e| refuse(&e.to_string()))?),
         };
-        let id = match resume {
-            Some(r) => r.client_id,
+        let (id, secret) = match resume {
+            Some(r) => (r.client_id, *self.secrets.entry(r.client_id).or_insert(r.secret)),
             None => {
                 let id = self.next_client;
                 self.next_client += 1;
                 self.issued.insert(id, Processed::default());
+                let secret = new_session_id().max(1);
+                self.secrets.insert(id, secret);
                 self.forget_oldest();
                 self.note(Journal::Issued { client: id });
-                id
+                (id, secret)
             }
         };
         let processed = self.issued.get(&id).cloned().unwrap_or_default();
@@ -298,7 +305,7 @@ impl Server {
         let signals = reads_signals(&hello.client_version);
         let peer = Peer { client_id: id, name: hello.name, color: hello.color };
         let others = self.peers.values().filter(|p| p.client_id != id).cloned().collect();
-        let welcome = ServerMsg::Welcome { session: self.session, client_id: id, seq: self.seq, catch_up, processed, peers: others, access };
+        let welcome = ServerMsg::Welcome { session: self.session, client_id: id, seq: self.seq, catch_up, processed, peers: others, access, secret };
         self.peers.insert(id, peer.clone());
         if access == Access::View {
             self.viewers.insert(id);
@@ -318,6 +325,16 @@ impl Server {
         Ok((id, outs))
     }
 
+    /// Whether `r` may take its client id back: it carries the secret that id was given with, or
+    /// (after a restart, which forgets secrets) a secret for an id nobody is connected as.
+    fn may_resume(&self, r: &Resume) -> bool {
+        r.secret != 0
+            && match self.secrets.get(&r.client_id) {
+                Some(s) => *s == r.secret,
+                None => !self.peers.contains_key(&r.client_id),
+            }
+    }
+
     /// Client `id`'s connection closed.
     pub fn leave(&mut self, id: u32) -> Vec<Outgoing> {
         self.presence.remove(&id);
@@ -541,11 +558,14 @@ impl Server {
                 nodes.extend(t.write(self.state.value(&t)?.as_ref()));
             }
         }
+        let mut restored = std::collections::BTreeSet::new();
         for id in gone {
             match doc.node(id) {
                 Some(_) => {
                     for d in doc.subtree(id) {
-                        if let Some(n) = doc.node(d) {
+                        if restored.insert(d)
+                            && let Some(n) = doc.node(d)
+                        {
                             nodes.push(create_change(n, self.state.key(d))?);
                         }
                     }
diff --git a/crates/color/Cargo.toml b/crates/color/Cargo.toml
index 0bd58852..755e35a1 100644
--- a/crates/color/Cargo.toml
+++ b/crates/color/Cargo.toml
@@ -3,7 +3,7 @@ name = "figcraft-color"
 version.workspace = true
 edition.workspace = true
 license.workspace = true
-description = "FigCraft colour and paint: RGBA colours, HSB/HSL, hex/CSS parsing, solid/gradient/image paints, blend modes"
+description = "FigCraft colour and paint: RGBA colours, HSB/HSL/LCH/OKLCH, hex/CSS parsing, solid/gradient/image paints, blend modes"
 
 [lints]
 workspace = true
diff --git a/crates/color/src/blend.rs b/crates/color/src/blend.rs
index 734759ee..250e8ab0 100644
--- a/crates/color/src/blend.rs
+++ b/crates/color/src/blend.rs
@@ -103,7 +103,7 @@ impl BlendMode {
     /// The mode named by its label or CSS keyword, ignoring case, spaces and dashes. Labels come
     /// first: "normal" is Normal, not pass-through (whose CSS keyword is also `normal`).
     pub fn from_name(s: &str) -> Option<Self> {
-        let key: String = s.chars().filter(|c| c.is_ascii_alphanumeric()).collect::<String>().to_ascii_lowercase();
+        let key: String = s.chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase();
         Self::ALL
             .into_iter()
             .find(|m| m.label().replace(' ', "").to_ascii_lowercase() == key)
diff --git a/crates/color/src/hsx.rs b/crates/color/src/hsx.rs
index a19a5fd5..01f31d31 100644
--- a/crates/color/src/hsx.rs
+++ b/crates/color/src/hsx.rs
@@ -1,4 +1,5 @@
-//! HSB (HSV) and HSL, the models the colour picker offers besides RGB and hex.
+//! HSB (HSV) and HSL, two of the models the colour picker offers besides RGB and hex (LCH and
+//! OKLCH are in `lch.rs`).
 
 use crate::Color;
 use serde::{Deserialize, Serialize};
diff --git a/crates/color/src/lch.rs b/crates/color/src/lch.rs
new file mode 100644
index 00000000..5abf9abf
--- /dev/null
+++ b/crates/color/src/lch.rs
@@ -0,0 +1,164 @@
+//! CIE LCH (CSS `lch()`, Lab with a D50 white) and OKLCH (CSS `oklch()`), the perceptual models
+//! the colour picker offers. Colours are read as sRGB, like the hex, RGB, HSL and HSB fields.
+//!
+//! The matrices are the ones CSS Color 4 publishes (sRGB ↔ XYZ D65, Bradford D65 ↔ D50) and
+//! Björn Ottosson's published OKLab matrices.
+
+use crate::Color;
+use crate::profile::{apply as mul, decode, encode};
+use serde::{Deserialize, Serialize};
+
+/// CIE LCH: lightness 0..100, chroma 0.. (about 0..150 for real colours), hue 0..360.
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Lch {
+    pub l: f32,
+    pub c: f32,
+    pub h: f32,
+}
+
+/// OKLCH: lightness 0..1, chroma 0.. (about 0..0.4 for real colours), hue 0..360.
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Oklch {
+    pub l: f32,
+    pub c: f32,
+    pub h: f32,
+}
+
+type V3 = [f64; 3];
+
+fn linear_rgb(c: Color) -> V3 {
+    [decode(c.r), decode(c.g), decode(c.b)]
+}
+
+const SRGB_TO_XYZ: [V3; 3] = [
+    [0.412_390_799_265_959_34, 0.357_584_339_383_878, 0.180_480_788_401_834_3],
+    [0.212_639_005_871_510_27, 0.715_168_678_767_756, 0.072_192_315_360_733_71],
+    [0.019_330_818_715_591_82, 0.119_194_779_794_625_98, 0.950_532_152_249_660_7],
+];
+const XYZ_TO_SRGB: [V3; 3] = [
+    [3.240_969_941_904_522_6, -1.537_383_177_570_094, -0.498_610_760_293_003_4],
+    [-0.969_243_636_280_879_6, 1.875_967_501_507_720_2, 0.041_555_057_407_175_59],
+    [0.055_630_079_696_993_66, -0.203_976_958_888_976_52, 1.056_971_514_242_878_6],
+];
+const D65_TO_D50: [V3; 3] = [
+    [1.047_929_820_840_548_8, 0.022_946_793_341_019_088, -0.050_192_229_543_135_57],
+    [0.029_627_815_688_159_344, 0.990_434_484_573_249, -0.017_073_825_029_385_14],
+    [-0.009_243_058_152_591_178, 0.015_055_144_896_577_895, 0.751_874_289_958_000_8],
+];
+const D50_TO_D65: [V3; 3] = [
+    [0.955_473_452_704_218_2, -0.023_098_536_874_261_423, 0.063_259_308_661_021_7],
+    [-0.028_369_706_963_208_136, 1.009_995_458_005_822_6, 0.021_041_398_966_943_008],
+    [0.012_314_001_688_319_899, -0.020_507_696_433_477_912, 1.330_365_936_608_075_3],
+];
+const D50_WHITE: V3 = [0.3457 / 0.3585, 1.0, (1.0 - 0.3457 - 0.3585) / 0.3585];
+const KAPPA: f64 = 24389.0 / 27.0;
+const EPSILON: f64 = 216.0 / 24389.0;
+
+const SRGB_TO_LMS: [V3; 3] = [
+    [0.412_221_470_8, 0.536_332_536_3, 0.051_445_992_9],
+    [0.211_903_498_2, 0.680_699_545_1, 0.107_396_956_6],
+    [0.088_302_461_9, 0.281_718_837_6, 0.629_978_700_5],
+];
+const LMS_TO_OKLAB: [V3; 3] = [
+    [0.210_454_255_3, 0.793_617_785_0, -0.004_072_046_8],
+    [1.977_998_495_1, -2.428_592_205_0, 0.450_593_709_9],
+    [0.025_904_037_1, 0.782_771_766_2, -0.808_675_766_0],
+];
+const OKLAB_TO_LMS: [V3; 3] =
+    [[1.0, 0.396_337_777_4, 0.215_803_757_3], [1.0, -0.105_561_345_8, -0.063_854_172_8], [1.0, -0.089_484_177_5, -1.291_485_548_0]];
+const LMS_TO_SRGB: [V3; 3] = [
+    [4.076_741_662_1, -3.307_711_591_3, 0.230_969_929_2],
+    [-1.268_438_004_6, 2.609_757_401_1, -0.341_319_396_5],
+    [-0.004_196_086_3, -0.703_418_614_7, 1.707_614_701_0],
+];
+
+fn lab_from_color(c: Color) -> V3 {
+    let xyz = mul(&D65_TO_D50, mul(&SRGB_TO_XYZ, linear_rgb(c)));
+    let f = |v: f64| if v > EPSILON { v.cbrt() } else { (KAPPA * v + 16.0) / 116.0 };
+    let [fx, fy, fz] = [f(xyz[0] / D50_WHITE[0]), f(xyz[1] / D50_WHITE[1]), f(xyz[2] / D50_WHITE[2])];
+    [116.0 * fy - 16.0, 500.0 * (fx - fy), 200.0 * (fy - fz)]
+}
+
+fn linear_from_lab([l, a, b]: V3) -> V3 {
+    let fy = (l + 16.0) / 116.0;
+    let fx = fy + a / 500.0;
+    let fz = fy - b / 200.0;
+    let inv = |f: f64| if f.powi(3) > EPSILON { f.powi(3) } else { (116.0 * f - 16.0) / KAPPA };
+    let y = if l > KAPPA * EPSILON { fy.powi(3) } else { l / KAPPA };
+    let xyz = [inv(fx) * D50_WHITE[0], y * D50_WHITE[1], inv(fz) * D50_WHITE[2]];
+    mul(&XYZ_TO_SRGB, mul(&D50_TO_D65, xyz))
+}
+
+fn oklab_from_color(c: Color) -> V3 {
+    let lms = mul(&SRGB_TO_LMS, linear_rgb(c));
+    mul(&LMS_TO_OKLAB, [lms[0].cbrt(), lms[1].cbrt(), lms[2].cbrt()])
+}
+
+fn linear_from_oklab(lab: V3) -> V3 {
+    let lms = mul(&OKLAB_TO_LMS, lab);
+    mul(&LMS_TO_SRGB, [lms[0].powi(3), lms[1].powi(3), lms[2].powi(3)])
+}
+
+/// Lab → (lightness, chroma, hue); grey has hue 0.
+fn polar([l, a, b]: V3, grey: f64) -> (f32, f32, f32) {
+    let c = a.hypot(b);
+    let h = if c < grey { 0.0 } else { b.atan2(a).to_degrees().rem_euclid(360.0) };
+    (l as f32, c as f32, h as f32)
+}
+
+fn finite(v: f32) -> f64 {
+    if v.is_finite() { f64::from(v) } else { 0.0 }
+}
+
+fn in_gamut(rgb: V3) -> bool {
+    rgb.iter().all(|v| (-1e-6..=1.0 + 1e-6).contains(v))
+}
+
+/// The sRGB colour for a lightness, chroma and hue: out of gamut, the chroma comes down (a binary
+/// search) until it fits, so lightness and hue stay what was asked for, as CSS gamut mapping does.
+fn map_to_srgb(l: f64, c: f64, h: f64, to_linear_rgb: impl Fn(V3) -> V3) -> Color {
+    let (sin, cos) = h.to_radians().sin_cos();
+    let lab = |c: f64| [l, c * cos, c * sin];
+    let mut rgb = to_linear_rgb(lab(c));
+    if !in_gamut(rgb) {
+        let (mut lo, mut hi) = (0.0, c);
+        for _ in 0..24 {
+            let mid = (lo + hi) / 2.0;
+            if in_gamut(to_linear_rgb(lab(mid))) {
+                lo = mid;
+            } else {
+                hi = mid;
+            }
+        }
+        rgb = to_linear_rgb(lab(lo));
+    }
+    Color::new(encode(rgb[0]), encode(rgb[1]), encode(rgb[2]), 1.0)
+}
+
+impl Lch {
+    pub fn from_color(c: Color) -> Self {
+        let (l, c, h) = polar(lab_from_color(c), 0.02);
+        Self { l, c, h }
+    }
+
+    /// Opaque sRGB; out-of-gamut chroma is reduced to the nearest colour sRGB can show.
+    pub fn to_color(self) -> Color {
+        let l = finite(self.l).clamp(0.0, 100.0);
+        let c = finite(self.c).clamp(0.0, 230.0);
+        map_to_srgb(l, c, finite(self.h).rem_euclid(360.0), linear_from_lab)
+    }
+}
+
+impl Oklch {
+    pub fn from_color(c: Color) -> Self {
+        let (l, c, h) = polar(oklab_from_color(c), 0.000_2);
+        Self { l, c, h }
+    }
+
+    /// Opaque sRGB; out-of-gamut chroma is reduced to the nearest colour sRGB can show.
+    pub fn to_color(self) -> Color {
+        let l = finite(self.l).clamp(0.0, 1.0);
+        let c = finite(self.c).clamp(0.0, 0.5);
+        map_to_srgb(l, c, finite(self.h).rem_euclid(360.0), linear_from_oklab)
+    }
+}
diff --git a/crates/color/src/lch_tests.rs b/crates/color/src/lch_tests.rs
new file mode 100644
index 00000000..0bf249b0
--- /dev/null
+++ b/crates/color/src/lch_tests.rs
@@ -0,0 +1,105 @@
+use super::*;
+
+fn close(a: f32, b: f32, tol: f32) -> bool {
+    (a - b).abs() <= tol
+}
+
+#[test]
+fn lch_matches_css_reference_values() {
+    // CSS Color 4 values for sRGB primaries and white (D50 Lab).
+    let red = Lch::from_color(Color::from_hex("FF0000").unwrap());
+    assert!(close(red.l, 54.29, 0.05) && close(red.c, 106.84, 0.1) && close(red.h, 40.85, 0.1), "{red:?}");
+    let white = Lch::from_color(Color::WHITE);
+    assert!(close(white.l, 100.0, 0.01) && white.c < 0.05, "{white:?}");
+    assert_eq!(Lch::from_color(Color::BLACK).l.round(), 0.0);
+}
+
+#[test]
+fn oklch_matches_reference_values() {
+    let red = Oklch::from_color(Color::from_hex("FF0000").unwrap());
+    assert!(close(red.l, 0.628, 0.001) && close(red.c, 0.2577, 0.001) && close(red.h, 29.23, 0.1), "{red:?}");
+    let white = Oklch::from_color(Color::WHITE);
+    assert!(close(white.l, 1.0, 0.001) && white.c < 0.001 && white.h == 0.0, "{white:?}");
+}
+
+#[test]
+fn lch_and_oklch_round_trip_through_srgb() {
+    for hex in ["0D99FF", "FF0000", "00FF00", "0000FF", "FFFFFF", "000000", "808080", "663399", "F24E1E", "1ABC9C"] {
+        let c = Color::from_hex(hex).unwrap();
+        assert_eq!(Lch::from_color(c).to_color().to_hex(), hex, "{hex} via LCH");
+        assert_eq!(Oklch::from_color(c).to_color().to_hex(), hex, "{hex} via OKLCH");
+    }
+}
+
+#[test]
+fn out_of_gamut_keeps_lightness_and_hue() {
+    // Far more chroma than sRGB holds: the chroma comes down, lightness and hue stay.
+    let asked = Oklch { l: 0.7, c: 0.45, h: 150.0 };
+    let got = Oklch::from_color(asked.to_color());
+    assert!(close(got.l, 0.7, 0.01) && close(got.h, 150.0, 1.5) && got.c < 0.45, "{got:?}");
+    let asked = Lch { l: 50.0, c: 200.0, h: 300.0 };
+    let got = Lch::from_color(asked.to_color());
+    assert!(close(got.l, 50.0, 1.0) && close(got.h, 300.0, 2.0) && got.c < 200.0, "{got:?}");
+}
+
+#[test]
+fn junk_values_never_panic() {
+    for v in [f32::NAN, f32::INFINITY, f32::NEG_INFINITY, -1e30, 1e30, -5.0, 0.0] {
+        let a = Lch { l: v, c: v, h: v }.to_color();
+        let b = Oklch { l: v, c: v, h: v }.to_color();
+        for x in [a.r, a.g, a.b, b.r, b.g, b.b] {
+            assert!(x.is_finite() && (0.0..=1.0).contains(&x));
+        }
+    }
+    let nan = Color { r: f32::NAN, g: 2.0, b: -1.0, a: 1.0 };
+    assert!(Lch::from_color(nan.sanitized()).l.is_finite());
+    assert!(Oklch::from_color(nan.sanitized()).l.is_finite());
+}
+
+#[test]
+fn css_reads_lch_and_oklch() {
+    assert_eq!(Color::parse_css("oklch(62.8% 0.2577 29.23)").unwrap().to_hex(), "FF0000");
+    assert_eq!(Color::parse_css("oklch(0.628 0.2577 29.23deg / 50%)").unwrap().to_rgba8(), [255, 0, 0, 128]);
+    assert_eq!(Color::parse_css("lch(54.29 106.84 40.85)").unwrap().to_hex(), "FF0000");
+    assert_eq!(Color::parse_css("LCH(100% 0 0)").unwrap().to_hex(), "FFFFFF");
+    assert!(Color::parse_css("oklch(nan 0 0)").is_none());
+    assert!(Color::parse_css("lch(50)").is_none());
+}
+
+#[test]
+fn css_hue_units_and_none() {
+    let blue = Color::parse_css("oklch(0.6 0.2 260)").unwrap();
+    for h in ["260deg", "0.7222222turn", "288.8888grad", "4.537856rad"] {
+        assert_eq!(Color::parse_css(&format!("oklch(0.6 0.2 {h})")).unwrap().to_hex(), blue.to_hex(), "{h}");
+    }
+    assert_eq!(Color::parse_css("lch(50 none none)").unwrap().to_hex(), Color::parse_css("lch(50 0 0)").unwrap().to_hex());
+    assert_eq!(Color::parse_css("oklch(none 0 0 / none)").unwrap().to_rgba8(), [0, 0, 0, 255]);
+}
+
+#[test]
+fn css_lch_and_oklch_junk_is_refused_or_in_range() {
+    let long = "9".repeat(100_000);
+    let junk = [
+        "oklch()".to_string(),
+        "oklch(,,)".into(),
+        "lch(1 2 3 4 5)".into(),
+        "oklch(0.5 0.1 1e40)".into(),
+        "lch(inf 0 0)".into(),
+        "oklch(0.5 0.1 deg)".into(),
+        "lch(50 50 50 / / /)".into(),
+        "oklch(🟥 0 0)".into(),
+        "lch(\u{0} 0 0)".into(),
+        format!("oklch({long} {long} {long})"),
+        format!("lch(50 50 {long}turn)"),
+    ];
+    for j in &junk {
+        if let Some(c) = Color::parse_css(j) {
+            for v in [c.r, c.g, c.b, c.a] {
+                assert!(v.is_finite() && (0.0..=1.0).contains(&v), "{j:.40}: {c:?}");
+            }
+        }
+    }
+    for j in ["oklch()", "lch(1 2 3 4 5)", "lch(inf 0 0)", "oklch(0.5 0.1 deg)", "oklch(🟥 0 0)", "oklch(0.5 0.1 1e40)"] {
+        assert!(Color::parse_css(j).is_none(), "{j}");
+    }
+}
diff --git a/crates/color/src/lib.rs b/crates/color/src/lib.rs
index d6859a51..6e61084d 100644
--- a/crates/color/src/lib.rs
+++ b/crates/color/src/lib.rs
@@ -11,10 +11,12 @@ use serde::{Deserialize, Serialize};
 mod blend;
 mod hsx;
 mod icc;
+mod lch;
 mod named;
 mod profile;
 pub use blend::BlendMode;
 pub use hsx::*;
+pub use lch::{Lch, Oklch};
 pub use profile::{ColorProfile, ProfileConversion};
 
 /// A non-premultiplied sRGB colour with alpha, components in `0..=1`. Deserializes from
@@ -61,7 +63,7 @@ impl<'de> Deserialize<'de> for Color {
 }
 
 fn clamp01(v: f32) -> f32 {
-    if v.is_finite() { v.clamp(0.0, 1.0) } else { 0.0 }
+    if v.is_nan() { 0.0 } else { v.clamp(0.0, 1.0) }
 }
 
 impl Default for Color {
@@ -122,7 +124,8 @@ impl Color {
     /// Parse hex the way the colour field does: `#` optional, 1, 2, 3, 4, 6 or 8 digits
     /// (`F` → `FFFFFF`, `AB` → `ABABAB`, `ABC` → `AABBCC`).
     pub fn from_hex(s: &str) -> Option<Self> {
-        let s = s.trim().trim_start_matches('#');
+        let s = s.trim();
+        let s = s.strip_prefix('#').unwrap_or(s);
         if !s.chars().all(|c| c.is_ascii_hexdigit()) {
             return None;
         }
@@ -146,7 +149,8 @@ impl Color {
         Self::from_hex(s).or_else(|| named::lookup(s).map(|[r, g, b]| Self::from_rgba8(r, g, b, 255)))
     }
 
-    /// Parse a CSS colour: hex, `rgb()/rgba()`, `hsl()/hsla()`, a CSS colour name or `transparent`.
+    /// Parse a CSS colour: hex, `rgb()/rgba()`, `hsl()/hsla()`, `lch()`, `oklch()`, a CSS colour
+    /// name or `transparent`. LCH and OKLCH outside sRGB come back as the nearest sRGB colour.
     pub fn parse_css(s: &str) -> Option<Self> {
         let t = s.trim().to_ascii_lowercase();
         if t.starts_with('#') {
@@ -162,7 +166,13 @@ impl Color {
                     p.parse::<f32>().ok().map(|v| v / 255.0)
                 }
             };
-            let alpha = parts.get(3).and_then(|a| parse_alpha(a)).unwrap_or(1.0);
+            let alpha = match parts.get(3) {
+                Some(a) => parse_alpha(a)?,
+                None => 1.0,
+            };
+            if parts.len() > 4 {
+                return None;
+            }
             return Some(Self::new(num(0)?, num(1)?, num(2)?, alpha));
         }
         if let Some(inner) = t.strip_prefix("hsla(").or_else(|| t.strip_prefix("hsl(")).and_then(|r| r.strip_suffix(')')) {
@@ -170,9 +180,24 @@ impl Color {
             let h = parts.first()?.trim_end_matches("deg").parse::<f32>().ok()?;
             let s = parts.get(1)?.trim_end_matches('%').parse::<f32>().ok()? / 100.0;
             let l = parts.get(2)?.trim_end_matches('%').parse::<f32>().ok()? / 100.0;
-            let alpha = parts.get(3).and_then(|a| parse_alpha(a)).unwrap_or(1.0);
+            let alpha = match parts.get(3) {
+                Some(a) => parse_alpha(a)?,
+                None => 1.0,
+            };
+            if parts.len() > 4 {
+                return None;
+            }
             return Some(Hsl { h, s, l }.to_color().with_alpha(alpha));
         }
+        // Percentages per CSS Color 4: OKLCH 100% is lightness 1, chroma 0.4; LCH 100% is 100 and 150.
+        if let Some(inner) = t.strip_prefix("oklch(").and_then(|r| r.strip_suffix(')')) {
+            let ([l, c, h], alpha) = css_polar(inner, 1.0, 0.4)?;
+            return Some(Oklch { l, c, h }.to_color().with_alpha(alpha));
+        }
+        if let Some(inner) = t.strip_prefix("lch(").and_then(|r| r.strip_suffix(')')) {
+            let ([l, c, h], alpha) = css_polar(inner, 100.0, 150.0)?;
+            return Some(Lch { l, c, h }.to_color().with_alpha(alpha));
+        }
         if t == "transparent" {
             return Some(Color::TRANSPARENT);
         }
@@ -182,7 +207,14 @@ impl Color {
     /// CSS `rgba(...)` / hex text for copy-as-CSS.
     pub fn to_css(self) -> String {
         let [r, g, b, _] = self.to_rgba8();
-        if self.a >= 0.999 { self.to_css_hex() } else { format!("rgba({r}, {g}, {b}, {:.2})", self.a) }
+        if self.a >= 0.999 {
+            return self.to_css_hex();
+        }
+        // Two decimals when they keep the 8-bit alpha, three otherwise (near-transparent colours).
+        let a8 = |a: f32| (a.clamp(0.0, 1.0) * 255.0).round() as u8;
+        let short = format!("{:.2}", self.a);
+        let alpha = if short.parse::<f32>().is_ok_and(|v| a8(v) == a8(self.a)) { short } else { format!("{:.3}", self.a) };
+        format!("rgba({r}, {g}, {b}, {alpha})")
     }
 
     /// Linear interpolation in sRGB (as gradients render).
@@ -213,6 +245,46 @@ fn css_args(inner: &str) -> Vec<String> {
     inner.replace('/', ",").split([',', ' ']).map(str::trim).filter(|p| !p.is_empty()).map(str::to_string).collect()
 }
 
+/// The arguments of `lch()` / `oklch()`: lightness, chroma, hue and alpha. Percentages are of
+/// `l_full` / `c_full`; `none` is 0.
+fn css_polar(inner: &str, l_full: f32, c_full: f32) -> Option<([f32; 3], f32)> {
+    let parts = css_args(inner);
+    if !(3..=4).contains(&parts.len()) {
+        return None;
+    }
+    let l = css_number(parts.first()?, l_full)?;
+    let c = css_number(parts.get(1)?, c_full)?;
+    let h = css_hue(parts.get(2)?)?;
+    let alpha = match parts.get(3).map(String::as_str) {
+        None | Some("none") => 1.0,
+        Some(a) => parse_alpha(a)?,
+    };
+    Some(([l, c, h], alpha))
+}
+
+/// A CSS number, a percentage of `full` or `none` (0); finite only.
+fn css_number(p: &str, full: f32) -> Option<f32> {
+    let v = match p.strip_suffix('%') {
+        _ if p == "none" => 0.0,
+        Some(pc) => pc.trim().parse::<f32>().ok()? / 100.0 * full,
+        None => p.parse::<f32>().ok()?,
+    };
+    v.is_finite().then_some(v)
+}
+
+/// A CSS hue in degrees: a number, `deg`, `rad`, `grad`, `turn` or `none` (0); finite only.
+fn css_hue(p: &str) -> Option<f32> {
+    if p == "none" {
+        return Some(0.0);
+    }
+    let (num, per_degree) = [("grad", 400.0 / 360.0), ("turn", 1.0 / 360.0), ("rad", std::f32::consts::PI / 180.0), ("deg", 1.0)]
+        .into_iter()
+        .find_map(|(unit, k)| p.strip_suffix(unit).map(|n| (n, k)))
+        .unwrap_or((p, 1.0));
+    let v = num.parse::<f32>().ok()? / per_degree;
+    v.is_finite().then_some(v)
+}
+
 fn parse_alpha(a: &str) -> Option<f32> {
     if let Some(pc) = a.strip_suffix('%') { pc.parse::<f32>().ok().map(|v| v / 100.0) } else { a.parse::<f32>().ok() }
 }
@@ -343,7 +415,7 @@ impl ImageFilters {
     }
 
     /// The built-in adjustment presets: `(id, label, adjustments)`. "Reset" is the identity.
-    pub const PRESETS: [(&'static str, &'static str, ImageFilters); 7] = [
+    pub const PRESETS: [(&str, &str, ImageFilters); 7] = [
         ("vivid", "Vivid", ImageFilters { contrast: 0.2, saturation: 0.45, highlights: -0.1, shadows: 0.1, ..ImageFilters::NONE }),
         ("muted", "Muted", ImageFilters { contrast: -0.15, saturation: -0.45, ..ImageFilters::NONE }),
         ("warm", "Warm", ImageFilters { temperature: 0.5, tint: 0.1, saturation: 0.1, ..ImageFilters::NONE }),
@@ -537,7 +609,7 @@ pub enum PaintKind {
 }
 
 /// One fill or stroke paint.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Paint {
     #[serde(flatten)]
     pub kind: PaintKind,
@@ -547,19 +619,41 @@ pub struct Paint {
     pub visible: bool,
     #[serde(default)]
     pub blend: BlendMode,
+    /// The part of the opacity that is the alpha of a typed solid colour (see [`Paint::solid`]),
+    /// the rest being an opacity set on its own: a colour variable bound to the paint replaces
+    /// this part only. 1: all of it is the paint's own.
+    #[serde(default = "one", rename = "colorAlpha", skip_serializing_if = "is_one")]
+    pub color_alpha: f32,
+}
+
+/// Paints compare by what they paint; where the opacity came from doesn't matter.
+impl PartialEq for Paint {
+    fn eq(&self, other: &Self) -> bool {
+        self.kind == other.kind && self.opacity == other.opacity && self.visible == other.visible && self.blend == other.blend
+    }
 }
 
 fn yes() -> bool {
     true
 }
 
+fn is_one(x: &f32) -> bool {
+    *x == 1.0
+}
+
 impl Paint {
     pub fn solid(color: Color) -> Self {
-        Self { kind: PaintKind::Solid { color: color.with_alpha(1.0) }, opacity: color.a, visible: true, blend: BlendMode::Normal }
+        Self {
+            kind: PaintKind::Solid { color: color.with_alpha(1.0) },
+            opacity: color.a,
+            visible: true,
+            blend: BlendMode::Normal,
+            color_alpha: color.a,
+        }
     }
 
     pub fn gradient(g: Gradient) -> Self {
-        Self { kind: PaintKind::Gradient(g), opacity: 1.0, visible: true, blend: BlendMode::Normal }
+        Self { kind: PaintKind::Gradient(g), opacity: 1.0, visible: true, blend: BlendMode::Normal, color_alpha: 1.0 }
     }
 
     pub fn image(hash: impl Into<String>, mode: ImageScaleMode) -> Self {
@@ -575,12 +669,13 @@ impl Paint {
             opacity: 1.0,
             visible: true,
             blend: BlendMode::Normal,
+            color_alpha: 1.0,
         }
     }
 
     /// Layer `source` (a node id) tiled at its own size.
     pub fn pattern(source: u64) -> Self {
-        Self { kind: PaintKind::Pattern(PatternPaint::new(source)), opacity: 1.0, visible: true, blend: BlendMode::Normal }
+        Self { kind: PaintKind::Pattern(PatternPaint::new(source)), opacity: 1.0, visible: true, blend: BlendMode::Normal, color_alpha: 1.0 }
     }
 
     /// The solid colour (with the paint opacity folded into alpha), if solid.
@@ -628,6 +723,8 @@ impl Paint {
 #[cfg(test)]
 mod gradient_tests;
 #[cfg(test)]
+mod lch_tests;
+#[cfg(test)]
 mod pattern_tests;
 #[cfg(test)]
 mod profile_tests;
diff --git a/crates/color/src/profile.rs b/crates/color/src/profile.rs
index c810e372..f6d9fec6 100644
--- a/crates/color/src/profile.rs
+++ b/crates/color/src/profile.rs
@@ -172,13 +172,13 @@ fn outside(l: f64) -> bool {
 const ENCODE_STEPS: usize = 4096;
 
 /// The sRGB transfer function, encoded value → linear light.
-fn decode(v: f32) -> f64 {
+pub(crate) fn decode(v: f32) -> f64 {
     let v = f64::from(if v.is_finite() { v.clamp(0.0, 1.0) } else { 0.0 });
     if v <= 0.04045 { v / 12.92 } else { ((v + 0.055) / 1.055).powf(2.4) }
 }
 
 /// The sRGB transfer function, linear light → encoded value (clipped to 0..=1).
-fn encode(l: f64) -> f32 {
+pub(crate) fn encode(l: f64) -> f32 {
     let l = if l.is_finite() { l.clamp(0.0, 1.0) } else { 0.0 };
     (if l <= 0.003_130_8 { l * 12.92 } else { 1.055 * l.powf(1.0 / 2.4) - 0.055 }) as f32
 }
diff --git a/crates/color/src/tests.rs b/crates/color/src/tests.rs
index 68a838e0..2b628b71 100644
--- a/crates/color/src/tests.rs
+++ b/crates/color/src/tests.rs
@@ -80,7 +80,7 @@ fn blend_names() {
 #[test]
 fn nan_inputs_are_sanitized() {
     let c = Color::new(f32::NAN, 2.0, -1.0, f32::INFINITY);
-    assert_eq!(c.to_rgba8(), [0, 255, 0, 0]);
+    assert_eq!(c.to_rgba8(), [0, 255, 0, 255]);
 }
 
 #[test]
@@ -106,3 +106,38 @@ fn crop_defaults_to_fill_and_roundtrips() {
         assert!((a - b).abs() < 1e-9);
     }
 }
+
+#[test]
+fn infinite_channels_clamp() {
+    let c = Color::parse_css("rgb(1e40, 0, 0)").unwrap();
+    assert_eq!(c.r, 1.0);
+    let c = Color::new(f32::INFINITY, f32::NEG_INFINITY, f32::NAN, f32::INFINITY);
+    assert_eq!((c.r, c.g, c.b, c.a), (1.0, 0.0, 0.0, 1.0));
+}
+
+#[test]
+fn hex_allows_at_most_one_leading_hash() {
+    assert!(Color::from_hex("##ff0000").is_none());
+    assert!(Color::from_hex("###fff").is_none());
+    assert!(Color::from_hex_or_name("##ff0000").is_none());
+    assert_eq!(Color::from_hex("#ff0000").unwrap().to_hex(), "FF0000");
+    assert_eq!(Color::from_hex("ff0000").unwrap().to_hex(), "FF0000");
+}
+
+#[test]
+fn malformed_alpha_or_extra_args_rejected() {
+    assert_eq!(Color::parse_css("rgba(0,0,0,abc)"), None);
+    assert_eq!(Color::parse_css("hsla(0,0%,0%,abc)"), None);
+    assert_eq!(Color::parse_css("rgb(1,2,3,4,5)"), None);
+    assert_eq!(Color::parse_css("hsl(0,0%,0%,0.5,1)"), None);
+    assert_eq!(Color::parse_css("rgb(1,2,3)").unwrap().a, 1.0);
+    assert_eq!(Color::parse_css("rgba(1,2,3,0.5)").unwrap().a, 0.5);
+}
+
+#[test]
+fn to_css_round_trips_every_alpha() {
+    for a in 0..=255u8 {
+        let c = Color::from_rgba8(10, 20, 30, a);
+        assert_eq!(Color::parse_css(&c.to_css()).unwrap().to_rgba8(), c.to_rgba8(), "alpha {a}: {}", c.to_css());
+    }
+}
diff --git a/crates/doc/src/board.rs b/crates/doc/src/board.rs
new file mode 100644
index 00000000..f7367db3
--- /dev/null
+++ b/crates/doc/src/board.rs
@@ -0,0 +1,452 @@
+//! Boards: a file kind for whiteboarding, and the small piece of metadata board objects carry.
+//!
+//! Board objects are ordinary nodes (frames, vectors, text) with a [`BoardItem`] on them, so
+//! rendering, hit testing, undo, saving, export, copy and paste and live sessions treat them like
+//! any other layer. The metadata says what the object is for: which text a sticky note fits, what
+//! a connector joins, who placed a stamp.
+
+use figcraft_color::Color;
+use figcraft_geom::kurbo::{Ellipse, RoundedRect};
+use figcraft_geom::{BezPath, Point, Rect, Shape, Vec2};
+use serde::{Deserialize, Serialize};
+
+use crate::NodeId;
+
+/// What a file is for: designing screens, or a board to think together on.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum FileKind {
+    #[default]
+    Design,
+    Board,
+}
+
+impl FileKind {
+    pub fn is_design(&self) -> bool {
+        *self == FileKind::Design
+    }
+    pub fn id(self) -> &'static str {
+        match self {
+            FileKind::Design => "design",
+            FileKind::Board => "board",
+        }
+    }
+}
+
+/// What a board object is.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum BoardItem {
+    /// A sticky note: a frame whose first text layer is the note (its size shrinks as the note
+    /// grows) and, below it, who wrote it.
+    Sticky {
+        #[serde(default, skip_serializing_if = "String::is_empty")]
+        author: String,
+    },
+    /// A shape with text: a frame holding the outline (a vector) and a centred text.
+    Shape { shape: BoardShape },
+    /// A line between two objects or points (a vector, re-routed when they move).
+    Connector(Connector),
+    /// The label in the middle of connector `connector` (a frame holding its text).
+    Label { connector: NodeId },
+    /// A stamp, and who placed it.
+    Stamp {
+        stamp: Stamp,
+        #[serde(default, skip_serializing_if = "String::is_empty")]
+        author: String,
+    },
+    /// A marker or highlighter stroke (what the eraser takes).
+    Ink,
+    /// A table: a frame of row frames holding cell frames with text (its column lines are thin
+    /// rectangles laid over it).
+    Table,
+}
+
+impl BoardItem {
+    /// Objects selected and moved as a whole: a click on their text or outline picks them, and
+    /// they never take other layers in.
+    pub fn is_atom(&self) -> bool {
+        matches!(self, BoardItem::Sticky { .. } | BoardItem::Shape { .. } | BoardItem::Label { .. } | BoardItem::Stamp { .. } | BoardItem::Table)
+    }
+
+    /// Objects whose first text layer is their text (a double-click or Enter edits it).
+    pub fn has_text(&self) -> bool {
+        matches!(self, BoardItem::Sticky { .. } | BoardItem::Shape { .. } | BoardItem::Label { .. })
+    }
+
+    /// Who made it (stickies and stamps; empty when unknown).
+    pub fn author(&self) -> &str {
+        match self {
+            BoardItem::Sticky { author } | BoardItem::Stamp { author, .. } => author,
+            _ => "",
+        }
+    }
+
+    /// Point the layers this object refers to (a connector's ends, a label's connector) at their
+    /// copies in `map`; the others stay.
+    pub fn remap(&mut self, map: &std::collections::BTreeMap<NodeId, NodeId>) {
+        match self {
+            BoardItem::Connector(c) => {
+                for end in [&mut c.from, &mut c.to] {
+                    if let End::Node { node, .. } = end
+                        && let Some(m) = map.get(node)
+                    {
+                        *node = *m;
+                    }
+                }
+            }
+            BoardItem::Label { connector } => {
+                if let Some(m) = map.get(connector) {
+                    *connector = *m;
+                }
+            }
+            _ => {}
+        }
+    }
+
+    pub fn kind_id(&self) -> &'static str {
+        match self {
+            BoardItem::Sticky { .. } => "sticky",
+            BoardItem::Shape { .. } => "shape",
+            BoardItem::Connector(_) => "connector",
+            BoardItem::Label { .. } => "label",
+            BoardItem::Stamp { .. } => "stamp",
+            BoardItem::Ink => "ink",
+            BoardItem::Table => "table",
+        }
+    }
+}
+
+/// The colours stickies, shapes and connectors come in: soft tints that dark text reads on.
+pub const BOARD_COLORS: [(&str, Color); 8] = [
+    ("yellow", Color::from_rgb8_const(0xFF, 0xE7, 0x8A)),
+    ("orange", Color::from_rgb8_const(0xFF, 0xC9, 0x94)),
+    ("red", Color::from_rgb8_const(0xFF, 0xAE, 0xA6)),
+    ("pink", Color::from_rgb8_const(0xF7, 0xB9, 0xDA)),
+    ("violet", Color::from_rgb8_const(0xD4, 0xC2, 0xFC)),
+    ("blue", Color::from_rgb8_const(0xAC, 0xD3, 0xFA)),
+    ("green", Color::from_rgb8_const(0xC2, 0xE8, 0xA6)),
+    ("gray", Color::from_rgb8_const(0xE3, 0xE1, 0xDD)),
+];
+
+/// A board colour by name ("yellow") or as hex ("#FFE78A").
+pub fn board_color(s: &str) -> Option<Color> {
+    let s = s.trim();
+    BOARD_COLORS.iter().find(|(n, _)| n.eq_ignore_ascii_case(s)).map(|(_, c)| *c).or_else(|| Color::from_hex(s))
+}
+
+/// The page colour boards start with: a warm light grey the colours stand out on.
+pub const BOARD_PAGE: Color = Color::from_rgb8_const(0xF4, 0xF3, 0xF0);
+
+/// The outlines shapes with text come in.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum BoardShape {
+    #[default]
+    Rectangle,
+    RoundedRectangle,
+    Ellipse,
+    Diamond,
+    Triangle,
+    SpeechBubble,
+    Chevron,
+}
+
+impl BoardShape {
+    pub const ALL: [BoardShape; 7] = [
+        BoardShape::Rectangle,
+        BoardShape::RoundedRectangle,
+        BoardShape::Ellipse,
+        BoardShape::Diamond,
+        BoardShape::Triangle,
+        BoardShape::SpeechBubble,
+        BoardShape::Chevron,
+    ];
+
+    pub fn id(self) -> &'static str {
+        match self {
+            BoardShape::Rectangle => "rectangle",
+            BoardShape::RoundedRectangle => "roundedRectangle",
+            BoardShape::Ellipse => "ellipse",
+            BoardShape::Diamond => "diamond",
+            BoardShape::Triangle => "triangle",
+            BoardShape::SpeechBubble => "speechBubble",
+            BoardShape::Chevron => "chevron",
+        }
+    }
+
+    pub fn from_id(s: &str) -> Option<BoardShape> {
+        BoardShape::ALL.into_iter().find(|b| b.id().eq_ignore_ascii_case(s))
+    }
+
+    pub fn label(self) -> &'static str {
+        match self {
+            BoardShape::Rectangle => "Rectangle",
+            BoardShape::RoundedRectangle => "Rounded rectangle",
+            BoardShape::Ellipse => "Ellipse",
+            BoardShape::Diamond => "Diamond",
+            BoardShape::Triangle => "Triangle",
+            BoardShape::SpeechBubble => "Speech bubble",
+            BoardShape::Chevron => "Chevron",
+        }
+    }
+
+    /// The outline in a `w` × `h` box at the origin.
+    pub fn path(self, w: f64, h: f64) -> BezPath {
+        let poly = |pts: &[(f64, f64)]| {
+            let mut p = BezPath::new();
+            for (i, (x, y)) in pts.iter().enumerate() {
+                let q = Point::new(x * w, y * h);
+                if i == 0 { p.move_to(q) } else { p.line_to(q) }
+            }
+            p.close_path();
+            p
+        };
+        let r = w.min(h);
+        match self {
+            BoardShape::Rectangle => Rect::new(0.0, 0.0, w, h).to_path(0.1),
+            BoardShape::RoundedRectangle => RoundedRect::new(0.0, 0.0, w, h, r * 0.16).to_path(0.1),
+            BoardShape::Ellipse => Ellipse::from_rect(Rect::new(0.0, 0.0, w, h)).to_path(0.1),
+            BoardShape::Diamond => poly(&[(0.5, 0.0), (1.0, 0.5), (0.5, 1.0), (0.0, 0.5)]),
+            BoardShape::Triangle => poly(&[(0.5, 0.0), (1.0, 1.0), (0.0, 1.0)]),
+            BoardShape::Chevron => poly(&[(0.0, 0.0), (0.72, 0.0), (1.0, 0.5), (0.72, 1.0), (0.0, 1.0), (0.28, 0.5)]),
+            BoardShape::SpeechBubble => {
+                // A rounded body over the bottom fifth, with a tail down to the left.
+                let (b, c) = (h * 0.8, r * 0.14);
+                let mut p = BezPath::new();
+                p.move_to((c, 0.0));
+                p.line_to((w - c, 0.0));
+                p.quad_to((w, 0.0), (w, c));
+                p.line_to((w, b - c));
+                p.quad_to((w, b), (w - c, b));
+                p.line_to((w * 0.42, b));
+                p.line_to((w * 0.18, h));
+                p.line_to((w * 0.24, b));
+                p.line_to((c, b));
+                p.quad_to((0.0, b), (0.0, b - c));
+                p.line_to((0.0, c));
+                p.quad_to((0.0, 0.0), (c, 0.0));
+                p.close_path();
+                p
+            }
+        }
+    }
+
+    /// Where the text goes, as insets of the box (top, right, bottom, left, in fractions of its
+    /// size): inside the outline's widest part.
+    pub fn text_insets(self) -> [f64; 4] {
+        match self {
+            BoardShape::Rectangle | BoardShape::RoundedRectangle => [0.08, 0.08, 0.08, 0.08],
+            BoardShape::Ellipse => [0.16, 0.16, 0.16, 0.16],
+            BoardShape::Diamond => [0.25, 0.25, 0.25, 0.25],
+            BoardShape::Triangle => [0.45, 0.22, 0.06, 0.22],
+            BoardShape::SpeechBubble => [0.08, 0.08, 0.28, 0.08],
+            BoardShape::Chevron => [0.12, 0.3, 0.12, 0.3],
+        }
+    }
+}
+
+/// The stamps: round badges with a mark.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Stamp {
+    #[default]
+    ThumbsUp,
+    Heart,
+    PlusOne,
+    Star,
+    Question,
+    Check,
+}
+
+/// One part of a stamp's mark: SVG path data on the badge's 40-unit box, filled or stroked.
+pub struct MarkPart {
+    pub d: &'static str,
+    pub filled: bool,
+}
+
+/// A stamp badge's size.
+pub const STAMP_SIZE: f64 = 40.0;
+
+impl Stamp {
+    pub const ALL: [Stamp; 6] = [Stamp::ThumbsUp, Stamp::Heart, Stamp::PlusOne, Stamp::Star, Stamp::Question, Stamp::Check];
+
+    pub fn id(self) -> &'static str {
+        match self {
+            Stamp::ThumbsUp => "thumbsUp",
+            Stamp::Heart => "heart",
+            Stamp::PlusOne => "plusOne",
+            Stamp::Star => "star",
+            Stamp::Question => "question",
+            Stamp::Check => "check",
+        }
+    }
+
+    pub fn from_id(s: &str) -> Option<Stamp> {
+        Stamp::ALL.into_iter().find(|b| b.id().eq_ignore_ascii_case(s))
+    }
+
+    pub fn label(self) -> &'static str {
+        match self {
+            Stamp::ThumbsUp => "Thumbs up",
+            Stamp::Heart => "Heart",
+            Stamp::PlusOne => "Plus one",
+            Stamp::Star => "Star",
+            Stamp::Question => "Question",
+            Stamp::Check => "Check",
+        }
+    }
+
+    /// The badge's colour (the mark is white on it).
+    pub fn color(self) -> Color {
+        match self {
+            Stamp::ThumbsUp => Color::from_rgb8_const(0x3B, 0x82, 0xE8),
+            Stamp::Heart => Color::from_rgb8_const(0xE5, 0x48, 0x5F),
+            Stamp::PlusOne => Color::from_rgb8_const(0x2E, 0xA0, 0x63),
+            Stamp::Star => Color::from_rgb8_const(0xEE, 0x9B, 0x1A),
+            Stamp::Question => Color::from_rgb8_const(0x84, 0x5E, 0xD8),
+            Stamp::Check => Color::from_rgb8_const(0x14, 0x96, 0x8C),
+        }
+    }
+
+    /// The mark, drawn for FigCraft from lines, arcs and simple outlines.
+    pub fn mark(self) -> &'static [MarkPart] {
+        match self {
+            // A cuff and a raised hand with its thumb up.
+            Stamp::ThumbsUp => &[
+                MarkPart { d: "M10.5 19 H15 V29 H10.5 Z", filled: true },
+                MarkPart {
+                    d: "M16.5 19 L20.6 11.4 C21.6 9.8 24.6 10.6 24.2 13 L23.4 17 H28.2 C29.8 17 30.9 18.5 30.4 20 L28.4 27.3 C28 28.4 27.1 29 25.9 29 H16.5 Z",
+                    filled: true,
+                },
+            ],
+            // Two round lobes meeting in a point.
+            Stamp::Heart => &[MarkPart {
+                d: "M20 29.5 C12.5 24.5 9.5 20.6 10.4 16.4 C11.3 12.2 16.8 11.2 20 15.4 C23.2 11.2 28.7 12.2 29.6 16.4 C30.5 20.6 27.5 24.5 20 29.5 Z",
+                filled: true,
+            }],
+            Stamp::PlusOne => &[MarkPart { d: "M10 20 H20 M15 15 V25", filled: false }, MarkPart { d: "M24.5 15 L27.5 12.5 V27.5", filled: false }],
+            Stamp::Star => &[MarkPart {
+                d: "M20 10.5 L22.8 16.7 L29.5 17.4 L24.5 21.9 L25.9 28.6 L20 25.2 L14.1 28.6 L15.5 21.9 L10.5 17.4 L17.2 16.7 Z",
+                filled: true,
+            }],
+            Stamp::Question => &[
+                MarkPart { d: "M15.6 16.2 C15.6 10.6 24.4 10.6 24.4 16 C24.4 19.6 20 19.9 20 23.6", filled: false },
+                MarkPart { d: "M18.2 28 A1.8 1.8 0 1 0 21.8 28 A1.8 1.8 0 1 0 18.2 28 Z", filled: true },
+            ],
+            Stamp::Check => &[MarkPart { d: "M12.5 20.5 L18 26 L28 14.5", filled: false }],
+        }
+    }
+}
+
+/// How a connector runs between its ends.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Routing {
+    #[default]
+    Straight,
+    /// Right angles only: out of each end along its side's normal, turning once or twice, around
+    /// the objects it joins when the short way would cross them.
+    Elbow,
+    /// One smooth curve, leaving and arriving along the sides' normals.
+    Curved,
+}
+
+impl Routing {
+    pub fn id(self) -> &'static str {
+        match self {
+            Routing::Straight => "straight",
+            Routing::Elbow => "elbow",
+            Routing::Curved => "curved",
+        }
+    }
+    pub fn from_id(s: &str) -> Option<Routing> {
+        [Routing::Straight, Routing::Elbow, Routing::Curved].into_iter().find(|r| r.id().eq_ignore_ascii_case(s))
+    }
+}
+
+/// The side of an object a connector end is attached to (at its middle).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Side {
+    /// The side facing the other end.
+    #[default]
+    Auto,
+    Top,
+    Right,
+    Bottom,
+    Left,
+}
+
+impl Side {
+    pub fn from_id(s: &str) -> Option<Side> {
+        Some(match s.to_ascii_lowercase().as_str() {
+            "auto" => Side::Auto,
+            "top" => Side::Top,
+            "right" => Side::Right,
+            "bottom" => Side::Bottom,
+            "left" => Side::Left,
+            _ => return None,
+        })
+    }
+
+    /// The side's middle on `b`.
+    pub fn point(self, b: Rect) -> Point {
+        let c = b.center();
+        match self {
+            Side::Top => Point::new(c.x, b.y0),
+            Side::Right => Point::new(b.x1, c.y),
+            Side::Bottom => Point::new(c.x, b.y1),
+            Side::Left => Point::new(b.x0, c.y),
+            Side::Auto => c,
+        }
+    }
+
+    pub fn horizontal(self) -> bool {
+        matches!(self, Side::Left | Side::Right)
+    }
+
+    /// The way out of the side (y down; none for [`Side::Auto`]).
+    pub fn normal(self) -> Vec2 {
+        match self {
+            Side::Top => Vec2::new(0.0, -1.0),
+            Side::Right => Vec2::new(1.0, 0.0),
+            Side::Bottom => Vec2::new(0.0, 1.0),
+            Side::Left => Vec2::new(-1.0, 0.0),
+            Side::Auto => Vec2::ZERO,
+        }
+    }
+}
+
+/// One end of a connector: attached to a layer, or a free point on the page.
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum End {
+    Node {
+        node: NodeId,
+        #[serde(default)]
+        side: Side,
+    },
+    Point {
+        x: f64,
+        y: f64,
+    },
+}
+
+impl End {
+    pub fn node(&self) -> Option<NodeId> {
+        match self {
+            End::Node { node, .. } => Some(*node),
+            End::Point { .. } => None,
+        }
+    }
+}
+
+/// What a connector joins and how it runs (its arrowheads are its stroke's caps).
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Connector {
+    pub from: End,
+    pub to: End,
+    #[serde(default)]
+    pub routing: Routing,
+}
diff --git a/crates/doc/src/colors.rs b/crates/doc/src/colors.rs
index d480f4ea..93d32f0b 100644
--- a/crates/doc/src/colors.rs
+++ b/crates/doc/src/colors.rs
@@ -35,6 +35,9 @@ impl Effect {
 impl TextStyle {
     pub fn for_each_color_mut(&mut self, f: &mut ColorVisitor) {
         self.fills.iter_mut().flatten().for_each(|p| p.for_each_color_mut(f));
+        if let Some(c) = self.decoration_look.as_deref_mut().and_then(|l| l.color.as_mut()) {
+            f(c);
+        }
     }
 }
 
diff --git a/crates/doc/src/colors_tests.rs b/crates/doc/src/colors_tests.rs
index 3a97a5d0..ebf65959 100644
--- a/crates/doc/src/colors_tests.rs
+++ b/crates/doc/src/colors_tests.rs
@@ -28,6 +28,7 @@ fn colourful() -> (Document, NodeId) {
                 close_on_outside: false,
                 background: Some(RED),
                 offset: None,
+                anchor: Default::default(),
             }],
             transition: Default::default(),
             duration_ms: 300,
@@ -134,3 +135,11 @@ fn profile_and_presets_serialize_only_when_set() {
     assert_eq!(back.color_profile, ColorProfile::DisplayP3);
     assert_eq!(back.image_presets, d.image_presets);
 }
+
+#[test]
+fn text_decoration_colour_is_visited() {
+    let mut s = TextStyle::default();
+    s.set_look(|l| l.color = Some(RED));
+    s.for_each_color_mut(&mut |c| *c = Color::BLACK);
+    assert_eq!(s.look().color, Some(Color::BLACK), "decoration colour not visited");
+}
diff --git a/crates/doc/src/facilitation.rs b/crates/doc/src/facilitation.rs
new file mode 100644
index 00000000..fd3ae1d2
--- /dev/null
+++ b/crates/doc/src/facilitation.rs
@@ -0,0 +1,111 @@
+//! A board's facilitation state, shared by everyone on it: the countdown timer and the vote.
+//!
+//! The timer keeps when it ends (or, paused, how long is left), never the ticks: each client works
+//! out the time left from its own clock. A vote's ballots are kept per voter, so two people voting
+//! at once change different entries.
+
+use std::collections::BTreeMap;
+
+use serde::{Deserialize, Serialize};
+
+use crate::{BoardItem, Document, NodeId};
+
+/// The longest a timer runs (24 hours, in milliseconds).
+pub const TIMER_MAX_MS: u64 = 24 * 60 * 60 * 1000;
+/// The most votes one person gets in a vote.
+pub const VOTES_MAX: u32 = 99;
+
+/// A board's countdown.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(tag = "state", rename_all = "camelCase")]
+pub enum BoardTimer {
+    /// Counting down to `ends` (milliseconds since the Unix epoch).
+    Running { ends: u64 },
+    /// Stopped with `left` milliseconds to go.
+    Paused { left: u64 },
+}
+
+impl BoardTimer {
+    /// Milliseconds left at `now` (ms since the Unix epoch); 0 once it has run out.
+    pub fn left(&self, now: u64) -> u64 {
+        match *self {
+            BoardTimer::Running { ends } => ends.saturating_sub(now).min(TIMER_MAX_MS),
+            BoardTimer::Paused { left } => left.min(TIMER_MAX_MS),
+        }
+    }
+}
+
+/// What a vote is on.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum VoteScope {
+    /// Any object on the board.
+    #[default]
+    All,
+    /// Sticky notes only.
+    Stickies,
+    /// The objects that were selected when it started.
+    Only { ids: Vec<NodeId> },
+}
+
+impl VoteScope {
+    /// The object a vote at layer `leaf` goes to: the nearest layer from it up that the vote is
+    /// on (`All`: `whole`, the object a click there picks).
+    pub fn target(&self, doc: &Document, leaf: NodeId, whole: NodeId) -> Option<NodeId> {
+        if matches!(self, VoteScope::All) {
+            return self.takes(doc, whole).then_some(whole);
+        }
+        std::iter::once(leaf).chain(doc.ancestors(leaf)).find(|id| self.takes(doc, *id))
+    }
+
+    /// Whether object `id` takes votes.
+    pub fn takes(&self, doc: &Document, id: NodeId) -> bool {
+        let Some(n) = doc.node(id) else { return false };
+        if doc.pages.contains(&id) || n.parent.is_none() {
+            return false;
+        }
+        match self {
+            VoteScope::All => true,
+            VoteScope::Stickies => matches!(n.board, Some(BoardItem::Sticky { .. })),
+            VoteScope::Only { ids } => ids.contains(&id),
+        }
+    }
+}
+
+/// A vote: how many votes each person has, what they go on, and whether it has ended (then
+/// everyone's votes show). The ballots are [`Document::votes`].
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Vote {
+    pub per_person: u32,
+    #[serde(default)]
+    pub scope: VoteScope,
+    #[serde(default)]
+    pub ended: bool,
+    /// Who started it.
+    #[serde(default, skip_serializing_if = "String::is_empty")]
+    pub by: String,
+}
+
+/// Every voter's ballot: the objects they put their votes on (once per vote).
+pub type Ballots = BTreeMap<String, Vec<NodeId>>;
+
+impl Vote {
+    /// The votes of `ballot` that count: on objects that are still there, up to the cap.
+    pub fn counted<'a>(&self, doc: &'a Document, ballot: &'a [NodeId]) -> impl Iterator<Item = NodeId> + 'a {
+        ballot.iter().copied().filter(|id| doc.node(*id).is_some()).take(self.per_person.min(VOTES_MAX) as usize)
+    }
+
+    /// The votes each object got, most first (ties in layer id order).
+    pub fn tally(&self, doc: &Document, ballots: &Ballots) -> Vec<(NodeId, u32)> {
+        let mut counts: BTreeMap<NodeId, u32> = BTreeMap::new();
+        for ballot in ballots.values() {
+            for id in self.counted(doc, ballot) {
+                *counts.entry(id).or_default() += 1;
+            }
+        }
+        let mut out: Vec<(NodeId, u32)> = counts.into_iter().collect();
+        out.sort_by(|a, b| b.1.cmp(&a.1).then(a.0.cmp(&b.0)));
+        out
+    }
+}
diff --git a/crates/doc/src/geometry.rs b/crates/doc/src/geometry.rs
index 06596ddc..1ee885f5 100644
--- a/crates/doc/src/geometry.rs
+++ b/crates/doc/src/geometry.rs
@@ -17,8 +17,10 @@ pub fn shape_path(n: &Node) -> Option<BezPath> {
         | NodeKind::Section { .. } => figcraft_geom::rounded_rect(w, h, c.radii, c.smoothing),
         NodeKind::Slice => figcraft_geom::rounded_rect(w, h, [0.0; 4], 0.0),
         NodeKind::Ellipse { start, sweep, inner } => figcraft_geom::ellipse(w, h, *start, *sweep, *inner),
-        NodeKind::Polygon { count } => figcraft_geom::rounded_polygon(&figcraft_geom::polygon_points(w, h, *count), c.radii[0]),
-        NodeKind::Star { count, inner_ratio } => figcraft_geom::rounded_polygon(&figcraft_geom::star_points(w, h, *count, *inner_ratio), c.radii[0]),
+        NodeKind::Polygon { count } => figcraft_geom::smoothed_polygon(&figcraft_geom::polygon_points(w, h, *count), c.radii[0], c.smoothing),
+        NodeKind::Star { count, inner_ratio } => {
+            figcraft_geom::smoothed_polygon(&figcraft_geom::star_points(w, h, *count, *inner_ratio), c.radii[0], c.smoothing)
+        }
         NodeKind::Line => {
             let mut p = BezPath::new();
             p.move_to((0.0, 0.0));
@@ -51,6 +53,10 @@ pub fn is_closed(n: &Node) -> bool {
     }
 }
 
+/// How much further than `tol` a stroke with nothing filled reaches: a thin line or stroke-only path
+/// is hard to land on with the plain tolerance, so it gets a wider band (5 screen px for the usual 2 px tolerance).
+const STROKE_REACH: f64 = 2.5;
+
 /// Whether `pt` hits `n` itself; in `outline` mode (nothing filled on the canvas) a shape only where
 /// its outline is.
 fn hits_node_itself(doc: &Document, id: NodeId, n: &Node, pt: Point, tol: f64, outline: bool) -> bool {
@@ -62,13 +68,22 @@ fn hits_node_itself(doc: &Document, id: NodeId, n: &Node, pt: Point, tol: f64, o
         NodeKind::Group | NodeKind::BooleanOp { .. } | NodeKind::Page { .. } => false,
         NodeKind::Text(_) | NodeKind::Slice => n.local_rect().inflate(tol_l, tol_l).contains(lp),
         NodeKind::Line => {
-            let half = (n.stroke.weight / 2.0).max(tol_l);
+            let half = (n.stroke.weight / 2.0).max(tol_l * STROKE_REACH);
             lp.x >= -half && lp.x <= n.width + half && lp.y.abs() <= half
         }
         NodeKind::Frame | NodeKind::Component { .. } | NodeKind::ComponentSet { .. } | NodeKind::Instance { .. } | NodeKind::Section { .. } => {
             n.local_rect().inflate(tol_l, tol_l).contains(lp)
         }
-        _ => shape_path(n).is_some_and(|path| hits_path(n, &path, lp, tol_l, !outline && is_closed(n) && path.winding(lp) != 0)),
+        _ => shape_path(n).is_some_and(|path| hits_path(n, &path, lp, tol_l, !outline && is_closed(n) && fills_point(n, &path, lp))),
+    }
+}
+
+/// Whether the fill of `n`, drawn as `path`, covers `lp` (vectors follow the rule of
+/// [`VectorNetwork::fill_contains`](crate::VectorNetwork::fill_contains): even-odd when any region asks for it).
+fn fills_point(n: &Node, path: &BezPath, lp: Point) -> bool {
+    match &n.kind {
+        NodeKind::Vector { network } => network.fill_contains(lp),
+        _ => path.winding(lp) != 0,
     }
 }
 
@@ -78,7 +93,9 @@ fn hits_path(n: &Node, path: &BezPath, lp: Point, tol: f64, inside: bool) -> boo
     if inside && (n.fills.iter().any(|f| f.visible) || !n.has_visible_stroke()) {
         return true;
     }
-    let reach = (n.stroke.max_weight() / 2.0).max(tol);
+    // Only a stroke with nothing filled gets the wider band: a filled shape's edge keeps the plain one.
+    let stroke_only = n.has_visible_stroke() && !n.fills.iter().any(|f| f.visible);
+    let reach = (n.stroke.max_weight() / 2.0).max(if stroke_only { tol * STROKE_REACH } else { tol });
     if !path.bounding_box().inflate(reach, reach).contains(lp) {
         return false;
     }
@@ -111,7 +128,7 @@ pub fn hit_leaf(doc: &Document, page: NodeId, pt: Point, tol: f64, result: BoolR
 
 /// Whether child `c` of `parent` is masked at `pt`: a visible mask below it (the nearest mask
 /// below it, a hidden one masks nothing) doesn't cover the point, so nothing of `c` shows there.
-fn masked_out(doc: &Document, parent: &Node, c: NodeId, pt: Point) -> bool {
+pub fn masked_out(doc: &Document, parent: &Node, c: NodeId, pt: Point) -> bool {
     if !doc.has_masks() {
         return false;
     }
@@ -249,6 +266,18 @@ pub fn select_target(doc: &Document, leaf: NodeId, context: &[NodeId], deep: boo
     if deep {
         return leaf;
     }
+    let target = level_target(doc, leaf, context);
+    // A board object is picked whole (a sticky, not its text), unless a layer inside it is selected.
+    let mut chain = doc.ancestors(target);
+    chain.reverse();
+    chain.push(target);
+    chain
+        .into_iter()
+        .find(|c| doc.node(*c).is_some_and(Node::is_board_atom) && !context.iter().any(|s| s != c && doc.is_ancestor(*c, *s)))
+        .unwrap_or(target)
+}
+
+fn level_target(doc: &Document, leaf: NodeId, context: &[NodeId]) -> NodeId {
     // Chain from the page's child down to the leaf.
     let mut chain: Vec<NodeId> = doc.ancestors(leaf);
     chain.reverse();
diff --git a/crates/doc/src/handoff.rs b/crates/doc/src/handoff.rs
index 9700b56c..04bf5e95 100644
--- a/crates/doc/src/handoff.rs
+++ b/crates/doc/src/handoff.rs
@@ -71,8 +71,38 @@ impl Document {
         if let (Some(now), Some(r)) = (self.node(root), d.nodes.get_mut(&root)) {
             Arc::make_mut(r).parent = now.parent;
         }
+        // A damaged file can give a historical layer itself (or an ancestor) as a child; a copy
+        // with a cycle under the root would send every walk of it round forever.
+        if !d.is_tree_under(root) {
+            return None;
+        }
         d.dev_snapshots.clear();
         d.dirty = crate::Dirty::default();
         Some(d)
     }
+
+    /// Whether every layer under `root` is reached once (no layer is its own descendant or listed
+    /// by two parents), walking iteratively and stopping at the first repeat.
+    fn is_tree_under(&self, root: NodeId) -> bool {
+        let mut seen = BTreeSet::new();
+        let mut stack = vec![root];
+        while let Some(id) = stack.pop() {
+            if !seen.insert(id) {
+                return false;
+            }
+            let Some(n) = self.nodes.get(&id) else {
+                return false;
+            };
+            for &c in &n.children {
+                let Some(child) = self.nodes.get(&c) else {
+                    return false;
+                };
+                if child.parent != Some(id) {
+                    return false;
+                }
+                stack.push(c);
+            }
+        }
+        true
+    }
 }
diff --git a/crates/doc/src/handoff_tests.rs b/crates/doc/src/handoff_tests.rs
index 7fc26898..79b97194 100644
--- a/crates/doc/src/handoff_tests.rs
+++ b/crates/doc/src/handoff_tests.rs
@@ -34,3 +34,54 @@ fn a_snapshot_shows_the_layer_as_it_was() {
     doc.dev_snapshots.clear();
     assert!(serde_json::to_value(&doc).unwrap().get("dev_snapshots").is_none());
 }
+
+#[test]
+fn a_snapshot_with_a_layer_inside_itself_is_refused() {
+    let mut doc = Document::new("d");
+    let page = doc.first_page().unwrap();
+    let f = doc.create(page, NodeKind::Frame, "Screen", 0.0, 0.0, 100.0, 100.0).unwrap();
+    let mut snap = doc.snapshot_subtree(f).unwrap();
+    // A damaged file: the historical frame lists itself as a child.
+    let mut bad = (*snap.nodes[0]).clone();
+    bad.children.push(f);
+    snap.nodes[0] = Arc::new(bad);
+    doc.dev_snapshots.insert(f, Arc::new(snap));
+    assert!(doc.with_dev_snapshot(f).is_none());
+}
+
+#[test]
+fn a_snapshot_with_missing_or_nonreciprocal_child_is_refused() {
+    use crate::NodeId;
+    let mut doc = Document::new("d");
+    let page = doc.first_page().unwrap();
+    let f = doc.create(page, NodeKind::Frame, "Screen", 0.0, 0.0, 100.0, 100.0).unwrap();
+    let _c1 = doc.create(f, NodeKind::Rectangle, "R1", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let snap = doc.snapshot_subtree(f).unwrap();
+
+    let mut missing = snap.clone();
+    let mut bad_root = (*missing.nodes[0]).clone();
+    bad_root.children.push(NodeId(99999));
+    missing.nodes[0] = Arc::new(bad_root);
+    doc.dev_snapshots.insert(f, Arc::new(missing));
+    assert!(doc.with_dev_snapshot(f).is_none());
+
+    let mut nonrecip = snap.clone();
+    let mut bad_child = (*nonrecip.nodes[1]).clone();
+    bad_child.parent = Some(NodeId(88888));
+    nonrecip.nodes[1] = Arc::new(bad_child);
+    doc.dev_snapshots.insert(f, Arc::new(nonrecip));
+    assert!(doc.with_dev_snapshot(f).is_none());
+}
+
+#[test]
+fn validate_is_linear_in_a_wide_parent() {
+    let mut doc = Document::new("d");
+    let page = doc.first_page().unwrap();
+    for i in 0..5_000 {
+        doc.create(page, NodeKind::Rectangle, "R", f64::from(i), 0.0, 1.0, 1.0).unwrap();
+    }
+    assert!(doc.validate().is_empty());
+    let kid = doc.node(page).unwrap().children[0];
+    doc.get_mut(page).unwrap().children.retain(|c| *c != kid);
+    assert!(doc.validate().iter().any(|m| m.contains("not listed in parent")));
+}
diff --git a/crates/doc/src/lib.rs b/crates/doc/src/lib.rs
index 71c6da39..caf0c861 100644
--- a/crates/doc/src/lib.rs
+++ b/crates/doc/src/lib.rs
@@ -8,8 +8,10 @@
 //! live in higher crates.
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
 
+pub mod board;
 pub mod colors;
 pub mod comments;
+pub mod facilitation;
 pub mod geometry;
 pub mod handoff;
 pub mod ids;
@@ -23,8 +25,10 @@ pub mod vector;
 pub mod vector_faces;
 pub mod vector_regions;
 
+pub use board::*;
 pub use colors::*;
 pub use comments::*;
+pub use facilitation::*;
 pub use figcraft_color as color;
 pub use figcraft_geom as geom;
 pub use handoff::*;
@@ -42,6 +46,10 @@ use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use std::sync::Arc;
 
+/// Deepest descendant [`Document::world_render_bounds`] follows: as deep as the renderer draws
+/// (`figcraft_render::MAX_EXPORT_DEPTH`), so a crafted chain can't overflow the stack (#1062).
+const MAX_RENDER_DEPTH: usize = 256;
+
 /// Stable node identifier, unique within a document.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 #[serde(transparent)]
@@ -77,17 +85,19 @@ pub enum DocError {
 
 pub type DocResult<T> = Result<T, DocError>;
 
-/// The set of touched node ids, and whether any layer is a mask (worked out when first asked
-/// after a change: hit testing skips its mask checks without one). Never part of equality or
+/// The set of touched node ids, whether any layer is a mask (hit testing skips its mask checks
+/// without one) and the largest background blur radius (renders keep that much overlap between
+/// their bands), both worked out when first asked after a change. Never part of equality or
 /// serialisation.
 #[derive(Clone, Debug, Default)]
-pub struct Dirty(pub std::collections::BTreeSet<NodeId>, std::sync::OnceLock<bool>);
+pub struct Dirty(pub std::collections::BTreeSet<NodeId>, std::sync::OnceLock<bool>, std::sync::OnceLock<f64>);
 
 impl Dirty {
     /// Record node `id` as touched (edited, added or removed).
     fn touch(&mut self, id: NodeId) {
         self.0.insert(id);
         self.1 = std::sync::OnceLock::new();
+        self.2 = std::sync::OnceLock::new();
     }
 }
 
@@ -155,6 +165,9 @@ pub struct ImageData {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Document {
     pub name: String,
+    /// A design file or a board (files from before boards are design files).
+    #[serde(default, skip_serializing_if = "FileKind::is_design")]
+    pub kind: FileKind,
     /// Page ids in order.
     pub pages: Vec<NodeId>,
     nodes: imbl::OrdMap<NodeId, Arc<Node>>,
@@ -197,6 +210,15 @@ pub struct Document {
     /// [`handoff`]).
     #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
     pub dev_snapshots: BTreeMap<NodeId, Arc<DevSnapshot>>,
+    /// A board's countdown (see [`facilitation`]).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub timer: Option<BoardTimer>,
+    /// A board's vote, running or ended.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub vote: Option<Vote>,
+    /// The vote's ballots, by voter.
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub votes: Ballots,
 }
 
 impl Default for Document {
@@ -219,6 +241,7 @@ impl Document {
     pub fn without_pages(name: impl Into<String>) -> Self {
         Self {
             name: name.into(),
+            kind: FileKind::Design,
             pages: Vec::new(),
             nodes: imbl::OrdMap::new(),
             dirty: Dirty::default(),
@@ -235,6 +258,9 @@ impl Document {
             image_presets: Vec::new(),
             annotation_categories: None,
             dev_snapshots: BTreeMap::new(),
+            timer: None,
+            vote: None,
+            votes: BTreeMap::new(),
         }
     }
 
@@ -254,6 +280,11 @@ impl Document {
         *self.dirty.1.get_or_init(|| self.nodes.values().any(|n| n.is_mask))
     }
 
+    /// The largest background blur or glass radius of any layer's effects (0 without any).
+    pub fn max_backdrop_radius(&self) -> f64 {
+        *self.dirty.2.get_or_init(|| self.nodes.values().flat_map(|n| n.effects.iter()).map(Effect::backdrop_radius).fold(0.0, f64::max))
+    }
+
     /// Node ids touched so far (without clearing).
     pub fn dirty(&self) -> &std::collections::BTreeSet<NodeId> {
         &self.dirty.0
@@ -262,7 +293,16 @@ impl Document {
     /// A fresh unused id (in this document's client space during a collaboration session; see
     /// [`set_client_id`](Self::set_client_id)).
     pub fn alloc_id(&mut self) -> NodeId {
-        self.next_id.alloc()
+        // A file's saved `next_id` can be stale (behind ids already in use): skip taken ids.
+        let mut id = self.next_id.alloc();
+        while self.nodes.contains_key(&id) {
+            let next = self.next_id.alloc();
+            if next == id {
+                break;
+            }
+            id = next;
+        }
+        id
     }
 
     /// The id [`alloc_id`](Self::alloc_id) returns next.
@@ -446,8 +486,9 @@ impl Document {
                 return true;
             }
             guard += 1;
-            if guard > 10_000 {
-                return false;
+            // More hops than nodes means the parent chain loops; fail closed so callers reject the move.
+            if guard > self.nodes.len() {
+                return true;
             }
             cur = self.node(c).and_then(|n| n.parent);
         }
@@ -680,12 +721,16 @@ impl Document {
     /// a clipping frame's own area, else that and what its visible children show (masked
     /// children only within their mask). A group is what its children show, grown by its effects.
     pub fn world_render_bounds(&self, id: NodeId) -> Option<Rect> {
+        self.render_bounds_at(id, 0)
+    }
+
+    fn render_bounds_at(&self, id: NodeId, depth: usize) -> Option<Rect> {
         let n = self.node(id)?;
         let own = n.own_paint_bounds(self.world_transform(id));
-        if n.clip && n.kind.is_frame_like() && !n.kind.bounds_follow_children() {
+        if (n.clip && n.kind.is_frame_like() && !n.kind.bounds_follow_children()) || depth >= MAX_RENDER_DEPTH {
             return Some(own);
         }
-        Some(match (self.children_render_bounds(n), &n.kind) {
+        Some(match (self.children_render_bounds(n, depth + 1), &n.kind) {
             (Some(kids), NodeKind::Group) => n.grow_by_effects(kids),
             (Some(kids), _) => own.union(kids),
             (None, _) => own,
@@ -693,15 +738,15 @@ impl Document {
     }
 
     /// What `n`'s visible children show, together: each mask's run within the mask's bounds.
-    fn children_render_bounds(&self, n: &Node) -> Option<Rect> {
+    fn children_render_bounds(&self, n: &Node, depth: usize) -> Option<Rect> {
         let shown = |i: &NodeId| self.node(*i).is_some_and(|c| c.visible && !c.is_mask);
         let mut out: Option<Rect> = None;
         for run in self.paint_runs(n) {
             let ids = n.children.get(run).unwrap_or(&[]);
             let mask = ids.first().copied().filter(|m| self.node(*m).is_some_and(|c| c.is_mask && c.visible));
-            let r = ids.iter().filter(|i| shown(i)).filter_map(|i| self.world_render_bounds(*i)).reduce(|a, b| a.union(b));
+            let r = ids.iter().filter(|i| shown(i)).filter_map(|i| self.render_bounds_at(*i, depth)).reduce(|a, b| a.union(b));
             let r = match mask {
-                Some(m) => r.zip(self.world_render_bounds(m)).map(|(a, b)| a.intersect(b)).filter(|x| x.width() > 0.0 && x.height() > 0.0),
+                Some(m) => r.zip(self.render_bounds_at(m, depth)).map(|(a, b)| a.intersect(b)).filter(|x| x.width() > 0.0 && x.height() > 0.0),
                 None => r,
             };
             out = match (out, r) {
@@ -814,6 +859,11 @@ impl Document {
             return Err(DocError::NotContainer(parent));
         }
         let new_root = *map.get(&root).ok_or(DocError::NoNode(root))?;
+        // Never overwrite an existing node, or another copy, with a copy.
+        let mut copied = std::collections::BTreeSet::new();
+        if let Some(taken) = nodes.iter().filter_map(|n| map.get(&n.id)).find(|i| self.nodes.contains_key(*i) || !copied.insert(**i)) {
+            return Err(DocError::Invalid(format!("node {taken} already exists")));
+        }
         for n in nodes {
             let Some(new_id) = map.get(&n.id) else { continue };
             let mut c = n.clone();
@@ -828,6 +878,16 @@ impl Document {
             {
                 *component = *m;
             }
+            // A measurement copied with the layer it measures to measures to the copy; one to a
+            // layer left behind isn't copied.
+            c.measurements.retain_mut(|m| match m.to {
+                Some(t) => map.get(&t).map(|n| m.to = Some(*n)).is_some(),
+                None => true,
+            });
+            // A connector (or label) copied with what it joins joins the copies.
+            if let Some(b) = c.board.as_mut() {
+                b.remap(map);
+            }
             // A pattern tiling a layer of the copy tiles the copy's layer.
             for p in c.fills.iter_mut().chain(c.strokes.iter_mut()) {
                 if let figcraft_color::PaintKind::Pattern(pt) = &mut p.kind
@@ -942,56 +1002,85 @@ impl Document {
         self.styles.iter().find(|s| s.id == id || s.name == id)
     }
 
-    /// The effective variable modes for a node (walking up its ancestors).
+    /// The effective variable modes for a node: the ones it sets over [`Self::inherited_modes`].
     pub fn modes_for(&self, id: NodeId) -> BTreeMap<CollectionId, ModeId> {
-        let mut out = BTreeMap::new();
-        let mut chain = vec![id];
-        chain.extend(self.ancestors(id));
-        for c in chain.into_iter().rev() {
-            if let Some(n) = self.node(c) {
-                for (k, v) in &n.var_modes {
-                    out.insert(k.clone(), v.clone());
-                }
-            }
+        let mut out = self.inherited_modes(id);
+        if let Some(n) = self.node(id) {
+            out.extend(n.var_modes.iter().map(|(k, v)| (k.clone(), v.clone())));
         }
         out
     }
 
+    /// The modes a node is on where it sets none (Auto): its ancestors', and for an instance the
+    /// ones its main component sets, which are closer than any container's.
+    pub fn inherited_modes(&self, id: NodeId) -> BTreeMap<CollectionId, ModeId> {
+        let mut out = BTreeMap::new();
+        for c in self.ancestors(id).into_iter().rev() {
+            if let Some(n) = self.node(c) {
+                out.extend(self.main_modes(n).chain(&n.var_modes).map(|(k, v)| (k.clone(), v.clone())));
+            }
+        }
+        if let Some(n) = self.node(id) {
+            out.extend(self.main_modes(n).map(|(k, v)| (k.clone(), v.clone())));
+        }
+        out
+    }
+
+    /// The modes an instance's main component sets (none for other layers).
+    fn main_modes<'a>(&'a self, n: &Node) -> impl Iterator<Item = (&'a CollectionId, &'a ModeId)> {
+        let main = match n.kind {
+            NodeKind::Instance { component, .. } => self.node(component),
+            _ => None,
+        };
+        main.into_iter().flat_map(|m| &m.var_modes)
+    }
+
     /// Check structural invariants (used by tests and after loading untrusted files).
     pub fn validate(&self) -> Vec<String> {
+        // Hostile files can break an invariant per child; keep only the first few reports.
+        const MAX_ISSUES: usize = 100;
+        fn note(issues: &mut Vec<String>, msg: impl FnOnce() -> String) {
+            if issues.len() < MAX_ISSUES {
+                issues.push(msg());
+            }
+        }
         let mut issues = Vec::new();
+        // Every (parent, child) edge and the page list, indexed once so each node's checks are
+        // lookups: a wide parent or a long page list doesn't make validation quadratic.
+        let edges: std::collections::BTreeSet<(NodeId, NodeId)> = self.nodes.iter().flat_map(|(p, n)| n.children.iter().map(|c| (*p, *c))).collect();
+        let page_ids: std::collections::BTreeSet<NodeId> = self.pages.iter().copied().collect();
         for (id, n) in self.nodes.iter() {
             if n.id != *id {
-                issues.push(format!("node key {id} has id {}", n.id));
+                note(&mut issues, || format!("node key {id} has id {}", n.id));
             }
             let mut seen = std::collections::BTreeSet::new();
             for c in &n.children {
                 if !seen.insert(*c) {
-                    issues.push(format!("child {c} listed twice in {id}"));
+                    note(&mut issues, || format!("child {c} listed twice in {id}"));
                 }
                 match self.node(*c) {
                     Some(cn) if cn.parent == Some(*id) => {}
-                    Some(_) => issues.push(format!("child {c} of {id} has another parent")),
-                    None => issues.push(format!("child {c} of {id} missing")),
+                    Some(_) => note(&mut issues, || format!("child {c} of {id} has another parent")),
+                    None => note(&mut issues, || format!("child {c} of {id} missing")),
                 }
             }
             if let Some(p) = n.parent
-                && !self.node(p).is_some_and(|pn| pn.children.contains(id))
+                && !(self.node(p).is_some() && edges.contains(&(p, *id)))
             {
-                issues.push(format!("{id} not listed in parent {p}"));
+                note(&mut issues, || format!("{id} not listed in parent {p}"));
             }
             // The library store's root is a page that is never listed.
-            let listed = self.pages.contains(id) || (n.is_page() && self.libraries.store == Some(*id));
+            let listed = page_ids.contains(id) || (n.is_page() && self.libraries.store == Some(*id));
             if n.is_page() != listed {
-                issues.push(format!("page list mismatch for {id}"));
+                note(&mut issues, || format!("page list mismatch for {id}"));
             }
             if n.is_page() && n.parent.is_some() {
-                issues.push(format!("page {id} has a parent"));
+                note(&mut issues, || format!("page {id} has a parent"));
             }
         }
         let reachable = self.reachable();
         for id in self.nodes.keys().filter(|k| !reachable.contains(*k)) {
-            issues.push(format!("{id} is not under a page (cycle or detached)"));
+            note(&mut issues, || format!("{id} is not under a page (cycle or detached)"));
         }
         issues
     }
@@ -1117,8 +1206,14 @@ impl Document {
     /// mask with the layers above it up to the next mask, or a single layer. An auto layout frame
     /// whose first child paints on top paints the runs in reverse (see [`Node::paint_order`]).
     pub fn paint_runs(&self, n: &Node) -> Vec<std::ops::Range<usize>> {
-        let kids = &n.children;
-        let node = |i: usize| kids.get(i).and_then(|k| self.node(*k));
+        let kids: Vec<Option<&Node>> = n.children.iter().map(|k| self.node(*k)).collect();
+        Self::paint_runs_of(&kids, n.layout.as_ref().is_some_and(|l| l.reverse_z))
+    }
+
+    /// [`Self::paint_runs`] of children already looked up (`None`: not in the document), last run
+    /// first when `reverse_z`.
+    pub fn paint_runs_of(kids: &[Option<&Node>], reverse_z: bool) -> Vec<std::ops::Range<usize>> {
+        let node = |i: usize| kids.get(i).copied().flatten();
         let mut runs = Vec::new();
         let mut i = 0;
         while i < kids.len() {
@@ -1131,7 +1226,7 @@ impl Document {
             runs.push(i..j);
             i = j;
         }
-        if n.layout.as_ref().is_some_and(|l| l.reverse_z) {
+        if reverse_z {
             runs.reverse();
         }
         runs
@@ -1175,6 +1270,8 @@ mod proto_expr_parse_tests;
 #[cfg(test)]
 mod proto_expr_tests;
 #[cfg(test)]
+mod proto_overlay_anchor_tests;
+#[cfg(test)]
 mod tests;
 #[cfg(test)]
 mod vector_regions_tests;
diff --git a/crates/doc/src/node.rs b/crates/doc/src/node.rs
index d43b4b2f..59a60992 100644
--- a/crates/doc/src/node.rs
+++ b/crates/doc/src/node.rs
@@ -218,7 +218,7 @@ pub struct Annotation {
 /// (`figcraft_engine::code_connect`).
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct CodeLink {
-    /// `react`, `swiftui`, `compose` or `flutter`.
+    /// `react`, `leptos`, `vue`, `swiftui`, `compose`, `arkui` or `flutter`.
     pub language: String,
     /// What the snippet imports from (`@acme/ui`, a Swift module, a Kotlin name).
     #[serde(default, skip_serializing_if = "String::is_empty")]
@@ -237,6 +237,17 @@ pub struct DevResource {
     pub name: String,
 }
 
+/// A measurement kept on the canvas for developers, stored on the layer it starts from: to another
+/// layer (`to`), or across one of the layer's own sides (`side`). Dev Mode draws it from the layers'
+/// current bounds, so it follows them.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Measurement {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub to: Option<NodeId>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub side: Option<crate::Side>,
+}
+
 /// A kind of annotation (Development, Accessibility…): its stable id, name and the colour its
 /// callouts are drawn in.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -386,6 +397,11 @@ impl NodeKind {
         self.has_corner_radius() && !matches!(self, NodeKind::Polygon { .. } | NodeKind::Star { .. } | NodeKind::Vector { .. })
     }
 
+    /// Kinds whose rounded corners are drawn with corner smoothing (a vector's rounded points are drawn without it).
+    pub fn has_corner_smoothing(&self) -> bool {
+        self.has_corner_radius() && !matches!(self, NodeKind::Vector { .. })
+    }
+
     pub fn text(&self) -> Option<&TextData> {
         match self {
             NodeKind::Text(t) => Some(t),
@@ -518,6 +534,12 @@ pub struct Node {
     /// Dev resources: links for developers (docs, code, tickets…), in the order they were added.
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub dev_resources: Vec<DevResource>,
+    /// Dev Mode measurements that start from this layer, in the order they were added.
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub measurements: Vec<Measurement>,
+    /// On a board: what this object is (a sticky note, a connector, a stamp…).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub board: Option<crate::BoardItem>,
 }
 
 pub(crate) fn yes() -> bool {
@@ -628,6 +650,8 @@ impl Node {
             annotations: Vec::new(),
             code_links: Vec::new(),
             dev_resources: Vec::new(),
+            measurements: Vec::new(),
+            board: None,
         }
     }
 
@@ -653,6 +677,11 @@ impl Node {
         matches!(self.kind, NodeKind::Page { .. })
     }
 
+    /// A board object selected and moved as a whole (a sticky, a shape with text, a stamp…).
+    pub fn is_board_atom(&self) -> bool {
+        self.board.as_ref().is_some_and(crate::BoardItem::is_atom)
+    }
+
     /// A section whose contents are hidden: only its name and outline show; its children are
     /// skipped when rendering and hit testing.
     pub fn hides_contents(&self) -> bool {
diff --git a/crates/doc/src/props.rs b/crates/doc/src/props.rs
index 4f6491c1..0d4361b2 100644
--- a/crates/doc/src/props.rs
+++ b/crates/doc/src/props.rs
@@ -475,7 +475,7 @@ impl WidthPreset {
     }
 
     pub fn from_id(s: &str) -> Option<WidthPreset> {
-        let s: String = s.chars().filter(|c| c.is_ascii_alphanumeric()).collect();
+        let s: String = s.chars().filter(char::is_ascii_alphanumeric).collect();
         WidthPreset::ALL
             .into_iter()
             .find(|p| p.id().eq_ignore_ascii_case(&s) || p.label().replace(' ', "").eq_ignore_ascii_case(&s))
@@ -795,7 +795,7 @@ fn yes() -> bool {
 
 impl Effect {
     /// Effect types in the order the Design panel lists them: (label, type name).
-    pub const TYPES: [(&'static str, &'static str); 7] = [
+    pub const TYPES: [(&str, &str); 7] = [
         ("Drop shadow", "dropShadow"),
         ("Inner shadow", "innerShadow"),
         ("Layer blur", "layerBlur"),
@@ -1233,11 +1233,14 @@ pub enum ExportFormat {
     Svg,
     Pdf,
     Webp,
+    /// Android Vector Drawable (an `.xml` drawable resource).
+    VectorDrawable,
 }
 
 impl ExportFormat {
     /// Every format, in the order the export menus list them.
-    pub const ALL: [ExportFormat; 5] = [ExportFormat::Png, ExportFormat::Jpg, ExportFormat::Svg, ExportFormat::Pdf, ExportFormat::Webp];
+    pub const ALL: [ExportFormat; 6] =
+        [ExportFormat::Png, ExportFormat::Jpg, ExportFormat::Svg, ExportFormat::Pdf, ExportFormat::Webp, ExportFormat::VectorDrawable];
 
     /// Pixel formats (their size depends on the export scale).
     pub fn is_raster(self) -> bool {
@@ -1252,9 +1255,15 @@ impl ExportFormat {
             ExportFormat::Svg => "SVG",
             ExportFormat::Pdf => "PDF",
             ExportFormat::Webp => "WebP",
+            ExportFormat::VectorDrawable => "XML",
         }
     }
 
+    /// Formats whose output is vector (one file whatever the scale).
+    pub fn is_vector(self) -> bool {
+        matches!(self, ExportFormat::Svg | ExportFormat::Pdf | ExportFormat::VectorDrawable)
+    }
+
     pub fn ext(self) -> &'static str {
         match self {
             ExportFormat::Png => "png",
@@ -1262,6 +1271,7 @@ impl ExportFormat {
             ExportFormat::Svg => "svg",
             ExportFormat::Pdf => "pdf",
             ExportFormat::Webp => "webp",
+            ExportFormat::VectorDrawable => "xml",
         }
     }
     pub fn from_ext(s: &str) -> Option<Self> {
@@ -1271,6 +1281,7 @@ impl ExportFormat {
             "svg" => Some(ExportFormat::Svg),
             "pdf" => Some(ExportFormat::Pdf),
             "webp" => Some(ExportFormat::Webp),
+            "xml" | "vd" | "vectordrawable" => Some(ExportFormat::VectorDrawable),
             _ => None,
         }
     }
@@ -1439,6 +1450,44 @@ pub struct ExportSetting {
     /// SVG: strokes as `stroke` attributes where that's exact (on), else as outlines.
     #[serde(skip_serializing_if = "is_true")]
     pub svg_simplify_stroke: bool,
+    /// Android Vector Drawable: what to do with what a drawable can't hold exactly.
+    #[serde(skip_serializing_if = "VdCompat::is_default")]
+    pub vd_compat: VdCompat,
+}
+
+/// How an Android Vector Drawable export handles what the format can't draw exactly (layer
+/// opacity over overlapping shapes, even-odd fills, diamond gradients, alpha masks).
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
+#[serde(rename_all = "camelCase")]
+pub enum VdCompat {
+    /// The closest drawing, with a warning for each approximation.
+    #[default]
+    BestEffort,
+    /// Never approximate: what can't be drawn exactly is left out, with a warning.
+    Exact,
+    /// Write what maps, leave out the rest, no warnings.
+    Ignore,
+}
+
+impl VdCompat {
+    pub const ALL: [VdCompat; 3] = [VdCompat::BestEffort, VdCompat::Exact, VdCompat::Ignore];
+
+    fn is_default(&self) -> bool {
+        *self == VdCompat::BestEffort
+    }
+
+    /// The name commands, files and the CLI use ("bestEffort").
+    pub fn key(self) -> &'static str {
+        match self {
+            VdCompat::BestEffort => "bestEffort",
+            VdCompat::Exact => "exact",
+            VdCompat::Ignore => "ignore",
+        }
+    }
+
+    pub fn from_key(s: &str) -> Option<Self> {
+        Self::ALL.into_iter().find(|c| c.key() == s)
+    }
 }
 
 impl Default for ExportSetting {
@@ -1453,6 +1502,7 @@ impl Default for ExportSetting {
             svg_outline_text: true,
             svg_id_attribute: false,
             svg_simplify_stroke: true,
+            vd_compat: VdCompat::BestEffort,
         }
     }
 }
diff --git a/crates/doc/src/proto.rs b/crates/doc/src/proto.rs
index 91d2e8eb..eaa1ccef 100644
--- a/crates/doc/src/proto.rs
+++ b/crates/doc/src/proto.rs
@@ -507,6 +507,47 @@ impl OverlayPosition {
     }
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
+#[serde(rename_all = "camelCase")]
+pub enum OverlayAnchor {
+    #[default]
+    Screen,
+    TriggerInside,
+    TriggerOutside,
+}
+
+impl OverlayAnchor {
+    /// The default (the screen places the overlay), which files and JSON leave out.
+    pub fn is_screen(&self) -> bool {
+        *self == OverlayAnchor::Screen
+    }
+
+    /// Gives None for Screen and for Manual.
+    pub fn offset(self, position: OverlayPosition, trigger: [f64; 2], overlay: [f64; 2]) -> Option<[f64; 2]> {
+        use OverlayPosition as P;
+        let ([tw, th], [ow, oh]) = (trigger, overlay);
+        let outside = match self {
+            OverlayAnchor::Screen => return None,
+            OverlayAnchor::TriggerInside => false,
+            OverlayAnchor::TriggerOutside => true,
+        };
+        let x = match position {
+            P::TopLeft | P::BottomLeft => 0.0,
+            P::Center | P::TopCenter | P::BottomCenter => (tw - ow) / 2.0,
+            P::TopRight | P::BottomRight => tw - ow,
+            P::Manual => return None,
+        };
+        let y = match position {
+            P::TopLeft | P::TopCenter | P::TopRight if outside => -oh,
+            P::TopLeft | P::TopCenter | P::TopRight => 0.0,
+            P::BottomLeft | P::BottomCenter | P::BottomRight if outside => th,
+            P::BottomLeft | P::BottomCenter | P::BottomRight => th - oh,
+            P::Center | P::Manual => (th - oh) / 2.0,
+        };
+        Some([x, y])
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(tag = "type", rename_all = "camelCase")]
 pub enum Action {
@@ -538,6 +579,9 @@ pub enum Action {
         /// opened it (x, y). None = right below that layer.
         #[serde(default, skip_serializing_if = "Option::is_none")]
         offset: Option<[f64; 2]>,
+        /// The incumbent has no such option. The .fig export writes it as a manual offset.
+        #[serde(default, skip_serializing_if = "OverlayAnchor::is_screen")]
+        anchor: OverlayAnchor,
     },
     SwapOverlay {
         dest: NodeId,
@@ -860,7 +904,35 @@ pub struct Device {
 
 impl PrototypeSettings {
     /// The devices to pick from ("None" presents the frame at its own size).
-    pub const DEVICES: [Device; 6] = [
+    pub const DEVICES: [Device; 19] = [
+        Device {
+            name: "iPhone 17",
+            width: 402.0,
+            height: 874.0,
+            rotates: true,
+            colors: &[c("Black", 0x38, 0x39, 0x3D), c("White", 0xE9, 0xE9, 0xE5)],
+        },
+        Device {
+            name: "iPhone 17 Pro",
+            width: 402.0,
+            height: 874.0,
+            rotates: true,
+            colors: &[c("Black", 0x38, 0x39, 0x3D), c("Silver", 0xD7, 0xD7, 0xD5)],
+        },
+        Device {
+            name: "iPhone 17 Pro Max",
+            width: 440.0,
+            height: 956.0,
+            rotates: true,
+            colors: &[c("Black", 0x38, 0x39, 0x3D), c("Silver", 0xD7, 0xD7, 0xD5)],
+        },
+        Device {
+            name: "iPhone Air",
+            width: 420.0,
+            height: 912.0,
+            rotates: true,
+            colors: &[c("Black", 0x38, 0x39, 0x3D), c("Silver", 0xD7, 0xD7, 0xD5)],
+        },
         Device {
             name: "iPhone 16",
             width: 393.0,
@@ -874,6 +946,13 @@ impl PrototypeSettings {
                 c("Blue", 0x72, 0x84, 0xD4),
             ],
         },
+        Device {
+            name: "iPhone 16 Pro",
+            width: 402.0,
+            height: 874.0,
+            rotates: true,
+            colors: &[c("Black", 0x3B, 0x3A, 0x38), c("White", 0xEC, 0xEB, 0xE6)],
+        },
         Device {
             name: "iPhone 16 Pro Max",
             width: 440.0,
@@ -881,6 +960,55 @@ impl PrototypeSettings {
             rotates: true,
             colors: &[c("Black", 0x3B, 0x3A, 0x38), c("White", 0xEC, 0xEB, 0xE6), c("Natural", 0xBF, 0xB9, 0xAF), c("Sand", 0xC6, 0xAC, 0x8F)],
         },
+        Device {
+            name: "iPhone 16 Plus",
+            width: 430.0,
+            height: 932.0,
+            rotates: true,
+            colors: &[c("Black", 0x3A, 0x3B, 0x3F), c("White", 0xEE, 0xED, 0xE8)],
+        },
+        Device {
+            name: "iPhone 15 Pro",
+            width: 393.0,
+            height: 852.0,
+            rotates: true,
+            colors: &[c("Black", 0x3B, 0x3A, 0x38), c("Silver", 0xD7, 0xD7, 0xD5)],
+        },
+        Device {
+            name: "iPhone 15 Pro Max",
+            width: 430.0,
+            height: 932.0,
+            rotates: true,
+            colors: &[c("Black", 0x3B, 0x3A, 0x38), c("Silver", 0xD7, 0xD7, 0xD5)],
+        },
+        Device {
+            name: "iPhone 15 Plus",
+            width: 430.0,
+            height: 932.0,
+            rotates: true,
+            colors: &[c("Black", 0x3A, 0x3B, 0x3F), c("White", 0xEE, 0xED, 0xE8)],
+        },
+        Device {
+            name: "iPhone 14 Pro",
+            width: 393.0,
+            height: 852.0,
+            rotates: true,
+            colors: &[c("Black", 0x3B, 0x3A, 0x38), c("Silver", 0xD7, 0xD7, 0xD5)],
+        },
+        Device {
+            name: "iPhone 14 Pro Max",
+            width: 430.0,
+            height: 932.0,
+            rotates: true,
+            colors: &[c("Black", 0x3B, 0x3A, 0x38), c("Silver", 0xD7, 0xD7, 0xD5)],
+        },
+        Device {
+            name: "iPhone 14",
+            width: 390.0,
+            height: 844.0,
+            rotates: true,
+            colors: &[c("Black", 0x3A, 0x3B, 0x3F), c("White", 0xEE, 0xED, 0xE8)],
+        },
         Device {
             name: "Android Compact",
             width: 412.0,
@@ -888,6 +1016,13 @@ impl PrototypeSettings {
             rotates: true,
             colors: &[c("Black", 0x2E, 0x2F, 0x33), c("Silver", 0xD6, 0xD8, 0xDB), c("Green", 0xA6, 0xC0, 0xA3)],
         },
+        Device {
+            name: "Android Medium",
+            width: 700.0,
+            height: 840.0,
+            rotates: true,
+            colors: &[c("Black", 0x2E, 0x2F, 0x33), c("Silver", 0xD6, 0xD8, 0xDB)],
+        },
         Device {
             name: "iPad mini",
             width: 744.0,
@@ -912,7 +1047,7 @@ impl PrototypeSettings {
     ];
 
     /// The device whose screen is [`custom_size`](Self::custom_size) (no body is drawn around it).
-    pub const CUSTOM_DEVICE: &'static str = "Custom size";
+    pub const CUSTOM_DEVICE: &str = "Custom size";
     /// A new custom size.
     pub const CUSTOM_DEFAULT: [f64; 2] = [1280.0, 720.0];
     /// The largest side a custom size may have (points).
diff --git a/crates/doc/src/proto_expr.rs b/crates/doc/src/proto_expr.rs
index f4404dc7..d5441b28 100644
--- a/crates/doc/src/proto_expr.rs
+++ b/crates/doc/src/proto_expr.rs
@@ -169,7 +169,12 @@ impl Expr {
                     })
                     .collect();
                 match (op, parts.as_slice()) {
-                    (ExprOp::Not, [x]) => format!("not {x}"),
+                    // `not done` reads as a variable named "not done" if there is one: then
+                    // `not (done)`.
+                    (ExprOp::Not, [x]) => {
+                        let bare = format!("not {x}");
+                        if x.starts_with('(') || Expr::parse(&bare, vars).is_ok_and(|e| e == *self) { bare } else { format!("not ({x})") }
+                    }
                     (ExprOp::Negate, [x]) => format!("-{x}"),
                     _ => parts.join(&format!(" {} ", op.symbol())),
                 }
diff --git a/crates/doc/src/proto_expr_parse.rs b/crates/doc/src/proto_expr_parse.rs
index 5214a2d6..54615ee0 100644
--- a/crates/doc/src/proto_expr_parse.rs
+++ b/crates/doc/src/proto_expr_parse.rs
@@ -459,16 +459,19 @@ impl Parser<'_> {
                 if self.at_keyword("mode") && self.next_after(4) == Some('(') {
                     return self.mode_of();
                 }
-                if let Some((id, n)) = self.variable_here() {
-                    self.i += n;
-                    return self.in_mode(id);
-                }
+                let var = self.variable_here();
+                // A bare `true`/`false` is the literal, also when a variable has that name (it reads
+                // as `{true}`); longer names that start with it ("true value") stay variables.
                 for (word, v) in [("true", true), ("false", false)] {
-                    if self.at_keyword(word) {
+                    if self.at_keyword(word) && var.as_ref().is_none_or(|(_, n)| *n <= word.len()) {
                         self.i += word.len();
                         return Ok(Expr::Value(VariableValue::Boolean(v)));
                     }
                 }
+                if let Some((id, n)) = var {
+                    self.i += n;
+                    return self.in_mode(id);
+                }
                 let word: String = self.s.iter().skip(self.i).take_while(|c| ident(**c)).collect();
                 if word.is_empty() { Err(self.err(format!("Unexpected {c}"))) } else { Err(self.err(format!("No variable `{word}`"))) }
             }
diff --git a/crates/doc/src/proto_expr_parse_tests.rs b/crates/doc/src/proto_expr_parse_tests.rs
index e106121d..1cac9f53 100644
--- a/crates/doc/src/proto_expr_parse_tests.rs
+++ b/crates/doc/src/proto_expr_parse_tests.rs
@@ -195,3 +195,49 @@ fn names_that_look_like_literals_read_back_as_variables() {
     assert_eq!(parse("1"), n(1.0));
     assert_eq!(parse("\"q\""), Expr::Value(VariableValue::String("q".into())));
 }
+
+#[test]
+fn not_of_a_variable_reads_back_when_a_name_starts_with_not() {
+    use ExprOp::*;
+    let mut v = vars();
+    let b = v.variables.iter().find(|x| x.id == "b").unwrap().clone();
+    for (id, name) in [("done", "done"), ("nd", "not done")] {
+        let mut x = b.clone();
+        x.id = id.into();
+        x.name = name.into();
+        v.variables.push(x);
+    }
+    let not_done = Expr::op(Not, vec![Expr::var("done")]);
+    for e in [
+        not_done.clone(),
+        Expr::op(And, vec![Expr::var("b"), not_done.clone()]),
+        Expr::op(Equals, vec![not_done.clone(), Expr::Value(VariableValue::Boolean(true))]),
+        Expr::op(Not, vec![not_done.clone()]),
+    ] {
+        let shown = e.display(&v);
+        assert_eq!(Expr::parse(&shown, &v), Ok(e.clone()), "shown as {shown:?}");
+    }
+    assert_eq!(Expr::op(Not, vec![Expr::var("b")]).display(&vars()), "not b-name", "plain names stay bare");
+}
+
+#[test]
+fn literal_true_false_survive_variables_named_true_false() {
+    use ExprOp::*;
+    let lit = |x: bool| Expr::Value(VariableValue::Boolean(x));
+    for name in ["true", "false", "TRUE"] {
+        let mut v = vars();
+        if let Some(var) = v.variables.iter_mut().find(|x| x.id == "b") {
+            var.name = name.into();
+        }
+        for e in [
+            Expr::op(Equals, vec![Expr::var("b"), lit(true)]),
+            Expr::op(Equals, vec![Expr::var("b"), lit(false)]),
+            Expr::op(Not, vec![lit(false)]),
+            Expr::var("b"),
+        ] {
+            let shown = e.display(&v);
+            assert_eq!(Expr::parse(&shown, &v), Ok(e.clone()), "{name:?} shown as {shown:?}");
+        }
+        assert_eq!(Expr::parse(&format!("{{{name}}}"), &v), Ok(Expr::var("b")));
+    }
+}
diff --git a/crates/doc/src/proto_overlay_anchor_tests.rs b/crates/doc/src/proto_overlay_anchor_tests.rs
new file mode 100644
index 00000000..d902d1c2
--- /dev/null
+++ b/crates/doc/src/proto_overlay_anchor_tests.rs
@@ -0,0 +1,61 @@
+use serde_json::json;
+
+use crate::NodeId;
+use crate::proto::*;
+
+const TRIGGER: [f64; 2] = [100.0, 40.0];
+const OVERLAY: [f64; 2] = [60.0, 200.0];
+
+fn at(anchor: OverlayAnchor, p: OverlayPosition) -> Option<[f64; 2]> {
+    anchor.offset(p, TRIGGER, OVERLAY)
+}
+
+#[test]
+fn outside_sits_above_or_below_with_edges_lined_up() {
+    use OverlayPosition as P;
+    let out = OverlayAnchor::TriggerOutside;
+    assert_eq!(at(out, P::BottomLeft), Some([0.0, 40.0]));
+    assert_eq!(at(out, P::BottomCenter), Some([20.0, 40.0]));
+    assert_eq!(at(out, P::BottomRight), Some([40.0, 40.0]));
+    assert_eq!(at(out, P::TopLeft), Some([0.0, -200.0]));
+    assert_eq!(at(out, P::TopCenter), Some([20.0, -200.0]));
+    assert_eq!(at(out, P::TopRight), Some([40.0, -200.0]));
+    assert_eq!(at(out, P::Center), Some([20.0, -80.0]));
+}
+
+#[test]
+fn inside_uses_the_presets_on_the_trigger() {
+    use OverlayPosition as P;
+    let ins = OverlayAnchor::TriggerInside;
+    assert_eq!(at(ins, P::TopLeft), Some([0.0, 0.0]));
+    assert_eq!(at(ins, P::TopRight), Some([40.0, 0.0]));
+    assert_eq!(at(ins, P::BottomLeft), Some([0.0, -160.0]));
+    assert_eq!(at(ins, P::BottomCenter), Some([20.0, -160.0]));
+    assert_eq!(at(ins, P::Center), Some([20.0, -80.0]));
+}
+
+#[test]
+fn the_screen_and_manual_positions_have_no_preset_offset() {
+    assert_eq!(at(OverlayAnchor::Screen, OverlayPosition::BottomLeft), None);
+    assert_eq!(at(OverlayAnchor::TriggerOutside, OverlayPosition::Manual), None);
+    assert_eq!(at(OverlayAnchor::TriggerInside, OverlayPosition::Manual), None);
+}
+
+#[test]
+fn json_keeps_the_anchor_and_old_actions_stay_on_the_screen() {
+    let a = Action::OpenOverlay {
+        dest: NodeId(7),
+        position: OverlayPosition::BottomLeft,
+        close_on_outside: true,
+        background: None,
+        offset: None,
+        anchor: OverlayAnchor::TriggerOutside,
+    };
+    let v = serde_json::to_value(&a).unwrap();
+    assert_eq!(v["anchor"], "triggerOutside");
+    assert_eq!(serde_json::from_value::<Action>(v).unwrap(), a);
+
+    let old: Action = serde_json::from_value(json!({"type": "openOverlay", "dest": 7, "position": "bottomLeft"})).unwrap();
+    assert!(matches!(old, Action::OpenOverlay { anchor: OverlayAnchor::Screen, .. }));
+    assert!(serde_json::to_value(&old).unwrap().get("anchor").is_none());
+}
diff --git a/crates/doc/src/tests.rs b/crates/doc/src/tests.rs
index a5ead3b7..ebec2383 100644
--- a/crates/doc/src/tests.rs
+++ b/crates/doc/src/tests.rs
@@ -326,6 +326,20 @@ fn repair_drops_cycles_and_repeated_children() {
     assert_eq!(bad.subtree(p), vec![p, r]);
 }
 
+#[test]
+fn validate_caps_the_issue_list() {
+    let mut d = Document::new("x");
+    let p = page(&d);
+    let f = d.create(p, NodeKind::Frame, "F", 0.0, 0.0, 100.0, 100.0).unwrap();
+    let g = d.create(f, NodeKind::Frame, "G", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let mut v = serde_json::to_value(&d).unwrap();
+    v["nodes"][f.to_string()]["children"] = serde_json::json!(vec![g; 5000]);
+    let bad: Document = serde_json::from_value(v).unwrap();
+    let issues = bad.validate();
+    assert!(!issues.is_empty());
+    assert!(issues.len() <= 100, "{}", issues.len());
+}
+
 #[test]
 fn auto_layout_loads_files_without_grid_tracks() {
     // Saved before grid tracks, cells and spans existed.
@@ -464,3 +478,169 @@ fn text_style_empty_range_links_and_unlinks_all() {
     e.unlink_text_style(0, 0);
     assert!(e.style.style_id.is_none());
 }
+
+#[test]
+fn stale_next_id_never_overwrites_existing_nodes() {
+    let mut d = Document::new("x");
+    let p = page(&d);
+    let f = d.create(p, NodeKind::Frame, "F", 0.0, 0.0, 100.0, 100.0).unwrap();
+    let a = d.create(f, NodeKind::Rectangle, "A", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let mut v = serde_json::to_value(&d).unwrap();
+    v["next_id"] = serde_json::json!(1);
+    let mut bad: Document = serde_json::from_value(v).unwrap();
+    let before: Vec<(NodeId, String, Option<NodeId>)> =
+        [p, f, a].iter().map(|i| (*i, bad.node(*i).unwrap().name.clone(), bad.node(*i).unwrap().parent)).collect();
+    let n = bad.node_count();
+    let copy = bad.duplicate_into(f, p, None).unwrap();
+    assert!(![p, f, a].contains(&copy));
+    assert_eq!(bad.node_count(), n + 2);
+    let copies = bad.duplicate_all_into(&[f], p).unwrap();
+    assert_eq!(bad.node_count(), n + 4);
+    assert!(copies.iter().all(|c| ![p, f, a, copy].contains(c)));
+    for (i, name, parent) in &before {
+        let node = bad.node(*i).unwrap();
+        assert_eq!((&node.name, node.parent), (name, *parent));
+    }
+    assert!(bad.validate().is_empty(), "{:?}", bad.validate());
+
+    // A paste whose id map points at an existing node fails and changes nothing.
+    let nodes: Vec<Node> = bad.subtree(f).into_iter().filter_map(|i| bad.node(i).cloned()).collect();
+    let mut map: BTreeMap<NodeId, NodeId> = nodes.iter().map(|n| (n.id, bad.alloc_id())).collect();
+    map.insert(a, p);
+    let snapshot = bad.clone();
+    assert!(bad.paste_nodes(&nodes, &map, f, p, None).is_err());
+    assert_eq!(bad, snapshot);
+    assert_eq!(bad.node(p).unwrap().name, snapshot.node(p).unwrap().name);
+    assert!(bad.validate().is_empty(), "{:?}", bad.validate());
+
+    // So does one that maps two nodes to the same new id.
+    let mut map: BTreeMap<NodeId, NodeId> = nodes.iter().map(|n| (n.id, bad.alloc_id())).collect();
+    map.insert(a, map[&f]);
+    assert!(bad.paste_nodes(&nodes, &map, f, p, None).is_err());
+    assert_eq!(bad, snapshot);
+}
+
+#[test]
+fn hit_test_even_odd_vector_hole_misses() {
+    let ring = |rule| {
+        let sq = |o: f64, s: f64, base: usize| {
+            (
+                [(o, o), (o + s, o), (o + s, o + s), (o, o + s)].map(|(x, y)| Vertex::new(x, y)),
+                [Segment::line(base, base + 1), Segment::line(base + 1, base + 2), Segment::line(base + 2, base + 3), Segment::line(base + 3, base)],
+            )
+        };
+        let (v1, s1) = sq(0.0, 200.0, 0);
+        let (v2, s2) = sq(60.0, 80.0, 4);
+        VectorNetwork {
+            vertices: v1.into_iter().chain(v2).collect(),
+            segments: s1.into_iter().chain(s2).collect(),
+            regions: vec![Region { loops: vec![vec![0, 1, 2, 3], vec![4, 5, 6, 7]], winding: rule }],
+        }
+    };
+    let mut d = Document::new("x");
+    let p = page(&d);
+    let eo = d.create(p, NodeKind::Vector { network: ring(WindingRule::EvenOdd) }, "V", 0.0, 0.0, 200.0, 200.0).unwrap();
+    assert_eq!(d.hit_test(p, Point::new(20.0, 100.0), 0.0, None), Some(eo));
+    assert_eq!(d.hit_test(p, Point::new(100.0, 100.0), 0.0, None), None, "the hole is not filled");
+    let mut d = Document::new("x");
+    let p = page(&d);
+    let nz = d.create(p, NodeKind::Vector { network: ring(WindingRule::NonZero) }, "V", 0.0, 0.0, 200.0, 200.0).unwrap();
+    assert_eq!(d.hit_test(p, Point::new(100.0, 100.0), 0.0, None), Some(nz));
+}
+
+#[test]
+fn is_ancestor_holds_for_very_deep_chains() {
+    let mut d = Document::new("x");
+    let root = d.create(page(&d), NodeKind::Frame, "root", 0.0, 0.0, 1.0, 1.0).unwrap();
+    let mut leaf = root;
+    for _ in 0..10_005 {
+        leaf = d.create(leaf, NodeKind::Frame, "n", 0.0, 0.0, 1.0, 1.0).unwrap();
+    }
+    assert!(d.is_ancestor(root, leaf));
+    assert!(matches!(d.reparent(root, leaf, None), Err(DocError::Cycle(..))));
+}
+
+#[test]
+fn render_bounds_stop_where_drawing_stops_on_very_deep_chains() {
+    // A crafted file nests groups far deeper than anything draws (#1062). The leaf counts while
+    // it's within the renderer's depth and is left out past it, as the renderer leaves it out.
+    let chain = |depth: usize| {
+        let mut d = Document::new("x");
+        let mut parent = page(&d);
+        for _ in 0..depth {
+            parent = d.create(parent, NodeKind::Group, "G", 0.0, 0.0, 10.0, 10.0).unwrap();
+        }
+        d.create(parent, NodeKind::Rectangle, "R", 100.0, 100.0, 10.0, 10.0).unwrap();
+        let top = d.node(page(&d)).unwrap().children[0];
+        d.world_render_bounds(top).unwrap()
+    };
+    assert_eq!(chain(MAX_RENDER_DEPTH).x1, 110.0);
+    assert_eq!(chain(20_000).x1, 10.0);
+}
+
+#[test]
+fn text_insert_at_run_boundary_keeps_runs_disjoint() {
+    let mut t = TextData::new("0123456789");
+    t.restyle(0, 5, |s| s.font_size = 20.0);
+    t.restyle(5, 10, |s| s.font_size = 30.0);
+    t.replace_range(5, 5, "xx");
+    let runs: Vec<(usize, usize)> = t.runs.iter().map(|r| (r.start, r.end)).collect();
+    assert_eq!(runs, vec![(0, 7), (7, 12)]);
+}
+
+#[test]
+fn many_small_vector_subpaths_build_and_stroke_without_rescans() {
+    // Many closed subpaths whose last point repeats the start (#F-332), a long open chain (#F-334)
+    // and a big rounded polygon (#F-333): each used to scan the whole network per step.
+    let mut p = figcraft_geom::kurbo::BezPath::new();
+    for i in 0..3_000 {
+        let x = f64::from(i) * 10.0;
+        p.move_to((x, 0.0));
+        p.line_to((x + 5.0, 0.0));
+        p.line_to((x + 5.0, 5.0));
+        p.line_to((x, 0.0));
+        p.close_path();
+    }
+    let net = VectorNetwork::from_path(&p);
+    assert_eq!(net.vertices.len(), 3 * 3_000);
+    assert_eq!(net.regions[0].loops.len(), 3_000);
+    assert!(net.segments.iter().all(|s| s.a < net.vertices.len() && s.b < net.vertices.len()));
+    assert_eq!(net.stroke_runs().len(), 3_000);
+
+    let pts: Vec<Point> = (0..20_000).map(|i| Point::new(f64::from(i), f64::from(i % 7))).collect();
+    let chain = VectorNetwork::from_points(&pts, false);
+    let runs = chain.stroke_runs();
+    assert_eq!(runs.len(), 1);
+    assert!(!runs[0].closed);
+
+    let ring: Vec<Point> = (0..4_000)
+        .map(|i| {
+            let t = f64::from(i) / 4_000.0 * std::f64::consts::TAU;
+            Point::new(1000.0 * t.cos(), 1000.0 * t.sin() * if i % 2 == 0 { 1.0 } else { 0.9 })
+        })
+        .collect();
+    let mut poly = VectorNetwork::from_points(&ring, true);
+    for v in &mut poly.vertices {
+        v.radius = 0.5;
+    }
+    let rounded = poly.rounded().unwrap();
+    assert!(rounded.regions[0].loops[0].len() > poly.segments.len(), "arcs are walked between the sides");
+    assert_eq!(rounded.regions[0].loops[0].len(), rounded.segments.len());
+}
+
+#[test]
+fn two_segment_closed_loop_rounded_corners() {
+    let mut v0 = Vertex::new(0.0, 0.0);
+    v0.radius = 2.0;
+    let mut v1 = Vertex::new(10.0, 0.0);
+    v1.radius = 2.0;
+    let net = VectorNetwork {
+        vertices: vec![v0, v1],
+        segments: vec![Segment { a: 0, b: 1, ta: (0.0, 0.0), tb: (0.0, 0.0) }, Segment { a: 1, b: 0, ta: (0.0, 5.0), tb: (0.0, -5.0) }],
+        regions: vec![Region { loops: vec![vec![0, 1]], winding: WindingRule::NonZero }],
+    };
+    let r = net.rounded().unwrap();
+    assert_eq!(r.regions[0].loops[0].len(), 4, "both arcs are in the loop");
+    let path = net.fill_path();
+    assert!(!path.elements().is_empty());
+}
diff --git a/crates/doc/src/text.rs b/crates/doc/src/text.rs
index b294151b..a000447f 100644
--- a/crates/doc/src/text.rs
+++ b/crates/doc/src/text.rs
@@ -60,6 +60,9 @@ impl LetterSpacing {
 }
 
 pub fn trim_num(v: f64) -> String {
+    if v.abs() >= 9.0e18 {
+        return format!("{v}");
+    }
     let r = (v * 100.0).round() / 100.0;
     if r.fract().abs() < 1e-9 { format!("{}", r as i64) } else { format!("{r}") }
 }
@@ -117,23 +120,40 @@ impl TextCase {
     }
 
     /// Apply the case to `s`, which follows `prev` in the text (so title case only capitalises
-    /// the first letter of each word even when a word spans several styled runs).
+    /// the first letter of each word even when a word spans several styled runs). An apostrophe
+    /// as `prev` is taken to continue a word.
     pub fn apply_after(self, s: &str, prev: Option<char>) -> String {
+        self.apply_impl(s, prev, prev.is_some_and(is_word_char))
+    }
+
+    /// Like [`apply_after`](Self::apply_after), also given the char `before` `prev`: an apostrophe
+    /// only continues a word when a letter or digit precedes it.
+    pub fn apply_between(self, s: &str, before: Option<char>, prev: Option<char>) -> String {
+        let continues = prev.is_some_and(|c| is_word_char(c) && (c.is_alphanumeric() || before.is_some_and(char::is_alphanumeric)));
+        self.apply_impl(s, prev, continues)
+    }
+
+    /// `in_word` says whether `prev` continues a word (rather than a new word starting here).
+    fn apply_impl(self, s: &str, prev: Option<char>, in_word: bool) -> String {
         match self {
             TextCase::Original | TextCase::SmallCaps => s.to_string(),
             TextCase::Upper => s.to_uppercase(),
             TextCase::Lower => s.to_lowercase(),
             TextCase::Title => {
                 let mut out = String::with_capacity(s.len());
-                let mut start = prev.is_none_or(|c| !is_word_char(c));
+                let mut start = !in_word;
+                let mut last = prev;
                 for ch in s.chars() {
                     if start && ch.is_alphanumeric() {
                         out.extend(ch.to_uppercase());
                         start = false;
                     } else {
                         out.push(ch);
-                        start = !is_word_char(ch);
+                        // An apostrophe only continues a word right after a letter or digit.
+                        let opening_apostrophe = matches!(ch, '\'' | '\u{2019}') && !last.is_some_and(char::is_alphanumeric);
+                        start = !is_word_char(ch) || opening_apostrophe;
                     }
+                    last = Some(ch);
                 }
                 out
             }
@@ -215,6 +235,10 @@ pub struct ParaList {
     pub list: ListStyle,
     /// Nesting level (0 = outermost; plain paragraphs are always 0).
     pub indent: u8,
+    /// A numbered list that starts counting at this paragraph counts from `start_offset + 1`
+    /// (items that go on counting ignore it; other paragraphs are always 0).
+    #[serde(skip_serializing_if = "crate::node::is_default")]
+    pub start_offset: u32,
 }
 
 /// Character style. In runs, every field is an override; `None` means "inherit the base".
@@ -246,10 +270,17 @@ pub struct TextStyle {
     pub style_id: Option<String>,
 }
 
+/// The font new text starts in. A build can name another (`FIGCRAFT_DEFAULT_FONT="Noto Sans Thai"`,
+/// for a distribution whose users mostly write a script Inter lacks); empty means Inter.
+pub const DEFAULT_FONT: &str = match option_env!("FIGCRAFT_DEFAULT_FONT") {
+    Some(family) if !family.is_empty() => family,
+    _ => "Inter",
+};
+
 impl Default for TextStyle {
     fn default() -> Self {
         Self {
-            font_family: "Inter".into(),
+            font_family: DEFAULT_FONT.into(),
             font_style: "Regular".into(),
             font_size: 12.0,
             line_height: LineHeight::Auto,
@@ -403,7 +434,8 @@ pub struct TextData {
     /// line's baseline).
     #[serde(skip_serializing_if = "crate::node::is_default")]
     pub leading_trim: LeadingTrim,
-    /// Max lines when truncating (0 = as many as fit).
+    /// Max lines when truncating, or before an auto-height text ends in an ellipsis (0 = as many
+    /// as fit).
     #[serde(skip_serializing_if = "crate::node::is_default")]
     pub max_lines: u32,
     /// OpenType feature toggles (e.g. "liga": false).
@@ -496,6 +528,28 @@ impl TextData {
         self.characters.chars().count()
     }
 
+    /// Whether text that runs out of room ends in an ellipsis: a truncating box, or auto height
+    /// with a line limit (the box hugs up to `max_lines` lines).
+    pub fn truncates(&self) -> bool {
+        match self.auto_resize {
+            TextAutoResize::Truncate => true,
+            TextAutoResize::Height => self.max_lines > 0,
+            TextAutoResize::WidthAndHeight | TextAutoResize::None => false,
+        }
+    }
+
+    /// The resize mode once the box is given an explicit `width` and/or `height`: an explicit
+    /// height fixes the box, an explicit width turns auto width into auto height, and truncating
+    /// text keeps truncating.
+    pub fn fix_size(&mut self, width: bool, height: bool) {
+        self.auto_resize = match self.auto_resize {
+            _ if height && self.truncates() => TextAutoResize::Truncate,
+            _ if height => TextAutoResize::None,
+            TextAutoResize::WidthAndHeight if width => TextAutoResize::Height,
+            mode => mode,
+        };
+    }
+
     /// The style at char index `i`.
     pub fn style_at(&self, i: usize) -> &TextStyle {
         self.runs.iter().find(|r| r.start <= i && i < r.end).map(|r| &r.style).unwrap_or(&self.style)
@@ -572,7 +626,14 @@ impl TextData {
         }
         self.runs.sort_by_key(|r| r.start);
         let mut merged: Vec<StyleRun> = Vec::with_capacity(self.runs.len());
-        for r in std::mem::take(&mut self.runs) {
+        for mut r in std::mem::take(&mut self.runs) {
+            // Runs never overlap: a later run starts where the previous one ends at the earliest.
+            if let Some(prev) = merged.last() {
+                r.start = r.start.max(prev.end);
+                if r.start >= r.end {
+                    continue;
+                }
+            }
             match merged.last_mut() {
                 Some(prev) if prev.end == r.start && prev.style == r.style => prev.end = r.end,
                 _ => merged.push(r),
@@ -637,13 +698,13 @@ impl TextData {
 
     /// Paragraph `p`'s list settings.
     pub fn para_list(&self, p: usize) -> ParaList {
-        self.paragraphs.get(p).copied().unwrap_or(ParaList { list: self.list, indent: 0 })
+        self.paragraphs.get(p).copied().unwrap_or(ParaList { list: self.list, ..ParaList::default() })
     }
 
     /// Spell out every paragraph's list settings in `paragraphs` (and drop extra entries).
     fn fill_paragraphs(&mut self) {
         let n = self.paragraph_count();
-        let fill = ParaList { list: self.list, indent: 0 };
+        let fill = ParaList { list: self.list, ..ParaList::default() };
         self.paragraphs.resize(n, fill);
     }
 
@@ -657,17 +718,23 @@ impl TextData {
     }
 
     /// Apply `f` to the list settings of the paragraphs chars `start..end` touch (plain
-    /// paragraphs stay at level 0, levels stop at [`MAX_LIST_INDENT`]); one style for all with
-    /// no nesting folds back into `list`.
+    /// paragraphs stay at level 0, only numbered ones keep a start, levels stop at
+    /// [`MAX_LIST_INDENT`]); one style for all with no nesting or start folds back into `list`.
     pub fn set_para_lists(&mut self, start: usize, end: usize, f: impl Fn(&mut ParaList)) {
         let (a, b) = self.para_span(start, end);
         self.fill_paragraphs();
         for pl in self.paragraphs.get_mut(a..=b).unwrap_or(&mut []) {
             f(pl);
-            pl.indent = if pl.list == ListStyle::None { 0 } else { pl.indent.min(MAX_LIST_INDENT) };
+            if pl.list == ListStyle::None {
+                pl.indent = 0;
+            }
+            if pl.list != ListStyle::Numbered {
+                pl.start_offset = 0;
+            }
+            pl.indent = pl.indent.min(MAX_LIST_INDENT);
         }
         if let Some(first) = self.paragraphs.first().copied()
-            && first.indent == 0
+            && first == (ParaList { list: first.list, ..ParaList::default() })
             && self.paragraphs.iter().all(|p| *p == first)
         {
             self.list = first.list;
@@ -675,11 +742,12 @@ impl TextData {
         }
     }
 
-    /// The list settings shared by the paragraphs chars `start..end` touch, or None when they differ.
+    /// The list style and level shared by the paragraphs chars `start..end` touch (the first
+    /// one's settings), or None when they differ. Start numbers don't count.
     pub fn common_para_list(&self, start: usize, end: usize) -> Option<ParaList> {
         let (a, b) = self.para_span(start, end);
         let first = self.para_list(a);
-        (a..=b).all(|p| self.para_list(p) == first).then_some(first)
+        (a..=b).all(|p| self.para_list(p).list == first.list && self.para_list(p).indent == first.indent).then_some(first)
     }
 
     /// Link chars `start..end` (all of them when the range is empty or the whole text) to text
@@ -749,6 +817,15 @@ impl TextData {
 mod case_tests {
     use super::*;
 
+    #[test]
+    fn trim_num_prints_huge_whole_numbers() {
+        assert_eq!(trim_num(1e19), "10000000000000000000");
+        assert_eq!(trim_num(-1e19), "-10000000000000000000");
+        assert_eq!(trim_num(12.0), "12");
+        let v = 12345678901234567890.0_f64;
+        assert_eq!(trim_num(v).parse::<f64>().unwrap(), v);
+    }
+
     #[test]
     fn title_case_respects_context() {
         assert_eq!(TextCase::Title.apply("hello wORLD don't 3d x-ray"), "Hello WORLD Don't 3d X-Ray");
@@ -760,6 +837,18 @@ mod case_tests {
         assert!(!valid_feature_tag("lig") && !valid_feature_tag("ligatures") && !valid_feature_tag("li\u{e9}"));
     }
 
+    #[test]
+    fn new_text_starts_in_the_builds_default_font() {
+        // Inter, unless the build names another with `FIGCRAFT_DEFAULT_FONT` (empty means Inter).
+        let named = option_env!("FIGCRAFT_DEFAULT_FONT").filter(|f| !f.is_empty());
+        assert_eq!(DEFAULT_FONT, named.unwrap_or("Inter"));
+        let st = TextStyle::default();
+        assert_eq!(st.font_family, DEFAULT_FONT);
+        // The family is always written, so a saved file keeps it in a build with another default.
+        let saved = serde_json::to_value(&st).unwrap();
+        assert_eq!(saved["font_family"], DEFAULT_FONT);
+    }
+
     #[test]
     fn variations_are_backward_compatible_and_imply_weight() {
         // Files written before variable fonts load with no custom axes, and stay byte-identical.
@@ -782,4 +871,50 @@ mod case_tests {
         assert_eq!(st.variations.keys().collect::<Vec<_>>(), ["wdth"]);
         assert!(valid_axis_tag("wght") && !valid_axis_tag("weight"));
     }
+
+    #[test]
+    fn list_starts_load_from_old_files_and_follow_edits() {
+        use ListStyle::{Bulleted as B, None as P, Numbered as N};
+        // Files written before start numbers load with none, and write the same bytes.
+        let old = r#"{"list":"numbered","indent":1}"#;
+        let pl: ParaList = serde_json::from_str(old).unwrap();
+        assert_eq!(pl, ParaList { list: N, indent: 1, start_offset: 0 });
+        assert_eq!(serde_json::to_string(&pl).unwrap(), old);
+        // One numbered paragraph with a start keeps it (it doesn't fold into `list`).
+        let mut t = TextData { characters: "Next".into(), ..Default::default() };
+        t.set_para_lists(0, 0, |p| *p = ParaList { list: N, indent: 0, start_offset: 1 });
+        assert_eq!(t.para_list(0), ParaList { list: N, indent: 0, start_offset: 1 });
+        // Enter copies it to the new item; different starts don't make the list mixed.
+        t.replace_range(4, 4, "\nMore");
+        assert_eq!(t.para_list(1).start_offset, 1);
+        t.set_para_lists(5, 5, |p| p.start_offset = 0);
+        assert!(t.common_para_list(0, t.char_count()).is_some_and(|p| p.list == N));
+        // Bullets have no number, so no start.
+        t.set_para_lists(0, 0, |p| *p = ParaList { list: B, indent: 1, start_offset: 4 });
+        assert_eq!(t.para_list(0), ParaList { list: B, indent: 1, start_offset: 0 });
+        // A plain paragraph has none.
+        t.set_para_lists(0, 0, |p| p.list = P);
+        assert_eq!(t.para_list(0), ParaList::default());
+    }
+}
+
+#[cfg(test)]
+mod title_case_tests {
+    use super::TextCase;
+
+    #[test]
+    fn title_case_after_opening_apostrophe() {
+        assert_eq!(TextCase::Title.apply("'hello world'"), "'Hello World'");
+        assert_eq!(TextCase::Title.apply("say 'hi'"), "Say 'Hi'");
+        assert_eq!(TextCase::Title.apply("don't"), "Don't");
+        assert_eq!(TextCase::Title.apply("\u{2019}hello"), "\u{2019}Hello");
+    }
+
+    #[test]
+    fn title_case_between_runs_sees_char_before_apostrophe() {
+        assert_eq!(TextCase::Title.apply_after("t", Some('\'')), "t");
+        assert_eq!(TextCase::Title.apply_between("hello", None, Some('\'')), "Hello");
+        assert_eq!(TextCase::Title.apply_between("t", Some('n'), Some('\'')), "t");
+        assert_eq!(TextCase::Title.apply_between("t", Some(' '), Some('\u{2019}')), "T");
+    }
 }
diff --git a/crates/doc/src/vector.rs b/crates/doc/src/vector.rs
index fd0a0f7e..b3040b1e 100644
--- a/crates/doc/src/vector.rs
+++ b/crates/doc/src/vector.rs
@@ -134,6 +134,16 @@ pub struct VectorNetwork {
     pub regions: Vec<Region>,
 }
 
+/// Point the subpath's last segment (the only one ending at the fresh vertex `from`) at `to`,
+/// so merging a duplicate endpoint doesn't rescan the segments of earlier subpaths.
+fn redirect_last_segment(net: &mut VectorNetwork, loop_segs: &[usize], from: usize, to: usize) {
+    if let Some(s) = loop_segs.last().and_then(|i| net.segments.get_mut(*i))
+        && s.b == from
+    {
+        s.b = to;
+    }
+}
+
 impl VectorNetwork {
     /// A network from a polyline / polygon.
     pub fn from_points(points: &[Point], closed: bool) -> Self {
@@ -169,11 +179,7 @@ impl VectorNetwork {
                 if a == f || loop_segs.len() < 2 || (pa - pf).hypot() > 1e-6 || a + 1 != net.vertices.len() {
                     return;
                 }
-                for s in net.segments.iter_mut() {
-                    if s.b == a {
-                        s.b = f;
-                    }
-                }
+                redirect_last_segment(net, loop_segs, a, f);
                 net.vertices.pop();
                 all_loops.push(std::mem::take(loop_segs));
             };
@@ -219,11 +225,7 @@ impl VectorNetwork {
                     let same = matches!((close_pt, first_pt), (Some(c), Some(f)) if (c - f).hypot() <= 1e-6);
                     if same && a != f {
                         // Merge the duplicate end vertex into the first one.
-                        for s in net.segments.iter_mut() {
-                            if s.b == a {
-                                s.b = f;
-                            }
-                        }
+                        redirect_last_segment(&mut net, &loop_segs, a, f);
                         if a + 1 == net.vertices.len() {
                             net.vertices.pop();
                         }
@@ -385,6 +387,7 @@ impl VectorNetwork {
             s.ta = (q.p1.x - q.p0.x, q.p1.y - q.p0.y);
             s.tb = (q.p2.x - q.p3.x, q.p2.y - q.p3.y);
         }
+        let mut by_vertex: std::collections::BTreeMap<usize, usize> = std::collections::BTreeMap::new();
         for c in corners {
             if let Some(v) = out.vertices.get_mut(c.v) {
                 (v.x, v.y) = (c.a.x, c.a.y);
@@ -400,15 +403,28 @@ impl VectorNetwork {
             }
             out.segments.push(Segment { a: c.v, b: nb, ta: c.ta, tb: c.tb });
             let arc = out.segments.len() - 1;
-            // The arc goes between the two segments wherever a loop walks through the point.
-            for lp in out.regions.iter_mut().flat_map(|r| r.loops.iter_mut()) {
-                let n = lp.len();
-                let between =
-                    |k: usize| matches!((lp.get(k), lp.get((k + 1) % n)), (Some(&x), Some(&y)) if (x, y) == (c.s1, c.s2) || (x, y) == (c.s2, c.s1));
-                if let Some(k) = (0..n).find(|k| between(*k)) {
-                    lp.insert(k + 1, arc);
+            by_vertex.insert(c.v, arc);
+        }
+        // The arc goes between the two segments wherever a loop walks through the point. Each loop
+        // is rebuilt in one pass, so a polygon with many rounded corners isn't quadratic.
+        for lp in out.regions.iter_mut().flat_map(|r| r.loops.iter_mut()) {
+            let Some(&first_idx) = lp.first() else { continue };
+            let start_v = match (self.segments.get(first_idx), lp.get(1).and_then(|&i| self.segments.get(i))) {
+                (Some(first), Some(second)) if first.a == second.a || first.a == second.b => first.b,
+                (Some(first), _) => first.a,
+                _ => 0,
+            };
+            let mut rebuilt = Vec::with_capacity(lp.len() + by_vertex.len().min(lp.len()));
+            let mut cur = start_v;
+            for &x in lp.iter() {
+                rebuilt.push(x);
+                let Some(s) = self.segments.get(x) else { continue };
+                cur = if s.a == cur { s.b } else { s.a };
+                if let Some(&arc) = by_vertex.get(&cur) {
+                    rebuilt.push(arc);
                 }
             }
+            *lp = rebuilt;
         }
         Some(out)
     }
@@ -468,9 +484,9 @@ impl VectorNetwork {
         start_dir(&self.outward(seg, at_a)?)
     }
 
-    /// Whether any point has a stroke cap or join of its own.
-    pub fn has_point_styles(&self) -> bool {
-        self.vertices.iter().any(|v| v.cap.is_some() || v.join.is_some())
+    /// Whether any point has a stroke cap of its own or a join other than the layer's `layer_join`.
+    pub fn has_point_styles(&self, layer_join: StrokeJoin) -> bool {
+        self.vertices.iter().any(|v| v.cap.is_some() || v.join.is_some_and(|j| j != layer_join))
     }
 
     /// The fill path: every region's loops.
@@ -547,25 +563,40 @@ impl VectorNetwork {
             }
         }
         let degree = |v: usize| degrees.get(v).copied().unwrap_or(0);
-        let next_from = |v: usize, used: &[bool]| -> Option<(usize, bool)> {
-            self.segments.iter().enumerate().find_map(|(i, s)| {
-                if used.get(i).copied().unwrap_or(true) {
-                    return None;
+        // Each vertex's segments in segment order, and how far down that list the used ones reach,
+        // so finding the next unused segment never rescans the whole network.
+        let mut adjacent: Vec<Vec<(usize, bool)>> = vec![Vec::new(); self.vertices.len()];
+        for (i, s) in self.segments.iter().enumerate() {
+            if let Some(l) = adjacent.get_mut(s.a) {
+                l.push((i, false));
+            }
+            if s.b != s.a
+                && let Some(l) = adjacent.get_mut(s.b)
+            {
+                l.push((i, true));
+            }
+        }
+        let mut cursor = vec![0usize; self.vertices.len()];
+        let mut remaining = self.segments.len();
+        let mut next_from = |v: usize, used: &[bool]| -> Option<(usize, bool)> {
+            let list = adjacent.get(v)?;
+            let at = cursor.get_mut(v)?;
+            while let Some(&(i, rev)) = list.get(*at) {
+                if !used.get(i).copied().unwrap_or(true) {
+                    return Some((i, rev));
                 }
-                if s.a == v {
-                    Some((i, false))
-                } else if s.b == v {
-                    Some((i, true))
-                } else {
-                    None
-                }
-            })
+                *at += 1;
+            }
+            None
         };
         let stop = |v: usize| degree(v) != 2 || breaks(v);
         // Start runs at endpoints, junctions and breaks first, then whatever remains (pure loops).
         let mut starts: Vec<usize> = (0..self.vertices.len()).filter(|v| stop(*v)).collect();
         starts.extend((0..self.vertices.len()).filter(|v| !stop(*v)));
         for v0 in starts {
+            if remaining == 0 {
+                break;
+            }
             while let Some((si, rev)) = next_from(v0, &used) {
                 let Some(start) = self.vertices.get(v0) else { break };
                 let mut path = BezPath::new();
@@ -574,8 +605,11 @@ impl VectorNetwork {
                 let mut closed = false;
                 let mut seg = Some((si, rev));
                 while let Some((i, r)) = seg {
-                    if let Some(u) = used.get_mut(i) {
+                    if let Some(u) = used.get_mut(i)
+                        && !*u
+                    {
                         *u = true;
+                        remaining = remaining.saturating_sub(1);
                     }
                     let Some(s) = self.segments.get(i) else { break };
                     self.push_seg(&mut path, s, r);
diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml
index f610c38b..beedc173 100644
--- a/crates/engine/Cargo.toml
+++ b/crates/engine/Cargo.toml
@@ -20,6 +20,8 @@ figcraft-render = { workspace = true }
 figcraft-format = { workspace = true }
 figcraft-svg = { workspace = true }
 figcraft-pdf = { workspace = true }
+figcraft-vectordrawable = { workspace = true }
+craft-docpath = { workspace = true }
 figcraft-plugin = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
@@ -27,8 +29,11 @@ thiserror = { workspace = true }
 log = { workspace = true }
 base64 = { workspace = true }
 regex = { workspace = true }
+deunicode = { workspace = true }
+same-file = { workspace = true }
 web-time = "1.1.0"
 
 [dev-dependencies]
+zip = { workspace = true }
 wat = { workspace = true }
 image = { workspace = true }
diff --git a/crates/engine/clippy.toml b/crates/engine/clippy.toml
new file mode 100644
index 00000000..3ceac899
--- /dev/null
+++ b/crates/engine/clippy.toml
@@ -0,0 +1,39 @@
+# The workspace settings (../../clippy.toml; clippy reads only the nearest file), plus the engine's
+# own rule: shipped engine code reaches the file system only through `file_access`, which enforces
+# the automation roots (#715), so every command is confined without a check of its own.
+allow-unwrap-in-tests = true
+allow-expect-in-tests = true
+allow-panic-in-tests = true
+too-many-arguments-threshold = 10
+disallowed-methods = [
+    { path = "std::fs::read", reason = "use file_access::read (automation roots)" },
+    { path = "std::fs::read_to_string", reason = "use file_access::read (automation roots)" },
+    { path = "std::fs::write", reason = "use file_access::write (automation roots)" },
+    { path = "std::fs::metadata", reason = "use file_access::metadata (automation roots)" },
+    { path = "std::fs::symlink_metadata", reason = "use file_access (automation roots)" },
+    { path = "std::fs::read_dir", reason = "use file_access::read_dir (automation roots)" },
+    { path = "std::fs::canonicalize", reason = "use file_access (automation roots)" },
+    { path = "std::fs::copy", reason = "use file_access (automation roots)" },
+    { path = "std::fs::rename", reason = "use file_access (automation roots)" },
+    { path = "std::fs::create_dir", reason = "use file_access::create_dir_all (automation roots)" },
+    { path = "std::fs::create_dir_all", reason = "use file_access::create_dir_all (automation roots)" },
+    { path = "std::fs::remove_file", reason = "use file_access (automation roots)" },
+    { path = "std::fs::remove_dir", reason = "use file_access (automation roots)" },
+    { path = "std::fs::remove_dir_all", reason = "use file_access (automation roots)" },
+    { path = "std::fs::hard_link", reason = "use file_access (automation roots)" },
+    { path = "std::fs::File::open", reason = "use file_access::open (automation roots)" },
+    { path = "std::fs::File::create", reason = "use file_access::write (automation roots)" },
+    { path = "std::fs::File::create_new", reason = "use file_access::write (automation roots)" },
+    { path = "std::fs::OpenOptions::open", reason = "use file_access (automation roots)" },
+    { path = "std::path::Path::exists", reason = "use file_access::exists (automation roots)" },
+    { path = "std::path::Path::try_exists", reason = "use file_access::exists (automation roots)" },
+    { path = "std::path::Path::is_file", reason = "use file_access::metadata (automation roots)" },
+    { path = "std::path::Path::is_dir", reason = "use file_access::is_dir (automation roots)" },
+    { path = "std::path::Path::metadata", reason = "use file_access::metadata (automation roots)" },
+    { path = "std::path::Path::symlink_metadata", reason = "use file_access (automation roots)" },
+    { path = "std::path::Path::read_dir", reason = "use file_access::read_dir (automation roots)" },
+    { path = "std::path::Path::canonicalize", reason = "use file_access (automation roots)" },
+    { path = "figcraft_format::write_file_atomic", reason = "use file_access::write (automation roots)" },
+    { path = "figcraft_format::save_file", reason = "use file_access::write (automation roots)" },
+    { path = "figcraft_format::load_file", reason = "use file_access::read (automation roots)" },
+]
diff --git a/crates/engine/src/a11y_keys_tests.rs b/crates/engine/src/a11y_keys_tests.rs
index 6687886c..e4892bca 100644
--- a/crates/engine/src/a11y_keys_tests.rs
+++ b/crates/engine/src/a11y_keys_tests.rs
@@ -55,3 +55,51 @@ fn reduce_motion_is_a_preference_that_persists() {
     let old: crate::Prefs = serde_json::from_value(json!({"theme": "dark"})).unwrap();
     assert!(!old.reduce_motion);
 }
+
+#[test]
+fn interface_size_is_relative_to_the_system_and_persists() {
+    let mut s = Session::new();
+    assert_eq!(s.prefs.ui_scale, 1.0, "the system's own size by default");
+    assert_eq!(s.execute("pref.uiScale", &json!({})).unwrap()["scale"], 1.0);
+    assert_eq!(s.execute("pref.uiScale", &json!({"scale": 1.25})).unwrap()["scale"], 1.25);
+    assert_eq!(s.prefs.ui_scale, 1.25);
+    // Reading changes nothing; "auto" (older scripts) is the system's own size.
+    assert_eq!(s.execute("pref.uiScale", &json!({})).unwrap()["scale"], 1.25);
+    assert_eq!(s.execute("pref.uiScale", &json!({"scale": "Auto"})).unwrap()["scale"], 1.0);
+    // Nothing to undo: the document didn't change.
+    assert!(!s.ds().map(|d| d.is_dirty()).unwrap_or(false));
+    // Saved with the other preferences and read back.
+    s.prefs.ui_scale = 0.9;
+    let v = serde_json::to_value(&s.prefs).unwrap();
+    assert_eq!(v["ui_scale"], 0.9);
+    let back: crate::Prefs = serde_json::from_value(v).unwrap();
+    assert_eq!(back.ui_scale, 0.9);
+}
+
+#[test]
+fn interface_size_stops_at_the_ends_and_junk_never_changes_it() {
+    let mut s = Session::new();
+    assert_eq!(s.execute("pref.uiScale", &json!({"scale": 0.01})).unwrap()["scale"], crate::UI_SCALE_MIN);
+    assert_eq!(s.execute("pref.uiScale", &json!({"scale": -4})).unwrap()["scale"], crate::UI_SCALE_MIN);
+    assert_eq!(s.execute("pref.uiScale", &json!({"scale": 1e308})).unwrap()["scale"], crate::UI_SCALE_MAX);
+    // The size is a factor (1.25), not a percentage: 125 is far past the end and stops there.
+    assert_eq!(s.execute("pref.uiScale", &json!({"scale": 125})).unwrap()["scale"], crate::UI_SCALE_MAX);
+    s.prefs.ui_scale = 1.5;
+    for junk in [json!({"scale": "NaN"}), json!({"scale": "big"}), json!({"scale": [1]}), json!({"scale": {"x": 1}})] {
+        assert!(s.execute("pref.uiScale", &junk).is_err(), "{junk}");
+        assert_eq!(s.prefs.ui_scale, 1.5, "{junk}");
+    }
+}
+
+#[test]
+fn a_settings_file_without_or_with_a_wrong_interface_size_reads_as_the_systems_size_and_keeps_the_rest() {
+    let old: crate::Prefs = serde_json::from_value(json!({"theme": "dark"})).unwrap();
+    assert_eq!(old.ui_scale, 1.0);
+    for bad in [json!("big"), json!(null), json!([2]), json!(true)] {
+        let p: crate::Prefs = serde_json::from_value(json!({"theme": "dark", "ui_scale": bad})).unwrap();
+        assert_eq!((p.ui_scale, p.theme.as_str()), (1.0, "dark"), "{bad}");
+    }
+    // A number out of range is clamped rather than refused.
+    let p: crate::Prefs = serde_json::from_value(json!({"ui_scale": 99, "theme": "dark"})).unwrap();
+    assert_eq!((p.ui_scale, p.theme.as_str()), (crate::UI_SCALE_MAX, "dark"));
+}
diff --git a/crates/engine/src/al_behaviour_tests.rs b/crates/engine/src/al_behaviour_tests.rs
index 5d34d586..a7a4d1d7 100644
--- a/crates/engine/src/al_behaviour_tests.rs
+++ b/crates/engine/src/al_behaviour_tests.rs
@@ -180,6 +180,23 @@ fn vertical_wrap_columns_take_arrows_and_drops() {
     assert_eq!(line, Some([30.0, 48.0, 50.0, 48.0]));
 }
 
+#[test]
+fn adding_auto_layout_to_a_frame_keeps_its_size() {
+    // An existing frame with content hugs it (padding inferred, so the size is preserved);
+    // an empty one keeps its size instead of collapsing to its padding.
+    let mut s = Session::new();
+    let f = id(s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 300, "height": 200})).unwrap());
+    rect(&mut s, f, 40.0, 20.0, "#FF0000");
+    s.execute("layout.add", &json!({"ids": [f]})).unwrap();
+    assert_eq!(sizing(&s, f), (Sizing::Hug, Sizing::Hug));
+    assert_eq!(size(&s, f), (300.0, 200.0));
+    // An empty frame keeps its size too.
+    let e = id(s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 300, "height": 200})).unwrap());
+    s.execute("layout.add", &json!({"ids": [e]})).unwrap();
+    assert_eq!(sizing(&s, e), (Sizing::Fixed, Sizing::Fixed));
+    assert_eq!(size(&s, e), (300.0, 200.0));
+}
+
 #[test]
 fn canvas_stacking_paints_and_exports_the_first_child_on_top() {
     // Documented: the last child is on top by default; "first on top" flips which one is drawn
@@ -204,3 +221,15 @@ fn canvas_stacking_paints_and_exports_the_first_child_on_top() {
     s.undo().unwrap();
     assert_eq!(pixel(&s, f, 40, 10), [0, 0, 255, 255]);
 }
+
+#[test]
+fn a_size_given_with_a_new_path_fixes_that_axis() {
+    let mut s = Session::new();
+    let f = al_frame(&mut s, json!({}));
+    let v = id(s.execute("node.create", &json!({"type": "vector", "path": "M0 0 L10 10", "closed": false, "parent": f})).unwrap());
+    set(&mut s, v, json!({"sizingH": "fill"}));
+    assert_eq!(sizing(&s, v).0, Sizing::Fill);
+    set(&mut s, v, json!({"path": "M0 0 L20 5", "width": 30}));
+    assert_eq!(sizing(&s, v).0, Sizing::Fixed);
+    assert!((size(&s, v).0 - 30.0).abs() < 1e-6, "{:?}", size(&s, v));
+}
diff --git a/crates/engine/src/annotations_tests.rs b/crates/engine/src/annotations_tests.rs
index 7fc7376f..00065049 100644
--- a/crates/engine/src/annotations_tests.rs
+++ b/crates/engine/src/annotations_tests.rs
@@ -171,7 +171,7 @@ fn ready_for_dev_lists_frames_by_status() {
     };
     let ready = ex(&mut s, "inspect.readyForDev", json!({}));
     assert_eq!(names(&ready), vec!["Login", "Onboarding", "Profile"], "every page, page and layer order");
-    assert_eq!(ready["items"][0], json!({"id": a.0, "name": "Login", "page": page.0, "status": "readyForDev"}));
+    assert_eq!(ready["items"][0], json!({"id": a.0, "name": "Login", "page": page.0, "status": "readyForDev", "changed": false}));
     assert_eq!(names(&ex(&mut s, "inspect.readyForDev", json!({"status": "completed"}))), vec!["Signup"]);
     assert_eq!(names(&ex(&mut s, "inspect.readyForDev", json!({"status": "any", "page": page}))), vec!["Login", "Signup", "Onboarding"]);
     assert!(s.execute("inspect.readyForDev", &json!({"status": "none"})).is_err());
diff --git a/crates/engine/src/assets.rs b/crates/engine/src/assets.rs
new file mode 100644
index 00000000..e648ad3b
--- /dev/null
+++ b/crates/engine/src/assets.rs
@@ -0,0 +1,7 @@
+pub mod components;
+pub mod library;
+pub mod library_server;
+pub mod library_swap;
+pub mod playground;
+pub mod style_vars;
+pub mod token_roles;
diff --git a/crates/engine/src/assets/components.rs b/crates/engine/src/assets/components.rs
new file mode 100644
index 00000000..3932efff
--- /dev/null
+++ b/crates/engine/src/assets/components.rs
@@ -0,0 +1,301 @@
+//! Components and instances.
+//!
+//! An instance's layers are real nodes copied from its main component; each copy records the
+//! main-component node it mirrors (`source`) and which property groups were changed locally
+//! (`overrides`). When a main component changes, every instance is rebuilt from it, keeping layer
+//! ids and re-applying overrides (matched by source, then by layer name path, so switching
+//! variants keeps compatible overrides). Variants are components inside a component set, named
+//! `Property=Value, …`; component properties (boolean, text, instance swap) are applied through
+//! `prop_refs` on the layers they control.
+//!
+//! Override groups: `fills`, `strokes`, `effects`, `opacity`, `visible`, `name`, `corners`,
+//! `characters`, `textStyle` (font, size, spacing, resizing, …), `padding`, `gap` and `alignment`
+//! (of auto layout: its direction and other settings are the main's), `grids`, `exports`,
+//! `interactions`, `size` and `resizing` (hug, fill or fixed, with min and max sizes) of layers
+//! inside an instance, `modes` (the variable modes a layer inside an instance chooses),
+//! `component` (a swapped nested instance), `props` (property values of a nested instance) and
+//! `slot` (a slot holding the instance's own content). An instance's own export settings,
+//! interactions, resizing and variable modes are its own, like its place. `position`
+//! overrides of layers inside an instance are still read and kept, but new ones are refused
+//! ([`check_override_edit`]): those layers take their place and constraints from the main.
+//!
+//! Switching variants keeps an override where the layer's name path matches and the two variants
+//! agreed on that property (text layers keep all of theirs); swapping from the Assets panel keeps
+//! only text layers' overrides ([`keep_text_overrides`]).
+//!
+//! Instances never gain or lose layers of their own: commands that would add, remove or reorder
+//! layers inside an instance are refused ([`check_structure_edit`]), except inside **slots**. A
+//! slot is a frame of a main component bound to a slot property (`prop_refs["slot"]`). An
+//! instance's copy of it shows the main's default content until its layers are edited; from then
+//! on (override group `slot`) its children are the instance's own content: free to edit, kept
+//! across syncs and variant switches, and outside the instance's structure (instances placed in it
+//! stand alone).
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use figcraft_doc::*;
+use figcraft_geom::Affine;
+use serde_json::Value;
+
+mod diff;
+mod guard;
+mod instances;
+mod patch;
+mod rebase;
+mod sync;
+mod variants;
+
+pub use diff::{diff_groups, property_owners, set_boolean_default, variable_groups};
+pub use guard::{check_override_edit, check_structure_edit, refused_override, unlink_layers};
+pub(crate) use instances::copy_group;
+pub use instances::{PROP_BINDING, copy_in_file, create_instance, create_instance_at, sync_instance};
+pub use patch::sync_after_edit;
+#[cfg(test)]
+pub(crate) use patch::{FULL_REBUILD, PATCHED};
+#[cfg(test)]
+use rebase::RebaseSources;
+pub use rebase::rebase_instance;
+pub use sync::keep_text_overrides;
+pub use variants::{default_variant, exposed_copies, find_variant, mirror_issues, variant_conflicts, variant_name, variant_options, variant_props};
+
+/// Nesting limit for instances inside instances.
+const MAX_DEPTH: usize = 16;
+/// The override group (and `prop_refs` field) of slots.
+pub const SLOT: &str = "slot";
+/// Every override group a layer can carry.
+pub const OVERRIDE_GROUPS: &[&str] = &[
+    "fills",
+    "strokes",
+    "effects",
+    "opacity",
+    "visible",
+    "name",
+    "corners",
+    "characters",
+    "textStyle",
+    "padding",
+    "gap",
+    "alignment",
+    "grids",
+    "exports",
+    "interactions",
+    "size",
+    "resizing",
+    "position",
+    "modes",
+    "component",
+    "props",
+    SLOT,
+];
+
+fn is_instance(doc: &Document, id: NodeId) -> bool {
+    doc.node(id).is_some_and(|n| matches!(n.kind, NodeKind::Instance { .. }))
+}
+
+/// A slot (inside an instance) whose children are the instance's own content.
+fn holds_content(n: &Node) -> bool {
+    n.overrides.contains(SLOT)
+}
+
+/// `id` and its ancestors, up to the nearest slot above it that holds an instance's own content:
+/// content belongs to no instance (it edits freely, and instances placed in it stand alone).
+fn scope(doc: &Document, id: NodeId) -> Vec<NodeId> {
+    let mut out = vec![id];
+    for a in doc.ancestors(id) {
+        if doc.node(a).is_some_and(holds_content) {
+            break;
+        }
+        out.push(a);
+    }
+    out
+}
+
+/// The component a node belongs to (itself, or the nearest component ancestor).
+pub fn owning_component(doc: &Document, id: NodeId) -> Option<NodeId> {
+    let mut chain = vec![id];
+    chain.extend(doc.ancestors(id));
+    chain.into_iter().find(|c| doc.node(*c).is_some_and(|n| matches!(n.kind, NodeKind::Component { .. })))
+}
+
+/// The innermost instance containing `id` (`id` itself when it is an instance).
+pub fn owning_instance(doc: &Document, id: NodeId) -> Option<NodeId> {
+    scope(doc, id).into_iter().find(|c| is_instance(doc, *c))
+}
+
+/// The outermost instance containing `id` (`id` itself when it is a top-level instance).
+pub fn root_instance(doc: &Document, id: NodeId) -> Option<NodeId> {
+    scope(doc, id).into_iter().rfind(|c| is_instance(doc, *c))
+}
+
+/// The innermost instance `id` is a layer of (never `id` itself).
+fn enclosing_instance(doc: &Document, id: NodeId) -> Option<NodeId> {
+    scope(doc, id).into_iter().skip(1).find(|c| is_instance(doc, *c))
+}
+
+/// Whether `id` is a layer inside an instance (not the outermost instance itself).
+pub fn inside_instance(doc: &Document, id: NodeId) -> bool {
+    enclosing_instance(doc, id).is_some()
+}
+
+/// Mark the `modes` override on layers inside instances whose variable modes differ from their
+/// main layer's, for files from before `modes` was an override group. Copies follow their main
+/// layer's modes, so a layer on other modes chose them itself.
+pub fn mark_layer_modes(doc: &mut Document) {
+    let chose: Vec<NodeId> = doc
+        .nodes()
+        .filter(|n| !n.overrides.contains("modes") && n.source.and_then(|s| doc.node(s)).is_some_and(|m| m.var_modes != n.var_modes))
+        .map(|n| n.id)
+        .filter(|id| inside_instance(doc, *id))
+        .collect();
+    for id in chose {
+        if let Some(n) = doc.node_mut(id) {
+            n.overrides.insert("modes".into());
+        }
+    }
+}
+
+/// The slot property frame `id` stands for (its name and preferred components): a frame bound to
+/// a slot property of its component, or an instance's copy of one (followed through its sources).
+pub fn slot_def(doc: &Document, id: NodeId) -> Option<(&str, &[NodeId])> {
+    let mut cur = id;
+    for _ in 0..=MAX_DEPTH {
+        let n = doc.node(cur)?;
+        if !matches!(n.kind, NodeKind::Frame) {
+            return None;
+        }
+        if let Some(name) = n.prop_refs.get(SLOT) {
+            let NodeKind::Component { props, .. } = &doc.node(owning_component(doc, cur)?)?.kind else { return None };
+            return match props.get(name) {
+                Some(PropDef::Slot { preferred }) => Some((name.as_str(), preferred.as_slice())),
+                _ => None,
+            };
+        }
+        cur = n.source?;
+    }
+    None
+}
+
+/// The name of the slot property frame `id` stands for ([`slot_def`]).
+pub fn slot_name(doc: &Document, id: NodeId) -> Option<String> {
+    slot_def(doc, id).map(|(name, _)| name.to_string())
+}
+
+/// Whether `id` is a slot (in a main component, or an instance's copy of one).
+pub fn is_slot(doc: &Document, id: NodeId) -> bool {
+    slot_def(doc, id).is_some()
+}
+
+/// Whether slot `id` (inside an instance) holds the instance's own content rather than its main's
+/// default content.
+pub fn slot_edited(doc: &Document, id: NodeId) -> bool {
+    doc.node(id).is_some_and(holds_content)
+}
+
+/// The slot `id` is, or lies in, within its instance: where layers may be added, removed and
+/// reordered freely.
+pub fn slot_scope(doc: &Document, id: NodeId) -> Option<NodeId> {
+    let mut chain = vec![id];
+    chain.extend(doc.ancestors(id));
+    for c in chain {
+        if is_instance(doc, c) {
+            return None;
+        }
+        if is_slot(doc, c) {
+            return Some(c);
+        }
+    }
+    None
+}
+
+/// Whether layers can't be added to, removed from or reordered in `id`: it is (inside) an
+/// instance, outside its slots.
+pub fn structure_locked(doc: &Document, id: NodeId) -> bool {
+    owning_instance(doc, id).is_some() && slot_scope(doc, id).is_none()
+}
+
+/// For tree walks that look for where layers can go: whether the children of `id` are locked (in
+/// an instance, outside its slots), given whether `id` itself is (`locked`).
+pub fn locks_children(doc: &Document, id: NodeId, locked: bool) -> bool {
+    is_instance(doc, id) || (locked && !is_slot(doc, id))
+}
+
+/// Whether layer `id`'s place (parent and position among its siblings) changed between two
+/// versions only where instance structure allows it.
+pub fn move_allowed(before: &Document, after: &Document, id: NodeId) -> bool {
+    let place = |d: &Document| d.node(id).and_then(|n| n.parent).map(|p| (p, d.index_in_parent(id)));
+    let (was, is) = (place(before), place(after));
+    was == is || (!was.is_some_and(|(p, _)| structure_locked(before, p)) && !is.is_some_and(|(p, _)| structure_locked(after, p)))
+}
+
+/// The slots of a component or instance (its own: not those of instances nested in it, nor of the
+/// content put into its slots), with their property names, top-most first.
+pub fn slots_of(doc: &Document, root: NodeId) -> Vec<(NodeId, String)> {
+    let mut out = Vec::new();
+    let mut stack: Vec<NodeId> = doc.node(root).map(|n| n.children.iter().rev().copied().collect()).unwrap_or_default();
+    let mut seen = 0usize;
+    while let Some(c) = stack.pop() {
+        seen += 1;
+        if seen > 1_000_000 {
+            break;
+        }
+        let Some(n) = doc.node(c) else { continue };
+        if let Some(name) = slot_name(doc, c) {
+            out.push((c, name));
+        }
+        if !is_instance(doc, c) && !holds_content(n) {
+            stack.extend(n.children.iter().rev().copied());
+        }
+    }
+    out
+}
+
+/// All instances of `component` in the document.
+pub fn instances_of(doc: &Document, component: NodeId) -> Vec<NodeId> {
+    doc.nodes().filter(|n| matches!(n.kind, NodeKind::Instance { component: c, .. } if c == component)).map(|n| n.id).collect()
+}
+
+/// The component set a variant belongs to.
+pub fn variant_set(doc: &Document, component: NodeId) -> Option<NodeId> {
+    doc.node(component).and_then(|c| c.parent).filter(|p| doc.node(*p).is_some_and(|n| matches!(n.kind, NodeKind::ComponentSet { .. })))
+}
+
+/// The layer name a fresh instance of `component` gets: the set's name for variants.
+pub fn default_instance_name(doc: &Document, component: NodeId) -> String {
+    let set = variant_set(doc, component).and_then(|s| doc.node(s));
+    set.or_else(|| doc.node(component)).map(|n| n.name.clone()).unwrap_or_else(|| "Instance".into())
+}
+
+/// Default property values of a component (slots hold content, not values: they have none).
+pub fn default_props(comp: &Node) -> BTreeMap<String, Value> {
+    let mut out = BTreeMap::new();
+    if let NodeKind::Component { props, .. } = &comp.kind {
+        for (k, d) in props {
+            if takes_value(d) {
+                out.insert(k.clone(), prop_default_value(d));
+            }
+        }
+    }
+    out
+}
+
+/// Whether instances store a value for the property (every kind but slots).
+pub fn takes_value(d: &PropDef) -> bool {
+    !matches!(d, PropDef::Slot { .. })
+}
+
+/// A property definition's default as a JSON value.
+pub fn prop_default_value(d: &PropDef) -> Value {
+    match d {
+        PropDef::Boolean { default } => Value::Bool(*default),
+        PropDef::Text { default } => Value::String(default.clone()),
+        PropDef::InstanceSwap { default, .. } => Value::from(default.0),
+        PropDef::Variant { default, .. } => Value::String(default.clone()),
+        PropDef::Slot { .. } => Value::Null,
+    }
+}
+
+#[cfg(test)]
+mod rebase_source_tests;
+
+#[cfg(test)]
+pub(crate) mod tests;
diff --git a/crates/engine/src/assets/components/diff.rs b/crates/engine/src/assets/components/diff.rs
new file mode 100644
index 00000000..bf742fed
--- /dev/null
+++ b/crates/engine/src/assets/components/diff.rs
@@ -0,0 +1,218 @@
+use super::instances::PROP_BINDING;
+use super::*;
+
+/// The property groups whose value layer `n` takes from the same variables as its main layer
+/// `src` (they differ only where the two resolve in different variable modes).
+pub fn variable_groups(n: &Node, src: &Node) -> Vec<&'static str> {
+    let mut out = Vec::new();
+    for (k, v) in &n.bound {
+        let Some(g) = binding_group(k) else { continue };
+        if src.bound.get(k) == Some(v) && !out.contains(&g) {
+            out.push(g);
+        }
+    }
+    out
+}
+
+/// The override group a variable binding key feeds (`None` for component property and layout
+/// grid bindings, which follow other rules).
+pub(super) fn binding_group(key: &str) -> Option<&'static str> {
+    use crate::cmd::lists::{BoundList, list_binding};
+    if key.starts_with(PROP_BINDING) {
+        return None;
+    }
+    match list_binding(key).map(|(l, _, _)| l) {
+        Some(BoundList::Fills) => Some("fills"),
+        Some(BoundList::Strokes) => Some("strokes"),
+        Some(BoundList::Effects) => Some("effects"),
+        Some(BoundList::Grids) => None,
+        None => Some(crate::cmd::props::override_group(key)).filter(|g| *g != "other"),
+    }
+}
+
+/// The variable bindings of `n` that feed group `g`.
+pub(super) fn bindings_of<'a>(n: &'a Node, g: &'a str) -> impl Iterator<Item = (&'a String, &'a String)> + 'a {
+    n.bound.iter().filter(move |(k, _)| binding_group(k) == Some(g))
+}
+
+/// Property groups that differ between two versions of a node.
+pub fn diff_groups(a: &Node, b: &Node) -> Vec<&'static str> {
+    let mut out = Vec::new();
+    if a.fills != b.fills {
+        out.push("fills");
+    }
+    if a.strokes != b.strokes || a.stroke != b.stroke {
+        out.push("strokes");
+    }
+    if a.effects != b.effects {
+        out.push("effects");
+    }
+    if a.opacity != b.opacity || a.blend != b.blend {
+        out.push("opacity");
+    }
+    if a.visible != b.visible {
+        out.push("visible");
+    }
+    if a.name != b.name {
+        out.push("name");
+    }
+    if a.corners != b.corners {
+        out.push("corners");
+    }
+    if (a.width - b.width).abs() > 1e-6 || (a.height - b.height).abs() > 1e-6 {
+        out.push("size");
+    }
+    if resizing(a) != resizing(b) {
+        out.push("resizing");
+    }
+    if a.transform != b.transform {
+        out.push("position");
+    }
+    if let (NodeKind::Text(x), NodeKind::Text(y)) = (&a.kind, &b.kind) {
+        if x.characters != y.characters {
+            out.push("characters");
+        }
+        if text_style_differs(x, y) {
+            out.push("textStyle");
+        }
+    }
+    if let (Some(x), Some(y)) = (&a.layout, &b.layout) {
+        if x.padding != y.padding {
+            out.push("padding");
+        }
+        if x.gap != y.gap || x.cross_gap != y.cross_gap {
+            out.push("gap");
+        }
+        if x.main_align != y.main_align || x.cross_align != y.cross_align || x.content_align != y.content_align {
+            out.push("alignment");
+        }
+    }
+    if a.grids != b.grids || a.styles.grid != b.styles.grid {
+        out.push("grids");
+    }
+    if a.exports != b.exports {
+        out.push("exports");
+    }
+    if a.interactions != b.interactions {
+        out.push("interactions");
+    }
+    if a.var_modes != b.var_modes {
+        out.push("modes");
+    }
+    if let (NodeKind::Instance { component: x, props: px }, NodeKind::Instance { component: y, props: py }) = (&a.kind, &b.kind) {
+        if x != y {
+            out.push("component");
+        }
+        if px != py {
+            out.push("props");
+        }
+    }
+    out
+}
+
+/// The `resizing` group of a layer: how it sizes on each axis, and its min and max sizes.
+fn resizing(n: &Node) -> (Sizing, Sizing, [Option<f64>; 4]) {
+    let c = &n.child_layout;
+    (c.sizing_h, c.sizing_v, [c.min_w, c.max_w, c.min_h, c.max_h])
+}
+
+/// Whether two texts differ in anything but their characters (the `textStyle` group).
+fn text_style_differs(x: &TextData, y: &TextData) -> bool {
+    x.style != y.style
+        || x.runs != y.runs
+        || x.auto_resize != y.auto_resize
+        || x.align_h != y.align_h
+        || x.align_v != y.align_v
+        || x.paragraph_spacing != y.paragraph_spacing
+        || x.paragraph_indent != y.paragraph_indent
+        || x.list != y.list
+        || x.paragraphs != y.paragraphs
+        || x.list_spacing != y.list_spacing
+        || x.hanging_punctuation != y.hanging_punctuation
+        || x.hanging_list != y.hanging_list
+        || x.max_lines != y.max_lines
+        || x.features != y.features
+}
+
+/// Whether a geometry change of `id` comes from layout rather than the user: an ancestor was
+/// resized in the same edit (constraints), the parent is an auto layout frame, or auto-sized text.
+pub(super) fn geometry_derived(doc: &Document, before: &Document, id: NodeId, group: &str) -> bool {
+    for a in doc.ancestors(id) {
+        let (Some(x), Some(y)) = (doc.node(a), before.node(a)) else { continue };
+        if (x.width - y.width).abs() > 1e-6 || (x.height - y.height).abs() > 1e-6 {
+            return true;
+        }
+    }
+    let Some(n) = doc.node(id) else { return true };
+    if group == "position" && n.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some()) && !n.child_layout.absolute {
+        return true;
+    }
+    if group == "size"
+        && let NodeKind::Text(t) = &n.kind
+    {
+        let wchanged = before.node(id).is_some_and(|b| (b.width - n.width).abs() > 1e-6);
+        return match t.auto_resize {
+            TextAutoResize::WidthAndHeight => true,
+            TextAutoResize::Height => !wchanged,
+            _ => false,
+        };
+    }
+    false
+}
+
+/// The components sharing the properties of component `c`: the variants of its set, or `c` alone.
+pub fn property_owners(doc: &Document, c: NodeId) -> Vec<NodeId> {
+    match variant_set(doc, c).and_then(|s| doc.node(s)) {
+        Some(set) => set.children.iter().copied().filter(|v| doc.node(*v).is_some_and(|n| matches!(n.kind, NodeKind::Component { .. }))).collect(),
+        None => vec![c],
+    }
+}
+
+/// Make `value` the default of boolean property `name` on components `comps`, showing or hiding
+/// their layers bound to it: on a main component, a boolean property's value is the visibility of
+/// its layers. Returns the components and layers it changed.
+pub fn set_boolean_default(doc: &mut Document, comps: &[NodeId], name: &str, value: bool) -> Vec<NodeId> {
+    let mut out = Vec::new();
+    for &c in comps {
+        let Some(NodeKind::Component { props, .. }) = doc.node(c).map(|n| &n.kind) else { continue };
+        let Some(PropDef::Boolean { default }) = props.get(name) else { continue };
+        if *default != value
+            && let Some(NodeKind::Component { props, .. }) = doc.node_mut(c).map(|n| &mut n.kind)
+        {
+            props.insert(name.to_string(), PropDef::Boolean { default: value });
+            out.push(c);
+        }
+        // The main's own layers (not those of instances nested in it, which follow their mains).
+        let layers: Vec<NodeId> = doc
+            .subtree(c)
+            .into_iter()
+            .filter(|d| *d != c && !inside_instance(doc, *d))
+            .filter(|d| doc.node(*d).is_some_and(|n| n.visible != value && n.prop_refs.get("visible").map(String::as_str) == Some(name)))
+            .collect();
+        for d in layers {
+            if let Some(n) = doc.node_mut(d) {
+                n.visible = value;
+                out.push(d);
+            }
+        }
+    }
+    out
+}
+
+/// A main component's layer bound to a boolean property was shown or hidden: that is the
+/// property's new default, which its other bound layers (in every variant) take too. Returns the
+/// components and layers that changed as a result.
+pub(super) fn follow_boolean_defaults(doc: &mut Document, before: &Document, changed: &[NodeId]) -> Vec<NodeId> {
+    let mut out = Vec::new();
+    for &id in changed {
+        let (Some(n), Some(b)) = (doc.node(id), before.node(id)) else { continue };
+        if n.visible == b.visible || inside_instance(doc, id) {
+            continue;
+        }
+        let Some(name) = n.prop_refs.get("visible").cloned() else { continue };
+        let visible = n.visible;
+        let Some(c) = owning_component(doc, id).filter(|c| *c != id) else { continue };
+        out.extend(set_boolean_default(doc, &property_owners(doc, c), &name, visible));
+    }
+    out
+}
diff --git a/crates/engine/src/assets/components/guard.rs b/crates/engine/src/assets/components/guard.rs
new file mode 100644
index 00000000..b320b7c4
--- /dev/null
+++ b/crates/engine/src/assets/components/guard.rs
@@ -0,0 +1,135 @@
+use super::diff::geometry_derived;
+use super::rebase::rebase_instance;
+use super::variants::instance_issues;
+use super::*;
+
+/// Slot `slot` (inside an instance) takes the instance's own content: the layers it shows (the
+/// main's default content until now) stop mirroring the main, and instances among them stand
+/// alone, linked to their own mains.
+pub(super) fn own_slot_content(doc: &mut Document, slot: NodeId) {
+    if let Some(n) = doc.node_mut(slot) {
+        n.overrides.insert(SLOT.into());
+    }
+    for nested in unlink_layers(doc, slot, None) {
+        rebase_instance(doc, nested);
+    }
+}
+
+/// Unlink the layers below `top` that are layers of `owner` (an instance, or `None` for the
+/// content of a slot): plain layers forget the main layer they mirrored and their property
+/// bindings. The instances among them are returned, to re-link to their own mains (with
+/// [`rebase_instance`]) once the caller is done.
+pub fn unlink_layers(doc: &mut Document, top: NodeId, owner: Option<NodeId>) -> Vec<NodeId> {
+    let picked: Vec<(NodeId, bool)> =
+        doc.subtree(top).into_iter().filter(|d| *d != top && enclosing_instance(doc, *d) == owner).map(|d| (d, is_instance(doc, d))).collect();
+    let mut nested = Vec::new();
+    for (d, instance) in picked {
+        let Some(n) = doc.node_mut(d) else { continue };
+        n.prop_refs.clear();
+        if instance {
+            nested.push(d);
+        } else {
+            n.source = None;
+            n.overrides.clear();
+        }
+    }
+    nested
+}
+
+/// A new layer copied from inside an instance (pasted, duplicated) to where no instance owns it
+/// stops mirroring the main; a copied nested instance is re-linked to its own main (its look kept).
+pub(super) fn relink_copy(doc: &mut Document, id: NodeId) {
+    let Some(n) = doc.node(id) else { return };
+    match &n.kind {
+        NodeKind::Instance { component, .. } => {
+            let main_ok = doc.node(*component).is_some_and(|m| matches!(m.kind, NodeKind::Component { .. }));
+            if main_ok && !inside_instance(doc, id) && (n.source != Some(*component) || !instance_issues(doc, id).is_empty()) {
+                rebase_instance(doc, id);
+            }
+        }
+        _ => {
+            if (n.source.is_some() || !n.overrides.is_empty())
+                && owning_instance(doc, id).is_none()
+                && let Some(m) = doc.node_mut(id)
+            {
+                m.source = None;
+                m.overrides.clear();
+            }
+        }
+    }
+}
+
+/// Refuse edits that add, remove or reorder layers inside an instance (only its main can), outside
+/// its slots.
+pub fn check_structure_edit(before: &Document, after: &Document) -> Result<(), String> {
+    for &id in after.dirty() {
+        let (Some(n), Some(b)) = (after.node(id), before.node(id)) else { continue };
+        // Library copies change only through library updates (and are read-only otherwise).
+        if n.children == b.children || after.is_remote(id) {
+            continue;
+        }
+        if structure_locked(before, id) && structure_locked(after, id) {
+            let name = owning_instance(after, id).and_then(|i| after.node(i)).map(|i| i.name.clone()).unwrap_or_default();
+            return Err(format!(
+                "layers can't be added, removed or reordered inside the instance \"{name}\": edit its main component, or detach the instance first"
+            ));
+        }
+    }
+    Ok(())
+}
+
+/// Refuse edits an instance doesn't take as overrides ([`refused_override`]); the edit is rolled
+/// back.
+pub fn check_override_edit(before: &Document, after: &Document) -> Result<(), String> {
+    match after.dirty().iter().find_map(|id| refused_override(before, after, *id)) {
+        Some(what) => Err(format!("{what} comes from the main component in an instance: edit the main component, or detach the instance")),
+        None => Ok(()),
+    }
+}
+
+/// What about layer `id` an edit from `before` to `after` changed that only its main can: the
+/// auto layout of an instance or a layer in one but its padding, gap and alignment, or the
+/// position (rotation too), constraints or place in auto layout (absolute, grid cell) of a layer
+/// inside an instance (its size and resizing are overrides). `None` when the edit is fine, also
+/// when the main changed the same way in this edit (a library update).
+pub fn refused_override(before: &Document, after: &Document, id: NodeId) -> Option<&'static str> {
+    let (n, b) = (after.node(id)?, before.node(id)?);
+    if after.is_remote(id) || n.source != b.source || owning_instance(before, id).is_none() || owning_instance(after, id).is_none() {
+        return None;
+    }
+    let (mb, ma) = (before.node(n.source?)?, after.node(n.source?)?);
+    let mode = |x: &Node| x.layout.as_ref().map(|l| l.mode);
+    // Auto layout settings other than the overridable ones.
+    let settings = |x: &Node| {
+        x.layout.clone().map(|mut l| {
+            (l.gap, l.cross_gap, l.padding, l.main_align, l.cross_align) = (0.0, 0.0, [0.0; 4], MainAlign::Min, CrossAlign::Min);
+            l.content_align = ContentAlign::Auto;
+            l
+        })
+    };
+    // Child layout settings other than the resizing ones.
+    let placing = |x: &Node| {
+        let mut c = x.child_layout.clone();
+        (c.sizing_h, c.sizing_v, c.min_w, c.max_w, c.min_h, c.max_h) = (Sizing::Fixed, Sizing::Fixed, None, None, None, None);
+        c
+    };
+    if mode(n) != mode(b) && mode(ma) == mode(mb) {
+        return Some("The auto layout direction");
+    }
+    if settings(n) != settings(b) && settings(ma) == settings(mb) {
+        return Some("This auto layout setting");
+    }
+    if !inside_instance(after, id) || !inside_instance(before, id) {
+        return None;
+    }
+    if n.transform != b.transform && ma.transform == mb.transform && !geometry_derived(after, before, id, "position") {
+        return Some("A layer's position");
+    }
+    if n.constraints != b.constraints && ma.constraints == mb.constraints {
+        return Some("A layer's constraints");
+    }
+    if placing(n) != placing(b) && placing(ma) == placing(mb) {
+        return Some("A layer's place in auto layout");
+    }
+    None
+}
diff --git a/crates/engine/src/assets/components/instances.rs b/crates/engine/src/assets/components/instances.rs
new file mode 100644
index 00000000..9fd4e2c2
--- /dev/null
+++ b/crates/engine/src/assets/components/instances.rs
@@ -0,0 +1,342 @@
+use super::diff::{binding_group, bindings_of};
+use super::sync::{insert_linked, sync_instance_depth};
+use super::*;
+
+/// Create an instance of `component` under `parent` at `(x, y)` (parent space).
+pub fn create_instance(doc: &mut Document, component: NodeId, parent: NodeId, x: f64, y: f64) -> Result<NodeId, DocError> {
+    create_instance_at(doc, component, parent, x, y, None)
+}
+
+/// [`create_instance`] at child `index` of `parent` (None: on top).
+pub fn create_instance_at(doc: &mut Document, component: NodeId, parent: NodeId, x: f64, y: f64, index: Option<usize>) -> Result<NodeId, DocError> {
+    let comp = doc.get(component)?.clone();
+    if !matches!(comp.kind, NodeKind::Component { .. }) {
+        return Err(DocError::Invalid(format!("{component} is not a component")));
+    }
+    if doc.is_ancestor(component, parent) {
+        return Err(DocError::Invalid("an instance can't be placed inside its own main component".into()));
+    }
+    let id = doc.alloc_id();
+    let mut root = comp.clone();
+    root.id = id;
+    root.name = default_instance_name(doc, component);
+    root.kind = NodeKind::Instance { component, props: default_props(&comp) };
+    root.children.clear();
+    root.parent = None;
+    root.source = Some(component);
+    root.overrides.clear();
+    root.transform = Affine::translate((x, y));
+    root.prop_refs.clear();
+    root.annotations.clear();
+    root.code_links.clear();
+    // The main's dev resources show on its instances without being copied.
+    root.dev_resources.clear();
+    // Measurements belong to the layer they were placed on.
+    root.measurements.clear();
+    // The main's interactions play on its instances in prototypes; the instance's own start empty.
+    root.interactions.clear();
+    // So do the variable modes the main sets (see `Document::inherited_modes`).
+    root.var_modes.clear();
+    doc.insert(root, parent, index)?;
+    sync_instance(doc, id);
+    Ok(id)
+}
+
+/// Copy `id` within its own file under `parent` (at `index`), keeping its local transform. A file
+/// has one main per component, so a main component's copy is an instance of it; a variant copied
+/// into its set stays a new variant, and every other layer is deep-copied.
+pub fn copy_in_file(doc: &mut Document, id: NodeId, parent: NodeId, index: Option<usize>) -> Result<NodeId, DocError> {
+    let n = doc.get(id)?;
+    let in_set = doc.node(parent).is_some_and(|p| matches!(p.kind, NodeKind::ComponentSet { .. }));
+    if !matches!(n.kind, NodeKind::Component { .. }) || in_set {
+        return doc.duplicate_into(id, parent, index);
+    }
+    let transform = n.transform;
+    let instance = create_instance_at(doc, id, parent, 0.0, 0.0, index)?;
+    doc.get_mut(instance)?.transform = transform;
+    Ok(instance)
+}
+
+/// Which part of the carried overrides to apply.
+#[derive(Clone, Copy, PartialEq)]
+pub(super) enum Carry {
+    /// Paint, text, visibility, … (everything but geometry).
+    Values,
+    /// Values plus size (instance roots: their size decides how children follow constraints).
+    Root,
+    /// Size and position (children, after constraints ran).
+    Geometry,
+}
+
+/// Copy the overridden property groups of `from` onto `to`.
+pub(super) fn carry_overrides(from: &Node, to: &mut Node, what: Carry) {
+    for g in &from.overrides {
+        let geo = matches!(g.as_str(), "size" | "position");
+        match what {
+            Carry::Values if geo => continue,
+            Carry::Root if g == "position" => continue,
+            Carry::Geometry if !geo => continue,
+            _ => {}
+        }
+        copy_group(from, to, g);
+    }
+    if what != Carry::Geometry {
+        to.overrides = from.overrides.clone();
+    }
+}
+
+/// An instance switched from variant `was` to `new`: its resizing (sizing and min / max per axis)
+/// that is still `was`'s follows `new`; what the instance set itself stays in `own`.
+pub(super) fn follow_variant_resizing(own: &mut ChildLayout, was: &ChildLayout, new: &ChildLayout) {
+    if own.sizing_h == was.sizing_h {
+        own.sizing_h = new.sizing_h;
+    }
+    if own.sizing_v == was.sizing_v {
+        own.sizing_v = new.sizing_v;
+    }
+    for (o, w, n) in [
+        (&mut own.min_w, was.min_w, new.min_w),
+        (&mut own.max_w, was.max_w, new.max_w),
+        (&mut own.min_h, was.min_h, new.min_h),
+        (&mut own.max_h, was.max_h, new.max_h),
+    ] {
+        if *o == w {
+            *o = n;
+        }
+    }
+}
+
+/// Copy the values of property group `g` of `from` onto `to`, with the variables bound to them.
+pub(crate) fn copy_group(from: &Node, to: &mut Node, g: &str) {
+    if from.bound.iter().chain(to.bound.iter()).any(|(k, _)| binding_group(k) == Some(g)) {
+        to.bound.retain(|k, _| binding_group(k) != Some(g));
+        to.bound.extend(bindings_of(from, g).map(|(k, v)| (k.clone(), v.clone())));
+    }
+    match g {
+        "fills" => {
+            to.fills = from.fills.clone();
+            to.styles.fill = from.styles.fill.clone();
+        }
+        "strokes" => {
+            to.strokes = from.strokes.clone();
+            to.stroke = from.stroke.clone();
+            to.styles.stroke = from.styles.stroke.clone();
+        }
+        "effects" => {
+            to.effects = from.effects.clone();
+            to.styles.effect = from.styles.effect.clone();
+        }
+        "opacity" => {
+            to.opacity = from.opacity;
+            to.blend = from.blend;
+        }
+        "visible" => to.visible = from.visible,
+        "name" => to.name = from.name.clone(),
+        "corners" => to.corners = from.corners,
+        "characters" => {
+            if let (NodeKind::Text(a), NodeKind::Text(b)) = (&from.kind, &mut to.kind) {
+                b.characters = a.characters.clone();
+                b.runs = a.runs.clone();
+                b.paragraphs = a.paragraphs.clone();
+            }
+        }
+        "textStyle" => {
+            if let (NodeKind::Text(a), NodeKind::Text(b)) = (&from.kind, &mut to.kind) {
+                b.style = a.style.clone();
+                b.runs = a.runs.clone();
+                b.auto_resize = a.auto_resize;
+                b.align_h = a.align_h;
+                b.align_v = a.align_v;
+                b.paragraph_spacing = a.paragraph_spacing;
+                b.paragraph_indent = a.paragraph_indent;
+                b.list = a.list;
+                b.paragraphs = a.paragraphs.clone();
+                b.list_spacing = a.list_spacing;
+                b.hanging_punctuation = a.hanging_punctuation;
+                b.hanging_list = a.hanging_list;
+                b.max_lines = a.max_lines;
+                b.features = a.features.clone();
+            }
+            to.styles.text = from.styles.text.clone();
+        }
+        "padding" | "gap" | "alignment" => {
+            if let (Some(a), Some(b)) = (&from.layout, &mut to.layout) {
+                match g {
+                    "padding" => b.padding = a.padding,
+                    "gap" => (b.gap, b.cross_gap) = (a.gap, a.cross_gap),
+                    _ => (b.main_align, b.cross_align, b.content_align) = (a.main_align, a.cross_align, a.content_align),
+                }
+            }
+        }
+        "grids" => {
+            to.grids = from.grids.clone();
+            to.styles.grid = from.styles.grid.clone();
+        }
+        "exports" => to.exports = from.exports.clone(),
+        "interactions" => to.interactions = from.interactions.clone(),
+        "size" => {
+            to.width = from.width;
+            to.height = from.height;
+            if let (NodeKind::Text(a), NodeKind::Text(b)) = (&from.kind, &mut to.kind) {
+                b.auto_resize = a.auto_resize;
+            }
+        }
+        "resizing" => {
+            let (a, b) = (&from.child_layout, &mut to.child_layout);
+            (b.sizing_h, b.sizing_v, b.min_w, b.max_w, b.min_h, b.max_h) = (a.sizing_h, a.sizing_v, a.min_w, a.max_w, a.min_h, a.max_h);
+        }
+        "position" => to.transform = from.transform,
+        "modes" => to.var_modes = from.var_modes.clone(),
+        "component" => {
+            if let (NodeKind::Instance { component: a, .. }, NodeKind::Instance { component: b, .. }) = (&from.kind, &mut to.kind) {
+                *b = *a;
+            }
+        }
+        "props" => {
+            if let (NodeKind::Instance { props: a, .. }, NodeKind::Instance { props: b, .. }) = (&from.kind, &mut to.kind) {
+                *b = a.clone();
+            }
+            carry_prop_bindings(from, to);
+        }
+        _ => {}
+    }
+}
+
+/// Layer name paths below `root` ("Frame/Label", with `#n` for same-named siblings). With
+/// `src_names` (an instance's layers), layers are named after the main layer they mirror (renames
+/// don't break matching), and the content of slots holding the instance's own is left out.
+pub(super) fn path_map(doc: &Document, root: NodeId, src_names: bool) -> BTreeMap<NodeId, String> {
+    let mut out = BTreeMap::new();
+    let mut stack = vec![(root, String::new())];
+    while let Some((id, prefix)) = stack.pop() {
+        let Some(n) = doc.node(id) else { continue };
+        let mut seen: BTreeMap<&str, usize> = BTreeMap::new();
+        for c in &n.children {
+            let Some(cn) = doc.node(*c) else { continue };
+            // A nested instance linked only to its own component so far (an imported one) mirrors no
+            // layer yet: it goes by its own name, like the main's layer it will be matched with.
+            let unplaced = matches!(&cn.kind, NodeKind::Instance { component, .. } if cn.source == Some(*component));
+            let mirrored = cn.source.filter(|_| src_names && !unplaced).and_then(|s| doc.node(s));
+            let name = mirrored.map_or(cn.name.as_str(), |s| s.name.as_str());
+            let k = seen.entry(name).or_insert(0);
+            let seg = if *k == 0 { name.to_string() } else { format!("{name}#{k}") };
+            *k += 1;
+            let path = if prefix.is_empty() { seg } else { format!("{prefix}/{seg}") };
+            out.insert(*c, path.clone());
+            if out.len() > 1_000_000 {
+                return out;
+            }
+            if !(src_names && holds_content(cn)) {
+                stack.push((*c, path));
+            }
+        }
+    }
+    out
+}
+
+/// The binding key prefix of an instance's component property value
+/// (`componentProperties/<name>`): a boolean property takes a boolean variable, a text property a
+/// string variable.
+pub const PROP_BINDING: &str = "componentProperties/";
+
+/// Give `to` the component property bindings of instance `from` (they go with its property
+/// values, which an instance keeps across rebuilds).
+pub(super) fn carry_prop_bindings(from: &Node, to: &mut Node) {
+    to.bound.retain(|k, _| !k.starts_with(PROP_BINDING));
+    to.bound.extend(from.bound.iter().filter(|(k, _)| k.starts_with(PROP_BINDING)).map(|(k, v)| (k.clone(), v.clone())));
+}
+
+/// The override group a property-bound field belongs to.
+pub(super) fn field_group(field: &str) -> &'static str {
+    match field {
+        "visible" => "visible",
+        "characters" => "characters",
+        "mainComponent" => "component",
+        _ => "",
+    }
+}
+
+/// Apply one component-property value to a layer.
+pub(super) fn apply_prop(doc: &Document, n: &mut Node, field: &str, val: &Value) {
+    match field {
+        "visible" => {
+            if let Some(b) = val.as_bool() {
+                n.visible = b;
+            }
+        }
+        "characters" => {
+            if let (NodeKind::Text(t), Some(sv)) = (&mut n.kind, val.as_str().map(crate::cmd::props::normalize_line_endings))
+                && t.characters != sv
+            {
+                let len = t.char_count();
+                t.replace_range(0, len, &sv);
+            }
+        }
+        "mainComponent" => {
+            if let (NodeKind::Instance { component: c, .. }, Some(v)) = (&mut n.kind, crate::params::id_of(val))
+                && doc.node(v).is_some_and(|m| matches!(m.kind, NodeKind::Component { .. }))
+            {
+                *c = v;
+            }
+        }
+        _ => {}
+    }
+}
+
+/// Rebuild instance `inst` from its main component, keeping ids, overrides and the content of its
+/// slots. An instance whose main component was deleted keeps its layers as they are.
+pub fn sync_instance(doc: &mut Document, inst: NodeId) {
+    // Layers the rebuild leaves as they were keep their shared snapshot (and aren't edits).
+    let old: Vec<(std::sync::Arc<Node>, bool)> =
+        doc.subtree(inst).into_iter().filter_map(|i| doc.node_arc(i).map(|a| (a.clone(), doc.dirty().contains(&i)))).collect();
+    let kept = slot_content(doc, inst);
+    sync_instance_depth(doc, inst, 0, BTreeMap::new());
+    restore_slot_content(doc, kept);
+    for (a, was_dirty) in old {
+        doc.keep_if_unchanged(a, was_dirty);
+    }
+}
+
+/// The slots in instance `inst` (nested instances included) holding the instance's own content:
+/// each with its content (the subtrees of its children, pre-order).
+fn slot_content(doc: &Document, inst: NodeId) -> Vec<(NodeId, Vec<Node>)> {
+    let mut out = Vec::new();
+    let mut stack: Vec<NodeId> = doc.node(inst).map(|n| n.children.clone()).unwrap_or_default();
+    while let Some(c) = stack.pop() {
+        let Some(n) = doc.node(c) else { continue };
+        if holds_content(n) {
+            let nodes = n.children.iter().flat_map(|k| doc.subtree(*k)).filter_map(|d| doc.node(d).cloned()).collect();
+            out.push((c, nodes));
+        } else {
+            stack.extend(n.children.iter().copied());
+        }
+    }
+    out
+}
+
+/// Put slot content back after a rebuild, into the slots that still hold the instance's own
+/// content (a slot the main no longer has, or no longer marks as a slot, loses it). Constraints
+/// and geometry overrides ran before, so the content keeps its place.
+fn restore_slot_content(doc: &mut Document, kept: Vec<(NodeId, Vec<Node>)>) {
+    for (slot, nodes) in kept {
+        let keep = slot_edited(doc, slot) && is_slot(doc, slot) && nodes.iter().all(|n| !doc.contains(n.id));
+        if !keep {
+            continue;
+        }
+        let ids: Vec<NodeId> = nodes.iter().map(|n| n.id).collect();
+        for n in nodes {
+            // Pre-order: every parent is back before its children.
+            let _ = insert_linked(doc, n);
+        }
+        // Never leave links to a layer that couldn't come back.
+        for id in ids.into_iter().chain([slot]) {
+            let dangling = doc.node(id).is_some_and(|n| n.children.iter().any(|c| !doc.contains(*c)));
+            if dangling {
+                let live: Vec<NodeId> = doc.node(id).map(|n| n.children.iter().copied().filter(|c| doc.contains(*c)).collect()).unwrap_or_default();
+                if let Some(n) = doc.node_mut(id) {
+                    n.children = live;
+                }
+            }
+        }
+    }
+}
diff --git a/crates/engine/src/assets/components/patch.rs b/crates/engine/src/assets/components/patch.rs
new file mode 100644
index 00000000..8c61f0b8
--- /dev/null
+++ b/crates/engine/src/assets/components/patch.rs
@@ -0,0 +1,528 @@
+use super::diff::{binding_group, bindings_of, diff_groups, follow_boolean_defaults, geometry_derived, variable_groups};
+use super::guard::{own_slot_content, relink_copy};
+use super::instances::{copy_group, field_group, sync_instance};
+use super::sync::insert_linked;
+use super::*;
+
+/// After an edit: record overrides inside instances, then rebuild instances whose main changed,
+/// whose properties or main were switched, or whose overrides were reset.
+pub fn sync_after_edit(doc: &mut Document, before: &Document, changed: &[NodeId], touched: &BTreeSet<NodeId>) {
+    let mut changed = changed.to_vec();
+    for id in follow_boolean_defaults(doc, before, &changed) {
+        if !changed.contains(&id) {
+            changed.push(id);
+        }
+    }
+    let changed = changed.as_slice();
+    // 0. A slot whose layers were added, removed or reordered holds the instance's own content
+    //    from now on; copies of instance layers placed elsewhere stop mirroring their main.
+    for &id in changed {
+        let (Some(n), Some(b)) = (doc.node(id), before.node(id)) else { continue };
+        if n.children == b.children || owning_instance(doc, id).is_none() {
+            continue;
+        }
+        if let Some(slot) = slot_scope(doc, id)
+            && !slot_edited(doc, slot)
+        {
+            own_slot_content(doc, slot);
+        }
+    }
+    for &id in changed {
+        if !before.contains(id) {
+            relink_copy(doc, id);
+        }
+    }
+    let mut resync: BTreeSet<NodeId> = BTreeSet::new();
+    // 1. Overrides for layers edited inside instances.
+    for &id in changed {
+        let (Some(n), Some(b)) = (doc.node(id), before.node(id)) else { continue };
+        let Some(inst) = owning_instance(doc, id) else { continue };
+        let top_root = inst == id && !inside_instance(doc, id);
+        if top_root
+            && let (NodeKind::Instance { component: c1, props: p1 }, NodeKind::Instance { component: c2, props: p2 }) = (&n.kind, &b.kind)
+            && (c1 != c2 || p1 != p2)
+        {
+            // Switching the main or a property value of an instance isn't an override.
+            resync.insert(id);
+        }
+        let raw = diff_groups(b, n);
+        let mut groups = raw.clone();
+        // An instance's own place, resizing, export settings, interactions and variable modes are
+        // its own, not overrides.
+        if top_root {
+            groups.retain(|g| !matches!(*g, "component" | "props" | "position" | "resizing" | "exports" | "interactions" | "modes"));
+        }
+        if groups.iter().any(|g| matches!(*g, "size" | "position")) {
+            groups.retain(|g| !matches!(*g, "size" | "position") || !geometry_derived(doc, before, id, g));
+        }
+        // A value equal to the main's isn't an override (setting it back clears the override).
+        let mut cleared = Vec::new();
+        if let Some(src) = n.source.and_then(|s| doc.node(s)) {
+            let mut differs = diff_groups(src, n);
+            if inst == id {
+                differs.retain(|g| *g != "name");
+                if n.name != default_instance_name(doc, src.id) {
+                    differs.push("name");
+                }
+            }
+            // A value from the same variable as the main's (resolved in this layer's modes) isn't an
+            // override either.
+            let from_variables = variable_groups(n, src);
+            groups.retain(|g| differs.contains(g) && !from_variables.contains(g));
+            // Binding another variable (or none) where the main binds one is an override.
+            for (k, _) in b.bound.iter().chain(n.bound.iter()) {
+                let Some(g) = binding_group(k) else { continue };
+                let rebound = b.bound.get(k) != n.bound.get(k) && !bindings_of(n, g).eq(bindings_of(src, g));
+                if rebound && !groups.contains(&g) {
+                    groups.push(g);
+                }
+            }
+            cleared =
+                raw.iter().filter(|g| !matches!(**g, "size" | "position") && !differs.contains(g) && n.overrides.contains(**g)).copied().collect();
+            if top_root {
+                cleared.retain(|g| !matches!(*g, "component" | "props"));
+            }
+        }
+        let lost = b.overrides.iter().any(|g| !n.overrides.contains(g));
+        let nested_switch = !top_root && raw.iter().any(|g| matches!(*g, "component" | "props"));
+        if (!groups.is_empty() || !cleared.is_empty())
+            && let Some(m) = doc.node_mut(id)
+        {
+            for g in groups {
+                m.overrides.insert(g.to_string());
+            }
+            for g in cleared {
+                m.overrides.remove(g);
+            }
+        }
+        if (lost || nested_switch)
+            && let Some(r) = root_instance(doc, id)
+        {
+            resync.insert(r);
+        }
+    }
+    // 2. Components whose layers changed, were added or removed. Value-only edits (paint, text,
+    //    visibility, …) are carried to the copies directly; anything else rebuilds the instances.
+    let mut comps: BTreeSet<NodeId> = BTreeSet::new();
+    let mut patches: Vec<(NodeId, Vec<&'static str>)> = Vec::new();
+    // Main layers that only gained new layers or lost some: their copies take the same change.
+    let mut restructured: Vec<NodeId> = Vec::new();
+    let mut covered: BTreeSet<NodeId> = BTreeSet::new();
+    for &id in changed {
+        if let (Some(b), Some(n)) = (before.node(id), doc.node(id))
+            && b.children != n.children
+            && owning_instance(doc, id).is_none()
+            && owning_component(doc, id).is_some()
+            && let Some(layers) = restructurable(doc, before, b, n)
+        {
+            restructured.push(id);
+            covered.extend(layers);
+        }
+    }
+    for &id in changed {
+        if covered.contains(&id) || restructured.contains(&id) {
+            continue;
+        }
+        let Some(c) = owning_component(doc, id) else { continue };
+        let (Some(b), Some(n)) = (before.node(id), doc.node(id)) else {
+            comps.insert(c);
+            continue;
+        };
+        if b == n {
+            continue;
+        }
+        match patchable(doc, b, n) {
+            Some(groups) => patches.push((id, groups)),
+            None => {
+                comps.insert(c);
+            }
+        }
+    }
+    for &id in touched {
+        if !doc.contains(id)
+            && !covered.contains(&id)
+            && let Some(c) = owning_component(before, id)
+            && doc.contains(c)
+        {
+            comps.insert(c);
+        }
+    }
+    for r in resync {
+        if doc.contains(r) {
+            sync_instance(doc, r);
+            if let Some(c) = owning_component(doc, r) {
+                comps.insert(c);
+            }
+        }
+    }
+    // A copy the patch can't follow exactly rebuilds instead (as does any other change).
+    let patched = comps.is_empty()
+        && !full_rebuild()
+        && (restructured.is_empty() || patch_structure(doc, before, &restructured))
+        && (patches.is_empty() || patch_copies(doc, &patches));
+    #[cfg(test)]
+    if patched && (!restructured.is_empty() || !patches.is_empty()) {
+        PATCHED.with(|c| c.set(c.get() + 1));
+    }
+    if !patched {
+        comps.extend(patches.iter().map(|(id, _)| *id).chain(restructured.iter().copied()).filter_map(|id| owning_component(doc, id)));
+    }
+    // 3. Instances of changed components follow; an instance inside another component makes that
+    //    one change too.
+    rebuild_instances(doc, &comps);
+}
+
+#[cfg(test)]
+thread_local! {
+    /// Tests: rebuild instances even for edits that could be patched (to compare both ways).
+    pub(crate) static FULL_REBUILD: std::cell::Cell<bool> = const { std::cell::Cell::new(false) };
+    /// Tests: edits carried to the copies without rebuilding instances.
+    pub(crate) static PATCHED: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
+}
+
+#[cfg(test)]
+fn full_rebuild() -> bool {
+    FULL_REBUILD.with(std::cell::Cell::get)
+}
+
+#[cfg(not(test))]
+fn full_rebuild() -> bool {
+    false
+}
+
+/// The property groups of a main-component layer edited from `b` to `n` when the edit changed
+/// values only (paint, text, visibility, size, position, …) that copies take as they are: carried to them without
+/// rebuilding the instances ([`patch_copies`]). `None` when anything else changed.
+fn patchable(doc: &Document, b: &Node, n: &Node) -> Option<Vec<&'static str>> {
+    const VALUES: [&str; 17] = [
+        "fills",
+        "strokes",
+        "effects",
+        "opacity",
+        "visible",
+        "name",
+        "corners",
+        "characters",
+        "textStyle",
+        "padding",
+        "gap",
+        "alignment",
+        "grids",
+        "exports",
+        "interactions",
+        "size",
+        "position",
+    ];
+    if b.children != n.children || b.parent != n.parent || b.kind.type_name() != n.kind.type_name() {
+        return None;
+    }
+    let groups = diff_groups(b, n);
+    if groups.is_empty() || groups.iter().any(|g| !VALUES.contains(g)) {
+        return None;
+    }
+    // Exactly those groups (and the layer's own overrides) changed.
+    let mut probe = n.clone();
+    for g in &groups {
+        copy_group(b, &mut probe, g);
+    }
+    probe.overrides = b.overrides.clone();
+    if probe != *b {
+        return None;
+    }
+    // Values a component property sets (on this layer or a main it mirrors) come from instances.
+    let mut cur = Some(n);
+    for _ in 0..=MAX_DEPTH {
+        let Some(x) = cur else { break };
+        if x.prop_refs.keys().any(|f| groups.contains(&field_group(f))) {
+            return None;
+        }
+        cur = x.source.and_then(|s| doc.node(s));
+    }
+    Some(groups)
+}
+
+/// Copies by the layer they mirror; nested instances swapped to a main also follow it.
+fn copies_index(doc: &Document) -> BTreeMap<NodeId, Vec<NodeId>> {
+    let mut copies: BTreeMap<NodeId, Vec<NodeId>> = BTreeMap::new();
+    for n in doc.nodes() {
+        let Some(s) = n.source else { continue };
+        copies.entry(s).or_default().push(n.id);
+        if let (NodeKind::Instance { component, .. }, Some(NodeKind::Instance { component: other, .. })) = (&n.kind, doc.node(s).map(|x| &x.kind))
+            && component != other
+        {
+            copies.entry(*component).or_default().push(n.id);
+        }
+    }
+    copies
+}
+
+/// When main layer `b` → `n` only gained new plain layers (created in this edit: no instances,
+/// components or property bindings in them) or lost layers that were deleted: those layers, which
+/// [`patch_structure`] carries to the copies. `None` for anything else.
+fn restructurable(doc: &Document, before: &Document, b: &Node, n: &Node) -> Option<Vec<NodeId>> {
+    let mut probe = n.clone();
+    probe.children = b.children.clone();
+    probe.overrides = b.overrides.clone();
+    if probe != *b {
+        return None;
+    }
+    let mut layers = Vec::new();
+    for c in n.children.iter().filter(|c| !b.children.contains(c)) {
+        for d in doc.subtree(*c) {
+            let x = doc.node(d)?;
+            let plain = !matches!(x.kind, NodeKind::Instance { .. } | NodeKind::Component { .. } | NodeKind::ComponentSet { .. });
+            if before.contains(d) || !plain || !x.prop_refs.is_empty() {
+                return None;
+            }
+            layers.push(d);
+        }
+    }
+    for c in b.children.iter().filter(|c| !n.children.contains(c)) {
+        if doc.contains(*c) {
+            return None;
+        }
+        layers.extend(before.subtree(*c));
+    }
+    Some(layers)
+}
+
+/// Carry the new and deleted layers of main layers `seeds` ([`restructurable`]) to every copy,
+/// through copies of copies (slots holding an instance's own content keep it). Returns false
+/// (leaving a partial patch for the caller to rebuild over) when a copy can't follow exactly.
+fn patch_structure(doc: &mut Document, before: &Document, seeds: &[NodeId]) -> bool {
+    let copies = copies_index(doc);
+    let mut work: Vec<NodeId> = seeds.to_vec();
+    let mut steps = 0usize;
+    while let Some(p) = work.pop() {
+        steps += 1;
+        if steps > 10_000_000 {
+            return false;
+        }
+        let Some(pn) = doc.node(p).cloned() else { continue };
+        for c in copies.get(&p).cloned().unwrap_or_default() {
+            let Some(cn) = doc.node(c).cloned() else { continue };
+            if holds_content(&cn) {
+                continue;
+            }
+            if let (NodeKind::Instance { component: a, .. }, NodeKind::Instance { component: b, .. }) = (&pn.kind, &cn.kind)
+                && a != b
+            {
+                continue;
+            }
+            // The copy's layers by the layer of `p` they mirror.
+            let mut mirrors: BTreeMap<NodeId, NodeId> = BTreeMap::new();
+            for k in &cn.children {
+                let Some(src) = doc.node(*k).and_then(|x| x.source) else { return false };
+                if mirrors.insert(src, *k).is_some() {
+                    return false;
+                }
+            }
+            let mut order = Vec::with_capacity(pn.children.len());
+            for pc in &pn.children {
+                if let Some(k) = mirrors.remove(pc) {
+                    order.push(k);
+                    continue;
+                }
+                // A layer the copy lacks must be new in this edit, placed as in the main.
+                let absolute = doc.node(*pc).is_some_and(|x| x.child_layout.absolute);
+                if before.contains(*pc) || !child_follows_main(doc, c, absolute) {
+                    return false;
+                }
+                match copy_layers(doc, *pc, c) {
+                    Some(k) => order.push(k),
+                    None => return false,
+                }
+            }
+            // Copies of layers the main lost.
+            for (src, k) in mirrors {
+                if doc.contains(src) || doc.remove(k).is_err() {
+                    return false;
+                }
+            }
+            if doc.node(c).is_some_and(|x| x.children != order)
+                && let Some(m) = doc.node_mut(c)
+            {
+                m.children = order;
+            }
+            work.push(c);
+        }
+    }
+    true
+}
+
+/// Whether a layer placed in copy `parent` (absolutely positioned or not) takes its main layer's
+/// place and size: nothing on the way up applies constraints ([`follows_main_geometry`]).
+fn child_follows_main(doc: &Document, parent: NodeId, absolute: bool) -> bool {
+    let Some(p) = doc.node(parent) else { return false };
+    let constrains = p.layout.is_none() || absolute;
+    let resized = sized_own(p)
+        || match &p.kind {
+            NodeKind::Instance { component, .. } => {
+                doc.node(*component).is_none_or(|m| (m.width - p.width).abs() > 1e-9 || (m.height - p.height).abs() > 1e-9)
+            }
+            _ => false,
+        };
+    !(constrains && resized) && follows_main_geometry(doc, parent)
+}
+
+/// Copy main layer `src` (with its layers) into copy `parent` as layers mirroring them; returns the
+/// new copy (the caller places it among `parent`'s layers).
+fn copy_layers(doc: &mut Document, src: NodeId, parent: NodeId) -> Option<NodeId> {
+    let sub = doc.subtree(src);
+    let map: BTreeMap<NodeId, NodeId> = sub.iter().map(|d| (*d, doc.alloc_id())).collect();
+    for d in &sub {
+        let mut n = doc.node(*d)?.clone();
+        n.id = *map.get(d)?;
+        n.parent = if *d == src { Some(parent) } else { n.parent.and_then(|x| map.get(&x).copied()) };
+        n.children = n.children.iter().filter_map(|k| map.get(k).copied()).collect();
+        n.source = Some(*d);
+        n.overrides.clear();
+        n.prop_refs.clear();
+        n.annotations.clear();
+        n.measurements.clear();
+        insert_linked(doc, n).ok()?;
+    }
+    map.get(&src).copied()
+}
+
+/// Carry value-only edits of main-component layers (`seeds`: layer, groups) to every copy, through
+/// copies of copies, except where a copy overrides the group. Returns false (leaving a partial
+/// patch for the caller to rebuild over) when a copy can't follow exactly.
+fn patch_copies(doc: &mut Document, seeds: &[(NodeId, Vec<&'static str>)]) -> bool {
+    let copies = copies_index(doc);
+    let text = |g: &str| matches!(g, "characters" | "textStyle");
+    let mut work: Vec<(NodeId, Vec<&'static str>)> = seeds.to_vec();
+    let mut steps = 0usize;
+    while let Some((p, groups)) = work.pop() {
+        steps += 1;
+        if steps > 10_000_000 {
+            return false;
+        }
+        let Some(pn) = doc.node(p).cloned() else { continue };
+        for c in copies.get(&p).cloned().unwrap_or_default() {
+            let Some(cn) = doc.node(c) else { continue };
+            // A swapped nested instance shows its own main, not the layer it stands in for.
+            if let (NodeKind::Instance { component: a, .. }, NodeKind::Instance { component: b, .. }) = (&pn.kind, &cn.kind)
+                && a != b
+            {
+                continue;
+            }
+            // An instance keeps its own visibility, place, export settings and interactions; its
+            // name follows the main's unless renamed; a resized one lays its layers out against
+            // the main's size.
+            let root = matches!(pn.kind, NodeKind::Component { .. });
+            if root && ((groups.contains(&"name") && !cn.overrides.contains("name")) || (groups.contains(&"size") && cn.overrides.contains("size"))) {
+                return false;
+            }
+            let gs: Vec<&'static str> = groups
+                .iter()
+                .copied()
+                .filter(|g| !(cn.overrides.contains(*g) || root && matches!(*g, "visible" | "name" | "position" | "exports" | "interactions")))
+                .collect();
+            if gs.is_empty() {
+                continue;
+            }
+            let geometry = gs.iter().any(|g| matches!(*g, "size" | "position"));
+            if geometry && !follows_main_geometry(doc, c) {
+                return false;
+            }
+            // Text content and style share their runs: a copy overriding one keeps its runs when the
+            // other follows the main (as a rebuild carries them).
+            let runs = match &cn.kind {
+                NodeKind::Text(t) if gs.iter().any(|g| text(g)) && cn.overrides.iter().any(|g| text(g)) => Some(t.runs.clone()),
+                _ => None,
+            };
+            if let Some(m) = doc.node_mut(c) {
+                for g in &gs {
+                    copy_group(&pn, m, g);
+                }
+                if let (Some(r), NodeKind::Text(t)) = (runs, &mut m.kind) {
+                    t.runs = r;
+                }
+            }
+            if (geometry || gs.iter().any(|g| text(g)))
+                && let Some((w, h)) = doc.node(c).and_then(figcraft_text::auto_size)
+                && doc.node(c).is_some_and(|n| (n.width - w).abs() > 1e-6 || (n.height - h).abs() > 1e-6)
+            {
+                figcraft_layout::set_size(doc, c, w, h);
+            }
+            work.push((c, gs));
+        }
+    }
+    true
+}
+
+/// Whether a copy's size and place are its main layer's: no layer around it inside its instances
+/// applies constraints on the way down to it (a resized instance or frame without auto layout, or
+/// a resized auto layout instance holding it absolutely positioned). Auto layout re-flows the rest.
+fn follows_main_geometry(doc: &Document, id: NodeId) -> bool {
+    let chain = scope(doc, id);
+    chain.windows(2).all(|w| {
+        let (Some(below), Some(a)) = (w.first().and_then(|i| doc.node(*i)), w.get(1).and_then(|i| doc.node(*i))) else { return false };
+        let constrains = a.layout.is_none() || below.child_layout.absolute;
+        if sized_own(a) && constrains {
+            return false;
+        }
+        match &a.kind {
+            NodeKind::Instance { component, .. } => {
+                !constrains || doc.node(*component).is_some_and(|m| (m.width - a.width).abs() <= 1e-9 && (m.height - a.height).abs() <= 1e-9)
+            }
+            _ => true,
+        }
+    })
+}
+
+/// Whether a layer inside an instance overrides its size or resizing: it may not have its main
+/// layer's size, so the layers in it can't take their main layers' places as they are.
+fn sized_own(n: &Node) -> bool {
+    n.overrides.contains("size") || n.overrides.contains("resizing")
+}
+
+/// Rebuild every instance of `comps` (and of the components that hold those instances, and so on
+/// outwards), each outermost instance once, inner components first.
+fn rebuild_instances(doc: &mut Document, comps: &BTreeSet<NodeId>) {
+    if comps.is_empty() {
+        return;
+    }
+    // Outermost instances by the components their layers instantiate.
+    let mut roots_of: BTreeMap<NodeId, BTreeSet<NodeId>> = BTreeMap::new();
+    for n in doc.nodes() {
+        if let NodeKind::Instance { component, .. } = &n.kind {
+            roots_of.entry(*component).or_default().insert(root_instance(doc, n.id).unwrap_or(n.id));
+        }
+    }
+    // Affected components, with how deep their dependencies go (an instance inside component X of
+    // component Y: X follows Y).
+    let mut level: BTreeMap<NodeId, usize> = comps.iter().map(|c| (*c, 0)).collect();
+    let mut outer: BTreeMap<NodeId, Option<NodeId>> = BTreeMap::new();
+    let mut frontier: Vec<NodeId> = comps.iter().copied().collect();
+    let mut rounds = 0;
+    while !frontier.is_empty() && rounds < 64 {
+        rounds += 1;
+        let mut next = Vec::new();
+        for c in frontier {
+            let lc = level.get(&c).copied().unwrap_or(0);
+            for r in roots_of.get(&c).into_iter().flatten() {
+                let o = *outer.entry(*r).or_insert_with(|| owning_component(doc, *r));
+                if let Some(x) = o
+                    && x != c
+                {
+                    let lx = level.entry(x).or_insert(0);
+                    if *lx < lc + 1 {
+                        *lx = lc + 1;
+                        next.push(x);
+                    }
+                }
+            }
+        }
+        frontier = next;
+    }
+    // Instances inside components by level, then the rest (each once).
+    let mut order: Vec<(usize, NodeId)> = outer.iter().map(|(r, o)| (o.and_then(|x| level.get(&x).copied()).unwrap_or(usize::MAX), *r)).collect();
+    order.sort();
+    for (_, r) in order {
+        if doc.contains(r) {
+            sync_instance(doc, r);
+        }
+    }
+}
diff --git a/crates/engine/src/assets/components/rebase.rs b/crates/engine/src/assets/components/rebase.rs
new file mode 100644
index 00000000..748a99d3
--- /dev/null
+++ b/crates/engine/src/assets/components/rebase.rs
@@ -0,0 +1,249 @@
+use super::diff::{diff_groups, variable_groups};
+use super::instances::{field_group, path_map};
+use super::*;
+
+/// Bounded source and parent lookups while a rebase reads an unchanged document.
+pub(super) struct RebaseSources<'a> {
+    doc: &'a Document,
+    chains: BTreeMap<NodeId, Option<Vec<NodeId>>>,
+    parents: BTreeMap<(NodeId, NodeId), Option<bool>>,
+    main_changes: BTreeMap<NodeId, bool>,
+}
+
+impl<'a> RebaseSources<'a> {
+    const PARENTS: usize = 512;
+    const CACHE: usize = 8192;
+
+    pub(super) fn new(doc: &'a Document) -> Self {
+        Self { doc, chains: BTreeMap::new(), parents: BTreeMap::new(), main_changes: BTreeMap::new() }
+    }
+
+    fn chain(&mut self, source: NodeId) -> Option<Vec<NodeId>> {
+        if let Some(chain) = self.chains.get(&source) {
+            return chain.clone();
+        }
+        let read = || {
+            let mut chain = Vec::new();
+            let mut seen = BTreeSet::new();
+            let mut current = Some(source);
+            for _ in 0..MAX_DEPTH {
+                let Some(id) = current else { return Some(chain) };
+                if !seen.insert(id) {
+                    return None;
+                }
+                let n = self.doc.node(id)?;
+                chain.push(id);
+                current = n.source;
+            }
+            current.is_none().then_some(chain)
+        };
+        let chain = read();
+        if self.chains.len() < Self::CACHE {
+            self.chains.insert(source, chain.clone());
+        }
+        chain
+    }
+
+    /// Validate the complete parent chain, even if `main` was found before a cycle.
+    fn in_main(&mut self, id: NodeId, main: NodeId) -> Option<bool> {
+        if let Some(found) = self.parents.get(&(id, main)) {
+            return *found;
+        }
+        let read = || {
+            let mut current = Some(id);
+            let mut seen = BTreeSet::new();
+            let mut found = false;
+            for _ in 0..Self::PARENTS {
+                let Some(id) = current else { return Some(found) };
+                if !seen.insert(id) {
+                    return None;
+                }
+                found |= id == main;
+                current = self.doc.node(id)?.parent;
+            }
+            current.is_none().then_some(found)
+        };
+        let found = read();
+        if self.parents.len() < Self::CACHE {
+            self.parents.insert((id, main), found);
+        }
+        found
+    }
+
+    fn member(&mut self, source: NodeId, main: NodeId, target: NodeId) -> Option<NodeId> {
+        let chain = self.chain(source)?;
+        if chain.contains(&target) {
+            return None;
+        }
+        let mut member = None;
+        for id in chain {
+            if self.in_main(id, main)? && id != main && member.is_none() {
+                member = Some(id);
+            }
+        }
+        member
+    }
+
+    /// Nearest enclosing instances and their current mains. Slots with own content end scope.
+    pub(super) fn owners(&self, id: NodeId) -> Option<Vec<(NodeId, NodeId)>> {
+        let mut owners = Vec::new();
+        let mut current = self.doc.node(id)?.parent;
+        let mut seen = BTreeSet::from([id]);
+        for _ in 0..Self::PARENTS {
+            let Some(id) = current else { return Some(owners) };
+            if !seen.insert(id) {
+                return None;
+            }
+            let n = self.doc.node(id)?;
+            if holds_content(n) {
+                return Some(owners);
+            }
+            if let NodeKind::Instance { component, .. } = &n.kind {
+                owners.push((id, *component));
+            }
+            current = n.parent;
+        }
+        current.is_none().then_some(owners)
+    }
+
+    fn contextual(&mut self, source: NodeId, owners: &[(NodeId, NodeId)]) -> bool {
+        owners.iter().any(|(_, main)| self.in_main(source, *main) == Some(true) && source != *main)
+    }
+
+    /// A contextual child belongs to the same placed slot as its enclosing instance.
+    fn valid(&mut self, source: NodeId, target: NodeId, owners: &[(NodeId, NodeId)]) -> bool {
+        let Some((owner, main)) = owners.first() else { return false };
+        if self.member(source, *main, target).is_none() {
+            return false;
+        }
+        if self.in_main(source, *main) == Some(true) {
+            return true;
+        }
+        let Some(source_owner) = self.doc.node(*owner).and_then(|n| n.source) else { return false };
+        matches!(self.doc.node(source_owner).map(|n| &n.kind), Some(NodeKind::Instance { component, .. }) if component == main)
+            && self.owners(source).and_then(|owners| owners.first().copied()).is_some_and(|(id, _)| id == source_owner)
+    }
+
+    fn placed(&mut self, id: NodeId, owners: &[(NodeId, NodeId)]) -> Option<NodeId> {
+        let source = self.doc.node(id)?.source?;
+        if !matches!(self.doc.node(source)?.kind, NodeKind::Instance { .. } | NodeKind::Frame)
+            || !self.valid(source, id, owners)
+            || !self.contextual(source, owners)
+        {
+            return None;
+        }
+        Some(source)
+    }
+
+    fn beneath_swap(&mut self, owners: &[(NodeId, NodeId)], stop: NodeId) -> bool {
+        for (index, (id, main)) in owners.iter().enumerate() {
+            if *id == stop {
+                break;
+            }
+            let changed = if let Some(changed) = self.main_changes.get(id) {
+                *changed
+            } else {
+                let changed = self.placed(*id, &owners[index + 1..]).is_some_and(|source| match self.doc.node(source).map(|n| &n.kind) {
+                    Some(NodeKind::Instance { component, .. }) => component != main,
+                    Some(NodeKind::Frame) => true,
+                    _ => false,
+                });
+                if self.main_changes.len() < Self::CACHE {
+                    self.main_changes.insert(*id, changed);
+                }
+                changed
+            };
+            if changed {
+                return true;
+            }
+        }
+        false
+    }
+}
+
+/// Re-derive `source` links and overrides of instance `inst` against its own main by comparing
+/// values (after detaching an outer instance, restoring a main, or copying a nested instance out):
+/// the look is kept exactly. Values a component property sets aren't overrides.
+pub fn rebase_instance(doc: &mut Document, inst: NodeId) {
+    let Some(NodeKind::Instance { component, .. }) = doc.node(inst).map(|n| n.kind.clone()) else { return };
+    let mine = path_map(doc, inst, true);
+    let theirs: BTreeMap<String, NodeId> =
+        if doc.contains(component) { path_map(doc, component, false).into_iter().map(|(k, v)| (v, k)).collect() } else { BTreeMap::new() };
+    let value_groups = |a: &Node, b: &Node| -> Vec<String> {
+        diff_groups(a, b).into_iter().filter(|g| !matches!(*g, "size" | "position")).map(str::to_string).collect()
+    };
+    let mut updates = Vec::new();
+    let mut sources = RebaseSources::new(doc);
+    let root_owners = sources.owners(inst).unwrap_or_default();
+    let placed_source = sources.placed(inst, &root_owners);
+    let mut contexts = vec![(inst, component)];
+    contexts.extend_from_slice(&root_owners);
+    for (id, path) in &mine {
+        let Some(n) = doc.node(*id) else { continue };
+        let owners = sources.owners(*id).unwrap_or_default();
+        let nearest_main = owners.first().map(|(_, main)| *main);
+        let valid_source = n.source.filter(|source| sources.valid(*source, *id, &owners));
+        let mut main = valid_source.and_then(|source| sources.member(source, component, *id));
+        // A swapped or Frame-to-Instance subtree is compared to its current main by the inner
+        // rebase. An outer name path must not rebind those children to the old expanded copies.
+        if main.is_none() && valid_source.is_some() && sources.beneath_swap(&owners, inst) {
+            updates.push((*id, valid_source, n.overrides.clone()));
+            continue;
+        }
+        main = main
+            .or_else(|| theirs.get(path).copied().filter(|source| nearest_main.is_some_and(|scope| sources.member(*source, scope, *id).is_some())));
+        let source = valid_source.filter(|source| sources.contextual(*source, &contexts)).filter(|_| main.is_some()).or(main);
+        let mut overrides: BTreeSet<String> = n.overrides.iter().filter(|g| !matches!(g.as_str(), "component" | "props")).cloned().collect();
+        if let Some(m) = source.and_then(|source| doc.node(source)) {
+            let mut bound: Vec<&str> = m.prop_refs.keys().map(|f| field_group(f)).collect();
+            bound.extend(variable_groups(n, m));
+            overrides.extend(value_groups(m, n).into_iter().filter(|g| !bound.contains(&g.as_str())));
+            if matches!((&m.kind, &n.kind), (NodeKind::Instance { component: a, .. }, NodeKind::Instance { component: b, .. }) if a != b) {
+                overrides.insert("component".into());
+            }
+        }
+        updates.push((*id, source, overrides));
+    }
+    // A placed nested root compares to its actual slot. A detached root compares to its own main.
+    let root_base = placed_source.or_else(|| {
+        let chain = sources.chain(component)?;
+        (!chain.contains(&inst) && sources.in_main(component, inst) == Some(false)).then_some(component)
+    });
+    let root_groups = match (root_base.and_then(|source| doc.node(source)), doc.node(inst)) {
+        (Some(m), Some(n)) => {
+            let from_variables = variable_groups(n, m);
+            let mut groups: Vec<String> = value_groups(m, n)
+                .into_iter()
+                .filter(|g| !matches!(g.as_str(), "name" | "exports" | "interactions") && !from_variables.contains(&g.as_str()))
+                .filter(|g| placed_source.is_some() || !matches!(g.as_str(), "resizing" | "modes"))
+                .collect();
+            let named = if placed_source.is_some() { n.name != m.name } else { n.name != default_instance_name(doc, component) };
+            if named {
+                groups.push("name".into());
+            }
+            if placed_source.is_some()
+                && matches!((&m.kind, &n.kind), (NodeKind::Instance { component: a, .. }, NodeKind::Instance { component: b, .. }) if a != b)
+            {
+                groups.push("component".into());
+            }
+            groups
+        }
+        _ => Vec::new(),
+    };
+    drop(sources);
+    for (id, main, overrides) in updates {
+        if let Some(n) = doc.node_mut(id) {
+            n.source = main;
+            n.overrides = if main.is_some() { overrides } else { BTreeSet::new() };
+        }
+    }
+    if let Some(n) = doc.node_mut(inst) {
+        n.source = root_base;
+        // A top-level instance's resizing and modes are its own (a nested one's override its main
+        // layer's).
+        n.overrides.retain(|g| {
+            !matches!(g.as_str(), "component" | "props" | "position") && (placed_source.is_some() || !matches!(g.as_str(), "resizing" | "modes"))
+        });
+        n.overrides.extend(root_groups);
+    }
+}
diff --git a/crates/engine/src/assets/components/rebase_source_tests.rs b/crates/engine/src/assets/components/rebase_source_tests.rs
new file mode 100644
index 00000000..94eae71f
--- /dev/null
+++ b/crates/engine/src/assets/components/rebase_source_tests.rs
@@ -0,0 +1,258 @@
+//! Contextual import sources survive rebasing; detached and swapped subtrees use their current mains.
+
+use super::*;
+
+fn add(doc: &mut Document, parent: NodeId, kind: NodeKind, name: &str) -> NodeId {
+    doc.create(parent, kind, name, 0.0, 0.0, 20.0, 20.0).unwrap()
+}
+
+fn component(doc: &mut Document, parent: NodeId, name: &str) -> NodeId {
+    add(doc, parent, NodeKind::Component { description: String::new(), props: BTreeMap::new() }, name)
+}
+
+fn mirror(doc: &mut Document, source: NodeId, parent: NodeId) -> NodeId {
+    let mut n = doc.node(source).unwrap().clone();
+    let children = std::mem::take(&mut n.children);
+    n.id = doc.alloc_id();
+    n.parent = None;
+    n.source = Some(source);
+    let id = n.id;
+    doc.insert(n, parent, None).unwrap();
+    for child in children {
+        mirror(doc, child, id);
+    }
+    id
+}
+
+fn instance(doc: &mut Document, main: NodeId, parent: NodeId, name: &str) -> NodeId {
+    let mut n = doc.node(main).unwrap().clone();
+    let children = std::mem::take(&mut n.children);
+    n.id = doc.alloc_id();
+    n.kind = NodeKind::Instance { component: main, props: BTreeMap::new() };
+    n.name = name.into();
+    n.parent = None;
+    n.source = None;
+    let id = n.id;
+    doc.insert(n, parent, None).unwrap();
+    for child in children {
+        mirror(doc, child, id);
+    }
+    id
+}
+
+struct Scene {
+    doc: Document,
+    inner: NodeId,
+    base: NodeId,
+    slot: NodeId,
+    context: NodeId,
+    root: NodeId,
+    nested: NodeId,
+    child: NodeId,
+}
+
+fn scene() -> Scene {
+    let mut doc = Document::new("Source context");
+    let page = doc.first_page().unwrap();
+    let inner = component(&mut doc, page, "Inner");
+    let base = add(&mut doc, inner, NodeKind::Rectangle, "Body");
+    doc.node_mut(base).unwrap().transform = Affine::translate((2.0, 0.0));
+    let outer = component(&mut doc, page, "Outer");
+    let slot = instance(&mut doc, inner, outer, "Nested");
+    doc.node_mut(slot).unwrap().source = Some(inner);
+    let context = doc.node(slot).unwrap().children[0];
+    doc.node_mut(context).unwrap().transform = Affine::translate((3.0, 0.0));
+    doc.node_mut(context).unwrap().opacity = 0.3;
+    let root = instance(&mut doc, outer, page, "Outer copy");
+    let nested = doc.node(root).unwrap().children[0];
+    let child = doc.node(nested).unwrap().children[0];
+    doc.node_mut(child).unwrap().transform = Affine::translate((2.0, 0.0));
+    doc.node_mut(child).unwrap().opacity = 0.2;
+    Scene { doc, inner, base, slot, context, root, nested, child }
+}
+
+fn both(s: &mut Scene) {
+    rebase_instance(&mut s.doc, s.nested);
+    rebase_instance(&mut s.doc, s.root);
+}
+
+#[test]
+fn rebase_default_only_sources_promote_to_the_actual_outer_context() {
+    let mut s = scene();
+    s.doc.node_mut(s.nested).unwrap().source = None;
+    s.doc.node_mut(s.child).unwrap().source = None;
+    both(&mut s);
+    assert_eq!(s.doc.node(s.nested).unwrap().source, Some(s.slot));
+    assert_eq!(s.doc.node(s.child).unwrap().source, Some(s.context));
+}
+
+#[test]
+fn rebase_rejects_a_context_source_from_another_nested_slot() {
+    let mut s = scene();
+    let outer = s.doc.node(s.slot).unwrap().parent.unwrap();
+    let sibling = instance(&mut s.doc, s.inner, outer, "Other nested slot");
+    s.doc.node_mut(sibling).unwrap().source = Some(s.inner);
+    let sibling_child = s.doc.node(sibling).unwrap().children[0];
+    mirror(&mut s.doc, sibling, s.root);
+    s.doc.node_mut(s.child).unwrap().source = Some(sibling_child);
+    both(&mut s);
+    assert_eq!(s.doc.node(s.nested).unwrap().source, Some(s.slot));
+    assert_eq!(s.doc.node(s.child).unwrap().source, Some(s.context));
+    assert_eq!(s.doc.node(sibling_child).unwrap().transform.translation().x, 2.0);
+    assert_eq!(s.doc.node(s.context).unwrap().transform.translation().x, 3.0);
+}
+
+#[test]
+fn rebase_does_not_mark_inherited_context_values_as_local_overrides() {
+    let mut s = scene();
+    s.doc.node_mut(s.child).unwrap().opacity = 0.3;
+    both(&mut s);
+    assert_eq!(s.doc.node(s.child).unwrap().source, Some(s.context));
+    assert!(!s.doc.node(s.child).unwrap().overrides.contains("opacity"));
+}
+
+#[test]
+fn rebase_preserves_multilevel_context_without_shortening_source_chains() {
+    let mut doc = Document::new("Nested source contexts");
+    let page = doc.first_page().unwrap();
+    let inner = component(&mut doc, page, "Inner");
+    let base = add(&mut doc, inner, NodeKind::Rectangle, "Body");
+    doc.node_mut(base).unwrap().transform = Affine::translate((2.0, 0.0));
+    let wrapper = component(&mut doc, page, "Wrapper");
+    let default_slot = instance(&mut doc, inner, wrapper, "Nested");
+    doc.node_mut(default_slot).unwrap().source = Some(inner);
+    let outer = component(&mut doc, page, "Outer");
+    let wrapper_slot = instance(&mut doc, wrapper, outer, "Wrapper slot");
+    doc.node_mut(wrapper_slot).unwrap().source = Some(wrapper);
+    let source_slot = doc.node(wrapper_slot).unwrap().children[0];
+    let context = doc.node(source_slot).unwrap().children[0];
+    doc.node_mut(context).unwrap().transform = Affine::translate((3.0, 0.0));
+    let root = instance(&mut doc, outer, page, "Outer copy");
+    let wrapper_copy = doc.node(root).unwrap().children[0];
+    let nested = doc.node(wrapper_copy).unwrap().children[0];
+    let child = doc.node(nested).unwrap().children[0];
+    doc.node_mut(nested).unwrap().name = "Renamed nested".into();
+    doc.node_mut(child).unwrap().transform = Affine::translate((2.0, 0.0));
+    for id in [nested, wrapper_copy, root] {
+        rebase_instance(&mut doc, id);
+        assert_eq!(doc.node(nested).unwrap().source, Some(source_slot));
+        assert_eq!(doc.node(child).unwrap().source, Some(context));
+    }
+    assert_eq!(doc.node(context).unwrap().source, Some(doc.node(default_slot).unwrap().children[0]));
+    assert_eq!(doc.node(context).unwrap().transform.translation().x, 3.0);
+    assert_eq!(doc.node(child).unwrap().transform.translation().x, 2.0);
+}
+
+#[test]
+fn rebase_preserves_placed_frame_to_instance_and_current_main_children() {
+    let mut doc = Document::new("Typed nested source");
+    let page = doc.first_page().unwrap();
+    let inner = component(&mut doc, page, "Inner");
+    let body = add(&mut doc, inner, NodeKind::Rectangle, "Body");
+    let outer = component(&mut doc, page, "Outer");
+    let slot = add(&mut doc, outer, NodeKind::Frame, "Empty slot");
+    let root = instance(&mut doc, outer, page, "Outer copy");
+    let nested = doc.node(root).unwrap().children[0];
+    doc.node_mut(nested).unwrap().kind = NodeKind::Instance { component: inner, props: BTreeMap::new() };
+    let child = mirror(&mut doc, body, nested);
+    rebase_instance(&mut doc, nested);
+    rebase_instance(&mut doc, root);
+    assert_eq!(doc.node(nested).unwrap().source, Some(slot));
+    assert_eq!(doc.node(child).unwrap().source, Some(body));
+    assert!(matches!(doc.node(nested).unwrap().kind, NodeKind::Instance { component, .. } if component == inner));
+}
+
+#[test]
+fn rebase_keeps_current_main_sources_and_component_delta_beneath_swap() {
+    let mut s = scene();
+    let page = s.doc.first_page().unwrap();
+    let replacement = component(&mut s.doc, page, "Replacement");
+    let body = add(&mut s.doc, replacement, NodeKind::Rectangle, "Body");
+    s.doc.node_mut(body).unwrap().transform = Affine::translate((7.0, 0.0));
+    s.doc.node_mut(s.nested).unwrap().kind = NodeKind::Instance { component: replacement, props: BTreeMap::new() };
+    s.doc.remove(s.child).unwrap();
+    s.child = mirror(&mut s.doc, body, s.nested);
+    s.doc.node_mut(s.child).unwrap().transform = Affine::translate((8.0, 0.0));
+    s.doc.node_mut(s.nested).unwrap().name = "Renamed swap".into();
+    rebase_instance(&mut s.doc, s.nested);
+    assert_eq!(s.doc.node(s.nested).unwrap().source, Some(s.slot));
+    assert!(s.doc.node(s.nested).unwrap().overrides.contains("component"));
+    rebase_instance(&mut s.doc, s.root);
+    assert_eq!(s.doc.node(s.nested).unwrap().source, Some(s.slot));
+    assert_eq!(s.doc.node(s.child).unwrap().source, Some(body));
+    assert!(s.doc.node(s.nested).unwrap().overrides.contains("component"));
+    assert_eq!(s.doc.node(s.child).unwrap().transform.translation().x, 8.0);
+}
+
+#[test]
+fn rebase_detached_nested_uses_own_main_and_keeps_inherited_geometry() {
+    let mut s = scene();
+    let page = s.doc.first_page().unwrap();
+    let detached = mirror(&mut s.doc, s.nested, page);
+    let child = s.doc.node(detached).unwrap().children[0];
+    // The old source references still exist, but their Outer context is absent here.
+    s.doc.node_mut(detached).unwrap().source = Some(s.slot);
+    s.doc.node_mut(child).unwrap().source = Some(s.context);
+    s.doc.node_mut(child).unwrap().transform = Affine::translate((3.0, 0.0));
+    rebase_instance(&mut s.doc, detached);
+    assert_eq!(s.doc.node(detached).unwrap().source, Some(s.inner));
+    assert_eq!(s.doc.node(child).unwrap().source, Some(s.base));
+    assert_eq!(s.doc.node(child).unwrap().transform.translation().x, 3.0);
+    assert_eq!(s.doc.node(s.base).unwrap().transform.translation().x, 2.0);
+}
+
+#[test]
+fn rebase_marks_a_nested_roots_own_mode_but_not_a_top_level_instances() {
+    let mut s = scene();
+    let modes = BTreeMap::from([("Tone".to_string(), "B".to_string())]);
+    s.doc.node_mut(s.nested).unwrap().var_modes = modes.clone();
+    both(&mut s);
+    assert!(s.doc.node(s.nested).unwrap().overrides.contains("modes"), "its slot in Outer sets no mode");
+    let page = s.doc.first_page().unwrap();
+    let detached = mirror(&mut s.doc, s.nested, page);
+    rebase_instance(&mut s.doc, detached);
+    let n = s.doc.node(detached).unwrap();
+    assert_eq!((&n.var_modes, n.overrides.contains("modes")), (&modes, false), "a top-level instance's modes are its own");
+}
+
+#[test]
+fn rebase_does_not_preserve_existing_foreign_or_stale_sources() {
+    let mut s = scene();
+    let page = s.doc.first_page().unwrap();
+    let foreign = component(&mut s.doc, page, "Foreign");
+    let foreign_body = add(&mut s.doc, foreign, NodeKind::Rectangle, "Body");
+    s.doc.node_mut(s.child).unwrap().source = Some(foreign_body);
+    both(&mut s);
+    assert_ne!(s.doc.node(s.child).unwrap().source, Some(foreign_body));
+    assert_eq!(s.doc.node(s.child).unwrap().source, Some(s.context));
+    let mut s = scene();
+    let page = s.doc.first_page().unwrap();
+    let replacement = component(&mut s.doc, page, "Replacement");
+    let body = add(&mut s.doc, replacement, NodeKind::Rectangle, "Body");
+    s.doc.node_mut(s.nested).unwrap().kind = NodeKind::Instance { component: replacement, props: BTreeMap::new() };
+    s.doc.node_mut(s.child).unwrap().source = Some(s.context);
+    both(&mut s);
+    assert_ne!(s.doc.node(s.child).unwrap().source, Some(s.context), "the old default-main child is stale after a swap");
+    assert!(s.doc.node(s.child).unwrap().source.is_none() || s.doc.node(s.child).unwrap().source == Some(body));
+}
+
+#[test]
+fn rebase_rejects_source_and_parent_cycles_with_bounded_lookups() {
+    let mut s = scene();
+    s.doc.node_mut(s.base).unwrap().source = Some(s.context);
+    both(&mut s);
+    assert_eq!(s.doc.node(s.child).unwrap().source, None);
+    let mut s = scene();
+    s.doc.node_mut(s.context).unwrap().parent = Some(s.context);
+    both(&mut s);
+    assert_ne!(s.doc.node(s.child).unwrap().source, Some(s.context));
+    let mut s = scene();
+    s.doc.node_mut(s.nested).unwrap().parent = Some(s.child);
+    s.doc.node_mut(s.child).unwrap().parent = Some(s.nested);
+    let sources = RebaseSources::new(&s.doc);
+    assert!(sources.owners(s.child).is_none());
+    let mut s = scene();
+    s.doc.node_mut(s.root).unwrap().kind = NodeKind::Instance { component: s.root, props: BTreeMap::new() };
+    rebase_instance(&mut s.doc, s.root);
+    assert_ne!(s.doc.node(s.root).unwrap().source, Some(s.root));
+}
diff --git a/crates/engine/src/assets/components/sync.rs b/crates/engine/src/assets/components/sync.rs
new file mode 100644
index 00000000..c502322d
--- /dev/null
+++ b/crates/engine/src/assets/components/sync.rs
@@ -0,0 +1,459 @@
+use super::diff::diff_groups;
+use super::instances::{Carry, apply_prop, carry_overrides, carry_prop_bindings, copy_group, field_group, follow_variant_resizing, path_map};
+use super::*;
+
+/// `spare`: layers the outer rebuild didn't reuse that were below `inst` (a swapped nested
+/// instance): its layers the outer main doesn't have, matched here so they keep ids and overrides.
+pub(super) fn sync_instance_depth(doc: &mut Document, inst: NodeId, depth: usize, spare: BTreeMap<NodeId, std::sync::Arc<Node>>) {
+    if depth > MAX_DEPTH {
+        return;
+    }
+    let Some(mut root) = doc.node(inst).cloned() else { return };
+    let NodeKind::Instance { component, props: root_props } = &root.kind else { return };
+    let component = *component;
+    let Some(comp) = doc.node(component).cloned() else { return };
+    if !matches!(comp.kind, NodeKind::Component { .. }) || doc.is_ancestor(inst, component) || doc.is_ancestor(component, inst) {
+        // A missing main, or an instance inside its own main (would recurse forever).
+        return;
+    }
+    let mut eff_props = default_props(&comp);
+    for (k, v) in root_props {
+        if eff_props.contains_key(k) {
+            eff_props.insert(k.clone(), v.clone());
+        }
+    }
+    // Old layers (kept alive for their overrides), by (parent, source), by source alone (when only
+    // one layer mirrors it) and, only when those don't match, by name path.
+    let mut old_ids = old_layers(doc, inst);
+    old_ids.extend(spare.keys().copied());
+    old_ids.sort();
+    old_ids.dedup();
+    let mut old: BTreeMap<NodeId, std::sync::Arc<Node>> = spare;
+    let mut by_source: BTreeMap<(NodeId, NodeId), NodeId> = BTreeMap::new();
+    let mut by_src: BTreeMap<NodeId, Option<NodeId>> = BTreeMap::new();
+    for i in &old_ids {
+        let Some(n) = doc.node_arc(*i).or_else(|| old.get(i)).cloned() else { continue };
+        if let Some(s) = n.source {
+            if let Some(p) = n.parent {
+                by_source.entry((p, s)).or_insert(*i);
+            }
+            by_src.entry(s).and_modify(|e| *e = None).or_insert(Some(*i));
+        }
+        old.insert(*i, n);
+    }
+    let mut by_path: Option<BTreeMap<String, NodeId>> = None;
+    let mut main_paths: Option<BTreeMap<NodeId, String>> = None;
+    // Ids for the copies: reuse the matching old layer's id (a layer the main moved to another
+    // parent keeps its id and overrides).
+    let src: Vec<NodeId> = doc.subtree(component).into_iter().filter(|i| *i != component).collect();
+    let mut map: BTreeMap<NodeId, NodeId> = BTreeMap::new();
+    map.insert(component, inst);
+    let mut used: BTreeSet<NodeId> = BTreeSet::new();
+    // Slots holding the instance's own content (new ids), and main layers not copied: the
+    // default content of those slots.
+    let mut edited: BTreeSet<NodeId> = BTreeSet::new();
+    let mut skipped: BTreeSet<NodeId> = BTreeSet::new();
+    let mut fresh_ids = Vec::new();
+    for s in &src {
+        let Some(sn) = doc.node(*s) else { continue };
+        if sn.parent.is_some_and(|p| skipped.contains(&p) || map.get(&p).is_some_and(|pn| edited.contains(pn))) {
+            skipped.insert(*s);
+            continue;
+        }
+        let parent_new = sn.parent.and_then(|p| map.get(&p).copied());
+        let mut found = parent_new.and_then(|pn| by_source.get(&(pn, *s)).copied()).or_else(|| by_src.get(s).copied().flatten());
+        if found.is_none() {
+            let paths = by_path.get_or_insert_with(|| path_map(doc, inst, true).into_iter().map(|(k, v)| (v, k)).collect());
+            let mains = main_paths.get_or_insert_with(|| path_map(doc, component, false));
+            found = mains.get(s).and_then(|p| paths.get(p)).copied();
+        }
+        let nid = match found {
+            Some(o) if used.insert(o) => o,
+            _ => {
+                fresh_ids.push(*s);
+                continue;
+            }
+        };
+        if let Some(m) = old.get(&nid).and_then(|o| variant_kept(doc, o, *s)) {
+            old.insert(nid, std::sync::Arc::new(m));
+        }
+        if old.get(&nid).is_some_and(|o| holds_content(o)) && is_slot(doc, *s) {
+            edited.insert(nid);
+        }
+        map.insert(*s, nid);
+    }
+    for c in root.children.clone() {
+        let _ = doc.remove(c);
+    }
+    for s in fresh_ids {
+        let nid = doc.alloc_id();
+        map.insert(s, nid);
+    }
+    // Build the copies (pre-order: parents first).
+    let mut enclosing: BTreeMap<NodeId, Vec<NodeId>> = BTreeMap::new();
+    enclosing.insert(inst, vec![inst]);
+    let mut inst_props: BTreeMap<NodeId, BTreeMap<String, Value>> = BTreeMap::new();
+    inst_props.insert(inst, eff_props);
+    let mut nested = Vec::new();
+    let mut new_nodes = Vec::new();
+    // Text layers showing other text or style than their main layer (to re-measure).
+    let mut remeasure = Vec::new();
+    for s in &src {
+        let Some(orig) = doc.node(*s) else { continue };
+        let Some(&nid) = map.get(s) else { continue };
+        let Some(parent) = orig.parent.and_then(|p| map.get(&p).copied()) else { continue };
+        let mut n = orig.clone();
+        n.id = nid;
+        n.parent = Some(parent);
+        n.children = orig.children.iter().filter_map(|c| map.get(c).copied()).collect();
+        n.source = Some(*s);
+        n.overrides.clear();
+        n.prop_refs.clear();
+        let prev = old.get(&nid);
+        // Annotations belong to the layer they were added to, not to its copies.
+        n.annotations = prev.map(|o| o.annotations.clone()).unwrap_or_default();
+        n.measurements = prev.map(|o| o.measurements.clone()).unwrap_or_default();
+        if let Some(o) = prev {
+            carry_overrides(o, &mut n, Carry::Values);
+            keep_laid_out(doc, orig, o, &mut n);
+        }
+        if !edited.contains(&nid) {
+            // No longer a slot in the main: it mirrors the main again.
+            n.overrides.remove(SLOT);
+        }
+        // Component properties: the main layer's bindings use this instance's values; layers of
+        // nested instances use the nested instance's values (one level per source hop).
+        let enc = enclosing.get(&parent).cloned().unwrap_or_default();
+        let mut chain: Vec<&Node> = vec![orig];
+        while chain.len() < enc.len() {
+            let Some(next) = chain.last().and_then(|c| c.source).and_then(|x| doc.node(x)) else { break };
+            chain.push(next);
+        }
+        for (j, level) in chain.iter().enumerate().rev() {
+            let Some(props) = enc.get(j).and_then(|e| inst_props.get(e)) else { continue };
+            for (field, prop) in &level.prop_refs {
+                let g = field_group(field);
+                if n.overrides.contains(g) || (j > 0 && orig.overrides.contains(g)) {
+                    continue;
+                }
+                if let Some(val) = props.get(prop) {
+                    apply_prop(doc, &mut n, field, val);
+                }
+            }
+        }
+        if let NodeKind::Instance { component: c, props } = &n.kind {
+            inst_props.insert(nid, props.clone());
+            let mut e = enc;
+            e.push(nid);
+            enclosing.insert(nid, e);
+            if !matches!(orig.kind, NodeKind::Instance { component: oc, .. } if oc == *c) {
+                nested.push(nid);
+            }
+        } else {
+            enclosing.insert(nid, enc);
+        }
+        if let (NodeKind::Text(a), NodeKind::Text(b)) = (&orig.kind, &n.kind)
+            && a != b
+        {
+            remeasure.push(nid);
+        }
+        new_nodes.push(n);
+    }
+    for n in new_nodes {
+        let (id, parent) = (n.id, n.parent);
+        if insert_linked(doc, n).is_err()
+            && let Some(p) = parent.and_then(|p| doc.node_mut(p))
+        {
+            p.children.retain(|c| *c != id);
+        }
+    }
+    // Root: follows the main except its own placement, name, size and overrides.
+    let order: Vec<NodeId> = comp.children.iter().filter_map(|c| map.get(c).copied()).filter(|c| doc.contains(*c)).collect();
+    let mut fresh = comp.clone();
+    fresh.id = inst;
+    fresh.parent = root.parent;
+    fresh.children = order;
+    fresh.transform = root.transform;
+    fresh.kind = root.kind.clone();
+    carry_prop_bindings(&root, &mut fresh);
+    // A nested instance keeps mirroring its layer of the outer main.
+    let nested_copy = inside_instance(doc, inst);
+    fresh.source = if nested_copy { root.source } else { Some(component) };
+    fresh.constraints = root.constraints;
+    fresh.child_layout = root.child_layout.clone();
+    fresh.interactions = root.interactions.clone();
+    fresh.exports = root.exports.clone();
+    fresh.prop_refs = root.prop_refs.clone();
+    fresh.plugin_data = root.plugin_data.clone();
+    fresh.annotations = root.annotations.clone();
+    // Code links belong to the main component; instances read them from it.
+    fresh.code_links.clear();
+    // An instance's own dev resources (its main's are listed with them, not copied).
+    fresh.dev_resources = root.dev_resources.clone();
+    fresh.measurements = root.measurements.clone();
+    fresh.locked = root.locked;
+    fresh.visible = root.visible;
+    fresh.var_modes = root.var_modes.clone();
+    fresh.is_mask = root.is_mask;
+    fresh.exposed = root.exposed;
+    fresh.guides = root.guides.clone();
+    fresh.dev_status = root.dev_status;
+    fresh.dev_changed = root.dev_changed;
+    fresh.dev_note = root.dev_note.clone();
+    fresh.constrain_proportions = root.constrain_proportions;
+    // How the instance combines in a boolean group it sits in is its own.
+    fresh.bool_op = root.bool_op;
+    // A swapped nested instance keeps the name its layer was given in the outer main.
+    let renamed = nested_copy
+        && root.source.and_then(|s| doc.node(s)).is_some_and(|s| match &s.kind {
+            NodeKind::Instance { component: c, .. } => s.name != default_instance_name(doc, *c),
+            _ => false,
+        });
+    fresh.name = if renamed { root.name.clone() } else { default_instance_name(doc, component) };
+    // Switched to another variant: its own overrides stay where both variants agreed.
+    if let Some(prev) = root.source.and_then(|p| doc.node(p)).filter(|p| sibling_variants(doc, p.id, component)) {
+        let differs = diff_groups(prev, &comp);
+        root.overrides.retain(|g| g == "name" || !differs.contains(&g.as_str()));
+        follow_variant_resizing(&mut fresh.child_layout, &prev.child_layout, &comp.child_layout);
+    }
+    carry_overrides(&root, &mut fresh, Carry::Root);
+    if let Some(r) = doc.node_mut(inst) {
+        *r = fresh;
+    }
+    // A resized instance: children follow their constraints (auto layout re-flows later).
+    let (iw, ih) = doc.node(inst).map(|n| (n.width, n.height)).unwrap_or((comp.width, comp.height));
+    if (iw - comp.width).abs() > 1e-9 || (ih - comp.height).abs() > 1e-9 {
+        figcraft_layout::apply_constraints(doc, inst, comp.width, comp.height);
+        remeasure = map.values().copied().collect();
+    }
+    // Geometry overrides of children win over constraints.
+    for s in &src {
+        let Some(nid) = map.get(s).copied() else { continue };
+        let Some(o) = old.get(&nid) else { continue };
+        // A frame that kept the size its own resizing gave it: its layers (copied at their main
+        // layers' places) follow their constraints from its main layer's size.
+        if o.overrides.contains("resizing")
+            && !o.overrides.contains("size")
+            && doc.node(nid).is_some_and(|n| n.kind.is_frame_like() && n.layout.is_none())
+            && let Some((mw, mh)) = doc.node(*s).map(|m| (m.width, m.height))
+        {
+            figcraft_layout::apply_constraints(doc, nid, mw, mh);
+        }
+        if !o.overrides.contains("size") && !o.overrides.contains("position") {
+            continue;
+        }
+        remeasure.push(nid);
+        let Some((ow, oh)) = doc.node(nid).map(|n| (n.width, n.height)) else { continue };
+        if o.overrides.contains("size") {
+            // Through set_size so vector networks scale with the box.
+            figcraft_layout::set_size(doc, nid, o.width, o.height);
+            if doc.node(nid).is_some_and(|n| n.kind.is_frame_like() && n.layout.is_none()) {
+                figcraft_layout::apply_constraints(doc, nid, ow, oh);
+            }
+        }
+        if let Some(n) = doc.node_mut(nid) {
+            carry_overrides(o, n, Carry::Geometry);
+        }
+    }
+    // Text whose characters or style differ from the main re-measures.
+    for nid in remeasure {
+        if let Some(n) = doc.node(nid)
+            && let Some((w, h)) = figcraft_text::auto_size(n)
+            && ((w - n.width).abs() > 1e-6 || (h - n.height).abs() > 1e-6)
+        {
+            figcraft_layout::set_size(doc, nid, w, h);
+        }
+    }
+    // Nested instances showing another main than the main's copy (swapped): rebuild from it,
+    // with the old layers below them this rebuild didn't reuse.
+    let unused: BTreeMap<NodeId, std::sync::Arc<Node>> =
+        old.iter().filter(|(i, _)| !used.contains(*i) && !doc.contains(**i)).map(|(i, x)| (*i, x.clone())).collect();
+    for n in nested {
+        let mut below: BTreeMap<NodeId, std::sync::Arc<Node>> = unused
+            .iter()
+            .filter(|(_, x)| {
+                let mut cur = x.parent;
+                for _ in 0..=MAX_DEPTH * 4 {
+                    match cur {
+                        Some(p) if p == n => return true,
+                        Some(p) => cur = unused.get(&p).and_then(|a| a.parent),
+                        None => return false,
+                    }
+                }
+                false
+            })
+            .map(|(i, x)| (*i, x.clone()))
+            .collect();
+        take_placing_overrides(doc, n, &old, &mut below);
+        sync_instance_depth(doc, n, depth + 1, below);
+    }
+}
+
+/// Before swapped nested instance `n` is rebuilt from its new main: each of its old layers (the
+/// copies just made of the outer main's, and `below`) takes the overrides held along the source
+/// chain it had before this rebuild (`before`), through layers inside instances in the mains that
+/// place `n`. Matched by name, they carry onto the new main's layers as the instance's own, so a
+/// swap takes what the outer main set once: later rebuilds find layers mirroring the new main.
+/// Geometry and slot content follow the new main; groups the layer overrides itself keep its value.
+fn take_placing_overrides(
+    doc: &mut Document,
+    n: NodeId,
+    before: &BTreeMap<NodeId, std::sync::Arc<Node>>,
+    below: &mut BTreeMap<NodeId, std::sync::Arc<Node>>,
+) {
+    let placing = placing_mains(doc, n);
+    for id in doc.subtree(n).into_iter().filter(|i| *i != n) {
+        let held = before.get(&id).map(|b| held_along(doc, b, &placing)).unwrap_or_default();
+        if let Some(layer) = doc.node_mut(id) {
+            take(layer, &held);
+        }
+    }
+    for layer in below.values_mut() {
+        let held = held_along(doc, layer, &placing);
+        if !held.is_empty() {
+            take(std::sync::Arc::make_mut(layer), &held);
+        }
+    }
+}
+
+/// The mains placing nested instance `n`: those of the layers it mirrors, outward.
+fn placing_mains(doc: &Document, n: NodeId) -> BTreeSet<NodeId> {
+    let mut out = BTreeSet::new();
+    let mut cur = doc.node(n).and_then(|x| x.source);
+    for _ in 0..=MAX_DEPTH {
+        let Some(s) = cur.and_then(|c| doc.node(c)).filter(|s| !matches!(s.kind, NodeKind::Component { .. })) else { break };
+        out.extend(owning_component(doc, s.id));
+        cur = s.source;
+    }
+    out
+}
+
+/// The overrides but geometry and slot content held along `layer`'s source chain while it runs
+/// through layers inside instances in `placing` mains, each with the nearest layer holding it.
+fn held_along(doc: &Document, layer: &Node, placing: &BTreeSet<NodeId>) -> BTreeMap<String, std::sync::Arc<Node>> {
+    let mut out = BTreeMap::new();
+    let mut cur = layer.source;
+    for _ in 0..=MAX_DEPTH {
+        let Some(s) = cur.and_then(|c| doc.node_arc(c)) else { break };
+        if !inside_instance(doc, s.id) || !owning_component(doc, s.id).is_some_and(|m| placing.contains(&m)) {
+            break;
+        }
+        for g in s.overrides.iter().filter(|g| !matches!(g.as_str(), "size" | "position" | SLOT)) {
+            out.entry(g.clone()).or_insert_with(|| s.clone());
+        }
+        cur = s.source;
+    }
+    out
+}
+
+/// Give `layer` the `held` groups it has no override of its own for.
+fn take(layer: &mut Node, held: &BTreeMap<String, std::sync::Arc<Node>>) {
+    for (g, from) in held {
+        if layer.overrides.insert(g.clone()) {
+            copy_group(from, layer, g);
+        }
+    }
+}
+
+/// Whether main components `a` and `b` are two variants of one set.
+fn sibling_variants(doc: &Document, a: NodeId, b: NodeId) -> bool {
+    a != b && variant_set(doc, a).is_some_and(|s| variant_set(doc, b) == Some(s))
+}
+
+/// Old copy `o` matched by name to main layer `s` of another variant (the instance switched
+/// variants): `o` without the overrides of properties the two variants' layers differ in (`None`
+/// when it keeps them all). Text layers keep every override.
+fn variant_kept(doc: &Document, o: &Node, s: NodeId) -> Option<Node> {
+    let from = o.source.filter(|f| *f != s).and_then(|f| doc.node(f))?;
+    if o.overrides.is_empty() || matches!(o.kind, NodeKind::Text(_)) {
+        return None;
+    }
+    if !sibling_variants(doc, owning_component(doc, from.id)?, owning_component(doc, s)?) {
+        return None;
+    }
+    let differs = diff_groups(from, doc.node(s)?);
+    let mut m = o.clone();
+    m.overrides.retain(|g| !differs.contains(&g.as_str()));
+    (m.overrides.len() != o.overrides.len()).then_some(m)
+}
+
+/// Drop the overrides of instance `inst` but its text layers' (and its own size and the content of
+/// its slots): what swapping it from the Assets panel keeps.
+pub fn keep_text_overrides(doc: &mut Document, inst: NodeId) {
+    for d in old_layers(doc, inst).into_iter().chain([inst]) {
+        let Some(n) = doc.node(d) else { continue };
+        let text = matches!(n.kind, NodeKind::Text(_));
+        let keep = |g: &String| text || g == SLOT || (d == inst && g == "size");
+        if !n.overrides.iter().all(keep)
+            && let Some(m) = doc.node_mut(d)
+        {
+            m.overrides.retain(keep);
+        }
+    }
+}
+
+/// Where auto layout places and sizes a rebuilt copy `n` of main layer `orig`, keep the old
+/// copy's `o` values (an instance's auto layout re-flows from its own content, so they usually
+/// differ from the main's): unchanged layers then stay unchanged, and auto layout re-flows wherever
+/// something that sizes or places layers did change.
+fn keep_laid_out(doc: &Document, orig: &Node, o: &Node, n: &mut Node) {
+    if o.parent != n.parent || o.overrides.contains("size") || o.overrides.contains("position") {
+        return;
+    }
+    let flows = !n.child_layout.absolute && orig.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some());
+    if flows {
+        // The main's rotation and skew, the old place.
+        let [a, b, c, d, _, _] = n.transform.as_coeffs();
+        let [.., e, f] = o.transform.as_coeffs();
+        n.transform = Affine::new([a, b, c, d, e, f]);
+    }
+    // Only layers whose shape is their box (a vector's points scale with it).
+    let boxed = n.kind.is_frame_like() || matches!(n.kind, NodeKind::Text(_) | NodeKind::Rectangle | NodeKind::Ellipse { .. });
+    let derived = |s: Sizing| boxed && ((s == Sizing::Hug && n.layout.is_some()) || (s == Sizing::Fill && flows));
+    if derived(n.child_layout.sizing_h) {
+        n.width = o.width;
+    }
+    if derived(n.child_layout.sizing_v) {
+        n.height = o.height;
+    }
+}
+
+/// The layers of instance `inst` a rebuild matches against (every layer below it but the content
+/// of slots holding its own), ascending.
+fn old_layers(doc: &Document, inst: NodeId) -> Vec<NodeId> {
+    let mut out = Vec::new();
+    let mut stack = vec![inst];
+    while let Some(id) = stack.pop() {
+        let Some(n) = doc.node(id) else { continue };
+        for c in &n.children {
+            out.push(*c);
+            if out.len() > 1_000_000 {
+                break;
+            }
+            if doc.node(*c).is_some_and(|cn| !holds_content(cn)) {
+                stack.push(*c);
+            }
+        }
+    }
+    out.sort();
+    out.dedup();
+    out
+}
+
+/// Insert a node whose parent/children links are already set (used when rebuilding instances).
+pub(super) fn insert_linked(doc: &mut Document, n: Node) -> Result<(), DocError> {
+    let parent = n.parent.ok_or_else(|| DocError::Invalid("no parent".into()))?;
+    let id = n.id;
+    let mut n = n;
+    let kids = std::mem::take(&mut n.children);
+    doc.insert(n, parent, None)?;
+    if let Some(m) = doc.node_mut(id) {
+        m.children = kids;
+    }
+    // The parent may already list us (its children were copied with ids): keep the first.
+    if let Some(p) = doc.node_mut(parent) {
+        let mut seen = BTreeSet::new();
+        p.children.retain(|c| seen.insert(*c));
+    }
+    Ok(())
+}
diff --git a/crates/engine/src/components_tests.rs b/crates/engine/src/assets/components/tests.rs
similarity index 87%
rename from crates/engine/src/components_tests.rs
rename to crates/engine/src/assets/components/tests.rs
index eb21b20e..30254651 100644
--- a/crates/engine/src/components_tests.rs
+++ b/crates/engine/src/assets/components/tests.rs
@@ -67,8 +67,6 @@ fn overrides_survive_main_edits() {
     ex(&mut s, "node.set", json!({"id": ibg, "props": {"effects": [{"type": "dropShadow"}]}}));
     ex(&mut s, "text.set", json!({"id": ititle, "characters": "Overridden"}));
     ex(&mut s, "node.set", json!({"id": idot, "props": {"visible": false}}));
-    // A layer inside an instance keeps its main's size (the instance itself resizes).
-    assert!(s.execute("node.set", &json!({"id": idot, "props": {"width": 30}})).is_err());
     let ov = node(&s, ibg).overrides;
     for g in ["fills", "strokes", "effects", "name"] {
         assert!(ov.contains(g), "{g} in {ov:?}");
@@ -431,6 +429,90 @@ fn component_properties_apply_to_instances() {
     healthy(&s);
 }
 
+/// The default of boolean property `name` on component `c`.
+fn bool_default(s: &Session, c: NodeId, name: &str) -> Option<bool> {
+    match &node(s, c).kind {
+        NodeKind::Component { props, .. } => match props.get(name) {
+            Some(PropDef::Boolean { default }) => Some(*default),
+            _ => None,
+        },
+        _ => None,
+    }
+}
+
+#[test]
+fn boolean_property_default_is_the_mains_visibility() {
+    let mut s = Session::new();
+    let (c, bg, title, dot) = card(&mut s);
+    // #993: a `false` default hides the bound layer in the main, not only in instances.
+    ex(&mut s, "component.addProperty", json!({"id": c, "name": "Show dot", "type": "boolean", "default": false, "layer": dot}));
+    assert!(!node(&s, dot).visible);
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": c, "x": 300, "y": 0})));
+    assert!(!node(&s, copy_of(&s, i, dot)).visible);
+    // Without a default, the property takes the layer's visibility.
+    ex(&mut s, "node.set", json!({"id": bg, "props": {"visible": false}}));
+    ex(&mut s, "component.addProperty", json!({"id": c, "name": "Show bg", "type": "boolean", "layer": bg}));
+    assert_eq!(bool_default(&s, c, "Show bg"), Some(false));
+    assert!(!node(&s, bg).visible);
+    // Binding a layer to an existing property shows it as the default says.
+    ex(&mut s, "component.bindProperty", json!({"layer": title, "property": "Show dot"}));
+    assert!(!node(&s, title).visible);
+    // A new default shows or hides every bound layer of the main; instances keep their values.
+    ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Show dot": false}}));
+    ex(&mut s, "component.editProperty", json!({"id": c, "name": "Show dot", "default": true}));
+    assert!(node(&s, dot).visible && node(&s, title).visible);
+    assert!(!node(&s, copy_of(&s, i, dot)).visible, "the instance's own value stays");
+    // Renamed with a new default in one go.
+    ex(&mut s, "component.editProperty", json!({"id": c, "name": "Show dot", "newName": "Dot", "default": false}));
+    assert!(!node(&s, dot).visible && !node(&s, title).visible);
+    assert_eq!(bool_default(&s, c, "Dot"), Some(false));
+    // Showing a bound layer on the main is the property's new default, for its other layers too.
+    ex(&mut s, "node.set", json!({"id": dot, "props": {"visible": true}}));
+    assert_eq!(bool_default(&s, c, "Dot"), Some(true));
+    assert!(node(&s, title).visible);
+    let j = idv(&ex(&mut s, "instance.create", json!({"component": c, "x": 600, "y": 0})));
+    assert!(node(&s, copy_of(&s, j, dot)).visible && node(&s, copy_of(&s, j, title)).visible);
+    assert!(!node(&s, copy_of(&s, i, dot)).visible, "existing instances keep their values");
+    // Hiding a layer inside an instance is an override there, not a new default.
+    let jdot = copy_of(&s, j, dot);
+    ex(&mut s, "node.set", json!({"id": jdot, "props": {"visible": false}}));
+    assert_eq!(bool_default(&s, c, "Dot"), Some(true));
+    assert!(node(&s, dot).visible);
+    // Undo puts the default and the layers back together.
+    s.undo().unwrap();
+    s.undo().unwrap();
+    s.undo().unwrap();
+    assert_eq!(bool_default(&s, c, "Dot"), Some(false));
+    assert!(!node(&s, dot).visible && !node(&s, title).visible);
+    healthy(&s);
+}
+
+#[test]
+fn boolean_property_default_follows_across_variants() {
+    let mut s = Session::new();
+    let mut variants = Vec::new();
+    let mut labels = Vec::new();
+    for (k, state) in ["Default", "Hover"].iter().enumerate() {
+        let f =
+            idv(&ex(&mut s, "frame.create", json!({"x": k as f64 * 150.0, "y": 0, "width": 100, "height": 40, "name": format!("State={state}")})));
+        labels.push(idv(&ex(&mut s, "text.create", json!({"text": *state, "x": 10, "y": 10, "parent": f, "props": {"name": "Label"}}))));
+        variants.push(idv(&ex(&mut s, "component.create", json!({"ids": [f]}))));
+    }
+    let set = idv(&ex(&mut s, "component.combineVariants", json!({"ids": variants.clone()})));
+    ex(&mut s, "component.addProperty", json!({"id": set, "name": "Show label", "type": "boolean", "default": false, "layer": labels[0]}));
+    ex(&mut s, "component.bindProperty", json!({"layer": labels[1], "property": "Show label"}));
+    assert!(labels.iter().all(|l| !node(&s, *l).visible));
+    ex(&mut s, "component.editProperty", json!({"id": set, "name": "Show label", "default": true}));
+    assert!(labels.iter().all(|l| node(&s, *l).visible));
+    // Hiding the label in one variant is the set's default: the other variant's label follows.
+    ex(&mut s, "node.set", json!({"id": labels[1], "props": {"visible": false}}));
+    assert!(variants.iter().all(|v| bool_default(&s, *v, "Show label") == Some(false)));
+    assert!(!node(&s, labels[0]).visible);
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": set, "x": 0, "y": 200})));
+    assert!(!node(&s, kids(&s, i)[0]).visible);
+    healthy(&s);
+}
+
 #[test]
 fn push_changes_to_main() {
     let mut s = Session::new();
diff --git a/crates/engine/src/assets/components/variants.rs b/crates/engine/src/assets/components/variants.rs
new file mode 100644
index 00000000..40ac23ea
--- /dev/null
+++ b/crates/engine/src/assets/components/variants.rs
@@ -0,0 +1,147 @@
+use super::*;
+
+/// A set's default variant: the one in its top-left corner (nearest to it, then the top-most, then
+/// the left-most).
+pub fn default_variant(doc: &Document, set: NodeId) -> Option<NodeId> {
+    let corner = |c: &NodeId| {
+        doc.node(*c).filter(|n| matches!(n.kind, NodeKind::Component { .. })).map(|n| n.transform.as_coeffs()).map(|[.., x, y]| (x + y, y, x))
+    };
+    let kids = &doc.node(set)?.children;
+    kids.iter()
+        .copied()
+        .filter_map(|c| corner(&c).map(|k| (k, c)))
+        .min_by(|(a, _), (b, _)| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
+        .map(|(_, c)| c)
+}
+
+/// Variants of a set sharing one combination of property values (each group two or more, in
+/// layer order): a conflict to resolve by giving each a unique combination.
+pub fn variant_conflicts(doc: &Document, set: NodeId) -> Vec<Vec<NodeId>> {
+    let mut by: BTreeMap<BTreeMap<String, String>, Vec<NodeId>> = BTreeMap::new();
+    for c in doc.node(set).map(|s| s.children.clone()).unwrap_or_default() {
+        if let Some(n) = doc.node(c).filter(|n| matches!(n.kind, NodeKind::Component { .. })) {
+            by.entry(variant_props(&n.name)).or_default().push(c);
+        }
+    }
+    by.into_values().filter(|v| v.len() > 1).collect()
+}
+
+/// Parse a variant name "Size=Large, State=Hover" into pairs.
+pub fn variant_props(name: &str) -> BTreeMap<String, String> {
+    name.split(',')
+        .filter_map(|kv| {
+            let (k, v) = kv.split_once('=')?;
+            Some((k.trim().to_string(), v.trim().to_string()))
+        })
+        .collect()
+}
+
+/// Format variant pairs as a layer name, in the given property order (others after, sorted).
+pub fn variant_name(pairs: &BTreeMap<String, String>, order: &[String]) -> String {
+    let mut keys: Vec<&String> = order.iter().filter(|k| pairs.contains_key(*k)).collect();
+    keys.extend(pairs.keys().filter(|k| !order.contains(k)));
+    keys.iter().filter_map(|k| pairs.get(*k).map(|v| format!("{k}={v}"))).collect::<Vec<_>>().join(", ")
+}
+
+/// Variant properties of a set: property → values, in first-seen order.
+pub fn variant_options(doc: &Document, set: NodeId) -> Vec<(String, Vec<String>)> {
+    let mut out: Vec<(String, Vec<String>)> = Vec::new();
+    for c in doc.node(set).map(|s| s.children.clone()).unwrap_or_default() {
+        let Some(cn) = doc.node(c) else { continue };
+        for kv in cn.name.split(',') {
+            let Some((k, v)) = kv.split_once('=') else { continue };
+            let (k, v) = (k.trim().to_string(), v.trim().to_string());
+            match out.iter_mut().find(|(p, _)| *p == k) {
+                Some((_, vals)) => {
+                    if !vals.contains(&v) {
+                        vals.push(v);
+                    }
+                }
+                None => out.push((k, vec![v])),
+            }
+        }
+    }
+    out
+}
+
+/// The variant in `set` matching `wanted` best: all given properties equal, or else the most.
+pub fn find_variant(doc: &Document, set: NodeId, wanted: &BTreeMap<String, String>) -> Option<NodeId> {
+    let s = doc.node(set)?;
+    let score = |c: &NodeId| doc.node(*c).map(|n| variant_props(&n.name)).map(|p| wanted.iter().filter(|(k, v)| p.get(*k) == Some(*v)).count());
+    if let Some(exact) = s.children.iter().copied().find(|c| score(c) == Some(wanted.len())) {
+        return Some(exact);
+    }
+    s.children.iter().copied().filter(|c| score(c).is_some()).max_by_key(|c| score(c).unwrap_or(0))
+}
+
+/// Check that every instance mirrors its main's layer structure (tests and diagnostics): each
+/// layer's `source` is the main layer at the same place, swapped nested instances mirror their
+/// own main, slots holding the instance's own content aren't compared. Returns the problems found.
+pub fn mirror_issues(doc: &Document) -> Vec<String> {
+    doc.nodes()
+        .filter(|n| matches!(n.kind, NodeKind::Instance { .. }) && !inside_instance(doc, n.id))
+        .flat_map(|n| instance_issues(doc, n.id))
+        .collect()
+}
+
+/// [`mirror_issues`] for one instance.
+pub(super) fn instance_issues(doc: &Document, id: NodeId) -> Vec<String> {
+    fn walk(doc: &Document, inst: &Node, main: &Node, depth: usize, out: &mut Vec<String>) {
+        if depth > MAX_DEPTH || holds_content(inst) {
+            return;
+        }
+        if inst.children.len() != main.children.len() {
+            out.push(format!("{} has {} layers, its main {} has {}", inst.id, inst.children.len(), main.id, main.children.len()));
+            return;
+        }
+        for (a, b) in inst.children.iter().zip(&main.children) {
+            let (Some(an), Some(bn)) = (doc.node(*a), doc.node(*b)) else { continue };
+            if an.source != Some(bn.id) {
+                out.push(format!("{} mirrors {:?}, expected {}", an.id, an.source, bn.id));
+                continue;
+            }
+            match (&an.kind, &bn.kind) {
+                (NodeKind::Instance { component: x, .. }, NodeKind::Instance { component: y, .. }) if x != y => {
+                    if let Some(m) = doc.node(*x) {
+                        walk(doc, an, m, depth + 1, out);
+                    }
+                }
+                _ => walk(doc, an, bn, depth + 1, out),
+            }
+        }
+    }
+    let mut out = Vec::new();
+    if let Some(n) = doc.node(id)
+        && let NodeKind::Instance { component, .. } = &n.kind
+        && let Some(m) = doc.node(*component)
+    {
+        walk(doc, n, m, 0, &mut out);
+    }
+    out
+}
+
+/// The nested instance copies inside instance `id` whose main-component counterpart is exposed
+/// (top-most first; an exposed instance's own exposed nested instances follow it).
+pub fn exposed_copies(doc: &Document, id: NodeId) -> Vec<NodeId> {
+    let mut out = Vec::new();
+    let mut stack: Vec<NodeId> = doc.node(id).map(|n| n.children.iter().rev().copied().collect()).unwrap_or_default();
+    let mut seen = 0usize;
+    while let Some(c) = stack.pop() {
+        seen += 1;
+        if seen > 100_000 {
+            break;
+        }
+        let Some(n) = doc.node(c) else { continue };
+        // A hidden exposed instance hides its properties too.
+        let exposed =
+            n.visible && matches!(n.kind, NodeKind::Instance { .. }) && n.source.and_then(|src| doc.node(src)).is_some_and(|src| src.exposed);
+        if exposed {
+            out.push(c);
+        }
+        // Only exposed nested instances pass their own exposed instances up.
+        if !matches!(n.kind, NodeKind::Instance { .. }) || exposed {
+            stack.extend(n.children.iter().rev().copied());
+        }
+    }
+    out
+}
diff --git a/crates/engine/src/library.rs b/crates/engine/src/assets/library.rs
similarity index 95%
rename from crates/engine/src/library.rs
rename to crates/engine/src/assets/library.rs
index 73c599a4..56b0fc07 100644
--- a/crates/engine/src/library.rs
+++ b/crates/engine/src/assets/library.rs
@@ -339,7 +339,7 @@ pub fn publish(doc: &Document, prev: Option<&PublishedLibrary>, sel: &Selection,
         .map(|v| v.id.as_str())
         .collect();
     let (bound, mode_colls) = used_variables(doc, &units);
-    let var_ids = alias_closure(&doc.variables, offered_vars.iter().map(|v| v.to_string()).chain(bound));
+    let var_ids = alias_closure(&doc.variables, offered_vars.iter().map(ToString::to_string).chain(bound));
     snap.variables.variables = doc.variables.variables.iter().filter(|v| var_ids.contains(&v.id)).cloned().collect();
     let coll_ids: BTreeSet<&str> = snap
         .variables
@@ -439,9 +439,9 @@ pub fn publish(doc: &Document, prev: Option<&PublishedLibrary>, sel: &Selection,
     Ok(PublishedLibrary { manifest, doc: Arc::new(snap) })
 }
 
-/// When a library file was last read.
+/// When a file was last read: its length and modification time (also a document's own file, #1330).
 #[derive(Clone, Debug, PartialEq)]
-struct Stamp {
+pub(crate) struct Stamp {
     len: u64,
     modified: Option<std::time::SystemTime>,
 }
@@ -449,9 +449,27 @@ struct Stamp {
 #[derive(Clone, Debug)]
 struct Entry {
     stamp: Option<Stamp>,
+    /// When the file was read: a stamp only proves the file unchanged once its modification time
+    /// is safely older than that, since file systems keep the time in coarse ticks.
+    read_at: Option<std::time::SystemTime>,
     result: std::result::Result<Arc<PublishedLibrary>, String>,
 }
 
+/// How far a file's modification time must lie before its read for the stamp to be trusted.
+const RACY_STAMP: std::time::Duration = std::time::Duration::from_secs(2);
+
+impl Entry {
+    /// A file stamped in the future (clock skew, unpacked archives) never settles: it is re-read on
+    /// every load until the clock passes it.
+    fn still_valid(&self, now: &Stamp) -> bool {
+        let settled = match (now.modified, self.read_at) {
+            (Some(modified), Some(read_at)) => modified.checked_add(RACY_STAMP).is_some_and(|t| t < read_at),
+            _ => false,
+        };
+        settled && self.stamp.as_ref() == Some(now)
+    }
+}
+
 /// Library files read by a session, by path (re-read when they change on disk).
 #[derive(Clone, Debug, Default)]
 pub struct Cache {
@@ -473,6 +491,11 @@ impl Cache {
                 None => Err(EngineError::Other(crate::library_server::NOT_FETCHED.into())),
             };
         }
+        // The path comes from a document: a network share would be contacted (and on Windows get
+        // the opener's credentials) by the stat below.
+        if !craft_docpath::is_local(path) {
+            return Err(EngineError::Other(format!("{path}: a library is opened only from this computer")));
+        }
         let stamp = stat(path);
         // Checked before the cache: the limit is the caller's.
         if let Ok(st) = &stamp
@@ -481,10 +504,11 @@ impl Cache {
             return Err(EngineError::Other(format!("{path} is too large to use as a library (the limit is {} MB)", max_bytes / 1024 / 1024)));
         }
         if let (Some(e), Ok(st)) = (self.entries.get(path), &stamp)
-            && e.stamp.as_ref() == Some(st)
+            && e.still_valid(st)
         {
             return e.result.clone().map_err(EngineError::Other);
         }
+        let read_at = now();
         let result = match &stamp {
             Ok(_) => read_file(path).map(Arc::new),
             Err(e) => Err(e.clone()),
@@ -492,7 +516,7 @@ impl Cache {
         if self.entries.len() >= MAX_CACHED && !self.entries.contains_key(path) {
             self.entries.clear();
         }
-        self.entries.insert(path.to_string(), Entry { stamp: stamp.ok(), result: result.clone() });
+        self.entries.insert(path.to_string(), Entry { stamp: stamp.ok(), read_at, result: result.clone() });
         result.map_err(EngineError::Other)
     }
 
@@ -506,13 +530,23 @@ impl Cache {
         if self.entries.len() >= MAX_CACHED && !self.entries.contains_key(path) {
             self.entries.clear();
         }
-        self.entries.insert(path.to_string(), Entry { stamp: None, result });
+        self.entries.insert(path.to_string(), Entry { stamp: None, read_at: None, result });
     }
 }
 
 #[cfg(not(target_arch = "wasm32"))]
-fn stat(path: &str) -> std::result::Result<Stamp, String> {
-    let m = std::fs::metadata(path).map_err(|e| format!("{path}: {e}"))?;
+fn now() -> Option<std::time::SystemTime> {
+    Some(std::time::SystemTime::now())
+}
+
+#[cfg(target_arch = "wasm32")]
+fn now() -> Option<std::time::SystemTime> {
+    None
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) fn stat(path: &str) -> std::result::Result<Stamp, String> {
+    let m = crate::file_access::metadata(path).map_err(|e| e.to_string())?;
     if !m.is_file() {
         return Err(format!("{path} is not a file"));
     }
@@ -520,15 +554,22 @@ fn stat(path: &str) -> std::result::Result<Stamp, String> {
 }
 
 #[cfg(target_arch = "wasm32")]
-fn stat(_path: &str) -> std::result::Result<Stamp, String> {
+pub(crate) fn stat(_path: &str) -> std::result::Result<Stamp, String> {
     Err(NO_FILES.into())
 }
 
+/// A library read from a file or a server, with the modes chosen inside its instances marked when
+/// it was published before they were overrides ([`crate::components::mark_layer_modes`]).
+pub(crate) fn settled(mut lib: PublishedLibrary) -> PublishedLibrary {
+    crate::components::mark_layer_modes(Arc::make_mut(&mut lib.doc));
+    lib
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 fn read_file(path: &str) -> std::result::Result<PublishedLibrary, String> {
-    let f = std::fs::File::open(path).map_err(|e| format!("{path}: {e}"))?;
+    let f = crate::file_access::open(path).map_err(|e| e.to_string())?;
     match figcraft_format::read_library(std::io::BufReader::new(f)) {
-        Ok(Some(lib)) => Ok(lib),
+        Ok(Some(lib)) => Ok(settled(lib)),
         Ok(None) => Err(format!("{path} has no published library: open it and publish it first (Libraries ▸ Publish library…)")),
         Err(e) => Err(format!("{path}: {e}")),
     }
@@ -1221,9 +1262,16 @@ pub fn check_read_only(cmd: &str, before: &Document, after: &Document) -> std::r
     if !variables_unchanged(before, after) {
         return Err(READ_ONLY.into());
     }
-    let Some(store) = after.library_store().or_else(|| before.library_store()) else { return Ok(()) };
-    let touched = |d: &Document, id: NodeId| d.contains(id) && d.page_of(id) == Some(store);
-    if after.dirty().iter().any(|id| touched(before, *id) || touched(after, *id)) {
+    let changed_remote = |id| {
+        if !before.is_remote(id) && !after.is_remote(id) {
+            return false;
+        }
+        match (before.node_arc(id), after.node_arc(id)) {
+            (Some(old), Some(new)) => !Arc::ptr_eq(old, new),
+            _ => true,
+        }
+    };
+    if after.dirty().iter().any(|id| changed_remote(*id)) {
         return Err(READ_ONLY.into());
     }
     Ok(())
@@ -1283,5 +1331,4 @@ pub fn published_variables(lib: &PublishedLibrary) -> impl Iterator<Item = &Vari
 }
 
 #[cfg(test)]
-#[path = "library_tests.rs"]
 mod tests;
diff --git a/crates/engine/src/library_tests.rs b/crates/engine/src/assets/library/tests.rs
similarity index 87%
rename from crates/engine/src/library_tests.rs
rename to crates/engine/src/assets/library/tests.rs
index 23d5af09..27c9e616 100644
--- a/crates/engine/src/library_tests.rs
+++ b/crates/engine/src/assets/library/tests.rs
@@ -45,6 +45,38 @@ fn path_str(p: &std::path::Path) -> String {
     p.to_string_lossy().into_owned()
 }
 
+fn dirty_library_document() -> (Document, NodeId) {
+    let mut doc = Document::new("Dirty library cache");
+    let store = doc.ensure_library_store();
+    let remote = doc.alloc_id();
+    doc.insert(Node::new(remote, NodeKind::Frame, "Remote", 10.0, 10.0), store, None).unwrap();
+    (doc, remote)
+}
+
+/// An imported cache is dirty until the first edit; that alone is no edit of the library copies.
+#[test]
+fn read_only_allows_unchanged_predirty_remote_nodes() {
+    let (before, remote) = dirty_library_document();
+    assert!(before.dirty().contains(&remote));
+
+    let mut after = before.clone();
+    after.add_page("Unrelated page");
+    assert!(after.dirty().contains(&remote), "the imported remote node remains in the pending dirty set");
+    check_read_only("page.add", &before, &after).unwrap();
+
+    let mut edited = before.clone();
+    edited.get_mut(remote).unwrap().opacity = 0.5;
+    assert_eq!(check_read_only("node.set", &before, &edited), Err(READ_ONLY.into()));
+
+    let mut moved = before.clone();
+    moved.reparent(remote, before.first_page().unwrap(), None).unwrap();
+    assert_eq!(check_read_only("node.reparent", &before, &moved), Err(READ_ONLY.into()));
+
+    let mut deleted = before.clone();
+    deleted.remove(remote).unwrap();
+    assert_eq!(check_read_only("edit.delete", &before, &deleted), Err(READ_ONLY.into()));
+}
+
 /// The library file's layers.
 struct Kit {
     button: NodeId,
@@ -179,8 +211,16 @@ fn add_place_and_update_keep_overrides() {
         NodeKind::Instance { component, .. } => component,
         _ => panic!("not an instance"),
     };
+    let unchanged = s.doc().unwrap().clone();
     let e = s.execute("node.set", &json!({"id": remote_button, "props": {"fill": "#ff0000"}})).unwrap_err();
     assert!(e.to_string().contains("can't be edited"), "{e}");
+    assert_eq!(s.doc().unwrap(), &unchanged, "a refused remote edit rolls back");
+    for (cmd, args) in
+        [("node.reparent", json!({"ids": [remote_button], "parent": s.page().unwrap()})), ("edit.delete", json!({"ids": [remote_button]}))]
+    {
+        assert!(s.execute(cmd, &args).is_err(), "{cmd} must preserve read-only copies");
+        assert_eq!(s.doc().unwrap(), &unchanged, "refused {cmd} rolls back");
+    }
     let style = s.doc().unwrap().styles[0].id.clone();
     assert!(s.execute("style.update", &json!({"style": style, "name": "Mine"})).is_err());
     assert!(s.execute("style.delete", &json!({"style": style})).is_err());
@@ -281,10 +321,16 @@ fn library_styles_apply_and_import_with_pages() {
     let copy = doc.nodes().find(|n| n.name == node(&s, inst).name && matches!(n.kind, NodeKind::Instance { .. }) && !doc.is_remote(n.id)).unwrap();
     let NodeKind::Instance { component, .. } = copy.kind else { panic!("not an instance") };
     assert!(doc.is_remote(component));
+    let store_roots = |s: &Session| {
+        let doc = s.doc().unwrap();
+        doc.library_store().and_then(|id| doc.node(id)).map_or(0, |n| n.children.len())
+    };
+    assert_eq!(store_roots(&t), 2, "recorded copies are not copied twice");
     // A second import shares the copies it already has.
     ex(&mut t, "file.import", json!({"path": path}));
     healthy(&t);
     assert_eq!(t.doc().unwrap().libraries.components.len(), 2);
+    assert_eq!(store_roots(&t), 2);
     let _ = std::fs::remove_dir_all(&d);
 }
 
@@ -399,3 +445,21 @@ fn library_survives_saving_with_versions() {
     healthy(&user);
     let _ = std::fs::remove_dir_all(&d);
 }
+
+#[test]
+fn a_file_stamp_from_the_moment_it_was_read_does_not_prove_it_unchanged() {
+    use std::time::{Duration, SystemTime};
+    let read_at = SystemTime::now();
+    let entry = |modified: SystemTime| Entry {
+        stamp: Some(Stamp { len: 10, modified: Some(modified) }),
+        read_at: Some(read_at),
+        result: Err("unused".into()),
+    };
+    // Written in the same coarse tick as the read: a same-length rewrite would keep this stamp.
+    let fresh = entry(read_at);
+    assert!(!fresh.still_valid(&Stamp { len: 10, modified: Some(read_at) }));
+    // Written well before the read: an unchanged stamp means an unchanged file.
+    let old = read_at - Duration::from_secs(10);
+    assert!(entry(old).still_valid(&Stamp { len: 10, modified: Some(old) }));
+    assert!(!entry(old).still_valid(&Stamp { len: 11, modified: Some(old) }));
+}
diff --git a/crates/engine/src/library_server.rs b/crates/engine/src/assets/library_server.rs
similarity index 94%
rename from crates/engine/src/library_server.rs
rename to crates/engine/src/assets/library_server.rs
index dbd97a0b..b9dbce47 100644
--- a/crates/engine/src/library_server.rs
+++ b/crates/engine/src/assets/library_server.rs
@@ -53,7 +53,7 @@ pub fn archive(lib: &PublishedLibrary) -> Result<Vec<u8>> {
 /// The library in an archive from a server (untrusted: read with the library file's limits).
 pub fn read_archive(bytes: &[u8]) -> std::result::Result<PublishedLibrary, String> {
     match figcraft_format::read_library(Cursor::new(bytes)) {
-        Ok(Some(lib)) => Ok(lib),
+        Ok(Some(lib)) => Ok(crate::library::settled(lib)),
         Ok(None) => Err("the server sent a file without a library".into()),
         Err(e) => Err(format!("the server sent a library that can't be read ({e})")),
     }
@@ -129,6 +129,13 @@ impl Session {
     /// document uses the library.
     pub fn fetch_library(&mut self, path: &str, fresh: bool) -> Result<Arc<PublishedLibrary>> {
         if !is_server_link(path) {
+            // A library link is stored in the document, so opening someone else's file would
+            // otherwise reach whatever path it names. Only a path on this computer is followed: a
+            // network share would make opening a document contact that server, and on Windows
+            // send the credentials of whoever opened it.
+            if !craft_docpath::is_local(path) {
+                return Err(EngineError::Other(format!("{path}: a library is opened only from this computer")));
+            }
             return self.libraries.load(path);
         }
         let have = match self.libraries.cached(path) {
@@ -205,5 +212,4 @@ impl Session {
 }
 
 #[cfg(test)]
-#[path = "library_server_tests.rs"]
 mod tests;
diff --git a/crates/engine/src/library_server_tests.rs b/crates/engine/src/assets/library_server/tests.rs
similarity index 100%
rename from crates/engine/src/library_server_tests.rs
rename to crates/engine/src/assets/library_server/tests.rs
diff --git a/crates/engine/src/library_swap.rs b/crates/engine/src/assets/library_swap.rs
similarity index 99%
rename from crates/engine/src/library_swap.rs
rename to crates/engine/src/assets/library_swap.rs
index de709b10..1220d24c 100644
--- a/crates/engine/src/library_swap.rs
+++ b/crates/engine/src/assets/library_swap.rs
@@ -245,5 +245,4 @@ pub fn swap_library(doc: &mut Document, from: &str, to: &PublishedLibrary) -> Re
 }
 
 #[cfg(test)]
-#[path = "library_swap_tests.rs"]
 mod tests;
diff --git a/crates/engine/src/library_swap_tests.rs b/crates/engine/src/assets/library_swap/tests.rs
similarity index 100%
rename from crates/engine/src/library_swap_tests.rs
rename to crates/engine/src/assets/library_swap/tests.rs
diff --git a/crates/engine/src/playground.rs b/crates/engine/src/assets/playground.rs
similarity index 88%
rename from crates/engine/src/playground.rs
rename to crates/engine/src/assets/playground.rs
index 4ba2d3e5..c41aa942 100644
--- a/crates/engine/src/playground.rs
+++ b/crates/engine/src/assets/playground.rs
@@ -52,7 +52,7 @@ pub fn specs() -> Vec<CommandSpec> {
     vec![spec!(
         "component.playground",
         "Component playground",
-        "{id? (an instance, a component or a component set; default the selection), properties? {name: value} (variant, boolean, text and instance-swap properties, as instance.setProperties takes them), language? css|html|react|leptos|swiftui|compose|flutter (default react), path? (write the preview there as a PNG), scale? (the PNG's, default 2)} → {component, properties: [{name, type, options?, value}], language, code, width, height, path?}  the component with those property values, tried on a copy: its code and its look. Nothing in the document changes",
+        "{id? (an instance, a component or a component set; default the selection), properties? {name: value} (variant, boolean, text and instance-swap properties, as instance.setProperties takes them), language? css|html|react|leptos|vue|swiftui|compose|arkui|flutter (default react), path? (write the preview there as a PNG), scale? (the PNG's, default 2)} → {component, properties: [{name, type, options?, value}], language, code, width, height, path?}  the component with those property values, tried on a copy: its code and its look. Nothing in the document changes",
         false,
         |s, p| {
             let cmd = "component.playground";
@@ -63,7 +63,7 @@ pub fn specs() -> Vec<CommandSpec> {
                 Some(_) => return Err(bad(cmd, "properties: {name: value}")),
             };
             let lang = match string(p, "language") {
-                Some(l) => CodeLang::from_id(&l).ok_or_else(|| bad(cmd, "language: css|html|react|leptos|swiftui|compose|flutter"))?,
+                Some(l) => CodeLang::from_id(&l).ok_or_else(|| bad(cmd, "language: css|html|react|leptos|vue|swiftui|compose|arkui|flutter"))?,
                 None => CodeLang::React,
             };
             let (copy, inst) = build(s.doc()?, target, &values)?;
@@ -75,7 +75,7 @@ pub fn specs() -> Vec<CommandSpec> {
             if let Some(path) = string(p, "path") {
                 let scale = num(p, "scale").filter(|k| k.is_finite()).map_or(2.0, |k| k.clamp(0.01, 16.0));
                 let png = crate::cmd::file::export_bytes(&copy, &[inst], ExportFormat::Png, scale)?;
-                std::fs::write(&path, png).map_err(|e| EngineError::Other(format!("{path}: {e}")))?;
+                crate::file_access::write(&path, &png)?;
                 out["path"] = json!(path);
             }
             Ok(out)
diff --git a/crates/engine/src/style_vars.rs b/crates/engine/src/assets/style_vars.rs
similarity index 88%
rename from crates/engine/src/style_vars.rs
rename to crates/engine/src/assets/style_vars.rs
index 97226aed..b2e5c182 100644
--- a/crates/engine/src/style_vars.rs
+++ b/crates/engine/src/assets/style_vars.rs
@@ -42,6 +42,29 @@ pub fn field_type(kind: &StyleKind, key: &str) -> Option<VariableType> {
     }
 }
 
+/// The variable scopes a picker offers for `key` of a style of `kind`: a variable scoped to any one
+/// of them fits. A paint style's colors take fill and stroke variables, an effect style's fields
+/// take effect variables, and a text style's fields take the variables of their font property.
+/// None when every variable of the field's type fits (a grid's fields, as on layers) or the style
+/// has no such field.
+pub fn field_scopes(kind: &StyleKind, key: &str) -> Option<&'static [&'static str]> {
+    field_type(kind, key)?;
+    Some(match (kind, list_binding(key)) {
+        (StyleKind::Paint { .. }, _) => &["FRAME_FILL", "SHAPE_FILL", "TEXT_FILL", "STROKE_COLOR"],
+        (StyleKind::Effect { .. }, Some((_, _, "color"))) => &["EFFECT_COLOR"],
+        (StyleKind::Effect { .. }, _) => &["EFFECT_FLOAT"],
+        (StyleKind::Text { .. }, _) => match key {
+            "fontSize" => &["FONT_SIZE"],
+            "lineHeight" => &["LINE_HEIGHT"],
+            "letterSpacing" => &["LETTER_SPACING"],
+            "fontFamily" => &["FONT_FAMILY"],
+            "fontStyle" => &["FONT_STYLE"],
+            _ => return None,
+        },
+        _ => return None,
+    })
+}
+
 /// The key a style stores a binding of `key` under: the first paint's colour has one spelling.
 pub fn canonical(key: &str) -> String {
     match list_binding(key) {
diff --git a/crates/engine/src/assets/token_roles.rs b/crates/engine/src/assets/token_roles.rs
new file mode 100644
index 00000000..3827ecbe
--- /dev/null
+++ b/crates/engine/src/assets/token_roles.rs
@@ -0,0 +1,99 @@
+//! What a file's number variables measure, so exported tokens carry the right unit: a radius,
+//! font size, spacing or other length is in pixels, opacity and font weight are bare numbers.
+//! A number's role comes from the layer fields bound to it, else its scopes, and an alias target
+//! with no role of its own takes the role of the variables that read it (the target of an opacity
+//! alias stays unitless). A number nothing tells about is a length: design tokens mostly are.
+
+use std::collections::HashMap;
+
+use figcraft_doc::{Document, Variable, VariableId, VariableType, VariableValue};
+
+use crate::codegen::num;
+
+/// What a number variable measures.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum NumberRole {
+    Radius,
+    FontSize,
+    Spacing,
+    /// Another length (stroke, line height, letter spacing, effects): pixels.
+    Length,
+    /// Opacity or font weight: no unit.
+    Unitless,
+}
+
+fn role_of_field(field: &str) -> Option<NumberRole> {
+    Some(match field {
+        "cornerRadius" | "topLeftRadius" | "topRightRadius" | "bottomRightRadius" | "bottomLeftRadius" => NumberRole::Radius,
+        "fontSize" => NumberRole::FontSize,
+        "opacity" | "fontWeight" => NumberRole::Unitless,
+        f if f == "gap" || f == "counterAxisSpacing" || f.starts_with("padding") || f == "width" || f == "height" => NumberRole::Spacing,
+        f if f.starts_with("min") || f.starts_with("max") => NumberRole::Spacing,
+        "strokeWeight" | "lineHeight" | "letterSpacing" | "paragraphSpacing" | "paragraphIndent" => NumberRole::Length,
+        _ => return None,
+    })
+}
+
+fn role_of_scope(scope: &str) -> Option<NumberRole> {
+    Some(match scope {
+        "CORNER_RADIUS" => NumberRole::Radius,
+        "FONT_SIZE" => NumberRole::FontSize,
+        "GAP" | "WIDTH_HEIGHT" => NumberRole::Spacing,
+        "OPACITY" | "FONT_WEIGHT" => NumberRole::Unitless,
+        "STROKE_FLOAT" | "EFFECT_FLOAT" | "LINE_HEIGHT" | "LETTER_SPACING" | "PARAGRAPH_SPACING" | "PARAGRAPH_INDENT" => NumberRole::Length,
+        _ => return None,
+    })
+}
+
+/// The roles of a file's number variables, computed once per export.
+#[derive(Default)]
+pub struct Roles(HashMap<VariableId, NumberRole>);
+
+impl Roles {
+    pub fn new(doc: &Document) -> Self {
+        let vars = &doc.variables.variables;
+        let mut roles: HashMap<VariableId, NumberRole> = HashMap::new();
+        for n in doc.nodes() {
+            for (field, id) in &n.bound {
+                if let Some(r) = role_of_field(field) {
+                    roles.entry(id.clone()).or_insert(r);
+                }
+            }
+        }
+        for v in vars.iter().filter(|v| v.kind == VariableType::Number) {
+            if let Some(r) = v.scopes.as_ref().and_then(|s| s.iter().find_map(|s| role_of_scope(s))) {
+                roles.entry(v.id.clone()).or_insert(r);
+            }
+        }
+        // Until a pass adds nothing: each pass adds a role or stops, so this ends within one pass
+        // per variable, however long a chain is.
+        loop {
+            let mut changed = false;
+            for v in vars {
+                let Some(r) = roles.get(&v.id).copied() else { continue };
+                for value in v.values.values() {
+                    if let VariableValue::Alias(target) = value
+                        && !roles.contains_key(target)
+                    {
+                        roles.insert(target.clone(), r);
+                        changed = true;
+                    }
+                }
+            }
+            if !changed {
+                break;
+            }
+        }
+        Roles(roles)
+    }
+
+    /// What `v` measures; a number nothing tells about is a length.
+    pub fn role(&self, v: &Variable) -> NumberRole {
+        self.0.get(&v.id).copied().unwrap_or(NumberRole::Length)
+    }
+
+    /// A number variable's CSS value: pixels for lengths, bare for opacity and font weight.
+    pub fn number_css(&self, v: &Variable, x: f64) -> String {
+        if self.role(v) == NumberRole::Unitless { num(x) } else { format!("{}px", num(x)) }
+    }
+}
diff --git a/crates/engine/src/automation.rs b/crates/engine/src/automation.rs
new file mode 100644
index 00000000..acf11e5c
--- /dev/null
+++ b/crates/engine/src/automation.rs
@@ -0,0 +1,5 @@
+pub mod batch;
+pub mod doc_urls;
+pub mod file_access;
+pub mod inspect;
+pub mod params;
diff --git a/crates/engine/src/automation/batch.rs b/crates/engine/src/automation/batch.rs
new file mode 100644
index 00000000..5c4550ec
--- /dev/null
+++ b/crates/engine/src/automation/batch.rs
@@ -0,0 +1,192 @@
+//! Step references in `command.batch`: a step's params can use what an earlier step returned.
+//!
+//! `{"$step": n}` stands for the `id` in the result of step `n` (zero-based), and `{"$ref": "name"}`
+//! for the `id` in the result of the step that called itself `name` with `"as": "name"`. Either
+//! takes a `field`, a key of that result or a slash path into it (`ids/0`, `map/3`, `bounds/x`), the
+//! way `variable.bind` names `fills/0/color`. The CLI's script runner resolves its steps the same way.
+
+use std::collections::HashMap;
+
+use serde_json::{Map, Value};
+
+use crate::{Result, bad};
+
+/// Deepest params nesting the resolver walks before giving up.
+const MAX_DEPTH: usize = 64;
+
+/// One step of a batch: a command, its params and the name later steps can call it by.
+#[derive(Clone, Debug, PartialEq)]
+pub struct BatchStep {
+    pub command: String,
+    pub params: Value,
+    /// The step's `as`, for `{"$ref": name}` in later steps.
+    pub name: Option<String>,
+}
+
+impl BatchStep {
+    /// A step without a name.
+    pub fn new(command: impl Into<String>, params: Value) -> Self {
+        Self { command: command.into(), params, name: None }
+    }
+}
+
+/// A step's `as` (`step` is its index, for the error): `None` when it has none.
+pub fn step_name(step: usize, json: &Value) -> Result<Option<String>> {
+    match json.get("as") {
+        None | Some(Value::Null) => Ok(None),
+        Some(Value::String(name)) if !name.is_empty() => Ok(Some(name.clone())),
+        Some(_) => Err(bad("command.batch", format!("step {step}: `as` must be a name (a non-empty string)"))),
+    }
+}
+
+/// The steps of one batch run so far: their results, and which step each `as` name belongs to.
+/// A nested `command.batch` step gets its own scope, so its references are to its own steps.
+#[derive(Clone, Debug, Default)]
+pub struct BatchScope {
+    names: HashMap<String, usize>,
+    results: Vec<Value>,
+}
+
+impl BatchScope {
+    /// The scope for running `steps`. Two steps with the same name fail here, before any step runs.
+    pub fn new(steps: &[BatchStep]) -> Result<Self> {
+        let mut names = HashMap::new();
+        for (i, step) in steps.iter().enumerate() {
+            let Some(name) = &step.name else { continue };
+            if let Some(first) = names.insert(name.clone(), i) {
+                return Err(bad("command.batch", format!("step {i}: `as` \"{name}\" is already step {first}'s name")));
+            }
+        }
+        Ok(Self { names, results: Vec::with_capacity(steps.len()) })
+    }
+
+    /// The results of the steps run so far, in order.
+    pub fn results(&self) -> &[Value] {
+        &self.results
+    }
+
+    pub fn into_results(self) -> Vec<Value> {
+        self.results
+    }
+
+    /// The index of the step that runs next.
+    pub fn next_step(&self) -> usize {
+        self.results.len()
+    }
+
+    pub(crate) fn push(&mut self, result: Value) {
+        self.results.push(result);
+    }
+
+    /// `params` of the next step with every reference in it replaced.
+    pub(crate) fn resolve(&self, params: &Value) -> Result<Value> {
+        self.resolve_in(params, 0)
+    }
+
+    fn resolve_in(&self, v: &Value, depth: usize) -> Result<Value> {
+        let step = self.next_step();
+        if depth > MAX_DEPTH {
+            return Err(bad("command.batch", format!("step {step}: params nest deeper than {MAX_DEPTH} levels")));
+        }
+        match v {
+            Value::Object(o) if o.contains_key("$step") || o.contains_key("$ref") => self.reference(o),
+            Value::Object(o) => {
+                let mut out = Map::with_capacity(o.len());
+                for (k, x) in o {
+                    out.insert(k.clone(), self.resolve_in(x, depth + 1)?);
+                }
+                Ok(Value::Object(out))
+            }
+            Value::Array(a) => a.iter().map(|x| self.resolve_in(x, depth + 1)).collect::<Result<Vec<_>>>().map(Value::Array),
+            _ => Ok(v.clone()),
+        }
+    }
+
+    /// The value a `{"$step": n}` or `{"$ref": "name"}` object (with an optional `field`) stands for.
+    fn reference(&self, o: &Map<String, Value>) -> Result<Value> {
+        let step = self.next_step();
+        let fail = |msg: String| bad("command.batch", format!("step {step}: {msg}"));
+        let key = if o.contains_key("$step") { "$step" } else { "$ref" };
+        if let Some(k) = o.keys().find(|k| *k != key && *k != "field") {
+            return Err(fail(format!("a `{key}` reference takes only `field`, not `{k}`")));
+        }
+        let (n, who) = if key == "$step" {
+            let n = o.get("$step").and_then(Value::as_u64).ok_or_else(|| fail("`$step` must be a step index (0, 1, …)".into()))?;
+            let n = usize::try_from(n).ok().filter(|n| *n < step).ok_or_else(|| {
+                let range = if step == 0 { "there is none before step 0".to_string() } else { format!("0 to {}", step - 1) };
+                fail(format!("`$step` {n} must be an earlier step ({range})"))
+            })?;
+            (n, format!("step {n}"))
+        } else {
+            let name = o.get("$ref").and_then(Value::as_str).ok_or_else(|| fail("`$ref` must be a step name (a string)".into()))?;
+            let n = *self.names.get(name).ok_or_else(|| fail(format!("`$ref` \"{name}\" names no step ({})", self.known_names())))?;
+            if n >= step {
+                return Err(fail(format!("`$ref` \"{name}\" is step {n}, not an earlier step")));
+            }
+            (n, format!("step {n} (\"{name}\")"))
+        };
+        let path = match o.get("field") {
+            None => "id",
+            Some(Value::String(f)) => f.as_str(),
+            Some(_) => return Err(fail("`field` must be a string".into())),
+        };
+        let result = self.results.get(n).ok_or_else(|| fail(format!("{who} has no result")))?;
+        lookup(result, path).cloned().map_err(|why| fail(format!("{who}'s result has no `{path}`{why}")))
+    }
+
+    fn known_names(&self) -> String {
+        let mut names: Vec<_> = self.names.iter().collect();
+        names.sort_by_key(|(_, i)| **i);
+        if names.is_empty() {
+            return "no step has an `as` name".into();
+        }
+        let list: Vec<_> = names.iter().map(|(name, i)| format!("\"{name}\" is step {i}")).collect();
+        list.join(", ")
+    }
+}
+
+/// `path` in `v`: a key as written, else a slash path (`ids/0`, `bounds/x`; a leading `/` as in
+/// JSON Pointer is allowed). The error is the detail after "has no `path`".
+fn lookup<'a>(v: &'a Value, path: &str) -> std::result::Result<&'a Value, String> {
+    // A key as written first, so a key holding `/` still works as it did before paths.
+    if let Some(x) = v.get(path) {
+        return Ok(x);
+    }
+    let hint = if path.contains('.') && !path.contains('/') { " (paths use `/`, as in `ids/0`)" } else { "" };
+    walk(v, path.strip_prefix('/').unwrap_or(path)).map_err(|why| format!("{why}{hint}"))
+}
+
+fn walk<'a>(v: &'a Value, path: &str) -> std::result::Result<&'a Value, String> {
+    let mut cur = v;
+    let mut walked = String::new();
+    for seg in path.split('/') {
+        let here = if walked.is_empty() { "the result".to_string() } else { format!("`{walked}`") };
+        cur = match cur {
+            Value::Object(o) => o.get(seg).ok_or_else(|| if walked.is_empty() { String::new() } else { format!(": {here} has no `{seg}`") })?,
+            Value::Array(a) => match seg.parse::<usize>() {
+                Ok(i) => a.get(i).ok_or_else(|| {
+                    let items = if a.len() == 1 { "1 item".to_string() } else { format!("{} items", a.len()) };
+                    format!(": {here} has {items}")
+                })?,
+                Err(_) => return Err(format!(": {here} is a list, so `{seg}` must be an index (0, 1, …)")),
+            },
+            _ => return Err(format!(": {here} is {}", kind(cur))),
+        };
+        if !walked.is_empty() {
+            walked.push('/');
+        }
+        walked.push_str(seg);
+    }
+    Ok(cur)
+}
+
+fn kind(v: &Value) -> &'static str {
+    match v {
+        Value::Null => "null",
+        Value::Bool(_) => "a boolean",
+        Value::Number(_) => "a number",
+        Value::String(_) => "a string",
+        Value::Array(_) => "a list",
+        Value::Object(_) => "an object",
+    }
+}
diff --git a/crates/engine/src/automation/doc_urls.rs b/crates/engine/src/automation/doc_urls.rs
new file mode 100644
index 00000000..3b8417cd
--- /dev/null
+++ b/crates/engine/src/automation/doc_urls.rs
@@ -0,0 +1,48 @@
+//! Which URLs stored in a document may be handed to the browser or the system opener.
+//!
+//! A document can carry URLs that the app opens for whoever views it: a prototype's Open link
+//! action ([`crate::proto_run`]) and Dev Mode's dev resources ([`crate::dev_resources`]). Both end
+//! up at the platform's opener, so a document that someone else made chooses what that opener is
+//! asked to do. Only the schemes a browser would follow on a plain link are allowed:
+//!
+//! - `javascript:` runs script. In the web build the opener is `window.open`, which executes it in
+//!   the app's own origin, so a saved document becomes stored XSS.
+//! - `file:` and `smb:` reach the file system; on Windows a UNC host also sends credentials.
+//! - Windows hands `ms-…:` schemes to application handlers, and macOS and Linux hand unknown
+//!   schemes to whichever application registered them.
+//!
+//! The check is lexical and does no I/O. It is deliberately an allow-list: a deny-list of known
+//! dangerous schemes is outgrown by every new handler a platform adds.
+
+/// The schemes a URL stored in a document may use.
+const WEB_SCHEMES: [&str; 3] = ["http", "https", "mailto"];
+
+/// Whether `url`, stored in a document, may be opened.
+///
+/// Requires a scheme from [`WEB_SCHEMES`], compared ignoring ASCII case. A URL with no scheme is
+/// refused: the opener would resolve it against the app's own page on the web. Control characters
+/// are refused anywhere, because browsers ignore some of them inside a scheme (`java\tscript:`
+/// reaches a `javascript:` handler), and `http`/`https` must name a host.
+pub fn openable(url: &str) -> bool {
+    let url = url.trim();
+    if url.is_empty() || url.chars().any(char::is_control) {
+        return false;
+    }
+    let Some((scheme, rest)) = url.split_once(':') else { return false };
+    // An RFC 3986 scheme, so a stray colon in text cannot look like one.
+    let mut chars = scheme.chars();
+    if !chars.next().is_some_and(|c| c.is_ascii_alphabetic()) || !chars.all(|c| c.is_ascii_alphanumeric() || matches!(c, '+' | '-' | '.')) {
+        return false;
+    }
+    if !WEB_SCHEMES.iter().any(|s| scheme.eq_ignore_ascii_case(s)) {
+        return false;
+    }
+    if scheme.eq_ignore_ascii_case("mailto") {
+        // `mailto:` names an address.
+        return !rest.is_empty();
+    }
+    // `http` and `https` name a host, so the authority is required: `http:x` is not a web link,
+    // and `http:///p` has no host.
+    let Some(after) = rest.strip_prefix("//") else { return false };
+    !after.is_empty() && !after.starts_with('/')
+}
diff --git a/crates/engine/src/automation/file_access.rs b/crates/engine/src/automation/file_access.rs
new file mode 100644
index 00000000..f741e21c
--- /dev/null
+++ b/crates/engine/src/automation/file_access.rs
@@ -0,0 +1,309 @@
+//! Automation roots (#715): the folders the files an agent's commands read and write must lie in.
+//!
+//! `figcraft-cli mcp --automation-read-root DIR --automation-write-root DIR` and the desktop app
+//! started with the same flags run their work [`confined`] to [`Roots`]: while a scope is active on
+//! the thread, every file the engine reads must lie inside a read or a write root and every file it
+//! writes inside a write root; anything else is an ordinary error. The engine reaches the file
+//! system only through this module (`crates/engine/clippy.toml` denies `std::fs` and friends
+//! anywhere else), so every command, present or future, is covered. Without a scope nothing changes.
+//!
+//! A path is made absolute against the working directory and resolved before it is compared: its
+//! links are followed (`std::fs::canonicalize`), and for a file that doesn't exist yet its nearest
+//! existing folder is resolved and the rest must be plain names. The comparison is by whole
+//! components (`/work2` is not inside `/work`), and the I/O uses the resolved path, so what was
+//! checked is what is opened.
+#![allow(clippy::disallowed_methods)]
+
+use std::cell::RefCell;
+use std::ffi::{OsStr, OsString};
+use std::path::{Component, Path, PathBuf};
+use std::sync::Arc;
+
+use crate::{EngineError, Result};
+
+/// What a command does with a file.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Access {
+    Read,
+    Write,
+}
+
+/// The folders automation may read (read and write roots) and write (write roots), resolved.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Roots {
+    read: Vec<PathBuf>,
+    write: Vec<PathBuf>,
+}
+
+impl Roots {
+    /// Roots from the folders given (relative ones against the working directory). Each must be an
+    /// existing folder.
+    pub fn new(read: &[String], write: &[String]) -> std::result::Result<Self, String> {
+        let resolve = |flag: &str, dirs: &[String]| {
+            dirs.iter()
+                .map(|d| match std::fs::canonicalize(d) {
+                    Ok(p) if p.is_dir() => Ok(p),
+                    Ok(_) => Err(format!("{flag} {d}: not a folder")),
+                    Err(e) => Err(format!("{flag} {d}: {e}")),
+                })
+                .collect::<std::result::Result<Vec<_>, String>>()
+        };
+        Ok(Self { read: resolve("--automation-read-root", read)?, write: resolve("--automation-write-root", write)? })
+    }
+
+    /// The resolved path to use for `access` to `path`, or why it is refused.
+    pub fn check(&self, path: &Path, access: Access) -> std::result::Result<PathBuf, String> {
+        let asked = path.display();
+        let (roots, what) = match access {
+            Access::Read => ([self.read.as_slice(), self.write.as_slice()].concat(), "read"),
+            Access::Write => (self.write.clone(), "written"),
+        };
+        match resolve(path) {
+            Ok(resolved) if roots.iter().any(|r| resolved.starts_with(r)) => return Ok(resolved),
+            Ok(_) => {}
+            // Why a path can't be resolved says what exists there: only told for paths inside a root.
+            Err(why) if inside_as_far_as_it_exists(path, &roots) => return Err(format!("automation path rejected: {asked}: {why}")),
+            Err(_) => {}
+        }
+        if roots.is_empty() {
+            return Err(format!("automation path rejected: no folder may be {what} (no root for it was given): {asked}"));
+        }
+        let shown: Vec<String> = roots.iter().map(|r| shown(r)).collect();
+        Err(format!("automation path rejected: {asked} is outside the folders that may be {what}: {}", shown.join(", ")))
+    }
+
+    /// The folders as JSON, resolved: `{read: [every folder that may be read], write: [the write roots]}`.
+    pub fn to_json(&self) -> serde_json::Value {
+        let list = |v: &[PathBuf]| v.iter().map(|p| shown(p)).collect::<Vec<_>>();
+        serde_json::json!({"read": list(&[self.read.as_slice(), self.write.as_slice()].concat()), "write": list(&self.write)})
+    }
+}
+
+/// Whether `path` lies in one of `roots` once made absolute with its `.` and `..` taken by name and
+/// its longest leading part that exists resolved, so links on the way are followed as the roots'
+/// were (`/tmp/work/x` is inside root `/private/tmp/work`, a link out of a root leads out of it).
+fn inside_as_far_as_it_exists(path: &Path, roots: &[PathBuf]) -> bool {
+    let Ok(abs) = std::path::absolute(path) else { return false };
+    let mut lexical = PathBuf::new();
+    for c in abs.components() {
+        match c {
+            Component::ParentDir => {
+                lexical.pop();
+            }
+            Component::CurDir => {}
+            c => lexical.push(c),
+        }
+    }
+    let mut rest: Vec<&OsStr> = Vec::new();
+    let mut at = lexical.as_path();
+    let resolved = loop {
+        if let Ok(mut base) = std::fs::canonicalize(at) {
+            base.extend(rest.iter().rev());
+            break base;
+        }
+        let (Some(name), Some(parent)) = (at.file_name(), at.parent()) else { return false };
+        rest.push(name);
+        at = parent;
+    };
+    roots.iter().any(|r| resolved.starts_with(r))
+}
+
+/// Whether `path` lies in the app's own folder `folder`, both resolved (links and `..` followed);
+/// false when either can't be resolved.
+#[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+pub(crate) fn within_app_folder(path: &Path, folder: &Path) -> bool {
+    matches!((std::fs::canonicalize(path), std::fs::canonicalize(folder)), (Ok(p), Ok(f)) if p.starts_with(&f))
+}
+
+pub fn same_file(a: impl AsRef<Path>, b: impl AsRef<Path>) -> bool {
+    let (a, b) = (a.as_ref(), b.as_ref());
+    a == b || same_file::is_same_file(a, b).unwrap_or(false)
+}
+
+/// `p` without Windows' `\\?\` prefix, for messages.
+fn shown(p: &Path) -> String {
+    let s = p.to_string_lossy();
+    match s.strip_prefix(r"\\?\UNC\") {
+        Some(unc) => format!(r"\\{unc}"),
+        None => s.strip_prefix(r"\\?\").unwrap_or(&s).to_string(),
+    }
+}
+
+/// `path` made absolute and resolved: links followed, and for a path that doesn't exist yet its
+/// nearest existing folder resolved with the rest appended (plain names only).
+fn resolve(path: &Path) -> std::result::Result<PathBuf, String> {
+    if path.as_os_str().is_empty() {
+        return Err("not a file path".into());
+    }
+    let abs = std::path::absolute(path).map_err(|e| e.to_string())?;
+    let mut rest: Vec<OsString> = Vec::new();
+    let mut at = abs.as_path();
+    loop {
+        match std::fs::canonicalize(at) {
+            Ok(mut base) => {
+                base.extend(rest.iter().rev());
+                return Ok(base);
+            }
+            Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
+                // Writing through a link that leads nowhere would create its target, wherever it is.
+                if std::fs::symlink_metadata(at).is_ok() {
+                    return Err("a link that leads nowhere".into());
+                }
+                match at.components().next_back() {
+                    Some(Component::Normal(name)) => {
+                        plain_name(name)?;
+                        rest.push(name.to_os_string());
+                    }
+                    Some(Component::CurDir) => {}
+                    _ => return Err("`..` (or a drive) below a folder that doesn't exist".into()),
+                }
+                at = at.parent().ok_or("no existing folder")?;
+            }
+            Err(e) => return Err(e.to_string()),
+        }
+    }
+}
+
+/// A name for a file or folder that doesn't exist yet: on Windows no device (`CON`, `NUL`, `COM1`…)
+/// and no alternate data stream (`a:b`).
+fn plain_name(name: &OsStr) -> std::result::Result<(), String> {
+    if cfg!(windows) {
+        let n = name.to_string_lossy();
+        let stem = n.split('.').next().unwrap_or_default().trim_end().to_ascii_uppercase();
+        let device = matches!(stem.as_str(), "CON" | "PRN" | "AUX" | "NUL" | "CONIN$" | "CONOUT$")
+            || ((stem.starts_with("COM") || stem.starts_with("LPT"))
+                && stem.chars().count() == 4
+                && stem.chars().last().is_some_and(|c| c.is_ascii_digit() || matches!(c, '¹' | '²' | '³')));
+        if device || n.contains(':') {
+            return Err(format!("`{n}` is a device or stream name, not a file"));
+        }
+    }
+    Ok(())
+}
+
+thread_local! {
+    static ROOTS: RefCell<Option<Arc<Roots>>> = const { RefCell::new(None) };
+}
+
+/// Run `f` with this thread's file access confined to `roots` (unchanged when `None`).
+pub fn confined<R>(roots: Option<&Arc<Roots>>, f: impl FnOnce() -> R) -> R {
+    match roots {
+        Some(roots) => scoped(Some(roots.clone()), f),
+        None => f(),
+    }
+}
+
+/// Run `f` unconfined: only for the app's own files, never for a path a command was given.
+// Only plugins read from disk use it, and the browser has no disk.
+#[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+pub(crate) fn app_owned<R>(f: impl FnOnce() -> R) -> R {
+    scoped(None, f)
+}
+
+fn scoped<R>(roots: Option<Arc<Roots>>, f: impl FnOnce() -> R) -> R {
+    /// Puts the outer scope's roots back, also when `f` panics.
+    struct Restore(Option<Arc<Roots>>);
+    impl Drop for Restore {
+        fn drop(&mut self) {
+            let outer = self.0.take();
+            ROOTS.with(|r| *r.borrow_mut() = outer);
+        }
+    }
+    let _restore = Restore(ROOTS.with(|r| std::mem::replace(&mut *r.borrow_mut(), roots)));
+    f()
+}
+
+/// The roots this thread's file access is confined to now, if any.
+pub fn current() -> Option<Arc<Roots>> {
+    ROOTS.with(|r| r.borrow().clone())
+}
+
+/// The path to use for `access` to `path`: resolved when confined, else as given.
+pub fn allow(path: impl AsRef<Path>, access: Access) -> Result<PathBuf> {
+    let path = path.as_ref();
+    match current() {
+        Some(roots) => roots.check(path, access).map_err(EngineError::Other),
+        None => Ok(path.to_path_buf()),
+    }
+}
+
+/// Whether `path` may be accessed so now.
+pub fn allowed(path: impl AsRef<Path>, access: Access) -> bool {
+    allow(path, access).is_ok()
+}
+
+fn io(path: &Path) -> impl Fn(std::io::Error) -> EngineError + '_ {
+    move |e| EngineError::Other(format!("{}: {e}", path.display()))
+}
+
+/// The bytes of file `path`.
+pub fn read(path: impl AsRef<Path>) -> Result<Vec<u8>> {
+    let path = path.as_ref();
+    std::fs::read(allow(path, Access::Read)?).map_err(io(path))
+}
+
+/// The bytes of file `path`, refused when it isn't a file or is larger than `max`.
+pub fn read_capped(path: impl AsRef<Path>, max: u64) -> Result<Vec<u8>> {
+    let path = path.as_ref();
+    let p = allow(path, Access::Read)?;
+    let meta = std::fs::metadata(&p).map_err(io(path))?;
+    if !meta.is_file() || meta.len() > max {
+        return Err(EngineError::Other(format!("{}: not a file of at most {max} bytes", path.display())));
+    }
+    std::fs::read(p).map_err(io(path))
+}
+
+/// File `path` opened for reading.
+pub fn open(path: impl AsRef<Path>) -> Result<std::fs::File> {
+    let path = path.as_ref();
+    std::fs::File::open(allow(path, Access::Read)?).map_err(io(path))
+}
+
+/// What the file system says about `path` (links followed).
+pub fn metadata(path: impl AsRef<Path>) -> Result<std::fs::Metadata> {
+    let path = path.as_ref();
+    std::fs::metadata(allow(path, Access::Read)?).map_err(io(path))
+}
+
+/// Whether `path` is a folder (false when it may not be read).
+pub fn is_dir(path: impl AsRef<Path>) -> bool {
+    metadata(path).is_ok_and(|m| m.is_dir())
+}
+
+/// Whether `path` exists (false when it may not be read).
+pub fn exists(path: impl AsRef<Path>) -> bool {
+    metadata(path).is_ok()
+}
+
+/// The paths of the entries of folder `path`.
+pub fn read_dir(path: impl AsRef<Path>) -> Result<Vec<PathBuf>> {
+    let path = path.as_ref();
+    let dir = allow(path, Access::Read)?;
+    Ok(std::fs::read_dir(&dir).map_err(io(path))?.flatten().map(|e| e.path()).collect())
+}
+
+/// Write `bytes` to `path` through a uniquely named staging file and one atomic rename (see
+/// [`figcraft_format::write_file_atomic`]).
+pub fn write(path: impl AsRef<Path>, bytes: &[u8]) -> Result<()> {
+    let path = path.as_ref();
+    write_atomic(&allow(path, Access::Write)?, bytes).map_err(io(path))
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn write_atomic(path: &Path, bytes: &[u8]) -> std::io::Result<()> {
+    figcraft_format::write_file_atomic(path, bytes)
+}
+
+#[cfg(target_arch = "wasm32")]
+fn write_atomic(_: &Path, _: &[u8]) -> std::io::Result<()> {
+    Err(std::io::Error::new(std::io::ErrorKind::Unsupported, "no file system in the browser"))
+}
+
+/// Create folder `path` and the folders above it that are missing.
+pub fn create_dir_all(path: impl AsRef<Path>) -> Result<()> {
+    let path = path.as_ref();
+    std::fs::create_dir_all(allow(path, Access::Write)?).map_err(io(path))
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/engine/src/automation/file_access/tests.rs b/crates/engine/src/automation/file_access/tests.rs
new file mode 100644
index 00000000..ba55e134
--- /dev/null
+++ b/crates/engine/src/automation/file_access/tests.rs
@@ -0,0 +1,388 @@
+//! Automation roots: how paths are resolved and compared, and that commands run confined can't
+//! reach past them.
+
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use serde_json::json;
+
+use super::{Access, Roots, allow, confined, current};
+use crate::Session;
+
+/// A fresh folder for one test: `<tmp>/figcraft-roots-<name>-<pid>`, holding `root/`, `root2/`
+/// (a sibling whose name starts like the root's) and `outside/`.
+struct Fixture(PathBuf);
+
+impl Fixture {
+    fn new(name: &str) -> Self {
+        let d = std::env::temp_dir().join(format!("figcraft-roots-{name}-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&d);
+        for sub in ["root/sub", "root2", "outside"] {
+            std::fs::create_dir_all(d.join(sub)).unwrap();
+        }
+        std::fs::write(d.join("root/in.txt"), b"in").unwrap();
+        std::fs::write(d.join("outside/secret.txt"), b"secret").unwrap();
+        Self(d)
+    }
+
+    fn p(&self, rel: &str) -> String {
+        self.0.join(rel).to_string_lossy().into_owned()
+    }
+
+    /// The root as both read and write root.
+    fn rw(&self) -> Roots {
+        Roots::new(&[], &[self.p("root")]).unwrap()
+    }
+}
+
+impl Drop for Fixture {
+    fn drop(&mut self) {
+        let _ = std::fs::remove_dir_all(&self.0);
+    }
+}
+
+#[cfg(unix)]
+fn symlink_dir(target: &Path, link: &Path) -> bool {
+    std::os::unix::fs::symlink(target, link).is_ok()
+}
+
+#[cfg(windows)]
+fn symlink_dir(target: &Path, link: &Path) -> bool {
+    std::os::windows::fs::symlink_dir(target, link).is_ok()
+}
+
+#[cfg(unix)]
+fn symlink_file(target: &Path, link: &Path) -> bool {
+    std::os::unix::fs::symlink(target, link).is_ok()
+}
+
+#[cfg(windows)]
+fn symlink_file(target: &Path, link: &Path) -> bool {
+    std::os::windows::fs::symlink_file(target, link).is_ok()
+}
+
+#[test]
+fn inside_is_allowed_and_resolved_outside_is_refused() {
+    let f = Fixture::new("inside");
+    let r = f.rw();
+    let got = r.check(Path::new(&f.p("root/in.txt")), Access::Read).unwrap();
+    assert_eq!(got, std::fs::canonicalize(f.p("root/in.txt")).unwrap(), "the I/O uses the resolved path");
+    assert!(r.check(Path::new(&f.p("root/new.png")), Access::Write).is_ok());
+    let e = r.check(Path::new(&f.p("outside/secret.txt")), Access::Read).unwrap_err();
+    assert!(e.starts_with("automation path rejected:") && e.contains("outside the folders that may be read"), "{e}");
+    assert!(r.check(Path::new(&f.p("outside/new.png")), Access::Write).is_err());
+    // The root itself is inside.
+    assert!(r.check(Path::new(&f.p("root")), Access::Read).is_ok());
+}
+
+#[test]
+fn a_sibling_whose_name_starts_like_the_root_is_outside() {
+    let f = Fixture::new("prefix");
+    let r = f.rw();
+    for p in ["root2/x.png", "root2", "root.png"] {
+        assert!(r.check(Path::new(&f.p(p)), Access::Write).is_err(), "{p}");
+        assert!(r.check(Path::new(&f.p(p)), Access::Read).is_err(), "{p}");
+    }
+}
+
+#[test]
+fn traversal_is_resolved_before_comparing() {
+    let f = Fixture::new("dots");
+    let r = f.rw();
+    assert!(r.check(Path::new(&f.p("root/sub/../../outside/secret.txt")), Access::Read).is_err());
+    assert!(r.check(Path::new(&f.p("root/sub/../../outside/new.txt")), Access::Write).is_err());
+    assert!(r.check(Path::new(&f.p("root/sub/../in.txt")), Access::Read).is_ok());
+    assert!(r.check(Path::new(&f.p("root/./sub/../new.txt")), Access::Write).is_ok());
+    // `..` below a folder that doesn't exist can't be resolved (on Windows it is taken lexically,
+    // as the system does, and stays inside).
+    let deep = f.p("root/missing/../../outside/x.txt");
+    assert!(r.check(Path::new(&deep), Access::Write).is_err(), "{deep}");
+}
+
+#[test]
+fn files_that_dont_exist_yet_resolve_through_their_nearest_folder() {
+    let f = Fixture::new("missing");
+    let r = f.rw();
+    let got = r.check(Path::new(&f.p("root/a/b/c.png")), Access::Write).unwrap();
+    assert_eq!(got, std::fs::canonicalize(f.p("root")).unwrap().join("a").join("b").join("c.png"));
+    assert!(r.check(Path::new(&f.p("outside/a/b/c.png")), Access::Write).is_err());
+}
+
+#[test]
+fn relative_paths_are_resolved_against_the_working_directory() {
+    // `cargo test` runs in the crate's folder, which holds Cargo.toml.
+    let cwd = std::env::current_dir().unwrap().to_string_lossy().into_owned();
+    let here = Roots::new(std::slice::from_ref(&cwd), &[]).unwrap();
+    assert_eq!(here.check(Path::new("Cargo.toml"), Access::Read).unwrap(), std::fs::canonicalize("Cargo.toml").unwrap());
+    assert!(here.check(Path::new("src/../Cargo.toml"), Access::Read).is_ok());
+    let f = Fixture::new("relative");
+    assert!(f.rw().check(Path::new("Cargo.toml"), Access::Read).is_err());
+    // Relative roots too.
+    assert_eq!(Roots::new(&[".".into()], &[]).unwrap(), here);
+}
+
+#[test]
+fn read_and_write_authority_are_separate() {
+    let f = Fixture::new("modes");
+    let read_only = Roots::new(&[f.p("root")], &[]).unwrap();
+    assert!(read_only.check(Path::new(&f.p("root/in.txt")), Access::Read).is_ok());
+    let e = read_only.check(Path::new(&f.p("root/out.png")), Access::Write).unwrap_err();
+    assert!(e.contains("no folder may be written"), "{e}");
+    // A write root may be read too; a read root elsewhere doesn't make it writable.
+    let both = Roots::new(&[f.p("outside")], &[f.p("root")]).unwrap();
+    assert!(both.check(Path::new(&f.p("root/in.txt")), Access::Read).is_ok());
+    assert!(both.check(Path::new(&f.p("outside/secret.txt")), Access::Read).is_ok());
+    assert!(both.check(Path::new(&f.p("outside/new.txt")), Access::Write).is_err());
+    // Several roots of each kind.
+    let many = Roots::new(&[f.p("root"), f.p("root2")], &[f.p("root2"), f.p("outside")]).unwrap();
+    assert!(many.check(Path::new(&f.p("outside/new.txt")), Access::Write).is_ok());
+    assert!(many.check(Path::new(&f.p("root/new.txt")), Access::Write).is_err());
+}
+
+#[test]
+fn roots_must_be_existing_folders() {
+    let f = Fixture::new("bad-roots");
+    assert!(Roots::new(&[f.p("nope")], &[]).unwrap_err().contains("--automation-read-root"));
+    assert!(Roots::new(&[], &[f.p("root/in.txt")]).unwrap_err().contains("not a folder"));
+    assert!(Roots::new(&[], &[String::new()]).is_err());
+    assert!(f.rw().check(Path::new(""), Access::Read).is_err());
+}
+
+#[test]
+fn links_that_lead_out_of_a_root_are_outside() {
+    let f = Fixture::new("links");
+    let r = f.rw();
+    if !symlink_dir(&f.0.join("outside"), &f.0.join("root/escape")) || !symlink_file(&f.0.join("outside/secret.txt"), &f.0.join("root/secret.txt")) {
+        eprintln!("skipped: this system doesn't let tests make symbolic links");
+        return;
+    }
+    assert!(r.check(Path::new(&f.p("root/escape/secret.txt")), Access::Read).is_err());
+    assert!(r.check(Path::new(&f.p("root/escape/new.txt")), Access::Write).is_err());
+    assert!(r.check(Path::new(&f.p("root/secret.txt")), Access::Read).is_err());
+    assert!(r.check(Path::new(&f.p("root/secret.txt")), Access::Write).is_err());
+    // A link that leads nowhere: writing through it would create its target.
+    assert!(symlink_file(&f.0.join("outside/not-yet.txt"), &f.0.join("root/dangling.txt")));
+    let e = r.check(Path::new(&f.p("root/dangling.txt")), Access::Write).unwrap_err();
+    assert!(e.contains("leads nowhere"), "{e}");
+    // A link inside the root to the root is fine.
+    assert!(symlink_dir(&f.0.join("root/sub"), &f.0.join("root/alias")));
+    assert!(r.check(Path::new(&f.p("root/alias/x.png")), Access::Write).is_ok());
+}
+
+#[cfg(windows)]
+#[test]
+fn windows_case_devices_and_streams() {
+    let f = Fixture::new("windows");
+    let r = f.rw();
+    // Case is taken from the disk: another spelling of the root is the root.
+    let upper = f.0.join("ROOT").join("IN.TXT");
+    assert!(r.check(&upper, Access::Read).is_ok());
+    for name in ["CON", "nul.txt", "Com1.png", "LPT9", "a.txt:stream", "conout$"] {
+        assert!(r.check(&f.0.join("root").join(name), Access::Write).is_err(), "{name}");
+    }
+    assert!(r.check(&f.0.join("root").join("console.png"), Access::Write).is_ok());
+    // The `\\?\` form of a path inside is inside; of a path outside, outside.
+    let verbatim = std::fs::canonicalize(f.p("root")).unwrap().join("v.png");
+    assert!(verbatim.to_string_lossy().starts_with(r"\\?\"));
+    assert!(r.check(&verbatim, Access::Write).is_ok());
+    assert!(r.check(&std::fs::canonicalize(f.p("outside")).unwrap().join("v.png"), Access::Write).is_err());
+    // Messages don't show the prefix.
+    let e = r.check(Path::new(&f.p("outside/x.png")), Access::Write).unwrap_err();
+    assert!(!e.contains(r"\\?\"), "{e}");
+}
+
+#[test]
+fn a_scope_confines_the_thread_and_ends_with_it() {
+    let f = Fixture::new("scope");
+    let roots = Arc::new(f.rw());
+    assert!(current().is_none());
+    confined(Some(&roots), || {
+        assert!(allow(f.p("outside/secret.txt"), Access::Read).is_err());
+        assert!(super::read(f.p("outside/secret.txt")).is_err());
+        assert_eq!(super::read(f.p("root/in.txt")).unwrap(), b"in");
+        // Not confined: the app's own files.
+        assert_eq!(super::app_owned(|| super::read(f.p("outside/secret.txt")).unwrap()), b"secret");
+        assert!(current().is_some(), "back in the scope after app_owned");
+        // Another thread isn't confined by this one's scope.
+        let p = f.p("outside/secret.txt");
+        assert!(std::thread::spawn(move || current().is_none() && allow(p, Access::Read).is_ok()).join().unwrap());
+    });
+    assert!(current().is_none());
+    assert!(allow(f.p("outside/secret.txt"), Access::Read).is_ok());
+    // A panic inside the scope still ends it.
+    let r = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| confined(Some(&roots), || panic!("boom"))));
+    assert!(r.is_err());
+    assert!(current().is_none());
+    // `None` changes nothing.
+    assert!(confined(None, || current().is_none()));
+}
+
+#[test]
+fn commands_run_confined_read_and_write_only_inside() {
+    let f = Fixture::new("commands");
+    std::fs::create_dir_all(f.0.join("outside/readable")).unwrap();
+    let roots = Arc::new(Roots::new(&[f.p("outside/readable")], &[f.p("root")]).unwrap());
+    // Unconfined, the outside is writable: the bait files a confined command must not reach.
+    let bait = f.p("outside/bait.figcraft");
+    let mut s = Session::new();
+    s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 20, "height": 10})).unwrap();
+    s.execute("file.saveAs", &json!({"path": bait})).unwrap();
+    std::fs::copy(&bait, f.0.join("outside/readable/ok.figcraft")).unwrap();
+    let mut s = Session::new();
+    s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 20, "height": 10})).unwrap();
+    s.prefs.recent_files = vec![bait.clone(), f.p("root/in.txt")];
+    confined(Some(&roots), || {
+        let e = s.execute("file.export", &json!({"format": "png", "path": f.p("outside/x.png")})).unwrap_err().to_string();
+        assert!(e.contains("automation path rejected"), "{e}");
+        assert!(s.execute("file.export", &json!({"format": "png", "path": f.p("root/x.png")})).is_ok());
+        assert!(s.execute("file.exportLayers", &json!({"dir": f.p("outside/layers")})).is_err());
+        assert!(s.execute("file.open", &json!({"path": bait})).is_err());
+        assert!(s.execute("file.import", &json!({"path": bait})).is_err());
+        assert!(s.execute("file.placeImage", &json!({"path": f.p("outside/secret.txt")})).is_err());
+        assert!(s.execute("file.open", &json!({"path": f.p("outside/readable/ok.figcraft")})).is_ok(), "read roots may be read");
+        assert!(s.execute("file.save", &json!({})).is_err(), "but not written");
+        assert!(s.execute("file.saveAs", &json!({"path": f.p("root/ok.figcraft")})).is_ok());
+        // Recent files outside the roots aren't listed.
+        let recent = s.execute("file.openRecent", &json!({})).unwrap().to_string();
+        assert!(!recent.contains("bait") && recent.contains("in.txt"), "{recent}");
+        assert!(s.execute("file.openRecent", &json!({"path": bait})).is_err());
+    });
+    assert!(f.0.join("root/x.png").is_file() && !f.0.join("outside/x.png").exists() && !f.0.join("outside/layers").exists());
+}
+
+/// Every command, given paths outside the roots in its usual path parameters, writes nothing
+/// there and opens nothing from there: they all reach files through `file_access`.
+#[test]
+fn no_command_reaches_outside_the_roots() {
+    let f = Fixture::new("sweep");
+    let roots = Arc::new(f.rw());
+    let outside = f.0.join("outside");
+    // Bait the sweep could pick up: a document, an SVG, a PNG and variables JSON, each holding a
+    // name that must never show up in a document or a result.
+    let mut s = Session::new();
+    s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 20, "height": 10, "name": "BAIT-LAYER"})).unwrap();
+    s.execute("file.saveAs", &json!({"path": f.p("outside/bait.figcraft")})).unwrap();
+    s.execute("file.export", &json!({"format": "png", "path": f.p("outside/bait.png")})).unwrap();
+    std::fs::write(
+        outside.join("bait.svg"),
+        r#"<svg xmlns="http://www.w3.org/2000/svg" width="9" height="9"><rect id="BAIT-LAYER" width="9" height="9"/></svg>"#,
+    )
+    .unwrap();
+    let before: Vec<_> = std::fs::read_dir(&outside).unwrap().flatten().map(|e| e.file_name()).collect();
+    // The bait is what an unconfined command finds.
+    for (cmd, bait) in [("file.open", "bait.figcraft"), ("file.import", "bait.svg")] {
+        let mut s = Session::new();
+        s.execute(cmd, &json!({"path": f.p(&format!("outside/{bait}"))})).unwrap();
+        assert!(crate::inspect::document(&s, 64, true).to_string().contains("BAIT-LAYER"), "{cmd} {bait}");
+    }
+    let mut s = Session::new();
+    s.execute("file.placeImage", &json!({"path": f.p("outside/bait.png")})).unwrap();
+    assert!(!s.doc().unwrap().images.is_empty());
+    for bait in ["bait.figcraft", "bait.svg", "bait.png", "new.figcraft", "new.png"] {
+        let path = f.p(&format!("outside/{bait}"));
+        let params = json!({"path": path, "dir": f.p("outside"), "file": path, "variables": path, "folder": f.p("outside"), "confirm": true});
+        for c in crate::all_commands() {
+            let mut s = Session::new();
+            let r = confined(Some(&roots), || s.execute(c.id, &params));
+            let shown = format!("{r:?}");
+            assert!(!shown.contains("BAIT-LAYER"), "{} read {bait}: {shown}", c.id);
+            let docs = crate::inspect::document(&s, 64, true).to_string();
+            assert!(!docs.contains("BAIT-LAYER"), "{} opened {bait}", c.id);
+            assert!(s.docs.iter().all(|ds| ds.doc.images.is_empty()), "{} placed {bait}", c.id);
+            let now: Vec<_> = std::fs::read_dir(&outside).unwrap().flatten().map(|e| e.file_name()).collect();
+            assert_eq!(now, before, "{} wrote outside the roots with {bait}", c.id);
+        }
+    }
+}
+
+#[test]
+fn recent_files_outside_the_roots_are_never_opened_removed_or_named() {
+    let f = Fixture::new("recents");
+    let roots = Arc::new(f.rw());
+    let (bait, gone, ok) = (f.p("outside/bait.figcraft"), f.p("outside/gone.figcraft"), f.p("root/ok.figcraft"));
+    let mut s = Session::new();
+    s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 20, "height": 10})).unwrap();
+    s.execute("file.saveAs", &json!({"path": bait})).unwrap();
+    s.execute("file.saveAs", &json!({"path": ok})).unwrap();
+    let mut s = Session::new();
+    let recents = vec![bait.clone(), gone.clone(), ok.clone()];
+    s.prefs.recent_files = recents.clone();
+    let quiet = |r: &crate::Result<serde_json::Value>| {
+        let shown = format!("{r:?}");
+        assert!(!shown.contains("bait") && !shown.contains("gone"), "an outside recent file was named: {shown}");
+    };
+    confined(Some(&roots), || {
+        let listing = s.execute("file.openRecent", &json!({}));
+        quiet(&listing);
+        assert_eq!(listing.unwrap()["files"].as_array().unwrap().len(), 1);
+        // `index` counts the files listed: 0 is the first one inside the roots.
+        let opened = s.execute("file.openRecent", &json!({"index": 0}));
+        quiet(&opened);
+        assert!(opened.is_ok(), "{opened:?}");
+        assert_eq!(s.ds().unwrap().path.as_deref(), Some(ok.as_str()));
+        for i in [1, 2] {
+            let r = s.execute("file.openRecent", &json!({"index": i}));
+            quiet(&r);
+            assert!(r.is_err());
+        }
+        // A path outside is refused like any outside path, and never dropped from the list.
+        let e = s.execute("file.openRecent", &json!({"path": gone})).unwrap_err().to_string();
+        assert!(e.contains("is outside the folders that may be read") && !e.contains("no longer exists"), "{e}");
+        quiet(&s.execute("file.openRecent", &json!({"remove": bait})));
+        assert!(s.prefs.recent_files.contains(&bait) && s.prefs.recent_files.contains(&gone));
+        // Clear clears what is listed.
+        quiet(&s.execute("file.openRecent", &json!({"clear": true})));
+    });
+    assert_eq!(s.prefs.recent_files, vec![bait, gone]);
+    // Unconfined, a recent file that is gone is still dropped.
+    s.execute("file.openRecent", &json!({"index": 1})).unwrap_err();
+    assert_eq!(s.prefs.recent_files.len(), 1);
+}
+
+#[test]
+fn outside_paths_are_refused_alike_whatever_exists_there() {
+    let f = Fixture::new("oracle");
+    let r = f.rw();
+    let refusal = |p: &str| r.check(Path::new(p), Access::Write).unwrap_err();
+    let standard = |p: &str| format!("automation path rejected: {} is outside the folders that may be written:", Path::new(p).display());
+    let mut outside = vec![f.p("outside/secret.txt"), f.p("outside/none.txt"), f.p("outside/missing/../x.txt"), f.p("nowhere/deeper/x.txt")];
+    if symlink_file(&f.0.join("outside/not-yet.txt"), &f.0.join("outside/dangling.txt")) {
+        outside.push(f.p("outside/dangling.txt"));
+        // Reached through a link in the root, it is outside all the same.
+        if symlink_dir(&f.0.join("outside"), &f.0.join("root/escape")) {
+            outside.push(f.p("root/escape/dangling.txt"));
+        }
+    }
+    for p in &outside {
+        let e = refusal(p);
+        assert!(e.starts_with(&standard(p)), "{p}: {e}");
+    }
+    // Inside a root the reason is given.
+    if symlink_file(&f.0.join("outside/not-yet.txt"), &f.0.join("root/dangling.txt")) {
+        assert!(refusal(&f.p("root/dangling.txt")).contains("leads nowhere"));
+    }
+}
+
+#[test]
+fn a_root_given_through_a_link_tells_why_paths_in_it_are_refused() {
+    let f = Fixture::new("linked-root");
+    if !symlink_dir(&f.0.join("root"), &f.0.join("via")) || !symlink_file(&f.0.join("outside/not-yet.txt"), &f.0.join("root/dangling.txt")) {
+        eprintln!("skipped: this system doesn't let tests make symbolic links");
+        return;
+    }
+    // Like `/tmp/work` on macOS, where `/tmp` leads to `/private/tmp`.
+    let r = Roots::new(&[], &[f.p("via")]).unwrap();
+    let e = r.check(Path::new(&f.p("via/dangling.txt")), Access::Write).unwrap_err();
+    assert!(e.contains("leads nowhere"), "{e}");
+}
+
+#[test]
+fn only_resolved_paths_count_as_the_apps_own_folder() {
+    let f = Fixture::new("own");
+    let install = f.0.join("root");
+    assert!(super::within_app_folder(&install.join("in.txt"), &install));
+    assert!(!super::within_app_folder(&install.join("..").join("outside").join("secret.txt"), &install), "`..` leaves it");
+    assert!(!super::within_app_folder(&f.0.join("root2"), &install), "a folder named like it is another");
+    assert!(!super::within_app_folder(&install.join("missing.wasm"), &install));
+    assert!(!super::within_app_folder(&install.join("in.txt"), &f.0.join("no-such-folder")));
+}
diff --git a/crates/engine/src/inspect.rs b/crates/engine/src/automation/inspect.rs
similarity index 94%
rename from crates/engine/src/inspect.rs
rename to crates/engine/src/automation/inspect.rs
index 1f461c60..7dccd706 100644
--- a/crates/engine/src/inspect.rs
+++ b/crates/engine/src/automation/inspect.rs
@@ -135,12 +135,18 @@ pub fn node_json(doc: &Document, id: NodeId, depth: usize) -> Value {
         if !n.exports.is_empty() {
             o.insert("exports".into(), serde_json::to_value(&n.exports).unwrap_or(Value::Null));
         }
+        if let Some(b) = &n.board {
+            o.insert("board".into(), serde_json::to_value(b).unwrap_or(Value::Null));
+        }
         if !n.annotations.is_empty() {
             o.insert("annotations".into(), serde_json::to_value(&n.annotations).unwrap_or(Value::Null));
         }
         if !n.code_links.is_empty() {
             o.insert("codeLinks".into(), camel(serde_json::to_value(&n.code_links).unwrap_or(Value::Null)));
         }
+        if !n.measurements.is_empty() {
+            o.insert("measurements".into(), serde_json::to_value(&n.measurements).unwrap_or(Value::Null));
+        }
         let dev = crate::dev_resources::list_json(doc, n.id);
         if dev.as_array().is_some_and(|a| !a.is_empty()) {
             o.insert("devResources".into(), dev);
@@ -165,6 +171,10 @@ pub fn node_json(doc: &Document, id: NodeId, depth: usize) -> Value {
             o.insert("operandOperation".into(), json!(op));
         }
     }
+    // Layer data written with `node.set {props: {pluginData}}` (pages too).
+    if !n.plugin_data.is_empty() {
+        o.insert("pluginData".into(), json!(n.plugin_data));
+    }
     match &n.kind {
         NodeKind::Text(t) => {
             o.insert("characters".into(), json!(t.characters));
@@ -178,6 +188,9 @@ pub fn node_json(doc: &Document, id: NodeId, depth: usize) -> Value {
             o.insert("letterSpacing".into(), json!(t.style.letter_spacing.label()));
             o.insert("textAlign".into(), json!(t.align_h));
             o.insert("textAutoResize".into(), json!(t.auto_resize));
+            if t.max_lines > 0 {
+                o.insert("maxLines".into(), json!(t.max_lines));
+            }
             if let Some(tp) = &t.path {
                 o.insert("textPath".into(), json!(tp));
             }
@@ -191,7 +204,7 @@ pub fn node_json(doc: &Document, id: NodeId, depth: usize) -> Value {
                 o.insert("textDecorationSkipInk".into(), json!(l.skip_ink));
                 o.insert("textDecorationColor".into(), l.color.map_or(json!("auto"), |c| json!(format!("#{}", c.to_hex()))));
             }
-            // Lists: one style for the layer, or each paragraph's type and nesting level.
+            // Lists: one style for the layer, or each paragraph's type, nesting level and start.
             if t.paragraphs.is_empty() {
                 if t.list != figcraft_doc::ListStyle::None {
                     o.insert("listStyle".into(), json!(t.list));
@@ -199,6 +212,9 @@ pub fn node_json(doc: &Document, id: NodeId, depth: usize) -> Value {
             } else {
                 o.insert("lineTypes".into(), t.paragraphs.iter().map(|p| json!(p.list)).collect());
                 o.insert("lineIndentations".into(), t.paragraphs.iter().map(|p| json!(p.indent)).collect());
+                if t.paragraphs.iter().any(|p| p.start_offset > 0) {
+                    o.insert("listStartOffsets".into(), t.paragraphs.iter().map(|p| json!(p.start_offset)).collect());
+                }
             }
             if t.list_spacing != 0.0 {
                 o.insert("listSpacing".into(), json!(t.list_spacing));
@@ -305,6 +321,7 @@ pub fn document(s: &Session, depth: usize, all_pages: bool) -> Value {
         doc.pages.iter().map(|p| if all_pages || *p == ds.page { node_json(doc, *p, depth) } else { node_json(doc, *p, 0) }).collect();
     json!({
         "name": doc.name,
+        "kind": doc.kind.id(),
         "path": ds.path,
         "dirty": ds.is_dirty(),
         "currentPage": ds.page,
diff --git a/crates/engine/src/params.rs b/crates/engine/src/automation/params.rs
similarity index 79%
rename from crates/engine/src/params.rs
rename to crates/engine/src/automation/params.rs
index bbaa42a4..35a74e0e 100644
--- a/crates/engine/src/params.rs
+++ b/crates/engine/src/automation/params.rs
@@ -88,6 +88,36 @@ pub fn req_id(cmd: &str, p: &Value, key: &str) -> Result<NodeId> {
     id(p, key).ok_or_else(|| bad(cmd, format!("`{key}` must be a node id")))
 }
 
+/// The offending value for an error message, cut to a few dozen characters so a huge param
+/// doesn't end up in the error whole.
+fn shown(v: &Value) -> String {
+    const MAX: usize = 40;
+    let text = v.to_string();
+    match text.char_indices().nth(MAX) {
+        Some((cut, _)) => format!("{}…", &text[..cut]),
+        None => text,
+    }
+}
+
+/// `key` when it is there: a layer id, or an error naming it. Missing and `null` mean "none", so a
+/// command can tell "no parent given" (use the page) from "a parent was given that isn't an id" —
+/// which is a mistake, not the default. Without this, `{"$step": 0}` reaching a param that isn't
+/// resolved yet silently becomes "no parent" and the layer lands on the page.
+pub fn opt_id(cmd: &str, p: &Value, key: &str) -> Result<Option<NodeId>> {
+    match get(p, key) {
+        None | Some(Value::Null) => Ok(None),
+        Some(v) => id_of(v).map(Some).ok_or_else(|| bad(cmd, format!("`{key}` must be a node id (got {})", shown(v)))),
+    }
+}
+
+/// `key` when it is there: a whole, non-negative number, or an error. Missing means "none".
+pub fn opt_index(cmd: &str, p: &Value, key: &str) -> Result<Option<usize>> {
+    match get(p, key) {
+        None | Some(Value::Null) => Ok(None),
+        Some(_) => req_index(cmd, p, key).map(Some),
+    }
+}
+
 /// `ids` (array), `id` (single), or the current selection.
 pub fn targets(s: &Session, p: &Value) -> Vec<NodeId> {
     if let Some(Value::Array(a)) = get(p, "ids") {
@@ -99,8 +129,25 @@ pub fn targets(s: &Session, p: &Value) -> Vec<NodeId> {
     s.selection()
 }
 
-/// Like [`targets`] but an empty result is an error.
+/// Like [`targets`] but an unparseable `ids` entry, an unparseable `id`, or an empty result is an
+/// error: naming something that isn't a layer is a mistake, not an empty selection. An explicit
+/// `null` says the same as leaving the key out.
 pub fn req_targets(cmd: &str, s: &Session, p: &Value) -> Result<Vec<NodeId>> {
+    match get(p, "ids") {
+        Some(Value::Array(a)) => {
+            if let Some(v) = a.iter().find(|v| id_of(v).is_none()) {
+                return Err(bad(cmd, format!("`ids`: every entry must be a node id (got {})", shown(v))));
+            }
+        }
+        Some(Value::Null) | None => {
+            if let Some(v) = get(p, "id").filter(|v| !v.is_null())
+                && id_of(v).is_none()
+            {
+                return Err(bad(cmd, format!("`id` must be a node id (got {})", shown(v))));
+            }
+        }
+        Some(v) => return Err(bad(cmd, format!("`ids` must be an array (got {})", shown(v)))),
+    }
     let t = targets(s, p);
     if t.is_empty() {
         return Err(EngineError::Disabled(cmd.to_string(), "nothing is selected (pass `ids`)".into()));
diff --git a/crates/engine/src/batch_rollback_tests.rs b/crates/engine/src/batch_rollback_tests.rs
index 12d958cd..298ca097 100644
--- a/crates/engine/src/batch_rollback_tests.rs
+++ b/crates/engine/src/batch_rollback_tests.rs
@@ -34,6 +34,31 @@ fn failed_group_closes_documents_opened_inside_it() {
     assert_eq!(s.journal, before_journal);
 }
 
+#[test]
+fn failed_group_reopens_documents_closed_inside_it() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"name": "Second"})).unwrap();
+    let uids: Vec<_> = s.docs.iter().map(|ds| ds.uid).collect();
+    assert_eq!((s.docs.len(), s.active), (2, 1));
+
+    let result = s.execute(
+        "command.batch",
+        &json!({
+            "commands": [
+                {"command": "file.close", "params": {"index": 1, "force": true}},
+                {"command": "node.set", "params": {"id": 999999, "props": {"name": "must fail"}}}
+            ]
+        }),
+    );
+
+    assert!(result.is_err());
+    assert_eq!(s.docs.len(), 2);
+    assert_eq!(s.active, 1);
+    assert_eq!(s.docs.iter().map(|ds| ds.uid).collect::<Vec<_>>(), uids);
+    assert!(s.ds().is_ok());
+    assert!(s.closed_in_group.is_empty());
+}
+
 #[test]
 fn failed_plugin_run_restores_each_document_without_restoring_unrelated_state() {
     let mut s = Session::new();
diff --git a/crates/engine/src/batch_step_ref_tests.rs b/crates/engine/src/batch_step_ref_tests.rs
index ac69118e..47d6e876 100644
--- a/crates/engine/src/batch_step_ref_tests.rs
+++ b/crates/engine/src/batch_step_ref_tests.rs
@@ -110,3 +110,173 @@ fn a_nested_batch_refers_to_its_own_steps() {
     let rect = s.doc().unwrap().node(id(&inner[1])).unwrap().clone();
     assert_eq!(rect.parent, Some(id(&inner[0])), "in the nested batch's own first frame, not the outer one");
 }
+
+/// Runs `commands` as a batch and returns the error message, which must be `BadParams`.
+fn batch_error(s: &mut Session, commands: serde_json::Value) -> String {
+    match s.execute("command.batch", &json!({"commands": commands})) {
+        Err(EngineError::BadParams { msg, .. }) => msg,
+        other => panic!("expected BadParams, got {other:?}"),
+    }
+}
+
+#[test]
+fn a_named_step_is_referred_to_by_its_name() {
+    let mut s = Session::new();
+    let results = s
+        .execute(
+            "command.batch",
+            &json!({"commands": [
+                {"command": "node.create", "as": "card", "params": {"type": "frame", "width": 200, "height": 100}},
+                {"command": "node.create", "as": "swatch", "params": {"type": "rectangle", "parent": {"$ref": "card"}, "width": 20, "height": 20}},
+                {"command": "node.set", "params": {"ids": [{"$ref": "swatch", "field": "id"}], "props": {"name": "Swatch"}}},
+                {"command": "node.create", "params": {"type": "text", "text": "hi", "parent": {"$step": 0}}}
+            ]}),
+        )
+        .unwrap();
+    let (frame, rect, text) = (id(&results[0]), id(&results[1]), id(&results[3]));
+    let doc = s.doc().unwrap();
+    assert_eq!(doc.node(rect).unwrap().parent, Some(frame));
+    assert_eq!(doc.node(rect).unwrap().name, "Swatch");
+    assert_eq!(doc.node(text).unwrap().parent, Some(frame), "`$step` and `$ref` mix in one batch");
+    assert_eq!(s.ds().unwrap().history.undo.len(), 1, "still one undo step");
+}
+
+/// `edit.duplicate` answers `{"ids": [...]}`: a slash path in `field` takes one of them.
+#[test]
+fn a_field_path_indexes_into_a_list_in_the_result() {
+    let mut s = Session::new();
+    let results = s
+        .execute(
+            "command.batch",
+            &json!({"commands": [
+                {"command": "node.create", "as": "a", "params": {"type": "frame", "name": "A", "width": 10, "height": 10}},
+                {"command": "node.create", "as": "b", "params": {"type": "frame", "name": "B", "width": 10, "height": 10}},
+                {"command": "edit.duplicate", "as": "copies", "params": {"ids": [{"$ref": "a"}, {"$ref": "b"}]}},
+                {"command": "node.set", "params": {"ids": [{"$ref": "copies", "field": "ids/1"}], "props": {"name": "B copy"}}},
+                {"command": "node.set", "params": {"ids": [{"$step": 2, "field": "/ids/0"}], "props": {"name": "A copy"}}}
+            ]}),
+        )
+        .unwrap();
+    let copies = results[2]["ids"].as_array().unwrap().clone();
+    let doc = s.doc().unwrap();
+    assert_eq!(doc.node(crate::params::id_of(&copies[0]).unwrap()).unwrap().name, "A copy", "a leading `/` works too");
+    assert_eq!(doc.node(crate::params::id_of(&copies[1]).unwrap()).unwrap().name, "B copy");
+}
+
+#[test]
+fn a_field_path_walks_nested_objects_and_takes_whole_values() {
+    let mut scope = crate::BatchScope::default();
+    scope.push(json!({"ids": [7, 8], "bounds": {"x": 1.5, "corners": [{"r": 4}]}, "a/b": "slash key"}));
+    let resolved = scope
+        .resolve(&json!({
+            "x": {"$step": 0, "field": "bounds/x"},
+            "r": {"$step": 0, "field": "bounds/corners/0/r"},
+            "all": {"$step": 0, "field": "ids"},
+            "key": {"$step": 0, "field": "a/b"},
+            "pointer": {"$step": 0, "field": "/ids"}
+        }))
+        .unwrap();
+    assert_eq!(resolved, json!({"x": 1.5, "r": 4, "all": [7, 8], "key": "slash key", "pointer": [7, 8]}), "a key holding `/` is still read as a key");
+}
+
+#[test]
+fn bad_names_and_paths_fail_and_roll_back() {
+    let mut s = Session::new();
+    let before = s.doc().unwrap().node(s.page().unwrap()).unwrap().children.len();
+    let frame = |name: &str| json!({"command": "node.create", "as": name, "params": {"type": "frame", "width": 10, "height": 10}});
+    let dup = json!({"command": "edit.duplicate", "as": "copy", "params": {"ids": [{"$ref": "card"}]}});
+    let set = |r: serde_json::Value| json!({"command": "node.set", "params": {"ids": [r], "props": {"name": "x"}}});
+    let later = json!({"command": "node.create", "as": "later", "params": {"type": "frame", "width": 10, "height": 10}});
+    for (commands, needle) in [
+        (json!([frame("card"), frame("card")]), "step 1: `as` \"card\" is already step 0's name"),
+        (json!([frame("card"), set(json!({"$ref": "nope"}))]), "step 1: `$ref` \"nope\" names no step (\"card\" is step 0)"),
+        (json!([{"command": "node.create", "params": {"type": "frame"}}, set(json!({"$ref": "nope"}))]), "no step has an `as` name"),
+        (json!([frame("card"), set(json!({"$ref": "later"})), later]), "step 1: `$ref` \"later\" is step 2, not an earlier step"),
+        (
+            json!([frame("card"), {"command": "node.set", "as": "self", "params": {"ids": [{"$ref": "self"}], "props": {}}}]),
+            "is step 1, not an earlier step",
+        ),
+        (json!([frame("card"), set(json!({"$ref": 0}))]), "`$ref` must be a step name"),
+        (json!([frame("card"), set(json!({"$ref": "card", "id": 3}))]), "a `$ref` reference takes only `field`, not `id`"),
+        (json!([frame("card"), set(json!({"$ref": "card", "$step": 0}))]), "a `$step` reference takes only `field`, not `$ref`"),
+        (json!([frame("card"), {"command": "node.create", "as": "", "params": {}}]), "step 1: `as` must be a name"),
+        (json!([frame("card"), {"command": "node.create", "as": 3, "params": {}}]), "step 1: `as` must be a name"),
+        (
+            json!([frame("card"), dup.clone(), set(json!({"$ref": "copy", "field": "ids/1"}))]),
+            "step 2: step 1 (\"copy\")'s result has no `ids/1`: `ids` has 1 item",
+        ),
+        (json!([frame("card"), dup.clone(), set(json!({"$ref": "copy", "field": "ids/first"}))]), "`ids` is a list, so `first` must be an index"),
+        (json!([frame("card"), dup.clone(), set(json!({"$ref": "copy", "field": "ids/0/x"}))]), "has no `ids/0/x`: `ids/0` is a number"),
+        (json!([frame("card"), dup.clone(), set(json!({"$ref": "copy", "field": "map/0"}))]), "step 1 (\"copy\")'s result has no `map/0`"),
+        (json!([frame("card"), dup.clone(), set(json!({"$ref": "copy", "field": "ids.0"}))]), "has no `ids.0` (paths use `/`, as in `ids/0`)"),
+        (json!([frame("card"), set(json!({"$step": 0, "field": "id/0"}))]), "has no `id/0`: `id` is a number"),
+    ] {
+        let msg = batch_error(&mut s, commands);
+        assert!(msg.contains(needle), "{msg:?} should contain {needle:?}");
+        assert_eq!(s.doc().unwrap().node(s.page().unwrap()).unwrap().children.len(), before, "rolled back");
+    }
+}
+
+#[test]
+fn text_that_looks_like_a_named_reference_is_left_alone() {
+    let mut s = Session::new();
+    let text = "{\"$ref\": \"card\"} $ref";
+    let results = s.execute("command.batch", &json!({"commands": [{"command": "node.create", "params": {"type": "text", "text": text}}]})).unwrap();
+    let n = s.doc().unwrap().node(id(&results[0])).unwrap().clone();
+    assert!(matches!(n.kind, figcraft_doc::NodeKind::Text(t) if t.characters == text));
+}
+
+/// A nested batch has its own names: it can't see the outer batch's, may reuse them, and the
+/// outer batch can't see its.
+#[test]
+fn a_nested_batch_has_its_own_names() {
+    let mut s = Session::new();
+    let frame = |name: &str| json!({"command": "node.create", "as": "frame", "params": {"type": "frame", "name": name, "width": 100, "height": 100}});
+    let results = s
+        .execute(
+            "command.batch",
+            &json!({"commands": [
+                frame("Outer"),
+                {"command": "command.batch", "as": "inner", "params": {"commands": [
+                    frame("Inner"),
+                    {"command": "node.create", "params": {"type": "rectangle", "parent": {"$ref": "frame"}, "width": 10, "height": 10}}
+                ]}},
+                {"command": "node.set", "params": {"ids": [{"$ref": "inner", "field": "1/id"}], "props": {"name": "In inner"}}}
+            ]}),
+        )
+        .unwrap();
+    let inner = &results[1];
+    let rect = s.doc().unwrap().node(id(&inner[1])).unwrap().clone();
+    assert_eq!(rect.parent, Some(id(&inner[0])), "in the nested batch's own frame, not the outer one");
+    assert_eq!(rect.name, "In inner", "a path indexes into a nested batch's result list");
+
+    let msg = batch_error(
+        &mut s,
+        json!([frame("Outer"), {"command": "command.batch", "params": {"commands": [
+            {"command": "node.create", "params": {"type": "rectangle", "parent": {"$ref": "frame"}, "width": 10, "height": 10}}
+        ]}}]),
+    );
+    assert!(msg.contains("`$ref` \"frame\" names no step"), "the outer names aren't visible inside: {msg}");
+}
+
+#[test]
+fn a_failing_command_names_its_step_and_rolls_back() {
+    let mut s = Session::new();
+    let frame = id(&s.execute("node.create", &json!({"type": "frame", "width": 50, "height": 50})).unwrap());
+    let text = id(&s.execute("node.create", &json!({"type": "text", "text": "orig"})).unwrap());
+    let undo = s.ds().unwrap().history.undo.len();
+    let name = s.doc().unwrap().node(s.page().unwrap()).unwrap().name.clone();
+    let msg = batch_error(
+        &mut s,
+        json!([
+            {"command": "text.set", "params": {"ids": [text.0], "text": "novo"}},
+            {"command": "text.set", "params": {"ids": [frame.0], "text": "erro"}},
+            {"command": "page.rename", "params": {"name": "Depois do erro"}}
+        ]),
+    );
+    // Still the command's own kind of error, its message saying which step.
+    assert!(msg.starts_with("step 1: ") && msg.contains("is not text"), "{msg}");
+    assert!(matches!(&s.doc().unwrap().node(text).unwrap().kind, figcraft_doc::NodeKind::Text(t) if t.characters == "orig"));
+    assert_eq!(s.doc().unwrap().node(s.page().unwrap()).unwrap().name, name);
+    assert_eq!(s.ds().unwrap().history.undo.len(), undo);
+}
diff --git a/crates/engine/src/binding_lists_tests.rs b/crates/engine/src/binding_lists_tests.rs
index 493c8f60..8b221efd 100644
--- a/crates/engine/src/binding_lists_tests.rs
+++ b/crates/engine/src/binding_lists_tests.rs
@@ -97,3 +97,77 @@ fn effect_moves_and_removals_reject_junk() {
     ex(&mut s, "effect.remove", json!({"ids": [r], "index": 7}));
     assert_eq!(s.doc().unwrap().node(r).unwrap().effects.len(), 1);
 }
+
+fn fill_hex(s: &Session, r: NodeId) -> Vec<String> {
+    s.doc().unwrap().node(r).unwrap().fills.iter().filter_map(|p| p.solid_color()).map(|c| c.to_hex()).collect()
+}
+
+fn brand_id(s: &Session) -> String {
+    s.doc().unwrap().variables.get("brand").unwrap().id.clone()
+}
+
+#[test]
+fn explicit_paint_edits_detach_the_colour_binding() {
+    // An edit that reported success keeps its colour: the binding it overwrote lets go (as
+    // selection colours already do), instead of putting the variable's colour back.
+    let edits = [
+        ("fill.set", json!({"color": "#00FF00"})),
+        ("node.set", json!({"props": {"fill": "#00FF00"}})),
+        ("node.set", json!({"props": {"fills": ["#00FF00"]}})),
+    ];
+    for (cmd, mut p) in edits {
+        let (mut s, r) = setup();
+        ex(&mut s, "variable.bind", json!({"ids": [r], "field": "fill", "variable": "brand"}));
+        p["ids"] = json!([r]);
+        ex(&mut s, cmd, p.clone());
+        assert_eq!(fill_hex(&s, r), ["00FF00"], "{cmd} {p}");
+        assert!(bound(&s, r).is_empty(), "{cmd} {p}");
+        ex(&mut s, "variable.set", json!({"variable": "brand", "value": "#123456"}));
+        assert_eq!(fill_hex(&s, r), ["00FF00"], "{cmd} {p}: no longer follows the variable");
+    }
+    for (cmd, mut p) in [("stroke.set", json!({"color": "#00FF00"})), ("node.set", json!({"props": {"stroke": "#00FF00"}}))] {
+        let (mut s, r) = setup();
+        ex(&mut s, "node.set", json!({"ids": [r], "props": {"strokes": ["#000000"]}}));
+        ex(&mut s, "variable.bind", json!({"ids": [r], "field": "stroke", "variable": "brand"}));
+        p["ids"] = json!([r]);
+        ex(&mut s, cmd, p);
+        let n = s.doc().unwrap().node(r).unwrap();
+        assert_eq!(n.strokes[0].solid_color().map(|c| c.to_hex()).as_deref(), Some("00FF00"), "{cmd}");
+        assert!(n.bound.is_empty(), "{cmd}");
+    }
+}
+
+#[test]
+fn clearing_bound_fills_adds_no_paint_back() {
+    let (mut s, r) = setup();
+    ex(&mut s, "variable.bind", json!({"ids": [r], "field": "fill", "variable": "brand"}));
+    ex(&mut s, "node.set", json!({"ids": [r], "props": {"fills": []}}));
+    assert!(s.doc().unwrap().node(r).unwrap().fills.is_empty());
+    assert!(bound(&s, r).is_empty());
+    ex(&mut s, "variable.set", json!({"variable": "brand", "value": "#123456"}));
+    assert!(s.doc().unwrap().node(r).unwrap().fills.is_empty(), "the variable doesn't bring the fill back");
+}
+
+#[test]
+fn paint_opacity_edits_keep_the_colour_binding() {
+    let (mut s, r) = setup();
+    ex(&mut s, "variable.bind", json!({"ids": [r], "field": "fill", "variable": "brand"}));
+    ex(&mut s, "fill.set", json!({"ids": [r], "opacity": 0.5}));
+    ex(&mut s, "variable.set", json!({"variable": "brand", "value": "#0000FF"}));
+    assert_eq!(fill_hex(&s, r), ["0000FF"], "the colour still follows the variable");
+    assert_eq!(s.doc().unwrap().node(r).unwrap().fills[0].opacity, 0.5);
+    // The same colour with another opacity, through node.set, keeps it too.
+    ex(&mut s, "node.set", json!({"ids": [r], "props": {"fills": [{"type": "solid", "color": "#0000FF", "opacity": 0.25}]}}));
+    assert_eq!(bound(&s, r).len(), 1);
+    assert_eq!(s.doc().unwrap().node(r).unwrap().fills[0].opacity, 0.25);
+}
+
+#[test]
+fn paints_set_with_their_binding_in_the_same_call_keep_it() {
+    let (mut s, r) = setup();
+    ex(&mut s, "variable.bind", json!({"ids": [r], "field": "fill", "variable": "brand"}));
+    let brand = brand_id(&s);
+    ex(&mut s, "node.set", json!({"ids": [r], "props": {"fills": ["#00FF00"], "boundVariables": {"fill": brand}}}));
+    assert_eq!(bound(&s, r), [("fill".to_string(), brand)]);
+    assert_eq!(fill_hex(&s, r), ["FF0000"], "the binding given with the paints applies");
+}
diff --git a/crates/engine/src/board_connector_tests.rs b/crates/engine/src/board_connector_tests.rs
new file mode 100644
index 00000000..cbb2070e
--- /dev/null
+++ b/crates/engine/src/board_connector_tests.rs
@@ -0,0 +1,179 @@
+//! Board connectors, continued: moving an end onto another object or off into the canvas (the
+//! command and a drag of the selected connector's end), curved connectors, and elbows that go
+//! around the objects they join.
+
+use figcraft_doc::{BoardItem, End, NodeKind, Routing, Side};
+use figcraft_geom::{Point, Rect};
+use serde_json::json;
+
+use crate::Session;
+use crate::board::route;
+use crate::board_tests::{board, connector, drawn, id, near, node};
+use crate::tools::{PointerEvent, PointerKind, handle_at};
+
+/// A board with three 100 × 100 shapes in a row 300 apart, and an elbow connector from the
+/// first to the second: (a, b, c, connector).
+fn three() -> (Session, [figcraft_doc::NodeId; 4]) {
+    let mut s = board();
+    let mut shape = |x: f64| id(&s.execute("board.shape", &json!({"x": x, "y": 0, "width": 100, "height": 100})).unwrap(), "id");
+    let (a, b, c) = (shape(0.0), shape(300.0), shape(600.0));
+    let k = id(&s.execute("board.connector", &json!({"from": a, "to": b, "style": "elbow"})).unwrap(), "id");
+    (s, [a, b, c, k])
+}
+
+#[test]
+fn reattach_moves_one_end_and_undoes() {
+    let (mut s, [a, b, c, k]) = three();
+    s.execute("board.reattach", &json!({"id": k, "end": "to", "target": c, "side": "top"})).unwrap();
+    assert_eq!(connector(&s, k).to, End::Node { node: c, side: Side::Top });
+    assert_eq!(connector(&s, k).from.node(), Some(a));
+    assert!(near(*drawn(&s, k).last().unwrap(), Point::new(650.0, 0.0)), "arrives on c's top: {:?}", drawn(&s, k));
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(connector(&s, k).to.node(), Some(b), "one undo step");
+    // Off into the canvas: the end stays there, free. The selection is the default connector.
+    s.execute("select.set", &json!({"ids": [k]})).unwrap();
+    s.execute("board.reattach", &json!({"end": "from", "target": {"x": -200, "y": 400}})).unwrap();
+    assert_eq!(connector(&s, k).from, End::Point { x: -200.0, y: 400.0 });
+    assert!(near(drawn(&s, k)[0], Point::new(-200.0, 400.0)));
+    // A label stands for its connector.
+    let label = id(&s.execute("board.label", &json!({"id": k, "text": "next"})).unwrap(), "label");
+    s.execute("board.reattach", &json!({"id": label, "end": "from", "target": c})).unwrap();
+    assert_eq!(connector(&s, k).from.node(), Some(c));
+}
+
+#[test]
+fn reattach_refuses_what_it_cant_join() {
+    let (mut s, [a, b, _, k]) = three();
+    let refused = |s: &mut Session, p| s.execute("board.reattach", &p).is_err();
+    assert!(refused(&mut s, json!({"id": k, "end": "to", "target": a})), "both ends on one layer");
+    assert!(refused(&mut s, json!({"id": k, "end": "middle", "target": b})));
+    assert!(refused(&mut s, json!({"id": k, "end": "to"})), "no target");
+    assert!(refused(&mut s, json!({"id": a, "end": "to", "target": b})), "not a connector");
+    assert!(refused(&mut s, json!({"id": k, "end": "to", "target": k})), "a connector isn't an end");
+    assert!(refused(&mut s, json!({"id": k, "end": "to", "target": {"x": "a", "y": 1}})));
+    assert!(refused(&mut s, json!({"id": k, "end": "to", "target": b, "side": "inside"})));
+    let mut d = Session::new();
+    d.execute("file.new", &json!({})).unwrap();
+    assert!(d.execute("board.reattach", &json!({"end": "to", "target": {"x": 0, "y": 0}})).is_err(), "boards only");
+    assert_eq!(connector(&s, k).to.node(), Some(b), "nothing changed");
+}
+
+#[test]
+fn dragging_a_selected_connectors_end_reattaches_it() {
+    let (mut s, [a, b, c, k]) = three();
+    s.execute("select.set", &json!({"ids": [k]})).unwrap();
+    let doc = s.doc().unwrap();
+    assert_eq!(handle_at(doc, &[k], Point::new(100.0, 50.0), 1.0), None, "no box handles on a connector");
+    let end = *drawn(&s, k).last().unwrap();
+    let ev = |k, p: Point| PointerEvent::at(k, p.x, p.y, 1.0);
+    // Onto c.
+    s.pointer(&ev(PointerKind::Down, end)).unwrap();
+    s.pointer(&ev(PointerKind::Move, Point::new(500.0, 50.0))).unwrap();
+    s.pointer(&ev(PointerKind::Move, Point::new(650.0, 50.0))).unwrap();
+    assert_eq!(s.tool.overlay.drop_target, Some(c), "the object it would attach to shows");
+    assert!(s.tool.overlay.rubber.is_some());
+    s.pointer(&ev(PointerKind::Up, Point::new(650.0, 50.0))).unwrap();
+    assert_eq!(connector(&s, k).to.node(), Some(c));
+    assert_eq!(connector(&s, k).from.node(), Some(a));
+    assert_eq!((s.tool.overlay.drop_target, s.tool.overlay.rubber), (None, None));
+    assert_eq!(s.selection(), vec![k], "still selected");
+    // The start into empty canvas: free where it was let go.
+    let start = drawn(&s, k)[0];
+    s.pointer(&ev(PointerKind::Down, start + figcraft_geom::Vec2::new(3.0, 0.0))).unwrap();
+    s.pointer(&ev(PointerKind::Move, Point::new(100.0, 400.0))).unwrap();
+    s.pointer(&ev(PointerKind::Up, Point::new(100.0, 400.0))).unwrap();
+    assert_eq!(connector(&s, k).from, End::Point { x: 100.0, y: 400.0 });
+    // A click on an end, or a drop on the other end's object, changes nothing.
+    let before = connector(&s, k);
+    let end = *drawn(&s, k).last().unwrap();
+    s.pointer(&ev(PointerKind::Down, end)).unwrap();
+    s.pointer(&ev(PointerKind::Up, end)).unwrap();
+    assert_eq!(connector(&s, k), before);
+    s.execute("board.reattach", &json!({"id": k, "end": "from", "target": b})).unwrap();
+    let before = connector(&s, k);
+    s.pointer(&ev(PointerKind::Down, *drawn(&s, k).last().unwrap())).unwrap();
+    s.pointer(&ev(PointerKind::Move, Point::new(350.0, 50.0))).unwrap();
+    assert_eq!(s.tool.overlay.drop_target, None, "not onto the other end's object");
+    s.pointer(&ev(PointerKind::Up, Point::new(350.0, 50.0))).unwrap();
+    assert_eq!(connector(&s, k), before);
+}
+
+#[test]
+fn curved_connectors_leave_and_arrive_along_the_sides() {
+    let (mut s, [a, _, c, k]) = three();
+    s.execute("board.setStyle", &json!({"ids": [k], "style": "curved"})).unwrap();
+    assert_eq!(connector(&s, k).routing, Routing::Curved);
+    let n = node(&s, k);
+    let NodeKind::Vector { network } = &n.kind else { panic!("a vector") };
+    assert_eq!((network.vertices.len(), network.segments.len()), (2, 1));
+    assert!(!network.segments[0].is_straight(), "one curve");
+    assert_eq!(drawn(&s, k), vec![Point::new(100.0, 50.0), Point::new(300.0, 50.0)]);
+    // Side to side in a line: the curve's control points lie on that line, so its box is flat.
+    assert!(n.height.abs() < 1e-9 && (n.width - 200.0).abs() < 1e-9, "{} × {}", n.width, n.height);
+    // From a's bottom to c's top: out downwards and in from above; the box holds the whole curve.
+    let k2 = id(
+        &s.execute("board.connector", &json!({"from": a, "to": c, "fromSide": "bottom", "toSide": "top", "style": "curved", "label": "x"})).unwrap(),
+        "id",
+    );
+    let pts = route(s.doc().unwrap(), &connector(&s, k2)).unwrap();
+    assert_eq!(pts.len(), 4);
+    assert!(pts[1].y > pts[0].y && pts[2].y < pts[3].y, "{pts:?}");
+    let b = s.doc().unwrap().world_bounds(k2).unwrap();
+    assert!(b.y0 <= 0.0 + 1e-9 && b.y1 >= 100.0 - 1e-9, "{b:?}");
+    // The label sits on the curve's middle (by length): here, by symmetry, the middle of the box.
+    let label = crate::board::label_of(s.doc().unwrap(), k2).unwrap();
+    let lc = s.doc().unwrap().world_bounds(label).unwrap().center();
+    assert!((lc - b.center()).hypot() < 0.5, "{lc:?} vs {:?}", b.center());
+    assert!(s.execute("board.setStyle", &json!({"ids": [k], "style": "wavy"})).is_err());
+    s.execute("tool.connector", &json!({"style": "curved"})).unwrap();
+    assert_eq!(s.tool.board.routing, Routing::Curved);
+}
+
+/// Whether `pts` (a right-angled route) runs through the inside of `r`.
+fn through(pts: &[Point], r: Rect) -> bool {
+    pts.windows(2).any(|w| {
+        let (a, b) = (w[0], w[1]);
+        a.x.min(b.x) < r.x1 - 0.5 && a.x.max(b.x) > r.x0 + 0.5 && a.y.min(b.y) < r.y1 - 0.5 && a.y.max(b.y) > r.y0 + 0.5
+    })
+}
+
+#[test]
+fn elbows_go_around_the_objects_they_join() {
+    let (mut s, [a, b, _, k]) = three();
+    // Out of a's left and b's right: the short way runs through both, so it goes over them.
+    s.execute("board.connector", &json!({"from": a, "to": b, "fromSide": "left", "toSide": "right", "style": "elbow"})).unwrap();
+    let k2 = s.selection()[0];
+    let pts = drawn(&s, k2);
+    let (ra, rb) = (Rect::new(0.0, 0.0, 100.0, 100.0), Rect::new(300.0, 0.0, 400.0, 100.0));
+    assert!(!through(&pts, ra) && !through(&pts, rb), "{pts:?}");
+    assert_eq!(pts.first().copied(), Some(Point::new(0.0, 50.0)));
+    assert_eq!(pts.last().copied(), Some(Point::new(400.0, 50.0)));
+    assert_eq!(pts.len(), 6, "out, over, down and in: {pts:?}");
+    assert!(pts.iter().all(|p| p.y <= 50.0), "over the top, the nearer way round: {pts:?}");
+    assert!(pts.windows(2).all(|w| w[0].x == w[1].x || w[0].y == w[1].y), "right angles only");
+    // Facing each other, the short way stays.
+    assert_eq!(drawn(&s, k), vec![Point::new(100.0, 50.0), Point::new(300.0, 50.0)]);
+    // An end at the bottom of b leaving towards a above it: around b's side and up.
+    s.execute("board.reattach", &json!({"id": k2, "end": "to", "target": b, "side": "bottom"})).unwrap();
+    let pts = drawn(&s, k2);
+    assert!(!through(&pts, ra) && !through(&pts, rb), "{pts:?}");
+    assert_eq!(pts.last().copied(), Some(Point::new(350.0, 100.0)));
+}
+
+#[test]
+fn reattach_survives_junk() {
+    let (mut s, [_, _, _, k]) = three();
+    for p in [
+        json!({"id": k, "end": "to", "target": {"x": 1e308, "y": -1e308}}),
+        json!({"id": k, "end": "from", "target": {"x": f64::MAX, "y": 0}, "side": 5}),
+        json!({"id": [k], "end": ["to"], "target": [1]}),
+        json!({"ids": "x", "end": null, "target": null}),
+        json!({"id": k, "end": "to", "target": 99_999}),
+    ] {
+        let _ = s.execute("board.reattach", &p);
+        let _ = s.execute("board.setStyle", &json!({"ids": [k], "style": "curved"}));
+        let _ = s.execute("board.reattach", &p);
+    }
+    assert!(matches!(node(&s, k).board, Some(BoardItem::Connector(_))));
+    assert!(drawn(&s, k).iter().all(|p| p.x.is_finite() && p.y.is_finite()));
+}
diff --git a/crates/engine/src/board_tables_tests.rs b/crates/engine/src/board_tables_tests.rs
new file mode 100644
index 00000000..2c0d07bb
--- /dev/null
+++ b/crates/engine/src/board_tables_tests.rs
@@ -0,0 +1,257 @@
+//! Boards: templates (each placed as board objects in one undo step) and tables (made from auto
+//! layout frames, edited by rows and columns, typed into with the text tools, synced live).
+
+use figcraft_doc::{BoardItem, NodeId, NodeKind};
+use serde_json::{Value, json};
+
+use crate::board_tests::{board, id, node};
+use crate::collab_live_tests::Room;
+use crate::tools::{PointerEvent, PointerKind};
+use crate::{EngineError, Session};
+
+fn count(s: &Session, f: impl Fn(&BoardItem) -> bool) -> usize {
+    s.doc().unwrap().nodes().filter(|n| n.board.as_ref().is_some_and(&f)).count()
+}
+
+fn ids(v: &Value, key: &str) -> Vec<NodeId> {
+    v[key].as_array().unwrap().iter().map(|i| NodeId(i.as_u64().unwrap())).collect()
+}
+
+/// Rows of cell texts' characters.
+fn texts(s: &Session, table: &Value) -> Vec<Vec<String>> {
+    let chars = |v: &Value| match &node(s, NodeId(v.as_u64().unwrap())).kind {
+        NodeKind::Text(td) => td.characters.clone(),
+        _ => panic!("not text"),
+    };
+    table["cells"].as_array().unwrap().iter().map(|r| r.as_array().unwrap().iter().map(chars).collect()).collect()
+}
+
+/// A table's column lines (its laid-out-over children): their x and height.
+fn lines(s: &Session, table: NodeId) -> Vec<(f64, f64)> {
+    let doc = s.doc().unwrap();
+    let t = doc.node(table).unwrap();
+    t.children.iter().map(|c| doc.node(*c).unwrap()).filter(|n| n.child_layout.absolute).map(|n| (n.transform.translation().x, n.height)).collect()
+}
+
+#[test]
+fn every_template_places_board_objects_in_one_undo_step() {
+    let mut s = board();
+    let list = s.execute("board.templates", &json!({})).unwrap();
+    let names: Vec<&str> = list.as_array().unwrap().iter().map(|t| t["id"].as_str().unwrap()).collect();
+    assert_eq!(names, ["retrospective", "brainstorm", "weeklyPlanner", "flowChart", "kanban"]);
+    for (i, name) in names.iter().enumerate() {
+        let before = s.doc().unwrap().nodes().count();
+        let r = s.execute("board.template", &json!({"name": name, "x": i as f64 * 2000.0, "y": 0})).unwrap();
+        let made = ids(&r, "ids");
+        assert!(!made.is_empty(), "{name}");
+        assert_eq!(s.selection(), made, "{name}: what it placed is selected");
+        let doc = s.doc().unwrap();
+        // It sits where it was asked to, about its listed size.
+        let b = doc.bounds_of(&made).unwrap();
+        assert!((b.x0 - i as f64 * 2000.0).abs() < 1.0 && b.y0.abs() < 1.0, "{name} at {b:?}");
+        let size = &list[i];
+        assert!((b.width() - size["width"].as_f64().unwrap()).abs() < 2.0, "{name}: width {}", b.width());
+        assert!(b.height() <= size["height"].as_f64().unwrap() + 2.0, "{name}: height {}", b.height());
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().nodes().count(), before, "{name}: one undo step");
+        s.execute("edit.redo", &json!({})).unwrap();
+    }
+    // By name too, centred in the view without a place.
+    let view = s.ds().unwrap().view.clone();
+    let r = s.execute("board.template", &json!({"name": "Kanban board"})).unwrap();
+    let b = s.doc().unwrap().bounds_of(&ids(&r, "ids")).unwrap();
+    assert!((b.center().x - view.cx).abs() < 2.0, "{b:?} centred on {}", view.cx);
+    assert!(s.execute("board.template", &json!({"name": "party"})).is_err());
+    assert!(s.execute("board.template", &json!({})).is_err());
+    let mut d = Session::new();
+    d.execute("file.new", &json!({})).unwrap();
+    assert!(matches!(d.execute("board.template", &json!({"name": "kanban"})), Err(EngineError::Disabled(..))), "boards only");
+    assert!(matches!(d.execute("board.table", &json!({})), Err(EngineError::Disabled(..))), "boards only");
+}
+
+#[test]
+fn templates_are_made_of_ordinary_board_objects() {
+    let mut s = board();
+    s.execute("board.template", &json!({"name": "retrospective", "x": 0, "y": 0})).unwrap();
+    let doc = s.doc().unwrap();
+    let sections: Vec<_> = doc.nodes().filter(|n| matches!(n.kind, NodeKind::Section { .. })).collect();
+    assert_eq!(sections.iter().map(|n| n.name.as_str()).collect::<Vec<_>>(), ["Went well", "To improve", "Next steps"]);
+    for sec in &sections {
+        let stickies = sec.children.iter().filter(|c| matches!(doc.node(**c).unwrap().board, Some(BoardItem::Sticky { .. }))).count();
+        assert_eq!(stickies, 2, "{}", sec.name);
+    }
+    // No author on a template's stickies.
+    assert!(doc.nodes().filter(|n| matches!(n.board, Some(BoardItem::Sticky { .. }))).all(|n| n.board.as_ref().unwrap().author().is_empty()));
+    // The flow chart's connectors join its shapes, labelled at the decision.
+    s.execute("board.template", &json!({"name": "flowChart", "x": 0, "y": 1000})).unwrap();
+    let doc = s.doc().unwrap();
+    let joined: Vec<_> = doc
+        .nodes()
+        .filter_map(|n| match &n.board {
+            Some(BoardItem::Connector(c)) => Some((c.from.node().unwrap(), c.to.node().unwrap())),
+            _ => None,
+        })
+        .collect();
+    assert_eq!(joined.len(), 6);
+    assert!(joined.iter().all(|(a, b)| matches!(doc.node(*a).unwrap().board, Some(BoardItem::Shape { .. }))
+        && matches!(doc.node(*b).unwrap().board, Some(BoardItem::Shape { .. }))));
+    assert_eq!(count(&s, |b| matches!(b, BoardItem::Label { .. })), 2);
+    // The brainstorm's topic is joined to each of its four clusters.
+    s.execute("board.template", &json!({"name": "brainstorm", "x": 3000, "y": 0})).unwrap();
+    assert_eq!(count(&s, |b| matches!(b, BoardItem::Connector(_))), 10);
+}
+
+#[test]
+fn a_table_is_auto_layout_frames_with_a_header_and_column_lines() {
+    let mut s = board();
+    let r = s.execute("board.table", &json!({"x": 0, "y": 0, "cells": [["Name", "Role"], ["Ada", "Lead"]], "rows": 3})).unwrap();
+    let t = id(&r, "id");
+    assert_eq!((r["rows"].as_u64(), r["columns"].as_u64()), (Some(3), Some(2)));
+    assert_eq!(texts(&s, &r), [["Name", "Role"], ["Ada", "Lead"], ["", ""]]);
+    assert_eq!(node(&s, t).board, Some(BoardItem::Table));
+    assert_eq!(s.selection(), [t]);
+    let table = node(&s, t);
+    assert_eq!(table.width, 320.0);
+    let rows: Vec<_> = table.children.iter().map(|c| node(&s, *c)).filter(|n| !n.child_layout.absolute).collect();
+    assert_eq!(rows.len(), 3);
+    assert!(rows[0].fills.len() == 1 && rows[1].fills.is_empty(), "the header row is tinted");
+    assert!(rows[1].strokes.len() == 1 && rows[2].strokes.is_empty(), "a line under every row but the last");
+    let cell = node(&s, rows[1].children[1]);
+    assert_eq!((cell.width, cell.transform.translation().x), (160.0, 160.0), "cells share their row");
+    assert_eq!(table.height, rows.iter().map(|r| r.height).sum::<f64>(), "the table hugs its rows");
+    assert_eq!(lines(&s, t), [(159.5, table.height)], "the column line runs the table's height");
+    // Caps and refusals.
+    for bad in
+        [json!({"rows": 51}), json!({"columns": 21}), json!({"rows": 0}), json!({"rows": 2.5}), json!({"cells": [["a", "b", "c"]], "columns": 2})]
+    {
+        assert!(s.execute("board.table", &bad).is_err(), "{bad}");
+    }
+    assert!(s.execute("board.table", &json!({"rows": 50, "columns": 20})).is_ok(), "the largest table");
+    // It saves and reopens.
+    let doc = s.doc().unwrap();
+    let (back, _) = figcraft_format::from_json(&figcraft_format::to_json(doc).unwrap().to_string()).unwrap();
+    assert_eq!(back.node(t).unwrap().board, Some(BoardItem::Table));
+}
+
+#[test]
+fn table_edits_add_and_remove_rows_and_columns_keeping_text() {
+    let mut s = board();
+    let r = s.execute("board.table", &json!({"x": 0, "y": 0, "cells": [["a", "b"], ["c", "d"]]})).unwrap();
+    let t = id(&r, "id");
+    let edit = |s: &mut Session, p: Value| s.execute("board.tableEdit", &p);
+    let r = edit(&mut s, json!({"id": t, "action": "addRow", "index": 1})).unwrap();
+    assert_eq!(texts(&s, &r), [["a", "b"], ["", ""], ["c", "d"]]);
+    let r = edit(&mut s, json!({"action": "addColumn", "index": 0})).unwrap();
+    assert_eq!(texts(&s, &r), [["", "a", "b"], ["", "", ""], ["", "c", "d"]]);
+    assert_eq!(node(&s, t).width, 480.0, "a new column as wide as the others");
+    assert_eq!(lines(&s, t).len(), 2);
+    let r = edit(&mut s, json!({"action": "removeRow", "index": 0})).unwrap();
+    assert_eq!(texts(&s, &r), [["", "", ""], ["", "c", "d"]]);
+    let first = node(&s, node(&s, t).children[0]);
+    assert_eq!(first.fills.len(), 1, "the new first row is the header");
+    let r = edit(&mut s, json!({"action": "removeColumn"})).unwrap();
+    assert_eq!(texts(&s, &r), [["", ""], ["", "c"]]);
+    assert_eq!(node(&s, t).width, 320.0);
+    // From a cell inside it too.
+    let cell_text = NodeId(r["cells"][1][1].as_u64().unwrap());
+    let r = edit(&mut s, json!({"id": cell_text, "action": "addRow"})).unwrap();
+    assert_eq!(r["rows"], 3);
+    // Undo, one step each.
+    s.execute("edit.undo", &json!({})).unwrap();
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(node(&s, t).width, 480.0);
+    // Refusals: the wrong action or index, the last row or column, beyond the caps, not a table.
+    for p in [
+        json!({"id": t, "action": "explode"}),
+        json!({"id": t, "action": "addRow", "index": 9}),
+        json!({"id": t, "action": "removeColumn", "index": 3}),
+        json!({"id": t, "action": "addRow", "index": -1}),
+        json!({"id": t}),
+    ] {
+        assert!(edit(&mut s, p.clone()).is_err(), "{p}");
+    }
+    let one = id(&s.execute("board.table", &json!({"rows": 1, "columns": 1})).unwrap(), "id");
+    assert!(edit(&mut s, json!({"id": one, "action": "removeRow"})).is_err());
+    assert!(edit(&mut s, json!({"id": one, "action": "removeColumn"})).is_err());
+    let full = id(&s.execute("board.table", &json!({"rows": 50, "columns": 20})).unwrap(), "id");
+    assert!(edit(&mut s, json!({"id": full, "action": "addRow"})).is_err());
+    assert!(edit(&mut s, json!({"id": full, "action": "addColumn"})).is_err());
+    let sticky = id(&s.execute("board.sticky", &json!({"x": 0, "y": 900})).unwrap(), "id");
+    assert!(edit(&mut s, json!({"id": sticky, "action": "addRow"})).is_err());
+}
+
+#[test]
+fn a_double_click_types_in_the_cell_and_its_row_grows_with_the_text() {
+    let mut s = board();
+    let r = s.execute("board.table", &json!({"x": 0, "y": 0})).unwrap();
+    let t = id(&r, "id");
+    let h0 = node(&s, t).height;
+    s.execute("select.none", &json!({})).unwrap();
+    // The middle cell (columns 160 wide, rows about 40 tall).
+    let row_h = h0 / 3.0;
+    s.pointer(&PointerEvent::at(PointerKind::DoubleClick, 240.0, row_h * 1.5, 1.0)).unwrap();
+    let te = s.ds().unwrap().text_edit.clone().expect("typing in the cell");
+    assert_eq!(te.id.0, r["cells"][1][1].as_u64().unwrap());
+    crate::textedit::insert(
+        &mut s,
+        "A longer note
+over
+several lines",
+    )
+    .unwrap();
+    crate::textedit::end(&mut s).unwrap();
+    let h1 = node(&s, t).height;
+    assert!(h1 > h0 + 10.0, "the row grew: {h0} → {h1}");
+    assert!(lines(&s, t).iter().all(|(_, h)| (*h - h1).abs() < 1e-6), "column lines follow: {:?} vs {h1}", lines(&s, t));
+    // A plain click picks the table whole.
+    s.execute("select.none", &json!({})).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Down, 240.0, 10.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, 240.0, 10.0, 1.0)).unwrap();
+    assert_eq!(s.selection(), [t]);
+}
+
+#[test]
+fn tables_and_templates_sync_in_live_sessions() {
+    let s = board();
+    let mut room = Room::new(s.doc().unwrap().clone(), 2, 11);
+    let t = id(&room.s(0).execute("board.table", &json!({"x": 0, "y": 0})).unwrap(), "id");
+    room.s(1).execute("board.template", &json!({"name": "flowChart", "x": 0, "y": 600})).unwrap();
+    room.settle();
+    room.check();
+    room.s(1).execute("board.tableEdit", &json!({"id": t, "action": "addColumn"})).unwrap();
+    room.settle();
+    room.check();
+    let doc = room.server.document();
+    assert_eq!(doc.node(t).unwrap().width, 640.0);
+    assert_eq!(doc.nodes().filter(|n| matches!(n.board, Some(BoardItem::Connector(_)))).count(), 6);
+}
+
+#[test]
+fn template_and_table_commands_survive_junk() {
+    let junk = [
+        json!({}),
+        json!(null),
+        json!([1]),
+        json!({"name": 7, "x": "NaN", "y": 1e308, "rows": "x", "columns": -1, "cells": 5}),
+        json!({"name": "kanban", "x": -1e308, "y": 1e308, "rows": 1e308, "columns": 0.5, "cells": [[1, 2]]}),
+        json!({"name": "\u{0}", "cells": [["a"], "b"], "rows": 50, "columns": 20}),
+        json!({"id": "x", "action": 5, "index": 1e308}),
+        json!({"id": -1, "action": "addRow", "index": -1}),
+        json!({"id": 99_999, "action": "removeColumn", "index": "NaN"}),
+        json!({"id": 2, "action": "addColumn", "index": 0}),
+    ];
+    for cmd in ["board.template", "board.templates", "board.table", "board.tableEdit"] {
+        for j in &junk {
+            let mut s = board();
+            let t = s.execute("board.table", &json!({"x": 0, "y": 0})).unwrap()["id"].clone();
+            let _ = s.execute("board.template", &json!({"name": "brainstorm"}));
+            let mut j = j.clone();
+            if j.get("action").is_some_and(|a| a == "addColumn") {
+                j["id"] = t;
+            }
+            if let Err(EngineError::Internal { cmd, msg }) = s.execute(cmd, &j) {
+                panic!("{cmd} panicked on {j}: {msg}");
+            }
+        }
+    }
+}
diff --git a/crates/engine/src/board_tests.rs b/crates/engine/src/board_tests.rs
new file mode 100644
index 00000000..56b24b84
--- /dev/null
+++ b/crates/engine/src/board_tests.rs
@@ -0,0 +1,365 @@
+//! Boards: the file kind, sticky notes, shapes with text, connectors that follow what they join
+//! (locally, through undo and in live sessions), stamps, ink and the eraser, and refusals.
+
+use figcraft_doc::{
+    BOARD_PAGE, BoardItem, BoardShape, Connector, End, FileKind, Node, NodeId, NodeKind, Routing, Side, Stamp, StrokeCap, board_color,
+};
+use figcraft_geom::Point;
+use serde_json::{Value, json};
+
+use crate::board::{route, sticky_font_size};
+use crate::collab_live_tests::Room;
+use crate::tools::{PointerEvent, PointerKind, ToolId};
+use crate::{EngineError, Session};
+
+pub(crate) fn board() -> Session {
+    let mut s = Session::new();
+    s.execute("file.newBoard", &json!({"name": "Ideas"})).unwrap();
+    s
+}
+
+pub(crate) fn id(v: &Value, key: &str) -> NodeId {
+    v[key].as_u64().map(NodeId).unwrap_or_else(|| panic!("no {key} in {v}"))
+}
+
+pub(crate) fn node(s: &Session, id: NodeId) -> Node {
+    s.doc().unwrap().node(id).unwrap().clone()
+}
+
+pub(crate) fn connector(s: &Session, id: NodeId) -> Connector {
+    match node(s, id).board {
+        Some(BoardItem::Connector(c)) => c,
+        other => panic!("not a connector: {other:?}"),
+    }
+}
+
+/// Connector `id`'s points on the page.
+pub(crate) fn drawn(s: &Session, id: NodeId) -> Vec<Point> {
+    let doc = s.doc().unwrap();
+    let NodeKind::Vector { network } = &doc.node(id).unwrap().kind else { panic!("not a vector") };
+    let w = doc.world_transform(id);
+    network.vertices.iter().map(|v| w * v.point()).collect()
+}
+
+pub(crate) fn near(a: Point, b: Point) -> bool {
+    (a - b).hypot() < 1e-6
+}
+
+#[test]
+fn a_board_is_a_kind_of_file_that_saves_and_reopens() {
+    let s = board();
+    let doc = s.doc().unwrap();
+    assert_eq!(doc.kind, FileKind::Board);
+    assert!(matches!(doc.node(doc.pages[0]).unwrap().kind, NodeKind::Page { background, .. } if background == BOARD_PAGE));
+    let (back, _) = figcraft_format::from_json(&figcraft_format::to_json(doc).unwrap().to_string()).unwrap();
+    assert_eq!(back.kind, FileKind::Board);
+    // Files from before boards (no kind) are design files, and design files don't write one.
+    let mut d = Session::new();
+    d.execute("file.new", &json!({})).unwrap();
+    let json = figcraft_format::to_json(d.doc().unwrap()).unwrap();
+    assert!(json.get("kind").is_none());
+    assert_eq!(figcraft_format::from_json(&json.to_string()).unwrap().0.kind, FileKind::Design);
+    assert_eq!(crate::inspect::document(&s, 0, false)["kind"], "board", "inspect shows the kind");
+}
+
+#[test]
+fn board_commands_refuse_on_design_files_and_prototyping_refuses_on_boards() {
+    let mut d = Session::new();
+    d.execute("file.new", &json!({})).unwrap();
+    for (cmd, p) in [("board.sticky", json!({"x": 0, "y": 0})), ("tool.sticky", json!({})), ("tool.set", json!({"tool": "marker"}))] {
+        assert!(matches!(d.execute(cmd, &p), Err(EngineError::Disabled(..))), "{cmd} on a design file");
+    }
+    let mut s = board();
+    for cmd in ["view.devMode", "view.prototype", "proto.present", "proto.flow.add", "dev.focus"] {
+        let e = s.execute(cmd, &json!({})).unwrap_err();
+        assert!(e.to_string().contains("boards have no prototypes"), "{cmd}: {e}");
+    }
+}
+
+#[test]
+fn a_sticky_is_a_square_frame_whose_note_shrinks_as_it_grows() {
+    let mut s = board();
+    s.prefs.user_name = "Ada".into();
+    let r = s.execute("board.sticky", &json!({"x": 10, "y": 20, "text": "Hi", "color": "blue"})).unwrap();
+    let (st, note) = (id(&r, "id"), id(&r, "text"));
+    let n = node(&s, st);
+    assert!(n.is_board_atom() && matches!(&n.board, Some(BoardItem::Sticky { author }) if author == "Ada"));
+    assert_eq!((n.width, n.height), (200.0, 200.0));
+    assert_eq!(n.fills[0].solid_color(), board_color("blue"));
+    assert!(n.layout.is_some() && !n.effects.is_empty());
+    assert_eq!(n.children.len(), 2, "the note and its author");
+    assert_eq!(node(&s, note).kind.text().unwrap().style.font_size, 24.0);
+    // A click on the note picks the sticky whole.
+    let doc = s.doc().unwrap();
+    assert_eq!(figcraft_doc::geometry::select_target(doc, note, &[], false), st);
+    // A long note takes a smaller size; a very long one grows the sticky past its square.
+    let long = "word ".repeat(120);
+    s.execute("node.set", &json!({"id": note, "props": {"characters": long}})).unwrap();
+    assert_eq!(node(&s, note).kind.text().unwrap().style.font_size, sticky_font_size(&long));
+    assert!(sticky_font_size(&long) < 16.0);
+    assert!(node(&s, st).width == 200.0 && node(&s, st).height >= 200.0);
+    // Undo puts the short note and its size back.
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(node(&s, note).kind.text().unwrap().style.font_size, 24.0);
+}
+
+#[test]
+fn next_sticky_goes_beside_in_the_same_colour_and_emptied_notes_stay() {
+    let mut s = board();
+    let a = id(&s.execute("board.sticky", &json!({"x": 0, "y": 0, "color": "pink"})).unwrap(), "id");
+    let r = s.execute("board.nextSticky", &json!({})).unwrap();
+    let b = id(&r, "id");
+    let (na, nb) = (node(&s, a), node(&s, b));
+    assert_eq!(nb.transform.translation().x, na.width + 24.0);
+    assert_eq!(nb.fills, na.fills);
+    assert_eq!(s.selection(), vec![b]);
+    // Typing in it and emptying it again keeps its note; ending selects the sticky.
+    let note = id(&r, "text");
+    crate::board::edit_text(&mut s, b).unwrap();
+    crate::textedit::insert(&mut s, "x").unwrap();
+    crate::textedit::key(&mut s, "Backspace", false, false, false).unwrap();
+    crate::textedit::end(&mut s).unwrap();
+    assert!(s.doc().unwrap().contains(note));
+    assert_eq!(s.selection(), vec![b]);
+}
+
+#[test]
+fn shapes_carry_text_and_change_outline() {
+    let mut s = board();
+    let r = s.execute("board.shape", &json!({"shape": "diamond", "x": 0, "y": 0, "text": "Decide", "color": "green"})).unwrap();
+    let sh = id(&r, "id");
+    let n = node(&s, sh);
+    assert_eq!(n.board, Some(BoardItem::Shape { shape: BoardShape::Diamond }));
+    assert_eq!(n.children.len(), 2);
+    assert!(matches!(node(&s, n.children[0]).kind, NodeKind::Vector { .. }));
+    s.execute("board.setStyle", &json!({"ids": [sh], "shape": "speechBubble", "fontSize": 24})).unwrap();
+    assert_eq!(node(&s, sh).board, Some(BoardItem::Shape { shape: BoardShape::SpeechBubble }));
+    assert_eq!(node(&s, id(&r, "text")).kind.text().unwrap().style.font_size, 24.0);
+    s.execute("board.setColor", &json!({"ids": [sh], "color": "#FF0000"})).unwrap();
+    assert_eq!(node(&s, n.children[0]).fills[0].solid_color().map(|c| c.to_hex()), Some("FF0000".into()));
+    assert!(s.execute("board.shape", &json!({"shape": "blob", "x": 0, "y": 0})).is_err());
+}
+
+#[test]
+fn connectors_follow_what_they_join_and_undo_with_it() {
+    let mut s = board();
+    let a = id(&s.execute("board.sticky", &json!({"x": 0, "y": 0})).unwrap(), "id");
+    let b = id(&s.execute("board.sticky", &json!({"x": 400, "y": 0})).unwrap(), "id");
+    let c = id(&s.execute("board.connector", &json!({"from": a, "to": b, "style": "straight", "label": "then"})).unwrap(), "id");
+    let pts = drawn(&s, c);
+    assert!(near(pts[0], Point::new(200.0, 100.0)) && near(pts[1], Point::new(400.0, 100.0)), "{pts:?}");
+    assert_eq!(node(&s, c).stroke.cap_end, StrokeCap::TriangleArrow);
+    // Its label sits at the middle.
+    let label = crate::board::label_of(s.doc().unwrap(), c).unwrap();
+    let lb = s.doc().unwrap().world_bounds(label).unwrap();
+    assert!(near(lb.center(), Point::new(300.0, 100.0)), "{lb:?}");
+    // Move one end: the connector re-routes (elbow now, out of the facing sides).
+    s.execute("board.setStyle", &json!({"ids": [c], "style": "elbow"})).unwrap();
+    s.execute("transform.move", &json!({"ids": [b], "dx": 0, "dy": 300})).unwrap();
+    let pts = drawn(&s, c);
+    assert!(near(pts[0], Point::new(200.0, 100.0)) && near(*pts.last().unwrap(), Point::new(400.0, 400.0)), "{pts:?}");
+    assert!(pts.windows(2).all(|w| w[0].x == w[1].x || w[0].y == w[1].y), "right angles: {pts:?}");
+    // Undo takes the move back and the route with it.
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert!(near(*drawn(&s, c).last().unwrap(), Point::new(400.0, 100.0)));
+    // A deleted end stays where it was, as a point.
+    s.execute("edit.delete", &json!({"ids": [b]})).unwrap();
+    assert!(matches!(connector(&s, c).to, End::Point { .. }));
+    assert!(near(*drawn(&s, c).last().unwrap(), Point::new(400.0, 100.0)));
+    // A connector moved on its own takes its free end along; the attached one stays.
+    s.execute("transform.move", &json!({"ids": [c], "dx": 0, "dy": 50})).unwrap();
+    assert!(matches!(connector(&s, c).to, End::Point { x, y } if x == 400.0 && y == 150.0), "{:?}", connector(&s, c));
+    assert!(near(drawn(&s, c)[0], Point::new(200.0, 100.0)));
+    // Deleting the connector takes its label.
+    s.execute("edit.delete", &json!({"ids": [c]})).unwrap();
+    assert!(!s.doc().unwrap().contains(label));
+    assert!(s.execute("board.connector", &json!({"from": a, "to": a})).is_err());
+}
+
+#[test]
+fn routes_are_the_same_for_the_same_document() {
+    let mut s = board();
+    let a = id(&s.execute("board.shape", &json!({"x": 0, "y": 0})).unwrap(), "id");
+    let c = Connector { from: End::Node { node: a, side: Side::Bottom }, to: End::Point { x: 300.0, y: 500.0 }, routing: Routing::Elbow };
+    let doc = s.doc().unwrap();
+    let r = route(doc, &c).unwrap();
+    assert_eq!(r, route(&doc.clone(), &c).unwrap());
+    // Down out of the bottom, across halfway, down into the point.
+    assert_eq!(r, vec![Point::new(80.0, 160.0), Point::new(80.0, 330.0), Point::new(300.0, 330.0), Point::new(300.0, 500.0)]);
+}
+
+#[test]
+fn stamps_and_ink_and_the_eraser() {
+    let mut s = board();
+    s.prefs.user_name = "Grace".into();
+    let st = id(&s.execute("board.stamp", &json!({"x": 100, "y": 100, "stamp": "heart"})).unwrap(), "id");
+    let n = node(&s, st);
+    assert_eq!(n.board, Some(BoardItem::Stamp { stamp: Stamp::Heart, author: "Grace".into() }));
+    assert_eq!(s.doc().unwrap().world_bounds(st).unwrap().center(), Point::new(100.0, 100.0));
+    assert!(!n.children.is_empty());
+    // Marker and highlighter strokes through the tools; the eraser takes what it touches.
+    let draw = |s: &mut Session, tool: &str, y: f64| {
+        s.execute("tool.set", &json!({"tool": tool})).unwrap();
+        for (k, x) in [(PointerKind::Down, 0.0), (PointerKind::Move, 50.0), (PointerKind::Move, 100.0), (PointerKind::Up, 150.0)] {
+            s.pointer(&PointerEvent::at(k, x, y, 1.0)).unwrap();
+        }
+    };
+    draw(&mut s, "marker", 300.0);
+    draw(&mut s, "highlighter", 400.0);
+    let inks: Vec<Node> = s.doc().unwrap().nodes().filter(|n| n.board == Some(BoardItem::Ink)).cloned().collect();
+    assert_eq!(inks.len(), 2);
+    assert!(inks.iter().any(|n| n.opacity < 1.0 && n.stroke.weight > 10.0), "a highlighter stroke");
+    let undo = s.undo_depth().0;
+    s.execute("tool.eraser", &json!({})).unwrap();
+    for (k, x) in [(PointerKind::Down, 20.0), (PointerKind::Move, 60.0), (PointerKind::Up, 80.0)] {
+        s.pointer(&PointerEvent::at(k, x, 300.0, 1.0)).unwrap();
+    }
+    assert_eq!(s.doc().unwrap().nodes().filter(|n| n.board == Some(BoardItem::Ink)).count(), 1, "the marker stroke is gone");
+    assert_eq!(s.undo_depth().0, undo + 1, "one step");
+    assert_eq!(s.tool.tool, ToolId::Eraser);
+}
+
+#[test]
+fn the_sticky_and_connector_tools() {
+    let mut s = board();
+    s.execute("tool.sticky", &json!({"color": "orange"})).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Down, 100.0, 100.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, 100.0, 100.0, 1.0)).unwrap();
+    let te = s.ds().unwrap().text_edit.clone().expect("typing in the new sticky");
+    let a = crate::board::owner_of_text(s.doc().unwrap(), te.id).unwrap();
+    assert_eq!(node(&s, a).fills[0].solid_color(), board_color("orange"));
+    crate::textedit::insert(&mut s, "First").unwrap();
+    crate::textedit::end(&mut s).unwrap();
+    let b = id(&s.execute("board.sticky", &json!({"x": 500, "y": 0})).unwrap(), "id");
+    s.execute("tool.connector", &json!({})).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Down, 100.0, 100.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Move, 300.0, 100.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, 600.0, 100.0, 1.0)).unwrap();
+    let c = s.doc().unwrap().nodes().find(|n| matches!(n.board, Some(BoardItem::Connector(_)))).map(|n| n.id).unwrap();
+    let k = connector(&s, c);
+    assert_eq!((k.from.node(), k.to.node()), (Some(a), Some(b)));
+}
+
+#[test]
+fn boards_sync_in_live_sessions() {
+    let mut s = board();
+    let a = id(&s.execute("board.sticky", &json!({"x": 0, "y": 0, "text": "A"})).unwrap(), "id");
+    let mut room = Room::new(s.doc().unwrap().clone(), 2, 7);
+    assert_eq!(room.s(1).doc().unwrap().kind, FileKind::Board, "joiners get a board");
+    let b = id(&room.s(1).execute("board.sticky", &json!({"x": 400, "y": 0, "text": "B"})).unwrap(), "id");
+    room.settle();
+    let c = id(&room.s(0).execute("board.connector", &json!({"from": a, "to": b})).unwrap(), "id");
+    room.s(1).execute("board.stamp", &json!({"x": 50, "y": 50, "stamp": "star"})).unwrap();
+    room.settle();
+    room.check();
+    // Person 1 moves the sticky person 0 connected: both see the connector follow it.
+    room.s(1).execute("transform.move", &json!({"ids": [b], "dx": 0, "dy": 250})).unwrap();
+    room.s(0).execute("board.setColor", &json!({"ids": [a], "color": "violet"})).unwrap();
+    room.settle();
+    room.check();
+    let doc = room.server.document();
+    let NodeKind::Vector { network } = &doc.node(c).unwrap().kind else { panic!("not a vector") };
+    let end = doc.world_transform(c) * network.vertices.last().unwrap().point();
+    assert_eq!(end, Point::new(400.0, 350.0), "to the moved sticky's facing side");
+    assert_eq!(doc.node(a).unwrap().fills[0].solid_color(), board_color("violet"));
+}
+
+#[test]
+fn board_commands_survive_junk() {
+    let junk = [
+        json!({}),
+        json!(null),
+        json!([1]),
+        json!({"x": "NaN", "y": 1e308, "text": 5, "color": [1], "author": {"x": 1}, "parent": "p"}),
+        json!({"x": -1e308, "y": 0, "color": "neon", "shape": 7, "width": -5, "height": 1e308, "stamp": "skull"}),
+        json!({"from": {"x": "a"}, "to": 99_999, "fromSide": "inside", "style": 3, "startCap": "spike", "endCap": 7, "label": [1]}),
+        json!({"from": {"x": 1e308, "y": -1e308}, "to": {"x": 0, "y": 0}, "style": "elbow", "label": "\u{0}"}),
+        json!({"ids": ["x", -1, 99_999], "color": "#GGG", "fontSize": -1, "side": "up", "edit": "yes"}),
+        json!({"id": 2, "text": "", "path": "M0 0 L", "points": [[1]], "highlighter": "yes"}),
+        json!({"path": "M0 0 L 1e308 1e308", "points": [[0, 0], [1e308, 1]]}),
+        json!({"end": "from", "target": {"x": 1e308, "y": -1e308}, "side": "inside", "style": "curved"}),
+        json!({"id": 99_999, "end": 7, "target": [1], "style": "wavy"}),
+    ];
+    let ids: Vec<&str> = crate::cmd::all_commands()
+        .iter()
+        .map(|c| c.id)
+        .filter(|i| {
+            i.starts_with("board.")
+                || ["tool.sticky", "tool.shape", "tool.connector", "tool.marker", "tool.highlighter", "tool.eraser", "tool.stamp", "file.newBoard"]
+                    .contains(i)
+        })
+        .collect();
+    assert!(ids.len() >= 17, "{ids:?}");
+    for cmd in ids {
+        for j in &junk {
+            let mut s = board();
+            let a = s.execute("board.sticky", &json!({"x": 0, "y": 0})).unwrap()["id"].clone();
+            let b = s.execute("board.shape", &json!({"x": 300, "y": 0})).unwrap()["id"].clone();
+            let _ = s.execute("board.connector", &json!({"from": a, "to": b, "label": "x"}));
+            if let Err(EngineError::Internal { cmd, msg }) = s.execute(cmd, j) {
+                panic!("{cmd} panicked on {j}: {msg}");
+            }
+        }
+    }
+    // Every other command on a board with objects on it.
+    for spec in crate::cmd::all_commands() {
+        if spec.id.starts_with("file.") && spec.id != "file.newBoard" || spec.id == "text.rescanFonts" || spec.id == "image.place" {
+            continue;
+        }
+        for j in &junk[..3] {
+            let mut s = board();
+            let a = s.execute("board.sticky", &json!({"x": 0, "y": 0})).unwrap()["id"].clone();
+            let b = s.execute("board.stamp", &json!({"x": 300, "y": 0})).unwrap()["id"].clone();
+            let _ = s.execute("board.connector", &json!({"from": a, "to": b}));
+            if let Err(EngineError::Internal { cmd, msg }) = s.execute(spec.id, j) {
+                panic!("{cmd} panicked on {j}: {msg}");
+            }
+        }
+    }
+}
+
+#[test]
+fn a_press_on_a_stickys_background_picks_and_drags_it() {
+    let mut s = board();
+    let a = id(&s.execute("board.sticky", &json!({"x": 0, "y": 0, "text": "Hi"})).unwrap(), "id");
+    let b = id(&s.execute("board.sticky", &json!({"x": 400, "y": 0})).unwrap(), "id");
+    let c = id(&s.execute("board.connector", &json!({"from": a, "to": b})).unwrap(), "id");
+    s.execute("select.none", &json!({})).unwrap();
+    // Below the note, on the sticky's own fill (a top-level frame's background is the canvas).
+    s.pointer(&PointerEvent::at(PointerKind::Down, 100.0, 150.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Move, 100.0, 250.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Move, 100.0, 450.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, 100.0, 450.0, 1.0)).unwrap();
+    assert_eq!(s.selection(), vec![a]);
+    assert_eq!(node(&s, a).transform.translation().y, 300.0);
+    assert!(near(drawn(&s, c)[0], Point::new(200.0, 400.0)), "the connector followed the drag: {:?}", drawn(&s, c));
+}
+
+#[test]
+fn a_copy_of_joined_objects_joins_the_copies() {
+    let mut s = board();
+    let a = id(&s.execute("board.sticky", &json!({"x": 0, "y": 0})).unwrap(), "id");
+    let b = id(&s.execute("board.sticky", &json!({"x": 400, "y": 0})).unwrap(), "id");
+    let c = id(&s.execute("board.connector", &json!({"from": a, "to": b, "label": "x"})).unwrap(), "id");
+    let label = crate::board::label_of(s.doc().unwrap(), c).unwrap();
+    s.execute("edit.duplicate", &json!({"ids": [a, b, c, label]})).unwrap();
+    let copies = s.selection();
+    assert_eq!(copies.len(), 4, "{copies:?}");
+    let k = copies.iter().find_map(|i| match node(&s, *i).board {
+        Some(BoardItem::Connector(k)) => Some(k),
+        _ => None,
+    });
+    let k = k.unwrap();
+    assert!(copies.contains(&k.from.node().unwrap()) && copies.contains(&k.to.node().unwrap()), "{k:?} {copies:?}");
+    // Copy and paste too.
+    s.execute("select.set", &json!({"ids": [a, b, c]})).unwrap();
+    s.execute("edit.copy", &json!({})).unwrap();
+    s.execute("edit.paste", &json!({})).unwrap();
+    let pasted = s.selection();
+    let k = pasted.iter().find_map(|i| match node(&s, *i).board {
+        Some(BoardItem::Connector(k)) => Some(k),
+        _ => None,
+    });
+    let k = k.unwrap();
+    assert!(pasted.contains(&k.from.node().unwrap()) && pasted.contains(&k.to.node().unwrap()), "{k:?} {pasted:?}");
+}
diff --git a/crates/engine/src/board_tools_tests.rs b/crates/engine/src/board_tools_tests.rs
new file mode 100644
index 00000000..4109adda
--- /dev/null
+++ b/crates/engine/src/board_tools_tests.rs
@@ -0,0 +1,277 @@
+//! Boards, continued: copies and pastes (within a file and from another), routes with named sides
+//! and free points, connectors inside moving sections, styles and labels with their refusals, and
+//! the shape, stamp, highlighter and connector tools with double-clicks.
+
+use figcraft_doc::{BoardItem, BoardShape, End, NodeId, Side, Stamp, StrokeCap, board_color};
+use figcraft_geom::Point;
+use serde_json::json;
+
+use crate::Session;
+use crate::board::route;
+use crate::board_tests::{board, connector, drawn, id, near, node};
+use crate::tools::{PointerEvent, PointerKind, ToolId};
+
+/// The connector among `ids`, if any.
+fn connector_in(s: &Session, ids: &[NodeId]) -> Option<figcraft_doc::Connector> {
+    let doc = s.doc().ok()?;
+    ids.iter().find_map(|i| match &doc.node(*i)?.board {
+        Some(BoardItem::Connector(k)) => Some(*k),
+        _ => None,
+    })
+}
+
+#[test]
+fn pasting_into_another_board_detaches_what_was_left_behind() {
+    let mut s = board();
+    let a = id(&s.execute("board.sticky", &json!({"x": 0, "y": 0})).unwrap(), "id");
+    let b = id(&s.execute("board.sticky", &json!({"x": 400, "y": 0})).unwrap(), "id");
+    let r = s.execute("board.connector", &json!({"from": a, "to": b, "style": "straight", "label": "x"})).unwrap();
+    let (c, label) = (id(&r, "id"), id(&r, "label"));
+    let first = s.active;
+    // A second board whose own ids are the same small numbers as the first's.
+    let second = s.execute("file.newBoard", &json!({})).unwrap()["index"].clone();
+    for x in [0, 300, 600, 900] {
+        s.execute("board.sticky", &json!({"x": x, "y": 500})).unwrap();
+    }
+    let others: Vec<NodeId> = s.doc().unwrap().nodes().map(|n| n.id).collect();
+    s.execute("doc.switch", &json!({"index": first})).unwrap();
+    s.execute("select.set", &json!({"ids": [a, c, label]})).unwrap();
+    s.execute("edit.copy", &json!({})).unwrap();
+    s.execute("doc.switch", &json!({"index": second})).unwrap();
+    s.execute("edit.paste", &json!({})).unwrap();
+    let doc = s.doc().unwrap();
+    let pasted = doc.nodes().find(|n| matches!(n.board, Some(BoardItem::Connector(_))) && !others.contains(&n.id)).unwrap().clone();
+    let k = connector(&s, pasted.id);
+    let from = k.from.node().unwrap();
+    assert!(!others.contains(&from) && matches!(doc.node(from).unwrap().board, Some(BoardItem::Sticky { .. })), "joins the pasted sticky");
+    let to = drawn(&s, pasted.id).last().copied().unwrap();
+    assert!(matches!(k.to, End::Point { x, y } if near(Point::new(x, y), to)), "the end left behind stays where it is drawn: {k:?}");
+    let pasted_label = crate::board::label_of(doc, pasted.id).expect("the label came with its connector");
+    assert!(!others.contains(&pasted_label));
+    // A label copied without its connector doesn't come.
+    s.execute("doc.switch", &json!({"index": first})).unwrap();
+    s.execute("select.set", &json!({"ids": [label]})).unwrap();
+    s.execute("edit.copy", &json!({})).unwrap();
+    s.execute("doc.switch", &json!({"index": second})).unwrap();
+    let labels = |s: &Session| s.doc().unwrap().nodes().filter(|n| matches!(n.board, Some(BoardItem::Label { .. }))).count();
+    let before = labels(&s);
+    s.execute("edit.paste", &json!({})).unwrap();
+    assert_eq!(labels(&s), before);
+    // Within its own file, a connector pasted alone stays joined to the same layers.
+    s.execute("doc.switch", &json!({"index": first})).unwrap();
+    s.execute("select.set", &json!({"ids": [c]})).unwrap();
+    s.execute("edit.copy", &json!({})).unwrap();
+    s.execute("edit.paste", &json!({})).unwrap();
+    let k = connector_in(&s, &s.selection()).unwrap();
+    assert_eq!((k.from.node(), k.to.node()), (Some(a), Some(b)));
+}
+
+#[test]
+fn duplicating_and_alt_dragging_keep_connections_inside_copied_sections() {
+    let mut s = board();
+    let sec = id(&s.execute("node.create", &json!({"type": "section", "x": -50, "y": -50, "width": 400, "height": 400})).unwrap(), "id");
+    let a = id(&s.execute("board.sticky", &json!({"x": 50, "y": 50, "parent": sec})).unwrap(), "id");
+    let b = id(&s.execute("board.sticky", &json!({"x": 600, "y": 0})).unwrap(), "id");
+    let c = id(&s.execute("board.connector", &json!({"from": a, "to": b})).unwrap(), "id");
+    s.execute("edit.duplicate", &json!({"ids": [sec, c]})).unwrap();
+    let copies = s.selection();
+    let from = connector_in(&s, &copies).unwrap().from.node().unwrap();
+    let doc = s.doc().unwrap();
+    assert!(from != a && copies.iter().any(|r| doc.is_ancestor(*r, from)), "the copy joins the sticky inside the copied section");
+    // Alt-drag copies the same way.
+    s.execute("select.set", &json!({"ids": [b, c]})).unwrap();
+    let press = |k, x| PointerEvent { alt: true, ..PointerEvent::at(k, x, 100.0, 1.0) };
+    for (k, x) in [(PointerKind::Down, 700.0), (PointerKind::Move, 760.0), (PointerKind::Move, 800.0), (PointerKind::Up, 800.0)] {
+        s.pointer(&press(k, x)).unwrap();
+    }
+    let copies = s.selection();
+    assert_eq!(copies.len(), 2);
+    let k = connector_in(&s, &copies).unwrap();
+    assert!(copies.contains(&k.to.node().unwrap()), "{k:?}");
+}
+
+#[test]
+fn routes_take_named_sides_and_free_points() {
+    let mut s = board();
+    let a = id(&s.execute("board.shape", &json!({"x": 0, "y": 0, "width": 100, "height": 100})).unwrap(), "id");
+    let b = id(&s.execute("board.shape", &json!({"x": 300, "y": 300, "width": 100, "height": 100})).unwrap(), "id");
+    let doc = s.doc().unwrap();
+    let elbow = |from, to| route(doc, &figcraft_doc::Connector { from, to, routing: figcraft_doc::Routing::Elbow }).unwrap();
+    let side = |n, side| End::Node { node: n, side };
+    let p = |x, y| End::Point { x, y };
+    let pt = Point::new;
+    // Side to side: out, across halfway, in.
+    assert_eq!(elbow(side(a, Side::Right), side(b, Side::Left)), vec![pt(100.0, 50.0), pt(200.0, 50.0), pt(200.0, 350.0), pt(300.0, 350.0)]);
+    // A side and a top or bottom: one turn.
+    assert_eq!(elbow(side(a, Side::Right), side(b, Side::Top)), vec![pt(100.0, 50.0), pt(350.0, 50.0), pt(350.0, 300.0)]);
+    assert_eq!(elbow(side(a, Side::Bottom), side(b, Side::Left)), vec![pt(50.0, 100.0), pt(50.0, 350.0), pt(300.0, 350.0)]);
+    // Two free points: the longer way first; in a line, no turns.
+    assert_eq!(elbow(p(0.0, 0.0), p(100.0, 40.0)), vec![pt(0.0, 0.0), pt(50.0, 0.0), pt(50.0, 40.0), pt(100.0, 40.0)]);
+    assert_eq!(elbow(p(0.0, 0.0), p(100.0, 0.0)), vec![pt(0.0, 0.0), pt(100.0, 0.0)]);
+    // An automatic side faces the other end.
+    let straight = route(doc, &figcraft_doc::Connector { from: side(a, Side::Auto), to: p(50.0, 500.0), routing: figcraft_doc::Routing::Straight });
+    assert_eq!(straight.unwrap(), vec![pt(50.0, 100.0), pt(50.0, 500.0)]);
+    assert_eq!(Side::from_id("TOP"), Some(Side::Top));
+    assert_eq!(Side::from_id("inside"), None);
+    // The same place twice is refused, as are a side that doesn't exist and a point without numbers.
+    assert!(s.execute("board.connector", &json!({"from": {"x": 5, "y": 5}, "to": {"x": 5, "y": 5}})).is_err());
+    assert!(s.execute("board.connector", &json!({"from": a, "to": b, "fromSide": "inside"})).is_err());
+    assert!(s.execute("board.connector", &json!({"from": a, "to": {"x": "a"}})).is_err());
+    assert!(s.execute("board.connector", &json!({"from": a})).is_err());
+}
+
+#[test]
+fn a_connector_follows_a_layer_whose_section_moves_and_ignores_unrelated_edits() {
+    let mut s = board();
+    let sec = id(&s.execute("node.create", &json!({"type": "section", "x": 0, "y": 0, "width": 300, "height": 300})).unwrap(), "id");
+    let a = id(&s.execute("board.sticky", &json!({"x": 50, "y": 50, "parent": sec})).unwrap(), "id");
+    let b = id(&s.execute("board.stamp", &json!({"x": 800, "y": 150})).unwrap(), "id");
+    let c = id(&s.execute("board.connector", &json!({"from": a, "to": b, "style": "straight"})).unwrap(), "id");
+    assert!(near(drawn(&s, c)[0], Point::new(250.0, 150.0)));
+    // Only the section is edited; the sticky inside it moves with it, and so does the connector.
+    s.execute("transform.move", &json!({"ids": [sec], "dx": 0, "dy": 100})).unwrap();
+    assert!(near(drawn(&s, c)[0], Point::new(250.0, 250.0)), "{:?}", drawn(&s, c));
+    // An edit that touches neither end leaves the connector as it was.
+    let before = s.doc().unwrap().node_arc(c).cloned().unwrap();
+    s.execute("board.sticky", &json!({"x": 0, "y": 900})).unwrap();
+    assert!(std::sync::Arc::ptr_eq(&before, s.doc().unwrap().node_arc(c).unwrap()));
+}
+
+#[test]
+fn styles_labels_and_their_refusals() {
+    let mut s = board();
+    let a = id(&s.execute("board.sticky", &json!({"x": 0, "y": 0, "author": false})).unwrap(), "id");
+    assert_eq!(node(&s, a).children.len(), 1, "no author line");
+    let b = id(&s.execute("board.sticky", &json!({"x": 400, "y": 0, "author": "  Lin  "})).unwrap(), "id");
+    assert!(matches!(node(&s, b).board, Some(BoardItem::Sticky { ref author }) if author == "Lin"));
+    let c = id(&s.execute("board.connector", &json!({"from": a, "to": b, "startCap": "circleFilled", "endCap": "none"})).unwrap(), "id");
+    assert_eq!((node(&s, c).stroke.cap_start, node(&s, c).stroke.cap_end), (StrokeCap::CircleFilled, StrokeCap::None));
+    // Labels: set, change, size, remove; named by the label itself too.
+    let l = id(&s.execute("board.label", &json!({"id": c, "text": "first"})).unwrap(), "label");
+    assert_eq!(id(&s.execute("board.label", &json!({"id": l, "text": "second"})).unwrap(), "label"), l, "the same label, new text");
+    let text = crate::board::text_of(s.doc().unwrap(), l).unwrap();
+    assert_eq!(node(&s, text).kind.text().unwrap().characters, "second");
+    s.execute("board.setStyle", &json!({"ids": [l], "fontSize": 36})).unwrap();
+    assert_eq!(node(&s, text).kind.text().unwrap().style.font_size, 36.0);
+    assert!(s.execute("board.label", &json!({"id": c, "text": ""})).unwrap()["label"].is_null());
+    assert!(!s.doc().unwrap().contains(l));
+    // What doesn't take a style or colour says so.
+    assert!(s.execute("board.setStyle", &json!({"ids": [a], "fontSize": 30})).is_err(), "stickies size their own text");
+    assert!(s.execute("board.setStyle", &json!({"ids": [c], "fontSize": 0})).is_err());
+    let st = id(&s.execute("board.stamp", &json!({"x": 0, "y": 0, "stamp": "check"})).unwrap(), "id");
+    assert!(s.execute("board.setColor", &json!({"ids": [st], "color": "blue"})).is_err());
+    assert!(s.execute("board.setColor", &json!({"ids": [a]})).is_err());
+    assert!(s.execute("board.label", &json!({"id": a, "text": "x"})).is_err());
+    // A palette colour on a line draws in its deeper shade; a hex colour as given.
+    s.execute("board.setColor", &json!({"ids": [c], "color": "blue"})).unwrap();
+    assert!(node(&s, c).strokes[0].solid_color().is_some() && node(&s, c).strokes[0].solid_color() != board_color("blue"));
+    s.execute("board.setColor", &json!({"ids": [c], "color": "#123456"})).unwrap();
+    assert_eq!(node(&s, c).strokes[0].solid_color().map(|c| c.to_hex()), Some("123456".into()));
+    // Next stickies on each side, and refusals.
+    for (side, dx, dy) in [("below", 0.0, 224.0), ("left", -224.0, 0.0), ("above", 0.0, -224.0)] {
+        let n = id(&s.execute("board.nextSticky", &json!({"id": a, "side": side})).unwrap(), "id");
+        let t = node(&s, n).transform.translation();
+        assert_eq!((t.x, t.y), (dx, dy), "{side}");
+    }
+    assert!(s.execute("board.nextSticky", &json!({"id": a, "side": "diagonal"})).is_err());
+    assert!(s.execute("board.nextSticky", &json!({"id": c})).is_err());
+    assert!(s.execute("board.ink", &json!({})).is_err());
+    assert!(s.execute("board.sticky", &json!({"x": 0, "y": 0, "parent": c})).is_err(), "a connector holds no layers");
+}
+
+#[test]
+fn the_shape_stamp_highlighter_and_connector_tools_and_double_clicks() {
+    let mut s = board();
+    let click = |s: &mut Session, x, y| {
+        s.pointer(&PointerEvent::at(PointerKind::Down, x, y, 1.0)).unwrap();
+        s.pointer(&PointerEvent::at(PointerKind::Up, x, y, 1.0)).unwrap();
+    };
+    s.execute("tool.shape", &json!({"shape": "roundedRectangle"})).unwrap();
+    click(&mut s, 100.0, 100.0);
+    let sh = s.selection()[0];
+    assert_eq!(node(&s, sh).board, Some(BoardItem::Shape { shape: BoardShape::RoundedRectangle }));
+    assert_eq!(s.tool.tool, ToolId::Move, "back to Move after placing");
+    s.execute("tool.stamp", &json!({"stamp": "question"})).unwrap();
+    click(&mut s, 400.0, 100.0);
+    click(&mut s, 450.0, 100.0);
+    let stamps = s.doc().unwrap().nodes().filter(|n| matches!(n.board, Some(BoardItem::Stamp { stamp: Stamp::Question, .. }))).count();
+    assert_eq!(stamps, 2);
+    assert_eq!(s.tool.tool, ToolId::Stamp, "stamps go on one after another");
+    assert!(s.execute("tool.stamp", &json!({"stamp": "skull"})).is_err());
+    s.execute("tool.highlighter", &json!({"color": "pink"})).unwrap();
+    assert_eq!(Some(s.tool.board.highlighter), board_color("pink"));
+    s.execute("tool.marker", &json!({"color": "#336699"})).unwrap();
+    assert_eq!(s.tool.board.marker.to_hex(), "336699");
+    // A connector drag that is only a click, or from an object to itself, makes nothing.
+    s.execute("tool.connector", &json!({"style": "straight"})).unwrap();
+    click(&mut s, 100.0, 100.0);
+    s.pointer(&PointerEvent::at(PointerKind::Down, 60.0, 120.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Move, 100.0, 140.0, 1.0)).unwrap();
+    assert!(s.tool.overlay.rubber.is_some(), "the rubber band shows while dragging");
+    s.pointer(&PointerEvent::at(PointerKind::Up, 100.0, 140.0, 1.0)).unwrap();
+    assert!(!s.doc().unwrap().nodes().any(|n| matches!(n.board, Some(BoardItem::Connector(_)))));
+    // From the shape out to empty canvas: a connector to a free point.
+    s.pointer(&PointerEvent::at(PointerKind::Down, 80.0, 140.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, 80.0, 600.0, 1.0)).unwrap();
+    let c = s.doc().unwrap().nodes().find(|n| matches!(n.board, Some(BoardItem::Connector(_)))).map(|n| n.id).unwrap();
+    assert!(matches!(connector(&s, c).to, End::Point { .. }));
+    // Double-clicks: on the shape its text, on the connector a new label, both typed into.
+    s.execute("tool.move", &json!({})).unwrap();
+    s.execute("select.none", &json!({})).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::DoubleClick, 80.0, 140.0, 1.0)).unwrap();
+    let te = s.ds().unwrap().text_edit.clone().expect("typing in the shape");
+    assert_eq!(crate::board::owner_of_text(s.doc().unwrap(), te.id), Some(sh));
+    crate::textedit::end(&mut s).unwrap();
+    let line = drawn(&s, c);
+    let m = line[0].midpoint(line[1]);
+    s.pointer(&PointerEvent::at(PointerKind::DoubleClick, m.x, m.y, 1.0)).unwrap();
+    let label = crate::board::label_of(s.doc().unwrap(), c).expect("a label was added");
+    let te = s.ds().unwrap().text_edit.clone().expect("typing in the label");
+    assert_eq!(crate::board::owner_of_text(s.doc().unwrap(), te.id), Some(label));
+}
+
+#[test]
+fn an_ink_stroke_ends_where_the_button_comes_up() {
+    let mut s = board();
+    s.execute("tool.marker", &json!({})).unwrap();
+    // Down and up with no move between: the stroke still runs from the press to the release.
+    s.pointer(&PointerEvent::at(PointerKind::Down, 0.0, 0.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, 150.0, 0.0, 1.0)).unwrap();
+    let doc = s.doc().unwrap();
+    let ink = doc.nodes().find(|n| matches!(n.board, Some(BoardItem::Ink))).map(|n| n.id).expect("a stroke");
+    let b = doc.world_bounds(ink).unwrap();
+    assert!(b.x0.abs() < 6.0 && (b.x1 - 150.0).abs() < 6.0, "from 0 to 150 (stroke width aside): {b:?}");
+}
+
+#[test]
+fn a_second_sticky_ends_the_first_ones_typing_and_undoes_alone() {
+    let mut s = board();
+    s.execute("tool.sticky", &json!({})).unwrap();
+    s.prefs.keep_tool = true;
+    s.pointer(&PointerEvent::at(PointerKind::Down, 100.0, 100.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, 100.0, 100.0, 1.0)).unwrap();
+    let text = s.ds().unwrap().text_edit.as_ref().expect("typing in the new sticky").id;
+    crate::textedit::insert(&mut s, "first note").unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Down, 500.0, 100.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, 500.0, 100.0, 1.0)).unwrap();
+    let stickies = |s: &Session| s.doc().unwrap().nodes().filter(|n| matches!(n.board, Some(BoardItem::Sticky { .. }))).count();
+    let typed = |s: &Session| s.doc().unwrap().node(text).unwrap().kind.text().unwrap().characters.clone();
+    assert_eq!(stickies(&s), 2);
+    crate::textedit::end(&mut s).unwrap();
+    s.undo().unwrap();
+    assert_eq!(stickies(&s), 1, "the second sticky is its own undo step");
+    assert_eq!(typed(&s), "first note", "the first sticky keeps what was typed in it");
+}
+
+#[test]
+fn a_board_tool_left_on_presses_as_move_in_a_design_file() {
+    let mut s = board();
+    s.execute("tool.sticky", &json!({})).unwrap();
+    s.execute("file.new", &json!({})).unwrap();
+    let r = id(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 100})).unwrap(), "id");
+    s.execute("select.none", &json!({})).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Down, 50.0, 50.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, 50.0, 50.0, 1.0)).unwrap();
+    assert_eq!(s.tool.tool, ToolId::Move);
+    assert_eq!(s.selection(), vec![r], "the press selected as Move does");
+}
diff --git a/crates/engine/src/boards.rs b/crates/engine/src/boards.rs
new file mode 100644
index 00000000..685c1d70
--- /dev/null
+++ b/crates/engine/src/boards.rs
@@ -0,0 +1,3 @@
+pub mod board;
+pub mod board_table;
+pub mod board_templates;
diff --git a/crates/engine/src/boards/board.rs b/crates/engine/src/boards/board.rs
new file mode 100644
index 00000000..b40bcc7d
--- /dev/null
+++ b/crates/engine/src/boards/board.rs
@@ -0,0 +1,277 @@
+//! Boards: files for thinking together, with sticky notes, shapes with text, connectors, ink and
+//! stamps. Board objects are ordinary layers with a [`BoardItem`] on them; [`settle_text`] and
+//! [`settle_routes`] keep what follows from it (a sticky's text size, a shape's text room,
+//! connectors' routes and their labels) up to date in the normalize pass, so local edits, undo and
+//! live-session edits from others all end in the same geometry.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use figcraft_color::{BlendMode, Color, Paint};
+use figcraft_doc::{
+    AutoLayout, BOARD_COLORS, BoardItem, BoardShape, Connector, Constraints, CrossAlign, DocError, Document, Effect, EffectKind, End, FileKind,
+    HConstraint, LayoutMode, MainAlign, Node, NodeId, NodeKind, Routing, STAMP_SIZE, Shadow, Side, Sizing, Stamp, StrokeAlign, StrokeCap, StrokeJoin,
+    TextAlignH, TextAutoResize, TextData, VConstraint, VectorNetwork, board_color,
+};
+use figcraft_geom::kurbo::PathEl;
+use figcraft_geom::{Affine, BezPath, Point, Rect, Shape, Vec2};
+use serde_json::{Value, json};
+
+use crate::cmd::CommandSpec;
+use crate::params::{boolean, color_of, get, id, id_of, num, num_or, opt_id, req_num, req_string, req_targets, string};
+use crate::tools::{Gesture, PointerEvent, ToolId};
+use crate::{EngineError, Result, Session, bad, spec, textedit};
+
+mod connectors;
+mod derived;
+mod edit;
+mod items;
+mod tools;
+
+pub(crate) use connectors::end_handle_at;
+pub use connectors::{END_HANDLE_PX, selected_connector_ends};
+use connectors::{connector_cmd, reattach};
+pub use derived::route;
+pub(crate) use derived::{settle_routes, settle_text};
+pub use edit::label_of;
+pub(crate) use edit::{copied_items, copy_map, rejoin};
+use edit::{label_cmd, set_color, set_style};
+pub(crate) use items::add_text;
+pub use items::{edit_text, owner_of_text, sticky_font_size, text_of};
+use items::{ink_cmd, next_sticky, shape_cmd, stamp_cmd, sticky_cmd};
+
+/// Why a board command refuses on a design file.
+pub const NEEDS_BOARD: &str = "this is for boards: make one with File ▸ New board";
+/// Why prototyping and Dev Mode refuse on a board.
+pub const NOT_ON_BOARDS: &str = "boards have no prototypes or Dev Mode: use a design file for those";
+
+/// A sticky note's side (it grows taller for long notes).
+pub const STICKY: f64 = 200.0;
+const STICKY_PAD: f64 = 16.0;
+/// The room between a sticky and the next one made beside it.
+const STICKY_GAP: f64 = 24.0;
+/// A new shape's size.
+const SHAPE: f64 = 160.0;
+/// Text on board objects, and the author line under a sticky's note.
+pub(crate) const INK: Color = Color::from_rgb8_const(0x1E, 0x1E, 0x1E);
+const AUTHOR_INK: Color = Color::from_rgb8_const(0x5C, 0x5A, 0x55);
+/// Connectors' default colour and weight.
+const LINE: Color = Color::from_rgb8_const(0x3A, 0x39, 0x36);
+const LINE_WEIGHT: f64 = 2.0;
+/// Marker and highlighter strokes: (weight, opacity).
+const MARKER: (f64, f32) = (4.0, 1.0);
+const HIGHLIGHTER: (f64, f32) = (20.0, 0.45);
+/// How far the eraser reaches around the pointer (screen pixels).
+const ERASER_PX: f64 = 8.0;
+/// The text sizes the contextual bar offers.
+pub const TEXT_SIZES: [(&str, f64); 4] = [("S", 12.0), ("M", 16.0), ("L", 24.0), ("XL", 36.0)];
+
+/// The board tools' choices: the colour new stickies get, the shape and stamp the tools place,
+/// how new connectors run and the marker's and highlighter's colours.
+#[derive(Clone, Debug)]
+pub struct BoardTool {
+    pub sticky: Color,
+    pub shape: BoardShape,
+    pub stamp: Stamp,
+    pub routing: Routing,
+    pub marker: Color,
+    pub highlighter: Color,
+}
+
+impl Default for BoardTool {
+    fn default() -> Self {
+        let first = BOARD_COLORS.first().map_or(Color::WHITE, |c| c.1);
+        Self {
+            sticky: first,
+            shape: BoardShape::Rectangle,
+            stamp: Stamp::ThumbsUp,
+            routing: Routing::Elbow,
+            marker: INK,
+            highlighter: Color::from_rgb8_const(0xFF, 0xD2, 0x1F),
+        }
+    }
+}
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        spec!(
+            "board.sticky",
+            "Sticky note",
+            "{x, y (its top-left, in the parent), text?, color? (yellow|orange|red|pink|violet|blue|green|gray or hex; default the sticky tool's), author? (a name, or false for none; default yours), parent?} → {id, text}",
+            true,
+            sticky_cmd
+        ),
+        spec!(
+            "board.nextSticky",
+            "Next sticky note",
+            "{id? (a sticky; default the selected or edited one), side?: right|below|left|above (default right), edit? (start typing in it; default false)} → {id, text}  a sticky of the same colour beside it",
+            true,
+            next_sticky
+        ),
+        spec!(
+            "board.shape",
+            "Shape with text",
+            "{shape: rectangle|roundedRectangle|ellipse|diamond|triangle|speechBubble|chevron, x, y, width?, height? (default 160), text?, color?, parent?} → {id, text}",
+            true,
+            shape_cmd
+        ),
+        spec!(
+            "board.connector",
+            "Connector",
+            "{from, to (each a layer id or {x, y} on the page), fromSide?, toSide? (auto|top|right|bottom|left), style?: straight|elbow|curved, startCap?, endCap? (none|lineArrow|triangleArrow|circleFilled|diamondFilled…; default an arrow at the end), label?} → {id, label?}  a line that follows the layers it joins",
+            true,
+            connector_cmd
+        ),
+        spec!(
+            "board.reattach",
+            "Reattach connector",
+            "{id? (a connector; default the selection), end: from|to, target (a layer id, or {x, y} on the page to leave the end free), side? (auto|top|right|bottom|left)} → {id}  moves one end of a connector",
+            true,
+            reattach
+        ),
+        spec!("board.label", "Connector label", "{id (a connector; default the selection), text (empty removes it)} → {id, label}", true, label_cmd),
+        spec!(
+            "board.stamp",
+            "Stamp",
+            "{x, y (its centre on the page), stamp: thumbsUp|heart|plusOne|star|question|check} → {id}  a badge with your name on hover",
+            true,
+            stamp_cmd
+        ),
+        spec!(
+            "board.ink",
+            "Marker stroke",
+            "{path (SVG path data on the page) | points [[x,y],..], highlighter? (wide and see-through), color?, select? (default true)} → {id}",
+            true,
+            ink_cmd
+        ),
+        spec!(
+            "board.setColor",
+            "Board color",
+            "{ids?, color (a board colour name or hex)}  stickies and shapes take it as their fill, connectors and ink as their line",
+            true,
+            set_color
+        ),
+        spec!(
+            "board.setStyle",
+            "Board style",
+            "{ids?, shape? (shapes with text), fontSize? (their text), style?: straight|elbow|curved, startCap?, endCap? (connectors)}",
+            true,
+            set_style
+        ),
+        spec!("tool.sticky", "Sticky note", "{color?} (a click places a sticky and starts typing in it)", false, |s, p| {
+            if let Some(c) = color_param("tool.sticky", p)? {
+                s.tool.board.sticky = c;
+            }
+            board_tool(s, ToolId::Sticky)
+        }),
+        spec!("tool.shape", "Shapes", "{shape?} (a click places a shape with text)", false, |s, p| {
+            if let Some(v) = string(p, "shape") {
+                s.tool.board.shape = shape_of("tool.shape", &v)?;
+            }
+            board_tool(s, ToolId::BoardShape)
+        }),
+        spec!("tool.connector", "Connector", "{style?: straight|elbow|curved} (drag from one object to another)", false, |s, p| {
+            if let Some(v) = string(p, "style") {
+                s.tool.board.routing = routing_of("tool.connector", &v)?;
+            }
+            board_tool(s, ToolId::Connector)
+        }),
+        spec!("tool.marker", "Marker", "{color?}", false, |s, p| {
+            if let Some(c) = color_param("tool.marker", p)? {
+                s.tool.board.marker = c;
+            }
+            board_tool(s, ToolId::Marker)
+        }),
+        spec!("tool.highlighter", "Highlighter", "{color?}", false, |s, p| {
+            if let Some(c) = color_param("tool.highlighter", p)? {
+                s.tool.board.highlighter = c;
+            }
+            board_tool(s, ToolId::Highlighter)
+        }),
+        spec!("tool.eraser", "Eraser", "{} (drag over marker and highlighter strokes to remove them)", false, |s, _| board_tool(s, ToolId::Eraser)),
+        spec!("tool.stamp", "Stamp", "{stamp?} (a click places the stamp)", false, |s, p| {
+            if let Some(v) = string(p, "stamp") {
+                s.tool.board.stamp = stamp_of("tool.stamp", &v)?;
+            }
+            board_tool(s, ToolId::Stamp)
+        }),
+    ]
+}
+
+pub fn is_board(doc: &Document) -> bool {
+    doc.kind == FileKind::Board
+}
+
+/// Refuse `cmd` unless the active file is a board.
+pub(crate) fn require(s: &Session, cmd: &str) -> Result<()> {
+    if s.doc().is_ok_and(is_board) { Ok(()) } else { Err(EngineError::Disabled(cmd.into(), NEEDS_BOARD.into())) }
+}
+
+/// Prototyping and Dev Mode: not on boards.
+fn design_only(cmd: &str) -> bool {
+    cmd.starts_with("proto.") || cmd.starts_with("dev.") || matches!(cmd, "view.prototype" | "view.designPrototype" | "view.devMode")
+}
+
+/// Refuse `cmd` on a board when it is prototyping or Dev Mode.
+pub(crate) fn refuse_on_board(s: &Session, cmd: &str) -> Result<()> {
+    if design_only(cmd) && s.doc().is_ok_and(is_board) { Err(EngineError::Disabled(cmd.into(), NOT_ON_BOARDS.into())) } else { Ok(()) }
+}
+
+fn board_tool(s: &mut Session, t: ToolId) -> Result<Value> {
+    require(s, &format!("tool.{}", t.id()))?;
+    crate::cmd::view::tool(s, t)
+}
+
+fn shape_of(cmd: &str, v: &str) -> Result<BoardShape> {
+    BoardShape::from_id(v)
+        .ok_or_else(|| bad(cmd, format!("unknown shape `{v}` (rectangle|roundedRectangle|ellipse|diamond|triangle|speechBubble|chevron)")))
+}
+
+fn stamp_of(cmd: &str, v: &str) -> Result<Stamp> {
+    Stamp::from_id(v).ok_or_else(|| bad(cmd, format!("unknown stamp `{v}` (thumbsUp|heart|plusOne|star|question|check)")))
+}
+
+fn routing_of(cmd: &str, v: &str) -> Result<Routing> {
+    Routing::from_id(v).ok_or_else(|| bad(cmd, format!("`style` is straight, elbow or curved, not `{v}`")))
+}
+
+fn cap_of(cmd: &str, p: &Value, key: &str) -> Result<Option<StrokeCap>> {
+    match get(p, key) {
+        None | Some(Value::Null) => Ok(None),
+        Some(v) => crate::cmd::props::enum_of::<StrokeCap>(v).map(Some).ok_or_else(|| bad(cmd, format!("`{key}`: unknown cap"))),
+    }
+}
+
+/// `color`: a board colour's name, or any colour.
+fn color_param(cmd: &str, p: &Value) -> Result<Option<Color>> {
+    match get(p, "color") {
+        None | Some(Value::Null) => Ok(None),
+        Some(Value::String(s)) if board_color(s).is_some() => Ok(board_color(s)),
+        Some(v) => color_of(v).map(Some).ok_or_else(|| bad(cmd, "`color` is a board colour (yellow, blue…) or a colour such as #FFE78A")),
+    }
+}
+
+/// The deeper shade of a board colour lines are drawn in (light tints are too faint as lines).
+fn line_shade(c: Color) -> Color {
+    let palette = BOARD_COLORS.iter().any(|(_, b)| *b == c);
+    if palette { Color::new(c.r * 0.55, c.g * 0.55, c.b * 0.55, c.a) } else { c }
+}
+
+/// Your name on what you make: the name from Preferences, else the one a live session gave you
+/// (none for the default name outside a session).
+pub(crate) fn author(s: &Session) -> String {
+    let name = crate::live::display_name(&s.prefs);
+    if name.is_empty() { s.live().info.as_ref().map(|i| i.name.clone()).unwrap_or_default() } else { name }
+}
+
+/// The parent a command places into, and that parent's page-to-local transform.
+fn parent_of(cmd: &str, s: &Session, p: &Value) -> Result<NodeId> {
+    let page = s.page()?;
+    let parent = opt_id(cmd, p, "parent")?.unwrap_or(page);
+    let doc = s.doc()?;
+    let n = doc.get(parent)?;
+    let takes = n.is_page() || matches!(n.kind, NodeKind::Section { .. }) || (n.kind.is_frame_like() && !n.is_board_atom());
+    if !takes {
+        return Err(bad(cmd, "`parent` is the page, a section or a frame"));
+    }
+    Ok(parent)
+}
diff --git a/crates/engine/src/boards/board/connectors.rs b/crates/engine/src/boards/board/connectors.rs
new file mode 100644
index 00000000..753550e5
--- /dev/null
+++ b/crates/engine/src/boards/board/connectors.rs
@@ -0,0 +1,147 @@
+use super::derived::{ends_now, place_route, route};
+use super::edit::set_label;
+use super::items::add;
+use super::*;
+
+/// One connector end from the params: a layer on this page, or a point.
+fn end_param(cmd: &str, s: &Session, p: &Value, key: &str, side_key: &str) -> Result<End> {
+    let side = match string(p, side_key) {
+        Some(v) => Side::from_id(&v).ok_or_else(|| bad(cmd, format!("`{side_key}` is auto, top, right, bottom or left")))?,
+        None => Side::Auto,
+    };
+    match get(p, key) {
+        Some(Value::Object(o)) if o.contains_key("x") => {
+            let (x, y) = (num(&Value::Object(o.clone()), "x"), num(&Value::Object(o.clone()), "y"));
+            match (x, y) {
+                (Some(x), Some(y)) if x.is_finite() && y.is_finite() => Ok(End::Point { x, y }),
+                _ => Err(bad(cmd, format!("`{key}` needs finite x and y"))),
+            }
+        }
+        Some(v) => {
+            let node = id_of(v).ok_or_else(|| bad(cmd, format!("`{key}` is a layer id or {{x, y}}")))?;
+            let doc = s.doc()?;
+            let n = doc.get(node)?;
+            if n.is_page() || doc.page_of(node) != Some(s.page()?) {
+                return Err(bad(cmd, format!("`{key}` must be a layer on this page")));
+            }
+            if matches!(n.board, Some(BoardItem::Connector(_))) {
+                return Err(bad(cmd, format!("`{key}` can't be another connector")));
+            }
+            Ok(End::Node { node, side })
+        }
+        None => Err(bad(cmd, format!("`{key}` is required"))),
+    }
+}
+
+pub(super) fn connector_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.connector";
+    require(s, cmd)?;
+    let from = end_param(cmd, s, p, "from", "fromSide")?;
+    let to = end_param(cmd, s, p, "to", "toSide")?;
+    if from.node().is_some() && from.node() == to.node() {
+        return Err(bad(cmd, "connect two different layers"));
+    }
+    let routing = match string(p, "style") {
+        Some(v) => routing_of(cmd, &v)?,
+        None => s.tool.board.routing,
+    };
+    let start = cap_of(cmd, p, "startCap")?.unwrap_or(StrokeCap::None);
+    let end = cap_of(cmd, p, "endCap")?.unwrap_or(StrokeCap::TriangleArrow);
+    let c = Connector { from, to, routing };
+    let page = s.page()?;
+    let doc = s.doc_mut()?;
+    let pts = route(doc, &c).ok_or_else(|| bad(cmd, "the ends can't be placed"))?;
+    if pts.windows(2).all(|w| w.first() == w.get(1)) {
+        return Err(bad(cmd, "the ends are in the same place"));
+    }
+    let id = add(doc, page, NodeKind::Vector { network: VectorNetwork::default() }, "Connector", (0.0, 0.0), (0.0, 0.0), |n| {
+        n.fills.clear();
+        n.strokes = vec![Paint::solid(LINE)];
+        n.stroke.weight = LINE_WEIGHT;
+        n.stroke.join = StrokeJoin::Round;
+        n.stroke.cap_start = start;
+        n.stroke.cap_end = end;
+        n.board = Some(BoardItem::Connector(c));
+    })?;
+    place_route(doc, id, &pts, routing);
+    let mut out = json!({"id": id});
+    if let Some(text) = string(p, "label").filter(|t| !t.trim().is_empty()) {
+        out["label"] = json!(set_label(doc, id, &text)?);
+    }
+    s.set_selection(vec![id]);
+    Ok(out)
+}
+
+/// The connector `id` names: a connector, or the label on one.
+pub(super) fn connector_of(cmd: &str, doc: &Document, id: NodeId) -> Result<(NodeId, Connector)> {
+    match doc.get(id)?.board.clone() {
+        Some(BoardItem::Connector(c)) => Ok((id, c)),
+        Some(BoardItem::Label { connector }) => match doc.get(connector)?.board.clone() {
+            Some(BoardItem::Connector(c)) => Ok((connector, c)),
+            _ => Err(bad(cmd, "that isn't a connector")),
+        },
+        _ => Err(bad(cmd, "that isn't a connector")),
+    }
+}
+
+pub(super) fn reattach(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.reattach";
+    require(s, cmd)?;
+    let id = req_targets(cmd, s, p)?.first().copied().ok_or_else(|| bad(cmd, "select a connector"))?;
+    let (id, mut c) = connector_of(cmd, s.doc()?, id)?;
+    let from = match string(p, "end").as_deref() {
+        Some("from") => true,
+        Some("to") => false,
+        _ => return Err(bad(cmd, "`end` is from or to")),
+    };
+    let end = end_param(cmd, s, p, "target", "side")?;
+    let other = if from { c.to } else { c.from };
+    if end.node().is_some() && end.node() == other.node() {
+        return Err(bad(cmd, "connect two different layers"));
+    }
+    *(if from { &mut c.from } else { &mut c.to }) = end;
+    let doc = s.doc_mut()?;
+    let pts = route(doc, &c).ok_or_else(|| bad(cmd, "the ends can't be placed"))?;
+    if pts.windows(2).all(|w| w.first() == w.get(1)) {
+        return Err(bad(cmd, "the ends are in the same place"));
+    }
+    doc.get_mut(id)?.board = Some(BoardItem::Connector(c));
+    place_route(doc, id, &pts, c.routing);
+    Ok(json!({"id": id}))
+}
+
+/// A connector end as `board.connector` and `board.reattach` take it.
+pub(super) fn end_json(e: End) -> Value {
+    match e {
+        End::Node { node, .. } => json!(node),
+        End::Point { x, y } => json!({"x": x, "y": y}),
+    }
+}
+
+/// The end of connector `id` that stays while its other one (`from`: its start) is dragged.
+pub(super) fn other_end(doc: &Document, id: NodeId, from: bool) -> Option<End> {
+    match &doc.node(id)?.board {
+        Some(BoardItem::Connector(c)) => Some(if from { c.to } else { c.from }),
+        _ => None,
+    }
+}
+
+/// The selected connector (one, alone and unlocked) and its two ends on the page as drawn.
+pub fn selected_connector_ends(doc: &Document, sel: &[NodeId]) -> Option<(NodeId, [Point; 2])> {
+    let [id] = sel else { return None };
+    if !matches!(doc.node(*id)?.board, Some(BoardItem::Connector(_))) || crate::tools::locked_in(doc, *id) {
+        return None;
+    }
+    let (a, b) = ends_now(doc, *id)?;
+    Some((*id, [a, b]))
+}
+
+/// How near (screen pixels) a press must be to a selected connector's end to drag it.
+pub const END_HANDLE_PX: f64 = 8.0;
+
+/// The selected connector's end under `p` at `zoom`, nearest first (`true`: its start).
+pub(crate) fn end_handle_at(doc: &Document, sel: &[NodeId], p: Point, zoom: f64) -> Option<(NodeId, bool)> {
+    let (id, [a, b]) = selected_connector_ends(doc, sel)?;
+    let (da, db) = ((a - p).hypot(), (b - p).hypot());
+    (da.min(db) * zoom.max(1e-6) <= END_HANDLE_PX).then_some((id, da <= db))
+}
diff --git a/crates/engine/src/boards/board/derived.rs b/crates/engine/src/boards/board/derived.rs
new file mode 100644
index 00000000..ac73df1e
--- /dev/null
+++ b/crates/engine/src/boards/board/derived.rs
@@ -0,0 +1,339 @@
+use super::edit::set_font_size;
+use super::items::{owner_of_text, shape_padding, sticky_font_size, text_of};
+use super::*;
+
+// ---------------------------------------------------------------------------------------------
+// Derived data (the normalize pass).
+
+/// Before text is measured: a sticky's note takes the size its length calls for, and a resized
+/// shape keeps its text inside its outline.
+pub(crate) fn settle_text(doc: &mut Document, before: &Document, touched: &BTreeSet<NodeId>) {
+    if !is_board(doc) {
+        return;
+    }
+    for &id in touched {
+        let Some(n) = doc.node(id) else { continue };
+        if let Some(owner) =
+            owner_of_text(doc, id).or(Some(id)).filter(|o| doc.node(*o).is_some_and(|k| matches!(k.board, Some(BoardItem::Sticky { .. }))))
+            && let Some(t) = text_of(doc, owner)
+            && let Some(NodeKind::Text(td)) = doc.node(t).map(|k| &k.kind)
+        {
+            let size = sticky_font_size(&td.characters);
+            let off = td.style.font_size != size || td.runs.iter().any(|r| r.style.font_size != size);
+            if off && let Some(NodeKind::Text(td)) = doc.node_mut(t).map(|k| &mut k.kind) {
+                set_font_size(td, size);
+            }
+            continue;
+        }
+        if let Some(BoardItem::Shape { shape }) = n.board
+            && before.node(id).is_none_or(|b| (b.width, b.height) != (n.width, n.height))
+        {
+            let pad = shape_padding(shape, n.width, n.height);
+            if n.layout.as_ref().is_some_and(|l| l.padding != pad)
+                && let Some(l) = doc.node_mut(id).and_then(|k| k.layout.as_mut())
+            {
+                l.padding = pad;
+            }
+        }
+    }
+}
+
+/// After layout: connectors run between their ends again (an end whose layer is gone stays where
+/// it was), one moved on its own takes its free ends along, and labels sit at their middles. Only
+/// the connectors and labels an edit can have moved are looked at: touched themselves, or with a
+/// touched (or gone) end, connector or layer around them.
+pub(crate) fn settle_routes(doc: &mut Document, before: &Document, touched: &BTreeSet<NodeId>) {
+    if !is_board(doc) || touched.is_empty() {
+        return;
+    }
+    let hit = |doc: &Document, id: NodeId| touched.contains(&id) || doc.ancestors(id).iter().any(|a| touched.contains(a));
+    let (mut connectors, mut labels) = (Vec::new(), Vec::new());
+    for n in doc.nodes() {
+        match &n.board {
+            Some(BoardItem::Connector(c)) => {
+                let ends = [c.from.node(), c.to.node()].into_iter().flatten();
+                if hit(doc, n.id) || ends.into_iter().any(|e| !doc.contains(e) || hit(doc, e)) {
+                    connectors.push((n.id, *c));
+                }
+            }
+            Some(BoardItem::Label { connector }) => labels.push((n.id, *connector)),
+            _ => {}
+        }
+    }
+    let rerouted: BTreeSet<NodeId> = connectors.iter().map(|(id, _)| *id).collect();
+    for (id, mut c) in connectors {
+        let changed = detach_gone_ends(doc, id, &mut c) | carry_free_ends(doc, before, touched, id, &mut c);
+        if changed && let Some(n) = doc.node_mut(id) {
+            n.board = Some(BoardItem::Connector(c));
+        }
+        if let Some(pts) = route(doc, &c) {
+            place_route(doc, id, &pts, c.routing);
+        }
+    }
+    for (label, connector) in labels {
+        if rerouted.contains(&connector) || touched.contains(&connector) || hit(doc, label) {
+            place_label(doc, label, connector);
+        }
+    }
+}
+
+/// The ends of connector `id` (as `c`) whose layer is gone or on another page stay where they are
+/// drawn, as points. Whether any did.
+fn detach_gone_ends(doc: &Document, id: NodeId, c: &mut Connector) -> bool {
+    let (page, ends) = (doc.page_of(id), ends_now(doc, id));
+    let mut detached = false;
+    for (end, at) in [(&mut c.from, ends.map(|e| e.0)), (&mut c.to, ends.map(|e| e.1))] {
+        if let (End::Node { node, .. }, Some(p)) = (*end, at)
+            && (!doc.contains(node) || doc.page_of(node) != page)
+        {
+            *end = End::Point { x: p.x, y: p.y };
+            detached = true;
+        }
+    }
+    detached
+}
+
+/// Connector `id` (as `c`) moved by itself (a drag, a nudge: its place changed but not what it
+/// joins): its free ends move with it. Whether they did.
+fn carry_free_ends(doc: &Document, before: &Document, touched: &BTreeSet<NodeId>, id: NodeId, c: &mut Connector) -> bool {
+    let (Some(b), Some(n)) = (before.node(id), doc.node(id)) else { return false };
+    if !touched.contains(&id) || b.transform == n.transform || b.board != n.board {
+        return false;
+    }
+    let Some(expected) = route(doc, c).and_then(|pts| finite_box(&route_path(&pts, c.routing))).map(|b| b.origin()) else { return false };
+    let d = (doc.world_transform(id) * Point::ZERO) - expected;
+    if d.hypot() <= 1e-9 {
+        return false;
+    }
+    let mut moved = false;
+    for end in [&mut c.from, &mut c.to] {
+        if let End::Point { x, y } = end {
+            (*x, *y) = (*x + d.x, *y + d.y);
+            moved = true;
+        }
+    }
+    moved
+}
+
+/// Label `label` at the middle of connector `connector`; gone with it when it is gone.
+fn place_label(doc: &mut Document, label: NodeId, connector: NodeId) {
+    let Some(mid) = doc.node(connector).and_then(|_| route_mid(doc, connector)) else {
+        let _ = doc.remove(label);
+        return;
+    };
+    let Some(n) = doc.node(label) else { return };
+    let pw = n.parent.map_or(Affine::IDENTITY, |p| doc.world_transform(p));
+    let local = pw.inverse() * mid;
+    let t = Affine::translate((local.x - n.width / 2.0, local.y - n.height / 2.0));
+    if n.transform != t
+        && let Some(n) = doc.node_mut(label)
+    {
+        n.transform = t;
+    }
+}
+
+/// Connector `id`'s first and last points on the page as it is drawn now.
+pub(super) fn ends_now(doc: &Document, id: NodeId) -> Option<(Point, Point)> {
+    let NodeKind::Vector { network } = &doc.node(id)?.kind else { return None };
+    let w = doc.world_transform(id);
+    Some((w * network.vertices.first()?.point(), w * network.vertices.last()?.point()))
+}
+
+/// The middle of connector `id`'s route by length, on the page.
+fn route_mid(doc: &Document, id: NodeId) -> Option<Point> {
+    let NodeKind::Vector { network } = &doc.node(id)?.kind else { return None };
+    let w = doc.world_transform(id);
+    let mut pts: Vec<Point> = Vec::new();
+    figcraft_geom::kurbo::flatten(network.stroke_path().iter(), 0.25, |el| {
+        if let PathEl::MoveTo(p) | PathEl::LineTo(p) = el {
+            pts.push(w * p);
+        }
+    });
+    let total: f64 = pts.windows(2).map(|s| (s[1] - s[0]).hypot()).sum();
+    let mut left = total / 2.0;
+    for s in pts.windows(2) {
+        let (a, b) = (s[0], s[1]);
+        let l = (b - a).hypot();
+        if l >= left && l > 0.0 {
+            return Some(a.lerp(b, left / l));
+        }
+        left -= l;
+    }
+    pts.first().copied()
+}
+
+/// The path through a route's page points `pts` (see [`route`]): one curve for a curved
+/// connector, straight runs otherwise.
+fn route_path(pts: &[Point], routing: Routing) -> BezPath {
+    let mut path = BezPath::new();
+    match (routing, pts) {
+        (Routing::Curved, [p0, c0, c1, p1]) => {
+            path.move_to(*p0);
+            path.curve_to(*c0, *c1, *p1);
+        }
+        _ => {
+            for (i, p) in pts.iter().enumerate() {
+                if i == 0 { path.move_to(*p) } else { path.line_to(*p) }
+            }
+        }
+    }
+    path
+}
+
+/// The box a path is drawn in, when it is finite.
+fn finite_box(path: &BezPath) -> Option<Rect> {
+    let b = path.bounding_box();
+    (b.x0.is_finite() && b.y0.is_finite() && b.x1.is_finite() && b.y1.is_finite()).then_some(b)
+}
+
+/// Write the route `pts` (page points, see [`route`]) into connector `id`: its box, place and
+/// path. Untouched when it already runs there, so a connector that didn't move isn't an edit.
+pub(super) fn place_route(doc: &mut Document, id: NodeId, pts: &[Point], routing: Routing) {
+    let Some(n) = doc.node(id) else { return };
+    let pw = n.parent.map_or(Affine::IDENTITY, |p| doc.world_transform(p));
+    let local = pw.inverse() * route_path(pts, routing);
+    let Some(b) = finite_box(&local) else { return };
+    let rel = Affine::translate((-b.x0, -b.y0)) * local;
+    let network = match routing {
+        Routing::Curved => VectorNetwork::from_path(&rel),
+        _ => VectorNetwork::from_points(&rel.elements().iter().filter_map(PathEl::end_point).collect::<Vec<_>>(), false),
+    };
+    let t = Affine::translate((b.x0, b.y0));
+    let same =
+        n.transform == t && n.width == b.width() && n.height == b.height() && matches!(&n.kind, NodeKind::Vector { network: old } if *old == network);
+    if same {
+        return;
+    }
+    if let Some(n) = doc.node_mut(id) {
+        n.kind = NodeKind::Vector { network };
+        n.transform = t;
+        (n.width, n.height) = (b.width(), b.height());
+    }
+}
+
+/// How far an elbow connector going around the objects it joins keeps from them.
+const ROOM: f64 = 24.0;
+
+/// The page points connector `c` runs through: from the middle of the side of each attached layer
+/// facing the other end (or the side it names), straight, in right angles, or (curved) its two
+/// ends with the curve's two control points between them.
+pub fn route(doc: &Document, c: &Connector) -> Option<Vec<Point>> {
+    let bounds = |e: &End| e.node().and_then(|n| doc.world_bounds(n));
+    let centre = |e: &End, b: Option<Rect>| match e {
+        End::Point { x, y } => Some(Point::new(*x, *y)),
+        End::Node { .. } => b.map(|b| b.center()),
+    };
+    let (fb, tb) = (bounds(&c.from), bounds(&c.to));
+    let (fc, tc) = (centre(&c.from, fb)?, centre(&c.to, tb)?);
+    let (p0, s0) = attach(&c.from, fb, tc)?;
+    let (p1, s1) = attach(&c.to, tb, fc)?;
+    let pts = match c.routing {
+        Routing::Straight => tidy(vec![p0, p1]),
+        Routing::Elbow => elbow(p0, s0, p1, s1, &[fb, tb].into_iter().flatten().collect::<Vec<_>>()),
+        Routing::Curved => curve(p0, s0, p1, s1),
+    };
+    pts.iter().all(|p| p.x.is_finite() && p.y.is_finite()).then_some(pts)
+}
+
+/// `pts` without repeats or turns that don't turn (three in a line across or down).
+fn tidy(pts: Vec<Point>) -> Vec<Point> {
+    let mut out: Vec<Point> = Vec::with_capacity(pts.len());
+    for p in pts {
+        if out.last() == Some(&p) {
+            continue;
+        }
+        if let [.., a, b] = out.as_slice()
+            && ((a.x == b.x && b.x == p.x) || (a.y == b.y && b.y == p.y))
+        {
+            out.pop();
+        }
+        out.push(p);
+    }
+    out
+}
+
+/// Where end `e` attaches (its point, or the middle of its layer's side facing `other`) and that
+/// side (`None`: a free point).
+fn attach(e: &End, b: Option<Rect>, other: Point) -> Option<(Point, Option<Side>)> {
+    match e {
+        End::Point { x, y } => Some((Point::new(*x, *y), None)),
+        End::Node { side, .. } => {
+            let b = b?;
+            let side = match side {
+                Side::Auto => {
+                    let d = other - b.center();
+                    // Compare against the box's proportions: a wide box takes the sides more.
+                    if d.x.abs() * b.height().max(1e-9) >= d.y.abs() * b.width().max(1e-9) {
+                        if d.x >= 0.0 { Side::Right } else { Side::Left }
+                    } else if d.y >= 0.0 {
+                        Side::Bottom
+                    } else {
+                        Side::Top
+                    }
+                }
+                s => *s,
+            };
+            Some((side.point(b), Some(side)))
+        }
+    }
+}
+
+/// A curve from `p0` to `p1` leaving and arriving along the sides' normals (a free end pulls no
+/// way): the ends and the two control points between them.
+fn curve(p0: Point, s0: Option<Side>, p1: Point, s1: Option<Side>) -> Vec<Point> {
+    let reach = (p1 - p0).hypot() / 2.0;
+    let pull = |p: Point, s: Option<Side>| p + s.map_or(Vec2::ZERO, |s| s.normal() * reach);
+    vec![p0, pull(p0, s0), pull(p1, s1), p1]
+}
+
+/// A right-angled route from `p0` to `p1`, leaving and arriving along the sides' normals (`s`; a
+/// free end follows the other): the short way when it keeps out of the attached objects' `boxes`,
+/// else the cheapest of a few ways around them (by length, and turns).
+fn elbow(p0: Point, s0: Option<Side>, p1: Point, s1: Option<Side>, boxes: &[Rect]) -> Vec<Point> {
+    let direct = tidy(short_elbow(p0, s0.map(Side::horizontal), p1, s1.map(Side::horizontal)));
+    let Some(all) = boxes.iter().copied().reduce(|a, b| a.union(b)) else { return direct };
+    if !crosses(&direct, boxes) {
+        return direct;
+    }
+    // Out of each end by ROOM, then across on one of a few lines: halfway, or clear of the objects.
+    let out = |p: Point, s: Option<Side>| p + s.map_or(Vec2::ZERO, |s| s.normal() * ROOM);
+    let (a, b) = (out(p0, s0), out(p1, s1));
+    let mut ways = vec![vec![p0, a, Point::new(b.x, a.y), b, p1], vec![p0, a, Point::new(a.x, b.y), b, p1]];
+    for x in [(a.x + b.x) / 2.0, all.x0 - ROOM, all.x1 + ROOM] {
+        ways.push(vec![p0, a, Point::new(x, a.y), Point::new(x, b.y), b, p1]);
+    }
+    for y in [(a.y + b.y) / 2.0, all.y0 - ROOM, all.y1 + ROOM] {
+        ways.push(vec![p0, a, Point::new(a.x, y), Point::new(b.x, y), b, p1]);
+    }
+    let cost = |r: &Vec<Point>| r.windows(2).map(|s| (s[1] - s[0]).hypot()).sum::<f64>() + ROOM * r.len() as f64;
+    ways.into_iter().map(tidy).filter(|r| !crosses(r, boxes)).min_by(|x, y| cost(x).total_cmp(&cost(y))).unwrap_or(direct)
+}
+
+/// Whether the right-angled route `pts` runs through the inside of any of `boxes` (along an edge,
+/// or out of one, is outside).
+fn crosses(pts: &[Point], boxes: &[Rect]) -> bool {
+    const EDGE: f64 = 0.5;
+    pts.windows(2).any(|s| {
+        let (a, b) = (s[0], s[1]);
+        boxes.iter().any(|r| a.x.min(b.x) < r.x1 - EDGE && a.x.max(b.x) > r.x0 + EDGE && a.y.min(b.y) < r.y1 - EDGE && a.y.max(b.y) > r.y0 + EDGE)
+    })
+}
+
+/// The short right-angled route from `p0` to `p1` (`h`: the side faces sideways; a free end
+/// follows the other): halfway across between two sides facing the same way, one turn otherwise.
+fn short_elbow(p0: Point, h0: Option<bool>, p1: Point, h1: Option<bool>) -> Vec<Point> {
+    let h0 = h0.or(h1).unwrap_or((p1.x - p0.x).abs() >= (p1.y - p0.y).abs());
+    let h1 = h1.unwrap_or(h0);
+    match (h0, h1) {
+        (true, true) => {
+            let mx = (p0.x + p1.x) / 2.0;
+            vec![p0, Point::new(mx, p0.y), Point::new(mx, p1.y), p1]
+        }
+        (false, false) => {
+            let my = (p0.y + p1.y) / 2.0;
+            vec![p0, Point::new(p0.x, my), Point::new(p1.x, my), p1]
+        }
+        (true, false) => vec![p0, Point::new(p1.x, p0.y), p1],
+        (false, true) => vec![p0, Point::new(p0.x, p1.y), p1],
+    }
+}
diff --git a/crates/engine/src/boards/board/edit.rs b/crates/engine/src/boards/board/edit.rs
new file mode 100644
index 00000000..1770852c
--- /dev/null
+++ b/crates/engine/src/boards/board/edit.rs
@@ -0,0 +1,260 @@
+use super::connectors::connector_of;
+use super::derived::ends_now;
+use super::items::{add, add_text, shape_padding, text_of};
+use super::*;
+
+/// The label of connector `id`, if it has one.
+pub fn label_of(doc: &Document, id: NodeId) -> Option<NodeId> {
+    let parent = doc.node(id)?.parent?;
+    doc.node(parent)?.children.iter().copied().find(|c| doc.node(*c).is_some_and(|n| n.board == Some(BoardItem::Label { connector: id })))
+}
+
+/// Give connector `id` the label `text` (empty removes it); the label's id.
+pub(super) fn set_label(doc: &mut Document, id: NodeId, text: &str) -> Result<Option<NodeId>> {
+    let existing = label_of(doc, id);
+    if text.trim().is_empty() {
+        if let Some(l) = existing {
+            doc.remove(l)?;
+        }
+        return Ok(None);
+    }
+    if let Some(l) = existing {
+        if let Some(t) = text_of(doc, l)
+            && let Some(NodeKind::Text(td)) = doc.node_mut(t).map(|n| &mut n.kind)
+        {
+            let len = td.char_count();
+            td.replace_range(0, len, text);
+        }
+        return Ok(Some(l));
+    }
+    let parent = doc.node(id).and_then(|n| n.parent).ok_or(DocError::NoNode(id))?;
+    let l = add(doc, parent, NodeKind::Frame, "Label", (0.0, 0.0), (40.0, 24.0), |n| {
+        n.fills = vec![Paint::solid(Color::WHITE)];
+        n.corners.radii = [4.0; 4];
+        n.clip = false;
+        n.layout = Some(AutoLayout { padding: [3.0, 6.0, 3.0, 6.0], ..AutoLayout::default() });
+        n.child_layout.sizing_h = Sizing::Hug;
+        n.child_layout.sizing_v = Sizing::Hug;
+        n.board = Some(BoardItem::Label { connector: id });
+    })?;
+    let t = add_text(doc, l, text, 12.0, INK, TextAlignH::Center, 40.0)?;
+    if let Some(n) = doc.node_mut(t)
+        && let NodeKind::Text(td) = &mut n.kind
+    {
+        // The label hugs its text: one line per paragraph.
+        td.auto_resize = TextAutoResize::WidthAndHeight;
+        n.child_layout.sizing_h = Sizing::Hug;
+    }
+    Ok(Some(l))
+}
+
+pub(super) fn label_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.label";
+    require(s, cmd)?;
+    let id = req_targets(cmd, s, p)?.first().copied().ok_or_else(|| bad(cmd, "select a connector"))?;
+    let (id, _) = connector_of(cmd, s.doc()?, id)?;
+    let text = req_string(cmd, p, "text")?;
+    let label = set_label(s.doc_mut()?, id, &text)?;
+    Ok(json!({"id": id, "label": label}))
+}
+
+/// The board objects among `ids`, each with its item (a label counts as its connector's text).
+fn items(doc: &Document, ids: &[NodeId]) -> Vec<(NodeId, BoardItem)> {
+    ids.iter().filter_map(|i| doc.node(*i).and_then(|n| n.board.clone()).map(|b| (*i, b))).collect()
+}
+
+pub(super) fn set_color(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.setColor";
+    require(s, cmd)?;
+    let ids = req_targets(cmd, s, p)?;
+    let color = color_param(cmd, p)?.ok_or_else(|| bad(cmd, "`color` is required"))?;
+    let doc = s.doc_mut()?;
+    let mut changed = Vec::new();
+    for (id, item) in items(doc, &ids) {
+        match item {
+            BoardItem::Sticky { .. } => doc.get_mut(id)?.fills = vec![Paint::solid(color)],
+            BoardItem::Shape { .. } => {
+                let Some(outline) = doc.get(id)?.children.first().copied() else { continue };
+                let n = doc.get_mut(outline)?;
+                n.fills = vec![Paint::solid(color)];
+                n.strokes = vec![Paint::solid(line_shade(color))];
+            }
+            BoardItem::Connector(_) | BoardItem::Ink => doc.get_mut(id)?.strokes = vec![Paint::solid(line_shade(color))],
+            BoardItem::Label { .. } | BoardItem::Stamp { .. } | BoardItem::Table => continue,
+        }
+        changed.push(id);
+    }
+    if changed.is_empty() {
+        return Err(bad(cmd, "select stickies, shapes, connectors or ink"));
+    }
+    Ok(json!({"ids": changed}))
+}
+
+/// What `board.setStyle` changes (each `None` leaves it).
+struct Restyle {
+    shape: Option<BoardShape>,
+    routing: Option<Routing>,
+    size: Option<f64>,
+    start: Option<StrokeCap>,
+    end: Option<StrokeCap>,
+}
+
+impl Restyle {
+    fn of(cmd: &str, p: &Value) -> Result<Restyle> {
+        let size = num(p, "fontSize")
+            .map(|v| if v.is_finite() && (1.0..=1000.0).contains(&v) { Ok(v) } else { Err(bad(cmd, "`fontSize` is from 1 to 1000")) })
+            .transpose()?;
+        Ok(Restyle {
+            shape: string(p, "shape").map(|v| shape_of(cmd, &v)).transpose()?,
+            routing: string(p, "style").map(|v| routing_of(cmd, &v)).transpose()?,
+            size,
+            start: cap_of(cmd, p, "startCap")?,
+            end: cap_of(cmd, p, "endCap")?,
+        })
+    }
+
+    /// Restyle board object `id` (`item`); whether anything about it changed.
+    fn apply(&self, doc: &mut Document, id: NodeId, item: BoardItem) -> Result<bool> {
+        let changed = match item {
+            BoardItem::Shape { shape } => match self.shape.filter(|n| *n != shape) {
+                Some(new) => {
+                    reshape(doc, id, new)?;
+                    true
+                }
+                None => false,
+            },
+            BoardItem::Connector(c) => self.restyle_connector(doc, id, c)?,
+            _ => false,
+        };
+        // Text sizes: shapes' and labels' text (stickies size theirs to fit).
+        let sized = match (self.size, &item) {
+            (Some(size), BoardItem::Shape { .. } | BoardItem::Label { .. }) => resize_text(doc, id, size),
+            _ => false,
+        };
+        Ok(changed || sized)
+    }
+
+    fn restyle_connector(&self, doc: &mut Document, id: NodeId, mut c: Connector) -> Result<bool> {
+        let n = doc.get_mut(id)?;
+        if let Some(r) = self.routing {
+            c.routing = r;
+            n.board = Some(BoardItem::Connector(c));
+        }
+        if let Some(cap) = self.start {
+            n.stroke.cap_start = cap;
+        }
+        if let Some(cap) = self.end {
+            n.stroke.cap_end = cap;
+        }
+        Ok(self.routing.is_some() || self.start.is_some() || self.end.is_some())
+    }
+}
+
+/// Shape with text `id` takes outline `new` (its text room too).
+fn reshape(doc: &mut Document, id: NodeId, new: BoardShape) -> Result<()> {
+    let n = doc.get_mut(id)?;
+    n.board = Some(BoardItem::Shape { shape: new });
+    n.name = new.label().into();
+    let (w, h) = (n.width, n.height);
+    if let Some(l) = n.layout.as_mut() {
+        l.padding = shape_padding(new, w, h);
+    }
+    if let Some(o) = doc.get(id)?.children.first().copied()
+        && let Some(on) = doc.node_mut(o)
+    {
+        on.kind = NodeKind::Vector { network: VectorNetwork::from_path(&new.path(w, h)) };
+        (on.width, on.height, on.transform) = (w, h, Affine::IDENTITY);
+    }
+    Ok(())
+}
+
+/// Board object `id`'s text at `size`; whether it has text.
+fn resize_text(doc: &mut Document, id: NodeId, size: f64) -> bool {
+    let Some(t) = text_of(doc, id) else { return false };
+    if let Some(NodeKind::Text(td)) = doc.node_mut(t).map(|n| &mut n.kind) {
+        set_font_size(td, size);
+        return true;
+    }
+    false
+}
+
+pub(super) fn set_style(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.setStyle";
+    require(s, cmd)?;
+    let ids = req_targets(cmd, s, p)?;
+    let restyle = Restyle::of(cmd, p)?;
+    let doc = s.doc_mut()?;
+    let mut changed = Vec::new();
+    for (id, item) in items(doc, &ids) {
+        if restyle.apply(doc, id, item)? {
+            changed.push(id);
+        }
+    }
+    if changed.is_empty() {
+        return Err(bad(cmd, "nothing selected takes these (shapes with text, connectors, labels)"));
+    }
+    Ok(json!({"ids": changed}))
+}
+
+pub(super) fn set_font_size(td: &mut TextData, size: f64) {
+    td.style.font_size = size;
+    for r in &mut td.runs {
+        r.style.font_size = size;
+    }
+}
+
+/// Each layer of `sources` (copied one by one, in order, as `copies`) and its copy: the whole
+/// subtrees pair up when they have the same shape (an instance made of a main component may not;
+/// then only the roots do).
+pub(crate) fn copy_map(doc: &Document, sources: &[NodeId], copies: &[NodeId]) -> BTreeMap<NodeId, NodeId> {
+    let mut map = BTreeMap::new();
+    for (s, c) in sources.iter().zip(copies) {
+        let (a, b) = (doc.subtree(*s), doc.subtree(*c));
+        if a.len() == b.len() {
+            map.extend(a.into_iter().zip(b));
+        } else {
+            map.insert(*s, *c);
+        }
+    }
+    map
+}
+
+/// The connectors and labels among copied layers, as `(copy, the original's board item)`, from the
+/// originals in `doc` (`map`: original → copy).
+pub(crate) fn copied_items(doc: &Document, map: &BTreeMap<NodeId, NodeId>) -> Vec<(NodeId, BoardItem)> {
+    map.iter().filter_map(|(o, c)| doc.node(*o).and_then(|n| n.board.clone()).map(|b| (*c, b))).collect()
+}
+
+/// After a copy (`map`: each copied original → its copy; `originals`: the copies' items as the
+/// originals had them), copied connectors join the copies of what they joined and labels follow
+/// the copies of their connectors. From another file (`foreign`), what wasn't copied isn't here: a
+/// connector's end there stays where it is drawn, as a point, and a label without its connector
+/// goes.
+pub(crate) fn rejoin(doc: &mut Document, originals: &[(NodeId, BoardItem)], map: &BTreeMap<NodeId, NodeId>, foreign: bool) {
+    for (copy, item) in originals {
+        let mut item = item.clone();
+        let copied = |n: NodeId| map.contains_key(&n);
+        match &mut item {
+            BoardItem::Connector(c) if foreign => {
+                let ends = ends_now(doc, *copy);
+                for (end, at) in [(&mut c.from, ends.map(|e| e.0)), (&mut c.to, ends.map(|e| e.1))] {
+                    if let (End::Node { node, .. }, Some(p)) = (*end, at)
+                        && !copied(node)
+                    {
+                        *end = End::Point { x: p.x, y: p.y };
+                    }
+                }
+            }
+            BoardItem::Label { connector } if foreign && !copied(*connector) => {
+                let _ = doc.remove(*copy);
+                continue;
+            }
+            BoardItem::Connector(_) | BoardItem::Label { .. } => {}
+            _ => continue,
+        }
+        item.remap(map);
+        if let Some(n) = doc.node_mut(*copy) {
+            n.board = Some(item);
+        }
+    }
+}
diff --git a/crates/engine/src/boards/board/items.rs b/crates/engine/src/boards/board/items.rs
new file mode 100644
index 00000000..6d96d34b
--- /dev/null
+++ b/crates/engine/src/boards/board/items.rs
@@ -0,0 +1,297 @@
+use super::*;
+
+/// A new layer at the top of `parent`, at `at` in it, made by `f`.
+pub(super) fn add(
+    doc: &mut Document,
+    parent: NodeId,
+    kind: NodeKind,
+    name: &str,
+    at: (f64, f64),
+    size: (f64, f64),
+    f: impl FnOnce(&mut Node),
+) -> Result<NodeId> {
+    let id = doc.alloc_id();
+    let mut n = Node::new(id, kind, name, size.0, size.1);
+    n.transform = Affine::translate(at);
+    f(&mut n);
+    doc.insert(n, parent, None)?;
+    Ok(id)
+}
+
+/// A soft shadow under stickies and stamps.
+fn soft_shadow() -> Effect {
+    Effect {
+        kind: EffectKind::DropShadow(Shadow { color: Color::new(0.0, 0.0, 0.0, 0.16), offset: (0.0, 2.0), radius: 6.0, ..Shadow::default() }),
+        visible: true,
+    }
+}
+
+/// A text layer filling its frame's width (the frame's auto layout places it).
+pub(crate) fn add_text(doc: &mut Document, parent: NodeId, text: &str, size: f64, color: Color, align: TextAlignH, width: f64) -> Result<NodeId> {
+    let first: String = text.lines().next().unwrap_or("").chars().take(64).collect();
+    let name = if first.trim().is_empty() { "Text" } else { first.as_str() };
+    let mut td = TextData {
+        characters: crate::cmd::props::normalize_line_endings(text),
+        auto_resize: TextAutoResize::Height,
+        align_h: align,
+        ..TextData::default()
+    };
+    td.style.font_size = size;
+    let id = add(doc, parent, NodeKind::Text(td), name, (0.0, 0.0), (width.max(1.0), size * 1.4), |n| {
+        n.fills = vec![Paint::solid(color)];
+        n.child_layout.sizing_h = Sizing::Fill;
+    })?;
+    if let Some(n) = doc.node(id)
+        && let Some((w, h)) = figcraft_text::auto_size(n)
+        && let Some(n) = doc.node_mut(id)
+    {
+        (n.width, n.height) = (w, h);
+    }
+    Ok(id)
+}
+
+/// The text size a sticky's note gets: smaller the more it holds (by characters and lines, so
+/// every copy of the file picks the same size whatever fonts it has).
+pub fn sticky_font_size(text: &str) -> f64 {
+    let weight = text.chars().count() + 24 * text.matches('\n').count();
+    match weight {
+        0..=24 => 24.0,
+        25..=64 => 20.0,
+        65..=140 => 16.0,
+        141..=280 => 13.0,
+        _ => 11.0,
+    }
+}
+
+/// A sticky note's layers: the frame, the note and (when known) its author.
+fn make_sticky(doc: &mut Document, parent: NodeId, at: (f64, f64), text: &str, color: Color, author: &str) -> Result<(NodeId, NodeId)> {
+    let id = add(doc, parent, NodeKind::Frame, "Sticky", at, (STICKY, STICKY), |n| {
+        n.fills = vec![Paint::solid(color)];
+        n.corners.radii = [2.0; 4];
+        n.effects = vec![soft_shadow()];
+        n.clip = false;
+        n.layout = Some(AutoLayout {
+            mode: LayoutMode::Vertical,
+            gap: 8.0,
+            padding: [STICKY_PAD; 4],
+            main_align: MainAlign::SpaceBetween,
+            ..AutoLayout::default()
+        });
+        n.child_layout.sizing_v = Sizing::Hug;
+        n.child_layout.min_h = Some(STICKY);
+        n.board = Some(BoardItem::Sticky { author: author.to_string() });
+    })?;
+    let inner = STICKY - 2.0 * STICKY_PAD;
+    let note = add_text(doc, id, text, sticky_font_size(text), INK, TextAlignH::Left, inner)?;
+    if !author.is_empty() {
+        let a = add_text(doc, id, author, 10.0, AUTHOR_INK, TextAlignH::Left, inner)?;
+        if let Some(n) = doc.node_mut(a) {
+            n.name = "Author".into();
+        }
+    }
+    Ok((id, note))
+}
+
+pub(super) fn sticky_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.sticky";
+    require(s, cmd)?;
+    let color = color_param(cmd, p)?.unwrap_or(s.tool.board.sticky);
+    let author = match get(p, "author") {
+        Some(Value::String(a)) => a.trim().chars().filter(|c| !c.is_control()).take(64).collect(),
+        Some(Value::Bool(false)) => String::new(),
+        _ => author(s),
+    };
+    let parent = parent_of(cmd, s, p)?;
+    let text = string(p, "text").unwrap_or_default();
+    let at = (num_or(p, "x", 0.0), num_or(p, "y", 0.0));
+    let (id, note) = make_sticky(s.doc_mut()?, parent, at, &text, color, &author)?;
+    s.set_selection(vec![id]);
+    Ok(json!({"id": id, "text": note}))
+}
+
+/// The first text layer inside board object `id` (its note or label).
+pub fn text_of(doc: &Document, id: NodeId) -> Option<NodeId> {
+    let n = doc.node(id)?;
+    n.board.as_ref().filter(|b| b.has_text())?;
+    n.children.iter().copied().find(|c| doc.node(*c).is_some_and(|k| matches!(k.kind, NodeKind::Text(_))))
+}
+
+/// The board object whose text `text` is, if any.
+pub fn owner_of_text(doc: &Document, text: NodeId) -> Option<NodeId> {
+    let p = doc.node(text)?.parent?;
+    (text_of(doc, p) == Some(text)).then_some(p)
+}
+
+/// Start typing in board object `id`'s text (all of it selected). False when it has none.
+pub fn edit_text(s: &mut Session, id: NodeId) -> Result<bool> {
+    let Some(t) = s.doc().ok().and_then(|d| text_of(d, id)) else { return Ok(false) };
+    textedit::begin(s, t, None, false)?;
+    textedit::key(s, "SelectAll", false, false, false)?;
+    Ok(true)
+}
+
+pub(super) fn next_sticky(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.nextSticky";
+    require(s, cmd)?;
+    let editing = s.ds()?.text_edit.as_ref().map(|t| t.id);
+    let doc = s.doc()?;
+    let from = id(p, "id")
+        .or_else(|| editing.and_then(|t| owner_of_text(doc, t)))
+        .or_else(|| s.selection().first().copied().map(|i| owner_of_text(doc, i).unwrap_or(i)))
+        .ok_or_else(|| EngineError::Disabled(cmd.into(), "select a sticky first".into()))?;
+    let n = doc.get(from)?;
+    if !matches!(n.board, Some(BoardItem::Sticky { .. })) {
+        return Err(bad(cmd, "that isn't a sticky"));
+    }
+    let color = n.fills.iter().find_map(Paint::solid_color).unwrap_or(s.tool.board.sticky);
+    let parent = n.parent.ok_or_else(|| bad(cmd, "that sticky has no parent"))?;
+    let at = n.transform.translation();
+    let (dx, dy) = match string(p, "side").as_deref().unwrap_or("right") {
+        "right" => (n.width + STICKY_GAP, 0.0),
+        "left" => (-(STICKY + STICKY_GAP), 0.0),
+        "below" => (0.0, n.height + STICKY_GAP),
+        "above" => (0.0, -(STICKY + STICKY_GAP)),
+        other => return Err(bad(cmd, format!("`side` is right, below, left or above, not `{other}`"))),
+    };
+    let author = author(s);
+    if editing.is_some() {
+        textedit::end(s)?;
+    }
+    let (id, note) = make_sticky(s.doc_mut()?, parent, (at.x + dx, at.y + dy), "", color, &author)?;
+    s.set_selection(vec![id]);
+    if boolean(p, "edit") == Some(true) {
+        // Typing goes on in the new sticky once this step is recorded.
+        s.request_ui("board.editText", json!({"id": id}));
+    }
+    Ok(json!({"id": id, "text": note}))
+}
+
+/// A shape with text's layers: the frame, its outline and its text.
+fn make_shape(
+    doc: &mut Document,
+    parent: NodeId,
+    at: (f64, f64),
+    size: (f64, f64),
+    shape: BoardShape,
+    text: &str,
+    color: Color,
+) -> Result<(NodeId, NodeId)> {
+    let (w, h) = size;
+    let id = add(doc, parent, NodeKind::Frame, shape.label(), at, size, |n| {
+        n.fills.clear();
+        n.clip = false;
+        n.layout = Some(AutoLayout {
+            mode: LayoutMode::Vertical,
+            padding: shape_padding(shape, w, h),
+            main_align: MainAlign::Center,
+            cross_align: CrossAlign::Center,
+            ..AutoLayout::default()
+        });
+        n.board = Some(BoardItem::Shape { shape });
+    })?;
+    add(doc, id, NodeKind::Vector { network: VectorNetwork::from_path(&shape.path(w, h)) }, "Outline", (0.0, 0.0), size, |n| {
+        n.fills = vec![Paint::solid(color)];
+        n.strokes = vec![Paint::solid(line_shade(color))];
+        n.stroke.weight = 1.5;
+        n.stroke.align = StrokeAlign::Inside;
+        n.child_layout.absolute = true;
+        n.constraints = Constraints { horizontal: HConstraint::Scale, vertical: VConstraint::Scale };
+    })?;
+    let [_, r, _, l] = shape_padding(shape, w, h);
+    let label = add_text(doc, id, text, 16.0, INK, TextAlignH::Center, (w - l - r).max(1.0))?;
+    Ok((id, label))
+}
+
+pub(super) fn shape_padding(shape: BoardShape, w: f64, h: f64) -> [f64; 4] {
+    let [t, r, b, l] = shape.text_insets();
+    [t * h, r * w, b * h, l * w]
+}
+
+pub(super) fn shape_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.shape";
+    require(s, cmd)?;
+    let shape = match string(p, "shape") {
+        Some(v) => shape_of(cmd, &v)?,
+        None => s.tool.board.shape,
+    };
+    let size = |k| {
+        num(p, k)
+            .map_or(Ok(SHAPE), |v| if (1.0..=100_000.0).contains(&v) { Ok(v) } else { Err(bad(cmd, format!("`{k}` is a size from 1 to 100000"))) })
+    };
+    let (w, h) = (size("width")?, size("height")?);
+    let color = color_param(cmd, p)?.unwrap_or(s.tool.board.sticky);
+    let parent = parent_of(cmd, s, p)?;
+    let text = string(p, "text").unwrap_or_default();
+    let at = (num_or(p, "x", 0.0), num_or(p, "y", 0.0));
+    let (id, label) = make_shape(s.doc_mut()?, parent, at, (w, h), shape, &text, color)?;
+    s.set_selection(vec![id]);
+    Ok(json!({"id": id, "text": label}))
+}
+
+pub(super) fn stamp_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.stamp";
+    require(s, cmd)?;
+    let stamp = match string(p, "stamp") {
+        Some(v) => stamp_of(cmd, &v)?,
+        None => s.tool.board.stamp,
+    };
+    let (x, y) = (req_num(cmd, p, "x")?, req_num(cmd, p, "y")?);
+    let author = author(s);
+    let page = s.page()?;
+    let half = STAMP_SIZE / 2.0;
+    let doc = s.doc_mut()?;
+    let id = add(doc, page, NodeKind::Frame, stamp.label(), (x - half, y - half), (STAMP_SIZE, STAMP_SIZE), |n| {
+        n.fills = vec![Paint::solid(stamp.color())];
+        n.corners.radii = [half; 4];
+        n.effects = vec![soft_shadow()];
+        n.clip = false;
+        n.board = Some(BoardItem::Stamp { stamp, author });
+    })?;
+    for part in stamp.mark() {
+        let path = figcraft_geom::BezPath::from_svg(part.d).map_err(|e| EngineError::Other(format!("stamp mark: {e}")))?;
+        add(doc, id, NodeKind::Vector { network: VectorNetwork::from_path(&path) }, "Mark", (0.0, 0.0), (STAMP_SIZE, STAMP_SIZE), |n| {
+            if part.filled {
+                n.fills = vec![Paint::solid(Color::WHITE)];
+            } else {
+                n.fills.clear();
+                n.strokes = vec![Paint::solid(Color::WHITE)];
+                n.stroke.weight = 3.0;
+                (n.stroke.cap_start, n.stroke.cap_end) = (StrokeCap::Round, StrokeCap::Round);
+                n.stroke.join = StrokeJoin::Round;
+                n.stroke.align = StrokeAlign::Center;
+            }
+        })?;
+    }
+    s.set_selection(vec![id]);
+    Ok(json!({"id": id}))
+}
+
+pub(super) fn ink_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.ink";
+    require(s, cmd)?;
+    let high = boolean(p, "highlighter").unwrap_or(false);
+    let color = color_param(cmd, p)?.unwrap_or(if high { s.tool.board.highlighter } else { s.tool.board.marker });
+    let (weight, opacity) = if high { HIGHLIGHTER } else { MARKER };
+    if get(p, "path").is_none() && get(p, "points").is_none() {
+        return Err(bad(cmd, "`path` or `points` is required"));
+    }
+    let page = s.page()?;
+    let select = boolean(p, "select").unwrap_or(true);
+    let mut q = json!({"type": "vector", "parent": page, "closed": false, "select": select, "name": if high { "Highlight" } else { "Ink" }, "props": {
+        "fills": [], "strokes": [color.to_css_hex()], "strokeWeight": weight, "strokeCap": "round", "strokeJoin": "round", "strokeAlign": "center",
+    }});
+    for k in ["path", "points"] {
+        if let (Some(v), Some(o)) = (get(p, k), q.as_object_mut()) {
+            o.insert(k.into(), v.clone());
+        }
+    }
+    let made = crate::cmd::create::create(s, &q)?;
+    let id = made.get("id").and_then(id_of).ok_or_else(|| EngineError::Other("no stroke made".into()))?;
+    let n = s.doc_mut()?.get_mut(id)?;
+    n.opacity = opacity;
+    if high {
+        n.blend = BlendMode::Multiply;
+    }
+    n.board = Some(BoardItem::Ink);
+    Ok(json!({"id": id}))
+}
diff --git a/crates/engine/src/boards/board/tools.rs b/crates/engine/src/boards/board/tools.rs
new file mode 100644
index 00000000..2dc904c9
--- /dev/null
+++ b/crates/engine/src/boards/board/tools.rs
@@ -0,0 +1,210 @@
+use super::connectors::{end_json, other_end};
+use super::derived::ends_now;
+use super::edit::label_of;
+use super::items::edit_text;
+use super::*;
+
+// ---------------------------------------------------------------------------------------------
+// The board tools.
+
+impl Session {
+    /// A press with a board tool: place a sticky, shape or stamp, start a connector or a stroke,
+    /// or start erasing.
+    pub(crate) fn board_down(&mut self, ev: &PointerEvent) -> Result<()> {
+        // A board tool kept while a design file came to the front: back to Move for this press.
+        if !is_board(self.doc()?) {
+            self.tool.tool = ToolId::Move;
+            return self.pointer(ev);
+        }
+        // A sticky still being typed in ends first, so the next object is an undo step of its own.
+        if self.ds()?.text_edit.is_some() {
+            crate::textedit::end(self)?;
+        }
+        match self.tool.tool {
+            ToolId::Sticky => {
+                let half = STICKY / 2.0;
+                let r = self.execute("board.sticky", &json!({"x": ev.x - half, "y": ev.y - half}))?;
+                self.board_placed();
+                if let Some(id) = r.get("id").and_then(id_of) {
+                    edit_text(self, id)?;
+                }
+                Ok(())
+            }
+            ToolId::BoardShape => {
+                let half = SHAPE / 2.0;
+                self.execute("board.shape", &json!({"x": ev.x - half, "y": ev.y - half}))?;
+                self.board_placed();
+                Ok(())
+            }
+            ToolId::Stamp => {
+                // Stamps go on one after another: the tool stays.
+                self.execute("board.stamp", &json!({"x": ev.x, "y": ev.y}))?;
+                Ok(())
+            }
+            ToolId::Marker | ToolId::Highlighter => {
+                self.tool.gesture = Gesture::Pencil { points: vec![ev.p()], pressure: vec![ev.pressure] };
+                Ok(())
+            }
+            ToolId::Connector => {
+                let from = self.end_at(ev);
+                self.tool.gesture = Gesture::Connect { from, start: ev.p() };
+                Ok(())
+            }
+            ToolId::Eraser => {
+                self.begin_interaction("Erase")?;
+                self.tool.gesture = Gesture::Erase { gone: Vec::new() };
+                self.erase_at(ev)
+            }
+            _ => Ok(()),
+        }
+    }
+
+    /// After placing an object: back to the Move tool unless tools stay on.
+    fn board_placed(&mut self) {
+        if !self.prefs.keep_tool {
+            self.set_tool(ToolId::Move);
+        }
+    }
+
+    /// What a connector end at the pointer attaches to: the object there, or the point.
+    fn end_at(&self, ev: &PointerEvent) -> End {
+        let hit = (|| {
+            let doc = self.doc().ok()?;
+            let leaf = self.hit(doc, self.page().ok()?, ev.p(), 2.0 / ev.zoom.max(1e-6))?;
+            let t = figcraft_doc::geometry::select_target(doc, leaf, &[], false);
+            let n = doc.node(t)?;
+            (!matches!(n.board, Some(BoardItem::Connector(_)) | Some(BoardItem::Label { .. }) | Some(BoardItem::Ink))).then_some(t)
+        })();
+        match hit {
+            Some(node) => End::Node { node, side: Side::Auto },
+            None => End::Point { x: ev.x, y: ev.y },
+        }
+    }
+
+    pub(crate) fn connect_drag(&mut self, ev: &PointerEvent, from: End, start: Point) {
+        let a = match from {
+            End::Point { x, y } => Point::new(x, y),
+            End::Node { .. } => start,
+        };
+        self.tool.overlay.rubber = Some([a.x, a.y, ev.x, ev.y]);
+        self.tool.overlay.drop_target = from.node();
+        self.tool.gesture = Gesture::Connect { from, start };
+        if let Ok(ds) = self.ds_mut() {
+            ds.revision += 1;
+        }
+    }
+
+    pub(crate) fn connect_up(&mut self, ev: &PointerEvent, from: End, start: Point) -> Result<()> {
+        self.tool.overlay.rubber = None;
+        self.tool.overlay.drop_target = None;
+        // A click, not a drag: nothing to join.
+        if (ev.p() - start).hypot() * ev.zoom.max(1e-6) < 4.0 {
+            return Ok(());
+        }
+        let to = self.end_at(ev);
+        if to.node().is_some() && to.node() == from.node() {
+            return Ok(());
+        }
+        let style = self.tool.board.routing.id();
+        self.execute("board.connector", &json!({"from": end_json(from), "to": end_json(to), "style": style}))?;
+        self.board_placed();
+        Ok(())
+    }
+
+    /// Dragging the selected connector `id`'s end (`from`: its start): a line from its other end
+    /// to the pointer, and the object it would attach to outlined.
+    pub(crate) fn reattach_drag(&mut self, ev: &PointerEvent, id: NodeId, from: bool, start: Point) {
+        self.tool.gesture = Gesture::Reattach { id, from, start };
+        let Ok(doc) = self.doc() else { return };
+        let fixed = ends_now(doc, id).map(|(a, b)| if from { b } else { a });
+        let other = other_end(doc, id, from).and_then(|e| e.node());
+        self.tool.overlay.rubber = fixed.map(|f| [f.x, f.y, ev.x, ev.y]);
+        self.tool.overlay.drop_target = self.end_at(ev).node().filter(|n| Some(*n) != other);
+        if let Ok(ds) = self.ds_mut() {
+            ds.revision += 1;
+        }
+    }
+
+    /// The end let go: attached to the object under the pointer, or free there (`board.reattach`).
+    /// A click, or a drop on the object the other end is on, changes nothing.
+    pub(crate) fn reattach_up(&mut self, ev: &PointerEvent, id: NodeId, from: bool, start: Point) -> Result<()> {
+        self.tool.overlay.rubber = None;
+        if (ev.p() - start).hypot() * ev.zoom.max(1e-6) < 4.0 {
+            return Ok(());
+        }
+        let target = self.end_at(ev);
+        let other = other_end(self.doc()?, id, from).and_then(|e| e.node());
+        if target.node().is_some() && target.node() == other {
+            return Ok(());
+        }
+        self.execute("board.reattach", &json!({"id": id, "end": if from { "from" } else { "to" }, "target": end_json(target)}))?;
+        Ok(())
+    }
+
+    /// The eraser at the pointer: the marker and highlighter strokes it touches go (until the
+    /// gesture ends, which is one undo step).
+    pub(crate) fn erase_at(&mut self, ev: &PointerEvent) -> Result<()> {
+        let Gesture::Erase { mut gone } = std::mem::take(&mut self.tool.gesture) else { return Ok(()) };
+        let tol = ERASER_PX / ev.zoom.max(1e-6);
+        self.tool.overlay.brush = Some([ev.x, ev.y, tol]);
+        let (doc, page) = (self.doc()?.clone(), self.page()?);
+        if let Some(hit) =
+            doc.hit_test(page, ev.p(), tol, None).filter(|h| doc.node(*h).is_some_and(|n| n.board == Some(BoardItem::Ink)) && !gone.contains(h))
+        {
+            gone.push(hit);
+            let ids = gone.clone();
+            self.preview(|d, sel| {
+                for i in &ids {
+                    let _ = d.remove(*i);
+                }
+                sel.retain(|s| !ids.contains(s));
+                Ok(())
+            })?;
+        }
+        self.tool.gesture = Gesture::Erase { gone };
+        if let Ok(ds) = self.ds_mut() {
+            ds.revision += 1;
+        }
+        Ok(())
+    }
+
+    pub(crate) fn erase_up(&mut self) -> Result<()> {
+        self.tool.overlay.brush = None;
+        self.commit_interaction()
+    }
+
+    /// A finished marker or highlighter stroke (page points).
+    pub(crate) fn ink_finish(&mut self, path: &str) -> Result<()> {
+        let high = self.tool.tool == ToolId::Highlighter;
+        self.execute("board.ink", &json!({"path": path, "highlighter": high, "select": false}))?;
+        // Strokes come one after another: the selection stays as it was.
+        Ok(())
+    }
+}
+
+impl Session {
+    /// A double-click with the Move tool on a board object: type in its text (a connector gets a
+    /// label to type in). True when it was one.
+    pub(crate) fn board_double_click(&mut self, doc: &Document, leaf: NodeId, sel: &[NodeId]) -> Result<bool> {
+        let whole = figcraft_doc::geometry::select_target(doc, leaf, sel, false);
+        let editing = self.ds()?.text_edit.as_ref().is_some_and(|te| doc.is_ancestor(whole, te.id));
+        let Some(item) = doc.node(whole).and_then(|n| n.board.clone()).filter(|_| !editing) else { return Ok(false) };
+        self.tool.gesture = Gesture::None;
+        self.cancel_interaction()?;
+        match item {
+            BoardItem::Connector(_) => {
+                let label = match label_of(doc, whole) {
+                    Some(l) => l,
+                    None => {
+                        let r = self.execute("board.label", &json!({"id": whole, "text": "Label"}))?;
+                        r.get("label").and_then(id_of).ok_or_else(|| EngineError::Other("no label made".into()))?
+                    }
+                };
+                edit_text(self, label)
+            }
+            BoardItem::Table => crate::board_table::edit_cell(self, doc, leaf),
+            b if b.has_text() => edit_text(self, whole),
+            _ => Ok(false),
+        }
+    }
+}
diff --git a/crates/engine/src/boards/board_table.rs b/crates/engine/src/boards/board_table.rs
new file mode 100644
index 00000000..9cf35dcb
--- /dev/null
+++ b/crates/engine/src/boards/board_table.rs
@@ -0,0 +1,300 @@
+//! Board tables: a frame of row frames holding cell frames with text, all ordinary auto layout
+//! layers. The table hugs its rows' height, the rows share its width and the cells share their
+//! row's width, so a cell that wraps more text makes its row taller. Each row but the last draws
+//! a line under itself and the column lines are thin rectangles over the table that stretch with
+//! it (they are rebuilt after every edit, like the first row's header tint).
+
+use figcraft_color::{Color, Paint};
+use figcraft_doc::{
+    AutoLayout, BoardItem, Constraints, Document, HConstraint, LayoutMode, Node, NodeId, NodeKind, Sizing, StrokeAlign, TextAlignH, VConstraint,
+};
+use figcraft_geom::Affine;
+use serde_json::{Value, json};
+
+use crate::board::{INK, add_text, require};
+use crate::cmd::CommandSpec;
+use crate::params::{get, id, num, num_or, opt_index, req_string};
+use crate::{EngineError, Result, Session, bad, spec, textedit};
+
+/// The most rows and columns a table has.
+pub const MAX_ROWS: usize = 50;
+pub const MAX_COLUMNS: usize = 20;
+/// A new column's width, and a cell's height before its text is measured.
+const CELL_W: f64 = 160.0;
+const CELL_H: f64 = 40.0;
+/// Room around a cell's text: [top, right, bottom, left].
+const CELL_PAD: [f64; 4] = [10.0, 12.0, 10.0, 12.0];
+const TEXT_SIZE: f64 = 14.0;
+const LINE_W: f64 = 1.0;
+const GRID: Color = Color::from_rgb8_const(0xCF, 0xCB, 0xC4);
+const HEADER: Color = Color::from_rgb8_const(0xF1, 0xEF, 0xEB);
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        spec!(
+            "board.table",
+            "Table",
+            "{rows?, columns? (default 3 × 3, or the size of `cells`; at most 50 × 20), cells? ([[text…]…] row by row), x?, y? (its top-left on the page; default centred in the view)} → {id, rows, columns, cells: [[text id…]…]}",
+            true,
+            table_cmd
+        ),
+        spec!(
+            "board.tableEdit",
+            "Edit table",
+            "{id? (a table or a layer in one; default the selection), action: addRow|addColumn|removeRow|removeColumn, index? (where the new one goes, or which one goes; default the last)} → {id, rows, columns, cells}",
+            true,
+            edit_cmd
+        ),
+    ]
+}
+
+/// A count from 1 to `max` (`default` when missing).
+fn count(cmd: &str, p: &Value, key: &str, default: usize, max: usize) -> Result<usize> {
+    match num(p, key) {
+        None if get(p, key).is_none() => Ok(default),
+        Some(v) if v.fract() == 0.0 && (1.0..=max as f64).contains(&v) => Ok(v as usize),
+        _ => Err(bad(cmd, format!("`{key}` is a whole number from 1 to {max}"))),
+    }
+}
+
+/// A frame for the table at `index` in `parent`, made by `f`.
+fn frame(doc: &mut Document, parent: NodeId, index: Option<usize>, name: &str, size: (f64, f64), f: impl FnOnce(&mut Node)) -> Result<NodeId> {
+    let id = doc.alloc_id();
+    let mut n = Node::new(id, NodeKind::Frame, name, size.0, size.1);
+    n.fills.clear();
+    n.clip = false;
+    f(&mut n);
+    doc.insert(n, parent, index)?;
+    Ok(id)
+}
+
+fn make_cell(doc: &mut Document, row: NodeId, index: Option<usize>, width: f64, text: &str) -> Result<NodeId> {
+    let cell = frame(doc, row, index, "Cell", (width, CELL_H), |n| {
+        n.layout = Some(AutoLayout { mode: LayoutMode::Vertical, gap: 0.0, padding: CELL_PAD, ..AutoLayout::default() });
+        n.child_layout.sizing_h = Sizing::Fill;
+        n.child_layout.sizing_v = Sizing::Hug;
+        n.child_layout.min_h = Some(CELL_H);
+    })?;
+    add_text(doc, cell, text, TEXT_SIZE, INK, TextAlignH::Left, (width - CELL_PAD[1] - CELL_PAD[3]).max(1.0))?;
+    Ok(cell)
+}
+
+fn make_row(doc: &mut Document, table: NodeId, index: Option<usize>, width: f64, texts: &[&str]) -> Result<NodeId> {
+    let row = frame(doc, table, index, "Row", (width, CELL_H), |n| {
+        n.layout = Some(AutoLayout { mode: LayoutMode::Horizontal, gap: 0.0, padding: [0.0; 4], ..AutoLayout::default() });
+        n.child_layout.sizing_h = Sizing::Fill;
+        n.child_layout.sizing_v = Sizing::Hug;
+        n.stroke.weight = LINE_W;
+        n.stroke.align = StrokeAlign::Inside;
+        n.stroke.sides = Some([0.0, 0.0, LINE_W, 0.0]);
+    })?;
+    let cw = width / texts.len().max(1) as f64;
+    for t in texts {
+        make_cell(doc, row, None, cw, t)?;
+    }
+    Ok(row)
+}
+
+/// A table of `texts` (rows of cell texts, all as long) at `at` on `parent`.
+pub(crate) fn make_table(doc: &mut Document, parent: NodeId, at: (f64, f64), texts: &[Vec<&str>]) -> Result<NodeId> {
+    let columns = texts.first().map_or(1, Vec::len).max(1);
+    let w = CELL_W * columns as f64;
+    let table = frame(doc, parent, None, "Table", (w, CELL_H * texts.len() as f64), |n| {
+        n.transform = Affine::translate(at);
+        n.fills = vec![Paint::solid(Color::WHITE)];
+        n.strokes = vec![Paint::solid(GRID)];
+        n.stroke.weight = LINE_W;
+        n.stroke.align = StrokeAlign::Inside;
+        n.corners.radii = [4.0; 4];
+        n.clip = true;
+        // The outline draws over the rows' edges rather than taking room from them.
+        n.layout = Some(AutoLayout { mode: LayoutMode::Vertical, gap: 0.0, padding: [0.0; 4], strokes_included: false, ..AutoLayout::default() });
+        n.child_layout.sizing_v = Sizing::Hug;
+        n.board = Some(BoardItem::Table);
+    })?;
+    for row in texts {
+        make_row(doc, table, None, w, row)?;
+    }
+    restyle(doc, table)?;
+    Ok(table)
+}
+
+/// Table `table`'s rows (its laid-out children) and column lines (the others).
+fn parts(doc: &Document, table: NodeId) -> (Vec<NodeId>, Vec<NodeId>) {
+    let kids = doc.node(table).map(|n| n.children.clone()).unwrap_or_default();
+    kids.into_iter().partition(|c| doc.node(*c).is_some_and(|n| !n.child_layout.absolute))
+}
+
+fn cells(doc: &Document, row: NodeId) -> Vec<NodeId> {
+    doc.node(row).map(|n| n.children.clone()).unwrap_or_default()
+}
+
+/// The first row tinted, a line under every row but the last, and the column lines over it all.
+fn restyle(doc: &mut Document, table: NodeId) -> Result<()> {
+    let (rows, lines) = parts(doc, table);
+    for l in lines {
+        doc.remove(l)?;
+    }
+    let last = rows.len().saturating_sub(1);
+    for (i, r) in rows.iter().enumerate() {
+        let n = doc.get_mut(*r)?;
+        n.fills = if i == 0 { vec![Paint::solid(HEADER)] } else { Vec::new() };
+        n.strokes = if i < last { vec![Paint::solid(GRID)] } else { Vec::new() };
+    }
+    let columns = rows.first().map_or(0, |r| cells(doc, *r).len());
+    let (w, h) = doc.get(table).map(|t| (t.width, t.height))?;
+    for i in 1..columns {
+        let x = w * i as f64 / columns as f64 - LINE_W / 2.0;
+        let id = doc.alloc_id();
+        let mut n = Node::new(id, NodeKind::Rectangle, "Column line", LINE_W, h);
+        n.fills = vec![Paint::solid(GRID)];
+        n.transform = Affine::translate((x, 0.0));
+        n.child_layout.absolute = true;
+        n.constraints = Constraints { horizontal: HConstraint::Scale, vertical: VConstraint::TopBottom };
+        n.locked = true;
+        doc.insert(n, table, None)?;
+    }
+    Ok(())
+}
+
+/// Each cell's text layer, row by row (null for a cell without one).
+fn cell_texts(doc: &Document, table: NodeId) -> Value {
+    let text = |cell: NodeId| {
+        doc.node(cell).and_then(|n| n.children.iter().copied().find(|c| doc.node(*c).is_some_and(|k| matches!(k.kind, NodeKind::Text(_)))))
+    };
+    let (rows, _) = parts(doc, table);
+    Value::Array(rows.iter().map(|r| Value::Array(cells(doc, *r).into_iter().map(|c| json!(text(c))).collect())).collect())
+}
+
+fn answer(doc: &Document, table: NodeId) -> Value {
+    let (rows, _) = parts(doc, table);
+    let columns = rows.first().map_or(0, |r| cells(doc, *r).len());
+    json!({"id": table, "rows": rows.len(), "columns": columns, "cells": cell_texts(doc, table)})
+}
+
+fn table_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.table";
+    require(s, cmd)?;
+    let given: Vec<Vec<String>> = match get(p, "cells") {
+        None | Some(Value::Null) => Vec::new(),
+        Some(Value::Array(rows)) => rows
+            .iter()
+            .map(|r| match r {
+                Value::Array(c) => c.iter().map(|t| t.as_str().map(str::to_string).ok_or_else(|| bad(cmd, "`cells` holds text"))).collect(),
+                _ => Err(bad(cmd, "`cells` is a list of rows, each a list of texts")),
+            })
+            .collect::<Result<_>>()?,
+        Some(_) => return Err(bad(cmd, "`cells` is a list of rows, each a list of texts")),
+    };
+    let widest = given.iter().map(Vec::len).max().unwrap_or(0);
+    let rows = count(cmd, p, "rows", if given.is_empty() { 3 } else { given.len() }, MAX_ROWS)?;
+    let columns = count(cmd, p, "columns", if widest == 0 { 3 } else { widest }, MAX_COLUMNS)?;
+    if given.len() > rows || widest > columns {
+        return Err(bad(cmd, format!("`cells` doesn't fit in {rows} × {columns}")));
+    }
+    let texts: Vec<Vec<&str>> =
+        (0..rows).map(|r| (0..columns).map(|c| given.get(r).and_then(|row| row.get(c)).map_or("", String::as_str)).collect()).collect();
+    let (w, h) = (CELL_W * columns as f64, CELL_H * rows as f64);
+    let view = &s.ds()?.view;
+    let at = (num_or(p, "x", view.cx - w / 2.0), num_or(p, "y", view.cy - h / 2.0));
+    if !(at.0.is_finite() && at.1.is_finite()) {
+        return Err(bad(cmd, "`x` and `y` are finite numbers"));
+    }
+    let page = s.page()?;
+    let doc = s.doc_mut()?;
+    let table = make_table(doc, page, at, &texts)?;
+    let out = answer(doc, table);
+    s.set_selection(vec![table]);
+    Ok(out)
+}
+
+/// The table `id` is or is in.
+fn table_of(doc: &Document, id: NodeId) -> Option<NodeId> {
+    std::iter::once(id).chain(doc.ancestors(id)).find(|a| doc.node(*a).is_some_and(|n| n.board == Some(BoardItem::Table)))
+}
+
+fn edit_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.tableEdit";
+    require(s, cmd)?;
+    let target = id(p, "id").or_else(|| s.selection().first().copied()).ok_or_else(|| EngineError::Disabled(cmd.into(), "select a table".into()))?;
+    let doc = s.doc()?;
+    doc.get(target)?;
+    let table = table_of(doc, target).ok_or_else(|| bad(cmd, "that isn't a table"))?;
+    let action = req_string(cmd, p, "action")?;
+    let index = opt_index(cmd, p, "index")?;
+    let (rows, _) = parts(doc, table);
+    let columns = rows.first().map_or(0, |r| cells(doc, *r).len()).max(1);
+    let width = doc.get(table)?.width;
+    let doc = s.doc_mut()?;
+    // `n` things: `index` (default `last`) must be at most `end`.
+    let at = |end: usize, last: usize| match index {
+        Some(i) if i > end => Err(bad(cmd, format!("`index` is from 0 to {end}"))),
+        Some(i) => Ok(i),
+        None => Ok(last),
+    };
+    match action.as_str() {
+        "addRow" => {
+            if rows.len() >= MAX_ROWS {
+                return Err(bad(cmd, format!("a table has at most {MAX_ROWS} rows")));
+            }
+            let i = at(rows.len(), rows.len())?;
+            // Rows come before the column lines among the table's layers.
+            let child = rows.get(i).or(rows.last()).and_then(|r| doc.node(table).and_then(|t| t.children.iter().position(|c| c == r)));
+            let child = child.map(|c| if i >= rows.len() { c + 1 } else { c });
+            make_row(doc, table, child, width, &vec![""; columns])?;
+        }
+        "removeRow" => {
+            if rows.len() <= 1 {
+                return Err(bad(cmd, "a table keeps at least one row"));
+            }
+            let i = at(rows.len() - 1, rows.len() - 1)?;
+            if let Some(r) = rows.get(i) {
+                doc.remove(*r)?;
+            }
+        }
+        "addColumn" => {
+            if columns >= MAX_COLUMNS {
+                return Err(bad(cmd, format!("a table has at most {MAX_COLUMNS} columns")));
+            }
+            let i = at(columns, columns)?;
+            let cw = width / columns as f64;
+            doc.get_mut(table)?.width = width + cw;
+            for r in &rows {
+                make_cell(doc, *r, Some(i), cw, "")?;
+            }
+        }
+        "removeColumn" => {
+            if columns <= 1 {
+                return Err(bad(cmd, "a table keeps at least one column"));
+            }
+            let i = at(columns - 1, columns - 1)?;
+            doc.get_mut(table)?.width = width - width / columns as f64;
+            for r in &rows {
+                if let Some(c) = cells(doc, *r).get(i) {
+                    doc.remove(*c)?;
+                }
+            }
+        }
+        other => return Err(bad(cmd, format!("`action` is addRow, addColumn, removeRow or removeColumn, not `{other}`"))),
+    }
+    restyle(doc, table)?;
+    let out = answer(doc, table);
+    s.set_selection(vec![table]);
+    Ok(out)
+}
+
+/// A double-click on a table: type in the cell under the pointer (`leaf`). False when it hit no
+/// cell (a column line, the table's edge).
+pub(crate) fn edit_cell(s: &mut Session, doc: &Document, leaf: NodeId) -> Result<bool> {
+    let in_table = |c: &NodeId| {
+        let row = doc.node(*c).and_then(|n| n.parent);
+        row.and_then(|r| doc.node(r)).and_then(|r| r.parent).and_then(|t| doc.node(t)).is_some_and(|t| t.board == Some(BoardItem::Table))
+    };
+    let Some(cell) = std::iter::once(leaf).chain(doc.ancestors(leaf)).find(in_table) else { return Ok(false) };
+    let Some(text) = cells(doc, cell).into_iter().find(|c| doc.node(*c).is_some_and(|n| matches!(n.kind, NodeKind::Text(_)))) else {
+        return Ok(false);
+    };
+    textedit::begin(s, text, None, false)?;
+    textedit::key(s, "SelectAll", false, false, false)?;
+    Ok(true)
+}
diff --git a/crates/engine/src/boards/board_templates.rs b/crates/engine/src/boards/board_templates.rs
new file mode 100644
index 00000000..2d86ac0b
--- /dev/null
+++ b/crates/engine/src/boards/board_templates.rs
@@ -0,0 +1,261 @@
+//! Board templates: ready-made layouts (a retrospective, a brainstorm, a weekly planner, a flow
+//! chart, a kanban board) placed on a board as ordinary board objects in one undo step. They are
+//! built in code by running the board commands, so everything in them edits like anything else on
+//! the board; their wording is FigCraft's own.
+
+use std::sync::Arc;
+
+use figcraft_doc::{Document, NodeId};
+use serde_json::{Value, json};
+
+use crate::board::require;
+use crate::cmd::CommandSpec;
+use crate::params::{id_of, num, string};
+use crate::{EngineError, Result, Session, bad, spec};
+
+/// A board template.
+pub struct BoardTemplate {
+    pub id: &'static str,
+    pub name: &'static str,
+    /// One line about what is in it.
+    pub description: &'static str,
+    /// Its width and height on the board.
+    pub size: (f64, f64),
+    make: fn(&mut Builder) -> Result<()>,
+}
+
+pub static TEMPLATES: &[BoardTemplate] = &[
+    BoardTemplate {
+        id: "retrospective",
+        name: "Retrospective",
+        description: "Three sections to look back on a stretch of work: what went well, what to improve, what to do next",
+        size: (1280.0, 592.0),
+        make: retrospective,
+    },
+    BoardTemplate {
+        id: "brainstorm",
+        name: "Brainstorm",
+        description: "A question in the middle and four clusters of ideas around it",
+        size: (1344.0, 760.0),
+        make: brainstorm,
+    },
+    BoardTemplate {
+        id: "weeklyPlanner",
+        name: "Weekly planner",
+        description: "A column for each working day with a note to start from",
+        size: (1380.0, 632.0),
+        make: weekly_planner,
+    },
+    BoardTemplate {
+        id: "flowChart",
+        name: "Flow chart",
+        description: "Steps, a decision and its two outcomes joined by connectors",
+        size: (1220.0, 360.0),
+        make: flow_chart,
+    },
+    BoardTemplate {
+        id: "kanban",
+        name: "Kanban board",
+        description: "To do, Doing and Done columns with cards to move along",
+        size: (900.0, 812.0),
+        make: kanban,
+    },
+];
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        spec!(
+            "board.template",
+            "Board template",
+            "{name (a template id from board.templates), x?, y? (its top-left on the page; default centred in the view)} → {name, ids}  its sections, stickies, shapes, connectors and text, selected",
+            true,
+            template_cmd
+        ),
+        spec!("board.templates", "List board templates", "{} → [{id, name, description, width, height}]", false, |_, _| {
+            Ok(Value::Array(
+                TEMPLATES
+                    .iter()
+                    .map(|t| json!({"id": t.id, "name": t.name, "description": t.description, "width": t.size.0, "height": t.size.1}))
+                    .collect(),
+            ))
+        }),
+    ]
+}
+
+/// The template called `name` (its id, or its name in any case).
+pub fn find(name: &str) -> Option<&'static BoardTemplate> {
+    let name = name.trim();
+    TEMPLATES.iter().find(|t| t.id.eq_ignore_ascii_case(name) || t.name.eq_ignore_ascii_case(name))
+}
+
+fn template_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "board.template";
+    require(s, cmd)?;
+    let names = || TEMPLATES.iter().map(|t| t.id).collect::<Vec<_>>().join(", ");
+    let name = string(p, "name").ok_or_else(|| bad(cmd, format!("`name` is one of {}", names())))?;
+    let t = find(&name).ok_or_else(|| bad(cmd, format!("no template `{name}`: one of {}", names())))?;
+    let view = &s.ds()?.view;
+    let at = (num(p, "x").unwrap_or(view.cx - t.size.0 / 2.0), num(p, "y").unwrap_or(view.cy - t.size.1 / 2.0));
+    if !(at.0.is_finite() && at.1.is_finite()) {
+        return Err(bad(cmd, "`x` and `y` are finite numbers"));
+    }
+    let page = s.page()?;
+    let mut b = Builder { s, page, at, made: Vec::new() };
+    (t.make)(&mut b)?;
+    let made = b.made;
+    s.set_selection(made.clone());
+    Ok(json!({"name": t.id, "ids": made}))
+}
+
+/// A board with template `id` at the page's origin and nothing else (the picker's previews).
+pub fn preview(id: &str) -> Result<Document> {
+    let mut s = Session::new();
+    s.execute("file.newBoard", &json!({"name": id}))?;
+    s.execute("board.template", &json!({"name": id, "x": 0, "y": 0}))?;
+    let ds = s.docs.pop().ok_or(EngineError::NoDocument)?;
+    Ok(Arc::try_unwrap(ds.doc).unwrap_or_else(|d| (*d).clone()))
+}
+
+/// Places a template's objects: positions are from its top-left (`at` on the page), or inside the
+/// section they go in.
+struct Builder<'a> {
+    s: &'a mut Session,
+    page: NodeId,
+    at: (f64, f64),
+    /// What it placed on the page.
+    made: Vec<NodeId>,
+}
+
+impl Builder<'_> {
+    /// Run board command `cmd` (in this command's undo step); the layer it made.
+    fn run(&mut self, cmd: &str, p: Value) -> Result<NodeId> {
+        let spec = crate::cmd::find_command(cmd).ok_or_else(|| EngineError::UnknownCommand(cmd.into()))?;
+        let v = (spec.run)(self.s, &p)?;
+        v.get("id").and_then(id_of).ok_or_else(|| EngineError::Other(format!("`{cmd}` made no layer")))
+    }
+
+    /// A layer on the page at (`x`, `y`) from the template's corner.
+    fn top(&mut self, cmd: &str, x: f64, y: f64, p: Value) -> Result<NodeId> {
+        let id = self.run(cmd, placed(p, self.page, (self.at.0 + x, self.at.1 + y)))?;
+        self.made.push(id);
+        Ok(id)
+    }
+
+    fn title(&mut self, text: &str) -> Result<NodeId> {
+        self.top("node.create", 0.0, 0.0, json!({"type": "text", "text": text, "props": {"fontSize": 32, "fills": ["#1E1E1E"]}}))
+    }
+
+    fn section(&mut self, name: &str, (x, y, w, h): (f64, f64, f64, f64), fill: &str) -> Result<NodeId> {
+        self.top("node.create", x, y, json!({"type": "section", "name": name, "width": w, "height": h, "props": {"fills": [fill]}}))
+    }
+
+    /// A sticky in `section` (or on the page) at (`x`, `y`) in it.
+    fn sticky(&mut self, section: Option<NodeId>, (x, y): (f64, f64), text: &str, color: &str) -> Result<NodeId> {
+        let p = json!({"text": text, "color": color, "author": false});
+        match section {
+            Some(sec) => self.run("board.sticky", placed(p, sec, (x, y))),
+            None => self.top("board.sticky", x, y, p),
+        }
+    }
+
+    fn shape(&mut self, shape: &str, (x, y, w, h): (f64, f64, f64, f64), text: &str, color: &str) -> Result<NodeId> {
+        self.top("board.shape", x, y, json!({"shape": shape, "width": w, "height": h, "text": text, "color": color}))
+    }
+
+    fn connector(&mut self, from: NodeId, to: NodeId, extra: Value) -> Result<NodeId> {
+        let id = self.run("board.connector", with(extra, [("from", json!(from)), ("to", json!(to))]))?;
+        self.made.push(id);
+        Ok(id)
+    }
+}
+
+/// Params `p` with `entries` added (`p` an object).
+fn with<const N: usize>(mut p: Value, entries: [(&str, Value); N]) -> Value {
+    if let Some(o) = p.as_object_mut() {
+        o.extend(entries.map(|(k, v)| (k.to_string(), v)));
+    }
+    p
+}
+
+/// Params `p` placing a layer in `parent` at `at`.
+fn placed(p: Value, parent: NodeId, at: (f64, f64)) -> Value {
+    with(p, [("parent", json!(parent)), ("x", json!(at.0)), ("y", json!(at.1))])
+}
+
+fn retrospective(b: &mut Builder) -> Result<()> {
+    b.title("Retrospective")?;
+    let parts = [
+        ("Went well", "#EAF6E1", "green", ["Something that helped us", "A win worth repeating"]),
+        ("To improve", "#FCE8EF", "pink", ["Something that slowed us down", "A question we still have"]),
+        ("Next steps", "#E6F0FC", "blue", ["One change to try next", "Who looks after it?"]),
+    ];
+    for (i, (name, fill, color, notes)) in parts.into_iter().enumerate() {
+        let sec = b.section(name, (i as f64 * 440.0, 72.0, 400.0, 520.0), fill)?;
+        for (j, note) in notes.into_iter().enumerate() {
+            b.sticky(Some(sec), (100.0, 60.0 + j as f64 * 230.0), note, color)?;
+        }
+    }
+    Ok(())
+}
+
+fn brainstorm(b: &mut Builder) -> Result<()> {
+    let topic = b.shape("ellipse", (532.0, 300.0, 280.0, 160.0), "What are we trying to solve?", "violet")?;
+    let clusters = [((0.0, 0.0), "yellow", 1), ((920.0, 0.0), "orange", 0), ((0.0, 560.0), "green", 1), ((920.0, 560.0), "blue", 0)];
+    for ((x, y), color, near) in clusters {
+        let notes = [b.sticky(None, (x, y), "An idea", color)?, b.sticky(None, (x + 224.0, y), "Build on it", color)?];
+        if let Some(n) = notes.get(near) {
+            b.connector(topic, *n, json!({"style": "straight", "endCap": "none"}))?;
+        }
+    }
+    Ok(())
+}
+
+fn weekly_planner(b: &mut Builder) -> Result<()> {
+    b.title("This week")?;
+    let days = [
+        ("Monday", "Plan the week"),
+        ("Tuesday", "Focus for the day"),
+        ("Wednesday", "Focus for the day"),
+        ("Thursday", "Focus for the day"),
+        ("Friday", "Wrap up and share"),
+    ];
+    for (i, (day, note)) in days.into_iter().enumerate() {
+        let sec = b.section(day, (i as f64 * 280.0, 72.0, 260.0, 560.0), "#FFFFFF")?;
+        b.sticky(Some(sec), (30.0, 60.0), note, if i % 2 == 0 { "yellow" } else { "orange" })?;
+    }
+    Ok(())
+}
+
+fn flow_chart(b: &mut Builder) -> Result<()> {
+    let start = b.shape("ellipse", (0.0, 30.0, 160.0, 100.0), "Start", "green")?;
+    let step = b.shape("rectangle", (240.0, 20.0, 180.0, 120.0), "Do the first step", "blue")?;
+    let check = b.shape("diamond", (500.0, 0.0, 200.0, 160.0), "Did it work?", "yellow")?;
+    let carry = b.shape("roundedRectangle", (800.0, 20.0, 180.0, 120.0), "Carry on", "blue")?;
+    let done = b.shape("ellipse", (1060.0, 30.0, 160.0, 100.0), "Done", "green")?;
+    let other = b.shape("roundedRectangle", (510.0, 240.0, 180.0, 120.0), "Try another way", "orange")?;
+    let elbow = json!({"style": "elbow"});
+    b.connector(start, step, elbow.clone())?;
+    b.connector(step, check, elbow.clone())?;
+    b.connector(check, carry, json!({"style": "elbow", "label": "Yes"}))?;
+    b.connector(carry, done, elbow)?;
+    b.connector(check, other, json!({"style": "elbow", "fromSide": "bottom", "toSide": "top", "label": "No"}))?;
+    // Back round to the step: out of the side, into the step from below.
+    b.connector(other, step, json!({"style": "elbow", "fromSide": "left", "toSide": "bottom"}))?;
+    Ok(())
+}
+
+fn kanban(b: &mut Builder) -> Result<()> {
+    b.title("Team board")?;
+    let columns: [(&str, &str, &[&str]); 3] = [
+        ("To do", "yellow", &["Write the brief", "Sketch the first screens", "Plan a test session"]),
+        ("Doing", "blue", &["Review the copy"]),
+        ("Done", "green", &["Set up the board"]),
+    ];
+    for (i, (name, color, cards)) in columns.into_iter().enumerate() {
+        let sec = b.section(name, (i as f64 * 310.0, 72.0, 280.0, 740.0), "#FFFFFF")?;
+        for (j, card) in cards.iter().enumerate() {
+            b.sticky(Some(sec), (40.0, 60.0 + j as f64 * 220.0), card, color)?;
+        }
+    }
+    Ok(())
+}
diff --git a/crates/engine/src/bound_alpha_tests.rs b/crates/engine/src/bound_alpha_tests.rs
new file mode 100644
index 00000000..fb15425d
--- /dev/null
+++ b/crates/engine/src/bound_alpha_tests.rs
@@ -0,0 +1,164 @@
+//! A colour variable's alpha applies once to the paint it is bound to (#802): a `#RRGGBBAA` fill keeps
+//! its alpha in the paint opacity, and binding a variable with alpha hands the variable the whole
+//! colour, so the two alphas don't multiply (canvas, SVG, `.fig` round trips, mode switches).
+
+use figcraft_doc::NodeId;
+use serde_json::json;
+
+use crate::Session;
+
+/// 0x80 / 255 and 0x40 / 255.
+const HALF: f32 = 128.0 / 255.0;
+const QUARTER: f32 = 64.0 / 255.0;
+
+fn ex(s: &mut Session, cmd: &str, p: serde_json::Value) {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd}: {e}"));
+}
+
+/// A rectangle filled `#0D6EFD80` and a colour variable `tint` (Light `light`, Dark `dark`).
+fn setup(light: &str, dark: &str) -> (Session, NodeId) {
+    let mut s = Session::new();
+    let r = s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10, "props": {"fill": "#0D6EFD80"}})).unwrap();
+    let r = NodeId(r["id"].as_u64().unwrap());
+    ex(&mut s, "variable.createCollection", json!({"name": "Tokens", "modes": ["Light", "Dark"]}));
+    ex(&mut s, "variable.create", json!({"collection": "Tokens", "name": "tint", "type": "color", "value": light}));
+    ex(&mut s, "variable.set", json!({"variable": "tint", "mode": "Dark", "value": dark}));
+    (s, r)
+}
+
+/// The fill's effective alpha (colour alpha times paint opacity).
+fn alpha(s: &Session, r: NodeId) -> f32 {
+    s.doc().unwrap().node(r).unwrap().fills[0].solid_color().unwrap().a
+}
+
+/// The alpha byte of the rectangle rendered on its own (transparent backdrop).
+fn pixel_alpha(s: &Session, r: NodeId) -> u8 {
+    let pix = figcraft_render::render_node(s.doc().unwrap(), r, 1.0).unwrap();
+    let i = ((5 * pix.width() + 5) * 4 + 3) as usize;
+    pix.data()[i]
+}
+
+fn near(a: f32, b: f32) -> bool {
+    (a - b).abs() < 2e-3
+}
+
+#[test]
+fn a_hex_with_alpha_keeps_its_alpha_in_the_opacity() {
+    let (s, r) = setup("#0D6EFD80", "#0D6EFD40");
+    let p = &s.doc().unwrap().node(r).unwrap().fills[0];
+    assert_eq!(p.kind, figcraft_color::PaintKind::Solid { color: figcraft_color::Color::from_rgb8_const(0x0D, 0x6E, 0xFD) });
+    assert!(near(p.opacity, HALF));
+    assert_eq!(pixel_alpha(&s, r), 128);
+}
+
+#[test]
+fn a_bound_variable_alpha_applies_once() {
+    // The fill and the variable are both #0D6EFD80: the result is 50%, not 25%.
+    let (mut s, r) = setup("#0D6EFD80", "#0D6EFD40");
+    ex(&mut s, "variable.bind", json!({"ids": [r.0], "field": "fill", "variable": "tint"}));
+    assert!(near(alpha(&s, r), HALF), "{}", alpha(&s, r));
+    assert_eq!(pixel_alpha(&s, r), 128);
+    let svg = figcraft_svg::export_svg(s.doc().unwrap(), &[r], &figcraft_svg::SvgOptions::default()).unwrap();
+    assert!(svg.contains("fill=\"#0D6EFD\" fill-opacity=\"0.502\""), "{svg}");
+    // Binding the same variable again changes nothing.
+    ex(&mut s, "variable.bind", json!({"ids": [r.0], "field": "fill", "variable": "tint"}));
+    assert!(near(alpha(&s, r), HALF));
+}
+
+#[test]
+fn unbinding_keeps_the_colour_with_its_alpha_in_the_opacity() {
+    let (mut s, r) = setup("#0D6EFD40", "#0D6EFD");
+    ex(&mut s, "variable.bind", json!({"ids": [r.0], "field": "fill", "variable": "tint"}));
+    assert_eq!(pixel_alpha(&s, r), 64);
+    ex(&mut s, "variable.bind", json!({"ids": [r.0], "field": "fill", "variable": null}));
+    let p = &s.doc().unwrap().node(r).unwrap().fills[0];
+    assert_eq!(p.kind, figcraft_color::PaintKind::Solid { color: figcraft_color::Color::from_rgb8_const(0x0D, 0x6E, 0xFD) });
+    assert!(near(p.opacity, QUARTER), "{}", p.opacity);
+    assert_eq!(pixel_alpha(&s, r), 64);
+    // Undo restores the binding and its paint.
+    ex(&mut s, "edit.undo", json!({}));
+    assert!(!s.doc().unwrap().node(r).unwrap().bound.is_empty());
+    assert_eq!(pixel_alpha(&s, r), 64);
+}
+
+#[test]
+fn modes_switch_the_alpha_without_accumulating() {
+    let (mut s, r) = setup("#0D6EFD40", "#0D6EFD80");
+    ex(&mut s, "variable.bind", json!({"ids": [r.0], "field": "fill", "variable": "tint"}));
+    for (mode, want) in [("Dark", HALF), ("Light", QUARTER), ("Dark", HALF), ("Light", QUARTER)] {
+        ex(&mut s, "variable.setMode", json!({"collection": "Tokens", "mode": mode}));
+        assert!(near(alpha(&s, r), want), "{mode}: {}", alpha(&s, r));
+    }
+    // An opacity set while bound multiplies on top and survives mode switches.
+    ex(&mut s, "fill.set", json!({"ids": [r.0], "index": 0, "opacity": 0.5}));
+    ex(&mut s, "variable.setMode", json!({"collection": "Tokens", "mode": "Dark"}));
+    assert!(near(alpha(&s, r), HALF * 0.5));
+}
+
+#[test]
+fn node_set_and_style_bindings_apply_the_alpha_once() {
+    let (mut s, r) = setup("#0D6EFD80", "#0D6EFD40");
+    let var = s.doc().unwrap().variables.get("tint").unwrap().id.clone();
+    ex(&mut s, "node.set", json!({"id": r.0, "props": {"boundVariables": {"fill": var}}}));
+    assert!(near(alpha(&s, r), HALF));
+    ex(&mut s, "node.set", json!({"id": r.0, "props": {"boundVariables": {"fill": null}}}));
+    assert!(near(s.doc().unwrap().node(r).unwrap().fills[0].opacity, HALF));
+    // A paint style made from a `#RRGGBBAA` colour, bound to the variable.
+    let st = s.execute("style.create", &json!({"type": "paint", "name": "Tint", "value": "#0D6EFD80"})).unwrap()["id"].clone();
+    ex(&mut s, "style.bind", json!({"style": st, "field": "fills/0/color", "variable": "tint"}));
+    ex(&mut s, "style.apply", json!({"ids": [r.0], "style": st}));
+    assert!(near(alpha(&s, r), HALF), "{}", alpha(&s, r));
+}
+
+#[test]
+fn a_fig_round_trip_keeps_the_alpha_once() {
+    let (mut s, r) = setup("#0D6EFD80", "#0D6EFD40");
+    ex(&mut s, "variable.bind", json!({"ids": [r.0], "field": "fill", "variable": "tint"}));
+    ex(&mut s, "fill.set", json!({"ids": [r.0], "index": 0, "opacity": 0.5}));
+    let (bytes, _) = figcraft_format::fig::export(s.doc().unwrap(), None).unwrap();
+    let back = crate::cmd::file::load_fig(&bytes, "x").unwrap().unwrap().doc;
+    let n = back.nodes().find(|n| !n.bound.is_empty()).unwrap();
+    let a = n.fills[0].solid_color().unwrap().a;
+    assert!(near(a, HALF * 0.5), "{a}");
+}
+
+#[test]
+fn code_gives_a_translucent_stroke_its_alpha_once() {
+    let (mut s, r) = setup("#0D6EFD80", "#0D6EFD40");
+    ex(&mut s, "stroke.add", json!({"ids": [r.0], "color": "#FF000080"}));
+    let code = s.execute("inspect.code", &json!({"id": r.0})).unwrap()["code"].as_str().unwrap_or_default().to_string();
+    assert!(code.contains("solid rgba(255, 0, 0, 0.50)"), "{code}");
+}
+
+#[test]
+fn binding_keeps_an_opacity_set_on_the_paint() {
+    // A 15% tint whose colour comes from a variable (#923): the bind replaces the colour only.
+    let mut s = Session::new();
+    ex(&mut s, "variable.createCollection", json!({"name": "Tokens", "modes": ["Light"]}));
+    ex(&mut s, "variable.create", json!({"collection": "Tokens", "name": "red", "type": "color", "value": "#FF0000"}));
+    let props = json!({"fills": [{"type": "solid", "color": "#000000", "opacity": 0.15}]});
+    let r = s.execute("node.create", &json!({"type": "rectangle", "x": 0, "y": 0, "width": 10, "height": 10, "props": props})).unwrap();
+    let r = NodeId(r["id"].as_u64().unwrap());
+    ex(&mut s, "variable.bind", json!({"ids": [r.0], "field": "fill", "variable": "red"}));
+    let p = s.doc().unwrap().node(r).unwrap().fills[0].clone();
+    assert_eq!(p.kind, figcraft_color::PaintKind::Solid { color: figcraft_color::Color::from_rgb8_const(0xFF, 0, 0) });
+    assert!(near(p.opacity, 0.15), "{}", p.opacity);
+    ex(&mut s, "variable.bind", json!({"ids": [r.0], "field": "fill", "variable": null}));
+    assert!(near(s.doc().unwrap().node(r).unwrap().fills[0].opacity, 0.15));
+    // An opacity set on a `#RRGGBBAA` fill is the user's too, and stays.
+    let (mut s, r) = setup("#FF0000", "#FF0000");
+    ex(&mut s, "fill.set", json!({"ids": [r.0], "index": 0, "opacity": 0.25}));
+    ex(&mut s, "variable.bind", json!({"ids": [r.0], "field": "fill", "variable": "tint"}));
+    assert!(near(alpha(&s, r), 0.25), "{}", alpha(&s, r));
+}
+
+#[test]
+fn an_unbind_and_rebind_keeps_the_opacity_set_on_the_paint() {
+    // A paint at 50% bound to a half-transparent colour shows a quarter, unbound or bound again.
+    let (mut s, r) = setup("#FF000080", "#FF000080");
+    ex(&mut s, "fill.set", json!({"ids": [r.0], "index": 0, "opacity": 0.5}));
+    for variable in [json!("tint"), json!(null), json!("tint"), json!(null)] {
+        ex(&mut s, "variable.bind", json!({"ids": [r.0], "field": "fill", "variable": variable}));
+        assert!(near(alpha(&s, r), HALF / 2.0), "{variable}: {}", alpha(&s, r));
+    }
+}
diff --git a/crates/engine/src/branch_live_tests.rs b/crates/engine/src/branch_live_tests.rs
new file mode 100644
index 00000000..ae1a5c87
--- /dev/null
+++ b/crates/engine/src/branch_live_tests.rs
@@ -0,0 +1,240 @@
+//! Branches of a file in a live session: the branch stays with its author and makes ids in their
+//! own client space; merging is one synced edit (and one step of the author's undo history) that
+//! everyone receives; peers' edits on main while the branch is open merge against the branch's own
+//! base, and conflicts with them resolve as offline; update from main takes them in; a view link
+//! still refuses merging; a branch made outside the session that adds layers is refused instead
+//! of being sent for the server to refuse. Plus a fuzz test with random real commands.
+
+use figcraft_collab::sim::Rng;
+use figcraft_doc::ids::space_of;
+use figcraft_doc::{Document, NodeId};
+use serde_json::{Map, Value, json};
+
+use crate::Session;
+use crate::branch_tests::{base_with_lists, random_edit};
+use crate::collab_live_tests::{Room, frame_and_rect};
+use crate::collab_tests::base;
+use crate::live::{Access, Event, Role, VIEW_ONLY};
+use crate::live_tests::{info, push, relay, serve_as, session};
+
+fn ok(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd} {p}: {e}"))
+}
+
+fn me(s: &Session) -> u32 {
+    s.live().client().unwrap().id()
+}
+
+fn version_names(s: &mut Session) -> Vec<String> {
+    ok(s, "version.list", json!({})).as_array().unwrap().iter().map(|v| v["name"].as_str().unwrap().to_string()).collect()
+}
+
+/// The conflict keys of branch `id`'s review.
+fn conflict_keys(s: &mut Session, id: &str) -> Vec<String> {
+    let review = ok(s, "branch.review", json!({"id": id}));
+    review["conflicts"].as_array().unwrap().iter().map(|c| c["key"].as_str().unwrap().to_string()).collect()
+}
+
+#[test]
+fn a_branch_merges_into_the_session_as_one_synced_edit() {
+    let mut room = Room::new(base(), 2, 7);
+    let (f, r) = frame_and_rect(room.server.document());
+    let you = me(room.s(0));
+    let id = ok(room.s(0), "branch.create", json!({"name": "Explore"}))["id"].as_str().unwrap().to_string();
+    // On the branch tab: a recolour, a new layer and a new style.
+    ok(room.s(0), "fill.set", json!({"ids": [r], "color": "#FF0000"}));
+    let made = NodeId(ok(room.s(0), "shape.rectangle", json!({"x": 900, "y": 900, "width": 10, "height": 10}))["id"].as_u64().unwrap());
+    assert_eq!(space_of(made.0), you, "the branch makes ids in your own client space");
+    ok(room.s(0), "style.create", json!({"type": "paint", "name": "Brand", "from": r}));
+    room.settle();
+    assert!(!room.server.document().contains(made), "the branch stays with its author");
+    // Someone else edits the main file meanwhile.
+    ok(room.s(1), "node.set", json!({"id": f, "props": {"name": "Renamed by a peer"}}));
+    room.settle();
+    assert_eq!(conflict_keys(room.s(0), &id), Vec::<String>::new());
+    assert_eq!(ok(room.s(0), "branch.merge", json!({"id": id}))["merged"], true);
+    room.settle();
+    room.check();
+    let doc = room.server.document();
+    assert!(doc.contains(made), "everyone has the merge");
+    assert_eq!(doc.node(f).unwrap().name, "Renamed by a peer", "the peer's edit stays");
+    assert!(doc.styles.iter().any(|st| st.name == "Brand"));
+    assert_ne!(doc.node(r).unwrap().fills, base().node(r).unwrap().fills);
+    // The merge is one step of the author's own undo history.
+    ok(room.s(0), "edit.undo", json!({}));
+    room.settle();
+    room.check();
+    assert!(!room.server.document().contains(made));
+    assert_eq!(room.server.document().node(f).unwrap().name, "Renamed by a peer");
+}
+
+#[test]
+fn conflicts_with_peers_resolve_as_offline() {
+    let mut room = Room::new(base(), 2, 3);
+    let (f, r) = frame_and_rect(room.server.document());
+    let r2 = room.server.document().node(f).unwrap().children[1];
+    let id = ok(room.s(0), "branch.create", json!({}))["id"].as_str().unwrap().to_string();
+    ok(room.s(0), "node.set", json!({"id": r, "props": {"name": "Kept on the branch"}}));
+    ok(room.s(0), "node.set", json!({"id": r2, "props": {"opacity": 0.5}}));
+    // A peer deletes the layer the branch edited and sets the same property another way.
+    ok(room.s(1), "edit.delete", json!({"ids": [r]}));
+    ok(room.s(1), "node.set", json!({"id": r2, "props": {"opacity": 0.2}}));
+    room.settle();
+    let keys = conflict_keys(room.s(0), &id);
+    let mut want = vec![format!("{r}/layer"), format!("{r2}/opacity")];
+    want.sort();
+    let mut got = keys.clone();
+    got.sort();
+    assert_eq!(got, want);
+    assert!(room.s(0).execute("branch.merge", &json!({"id": id})).is_err(), "conflicts first");
+    // The branch's edits win the deletion, main wins the opacity.
+    let picks: Map<String, Value> = keys.iter().map(|k| (k.clone(), json!(if k.ends_with("/layer") { "branch" } else { "main" }))).collect();
+    ok(room.s(0), "branch.merge", json!({"id": id, "resolutions": picks}));
+    room.settle();
+    room.check();
+    let doc = room.server.document();
+    assert_eq!(doc.node(r).map(|n| n.name.as_str()), Some("Kept on the branch"), "the deleted layer is back, with the branch's edit");
+    assert_eq!(doc.node(r2).unwrap().opacity, 0.2);
+}
+
+#[test]
+fn update_from_main_takes_in_peers_edits_and_shows_in_the_branch_history() {
+    let mut room = Room::new(base(), 2, 5);
+    let (f, r) = frame_and_rect(room.server.document());
+    let id = ok(room.s(0), "branch.create", json!({}))["id"].as_str().unwrap().to_string();
+    ok(room.s(0), "node.set", json!({"id": r, "props": {"name": "Branch"}}));
+    ok(room.s(1), "node.set", json!({"id": f, "props": {"name": "Peer 1"}}));
+    room.settle();
+    assert_eq!(ok(room.s(0), "branch.updateFromMain", json!({}))["updated"], true);
+    assert_eq!(room.s(0).doc().unwrap().node(f).unwrap().name, "Peer 1", "the branch tab has the peer's edit");
+    assert_eq!(version_names(room.s(0)), ["Branch created", "Updated from main"]);
+    // The new base is main as it was then: a later peer edit is main's change, not a conflict.
+    ok(room.s(1), "node.set", json!({"id": f, "props": {"name": "Peer 2"}}));
+    room.settle();
+    assert_eq!(conflict_keys(room.s(0), &id), Vec::<String>::new());
+    ok(room.s(0), "branch.merge", json!({}));
+    room.settle();
+    room.check();
+    let doc = room.server.document();
+    assert_eq!((doc.node(f).unwrap().name.as_str(), doc.node(r).unwrap().name.as_str()), ("Peer 2", "Branch"));
+}
+
+#[test]
+fn a_view_link_still_refuses_merging() {
+    let (mut s, script) = session();
+    s.execute("collab.join", &json!({"link": "figcraft://join?host=a:1&file=f&token=t"})).unwrap();
+    let mut doc = Document::new("Shared");
+    let page = doc.first_page().unwrap();
+    let card = doc.create(page, figcraft_doc::NodeKind::Rectangle, "Card", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let (_server, id, welcome) = serve_as(&doc, Access::View);
+    let mut you = info(Role::Guest, id);
+    you.access = Access::View;
+    push(&script, vec![Event::Welcome { info: you, peers: vec![] }, welcome]);
+    s.live_poll();
+    assert_eq!(s.active_read_only(), Some(VIEW_ONLY));
+    // The branch is yours to edit; merging it would edit the file you may only view.
+    ok(&mut s, "branch.create", json!({}));
+    ok(&mut s, "node.set", json!({"id": card, "props": {"name": "Mine"}}));
+    ok(&mut s, "branch.updateFromMain", json!({}));
+    match s.execute("branch.merge", &json!({})) {
+        Err(crate::EngineError::Disabled(_, why)) => assert_eq!(why, VIEW_ONLY),
+        other => panic!("expected a refusal, got {other:?}"),
+    }
+    assert!(script.lock().unwrap().msgs.is_empty(), "nothing was sent");
+}
+
+#[test]
+fn a_branch_made_outside_the_session_merges_edits_but_not_new_layers() {
+    let (mut s, script) = session();
+    let r = NodeId(ok(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 50, "height": 50}))["id"].as_u64().unwrap());
+    let edits = ok(&mut s, "branch.create", json!({"name": "Edits"}))["id"].as_str().unwrap().to_string();
+    ok(&mut s, "node.set", json!({"id": r, "props": {"name": "Edited before the session"}}));
+    ok(&mut s, "doc.switch", json!({"index": 0}));
+    let adds = ok(&mut s, "branch.create", json!({"name": "Adds"}))["id"].as_str().unwrap().to_string();
+    ok(&mut s, "shape.ellipse", json!({"x": 90, "y": 0, "width": 20, "height": 20}));
+    ok(&mut s, "doc.switch", json!({"index": 0}));
+    s.execute("collab.host", &json!({})).unwrap();
+    let (mut server, id, welcome) = serve_as(s.doc().unwrap(), Access::Edit);
+    push(&script, vec![welcome]);
+    s.live_poll();
+    assert!(s.live().syncing());
+    // Its new layer is in another id space: refused here rather than by the server.
+    match s.execute("branch.merge", &json!({"id": adds})) {
+        Err(crate::EngineError::Disabled(_, why)) => assert!(why.contains("outside this live session"), "{why}"),
+        other => panic!("expected a refusal, got {other:?}"),
+    }
+    assert_eq!(s.doc().unwrap().node_count(), server.document().node_count(), "nothing merged");
+    // Edits of layers everyone has go through.
+    ok(&mut s, "branch.merge", json!({"id": edits}));
+    let answers = relay(&script, &mut server, id);
+    push(&script, answers);
+    s.live_poll();
+    assert_eq!(server.document().node(r).unwrap().name, "Edited before the session");
+    assert!(*s.doc().unwrap() == *server.document());
+}
+
+/// The live fuzz test: three people edit with random real commands (export settings and guides
+/// included) while one of them works on a branch; every conflict resolved for a random side, the
+/// merge goes through the server as it is and everyone converges on it.
+#[test]
+fn random_edits_on_a_branch_merge_into_a_live_session() {
+    let (mut created, mut conflicted) = (0, 0);
+    for seed in 0..8 {
+        let mut room = Room::new(base_with_lists(), 3, seed);
+        let mut rng = Rng::new(seed + 50);
+        let id = ok(room.s(0), "branch.create", json!({}))["id"].as_str().unwrap().to_string();
+        for _ in 0..30 {
+            let i = rng.below(3);
+            let (cmd, params) = random_edit(room.s(i).doc().unwrap(), &mut rng, true);
+            let _ = room.s(i).execute(cmd, &params);
+            if rng.chance(0.3) {
+                room.settle();
+            }
+        }
+        room.settle();
+        let keys = conflict_keys(room.s(0), &id);
+        conflicted += usize::from(!keys.is_empty());
+        let picks: Map<String, Value> = keys.into_iter().map(|k| (k, json!(if rng.chance(0.5) { "branch" } else { "main" }))).collect();
+        let before = room.server.document().clone();
+        ok(room.s(0), "branch.merge", json!({"id": id, "resolutions": picks}));
+        let merged = room.s(0).doc().unwrap().clone();
+        assert!(merged.validate().is_empty(), "seed {seed}: {:?}", merged.validate());
+        created += usize::from(merged.ids().any(|n| !before.contains(n)));
+        room.settle();
+        room.check();
+        assert!(*room.server.document() == merged, "seed {seed}: the server took the merge as it is");
+    }
+    assert!(created >= 3 && conflicted >= 2, "{created} merges added layers, {conflicted} had conflicts");
+}
+
+/// No branch command panics on junk parameters in a live session, from the main file's tab or
+/// the branch's, and the session stays in sync.
+#[test]
+fn branch_commands_survive_junk_params_in_a_live_session() {
+    let junk = [
+        json!({}),
+        json!(null),
+        json!([1, 2]),
+        json!({"id": 5, "name": 1e308, "resolutions": [1]}),
+        json!({"id": "nope", "resolutions": {"1/layer": "both", "doc/name": 7}}),
+        json!({"name": "\u{0}".repeat(500), "resolutions": {"x": "branch"}}),
+    ];
+    let mut room = Room::new(base(), 2, 11);
+    ok(room.s(0), "branch.create", json!({}));
+    let ids: Vec<&str> = crate::branches::specs().iter().map(|s| s.id).collect();
+    for tab in [0, 1] {
+        for id in &ids {
+            for j in &junk {
+                let s = room.s(0);
+                if s.docs.len() > tab {
+                    let _ = s.execute("doc.switch", &json!({"index": tab}));
+                }
+                if let Err(crate::EngineError::Internal { cmd, msg }) = s.execute(id, j) {
+                    panic!("{cmd} panicked on {j}: {msg}");
+                }
+                room.settle();
+            }
+        }
+    }
+    room.check();
+}
diff --git a/crates/engine/src/branch_tests.rs b/crates/engine/src/branch_tests.rs
index 1c2cc769..f0e8a72e 100644
--- a/crates/engine/src/branch_tests.rs
+++ b/crates/engine/src/branch_tests.rs
@@ -1,9 +1,9 @@
 //! Branches through commands: create, edit on both sides, review, resolve, merge as one undo step,
 //! update from main, archive, saving with the file, and a fuzz test over random real commands.
 
-use figcraft_collab::merge::{Side, plan};
+use figcraft_collab::merge::{Key, Side, plan};
 use figcraft_collab::sim::Rng;
-use figcraft_collab::{Change, DocProp, Mode, Replica, Target};
+use figcraft_collab::{Change, DocProp, Mode, Prop, Replica, Target};
 use figcraft_doc::{Document, NodeId, NodeKind};
 use serde_json::{Value, json};
 
@@ -215,26 +215,68 @@ fn shows(changes: &[Change], doc: &Document) -> Result<(), String> {
     Ok(())
 }
 
-/// The fuzz test: random real commands on a branch and on main. Without conflicts the merge (both
-/// ways) equals applying both change sets and shows every change of either side; with conflicts,
-/// resolving them all for either side gives a valid document.
+/// [`base`] with two export settings and two guides on its first frame (lists that merge item by
+/// item).
+pub(crate) fn base_with_lists() -> Document {
+    let mut doc = base();
+    let f = doc.node(doc.first_page().unwrap()).unwrap().children[0];
+    let n = doc.get_mut(f).unwrap();
+    n.exports = ["@1", "@2"].map(|suffix| figcraft_doc::ExportSetting { suffix: suffix.into(), ..Default::default() }).to_vec();
+    n.guides = vec![figcraft_doc::Guide { vertical: true, offset: 10.0 }, figcraft_doc::Guide { vertical: false, offset: 20.0 }];
+    doc
+}
+
+/// A random real command: often an edit of a frame's export settings or guides, else
+/// [`random_command`].
+pub(crate) fn random_edit(doc: &Document, rng: &mut Rng, with_undo: bool) -> (&'static str, Value) {
+    if rng.chance(0.6) {
+        return random_command(doc, rng, with_undo);
+    }
+    let frames: Vec<NodeId> = doc.nodes().filter(|n| matches!(n.kind, NodeKind::Frame)).map(|n| n.id).collect();
+    let f = rng.pick(&frames).map_or(json!(0), |i| json!(i));
+    let i = rng.below(3);
+    match rng.below(6) {
+        0 => ("export.add", json!({"ids": [f]})),
+        1 => ("export.update", json!({"ids": [f], "index": i, "suffix": format!("@{}", rng.below(9))})),
+        2 => ("export.remove", json!({"ids": [f], "index": i})),
+        3 => ("guide.add", json!({"frame": f, "vertical": rng.chance(0.5), "offset": rng.below(300)})),
+        4 => ("guide.move", json!({"frame": f, "index": i, "offset": rng.below(300)})),
+        _ => ("guide.remove", json!({"frame": f, "index": i})),
+    }
+}
+
+/// The fuzz test: random real commands on a branch and on main (export settings and guides
+/// included). Without conflicts the merge (both ways) equals applying both change sets and shows
+/// every change of either side; with conflicts, resolving them all for either side gives a valid
+/// document.
 #[test]
 fn random_edits_on_both_sides_merge() {
-    let (mut disjoint, mut conflicted) = (0, 0);
+    let (mut disjoint, mut conflicted, mut lists) = (0, 0, 0);
     for seed in 0..60 {
         let mut rng = Rng::new(seed);
-        let start = base();
+        let start = base_with_lists();
         let mut on_branch = start.clone();
         on_branch.set_client_id(start.highest_id_space() + 1);
         let mut sides = [Session::with_document(on_branch), Session::with_document(start.clone())];
         for s in &mut sides {
             for _ in 0..1 + rng.below(5) {
-                let (cmd, params) = random_command(s.doc().unwrap(), &mut rng, false);
+                let (cmd, params) = random_edit(s.doc().unwrap(), &mut rng, false);
                 let _ = s.execute(cmd, &params);
             }
         }
         let [b, m] = sides.map(|s| s.doc().unwrap().clone());
         let p = plan(&start, &b, &m).unwrap();
+        // Export settings or guides of a layer changed on both sides that merged item by item.
+        let list_writes = |changes: &[Change]| -> std::collections::BTreeSet<Key> {
+            changes
+                .iter()
+                .filter_map(|c| match c {
+                    Change::Set { id, prop: prop @ (Prop::Exports | Prop::Guides), .. } => Some(Key::Node(*id, *prop)),
+                    _ => None,
+                })
+                .collect()
+        };
+        lists += list_writes(&p.branch).intersection(&list_writes(&p.main)).filter(|k| !p.conflicts.iter().any(|c| c.key == **k)).count();
         if p.conflicts.is_empty() {
             disjoint += 1;
             let none = |_: &figcraft_collab::merge::Key| None;
@@ -260,5 +302,5 @@ fn random_edits_on_both_sides_merge() {
             }
         }
     }
-    assert!(disjoint >= 10 && conflicted >= 5, "{disjoint} disjoint, {conflicted} with conflicts");
+    assert!(disjoint >= 10 && conflicted >= 5 && lists >= 3, "{disjoint} disjoint, {conflicted} with conflicts, {lists} lists merged item by item");
 }
diff --git a/crates/engine/src/branch_versions_tests.rs b/crates/engine/src/branch_versions_tests.rs
index 30bdf736..30f5134e 100644
--- a/crates/engine/src/branch_versions_tests.rs
+++ b/crates/engine/src/branch_versions_tests.rs
@@ -35,12 +35,12 @@ fn branched() -> (Session, String, NodeId) {
 fn versions_saved_on_a_branch_are_the_branchs_own() {
     let (mut s, _, r) = branched();
     let original = layer_name(&s, r);
-    // A new branch's history starts empty: the main file's versions stay with it.
-    assert!(names(&mut s).is_empty());
+    // A new branch's history starts with its creation: the main file's versions stay with it.
+    assert_eq!(names(&mut s), ["Branch created"]);
     ok(&mut s, "node.set", json!({"id": r, "props": {"name": "Before"}}));
     let v = ok(&mut s, "file.saveVersion", json!({"name": "Branch v1"}))["id"].clone();
     ok(&mut s, "node.set", json!({"id": r, "props": {"name": "After"}}));
-    assert_eq!(names(&mut s), ["Branch v1"]);
+    assert_eq!(names(&mut s), ["Branch created", "Branch v1"]);
     // Viewing a branch version shows it read-only; going back shows the branch as it is.
     ok(&mut s, "version.preview", json!({"id": v}));
     assert_eq!(layer_name(&s, r), "Before");
@@ -77,13 +77,13 @@ fn branch_versions_save_with_the_file_and_survive_merging() {
     ok(&mut t, "file.open", json!({"path": path}));
     assert_eq!(names(&mut t), ["Main v1"]);
     ok(&mut t, "branch.open", json!({"id": id}));
-    assert_eq!(names(&mut t), ["Branch v1", "Autosave"]);
+    assert_eq!(names(&mut t), ["Branch created", "Branch v1", "Autosave"]);
     // Merging adds a version to the main file's history; the branch keeps its own.
     ok(&mut t, "branch.merge", json!({}));
     assert_eq!(names(&mut t), ["Main v1", "Autosave", "Merged “Explore”"]);
     assert_eq!(layer_name(&t, r), "On the branch, later");
     ok(&mut t, "branch.open", json!({"id": id}));
-    assert_eq!(names(&mut t), ["Branch v1", "Autosave"]);
+    assert_eq!(names(&mut t), ["Branch created", "Branch v1", "Autosave"]);
     std::fs::remove_dir_all(&dir).ok();
 }
 
@@ -94,7 +94,7 @@ fn archiving_keeps_the_branch_history() {
     ok(&mut s, "branch.archive", json!({}));
     assert_eq!(names(&mut s), ["Main v1"]);
     ok(&mut s, "branch.open", json!({"id": id}));
-    assert_eq!(names(&mut s), ["Branch v1"]);
+    assert_eq!(names(&mut s), ["Branch created", "Branch v1"]);
 }
 
 #[test]
diff --git a/crates/engine/src/canvas.rs b/crates/engine/src/canvas.rs
new file mode 100644
index 00000000..b513ffbd
--- /dev/null
+++ b/crates/engine/src/canvas.rs
@@ -0,0 +1,14 @@
+pub mod al_keys;
+pub mod arc_handles;
+pub mod booleans;
+pub mod distance;
+pub mod drop;
+pub mod guides;
+pub mod rotation_origin;
+pub mod shape_handles;
+pub mod shapebuilder;
+pub mod snap;
+pub mod textedit;
+pub mod textpreview;
+pub mod tools;
+pub mod vectoredit;
diff --git a/crates/engine/src/al_keys.rs b/crates/engine/src/canvas/al_keys.rs
similarity index 100%
rename from crates/engine/src/al_keys.rs
rename to crates/engine/src/canvas/al_keys.rs
diff --git a/crates/engine/src/arc_handles.rs b/crates/engine/src/canvas/arc_handles.rs
similarity index 100%
rename from crates/engine/src/arc_handles.rs
rename to crates/engine/src/canvas/arc_handles.rs
diff --git a/crates/engine/src/booleans.rs b/crates/engine/src/canvas/booleans.rs
similarity index 98%
rename from crates/engine/src/booleans.rs
rename to crates/engine/src/canvas/booleans.rs
index 87d90153..c3de51cb 100644
--- a/crates/engine/src/booleans.rs
+++ b/crates/engine/src/canvas/booleans.rs
@@ -124,7 +124,7 @@ pub(crate) fn apply(s: &mut Session, cmd: &str, p: &Value, op: BoolOp) -> Result
         }
         return Ok(json!({"ids": ids, "operation": op}));
     }
-    let out = crate::cmd::structure::wrap_boolean(s, p, op)?;
+    let out = crate::cmd::structure::wrap_boolean(s, p, cmd, op)?;
     // Operands of a new group follow its operation.
     if let Some(g) = crate::params::id_of(&out["id"]) {
         let doc = s.doc_mut()?;
diff --git a/crates/engine/src/distance.rs b/crates/engine/src/canvas/distance.rs
similarity index 99%
rename from crates/engine/src/distance.rs
rename to crates/engine/src/canvas/distance.rs
index c86aeaf0..62679e38 100644
--- a/crates/engine/src/distance.rs
+++ b/crates/engine/src/canvas/distance.rs
@@ -34,7 +34,7 @@ pub fn label(d: f64) -> String {
 }
 
 /// A labelled distance line, unless it has no length.
-fn measured(out: &mut Vec<Guide>, a: Point, b: Point) {
+pub(crate) fn measured(out: &mut Vec<Guide>, a: Point, b: Point) {
     let d = (b - a).hypot();
     if d > EPS && d.is_finite() {
         out.push(Guide { label: Some(label(d)), ..Guide::new(a, b) });
diff --git a/crates/engine/src/drop.rs b/crates/engine/src/canvas/drop.rs
similarity index 100%
rename from crates/engine/src/drop.rs
rename to crates/engine/src/canvas/drop.rs
diff --git a/crates/engine/src/guides.rs b/crates/engine/src/canvas/guides.rs
similarity index 100%
rename from crates/engine/src/guides.rs
rename to crates/engine/src/canvas/guides.rs
diff --git a/crates/engine/src/rotation_origin.rs b/crates/engine/src/canvas/rotation_origin.rs
similarity index 100%
rename from crates/engine/src/rotation_origin.rs
rename to crates/engine/src/canvas/rotation_origin.rs
diff --git a/crates/engine/src/shape_handles.rs b/crates/engine/src/canvas/shape_handles.rs
similarity index 100%
rename from crates/engine/src/shape_handles.rs
rename to crates/engine/src/canvas/shape_handles.rs
diff --git a/crates/engine/src/shapebuilder.rs b/crates/engine/src/canvas/shapebuilder.rs
similarity index 100%
rename from crates/engine/src/shapebuilder.rs
rename to crates/engine/src/canvas/shapebuilder.rs
diff --git a/crates/engine/src/snap.rs b/crates/engine/src/canvas/snap.rs
similarity index 100%
rename from crates/engine/src/snap.rs
rename to crates/engine/src/canvas/snap.rs
diff --git a/crates/engine/src/canvas/textedit.rs b/crates/engine/src/canvas/textedit.rs
new file mode 100644
index 00000000..91e411e5
--- /dev/null
+++ b/crates/engine/src/canvas/textedit.rs
@@ -0,0 +1,799 @@
+//! On-canvas text editing: caret, selection, typing. A whole editing session is one undo step.
+
+use std::sync::{LazyLock, Mutex};
+
+use figcraft_doc::{Document, ListStyle, NodeId, NodeKind, TextData};
+
+use crate::{EngineError, Preedit, Result, Session, TextEdit};
+
+/// Most committed UTF-8 bytes an outgoing IME snapshot may describe.
+///
+/// This mirrors the fork's `egui::output::MAX_IME_SURROUNDING_TEXT_BYTES`; the engine keeps its
+/// own constant so this layer has no egui dependency. The query below returns only this bounded
+/// window around the selection, never a copy of the whole document.
+pub const MAX_IME_SURROUNDING_BYTES: usize = 4000;
+
+/// Stable identity of the on-canvas text edit an IME context belongs to.
+///
+/// `document` and `node` do not change through ordinary text or caret edits. `editing_session`
+/// changes when [`begin`] starts a new session for an equal `(document, node)` pair (leaving and
+/// re-entering the same layer), so a replaced target never inherits an old composition.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ImeEditOwner {
+    /// The document tab's uid.
+    pub document: u64,
+    /// The edited text node.
+    pub node: NodeId,
+    /// [`TextEdit::editing_session`] of the current edit.
+    pub editing_session: u64,
+}
+
+/// Why the committed text around the IME caret cannot be described.
+///
+/// These are the only reasons this custom editor reports
+/// `egui::output::IMESurroundingText::Unavailable`; an empty text layer is available with empty
+/// text and a collapsed selection.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum ImeSurroundingUnavailable {
+    /// No text layer is being edited.
+    NotEditing,
+    /// The editing target is not a text node any more.
+    NotText,
+    /// The selection alone is wider than [`MAX_IME_SURROUNDING_BYTES`], so no bounded snapshot
+    /// can contain both selection ends.
+    SelectionTooWide,
+    /// Defensive: the computed window was not a character-boundary slice. The rounding above
+    /// makes this unreachable for a well-formed text model.
+    InvalidWindow,
+}
+
+/// One bounded, committed logical-text observation for the outgoing IME snapshot.
+///
+/// `text` is never display/bidi order and never contains the pre-edit (which is UI-only in this
+/// editor). `cursor` and `anchor` are UTF-8 byte offsets into `text`; `anchor > cursor` is a
+/// valid reversed selection.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct ImeSurrounding {
+    /// Identity of the edit this observation belongs to.
+    pub owner: ImeEditOwner,
+    /// At most [`MAX_IME_SURROUNDING_BYTES`] bytes of committed text around the selection.
+    pub text: String,
+    /// UTF-8 byte offset of the primary caret in [`Self::text`].
+    pub cursor: usize,
+    /// UTF-8 byte offset of the selection anchor in [`Self::text`].
+    pub anchor: usize,
+}
+
+/// Every editing session gets its own token; zero is valid and never reused deliberately.
+///
+/// A mutex (rather than an atomic) also works on wasm32 targets without 64-bit atomics.
+static EDITING_SESSION: LazyLock<Mutex<u64>> = LazyLock::new(|| Mutex::new(0));
+
+/// Return the next editing-session token from a mutex-protected counter (`wrapping_add`).
+/// Zero is a valid token; the mutex also works on wasm32 without 64-bit atomics.
+fn next_editing_session() -> u64 {
+    let mut session = match EDITING_SESSION.lock() {
+        Ok(session) => session,
+        Err(poisoned) => poisoned.into_inner(),
+    };
+    *session = session.wrapping_add(1);
+    *session
+}
+
+fn text_of(s: &Session, id: NodeId) -> Result<TextData> {
+    match &s.doc()?.get(id)?.kind {
+        NodeKind::Text(t) => Ok(t.clone()),
+        _ => Err(EngineError::Other(format!("{id} is not a text layer"))),
+    }
+}
+
+/// Start editing text node `id` with the caret at `caret` (None = select all).
+pub fn begin(s: &mut Session, id: NodeId, caret: Option<usize>, created: bool) -> Result<()> {
+    let t = text_of(s, id)?;
+    let n = t.char_count();
+    s.begin_interaction("Edit text")?;
+    let ds = s.ds_mut()?;
+    // Editing the same layer again (a double-click into a text just made) keeps it new.
+    let created = created || ds.text_edit.as_ref().is_some_and(|te| te.id == id && te.created);
+    let (caret, anchor) = match caret {
+        Some(c) => (c.min(n), c.min(n)),
+        None => (n, 0),
+    };
+    ds.text_edit = Some(TextEdit { id, caret, anchor, created, editing_session: next_editing_session(), preedit: None });
+    ds.selection = vec![id];
+    ds.revision += 1;
+    s.live_text_notice(id);
+    Ok(())
+}
+
+/// Finish editing: an empty new text layer is removed; the session becomes one undo step.
+pub fn end(s: &mut Session) -> Result<()> {
+    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(()) };
+    s.ds_mut()?.text_edit = None;
+    // A widget's editable field: the typing is put back and the new value goes to the widget's
+    // plugin through `widget.setText`, one undo step (or none when nothing changed).
+    if let Some((w, field)) = s.doc().ok().and_then(|d| crate::widgets::field_of(d, te.id)) {
+        let value = text_of(s, te.id).map(|t| t.characters).unwrap_or_default();
+        s.cancel_interaction()?;
+        let ds = s.ds_mut()?;
+        ds.selection = vec![w];
+        ds.revision += 1;
+        if text_of(s, te.id).is_ok_and(|t| t.characters != value)
+            && let Err(e) = s.execute("widget.setText", &serde_json::json!({"id": w, "field": field, "value": value}))
+        {
+            s.message = Some(e.to_string());
+        }
+        return Ok(());
+    }
+    // A board object's text (a sticky's note) stays when emptied; the object is selected again.
+    let owner = s.doc().ok().and_then(|d| crate::board::owner_of_text(d, te.id));
+    let empty = owner.is_none() && text_of(s, te.id).map(|t| t.characters.trim().is_empty()).unwrap_or(false);
+    if empty {
+        let doc = s.doc_mut()?;
+        let _ = doc.remove(te.id);
+        s.ds_mut()?.selection.clear();
+    }
+    if empty && te.created {
+        // Nothing to undo for a text box that was never filled. The gesture snapshot was taken
+        // after the layer was added, so it still holds it: re-base it on the document without the
+        // layer, and committing then records no step (and leaves the redo stack alone).
+        // A snapshot taken before the layer was added (the Text on a path tool, which also took
+        // the path layer away) is put back whole instead.
+        let ds = s.ds_mut()?;
+        let doc = ds.doc.clone();
+        if ds.interaction.as_ref().is_some_and(|it| it.doc.node(te.id).is_none()) {
+            s.cancel_interaction()?;
+        } else if let Some(it) = ds.interaction.as_mut() {
+            it.doc = doc;
+        }
+    }
+    s.commit_interaction()?;
+    let ds = s.ds_mut()?;
+    if let Some(o) = owner {
+        ds.selection = vec![o];
+    }
+    ds.revision += 1;
+    Ok(())
+}
+
+fn range(te: &TextEdit) -> (usize, usize) {
+    (te.caret.min(te.anchor), te.caret.max(te.anchor))
+}
+
+/// Apply an unconditional text-model mutation through `edit_if`, whose success clears the
+/// composition, clamps caret and anchor to the character count, marks a `characters` override
+/// when the node is source-backed, normalizes the document and bumps the revision.
+fn edit(s: &mut Session, f: impl FnOnce(&mut TextData, &mut TextEdit)) -> Result<()> {
+    edit_if(s, |t, te| {
+        f(t, te);
+        true
+    })
+    .map(|_| ())
+}
+
+/// [`edit`] for a mutation that can still turn out to be a no-op.
+///
+/// The closure returns whether it changed the model; return `false` only before mutating (the
+/// text is handed over directly). A no-op leaves the composition (`preedit`), the revision and the
+/// document untouched, so an IME deletion that finds nothing to delete does not cancel an
+/// in-progress composition.
+fn edit_if(s: &mut Session, f: impl FnOnce(&mut TextData, &mut TextEdit) -> bool) -> Result<bool> {
+    let ds = s.ds_mut()?;
+    let Some(mut te) = ds.text_edit.clone() else { return Err(EngineError::Other("not editing text".into())) };
+    let before = ds.doc.clone();
+    let doc = ds.doc_mut();
+    let n = doc.get_mut(te.id)?;
+    let NodeKind::Text(t) = &mut n.kind else { return Err(EngineError::Other("not a text layer".into())) };
+    if !f(t, &mut te) {
+        return Ok(false);
+    }
+    // Any edit ends a composition (a commit replaces it with the final text).
+    te.preedit = None;
+    let len = t.char_count();
+    te.caret = te.caret.min(len);
+    te.anchor = te.anchor.min(len);
+    if n.source.is_some() {
+        n.overrides.insert("characters".into());
+    }
+    crate::normalize(doc, &before);
+    ds.text_edit = Some(te);
+    ds.revision += 1;
+    Ok(true)
+}
+
+/// What an accepted IME `Commit` did to the committed model.
+///
+/// An IME receipt may label the snapshot `InputMethod` only for [`Self::Plain`]. AutoFormat
+/// (typing "- " at a line start turns the paragraph into a list) is an application
+/// transformation in the same command, so the frame's change must be reported as `Other`.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum ImeInsertion {
+    /// Nothing was inserted (an empty, control-only, or bare-newline commit).
+    Nothing,
+    /// The committed text replaced the selection exactly.
+    Plain,
+    /// The editor transformed the commit before applying it: paragraph AutoFormat, or line-ending
+    /// normalisation/control-character removal. The frame's change is application-origin.
+    Transformed,
+}
+
+/// Type (or paste) `text` replacing the selection. Line endings are normalised and other control
+/// characters dropped, so pasted plain text from any platform lands cleanly.
+pub fn insert(s: &mut Session, text: &str) -> Result<()> {
+    insert_model(s, text, false).map(|_| ())
+}
+
+/// End the composition without changing the document, for an empty IME commit.
+///
+/// Returns without touching the session when no composition is active (or nothing is being
+/// edited): an empty commit is otherwise a no-op, never an error.
+fn clear_composition(s: &mut Session) -> Result<()> {
+    let composing = s.ds().ok().and_then(|d| d.text_edit.as_ref()).is_some_and(|te| te.preedit.is_some());
+    if !composing {
+        return Ok(());
+    }
+    let ds = s.ds_mut()?;
+    if let Some(te) = ds.text_edit.as_mut() {
+        te.preedit = None;
+    }
+    ds.revision += 1;
+    Ok(())
+}
+
+/// Apply an IME `Commit`, reporting whether it was a plain insertion.
+///
+/// The UI calls this instead of [`insert`] so only a commit that the editor applied as a plain
+/// insertion can earn an `InputMethod` receipt. AutoFormat, line-ending normalisation and
+/// control-character removal are application transformations and are reported as
+/// [`ImeInsertion::Transformed`]. Like stock `TextEdit`, a bare `"\n"`/`"\r"` commit is ignored.
+pub fn insert_ime_commit(s: &mut Session, text: &str) -> Result<ImeInsertion> {
+    insert_model(s, text, true)
+}
+
+/// Insert committed text, optionally as an IME commit: normalize line endings, drop control
+/// characters except `\n`/`\t`, ignore a bare newline/CR IME commit, clear an active
+/// composition for an empty or control-only IME commit, and turn a committed space after a
+/// line-start `-`, `*` or `1.` into a bulleted/numbered list. Reports whether the insertion was
+/// plain, transformed, or a no-op.
+fn insert_model(s: &mut Session, text: &str, ime_commit: bool) -> Result<ImeInsertion> {
+    // Stock `TextEdit` deliberately ignores these two commits (they are not a mutation); only a
+    // real commit may do so, since typing Enter goes through `insert`.
+    if ime_commit && matches!(text, "\n" | "\r") {
+        return Ok(ImeInsertion::Nothing);
+    }
+    let normalized: String =
+        crate::cmd::props::normalize_line_endings(text).chars().filter(|c| !c.is_control() || matches!(c, '\n' | '\t')).collect();
+    if normalized.is_empty() {
+        // An empty commit is how some integrations (Safari's egui web integration when the last
+        // composition character is deleted) end the composition. It inserts nothing, but it must
+        // still clear the pre-edit; stock `TextEdit` does the same in its non-ignored `Commit` arm.
+        if ime_commit {
+            clear_composition(s)?;
+        }
+        return Ok(ImeInsertion::Nothing);
+    }
+    // A commit the editor had to transform is an application edit, not a plain insertion.
+    let mut outcome = if normalized == text { ImeInsertion::Plain } else { ImeInsertion::Transformed };
+    let text = normalized;
+    edit(s, |t, te| {
+        let (a, b) = range(te);
+        // "- ", "* " or "1. " typed at the start of a plain paragraph starts a list.
+        if text == " " && a == b && t.para_list(t.para_of(a)).list == ListStyle::None {
+            let chars: Vec<char> = t.characters.chars().collect();
+            let start = line_start(&chars, a);
+            let typed: String = chars.get(start..a).unwrap_or(&[]).iter().collect();
+            let list = match typed.as_str() {
+                "-" | "*" => ListStyle::Bulleted,
+                "1." => ListStyle::Numbered,
+                _ => ListStyle::None,
+            };
+            if list != ListStyle::None {
+                t.replace_range(start, a, "");
+                t.set_para_lists(start, start, |pl| pl.list = list);
+                (te.caret, te.anchor) = (start, start);
+                outcome = ImeInsertion::Transformed;
+                return;
+            }
+        }
+        t.replace_range(a, b, &text);
+        te.caret = a + text.chars().count();
+        te.anchor = te.caret;
+    })?;
+    Ok(outcome)
+}
+
+/// List keys: Tab nests the selected list items a level deeper; Shift+Tab, Backspace at an item's
+/// start and Enter on an empty item move it a level out (at the top: out of the list). Returns
+/// whether the key was taken.
+fn list_key(s: &mut Session, key: &str, shift: bool) -> Result<bool> {
+    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(false) };
+    let t = text_of(s, te.id)?;
+    let (a, b) = range(&te);
+    let chars: Vec<char> = t.characters.chars().collect();
+    let at_start = a == b && line_start(&chars, a) == a;
+    let item = t.para_list(t.para_of(a)).list != ListStyle::None;
+    let (pa, pb) = t.para_span(a, b);
+    let any_item = (pa..=pb).any(|p| t.para_list(p).list != ListStyle::None);
+    let deeper = match key {
+        "Tab" if any_item => !shift,
+        "Backspace" if item && at_start => false,
+        "Enter" if item && at_start && chars.get(a).is_none_or(|c| *c == '\n') => false,
+        _ => return Ok(false),
+    };
+    edit(s, |t, _| {
+        t.set_para_lists(a, b, |pl| match pl.list {
+            ListStyle::None => {}
+            _ if deeper => pl.indent = pl.indent.saturating_add(1),
+            _ if pl.indent > 0 => pl.indent -= 1,
+            _ => pl.list = ListStyle::None,
+        })
+    })?;
+    Ok(true)
+}
+
+/// Cmd/Ctrl+] and Cmd/Ctrl+[ while editing: the selected list items a level deeper or out, like
+/// Tab and Shift+Tab. Returns whether anything changed (text that isn't a list and items already
+/// at the deepest level stay as they are).
+pub fn list_indent(s: &mut Session, out: bool) -> Result<bool> {
+    let Some(id) = s.ds()?.text_edit.as_ref().map(|te| te.id) else { return Ok(false) };
+    let before = text_of(s, id)?;
+    if !list_key(s, "Tab", out)? {
+        return Ok(false);
+    }
+    Ok(text_of(s, id)? != before)
+}
+
+/// The kind of word char `i` belongs to: 0 for spaces and punctuation, else its script, so a word
+/// ends where the script changes (Han, hiragana, katakana and Hangul runs are words of their own in
+/// text without spaces). Combining marks and voicing marks belong to the char before them.
+fn word_class(chars: &[char], mut i: usize) -> u8 {
+    while i > 0
+        && chars.get(i).is_some_and(
+            |c| matches!(*c as u32, 0x0300..=0x036F | 0x1AB0..=0x1AFF | 0x1DC0..=0x1DFF | 0x20D0..=0x20FF | 0x3099..=0x309A | 0xFE20..=0xFE2F),
+        )
+    {
+        i -= 1;
+    }
+    match chars.get(i).copied() {
+        Some(
+            '\u{3005}'
+            | '\u{3006}'
+            | '\u{3007}'
+            | '\u{3400}'..='\u{4DBF}'
+            | '\u{4E00}'..='\u{9FFF}'
+            | '\u{F900}'..='\u{FAFF}'
+            | '\u{20000}'..='\u{3FFFF}',
+        ) => 2,
+        Some('\u{3041}'..='\u{309F}') => 3,
+        Some('\u{30A0}'..='\u{30FF}' | '\u{31F0}'..='\u{31FF}' | '\u{FF66}'..='\u{FF9F}') => 4,
+        Some('\u{1100}'..='\u{11FF}' | '\u{3130}'..='\u{318F}' | '\u{AC00}'..='\u{D7AF}') => 5,
+        Some(c) if c.is_alphanumeric() || c == '_' => 1,
+        _ => 0,
+    }
+}
+
+fn is_word(chars: &[char], i: usize) -> bool {
+    word_class(chars, i) != 0
+}
+
+/// The start of the word before `i` (skipping spaces and punctuation first).
+fn word_left(chars: &[char], mut i: usize) -> usize {
+    while i > 0 && !is_word(chars, i - 1) {
+        i -= 1;
+    }
+    let class = word_class(chars, i.saturating_sub(1));
+    while i > 0 && word_class(chars, i - 1) == class && class != 0 {
+        i -= 1;
+    }
+    i
+}
+
+/// The end of the word after `i` (skipping spaces and punctuation first).
+fn word_right(chars: &[char], mut i: usize) -> usize {
+    let n = chars.len();
+    while i < n && !is_word(chars, i) {
+        i += 1;
+    }
+    let class = word_class(chars, i);
+    while i < n && word_class(chars, i) == class && class != 0 {
+        i += 1;
+    }
+    i
+}
+
+/// A named key: Backspace, Delete, Left, Right, Up, Down, Home, End, Enter, Escape, SelectAll.
+/// `word` moves or deletes by word, `line` to the line's ends (Up/Down, Home/End: the text's ends);
+/// [`crate::keymap::text_motion`] gives them for the platform's keys. `ArrowLeft` etc. also work.
+pub fn key(s: &mut Session, key: &str, shift: bool, word: bool, line: bool) -> Result<()> {
+    let key = key.strip_prefix("Arrow").unwrap_or(key);
+    let Some(te) = s.ds()?.text_edit.clone() else { return Err(EngineError::Other("not editing text".into())) };
+    let t = text_of(s, te.id)?;
+    let chars: Vec<char> = t.characters.chars().collect();
+    let n = chars.len();
+    if matches!(key, "Tab" | "Backspace" | "Enter") && !word && !line && list_key(s, key, shift)? {
+        return Ok(());
+    }
+    match key {
+        "Escape" => return end(s),
+        "Enter" => return insert(s, "\n"),
+        "Tab" => return insert(s, "\t"),
+        "Backspace" | "Delete" => {
+            return edit(s, |t, te| {
+                let (a, b) = range(te);
+                let (a, b) = if a != b {
+                    (a, b)
+                } else if key == "Backspace" {
+                    let from = if line {
+                        line_start(&chars, a)
+                    } else if word {
+                        word_left(&chars, a)
+                    } else {
+                        figcraft_text::backspace_step(&t.characters, a)
+                    };
+                    (from, a)
+                } else {
+                    let to = if line {
+                        line_end(&chars, a)
+                    } else if word {
+                        word_right(&chars, a)
+                    } else {
+                        figcraft_text::grapheme_step(&t.characters, a, true).min(n)
+                    };
+                    (a, to)
+                };
+                t.replace_range(a, b, "");
+                te.caret = a;
+                te.anchor = a;
+            });
+        }
+        _ => {}
+    }
+    // Caret movement.
+    let layout = {
+        let doc = s.doc()?;
+        let node = doc.get(te.id)?;
+        figcraft_text::layout_node(node).map(|(l, _)| l)
+    };
+    let (a, b) = range(&te);
+    // Without Shift, a selection collapses first: plain arrows stop at its edge, word/line moves
+    // continue from that edge.
+    let cur = match key {
+        "Left" | "Up" | "Home" if !shift && a != b => a,
+        "Right" | "Down" | "End" if !shift && a != b => b,
+        _ => te.caret,
+    };
+    let next = match key {
+        "Left" if !shift && a != b && !word && !line => a,
+        "Right" if !shift && a != b && !word && !line => b,
+        "Left" if line => line_start(&chars, cur),
+        "Right" if line => line_end(&chars, cur),
+        "Left" if word => word_left(&chars, cur),
+        "Right" if word => word_right(&chars, cur),
+        // Plain arrows move on screen through right-to-left runs, by char elsewhere.
+        "Left" | "Right" => match layout.as_ref().and_then(|l| l.visual_step(cur, key == "Right")) {
+            Some(i) => i.min(n),
+            None => figcraft_text::grapheme_step(&t.characters, cur, key == "Right").min(n),
+        },
+        "Home" if line => 0,
+        "End" if line => n,
+        "Home" => line_start(&chars, cur),
+        "End" => line_end(&chars, cur),
+        "Up" | "Down" => match &layout {
+            _ if line => {
+                if key == "Up" {
+                    0
+                } else {
+                    n
+                }
+            }
+            Some(l) => {
+                let (x, li) = l.caret(cur);
+                let target = if key == "Up" { li.checked_sub(1) } else { Some(li + 1).filter(|k| *k < l.lines.len()) };
+                match target.and_then(|k| l.lines.get(k)) {
+                    Some(line) => l.hit(x, line.top + line.height / 2.0),
+                    None => {
+                        if key == "Up" {
+                            0
+                        } else {
+                            n
+                        }
+                    }
+                }
+            }
+            None => cur,
+        },
+        "SelectAll" => return select(s, 0, n),
+        _ => return Ok(()),
+    };
+    let anchor = if shift { te.anchor } else { next };
+    select(s, anchor, next)
+}
+
+/// Set the selection (`anchor`..`caret`, clamped to the text). Moving the caret abandons any
+/// composition in progress.
+fn select(s: &mut Session, anchor: usize, caret: usize) -> Result<()> {
+    let Some(id) = s.ds()?.text_edit.as_ref().map(|te| te.id) else { return Ok(()) };
+    let len = s.doc()?.node(id).and_then(|n| n.kind.text()).map_or(0, TextData::char_count);
+    let ds = s.ds_mut()?;
+    if let Some(te) = ds.text_edit.as_mut() {
+        te.anchor = anchor.min(len);
+        te.caret = caret.min(len);
+        te.preedit = None;
+    }
+    ds.revision += 1;
+    Ok(())
+}
+
+/// Delete the text surrounding the caret/selection that an IME reports with
+/// [`egui::ImeEvent::DeleteSurroundingBytes`]: `before_bytes` UTF-8 bytes end where the selection
+/// starts and `after_bytes` start where it ends. As in stock `TextEdit`, the selected text itself
+/// is kept for the paired `Commit`; only whole characters covered by the byte counts beyond the
+/// selection are removed (a character the range only partly covers stays). Returns whether
+/// anything was deleted.
+pub fn delete_surrounding_bytes(s: &mut Session, before_bytes: usize, after_bytes: usize) -> Result<bool> {
+    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(false) };
+    let t = text_of(s, te.id)?;
+    let (a, b) = range(&te);
+    let (before, after) = surrounding_chars(&t.characters, a, b, before_bytes, after_bytes);
+    if before == 0 && after == 0 {
+        return Ok(false);
+    }
+    edit_if(s, |t, te| {
+        let (a, b) = range(te);
+        let (before, after) = surrounding_chars(&t.characters, a, b, before_bytes, after_bytes);
+        if before == 0 && after == 0 {
+            return false;
+        }
+        // Delete after the selection first so the before range's indices stay valid.
+        if after > 0 {
+            t.replace_range(b, b + after, "");
+        }
+        if before > 0 {
+            t.replace_range(a - before, a, "");
+        }
+        // Keep the selection: both ends move left by the deleted prefix, reversed or not.
+        te.caret = te.caret.saturating_sub(before);
+        te.anchor = te.anchor.saturating_sub(before);
+        true
+    })
+}
+
+/// Delete surrounding text counted in characters (the older `DeleteSurrounding` event). The
+/// selection is kept, as in stock `TextEdit`; only text before and after it is removed.
+pub fn delete_surrounding_chars(s: &mut Session, before_chars: usize, after_chars: usize) -> Result<bool> {
+    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(false) };
+    let t = text_of(s, te.id)?;
+    let (a, b) = range(&te);
+    let (_, b_byte) = char_byte_offsets(&t.characters, a, b);
+    let before = before_chars.min(a);
+    let after = t.characters.get(b_byte..).map_or(0, |rest| rest.chars().take(after_chars).count());
+    if before == 0 && after == 0 {
+        return Ok(false);
+    }
+    edit_if(s, |t, te| {
+        let (a, b) = range(te);
+        let (_, b_byte) = char_byte_offsets(&t.characters, a, b);
+        let before = before_chars.min(a);
+        let after = t.characters.get(b_byte..).map_or(0, |rest| rest.chars().take(after_chars).count());
+        if before == 0 && after == 0 {
+            return false;
+        }
+        if after > 0 {
+            t.replace_range(b, b + after, "");
+        }
+        if before > 0 {
+            t.replace_range(a - before, a, "");
+        }
+        te.caret = te.caret.saturating_sub(before);
+        te.anchor = te.anchor.saturating_sub(before);
+        true
+    })
+}
+
+/// The UTF-8 byte offsets of character indices `a` and `b` in one forward pass.
+///
+/// An index at or past the end maps to `text.len()`. Walking once (instead of twice) matters on
+/// every IME event over a large text layer; the walk is still O(max(a, b)) characters, and callers
+/// that need the end still pay O(n). See [`ime_surrounding`].
+fn char_byte_offsets(text: &str, a: usize, b: usize) -> (usize, usize) {
+    let (mut a_byte, mut b_byte) = (None, None);
+    for (i, (byte, _)) in text.char_indices().enumerate() {
+        if a_byte.is_none() && i == a {
+            a_byte = Some(byte);
+        }
+        if b_byte.is_none() && i == b {
+            b_byte = Some(byte);
+        }
+        if a_byte.is_some() && b_byte.is_some() {
+            break;
+        }
+    }
+    (a_byte.unwrap_or(text.len()), b_byte.unwrap_or(text.len()))
+}
+
+/// `(before, after)` characters covered by the IME's byte counts around the selection `[a, b)`
+/// (character indices): mirror of egui's own `surrounding_bytes_to_chars`.
+fn surrounding_chars(text: &str, a: usize, b: usize, before_bytes: usize, after_bytes: usize) -> (usize, usize) {
+    let (a_byte, b_byte) = char_byte_offsets(text, a, b);
+    let from = a_byte.saturating_sub(before_bytes);
+    let before = text[..a_byte].char_indices().rev().take_while(|(i, _)| *i >= from).count();
+    let after = text[b_byte..].char_indices().take_while(|(i, c)| i + c.len_utf8() <= after_bytes).count();
+    (before, after)
+}
+
+/// The committed text around the IME caret for the outgoing surrounding-text snapshot.
+///
+/// This is the edited node's logical model text (never the bidi display order), with the
+/// pre-edit excluded because a composition is UI-only in this editor until it is committed.
+/// Character caret/anchor indices become independent UTF-8 byte offsets, so a reversed
+/// selection stays reversed. At most [`MAX_IME_SURROUNDING_BYTES`] bytes are copied: the window
+/// is centred on the selection and rounded inward to character boundaries. An empty text layer
+/// is `Ok` with `text == ""` and both offsets zero; the result is [`ImeSurroundingUnavailable`]
+/// only when there is no text edit, the target is not a text node, or the selection alone is
+/// wider than the budget.
+///
+/// Cost: one character walk up to the later of the two cursor indices (to turn char indices into
+/// UTF-8 bytes) plus the bounded copy. The caret is a character index, so reaching a caret near
+/// the end of a very large layer is still O(n); the UI calls this once per pass and twice around
+/// each text-affecting event (`ime_stamp`), so such a layer pays O(caret/anchor) per event. The
+/// document is never cloned here.
+pub fn ime_surrounding(s: &Session) -> std::result::Result<ImeSurrounding, ImeSurroundingUnavailable> {
+    let ds = s.ds().map_err(|_| ImeSurroundingUnavailable::NotEditing)?;
+    let te = ds.text_edit.as_ref().ok_or(ImeSurroundingUnavailable::NotEditing)?;
+    let node = ds.doc.node(te.id).ok_or(ImeSurroundingUnavailable::NotText)?;
+    let NodeKind::Text(t) = &node.kind else { return Err(ImeSurroundingUnavailable::NotText) };
+    let text = t.characters.as_str();
+    // One pass for both offsets (the caret and anchor are already clamped by `edit`/`select`).
+    let (cursor, anchor) = char_byte_offsets(text, te.caret, te.anchor);
+    let (selection_start, selection_end) = (cursor.min(anchor), cursor.max(anchor));
+    let selection_len = selection_end - selection_start;
+    if selection_len > MAX_IME_SURROUNDING_BYTES {
+        return Err(ImeSurroundingUnavailable::SelectionTooWide);
+    }
+    // Spend the budget on both sides, giving room unused on one side to the other.
+    let budget = MAX_IME_SURROUNDING_BYTES - selection_len;
+    let before_available = selection_start;
+    let after_available = text.len() - selection_end;
+    let mut before = (budget / 2).min(before_available);
+    let mut after = (budget - before).min(after_available);
+    before = (budget - after).min(before_available);
+    after = (budget - before).min(after_available);
+    let mut window_start = selection_start - before;
+    let mut window_end = selection_end + after;
+    // Round inward so the window stays within the byte budget and on character boundaries.
+    while window_start < window_end && !text.is_char_boundary(window_start) {
+        window_start += 1;
+    }
+    while window_end > window_start && !text.is_char_boundary(window_end) {
+        window_end -= 1;
+    }
+    let Some(window) = text.get(window_start..window_end) else {
+        return Err(ImeSurroundingUnavailable::InvalidWindow);
+    };
+    Ok(ImeSurrounding {
+        owner: ImeEditOwner { document: ds.uid, node: te.id, editing_session: te.editing_session },
+        text: window.to_owned(),
+        cursor: cursor.saturating_sub(window_start),
+        anchor: anchor.saturating_sub(window_start),
+    })
+}
+
+/// Show an IME composition inline at the caret (`cursor` = the IME's cursor inside it, in chars;
+/// default its end). The document doesn't change until the composition is committed with
+/// [`insert`]; an empty `text` cancels it. Starting to compose over a selection deletes it, as
+/// typing would.
+pub fn preedit(s: &mut Session, text: &str, cursor: Option<usize>) -> Result<()> {
+    let Some(te) = s.ds()?.text_edit.clone() else { return Err(EngineError::Other("not editing text".into())) };
+    let text: String = text.chars().filter(|c| !c.is_control()).take(MAX_PREEDIT).collect();
+    if text.is_empty() && te.preedit.is_none() {
+        return Ok(()); // IMEs send empty compositions when idle
+    }
+    if !text.is_empty() && te.preedit.is_none() && te.caret != te.anchor {
+        edit(s, |t, te| {
+            let (a, b) = range(te);
+            t.replace_range(a, b, "");
+            te.caret = a;
+            te.anchor = a;
+        })?;
+    }
+    let n = text.chars().count();
+    let ds = s.ds_mut()?;
+    if let Some(te) = ds.text_edit.as_mut() {
+        te.preedit = (n > 0).then(|| Preedit { text, cursor: cursor.unwrap_or(n).min(n) });
+    }
+    ds.revision += 1;
+    Ok(())
+}
+
+/// Longest composition shown (IMEs compose a phrase at a time).
+const MAX_PREEDIT: usize = 1000;
+
+/// The document as it looks while composing: the composition inserted at the caret, with text
+/// auto-size and layout applied. Also returns the composition's char range and the IME cursor's
+/// index in that document. `None` when nothing is being composed.
+pub fn preedit_doc(s: &Session) -> Option<(Document, (usize, usize), usize)> {
+    let ds = s.ds().ok()?;
+    let te = ds.text_edit.as_ref()?;
+    let pe = te.preedit.as_ref()?;
+    let mut doc = (*ds.doc).clone();
+    let NodeKind::Text(t) = &mut doc.get_mut(te.id).ok()?.kind else { return None };
+    let at = te.caret.min(t.char_count());
+    t.replace_range(at, at, &pe.text);
+    crate::normalize(&mut doc, &ds.doc);
+    let n = pe.text.chars().count();
+    Some((doc, (at, at + n), at + pe.cursor.min(n)))
+}
+
+fn line_start(chars: &[char], mut i: usize) -> usize {
+    while i > 0 && chars.get(i - 1).is_some_and(|c| *c != '\n') {
+        i -= 1;
+    }
+    i
+}
+
+fn line_end(chars: &[char], mut i: usize) -> usize {
+    while i < chars.len() && chars.get(i).is_some_and(|c| *c != '\n') {
+        i += 1;
+    }
+    i
+}
+
+/// Place the caret (and optionally extend the selection) at char `index`.
+pub fn set_caret(s: &mut Session, index: usize, extend: bool) -> Result<()> {
+    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(()) };
+    select(s, if extend { te.anchor } else { index }, index)
+}
+
+/// Select the word at `index` (double-click).
+pub fn select_word(s: &mut Session, index: usize) -> Result<()> {
+    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(()) };
+    let chars: Vec<char> = text_of(s, te.id)?.characters.chars().collect();
+    let mut a = index.min(chars.len());
+    // Double-clicking just after a word's last char (or at the end) selects that word.
+    if a > 0 && !is_word(&chars, a) && is_word(&chars, a - 1) {
+        a -= 1;
+    }
+    let mut b = a;
+    // Words by script (see `word_class`), then runs of spaces (10) and of punctuation (11).
+    let class = |i: usize| match word_class(&chars, i) {
+        0 if chars.get(i).is_some_and(|c| c.is_whitespace()) => 10,
+        0 => 11,
+        k => k,
+    };
+    // A word, a run of spaces or a run of punctuation, like the incumbent; newlines stay unselected.
+    if let Some(k) = chars.get(a).filter(|c| **c != '\n').map(|_| class(a)) {
+        while a > 0 && chars.get(a - 1).is_some_and(|c| *c != '\n') && class(a - 1) == k {
+            a -= 1;
+        }
+        while b < chars.len() && chars.get(b).is_some_and(|c| *c != '\n') && class(b) == k {
+            b += 1;
+        }
+    }
+    select(s, a, b)
+}
+
+/// Select the line (paragraph) containing `index` (triple-click).
+pub fn select_line(s: &mut Session, index: usize) -> Result<()> {
+    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(()) };
+    let chars: Vec<char> = text_of(s, te.id)?.characters.chars().collect();
+    let i = index.min(chars.len());
+    select(s, line_start(&chars, i), line_end(&chars, i))
+}
+
+/// The selected text while editing (for copy).
+pub fn selected_text(s: &Session) -> Option<String> {
+    let (id, a, b) = selected_range(s)?;
+    let doc = s.doc().ok()?;
+    let t = doc.node(id)?.kind.text()?;
+    Some(t.characters.chars().skip(a).take(b.saturating_sub(a)).collect())
+}
+
+/// The selected range while editing (for styling commands), or None.
+pub fn selected_range(s: &Session) -> Option<(NodeId, usize, usize)> {
+    let te = s.ds().ok()?.text_edit.clone()?;
+    let (a, b) = range(&te);
+    Some((te.id, a, b))
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/engine/src/canvas/textedit/tests.rs b/crates/engine/src/canvas/textedit/tests.rs
new file mode 100644
index 00000000..fecca580
--- /dev/null
+++ b/crates/engine/src/canvas/textedit/tests.rs
@@ -0,0 +1,571 @@
+use super::*;
+use crate::tools::{PointerEvent, PointerKind};
+use figcraft_doc::{ListStyle, TextAutoResize, TextCase, TextDecoration};
+use serde_json::json;
+
+fn setup(text: &str) -> (Session, NodeId) {
+    let mut s = Session::new();
+    let r = s.execute("text.create", &json!({"text": text, "x": 0, "y": 0, "props": {"fontSize": 24}})).unwrap();
+    let id = crate::params::id_of(&r["id"]).unwrap();
+    (s, id)
+}
+
+fn data(s: &Session, id: NodeId) -> TextData {
+    s.doc().unwrap().node(id).unwrap().kind.text().unwrap().clone()
+}
+
+fn sel(s: &Session) -> (usize, usize) {
+    let te = s.ds().unwrap().text_edit.clone().unwrap();
+    (te.anchor, te.caret)
+}
+
+#[test]
+fn whole_editing_session_is_one_undo_step() {
+    let (mut s, id) = setup("Hello");
+    let undo_before = s.ds().unwrap().history.undo.len();
+    begin(&mut s, id, Some(5), false).unwrap();
+    insert(&mut s, " big").unwrap();
+    insert(&mut s, " world").unwrap();
+    key(&mut s, "Backspace", false, false, false).unwrap();
+    // Styling a range mid-session joins the same step.
+    set_caret(&mut s, 0, false).unwrap();
+    set_caret(&mut s, 5, true).unwrap();
+    s.execute("text.bold", &json!({})).unwrap();
+    s.execute("text.alignCenter", &json!({})).unwrap();
+    end(&mut s).unwrap();
+    let t = data(&s, id);
+    assert_eq!(t.characters, "Hello big worl");
+    assert_eq!(t.style_at(0).font_style, "Bold");
+    assert_eq!(t.style_at(6).font_style, "Regular");
+    assert_eq!(s.ds().unwrap().history.undo.len(), undo_before + 1);
+    s.undo().unwrap();
+    let t = data(&s, id);
+    assert_eq!(t.characters, "Hello");
+    assert!(t.runs.is_empty());
+    assert_eq!(t.align_h, figcraft_doc::TextAlignH::Left);
+}
+
+#[test]
+fn typing_replaces_selection_and_paste_is_plain() {
+    let (mut s, id) = setup("Hello world");
+    begin(&mut s, id, None, false).unwrap();
+    assert_eq!(sel(&s), (0, 11), "begin without caret selects all");
+    select_word(&mut s, 7).unwrap();
+    assert_eq!(sel(&s), (6, 11));
+    insert(&mut s, "there").unwrap();
+    assert_eq!(data(&s, id).characters, "Hello there");
+    assert_eq!(sel(&s), (11, 11));
+    // Pasted text: CRLF / CR / Unicode separators become newlines, other controls are dropped.
+    insert(&mut s, "\r\na\rb\u{2029}c\u{0}\u{7}\td").unwrap();
+    assert_eq!(data(&s, id).characters, "Hello there\na\nb\nc\td");
+    insert(&mut s, "\u{1}").unwrap();
+    assert_eq!(data(&s, id).characters, "Hello there\na\nb\nc\td");
+    // Select the line (paragraph) then type over it.
+    select_line(&mut s, 0).unwrap();
+    assert_eq!(sel(&s), (0, 11));
+    insert(&mut s, "Hi").unwrap();
+    assert_eq!(data(&s, id).characters, "Hi\na\nb\nc\td");
+    assert_eq!(selected_text(&s).as_deref(), Some(""));
+    end(&mut s).unwrap();
+}
+
+#[test]
+fn word_selection_classes() {
+    let (mut s, id) = setup("foo,  bar_baz!\nnext");
+    begin(&mut s, id, Some(0), false).unwrap();
+    select_word(&mut s, 1).unwrap();
+    assert_eq!(sel(&s), (0, 3));
+    // Right after a word's last char selects the word.
+    select_word(&mut s, 13).unwrap();
+    assert_eq!(sel(&s), (6, 13));
+    // A run of spaces.
+    select_word(&mut s, 4).unwrap();
+    assert_eq!(sel(&s), (4, 6));
+    select_line(&mut s, 16).unwrap();
+    assert_eq!(sel(&s), (15, 19));
+    select_line(&mut s, 999).unwrap();
+    assert_eq!(sel(&s), (15, 19));
+    select_word(&mut s, 999).unwrap();
+    assert_eq!(sel(&s), (15, 19));
+    set_caret(&mut s, 999, false).unwrap();
+    assert_eq!(sel(&s), (19, 19), "carets clamp to the text");
+}
+
+#[test]
+fn keyboard_navigation_and_extension() {
+    let (mut s, id) = setup("one two\nthree");
+    begin(&mut s, id, Some(0), false).unwrap();
+    key(&mut s, "Right", false, true, false).unwrap(); // Alt+Right: end of word
+    assert_eq!(sel(&s), (3, 3));
+    key(&mut s, "Right", true, true, false).unwrap(); // Shift+Alt+Right extends
+    assert_eq!(sel(&s), (3, 7));
+    key(&mut s, "Left", false, false, false).unwrap(); // collapses to the start
+    assert_eq!(sel(&s), (3, 3));
+    key(&mut s, "Right", false, false, true).unwrap(); // Cmd+Right: line end
+    assert_eq!(sel(&s), (7, 7));
+    key(&mut s, "Down", true, false, true).unwrap(); // Shift+Cmd+Down: to the end
+    assert_eq!(sel(&s), (7, 13));
+    key(&mut s, "Left", false, false, true).unwrap(); // Cmd+Left from the collapsed start
+    assert_eq!(sel(&s), (0, 0));
+    key(&mut s, "Delete", false, true, false).unwrap(); // Alt+Delete: word forward
+    assert_eq!(data(&s, id).characters, " two\nthree");
+    key(&mut s, "SelectAll", false, false, false).unwrap();
+    assert_eq!(sel(&s), (0, 10));
+    end(&mut s).unwrap();
+}
+
+#[test]
+fn backspace_removes_only_the_final_thai_mark() {
+    let (mut s, id) = setup("น้ำ");
+    begin(&mut s, id, Some(3), false).unwrap();
+
+    key(&mut s, "Backspace", false, false, false).unwrap();
+
+    assert_eq!(data(&s, id).characters, "น้");
+}
+
+fn ev(kind: PointerKind, x: f64, y: f64, shift: bool) -> PointerEvent {
+    let mut e = PointerEvent::at(kind, x, y, 1.0);
+    e.shift = shift;
+    e
+}
+
+/// Asserts double-clicking a text layer selects all text, a second double-click selects the
+/// word without changing the editing session, and drag and Shift+click extend the
+/// selection.
+#[test]
+fn pointer_double_click_drag_and_shift_click() {
+    let (mut s, id) = setup("Hello world");
+    let Some((l, _)) = figcraft_text::layout_node(s.doc().unwrap().node(id).unwrap()) else { return };
+    if l.glyphs.is_empty() {
+        return; // no fonts
+    }
+    let y = l.lines[0].top + l.lines[0].height / 2.0;
+    let x_of = |i: usize| l.caret(i).0;
+    // Double-click inside "world" edits with all the text selected; another one there
+    // selects the word.
+    let mid = (x_of(7) + x_of(8)) / 2.0;
+    s.pointer(&ev(PointerKind::Down, mid, y, false)).unwrap();
+    s.pointer(&ev(PointerKind::Up, mid, y, false)).unwrap();
+    s.pointer(&ev(PointerKind::DoubleClick, mid, y, false)).unwrap();
+    assert_eq!(sel(&s), (0, 11));
+    let epoch = s.ds().unwrap().text_edit.as_ref().unwrap().editing_session;
+    s.pointer(&ev(PointerKind::Down, mid, y, false)).unwrap();
+    s.pointer(&ev(PointerKind::DoubleClick, mid, y, false)).unwrap();
+    s.pointer(&ev(PointerKind::Up, mid, y, false)).unwrap();
+    assert_eq!(sel(&s), (6, 11));
+    assert_eq!(
+        s.ds().unwrap().text_edit.as_ref().unwrap().editing_session,
+        epoch,
+        "a double-click inside the edit is an ordinary edit: same IME replacement epoch"
+    );
+    // Drag-select from the start of "Hello" to the middle.
+    s.pointer(&ev(PointerKind::Down, x_of(0) + 0.5, y, false)).unwrap();
+    assert_eq!(sel(&s), (0, 0));
+    s.pointer(&ev(PointerKind::Move, (x_of(3) + x_of(4)) / 2.0 - 1.0, y, false)).unwrap();
+    s.pointer(&ev(PointerKind::Up, (x_of(3) + x_of(4)) / 2.0 - 1.0, y, false)).unwrap();
+    assert_eq!(sel(&s), (0, 3));
+    // Shift+click extends.
+    s.pointer(&ev(PointerKind::Down, x_of(9) + 0.5, y, true)).unwrap();
+    s.pointer(&ev(PointerKind::Up, x_of(9) + 0.5, y, true)).unwrap();
+    assert_eq!(sel(&s), (0, 9));
+    insert(&mut s, "J").unwrap();
+    assert_eq!(data(&s, id).characters, "Jld");
+}
+
+#[test]
+fn text_commands_apply_to_edited_range() {
+    let (mut s, id) = setup("Hello world");
+    begin(&mut s, id, Some(0), false).unwrap();
+    set_caret(&mut s, 6, true).unwrap(); // "Hello "
+    for (cmd, p) in [
+        ("text.underline", json!({})),
+        ("text.italic", json!({})),
+        ("text.sizeUp", json!({})),
+        ("text.trackingUp", json!({})),
+        ("text.lineHeightUp", json!({})),
+        ("text.caseSmallCaps", json!({})),
+        ("text.link", json!({"url": "https://example.com"})),
+    ] {
+        s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd}: {e}"));
+    }
+    let t = data(&s, id);
+    let (a, b) = (t.style_at(0), t.style_at(8));
+    assert_eq!(a.decoration, TextDecoration::Underline);
+    assert!(a.italic() && !b.italic());
+    assert_eq!(a.font_size, 25.0);
+    assert_eq!(b.font_size, 24.0);
+    assert_eq!(a.case, TextCase::SmallCaps);
+    assert_eq!(a.link.as_deref(), Some("https://example.com"));
+    assert!(b.link.is_none());
+    // text.style with an explicit range (what the panel sends).
+    s.execute("text.style", &json!({"id": id, "start": 6, "end": 11, "fontSize": 40, "textCase": "upper"})).unwrap();
+    let t = data(&s, id);
+    assert_eq!(t.style_at(8).font_size, 40.0);
+    assert_eq!(t.style_at(8).case, TextCase::Upper);
+    // Paragraph commands hit the edited node.
+    s.execute("text.listStyle", &json!({"style": "numbered"})).unwrap();
+    assert_eq!(data(&s, id).list, ListStyle::Numbered);
+    // Every Text-menu command runs while editing.
+    for item in crate::catalog::MENU.iter().filter(|i| i.id.starts_with("text.")) {
+        let p = if item.id == "text.link" { json!({"url": "u"}) } else { json!({}) };
+        if crate::find_command(item.id).is_some() {
+            s.execute(item.id, &p).unwrap_or_else(|e| panic!("{}: {e}", item.id));
+        }
+    }
+    end(&mut s).unwrap();
+}
+
+#[test]
+fn paragraph_and_feature_commands_on_nodes() {
+    let (mut s, id) = setup("Hello");
+    let ids = json!([id]);
+    s.execute("text.setFeatures", &json!({"ids": ids, "features": {"liga": false, "tnum": true}})).unwrap();
+    assert_eq!(data(&s, id).features.get("liga"), Some(&false));
+    s.execute("text.setFeatures", &json!({"ids": ids, "features": {"liga": null, "ss01": 1}})).unwrap();
+    let f = data(&s, id).features;
+    assert_eq!(f.get("liga"), None);
+    assert_eq!(f.get("ss01"), Some(&true));
+    assert_eq!(f.get("tnum"), Some(&true));
+    s.execute("text.setFeatures", &json!({"ids": ids, "features": {"zero": true}, "replace": true})).unwrap();
+    assert_eq!(data(&s, id).features.len(), 1);
+    assert!(s.execute("text.setFeatures", &json!({"ids": ids, "features": {"ligatures": true}})).is_err());
+    assert!(s.execute("text.setFeatures", &json!({"ids": ids, "features": {"liga": "yes"}})).is_err());
+    assert!(s.execute("text.setFeatures", &json!({"ids": ids})).is_err());
+    s.execute("node.set", &json!({"id": id, "props": {"features": {"calt": false}}})).unwrap();
+    assert_eq!(data(&s, id).features.len(), 1);
+    s.execute("text.paragraphIndent", &json!({"ids": ids, "indent": 16})).unwrap();
+    s.execute("text.paragraphSpacing", &json!({"ids": ids, "spacing": 8})).unwrap();
+    s.execute("text.maxLines", &json!({"ids": ids, "lines": 2})).unwrap();
+    s.execute("text.decoration", &json!({"ids": ids, "decoration": "strikethrough"})).unwrap();
+    s.execute("text.case", &json!({"ids": ids, "case": "smallCaps"})).unwrap();
+    s.execute("text.listStyle", &json!({"ids": ids, "style": "bulleted"})).unwrap();
+    let t = data(&s, id);
+    assert_eq!((t.paragraph_indent, t.paragraph_spacing, t.max_lines), (16.0, 8.0, 2));
+    assert_eq!(t.auto_resize, TextAutoResize::Truncate);
+    assert_eq!(t.style.decoration, TextDecoration::Strikethrough);
+    assert_eq!(t.style.case, TextCase::SmallCaps);
+    assert_eq!(t.list, ListStyle::Bulleted);
+    assert!(s.execute("text.listStyle", &json!({"ids": ids, "style": "zigzag"})).is_err());
+    assert!(s.execute("text.paragraphIndent", &json!({"ids": ids, "indent": "NaN"})).is_err());
+    s.execute("node.set", &json!({"id": id, "props": {"textCase": "smallCaps", "paragraphIndent": 4, "maxLines": 0}})).unwrap();
+    assert_eq!(data(&s, id).paragraph_indent, 4.0);
+}
+
+fn preedit_state(s: &Session) -> Option<Preedit> {
+    s.ds().unwrap().text_edit.clone().unwrap().preedit
+}
+
+#[test]
+fn ime_composition_is_shown_but_not_in_the_document_until_committed() {
+    let (mut s, id) = setup("Hello world");
+    let undo_before = s.ds().unwrap().history.undo.len();
+    begin(&mut s, id, Some(5), false).unwrap();
+    let doc_before = s.ds().unwrap().doc.clone();
+    s.execute("text.edit.preedit", &json!({"text": "にほ", "cursor": 1})).unwrap();
+    assert_eq!(preedit_state(&s), Some(Preedit { text: "にほ".into(), cursor: 1 }));
+    assert!(std::sync::Arc::ptr_eq(&doc_before, &s.ds().unwrap().doc), "composing leaves the document alone");
+    let (shown, range, cursor) = preedit_doc(&s).unwrap();
+    assert_eq!(shown.node(id).unwrap().kind.text().unwrap().characters, "Helloにほ world");
+    assert_eq!((range, cursor), ((5, 7), 6));
+    let info = s.execute("text.edit.selection", &json!({})).unwrap();
+    assert_eq!(info["preedit"]["text"], "にほ");
+    // Updating the composition replaces it; an empty one cancels it.
+    preedit(&mut s, "にほん", None).unwrap();
+    assert_eq!(preedit_doc(&s).unwrap().2, 8);
+    preedit(&mut s, "", None).unwrap();
+    assert!(preedit_state(&s).is_none() && preedit_doc(&s).is_none());
+    assert_eq!(data(&s, id).characters, "Hello world");
+    // Commit puts the final text at the caret.
+    preedit(&mut s, "にほん", None).unwrap();
+    s.execute("text.edit.insert", &json!({"text": "日本"})).unwrap();
+    assert!(preedit_state(&s).is_none());
+    assert_eq!(data(&s, id).characters, "Hello日本 world");
+    assert_eq!(sel(&s), (7, 7));
+    // Composing over a selection replaces it; moving the caret abandons the composition.
+    set_caret(&mut s, 7, false).unwrap();
+    set_caret(&mut s, 13, true).unwrap();
+    preedit(&mut s, "x", None).unwrap();
+    assert_eq!(data(&s, id).characters, "Hello日本");
+    set_caret(&mut s, 0, false).unwrap();
+    assert!(preedit_state(&s).is_none());
+    assert_eq!(data(&s, id).characters, "Hello日本");
+    // Ending the edit drops an uncommitted composition; the session stays one undo step.
+    preedit(&mut s, "zz", None).unwrap();
+    end(&mut s).unwrap();
+    assert_eq!(data(&s, id).characters, "Hello日本");
+    assert_eq!(s.ds().unwrap().history.undo.len(), undo_before + 1);
+    // Not editing: an error, not a crash.
+    assert!(preedit(&mut s, "a", None).is_err());
+}
+
+#[test]
+fn variable_font_axes_as_commands_and_props() {
+    let (mut s, id) = setup("Hello world");
+    let ids = json!([id]);
+    s.execute("text.setVariations", &json!({"ids": ids, "variations": {"wght": 550, "wdth": 85}})).unwrap();
+    let st = data(&s, id).style;
+    assert_eq!((st.variations.get("wght"), st.variations.get("wdth")), (Some(&550.0), Some(&85.0)));
+    assert_eq!(st.weight(), 550);
+    // null removes one axis; replace clears the rest.
+    s.execute("text.setVariations", &json!({"ids": ids, "variations": {"wdth": null}})).unwrap();
+    assert_eq!(data(&s, id).style.variations.len(), 1);
+    s.execute("text.setVariations", &json!({"ids": ids, "variations": {"opsz": 14}, "replace": true})).unwrap();
+    assert_eq!(data(&s, id).style.variations.keys().collect::<Vec<_>>(), ["opsz"]);
+    // Undo restores the previous values.
+    s.undo().unwrap();
+    assert_eq!(data(&s, id).style.variations.keys().collect::<Vec<_>>(), ["wght"]);
+    // Junk is rejected.
+    assert!(s.execute("text.setVariations", &json!({"ids": ids, "variations": {"weight": 500}})).is_err());
+    assert!(s.execute("text.setVariations", &json!({"ids": ids, "variations": {"wght": "bold"}})).is_err());
+    assert!(s.execute("text.setVariations", &json!({"ids": ids})).is_err());
+    // node.set props (whole text or a range) replace the custom values.
+    s.execute("node.set", &json!({"id": id, "props": {"fontVariations": {"wght": 300}, "start": 6, "end": 11}})).unwrap();
+    let t = data(&s, id);
+    assert_eq!(t.style_at(0).variations.get("wght"), Some(&550.0));
+    assert_eq!(t.style_at(7).variations.get("wght"), Some(&300.0));
+    s.execute("node.set", &json!({"id": id, "props": {"variationSettings": null}})).unwrap();
+    assert!(data(&s, id).runs.is_empty() && data(&s, id).style.variations.is_empty());
+    // Picking a named style (Bold, weight steps) drops the custom weight but keeps width.
+    s.execute("text.setVariations", &json!({"ids": ids, "variations": {"wght": 650, "wdth": 90}})).unwrap();
+    s.execute("text.bold", &json!({"ids": ids})).unwrap();
+    let st = data(&s, id).style;
+    assert_eq!(st.font_style, "Bold", "650 is lighter than bold, so Bold applies");
+    assert!(!st.variations.contains_key("wght"));
+    assert_eq!(st.variations.get("wdth"), Some(&90.0));
+    // While editing, the command styles the selected range only.
+    begin(&mut s, id, Some(0), false).unwrap();
+    set_caret(&mut s, 5, true).unwrap();
+    s.execute("text.setVariations", &json!({"variations": {"wdth": 75}})).unwrap();
+    end(&mut s).unwrap();
+    let t = data(&s, id);
+    assert_eq!(t.style_at(0).variations.get("wdth"), Some(&75.0));
+    assert_eq!(t.style_at(8).variations.get("wdth"), Some(&90.0));
+    // The axes query answers without fonts too.
+    let r = s.execute("text.fonts", &json!({"family": "Inter", "axes": true})).unwrap();
+    assert!(r.is_null() || r["axes"].is_array());
+}
+
+/// No text command panics on junk parameters while a text is being edited.
+#[test]
+fn text_commands_survive_junk_while_editing() {
+    let junk = [
+        json!({}),
+        json!(null),
+        json!({"index": -5, "features": {"": 1}}),
+        json!({"index": 1e300, "style": 3, "case": null}),
+        json!([1]),
+        json!({"variations": {"wght": "heavy", "toolong": 1}, "text": "\u{0}\u{7}", "cursor": 1e300}),
+        json!({"variations": {"wght": 1e300, "opsz": -1e300}, "replace": "yes", "text": "日本語", "cursor": -1}),
+    ];
+    // `text.rescanFonts` takes no params and walks the font folders: one walk per junk is slow.
+    for spec in crate::cmd::all_commands().iter().filter(|c| c.id.starts_with("text.") && c.id != "text.rescanFonts") {
+        for j in &junk {
+            let (mut s, id) = setup("Hi there\nyou");
+            begin(&mut s, id, Some(2), false).unwrap();
+            set_caret(&mut s, 5, true).unwrap();
+            if let Err(EngineError::Internal { cmd, msg }) = s.execute(spec.id, j) {
+                panic!("{cmd} panicked on {j}: {msg}");
+            }
+        }
+    }
+}
+
+/// Asserts surrounding text is logical UTF-8 text with byte offsets and keeps a reversed
+/// selection reversed.
+#[test]
+fn ime_surrounding_uses_logical_utf8_bytes_and_keeps_selection_direction() {
+    let (mut s, id) = setup("café😀e\u{301}x");
+    begin(&mut s, id, Some(8), false).unwrap();
+    set_caret(&mut s, 8, false).unwrap();
+    set_caret(&mut s, 5, true).unwrap(); // anchor after the emoji, caret before it
+    let ime = ime_surrounding(&s).unwrap();
+    assert_eq!(ime.text, "café😀e\u{301}x");
+    assert_eq!((ime.cursor, ime.anchor), (9, 13), "char 5 and char 8 as UTF-8 bytes");
+    assert!(ime.cursor < ime.anchor, "the reversed selection stays reversed");
+    assert_eq!(ime.owner.node, id);
+    assert_eq!(ime.owner.document, s.ds().unwrap().uid);
+}
+
+/// Asserts an active composition is excluded from surrounding text and an empty text layer
+/// reports an available, empty payload.
+#[test]
+fn ime_surrounding_excludes_the_composition_and_empty_text_is_available() {
+    let (mut s, id) = setup("Hi");
+    begin(&mut s, id, Some(2), false).unwrap();
+    preedit(&mut s, "にほ", Some(1)).unwrap();
+    let ime = ime_surrounding(&s).unwrap();
+    assert_eq!(ime.text, "Hi", "the composition is not committed text");
+    assert_eq!((ime.cursor, ime.anchor), (2, 2));
+    end(&mut s).unwrap();
+
+    let (mut s, id) = setup("");
+    begin(&mut s, id, Some(0), false).unwrap();
+    let ime = ime_surrounding(&s).unwrap();
+    assert_eq!((ime.text.as_str(), ime.cursor, ime.anchor), ("", 0, 0), "an empty layer is available, not unavailable");
+}
+
+/// Asserts surrounding text is capped at `MAX_IME_SURROUNDING_BYTES`, an exactly budget-sized
+/// selection is describable, and one byte more is `SelectionTooWide`.
+#[test]
+fn ime_surrounding_is_bounded_and_a_too_wide_selection_is_explicitly_unavailable() {
+    let long = "a".repeat(5000);
+    let (mut s, id) = setup(&long);
+    begin(&mut s, id, Some(5000), false).unwrap();
+    let ime = ime_surrounding(&s).unwrap();
+    assert_eq!(ime.text.len(), MAX_IME_SURROUNDING_BYTES);
+    assert_eq!((ime.cursor, ime.anchor), (MAX_IME_SURROUNDING_BYTES, MAX_IME_SURROUNDING_BYTES));
+
+    // Exactly the budget is still describable; one more byte is not.
+    set_caret(&mut s, 1000, false).unwrap();
+    set_caret(&mut s, 5000, true).unwrap();
+    let ime = ime_surrounding(&s).unwrap();
+    assert_eq!(ime.text.len(), 4000);
+    assert_eq!((ime.cursor, ime.anchor), (4000, 0));
+    set_caret(&mut s, 999, false).unwrap();
+    set_caret(&mut s, 5000, true).unwrap();
+    assert_eq!(ime_surrounding(&s), Err(ImeSurroundingUnavailable::SelectionTooWide));
+}
+
+/// Asserts edits and caret moves keep the same IME owner, while ending and beginning a new
+/// edit session changes the generation.
+#[test]
+fn ime_owner_is_stable_through_edits_and_the_session_changes_on_begin() {
+    let (mut s, id) = setup("Hello");
+    begin(&mut s, id, Some(0), false).unwrap();
+    let first = ime_surrounding(&s).unwrap().owner;
+    insert(&mut s, "x").unwrap();
+    set_caret(&mut s, 2, false).unwrap();
+    assert_eq!(ime_surrounding(&s).unwrap().owner, first, "edits and caret moves keep the owner");
+    end(&mut s).unwrap();
+    begin(&mut s, id, Some(0), false).unwrap();
+    let replaced = ime_surrounding(&s).unwrap().owner;
+    assert_eq!(replaced.node, id);
+    assert_ne!(replaced.editing_session, first.editing_session, "a new edit session is a replacement epoch");
+}
+
+/// Asserts byte deletion around a reversed selection removes whole characters on both
+/// sides, keeps the selected text and direction, and a final no-op leaves the text alone.
+#[test]
+fn ime_delete_surrounding_bytes_keeps_the_reversed_selection_and_deletes_around_it() {
+    let (mut s, id) = setup("ab你好cd");
+    begin(&mut s, id, Some(4), false).unwrap();
+    set_caret(&mut s, 4, false).unwrap();
+    set_caret(&mut s, 2, true).unwrap(); // reversed: caret before 你, anchor after 好
+    assert!(delete_surrounding_bytes(&mut s, 1, 1).unwrap());
+    // "b" (whole character before the selection) and "c" (whole character after it) go; the
+    // selected "你好" stays for the paired commit, and the reversed direction is preserved.
+    assert_eq!(data(&s, id).characters, "a你好d");
+    assert_eq!(sel(&s), (3, 1)); // (anchor, caret), still reversed
+    assert!(delete_surrounding_bytes(&mut s, 1, 1).unwrap());
+    assert_eq!(data(&s, id).characters, "你好");
+    assert_eq!(sel(&s), (2, 0)); // (anchor, caret), still reversed
+    assert!(!delete_surrounding_bytes(&mut s, 1, 1).unwrap(), "nothing is left around the selection");
+    assert_eq!(data(&s, id).characters, "你好", "a no-op delete does not touch the text");
+}
+
+/// Asserts character deletion keeps and shifts the selection, and a no-op delete leaves an
+/// active composition and the revision untouched.
+#[test]
+fn ime_delete_surrounding_chars_keeps_the_selection_and_ignores_a_no_op() {
+    let (mut s, id) = setup("ab你好cd");
+    begin(&mut s, id, Some(2), false).unwrap();
+    set_caret(&mut s, 4, true).unwrap(); // "你好"
+    assert!(delete_surrounding_chars(&mut s, 1, 1).unwrap());
+    assert_eq!(data(&s, id).characters, "a你好d");
+    assert_eq!(sel(&s), (1, 3), "the selection is kept, shifted by the deleted prefix");
+    set_caret(&mut s, 0, false).unwrap();
+    // A composition in progress survives a delete that finds nothing to remove.
+    preedit(&mut s, "x", None).unwrap();
+    let revision = s.ds().unwrap().revision;
+    assert!(!delete_surrounding_chars(&mut s, 1, 0).unwrap());
+    assert_eq!(s.ds().unwrap().text_edit.as_ref().and_then(|te| te.preedit.as_ref()).map(|p| p.text.as_str()), Some("x"));
+    assert_eq!(s.ds().unwrap().revision, revision, "a no-op does not bump the revision");
+    assert!(!delete_surrounding_bytes(&mut s, 1, 0).unwrap());
+    assert_eq!(s.ds().unwrap().text_edit.as_ref().and_then(|te| te.preedit.as_ref()).map(|p| p.text.as_str()), Some("x"));
+    assert_eq!(s.ds().unwrap().revision, revision);
+}
+
+/// Asserts a text layer in another document has a different IME owner.
+#[test]
+fn ime_owner_identity_changes_with_the_document() {
+    let (mut s, id) = setup("Hi");
+    begin(&mut s, id, Some(2), false).unwrap();
+    let first = ime_surrounding(&s).unwrap().owner;
+    end(&mut s).unwrap();
+    s.execute("file.new", &json!({"name": "Second"})).unwrap();
+    let r = s.execute("text.create", &json!({"text": "There", "x": 0, "y": 0})).unwrap();
+    let other = crate::params::id_of(&r["id"]).unwrap();
+    begin(&mut s, other, Some(5), false).unwrap();
+    let second = ime_surrounding(&s).unwrap().owner;
+    assert_ne!(second.document, first.document, "another document is another IME owner");
+    assert_eq!(second.node, other);
+}
+
+/// Asserts a space committed after a line-start `-` becomes a bulleted list and reports
+/// `Transformed`; a plain `"x"` commit reports `Plain`, and an empty commit reports `Nothing`.
+#[test]
+fn ime_commit_reports_list_autoformat_as_an_application_transformation() {
+    let (mut s, id) = setup("-");
+    begin(&mut s, id, Some(1), false).unwrap();
+    assert_eq!(insert_ime_commit(&mut s, " ").unwrap(), ImeInsertion::Transformed);
+    assert_eq!(data(&s, id).characters, "");
+    assert_eq!(data(&s, id).para_list(0).list, ListStyle::Bulleted);
+    assert_eq!(insert_ime_commit(&mut s, "x").unwrap(), ImeInsertion::Plain);
+    assert_eq!(insert_ime_commit(&mut s, "").unwrap(), ImeInsertion::Nothing);
+}
+
+/// Asserts CRLF normalization reports `Transformed`, control-only input reports `Nothing`,
+/// and bare newline/CR commits are ignored while a live composition remains.
+#[test]
+fn ime_commit_normalisation_is_a_transformation_and_a_bare_newline_is_ignored() {
+    let (mut s, id) = setup("Hi");
+    begin(&mut s, id, Some(2), false).unwrap();
+    // CRLF is inserted as LF, but the editor changed the commit: application-origin.
+    assert_eq!(insert_ime_commit(&mut s, "a\r\nb").unwrap(), ImeInsertion::Transformed);
+    assert_eq!(data(&s, id).characters, "Hia\nb");
+    // Control characters are dropped; the commit itself is a no-op.
+    assert_eq!(insert_ime_commit(&mut s, "\u{0}\u{7}").unwrap(), ImeInsertion::Nothing);
+    assert_eq!(data(&s, id).characters, "Hia\nb");
+    // Stock `TextEdit` ignores a bare newline/CR commit; typing Enter still inserts one.
+    // (It also leaves a live composition alone, unlike the non-ignored commit below.)
+    preedit(&mut s, "x", None).unwrap();
+    assert_eq!(insert_ime_commit(&mut s, "\n").unwrap(), ImeInsertion::Nothing);
+    assert_eq!(insert_ime_commit(&mut s, "\r").unwrap(), ImeInsertion::Nothing);
+    assert_eq!(preedit_state(&s).map(|p| p.text), Some("x".into()));
+    preedit(&mut s, "", None).unwrap();
+    assert_eq!(data(&s, id).characters, "Hia\nb");
+    insert(&mut s, "\n").unwrap();
+    assert_eq!(data(&s, id).characters, "Hia\nb\n");
+}
+
+/// Asserts an empty or control-only IME commit ends a live composition (bumping the revision
+/// once), inserts nothing, and is a harmless no-op when no composition is active.
+#[test]
+fn an_empty_ime_commit_ends_the_composition_without_inserting_text() {
+    let (mut s, id) = setup("Hello");
+    begin(&mut s, id, Some(5), false).unwrap();
+    preedit(&mut s, "にほ", None).unwrap();
+    assert_eq!(preedit_state(&s).map(|p| p.text), Some("にほ".into()));
+    let revision = s.ds().unwrap().revision;
+    assert_eq!(insert_ime_commit(&mut s, "").unwrap(), ImeInsertion::Nothing);
+    assert_eq!(s.ds().unwrap().revision, revision + 1, "ending a live composition bumps the revision");
+    assert!(preedit_state(&s).is_none(), "an empty commit ends the composition");
+    assert!(preedit_doc(&s).is_none());
+    assert_eq!(data(&s, id).characters, "Hello", "and inserts nothing");
+
+    // A control-only commit normalises to empty and ends the composition too.
+    preedit(&mut s, "x", None).unwrap();
+    let revision = s.ds().unwrap().revision;
+    assert_eq!(insert_ime_commit(&mut s, "\u{0}\u{7}").unwrap(), ImeInsertion::Nothing);
+    assert_eq!(s.ds().unwrap().revision, revision + 1, "clearing a live composition bumps the revision");
+    assert!(preedit_state(&s).is_none());
+    assert_eq!(data(&s, id).characters, "Hello");
+
+    // With no composition (and not even while editing) an empty commit stays a harmless no-op.
+    let revision = s.ds().unwrap().revision;
+    assert_eq!(insert_ime_commit(&mut s, "").unwrap(), ImeInsertion::Nothing);
+    assert_eq!(s.ds().unwrap().revision, revision);
+    end(&mut s).unwrap();
+    assert_eq!(insert_ime_commit(&mut s, "").unwrap(), ImeInsertion::Nothing);
+}
diff --git a/crates/engine/src/textpreview.rs b/crates/engine/src/canvas/textpreview.rs
similarity index 92%
rename from crates/engine/src/textpreview.rs
rename to crates/engine/src/canvas/textpreview.rs
index 507eccc3..da101d5e 100644
--- a/crates/engine/src/textpreview.rs
+++ b/crates/engine/src/canvas/textpreview.rs
@@ -1,6 +1,6 @@
 //! Live text previews: what a text command would do, shown on the canvas without an undo step —
-//! while the pointer is over a text style in the style browser or a font's named instance, or
-//! while a variable font axis slider is dragged. The document under the preview is kept and comes
+//! while the pointer is over a font family or style, a text style in the style browser or a
+//! font's named instance, or while a variable font axis slider is dragged. The document under the preview is kept and comes
 //! back when the preview ends ([`end`], `text.endPreview`). Every other command ends it first, so
 //! committing (running the command for real) applies to the document itself as one undo step, and
 //! Escape just ends the preview.
diff --git a/crates/engine/src/canvas/tools.rs b/crates/engine/src/canvas/tools.rs
new file mode 100644
index 00000000..fce14f7c
--- /dev/null
+++ b/crates/engine/src/canvas/tools.rs
@@ -0,0 +1,578 @@
+//! Pointer tools. The UI (or an agent through the control channel) feeds [`PointerEvent`]s in page
+//! coordinates; tools turn gestures into document edits through interactions (one undo step per
+//! gesture) and publish overlay hints (marquee, guides, size label, cursor) for the canvas.
+
+use std::collections::BTreeMap;
+
+use figcraft_color::{ImageScaleMode, PaintKind};
+use figcraft_doc::geometry::select_target;
+use figcraft_doc::*;
+use figcraft_geom::{Affine, Point, Rect, Vec2};
+use serde::Serialize;
+use serde_json::json;
+
+use crate::arc_handles::{ArcHandle, ArcHint};
+use crate::cmd::arrange::move_world;
+use crate::cmd::create::frame_at;
+use crate::cmd::edit::roots;
+use crate::shape_handles::{ShapeHandle, ShapeHint};
+use crate::snap::{Guide, Targets};
+use crate::{Result, Session, textedit};
+
+mod click;
+mod drag;
+mod draw;
+mod handles;
+mod keys;
+mod pen;
+mod pointer;
+
+use handles::DRAG_SLOP_PX;
+#[cfg(test)]
+pub(crate) use handles::scale_factor;
+pub use handles::{
+    PENCIL_STROKE, SMALL_BOX_PX, anchor_name, anchor_of, box_sides_px, handle_at, handle_at_corners, label_at, locked_in, scale_anchor_point,
+    selection_box, selection_frame,
+};
+pub(crate) use handles::{SNAP_PX, handle_cursor, readable_text_fills, resized_box};
+#[cfg(test)]
+pub(crate) use pen::pressure_profile;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Default)]
+pub enum ToolId {
+    #[default]
+    Move,
+    Scale,
+    Hand,
+    Frame,
+    Section,
+    Slice,
+    Rectangle,
+    Line,
+    Arrow,
+    Ellipse,
+    Polygon,
+    Star,
+    Pen,
+    Pencil,
+    Text,
+    TextOnPath,
+    Comment,
+    Eyedropper,
+    ShapeBuilder,
+    // Board tools.
+    Sticky,
+    BoardShape,
+    Connector,
+    Marker,
+    Highlighter,
+    Eraser,
+    Stamp,
+}
+
+impl ToolId {
+    pub const ALL: [ToolId; 26] = [
+        ToolId::Move,
+        ToolId::Scale,
+        ToolId::Hand,
+        ToolId::Frame,
+        ToolId::Section,
+        ToolId::Slice,
+        ToolId::Rectangle,
+        ToolId::Line,
+        ToolId::Arrow,
+        ToolId::Ellipse,
+        ToolId::Polygon,
+        ToolId::Star,
+        ToolId::Pen,
+        ToolId::Pencil,
+        ToolId::Text,
+        ToolId::TextOnPath,
+        ToolId::Comment,
+        ToolId::Eyedropper,
+        ToolId::ShapeBuilder,
+        ToolId::Sticky,
+        ToolId::BoardShape,
+        ToolId::Connector,
+        ToolId::Marker,
+        ToolId::Highlighter,
+        ToolId::Eraser,
+        ToolId::Stamp,
+    ];
+    pub fn id(self) -> &'static str {
+        match self {
+            ToolId::Move => "move",
+            ToolId::Scale => "scale",
+            ToolId::Hand => "hand",
+            ToolId::Frame => "frame",
+            ToolId::Section => "section",
+            ToolId::Slice => "slice",
+            ToolId::Rectangle => "rectangle",
+            ToolId::Line => "line",
+            ToolId::Arrow => "arrow",
+            ToolId::Ellipse => "ellipse",
+            ToolId::Polygon => "polygon",
+            ToolId::Star => "star",
+            ToolId::Pen => "pen",
+            ToolId::Pencil => "pencil",
+            ToolId::Text => "text",
+            ToolId::TextOnPath => "textOnPath",
+            ToolId::Comment => "comment",
+            ToolId::Eyedropper => "eyedropper",
+            ToolId::ShapeBuilder => "shapeBuilder",
+            ToolId::Sticky => "sticky",
+            ToolId::BoardShape => "shape",
+            ToolId::Connector => "connector",
+            ToolId::Marker => "marker",
+            ToolId::Highlighter => "highlighter",
+            ToolId::Eraser => "eraser",
+            ToolId::Stamp => "stamp",
+        }
+    }
+    pub fn from_id(s: &str) -> Option<ToolId> {
+        ToolId::ALL.into_iter().find(|t| t.id().eq_ignore_ascii_case(s))
+    }
+    pub fn label(self) -> &'static str {
+        match self {
+            ToolId::Move => "Move",
+            ToolId::Scale => "Scale",
+            ToolId::Hand => "Hand tool",
+            ToolId::Frame => "Frame",
+            ToolId::Section => "Section",
+            ToolId::Slice => "Slice",
+            ToolId::Rectangle => "Rectangle",
+            ToolId::Line => "Line",
+            ToolId::Arrow => "Arrow",
+            ToolId::Ellipse => "Ellipse",
+            ToolId::Polygon => "Polygon",
+            ToolId::Star => "Star",
+            ToolId::Pen => "Pen",
+            ToolId::Pencil => "Pencil",
+            ToolId::Text => "Text",
+            ToolId::TextOnPath => "Text on a path",
+            ToolId::Comment => "Comment",
+            ToolId::Eyedropper => "Pick color",
+            ToolId::ShapeBuilder => "Shape builder",
+            ToolId::Sticky => "Sticky note",
+            ToolId::BoardShape => "Shapes",
+            ToolId::Connector => "Connector",
+            ToolId::Marker => "Marker",
+            ToolId::Highlighter => "Highlighter",
+            ToolId::Eraser => "Eraser",
+            ToolId::Stamp => "Stamp",
+        }
+    }
+
+    /// The tools of a board's toolbar (a design file's toolbar has the others).
+    pub fn on_boards(self) -> bool {
+        matches!(
+            self,
+            ToolId::Sticky | ToolId::BoardShape | ToolId::Connector | ToolId::Marker | ToolId::Highlighter | ToolId::Eraser | ToolId::Stamp
+        )
+    }
+    /// The tool's key (from [`crate::keymap`]; empty when it has none).
+    pub fn shortcut(self) -> &'static str {
+        let id = self.id();
+        crate::keymap::KEYS
+            .iter()
+            .find(|b| if self == ToolId::Eyedropper { b.id == "edit.pickColor" } else { b.id.strip_prefix("tool.") == Some(id) })
+            .and_then(|b| b.keys(crate::keymap::Platform::current()).first().copied())
+            .unwrap_or("")
+    }
+
+    /// The size a click (or Enter, `tool.place`) makes with a shape or frame tool.
+    pub fn click_size(self) -> (f64, f64) {
+        match self {
+            ToolId::Line | ToolId::Arrow => (100.0, 0.0),
+            ToolId::Section => (400.0, 300.0),
+            _ => (100.0, 100.0),
+        }
+    }
+
+    pub fn draws_shape(self) -> bool {
+        matches!(
+            self,
+            ToolId::Frame
+                | ToolId::Section
+                | ToolId::Slice
+                | ToolId::Rectangle
+                | ToolId::Ellipse
+                | ToolId::Polygon
+                | ToolId::Star
+                | ToolId::Line
+                | ToolId::Arrow
+        )
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
+pub enum PointerKind {
+    Down,
+    Move,
+    Up,
+    /// Pointer moved without a button.
+    Hover,
+    DoubleClick,
+}
+
+/// A pointer event in page coordinates (and screen coordinates for panning).
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub struct PointerEvent {
+    pub kind: PointerKind,
+    pub x: f64,
+    pub y: f64,
+    /// Screen position (logical pixels).
+    pub sx: f64,
+    pub sy: f64,
+    pub shift: bool,
+    pub alt: bool,
+    /// Cmd on macOS, Ctrl elsewhere.
+    pub cmd: bool,
+    pub ctrl: bool,
+    /// Screen pixels per page unit.
+    pub zoom: f64,
+    /// Pen pressure, 0..1, where the device reports it (`None`: a mouse, or a platform that doesn't).
+    pub pressure: Option<f32>,
+}
+
+/// The pointer is still within [`DRAG_SLOP_PX`] of where it was pressed.
+fn within_slop(ev: &PointerEvent, start: Point) -> bool {
+    (ev.p() - start).hypot() * ev.zoom.max(1e-6) < DRAG_SLOP_PX
+}
+
+impl PointerEvent {
+    pub fn at(kind: PointerKind, x: f64, y: f64, zoom: f64) -> Self {
+        Self { kind, x, y, sx: x * zoom, sy: y * zoom, shift: false, alt: false, cmd: false, ctrl: false, zoom, pressure: None }
+    }
+    pub(crate) fn p(&self) -> Point {
+        Point::new(self.x, self.y)
+    }
+    fn tol(&self) -> f64 {
+        1.0 / self.zoom.max(1e-6)
+    }
+}
+
+/// Cursor hint for the UI.
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Default)]
+pub enum Cursor {
+    #[default]
+    Default,
+    Crosshair,
+    Move,
+    /// Resize along an angle (degrees, 0 = horizontal).
+    Resize(f64),
+    /// Rotate, turned to the corner it is near: the direction from the box's centre to the corner
+    /// (while rotating: to the pointer), in degrees, 0 = right and 90 = down.
+    Rotate(f64),
+    Grab,
+    Grabbing,
+    Text,
+    Pen(PenCursor),
+    /// A drag here makes a copy (Alt).
+    Copy,
+    /// Over a clickable part of a widget.
+    Pointer,
+    Eyedropper,
+    Comment,
+    /// What the gesture is doing will be undone when it ends (an edit only a main component can
+    /// make).
+    NotAllowed,
+}
+
+/// What a click with the pen would do.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Default)]
+pub enum PenCursor {
+    /// A new point.
+    #[default]
+    New,
+    /// On a point: closes the path, connects to the point or goes on from it.
+    Close,
+    /// On a segment: adds a point there.
+    Add,
+    /// Bends the segment or the point's handles (the Bend tool; Cmd/Ctrl in vector edit mode).
+    Bend,
+}
+
+impl ToolId {
+    /// The tool's cursor over empty canvas.
+    pub fn cursor(self) -> Cursor {
+        match self {
+            ToolId::Hand => Cursor::Grab,
+            ToolId::Pen => Cursor::Pen(PenCursor::New),
+            ToolId::Comment => Cursor::Comment,
+            ToolId::Eyedropper => Cursor::Eyedropper,
+            // Text on a path acts only over a path, where it shows the I-beam.
+            ToolId::Move | ToolId::Scale | ToolId::TextOnPath => Cursor::Default,
+            // The other tools make something where they are pressed: shapes, frames, slices, pencil
+            // strokes, a new text (over a text the Text tool shows the I-beam instead).
+            _ => Cursor::Crosshair,
+        }
+    }
+}
+
+/// Selection handle kinds: corners (0 tl, 1 tr, 2 br, 3 bl), edges (0 t, 1 r, 2 b, 3 l) and the
+/// rotation zones outside the corners.
+#[derive(Clone, Copy, Debug, PartialEq, Serialize)]
+pub enum Handle {
+    Corner(u8),
+    Edge(u8),
+    Rotate(u8),
+}
+
+/// What the canvas should draw on top of the scene.
+#[derive(Clone, Debug, Default, Serialize)]
+pub struct Overlay {
+    pub marquee: Option<[f64; 4]>,
+    pub guides: Vec<Guide>,
+    pub cursor: Cursor,
+    /// Pen tool: the in-progress path's anchor points and the rubber band to the pointer.
+    pub pen: Vec<[f64; 2]>,
+    pub rubber: Option<[f64; 4]>,
+    /// Pen tool: the handles shaping the segments at the pen (anchor x, y, handle x, y): the last
+    /// anchor's in and out handles and the one before's out handle.
+    pub pen_handles: Vec<[f64; 4]>,
+    /// Pen tool: where the last anchor's out handle ends, when it has one: the rubber band is the
+    /// curve a click would make, leaving along it.
+    pub rubber_handle: Option<[f64; 2]>,
+    /// Frame/section the pointer is drawing or dropping into (highlighted).
+    pub drop_target: Option<NodeId>,
+    /// Auto layout insertion indicator (x0, y0, x1, y1).
+    pub insert_line: Option<[f64; 4]>,
+    /// The instance an Alt-drop of a component from the Assets panel would swap (highlighted).
+    pub swap_target: Option<NodeId>,
+    /// Auto layout grid cell a drag would drop into (x0, y0, x1, y1).
+    pub drop_cell: Option<[f64; 4]>,
+    /// Vector edit mode: what the pointer is over, the lasso being drawn and the closed area the
+    /// paint bucket would fill (page-space polygons).
+    pub vector_hover: Option<crate::vectoredit::VHit>,
+    /// The edited layer `vector_hover` is on (several layers can be in edit mode).
+    pub vector_hover_on: Option<NodeId>,
+    /// Vector edit mode: the point a press on the outline would add (the pen's ghost anchor where
+    /// it is over a segment, or the midpoint of the segment under the Move tool).
+    pub vector_add: Option<VectorAdd>,
+    /// Vector edit mode, Variable width tool: the width point, handle or path under the pointer.
+    pub width_hover: Option<crate::vectoredit::WHit>,
+    pub lasso: Vec<[f64; 2]>,
+    /// The eraser brush under the pointer (x, y, radius in page units).
+    pub brush: Option<[f64; 3]>,
+    pub face: Vec<Vec<[f64; 2]>>,
+    /// Shape builder: the regions under the pointer or collected by the drag (indexes into
+    /// [`crate::shapebuilder::current`]) and whether releasing removes them.
+    pub builder_regions: Vec<usize>,
+    pub builder_remove: bool,
+    /// Measuring (Alt): the box of the layer or frame measured to (x0, y0, x1, y1), outlined.
+    pub measure_box: Option<[f64; 4]>,
+    /// Scale tool drag: the factor so far and the point that stays put.
+    pub scale: Option<ScaleHint>,
+    /// The selected ellipse's arc handle under the pointer, and the readout while one is dragged
+    /// (see [`crate::arc_handles`]).
+    pub arc_hover: Option<ArcHandle>,
+    pub arc: Option<ArcHint>,
+    /// The selected shape's corner radius or star ratio handle under the pointer, and the readout
+    /// while one is dragged (see [`crate::shape_handles`]).
+    pub shape_hover: Option<ShapeHandle>,
+    pub shape: Option<ShapeHint>,
+}
+
+/// A point a press would add to the edited vector's outline: page position, whether it is a
+/// segment's midpoint (the Move tool) rather than the pen's place on its segment, and whether the
+/// pointer is on it (a press adds it; otherwise it just shows where one would go).
+#[derive(Clone, Copy, Debug, PartialEq, Serialize)]
+pub struct VectorAdd {
+    pub at: [f64; 2],
+    pub midpoint: bool,
+    pub on: bool,
+}
+
+/// The Scale tool's live readout while dragging a handle.
+#[derive(Clone, Copy, Debug, PartialEq, Serialize)]
+pub struct ScaleHint {
+    pub factor: f64,
+    pub pivot: [f64; 2],
+}
+
+#[derive(Clone, Debug)]
+pub(crate) struct ResizeStart {
+    /// Node id → (world transform, w, h) at the start.
+    nodes: Vec<(NodeId, Affine, f64, f64)>,
+    /// The handle box: page transform of its top-left corner (axes along the box) and its size.
+    frame: (Affine, f64, f64),
+    /// One layer (resized in place) rather than several (mapped from the old box to the new).
+    single: bool,
+    handle: Handle,
+}
+
+#[derive(Clone, Debug, Default)]
+pub(crate) enum Gesture {
+    #[default]
+    None,
+    Marquee {
+        start: Point,
+        /// Shift: toggle what it touches in the selection it started from (`base`).
+        additive: bool,
+        base: Vec<NodeId>,
+        within: Option<NodeId>,
+    },
+    Move {
+        start: Point,
+        ids: Vec<NodeId>,
+        targets: Targets,
+        duplicate: bool,
+        moved: bool,
+        /// A Shift-press on this selected layer: it leaves the selection on release, unless the
+        /// press became a drag.
+        deselect: Option<NodeId>,
+    },
+    Resize {
+        start: Point,
+        r: Box<ResizeStart>,
+        scale_tool: bool,
+        moved: bool,
+    },
+    Rotate {
+        center: Point,
+        start_angle: f64,
+        ids: Vec<NodeId>,
+    },
+    Draw {
+        start: Point,
+        id: Option<NodeId>,
+        parent: NodeId,
+        targets: Targets,
+    },
+    Pan {
+        sx: f64,
+        sy: f64,
+        cx: f64,
+        cy: f64,
+    },
+    Pencil {
+        points: Vec<Point>,
+        /// The pen pressure at each point, where the device reports it.
+        pressure: Vec<Option<f32>>,
+    },
+    TextSelect {
+        id: NodeId,
+    },
+    /// A new text from the Text tool, still pressed: a drag makes it a box the size of the drag
+    /// (at least `line`, the height of its first line, tall).
+    TextBox {
+        id: NodeId,
+        start: Point,
+        line: f64,
+    },
+    PenDrag {
+        anchor: Point,
+    },
+    /// Vector edit mode gestures (handled in `vectoredit`).
+    Vector(crate::vectoredit::VGesture),
+    /// Dragging an ellipse's arc handle: the arc so far (see [`crate::arc_handles`]).
+    Arc {
+        id: NodeId,
+        handle: ArcHandle,
+        arc: crate::arc_handles::Arc,
+    },
+    /// Dragging a shape's corner radius or star ratio handle (see [`crate::shape_handles`]).
+    Shape {
+        id: NodeId,
+        handle: ShapeHandle,
+    },
+    /// Dragging the rotation origin handle (see [`crate::rotation_origin`]).
+    Origin,
+    /// The connector tool: dragging from `from` (pressed at `start`).
+    Connect {
+        from: figcraft_doc::End,
+        start: Point,
+    },
+    /// Dragging the selected connector `id`'s end (`from`: its start, pressed at `start`) to
+    /// attach it elsewhere.
+    Reattach {
+        id: NodeId,
+        from: bool,
+        start: Point,
+    },
+    /// The eraser: the strokes it took so far.
+    Erase {
+        gone: Vec<NodeId>,
+    },
+    /// Shape builder: regions collected so far (handled in `shapebuilder`).
+    ShapeBuild {
+        picked: Vec<usize>,
+        remove: bool,
+        start: Point,
+        last: Point,
+    },
+}
+
+/// Where Shift puts the Pen's next point: as far from `last` as `p` is, at the nearest 45° step.
+fn at_45_degrees(last: Point, p: Point) -> Point {
+    let v = p - last;
+    let ang = (v.atan2() / (std::f64::consts::PI / 4.0)).round() * std::f64::consts::PI / 4.0;
+    last + Vec2::from_angle(ang) * v.hypot()
+}
+
+/// The handles a pen path shows while it is drawn ([`Overlay::pen_handles`]): the last anchor's in
+/// and out handles and the one before's out handle, those that aren't zero.
+fn pen_handles(points: &[(Point, Vec2, Vec2)]) -> Vec<[f64; 4]> {
+    let last = points.last().into_iter().flat_map(|(p, i, o)| [(p, i), (p, o)]);
+    let before = points.len().checked_sub(2).and_then(|k| points.get(k)).into_iter().map(|(p, _, o)| (p, o));
+    before.chain(last).filter(|(_, h)| h.hypot() > 0.0).map(|(p, h)| [p.x, p.y, p.x + h.x, p.y + h.y]).collect()
+}
+
+/// The pen tool's in-progress path (page coordinates).
+#[derive(Clone, Debug, Default)]
+pub struct PenPath {
+    pub id: Option<NodeId>,
+    pub parent: Option<NodeId>,
+    /// Anchors with (in, out) handle offsets.
+    pub points: Vec<(Point, Vec2, Vec2)>,
+    pub closed: bool,
+    /// The path ends connected to this anchor of its own (a vector network).
+    pub join: Option<usize>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct ToolState {
+    pub tool: ToolId,
+    pub(crate) gesture: Gesture,
+    pub overlay: Overlay,
+    pub pen: Option<PenPath>,
+    /// Tool to return to after a temporary tool (space → hand).
+    pub temp_from: Option<ToolId>,
+    /// Last click (for double-click detection by agents that only send downs).
+    pub last_hover: Option<NodeId>,
+    /// Shape builder: the cached arrangement of the selection, and Remove mode (a plain click
+    /// removes; Alt merges).
+    pub shape_builder: Option<std::sync::Arc<crate::shapebuilder::Arrangement>>,
+    pub builder_remove: bool,
+    /// Dev Mode: the canvas inspects. Hovering shows distances from the selection without Alt, and
+    /// presses select, pan and comment but never edit the design (no moving, resizing, drawing,
+    /// or editing text or vectors).
+    pub dev_mode: bool,
+    /// Pen snap targets, kept while hovering (see `vectoredit::point_snap`).
+    pub(crate) pen_targets: Option<crate::vectoredit::point_snap::PenTargets>,
+    /// The Scale tool's anchor: column and row (0 start, 1 middle, 2 end) of the point of the
+    /// selection box that stays put (`tool.scaleAnchor`).
+    pub scale_anchor: (u8, u8),
+    /// The last drag move handled (a held button repeats it every frame).
+    pub(crate) last_move: Option<PointerEvent>,
+    /// The name labels of top-level frames and sections as the canvas last drew them (each label's
+    /// corners on the page, turned with its frame): the Move and Scale tools treat a press or
+    /// hover on one as on its frame.
+    pub labels: Vec<(NodeId, [Point; 4])>,
+    /// The brush the Pencil draws with (`tool.pencilBrush`; `None`: a plain stroke).
+    pub pencil_brush: Option<figcraft_doc::Brush>,
+    /// The board tools' colours and choices.
+    pub board: crate::board::BoardTool,
+    /// The eyedropper samples for a colour picker (`edit.pickColor` with `apply: false`): the
+    /// colour goes to `picked`, for the picker to write to the paint it edits, not to the fill.
+    pub pick_only: bool,
+    /// The colour the eyedropper sampled for a colour picker, until the picker takes it.
+    pub picked: Option<figcraft_color::Color>,
+}
+
+impl ToolState {
+    pub fn busy(&self) -> bool {
+        !matches!(self.gesture, Gesture::None)
+    }
+}
diff --git a/crates/engine/src/canvas/tools/click.rs b/crates/engine/src/canvas/tools/click.rs
new file mode 100644
index 00000000..8f21aaca
--- /dev/null
+++ b/crates/engine/src/canvas/tools/click.rs
@@ -0,0 +1,344 @@
+use super::handles::{PATH_REACH_PX, label_at, locked_in, path_candidates, readable_text_fills};
+use super::*;
+
+impl Session {
+    /// Handle a double-click gesture: finish a pen path, rename or click labels/widgets,
+    /// cancel an in-progress move/resize/draw/marquee, handle board double-clicks, enter text
+    /// editing (select-all on entry, word-select inside the running edit), enter vector editing
+    /// for selected shapes, and step groups/frames one level deeper.
+    /// A double-click on `leaf` that a board object or a widget's editable field takes (typing into
+    /// a sticky or a shape on a board; editing the field like any text, its plugin told when editing
+    /// ends). Whether it was taken.
+    fn object_double_click(&mut self, doc: &Document, leaf: NodeId, sel: &[NodeId], p: Point, edits: bool) -> Result<bool> {
+        if matches!(self.tool.tool, ToolId::Move | ToolId::Scale) && self.board_double_click(doc, leaf, sel)? {
+            return Ok(true);
+        }
+        match crate::widgets::field_at(doc, leaf, p).filter(|_| edits) {
+            Some(field) => textedit::begin(self, field, None, false).map(|()| true),
+            None => Ok(false),
+        }
+    }
+
+    pub(super) fn double_click(&mut self, ev: &PointerEvent) -> Result<()> {
+        let ds = self.ds()?;
+        let (doc, sel, page) = (ds.doc.clone(), ds.selection.clone(), ds.page);
+        if self.tool.tool == ToolId::Pen {
+            return self.pen_finish();
+        }
+        let edits = !self.tool.dev_mode;
+        // A frame's or section's name label: rename it there (the canvas puts a field over it).
+        // Labels come before widgets, as on a press; the second press began a move: undo it.
+        if edits
+            && matches!(self.tool.tool, ToolId::Move | ToolId::Scale)
+            && !(ev.shift || ev.cmd || ev.alt)
+            && let Some(id) = label_at(&doc, page, &self.tool.labels, ev.p())
+        {
+            self.tool.gesture = Gesture::None;
+            self.cancel_interaction()?;
+            if sel != [id] {
+                self.set_selection(vec![id]);
+            }
+            self.request_ui("canvas.renameLabel", serde_json::json!({"id": id}));
+            return Ok(());
+        }
+        // Quick clicks on a widget's clickable part are clicks, one by one.
+        if edits
+            && matches!(self.tool.tool, ToolId::Move | ToolId::Scale)
+            && !(ev.shift || ev.cmd || ev.alt)
+            && self.hit(&doc, page, ev.p(), ev.tol() * 2.0).and_then(|hit| crate::widgets::target_at(&doc, hit, ev.p())).is_some()
+        {
+            self.tool.gesture = Gesture::None;
+            self.cancel_interaction()?;
+            self.widget_click(ev.p(), ev.tol() * 2.0)?;
+            return Ok(());
+        }
+        // The second press began a move, a resize, a shape or a marquee: a double-click isn't one.
+        if matches!(self.tool.gesture, Gesture::Move { .. } | Gesture::Resize { .. } | Gesture::Draw { .. } | Gesture::Marquee { .. }) {
+            self.tool.gesture = Gesture::None;
+            self.tool.overlay.marquee = None;
+            self.cancel_interaction()?;
+        }
+        let hit_here = self.hit(&doc, page, ev.p(), ev.tol() * 2.0);
+        // A double-click anywhere on the one selected shape edits its points, like Enter: also
+        // inside a hollow (unfilled) closed shape, where the hit test finds nothing under the
+        // pointer (an open path or a line has no inside: only its stroke counts).
+        if edits
+            && let [id] = sel[..]
+            && doc.node(id).is_some_and(|n| n.kind.is_shape() && figcraft_doc::geometry::is_closed(n))
+            && doc.world_bounds(id).is_some_and(|b| b.contains(ev.p()))
+            && hit_here.is_none_or(|h| h == id || doc.is_ancestor(id, h))
+        {
+            return crate::vectoredit::begin_many(self, &[id]);
+        }
+        let Some(leaf) = hit_here else { return Ok(()) };
+        if self.object_double_click(&doc, leaf, &sel, ev.p(), edits)? {
+            return Ok(());
+        }
+        let target = select_target(&doc, leaf, &sel, true);
+        // Text: edit at the click.
+        if edits
+            && doc.node(target).is_some_and(|n| matches!(n.kind, NodeKind::Text(_)))
+            && (sel.contains(&target) || select_target(&doc, leaf, &sel, false) == target)
+        {
+            // Entering a text selects all of it; in the text being edited, the word. A
+            // double-click inside the running edit is an ordinary edit: starting a new session
+            // here would replace the IME owner's epoch and drop a composition on a plain gesture.
+            let editing = self.ds()?.text_edit.as_ref().is_some_and(|te| te.id == target);
+            let idx = self.text_index_at(target, ev.p())?;
+            if editing {
+                textedit::select_word(self, idx)?;
+            } else {
+                textedit::begin(self, target, Some(idx), false)?;
+                textedit::key(self, "SelectAll", false, false, false)?;
+            }
+            return Ok(());
+        }
+        // Shapes and vectors: enter vector edit mode (every selected shape, the clicked one active).
+        // A shape clicked on its own edits even when the click that selects it and the double-click
+        // arrived in one frame (a press and a release the canvas took together), so no selection was
+        // made yet; another layer's shapes are reached one level at a time, as below.
+        if edits && doc.node(target).is_some_and(|n| n.kind.is_shape()) && (sel.contains(&target) || select_target(&doc, leaf, &sel, false) == target)
+        {
+            let mut ids = if sel.contains(&target) { crate::vectoredit::enter_targets(&doc, &sel).unwrap_or_default() } else { vec![target] };
+            ids.retain(|i| *i != target);
+            ids.insert(0, target);
+            return crate::vectoredit::begin_many(self, &ids);
+        }
+        // Groups, frames and boolean groups: select one level deeper (the layer under the pointer).
+        let deeper = figcraft_doc::geometry::enter_target(&doc, leaf, &sel);
+        if deeper != target || !sel.contains(&deeper) {
+            self.set_selection(vec![deeper]);
+        }
+        Ok(())
+    }
+
+    /// A plain click at `p` on a clickable part of a widget calls its plugin back (a failure is
+    /// shown as a message).
+    pub(super) fn widget_click(&mut self, p: Point, tol: f64) -> Result<()> {
+        let (doc, page) = (self.doc()?.clone(), self.page()?);
+        let Some((id, target)) = self.hit(&doc, page, p, tol).and_then(|hit| crate::widgets::target_at(&doc, hit, p)) else { return Ok(()) };
+        if let Err(e) = self.execute("widget.click", &serde_json::json!({"id": id, "target": target})) {
+            self.message = Some(e.to_string());
+        }
+        Ok(())
+    }
+
+    /// The char index in text node `id` at page point `p`.
+    pub fn text_index_at(&self, id: NodeId, p: Point) -> Result<usize> {
+        let doc = self.doc()?;
+        let n = doc.get(id)?;
+        let local = doc.world_transform(id).inverse() * p;
+        let Some((layout, dy)) = figcraft_text::layout_node(n) else { return Ok(0) };
+        Ok(layout.hit(local.x, local.y - dy))
+    }
+
+    pub(super) fn text_click(&mut self, id: NodeId, ev: &PointerEvent, extend: bool) -> Result<()> {
+        let idx = self.text_index_at(id, ev.p())?;
+        textedit::set_caret(self, idx, extend)?;
+        self.tool.gesture = Gesture::TextSelect { id };
+        Ok(())
+    }
+
+    pub(super) fn text_down(&mut self, ev: &PointerEvent) -> Result<()> {
+        let ds = self.ds()?;
+        let (doc, page) = (ds.doc.clone(), ds.page);
+        if let Some(te) = ds.text_edit.clone() {
+            if doc.world_bounds(te.id).is_some_and(|b| b.contains(ev.p())) {
+                return self.text_click(te.id, ev, ev.shift);
+            }
+            textedit::end(self)?;
+        }
+        // Clicking existing text edits it.
+        if let Some(leaf) = self.hit(&doc, page, ev.p(), ev.tol() * 2.0)
+            && doc.node(leaf).is_some_and(|n| matches!(n.kind, NodeKind::Text(_)))
+        {
+            let idx = self.text_index_at(leaf, ev.p())?;
+            textedit::begin(self, leaf, Some(idx), false)?;
+            self.tool.gesture = Gesture::TextSelect { id: leaf };
+            return Ok(());
+        }
+        // New text at the click (Figma puts the baseline-ish top-left there).
+        let parent = frame_at(&doc, page, ev.p(), &[]).unwrap_or(page);
+        let ds = self.ds_mut()?;
+        let d = ds.doc_mut();
+        let id = d.alloc_id();
+        let mut n = Node::new(id, NodeKind::Text(TextData::default()), "Text", 1.0, 14.0);
+        let pw = d.world_transform(parent);
+        let at = Point::new(ev.x.round(), (ev.y - 7.0).round());
+        n.transform = pw.inverse() * Affine::translate(at.to_vec2());
+        n.name = String::new();
+        if let Some(fills) = readable_text_fills(d, parent) {
+            n.fills = fills;
+        }
+        if let Some((w, h)) = figcraft_text::auto_size(&n) {
+            n.width = w.max(1.0);
+            n.height = h;
+        }
+        let line = n.height;
+        d.insert(n, parent, None)?;
+        ds.selection = vec![id];
+        textedit::begin(self, id, Some(0), true)?;
+        self.tool.gesture = Gesture::TextBox { id, start: ev.p(), line };
+        if !self.prefs.keep_tool {
+            self.tool.tool = ToolId::Move;
+        }
+        Ok(())
+    }
+
+    /// The layer whose path is under `ev` for the Text on a path tool and where along it the press
+    /// is (0..1 by length): the front-most shape or vector layer within a few screen pixels of its
+    /// first subpath (the one text follows), not locked and not inside an instance. Layers in front
+    /// whose path is further away don't hide it.
+    pub(crate) fn path_at(&self, doc: &Document, page: NodeId, ev: &PointerEvent) -> Option<(NodeId, f64)> {
+        let reach = ev.tol() * PATH_REACH_PX;
+        let near = |id: NodeId| -> Option<(NodeId, f64)> {
+            let n = doc.node(id)?;
+            let shape = matches!(
+                n.kind,
+                NodeKind::Rectangle
+                    | NodeKind::Ellipse { .. }
+                    | NodeKind::Polygon { .. }
+                    | NodeKind::Star { .. }
+                    | NodeKind::Line
+                    | NodeKind::Vector { .. }
+            );
+            if !shape || locked_in(doc, id) || crate::components::inside_instance(doc, id) {
+                return None;
+            }
+            let geom = figcraft_doc::geometry::stroke_geometry(n)?;
+            let line = figcraft_geom::measure::polylines(&geom)?.into_iter().next()?;
+            // Measured on the page (a layer scaled more one way than the other is still reached
+            // where it shows), the start by length along the layer's own path.
+            let world = doc.world_transform(id);
+            let p = ev.p();
+            let mut best: Option<(f64, f64)> = None;
+            for (i, w) in line.points.windows(2).enumerate() {
+                let (a, b) = (world * w[0], world * w[1]);
+                let d = b - a;
+                let l2 = d.hypot2();
+                let u = if l2 > 1e-18 { ((p - a).dot(d) / l2).clamp(0.0, 1.0) } else { 0.0 };
+                let dist = (a.lerp(b, u) - p).hypot();
+                if best.is_none_or(|(_, bd)| dist < bd) {
+                    let (la, lb) = (*line.lengths.get(i)?, *line.lengths.get(i + 1)?);
+                    best = Some((la + u * (lb - la), dist));
+                }
+            }
+            let (along, dist) = best?;
+            let len = line.length();
+            (len > 1e-9 && dist <= reach).then_some((id, along / len))
+        };
+        let mut candidates = Vec::new();
+        path_candidates(doc, page, ev.p(), reach, 0, &mut candidates);
+        candidates.into_iter().find_map(near)
+    }
+
+    /// A press with the Text on a path tool: on a path, a new empty text layer goes onto it,
+    /// starting where it was pressed, and typing starts. The text takes the path layer's place,
+    /// geometry, transform, constraints and effects, and its fills when one of them shows; the path
+    /// layer is removed. Ending the edit with nothing typed puts the path back without an undo step
+    /// ([`textedit::end`]). Elsewhere a press does nothing.
+    pub(super) fn text_on_path_down(&mut self, ev: &PointerEvent) -> Result<()> {
+        if let Some(te) = self.ds()?.text_edit.clone() {
+            if self.ds()?.doc.world_bounds(te.id).is_some_and(|b| b.contains(ev.p())) {
+                return self.text_click(te.id, ev, ev.shift);
+            }
+            textedit::end(self)?;
+        }
+        let ds = self.ds()?;
+        let (doc, page) = (ds.doc.clone(), ds.page);
+        let Some((path, start)) = self.path_at(&doc, page, ev) else { return Ok(()) };
+        let Some(pn) = doc.node(path) else { return Ok(()) };
+        let (Some(parent), Some(geom)) = (pn.parent, figcraft_doc::geometry::stroke_geometry(pn)) else { return Ok(()) };
+        let index = doc.index_in_parent(path);
+        self.begin_interaction("Text on a path")?;
+        let ds = self.ds_mut()?;
+        let d = ds.doc_mut();
+        let id = d.alloc_id();
+        let mut n = Node::new(id, NodeKind::Text(TextData::default()), "Text", pn.width, pn.height);
+        n.name = String::new();
+        n.transform = pn.transform;
+        n.constraints = pn.constraints;
+        n.child_layout = pn.child_layout.clone();
+        let effects = !pn.effects.is_empty();
+        if effects {
+            n.effects = pn.effects.clone();
+            n.styles.effect = pn.styles.effect.clone();
+        }
+        // A path drawn with a stroke only has no fill to give: the text gets the usual one.
+        let filled = pn.fills.iter().any(|f| f.visible);
+        if filled {
+            n.fills = pn.fills.clone();
+            n.styles.fill = pn.styles.fill.clone();
+        } else if let Some(fills) = readable_text_fills(d, parent) {
+            n.fills = fills;
+        }
+        // As `text.onPath`: a binding goes with the list it binds into (`fill`, `fills`, `fills/N/…`).
+        let carried = |k: &str| match crate::cmd::lists::list_binding(k) {
+            Some((crate::cmd::lists::BoundList::Fills, ..)) => filled,
+            Some((crate::cmd::lists::BoundList::Effects, ..)) => effects,
+            _ => false,
+        };
+        n.bound = pn.bound.iter().filter(|(k, _)| carried(k)).map(|(k, v)| (k.clone(), v.clone())).collect();
+        if let NodeKind::Text(t) = &mut n.kind {
+            let mut tp = TextPath::new(&geom);
+            tp.start = start;
+            t.path = Some(Box::new(tp));
+        }
+        d.insert(n, parent, index)?;
+        d.remove(path)?;
+        ds.selection = vec![id];
+        textedit::begin(self, id, Some(0), true)?;
+        if !self.prefs.keep_tool {
+            self.tool.tool = ToolId::Move;
+        }
+        Ok(())
+    }
+
+    /// Drag out a new text box: past the drag slop it has the drag's size (at least one line
+    /// tall) and its top-left, and that size is fixed.
+    pub(super) fn text_box_drag(&mut self, ev: &PointerEvent, id: NodeId, start: Point, line: f64) -> Result<()> {
+        if within_slop(ev, start) {
+            return Ok(());
+        }
+        let r = Rect::from_points(start, ev.p());
+        let d = self.ds_mut()?.doc_mut();
+        let pw = d.node(id).and_then(|n| n.parent).map(|p| d.world_transform(p)).unwrap_or_default();
+        let n = d.get_mut(id)?;
+        n.transform = pw.inverse() * Affine::translate((r.x0.round(), r.y0.round()));
+        n.width = r.width().round().max(1.0);
+        n.height = r.height().round().max(line);
+        n.child_layout.sizing_h = Sizing::Fixed;
+        n.child_layout.sizing_v = Sizing::Fixed;
+        if let NodeKind::Text(t) = &mut n.kind {
+            t.auto_resize = TextAutoResize::None;
+        }
+        self.ds_mut()?.revision += 1;
+        Ok(())
+    }
+
+    pub(super) fn eyedrop(&mut self, ev: &PointerEvent) -> Result<()> {
+        let ds = self.ds()?;
+        let doc = ds.doc.clone();
+        let view = figcraft_render::View { origin: (ev.x, ev.y), scale: ev.zoom.max(0.01), width: 1, height: 1 };
+        let Some(pix) = figcraft_render::render_view(&doc, ds.page, &view, &Default::default()) else { return Ok(()) };
+        let rgba = figcraft_render::to_rgba8(&pix);
+        let c = figcraft_color::Color::from_rgba8(
+            rgba.first().copied().unwrap_or(0),
+            rgba.get(1).copied().unwrap_or(0),
+            rgba.get(2).copied().unwrap_or(0),
+            255,
+        );
+        let sel = ds.selection.clone();
+        if self.tool.pick_only {
+            self.tool.picked = Some(c);
+        } else if !sel.is_empty() {
+            self.execute("node.set", &json!({"ids": sel, "props": {"fill": c.to_css_hex()}}))?;
+        }
+        self.recent_colors.retain(|x| *x != c);
+        self.recent_colors.insert(0, c);
+        self.recent_colors.truncate(16);
+        self.message = Some(format!("Picked #{}", c.to_hex()));
+        self.set_tool(ToolId::Move);
+        Ok(())
+    }
+}
diff --git a/crates/engine/src/canvas/tools/drag.rs b/crates/engine/src/canvas/tools/drag.rs
new file mode 100644
index 00000000..0d406673
--- /dev/null
+++ b/crates/engine/src/canvas/tools/drag.rs
@@ -0,0 +1,605 @@
+use super::handles::{
+    SNAP_PX, handle_at, in_quad, label_at, locked_in, on_corner_square, paints_below, resized_box, scale_factor, selection_box, selection_frame,
+    shape_hint,
+};
+use super::*;
+
+impl Session {
+    pub(super) fn move_down(&mut self, ev: &PointerEvent) -> Result<()> {
+        let ds = self.ds()?;
+        let (doc, sel, page) = (ds.doc.clone(), ds.selection.clone(), ds.page);
+        // Clicking outside the text being edited ends editing.
+        if let Some(te) = ds.text_edit.clone() {
+            let inside = doc.world_bounds(te.id).is_some_and(|b| b.inflate(ev.tol() * 4.0, ev.tol() * 4.0).contains(ev.p()));
+            if inside {
+                return self.text_click(te.id, ev, ev.shift);
+            }
+            textedit::end(self)?;
+        }
+        // Handles first: a selected connector's ends, a selected ellipse's arc handles (drawn over
+        // the box), then the box's.
+        let edits = !self.tool.dev_mode;
+        if edits && let Some((id, from)) = crate::board::end_handle_at(&doc, &sel, ev.p(), ev.zoom) {
+            self.tool.gesture = Gesture::Reattach { id, from, start: ev.p() };
+            return Ok(());
+        }
+        if self.arc_handles_shown()
+            && let Some((id, handle)) = crate::arc_handles::hit(&doc, &sel, ev.p(), ev.zoom)
+            && let Some(arc) = crate::arc_handles::arc_of(&doc, id)
+        {
+            self.begin_interaction("Arc")?;
+            self.tool.gesture = Gesture::Arc { id, handle, arc };
+            self.tool.overlay.arc =
+                crate::arc_handles::handle_at(&doc, id, handle, arc, ev.zoom).map(|at| ArcHint { handle, label: arc.label(handle), at });
+            return Ok(());
+        }
+        if self.arc_handles_shown()
+            && !on_corner_square(&doc, &sel, ev.p(), ev.zoom)
+            && let Some((id, handle)) = crate::shape_handles::hit(&doc, &sel, ev.p(), ev.zoom)
+        {
+            self.begin_interaction("Corner radius")?;
+            self.tool.gesture = Gesture::Shape { id, handle };
+            self.tool.overlay.shape = shape_hint(&doc, id, handle, ev.zoom);
+            return Ok(());
+        }
+        if let Some(h) = handle_at(&doc, &sel, ev.p(), ev.zoom).filter(|_| edits) {
+            let ids = roots(&doc, &sel);
+            if let Handle::Rotate(_) = h {
+                let Some(b) = selection_box(&doc, &ids) else { return Ok(()) };
+                let center = self
+                    .ds()?
+                    .moved_origin()
+                    .unwrap_or_else(|| Point::new(b.iter().map(|c| c.x).sum::<f64>() / 4.0, b.iter().map(|c| c.y).sum::<f64>() / 4.0));
+                self.begin_interaction("Rotate")?;
+                self.tool.gesture = Gesture::Rotate { center, start_angle: (ev.p() - center).atan2(), ids };
+                return Ok(());
+            }
+            let nodes: Vec<(NodeId, Affine, f64, f64)> =
+                ids.iter().filter_map(|i| doc.node(*i).map(|n| (*i, doc.world_transform(*i), n.width, n.height))).collect();
+            let Some(frame) = selection_frame(&doc, &ids) else { return Ok(()) };
+            let single = ids.len() == 1;
+            self.begin_interaction(if self.tool.tool == ToolId::Scale { "Scale" } else { "Resize" })?;
+            self.tool.gesture = Gesture::Resize {
+                start: ev.p(),
+                r: Box::new(ResizeStart { nodes, frame, single, handle: h }),
+                scale_tool: self.tool.tool == ToolId::Scale,
+                moved: false,
+            };
+            return Ok(());
+        }
+        // A frame's name label picks the frame itself. The background of a top-level frame with
+        // layers in it is like the canvas (a press starts a marquee inside it) unless the frame is
+        // selected; an empty frame (or a widget, or a board object such as a sticky) is picked and
+        // dragged.
+        let board_background = |leaf: NodeId| {
+            !sel.contains(&leaf)
+                && doc.node(leaf).is_some_and(|n| {
+                    n.parent == Some(page) && n.kind.is_frame_like() && !n.children.is_empty() && !crate::widgets::is_widget(n) && !n.is_board_atom()
+                })
+        };
+        let label = label_at(&doc, page, &self.tool.labels, ev.p());
+        let target = label.or_else(|| {
+            self.hit(&doc, page, ev.p(), ev.tol() * 2.0)
+                .filter(|leaf| ev.cmd || !board_background(*leaf))
+                .map(|leaf| select_target(&doc, leaf, &sel, ev.cmd))
+        });
+        // A press inside the selection's box that reaches nothing above it (an unfilled shape's
+        // inside, the frame or canvas behind it, or a layer stacked below the selected layer the
+        // press is in) drags the selection. In a gap between selected layers, what's there is hit.
+        let in_own_box = |s: NodeId| selection_box(&doc, &[s]).is_some_and(|q| in_quad(&q, ev.p()));
+        let behind_sel = |t: Option<NodeId>| {
+            t.is_none_or(|t| sel.iter().any(|s| *s != t && (doc.is_ancestor(t, *s) || (in_own_box(*s) && paints_below(&doc, t, *s)))))
+        };
+        let target = match sel.iter().copied().find(|s| !locked_in(&doc, *s)) {
+            Some(first) if label.is_none() && !ev.shift && behind_sel(target) && selection_box(&doc, &sel).is_some_and(|q| in_quad(&q, ev.p())) => {
+                Some(first)
+            }
+            _ => target,
+        };
+        match target {
+            Some(target) => {
+                // Clicking inside the current selection's box keeps it (drag them all).
+                let in_sel_box = sel.len() > 1 && doc.bounds_of(&sel).is_some_and(|b| b.contains(ev.p())) && !ev.shift;
+                // Shift on a selected layer takes it out on release if the press doesn't become a
+                // drag; a drag moves the selection with it. Where no drag can start, it goes now.
+                let deselect = (ev.shift && sel.contains(&target)).then_some(target);
+                let without_target = || sel.iter().copied().filter(|x| *x != target).collect::<Vec<_>>();
+                let new_sel = if in_sel_box && (sel.contains(&target) || sel.iter().any(|s| doc.is_ancestor(*s, target))) {
+                    sel.clone()
+                } else if ev.shift && deselect.is_none() {
+                    let mut s2 = sel.clone();
+                    s2.push(target);
+                    s2
+                } else if sel.contains(&target) {
+                    sel.clone()
+                } else {
+                    vec![target]
+                };
+                self.set_selection(new_sel.clone());
+                // Dev Mode only selects (Shift-click still deselects): nothing moves.
+                if !edits {
+                    if deselect.is_some() {
+                        self.set_selection(without_target());
+                    }
+                    return Ok(());
+                }
+                // Locked layers selected in the layers panel stay put.
+                let ids: Vec<NodeId> = roots(&doc, &new_sel).into_iter().filter(|i| !locked_in(&doc, *i)).collect();
+                if new_sel.is_empty() || doc.node(target).is_some_and(|n| n.locked) || ids.is_empty() {
+                    if deselect.is_some() {
+                        self.set_selection(without_target());
+                    }
+                    return Ok(());
+                }
+                let mut targets = Targets::gather(&doc, page, &ids);
+                // A copy dragged out with Alt snaps to the layers it came from too (they stay put).
+                if ev.alt
+                    && let Some(b) = targets.moving
+                {
+                    targets.add_box(b);
+                }
+                if let Err(e) = self.begin_interaction(if ev.alt { "Duplicate" } else { "Move" }) {
+                    if deselect.is_some() {
+                        self.set_selection(without_target());
+                    }
+                    return Err(e);
+                }
+                self.tool.gesture = Gesture::Move { start: ev.p(), ids, targets, duplicate: ev.alt, moved: false, deselect };
+                self.tool.overlay.cursor = if ev.alt { Cursor::Copy } else { Cursor::Default };
+            }
+            None => {
+                let within = self.marquee_within(ev.p())?;
+                if !ev.shift {
+                    self.set_selection(vec![]);
+                }
+                self.tool.gesture = Gesture::Marquee { start: ev.p(), additive: ev.shift, base: if ev.shift { sel } else { vec![] }, within };
+            }
+        }
+        Ok(())
+    }
+
+    pub(super) fn drag(&mut self, ev: &PointerEvent) -> Result<()> {
+        let g = std::mem::take(&mut self.tool.gesture);
+        let res = match &g {
+            Gesture::None => return self.hover(ev),
+            Gesture::Marquee { start, additive, base, within } => {
+                let r = Rect::from_points(*start, ev.p());
+                self.tool.overlay.marquee = Some([r.x0, r.y0, r.x1, r.y1]);
+                // Cmd/Ctrl: the nested layers it touches.
+                let sel = self.marquee_selection(r, *within, ev.cmd, base, *additive)?;
+                self.set_selection(sel);
+                Ok(())
+            }
+            Gesture::Move { start, moved: false, .. } | Gesture::Resize { start, moved: false, .. } if within_slop(ev, *start) => Ok(()),
+            Gesture::Move { start, ids, targets, duplicate, .. } => {
+                let mut d = ev.p() - *start;
+                if ev.shift {
+                    if d.x.abs() > d.y.abs() {
+                        d.y = 0.0;
+                    } else {
+                        d.x = 0.0;
+                    }
+                }
+                // Cmd/Ctrl (and Control on macOS) held while dragging suspends snapping.
+                let snap_on = self.ds().map(|ds| ds.view.snap_objects).unwrap_or(true) && !ev.cmd && !ev.ctrl;
+                let mut guides = Vec::new();
+                if snap_on {
+                    let (c, g2) = targets.snap_move(d, SNAP_PX / ev.zoom.max(1e-6));
+                    d += c;
+                    guides = g2;
+                }
+                if self.ds().map(|ds| ds.view.snap_pixel).unwrap_or(true) {
+                    // Keep the box's origin on whole pixels (a rotated parent frame's, inside one).
+                    d = targets.round_move(d);
+                }
+                let ids = ids.clone();
+                let dup = *duplicate;
+                let page = self.page()?;
+                let mut drop_cell = None;
+                let mut drop_target = None;
+                let mut in_flow = false;
+                // Placed in a row or column: (is it a column, its gap) for the insertion line.
+                let mut slot_axis: Option<(bool, f64)> = None;
+                self.preview(|doc, sel| {
+                    let mut moving = ids.clone();
+                    if dup {
+                        let mut copies = Vec::new();
+                        for i in &ids {
+                            let parent = doc.get(*i)?.parent.unwrap_or(page);
+                            let idx = doc.index_in_parent(*i).map(|x| x + 1);
+                            copies.push(crate::components::copy_in_file(doc, *i, parent, idx)?);
+                        }
+                        // Connectors copied with what they join join the copies.
+                        let map = crate::board::copy_map(doc, &ids, &copies);
+                        crate::board::rejoin(doc, &crate::board::copied_items(doc, &map), &map, false);
+                        moving = copies;
+                        *sel = moving.clone();
+                    }
+                    let p = ev.p();
+                    let home = moving.first().and_then(|i| doc.node(*i)).and_then(|n| n.parent);
+                    // Absolute children of an auto layout frame stay in it, and so do the layers of
+                    // groups, boolean groups and instances ([`crate::drop::keeps_layers`]); the
+                    // rest may change parent.
+                    let flow = moving.iter().all(|i| doc.node(*i).is_some_and(|n| !n.child_layout.absolute))
+                        && !home.is_some_and(|h| crate::drop::keeps_layers(doc, h));
+                    let target = if flow { crate::drop::drag_parent(doc, page, p, &moving) } else { home.unwrap_or(page) };
+                    let mode = doc.node(target).and_then(|n| n.layout.as_ref()).map(|l| l.mode);
+                    if let (true, Some(mode)) = (flow, mode) {
+                        // Into (or within) an auto layout frame: the layers take the slot (a grid: the
+                        // cell) under the pointer, as the frame shows it now. A frame other than the
+                        // one they come from is outlined too.
+                        let cell = if mode == LayoutMode::Grid { crate::drop::grid_cell_at(doc, target, p) } else { None };
+                        let idx =
+                            if mode == LayoutMode::Grid { 0 } else { crate::drop::auto_layout_slot(doc, target, p, &moving).map_or(0, |(i, _)| i) };
+                        for m in &moving {
+                            if doc.get(*m)?.parent != Some(target) {
+                                doc.reparent(*m, target, None)?;
+                            }
+                        }
+                        if let (Some(first), Some((col, row, rect))) = (moving.first().copied(), cell) {
+                            let cl = &mut doc.get_mut(first)?.child_layout;
+                            cl.grid_column = Some(col);
+                            cl.grid_row = Some(row);
+                            drop_cell = Some(rect);
+                        } else if mode != LayoutMode::Grid {
+                            let mut kids: Vec<NodeId> = doc.get(target)?.children.iter().copied().filter(|c| !moving.contains(c)).collect();
+                            for (k, m) in moving.iter().enumerate() {
+                                kids.insert((idx + k).min(kids.len()), *m);
+                            }
+                            let gap = doc.node(target).and_then(|n| n.layout.as_ref()).map_or(0.0, |l| l.gap);
+                            doc.get_mut(target)?.children = kids;
+                            slot_axis = Some((mode == LayoutMode::Vertical, gap));
+                        }
+                        drop_target = (Some(target) != home).then_some(target);
+                        in_flow = true;
+                        return Ok(());
+                    }
+                    // A free move. Layers dragged out of an auto layout flow leave it (onto the page
+                    // while dragging; the drop puts them in the frame under the pointer).
+                    for m in &moving {
+                        let in_al = doc.node(*m).and_then(|n| n.parent).and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some());
+                        if flow && in_al {
+                            doc.reparent(*m, page, None)?;
+                        }
+                        move_world(doc, *m, d.x, d.y)?;
+                    }
+                    drop_target = (flow && target != page).then_some(target);
+                    Ok(())
+                })?;
+                let placed = if dup { self.selection() } else { ids };
+                // Snapping guides mean nothing while the layout places the layers; with Alt held,
+                // live distances to the neighbours replace them.
+                self.tool.overlay.guides = if in_flow {
+                    Vec::new()
+                } else if ev.alt {
+                    let doc = self.doc()?;
+                    doc.bounds_of(&placed).map(|b| crate::distance::neighbours(doc, page, &placed, b)).unwrap_or_default()
+                } else {
+                    guides
+                };
+                // The preview already shows the layers in their slot: the line marks it there, in
+                // the middle of the gap before them (clear of the selection box).
+                self.tool.overlay.insert_line = slot_axis.and_then(|(vertical, gap)| {
+                    let off = if gap.is_finite() { (gap / 2.0).clamp(3.0, 24.0) } else { 3.0 };
+                    self.doc().ok()?.bounds_of(&placed).map(|b| crate::drop::line_before(b, vertical, off))
+                });
+                self.tool.overlay.drop_cell = drop_cell;
+                self.tool.overlay.drop_target = drop_target;
+                self.tool.overlay.cursor = if self.refused(&placed, true) {
+                    Cursor::NotAllowed
+                } else if dup {
+                    Cursor::Copy
+                } else {
+                    Cursor::Default
+                };
+                self.tool.gesture = g.clone();
+                if let Gesture::Move { moved, .. } = &mut self.tool.gesture {
+                    *moved = true;
+                }
+                return Ok(());
+            }
+            Gesture::Resize { start, r, scale_tool, .. } => {
+                let res = self.resize_drag(ev, *start, r, *scale_tool);
+                self.tool.gesture = Gesture::Resize { start: *start, r: r.clone(), scale_tool: *scale_tool, moved: true };
+                if self.refused(&self.selection(), false) {
+                    self.tool.overlay.cursor = Cursor::NotAllowed;
+                }
+                return res;
+            }
+            Gesture::Rotate { center, start_angle, ids } => {
+                let mut a = ((ev.p() - *center).atan2() - start_angle).to_degrees();
+                if ev.shift {
+                    a = (a / 15.0).round() * 15.0;
+                }
+                let (c, ids) = (*center, ids.clone());
+                self.preview(|doc, _| {
+                    for i in &ids {
+                        crate::cmd::arrange::rotate_world(doc, *i, c, -a)?;
+                    }
+                    Ok(())
+                })?;
+                // The cursor turns with the pointer about the centre.
+                self.tool.overlay.cursor =
+                    if self.refused(&ids, false) { Cursor::NotAllowed } else { Cursor::Rotate((ev.p() - c).atan2().to_degrees()) };
+                Ok(())
+            }
+            Gesture::Draw { start, id, parent, targets } => {
+                let (start, id, parent, targets) = (*start, *id, *parent, targets.clone());
+                self.tool.gesture = g;
+                return self.draw_drag(ev, start, id, parent, &targets);
+            }
+            Gesture::TextBox { id, start, line } => {
+                let (id, start, line) = (*id, *start, *line);
+                self.tool.gesture = g;
+                return self.text_box_drag(ev, id, start, line);
+            }
+            Gesture::Arc { id, handle, arc } => {
+                let (id, handle, arc) = (*id, *handle, *arc);
+                self.tool.gesture = g;
+                return self.arc_drag(ev, id, handle, arc);
+            }
+            Gesture::Shape { id, handle } => {
+                let (id, handle) = (*id, *handle);
+                let doc = self.doc()?.clone();
+                if let Some(props) = crate::shape_handles::drag(&doc, id, handle, ev.p(), ev.alt) {
+                    self.preview(|doc, _| crate::cmd::props::apply("node.set", doc, id, &props))?;
+                }
+                self.tool.overlay.shape = shape_hint(self.doc()?, id, handle, ev.zoom);
+                self.tool.overlay.shape_hover = Some(handle);
+                Ok(())
+            }
+            Gesture::Pan { sx, sy, cx, cy } => {
+                let ds = self.ds_mut()?;
+                let z = ds.view.zoom.max(1e-6);
+                ds.view.cx = cx - (ev.sx - sx) / z;
+                ds.view.cy = cy - (ev.sy - sy) / z;
+                ds.revision += 1;
+                Ok(())
+            }
+            Gesture::Pencil { points, pressure } => {
+                let (mut pts, mut pressure) = (points.clone(), pressure.clone());
+                if pts.last().is_none_or(|l| (*l - ev.p()).hypot() > 0.5 / ev.zoom.max(1e-6)) {
+                    pts.push(ev.p());
+                    pressure.push(ev.pressure);
+                }
+                self.tool.overlay.pen = pts.iter().map(|p| [p.x, p.y]).collect();
+                self.tool.gesture = Gesture::Pencil { points: pts, pressure };
+                if let Ok(ds) = self.ds_mut() {
+                    ds.revision += 1;
+                }
+                return Ok(());
+            }
+            Gesture::TextSelect { id } => {
+                let id = *id;
+                let idx = self.text_index_at(id, ev.p())?;
+                textedit::set_caret(self, idx, true)?;
+                Ok(())
+            }
+            Gesture::Vector(_) | Gesture::ShapeBuild { .. } | Gesture::Origin => Ok(()),
+            Gesture::Connect { from, start } => {
+                let (from, start) = (*from, *start);
+                self.connect_drag(ev, from, start);
+                return Ok(());
+            }
+            Gesture::Erase { gone } => {
+                self.tool.gesture = Gesture::Erase { gone: gone.clone() };
+                return self.erase_at(ev);
+            }
+            Gesture::Reattach { id, from, start } => {
+                let (id, from, start) = (*id, *from, *start);
+                self.reattach_drag(ev, id, from, start);
+                return Ok(());
+            }
+            Gesture::PenDrag { anchor } => {
+                // A click's wobble pulls out no handle.
+                let out = if within_slop(ev, *anchor) { Vec2::ZERO } else { ev.p() - *anchor };
+                if let Some(pen) = self.tool.pen.as_mut()
+                    && let Some(last) = pen.points.last_mut()
+                {
+                    last.2 = out;
+                    last.1 = -out;
+                }
+                self.pen_update()?;
+                Ok(())
+            }
+        };
+        self.tool.gesture = g;
+        res
+    }
+
+    /// An arc handle drag: the new arc, written through `node.set`'s keys.
+    fn arc_drag(&mut self, ev: &PointerEvent, id: NodeId, handle: ArcHandle, arc: crate::arc_handles::Arc) -> Result<()> {
+        let doc = self.doc()?.clone();
+        let Some(next) = crate::arc_handles::drag(&doc, id, handle, arc, ev.p(), ev.shift, ev.zoom) else { return Ok(()) };
+        let props = crate::arc_handles::props(next);
+        self.preview(|doc, _| crate::cmd::props::apply("node.set", doc, id, &props))?;
+        self.tool.gesture = Gesture::Arc { id, handle, arc: next };
+        let at = crate::arc_handles::handle_at(self.doc()?, id, handle, next, ev.zoom);
+        self.tool.overlay.arc = at.map(|at| ArcHint { handle, label: next.label(handle), at });
+        self.tool.overlay.arc_hover = Some(handle);
+        Ok(())
+    }
+
+    fn resize_drag(&mut self, ev: &PointerEvent, start: Point, r: &ResizeStart, scale_tool: bool) -> Result<()> {
+        let page = self.page()?;
+        let snap = self.ds().map(|d| d.view.snap_objects).unwrap_or(true) && !ev.cmd && !ev.ctrl;
+        let ids: Vec<NodeId> = r.nodes.iter().map(|n| n.0).collect();
+        let targets = if snap { Some(Targets::gather(self.doc()?, page, &ids)) } else { None };
+        let mut p = ev.p();
+        let mut guides = Vec::new();
+        if let Some(t) = &targets {
+            let (dx, dy, g) = t.snap_point(p.x, p.y, SNAP_PX / ev.zoom.max(1e-6));
+            p.x += dx;
+            p.y += dy;
+            guides = g;
+        }
+        let _ = start;
+        // In the handle box's own axes (one layer: its local space).
+        let (frame, w0, h0) = r.frame;
+        // The pixel grid: an upright box's dragged sides land on whole pixels (the Scale tool
+        // scales by the factor as dragged).
+        if !scale_tool && self.ds().map(|d| d.view.snap_pixel).unwrap_or(true) && crate::guides::axis_aligned(frame) {
+            p = Point::new(p.x.round(), p.y.round());
+        }
+        let q = frame.inverse() * p;
+        let is_line = r.single && ids.first().and_then(|i| self.doc().ok()?.node(*i).map(|n| matches!(n.kind, NodeKind::Line))).unwrap_or(false);
+        if scale_tool {
+            return self.scale_drag(ev, r, q, guides);
+        }
+        if is_line {
+            // Line end handles: move the end point freely (length + angle).
+            let (a, b) = match r.handle {
+                Handle::Corner(0) => (p, frame * Point::new(w0, 0.0)),
+                _ => (frame * Point::new(0.0, 0.0), p),
+            };
+            let id = ids.first().copied().unwrap_or(NodeId(0));
+            self.preview(|doc, _| {
+                let mut v = b - a;
+                if ev.shift {
+                    let ang = (v.atan2() / (std::f64::consts::PI / 4.0)).round() * std::f64::consts::PI / 4.0;
+                    v = Vec2::from_angle(ang) * v.hypot();
+                }
+                let len = v.hypot();
+                let world = Affine::translate(a.to_vec2()) * Affine::rotate(v.atan2());
+                doc.set_world_transform(id, world)?;
+                figcraft_layout::set_size(doc, id, len, 0.0);
+                Ok(())
+            })?;
+            self.tool.overlay.guides = guides;
+            return Ok(());
+        }
+        // Constrain proportions (Shift, or the node's lock).
+        let keep = ev.shift || r.single && ids.first().and_then(|i| self.doc().ok()?.node(*i).map(|n| n.constrain_proportions)).unwrap_or(false);
+        let (x0, y0, x1, y1) = resized_box(r.handle, q, w0, h0, keep, ev.alt);
+        let (flip_x, flip_y) = (x1 < x0, y1 < y0);
+        let (nx0, ny0) = (x0.min(x1), y0.min(y1));
+        let (nw, nh) = ((x1 - x0).abs(), (y1 - y0).abs());
+        let nodes = r.nodes.clone();
+        let single = r.single;
+        let handle = r.handle;
+        // What's in a section stays where it is on the page, and so does what's in a frame resized
+        // with Cmd/Ctrl held (its constraints are ignored).
+        let keeps = |doc: &Document, id: NodeId| {
+            doc.node(id).is_some_and(|n| matches!(n.kind, NodeKind::Section { .. }) || (ev.cmd && single && n.kind.is_frame_like()))
+        };
+        self.preview(|doc, _| {
+            if single {
+                let Some((id, world, _, _)) = nodes.first() else { return Ok(()) };
+                let kept = if keeps(doc, *id) { crate::cmd::props::children_worlds(doc, *id) } else { Vec::new() };
+                let mut t = *world * Affine::translate((nx0, ny0));
+                if flip_x {
+                    t *= Affine::new([-1.0, 0.0, 0.0, 1.0, nw, 0.0]);
+                }
+                if flip_y {
+                    t *= Affine::new([1.0, 0.0, 0.0, -1.0, 0.0, nh]);
+                }
+                // Text reflow and auto layout can recompute this box after the preview (a size bound
+                // to a variable lets go of it: the resize is an explicit edit).
+                let n = doc.get(*id)?;
+                let crop_images = ev.cmd
+                    && !matches!(n.kind, NodeKind::Text(_))
+                    && !std::iter::once(*id).chain(doc.ancestors(*id)).any(|a| doc.node(a).is_some_and(|n| n.layout.is_some()));
+                if crop_images {
+                    // Crop the layer's image fills without moving their pixels on the page.
+                    // Work from the interaction snapshot, just like the geometry on every move.
+                    let (w, h) = (n.width.max(1e-6), n.height.max(1e-6));
+                    let to_old =
+                        Affine::scale_non_uniform(1.0 / w, 1.0 / h) * world.inverse() * t * Affine::scale_non_uniform(nw.max(0.01), nh.max(0.01));
+                    let mut fills = n.fills.clone();
+                    for paint in &mut fills {
+                        let PaintKind::Image(img) = &mut paint.kind else { continue };
+                        // A repeating image cannot be represented by a single Crop placement.
+                        if img.scale_mode == ImageScaleMode::Tile {
+                            continue;
+                        }
+                        let Some(data) = doc.images.get(&img.image) else { continue };
+                        let (iw, ih) = (f64::from(data.width), f64::from(data.height));
+                        let crop = if img.scale_mode == ImageScaleMode::Crop {
+                            img.effective_crop(iw, ih, w, h)
+                        } else {
+                            let (rw, rh) = img.rotated_size(iw.max(1.0), ih.max(1.0));
+                            let s = if img.scale_mode == ImageScaleMode::Fit { (w / rw).min(h / rh) } else { (w / rw).max(h / rh) };
+                            [w / (rw * s), 0.0, 0.0, h / (rh * s), (rw * s - w) / (2.0 * rw * s), (rh * s - h) / (2.0 * rh * s)]
+                        };
+                        // A degenerate (zero-scale) layer has no inverse: its image keeps its placement.
+                        let crop = (Affine::new(crop) * to_old).as_coeffs();
+                        if !crop.iter().all(|c| c.is_finite()) {
+                            continue;
+                        }
+                        img.crop = Some(crop);
+                        img.scale_mode = ImageScaleMode::Crop;
+                    }
+                    doc.get_mut(*id)?.fills = fills;
+                }
+                doc.set_world_transform(*id, t)?;
+                if kept.is_empty() {
+                    crate::cmd::props::resize_node(doc, *id, nw.max(0.01), nh.max(0.01))?;
+                } else {
+                    figcraft_layout::set_size(doc, *id, nw.max(0.01), nh.max(0.01));
+                    crate::cmd::props::restore_worlds(doc, &kept)?;
+                }
+                let n = doc.get_mut(*id)?;
+                if matches!(handle, Handle::Corner(_) | Handle::Edge(1) | Handle::Edge(3)) {
+                    n.child_layout.sizing_h = Sizing::Fixed;
+                }
+                if matches!(handle, Handle::Corner(_) | Handle::Edge(0) | Handle::Edge(2)) {
+                    n.child_layout.sizing_v = Sizing::Fixed;
+                }
+                if let NodeKind::Text(t) = &mut n.kind {
+                    match handle {
+                        Handle::Edge(1) | Handle::Edge(3) if t.auto_resize == TextAutoResize::Truncate => {}
+                        Handle::Edge(1) | Handle::Edge(3) => t.auto_resize = TextAutoResize::Height,
+                        _ => t.fix_size(true, true),
+                    }
+                }
+                return Ok(());
+            }
+            // Several layers: map the old box onto the new one, in the box's axes. Each layer's
+            // centre follows the box (mirrored when it flips); each keeps its rotation and scales
+            // along its own axes (see `axis_factors`), turning over with the box.
+            let (sx, sy) = (if w0 > 1e-9 { (x1 - x0) / w0 } else { 1.0 }, if h0 > 1e-9 { (y1 - y0) / h0 } else { 1.0 });
+            let mirror = Affine::new([sx.signum(), 0.0, 0.0, sy.signum(), 0.0, 0.0]);
+            let inv = frame.inverse();
+            for (id, world, w, h) in &nodes {
+                let local = inv * *world;
+                let center = local * Point::new(w / 2.0, h / 2.0);
+                let (kw, kh) = figcraft_layout::axis_factors(local, sx, sy);
+                let (w2, h2) = (w * kw, h * kh);
+                let lin = (mirror * local).with_translation(Vec2::ZERO);
+                let origin = Point::new(x0 + center.x * sx, y0 + center.y * sy) - lin * Point::new(w2 / 2.0, h2 / 2.0);
+                let kept = if keeps(doc, *id) { crate::cmd::props::children_worlds(doc, *id) } else { Vec::new() };
+                doc.set_world_transform(*id, frame * lin.with_translation(origin))?;
+                crate::cmd::props::resize_node(doc, *id, w2, h2)?;
+                crate::cmd::props::restore_worlds(doc, &kept)?;
+            }
+            Ok(())
+        })?;
+        self.tool.overlay.guides = guides;
+        Ok(())
+    }
+
+    /// Scale tool handle drag (`q`: the snapped pointer in the handle box's axes): everything
+    /// scales by one factor about the anchor point (Alt: the centre), strokes, effects, radii and
+    /// text included, children by the same factor whatever their constraints.
+    fn scale_drag(&mut self, ev: &PointerEvent, r: &ResizeStart, q: Point, guides: Vec<Guide>) -> Result<()> {
+        let (frame, w0, h0) = r.frame;
+        let Some((k, pivot)) = scale_factor(r.handle, q, w0, h0, self.tool.scale_anchor, ev.alt) else { return Ok(()) };
+        let nodes = r.nodes.clone();
+        let inv = frame.inverse();
+        // A layer's place in the box scales about the pivot; a negative factor turns it over.
+        let about = frame * Affine::translate(pivot.to_vec2() * (1.0 - k));
+        let sign = k.signum();
+        self.preview(|doc, _| {
+            for (id, world, _, _) in &nodes {
+                let c = (inv * *world).as_coeffs();
+                doc.set_world_transform(*id, about * Affine::new([sign * c[0], sign * c[1], sign * c[2], sign * c[3], k * c[4], k * c[5]]))?;
+                crate::cmd::arrange::scale_node(doc, *id, k.abs())?;
+            }
+            Ok(())
+        })?;
+        let p = frame * pivot;
+        self.tool.overlay.scale = Some(ScaleHint { factor: k, pivot: [p.x, p.y] });
+        self.tool.overlay.guides = guides;
+        Ok(())
+    }
+}
diff --git a/crates/engine/src/canvas/tools/draw.rs b/crates/engine/src/canvas/tools/draw.rs
new file mode 100644
index 00000000..b594ae27
--- /dev/null
+++ b/crates/engine/src/canvas/tools/draw.rs
@@ -0,0 +1,229 @@
+use super::handles::SNAP_PX;
+use super::pen::take_enclosed;
+use super::*;
+
+impl Session {
+    pub(super) fn draw_down(&mut self, ev: &PointerEvent) -> Result<()> {
+        let ds = self.ds()?;
+        let doc = ds.doc.clone();
+        let page = ds.page;
+        if ds.text_edit.is_some() {
+            textedit::end(self)?;
+        }
+        // Frames drawn inside frames nest; sections only at the top or in sections.
+        let parent = match self.tool.tool {
+            ToolId::Section => {
+                frame_at(&doc, page, ev.p(), &[]).filter(|f| doc.node(*f).is_some_and(|n| matches!(n.kind, NodeKind::Section { .. }))).unwrap_or(page)
+            }
+            _ => frame_at(&doc, page, ev.p(), &[]).unwrap_or(page),
+        };
+        let targets = Targets::gather(&doc, page, &[]);
+        self.begin_interaction(self.tool.tool.label())?;
+        self.tool.gesture = Gesture::Draw { start: ev.p(), id: None, parent, targets };
+        Ok(())
+    }
+
+    pub(super) fn draw_drag(&mut self, ev: &PointerEvent, start: Point, id: Option<NodeId>, parent: NodeId, targets: &Targets) -> Result<()> {
+        let tool = self.tool.tool;
+        let mut p = ev.p();
+        let mut guides = Vec::new();
+        if self.ds().map(|d| d.view.snap_objects).unwrap_or(true) && !ev.cmd && !ev.ctrl {
+            let (dx, dy, g) = targets.snap_point(p.x, p.y, SNAP_PX / ev.zoom.max(1e-6));
+            p.x += dx;
+            p.y += dy;
+            guides = g;
+        }
+        let pixel = self.ds().map(|d| d.view.snap_pixel).unwrap_or(true);
+        let mut created = id;
+        let page = self.page()?;
+        self.preview(|doc, sel| {
+            let (mut a, mut b) = (start, p);
+            if pixel {
+                a = Point::new(a.x.round(), a.y.round());
+                b = Point::new(b.x.round(), b.y.round());
+            }
+            let pw = doc.world_transform(parent);
+            let (kind, base) = match tool {
+                ToolId::Frame => (NodeKind::Frame, "Frame"),
+                ToolId::Section => (NodeKind::Section { contents_hidden: false }, "Section"),
+                ToolId::Slice => (NodeKind::Slice, "Slice"),
+                ToolId::Rectangle => (NodeKind::Rectangle, "Rectangle"),
+                ToolId::Ellipse => (NodeKind::Ellipse { start: 0.0, sweep: std::f64::consts::TAU, inner: 0.0 }, "Ellipse"),
+                ToolId::Polygon => (NodeKind::Polygon { count: 3 }, "Polygon"),
+                ToolId::Star => (NodeKind::Star { count: 5, inner_ratio: 0.38 }, "Star"),
+                ToolId::Line => (NodeKind::Line, "Line"),
+                ToolId::Arrow => (NodeKind::Line, "Arrow"),
+                _ => return Ok(()),
+            };
+            let name = match tool {
+                ToolId::Frame | ToolId::Section | ToolId::Slice => doc.next_name(base),
+                _ => base.to_string(),
+            };
+            let nid = doc.alloc_id();
+            let mut n = if tool == ToolId::Section { Node::new_section(nid, name, 0.0, 0.0) } else { Node::new(nid, kind, name, 0.0, 0.0) };
+            if tool == ToolId::Arrow {
+                n.stroke.cap_end = StrokeCap::LineArrow;
+            }
+            if matches!(tool, ToolId::Line | ToolId::Arrow) {
+                let mut v = b - a;
+                if ev.shift {
+                    let ang = (v.atan2() / (std::f64::consts::PI / 4.0)).round() * std::f64::consts::PI / 4.0;
+                    v = Vec2::from_angle(ang) * v.hypot();
+                }
+                // Alt draws from the centre, as for the other shapes.
+                let (a, v) = if ev.alt { (a - v, v * 2.0) } else { (a, v) };
+                n.width = v.hypot();
+                n.transform = pw.inverse() * Affine::translate(a.to_vec2()) * Affine::rotate(v.atan2());
+            } else {
+                let mut d = b - a;
+                if ev.shift {
+                    let m = d.x.abs().max(d.y.abs());
+                    d = Vec2::new(m * d.x.signum(), m * d.y.signum());
+                }
+                let (x0, y0, x1, y1) = if ev.alt { (a.x - d.x, a.y - d.y, a.x + d.x, a.y + d.y) } else { (a.x, a.y, a.x + d.x, a.y + d.y) };
+                let r = Rect::new(x0.min(x1), y0.min(y1), x0.max(x1), y0.max(y1));
+                n.width = r.width();
+                n.height = r.height();
+                n.transform = pw.inverse() * Affine::translate((r.x0, r.y0));
+            }
+            doc.insert(n, parent, None)?;
+            *sel = vec![nid];
+            created = Some(nid);
+            let _ = page;
+            Ok(())
+        })?;
+        self.tool.overlay.guides = guides;
+        self.tool.gesture = Gesture::Draw { start, id: created, parent, targets: targets.clone() };
+        Ok(())
+    }
+
+    pub(super) fn up(&mut self, ev: &PointerEvent) -> Result<()> {
+        let g = std::mem::take(&mut self.tool.gesture);
+        self.tool.overlay.marquee = None;
+        self.tool.overlay.guides.clear();
+        self.tool.overlay.scale = None;
+        self.tool.overlay.arc = None;
+        self.tool.overlay.shape = None;
+        self.tool.overlay.measure_box = None;
+        self.tool.overlay.insert_line = None;
+        self.tool.overlay.drop_cell = None;
+        let drop_target = self.tool.overlay.drop_target.take();
+        match g {
+            Gesture::Move { ids, moved, duplicate, start, deselect, .. } => {
+                if moved {
+                    // A free move lands in the frame under the pointer (or the page) where it was
+                    // dropped; layers in an auto layout frame already sit in their slot.
+                    let page = self.page()?;
+                    let sel = self.selection();
+                    let sources = if duplicate { ids.clone() } else { Vec::new() };
+                    let moving = if duplicate { sel } else { ids };
+                    let doc = self.doc()?.clone();
+                    let in_al =
+                        moving.iter().any(|m| doc.node(*m).and_then(|n| n.parent).and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some()));
+                    let target = drop_target.unwrap_or(page);
+                    let current = moving.first().and_then(|m| doc.node(*m)).and_then(|n| n.parent);
+                    if !in_al && current != Some(target) {
+                        let ds = self.ds_mut()?;
+                        let before = ds.doc.clone();
+                        let d = ds.doc_mut();
+                        for m in &moving {
+                            // Group, boolean group and instance layers stay put: they only move.
+                            let from = d.node(*m).and_then(|n| n.parent);
+                            if from.is_some_and(|f| crate::drop::keeps_layers(d, f)) || crate::components::structure_locked(d, target) {
+                                continue;
+                            }
+                            // A layer can't go into itself; it stays where it is.
+                            let _ = d.reparent(*m, target, None);
+                        }
+                        crate::normalize(ds.doc_mut(), &before);
+                    }
+                    // Reordering or dragging layers out of an instance (outside its slots), or
+                    // moving layers inside one, are edits only its main can make: the gesture is
+                    // undone.
+                    if self.refused(&moving, true) {
+                        self.cancel_interaction()?;
+                    } else {
+                        self.commit_interaction()?;
+                        // Duplicate repeats a free Alt-drag's step (an auto layout places its own).
+                        if duplicate && !in_al && moving.len() == sources.len() {
+                            self.ds_mut()?.last_duplicate = Some(crate::cmd::edit::Duplicated { sources, copies: moving });
+                        }
+                    }
+                } else {
+                    self.cancel_interaction()?;
+                    if let Some(d) = deselect {
+                        let sel = self.selection().into_iter().filter(|x| *x != d).collect();
+                        self.set_selection(sel);
+                    }
+                    if deselect.is_none() && !(ev.shift || ev.cmd || duplicate) {
+                        self.widget_click(start, ev.tol() * 2.0)?;
+                    }
+                }
+            }
+            Gesture::Resize { .. } | Gesture::Rotate { .. } | Gesture::Arc { .. } | Gesture::Shape { .. } => {
+                // Layers inside an instance keep their main's size and rotation.
+                if self.refused(&self.selection(), false) {
+                    self.cancel_interaction()?;
+                } else {
+                    self.commit_interaction()?;
+                }
+            }
+            Gesture::Draw { start, id, parent, .. } => {
+                let tiny = (ev.p() - start).hypot() * ev.zoom < 3.0;
+                if tiny || id.is_none() {
+                    // Click without drag: Figma makes a 100×100 shape (frames 100×100 too).
+                    self.cancel_interaction()?;
+                    self.begin_interaction(self.tool.tool.label())?;
+                    let (w, h) = self.tool.tool.click_size();
+                    let target = start + Vec2::new(w, h);
+                    let mut fake = ev.clone();
+                    fake.x = target.x;
+                    fake.y = target.y;
+                    fake.shift = false;
+                    fake.alt = false;
+                    self.tool.gesture = Gesture::None;
+                    let targets = Targets::default();
+                    self.draw_drag(&fake, start, None, parent, &targets)?;
+                    self.tool.gesture = Gesture::None;
+                }
+                if matches!(self.tool.tool, ToolId::Frame | ToolId::Section)
+                    && let Some(drawn) = self.selection().first().copied()
+                {
+                    let ds = self.ds_mut()?;
+                    let before = ds.doc.clone();
+                    take_enclosed(ds.doc_mut(), drawn)?;
+                    crate::normalize(ds.doc_mut(), &before);
+                }
+                self.commit_interaction()?;
+                if !self.prefs.keep_tool {
+                    self.set_tool(ToolId::Move);
+                }
+            }
+            Gesture::Pan { .. } => {
+                self.tool.overlay.cursor = Cursor::Grab;
+                if let Some(t) = self.tool.temp_from.take() {
+                    self.tool.tool = t;
+                }
+            }
+            Gesture::Pencil { mut points, mut pressure } => {
+                self.tool.overlay.pen.clear();
+                // The stroke ends where the button came up, even without a move to get there.
+                if points.last().is_none_or(|l| (*l - ev.p()).hypot() > 0.5 / ev.zoom.max(1e-6)) {
+                    points.push(ev.p());
+                    pressure.push(ev.pressure);
+                }
+                self.pencil_finish(&points, &pressure)?;
+            }
+            Gesture::Connect { from, start } => self.connect_up(ev, from, start)?,
+            Gesture::Erase { .. } => self.erase_up()?,
+            Gesture::Reattach { id, from, start } => self.reattach_up(ev, id, from, start)?,
+            Gesture::TextSelect { .. } | Gesture::TextBox { .. } | Gesture::Marquee { .. } | Gesture::None => {}
+            Gesture::PenDrag { .. } | Gesture::ShapeBuild { .. } | Gesture::Origin => {}
+            Gesture::Vector(_) => self.commit_interaction()?,
+        }
+        if let Ok(ds) = self.ds_mut() {
+            ds.revision += 1;
+        }
+        Ok(())
+    }
+}
diff --git a/crates/engine/src/canvas/tools/handles.rs b/crates/engine/src/canvas/tools/handles.rs
new file mode 100644
index 00000000..fd765f66
--- /dev/null
+++ b/crates/engine/src/canvas/tools/handles.rs
@@ -0,0 +1,426 @@
+use super::*;
+
+/// The frame whose name label (see [`ToolState::labels`]) is under `p` on `page`: the topmost
+/// one drawn, if it can be selected (still there, on the page, visible and unlocked).
+pub fn label_at(doc: &Document, page: NodeId, labels: &[(NodeId, [Point; 4])], p: Point) -> Option<NodeId> {
+    labels
+        .iter()
+        .rev()
+        .find(|(id, q)| in_quad(q, p) && doc.page_of(*id) == Some(page) && doc.node(*id).is_some_and(|n| n.visible && !n.locked))
+        .map(|(id, _)| *id)
+}
+
+/// Whether `p` is inside the convex quadrilateral `q` (either winding; edges included).
+pub(super) fn in_quad(q: &[Point; 4], p: Point) -> bool {
+    let (mut left, mut right) = (false, false);
+    for (a, b) in q.iter().zip(q.iter().cycle().skip(1)) {
+        let side = (*b - *a).cross(p - *a);
+        if !side.is_finite() {
+            return false;
+        }
+        left |= side < 0.0;
+        right |= side > 0.0;
+    }
+    // On one side of every edge (a point can't be on all four edges of a quad with an area).
+    left != right
+}
+
+/// An anchor name (`tl`, `t`, `tr`, `l`, `c`, `r`, `bl`, `b`, `br`) as column and row (0 start,
+/// 1 middle, 2 end).
+pub fn anchor_of(name: &str) -> Option<(u8, u8)> {
+    ANCHORS.iter().position(|a| a.eq_ignore_ascii_case(name.trim())).map(|i| ((i % 3) as u8, (i / 3) as u8))
+}
+
+/// The name of anchor `(column, row)`.
+pub fn anchor_name(a: (u8, u8)) -> &'static str {
+    ANCHORS.get(usize::from(a.1.min(2)) * 3 + usize::from(a.0.min(2))).copied().unwrap_or("tl")
+}
+
+/// The fill new text takes to be readable where it is drawn, in `parent`: white on a dark
+/// background (None: the model's default, black). The background is the nearest layer from `parent`
+/// out whose top visible fill is a mostly opaque solid colour, else the page (#362). For text made
+/// in the app: by the Text tool, or by a command that names no fill while the interface is up.
+pub(crate) fn readable_text_fills(doc: &Document, parent: NodeId) -> Option<Vec<figcraft_color::Paint>> {
+    let dark = std::iter::once(parent).chain(doc.ancestors(parent)).filter_map(|id| doc.node(id)).find_map(|n| match &n.kind {
+        NodeKind::Page { background, .. } => Some(background.is_dark()),
+        _ => n.fills.iter().rev().find(|p| p.visible).and_then(|p| p.solid_color()).filter(|c| c.a >= 0.5).map(|c| c.is_dark()),
+    });
+    dark.unwrap_or(false).then(|| vec![figcraft_color::Paint::solid(figcraft_color::Color::WHITE)])
+}
+
+const ANCHORS: [&str; 9] = ["tl", "t", "tr", "l", "c", "r", "bl", "b", "br"];
+
+const HANDLE_PX: f64 = 5.0;
+
+const ROTATE_PX: f64 = 18.0;
+
+/// Snap distance in screen pixels.
+pub(crate) const SNAP_PX: f64 = 5.0;
+
+/// Screen pixels the pointer travels after a press before a move or resize starts: a click or a
+/// double-click made with an unsteady hand doesn't drag what it lands on.
+pub(super) const DRAG_SLOP_PX: f64 = 3.0;
+
+/// Screen pixels from a path within which the Text on a path tool takes it.
+pub(super) const PATH_REACH_PX: f64 = 6.0;
+
+/// The visible layers under `id` whose box, grown by `reach` (page units), holds `p`, front-most
+/// first: what the Text on a path tool measures its distance to. Content a clipping frame or a
+/// mask hides at `p` and the operands of boolean groups are left out.
+pub(super) fn path_candidates(doc: &Document, id: NodeId, p: Point, reach: f64, depth: usize, out: &mut Vec<NodeId>) {
+    let Some(n) = doc.node(id) else { return };
+    if !n.visible || depth > 512 || matches!(n.kind, NodeKind::BooleanOp { .. }) {
+        return;
+    }
+    if n.clip && n.kind.is_frame_like() && !n.local_rect().contains(doc.world_transform(id).inverse() * p) {
+        return;
+    }
+    for c in n.paint_order().rev() {
+        let before = out.len();
+        path_candidates(doc, c, p, reach, depth + 1, out);
+        if out.len() > before && figcraft_doc::geometry::masked_out(doc, n, c, p) {
+            out.truncate(before);
+        }
+    }
+    if n.children.is_empty() && !n.is_mask && doc.world_bounds(id).is_some_and(|b| b.inflate(reach, reach).contains(p)) {
+        out.push(id);
+    }
+}
+
+/// Corners of the selection's handle box in page coordinates (tl, tr, br, bl).
+pub fn selection_box(doc: &Document, sel: &[NodeId]) -> Option<[Point; 4]> {
+    let (f, w, h) = selection_frame(doc, sel)?;
+    Some([f * Point::ZERO, f * Point::new(w, 0.0), f * Point::new(w, h), f * Point::new(0.0, h)])
+}
+
+/// The selection's handle box: the page transform of its top-left corner (axes along the box) and
+/// its size. One layer: its own box; several sharing a rotation: a box turned with them;
+/// otherwise the page-aligned bounds.
+pub fn selection_frame(doc: &Document, sel: &[NodeId]) -> Option<(Affine, f64, f64)> {
+    let ids = roots(doc, sel);
+    if let [id] = ids.as_slice() {
+        let n = doc.node(*id)?;
+        return Some((doc.world_transform(*id), n.width, n.height));
+    }
+    let Some(angle) = shared_rotation(doc, &ids) else {
+        let b = doc.bounds_of(&ids)?;
+        return Some((Affine::translate((b.x0, b.y0)), b.width(), b.height()));
+    };
+    let rot = Affine::rotate(angle);
+    let inv = rot.inverse();
+    let b = ids
+        .iter()
+        .filter_map(|i| Some(figcraft_geom::transform_rect_bbox(inv * doc.world_transform(*i), doc.node(*i)?.local_rect())))
+        .reduce(|a, b| a.union(b))?;
+    Some((rot * Affine::translate((b.x0, b.y0)), b.width(), b.height()))
+}
+
+/// The rotation (radians) every layer in `ids` shares, unless it's a multiple of 90 degrees (the
+/// page-aligned box is then the same box). Flipped layers count by their axis, not its direction.
+fn shared_rotation(doc: &Document, ids: &[NodeId]) -> Option<f64> {
+    use std::f64::consts::{FRAC_PI_2, PI};
+    const EPS: f64 = 1e-4;
+    let mut angles = ids.iter().map(|i| {
+        let c = doc.world_transform(*i).as_coeffs();
+        c[1].atan2(c[0])
+    });
+    let a = angles.next()?;
+    let same = |b: f64| {
+        let d = (b - a).rem_euclid(PI);
+        d.min(PI - d) < EPS
+    };
+    let axis_aligned = (a - (a / FRAC_PI_2).round() * FRAC_PI_2).abs() < EPS;
+    (a.is_finite() && !axis_aligned && angles.all(same)).then_some(a)
+}
+
+/// Whether layer `id` is locked or inside a locked layer: it can be selected in the layers panel
+/// but not moved or resized on the canvas.
+pub fn locked_in(doc: &Document, id: NodeId) -> bool {
+    std::iter::once(id).chain(doc.ancestors(id)).any(|a| doc.node(a).is_some_and(|n| n.locked))
+}
+
+/// Whether layer `t` paints below layer `s`: it holds `s`, or it is behind `s` in the stack of the
+/// nearest layer holding both.
+pub(super) fn paints_below(doc: &Document, t: NodeId, s: NodeId) -> bool {
+    let chain = |id: NodeId| {
+        let mut c: Vec<NodeId> = std::iter::once(id).chain(doc.ancestors(id)).collect();
+        c.reverse();
+        c
+    };
+    let (ct, cs) = (chain(t), chain(s));
+    let shared = ct.iter().zip(&cs).take_while(|(a, b)| a == b).count();
+    match (ct.get(shared), cs.get(shared)) {
+        (None, Some(_)) => true,
+        (Some(a), Some(b)) => shared.checked_sub(1).and_then(|i| ct.get(i)).and_then(|p| doc.node(*p)).is_some_and(|p| {
+            let order: Vec<NodeId> = p.paint_order().collect();
+            order.iter().position(|c| c == a) < order.iter().position(|c| c == b)
+        }),
+        _ => false,
+    }
+}
+
+/// Which handle (if any) is under `p`. A selection with a locked layer has none.
+pub fn handle_at(doc: &Document, sel: &[NodeId], p: Point, zoom: f64) -> Option<Handle> {
+    if sel.is_empty() || sel.iter().any(|i| locked_in(doc, *i)) {
+        return None;
+    }
+    // A connector's handles are its ends (see `board::end_handle_at`): no box to resize or turn.
+    if crate::board::selected_connector_ends(doc, sel).is_some() {
+        return None;
+    }
+    let corners = selection_box(doc, sel)?;
+    // Lines (zero height) only get end handles.
+    let is_line = sel.len() == 1 && sel.first().and_then(|i| doc.node(*i)).is_some_and(|n| matches!(n.kind, NodeKind::Line));
+    handle_at_corners(&corners, p, zoom, is_line)
+}
+
+/// Half the side of the square the canvas draws on each corner of the handle box (screen pixels,
+/// upright whatever the box's rotation).
+const CORNER_SQUARE_PX: f64 = 4.0;
+
+/// Whether `p` is on a corner square of the selection's handle box as drawn: there the corner
+/// resizes, although a corner-radius handle 10 px in reaches that far too.
+pub(super) fn on_corner_square(doc: &Document, sel: &[NodeId], p: Point, zoom: f64) -> bool {
+    let reach = CORNER_SQUARE_PX / zoom.max(1e-6);
+    matches!(handle_at(doc, sel, p, zoom), Some(Handle::Corner(_)))
+        && selection_box(doc, sel).is_some_and(|c| c.iter().any(|c| (c.x - p.x).abs() <= reach && (c.y - p.y).abs() <= reach))
+}
+
+/// A box whose sides are both shorter than this on screen (pixels) would be covered by its
+/// handles: the canvas draws just its outline (the handles still answer just outside it).
+pub const SMALL_BOX_PX: f64 = 16.0;
+
+/// The stroke the Pencil draws: its colour and weight (the canvas previews it the same).
+pub const PENCIL_STROKE: (figcraft_color::Color, f64) = (figcraft_color::Color::BLACK, 2.0);
+
+/// The shorter and longer sides, in screen pixels, of the box with `corners` (tl, tr, br, bl).
+pub fn box_sides_px(corners: &[Point; 4], zoom: f64) -> (f64, f64) {
+    let [a, b, _, d] = corners;
+    let (w, h) = ((*b - *a).hypot() * zoom, (*d - *a).hypot() * zoom);
+    (w.min(h), w.max(h))
+}
+
+/// Which handle of the box with `corners` (tl, tr, br, bl in page coordinates) is under `p`;
+/// `is_line` keeps only the two end handles.
+pub fn handle_at_corners(corners: &[Point; 4], p: Point, zoom: f64, is_line: bool) -> Option<Handle> {
+    let tol = HANDLE_PX / zoom.max(1e-6);
+    // Inside the box, handles reach in at most a quarter of its shorter side, so that a press in
+    // the middle of a small layer moves it; outside it they reach as far as ever.
+    let inner = if !is_line && in_quad(corners, p) { box_sides_px(corners, zoom).0 / 4.0 / zoom.max(1e-6) } else { f64::INFINITY };
+    let (corner_reach, edge_reach) = ((tol * 1.6).min(inner), tol.min(inner));
+    // The nearest corner, then the nearest edge, in reach (a small box's reaches overlap).
+    let nearest = |hits: &mut dyn Iterator<Item = (f64, Handle)>| hits.min_by(|a, b| a.0.total_cmp(&b.0)).map(|(_, h)| h);
+    let corner = nearest(
+        &mut corners
+            .iter()
+            .enumerate()
+            .filter(|(i, _)| !(is_line && *i >= 2))
+            .map(|(i, c)| ((*c - p).hypot(), Handle::Corner(i as u8)))
+            .filter(|(d, _)| *d <= corner_reach),
+    );
+    if corner.is_some() {
+        return corner;
+    }
+    if !is_line {
+        use figcraft_geom::kurbo::ParamCurveNearest;
+        let edge = nearest(&mut (0..4).filter_map(|i| {
+            let (a, b) = (corners.get(i)?, corners.get((i + 1) % 4)?);
+            let near = figcraft_geom::kurbo::Line::new(*a, *b).nearest(p, 0.001);
+            let d = near.distance_sq.sqrt();
+            (d <= edge_reach && near.t > 0.05 && near.t < 0.95).then_some((d, Handle::Edge(i as u8)))
+        }));
+        if edge.is_some() {
+            return edge;
+        }
+    }
+    // Rotation zones: just outside each corner.
+    let center = Point::new(corners.iter().map(|c| c.x).sum::<f64>() / 4.0, corners.iter().map(|c| c.y).sum::<f64>() / 4.0);
+    let rot = ROTATE_PX / zoom.max(1e-6);
+    for (i, c) in corners.iter().enumerate() {
+        let d = (*c - p).hypot();
+        let outward = (p - *c).dot(*c - center) > 0.0;
+        if d <= rot && d > tol && outward {
+            return Some(Handle::Rotate(i as u8));
+        }
+    }
+    None
+}
+
+pub(super) fn resize_cursor(doc: &Document, sel: &[NodeId], h: Handle) -> Cursor {
+    selection_box(doc, sel).map_or(Cursor::Default, |c| handle_cursor(&c, h))
+}
+
+/// The cursor over handle `h` of the box with corners `c`.
+pub(crate) fn handle_cursor(c: &[Point; 4], h: Handle) -> Cursor {
+    let angle = |a: Point, b: Point| (b - a).atan2().to_degrees();
+    match h {
+        Handle::Corner(i) => {
+            let a = c.get(i as usize).copied().unwrap_or_default();
+            let b = c.get((i as usize + 2) % 4).copied().unwrap_or_default();
+            // Along the box's own axes at 45°, not the diagonal, so wide or tall boxes still get a
+            // diagonal cursor. A box with no width or height falls back to the diagonal.
+            let unit = |v: figcraft_geom::kurbo::Vec2| {
+                let len = v.hypot();
+                (len.is_finite() && len > 1e-9).then(|| v / len)
+            };
+            let next = c.get((i as usize + 1) % 4).copied().unwrap_or_default();
+            let prev = c.get((i as usize + 3) % 4).copied().unwrap_or_default();
+            match (unit(next - a), unit(prev - a)) {
+                (Some(u), Some(v)) => Cursor::Resize((u + v).atan2().to_degrees()),
+                _ => Cursor::Resize(angle(a, b)),
+            }
+        }
+        Handle::Edge(i) => {
+            let a = c.get(i as usize).copied().unwrap_or_default();
+            let b = c.get((i as usize + 1) % 4).copied().unwrap_or_default();
+            Cursor::Resize(angle(a, b) + 90.0)
+        }
+        Handle::Rotate(i) => {
+            let centre = Point::new(c.iter().map(|p| p.x).sum::<f64>() / 4.0, c.iter().map(|p| p.y).sum::<f64>() / 4.0);
+            Cursor::Rotate(angle(centre, c.get(i as usize).copied().unwrap_or_default()))
+        }
+    }
+}
+
+/// The box (x0, y0, x1, y1) a `w0`×`h0` handle box becomes when `handle` is dragged to `q`, all in
+/// the box's own axes: `keep` constrains proportions, `from_center` resizes about the centre (the
+/// opposite side mirrors the dragged one). Edges that cross over come back reversed (x1 < x0 or
+/// y1 < y0: a flip).
+pub(crate) fn resized_box(handle: Handle, q: Point, w0: f64, h0: f64, keep: bool, from_center: bool) -> (f64, f64, f64, f64) {
+    let (mut x0, mut y0, mut x1, mut y1) = (0.0, 0.0, w0, h0);
+    // The dragged sides: x0 or x1 (`Some(false)` / `Some(true)`), y0 or y1.
+    let (sx, sy) = match handle {
+        Handle::Corner(0) => (Some(false), Some(false)),
+        Handle::Corner(1) => (Some(true), Some(false)),
+        Handle::Corner(2) => (Some(true), Some(true)),
+        Handle::Corner(_) => (Some(false), Some(true)),
+        Handle::Edge(0) => (None, Some(false)),
+        Handle::Edge(1) => (Some(true), None),
+        Handle::Edge(2) => (None, Some(true)),
+        Handle::Edge(_) => (Some(false), None),
+        Handle::Rotate(_) => (None, None),
+    };
+    match sx {
+        Some(false) => (x0, x1) = (q.x, if from_center { w0 - q.x } else { w0 }),
+        Some(true) => (x0, x1) = (if from_center { w0 - q.x } else { 0.0 }, q.x),
+        None => {}
+    }
+    match sy {
+        Some(false) => (y0, y1) = (q.y, if from_center { h0 - q.y } else { h0 }),
+        Some(true) => (y0, y1) = (if from_center { h0 - q.y } else { 0.0 }, q.y),
+        None => {}
+    }
+    if keep && w0 > 1e-9 && h0 > 1e-9 && !matches!(handle, Handle::Rotate(_)) {
+        // One factor for both axes: the dragged axis's (a corner: the one that moved the most),
+        // about the point that stays put (the opposite handle, or the centre).
+        let (kx, ky) = ((x1 - x0) / w0, (y1 - y0) / h0);
+        let k = match (sx, sy) {
+            (None, _) => ky,
+            (_, None) => kx,
+            _ if kx.abs() > ky.abs() => kx,
+            _ => ky,
+        };
+        let pivot = if from_center { Point::new(w0 / 2.0, h0 / 2.0) } else { handle_point(opposite(handle), w0, h0) };
+        (x0, x1) = (pivot.x * (1.0 - k), pivot.x + (w0 - pivot.x) * k);
+        (y0, y1) = (pivot.y * (1.0 - k), pivot.y + (h0 - pivot.y) * k);
+    }
+    (x0, y0, x1, y1)
+}
+
+/// A handle's point in its box's axes (`w0`×`h0`): a corner or an edge's middle.
+fn handle_point(h: Handle, w0: f64, h0: f64) -> Point {
+    match h {
+        Handle::Corner(0) | Handle::Rotate(0) => Point::new(0.0, 0.0),
+        Handle::Corner(1) | Handle::Rotate(1) => Point::new(w0, 0.0),
+        Handle::Corner(2) | Handle::Rotate(2) => Point::new(w0, h0),
+        Handle::Corner(_) | Handle::Rotate(_) => Point::new(0.0, h0),
+        Handle::Edge(0) => Point::new(w0 / 2.0, 0.0),
+        Handle::Edge(1) => Point::new(w0, h0 / 2.0),
+        Handle::Edge(2) => Point::new(w0 / 2.0, h0),
+        Handle::Edge(_) => Point::new(0.0, h0 / 2.0),
+    }
+}
+
+/// Anchor `(column, row)` of a `w`×`h` box, in its axes.
+fn anchor_in_box(anchor: (u8, u8), w: f64, h: f64) -> Point {
+    Point::new(w * f64::from(anchor.0.min(2)) / 2.0, h * f64::from(anchor.1.min(2)) / 2.0)
+}
+
+/// The Scale tool's anchor point on the selection's handle box, in page coordinates.
+pub fn scale_anchor_point(doc: &Document, sel: &[NodeId], anchor: (u8, u8)) -> Option<Point> {
+    let (f, w, h) = selection_frame(doc, sel)?;
+    Some(f * anchor_in_box(anchor, w, h))
+}
+
+/// The handle across the box from `h`.
+fn opposite(h: Handle) -> Handle {
+    match h {
+        Handle::Corner(i) => Handle::Corner((i + 2) % 4),
+        Handle::Edge(i) => Handle::Edge((i + 2) % 4),
+        Handle::Rotate(i) => Handle::Rotate((i + 2) % 4),
+    }
+}
+
+/// The Scale tool's factor and pivot (in the box's axes) for dragging `handle` of a `w0`×`h0` box
+/// to `q`. The pivot is the anchor point (`anchor`: column, row), or the opposite handle when the
+/// anchor lies on the side being dragged, or the centre (`from_center`). Corners follow the axis
+/// that moved the most; a negative factor flips. None when the box has no size to scale by.
+pub(crate) fn scale_factor(handle: Handle, q: Point, w0: f64, h0: f64, anchor: (u8, u8), from_center: bool) -> Option<(f64, Point)> {
+    const EPS: f64 = 1e-9;
+    if !(q.x.is_finite() && q.y.is_finite() && w0.is_finite() && h0.is_finite()) || matches!(handle, Handle::Rotate(_)) {
+        return None;
+    }
+    let h = handle_point(handle, w0, h0);
+    let anchor_pt = anchor_in_box(anchor, w0, h0);
+    // The axes the handle moves along.
+    let (ax_x, ax_y) = match handle {
+        Handle::Edge(0) | Handle::Edge(2) => (false, true),
+        Handle::Edge(_) => (true, false),
+        _ => (true, true),
+    };
+    let on_side = (ax_x && (anchor_pt.x - h.x).abs() < EPS) || (ax_y && (anchor_pt.y - h.y).abs() < EPS);
+    let pivot = if from_center {
+        Point::new(w0 / 2.0, h0 / 2.0)
+    } else if on_side {
+        handle_point(opposite(handle), w0, h0)
+    } else {
+        anchor_pt
+    };
+    let ratio = |on: bool, to: f64, from: f64, p: f64| (on && (from - p).abs() > EPS).then(|| (to - p) / (from - p));
+    let kx = ratio(ax_x, q.x, h.x, pivot.x);
+    let ky = ratio(ax_y, q.y, h.y, pivot.y);
+    let k = match (kx, ky) {
+        (Some(a), Some(b)) => {
+            if a.abs() > b.abs() {
+                a
+            } else {
+                b
+            }
+        }
+        (Some(a), None) | (None, Some(a)) => a,
+        (None, None) => return None,
+    };
+    if !k.is_finite() {
+        return None;
+    }
+    // Never collapse to nothing (or blow up past a usable size); 0 counts as positive.
+    Some((k.signum() * k.abs().clamp(0.01, 1000.0), pivot))
+}
+
+/// The readout of a shape handle drag on `id`.
+pub(super) fn shape_hint(doc: &Document, id: NodeId, handle: ShapeHandle, zoom: f64) -> Option<ShapeHint> {
+    Some(ShapeHint { handle, value: crate::shape_handles::value(doc, id, handle)?, at: crate::shape_handles::handle_at(doc, id, handle, zoom)? })
+}
+
+#[allow(dead_code)]
+fn unused(_: BTreeMap<u8, u8>) {}
+
+/// An end point of a selected open vector within `tol` of page point `p`: (layer, point).
+pub(super) fn selected_end_at(doc: &Document, sel: &[NodeId], p: Point, tol: f64) -> Option<(NodeId, usize)> {
+    sel.iter().find_map(|id| {
+        let net = crate::vectoredit::network(doc, *id)?;
+        let w = doc.world_transform(*id);
+        let near = |v: &usize| net.vertices.get(*v).is_some_and(|x| (w * x.point() - p).hypot() <= tol);
+        (0..net.vertices.len()).filter(near).find(|v| net.incident(*v).len() == 1).map(|v| (*id, v))
+    })
+}
diff --git a/crates/engine/src/canvas/tools/keys.rs b/crates/engine/src/canvas/tools/keys.rs
new file mode 100644
index 00000000..591f1479
--- /dev/null
+++ b/crates/engine/src/canvas/tools/keys.rs
@@ -0,0 +1,174 @@
+use super::*;
+
+impl Session {
+    /// Keys the current mode handles before menu shortcuts (vector edit mode's tools and point
+    /// keys, Enter to finish the shape builder). Returns whether the key was used.
+    pub fn tool_key(&mut self, name: &str, shift: bool, alt: bool, cmd: bool) -> Result<bool> {
+        // Dev Mode edits nothing: keys go to the commands (which it refuses in the app).
+        if self.tool.dev_mode {
+            return Ok(false);
+        }
+        if self.ds().is_ok_and(|d| d.vector_edit.is_some()) {
+            return crate::vectoredit::key(self, name, shift, alt, cmd);
+        }
+        if !alt && !cmd && self.guide_key(name, shift)? {
+            return Ok(true);
+        }
+        crate::shapebuilder::key(self, name)
+    }
+
+    /// Keys for a selected ruler guide: Delete removes it, arrows across it nudge it (Shift: the big
+    /// nudge), Escape deselects it.
+    fn guide_key(&mut self, name: &str, shift: bool) -> Result<bool> {
+        let Some((owner, index)) = self.ds()?.selected_guide() else { return Ok(false) };
+        // Backspace is Delete, `Left` is `ArrowLeft`, and so on.
+        let name = crate::keymap::normalize(name).map_or(name, |(k, _)| k);
+        let page = self.page()?;
+        let at = |mut p: serde_json::Value| {
+            if owner != page {
+                p["frame"] = json!(owner);
+            }
+            p
+        };
+        let Some(g) = self.doc()?.node(owner).and_then(|n| n.guides().get(index).cloned()) else { return Ok(false) };
+        let step = if shift { self.prefs.nudge_big } else { self.prefs.nudge_small };
+        let d = match (name, g.vertical) {
+            ("Delete", _) => {
+                self.execute("guide.remove", &at(json!({"index": index})))?;
+                return Ok(true);
+            }
+            ("Escape", _) => {
+                self.execute("guide.select", &json!({}))?;
+                return Ok(true);
+            }
+            ("ArrowLeft", true) | ("ArrowUp", false) => -step,
+            ("ArrowRight", true) | ("ArrowDown", false) => step,
+            _ => return Ok(false),
+        };
+        self.execute("guide.move", &at(json!({"index": index, "offset": g.offset + d})))?;
+        Ok(true)
+    }
+
+    /// The layer under `p` for a click: the topmost on `page`, or in the focus view the focused
+    /// frame's. Boolean groups are hit by their results ([`crate::booleans::result_outline`]); in
+    /// outline mode shapes only on their outlines.
+    pub fn hit(&self, doc: &Document, page: NodeId, p: Point, tol: f64) -> Option<NodeId> {
+        let sel = self.selection();
+        let result = crate::booleans::result_outline(doc, &sel);
+        let focus = self.ds().ok().and_then(crate::DocState::focused);
+        // Outline mode draws no fills: shapes are clicked on their outlines, reaching what's behind.
+        if let Some(v) = self.ds().ok().map(|d| &d.view).filter(|v| v.outlines) {
+            // What it draws besides the shapes can be clicked too.
+            let also = figcraft_doc::geometry::OutlineHits { hidden: v.outline_hidden, bounds: v.outline_bounds };
+            return figcraft_doc::geometry::hit_outlines(doc, focus.unwrap_or(page), p, tol, Some(&result), also);
+        }
+        match focus {
+            Some(f) => figcraft_doc::geometry::hit_in(doc, f, p, tol, Some(&result)),
+            None => doc.hit_test(page, p, tol, Some(&result)),
+        }
+    }
+
+    /// Enter with a shape or frame tool (`tool.place`): what a click with it makes, centred on `at`
+    /// (default the middle of the view) and selected.
+    pub fn place(&mut self, at: Option<Point>) -> Result<()> {
+        let tool = self.tool.tool;
+        let refuse = |why: &str| Err(crate::EngineError::Disabled("tool.place".into(), why.into()));
+        if !tool.draws_shape() {
+            return refuse("choose a shape or frame tool first");
+        }
+        if self.tool.busy() {
+            return refuse("finish the drag first");
+        }
+        let v = &self.ds()?.view;
+        let (c, zoom) = (at.unwrap_or(Point::new(v.cx, v.cy)), v.zoom);
+        let (w, h) = tool.click_size();
+        let ev = |kind| PointerEvent::at(kind, c.x - w / 2.0, c.y - h / 2.0, zoom);
+        let r = self.pointer(&ev(PointerKind::Down)).and_then(|()| self.pointer(&ev(PointerKind::Up)));
+        if r.is_err() {
+            self.tool.gesture = Gesture::None;
+            let _ = self.cancel_interaction();
+        }
+        r
+    }
+
+    /// Keyboard Escape: cancel gestures, finish pens, leave text editing, then deselect (in the
+    /// focus view, once the focused frame or nothing is selected, it ends the focus view).
+    pub fn escape(&mut self) -> Result<()> {
+        // Following someone in a live session: Escape stops that first.
+        if self.live_unfollow() {
+            return Ok(());
+        }
+        if self.tool.pen.is_some() {
+            return self.pen_end();
+        }
+        if self.tool.busy() {
+            self.tool.gesture = Gesture::None;
+            self.tool.overlay = Overlay::default();
+            return self.cancel_interaction();
+        }
+        if self.end_origin_edit() {
+            return Ok(());
+        }
+        if self.ds()?.text_edit.is_some() {
+            return textedit::end(self);
+        }
+        if self.ds()?.vector_edit.is_some() {
+            return crate::vectoredit::escape(self);
+        }
+        if self.tool.tool != ToolId::Move {
+            self.set_tool(ToolId::Move);
+            return Ok(());
+        }
+        let sel = self.selection();
+        if let Some(f) = self.ds()?.focused()
+            && (sel.is_empty() || sel == [f])
+        {
+            self.ds_mut()?.focus = None;
+            return Ok(());
+        }
+        // Escape selects the parent, then nothing.
+        let doc = self.doc()?;
+        let parents: Vec<NodeId> =
+            sel.iter().filter_map(|i| doc.node(*i).and_then(|n| n.parent)).filter(|p| !doc.node(*p).is_some_and(Node::is_page)).collect();
+        if !parents.is_empty() {
+            let mut uniq = Vec::new();
+            for p in parents {
+                if !uniq.contains(&p) {
+                    uniq.push(p);
+                }
+            }
+            self.set_selection(uniq);
+        } else {
+            self.set_selection(vec![]);
+        }
+        Ok(())
+    }
+
+    /// Whether the Move tool shows arc and shape handles now (not while another gesture runs, nor
+    /// in vector or text edit mode).
+    pub(super) fn arc_handles_shown(&self) -> bool {
+        let arc_drag = matches!(self.tool.gesture, Gesture::Arc { .. } | Gesture::Shape { .. });
+        self.tool.tool == ToolId::Move
+            && !self.tool.dev_mode
+            && (arc_drag || !self.tool.busy())
+            && self.ds().is_ok_and(|ds| ds.vector_edit.is_none() && ds.text_edit.is_none())
+    }
+
+    /// The selected ellipse's arc handles as the canvas shows them at the current zoom.
+    pub fn arc_handles(&self) -> Option<crate::arc_handles::ArcHandles> {
+        let ds = self.ds().ok()?;
+        self.arc_handles_shown().then(|| crate::arc_handles::handles(&ds.doc, &ds.selection, ds.view.zoom)).flatten()
+    }
+
+    /// The selected shape's corner radius and star ratio handles as the canvas shows them now.
+    pub fn shape_handles(&self) -> Vec<(ShapeHandle, [f64; 2])> {
+        let Ok(ds) = self.ds() else { return vec![] };
+        if self.arc_handles_shown() { crate::shape_handles::handles(&ds.doc, &ds.selection, ds.view.zoom) } else { vec![] }
+    }
+
+    /// Snapshot of tool state for the UI / inspect.
+    pub fn tool_info(&self) -> serde_json::Value {
+        let shapes: Vec<serde_json::Value> = self.shape_handles().into_iter().map(|(h, at)| json!({"handle": h, "at": at})).collect();
+        json!({"tool": self.tool.tool.id(), "busy": self.tool.busy(), "overlay": self.tool.overlay, "arcHandles": self.arc_handles(), "shapeHandles": shapes})
+    }
+}
diff --git a/crates/engine/src/canvas/tools/pen.rs b/crates/engine/src/canvas/tools/pen.rs
new file mode 100644
index 00000000..319c11b7
--- /dev/null
+++ b/crates/engine/src/canvas/tools/pen.rs
@@ -0,0 +1,276 @@
+use super::handles::{PENCIL_STROKE, selected_end_at};
+use super::*;
+
+/// Pen pressure along drawn samples as width profile points `[t, scale]`: `t` by length, at most
+/// 32 points, medium pressure (0.5) at the stroke weight, from a tenth to twice it. `None` when no
+/// sample has pressure.
+pub(crate) fn pressure_profile(points: &[Point], pressure: &[Option<f32>]) -> Option<Vec<[f64; 2]>> {
+    if pressure.iter().all(Option::is_none) {
+        return None;
+    }
+    let mut lengths = vec![0.0];
+    for w in points.windows(2) {
+        let (Some(a), Some(b)) = (w.first(), w.get(1)) else { continue };
+        lengths.push(lengths.last().copied().unwrap_or(0.0) + (*b - *a).hypot());
+    }
+    let total = lengths.last().copied().unwrap_or(0.0);
+    if !(total.is_finite() && total > 0.0) {
+        return None;
+    }
+    let at = |i: usize| f64::from(pressure.get(i).copied().flatten().filter(|p| p.is_finite()).unwrap_or(0.5).clamp(0.0, 1.0));
+    let n = points.len().clamp(2, 32);
+    let profile = (0..n).map(|k| {
+        let t = k as f64 / (n - 1) as f64;
+        let s = t * total;
+        let i = lengths.partition_point(|l| *l < s).min(lengths.len().saturating_sub(1));
+        let p = match (i.checked_sub(1).and_then(|j| lengths.get(j)), lengths.get(i)) {
+            (Some(a), Some(b)) if b > a => at(i - 1) + (at(i) - at(i - 1)) * ((s - a) / (b - a)),
+            _ => at(i),
+        };
+        [t, (p / 0.5).clamp(0.1, 2.0)]
+    });
+    Some(profile.collect())
+}
+
+/// A frame or section drawn around layers takes those of its siblings that lie fully inside it
+/// (visible and unlocked ones, in their order; a frame never takes a section). Not in auto layout,
+/// where the new frame is one more item of the flow.
+pub(super) fn take_enclosed(doc: &mut Document, drawn: NodeId) -> Result<()> {
+    let Some(n) = doc.node(drawn) else { return Ok(()) };
+    let section = matches!(n.kind, NodeKind::Section { .. });
+    let (Some(parent), Some(area)) = (n.parent.and_then(|p| doc.node(p)), doc.world_bounds(drawn)) else { return Ok(()) };
+    if parent.layout.is_some() {
+        return Ok(());
+    }
+    let inside: Vec<NodeId> = parent
+        .children
+        .iter()
+        .copied()
+        .filter(|c| *c != drawn && doc.node(*c).is_some_and(|k| k.visible && !k.locked && (section || !matches!(k.kind, NodeKind::Section { .. }))))
+        .filter(|c| doc.world_bounds(*c).is_some_and(|b| area.contains(b.origin()) && area.contains(Point::new(b.x1, b.y1))))
+        .collect();
+    for c in inside {
+        doc.reparent(c, drawn, None)?;
+    }
+    Ok(())
+}
+
+impl Session {
+    /// The pen tool's snapped position for `ev`: its path's vector (or, before it has one, its first
+    /// point) counts among the targets.
+    pub(super) fn snap_pen_tool(&mut self, ev: &PointerEvent) -> Result<(Point, Vec<Guide>)> {
+        let (id, extra) = match &self.tool.pen {
+            Some(pen) if pen.id.is_some() => (pen.id, Vec::new()),
+            Some(pen) => (None, pen.points.iter().map(|(p, _, _)| *p).collect()),
+            None => (None, Vec::new()),
+        };
+        self.snap_pen(ev, id, &extra)
+    }
+
+    pub(super) fn pen_down(&mut self, ev: &PointerEvent) -> Result<()> {
+        self.tool.overlay.guides.clear();
+        // The segment being placed shows as itself while the press lasts.
+        self.tool.overlay.rubber = None;
+        self.tool.overlay.rubber_handle = None;
+        let p = if ev.shift { ev.p() } else { self.snap_pen_tool(ev)?.0 };
+        let (doc, page) = {
+            let ds = self.ds()?;
+            (ds.doc.clone(), ds.page)
+        };
+        // With an open path selected, a click on one of its end points continues it in edit mode.
+        if self.tool.pen.is_none()
+            && let Some((id, v)) = selected_end_at(&doc, &self.selection(), ev.p(), 8.0 / ev.zoom.max(1e-6))
+        {
+            return self.pen_edit(id, Some(v));
+        }
+        let pen = self.tool.pen.get_or_insert_with(PenPath::default);
+        // Clicking the first anchor closes the path.
+        if pen.points.len() > 2
+            && let Some((first, _, _)) = pen.points.first()
+            && (*first - p).hypot() * ev.zoom < 8.0
+        {
+            pen.closed = true;
+            self.pen_update()?;
+            return self.pen_finish();
+        }
+        // Clicking another of its own anchors (not the last) connects there and ends the path.
+        let near = |q: &Point| (*q - p).hypot() * ev.zoom < 8.0;
+        if let Some(k) = (1..pen.points.len().saturating_sub(1)).find(|k| pen.points.get(*k).is_some_and(|(q, _, _)| near(q))) {
+            pen.join = Some(k);
+            self.pen_update()?;
+            return self.pen_finish();
+        }
+        if pen.parent.is_none() {
+            pen.parent = Some(frame_at(&doc, page, p, &[]).unwrap_or(page));
+        }
+        let mut p = p;
+        if ev.shift
+            && let Some((last, _, _)) = pen.points.last()
+        {
+            p = at_45_degrees(*last, p);
+        }
+        pen.points.push((p, Vec2::ZERO, Vec2::ZERO));
+        self.tool.gesture = Gesture::PenDrag { anchor: p };
+        self.pen_update()
+    }
+
+    /// Rebuild the pen's vector node from its anchors.
+    pub(super) fn pen_update(&mut self) -> Result<()> {
+        let Some(pen) = self.tool.pen.clone() else { return Ok(()) };
+        self.tool.overlay.pen = pen.points.iter().map(|(p, _, _)| [p.x, p.y]).collect();
+        self.tool.overlay.pen_handles = pen_handles(&pen.points);
+        if pen.points.len() < 2 {
+            if let Ok(ds) = self.ds_mut() {
+                ds.revision += 1;
+            }
+            return Ok(());
+        }
+        let page = self.page()?;
+        let parent = pen.parent.unwrap_or(page);
+        if pen.id.is_none() {
+            self.begin_interaction("Pen")?;
+        }
+        let ds = self.ds_mut()?;
+        let doc = ds.doc_mut();
+        let pw = doc.world_transform(parent);
+        let inv = pw.inverse();
+        // Anchors and handles into the parent's space.
+        let pts: Vec<(Point, Point, Point)> = pen.points.iter().map(|(p, i, o)| (inv * *p, inv * (*p + *i), inv * (*p + *o))).collect();
+        let mut path = figcraft_geom::BezPath::new();
+        for (k, (p, _, _)) in pts.iter().enumerate() {
+            if k == 0 {
+                path.move_to(*p);
+            } else if let (Some(prev), Some(cur)) = (pts.get(k - 1), pts.get(k)) {
+                path.curve_to(prev.2, cur.1, *p);
+            }
+        }
+        if pen.closed
+            && let (Some(last), Some(first)) = (pts.last(), pts.first())
+        {
+            path.curve_to(last.2, first.1, first.0);
+            path.close_path();
+        }
+        use figcraft_geom::Shape;
+        let bb = path.bounding_box();
+        path.apply_affine(Affine::translate((-bb.x0, -bb.y0)));
+        let mut net = VectorNetwork::from_path(&path);
+        // Straight segments stay straight.
+        for s in &mut net.segments {
+            if (s.ta.0.abs() + s.ta.1.abs()) < 1e-9 && (s.tb.0.abs() + s.tb.1.abs()) < 1e-9 {
+                s.ta = (0.0, 0.0);
+                s.tb = (0.0, 0.0);
+            }
+        }
+        if !pen.closed {
+            net.regions.clear();
+        }
+        // Anchor k is vertex k of the open path.
+        if let (Some(k), Some((last, _, out))) = (pen.join, pts.last()) {
+            let from = pts.len() - 1;
+            crate::vectoredit::ops::connect(&mut net, from, k, (out.x - last.x, out.y - last.y), (0.0, 0.0));
+        }
+        let id = match pen.id {
+            Some(id) if doc.contains(id) => id,
+            _ => {
+                let id = doc.alloc_id();
+                let mut n = Node::new(id, NodeKind::Vector { network: VectorNetwork::default() }, "Vector", 0.0, 0.0);
+                n.fills.clear();
+                n.strokes = vec![figcraft_color::Paint::solid(figcraft_color::Color::BLACK)];
+                n.stroke.align = StrokeAlign::Center;
+                doc.insert(n, parent, None)?;
+                id
+            }
+        };
+        let n = doc.get_mut(id)?;
+        n.kind = NodeKind::Vector { network: net };
+        n.width = bb.width();
+        n.height = bb.height();
+        n.transform = Affine::translate((bb.x0, bb.y0));
+        if pen.closed && n.fills.is_empty() {
+            n.fills = vec![figcraft_color::Paint::solid(figcraft_color::Color::DEFAULT_SHAPE)];
+        }
+        ds.selection = vec![id];
+        ds.revision += 1;
+        if let Some(p) = self.tool.pen.as_mut() {
+            p.id = Some(id);
+        }
+        Ok(())
+    }
+
+    /// Edit `id` as a vector with the pen, going on from point `anchor` (or, without one, starting
+    /// a new path in the same layer at the next click).
+    fn pen_edit(&mut self, id: NodeId, anchor: Option<usize>) -> Result<()> {
+        self.set_tool(ToolId::Move);
+        crate::vectoredit::begin(self, id)?;
+        crate::vectoredit::set_tool(self, crate::vectoredit::VTool::Pen)?;
+        crate::vectoredit::set_state(self, |e| {
+            e.anchor = anchor;
+            e.vertices = anchor.into_iter().collect();
+        })
+    }
+
+    /// Enter/Escape while the pen draws: the path ends but its layer stays in edit mode with the
+    /// pen, so the next path joins the same vector (another Escape leaves edit mode).
+    pub fn pen_end(&mut self) -> Result<()> {
+        let id = self.tool.pen.as_ref().and_then(|p| p.id);
+        self.pen_finish()?;
+        match id {
+            Some(id) if self.doc()?.contains(id) => self.pen_edit(id, None),
+            _ => Ok(()),
+        }
+    }
+
+    /// Finish the pen path (and keep the pen tool: double-click, Delete, a tool switch).
+    pub fn pen_finish(&mut self) -> Result<()> {
+        let pen = self.tool.pen.take();
+        self.tool.overlay.pen.clear();
+        self.tool.overlay.pen_handles.clear();
+        self.tool.overlay.rubber = None;
+        self.tool.overlay.rubber_handle = None;
+        self.tool.gesture = Gesture::None;
+        if pen.as_ref().is_some_and(|p| p.id.is_some()) {
+            self.commit_interaction()?;
+        }
+        Ok(())
+    }
+
+    pub(super) fn pencil_finish(&mut self, points: &[Point], pressure: &[Option<f32>]) -> Result<()> {
+        if points.len() < 2 {
+            return Ok(());
+        }
+        // Smooth: fit a curve through the samples.
+        let mut poly = figcraft_geom::BezPath::new();
+        for (k, p) in points.iter().enumerate() {
+            if k == 0 {
+                poly.move_to(*p);
+            } else {
+                poly.line_to(*p);
+            }
+        }
+        let fitted = figcraft_geom::kurbo::simplify::simplify_bezpath(poly.iter(), 0.75, &Default::default());
+        let d = fitted.to_svg();
+        if matches!(self.tool.tool, ToolId::Marker | ToolId::Highlighter) {
+            return self.ink_finish(&d);
+        }
+        let page = self.page()?;
+        let parent = frame_at(self.doc()?, page, points.first().copied().unwrap_or_default(), &[]).unwrap_or(page);
+        let pw = self.doc()?.world_transform(parent);
+        let mut local = fitted.clone();
+        local.apply_affine(pw.inverse());
+        let _ = d;
+        let (color, weight) = PENCIL_STROKE;
+        let mut props = json!({"fills": [], "strokes": [color.to_css_hex()], "strokeWeight": weight, "strokeCap": "round", "strokeJoin": "round", "strokeAlign": "center"});
+        // Pen pressure becomes the stroke's width profile (brushes follow it too).
+        if let Some(points) = pressure_profile(points, pressure) {
+            props["widthProfile"] = json!(points);
+        }
+        if let Some(b) = &self.tool.pencil_brush {
+            props["brush"] = serde_json::to_value(b).unwrap_or_default();
+        }
+        self.execute(
+            "node.create",
+            &json!({"type": "vector", "path": local.to_svg(), "closed": false, "parent": parent, "name": "Vector", "props": props}),
+        )?;
+        Ok(())
+    }
+}
diff --git a/crates/engine/src/canvas/tools/pointer.rs b/crates/engine/src/canvas/tools/pointer.rs
new file mode 100644
index 00000000..985e3326
--- /dev/null
+++ b/crates/engine/src/canvas/tools/pointer.rs
@@ -0,0 +1,292 @@
+use super::handles::{handle_at, label_at, locked_in, on_corner_square, resize_cursor, selected_end_at};
+use super::*;
+
+impl Session {
+    /// The pointer left the canvas: what hovering there showed goes (the distances Alt or Dev Mode
+    /// measured and the box measured to, a vector region's highlight), unless a gesture holds it.
+    pub fn pointer_left(&mut self) {
+        if !self.tool.busy() {
+            self.tool.overlay.guides.clear();
+            self.tool.overlay.measure_box = None;
+        }
+        self.vector_pointer_left();
+    }
+
+    /// What a marquee starting at page point `p` selects inside: the top-level frame it starts in
+    /// (its children), or the focus view's frame.
+    pub(crate) fn marquee_within(&self, p: Point) -> Result<Option<NodeId>> {
+        let (doc, page) = (self.doc()?, self.page()?);
+        let within = frame_at(doc, page, p, &[]).filter(|f| doc.node(*f).is_some_and(|n| n.parent == Some(page)));
+        let within = within.filter(|f| doc.world_bounds(*f).is_some_and(|b| b.contains(p)));
+        Ok(self.ds()?.focused().or(within))
+    }
+
+    /// The selection a marquee over page rect `r` makes from `base` (what was selected before):
+    /// the layers it touches (`deep`: nested ones too); `additive` (Shift) toggles them.
+    pub(crate) fn marquee_selection(&self, r: Rect, within: Option<NodeId>, deep: bool, base: &[NodeId], additive: bool) -> Result<Vec<NodeId>> {
+        let (doc, page) = (self.doc()?, self.page()?);
+        let mut hits =
+            if deep { figcraft_doc::geometry::marquee_deep(doc, page, r) } else { figcraft_doc::geometry::marquee_select(doc, page, r, within) };
+        if let Some(f) = self.ds()?.focused() {
+            hits.retain(|h| *h != f && doc.is_ancestor(f, *h));
+        }
+        // A marquee over a frame from outside selects the frame only when it covers it fully.
+        if within.is_none() && !deep {
+            hits.retain(|h| {
+                let full = doc.world_bounds(*h).is_some_and(|b| r.contains(b.origin()) && r.contains(Point::new(b.x1, b.y1)));
+                full || !doc.node(*h).is_some_and(|n| n.kind.is_frame_like() || matches!(n.kind, NodeKind::Section { .. }))
+            });
+        }
+        // Shift toggles: what was selected and is touched again comes out.
+        let mut sel: Vec<NodeId> = base.iter().copied().filter(|b| !(additive && hits.contains(b))).collect();
+        for h in hits {
+            if !base.contains(&h) && !sel.contains(&h) {
+                sel.push(h);
+            }
+        }
+        Ok(sel)
+    }
+
+    pub fn set_tool(&mut self, t: ToolId) {
+        if self.tool.tool == ToolId::Pen && t != ToolId::Pen {
+            let _ = self.pen_finish();
+        }
+        if !matches!(t, ToolId::Move | ToolId::Scale | ToolId::Hand) && self.ds().is_ok_and(|d| d.vector_edit.is_some()) {
+            let _ = crate::vectoredit::end(self);
+        }
+        self.tool.tool = t;
+        self.tool.gesture = Gesture::None;
+        self.tool.pick_only = false;
+        // The tool's cursor shows before the pointer moves.
+        self.tool.overlay =
+            Overlay { builder_remove: self.tool.builder_remove && t == ToolId::ShapeBuilder, cursor: t.cursor(), ..Overlay::default() };
+        self.tool.shape_builder = None;
+        if t == ToolId::ShapeBuilder {
+            // Regions show straight away, before the pointer moves.
+            let sel = self.selection();
+            let _ = crate::shapebuilder::arrangement(self, &sel);
+        }
+        if let Ok(ds) = self.ds_mut() {
+            if !matches!(t, ToolId::Text | ToolId::TextOnPath | ToolId::Move) {
+                ds.text_edit = None;
+            }
+            ds.revision += 1;
+        }
+    }
+
+    /// The tool pointer events go to: in Dev Mode every tool but the hand and comments selects.
+    fn acting_tool(&self) -> ToolId {
+        match self.tool.tool {
+            t if self.tool.dev_mode && !matches!(t, ToolId::Hand | ToolId::Comment) => ToolId::Move,
+            t => t,
+        }
+    }
+
+    /// Drop the gesture under way (a drag, a resize, a shape being drawn), restoring the document
+    /// as Escape does; the UI calls it when Dev Mode starts, where nothing may move.
+    pub fn drop_gesture(&mut self) -> Result<()> {
+        self.tool.gesture = Gesture::None;
+        self.cancel_interaction()
+    }
+
+    /// Feed one pointer event to the current tool.
+    pub fn pointer(&mut self, ev: &PointerEvent) -> Result<()> {
+        // A held button sends the same move every frame: running the gesture again would only
+        // rebuild the same preview (a new document, and a canvas render, every frame).
+        if ev.kind != PointerKind::Move {
+            self.tool.last_move = None;
+        } else if self.tool.busy() {
+            if self.tool.last_move.as_ref() == Some(ev) {
+                return Ok(());
+            }
+            self.tool.last_move = Some(ev.clone());
+        }
+        let tool = self.acting_tool();
+        let edits = matches!(tool, ToolId::Move | ToolId::Scale) && !self.tool.dev_mode;
+        if edits && self.origin_pointer(ev)? {
+            return Ok(());
+        }
+        if edits && self.ds().is_ok_and(|d| d.vector_edit.is_some()) && self.vector_pointer(ev)? {
+            return Ok(());
+        }
+        if tool == ToolId::ShapeBuilder {
+            return self.shape_builder_pointer(ev);
+        }
+        match ev.kind {
+            PointerKind::Hover => self.hover(ev),
+            PointerKind::Down => match tool {
+                ToolId::Move | ToolId::Scale => {
+                    // While a board's vote runs, a click on an object votes.
+                    if tool == ToolId::Move && !self.tool.dev_mode && self.vote_down(ev)? {
+                        return Ok(());
+                    }
+                    // A click on the canvas deselects a ruler guide (the UI selects guides itself).
+                    self.ds_mut()?.guide = None;
+                    self.move_down(ev)
+                }
+                ToolId::Hand => {
+                    let v = &self.ds()?.view;
+                    self.tool.gesture = Gesture::Pan { sx: ev.sx, sy: ev.sy, cx: v.cx, cy: v.cy };
+                    self.tool.overlay.cursor = Cursor::Grabbing;
+                    Ok(())
+                }
+                ToolId::Text => self.text_down(ev),
+                ToolId::TextOnPath => self.text_on_path_down(ev),
+                ToolId::Pen => self.pen_down(ev),
+                ToolId::Pencil => {
+                    self.tool.gesture = Gesture::Pencil { points: vec![ev.p()], pressure: vec![ev.pressure] };
+                    Ok(())
+                }
+                ToolId::Comment => {
+                    self.request_ui("comment.new", json!({"x": ev.x, "y": ev.y}));
+                    Ok(())
+                }
+                ToolId::Eyedropper => self.eyedrop(ev),
+                t if t.on_boards() => self.board_down(ev),
+                t if t.draws_shape() => self.draw_down(ev),
+                _ => Ok(()),
+            },
+            PointerKind::Move => self.drag(ev),
+            PointerKind::Up => self.up(ev),
+            PointerKind::DoubleClick => self.double_click(ev),
+        }
+    }
+
+    /// The rotation origin handle while it shows: a press drags it, a double-click puts it back
+    /// at the centre. True when the event was the handle's.
+    fn origin_pointer(&mut self, ev: &PointerEvent) -> Result<bool> {
+        let dragging = matches!(self.tool.gesture, Gesture::Origin);
+        if !dragging && !self.ds()?.on_origin_handle(ev.p(), ev.zoom) {
+            return Ok(false);
+        }
+        match ev.kind {
+            PointerKind::Down if !dragging => self.tool.gesture = Gesture::Origin,
+            PointerKind::Move if dragging => self.drag_origin_to(ev.p(), ev.zoom)?,
+            PointerKind::Up if dragging => self.tool.gesture = Gesture::None,
+            PointerKind::DoubleClick => self.set_rotation_origin(None)?,
+            PointerKind::Hover => {}
+            _ => return Ok(false),
+        }
+        self.tool.overlay.cursor = Cursor::Move;
+        Ok(true)
+    }
+
+    pub(super) fn hover(&mut self, ev: &PointerEvent) -> Result<()> {
+        let tool = self.acting_tool();
+        let ds = self.ds()?;
+        let (doc, sel, page) = (ds.doc.clone(), ds.selection.clone(), ds.page);
+        let mut cursor = tool.cursor();
+        // The text being edited, and with the Text tool any text, takes the I-beam: a click there
+        // puts the caret.
+        let on_edited = ds
+            .text_edit
+            .as_ref()
+            .is_some_and(|te| doc.world_bounds(te.id).is_some_and(|b| b.inflate(ev.tol() * 4.0, ev.tol() * 4.0).contains(ev.p())));
+        let on_text =
+            |s: &Self| s.hit(&doc, page, ev.p(), ev.tol() * 2.0).and_then(|l| doc.node(l)).is_some_and(|n| matches!(n.kind, NodeKind::Text(_)));
+        if tool == ToolId::Text && (on_edited || on_text(self)) {
+            cursor = Cursor::Text;
+        }
+        if tool == ToolId::TextOnPath && (on_edited || self.path_at(&doc, page, ev).is_some()) {
+            cursor = Cursor::Text;
+        }
+        let mut hover = None;
+        let mut guides = Vec::new();
+        let mut measure_box = None;
+        let arc_hover = if self.arc_handles_shown() { crate::arc_handles::hit(&doc, &sel, ev.p(), ev.zoom).map(|(_, h)| h) } else { None };
+        self.tool.overlay.arc_hover = arc_hover;
+        let shape_hover = if self.arc_handles_shown() && !on_corner_square(&doc, &sel, ev.p(), ev.zoom) {
+            crate::shape_handles::hit(&doc, &sel, ev.p(), ev.zoom).map(|(_, h)| h)
+        } else {
+            None
+        };
+        self.tool.overlay.shape_hover = shape_hover;
+        if matches!(tool, ToolId::Move | ToolId::Scale) && on_edited {
+            cursor = Cursor::Text;
+        } else if matches!(tool, ToolId::Move | ToolId::Scale) && arc_hover.is_none() && shape_hover.is_none() {
+            if let Some(h) = handle_at(&doc, &sel, ev.p(), ev.zoom).filter(|_| !self.tool.dev_mode) {
+                cursor = resize_cursor(&doc, &sel, h);
+            } else {
+                let leaf = self.hit(&doc, page, ev.p(), ev.tol() * 2.0);
+                if leaf.and_then(|l| crate::widgets::target_at(&doc, l, ev.p())).is_some() {
+                    cursor = Cursor::Pointer;
+                }
+                hover = label_at(&doc, page, &self.tool.labels, ev.p()).or_else(|| leaf.map(|leaf| select_target(&doc, leaf, &sel, ev.cmd)));
+                // Alt over a selected layer: a drag from here duplicates it.
+                if ev.alt && !self.tool.dev_mode && tool == ToolId::Move && hover.is_some_and(|h| sel.contains(&h) && !locked_in(&doc, h)) {
+                    cursor = Cursor::Copy;
+                }
+                if ev.alt || self.tool.dev_mode {
+                    use crate::distance::{Hover, guide_at, hover_lines, padding_frame, parent_of};
+                    // Shift+Alt over an auto layout frame: its padding and gaps. Otherwise from the
+                    // selection to a ruler guide, the hovered layer or (over empty canvas) the parent.
+                    let around: Vec<NodeId> = sel.iter().copied().chain(hover).collect();
+                    let what = hover.filter(|_| ev.alt && ev.shift).and_then(|t| padding_frame(&doc, t)).map(Hover::Padding).or_else(|| {
+                        if sel.is_empty() {
+                            return None;
+                        }
+                        let guide = guide_at(&doc, page, &around, ev.p(), ev.tol() * 4.0).map(|(vertical, at)| Hover::Guide { vertical, at });
+                        guide.or_else(|| hover.or_else(|| parent_of(&doc, page, &sel)).map(Hover::Layer))
+                    });
+                    if let Some(what) = what {
+                        let (g, b) = hover_lines(&doc, page, &sel, what);
+                        guides = g;
+                        measure_box = b.map(|b| [b.x0, b.y0, b.x1, b.y1]);
+                    }
+                }
+            }
+        }
+        if tool == ToolId::Move && !self.tool.dev_mode && crate::board::end_handle_at(&doc, &sel, ev.p(), ev.zoom).is_some() {
+            cursor = Cursor::Grab;
+        }
+        self.tool.overlay.measure_box = measure_box;
+        self.tool.overlay.cursor = cursor;
+        if tool == ToolId::Pen {
+            // Where a click would land (snapped), with its guides.
+            let (to, g) = if ev.shift { (ev.p(), Vec::new()) } else { self.snap_pen_tool(ev)? };
+            guides = g;
+            self.tool.overlay.cursor = Cursor::Pen(self.pen_cursor(&doc, &sel, to, ev.zoom));
+            if let Some((last, _, out)) = self.tool.pen.as_ref().and_then(|pen| pen.points.last()) {
+                // With Shift the band ends where a click puts the point (#970).
+                let to = if ev.shift { at_45_degrees(*last, to) } else { to };
+                self.tool.overlay.rubber = Some([last.x, last.y, to.x, to.y]);
+                self.tool.overlay.rubber_handle = (out.hypot() > 0.0).then_some([last.x + out.x, last.y + out.y]);
+            }
+        }
+        self.tool.overlay.guides = guides;
+        let ds = self.ds_mut()?;
+        if ds.hover != hover {
+            ds.hover = hover;
+            ds.revision += 1;
+        }
+        Ok(())
+    }
+
+    /// What a click with the Pen tool at `p` (where it snaps) would do: close the path on its first
+    /// point, connect to another of its points, go on from a selected open path's end, or add a
+    /// new point (the same tests as [`Self::pen_down`]).
+    fn pen_cursor(&self, doc: &Document, sel: &[NodeId], p: Point, zoom: f64) -> PenCursor {
+        let near = |q: &Point| (*q - p).hypot() * zoom < 8.0;
+        let on_point = match &self.tool.pen {
+            None => selected_end_at(doc, sel, p, 8.0 / zoom.max(1e-6)).is_some(),
+            Some(pen) => {
+                let n = pen.points.len();
+                (n > 2 && pen.points.first().is_some_and(|(q, _, _)| near(q)))
+                    || (1..n.saturating_sub(1)).any(|k| pen.points.get(k).is_some_and(|(q, _, _)| near(q)))
+            }
+        };
+        if on_point { PenCursor::Close } else { PenCursor::New }
+    }
+
+    /// Whether what the gesture did to `ids` so far is an edit only a main component can make
+    /// (`moved`: their place among the layers counts too): it is undone when the gesture ends.
+    pub(super) fn refused(&self, ids: &[NodeId], moved: bool) -> bool {
+        let Ok(ds) = self.ds() else { return false };
+        ds.interaction.as_ref().is_some_and(|it| {
+            ids.iter().any(|m| {
+                (moved && !crate::components::move_allowed(&it.doc, &ds.doc, *m))
+                    || crate::components::refused_override(&it.doc, &ds.doc, *m).is_some()
+            })
+        })
+    }
+}
diff --git a/crates/engine/src/vectoredit.rs b/crates/engine/src/canvas/vectoredit.rs
similarity index 97%
rename from crates/engine/src/vectoredit.rs
rename to crates/engine/src/canvas/vectoredit.rs
index f923de80..03b22d22 100644
--- a/crates/engine/src/vectoredit.rs
+++ b/crates/engine/src/canvas/vectoredit.rs
@@ -4,7 +4,7 @@
 //! Entering edit mode on a non-vector shape converts it to a vector first (like the incumbent).
 //! Vertex coordinates are node-local; after each edit the node is re-fitted so its box wraps the
 //! network again. The network edits themselves live in [`ops`]; pointer gestures in `pointer.rs`,
-//! the transform box around several points in [`transform`], point snapping in `point_snap.rs` and
+//! the transform box around several points (in one layer or several) in [`transform`], point snapping in `point_snap.rs` and
 //! hovering, hatching and selecting filled regions in [`regions`].
 
 pub mod ops;
@@ -508,16 +508,15 @@ pub fn begin_many(s: &mut Session, ids: &[NodeId]) -> Result<()> {
     let before = s.ds()?.doc.clone();
     let mut edited = Vec::new();
     let mut first_err = None;
-    {
-        let doc = s.doc_mut()?;
-        for id in ids.iter().take(MAX_EDITED) {
-            if edited.contains(id) {
-                continue;
-            }
-            match ensure_vector(doc, *id) {
-                Ok(()) => edited.push(*id),
-                Err(e) => first_err = first_err.or(Some(e)),
-            }
+    for id in ids.iter().take(MAX_EDITED) {
+        if edited.contains(id) {
+            continue;
+        }
+        // Vectors are left untouched, so editing only them records no undo step.
+        let is_vector = before.node(*id).is_some_and(|n| matches!(n.kind, NodeKind::Vector { .. }));
+        match if is_vector { Ok(()) } else { ensure_vector(s.doc_mut()?, *id) } {
+            Ok(()) => edited.push(*id),
+            Err(e) => first_err = first_err.or(Some(e)),
         }
     }
     let Some((&id, rest)) = edited.split_first() else {
@@ -540,9 +539,28 @@ pub fn begin_many(s: &mut Session, ids: &[NodeId]) -> Result<()> {
 /// At most this many layers are edited at once.
 const MAX_EDITED: usize = 500;
 
+/// The edited layers left without a single segment: they draw nothing (isolated points included),
+/// so their layer would only leave an empty box behind.
+fn empty_layers(doc: &Document, ids: &[NodeId]) -> Vec<NodeId> {
+    ids.iter().copied().filter(|id| network(doc, *id).is_some_and(|n| n.segments.is_empty())).collect()
+}
+
+/// Leave edit mode. Layers whose every point was deleted go with it (the undo step that deleted
+/// the last points brings them back).
 pub fn end(s: &mut Session) -> Result<()> {
+    let empty = {
+        let ds = s.ds()?;
+        ds.vector_edit.as_ref().map(|ve| empty_layers(&ds.doc, &ve.parts().iter().map(|p| p.id).collect::<Vec<_>>())).unwrap_or_default()
+    };
+    if !empty.is_empty() {
+        let doc = s.doc_mut()?;
+        for id in &empty {
+            let _ = doc.remove(*id);
+        }
+    }
     let ds = s.ds_mut()?;
     ds.vector_edit = None;
+    ds.selection.retain(|id| !empty.contains(id));
     ds.revision += 1;
     s.tool.overlay = Default::default();
     Ok(())
diff --git a/crates/engine/src/vectoredit/ops.rs b/crates/engine/src/canvas/vectoredit/ops.rs
similarity index 100%
rename from crates/engine/src/vectoredit/ops.rs
rename to crates/engine/src/canvas/vectoredit/ops.rs
diff --git a/crates/engine/src/vectoredit/point_snap.rs b/crates/engine/src/canvas/vectoredit/point_snap.rs
similarity index 100%
rename from crates/engine/src/vectoredit/point_snap.rs
rename to crates/engine/src/canvas/vectoredit/point_snap.rs
diff --git a/crates/engine/src/vectoredit/pointer.rs b/crates/engine/src/canvas/vectoredit/pointer.rs
similarity index 88%
rename from crates/engine/src/vectoredit/pointer.rs
rename to crates/engine/src/canvas/vectoredit/pointer.rs
index 388fe245..d977ce87 100644
--- a/crates/engine/src/vectoredit/pointer.rs
+++ b/crates/engine/src/canvas/vectoredit/pointer.rs
@@ -114,6 +114,16 @@ pub(crate) struct PointSnap {
 /// Eraser brush radius in screen pixels.
 const ERASER_PX: f64 = 8.0;
 
+/// A segment's midpoint is a point a press adds when the pointer is this close (screen pixels).
+const MIDPOINT_PX: f64 = 6.0;
+
+/// The page point at `t` (0..1) along segment `seg` of vector `id`.
+fn segment_point(doc: &Document, id: NodeId, seg: usize, t: f64) -> Option<Point> {
+    use figcraft_geom::kurbo::ParamCurve;
+    let c = network(doc, id)?.cubic(seg)?;
+    Some(doc.world_transform(id) * c.eval(t.clamp(0.0, 1.0)))
+}
+
 fn erase_all(net: &mut VectorNetwork, stamps: &[Point], radius: f64) -> bool {
     stamps.iter().fold(false, |acc, c| ops::erase(net, *c, radius) | acc)
 }
@@ -262,7 +272,7 @@ impl Session {
     }
 
     /// Every edited layer's selected points (segment ends included) other than the active one's.
-    fn others_moving(doc: &Document, ve: &VectorEdit) -> Vec<(NodeId, Vec<usize>)> {
+    pub(super) fn others_moving(doc: &Document, ve: &VectorEdit) -> Vec<(NodeId, Vec<usize>)> {
         ve.others
             .iter()
             .filter_map(|o| {
@@ -310,7 +320,7 @@ impl Session {
         let Some(b) = transform::shown_box(&doc, ve) else { return Ok(()) };
         match bh {
             BoxHit::Inside => {
-                let g = self.points_gesture(ve.id, ev.p(), b.points, vec![], None, true)?;
+                let g = self.points_gesture(ve.id, ev.p(), b.points, b.others, None, true)?;
                 self.begin_interaction("Move points")?;
                 self.vgesture(g);
             }
@@ -320,7 +330,7 @@ impl Session {
                 self.vgesture(VGesture::BoxRotate { b, start_angle, angle: 0.0 });
             }
             BoxHit::Handle(handle) => {
-                let targets = Arc::new(point_snap::targets(&doc, page, Some(ve.id), &b.points, &[]));
+                let targets = Arc::new(point_snap::targets_moving(&doc, page, Some(ve.id), &b.points, &[], &b.others));
                 self.begin_interaction("Scale points")?;
                 self.vgesture(VGesture::BoxScale { b, handle, targets, pick });
             }
@@ -337,9 +347,22 @@ impl Session {
         let shown = if width_tool { None } else { h.map(|h| (ve.id, h)).or_else(|| hit_any(&doc, ve, ev.p(), tol)) };
         // A pen click on empty canvas lands where it snaps.
         let pen_at = if ve.tool == VTool::Pen && h.is_none() && !ev.shift { Some(self.snap_pen(ev, Some(ve.id), &[])?) } else { None };
+        // A point a press on the outline would add: the pen's place under its pointer on a segment
+        // (its ghost anchor), or the midpoint of the segment under the Move tool.
+        let add = match (ve.tool, h) {
+            (VTool::Pen, Some(VHit::Segment { seg, t })) => {
+                segment_point(&doc, ve.id, seg, t).map(|at| crate::tools::VectorAdd { at: [at.x, at.y], midpoint: false, on: true })
+            }
+            (VTool::Move, Some(VHit::Segment { seg, .. })) if !ev.cmd && !ev.alt => segment_point(&doc, ve.id, seg, 0.5).map(|at| {
+                let on = (at - ev.p()).hypot() * ev.zoom.max(1e-6) <= MIDPOINT_PX;
+                crate::tools::VectorAdd { at: [at.x, at.y], midpoint: true, on }
+            }),
+            _ => None,
+        };
         let ov = &mut self.tool.overlay;
         ov.vector_hover = shown.map(|x| x.1);
         ov.vector_hover_on = shown.map(|x| x.0);
+        ov.vector_add = add;
         ov.width_hover = None;
         ov.face.clear();
         ov.rubber = None;
@@ -351,6 +374,8 @@ impl Session {
             (VTool::Move, Some(_)) if ev.cmd => Cursor::Pen(PenCursor::Bend),
             (VTool::Move, _) if ev.cmd => Cursor::Crosshair,
             (VTool::Move, Some(VHit::Segment { .. })) if ev.alt => Cursor::Pen(PenCursor::Add),
+            // On a segment's midpoint the arrow turns into the pen: a press adds a point there.
+            (VTool::Move, Some(VHit::Segment { .. })) if add.is_some_and(|a| a.on) => Cursor::Pen(PenCursor::Add),
             (VTool::Move, _) => Cursor::Default,
             (VTool::Pen, Some(VHit::Vertex { .. })) => Cursor::Pen(PenCursor::Close),
             (VTool::Pen, Some(VHit::Segment { .. })) => Cursor::Pen(PenCursor::Add),
@@ -370,11 +395,13 @@ impl Session {
                 {
                     self.tool.overlay.cursor = crate::tools::handle_cursor(&b.corners(), handle);
                     self.tool.overlay.vector_hover = None;
+                    self.tool.overlay.vector_add = None;
                 } else if shown.is_none_or(|(on, h)| on == ve.id && !matches!(h, VHit::Handle { .. })) {
                     region = Self::region_under(&doc, ve, h, ev);
                     if region.is_some() {
                         self.tool.overlay.vector_hover = None;
                         self.tool.overlay.vector_hover_on = None;
+                        self.tool.overlay.vector_add = None;
                     }
                 }
             }
@@ -428,11 +455,11 @@ impl Session {
     }
 
     /// The region of the active layer a press at `ev` would take (Move tool, `h` the network's part
-    /// there). Inside the transform box around points selected in their own right, the box keeps
-    /// its drag unless the region is already selected.
+    /// there). Inside the transform box around points selected in their own right (in any edited
+    /// layer), the box keeps its drag unless the region is already selected.
     fn region_under(doc: &Document, ve: &VectorEdit, h: Option<VHit>, ev: &PointerEvent) -> Option<usize> {
         let r = region_hit(doc, ve, ev.p(), ev.zoom)?;
-        let own = !ve.shown_vertices().is_empty() || !ve.segments.is_empty();
+        let own = !ve.shown_vertices().is_empty() || !ve.segments.is_empty() || ve.others_selected();
         let in_box = !ev.shift && own && transform::box_hit(doc, ve, h, ev.p(), ev.zoom) == Some(BoxHit::Inside);
         (!in_box || ve.regions.contains(&r)).then_some(r)
     }
@@ -510,6 +537,7 @@ impl Session {
         };
         let h = hit(&doc, ve, ev.p(), tol);
         self.tool.overlay.vector_hover = None;
+        self.tool.overlay.vector_add = None;
         self.tool.overlay.face.clear();
         self.tool.overlay.guides.clear();
         let tool = if ev.cmd && ve.tool == VTool::Move { VTool::Bend } else { ve.tool };
@@ -626,8 +654,14 @@ impl Session {
                     self.vgesture(g);
                 }
                 Some(VHit::Segment { seg, t }) => {
-                    if ev.alt {
+                    // A press on the midpoint the hover showed adds a point exactly there; Alt adds
+                    // one anywhere else on the segment.
+                    let midpoint = !ev.alt
+                        && !ev.shift
+                        && segment_point(&doc, id, seg, 0.5).is_some_and(|m| (m - ev.p()).hypot() * ev.zoom.max(1e-6) <= MIDPOINT_PX);
+                    if ev.alt || midpoint {
                         // Add a point on the segment and drag it.
+                        let t = if midpoint { 0.5 } else { t };
                         self.begin_interaction("Add point")?;
                         let mut v = None;
                         self.preview(|doc, _| {
@@ -661,10 +695,14 @@ impl Session {
                     }
                 }
                 None => {
-                    // Outside every edited layer (and not shift): leave edit mode.
+                    // A press on another layer (and not shift) leaves edit mode, so the normal tool
+                    // takes it; empty canvas only clears the points and starts a marquee (a
+                    // double-click or Escape leaves edit mode).
                     let inside =
                         ve.parts().iter().any(|p| doc.world_render_bounds(p.id).is_some_and(|b| b.inflate(tol * 4.0, tol * 4.0).contains(ev.p())));
-                    if !inside && !ev.shift {
+                    let page = self.ds()?.page;
+                    let other = !inside && self.hit(&doc, page, ev.p(), tol * 2.0).is_some();
+                    if other && !ev.shift {
                         super::end(self)?;
                         return Ok(false);
                     }
@@ -883,7 +921,7 @@ impl Session {
                 let q = b.frame.inverse() * (ev.p() + c);
                 let (x0, y0, x1, y1) = crate::tools::resized_box(handle, q, b.width, b.height, ev.shift, ev.alt);
                 let m = b.onto(x0, y0, x1, y1);
-                self.preview(|doc, _| transform::transform_points(doc, id, &b.points, m))?;
+                self.preview(|doc, _| transform::transform_box(doc, id, &b, m))?;
             }
             VGesture::BoxRotate { b, start_angle, .. } => {
                 let c = b.center();
@@ -892,7 +930,7 @@ impl Session {
                     angle = (angle / 15.0).round() * 15.0;
                 }
                 let m = figcraft_geom::rotate_about(Affine::IDENTITY, c, -angle);
-                self.preview(|doc, _| transform::transform_points(doc, id, &b.points, m))?;
+                self.preview(|doc, _| transform::transform_box(doc, id, &b, m))?;
                 self.tool.overlay.cursor = Cursor::Rotate((ev.p() - c).atan2().to_degrees());
                 self.vgesture(VGesture::BoxRotate { b, start_angle, angle });
             }
@@ -996,16 +1034,18 @@ impl Session {
         self.tool.overlay.guides.clear();
         let Gesture::Vector(g) = g else { return Ok(()) };
         match g {
-            VGesture::Points { moved, split, click_clears, .. } => {
+            VGesture::Points { verts, others, moved, split, click_clears, .. } => {
                 if moved || split.is_some() {
+                    if let ([v], None) = (verts.as_slice(), split)
+                        && others.iter().all(|(_, o)| o.is_empty())
+                    {
+                        self.merge_dropped_point(ve.id, *v, 6.0 / ev.zoom.max(1e-6))?;
+                    }
                     self.commit_interaction()?;
                 } else {
                     self.cancel_interaction()?;
                     if click_clears {
-                        set_state(self, |e| {
-                            e.vertices.clear();
-                            e.segments.clear();
-                        })?;
+                        self.clear_points()?;
                     }
                 }
             }
@@ -1032,23 +1072,7 @@ impl Session {
                 }
             })?,
             VGesture::Erase { .. } | VGesture::Paint { .. } => self.commit_interaction()?,
-            VGesture::BoxScale { pick, .. } => {
-                let ds = self.ds()?;
-                let clicked = ds.interaction.as_ref().is_some_and(|it| Arc::ptr_eq(&it.doc, &ds.doc));
-                match pick.filter(|_| clicked) {
-                    Some(v) => {
-                        self.cancel_interaction()?;
-                        set_state(self, |e| {
-                            if let Some(i) = e.vertices.iter().position(|x| *x == v) {
-                                e.vertices.remove(i);
-                            } else {
-                                e.vertices.push(v);
-                            }
-                        })?;
-                    }
-                    None => self.commit_interaction()?,
-                }
-            }
+            VGesture::BoxScale { pick, .. } => self.box_scale_up(pick)?,
             VGesture::Cut { start, hit } => self.cut_up(ve, start, hit, ev)?,
             VGesture::Width(g) => self.width_up(g)?,
         }
@@ -1057,4 +1081,68 @@ impl Session {
         }
         Ok(())
     }
+
+    /// Clears the point selection of the active layer and of the other layers being edited.
+    fn clear_points(&mut self) -> Result<()> {
+        set_state(self, |e| {
+            e.vertices.clear();
+            e.segments.clear();
+            for o in &mut e.others {
+                o.vertices.clear();
+                o.segments.clear();
+            }
+        })
+    }
+
+    /// The transform box's corner or edge was let go: a Shift-click (no drag) on the corner's
+    /// point `pick` toggles it in the selection; anything else keeps the scale.
+    fn box_scale_up(&mut self, pick: Option<usize>) -> Result<()> {
+        let ds = self.ds()?;
+        let clicked = ds.interaction.as_ref().is_some_and(|it| Arc::ptr_eq(&it.doc, &ds.doc));
+        let Some(v) = pick.filter(|_| clicked) else { return self.commit_interaction() };
+        self.cancel_interaction()?;
+        set_state(self, |e| {
+            if let Some(i) = e.vertices.iter().position(|x| *x == v) {
+                e.vertices.remove(i);
+            } else {
+                e.vertices.push(v);
+            }
+        })
+    }
+
+    /// Point `v` of vector `id`, dragged and dropped within `tol` (page units) of another of its
+    /// points, merges into that point (in the same undo step as the move), which stays selected.
+    fn merge_dropped_point(&mut self, id: NodeId, v: usize, tol: f64) -> Result<()> {
+        let moved = self.ds()?.doc.get(id)?.clone();
+        let w = self.ds()?.doc.world_transform(id);
+        let NodeKind::Vector { network: net } = &moved.kind else { return Ok(()) };
+        let Some(p) = net.vertices.get(v).map(|x| w * x.point()) else { return Ok(()) };
+        let Some(keep) = net
+            .vertices
+            .iter()
+            .enumerate()
+            .filter(|(i, _)| *i != v)
+            .map(|(i, x)| (i, (w * x.point() - p).hypot()))
+            .filter(|(_, d)| *d <= tol)
+            .min_by(|a, b| a.1.total_cmp(&b.1))
+            .map(|(i, _)| i)
+        else {
+            return Ok(());
+        };
+        let mut merged = net.clone();
+        ops::merge_vertices(&mut merged, keep, v);
+        // A merge that would leave no segment (a 2-point line's ends dropped together) only moves.
+        if merged.segments.is_empty() {
+            return Ok(());
+        }
+        // The preview starts again from the document before the drag: bring the moved layer.
+        self.preview(|doc, _| {
+            *doc.get_mut(id)? = moved;
+            edit(doc, id, |net| *net = merged)
+        })?;
+        set_state(self, |e| {
+            e.vertices = vec![if keep > v { keep - 1 } else { keep }];
+            e.segments.clear();
+        })
+    }
 }
diff --git a/crates/engine/src/vectoredit/regions.rs b/crates/engine/src/canvas/vectoredit/regions.rs
similarity index 100%
rename from crates/engine/src/vectoredit/regions.rs
rename to crates/engine/src/canvas/vectoredit/regions.rs
diff --git a/crates/engine/src/vectoredit/regions_tests.rs b/crates/engine/src/canvas/vectoredit/regions_tests.rs
similarity index 100%
rename from crates/engine/src/vectoredit/regions_tests.rs
rename to crates/engine/src/canvas/vectoredit/regions_tests.rs
diff --git a/crates/engine/src/vectoredit/tests.rs b/crates/engine/src/canvas/vectoredit/tests.rs
similarity index 68%
rename from crates/engine/src/vectoredit/tests.rs
rename to crates/engine/src/canvas/vectoredit/tests.rs
index ae7ac27e..07ebd56f 100644
--- a/crates/engine/src/vectoredit/tests.rs
+++ b/crates/engine/src/canvas/vectoredit/tests.rs
@@ -171,7 +171,7 @@ fn lasso_marquee_and_segment_selection() {
     assert!(s.tool.overlay.lasso.is_empty());
     // Move tool: clicking a segment selects it; shift adds another.
     ex(&mut s, "vector.edit.tool", json!({"tool": "move"}));
-    click(&mut s, 50.0, 100.0);
+    click(&mut s, 30.0, 100.0);
     assert_eq!(ve(&s).segments.len(), 1);
     assert!(ve(&s).vertices.is_empty());
     let mut sh = ev(PointerKind::Down, 0.0, 50.0);
@@ -280,6 +280,71 @@ fn mirroring_position_and_join_commands() {
     assert!(s.execute("vector.join", &json!({"ids": [id]})).is_ok());
 }
 
+#[test]
+fn a_point_dropped_on_another_merges_into_it() {
+    // #401: an open path's end dragged onto its start closes the path at that point.
+    let mut s = Session::new();
+    let r = ex(&mut s, "vector.create", json!({"points": [[0, 0], [100, 0], [100, 100], [0, 100]]}));
+    let id = crate::params::id_of(&r["id"]).unwrap();
+    ex(&mut s, "vector.edit.begin", json!({"id": id}));
+    drag(&mut s, (0.0, 100.0), (2.0, 3.0));
+    let n = net(&s, id);
+    assert_eq!(n.vertices.len(), 3, "the dropped point merged");
+    assert!((0..3).all(|v| n.incident(v).len() == 2), "a closed path: {n:?}");
+    assert_eq!(ve(&s).vertices, vec![vertex_at(&n, 0.0, 0.0)], "the point it merged into stays selected");
+    s.undo().unwrap();
+    let n = net(&s, id);
+    assert_eq!(n.vertices.len(), 4, "one undo step takes back the move and the merge");
+    vertex_at(&n, 0.0, 100.0);
+    // A drop away from every point only moves it.
+    ex(&mut s, "vector.edit.select", json!({"vertices": []}));
+    drag(&mut s, (0.0, 100.0), (0.0, 50.0));
+    assert_eq!(net(&s, id).vertices.len(), 4);
+    // A 2-point line's end dropped on its other end only moves: no segment would be left.
+    let mut s = Session::new();
+    let r = ex(&mut s, "vector.create", json!({"points": [[0, 0], [100, 0]]}));
+    let id = crate::params::id_of(&r["id"]).unwrap();
+    ex(&mut s, "vector.edit.begin", json!({"id": id}));
+    drag(&mut s, (100.0, 0.0), (2.0, 0.0));
+    let n = net(&s, id);
+    assert_eq!((n.vertices.len(), n.segments.len()), (2, 1), "still a line: {n:?}");
+}
+
+#[test]
+fn deleting_every_point_takes_the_layer_with_the_edit_mode() {
+    // Delete: no point is left at all.
+    let mut s = Session::new();
+    let id = rect(&mut s);
+    ex(&mut s, "vector.edit.selectAll", json!({}));
+    ex(&mut s, "vector.edit.delete", json!({}));
+    assert!(net(&s, id).vertices.is_empty() && net(&s, id).segments.is_empty(), "no point left");
+    assert!(s.doc().unwrap().node(id).is_some(), "the layer stays while editing");
+    ex(&mut s, "vector.edit.end", json!({}));
+    assert!(s.doc().unwrap().node(id).is_none(), "it goes with edit mode instead of leaving an empty box");
+    assert!(s.selection().is_empty());
+    // The step that deleted the last points brings the shape back.
+    s.undo().unwrap();
+    assert_eq!(net(&s, id).vertices.len(), 4);
+    // Shift+Delete (heal): the last point is left on its own with no segment, drawing nothing either.
+    let mut s = Session::new();
+    let id = rect(&mut s);
+    ex(&mut s, "vector.edit.selectAll", json!({}));
+    ex(&mut s, "vector.deleteHeal", json!({}));
+    assert!(net(&s, id).segments.is_empty(), "nothing draws: {:?}", net(&s, id));
+    ex(&mut s, "vector.edit.end", json!({}));
+    assert!(s.doc().unwrap().node(id).is_none(), "an unconnected point left behind doesn't keep the layer");
+    // Escape ends edit mode the same way, for every layer edited along that is left empty.
+    let mut s = Session::new();
+    let a = crate::params::id_of(&ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 100, "height": 100}))["id"]).unwrap();
+    let b = crate::params::id_of(&ex(&mut s, "shape.rectangle", json!({"x": 200, "y": 0, "width": 50, "height": 50}))["id"]).unwrap();
+    ex(&mut s, "vector.edit.begin", json!({"ids": [a, b]}));
+    ex(&mut s, "vector.edit.selectAll", json!({}));
+    ex(&mut s, "vector.edit.delete", json!({}));
+    s.escape().unwrap();
+    assert!(s.ds().unwrap().vector_edit.is_none());
+    assert!(s.doc().unwrap().node(a).is_none() && s.doc().unwrap().node(b).is_none());
+}
+
 #[test]
 fn undo_back_past_the_conversion_leaves_edit_mode() {
     let mut s = Session::new();
@@ -341,3 +406,67 @@ fn eraser_strokes_cut_paths_in_one_step() {
     assert!(key(&mut s, "E", true, false, false).unwrap());
     assert_eq!(ve(&s).tool, VTool::Eraser);
 }
+
+#[test]
+fn a_segment_shows_its_midpoint_and_a_press_adds_a_point_there() {
+    let mut s = Session::new();
+    let id = rect(&mut s);
+    // Near the top edge but off its midpoint: the hint shows where the point would go, but the
+    // pointer is not on it, so the arrow stays.
+    s.pointer(&ev(PointerKind::Hover, 30.0, 0.0)).unwrap();
+    let add = s.tool.overlay.vector_add.expect("the segment's midpoint");
+    assert!(add.midpoint && !add.on, "{add:?}");
+    assert!((add.at[0] - 50.0).abs() < 1e-9 && add.at[1].abs() < 1e-9, "{add:?}");
+    assert_eq!(s.tool.overlay.cursor, crate::tools::Cursor::Default);
+    // On the midpoint: the pen cursor, and a press adds a point there and selects it.
+    s.pointer(&ev(PointerKind::Hover, 50.0, 0.0)).unwrap();
+    assert!(s.tool.overlay.vector_add.is_some_and(|a| a.on), "the pointer is on the midpoint");
+    assert_eq!(s.tool.overlay.cursor, crate::tools::Cursor::Pen(crate::tools::PenCursor::Add));
+    click(&mut s, 50.0, 0.0);
+    let n = net(&s, id);
+    assert_eq!(n.vertices.len(), 5, "a point was added: {n:?}");
+    assert_eq!(ve(&s).vertices, vec![vertex_at(&n, 50.0, 0.0)], "the new point is selected");
+}
+
+#[test]
+fn adding_a_midpoint_keeps_new_midpoints_coming_on_each_half() {
+    let mut s = Session::new();
+    let id = rect(&mut s);
+    click(&mut s, 50.0, 0.0);
+    assert_eq!(net(&s, id).vertices.len(), 5);
+    // The left half has its own midpoint, shown and added the same way.
+    s.pointer(&ev(PointerKind::Hover, 25.0, 0.0)).unwrap();
+    let add = s.tool.overlay.vector_add.expect("the new half's midpoint");
+    assert!(add.midpoint && add.on && (add.at[0] - 25.0).abs() < 1e-9, "{add:?}");
+    click(&mut s, 25.0, 0.0);
+    let n = net(&s, id);
+    assert_eq!(n.vertices.len(), 6, "{n:?}");
+    assert_eq!(ve(&s).vertices, vec![vertex_at(&n, 25.0, 0.0)]);
+    // And on it goes: a quarter of the way along.
+    s.pointer(&ev(PointerKind::Hover, 12.5, 0.0)).unwrap();
+    let add = s.tool.overlay.vector_add.expect("another midpoint");
+    assert!((add.at[0] - 12.5).abs() < 1e-9, "{add:?}");
+}
+
+#[test]
+fn a_press_away_from_the_midpoint_selects_the_segment() {
+    let mut s = Session::new();
+    let id = rect(&mut s);
+    click(&mut s, 30.0, 0.0);
+    assert_eq!(net(&s, id).vertices.len(), 4, "no point is added off the midpoint");
+    assert_eq!(ve(&s).segments.len(), 1, "the segment is selected instead");
+}
+
+#[test]
+fn the_pen_shows_its_ghost_anchor_on_the_segment_under_it() {
+    let mut s = Session::new();
+    let id = rect(&mut s);
+    ex(&mut s, "vector.edit.tool", json!({"tool": "pen"}));
+    s.pointer(&ev(PointerKind::Hover, 80.0, 0.0)).unwrap();
+    let add = s.tool.overlay.vector_add.expect("the ghost anchor");
+    assert!(!add.midpoint && add.on, "{add:?}");
+    assert!((add.at[0] - 80.0).abs() < 1e-3 && add.at[1].abs() < 1e-3, "{add:?}");
+    click(&mut s, 80.0, 0.0);
+    assert_eq!(net(&s, id).vertices.len(), 5, "the press added the point");
+    assert_eq!(ve(&s).anchor, None, "the click ended the pen's path");
+}
diff --git a/crates/engine/src/vectoredit/transform.rs b/crates/engine/src/canvas/vectoredit/transform.rs
similarity index 73%
rename from crates/engine/src/vectoredit/transform.rs
rename to crates/engine/src/canvas/vectoredit/transform.rs
index 1d5f27a6..5efb5343 100644
--- a/crates/engine/src/vectoredit/transform.rs
+++ b/crates/engine/src/canvas/vectoredit/transform.rs
@@ -1,11 +1,11 @@
 //! The transform box of vector edit mode. With two or more points selected (Move tool) a box in the
-//! vector's own axes wraps them: its corners and edges scale them (Shift keeps proportions, Alt
-//! scales from the centre), dragging just outside a corner rotates them about its centre (Shift:
-//! 15° steps) and dragging inside it moves them; each drag is one undo step (the gestures live in
-//! `pointer.rs`). Commands make the same edits for the Design panel, the control channel and MCP,
+//! vector's own axes wraps them (in the page's axes when they are in several layers): its corners
+//! and edges scale them (Shift keeps proportions, Alt scales from the centre), dragging just
+//! outside a corner rotates them about its centre (Shift: 15° steps) and dragging inside it moves
+//! them; each drag is one undo step for every layer (the gestures live in `pointer.rs`). Commands make the same edits for the Design panel, the control channel and MCP,
 //! and while points are selected the flip and 90°/180° rotation commands act on them.
 
-use figcraft_doc::Document;
+use figcraft_doc::{Document, NodeId};
 use figcraft_geom::{Affine, Point};
 use serde_json::{Value, json};
 
@@ -19,16 +19,23 @@ use crate::{Result, Session, bad, spec};
 const EPS: f64 = 1e-9;
 
 /// The selected points' box: the page transform of its top-left corner (axes along the vector's
-/// own), its size in those axes and the points in it.
+/// own), its size in those axes and the points in it: the active layer's, and other edited
+/// layers' in `others`.
 #[derive(Clone, Debug, PartialEq)]
 pub struct PointBox {
     pub frame: Affine,
     pub width: f64,
     pub height: f64,
     pub points: Vec<usize>,
+    pub others: Vec<(NodeId, Vec<usize>)>,
 }
 
 impl PointBox {
+    /// How many points the box wraps, in every layer.
+    pub fn point_count(&self) -> usize {
+        self.points.len() + self.others.iter().map(|(_, v)| v.len()).sum::<usize>()
+    }
+
     /// Corners in page coordinates (tl, tr, br, bl).
     pub fn corners(&self) -> [Point; 4] {
         let (f, w, h) = (self.frame, self.width, self.height);
@@ -62,17 +69,37 @@ pub fn point_box(doc: &Document, ve: &VectorEdit) -> Option<PointBox> {
     if !(x0.is_finite() && y0.is_finite() && width.is_finite() && height.is_finite()) {
         return None;
     }
-    Some(PointBox { frame: doc.world_transform(ve.id) * Affine::translate((x0, y0)), width, height, points })
+    Some(PointBox { frame: doc.world_transform(ve.id) * Affine::translate((x0, y0)), width, height, points, others: vec![] })
+}
+
+/// The box of the selected points of every edited layer, in the page's axes (the layers' own may
+/// differ).
+fn layers_box(doc: &Document, ve: &VectorEdit) -> Option<PointBox> {
+    let points = selected_points(network(doc, ve.id)?, ve);
+    let others = Session::others_moving(doc, ve);
+    let page = |id: NodeId, verts: &[usize]| -> Vec<Point> {
+        let w = doc.world_transform(id);
+        network(doc, id).map(|n| verts.iter().filter_map(|v| n.vertices.get(*v)).map(|v| w * v.point()).collect()).unwrap_or_default()
+    };
+    let all = page(ve.id, &points).into_iter().chain(others.iter().flat_map(|(id, v)| page(*id, v)));
+    let (x0, y0, x1, y1) = all.fold((f64::INFINITY, f64::INFINITY, f64::NEG_INFINITY, f64::NEG_INFINITY), |(a, b, c, d), p| {
+        (a.min(p.x), b.min(p.y), c.max(p.x), d.max(p.y))
+    });
+    let (width, height) = (x1 - x0, y1 - y0);
+    if !(x0.is_finite() && y0.is_finite() && width.is_finite() && height.is_finite()) {
+        return None;
+    }
+    Some(PointBox { frame: Affine::translate((x0, y0)), width, height, points, others })
 }
 
 /// The box drawn and dragged on the canvas: the Move tool, no open pen path, and two or more
-/// points that aren't all in one place, all in the active layer.
-/// shortcut: with points selected in several layers there is no box (drags, nudges and the Design panel still reach them all); wrap them all if asked for.
+/// points that aren't all in one place, in any of the edited layers.
 pub fn shown_box(doc: &Document, ve: &VectorEdit) -> Option<PointBox> {
-    if ve.tool != VTool::Move || ve.anchor.is_some() || ve.others_selected() {
+    if ve.tool != VTool::Move || ve.anchor.is_some() {
         return None;
     }
-    point_box(doc, ve).filter(|b| b.points.len() >= 2 && (b.width > EPS || b.height > EPS))
+    let b = if ve.others_selected() { layers_box(doc, ve) } else { point_box(doc, ve) };
+    b.filter(|b| b.point_count() >= 2 && (b.width > EPS || b.height > EPS))
 }
 
 /// What the transform box does under the pointer.
@@ -85,14 +112,16 @@ pub enum BoxHit {
 }
 
 /// The box's part under page point `p` when it wins over `h`, the network's part there: Bezier
-/// handles come first, then the box's corners, points, the box's edges, segments, the rotation
-/// zones, and the inside of the box last. Edges along an axis without extent are left out.
+/// handles come first, then points, the box's corners, its edges, segments and the rotation zones,
+/// and the inside of the box last. A point under a corner or an edge is dragged with the others
+/// (the box draws no handles of its own), so it keeps the box off. Edges along an axis without
+/// extent are left out.
 pub fn box_hit(doc: &Document, ve: &VectorEdit, h: Option<VHit>, p: Point, zoom: f64) -> Option<BoxHit> {
     let b = shown_box(doc, ve)?;
     match handle_at_corners(&b.corners(), p, zoom, false) {
         Some(handle) => {
             let wins = match (handle, h) {
-                (_, Some(VHit::Handle { .. })) => false,
+                (_, Some(VHit::Handle { .. } | VHit::Vertex { .. })) => false,
                 (Handle::Corner(_), _) => true,
                 (Handle::Edge(e), None | Some(VHit::Segment { .. })) => {
                     if e % 2 == 0 {
@@ -115,12 +144,21 @@ pub fn box_hit(doc: &Document, ve: &VectorEdit, h: Option<VHit>, p: Point, zoom:
 
 /// Map points `verts` of vector `id` (and the handles at them) through page transform `m`, then
 /// re-fit the vector.
-pub fn transform_points(doc: &mut Document, id: figcraft_doc::NodeId, verts: &[usize], m: Affine) -> Result<()> {
+pub fn transform_points(doc: &mut Document, id: NodeId, verts: &[usize], m: Affine) -> Result<()> {
     let w = doc.world_transform(id);
     let local = w.inverse() * m * w;
     edit(doc, id, |net| ops::transform_vertices(net, verts, local))
 }
 
+/// Map the points of box `b` (`id`: the active layer) in every layer through page transform `m`.
+pub fn transform_box(doc: &mut Document, id: NodeId, b: &PointBox, m: Affine) -> Result<()> {
+    transform_points(doc, id, &b.points, m)?;
+    for (o, verts) in &b.others {
+        transform_points(doc, *o, verts, m)?;
+    }
+    Ok(())
+}
+
 /// Transform the selected points by `f(box)` (page space) when editing with points selected and
 /// the command names no layers (`p` has no `ids` or `id`); `None` otherwise (it then acts on
 /// layers).
diff --git a/crates/engine/src/vectoredit/transform_tests.rs b/crates/engine/src/canvas/vectoredit/transform_tests.rs
similarity index 61%
rename from crates/engine/src/vectoredit/transform_tests.rs
rename to crates/engine/src/canvas/vectoredit/transform_tests.rs
index d69baf52..eb2f96f5 100644
--- a/crates/engine/src/vectoredit/transform_tests.rs
+++ b/crates/engine/src/canvas/vectoredit/transform_tests.rs
@@ -7,6 +7,7 @@ use super::tests::{click, drag, ev, ex, net, pt, rect, ve, vertex_at};
 use super::transform::{BoxHit, box_hit, shown_box};
 use super::*;
 use crate::EngineError;
+use crate::params::id_of;
 use crate::tools::{Handle, PointerKind, ToolId};
 
 /// Page position of point `v` of vector `id`.
@@ -47,13 +48,15 @@ fn the_box_shows_for_two_or_more_points_with_the_move_tool() {
     let b = shown_box(s.doc().unwrap(), &ve(&s)).unwrap();
     assert_eq!((b.width, b.height, b.points.len()), (100.0, 100.0, 4));
     assert!(near(b.corners()[2], pt(100.0, 100.0)));
-    // Corners win over the points under them, points over edges, edges over segments.
+    // A point under a corner is dragged with the others, not scaled (the box draws no handles of
+    // its own), so it keeps the box off; corners and edges clear of points still scale, and edges
+    // win over segments.
     let doc = s.doc().unwrap().clone();
     let at = |x, y| {
         let h = hit(&doc, &ve(&s), pt(x, y), 6.0);
         box_hit(&doc, &ve(&s), h, pt(x, y), 1.0)
     };
-    assert_eq!(at(100.0, 100.0), Some(BoxHit::Handle(Handle::Corner(2))));
+    assert_eq!(at(100.0, 100.0), None, "a point under the corner: a drag moves the points");
     assert_eq!(at(100.0, 50.0), Some(BoxHit::Handle(Handle::Edge(1))));
     assert_eq!(at(110.0, -10.0), Some(BoxHit::Handle(Handle::Rotate(1))));
     assert_eq!(at(40.0, 60.0), Some(BoxHit::Inside));
@@ -64,27 +67,47 @@ fn the_box_shows_for_two_or_more_points_with_the_move_tool() {
 }
 
 #[test]
-fn corners_scale_points_in_one_undo_step() {
+fn corners_clear_of_points_scale_them_in_one_undo_step() {
     let mut s = Session::new();
-    let id = rect(&mut s);
+    // An L of three points: the box's bottom-right corner (50, 50) has no point under it.
+    let id = id_of(&ex(&mut s, "vector.create", json!({"points": [[0, 0], [50, 0], [0, 50]], "closed": false}))["id"]).unwrap();
+    ex(&mut s, "vector.edit.begin", json!({"id": id}));
     select_all(&mut s);
-    drag(&mut s, (100.0, 100.0), (150.0, 120.0));
-    let b = s.doc().unwrap().world_bounds(id).unwrap();
-    assert_eq!((b.x0, b.y0, b.x1, b.y1), (0.0, 0.0, 150.0, 120.0));
-    assert_eq!(ve(&s).vertices.len(), 4, "the points stay selected");
+    drag(&mut s, (50.0, 50.0), (150.0, 120.0));
+    assert!(near(page_pt(&s, id, 1), pt(150.0, 0.0)) && near(page_pt(&s, id, 2), pt(0.0, 120.0)), "{:?}", page_pt(&s, id, 1));
+    assert_eq!(ve(&s).vertices.len(), 3, "the points stay selected");
     s.undo().unwrap();
-    let b = s.doc().unwrap().world_bounds(id).unwrap();
-    assert_eq!((b.width(), b.height()), (100.0, 100.0), "one undo step");
+    assert!(near(page_pt(&s, id, 1), pt(50.0, 0.0)), "one undo step");
     // Shift keeps proportions; Alt scales from the centre.
     select_all(&mut s);
-    drag_with(&mut s, (100.0, 100.0), (150.0, 110.0), true, false);
-    let b = s.doc().unwrap().world_bounds(id).unwrap();
-    assert_eq!((b.x0, b.y0, b.x1, b.y1), (0.0, 0.0, 150.0, 150.0));
+    drag_with(&mut s, (50.0, 50.0), (150.0, 110.0), true, false);
+    assert!(near(page_pt(&s, id, 1), pt(150.0, 0.0)) && near(page_pt(&s, id, 2), pt(0.0, 150.0)), "{:?}", page_pt(&s, id, 2));
     s.undo().unwrap();
     select_all(&mut s);
-    drag_with(&mut s, (100.0, 100.0), (110.0, 120.0), false, true);
-    let b = s.doc().unwrap().world_bounds(id).unwrap();
-    assert_eq!((b.x0, b.y0, b.x1, b.y1), (-10.0, -20.0, 110.0, 120.0));
+    drag_with(&mut s, (50.0, 50.0), (60.0, 70.0), false, true);
+    assert!(
+        near(page_pt(&s, id, 0), pt(-10.0, -20.0)) && near(page_pt(&s, id, 1), pt(60.0, -20.0)) && near(page_pt(&s, id, 2), pt(-10.0, 70.0)),
+        "{:?}",
+        page_pt(&s, id, 2)
+    );
+}
+
+#[test]
+fn dragging_one_of_several_selected_points_moves_them_all_freely() {
+    let mut s = Session::new();
+    let id = rect(&mut s);
+    let n = net(&s, id);
+    let (a, b) = (vertex_at(&n, 0.0, 0.0), vertex_at(&n, 100.0, 0.0));
+    // Two points on one side: their box is a flat line, and the press is on a corner of it.
+    ex(&mut s, "vector.edit.select", json!({"vertices": [a, b]}));
+    drag(&mut s, (100.0, 0.0), (130.0, 40.0));
+    assert!(
+        near(page_pt(&s, id, a), pt(30.0, 40.0)) && near(page_pt(&s, id, b), pt(130.0, 40.0)),
+        "{:?} {:?}",
+        page_pt(&s, id, a),
+        page_pt(&s, id, b)
+    );
+    assert_eq!(ve(&s).vertices.len(), 2, "both stay selected");
 }
 
 #[test]
@@ -307,3 +330,122 @@ fn edit_mode_transform_commands_survive_junk() {
         }
     }
 }
+
+/// Two edited layers turned differently: `a` a 100×100 square at the origin turned -20°, `b` one
+/// at (200, 0) turned 30° (the active layer), with two of `a`'s corners and all of `b`'s points
+/// selected. Neither layer's axes are the page's. Snapping (the pixel grid too) is off so drags
+/// land exactly.
+fn two_layers(s: &mut Session) -> (NodeId, NodeId) {
+    let mut square = |x: f64| crate::params::id_of(&ex(s, "shape.rectangle", json!({"x": x, "y": 0, "width": 100, "height": 100}))["id"]).unwrap();
+    let (a, b) = (square(0.0), square(200.0));
+    ex(s, "node.set", json!({"id": a, "props": {"rotation": -20}}));
+    ex(s, "node.set", json!({"id": b, "props": {"rotation": 30}}));
+    ex(s, "view.snapGeometry", json!({"on": false}));
+    ex(s, "view.snapObjects", json!({"on": false}));
+    ex(s, "view.snapPixel", json!({"on": false}));
+    ex(s, "vector.edit.begin", json!({"ids": [a, b]}));
+    let n = net(s, a);
+    ex(s, "vector.edit.select", json!({"vertices": [vertex_at(&n, 0.0, 0.0), vertex_at(&n, 100.0, 100.0)]}));
+    ex(s, "vector.edit.select", json!({"id": b, "vertices": [0, 1, 2, 3], "add": true}));
+    assert_eq!(ve(s).id, b, "the layer named last is the active one");
+    (a, b)
+}
+
+/// Every selected point's page position, layer by layer.
+fn selected_page_points(s: &Session, a: NodeId, b: NodeId) -> Vec<(NodeId, usize, Point)> {
+    let e = ve(s);
+    let parts = e.parts();
+    [a, b]
+        .iter()
+        .flat_map(|id| {
+            let part = parts.iter().find(|p| p.id == *id).unwrap();
+            part.vertices.iter().map(|v| (*id, *v, page_pt(s, *id, *v))).collect::<Vec<_>>()
+        })
+        .collect()
+}
+
+#[test]
+fn the_box_wraps_points_selected_in_several_layers() {
+    let mut s = Session::new();
+    let (a, b) = two_layers(&mut s);
+    let before = selected_page_points(&s, a, b);
+    assert_eq!(before.len(), 6);
+    // On the page's axes: `b` is turned, so neither layer's own axes fit both.
+    let (x0, y0) = before.iter().fold((f64::INFINITY, f64::INFINITY), |(x, y), (_, _, p)| (x.min(p.x), y.min(p.y)));
+    let (x1, y1) = before.iter().fold((f64::NEG_INFINITY, f64::NEG_INFINITY), |(x, y), (_, _, p)| (x.max(p.x), y.max(p.y)));
+    let c = s.vector_edit_box().expect("a box around the points of both layers");
+    assert!(near(c[0], pt(x0, y0)) && near(c[2], pt(x1, y1)), "{c:?} vs ({x0}, {y0})–({x1}, {y1})");
+
+    // The bottom-right corner dragged to twice the width scales every point in both layers.
+    drag(&mut s, (x1, y1), (x0 + 2.0 * (x1 - x0), y1));
+    for (id, v, p) in &before {
+        let q = page_pt(&s, *id, *v);
+        assert!(near(q, pt(x0 + 2.0 * (p.x - x0), p.y)), "point {v} of {id:?}: {p:?} → {q:?}");
+    }
+    s.undo().unwrap();
+    for (id, v, p) in &before {
+        assert!(near(page_pt(&s, *id, *v), *p), "one undo step brings back point {v} of {id:?}");
+    }
+
+    // From just outside the top-right corner, a quarter turn clockwise about the box's centre.
+    let ctr = pt((x0 + x1) / 2.0, (y0 + y1) / 2.0);
+    let from = pt(x1 + 10.0, y0 - 10.0);
+    let d = from - ctr;
+    drag(&mut s, (from.x, from.y), (ctr.x - d.y, ctr.y + d.x));
+    for (id, v, p) in &before {
+        let r = *p - ctr;
+        let q = page_pt(&s, *id, *v);
+        assert!(near(q, pt(ctr.x - r.y, ctr.y + r.x)), "point {v} of {id:?}: {p:?} → {q:?}");
+    }
+    s.undo().unwrap();
+    for (id, v, p) in &before {
+        assert!(near(page_pt(&s, *id, *v), *p), "one undo step brings back point {v} of {id:?}");
+    }
+}
+
+#[test]
+fn inside_the_box_of_several_layers_drags_and_a_click_clears_them_all() {
+    let mut s = Session::new();
+    let (a, b) = two_layers(&mut s);
+    let before = selected_page_points(&s, a, b);
+    // Clear of both networks: between the two squares, inside the box.
+    let doc = s.doc().unwrap().clone();
+    assert!(hit_any(&doc, &ve(&s), pt(150.0, 50.0), 6.0).is_none());
+    assert_eq!(box_hit(&doc, &ve(&s), None, pt(150.0, 50.0), 1.0), Some(BoxHit::Inside));
+    drag(&mut s, (150.0, 50.0), (170.0, 60.0));
+    for (id, v, p) in &before {
+        assert!(near(page_pt(&s, *id, *v), *p + Vec2::new(20.0, 10.0)), "point {v} of {id:?} moves along");
+    }
+    s.undo().unwrap();
+    click(&mut s, 150.0, 50.0);
+    assert!(ve(&s).parts().iter().all(|p| p.vertices.is_empty()), "a click inside clears every layer's points");
+}
+
+#[test]
+fn inside_the_box_of_another_layer_drags_over_a_region_of_the_active_one() {
+    // `b`'s points selected, `a` (a filled 300 square around `b`) active with nothing selected:
+    // the press at the box's centre lands on `a`'s region too.
+    let mut s = Session::new();
+    let mut square = |x: f64, size: f64| {
+        crate::params::id_of(&ex(&mut s, "shape.rectangle", json!({"x": x, "y": x, "width": size, "height": size}))["id"]).unwrap()
+    };
+    let (a, b) = (square(0.0, 300.0), square(100.0, 50.0));
+    ex(&mut s, "view.snapGeometry", json!({"on": false}));
+    ex(&mut s, "view.snapObjects", json!({"on": false}));
+    ex(&mut s, "view.snapPixel", json!({"on": false}));
+    ex(&mut s, "vector.edit.begin", json!({"ids": [a, b]}));
+    ex(&mut s, "vector.edit.select", json!({"id": b, "vertices": [0, 1, 2, 3]}));
+    ex(&mut s, "vector.edit.select", json!({"id": a, "add": true}));
+    let doc = s.doc().unwrap().clone();
+    let e = ve(&s);
+    assert!(e.id == a && e.vertices.is_empty() && e.others_selected());
+    assert!(hit_any(&doc, &e, pt(125.0, 125.0), 6.0).is_none());
+    assert!(regions::region_hit(&doc, &e, pt(125.0, 125.0), 1.0).is_some(), "a region of the active layer under the press");
+    assert_eq!(box_hit(&doc, &e, None, pt(125.0, 125.0), 1.0), Some(BoxHit::Inside));
+    let before: Vec<Point> = (0..4).map(|v| page_pt(&s, b, v)).collect();
+    drag(&mut s, (125.0, 125.0), (145.0, 135.0));
+    assert!(ve(&s).regions.is_empty(), "the region isn't selected");
+    for (v, p) in before.iter().enumerate() {
+        assert!(near(page_pt(&s, b, v), *p + Vec2::new(20.0, 10.0)), "point {v} of b moves along");
+    }
+}
diff --git a/crates/engine/src/vectoredit/width.rs b/crates/engine/src/canvas/vectoredit/width.rs
similarity index 100%
rename from crates/engine/src/vectoredit/width.rs
rename to crates/engine/src/canvas/vectoredit/width.rs
diff --git a/crates/engine/src/vectoredit/width_sides_tests.rs b/crates/engine/src/canvas/vectoredit/width_sides_tests.rs
similarity index 100%
rename from crates/engine/src/vectoredit/width_sides_tests.rs
rename to crates/engine/src/canvas/vectoredit/width_sides_tests.rs
diff --git a/crates/engine/src/vectoredit/width_tests.rs b/crates/engine/src/canvas/vectoredit/width_tests.rs
similarity index 100%
rename from crates/engine/src/vectoredit/width_tests.rs
rename to crates/engine/src/canvas/vectoredit/width_tests.rs
diff --git a/crates/engine/src/catalog.rs b/crates/engine/src/catalog.rs
index c8f34fc1..5180b340 100644
--- a/crates/engine/src/catalog.rs
+++ b/crates/engine/src/catalog.rs
@@ -21,8 +21,9 @@ pub const SEP: &str = "-";
 pub static MENU: &[MenuItem] = &[
     // File
     m!("File", "New design file", "file.new"),
-    // FigCraft's own: starter templates (not counted by `parity`, like the other items of its own
-    // listed in `OWN`).
+    m!("File", "New board", "file.newBoard"),
+    // FigCraft's own: boards and starter templates (not counted by `parity`, like the other items
+    // of its own listed in `OWN`).
     m!("File", "New from template…", "file.newFromTemplate"),
     m!("File", "New window", "window.new"),
     m!("File", "Open…", "file.open"),
@@ -213,6 +214,8 @@ pub static MENU: &[MenuItem] = &[
     m!("Text/Case", "Uppercase", "text.caseUpper"),
     m!("Text/Case", "Lowercase", "text.caseLower"),
     m!("Text/Case", "Title case", "text.caseTitle"),
+    m!("Text", SEP, ""),
+    m!("Text", "Missing fonts…", "text.missingFonts"),
     // Arrange
     m!("Arrange", "Align left", "align.left"),
     m!("Arrange", "Align horizontal centers", "align.hcenter"),
@@ -287,7 +290,7 @@ pub fn items() -> impl Iterator<Item = &'static MenuItem> {
 }
 
 /// Items of FigCraft's own that the parity count leaves out (as it does the `collab.` ones).
-const OWN: [&str; 2] = ["file.newFromTemplate", "help.gettingStarted"];
+const OWN: [&str; 4] = ["file.newFromTemplate", "file.newBoard", "help.gettingStarted", "text.missingFonts"];
 
 /// Coverage: (implemented, total, missing ids). `extra` lists ids implemented by the UI layer.
 pub fn parity(extra: &[&str]) -> (usize, usize, Vec<&'static str>) {
diff --git a/crates/engine/src/cmd/mod.rs b/crates/engine/src/cmd.rs
similarity index 89%
rename from crates/engine/src/cmd/mod.rs
rename to crates/engine/src/cmd.rs
index 6579494c..a247ed52 100644
--- a/crates/engine/src/cmd/mod.rs
+++ b/crates/engine/src/cmd.rs
@@ -5,6 +5,7 @@ pub mod comment;
 pub mod component;
 pub mod create;
 pub mod edit;
+pub mod facilitate;
 pub mod file;
 pub mod image;
 pub mod layout;
@@ -71,6 +72,7 @@ fn registry() -> &'static Registry {
         list.extend(create::specs());
         list.extend(edit::specs());
         list.extend(lists::specs());
+        list.extend(crate::selection_colors::specs());
         list.extend(arrange::specs());
         list.extend(structure::specs());
         list.extend(section::specs());
@@ -79,6 +81,7 @@ fn registry() -> &'static Registry {
         list.extend(page::specs());
         list.extend(view::specs());
         list.extend(text::specs());
+        list.extend(crate::fonts::specs());
         list.extend(styles::specs());
         list.extend(image::specs());
         list.extend(variables::specs());
@@ -97,6 +100,7 @@ fn registry() -> &'static Registry {
         list.extend(crate::code_connect::specs());
         list.extend(crate::annotations::specs());
         list.extend(crate::dev_resources::specs());
+        list.extend(crate::dev_measurements::specs());
         list.extend(crate::distance::specs());
         list.extend(crate::collab::specs());
         list.extend(crate::branches::specs());
@@ -107,6 +111,12 @@ fn registry() -> &'static Registry {
         list.extend(crate::online::specs());
         list.extend(crate::invite_links::specs());
         list.extend(crate::templates::specs());
+        list.extend(crate::datafill::specs());
+        list.extend(crate::textfit::specs());
+        list.extend(crate::board::specs());
+        list.extend(facilitate::specs());
+        list.extend(crate::board_table::specs());
+        list.extend(crate::board_templates::specs());
         let mut index = HashMap::new();
         for (i, s) in list.iter().enumerate() {
             if index.insert(s.id, i).is_some() {
diff --git a/crates/engine/src/cmd/arrange.rs b/crates/engine/src/cmd/arrange.rs
index 43cfcf3c..8f8e40d2 100644
--- a/crates/engine/src/cmd/arrange.rs
+++ b/crates/engine/src/cmd/arrange.rs
@@ -19,7 +19,21 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!("align.bottom", "Align bottom", "{ids?}", true, |s, p| align(s, p, Al::Bottom)),
         spec!("distribute.horizontal", "Distribute horizontal spacing", "{ids?, spacing?}", true, |s, p| distribute(s, p, true)),
         spec!("distribute.vertical", "Distribute vertical spacing", "{ids?, spacing?}", true, |s, p| distribute(s, p, false)),
+        spec!(
+            "arrange.spacing",
+            "Spacing",
+            "{ids?, horizontal?, vertical?, fromGesture?} (page units; fromGesture uses the interaction snapshot)",
+            true,
+            spacing
+        ),
         spec!("arrange.tidy", "Tidy up", "{ids?, spacing?}", true, tidy),
+        spec!(
+            "arrange.reorder",
+            "Reorder selection",
+            "{ids?, source, target, swap?, fromGesture?} (insert at target's visual slot; no hierarchy changes)",
+            true,
+            reorder
+        ),
         spec!("arrange.packH", "Pack horizontal", "{ids?}", true, |s, p| pack(s, p, true)),
         spec!("arrange.packV", "Pack vertical", "{ids?}", true, |s, p| pack(s, p, false)),
         spec!("arrange.roundToPixels", "Round to pixels", "{ids?}", true, round_px),
@@ -192,8 +206,9 @@ fn distribute(s: &mut Session, p: &Value, horizontal: bool) -> Result<Value> {
     let mut items: Vec<(NodeId, Rect)> = ids.iter().filter_map(|i| doc.world_bounds(*i).map(|b| (*i, b))).collect();
     items.sort_by(|a, b| if horizontal { a.1.x0.total_cmp(&b.1.x0) } else { a.1.y0.total_cmp(&b.1.y0) });
     let total: f64 = items.iter().map(|(_, b)| if horizontal { b.width() } else { b.height() }).sum();
-    let (Some(first), Some(last)) = (items.first(), items.last()) else { return ok() };
-    let span = if horizontal { last.1.x1 - first.1.x0 } else { last.1.y1 - first.1.y0 };
+    let Some(first) = items.first() else { return ok() };
+    let end = items.iter().map(|(_, b)| if horizontal { b.x1 } else { b.y1 }).fold(f64::MIN, f64::max);
+    let span = if horizontal { end - first.1.x0 } else { end - first.1.y0 };
     let gap = num(p, "spacing").unwrap_or((span - total) / (items.len().saturating_sub(1).max(1)) as f64);
     let mut pos = if horizontal { first.1.x0 } else { first.1.y0 };
     for (i, b) in items.clone() {
@@ -480,9 +495,15 @@ pub fn scale_node(doc: &mut Document, id: NodeId, k: f64) -> Result<()> {
             t.paragraph_spacing *= k;
             t.paragraph_indent *= k;
             t.list_spacing *= k;
+            if let Some(tp) = &mut t.path {
+                tp.scale(k, k);
+            }
         }
         if let NodeKind::Vector { network } = &mut n.kind {
             network.scale(k, k);
+            for v in &mut network.vertices {
+                v.radius *= k;
+            }
         }
         n.width *= k;
         n.height *= k;
@@ -521,6 +542,7 @@ pub(crate) fn resize_cmd(s: &mut Session, p: &Value) -> Result<Value> {
     let (col, row) = string(p, "anchor").and_then(|a| crate::tools::anchor_of(&a)).unwrap_or((0, 0));
     let (ax, ay) = (f64::from(col) / 2.0, f64::from(row) / 2.0);
     let doc = s.doc_mut()?;
+    let before = super::styles::bound_before(doc, &ids);
     for i in ids {
         let n = doc.get(i)?;
         let (ow, oh) = (n.width, n.height);
@@ -540,9 +562,106 @@ pub(crate) fn resize_cmd(s: &mut Session, p: &Value) -> Result<Value> {
             n.child_layout.sizing_v = Sizing::Fixed;
         }
         if let NodeKind::Text(t) = &mut n.kind {
-            t.auto_resize = if num(p, "height").is_some() { TextAutoResize::None } else { TextAutoResize::Height };
+            if num(p, "height").is_some() {
+                t.fix_size(num(p, "width").is_some(), true);
+            } else if t.auto_resize != TextAutoResize::Truncate {
+                t.auto_resize = TextAutoResize::Height;
+            }
         }
         super::props::restore_worlds(doc, &kept)?;
     }
+    super::styles::detach_edited(doc, &before);
+    ok()
+}
+
+/// Reorder visual slots without rebuilding or reparenting layers.
+fn reorder(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "arrange.reorder";
+    let ids = req_targets(cmd, s, p)?;
+    let source = req_id(cmd, p, "source")?;
+    let target = req_id(cmd, p, "target")?;
+    let ds = s.ds()?;
+    let base = ds.interaction.as_ref().filter(|_| boolean(p, "fromGesture") == Some(true)).map(|i| i.doc.clone()).unwrap_or_else(|| ds.doc.clone());
+    let layout =
+        crate::selection_reorder::ReorderLayout::new(&base, &ids).ok_or_else(|| bad(cmd, "select a regular row, column or complete aligned grid"))?;
+    let positions = layout
+        .positions(source, target, boolean(p, "swap") == Some(true))
+        .ok_or_else(|| bad(cmd, "source and target must belong to the selection"))?;
+    // Validate every delta before editing; absolute targets always come from the gesture's
+    // snapshot so crossing several slots and returning to the start does not accumulate edits.
+    let doc = s.doc()?;
+    let mut moves = Vec::new();
+    for (id, at) in positions {
+        let now = doc.world_bounds(id).ok_or_else(|| bad(cmd, "layer is no longer available"))?;
+        let (dx, dy) = (at.x - now.x0, at.y - now.y0);
+        if !dx.is_finite() || !dy.is_finite() {
+            return Err(bad(cmd, "non-finite reorder result"));
+        }
+        if dx.abs() > 1e-9 || dy.abs() > 1e-9 {
+            let node = doc.get(id)?;
+            let parent = node.parent.map(|p| doc.world_transform(p)).unwrap_or(Affine::IDENTITY);
+            let transform = parent.inverse() * Affine::translate((dx, dy)) * parent * node.transform;
+            if !transform.as_coeffs().iter().all(|v| v.is_finite()) {
+                return Err(bad(cmd, "non-finite local transform"));
+            }
+            moves.push((id, dx, dy));
+        }
+    }
+    if !moves.is_empty() {
+        let doc = s.doc_mut()?;
+        for (id, dx, dy) in moves {
+            move_world(doc, id, dx, dy)?;
+        }
+    }
+    ok()
+}
+
+/// Set the distances between smart-selection tracks without rebuilding/reparenting the layers.
+fn spacing(s: &mut Session, p: &Value) -> Result<Value> {
+    let ids = req_targets("arrange.spacing", s, p)?;
+    // A scrub is absolute from the interaction snapshot, even if tracks overlap or cross.
+    let ds = s.ds()?;
+    let base = ds.interaction.as_ref().filter(|_| boolean(p, "fromGesture") == Some(true)).map(|i| i.doc.clone()).unwrap_or_else(|| ds.doc.clone());
+    let layout = crate::selection_spacing::selection_spacing(&base, &ids);
+    let mut offsets = std::collections::BTreeMap::<NodeId, (Option<f64>, Option<f64>)>::new();
+    let mut any = false;
+    for (key, axis, vertical) in [("horizontal", &layout.horizontal, false), ("vertical", &layout.vertical, true)] {
+        if get(p, key).is_none() {
+            continue;
+        }
+        let value = req_num("arrange.spacing", p, key)?;
+        if value.abs() > 1_000_000.0 {
+            return Err(bad("arrange.spacing", "spacing out of range"));
+        }
+        let axis = axis.as_ref().ok_or_else(|| bad("arrange.spacing", "selection has no spacing on this axis"))?;
+        any = true;
+        for (id, delta) in axis.offsets(value) {
+            if !delta.is_finite() {
+                return Err(bad("arrange.spacing", "non-finite spacing result"));
+            }
+            let pair = offsets.entry(id).or_default();
+            if vertical {
+                pair.1 = Some(delta);
+            } else {
+                pair.0 = Some(delta);
+            }
+        }
+    }
+    if !any {
+        return Err(bad("arrange.spacing", "pass horizontal or vertical spacing"));
+    }
+    let doc = s.doc_mut()?;
+    let mut moves = Vec::new();
+    for (id, (dx, dy)) in offsets {
+        let (Some(before), Some(now)) = (base.world_bounds(id), doc.world_bounds(id)) else { continue };
+        let (dx, dy) = (dx.map_or(0.0, |d| before.x0 + d - now.x0), dy.map_or(0.0, |d| before.y0 + d - now.y0));
+        if !dx.is_finite() || !dy.is_finite() {
+            return Err(bad("arrange.spacing", "non-finite spacing result"));
+        }
+        moves.push((id, dx, dy));
+    }
+    for (id, dx, dy) in moves {
+        move_world(doc, id, dx, dy)?;
+    }
     ok()
 }
diff --git a/crates/engine/src/cmd/component.rs b/crates/engine/src/cmd/component.rs
index 0fb64816..5abe79b8 100644
--- a/crates/engine/src/cmd/component.rs
+++ b/crates/engine/src/cmd/component.rs
@@ -11,6 +11,17 @@ use crate::components::*;
 use crate::params::*;
 use crate::{EngineError, Result, Session, bad, spec};
 
+mod instance;
+mod props;
+mod variants;
+
+use instance::{detach, make_slot, push_changes, remove_slot, reset_instance, reset_override, reset_slot, restore_main, slot_insert, swap};
+pub(crate) use instance::{swap_at, swap_instance};
+use props::{add_prop, bind_prop, delete_prop, edit_prop, set_props};
+pub(crate) use props::{apply_prop_bindings, check_prop_binding, describe_props};
+use variants::{add_variant, combine};
+pub use variants::{can_add_variant, can_combine_variants};
+
 /// `component.hideWhenPublishing`: the leading `.` of the names of this file's components and
 /// sets (those `ids` are or are in), put on or taken off.
 fn hide_when_publishing(s: &mut Session, p: &Value) -> Result<Value> {
@@ -56,11 +67,17 @@ pub fn specs() -> Vec<CommandSpec> {
             s.set_selection(out.iter().filter_map(id_of).collect());
             Ok(json!({"ids": out}))
         }),
-        spec!("component.combineVariants", "Combine as variants", "{ids? (components)}", true, combine),
+        spec!(
+            "component.combineVariants",
+            "Combine as variants",
+            "{ids? (main components; none already a variant, a library copy or inside an instance)}  (wraps them in a new component set; names without `=` become \"Property 1=Default\", \"Property 1=VariantN\")",
+            true,
+            combine
+        ),
         spec!(
             "component.addVariant",
             "Add variant",
-            "{id? (component set or variant), property?, value?}  (duplicates the variant; `property`=`value` names the new one)",
+            "{id? (component set, variant, or a main component not in a set yet: it becomes a set of itself and the new variant), property?, value?}  (duplicates the variant; `property`=`value` names the new one)",
             true,
             add_variant
         ),
@@ -68,7 +85,7 @@ pub fn specs() -> Vec<CommandSpec> {
             let cmd = "instance.create";
             let c = req_id(cmd, p, "component")?;
             let page = s.page()?;
-            let parent = id(p, "parent").unwrap_or(page);
+            let parent = crate::params::opt_id(cmd, p, "parent")?.unwrap_or(page);
             let doc = s.doc_mut()?;
             let c = main_of(doc, c).ok_or_else(|| bad(cmd, "`component` must be a component or component set"))?;
             let (x, y) = match (num(p, "x"), num(p, "y")) {
@@ -159,7 +176,7 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "component.resetOverride",
             "Reset override",
-            "{id?, group? (fills|strokes|effects|opacity|visible|name|corners|characters|textStyle|padding|gap|alignment|grids|exports|interactions|size|position|component|props|slot; all when omitted)}",
+            "{id?, group? (fills|strokes|effects|opacity|visible|name|corners|characters|textStyle|padding|gap|alignment|grids|exports|interactions|size|position|modes|component|props|slot; all when omitted)}",
             true,
             reset_override
         ),
@@ -211,14 +228,14 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "component.addProperty",
             "Add component property",
-            "{id? (component, set, or a layer inside a component: it gets bound), name, type: boolean|text|instanceSwap|variant|slot, default?, layer? (node bound to it; a frame for slots), preferred? (instance swap and slot properties: component or set ids offered first)}",
+            "{id? (component, set, or a layer inside a component: it gets bound), name, type: boolean|text|instanceSwap|variant|slot, default? (boolean: the bound layer's visibility in the main; without it, the layer's current visibility), layer? (node bound to it; a frame for slots), preferred? (instance swap and slot properties: component or set ids offered first)}",
             true,
             add_prop
         ),
         spec!(
             "component.editProperty",
             "Edit component property",
-            "{id? (component or set), name, newName?, default? (variant properties: that variant takes the top-left place), value? + newValue? (rename a variant value), index? (variant properties: move to this place; the variants' names follow), preferred? (instance swap and slot properties: component or set ids offered first)}",
+            "{id? (component or set), name, newName?, default? (variant properties: that variant takes the top-left place; boolean: the main's bound layers show or hide to match), value? + newValue? (rename a variant value), index? (variant properties: move to this place; the variants' names follow), preferred? (instance swap and slot properties: component or set ids offered first)}",
             true,
             edit_prop
         ),
@@ -330,1098 +347,10 @@ fn create(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(json!({"id": target}))
 }
 
-/// Wrap components in a new component set (named after the first) placed around them.
-fn wrap_in_set(doc: &mut Document, ids: &[NodeId]) -> Result<NodeId> {
-    let cmd = "component.combineVariants";
-    let top = *ids.last().ok_or_else(|| bad(cmd, "nothing selected"))?;
-    let parent = doc.get(top)?.parent.ok_or_else(|| bad(cmd, "page"))?;
-    if inside_instance(doc, top) || owning_instance(doc, parent).is_some() {
-        return Err(EngineError::Disabled(cmd.into(), "components inside an instance can't be combined".into()));
-    }
-    let bounds = doc.bounds_of(ids).unwrap_or_default();
-    let pw = doc.world_transform(parent);
-    let local = figcraft_geom::transform_rect_bbox(pw.inverse(), bounds.inflate(20.0, 20.0));
-    let base = ids
-        .first()
-        .and_then(|i| doc.node(*i))
-        .map(|n| n.name.split(['/', '=']).next().unwrap_or("Component").trim().to_string())
-        .filter(|n| !n.is_empty() && !n.contains(','))
-        .unwrap_or_else(|| "Component".into());
-    let set = doc.alloc_id();
-    let mut n = Node::new(set, NodeKind::ComponentSet { description: String::new() }, base, local.width(), local.height());
-    n.transform = figcraft_geom::Affine::translate((local.x0, local.y0));
-    n.fills.clear();
-    doc.insert(n, parent, doc.index_in_parent(top).map(|i| i + 1))?;
-    for i in ids {
-        doc.reparent(*i, set, None)?;
-    }
-    Ok(set)
-}
-
-fn combine(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.combineVariants";
-    let ids = req_targets(cmd, s, p)?;
-    let doc = s.doc_mut()?;
-    if !ids.iter().all(|i| doc.node(*i).is_some_and(|n| matches!(n.kind, NodeKind::Component { .. }))) {
-        return Err(bad(cmd, "select components only"));
-    }
-    let ids = z_sorted(doc, &ids);
-    let set = wrap_in_set(doc, &ids)?;
-    for (k, i) in ids.iter().enumerate() {
-        // Name variants "Property 1=Variant N" unless already in prop=value form.
-        let node = doc.get_mut(*i)?;
-        if !node.name.contains('=') {
-            node.name = format!("Property 1={}", if k == 0 { "Default".to_string() } else { format!("Variant{}", k + 1) });
-        }
-    }
-    s.set_selection(vec![set]);
-    Ok(json!({"id": set}))
-}
-
-/// Grow a component set so it wraps its variants with 20 px of padding (right and bottom).
-fn fit_set(doc: &mut Document, set: NodeId) {
-    let Some(kids) = doc.node(set).map(|n| n.children.clone()) else { return };
-    let (mut w, mut h) = (0.0f64, 0.0f64);
-    for c in kids {
-        if let Some(n) = doc.node(c) {
-            let b = figcraft_geom::transform_rect_bbox(n.transform, n.local_rect());
-            w = w.max(b.x1 + 20.0);
-            h = h.max(b.y1 + 20.0);
-        }
-    }
-    if let Some(n) = doc.node_mut(set) {
-        n.width = n.width.max(w);
-        n.height = n.height.max(h);
-    }
-}
-
-fn add_variant(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.addVariant";
-    let t = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a component set or variant"))?;
-    let doc = s.doc_mut()?;
-    let (set, base) = match doc.get(t)?.kind {
-        NodeKind::ComponentSet { .. } => {
-            let last = doc.get(t)?.children.last().copied().ok_or_else(|| bad(cmd, "the component set is empty"))?;
-            (t, last)
-        }
-        NodeKind::Component { .. } => (variant_set(doc, t).ok_or_else(|| bad(cmd, "the component isn't a variant (combine as variants first)"))?, t),
-        _ => return Err(bad(cmd, "select a component set or variant")),
-    };
-    let options = variant_options(doc, set);
-    let mut pairs = variant_props(&doc.get(base)?.name);
-    let order: Vec<String> = options.iter().map(|(k, _)| k.clone()).collect();
-    let existing: BTreeSet<BTreeMap<String, String>> =
-        doc.get(set)?.children.iter().filter_map(|c| doc.node(*c)).map(|n| variant_props(&n.name)).collect();
-    match (string(p, "property"), string(p, "value")) {
-        (Some(prop), Some(value)) => {
-            let (prop, value) = (prop.trim().to_string(), value.trim().to_string());
-            if !options.iter().any(|(k, _)| *k == prop) {
-                return Err(bad(cmd, format!("unknown variant property `{prop}`")));
-            }
-            if value.is_empty() || value.contains([',', '=']) {
-                return Err(bad(cmd, "`value` must be non-empty without ',' or '='"));
-            }
-            pairs.insert(prop, value);
-            if existing.contains(&pairs) {
-                return Err(bad(cmd, "that variant already exists"));
-            }
-        }
-        (Some(_), None) => return Err(bad(cmd, "`value` is required with `property`")),
-        _ => {
-            let prop = order.first().cloned().unwrap_or_else(|| "Property 1".into());
-            let mut k = existing.len() + 1;
-            loop {
-                pairs.insert(prop.clone(), format!("Variant{k}"));
-                if !existing.contains(&pairs) || k > 10_000 {
-                    break;
-                }
-                k += 1;
-            }
-        }
-    }
-    let name = variant_name(&pairs, &order);
-    let bottom = doc
-        .get(set)?
-        .children
-        .iter()
-        .filter_map(|c| doc.node(*c))
-        .map(|n| figcraft_geom::transform_rect_bbox(n.transform, n.local_rect()).y1)
-        .fold(0.0f64, f64::max);
-    let dup = doc.duplicate_into(base, set, None)?;
-    let n = doc.get_mut(dup)?;
-    n.name = name;
-    let c = n.transform.as_coeffs();
-    n.transform = figcraft_geom::Affine::new([c[0], c[1], c[2], c[3], c[4], bottom + 20.0]);
-    fit_set(doc, set);
-    s.set_selection(vec![dup]);
-    Ok(json!({"id": dup}))
-}
-
-fn detach(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.detach";
-    let ids = req_targets(cmd, s, p)?;
-    let doc = s.doc_mut()?;
-    let mut out = Vec::new();
-    for i in ids {
-        if !matches!(doc.get(i)?.kind, NodeKind::Instance { .. }) {
-            continue;
-        }
-        if inside_instance(doc, i) {
-            return Err(EngineError::Disabled(cmd.into(), "a nested instance can't be detached on its own: detach the outer instance first".into()));
-        }
-        // Own layers lose their link (slot content stays as it is); nested instances stay
-        // instances of their own mains.
-        let nested = unlink_layers(doc, i, Some(i));
-        let n = doc.get_mut(i)?;
-        n.kind = NodeKind::Frame;
-        n.source = None;
-        n.overrides.clear();
-        n.prop_refs.remove("mainComponent");
-        // No properties left to drive.
-        n.bound.retain(|k, _| !k.starts_with(PROP_BINDING));
-        for nn in nested {
-            rebase_instance(doc, nn);
-        }
-        out.push(i);
-    }
-    if out.is_empty() {
-        return Err(EngineError::Disabled(cmd.into(), "select an instance".into()));
-    }
-    s.set_selection(out.clone());
-    Ok(json!({"ids": out}))
-}
-
-fn reset_instance(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.resetInstance";
-    let ids = req_targets(cmd, s, p)?;
-    let doc = s.doc_mut()?;
-    let mut done = Vec::new();
-    for i in ids {
-        let Some(inst) = owning_instance(doc, i) else { continue };
-        let top = !inside_instance(doc, inst);
-        for d in doc.subtree(inst) {
-            let keep: Vec<&str> = if d == inst && top { vec!["size"] } else { vec![] };
-            if let Some(n) = doc.node(d)
-                && n.overrides.iter().any(|g| !keep.contains(&g.as_str()))
-                && let Some(n) = doc.node_mut(d)
-            {
-                n.overrides.retain(|g| keep.contains(&g.as_str()));
-            }
-        }
-        // Property values go back to the defaults.
-        if top
-            && let Some(NodeKind::Instance { component, props }) = doc.node(inst).map(|n| n.kind.clone())
-            && let Some(defaults) = doc.node(component).map(default_props)
-            && props != defaults
-            && let NodeKind::Instance { props, .. } = &mut doc.get_mut(inst)?.kind
-        {
-            *props = defaults;
-        }
-        // ...and stop following variables.
-        if top && doc.node(inst).is_some_and(|n| n.bound.keys().any(|k| k.starts_with(PROP_BINDING))) {
-            doc.get_mut(inst)?.bound.retain(|k, _| !k.starts_with(PROP_BINDING));
-        }
-        done.push(inst);
-    }
-    if done.is_empty() {
-        return Err(EngineError::Disabled(cmd.into(), "select an instance".into()));
-    }
-    Ok(json!({"ids": done}))
-}
-
-fn reset_override(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.resetOverride";
-    let i = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a layer inside an instance"))?;
-    let group = string(p, "group");
-    if let Some(g) = &group
-        && !OVERRIDE_GROUPS.contains(&g.as_str())
-    {
-        return Err(bad(cmd, format!("unknown group `{g}` (known: {})", OVERRIDE_GROUPS.join(", "))));
-    }
-    let doc = s.doc_mut()?;
-    if owning_instance(doc, i).is_none() || doc.get(i)?.source.is_none() {
-        return Err(bad(cmd, "not a layer of an instance"));
-    }
-    let top_root = matches!(doc.get(i)?.kind, NodeKind::Instance { .. }) && !inside_instance(doc, i);
-    let had = doc.get(i)?.overrides.clone();
-    let n = doc.get_mut(i)?;
-    match &group {
-        Some(g) => {
-            n.overrides.remove(g);
-        }
-        None => n.overrides.clear(),
-    }
-    let mut changed = had != doc.get(i)?.overrides;
-    // The instance's own property values reset with `props`.
-    if top_root
-        && group.as_deref().is_none_or(|g| g == "props")
-        && let Some(NodeKind::Instance { component, props }) = doc.node(i).map(|n| n.kind.clone())
-        && let Some(defaults) = doc.node(component).map(default_props)
-        && props != defaults
-        && let NodeKind::Instance { props, .. } = &mut doc.get_mut(i)?.kind
-    {
-        *props = defaults;
-        changed = true;
-    }
-    Ok(json!({"changed": changed}))
-}
-
-/// A property name for `owner` based on `base` (a layer name): valid and not taken yet.
-fn fresh_prop_name(doc: &Document, owner: &Owner, base: &str) -> String {
-    let base: String = base.chars().filter(|c| !matches!(c, ',' | '=')).take(100).collect::<String>().trim().to_string();
-    let base = if base.is_empty() { "Slot".to_string() } else { base };
-    let taken = |n: &str| {
-        owner.components(doc).iter().any(|c| prop_defs(doc, *c).contains_key(n))
-            || matches!(owner, Owner::Set(s) if variant_options(doc, *s).iter().any(|(k, _)| k == n))
-    };
-    (1..10_000).map(|k| if k == 1 { base.clone() } else { format!("{base} {k}") }).find(|n| !taken(n)).unwrap_or(base)
-}
-
-/// The `preferred` components of a slot property: component or component set ids.
-fn preferred_arg(cmd: &str, doc: &Document, p: &Value) -> Result<Vec<NodeId>> {
-    let Some(v) = get(p, "preferred").filter(|v| !v.is_null()) else { return Ok(Vec::new()) };
-    let list = v.as_array().ok_or_else(|| bad(cmd, "`preferred`: an array of component ids"))?;
-    let mut out = Vec::new();
-    for x in list.iter().take(500) {
-        let c = id_of(x)
-            .filter(|c| doc.node(*c).is_some_and(|n| matches!(n.kind, NodeKind::Component { .. } | NodeKind::ComponentSet { .. })))
-            .ok_or_else(|| bad(cmd, format!("`preferred`: {x} is not a component or component set")))?;
-        if !out.contains(&c) {
-            out.push(c);
-        }
-    }
-    Ok(out)
-}
-
-fn make_slot(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.makeSlot";
-    let id = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a frame inside a main component"))?;
-    let doc = s.doc()?;
-    let n = doc.get(id)?;
-    let inside_main = owning_component(doc, id).is_some_and(|c| c != id) && owning_instance(doc, id).is_none();
-    if !matches!(n.kind, NodeKind::Frame) || !inside_main {
-        return Err(bad(cmd, "only a frame inside a main component (not inside an instance) can become a slot"));
-    }
-    if is_slot(doc, id) {
-        return Err(EngineError::Disabled(cmd.into(), format!("\"{}\" is already a slot", n.name)));
-    }
-    let owner = Owner::resolve(doc, id).ok_or_else(|| bad(cmd, "the frame isn't inside a component"))?;
-    let name = string(p, "name").unwrap_or_else(|| fresh_prop_name(doc, &owner, &n.name));
-    let preferred = get(p, "preferred").cloned().unwrap_or(Value::Null);
-    add_prop(s, &json!({"id": id, "layer": id, "name": name, "type": "slot", "preferred": preferred}))
-}
-
-fn remove_slot(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.removeSlot";
-    let id = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a slot frame of a main component"))?;
-    let doc = s.doc()?;
-    if owning_instance(doc, id).is_some() {
-        return Err(EngineError::Disabled(cmd.into(), "slots are removed on the main component".into()));
-    }
-    let name = slot_name(doc, id).ok_or_else(|| bad(cmd, "not a slot frame of a main component"))?;
-    delete_prop(s, &json!({"id": id, "name": name}))?;
-    Ok(json!({"id": id, "name": name}))
-}
-
-/// The slot inside an instance a command acts on: `id` itself, or instance `id`'s slot `name`.
-fn instance_slot(cmd: &str, doc: &Document, id: NodeId, name: Option<&str>) -> Result<NodeId> {
-    let slot = match name {
-        Some(nm) => slots_of(doc, id).into_iter().find(|(_, n)| n == nm).map(|(l, _)| l).ok_or_else(|| bad(cmd, format!("no slot named `{nm}`")))?,
-        None => id,
-    };
-    if !is_slot(doc, slot) || owning_instance(doc, slot).is_none() {
-        return Err(bad(cmd, "not a slot of an instance (a main component's slot takes layers like any frame)"));
-    }
-    Ok(slot)
-}
-
-fn slot_insert(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "instance.slotInsert";
-    let c = req_id(cmd, p, "component")?;
-    let target = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a slot inside an instance"))?;
-    let index = match get(p, "index").filter(|v| !v.is_null()) {
-        None => None,
-        Some(v) => Some(v.as_u64().and_then(|i| usize::try_from(i).ok()).ok_or_else(|| bad(cmd, "`index`: a child index (0 = bottom)"))?),
-    };
-    let doc = s.doc_mut()?;
-    let slot = instance_slot(cmd, doc, target, string(p, "slot").as_deref())?;
-    let c = main_of(doc, c).ok_or_else(|| bad(cmd, "`component` must be a component or component set"))?;
-    if boolean(p, "replace").unwrap_or(false) {
-        for k in doc.get(slot)?.children.clone() {
-            doc.remove(k)?;
-        }
-    }
-    let i = create_instance_at(doc, c, slot, 0.0, 0.0, index)?;
-    s.set_selection(vec![i]);
-    Ok(json!({"id": i, "slot": slot}))
-}
-
-fn reset_slot(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "instance.resetSlot";
-    let id = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a slot inside an instance"))?;
-    let doc = s.doc_mut()?;
-    let slot = instance_slot(cmd, doc, id, string(p, "slot").as_deref())?;
-    let changed = slot_edited(doc, slot);
-    if changed {
-        doc.get_mut(slot)?.overrides.remove(SLOT);
-    }
-    Ok(json!({"id": slot, "changed": changed}))
-}
-
-fn push_changes(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.pushChanges";
-    let i = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select an instance"))?;
-    let doc = s.doc_mut()?;
-    // Changes go to the outer instance's main (never into a nested instance's own main).
-    let inst = root_instance(doc, i).ok_or_else(|| bad(cmd, "not an instance"))?;
-    let Some(NodeKind::Instance { component, .. }) = doc.node(inst).map(|n| n.kind.clone()) else { return ok() };
-    if !doc.contains(component) {
-        return Err(EngineError::Disabled(cmd.into(), "the main component was deleted (use component.restoreMain)".into()));
-    }
-    // Copy every overridden layer's values to its source in the main (geometry, swaps, property
-    // values and slot content stay with the instance).
-    let mut pushed = 0;
-    for d in doc.subtree(inst) {
-        let Some(n) = doc.node(d).cloned() else { continue };
-        let Some(src) = (if d == inst { Some(component) } else { n.source }) else { continue };
-        if n.overrides.is_empty() || !doc.contains(src) || !doc.is_ancestor(component, src) {
-            continue;
-        }
-        let Some(mut target) = doc.node(src).cloned() else { continue };
-        let groups: BTreeSet<String> = n
-            .overrides
-            .iter()
-            .filter(|g| !matches!(g.as_str(), "size" | "position" | "component" | "props" | SLOT) && !(d == inst && g.as_str() == "name"))
-            .cloned()
-            .collect();
-        for g in &groups {
-            copy_group(&n, &mut target, g);
-        }
-        if groups.is_empty() {
-            continue;
-        }
-        pushed += 1;
-        if let Some(slot) = doc.node_mut(src) {
-            *slot = target;
-        }
-        if let Some(m) = doc.node_mut(d) {
-            m.overrides.retain(|g| !groups.contains(g));
-        }
-    }
-    Ok(json!({"layers": pushed}))
-}
-
-fn restore_main(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.restoreMain";
-    let i = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select an instance"))?;
-    let doc = s.doc_mut()?;
-    let Some(NodeKind::Instance { component, props }) = doc.node(i).map(|n| n.kind.clone()) else {
-        return Err(bad(cmd, "select an instance"));
-    };
-    if doc.contains(component) {
-        return Err(EngineError::Disabled(cmd.into(), "the main component still exists".into()));
-    }
-    if inside_instance(doc, i) {
-        return Err(EngineError::Disabled(cmd.into(), "select the outer instance".into()));
-    }
-    let parent = doc.get(i)?.parent.ok_or_else(|| bad(cmd, "no parent"))?;
-    let index = doc.index_in_parent(i);
-    // The main comes back with its old id (other instances point to it) and its layers with the
-    // ids their copies mirror, so every instance re-links by source.
-    let sub = doc.subtree(i);
-    let mut map: BTreeMap<NodeId, NodeId> = BTreeMap::new();
-    let mut used: BTreeSet<NodeId> = BTreeSet::new();
-    map.insert(i, component);
-    used.insert(component);
-    for d in sub.iter().filter(|d| **d != i) {
-        let src = doc.node(*d).and_then(|n| n.source);
-        let nid = match src {
-            Some(s) if !doc.contains(s) && used.insert(s) => s,
-            _ => doc.alloc_id(),
-        };
-        map.insert(*d, nid);
-    }
-    let mut nodes = Vec::new();
-    let mut nested = Vec::new();
-    for d in &sub {
-        let Some(mut n) = doc.node(*d).cloned() else { continue };
-        if *d == i {
-            let mut defs = BTreeMap::new();
-            for (k, v) in &props {
-                let def = match v {
-                    Value::Bool(b) => PropDef::Boolean { default: *b },
-                    Value::String(t) => PropDef::Text { default: t.clone() },
-                    other => match id_of(other) {
-                        Some(c) if doc.contains(c) => PropDef::InstanceSwap { default: c, preferred: Vec::new() },
-                        _ => continue,
-                    },
-                };
-                defs.insert(k.clone(), def);
-            }
-            n.kind = NodeKind::Component { description: String::new(), props: defs };
-            n.source = None;
-            n.overrides.clear();
-            n.prop_refs.clear();
-        } else {
-            let parent_inst = n.parent.and_then(|p| owning_instance(doc, p));
-            if parent_inst != Some(i) {
-                nodes.push(n);
-                continue;
-            }
-            if matches!(n.kind, NodeKind::Instance { .. }) {
-                nested.push(*d);
-            } else {
-                n.source = None;
-                n.overrides.clear();
-            }
-        }
-        nodes.push(n);
-    }
-    doc.remove(i)?;
-    doc.paste_nodes(&nodes, &map, i, parent, index)?;
-    for nn in nested {
-        if let Some(m) = map.get(&nn).copied() {
-            rebase_instance(doc, m);
-        }
-    }
-    s.set_selection(vec![component]);
-    Ok(json!({"id": component}))
-}
-
-fn swap(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "instance.swap";
-    let c = req_id(cmd, p, "component")?;
-    let ids = req_targets(cmd, s, p)?;
-    let doc = s.doc_mut()?;
-    let c = main_of(doc, c).ok_or_else(|| bad(cmd, "`component` must be a component or component set"))?;
-    for i in ids {
-        swap_instance(doc, i, c).map_err(|m| bad(cmd, m))?;
-    }
-    ok()
-}
-
-/// Make instance `i` show main component `c`, keeping the values of properties with the same names
-/// (the layers' overrides follow by name when the instance is rebuilt).
-pub(crate) fn swap_instance(doc: &mut Document, i: NodeId, c: NodeId) -> std::result::Result<(), String> {
-    if doc.is_ancestor(c, i) {
-        return Err("an instance can't show the component it is inside".into());
-    }
-    let defaults = doc.node(c).map(default_props).unwrap_or_default();
-    match doc.get_mut(i).map(|n| &mut n.kind) {
-        Ok(NodeKind::Instance { component, props }) => {
-            *component = c;
-            let old = std::mem::take(props);
-            *props = defaults.iter().map(|(k, d)| (k.clone(), old.get(k).cloned().unwrap_or_else(|| d.clone()))).collect();
-            Ok(())
-        }
-        _ => Err(format!("{i} is not an instance")),
-    }
-}
-
-/// Swap the instance under a page point to a component (`instance.swapAt`).
-pub(crate) fn swap_at(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "instance.swapAt";
-    let c = req_id(cmd, p, "component")?;
-    let pt = figcraft_geom::Point::new(req_num(cmd, p, "x")?, req_num(cmd, p, "y")?);
-    let page = s.page()?;
-    let doc = s.doc()?;
-    let c = main_of(doc, c).ok_or_else(|| bad(cmd, "`component` must be a component or component set"))?;
-    let family = crate::drop::swap_family(doc, c);
-    let target = crate::drop::swap_target(doc, page, pt, family.as_deref(), Some(c))
-        .ok_or_else(|| EngineError::Disabled(cmd.into(), "there is no instance at that point to swap".into()))?;
-    keep_text_overrides(s.doc_mut()?, target);
-    swap(s, &json!({"ids": [target], "component": c}))?;
-    s.set_selection(vec![target]);
-    Ok(json!({"id": target, "component": c}))
-}
-
-/// Whether instance `id` has a component property `name` that a `kind` variable can drive (a
-/// boolean property takes a boolean variable, a text or variant property a string one).
-pub(crate) fn check_prop_binding(doc: &Document, id: NodeId, name: &str, kind: VariableType) -> std::result::Result<(), String> {
-    let Some(NodeKind::Instance { component, .. }) = doc.node(id).map(|n| &n.kind) else {
-        return Err(format!("{id} is not an instance (component properties are bound on instances)"));
-    };
-    if variant_set(doc, *component).is_some_and(|set| variant_options(doc, set).iter().any(|(o, _)| o == name)) {
-        return if kind == VariableType::String { Ok(()) } else { Err(format!("`{name}` is a variant property: bind a string variable")) };
-    }
-    match (prop_defs(doc, *component).get(name), kind) {
-        (Some(PropDef::Boolean { .. }), VariableType::Boolean) | (Some(PropDef::Text { .. }), VariableType::String) => Ok(()),
-        (Some(PropDef::Boolean { .. }), _) => Err(format!("`{name}` is a boolean property: bind a boolean variable")),
-        (Some(PropDef::Text { .. }), _) => Err(format!("`{name}` is a text property: bind a string variable")),
-        (Some(_), _) => Err(format!("`{name}`: only boolean and text properties can be bound to variables")),
-        (None, _) => Err(format!("the instance has no property named `{name}`")),
-    }
-}
-
-/// Write bound variable values into instance `id`'s boolean and text property values, and switch
-/// it to the variant its bound variant properties name (only what changed; the instance then
-/// follows like after `instance.setProperties`). A value that names no variant changes nothing.
-pub(crate) fn apply_prop_bindings(doc: &mut Document, id: NodeId, sets: &[(String, VariableValue)]) {
-    let Some(NodeKind::Instance { component, .. }) = doc.node(id).map(|n| &n.kind) else { return };
-    let component = *component;
-    if let Some(set) = variant_set(doc, component) {
-        let options = variant_options(doc, set);
-        let current = doc.node(component).map(|c| variant_props(&c.name)).unwrap_or_default();
-        let mut wanted = current.clone();
-        for (name, val) in sets {
-            if let VariableValue::String(t) = val
-                && options.iter().any(|(o, vals)| o == name && vals.contains(t))
-            {
-                wanted.insert(name.clone(), t.clone());
-            }
-        }
-        if wanted != current
-            && let Some(target) = find_variant(doc, set, &wanted)
-            && let Ok(n) = doc.get_mut(id)
-            && let NodeKind::Instance { component: c, .. } = &mut n.kind
-        {
-            *c = target;
-        }
-    }
-    let Some(NodeKind::Instance { component, props }) = doc.node(id).map(|n| &n.kind) else { return };
-    let Some(NodeKind::Component { props: defs, .. }) = doc.node(*component).map(|c| &c.kind) else { return };
-    let mut next = props.clone();
-    for (name, val) in sets {
-        let v = match (defs.get(name), val) {
-            (Some(PropDef::Boolean { .. }), VariableValue::Boolean(b)) => json!(b),
-            (Some(PropDef::Text { .. }), VariableValue::String(t)) => json!(t),
-            _ => continue,
-        };
-        next.insert(name.clone(), v);
-    }
-    if next != *props
-        && let Ok(n) = doc.get_mut(id)
-        && let NodeKind::Instance { props, .. } = &mut n.kind
-    {
-        *props = next;
-    }
-}
-
-/// Coerce a property value to the definition's type.
-fn coerce(cmd: &str, doc: &Document, name: &str, def: &PropDef, v: &Value) -> Result<Value> {
-    match def {
-        PropDef::Boolean { .. } => match v {
-            Value::Bool(b) => Ok(json!(b)),
-            Value::String(t) if t == "true" || t == "false" => Ok(json!(t == "true")),
-            _ => Err(bad(cmd, format!("`{name}` is a boolean property"))),
-        },
-        PropDef::Text { .. } => match v {
-            Value::String(t) => Ok(json!(t)),
-            Value::Number(n) => Ok(json!(n.to_string())),
-            _ => Err(bad(cmd, format!("`{name}` is a text property"))),
-        },
-        PropDef::InstanceSwap { .. } => match id_of(v).and_then(|c| main_of(doc, c)) {
-            Some(c) => Ok(json!(c.0)),
-            None => Err(bad(cmd, format!("`{name}` takes a component id"))),
-        },
-        PropDef::Variant { options, .. } => {
-            let t = v.as_str().map(str::to_string).unwrap_or_else(|| v.to_string());
-            if options.is_empty() || options.contains(&t) { Ok(json!(t)) } else { Err(bad(cmd, format!("`{name}` must be one of {options:?}"))) }
-        }
-        PropDef::Slot { .. } => Err(bad(cmd, format!("`{name}` is a slot: fill it with instance.slotInsert or by adding layers to it"))),
-    }
-}
-
-fn set_props(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "instance.setProperties";
-    let ids = req_targets(cmd, s, p)?;
-    let props = get(p, "properties").and_then(Value::as_object).cloned().ok_or_else(|| bad(cmd, "`properties` object required"))?;
-    let doc = s.doc_mut()?;
-    for i in ids {
-        let Some(NodeKind::Instance { component, .. }) = doc.node(i).map(|n| n.kind.clone()) else {
-            return Err(bad(cmd, format!("{i} is not an instance")));
-        };
-        // Variant properties: switch to the matching sibling variant.
-        let set = variant_set(doc, component);
-        let options = set.map(|s| variant_options(doc, s)).unwrap_or_default();
-        let mut wanted = doc.node(component).map(|c| variant_props(&c.name)).unwrap_or_default();
-        let mut target = component;
-        let mut rest = Vec::new();
-        for (k, v) in &props {
-            if let Some((_, vals)) = options.iter().find(|(o, _)| o == k) {
-                let val = v.as_str().map(str::to_string).unwrap_or_else(|| v.to_string());
-                if !vals.contains(&val) {
-                    return Err(bad(cmd, format!("`{k}` must be one of {vals:?}")));
-                }
-                wanted.insert(k.clone(), val);
-            } else {
-                rest.push((k.clone(), v.clone()));
-            }
-        }
-        if let Some(set) = set
-            && wanted != doc.node(component).map(|c| variant_props(&c.name)).unwrap_or_default()
-        {
-            target = find_variant(doc, set, &wanted).unwrap_or(component);
-        }
-        let defs = match doc.node(target).map(|n| &n.kind) {
-            Some(NodeKind::Component { props, .. }) => props.clone(),
-            _ => BTreeMap::new(),
-        };
-        let mut values = Vec::new();
-        for (k, v) in rest {
-            let def = defs.get(&k).ok_or_else(|| {
-                let known: Vec<&str> = defs.keys().map(String::as_str).chain(options.iter().map(|(o, _)| o.as_str())).collect();
-                bad(cmd, format!("unknown property `{k}` (known: {})", known.join(", ")))
-            })?;
-            values.push((k.clone(), coerce(cmd, doc, &k, def, &v)?));
-        }
-        if let NodeKind::Instance { component: c, props: ip } = &mut doc.get_mut(i)?.kind {
-            *c = target;
-            for (k, v) in values {
-                ip.insert(k, v);
-            }
-            for (k, d) in defs.iter().filter(|(_, d)| takes_value(d)) {
-                ip.entry(k.clone()).or_insert_with(|| prop_default_value(d));
-            }
-        }
-    }
-    ok()
-}
-
-/// Where component properties live: a set (its variants share them) or a lone component.
-enum Owner {
-    Set(NodeId),
-    Comp(NodeId),
-}
-
-impl Owner {
-    fn resolve(doc: &Document, id: NodeId) -> Option<Owner> {
-        let n = doc.node(id)?;
-        match n.kind {
-            NodeKind::ComponentSet { .. } => Some(Owner::Set(id)),
-            _ => {
-                let c = owning_component(doc, id)?;
-                Some(match variant_set(doc, c) {
-                    Some(s) => Owner::Set(s),
-                    None => Owner::Comp(c),
-                })
-            }
-        }
-    }
-
-    fn components(&self, doc: &Document) -> Vec<NodeId> {
-        match self {
-            Owner::Comp(c) => vec![*c],
-            Owner::Set(s) => doc
-                .node(*s)
-                .map(|n| n.children.iter().copied().filter(|c| doc.node(*c).is_some_and(|x| matches!(x.kind, NodeKind::Component { .. }))).collect())
-                .unwrap_or_default(),
-        }
-    }
-
-    fn id(&self) -> NodeId {
-        match self {
-            Owner::Set(s) | Owner::Comp(s) => *s,
-        }
-    }
-}
-
-fn prop_defs(doc: &Document, c: NodeId) -> BTreeMap<String, PropDef> {
-    match doc.node(c).map(|n| &n.kind) {
-        Some(NodeKind::Component { props, .. }) => props.clone(),
-        _ => BTreeMap::new(),
-    }
-}
-
-fn set_prop_defs(doc: &mut Document, c: NodeId, f: impl FnOnce(&mut BTreeMap<String, PropDef>)) -> Result<()> {
-    if let NodeKind::Component { props, .. } = &mut doc.get_mut(c)?.kind {
-        f(props);
-    }
-    Ok(())
-}
-
-fn valid_prop_name(cmd: &str, name: &str) -> Result<String> {
-    let name = name.trim();
-    if name.is_empty() || name.contains([',', '=']) || name.chars().count() > 200 {
-        return Err(bad(cmd, "property names must be non-empty, without ',' or '='"));
-    }
-    Ok(name.to_string())
-}
-
-fn add_prop(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.addProperty";
-    let target = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a component"))?;
-    let name = valid_prop_name(cmd, &req_string(cmd, p, "name")?)?;
-    let t = req_string(cmd, p, "type")?;
-    let doc = s.doc_mut()?;
-    if inside_instance(doc, target) {
-        return Err(bad(cmd, "select a component, not a layer of an instance"));
-    }
-    let owner = Owner::resolve(doc, target).ok_or_else(|| bad(cmd, "select a component, a component set or a layer inside a component"))?;
-    // A layer selected inside the component gets bound to the new property.
-    let layer = id(p, "layer")
-        .or_else(|| (target != owner.id() && !matches!(doc.node(target).map(|n| &n.kind), Some(NodeKind::Component { .. }))).then_some(target));
-    let comps = owner.components(doc);
-    let variants = match &owner {
-        Owner::Set(s) => variant_options(doc, *s),
-        Owner::Comp(_) => Vec::new(),
-    };
-    if variants.iter().any(|(k, _)| *k == name) || comps.iter().any(|c| prop_defs(doc, *c).contains_key(&name)) {
-        return Err(bad(cmd, format!("a property named `{name}` already exists")));
-    }
-    let layer_node = layer.and_then(|l| doc.node(l)).cloned();
-    let def = match t.to_ascii_lowercase().as_str() {
-        "boolean" | "bool" => PropDef::Boolean { default: boolean(p, "default").unwrap_or(true) },
-        "text" => PropDef::Text {
-            default: string(p, "default")
-                .or_else(|| layer_node.as_ref().and_then(|n| n.kind.text()).map(|t| t.characters.clone()))
-                .unwrap_or_else(|| name.clone()),
-        },
-        "instanceswap" | "instance_swap" | "instance" => {
-            let d = id(p, "default")
-                .or_else(|| match layer_node.as_ref().map(|n| &n.kind) {
-                    Some(NodeKind::Instance { component, .. }) => Some(*component),
-                    _ => None,
-                })
-                .and_then(|c| main_of(doc, c))
-                .ok_or_else(|| bad(cmd, "default: a component id"))?;
-            PropDef::InstanceSwap { default: d, preferred: preferred_arg(cmd, doc, p)? }
-        }
-        "variant" => {
-            let dv = string(p, "default")
-                .map(|d| d.trim().to_string())
-                .filter(|d| !d.is_empty() && !d.contains([',', '=']))
-                .unwrap_or_else(|| "Default".into());
-            let set = match owner {
-                Owner::Set(s) => s,
-                Owner::Comp(c) => wrap_in_set(doc, &[c])?,
-            };
-            for c in Owner::Set(set).components(doc) {
-                let cn = doc.get_mut(c)?;
-                cn.name = if cn.name.contains('=') { format!("{}, {name}={dv}", cn.name) } else { format!("{name}={dv}") };
-            }
-            s.set_selection(vec![set]);
-            return Ok(json!({"id": set}));
-        }
-        "slot" => {
-            if !layer_node.as_ref().is_some_and(|n| matches!(n.kind, NodeKind::Frame)) {
-                return Err(bad(cmd, "a slot is a frame inside the component: select one (or pass `layer`)"));
-            }
-            PropDef::Slot { preferred: preferred_arg(cmd, doc, p)? }
-        }
-        _ => return Err(bad(cmd, "type: boolean|text|instanceSwap|variant|slot")),
-    };
-    for c in &comps {
-        set_prop_defs(doc, *c, |m| {
-            m.insert(name.clone(), def.clone());
-        })?;
-        // Existing instances get the default.
-        if !takes_value(&def) {
-            continue;
-        }
-        for inst in instances_of(doc, *c) {
-            if let NodeKind::Instance { props, .. } = &mut doc.get_mut(inst)?.kind {
-                props.entry(name.clone()).or_insert_with(|| prop_default_value(&def));
-            }
-        }
-    }
-    if let Some(l) = layer {
-        bind(cmd, doc, l, Some(&name), None)?;
-    }
-    Ok(json!({"id": owner.id(), "name": name}))
-}
-
-/// Bind (or with `property: None` unbind) a layer's field to a property of its component.
-fn bind(cmd: &str, doc: &mut Document, layer: NodeId, property: Option<&str>, field: Option<&str>) -> Result<()> {
-    let n = doc.get(layer)?.clone();
-    if inside_instance(doc, layer) {
-        return Err(bad(cmd, "layers inside an instance can't be bound (bind the nested instance itself, or edit its main)"));
-    }
-    let comp = owning_component(doc, layer).ok_or_else(|| bad(cmd, "the layer isn't inside a component"))?;
-    let Some(property) = property.filter(|p| !p.is_empty()) else {
-        let n = doc.get_mut(layer)?;
-        match field {
-            Some(f) => {
-                n.prop_refs.remove(f);
-            }
-            None => n.prop_refs.clear(),
-        }
-        return Ok(());
-    };
-    let defs = prop_defs(doc, comp);
-    let def = defs.get(property).ok_or_else(|| bad(cmd, format!("the component has no property `{property}`")))?;
-    let expected = match def {
-        PropDef::Boolean { .. } => "visible",
-        PropDef::Text { .. } => "characters",
-        PropDef::InstanceSwap { .. } => "mainComponent",
-        PropDef::Variant { .. } => return Err(bad(cmd, "variant properties pick a variant; they can't be bound to a layer")),
-        PropDef::Slot { .. } => SLOT,
-    };
-    let field = field.unwrap_or(expected);
-    if field != expected {
-        return Err(bad(cmd, format!("`{property}` can only control `{expected}`")));
-    }
-    match field {
-        "characters" if n.kind.text().is_none() => return Err(bad(cmd, "text properties bind to text layers")),
-        "mainComponent" if !matches!(n.kind, NodeKind::Instance { .. }) => return Err(bad(cmd, "instance swap properties bind to instances")),
-        "visible" if layer == comp => return Err(bad(cmd, "the component itself can't be hidden by its own property")),
-        SLOT if !matches!(n.kind, NodeKind::Frame) => return Err(bad(cmd, "slot properties bind to frames inside the component")),
-        SLOT if doc
-            .subtree(comp)
-            .into_iter()
-            .any(|d| d != layer && doc.node(d).is_some_and(|x| x.prop_refs.get(SLOT).map(String::as_str) == Some(property))) =>
-        {
-            return Err(bad(cmd, format!("another frame of the component is already the slot `{property}`")));
-        }
-        _ => {}
-    }
-    doc.get_mut(layer)?.prop_refs.insert(field.to_string(), property.to_string());
-    Ok(())
-}
-
-fn bind_prop(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.bindProperty";
-    let layer = id(p, "layer").or_else(|| targets(s, p).first().copied()).ok_or_else(|| bad(cmd, "`layer` required"))?;
-    let property = string(p, "property");
-    let field = string(p, "field");
-    if let Some(f) = &field
-        && !matches!(f.as_str(), "visible" | "characters" | "mainComponent" | SLOT)
-    {
-        return Err(bad(cmd, "field: visible|characters|mainComponent|slot"));
-    }
-    let doc = s.doc_mut()?;
-    bind(cmd, doc, layer, property.as_deref(), field.as_deref())?;
-    ok()
-}
-
-/// Rename `old` → `new` in the bindings of a component's layers and in its instances' values.
-fn rename_prop_refs(doc: &mut Document, comp: NodeId, old: &str, new: Option<&str>) -> Result<()> {
-    for d in doc.subtree(comp) {
-        let refs = doc.node(d).map(|n| n.prop_refs.clone()).unwrap_or_default();
-        if refs.values().any(|v| v == old)
-            && let Some(n) = doc.node_mut(d)
-        {
-            match new {
-                Some(nw) => n.prop_refs.values_mut().filter(|v| *v == old).for_each(|v| *v = nw.to_string()),
-                None => n.prop_refs.retain(|_, v| v != old),
-            }
-        }
-    }
-    // Instances' values and the variables bound to them follow (a deleted property drops both).
-    let old_key = format!("{PROP_BINDING}{old}");
-    for inst in instances_of(doc, comp) {
-        let n = doc.get_mut(inst)?;
-        if let NodeKind::Instance { props, .. } = &mut n.kind
-            && let Some(v) = props.remove(old)
-            && let Some(nw) = new
-        {
-            props.insert(nw.to_string(), v);
-        }
-        if let Some(var) = n.bound.remove(&old_key)
-            && let Some(nw) = new
-        {
-            n.bound.insert(format!("{PROP_BINDING}{nw}"), var);
-        }
-    }
-    Ok(())
-}
-
-fn edit_prop(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.editProperty";
-    let target = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a component"))?;
-    let name = req_string(cmd, p, "name")?;
-    let new_name = string(p, "newName").map(|n| valid_prop_name(cmd, &n)).transpose()?.filter(|n| *n != name);
-    let doc = s.doc_mut()?;
-    let owner = Owner::resolve(doc, target).ok_or_else(|| bad(cmd, "select a component or component set"))?;
-    let comps = owner.components(doc);
-    if let Some(nn) = &new_name {
-        let taken = comps.iter().any(|c| prop_defs(doc, *c).contains_key(nn))
-            || matches!(owner, Owner::Set(s) if variant_options(doc, s).iter().any(|(k, _)| k == nn));
-        if taken {
-            return Err(bad(cmd, format!("a property named `{nn}` already exists")));
-        }
-    }
-    // Variant property of a set.
-    if let Owner::Set(set) = owner
-        && let Some((_, values)) = variant_options(doc, set).into_iter().find(|(k, _)| *k == name)
-    {
-        let order: Vec<String> = variant_options(doc, set).into_iter().map(|(k, _)| k).collect();
-        let rename_value = match (string(p, "value"), string(p, "newValue")) {
-            (Some(v), Some(nv)) => {
-                let nv = nv.trim().to_string();
-                if !values.contains(&v) {
-                    return Err(bad(cmd, format!("`{name}` has no value `{v}`")));
-                }
-                if nv.is_empty() || nv.contains([',', '=']) {
-                    return Err(bad(cmd, "`newValue` must be non-empty, without ',' or '='"));
-                }
-                Some((v, nv))
-            }
-            _ => None,
-        };
-        let mut order: Vec<String> = order.into_iter().map(|k| if k == name { new_name.clone().unwrap_or(k) } else { k }).collect();
-        // Reordered: every variant's name lists the properties in the new order.
-        if let Some(to) = get(p, "index").filter(|v| !v.is_null()) {
-            let to = to.as_u64().and_then(|i| usize::try_from(i).ok()).ok_or_else(|| bad(cmd, "`index`: a property place (0 = first)"))?;
-            let key = new_name.clone().unwrap_or(name.clone());
-            order.retain(|k| *k != key);
-            order.insert(to.min(order.len()), key);
-        }
-        for c in &comps {
-            let mut pairs = variant_props(&doc.get(*c)?.name);
-            if let Some((v, nv)) = &rename_value
-                && pairs.get(&name) == Some(v)
-            {
-                pairs.insert(name.clone(), nv.clone());
-            }
-            if let Some(nn) = &new_name
-                && let Some(v) = pairs.remove(&name)
-            {
-                pairs.insert(nn.clone(), v);
-            }
-            doc.get_mut(*c)?.name = variant_name(&pairs, &order);
-        }
-        // The default variant is the top-left one: the variant with that value (and the default's
-        // other values, when there is one) trades places with it.
-        if let Some(dv) = string(p, "default") {
-            let key = new_name.clone().unwrap_or(name.clone());
-            let current = default_variant(doc, set);
-            let mut wanted = current.and_then(|d| doc.node(d)).map(|n| variant_props(&n.name)).unwrap_or_default();
-            wanted.insert(key.clone(), dv.clone());
-            let props_of = |c: &NodeId| doc.node(*c).map(|n| variant_props(&n.name)).unwrap_or_default();
-            let pick =
-                comps.iter().copied().find(|c| props_of(c) == wanted).or_else(|| comps.iter().copied().find(|c| props_of(c).get(&key) == Some(&dv)));
-            let (Some(f), Some(d)) = (pick, current) else { return Err(bad(cmd, format!("no variant has {key}={dv}"))) };
-            if f != d {
-                let place = |doc: &Document, c: NodeId| doc.node(c).map(|n| n.transform.as_coeffs()).map(|[.., x, y]| (x, y)).unwrap_or_default();
-                let (fp, dp) = (place(doc, f), place(doc, d));
-                for (c, (x, y)) in [(f, dp), (d, fp)] {
-                    let n = doc.get_mut(c)?;
-                    let [a, b, cc, dd, ..] = n.transform.as_coeffs();
-                    n.transform = figcraft_geom::Affine::new([a, b, cc, dd, x, y]);
-                }
-                fit_set(doc, set);
-            }
-        }
-        return ok();
-    }
-    let def = comps.iter().find_map(|c| prop_defs(doc, *c).get(&name).cloned()).ok_or_else(|| bad(cmd, format!("no property named `{name}`")))?;
-    let preferred = if get(p, "preferred").is_some() {
-        if !matches!(def, PropDef::Slot { .. } | PropDef::InstanceSwap { .. }) {
-            return Err(bad(cmd, "`preferred` is for instance swap and slot properties"));
-        }
-        Some(preferred_arg(cmd, doc, p)?)
-    } else {
-        None
-    };
-    let mut new_def = match get(p, "default") {
-        Some(v) => match coerce(cmd, doc, &name, &def, v)? {
-            Value::Bool(b) => PropDef::Boolean { default: b },
-            Value::String(t) if matches!(def, PropDef::Text { .. }) => PropDef::Text { default: t },
-            other => match (&def, id_of(&other)) {
-                (PropDef::InstanceSwap { preferred, .. }, Some(c)) => PropDef::InstanceSwap { default: c, preferred: preferred.clone() },
-                _ => def.clone(),
-            },
-        },
-        None => def.clone(),
-    };
-    if let (Some(list), PropDef::Slot { preferred } | PropDef::InstanceSwap { preferred, .. }) = (preferred, &mut new_def) {
-        *preferred = list;
-    }
-    for c in &comps {
-        let had = prop_defs(doc, *c).contains_key(&name);
-        if !had {
-            continue;
-        }
-        let key = new_name.clone().unwrap_or(name.clone());
-        let nd = new_def.clone();
-        let old = name.clone();
-        set_prop_defs(doc, *c, move |m| {
-            m.remove(&old);
-            m.insert(key, nd);
-        })?;
-        if let Some(nn) = &new_name {
-            rename_prop_refs(doc, *c, &name, Some(nn))?;
-        }
-    }
-    ok()
-}
-
-fn delete_prop(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "component.deleteProperty";
-    let target = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a component"))?;
-    let name = req_string(cmd, p, "name")?;
-    let doc = s.doc_mut()?;
-    let owner = Owner::resolve(doc, target).ok_or_else(|| bad(cmd, "select a component or component set"))?;
-    let comps = owner.components(doc);
-    if let Owner::Set(set) = owner
-        && variant_options(doc, set).iter().any(|(k, _)| *k == name)
-    {
-        let order: Vec<String> = variant_options(doc, set).into_iter().map(|(k, _)| k).collect();
-        for c in &comps {
-            let mut pairs = variant_props(&doc.get(*c)?.name);
-            pairs.remove(&name);
-            let n = doc.get_mut(*c)?;
-            n.name = if pairs.is_empty() { "Default".into() } else { variant_name(&pairs, &order) };
-        }
-        return ok();
-    }
-    let mut found = false;
-    for c in &comps {
-        if prop_defs(doc, *c).contains_key(&name) {
-            found = true;
-            set_prop_defs(doc, *c, |m| {
-                m.remove(&name);
-            })?;
-            rename_prop_refs(doc, *c, &name, None)?;
-        }
-    }
-    if !found {
-        return Err(bad(cmd, format!("no property named `{name}`")));
-    }
-    ok()
-}
-
-fn def_json(name: &str, d: &PropDef) -> Value {
-    match d {
-        PropDef::Boolean { default } => json!({"name": name, "type": "boolean", "default": default}),
-        PropDef::Text { default } => json!({"name": name, "type": "text", "default": default}),
-        PropDef::InstanceSwap { default, preferred } => json!({"name": name, "type": "instanceSwap", "default": default, "preferred": preferred}),
-        PropDef::Variant { options, default } => json!({"name": name, "type": "variant", "default": default, "options": options}),
-        PropDef::Slot { preferred } => json!({"name": name, "type": "slot", "preferred": preferred}),
-    }
-}
-
-/// Properties of a component, set or instance as JSON (`component.properties`).
-pub(crate) fn describe_props(doc: &Document, id: NodeId) -> Value {
-    let Some(n) = doc.node(id) else { return Value::Null };
-    let (owner_comp, values) = match &n.kind {
-        NodeKind::Instance { component, props } => (Some(*component), Some(props.clone())),
-        _ => (main_of(doc, id).or_else(|| owning_component(doc, id)), None),
-    };
-    let Some(comp) = owner_comp else { return json!({"properties": []}) };
-    let mut list: Vec<Value> = Vec::new();
-    if let Some(set) = variant_set(doc, comp) {
-        let current = doc.node(comp).map(|c| variant_props(&c.name)).unwrap_or_default();
-        let defaults = default_variant(doc, set).and_then(|d| doc.node(d)).map(|n| variant_props(&n.name)).unwrap_or_default();
-        for (k, vals) in variant_options(doc, set) {
-            let mut v = json!({"name": k, "type": "variant", "options": vals, "default": defaults.get(&k).or(vals.first())});
-            if values.is_some() {
-                v["value"] = json!(current.get(&k));
-            }
-            list.push(v);
-        }
-    }
-    // Slots: the frames (on a main) or this instance's copy, with whether it holds its own content.
-    let slots = slots_of(doc, if values.is_some() { id } else { variant_set(doc, comp).unwrap_or(comp) });
-    for (k, d) in prop_defs(doc, comp) {
-        let mut v = def_json(&k, &d);
-        if !takes_value(&d) {
-            let layers: Vec<NodeId> = slots.iter().filter(|(_, n)| *n == k).map(|(l, _)| *l).collect();
-            if values.is_some() {
-                v["value"] = layers.first().map_or(Value::Null, |l| {
-                    let count = doc.node(*l).map_or(0, |n| n.children.len());
-                    json!({"layer": l, "edited": slot_edited(doc, *l), "layers": count})
-                });
-            } else {
-                v["layers"] = json!(layers);
-            }
-        } else if let Some(vals) = &values {
-            v["value"] = vals.get(&k).cloned().unwrap_or_else(|| prop_default_value(&d));
-        }
-        list.push(v);
-    }
-    let set = variant_set(doc, comp);
-    let conflicts = set.map(|s| variant_conflicts(doc, s)).unwrap_or_default();
-    json!({"component": comp, "set": set, "properties": list, "conflicts": conflicts})
+/// The name a new component set takes from its first variant: the path before the last '/'
+/// ("Button/State=Hover" → "Button"), or a plain name as is ("Button"). A bare "prop=value" name
+/// ("State=Default, Size=Small") names no set.
+fn set_name_from(variant: &str) -> Option<String> {
+    let base = variant.rsplit_once('/').map_or(variant, |(path, _)| path).trim();
+    (!base.is_empty() && !base.contains('=')).then(|| base.to_string())
 }
diff --git a/crates/engine/src/cmd/component/instance.rs b/crates/engine/src/cmd/component/instance.rs
new file mode 100644
index 00000000..ffc5ec1c
--- /dev/null
+++ b/crates/engine/src/cmd/component/instance.rs
@@ -0,0 +1,404 @@
+use super::props::{Owner, add_prop_for, delete_prop, prop_defs};
+use super::*;
+
+pub(super) fn detach(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.detach";
+    let ids = req_targets(cmd, s, p)?;
+    let doc = s.doc_mut()?;
+    let mut out = Vec::new();
+    for i in ids {
+        if !matches!(doc.get(i)?.kind, NodeKind::Instance { .. }) {
+            continue;
+        }
+        if inside_instance(doc, i) {
+            return Err(EngineError::Disabled(cmd.into(), "a nested instance can't be detached on its own: detach the outer instance first".into()));
+        }
+        // Own layers lose their link (slot content stays as it is); nested instances stay
+        // instances of their own mains.
+        let nested = unlink_layers(doc, i, Some(i));
+        keep_main_modes(doc, i)?;
+        let n = doc.get_mut(i)?;
+        n.kind = NodeKind::Frame;
+        n.source = None;
+        n.overrides.clear();
+        n.prop_refs.remove("mainComponent");
+        // No properties left to drive.
+        n.bound.retain(|k, _| !k.starts_with(PROP_BINDING));
+        for nn in nested {
+            rebase_instance(doc, nn);
+        }
+        out.push(i);
+    }
+    if out.is_empty() {
+        return Err(EngineError::Disabled(cmd.into(), "select an instance".into()));
+    }
+    s.set_selection(out.clone());
+    Ok(json!({"ids": out}))
+}
+
+/// Make the variable modes instance `i` takes from its main its own (it's being detached).
+fn keep_main_modes(doc: &mut Document, i: NodeId) -> Result<()> {
+    let modes = match doc.get(i)?.kind {
+        NodeKind::Instance { component, .. } => doc.node(component).map(|m| m.var_modes.clone()).unwrap_or_default(),
+        _ => return Ok(()),
+    };
+    let own = &mut doc.get_mut(i)?.var_modes;
+    for (c, m) in modes {
+        own.entry(c).or_insert(m);
+    }
+    Ok(())
+}
+
+pub(super) fn reset_instance(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.resetInstance";
+    let ids = req_targets(cmd, s, p)?;
+    let doc = s.doc_mut()?;
+    let mut done = Vec::new();
+    for i in ids {
+        let Some(inst) = owning_instance(doc, i) else { continue };
+        let top = !inside_instance(doc, inst);
+        for d in doc.subtree(inst) {
+            let keep: Vec<&str> = if d == inst && top { vec!["size"] } else { vec![] };
+            if let Some(n) = doc.node(d)
+                && n.overrides.iter().any(|g| !keep.contains(&g.as_str()))
+                && let Some(n) = doc.node_mut(d)
+            {
+                n.overrides.retain(|g| keep.contains(&g.as_str()));
+            }
+        }
+        // Property values go back to the defaults.
+        if top
+            && let Some(NodeKind::Instance { component, props }) = doc.node(inst).map(|n| n.kind.clone())
+            && let Some(defaults) = doc.node(component).map(default_props)
+            && props != defaults
+            && let NodeKind::Instance { props, .. } = &mut doc.get_mut(inst)?.kind
+        {
+            *props = defaults;
+        }
+        // ...and stop following variables.
+        if top && doc.node(inst).is_some_and(|n| n.bound.keys().any(|k| k.starts_with(PROP_BINDING))) {
+            doc.get_mut(inst)?.bound.retain(|k, _| !k.starts_with(PROP_BINDING));
+        }
+        done.push(inst);
+    }
+    if done.is_empty() {
+        return Err(EngineError::Disabled(cmd.into(), "select an instance".into()));
+    }
+    Ok(json!({"ids": done}))
+}
+
+pub(super) fn reset_override(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.resetOverride";
+    let i = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a layer inside an instance"))?;
+    let group = string(p, "group");
+    if let Some(g) = &group
+        && !OVERRIDE_GROUPS.contains(&g.as_str())
+    {
+        return Err(bad(cmd, format!("unknown group `{g}` (known: {})", OVERRIDE_GROUPS.join(", "))));
+    }
+    let doc = s.doc_mut()?;
+    if owning_instance(doc, i).is_none() || doc.get(i)?.source.is_none() {
+        return Err(bad(cmd, "not a layer of an instance"));
+    }
+    let top_root = matches!(doc.get(i)?.kind, NodeKind::Instance { .. }) && !inside_instance(doc, i);
+    let had = doc.get(i)?.overrides.clone();
+    let n = doc.get_mut(i)?;
+    match &group {
+        Some(g) => {
+            n.overrides.remove(g);
+        }
+        None => n.overrides.clear(),
+    }
+    let mut changed = had != doc.get(i)?.overrides;
+    // The instance's own property values reset with `props`.
+    if top_root
+        && group.as_deref().is_none_or(|g| g == "props")
+        && let Some(NodeKind::Instance { component, props }) = doc.node(i).map(|n| n.kind.clone())
+        && let Some(defaults) = doc.node(component).map(default_props)
+        && props != defaults
+        && let NodeKind::Instance { props, .. } = &mut doc.get_mut(i)?.kind
+    {
+        *props = defaults;
+        changed = true;
+    }
+    Ok(json!({"changed": changed}))
+}
+
+/// A property name for `owner` based on `base` (a layer name): valid and not taken yet.
+fn fresh_prop_name(doc: &Document, owner: &Owner, base: &str) -> String {
+    let base: String = base.chars().filter(|c| !matches!(c, ',' | '=')).take(100).collect::<String>().trim().to_string();
+    let base = if base.is_empty() { "Slot".to_string() } else { base };
+    let taken = |n: &str| {
+        owner.components(doc).iter().any(|c| prop_defs(doc, *c).contains_key(n))
+            || matches!(owner, Owner::Set(s) if variant_options(doc, *s).iter().any(|(k, _)| k == n))
+    };
+    (1..10_000).map(|k| if k == 1 { base.clone() } else { format!("{base} {k}") }).find(|n| !taken(n)).unwrap_or(base)
+}
+
+/// The `preferred` components of a slot property: component or component set ids.
+pub(super) fn preferred_arg(cmd: &str, doc: &Document, p: &Value) -> Result<Vec<NodeId>> {
+    let Some(v) = get(p, "preferred").filter(|v| !v.is_null()) else { return Ok(Vec::new()) };
+    let list = v.as_array().ok_or_else(|| bad(cmd, "`preferred`: an array of component ids"))?;
+    let mut out = Vec::new();
+    for x in list.iter().take(500) {
+        let c = id_of(x)
+            .filter(|c| doc.node(*c).is_some_and(|n| matches!(n.kind, NodeKind::Component { .. } | NodeKind::ComponentSet { .. })))
+            .ok_or_else(|| bad(cmd, format!("`preferred`: {x} is not a component or component set")))?;
+        if !out.contains(&c) {
+            out.push(c);
+        }
+    }
+    Ok(out)
+}
+
+pub(super) fn make_slot(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.makeSlot";
+    let id = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a frame inside a main component"))?;
+    let doc = s.doc()?;
+    let n = doc.get(id)?;
+    let inside_main = owning_component(doc, id).is_some_and(|c| c != id) && owning_instance(doc, id).is_none();
+    if !matches!(n.kind, NodeKind::Frame) || !inside_main {
+        return Err(bad(cmd, "only a frame inside a main component (not inside an instance) can become a slot"));
+    }
+    if is_slot(doc, id) {
+        return Err(EngineError::Disabled(cmd.into(), format!("\"{}\" is already a slot", n.name)));
+    }
+    let owner = Owner::resolve(doc, id).ok_or_else(|| bad(cmd, "the frame isn't inside a component"))?;
+    let name = string(p, "name").unwrap_or_else(|| fresh_prop_name(doc, &owner, &n.name));
+    let preferred = get(p, "preferred").cloned().unwrap_or(Value::Null);
+    add_prop_for(cmd, s, &json!({"id": id, "layer": id, "name": name, "type": "slot", "preferred": preferred}))
+}
+
+pub(super) fn remove_slot(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.removeSlot";
+    let id = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a slot frame of a main component"))?;
+    let doc = s.doc()?;
+    if owning_instance(doc, id).is_some() {
+        return Err(EngineError::Disabled(cmd.into(), "slots are removed on the main component".into()));
+    }
+    let name = slot_name(doc, id).ok_or_else(|| bad(cmd, "not a slot frame of a main component"))?;
+    delete_prop(s, &json!({"id": id, "name": name}))?;
+    Ok(json!({"id": id, "name": name}))
+}
+
+/// The slot inside an instance a command acts on: `id` itself, or instance `id`'s slot `name`.
+fn instance_slot(cmd: &str, doc: &Document, id: NodeId, name: Option<&str>) -> Result<NodeId> {
+    let slot = match name {
+        Some(nm) => slots_of(doc, id).into_iter().find(|(_, n)| n == nm).map(|(l, _)| l).ok_or_else(|| bad(cmd, format!("no slot named `{nm}`")))?,
+        None => id,
+    };
+    if !is_slot(doc, slot) || owning_instance(doc, slot).is_none() {
+        return Err(bad(cmd, "not a slot of an instance (a main component's slot takes layers like any frame)"));
+    }
+    Ok(slot)
+}
+
+pub(super) fn slot_insert(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "instance.slotInsert";
+    let c = req_id(cmd, p, "component")?;
+    let target = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a slot inside an instance"))?;
+    let index = match get(p, "index").filter(|v| !v.is_null()) {
+        None => None,
+        Some(v) => Some(v.as_u64().and_then(|i| usize::try_from(i).ok()).ok_or_else(|| bad(cmd, "`index`: a child index (0 = bottom)"))?),
+    };
+    let doc = s.doc_mut()?;
+    let slot = instance_slot(cmd, doc, target, string(p, "slot").as_deref())?;
+    let c = main_of(doc, c).ok_or_else(|| bad(cmd, "`component` must be a component or component set"))?;
+    if boolean(p, "replace").unwrap_or(false) {
+        for k in doc.get(slot)?.children.clone() {
+            doc.remove(k)?;
+        }
+    }
+    let i = create_instance_at(doc, c, slot, 0.0, 0.0, index)?;
+    s.set_selection(vec![i]);
+    Ok(json!({"id": i, "slot": slot}))
+}
+
+pub(super) fn reset_slot(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "instance.resetSlot";
+    let id = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a slot inside an instance"))?;
+    let doc = s.doc_mut()?;
+    let slot = instance_slot(cmd, doc, id, string(p, "slot").as_deref())?;
+    let changed = slot_edited(doc, slot);
+    if changed {
+        doc.get_mut(slot)?.overrides.remove(SLOT);
+    }
+    Ok(json!({"id": slot, "changed": changed}))
+}
+
+pub(super) fn push_changes(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.pushChanges";
+    let i = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select an instance"))?;
+    let doc = s.doc_mut()?;
+    // Changes go to the outer instance's main (never into a nested instance's own main).
+    let inst = root_instance(doc, i).ok_or_else(|| bad(cmd, "not an instance"))?;
+    let Some(NodeKind::Instance { component, .. }) = doc.node(inst).map(|n| n.kind.clone()) else { return ok() };
+    if !doc.contains(component) {
+        return Err(EngineError::Disabled(cmd.into(), "the main component was deleted (use component.restoreMain)".into()));
+    }
+    // Copy every overridden layer's values to its source in the main (geometry, resizing, swaps,
+    // property values and slot content stay with the instance).
+    let mut pushed = 0;
+    for d in doc.subtree(inst) {
+        let Some(n) = doc.node(d).cloned() else { continue };
+        let Some(src) = (if d == inst { Some(component) } else { n.source }) else { continue };
+        if n.overrides.is_empty() || !doc.contains(src) || !doc.is_ancestor(component, src) {
+            continue;
+        }
+        let Some(mut target) = doc.node(src).cloned() else { continue };
+        let groups: BTreeSet<String> = n
+            .overrides
+            .iter()
+            .filter(|g| !(matches!(g.as_str(), "size" | "resizing" | "position" | "component" | "props" | SLOT) || d == inst && g.as_str() == "name"))
+            .cloned()
+            .collect();
+        for g in &groups {
+            copy_group(&n, &mut target, g);
+        }
+        if groups.is_empty() {
+            continue;
+        }
+        pushed += 1;
+        if let Some(slot) = doc.node_mut(src) {
+            *slot = target;
+        }
+        if let Some(m) = doc.node_mut(d) {
+            m.overrides.retain(|g| !groups.contains(g));
+        }
+    }
+    Ok(json!({"layers": pushed}))
+}
+
+fn restore_prop_defs(doc: &Document, props: &BTreeMap<String, Value>) -> BTreeMap<String, PropDef> {
+    let mut defs = BTreeMap::new();
+    for (k, v) in props {
+        let def = match v {
+            Value::Bool(b) => PropDef::Boolean { default: *b },
+            Value::String(t) => PropDef::Text { default: t.clone() },
+            other => match id_of(other) {
+                Some(c) if doc.contains(c) => PropDef::InstanceSwap { default: c, preferred: Vec::new() },
+                _ => continue,
+            },
+        };
+        defs.insert(k.clone(), def);
+    }
+    defs
+}
+
+fn restore_id_map(doc: &mut Document, i: NodeId, component: NodeId, sub: &[NodeId]) -> BTreeMap<NodeId, NodeId> {
+    let mut map: BTreeMap<NodeId, NodeId> = BTreeMap::new();
+    let mut used: BTreeSet<NodeId> = BTreeSet::new();
+    map.insert(i, component);
+    used.insert(component);
+    for d in sub.iter().filter(|d| **d != i) {
+        let src = doc.node(*d).and_then(|n| n.source);
+        let nid = match src {
+            Some(s) if !doc.contains(s) && used.insert(s) => s,
+            _ => doc.alloc_id(),
+        };
+        map.insert(*d, nid);
+    }
+    map
+}
+
+pub(super) fn restore_main(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.restoreMain";
+    let i = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select an instance"))?;
+    let doc = s.doc_mut()?;
+    let Some(NodeKind::Instance { component, props }) = doc.node(i).map(|n| n.kind.clone()) else {
+        return Err(bad(cmd, "select an instance"));
+    };
+    if doc.contains(component) {
+        return Err(EngineError::Disabled(cmd.into(), "the main component still exists".into()));
+    }
+    if inside_instance(doc, i) {
+        return Err(EngineError::Disabled(cmd.into(), "select the outer instance".into()));
+    }
+    let parent = doc.get(i)?.parent.ok_or_else(|| bad(cmd, "no parent"))?;
+    let index = doc.index_in_parent(i);
+    // The main comes back with its old id (other instances point to it) and its layers with the
+    // ids their copies mirror, so every instance re-links by source.
+    let sub = doc.subtree(i);
+    let map = restore_id_map(doc, i, component, &sub);
+    let mut nodes = Vec::new();
+    let mut nested = Vec::new();
+    for d in &sub {
+        let Some(mut n) = doc.node(*d).cloned() else { continue };
+        if *d == i {
+            let defs = restore_prop_defs(doc, &props);
+            n.kind = NodeKind::Component { description: String::new(), props: defs };
+            n.source = None;
+            n.overrides.clear();
+            n.prop_refs.clear();
+        } else {
+            let parent_inst = n.parent.and_then(|p| owning_instance(doc, p));
+            if parent_inst != Some(i) {
+                nodes.push(n);
+                continue;
+            }
+            if matches!(n.kind, NodeKind::Instance { .. }) {
+                nested.push(*d);
+            } else {
+                n.source = None;
+                n.overrides.clear();
+            }
+        }
+        nodes.push(n);
+    }
+    doc.remove(i)?;
+    doc.paste_nodes(&nodes, &map, i, parent, index)?;
+    for nn in nested {
+        if let Some(m) = map.get(&nn).copied() {
+            rebase_instance(doc, m);
+        }
+    }
+    s.set_selection(vec![component]);
+    Ok(json!({"id": component}))
+}
+
+pub(super) fn swap(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "instance.swap";
+    let c = req_id(cmd, p, "component")?;
+    let ids = req_targets(cmd, s, p)?;
+    let doc = s.doc_mut()?;
+    let c = main_of(doc, c).ok_or_else(|| bad(cmd, "`component` must be a component or component set"))?;
+    for i in ids {
+        swap_instance(doc, i, c).map_err(|m| bad(cmd, m))?;
+    }
+    ok()
+}
+
+/// Make instance `i` show main component `c`, keeping the values of properties with the same names
+/// (the layers' overrides follow by name when the instance is rebuilt).
+pub(crate) fn swap_instance(doc: &mut Document, i: NodeId, c: NodeId) -> std::result::Result<(), String> {
+    if doc.is_ancestor(c, i) {
+        return Err("an instance can't show the component it is inside".into());
+    }
+    let defaults = doc.node(c).map(default_props).unwrap_or_default();
+    match doc.get_mut(i).map(|n| &mut n.kind) {
+        Ok(NodeKind::Instance { component, props }) => {
+            *component = c;
+            let old = std::mem::take(props);
+            *props = defaults.iter().map(|(k, d)| (k.clone(), old.get(k).cloned().unwrap_or_else(|| d.clone()))).collect();
+            Ok(())
+        }
+        _ => Err(format!("{i} is not an instance")),
+    }
+}
+
+/// Swap the instance under a page point to a component (`instance.swapAt`).
+pub(crate) fn swap_at(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "instance.swapAt";
+    let c = req_id(cmd, p, "component")?;
+    let pt = figcraft_geom::Point::new(req_num(cmd, p, "x")?, req_num(cmd, p, "y")?);
+    let page = s.page()?;
+    let doc = s.doc()?;
+    let c = main_of(doc, c).ok_or_else(|| bad(cmd, "`component` must be a component or component set"))?;
+    let family = crate::drop::swap_family(doc, c);
+    let target = crate::drop::swap_target(doc, page, pt, family.as_deref(), Some(c))
+        .ok_or_else(|| EngineError::Disabled(cmd.into(), "there is no instance at that point to swap".into()))?;
+    keep_text_overrides(s.doc_mut()?, target);
+    swap(s, &json!({"ids": [target], "component": c}))?;
+    s.set_selection(vec![target]);
+    Ok(json!({"id": target, "component": c}))
+}
diff --git a/crates/engine/src/cmd/component/props.rs b/crates/engine/src/cmd/component/props.rs
new file mode 100644
index 00000000..3f2d7002
--- /dev/null
+++ b/crates/engine/src/cmd/component/props.rs
@@ -0,0 +1,609 @@
+use super::instance::preferred_arg;
+use super::variants::{fit_set, wrap_in_set};
+use super::*;
+
+/// Whether instance `id` has a component property `name` that a `kind` variable can drive (a
+/// boolean property takes a boolean variable, a text or variant property a string one).
+pub(crate) fn check_prop_binding(doc: &Document, id: NodeId, name: &str, kind: VariableType) -> std::result::Result<(), String> {
+    let Some(NodeKind::Instance { component, .. }) = doc.node(id).map(|n| &n.kind) else {
+        return Err(format!("{id} is not an instance (component properties are bound on instances)"));
+    };
+    if variant_set(doc, *component).is_some_and(|set| variant_options(doc, set).iter().any(|(o, _)| o == name)) {
+        return if kind == VariableType::String { Ok(()) } else { Err(format!("`{name}` is a variant property: bind a string variable")) };
+    }
+    match (prop_defs(doc, *component).get(name), kind) {
+        (Some(PropDef::Boolean { .. }), VariableType::Boolean) | (Some(PropDef::Text { .. }), VariableType::String) => Ok(()),
+        (Some(PropDef::Boolean { .. }), _) => Err(format!("`{name}` is a boolean property: bind a boolean variable")),
+        (Some(PropDef::Text { .. }), _) => Err(format!("`{name}` is a text property: bind a string variable")),
+        (Some(_), _) => Err(format!("`{name}`: only boolean and text properties can be bound to variables")),
+        (None, _) => Err(format!("the instance has no property named `{name}`")),
+    }
+}
+
+/// Write bound variable values into instance `id`'s boolean and text property values, and switch
+/// it to the variant its bound variant properties name (only what changed; the instance then
+/// follows like after `instance.setProperties`). A value that names no variant changes nothing.
+pub(crate) fn apply_prop_bindings(doc: &mut Document, id: NodeId, sets: &[(String, VariableValue)]) {
+    let Some(NodeKind::Instance { component, .. }) = doc.node(id).map(|n| &n.kind) else { return };
+    let component = *component;
+    if let Some(set) = variant_set(doc, component) {
+        let options = variant_options(doc, set);
+        let current = doc.node(component).map(|c| variant_props(&c.name)).unwrap_or_default();
+        let mut wanted = current.clone();
+        for (name, val) in sets {
+            if let VariableValue::String(t) = val
+                && options.iter().any(|(o, vals)| o == name && vals.contains(t))
+            {
+                wanted.insert(name.clone(), t.clone());
+            }
+        }
+        if wanted != current
+            && let Some(target) = find_variant(doc, set, &wanted)
+            && let Ok(n) = doc.get_mut(id)
+            && let NodeKind::Instance { component: c, .. } = &mut n.kind
+        {
+            *c = target;
+        }
+    }
+    let Some(NodeKind::Instance { component, props }) = doc.node(id).map(|n| &n.kind) else { return };
+    let Some(NodeKind::Component { props: defs, .. }) = doc.node(*component).map(|c| &c.kind) else { return };
+    let mut next = props.clone();
+    for (name, val) in sets {
+        let v = match (defs.get(name), val) {
+            (Some(PropDef::Boolean { .. }), VariableValue::Boolean(b)) => json!(b),
+            (Some(PropDef::Text { .. }), VariableValue::String(t)) => json!(t),
+            _ => continue,
+        };
+        next.insert(name.clone(), v);
+    }
+    if next != *props
+        && let Ok(n) = doc.get_mut(id)
+        && let NodeKind::Instance { props, .. } = &mut n.kind
+    {
+        *props = next;
+    }
+}
+
+/// Coerce a property value to the definition's type.
+fn coerce(cmd: &str, doc: &Document, name: &str, def: &PropDef, v: &Value) -> Result<Value> {
+    match def {
+        PropDef::Boolean { .. } => match v {
+            Value::Bool(b) => Ok(json!(b)),
+            Value::String(t) if t == "true" || t == "false" => Ok(json!(t == "true")),
+            _ => Err(bad(cmd, format!("`{name}` is a boolean property"))),
+        },
+        PropDef::Text { .. } => match v {
+            Value::String(t) => Ok(json!(t)),
+            Value::Number(n) => Ok(json!(n.to_string())),
+            _ => Err(bad(cmd, format!("`{name}` is a text property"))),
+        },
+        PropDef::InstanceSwap { .. } => match id_of(v).and_then(|c| main_of(doc, c)) {
+            Some(c) => Ok(json!(c.0)),
+            None => Err(bad(cmd, format!("`{name}` takes a component id"))),
+        },
+        PropDef::Variant { options, .. } => {
+            let t = v.as_str().map(str::to_string).unwrap_or_else(|| v.to_string());
+            if options.is_empty() || options.contains(&t) { Ok(json!(t)) } else { Err(bad(cmd, format!("`{name}` must be one of {options:?}"))) }
+        }
+        PropDef::Slot { .. } => Err(bad(cmd, format!("`{name}` is a slot: fill it with instance.slotInsert or by adding layers to it"))),
+    }
+}
+
+pub(super) fn set_props(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "instance.setProperties";
+    let ids = req_targets(cmd, s, p)?;
+    let props = get(p, "properties").and_then(Value::as_object).cloned().ok_or_else(|| bad(cmd, "`properties` object required"))?;
+    let doc = s.doc_mut()?;
+    for i in ids {
+        let Some(NodeKind::Instance { component, .. }) = doc.node(i).map(|n| n.kind.clone()) else {
+            return Err(bad(cmd, format!("{i} is not an instance")));
+        };
+        // Variant properties: switch to the matching sibling variant.
+        let set = variant_set(doc, component);
+        let options = set.map(|s| variant_options(doc, s)).unwrap_or_default();
+        let mut wanted = doc.node(component).map(|c| variant_props(&c.name)).unwrap_or_default();
+        let mut target = component;
+        let mut rest = Vec::new();
+        for (k, v) in &props {
+            if let Some((_, vals)) = options.iter().find(|(o, _)| o == k) {
+                let val = v.as_str().map(str::to_string).unwrap_or_else(|| v.to_string());
+                if !vals.contains(&val) {
+                    return Err(bad(cmd, format!("`{k}` must be one of {vals:?}")));
+                }
+                wanted.insert(k.clone(), val);
+            } else {
+                rest.push((k.clone(), v.clone()));
+            }
+        }
+        if let Some(set) = set
+            && wanted != doc.node(component).map(|c| variant_props(&c.name)).unwrap_or_default()
+        {
+            target = find_variant(doc, set, &wanted).unwrap_or(component);
+        }
+        let defs = match doc.node(target).map(|n| &n.kind) {
+            Some(NodeKind::Component { props, .. }) => props.clone(),
+            _ => BTreeMap::new(),
+        };
+        let mut values = Vec::new();
+        for (k, v) in rest {
+            let def = defs.get(&k).ok_or_else(|| {
+                let known: Vec<&str> = defs.keys().map(String::as_str).chain(options.iter().map(|(o, _)| o.as_str())).collect();
+                bad(cmd, format!("unknown property `{k}` (known: {})", known.join(", ")))
+            })?;
+            values.push((k.clone(), coerce(cmd, doc, &k, def, &v)?));
+        }
+        if let NodeKind::Instance { component: c, props: ip } = &mut doc.get_mut(i)?.kind {
+            *c = target;
+            for (k, v) in values {
+                ip.insert(k, v);
+            }
+            for (k, d) in defs.iter().filter(|(_, d)| takes_value(d)) {
+                ip.entry(k.clone()).or_insert_with(|| prop_default_value(d));
+            }
+        }
+    }
+    ok()
+}
+
+/// Where component properties live: a set (its variants share them) or a lone component.
+pub(super) enum Owner {
+    Set(NodeId),
+    Comp(NodeId),
+}
+
+impl Owner {
+    pub(super) fn resolve(doc: &Document, id: NodeId) -> Option<Owner> {
+        let n = doc.node(id)?;
+        match n.kind {
+            NodeKind::ComponentSet { .. } => Some(Owner::Set(id)),
+            _ => {
+                let c = owning_component(doc, id)?;
+                Some(match variant_set(doc, c) {
+                    Some(s) => Owner::Set(s),
+                    None => Owner::Comp(c),
+                })
+            }
+        }
+    }
+
+    pub(super) fn components(&self, doc: &Document) -> Vec<NodeId> {
+        match self {
+            Owner::Comp(c) => vec![*c],
+            Owner::Set(s) => doc
+                .node(*s)
+                .map(|n| n.children.iter().copied().filter(|c| doc.node(*c).is_some_and(|x| matches!(x.kind, NodeKind::Component { .. }))).collect())
+                .unwrap_or_default(),
+        }
+    }
+
+    fn id(&self) -> NodeId {
+        match self {
+            Owner::Set(s) | Owner::Comp(s) => *s,
+        }
+    }
+}
+
+pub(super) fn prop_defs(doc: &Document, c: NodeId) -> BTreeMap<String, PropDef> {
+    match doc.node(c).map(|n| &n.kind) {
+        Some(NodeKind::Component { props, .. }) => props.clone(),
+        _ => BTreeMap::new(),
+    }
+}
+
+fn set_prop_defs(doc: &mut Document, c: NodeId, f: impl FnOnce(&mut BTreeMap<String, PropDef>)) -> Result<()> {
+    if let NodeKind::Component { props, .. } = &mut doc.get_mut(c)?.kind {
+        f(props);
+    }
+    Ok(())
+}
+
+fn valid_prop_name(cmd: &str, name: &str) -> Result<String> {
+    let name = name.trim();
+    if name.is_empty() || name.contains([',', '=']) || name.chars().count() > 200 {
+        return Err(bad(cmd, "property names must be non-empty, without ',' or '='"));
+    }
+    Ok(name.to_string())
+}
+
+pub(super) fn add_prop(s: &mut Session, p: &Value) -> Result<Value> {
+    add_prop_for("component.addProperty", s, p)
+}
+
+/// Add a component property for command `cmd`, which errors name (`component.makeSlot` adds its
+/// slot property here).
+pub(super) fn add_prop_for(cmd: &str, s: &mut Session, p: &Value) -> Result<Value> {
+    let target = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a component"))?;
+    let name = valid_prop_name(cmd, &req_string(cmd, p, "name")?)?;
+    let t = req_string(cmd, p, "type")?;
+    let doc = s.doc_mut()?;
+    if inside_instance(doc, target) {
+        return Err(bad(cmd, "select a component, not a layer of an instance"));
+    }
+    let owner = Owner::resolve(doc, target).ok_or_else(|| bad(cmd, "select a component, a component set or a layer inside a component"))?;
+    // A layer selected inside the component gets bound to the new property.
+    let layer = id(p, "layer")
+        .or_else(|| (target != owner.id() && !matches!(doc.node(target).map(|n| &n.kind), Some(NodeKind::Component { .. }))).then_some(target));
+    let comps = owner.components(doc);
+    let variants = match &owner {
+        Owner::Set(s) => variant_options(doc, *s),
+        Owner::Comp(_) => Vec::new(),
+    };
+    if variants.iter().any(|(k, _)| *k == name) || comps.iter().any(|c| prop_defs(doc, *c).contains_key(&name)) {
+        return Err(bad(cmd, format!("a property named `{name}` already exists")));
+    }
+    let layer_node = layer.and_then(|l| doc.node(l)).cloned();
+    let def = match t.to_ascii_lowercase().as_str() {
+        // Without a default, a bound layer keeps showing as it does: its visibility is the default.
+        "boolean" | "bool" => PropDef::Boolean { default: boolean(p, "default").or_else(|| layer_node.as_ref().map(|n| n.visible)).unwrap_or(true) },
+        "text" => PropDef::Text {
+            default: string(p, "default")
+                .or_else(|| layer_node.as_ref().and_then(|n| n.kind.text()).map(|t| t.characters.clone()))
+                .unwrap_or_else(|| name.clone()),
+        },
+        "instanceswap" | "instance_swap" | "instance" => {
+            let d = id(p, "default")
+                .or_else(|| match layer_node.as_ref().map(|n| &n.kind) {
+                    Some(NodeKind::Instance { component, .. }) => Some(*component),
+                    _ => None,
+                })
+                .and_then(|c| main_of(doc, c))
+                .ok_or_else(|| bad(cmd, "default: a component id"))?;
+            PropDef::InstanceSwap { default: d, preferred: preferred_arg(cmd, doc, p)? }
+        }
+        "variant" => {
+            let dv = string(p, "default")
+                .map(|d| d.trim().to_string())
+                .filter(|d| !d.is_empty() && !d.contains([',', '=']))
+                .unwrap_or_else(|| "Default".into());
+            let set = match owner {
+                Owner::Set(s) => s,
+                Owner::Comp(c) => wrap_in_set(cmd, doc, &[c])?,
+            };
+            for c in Owner::Set(set).components(doc) {
+                let cn = doc.get_mut(c)?;
+                cn.name = if cn.name.contains('=') { format!("{}, {name}={dv}", cn.name) } else { format!("{name}={dv}") };
+            }
+            s.set_selection(vec![set]);
+            return Ok(json!({"id": set}));
+        }
+        "slot" => {
+            if !layer_node.as_ref().is_some_and(|n| matches!(n.kind, NodeKind::Frame)) {
+                return Err(bad(cmd, "a slot is a frame inside the component: select one (or pass `layer`)"));
+            }
+            PropDef::Slot { preferred: preferred_arg(cmd, doc, p)? }
+        }
+        _ => return Err(bad(cmd, "type: boolean|text|instanceSwap|variant|slot")),
+    };
+    for c in &comps {
+        set_prop_defs(doc, *c, |m| {
+            m.insert(name.clone(), def.clone());
+        })?;
+        // Existing instances get the default.
+        if !takes_value(&def) {
+            continue;
+        }
+        for inst in instances_of(doc, *c) {
+            if let NodeKind::Instance { props, .. } = &mut doc.get_mut(inst)?.kind {
+                props.entry(name.clone()).or_insert_with(|| prop_default_value(&def));
+            }
+        }
+    }
+    if let Some(l) = layer {
+        bind(cmd, doc, l, Some(&name), None)?;
+    }
+    Ok(json!({"id": owner.id(), "name": name}))
+}
+
+/// Bind (or with `property: None` unbind) a layer's field to a property of its component.
+fn bind(cmd: &str, doc: &mut Document, layer: NodeId, property: Option<&str>, field: Option<&str>) -> Result<()> {
+    let n = doc.get(layer)?.clone();
+    if inside_instance(doc, layer) {
+        return Err(bad(cmd, "layers inside an instance can't be bound (bind the nested instance itself, or edit its main)"));
+    }
+    let comp = owning_component(doc, layer).ok_or_else(|| bad(cmd, "the layer isn't inside a component"))?;
+    let Some(property) = property.filter(|p| !p.is_empty()) else {
+        let n = doc.get_mut(layer)?;
+        match field {
+            Some(f) => {
+                n.prop_refs.remove(f);
+            }
+            None => n.prop_refs.clear(),
+        }
+        return Ok(());
+    };
+    let defs = prop_defs(doc, comp);
+    let def = defs.get(property).ok_or_else(|| bad(cmd, format!("the component has no property `{property}`")))?;
+    let expected = match def {
+        PropDef::Boolean { .. } => "visible",
+        PropDef::Text { .. } => "characters",
+        PropDef::InstanceSwap { .. } => "mainComponent",
+        PropDef::Variant { .. } => return Err(bad(cmd, "variant properties pick a variant; they can't be bound to a layer")),
+        PropDef::Slot { .. } => SLOT,
+    };
+    let field = field.unwrap_or(expected);
+    if field != expected {
+        return Err(bad(cmd, format!("`{property}` can only control `{expected}`")));
+    }
+    match field {
+        "characters" if n.kind.text().is_none() => return Err(bad(cmd, "text properties bind to text layers")),
+        "mainComponent" if !matches!(n.kind, NodeKind::Instance { .. }) => return Err(bad(cmd, "instance swap properties bind to instances")),
+        "visible" if layer == comp => return Err(bad(cmd, "the component itself can't be hidden by its own property")),
+        SLOT if !matches!(n.kind, NodeKind::Frame) => return Err(bad(cmd, "slot properties bind to frames inside the component")),
+        SLOT if doc
+            .subtree(comp)
+            .into_iter()
+            .any(|d| d != layer && doc.node(d).is_some_and(|x| x.prop_refs.get(SLOT).map(String::as_str) == Some(property))) =>
+        {
+            return Err(bad(cmd, format!("another frame of the component is already the slot `{property}`")));
+        }
+        _ => {}
+    }
+    let n = doc.get_mut(layer)?;
+    n.prop_refs.insert(field.to_string(), property.to_string());
+    // On the main, a boolean property's value is the visibility of the layers it controls.
+    if let PropDef::Boolean { default } = def {
+        n.visible = *default;
+    }
+    Ok(())
+}
+
+pub(super) fn bind_prop(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.bindProperty";
+    let layer = id(p, "layer").or_else(|| targets(s, p).first().copied()).ok_or_else(|| bad(cmd, "`layer` required"))?;
+    let property = string(p, "property");
+    let field = string(p, "field");
+    if let Some(f) = &field
+        && !matches!(f.as_str(), "visible" | "characters" | "mainComponent" | SLOT)
+    {
+        return Err(bad(cmd, "field: visible|characters|mainComponent|slot"));
+    }
+    let doc = s.doc_mut()?;
+    bind(cmd, doc, layer, property.as_deref(), field.as_deref())?;
+    ok()
+}
+
+/// Rename `old` → `new` in the bindings of a component's layers and in its instances' values.
+fn rename_prop_refs(doc: &mut Document, comp: NodeId, old: &str, new: Option<&str>) -> Result<()> {
+    for d in doc.subtree(comp) {
+        let refs = doc.node(d).map(|n| n.prop_refs.clone()).unwrap_or_default();
+        if refs.values().any(|v| v == old)
+            && let Some(n) = doc.node_mut(d)
+        {
+            match new {
+                Some(nw) => n.prop_refs.values_mut().filter(|v| *v == old).for_each(|v| *v = nw.to_string()),
+                None => n.prop_refs.retain(|_, v| v != old),
+            }
+        }
+    }
+    // Instances' values and the variables bound to them follow (a deleted property drops both).
+    let old_key = format!("{PROP_BINDING}{old}");
+    for inst in instances_of(doc, comp) {
+        let n = doc.get_mut(inst)?;
+        if let NodeKind::Instance { props, .. } = &mut n.kind
+            && let Some(v) = props.remove(old)
+            && let Some(nw) = new
+        {
+            props.insert(nw.to_string(), v);
+        }
+        if let Some(var) = n.bound.remove(&old_key)
+            && let Some(nw) = new
+        {
+            n.bound.insert(format!("{PROP_BINDING}{nw}"), var);
+        }
+    }
+    Ok(())
+}
+
+pub(super) fn edit_prop(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.editProperty";
+    let target = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a component"))?;
+    let name = req_string(cmd, p, "name")?;
+    let new_name = string(p, "newName").map(|n| valid_prop_name(cmd, &n)).transpose()?.filter(|n| *n != name);
+    let doc = s.doc_mut()?;
+    let owner = Owner::resolve(doc, target).ok_or_else(|| bad(cmd, "select a component or component set"))?;
+    let comps = owner.components(doc);
+    if let Some(nn) = &new_name {
+        let taken = comps.iter().any(|c| prop_defs(doc, *c).contains_key(nn))
+            || matches!(owner, Owner::Set(s) if variant_options(doc, s).iter().any(|(k, _)| k == nn));
+        if taken {
+            return Err(bad(cmd, format!("a property named `{nn}` already exists")));
+        }
+    }
+    // Variant property of a set.
+    if let Owner::Set(set) = owner
+        && let Some((_, values)) = variant_options(doc, set).into_iter().find(|(k, _)| *k == name)
+    {
+        let order: Vec<String> = variant_options(doc, set).into_iter().map(|(k, _)| k).collect();
+        let rename_value = match (string(p, "value"), string(p, "newValue")) {
+            (Some(v), Some(nv)) => {
+                let nv = nv.trim().to_string();
+                if !values.contains(&v) {
+                    return Err(bad(cmd, format!("`{name}` has no value `{v}`")));
+                }
+                if nv.is_empty() || nv.contains([',', '=']) {
+                    return Err(bad(cmd, "`newValue` must be non-empty, without ',' or '='"));
+                }
+                Some((v, nv))
+            }
+            _ => None,
+        };
+        let mut order: Vec<String> = order.into_iter().map(|k| if k == name { new_name.clone().unwrap_or(k) } else { k }).collect();
+        // Reordered: every variant's name lists the properties in the new order.
+        if let Some(to) = get(p, "index").filter(|v| !v.is_null()) {
+            let to = to.as_u64().and_then(|i| usize::try_from(i).ok()).ok_or_else(|| bad(cmd, "`index`: a property place (0 = first)"))?;
+            let key = new_name.clone().unwrap_or(name.clone());
+            order.retain(|k| *k != key);
+            order.insert(to.min(order.len()), key);
+        }
+        for c in &comps {
+            let mut pairs = variant_props(&doc.get(*c)?.name);
+            if let Some((v, nv)) = &rename_value
+                && pairs.get(&name) == Some(v)
+            {
+                pairs.insert(name.clone(), nv.clone());
+            }
+            if let Some(nn) = &new_name
+                && let Some(v) = pairs.remove(&name)
+            {
+                pairs.insert(nn.clone(), v);
+            }
+            doc.get_mut(*c)?.name = variant_name(&pairs, &order);
+        }
+        // The default variant is the top-left one: the variant with that value (and the default's
+        // other values, when there is one) trades places with it.
+        if let Some(dv) = string(p, "default") {
+            let key = new_name.clone().unwrap_or(name.clone());
+            let current = default_variant(doc, set);
+            let mut wanted = current.and_then(|d| doc.node(d)).map(|n| variant_props(&n.name)).unwrap_or_default();
+            wanted.insert(key.clone(), dv.clone());
+            let props_of = |c: &NodeId| doc.node(*c).map(|n| variant_props(&n.name)).unwrap_or_default();
+            let pick =
+                comps.iter().copied().find(|c| props_of(c) == wanted).or_else(|| comps.iter().copied().find(|c| props_of(c).get(&key) == Some(&dv)));
+            let (Some(f), Some(d)) = (pick, current) else { return Err(bad(cmd, format!("no variant has {key}={dv}"))) };
+            if f != d {
+                let place = |doc: &Document, c: NodeId| doc.node(c).map(|n| n.transform.as_coeffs()).map(|[.., x, y]| (x, y)).unwrap_or_default();
+                let (fp, dp) = (place(doc, f), place(doc, d));
+                for (c, (x, y)) in [(f, dp), (d, fp)] {
+                    let n = doc.get_mut(c)?;
+                    let [a, b, cc, dd, ..] = n.transform.as_coeffs();
+                    n.transform = figcraft_geom::Affine::new([a, b, cc, dd, x, y]);
+                }
+                fit_set(doc, set);
+            }
+        }
+        return ok();
+    }
+    let def = comps.iter().find_map(|c| prop_defs(doc, *c).get(&name).cloned()).ok_or_else(|| bad(cmd, format!("no property named `{name}`")))?;
+    let preferred = if get(p, "preferred").is_some() {
+        if !matches!(def, PropDef::Slot { .. } | PropDef::InstanceSwap { .. }) {
+            return Err(bad(cmd, "`preferred` is for instance swap and slot properties"));
+        }
+        Some(preferred_arg(cmd, doc, p)?)
+    } else {
+        None
+    };
+    let mut new_def = match get(p, "default") {
+        Some(v) => match coerce(cmd, doc, &name, &def, v)? {
+            Value::Bool(b) => PropDef::Boolean { default: b },
+            Value::String(t) if matches!(def, PropDef::Text { .. }) => PropDef::Text { default: t },
+            other => match (&def, id_of(&other)) {
+                (PropDef::InstanceSwap { preferred, .. }, Some(c)) => PropDef::InstanceSwap { default: c, preferred: preferred.clone() },
+                _ => def.clone(),
+            },
+        },
+        None => def.clone(),
+    };
+    if let (Some(list), PropDef::Slot { preferred } | PropDef::InstanceSwap { preferred, .. }) = (preferred, &mut new_def) {
+        *preferred = list;
+    }
+    for c in &comps {
+        let had = prop_defs(doc, *c).contains_key(&name);
+        if !had {
+            continue;
+        }
+        let key = new_name.clone().unwrap_or(name.clone());
+        let nd = new_def.clone();
+        let old = name.clone();
+        set_prop_defs(doc, *c, move |m| {
+            m.remove(&old);
+            m.insert(key, nd);
+        })?;
+        if let Some(nn) = &new_name {
+            rename_prop_refs(doc, *c, &name, Some(nn))?;
+        }
+    }
+    // The main's bound layers show the new default.
+    if let PropDef::Boolean { default } = new_def {
+        set_boolean_default(doc, &comps, new_name.as_deref().unwrap_or(&name), default);
+    }
+    ok()
+}
+
+pub(super) fn delete_prop(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.deleteProperty";
+    let target = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a component"))?;
+    let name = req_string(cmd, p, "name")?;
+    let doc = s.doc_mut()?;
+    let owner = Owner::resolve(doc, target).ok_or_else(|| bad(cmd, "select a component or component set"))?;
+    let comps = owner.components(doc);
+    if let Owner::Set(set) = owner
+        && variant_options(doc, set).iter().any(|(k, _)| *k == name)
+    {
+        let order: Vec<String> = variant_options(doc, set).into_iter().map(|(k, _)| k).collect();
+        for c in &comps {
+            let mut pairs = variant_props(&doc.get(*c)?.name);
+            pairs.remove(&name);
+            let n = doc.get_mut(*c)?;
+            n.name = if pairs.is_empty() { "Default".into() } else { variant_name(&pairs, &order) };
+        }
+        return ok();
+    }
+    let mut found = false;
+    for c in &comps {
+        if prop_defs(doc, *c).contains_key(&name) {
+            found = true;
+            set_prop_defs(doc, *c, |m| {
+                m.remove(&name);
+            })?;
+            rename_prop_refs(doc, *c, &name, None)?;
+        }
+    }
+    if !found {
+        return Err(bad(cmd, format!("no property named `{name}`")));
+    }
+    ok()
+}
+
+fn def_json(name: &str, d: &PropDef) -> Value {
+    match d {
+        PropDef::Boolean { default } => json!({"name": name, "type": "boolean", "default": default}),
+        PropDef::Text { default } => json!({"name": name, "type": "text", "default": default}),
+        PropDef::InstanceSwap { default, preferred } => json!({"name": name, "type": "instanceSwap", "default": default, "preferred": preferred}),
+        PropDef::Variant { options, default } => json!({"name": name, "type": "variant", "default": default, "options": options}),
+        PropDef::Slot { preferred } => json!({"name": name, "type": "slot", "preferred": preferred}),
+    }
+}
+
+/// Properties of a component, set or instance as JSON (`component.properties`).
+pub(crate) fn describe_props(doc: &Document, id: NodeId) -> Value {
+    let Some(n) = doc.node(id) else { return Value::Null };
+    let (owner_comp, values) = match &n.kind {
+        NodeKind::Instance { component, props } => (Some(*component), Some(props.clone())),
+        _ => (main_of(doc, id).or_else(|| owning_component(doc, id)), None),
+    };
+    let Some(comp) = owner_comp else { return json!({"properties": []}) };
+    let mut list: Vec<Value> = Vec::new();
+    if let Some(set) = variant_set(doc, comp) {
+        let current = doc.node(comp).map(|c| variant_props(&c.name)).unwrap_or_default();
+        let defaults = default_variant(doc, set).and_then(|d| doc.node(d)).map(|n| variant_props(&n.name)).unwrap_or_default();
+        for (k, vals) in variant_options(doc, set) {
+            let mut v = json!({"name": k, "type": "variant", "options": vals, "default": defaults.get(&k).or(vals.first())});
+            if values.is_some() {
+                v["value"] = json!(current.get(&k));
+            }
+            list.push(v);
+        }
+    }
+    // Slots: the frames (on a main) or this instance's copy, with whether it holds its own content.
+    let slots = slots_of(doc, if values.is_some() { id } else { variant_set(doc, comp).unwrap_or(comp) });
+    for (k, d) in prop_defs(doc, comp) {
+        let mut v = def_json(&k, &d);
+        if !takes_value(&d) {
+            let layers: Vec<NodeId> = slots.iter().filter(|(_, n)| *n == k).map(|(l, _)| *l).collect();
+            if values.is_some() {
+                v["value"] = layers.first().map_or(Value::Null, |l| {
+                    let count = doc.node(*l).map_or(0, |n| n.children.len());
+                    json!({"layer": l, "edited": slot_edited(doc, *l), "layers": count})
+                });
+            } else {
+                v["layers"] = json!(layers);
+            }
+        } else if let Some(vals) = &values {
+            v["value"] = vals.get(&k).cloned().unwrap_or_else(|| prop_default_value(&d));
+        }
+        list.push(v);
+    }
+    let set = variant_set(doc, comp);
+    let conflicts = set.map(|s| variant_conflicts(doc, s)).unwrap_or_default();
+    json!({"component": comp, "set": set, "properties": list, "conflicts": conflicts})
+}
diff --git a/crates/engine/src/cmd/component/variants.rs b/crates/engine/src/cmd/component/variants.rs
new file mode 100644
index 00000000..f6e7ac6c
--- /dev/null
+++ b/crates/engine/src/cmd/component/variants.rs
@@ -0,0 +1,175 @@
+use super::*;
+
+/// Wrap components in a new component set (named after the first) placed around them.
+pub(super) fn wrap_in_set(cmd: &str, doc: &mut Document, ids: &[NodeId]) -> Result<NodeId> {
+    let top = *ids.last().ok_or_else(|| bad(cmd, "nothing selected"))?;
+    let parent = doc.get(top)?.parent.ok_or_else(|| bad(cmd, "page"))?;
+    if inside_instance(doc, top) || owning_instance(doc, parent).is_some() {
+        return Err(EngineError::Disabled(cmd.into(), INSIDE_INSTANCE.into()));
+    }
+    let bounds = doc.bounds_of(ids).unwrap_or_default();
+    let pw = doc.world_transform(parent);
+    let local = figcraft_geom::transform_rect_bbox(pw.inverse(), bounds.inflate(20.0, 20.0));
+    let base = ids.first().and_then(|i| doc.node(*i)).and_then(|n| set_name_from(&n.name)).unwrap_or_else(|| doc.next_name("Component"));
+    let set = doc.alloc_id();
+    let mut n = Node::new(set, NodeKind::ComponentSet { description: String::new() }, base, local.width(), local.height());
+    n.transform = figcraft_geom::Affine::translate((local.x0, local.y0));
+    n.fills.clear();
+    doc.insert(n, parent, doc.index_in_parent(top).map(|i| i + 1))?;
+    for i in ids {
+        doc.reparent(*i, set, None)?;
+    }
+    Ok(set)
+}
+
+const INSIDE_INSTANCE: &str = "components inside an instance can't become variants";
+
+/// Why `ids` (distinct) can't become the variants of a new component set, or `None` when they
+/// can: anything but main components, components that are variants already (combining them would
+/// put a set in a set), library copies, components inside an instance, and a component inside
+/// another one of `ids`.
+fn combine_refusal(doc: &Document, ids: &[NodeId]) -> Option<&'static str> {
+    if !ids.iter().all(|i| doc.node(*i).is_some_and(|n| matches!(n.kind, NodeKind::Component { .. }))) {
+        Some("select components only")
+    } else if ids.iter().any(|i| variant_set(doc, *i).is_some()) {
+        Some("components that are variants already can't be combined again")
+    } else if ids.iter().any(|i| doc.is_remote(*i)) {
+        Some(crate::library::READ_ONLY)
+    } else if ids.iter().any(|i| inside_instance(doc, *i)) {
+        Some(INSIDE_INSTANCE)
+    } else if roots(doc, ids).len() != ids.len() {
+        Some("a component can't be combined with one inside it")
+    } else {
+        None
+    }
+}
+
+/// Whether "Combine as variants" is on offer for `ids` (menus and the Design panel): two or more
+/// main components that [`combine_refusal`] lets through.
+pub fn can_combine_variants(doc: &Document, ids: &[NodeId]) -> bool {
+    ids.len() >= 2 && combine_refusal(doc, ids).is_none() && ids.iter().collect::<BTreeSet<_>>().len() == ids.len()
+}
+
+/// Whether "Add variant" is on offer for `id`: a component set with variants, a variant, or a main
+/// component not in a set yet (it becomes one); never a library copy or inside an instance.
+pub fn can_add_variant(doc: &Document, id: NodeId) -> bool {
+    let Some(n) = doc.node(id) else { return false };
+    let local = !doc.is_remote(id) && !inside_instance(doc, id);
+    match n.kind {
+        NodeKind::ComponentSet { .. } => {
+            local && n.children.iter().any(|c| doc.node(*c).is_some_and(|c| matches!(c.kind, NodeKind::Component { .. })))
+        }
+        NodeKind::Component { .. } => local,
+        _ => false,
+    }
+}
+
+/// Wrap `ids` (z-sorted main components) in a new component set, naming them "Property 1=Default",
+/// "Property 1=VariantN" unless already in prop=value form. Returns the set.
+fn make_variant_set(cmd: &str, doc: &mut Document, ids: &[NodeId]) -> Result<NodeId> {
+    let set = wrap_in_set(cmd, doc, ids)?;
+    for (k, i) in ids.iter().enumerate() {
+        let node = doc.get_mut(*i)?;
+        if !node.name.contains('=') {
+            node.name = format!("Property 1={}", if k == 0 { "Default".to_string() } else { format!("Variant{}", k + 1) });
+        }
+    }
+    Ok(set)
+}
+
+pub(super) fn combine(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.combineVariants";
+    let mut seen = BTreeSet::new();
+    let ids: Vec<NodeId> = req_targets(cmd, s, p)?.into_iter().filter(|i| seen.insert(*i)).collect();
+    let doc = s.doc_mut()?;
+    if let Some(why) = combine_refusal(doc, &ids) {
+        return Err(EngineError::Disabled(cmd.into(), why.into()));
+    }
+    let ids = z_sorted(doc, &ids);
+    let set = make_variant_set(cmd, doc, &ids)?;
+    s.set_selection(vec![set]);
+    Ok(json!({"id": set}))
+}
+
+/// Grow a component set so it wraps its variants with 20 px of padding (right and bottom).
+pub(super) fn fit_set(doc: &mut Document, set: NodeId) {
+    let Some(kids) = doc.node(set).map(|n| n.children.clone()) else { return };
+    let (mut w, mut h) = (0.0f64, 0.0f64);
+    for c in kids {
+        if let Some(n) = doc.node(c) {
+            let b = figcraft_geom::transform_rect_bbox(n.transform, n.local_rect());
+            w = w.max(b.x1 + 20.0);
+            h = h.max(b.y1 + 20.0);
+        }
+    }
+    if let Some(n) = doc.node_mut(set) {
+        n.width = n.width.max(w);
+        n.height = n.height.max(h);
+    }
+}
+
+pub(super) fn add_variant(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "component.addVariant";
+    let t = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a component set or component"))?;
+    let doc = s.doc_mut()?;
+    let (set, base) = match doc.get(t)?.kind {
+        NodeKind::ComponentSet { .. } => {
+            let last = doc.get(t)?.children.last().copied().ok_or_else(|| bad(cmd, "the component set is empty"))?;
+            (t, last)
+        }
+        NodeKind::Component { .. } => match variant_set(doc, t) {
+            Some(set) => (set, t),
+            // A main component on its own becomes a set of itself, then gains the new variant.
+            None => (make_variant_set(cmd, doc, &[t])?, t),
+        },
+        _ => return Err(bad(cmd, "select a component set or component")),
+    };
+    let options = variant_options(doc, set);
+    let mut pairs = variant_props(&doc.get(base)?.name);
+    let order: Vec<String> = options.iter().map(|(k, _)| k.clone()).collect();
+    let existing: BTreeSet<BTreeMap<String, String>> =
+        doc.get(set)?.children.iter().filter_map(|c| doc.node(*c)).map(|n| variant_props(&n.name)).collect();
+    match (string(p, "property"), string(p, "value")) {
+        (Some(prop), Some(value)) => {
+            let (prop, value) = (prop.trim().to_string(), value.trim().to_string());
+            if !options.iter().any(|(k, _)| *k == prop) {
+                return Err(bad(cmd, format!("unknown variant property `{prop}`")));
+            }
+            if value.is_empty() || value.contains([',', '=']) {
+                return Err(bad(cmd, "`value` must be non-empty without ',' or '='"));
+            }
+            pairs.insert(prop, value);
+            if existing.contains(&pairs) {
+                return Err(bad(cmd, "that variant already exists"));
+            }
+        }
+        (Some(_), None) => return Err(bad(cmd, "`value` is required with `property`")),
+        _ => {
+            let prop = order.first().cloned().unwrap_or_else(|| "Property 1".into());
+            let mut k = existing.len() + 1;
+            loop {
+                pairs.insert(prop.clone(), format!("Variant{k}"));
+                if !existing.contains(&pairs) || k > 10_000 {
+                    break;
+                }
+                k += 1;
+            }
+        }
+    }
+    let name = variant_name(&pairs, &order);
+    let bottom = doc
+        .get(set)?
+        .children
+        .iter()
+        .filter_map(|c| doc.node(*c))
+        .map(|n| figcraft_geom::transform_rect_bbox(n.transform, n.local_rect()).y1)
+        .fold(0.0f64, f64::max);
+    let dup = doc.duplicate_into(base, set, None)?;
+    let n = doc.get_mut(dup)?;
+    n.name = name;
+    let c = n.transform.as_coeffs();
+    n.transform = figcraft_geom::Affine::new([c[0], c[1], c[2], c[3], c[4], bottom + 20.0]);
+    fit_set(doc, set);
+    s.set_selection(vec![dup]);
+    Ok(json!({"id": dup}))
+}
diff --git a/crates/engine/src/cmd/create.rs b/crates/engine/src/cmd/create.rs
index 2150701a..414a2310 100644
--- a/crates/engine/src/cmd/create.rs
+++ b/crates/engine/src/cmd/create.rs
@@ -7,7 +7,7 @@ use serde_json::{Value, json};
 
 use super::{CommandSpec, ok};
 use crate::params::*;
-use crate::{EngineError, Result, Session, bad, spec};
+use crate::{Result, Session, bad, spec};
 
 /// Frame presets shown by the Frame tool (category, name, width, height).
 pub const FRAME_PRESETS: &[(&str, &str, f64, f64)] = &[
@@ -73,13 +73,17 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!("text.create", "Text", "{text, x, y, parent?, width? (fixed width wraps), props? (fontSize, fontFamily, …)}", true, |s, p| {
             create_kind(s, p, "text")
         }),
-        spec!("vector.create", "Vector", "{path (SVG path data) | points [[x,y],..], closed?, x?, y?, parent?, props?}", true, |s, p| create_kind(
-            s, p, "vector"
-        )),
+        spec!(
+            "vector.create",
+            "Vector",
+            "{path (SVG path data) | points [[x,y],..], closed?, x?, y?, width?, height? (scale the path; one keeps its proportion), parent?, props?}",
+            true,
+            |s, p| create_kind(s, p, "vector")
+        ),
         spec!(
             "image.place",
             "Place image",
-            "{data (base64) | path, x?, y?, width?, height?, parent?, mode? (fill|fit|crop|tile)} → {id, image, width, height, imageProfile (its embedded colour profile; null: taken as sRGB)}",
+            "{data (base64) | path, x?, y?, width?, height?, parent?, target? (an existing layer: the image is added on top of its fills instead of making a layer), mode? (fill|fit|crop|tile)} → {id, image, width, height, imageProfile (its embedded colour profile; null: taken as sRGB)}",
             true,
             place_image
         ),
@@ -107,7 +111,8 @@ pub fn frame_at(doc: &Document, page: NodeId, pt: Point, exclude: &[NodeId]) ->
             return None;
         }
         let n = doc.node(id)?;
-        if !n.visible || n.locked {
+        // Board objects (stickies, shapes with text) never take layers in.
+        if !n.visible || n.locked || n.is_board_atom() {
             return None;
         }
         let is_container = n.kind.is_frame_like() || matches!(n.kind, NodeKind::Section { .. });
@@ -162,12 +167,79 @@ pub fn parse_path_data(d: &str) -> Option<figcraft_geom::BezPath> {
     figcraft_geom::BezPath::from_svg(d).ok()
 }
 
+/// A vector's geometry made from SVG path data (see [`path_network`]).
+pub(crate) struct PathShape {
+    /// The network, with the path's own box moved to the origin and scaled to the size asked for.
+    pub network: VectorNetwork,
+    pub width: f64,
+    pub height: f64,
+    /// Where the path's own box starts in its coordinates (unscaled).
+    pub offset: (f64, f64),
+}
+
+/// The network SVG path data `d` draws, for `node.create` and `node.set`: the path's own box moves
+/// to the origin, and `width`/`height` scale it as [`vector_scale`] says. Data that doesn't parse
+/// or draws nothing is refused.
+pub(crate) fn path_network(cmd: &str, d: &str, width: Option<f64>, height: Option<f64>) -> Result<PathShape> {
+    use figcraft_geom::Shape;
+    let empty = || bad(cmd, "`path` draws nothing: a vector needs a visible line or area");
+    let mut path = parse_path_data(d).ok_or_else(|| bad(cmd, "`path` is not valid SVG path data"))?;
+    let bb = path.bounding_box();
+    if !(bb.x0.is_finite() && bb.y0.is_finite() && bb.width().is_finite() && bb.height().is_finite()) {
+        return Err(bad(cmd, "`path` has coordinates too large to draw"));
+    }
+    if bb.width() <= 1e-9 && bb.height() <= 1e-9 {
+        return Err(empty());
+    }
+    path.apply_affine(figcraft_geom::Affine::translate((-bb.x0, -bb.y0)));
+    let (sx, sy) = vector_scale(width, height, bb.width(), bb.height(), "a path").map_err(|e| bad(cmd, e))?;
+    if sx != 1.0 || sy != 1.0 {
+        path.apply_affine(figcraft_geom::Affine::scale_non_uniform(sx, sy));
+    }
+    let network = VectorNetwork::from_path(&path);
+    if network.segments.is_empty() {
+        return Err(empty());
+    }
+    Ok(PathShape { network, width: bb.width() * sx, height: bb.height() * sy, offset: (bb.x0, bb.y0) })
+}
+
+/// How much a vector's path is scaled to take the size asked for: with both sides, each scales
+/// independently (as resizing a vector does); with one, the other keeps its proportion. A size on
+/// an axis the geometry has none of is an error unless it is 0 (a line's height), and a size of 0
+/// or less on an axis it has is refused rather than flattening it.
+fn vector_scale(width: Option<f64>, height: Option<f64>, bw: f64, bh: f64, what: &str) -> std::result::Result<(f64, f64), String> {
+    let fit = |asked: Option<f64>, have: f64, axis: &str| match asked {
+        None => Ok(1.0),
+        Some(a) if have <= 1e-9 => {
+            if a == 0.0 {
+                Ok(1.0)
+            } else {
+                Err(format!("`{axis}` can't size {what} with no {} extent", if axis == "width" { "horizontal" } else { "vertical" }))
+            }
+        }
+        Some(a) if a > 0.0 && (a / have).is_finite() => Ok(a / have),
+        Some(_) => Err(format!("`{axis}` must be a positive, finite size: 0 or less would flatten {what}")),
+    };
+    Ok(match (width, height) {
+        (Some(_), Some(_)) => (fit(width, bw, "width")?, fit(height, bh, "height")?),
+        (Some(_), None) => {
+            let s = fit(width, bw, "width")?;
+            (s, s)
+        }
+        (None, Some(_)) => {
+            let s = fit(height, bh, "height")?;
+            (s, s)
+        }
+        (None, None) => (1.0, 1.0),
+    })
+}
+
 pub fn create(s: &mut Session, p: &Value) -> Result<Value> {
     let cmd = "node.create";
     let t = string(p, "type").ok_or_else(|| bad(cmd, "`type` is required"))?;
     let (mut kind, base) = kind_for(&t).ok_or_else(|| bad(cmd, format!("unknown type `{t}`")))?;
     let page = s.page()?;
-    let parent = id(p, "parent").unwrap_or(page);
+    let parent = crate::params::opt_id(cmd, p, "parent")?.unwrap_or(page);
     let doc = s.doc()?;
     let pn = doc.get(parent)?;
     if !pn.kind.is_container() {
@@ -187,31 +259,32 @@ pub fn create(s: &mut Session, p: &Value) -> Result<Value> {
         "Section" => (num_or(p, "width", 400.0), num_or(p, "height", 300.0)),
         _ => (num_or(p, "width", 100.0), num_or(p, "height", 100.0)),
     };
-    // Vectors: path data or points define the shape and its box.
+    // Vectors: path data or points define the shape and its box. `width`/`height`, when asked
+    // for, scale the geometry: both sides independently, one side proportionally.
     let mut offset = (0.0, 0.0);
+    let asked = (num(p, "width"), num(p, "height"));
     if let NodeKind::Vector { network } = &mut kind {
         if let Some(d) = string(p, "path") {
-            let mut path = parse_path_data(&d).ok_or_else(|| bad(cmd, "`path` is not valid SVG path data"))?;
-            use figcraft_geom::Shape;
-            let bb = path.bounding_box();
-            path.apply_affine(figcraft_geom::Affine::translate((-bb.x0, -bb.y0)));
-            *network = VectorNetwork::from_path(&path);
+            let shape = path_network(cmd, &d, asked.0, asked.1)?;
+            *network = shape.network;
             if boolean(p, "closed") == Some(false) {
                 network.regions.clear();
             }
-            w = bb.width();
-            h = bb.height();
-            offset = (bb.x0, bb.y0);
+            (w, h, offset) = (shape.width, shape.height, shape.offset);
         } else if let Some(Value::Array(pts)) = get(p, "points") {
             let pts: Vec<Point> = pts.iter().filter_map(|v| Some(Point::new(f64_of(v.get(0)?)?, f64_of(v.get(1)?)?))).collect();
             if pts.len() < 2 {
                 return Err(bad(cmd, "`points` needs at least two [x, y] pairs"));
             }
             let bb = figcraft_geom::points_bounds(pts.iter().copied()).unwrap_or_default();
-            let local: Vec<Point> = pts.iter().map(|q| Point::new(q.x - bb.x0, q.y - bb.y0)).collect();
+            if bb.width() <= 1e-9 && bb.height() <= 1e-9 {
+                return Err(bad(cmd, "`points` draws nothing: a vector needs a visible line or area"));
+            }
+            let (sx, sy) = vector_scale(asked.0, asked.1, bb.width(), bb.height(), "a point set").map_err(|e| bad(cmd, e))?;
+            let local: Vec<Point> = pts.iter().map(|q| Point::new((q.x - bb.x0) * sx, (q.y - bb.y0) * sy)).collect();
             *network = VectorNetwork::from_points(&local, boolean(p, "closed").unwrap_or(false));
-            w = bb.width();
-            h = bb.height();
+            w = bb.width() * sx;
+            h = bb.height() * sy;
             offset = (bb.x0, bb.y0);
         }
     }
@@ -255,7 +328,7 @@ pub fn create(s: &mut Session, p: &Value) -> Result<Value> {
         node.width = tw;
         node.height = th;
     }
-    let index = num(p, "index").map(|i| i.max(0.0) as usize);
+    let index = crate::params::opt_index(cmd, p, "index")?;
     doc.insert(node, parent, index)?;
     if let Some(Value::Object(props)) = get(p, "props") {
         super::props::apply(cmd, doc, nid, props)?;
@@ -313,17 +386,36 @@ fn free_spot(s: &Session, w: f64, h: f64) -> Result<(f64, f64)> {
 
 #[cfg(not(target_arch = "wasm32"))]
 fn read_path(path: &str) -> Result<Vec<u8>> {
-    std::fs::read(path).map_err(|e| EngineError::Other(format!("{path}: {e}")))
+    crate::file_access::read(path)
 }
 
 #[cfg(target_arch = "wasm32")]
 fn read_path(path: &str) -> Result<Vec<u8>> {
-    Err(EngineError::Other(format!("{path}: files can't be read in the browser")))
+    Err(crate::EngineError::Other(format!("{path}: files can't be read in the browser")))
+}
+
+/// Layers that can show an image inside their own outline.
+pub fn accepts_image_fill(kind: &NodeKind) -> bool {
+    kind.is_shape() || kind.is_frame_like() || matches!(kind, NodeKind::Text(_) | NodeKind::BooleanOp { .. })
+}
+
+/// Add an image fill on top of the layer's fills: the others keep their place and variable
+/// bindings; a linked fill style no longer describes the list, so the link goes.
+fn add_image_fill(node: &mut Node, image: String, mode: ImageScaleMode) {
+    node.fills.push(Paint::image(image, mode));
+    node.styles.fill = None;
 }
 
 /// Place an image as a rectangle with an image fill (Figma's image layer).
 pub fn place_image(s: &mut Session, p: &Value) -> Result<Value> {
     let cmd = "image.place";
+    let target = opt_id(cmd, p, "target")?;
+    if let Some(id) = target {
+        let node = s.doc()?.node(id).ok_or(crate::EngineError::NoNode(id))?;
+        if !accepts_image_fill(&node.kind) {
+            return Err(bad(cmd, "`target` must be a layer that can have a fill"));
+        }
+    }
     let bytes = if let Some(b64) = string(p, "data") {
         use base64::Engine as _;
         let b64 = b64.split_once(',').map(|(_, d)| d.to_string()).unwrap_or(b64);
@@ -339,8 +431,16 @@ pub fn place_image(s: &mut Session, p: &Value) -> Result<Value> {
         "tile" => ImageScaleMode::Tile,
         _ => ImageScaleMode::Fill,
     };
+    if let Some(id) = target {
+        let doc = s.doc_mut()?;
+        let (hash, _, _) = figcraft_format::add_image(doc, bytes).map_err(|e| bad(cmd, e.to_string()))?;
+        let profile = figcraft_render::images::profile_name(&hash, doc.images.get(&hash));
+        let node = doc.get_mut(id)?;
+        add_image_fill(node, hash.clone(), mode);
+        return Ok(json!({"id": id, "image": hash, "width": node.width, "height": node.height, "imageProfile": profile}));
+    }
     let page = s.page()?;
-    let parent = id(p, "parent").unwrap_or(page);
+    let parent = crate::params::opt_id(cmd, p, "parent")?.unwrap_or(page);
     let ds = s.ds_mut()?;
     let doc = ds.doc_mut();
     let (hash, iw, ih) = figcraft_format::add_image(doc, bytes).map_err(|e| bad(cmd, e.to_string()))?;
diff --git a/crates/engine/src/cmd/edit.rs b/crates/engine/src/cmd/edit.rs
index 2c767b93..7ec63c69 100644
--- a/crates/engine/src/cmd/edit.rs
+++ b/crates/engine/src/cmd/edit.rs
@@ -4,11 +4,27 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use figcraft_doc::*;
 use figcraft_geom::Affine;
-use serde_json::{Value, json};
+use serde_json::{Map, Value, json};
 
 use super::{CommandSpec, ok};
 use crate::params::*;
-use crate::{EngineError, Result, Session, bad, spec};
+use crate::{BatchStep, EngineError, Result, Session, bad, spec};
+
+mod clipboard;
+mod props;
+mod select;
+
+pub use clipboard::{CLIP_CLOSE, CLIP_OPEN, copy_to_clipboard, design_clipboard_buffer, paste_into};
+use clipboard::{copy, copy_props, copy_props_of, cut, paste, paste_design_layers, paste_over, paste_props, paste_replace};
+use props::{
+    batch_rename, effect_add, effect_copy, effect_paste, find_replace, paint_copy, paint_list, paint_paste, paint_set, pattern_fill, reparent, set,
+    stroke_brush, width_profile,
+};
+pub use select::opacity_from_digits;
+use select::{
+    hide_others, layers_at, nudge, nudge_size, opacity_keys, select_all, select_area, select_children, select_inverse, select_matching,
+    select_parent, select_same, select_sibling, toggle,
+};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![
@@ -18,13 +34,26 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "edit.duplicate",
             "Duplicate",
-            "{ids?, dx?, dy? (page offset; default: the offset of the last duplicate when ids are its copies, still selected; else top-level frames to the right with a 100 gap, everything else in place)}",
+            "{ids?, dx?, dy? (page offset; default: the offset of the last duplicate when ids are its copies, still selected; else top-level frames to the right with a 100 gap, everything else in place)}  a main component's copy is an instance of it (a variant stays a new variant in its set)",
             true,
             duplicate
         ),
         spec!("edit.copy", "Copy", "{ids?}", false, copy),
         spec!("edit.cut", "Cut", "{ids?}", true, cut),
-        spec!("edit.paste", "Paste", "{parent?, x?, y? (page coordinates of the pasted top-left)}", true, paste),
+        spec!(
+            "edit.paste",
+            "Paste",
+            "{parent?, x?, y? (page coordinates of the pasted top-left)}  a copied main component pastes as an instance of it within its file (cut ones, and pastes into other files, keep the component)",
+            true,
+            paste
+        ),
+        spec!(
+            "edit.pasteDesignLayers",
+            "Paste design layers",
+            "{html (the clipboard's HTML) | data (base64 of the clipboard's design data, at most 256 MB), parent?, x?, y?}  layers copied from another design app (a .fig canvas in the clipboard's HTML), read like a .fig file (best effort, with `warnings`), pasted as edit.paste pastes",
+            true,
+            paste_design_layers
+        ),
         spec!("edit.pasteOver", "Paste over selection", "{}", true, paste_over),
         spec!("edit.pasteReplace", "Paste to replace", "{ids?}", true, paste_replace),
         spec!("edit.copyProperties", "Copy properties", "{id?}", false, copy_props),
@@ -203,7 +232,13 @@ pub fn specs() -> Vec<CommandSpec> {
             let i = req_id("node.get", p, "id")?;
             Ok(crate::inspect::node_json(s.doc()?, i, 1))
         }),
-        spec!("node.reparent", "Move layer into", "{ids?, parent, index?}", true, reparent),
+        spec!(
+            "node.reparent",
+            "Move layer into",
+            "{ids?, parent, index? (final position among parent's children, bottom first; default top)}",
+            true,
+            reparent
+        ),
         spec!("node.reorder", "Reorder layer", "{id, index}", true, |s, p| {
             let i = req_id("node.reorder", p, "id")?;
             let idx = req_num("node.reorder", p, "index")?.max(0.0) as usize;
@@ -216,6 +251,22 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!("stroke.remove", "Remove stroke", "{ids?, index}", true, |s, p| paint_list(s, p, false, false)),
         spec!("fill.set", "Set fill", "{ids?, index?, paint | color, opacity?, visible?, blend?}", true, |s, p| paint_set(s, p, true)),
         spec!("stroke.set", "Set stroke", "{ids?, index?, paint | color, opacity?, visible?, blend?}", true, |s, p| paint_set(s, p, false)),
+        spec!("fill.copy", "Copy fill", "{id?, index? (default the top fill)}", false, |s, p| paint_copy(s, p, true)),
+        spec!("fill.paste", "Paste fill", "{ids?, index? (replace the fill there; without: add one)}", true, |s, p| paint_paste(s, p, true)),
+        spec!(
+            "stroke.copy",
+            "Copy stroke",
+            "{id?, index? (default the top stroke)}  its paint and the stroke's weight, alignment, sides, caps, joins and dashes",
+            false,
+            |s, p| paint_copy(s, p, false)
+        ),
+        spec!(
+            "stroke.paste",
+            "Paste stroke",
+            "{ids?, index? (replace the stroke there; without: add one)}  the copied stroke's settings come with its paint",
+            true,
+            |s, p| paint_paste(s, p, false)
+        ),
         spec!(
             "fill.pattern",
             "Pattern fill",
@@ -254,7 +305,7 @@ pub fn specs() -> Vec<CommandSpec> {
         }),
         spec!("effect.set", "Set effect", "{ids?, index, effect {..}}", true, |s, p| {
             let i = req_index("effect.set", p, "index")?;
-            let e: Effect = parse("effect.set", p, "effect")?.ok_or_else(|| bad("effect.set", "`effect` required"))?;
+            let e = super::props::effect_from("effect.set", p, "effect")?.ok_or_else(|| bad("effect.set", "`effect` required"))?;
             for id in req_targets("effect.set", s, p)? {
                 let n = s.doc_mut()?.get_mut(id)?;
                 if let Some(slot) = n.effects.get_mut(i) {
@@ -263,6 +314,8 @@ pub fn specs() -> Vec<CommandSpec> {
             }
             ok()
         }),
+        spec!("effect.copy", "Copy effect", "{id?, index? (default the top effect)}", false, effect_copy),
+        spec!("effect.paste", "Paste effect", "{ids?, index? (replace the effect there; without: add one)}", true, effect_paste),
         spec!("grid.add", "Add layout grid", "{ids?, grid? {kind: grid|columns|rows, ..}}", true, |s, p| {
             let g: LayoutGrid = parse("grid.add", p, "grid")?.unwrap_or_default();
             for id in req_targets("grid.add", s, p)? {
@@ -280,7 +333,7 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "export.add",
             "Add export setting",
-            "{ids?, setting? {size: 2x|512w|512h|{by: scale|width|height, value}, suffix?, format?: png|jpg|svg|pdf|webp, bleed? (PDF: points, or with a unit: \"3mm\", \"0.125in\", \"9pt\"), cropMarks?, bleedMarks?, cmyk? (PDF print options)}} (without a setting: 1x, then one scale step up with an \"@2x\"-style suffix)",
+            "{ids?, setting? {size: 2x|512w|512h|{by: scale|width|height, value}, suffix?, format?: png|jpg|svg|pdf|webp|xml (Android Vector Drawable), bleed? (PDF: points, or with a unit: \"3mm\", \"0.125in\", \"9pt\"), cropMarks?, bleedMarks?, cmyk? (PDF print options), vdCompat? (XML: bestEffort|exact|ignore)}} (without a setting: 1x, then one scale step up with an \"@2x\"-style suffix)",
             true,
             |s, p| {
                 let cmd = "export.add";
@@ -298,7 +351,7 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "export.update",
             "Edit export setting",
-            "{ids?, index, size? (2x|512w|512h|{by, value}), suffix?, format? (png|jpg|svg|pdf|webp), bleed? (PDF: points, or with a unit: \"3mm\", \"0.125in\", \"9pt\"), cropMarks?, bleedMarks?, cmyk? (PDF print options)}",
+            "{ids?, index, size? (2x|512w|512h|{by, value}), suffix?, format? (png|jpg|svg|pdf|webp|xml: Android Vector Drawable), bleed? (PDF: points, or with a unit: \"3mm\", \"0.125in\", \"9pt\"), cropMarks?, bleedMarks?, cmyk? (PDF print options), vdCompat? (XML: bestEffort|exact|ignore)}",
             true,
             |s, p| {
                 let cmd = "export.update";
@@ -323,15 +376,16 @@ pub fn specs() -> Vec<CommandSpec> {
             }
             ok()
         }),
-        spec!("command.batch", "Run several commands", "{label?, commands: [{command, params}]} (one undo step)", false, |s, p| {
+        spec!("command.batch", "Run several commands", "{label?, commands: [{command, params, as?}]} (one undo step)", false, |s, p| {
             let label = string(p, "label").unwrap_or_else(|| "Batch".into());
-            let cmds: Vec<(String, Value)> = match get(p, "commands") {
+            let cmds: Vec<BatchStep> = match get(p, "commands") {
                 Some(Value::Array(a)) => {
                     let mut out = Vec::new();
                     for (i, c) in a.iter().enumerate() {
                         let cmd =
                             c.get("command").and_then(Value::as_str).ok_or_else(|| bad("command.batch", format!("step {i} has no `command`")))?;
-                        out.push((cmd.to_string(), c.get("params").cloned().unwrap_or(json!({}))));
+                        let params = c.get("params").cloned().unwrap_or(json!({}));
+                        out.push(BatchStep { name: crate::batch::step_name(i, c)?, ..BatchStep::new(cmd, params) });
                     }
                     out
                 }
@@ -459,7 +513,7 @@ fn duplicate(s: &mut Session, p: &Value) -> Result<Value> {
         let top_frame = doc.node(parent).is_some_and(Node::is_page) && n.kind.is_frame_like();
         let idx = doc.index_in_parent(i).map(|x| x + 1);
         let w = n.width;
-        let nid = doc.duplicate_into(i, parent, idx)?;
+        let nid = crate::components::copy_in_file(doc, i, parent, idx)?;
         let (dx, dy) = match (num(p, "dx"), num(p, "dy")) {
             (Some(dx), dy) => (dx, dy.unwrap_or(0.0)),
             (None, Some(dy)) => (0.0, dy),
@@ -474,12 +528,16 @@ fn duplicate(s: &mut Session, p: &Value) -> Result<Value> {
                 nn.transform = Affine::translate((dx, dy)) * nn.transform;
             }
         }
-        if rename {
+        // An instance keeps the name instances get by default.
+        if rename && !matches!(doc.get(nid)?.kind, NodeKind::Instance { .. }) {
             let nn = doc.get_mut(nid)?;
             nn.name = bump_name(&nn.name);
         }
         out.push(nid);
     }
+    // Board connectors copied with what they join join the copies.
+    let map = crate::board::copy_map(doc, &ids, &out);
+    crate::board::rejoin(doc, &crate::board::copied_items(doc, &map), &map, false);
     s.set_selection(out.clone());
     s.ds_mut()?.last_duplicate = Some(Duplicated { sources: ids, copies: out.clone() });
     Ok(json!({"ids": out}))
@@ -494,766 +552,3 @@ fn bump_name(n: &str) -> String {
     }
     format!("{n} 2")
 }
-
-/// The copied form of the selection.
-pub fn copy_to_clipboard(s: &mut Session, ids: &[NodeId]) -> Result<()> {
-    let ds = s.ds()?;
-    let doc = &ds.doc;
-    let ids = z_sorted(doc, &roots(doc, ids));
-    let mut nodes = Vec::new();
-    let mut images = BTreeMap::new();
-    for i in &ids {
-        let world = doc.world_transform(*i);
-        let mut sub: Vec<Node> = doc.subtree(*i).into_iter().filter_map(|x| doc.node(x).cloned()).collect();
-        // Store the root's transform in page space so pastes land where it was.
-        if let Some(r) = sub.first_mut() {
-            r.transform = world;
-        }
-        for n in &sub {
-            for p in n.fills.iter().chain(n.strokes.iter()) {
-                if let figcraft_color::PaintKind::Image(img) = &p.kind
-                    && let Some(d) = doc.images.get(&img.image)
-                {
-                    images.insert(img.image.clone(), d.clone());
-                }
-            }
-        }
-        nodes.push((*i, sub));
-    }
-    let bounds = doc.bounds_of(&ids);
-    let uid = ds.uid;
-    let source = Some(ds.doc.clone());
-    let source_path = ds.path.clone();
-    s.clipboard.source = source;
-    s.clipboard.source_path = source_path;
-    s.clipboard.nodes = nodes;
-    s.clipboard.images = images;
-    s.clipboard.bounds = bounds;
-    s.clipboard.source_doc = uid;
-    Ok(())
-}
-
-fn copy(s: &mut Session, p: &Value) -> Result<Value> {
-    let ids = req_targets("edit.copy", s, p)?;
-    copy_to_clipboard(s, &ids)?;
-    Ok(json!({"copied": s.clipboard.nodes.len()}))
-}
-
-fn cut(s: &mut Session, p: &Value) -> Result<Value> {
-    let ids = req_targets("edit.cut", s, p)?;
-    copy_to_clipboard(s, &ids)?;
-    delete(s, &json!({"ids": ids}))
-}
-
-/// Paste the clipboard under `parent` with the copied top-left moved to `at` (page coords).
-pub fn paste_into(s: &mut Session, parent: NodeId, at: Option<(f64, f64)>) -> Result<Vec<NodeId>> {
-    let clip = s.clipboard.clone();
-    if clip.nodes.is_empty() {
-        return Err(EngineError::Disabled("edit.paste".into(), "the clipboard is empty".into()));
-    }
-    // From another file: its instances follow the mains this file can have.
-    let foreign = clip.source.as_ref().filter(|_| s.ds().is_ok_and(|d| d.uid != clip.source_doc));
-    let doc = s.doc_mut()?;
-    for (k, v) in &clip.images {
-        doc.images.entry(k.clone()).or_insert_with(|| v.clone());
-    }
-    // Sections go on the page (or in sections), never in the frame being pasted into.
-    let page = doc.page_of(parent).unwrap_or(parent);
-    let shift = match (at, clip.bounds) {
-        (Some((x, y)), Some(b)) => Affine::translate((x - b.x0, y - b.y0)),
-        _ => Affine::IDENTITY,
-    };
-    let mut out = Vec::new();
-    let mut all = BTreeMap::new();
-    for (root, nodes) in &clip.nodes {
-        let mut map = BTreeMap::new();
-        for n in nodes {
-            map.insert(n.id, doc.alloc_id());
-        }
-        let mut nodes = nodes.clone();
-        let section = nodes.first().is_some_and(|r| matches!(r.kind, NodeKind::Section { .. }));
-        let into = if section && !doc.takes_sections(parent) { page } else { parent };
-        if let Some(r) = nodes.first_mut() {
-            r.transform = doc.world_transform(into).inverse() * shift * r.transform;
-        }
-        out.push(doc.paste_nodes(&nodes, &map, *root, into, None)?);
-        all.extend(map);
-    }
-    if let Some(src) = foreign {
-        crate::library::adopt_pasted(doc, src, clip.source_path.as_deref(), &all)?;
-    }
-    Ok(out)
-}
-
-fn paste(s: &mut Session, p: &Value) -> Result<Value> {
-    let page = s.page()?;
-    // Figma pastes into the selected frame (if one is selected), at the same position when it fits,
-    // else in the frame's centre; otherwise in place on the page (or the viewport centre).
-    let sel = s.selection();
-    let doc = s.doc()?;
-    let target = id(p, "parent").or_else(|| {
-        sel.first()
-            .copied()
-            .filter(|i| sel.len() == 1 && doc.node(*i).is_some_and(|n| n.kind.is_frame_like() && !matches!(n.kind, NodeKind::Instance { .. })))
-    });
-    let parent = target.unwrap_or(page);
-    let at = match (num(p, "x"), num(p, "y")) {
-        (Some(x), Some(y)) => Some((x, y)),
-        _ => {
-            let b = s.clipboard.bounds;
-            match (target, b) {
-                (Some(t), Some(b)) => {
-                    let tb = doc.world_bounds(t);
-                    match tb {
-                        Some(tb) if tb.contains(b.origin()) && tb.contains(figcraft_geom::Point::new(b.x1, b.y1)) => None,
-                        Some(tb) => Some((tb.center().x - b.width() / 2.0, tb.center().y - b.height() / 2.0)),
-                        None => None,
-                    }
-                }
-                (None, Some(b)) => {
-                    // Off-screen originals paste at the viewport centre.
-                    let v = &s.ds()?.view;
-                    let (ox, oy) = v.origin();
-                    let vr = figcraft_geom::Rect::new(ox, oy, ox + v.vw / v.zoom.max(1e-9), oy + v.vh / v.zoom.max(1e-9));
-                    if vr.intersect(b).is_zero_area() { Some((v.cx - b.width() / 2.0, v.cy - b.height() / 2.0)) } else { None }
-                }
-                _ => None,
-            }
-        }
-    };
-    let ids = paste_into(s, parent, at)?;
-    s.set_selection(ids.clone());
-    Ok(json!({"ids": ids}))
-}
-
-fn paste_over(s: &mut Session, _p: &Value) -> Result<Value> {
-    let sel = s.selection();
-    let page = s.page()?;
-    let doc = s.doc()?;
-    let (parent, at) = match sel.first() {
-        Some(i) => {
-            let parent = doc.node(*i).and_then(|n| n.parent).unwrap_or(page);
-            (parent, doc.world_bounds(*i).map(|b| (b.x0, b.y0)))
-        }
-        None => (page, None),
-    };
-    let ids = paste_into(s, parent, at)?;
-    s.set_selection(ids.clone());
-    Ok(json!({"ids": ids}))
-}
-
-fn paste_replace(s: &mut Session, p: &Value) -> Result<Value> {
-    let targets = req_targets("edit.pasteReplace", s, p)?;
-    let mut out = Vec::new();
-    for t in targets {
-        let doc = s.doc()?;
-        let Some(n) = doc.node(t) else { continue };
-        let parent = n.parent.ok_or_else(|| bad("edit.pasteReplace", "can't replace a page"))?;
-        let idx = doc.index_in_parent(t);
-        let at = doc.world_bounds(t).map(|b| (b.x0, b.y0));
-        let ids = paste_into(s, parent, at)?;
-        let doc = s.doc_mut()?;
-        for (k, i) in ids.iter().enumerate() {
-            if let Some(ix) = idx {
-                let _ = doc.reorder(*i, ix + k);
-            }
-        }
-        doc.remove(t)?;
-        out.extend(ids);
-    }
-    s.set_selection(out.clone());
-    Ok(json!({"ids": out}))
-}
-
-fn copy_props_of(doc: &Document, id: NodeId) -> Value {
-    let Some(n) = doc.node(id) else { return Value::Null };
-    let mut v = json!({
-        "fills": n.fills, "strokes": n.strokes, "strokeWeight": n.stroke.weight, "strokeAlign": n.stroke.align,
-        "effects": n.effects, "opacity": n.opacity, "blend": n.blend, "cornerRadius": n.corners.radii,
-        "cornerSmoothing": n.corners.smoothing,
-    });
-    if let NodeKind::Text(t) = &n.kind {
-        v["fontFamily"] = json!(t.style.font_family);
-        v["fontStyle"] = json!(t.style.font_style);
-        v["fontSize"] = json!(t.style.font_size);
-        v["fontVariations"] = json!(t.style.variations);
-        v["lineHeight"] = serde_json::to_value(t.style.line_height).unwrap_or(Value::Null);
-        v["letterSpacing"] = serde_json::to_value(t.style.letter_spacing).unwrap_or(Value::Null);
-    }
-    v
-}
-
-fn copy_props(s: &mut Session, p: &Value) -> Result<Value> {
-    let id = targets(s, p).first().copied().ok_or_else(|| bad("edit.copyProperties", "select one layer"))?;
-    let v = copy_props_of(s.doc()?, id);
-    s.clipboard.props = Some(v.clone());
-    Ok(v)
-}
-
-fn paste_props(s: &mut Session, p: &Value) -> Result<Value> {
-    let props = s.clipboard.props.clone().ok_or_else(|| EngineError::Disabled("edit.pasteProperties".into(), "no copied properties".into()))?;
-    let ids = req_targets("edit.pasteProperties", s, p)?;
-    let doc = s.doc_mut()?;
-    for i in ids {
-        let mut m = props.as_object().cloned().unwrap_or_default();
-        let is_text = matches!(doc.get(i)?.kind, NodeKind::Text(_));
-        if !is_text {
-            m.retain(|k, _| !k.starts_with("font") && k != "lineHeight" && k != "letterSpacing");
-        }
-        if !doc.get(i)?.kind.has_corner_radius() {
-            m.remove("cornerRadius");
-            m.remove("cornerSmoothing");
-        }
-        super::props::apply("edit.pasteProperties", doc, i, &m)?;
-    }
-    ok()
-}
-
-fn layers_at(s: &mut Session, p: &Value) -> Result<Value> {
-    let (x, y) = (req_num("select.layersAt", p, "x")?, req_num("select.layersAt", p, "y")?);
-    let doc = s.doc()?;
-    let zoom = s.ds()?.view.zoom.max(1e-6);
-    let sel = s.selection();
-    let result = crate::booleans::result_outline(doc, &sel);
-    let layers: Vec<Value> = figcraft_doc::geometry::layers_at(doc, s.page()?, figcraft_geom::Point::new(x, y), 2.0 / zoom, Some(&result))
-        .into_iter()
-        .filter_map(|(id, depth)| doc.node(id).map(|n| json!({"id": id, "name": n.name, "type": n.kind.type_name(), "depth": depth})))
-        .collect();
-    Ok(json!({"layers": layers}))
-}
-
-fn select_all(s: &mut Session, _p: &Value) -> Result<Value> {
-    let doc = s.doc()?;
-    let sel = s.selection();
-    // Select all siblings of the current selection, else the page's top level.
-    let parent = sel.first().and_then(|i| doc.node(*i)).and_then(|n| n.parent).unwrap_or(s.page()?);
-    let ids: Vec<NodeId> = doc.get(parent)?.children.iter().copied().filter(|c| doc.node(*c).is_some_and(|n| n.visible && !n.locked)).collect();
-    s.set_selection(ids.clone());
-    Ok(json!({"selection": ids}))
-}
-
-/// What Select all would select, less the selection (hidden and locked layers neither).
-fn select_inverse(s: &mut Session, _p: &Value) -> Result<Value> {
-    let doc = s.doc()?;
-    let sel = s.selection();
-    let parent = sel.first().and_then(|i| doc.node(*i)).and_then(|n| n.parent).unwrap_or(s.page()?);
-    let ids: Vec<NodeId> =
-        doc.get(parent)?.children.iter().copied().filter(|c| !sel.contains(c) && doc.node(*c).is_some_and(|n| n.visible && !n.locked)).collect();
-    s.set_selection(ids.clone());
-    Ok(json!({"selection": ids}))
-}
-
-/// `select.area`: what a marquee from (x, y) over the box selects; no box asks the app for one.
-fn select_area(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "select.area";
-    let keys = ["x", "y", "width", "height"];
-    if keys.iter().all(|k| p.get(*k).is_none()) {
-        s.request_ui("selectArea", json!({}));
-        return ok();
-    }
-    let [x, y, w, h] = keys.map(|k| num(p, k));
-    let (Some(x), Some(y), Some(w), Some(h)) = (x, y, w, h) else { return Err(bad(cmd, "pass x, y, width and height (numbers)")) };
-    if ![x, y, w, h].iter().all(|v| v.is_finite() && v.abs() < 1e9) {
-        return Err(bad(cmd, "the box is out of range"));
-    }
-    let start = figcraft_geom::Point::new(x, y);
-    let r = figcraft_geom::Rect::from_points(start, figcraft_geom::Point::new(x + w, y + h));
-    let add = boolean(p, "add") == Some(true);
-    let base = if add { s.selection() } else { Vec::new() };
-    let within = s.marquee_within(start)?;
-    let sel = s.marquee_selection(r, within, boolean(p, "deep") == Some(true), &base, add)?;
-    s.set_selection(sel.clone());
-    Ok(json!({"selection": sel}))
-}
-
-fn select_children(s: &mut Session, _p: &Value) -> Result<Value> {
-    let doc = s.doc()?;
-    let mut ids = Vec::new();
-    for i in s.selection() {
-        if let Some(n) = doc.node(i) {
-            ids.extend(n.children.iter().copied());
-        }
-    }
-    if ids.is_empty() {
-        return Ok(json!({"selection": s.selection()}));
-    }
-    s.set_selection(ids.clone());
-    Ok(json!({"selection": ids}))
-}
-
-fn select_parent(s: &mut Session, _p: &Value) -> Result<Value> {
-    let doc = s.doc()?;
-    let mut ids: Vec<NodeId> = Vec::new();
-    for i in s.selection() {
-        if let Some(p) = doc.node(i).and_then(|n| n.parent)
-            && !doc.node(p).is_some_and(Node::is_page)
-            && !ids.contains(&p)
-        {
-            ids.push(p);
-        }
-    }
-    if ids.is_empty() {
-        return Ok(json!({"selection": s.selection()}));
-    }
-    s.set_selection(ids.clone());
-    Ok(json!({"selection": ids}))
-}
-
-fn select_sibling(s: &mut Session, dir: i64) -> Result<Value> {
-    let doc = s.doc()?;
-    let sel = s.selection();
-    let Some(cur) = sel.last().copied() else {
-        let first = doc.get(s.page()?)?.children.last().copied();
-        s.set_selection(first.into_iter().collect());
-        return Ok(json!({"selection": s.selection()}));
-    };
-    let parent = doc.get(cur)?.parent.ok_or_else(|| bad("select.next", "no parent"))?;
-    let kids = &doc.get(parent)?.children;
-    let idx = kids.iter().position(|c| *c == cur).unwrap_or(0) as i64;
-    let n = kids.len() as i64;
-    // Layers panel order is reversed (top of the list = last child): Tab goes down the list.
-    let next = (idx - dir).rem_euclid(n.max(1)) as usize;
-    let id = kids.get(next).copied().unwrap_or(cur);
-    s.set_selection(vec![id]);
-    Ok(json!({"selection": [id]}))
-}
-
-fn select_matching(s: &mut Session, _p: &Value) -> Result<Value> {
-    let doc = s.doc()?;
-    let sel = s.selection();
-    let Some(first) = sel.first().and_then(|i| doc.node(*i)) else { return Ok(json!({"selection": []})) };
-    let (name, ty) = (first.name.clone(), first.kind.type_name());
-    let page = s.page()?;
-    let ids: Vec<NodeId> =
-        doc.subtree(page).into_iter().filter(|i| doc.node(*i).is_some_and(|n| n.name == name && n.kind.type_name() == ty)).collect();
-    s.set_selection(ids.clone());
-    Ok(json!({"selection": ids}))
-}
-
-fn select_same(s: &mut Session, same: impl Fn(&Node, &Node) -> bool) -> Result<Value> {
-    let doc = s.doc()?;
-    let sel = s.selection();
-    let Some(first) = sel.first().and_then(|i| doc.node(*i)).cloned() else { return Ok(json!({"selection": []})) };
-    let page = s.page()?;
-    let ids: Vec<NodeId> = doc.subtree(page).into_iter().filter(|i| *i != page && doc.node(*i).is_some_and(|n| same(&first, n))).collect();
-    s.set_selection(ids.clone());
-    Ok(json!({"selection": ids}))
-}
-
-/// The opacity number keys give: one digit is tens of percent (0 is 100%), two digits typed in
-/// quick succession the exact percentage.
-pub fn opacity_from_digits(digits: &str) -> Option<f32> {
-    let mut n = 0u32;
-    let mut count = 0;
-    for c in digits.chars() {
-        // Input-derived: a number that outgrows `u32` stops the scan (None); it never wraps.
-        n = n.checked_mul(10)?.checked_add(c.to_digit(10)?)?;
-        count += 1;
-    }
-    match count {
-        1 if n == 0 => Some(1.0),
-        1 => Some(n as f32 / 10.0),
-        2 => Some(n as f32 / 100.0),
-        _ => None,
-    }
-}
-
-fn opacity_keys(s: &mut Session, p: &Value) -> Result<Value> {
-    let digits = req_string("object.opacityKeys", p, "digits")?;
-    let o = opacity_from_digits(&digits).ok_or_else(|| bad("object.opacityKeys", "`digits` must be one or two digits"))?;
-    for i in req_targets("object.opacityKeys", s, p)? {
-        s.doc_mut()?.get_mut(i)?.opacity = o;
-    }
-    Ok(json!({"opacity": o}))
-}
-
-fn nudge(s: &mut Session, p: &Value) -> Result<Value> {
-    let big = boolean(p, "big").unwrap_or(false);
-    let k = if big { s.prefs.nudge_big } else { s.prefs.nudge_small };
-    let (ux, uy) = (num_or(p, "dx", 0.0), num_or(p, "dy", 0.0));
-    let (dx, dy) = (ux * k, uy * k);
-    let ids = req_targets("transform.nudge", s, p)?;
-    // Edit a copy and keep it only if something moved, so an arrow that can't move anything adds
-    // no undo step.
-    let mut work = s.doc()?.clone();
-    let doc = &mut work;
-    let ids = roots(doc, &ids);
-    let mut changed = false;
-    // Children in an auto layout flow move one place instead (see `al_keys`).
-    for i in &ids {
-        if crate::al_keys::flowing_parent(doc, *i).is_none() && (dx, dy) != (0.0, 0.0) {
-            let n = doc.get_mut(*i)?;
-            n.transform = Affine::translate((dx, dy)) * n.transform;
-            changed = true;
-        }
-    }
-    for dir in crate::al_keys::Dir::from_units(ux, uy) {
-        // Grouped per arrow: a move into a neighbouring frame changes the parent.
-        let mut groups: BTreeMap<NodeId, Vec<NodeId>> = BTreeMap::new();
-        for i in &ids {
-            if let Some(parent) = crate::al_keys::flowing_parent(doc, *i) {
-                groups.entry(parent).or_default().push(*i);
-            }
-        }
-        for (parent, block) in groups {
-            changed |= crate::al_keys::arrow_move(doc, parent, &block, dir)?;
-        }
-    }
-    if changed {
-        s.ds_mut()?.doc = std::sync::Arc::new(work);
-    }
-    ok()
-}
-
-fn nudge_size(s: &mut Session, p: &Value) -> Result<Value> {
-    let big = boolean(p, "big").unwrap_or(false);
-    let k = if big { s.prefs.nudge_big } else { s.prefs.nudge_small };
-    let (dw, dh) = (num_or(p, "dw", 0.0) * k, num_or(p, "dh", 0.0) * k);
-    let ids = req_targets("transform.nudgeSize", s, p)?;
-    let ids = roots(s.doc()?, &ids);
-    for i in ids {
-        let Some((w, h)) = s.doc()?.node(i).map(|n| (n.width, n.height)) else { continue };
-        let mut q = serde_json::Map::new();
-        q.insert("ids".into(), json!([i]));
-        // Only the axis that changes becomes fixed.
-        if dw != 0.0 {
-            q.insert("width".into(), json!((w + dw).max(0.0)));
-        }
-        if dh != 0.0 {
-            q.insert("height".into(), json!((h + dh).max(0.0)));
-        }
-        super::arrange::resize_cmd(s, &Value::Object(q))?;
-    }
-    ok()
-}
-
-fn toggle(s: &mut Session, p: &Value, what: &str) -> Result<Value> {
-    let ids = req_targets("object.toggle", s, p)?;
-    let doc = s.doc_mut()?;
-    let explicit = boolean(p, what);
-    // Figma: if any is visible, hide all (and vice versa).
-    let value = explicit.unwrap_or_else(|| match what {
-        "visible" => !ids.iter().all(|i| doc.node(*i).is_some_and(|n| n.visible)),
-        _ => !ids.iter().all(|i| doc.node(*i).is_some_and(|n| n.locked)),
-    });
-    for i in &ids {
-        let n = doc.get_mut(*i)?;
-        if what == "visible" {
-            n.visible = value;
-        } else {
-            n.locked = value;
-        }
-    }
-    if what == "locked" && value {
-        s.set_selection(vec![]);
-    }
-    Ok(json!({what: value}))
-}
-
-fn hide_others(s: &mut Session, _p: &Value) -> Result<Value> {
-    let sel = s.selection();
-    let page = s.page()?;
-    let doc = s.doc_mut()?;
-    let keep: BTreeSet<NodeId> = sel
-        .iter()
-        .flat_map(|i| {
-            let mut v = doc.ancestors(*i);
-            v.push(*i);
-            v
-        })
-        .collect();
-    let tops: Vec<NodeId> = doc.get(page)?.children.clone();
-    for t in tops {
-        if !keep.contains(&t) {
-            doc.get_mut(t)?.visible = false;
-        }
-    }
-    ok()
-}
-
-fn batch_rename(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "object.batchRename";
-    let ids = req_targets(cmd, s, p)?;
-    let find = string(p, "find");
-    let replace = string(p, "replace").unwrap_or_default();
-    let pattern = string(p, "name");
-    let rename =
-        crate::rename::BatchRename::new(find.as_deref(), boolean(p, "regex").unwrap_or(false), &replace, pattern.as_deref(), num(p, "start"))
-            .map_err(|e| bad(cmd, e))?;
-    let doc = s.doc_mut()?;
-    let names = rename.plan(doc, &ids);
-    for (i, name) in &names {
-        doc.get_mut(*i)?.name = name.clone();
-    }
-    Ok(json!({"names": names.iter().map(|(i, n)| json!({"id": i, "name": n})).collect::<Vec<_>>()}))
-}
-
-/// Char index of the first case-insensitive occurrence of `needle` in `hay` at or after `from`.
-/// Works on char indices (what `replace_range` takes), so lowercasing never shifts offsets.
-fn find_ci(hay: &[char], needle: &[char], from: usize) -> Option<usize> {
-    if needle.is_empty() {
-        return None;
-    }
-    (from..hay.len())
-        .find(|&i| hay.get(i..i + needle.len()).is_some_and(|w| w.iter().zip(needle).all(|(a, b)| a == b || a.to_lowercase().eq(b.to_lowercase()))))
-}
-
-fn find_replace(s: &mut Session, p: &Value) -> Result<Value> {
-    let find = req_string("edit.findReplace", p, "find")?;
-    if find.is_empty() {
-        return Err(bad("edit.findReplace", "`find` is empty"));
-    }
-    // Line breaks stored as the editor stores them (CRLF, CR, U+2028 and U+2029 become LF).
-    let replace = string(p, "replace").map(|r| super::props::normalize_line_endings(&r));
-    let names = boolean(p, "layerNames").unwrap_or(false);
-    let page = s.page()?;
-    let doc = s.doc_mut()?;
-    let mut hits = Vec::new();
-    let needle: Vec<char> = find.chars().collect();
-    let r_chars: Vec<char> = replace.as_deref().map(|r| r.chars().collect()).unwrap_or_default();
-    for i in doc.subtree(page) {
-        let Some(n) = doc.node(i) else { continue };
-        let text: Option<Vec<char>> = match &n.kind {
-            NodeKind::Text(t) => Some(t.characters.chars().collect()),
-            _ => None,
-        };
-        let text_hit = text.as_deref().is_some_and(|c| find_ci(c, &needle, 0).is_some());
-        let name_hit = names && find_ci(&n.name.chars().collect::<Vec<_>>(), &needle, 0).is_some();
-        if !(text_hit || name_hit) || n.is_page() {
-            continue;
-        }
-        hits.push(i);
-        if let Some(r) = &replace {
-            let n = doc.get_mut(i)?;
-            if names && name_hit {
-                let chars: Vec<char> = n.name.chars().collect();
-                let mut out = String::new();
-                let mut at = 0;
-                while let Some(pos) = find_ci(&chars, &needle, at) {
-                    out.extend(chars.get(at..pos).unwrap_or_default());
-                    out.push_str(r);
-                    at = pos + needle.len();
-                }
-                out.extend(chars.get(at..).unwrap_or_default());
-                n.name = out;
-            }
-            if let (NodeKind::Text(t), Some(mut chars)) = (&mut n.kind, text) {
-                // Replace occurrence by occurrence so styles shift correctly. The search resumes
-                // after each inserted replacement, so a replacement that matches `find` (in any
-                // case) neither loops forever nor stops the other occurrences.
-                let mut cursor = 0;
-                for _ in 0..10_000 {
-                    let Some(start) = find_ci(&chars, &needle, cursor) else { break };
-                    t.replace_range(start, start + needle.len(), r);
-                    chars.splice(start..start + needle.len(), r_chars.iter().copied());
-                    cursor = start + r_chars.len();
-                }
-            }
-        }
-    }
-    if boolean(p, "select").unwrap_or(true) {
-        s.set_selection(hits.clone());
-    }
-    Ok(json!({"matches": hits}))
-}
-
-fn set(s: &mut Session, p: &Value) -> Result<Value> {
-    let ids = req_targets("node.set", s, p)?;
-    let props = match get(p, "props") {
-        Some(Value::Object(m)) => m.clone(),
-        _ => {
-            // Allow flat params: {"id": 3, "fill": "#f00"}.
-            let mut m = p.as_object().cloned().unwrap_or_default();
-            m.remove("id");
-            m.remove("ids");
-            m
-        }
-    };
-    if props.is_empty() {
-        return Err(bad("node.set", "no properties given"));
-    }
-    // A new rotation for the selection turns it about its moved rotation origin: each layer's
-    // point under the origin stays put.
-    let ds = s.ds()?;
-    let pivot =
-        ds.moved_origin().filter(|_| props.contains_key("rotation") && !props.contains_key("x") && !props.contains_key("y") && ds.selection == ids);
-    let pinned: Vec<(NodeId, figcraft_geom::Point)> = match pivot {
-        Some(o) => roots(&ds.doc, &ids)
-            .into_iter()
-            .map(|i| (i, ds.doc.world_transform(i)))
-            .filter(|(_, w)| w.determinant().abs() > 1e-12)
-            .map(|(i, w)| (i, w.inverse() * o))
-            .collect(),
-        None => Vec::new(),
-    };
-    let doc = s.doc_mut()?;
-    for i in ids {
-        super::props::apply("node.set", doc, i, &props)?;
-    }
-    if let Some(o) = pivot {
-        for (i, q) in pinned {
-            let d = o - doc.world_transform(i) * q;
-            if d.hypot().is_finite() {
-                super::arrange::move_world(doc, i, d.x, d.y)?;
-            }
-        }
-    }
-    ok()
-}
-
-/// `stroke.widthProfile`: a preset or points (through `node.set`'s `widthProfile`, so instances
-/// record the override).
-fn width_profile(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "stroke.widthProfile";
-    let v = get(p, "preset").or_else(|| get(p, "points")).cloned().unwrap_or(Value::Null);
-    let ids = req_targets(cmd, s, p)?;
-    let props = serde_json::Map::from_iter([("widthProfile".to_string(), v)]);
-    let doc = s.doc_mut()?;
-    for i in ids {
-        super::props::apply(cmd, doc, i, &props)?;
-    }
-    ok()
-}
-
-fn stroke_brush(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "stroke.brush";
-    let v = if get(p, "preset").is_none_or(Value::is_null) { Value::Null } else { p.clone() };
-    let brush = super::props::brush_of(&v).ok_or_else(|| bad(cmd, super::props::BRUSH_HELP))?;
-    let ids = req_targets(cmd, s, p)?;
-    let doc = s.doc_mut()?;
-    for i in ids {
-        let n = doc.get_mut(i)?;
-        if brush.is_some() && n.strokes.is_empty() {
-            n.strokes.push(figcraft_color::Paint::solid(figcraft_color::Color::BLACK));
-        }
-        n.stroke.brush = brush.clone();
-    }
-    ok()
-}
-
-fn reparent(s: &mut Session, p: &Value) -> Result<Value> {
-    let ids = req_targets("node.reparent", s, p)?;
-    let parent = req_id("node.reparent", p, "parent")?;
-    let index = num(p, "index").map(|i| i.max(0.0) as usize);
-    let doc = s.doc_mut()?;
-    let ids = z_sorted(doc, &roots(doc, &ids));
-    // The layers land together under the first sibling at or above `index` that stays put (none: on
-    // top), wherever they came from.
-    let above = index.and_then(|at| doc.get(parent).ok()?.children.iter().skip(at).find(|c| !ids.contains(c)).copied());
-    for i in &ids {
-        // Counted with the layer still in place, as `reparent` expects.
-        let at = above.and_then(|a| doc.node(parent)?.children.iter().position(|c| *c == a));
-        doc.reparent(*i, parent, at)?;
-    }
-    ok()
-}
-
-fn paint_list(s: &mut Session, p: &Value, fills: bool, add: bool) -> Result<Value> {
-    let cmd = if fills { "fill" } else { "stroke" };
-    let ids = req_targets(cmd, s, p)?;
-    let index = if add || get(p, "index").is_none() { None } else { Some(req_index(cmd, p, "index")?) };
-    let doc = s.doc_mut()?;
-    for i in ids {
-        let n = doc.get_mut(i)?;
-        let frameish = n.kind.is_frame_like();
-        let list = if fills { &mut n.fills } else { &mut n.strokes };
-        if add {
-            let paint = match get(p, "paint").or_else(|| get(p, "color")) {
-                Some(v) => paint_of(v).ok_or_else(|| bad(cmd, "invalid paint"))?,
-                None if fills && frameish => figcraft_color::Paint::solid(figcraft_color::Color::WHITE),
-                None if fills => figcraft_color::Paint::solid(figcraft_color::Color::DEFAULT_SHAPE),
-                None => figcraft_color::Paint::solid(figcraft_color::Color::BLACK),
-            };
-            list.push(paint);
-        } else {
-            let idx = index.unwrap_or(list.len().saturating_sub(1));
-            // The paint's colour binding goes with it; later paints' move down one.
-            super::lists::remove_item(n, if fills { super::lists::BoundList::Fills } else { super::lists::BoundList::Strokes }, idx);
-        }
-    }
-    ok()
-}
-
-fn paint_set(s: &mut Session, p: &Value, fills: bool) -> Result<Value> {
-    let cmd = if fills { "fill.set" } else { "stroke.set" };
-    let ids = req_targets(cmd, s, p)?;
-    let idx = num(p, "index").map(|x| x.max(0.0) as usize);
-    let new_paint = match get(p, "paint") {
-        Some(v) => Some(paint_of(v).ok_or_else(|| bad(cmd, "invalid paint"))?),
-        None => None,
-    };
-    let col = color(p, "color");
-    let doc = s.doc_mut()?;
-    for i in ids {
-        let n = doc.get_mut(i)?;
-        let list = if fills { &mut n.fills } else { &mut n.strokes };
-        let at = idx.unwrap_or(list.len().saturating_sub(1));
-        if list.is_empty() {
-            list.push(figcraft_color::Paint::solid(if fills { figcraft_color::Color::DEFAULT_SHAPE } else { figcraft_color::Color::BLACK }));
-        }
-        let Some(slot) = list.get_mut(at) else { return Err(bad(cmd, format!("no paint at index {at}"))) };
-        let old = slot.clone();
-        if let Some(np) = &new_paint {
-            *slot = np.clone();
-        }
-        if let Some(c) = col {
-            slot.kind = figcraft_color::PaintKind::Solid { color: c.with_alpha(1.0) };
-            if c.a < 1.0 {
-                slot.opacity = c.a;
-            }
-        }
-        if let Some(o) = num(p, "opacity") {
-            slot.opacity = (if o > 1.0 { o / 100.0 } else { o }).clamp(0.0, 1.0) as f32;
-        }
-        if let Some(v) = boolean(p, "visible") {
-            slot.visible = v;
-        }
-        if let Some(b) = blend(p, "blend") {
-            slot.blend = b;
-        }
-        super::lists::remap_stop_bindings(n, fills, at, &old);
-        if fills {
-            n.styles.fill = None;
-        } else {
-            n.styles.stroke = None;
-        }
-    }
-    ok()
-}
-
-fn pattern_fill(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "fill.pattern";
-    let src = req_id(CMD, p, "source")?;
-    let doc = s.doc()?;
-    if !doc.node(src).is_some_and(|n| !n.is_page()) {
-        return Err(bad(CMD, "`source` must be a layer"));
-    }
-    if req_targets(CMD, s, p)?.iter().any(|t| doc.is_ancestor(*t, src)) {
-        return Err(bad(CMD, "a layer can't be filled with itself or a layer inside it"));
-    }
-    let mut pt = figcraft_color::PatternPaint::new(src.0);
-    pt.tile = parse(CMD, p, "tile")?.unwrap_or_default();
-    pt.align = parse(CMD, p, "align")?.unwrap_or_default();
-    pt.spacing = parse(CMD, p, "spacing")?.unwrap_or_default();
-    let (lo, hi) = figcraft_color::PatternPaint::SCALE_RANGE;
-    pt.scale = num(p, "scale").filter(|v| v.is_finite()).unwrap_or(1.0).clamp(lo, hi);
-    let mut q = if p.is_object() { p.clone() } else { json!({}) };
-    q["paint"] =
-        serde_json::to_value(figcraft_color::Paint { kind: figcraft_color::PaintKind::Pattern(pt), ..figcraft_color::Paint::pattern(src.0) })
-            .map_err(|e| bad(CMD, e.to_string()))?;
-    paint_set(s, &q, true)
-}
-
-fn effect_add(s: &mut Session, p: &Value) -> Result<Value> {
-    let e: Effect = match get(p, "effect") {
-        Some(v) => serde_json::from_value(v.clone()).map_err(|e| bad("effect.add", e.to_string()))?,
-        None => {
-            let ty = string(p, "type").unwrap_or_else(|| "dropShadow".into());
-            Effect::of_type(&ty).ok_or_else(|| bad("effect.add", format!("unknown effect type `{ty}`")))?
-        }
-    };
-    for i in req_targets("effect.add", s, p)? {
-        s.doc_mut()?.get_mut(i)?.effects.push(e.clone());
-    }
-    ok()
-}
diff --git a/crates/engine/src/cmd/edit/clipboard.rs b/crates/engine/src/cmd/edit/clipboard.rs
new file mode 100644
index 00000000..d0e7b2dc
--- /dev/null
+++ b/crates/engine/src/cmd/edit/clipboard.rs
@@ -0,0 +1,332 @@
+use super::*;
+
+/// The copied form of the selection.
+pub fn copy_to_clipboard(s: &mut Session, cmd: &str, ids: &[NodeId]) -> Result<()> {
+    let ds = s.ds()?;
+    // Pages are not layers: they can't be pasted anywhere.
+    let layers: Vec<NodeId> = ids.iter().copied().filter(|i| !ds.doc.node(*i).is_some_and(Node::is_page)).collect();
+    if layers.is_empty() && !ids.is_empty() {
+        return Err(EngineError::Disabled(cmd.into(), "pages can't be copied; use page.duplicate".into()));
+    }
+    let (nodes, images, bounds) = copied(&ds.doc, &layers);
+    let (source, source_path, uid) = (ds.doc.clone(), ds.path.clone(), ds.uid);
+    s.clipboard.source = Some(source);
+    s.clipboard.source_path = source_path;
+    s.clipboard.source_doc = uid;
+    s.clipboard.copied_components = nodes
+        .iter()
+        .filter(|(_, sub)| {
+            cmd == "edit.copy" && sub.first().is_some_and(|n| matches!(n.kind, NodeKind::Component { .. } | NodeKind::ComponentSet { .. }))
+        })
+        .map(|(root, _)| *root)
+        .collect();
+    s.clipboard.nodes = nodes;
+    s.clipboard.images = images;
+    s.clipboard.bounds = bounds;
+    s.clipboard.layers_generation = s.clipboard.layers_generation.wrapping_add(1);
+    Ok(())
+}
+
+type Copied = (Vec<(NodeId, Vec<Node>)>, BTreeMap<String, ImageData>, Option<figcraft_geom::Rect>);
+
+fn copied(doc: &Document, ids: &[NodeId]) -> Copied {
+    let ids = z_sorted(doc, &roots(doc, ids));
+    let mut nodes = Vec::new();
+    let mut images = BTreeMap::new();
+    for i in &ids {
+        let world = doc.world_transform(*i);
+        let mut sub: Vec<Node> = doc.subtree(*i).into_iter().filter_map(|x| doc.node(x).cloned()).collect();
+        // Store the root's transform in page space so pastes land where it was.
+        if let Some(r) = sub.first_mut() {
+            r.transform = world;
+        }
+        for n in &sub {
+            for p in n.fills.iter().chain(n.strokes.iter()) {
+                if let figcraft_color::PaintKind::Image(img) = &p.kind
+                    && let Some(d) = doc.images.get(&img.image)
+                {
+                    images.insert(img.image.clone(), d.clone());
+                }
+            }
+        }
+        nodes.push((*i, sub));
+    }
+    let bounds = doc.bounds_of(&ids);
+    (nodes, images, bounds)
+}
+
+/// The markers around the copied layers in the clipboard's HTML, spelt as that format spells them.
+pub const CLIP_OPEN: &str = "(figma)";
+
+pub const CLIP_CLOSE: &str = "(/figma)";
+
+/// Largest design data read from the clipboard: the `.fig` import's own canvas cap (256 MB). Its
+/// base64 is checked first, so neither the text nor the decoded bytes can pass it.
+const MAX_CLIP_DATA: usize = 256 * 1024 * 1024;
+
+const MAX_CLIP_BASE64: usize = MAX_CLIP_DATA.div_ceil(3) * 4;
+
+/// Base64 `text` (whitespace ignored, padding optional) when it fits [`MAX_CLIP_DATA`].
+fn clip_base64(text: &str) -> Option<Vec<u8>> {
+    use base64::Engine as _;
+    if text.bytes().filter(|b| !b.is_ascii_whitespace()).count() > MAX_CLIP_BASE64 {
+        return None;
+    }
+    let b64: String = text.chars().filter(|c| !c.is_ascii_whitespace()).collect();
+    base64::engine::general_purpose::STANDARD.decode(&b64).or_else(|_| base64::engine::general_purpose::STANDARD_NO_PAD.decode(&b64)).ok()
+}
+
+/// Layers copied from another design app travel in the clipboard's HTML as a `.fig` canvas in
+/// base64 between [`CLIP_OPEN`] and [`CLIP_CLOSE`]. This gives those bytes, or `None` when the HTML
+/// holds no readable design data (it may just mention the marker).
+pub fn design_clipboard_buffer(html: &str) -> Option<Vec<u8>> {
+    let start = html.find(CLIP_OPEN)? + CLIP_OPEN.len();
+    let len = html.get(start..)?.find(CLIP_CLOSE)?;
+    let bytes = clip_base64(html.get(start..start + len)?)?;
+    figcraft_format::fig::is_fig(&bytes).then_some(bytes)
+}
+
+/// Paste design layers from clipboard HTML or base64 `data`: decode and reject missing,
+/// invalid or oversized data, load a temporary `.fig`, take its top-level page layers,
+/// store them as a foreign-file clipboard source with a bumped layers generation, then
+/// delegate to `paste` and append import warnings.
+pub(super) fn paste_design_layers(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "edit.pasteDesignLayers";
+    let bytes = match (string(p, "html"), string(p, "data")) {
+        (Some(html), _) => design_clipboard_buffer(&html).ok_or_else(|| bad(CMD, "the HTML holds no copied design layers"))?,
+        (None, Some(d)) => clip_base64(&d).ok_or_else(|| bad(CMD, "`data` is not base64 of at most 256 MB"))?,
+        (None, None) => return Err(bad(CMD, "pass `html` or `data`")),
+    };
+    let other = crate::cmd::file::load_fig(&bytes, "Pasted layers").ok_or_else(|| bad(CMD, "the data is not copied design layers"))??;
+    let doc = std::sync::Arc::new(other.doc);
+    let tops: Vec<NodeId> = doc.pages.iter().filter_map(|pg| doc.node(*pg)).flat_map(|pg| pg.children.iter().copied()).collect();
+    if tops.is_empty() {
+        return Err(EngineError::Disabled(CMD.into(), "the copied layers came in empty".into()));
+    }
+    let (nodes, images, bounds) = copied(&doc, &tops);
+    // A design-app paste replaces the copied layers, not the copied rows: a `fill.copy` before it
+    // still pastes afterwards.
+    let props = s.clipboard.props.take();
+    let paint = s.clipboard.paint.take();
+    let stroke = s.clipboard.stroke.take();
+    let effect = s.clipboard.effect.take();
+    // No open file has id 0. So paste treats this copy as a copy from a different file.
+    let layers_generation = s.clipboard.layers_generation.wrapping_add(1);
+    s.clipboard = crate::Clipboard {
+        nodes,
+        images,
+        props,
+        paint,
+        stroke,
+        effect,
+        bounds,
+        source_doc: 0,
+        source: Some(doc),
+        source_path: None,
+        copied_components: BTreeSet::new(),
+        layers_generation,
+    };
+    let mut out = paste(s, p)?;
+    if !other.issues.is_empty() {
+        out["warnings"] = json!(other.issues);
+    }
+    Ok(out)
+}
+
+pub(super) fn copy(s: &mut Session, p: &Value) -> Result<Value> {
+    let ids = req_targets("edit.copy", s, p)?;
+    copy_to_clipboard(s, "edit.copy", &ids)?;
+    Ok(json!({"copied": s.clipboard.nodes.len()}))
+}
+
+pub(super) fn cut(s: &mut Session, p: &Value) -> Result<Value> {
+    let ids = req_targets("edit.cut", s, p)?;
+    copy_to_clipboard(s, "edit.cut", &ids)?;
+    let doc = s.doc()?;
+    let layers: Vec<NodeId> = ids.into_iter().filter(|i| !doc.node(*i).is_some_and(Node::is_page)).collect();
+    delete(s, &json!({"ids": layers}))
+}
+
+/// Paste the clipboard under `parent` with the copied top-left moved to `at` (page coords).
+pub fn paste_into(s: &mut Session, parent: NodeId, at: Option<(f64, f64)>) -> Result<Vec<NodeId>> {
+    let clip = s.clipboard.clone();
+    if clip.nodes.is_empty() {
+        return Err(EngineError::Disabled("edit.paste".into(), "the clipboard is empty".into()));
+    }
+    // From another file: its instances follow the mains this file can have.
+    let foreign = clip.source.as_ref().filter(|_| s.ds().is_ok_and(|d| d.uid != clip.source_doc));
+    let copy_local = s.ds()?.uid == clip.source_doc;
+    let doc = s.doc_mut()?;
+    for (k, v) in &clip.images {
+        doc.images.entry(k.clone()).or_insert_with(|| v.clone());
+    }
+    // Sections go on the page (or in sections), never in the frame being pasted into.
+    let page = doc.page_of(parent).unwrap_or(parent);
+    let shift = match (at, clip.bounds) {
+        (Some((x, y)), Some(b)) => Affine::translate((x - b.x0, y - b.y0)),
+        _ => Affine::IDENTITY,
+    };
+    let mut out = Vec::new();
+    let mut all = BTreeMap::new();
+    for (root, nodes) in &clip.nodes {
+        if copy_local
+            && clip.copied_components.contains(root)
+            && let Some(n) = nodes.first().filter(|n| matches!(n.kind, NodeKind::Component { .. }))
+            && doc.node(*root).is_some_and(|n| matches!(n.kind, NodeKind::Component { .. }))
+        {
+            let instance = crate::components::create_instance(doc, *root, parent, 0.0, 0.0)?;
+            doc.get_mut(instance)?.transform = doc.world_transform(parent).inverse() * shift * n.transform;
+            out.push(instance);
+            continue;
+        }
+        let mut map = BTreeMap::new();
+        for n in nodes {
+            map.insert(n.id, doc.alloc_id());
+        }
+        let mut nodes = nodes.clone();
+        let section = nodes.first().is_some_and(|r| matches!(r.kind, NodeKind::Section { .. }));
+        let into = if section && !doc.takes_sections(parent) { page } else { parent };
+        if let Some(r) = nodes.first_mut() {
+            r.transform = doc.world_transform(into).inverse() * shift * r.transform;
+        }
+        out.push(doc.paste_nodes(&nodes, &map, *root, into, None)?);
+        all.extend(map);
+    }
+    // Board connectors pasted with what they join join the pasted copies.
+    let originals: Vec<(NodeId, figcraft_doc::BoardItem)> =
+        clip.nodes.iter().flat_map(|(_, nodes)| nodes).filter_map(|n| Some((*all.get(&n.id)?, n.board.clone()?))).collect();
+    crate::board::rejoin(doc, &originals, &all, !copy_local);
+    if let Some(src) = foreign {
+        crate::library::adopt_pasted(doc, src, clip.source_path.as_deref(), &all)?;
+    }
+    Ok(out)
+}
+
+pub(super) fn paste(s: &mut Session, p: &Value) -> Result<Value> {
+    let page = s.page()?;
+    // Figma pastes into the selected frame (if one is selected), at the same position when it fits,
+    // else in the frame's centre; otherwise in place on the page (or the viewport centre).
+    let sel = s.selection();
+    let doc = s.doc()?;
+    let copy_local = s.ds()?.uid == s.clipboard.source_doc;
+    let target = id(p, "parent").or_else(|| {
+        sel.first()
+            .copied()
+            .filter(|i| {
+                sel.len() == 1
+                    && doc.node(*i).is_some_and(|n| n.kind.is_frame_like() && !matches!(n.kind, NodeKind::Instance { .. }) && !n.is_board_atom())
+            })
+            .filter(|i| !copy_local || !s.clipboard.copied_components.iter().any(|root| doc.is_ancestor(*root, *i)))
+    });
+    let parent = target.unwrap_or(page);
+    let at = match (num(p, "x"), num(p, "y")) {
+        (Some(x), Some(y)) => Some((x, y)),
+        _ => {
+            let b = s.clipboard.bounds;
+            match (target, b) {
+                (Some(t), Some(b)) => {
+                    let tb = doc.world_bounds(t);
+                    match tb {
+                        Some(tb) if tb.contains(b.origin()) && tb.contains(figcraft_geom::Point::new(b.x1, b.y1)) => None,
+                        Some(tb) => Some((tb.center().x - b.width() / 2.0, tb.center().y - b.height() / 2.0)),
+                        None => None,
+                    }
+                }
+                (None, Some(b)) => {
+                    // Off-screen originals paste at the viewport centre.
+                    let v = &s.ds()?.view;
+                    let (ox, oy) = v.origin();
+                    let vr = figcraft_geom::Rect::new(ox, oy, ox + v.vw / v.zoom.max(1e-9), oy + v.vh / v.zoom.max(1e-9));
+                    if vr.intersect(b).is_zero_area() { Some((v.cx - b.width() / 2.0, v.cy - b.height() / 2.0)) } else { None }
+                }
+                _ => None,
+            }
+        }
+    };
+    let ids = paste_into(s, parent, at)?;
+    s.set_selection(ids.clone());
+    Ok(json!({"ids": ids}))
+}
+
+pub(super) fn paste_over(s: &mut Session, _p: &Value) -> Result<Value> {
+    let sel = s.selection();
+    let page = s.page()?;
+    let doc = s.doc()?;
+    let (parent, at) = match sel.first() {
+        Some(i) => {
+            let parent = doc.node(*i).and_then(|n| n.parent).unwrap_or(page);
+            (parent, doc.world_bounds(*i).map(|b| (b.x0, b.y0)))
+        }
+        None => (page, None),
+    };
+    let ids = paste_into(s, parent, at)?;
+    s.set_selection(ids.clone());
+    Ok(json!({"ids": ids}))
+}
+
+pub(super) fn paste_replace(s: &mut Session, p: &Value) -> Result<Value> {
+    let targets = req_targets("edit.pasteReplace", s, p)?;
+    let mut out = Vec::new();
+    for t in targets {
+        let doc = s.doc()?;
+        let Some(n) = doc.node(t) else { continue };
+        let parent = n.parent.ok_or_else(|| bad("edit.pasteReplace", "can't replace a page"))?;
+        let idx = doc.index_in_parent(t);
+        let at = doc.world_bounds(t).map(|b| (b.x0, b.y0));
+        let ids = paste_into(s, parent, at)?;
+        let doc = s.doc_mut()?;
+        for (k, i) in ids.iter().enumerate() {
+            if let Some(ix) = idx {
+                let _ = doc.reorder(*i, ix + k);
+            }
+        }
+        doc.remove(t)?;
+        out.extend(ids);
+    }
+    s.set_selection(out.clone());
+    Ok(json!({"ids": out}))
+}
+
+pub(super) fn copy_props_of(doc: &Document, id: NodeId) -> Value {
+    let Some(n) = doc.node(id) else { return Value::Null };
+    let mut v = json!({
+        "fills": n.fills, "strokes": n.strokes, "strokeWeight": n.stroke.weight, "strokeAlign": n.stroke.align,
+        "effects": n.effects, "opacity": n.opacity, "blend": n.blend, "cornerRadius": n.corners.radii,
+        "cornerSmoothing": n.corners.smoothing,
+    });
+    if let NodeKind::Text(t) = &n.kind {
+        v["fontFamily"] = json!(t.style.font_family);
+        v["fontStyle"] = json!(t.style.font_style);
+        v["fontSize"] = json!(t.style.font_size);
+        v["fontVariations"] = json!(t.style.variations);
+        v["lineHeight"] = serde_json::to_value(t.style.line_height).unwrap_or(Value::Null);
+        v["letterSpacing"] = serde_json::to_value(t.style.letter_spacing).unwrap_or(Value::Null);
+    }
+    v
+}
+
+pub(super) fn copy_props(s: &mut Session, p: &Value) -> Result<Value> {
+    let id = targets(s, p).first().copied().ok_or_else(|| bad("edit.copyProperties", "select one layer"))?;
+    let v = copy_props_of(s.doc()?, id);
+    s.clipboard.props = Some(v.clone());
+    Ok(v)
+}
+
+pub(super) fn paste_props(s: &mut Session, p: &Value) -> Result<Value> {
+    let props = s.clipboard.props.clone().ok_or_else(|| EngineError::Disabled("edit.pasteProperties".into(), "no copied properties".into()))?;
+    let ids = req_targets("edit.pasteProperties", s, p)?;
+    let doc = s.doc_mut()?;
+    for i in ids {
+        let mut m = props.as_object().cloned().unwrap_or_default();
+        let is_text = matches!(doc.get(i)?.kind, NodeKind::Text(_));
+        if !is_text {
+            m.retain(|k, _| !k.starts_with("font") && k != "lineHeight" && k != "letterSpacing");
+        }
+        if !doc.get(i)?.kind.has_corner_radius() {
+            m.remove("cornerRadius");
+            m.remove("cornerSmoothing");
+        }
+        crate::cmd::props::apply("edit.pasteProperties", doc, i, &m)?;
+    }
+    ok()
+}
diff --git a/crates/engine/src/cmd/edit/props.rs b/crates/engine/src/cmd/edit/props.rs
new file mode 100644
index 00000000..f793b50c
--- /dev/null
+++ b/crates/engine/src/cmd/edit/props.rs
@@ -0,0 +1,458 @@
+use super::*;
+
+pub(super) fn batch_rename(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "object.batchRename";
+    let ids = req_targets(cmd, s, p)?;
+    let find = string(p, "find");
+    let replace = string(p, "replace").unwrap_or_default();
+    let pattern = string(p, "name");
+    let rename =
+        crate::rename::BatchRename::new(find.as_deref(), boolean(p, "regex").unwrap_or(false), &replace, pattern.as_deref(), num(p, "start"))
+            .map_err(|e| bad(cmd, e))?;
+    let doc = s.doc_mut()?;
+    let names = rename.plan(doc, &ids);
+    for (i, name) in &names {
+        doc.get_mut(*i)?.name = name.clone();
+    }
+    Ok(json!({"names": names.iter().map(|(i, n)| json!({"id": i, "name": n})).collect::<Vec<_>>()}))
+}
+
+/// Char index of the first case-insensitive occurrence of `needle` in `hay` at or after `from`.
+/// Works on char indices (what `replace_range` takes), so lowercasing never shifts offsets.
+fn find_ci(hay: &[char], needle: &[char], from: usize) -> Option<usize> {
+    if needle.is_empty() {
+        return None;
+    }
+    (from..hay.len())
+        .find(|&i| hay.get(i..i + needle.len()).is_some_and(|w| w.iter().zip(needle).all(|(a, b)| a == b || a.to_lowercase().eq(b.to_lowercase()))))
+}
+
+pub(super) fn find_replace(s: &mut Session, p: &Value) -> Result<Value> {
+    let find = req_string("edit.findReplace", p, "find")?;
+    if find.is_empty() {
+        return Err(bad("edit.findReplace", "`find` is empty"));
+    }
+    // Line breaks stored as the editor stores them (CRLF, CR, U+2028 and U+2029 become LF).
+    let replace = string(p, "replace").map(|r| crate::cmd::props::normalize_line_endings(&r));
+    let names = boolean(p, "layerNames").unwrap_or(false);
+    let page = s.page()?;
+    let doc = s.doc_mut()?;
+    let mut hits = Vec::new();
+    let needle: Vec<char> = find.chars().collect();
+    let r_chars: Vec<char> = replace.as_deref().map(|r| r.chars().collect()).unwrap_or_default();
+    for i in doc.subtree(page) {
+        let Some(n) = doc.node(i) else { continue };
+        let text: Option<Vec<char>> = match &n.kind {
+            NodeKind::Text(t) => Some(t.characters.chars().collect()),
+            _ => None,
+        };
+        let text_hit = text.as_deref().is_some_and(|c| find_ci(c, &needle, 0).is_some());
+        let name_hit = names && find_ci(&n.name.chars().collect::<Vec<_>>(), &needle, 0).is_some();
+        if !(text_hit || name_hit) || n.is_page() {
+            continue;
+        }
+        hits.push(i);
+        if let Some(r) = &replace {
+            let n = doc.get_mut(i)?;
+            if names && name_hit {
+                let chars: Vec<char> = n.name.chars().collect();
+                let mut out = String::new();
+                let mut at = 0;
+                while let Some(pos) = find_ci(&chars, &needle, at) {
+                    out.extend(chars.get(at..pos).unwrap_or_default());
+                    out.push_str(r);
+                    at = pos + needle.len();
+                }
+                out.extend(chars.get(at..).unwrap_or_default());
+                n.name = out;
+            }
+            if let (NodeKind::Text(t), Some(mut chars)) = (&mut n.kind, text) {
+                // Replace occurrence by occurrence so styles shift correctly. The search resumes
+                // after each inserted replacement, so a replacement that matches `find` (in any
+                // case) neither loops forever nor stops the other occurrences.
+                let mut cursor = 0;
+                for _ in 0..10_000 {
+                    let Some(start) = find_ci(&chars, &needle, cursor) else { break };
+                    t.replace_range(start, start + needle.len(), r);
+                    chars.splice(start..start + needle.len(), r_chars.iter().copied());
+                    cursor = start + r_chars.len();
+                }
+            }
+        }
+    }
+    if boolean(p, "select").unwrap_or(true) {
+        s.set_selection(hits.clone());
+    }
+    Ok(json!({"matches": hits}))
+}
+
+/// Keys only some layer types take, the test for those layers, and why the others skip them.
+type TypedKeys<'a> = (&'a [&'a str], &'a dyn Fn(&Node) -> bool, &'a str);
+
+pub(super) fn set(s: &mut Session, p: &Value) -> Result<Value> {
+    let ids = req_targets("node.set", s, p)?;
+    let props = match get(p, "props") {
+        Some(Value::Object(m)) => m.clone(),
+        _ => {
+            // Allow flat params: {"id": 3, "fill": "#f00"}.
+            let mut m = p.as_object().cloned().unwrap_or_default();
+            m.remove("id");
+            m.remove("ids");
+            m
+        }
+    };
+    if props.is_empty() {
+        return Err(bad("node.set", "no properties given"));
+    }
+    // A new rotation for the selection turns it about its moved rotation origin: each layer's
+    // point under the origin stays put.
+    let ds = s.ds()?;
+    let pivot =
+        ds.moved_origin().filter(|_| props.contains_key("rotation") && !props.contains_key("x") && !props.contains_key("y") && ds.selection == ids);
+    let pinned: Vec<(NodeId, figcraft_geom::Point)> = match pivot {
+        Some(o) => roots(&ds.doc, &ids)
+            .into_iter()
+            .map(|i| (i, ds.doc.world_transform(i)))
+            .filter(|(_, w)| w.determinant().abs() > 1e-12)
+            .map(|(i, w)| (i, w.inverse() * o))
+            .collect(),
+        None => Vec::new(),
+    };
+    let mut warnings = font_style_warnings(&s.ds()?.doc, &ids, &props);
+    // Type-specific keys go to the layers that take them and are skipped, with a warning, on the
+    // others: auto layout keys to frame-like layers, `path` to vectors. With none among the targets
+    // that take them, the first refuses them (`props::layout_mut`, `props::apply`).
+    let doc = &s.ds()?.doc;
+    let layout_keys: Vec<&str> = props.keys().map(String::as_str).filter(|k| crate::cmd::props::LAYOUT_KEYS.contains(k)).collect();
+    let path_keys: Vec<&str> = props.keys().map(String::as_str).filter(|k| *k == "path").collect();
+    let frame_like = |n: &Node| n.kind.is_frame_like();
+    let vector = |n: &Node| matches!(n.kind, NodeKind::Vector { .. });
+    let typed: [TypedKeys; 2] = [
+        (&layout_keys, &frame_like, "only frames, components and instances have auto layout"),
+        (&path_keys, &vector, "only vector layers have a path"),
+    ];
+    let mut skipped: BTreeMap<NodeId, Map<String, Value>> = BTreeMap::new();
+    for (keys, takes, why) in typed {
+        let takes = |i: &NodeId| doc.node(*i).is_some_and(takes);
+        if keys.is_empty() || !ids.iter().any(takes) {
+            continue;
+        }
+        let others: Vec<NodeId> = ids.iter().copied().filter(|i| !takes(i)).collect();
+        if others.is_empty() {
+            continue;
+        }
+        for i in &others {
+            skipped.entry(*i).or_insert_with(|| props.clone()).retain(|k, _| !keys.contains(&k.as_str()));
+        }
+        let names: Vec<String> =
+            others.iter().take(10).filter_map(|i| doc.node(*i)).map(|n| format!("{} “{}” ({})", n.id, n.name, n.kind.type_name())).collect();
+        let more = if others.len() > names.len() { format!(" and {} more", others.len() - names.len()) } else { String::new() };
+        warnings.push(format!(
+            "{} skipped on {}{more}: {why}",
+            keys.iter().map(|k| format!("`{k}`")).collect::<Vec<_>>().join(", "),
+            names.join(", ")
+        ));
+    }
+    let doc = s.doc_mut()?;
+    let before = crate::cmd::styles::bound_before(doc, &ids);
+    for i in ids {
+        crate::cmd::props::apply("node.set", doc, i, skipped.get(&i).unwrap_or(&props))?;
+    }
+    crate::cmd::styles::detach_edited(doc, &before);
+    if let Some(o) = pivot {
+        for (i, q) in pinned {
+            let d = o - doc.world_transform(i) * q;
+            if d.hypot().is_finite() {
+                crate::cmd::arrange::move_world(doc, i, d.x, d.y)?;
+            }
+        }
+    }
+    if warnings.is_empty() { ok() } else { Ok(json!({"ok": true, "warnings": warnings})) }
+}
+
+/// A `fontStyle` draws in the family's face nearest to it, as a text layer resolves it. When that
+/// face has another weight or slant than the name asks for ("Black" on a family whose heaviest is
+/// Bold), say which face it is. Families that aren't installed, and names that match a style or a
+/// named instance (spelled any way: "SemiBold", "Semi Bold"), say nothing.
+fn font_style_warnings(doc: &figcraft_doc::Document, ids: &[NodeId], props: &serde_json::Map<String, Value>) -> Vec<String> {
+    let Some(style) = props.get("fontStyle").and_then(Value::as_str) else { return Vec::new() };
+    let mut families: Vec<String> = match props.get("fontFamily").and_then(Value::as_str) {
+        Some(f) => vec![f.to_string()],
+        None => ids
+            .iter()
+            .filter_map(|i| doc.node(*i))
+            .filter_map(|n| n.kind.text())
+            .flat_map(|t| t.spans().into_iter().map(|(_, _, st)| st.font_family.clone()).collect::<Vec<_>>())
+            .collect(),
+    };
+    families.sort();
+    families.dedup();
+    let norm = |s: &str| s.to_lowercase().replace([' ', '-', '_'], "");
+    let (want_w, want_i) = (i32::from(figcraft_doc::style_weight(style)), style.to_lowercase().contains("italic"));
+    families
+        .into_iter()
+        .filter_map(|family| {
+            let styles = figcraft_text::family_styles(&family);
+            if styles.is_empty() || styles.iter().any(|x| norm(x) == norm(style)) {
+                return None;
+            }
+            let face = figcraft_text::find_face(&family, style).filter(|f| f.family.eq_ignore_ascii_case(&family))?;
+            let w = face.axis("wght").map_or(i32::from(face.weight), |a| a.clamp(f64::from(want_w)).round() as i32);
+            if face.instance(style).is_some() || (w == want_w && face.italic == want_i) {
+                return None;
+            }
+            Some(format!("{family} has no `{style}` style: it draws in {}, the nearest (it has: {})", face.style, styles.join(", ")))
+        })
+        .collect()
+}
+
+/// `stroke.widthProfile`: a preset or points (through `node.set`'s `widthProfile`, so instances
+/// record the override).
+pub(super) fn width_profile(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "stroke.widthProfile";
+    let v = get(p, "preset").or_else(|| get(p, "points")).cloned().unwrap_or(Value::Null);
+    let ids = req_targets(cmd, s, p)?;
+    let props = serde_json::Map::from_iter([("widthProfile".to_string(), v)]);
+    let doc = s.doc_mut()?;
+    for i in ids {
+        crate::cmd::props::apply(cmd, doc, i, &props)?;
+    }
+    ok()
+}
+
+pub(super) fn stroke_brush(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "stroke.brush";
+    let v = if get(p, "preset").is_none_or(Value::is_null) { Value::Null } else { p.clone() };
+    let brush = crate::cmd::props::brush_of(&v).ok_or_else(|| bad(cmd, crate::cmd::props::BRUSH_HELP))?;
+    let ids = req_targets(cmd, s, p)?;
+    let doc = s.doc_mut()?;
+    for i in ids {
+        let n = doc.get_mut(i)?;
+        if brush.is_some() && n.strokes.is_empty() {
+            n.strokes.push(figcraft_color::Paint::solid(figcraft_color::Color::BLACK));
+        }
+        n.stroke.brush = brush.clone();
+    }
+    ok()
+}
+
+pub(super) fn reparent(s: &mut Session, p: &Value) -> Result<Value> {
+    let ids = req_targets("node.reparent", s, p)?;
+    let parent = req_id("node.reparent", p, "parent")?;
+    let index = num(p, "index").map(|i| i.max(0.0) as usize);
+    let doc = s.doc_mut()?;
+    let ids = z_sorted(doc, &roots(doc, &ids));
+    // `index` is where the first moved layer ends up among the parent's children (bottom first),
+    // counted after the move, the way `node.reorder` counts it. The layers land together, keeping
+    // their order, under the sibling that stays put and ends up just after them (none: on top).
+    let above = index.and_then(|at| doc.get(parent).ok()?.children.iter().filter(|c| !ids.contains(c)).nth(at).copied());
+    for i in &ids {
+        // Counted with the layer still in place, as `reparent` expects.
+        let at = above.and_then(|a| doc.node(parent)?.children.iter().position(|c| *c == a));
+        doc.reparent(*i, parent, at)?;
+    }
+    ok()
+}
+
+pub(super) fn paint_list(s: &mut Session, p: &Value, fills: bool, add: bool) -> Result<Value> {
+    let cmd = if fills { "fill" } else { "stroke" };
+    let ids = req_targets(cmd, s, p)?;
+    let index = if add || get(p, "index").is_none() { None } else { Some(req_index(cmd, p, "index")?) };
+    let doc = s.doc_mut()?;
+    for i in ids {
+        let n = doc.get_mut(i)?;
+        let frameish = n.kind.is_frame_like();
+        let list = if fills { &mut n.fills } else { &mut n.strokes };
+        if add {
+            let paint = match get(p, "paint").or_else(|| get(p, "color")) {
+                Some(v) => paint_of(v).ok_or_else(|| bad(cmd, "invalid paint"))?,
+                None if fills && frameish => figcraft_color::Paint::solid(figcraft_color::Color::WHITE),
+                None if fills => figcraft_color::Paint::solid(figcraft_color::Color::DEFAULT_SHAPE),
+                None => figcraft_color::Paint::solid(figcraft_color::Color::BLACK),
+            };
+            list.push(paint);
+        } else {
+            let idx = index.unwrap_or(list.len().saturating_sub(1));
+            // The paint's colour binding goes with it; later paints' move down one.
+            crate::cmd::lists::remove_item(n, if fills { crate::cmd::lists::BoundList::Fills } else { crate::cmd::lists::BoundList::Strokes }, idx);
+        }
+    }
+    ok()
+}
+
+pub(super) fn paint_set(s: &mut Session, p: &Value, fills: bool) -> Result<Value> {
+    let cmd = if fills { "fill.set" } else { "stroke.set" };
+    let ids = req_targets(cmd, s, p)?;
+    let idx = opt_index(cmd, p, "index")?;
+    let new_paint = match get(p, "paint") {
+        Some(v) => Some(paint_of(v).ok_or_else(|| bad(cmd, "invalid paint"))?),
+        None => None,
+    };
+    let col = color(p, "color");
+    let doc = s.doc_mut()?;
+    for i in ids {
+        let n = doc.get_mut(i)?;
+        let list = if fills { &mut n.fills } else { &mut n.strokes };
+        let at = idx.unwrap_or(list.len().saturating_sub(1));
+        if list.is_empty() {
+            list.push(figcraft_color::Paint::solid(if fills { figcraft_color::Color::DEFAULT_SHAPE } else { figcraft_color::Color::BLACK }));
+        }
+        let Some(slot) = list.get_mut(at) else { return Err(bad(cmd, format!("no paint at index {at}"))) };
+        let old = slot.clone();
+        if let Some(np) = &new_paint {
+            *slot = np.clone();
+        }
+        if let Some(c) = col {
+            slot.kind = figcraft_color::PaintKind::Solid { color: c.with_alpha(1.0) };
+            if c.a < 1.0 {
+                slot.opacity = c.a;
+                slot.color_alpha = c.a;
+            }
+        }
+        if let Some(o) = num(p, "opacity") {
+            slot.opacity = (if o > 1.0 { o / 100.0 } else { o }).clamp(0.0, 1.0) as f32;
+            slot.color_alpha = 1.0;
+        }
+        if let Some(v) = boolean(p, "visible") {
+            slot.visible = v;
+        }
+        if let Some(b) = blend(p, "blend") {
+            slot.blend = b;
+        }
+        crate::cmd::lists::rebind_edited_paint(n, fills, at, &old);
+        if fills {
+            n.styles.fill = None;
+        } else {
+            n.styles.stroke = None;
+        }
+    }
+    ok()
+}
+
+/// Copy paint `index` (the top one by default) of the first target into the clipboard. A stroke
+/// takes its node-wide settings (weight, alignment, sides, caps, joins, dashes) along.
+pub(super) fn paint_copy(s: &mut Session, p: &Value, fills: bool) -> Result<Value> {
+    let cmd = if fills { "fill.copy" } else { "stroke.copy" };
+    let id = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a layer"))?;
+    let at = opt_index(cmd, p, "index")?;
+    let (paint, stroke) = {
+        let doc = s.doc()?;
+        let n = doc.get(id)?;
+        let list = if fills { &n.fills } else { &n.strokes };
+        let at = at.unwrap_or(list.len().saturating_sub(1));
+        let paint = list.get(at).cloned().ok_or_else(|| bad(cmd, format!("no {} at index {at}", if fills { "fill" } else { "stroke" })))?;
+        (paint, (!fills).then(|| n.stroke.clone()))
+    };
+    s.clipboard.paint = Some((fills, paint.clone()));
+    s.clipboard.stroke = stroke;
+    serde_json::to_value(&paint).map_err(|e| bad(cmd, e.to_string()))
+}
+
+/// Paste the copied paint onto the targets: replacing paint `index` there, or adding one. A
+/// stroke's copied settings go onto each target too.
+pub(super) fn paint_paste(s: &mut Session, p: &Value, fills: bool) -> Result<Value> {
+    let cmd = if fills { "fill.paste" } else { "stroke.paste" };
+    let Some((copied_fills, paint)) = s.clipboard.paint.clone() else {
+        return Err(EngineError::Disabled(cmd.into(), "no copied fill or stroke".into()));
+    };
+    if copied_fills != fills {
+        let what = if fills { "stroke" } else { "fill" };
+        return Err(EngineError::Disabled(cmd.into(), format!("the copied paint is a {what}")));
+    }
+    let ids = req_targets(cmd, s, p)?;
+    // A copied pattern pointing at a target or a layer inside it would make the layer pattern
+    // itself; `fill.pattern` refuses the same, and the renderer would drop the pattern.
+    if let figcraft_color::PaintKind::Pattern(pt) = &paint.kind {
+        let doc = s.doc()?;
+        if ids.iter().any(|t| doc.is_ancestor(*t, NodeId(pt.source))) {
+            return Err(bad(cmd, "a layer can't be filled with itself or a layer inside it"));
+        }
+    }
+    let mut q = json!({"ids": ids, "paint": serde_json::to_value(paint).map_err(|e| bad(cmd, e.to_string()))?});
+    let out = match opt_index(cmd, p, "index")? {
+        Some(at) => {
+            q["index"] = json!(at);
+            paint_set(s, &q, fills)?
+        }
+        None => paint_list(s, &q, fills, true)?,
+    };
+    if let Some(stroke) = s.clipboard.stroke.clone().filter(|_| !fills) {
+        for id in ids {
+            s.doc_mut()?.get_mut(id)?.stroke = stroke.clone();
+        }
+    }
+    Ok(out)
+}
+
+pub(super) fn pattern_fill(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "fill.pattern";
+    let src = req_id(CMD, p, "source")?;
+    let doc = s.doc()?;
+    if doc.node(src).is_none_or(|n| n.is_page()) {
+        return Err(bad(CMD, "`source` must be a layer"));
+    }
+    if req_targets(CMD, s, p)?.iter().any(|t| doc.is_ancestor(*t, src)) {
+        return Err(bad(CMD, "a layer can't be filled with itself or a layer inside it"));
+    }
+    let mut pt = figcraft_color::PatternPaint::new(src.0);
+    pt.tile = parse(CMD, p, "tile")?.unwrap_or_default();
+    pt.align = parse(CMD, p, "align")?.unwrap_or_default();
+    pt.spacing = parse(CMD, p, "spacing")?.unwrap_or_default();
+    let (lo, hi) = figcraft_color::PatternPaint::SCALE_RANGE;
+    pt.scale = num(p, "scale").filter(|v| v.is_finite()).unwrap_or(1.0).clamp(lo, hi);
+    let mut q = if p.is_object() { p.clone() } else { json!({}) };
+    q["paint"] =
+        serde_json::to_value(figcraft_color::Paint { kind: figcraft_color::PaintKind::Pattern(pt), ..figcraft_color::Paint::pattern(src.0) })
+            .map_err(|e| bad(CMD, e.to_string()))?;
+    paint_set(s, &q, true)
+}
+
+pub(super) fn effect_add(s: &mut Session, p: &Value) -> Result<Value> {
+    let e: Effect = match crate::cmd::props::effect_from("effect.add", p, "effect")? {
+        Some(e) => e,
+        None => {
+            let ty = string(p, "type").unwrap_or_else(|| "dropShadow".into());
+            Effect::of_type(&ty).ok_or_else(|| bad("effect.add", format!("unknown effect type `{ty}`")))?
+        }
+    };
+    for i in req_targets("effect.add", s, p)? {
+        s.doc_mut()?.get_mut(i)?.effects.push(e.clone());
+    }
+    ok()
+}
+
+/// Copy effect `index` (the top one by default) of the first target into the clipboard.
+pub(super) fn effect_copy(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "effect.copy";
+    let id = targets(s, p).first().copied().ok_or_else(|| bad(CMD, "select a layer"))?;
+    let at = opt_index(CMD, p, "index")?;
+    let e = {
+        let doc = s.doc()?;
+        let list = &doc.get(id)?.effects;
+        let at = at.unwrap_or(list.len().saturating_sub(1));
+        list.get(at).cloned().ok_or_else(|| bad(CMD, format!("no effect at index {at}")))?
+    };
+    s.clipboard.effect = Some(e.clone());
+    serde_json::to_value(&e).map_err(|err| bad(CMD, err.to_string()))
+}
+
+/// Paste the copied effect onto the targets: replacing effect `index` there, or adding one.
+pub(super) fn effect_paste(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "effect.paste";
+    let Some(e) = s.clipboard.effect.clone() else {
+        return Err(EngineError::Disabled(CMD.into(), "no copied effect".into()));
+    };
+    let at = opt_index(CMD, p, "index")?;
+    for id in req_targets(CMD, s, p)? {
+        let n = s.doc_mut()?.get_mut(id)?;
+        match at {
+            Some(i) => {
+                if let Some(slot) = n.effects.get_mut(i) {
+                    *slot = e.clone();
+                }
+            }
+            None => n.effects.push(e.clone()),
+        }
+    }
+    ok()
+}
diff --git a/crates/engine/src/cmd/edit/select.rs b/crates/engine/src/cmd/edit/select.rs
new file mode 100644
index 00000000..03bba890
--- /dev/null
+++ b/crates/engine/src/cmd/edit/select.rs
@@ -0,0 +1,267 @@
+use super::*;
+
+pub(super) fn layers_at(s: &mut Session, p: &Value) -> Result<Value> {
+    let (x, y) = (req_num("select.layersAt", p, "x")?, req_num("select.layersAt", p, "y")?);
+    let doc = s.doc()?;
+    let zoom = s.ds()?.view.zoom.max(1e-6);
+    let sel = s.selection();
+    let result = crate::booleans::result_outline(doc, &sel);
+    let layers: Vec<Value> = figcraft_doc::geometry::layers_at(doc, s.page()?, figcraft_geom::Point::new(x, y), 2.0 / zoom, Some(&result))
+        .into_iter()
+        .filter_map(|(id, depth)| doc.node(id).map(|n| json!({"id": id, "name": n.name, "type": n.kind.type_name(), "depth": depth})))
+        .collect();
+    Ok(json!({"layers": layers}))
+}
+
+pub(super) fn select_all(s: &mut Session, _p: &Value) -> Result<Value> {
+    let doc = s.doc()?;
+    let sel = s.selection();
+    // Select all siblings of the current selection, else the page's top level.
+    let parent = sel.first().and_then(|i| doc.node(*i)).and_then(|n| n.parent).unwrap_or(s.page()?);
+    let ids: Vec<NodeId> = doc.get(parent)?.children.iter().copied().filter(|c| doc.node(*c).is_some_and(|n| n.visible && !n.locked)).collect();
+    s.set_selection(ids.clone());
+    Ok(json!({"selection": ids}))
+}
+
+/// What Select all would select, less the selection (hidden and locked layers neither).
+pub(super) fn select_inverse(s: &mut Session, _p: &Value) -> Result<Value> {
+    let doc = s.doc()?;
+    let sel = s.selection();
+    let parent = sel.first().and_then(|i| doc.node(*i)).and_then(|n| n.parent).unwrap_or(s.page()?);
+    let ids: Vec<NodeId> =
+        doc.get(parent)?.children.iter().copied().filter(|c| !sel.contains(c) && doc.node(*c).is_some_and(|n| n.visible && !n.locked)).collect();
+    s.set_selection(ids.clone());
+    Ok(json!({"selection": ids}))
+}
+
+/// `select.area`: what a marquee from (x, y) over the box selects; no box asks the app for one.
+pub(super) fn select_area(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "select.area";
+    let keys = ["x", "y", "width", "height"];
+    if keys.iter().all(|k| p.get(*k).is_none()) {
+        s.request_ui("selectArea", json!({}));
+        return ok();
+    }
+    let [x, y, w, h] = keys.map(|k| num(p, k));
+    let (Some(x), Some(y), Some(w), Some(h)) = (x, y, w, h) else { return Err(bad(cmd, "pass x, y, width and height (numbers)")) };
+    if ![x, y, w, h].iter().all(|v| v.is_finite() && v.abs() < 1e9) {
+        return Err(bad(cmd, "the box is out of range"));
+    }
+    let start = figcraft_geom::Point::new(x, y);
+    let r = figcraft_geom::Rect::from_points(start, figcraft_geom::Point::new(x + w, y + h));
+    let add = boolean(p, "add") == Some(true);
+    let base = if add { s.selection() } else { Vec::new() };
+    let within = s.marquee_within(start)?;
+    let sel = s.marquee_selection(r, within, boolean(p, "deep") == Some(true), &base, add)?;
+    s.set_selection(sel.clone());
+    Ok(json!({"selection": sel}))
+}
+
+pub(super) fn select_children(s: &mut Session, _p: &Value) -> Result<Value> {
+    let doc = s.doc()?;
+    let mut ids = Vec::new();
+    for i in s.selection() {
+        if let Some(n) = doc.node(i) {
+            ids.extend(n.children.iter().copied());
+        }
+    }
+    if ids.is_empty() {
+        return Ok(json!({"selection": s.selection()}));
+    }
+    s.set_selection(ids.clone());
+    Ok(json!({"selection": ids}))
+}
+
+pub(super) fn select_parent(s: &mut Session, _p: &Value) -> Result<Value> {
+    let doc = s.doc()?;
+    let mut ids: Vec<NodeId> = Vec::new();
+    for i in s.selection() {
+        if let Some(p) = doc.node(i).and_then(|n| n.parent)
+            && !doc.node(p).is_some_and(Node::is_page)
+            && !ids.contains(&p)
+        {
+            ids.push(p);
+        }
+    }
+    if ids.is_empty() {
+        return Ok(json!({"selection": s.selection()}));
+    }
+    s.set_selection(ids.clone());
+    Ok(json!({"selection": ids}))
+}
+
+pub(super) fn select_sibling(s: &mut Session, dir: i64) -> Result<Value> {
+    let doc = s.doc()?;
+    let sel = s.selection();
+    let Some(cur) = sel.last().copied() else {
+        let first = doc.get(s.page()?)?.children.last().copied();
+        s.set_selection(first.into_iter().collect());
+        return Ok(json!({"selection": s.selection()}));
+    };
+    let parent = doc.get(cur)?.parent.ok_or_else(|| bad("select.next", "no parent"))?;
+    let kids = &doc.get(parent)?.children;
+    let idx = kids.iter().position(|c| *c == cur).unwrap_or(0) as i64;
+    let n = kids.len() as i64;
+    // Layers panel order is reversed (top of the list = last child): Tab goes down the list.
+    let next = (idx - dir).rem_euclid(n.max(1)) as usize;
+    let id = kids.get(next).copied().unwrap_or(cur);
+    s.set_selection(vec![id]);
+    Ok(json!({"selection": [id]}))
+}
+
+pub(super) fn select_matching(s: &mut Session, _p: &Value) -> Result<Value> {
+    let doc = s.doc()?;
+    let sel = s.selection();
+    let Some(first) = sel.first().and_then(|i| doc.node(*i)) else { return Ok(json!({"selection": []})) };
+    let (name, ty) = (first.name.clone(), first.kind.type_name());
+    let page = s.page()?;
+    let ids: Vec<NodeId> =
+        doc.subtree(page).into_iter().filter(|i| doc.node(*i).is_some_and(|n| n.name == name && n.kind.type_name() == ty)).collect();
+    s.set_selection(ids.clone());
+    Ok(json!({"selection": ids}))
+}
+
+pub(super) fn select_same(s: &mut Session, same: impl Fn(&Node, &Node) -> bool) -> Result<Value> {
+    let doc = s.doc()?;
+    let sel = s.selection();
+    let Some(first) = sel.first().and_then(|i| doc.node(*i)).cloned() else { return Ok(json!({"selection": []})) };
+    let page = s.page()?;
+    let ids: Vec<NodeId> = doc.subtree(page).into_iter().filter(|i| *i != page && doc.node(*i).is_some_and(|n| same(&first, n))).collect();
+    s.set_selection(ids.clone());
+    Ok(json!({"selection": ids}))
+}
+
+/// The opacity number keys give: one digit is tens of percent (0 is 100%), two digits typed in
+/// quick succession the exact percentage.
+pub fn opacity_from_digits(digits: &str) -> Option<f32> {
+    let mut n = 0u32;
+    let mut count = 0;
+    for c in digits.chars() {
+        // Input-derived: a number that outgrows `u32` stops the scan (None); it never wraps.
+        n = n.checked_mul(10)?.checked_add(c.to_digit(10)?)?;
+        count += 1;
+    }
+    match count {
+        1 if n == 0 => Some(1.0),
+        1 => Some(n as f32 / 10.0),
+        2 => Some(n as f32 / 100.0),
+        _ => None,
+    }
+}
+
+pub(super) fn opacity_keys(s: &mut Session, p: &Value) -> Result<Value> {
+    let digits = req_string("object.opacityKeys", p, "digits")?;
+    let o = opacity_from_digits(&digits).ok_or_else(|| bad("object.opacityKeys", "`digits` must be one or two digits"))?;
+    let ids = req_targets("object.opacityKeys", s, p)?;
+    let doc = s.doc_mut()?;
+    let before = crate::cmd::styles::bound_before(doc, &ids);
+    for i in ids {
+        doc.get_mut(i)?.opacity = o;
+    }
+    crate::cmd::styles::detach_edited(doc, &before);
+    Ok(json!({"opacity": o}))
+}
+
+pub(super) fn nudge(s: &mut Session, p: &Value) -> Result<Value> {
+    let big = boolean(p, "big").unwrap_or(false);
+    let k = if big { s.prefs.nudge_big } else { s.prefs.nudge_small };
+    let (ux, uy) = (num_or(p, "dx", 0.0), num_or(p, "dy", 0.0));
+    let (dx, dy) = (ux * k, uy * k);
+    let ids = req_targets("transform.nudge", s, p)?;
+    // Edit a copy and keep it only if something moved, so an arrow that can't move anything adds
+    // no undo step.
+    let mut work = s.doc()?.clone();
+    let doc = &mut work;
+    let ids = roots(doc, &ids);
+    let mut changed = false;
+    // Children in an auto layout flow move one place instead (see `al_keys`).
+    for i in &ids {
+        if crate::al_keys::flowing_parent(doc, *i).is_none() && (dx, dy) != (0.0, 0.0) {
+            let n = doc.get_mut(*i)?;
+            n.transform = Affine::translate((dx, dy)) * n.transform;
+            changed = true;
+        }
+    }
+    for dir in crate::al_keys::Dir::from_units(ux, uy) {
+        // Grouped per arrow: a move into a neighbouring frame changes the parent.
+        let mut groups: BTreeMap<NodeId, Vec<NodeId>> = BTreeMap::new();
+        for i in &ids {
+            if let Some(parent) = crate::al_keys::flowing_parent(doc, *i) {
+                groups.entry(parent).or_default().push(*i);
+            }
+        }
+        for (parent, block) in groups {
+            changed |= crate::al_keys::arrow_move(doc, parent, &block, dir)?;
+        }
+    }
+    if changed {
+        s.ds_mut()?.doc = std::sync::Arc::new(work);
+    }
+    ok()
+}
+
+pub(super) fn nudge_size(s: &mut Session, p: &Value) -> Result<Value> {
+    let big = boolean(p, "big").unwrap_or(false);
+    let k = if big { s.prefs.nudge_big } else { s.prefs.nudge_small };
+    let (dw, dh) = (num_or(p, "dw", 0.0) * k, num_or(p, "dh", 0.0) * k);
+    let ids = req_targets("transform.nudgeSize", s, p)?;
+    let ids = roots(s.doc()?, &ids);
+    for i in ids {
+        let Some((w, h)) = s.doc()?.node(i).map(|n| (n.width, n.height)) else { continue };
+        let mut q = serde_json::Map::new();
+        q.insert("ids".into(), json!([i]));
+        // Only the axis that changes becomes fixed.
+        if dw != 0.0 {
+            q.insert("width".into(), json!((w + dw).max(0.0)));
+        }
+        if dh != 0.0 {
+            q.insert("height".into(), json!((h + dh).max(0.0)));
+        }
+        crate::cmd::arrange::resize_cmd(s, &Value::Object(q))?;
+    }
+    ok()
+}
+
+pub(super) fn toggle(s: &mut Session, p: &Value, what: &str) -> Result<Value> {
+    let ids = req_targets("object.toggle", s, p)?;
+    let doc = s.doc_mut()?;
+    let explicit = boolean(p, what);
+    // Figma: if any is visible, hide all (and vice versa).
+    let value = explicit.unwrap_or_else(|| match what {
+        "visible" => !ids.iter().all(|i| doc.node(*i).is_some_and(|n| n.visible)),
+        _ => !ids.iter().all(|i| doc.node(*i).is_some_and(|n| n.locked)),
+    });
+    for i in &ids {
+        let n = doc.get_mut(*i)?;
+        if what == "visible" {
+            n.visible = value;
+        } else {
+            n.locked = value;
+        }
+    }
+    if what == "locked" && value {
+        s.set_selection(vec![]);
+    }
+    Ok(json!({what: value}))
+}
+
+pub(super) fn hide_others(s: &mut Session, _p: &Value) -> Result<Value> {
+    let sel = s.selection();
+    let page = s.page()?;
+    let doc = s.doc_mut()?;
+    let keep: BTreeSet<NodeId> = sel
+        .iter()
+        .flat_map(|i| {
+            let mut v = doc.ancestors(*i);
+            v.push(*i);
+            v
+        })
+        .collect();
+    let tops: Vec<NodeId> = doc.get(page)?.children.clone();
+    for t in tops {
+        if !keep.contains(&t) {
+            doc.get_mut(t)?.visible = false;
+        }
+    }
+    ok()
+}
diff --git a/crates/engine/src/cmd/facilitate.rs b/crates/engine/src/cmd/facilitate.rs
new file mode 100644
index 00000000..9a1513a6
--- /dev/null
+++ b/crates/engine/src/cmd/facilitate.rs
@@ -0,0 +1,373 @@
+//! Running a session on a board: a countdown everyone sees and votes on objects.
+//!
+//! Both live in the document ([`figcraft_doc::facilitation`]) so they reach everyone in a live
+//! session, and neither is an undo step: undoing an edit leaves the timer and the vote as they are.
+
+use std::sync::Arc;
+
+use figcraft_doc::{BoardTimer, Document, NodeId, TIMER_MAX_MS, VOTES_MAX, Vote, VoteScope};
+use figcraft_geom::{Point, Rect};
+use serde_json::{Value, json};
+
+use crate::board::{require, text_of};
+use crate::cmd::CommandSpec;
+use crate::params::{id, num, req_string, req_targets, string};
+use crate::tools::PointerEvent;
+use crate::{EngineError, Result, Session, bad, spec};
+
+/// Minutes a timer starts with, and adds, when none are given.
+const START_MINUTES: f64 = 5.0;
+const ADD_MINUTES: f64 = 1.0;
+/// Votes each person gets when none are given.
+const VOTES: u32 = 3;
+/// A vote badge's radius on screen (logical pixels).
+pub const BADGE_PX: f64 = 11.0;
+/// The longest a voter name is kept.
+const MAX_VOTER: usize = 64;
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        spec!(
+            "board.timer",
+            "Timer",
+            "{action: start|pause|resume|add|stop, minutes? (start: default 5; add: default 1; up to 1440)} → the timer's state (as board.timerState)  one countdown per board, the same for everyone in a live session",
+            false,
+            timer_cmd
+        ),
+        spec!(
+            "board.timerState",
+            "Timer state",
+            "{} → {state: off|running|paused|done, left (ms), text (m:ss), ends? (ms since 1970, while running)}",
+            false,
+            |s, _| {
+                require(s, "board.timerState")?;
+                Ok(timer_json(s.doc()?.timer, now_ms()))
+            }
+        ),
+        spec!(
+            "board.vote",
+            "Voting session",
+            "{action: start|cast|retract|end|clear, votes? (start: per person, 1–99, default 3), on? (start: all|stickies|selection; default all), ids? (start with on: selection; default the selection), id (cast, retract: the object), voter? (default you)} → the vote's state (as board.voteResults)  one vote at a time; others' votes show once it ends",
+            false,
+            vote_cmd
+        ),
+        spec!(
+            "board.voteResults",
+            "Voting results",
+            "{voter?} → {state: off|running|ended, votesPerPerson, on, by, left (your votes left), mine [{id, votes}], voters, results? [{id, name, votes, rank}] (once ended, most votes first)}",
+            false,
+            |s, p| {
+                require(s, "board.voteResults")?;
+                let who = voter(s, p);
+                Ok(vote_json(s.doc()?, &who))
+            }
+        ),
+    ]
+}
+
+/// Milliseconds since the Unix epoch (0 if the clock is before it).
+pub fn now_ms() -> u64 {
+    web_time::SystemTime::now().duration_since(web_time::UNIX_EPOCH).map_or(0, |d| u64::try_from(d.as_millis()).unwrap_or(u64::MAX))
+}
+
+/// `left` milliseconds as a clock: "4:05", "1:02:03" (whole seconds, rounded up).
+pub fn clock(left: u64) -> String {
+    let s = left.div_ceil(1000);
+    let (h, m, s) = (s / 3600, s / 60 % 60, s % 60);
+    if h > 0 { format!("{h}:{m:02}:{s:02}") } else { format!("{m}:{s:02}") }
+}
+
+/// The timer's state at `now`: off, running, paused or done (run out, until someone stops it).
+pub fn timer_state(t: Option<BoardTimer>, now: u64) -> &'static str {
+    match t {
+        None => "off",
+        Some(BoardTimer::Paused { .. }) => "paused",
+        Some(t) if t.left(now) == 0 => "done",
+        Some(_) => "running",
+    }
+}
+
+fn timer_json(t: Option<BoardTimer>, now: u64) -> Value {
+    let left = t.map_or(0, |t| t.left(now));
+    let ends = match t {
+        Some(BoardTimer::Running { ends }) => Some(ends),
+        _ => None,
+    };
+    json!({"state": timer_state(t, now), "left": left, "text": clock(left), "ends": ends})
+}
+
+/// `minutes` (or `default`) as milliseconds: more than 0, at most a day.
+fn duration(cmd: &str, p: &Value, default: f64) -> Result<u64> {
+    let m = match p.get("minutes").filter(|v| !v.is_null()) {
+        Some(_) => num(p, "minutes").ok_or_else(|| bad(cmd, "`minutes` must be a number"))?,
+        None => default,
+    };
+    let ms = (m * 60_000.0).round();
+    if !(1000.0..=TIMER_MAX_MS as f64).contains(&ms) {
+        return Err(bad(cmd, "`minutes` must be from 1 second to 1440 minutes"));
+    }
+    Ok(ms as u64)
+}
+
+/// The timer after `action` at `now` (`Ok(None)`: stopped).
+pub fn timer_after(cmd: &str, t: Option<BoardTimer>, action: &str, p: &Value, now: u64) -> Result<Option<BoardTimer>> {
+    let off = || EngineError::Disabled(cmd.into(), "there is no timer: start one".into());
+    Ok(match action {
+        "start" => Some(BoardTimer::Running { ends: now.saturating_add(duration(cmd, p, START_MINUTES)?) }),
+        "stop" => None,
+        "pause" => match t {
+            Some(r @ BoardTimer::Running { .. }) if r.left(now) > 0 => Some(BoardTimer::Paused { left: r.left(now) }),
+            _ => return Err(EngineError::Disabled(cmd.into(), "the timer isn't running".into())),
+        },
+        "resume" => match t {
+            Some(BoardTimer::Paused { left }) => Some(BoardTimer::Running { ends: now.saturating_add(left) }),
+            _ => return Err(EngineError::Disabled(cmd.into(), "the timer isn't paused".into())),
+        },
+        "add" => {
+            let more = duration(cmd, p, ADD_MINUTES)?;
+            let left = t.ok_or_else(off)?.left(now).saturating_add(more).min(TIMER_MAX_MS);
+            match t {
+                Some(BoardTimer::Paused { .. }) => Some(BoardTimer::Paused { left }),
+                _ => Some(BoardTimer::Running { ends: now.saturating_add(left) }),
+            }
+        }
+        other => return Err(bad(cmd, format!("unknown action `{other}` (start|pause|resume|add|stop)"))),
+    })
+}
+
+fn timer_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    require(s, "board.timer")?;
+    let action = req_string("board.timer", p, "action")?;
+    let now = now_ms();
+    let t = timer_after("board.timer", s.doc()?.timer, &action, p, now)?;
+    if s.doc()?.timer != t {
+        s.doc_mut()?.timer = t;
+    }
+    Ok(timer_json(t, now))
+}
+
+/// Who votes: `voter` from the params, else you as the live session knows you (your client id
+/// there, so two people of the same name vote apart), else your name.
+pub fn voter(s: &Session, p: &Value) -> String {
+    if let Some(v) = string(p, "voter").map(|v| v.trim().chars().filter(|c| !c.is_control()).take(MAX_VOTER).collect::<String>())
+        && !v.is_empty()
+    {
+        return v;
+    }
+    let live = s.ds().ok().filter(|ds| s.live_doc(ds.uid)).and_then(|ds| s.live_of(ds.uid).info.as_ref());
+    match live {
+        Some(info) => format!("peer {}", info.me),
+        None => crate::cmd::comment::user_name(s),
+    }
+}
+
+fn running<'a>(cmd: &str, doc: &'a Document) -> Result<&'a Vote> {
+    match &doc.vote {
+        Some(v) if !v.ended => Ok(v),
+        _ => Err(EngineError::Disabled(cmd.into(), "no vote is running".into())),
+    }
+}
+
+fn vote_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "board.vote";
+    require(s, CMD)?;
+    let action = req_string(CMD, p, "action")?;
+    let who = voter(s, p);
+    match action.as_str() {
+        "start" => start_vote(s, p, CMD)?,
+        "cast" | "retract" => change_ballot(s, p, CMD, &who, action == "cast")?,
+        "end" => {
+            running(CMD, s.doc()?)?;
+            if let Some(v) = s.doc_mut()?.vote.as_mut() {
+                v.ended = true;
+            }
+        }
+        "clear" => {
+            let doc = s.doc()?;
+            if doc.vote.is_some() || !doc.votes.is_empty() {
+                let doc = s.doc_mut()?;
+                doc.vote = None;
+                doc.votes.clear();
+            }
+        }
+        other => return Err(bad(CMD, format!("unknown action `{other}` (start|cast|retract|end|clear)"))),
+    }
+    Ok(vote_json(s.doc()?, &who))
+}
+
+/// `board.vote {action: start}`: a new vote (votes per person, on what), clearing the last results.
+fn start_vote(s: &mut Session, p: &Value, cmd: &str) -> Result<()> {
+    if s.doc()?.vote.as_ref().is_some_and(|v| !v.ended) {
+        return Err(EngineError::Disabled(cmd.into(), "a vote is already running: end it first".into()));
+    }
+    let per = match p.get("votes").filter(|v| !v.is_null()) {
+        Some(_) => num(p, "votes")
+            .filter(|n| n.fract() == 0.0 && (1.0..=f64::from(VOTES_MAX)).contains(n))
+            .ok_or_else(|| bad(cmd, "`votes` must be a whole number from 1 to 99"))?,
+        None => f64::from(VOTES),
+    } as u32;
+    let scope = match string(p, "on").as_deref().unwrap_or("all") {
+        "all" => VoteScope::All,
+        "stickies" => VoteScope::Stickies,
+        "selection" => {
+            let doc = s.doc()?;
+            let ids: Vec<NodeId> = req_targets(cmd, s, p)?.into_iter().filter(|i| VoteScope::All.takes(doc, *i)).collect();
+            if ids.is_empty() {
+                return Err(bad(cmd, "pick the objects to vote on (not pages)"));
+            }
+            VoteScope::Only { ids }
+        }
+        other => return Err(bad(cmd, format!("unknown `on` `{other}` (all|stickies|selection)"))),
+    };
+    let by = crate::board::author(s);
+    let doc = s.doc_mut()?;
+    doc.votes.clear();
+    doc.vote = Some(Vote { per_person: per, scope, ended: false, by });
+    Ok(())
+}
+
+/// `board.vote {action: cast|retract, id}`: one vote of `who`'s placed on (`cast`) or taken back
+/// from an object, within the running vote's scope and votes per person.
+fn change_ballot(s: &mut Session, p: &Value, cmd: &str, who: &str, cast: bool) -> Result<()> {
+    let target = id(p, "id").ok_or_else(|| bad(cmd, "`id` must be the object to vote on"))?;
+    let doc = s.doc()?;
+    let vote = running(cmd, doc)?;
+    let mut ballot: Vec<NodeId> = vote.counted(doc, doc.votes.get(who).map_or(&[], Vec::as_slice)).collect();
+    if cast {
+        if !vote.scope.takes(doc, target) {
+            return Err(match doc.node(target) {
+                None => EngineError::NoNode(target),
+                Some(_) => EngineError::Disabled(cmd.into(), "this vote isn't on that object".into()),
+            });
+        }
+        if ballot.len() >= vote.per_person as usize {
+            return Err(EngineError::Disabled(cmd.into(), "you have no votes left: remove one first".into()));
+        }
+        ballot.push(target);
+    } else {
+        let i =
+            ballot.iter().rposition(|i| *i == target).ok_or_else(|| EngineError::Disabled(cmd.into(), "you have no vote on that object".into()))?;
+        ballot.remove(i);
+    }
+    let votes = &mut s.doc_mut()?.votes;
+    if ballot.is_empty() {
+        votes.remove(who);
+    } else {
+        votes.insert(who.to_string(), ballot);
+    }
+    Ok(())
+}
+
+/// `who`'s votes per object, in the order first voted on.
+pub fn mine(doc: &Document, who: &str) -> Vec<(NodeId, u32)> {
+    let (Some(vote), Some(ballot)) = (&doc.vote, doc.votes.get(who)) else { return Vec::new() };
+    let mut out: Vec<(NodeId, u32)> = Vec::new();
+    for id in vote.counted(doc, ballot) {
+        match out.iter_mut().find(|(i, _)| *i == id) {
+            Some((_, n)) => *n += 1,
+            None => out.push((id, 1)),
+        }
+    }
+    out
+}
+
+/// What an object is called in the results: its text (a sticky's note), else its name.
+pub fn object_name(doc: &Document, id: NodeId) -> String {
+    let text = text_of(doc, id).and_then(|t| doc.node(t)).and_then(|n| n.kind.text()).map(|t| t.characters.trim().to_string());
+    let name = text.filter(|t| !t.is_empty()).or_else(|| doc.node(id).map(|n| n.name.clone())).unwrap_or_default();
+    let line = name.lines().next().unwrap_or_default();
+    let short: String = line.chars().take(60).collect();
+    if short.len() < name.len() { format!("{short}…") } else { short }
+}
+
+fn vote_json(doc: &Document, who: &str) -> Value {
+    let Some(vote) = &doc.vote else { return json!({"state": "off"}) };
+    let on = match &vote.scope {
+        VoteScope::All => json!("all"),
+        VoteScope::Stickies => json!("stickies"),
+        VoteScope::Only { ids } => json!({"selection": ids}),
+    };
+    let mine = mine(doc, who);
+    let used: u32 = mine.iter().map(|m| m.1).sum();
+    let voters = doc.votes.values().filter(|b| vote.counted(doc, b).next().is_some()).count();
+    let mut out = json!({
+        "state": if vote.ended { "ended" } else { "running" },
+        "votesPerPerson": vote.per_person,
+        "on": on,
+        "by": vote.by,
+        "left": vote.per_person.saturating_sub(used),
+        "mine": mine.iter().map(|(id, n)| json!({"id": id, "votes": n})).collect::<Vec<_>>(),
+        "voters": voters,
+    });
+    if vote.ended {
+        let results: Vec<Value> =
+            ranked(doc, vote).into_iter().map(|(rank, id, n)| json!({"id": id, "name": object_name(doc, id), "votes": n, "rank": rank})).collect();
+        out["results"] = json!(results);
+    }
+    out
+}
+
+/// The objects with votes, most first, each with its rank (ties share one: "1, 2, 2, 4").
+pub fn ranked(doc: &Document, vote: &Vote) -> Vec<(usize, NodeId, u32)> {
+    let mut last = None;
+    let mut rank = 0;
+    vote.tally(doc, &doc.votes)
+        .into_iter()
+        .enumerate()
+        .map(|(i, (id, n))| {
+            if last != Some(n) {
+                rank = i + 1;
+                last = Some(n);
+            }
+            (rank, id, n)
+        })
+        .collect()
+}
+
+/// Where object `b`'s vote badge sits (its top-right corner) and its radius, in page units at
+/// `zoom` screen pixels per unit.
+pub fn badge(b: Rect, zoom: f64) -> (Point, f64) {
+    (Point::new(b.x1, b.y0), BADGE_PX / zoom.max(1e-6))
+}
+
+impl Session {
+    /// A press with the Move tool while a vote runs: on one of your vote badges, or with Alt, it
+    /// takes that vote back; on an object the vote is on, it puts a vote there. False when the
+    /// press is for the tool (no vote running, or nothing to vote on there).
+    pub(crate) fn vote_down(&mut self, ev: &PointerEvent) -> Result<bool> {
+        let doc = self.doc()?;
+        let Some(vote) = doc.vote.as_ref().filter(|v| !v.ended) else { return Ok(false) };
+        let who = voter(self, &Value::Null);
+        let p = ev.p();
+        let on_badge = mine(doc, &who).into_iter().map(|(id, _)| id).find(|id| {
+            doc.world_bounds(*id).is_some_and(|b| {
+                let (c, r) = badge(b, ev.zoom);
+                (p - c).hypot() <= r
+            })
+        });
+        let hit = || {
+            let leaf = self.hit(doc, self.page().ok()?, p, 2.0 / ev.zoom.max(1e-6))?;
+            vote.scope.target(doc, leaf, figcraft_doc::geometry::select_target(doc, leaf, &[], false))
+        };
+        let (action, target) = match on_badge {
+            Some(id) => ("retract", id),
+            None => match hit() {
+                Some(id) => (if ev.alt { "retract" } else { "cast" }, id),
+                None => return Ok(false),
+            },
+        };
+        self.execute("board.vote", &json!({"action": action, "id": target}))?;
+        Ok(true)
+    }
+}
+
+/// Undo and redo bring back a document as it was, but the timer and the vote aren't undoable:
+/// keep them as they are now (`from`).
+pub(crate) fn keep(from: &Document, to: &mut Arc<Document>) {
+    if from.timer != to.timer || from.vote != to.vote || from.votes != to.votes {
+        let d = Arc::make_mut(to);
+        d.timer = from.timer;
+        d.vote = from.vote.clone();
+        d.votes = from.votes.clone();
+    }
+}
diff --git a/crates/engine/src/cmd/file.rs b/crates/engine/src/cmd/file.rs
index 5e27c572..fed4bff1 100644
--- a/crates/engine/src/cmd/file.rs
+++ b/crates/engine/src/cmd/file.rs
@@ -11,26 +11,68 @@ use super::{CommandSpec, ok};
 use crate::params::*;
 use crate::{DocState, EngineError, Result, Session, bad, spec};
 
+mod export;
+mod load;
+mod open;
+mod save;
+mod version;
+
+pub(crate) use export::FORBIDDEN_FILE_NAME_CHARS;
+#[cfg(test)]
+use export::add_member;
+pub(super) use export::export_setting;
+pub use export::{
+    ExportJob, copy_png, drawn_layers, export_area, export_bytes, export_bytes_with, export_jobs, export_scale, exportable_layers, fig_bytes,
+    frames_pdf, jobs_for, safe_file_name,
+};
+use export::{export, export_frames_pdf, export_layers, pdf_bytes};
+#[cfg(test)]
+pub(crate) use load::{installed_family, sketch_line};
+pub use load::{load, load_bytes, load_path};
+pub(crate) use load::{load_fig, read_capped, recovered, variables_param, write};
+pub use open::MAX_RECENT;
+#[cfg(test)]
+use open::append_pages;
+use open::{import, open, open_recent};
+pub(crate) use save::save_ends_preview;
+pub use save::{FileSnapshot, file_bytes, thumbnail};
+use save::{color_profile, mark_saved, save, save_as};
+pub use version::MAX_AUTOSAVES;
+pub(crate) use version::{add_version, keep_in_history, read_version, unique_id};
+use version::{autosave, restore_version, save_version, version_index, version_json, version_list};
+
+/// A new file of `kind` in a tab of its own.
+fn new_file(s: &mut Session, p: &Value, kind: FileKind) -> Result<Value> {
+    let name = string(p, "name").unwrap_or_else(|| if kind == FileKind::Board { "Untitled board" } else { "Untitled" }.into());
+    let mut doc = Document::new(name);
+    doc.kind = kind;
+    // A property of the page from here on: a later change of theme leaves it alone. Boards are
+    // light whatever the theme.
+    let background = if kind == FileKind::Board { BOARD_PAGE } else { s.new_page_background() };
+    for page in doc.pages.clone() {
+        if let Some(NodeKind::Page { background: b, .. }) = doc.node_mut(page).map(|n| &mut n.kind) {
+            *b = background;
+        }
+    }
+    s.docs.push(DocState::new(doc, None));
+    s.active = s.docs.len() - 1;
+    Ok(json!({"index": s.active, "kind": kind.id()}))
+}
+
 pub fn specs() -> Vec<CommandSpec> {
     vec![
-        spec!("file.new", "New design file", "{name?}", false, |s, p| {
-            let name = string(p, "name").unwrap_or_else(|| "Untitled".into());
-            let mut doc = Document::new(name);
-            // A property of the page from here on: a later change of theme leaves it alone.
-            let background = s.new_page_background();
-            for page in doc.pages.clone() {
-                if let Some(NodeKind::Page { background: b, .. }) = doc.node_mut(page).map(|n| &mut n.kind) {
-                    *b = background;
-                }
-            }
-            s.docs.push(DocState::new(doc, None));
-            s.active = s.docs.len() - 1;
-            Ok(json!({"index": s.active}))
-        }),
+        spec!("file.new", "New design file", "{name?}", false, |s, p| new_file(s, p, FileKind::Design)),
+        spec!(
+            "file.newBoard",
+            "New board",
+            "{name?}  a board: sticky notes, shapes with text, connectors, marker and stamps on a light page",
+            false,
+            |s, p| new_file(s, p, FileKind::Board)
+        ),
         spec!(
             "file.open",
             "Open",
-            "{path | data (base64) + name (tells the format; opens as a new unsaved document), variables? (REST: the local variables JSON as an object, JSON text or a path; default `<name>.variables.json` or `variables.json` next to the file)} (.figcraft, .json: FigCraft or REST API file JSON, .fig (best effort), .svg, .png, .jpg …); REST and .fig imports return `warnings`",
+            "{path | data (base64) + name (tells the format; opens as a new unsaved document), variables? (REST: the local variables JSON as an object, JSON text or a path; default `<name>.variables.json` or `variables.json` next to the file)} (.figcraft, .json: FigCraft or REST API file JSON, .fig (best effort), .sketch (Sketch 48 or newer, best effort), .svg, .png, .jpg …); REST, .fig and .sketch imports return `warnings`; a file opened anew returns `summary` {name, pages, layers, images} (one that was already open just returns its `index`)",
             false,
             open
         ),
@@ -41,19 +83,38 @@ pub fn specs() -> Vec<CommandSpec> {
             false,
             open_recent
         ),
-        spec!("file.save", "Save", "{path?} (programmatic saves need a path the first time)", false, save),
-        spec!("file.saveAs", "Save as", "{path}", false, save_as),
+        spec!(
+            "file.save",
+            "Save",
+            "{path?, overwrite? (replace what another app wrote to the file since it was opened or saved: without it that save is refused)} (programmatic saves need a path the first time); a .fig path writes an experimental export copy of the shown document with `warnings`, keeping the native path, unsaved changes and version preview",
+            false,
+            save
+        ),
+        spec!(
+            "file.saveAs",
+            "Save as",
+            "{path | data: true (no path: returns the file as base64 `data` with its `name`, for a download)} (no extension adds .figcraft); a .fig path writes an experimental export copy of the shown document with `warnings`, keeping the native path, unsaved changes and version preview",
+            false,
+            save_as
+        ),
+        spec!(
+            "file.markSaved",
+            "Mark saved",
+            "{}  clears the unsaved changes of the active tab's file and its branch tabs: run it once the file from `file.saveAs {data: true}` was delivered (a refused download keeps them)",
+            false,
+            mark_saved
+        ),
         spec!(
             "file.export",
             "Export",
-            "{ids? (default selection, else the page), format? (png|jpg|svg|pdf|webp, or fig: the whole file as .fig, experimental, with `warnings` for what was left out; other apps may not open every file), scale? (default 1) | size? (2x|512w|512h or {by: scale|width|height, value}: a scale, or a width or height in pixels), path? (else returns base64 `data`), bleed? (PDF: points, or with a unit: \"3mm\", \"0.125in\", \"9pt\"), cropMarks?, bleedMarks?, cmyk? (PDF print options)}",
+            "{ids? (default selection, else the page), format? (png|jpg|svg|pdf|webp|xml (an Android Vector Drawable, with `warnings` for what it changed or left out), or fig: the whole file as .fig, experimental, with `warnings` for what was left out; other apps may not open every file), scale? (default 1) | size? (2x|512w|512h or {by: scale|width|height, value}: a scale, or a width or height in pixels), path? (else returns base64 `data`), bleed? (PDF: points, or with a unit: \"3mm\", \"0.125in\", \"9pt\"), cropMarks?, bleedMarks?, cmyk? (PDF print options), svgIdAttribute? (SVG ids, XML android:name), vdCompat? (XML: bestEffort (default: approximate with a warning)|exact (leave out what can't be exact, with a warning)|ignore (no warnings))}",
             false,
             export
         ),
         spec!(
             "file.exportLayers",
             "Export layers",
-            "{ids? (default the selection, else every layer on the page with export settings), assets? (true: the Inspect tab's assets in and under them instead: layers with export settings, icons as SVG, images as PNG), dir? (folder to write into; else each file comes back as base64 `data`), bleed? (PDF: points, or with a unit: \"3mm\", \"0.125in\", \"9pt\"), cropMarks?, bleedMarks?, cmyk? (PDF print options): for every PDF instead of each setting's own}  every layer once per export setting, named `<layer><suffix>.<format>` (\"@2x\" when a scaled export has no suffix; repeats get \" 2\"; slashes in a layer name make folders). Returns {files: [{name, id, bytes, path | data}], skipped (layers without settings)}",
+            "{ids? (default the selection, else every layer on the page with export settings), assets? (true: the Inspect tab's assets in and under them instead: layers with export settings, icons as SVG, images as PNG), dir? (folder to write into; else each file comes back as base64 `data`), zip? (no dir: the files come back together as one base64 zip `data` instead), bleed? (PDF: points, or with a unit: \"3mm\", \"0.125in\", \"9pt\"), cropMarks?, bleedMarks?, cmyk? (PDF print options): for every PDF instead of each setting's own, vdCompat? (bestEffort|exact|ignore: for every XML instead of each setting's own)}  every layer once per export setting, named `<layer><suffix>.<format>` (\"@2x\" when a scaled export has no suffix; repeats get \" 2\"; slashes in a layer name make folders). Returns {files: [{name, id, bytes, path | data, warnings (XML only)}], skipped (layers without settings), data? (zip)}",
             false,
             export_layers
         ),
@@ -74,12 +135,26 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "file.import",
             "Import",
-            "{path | data (base64) + name, x?, y?, center? (SVG: centre it on x, y), variables? (REST: the local variables JSON as an object, JSON text or a path)}  SVG becomes an editable frame (shapes, text, gradients, masks, effects; with `warnings` for what it left out), images become image layers, .figcraft, REST API file JSON and .fig pages are appended with their variables and flows (REST and .fig: with `warnings`)",
+            "{path | data (base64) + name, x?, y?, center? (SVG: centre it on x, y), variables? (REST: the local variables JSON as an object, JSON text or a path)}  SVG becomes an editable frame (shapes, text, gradients, masks, effects; with `warnings` for what it left out), images become image layers, .figcraft, REST API file JSON, .fig and .sketch pages are appended with their variables and flows (REST, .fig and .sketch: with `warnings`; those return `summary` {name, pages, layers, images} of the file read)",
             true,
             import
         ),
         spec!("file.placeImage", "Place image", "{path | data, x?, y?}", true, super::create::place_image),
         spec!("file.close", "Close tab", "{index?, force? (discard unsaved changes)}", false, close),
+        spec!("file.moveTab", "Move tab", "{from, to} (indices among open documents)", false, |s, p| {
+            let from = req_index("file.moveTab", p, "from")?;
+            let to = req_index("file.moveTab", p, "to")?;
+            if from >= s.docs.len() || to >= s.docs.len() {
+                return Err(bad("file.moveTab", "no such document"));
+            }
+            if from != to {
+                let active_uid = s.docs.get(s.active).map(|d| d.uid);
+                let doc = s.docs.remove(from);
+                s.docs.insert(to, doc);
+                s.active = active_uid.and_then(|uid| s.docs.iter().position(|d| d.uid == uid)).unwrap_or(0);
+            }
+            Ok(json!({"index": to}))
+        }),
         spec!(
             "file.recover",
             "Recover file",
@@ -114,11 +189,17 @@ pub fn specs() -> Vec<CommandSpec> {
         }),
         spec!("file.revert", "Revert to saved", "{}  leave the live session first, if any", false, |s, _| {
             let path = s.ds()?.path.clone().ok_or_else(|| EngineError::Disabled("file.revert".into(), "the file was never saved".into()))?;
+            // Stamped before reading: a change made during the read makes the next save refuse.
+            let on_disk = crate::library::stat(&path).ok();
             let (loaded, _) = load_path(&path, None)?;
             let i = s.active;
             let uid = s.ds()?.uid;
             if let Some(slot) = s.docs.get_mut(i) {
-                *slot = DocState::new(loaded.doc, Some(path)).with_versions(loaded.versions).with_branches(loaded.branches);
+                *slot = DocState::new(loaded.doc, Some(path.clone()))
+                    .with_versions(loaded.versions)
+                    .with_branches(loaded.branches)
+                    .with_images_left_in_file(&path, loaded.images_past_budget);
+                slot.on_disk = on_disk;
             }
             // Edits on its branch tabs are reverted too.
             crate::branches::close_tabs(s, uid, None);
@@ -244,644 +325,15 @@ pub fn specs() -> Vec<CommandSpec> {
     ]
 }
 
-fn version_json(index: usize, v: &Version) -> Value {
-    let mut j = json!({"id": v.id, "index": index, "name": v.name, "description": v.description, "time": v.time});
-    if v.auto {
-        j["auto"] = json!(true);
-    }
-    j
-}
-
-/// Autosaves kept per file; older ones make room for new ones.
-pub const MAX_AUTOSAVES: usize = 20;
-
-/// `version.autosave`: a checkpoint of a document with unsaved changes since the last version.
-fn autosave(s: &mut Session, _: &Value) -> Result<Value> {
-    let auto_save = s.prefs.auto_save;
-    let ds = s.ds_mut()?;
-    // A file that saves itself is rarely unsaved: edits since it was opened count then.
-    let edited = ds.is_dirty() || (auto_save && !ds.history.undo.is_empty());
-    if ds.preview.is_some() || !edited || !ds.changed_since_checkpoint() {
-        return Ok(json!({"saved": false}));
-    }
-    Ok(match add_version(ds, AUTOSAVE, "", true) {
-        Some(v) => json!({"saved": true, "version": v}),
-        None => json!({"saved": false}),
-    })
-}
-
-/// What checkpoints are called.
-const AUTOSAVE: &str = "Autosave";
-
-/// Add a version of `ds`'s document as it is now (`auto`: a checkpoint) and return it. The oldest
-/// autosave makes room when the autosaves or the history are full; versions the user named are
-/// never dropped, so a history full of them takes nothing (None).
-pub(crate) fn add_version(ds: &mut DocState, name: &str, description: &str, auto: bool) -> Option<Value> {
-    let autos = ds.versions.iter().filter(|v| v.auto).count();
-    if ((auto && autos >= MAX_AUTOSAVES) || ds.versions.len() >= figcraft_format::MAX_VERSIONS)
-        && let Some(oldest) = ds.versions.iter().position(|v| v.auto)
-    {
-        ds.versions_mut().remove(oldest);
-    }
-    if ds.versions.len() >= figcraft_format::MAX_VERSIONS {
-        return None;
-    }
-    let mut v = snapshot_version(ds, name, description);
-    v.auto = auto;
-    let out = version_json(ds.versions.len(), &v);
-    ds.versions_mut().push(v);
-    ds.mark_checkpoint();
-    Some(out)
-}
-
-/// Before the document is replaced (a restore, a merge): keep it in the history as it is, unless
-/// it is what the last version saved or restored holds.
-pub(crate) fn keep_in_history(ds: &mut DocState) {
-    if ds.branch_of.is_none() && ds.changed_since_checkpoint() {
-        add_version(ds, AUTOSAVE, "", true);
-    }
-}
-
-/// A version of `ds`'s document as it is now, opening on the page shown.
-fn snapshot_version(ds: &DocState, name: &str, description: &str) -> Version {
-    let mut snap = ds.doc.clone();
-    if snap.current_page != Some(ds.page) {
-        Arc::make_mut(&mut snap).current_page = Some(ds.page);
-    }
-    Version::new(unique_id(|id| ds.versions.iter().any(|v| v.id == id)), name, description, super::comment::now_secs(), snap)
-}
-
-fn version_list(ds: &DocState) -> Value {
-    let previewing = ds.preview.as_ref().map(|p| p.id.as_str());
-    Value::Array(
-        ds.versions
-            .iter()
-            .enumerate()
-            .map(|(i, v)| {
-                let mut j = version_json(i, v);
-                if previewing == Some(v.id.as_str()) {
-                    j["previewing"] = json!(true);
-                }
-                j
-            })
-            .collect(),
-    )
-}
-
-/// The version named by `id`, else by `index` (validated: never negative, never past the end).
-fn version_index(cmd: &str, ds: &DocState, p: &Value) -> Result<usize> {
-    if let Some(id) = string(p, "id") {
-        return ds.versions.iter().position(|v| v.id == id).ok_or_else(|| bad(cmd, format!("no version `{id}`")));
-    }
-    if get(p, "index").is_none() {
-        return Err(bad(cmd, "pass the version's `id` or `index`"));
-    }
-    let i = req_index(cmd, p, "index")?;
-    if i < ds.versions.len() { Ok(i) } else { Err(bad(cmd, format!("no version at index {i}"))) }
-}
-
-fn read_version(v: &Version) -> Result<Arc<Document>> {
-    v.document().map_err(|e| EngineError::Other(format!("version “{}” can't be read: {e}", v.name)))
-}
-
-/// A new version or branch id: the time in milliseconds (hex), not `taken`.
-pub(crate) fn unique_id(taken: impl Fn(&str) -> bool) -> String {
-    let mut n = web_time::SystemTime::now().duration_since(web_time::UNIX_EPOCH).map(|d| d.as_millis() as u64).unwrap_or(0);
-    loop {
-        let id = format!("{n:x}");
-        if !taken(&id) {
-            return id;
-        }
-        n = n.wrapping_add(1);
-    }
-}
-
-/// `file.saveVersion`; on a branch tab the version goes into the branch's own history.
-fn save_version(s: &mut Session, p: &Value) -> Result<Value> {
-    let ds = s.ds_mut()?;
-    if ds.versions.len() >= figcraft_format::MAX_VERSIONS {
-        return Err(EngineError::Disabled(
-            "file.saveVersion".into(),
-            format!("the version history is full ({} versions): delete old versions first", figcraft_format::MAX_VERSIONS),
-        ));
-    }
-    let name =
-        string(p, "name").map(|n| n.trim().to_string()).filter(|n| !n.is_empty()).unwrap_or_else(|| format!("Version {}", ds.versions.len() + 1));
-    let description = string(p, "description").unwrap_or_default();
-    // The version opens on the page shown when it was saved.
-    add_version(ds, &name, description.trim(), false).ok_or_else(|| {
-        EngineError::Disabled(
-            "file.saveVersion".into(),
-            format!("the version history is full ({} versions): delete old versions first", figcraft_format::MAX_VERSIONS),
-        )
-    })
-}
-
-fn restore_version(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "version.restore";
-    // Refused before anything goes into the history.
-    if let Some(why) = s.live_read_only(s.ds()?.uid) {
-        return Err(EngineError::Disabled(CMD.into(), why.into()));
-    }
-    let ds = s.ds_mut()?;
-    let i = version_index(CMD, ds, p)?;
-    let v = ds.versions.get(i).ok_or_else(|| bad(CMD, "no such version"))?;
-    let (id, mut doc) = (v.id.clone(), read_version(v)?);
-    // Restoring never loses work: the document as it is goes into the history first.
-    keep_in_history(ds);
-    let out = ds.versions.iter().enumerate().find(|(_, v)| v.id == id).map_or(Value::Null, |(i, v)| version_json(i, v));
-    let d = Arc::make_mut(&mut doc);
-    d.name = ds.doc.name.clone();
-    // What the file published belongs to the file, not to the version.
-    d.published = ds.doc.published.clone();
-    // Comments are a conversation about the file, kept apart from its design history: they stay,
-    // and those on layers the version doesn't have stay where they were.
-    d.comments = ds.doc.comments.clone();
-    super::comment::follow_anchors(d, &ds.doc);
-    // The snapshot is already consistent: nothing to re-normalise.
-    d.take_dirty();
-    // Stay on the current page when the version has it.
-    ds.page = Some(ds.page)
-        .filter(|pg| d.pages.contains(pg))
-        .or_else(|| d.current_page.filter(|pg| d.pages.contains(pg)))
-        .or_else(|| d.first_page())
-        .unwrap_or(ds.page);
-    ds.doc = doc;
-    ds.selection.clear();
-    ds.text_edit = None;
-    ds.vector_edit = None;
-    // The restored design is in the history already: restoring it again keeps nothing new.
-    ds.mark_checkpoint();
-    Ok(out)
-}
-
-/// The recovery copy at `path` as a document with unsaved changes and no path.
-pub(crate) fn recovered(path: &str) -> Result<DocState> {
-    let loaded = read(path).and_then(|b| figcraft_format::load_bytes_with_versions(&b).map_err(|e| EngineError::Other(e.to_string())))?;
-    Ok(DocState::new(loaded.doc, None).with_versions(loaded.versions).with_branches(loaded.branches).unsaved())
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn read(path: &str) -> Result<Vec<u8>> {
-    std::fs::read(path).map_err(|e| EngineError::Other(format!("{path}: {e}")))
-}
-
-#[cfg(target_arch = "wasm32")]
-fn read(path: &str) -> Result<Vec<u8>> {
-    Err(EngineError::Other(format!("{path}: no file system in the browser")))
-}
-
-/// The bytes of file `path`, refused when it's larger than `max`.
-pub(crate) fn read_capped(path: &str, max: u64) -> Result<Vec<u8>> {
-    let meta = std::fs::metadata(path).map_err(|e| EngineError::Other(format!("{path}: {e}")))?;
-    if !meta.is_file() || meta.len() > max {
-        return Err(EngineError::Other(format!("{path}: not a file of at most {max} bytes")));
-    }
-    read(path)
-}
-
-/// Write `bytes` to `path` through a uniquely named, exclusively created staging file and one
-/// atomic rename (see [`figcraft_format::write_file_atomic`]): a failed or interrupted write never
-/// truncates `path`, and no file or symlink at a staging name is ever written through.
-#[cfg(not(target_arch = "wasm32"))]
-pub(crate) fn write(path: &str, bytes: &[u8]) -> Result<()> {
-    figcraft_format::write_file_atomic(std::path::Path::new(path), bytes).map_err(|e| EngineError::Other(format!("{path}: {e}")))
-}
-
-#[cfg(target_arch = "wasm32")]
-pub(crate) fn write(path: &str, _bytes: &[u8]) -> Result<()> {
-    Err(EngineError::Other(format!("{path}: no file system in the browser")))
-}
-
-fn ext(path: &str) -> String {
-    std::path::Path::new(path).extension().and_then(|e| e.to_str()).unwrap_or("").to_ascii_lowercase()
-}
-
-fn file_stem(path: &str) -> String {
-    std::path::Path::new(path).file_stem().and_then(|e| e.to_str()).unwrap_or("Untitled").to_string()
-}
-
-/// Load a document from any supported file (REST API file JSON images come from an `images`
-/// folder next to the file).
-pub fn load(path: &str) -> Result<(Document, Vec<String>)> {
-    load_path(path, None).map(|(l, _)| (l.doc, l.issues))
-}
-
-pub fn load_bytes(bytes: &[u8], name_hint: &str) -> Result<(Document, Vec<String>)> {
-    load_with(bytes, name_hint, None, &figcraft_format::rest::no_images).map(|(l, _)| (l.doc, l.issues))
-}
-
-/// [`load`] with the version history, also telling whether the file was REST API file JSON. A REST
-/// import reads its variables from `variables`, else from a variables JSON next to the file.
-pub fn load_path(path: &str, variables: Option<&Value>) -> Result<(figcraft_format::Loaded, bool)> {
-    let bytes = read(path)?;
-    let sibling = if variables.is_none() { sibling_variables(path) } else { None };
-    load_with(&bytes, path, variables.or(sibling.as_ref()), &rest_images(path))
-}
-
-/// Load from bytes. Returns the document with its notes (repairs of a native file, or import
-/// warnings) and version history, and whether it was imported from REST API file JSON or a `.fig`
-/// file (such a file is never saved over). `variables`: the local variables JSON for a REST API file JSON.
-fn load_with(
-    bytes: &[u8],
-    name_hint: &str,
-    variables: Option<&Value>,
-    images: figcraft_format::rest::ImageResolver,
-) -> Result<(figcraft_format::Loaded, bool)> {
-    match ext(name_hint).as_str() {
-        "svg" => {
-            let mut doc = Document::new(file_stem(name_hint));
-            let page = doc.first_page().ok_or(EngineError::NoDocument)?;
-            let notes = figcraft_svg::import_svg_with_notes(&mut doc, bytes, page, 0.0, 0.0, &file_stem(name_hint))
-                .map_err(|e| EngineError::Other(e.to_string()))?
-                .notes;
-            Ok((figcraft_format::Loaded { issues: notes, ..doc.into() }, false))
-        }
-        "png" | "jpg" | "jpeg" | "gif" | "webp" | "bmp" | "tif" | "tiff" => {
-            let mut doc = Document::new(file_stem(name_hint));
-            let page = doc.first_page().ok_or(EngineError::NoDocument)?;
-            let (hash, w, h) = figcraft_format::add_image(&mut doc, bytes.to_vec()).map_err(|e| EngineError::Other(e.to_string()))?;
-            let id = doc.create(page, NodeKind::Rectangle, &file_stem(name_hint), 0.0, 0.0, f64::from(w), f64::from(h))?;
-            doc.get_mut(id)?.fills = vec![figcraft_color::Paint::image(hash, figcraft_color::ImageScaleMode::Fill)];
-            Ok((doc.into(), false))
-        }
-        _ => {
-            if let Some(r) = figcraft_format::fig::try_import(bytes, &file_stem(name_hint)) {
-                let (mut doc, warnings) = r.map_err(|e| EngineError::Other(e.to_string()))?;
-                link_instances(&mut doc);
-                return Ok((figcraft_format::Loaded { issues: warnings, ..doc.into() }, true));
-            }
-            if let Some(r) = figcraft_format::rest::try_import_with(bytes, variables, images) {
-                let (mut doc, warnings) = r.map_err(|e| EngineError::Other(e.to_string()))?;
-                link_instances(&mut doc);
-                return Ok((figcraft_format::Loaded { issues: warnings, ..doc.into() }, true));
-            }
-            let mut loaded = figcraft_format::load_bytes_with_versions(bytes).map_err(|e| EngineError::Other(e.to_string()))?;
-            if loaded.doc.name.is_empty() {
-                loaded.doc.name = file_stem(name_hint);
-            }
-            Ok((loaded, false))
-        }
-    }
-}
-
-/// Link imported instances to their mains (layer sources, overrides found by comparing values),
-/// innermost first so outer instances settle last.
-fn link_instances(doc: &mut Document) {
-    crate::style_vars::after_load(doc);
-    let mut insts: Vec<(usize, NodeId)> =
-        doc.nodes().filter(|n| matches!(n.kind, NodeKind::Instance { .. })).map(|n| (doc.ancestors(n.id).len(), n.id)).collect();
-    insts.sort_by_key(|a| std::cmp::Reverse(a.0));
-    for (_, i) in insts {
-        crate::components::rebase_instance(doc, i);
-    }
-}
-
-/// Largest image file read for a REST API file JSON import.
-#[cfg(not(target_arch = "wasm32"))]
-const MAX_IMAGE_FILE: u64 = 256 * 1024 * 1024;
-
-/// Image bytes for a REST API file JSON's `imageRef`: `images/<imageRef>[.png|.jpg|…]` next to
-/// the file.
-#[cfg(not(target_arch = "wasm32"))]
-fn rest_images(path: &str) -> impl Fn(&str) -> Option<Vec<u8>> {
-    let dir = std::path::Path::new(path).parent().map(|d| d.join("images"));
-    move |r: &str| {
-        // Image refs are content hashes; anything else never becomes a path.
-        if r.is_empty() || r.len() > 128 || !r.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-' || b == b'_') {
-            return None;
-        }
-        let dir = dir.as_ref()?;
-        ["", ".png", ".jpg", ".jpeg", ".gif", ".webp"].iter().find_map(|e| {
-            let p = dir.join(format!("{r}{e}"));
-            let meta = std::fs::metadata(&p).ok()?;
-            if meta.is_file() && meta.len() <= MAX_IMAGE_FILE { std::fs::read(&p).ok() } else { None }
-        })
-    }
-}
-
-#[cfg(target_arch = "wasm32")]
-fn rest_images(_path: &str) -> impl Fn(&str) -> Option<Vec<u8>> {
-    figcraft_format::rest::no_images
-}
-
-/// Largest variables JSON read from disk.
-#[cfg(not(target_arch = "wasm32"))]
-const MAX_VARIABLES_FILE: u64 = 256 * 1024 * 1024;
-
-/// A local variables JSON next to a REST API file JSON: `<name>.variables.json`, else
-/// `variables.json`.
-#[cfg(not(target_arch = "wasm32"))]
-fn sibling_variables(path: &str) -> Option<Value> {
-    if ext(path) != "json" {
-        return None;
-    }
-    let file = std::path::Path::new(path);
-    let dir = file.parent()?;
-    [format!("{}.variables.json", file_stem(path)), "variables.json".to_string()].iter().map(|n| dir.join(n)).filter(|c| c != file).find_map(|c| {
-        let meta = std::fs::metadata(&c).ok()?;
-        if !meta.is_file() || meta.len() > MAX_VARIABLES_FILE {
-            return None;
-        }
-        let v: Value = serde_json::from_slice(&std::fs::read(&c).ok()?).ok()?;
-        figcraft_format::rest::is_variables_json(&v).then_some(v)
-    })
-}
-
-#[cfg(target_arch = "wasm32")]
-fn sibling_variables(_path: &str) -> Option<Value> {
-    None
-}
-
-/// The local variables JSON a command passes as `variables`: an object, JSON text or a file path.
-pub(crate) fn variables_param(cmd: &str, p: &Value) -> Result<Option<Value>> {
-    let parse = |text: &[u8]| serde_json::from_slice::<Value>(text).map_err(|e| bad(cmd, format!("variables: {e}")));
-    let v = match get(p, "variables") {
-        None | Some(Value::Null) => return Ok(None),
-        Some(v @ Value::Object(_)) => v.clone(),
-        Some(Value::String(s)) if s.trim_start().starts_with('{') => parse(s.as_bytes())?,
-        Some(Value::String(path)) => parse(&read(path)?)?,
-        Some(_) => return Err(bad(cmd, "variables: the local variables JSON (an object, JSON text or a path)")),
-    };
-    if !figcraft_format::rest::is_variables_json(&v) {
-        return Err(bad(cmd, "variables: expected the local variables JSON (`meta.variableCollections` and `meta.variables`)"));
-    }
-    Ok(Some(v))
-}
-
-/// How many files File ▸ Open recent keeps.
-pub const MAX_RECENT: usize = 20;
-
-/// Put `path` at the top of the recent files.
-fn remember(s: &mut Session, path: &str) {
-    let r = &mut s.prefs.recent_files;
-    r.retain(|p| p != path);
-    r.insert(0, path.to_string());
-    r.truncate(MAX_RECENT);
-}
-
-fn open_recent(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "file.openRecent";
-    if p.get("clear").and_then(Value::as_bool) == Some(true) {
-        s.prefs.recent_files.clear();
-    }
-    if let Some(gone) = string(p, "remove") {
-        s.prefs.recent_files.retain(|r| *r != gone);
-    }
-    let path = match (string(p, "path"), num(p, "index")) {
-        (Some(path), _) => Some(path),
-        (None, Some(i)) => Some(s.prefs.recent_files.get(i.max(0.0) as usize).cloned().ok_or_else(|| bad(CMD, "no such recent file"))?),
-        _ => None,
-    };
-    if let Some(path) = path {
-        if !std::path::Path::new(&path).exists() {
-            s.prefs.recent_files.retain(|r| *r != path);
-            return Err(bad(CMD, format!("{path} no longer exists")));
-        }
-        return open(s, &json!({"path": path}));
-    }
-    let files: Vec<Value> = s
-        .prefs
-        .recent_files
-        .iter()
-        .map(|r| {
-            let name = std::path::Path::new(r).file_name().map_or_else(|| r.clone(), |f| f.to_string_lossy().into_owned());
-            json!({"path": r, "name": name, "exists": std::path::Path::new(r).exists()})
-        })
-        .collect();
-    Ok(json!({"files": files}))
-}
-
-fn open(s: &mut Session, p: &Value) -> Result<Value> {
-    let variables = variables_param("file.open", p)?;
-    if string(p, "path").is_none()
-        && let Some(d) = string(p, "data")
-    {
-        return open_data(s, &d, p, variables.as_ref());
-    }
-    let path = req_string("file.open", p, "path")?;
-    // Already open: switch to it.
-    if let Some(i) = s.docs.iter().position(|d| d.path.as_deref() == Some(path.as_str())) {
-        s.active = i;
-        remember(s, &path);
-        return Ok(json!({"index": i}));
-    }
-    let (loaded, rest) = load_path(&path, variables.as_ref())?;
-    remember(s, &path);
-    let native = !rest && matches!(ext(&path).as_str(), "figcraft" | "json");
-    let warnings = rest || ext(&path) == "svg";
-    // A native file that lost something (a damaged image, say): the app says so, not only the result.
-    if native && !loaded.issues.is_empty() {
-        s.message = Some(match loaded.issues.as_slice() {
-            [one] => format!("{}: {one}", file_stem(&path)),
-            more => format!("{}: {} problems were repaired or left out while opening it, e.g. {}", file_stem(&path), more.len(), more[0]),
-        });
-    }
-    s.docs.push(DocState::new(loaded.doc, native.then_some(path)).with_versions(loaded.versions).with_branches(loaded.branches));
-    s.active = s.docs.len() - 1;
-    let mut out = json!({"index": s.active});
-    out[if warnings { "warnings" } else { "repairs" }] = json!(loaded.issues);
-    Ok(out)
-}
-
-/// [`open`] for a file given as base64 `data` (a file dropped without a path on disk): `name` tells
-/// the format. It opens as a new document with no path, so the first save asks where to put it.
-fn open_data(s: &mut Session, data: &str, p: &Value, variables: Option<&Value>) -> Result<Value> {
-    let name = req_string("file.open", p, "name")?;
-    let data = data.split_once(',').map_or(data, |(_, b)| b);
-    let bytes = base64::engine::general_purpose::STANDARD.decode(data.trim()).map_err(|e| bad("file.open", e.to_string()))?;
-    let (loaded, rest) = load_with(&bytes, &name, variables, &figcraft_format::rest::no_images)?;
-    let warnings = rest || ext(&name) == "svg";
-    s.docs.push(DocState::new(loaded.doc, None).with_versions(loaded.versions).with_branches(loaded.branches));
-    s.active = s.docs.len() - 1;
-    let mut out = json!({"index": s.active});
-    out[if warnings { "warnings" } else { "repairs" }] = json!(loaded.issues);
-    Ok(out)
-}
-
-/// Thumbnail PNG of the first page's content (for file browsers / the home screen).
-pub fn thumbnail(doc: &Document) -> Option<Vec<u8>> {
-    let page = doc.first_page()?;
-    let b = doc.page_content_bounds(page)?;
-    let scale = (400.0 / b.width().max(b.height()).max(1.0)).min(2.0);
-    let view = figcraft_render::View {
-        origin: (b.x0, b.y0),
-        scale,
-        width: (b.width() * scale).ceil().max(1.0) as u32,
-        height: (b.height() * scale).ceil().max(1.0) as u32,
-    };
-    let pix = figcraft_render::render_view(doc, page, &view, &Default::default())?;
-    figcraft_render::encode_png(&pix).ok()
-}
-
-/// The `.figcraft` file for a document: content, thumbnail and version history.
-pub fn file_bytes(ds: &DocState) -> Result<Vec<u8>> {
-    FileSnapshot::of(ds).encode()
-}
-
-/// A document's file as it is at one moment, so the slow part of saving it (the thumbnail and the
-/// encoding) can run on another thread while editing goes on: [`encode`](Self::encode) there, then
-/// [`save`](Self::save) the bytes back on the session's thread.
-pub struct FileSnapshot {
-    uid: u64,
-    path: Option<String>,
-    revision: u64,
-    doc: Arc<Document>,
-    /// The document as last saved when the snapshot was taken: another save since makes it stale.
-    saved: Arc<Document>,
-    page: NodeId,
-    versions: Vec<Version>,
-    branches: Vec<figcraft_format::Branch>,
-}
-
-impl FileSnapshot {
-    pub fn of(ds: &DocState) -> Self {
-        Self {
-            uid: ds.uid,
-            path: ds.path.clone(),
-            revision: ds.revision,
-            doc: ds.doc.clone(),
-            saved: ds.saved_doc.clone(),
-            page: ds.page,
-            versions: ds.versions.clone(),
-            branches: ds.branches.clone(),
-        }
-    }
-
-    /// The file's bytes: content, thumbnail and version history.
-    pub fn encode(&self) -> Result<Vec<u8>> {
-        let mut doc = (*self.doc).clone();
-        doc.current_page = Some(self.page);
-        let thumb = thumbnail(&doc);
-        figcraft_format::save_bytes_with_history(&doc, thumb.as_deref(), &self.versions, &self.branches)
-            .map_err(|e| EngineError::Other(e.to_string()))
-    }
-
-    /// Write `bytes` (this snapshot's [`encode`](Self::encode)) to the document's file: it is saved
-    /// as of the snapshot, and edits since stay unsaved. False (nothing written) when the document
-    /// was closed, saved, reverted or given another path since: the bytes are out of date.
-    pub fn save(self, s: &mut Session, bytes: &[u8]) -> Result<bool> {
-        let Some(ds) = s.docs.iter_mut().find(|d| d.uid == self.uid && d.path == self.path && Arc::ptr_eq(&d.saved_doc, &self.saved)) else {
-            return Ok(false);
-        };
-        write(self.path.as_deref().ok_or(EngineError::NoDocument)?, bytes)?;
-        // The history or branches may have changed since: then they still count as unsaved.
-        if ds.revision == self.revision {
-            ds.versions_changed = false;
-        }
-        ds.saved_doc = self.doc;
-        ds.revision += 1;
-        branch_tabs_saved(s, self.uid);
-        Ok(true)
-    }
-}
-
-/// The branch tabs of the file in tab `uid` were saved with it.
-fn branch_tabs_saved(s: &mut Session, uid: u64) {
-    for tab in s.docs.iter_mut().filter(|d| d.branch_of.as_ref().is_some_and(|(m, _)| *m == uid)) {
-        tab.mark_saved();
-    }
-}
-
-fn color_profile(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "file.colorProfile";
-    let Some(name) = string(p, "profile") else {
-        s.request_ui("dialog.colorProfile", json!({}));
-        return Ok(json!({"profile": s.doc()?.color_profile.id(), "changed": false}));
-    };
-    let profile = figcraft_color::ColorProfile::parse(&name).ok_or_else(|| bad(cmd, "profile: srgb or displayP3"))?;
-    let convert = boolean(p, "convert").unwrap_or(true);
-    let changed = s.doc()?.color_profile != profile && s.doc_mut()?.set_color_profile(profile, convert);
-    Ok(json!({"profile": profile.id(), "changed": changed}))
-}
-
-/// Save the file of the active tab (the main file for a branch tab, with its branches).
-fn save_to(s: &mut Session, path: String) -> Result<Value> {
-    let i = crate::branches::file_tab(s);
-    let ds = s.docs.get_mut(i).ok_or(EngineError::NoDocument)?;
-    let bytes = file_bytes(ds)?;
-    write(&path, &bytes)?;
-    ds.path = Some(path.clone());
-    ds.mark_saved();
-    ds.revision += 1;
-    let uid = ds.uid;
-    branch_tabs_saved(s, uid);
-    remember(s, &path);
-    Ok(json!({"path": path, "bytes": bytes.len()}))
-}
-
-fn save(s: &mut Session, p: &Value) -> Result<Value> {
-    if let Some(path) = string(p, "path") {
-        return save_to(s, path);
-    }
-    match s.docs.get(crate::branches::file_tab(s)).ok_or(EngineError::NoDocument)?.path.clone() {
-        Some(path) => save_to(s, path),
-        None => {
-            s.request_ui("dialog.saveAs", json!({}));
-            Err(EngineError::Disabled("file.save".into(), "the file has no path yet: pass `path`".into()))
-        }
-    }
-}
-
-fn save_as(s: &mut Session, p: &Value) -> Result<Value> {
-    match string(p, "path") {
-        Some(mut path) => {
-            if ext(&path).is_empty() {
-                path.push_str(".figcraft");
-            }
-            save_to(s, path)
-        }
-        None => {
-            s.request_ui("dialog.saveAs", json!({}));
-            Err(EngineError::Disabled("file.saveAs".into(), "pass `path`".into()))
-        }
-    }
-}
-
-/// Encode `ids` (or the page) in `format` at `scale`.
-pub fn export_bytes(doc: &Document, ids: &[NodeId], format: ExportFormat, scale: f64) -> Result<Vec<u8>> {
-    export_bytes_with(doc, ids, &ExportSetting { format, ..Default::default() }, scale)
-}
-
-/// The page area exporting `ids` with `setting` covers: what they paint (a clipping frame's own
-/// area), or their boxes with "include bounding box" and for slices. Hidden layers paint nothing,
-/// so they take no room next to visible ones (a hidden-only export keeps its own area).
-pub fn export_area(doc: &Document, ids: &[NodeId], setting: &ExportSetting) -> Option<figcraft_geom::Rect> {
-    let any_visible = ids.iter().any(|i| doc.node(*i).is_some_and(|n| n.visible));
-    ids.iter()
-        .filter_map(|i| {
-            let node = doc.node(*i);
-            let slice = node.is_some_and(|n| matches!(n.kind, NodeKind::Slice));
-            if setting.include_bounding_box || slice {
-                doc.world_bounds(*i)
-            } else if any_visible && node.is_some_and(|n| !n.visible) {
-                None
-            } else {
-                figcraft_render::export_bounds(doc, *i)
-            }
-        })
-        .reduce(|a, b| a.union(b))
-}
-
-/// What an export of `ids` draws, bottom to top: the layers themselves, or (contents only off,
-/// and always for slices) every top-level layer of their page, so whatever shows in the area is in.
-fn drawn_layers(doc: &Document, ids: &[NodeId], setting: &ExportSetting) -> Vec<NodeId> {
-    let slice = ids.iter().any(|i| doc.node(*i).is_some_and(|n| matches!(n.kind, NodeKind::Slice)));
-    match ids.first().and_then(|i| doc.page_of(*i)).and_then(|p| doc.node(p)) {
-        Some(page) if slice || !setting.contents_only => page.children.clone(),
-        _ => super::edit::z_sorted(doc, ids),
-    }
-}
-
-/// [`export_bytes`] with an export setting's format and options (its size is `scale`: see
-/// [`export_scale`]): contents only, include bounding box, the SVG options and PDF print settings.
-pub fn export_bytes_with(doc: &Document, ids: &[NodeId], setting: &ExportSetting, scale: f64) -> Result<Vec<u8>> {
+/// [`export_bytes_with`] and what the export changed or left out (Android Vector Drawable only;
+/// empty for the other formats).
+pub fn export_file(doc: &Document, ids: &[NodeId], setting: &ExportSetting, scale: f64) -> Result<(Vec<u8>, Vec<String>)> {
     let nothing = || EngineError::Disabled("file.export".into(), "nothing to export".into());
     if ids.is_empty() {
         return Err(nothing());
     }
     let drawn = drawn_layers(doc, ids, setting);
-    if matches!(setting.format, ExportFormat::Svg | ExportFormat::Pdf) {
+    if setting.format.is_vector() {
         figcraft_render::check_export_depth(doc, &drawn).map_err(|e| EngineError::Other(e.to_string()))?;
     }
     let area = export_area(doc, ids, setting).ok_or_else(nothing)?;
@@ -898,405 +350,47 @@ pub fn export_bytes_with(doc: &Document, ids: &[NodeId], setting: &ExportSetting
                 simplify_stroke: setting.svg_simplify_stroke,
                 bounds: Some(area),
             };
-            figcraft_svg::try_export_svg(&doc.in_srgb(), &drawn, &opts).map(String::into_bytes).map_err(|e| match e {
+            let svg = figcraft_svg::try_export_svg(&doc.in_srgb(), &drawn, &opts).map_err(|e| match e {
                 figcraft_svg::SvgError::Empty => nothing(),
                 other => EngineError::Other(other.to_string()),
-            })
+            })?;
+            Ok((svg.into_bytes(), Vec::new()))
+        }
+        // Android colours are sRGB too.
+        ExportFormat::VectorDrawable => {
+            let compat = match setting.vd_compat {
+                VdCompat::BestEffort => figcraft_vectordrawable::Compat::BestEffort,
+                VdCompat::Exact => figcraft_vectordrawable::Compat::Exact,
+                VdCompat::Ignore => figcraft_vectordrawable::Compat::Ignore,
+            };
+            let opts = figcraft_vectordrawable::VdOptions { bounds: Some(area), include_names: setting.svg_id_attribute, compat };
+            let out = figcraft_vectordrawable::try_export(&doc.in_srgb(), &drawn, &opts).map_err(|e| match e {
+                figcraft_vectordrawable::VdError::Empty => nothing(),
+                other => EngineError::Other(other.to_string()),
+            })?;
+            Ok((out.xml.into_bytes(), out.warnings))
         }
         ExportFormat::Pdf => {
             let doc = &*doc.in_srgb();
             // Frames export one page each; anything else shares one page.
             let all_frames = own_area && ids.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.is_frame_like()));
             let groups: Vec<Vec<NodeId>> = if all_frames { ids.iter().map(|i| vec![*i]).collect() } else { vec![drawn] };
-            pdf_bytes(doc, &groups, &setting.print, (!own_area).then_some(area))
+            Ok((pdf_bytes(doc, &groups, &setting.print, (!own_area).then_some(area))?, Vec::new()))
         }
         _ => {
             let pix = figcraft_render::render_area(doc, &drawn, area, scale)
                 .ok_or_else(|| EngineError::Other("render failed (empty or too large)".into()))?;
-            figcraft_render::encode_export(&pix, setting.format, doc.color_profile).map_err(EngineError::Other)
+            Ok((figcraft_render::encode_export(&pix, setting.format, doc.color_profile).map_err(EngineError::Other)?, Vec::new()))
         }
     }
 }
 
-/// What Copy as PNG puts on the clipboard: the layers together, at 2x (in the document's colour
-/// profile; the clipboard wants sRGB).
-pub fn copy_png(doc: &Document, ids: &[NodeId]) -> Option<figcraft_render::Pixmap> {
-    let area = export_area(doc, ids, &ExportSetting::default())?;
-    figcraft_render::render_area(doc, &super::edit::z_sorted(doc, ids), area, 2.0)
-}
-
-fn export(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "file.export";
-    let fig = match string(p, "format") {
-        Some(f) => f.eq_ignore_ascii_case("fig"),
-        None => string(p, "path").is_some_and(|pp| ext(&pp) == "fig"),
-    };
-    if fig {
-        return export_fig(s, p);
+/// The `vdCompat` `p` passes: bestEffort, exact or ignore (anything else is an error).
+fn vd_compat_param(cmd: &str, p: &Value) -> Result<Option<VdCompat>> {
+    match get(p, "vdCompat") {
+        None | Some(Value::Null) => Ok(None),
+        Some(v) => v.as_str().and_then(VdCompat::from_key).map(Some).ok_or_else(|| bad(cmd, "vdCompat: bestEffort|exact|ignore")),
     }
-    let doc = s.doc()?;
-    let mut ids = targets(s, p);
-    if ids.is_empty() {
-        ids = doc.get(s.page()?)?.children.clone();
-    }
-    let mut setting = export_setting(cmd, ExportSetting::default(), p)?;
-    if string(p, "format").is_none()
-        && let Some(f) = string(p, "path").and_then(|pp| ExportFormat::from_ext(&ext(&pp)))
-    {
-        setting.format = f;
-    }
-    let scale = match size_param(cmd, p)? {
-        Some(_) => export_scale(doc, &ids, &setting),
-        None => num_or(p, "scale", 1.0).clamp(0.01, ExportSize::MAX_SCALE),
-    };
-    let format = setting.format;
-    let bytes = export_bytes_with(doc, &ids, &setting, scale)?;
-    match string(p, "path") {
-        Some(path) => {
-            write(&path, &bytes)?;
-            Ok(json!({"path": path, "bytes": bytes.len(), "format": format.ext()}))
-        }
-        None => Ok(json!({"format": format.ext(), "data": base64::engine::general_purpose::STANDARD.encode(&bytes)})),
-    }
-}
-
-/// The whole document as a `.fig` file (experimental: only round trips through our own importer
-/// are verified), with the warnings about what was left out.
-fn export_fig(s: &mut Session, p: &Value) -> Result<Value> {
-    let doc = s.doc()?;
-    let (bytes, warnings) = fig_bytes(doc)?;
-    match string(p, "path") {
-        Some(path) => {
-            write(&path, &bytes)?;
-            Ok(json!({"path": path, "bytes": bytes.len(), "format": "fig", "warnings": warnings}))
-        }
-        None => Ok(json!({"format": "fig", "data": base64::engine::general_purpose::STANDARD.encode(&bytes), "warnings": warnings})),
-    }
-}
-
-/// `doc` as a `.fig` file (with a thumbnail) and the warnings about what was left out.
-pub fn fig_bytes(doc: &Document) -> Result<(Vec<u8>, Vec<String>)> {
-    figcraft_format::fig::export(doc, thumbnail(doc).as_deref()).map_err(|e| EngineError::Other(e.to_string()))
-}
-
-/// The scale that gives `ids` (their export area together) `setting`'s export size.
-pub fn export_scale(doc: &Document, ids: &[NodeId], setting: &ExportSetting) -> f64 {
-    // Size-based exports ask for bounds before encoding. Let encoding report the depth error
-    // without entering a recursive bounds walk here; SVG/PDF do not use this raster scale.
-    if matches!(setting.format, ExportFormat::Svg | ExportFormat::Pdf) && figcraft_render::check_export_depth(doc, ids).is_err() {
-        return 1.0;
-    }
-    export_area(doc, ids, setting).map_or(1.0, |b| setting.size.scale_for(b.width(), b.height()))
-}
-
-/// `e` with the `size` ("2x", "512w", "512h" or `{by, value}`), `suffix` and `format` that `p` sets.
-pub(super) fn export_setting(cmd: &str, mut e: ExportSetting, p: &Value) -> Result<ExportSetting> {
-    if let Some(size) = size_param(cmd, p)? {
-        e.size = size;
-    }
-    if let Some(s) = string(p, "suffix") {
-        e.suffix = s.chars().filter(|c| !c.is_control()).take(200).collect();
-    }
-    if let Some(f) = string(p, "format") {
-        e.format = ExportFormat::from_ext(&f).ok_or_else(|| bad(cmd, "format: png|jpg|svg|pdf|webp"))?;
-    }
-    e.print = print_param(cmd, p, e.print)?;
-    for (key, slot) in [
-        ("contentsOnly", &mut e.contents_only),
-        ("includeBoundingBox", &mut e.include_bounding_box),
-        ("svgOutlineText", &mut e.svg_outline_text),
-        ("svgIdAttribute", &mut e.svg_id_attribute),
-        ("svgSimplifyStroke", &mut e.svg_simplify_stroke),
-    ] {
-        match get(p, key) {
-            None | Some(Value::Null) => {}
-            Some(v) => *slot = bool_of(v).ok_or_else(|| bad(cmd, format!("{key}: true or false")))?,
-        }
-    }
-    Ok(e)
-}
-
-/// Whether `p` sets any PDF print option.
-fn has_print_param(p: &Value) -> bool {
-    ["bleed", "cropMarks", "bleedMarks", "cmyk"].iter().any(|k| get(p, k).is_some_and(|v| !v.is_null()))
-}
-
-/// `base` with the PDF print options `p` sets: `bleed` (points, or a length like "3mm" or
-/// "0.125in"), `cropMarks`, `bleedMarks`, `cmyk`.
-pub(super) fn print_param(cmd: &str, p: &Value, mut base: PrintSettings) -> Result<PrintSettings> {
-    match get(p, "bleed") {
-        None | Some(Value::Null) => {}
-        Some(v) => {
-            let pt = match v {
-                Value::String(s) => PrintSettings::parse_length(s),
-                v => v.as_f64().filter(|n| n.is_finite() && *n >= 0.0),
-            };
-            base.bleed = pt
-                .filter(|b| *b <= PrintSettings::MAX_BLEED)
-                .ok_or_else(|| bad(cmd, "bleed: points, or a length like \"3mm\" or \"0.125in\" (up to 144 pt, 2 in)"))?;
-        }
-    }
-    for (key, slot) in [("cropMarks", &mut base.crop_marks), ("bleedMarks", &mut base.bleed_marks), ("cmyk", &mut base.cmyk)] {
-        match get(p, key) {
-            None | Some(Value::Null) => {}
-            Some(v) => *slot = bool_of(v).ok_or_else(|| bad(cmd, format!("{key}: true or false")))?,
-        }
-    }
-    Ok(base)
-}
-
-/// An export size passed as `size`: "2x", "512w", "512h", a number (scale) or `{by, value}`.
-fn size_param(cmd: &str, p: &Value) -> Result<Option<ExportSize>> {
-    let size = match get(p, "size") {
-        None | Some(Value::Null) => return Ok(None),
-        Some(Value::String(s)) => ExportSize::parse(s),
-        Some(Value::Number(n)) => n.as_f64().and_then(|value| ExportSize::Scale { value }.checked()),
-        Some(v) => serde_json::from_value::<ExportSize>(v.clone()).ok().and_then(ExportSize::checked),
-    };
-    size.map(Some).ok_or_else(|| bad(cmd, "size: 2x, 512w or 512h (or {by: scale|width|height, value})"))
-}
-
-/// Most files one `file.exportLayers` writes.
-const MAX_EXPORT_FILES: usize = 1000;
-
-/// One file of a layer export: the layer, its setting and the file name.
-pub struct ExportJob {
-    pub id: NodeId,
-    pub setting: ExportSetting,
-    pub file: String,
-}
-
-/// The files exporting `ids` with their export settings makes, with unique names (repeats get
-/// " 2", " 3"…). Layers without settings make none.
-pub fn export_jobs(doc: &Document, ids: &[NodeId]) -> Vec<ExportJob> {
-    jobs_for(ids.iter().filter_map(|i| Some((*i, doc.node(*i)?.exports.clone()))), doc)
-}
-
-/// The files exporting each layer with the settings beside it makes (see [`export_jobs`]).
-pub fn jobs_for(items: impl IntoIterator<Item = (NodeId, Vec<ExportSetting>)>, doc: &Document) -> Vec<ExportJob> {
-    let mut used = std::collections::BTreeSet::new();
-    let mut out = Vec::new();
-    for (id, settings) in items {
-        let Some(n) = doc.node(id) else { continue };
-        let base = export_path(&n.name);
-        for e in settings {
-            if out.len() >= MAX_EXPORT_FILES {
-                return out;
-            }
-            let stem = format!("{base}{}", safe_file_name(&e.file_suffix()));
-            let ext = e.format.ext();
-            let file =
-                (1..).map(|k| if k == 1 { format!("{stem}.{ext}") } else { format!("{stem} {k}.{ext}") }).find(|f| used.insert(f.to_lowercase()));
-            if let Some(file) = file {
-                out.push(ExportJob { id, setting: e, file });
-            }
-        }
-    }
-    out
-}
-
-/// The file path a layer name exports to, without extension: each `/` makes a folder; `.` and
-/// `..` segments are dropped, so it stays inside the export folder.
-fn export_path(name: &str) -> String {
-    let parts: Vec<String> =
-        name.split('/').map(|seg| safe_file_name(seg).trim().trim_end_matches('.').to_string()).filter(|seg| !seg.is_empty()).take(32).collect();
-    if parts.is_empty() { "Untitled".into() } else { parts.join("/") }
-}
-
-/// `name` without path separators and characters file systems reject.
-fn safe_file_name(name: &str) -> String {
-    name.chars().take(200).map(|c| if c.is_control() || "/\\:*?\"<>|".contains(c) { '_' } else { c }).collect()
-}
-
-/// Layers on `page` that have export settings (document order).
-pub fn exportable_layers(doc: &Document, page: NodeId) -> Vec<NodeId> {
-    doc.subtree(page).into_iter().skip(1).filter(|i| doc.node(*i).is_some_and(|n| !n.exports.is_empty())).collect()
-}
-
-fn export_layers(s: &mut Session, p: &Value) -> Result<Value> {
-    let cmd = "file.exportLayers";
-    let doc = s.doc()?;
-    let assets = boolean(p, "assets").unwrap_or(false);
-    let mut ids = targets(s, p);
-    if ids.is_empty() {
-        ids = if assets { vec![s.page()?] } else { exportable_layers(doc, s.page()?) };
-    }
-    let jobs = if assets { crate::devinspect::asset_jobs(doc, &ids) } else { export_jobs(doc, &ids) };
-    if jobs.is_empty() {
-        return Err(EngineError::Disabled(cmd.into(), "no export settings (add one with export.add)".into()));
-    }
-    let dir = string(p, "dir");
-    // Print options passed here stand in for every PDF setting's own.
-    let print = has_print_param(p).then(|| print_param(cmd, p, PrintSettings::default())).transpose()?;
-    let mut files = Vec::with_capacity(jobs.len());
-    for job in &jobs {
-        let setting = ExportSetting { print: print.unwrap_or(job.setting.print), ..job.setting.clone() };
-        let scale = export_scale(doc, &[job.id], &setting);
-        let bytes = export_bytes_with(doc, &[job.id], &setting, scale)?;
-        let mut f = json!({"name": job.file, "id": job.id, "bytes": bytes.len()});
-        match &dir {
-            Some(d) => {
-                let path = std::path::Path::new(d).join(&job.file);
-                // A layer name with slashes exports into folders.
-                if let Some(parent) = path.parent() {
-                    let _ = std::fs::create_dir_all(parent);
-                }
-                let path = path.to_string_lossy().to_string();
-                write(&path, &bytes)?;
-                f["path"] = json!(path);
-            }
-            None => f["data"] = json!(base64::engine::general_purpose::STANDARD.encode(&bytes)),
-        }
-        files.push(f);
-    }
-    let with_settings: std::collections::BTreeSet<NodeId> = jobs.iter().map(|j| j.id).collect();
-    Ok(json!({"files": files, "skipped": ids.len().saturating_sub(with_settings.len())}))
-}
-
-/// A PDF with one page per group of layers (an sRGB document), titled after the file; `area`
-/// sizes a single page to that page area instead of the layers' bounds.
-fn pdf_bytes(doc: &Document, groups: &[Vec<NodeId>], print: &PrintSettings, area: Option<figcraft_geom::Rect>) -> Result<Vec<u8>> {
-    let opts = figcraft_pdf::PdfOptions { title: Some(doc.name.clone()), print: *print, area, ..Default::default() };
-    figcraft_pdf::export_groups(doc, groups, &opts).map_err(|e| EngineError::Other(e.to_string()))
-}
-
-/// Every top-level frame of `page` (reading order) as one PDF page each, and the page count.
-pub fn frames_pdf(doc: &Document, page: NodeId, print: &PrintSettings) -> Result<(Vec<u8>, usize)> {
-    let mut frames = doc.top_frames(page);
-    frames.retain(|f| doc.node(*f).is_some_and(|n| n.visible));
-    if frames.is_empty() {
-        return Err(EngineError::Disabled("file.exportFramesPdf".into(), "the page has no visible frames".into()));
-    }
-    let groups: Vec<Vec<NodeId>> = frames.iter().map(|f| vec![*f]).collect();
-    Ok((pdf_bytes(&doc.in_srgb(), &groups, print, None)?, frames.len()))
-}
-
-/// Every top-level frame of a page (reading order), one PDF page each.
-fn export_frames_pdf(s: &mut Session, p: &Value) -> Result<Value> {
-    let doc = s.doc()?;
-    let page = match id(p, "page") {
-        Some(pg) if doc.node(pg).is_some_and(Node::is_page) => pg,
-        Some(_) => return Err(bad("file.exportFramesPdf", "`page` is not a page")),
-        None => s.page()?,
-    };
-    let print = print_param("file.exportFramesPdf", p, PrintSettings::default())?;
-    let (bytes, pages) = frames_pdf(doc, page, &print)?;
-    match string(p, "path") {
-        Some(path) => {
-            write(&path, &bytes)?;
-            Ok(json!({"path": path, "bytes": bytes.len(), "pages": pages}))
-        }
-        None => Ok(json!({"format": "pdf", "pages": pages, "data": base64::engine::general_purpose::STANDARD.encode(&bytes)})),
-    }
-}
-
-fn import(s: &mut Session, p: &Value) -> Result<Value> {
-    let path = string(p, "path");
-    let variables = variables_param("file.import", p)?;
-    let (bytes, name) = if let Some(path) = &path {
-        (read(path)?, path.clone())
-    } else if let Some(d) = string(p, "data") {
-        let d = d.split_once(',').map(|(_, b)| b.to_string()).unwrap_or(d);
-        (
-            base64::engine::general_purpose::STANDARD.decode(d.trim()).map_err(|e| bad("file.import", e.to_string()))?,
-            string(p, "name").unwrap_or_else(|| "import.png".into()),
-        )
-    } else {
-        return Err(bad("file.import", "pass `path` or `data`"));
-    };
-    let page = s.page()?;
-    let (x, y) = (num(p, "x"), num(p, "y"));
-    let center = s.ds().map(|d| (d.view.cx, d.view.cy)).unwrap_or((0.0, 0.0));
-    match ext(&name).as_str() {
-        "svg" => {
-            let doc = s.doc_mut()?;
-            let (x, y) = (x.unwrap_or(center.0), y.unwrap_or(center.1));
-            let imported =
-                figcraft_svg::import_svg_with_notes(doc, &bytes, page, x, y, &file_stem(&name)).map_err(|e| EngineError::Other(e.to_string()))?;
-            let id = imported.frame;
-            // Centred on the point (a paste lands in the middle of the view).
-            if boolean(p, "center").unwrap_or(false)
-                && let Some(n) = doc.node_mut(id)
-            {
-                n.transform = figcraft_geom::Affine::translate(((x - n.width / 2.0).round(), (y - n.height / 2.0).round()));
-            }
-            s.set_selection(vec![id]);
-            let mut out = json!({"id": id});
-            if !imported.notes.is_empty() {
-                out["warnings"] = json!(imported.notes);
-            }
-            Ok(out)
-        }
-        "figcraft" | "json" | "fig" => {
-            let resolver = path.as_deref().map(rest_images);
-            let images: figcraft_format::rest::ImageResolver = match &resolver {
-                Some(r) => r,
-                None => &figcraft_format::rest::no_images,
-            };
-            let sibling = if variables.is_none() { path.as_deref().and_then(sibling_variables) } else { None };
-            let (other, rest) = load_with(&bytes, &name, variables.as_ref().or(sibling.as_ref()), images)?;
-            let pages = append_pages(s.doc_mut()?, &other.doc)?;
-            let mut out = json!({"pages": pages});
-            if rest {
-                out["warnings"] = json!(other.issues);
-            }
-            Ok(out)
-        }
-        _ => {
-            let b64 = base64::engine::general_purpose::STANDARD.encode(&bytes);
-            super::create::place_image(s, &json!({"data": b64, "x": x.unwrap_or(center.0), "y": y.unwrap_or(center.1), "name": file_stem(&name)}))
-        }
-    }
-}
-
-/// Append `other`'s pages (with their settings and flows, its images, styles and variables) to
-/// `doc`. Ids are remapped across all pages at once, so instances keep their main, instance layers
-/// their source and interactions and flows their targets wherever those are. Styles, variables and
-/// collections whose id the document already has are kept as they are.
-fn append_pages(doc: &mut Document, other: &Document) -> Result<Vec<NodeId>> {
-    for (k, v) in &other.images {
-        doc.images.entry(k.clone()).or_insert_with(|| v.clone());
-    }
-    for st in &other.styles {
-        if !doc.styles.iter().any(|s| s.id == st.id) {
-            doc.styles.push(st.clone());
-        }
-    }
-    let have: std::collections::BTreeSet<String> = doc.variables.collections.iter().map(|c| c.id.clone()).collect();
-    doc.variables.collections.extend(other.variables.collections.iter().filter(|c| !have.contains(&c.id)).cloned());
-    let have: std::collections::BTreeSet<String> = doc.variables.variables.iter().map(|v| v.id.clone()).collect();
-    doc.variables.variables.extend(other.variables.variables.iter().filter(|v| !have.contains(&v.id)).cloned());
-    let mut map = std::collections::BTreeMap::new();
-    for pg in &other.pages {
-        for id in other.subtree(*pg).into_iter().skip(1) {
-            map.insert(id, doc.alloc_id());
-        }
-    }
-    let mut new_pages = Vec::new();
-    for pg in &other.pages {
-        let Some(pn) = other.node(*pg) else { continue };
-        let np = doc.add_page(&pn.name);
-        let mut kind = pn.kind.clone();
-        if let NodeKind::Page { flows, .. } = &mut kind {
-            flows.retain_mut(|f| map.get(&f.start).map(|n| f.start = *n).is_some());
-        }
-        if let Some(n) = doc.node_mut(np) {
-            n.kind = kind;
-        }
-        for c in &pn.children {
-            let nodes: Vec<Node> = other.subtree(*c).into_iter().filter_map(|i| other.node(i).cloned()).collect();
-            doc.paste_nodes(&nodes, &map, *c, np, None)?;
-        }
-        new_pages.push(np);
-    }
-    for new in map.values() {
-        let src = doc.node(*new).and_then(|n| n.source).and_then(|s| map.get(&s).copied());
-        if let (Some(src), Some(n)) = (src, doc.node_mut(*new)) {
-            n.source = Some(src);
-        }
-    }
-    crate::library::merge_store(doc, other, &map)?;
-    Ok(new_pages)
 }
 
 fn close(s: &mut Session, p: &Value) -> Result<Value> {
@@ -1308,14 +402,17 @@ fn close(s: &mut Session, p: &Value) -> Result<Value> {
         return Err(EngineError::Disabled("file.close".into(), "the document has unsaved changes (pass force: true to discard)".into()));
     }
     let uid = ds.uid;
-    s.docs.remove(i);
-    if s.active >= s.docs.len() {
-        s.active = s.docs.len().saturating_sub(1);
-    }
+    let active_uid = s.docs.get(s.active).map(|d| d.uid);
+    s.remove_tabs(|d| d.uid == uid);
+    // Removing a tab before the active one shifts its index; keep the same document selected.
+    s.active = active_uid.and_then(|a| s.docs.iter().position(|d| d.uid == a)).unwrap_or(i.min(s.docs.len().saturating_sub(1)));
     crate::branches::close_tabs(s, uid, None);
     ok()
 }
 
+#[cfg(test)]
+mod tab_order_tests;
+
 /// Ctrl+Tab / Ctrl+Shift+Tab: the next or previous open document, wrapping around.
 fn cycle_doc(s: &mut Session, dir: i64) -> Result<Value> {
     let n = s.docs.len() as i64;
@@ -1327,233 +424,10 @@ fn cycle_doc(s: &mut Session, dir: i64) -> Result<Value> {
 }
 
 #[cfg(test)]
-mod rest_import_tests {
-    use super::*;
-
-    /// A synthetic REST API file JSON: a component with a text layer, an instance of it whose text
-    /// is overridden, and an image fill.
-    fn kit() -> Value {
-        let at = |x: f64, y: f64| json!([[1, 0, x], [0, 1, y]]);
-        let label = |id: &str, text: &str| {
-            json!({"id": id, "name": "Label", "type": "TEXT", "relativeTransform": at(8.0, 8.0), "size": {"x": 40, "y": 20}, "characters": text,
-                   "style": {"fontFamily": "Inter", "fontSize": 14}, "fills": [{"type": "SOLID", "color": {"r": 0, "g": 0, "b": 0, "a": 1}}]})
-        };
-        json!({"name": "Kit", "document": {"id": "0:0", "type": "DOCUMENT", "children": [
-            {"id": "0:1", "name": "Main", "type": "CANVAS", "backgroundColor": {"r": 0.9, "g": 0.9, "b": 0.9, "a": 1}, "children": [
-                {"id": "1:1", "name": "Button", "type": "COMPONENT", "relativeTransform": at(0.0, 0.0), "size": {"x": 100, "y": 40},
-                 "fills": [{"type": "SOLID", "color": {"r": 0.2, "g": 0.4, "b": 1, "a": 1}}], "children": [label("1:2", "OK")]},
-                {"id": "2:1", "name": "Button", "type": "INSTANCE", "componentId": "1:1", "relativeTransform": at(0.0, 100.0), "size": {"x": 100, "y": 40},
-                 "fills": [{"type": "SOLID", "color": {"r": 0.2, "g": 0.4, "b": 1, "a": 1}}], "children": [label("I2:1;1:2", "Go")]},
-                {"id": "3:1", "name": "Photo", "type": "RECTANGLE", "relativeTransform": at(200.0, 0.0), "size": {"x": 30, "y": 20},
-                 "fills": [{"type": "IMAGE", "imageRef": "photo1", "scaleMode": "FILL"}]}
-            ]}
-        ]}, "components": {"1:1": {"key": "k", "name": "Button", "description": ""}}, "styles": {}})
-    }
-
-    fn instance(doc: &Document) -> &Node {
-        doc.nodes().find(|n| matches!(n.kind, NodeKind::Instance { .. })).unwrap()
-    }
-
-    #[test]
-    fn rest_json_loads_with_linked_instances() {
-        let bytes = serde_json::to_vec(&kit()).unwrap();
-        let (doc, warnings) = load_bytes(&bytes, "kit.json").unwrap();
-        assert_eq!(doc.name, "Kit");
-        assert!(warnings.iter().any(|w| w.contains("placeholder")), "{warnings:?}");
-        let inst = instance(&doc);
-        let NodeKind::Instance { component, .. } = inst.kind else { panic!() };
-        assert_eq!(inst.source, Some(component));
-        let main_label = doc.node(component).unwrap().children[0];
-        let label = doc.node(inst.children[0]).unwrap();
-        assert_eq!(label.source, Some(main_label));
-        assert!(label.overrides.contains("characters"), "{:?}", label.overrides);
-        assert!(crate::components::mirror_issues(&doc).is_empty());
-        assert!(thumbnail(&doc).is_some());
-    }
-
-    #[test]
-    fn open_takes_data_and_a_name_as_a_new_unsaved_document() {
-        let mut saved = Session::new();
-        saved.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
-        let bytes = file_bytes(saved.ds().unwrap()).unwrap();
-        let data = base64::engine::general_purpose::STANDARD.encode(&bytes);
-        let mut s = Session::new();
-        let recent = s.prefs.recent_files.clone();
-        let r = s.execute("file.open", &json!({"data": data, "name": "Dropped.figcraft"})).unwrap();
-        let open = s.docs.len();
-        assert_eq!(r["index"], open - 1, "a document of its own, made active");
-        assert_eq!(s.ds().unwrap().path, None, "no path to save over");
-        assert!(s.doc().unwrap().nodes().any(|n| matches!(n.kind, NodeKind::Rectangle)));
-        assert_eq!(s.prefs.recent_files, recent, "nothing on disk to remember");
-        assert!(s.execute("file.open", &json!({"data": data})).is_err(), "the name tells the format");
-        assert!(s.execute("file.open", &json!({"data": "not base64!", "name": "x.svg"})).is_err());
-        assert_eq!(s.docs.len(), open, "a refused open adds nothing");
-    }
-
-    #[test]
-    fn open_and_import_rest_json() {
-        let dir = std::env::temp_dir().join(format!("figcraft-rest-{}", std::process::id()));
-        std::fs::create_dir_all(dir.join("images")).unwrap();
-        let png = {
-            let mut d = Document::new("x");
-            let p = d.first_page().unwrap();
-            let id = d.create(p, NodeKind::Rectangle, "R", 0.0, 0.0, 3.0, 2.0).unwrap();
-            export_bytes(&d, &[id], ExportFormat::Png, 1.0).unwrap()
-        };
-        std::fs::write(dir.join("images").join("photo1.png"), &png).unwrap();
-        let path = dir.join("kit.json");
-        std::fs::write(&path, serde_json::to_vec(&kit()).unwrap()).unwrap();
-        let path = path.to_string_lossy().to_string();
-
-        let mut s = Session::new();
-        let r = s.execute("file.open", &json!({"path": path})).unwrap();
-        assert!(r["warnings"].as_array().is_some_and(|w| w.iter().all(|w| !w.as_str().unwrap_or("").contains("placeholder"))), "{r}");
-        assert!(r.get("repairs").is_none());
-        assert_eq!(s.ds().unwrap().path, None, "an import is never saved over its JSON");
-        let doc = s.doc().unwrap();
-        let photo = doc.nodes().find(|n| n.name == "Photo").unwrap();
-        let figcraft_color::PaintKind::Image(img) = &photo.fills[0].kind else { panic!() };
-        assert_eq!(doc.images.get(&img.image).map(|i| (i.width, i.height)), Some((3, 2)), "read from images/ next to the file");
-
-        // Import into another document: pages are appended and references follow the new ids.
-        let mut s = Session::new();
-        let data = base64::engine::general_purpose::STANDARD.encode(serde_json::to_vec(&kit()).unwrap());
-        let r = s.execute("file.import", &json!({"data": data, "name": "kit.json"})).unwrap();
-        assert_eq!(r["pages"].as_array().map(Vec::len), Some(1));
-        assert!(r["warnings"].is_array(), "{r}");
-        let doc = s.doc().unwrap();
-        assert_eq!(doc.pages.len(), 2);
-        let page = doc.node(doc.pages[1]).unwrap();
-        assert!(matches!(page.kind, NodeKind::Page { background, .. } if (background.r - 0.9).abs() < 1e-6));
-        let inst = instance(doc);
-        let NodeKind::Instance { component, .. } = inst.kind else { panic!() };
-        assert!(doc.node(component).is_some_and(|c| matches!(c.kind, NodeKind::Component { .. })));
-        let label = doc.node(inst.children[0]).unwrap();
-        assert!(label.source.is_some_and(|src| doc.is_ancestor(component, src)));
-        assert!(crate::components::mirror_issues(doc).is_empty());
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-}
+mod rest_import_tests;
 
 #[cfg(test)]
-mod staging_write_tests {
-    use super::*;
+mod staging_write_tests;
 
-    fn dir(name: &str) -> std::path::PathBuf {
-        let d = std::env::temp_dir().join(format!("figcraft-engine-staging-{name}-{}", std::process::id()));
-        std::fs::create_dir_all(&d).unwrap();
-        d
-    }
-
-    /// A symlink `from` → `to`; false when the platform won't make one (Windows needs privileges).
-    #[cfg(unix)]
-    fn symlink(from: &std::path::Path, to: &std::path::Path) -> bool {
-        std::os::unix::fs::symlink(to, from).is_ok()
-    }
-
-    #[cfg(windows)]
-    fn symlink(from: &std::path::Path, to: &std::path::Path) -> bool {
-        std::os::windows::fs::symlink_file(to, from).is_ok()
-    }
-
-    #[test]
-    fn an_existing_staging_file_is_never_written_through() {
-        let d = dir("existing");
-        let path = d.join("shot.svg");
-        // The old deterministic staging name, held by an unrelated file: the write must pick its
-        // own staging name instead of truncating this one.
-        let old = d.join("shot.svg.tmp-figcraft");
-        std::fs::write(&old, b"not yours").unwrap();
-        write(&path.to_string_lossy(), b"<svg/>").unwrap();
-        assert_eq!(std::fs::read(&path).unwrap(), b"<svg/>");
-        assert_eq!(std::fs::read(&old).unwrap(), b"not yours", "an unrelated file at a staging name is untouched");
-        // Just the file and the untouched staging file: no new staging leftovers.
-        assert_eq!(std::fs::read_dir(&d).unwrap().count(), 2);
-        let _ = std::fs::remove_dir_all(&d);
-    }
-
-    #[test]
-    fn a_staging_symlink_is_never_followed() {
-        let d = dir("symlink");
-        let path = d.join("shot.svg");
-        let victim = d.join("victim.txt");
-        std::fs::write(&victim, b"innocent").unwrap();
-        let old = d.join("shot.svg.tmp-figcraft");
-        if !symlink(&old, &victim) {
-            return; // Making a symlink needs privileges on some Windows setups.
-        }
-        write(&path.to_string_lossy(), b"<svg/>").unwrap();
-        assert_eq!(std::fs::read(&victim).unwrap(), b"innocent", "the symlink was never written through");
-        assert_eq!(std::fs::read(&path).unwrap(), b"<svg/>");
-        let _ = std::fs::remove_dir_all(&d);
-    }
-
-    #[test]
-    fn concurrent_writers_of_one_file_never_interleave() {
-        let d = dir("concurrent");
-        let path = d.join("shot.svg");
-        for round in 0..5u8 {
-            let mut handles = Vec::new();
-            for w in 0u8..4 {
-                let (path, bytes) = (path.clone(), vec![b'0' + w; 8192]);
-                handles.push(std::thread::spawn(move || write(&path.to_string_lossy(), &bytes)));
-            }
-            let mut wins = 0;
-            for h in handles {
-                // On Windows a rename over a file another writer just replaced can lose the race.
-                if h.join().unwrap().is_ok() {
-                    wins += 1;
-                }
-            }
-            assert!(wins > 0, "round {round}: every writer lost");
-            // Whatever landed is one writer's complete payload, never a mix.
-            let got = std::fs::read(&path).unwrap();
-            assert_eq!(got.len(), 8192, "round {round}: a complete payload landed");
-            assert!(got.windows(2).all(|w| w[0] == w[1]), "round {round}: one writer's payload, not a mix");
-        }
-        // No staging file was left stuck (a failed writer removes its own).
-        let left = std::fs::read_dir(&d).unwrap().count();
-        assert!(left <= if cfg!(windows) { 5 } else { 1 }, "{left} files left in the staging directory");
-        let _ = std::fs::remove_dir_all(&d);
-    }
-
-    #[test]
-    fn a_failed_write_leaves_the_destination_alone_and_cleans_up() {
-        let d = dir("failure");
-        // The destination is a directory: the rename fails, our staging file is removed and the
-        // directory is untouched.
-        let taken = d.join("over-a-directory");
-        std::fs::create_dir_all(&taken).unwrap();
-        assert!(write(&taken.to_string_lossy(), b"payload").is_err());
-        assert!(taken.is_dir());
-        assert_eq!(std::fs::read_dir(&d).unwrap().count(), 1, "no staging file left behind");
-        // A missing parent directory fails without creating anything anywhere.
-        assert!(write(&d.join("no").join("such.svg").to_string_lossy(), b"payload").is_err());
-        assert!(!d.join("no").exists());
-        #[cfg(unix)]
-        {
-            use std::os::unix::fs::PermissionsExt;
-            // A read-only directory refuses the staging file, and the old destination stays.
-            let ro = d.join("read-only");
-            std::fs::create_dir_all(&ro).unwrap();
-            let dest = ro.join("keep.svg");
-            std::fs::write(&dest, b"keep").unwrap();
-            let mut perms = std::fs::metadata(&ro).unwrap().permissions();
-            perms.set_mode(0o500);
-            std::fs::set_permissions(&ro, perms).unwrap();
-            // Running as root would defeat the read-only directory: skip instead of failing.
-            let probe = ro.join(".probe");
-            if std::fs::write(&probe, b"").is_ok() {
-                let _ = std::fs::remove_file(&probe);
-            } else {
-                assert!(write(&dest.to_string_lossy(), b"payload").is_err());
-                assert_eq!(std::fs::read(&dest).unwrap(), b"keep");
-                assert_eq!(std::fs::read_dir(&ro).unwrap().count(), 1, "no staging file left behind");
-            }
-            let mut perms = std::fs::metadata(&ro).unwrap().permissions();
-            perms.set_mode(0o700);
-            std::fs::set_permissions(&ro, perms).unwrap();
-        }
-        let _ = std::fs::remove_dir_all(&d);
-    }
-}
+#[cfg(test)]
+mod zip_cap_tests;
diff --git a/crates/engine/src/cmd/file/export.rs b/crates/engine/src/cmd/file/export.rs
new file mode 100644
index 00000000..005afe6f
--- /dev/null
+++ b/crates/engine/src/cmd/file/export.rs
@@ -0,0 +1,383 @@
+use super::load::{ext, write};
+use super::save::thumbnail;
+use super::*;
+
+/// Encode `ids` (or the page) in `format` at `scale`.
+pub fn export_bytes(doc: &Document, ids: &[NodeId], format: ExportFormat, scale: f64) -> Result<Vec<u8>> {
+    export_bytes_with(doc, ids, &ExportSetting { format, ..Default::default() }, scale)
+}
+
+/// The page area exporting `ids` with `setting` covers: what they paint (a clipping frame's own
+/// area), or their boxes with "include bounding box" and for slices. Hidden layers paint nothing,
+/// so they take no room next to visible ones (a hidden-only export keeps its own area).
+pub fn export_area(doc: &Document, ids: &[NodeId], setting: &ExportSetting) -> Option<figcraft_geom::Rect> {
+    let any_visible = ids.iter().any(|i| doc.node(*i).is_some_and(|n| n.visible));
+    ids.iter()
+        .filter_map(|i| {
+            let node = doc.node(*i);
+            let slice = node.is_some_and(|n| matches!(n.kind, NodeKind::Slice));
+            if setting.include_bounding_box || slice {
+                doc.world_bounds(*i)
+            } else if any_visible && node.is_some_and(|n| !n.visible) {
+                None
+            } else {
+                figcraft_render::export_bounds(doc, *i)
+            }
+        })
+        .reduce(|a, b| a.union(b))
+}
+
+/// What an export of `ids` draws, bottom to top: the layers themselves, or (contents only off)
+/// every top-level layer of their page, so whatever shows in the area is in. A slice paints nothing
+/// itself: with contents only on, a slice inside a frame or group draws that frame or group, and a
+/// slice anywhere else draws every top-level layer of its page.
+pub fn drawn_layers(doc: &Document, ids: &[NodeId], setting: &ExportSetting) -> Vec<NodeId> {
+    let Some(page) = ids.first().and_then(|i| doc.page_of(*i)).and_then(|p| doc.node(p)) else {
+        return crate::cmd::edit::z_sorted(doc, ids);
+    };
+    if !setting.contents_only {
+        return page.children.clone();
+    }
+    let mut own = Vec::with_capacity(ids.len());
+    for &i in ids {
+        if !doc.node(i).is_some_and(|n| matches!(n.kind, NodeKind::Slice)) {
+            own.push(i);
+            continue;
+        }
+        match slice_container(doc, i) {
+            Some(c) => own.push(c),
+            None => return page.children.clone(),
+        }
+    }
+    own.sort_unstable();
+    own.dedup();
+    crate::cmd::edit::z_sorted(doc, &crate::cmd::edit::roots(doc, &own))
+}
+
+/// The frame or group a slice sits in: None on the page or in a section.
+fn slice_container(doc: &Document, slice: NodeId) -> Option<NodeId> {
+    let parent = doc.node(slice)?.parent?;
+    doc.node(parent).is_some_and(|p| p.kind.is_frame_like() || matches!(p.kind, NodeKind::Group)).then_some(parent)
+}
+
+/// [`export_bytes`] with an export setting's format and options (its size is `scale`: see
+/// [`export_scale`]): contents only, include bounding box, the SVG, PDF and Vector Drawable options.
+pub fn export_bytes_with(doc: &Document, ids: &[NodeId], setting: &ExportSetting, scale: f64) -> Result<Vec<u8>> {
+    export_file(doc, ids, setting, scale).map(|(bytes, _)| bytes)
+}
+
+/// What Copy as PNG puts on the clipboard: the layers together, at 2x (in the document's colour
+/// profile; the clipboard wants sRGB).
+pub fn copy_png(doc: &Document, ids: &[NodeId]) -> Option<figcraft_render::Pixmap> {
+    let area = export_area(doc, ids, &ExportSetting::default())?;
+    figcraft_render::render_area(doc, &crate::cmd::edit::z_sorted(doc, ids), area, 2.0)
+}
+
+pub(super) fn export(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "file.export";
+    let fig = match string(p, "format") {
+        Some(f) => f.eq_ignore_ascii_case("fig"),
+        None => string(p, "path").is_some_and(|pp| ext(&pp) == "fig"),
+    };
+    if fig {
+        return export_fig(s, p);
+    }
+    let doc = s.doc()?;
+    let mut ids = targets(s, p);
+    if ids.is_empty() {
+        ids = doc.get(s.page()?)?.children.clone();
+    }
+    let mut setting = export_setting(cmd, ExportSetting::default(), p)?;
+    if string(p, "format").is_none()
+        && let Some(f) = string(p, "path").and_then(|pp| ExportFormat::from_ext(&ext(&pp)))
+    {
+        setting.format = f;
+    }
+    let scale = match size_param(cmd, p)? {
+        Some(_) => export_scale(doc, &ids, &setting),
+        None => num_or(p, "scale", 1.0).clamp(0.01, ExportSize::MAX_SCALE),
+    };
+    let format = setting.format;
+    let (bytes, warnings) = export_file(doc, &ids, &setting, scale)?;
+    let mut out = match string(p, "path") {
+        Some(path) => {
+            write(&path, &bytes)?;
+            json!({"path": path, "bytes": bytes.len(), "format": format.ext()})
+        }
+        None => json!({"format": format.ext(), "data": base64::engine::general_purpose::STANDARD.encode(&bytes)}),
+    };
+    // Android Vector Drawables say what they changed or left out (an empty list when nothing).
+    if format == ExportFormat::VectorDrawable {
+        out["warnings"] = json!(warnings);
+    }
+    Ok(out)
+}
+
+/// The whole document as a `.fig` file (experimental: only round trips through our own importer
+/// are verified), with the warnings about what was left out.
+pub(super) fn export_fig(s: &mut Session, p: &Value) -> Result<Value> {
+    let doc = s.doc()?;
+    let (bytes, warnings) = fig_bytes(doc)?;
+    match string(p, "path") {
+        Some(path) => {
+            write(&path, &bytes)?;
+            Ok(json!({"path": path, "bytes": bytes.len(), "format": "fig", "warnings": warnings}))
+        }
+        None => Ok(json!({"format": "fig", "data": base64::engine::general_purpose::STANDARD.encode(&bytes), "warnings": warnings})),
+    }
+}
+
+/// `doc` as a `.fig` file (with a thumbnail) and the warnings about what was left out.
+pub fn fig_bytes(doc: &Document) -> Result<(Vec<u8>, Vec<String>)> {
+    figcraft_format::fig::export(doc, thumbnail(doc).as_deref()).map_err(|e| EngineError::Other(e.to_string()))
+}
+
+/// The scale that gives `ids` (their export area together) `setting`'s export size.
+pub fn export_scale(doc: &Document, ids: &[NodeId], setting: &ExportSetting) -> f64 {
+    // Size-based exports ask for bounds before encoding. Let encoding report the depth error
+    // without entering a recursive bounds walk here; SVG/PDF do not use this raster scale.
+    if setting.format.is_vector() && figcraft_render::check_export_depth(doc, ids).is_err() {
+        return 1.0;
+    }
+    export_area(doc, ids, setting).map_or(1.0, |b| setting.size.scale_for(b.width(), b.height()))
+}
+
+/// `e` with the `size` ("2x", "512w", "512h" or `{by, value}`), `suffix` and `format` that `p` sets.
+pub(in crate::cmd) fn export_setting(cmd: &str, mut e: ExportSetting, p: &Value) -> Result<ExportSetting> {
+    if let Some(size) = size_param(cmd, p)? {
+        e.size = size;
+    }
+    if let Some(s) = string(p, "suffix") {
+        e.suffix = s.chars().filter(|c| !c.is_control()).take(200).collect();
+    }
+    if let Some(f) = string(p, "format") {
+        e.format = ExportFormat::from_ext(&f).ok_or_else(|| bad(cmd, "format: png|jpg|svg|pdf|webp|xml"))?;
+    }
+    if let Some(c) = vd_compat_param(cmd, p)? {
+        e.vd_compat = c;
+    }
+    e.print = print_param(cmd, p, e.print)?;
+    for (key, slot) in [
+        ("contentsOnly", &mut e.contents_only),
+        ("includeBoundingBox", &mut e.include_bounding_box),
+        ("svgOutlineText", &mut e.svg_outline_text),
+        ("svgIdAttribute", &mut e.svg_id_attribute),
+        ("svgSimplifyStroke", &mut e.svg_simplify_stroke),
+    ] {
+        match get(p, key) {
+            None | Some(Value::Null) => {}
+            Some(v) => *slot = bool_of(v).ok_or_else(|| bad(cmd, format!("{key}: true or false")))?,
+        }
+    }
+    Ok(e)
+}
+
+/// Whether `p` sets any PDF print option.
+fn has_print_param(p: &Value) -> bool {
+    ["bleed", "cropMarks", "bleedMarks", "cmyk"].iter().any(|k| get(p, k).is_some_and(|v| !v.is_null()))
+}
+
+/// `base` with the PDF print options `p` sets: `bleed` (points, or a length like "3mm" or
+/// "0.125in"), `cropMarks`, `bleedMarks`, `cmyk`.
+pub(in crate::cmd) fn print_param(cmd: &str, p: &Value, mut base: PrintSettings) -> Result<PrintSettings> {
+    match get(p, "bleed") {
+        None | Some(Value::Null) => {}
+        Some(v) => {
+            let pt = match v {
+                Value::String(s) => PrintSettings::parse_length(s),
+                v => v.as_f64().filter(|n| n.is_finite() && *n >= 0.0),
+            };
+            base.bleed = pt
+                .filter(|b| *b <= PrintSettings::MAX_BLEED)
+                .ok_or_else(|| bad(cmd, "bleed: points, or a length like \"3mm\" or \"0.125in\" (up to 144 pt, 2 in)"))?;
+        }
+    }
+    for (key, slot) in [("cropMarks", &mut base.crop_marks), ("bleedMarks", &mut base.bleed_marks), ("cmyk", &mut base.cmyk)] {
+        match get(p, key) {
+            None | Some(Value::Null) => {}
+            Some(v) => *slot = bool_of(v).ok_or_else(|| bad(cmd, format!("{key}: true or false")))?,
+        }
+    }
+    Ok(base)
+}
+
+/// An export size passed as `size`: "2x", "512w", "512h", a number (scale) or `{by, value}`.
+fn size_param(cmd: &str, p: &Value) -> Result<Option<ExportSize>> {
+    let size = match get(p, "size") {
+        None | Some(Value::Null) => return Ok(None),
+        Some(Value::String(s)) => ExportSize::parse(s),
+        Some(Value::Number(n)) => n.as_f64().and_then(|value| ExportSize::Scale { value }.checked()),
+        Some(v) => serde_json::from_value::<ExportSize>(v.clone()).ok().and_then(ExportSize::checked),
+    };
+    size.map(Some).ok_or_else(|| bad(cmd, "size: 2x, 512w or 512h (or {by: scale|width|height, value})"))
+}
+
+/// Most files one `file.exportLayers` writes.
+const MAX_EXPORT_FILES: usize = 1000;
+
+/// Most bytes the files of one zip export add up to: the files, the archive and its base64 copy
+/// are all in memory at once (in the browser too).
+const MAX_ZIP_BYTES: usize = 256 << 20;
+
+/// Keep `bytes` as zip member `name`, unless the members would pass `limit` bytes together.
+pub(super) fn add_member<'a>(members: &mut Vec<(&'a str, Vec<u8>)>, name: &'a str, bytes: Vec<u8>, limit: usize) -> Result<()> {
+    let total = members.iter().map(|(_, b)| b.len()).sum::<usize>().saturating_add(bytes.len());
+    if total > limit {
+        let mb = limit >> 20;
+        return Err(bad("file.exportLayers", format!("the files would pass {mb} MB as one zip: export fewer layers at a time, or to a folder")));
+    }
+    members.push((name, bytes));
+    Ok(())
+}
+
+/// One file of a layer export: the layer, its setting and the file name.
+pub struct ExportJob {
+    pub id: NodeId,
+    pub setting: ExportSetting,
+    pub file: String,
+}
+
+/// The files exporting `ids` with their export settings makes, with unique names (repeats get
+/// " 2", " 3"…). Layers without settings make none.
+pub fn export_jobs(doc: &Document, ids: &[NodeId]) -> Vec<ExportJob> {
+    jobs_for(ids.iter().filter_map(|i| Some((*i, doc.node(*i)?.exports.clone()))), doc)
+}
+
+/// The files exporting each layer with the settings beside it makes (see [`export_jobs`]).
+pub fn jobs_for(items: impl IntoIterator<Item = (NodeId, Vec<ExportSetting>)>, doc: &Document) -> Vec<ExportJob> {
+    let mut used = std::collections::BTreeSet::new();
+    let mut out = Vec::new();
+    for (id, settings) in items {
+        let Some(n) = doc.node(id) else { continue };
+        let base = export_path(&n.name);
+        for e in settings {
+            if out.len() >= MAX_EXPORT_FILES {
+                return out;
+            }
+            let stem = format!("{base}{}", safe_file_name(&e.file_suffix()));
+            let ext = e.format.ext();
+            let file =
+                (1..).map(|k| if k == 1 { format!("{stem}.{ext}") } else { format!("{stem} {k}.{ext}") }).find(|f| used.insert(f.to_lowercase()));
+            if let Some(file) = file {
+                out.push(ExportJob { id, setting: e, file });
+            }
+        }
+    }
+    out
+}
+
+/// The file path a layer name exports to, without extension: each `/` makes a folder; `.` and
+/// `..` segments are dropped, so it stays inside the export folder.
+fn export_path(name: &str) -> String {
+    let parts: Vec<String> =
+        name.split('/').map(|seg| safe_file_name(seg).trim().trim_end_matches('.').to_string()).filter(|seg| !seg.is_empty()).take(32).collect();
+    if parts.is_empty() { "Untitled".into() } else { parts.join("/") }
+}
+
+/// Characters no file name may contain (path separators and ones file systems reject).
+pub(crate) const FORBIDDEN_FILE_NAME_CHARS: &str = "/\\:*?\"<>|";
+
+/// `name` without path separators and characters file systems reject (`/ \ : * ? " < > |` and
+/// control characters become `_`); everything else is kept, up to the first 200 characters.
+/// `figcraft-cli export` names its files by this rule too (and keeps at most 100 characters before
+/// the number and extension it adds).
+pub fn safe_file_name(name: &str) -> String {
+    name.chars().take(200).map(|c| if c.is_control() || FORBIDDEN_FILE_NAME_CHARS.contains(c) { '_' } else { c }).collect()
+}
+
+/// Layers on `page` that have export settings (document order).
+pub fn exportable_layers(doc: &Document, page: NodeId) -> Vec<NodeId> {
+    doc.subtree(page).into_iter().skip(1).filter(|i| doc.node(*i).is_some_and(|n| !n.exports.is_empty())).collect()
+}
+
+pub(super) fn export_layers(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "file.exportLayers";
+    let doc = s.doc()?;
+    let assets = boolean(p, "assets").unwrap_or(false);
+    let mut ids = targets(s, p);
+    if ids.is_empty() {
+        ids = if assets { vec![s.page()?] } else { exportable_layers(doc, s.page()?) };
+    }
+    let jobs = if assets { crate::devinspect::asset_jobs(doc, &ids) } else { export_jobs(doc, &ids) };
+    if jobs.is_empty() {
+        return Err(EngineError::Disabled(cmd.into(), "no export settings (add one with export.add)".into()));
+    }
+    let dir = string(p, "dir");
+    // The browser saves one download at a time: several files go as one zip (#969).
+    let zip = dir.is_none() && boolean(p, "zip").unwrap_or(false);
+    let mut members = Vec::new();
+    // Print options passed here stand in for every PDF setting's own.
+    let print = has_print_param(p).then(|| print_param(cmd, p, PrintSettings::default())).transpose()?;
+    // And a compatibility mode for every Android Vector Drawable.
+    let compat = vd_compat_param(cmd, p)?;
+    let mut files = Vec::with_capacity(jobs.len());
+    for job in &jobs {
+        let setting =
+            ExportSetting { print: print.unwrap_or(job.setting.print), vd_compat: compat.unwrap_or(job.setting.vd_compat), ..job.setting.clone() };
+        let scale = export_scale(doc, &[job.id], &setting);
+        let (bytes, warnings) = export_file(doc, &[job.id], &setting, scale)?;
+        let mut f = json!({"name": job.file, "id": job.id, "bytes": bytes.len()});
+        if setting.format == ExportFormat::VectorDrawable {
+            f["warnings"] = json!(warnings);
+        }
+        match &dir {
+            Some(d) => {
+                let path = std::path::Path::new(d).join(&job.file);
+                // A layer name with slashes exports into folders.
+                if let Some(parent) = path.parent() {
+                    let _ = crate::file_access::create_dir_all(parent);
+                }
+                let path = path.to_string_lossy().to_string();
+                write(&path, &bytes)?;
+                f["path"] = json!(path);
+            }
+            None if zip => add_member(&mut members, job.file.as_str(), bytes, MAX_ZIP_BYTES)?,
+            None => f["data"] = json!(base64::engine::general_purpose::STANDARD.encode(&bytes)),
+        }
+        files.push(f);
+    }
+    let with_settings: std::collections::BTreeSet<NodeId> = jobs.iter().map(|j| j.id).collect();
+    let mut r = json!({"files": files, "skipped": ids.len().saturating_sub(with_settings.len())});
+    if zip {
+        let archive = figcraft_format::zip_files(members.iter().map(|(n, b)| (*n, b.as_slice()))).map_err(|e| EngineError::Other(e.to_string()))?;
+        r["data"] = json!(base64::engine::general_purpose::STANDARD.encode(&archive));
+    }
+    Ok(r)
+}
+
+/// A PDF with one page per group of layers (an sRGB document), titled after the file; `area`
+/// sizes a single page to that page area instead of the layers' bounds.
+pub(super) fn pdf_bytes(doc: &Document, groups: &[Vec<NodeId>], print: &PrintSettings, area: Option<figcraft_geom::Rect>) -> Result<Vec<u8>> {
+    let opts = figcraft_pdf::PdfOptions { title: Some(doc.name.clone()), print: *print, area, ..Default::default() };
+    figcraft_pdf::export_groups(doc, groups, &opts).map_err(|e| EngineError::Other(e.to_string()))
+}
+
+/// Every top-level frame of `page` (reading order) as one PDF page each, and the page count.
+pub fn frames_pdf(doc: &Document, page: NodeId, print: &PrintSettings) -> Result<(Vec<u8>, usize)> {
+    let mut frames = doc.top_frames(page);
+    frames.retain(|f| doc.node(*f).is_some_and(|n| n.visible));
+    if frames.is_empty() {
+        return Err(EngineError::Disabled("file.exportFramesPdf".into(), "the page has no visible frames".into()));
+    }
+    let groups: Vec<Vec<NodeId>> = frames.iter().map(|f| vec![*f]).collect();
+    Ok((pdf_bytes(&doc.in_srgb(), &groups, print, None)?, frames.len()))
+}
+
+/// Every top-level frame of a page (reading order), one PDF page each.
+pub(super) fn export_frames_pdf(s: &mut Session, p: &Value) -> Result<Value> {
+    let doc = s.doc()?;
+    let page = match id(p, "page") {
+        Some(pg) if doc.node(pg).is_some_and(Node::is_page) => pg,
+        Some(_) => return Err(bad("file.exportFramesPdf", "`page` is not a page")),
+        None => s.page()?,
+    };
+    let print = print_param("file.exportFramesPdf", p, PrintSettings::default())?;
+    let (bytes, pages) = frames_pdf(doc, page, &print)?;
+    match string(p, "path") {
+        Some(path) => {
+            write(&path, &bytes)?;
+            Ok(json!({"path": path, "bytes": bytes.len(), "pages": pages}))
+        }
+        None => Ok(json!({"format": "pdf", "pages": pages, "data": base64::engine::general_purpose::STANDARD.encode(&bytes)})),
+    }
+}
diff --git a/crates/engine/src/cmd/file/load.rs b/crates/engine/src/cmd/file/load.rs
new file mode 100644
index 00000000..071c651e
--- /dev/null
+++ b/crates/engine/src/cmd/file/load.rs
@@ -0,0 +1,416 @@
+use super::*;
+
+/// The recovery copy at `path` as a document with unsaved changes and no path.
+pub(crate) fn recovered(path: &str) -> Result<DocState> {
+    let loaded = read(path).and_then(|b| figcraft_format::load_bytes_with_versions(&b).map_err(|e| EngineError::Other(e.to_string())))?;
+    Ok(DocState::new(loaded.doc, None).with_versions(loaded.versions).with_branches(loaded.branches).unsaved())
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub(super) fn read(path: &str) -> Result<Vec<u8>> {
+    crate::file_access::read(path)
+}
+
+#[cfg(target_arch = "wasm32")]
+pub(super) fn read(path: &str) -> Result<Vec<u8>> {
+    Err(EngineError::Other(format!("{path}: no file system in the browser")))
+}
+
+/// The bytes of file `path`, refused when it's larger than `max`.
+pub(crate) fn read_capped(path: &str, max: u64) -> Result<Vec<u8>> {
+    crate::file_access::read_capped(path, max)
+}
+
+/// Write `bytes` to `path` through a uniquely named, exclusively created staging file and one
+/// atomic rename (see [`figcraft_format::write_file_atomic`]): a failed or interrupted write never
+/// truncates `path`, and no file or symlink at a staging name is ever written through.
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) fn write(path: &str, bytes: &[u8]) -> Result<()> {
+    crate::file_access::write(path, bytes)
+}
+
+#[cfg(target_arch = "wasm32")]
+pub(crate) fn write(path: &str, _bytes: &[u8]) -> Result<()> {
+    Err(EngineError::Other(format!("{path}: no file system in the browser")))
+}
+
+pub(super) fn ext(path: &str) -> String {
+    std::path::Path::new(path).extension().and_then(std::ffi::OsStr::to_str).unwrap_or("").to_ascii_lowercase()
+}
+
+pub(super) fn file_stem(path: &str) -> String {
+    std::path::Path::new(path).file_stem().and_then(std::ffi::OsStr::to_str).unwrap_or("Untitled").to_string()
+}
+
+/// The counts the import report shows for a freshly loaded document.
+pub(super) fn import_summary(doc: &Document) -> Value {
+    json!({"name": doc.name, "pages": doc.pages.len(), "layers": doc.nodes().filter(|n| !n.is_page()).count(), "images": doc.images.len()})
+}
+
+/// Load a document from any supported file (REST API file JSON images come from an `images`
+/// folder next to the file).
+pub fn load(path: &str) -> Result<(Document, Vec<String>)> {
+    load_path(path, None).map(|(l, _)| (l.doc, l.issues))
+}
+
+pub fn load_bytes(bytes: &[u8], name_hint: &str) -> Result<(Document, Vec<String>)> {
+    load_with(bytes, name_hint, None, &figcraft_format::rest::no_images).map(|(l, _)| (l.doc, l.issues))
+}
+
+/// [`load`] with the version history, also telling whether the file was REST API file JSON. A REST
+/// import reads its variables from `variables`, else from a variables JSON next to the file.
+pub fn load_path(path: &str, variables: Option<&Value>) -> Result<(figcraft_format::Loaded, bool)> {
+    let bytes = read(path)?;
+    let sibling = if variables.is_none() { sibling_variables(path) } else { None };
+    load_with(&bytes, path, variables.or(sibling.as_ref()), &rest_images(path))
+}
+
+/// Load from bytes. Returns the document with its notes (repairs of a native file, or import
+/// warnings) and version history, and whether it was imported from REST API file JSON or a `.fig`
+/// file (such a file is never saved over). `variables`: the local variables JSON for a REST API file JSON.
+pub(super) fn load_with(
+    bytes: &[u8],
+    name_hint: &str,
+    variables: Option<&Value>,
+    images: figcraft_format::rest::ImageResolver,
+) -> Result<(figcraft_format::Loaded, bool)> {
+    match ext(name_hint).as_str() {
+        "svg" => {
+            let mut doc = Document::new(file_stem(name_hint));
+            let page = doc.first_page().ok_or(EngineError::NoDocument)?;
+            let notes = figcraft_svg::import_svg_with_notes(&mut doc, bytes, page, 0.0, 0.0, &file_stem(name_hint))
+                .map_err(|e| EngineError::Other(e.to_string()))?
+                .notes;
+            Ok((figcraft_format::Loaded { issues: notes, ..doc.into() }, false))
+        }
+        "png" | "jpg" | "jpeg" | "gif" | "webp" | "bmp" | "tif" | "tiff" => {
+            let mut doc = Document::new(file_stem(name_hint));
+            let page = doc.first_page().ok_or(EngineError::NoDocument)?;
+            let (hash, w, h) = figcraft_format::add_image(&mut doc, bytes.to_vec()).map_err(|e| EngineError::Other(e.to_string()))?;
+            let id = doc.create(page, NodeKind::Rectangle, &file_stem(name_hint), 0.0, 0.0, f64::from(w), f64::from(h))?;
+            doc.get_mut(id)?.fills = vec![figcraft_color::Paint::image(hash, figcraft_color::ImageScaleMode::Fill)];
+            Ok((doc.into(), false))
+        }
+        _ => {
+            if let Some(r) = load_fig(bytes, &file_stem(name_hint)) {
+                return Ok((r?, true));
+            }
+            if let Some(r) = load_sketch(bytes, &file_stem(name_hint)) {
+                return Ok((r?, true));
+            }
+            if let Some(r) = figcraft_format::rest::try_import_with(bytes, variables, images) {
+                let (mut doc, warnings) = r.map_err(|e| EngineError::Other(e.to_string()))?;
+                link_instances(&mut doc);
+                return Ok((figcraft_format::Loaded { issues: warnings, ..doc.into() }, true));
+            }
+            let mut loaded = figcraft_format::load_bytes_with_versions(bytes).map_err(|e| EngineError::Other(e.to_string()))?;
+            // Older files saved an untouched default title even after the user chose a filename.
+            if loaded.doc.name.is_empty() || loaded.doc.name == "Untitled" {
+                loaded.doc.name = file_stem(name_hint);
+            }
+            Ok((loaded, false))
+        }
+    }
+}
+
+/// Gives `None` when `bytes` are not a `.sketch` file. Then other readers can try.
+fn load_sketch(bytes: &[u8], name: &str) -> Option<Result<figcraft_format::Loaded>> {
+    if !figcraft_format::sketch::is_sketch(bytes) {
+        return None;
+    }
+    // The import and what follows read the installed fonts: the system's must be known first (the
+    // desktop app scans them in the background; this waits for that scan).
+    figcraft_text::fontdb::scan_system_fonts();
+    let fonts: figcraft_format::sketch::FontLookup = Box::new(figcraft_text::fontdb::postscript_face);
+    let r = figcraft_format::sketch::try_import_with_fonts(bytes, name, Some(fonts))?;
+    Some(r.map_err(|e| EngineError::Other(e.to_string())).map(|(mut doc, warnings)| {
+        match_font_families(&mut doc);
+        platform_tracking(&mut doc);
+        sketch_line_heights(&mut doc);
+        link_instances(&mut doc);
+        reflow_overridden_text(&mut doc);
+        figcraft_format::Loaded { issues: warnings, ..doc.into() }
+    }))
+}
+
+/// Instances of a stack sized apart from their main are laid out at their size, and texts in
+/// instances whose string an override changed are measured again with the auto layout around them
+/// re-flowing (Sketch saves layouts measured with the master's string). The rest keeps the layout
+/// Sketch saved.
+fn reflow_overridden_text(doc: &mut Document) {
+    let changed: Vec<NodeId> = doc
+        .nodes()
+        .filter(|n| match (&n.kind, n.source.and_then(|s| doc.node(s)).map(|s| &s.kind)) {
+            (NodeKind::Text(t), Some(NodeKind::Text(main))) => t.characters != main.characters,
+            _ => false,
+        })
+        .map(|n| n.id)
+        .collect();
+    let m = crate::measure::TextMeasure;
+    // Instances of a stack at another size than their main: the stack at their size, innermost first.
+    let mut resized: Vec<(usize, NodeId)> = doc
+        .nodes()
+        .filter(|n| n.layout.is_some())
+        .filter(|n| match &n.kind {
+            NodeKind::Instance { component, .. } => {
+                doc.node(*component).is_some_and(|c| (c.width - n.width).abs() > 1e-6 || (c.height - n.height).abs() > 1e-6)
+            }
+            _ => false,
+        })
+        .map(|n| (doc.ancestors(n.id).len(), n.id))
+        .collect();
+    resized.sort_by_key(|r| std::cmp::Reverse(r.0));
+    for (_, id) in resized {
+        figcraft_layout::layout_frame(doc, id, &m);
+    }
+    for id in changed {
+        if let Some((w, h)) = doc.node(id).and_then(figcraft_text::auto_size) {
+            figcraft_layout::set_size(doc, id, w, h);
+        }
+        figcraft_layout::layout_up(doc, id, &m);
+    }
+}
+
+/// Font families a `.sketch` import guessed from PostScript names ("Ping Fang SC" from
+/// "PingFangSC-Semibold") take the installed family's name when they differ only in spaces and
+/// case.
+fn match_font_families(doc: &mut Document) {
+    let installed = figcraft_text::fontdb::family_names();
+    let mut cache: std::collections::BTreeMap<String, Option<String>> = std::collections::BTreeMap::new();
+    let mut fix = |style: &mut figcraft_doc::TextStyle| {
+        let found = cache.entry(style.font_family.clone()).or_insert_with(|| installed_family(&style.font_family, &installed));
+        if let Some(f) = found {
+            style.font_family = f.clone();
+        }
+    };
+    let ids: Vec<NodeId> = doc.nodes().filter(|n| matches!(n.kind, NodeKind::Text(_))).map(|n| n.id).collect();
+    for id in ids {
+        if let Some(NodeKind::Text(td)) = doc.node_mut(id).map(|n| &mut n.kind) {
+            fix(&mut td.style);
+            for r in &mut td.runs {
+                fix(&mut r.style);
+            }
+        }
+    }
+    // Shared text styles too, so they stay like the layers linked to them.
+    for st in &mut doc.styles {
+        if let StyleKind::Text { style } = &mut st.kind {
+            fix(style);
+        }
+    }
+}
+
+/// Sketch draws text with the tracking a font's `trak` table gives at its size (Apple's text engine
+/// adds it; FigCraft's, like Figma's, doesn't): the imported text keeps it as letter spacing, so
+/// lines measure and break as they did there. A named style's optical size follows the text size
+/// there too (FigCraft keeps the instance's), so the imported text carries it as an `opsz` value.
+fn platform_tracking(doc: &mut Document) {
+    let mut cache: std::collections::BTreeMap<(String, String), Option<std::sync::Arc<figcraft_text::fontdb::Face>>> =
+        std::collections::BTreeMap::new();
+    let mut face = |style: &figcraft_doc::TextStyle| {
+        cache
+            .entry((style.font_family.clone(), style.font_style.clone()))
+            .or_insert_with(|| {
+                figcraft_text::fontdb::has_family(&style.font_family)
+                    .then(|| figcraft_text::fontdb::find_face(&style.font_family, &style.font_style))
+                    .flatten()
+            })
+            .clone()
+    };
+    let mut track = |style: &mut figcraft_doc::TextStyle| {
+        let Some(f) = face(style) else { return };
+        let t = f.tracking(style.font_size);
+        if t != 0.0 && t.is_finite() {
+            let px = style.letter_spacing.resolve(style.font_size);
+            style.letter_spacing = figcraft_doc::LetterSpacing::Pixels(px + t);
+        }
+        if f.axis("opsz").is_some() && f.instance(&style.font_style).is_some() && style.font_size.is_finite() {
+            style.variations.entry("opsz".into()).or_insert(style.font_size);
+        }
+    };
+    let ids: Vec<NodeId> = doc.nodes().filter(|n| matches!(n.kind, NodeKind::Text(_))).map(|n| n.id).collect();
+    for id in ids {
+        if let Some(NodeKind::Text(td)) = doc.node_mut(id).map(|n| &mut n.kind) {
+            track(&mut td.style);
+            for r in &mut td.runs {
+                track(&mut r.style);
+            }
+        }
+    }
+    for st in &mut doc.styles {
+        if let StyleKind::Text { style } = &mut st.kind {
+            track(style);
+        }
+    }
+}
+
+/// Families Sketch (Apple's text system) gives a fifth more than their ascent and descent as their
+/// natural line: classic Mac fonts, found on `sketchtool` renders. Other fonts show none of this.
+const TALL_LINE_FAMILIES: [&str; 11] =
+    ["Academy Engraved LET", "Courier", "Helvetica", "Hoefler Text", "Palatino", "Sathu", "Silom", "Skia", "Times", "Webdings", "Zapf Dingbats"];
+
+/// Sketch's natural line for a font of `ascent` and `descent` in `upem` units at `size` px: its
+/// height in px and how far down the text moves so its baseline sits where Sketch puts it. Sketch
+/// rounds the ascent and descent to whole pixels each and leaves the font's line gap out (a fifth
+/// more for [`TALL_LINE_FAMILIES`]), with the baseline above the rounded descent; FigCraft centres
+/// the font's own ascent and descent in the line. `(0, 0)` without metrics.
+pub(crate) fn sketch_line(ascent: f64, descent: f64, upem: f64, family: &str, size: f64) -> (f64, f64) {
+    let k = size / upem;
+    let (a, d) = (ascent * k, descent * k);
+    if !(a.is_finite() && d.is_finite()) || a + d <= 0.0 {
+        return (0.0, 0.0);
+    }
+    let natural = a.round() + d.round();
+    let line = if TALL_LINE_FAMILIES.iter().any(|f| f.eq_ignore_ascii_case(family)) { (natural * 1.2).round() } else { natural };
+    let sketch_baseline = line - d.round();
+    let figcraft_baseline = (line - (a + d)) / 2.0 + a;
+    (line, sketch_baseline - figcraft_baseline)
+}
+
+/// Text without a fixed line height takes the line Sketch drew it with (FigCraft's natural line,
+/// like Figma's, counts the font's line gap and centres the font in it; Sketch's doesn't), as a
+/// share of its size so it still follows the size, and moves to Sketch's baseline. Shared text
+/// styles take the line too.
+fn sketch_line_heights(doc: &mut Document) {
+    // Per family and style: the face's ascent, descent and units per em.
+    type Metrics = Option<(f64, f64, f64)>;
+    let mut cache: std::collections::BTreeMap<(String, String), Metrics> = std::collections::BTreeMap::new();
+    let mut set = |style: &mut TextStyle| -> f64 {
+        if style.line_height != LineHeight::Auto || !style.font_size.is_finite() || style.font_size <= 0.0 {
+            return 0.0;
+        }
+        let m = *cache.entry((style.font_family.clone(), style.font_style.clone())).or_insert_with(|| {
+            figcraft_text::fontdb::has_family(&style.font_family)
+                .then(|| figcraft_text::fontdb::find_face(&style.font_family, &style.font_style))
+                .flatten()
+                .map(|f| (f.ascent, f.descent, f.upem))
+        });
+        let Some((a, d, upem)) = m else { return 0.0 };
+        let (line, down) = sketch_line(a, d, upem, &style.font_family, style.font_size);
+        if line > 0.0 {
+            style.line_height = LineHeight::Percent(line / style.font_size * 100.0);
+        }
+        down
+    };
+    let ids: Vec<NodeId> = doc.nodes().filter(|n| matches!(n.kind, NodeKind::Text(_))).map(|n| n.id).collect();
+    for id in ids {
+        // An auto layout places its texts itself (its next pass would take a move back).
+        let laid_out =
+            doc.node(id).is_some_and(|n| !n.child_layout.absolute && n.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some()));
+        let Some(n) = doc.node_mut(id) else { continue };
+        let NodeKind::Text(td) = &mut n.kind else { continue };
+        let down = set(&mut td.style);
+        for r in &mut td.runs {
+            set(&mut r.style);
+        }
+        // Down in the layer's own frame (a rotated text moves along its own axis).
+        if !laid_out && down.is_finite() && down != 0.0 {
+            n.transform *= figcraft_doc::geom::Affine::translate((0.0, down));
+        }
+    }
+    for st in &mut doc.styles {
+        if let StyleKind::Text { style } = &mut st.kind {
+            set(style);
+        }
+    }
+}
+
+/// The installed family `family` means when it isn't installed under that exact name: the one
+/// whose name is the same without spaces, ignoring case.
+pub(crate) fn installed_family(family: &str, installed: &[String]) -> Option<String> {
+    let key = |s: &str| s.chars().filter(|c| !c.is_whitespace()).flat_map(char::to_lowercase).collect::<String>();
+    if installed.iter().any(|f| f.eq_ignore_ascii_case(family)) {
+        return None;
+    }
+    let want = key(family);
+    installed.iter().find(|f| key(f) == want).cloned()
+}
+
+/// Gives `None` when `bytes` are not a `.fig` file. Then other readers can try.
+pub(crate) fn load_fig(bytes: &[u8], name: &str) -> Option<Result<figcraft_format::Loaded>> {
+    let r = figcraft_format::fig::try_import(bytes, name)?;
+    Some(r.map_err(|e| EngineError::Other(e.to_string())).map(|(mut doc, warnings)| {
+        link_instances(&mut doc);
+        figcraft_format::Loaded { issues: warnings, ..doc.into() }
+    }))
+}
+
+/// Link imported instances to their mains (layer sources, overrides found by comparing values),
+/// innermost first so outer instances settle last.
+fn link_instances(doc: &mut Document) {
+    crate::cmd::styles::unfold_imported_bound_alpha(doc);
+    crate::style_vars::after_load(doc);
+    crate::cmd::styles::apply_paint_bindings_on_load(doc);
+    let mut insts: Vec<(usize, NodeId)> =
+        doc.nodes().filter(|n| matches!(n.kind, NodeKind::Instance { .. })).map(|n| (doc.ancestors(n.id).len(), n.id)).collect();
+    insts.sort_by_key(|a| std::cmp::Reverse(a.0));
+    for (_, i) in insts {
+        crate::components::rebase_instance(doc, i);
+    }
+}
+
+/// Largest image file read for a REST API file JSON import.
+#[cfg(not(target_arch = "wasm32"))]
+const MAX_IMAGE_FILE: u64 = 256 * 1024 * 1024;
+
+/// Image bytes for a REST API file JSON's `imageRef`: `images/<imageRef>[.png|.jpg|…]` next to
+/// the file.
+#[cfg(not(target_arch = "wasm32"))]
+pub(super) fn rest_images(path: &str) -> impl Fn(&str) -> Option<Vec<u8>> {
+    let dir = std::path::Path::new(path).parent().map(|d| d.join("images"));
+    move |r: &str| {
+        // Image refs are content hashes; anything else never becomes a path.
+        if r.is_empty() || r.len() > 128 || !r.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-' || b == b'_') {
+            return None;
+        }
+        let dir = dir.as_ref()?;
+        ["", ".png", ".jpg", ".jpeg", ".gif", ".webp"]
+            .iter()
+            .find_map(|e| crate::file_access::read_capped(dir.join(format!("{r}{e}")), MAX_IMAGE_FILE).ok())
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+pub(super) fn rest_images(_path: &str) -> impl Fn(&str) -> Option<Vec<u8>> {
+    figcraft_format::rest::no_images
+}
+
+/// Largest variables JSON read from disk.
+#[cfg(not(target_arch = "wasm32"))]
+const MAX_VARIABLES_FILE: u64 = 256 * 1024 * 1024;
+
+/// A local variables JSON next to a REST API file JSON: `<name>.variables.json`, else
+/// `variables.json`.
+#[cfg(not(target_arch = "wasm32"))]
+pub(super) fn sibling_variables(path: &str) -> Option<Value> {
+    if ext(path) != "json" {
+        return None;
+    }
+    let file = std::path::Path::new(path);
+    let dir = file.parent()?;
+    [format!("{}.variables.json", file_stem(path)), "variables.json".to_string()].iter().map(|n| dir.join(n)).filter(|c| c != file).find_map(|c| {
+        let v: Value = serde_json::from_slice(&crate::file_access::read_capped(c, MAX_VARIABLES_FILE).ok()?).ok()?;
+        figcraft_format::rest::is_variables_json(&v).then_some(v)
+    })
+}
+
+#[cfg(target_arch = "wasm32")]
+pub(super) fn sibling_variables(_path: &str) -> Option<Value> {
+    None
+}
+
+/// The local variables JSON a command passes as `variables`: an object, JSON text or a file path.
+pub(crate) fn variables_param(cmd: &str, p: &Value) -> Result<Option<Value>> {
+    let parse = |text: &[u8]| serde_json::from_slice::<Value>(text).map_err(|e| bad(cmd, format!("variables: {e}")));
+    let v = match get(p, "variables") {
+        None | Some(Value::Null) => return Ok(None),
+        Some(v @ Value::Object(_)) => v.clone(),
+        Some(Value::String(s)) if s.trim_start().starts_with('{') => parse(s.as_bytes())?,
+        Some(Value::String(path)) => parse(&read(path)?)?,
+        Some(_) => return Err(bad(cmd, "variables: the local variables JSON (an object, JSON text or a path)")),
+    };
+    if !figcraft_format::rest::is_variables_json(&v) {
+        return Err(bad(cmd, "variables: expected the local variables JSON (`meta.variableCollections` and `meta.variables`)"));
+    }
+    Ok(Some(v))
+}
diff --git a/crates/engine/src/cmd/file/open.rs b/crates/engine/src/cmd/file/open.rs
new file mode 100644
index 00000000..6b724ced
--- /dev/null
+++ b/crates/engine/src/cmd/file/open.rs
@@ -0,0 +1,245 @@
+use super::load::{ext, file_stem, import_summary, load_path, load_with, read, rest_images, sibling_variables, variables_param};
+use super::*;
+
+/// How many files File ▸ Open recent keeps.
+pub const MAX_RECENT: usize = 20;
+
+/// Put `path` at the top of the recent files.
+pub(super) fn remember(s: &mut Session, path: &str) {
+    let r = &mut s.prefs.recent_files;
+    r.retain(|p| p != path);
+    r.insert(0, path.to_string());
+    r.truncate(MAX_RECENT);
+}
+
+pub(super) fn open_recent(s: &mut Session, p: &Value) -> Result<Value> {
+    use crate::file_access::{Access, allow, allowed};
+    const CMD: &str = "file.openRecent";
+    // Confined to automation roots, the recent files outside them are never listed, opened, removed
+    // or named: `index` counts the files listed.
+    let listed = |r: &String| allowed(r, Access::Read);
+    if p.get("clear").and_then(Value::as_bool) == Some(true) {
+        s.prefs.recent_files.retain(|r| !listed(r));
+    }
+    if let Some(gone) = string(p, "remove") {
+        s.prefs.recent_files.retain(|r| *r != gone || !listed(r));
+    }
+    let path = match (string(p, "path"), num(p, "index")) {
+        (Some(path), _) => {
+            allow(&path, Access::Read)?;
+            Some(path)
+        }
+        (None, Some(i)) => {
+            Some(s.prefs.recent_files.iter().filter(|r| listed(r)).nth(i.max(0.0) as usize).cloned().ok_or_else(|| bad(CMD, "no such recent file"))?)
+        }
+        _ => None,
+    };
+    if let Some(path) = path {
+        if !crate::file_access::exists(&path) {
+            s.prefs.recent_files.retain(|r| *r != path);
+            return Err(bad(CMD, format!("{path} no longer exists")));
+        }
+        return open(s, &json!({"path": path}));
+    }
+    let files: Vec<Value> = s
+        .prefs
+        .recent_files
+        .iter()
+        .filter(|r| listed(r))
+        .map(|r| {
+            let name = std::path::Path::new(r).file_name().map_or_else(|| r.clone(), |f| f.to_string_lossy().into_owned());
+            json!({"path": r, "name": name, "exists": crate::file_access::exists(r)})
+        })
+        .collect();
+    Ok(json!({"files": files}))
+}
+
+pub(super) fn open(s: &mut Session, p: &Value) -> Result<Value> {
+    let variables = variables_param("file.open", p)?;
+    if string(p, "path").is_none()
+        && let Some(d) = string(p, "data")
+    {
+        return open_data(s, &d, p, variables.as_ref());
+    }
+    let path = req_string("file.open", p, "path")?;
+    // Already open: switch to it.
+    if let Some(i) = s.docs.iter().position(|d| d.path.as_deref() == Some(path.as_str())) {
+        s.active = i;
+        remember(s, &path);
+        return Ok(json!({"index": i}));
+    }
+    // Stamped before reading: a change made during the read makes the next save refuse.
+    let on_disk = crate::library::stat(&path).ok();
+    let (loaded, rest) = load_path(&path, variables.as_ref())?;
+    remember(s, &path);
+    let native = !rest && matches!(ext(&path).as_str(), "figcraft" | "json");
+    let warnings = rest || ext(&path) == "svg";
+    // A native file that lost something (a damaged image, say): the app says so, not only the result.
+    if native && !loaded.issues.is_empty() {
+        s.message = Some(match loaded.issues.as_slice() {
+            [one] => format!("{}: {one}", file_stem(&path)),
+            more => format!("{}: {} problems were repaired or left out while opening it, e.g. {}", file_stem(&path), more.len(), more[0]),
+        });
+    }
+    let summary = import_summary(&loaded.doc);
+    let images_left_out = if native { loaded.images_past_budget } else { 0 };
+    let mut ds = DocState::new(loaded.doc, native.then(|| path.clone()))
+        .with_versions(loaded.versions)
+        .with_branches(loaded.branches)
+        .with_images_left_in_file(&path, images_left_out);
+    ds.on_disk = on_disk.filter(|_| native);
+    s.docs.push(ds);
+    s.active = s.docs.len() - 1;
+    let mut out = json!({"index": s.active, "summary": summary});
+    out[if warnings { "warnings" } else { "repairs" }] = json!(loaded.issues);
+    Ok(out)
+}
+
+/// [`open`] for a file given as base64 `data` (a file dropped without a path on disk): `name` tells
+/// the format. It opens as a new document with no path, so the first save asks where to put it.
+fn open_data(s: &mut Session, data: &str, p: &Value, variables: Option<&Value>) -> Result<Value> {
+    let name = req_string("file.open", p, "name")?;
+    let data = data.split_once(',').map_or(data, |(_, b)| b);
+    let bytes = base64::engine::general_purpose::STANDARD.decode(data.trim()).map_err(|e| bad("file.open", e.to_string()))?;
+    let (loaded, rest) = load_with(&bytes, &name, variables, &figcraft_format::rest::no_images)?;
+    let warnings = rest || ext(&name) == "svg";
+    let summary = import_summary(&loaded.doc);
+    s.docs.push(DocState::new(loaded.doc, None).with_versions(loaded.versions).with_branches(loaded.branches));
+    s.active = s.docs.len() - 1;
+    let mut out = json!({"index": s.active, "summary": summary});
+    out[if warnings { "warnings" } else { "repairs" }] = json!(loaded.issues);
+    Ok(out)
+}
+
+pub(super) fn import(s: &mut Session, p: &Value) -> Result<Value> {
+    let path = string(p, "path");
+    let variables = variables_param("file.import", p)?;
+    let (bytes, name) = if let Some(path) = &path {
+        (read(path)?, path.clone())
+    } else if let Some(d) = string(p, "data") {
+        let d = d.split_once(',').map(|(_, b)| b.to_string()).unwrap_or(d);
+        (
+            base64::engine::general_purpose::STANDARD.decode(d.trim()).map_err(|e| bad("file.import", e.to_string()))?,
+            string(p, "name").unwrap_or_else(|| "import.png".into()),
+        )
+    } else {
+        return Err(bad("file.import", "pass `path` or `data`"));
+    };
+    let page = s.page()?;
+    let (x, y) = (num(p, "x"), num(p, "y"));
+    let center = s.ds().map(|d| (d.view.cx, d.view.cy)).unwrap_or((0.0, 0.0));
+    match ext(&name).as_str() {
+        "svg" => {
+            let doc = s.doc_mut()?;
+            let (x, y) = (x.unwrap_or(center.0), y.unwrap_or(center.1));
+            let imported =
+                figcraft_svg::import_svg_with_notes(doc, &bytes, page, x, y, &file_stem(&name)).map_err(|e| EngineError::Other(e.to_string()))?;
+            let id = imported.frame;
+            // Centred on the point (a paste lands in the middle of the view).
+            if boolean(p, "center").unwrap_or(false)
+                && let Some(n) = doc.node_mut(id)
+            {
+                n.transform = figcraft_geom::Affine::translate(((x - n.width / 2.0).round(), (y - n.height / 2.0).round()));
+            }
+            s.set_selection(vec![id]);
+            let mut out = json!({"id": id});
+            if !imported.notes.is_empty() {
+                out["warnings"] = json!(imported.notes);
+            }
+            Ok(out)
+        }
+        "figcraft" | "json" | "fig" | "sketch" => {
+            let resolver = path.as_deref().map(rest_images);
+            let images: figcraft_format::rest::ImageResolver = match &resolver {
+                Some(r) => r,
+                None => &figcraft_format::rest::no_images,
+            };
+            let sibling = if variables.is_none() { path.as_deref().and_then(sibling_variables) } else { None };
+            let (other, rest) = load_with(&bytes, &name, variables.as_ref().or(sibling.as_ref()), images)?;
+            let summary = import_summary(&other.doc);
+            let pages = append_pages(s.doc_mut()?, &other.doc)?;
+            let mut out = json!({"pages": pages, "summary": summary});
+            if rest {
+                out["warnings"] = json!(other.issues);
+            }
+            Ok(out)
+        }
+        _ => {
+            let b64 = base64::engine::general_purpose::STANDARD.encode(&bytes);
+            crate::cmd::create::place_image(
+                s,
+                &json!({"data": b64, "x": x.unwrap_or(center.0), "y": y.unwrap_or(center.1), "name": file_stem(&name)}),
+            )
+        }
+    }
+}
+
+/// Append `other`'s pages (with their settings and flows, its images, styles and variables) to
+/// `doc`. Ids are remapped across all pages at once, so instances keep their main, instance layers
+/// their source and interactions and flows their targets wherever those are. Styles, variables and
+/// collections whose id the document already has are kept as they are.
+pub(super) fn append_pages(doc: &mut Document, other: &Document) -> Result<Vec<NodeId>> {
+    for (k, v) in &other.images {
+        doc.images.entry(k.clone()).or_insert_with(|| v.clone());
+    }
+    for st in &other.styles {
+        if !doc.styles.iter().any(|s| s.id == st.id) {
+            doc.styles.push(st.clone());
+        }
+    }
+    let have: std::collections::BTreeSet<String> = doc.variables.collections.iter().map(|c| c.id.clone()).collect();
+    doc.variables.collections.extend(other.variables.collections.iter().filter(|c| !have.contains(&c.id)).cloned());
+    let have: std::collections::BTreeSet<String> = doc.variables.variables.iter().map(|v| v.id.clone()).collect();
+    doc.variables.variables.extend(other.variables.variables.iter().filter(|v| !have.contains(&v.id)).cloned());
+    let mut map = std::collections::BTreeMap::new();
+    for pg in &other.pages {
+        for id in other.subtree(*pg).into_iter().skip(1) {
+            map.insert(id, doc.alloc_id());
+        }
+    }
+    // Library copies a .fig import keeps (cached definitions) have no library record to follow:
+    // the layers of its store come along into the store of `doc`. Recorded copies are left to
+    // `merge_store`, which shares them with copies `doc` already has.
+    let cached: Vec<NodeId> = other
+        .library_store()
+        .and_then(|s| other.node(s))
+        .map(|s| s.children.iter().copied().filter(|root| other.libraries.import_of(*root).is_none()).collect())
+        .unwrap_or_default();
+    for root in &cached {
+        for id in other.subtree(*root) {
+            map.insert(id, doc.alloc_id());
+        }
+    }
+    let mut new_pages = Vec::new();
+    for pg in &other.pages {
+        let Some(pn) = other.node(*pg) else { continue };
+        let np = doc.add_page(&pn.name);
+        let mut kind = pn.kind.clone();
+        if let NodeKind::Page { flows, .. } = &mut kind {
+            flows.retain_mut(|f| map.get(&f.start).map(|n| f.start = *n).is_some());
+        }
+        if let Some(n) = doc.node_mut(np) {
+            n.kind = kind;
+        }
+        for c in &pn.children {
+            let nodes: Vec<Node> = other.subtree(*c).into_iter().filter_map(|i| other.node(i).cloned()).collect();
+            doc.paste_nodes(&nodes, &map, *c, np, None)?;
+        }
+        new_pages.push(np);
+    }
+    if !cached.is_empty() {
+        let store = doc.ensure_library_store();
+        for root in &cached {
+            let nodes: Vec<Node> = other.subtree(*root).into_iter().filter_map(|i| other.node(i).cloned()).collect();
+            doc.paste_nodes(&nodes, &map, *root, store, None)?;
+        }
+    }
+    for new in map.values() {
+        let src = doc.node(*new).and_then(|n| n.source).and_then(|s| map.get(&s).copied());
+        if let (Some(src), Some(n)) = (src, doc.node_mut(*new)) {
+            n.source = Some(src);
+        }
+    }
+    crate::library::merge_store(doc, other, &map)?;
+    Ok(new_pages)
+}
diff --git a/crates/engine/src/cmd/file/rest_import_tests.rs b/crates/engine/src/cmd/file/rest_import_tests.rs
new file mode 100644
index 00000000..189edc60
--- /dev/null
+++ b/crates/engine/src/cmd/file/rest_import_tests.rs
@@ -0,0 +1,187 @@
+use super::*;
+
+/// A synthetic REST API file JSON: a component with a text layer, an instance of it whose text
+/// is overridden, and an image fill.
+fn kit() -> Value {
+    let at = |x: f64, y: f64| json!([[1, 0, x], [0, 1, y]]);
+    let label = |id: &str, text: &str| {
+        json!({"id": id, "name": "Label", "type": "TEXT", "relativeTransform": at(8.0, 8.0), "size": {"x": 40, "y": 20}, "characters": text,
+               "style": {"fontFamily": "Inter", "fontSize": 14}, "fills": [{"type": "SOLID", "color": {"r": 0, "g": 0, "b": 0, "a": 1}}]})
+    };
+    json!({"name": "Kit", "document": {"id": "0:0", "type": "DOCUMENT", "children": [
+        {"id": "0:1", "name": "Main", "type": "CANVAS", "backgroundColor": {"r": 0.9, "g": 0.9, "b": 0.9, "a": 1}, "children": [
+            {"id": "1:1", "name": "Button", "type": "COMPONENT", "relativeTransform": at(0.0, 0.0), "size": {"x": 100, "y": 40},
+             "fills": [{"type": "SOLID", "color": {"r": 0.2, "g": 0.4, "b": 1, "a": 1}}], "children": [label("1:2", "OK")]},
+            {"id": "2:1", "name": "Button", "type": "INSTANCE", "componentId": "1:1", "relativeTransform": at(0.0, 100.0), "size": {"x": 100, "y": 40},
+             "fills": [{"type": "SOLID", "color": {"r": 0.2, "g": 0.4, "b": 1, "a": 1}}], "children": [label("I2:1;1:2", "Go")]},
+            {"id": "3:1", "name": "Photo", "type": "RECTANGLE", "relativeTransform": at(200.0, 0.0), "size": {"x": 30, "y": 20},
+             "fills": [{"type": "IMAGE", "imageRef": "photo1", "scaleMode": "FILL"}]}
+        ]}
+    ]}, "components": {"1:1": {"key": "k", "name": "Button", "description": ""}}, "styles": {}})
+}
+
+fn instance(doc: &Document) -> &Node {
+    doc.nodes().find(|n| matches!(n.kind, NodeKind::Instance { .. })).unwrap()
+}
+
+/// What a .fig import with a cached library component leaves: the main in the hidden store, a
+/// visible instance of it and a layer linked to the main's layer.
+fn cached_import() -> Document {
+    let mut doc = Document::new("Cached");
+    let page = doc.first_page().unwrap();
+    let store = doc.ensure_library_store();
+    let main = doc
+        .create(store, NodeKind::Component { description: String::new(), props: Default::default() }, "Cached main", 0.0, 0.0, 20.0, 20.0)
+        .unwrap();
+    let body = doc.create(main, NodeKind::Rectangle, "Body", 0.0, 0.0, 20.0, 20.0).unwrap();
+    let inst = doc.create(page, NodeKind::Instance { component: main, props: Default::default() }, "Cached instance", 0.0, 0.0, 20.0, 20.0).unwrap();
+    let mut copy = doc.node(body).unwrap().clone();
+    copy.id = doc.alloc_id();
+    copy.parent = None;
+    copy.source = Some(body);
+    let copy_id = copy.id;
+    doc.insert(copy, inst, None).unwrap();
+    assert!(doc.is_remote(main) && doc.node(copy_id).unwrap().source == Some(body));
+    doc
+}
+
+/// Pasting layers that use a cached main into another document leaves the main behind, as it
+/// does for other mains that are not published: no link points at a layer of the target.
+#[test]
+fn pasting_instances_of_cached_components_leaves_no_dangling_links() {
+    let src = cached_import();
+    let mut doc = Document::new("Target");
+    let page = doc.first_page().unwrap();
+    for i in 0..8 {
+        doc.create(page, NodeKind::Rectangle, &format!("Filler {i}"), 0.0, 0.0, 5.0, 5.0).unwrap();
+    }
+    let inst = src.nodes().find(|n| n.name == "Cached instance").unwrap().id;
+    let ids = src.subtree(inst);
+    let map: std::collections::BTreeMap<NodeId, NodeId> = ids.iter().map(|i| (*i, doc.alloc_id())).collect();
+    let nodes: Vec<Node> = ids.iter().filter_map(|i| src.node(*i).cloned()).collect();
+    doc.paste_nodes(&nodes, &map, inst, page, None).unwrap();
+    crate::library::adopt_pasted(&mut doc, &src, None, &map).unwrap();
+    let pasted = doc.node(map[&inst]).unwrap();
+    let NodeKind::Instance { component, .. } = pasted.kind else { panic!() };
+    assert!(!doc.contains(component), "the main stays behind: {component:?}");
+    assert!(doc.node(pasted.children[0]).unwrap().source.is_none_or(|s| !doc.contains(s)));
+}
+
+#[test]
+fn appending_pages_with_cached_library_components_brings_the_components() {
+    let other = cached_import();
+    let mut doc = Document::new("Target");
+    let page = doc.first_page().unwrap();
+    // Ids of the target that would collide with the other document's store.
+    for i in 0..8 {
+        doc.create(page, NodeKind::Rectangle, &format!("Filler {i}"), 0.0, 0.0, 5.0, 5.0).unwrap();
+    }
+    append_pages(&mut doc, &other).unwrap();
+    assert!(doc.validate().is_empty(), "{:?}", doc.validate());
+    assert!(crate::components::mirror_issues(&doc).is_empty(), "{:?}", crate::components::mirror_issues(&doc));
+    let inst = doc.nodes().find(|n| n.name == "Cached instance").unwrap();
+    let NodeKind::Instance { component, .. } = inst.kind else { panic!() };
+    assert_eq!(doc.node(component).unwrap().name, "Cached main");
+    assert!(doc.is_remote(component), "the main comes along into the store");
+    let layer = doc.node(inst.children[0]).unwrap();
+    assert_eq!(layer.source, doc.node(component).unwrap().children.first().copied());
+}
+
+#[test]
+fn rest_json_loads_with_linked_instances() {
+    let bytes = serde_json::to_vec(&kit()).unwrap();
+    let (doc, warnings) = load_bytes(&bytes, "kit.json").unwrap();
+    assert_eq!(doc.name, "Kit");
+    assert!(warnings.iter().any(|w| w.contains("placeholder")), "{warnings:?}");
+    let inst = instance(&doc);
+    let NodeKind::Instance { component, .. } = inst.kind else { panic!() };
+    assert_eq!(inst.source, Some(component));
+    let main_label = doc.node(component).unwrap().children[0];
+    let label = doc.node(inst.children[0]).unwrap();
+    assert_eq!(label.source, Some(main_label));
+    assert!(label.overrides.contains("characters"), "{:?}", label.overrides);
+    assert!(crate::components::mirror_issues(&doc).is_empty());
+    assert!(thumbnail(&doc).is_some());
+}
+
+#[test]
+fn open_takes_data_and_a_name_as_a_new_unsaved_document() {
+    let mut saved = Session::new();
+    saved.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+    let bytes = file_bytes(saved.ds().unwrap()).unwrap();
+    let data = base64::engine::general_purpose::STANDARD.encode(&bytes);
+    let mut s = Session::new();
+    let recent = s.prefs.recent_files.clone();
+    let r = s.execute("file.open", &json!({"data": data, "name": "Dropped.figcraft"})).unwrap();
+    let open = s.docs.len();
+    assert_eq!(r["index"], open - 1, "a document of its own, made active");
+    assert_eq!(s.ds().unwrap().path, None, "no path to save over");
+    assert!(s.doc().unwrap().nodes().any(|n| matches!(n.kind, NodeKind::Rectangle)));
+    assert_eq!(s.prefs.recent_files, recent, "nothing on disk to remember");
+    assert!(s.execute("file.open", &json!({"data": data})).is_err(), "the name tells the format");
+    assert!(s.execute("file.open", &json!({"data": "not base64!", "name": "x.svg"})).is_err());
+    assert_eq!(s.docs.len(), open, "a refused open adds nothing");
+}
+
+#[test]
+fn save_as_data_hands_back_the_file_and_marks_it_saved_once_delivered() {
+    // The browser has no paths: Save as returns the file for a download (#969).
+    let mut s = Session::new();
+    s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+    assert!(s.execute("file.saveAs", &json!({})).is_err(), "no path and no data: still asks for a path");
+    let recent = s.prefs.recent_files.clone();
+    let r = s.execute("file.saveAs", &json!({"data": true})).unwrap();
+    assert_eq!(r["name"], "Untitled.figcraft");
+    assert!(s.ds().unwrap().is_dirty(), "not delivered yet: a refused download must not lose the edits");
+    s.execute("file.markSaved", &json!({})).unwrap();
+    assert!(!s.ds().unwrap().is_dirty());
+    assert_eq!(s.ds().unwrap().path, None, "still no path to save over");
+    assert_eq!(s.prefs.recent_files, recent, "nothing on disk to remember");
+    let mut t = Session::new();
+    t.execute("file.open", &json!({"data": r["data"], "name": r["name"]})).unwrap();
+    assert!(t.doc().unwrap().nodes().any(|n| matches!(n.kind, NodeKind::Rectangle)), "the bytes reopen");
+}
+
+#[test]
+fn open_and_import_rest_json() {
+    let dir = std::env::temp_dir().join(format!("figcraft-rest-{}", std::process::id()));
+    std::fs::create_dir_all(dir.join("images")).unwrap();
+    let png = {
+        let mut d = Document::new("x");
+        let p = d.first_page().unwrap();
+        let id = d.create(p, NodeKind::Rectangle, "R", 0.0, 0.0, 3.0, 2.0).unwrap();
+        export_bytes(&d, &[id], ExportFormat::Png, 1.0).unwrap()
+    };
+    std::fs::write(dir.join("images").join("photo1.png"), &png).unwrap();
+    let path = dir.join("kit.json");
+    std::fs::write(&path, serde_json::to_vec(&kit()).unwrap()).unwrap();
+    let path = path.to_string_lossy().to_string();
+
+    let mut s = Session::new();
+    let r = s.execute("file.open", &json!({"path": path})).unwrap();
+    assert!(r["warnings"].as_array().is_some_and(|w| w.iter().all(|w| !w.as_str().unwrap_or("").contains("placeholder"))), "{r}");
+    assert!(r.get("repairs").is_none());
+    assert_eq!(s.ds().unwrap().path, None, "an import is never saved over its JSON");
+    let doc = s.doc().unwrap();
+    let photo = doc.nodes().find(|n| n.name == "Photo").unwrap();
+    let figcraft_color::PaintKind::Image(img) = &photo.fills[0].kind else { panic!() };
+    assert_eq!(doc.images.get(&img.image).map(|i| (i.width, i.height)), Some((3, 2)), "read from images/ next to the file");
+
+    // Import into another document: pages are appended and references follow the new ids.
+    let mut s = Session::new();
+    let data = base64::engine::general_purpose::STANDARD.encode(serde_json::to_vec(&kit()).unwrap());
+    let r = s.execute("file.import", &json!({"data": data, "name": "kit.json"})).unwrap();
+    assert_eq!(r["pages"].as_array().map(Vec::len), Some(1));
+    assert!(r["warnings"].is_array(), "{r}");
+    let doc = s.doc().unwrap();
+    assert_eq!(doc.pages.len(), 2);
+    let page = doc.node(doc.pages[1]).unwrap();
+    assert!(matches!(page.kind, NodeKind::Page { background, .. } if (background.r - 0.9).abs() < 1e-6));
+    let inst = instance(doc);
+    let NodeKind::Instance { component, .. } = inst.kind else { panic!() };
+    assert!(doc.node(component).is_some_and(|c| matches!(c.kind, NodeKind::Component { .. })));
+    let label = doc.node(inst.children[0]).unwrap();
+    assert!(label.source.is_some_and(|src| doc.is_ancestor(component, src)));
+    assert!(crate::components::mirror_issues(doc).is_empty());
+    let _ = std::fs::remove_dir_all(&dir);
+}
diff --git a/crates/engine/src/cmd/file/save.rs b/crates/engine/src/cmd/file/save.rs
new file mode 100644
index 00000000..593c4c21
--- /dev/null
+++ b/crates/engine/src/cmd/file/save.rs
@@ -0,0 +1,225 @@
+use super::export::export_fig;
+use super::load::{ext, file_stem, write};
+use super::open::remember;
+use super::*;
+
+/// Thumbnail PNG of the first page's content (for file browsers / the home screen).
+pub fn thumbnail(doc: &Document) -> Option<Vec<u8>> {
+    let page = doc.first_page()?;
+    let b = doc.page_content_bounds(page)?;
+    let scale = (400.0 / b.width().max(b.height()).max(1.0)).min(2.0);
+    let view = figcraft_render::View {
+        origin: (b.x0, b.y0),
+        scale,
+        width: (b.width() * scale).ceil().max(1.0) as u32,
+        height: (b.height() * scale).ceil().max(1.0) as u32,
+    };
+    let pix = figcraft_render::render_view(doc, page, &view, &Default::default())?;
+    figcraft_render::encode_png(&pix).ok()
+}
+
+/// The `.figcraft` file for a document: content, thumbnail and version history.
+pub fn file_bytes(ds: &DocState) -> Result<Vec<u8>> {
+    FileSnapshot::of(ds).encode()
+}
+
+/// A document's file as it is at one moment, so the slow part of saving it (the thumbnail and the
+/// encoding) can run on another thread while editing goes on: [`encode`](Self::encode) there, then
+/// [`save`](Self::save) the bytes back on the session's thread.
+pub struct FileSnapshot {
+    uid: u64,
+    path: Option<String>,
+    revision: u64,
+    doc: Arc<Document>,
+    /// The document as last saved when the snapshot was taken: another save since makes it stale.
+    saved: Arc<Document>,
+    page: NodeId,
+    versions: Vec<Version>,
+    branches: Vec<figcraft_format::Branch>,
+}
+
+impl FileSnapshot {
+    pub fn of(ds: &DocState) -> Self {
+        Self {
+            uid: ds.uid,
+            path: ds.path.clone(),
+            revision: ds.revision,
+            doc: ds.doc.clone(),
+            saved: ds.saved_doc.clone(),
+            page: ds.page,
+            versions: ds.versions.clone(),
+            branches: ds.branches.clone(),
+        }
+    }
+
+    /// The file's bytes: content, thumbnail and version history.
+    pub fn encode(&self) -> Result<Vec<u8>> {
+        let mut doc = (*self.doc).clone();
+        doc.current_page = Some(self.page);
+        let thumb = thumbnail(&doc);
+        figcraft_format::save_bytes_with_history(&doc, thumb.as_deref(), &self.versions, &self.branches)
+            .map_err(|e| EngineError::Other(e.to_string()))
+    }
+
+    /// Write `bytes` (this snapshot's [`encode`](Self::encode)) to the document's file: it is saved
+    /// as of the snapshot, and edits since stay unsaved. False (nothing written) when the document
+    /// was closed, saved, reverted or given another path since: the bytes are out of date.
+    pub fn save(self, s: &mut Session, bytes: &[u8]) -> Result<bool> {
+        let Some(ds) = s.docs.iter_mut().find(|d| d.uid == self.uid && d.path == self.path && Arc::ptr_eq(&d.saved_doc, &self.saved)) else {
+            return Ok(false);
+        };
+        let path = self.path.as_deref().ok_or(EngineError::NoDocument)?;
+        refuse_dropping_images(ds, path)?;
+        refuse_overwriting_changes(ds, path)?;
+        write(path, bytes)?;
+        ds.note_on_disk();
+        // The history or branches may have changed since: then they still count as unsaved.
+        if ds.revision == self.revision {
+            ds.versions_changed = false;
+        }
+        ds.saved_doc = self.doc;
+        ds.revision += 1;
+        branch_tabs_saved(s, self.uid);
+        Ok(true)
+    }
+}
+
+fn refuse_dropping_images(ds: &DocState, path: &str) -> Result<()> {
+    match ds.images_lost_saving_to(path) {
+        Some(count) => Err(EngineError::Other(format!(
+            "{} wasn't saved: {count} of its images weren't loaded (together they pass what FigCraft reads from one file), and saving over it would delete them. Save it under another name; this file keeps them.",
+            file_stem(path)
+        ))),
+        None => Ok(()),
+    }
+}
+
+/// Saving over the tab's own file would lose what another app wrote to it since (#1330).
+fn refuse_overwriting_changes(ds: &DocState, path: &str) -> Result<()> {
+    match (&ds.on_disk, crate::library::stat(path)) {
+        (Some(was), Ok(now)) if now != *was => Err(EngineError::Other(format!(
+            "{} wasn't saved: the file changed on disk since it was opened or saved here (another app or figcraft-cli wrote to it), and saving would replace those changes. Revert to saved to load them, or Save as to keep this version as well.",
+            file_stem(path)
+        ))),
+        _ => Ok(()),
+    }
+}
+
+/// The branch tabs of the file in tab `uid` were saved with it.
+fn branch_tabs_saved(s: &mut Session, uid: u64) {
+    for tab in s.docs.iter_mut().filter(|d| d.branch_of.as_ref().is_some_and(|(m, _)| *m == uid)) {
+        tab.mark_saved();
+    }
+}
+
+pub(super) fn color_profile(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "file.colorProfile";
+    let Some(name) = string(p, "profile") else {
+        s.request_ui("dialog.colorProfile", json!({}));
+        return Ok(json!({"profile": s.doc()?.color_profile.id(), "changed": false}));
+    };
+    let profile = figcraft_color::ColorProfile::parse(&name).ok_or_else(|| bad(cmd, "profile: srgb or displayP3"))?;
+    let convert = boolean(p, "convert").unwrap_or(true);
+    let changed = s.doc()?.color_profile != profile && s.doc_mut()?.set_color_profile(profile, convert);
+    Ok(json!({"profile": profile.id(), "changed": changed}))
+}
+
+/// Native saves act on the current document; a `.fig` copy exports the version shown, and a
+/// pending Save As choice must leave it shown until its destination is known.
+pub(crate) fn save_ends_preview(s: &Session, cmd: &str, p: &Value) -> bool {
+    let path =
+        string(p, "path").or_else(|| if cmd == "file.save" { s.docs.get(crate::branches::file_tab(s)).and_then(|ds| ds.path.clone()) } else { None });
+    path.is_some_and(|path| ext(&path) != "fig") || (cmd == "file.saveAs" && wants_data(p))
+}
+
+/// `file.saveAs` asked for the file's bytes instead of a path to write (the browser's download).
+fn wants_data(p: &Value) -> bool {
+    p.get("data").and_then(Value::as_bool) == Some(true)
+}
+
+/// Save the file of the active tab (the main file for a branch tab, with its branches), or export
+/// the active document as an experimental `.fig` copy without changing its native save state.
+/// Without a path the file comes back as base64 `data` for the caller to deliver (#969).
+fn save_to(s: &mut Session, path: Option<String>) -> Result<Value> {
+    if let Some(path) = path.as_deref().filter(|p| ext(p) == "fig") {
+        return export_fig(s, &json!({"path": path}));
+    }
+    let i = crate::branches::file_tab(s);
+    let ds = s.docs.get_mut(i).ok_or(EngineError::NoDocument)?;
+    // A download (no path) writes over no file.
+    if let Some(path) = path.as_deref() {
+        refuse_dropping_images(ds, path)?;
+    }
+    let mut snapshot = FileSnapshot::of(ds);
+    let follows_path = ds.path.as_deref().map_or(ds.doc.name == "Untitled", |old| ds.doc.name == file_stem(old));
+    if let Some(path) = path.as_deref()
+        && follows_path
+        && ds.path.as_deref() != Some(path)
+    {
+        Arc::make_mut(&mut snapshot.doc).name = file_stem(path);
+    }
+    let bytes = snapshot.encode()?;
+    let Some(path) = path else {
+        // The download can still be refused: the caller marks the file saved once it was delivered.
+        let name = format!("{}.figcraft", ds.doc.name);
+        return Ok(json!({"name": name, "bytes": bytes.len(), "data": base64::engine::general_purpose::STANDARD.encode(&bytes)}));
+    };
+    write(&path, &bytes)?;
+    ds.doc = snapshot.doc;
+    ds.path = Some(path.clone());
+    ds.note_on_disk();
+    mark_saved(s, &json!({}))?;
+    remember(s, &path);
+    Ok(json!({"path": path, "bytes": bytes.len()}))
+}
+
+/// The file of the active tab (with its branch tabs) now matches what was written or delivered.
+pub(super) fn mark_saved(s: &mut Session, _: &Value) -> Result<Value> {
+    let i = crate::branches::file_tab(s);
+    let ds = s.docs.get_mut(i).ok_or(EngineError::NoDocument)?;
+    ds.mark_saved();
+    ds.revision += 1;
+    let uid = ds.uid;
+    branch_tabs_saved(s, uid);
+    Ok(json!({"saved": true}))
+}
+
+pub(super) fn save(s: &mut Session, p: &Value) -> Result<Value> {
+    if let Some(path) = string(p, "path") {
+        return save_to(s, Some(path));
+    }
+    let ds = s.docs.get(crate::branches::file_tab(s)).ok_or(EngineError::NoDocument)?;
+    match ds.path.clone() {
+        // Earlier builds wrote native data under a .fig name: never overwrite that file with an export.
+        Some(path) if ext(&path) == "fig" => {
+            s.request_ui("dialog.saveAs", json!({}));
+            Err(EngineError::Disabled("file.save".into(), "the saved path ends in .fig: choose Save as or pass `path`".into()))
+        }
+        Some(path) => {
+            if p.get("overwrite").and_then(Value::as_bool) != Some(true) {
+                refuse_overwriting_changes(ds, &path)?;
+            }
+            save_to(s, Some(path))
+        }
+        None => {
+            s.request_ui("dialog.saveAs", json!({}));
+            Err(EngineError::Disabled("file.save".into(), "the file has no path yet: pass `path`".into()))
+        }
+    }
+}
+
+pub(super) fn save_as(s: &mut Session, p: &Value) -> Result<Value> {
+    match string(p, "path") {
+        Some(mut path) => {
+            if ext(&path).is_empty() {
+                path.push_str(".figcraft");
+            }
+            save_to(s, Some(path))
+        }
+        None if wants_data(p) => save_to(s, None),
+        None => {
+            s.request_ui("dialog.saveAs", json!({}));
+            Err(EngineError::Disabled("file.saveAs".into(), "pass `path`".into()))
+        }
+    }
+}
diff --git a/crates/engine/src/cmd/file/staging_write_tests.rs b/crates/engine/src/cmd/file/staging_write_tests.rs
new file mode 100644
index 00000000..5653ce78
--- /dev/null
+++ b/crates/engine/src/cmd/file/staging_write_tests.rs
@@ -0,0 +1,119 @@
+use super::*;
+
+fn dir(name: &str) -> std::path::PathBuf {
+    let d = std::env::temp_dir().join(format!("figcraft-engine-staging-{name}-{}", std::process::id()));
+    std::fs::create_dir_all(&d).unwrap();
+    d
+}
+
+/// A symlink `from` → `to`; false when the platform won't make one (Windows needs privileges).
+#[cfg(unix)]
+fn symlink(from: &std::path::Path, to: &std::path::Path) -> bool {
+    std::os::unix::fs::symlink(to, from).is_ok()
+}
+
+#[cfg(windows)]
+fn symlink(from: &std::path::Path, to: &std::path::Path) -> bool {
+    std::os::windows::fs::symlink_file(to, from).is_ok()
+}
+
+#[test]
+fn an_existing_staging_file_is_never_written_through() {
+    let d = dir("existing");
+    let path = d.join("shot.svg");
+    // The old deterministic staging name, held by an unrelated file: the write must pick its
+    // own staging name instead of truncating this one.
+    let old = d.join("shot.svg.tmp-figcraft");
+    std::fs::write(&old, b"not yours").unwrap();
+    write(&path.to_string_lossy(), b"<svg/>").unwrap();
+    assert_eq!(std::fs::read(&path).unwrap(), b"<svg/>");
+    assert_eq!(std::fs::read(&old).unwrap(), b"not yours", "an unrelated file at a staging name is untouched");
+    // Just the file and the untouched staging file: no new staging leftovers.
+    assert_eq!(std::fs::read_dir(&d).unwrap().count(), 2);
+    let _ = std::fs::remove_dir_all(&d);
+}
+
+#[test]
+fn a_staging_symlink_is_never_followed() {
+    let d = dir("symlink");
+    let path = d.join("shot.svg");
+    let victim = d.join("victim.txt");
+    std::fs::write(&victim, b"innocent").unwrap();
+    let old = d.join("shot.svg.tmp-figcraft");
+    if !symlink(&old, &victim) {
+        return; // Making a symlink needs privileges on some Windows setups.
+    }
+    write(&path.to_string_lossy(), b"<svg/>").unwrap();
+    assert_eq!(std::fs::read(&victim).unwrap(), b"innocent", "the symlink was never written through");
+    assert_eq!(std::fs::read(&path).unwrap(), b"<svg/>");
+    let _ = std::fs::remove_dir_all(&d);
+}
+
+#[test]
+fn concurrent_writers_of_one_file_never_interleave() {
+    let d = dir("concurrent");
+    let path = d.join("shot.svg");
+    for round in 0..5u8 {
+        let mut handles = Vec::new();
+        for w in 0u8..4 {
+            let (path, bytes) = (path.clone(), vec![b'0' + w; 8192]);
+            handles.push(std::thread::spawn(move || write(&path.to_string_lossy(), &bytes)));
+        }
+        let mut wins = 0;
+        for h in handles {
+            // On Windows a rename over a file another writer just replaced can lose the race.
+            if h.join().unwrap().is_ok() {
+                wins += 1;
+            }
+        }
+        assert!(wins > 0, "round {round}: every writer lost");
+        // Whatever landed is one writer's complete payload, never a mix.
+        let got = std::fs::read(&path).unwrap();
+        assert_eq!(got.len(), 8192, "round {round}: a complete payload landed");
+        assert!(got.windows(2).all(|w| w[0] == w[1]), "round {round}: one writer's payload, not a mix");
+    }
+    // No staging file was left stuck (a failed writer removes its own).
+    let left = std::fs::read_dir(&d).unwrap().count();
+    assert!(left <= if cfg!(windows) { 5 } else { 1 }, "{left} files left in the staging directory");
+    let _ = std::fs::remove_dir_all(&d);
+}
+
+#[test]
+fn a_failed_write_leaves_the_destination_alone_and_cleans_up() {
+    let d = dir("failure");
+    // The destination is a directory: the rename fails, our staging file is removed and the
+    // directory is untouched.
+    let taken = d.join("over-a-directory");
+    std::fs::create_dir_all(&taken).unwrap();
+    assert!(write(&taken.to_string_lossy(), b"payload").is_err());
+    assert!(taken.is_dir());
+    assert_eq!(std::fs::read_dir(&d).unwrap().count(), 1, "no staging file left behind");
+    // A missing parent directory fails without creating anything anywhere.
+    assert!(write(&d.join("no").join("such.svg").to_string_lossy(), b"payload").is_err());
+    assert!(!d.join("no").exists());
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+        // A read-only directory refuses the staging file, and the old destination stays.
+        let ro = d.join("read-only");
+        std::fs::create_dir_all(&ro).unwrap();
+        let dest = ro.join("keep.svg");
+        std::fs::write(&dest, b"keep").unwrap();
+        let mut perms = std::fs::metadata(&ro).unwrap().permissions();
+        perms.set_mode(0o500);
+        std::fs::set_permissions(&ro, perms).unwrap();
+        // Running as root would defeat the read-only directory: skip instead of failing.
+        let probe = ro.join(".probe");
+        if std::fs::write(&probe, b"").is_ok() {
+            let _ = std::fs::remove_file(&probe);
+        } else {
+            assert!(write(&dest.to_string_lossy(), b"payload").is_err());
+            assert_eq!(std::fs::read(&dest).unwrap(), b"keep");
+            assert_eq!(std::fs::read_dir(&ro).unwrap().count(), 1, "no staging file left behind");
+        }
+        let mut perms = std::fs::metadata(&ro).unwrap().permissions();
+        perms.set_mode(0o700);
+        std::fs::set_permissions(&ro, perms).unwrap();
+    }
+    let _ = std::fs::remove_dir_all(&d);
+}
diff --git a/crates/engine/src/cmd/file/tab_order_tests.rs b/crates/engine/src/cmd/file/tab_order_tests.rs
new file mode 100644
index 00000000..f884ee42
--- /dev/null
+++ b/crates/engine/src/cmd/file/tab_order_tests.rs
@@ -0,0 +1,18 @@
+use super::*;
+
+#[test]
+fn moving_and_closing_inactive_tabs_preserves_the_active_document() {
+    let mut session = Session::new();
+    for name in ["Two", "Three", "Four"] {
+        session.execute("file.new", &json!({"name": name})).unwrap();
+    }
+    session.execute("doc.switch", &json!({"index": 2})).unwrap();
+    let active_uid = session.docs[session.active].uid;
+    let moved_uid = session.docs[0].uid;
+    session.execute("file.moveTab", &json!({"from": 0, "to": 2})).unwrap();
+    assert_eq!(session.docs[2].uid, moved_uid);
+    assert_eq!(session.docs[session.active].uid, active_uid);
+    session.execute("file.close", &json!({"index": 0})).unwrap();
+    assert_eq!(session.docs[session.active].uid, active_uid);
+    assert!(session.execute("file.moveTab", &json!({"from": 0, "to": 99})).is_err());
+}
diff --git a/crates/engine/src/cmd/file/version.rs b/crates/engine/src/cmd/file/version.rs
new file mode 100644
index 00000000..3d311a44
--- /dev/null
+++ b/crates/engine/src/cmd/file/version.rs
@@ -0,0 +1,172 @@
+use super::*;
+
+pub(super) fn version_json(index: usize, v: &Version) -> Value {
+    let mut j = json!({"id": v.id, "index": index, "name": v.name, "description": v.description, "time": v.time});
+    if v.auto {
+        j["auto"] = json!(true);
+    }
+    j
+}
+
+/// Autosaves kept per file; older ones make room for new ones.
+pub const MAX_AUTOSAVES: usize = 20;
+
+/// `version.autosave`: a checkpoint of a document with unsaved changes since the last version.
+pub(super) fn autosave(s: &mut Session, _: &Value) -> Result<Value> {
+    let auto_save = s.prefs.auto_save;
+    let ds = s.ds_mut()?;
+    // A file that saves itself is rarely unsaved: edits since it was opened count then.
+    let edited = ds.is_dirty() || (auto_save && !ds.history.undo.is_empty());
+    if ds.preview.is_some() || !edited || !ds.changed_since_checkpoint() {
+        return Ok(json!({"saved": false}));
+    }
+    Ok(match add_version(ds, AUTOSAVE, "", true) {
+        Some(v) => json!({"saved": true, "version": v}),
+        None => json!({"saved": false}),
+    })
+}
+
+/// What checkpoints are called.
+const AUTOSAVE: &str = "Autosave";
+
+/// Add a version of `ds`'s document as it is now (`auto`: a checkpoint) and return it. The oldest
+/// autosave makes room when the autosaves or the history are full; versions the user named are
+/// never dropped, so a history full of them takes nothing (None).
+pub(crate) fn add_version(ds: &mut DocState, name: &str, description: &str, auto: bool) -> Option<Value> {
+    let autos = ds.versions.iter().filter(|v| v.auto).count();
+    if ((auto && autos >= MAX_AUTOSAVES) || ds.versions.len() >= figcraft_format::MAX_VERSIONS)
+        && let Some(oldest) = ds.versions.iter().position(|v| v.auto)
+    {
+        ds.versions_mut().remove(oldest);
+    }
+    if ds.versions.len() >= figcraft_format::MAX_VERSIONS {
+        return None;
+    }
+    let mut v = snapshot_version(ds, name, description);
+    v.auto = auto;
+    let out = version_json(ds.versions.len(), &v);
+    ds.versions_mut().push(v);
+    ds.mark_checkpoint();
+    Some(out)
+}
+
+/// Before the document is replaced (a restore, a merge): keep it in the history as it is, unless
+/// it is what the last version saved or restored holds.
+pub(crate) fn keep_in_history(ds: &mut DocState) {
+    if ds.branch_of.is_none() && ds.changed_since_checkpoint() {
+        add_version(ds, AUTOSAVE, "", true);
+    }
+}
+
+/// A version of `ds`'s document as it is now, opening on the page shown.
+fn snapshot_version(ds: &DocState, name: &str, description: &str) -> Version {
+    let mut snap = ds.doc.clone();
+    if snap.current_page != Some(ds.page) {
+        Arc::make_mut(&mut snap).current_page = Some(ds.page);
+    }
+    Version::new(unique_id(|id| ds.versions.iter().any(|v| v.id == id)), name, description, crate::cmd::comment::now_secs(), snap)
+}
+
+pub(super) fn version_list(ds: &DocState) -> Value {
+    let previewing = ds.preview.as_ref().map(|p| p.id.as_str());
+    Value::Array(
+        ds.versions
+            .iter()
+            .enumerate()
+            .map(|(i, v)| {
+                let mut j = version_json(i, v);
+                if previewing == Some(v.id.as_str()) {
+                    j["previewing"] = json!(true);
+                }
+                j
+            })
+            .collect(),
+    )
+}
+
+/// The version named by `id`, else by `index` (validated: never negative, never past the end).
+pub(super) fn version_index(cmd: &str, ds: &DocState, p: &Value) -> Result<usize> {
+    if let Some(id) = string(p, "id") {
+        return ds.versions.iter().position(|v| v.id == id).ok_or_else(|| bad(cmd, format!("no version `{id}`")));
+    }
+    if get(p, "index").is_none() {
+        return Err(bad(cmd, "pass the version's `id` or `index`"));
+    }
+    let i = req_index(cmd, p, "index")?;
+    if i < ds.versions.len() { Ok(i) } else { Err(bad(cmd, format!("no version at index {i}"))) }
+}
+
+pub(crate) fn read_version(v: &Version) -> Result<Arc<Document>> {
+    v.document().map_err(|e| EngineError::Other(format!("version “{}” can't be read: {e}", v.name)))
+}
+
+/// A new version or branch id: the time in milliseconds (hex), not `taken`.
+pub(crate) fn unique_id(taken: impl Fn(&str) -> bool) -> String {
+    let mut n = web_time::SystemTime::now().duration_since(web_time::UNIX_EPOCH).map(|d| d.as_millis() as u64).unwrap_or(0);
+    loop {
+        let id = format!("{n:x}");
+        if !taken(&id) {
+            return id;
+        }
+        n = n.wrapping_add(1);
+    }
+}
+
+/// `file.saveVersion`; on a branch tab the version goes into the branch's own history.
+pub(super) fn save_version(s: &mut Session, p: &Value) -> Result<Value> {
+    let ds = s.ds_mut()?;
+    if ds.versions.len() >= figcraft_format::MAX_VERSIONS {
+        return Err(EngineError::Disabled(
+            "file.saveVersion".into(),
+            format!("the version history is full ({} versions): delete old versions first", figcraft_format::MAX_VERSIONS),
+        ));
+    }
+    let name =
+        string(p, "name").map(|n| n.trim().to_string()).filter(|n| !n.is_empty()).unwrap_or_else(|| format!("Version {}", ds.versions.len() + 1));
+    let description = string(p, "description").unwrap_or_default();
+    // The version opens on the page shown when it was saved.
+    add_version(ds, &name, description.trim(), false).ok_or_else(|| {
+        EngineError::Disabled(
+            "file.saveVersion".into(),
+            format!("the version history is full ({} versions): delete old versions first", figcraft_format::MAX_VERSIONS),
+        )
+    })
+}
+
+pub(super) fn restore_version(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "version.restore";
+    // Refused before anything goes into the history.
+    if let Some(why) = s.live_read_only(s.ds()?.uid) {
+        return Err(EngineError::Disabled(CMD.into(), why.into()));
+    }
+    let ds = s.ds_mut()?;
+    let i = version_index(CMD, ds, p)?;
+    let v = ds.versions.get(i).ok_or_else(|| bad(CMD, "no such version"))?;
+    let (id, mut doc) = (v.id.clone(), read_version(v)?);
+    // Restoring never loses work: the document as it is goes into the history first.
+    keep_in_history(ds);
+    let out = ds.versions.iter().enumerate().find(|(_, v)| v.id == id).map_or(Value::Null, |(i, v)| version_json(i, v));
+    let d = Arc::make_mut(&mut doc);
+    d.name = ds.doc.name.clone();
+    // What the file published belongs to the file, not to the version.
+    d.published = ds.doc.published.clone();
+    // Comments are a conversation about the file, kept apart from its design history: they stay,
+    // and those on layers the version doesn't have stay where they were.
+    d.comments = ds.doc.comments.clone();
+    crate::cmd::comment::follow_anchors(d, &ds.doc);
+    // The snapshot is already consistent: nothing to re-normalise.
+    d.take_dirty();
+    // Stay on the current page when the version has it.
+    ds.page = Some(ds.page)
+        .filter(|pg| d.pages.contains(pg))
+        .or_else(|| d.current_page.filter(|pg| d.pages.contains(pg)))
+        .or_else(|| d.first_page())
+        .unwrap_or(ds.page);
+    ds.doc = doc;
+    ds.selection.clear();
+    ds.text_edit = None;
+    ds.vector_edit = None;
+    // The restored design is in the history already: restoring it again keeps nothing new.
+    ds.mark_checkpoint();
+    Ok(out)
+}
diff --git a/crates/engine/src/cmd/file/zip_cap_tests.rs b/crates/engine/src/cmd/file/zip_cap_tests.rs
new file mode 100644
index 00000000..ee3e461b
--- /dev/null
+++ b/crates/engine/src/cmd/file/zip_cap_tests.rs
@@ -0,0 +1,11 @@
+use super::add_member;
+
+#[test]
+fn zip_members_stop_at_the_limit_and_keep_what_fit() {
+    let mut members = Vec::new();
+    add_member(&mut members, "a.png", vec![0; 6], 10).unwrap();
+    add_member(&mut members, "b.png", vec![0; 4], 10).unwrap();
+    let err = add_member(&mut members, "c.png", vec![0; 1], 10).unwrap_err().to_string();
+    assert!(err.contains("as one zip"), "{err}");
+    assert_eq!(members.iter().map(|(n, _)| *n).collect::<Vec<_>>(), ["a.png", "b.png"]);
+}
diff --git a/crates/engine/src/cmd/layout.rs b/crates/engine/src/cmd/layout.rs
index 5643ac70..5a0a4000 100644
--- a/crates/engine/src/cmd/layout.rs
+++ b/crates/engine/src/cmd/layout.rs
@@ -19,6 +19,9 @@ pub fn specs() -> Vec<CommandSpec> {
     )]
 }
 
+/// Same cap the layout pass applies to grid track counts.
+const MAX_TRACKS: usize = 1000;
+
 fn set_track(s: &mut Session, p: &Value) -> Result<Value> {
     const CMD: &str = "layout.setTrack";
     let ids = req_targets(CMD, s, p)?;
@@ -38,7 +41,7 @@ fn set_track(s: &mut Session, p: &Value) -> Result<Value> {
         let Some(l) = n.layout.as_mut().filter(|l| l.mode == LayoutMode::Grid) else {
             return Err(bad(CMD, format!("node {id} is not a grid auto layout frame")));
         };
-        let count = tracks_now.len().max(if columns { l.grid_columns } else { l.grid_rows } as usize);
+        let count = tracks_now.len().max(if columns { l.grid_columns } else { l.grid_rows } as usize).min(MAX_TRACKS);
         if !(0.0..count as f64).contains(&index) {
             return Err(bad(CMD, format!("`index` must be 0..{count}")));
         }
@@ -149,6 +152,35 @@ mod tests {
         assert!(s.execute("node.set", &json!({"id": b, "props": {"absolute": "maybe"}})).is_err());
     }
 
+    /// Each side key writes its own padding slot and leaves the other three alone.
+    #[test]
+    fn each_side_padding_sets_its_side_alone() {
+        let mut s = Session::new();
+        let (f, _, _) = al_frame(&mut s);
+        // One side at a time: the other three stay 0 ([top, right, bottom, left]).
+        for (key, v, want) in [
+            ("paddingTop", 8.0, [8.0, 0.0, 0.0, 0.0]),
+            ("paddingRight", 12.0, [0.0, 12.0, 0.0, 0.0]),
+            ("paddingBottom", 16.0, [0.0, 0.0, 16.0, 0.0]),
+            ("paddingLeft", 20.0, [0.0, 0.0, 0.0, 20.0]),
+        ] {
+            ex(&mut s, "node.set", json!({"id": f, "props": {"padding": 0}}));
+            ex(&mut s, "node.set", json!({"id": f, "props": {key: v}}));
+            assert_eq!(node(&s, f).layout.as_ref().unwrap().padding, want, "{key}");
+        }
+        // The [t, r, b, l] array and the axis pairs agree with the four sides.
+        ex(&mut s, "node.set", json!({"id": f, "props": {"padding": [8, 12, 16, 20]}}));
+        assert_eq!(node(&s, f).layout.as_ref().unwrap().padding, [8.0, 12.0, 16.0, 20.0]);
+        ex(&mut s, "node.set", json!({"id": f, "props": {"paddingHorizontal": 4}}));
+        assert_eq!(node(&s, f).layout.as_ref().unwrap().padding, [8.0, 4.0, 16.0, 4.0]);
+        ex(&mut s, "node.set", json!({"id": f, "props": {"paddingVertical": 2}}));
+        assert_eq!(node(&s, f).layout.as_ref().unwrap().padding, [2.0, 4.0, 2.0, 4.0]);
+        // Negatives clamp to 0; junk is refused.
+        ex(&mut s, "node.set", json!({"id": f, "props": {"paddingTop": -5}}));
+        assert_eq!(node(&s, f).layout.as_ref().unwrap().padding[0], 0.0);
+        assert!(s.execute("node.set", &json!({"id": f, "props": {"paddingLeft": "wide"}})).is_err());
+    }
+
     #[test]
     fn baseline_alignment_lines_up_text() {
         let mut s = Session::new();
@@ -220,6 +252,17 @@ mod tests {
         assert!(s.execute("node.set", &json!({"id": f, "props": {"rowTracks": 5}})).is_err());
     }
 
+    #[test]
+    fn set_track_clamps_hostile_grid_counts() {
+        let mut s = Session::new();
+        let f = id(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 320, "height": 200, "props": {"layout": "grid"}})));
+        // A crafted file can carry a count node.set would have clamped.
+        s.doc_mut().unwrap().get_mut(f).unwrap().layout.as_mut().unwrap().grid_columns = 5_000_000;
+        let p = json!({"ids": [f], "axis": "columns", "index": 4_999_999, "sizing": "hug"});
+        assert!(s.execute("layout.setTrack", &p).is_err());
+        assert!(node(&s, f).layout.unwrap().column_tracks.len() <= 1000);
+    }
+
     #[test]
     fn layout_props_survive_hostile_values() {
         let junk = [json!(null), json!("NaN"), json!(-1e308), json!(1e308), json!([]), json!({}), json!(true), json!("-5fr")];
diff --git a/crates/engine/src/cmd/lists.rs b/crates/engine/src/cmd/lists.rs
index 769d0a29..287c9ddd 100644
--- a/crates/engine/src/cmd/lists.rs
+++ b/crates/engine/src/cmd/lists.rs
@@ -112,7 +112,8 @@ pub fn stop_binding(field: &str) -> Option<usize> {
 /// Keep the gradient stop bindings of paint `index` of `n`'s fills (or strokes) on their stops after
 /// the paint changed from `old`: one stop removed shifts the later ones down (the removed one's
 /// binding goes); a paint that is no longer a gradient drops them. Other edits keep stop indices.
-pub(crate) fn remap_stop_bindings(n: &mut Node, fills: bool, index: usize, old: &figcraft_color::Paint) {
+/// Returns the removed stop's index.
+pub(crate) fn remap_stop_bindings(n: &mut Node, fills: bool, index: usize, old: &figcraft_color::Paint) -> Option<usize> {
     use figcraft_color::PaintKind;
     let list = if fills { BoundList::Fills } else { BoundList::Strokes };
     let new = if fills { n.fills.get(index) } else { n.strokes.get(index) };
@@ -122,11 +123,11 @@ pub(crate) fn remap_stop_bindings(n: &mut Node, fills: bool, index: usize, old:
             // The first stop that differs is the removed one when the rest moved down unchanged.
             let k = a.stops.iter().zip(&b.stops).position(|(x, y)| x != y).unwrap_or(b.stops.len());
             if a.stops.get(k + 1..) != b.stops.get(k..) {
-                return;
+                return None;
             }
             Some(k)
         }
-        (_, Some(PaintKind::Gradient(_))) => return,
+        (_, Some(PaintKind::Gradient(_))) => return None,
         _ => None,
     };
     let keys: Vec<(String, Option<String>)> = n
@@ -150,6 +151,42 @@ pub(crate) fn remap_stop_bindings(n: &mut Node, fills: bool, index: usize, old:
         }
     }
     n.bound.extend(kept);
+    removed
+}
+
+/// After an explicit edit changed paint `index` of `n`'s fills (or strokes) from `old`: its stop
+/// bindings follow a removed stop, then each binding whose value the edit changed (the colour, the
+/// opacity, a stop's colour) lets go, so the edit stays instead of being put back from the
+/// variable. Bindings whose value the edit kept stay; a paint that is gone takes its bindings.
+pub(crate) fn rebind_edited_paint(n: &mut Node, fills: bool, index: usize, old: &figcraft_color::Paint) {
+    let removed = remap_stop_bindings(n, fills, index, old);
+    let mut old = old.clone();
+    if let (Some(k), figcraft_color::PaintKind::Gradient(g)) = (removed, &mut old.kind)
+        && k < g.stops.len()
+    {
+        g.stops.remove(k);
+    }
+    let list = if fills { BoundList::Fills } else { BoundList::Strokes };
+    let new = if fills { n.fills.get(index) } else { n.strokes.get(index) }.cloned();
+    n.bound.retain(|key, _| match list_binding(key) {
+        Some((l, i, field)) if l == list && i == index => new.as_ref().is_some_and(|new| paint_field_kept(&old, new, field)),
+        _ => true,
+    });
+}
+
+/// Whether a paint's bound `field` (`color`, `opacity`, `stops/<j>/color`, …) has the same value in
+/// `new` as in `old`.
+fn paint_field_kept(old: &figcraft_color::Paint, new: &figcraft_color::Paint, field: &str) -> bool {
+    use figcraft_color::PaintKind;
+    match field {
+        "color" => matches!((&old.kind, &new.kind), (PaintKind::Solid { color: a }, PaintKind::Solid { color: b }) if a == b),
+        "opacity" => old.opacity == new.opacity,
+        _ => match (stop_binding(field), &old.kind, &new.kind) {
+            (Some(j), PaintKind::Gradient(a), PaintKind::Gradient(b)) => a.stops.get(j).map(|s| s.color) == b.stops.get(j).map(|s| s.color),
+            (Some(_), _, _) => false,
+            _ => old == new,
+        },
+    }
 }
 
 /// Where item `k` lands when the item at `from` moves to `to`.
diff --git a/crates/engine/src/cmd/props.rs b/crates/engine/src/cmd/props.rs
index 598be752..30a10393 100644
--- a/crates/engine/src/cmd/props.rs
+++ b/crates/engine/src/cmd/props.rs
@@ -13,7 +13,7 @@ pub const STROKE_SIDES: [&str; 4] = ["strokeTopWeight", "strokeRightWeight", "st
 
 /// Keys `node.set` understands (documented for agents).
 pub const KEYS: &str = "name, visible, locked, opacity (0-1), blend, x, y (relative to the parent frame; groups don't count), width, height, rotation (degrees), \
-fills (paints or colours; gradients as {type: linearGradient|radialGradient|angularGradient|diamondGradient, stops: [\"#hex\", ...], from?, to?} too), fill (colour), strokes, stroke (colour), strokeWeight, strokeAlign (inside|center|outside), strokeSides [t,r,b,l], strokeTopWeight / strokeRightWeight / strokeBottomWeight / strokeLeftWeight (one side; turns on individual strokes), \
+fills (paints or colours; gradients as {type: linearGradient|radialGradient|angularGradient|diamondGradient, stops: [\"#hex\", ...], from?, to?} too), fill (colour, or \"none\"/null: no fill), strokes, stroke (colour, or \"none\"/null: no stroke), strokeWeight, strokeAlign (inside|center|outside), strokeSides [t,r,b,l], strokeTopWeight / strokeRightWeight / strokeBottomWeight / strokeLeftWeight (one side; turns on individual strokes), \
 strokeCap / startCap / endCap, strokeJoin, miterAngle (degrees: sharper joins bevel; or miterLimit as a ratio), dashes [..], widthProfile (preset uniform|wedge|taper|eye|rounded|pinch, [[t, scale], ...] or null), brush (preset id, {preset, spacing, sizeJitter, rotationJitter, scatter, seed} or null), cornerRadius (n or [tl,tr,br,bl]), cornerSmoothing (0-1), effects, \
 clip, isMask, layout (null|horizontal|vertical|grid|{...}), gap, crossGap, padding (n or [t,r,b,l]), paddingTop/Right/Bottom/Left, \
 mainAlign (min|center|max, or the auto gaps spaceBetween|spaceAround|spaceEvenly), crossAlign (min|center|max|baseline: first text baselines, horizontal layouts), contentAlign (wrapped lines: auto = packed where crossAlign says | spaceBetween), wrap (rows of a horizontal layout, columns of a vertical one), strokesIncluded (the frame's inside stroke takes up space), reverseZ (canvas stacking: true = first on top), \
@@ -26,7 +26,9 @@ fontSize, lineHeight (auto|px|\"150%\"), letterSpacing (px|\"2%\"), textAlign (l
 textDecorationColor (colour, or auto/null: the text's), textCase (original|upper|lower|title|smallCaps), paragraphSpacing, paragraphIndent, \
 listStyle (none|bulleted|numbered; with start/end: the paragraphs those chars touch), indentation (list nesting level 0-8, same range rule), \
 listSpacing (px between list items, in place of paragraphSpacing), hangingPunctuation, hangingList (markers outside the box), leadingTrim (vertical trim: none|capHeight), maxLines, features ({tag: bool}, e.g. {\"liga\": false, \"tnum\": true}), \
-fontVariations / variationSettings ({axis: number}, e.g. {\"wght\": 550, \"wdth\": 85}; null = none), pointCount, innerRadius, arcStart, arcSweep, \
+fontVariations / variationSettings ({axis: number}, e.g. {\"wght\": 550, \"wdth\": 85}; null = none), \
+path (a vector's SVG path data: replaces its geometry, keeping the layer, its paints, styles and bindings; width/height in the same call scale it as \
+node.create does; its own box goes at the layer's x/y, or with x/y given, at x + its left edge and y + its top as node.create places it), pointCount, innerRadius, arcStart, arcSweep, \
 arcInner, booleanOperation (a boolean group's operation, or an operand's own; null: the group's), operandOperation (a layer in a boolean \
 group: how it combines with the operands below it; null: the group's), constrainProportions, description, interactions, overflow, pluginData {k: v}";
 
@@ -61,6 +63,48 @@ pub fn snake(v: &Value) -> Value {
     }
 }
 
+/// `v` as an effect list, refusing keys an effect doesn't read: serde dropped them without a word,
+/// so a shadow given `offsetY` kept the default offset.
+pub fn effects_from(cmd: &str, v: &Value) -> Result<Vec<Effect>> {
+    let effects: Vec<Effect> = serde_json::from_value(snake(v)).map_err(|e| bad(cmd, format!("effects: {e}")))?;
+    for (i, given) in v.as_array().into_iter().flatten().enumerate() {
+        refuse_ignored_effect_keys(cmd, &format!("effects[{i}]"), given, |v| serde_json::from_value(snake(v)).ok())?;
+    }
+    Ok(effects)
+}
+
+/// `p[key]` as one effect, read as serde reads it (its aliases too), refusing keys it doesn't read.
+pub fn effect_from(cmd: &str, p: &Value, key: &str) -> Result<Option<Effect>> {
+    let Some(v) = get(p, key) else { return Ok(None) };
+    let effect: Effect = serde_json::from_value(v.clone()).map_err(|e| bad(cmd, format!("`{key}`: {e}")))?;
+    refuse_ignored_effect_keys(cmd, &format!("`{key}`"), v, |v| serde_json::from_value(v.clone()).ok())?;
+    Ok(Some(effect))
+}
+
+/// Refuse the keys of effect `given` that `parse` ignores, naming the keys the effect takes. Set to
+/// null, a key it reads fails to parse or changes the effect; a key it ignores changes nothing.
+fn refuse_ignored_effect_keys(cmd: &str, at: &str, given: &Value, parse: impl Fn(&Value) -> Option<Effect>) -> Result<()> {
+    let Some(fields) = given.as_object() else { return Ok(()) };
+    let parsed = parse(given);
+    let ignored: Vec<&str> = fields
+        .iter()
+        .filter(|(_, v)| !v.is_null())
+        .filter(|(k, _)| {
+            let mut probe = fields.clone();
+            probe.insert((*k).clone(), Value::Null);
+            parse(&Value::Object(probe)).is_some_and(|e| Some(e) == parsed)
+        })
+        .map(|(k, _)| k.as_str())
+        .collect();
+    if ignored.is_empty() {
+        return Ok(());
+    }
+    let takes = parsed.and_then(|e| serde_json::to_value(e).ok()).map(crate::inspect::camel).unwrap_or_default();
+    let kind = takes.get("type").and_then(Value::as_str).unwrap_or("effect").to_string();
+    let names: Vec<&str> = takes.as_object().into_iter().flatten().map(|(k, _)| k.as_str()).collect();
+    Err(bad(cmd, format!("{at}: unknown properties: {} (a {kind} takes {})", ignored.join(", "), names.join(", "))))
+}
+
 pub(crate) fn enum_of<T: serde::de::DeserializeOwned>(v: &Value) -> Option<T> {
     let s = v.as_str()?;
     // Accept camelCase, snake/upper-case and spaced variants.
@@ -100,7 +144,9 @@ pub(crate) fn sizing(v: &Value) -> Option<Sizing> {
 pub(crate) fn line_height(v: &Value) -> Option<LineHeight> {
     match v {
         Value::String(s) if s.eq_ignore_ascii_case("auto") => Some(LineHeight::Auto),
-        Value::String(s) if s.trim().ends_with('%') => s.trim().trim_end_matches('%').trim().parse().ok().map(LineHeight::Percent),
+        Value::String(s) if s.trim().ends_with('%') => {
+            s.trim().trim_end_matches('%').trim().parse().ok().filter(|f: &f64| f.is_finite()).map(LineHeight::Percent)
+        }
         Value::Object(_) => serde_json::from_value(v.clone()).ok(),
         other => f64_of(other).map(LineHeight::Pixels),
     }
@@ -108,7 +154,9 @@ pub(crate) fn line_height(v: &Value) -> Option<LineHeight> {
 
 pub(crate) fn letter_spacing(v: &Value) -> Option<LetterSpacing> {
     match v {
-        Value::String(s) if s.trim().ends_with('%') => s.trim().trim_end_matches('%').trim().parse().ok().map(LetterSpacing::Percent),
+        Value::String(s) if s.trim().ends_with('%') => {
+            s.trim().trim_end_matches('%').trim().parse().ok().filter(|f: &f64| f.is_finite()).map(LetterSpacing::Percent)
+        }
         Value::Object(_) => serde_json::from_value(v.clone()).ok(),
         other => f64_of(other).map(LetterSpacing::Pixels),
     }
@@ -265,23 +313,119 @@ fn ensure_layout(n: &mut Node) -> &mut AutoLayout {
     n.layout.get_or_insert_with(|| AutoLayout { padding: [0.0; 4], gap: 0.0, ..Default::default() })
 }
 
+/// The keys that set a frame's auto layout (through [`layout_mut`]).
+pub const LAYOUT_KEYS: &[&str] = &[
+    "gap",
+    "itemSpacing",
+    "columnGap",
+    "crossGap",
+    "counterAxisSpacing",
+    "rowGap",
+    "padding",
+    "paddingTop",
+    "paddingRight",
+    "paddingBottom",
+    "paddingLeft",
+    "paddingHorizontal",
+    "paddingVertical",
+    "mainAlign",
+    "primaryAxisAlignItems",
+    "crossAlign",
+    "counterAxisAlignItems",
+    "contentAlign",
+    "counterAxisAlignContent",
+    "wrap",
+    "gridColumns",
+    "gridRows",
+    "strokesIncluded",
+    "reverseZ",
+    "columnTracks",
+    "gridColumnTracks",
+    "rowTracks",
+    "gridRowTracks",
+];
+
+/// Drop the bindings of auto layout fields (gap, padding…): they go with the auto layout, or
+/// re-applying them would bring it back.
+pub fn drop_layout_bindings(n: &mut Node) {
+    n.bound.retain(|k, _| !LAYOUT_KEYS.contains(&k.as_str()));
+}
+
+/// The auto layout of a frame-like node, created when it has none yet. Other nodes can't hold an
+/// auto layout: an auto layout key on them is refused, not stored where nothing reads it
+/// (`node.set` on several layers skips them instead, see `edit::set`).
+fn layout_mut<'a>(cmd: &str, k: &str, n: &'a mut Node) -> Result<&'a mut AutoLayout> {
+    if !n.kind.is_frame_like() {
+        return Err(bad(
+            cmd,
+            format!(
+                "`{k}` is an auto layout property, and layer {} “{}” is a {} (only frames, components and instances have auto layout)",
+                n.id,
+                n.name,
+                n.kind.type_name()
+            ),
+        ));
+    }
+    Ok(ensure_layout(n))
+}
+
+/// Replace a node's fills (or strokes). Bindings on the paints whose bound values the new list
+/// changed let go, as an explicit edit does (see `lists::rebind_edited_paint`).
+fn set_paints(n: &mut Node, fills: bool, paints: Vec<Paint>) {
+    let old = std::mem::replace(if fills { &mut n.fills } else { &mut n.strokes }, paints);
+    for (i, p) in old.iter().enumerate() {
+        super::lists::rebind_edited_paint(n, fills, i, p);
+    }
+}
+
+/// `"none"` (either case) and null ask for no paint, as an empty `fills`/`strokes` list does.
+fn paint_none(v: &Value) -> bool {
+    v.is_null() || v.as_str().is_some_and(|s| s.eq_ignore_ascii_case("none"))
+}
+
+/// The order [`apply`] takes keys in: geometry first so rotation applies to the final size, style
+/// links after the values so a link wins over values its style sets, variable bindings last so
+/// paints set in the same call don't detach them.
+fn apply_order(k: &str) -> u8 {
+    match k {
+        "path" | "width" | "height" | "w" | "h" => 0,
+        "rotation" => 2,
+        "x" | "y" => 3,
+        "fillStyle" | "strokeStyle" | "effectStyle" | "textStyle" | "gridStyle" => 4,
+        "boundVariables" => 5,
+        _ => 1,
+    }
+}
+
+/// An explicit width (`is_w`) or height makes hugging or filling on that axis fixed, like typing
+/// into W or H.
+fn fix_axis(doc: &mut Document, id: NodeId, is_w: bool) -> Result<()> {
+    let n = doc.get_mut(id)?;
+    if is_w {
+        n.child_layout.sizing_h = Sizing::Fixed;
+    } else {
+        n.child_layout.sizing_v = Sizing::Fixed;
+    }
+    Ok(())
+}
+
 /// Apply a property map to one node. `x`/`y` are relative to the parent.
 pub fn apply(cmd: &str, doc: &mut Document, id: NodeId, props: &Map<String, Value>) -> Result<()> {
     let mut unknown = Vec::new();
-    // Geometry keys first so rotation applies to the final size.
-    let order = |k: &str| match k {
-        "width" | "height" | "w" | "h" => 0,
-        "rotation" => 2,
-        "x" | "y" => 3,
-        _ => 1,
-    };
     let mut keys: Vec<(&String, &Value)> = props.iter().collect();
-    keys.sort_by_key(|(k, _)| order(k));
+    keys.sort_by_key(|(k, _)| apply_order(k));
+    // Where a new `path` had its own box, for `x`/`y` in the same call (as `node.create` places it).
+    let mut path_offset = (0.0, 0.0);
     for (k, v) in keys {
         let k = k.as_str();
         match k {
+            "path" => path_offset = set_path(cmd, doc, id, v, props)?,
+            // A new path takes the size asked for as its scale (`set_path`); the size still fixes
+            // its auto layout axis.
+            "width" | "height" | "w" | "h" if props.contains_key("path") => fix_axis(doc, id, k.starts_with('w'))?,
             "x" | "y" => {
                 let val = f64_of(v).ok_or_else(|| bad(cmd, format!("`{k}` must be a number")))?;
+                let val = val + if k == "x" { path_offset.0 } else { path_offset.1 };
                 // X/Y are the node's own origin (its rotated top-left for rotated nodes), in the
                 // frame it is in (groups have no space of their own).
                 let n = doc.get(id)?;
@@ -317,19 +461,9 @@ pub fn apply(cmd: &str, doc: &mut Document, id: NodeId, props: &Map<String, Valu
                 resize_node(doc, id, nw, nh)?;
                 // Explicit size makes text fixed in that dimension.
                 if let Some(t) = doc.get_mut(id)?.kind.text_mut() {
-                    t.auto_resize = if is_w {
-                        if t.auto_resize == TextAutoResize::WidthAndHeight { TextAutoResize::Height } else { t.auto_resize }
-                    } else {
-                        TextAutoResize::None
-                    };
-                }
-                // Explicit width/height makes hugging/filling fixed (like typing into W/H).
-                let n = doc.get_mut(id)?;
-                if is_w {
-                    n.child_layout.sizing_h = Sizing::Fixed;
-                } else {
-                    n.child_layout.sizing_v = Sizing::Fixed;
+                    t.fix_size(is_w, !is_w);
                 }
+                fix_axis(doc, id, is_w)?;
             }
             "rotation" => {
                 let deg = f64_of(v).ok_or_else(|| bad(cmd, "`rotation` must be degrees"))?;
@@ -348,15 +482,23 @@ pub fn apply(cmd: &str, doc: &mut Document, id: NodeId, props: &Map<String, Valu
                 let b = v.as_str().and_then(figcraft_color::BlendMode::from_name).ok_or_else(|| bad(cmd, "unknown blend mode"))?;
                 doc.get_mut(id)?.blend = b;
             }
-            "fills" => doc.get_mut(id)?.fills = paints_of(v).ok_or_else(|| bad(cmd, "`fills` must be paints or colours"))?,
+            "fills" => set_paints(doc.get_mut(id)?, true, paints_of(v).ok_or_else(|| bad(cmd, "`fills` must be paints or colours"))?),
             "fill" => {
-                let c = color_of(v).ok_or_else(|| bad(cmd, "`fill` must be a colour"))?;
-                doc.get_mut(id)?.fills = vec![Paint::solid(c)];
+                if paint_none(v) {
+                    set_paints(doc.get_mut(id)?, true, vec![]);
+                } else {
+                    let c = color_of(v).ok_or_else(|| bad(cmd, "`fill` must be a colour, \"none\" or null"))?;
+                    set_paints(doc.get_mut(id)?, true, vec![Paint::solid(c)]);
+                }
             }
-            "strokes" => doc.get_mut(id)?.strokes = paints_of(v).ok_or_else(|| bad(cmd, "`strokes` must be paints or colours"))?,
+            "strokes" => set_paints(doc.get_mut(id)?, false, paints_of(v).ok_or_else(|| bad(cmd, "`strokes` must be paints or colours"))?),
             "stroke" => {
-                let c = color_of(v).ok_or_else(|| bad(cmd, "`stroke` must be a colour"))?;
-                doc.get_mut(id)?.strokes = vec![Paint::solid(c)];
+                if paint_none(v) {
+                    set_paints(doc.get_mut(id)?, false, vec![]);
+                } else {
+                    let c = color_of(v).ok_or_else(|| bad(cmd, "`stroke` must be a colour, \"none\" or null"))?;
+                    set_paints(doc.get_mut(id)?, false, vec![Paint::solid(c)]);
+                }
             }
             "strokeWeight" => doc.get_mut(id)?.stroke.weight = f64_of(v).ok_or_else(|| bad(cmd, "`strokeWeight` must be a number"))?.max(0.0),
             "strokeAlign" => doc.get_mut(id)?.stroke.align = enum_of(v).ok_or_else(|| bad(cmd, "strokeAlign: inside|center|outside"))?,
@@ -412,7 +554,7 @@ pub fn apply(cmd: &str, doc: &mut Document, id: NodeId, props: &Map<String, Valu
                 }
             }
             "cornerSmoothing" => doc.get_mut(id)?.corners.smoothing = f64_of(v).unwrap_or(0.0).clamp(0.0, 1.0),
-            "effects" => doc.get_mut(id)?.effects = serde_json::from_value(snake(v)).map_err(|e| bad(cmd, format!("effects: {e}")))?,
+            "effects" => doc.get_mut(id)?.effects = effects_from(cmd, v)?,
             "clip" | "clipsContent" => doc.get_mut(id)?.clip = v.as_bool().ok_or_else(|| bad(cmd, "`clip` must be a boolean"))?,
             "isMask" => doc.get_mut(id)?.is_mask = v.as_bool().unwrap_or(false),
             "devStatus" => {
@@ -421,8 +563,12 @@ pub fn apply(cmd: &str, doc: &mut Document, id: NodeId, props: &Map<String, Valu
                 } else {
                     v.as_str().and_then(|s| DevStatus::ALL.into_iter().find(|d| d.id().eq_ignore_ascii_case(s)))
                 };
+                let st = st.ok_or_else(|| bad(cmd, "devStatus: none|readyForDev|completed"))?;
+                if !st.is_none() && !crate::devinspect::has_status(doc, id) {
+                    return Err(bad(cmd, "devStatus: only sections and frames at the top of a page or section take one"));
+                }
                 let n = doc.get_mut(id)?;
-                n.dev_status = st.ok_or_else(|| bad(cmd, "devStatus: none|readyForDev|completed"))?;
+                n.dev_status = st;
                 // Marking a layer (again) starts from its current contents.
                 n.dev_changed = false;
             }
@@ -436,8 +582,14 @@ pub fn apply(cmd: &str, doc: &mut Document, id: NodeId, props: &Map<String, Valu
                     return Err(bad(cmd, "auto layout needs a frame"));
                 }
                 match v {
-                    Value::Null => n.layout = None,
-                    Value::String(s) if s.eq_ignore_ascii_case("none") => n.layout = None,
+                    Value::Null => {
+                        n.layout = None;
+                        drop_layout_bindings(n);
+                    }
+                    Value::String(s) if s.eq_ignore_ascii_case("none") => {
+                        n.layout = None;
+                        drop_layout_bindings(n);
+                    }
                     Value::String(s) => {
                         let mode = match s.to_ascii_lowercase().as_str() {
                             "horizontal" | "row" => LayoutMode::Horizontal,
@@ -452,56 +604,56 @@ pub fn apply(cmd: &str, doc: &mut Document, id: NodeId, props: &Map<String, Valu
                 }
             }
             "gap" | "itemSpacing" | "columnGap" => {
-                ensure_layout(doc.get_mut(id)?).gap = f64_of(v).ok_or_else(|| bad(cmd, format!("`{k}` must be a number")))?
+                layout_mut(cmd, k, doc.get_mut(id)?)?.gap = f64_of(v).ok_or_else(|| bad(cmd, format!("`{k}` must be a number")))?
             }
             "crossGap" | "counterAxisSpacing" | "rowGap" => {
-                ensure_layout(doc.get_mut(id)?).cross_gap = f64_of(v).ok_or_else(|| bad(cmd, format!("`{k}` must be a number")))?
+                layout_mut(cmd, k, doc.get_mut(id)?)?.cross_gap = f64_of(v).ok_or_else(|| bad(cmd, format!("`{k}` must be a number")))?
             }
             "padding" => {
                 let p = four(v).ok_or_else(|| bad(cmd, "padding: n or [t,r,b,l]"))?;
-                ensure_layout(doc.get_mut(id)?).padding = p.map(|x| x.max(0.0));
+                layout_mut(cmd, k, doc.get_mut(id)?)?.padding = p.map(|x| x.max(0.0));
             }
             "paddingTop" | "paddingRight" | "paddingBottom" | "paddingLeft" => {
                 let i = ["paddingTop", "paddingRight", "paddingBottom", "paddingLeft"].iter().position(|x| *x == k).unwrap_or(0);
                 let val = f64_of(v).ok_or_else(|| bad(cmd, format!("`{k}` must be a number")))?.max(0.0);
-                if let Some(slot) = ensure_layout(doc.get_mut(id)?).padding.get_mut(i) {
+                if let Some(slot) = layout_mut(cmd, k, doc.get_mut(id)?)?.padding.get_mut(i) {
                     *slot = val;
                 }
             }
             "paddingHorizontal" => {
                 let val = f64_of(v).unwrap_or(0.0).max(0.0);
-                let l = ensure_layout(doc.get_mut(id)?);
+                let l = layout_mut(cmd, k, doc.get_mut(id)?)?;
                 l.padding[1] = val;
                 l.padding[3] = val;
             }
             "paddingVertical" => {
                 let val = f64_of(v).unwrap_or(0.0).max(0.0);
-                let l = ensure_layout(doc.get_mut(id)?);
+                let l = layout_mut(cmd, k, doc.get_mut(id)?)?;
                 l.padding[0] = val;
                 l.padding[2] = val;
             }
             "mainAlign" | "primaryAxisAlignItems" => {
-                ensure_layout(doc.get_mut(id)?).main_align =
+                layout_mut(cmd, k, doc.get_mut(id)?)?.main_align =
                     enum_of(v).ok_or_else(|| bad(cmd, "mainAlign: min|center|max|spaceBetween|spaceAround|spaceEvenly"))?
             }
             "crossAlign" | "counterAxisAlignItems" => {
-                ensure_layout(doc.get_mut(id)?).cross_align = enum_of(v).ok_or_else(|| bad(cmd, "crossAlign: min|center|max|baseline"))?
+                layout_mut(cmd, k, doc.get_mut(id)?)?.cross_align = enum_of(v).ok_or_else(|| bad(cmd, "crossAlign: min|center|max|baseline"))?
             }
             "contentAlign" | "counterAxisAlignContent" => {
-                ensure_layout(doc.get_mut(id)?).content_align = enum_of(v).ok_or_else(|| bad(cmd, "contentAlign: auto|spaceBetween"))?
+                layout_mut(cmd, k, doc.get_mut(id)?)?.content_align = enum_of(v).ok_or_else(|| bad(cmd, "contentAlign: auto|spaceBetween"))?
             }
-            "wrap" => ensure_layout(doc.get_mut(id)?).wrap = v.as_bool().unwrap_or(false),
+            "wrap" => layout_mut(cmd, k, doc.get_mut(id)?)?.wrap = v.as_bool().unwrap_or(false),
             "gridColumns" | "gridRows" => {
                 let count = f64_of(v).ok_or_else(|| bad(cmd, format!("`{k}` must be a number")))?.clamp(1.0, 1000.0) as u32;
-                let l = ensure_layout(doc.get_mut(id)?);
+                let l = layout_mut(cmd, k, doc.get_mut(id)?)?;
                 // Tracks past the new count go away (new tracks are 1fr).
                 let (n, tracks) =
                     if k == "gridColumns" { (&mut l.grid_columns, &mut l.column_tracks) } else { (&mut l.grid_rows, &mut l.row_tracks) };
                 *n = count;
                 tracks.truncate(count as usize);
             }
-            "strokesIncluded" => ensure_layout(doc.get_mut(id)?).strokes_included = v.as_bool().unwrap_or(false),
-            "reverseZ" => ensure_layout(doc.get_mut(id)?).reverse_z = v.as_bool().unwrap_or(false),
+            "strokesIncluded" => layout_mut(cmd, k, doc.get_mut(id)?)?.strokes_included = v.as_bool().unwrap_or(false),
+            "reverseZ" => layout_mut(cmd, k, doc.get_mut(id)?)?.reverse_z = v.as_bool().unwrap_or(false),
             "sizingH" | "layoutSizingHorizontal" => {
                 let s = sizing(v).ok_or_else(|| bad(cmd, "sizing: fixed|hug|fill"))?;
                 set_sizing(cmd, doc, id, s, true)?;
@@ -533,7 +685,7 @@ pub fn apply(cmd: &str, doc: &mut Document, id: NodeId, props: &Map<String, Valu
             "columnTracks" | "gridColumnTracks" | "rowTracks" | "gridRowTracks" => {
                 let a = v.as_array().ok_or_else(|| bad(cmd, format!("`{k}` must be an array of tracks")))?;
                 let tracks = a.iter().map(track_of).collect::<Option<Vec<_>>>().ok_or_else(|| bad(cmd, TRACK_HELP))?;
-                let l = ensure_layout(doc.get_mut(id)?);
+                let l = layout_mut(cmd, k, doc.get_mut(id)?)?;
                 if k.contains("olumn") {
                     l.grid_columns = (tracks.len() as u32).clamp(1, 1000);
                     l.column_tracks = tracks;
@@ -725,10 +877,15 @@ pub fn apply(cmd: &str, doc: &mut Document, id: NodeId, props: &Map<String, Valu
                     for (field, var) in o {
                         match var.as_str() {
                             Some(vid) => {
+                                if n.bound.get(field).map(String::as_str) != Some(vid) {
+                                    crate::cmd::styles::rebind_paint_alpha(&mut n.fills, &mut n.strokes, field, true);
+                                }
                                 n.bound.insert(field.clone(), vid.to_string());
                             }
                             None => {
-                                n.bound.remove(field);
+                                if n.bound.remove(field).is_some() {
+                                    crate::cmd::styles::rebind_paint_alpha(&mut n.fills, &mut n.strokes, field, false);
+                                }
                             }
                         }
                     }
@@ -783,18 +940,47 @@ pub fn apply(cmd: &str, doc: &mut Document, id: NodeId, props: &Map<String, Valu
     if !unknown.is_empty() {
         return Err(bad(cmd, format!("unknown properties: {} (known: {KEYS})", unknown.join(", "))));
     }
-    // Inside an instance, record which property groups were overridden (an instance's own export
-    // settings and interactions are its own, not overrides).
+    // Inside an instance, record which property groups were overridden (an instance's own
+    // resizing, export settings and interactions are its own, not overrides).
     let own_root = matches!(doc.get(id)?.kind, NodeKind::Instance { .. }) && !crate::components::inside_instance(doc, id);
     let n = doc.get_mut(id)?;
     if n.source.is_some() {
-        for g in props.keys().map(|k| override_group(k)).filter(|g| *g != "other" && !(own_root && matches!(*g, "exports" | "interactions"))) {
+        for g in
+            props.keys().map(|k| override_group(k)).filter(|g| *g != "other" && !(own_root && matches!(*g, "resizing" | "exports" | "interactions")))
+        {
             n.overrides.insert(g.to_string());
         }
     }
     Ok(())
 }
 
+/// Replace vector `id`'s geometry with SVG path data `v`, as `node.create` reads it: `width`/`height`
+/// in the same call scale it, and the path's own box goes at the layer's origin, which keeps its
+/// place, rotation and everything else. Returns where the path's own box was, which `x`/`y` in the
+/// same call add (so `{path, x: 0, y: 0}` places it as `node.create` does). Layers inside an
+/// instance are refused: their geometry comes from the main component, and a sync would undo it.
+fn set_path(cmd: &str, doc: &mut Document, id: NodeId, v: &Value, props: &Map<String, Value>) -> Result<(f64, f64)> {
+    let d = v.as_str().ok_or_else(|| bad(cmd, "`path` must be SVG path data (a string)"))?;
+    let n = doc.get(id)?;
+    if !matches!(n.kind, NodeKind::Vector { .. }) {
+        return Err(bad(cmd, format!("`path` applies to vector layers, and layer {} “{}” is a {}", n.id, n.name, n.kind.type_name())));
+    }
+    if crate::components::inside_instance(doc, id) {
+        return Err(bad(cmd, format!("`path`: layer {} “{}” is inside an instance: edit its main component, or detach the instance", n.id, n.name)));
+    }
+    let size = |long: &str, short: &str| -> Result<Option<f64>> {
+        props.get(long).or_else(|| props.get(short)).map(|v| f64_of(v).ok_or_else(|| bad(cmd, format!("`{long}` must be a number")))).transpose()
+    };
+    let shape = super::create::path_network(cmd, d, size("width", "w")?, size("height", "h")?)?;
+    let n = doc.get_mut(id)?;
+    if let NodeKind::Vector { network } = &mut n.kind {
+        *network = shape.network;
+    }
+    n.width = shape.width;
+    n.height = shape.height;
+    Ok(shape.offset)
+}
+
 /// The override group a property key belongs to.
 pub fn override_group(k: &str) -> &'static str {
     match k {
@@ -810,7 +996,8 @@ pub fn override_group(k: &str) -> &'static str {
         "features" | "fontFeatures" | "openTypeFeatures" | "listStyle" | "indentation" | "listSpacing" | "maxLines" | "variationSettings"
         | "hangingPunctuation" | "hangingList" => "textStyle",
         "cornerRadius" | "cornerSmoothing" | "topLeftRadius" | "topRightRadius" | "bottomRightRadius" | "bottomLeftRadius" => "corners",
-        "width" | "height" | "w" | "h" | "sizingH" | "sizingV" => "size",
+        "width" | "height" | "w" | "h" => "size",
+        "sizingH" | "sizingV" | "layoutSizingHorizontal" | "layoutSizingVertical" | "minWidth" | "maxWidth" | "minHeight" | "maxHeight" => "resizing",
         "gap" | "itemSpacing" | "columnGap" | "crossGap" | "counterAxisSpacing" | "rowGap" => "gap",
         "padding" | "paddingTop" | "paddingRight" | "paddingBottom" | "paddingLeft" | "paddingHorizontal" | "paddingVertical" => "padding",
         "mainAlign" | "primaryAxisAlignItems" | "crossAlign" | "counterAxisAlignItems" | "contentAlign" | "counterAxisAlignContent" => "alignment",
@@ -1029,6 +1216,7 @@ fn set_sizing(cmd: &str, doc: &mut Document, id: NodeId, s: Sizing, horizontal:
         t.auto_resize = match (n.child_layout.sizing_h, n.child_layout.sizing_v) {
             (Sizing::Hug, _) => TextAutoResize::WidthAndHeight,
             (_, Sizing::Hug) => TextAutoResize::Height,
+            _ if t.truncates() => TextAutoResize::Truncate,
             _ => TextAutoResize::None,
         };
     }
@@ -1090,3 +1278,17 @@ pub fn describe(doc: &Document, id: NodeId) -> Value {
     let _ = Color::BLACK;
     v
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn non_finite_percent_strings_are_rejected() {
+        for s in ["NaN%", "inf%", "-inf%"] {
+            assert!(line_height(&json!(s)).is_none(), "line_height accepted {s}");
+            assert!(letter_spacing(&json!(s)).is_none(), "letter_spacing accepted {s}");
+        }
+        assert!(matches!(line_height(&json!("150%")), Some(LineHeight::Percent(p)) if p == 150.0));
+    }
+}
diff --git a/crates/engine/src/cmd/proto.rs b/crates/engine/src/cmd/proto.rs
index be6907b5..ce7219f4 100644
--- a/crates/engine/src/cmd/proto.rs
+++ b/crates/engine/src/cmd/proto.rs
@@ -13,7 +13,7 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "proto.interaction.add",
             "Add interaction",
-            "{id?, trigger? {type: onClick|onHover|onPress|onDrag|mouseEnter|mouseLeave|mouseDown|mouseUp|afterDelay {ms}|keyPress {key (a key or a combination: Shift+K, Ctrl+Alt+Delete; or a controller button: Gamepad A|B|X|Y|LB|RB|LT|RT|View|Menu|LS|RS|Up|Down|Left|Right|Home)}}, action {type: navigate {preserveScroll?}|back|scrollTo {offset? [x, y] (where the layer ends up from the top-left)}|openOverlay {position?, offset? [x, y] (position manual: the overlay's top-left from the top-left of the layer that opens it; without it, right below that layer), close_on_outside? (default true), background?}|swapOverlay|closeOverlay|openUrl {url}|changeTo|setVariable {variable, value | expression (text, e.g. \"count + 1\")}|setVariableMode {collection, mode}|conditional {blocks [{condition? | expression? (text, e.g. \"count >= 3\"), actions}]}, dest?}, actions? [..], transition? {type: instant|dissolve|smartAnimate|moveIn|moveOut|push|slideIn|slideOut, direction?: left|right|top|bottom}, durationMs?, easing? linear|easeIn|easeOut|easeInOut|easeInBack|easeOutBack|easeInOutBack|gentle|quick|bouncy|slow|{customBezier {x1, y1, x2, y2}}|{customSpring {mass, stiffness, damping}}}, delayMs? (mouse enter, leave, down and up: how long after the gesture the actions run, up to 600000)} — or {id, dest} for a click-navigate. Returns {index}",
+            "{id?, trigger? {type: onClick|onHover|onPress|onDrag|mouseEnter|mouseLeave|mouseDown|mouseUp|afterDelay {ms}|keyPress {key (a key or a combination: Shift+K, Ctrl+Alt+Delete; or a controller button: Gamepad A|B|X|Y|LB|RB|LT|RT|View|Menu|LS|RS|Up|Down|Left|Right|Home)}}, action {type: navigate {preserveScroll?}|back|scrollTo {offset? [x, y] (where the layer ends up from the top-left)}|openOverlay {position?, anchor? screen|triggerInside|triggerOutside (default screen; the trigger ones measure the position preset on the layer that opens the overlay: outside puts top presets above it and bottom presets below it, edges lined up), offset? [x, y] (position manual: the overlay's top-left from the top-left of the layer that opens it; without it, right below that layer), close_on_outside? (default true), background?}|swapOverlay|closeOverlay|openUrl {url}|changeTo|setVariable {variable, value | expression (text, e.g. \"count + 1\")}|setVariableMode {collection, mode}|conditional {blocks [{condition? | expression? (text, e.g. \"count >= 3\"), actions}]}, dest?}, actions? [..], transition? {type: instant|dissolve|smartAnimate|moveIn|moveOut|push|slideIn|slideOut, direction?: left|right|top|bottom}, durationMs?, easing? linear|easeIn|easeOut|easeInOut|easeInBack|easeOutBack|easeInOutBack|gentle|quick|bouncy|slow|{customBezier {x1, y1, x2, y2}}|{customSpring {mass, stiffness, damping}}}, delayMs? (mouse enter, leave, down and up: how long after the gesture the actions run, up to 600000)} — or {id, dest} for a click-navigate. Returns {index}",
             true,
             add
         ),
@@ -155,6 +155,17 @@ pub fn specs() -> Vec<CommandSpec> {
                 ok()
             }
         ),
+        spec!(
+            "proto.linkNotice",
+            "Notice before leaving for a link",
+            "{show? (default true; false skips it)}  whether a presented prototype's Open link to a website first says that it leaves the prototype, with Open link and Cancel; kept with the preferences → {shown}",
+            false,
+            |s, p| {
+                let show = boolean(p, "show").unwrap_or(true);
+                s.prefs.link_notice_skipped = !show;
+                Ok(json!({"shown": show}))
+            }
+        ),
     ]
 }
 
diff --git a/crates/engine/src/cmd/section.rs b/crates/engine/src/cmd/section.rs
index ac7fb1ee..08a5a7cc 100644
--- a/crates/engine/src/cmd/section.rs
+++ b/crates/engine/src/cmd/section.rs
@@ -34,7 +34,7 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "dev.compare",
             "Compare changes",
-            "{id? (default the first selected layer), show? (open the compare view in the app)} → {id, name, changed, snapshot, added, removed, modified, truncated, changes: [{id, name, type, change: added|removed|changed, depth, layers, properties?: [{section, property, before, after, text}]}]}  what changed in a ready-for-dev frame or section since it was marked (`snapshot` is false when that isn't known: a file from before snapshots were kept)",
+            "{id? (default the first selected layer), version? (a version id from version.list: compare with that saved version instead; any top-level frame or section), show? (open the compare view in the app)} → {id, name, changed, snapshot, added, removed, modified, truncated, version: {id, name, time} | null, changes: [{id, name, type, change: added|removed|changed, depth, layers, properties?: [{section, property, before, after, text}]}]}  what changed in a ready-for-dev frame or section since it was marked, or since the version (`snapshot` is false when that isn't known: a file from before snapshots were kept)",
             false,
             compare
         ),
@@ -104,14 +104,30 @@ fn resolve_change(s: &mut Session, p: &Value) -> Result<Value> {
 fn compare(s: &mut Session, p: &Value) -> Result<Value> {
     let cmd = "dev.compare";
     let id = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a frame or section or pass `id`"))?;
-    let doc = s.doc()?;
+    let version = match get(p, "version") {
+        None | Some(Value::Null) => None,
+        Some(Value::String(v)) => Some(v.clone()),
+        Some(_) => return Err(bad(cmd, "version: a version id (version.list)")),
+    };
+    let ds = s.ds()?;
+    let doc = &ds.doc;
     let n = doc.node(id).ok_or_else(|| bad(cmd, "no such layer"))?;
-    if !has_status(doc, id) || n.dev_status != DevStatus::ReadyForDev {
-        return Err(bad(cmd, "compare a frame or section marked ready for dev"));
+    if !has_status(doc, id) {
+        return Err(bad(cmd, "compare a top-level frame or a section"));
     }
-    let v = serde_json::to_value(crate::devcompare::compare(doc, id)).unwrap_or(Value::Null);
+    let (cmp, against) = match &version {
+        Some(v) => {
+            let ver = ds.versions.iter().find(|x| x.id == *v).ok_or_else(|| bad(cmd, format!("no version `{v}`")))?;
+            let before = crate::cmd::file::read_version(ver)?;
+            (crate::devcompare::compare_with(&before, doc, id), json!({"id": ver.id, "name": ver.name, "time": ver.time}))
+        }
+        None if n.dev_status != DevStatus::ReadyForDev => return Err(bad(cmd, "compare a frame or section marked ready for dev, or pass `version`")),
+        None => (crate::devcompare::compare(doc, id), Value::Null),
+    };
+    let mut v = serde_json::to_value(cmp).unwrap_or(Value::Null);
+    v["version"] = against;
     if boolean(p, "show") == Some(true) {
-        s.request_ui("view.devCompare", json!({"id": id}));
+        s.request_ui("view.devCompare", json!({"id": id, "version": version}));
     }
     Ok(v)
 }
diff --git a/crates/engine/src/cmd/structure.rs b/crates/engine/src/cmd/structure.rs
index bed70d3d..700825f2 100644
--- a/crates/engine/src/cmd/structure.rs
+++ b/crates/engine/src/cmd/structure.rs
@@ -10,11 +10,13 @@ use super::{CommandSpec, ok};
 use crate::params::*;
 use crate::{EngineError, Result, Session, bad, spec};
 
+/// The layer structure commands: group, frame, mask, boolean operations, flatten, auto layout
+/// add/remove, move to page and vector path edits.
 pub fn specs() -> Vec<CommandSpec> {
     vec![
-        spec!("object.group", "Group selection", "{ids?, name?}", true, |s, p| wrap(s, p, Wrap::Group)),
+        spec!("object.group", "Group selection", "{ids?, name?}", true, |s, p| wrap(s, p, "object.group", Wrap::Group)),
         spec!("object.ungroup", "Ungroup selection", "{ids?}", true, ungroup),
-        spec!("object.frameSelection", "Frame selection", "{ids?, name?}", true, |s, p| wrap(s, p, Wrap::Frame)),
+        spec!("object.frameSelection", "Frame selection", "{ids?, name?}", true, |s, p| wrap(s, p, "object.frameSelection", Wrap::Frame)),
         spec!("object.removeFrame", "Remove frame", "{ids?}", true, ungroup),
         spec!(
             "object.convertToGroup",
@@ -26,16 +28,23 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "object.convertToFrame",
             "Convert to frame",
-            "{ids?} (groups become frames of the same box in place, their layers staying where they are: no fill, not clipping. Frames are left alone; instances, main components and layers inside instances are refused)",
+            "{ids?} (groups become frames of the same box in place, their layers staying where they are: no fill, not clipping; sections become frames that keep their fill and don't clip. Frames are left alone; instances, main components, layers inside instances and sections holding sections are refused)",
             true,
             |s, p| convert(s, p, "object.convertToFrame", true)
         ),
+        spec!(
+            "object.convertToSection",
+            "Convert to section",
+            "{ids?} (frames on the page or in a section become sections in place, keeping their fill and layers; what only a frame has goes: auto layout, clipping, layout grids, guides and scrolling. Sections are left alone; nested frames, instances and main components are refused)",
+            true,
+            convert_to_section
+        ),
         spec!(
             "object.wrapInSection",
             "Wrap in new section",
             "{ids?, name?} (layers on the page or in a section; the section wraps them with some room)",
             true,
-            |s, p| wrap(s, p, Wrap::Section)
+            |s, p| wrap(s, p, "object.wrapInSection", Wrap::Section)
         ),
         spec!(
             "object.resizeToFit",
@@ -64,7 +73,9 @@ pub fn specs() -> Vec<CommandSpec> {
                 // Hugging needs auto layout and the children that filled have nothing to fill: both
                 // become fixed (the frame keeps filling its own auto layout parent).
                 let doc = s.doc_mut()?;
-                doc.get_mut(i)?.layout = None;
+                let n = doc.get_mut(i)?;
+                n.layout = None;
+                super::props::drop_layout_bindings(n);
                 figcraft_layout::coherent_sizing(doc, i);
             }
             ok()
@@ -96,6 +107,20 @@ pub fn specs() -> Vec<CommandSpec> {
             }
             ok()
         }),
+        spec!(
+            "vector.fillRule",
+            "Set fill rule",
+            "{ids? | id?, region? (a filled area of a vector; every area when left out), rule: nonZero|evenOdd}",
+            true,
+            fill_rule
+        ),
+        spec!(
+            "vector.reverseLoop",
+            "Reverse loop",
+            "{ids? | id?, region, loop} (a loop of a filled area; its direction flips, which changes how the area fills)",
+            true,
+            reverse_loop
+        ),
         spec!("vector.simplify", "Simplify vector", "{ids?, tolerance?}", true, simplify),
         spec!("vector.offset", "Offset path", "{ids?, offset}", true, offset_path),
         spec!("vector.join", "Join selection", "{ids?} (in vector edit mode: joins the selected points)", true, |s, p| {
@@ -121,26 +146,27 @@ const SECTION_PAD: f64 = 40.0;
 const BOOL_PARAMS: &str = "{ids?} — layers inside boolean groups: sets their own operation (how each combines with the operands below it); one boolean group: sets its operation (every operand follows it); otherwise wraps the layers in a new boolean group";
 
 /// Wrap the selection in a new boolean group doing `op`.
-pub(crate) fn wrap_boolean(s: &mut Session, p: &Value, op: BoolOp) -> Result<Value> {
-    wrap(s, p, Wrap::Bool(op))
+pub(crate) fn wrap_boolean(s: &mut Session, p: &Value, cmd: &str, op: BoolOp) -> Result<Value> {
+    wrap(s, p, cmd, Wrap::Bool(op))
 }
 
-/// Wrap the selection in a new container at the topmost selected layer's place.
-fn wrap(s: &mut Session, p: &Value, w: Wrap) -> Result<Value> {
-    let ids = req_targets("object.group", s, p)?;
+/// Wrap the selection in a new container at the topmost selected layer's place. Errors name `cmd`,
+/// the command that asked.
+fn wrap(s: &mut Session, p: &Value, cmd: &str, w: Wrap) -> Result<Value> {
+    let ids = req_targets(cmd, s, p)?;
     let doc = s.doc_mut()?;
     let ids = z_sorted(doc, &roots(doc, &ids));
-    let top = *ids.last().ok_or_else(|| bad("object.group", "nothing selected"))?;
-    let parent = doc.get(top)?.parent.ok_or_else(|| bad("object.group", "can't group a page"))?;
+    let top = *ids.last().ok_or_else(|| bad(cmd, "nothing selected"))?;
+    let parent = doc.get(top)?.parent.ok_or_else(|| bad(cmd, "can't group a page"))?;
     // Sections sit on the page or in sections, never in frames or groups.
     let board = |doc: &Document, i: NodeId| {
         doc.node(i).and_then(|n| n.parent).and_then(|p| doc.node(p)).is_some_and(|p| p.is_page() || matches!(p.kind, NodeKind::Section { .. }))
     };
     if matches!(w, Wrap::Section) && !ids.iter().all(|i| board(doc, *i)) {
-        return Err(bad("object.wrapInSection", "only layers on the page or in a section can be wrapped in a section"));
+        return Err(bad(cmd, "only layers on the page or in a section can be wrapped in a section"));
     }
     if !matches!(w, Wrap::Section) && ids.iter().any(|i| doc.node(*i).is_some_and(|n| matches!(n.kind, NodeKind::Section { .. }))) {
-        return Err(bad("object.group", "sections can't go in groups or frames"));
+        return Err(bad(cmd, "sections can't go in groups or frames"));
     }
     let index = doc.index_in_parent(top).map(|i| i + 1);
     let mut bounds = doc.bounds_of(&ids).unwrap_or_default();
@@ -199,6 +225,13 @@ fn convert(s: &mut Session, p: &Value, cmd: &'static str, to_frame: bool) -> Res
         let n = doc.get(i)?;
         let refuse = |why: &str| Err(bad(cmd, format!("\"{}\" {why}", n.name)));
         match (&n.kind, to_frame) {
+            // A frame can't hold sections.
+            (NodeKind::Section { .. }, true)
+                if n.children.iter().any(|c| doc.node(*c).is_some_and(|c| matches!(c.kind, NodeKind::Section { .. }))) =>
+            {
+                return refuse("holds sections, which can't go inside a frame: convert those first");
+            }
+            (NodeKind::Section { .. }, true) => todo.push(i),
             (NodeKind::Instance { .. }, _) => return refuse("is an instance: its layers come from its main component (detach it first)"),
             (NodeKind::Component { .. }, _) => return refuse("is a main component, which stays a frame"),
             (NodeKind::Frame | NodeKind::Group, _) if crate::components::owning_instance(doc, i).is_some() => {
@@ -212,12 +245,15 @@ fn convert(s: &mut Session, p: &Value, cmd: &'static str, to_frame: bool) -> Res
     }
     for i in &todo {
         if to_frame {
-            // The group's box as it is; nothing painted or clipped, so the look stays.
+            // The box as it is and nothing clipped, so the look stays: a group has nothing painted, a
+            // section keeps its fill.
             let n = doc.get_mut(*i)?;
+            if matches!(n.kind, NodeKind::Group) {
+                n.fills.clear();
+                n.strokes.clear();
+            }
             n.kind = NodeKind::Frame;
             n.clip = false;
-            n.fills.clear();
-            n.strokes.clear();
             continue;
         }
         let n = doc.get_mut(*i)?;
@@ -242,6 +278,43 @@ fn convert(s: &mut Session, p: &Value, cmd: &'static str, to_frame: bool) -> Res
     Ok(json!({"ids": todo}))
 }
 
+/// Frames on the page or in a section become sections in place (sections only sit there).
+fn convert_to_section(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "object.convertToSection";
+    let ids = req_targets(cmd, s, p)?;
+    let doc = s.doc_mut()?;
+    let mut todo = Vec::new();
+    for i in ids {
+        let n = doc.get(i)?;
+        let refuse = |why: &str| Err(bad(cmd, format!("\"{}\" {why}", n.name)));
+        let on_board = n.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.is_page() || matches!(p.kind, NodeKind::Section { .. }));
+        match &n.kind {
+            NodeKind::Section { .. } => {}
+            NodeKind::Instance { .. } => return refuse("is an instance: its layers come from its main component (detach it first)"),
+            NodeKind::Component { .. } | NodeKind::ComponentSet { .. } => return refuse("is a main component, which stays a frame"),
+            NodeKind::Frame if !on_board => return refuse("is inside a frame or group: only frames on the page or in a section become sections"),
+            NodeKind::Frame => todo.push(i),
+            _ => return refuse("is not a frame"),
+        }
+    }
+    for i in &todo {
+        let n = doc.get_mut(*i)?;
+        n.kind = NodeKind::Section { contents_hidden: false };
+        (n.layout, n.clip, n.overflow) = (None, false, proto::Overflow::None);
+        n.grids.clear();
+        n.guides.clear();
+        n.styles.grid = None;
+        super::props::drop_layout_bindings(n);
+        let kids = n.children.clone();
+        for k in kids {
+            // Out of the flow there is nothing to fill or to be absolute against.
+            doc.get_mut(k)?.child_layout.absolute = false;
+        }
+        figcraft_layout::coherent_sizing(doc, *i);
+    }
+    Ok(json!({"ids": todo}))
+}
+
 fn ungroup(s: &mut Session, p: &Value) -> Result<Value> {
     let ids = req_targets("object.ungroup", s, p)?;
     let doc = s.doc_mut()?;
@@ -284,7 +357,7 @@ fn mask(s: &mut Session, p: &Value) -> Result<Value> {
         return ok();
     }
     // Group, then the bottom-most child is the mask.
-    let r = wrap(s, &json!({"ids": ids, "name": "Mask group"}), Wrap::Group)?;
+    let r = wrap(s, &json!({"ids": ids, "name": "Mask group"}), "object.mask", Wrap::Group)?;
     let gid = id_of(&r["id"]).ok_or_else(|| EngineError::Other("group failed".into()))?;
     let doc = s.doc_mut()?;
     if let Some(first) = doc.get(gid)?.children.first().copied() {
@@ -309,33 +382,46 @@ fn flatten(s: &mut Session, p: &Value) -> Result<Value> {
     let parent = doc.get(top)?.parent.ok_or_else(|| bad("vector.flatten", "can't flatten a page"))?;
     let index = doc.index_in_parent(top).map(|i| i + 1);
     let pw = doc.world_transform(parent);
-    let mut path = BezPath::new();
-    let mut even = false;
+    let mut net = VectorNetwork::default();
     for i in &ids {
         let Some(n) = doc.node(*i) else { continue };
-        // Booleans flatten to their result; strokes don't get outlined.
-        let Some((mut op, rule)) = (match &n.kind {
-            NodeKind::Group | NodeKind::Frame | NodeKind::Component { .. } | NodeKind::Instance { .. } => figcraft_render::subtree_outline(doc, n, 0),
-            _ => figcraft_render::node_outline(doc, n),
-        }) else {
-            continue;
+        // Vectors keep their own network (open paths and unfilled loops have no fill outline);
+        // booleans flatten to their result; strokes don't get outlined.
+        let mut part = match &n.kind {
+            NodeKind::Vector { network } => network.clone(),
+            _ => {
+                let Some((op, rule)) = (match &n.kind {
+                    NodeKind::Group | NodeKind::Frame | NodeKind::Component { .. } | NodeKind::Instance { .. } => {
+                        figcraft_render::subtree_outline(doc, n, 0)
+                    }
+                    _ => figcraft_render::node_outline(doc, n),
+                }) else {
+                    continue;
+                };
+                let mut part = VectorNetwork::from_path(&op);
+                if rule == figcraft_render::FillRule::EvenOdd {
+                    for r in &mut part.regions {
+                        r.winding = WindingRule::EvenOdd;
+                    }
+                }
+                part
+            }
         };
-        even |= rule == figcraft_render::FillRule::EvenOdd;
         // Into the common parent's space.
-        let w = doc.world_transform(*i);
-        op.apply_affine(pw.inverse() * w);
-        path.extend(op.elements().iter().copied());
+        let all: Vec<usize> = (0..part.vertices.len()).collect();
+        crate::vectoredit::ops::transform_vertices(&mut part, &all, pw.inverse() * doc.world_transform(*i));
+        let (nv, ns) = (net.vertices.len(), net.segments.len());
+        net.vertices.extend(part.vertices);
+        net.segments.extend(part.segments.into_iter().map(|s| Segment { a: s.a + nv, b: s.b + nv, ..s }));
+        net.regions.extend(
+            part.regions.into_iter().map(|r| Region { loops: r.loops.into_iter().map(|l| l.into_iter().map(|s| s + ns).collect()).collect(), ..r }),
+        );
     }
-    if path.elements().is_empty() {
+    let Some(bb) = net.bounds() else {
         return Err(EngineError::Disabled("vector.flatten".into(), "nothing to flatten".into()));
-    }
+    };
     let first = ids.first().and_then(|i| doc.node(*i)).cloned();
-    let bb = path.bounding_box();
-    path.apply_affine(Affine::translate((-bb.x0, -bb.y0)));
-    let mut net = VectorNetwork::from_path(&path);
-    for r in &mut net.regions {
-        r.winding = if even { WindingRule::EvenOdd } else { WindingRule::NonZero };
-    }
+    net.translate(-bb.x0, -bb.y0);
     let vid = doc.alloc_id();
     let name = first.as_ref().map(|f| f.name.clone()).unwrap_or_else(|| "Vector".into());
     let mut v = Node::new(vid, NodeKind::Vector { network: net }, name, bb.width(), bb.height());
@@ -370,16 +456,19 @@ fn outline_stroke(s: &mut Session, p: &Value) -> Result<Value> {
             continue;
         }
         let closed = figcraft_doc::geometry::is_closed(&n);
-        let Some(geom) = (match &n.kind {
-            NodeKind::Text(_) | NodeKind::BooleanOp { .. } => figcraft_render::node_outline(doc, &n).map(|(p, _)| p),
-            _ => figcraft_doc::geometry::stroke_geometry(&n),
+        let Some((area, rule)) = (match &n.kind {
+            NodeKind::Text(_) => figcraft_render::node_outline(doc, &n)
+                .map(|(p, _)| (figcraft_render::draw::stroke_area(&n, &p, closed), figcraft_render::FillRule::Winding)),
+            _ => figcraft_render::stroke_fill(doc, &n),
         }) else {
             continue;
         };
-        let area = figcraft_render::draw::stroke_area(&n, &geom, closed);
         let mut path = (*area).clone();
-        // Union the pieces so the outline is one clean shape.
-        if let Ok(u) = figcraft_pathops::simplify(&path) {
+        // Simplify non-zero strokes into even-odd contours. Inside/outside rings already use
+        // even-odd: interpreting their same-direction contours as non-zero would fill the hole.
+        if rule == figcraft_render::FillRule::Winding
+            && let Ok(u) = figcraft_pathops::simplify(&path)
+        {
             path = u;
         }
         let bb = path.bounding_box();
@@ -405,7 +494,7 @@ fn outline_stroke(s: &mut Session, p: &Value) -> Result<Value> {
                 let f = doc.get_mut(fill_id)?;
                 f.strokes.clear();
             }
-            let r = wrap(s, &json!({"ids": [fill_id, vid], "name": n.name}), Wrap::Group)?;
+            let r = wrap(s, &json!({"ids": [fill_id, vid], "name": n.name}), "vector.outlineStroke", Wrap::Group)?;
             if let Some(g) = id_of(&r["id"]) {
                 out.push(g);
             }
@@ -452,7 +541,7 @@ fn layout_add(s: &mut Session, p: &Value) -> Result<Value> {
         ids
     } else {
         // Wrap non-frames in a new frame without a fill, then add auto layout to it.
-        let r = wrap(s, &json!({"ids": ids}), Wrap::Frame)?;
+        let r = wrap(s, &json!({"ids": ids}), "layout.add", Wrap::Frame)?;
         let fid = id_of(&r["id"]).ok_or_else(|| EngineError::Other("wrap failed".into()))?;
         let f = s.doc_mut()?.get_mut(fid)?;
         f.fills.clear();
@@ -477,11 +566,16 @@ fn layout_add(s: &mut Session, p: &Value) -> Result<Value> {
             let pb = doc.node(*b).map(|n| figcraft_geom::transform_rect_bbox(n.transform, n.local_rect())).unwrap_or_default();
             if vertical { pa.y0.total_cmp(&pb.y0) } else { pa.x0.total_cmp(&pb.x0) }
         });
+        let empty = doc.node(*f).is_some_and(|n| n.children.iter().filter_map(|c| doc.node(*c)).all(|c| !c.visible || c.child_layout.absolute));
         let n = doc.get_mut(*f)?;
         n.children = kids;
         n.layout = Some(al);
-        n.child_layout.sizing_h = Sizing::Hug;
-        n.child_layout.sizing_v = Sizing::Hug;
+        if !all_frames || !empty {
+            // A frame wrapped around the selection hugs it; an existing frame with no flow
+            // children keeps its size instead of collapsing to its padding.
+            n.child_layout.sizing_h = Sizing::Hug;
+            n.child_layout.sizing_v = Sizing::Hug;
+        }
     }
     s.set_selection(targets.clone());
     Ok(json!({"ids": targets}))
@@ -556,6 +650,10 @@ fn offset_path(s: &mut Session, p: &Value) -> Result<Value> {
     for i in req_targets("vector.offset", s, p)? {
         let doc = s.doc_mut()?;
         let n = doc.get(i)?.clone();
+        // A vector can't hold children: leave containers (frames, groups, instances) alone.
+        if !n.children.is_empty() {
+            continue;
+        }
         let Some((path, _)) = figcraft_render::node_outline(doc, &n) else { continue };
         let props = StrokeProps { weight: d.abs() * 2.0, join: StrokeJoin::Round, align: StrokeAlign::Center, ..Default::default() };
         let ring = figcraft_pathops::stroke_center(&path, d.abs() * 2.0, &props);
@@ -648,3 +746,146 @@ fn resize_to_fit(s: &mut Session, p: &Value) -> Result<Value> {
     }
     Ok(json!({"ids": fitted}))
 }
+
+/// The vector network of `id`, when it is a vector layer.
+fn network_mut(doc: &mut Document, id: NodeId) -> Option<&mut VectorNetwork> {
+    match &mut doc.get_mut(id).ok()?.kind {
+        NodeKind::Vector { network } => Some(network),
+        _ => None,
+    }
+}
+
+/// The id a fill rule is written as.
+fn rule_id(rule: WindingRule) -> &'static str {
+    match rule {
+        WindingRule::NonZero => "nonZero",
+        WindingRule::EvenOdd => "evenOdd",
+    }
+}
+
+/// `region` as an index: absent (or null) means every area.
+fn area_index(cmd: &str, p: &Value) -> Result<Option<usize>> {
+    match get(p, "region") {
+        None | Some(Value::Null) => Ok(None),
+        Some(v) => {
+            let k = f64_of(v).ok_or_else(|| bad(cmd, "`region` must be a number"))?;
+            if !(0.0..1e9).contains(&k) || k.fract() != 0.0 {
+                return Err(bad(cmd, "`region` out of range"));
+            }
+            Ok(Some(k as usize))
+        }
+    }
+}
+
+/// Segments another one- or two-segment loop lists: a short loop takes its direction from the ends
+/// its segments are stored with, so re-storing one of those would turn that loop round too. A loop
+/// of three or more segments is left out: its ring is walked in list order, which the stored ends
+/// don't decide.
+fn short_loop_segments(net: &VectorNetwork, skip: (usize, usize)) -> std::collections::HashSet<usize> {
+    let mut out = std::collections::HashSet::new();
+    for (r, region) in net.regions.iter().enumerate() {
+        for (l, lp) in region.loops.iter().enumerate() {
+            if (r, l) != skip && lp.len() <= 2 {
+                out.extend(lp.iter().copied());
+            }
+        }
+    }
+    out
+}
+
+fn fill_rule(s: &mut Session, p: &Value) -> Result<Value> {
+    let ids = req_targets("vector.fillRule", s, p)?;
+    let rule = match string(p, "rule").as_deref().map(str::trim) {
+        Some("evenOdd" | "evenodd" | "EVENODD") => WindingRule::EvenOdd,
+        Some("nonZero" | "nonzero" | "NONZERO") => WindingRule::NonZero,
+        _ => return Err(bad("vector.fillRule", "`rule` is nonZero or evenOdd")),
+    };
+    let only = area_index("vector.fillRule", p)?;
+    let doc = s.doc_mut()?;
+    let mut count = 0usize;
+    for id in ids {
+        let Some(net) = network_mut(doc, id) else { continue };
+        match only {
+            Some(r) => {
+                if let Some(region) = net.regions.get_mut(r) {
+                    region.winding = rule;
+                    count += 1;
+                }
+            }
+            None => {
+                for region in &mut net.regions {
+                    region.winding = rule;
+                    count += 1;
+                }
+            }
+        }
+    }
+    if count == 0 {
+        return Err(EngineError::Disabled("vector.fillRule".into(), "no filled area to set (select a vector)".into()));
+    }
+    Ok(json!({"regions": count, "rule": rule_id(rule)}))
+}
+
+/// One loop of a vector, worked out but not yet written back: its segments in the new order and,
+/// for a loop of one or two segments, the one to store the other way.
+struct LoopFlip {
+    id: NodeId,
+    turned: Vec<usize>,
+    store: Option<usize>,
+}
+
+/// Turn one loop of a filled area round: its segments are walked the other way, so the area it
+/// bounds counts the other way in the winding (which turns a hole into a filled part and back).
+///
+/// How a loop is walked depends on how many segments it has:
+/// - three or more: the order they are listed in, each segment turned to continue from the point
+///   reached. Reversing the list is therefore enough, and the stored ends are left alone (a shared
+///   segment's ends belong to its neighbour too);
+/// - two: the same ring either way round, so one of the two has to be stored the other way instead;
+/// - one: only its stored ends say which way it runs, so they are swapped.
+///
+/// A short loop can only turn round by re-storing a segment, which is refused when another short
+/// loop lists that segment too: it would turn that area round as well.
+fn reverse_loop(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "vector.reverseLoop";
+    let ids = req_targets(cmd, s, p)?;
+    let region = req_index(cmd, p, "region")?;
+    let index = req_index(cmd, p, "loop")?;
+    let doc = s.doc_mut()?;
+    // Work every loop out before touching the document: one that can't turn round refuses the call
+    // and the others stay as they were.
+    let mut flips: Vec<LoopFlip> = Vec::new();
+    for id in ids {
+        let Some(NodeKind::Vector { network }) = doc.node(id).map(|n| &n.kind) else { continue };
+        let Some(loop_) = network.regions.get(region).and_then(|r| r.loops.get(index)) else { continue };
+        if loop_.is_empty() {
+            continue;
+        }
+        let mut store = None;
+        if loop_.len() <= 2 {
+            let busy = short_loop_segments(network, (region, index));
+            let Some(pick) = loop_.iter().copied().filter(|s| !busy.contains(s)).min() else {
+                return Err(EngineError::Disabled(
+                    cmd.into(),
+                    "the loop shares its segments with another one- or two-segment loop, so turning it round would turn that one round too".into(),
+                ));
+            };
+            store = Some(pick);
+        }
+        flips.push(LoopFlip { id, turned: loop_.iter().rev().copied().collect(), store });
+    }
+    if flips.is_empty() {
+        return Err(EngineError::Disabled(cmd.into(), "no such loop (select a vector with filled areas)".into()));
+    }
+    for LoopFlip { id, turned, store } in flips {
+        let Some(net) = network_mut(doc, id) else { continue };
+        if let Some(seg) = store.and_then(|i| net.segments.get_mut(i)) {
+            std::mem::swap(&mut seg.a, &mut seg.b);
+            std::mem::swap(&mut seg.ta, &mut seg.tb);
+        }
+        if let Some(l) = net.regions.get_mut(region).and_then(|r| r.loops.get_mut(index)) {
+            *l = turned;
+        }
+    }
+    Ok(json!({"reversed": true}))
+}
diff --git a/crates/engine/src/cmd/styles.rs b/crates/engine/src/cmd/styles.rs
index 552a44cf..9c2922d2 100644
--- a/crates/engine/src/cmd/styles.rs
+++ b/crates/engine/src/cmd/styles.rs
@@ -110,16 +110,26 @@ pub fn specs() -> Vec<CommandSpec> {
             ))
         }),
         spec!("variable.createCollection", "Create variable collection", "{name, modes? [names]}", true, |s, p| {
-            let name = req_string("variable.createCollection", p, "name")?;
-            let doc = s.doc_mut()?;
-            if doc.variables.collections.iter().any(|c| c.name == name) {
-                return Err(bad("variable.createCollection", format!("a collection named `{name}` already exists")));
+            let cmd = "variable.createCollection";
+            let name = req_string(cmd, p, "name")?.trim().to_string();
+            if name.is_empty() {
+                return Err(bad(cmd, "name can't be empty"));
             }
-            let id = doc.new_collection_id();
             let modes: Vec<String> = match get(p, "modes") {
-                Some(Value::Array(a)) => a.iter().filter_map(|m| m.as_str().map(str::to_string)).collect(),
+                Some(Value::Array(a)) => a.iter().filter_map(|m| m.as_str().map(|m| m.trim().to_string())).collect(),
                 _ => vec!["Mode 1".into()],
             };
+            if modes.is_empty() {
+                return Err(bad(cmd, "a collection needs at least one mode"));
+            }
+            if modes.iter().any(String::is_empty) {
+                return Err(bad(cmd, "mode names can't be empty"));
+            }
+            let doc = s.doc_mut()?;
+            if doc.variables.collections.iter().any(|c| c.name == name) {
+                return Err(bad(cmd, format!("a collection named `{name}` already exists")));
+            }
+            let id = doc.new_collection_id();
             let modes = modes.into_iter().enumerate().map(|(i, m)| Mode { id: format!("{id}/mode{}", i + 1), name: m }).collect();
             doc.variables.collections.push(Collection { id: id.clone(), name, modes, extends: None });
             Ok(json!({"id": id}))
@@ -458,10 +468,19 @@ fn bind_style(s: &mut Session, p: &Value) -> Result<Value> {
     match var {
         Some((_, kind)) if kind != want => return Err(bad(cmd, format!("`{field}` takes a {} variable, not a {} one", want.id(), kind.id()))),
         Some((id, _)) => {
+            if style.bound.get(&key) != Some(&id)
+                && let StyleKind::Paint { paints } = &mut style.kind
+            {
+                rebind_paint_alpha(paints, &mut [], &key, true);
+            }
             style.bound.insert(key, id);
         }
         None => {
-            style.bound.remove(&key);
+            if style.bound.remove(&key).is_some()
+                && let StyleKind::Paint { paints } = &mut style.kind
+            {
+                rebind_paint_alpha(paints, &mut [], &key, false);
+            }
         }
     }
     // The style takes its default-mode value, and each layer using it its own.
@@ -770,16 +789,48 @@ pub fn bind(s: &mut Session, p: &Value) -> Result<Value> {
         let n = doc.get_mut(i)?;
         match &vid {
             Some(v) => {
+                if n.bound.get(&field) != Some(v) {
+                    rebind_paint_alpha(&mut n.fills, &mut n.strokes, &field, true);
+                }
                 n.bound.insert(field.clone(), v.clone());
             }
             None => {
-                n.bound.remove(&field);
+                if n.bound.remove(&field).is_some() {
+                    rebind_paint_alpha(&mut n.fills, &mut n.strokes, &field, false);
+                }
             }
         }
     }
     ok()
 }
 
+/// A colour variable bound to a solid paint owns its whole colour, alpha included. Binding takes the
+/// alpha a typed colour had (see `Paint::solid`) out of the opacity, so the variable's alpha applies
+/// once; an opacity set on its own, before or while bound, multiplies on top and stays. Unbinding
+/// moves the colour's alpha back into the opacity, where a typed colour keeps it.
+pub(crate) fn rebind_paint_alpha(fills: &mut [Paint], strokes: &mut [Paint], field: &str, bind: bool) {
+    use super::lists::{BoundList, list_binding};
+    let Some((list, i, "color")) = list_binding(field) else { return };
+    let paints = match list {
+        BoundList::Fills => fills,
+        BoundList::Strokes => strokes,
+        _ => return,
+    };
+    if let Some(p) = paints.get_mut(i)
+        && let PaintKind::Solid { color } = &mut p.kind
+    {
+        if bind {
+            // What's left is the opacity set on its own (unknown under a colour alpha of 0: 1).
+            p.opacity = if p.color_alpha > 0.0 { (p.opacity / p.color_alpha).clamp(0.0, 1.0) } else { 1.0 };
+            p.color_alpha = 1.0;
+        } else {
+            p.opacity *= color.a;
+            p.color_alpha *= color.a;
+        }
+        color.a = 1.0;
+    }
+}
+
 /// `variable.setMode`: choose a collection's mode on frames (the page when none are given).
 pub fn set_mode(s: &mut Session, p: &Value) -> Result<Value> {
     let cmd = "variable.setMode";
@@ -913,6 +964,167 @@ pub fn apply_bindings(doc: &mut Document) {
 
 /// [`apply_bindings`] for the layers `only` (every bound layer when `None`).
 pub fn apply_bindings_to(doc: &mut Document, only: Option<&std::collections::BTreeSet<NodeId>>) {
+    apply_bindings_matching(doc, only, |_| true);
+}
+
+/// The layers `ids` before an explicit edit, for [`detach_edited`] (only those with bindings).
+pub(crate) fn bound_before(doc: &Document, ids: &[NodeId]) -> Vec<std::sync::Arc<Node>> {
+    ids.iter().filter_map(|i| doc.node_arc(*i)).filter(|n| !n.bound.is_empty()).cloned().collect()
+}
+
+/// An explicit edit sticks: each layer's own bound field (not a list item's) whose value the edit
+/// changed drops its binding, which would otherwise write the variable's value back (#809).
+/// Compared by value, so keys written unchanged keep their bindings and fields moved along with
+/// another (proportions, min/max) lose theirs.
+pub(crate) fn detach_edited(doc: &mut Document, before: &[std::sync::Arc<Node>]) {
+    for old in before {
+        let Some(n) = doc.node(old.id) else { continue };
+        let edited: Vec<String> = n
+            .bound
+            .keys()
+            // A binding the edit itself made (`boundVariables`) stays.
+            .filter(|f| old.bound.get(*f) == n.bound.get(*f))
+            .filter(|f| super::lists::list_binding(f).is_none() && !f.starts_with(crate::components::PROP_BINDING))
+            .filter(|f| bound_field(old, f) != bound_field(n, f))
+            .cloned()
+            .collect();
+        if edited.is_empty() {
+            continue;
+        }
+        if let Ok(n) = doc.get_mut(old.id) {
+            for f in edited {
+                n.bound.remove(&f);
+            }
+        }
+    }
+}
+
+/// The stored value a layer-level binding writes, comparable (`None`: the layer has no such field).
+fn bound_field(n: &Node, field: &str) -> Option<String> {
+    let text = |f: &dyn Fn(&TextStyle) -> String| match &n.kind {
+        NodeKind::Text(t) => Some(std::iter::once(&t.style).chain(t.runs.iter().map(|r| &r.style)).map(f).collect::<Vec<_>>().join(",")),
+        _ => None,
+    };
+    let layout = n.layout.as_ref();
+    let cl = &n.child_layout;
+    let pad = |i: usize| layout.and_then(|l| l.padding.get(i).copied());
+    Some(match field {
+        "width" | "w" => format!("{}", n.width),
+        "height" | "h" => format!("{}", n.height),
+        "minWidth" => format!("{:?}", cl.min_w),
+        "maxWidth" => format!("{:?}", cl.max_w),
+        "minHeight" => format!("{:?}", cl.min_h),
+        "maxHeight" => format!("{:?}", cl.max_h),
+        "opacity" => format!("{}", n.opacity),
+        "visible" => format!("{}", n.visible),
+        "gap" | "columnGap" => format!("{:?}", layout.map(|l| l.gap)),
+        "crossGap" | "rowGap" => format!("{:?}", layout.map(|l| l.cross_gap)),
+        "padding" => format!("{:?}", layout.map(|l| l.padding)),
+        "paddingTop" => format!("{:?}", pad(0)),
+        "paddingRight" => format!("{:?}", pad(1)),
+        "paddingBottom" => format!("{:?}", pad(2)),
+        "paddingLeft" => format!("{:?}", pad(3)),
+        "paddingHorizontal" => format!("{:?}", (pad(1), pad(3))),
+        "paddingVertical" => format!("{:?}", (pad(0), pad(2))),
+        "cornerRadius" => format!("{:?}", n.corners.radii),
+        "topLeftRadius" => format!("{:?}", n.corners.radii.first()),
+        "topRightRadius" => format!("{:?}", n.corners.radii.get(1)),
+        "bottomRightRadius" => format!("{:?}", n.corners.radii.get(2)),
+        "bottomLeftRadius" => format!("{:?}", n.corners.radii.get(3)),
+        "strokeWeight" => format!("{:?}", (n.stroke.weight, n.stroke.sides)),
+        "strokeTopWeight" | "strokeRightWeight" | "strokeBottomWeight" | "strokeLeftWeight" => format!("{:?}", n.stroke.sides),
+        "arcStart" | "arcSweep" | "arcInner" => match &n.kind {
+            NodeKind::Ellipse { start, sweep, inner } => format!(
+                "{}",
+                if field == "arcStart" {
+                    start
+                } else if field == "arcSweep" {
+                    sweep
+                } else {
+                    inner
+                }
+            ),
+            _ => return None,
+        },
+        "characters" => match &n.kind {
+            NodeKind::Text(t) => t.characters.clone(),
+            _ => return None,
+        },
+        "paragraphSpacing" | "paragraphIndent" => match &n.kind {
+            NodeKind::Text(t) => format!("{}", if field == "paragraphSpacing" { t.paragraph_spacing } else { t.paragraph_indent }),
+            _ => return None,
+        },
+        "fontFamily" => text(&|s| s.font_family.clone())?,
+        "fontStyle" => text(&|s| s.font_style.clone())?,
+        "fontWeight" => text(&|s| s.weight().to_string())?,
+        "fontSize" => text(&|s| s.font_size.to_string())?,
+        "lineHeight" => text(&|s| format!("{:?}", s.line_height))?,
+        "letterSpacing" => text(&|s| format!("{:?}", s.letter_spacing))?,
+        // shortcut: other layer-level fields keep their binding on edits; add a reader when one is bound in practice.
+        _ => return None,
+    })
+}
+
+/// Imported files (`.fig`, REST) keep a solid paint's alpha in its opacity, a bound paint's too,
+/// while the bound colour brings its own alpha: take the variable's alpha back out of the opacity
+/// (styles' paints and layers') before the bindings are first resolved, so it applies once.
+pub(crate) fn unfold_imported_bound_alpha(doc: &mut Document) {
+    use super::lists::{BoundList, list_binding};
+    fn alphas(vars: &Variables, bound: &BTreeMap<String, VariableId>, modes: &BTreeMap<CollectionId, ModeId>) -> Vec<(BoundList, usize, f32)> {
+        let found = bound.iter().filter_map(|(field, var)| match (list_binding(field)?, vars.resolve(var, modes)?) {
+            ((list @ (BoundList::Fills | BoundList::Strokes), i, "color"), VariableValue::Color(c)) if c.a > 0.0 && c.a < 1.0 => Some((list, i, c.a)),
+            _ => None,
+        });
+        found.collect()
+    }
+    fn unfold(p: Option<&mut Paint>, a: f32) {
+        if let Some(p) = p
+            && matches!(p.kind, PaintKind::Solid { .. })
+        {
+            p.opacity = (p.opacity / a).min(1.0);
+        }
+    }
+    let pending = doc.take_dirty();
+    for i in 0..doc.styles.len() {
+        let found = doc.styles.get(i).map(|s| alphas(&doc.variables, &s.bound, &BTreeMap::new())).unwrap_or_default();
+        if let Some(StyleKind::Paint { paints }) = doc.styles.get_mut(i).filter(|_| !found.is_empty()).map(|s| &mut s.kind) {
+            for (_, j, a) in found {
+                unfold(paints.get_mut(j), a);
+            }
+        }
+    }
+    let ids: Vec<NodeId> = doc.nodes().filter(|n| !n.bound.is_empty()).map(|n| n.id).collect();
+    for id in ids {
+        let found = doc.node(id).map(|n| alphas(&doc.variables, &n.bound, &doc.modes_for(id))).unwrap_or_default();
+        if found.is_empty() {
+            continue;
+        }
+        let Ok(n) = doc.get_mut(id) else { continue };
+        for (list, j, a) in found {
+            unfold(if list == BoundList::Fills { n.fills.get_mut(j) } else { n.strokes.get_mut(j) }, a);
+        }
+    }
+    doc.take_dirty();
+    doc.mark_dirty(pending);
+}
+
+/// Settle imported paint colours before the document is first shown. Other bindings can affect
+/// layout or component structure, which must be resolved through the normal edit pipeline.
+pub(crate) fn apply_paint_bindings_on_load(doc: &mut Document) {
+    let pending = doc.take_dirty();
+    apply_bindings_matching(doc, None, |field| {
+        super::lists::list_binding(field).is_some_and(|(list, _, prop)| {
+            matches!(list, super::lists::BoundList::Fills | super::lists::BoundList::Strokes)
+                && (prop == "color" || super::lists::stop_binding(prop).is_some())
+        })
+    });
+    doc.take_dirty();
+    doc.mark_dirty(pending);
+}
+
+/// Re-apply the variable bindings whose field passes `include`, on the `only` nodes (every bound
+/// node when `None`). Auto layout fields wait while their node has no auto layout.
+fn apply_bindings_matching(doc: &mut Document, only: Option<&std::collections::BTreeSet<NodeId>>, include: impl Fn(&str) -> bool) {
     use super::lists::{BoundList, list_binding};
     if doc.variables.variables.is_empty() {
         return;
@@ -926,12 +1138,20 @@ pub fn apply_bindings_to(doc: &mut Document, only: Option<&std::collections::BTr
         let modes = doc.modes_for(id);
         let Some(n) = doc.node(id) else { continue };
         let binds = n.bound.clone();
+        let has_layout = n.layout.is_some();
         let mut sets = serde_json::Map::new();
         let mut effect_sets: Vec<(usize, String, VariableValue)> = Vec::new();
         let mut paint_sets: Vec<(bool, usize, Option<usize>, Color)> = Vec::new();
         let mut grid_sets: Vec<(usize, String, f64)> = Vec::new();
         let mut prop_sets: Vec<(String, VariableValue)> = Vec::new();
         for (field, var) in binds {
+            if !include(&field) {
+                continue;
+            }
+            // A binding never creates an auto layout: without one it waits for the next.
+            if !has_layout && super::props::LAYOUT_KEYS.contains(&field.as_str()) {
+                continue;
+            }
             let Some(val) = doc.variables.resolve(&var, &modes) else { continue };
             // One list item's value: a paint's colour, an effect's or a layout grid's field.
             if let Some((list, i, prop)) = list_binding(&field) {
@@ -1083,7 +1303,6 @@ pub fn document_colors(doc: &Document, page: NodeId) -> Vec<(Color, usize)> {
         stack.extend(n.children.iter().copied());
         for paint in n.fills.iter().chain(n.strokes.iter()).filter(|p| p.visible) {
             if let Some(c) = paint.solid_color() {
-                let c = c.with_alpha(c.a * paint.opacity);
                 counts.entry(c.to_rgba8()).or_insert((c, 0)).1 += 1;
             }
         }
diff --git a/crates/engine/src/cmd/text.rs b/crates/engine/src/cmd/text.rs
index 14ea1762..3822c5c5 100644
--- a/crates/engine/src/cmd/text.rs
+++ b/crates/engine/src/cmd/text.rs
@@ -18,6 +18,7 @@ fn style(s: &mut Session, p: &Value, f: impl Fn(&mut TextStyle)) -> Result<Value
         let ds = s.ds_mut()?;
         let before = ds.doc.clone();
         let doc = ds.doc_mut();
+        let bound = super::styles::bound_before(doc, &[id]);
         if let NodeKind::Text(t) = &mut doc.get_mut(id)?.kind {
             if a == b {
                 t.restyle(0, t.char_count(), &f);
@@ -25,19 +26,21 @@ fn style(s: &mut Session, p: &Value, f: impl Fn(&mut TextStyle)) -> Result<Value
                 t.restyle(a, b, &f);
             }
         }
+        super::styles::detach_edited(doc, &bound);
         crate::normalize(doc, &before);
         return ok();
     }
     let ids = req_targets("text", s, p)?;
     let doc = s.doc_mut()?;
-    for i in ids {
-        for d in doc.subtree(i) {
-            if let Some(NodeKind::Text(t)) = doc.node_mut(d).map(|n| &mut n.kind) {
-                let n = t.char_count();
-                t.restyle(0, n, &f);
-            }
+    let ids: Vec<NodeId> = ids.into_iter().flat_map(|i| doc.subtree(i)).collect();
+    let before = super::styles::bound_before(doc, &ids);
+    for d in ids {
+        if let Some(NodeKind::Text(t)) = doc.node_mut(d).map(|n| &mut n.kind) {
+            let n = t.char_count();
+            t.restyle(0, n, &f);
         }
     }
+    super::styles::detach_edited(doc, &before);
     ok()
 }
 
@@ -123,7 +126,9 @@ fn step_weight(s: &mut Session, p: &Value, up: bool) -> Result<Value> {
 }
 
 /// Put a text layer on a path: the text takes the path layer's place, geometry and transform, and
-/// the path layer is removed.
+/// the path layer is removed. The path's effects move to the text when it has any, and its fills
+/// when one of them shows, each with its style and variable bindings; otherwise the text keeps
+/// its own.
 fn on_path(s: &mut Session, p: &Value) -> Result<Value> {
     const CMD: &str = "text.onPath";
     let doc = s.doc()?;
@@ -141,6 +146,14 @@ fn on_path(s: &mut Session, p: &Value) -> Result<Value> {
     }
     let (parent, index) = (pn.parent.ok_or_else(|| bad(CMD, "pages have no path"))?, doc.index_in_parent(path));
     let (transform, w, h) = (pn.transform, pn.width, pn.height);
+    let fills = pn.fills.iter().any(|f| f.visible).then(|| (pn.fills.clone(), pn.styles.fill.clone()));
+    let effects = (!pn.effects.is_empty()).then(|| (pn.effects.clone(), pn.styles.effect.clone()));
+    let moved = |k: &str| match super::lists::list_binding(k) {
+        Some((super::lists::BoundList::Fills, ..)) => fills.is_some(),
+        Some((super::lists::BoundList::Effects, ..)) => effects.is_some(),
+        _ => false,
+    };
+    let bound: Vec<(String, VariableId)> = pn.bound.iter().filter(|(k, _)| moved(k)).map(|(k, v)| (k.clone(), v.clone())).collect();
     let mut tp = TextPath::new(&geom);
     tp.start = num(p, "start").filter(|v| v.is_finite()).unwrap_or(0.0).clamp(0.0, 1.0);
     tp.flip = boolean(p, "flip").unwrap_or(false);
@@ -150,6 +163,14 @@ fn on_path(s: &mut Session, p: &Value) -> Result<Value> {
     let n = doc.get_mut(text)?;
     n.transform = transform;
     (n.width, n.height) = (w, h);
+    n.bound.retain(|k, _| !moved(k));
+    n.bound.extend(bound);
+    if let Some((fills, style)) = fills {
+        (n.fills, n.styles.fill) = (fills, style);
+    }
+    if let Some((effects, style)) = effects {
+        (n.effects, n.styles.effect) = (effects, style);
+    }
     if let NodeKind::Text(t) = &mut n.kind {
         t.path = Some(Box::new(tp));
     }
@@ -162,7 +183,7 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "text.onPath",
             "Text on path",
-            "{text? (text layer), path? (vector or shape layer; default: the selected text and other layer), start? (0..1 along the path), flip?}  the text follows the path and the path layer is removed → {id}",
+            "{text? (text layer), path? (vector or shape layer; default: the selected text and other layer), start? (0..1 along the path), flip?}  the text follows the path and takes its effects and its fills when one shows, and the path layer is removed → {id}",
             true,
             on_path
         ),
@@ -270,15 +291,21 @@ pub fn specs() -> Vec<CommandSpec> {
             let v = finite(req_num("text.paragraphSpacing", p, "spacing")?).clamp(0.0, 10_000.0);
             para(s, p, |t| t.paragraph_spacing = v)
         }),
-        spec!("text.maxLines", "Max lines", "{lines (0 = no limit; truncates), ids?}", true, |s, p| {
-            let v = finite(req_num("text.maxLines", p, "lines")?).clamp(0.0, 10_000.0) as u32;
-            para(s, p, |t| {
-                t.max_lines = v;
-                if v > 0 {
-                    t.auto_resize = TextAutoResize::Truncate;
-                }
-            })
-        }),
+        spec!(
+            "text.maxLines",
+            "Max lines",
+            "{lines (0 = no limit; truncates: auto-height text hugs up to that many lines, other text becomes a truncating box), ids?}",
+            true,
+            |s, p| {
+                let v = finite(req_num("text.maxLines", p, "lines")?).clamp(0.0, 10_000.0) as u32;
+                para(s, p, |t| {
+                    t.max_lines = v;
+                    if v > 0 && t.auto_resize != TextAutoResize::Height {
+                        t.auto_resize = TextAutoResize::Truncate;
+                    }
+                })
+            }
+        ),
         spec!(
             "text.setFeatures",
             "OpenType features",
@@ -332,7 +359,7 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "text.preview",
             "Preview text change",
-            "{command: style.apply|library.applyStyle|text.setVariations|text.style, params}  shows what the command would do on the canvas without an undo step (a hovered text style or named instance, a dragged axis slider), in place of an earlier preview; text.endPreview or any other command ends it, so running the command for real commits it as one undo step",
+            "{command: style.apply|library.applyStyle|text.setVariations|text.style, params}  shows what the command would do on the canvas without an undo step (a hovered font family or style, text style or named instance, a dragged axis slider), in place of an earlier preview; text.endPreview or any other command ends it, so running the command for real commits it as one undo step",
             false,
             |s, p| {
                 let c = req_string("text.preview", p, "command")?;
@@ -348,11 +375,13 @@ pub fn specs() -> Vec<CommandSpec> {
             let c = string(p, "characters").or_else(|| string(p, "text")).ok_or_else(|| bad("text.set", "`characters` required"))?;
             let ids = req_targets("text.set", s, p)?;
             let doc = s.doc_mut()?;
+            let before = super::styles::bound_before(doc, &ids);
             for i in ids {
                 let mut m = Map::new();
                 m.insert("characters".into(), json!(c));
                 super::props::apply("text.set", doc, i, &m)?;
             }
+            super::styles::detach_edited(doc, &before);
             ok()
         }),
         spec!(
@@ -364,6 +393,7 @@ pub fn specs() -> Vec<CommandSpec> {
                 let ids = req_targets("text.style", s, p)?;
                 let m = p.as_object().cloned().unwrap_or_default();
                 let doc = s.doc_mut()?;
+                let before = super::styles::bound_before(doc, &ids);
                 for i in ids {
                     let n = doc.get_mut(i)?;
                     let NodeKind::Text(t) = &mut n.kind else { return Err(bad("text.style", format!("{i} is not text"))) };
@@ -377,6 +407,7 @@ pub fn specs() -> Vec<CommandSpec> {
                         super::props::apply_text_style("text.style", t, a, b, k, v)?;
                     }
                 }
+                super::styles::detach_edited(doc, &before);
                 ok()
             }
         ),
@@ -474,5 +505,40 @@ pub fn specs() -> Vec<CommandSpec> {
                 })
             }
         ),
+        spec!(
+            "text.rescanFonts",
+            "Rescan installed fonts",
+            "{}  walks the system font folders again, for fonts installed while the app runs; the open document's auto-sizing text in the families that gained faces (new ones, or styles installed since) fits them (text.refit) → {added: [families that were unknown], refitted: [ids]}",
+            true,
+            |s, _| {
+                let rescan = figcraft_text::rescan_system_fonts();
+                let refitted = crate::fonts::refit_open(s, None, Some(&rescan.changed));
+                Ok(json!({"added": rescan.added, "refitted": refitted}))
+            }
+        ),
+        spec!(
+            "text.loadFont",
+            "Load font file",
+            "{path | data (base64)}  adds a font file (.ttf, .otf, .ttc, .otc; every face of a collection) to this session's fonts without installing it; the open document's auto-sizing text in its families fits it (text.refit) → {families, refitted: [ids]}",
+            true,
+            |s, p| {
+                let cmd = "text.loadFont";
+                let bytes = if let Some(b64) = string(p, "data") {
+                    use base64::Engine as _;
+                    let b64 = b64.split_once(',').map(|(_, d)| d.to_string()).unwrap_or(b64);
+                    base64::engine::general_purpose::STANDARD.decode(b64.trim()).map_err(|e| bad(cmd, format!("`data`: {e}")))?
+                } else if let Some(path) = string(p, "path") {
+                    super::file::read_capped(&path, figcraft_text::fontdb::MAX_FONT_FILE)?
+                } else {
+                    return Err(bad(cmd, "pass `path` or `data` (base64)"));
+                };
+                let families = figcraft_text::load_font_bytes(bytes);
+                if families.is_empty() {
+                    return Err(bad(cmd, "not a font file"));
+                }
+                let refitted = crate::fonts::refit_open(s, None, Some(&families));
+                Ok(json!({"families": families, "refitted": refitted}))
+            }
+        ),
     ]
 }
diff --git a/crates/engine/src/cmd/variables.rs b/crates/engine/src/cmd/variables.rs
index 3e6dc69d..53b62ee4 100644
--- a/crates/engine/src/cmd/variables.rs
+++ b/crates/engine/src/cmd/variables.rs
@@ -288,7 +288,11 @@ pub(crate) fn forget_variables(doc: &mut Document, gone: &BTreeSet<VariableId>)
     doc.variables.variables.retain(|v| !gone.contains(&v.id));
     let users: Vec<NodeId> = doc.nodes().filter(|n| n.bound.values().any(|v| gone.contains(v))).map(|n| n.id).collect();
     for id in users {
-        doc.get_mut(id)?.bound.retain(|_, v| !gone.contains(v));
+        let n = doc.get_mut(id)?;
+        for (field, _) in n.bound.iter().filter(|(_, v)| gone.contains(*v)) {
+            super::styles::rebind_paint_alpha(&mut n.fills, &mut n.strokes, field, false);
+        }
+        n.bound.retain(|_, v| !gone.contains(v));
     }
     Ok(())
 }
diff --git a/crates/engine/src/cmd/variables_io.rs b/crates/engine/src/cmd/variables_io.rs
index 99a78640..6bd5bb40 100644
--- a/crates/engine/src/cmd/variables_io.rs
+++ b/crates/engine/src/cmd/variables_io.rs
@@ -1,6 +1,6 @@
 //! Variables import and export: a file's collections as the local variables JSON (the shape the
-//! REST importer reads, so exports round-trip) or as CSS custom properties, and such JSON read
-//! back into a file.
+//! REST importer reads, so exports round-trip), as CSS custom properties or as Dart constants for
+//! Flutter, and such JSON read back into a file.
 
 use std::collections::{BTreeMap, BTreeSet};
 
@@ -18,14 +18,14 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "variable.export",
             "Export variables",
-            "{collections? [ids or names; default every collection of this file, not library copies], format? (json (default): the local variables JSON that variable.import reads | css: custom properties, the default mode on :root and each other mode on [data-<collection>=\"<mode>\"]), path? (write it there)}  → {text}, or {path} when written",
+            "{collections? [ids or names; default every collection of this file, not library copies], format? (json (default): the local variables JSON that variable.import reads | css: custom properties, the default mode on :root and each other mode on [data-<collection>=\"<mode>\"]; numbers in px unless layers or scopes use them as opacity or font weight | tailwind: a Tailwind CSS v4 stylesheet, the default mode as an @theme block named the way inspect.code's tailwind utilities read them: --color-*, --radius-*, --text-*, --spacing-*, --font-*, unique per file) | dart: a Dart file for Flutter, a class of constants per collection and mode (Color, double, String, bool), aliases resolved), path? (write it there)}  → {text}, or {path} when written",
             false,
             export
         ),
         spec!(
             "variable.import",
             "Import variables",
-            "{variables (the local variables JSON, as variable.export writes it: an object, JSON text or a path)}  collections join this file's collection of the same name (values by mode name; new modes and variables are added, a variable of another type is skipped), others are added  → {collections (added), variables (added), updated, warnings}",
+            "{variables (the local variables JSON, as variable.export writes it: an object, JSON text or a path; `variableCollections` and `variables` under `meta` or at the top level)}  collections join this file's collection of the same name (values by mode name; new modes and variables are added, a variable of another type is skipped), others are added  → {collections (added), variables (added), updated, warnings (also when it holds no variables, or fewer than its collections list)}",
             true,
             import
         ),
@@ -46,8 +46,10 @@ fn export(s: &mut Session, p: &Value) -> Result<Value> {
     let text = match string(p, "format").as_deref().unwrap_or("json") {
         "json" => serde_json::to_string_pretty(&figcraft_format::rest::export_variables(&doc.variables, &colls))
             .map_err(|e| EngineError::Other(e.to_string()))?,
-        "css" => css(&doc.variables, &colls),
-        _ => return Err(bad(cmd, "format: json|css")),
+        "css" => css(doc, &colls, false),
+        "tailwind" => css(doc, &colls, true),
+        "dart" => dart(&doc.variables, &colls),
+        _ => return Err(bad(cmd, "format: json|css|tailwind|dart")),
     };
     match string(p, "path") {
         Some(path) => {
@@ -66,26 +68,177 @@ fn css_safe(text: &str) -> String {
 /// Each collection's variables as custom properties (named as generated code names them): the
 /// default mode's values on `:root`, every other mode's on `[data-<collection>="<mode>"]`;
 /// aliases are `var(--name)`.
-fn css(vars: &Variables, colls: &[&Collection]) -> String {
-    let mut out = String::new();
+fn css(doc: &Document, colls: &[&Collection], tailwind: bool) -> String {
+    let vars = &doc.variables;
+    // Tailwind theme names, unique per file and the same ones page code reads.
+    let theme = crate::tailwind::Theme::new(doc);
+    let name = |v: &Variable| if tailwind { theme.name(v) } else { css_var_of(v) };
+    // Lengths need a unit where CSS reads them (`border-radius: var(--radius)`); opacity and
+    // font weight don't.
+    let roles = crate::token_roles::Roles::new(doc);
+    let mut out = if tailwind { "@import \"tailwindcss\";\n\n".to_string() } else { String::new() };
     for c in colls {
         let attr = css_var_name(&c.name);
         for (i, m) in c.modes.iter().enumerate() {
-            let sel = if i == 0 { ":root".to_string() } else { format!("[data-{}=\"{}\"]", attr.trim_start_matches('-'), css_safe(&m.name)) };
+            let sel = match i {
+                // `static`: Tailwind otherwise drops theme variables no utility uses, and pages also
+                // read them through `var()` and `(--name)` utilities.
+                0 if tailwind => "@theme static".to_string(),
+                0 => ":root".to_string(),
+                _ => format!("[data-{}=\"{}\"]", attr.trim_start_matches('-'), css_safe(&m.name)),
+            };
             out.push_str(&format!("/* {} · {} */\n{sel} {{\n", css_safe(&c.name), css_safe(&m.name)));
             for v in vars.variables.iter().filter(|v| v.collection == c.id) {
                 let value = match v.values.get(&m.id) {
                     Some(VariableValue::Color(col)) => col.to_css(),
-                    Some(VariableValue::Number(x)) => trim_num(*x),
+                    Some(VariableValue::Number(x)) if roles.role(v) == crate::token_roles::NumberRole::Unitless => trim_num(*x),
+                    Some(VariableValue::Number(x)) => format!("{}px", trim_num(*x)),
                     Some(VariableValue::String(t)) => format!("\"{}\"", css_safe(t)),
                     Some(VariableValue::Boolean(b)) => b.to_string(),
                     Some(VariableValue::Alias(a)) => match vars.get(a) {
-                        Some(t) => format!("var({})", css_var_of(t)),
+                        Some(t) => format!("var({})", name(t)),
                         None => continue,
                     },
                     None => continue,
                 };
-                out.push_str(&format!("  {}: {value};\n", css_var_of(v)));
+                out.push_str(&format!("  {}: {value};\n", name(v)));
+            }
+            out.push_str("}\n");
+        }
+    }
+    out
+}
+
+/// Words Dart never takes as a name.
+const DART_RESERVED: &[&str] = &[
+    "assert", "await", "break", "case", "catch", "class", "const", "continue", "default", "do", "else", "enum", "extends", "false", "final",
+    "finally", "for", "if", "in", "is", "new", "null", "rethrow", "return", "super", "switch", "this", "throw", "true", "try", "var", "void",
+    "while", "with", "yield",
+];
+
+/// Dart's built-in identifiers (no type may take them), and the types the constants use or name,
+/// which a class or constant of that name would shadow.
+const DART_BUILT_IN: &[&str] = &[
+    "abstract",
+    "as",
+    "bool",
+    "Color",
+    "covariant",
+    "deferred",
+    "double",
+    "dynamic",
+    "export",
+    "extension",
+    "external",
+    "factory",
+    "Function",
+    "get",
+    "implements",
+    "import",
+    "int",
+    "interface",
+    "late",
+    "library",
+    "List",
+    "mixin",
+    "num",
+    "Object",
+    "operator",
+    "part",
+    "required",
+    "set",
+    "static",
+    "String",
+    "typedef",
+];
+
+/// `name` as a Dart identifier: its words (anything but ASCII letters and digits separates them)
+/// in camelCase, or PascalCase for a type; never empty, never starting with a digit or reserved.
+fn dart_ident(name: &str, pascal: bool) -> String {
+    let mut out = String::new();
+    for w in name.split(|c: char| !c.is_ascii_alphanumeric()).filter(|w| !w.is_empty()) {
+        let mut cs = w.chars();
+        let Some(first) = cs.next() else { continue };
+        if out.is_empty() && !pascal {
+            out.push(first.to_ascii_lowercase());
+        } else {
+            out.push(first.to_ascii_uppercase());
+        }
+        out.extend(cs);
+    }
+    if out.is_empty() || out.starts_with(|c: char| c.is_ascii_digit()) {
+        out.insert(0, if pascal { 'V' } else { 'v' });
+    }
+    if DART_RESERVED.contains(&out.as_str()) || DART_BUILT_IN.contains(&out.as_str()) {
+        out.push('_');
+    }
+    out
+}
+
+/// `base`, or `base2`, `base3`… when `taken` has it already; the result is taken.
+fn dart_unique(base: String, taken: &mut BTreeSet<String>) -> String {
+    let mut name = base.clone();
+    let mut n = 2;
+    while !taken.insert(name.clone()) {
+        name = format!("{base}{n}");
+        n += 1;
+    }
+    name
+}
+
+/// `text` inside a Dart single-quoted string.
+fn dart_string(text: &str) -> String {
+    let mut out = String::with_capacity(text.len());
+    for c in text.chars() {
+        match c {
+            '\\' => out.push_str("\\\\"),
+            '\'' => out.push_str("\\'"),
+            '$' => out.push_str("\\$"),
+            '\n' => out.push_str("\\n"),
+            '\r' => out.push_str("\\r"),
+            c if c.is_control() => out.push_str(&format!("\\u{{{:x}}}", u32::from(c))),
+            c => out.push(c),
+        }
+    }
+    out
+}
+
+/// `x` at full precision as a Dart literal: whole numbers as integers (`4`), the rest in Rust's
+/// shortest round-trip form (`0.125`, `1e21`), which Dart reads as the same double.
+fn dart_number(x: f64) -> String {
+    if x.fract() == 0.0 && x.abs() < 1e15 { format!("{x}") } else { format!("{x:?}") }
+}
+
+/// `text` on one line of a Dart comment.
+fn dart_comment(text: &str) -> String {
+    text.chars().map(|c| if c.is_control() { ' ' } else { c }).collect()
+}
+
+/// Each collection's variables as Dart constants for Flutter: a class per mode (the default mode's
+/// named after the collection, the others after the collection and the mode) with a `static const`
+/// per variable. Aliases are resolved to their value in that mode (a variable of another
+/// collection in that collection's default mode), so each class stands alone.
+fn dart(vars: &Variables, colls: &[&Collection]) -> String {
+    let mut out = String::from("// Variables exported from FigCraft.\n\nimport 'dart:ui';\n");
+    let mut classes = BTreeSet::new();
+    for c in colls {
+        let base = dart_ident(&c.name, true);
+        let mut members = BTreeSet::new();
+        let names: Vec<(&Variable, String)> =
+            vars.variables.iter().filter(|v| v.collection == c.id).map(|v| (v, dart_unique(dart_ident(&v.name, false), &mut members))).collect();
+        for (i, m) in c.modes.iter().enumerate() {
+            let class = dart_unique(if i == 0 { base.clone() } else { format!("{base}{}", dart_ident(&m.name, true)) }, &mut classes);
+            out.push_str(&format!("\n/// {} · {}\nabstract final class {class} {{\n", dart_comment(&c.name), dart_comment(&m.name)));
+            let modes = BTreeMap::from([(c.id.clone(), m.id.clone())]);
+            for (v, name) in &names {
+                let (ty, value) = match vars.resolve(&v.id, &modes) {
+                    Some(VariableValue::Color(col)) => ("Color", crate::codegen::kotlin_color(col)),
+                    Some(VariableValue::Number(x)) if x.is_finite() => ("double", dart_number(x)),
+                    Some(VariableValue::String(t)) => ("String", format!("'{}'", dart_string(&t))),
+                    Some(VariableValue::Boolean(b)) => ("bool", b.to_string()),
+                    _ => continue,
+                };
+                out.push_str(&format!("  static const {ty} {name} = {value};\n"));
             }
             out.push_str("}\n");
         }
diff --git a/crates/engine/src/cmd/view.rs b/crates/engine/src/cmd/view.rs
index de69e690..7364557f 100644
--- a/crates/engine/src/cmd/view.rs
+++ b/crates/engine/src/cmd/view.rs
@@ -19,30 +19,58 @@ fn flag(s: &mut Session, p: &Value, f: fn(&mut ViewState) -> &mut bool) -> Resul
     Ok(json!({"on": *slot}))
 }
 
+/// One of a view's on/off settings.
+type Slot = fn(&mut ViewState) -> &mut bool;
+
+/// The View menu's on/off toggles (Pixel preview, with its scale, has its own command), and
+/// whether the preferences keep each: files opened or made later start with the kept ones. Outline
+/// modes and the sRGB soft-proof stay with their file, so a new file never opens in one.
+const TOGGLES: &[(&str, Slot, bool)] = &[
+    ("view.pixelGrid", |v| &mut v.pixel_grid, true),
+    ("view.layoutGrids", |v| &mut v.layout_grids, true),
+    ("view.rulers", |v| &mut v.rulers, true),
+    ("view.slices", |v| &mut v.show_slices, true),
+    ("view.comments", |v| &mut v.comments, true),
+    ("view.multiplayerCursors", |v| &mut v.multiplayer_cursors, true),
+    ("view.outlines", |v| &mut v.outlines, false),
+    ("view.outlinesSelection", |v| &mut v.outlines_selection, false),
+    ("view.outlinesHiddenLayers", |v| &mut v.outline_hidden, true),
+    ("view.outlinesObjectBounds", |v| &mut v.outline_bounds, true),
+    ("view.maskOutlines", |v| &mut v.mask_outlines, true),
+    ("view.frameOutlines", |v| &mut v.frame_outlines, true),
+    ("view.proofSrgb", |v| &mut v.proof_srgb, false),
+    ("view.snapGeometry", |v| &mut v.snap_geometry, true),
+    ("view.snapObjects", |v| &mut v.snap_objects, true),
+    ("view.snapPixel", |v| &mut v.snap_pixel, true),
+];
+
+/// View toggle `id`: the file's view changes, and the preferences remember a kept one.
+fn toggle(s: &mut Session, p: &Value, id: &str) -> Result<Value> {
+    let Some(&(_, f, keep)) = TOGGLES.iter().find(|(k, ..)| *k == id) else { return Err(bad(id, "not a View toggle")) };
+    let r = flag(s, p, f)?;
+    if keep && let Some(on) = r.get("on").and_then(Value::as_bool) {
+        s.prefs.view.insert(id.to_string(), on);
+    }
+    Ok(r)
+}
+
+/// Set `v`'s View toggles to the ones the preferences keep (the others stay as they are).
+pub(crate) fn apply_kept(prefs: &crate::Prefs, v: &mut ViewState) {
+    for (id, f, _) in TOGGLES.iter().filter(|t| t.2) {
+        if let Some(on) = prefs.view.get(*id) {
+            *f(v) = *on;
+        }
+    }
+}
+
 /// Whether the View menu's toggle `id` is on (the menus show a check mark); `None` for a command
 /// that isn't one.
 pub fn checked(s: &Session, id: &str) -> Option<bool> {
-    let v = &s.ds().ok()?.view;
-    Some(match id {
-        "view.pixelGrid" => v.pixel_grid,
-        "view.layoutGrids" => v.layout_grids,
-        "view.rulers" => v.rulers,
-        "view.slices" => v.show_slices,
-        "view.comments" => v.comments,
-        "view.multiplayerCursors" => v.multiplayer_cursors,
-        "view.outlines" => v.outlines,
-        "view.outlinesSelection" => v.outlines_selection,
-        "view.outlinesHiddenLayers" => v.outline_hidden,
-        "view.outlinesObjectBounds" => v.outline_bounds,
-        "view.maskOutlines" => v.mask_outlines,
-        "view.pixelPreview" => v.pixel_preview,
-        "view.frameOutlines" => v.frame_outlines,
-        "view.proofSrgb" => v.proof_srgb,
-        "view.snapGeometry" => v.snap_geometry,
-        "view.snapObjects" => v.snap_objects,
-        "view.snapPixel" => v.snap_pixel,
-        _ => return None,
-    })
+    let mut v = s.ds().ok()?.view.clone();
+    if id == "view.pixelPreview" {
+        return Some(v.pixel_preview);
+    }
+    TOGGLES.iter().find(|(k, ..)| *k == id).map(|(_, f, _)| *f(&mut v))
 }
 
 /// Pixel preview: toggles, or turns on at a resolution of 1x or 2x.
@@ -172,7 +200,7 @@ fn pref(s: &mut Session, p: &Value, f: fn(&mut crate::Prefs) -> &mut bool) -> Re
     Ok(json!({"on": *slot}))
 }
 
-fn tool(s: &mut Session, t: ToolId) -> Result<Value> {
+pub(crate) fn tool(s: &mut Session, t: ToolId) -> Result<Value> {
     // A file you can't edit now (view only, or on its way to a server): moving around only.
     if let Some(why) = s.active_read_only().filter(|_| !matches!(t, ToolId::Move | ToolId::Hand)) {
         return Err(EngineError::Disabled(format!("tool.{}", t.id()), why.into()));
@@ -235,46 +263,46 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!("view.nextFrame", "Zoom to next frame", "{}", false, |s, _| zoom_frame(s, 1)),
         spec!("view.prevPage", "Previous page", "{}", false, |s, _| page_step(s, -1)),
         spec!("view.nextPage", "Next page", "{}", false, |s, _| page_step(s, 1)),
-        spec!("view.pixelGrid", "Pixel grid", "{on?}", false, |s, p| flag(s, p, |v| &mut v.pixel_grid)),
-        spec!("view.layoutGrids", "Layout grids", "{on?}", false, |s, p| flag(s, p, |v| &mut v.layout_grids)),
-        spec!("view.rulers", "Rulers", "{on?}", false, |s, p| flag(s, p, |v| &mut v.rulers)),
-        spec!("view.slices", "Slices", "{on?}", false, |s, p| flag(s, p, |v| &mut v.show_slices)),
-        spec!("view.comments", "Comments", "{on?}", false, |s, p| flag(s, p, |v| &mut v.comments)),
+        spec!("view.pixelGrid", "Pixel grid", "{on?}", false, |s, p| toggle(s, p, "view.pixelGrid")),
+        spec!("view.layoutGrids", "Layout grids", "{on?}", false, |s, p| toggle(s, p, "view.layoutGrids")),
+        spec!("view.rulers", "Rulers", "{on?}", false, |s, p| toggle(s, p, "view.rulers")),
+        spec!("view.slices", "Slices", "{on?}", false, |s, p| toggle(s, p, "view.slices")),
+        spec!("view.comments", "Comments", "{on?}", false, |s, p| toggle(s, p, "view.comments")),
         spec!("view.multiplayerCursors", "Multiplayer cursors", "{on?}  others' cursors in a live session", false, |s, p| {
-            flag(s, p, |v| &mut v.multiplayer_cursors)
+            toggle(s, p, "view.multiplayerCursors")
         }),
         spec!("view.pan", "Pan the view", "{dx, dy (arrow-key steps, e.g. 1 or -1), big? (ten times as far, like Shift)}", false, pan),
-        spec!("view.outlines", "Outlines", "{on?}", false, |s, p| flag(s, p, |v| &mut v.outlines)),
+        spec!("view.outlines", "Outlines", "{on?}", false, |s, p| toggle(s, p, "view.outlines")),
         spec!("view.outlinesSelection", "Outlines for selection", "{on?}  outline mode for the selected layers only", false, |s, p| {
-            flag(s, p, |v| &mut v.outlines_selection)
+            toggle(s, p, "view.outlinesSelection")
         }),
         spec!(
             "view.outlinesHiddenLayers",
             "Include hidden layers in outlines",
             "{on?}  outline mode (and outlines for the selection) outlines hidden layers too; they can be clicked there",
             false,
-            |s, p| { flag(s, p, |v| &mut v.outline_hidden) }
+            |s, p| { toggle(s, p, "view.outlinesHiddenLayers") }
         ),
         spec!(
             "view.outlinesObjectBounds",
             "Include object bounds in outlines",
             "{on?}  outline mode also draws each layer's box (groups, text, vectors); a click on a box's edge picks its layer",
             false,
-            |s, p| { flag(s, p, |v| &mut v.outline_bounds) }
+            |s, p| { toggle(s, p, "view.outlinesObjectBounds") }
         ),
-        spec!("view.maskOutlines", "Mask outlines", "{on?}", false, |s, p| flag(s, p, |v| &mut v.mask_outlines)),
+        spec!("view.maskOutlines", "Mask outlines", "{on?}", false, |s, p| toggle(s, p, "view.maskOutlines")),
         spec!("view.pixelPreview", "Pixel preview", "{on?, scale? (1|2: rendered pixels per page pixel; turns it on)}", false, pixel_preview),
-        spec!("view.frameOutlines", "Frame outlines", "{on?}", false, |s, p| flag(s, p, |v| &mut v.frame_outlines)),
+        spec!("view.frameOutlines", "Frame outlines", "{on?}", false, |s, p| toggle(s, p, "view.frameOutlines")),
         spec!(
             "view.proofSrgb",
             "Soft-proof sRGB",
             "{on?}  mark the colours of a Display P3 file that sRGB screens and files can't show",
             false,
-            |s, p| { flag(s, p, |v| &mut v.proof_srgb) }
+            |s, p| { toggle(s, p, "view.proofSrgb") }
         ),
-        spec!("view.snapGeometry", "Snap to geometry", "{on?}", false, |s, p| flag(s, p, |v| &mut v.snap_geometry)),
-        spec!("view.snapObjects", "Snap to objects", "{on?}", false, |s, p| flag(s, p, |v| &mut v.snap_objects)),
-        spec!("view.snapPixel", "Snap to pixel grid", "{on?}", false, |s, p| flag(s, p, |v| &mut v.snap_pixel)),
+        spec!("view.snapGeometry", "Snap to geometry", "{on?}", false, |s, p| toggle(s, p, "view.snapGeometry")),
+        spec!("view.snapObjects", "Snap to objects", "{on?}", false, |s, p| toggle(s, p, "view.snapObjects")),
+        spec!("view.snapPixel", "Snap to pixel grid", "{on?}", false, |s, p| toggle(s, p, "view.snapPixel")),
         spec!("view.toggleUi", "Show/Hide UI", "{on?}", false, |s, p| flag(s, p, |v| &mut v.ui_hidden)),
         spec!("view.fullscreen", "Full screen", "{on?}  the window fills the screen (the desktop app; a no-op headless)", false, |s, p| {
             s.request_ui("window.fullscreen", json!({"on": boolean(p, "on")}));
@@ -342,7 +370,25 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!("pref.showDimensions", "Show dimensions on objects", "{on?}", false, |s, p| pref(s, p, |x| &mut x.show_dimensions)),
         spec!("pref.numberKeysOpacity", "Use number keys for opacity", "{on?}", false, |s, p| pref(s, p, |x| &mut x.number_keys_opacity)),
         spec!("pref.reduceMotion", "Reduce motion", "{on?}", false, |s, p| pref(s, p, |x| &mut x.reduce_motion)),
+        spec!(
+            "pref.uiScale",
+            "Interface size",
+            "{scale?: a size from 0.75 to 3 relative to the system's display scale, 1 being the system's own size, so 1.25 is 125 %, not 125 (outside the range it stops at the nearest end; \"auto\" is 1; omit: just read it)} → {scale}: how large the whole interface is drawn; the canvas zoom is separate",
+            false,
+            |s, p| {
+                match get(p, "scale") {
+                    None => {}
+                    Some(Value::String(v)) if v.trim().eq_ignore_ascii_case("auto") => s.prefs.ui_scale = 1.0,
+                    Some(_) => {
+                        let scale = req_num("pref.uiScale", p, "scale")?;
+                        s.prefs.ui_scale = crate::clamp_ui_scale(scale).ok_or_else(|| bad("pref.uiScale", "`scale` must be a finite number"))?;
+                    }
+                }
+                Ok(json!({"scale": s.prefs.ui_scale}))
+            }
+        ),
         spec!("pref.autoSave", "Save files automatically", "{on?}", false, |s, p| pref(s, p, |x| &mut x.auto_save)),
+        spec!("pref.startOnHome", "Start on the Home screen", "{on?}", false, |s, p| pref(s, p, |x| &mut x.start_on_home)),
         spec!("pref.nudge", "Nudge amount", "{small?, big?}", false, |s, p| {
             s.prefs.nudge_small = num(p, "small").unwrap_or(s.prefs.nudge_small).clamp(0.01, 1000.0);
             s.prefs.nudge_big = num(p, "big").unwrap_or(s.prefs.nudge_big).clamp(0.01, 10000.0);
@@ -381,7 +427,7 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "pref.language",
             "Interface language",
-            "{language: system|en|cs|ru|es|es-419|fr|de|pt-BR|ja|ko|zh-Hans|…; else English}",
+            "{language: system|en|cs|ru|es|es-419|fr|de|pt-BR|ja|ka|ko|vi|zh-Hans|…; else English}",
             false,
             |s, p| {
                 let lang = req_string("pref.language", p, "language")?;
@@ -419,11 +465,14 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "tool.set",
             "Choose tool",
-            "{tool: move|scale|hand|frame|section|slice|rectangle|line|arrow|ellipse|polygon|star|pen|pencil|text|comment|shapeBuilder}",
+            "{tool: move|scale|hand|frame|section|slice|rectangle|line|arrow|ellipse|polygon|star|pen|pencil|text|comment|shapeBuilder | on boards: sticky|shape|connector|marker|highlighter|eraser|stamp}",
             false,
             |s, p| {
                 let t = req_string("tool.set", p, "tool")?;
                 let t = ToolId::from_id(&t).ok_or_else(|| bad("tool.set", format!("unknown tool `{t}`")))?;
+                if t.on_boards() {
+                    crate::board::require(s, &format!("tool.{}", t.id()))?;
+                }
                 tool(s, t)
             }
         ),
@@ -486,11 +535,42 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!("tool.pen", "Pen", "{}", false, |s, _| tool(s, ToolId::Pen)),
         spec!("tool.pencil", "Pencil", "{}", false, |s, _| tool(s, ToolId::Pencil)),
         spec!("tool.text", "Text", "{}", false, |s, _| tool(s, ToolId::Text)),
+        spec!("tool.textOnPath", "Text on a path", "{}  a click on a shape's or vector's path puts new text on it", false, |s, _| {
+            tool(s, ToolId::TextOnPath)
+        }),
         spec!("tool.comment", "Comment", "{}", false, |s, _| tool(s, ToolId::Comment)),
         spec!("tool.shapeBuilder", "Shape builder", "{}", false, |s, _| tool(s, ToolId::ShapeBuilder)),
-        spec!("edit.pickColor", "Pick color", "{}", false, |s, _| tool(s, ToolId::Eyedropper)),
+        // `apply: false` is for the UI colour picker: the eyedropper only samples (into
+        // `ToolState::picked`) and the picker writes the colour to the paint it edits.
+        spec!("edit.pickColor", "Pick color", "{apply?}", false, |s, p| {
+            let r = tool(s, ToolId::Eyedropper)?;
+            s.tool.pick_only = !boolean(p, "apply").unwrap_or(true);
+            s.tool.picked = None;
+            Ok(r)
+        }),
     ]
 }
 
 #[allow(dead_code)]
 fn unused(_: NodeId) {}
+
+#[cfg(test)]
+mod start_on_home_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn start_on_home_is_a_preference_that_persists() {
+        let mut s = Session::new();
+        assert!(!s.prefs.start_on_home);
+        assert_eq!(s.execute("pref.startOnHome", &json!({})).unwrap()["on"], true);
+        assert!(s.prefs.start_on_home);
+        // Saved with the other preferences and read back; older settings files without it read as off.
+        let saved: crate::Prefs = serde_json::from_value(serde_json::to_value(&s.prefs).unwrap()).unwrap();
+        assert!(saved.start_on_home);
+        assert_eq!(s.execute("pref.startOnHome", &json!({"on": false})).unwrap()["on"], false);
+        let old: crate::Prefs = serde_json::from_value(json!({"theme": "dark"})).unwrap();
+        assert!(!old.start_on_home);
+    }
+}
diff --git a/crates/engine/src/code_connect_tests.rs b/crates/engine/src/code_connect_tests.rs
index 9d657d5f..1ee785e6 100644
--- a/crates/engine/src/code_connect_tests.rs
+++ b/crates/engine/src/code_connect_tests.rs
@@ -72,6 +72,16 @@ fn connected_instances_show_the_real_snippet() {
         json!({"id": c, "language": "leptos", "importPath": "crate::ui", "template": "<Card title={title} dotted={Show dot} />"}),
     );
     assert_eq!(code(&mut s, i, "leptos"), "use crate::ui::Card;\n\n<Card title={\"Say \\\"hi\\\"\"} dotted={false} />\n");
+    // ArkUI: an ArkTS import and an object-literal call.
+    ex(
+        &mut s,
+        "codeConnect.set",
+        json!({"id": c, "language": "arkui", "importPath": "@acme/arkui", "template": "Card({ title: {title}, dotted: {Show dot} })"}),
+    );
+    assert_eq!(code(&mut s, i, "arkui"), "import { Card } from \"@acme/arkui\";\n\nCard({ title: \"Say \\\"hi\\\"\", dotted: false })\n");
+    let v = ex(&mut s, "inspect.componentCode", json!({"id": i, "language": "arkui"}));
+    assert_eq!(v["usage"], "Card({ title: \"Say \\\"hi\\\"\", dotted: false })\n");
+    assert_eq!(v["connected"]["import"], "import { Card } from \"@acme/arkui\";");
     assert!(s.execute("codeConnect.set", &json!({"id": c, "language": "leptos", "importPath": "crate/ui"})).is_err(), "a Rust path");
     ex(&mut s, "codeConnect.remove", json!({"id": c, "language": "leptos"}));
     // inspect.componentCode: the snippet as the usage, and the link.
@@ -105,7 +115,7 @@ fn connected_instances_show_the_real_snippet() {
     assert!(code(&mut s, i, "swiftui").starts_with("import AcmeUI"));
     ex(&mut s, "edit.undo", json!({}));
     assert!(code(&mut s, i, "react").starts_with("import { Card }"));
-    assert_eq!(ex(&mut s, "codeConnect.remove", json!({"id": c}))["removed"], 2);
+    assert_eq!(ex(&mut s, "codeConnect.remove", json!({"id": c}))["removed"], 3);
     assert!(s.execute("codeConnect.remove", &json!({"id": c})).is_err(), "nothing left");
 }
 
@@ -183,3 +193,79 @@ fn code_connect_commands_survive_junk() {
         }
     }
 }
+
+#[test]
+fn vue_links_are_a_default_import_with_quoted_bindings() {
+    let mut s = Session::new();
+    let c = card(&mut s);
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": c, "x": 300, "y": 0})));
+    ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Show dot": false, "Title": "Buy"}}));
+    // A single-file component is a default import. A bound attribute takes an expression, so a
+    // string keeps its JS quotes inside the attribute (as entities): `Buy` alone would be a
+    // variable, not the string.
+    let v = ex(
+        &mut s,
+        "codeConnect.set",
+        json!({"id": i, "language": "vue", "importPath": "@/components/Card.vue",
+               "template": "<Card :title={title} :dotted={Show dot} />"}),
+    );
+    let want = "import Card from \"@/components/Card.vue\";\n\n<Card :title=\"&quot;Buy&quot;\" :dotted=\"false\" />\n";
+    assert_eq!(v["code"], want);
+    assert_eq!(code(&mut s, i, "vue"), want);
+    assert_eq!(ex(&mut s, "inspect.code", json!({"id": i, "language": "vue"}))["connected"], true);
+    // No template given: the generated one binds a quoted value for every property.
+    ex(&mut s, "codeConnect.remove", json!({"id": c, "language": "vue"}));
+    ex(&mut s, "codeConnect.set", json!({"id": c, "language": "vue", "importPath": "./Card.vue"}));
+    assert_eq!(code(&mut s, c, "vue"), "import Card from \"./Card.vue\";\n\n<Card :showDot=\"true\" :title=\"&quot;Hello&quot;\" />\n");
+    // A plain string attribute (no `:`) takes the text itself, and a variant binding is a string
+    // expression like any other.
+    ex(&mut s, "codeConnect.set", json!({"id": i, "language": "vue", "template": "<Card title={title} :dotted={Show dot} />"}));
+    assert_eq!(code(&mut s, i, "vue"), "import Card from \"./Card.vue\";\n\n<Card title=\"Buy\" :dotted=\"false\" />\n");
+    let (set, hover) = button(&mut s);
+    let b = idv(&ex(&mut s, "instance.create", json!({"component": hover, "x": 0, "y": 700})));
+    ex(&mut s, "codeConnect.set", json!({"id": b, "language": "vue", "template": "<Button :state={state} />"}));
+    assert_eq!(code(&mut s, b, "vue"), "<Button :state=\"&quot;Hover&quot;\" />\n");
+    assert_eq!(id_of(&ex(&mut s, "codeConnect.set", json!({"id": set}))["component"]), Some(set));
+    // A string with escapes stays one value: the attribute delimiter is what gets escaped, so the
+    // binding stays a single well-formed attribute.
+    ex(&mut s, "codeConnect.set", json!({"id": i, "language": "vue", "template": "<Card :title={title} :dotted={Show dot} />"}));
+    ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Title": "Say \"hi\""}}));
+    let escaped = code(&mut s, i, "vue");
+    let line = escaped.lines().find(|l| l.contains("&quot;")).unwrap_or_default();
+    assert!(line.starts_with("<Card :title=\"&quot;Say"), "{line}");
+    assert!(line.contains(":dotted=\"false\""), "{line}");
+    assert!(line.ends_with("\" />"), "{line}");
+    // A single-quoted attribute keeps its delimiter (the expression's double quotes stay), and a
+    // placeholder in template content is text, not a quoted string.
+    ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Title": "Buy"}}));
+    ex(&mut s, "codeConnect.set", json!({"id": i, "language": "vue", "template": "<Card :title='{title}' :dotted='{Show dot}' />"}));
+    assert_eq!(code(&mut s, i, "vue"), "import Card from \"./Card.vue\";\n\n<Card :title='\"Buy\"' :dotted='false' />\n");
+    ex(&mut s, "codeConnect.set", json!({"id": i, "language": "vue", "template": "<Card title='{title}'>{title}</Card>"}));
+    assert_eq!(code(&mut s, i, "vue"), "import Card from \"./Card.vue\";\n\n<Card title='Buy'>Buy</Card>\n");
+    // A second placeholder in the same quoted attribute is still attribute text, and its value's
+    // quotes are escaped.
+    ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Title": "Say \"hi\""}}));
+    ex(&mut s, "codeConnect.set", json!({"id": i, "language": "vue", "template": "<Card title=\"{title} {title}\" />"}));
+    assert_eq!(code(&mut s, i, "vue"), "import Card from \"./Card.vue\";\n\n<Card title=\"Say &quot;hi&quot; Say &quot;hi&quot;\" />\n");
+    // Text after a completed tag is text, even when it contains `=`.
+    ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Title": "Buy"}}));
+    ex(&mut s, "codeConnect.set", json!({"id": i, "language": "vue", "template": "<p>Total = {title}</p>"}));
+    assert_eq!(code(&mut s, i, "vue"), "import Card from \"./Card.vue\";\n\n<p>Total = Buy</p>\n");
+    // Vue is linkable; a language that isn't stays refused.
+    assert!(s.execute("codeConnect.set", &json!({"id": c, "language": "css"})).is_err(), "not a code language");
+    assert!(s.execute("codeConnect.set", &json!({"id": c, "language": "vue", "importPath": "a b"})).is_err(), "no spaces in a path");
+}
+
+#[test]
+fn vue_layer_trees_import_connected_components_in_script_setup() {
+    let mut s = Session::new();
+    let c = card(&mut s);
+    ex(&mut s, "codeConnect.set", json!({"id": c, "language": "vue", "importPath": "./Card.vue"}));
+    let screen = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 500, "width": 400, "height": 300, "name": "Screen"})));
+    ex(&mut s, "instance.create", json!({"component": c, "x": 20, "y": 30, "parent": screen}));
+    // A single-file component's imports belong in its `<script setup>`, not before the template.
+    let code = code(&mut s, screen, "vue");
+    let want = "<script setup lang=\"ts\">\n\nimport Card from \"./Card.vue\";\n\n</script>\n\n<template>\n";
+    assert!(code.starts_with(want), "{code}");
+    assert_eq!(code.matches("import Card").count(), 1, "{code}");
+}
diff --git a/crates/engine/src/codegen.rs b/crates/engine/src/codegen.rs
deleted file mode 100644
index 273d84ad..00000000
--- a/crates/engine/src/codegen.rs
+++ /dev/null
@@ -1,1549 +0,0 @@
-//! Code for a layer, as shown by the Inspect panel and returned by `inspect.code`: CSS for the
-//! layer itself, HTML or React for its subtree, and SwiftUI, Jetpack Compose or Flutter (stacks
-//! for auto layout, absolute offsets otherwise). Components become components whose properties are
-//! parameters and instances become calls passing their values (see [`crate::component_codegen`]);
-//! variables bound to a layer become CSS custom properties. The output is a starting point, not a
-//! pixel-exact translation.
-
-use figcraft_color::{Color, PaintKind};
-use figcraft_doc::*;
-use serde_json::json;
-
-use crate::cmd::CommandSpec;
-use crate::component_codegen::{Component, Param};
-use crate::params::*;
-use crate::{bad, spec};
-
-pub fn specs() -> Vec<CommandSpec> {
-    vec![spec!(
-        "inspect.code",
-        "Code for layer",
-        "{id?, language?: css|html|react|leptos|swiftui|compose|flutter (default css; html, react and leptos are the whole layer tree; components take their properties as parameters, instances pass their values; a component connected to code (codeConnect.set) gives its import and snippet instead), unit?: px|rem (CSS, HTML, React and Leptos; default px), rootFontSize? (rem: pixels per rem, default 16)} → {code, language, connected}",
-        false,
-        |s, p| {
-            let cmd = "inspect.code";
-            let id = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a layer"))?;
-            let lang = match string(p, "language") {
-                Some(l) => CodeLang::from_id(&l).ok_or_else(|| bad(cmd, "language: css|html|react|leptos|swiftui|compose|flutter"))?,
-                None => CodeLang::Css,
-            };
-            let rem = match string(p, "unit").map(|u| u.to_ascii_lowercase()).as_deref() {
-                None | Some("px") => None,
-                Some("rem") => Some(num_or(p, "rootFontSize", 16.0)).filter(|r| r.is_finite() && *r > 0.0 && *r <= 1000.0),
-                Some(_) => return Err(bad(cmd, "unit: px|rem")),
-            };
-            if string(p, "unit").is_some_and(|u| u.eq_ignore_ascii_case("rem")) && rem.is_none() {
-                return Err(bad(cmd, "rootFontSize: a positive number of pixels (up to 1000)"));
-            }
-            let doc = s.doc()?;
-            if !doc.contains(id) {
-                return Err(bad(cmd, "no such layer"));
-            }
-            let connected = crate::code_connect::link(doc, id, lang).is_some();
-            let code = code_for(doc, id, lang);
-            let code = match rem {
-                Some(root) if lang.is_web() => px_to_rem(&code, root),
-                _ => code,
-            };
-            Ok(json!({"code": code, "language": lang.id(), "connected": connected}))
-        }
-    )]
-}
-
-/// Languages the Inspect panel offers.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
-pub enum CodeLang {
-    #[default]
-    Css,
-    /// The whole layer tree as nested HTML elements with a stylesheet.
-    Html,
-    /// A React function component (TSX) with its stylesheet.
-    React,
-    /// A Leptos component (`view!` markup) with its stylesheet.
-    Leptos,
-    SwiftUi,
-    Compose,
-    /// A Flutter `StatelessWidget` (Dart) with its widget tree.
-    Flutter,
-}
-
-impl CodeLang {
-    pub const ALL: [CodeLang; 7] =
-        [CodeLang::Css, CodeLang::Html, CodeLang::React, CodeLang::Leptos, CodeLang::SwiftUi, CodeLang::Compose, CodeLang::Flutter];
-    pub fn id(self) -> &'static str {
-        match self {
-            CodeLang::Css => "css",
-            CodeLang::Html => "html",
-            CodeLang::React => "react",
-            CodeLang::Leptos => "leptos",
-            CodeLang::SwiftUi => "swiftui",
-            CodeLang::Compose => "compose",
-            CodeLang::Flutter => "flutter",
-        }
-    }
-    pub fn label(self) -> &'static str {
-        match self {
-            CodeLang::Css => "CSS",
-            CodeLang::Html => "HTML + CSS",
-            CodeLang::React => "React",
-            CodeLang::Leptos => "Leptos",
-            CodeLang::SwiftUi => "SwiftUI",
-            CodeLang::Compose => "Compose",
-            CodeLang::Flutter => "Flutter",
-        }
-    }
-    /// Languages whose lengths are CSS pixels (they can be shown in rem).
-    pub fn is_web(self) -> bool {
-        matches!(self, CodeLang::Css | CodeLang::Html | CodeLang::React | CodeLang::Leptos)
-    }
-    /// Languages whose strings interpolate `$` (Kotlin's `$name`, Dart's `$name`), where a literal
-    /// `$` has to be escaped.
-    pub fn escapes_dollar(self) -> bool {
-        matches!(self, CodeLang::Compose | CodeLang::Flutter)
-    }
-    pub fn from_id(s: &str) -> Option<CodeLang> {
-        if s.eq_ignore_ascii_case("tsx") || s.eq_ignore_ascii_case("jsx") {
-            return Some(CodeLang::React);
-        }
-        if s.eq_ignore_ascii_case("dart") {
-            return Some(CodeLang::Flutter);
-        }
-        CodeLang::ALL.into_iter().find(|l| l.id().eq_ignore_ascii_case(s) || l.label().eq_ignore_ascii_case(s))
-    }
-}
-
-/// Layers deeper than this (or past this many children) are summarised.
-const MAX_DEPTH: usize = 12;
-const MAX_CHILDREN: usize = 200;
-
-/// `v` without trailing zeros (2 decimals).
-pub(crate) fn num(v: f64) -> String {
-    if !v.is_finite() {
-        return "0".into();
-    }
-    let r = (v * 100.0).round() / 100.0;
-    if (r - r.round()).abs() < 1e-9 { format!("{}", r.round() as i64) } else { format!("{r}") }
-}
-
-/// `code` with every pixel length (`12px`) in rem of `root` pixels (`0.75rem`); names that end
-/// in "px", markup lines (layer text), string literals and comments are left alone.
-pub fn px_to_rem(code: &str, root: f64) -> String {
-    let mut out = String::with_capacity(code.len());
-    let mut in_comment = false;
-    for line in code.split_inclusive('\n') {
-        if !in_comment && line.trim_start().starts_with('<') {
-            out.push_str(line);
-            continue;
-        }
-        // Lengths outside strings and comments convert; `plain` is where that stretch starts.
-        let mut plain = 0;
-        let mut chars = line.char_indices().peekable();
-        while let Some((i, c)) = chars.next() {
-            if in_comment {
-                if c == '*' && chars.peek().is_some_and(|(_, n)| *n == '/') {
-                    chars.next();
-                    out.push_str(line.get(plain..i + 2).unwrap_or(""));
-                    plain = i + 2;
-                    in_comment = false;
-                }
-            } else if c == '/' && chars.peek().is_some_and(|(_, n)| *n == '*') {
-                chars.next();
-                out.push_str(&lengths_to_rem(line.get(plain..i).unwrap_or(""), root));
-                plain = i;
-                in_comment = true;
-            } else if c == '"' {
-                out.push_str(&lengths_to_rem(line.get(plain..i).unwrap_or(""), root));
-                let mut end = line.len();
-                while let Some((j, s)) = chars.next() {
-                    if s == '\\' {
-                        chars.next();
-                    } else if s == '"' {
-                        end = j + 1;
-                        break;
-                    }
-                }
-                out.push_str(line.get(i..end).unwrap_or(""));
-                plain = end;
-            }
-        }
-        let rest = line.get(plain..).unwrap_or("");
-        if in_comment {
-            out.push_str(rest);
-        } else {
-            out.push_str(&lengths_to_rem(rest, root));
-        }
-    }
-    out
-}
-
-/// `code` with every pixel length in rem of `root` pixels; names that end in "px" are left alone.
-fn lengths_to_rem(code: &str, root: f64) -> String {
-    let ident = |c: char| c.is_alphanumeric() || c == '_';
-    let mut out = String::with_capacity(code.len());
-    let mut rest = code;
-    while let Some(i) = rest.find("px") {
-        let (head, tail) = (rest.get(..i).unwrap_or(""), rest.get(i + 2..).unwrap_or(""));
-        // The number right before "px".
-        let start = head.char_indices().rev().take_while(|(_, c)| c.is_ascii_digit() || *c == '.' || *c == '-').last().map_or(head.len(), |(j, _)| j);
-        let (before, number) = (head.get(..start).unwrap_or(""), head.get(start..).unwrap_or(""));
-        let free = !before.chars().next_back().is_some_and(ident) && !tail.chars().next().is_some_and(|c| ident(c) || c == '-');
-        match number.parse::<f64>() {
-            Ok(v) if free && v.is_finite() => {
-                out.push_str(before);
-                out.push_str(&format!("{}rem", num(v / root)));
-            }
-            _ => {
-                out.push_str(head);
-                out.push_str("px");
-            }
-        }
-        rest = tail;
-    }
-    out.push_str(rest);
-    out
-}
-
-pub fn code_for(doc: &Document, id: NodeId, lang: CodeLang) -> String {
-    match lang {
-        CodeLang::Css => css(doc, id),
-        CodeLang::Html => html(doc, id),
-        CodeLang::React | CodeLang::Leptos | CodeLang::SwiftUi | CodeLang::Compose | CodeLang::Flutter => {
-            crate::component_codegen::code(doc, id, lang)
-        }
-    }
-}
-
-/// What a tree walk generates for: the document, the layer the code is for (instances under it
-/// become calls), and the component whose properties are parameters.
-pub(crate) struct Ctx<'a> {
-    pub doc: &'a Document,
-    pub root: NodeId,
-    pub comp: Option<&'a Component>,
-    /// Indentation the walk starts at (the depth cap counts from it).
-    pub base: usize,
-}
-
-impl<'a> Ctx<'a> {
-    pub fn new(doc: &'a Document, root: NodeId) -> Self {
-        Ctx { doc, root, comp: None, base: 0 }
-    }
-
-    /// The component parameter controlling `field` ("visible", "characters", "mainComponent",
-    /// "slot") of `n`.
-    pub fn param(&self, n: &Node, field: &str) -> Option<&'a Param> {
-        let name = n.prop_refs.get(field)?;
-        self.comp?.params.iter().find(|p| &p.prop == name)
-    }
-
-    /// Visible children in paint order (bottom first), capped; in component code, hidden layers a
-    /// boolean parameter shows are included.
-    pub fn kids(&self, n: &Node) -> Vec<NodeId> {
-        n.children
-            .iter()
-            .copied()
-            .filter(|c| self.doc.node(*c).is_some_and(|k| k.visible || self.param(k, "visible").is_some()))
-            .take(MAX_CHILDREN)
-            .collect()
-    }
-
-    fn too_deep(&self, depth: usize) -> bool {
-        depth > self.base + MAX_DEPTH
-    }
-
-    /// A call for an instance below the root (`None` for other layers, or a missing main).
-    fn call(&self, n: &Node, lang: CodeLang, depth: usize) -> Option<String> {
-        if n.id == self.root || !matches!(n.kind, NodeKind::Instance { .. }) {
-            return None;
-        }
-        crate::component_codegen::usage(self.doc, n.id, lang, depth)
-    }
-}
-
-fn first_fill(n: &Node) -> Option<Color> {
-    n.fills.iter().filter(|p| p.visible).find_map(|p| match &p.kind {
-        PaintKind::Solid { color } => Some(color.with_alpha(color.a * p.opacity)),
-        PaintKind::Gradient(g) => g.sorted_stops().first().map(|s| s.color),
-        PaintKind::Image(_) | PaintKind::Pattern(_) => None,
-    })
-}
-
-fn stroke_color(n: &Node) -> Option<Color> {
-    if !n.has_visible_stroke() {
-        return None;
-    }
-    n.strokes.iter().filter(|p| p.visible).find_map(|p| p.solid_color().map(|c| c.with_alpha(c.a * p.opacity)))
-}
-
-fn drop_shadow(n: &Node) -> Option<&Shadow> {
-    n.effects.iter().filter(|e| e.visible).find_map(|e| match &e.kind {
-        EffectKind::DropShadow(s) => Some(s),
-        _ => None,
-    })
-}
-
-fn radius(n: &Node) -> f64 {
-    n.corners.uniform().unwrap_or_else(|| n.corners.radii.iter().copied().fold(0.0, f64::max))
-}
-
-/// Text content as a string literal (escaped for Swift; Kotlin and Dart also escape `$`).
-pub(crate) fn literal(s: &str, escape_dollar: bool) -> String {
-    let mut out = String::from("\"");
-    for c in s.chars().take(10_000) {
-        match c {
-            '"' => out.push_str("\\\""),
-            '\\' => out.push_str("\\\\"),
-            '\n' | '\u{2028}' => out.push_str("\\n"),
-            '\r' => {}
-            '\t' => out.push_str("\\t"),
-            '$' if escape_dollar => out.push_str("\\$"),
-            c if c.is_control() => {}
-            c => out.push(c),
-        }
-    }
-    out.push('"');
-    out
-}
-
-pub(crate) fn indent(depth: usize) -> String {
-    "    ".repeat(depth)
-}
-
-// ------------------------------------------------------------------ CSS
-
-/// The CSS custom properties generated code uses: name → fallback value, in first-use order.
-#[derive(Default)]
-pub(crate) struct Tokens(pub Vec<(String, String)>);
-
-impl Tokens {
-    /// `var(--name, value)`, remembering the variable.
-    fn var(&mut self, variable: &Variable, value: String) -> String {
-        let name = css_var_of(variable);
-        let out = format!("var({name}, {value})");
-        if !self.0.iter().any(|(n, _)| *n == name) {
-            self.0.push((name, value));
-        }
-        out
-    }
-
-    /// A `:root` rule declaring the variables (empty without any).
-    pub fn root_rule(&self) -> String {
-        if self.0.is_empty() {
-            return String::new();
-        }
-        let decls: String = self.0.iter().map(|(n, v)| format!("  {n}: {v};\n")).collect();
-        format!(":root {{\n{decls}}}\n")
-    }
-}
-
-/// A variable's CSS custom property name: "Colors/Brand 500" → `--colors-brand-500`.
-pub fn css_var_name(variable: &str) -> String {
-    let mut out = String::from("--");
-    for c in variable.chars().flat_map(char::to_lowercase).take(80) {
-        if c.is_alphanumeric() || c == '_' {
-            out.push(c);
-        } else if !out.ends_with('-') {
-            out.push('-');
-        }
-    }
-    let trimmed = out.trim_end_matches('-');
-    if trimmed.len() <= 2 { "--variable".into() } else { trimmed.to_string() }
-}
-
-/// A variable's CSS custom property: its Web code syntax (`var(--x)` or `--x`) when it has one,
-/// else made from its name.
-pub fn css_var_of(v: &Variable) -> String {
-    let Some(web) = v.code_syntax.get("WEB").map(|w| w.trim()) else { return css_var_name(&v.name) };
-    let inner = web.strip_prefix("var(").map_or(web, |r| r.split([',', ')']).next().unwrap_or("").trim());
-    let valid = inner.len() > 2 && inner.starts_with("--") && inner.chars().all(|c| c.is_alphanumeric() || c == '-' || c == '_');
-    if valid { inner.chars().take(80).collect() } else { css_var_name(inner) }
-}
-
-/// `value`, or a reference to the variable bound to the first of `fields` that has one.
-fn tok(doc: &Document, n: &Node, fields: &[&str], value: String, t: &mut Tokens) -> String {
-    match fields.iter().find_map(|f| crate::devinspect::bound_variable(doc, n, f)) {
-        Some(v) => t.var(v, value),
-        None => value,
-    }
-}
-
-fn css(doc: &Document, id: NodeId) -> String {
-    let Some(n) = doc.node(id) else { return String::new() };
-    let mut t = Tokens::default();
-    let decls = css_decls(doc, n, &mut t, (false, false));
-    format!("/* {} */\n{decls}", n.name.replace("*/", "* /"))
-}
-
-/// The CSS declarations for `n`'s own look and size, one per line; `hug` leaves out the width
-/// and/or height (they follow the content). Bound variables become `var(--name, value)`.
-pub(crate) fn css_decls(doc: &Document, n: &Node, t: &mut Tokens, hug: (bool, bool)) -> String {
-    let px = |v: f64| format!("{}px", num(v));
-    let mut out = String::new();
-    let mut put = |key: &str, value: String| out.push_str(&format!("{key}: {value};\n"));
-    if !hug.0 {
-        put("width", tok(doc, n, &["width"], px(n.width), t));
-    }
-    if !hug.1 {
-        put("height", tok(doc, n, &["height"], px(n.height), t));
-    }
-    if let Some(l) = &n.layout {
-        put("display", "flex".into());
-        put("flex-direction", if l.mode == LayoutMode::Vertical { "column" } else { "row" }.into());
-        if l.wrap {
-            put("flex-wrap", "wrap".into());
-        }
-        put("gap", tok(doc, n, &["gap"], px(l.gap), t));
-        let [pt, pr, pb, pl] = l.padding;
-        let sides = [
-            tok(doc, n, &["paddingTop", "paddingVertical", "padding"], px(pt), t),
-            tok(doc, n, &["paddingRight", "paddingHorizontal", "padding"], px(pr), t),
-            tok(doc, n, &["paddingBottom", "paddingVertical", "padding"], px(pb), t),
-            tok(doc, n, &["paddingLeft", "paddingHorizontal", "padding"], px(pl), t),
-        ];
-        put("padding", sides.join(" "));
-        let justify = match l.main_align {
-            MainAlign::Min => "flex-start",
-            MainAlign::Center => "center",
-            MainAlign::Max => "flex-end",
-            MainAlign::SpaceBetween => "space-between",
-            MainAlign::SpaceAround => "space-around",
-            MainAlign::SpaceEvenly => "space-evenly",
-        };
-        put("justify-content", justify.into());
-        let align = match l.cross_align {
-            CrossAlign::Min => "flex-start",
-            CrossAlign::Center => "center",
-            CrossAlign::Max => "flex-end",
-            CrossAlign::Baseline => "baseline",
-        };
-        put("align-items", align.into());
-        if l.wrap {
-            // The lines: spread, or packed where the items align (baseline: at the start).
-            let spread = l.content_align == ContentAlign::SpaceBetween;
-            put(
-                "align-content",
-                if spread {
-                    "space-between"
-                } else if align == "baseline" {
-                    "flex-start"
-                } else {
-                    align
-                }
-                .into(),
-            );
-        }
-    }
-    if matches!(n.kind, NodeKind::Ellipse { .. }) {
-        put("border-radius", "50%".into());
-    } else if let Some(r) = n.corners.uniform().filter(|r| *r > 0.0) {
-        put("border-radius", tok(doc, n, &["cornerRadius"], px(r), t));
-    } else if n.corners.radii.iter().any(|r| *r > 0.0) {
-        let fields = ["topLeftRadius", "topRightRadius", "bottomRightRadius", "bottomLeftRadius"];
-        let corners: Vec<String> = n.corners.radii.iter().zip(fields).map(|(r, f)| tok(doc, n, &[f, "cornerRadius"], px(*r), t)).collect();
-        put("border-radius", corners.join(" "));
-    }
-    if n.opacity < 1.0 {
-        put("opacity", tok(doc, n, &["opacity"], num(f64::from(n.opacity)), t));
-    }
-    if !matches!(n.blend, figcraft_color::BlendMode::Normal | figcraft_color::BlendMode::PassThrough) {
-        put("mix-blend-mode", n.blend.css().into());
-    }
-    // Rotation turns counter-clockwise about the top-left corner (the position given); CSS
-    // rotate turns clockwise.
-    let rot = figcraft_geom::rotation_degrees(n.transform);
-    if rot.abs() > 0.01 && rot.is_finite() {
-        put("transform", format!("rotate({}deg)", num(-rot)));
-        put("transform-origin", "top left".into());
-    }
-    for (i, p) in n.fills.iter().enumerate().filter(|(_, p)| p.visible) {
-        match &p.kind {
-            PaintKind::Solid { color } => {
-                let key = if matches!(n.kind, NodeKind::Text(_)) { "color" } else { "background" };
-                let c = color.with_alpha(color.a * p.opacity).to_css();
-                // A variable binds the first paint's colour.
-                put(key, if i == 0 { tok(doc, n, &["fill"], c, t) } else { c });
-            }
-            PaintKind::Gradient(g) => put("background", css_gradient(g, n.width, n.height)),
-            PaintKind::Image(_) => put("background", "url(image.png) center / cover".into()),
-            PaintKind::Pattern(_) => put("background", "url(pattern.png) repeat".into()),
-        }
-    }
-    if let Some(c) = stroke_color(n) {
-        let weight = tok(doc, n, &["strokeWeight"], px(n.stroke.weight), t);
-        put("border", format!("{weight} solid {}", tok(doc, n, &["stroke"], c.to_css(), t)));
-    }
-    let shadows: Vec<String> = n
-        .effects
-        .iter()
-        .filter(|e| e.visible)
-        .filter_map(|e| match &e.kind {
-            EffectKind::DropShadow(s) => {
-                Some(format!("{}px {}px {}px {}px {}", num(s.offset.0), num(s.offset.1), num(s.radius), num(s.spread), s.color.to_css()))
-            }
-            EffectKind::InnerShadow(s) => {
-                Some(format!("inset {}px {}px {}px {}px {}", num(s.offset.0), num(s.offset.1), num(s.radius), num(s.spread), s.color.to_css()))
-            }
-            _ => None,
-        })
-        .collect();
-    if !shadows.is_empty() {
-        put("box-shadow", shadows.join(", "));
-    }
-    for e in n.effects.iter().filter(|e| e.visible) {
-        match e.kind {
-            // CSS blurs are uniform: a progressive blur has no CSS equivalent and is left out.
-            EffectKind::LayerBlur(ref b) if !b.is_progressive() => put("filter", format!("blur({}px)", num(b.radius / 2.0))),
-            EffectKind::BackgroundBlur(ref b) if !b.is_progressive() => put("backdrop-filter", format!("blur({}px)", num(b.radius / 2.0))),
-            // CSS has no refraction: the frost is the nearest.
-            EffectKind::Glass(ref g) => put("backdrop-filter", format!("blur({}px)", num(g.sanitized().frost / 2.0))),
-            _ => {}
-        }
-    }
-    if let NodeKind::Text(tx) = &n.kind {
-        let s = &tx.style;
-        put("font-family", tok(doc, n, &["fontFamily"], format!("\"{}\"", s.font_family.replace('"', "'")), t));
-        put("font-size", tok(doc, n, &["fontSize"], px(s.font_size), t));
-        put("font-weight", s.weight().to_string());
-        if s.italic() {
-            put("font-style", "italic".into());
-        }
-        match s.line_height {
-            LineHeight::Pixels(v) => put("line-height", tok(doc, n, &["lineHeight"], px(v), t)),
-            LineHeight::Percent(p) => put("line-height", format!("{}%", num(p))),
-            LineHeight::Auto => {}
-        }
-        match s.letter_spacing {
-            LetterSpacing::Pixels(v) if v != 0.0 => put("letter-spacing", tok(doc, n, &["letterSpacing"], px(v), t)),
-            LetterSpacing::Percent(p) if p != 0.0 => put("letter-spacing", format!("{}em", num(p / 100.0))),
-            _ => {}
-        }
-        match tx.align_h {
-            TextAlignH::Left => {}
-            TextAlignH::Center => put("text-align", "center".into()),
-            TextAlignH::Right => put("text-align", "right".into()),
-            TextAlignH::Justified => put("text-align", "justify".into()),
-        }
-        match s.case {
-            TextCase::Original => {}
-            TextCase::Upper => put("text-transform", "uppercase".into()),
-            TextCase::Lower => put("text-transform", "lowercase".into()),
-            TextCase::Title => put("text-transform", "capitalize".into()),
-            TextCase::SmallCaps => put("font-variant", "small-caps".into()),
-        }
-        match s.decoration {
-            TextDecoration::None => {}
-            TextDecoration::Underline => put("text-decoration", "underline".into()),
-            TextDecoration::Strikethrough => put("text-decoration", "line-through".into()),
-        }
-        if s.decoration != TextDecoration::None {
-            let l = s.look();
-            let len = |m: LineHeight| match m {
-                LineHeight::Auto => None,
-                LineHeight::Pixels(v) => Some(px(v)),
-                LineHeight::Percent(p) => Some(format!("{}%", num(p))),
-            };
-            match l.style {
-                figcraft_doc::DecorationStyle::Solid => {}
-                figcraft_doc::DecorationStyle::Dotted => put("text-decoration-style", "dotted".into()),
-                figcraft_doc::DecorationStyle::Wavy => put("text-decoration-style", "wavy".into()),
-            }
-            if let Some(v) = len(l.thickness) {
-                put("text-decoration-thickness", v);
-            }
-            if let Some(c) = l.color {
-                put("text-decoration-color", c.to_css());
-            }
-            if s.decoration == TextDecoration::Underline {
-                if let Some(v) = len(l.offset) {
-                    put("text-underline-offset", v);
-                }
-                // Browsers skip ink by default; the canvas only when asked.
-                if !l.skip_ink {
-                    put("text-decoration-skip-ink", "none".into());
-                }
-            }
-        }
-        if tx.leading_trim == figcraft_doc::LeadingTrim::CapHeight {
-            put("text-box", "trim-both cap alphabetic".into());
-        }
-    }
-    out
-}
-
-/// A gradient fill on a `w`×`h` box as a CSS background: linear along its handles' direction
-/// (CSS angles: 0deg up, 90deg right), radial with its handles' radii, angular as a conic
-/// gradient from its start direction.
-fn css_gradient(g: &figcraft_color::Gradient, w: f64, h: f64) -> String {
-    let stops = g.sorted_stops().iter().map(|s| format!("{} {}%", s.color.to_css(), (s.position * 100.0).round())).collect::<Vec<_>>().join(", ");
-    let (dx, dy) = ((g.to.0 - g.from.0) * w, (g.to.1 - g.from.1) * h);
-    let angle = if dx == 0.0 && dy == 0.0 { 180.0 } else { dx.atan2(-dy).to_degrees().rem_euclid(360.0) };
-    let pct = |v: f64| format!("{}%", num(v * 100.0));
-    let at = format!("at {} {}", pct(g.from.0), pct(g.from.1));
-    match g.kind {
-        figcraft_color::GradientKind::Linear => format!("linear-gradient({}deg, {stops})", num(angle)),
-        figcraft_color::GradientKind::Radial | figcraft_color::GradientKind::Diamond => {
-            let (rx, ry) = (((g.width.0 - g.from.0) * w).hypot((g.width.1 - g.from.1) * h), dx.hypot(dy));
-            let rel = |r: f64, side: f64| if side > 0.0 { pct(r / side) } else { "50%".into() };
-            format!("radial-gradient({} {} {at}, {stops})", rel(rx, w), rel(ry, h))
-        }
-        figcraft_color::GradientKind::Angular => format!("conic-gradient(from {}deg {at}, {stops})", num(angle)),
-    }
-}
-
-// ------------------------------------------------------------------ HTML and React markup
-
-/// A CSS class name from a layer name ("Card / Title" → "card-title"), unique in `used`.
-pub(crate) fn class_name(name: &str, used: &mut Vec<String>) -> String {
-    let mut base = String::new();
-    for c in name.chars().flat_map(char::to_lowercase) {
-        if c.is_ascii_alphanumeric() {
-            base.push(c);
-        } else if !base.ends_with('-') && !base.is_empty() {
-            base.push('-');
-        }
-    }
-    let base = base.trim_end_matches('-').chars().take(40).collect::<String>();
-    let base = if base.is_empty() || base.starts_with(|c: char| c.is_ascii_digit()) { format!("layer-{base}") } else { base };
-    let name = (1..).map(|k| if k == 1 { base.clone() } else { format!("{base}-{k}") }).find(|n| !used.contains(n)).unwrap_or(base);
-    used.push(name.clone());
-    name
-}
-
-fn html_escape(s: &str) -> String {
-    s.replace('&', "&amp;").replace('<', "&lt;").replace('>', "&gt;").replace('\n', "<br>")
-}
-
-/// Text as JSX children: HTML escapes, braces as expressions, line breaks as `<br />`.
-fn jsx_text(s: &str) -> String {
-    let mut out = String::new();
-    for c in s.chars().take(10_000) {
-        match c {
-            '&' => out.push_str("&amp;"),
-            '<' => out.push_str("&lt;"),
-            '>' => out.push_str("&gt;"),
-            '{' => out.push_str("{\"{\"}"),
-            '}' => out.push_str("{\"}\"}"),
-            '\n' => out.push_str("<br />"),
-            '\r' => {}
-            c => out.push(c),
-        }
-    }
-    out
-}
-
-/// The whole tree under `id` as nested HTML with a stylesheet: auto layout frames become
-/// flexboxes, other children are placed absolutely in their parent, text becomes paragraphs.
-fn html(doc: &Document, id: NodeId) -> String {
-    let ctx = Ctx::new(doc, id);
-    let mut out = Markup::new(&ctx, CodeLang::Html);
-    out.node(id, None, 0, "");
-    format!("{}\n<style>\n{}{}</style>\n", out.markup, out.tokens.root_rule(), out.styles)
-}
-
-/// Markup being built for a layer tree: HTML (`class`), React JSX (`className`) or Leptos `view!`
-/// markup (text as Rust string literals); the last two with component parameters and instances
-/// as calls. With its stylesheet.
-pub(crate) struct Markup<'c, 'a> {
-    ctx: &'c Ctx<'a>,
-    /// Html, React or Leptos.
-    lang: CodeLang,
-    used: Vec<String>,
-    pub markup: String,
-    pub styles: String,
-    pub tokens: Tokens,
-    /// The root's class (default: from its name) and extra JSX attributes.
-    pub root_class: Option<String>,
-    pub root_attrs: String,
-    /// Each layer's path in the tree (names with sibling counts), class and declarations, so
-    /// variants can be compared layer by layer.
-    pub rules: Vec<(String, String, String)>,
-}
-
-impl<'c, 'a> Markup<'c, 'a> {
-    pub fn new(ctx: &'c Ctx<'a>, lang: CodeLang) -> Self {
-        Markup {
-            ctx,
-            lang,
-            used: Vec::new(),
-            markup: String::new(),
-            styles: String::new(),
-            tokens: Tokens::default(),
-            root_class: None,
-            root_attrs: String::new(),
-            rules: Vec::new(),
-        }
-    }
-
-    /// JSX indents by two spaces, HTML and Leptos by four.
-    fn pad(&self, depth: usize) -> String {
-        if self.lang == CodeLang::React { "  ".repeat(depth) } else { indent(depth) }
-    }
-
-    /// Component code (React or Leptos): parameters and instances as calls.
-    fn code(&self) -> bool {
-        self.lang != CodeLang::Html
-    }
-
-    /// A parameter's name in the generated code.
-    fn ident(&self, p: &Param) -> String {
-        if self.lang == CodeLang::Leptos { crate::component_codegen::rust_ident(&p.ident) } else { p.ident.clone() }
-    }
-
-    /// A layer, shown only while its boolean parameter is on (component code).
-    pub fn node(&mut self, id: NodeId, parent: Option<&Node>, depth: usize, path: &str) {
-        let Some(n) = self.ctx.doc.node(id) else { return };
-        if self.code()
-            && id != self.ctx.root
-            && let Some(p) = self.ctx.param(n, "visible")
-        {
-            let (pad, p) = (self.pad(depth), self.ident(p));
-            let (open, close) =
-                if self.lang == CodeLang::Leptos { (format!("{{{p}.then(|| view! {{"), "})}") } else { (format!("{{{p} && ("), ")}") };
-            self.markup.push_str(&format!("{pad}{open}\n"));
-            self.element(n, parent, depth + 1, path);
-            self.markup.push_str(&format!("{pad}{close}\n"));
-            return;
-        }
-        self.element(n, parent, depth, path);
-    }
-
-    fn rule(&mut self, path: &str, class: &str, decls: String) {
-        self.styles.push_str(&format!(".{class} {{\n"));
-        for line in decls.lines() {
-            self.styles.push_str(&format!("  {line}\n"));
-        }
-        self.styles.push_str("}\n");
-        self.rules.push((path.to_string(), class.to_string(), decls));
-    }
-
-    fn element(&mut self, n: &Node, parent: Option<&Node>, depth: usize, path: &str) {
-        let doc = self.ctx.doc;
-        let root = n.id == self.ctx.root;
-        let class = match self.root_class.take().filter(|_| root) {
-            Some(c) => {
-                self.used.push(c.clone());
-                c
-            }
-            None => class_name(&n.name, &mut self.used),
-        };
-        let pad = self.pad(depth);
-        let attr = if self.lang == CodeLang::React { "className" } else { "class" };
-        // How it sits in its parent: in the flex flow, or placed at its position.
-        let mut decls = String::new();
-        let in_flow = parent.is_some_and(|p| p.layout.is_some()) && !n.child_layout.absolute;
-        if root {
-            decls.push_str("position: relative;\n");
-        } else if in_flow {
-            let vertical = parent.and_then(|p| p.layout.as_ref()).is_some_and(|l| l.mode == LayoutMode::Vertical);
-            let (main, cross) =
-                if vertical { (n.child_layout.sizing_v, n.child_layout.sizing_h) } else { (n.child_layout.sizing_h, n.child_layout.sizing_v) };
-            if main == Sizing::Fill {
-                decls.push_str("flex: 1 1 0;\n");
-            }
-            if cross == Sizing::Fill {
-                decls.push_str("align-self: stretch;\n");
-            }
-        } else {
-            let c = n.transform.as_coeffs();
-            decls.push_str(&format!("position: absolute;\nleft: {}px;\ntop: {}px;\n", num(c[4]), num(c[5])));
-            let rot = figcraft_geom::rotation_degrees(n.transform);
-            if rot.abs() > 0.01 {
-                decls.push_str(&format!("transform: rotate({}deg);\ntransform-origin: 0 0;\n", num(-rot)));
-            }
-        }
-        // Nested instances are calls (component code), in a wrapper that places them when needed.
-        if self.code() && !root && matches!(n.kind, NodeKind::Instance { .. }) {
-            let at = depth + usize::from(!decls.is_empty());
-            let run = if self.lang == CodeLang::Leptos { ".run()" } else { "" };
-            let inner = match self.ctx.param(n, "mainComponent") {
-                Some(p) => Some(format!("{}{{{}{run}}}\n", self.pad(at), self.ident(p))),
-                None => self.ctx.call(n, self.lang, at),
-            };
-            if let Some(inner) = inner {
-                if decls.is_empty() {
-                    self.markup.push_str(&inner);
-                } else {
-                    self.markup.push_str(&format!("{pad}<div {attr}=\"{class}\">\n{inner}{pad}</div>\n"));
-                    self.rule(path, &class, decls);
-                }
-                return;
-            }
-        }
-        let hugs = n.layout.is_some() || matches!(n.kind, NodeKind::Text(_));
-        let hug = (hugs && n.child_layout.sizing_h == Sizing::Hug, hugs && n.child_layout.sizing_v == Sizing::Hug);
-        let mut own = css_decls(doc, n, &mut self.tokens, hug);
-        if n.layout.is_none() && !n.children.is_empty() && !root && in_flow {
-            own.push_str("position: relative;\n");
-        }
-        decls.push_str(&own);
-        self.rule(path, &class, decls);
-        let attrs = if root { self.root_attrs.clone() } else { String::new() };
-        let open = |tag: &str| format!("{pad}<{tag} {attr}=\"{class}\"{attrs}>");
-        match &n.kind {
-            NodeKind::Text(t) => {
-                let body = match (self.ctx.param(n, "characters").filter(|_| self.code()), self.lang) {
-                    (Some(p), CodeLang::Leptos) => format!("{{{}.clone()}}", self.ident(p)),
-                    (Some(p), _) => format!("{{{}}}", p.ident),
-                    (None, CodeLang::React) => jsx_text(&t.characters),
-                    // `view!` takes text as string literals and void elements self-closed.
-                    (None, CodeLang::Leptos) => {
-                        t.characters.chars().take(10_000).collect::<String>().lines().map(|l| format!("{l:?}")).collect::<Vec<_>>().join("<br/>")
-                    }
-                    (None, _) => html_escape(&t.characters),
-                };
-                self.markup.push_str(&format!("{}{body}</p>\n", open("p")));
-            }
-            _ => {
-                let kids = self.ctx.kids(n);
-                let slot = self.ctx.param(n, "slot").filter(|_| self.code());
-                let leptos = self.lang == CodeLang::Leptos;
-                let open = open("div");
-                if let Some(p) = slot.filter(|_| kids.is_empty()) {
-                    let content = if leptos { format!("{}.as_ref().map(|c| c.run())", self.ident(p)) } else { p.ident.clone() };
-                    self.markup.push_str(&format!("{open}{{{content}}}</div>\n"));
-                } else if kids.is_empty() || self.ctx.too_deep(depth) {
-                    self.markup.push_str(&format!("{open}</div>\n"));
-                } else {
-                    self.markup.push_str(&format!("{open}\n"));
-                    // A slot shows the instance's content, or else the main's.
-                    let (p1, p2) = (self.pad(depth + 1), self.pad(depth + 2));
-                    let inner = match slot {
-                        Some(p) if leptos => {
-                            self.markup.push_str(&format!("{p1}{{match &{} {{ Some(c) => c.run(), None => view! {{\n", self.ident(p)));
-                            depth + 2
-                        }
-                        Some(p) => {
-                            self.markup.push_str(&format!("{p1}{{{} ?? (\n{p2}<>\n", p.ident));
-                            depth + 3
-                        }
-                        None => depth + 1,
-                    };
-                    let mut seen: Vec<&str> = Vec::new();
-                    // Bottom layer first: later elements paint on top, like the layer order.
-                    for k in kids {
-                        let Some(kn) = doc.node(k) else { continue };
-                        let count = seen.iter().filter(|s| **s == kn.name).count();
-                        seen.push(&kn.name);
-                        self.node(k, Some(n), inner, &format!("{path}/{}#{count}", kn.name));
-                    }
-                    match slot {
-                        Some(_) if leptos => self.markup.push_str(&format!("{p1}}}.into_any() }}}}\n")),
-                        Some(_) => self.markup.push_str(&format!("{p2}</>\n{p1})}}\n")),
-                        None => {}
-                    }
-                    self.markup.push_str(&format!("{pad}</div>\n"));
-                }
-            }
-        }
-    }
-}
-
-// ------------------------------------------------------------------ SwiftUI
-
-fn swift_color(c: Color) -> String {
-    format!("Color(red: {}, green: {}, blue: {}, opacity: {})", num(f64::from(c.r)), num(f64::from(c.g)), num(f64::from(c.b)), num(f64::from(c.a)))
-}
-
-fn swift_weight(w: u16) -> &'static str {
-    match w {
-        0..=150 => ".thin",
-        151..=250 => ".ultraLight",
-        251..=350 => ".light",
-        351..=450 => ".regular",
-        451..=550 => ".medium",
-        551..=650 => ".semibold",
-        651..=750 => ".bold",
-        751..=850 => ".heavy",
-        _ => ".black",
-    }
-}
-
-/// SwiftUI for a layer and its subtree at `depth`; `extra` modifiers go last (a free child's
-/// offset). A layer a boolean parameter shows sits in an `if`.
-pub(crate) fn swift(ctx: &Ctx, id: NodeId, depth: usize, out: &mut String, extra: &[String]) {
-    let Some(n) = ctx.doc.node(id) else { return };
-    if id != ctx.root
-        && let Some(p) = ctx.param(n, "visible")
-    {
-        let pad = indent(depth);
-        out.push_str(&format!("{pad}if {} {{\n", p.ident));
-        swift_layer(ctx, n, depth + 1, out, extra);
-        out.push_str(&format!("{pad}}}\n"));
-        return;
-    }
-    swift_layer(ctx, n, depth, out, extra);
-}
-
-fn swift_layer(ctx: &Ctx, n: &Node, depth: usize, out: &mut String, extra: &[String]) {
-    let doc = ctx.doc;
-    let pad = indent(depth);
-    if ctx.too_deep(depth) {
-        out.push_str(&format!("{pad}// {} …\n", n.name));
-        return;
-    }
-    // Nested instances are calls; an instance swap parameter is a view.
-    let call = match ctx.param(n, "mainComponent").filter(|_| n.id != ctx.root) {
-        Some(p) => Some(format!("{pad}{}\n", p.ident)),
-        None => ctx.call(n, CodeLang::SwiftUi, depth),
-    };
-    if let Some(call) = call {
-        out.push_str(&call);
-        for m in extra {
-            out.push_str(&format!("{pad}    {m}\n"));
-        }
-        return;
-    }
-    let mut mods: Vec<String> = Vec::new();
-    match &n.kind {
-        NodeKind::Text(t) => {
-            let text = ctx.param(n, "characters").map_or_else(|| literal(&t.characters, false), |p| p.ident.clone());
-            out.push_str(&format!("{pad}Text({text})\n"));
-            mods.push(format!(
-                ".font(.custom({}, size: {}).weight({}))",
-                literal(&t.style.font_family, false),
-                num(t.style.font_size),
-                swift_weight(t.style.weight())
-            ));
-            if let Some(c) = first_fill(n) {
-                mods.push(format!(".foregroundColor({})", swift_color(c)));
-            }
-        }
-        NodeKind::Ellipse { .. } => {
-            out.push_str(&format!("{pad}Ellipse()\n"));
-            if let Some(c) = first_fill(n) {
-                mods.push(format!(".fill({})", swift_color(c)));
-            }
-            mods.push(format!(".frame(width: {}, height: {})", num(n.width), num(n.height)));
-        }
-        NodeKind::Rectangle => {
-            out.push_str(&format!("{pad}RoundedRectangle(cornerRadius: {})\n", num(radius(n))));
-            if let Some(c) = first_fill(n) {
-                mods.push(format!(".fill({})", swift_color(c)));
-            }
-            mods.push(format!(".frame(width: {}, height: {})", num(n.width), num(n.height)));
-        }
-        k if k.is_frame_like() || matches!(k, NodeKind::Group) => {
-            let children = ctx.kids(n);
-            let open = match n.layout.as_ref().map(|l| (l.mode, l)) {
-                Some((LayoutMode::Vertical, l)) => format!("VStack(alignment: .leading, spacing: {}) {{", num(l.gap)),
-                Some((_, l)) => format!("HStack(alignment: .center, spacing: {}) {{", num(l.gap)),
-                None => "ZStack(alignment: .topLeading) {".to_string(),
-            };
-            out.push_str(&format!("{pad}{open}\n"));
-            // A slot shows the instance's content, or else the main's.
-            let slot = ctx.param(n, "slot");
-            let inner = match slot {
-                Some(p) => {
-                    out.push_str(&format!("{pad}    if let {0} {{\n{pad}        {0}\n{pad}    }} else {{\n", p.ident));
-                    depth + 2
-                }
-                None => depth + 1,
-            };
-            for c in &children {
-                // Free children sit at their offset inside a ZStack.
-                let offset: Vec<String> = match doc.node(*c).filter(|_| n.layout.is_none()) {
-                    Some(cn) => {
-                        let [_, _, _, _, x, y] = cn.transform.as_coeffs();
-                        vec![format!(".offset(x: {}, y: {})", num(x), num(y))]
-                    }
-                    None => Vec::new(),
-                };
-                swift(ctx, *c, inner, out, &offset);
-            }
-            if slot.is_some() {
-                out.push_str(&format!("{pad}    }}\n"));
-            }
-            out.push_str(&format!("{pad}}}\n"));
-            if let Some(l) = &n.layout {
-                let [t, r, b, lft] = l.padding;
-                if [t, r, b, lft].iter().any(|v| *v > 0.0) {
-                    mods.push(format!(".padding(EdgeInsets(top: {}, leading: {}, bottom: {}, trailing: {}))", num(t), num(lft), num(b), num(r)));
-                }
-            }
-            mods.push(format!(".frame(width: {}, height: {}, alignment: .topLeading)", num(n.width), num(n.height)));
-            if let Some(c) = first_fill(n) {
-                mods.push(format!(".background({})", swift_color(c)));
-            }
-            if radius(n) > 0.0 {
-                mods.push(format!(".clipShape(RoundedRectangle(cornerRadius: {}))", num(radius(n))));
-            }
-        }
-        _ => {
-            out.push_str(&format!("{pad}// {}: export as an image asset\n{pad}Image({})\n", n.kind.label(), literal(&n.name, false)));
-            mods.push(".resizable()".into());
-            mods.push(format!(".frame(width: {}, height: {})", num(n.width), num(n.height)));
-        }
-    }
-    if let Some(c) = stroke_color(n) {
-        mods.push(format!(
-            ".overlay(RoundedRectangle(cornerRadius: {}).stroke({}, lineWidth: {}))",
-            num(radius(n)),
-            swift_color(c),
-            num(n.stroke.weight)
-        ));
-    }
-    if let Some(s) = drop_shadow(n) {
-        mods.push(format!(
-            ".shadow(color: {}, radius: {}, x: {}, y: {})",
-            swift_color(s.color),
-            num(s.radius / 2.0),
-            num(s.offset.0),
-            num(s.offset.1)
-        ));
-    }
-    if n.opacity < 1.0 {
-        mods.push(format!(".opacity({})", num(f64::from(n.opacity))));
-    }
-    mods.extend(extra.iter().cloned());
-    for m in mods {
-        out.push_str(&format!("{pad}    {m}\n"));
-    }
-}
-
-// ------------------------------------------------------------------ Jetpack Compose
-
-/// A colour literal as `Color(0xAARRGGBB)` (Kotlin and Dart).
-fn argb_color(c: Color) -> String {
-    let [r, g, b, a] = c.to_rgba8();
-    format!("Color(0x{a:02X}{r:02X}{g:02X}{b:02X})")
-}
-
-/// The Modifier chain for a layer (size, shadow, background, border, alpha, padding).
-fn modifier(n: &Node, shape: &str, padding: bool) -> String {
-    let mut m = format!("Modifier.size({}.dp, {}.dp)", num(n.width), num(n.height));
-    if let Some(s) = drop_shadow(n) {
-        m.push_str(&format!(".shadow({}.dp, {shape})", num(s.radius / 2.0)));
-    }
-    if let Some(c) = first_fill(n) {
-        m.push_str(&format!(".background({}, {shape})", argb_color(c)));
-    }
-    if let Some(c) = stroke_color(n) {
-        m.push_str(&format!(".border({}.dp, {}, {shape})", num(n.stroke.weight), argb_color(c)));
-    }
-    if n.opacity < 1.0 {
-        m.push_str(&format!(".alpha({}f)", num(f64::from(n.opacity))));
-    }
-    if padding && let Some(l) = &n.layout {
-        let [t, r, b, lft] = l.padding;
-        if [t, r, b, lft].iter().any(|v| *v > 0.0) {
-            m.push_str(&format!(".padding(start = {}.dp, top = {}.dp, end = {}.dp, bottom = {}.dp)", num(lft), num(t), num(r), num(b)));
-        }
-    }
-    m
-}
-
-/// Jetpack Compose for a layer and its subtree at `depth`. A layer a boolean parameter shows sits
-/// in an `if`.
-pub(crate) fn compose(ctx: &Ctx, id: NodeId, depth: usize, out: &mut String) {
-    let Some(n) = ctx.doc.node(id) else { return };
-    if id != ctx.root
-        && let Some(p) = ctx.param(n, "visible")
-    {
-        let pad = indent(depth);
-        out.push_str(&format!("{pad}if ({}) {{\n", p.ident));
-        compose_layer(ctx, n, depth + 1, out);
-        out.push_str(&format!("{pad}}}\n"));
-        return;
-    }
-    compose_layer(ctx, n, depth, out);
-}
-
-fn compose_layer(ctx: &Ctx, n: &Node, depth: usize, out: &mut String) {
-    let doc = ctx.doc;
-    let pad = indent(depth);
-    if ctx.too_deep(depth) {
-        out.push_str(&format!("{pad}// {} …\n", n.name));
-        return;
-    }
-    // Nested instances are calls; an instance swap parameter is a composable.
-    let call = match ctx.param(n, "mainComponent").filter(|_| n.id != ctx.root) {
-        Some(p) => Some(format!("{pad}{}()\n", p.ident)),
-        None => ctx.call(n, CodeLang::Compose, depth),
-    };
-    if let Some(call) = call {
-        out.push_str(&call);
-        return;
-    }
-    let shape = if radius(n) > 0.0 { format!("RoundedCornerShape({}.dp)", num(radius(n))) } else { "RectangleShape".to_string() };
-    match &n.kind {
-        NodeKind::Text(t) => {
-            let color = first_fill(n).map(argb_color).unwrap_or_else(|| "Color.Unspecified".into());
-            let text = ctx.param(n, "characters").map_or_else(|| literal(&t.characters, true), |p| p.ident.clone());
-            out.push_str(&format!(
-                "{pad}Text(\n{pad}    text = {text},\n{pad}    fontSize = {}.sp,\n{pad}    fontWeight = FontWeight.W{},\n{pad}    color = {color},\n{pad})\n",
-                num(t.style.font_size),
-                (t.style.weight().clamp(100, 900) / 100) * 100
-            ));
-        }
-        NodeKind::Ellipse { .. } => out.push_str(&format!("{pad}Box(modifier = {})\n", modifier(n, "CircleShape", false))),
-        NodeKind::Rectangle => out.push_str(&format!("{pad}Box(modifier = {})\n", modifier(n, &shape, false))),
-        k if k.is_frame_like() || matches!(k, NodeKind::Group) => {
-            let children = ctx.kids(n);
-            let open = match n.layout.as_ref().map(|l| (l.mode, l)) {
-                Some((LayoutMode::Vertical, l)) => format!(
-                    "Column(\n{pad}    modifier = {},\n{pad}    verticalArrangement = Arrangement.spacedBy({}.dp),\n{pad}) {{",
-                    modifier(n, &shape, true),
-                    num(l.gap)
-                ),
-                Some((_, l)) => format!(
-                    "Row(\n{pad}    modifier = {},\n{pad}    horizontalArrangement = Arrangement.spacedBy({}.dp),\n{pad}    verticalAlignment = Alignment.CenterVertically,\n{pad}) {{",
-                    modifier(n, &shape, true),
-                    num(l.gap)
-                ),
-                None => format!("Box(modifier = {}) {{", modifier(n, &shape, false)),
-            };
-            out.push_str(&format!("{pad}{open}\n"));
-            // A slot shows the instance's content, or else the main's.
-            let slot = ctx.param(n, "slot");
-            let base = match slot {
-                Some(p) => {
-                    out.push_str(&format!("{pad}    if ({0} != null) {{\n{pad}        {0}()\n{pad}    }} else {{\n", p.ident));
-                    depth + 1
-                }
-                None => depth,
-            };
-            for c in &children {
-                if n.layout.is_none()
-                    && let Some(cn) = doc.node(*c)
-                {
-                    let [_, _, _, _, x, y] = cn.transform.as_coeffs();
-                    out.push_str(&format!("{}Box(modifier = Modifier.offset({}.dp, {}.dp)) {{\n", indent(base + 1), num(x), num(y)));
-                    compose(ctx, *c, base + 2, out);
-                    out.push_str(&format!("{}}}\n", indent(base + 1)));
-                } else {
-                    compose(ctx, *c, base + 1, out);
-                }
-            }
-            if slot.is_some() {
-                out.push_str(&format!("{pad}    }}\n"));
-            }
-            out.push_str(&format!("{pad}}}\n"));
-        }
-        _ => out.push_str(&format!(
-            "{pad}// {}: export as an image asset\n{pad}Image(painter = painterResource(R.drawable.asset), contentDescription = {}, modifier = Modifier.size({}.dp, {}.dp))\n",
-            n.kind.label(),
-            literal(&n.name, true),
-            num(n.width),
-            num(n.height)
-        )),
-    }
-}
-
-// ------------------------------------------------------------------ Flutter
-
-/// The import a generated Flutter unit starts with (a widget tree on its own needs it too).
-pub(crate) const FLUTTER_IMPORT: &str = "import 'package:flutter/material.dart';\n\n";
-
-/// Dart indents by two spaces.
-pub(crate) fn flutter_indent(depth: usize) -> String {
-    "  ".repeat(depth)
-}
-
-/// Where a child sits in its parent: in a Stack at its position in the frame, taking the room left
-/// in a Row or Column, or wherever the parent puts it.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub(crate) enum Place {
-    Flow,
-    At(f64, f64),
-    Fill,
-}
-
-/// Dart's `FontWeight.w600` (a weight is hundreds).
-fn flutter_weight(w: u16) -> String {
-    format!("FontWeight.w{}", (w.clamp(100, 900) / 100) * 100)
-}
-
-/// A Row or Column's main-axis alignment (`None` for the default, the start).
-fn flutter_main_align(a: MainAlign) -> Option<&'static str> {
-    match a {
-        MainAlign::Min => None,
-        MainAlign::Center => Some("MainAxisAlignment.center"),
-        MainAlign::Max => Some("MainAxisAlignment.end"),
-        MainAlign::SpaceBetween => Some("MainAxisAlignment.spaceBetween"),
-        MainAlign::SpaceAround => Some("MainAxisAlignment.spaceAround"),
-        MainAlign::SpaceEvenly => Some("MainAxisAlignment.spaceEvenly"),
-    }
-}
-
-/// A Row or Column's cross-axis alignment; a child that fills it stretches the line instead.
-fn flutter_cross_align(a: CrossAlign, stretch: bool) -> &'static str {
-    if stretch {
-        return "CrossAxisAlignment.stretch";
-    }
-    match a {
-        CrossAlign::Min => "CrossAxisAlignment.start",
-        CrossAlign::Center => "CrossAxisAlignment.center",
-        CrossAlign::Max => "CrossAxisAlignment.end",
-        CrossAlign::Baseline => "CrossAxisAlignment.baseline",
-    }
-}
-
-/// A frame's auto layout padding as `EdgeInsets` (`None` when it has none).
-fn flutter_padding(n: &Node) -> Option<String> {
-    let l = n.layout.as_ref()?;
-    let [t, r, b, left] = l.padding;
-    if ![t, r, b, left].iter().any(|v| *v > 0.0) {
-        return None;
-    }
-    Some(if t == r && r == b && b == left {
-        format!("EdgeInsets.all({})", num(t))
-    } else if t == b && left == r {
-        format!("EdgeInsets.symmetric(vertical: {}, horizontal: {})", num(t), num(left))
-    } else {
-        format!("EdgeInsets.fromLTRB({}, {}, {}, {})", num(left), num(t), num(r), num(b))
-    })
-}
-
-/// A layer's fill, shape, corner radius, stroke and shadow as a `BoxDecoration`; `None` when it has
-/// none of them. `pad` is the indentation of the constructor itself.
-fn box_decoration(n: &Node, pad: &str) -> Option<String> {
-    let mut parts: Vec<String> = Vec::new();
-    if let Some(c) = first_fill(n) {
-        parts.push(format!("color: {}", argb_color(c)));
-    }
-    if matches!(n.kind, NodeKind::Ellipse { .. }) {
-        parts.push("shape: BoxShape.circle".into());
-    } else if radius(n) > 0.0 {
-        parts.push(format!("borderRadius: BorderRadius.circular({})", num(radius(n))));
-    }
-    if let Some(c) = stroke_color(n) {
-        parts.push(format!("border: Border.all(color: {}, width: {})", argb_color(c), num(n.stroke.weight)));
-    }
-    if let Some(s) = drop_shadow(n) {
-        parts.push(format!(
-            "boxShadow: [BoxShadow(color: {}, blurRadius: {}, offset: Offset({}, {}))]",
-            argb_color(s.color),
-            num(s.radius / 2.0),
-            num(s.offset.0),
-            num(s.offset.1)
-        ));
-    }
-    if parts.is_empty() {
-        return None;
-    }
-    let inner = format!("{pad}  ");
-    Some(format!("BoxDecoration(\n{}{pad})", parts.iter().map(|p| format!("{inner}{p},\n")).collect::<String>()))
-}
-
-/// Flutter for a layer and its subtree at `depth`. A layer a boolean parameter shows sits behind an
-/// `if (…)`: Dart's lists take conditions, so the element itself carries it.
-pub(crate) fn flutter(ctx: &Ctx, id: NodeId, depth: usize, out: &mut String, place: Place) {
-    let Some(n) = ctx.doc.node(id) else { return };
-    if id != ctx.root
-        && let Some(p) = ctx.param(n, "visible")
-    {
-        out.push_str(&format!("{}if ({})\n", flutter_indent(depth), p.ident));
-        flutter_placed(ctx, n, depth + 1, out, place);
-        return;
-    }
-    flutter_placed(ctx, n, depth, out, place);
-}
-
-/// A layer at `depth` and what wraps it: where its parent puts it, then its opacity. Every closing
-/// parenthesis sits at its own level, so the caller can end the element with a comma in a list.
-fn flutter_placed(ctx: &Ctx, n: &Node, depth: usize, out: &mut String, place: Place) {
-    if ctx.too_deep(depth) {
-        let pad = flutter_indent(depth);
-        out.push_str(&format!("{pad}// {} …\n{pad}const SizedBox()", n.name));
-        return;
-    }
-    let mut depth = depth;
-    let mut close: Vec<String> = Vec::new();
-    match place {
-        Place::Flow => {}
-        Place::At(x, y) => {
-            let (pad, inner) = (flutter_indent(depth), flutter_indent(depth + 1));
-            out.push_str(&format!("{pad}Positioned(\n{inner}left: {},\n{inner}top: {},\n{inner}child: ", num(x), num(y)));
-            close.push(format!("\n{pad})"));
-            depth += 1;
-        }
-        Place::Fill => {
-            let (pad, inner) = (flutter_indent(depth), flutter_indent(depth + 1));
-            out.push_str(&format!("{pad}Expanded(\n{inner}child: "));
-            close.push(format!("\n{pad})"));
-            depth += 1;
-        }
-    }
-    if n.opacity < 1.0 {
-        let (pad, inner) = (flutter_indent(depth), flutter_indent(depth + 1));
-        out.push_str(&format!("{pad}Opacity(\n{inner}opacity: {},\n{inner}child: ", num(f64::from(n.opacity))));
-        close.push(format!("\n{pad})"));
-        depth += 1;
-    }
-    // A wrapper leaves its line open ("child: "), so the widget carries no indentation of its own.
-    let mut body = String::new();
-    flutter_widget(ctx, n, depth, &mut body);
-    out.push_str(if close.is_empty() { body.as_str() } else { body.trim_start() });
-    for c in close.iter().rev() {
-        out.push_str(c);
-    }
-}
-
-/// A layer's own look and its subtree as a Flutter widget at `depth`: a complete expression whose
-/// closing parenthesis sits at `depth`.
-fn flutter_widget(ctx: &Ctx, n: &Node, depth: usize, out: &mut String) {
-    let (pad, inner) = (flutter_indent(depth), flutter_indent(depth + 1));
-    // Nested instances are calls; an instance swap parameter is a widget.
-    let call = match ctx.param(n, "mainComponent").filter(|_| n.id != ctx.root) {
-        Some(p) => Some(p.ident.clone()),
-        None => ctx.call(n, CodeLang::Flutter, depth),
-    };
-    if let Some(call) = call {
-        out.push_str(call.trim_end_matches('\n'));
-        return;
-    }
-    match &n.kind {
-        NodeKind::Text(t) => {
-            let text = ctx.param(n, "characters").map_or_else(|| literal(&t.characters, true), |p| p.ident.clone());
-            out.push_str(&format!("{pad}Text(\n{inner}{text},\n"));
-            match t.align_h {
-                TextAlignH::Left => {}
-                TextAlignH::Center => out.push_str(&format!("{inner}textAlign: TextAlign.center,\n")),
-                TextAlignH::Right => out.push_str(&format!("{inner}textAlign: TextAlign.right,\n")),
-                TextAlignH::Justified => out.push_str(&format!("{inner}textAlign: TextAlign.justify,\n")),
-            }
-            let s = &t.style;
-            let mut style: Vec<String> = Vec::new();
-            if !s.font_family.is_empty() {
-                style.push(format!("fontFamily: {}", literal(&s.font_family, true)));
-            }
-            style.push(format!("fontSize: {}", num(s.font_size)));
-            style.push(format!("fontWeight: {}", flutter_weight(s.weight())));
-            if let Some(c) = first_fill(n) {
-                style.push(format!("color: {}", argb_color(c)));
-            }
-            if s.italic() {
-                style.push("fontStyle: FontStyle.italic".into());
-            }
-            match s.line_height {
-                // Dart's height is a multiple of the font size, not a length.
-                LineHeight::Pixels(v) if v > 0.0 && s.font_size > 0.0 => style.push(format!("height: {}", num(v / s.font_size))),
-                LineHeight::Percent(p) if p > 0.0 => style.push(format!("height: {}", num(p / 100.0))),
-                _ => {}
-            }
-            match s.letter_spacing {
-                LetterSpacing::Pixels(v) if v != 0.0 => style.push(format!("letterSpacing: {}", num(v))),
-                LetterSpacing::Percent(p) if p != 0.0 && s.font_size > 0.0 => style.push(format!("letterSpacing: {}", num(p / 100.0 * s.font_size))),
-                _ => {}
-            }
-            match s.decoration {
-                TextDecoration::None => {}
-                TextDecoration::Underline => style.push("decoration: TextDecoration.underline".into()),
-                TextDecoration::Strikethrough => style.push("decoration: TextDecoration.lineThrough".into()),
-            }
-            let sp = flutter_indent(depth + 2);
-            out.push_str(&format!("{inner}style: TextStyle(\n{}{inner}),\n{pad})", style.iter().map(|x| format!("{sp}{x},\n")).collect::<String>()));
-        }
-        NodeKind::Ellipse { .. } | NodeKind::Rectangle => {
-            out.push_str(&format!("{pad}Container(\n{inner}width: {},\n{inner}height: {},\n", num(n.width), num(n.height)));
-            if let Some(d) = box_decoration(n, &inner) {
-                out.push_str(&format!("{inner}decoration: {d},\n"));
-            }
-            out.push_str(&format!("{pad})"));
-        }
-        k if k.is_frame_like() || matches!(k, NodeKind::Group) => {
-            let children = ctx.kids(n);
-            let slot = ctx.param(n, "slot");
-            out.push_str(&format!("{pad}Container(\n{inner}width: {},\n{inner}height: {},\n", num(n.width), num(n.height)));
-            if let Some(p) = flutter_padding(n) {
-                out.push_str(&format!("{inner}padding: {p},\n"));
-            }
-            if let Some(d) = box_decoration(n, &inner) {
-                out.push_str(&format!("{inner}decoration: {d},\n"));
-            }
-            if children.is_empty() && slot.is_none() {
-                out.push_str(&format!("{pad})"));
-                return;
-            }
-            out.push_str(&format!("{inner}alignment: Alignment.topLeft,\n{inner}child: "));
-            let mut kids = String::new();
-            flutter_children(ctx, n, &children, slot, depth + 1, &mut kids);
-            out.push_str(kids.trim_start());
-            out.push_str(&format!(",\n{pad})"));
-        }
-        _ => out.push_str(&format!(
-            "{pad}// {}: export as an image asset\n{pad}Image.asset({}, width: {}, height: {})",
-            n.kind.label(),
-            literal(&format!("{}.png", n.name), true),
-            num(n.width),
-            num(n.height)
-        )),
-    }
-}
-
-/// The Row, Column or Stack holding a frame-like layer's children, at `depth`.
-fn flutter_children(ctx: &Ctx, n: &Node, children: &[NodeId], slot: Option<&Param>, depth: usize, out: &mut String) {
-    let doc = ctx.doc;
-    let (pad, inner) = (flutter_indent(depth), flutter_indent(depth + 1));
-    // Where each child sits, and whether one of them asks the line to stretch.
-    let mut placed: Vec<(NodeId, Place)> = Vec::new();
-    let mut stretch = false;
-    for c in children {
-        let Some(cn) = doc.node(*c) else { continue };
-        let place = match n.layout.as_ref() {
-            Some(l) => {
-                let vertical = l.mode == LayoutMode::Vertical;
-                let (main, cross) = if vertical {
-                    (cn.child_layout.sizing_v, cn.child_layout.sizing_h)
-                } else {
-                    (cn.child_layout.sizing_h, cn.child_layout.sizing_v)
-                };
-                stretch |= cross == Sizing::Fill;
-                if main == Sizing::Fill && !cn.child_layout.absolute { Place::Fill } else { Place::Flow }
-            }
-            // Free children sit at their position in the frame.
-            None => {
-                let [_, _, _, _, x, y] = cn.transform.as_coeffs();
-                Place::At(x, y)
-            }
-        };
-        placed.push((*c, place));
-    }
-    match n.layout.as_ref() {
-        Some(l) => {
-            out.push_str(&format!("{pad}{}(\n", if l.mode == LayoutMode::Vertical { "Column" } else { "Row" }));
-            if let Some(m) = flutter_main_align(l.main_align) {
-                out.push_str(&format!("{inner}mainAxisAlignment: {m},\n"));
-            }
-            out.push_str(&format!("{inner}crossAxisAlignment: {},\n", flutter_cross_align(l.cross_align, stretch)));
-            if !stretch && matches!(l.cross_align, CrossAlign::Baseline) {
-                out.push_str(&format!("{inner}textBaseline: TextBaseline.alphabetic,\n"));
-            }
-            // The gap between the children; the space distributions already spread them.
-            if l.gap > 0.0 && flutter_main_align(l.main_align).is_none_or(|m| !m.contains("Space")) {
-                out.push_str(&format!("{inner}spacing: {},\n", num(l.gap)));
-            }
-        }
-        None => out.push_str(&format!("{pad}Stack(\n{inner}alignment: Alignment.topLeft,\n")),
-    }
-    out.push_str(&format!("{inner}children: [\n"));
-    let list = flutter_indent(depth + 2);
-    // A slot shows the instance's content, or else the main's.
-    if let Some(p) = slot {
-        let name = &p.ident;
-        out.push_str(&format!("{list}...?{name},\n"));
-        out.push_str(&format!("{list}if ({name} == null) ...[\n"));
-    }
-    let kid = depth + 2 + usize::from(slot.is_some());
-    for (id, place) in placed {
-        flutter(ctx, id, kid, out, place);
-        out.push_str(",\n");
-    }
-    if slot.is_some() {
-        out.push_str(&format!("{list}],\n"));
-    }
-    out.push_str(&format!("{inner}],\n{pad})"));
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::Session;
-    use crate::params::id_of;
-    use serde_json::json;
-
-    fn card(s: &mut Session) -> NodeId {
-        let f = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Card"})).unwrap()["id"]).unwrap();
-        s.execute("node.set", &json!({"id": f, "props": {"fills": ["#FFFFFF"], "cornerRadius": 12}})).unwrap();
-        s.execute("text.create", &json!({"text": "Say \"hi\" $5\nnow", "x": 0, "y": 0, "parent": f})).unwrap();
-        s.execute("shape.ellipse", &json!({"x": 0, "y": 0, "width": 24, "height": 24, "parent": f})).unwrap();
-        s.execute("layout.add", &json!({"ids": [f]})).unwrap();
-        f
-    }
-
-    #[test]
-    fn swiftui_and_compose_for_an_auto_layout_card() {
-        let mut s = Session::new();
-        let f = card(&mut s);
-        let doc = s.doc().unwrap();
-        let sw = code_for(doc, f, CodeLang::SwiftUi);
-        assert!(sw.contains("Stack(alignment:"), "{sw}");
-        assert!(sw.contains("Text(\"Say \\\"hi\\\" $5\\nnow\")"), "escaped: {sw}");
-        assert!(sw.contains("Ellipse()"));
-        assert!(sw.contains(".clipShape(RoundedRectangle(cornerRadius: 12))"));
-        let kt = code_for(doc, f, CodeLang::Compose);
-        assert!(kt.contains("Arrangement.spacedBy("), "{kt}");
-        assert!(kt.contains("\\$5"), "Kotlin escapes $: {kt}");
-        assert!(kt.contains("CircleShape"));
-        assert!(kt.contains("RoundedCornerShape(12.dp)"));
-        let css = code_for(doc, f, CodeLang::Css);
-        assert!(css.contains("display: flex;") && css.contains("border-radius: 12px;"));
-        // Through the command.
-        let v = s.execute("inspect.code", &json!({"id": f, "language": "compose"})).unwrap();
-        assert_eq!(v["code"].as_str().unwrap(), kt);
-        assert!(s.execute("inspect.code", &json!({"id": f, "language": "cobol"})).is_err());
-    }
-
-    #[test]
-    fn free_children_get_offsets_and_deep_trees_are_capped() {
-        let mut s = Session::new();
-        let mut parent = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 50, "height": 50})).unwrap()["id"]).unwrap();
-        let root = parent;
-        s.execute("shape.rectangle", &json!({"x": 7, "y": 9, "width": 5, "height": 5, "parent": root})).unwrap();
-        for _ in 0..20 {
-            parent = id_of(&s.execute("frame.create", &json!({"x": 1, "y": 1, "width": 40, "height": 40, "parent": parent})).unwrap()["id"]).unwrap();
-        }
-        let doc = s.doc().unwrap();
-        let sw = code_for(doc, root, CodeLang::SwiftUi);
-        assert!(sw.contains(".offset(x: 7, y: 9)"), "{sw}");
-        assert!(sw.contains("…"), "depth capped");
-        let kt = code_for(doc, root, CodeLang::Compose);
-        assert!(kt.contains("Modifier.offset(7.dp, 9.dp)"));
-        assert!(code_for(doc, NodeId(999_999), CodeLang::Css).is_empty());
-    }
-
-    #[test]
-    fn flutter_builds_a_widget_tree() {
-        let mut s = Session::new();
-        let f = card(&mut s);
-        let doc = s.doc().unwrap();
-        let dart = code_for(doc, f, CodeLang::Flutter);
-        // The card hugs its content, so its width is the layout's, not the 200 it was created with.
-        let w = doc.node(f).map(|n| n.width).unwrap_or_default();
-        assert!(dart.starts_with(&format!("Container(\n  width: {},\n  height: 100,\n", num(w))), "{dart}");
-        assert!(dart.contains("borderRadius: BorderRadius.circular(12)"), "{dart}");
-        assert!(dart.contains("child: Row(\n"), "{dart}");
-        assert!(dart.contains("      Text(\n        \"Say \\\"hi\\\" \\$5\\nnow\",\n"), "escaped: {dart}");
-        assert!(dart.contains("fontWeight: FontWeight.w400,"), "{dart}");
-        assert!(dart.contains("shape: BoxShape.circle"), "{dart}");
-        assert!(dart.ends_with(')'), "a bare expression, like the other native targets: {dart}");
-        // Through the command: `dart` names the same language, and rem is for the web only.
-        let v = s.execute("inspect.code", &json!({"id": f, "language": "flutter"})).unwrap();
-        assert_eq!(v["code"].as_str().unwrap(), dart);
-        assert_eq!(v["language"], "flutter");
-        assert_eq!(s.execute("inspect.code", &json!({"id": f, "language": "dart"})).unwrap()["language"], "flutter");
-        let rem = s.execute("inspect.code", &json!({"id": f, "language": "flutter", "unit": "rem"})).unwrap();
-        assert_eq!(rem["code"].as_str().unwrap(), dart, "rem doesn't apply to Dart");
-    }
-
-    #[test]
-    fn flutter_positions_free_children_and_bounds_the_tree() {
-        let mut s = Session::new();
-        let root = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 50, "height": 50})).unwrap()["id"]).unwrap();
-        s.execute("shape.rectangle", &json!({"x": 7, "y": 9, "width": 5, "height": 5, "parent": root})).unwrap();
-        let mut parent = root;
-        for _ in 0..20 {
-            parent = id_of(&s.execute("frame.create", &json!({"x": 1, "y": 1, "width": 40, "height": 40, "parent": parent})).unwrap()["id"]).unwrap();
-        }
-        let dart = code_for(s.doc().unwrap(), root, CodeLang::Flutter);
-        assert!(dart.contains("Stack(\n    alignment: Alignment.topLeft,\n"), "{dart}");
-        assert!(dart.contains("Positioned(\n        left: 7,\n        top: 9,\n"), "{dart}");
-        // A wrapper's closing parenthesis sits on its own line, not glued to the widget's.
-        assert!(dart.contains("        )\n      ),\n"), "{dart}");
-        assert!(dart.contains("…"), "the depth is capped: {dart}");
-        assert!(dart.contains("const SizedBox()"), "a capped layer is still a widget in the list: {dart}");
-    }
-
-    #[test]
-    fn flutter_expands_and_stretches_fill_children() {
-        let mut s = Session::new();
-        let row = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 200, "height": 40})).unwrap()["id"]).unwrap();
-        let a = id_of(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 50, "height": 20, "parent": row})).unwrap()["id"]).unwrap();
-        s.execute("shape.rectangle", &json!({"x": 60, "y": 0, "width": 50, "height": 20, "parent": row})).unwrap();
-        s.execute("layout.add", &json!({"ids": [row], "direction": "horizontal"})).unwrap();
-        s.execute("node.set", &json!({"id": a, "props": {"sizingH": "fill", "sizingV": "fill"}})).unwrap();
-        let dart = code_for(s.doc().unwrap(), row, CodeLang::Flutter);
-        assert!(dart.contains("child: Row(\n"), "{dart}");
-        assert!(dart.contains("Expanded(\n"), "a child filling the main axis takes the room left: {dart}");
-        assert!(dart.contains("crossAxisAlignment: CrossAxisAlignment.stretch,"), "a child filling the cross axis stretches the line: {dart}");
-    }
-}
diff --git a/crates/engine/src/collab_live_tests.rs b/crates/engine/src/collab_live_tests.rs
index 5b759391..d53eeff2 100644
--- a/crates/engine/src/collab_live_tests.rs
+++ b/crates/engine/src/collab_live_tests.rs
@@ -246,9 +246,9 @@ fn a_group_of_commands_syncs_as_one_step() {
     let (f, r) = frame_and_rect(room.server.document());
     let start = room.server.replica().clone();
     let cmds = vec![
-        ("node.set".to_string(), json!({"id": r, "props": {"name": "A"}})),
-        ("node.set".to_string(), json!({"id": f, "props": {"name": "B"}})),
-        ("shape.rectangle".to_string(), json!({"x": 0, "y": 0, "width": 5, "height": 5})),
+        crate::BatchStep::new("node.set", json!({"id": r, "props": {"name": "A"}})),
+        crate::BatchStep::new("node.set", json!({"id": f, "props": {"name": "B"}})),
+        crate::BatchStep::new("shape.rectangle", json!({"x": 0, "y": 0, "width": 5, "height": 5})),
     ];
     room.s(0).batch("Three", &cmds).unwrap();
     room.pump();
diff --git a/crates/engine/src/component_codegen_tests.rs b/crates/engine/src/component_codegen_tests.rs
index ffe59057..176ee474 100644
--- a/crates/engine/src/component_codegen_tests.rs
+++ b/crates/engine/src/component_codegen_tests.rs
@@ -43,6 +43,18 @@ fn button_set(s: &mut Session) -> (NodeId, NodeId, NodeId) {
     (set, variants[0], variants[1])
 }
 
+#[test]
+fn strict_mode_reserved_words_are_not_parameter_names() {
+    let mut s = Session::new();
+    let (c, title, _) = card(&mut s);
+    ex(&mut s, "component.addProperty", json!({"id": c, "name": "Protected", "type": "text", "layer": title}));
+    let react = code(&mut s, c, "react");
+    assert!(react.contains("protectedValue"), "React renames the property:\n{react}");
+    for bad in ["  protected?", "  protected =", "{protected}"] {
+        assert!(!react.contains(bad), "reserved word used as a binding ({bad:?}):\n{react}");
+    }
+}
+
 #[test]
 fn components_take_their_properties_as_parameters() {
     let mut s = Session::new();
@@ -71,6 +83,17 @@ fn components_take_their_properties_as_parameters() {
     for want in ["@Composable\nfun Card(", "    showDot: Boolean = true,", "    title: String = \"Hello\",", "if (showDot) {", "text = title,"] {
         assert!(kt.contains(want), "Compose has {want:?}:\n{kt}");
     }
+    let ark = code(&mut s, c, "arkui");
+    for want in [
+        "@Component\nexport struct Card {",
+        "    @Prop showDot: boolean = true",
+        "    @Prop title: string = \"Hello\"",
+        "    build() {",
+        "        if (this.showDot) {",
+        "Text(this.title)",
+    ] {
+        assert!(ark.contains(want), "ArkUI has {want:?}:\n{ark}");
+    }
     let leptos = code(&mut s, c, "leptos");
     for want in [
         "use leptos::prelude::*;\n\n#[component]\npub fn Card(\n",
@@ -129,6 +152,7 @@ fn instances_are_calls_passing_the_values_they_set() {
     assert_eq!(component_code(&mut s, i, "swiftui")["usage"], "Card(showDot: false, title: \"Buy\")\n");
     assert_eq!(component_code(&mut s, i, "compose")["usage"], "Card(showDot = false, title = \"Buy\")\n");
     assert_eq!(component_code(&mut s, i, "flutter")["usage"], "Card(showDot: false, title: \"Buy\")\n");
+    assert_eq!(component_code(&mut s, i, "arkui")["usage"], "Card({ showDot: false, title: \"Buy\" })\n");
     assert_eq!(component_code(&mut s, i, "leptos")["usage"], "<Card show_dot={false} title=\"Buy\" />\n");
     // Text that needs escaping is an expression in JSX and escaped per language.
     ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Title": "Say \"hi\" $5\nnow"}}));
@@ -136,7 +160,19 @@ fn instances_are_calls_passing_the_values_they_set() {
     assert_eq!(component_code(&mut s, i, "swiftui")["usage"], "Card(showDot: false, title: \"Say \\\"hi\\\" $5\\nnow\")\n");
     assert_eq!(component_code(&mut s, i, "compose")["usage"], "Card(showDot = false, title = \"Say \\\"hi\\\" \\$5\\nnow\")\n");
     assert_eq!(component_code(&mut s, i, "flutter")["usage"], "Card(showDot: false, title: \"Say \\\"hi\\\" \\$5\\nnow\")\n");
+    assert_eq!(component_code(&mut s, i, "arkui")["usage"], "Card({ showDot: false, title: \"Say \\\"hi\\\" $5\\nnow\" })\n");
     assert_eq!(component_code(&mut s, i, "leptos")["usage"], "<Card show_dot={false} title={\"Say \\\"hi\\\" $5\\nnow\"} />\n");
+    // A quoted title becomes a binding whose attribute value is escaped: the expression itself
+    // keeps its JS quotes, and the attribute's own quotes are entities.
+    assert_eq!(component_code(&mut s, i, "vue")["usage"], "<Card :showDot=\"false\" :title=\"&quot;Say \\&quot;hi\\&quot; $5\\nnow&quot;\" />\n");
+    let vue = code(&mut s, i, "vue");
+    assert!(vue.starts_with("<Card :showDot=\"false\" :title=\"&quot;Say \\&quot;hi\\&quot; $5\\nnow&quot;\" />\n"), "{vue}");
+    // A plain attribute keeps HTML entities intact: a literal ampersand is written as `&amp;`,
+    // and a literal `&amp;` as `&amp;amp;`.
+    ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Title": "Fish & Chips"}}));
+    assert_eq!(component_code(&mut s, i, "vue")["usage"], "<Card :showDot=\"false\" title=\"Fish &amp; Chips\" />\n");
+    ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Title": "Fish &amp; Chips"}}));
+    assert_eq!(component_code(&mut s, i, "vue")["usage"], "<Card :showDot=\"false\" title=\"Fish &amp;amp; Chips\" />\n");
 }
 
 #[test]
@@ -192,6 +228,9 @@ fn variant_sets_share_one_definition() {
     assert!(dart.contains("enum ButtonState { defaultValue, hover }\n"), "{dart}");
     assert!(dart.contains("    this.state = ButtonState.defaultValue,\n"), "{dart}");
     assert!(dart.contains("  final ButtonState state;\n"), "{dart}");
+    let ark = code(&mut s, set, "arkui");
+    assert!(ark.contains("export enum ButtonState { Default, Hover }"), "{ark}");
+    assert!(ark.contains("    @Prop state: ButtonState = ButtonState.Default"), "{ark}");
     let leptos = code(&mut s, set, "leptos");
     for want in [
         "#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]\npub enum ButtonState {\n    #[default]\n    Default,\n    Hover,\n}",
@@ -209,6 +248,7 @@ fn variant_sets_share_one_definition() {
     assert_eq!(component_code(&mut s, i, "swiftui")["usage"], "Button(state: .hover)\n");
     assert_eq!(component_code(&mut s, i, "compose")["usage"], "Button(state = ButtonState.Hover)\n");
     assert_eq!(component_code(&mut s, i, "flutter")["usage"], "Button(state: ButtonState.hover)\n");
+    assert_eq!(component_code(&mut s, i, "arkui")["usage"], "Button({ state: ButtonState.Hover })\n");
     assert_eq!(component_code(&mut s, i, "leptos")["usage"], "<Button state=ButtonState::Hover />\n");
 }
 
@@ -236,16 +276,30 @@ fn instance_swap_properties_take_views() {
     assert!(dart.contains("  final Widget icon;\n") && dart.contains("    this.icon = const HeartIcon(),\n"), "{dart}");
     assert!(dart.contains("child: icon\n"), "the nested instance is the parameter: {dart}");
     assert!(!dart.contains("child: Container("), "the swap's widget tree isn't spelled out: {dart}");
+    let ark = code(&mut s, chip, "arkui");
+    for want in [
+        "    @BuilderParam icon: () => void = this.defaultIconBuilder",
+        "    @Builder\n    defaultIconBuilder() {\n        HeartIcon()\n    }",
+        "            this.icon()",
+    ] {
+        assert!(ark.contains(want), "ArkUI has {want:?}:\n{ark}");
+    }
     let leptos = code(&mut s, chip, "leptos");
     assert!(leptos.contains("    #[prop(into, default = (|| view! { <HeartIcon /> }).into())] icon: ViewFn,"), "{leptos}");
     assert!(leptos.contains("{icon.run()}"), "{leptos}");
+    let vue = code(&mut s, chip, "vue");
+    assert!(vue.contains("    icon?: unknown;"), "{vue}");
+    assert!(vue.contains("    icon: HeartIcon,"), "the swap defaults to its component: {vue}");
+    assert!(vue.contains("<component :is=\"icon\" />"), "a swap is a component, not an element: {vue}");
     let i = idv(&ex(&mut s, "instance.create", json!({"component": chip, "x": 0, "y": 100})));
     ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Icon": star}}));
     assert_eq!(component_code(&mut s, i, "react")["usage"], "<Chip icon={<StarIcon />} />\n");
     assert_eq!(component_code(&mut s, i, "swiftui")["usage"], "Chip(icon: AnyView(StarIcon()))\n");
     assert_eq!(component_code(&mut s, i, "compose")["usage"], "Chip(icon = { StarIcon() })\n");
     assert_eq!(component_code(&mut s, i, "flutter")["usage"], "Chip(icon: StarIcon())\n");
+    assert_eq!(component_code(&mut s, i, "arkui")["usage"], "Chip({ icon: () => { StarIcon() } })\n");
     assert_eq!(component_code(&mut s, i, "leptos")["usage"], "<Chip icon={|| view! { <StarIcon /> }} />\n");
+    assert_eq!(component_code(&mut s, i, "vue")["usage"], "<Chip :icon=\"StarIcon\" />\n");
 }
 
 #[test]
@@ -263,6 +317,14 @@ fn slots_take_optional_content() {
     let dart = code(&mut s, panel, "flutter");
     assert!(dart.contains("  final List<Widget>? content;\n") && dart.contains("    this.content,\n"), "{dart}");
     assert!(dart.contains("...?content,\n") && dart.contains("if (content == null) ...[\n"), "{dart}");
+    let ark = code(&mut s, panel, "arkui");
+    for want in [
+        "    @BuilderParam content: () => void = this.defaultContentBuilder",
+        "    @Builder\n    defaultContentBuilder() {\n",
+        "            this.content()",
+    ] {
+        assert!(ark.contains(want), "ArkUI has {want:?}:\n{ark}");
+    }
     let leptos = code(&mut s, panel, "leptos");
     assert!(leptos.contains("    #[prop(optional, into)] content: Option<ViewFn>,"), "{leptos}");
     assert!(leptos.contains("{match &content { Some(c) => c.run(), None => view! {\n") && leptos.contains("}.into_any() }}\n"), "{leptos}");
@@ -279,6 +341,8 @@ fn slots_take_optional_content() {
     assert!(usage.starts_with("<Panel content={|| view! {\n") && usage.contains("<Badge />") && usage.ends_with("}} />\n"), "{usage}");
     let usage = component_code(&mut s, i, "flutter")["usage"].as_str().unwrap_or_default().to_string();
     assert!(usage.starts_with("Panel(content: [\n") && usage.contains("Badge()"), "{usage}");
+    let usage = component_code(&mut s, i, "arkui")["usage"].as_str().unwrap_or_default().to_string();
+    assert!(usage.starts_with("Panel({ content: () => {\n") && usage.contains("Badge()") && usage.ends_with("} })\n"), "{usage}");
 }
 
 #[test]
diff --git a/crates/engine/src/components.rs b/crates/engine/src/components.rs
deleted file mode 100644
index da0b2d13..00000000
--- a/crates/engine/src/components.rs
+++ /dev/null
@@ -1,1926 +0,0 @@
-//! Components and instances.
-//!
-//! An instance's layers are real nodes copied from its main component; each copy records the
-//! main-component node it mirrors (`source`) and which property groups were changed locally
-//! (`overrides`). When a main component changes, every instance is rebuilt from it, keeping layer
-//! ids and re-applying overrides (matched by source, then by layer name path, so switching
-//! variants keeps compatible overrides). Variants are components inside a component set, named
-//! `Property=Value, …`; component properties (boolean, text, instance swap) are applied through
-//! `prop_refs` on the layers they control.
-//!
-//! Override groups: `fills`, `strokes`, `effects`, `opacity`, `visible`, `name`, `corners`,
-//! `characters`, `textStyle` (font, size, spacing, resizing, …), `padding`, `gap` and `alignment`
-//! (of auto layout: its direction and other settings are the main's), `grids`, `exports`,
-//! `interactions`, `component` (a swapped nested instance), `props` (property values of a nested
-//! instance) and `slot` (a slot holding the instance's own content). An instance's own export
-//! settings and interactions are its own, like its place. `size` and `position` overrides of
-//! layers inside an instance are still read and kept, but new ones are refused
-//! ([`check_override_edit`]): those layers take their geometry, constraints and resizing from the
-//! main; the instance itself resizes.
-//!
-//! Switching variants keeps an override where the layer's name path matches and the two variants
-//! agreed on that property (text layers keep all of theirs); swapping from the Assets panel keeps
-//! only text layers' overrides ([`keep_text_overrides`]).
-//!
-//! Instances never gain or lose layers of their own: commands that would add, remove or reorder
-//! layers inside an instance are refused ([`check_structure_edit`]), except inside **slots**. A
-//! slot is a frame of a main component bound to a slot property (`prop_refs["slot"]`). An
-//! instance's copy of it shows the main's default content until its layers are edited; from then
-//! on (override group `slot`) its children are the instance's own content: free to edit, kept
-//! across syncs and variant switches, and outside the instance's structure (instances placed in it
-//! stand alone).
-
-use std::collections::{BTreeMap, BTreeSet};
-
-use figcraft_doc::*;
-use figcraft_geom::Affine;
-use serde_json::Value;
-
-/// Nesting limit for instances inside instances.
-const MAX_DEPTH: usize = 16;
-/// The override group (and `prop_refs` field) of slots.
-pub const SLOT: &str = "slot";
-/// Every override group a layer can carry.
-pub const OVERRIDE_GROUPS: &[&str] = &[
-    "fills",
-    "strokes",
-    "effects",
-    "opacity",
-    "visible",
-    "name",
-    "corners",
-    "characters",
-    "textStyle",
-    "padding",
-    "gap",
-    "alignment",
-    "grids",
-    "exports",
-    "interactions",
-    "size",
-    "position",
-    "component",
-    "props",
-    SLOT,
-];
-
-fn is_instance(doc: &Document, id: NodeId) -> bool {
-    doc.node(id).is_some_and(|n| matches!(n.kind, NodeKind::Instance { .. }))
-}
-
-/// A slot (inside an instance) whose children are the instance's own content.
-fn holds_content(n: &Node) -> bool {
-    n.overrides.contains(SLOT)
-}
-
-/// `id` and its ancestors, up to the nearest slot above it that holds an instance's own content:
-/// content belongs to no instance (it edits freely, and instances placed in it stand alone).
-fn scope(doc: &Document, id: NodeId) -> Vec<NodeId> {
-    let mut out = vec![id];
-    for a in doc.ancestors(id) {
-        if doc.node(a).is_some_and(holds_content) {
-            break;
-        }
-        out.push(a);
-    }
-    out
-}
-
-/// The component a node belongs to (itself, or the nearest component ancestor).
-pub fn owning_component(doc: &Document, id: NodeId) -> Option<NodeId> {
-    let mut chain = vec![id];
-    chain.extend(doc.ancestors(id));
-    chain.into_iter().find(|c| doc.node(*c).is_some_and(|n| matches!(n.kind, NodeKind::Component { .. })))
-}
-
-/// The innermost instance containing `id` (`id` itself when it is an instance).
-pub fn owning_instance(doc: &Document, id: NodeId) -> Option<NodeId> {
-    scope(doc, id).into_iter().find(|c| is_instance(doc, *c))
-}
-
-/// The outermost instance containing `id` (`id` itself when it is a top-level instance).
-pub fn root_instance(doc: &Document, id: NodeId) -> Option<NodeId> {
-    scope(doc, id).into_iter().rfind(|c| is_instance(doc, *c))
-}
-
-/// The innermost instance `id` is a layer of (never `id` itself).
-fn enclosing_instance(doc: &Document, id: NodeId) -> Option<NodeId> {
-    scope(doc, id).into_iter().skip(1).find(|c| is_instance(doc, *c))
-}
-
-/// Whether `id` is a layer inside an instance (not the outermost instance itself).
-pub fn inside_instance(doc: &Document, id: NodeId) -> bool {
-    enclosing_instance(doc, id).is_some()
-}
-
-/// The slot property frame `id` stands for (its name and preferred components): a frame bound to
-/// a slot property of its component, or an instance's copy of one (followed through its sources).
-pub fn slot_def(doc: &Document, id: NodeId) -> Option<(&str, &[NodeId])> {
-    let mut cur = id;
-    for _ in 0..=MAX_DEPTH {
-        let n = doc.node(cur)?;
-        if !matches!(n.kind, NodeKind::Frame) {
-            return None;
-        }
-        if let Some(name) = n.prop_refs.get(SLOT) {
-            let NodeKind::Component { props, .. } = &doc.node(owning_component(doc, cur)?)?.kind else { return None };
-            return match props.get(name) {
-                Some(PropDef::Slot { preferred }) => Some((name.as_str(), preferred.as_slice())),
-                _ => None,
-            };
-        }
-        cur = n.source?;
-    }
-    None
-}
-
-/// The name of the slot property frame `id` stands for ([`slot_def`]).
-pub fn slot_name(doc: &Document, id: NodeId) -> Option<String> {
-    slot_def(doc, id).map(|(name, _)| name.to_string())
-}
-
-/// Whether `id` is a slot (in a main component, or an instance's copy of one).
-pub fn is_slot(doc: &Document, id: NodeId) -> bool {
-    slot_def(doc, id).is_some()
-}
-
-/// Whether slot `id` (inside an instance) holds the instance's own content rather than its main's
-/// default content.
-pub fn slot_edited(doc: &Document, id: NodeId) -> bool {
-    doc.node(id).is_some_and(holds_content)
-}
-
-/// The slot `id` is, or lies in, within its instance: where layers may be added, removed and
-/// reordered freely.
-pub fn slot_scope(doc: &Document, id: NodeId) -> Option<NodeId> {
-    let mut chain = vec![id];
-    chain.extend(doc.ancestors(id));
-    for c in chain {
-        if is_instance(doc, c) {
-            return None;
-        }
-        if is_slot(doc, c) {
-            return Some(c);
-        }
-    }
-    None
-}
-
-/// Whether layers can't be added to, removed from or reordered in `id`: it is (inside) an
-/// instance, outside its slots.
-pub fn structure_locked(doc: &Document, id: NodeId) -> bool {
-    owning_instance(doc, id).is_some() && slot_scope(doc, id).is_none()
-}
-
-/// For tree walks that look for where layers can go: whether the children of `id` are locked (in
-/// an instance, outside its slots), given whether `id` itself is (`locked`).
-pub fn locks_children(doc: &Document, id: NodeId, locked: bool) -> bool {
-    is_instance(doc, id) || (locked && !is_slot(doc, id))
-}
-
-/// Whether layer `id`'s place (parent and position among its siblings) changed between two
-/// versions only where instance structure allows it.
-pub fn move_allowed(before: &Document, after: &Document, id: NodeId) -> bool {
-    let place = |d: &Document| d.node(id).and_then(|n| n.parent).map(|p| (p, d.index_in_parent(id)));
-    let (was, is) = (place(before), place(after));
-    was == is || (!was.is_some_and(|(p, _)| structure_locked(before, p)) && !is.is_some_and(|(p, _)| structure_locked(after, p)))
-}
-
-/// The slots of a component or instance (its own: not those of instances nested in it, nor of the
-/// content put into its slots), with their property names, top-most first.
-pub fn slots_of(doc: &Document, root: NodeId) -> Vec<(NodeId, String)> {
-    let mut out = Vec::new();
-    let mut stack: Vec<NodeId> = doc.node(root).map(|n| n.children.iter().rev().copied().collect()).unwrap_or_default();
-    let mut seen = 0usize;
-    while let Some(c) = stack.pop() {
-        seen += 1;
-        if seen > 1_000_000 {
-            break;
-        }
-        let Some(n) = doc.node(c) else { continue };
-        if let Some(name) = slot_name(doc, c) {
-            out.push((c, name));
-        }
-        if !is_instance(doc, c) && !holds_content(n) {
-            stack.extend(n.children.iter().rev().copied());
-        }
-    }
-    out
-}
-
-/// All instances of `component` in the document.
-pub fn instances_of(doc: &Document, component: NodeId) -> Vec<NodeId> {
-    doc.nodes().filter(|n| matches!(n.kind, NodeKind::Instance { component: c, .. } if c == component)).map(|n| n.id).collect()
-}
-
-/// The component set a variant belongs to.
-pub fn variant_set(doc: &Document, component: NodeId) -> Option<NodeId> {
-    doc.node(component).and_then(|c| c.parent).filter(|p| doc.node(*p).is_some_and(|n| matches!(n.kind, NodeKind::ComponentSet { .. })))
-}
-
-/// The layer name a fresh instance of `component` gets: the set's name for variants.
-pub fn default_instance_name(doc: &Document, component: NodeId) -> String {
-    let set = variant_set(doc, component).and_then(|s| doc.node(s));
-    set.or_else(|| doc.node(component)).map(|n| n.name.clone()).unwrap_or_else(|| "Instance".into())
-}
-
-/// Default property values of a component (slots hold content, not values: they have none).
-pub fn default_props(comp: &Node) -> BTreeMap<String, Value> {
-    let mut out = BTreeMap::new();
-    if let NodeKind::Component { props, .. } = &comp.kind {
-        for (k, d) in props {
-            if takes_value(d) {
-                out.insert(k.clone(), prop_default_value(d));
-            }
-        }
-    }
-    out
-}
-
-/// Whether instances store a value for the property (every kind but slots).
-pub fn takes_value(d: &PropDef) -> bool {
-    !matches!(d, PropDef::Slot { .. })
-}
-
-/// A property definition's default as a JSON value.
-pub fn prop_default_value(d: &PropDef) -> Value {
-    match d {
-        PropDef::Boolean { default } => Value::Bool(*default),
-        PropDef::Text { default } => Value::String(default.clone()),
-        PropDef::InstanceSwap { default, .. } => Value::from(default.0),
-        PropDef::Variant { default, .. } => Value::String(default.clone()),
-        PropDef::Slot { .. } => Value::Null,
-    }
-}
-
-/// Create an instance of `component` under `parent` at `(x, y)` (parent space).
-pub fn create_instance(doc: &mut Document, component: NodeId, parent: NodeId, x: f64, y: f64) -> Result<NodeId, DocError> {
-    create_instance_at(doc, component, parent, x, y, None)
-}
-
-/// [`create_instance`] at child `index` of `parent` (None: on top).
-pub fn create_instance_at(doc: &mut Document, component: NodeId, parent: NodeId, x: f64, y: f64, index: Option<usize>) -> Result<NodeId, DocError> {
-    let comp = doc.get(component)?.clone();
-    if !matches!(comp.kind, NodeKind::Component { .. }) {
-        return Err(DocError::Invalid(format!("{component} is not a component")));
-    }
-    if doc.is_ancestor(component, parent) {
-        return Err(DocError::Invalid("an instance can't be placed inside its own main component".into()));
-    }
-    let id = doc.alloc_id();
-    let mut root = comp.clone();
-    root.id = id;
-    root.name = default_instance_name(doc, component);
-    root.kind = NodeKind::Instance { component, props: default_props(&comp) };
-    root.children.clear();
-    root.parent = None;
-    root.source = Some(component);
-    root.overrides.clear();
-    root.transform = Affine::translate((x, y));
-    root.prop_refs.clear();
-    root.annotations.clear();
-    root.code_links.clear();
-    // The main's dev resources show on its instances without being copied.
-    root.dev_resources.clear();
-    // The main's interactions play on its instances in prototypes; the instance's own start empty.
-    root.interactions.clear();
-    doc.insert(root, parent, index)?;
-    sync_instance(doc, id);
-    Ok(id)
-}
-
-/// Which part of the carried overrides to apply.
-#[derive(Clone, Copy, PartialEq)]
-enum Carry {
-    /// Paint, text, visibility, … (everything but geometry).
-    Values,
-    /// Values plus size (instance roots: their size decides how children follow constraints).
-    Root,
-    /// Size and position (children, after constraints ran).
-    Geometry,
-}
-
-/// Copy the overridden property groups of `from` onto `to`.
-fn carry_overrides(from: &Node, to: &mut Node, what: Carry) {
-    for g in &from.overrides {
-        let geo = matches!(g.as_str(), "size" | "position");
-        match what {
-            Carry::Values if geo => continue,
-            Carry::Root if g == "position" => continue,
-            Carry::Geometry if !geo => continue,
-            _ => {}
-        }
-        copy_group(from, to, g);
-    }
-    if what != Carry::Geometry {
-        to.overrides = from.overrides.clone();
-    }
-}
-
-/// Copy the values of property group `g` of `from` onto `to`, with the variables bound to them.
-pub(crate) fn copy_group(from: &Node, to: &mut Node, g: &str) {
-    if from.bound.iter().chain(to.bound.iter()).any(|(k, _)| binding_group(k) == Some(g)) {
-        to.bound.retain(|k, _| binding_group(k) != Some(g));
-        to.bound.extend(bindings_of(from, g).map(|(k, v)| (k.clone(), v.clone())));
-    }
-    match g {
-        "fills" => {
-            to.fills = from.fills.clone();
-            to.styles.fill = from.styles.fill.clone();
-        }
-        "strokes" => {
-            to.strokes = from.strokes.clone();
-            to.stroke = from.stroke.clone();
-            to.styles.stroke = from.styles.stroke.clone();
-        }
-        "effects" => {
-            to.effects = from.effects.clone();
-            to.styles.effect = from.styles.effect.clone();
-        }
-        "opacity" => {
-            to.opacity = from.opacity;
-            to.blend = from.blend;
-        }
-        "visible" => to.visible = from.visible,
-        "name" => to.name = from.name.clone(),
-        "corners" => to.corners = from.corners,
-        "characters" => {
-            if let (NodeKind::Text(a), NodeKind::Text(b)) = (&from.kind, &mut to.kind) {
-                b.characters = a.characters.clone();
-                b.runs = a.runs.clone();
-                b.paragraphs = a.paragraphs.clone();
-            }
-        }
-        "textStyle" => {
-            if let (NodeKind::Text(a), NodeKind::Text(b)) = (&from.kind, &mut to.kind) {
-                b.style = a.style.clone();
-                b.runs = a.runs.clone();
-                b.auto_resize = a.auto_resize;
-                b.align_h = a.align_h;
-                b.align_v = a.align_v;
-                b.paragraph_spacing = a.paragraph_spacing;
-                b.paragraph_indent = a.paragraph_indent;
-                b.list = a.list;
-                b.paragraphs = a.paragraphs.clone();
-                b.list_spacing = a.list_spacing;
-                b.hanging_punctuation = a.hanging_punctuation;
-                b.hanging_list = a.hanging_list;
-                b.max_lines = a.max_lines;
-                b.features = a.features.clone();
-            }
-            to.styles.text = from.styles.text.clone();
-        }
-        "padding" | "gap" | "alignment" => {
-            if let (Some(a), Some(b)) = (&from.layout, &mut to.layout) {
-                match g {
-                    "padding" => b.padding = a.padding,
-                    "gap" => (b.gap, b.cross_gap) = (a.gap, a.cross_gap),
-                    _ => (b.main_align, b.cross_align, b.content_align) = (a.main_align, a.cross_align, a.content_align),
-                }
-            }
-        }
-        "grids" => {
-            to.grids = from.grids.clone();
-            to.styles.grid = from.styles.grid.clone();
-        }
-        "exports" => to.exports = from.exports.clone(),
-        "interactions" => to.interactions = from.interactions.clone(),
-        "size" => {
-            to.width = from.width;
-            to.height = from.height;
-            to.child_layout = from.child_layout.clone();
-            if let (NodeKind::Text(a), NodeKind::Text(b)) = (&from.kind, &mut to.kind) {
-                b.auto_resize = a.auto_resize;
-            }
-        }
-        "position" => to.transform = from.transform,
-        "component" => {
-            if let (NodeKind::Instance { component: a, .. }, NodeKind::Instance { component: b, .. }) = (&from.kind, &mut to.kind) {
-                *b = *a;
-            }
-        }
-        "props" => {
-            if let (NodeKind::Instance { props: a, .. }, NodeKind::Instance { props: b, .. }) = (&from.kind, &mut to.kind) {
-                *b = a.clone();
-            }
-            carry_prop_bindings(from, to);
-        }
-        _ => {}
-    }
-}
-
-/// Layer name paths below `root` ("Frame/Label", with `#n` for same-named siblings). With
-/// `src_names` (an instance's layers), layers are named after the main layer they mirror (renames
-/// don't break matching), and the content of slots holding the instance's own is left out.
-fn path_map(doc: &Document, root: NodeId, src_names: bool) -> BTreeMap<NodeId, String> {
-    let mut out = BTreeMap::new();
-    let mut stack = vec![(root, String::new())];
-    while let Some((id, prefix)) = stack.pop() {
-        let Some(n) = doc.node(id) else { continue };
-        let mut seen: BTreeMap<&str, usize> = BTreeMap::new();
-        for c in &n.children {
-            let Some(cn) = doc.node(*c) else { continue };
-            // A nested instance linked only to its own component so far (an imported one) mirrors no
-            // layer yet: it goes by its own name, like the main's layer it will be matched with.
-            let unplaced = matches!(&cn.kind, NodeKind::Instance { component, .. } if cn.source == Some(*component));
-            let mirrored = cn.source.filter(|_| src_names && !unplaced).and_then(|s| doc.node(s));
-            let name = mirrored.map_or(cn.name.as_str(), |s| s.name.as_str());
-            let k = seen.entry(name).or_insert(0);
-            let seg = if *k == 0 { name.to_string() } else { format!("{name}#{k}") };
-            *k += 1;
-            let path = if prefix.is_empty() { seg } else { format!("{prefix}/{seg}") };
-            out.insert(*c, path.clone());
-            if out.len() > 1_000_000 {
-                return out;
-            }
-            if !(src_names && holds_content(cn)) {
-                stack.push((*c, path));
-            }
-        }
-    }
-    out
-}
-
-/// The binding key prefix of an instance's component property value
-/// (`componentProperties/<name>`): a boolean property takes a boolean variable, a text property a
-/// string variable.
-pub const PROP_BINDING: &str = "componentProperties/";
-
-/// Give `to` the component property bindings of instance `from` (they go with its property
-/// values, which an instance keeps across rebuilds).
-fn carry_prop_bindings(from: &Node, to: &mut Node) {
-    to.bound.retain(|k, _| !k.starts_with(PROP_BINDING));
-    to.bound.extend(from.bound.iter().filter(|(k, _)| k.starts_with(PROP_BINDING)).map(|(k, v)| (k.clone(), v.clone())));
-}
-
-/// The override group a property-bound field belongs to.
-fn field_group(field: &str) -> &'static str {
-    match field {
-        "visible" => "visible",
-        "characters" => "characters",
-        "mainComponent" => "component",
-        _ => "",
-    }
-}
-
-/// Apply one component-property value to a layer.
-fn apply_prop(doc: &Document, n: &mut Node, field: &str, val: &Value) {
-    match field {
-        "visible" => {
-            if let Some(b) = val.as_bool() {
-                n.visible = b;
-            }
-        }
-        "characters" => {
-            if let (NodeKind::Text(t), Some(sv)) = (&mut n.kind, val.as_str().map(crate::cmd::props::normalize_line_endings))
-                && t.characters != sv
-            {
-                let len = t.char_count();
-                t.replace_range(0, len, &sv);
-            }
-        }
-        "mainComponent" => {
-            if let (NodeKind::Instance { component: c, .. }, Some(v)) = (&mut n.kind, crate::params::id_of(val))
-                && doc.node(v).is_some_and(|m| matches!(m.kind, NodeKind::Component { .. }))
-            {
-                *c = v;
-            }
-        }
-        _ => {}
-    }
-}
-
-/// Rebuild instance `inst` from its main component, keeping ids, overrides and the content of its
-/// slots. An instance whose main component was deleted keeps its layers as they are.
-pub fn sync_instance(doc: &mut Document, inst: NodeId) {
-    // Layers the rebuild leaves as they were keep their shared snapshot (and aren't edits).
-    let old: Vec<(std::sync::Arc<Node>, bool)> =
-        doc.subtree(inst).into_iter().filter_map(|i| doc.node_arc(i).map(|a| (a.clone(), doc.dirty().contains(&i)))).collect();
-    let kept = slot_content(doc, inst);
-    sync_instance_depth(doc, inst, 0, BTreeMap::new());
-    restore_slot_content(doc, kept);
-    for (a, was_dirty) in old {
-        doc.keep_if_unchanged(a, was_dirty);
-    }
-}
-
-/// The slots in instance `inst` (nested instances included) holding the instance's own content:
-/// each with its content (the subtrees of its children, pre-order).
-fn slot_content(doc: &Document, inst: NodeId) -> Vec<(NodeId, Vec<Node>)> {
-    let mut out = Vec::new();
-    let mut stack: Vec<NodeId> = doc.node(inst).map(|n| n.children.clone()).unwrap_or_default();
-    while let Some(c) = stack.pop() {
-        let Some(n) = doc.node(c) else { continue };
-        if holds_content(n) {
-            let nodes = n.children.iter().flat_map(|k| doc.subtree(*k)).filter_map(|d| doc.node(d).cloned()).collect();
-            out.push((c, nodes));
-        } else {
-            stack.extend(n.children.iter().copied());
-        }
-    }
-    out
-}
-
-/// Put slot content back after a rebuild, into the slots that still hold the instance's own
-/// content (a slot the main no longer has, or no longer marks as a slot, loses it). Constraints
-/// and geometry overrides ran before, so the content keeps its place.
-fn restore_slot_content(doc: &mut Document, kept: Vec<(NodeId, Vec<Node>)>) {
-    for (slot, nodes) in kept {
-        let keep = slot_edited(doc, slot) && is_slot(doc, slot) && nodes.iter().all(|n| !doc.contains(n.id));
-        if !keep {
-            continue;
-        }
-        let ids: Vec<NodeId> = nodes.iter().map(|n| n.id).collect();
-        for n in nodes {
-            // Pre-order: every parent is back before its children.
-            let _ = insert_linked(doc, n);
-        }
-        // Never leave links to a layer that couldn't come back.
-        for id in ids.into_iter().chain([slot]) {
-            let dangling = doc.node(id).is_some_and(|n| n.children.iter().any(|c| !doc.contains(*c)));
-            if dangling {
-                let live: Vec<NodeId> = doc.node(id).map(|n| n.children.iter().copied().filter(|c| doc.contains(*c)).collect()).unwrap_or_default();
-                if let Some(n) = doc.node_mut(id) {
-                    n.children = live;
-                }
-            }
-        }
-    }
-}
-
-/// `spare`: layers the outer rebuild didn't reuse that were below `inst` (a swapped nested
-/// instance): its layers the outer main doesn't have, matched here so they keep ids and overrides.
-fn sync_instance_depth(doc: &mut Document, inst: NodeId, depth: usize, spare: BTreeMap<NodeId, std::sync::Arc<Node>>) {
-    if depth > MAX_DEPTH {
-        return;
-    }
-    let Some(mut root) = doc.node(inst).cloned() else { return };
-    let NodeKind::Instance { component, props: root_props } = &root.kind else { return };
-    let component = *component;
-    let Some(comp) = doc.node(component).cloned() else { return };
-    if !matches!(comp.kind, NodeKind::Component { .. }) || doc.is_ancestor(inst, component) || doc.is_ancestor(component, inst) {
-        // A missing main, or an instance inside its own main (would recurse forever).
-        return;
-    }
-    let mut eff_props = default_props(&comp);
-    for (k, v) in root_props {
-        if eff_props.contains_key(k) {
-            eff_props.insert(k.clone(), v.clone());
-        }
-    }
-    // Old layers (kept alive for their overrides), by (parent, source), by source alone (when only
-    // one layer mirrors it) and, only when those don't match, by name path.
-    let mut old_ids = old_layers(doc, inst);
-    old_ids.extend(spare.keys().copied());
-    old_ids.sort();
-    old_ids.dedup();
-    let mut old: BTreeMap<NodeId, std::sync::Arc<Node>> = spare;
-    let mut by_source: BTreeMap<(NodeId, NodeId), NodeId> = BTreeMap::new();
-    let mut by_src: BTreeMap<NodeId, Option<NodeId>> = BTreeMap::new();
-    for i in &old_ids {
-        let Some(n) = doc.node_arc(*i).or_else(|| old.get(i)).cloned() else { continue };
-        if let Some(s) = n.source {
-            if let Some(p) = n.parent {
-                by_source.entry((p, s)).or_insert(*i);
-            }
-            by_src.entry(s).and_modify(|e| *e = None).or_insert(Some(*i));
-        }
-        old.insert(*i, n);
-    }
-    let mut by_path: Option<BTreeMap<String, NodeId>> = None;
-    let mut main_paths: Option<BTreeMap<NodeId, String>> = None;
-    // Ids for the copies: reuse the matching old layer's id (a layer the main moved to another
-    // parent keeps its id and overrides).
-    let src: Vec<NodeId> = doc.subtree(component).into_iter().filter(|i| *i != component).collect();
-    let mut map: BTreeMap<NodeId, NodeId> = BTreeMap::new();
-    map.insert(component, inst);
-    let mut used: BTreeSet<NodeId> = BTreeSet::new();
-    // Slots holding the instance's own content (new ids), and main layers not copied: the
-    // default content of those slots.
-    let mut edited: BTreeSet<NodeId> = BTreeSet::new();
-    let mut skipped: BTreeSet<NodeId> = BTreeSet::new();
-    let mut fresh_ids = Vec::new();
-    for s in &src {
-        let Some(sn) = doc.node(*s) else { continue };
-        if sn.parent.is_some_and(|p| skipped.contains(&p) || map.get(&p).is_some_and(|pn| edited.contains(pn))) {
-            skipped.insert(*s);
-            continue;
-        }
-        let parent_new = sn.parent.and_then(|p| map.get(&p).copied());
-        let mut found = parent_new.and_then(|pn| by_source.get(&(pn, *s)).copied()).or_else(|| by_src.get(s).copied().flatten());
-        if found.is_none() {
-            let paths = by_path.get_or_insert_with(|| path_map(doc, inst, true).into_iter().map(|(k, v)| (v, k)).collect());
-            let mains = main_paths.get_or_insert_with(|| path_map(doc, component, false));
-            found = mains.get(s).and_then(|p| paths.get(p)).copied();
-        }
-        let nid = match found {
-            Some(o) if used.insert(o) => o,
-            _ => {
-                fresh_ids.push(*s);
-                continue;
-            }
-        };
-        if let Some(m) = old.get(&nid).and_then(|o| variant_kept(doc, o, *s)) {
-            old.insert(nid, std::sync::Arc::new(m));
-        }
-        if old.get(&nid).is_some_and(|o| holds_content(o)) && is_slot(doc, *s) {
-            edited.insert(nid);
-        }
-        map.insert(*s, nid);
-    }
-    for c in root.children.clone() {
-        let _ = doc.remove(c);
-    }
-    for s in fresh_ids {
-        let nid = doc.alloc_id();
-        map.insert(s, nid);
-    }
-    // Build the copies (pre-order: parents first).
-    let mut enclosing: BTreeMap<NodeId, Vec<NodeId>> = BTreeMap::new();
-    enclosing.insert(inst, vec![inst]);
-    let mut inst_props: BTreeMap<NodeId, BTreeMap<String, Value>> = BTreeMap::new();
-    inst_props.insert(inst, eff_props);
-    let mut nested = Vec::new();
-    let mut new_nodes = Vec::new();
-    // Text layers showing other text or style than their main layer (to re-measure).
-    let mut remeasure = Vec::new();
-    for s in &src {
-        let Some(orig) = doc.node(*s) else { continue };
-        let Some(&nid) = map.get(s) else { continue };
-        let Some(parent) = orig.parent.and_then(|p| map.get(&p).copied()) else { continue };
-        let mut n = orig.clone();
-        n.id = nid;
-        n.parent = Some(parent);
-        n.children = orig.children.iter().filter_map(|c| map.get(c).copied()).collect();
-        n.source = Some(*s);
-        n.overrides.clear();
-        n.prop_refs.clear();
-        let prev = old.get(&nid);
-        // Annotations belong to the layer they were added to, not to its copies.
-        n.annotations = prev.map(|o| o.annotations.clone()).unwrap_or_default();
-        if let Some(o) = prev {
-            carry_overrides(o, &mut n, Carry::Values);
-            keep_laid_out(doc, orig, o, &mut n);
-        }
-        if !edited.contains(&nid) {
-            // No longer a slot in the main: it mirrors the main again.
-            n.overrides.remove(SLOT);
-        }
-        // Component properties: the main layer's bindings use this instance's values; layers of
-        // nested instances use the nested instance's values (one level per source hop).
-        let enc = enclosing.get(&parent).cloned().unwrap_or_default();
-        let mut chain: Vec<&Node> = vec![orig];
-        while chain.len() < enc.len() {
-            let Some(next) = chain.last().and_then(|c| c.source).and_then(|x| doc.node(x)) else { break };
-            chain.push(next);
-        }
-        for (j, level) in chain.iter().enumerate().rev() {
-            let Some(props) = enc.get(j).and_then(|e| inst_props.get(e)) else { continue };
-            for (field, prop) in &level.prop_refs {
-                let g = field_group(field);
-                if n.overrides.contains(g) || (j > 0 && orig.overrides.contains(g)) {
-                    continue;
-                }
-                if let Some(val) = props.get(prop) {
-                    apply_prop(doc, &mut n, field, val);
-                }
-            }
-        }
-        if let NodeKind::Instance { component: c, props } = &n.kind {
-            inst_props.insert(nid, props.clone());
-            let mut e = enc;
-            e.push(nid);
-            enclosing.insert(nid, e);
-            if !matches!(orig.kind, NodeKind::Instance { component: oc, .. } if oc == *c) {
-                nested.push(nid);
-            }
-        } else {
-            enclosing.insert(nid, enc);
-        }
-        if let (NodeKind::Text(a), NodeKind::Text(b)) = (&orig.kind, &n.kind)
-            && a != b
-        {
-            remeasure.push(nid);
-        }
-        new_nodes.push(n);
-    }
-    for n in new_nodes {
-        let (id, parent) = (n.id, n.parent);
-        if insert_linked(doc, n).is_err()
-            && let Some(p) = parent.and_then(|p| doc.node_mut(p))
-        {
-            p.children.retain(|c| *c != id);
-        }
-    }
-    // Root: follows the main except its own placement, name, size and overrides.
-    let order: Vec<NodeId> = comp.children.iter().filter_map(|c| map.get(c).copied()).filter(|c| doc.contains(*c)).collect();
-    let mut fresh = comp.clone();
-    fresh.id = inst;
-    fresh.parent = root.parent;
-    fresh.children = order;
-    fresh.transform = root.transform;
-    fresh.kind = root.kind.clone();
-    carry_prop_bindings(&root, &mut fresh);
-    // A nested instance keeps mirroring its layer of the outer main.
-    let nested_copy = inside_instance(doc, inst);
-    fresh.source = if nested_copy { root.source } else { Some(component) };
-    fresh.constraints = root.constraints;
-    fresh.child_layout = root.child_layout.clone();
-    fresh.interactions = root.interactions.clone();
-    fresh.exports = root.exports.clone();
-    fresh.prop_refs = root.prop_refs.clone();
-    fresh.plugin_data = root.plugin_data.clone();
-    fresh.annotations = root.annotations.clone();
-    // Code links belong to the main component; instances read them from it.
-    fresh.code_links.clear();
-    // An instance's own dev resources (its main's are listed with them, not copied).
-    fresh.dev_resources = root.dev_resources.clone();
-    fresh.locked = root.locked;
-    fresh.visible = root.visible;
-    fresh.var_modes = root.var_modes.clone();
-    fresh.is_mask = root.is_mask;
-    fresh.exposed = root.exposed;
-    fresh.guides = root.guides.clone();
-    fresh.dev_status = root.dev_status;
-    fresh.dev_changed = root.dev_changed;
-    fresh.dev_note = root.dev_note.clone();
-    fresh.constrain_proportions = root.constrain_proportions;
-    // How the instance combines in a boolean group it sits in is its own.
-    fresh.bool_op = root.bool_op;
-    // A swapped nested instance keeps the name its layer was given in the outer main.
-    let renamed = nested_copy
-        && root.source.and_then(|s| doc.node(s)).is_some_and(|s| match &s.kind {
-            NodeKind::Instance { component: c, .. } => s.name != default_instance_name(doc, *c),
-            _ => false,
-        });
-    fresh.name = if renamed { root.name.clone() } else { default_instance_name(doc, component) };
-    // Switched to another variant: its own overrides stay where both variants agreed.
-    if let Some(prev) = root.source.and_then(|p| doc.node(p)).filter(|p| sibling_variants(doc, p.id, component)) {
-        let differs = diff_groups(prev, &comp);
-        root.overrides.retain(|g| g == "name" || !differs.contains(&g.as_str()));
-    }
-    carry_overrides(&root, &mut fresh, Carry::Root);
-    if let Some(r) = doc.node_mut(inst) {
-        *r = fresh;
-    }
-    // A resized instance: children follow their constraints (auto layout re-flows later).
-    let (iw, ih) = doc.node(inst).map(|n| (n.width, n.height)).unwrap_or((comp.width, comp.height));
-    if (iw - comp.width).abs() > 1e-9 || (ih - comp.height).abs() > 1e-9 {
-        figcraft_layout::apply_constraints(doc, inst, comp.width, comp.height);
-        remeasure = map.values().copied().collect();
-    }
-    // Geometry overrides of children win over constraints.
-    for s in &src {
-        let Some(nid) = map.get(s).copied() else { continue };
-        let Some(o) = old.get(&nid) else { continue };
-        if !o.overrides.contains("size") && !o.overrides.contains("position") {
-            continue;
-        }
-        remeasure.push(nid);
-        let Some((ow, oh)) = doc.node(nid).map(|n| (n.width, n.height)) else { continue };
-        if o.overrides.contains("size") {
-            // Through set_size so vector networks scale with the box.
-            figcraft_layout::set_size(doc, nid, o.width, o.height);
-            if doc.node(nid).is_some_and(|n| n.kind.is_frame_like() && n.layout.is_none()) {
-                figcraft_layout::apply_constraints(doc, nid, ow, oh);
-            }
-        }
-        if let Some(n) = doc.node_mut(nid) {
-            carry_overrides(o, n, Carry::Geometry);
-        }
-    }
-    // Text whose characters or style differ from the main re-measures.
-    for nid in remeasure {
-        if let Some(n) = doc.node(nid)
-            && let Some((w, h)) = figcraft_text::auto_size(n)
-            && ((w - n.width).abs() > 1e-6 || (h - n.height).abs() > 1e-6)
-        {
-            figcraft_layout::set_size(doc, nid, w, h);
-        }
-    }
-    // Nested instances showing another main than the main's copy (swapped): rebuild from it,
-    // with the old layers below them this rebuild didn't reuse.
-    let unused: BTreeMap<NodeId, std::sync::Arc<Node>> = old.into_iter().filter(|(i, _)| !used.contains(i) && !doc.contains(*i)).collect();
-    for n in nested {
-        let below: BTreeMap<NodeId, std::sync::Arc<Node>> = unused
-            .iter()
-            .filter(|(_, x)| {
-                let mut cur = x.parent;
-                for _ in 0..=MAX_DEPTH * 4 {
-                    match cur {
-                        Some(p) if p == n => return true,
-                        Some(p) => cur = unused.get(&p).and_then(|a| a.parent),
-                        None => return false,
-                    }
-                }
-                false
-            })
-            .map(|(i, x)| (*i, x.clone()))
-            .collect();
-        sync_instance_depth(doc, n, depth + 1, below);
-    }
-}
-
-/// Whether main components `a` and `b` are two variants of one set.
-fn sibling_variants(doc: &Document, a: NodeId, b: NodeId) -> bool {
-    a != b && variant_set(doc, a).is_some_and(|s| variant_set(doc, b) == Some(s))
-}
-
-/// Old copy `o` matched by name to main layer `s` of another variant (the instance switched
-/// variants): `o` without the overrides of properties the two variants' layers differ in (`None`
-/// when it keeps them all). Text layers keep every override.
-fn variant_kept(doc: &Document, o: &Node, s: NodeId) -> Option<Node> {
-    let from = o.source.filter(|f| *f != s).and_then(|f| doc.node(f))?;
-    if o.overrides.is_empty() || matches!(o.kind, NodeKind::Text(_)) {
-        return None;
-    }
-    if !sibling_variants(doc, owning_component(doc, from.id)?, owning_component(doc, s)?) {
-        return None;
-    }
-    let differs = diff_groups(from, doc.node(s)?);
-    let mut m = o.clone();
-    m.overrides.retain(|g| !differs.contains(&g.as_str()));
-    (m.overrides.len() != o.overrides.len()).then_some(m)
-}
-
-/// Drop the overrides of instance `inst` but its text layers' (and its own size and the content of
-/// its slots): what swapping it from the Assets panel keeps.
-pub fn keep_text_overrides(doc: &mut Document, inst: NodeId) {
-    for d in old_layers(doc, inst).into_iter().chain([inst]) {
-        let Some(n) = doc.node(d) else { continue };
-        let text = matches!(n.kind, NodeKind::Text(_));
-        let keep = |g: &String| text || g == SLOT || (d == inst && g == "size");
-        if !n.overrides.iter().all(keep)
-            && let Some(m) = doc.node_mut(d)
-        {
-            m.overrides.retain(keep);
-        }
-    }
-}
-
-/// Where auto layout places and sizes a rebuilt copy `n` of main layer `orig`, keep the old
-/// copy's `o` values (an instance's auto layout re-flows from its own content, so they usually
-/// differ from the main's): unchanged layers then stay unchanged, and auto layout re-flows wherever
-/// something that sizes or places layers did change.
-fn keep_laid_out(doc: &Document, orig: &Node, o: &Node, n: &mut Node) {
-    if o.parent != n.parent || o.overrides.contains("size") || o.overrides.contains("position") {
-        return;
-    }
-    let flows = !n.child_layout.absolute && orig.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some());
-    if flows {
-        // The main's rotation and skew, the old place.
-        let [a, b, c, d, _, _] = n.transform.as_coeffs();
-        let [.., e, f] = o.transform.as_coeffs();
-        n.transform = Affine::new([a, b, c, d, e, f]);
-    }
-    // Only layers whose shape is their box (a vector's points scale with it).
-    let boxed = n.kind.is_frame_like() || matches!(n.kind, NodeKind::Text(_) | NodeKind::Rectangle | NodeKind::Ellipse { .. });
-    let derived = |s: Sizing| boxed && ((s == Sizing::Hug && n.layout.is_some()) || (s == Sizing::Fill && flows));
-    if derived(n.child_layout.sizing_h) {
-        n.width = o.width;
-    }
-    if derived(n.child_layout.sizing_v) {
-        n.height = o.height;
-    }
-}
-
-/// The layers of instance `inst` a rebuild matches against (every layer below it but the content
-/// of slots holding its own), ascending.
-fn old_layers(doc: &Document, inst: NodeId) -> Vec<NodeId> {
-    let mut out = Vec::new();
-    let mut stack = vec![inst];
-    while let Some(id) = stack.pop() {
-        let Some(n) = doc.node(id) else { continue };
-        for c in &n.children {
-            out.push(*c);
-            if out.len() > 1_000_000 {
-                break;
-            }
-            if doc.node(*c).is_some_and(|cn| !holds_content(cn)) {
-                stack.push(*c);
-            }
-        }
-    }
-    out.sort();
-    out.dedup();
-    out
-}
-
-/// Insert a node whose parent/children links are already set (used when rebuilding instances).
-fn insert_linked(doc: &mut Document, n: Node) -> Result<(), DocError> {
-    let parent = n.parent.ok_or_else(|| DocError::Invalid("no parent".into()))?;
-    let id = n.id;
-    let mut n = n;
-    let kids = std::mem::take(&mut n.children);
-    doc.insert(n, parent, None)?;
-    if let Some(m) = doc.node_mut(id) {
-        m.children = kids;
-    }
-    // The parent may already list us (its children were copied with ids): keep the first.
-    if let Some(p) = doc.node_mut(parent) {
-        let mut seen = BTreeSet::new();
-        p.children.retain(|c| seen.insert(*c));
-    }
-    Ok(())
-}
-
-/// The property groups whose value layer `n` takes from the same variables as its main layer
-/// `src` (they differ only where the two resolve in different variable modes).
-pub fn variable_groups(n: &Node, src: &Node) -> Vec<&'static str> {
-    let mut out = Vec::new();
-    for (k, v) in &n.bound {
-        let Some(g) = binding_group(k) else { continue };
-        if src.bound.get(k) == Some(v) && !out.contains(&g) {
-            out.push(g);
-        }
-    }
-    out
-}
-
-/// The override group a variable binding key feeds (`None` for component property and layout
-/// grid bindings, which follow other rules).
-fn binding_group(key: &str) -> Option<&'static str> {
-    use crate::cmd::lists::{BoundList, list_binding};
-    if key.starts_with(PROP_BINDING) {
-        return None;
-    }
-    match list_binding(key).map(|(l, _, _)| l) {
-        Some(BoundList::Fills) => Some("fills"),
-        Some(BoundList::Strokes) => Some("strokes"),
-        Some(BoundList::Effects) => Some("effects"),
-        Some(BoundList::Grids) => None,
-        None => Some(crate::cmd::props::override_group(key)).filter(|g| *g != "other"),
-    }
-}
-
-/// The variable bindings of `n` that feed group `g`.
-fn bindings_of<'a>(n: &'a Node, g: &'a str) -> impl Iterator<Item = (&'a String, &'a String)> + 'a {
-    n.bound.iter().filter(move |(k, _)| binding_group(k) == Some(g))
-}
-
-/// Property groups that differ between two versions of a node.
-pub fn diff_groups(a: &Node, b: &Node) -> Vec<&'static str> {
-    let mut out = Vec::new();
-    if a.fills != b.fills {
-        out.push("fills");
-    }
-    if a.strokes != b.strokes || a.stroke != b.stroke {
-        out.push("strokes");
-    }
-    if a.effects != b.effects {
-        out.push("effects");
-    }
-    if a.opacity != b.opacity || a.blend != b.blend {
-        out.push("opacity");
-    }
-    if a.visible != b.visible {
-        out.push("visible");
-    }
-    if a.name != b.name {
-        out.push("name");
-    }
-    if a.corners != b.corners {
-        out.push("corners");
-    }
-    if (a.width - b.width).abs() > 1e-6 || (a.height - b.height).abs() > 1e-6 {
-        out.push("size");
-    }
-    if a.transform != b.transform {
-        out.push("position");
-    }
-    if let (NodeKind::Text(x), NodeKind::Text(y)) = (&a.kind, &b.kind) {
-        if x.characters != y.characters {
-            out.push("characters");
-        }
-        if text_style_differs(x, y) {
-            out.push("textStyle");
-        }
-    }
-    if let (Some(x), Some(y)) = (&a.layout, &b.layout) {
-        if x.padding != y.padding {
-            out.push("padding");
-        }
-        if x.gap != y.gap || x.cross_gap != y.cross_gap {
-            out.push("gap");
-        }
-        if x.main_align != y.main_align || x.cross_align != y.cross_align || x.content_align != y.content_align {
-            out.push("alignment");
-        }
-    }
-    if a.grids != b.grids || a.styles.grid != b.styles.grid {
-        out.push("grids");
-    }
-    if a.exports != b.exports {
-        out.push("exports");
-    }
-    if a.interactions != b.interactions {
-        out.push("interactions");
-    }
-    if let (NodeKind::Instance { component: x, props: px }, NodeKind::Instance { component: y, props: py }) = (&a.kind, &b.kind) {
-        if x != y {
-            out.push("component");
-        }
-        if px != py {
-            out.push("props");
-        }
-    }
-    out
-}
-
-/// Whether two texts differ in anything but their characters (the `textStyle` group).
-fn text_style_differs(x: &TextData, y: &TextData) -> bool {
-    x.style != y.style
-        || x.runs != y.runs
-        || x.auto_resize != y.auto_resize
-        || x.align_h != y.align_h
-        || x.align_v != y.align_v
-        || x.paragraph_spacing != y.paragraph_spacing
-        || x.paragraph_indent != y.paragraph_indent
-        || x.list != y.list
-        || x.paragraphs != y.paragraphs
-        || x.list_spacing != y.list_spacing
-        || x.hanging_punctuation != y.hanging_punctuation
-        || x.hanging_list != y.hanging_list
-        || x.max_lines != y.max_lines
-        || x.features != y.features
-}
-
-/// Whether a geometry change of `id` comes from layout rather than the user: an ancestor was
-/// resized in the same edit (constraints), the parent is an auto layout frame, or auto-sized text.
-fn geometry_derived(doc: &Document, before: &Document, id: NodeId, group: &str) -> bool {
-    for a in doc.ancestors(id) {
-        let (Some(x), Some(y)) = (doc.node(a), before.node(a)) else { continue };
-        if (x.width - y.width).abs() > 1e-6 || (x.height - y.height).abs() > 1e-6 {
-            return true;
-        }
-    }
-    let Some(n) = doc.node(id) else { return true };
-    if group == "position" && n.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some()) && !n.child_layout.absolute {
-        return true;
-    }
-    if group == "size"
-        && let NodeKind::Text(t) = &n.kind
-    {
-        let wchanged = before.node(id).is_some_and(|b| (b.width - n.width).abs() > 1e-6);
-        return match t.auto_resize {
-            TextAutoResize::WidthAndHeight => true,
-            TextAutoResize::Height => !wchanged,
-            _ => false,
-        };
-    }
-    false
-}
-
-/// After an edit: record overrides inside instances, then rebuild instances whose main changed,
-/// whose properties or main were switched, or whose overrides were reset.
-pub fn sync_after_edit(doc: &mut Document, before: &Document, changed: &[NodeId], touched: &BTreeSet<NodeId>) {
-    // 0. A slot whose layers were added, removed or reordered holds the instance's own content
-    //    from now on; copies of instance layers placed elsewhere stop mirroring their main.
-    for &id in changed {
-        let (Some(n), Some(b)) = (doc.node(id), before.node(id)) else { continue };
-        if n.children == b.children || owning_instance(doc, id).is_none() {
-            continue;
-        }
-        if let Some(slot) = slot_scope(doc, id)
-            && !slot_edited(doc, slot)
-        {
-            own_slot_content(doc, slot);
-        }
-    }
-    for &id in changed {
-        if !before.contains(id) {
-            relink_copy(doc, id);
-        }
-    }
-    let mut resync: BTreeSet<NodeId> = BTreeSet::new();
-    // 1. Overrides for layers edited inside instances.
-    for &id in changed {
-        let (Some(n), Some(b)) = (doc.node(id), before.node(id)) else { continue };
-        let Some(inst) = owning_instance(doc, id) else { continue };
-        let top_root = inst == id && !inside_instance(doc, id);
-        if top_root
-            && let (NodeKind::Instance { component: c1, props: p1 }, NodeKind::Instance { component: c2, props: p2 }) = (&n.kind, &b.kind)
-            && (c1 != c2 || p1 != p2)
-        {
-            // Switching the main or a property value of an instance isn't an override.
-            resync.insert(id);
-        }
-        let raw = diff_groups(b, n);
-        let mut groups = raw.clone();
-        // An instance's own place, export settings and interactions are its own, not overrides.
-        if top_root {
-            groups.retain(|g| !matches!(*g, "component" | "props" | "position" | "exports" | "interactions"));
-        }
-        if groups.iter().any(|g| matches!(*g, "size" | "position")) {
-            groups.retain(|g| !matches!(*g, "size" | "position") || !geometry_derived(doc, before, id, g));
-        }
-        // A value equal to the main's isn't an override (setting it back clears the override).
-        let mut cleared = Vec::new();
-        if let Some(src) = n.source.and_then(|s| doc.node(s)) {
-            let mut differs = diff_groups(src, n);
-            if inst == id {
-                differs.retain(|g| *g != "name");
-                if n.name != default_instance_name(doc, src.id) {
-                    differs.push("name");
-                }
-            }
-            // A value from the same variable as the main's (resolved in this layer's modes) isn't an
-            // override either.
-            let from_variables = variable_groups(n, src);
-            groups.retain(|g| differs.contains(g) && !from_variables.contains(g));
-            // Binding another variable (or none) where the main binds one is an override.
-            for (k, _) in b.bound.iter().chain(n.bound.iter()) {
-                let Some(g) = binding_group(k) else { continue };
-                let rebound = b.bound.get(k) != n.bound.get(k) && !bindings_of(n, g).eq(bindings_of(src, g));
-                if rebound && !groups.contains(&g) {
-                    groups.push(g);
-                }
-            }
-            cleared =
-                raw.iter().filter(|g| !matches!(**g, "size" | "position") && !differs.contains(g) && n.overrides.contains(**g)).copied().collect();
-            if top_root {
-                cleared.retain(|g| !matches!(*g, "component" | "props"));
-            }
-        }
-        let lost = b.overrides.iter().any(|g| !n.overrides.contains(g));
-        let nested_switch = !top_root && raw.iter().any(|g| matches!(*g, "component" | "props"));
-        if (!groups.is_empty() || !cleared.is_empty())
-            && let Some(m) = doc.node_mut(id)
-        {
-            for g in groups {
-                m.overrides.insert(g.to_string());
-            }
-            for g in cleared {
-                m.overrides.remove(g);
-            }
-        }
-        if (lost || nested_switch)
-            && let Some(r) = root_instance(doc, id)
-        {
-            resync.insert(r);
-        }
-    }
-    // 2. Components whose layers changed, were added or removed. Value-only edits (paint, text,
-    //    visibility, …) are carried to the copies directly; anything else rebuilds the instances.
-    let mut comps: BTreeSet<NodeId> = BTreeSet::new();
-    let mut patches: Vec<(NodeId, Vec<&'static str>)> = Vec::new();
-    // Main layers that only gained new layers or lost some: their copies take the same change.
-    let mut restructured: Vec<NodeId> = Vec::new();
-    let mut covered: BTreeSet<NodeId> = BTreeSet::new();
-    for &id in changed {
-        if let (Some(b), Some(n)) = (before.node(id), doc.node(id))
-            && b.children != n.children
-            && owning_instance(doc, id).is_none()
-            && owning_component(doc, id).is_some()
-            && let Some(layers) = restructurable(doc, before, b, n)
-        {
-            restructured.push(id);
-            covered.extend(layers);
-        }
-    }
-    for &id in changed {
-        if covered.contains(&id) || restructured.contains(&id) {
-            continue;
-        }
-        let Some(c) = owning_component(doc, id) else { continue };
-        let (Some(b), Some(n)) = (before.node(id), doc.node(id)) else {
-            comps.insert(c);
-            continue;
-        };
-        if b == n {
-            continue;
-        }
-        match patchable(doc, b, n) {
-            Some(groups) => patches.push((id, groups)),
-            None => {
-                comps.insert(c);
-            }
-        }
-    }
-    for &id in touched {
-        if !doc.contains(id)
-            && !covered.contains(&id)
-            && let Some(c) = owning_component(before, id)
-            && doc.contains(c)
-        {
-            comps.insert(c);
-        }
-    }
-    for r in resync {
-        if doc.contains(r) {
-            sync_instance(doc, r);
-            if let Some(c) = owning_component(doc, r) {
-                comps.insert(c);
-            }
-        }
-    }
-    // A copy the patch can't follow exactly rebuilds instead (as does any other change).
-    let patched = comps.is_empty()
-        && !full_rebuild()
-        && (restructured.is_empty() || patch_structure(doc, before, &restructured))
-        && (patches.is_empty() || patch_copies(doc, &patches));
-    #[cfg(test)]
-    if patched && (!restructured.is_empty() || !patches.is_empty()) {
-        PATCHED.with(|c| c.set(c.get() + 1));
-    }
-    if !patched {
-        comps.extend(patches.iter().map(|(id, _)| *id).chain(restructured.iter().copied()).filter_map(|id| owning_component(doc, id)));
-    }
-    // 3. Instances of changed components follow; an instance inside another component makes that
-    //    one change too.
-    rebuild_instances(doc, &comps);
-}
-
-#[cfg(test)]
-thread_local! {
-    /// Tests: rebuild instances even for edits that could be patched (to compare both ways).
-    pub(crate) static FULL_REBUILD: std::cell::Cell<bool> = const { std::cell::Cell::new(false) };
-    /// Tests: edits carried to the copies without rebuilding instances.
-    pub(crate) static PATCHED: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
-}
-
-#[cfg(test)]
-fn full_rebuild() -> bool {
-    FULL_REBUILD.with(std::cell::Cell::get)
-}
-
-#[cfg(not(test))]
-fn full_rebuild() -> bool {
-    false
-}
-
-/// The property groups of a main-component layer edited from `b` to `n` when the edit changed
-/// values only (paint, text, visibility, size, position, …) that copies take as they are: carried to them without
-/// rebuilding the instances ([`patch_copies`]). `None` when anything else changed.
-fn patchable(doc: &Document, b: &Node, n: &Node) -> Option<Vec<&'static str>> {
-    const VALUES: [&str; 17] = [
-        "fills",
-        "strokes",
-        "effects",
-        "opacity",
-        "visible",
-        "name",
-        "corners",
-        "characters",
-        "textStyle",
-        "padding",
-        "gap",
-        "alignment",
-        "grids",
-        "exports",
-        "interactions",
-        "size",
-        "position",
-    ];
-    if b.children != n.children || b.parent != n.parent || b.kind.type_name() != n.kind.type_name() {
-        return None;
-    }
-    let groups = diff_groups(b, n);
-    if groups.is_empty() || groups.iter().any(|g| !VALUES.contains(g)) {
-        return None;
-    }
-    // Exactly those groups (and the layer's own overrides) changed.
-    let mut probe = n.clone();
-    for g in &groups {
-        copy_group(b, &mut probe, g);
-    }
-    probe.overrides = b.overrides.clone();
-    if probe != *b {
-        return None;
-    }
-    // Values a component property sets (on this layer or a main it mirrors) come from instances.
-    let mut cur = Some(n);
-    for _ in 0..=MAX_DEPTH {
-        let Some(x) = cur else { break };
-        if x.prop_refs.keys().any(|f| groups.contains(&field_group(f))) {
-            return None;
-        }
-        cur = x.source.and_then(|s| doc.node(s));
-    }
-    Some(groups)
-}
-
-/// Copies by the layer they mirror; nested instances swapped to a main also follow it.
-fn copies_index(doc: &Document) -> BTreeMap<NodeId, Vec<NodeId>> {
-    let mut copies: BTreeMap<NodeId, Vec<NodeId>> = BTreeMap::new();
-    for n in doc.nodes() {
-        let Some(s) = n.source else { continue };
-        copies.entry(s).or_default().push(n.id);
-        if let (NodeKind::Instance { component, .. }, Some(NodeKind::Instance { component: other, .. })) = (&n.kind, doc.node(s).map(|x| &x.kind))
-            && component != other
-        {
-            copies.entry(*component).or_default().push(n.id);
-        }
-    }
-    copies
-}
-
-/// When main layer `b` → `n` only gained new plain layers (created in this edit: no instances,
-/// components or property bindings in them) or lost layers that were deleted: those layers, which
-/// [`patch_structure`] carries to the copies. `None` for anything else.
-fn restructurable(doc: &Document, before: &Document, b: &Node, n: &Node) -> Option<Vec<NodeId>> {
-    let mut probe = n.clone();
-    probe.children = b.children.clone();
-    probe.overrides = b.overrides.clone();
-    if probe != *b {
-        return None;
-    }
-    let mut layers = Vec::new();
-    for c in n.children.iter().filter(|c| !b.children.contains(c)) {
-        for d in doc.subtree(*c) {
-            let x = doc.node(d)?;
-            let plain = !matches!(x.kind, NodeKind::Instance { .. } | NodeKind::Component { .. } | NodeKind::ComponentSet { .. });
-            if before.contains(d) || !plain || !x.prop_refs.is_empty() {
-                return None;
-            }
-            layers.push(d);
-        }
-    }
-    for c in b.children.iter().filter(|c| !n.children.contains(c)) {
-        if doc.contains(*c) {
-            return None;
-        }
-        layers.extend(before.subtree(*c));
-    }
-    Some(layers)
-}
-
-/// Carry the new and deleted layers of main layers `seeds` ([`restructurable`]) to every copy,
-/// through copies of copies (slots holding an instance's own content keep it). Returns false
-/// (leaving a partial patch for the caller to rebuild over) when a copy can't follow exactly.
-fn patch_structure(doc: &mut Document, before: &Document, seeds: &[NodeId]) -> bool {
-    let copies = copies_index(doc);
-    let mut work: Vec<NodeId> = seeds.to_vec();
-    let mut steps = 0usize;
-    while let Some(p) = work.pop() {
-        steps += 1;
-        if steps > 10_000_000 {
-            return false;
-        }
-        let Some(pn) = doc.node(p).cloned() else { continue };
-        for c in copies.get(&p).cloned().unwrap_or_default() {
-            let Some(cn) = doc.node(c).cloned() else { continue };
-            if holds_content(&cn) {
-                continue;
-            }
-            if let (NodeKind::Instance { component: a, .. }, NodeKind::Instance { component: b, .. }) = (&pn.kind, &cn.kind)
-                && a != b
-            {
-                continue;
-            }
-            // The copy's layers by the layer of `p` they mirror.
-            let mut mirrors: BTreeMap<NodeId, NodeId> = BTreeMap::new();
-            for k in &cn.children {
-                let Some(src) = doc.node(*k).and_then(|x| x.source) else { return false };
-                if mirrors.insert(src, *k).is_some() {
-                    return false;
-                }
-            }
-            let mut order = Vec::with_capacity(pn.children.len());
-            for pc in &pn.children {
-                if let Some(k) = mirrors.remove(pc) {
-                    order.push(k);
-                    continue;
-                }
-                // A layer the copy lacks must be new in this edit, placed as in the main.
-                let absolute = doc.node(*pc).is_some_and(|x| x.child_layout.absolute);
-                if before.contains(*pc) || !child_follows_main(doc, c, absolute) {
-                    return false;
-                }
-                match copy_layers(doc, *pc, c) {
-                    Some(k) => order.push(k),
-                    None => return false,
-                }
-            }
-            // Copies of layers the main lost.
-            for (src, k) in mirrors {
-                if doc.contains(src) || doc.remove(k).is_err() {
-                    return false;
-                }
-            }
-            if doc.node(c).is_some_and(|x| x.children != order)
-                && let Some(m) = doc.node_mut(c)
-            {
-                m.children = order;
-            }
-            work.push(c);
-        }
-    }
-    true
-}
-
-/// Whether a layer placed in copy `parent` (absolutely positioned or not) takes its main layer's
-/// place and size: nothing on the way up applies constraints ([`follows_main_geometry`]).
-fn child_follows_main(doc: &Document, parent: NodeId, absolute: bool) -> bool {
-    let Some(p) = doc.node(parent) else { return false };
-    let constrains = p.layout.is_none() || absolute;
-    let resized = p.overrides.contains("size")
-        || match &p.kind {
-            NodeKind::Instance { component, .. } => {
-                doc.node(*component).is_none_or(|m| (m.width - p.width).abs() > 1e-9 || (m.height - p.height).abs() > 1e-9)
-            }
-            _ => false,
-        };
-    !(constrains && resized) && follows_main_geometry(doc, parent)
-}
-
-/// Copy main layer `src` (with its layers) into copy `parent` as layers mirroring them; returns the
-/// new copy (the caller places it among `parent`'s layers).
-fn copy_layers(doc: &mut Document, src: NodeId, parent: NodeId) -> Option<NodeId> {
-    let sub = doc.subtree(src);
-    let map: BTreeMap<NodeId, NodeId> = sub.iter().map(|d| (*d, doc.alloc_id())).collect();
-    for d in &sub {
-        let mut n = doc.node(*d)?.clone();
-        n.id = *map.get(d)?;
-        n.parent = if *d == src { Some(parent) } else { n.parent.and_then(|x| map.get(&x).copied()) };
-        n.children = n.children.iter().filter_map(|k| map.get(k).copied()).collect();
-        n.source = Some(*d);
-        n.overrides.clear();
-        n.prop_refs.clear();
-        n.annotations.clear();
-        insert_linked(doc, n).ok()?;
-    }
-    map.get(&src).copied()
-}
-
-/// Carry value-only edits of main-component layers (`seeds`: layer, groups) to every copy, through
-/// copies of copies, except where a copy overrides the group. Returns false (leaving a partial
-/// patch for the caller to rebuild over) when a copy can't follow exactly.
-fn patch_copies(doc: &mut Document, seeds: &[(NodeId, Vec<&'static str>)]) -> bool {
-    let copies = copies_index(doc);
-    let text = |g: &str| matches!(g, "characters" | "textStyle");
-    let mut work: Vec<(NodeId, Vec<&'static str>)> = seeds.to_vec();
-    let mut steps = 0usize;
-    while let Some((p, groups)) = work.pop() {
-        steps += 1;
-        if steps > 10_000_000 {
-            return false;
-        }
-        let Some(pn) = doc.node(p).cloned() else { continue };
-        for c in copies.get(&p).cloned().unwrap_or_default() {
-            let Some(cn) = doc.node(c) else { continue };
-            // A swapped nested instance shows its own main, not the layer it stands in for.
-            if let (NodeKind::Instance { component: a, .. }, NodeKind::Instance { component: b, .. }) = (&pn.kind, &cn.kind)
-                && a != b
-            {
-                continue;
-            }
-            // An instance keeps its own visibility, place, export settings and interactions; its
-            // name follows the main's unless renamed; a resized one lays its layers out against
-            // the main's size.
-            let root = matches!(pn.kind, NodeKind::Component { .. });
-            if root && ((groups.contains(&"name") && !cn.overrides.contains("name")) || (groups.contains(&"size") && cn.overrides.contains("size"))) {
-                return false;
-            }
-            let gs: Vec<&'static str> = groups
-                .iter()
-                .copied()
-                .filter(|g| !cn.overrides.contains(*g) && !(root && matches!(*g, "visible" | "name" | "position" | "exports" | "interactions")))
-                .collect();
-            if gs.is_empty() {
-                continue;
-            }
-            let geometry = gs.iter().any(|g| matches!(*g, "size" | "position"));
-            if geometry && !follows_main_geometry(doc, c) {
-                return false;
-            }
-            // Text content and style share their runs: a copy overriding one keeps its runs when the
-            // other follows the main (as a rebuild carries them).
-            let runs = match &cn.kind {
-                NodeKind::Text(t) if gs.iter().any(|g| text(g)) && cn.overrides.iter().any(|g| text(g)) => Some(t.runs.clone()),
-                _ => None,
-            };
-            if let Some(m) = doc.node_mut(c) {
-                for g in &gs {
-                    copy_group(&pn, m, g);
-                }
-                if let (Some(r), NodeKind::Text(t)) = (runs, &mut m.kind) {
-                    t.runs = r;
-                }
-            }
-            if (geometry || gs.iter().any(|g| text(g)))
-                && let Some((w, h)) = doc.node(c).and_then(figcraft_text::auto_size)
-                && doc.node(c).is_some_and(|n| (n.width - w).abs() > 1e-6 || (n.height - h).abs() > 1e-6)
-            {
-                figcraft_layout::set_size(doc, c, w, h);
-            }
-            work.push((c, gs));
-        }
-    }
-    true
-}
-
-/// Whether a copy's size and place are its main layer's: no layer around it inside its instances
-/// applies constraints on the way down to it (a resized instance or frame without auto layout, or
-/// a resized auto layout instance holding it absolutely positioned). Auto layout re-flows the rest.
-fn follows_main_geometry(doc: &Document, id: NodeId) -> bool {
-    let chain = scope(doc, id);
-    chain.windows(2).all(|w| {
-        let (Some(below), Some(a)) = (w.first().and_then(|i| doc.node(*i)), w.get(1).and_then(|i| doc.node(*i))) else { return false };
-        let constrains = a.layout.is_none() || below.child_layout.absolute;
-        if a.overrides.contains("size") && constrains {
-            return false;
-        }
-        match &a.kind {
-            NodeKind::Instance { component, .. } => {
-                !constrains || doc.node(*component).is_some_and(|m| (m.width - a.width).abs() <= 1e-9 && (m.height - a.height).abs() <= 1e-9)
-            }
-            _ => true,
-        }
-    })
-}
-
-/// Rebuild every instance of `comps` (and of the components that hold those instances, and so on
-/// outwards), each outermost instance once, inner components first.
-fn rebuild_instances(doc: &mut Document, comps: &BTreeSet<NodeId>) {
-    if comps.is_empty() {
-        return;
-    }
-    // Outermost instances by the components their layers instantiate.
-    let mut roots_of: BTreeMap<NodeId, BTreeSet<NodeId>> = BTreeMap::new();
-    for n in doc.nodes() {
-        if let NodeKind::Instance { component, .. } = &n.kind {
-            roots_of.entry(*component).or_default().insert(root_instance(doc, n.id).unwrap_or(n.id));
-        }
-    }
-    // Affected components, with how deep their dependencies go (an instance inside component X of
-    // component Y: X follows Y).
-    let mut level: BTreeMap<NodeId, usize> = comps.iter().map(|c| (*c, 0)).collect();
-    let mut outer: BTreeMap<NodeId, Option<NodeId>> = BTreeMap::new();
-    let mut frontier: Vec<NodeId> = comps.iter().copied().collect();
-    let mut rounds = 0;
-    while !frontier.is_empty() && rounds < 64 {
-        rounds += 1;
-        let mut next = Vec::new();
-        for c in frontier {
-            let lc = level.get(&c).copied().unwrap_or(0);
-            for r in roots_of.get(&c).into_iter().flatten() {
-                let o = *outer.entry(*r).or_insert_with(|| owning_component(doc, *r));
-                if let Some(x) = o
-                    && x != c
-                {
-                    let lx = level.entry(x).or_insert(0);
-                    if *lx < lc + 1 {
-                        *lx = lc + 1;
-                        next.push(x);
-                    }
-                }
-            }
-        }
-        frontier = next;
-    }
-    // Instances inside components by level, then the rest (each once).
-    let mut order: Vec<(usize, NodeId)> = outer.iter().map(|(r, o)| (o.and_then(|x| level.get(&x).copied()).unwrap_or(usize::MAX), *r)).collect();
-    order.sort();
-    for (_, r) in order {
-        if doc.contains(r) {
-            sync_instance(doc, r);
-        }
-    }
-}
-
-/// Slot `slot` (inside an instance) takes the instance's own content: the layers it shows (the
-/// main's default content until now) stop mirroring the main, and instances among them stand
-/// alone, linked to their own mains.
-fn own_slot_content(doc: &mut Document, slot: NodeId) {
-    if let Some(n) = doc.node_mut(slot) {
-        n.overrides.insert(SLOT.into());
-    }
-    for nested in unlink_layers(doc, slot, None) {
-        rebase_instance(doc, nested);
-    }
-}
-
-/// Unlink the layers below `top` that are layers of `owner` (an instance, or `None` for the
-/// content of a slot): plain layers forget the main layer they mirrored and their property
-/// bindings. The instances among them are returned, to re-link to their own mains (with
-/// [`rebase_instance`]) once the caller is done.
-pub fn unlink_layers(doc: &mut Document, top: NodeId, owner: Option<NodeId>) -> Vec<NodeId> {
-    let picked: Vec<(NodeId, bool)> =
-        doc.subtree(top).into_iter().filter(|d| *d != top && enclosing_instance(doc, *d) == owner).map(|d| (d, is_instance(doc, d))).collect();
-    let mut nested = Vec::new();
-    for (d, instance) in picked {
-        let Some(n) = doc.node_mut(d) else { continue };
-        n.prop_refs.clear();
-        if instance {
-            nested.push(d);
-        } else {
-            n.source = None;
-            n.overrides.clear();
-        }
-    }
-    nested
-}
-
-/// A new layer copied from inside an instance (pasted, duplicated) to where no instance owns it
-/// stops mirroring the main; a copied nested instance is re-linked to its own main (its look kept).
-fn relink_copy(doc: &mut Document, id: NodeId) {
-    let Some(n) = doc.node(id) else { return };
-    match &n.kind {
-        NodeKind::Instance { component, .. } => {
-            let main_ok = doc.node(*component).is_some_and(|m| matches!(m.kind, NodeKind::Component { .. }));
-            if main_ok && !inside_instance(doc, id) && (n.source != Some(*component) || !instance_issues(doc, id).is_empty()) {
-                rebase_instance(doc, id);
-            }
-        }
-        _ => {
-            if (n.source.is_some() || !n.overrides.is_empty())
-                && owning_instance(doc, id).is_none()
-                && let Some(m) = doc.node_mut(id)
-            {
-                m.source = None;
-                m.overrides.clear();
-            }
-        }
-    }
-}
-
-/// Refuse edits that add, remove or reorder layers inside an instance (only its main can), outside
-/// its slots.
-pub fn check_structure_edit(before: &Document, after: &Document) -> Result<(), String> {
-    for &id in after.dirty() {
-        let (Some(n), Some(b)) = (after.node(id), before.node(id)) else { continue };
-        // Library copies change only through library updates (and are read-only otherwise).
-        if n.children == b.children || after.is_remote(id) {
-            continue;
-        }
-        if structure_locked(before, id) && structure_locked(after, id) {
-            let name = owning_instance(after, id).and_then(|i| after.node(i)).map(|i| i.name.clone()).unwrap_or_default();
-            return Err(format!(
-                "layers can't be added, removed or reordered inside the instance \"{name}\": edit its main component, or detach the instance first"
-            ));
-        }
-    }
-    Ok(())
-}
-
-/// Refuse edits an instance doesn't take as overrides ([`refused_override`]); the edit is rolled
-/// back.
-pub fn check_override_edit(before: &Document, after: &Document) -> Result<(), String> {
-    match after.dirty().iter().find_map(|id| refused_override(before, after, *id)) {
-        Some(what) => Err(format!("{what} comes from the main component in an instance: edit the main component, or detach the instance")),
-        None => Ok(()),
-    }
-}
-
-/// What about layer `id` an edit from `before` to `after` changed that only its main can: the
-/// auto layout of an instance or a layer in one but its padding, gap and alignment, or the
-/// position (rotation too), size, constraints or resizing of a layer inside an instance (the
-/// instance itself resizes, and its layers follow; text whose box follows its content still
-/// does). `None` when the edit is fine, also when the main changed the same way in this edit (a
-/// library update).
-pub fn refused_override(before: &Document, after: &Document, id: NodeId) -> Option<&'static str> {
-    let (n, b) = (after.node(id)?, before.node(id)?);
-    if after.is_remote(id) || n.source != b.source || owning_instance(before, id).is_none() || owning_instance(after, id).is_none() {
-        return None;
-    }
-    let (mb, ma) = (before.node(n.source?)?, after.node(n.source?)?);
-    let mode = |x: &Node| x.layout.as_ref().map(|l| l.mode);
-    // Auto layout settings other than the overridable ones.
-    let settings = |x: &Node| {
-        x.layout.clone().map(|mut l| {
-            (l.gap, l.cross_gap, l.padding, l.main_align, l.cross_align) = (0.0, 0.0, [0.0; 4], MainAlign::Min, CrossAlign::Min);
-            l.content_align = ContentAlign::Auto;
-            l
-        })
-    };
-    let size = |x: &Node| (x.width, x.height);
-    let resized = |x: &Node, y: &Node| (x.width - y.width).abs() > 1e-6 || (x.height - y.height).abs() > 1e-6;
-    if mode(n) != mode(b) && mode(ma) == mode(mb) {
-        return Some("The auto layout direction");
-    }
-    if settings(n) != settings(b) && settings(ma) == settings(mb) {
-        return Some("This auto layout setting");
-    }
-    if !inside_instance(after, id) || !inside_instance(before, id) {
-        return None;
-    }
-    if n.transform != b.transform && ma.transform == mb.transform && !geometry_derived(after, before, id, "position") {
-        return Some("A layer's position");
-    }
-    if resized(n, b) && size(ma) == size(mb) && !geometry_derived(after, before, id, "size") {
-        return Some("A layer's size");
-    }
-    if n.constraints != b.constraints && ma.constraints == mb.constraints {
-        return Some("A layer's constraints");
-    }
-    if n.child_layout != b.child_layout && ma.child_layout == mb.child_layout {
-        return Some("A layer's resizing");
-    }
-    None
-}
-
-/// Re-derive `source` links and overrides of instance `inst` against its own main by comparing
-/// values (after detaching an outer instance, restoring a main, or copying a nested instance out):
-/// the look is kept exactly. Values a component property sets aren't overrides.
-pub fn rebase_instance(doc: &mut Document, inst: NodeId) {
-    let Some(NodeKind::Instance { component, .. }) = doc.node(inst).map(|n| n.kind.clone()) else { return };
-    let mine = path_map(doc, inst, true);
-    let theirs: BTreeMap<String, NodeId> =
-        if doc.contains(component) { path_map(doc, component, false).into_iter().map(|(k, v)| (v, k)).collect() } else { BTreeMap::new() };
-    let value_groups = |a: &Node, b: &Node| -> Vec<String> {
-        diff_groups(a, b).into_iter().filter(|g| !matches!(*g, "size" | "position")).map(str::to_string).collect()
-    };
-    let mut updates = Vec::new();
-    for (id, path) in &mine {
-        let Some(n) = doc.node(*id) else { continue };
-        // Follow the source chain into the main first (exact), then fall back to the name path.
-        let mut main = None;
-        let mut cur = n.source;
-        for _ in 0..MAX_DEPTH {
-            let Some(c) = cur else { break };
-            if c != component && doc.contains(c) && doc.is_ancestor(component, c) {
-                main = Some(c);
-                break;
-            }
-            cur = doc.node(c).and_then(|x| x.source);
-        }
-        let main = main.or_else(|| theirs.get(path).copied());
-        let mut overrides: BTreeSet<String> = n.overrides.iter().filter(|g| !matches!(g.as_str(), "component" | "props")).cloned().collect();
-        if let Some(m) = main.and_then(|m| doc.node(m)) {
-            let mut bound: Vec<&str> = m.prop_refs.keys().map(|f| field_group(f)).collect();
-            bound.extend(variable_groups(n, m));
-            overrides.extend(value_groups(m, n).into_iter().filter(|g| !bound.contains(&g.as_str())));
-            if matches!((&m.kind, &n.kind), (NodeKind::Instance { component: a, .. }, NodeKind::Instance { component: b, .. }) if a != b) {
-                overrides.insert("component".into());
-            }
-        }
-        updates.push((*id, main, overrides));
-    }
-    for (id, main, overrides) in updates {
-        if let Some(n) = doc.node_mut(id) {
-            n.source = main;
-            n.overrides = if main.is_some() { overrides } else { BTreeSet::new() };
-        }
-    }
-    let root_groups = match (doc.node(component), doc.node(inst)) {
-        (Some(m), Some(n)) => {
-            let from_variables = variable_groups(n, m);
-            let mut groups: Vec<String> = value_groups(m, n)
-                .into_iter()
-                .filter(|g| !matches!(g.as_str(), "name" | "exports" | "interactions") && !from_variables.contains(&g.as_str()))
-                .collect();
-            // A layer name of its own (a nested instance renamed in its old main) stays.
-            if n.name != default_instance_name(doc, component) {
-                groups.push("name".into());
-            }
-            groups
-        }
-        _ => Vec::new(),
-    };
-    if let Some(n) = doc.node_mut(inst) {
-        n.source = Some(component);
-        n.overrides.retain(|g| !matches!(g.as_str(), "component" | "props" | "position"));
-        n.overrides.extend(root_groups);
-    }
-}
-
-/// A set's default variant: the one in its top-left corner (nearest to it, then the top-most, then
-/// the left-most).
-pub fn default_variant(doc: &Document, set: NodeId) -> Option<NodeId> {
-    let corner = |c: &NodeId| {
-        doc.node(*c).filter(|n| matches!(n.kind, NodeKind::Component { .. })).map(|n| n.transform.as_coeffs()).map(|[.., x, y]| (x + y, y, x))
-    };
-    let kids = &doc.node(set)?.children;
-    kids.iter()
-        .copied()
-        .filter_map(|c| corner(&c).map(|k| (k, c)))
-        .min_by(|(a, _), (b, _)| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
-        .map(|(_, c)| c)
-}
-
-/// Variants of a set sharing one combination of property values (each group two or more, in
-/// layer order): a conflict to resolve by giving each a unique combination.
-pub fn variant_conflicts(doc: &Document, set: NodeId) -> Vec<Vec<NodeId>> {
-    let mut by: BTreeMap<BTreeMap<String, String>, Vec<NodeId>> = BTreeMap::new();
-    for c in doc.node(set).map(|s| s.children.clone()).unwrap_or_default() {
-        if let Some(n) = doc.node(c).filter(|n| matches!(n.kind, NodeKind::Component { .. })) {
-            by.entry(variant_props(&n.name)).or_default().push(c);
-        }
-    }
-    by.into_values().filter(|v| v.len() > 1).collect()
-}
-
-/// Parse a variant name "Size=Large, State=Hover" into pairs.
-pub fn variant_props(name: &str) -> BTreeMap<String, String> {
-    name.split(',')
-        .filter_map(|kv| {
-            let (k, v) = kv.split_once('=')?;
-            Some((k.trim().to_string(), v.trim().to_string()))
-        })
-        .collect()
-}
-
-/// Format variant pairs as a layer name, in the given property order (others after, sorted).
-pub fn variant_name(pairs: &BTreeMap<String, String>, order: &[String]) -> String {
-    let mut keys: Vec<&String> = order.iter().filter(|k| pairs.contains_key(*k)).collect();
-    keys.extend(pairs.keys().filter(|k| !order.contains(k)));
-    keys.iter().filter_map(|k| pairs.get(*k).map(|v| format!("{k}={v}"))).collect::<Vec<_>>().join(", ")
-}
-
-/// Variant properties of a set: property → values, in first-seen order.
-pub fn variant_options(doc: &Document, set: NodeId) -> Vec<(String, Vec<String>)> {
-    let mut out: Vec<(String, Vec<String>)> = Vec::new();
-    for c in doc.node(set).map(|s| s.children.clone()).unwrap_or_default() {
-        let Some(cn) = doc.node(c) else { continue };
-        for kv in cn.name.split(',') {
-            let Some((k, v)) = kv.split_once('=') else { continue };
-            let (k, v) = (k.trim().to_string(), v.trim().to_string());
-            match out.iter_mut().find(|(p, _)| *p == k) {
-                Some((_, vals)) => {
-                    if !vals.contains(&v) {
-                        vals.push(v);
-                    }
-                }
-                None => out.push((k, vec![v])),
-            }
-        }
-    }
-    out
-}
-
-/// The variant in `set` matching `wanted` best: all given properties equal, or else the most.
-pub fn find_variant(doc: &Document, set: NodeId, wanted: &BTreeMap<String, String>) -> Option<NodeId> {
-    let s = doc.node(set)?;
-    let score = |c: &NodeId| doc.node(*c).map(|n| variant_props(&n.name)).map(|p| wanted.iter().filter(|(k, v)| p.get(*k) == Some(*v)).count());
-    if let Some(exact) = s.children.iter().copied().find(|c| score(c) == Some(wanted.len())) {
-        return Some(exact);
-    }
-    s.children.iter().copied().filter(|c| score(c).is_some()).max_by_key(|c| score(c).unwrap_or(0))
-}
-
-/// Check that every instance mirrors its main's layer structure (tests and diagnostics): each
-/// layer's `source` is the main layer at the same place, swapped nested instances mirror their
-/// own main, slots holding the instance's own content aren't compared. Returns the problems found.
-pub fn mirror_issues(doc: &Document) -> Vec<String> {
-    doc.nodes()
-        .filter(|n| matches!(n.kind, NodeKind::Instance { .. }) && !inside_instance(doc, n.id))
-        .flat_map(|n| instance_issues(doc, n.id))
-        .collect()
-}
-
-/// [`mirror_issues`] for one instance.
-fn instance_issues(doc: &Document, id: NodeId) -> Vec<String> {
-    fn walk(doc: &Document, inst: &Node, main: &Node, depth: usize, out: &mut Vec<String>) {
-        if depth > MAX_DEPTH || holds_content(inst) {
-            return;
-        }
-        if inst.children.len() != main.children.len() {
-            out.push(format!("{} has {} layers, its main {} has {}", inst.id, inst.children.len(), main.id, main.children.len()));
-            return;
-        }
-        for (a, b) in inst.children.iter().zip(&main.children) {
-            let (Some(an), Some(bn)) = (doc.node(*a), doc.node(*b)) else { continue };
-            if an.source != Some(bn.id) {
-                out.push(format!("{} mirrors {:?}, expected {}", an.id, an.source, bn.id));
-                continue;
-            }
-            match (&an.kind, &bn.kind) {
-                (NodeKind::Instance { component: x, .. }, NodeKind::Instance { component: y, .. }) if x != y => {
-                    if let Some(m) = doc.node(*x) {
-                        walk(doc, an, m, depth + 1, out);
-                    }
-                }
-                _ => walk(doc, an, bn, depth + 1, out),
-            }
-        }
-    }
-    let mut out = Vec::new();
-    if let Some(n) = doc.node(id)
-        && let NodeKind::Instance { component, .. } = &n.kind
-        && let Some(m) = doc.node(*component)
-    {
-        walk(doc, n, m, 0, &mut out);
-    }
-    out
-}
-
-#[cfg(test)]
-#[path = "components_tests.rs"]
-pub(crate) mod tests;
-
-/// The nested instance copies inside instance `id` whose main-component counterpart is exposed
-/// (top-most first; an exposed instance's own exposed nested instances follow it).
-pub fn exposed_copies(doc: &Document, id: NodeId) -> Vec<NodeId> {
-    let mut out = Vec::new();
-    let mut stack: Vec<NodeId> = doc.node(id).map(|n| n.children.iter().rev().copied().collect()).unwrap_or_default();
-    let mut seen = 0usize;
-    while let Some(c) = stack.pop() {
-        seen += 1;
-        if seen > 100_000 {
-            break;
-        }
-        let Some(n) = doc.node(c) else { continue };
-        // A hidden exposed instance hides its properties too.
-        let exposed =
-            n.visible && matches!(n.kind, NodeKind::Instance { .. }) && n.source.and_then(|src| doc.node(src)).is_some_and(|src| src.exposed);
-        if exposed {
-            out.push(c);
-        }
-        // Only exposed nested instances pass their own exposed instances up.
-        if !matches!(n.kind, NodeKind::Instance { .. }) || exposed {
-            stack.extend(n.children.iter().rev().copied());
-        }
-    }
-    out
-}
diff --git a/crates/engine/src/components_behaviour_tests.rs b/crates/engine/src/components_behaviour_tests.rs
index 325ccdee..a95e1268 100644
--- a/crates/engine/src/components_behaviour_tests.rs
+++ b/crates/engine/src/components_behaviour_tests.rs
@@ -82,6 +82,179 @@ fn text(n: &Node) -> &TextData {
     n.kind.text().unwrap()
 }
 
+#[test]
+fn copying_a_main_component_pastes_a_linked_instance() {
+    for command in ["edit.paste", "edit.pasteOver", "edit.pasteReplace"] {
+        let mut s = Session::new();
+        let k = kit(&mut s);
+        ex(&mut s, "select.set", json!({"ids": [k.card]}));
+        ex(&mut s, "edit.copy", json!({}));
+        if command != "edit.paste" {
+            ex(&mut s, "select.set", json!({"ids": [k.inst]}));
+        }
+        let before = undo_len(&s);
+        let pasted = crate::params::id_of(&ex(&mut s, command, json!({}))["ids"][0]).unwrap();
+        assert_eq!(component_of(&s, pasted), k.card, "{command}");
+        assert_eq!(node(&s, pasted).parent, Some(s.page().unwrap()));
+        assert_eq!(node(&s, pasted).source, Some(k.card));
+        assert_eq!(undo_len(&s), before + 1);
+        ex(&mut s, "edit.undo", json!({}));
+        assert!(s.doc().unwrap().node(pasted).is_none());
+        ex(&mut s, "edit.redo", json!({}));
+        assert_eq!(component_of(&s, pasted), k.card);
+        ex(&mut s, "node.set", json!({"id": k.title, "props": {"characters": "Updated"}}));
+        assert_eq!(chars(&s, copy_of(&s, pasted, k.title)), "Updated");
+        healthy(&s);
+    }
+}
+
+#[test]
+fn copying_a_variant_pastes_an_instance_but_copying_its_set_keeps_the_components() {
+    let mut s = Session::new();
+    let (set, _, hover) = button_set(&mut s);
+    ex(&mut s, "select.set", json!({"ids": [hover]}));
+    ex(&mut s, "edit.copy", json!({}));
+    let pasted = crate::params::id_of(&ex(&mut s, "edit.paste", json!({}))["ids"][0]).unwrap();
+    assert_eq!(component_of(&s, pasted), hover);
+    assert_eq!(node(&s, pasted).name, node(&s, set).name);
+    let NodeKind::Instance { props, .. } = &node(&s, pasted).kind else { panic!("pasted variant is not an instance") };
+    assert_eq!(chars(&s, layer(&s, pasted, "Label").unwrap()), "Hover");
+    assert_eq!(props["Show dot"], true);
+    assert_eq!(node(&s, pasted).parent, Some(s.page().unwrap()));
+
+    ex(&mut s, "select.set", json!({"ids": [set]}));
+    ex(&mut s, "edit.copy", json!({}));
+    let copied_set = crate::params::id_of(&ex(&mut s, "edit.paste", json!({}))["ids"][0]).unwrap();
+    assert!(matches!(node(&s, copied_set).kind, NodeKind::ComponentSet { .. }));
+    assert_eq!(node(&s, copied_set).parent, Some(s.page().unwrap()));
+    assert_eq!(kids(&s, copied_set).len(), 2);
+    for variant in kids(&s, copied_set) {
+        assert!(matches!(node(&s, variant).kind, NodeKind::Component { .. }));
+        assert!(!kids(&s, set).contains(&variant));
+    }
+    healthy(&s);
+}
+
+#[test]
+fn cut_components_and_components_copied_to_another_file_remain_components() {
+    for (copy, undo_cut, new_file) in [("edit.cut", false, false), ("edit.cut", true, false), ("edit.copy", false, true)] {
+        let mut s = Session::new();
+        let k = kit(&mut s);
+        ex(&mut s, copy, json!({"ids": [k.card]}));
+        if undo_cut {
+            ex(&mut s, "edit.undo", json!({}));
+        }
+        if new_file {
+            ex(&mut s, "file.new", json!({}));
+        }
+        let page = s.page().unwrap();
+        let pasted = crate::params::id_of(&ex(&mut s, "edit.paste", json!({"parent": page}))["ids"][0]).unwrap();
+        assert!(matches!(node(&s, pasted).kind, NodeKind::Component { .. }), "{copy}, undo={undo_cut}, new_file={new_file}");
+        assert_eq!(kids(&s, pasted).len(), 3);
+        healthy(&s);
+    }
+}
+
+#[test]
+fn copying_a_component_does_not_link_to_an_id_reused_after_undo() {
+    let mut s = Session::new();
+    let frame = idv(&ex(&mut s, "frame.create", json!({"width": 120, "height": 60, "name": "Copied main"})));
+    let main = idv(&ex(&mut s, "component.create", json!({"ids": [frame]})));
+    ex(&mut s, "edit.copy", json!({"ids": [main]}));
+    s.undo().unwrap();
+    s.undo().unwrap();
+    let other = idv(&ex(&mut s, "frame.create", json!({"width": 300, "height": 200, "name": "Unrelated main"})));
+    ex(&mut s, "component.create", json!({"ids": [other]}));
+    assert_eq!(other, main, "undo makes the original id available again");
+    let page = s.page().unwrap();
+    let pasted = crate::params::id_of(&ex(&mut s, "edit.paste", json!({"parent": page}))["ids"][0]).unwrap();
+    assert_eq!(node(&s, pasted).name, "Copied main");
+    assert_eq!((node(&s, pasted).width, node(&s, pasted).height), (120.0, 60.0));
+    assert!(matches!(node(&s, pasted).kind, NodeKind::Component { .. }));
+    healthy(&s);
+}
+
+#[test]
+fn pasted_component_instances_keep_the_copied_transform_in_the_target_frame() {
+    let mut s = Session::new();
+    let k = kit(&mut s);
+    ex(&mut s, "node.set", json!({"id": k.card, "props": {"rotation": 30}}));
+    let original = s.doc().unwrap().world_transform(k.card);
+    let frame = idv(&ex(&mut s, "frame.create", json!({"x": -100, "y": -100, "width": 1000, "height": 1000})));
+    ex(&mut s, "edit.copy", json!({"ids": [k.card]}));
+    let pasted = crate::params::id_of(&ex(&mut s, "edit.paste", json!({"parent": frame}))["ids"][0]).unwrap();
+    assert_eq!(component_of(&s, pasted), k.card);
+    for (actual, expected) in s.doc().unwrap().world_transform(pasted).as_coeffs().into_iter().zip(original.as_coeffs()) {
+        assert!((actual - expected).abs() < 1e-9);
+    }
+    assert_eq!(node(&s, pasted).parent, Some(frame));
+    let before = s.doc().unwrap().clone();
+    assert!(s.execute("edit.paste", &json!({"parent": k.card})).is_err());
+    assert_eq!(s.doc().unwrap(), &before, "pasting into the main is refused atomically");
+    healthy(&s);
+}
+
+#[test]
+fn duplicating_a_main_component_makes_a_linked_instance() {
+    for rename in [false, true] {
+        let mut s = Session::new();
+        ex(&mut s, "pref.renameDuplicates", json!({"on": rename}));
+        let k = kit(&mut s);
+        let rect = idv(&ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 300, "width": 50, "height": 50, "props": {"name": "Box"}})));
+        let before = s.doc().unwrap().clone();
+        let out = ex(&mut s, "edit.duplicate", json!({"ids": [k.card, rect]}));
+        let ids: Vec<NodeId> = out["ids"].as_array().unwrap().iter().filter_map(crate::params::id_of).collect();
+        assert_eq!(s.selection(), ids);
+        let copy = *ids.iter().find(|i| matches!(node(&s, **i).kind, NodeKind::Instance { .. })).expect("the main's copy is an instance");
+        assert_eq!(component_of(&s, copy), k.card);
+        assert_eq!(node(&s, copy).name, "Card", "instances keep their default name (rename={rename})");
+        assert_eq!(node(&s, copy).parent, Some(s.page().unwrap()));
+        let (b, c) = (s.doc().unwrap().world_bounds(k.card).unwrap(), s.doc().unwrap().world_bounds(copy).unwrap());
+        assert_eq!((c.x0, c.y0, c.width(), c.height()), (b.x1 + 100.0, b.y0, b.width(), b.height()), "a top-level frame's offset");
+        let other = *ids.iter().find(|i| **i != copy).unwrap();
+        assert!(matches!(node(&s, other).kind, NodeKind::Rectangle), "other layers are still copied");
+        ex(&mut s, "node.set", json!({"id": k.title, "props": {"characters": "Updated"}}));
+        assert_eq!(chars(&s, copy_of(&s, copy, k.title)), "Updated", "the instance follows its main");
+        ex(&mut s, "edit.undo", json!({}));
+        ex(&mut s, "edit.undo", json!({}));
+        assert_eq!(*s.doc().unwrap(), before, "undo restores exactly");
+        healthy(&s);
+    }
+}
+
+#[test]
+fn alt_dragging_a_main_component_copies_an_instance() {
+    use crate::tools::{PointerEvent, PointerKind};
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100, "name": "Tile"})));
+    let main = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    let ev = |kind, x| PointerEvent { alt: true, ..PointerEvent::at(kind, x, 50.0, 1.0) };
+    s.pointer(&ev(PointerKind::Down, 50.0)).unwrap();
+    s.pointer(&ev(PointerKind::Move, 150.0)).unwrap();
+    s.pointer(&ev(PointerKind::Move, 250.0)).unwrap();
+    s.pointer(&ev(PointerKind::Up, 250.0)).unwrap();
+    let [copy] = s.selection()[..] else { panic!("one copy selected") };
+    assert_eq!(component_of(&s, copy), main);
+    assert_eq!(s.doc().unwrap().world_bounds(copy).unwrap().x0, 200.0);
+    assert_eq!(s.doc().unwrap().world_bounds(main).unwrap().x0, 0.0, "the main stays");
+    healthy(&s);
+}
+
+#[test]
+fn duplicating_a_variant_adds_a_variant_to_its_set() {
+    let mut s = Session::new();
+    let (set, _, hover) = button_set(&mut s);
+    let copy = crate::params::id_of(&ex(&mut s, "edit.duplicate", json!({"ids": [hover]}))["ids"][0]).unwrap();
+    assert!(matches!(node(&s, copy).kind, NodeKind::Component { .. }));
+    assert_eq!(node(&s, copy).parent, Some(set));
+    assert_eq!(kids(&s, set).len(), 3);
+    // A whole set duplicates as a new set of variants.
+    let set2 = crate::params::id_of(&ex(&mut s, "edit.duplicate", json!({"ids": [set]}))["ids"][0]).unwrap();
+    assert!(matches!(node(&s, set2).kind, NodeKind::ComponentSet { .. }));
+    assert!(kids(&s, set2).iter().all(|v| matches!(node(&s, *v).kind, NodeKind::Component { .. })));
+    healthy(&s);
+}
+
 #[test]
 fn overridable_properties_stay_through_main_edits_and_reset() {
     // (what, layer, group, override on the instance, the same property edited on the main, read,
@@ -316,14 +489,6 @@ fn what_instances_cannot_override_is_refused() {
         ("nudge a layer", "transform.nudge", json!({"ids": ["$"], "dx": 1, "dy": 0}), Layer::Bg, "position"),
         ("rotate a layer", "node.set", json!({"id": "$", "props": {"rotation": 15}}), Layer::Bg, "position and rotation come with the layer's place"),
         ("flip a layer", "object.flipH", json!({"ids": ["$"]}), Layer::Bg, "position"),
-        (
-            "resize a layer",
-            "node.set",
-            json!({"id": "$", "props": {"width": 50}}),
-            Layer::Bg,
-            "not among the overridable properties; the instance resizes",
-        ),
-        ("resize a text box", "node.set", json!({"id": "$", "props": {"width": 150}}), Layer::Title, "\"the bounds of any text layers\""),
         (
             "change constraints",
             "node.set",
@@ -331,13 +496,6 @@ fn what_instances_cannot_override_is_refused() {
             Layer::Bg,
             "\"any constraints applied to the layers\"",
         ),
-        (
-            "make a layer fill its auto layout",
-            "node.set",
-            json!({"id": "$", "props": {"sizingH": "fill"}}),
-            Layer::Chip,
-            "resizing comes with the layer's size",
-        ),
         (
             "take a layer out of auto layout",
             "node.set",
@@ -499,6 +657,64 @@ fn switching_variants_keeps_overrides_where_the_variants_agreed() {
     healthy(&s);
 }
 
+/// A "Layout" set: Row (horizontal, hugging, a 40 wide "A") and Stacked (vertical, fixed 300 wide,
+/// "A" filling it). Returns (set, row, stacked).
+fn layout_set(s: &mut Session) -> (NodeId, NodeId, NodeId) {
+    let mut variants = Vec::new();
+    for (k, (name, props, child)) in [
+        ("Layout=Row", json!({"layout": "horizontal", "gap": 8, "sizingH": "hug", "sizingV": "hug", "fills": []}), json!({})),
+        (
+            "Layout=Stacked",
+            json!({"layout": "vertical", "gap": 8, "sizingH": "fixed", "width": 300, "sizingV": "hug", "fills": []}),
+            json!({"sizingH": "fill"}),
+        ),
+    ]
+    .into_iter()
+    .enumerate()
+    {
+        let c = idv(&ex(s, "node.create", json!({"type": "component", "name": name, "x": k as f64 * 400.0, "props": props})));
+        ex(s, "node.create", json!({"type": "rectangle", "parent": c, "name": "A", "width": 40, "height": 20, "props": child}));
+        variants.push(c);
+    }
+    let set = idv(&ex(s, "component.combineVariants", json!({"ids": variants.clone()})));
+    (set, variants[0], variants[1])
+}
+
+#[test]
+fn switching_variants_takes_the_new_variants_resizing_unless_the_instance_set_its_own() {
+    let mut s = Session::new();
+    let (set, row, stacked) = layout_set(&mut s);
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": set, "x": 0, "y": 200})));
+    assert_eq!(component_of(&s, i), row);
+    ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Layout": "Stacked"}}));
+    assert_eq!(component_of(&s, i), stacked);
+    let direct = idv(&ex(&mut s, "instance.create", json!({"component": stacked, "x": 0, "y": 400})));
+    let (n, d) = (node(&s, i), node(&s, direct));
+    assert_eq!(n.child_layout.sizing_h, Sizing::Fixed, "Row's Hug was never the instance's own: it takes Stacked's Fixed");
+    assert_eq!((n.width, n.child_layout.sizing_h), (d.width, d.child_layout.sizing_h), "the same as an instance made from Stacked");
+    let a = layer(&s, i, "A").unwrap();
+    assert_eq!((node(&s, a).child_layout.sizing_h, node(&s, a).width), (Sizing::Fill, 300.0), "A fills the 300 wide instance");
+    // Filling an auto layout parent afterwards leaves A filling, with nothing turned into an override.
+    let col = idv(&ex(
+        &mut s,
+        "node.create",
+        json!({"type": "frame", "name": "Column", "x": 600, "y": 0, "width": 500, "props": {"layout": "vertical", "sizingH": "fixed", "sizingV": "hug", "fills": []}}),
+    ));
+    ex(&mut s, "node.reparent", json!({"ids": [i], "parent": col}));
+    ex(&mut s, "node.set", json!({"ids": [i], "props": {"sizingH": "fill"}}));
+    let a = layer(&s, i, "A").unwrap();
+    assert_eq!(node(&s, a).child_layout.sizing_h, Sizing::Fill, "A still fills");
+    assert!(!node(&s, a).overrides.contains("resizing"), "A's resizing is still the main's");
+    assert_eq!(node(&s, a).width, node(&s, i).width);
+    // Resizing the instance set itself stays across a switch.
+    let own = idv(&ex(&mut s, "instance.create", json!({"component": set, "x": 0, "y": 600})));
+    ex(&mut s, "node.set", json!({"ids": [own], "props": {"minWidth": 120}}));
+    ex(&mut s, "instance.setProperties", json!({"ids": [own], "properties": {"Layout": "Stacked"}}));
+    assert_eq!(node(&s, own).child_layout.min_w, Some(120.0), "its own min width stays");
+    assert_eq!(node(&s, own).child_layout.sizing_h, Sizing::Fixed, "its sizing, still Row's, follows Stacked");
+    healthy(&s);
+}
+
 #[test]
 fn variant_combinations_order_default_and_conflicts() {
     let mut s = Session::new();
@@ -721,3 +937,35 @@ fn auto_layout_instances_follow_their_main() {
     assert_eq!(node(&s, i).child_layout.min_w, Some(80.0));
     healthy(&s);
 }
+
+#[test]
+fn a_new_component_set_is_named_after_its_first_variant() {
+    // "Button/State=Hover" groups under "Button": the set takes the path before the last '/'.
+    // A bare property name ("State=Default, Size=Small") names no set, and neither does an empty
+    // name: the set gets the next numbered default, like a new component. A plain name is kept.
+    let rows = [
+        ("Button/State=Hover", "Button", "slash-prefixed: the path before the last '/'"),
+        ("Icons/Arrow/Dir=Up", "Icons/Arrow", "nested path: everything before the last '/'"),
+        ("State=Default, Size=Small", "Component 1", "bare prop=value: not \"State\""),
+        ("", "Component 1", "empty name: the numbered default"),
+    ];
+    for (name, expected, why) in rows {
+        let mut s = Session::new();
+        let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 40, "height": 20})));
+        ex(&mut s, "node.set", json!({"id": f, "props": {"name": name}}));
+        let c = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+        assert_eq!(node(&s, c).name, name, "{why}: the variant keeps its name");
+        let set = idv(&ex(&mut s, "component.combineVariants", json!({"ids": [c]})));
+        assert_eq!(node(&s, set).name, expected, "{why}");
+        healthy(&s);
+    }
+
+    // Add variant on a lone component (a variant property on it) wraps it in a set named after it.
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 40, "height": 20, "name": "Button"})));
+    let c = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    let set = idv(&ex(&mut s, "component.addProperty", json!({"id": c, "name": "State", "type": "variant"})));
+    assert_eq!(node(&s, set).name, "Button");
+    assert_eq!(node(&s, c).name, "State=Default");
+    healthy(&s);
+}
diff --git a/crates/engine/src/components_scale_tests.rs b/crates/engine/src/components_scale_tests.rs
index c796dad8..68465932 100644
--- a/crates/engine/src/components_scale_tests.rs
+++ b/crates/engine/src/components_scale_tests.rs
@@ -747,3 +747,29 @@ fn alt_dropping_a_library_component_swaps_to_it() {
     assert!(doc.node(glyph).unwrap().overrides.is_empty());
     let _ = std::fs::remove_dir_all(dir);
 }
+
+#[test]
+fn a_fill_set_on_a_bound_instance_layer_detaches_it_as_an_override() {
+    // Without unbinding first: the explicit colour detaches the variable on the instance layer only,
+    // and stays through main edits until the override is reset.
+    let mut s = Session::new();
+    let (chip, _) = bound_chip(&mut s);
+    let i = crate::params::id_of(&ex(&mut s, "instance.create", json!({"component": chip, "x": 200, "y": 0}))["id"]).unwrap();
+    let bg = find_path(s.doc().unwrap(), i, &["Bg"]).unwrap();
+    ex(&mut s, "node.set", json!({"ids": [bg], "props": {"fill": "#ff00ff"}}));
+    let n = s.doc().unwrap().node(bg).unwrap().clone();
+    assert_eq!(n.fills[0].solid_color().unwrap().to_hex(), "FF00FF");
+    assert!(!n.bound.contains_key("fill"));
+    assert!(n.overrides.contains("fills"));
+    let main_bg = find_path(s.doc().unwrap(), chip, &["Bg"]).unwrap();
+    ex(&mut s, "node.set", json!({"ids": [main_bg], "props": {"height": 28}}));
+    ex(&mut s, "variable.set", json!({"variable": "Chip", "value": "#445566"}));
+    let doc = s.doc().unwrap();
+    healthy(doc);
+    assert_eq!(doc.node(bg).unwrap().fills[0].solid_color().unwrap().to_hex(), "FF00FF");
+    assert!(doc.node(main_bg).unwrap().bound.contains_key("fill"), "the main keeps its binding");
+    ex(&mut s, "component.resetOverride", json!({"id": bg, "group": "fills"}));
+    let n = s.doc().unwrap().node(bg).unwrap();
+    assert!(n.bound.contains_key("fill"));
+    assert_eq!(n.fills[0].solid_color().unwrap().to_hex(), "445566");
+}
diff --git a/crates/engine/src/content.rs b/crates/engine/src/content.rs
new file mode 100644
index 00000000..cf32c3eb
--- /dev/null
+++ b/crates/engine/src/content.rs
@@ -0,0 +1,5 @@
+pub mod datafill;
+pub mod synthetic;
+pub mod synthetic_ds;
+pub mod templates;
+pub mod textfit;
diff --git a/crates/engine/src/content/datafill.rs b/crates/engine/src/content/datafill.rs
new file mode 100644
index 00000000..b93e5f59
--- /dev/null
+++ b/crates/engine/src/content/datafill.rs
@@ -0,0 +1,219 @@
+//! `data.fill`: one frame repeated per row of data (a carousel, a set of posts, cards from a
+//! list): each copy gets its row's texts, colours and visibility on the layers named by the row's
+//! keys, in one undo step, and optionally each copy exported as a file. Agents make a series with
+//! one call instead of a duplicate, a lookup and an edit per layer and an export per copy.
+
+use figcraft_doc::NodeId;
+use serde_json::{Value, json};
+
+use crate::cmd::CommandSpec;
+use crate::params::{get, id, id_of, num_or, string};
+use crate::{EngineError, Result, Session, bad, spec};
+
+const CMD: &str = "data.fill";
+const MAX_ROWS: usize = 500;
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![spec!(
+        "data.fill",
+        "Fill copies with data",
+        "{id (the frame to repeat), rows: [{<layer name>: text | {text?, fill? (#rrggbb), visible?, fit? (true or text.fit's {maxLines?, minSize?, orphans?}: size the text to its box)}, name? (the copy's name)}] (every layer with that name in the copy; up to 500 rows), gap? (between copies, placed in a row to the right; default 100), formats? ([{name?, width, height}]: each row once per size, the copy resized so its auto layout reflows and named <name>-<format name>; e.g. feed 1080×1350, story 1080×1920, square 1080×1080), dir? (export each copy there as <name>.<format>), format? (png|jpg|webp|svg|pdf; default png), scale? (default 1)}  one undo step  → {ids (the copies, in row order), missing (keys no layer is named), files? (paths written, one per copy: same file names get a numbered suffix), errors? ([{id, path, error}] for exports that failed; the copies stay)}",
+        false,
+        fill
+    )]
+}
+
+/// A file name from a layer name: letters, digits, spaces, `-` and `_` kept, the rest `-`.
+fn file_name(name: &str) -> String {
+    let s: String = name.chars().take(80).map(|c| if c.is_alphanumeric() || matches!(c, ' ' | '-' | '_') { c } else { '-' }).collect();
+    let s = s.trim().to_string();
+    if s.is_empty() { "copy".into() } else { s }
+}
+
+fn fill(s: &mut Session, p: &Value) -> Result<Value> {
+    // Refused before any copy or file is made: a rollback afterwards wouldn't take files back.
+    if let Some(why) = s.live_read_only(s.ds()?.uid) {
+        return Err(EngineError::Disabled(CMD.into(), why.into()));
+    }
+    let src = id(p, "id").ok_or_else(|| bad(CMD, "`id` (the frame to repeat) required"))?;
+    let rows = match get(p, "rows") {
+        Some(Value::Array(a)) if a.iter().all(Value::is_object) && a.len() <= MAX_ROWS => a.clone(),
+        _ => return Err(bad(CMD, "rows: an array of objects (up to 500)")),
+    };
+    let gap = num_or(p, "gap", 100.0);
+    if !gap.is_finite() {
+        return Err(bad(CMD, "gap: a number"));
+    }
+    let format = string(p, "format").unwrap_or_else(|| "png".into()).to_ascii_lowercase();
+    if !["png", "jpg", "webp", "svg", "pdf"].contains(&format.as_str()) {
+        return Err(bad(CMD, "format: png|jpg|webp|svg|pdf"));
+    }
+    let (width, base) = {
+        let doc = s.doc()?;
+        let n = doc.node(src).ok_or_else(|| bad(CMD, "no such layer"))?;
+        (n.width, n.name.clone())
+    };
+    let formats = formats(p)?;
+    let column = formats.iter().flatten().map(|f| f.1).fold(width, f64::max);
+    let grid = Grid { src, base, column, gap };
+    let mut missing: Vec<String> = Vec::new();
+    let ids = s.grouped("Fill copies with data", |s| {
+        let mut ids = Vec::with_capacity(rows.len() * formats.len());
+        for (i, row) in rows.iter().enumerate() {
+            let mut dy = 0.0;
+            for fmt in &formats {
+                if let Some(made) = copy_row(s, &grid, (i, row), fmt.as_ref(), &mut dy, &mut missing)? {
+                    ids.push(made);
+                }
+            }
+        }
+        Ok(ids)
+    })?;
+    let mut out = json!({"ids": ids.iter().map(|(i, _)| i.0).collect::<Vec<_>>(), "missing": missing});
+    // Exports after the edits landed: a failed edit writes no files. A failed export keeps the
+    // copies (one undo step removes them) and is reported with the files that were written.
+    if let Some(dir) = string(p, "dir") {
+        export_copies(s, &ids, &dir, (&format, num_or(p, "scale", 1.0)), &mut out);
+    }
+    Ok(out)
+}
+
+/// A size the copies are made in: its name, width and height.
+type Format = (String, f64, f64);
+
+/// `formats`: each row once per size, the copy resized so its auto layout reflows (`None`: the
+/// frame's own size).
+fn formats(p: &Value) -> Result<Vec<Option<Format>>> {
+    match get(p, "formats") {
+        None | Some(Value::Null) => Ok(vec![None]),
+        Some(Value::Array(a)) if !a.is_empty() && a.len() <= 12 => a.iter().map(format_of).collect(),
+        Some(_) => Err(bad(CMD, "formats: [{name?, width, height}] (1 to 12 sizes)")),
+    }
+}
+
+/// One `formats` entry, named `<width>x<height>` when it has no name.
+fn format_of(f: &Value) -> Result<Option<Format>> {
+    let (w, h) = (f.get("width").and_then(Value::as_f64), f.get("height").and_then(Value::as_f64));
+    let name = f.get("name").and_then(Value::as_str).unwrap_or_default().trim().to_string();
+    match (w, h) {
+        (Some(w), Some(h)) if w.is_finite() && h.is_finite() && (1.0..=20_000.0).contains(&w) && (1.0..=20_000.0).contains(&h) => {
+            Ok(Some((if name.is_empty() { format!("{}x{}", w as i64, h as i64) } else { name }, w, h)))
+        }
+        _ => Err(bad(CMD, "formats: [{name?, width, height}] with sizes from 1 to 20000")),
+    }
+}
+
+/// Where the copies go: the frame repeated, its name, the column width and the gap.
+struct Grid {
+    src: NodeId,
+    base: String,
+    column: f64,
+    gap: f64,
+}
+
+/// Row `i` in format `fmt`: duplicate the frame (rows go right; a row's formats stack downwards
+/// from `dy`), name the copy and fill its layers. The copy and its name.
+fn copy_row(
+    s: &mut Session,
+    g: &Grid,
+    (i, row): (usize, &Value),
+    fmt: Option<&Format>,
+    dy: &mut f64,
+    missing: &mut Vec<String>,
+) -> Result<Option<(NodeId, String)>> {
+    let dx = (g.column + g.gap) * (i as f64 + 1.0);
+    let dup = s.execute("edit.duplicate", &json!({"ids": [g.src], "dx": dx, "dy": *dy}))?;
+    let copy = dup["ids"].get(0).and_then(id_of).ok_or_else(|| bad(CMD, "the frame couldn't be duplicated"))?;
+    let Some(fields) = row.as_object() else { return Ok(None) };
+    let name = fields.get("name").and_then(Value::as_str).map_or_else(|| format!("{} {}", g.base, i + 1), str::to_string);
+    let name = match fmt {
+        Some((suffix, w, h)) => {
+            s.execute("node.set", &json!({"id": copy, "props": {"width": w, "height": h}}))?;
+            *dy += h + g.gap;
+            format!("{name}-{suffix}")
+        }
+        None => name,
+    };
+    s.execute("node.set", &json!({"id": copy, "props": {"name": name}}))?;
+    for (key, value) in fields.iter().filter(|(k, _)| k.as_str() != "name") {
+        fill_layers(s, copy, (key, value), missing)?;
+    }
+    Ok(Some((copy, name)))
+}
+
+/// Give every layer named `key` in `copy` the row's `value`: its text, fill, visibility and fit.
+/// A key no layer has goes on `missing` (once).
+fn fill_layers(s: &mut Session, copy: NodeId, (key, value): (&str, &Value), missing: &mut Vec<String>) -> Result<()> {
+    let doc = s.doc()?;
+    let targets: Vec<_> = doc.subtree(copy).into_iter().filter(|t| *t != copy && doc.node(*t).is_some_and(|n| n.name == key)).collect();
+    if targets.is_empty() {
+        if !missing.iter().any(|m| m == key) {
+            missing.push(key.to_string());
+        }
+        return Ok(());
+    }
+    let (text, fill, visible, fit) = match value {
+        Value::Object(o) => (
+            o.get("text").map(text_of),
+            o.get("fill").and_then(Value::as_str),
+            o.get("visible").and_then(Value::as_bool),
+            o.get("fit").cloned().filter(|f| !matches!(f, Value::Bool(false) | Value::Null)),
+        ),
+        v => (Some(text_of(v)), None, None, None),
+    };
+    let mut texts = Vec::new();
+    for t in targets {
+        let is_text = s.doc()?.node(t).is_some_and(|n| matches!(n.kind, figcraft_doc::NodeKind::Text(_)));
+        if let Some(text) = text.as_ref().filter(|_| is_text) {
+            s.execute("text.set", &json!({"id": t, "characters": text}))?;
+        }
+        if is_text {
+            texts.push(t.0);
+        }
+        if let Some(f) = fill {
+            s.execute("node.set", &json!({"id": t, "props": {"fills": [f]}}))?;
+        }
+        if let Some(v) = visible {
+            s.execute("node.set", &json!({"id": t, "props": {"visible": v}}))?;
+        }
+    }
+    // `fit: true` or `{maxLines?, minSize?, orphans?}`: size the text to its box.
+    if let Some(f) = fit.filter(|_| !texts.is_empty()) {
+        let mut params = if f.is_object() { f } else { json!({}) };
+        params["ids"] = json!(texts);
+        s.execute("text.fit", &params)?;
+    }
+    Ok(())
+}
+
+/// Export each copy into `dir` as `<name>.<format>` at `scale`, adding `files` (and `errors`) to
+/// `out`.
+fn export_copies(s: &mut Session, ids: &[(NodeId, String)], dir: &str, (format, scale): (&str, f64), out: &mut Value) {
+    let (mut files, mut errors, mut used) = (Vec::new(), Vec::new(), Vec::<String>::new());
+    for (copy, name) in ids {
+        // One file per copy: same or same-looking names get " 2", " 3"… (case-insensitively,
+        // as macOS and Windows file systems compare names).
+        let base = file_name(name);
+        let stem =
+            (1..).map(|k| if k == 1 { base.clone() } else { format!("{base} {k}") }).find(|n| !used.contains(&n.to_lowercase())).unwrap_or(base);
+        used.push(stem.to_lowercase());
+        let path = std::path::Path::new(dir).join(format!("{stem}.{format}")).to_string_lossy().to_string();
+        match s.execute("file.export", &json!({"ids": [copy.0], "format": format, "scale": scale, "path": path})) {
+            Ok(_) => files.push(path),
+            Err(e) => errors.push(json!({"id": copy.0, "path": path, "error": e.to_string()})),
+        }
+    }
+    out["files"] = json!(files);
+    if !errors.is_empty() {
+        out["errors"] = json!(errors);
+    }
+}
+
+/// A cell as text: strings as they are, numbers and booleans as written, null as empty.
+fn text_of(v: &Value) -> String {
+    match v {
+        Value::String(s) => s.clone(),
+        Value::Null => String::new(),
+        v => v.to_string(),
+    }
+}
diff --git a/crates/engine/src/synthetic.rs b/crates/engine/src/content/synthetic.rs
similarity index 65%
rename from crates/engine/src/synthetic.rs
rename to crates/engine/src/content/synthetic.rs
index c2a9f5d6..d5ead671 100644
--- a/crates/engine/src/synthetic.rs
+++ b/crates/engine/src/content/synthetic.rs
@@ -28,6 +28,53 @@ fn fill(doc: &mut Document, id: NodeId, c: Color) {
     }
 }
 
+fn add_screen_header(doc: &mut Document, screen: NodeId, s: usize) -> DocResult<()> {
+    let header = doc.create(screen, NodeKind::Frame, "Header", 0.0, 0.0, SCREEN_W, 40.0)?;
+    if let Some(n) = doc.node_mut(header) {
+        n.layout = Some(AutoLayout { gap: 8.0, padding: [8.0; 4], ..AutoLayout::default() });
+        n.fills = vec![Paint::solid(Color::from_rgb8_const(0xF5, 0xF5, 0xF5))];
+    }
+    doc.create(header, text(&format!("Screen {}", s + 1)), "Title", 0.0, 0.0, 120.0, 16.0)?;
+    for k in 0..2 {
+        let icon = doc.create(header, ellipse(), &format!("Icon {}", k + 1), 0.0, 0.0, 20.0, 20.0)?;
+        fill(doc, icon, Color::from_rgb8_const(0x99, 0x99, 0x99));
+    }
+    Ok(())
+}
+
+fn add_card_group(doc: &mut Document, screen: NodeId) -> DocResult<()> {
+    let card = doc.create(screen, NodeKind::Group, "Card", 12.0, 52.0, 160.0, 64.0)?;
+    // Children are in the group's space; normalising fits the group around them.
+    let cbg = doc.create(card, NodeKind::Rectangle, "Card background", 0.0, 0.0, 160.0, 64.0)?;
+    fill(doc, cbg, Color::from_rgb8_const(0xEE, 0xF4, 0xFF));
+    doc.create(card, ellipse(), "Avatar", 8.0, 8.0, 32.0, 32.0)?;
+    doc.create(card, text("Ada Lovelace"), "Name", 48.0, 8.0, 100.0, 16.0)?;
+    doc.create(card, text("Analyst"), "Role", 48.0, 28.0, 100.0, 16.0)?;
+    Ok(())
+}
+
+fn add_screen_grid(doc: &mut Document, screen: NodeId, s: usize, rest: usize, made: &mut usize) -> DocResult<()> {
+    for k in 0..rest {
+        let (gx, gy) = (184.0 + (k % 8) as f64 * 21.0, 52.0 + (k / 8) as f64 * 34.0);
+        let hue = ((s * PER_SCREEN + k) % 360) as f32 / 360.0;
+        // The grid starts with a rectangle so even the smallest workload has one.
+        let kind = (k + 2) % 5;
+        let id = match kind {
+            0 => doc.create(screen, text(&format!("Item {k}")), "Text", gx, gy, 20.0, 14.0)?,
+            1 | 3 => doc.create(screen, ellipse(), "Ellipse", gx, gy, 18.0, 18.0)?,
+            _ => doc.create(screen, NodeKind::Rectangle, "Rectangle", gx, gy, 18.0, 18.0)?,
+        };
+        if kind != 0 {
+            fill(doc, id, Color::new(hue, 0.5, 1.0 - hue, 1.0));
+            if let Some(n) = doc.node_mut(id) {
+                n.corners.radii = [3.0; 4];
+            }
+        }
+        *made += 1;
+    }
+    Ok(())
+}
+
 /// A page of about `layers` layers (pages not counted), normalised like an opened file. Returns
 /// the document and its page.
 pub fn large_document(layers: usize) -> DocResult<(Document, NodeId)> {
@@ -53,28 +100,13 @@ pub fn large_document(layers: usize) -> DocResult<(Document, NodeId)> {
         let budget = |made: usize| layers.saturating_sub(made);
         // Auto layout header: title + two icons (4 layers).
         if budget(made) >= 4 {
-            let header = doc.create(screen, NodeKind::Frame, "Header", 0.0, 0.0, SCREEN_W, 40.0)?;
-            if let Some(n) = doc.node_mut(header) {
-                n.layout = Some(AutoLayout { gap: 8.0, padding: [8.0; 4], ..AutoLayout::default() });
-                n.fills = vec![Paint::solid(Color::from_rgb8_const(0xF5, 0xF5, 0xF5))];
-            }
-            doc.create(header, text(&format!("Screen {}", s + 1)), "Title", 0.0, 0.0, 120.0, 16.0)?;
-            for k in 0..2 {
-                let icon = doc.create(header, ellipse(), &format!("Icon {}", k + 1), 0.0, 0.0, 20.0, 20.0)?;
-                fill(&mut doc, icon, Color::from_rgb8_const(0x99, 0x99, 0x99));
-            }
+            add_screen_header(&mut doc, screen, s)?;
             made += 4;
         }
         // A card group (5 layers).
         // The card and the instances leave one layer for the grid, which starts with a rectangle.
         if budget(made) > 5 {
-            let card = doc.create(screen, NodeKind::Group, "Card", 12.0, 52.0, 160.0, 64.0)?;
-            // Children are in the group's space; normalising fits the group around them.
-            let cbg = doc.create(card, NodeKind::Rectangle, "Card background", 0.0, 0.0, 160.0, 64.0)?;
-            fill(&mut doc, cbg, Color::from_rgb8_const(0xEE, 0xF4, 0xFF));
-            doc.create(card, ellipse(), "Avatar", 8.0, 8.0, 32.0, 32.0)?;
-            doc.create(card, text("Ada Lovelace"), "Name", 48.0, 8.0, 100.0, 16.0)?;
-            doc.create(card, text("Analyst"), "Role", 48.0, 28.0, 100.0, 16.0)?;
+            add_card_group(&mut doc, screen)?;
             made += 5;
         }
         // Three button instances (3 layers each).
@@ -87,24 +119,7 @@ pub fn large_document(layers: usize) -> DocResult<(Document, NodeId)> {
         }
         // Fill the rest of the screen with a grid of shapes and text.
         let rest = PER_SCREEN.saturating_sub(4 + 5 + 9 + 1).min(budget(made));
-        for k in 0..rest {
-            let (gx, gy) = (184.0 + (k % 8) as f64 * 21.0, 52.0 + (k / 8) as f64 * 34.0);
-            let hue = ((s * PER_SCREEN + k) % 360) as f32 / 360.0;
-            // The grid starts with a rectangle so even the smallest workload has one.
-            let kind = (k + 2) % 5;
-            let id = match kind {
-                0 => doc.create(screen, text(&format!("Item {k}")), "Text", gx, gy, 20.0, 14.0)?,
-                1 | 3 => doc.create(screen, ellipse(), "Ellipse", gx, gy, 18.0, 18.0)?,
-                _ => doc.create(screen, NodeKind::Rectangle, "Rectangle", gx, gy, 18.0, 18.0)?,
-            };
-            if kind != 0 {
-                fill(&mut doc, id, Color::new(hue, 0.5, 1.0 - hue, 1.0));
-                if let Some(n) = doc.node_mut(id) {
-                    n.corners.radii = [3.0; 4];
-                }
-            }
-            made += 1;
-        }
+        add_screen_grid(&mut doc, screen, s, rest, &mut made)?;
         if budget(made) == 0 {
             break;
         }
diff --git a/crates/engine/src/synthetic_ds.rs b/crates/engine/src/content/synthetic_ds.rs
similarity index 100%
rename from crates/engine/src/synthetic_ds.rs
rename to crates/engine/src/content/synthetic_ds.rs
diff --git a/crates/engine/src/templates/mod.rs b/crates/engine/src/content/templates.rs
similarity index 100%
rename from crates/engine/src/templates/mod.rs
rename to crates/engine/src/content/templates.rs
diff --git a/crates/engine/src/templates/dashboard.rs b/crates/engine/src/content/templates/dashboard.rs
similarity index 100%
rename from crates/engine/src/templates/dashboard.rs
rename to crates/engine/src/content/templates/dashboard.rs
diff --git a/crates/engine/src/templates/design_system.rs b/crates/engine/src/content/templates/design_system.rs
similarity index 100%
rename from crates/engine/src/templates/design_system.rs
rename to crates/engine/src/content/templates/design_system.rs
diff --git a/crates/engine/src/templates/glyphs.rs b/crates/engine/src/content/templates/glyphs.rs
similarity index 100%
rename from crates/engine/src/templates/glyphs.rs
rename to crates/engine/src/content/templates/glyphs.rs
diff --git a/crates/engine/src/templates/icon_set.rs b/crates/engine/src/content/templates/icon_set.rs
similarity index 100%
rename from crates/engine/src/templates/icon_set.rs
rename to crates/engine/src/content/templates/icon_set.rs
diff --git a/crates/engine/src/templates/kit.rs b/crates/engine/src/content/templates/kit.rs
similarity index 99%
rename from crates/engine/src/templates/kit.rs
rename to crates/engine/src/content/templates/kit.rs
index 4ad5b11a..39bd248b 100644
--- a/crates/engine/src/templates/kit.rs
+++ b/crates/engine/src/content/templates/kit.rs
@@ -216,7 +216,7 @@ impl Kit {
     pub fn variables(&mut self, collection: &str, modes: &[&str], vars: Vec<(&str, &str, Vec<Value>)>) -> Result<()> {
         self.run("variable.createCollection", json!({"name": collection, "modes": modes}))?;
         for (name, kind, values) in vars {
-            let values: Map<String, Value> = modes.iter().map(|m| m.to_string()).zip(values).collect();
+            let values: Map<String, Value> = modes.iter().map(ToString::to_string).zip(values).collect();
             self.run("variable.create", json!({"collection": collection, "name": name, "type": kind, "values": values}))?;
         }
         Ok(())
diff --git a/crates/engine/src/templates/landing.rs b/crates/engine/src/content/templates/landing.rs
similarity index 100%
rename from crates/engine/src/templates/landing.rs
rename to crates/engine/src/content/templates/landing.rs
diff --git a/crates/engine/src/templates/mobile.rs b/crates/engine/src/content/templates/mobile.rs
similarity index 100%
rename from crates/engine/src/templates/mobile.rs
rename to crates/engine/src/content/templates/mobile.rs
diff --git a/crates/engine/src/templates/slides.rs b/crates/engine/src/content/templates/slides.rs
similarity index 100%
rename from crates/engine/src/templates/slides.rs
rename to crates/engine/src/content/templates/slides.rs
diff --git a/crates/engine/src/templates/social.rs b/crates/engine/src/content/templates/social.rs
similarity index 100%
rename from crates/engine/src/templates/social.rs
rename to crates/engine/src/content/templates/social.rs
diff --git a/crates/engine/src/templates/wireframe.rs b/crates/engine/src/content/templates/wireframe.rs
similarity index 100%
rename from crates/engine/src/templates/wireframe.rs
rename to crates/engine/src/content/templates/wireframe.rs
diff --git a/crates/engine/src/content/textfit.rs b/crates/engine/src/content/textfit.rs
new file mode 100644
index 00000000..f9d549e4
--- /dev/null
+++ b/crates/engine/src/content/textfit.rs
@@ -0,0 +1,141 @@
+//! `text.fit`: text sized to fit its box, for posts and cards whose copy changes (a carousel
+//! filled from data, a translated headline). The largest font size, down to a floor, at which the
+//! text stays within `maxLines` lines and its box's height; then a last line that is a single word
+//! (an orphan) is avoided by shrinking a little more, else by keeping the last two words together
+//! with a no-break space. Every style run scales by the same factor, so mixed sizes keep their
+//! proportions.
+
+use figcraft_doc::{NodeKind, TextAutoResize, TextData};
+use serde_json::{Value, json};
+
+use crate::cmd::CommandSpec;
+use crate::params::{boolean, num, req_targets};
+use crate::{Result, Session, bad, spec};
+
+const CMD: &str = "text.fit";
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![spec!(
+        "text.fit",
+        "Fit text to its box",
+        "{ids? (text layers; default the selection), maxLines? (default: no limit but the box height), minSize? (smallest font size, px; default 60% of the current), orphans? (avoid a one-word last line; default true)}  needs a fixed width (fixed or auto-height text)  → {fitted: [{id, fontSize, lines, fits, orphan}]}",
+        true,
+        fit
+    )]
+}
+
+/// The layout of `t` with every run's font size times `k`, at `width`: (line count, height,
+/// whether the last line is an orphan: one word, wrapped from the line above rather than a
+/// paragraph of its own after a hard break, which no size can fix).
+fn measure(t: &TextData, k: f64, width: f64) -> (usize, f64, bool) {
+    let mut t = t.clone();
+    // Every line counts, not only those the layer's own line limit shows.
+    t.max_lines = 0;
+    let n = t.char_count();
+    t.restyle(0, n, |s| s.font_size = (s.font_size * k).clamp(1.0, 5000.0));
+    let l = figcraft_text::layout(&t, Some(width), None);
+    let orphan = l.lines.len() > 1
+        && l.lines.last().is_some_and(|line| {
+            let mut before = t.characters.chars().skip(line.char_start.saturating_sub(1));
+            let wrapped = line.char_start > 0 && before.next() != Some('\n');
+            wrapped
+                && t.characters
+                    .chars()
+                    .skip(line.char_start)
+                    .take(line.char_end.saturating_sub(line.char_start))
+                    .collect::<String>()
+                    .split_whitespace()
+                    .count()
+                    == 1
+        });
+    (l.lines.len(), l.height, orphan)
+}
+
+fn fit(s: &mut Session, p: &Value) -> Result<Value> {
+    let ids = req_targets(CMD, s, p)?;
+    let max_lines = num(p, "maxLines").filter(|v| v.is_finite() && *v >= 1.0).map(|v| v.min(1000.0) as usize);
+    let orphans = boolean(p, "orphans").unwrap_or(true);
+    let mut out = Vec::new();
+    let doc = s.doc_mut()?;
+    for id in ids {
+        let n = doc.node(id).ok_or_else(|| bad(CMD, format!("no layer {id}")))?;
+        let NodeKind::Text(t) = &n.kind else { return Err(bad(CMD, format!("{id} is not text"))) };
+        if t.auto_resize == TextAutoResize::WidthAndHeight {
+            return Err(bad(CMD, format!("{id} grows to its text: give it a fixed width (auto height or fixed) first")));
+        }
+        let (width, height_cap) = (n.width, if t.auto_resize == TextAutoResize::None { n.height } else { f64::INFINITY });
+        let size = t.style.font_size.max(1.0);
+        let min = num(p, "minSize").filter(|v| v.is_finite() && *v >= 1.0).unwrap_or(size * 0.6).min(size);
+        let fits = |m: (usize, f64, bool)| max_lines.is_none_or(|ml| m.0 <= ml) && m.1 <= height_cap + 0.5;
+        let k = largest_fit(t, width, (size, min), &fits);
+        let (k, nbsp) = if orphans { avoid_orphan(t, k, width, (size, min)) } else { (k, false) };
+        let n = doc.get_mut(id)?;
+        let NodeKind::Text(t) = &mut n.kind else { continue };
+        let count = t.char_count();
+        if k < 1.0 {
+            // Each run rounds to a tenth, but not below its share of the floor.
+            t.restyle(0, count, |st| {
+                let floor = st.font_size * min / size;
+                st.font_size = ((st.font_size * k * 10.0).round() / 10.0).max(floor).clamp(1.0, 5000.0)
+            });
+        }
+        let after = if nbsp { keep_together(t, width, &fits) } else { measure(t, 1.0, width) };
+        // Reported from the final text (rounded sizes, the no-break space), which callers rely on.
+        out.push(json!({"id": id.0, "fontSize": (t.style.font_size * 10.0).round() / 10.0, "lines": after.0, "fits": fits(after), "orphan": orphans && after.2}));
+    }
+    Ok(json!({"fitted": out}))
+}
+
+/// The largest factor in [min/size, 1] at which `t` fits: a binary search to a tenth of a pixel,
+/// then rounded down to a whole-tenth size (which reads better in the panel) but never below the
+/// floor. Text that fits keeps its exact size.
+fn largest_fit(t: &TextData, width: f64, (size, min): (f64, f64), fits: &dyn Fn((usize, f64, bool)) -> bool) -> f64 {
+    let (mut lo, mut hi) = (min / size, 1.0);
+    if fits(measure(t, 1.0, width)) {
+        return 1.0;
+    }
+    if fits(measure(t, lo, width)) {
+        for _ in 0..24 {
+            let mid = (lo + hi) / 2.0;
+            if fits(measure(t, mid, width)) {
+                lo = mid
+            } else {
+                hi = mid
+            }
+            if (hi - lo) * size < 0.1 {
+                break;
+            }
+        }
+    }
+    ((size * lo * 10.0).floor() / 10.0).max(min) / size
+}
+
+/// Up to 8% smaller than `k` (not below the floor) may pull a word down to an orphaned last line.
+/// The factor, and whether an orphan is left (to be kept together with a no-break space).
+fn avoid_orphan(t: &TextData, mut k: f64, width: f64, (size, min): (f64, f64)) -> (f64, bool) {
+    let mut orphan = measure(t, k, width).2;
+    let mut tries = 0;
+    while orphan && tries < 8 && size * k * 0.99 >= min {
+        k *= 0.99;
+        orphan = measure(t, k, width).2;
+        tries += 1;
+    }
+    (k, orphan)
+}
+
+/// Keep the last two words together with a no-break space, unless that breaks the limit (an
+/// orphan is better). Same character count, so style runs keep their ranges. The final layout.
+fn keep_together(t: &mut TextData, width: f64, fits: &dyn Fn((usize, f64, bool)) -> bool) -> (usize, f64, bool) {
+    // Only inside the last paragraph: a space before a hard break joins nothing on the last line.
+    let para = t.characters.rfind('\n').map_or(0, |i| i + 1);
+    let Some(i) = t.characters.trim_end().get(para..).and_then(|p| p.rfind(' ')).map(|i| para + i) else {
+        return measure(t, 1.0, width);
+    };
+    t.characters.replace_range(i..i + 1, "\u{a0}");
+    let after = measure(t, 1.0, width);
+    if fits(after) {
+        return after;
+    }
+    t.characters.replace_range(i..i + '\u{a0}'.len_utf8(), " ");
+    measure(t, 1.0, width)
+}
diff --git a/crates/engine/src/convert_container_tests.rs b/crates/engine/src/convert_container_tests.rs
index 7c25a620..be338a82 100644
--- a/crates/engine/src/convert_container_tests.rs
+++ b/crates/engine/src/convert_container_tests.rs
@@ -1,5 +1,5 @@
-//! Frames and groups converted into each other in place: the layers stay where they are on the
-//! page, what only a frame has goes with it, what can't convert is refused, one undo step.
+//! Frames, groups and sections converted into each other in place: the layers stay where they are on
+//! the page, what only a frame has goes with it, what can't convert is refused, one undo step.
 
 use serde_json::{Value, json};
 
@@ -136,7 +136,7 @@ fn what_cannot_convert_is_refused_and_nothing_changes() {
 #[test]
 fn junk_parameters_are_refused_not_fatal() {
     let junk = [json!(null), json!(true), json!(-1), json!(1e308), json!("x"), json!([[1]]), json!({"a": 1}), json!([0, 999_999, "7"])];
-    for cmd in ["object.convertToGroup", "object.convertToFrame"] {
+    for cmd in ["object.convertToGroup", "object.convertToFrame", "object.convertToSection"] {
         for j in &junk {
             let mut s = Session::new();
             let f = id(ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 50, "height": 50})));
@@ -148,3 +148,72 @@ fn junk_parameters_are_refused_not_fatal() {
         }
     }
 }
+
+#[test]
+fn a_frame_on_the_page_becomes_a_section_and_back() {
+    let mut s = Session::new();
+    let f = id(ex(&mut s, "frame.create", json!({"x": 100, "y": 50, "width": 300, "height": 200, "name": "Flow", "props": {"fill": "#FFEEDD"}})));
+    let (a, b) = (rect(&mut s, f, 20.0, 30.0), rect(&mut s, f, 400.0, 90.0));
+    ex(&mut s, "layout.add", json!({"ids": [f], "direction": "horizontal"}));
+    ex(&mut s, "node.set", json!({"id": f, "props": {"width": 300, "height": 200}}));
+    let before = [page_box(&s, a), page_box(&s, b), page_box(&s, f)];
+    assert_eq!(ex(&mut s, "object.convertToSection", json!({"ids": [f]}))["ids"], json!([f]));
+    let n = s.doc().unwrap().node(f).unwrap().clone();
+    assert!(matches!(n.kind, NodeKind::Section { contents_hidden: false }));
+    assert_eq!((n.name.as_str(), n.children.clone(), n.fills.len()), ("Flow", vec![a, b], 1), "same name, layers and fill");
+    assert!(n.layout.is_none() && !n.clip, "no auto layout or clipping on a section");
+    assert_eq!([page_box(&s, a), page_box(&s, b), page_box(&s, f)], before, "nothing moves");
+    // And back: a frame that keeps the fill and doesn't clip, so the look stays.
+    assert_eq!(ex(&mut s, "object.convertToFrame", json!({"ids": [f]}))["ids"], json!([f]));
+    let n = s.doc().unwrap().node(f).unwrap().clone();
+    assert!(matches!(n.kind, NodeKind::Frame) && n.fills.len() == 1 && !n.clip);
+    assert_eq!([page_box(&s, a), page_box(&s, b), page_box(&s, f)], before);
+    // Each conversion is one undo step.
+    ex(&mut s, "edit.undo", json!({}));
+    assert!(matches!(kind(&s, f), NodeKind::Section { .. }));
+    ex(&mut s, "edit.undo", json!({}));
+    assert!(matches!(kind(&s, f), NodeKind::Frame));
+    assert!(s.doc().unwrap().node(f).unwrap().layout.is_some(), "the frame's auto layout is back");
+}
+
+#[test]
+fn only_frames_on_the_page_or_in_a_section_become_sections() {
+    let mut s = Session::new();
+    let outer = id(ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 300})));
+    let inner = id(ex(&mut s, "frame.create", json!({"parent": outer, "x": 10, "y": 10, "width": 100, "height": 100})));
+    let err = s.execute("object.convertToSection", &json!({"ids": [inner]})).unwrap_err().to_string();
+    assert!(err.contains("inside a frame"), "{err}");
+    let r = rect(&mut s, outer, 150.0, 150.0);
+    assert!(s.execute("object.convertToSection", &json!({"ids": [r]})).is_err(), "a rectangle isn't a frame");
+    // A frame inside a section converts; a section holding a section can't become a frame.
+    let sec = id(ex(&mut s, "node.create", json!({"type": "section", "x": 500, "y": 0, "width": 400, "height": 400})));
+    let in_sec = id(ex(&mut s, "frame.create", json!({"parent": sec, "x": 20, "y": 20, "width": 100, "height": 100})));
+    ex(&mut s, "object.convertToSection", json!({"ids": [in_sec]}));
+    assert!(matches!(kind(&s, in_sec), NodeKind::Section { .. }));
+    let err = s.execute("object.convertToFrame", &json!({"ids": [sec]})).unwrap_err().to_string();
+    assert!(err.contains("holds sections"), "{err}");
+    assert!(matches!(kind(&s, sec), NodeKind::Section { .. }), "nothing changed");
+}
+
+#[test]
+fn wrapping_errors_name_the_command_that_was_run() {
+    // Grouping, framing, auto layout, masks and booleans share one wrapping step; a refusal names
+    // the command that asked, not `object.group`.
+    let mut s = Session::new();
+    let page = s.page().unwrap();
+    for cmd in ["object.group", "object.frameSelection", "layout.add", "bool.union"] {
+        let err = s.execute(cmd, &json!({"ids": [page]})).unwrap_err().to_string();
+        assert!(err.contains(&format!("`{cmd}`")), "{cmd}: {err}");
+    }
+    let r = rect(&mut s, page, 0.0, 0.0);
+    let err = s.execute("object.mask", &json!({"ids": [page, r]})).unwrap_err().to_string();
+    assert!(err.contains("`object.mask`"), "{err}");
+    let section = id(ex(&mut s, "node.create", json!({"type": "section", "x": 300, "y": 0, "width": 100, "height": 100})));
+    ex(&mut s, "node.set", json!({"ids": [section], "props": {"fills": ["#FFFFFF"], "strokes": ["#000000"], "strokeWeight": 1}}));
+    let err = s.execute("vector.outlineStroke", &json!({"ids": [section]})).unwrap_err().to_string();
+    assert!(err.contains("`vector.outlineStroke`"), "{err}");
+    let f = id(ex(&mut s, "frame.create", json!({"x": 100, "y": 0, "width": 100, "height": 100})));
+    let inner = rect(&mut s, f, 10.0, 10.0);
+    let err = s.execute("object.wrapInSection", &json!({"ids": [inner, r]})).unwrap_err().to_string();
+    assert!(err.contains("`object.wrapInSection`"), "{err}");
+}
diff --git a/crates/engine/src/cursor_tests.rs b/crates/engine/src/cursor_tests.rs
index 05a95f66..86122c53 100644
--- a/crates/engine/src/cursor_tests.rs
+++ b/crates/engine/src/cursor_tests.rs
@@ -70,6 +70,7 @@ fn scene() -> (Session, NodeId, NodeId) {
 
 const EMPTY: (f64, f64) = (700.0, 600.0);
 const ON_SQUARE: (f64, f64) = (150.0, 150.0);
+const ON_SQUARE_EDGE: (f64, f64) = (101.0, 150.0);
 const ON_TEXT: (f64, f64) = (420.0, 120.0);
 
 #[test]
@@ -101,6 +102,9 @@ fn each_tool_has_its_cursor_by_modifier_and_what_is_under_the_pointer() {
         (ToolId::Text, NONE, EMPTY, Crosshair, "the Text tool makes a text where it is pressed"),
         (ToolId::Text, NONE, ON_SQUARE, Crosshair, "over a shape too"),
         (ToolId::Text, NONE, ON_TEXT, Text, "the I-beam over a text: a click edits it there"),
+        (ToolId::TextOnPath, NONE, EMPTY, Default, "text on a path: a click on empty canvas does nothing"),
+        (ToolId::TextOnPath, NONE, ON_SQUARE, Default, "nor inside a shape, away from its path"),
+        (ToolId::TextOnPath, NONE, ON_SQUARE_EDGE, Text, "the I-beam over a shape's path: a click puts text on it"),
         (ToolId::Pen, NONE, EMPTY, Pen(PenCursor::New), "the pen: a new point"),
         (ToolId::Comment, NONE, EMPTY, Comment, "the comment pin"),
         (ToolId::Eyedropper, NONE, ON_SQUARE, Eyedropper, "the eyedropper"),
@@ -202,15 +206,16 @@ fn an_edit_an_instance_refuses_shows_not_allowed_and_is_undone() {
     let before = s.doc().unwrap().world_bounds(inner).unwrap();
     assert_eq!((before.x0, before.y0, before.x1, before.y1), (450.0, 50.0, 550.0, 150.0));
     ex(&mut s, "select.set", json!({"ids": [inner]}));
-    // Resizing it by its right edge: only the main component can.
-    assert!(close(resize(hover(&mut s, (550.0, 100.0), NONE)), 0.0), "the handle still shows its arrow");
+    // Resizing it by its right edge: a size of its own (an override).
+    assert!(close(resize(hover(&mut s, (550.0, 100.0), NONE)), 0.0), "the handle shows its arrow");
     s.pointer(&ev(PointerKind::Down, (550.0, 100.0), NONE)).unwrap();
     s.pointer(&ev(PointerKind::Move, (570.0, 100.0), NONE)).unwrap();
     s.pointer(&ev(PointerKind::Move, (600.0, 100.0), NONE)).unwrap();
-    assert_eq!(s.tool.overlay.cursor, Cursor::NotAllowed);
+    assert_ne!(s.tool.overlay.cursor, Cursor::NotAllowed);
     s.pointer(&ev(PointerKind::Up, (600.0, 100.0), NONE)).unwrap();
-    assert_eq!(s.doc().unwrap().world_bounds(inner).unwrap(), before, "the resize was undone");
-    // Moving it: refused too.
+    let before = s.doc().unwrap().world_bounds(inner).unwrap();
+    assert_eq!((before.x0, before.x1), (450.0, 600.0), "the resize stays");
+    // Moving it: only the main component can.
     s.pointer(&ev(PointerKind::Down, (500.0, 100.0), NONE)).unwrap();
     s.pointer(&ev(PointerKind::Move, (510.0, 110.0), NONE)).unwrap();
     s.pointer(&ev(PointerKind::Move, (520.0, 120.0), NONE)).unwrap();
@@ -269,13 +274,14 @@ fn vector_edit_mode_shows_each_tool_and_modifier() {
     let mut s = Session::new();
     let path = id(&ex(&mut s, "vector.create", json!({"points": [[100, 100], [300, 100], [300, 300]], "closed": false})));
     ex(&mut s, "vector.edit.begin", json!({"id": path}));
-    let (point, segment, empty) = ((300.0, 100.0), (200.0, 100.0), (200.0, 250.0));
+    let (point, segment, midpoint, empty) = ((300.0, 100.0), (150.0, 100.0), (200.0, 100.0), (200.0, 250.0));
     use Cursor::*;
     // (vector tool, modifiers, where, cursor, why)
     type Row = (&'static str, Mods, (f64, f64), Cursor, &'static str);
     let rows: Vec<Row> = vec![
         ("move", NONE, point, Default, "the arrow over a point"),
         ("move", NONE, segment, Default, "the arrow over a segment"),
+        ("move", NONE, midpoint, Pen(PenCursor::Add), "the arrow over a segment's midpoint: adds a point there"),
         ("move", NONE, empty, Default, "the arrow elsewhere"),
         ("move", ALT, segment, Pen(PenCursor::Add), "Alt over a segment adds a point there"),
         ("move", ALT, point, Default, "Alt over a point adds nothing"),
diff --git a/crates/engine/src/datafill_tests.rs b/crates/engine/src/datafill_tests.rs
new file mode 100644
index 00000000..3e0cff7f
--- /dev/null
+++ b/crates/engine/src/datafill_tests.rs
@@ -0,0 +1,142 @@
+//! `data.fill`: a frame repeated per row with that row's texts, fills and visibility, in one undo
+//! step, optionally exported.
+
+use crate::Session;
+use crate::components::tests::{ex, idv};
+use figcraft_doc::{NodeId, NodeKind};
+use serde_json::json;
+
+/// A 1080×1350 "Post" with "Title" and "Price" texts and a "Badge" rectangle. Returns the frame.
+fn post(s: &mut Session) -> NodeId {
+    let f = idv(&ex(s, "frame.create", json!({"x": 0, "y": 0, "width": 1080, "height": 1350, "name": "Post"})));
+    ex(s, "text.create", json!({"text": "Title", "x": 80, "y": 80, "parent": f, "props": {"name": "Title"}}));
+    ex(s, "text.create", json!({"text": "R$ 0", "x": 80, "y": 1200, "parent": f, "props": {"name": "Price"}}));
+    ex(s, "shape.rectangle", json!({"x": 80, "y": 40, "width": 200, "height": 32, "parent": f, "props": {"name": "Badge", "fill": "#3DDC97"}}));
+    f
+}
+
+fn text(s: &Session, frame: NodeId, name: &str) -> String {
+    let doc = s.doc().unwrap();
+    doc.subtree(frame)
+        .into_iter()
+        .filter_map(|i| doc.node(i))
+        .find(|n| n.name == name)
+        .and_then(|n| match &n.kind {
+            NodeKind::Text(t) => Some(t.characters.clone()),
+            _ => None,
+        })
+        .unwrap_or_default()
+}
+
+#[test]
+fn each_row_fills_a_copy_in_one_undo_step() {
+    let mut s = Session::new();
+    let f = post(&mut s);
+    let r = ex(
+        &mut s,
+        "data.fill",
+        json!({"id": f, "rows": [
+            {"name": "Slide 1", "Title": "Site em 7 dias", "Price": 5500},
+            {"name": "Slide 2", "Title": "WhatsApp com IA", "Badge": {"visible": false}},
+            {"Title": "Agenda sozinha", "Badge": {"fill": "#7C5CFF"}, "Subtitle": "nope"}
+        ]}),
+    );
+    let ids: Vec<NodeId> = r["ids"].as_array().unwrap().iter().map(|v| NodeId(v.as_u64().unwrap())).collect();
+    assert_eq!(ids.len(), 3);
+    assert_eq!(r["missing"], json!(["Subtitle"]));
+    assert_eq!(text(&s, ids[0], "Title"), "Site em 7 dias");
+    assert_eq!(text(&s, ids[0], "Price"), "5500");
+    assert_eq!(text(&s, ids[2], "Title"), "Agenda sozinha");
+    assert_eq!(text(&s, f, "Title"), "Title", "the source frame is untouched");
+    let doc = s.doc().unwrap();
+    assert_eq!(doc.node(ids[0]).unwrap().name, "Slide 1");
+    assert_eq!(doc.node(ids[2]).unwrap().name, "Post 3");
+    // Copies sit in a row to the right, 100 apart.
+    let x = |i: NodeId| doc.node(i).unwrap().transform.as_coeffs()[4];
+    assert_eq!((x(ids[0]), x(ids[1])), (1180.0, 2360.0));
+    let badge = |i: NodeId| doc.subtree(i).into_iter().filter_map(|k| doc.node(k)).find(|n| n.name == "Badge").cloned().unwrap();
+    assert!(!badge(ids[1]).visible && badge(ids[0]).visible);
+    assert_eq!(badge(ids[2]).fills[0].solid_color().map(|c| c.to_hex()), Some("7C5CFF".into()));
+    // One undo removes every copy.
+    ex(&mut s, "edit.undo", json!({}));
+    assert!(ids.iter().all(|i| !s.doc().unwrap().contains(*i)));
+}
+
+#[test]
+fn copies_export_to_a_folder_and_bad_input_is_refused() {
+    let mut s = Session::new();
+    let f = post(&mut s);
+    let dir = std::env::temp_dir().join(format!("figcraft-datafill-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let r = ex(
+        &mut s,
+        "data.fill",
+        json!({"id": f, "rows": [{"name": "Post/1: hero", "Title": "A"}, {"Title": "B"}], "dir": dir.to_string_lossy(), "scale": 0.25}),
+    );
+    let files: Vec<String> = r["files"].as_array().unwrap().iter().map(|v| v.as_str().unwrap().to_string()).collect();
+    assert_eq!(files.len(), 2);
+    assert!(files[0].ends_with("Post-1- hero.png"), "{files:?}");
+    assert!(files.iter().all(|p| std::fs::metadata(p).is_ok_and(|m| m.len() > 0)));
+    let _ = std::fs::remove_dir_all(&dir);
+    for bad in [json!({"id": f}), json!({"id": f, "rows": [1, 2]}), json!({"id": f, "rows": [], "format": "gif"}), json!({"id": 999_999, "rows": []})]
+    {
+        assert!(s.execute("data.fill", &bad).is_err(), "{bad}");
+    }
+}
+
+#[test]
+fn each_row_comes_in_every_format() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 1080, "height": 1350, "name": "Post"})));
+    ex(&mut s, "layout.add", json!({"ids": [f], "direction": "vertical"}));
+    ex(&mut s, "node.set", json!({"id": f, "props": {"sizingV": "fixed", "padding": 80}}));
+    let t = idv(&ex(&mut s, "text.create", json!({"text": "Título", "x": 0, "y": 0, "parent": f, "props": {"name": "Title", "fontSize": 96}})));
+    ex(&mut s, "node.set", json!({"id": t, "props": {"sizingH": "fill", "textAutoResize": "height"}}));
+    let r = ex(
+        &mut s,
+        "data.fill",
+        json!({"id": f, "formats": [
+        {"name": "feed", "width": 1080, "height": 1350}, {"name": "story", "width": 1080, "height": 1920}, {"width": 1080, "height": 1080}
+    ], "rows": [{"name": "capa", "Title": "Site em 7 dias"}, {"name": "prova", "Title": "Lighthouse 100"}]}),
+    );
+    let ids: Vec<NodeId> = r["ids"].as_array().unwrap().iter().map(|v| NodeId(v.as_u64().unwrap())).collect();
+    assert_eq!(ids.len(), 6);
+    let doc = s.doc().unwrap();
+    let names: Vec<String> = ids.iter().map(|i| doc.node(*i).unwrap().name.clone()).collect();
+    assert_eq!(names, ["capa-feed", "capa-story", "capa-1080x1080", "prova-feed", "prova-story", "prova-1080x1080"]);
+    let size = |i: NodeId| (doc.node(i).unwrap().width, doc.node(i).unwrap().height);
+    assert_eq!(size(ids[1]), (1080.0, 1920.0));
+    assert_eq!(size(ids[2]), (1080.0, 1080.0));
+    assert_eq!(text(&s, ids[4], "Title"), "Lighthouse 100");
+    // Formats of a row stack downwards; rows go right without overlapping.
+    let at = |i: NodeId| (doc.node(i).unwrap().transform.as_coeffs()[4], doc.node(i).unwrap().transform.as_coeffs()[5]);
+    assert_eq!(at(ids[0]).0, at(ids[1]).0);
+    assert!(at(ids[1]).1 >= at(ids[0]).1 + 1350.0);
+    assert!(at(ids[3]).0 >= at(ids[0]).0 + 1080.0);
+    for bad in [json!([]), json!([{"width": 0, "height": 10}]), json!("feed")] {
+        assert!(s.execute("data.fill", &json!({"id": f, "rows": [{}], "formats": bad})).is_err(), "{bad}");
+    }
+}
+
+#[test]
+fn review_export_names_are_unique_and_failures_are_reported() {
+    let mut s = Session::new();
+    let f = post(&mut s);
+    let dir = std::env::temp_dir().join(format!("figcraft-datafill-names-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let r = ex(
+        &mut s,
+        "data.fill",
+        json!({"id": f, "rows": [{"name": "Post"}, {"name": "post"}, {"name": "a/b"}, {"name": "a:b"}], "dir": dir.to_string_lossy(), "scale": 0.1}),
+    );
+    let files: Vec<String> = r["files"].as_array().unwrap().iter().map(|v| v.as_str().unwrap().to_string()).collect();
+    let lower: std::collections::HashSet<String> = files.iter().map(|f| f.to_lowercase()).collect();
+    assert_eq!(lower.len(), 4, "one file per copy: {files:?}");
+    assert!(files.iter().all(|p| std::fs::metadata(p).is_ok()), "{files:?}");
+    let _ = std::fs::remove_dir_all(&dir);
+    // A folder that can't be written: the copies stay and every failure is reported.
+    let r = ex(&mut s, "data.fill", json!({"id": f, "rows": [{"name": "x"}], "dir": "/nonexistent-figcraft-dir/out"}));
+    assert_eq!(r["ids"].as_array().unwrap().len(), 1);
+    assert_eq!(r["errors"].as_array().map(Vec::len), Some(1), "{r}");
+    assert!(s.doc().unwrap().contains(NodeId(r["ids"][0].as_u64().unwrap())));
+}
diff --git a/crates/engine/src/derived.rs b/crates/engine/src/derived.rs
new file mode 100644
index 00000000..765e3be5
--- /dev/null
+++ b/crates/engine/src/derived.rs
@@ -0,0 +1,236 @@
+use super::*;
+
+/// Nodes whose `Arc` differs from `before` (new or edited).
+pub fn changed_nodes(doc: &Document, before: &Document) -> Vec<NodeId> {
+    doc.ids()
+        .filter(|id| match (doc.node_arc(*id), before.node_arc(*id)) {
+            (Some(a), Some(b)) => !Arc::ptr_eq(a, b),
+            _ => true,
+        })
+        .collect()
+}
+
+/// Keep derived state consistent after edits: text boxes resize to their content, groups wrap
+/// their children, instances follow their main components, auto layout re-flows.
+pub fn normalize(doc: &mut Document, before: &Document) {
+    // Only what was touched since the last normalisation (edited, added or removed).
+    let mut touched: BTreeSet<NodeId> = doc.take_dirty();
+    // A variable or style edit changes no layer directly, but bound and linked layers must follow it.
+    if touched.is_empty() && doc.variables == before.variables && doc.styles == before.styles {
+        return;
+    }
+    let m = measure::TextMeasure;
+    // 0. Variable bindings and style links feed node values.
+    let scope = binding_scope(doc, before, &touched);
+    if doc.variables != before.variables || doc.styles != before.styles {
+        style_vars::settle(doc);
+    }
+    cmd::styles::apply_bindings_to(doc, scope.as_ref());
+    style_vars::refresh(doc, Some(before), scope.as_ref());
+    if doc.styles != before.styles {
+        let changed_styles: Vec<String> = doc.styles.iter().filter(|s| !before.styles.contains(s)).map(|s| s.id.clone()).collect();
+        for sid in changed_styles {
+            cmd::styles::propagate_style(doc, &sid);
+        }
+    }
+    touched.extend(doc.take_dirty());
+    // Lists and text chars edited away from their style unlink from it.
+    let live_now: Vec<NodeId> = touched.iter().copied().filter(|i| doc.contains(*i)).collect();
+    cmd::styles::sync_list_styles(doc, before, &live_now);
+    cmd::styles::sync_text_styles(doc, &live_now);
+    touched.extend(doc.take_dirty());
+    let live = |doc: &Document, t: &BTreeSet<NodeId>| -> Vec<NodeId> { t.iter().copied().filter(|i| doc.contains(*i)).collect() };
+    // 0b. Fill and hug only where they can apply (a layer moved out of auto layout, a parent that
+    // started to hug or lost auto layout): the rest becomes fixed at its current size.
+    for id in live(doc, &touched) {
+        figcraft_layout::coherent_sizing(doc, id);
+    }
+    touched.extend(doc.take_dirty());
+    // 1. Text auto-size (a sticky's note first takes the size its length calls for).
+    board::settle_text(doc, before, &touched);
+    touched.extend(doc.take_dirty());
+    for id in live(doc, &touched) {
+        let Some(n) = doc.node(id) else { continue };
+        if let Some((w, h)) = figcraft_text::auto_size(n)
+            && ((w - n.width).abs() > 1e-6 || (h - n.height).abs() > 1e-6)
+        {
+            figcraft_layout::set_size(doc, id, w, h);
+        }
+    }
+    touched.extend(doc.take_dirty());
+    // 2. Instances follow edited main components (and record overrides inside instances).
+    let changed = live(doc, &touched);
+    components::sync_after_edit(doc, before, &changed, &touched);
+    // Rebuilt copies took their mains' values: their bindings resolve in their own modes.
+    let synced = doc.take_dirty();
+    if !synced.is_empty() {
+        cmd::styles::apply_bindings_to(doc, Some(&synced));
+        style_vars::refresh(doc, Some(before), Some(&synced));
+        touched.extend(synced);
+    }
+    touched.extend(doc.take_dirty());
+    // Parents of removed nodes (as they were before) count as touched.
+    let removed_parents: Vec<NodeId> =
+        touched.iter().filter(|i| !doc.contains(**i)).filter_map(|i| before.node(*i).and_then(|n| n.parent)).filter(|p| doc.contains(*p)).collect();
+    // 3. Groups / booleans wrap their children.
+    let mut fit: BTreeSet<NodeId> = BTreeSet::new();
+    for id in live(doc, &touched).into_iter().chain(removed_parents.iter().copied()) {
+        if doc.node(id).is_some_and(|n| n.kind.bounds_follow_children()) {
+            fit.insert(id);
+        }
+        for a in doc.ancestors(id) {
+            if doc.node(a).is_some_and(|n| n.kind.bounds_follow_children()) {
+                fit.insert(a);
+            } else {
+                break;
+            }
+        }
+    }
+    let mut fit: Vec<NodeId> = fit.into_iter().collect();
+    fit.sort_by_key(|id| std::cmp::Reverse(doc.ancestors(*id).len()));
+    for id in fit {
+        if doc.node(id).is_some_and(|n| n.children.is_empty()) {
+            // Empty groups disappear, like the incumbent.
+            let _ = doc.remove(id);
+        } else {
+            let _ = doc.fit_to_children(id);
+        }
+    }
+    touched.extend(doc.take_dirty());
+    // 4. Auto layout for frames where something that sizes or places layers changed.
+    let mut frames: BTreeSet<NodeId> = BTreeSet::new();
+    let moved = live(doc, &touched).into_iter().filter(|id| affects_layout(before, doc, *id));
+    for id in moved.chain(removed_parents) {
+        if !doc.contains(id) {
+            continue;
+        }
+        let mut chain = vec![id];
+        chain.extend(doc.ancestors(id));
+        for c in chain {
+            if doc.node(c).is_some_and(|n| n.layout.is_some()) {
+                frames.insert(c);
+            }
+        }
+    }
+    let mut frames: Vec<NodeId> = frames.into_iter().collect();
+    frames.sort_by_key(|id| std::cmp::Reverse(doc.ancestors(*id).len()));
+    for f in frames {
+        // Layers the layout leaves where they were stay untouched.
+        let kept: Vec<(Arc<Node>, bool)> = doc
+            .node(f)
+            .map(|n| std::iter::once(f).chain(n.children.iter().copied()).collect::<Vec<_>>())
+            .unwrap_or_default()
+            .into_iter()
+            .filter_map(|i| doc.node_arc(i).map(|a| (a.clone(), doc.dirty().contains(&i))))
+            .collect();
+        figcraft_layout::layout_frame(doc, f, &m);
+        for (a, was_dirty) in kept {
+            doc.keep_if_unchanged(a, was_dirty);
+        }
+    }
+    touched.extend(doc.take_dirty());
+    // 4b. Board connectors follow the layers they join; their labels sit at their middles.
+    board::settle_routes(doc, before, &touched);
+    touched.extend(doc.take_dirty());
+    // 5. Ready-for-dev layers whose contents changed show "Changed".
+    mark_dev_changes(doc, before, &touched);
+    doc.take_dirty();
+    // 5. Comment pins follow their layers to other pages and stay put when the layers are deleted.
+    cmd::comment::follow_anchors(doc, before);
+}
+
+/// Whether layer `id` changed (since `before`) in a way that can move or resize layers in an auto
+/// layout frame around it: new, resized, moved, shown or hidden, restructured, other text or
+/// layout settings.
+fn affects_layout(before: &Document, doc: &Document, id: NodeId) -> bool {
+    let (Some(a), Some(b)) = (before.node(id), doc.node(id)) else { return true };
+    a.width != b.width
+        || a.height != b.height
+        || a.transform != b.transform
+        || a.visible != b.visible
+        || a.parent != b.parent
+        || a.children != b.children
+        || a.layout != b.layout
+        || a.child_layout != b.child_layout
+        || a.stroke != b.stroke
+        || a.strokes.len() != b.strokes.len()
+        || a.kind != b.kind
+}
+
+/// The layers whose variable bindings an edit may have changed: every bound layer when a variable
+/// changed, else the touched layers and everything below those that moved, are new, chose
+/// another variable mode or became an instance of another main (modes are inherited, an
+/// instance's from its main too), and the instances of a main that chose another mode.
+fn binding_scope(doc: &Document, before: &Document, touched: &BTreeSet<NodeId>) -> Option<BTreeSet<NodeId>> {
+    if doc.variables != before.variables {
+        return None;
+    }
+    let main = |n: &Node| match n.kind {
+        figcraft_doc::NodeKind::Instance { component, .. } => Some(component),
+        _ => None,
+    };
+    let mut out = BTreeSet::new();
+    for &id in touched {
+        let Some(n) = doc.node(id) else { continue };
+        let Some(b) = before.node(id) else {
+            out.extend(doc.subtree(id));
+            continue;
+        };
+        let modes = b.var_modes != n.var_modes;
+        if modes || b.parent != n.parent || main(b) != main(n) {
+            out.extend(doc.subtree(id));
+        } else {
+            out.insert(id);
+        }
+        if modes && matches!(n.kind, figcraft_doc::NodeKind::Component { .. }) {
+            for i in components::instances_of(doc, id) {
+                out.extend(doc.subtree(i));
+            }
+        }
+    }
+    Some(out)
+}
+
+/// Flag the frames and sections marked ready for dev (before this edit) that contain a layer whose
+/// design `touched` changed (added, removed or edited; the handoff status itself and hiding a
+/// section's contents don't count).
+fn mark_dev_changes(doc: &mut Document, before: &Document, touched: &BTreeSet<NodeId>) {
+    let ready = |d: &Document, id: NodeId| d.node(id).is_some_and(|n| n.dev_status == figcraft_doc::DevStatus::ReadyForDev);
+    let mut changed: BTreeSet<NodeId> = BTreeSet::new();
+    for &id in touched {
+        // Ready-for-dev frames around it first (the cheap test).
+        let mut chain = vec![id];
+        chain.extend(if doc.contains(id) { doc.ancestors(id) } else { before.ancestors(id) });
+        chain.retain(|m| ready(before, *m) && ready(doc, *m));
+        if chain.is_empty() {
+            continue;
+        }
+        let differs = match (before.node(id), doc.node(id)) {
+            (Some(a), Some(b)) => !a.same_design(b),
+            (None, None) => false,
+            _ => true,
+        };
+        if differs {
+            changed.extend(chain);
+        }
+    }
+    for m in changed {
+        if doc.node(m).is_some_and(|n| !n.dev_changed) {
+            // Its first change since it was marked: keep what it looked like (for Compare changes).
+            if let Some(snap) = before.snapshot_subtree(m) {
+                doc.dev_snapshots.insert(m, Arc::new(snap));
+            }
+            if let Some(n) = doc.node_mut(m) {
+                n.dev_changed = true;
+            }
+        }
+    }
+    // Snapshots last until the change is resolved, the layer is marked again or it's deleted.
+    if !doc.dev_snapshots.is_empty() {
+        let keep = |d: &Document, id: NodeId| d.node(id).is_some_and(|n| n.dev_status == figcraft_doc::DevStatus::ReadyForDev && n.dev_changed);
+        let stale: Vec<NodeId> = doc.dev_snapshots.keys().copied().filter(|id| !keep(doc, *id)).collect();
+        for id in stale {
+            doc.dev_snapshots.remove(&id);
+        }
+    }
+}
diff --git a/crates/engine/src/design_paste_tests.rs b/crates/engine/src/design_paste_tests.rs
new file mode 100644
index 00000000..52dc4230
--- /dev/null
+++ b/crates/engine/src/design_paste_tests.rs
@@ -0,0 +1,108 @@
+//! Paste of layers copied from another design app: the clipboard's design data (a `.fig` canvas in
+//! its HTML) read through the `.fig` import and pasted as Paste pastes our own layers.
+
+use base64::Engine as _;
+use serde_json::json;
+
+use super::{NodeId, Session, Value, params};
+use crate::cmd::edit::{CLIP_CLOSE, CLIP_OPEN, design_clipboard_buffer};
+
+const B64: base64::engine::GeneralPurpose = base64::engine::general_purpose::STANDARD;
+
+fn id(v: &Value) -> NodeId {
+    params::id_of(&v["id"]).unwrap()
+}
+
+fn copied_file() -> Vec<u8> {
+    let mut s = Session::new();
+    let frame = id(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Card"})).unwrap());
+    s.execute("node.create", &json!({"type": "rectangle", "x": 10, "y": 10, "width": 40, "height": 20, "parent": frame, "name": "Badge"})).unwrap();
+    s.execute("node.create", &json!({"type": "ellipse", "x": 300, "y": 0, "width": 50, "height": 50, "name": "Dot"})).unwrap();
+    let r = s.execute("file.export", &json!({"format": "fig"})).unwrap();
+    B64.decode(r["data"].as_str().unwrap()).unwrap()
+}
+
+fn clipboard_html(buffer: &[u8]) -> String {
+    let mut wrapped = B64.encode(buffer);
+    wrapped.insert(8, '\n');
+    format!(r#"<meta charset="utf-8"><span data-buffer="<!--{CLIP_OPEN}{wrapped}{CLIP_CLOSE}-->"></span>"#)
+}
+
+fn names(s: &Session, ids: &[NodeId]) -> Vec<String> {
+    let doc = s.doc().unwrap();
+    ids.iter().map(|i| doc.node(*i).unwrap().name.clone()).collect()
+}
+
+#[test]
+fn buffer_is_found_in_the_html() {
+    let file = copied_file();
+    assert_eq!(design_clipboard_buffer(&clipboard_html(&file)), Some(file));
+    assert_eq!(design_clipboard_buffer("<p>plain</p>"), None);
+    assert_eq!(design_clipboard_buffer(&format!("{CLIP_OPEN}not base64!{CLIP_CLOSE}")), None);
+    assert_eq!(design_clipboard_buffer(&format!("{CLIP_OPEN}{}{CLIP_CLOSE}", B64.encode(b"hello"))), None);
+    assert_eq!(design_clipboard_buffer(&format!("{CLIP_OPEN}ZmlnLQ")), None);
+    // Web text that only mentions the markers holds no design data.
+    assert_eq!(design_clipboard_buffer(&format!("<p>see {CLIP_OPEN} and {CLIP_CLOSE} in the docs</p>")), None);
+}
+
+#[test]
+fn oversized_design_data_is_refused_before_decoding() {
+    // Just past the cap (256 MB of data, as base64), made of valid base64 characters.
+    let big = "A".repeat((256 * 1024 * 1024usize).div_ceil(3) * 4 + 4);
+    assert_eq!(design_clipboard_buffer(&format!("{CLIP_OPEN}{big}{CLIP_CLOSE}")), None);
+    let mut s = Session::new();
+    let e = s.execute("edit.pasteDesignLayers", &json!({ "data": big })).unwrap_err();
+    assert!(e.to_string().contains("256 MB"), "{e}");
+    assert!(s.clipboard.nodes.is_empty());
+}
+
+#[test]
+fn layers_paste_into_the_page_and_undo() {
+    let mut s = Session::new();
+    let page = s.page().unwrap();
+    let r = s.execute("edit.pasteDesignLayers", &json!({"html": clipboard_html(&copied_file())})).unwrap();
+    let ids: Vec<NodeId> = r["ids"].as_array().unwrap().iter().map(|v| params::id_of(v).unwrap()).collect();
+    assert_eq!(names(&s, &ids), ["Card", "Dot"]);
+    assert_eq!(s.selection(), ids);
+    let doc = s.doc().unwrap();
+    assert!(ids.iter().all(|i| doc.node(*i).unwrap().parent == Some(page)));
+    let card = doc.node(ids[0]).unwrap();
+    assert_eq!(names(&s, &card.children), ["Badge"]);
+    assert_eq!((card.width, card.height), (200.0, 100.0));
+    assert!(s.undo().unwrap());
+    assert!(ids.iter().all(|i| !s.doc().unwrap().contains(*i)));
+}
+
+#[test]
+fn a_second_paste_repeats_the_copied_layers() {
+    let mut s = Session::new();
+    // `data` may be wrapped and unpadded, like the HTML's base64.
+    let mut data = B64.encode(copied_file()).trim_end_matches('=').to_string();
+    data.insert(8, '\n');
+    s.execute("edit.pasteDesignLayers", &json!({ "data": data })).unwrap();
+    let r = s.execute("edit.paste", &json!({})).unwrap();
+    let ids: Vec<NodeId> = r["ids"].as_array().unwrap().iter().map(|v| params::id_of(v).unwrap()).collect();
+    assert_eq!(names(&s, &ids), ["Card", "Dot"]);
+}
+
+#[test]
+fn pastes_into_the_selected_frame() {
+    let mut s = Session::new();
+    let host = id(&s.execute("frame.create", &json!({"x": 1000, "y": 0, "width": 800, "height": 600})).unwrap());
+    s.execute("select.set", &json!({"ids": [host]})).unwrap();
+    let r = s.execute("edit.pasteDesignLayers", &json!({"html": clipboard_html(&copied_file())})).unwrap();
+    let first = params::id_of(&r["ids"][0]).unwrap();
+    assert_eq!(s.doc().unwrap().node(first).unwrap().parent, Some(host));
+}
+
+#[test]
+fn other_content_is_refused_without_changes() {
+    let mut s = Session::new();
+    let before = s.doc().unwrap().nodes().count();
+    assert!(s.execute("edit.pasteDesignLayers", &json!({})).is_err());
+    assert!(s.execute("edit.pasteDesignLayers", &json!({"html": "<b>hi</b>"})).is_err());
+    assert!(s.execute("edit.pasteDesignLayers", &json!({"data": B64.encode(b"PK not a zip")})).is_err());
+    assert!(s.execute("edit.pasteDesignLayers", &json!({"data": B64.encode(b"fig-kiwi\x00\x00\x00\x00junk")})).is_err());
+    assert_eq!(s.doc().unwrap().nodes().count(), before);
+    assert!(s.clipboard.nodes.is_empty());
+}
diff --git a/crates/engine/src/dev.rs b/crates/engine/src/dev.rs
new file mode 100644
index 00000000..bc46aae9
--- /dev/null
+++ b/crates/engine/src/dev.rs
@@ -0,0 +1,9 @@
+pub mod annotations;
+pub mod code_connect;
+pub mod codegen;
+pub mod component_codegen;
+pub mod dev_measurements;
+pub mod dev_resources;
+pub mod devcompare;
+pub mod devinspect;
+pub mod tailwind;
diff --git a/crates/engine/src/annotations.rs b/crates/engine/src/dev/annotations.rs
similarity index 100%
rename from crates/engine/src/annotations.rs
rename to crates/engine/src/dev/annotations.rs
diff --git a/crates/engine/src/code_connect.rs b/crates/engine/src/dev/code_connect.rs
similarity index 61%
rename from crates/engine/src/code_connect.rs
rename to crates/engine/src/dev/code_connect.rs
index f554632a..8b29235e 100644
--- a/crates/engine/src/code_connect.rs
+++ b/crates/engine/src/dev/code_connect.rs
@@ -14,9 +14,9 @@ use figcraft_doc::*;
 use serde_json::{Value, json};
 
 use crate::cmd::CommandSpec;
-use crate::codegen::CodeLang;
+use crate::codegen::{CodeLang, Ctx};
 use crate::component_codegen::{Component, Param, ParamKind, describe, instance_values, js_string, main_of, value_expr};
-use crate::components::variant_set;
+use crate::components::{slots_of, variant_set};
 use crate::params::*;
 use crate::{EngineError, Result, Session, bad, spec};
 
@@ -37,7 +37,9 @@ const MAX_WARNINGS: usize = 50;
 
 /// The languages a component can be connected in.
 pub fn language(s: &str) -> Option<CodeLang> {
-    CodeLang::from_id(s).filter(|l| matches!(l, CodeLang::React | CodeLang::Leptos | CodeLang::SwiftUi | CodeLang::Compose | CodeLang::Flutter))
+    CodeLang::from_id(s).filter(|l| {
+        matches!(l, CodeLang::React | CodeLang::Leptos | CodeLang::Vue | CodeLang::SwiftUi | CodeLang::Compose | CodeLang::ArkUi | CodeLang::Flutter)
+    })
 }
 
 /// The layer `id`'s links are stored on: its component set, else its component (an instance's
@@ -64,21 +66,115 @@ pub fn import_line(link: &CodeLink, lang: CodeLang) -> String {
     let path = &link.import_path;
     match lang {
         _ if path.is_empty() => String::new(),
-        CodeLang::React => format!("import {{ {} }} from {};", link.name.split('.').next().unwrap_or_default(), js_string(path)),
+        CodeLang::React | CodeLang::ArkUi => format!("import {{ {} }} from {};", link.name.split('.').next().unwrap_or_default(), js_string(path)),
         CodeLang::Leptos => format!("use {path}::{};", link.name.split('.').next().unwrap_or_default()),
+        // A single-file component is a default export.
+        CodeLang::Vue => format!("import {} from {};", link.name.split('.').next().unwrap_or_default(), js_string(path)),
         CodeLang::Flutter => format!("import '{}';", path.replace(['\'', '\\'], "")),
         _ => format!("import {path}"),
     }
 }
 
-/// Layer `id`'s code with `link`: the import line and the snippet (an instance's values, else the
-/// defaults). `None` when `id` isn't a component, set or instance.
+/// Layer `id`'s code with `link`: the import lines (its own and those of connected components its
+/// instance swaps place) and the snippet (an instance's values, else the defaults). `None` when
+/// `id` isn't a component, set or instance.
 pub fn connected_code(doc: &Document, id: NodeId, lang: CodeLang, link: &CodeLink) -> Option<String> {
     let c = main_of(doc, id).and_then(|m| describe(doc, m))?;
     let values = instance_values(doc, id, &c).unwrap_or_else(|| c.params.iter().map(|p| (p.prop.clone(), p.default.clone())).collect());
-    let snippet = render(doc, &c, &values, link, lang, "");
-    let import = import_line(link, lang);
-    Some(if import.is_empty() { snippet } else { format!("{import}\n\n{snippet}") })
+    let mut imports = Vec::new();
+    snippet_imports(doc, &c, &values, link, lang, &mut imports);
+    Some(with_imports(&imports, render(doc, &c, &values, link, lang, "")))
+}
+
+/// `code` with `imports` at the top: joined to the import block it starts with, else apart.
+pub fn with_imports(imports: &[String], code: String) -> String {
+    match imports.join("\n") {
+        i if i.is_empty() => code,
+        i if code.starts_with("import ") || code.starts_with("use ") => format!("{i}\n{code}"),
+        i => format!("{i}\n\n{code}"),
+    }
+}
+
+/// Adds `line` to `out` unless it's empty or already there.
+fn add(out: &mut Vec<String>, line: String) {
+    if !line.is_empty() && !out.contains(&line) {
+        out.push(line);
+    }
+}
+
+/// The import lines a connected snippet needs: its own and those of the connected components its
+/// instance swaps place (the ones its template shows).
+fn snippet_imports(doc: &Document, c: &Component, values: &[(String, Value)], link: &CodeLink, lang: CodeLang, out: &mut Vec<String>) {
+    add(out, import_line(link, lang));
+    for piece in pieces(&link.template) {
+        if let Piece::Value { name, .. } = piece
+            && let Some((p, v)) = find(c, values, name)
+            && p.kind == ParamKind::InstanceSwap
+            && let Some(l) = id_of(v).and_then(|i| self::link(doc, i, lang))
+        {
+            add(out, import_line(l, lang));
+        }
+    }
+}
+
+/// The import lines of the connected components the generated code of layer `id` calls
+/// (instances in its tree, in a component's definition and in the slots an instance fills), once
+/// each in tree order. A connected `id` shows its snippet ([`connected_code`]) instead.
+pub fn tree_imports(doc: &Document, id: NodeId, lang: CodeLang) -> Vec<String> {
+    let mut out = Vec::new();
+    let Some(n) = doc.node(id) else { return out };
+    let c = main_of(doc, id).and_then(|m| describe(doc, m));
+    match (&n.kind, &c) {
+        // Its call (the slots it fills), then its component's definition.
+        (NodeKind::Instance { .. }, Some(c)) => {
+            call_imports(doc, id, lang, 0, &mut out);
+            tree(&Ctx { doc, root: c.comp, comp: Some(c), base: 0 }, c.comp, lang, 0, &mut out);
+        }
+        (NodeKind::Component { .. } | NodeKind::ComponentSet { .. }, Some(c)) => {
+            tree(&Ctx { doc, root: c.comp, comp: Some(c), base: 0 }, c.comp, lang, 0, &mut out)
+        }
+        _ => tree(&Ctx::new(doc, id), id, lang, 0, &mut out),
+    }
+    out
+}
+
+/// Imports under layer `id` as the code walk sees it: its visible children, instances as calls
+/// (one an instance swap parameter places is that parameter). shortcut: the depth cap counts from
+/// the tree's root, not from each slot's; align them if a deep slot tree shows a stray import.
+fn tree(ctx: &Ctx, id: NodeId, lang: CodeLang, depth: usize, out: &mut Vec<String>) {
+    let Some(n) = ctx.doc.node(id) else { return };
+    if ctx.too_deep(depth) {
+        return;
+    }
+    for k in ctx.kids(n) {
+        let Some(kn) = ctx.doc.node(k) else { continue };
+        let call = matches!(kn.kind, NodeKind::Instance { .. }) && main_of(ctx.doc, k).is_some();
+        match (call, ctx.param(kn, "mainComponent")) {
+            (true, Some(_)) => {}
+            (true, None) => call_imports(ctx.doc, k, lang, depth + 1, out),
+            (false, _) => tree(ctx, k, lang, depth + 1, out),
+        }
+    }
+}
+
+/// The imports instance `id` placed as a call brings: a connected one's snippet's, else those of
+/// the content it puts in its slots.
+fn call_imports(doc: &Document, id: NodeId, lang: CodeLang, depth: usize, out: &mut Vec<String>) {
+    let Some(c) = main_of(doc, id).and_then(|m| describe(doc, m)) else { return };
+    let Some(values) = instance_values(doc, id, &c) else { return };
+    if let Some(l) = link(doc, id, lang) {
+        return snippet_imports(doc, &c, &values, l, lang, out);
+    }
+    let slots = slots_of(doc, id);
+    for (p, (_, v)) in c.params.iter().zip(&values) {
+        if p.kind == ParamKind::Slot
+            && v.as_bool() == Some(true)
+            && let Some((slot, _)) = slots.iter().find(|(_, name)| *name == p.prop)
+        {
+            // The same depth base as the slot's generated content, so its connected children count.
+            tree(&Ctx { doc, root: *slot, comp: None, base: depth }, *slot, lang, depth + 1, out);
+        }
+    }
 }
 
 // ------------------------------------------------------------------ templates
@@ -175,33 +271,172 @@ fn expr(doc: &Document, c: &Component, p: &Param, v: &Value, lang: CodeLang) ->
     match (swapped, lang) {
         (Some(l), CodeLang::React) => format!("<{} />", l.name),
         (Some(l), CodeLang::Leptos) => format!("|| view! {{ <{} /> }}", l.name),
+        // A Vue binding takes the component itself.
+        (Some(l), CodeLang::Vue) => l.name.clone(),
         (Some(l), CodeLang::SwiftUi) => format!("{}()", l.name),
+        (Some(l), CodeLang::ArkUi) => format!("() => {{ {}() }}", l.name),
         (Some(l), CodeLang::Flutter) => format!("{}()", l.name),
         (Some(l), _) => format!("{{ {}() }}", l.name),
         (None, _) => value_expr(doc, c, p, v, lang),
     }
 }
 
+/// Template `t` as pieces. One that doesn't parse, or that skipped `check` (a hand-edited file)
+/// and is far too long, stays as written: parsing rescans after each literal brace.
+fn pieces(t: &str) -> Vec<Piece<'_>> {
+    let checkable = t.len() <= MAX_TEMPLATE * 4;
+    checkable.then(|| parse(t).ok()).flatten().unwrap_or_else(|| vec![Piece::Text(t)])
+}
+
+/// Whether `s` ends inside an unclosed opening tag (no `>` outside quotes since the last `<`).
+fn inside_open_tag(s: &str) -> bool {
+    let mut in_tag = false;
+    let mut quote = None;
+    let mut chars = s.chars().peekable();
+    while let Some(c) = chars.next() {
+        match quote {
+            Some(q) => {
+                if c == q {
+                    quote = None;
+                }
+            }
+            None => match c {
+                '<' if !in_tag && chars.peek().is_some_and(|ch| ch.is_ascii_alphabetic() || matches!(*ch, '/' | '!' | '?')) => {
+                    in_tag = true;
+                }
+                '>' if in_tag => in_tag = false,
+                '"' | '\'' if in_tag => quote = Some(c),
+                _ => {}
+            },
+        }
+    }
+    in_tag
+}
+
+/// Where a placeholder sits in a Vue template: whether the attribute is bound, and the quote the
+/// template already opened (if any). `None` when it isn't in an attribute at all.
+fn vue_attribute(out: &str) -> Option<(bool, Option<char>)> {
+    let end = out.trim_end();
+    if !inside_open_tag(end) {
+        return None;
+    }
+    let (after, quote) = match end.chars().last() {
+        Some(q @ ('"' | '\'')) => (&end[..end.len() - q.len_utf8()], Some(q)),
+        _ => (end, None),
+    };
+    let after = after.trim_end();
+    let eq = after.rfind('=')?;
+    // The placeholder must follow the `=` (or its opening quote) directly; text after a closed
+    // attribute (`<Card title='Buy'>`) is template content, not an attribute value.
+    if !after[eq + 1..].trim().is_empty() {
+        return None;
+    }
+    let before = after[..eq].trim_end();
+    let name: String = before
+        .chars()
+        .rev()
+        .take_while(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_' | ':' | '@' | '.' | '[' | ']'))
+        .collect::<Vec<_>>()
+        .into_iter()
+        .rev()
+        .collect();
+    if name.is_empty() {
+        return None;
+    }
+    let bound = name.starts_with(':') || name.starts_with("v-bind:") || name.starts_with('@') || name.starts_with("v-on:") || name.starts_with("v-");
+    Some((bound, quote))
+}
+
+/// An expression written into an HTML attribute opened with `quote`: its own delimiter and markup
+/// become entities, so Vue's parser hands the expression its string literal intact.
+fn html_attr_expr(e: &str, quote: Option<char>) -> String {
+    let e = e.replace('&', "&amp;").replace('<', "&lt;");
+    match quote {
+        Some('\'') => e.replace('\'', "&#39;"),
+        _ => e.replace('"', "&quot;"),
+    }
+}
+
+/// Literal text written into an HTML attribute opened with `quote`.
+fn html_attr_text(s: &str, quote: Option<char>) -> String {
+    let s = s.replace('&', "&amp;").replace('<', "&lt;");
+    match quote {
+        Some('\'') => s.replace('\'', "&#39;"),
+        _ => s.replace('"', "&quot;"),
+    }
+}
+
+/// Literal text in Vue template content: braces would start an interpolation, so they are escaped.
+fn html_text(s: &str) -> String {
+    s.replace('&', "&amp;").replace('<', "&lt;").replace('>', "&gt;").replace('{', "&#123;").replace('}', "&#125;")
+}
+
 /// `link`'s template with `values` (one per parameter of `c`), every line prefixed by `pad`.
 pub(crate) fn render(doc: &Document, c: &Component, values: &[(String, Value)], link: &CodeLink, lang: CodeLang, pad: &str) -> String {
-    // A template that skipped `check` (a hand-edited file) and is far too long stays as written:
-    // parsing rescans after each literal brace.
-    let checkable = link.template.len() <= MAX_TEMPLATE * 4;
-    let pieces = checkable.then(|| parse(&link.template).ok()).flatten().unwrap_or_else(|| vec![Piece::Text(&link.template)]);
     let mut out = String::new();
-    for piece in pieces {
+    // A quoted attribute stays open across substitutions: `title="{a} {b}"` must treat both
+    // placeholders as attribute values, not text after the first one.
+    let mut vue_attr: Option<(bool, Option<char>)> = None;
+    for piece in pieces(&link.template) {
         match piece {
-            Piece::Text(t) => out.push_str(t),
+            Piece::Text(t) => {
+                out.push_str(t);
+                if let Some((_, Some(q))) = vue_attr
+                    && t.contains(q)
+                {
+                    vue_attr = None;
+                }
+            }
             Piece::Value { name, inner } => match find(c, values, name) {
                 Some((p, v)) => {
                     let e = expr(doc, c, p, v, lang);
                     // JSX and `view!`: a plain string reads best as an attribute value, anything
                     // else is an expression in braces (JSX attribute strings have no escapes).
-                    let markup = matches!(lang, CodeLang::React | CodeLang::Leptos);
-                    if !markup || (out.ends_with('=') && e.starts_with('"') && !e.contains('\\')) {
-                        out.push_str(&e);
+                    // Vue's bound attributes take an expression, so a string keeps its JS quotes
+                    // inside the attribute (as entities); a static attribute takes plain text.
+                    if lang == CodeLang::Vue {
+                        match vue_attr.or_else(|| vue_attribute(&out)) {
+                            Some((bound, quote)) => {
+                                if bound {
+                                    let expr = html_attr_expr(&e, quote);
+                                    if quote.is_some() {
+                                        out.push_str(&expr);
+                                    } else {
+                                        out.push('"');
+                                        out.push_str(&expr);
+                                        out.push('"');
+                                    }
+                                } else {
+                                    let text = match &p.kind {
+                                        ParamKind::Text | ParamKind::Variant(_) => html_attr_text(v.as_str().unwrap_or(""), quote),
+                                        _ => e.clone(),
+                                    };
+                                    if quote.is_some() {
+                                        out.push_str(&text);
+                                    } else {
+                                        out.push('"');
+                                        out.push_str(&text);
+                                        out.push('"');
+                                    }
+                                }
+                                vue_attr = quote.map(|q| (bound, Some(q)));
+                            }
+                            None => {
+                                let text = match &p.kind {
+                                    ParamKind::Text | ParamKind::Variant(_) => html_text(v.as_str().unwrap_or("")),
+                                    _ => e.clone(),
+                                };
+                                out.push_str(&text);
+                                vue_attr = None;
+                            }
+                        }
                     } else {
-                        out.push_str(&format!("{{{e}}}"));
+                        let markup = matches!(lang, CodeLang::React | CodeLang::Leptos);
+                        if !markup || (out.ends_with('=') && e.starts_with('"') && !e.contains('\\')) {
+                            out.push_str(&e);
+                        } else {
+                            out.push_str(&format!("{{{e}}}"));
+                        }
                     }
                 }
                 None => out.push_str(&format!("{{{inner}}}")),
@@ -223,7 +458,9 @@ fn default_template(c: &Component, lang: CodeLang, name: &str) -> String {
         CodeLang::Leptos => {
             format!("<{name}{} />", params.iter().map(|p| format!(" {}={{{p}}}", crate::component_codegen::rust_ident(p))).collect::<String>())
         }
+        CodeLang::Vue => format!("<{name}{} />", params.iter().map(|p| format!(" :{p}={{{p}}}")).collect::<String>()),
         CodeLang::SwiftUi | CodeLang::Flutter => format!("{name}({})", params.iter().map(|p| format!("{p}: {{{p}}}")).collect::<Vec<_>>().join(", ")),
+        CodeLang::ArkUi => format!("{name}({{ {} }})", params.iter().map(|p| format!("{p}: {{{p}}}")).collect::<Vec<_>>().join(", ")),
         _ => format!("{name}({})", params.iter().map(|p| format!("{p} = {{{p}}}")).collect::<Vec<_>>().join(", ")),
     }
 }
@@ -241,15 +478,18 @@ pub fn check(c: &Component, link: &CodeLink, lang: CodeLang) -> std::result::Res
     }
     let path = &link.import_path;
     let path_ok = match lang {
-        CodeLang::React => !path.chars().any(|ch| ch.is_control() || ch == '"' || ch == '\\'),
+        CodeLang::React | CodeLang::ArkUi => !path.chars().any(|ch| ch.is_control() || ch == '"' || ch == '\\'),
         CodeLang::Leptos => path.chars().all(|ch| ch.is_ascii_alphanumeric() || ch == '_' || ch == ':'),
+        CodeLang::Vue => path.chars().all(|ch| ch.is_ascii_alphanumeric() || "_./@-".contains(ch)),
         CodeLang::Flutter => path.chars().all(|ch| ch.is_ascii_alphanumeric() || "_./:-".contains(ch)),
         _ => path.chars().all(|ch| ch.is_ascii_alphanumeric() || ch == '_' || ch == '.'),
     };
     if path.chars().count() > MAX_IMPORT || !path_ok {
         return Err(match lang {
             CodeLang::React => format!("importPath: a module path without quotes, up to {MAX_IMPORT} characters"),
+            CodeLang::ArkUi => format!("importPath: a module path without quotes, up to {MAX_IMPORT} characters"),
             CodeLang::Leptos => format!("importPath: a Rust module path (letters, digits, _ and ::), up to {MAX_IMPORT} characters"),
+            CodeLang::Vue => format!("importPath: a module path (letters, digits, _ . / @ and -), up to {MAX_IMPORT} characters"),
             CodeLang::Flutter => {
                 format!("importPath: a Dart import (package:acme/card.dart; letters, digits, _ . / : and -), up to {MAX_IMPORT} characters")
             }
@@ -288,7 +528,7 @@ fn text(cmd: &str, p: &Value, key: &str) -> Result<Option<String>> {
 /// The `language` parameter (default React).
 fn lang_param(cmd: &str, p: &Value) -> Result<CodeLang> {
     match text(cmd, p, "language")? {
-        Some(l) => language(&l).ok_or_else(|| bad(cmd, "language: react|leptos|swiftui|compose|flutter")),
+        Some(l) => language(&l).ok_or_else(|| bad(cmd, "language: react|leptos|vue|swiftui|compose|arkui|flutter")),
         None => Ok(CodeLang::React),
     }
 }
@@ -318,7 +558,7 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "codeConnect.set",
             "Connect to code",
-            "{id? (component, set or instance; default the selection), language?: react|leptos|swiftui|compose|flutter (default react), importPath?, name? (default the generated name), template? (default a call passing every property)}  links the component (its set, for a variant) to its code component; fields left out keep their current value. Placeholders: {property} (its name or parameter name) and {property ? \"a\" : \"b\"}; other {…} stay as written  → {component, language, code (the snippet for the layer), unknown (placeholder names that aren't properties)}",
+            "{id? (component, set or instance; default the selection), language?: react|leptos|vue|swiftui|compose|arkui|flutter (default react), importPath?, name? (default the generated name), template? (default a call passing every property)}  links the component (its set, for a variant) to its code component; fields left out keep their current value. Placeholders: {property} (its name or parameter name) and {property ? \"a\" : \"b\"}; other {…} stay as written  → {component, language, code (the snippet for the layer), unknown (placeholder names that aren't properties)}",
             true,
             |s, p| {
                 let cmd = "codeConnect.set";
@@ -433,7 +673,10 @@ fn import(s: &mut Session, p: &Value) -> Result<Value> {
         let (Some(component), Some(lang), Some(name), Some(template)) =
             (field("component"), field("language").and_then(language), field("name"), e.get("template").and_then(Value::as_str))
         else {
-            warnings.push(format!("link {}: needs component, language (react|leptos|swiftui|compose|flutter), name and template strings", i + 1));
+            warnings.push(format!(
+                "link {}: needs component, language (react|leptos|vue|swiftui|compose|arkui|flutter), name and template strings",
+                i + 1
+            ));
             continue;
         };
         let link = CodeLink {
diff --git a/crates/engine/src/dev/codegen.rs b/crates/engine/src/dev/codegen.rs
new file mode 100644
index 00000000..fa9a6287
--- /dev/null
+++ b/crates/engine/src/dev/codegen.rs
@@ -0,0 +1,683 @@
+//! Code for a layer, as shown by the Inspect panel and returned by `inspect.code`: CSS for the
+//! layer itself, HTML or React for its subtree, and SwiftUI, Jetpack Compose, ArkUI (HarmonyOS) or
+//! Flutter (stacks for auto layout, absolute offsets otherwise). Components become components
+//! whose properties are parameters and instances become calls passing their values (see
+//! [`crate::component_codegen`]); variables bound to a layer become CSS custom properties. The
+//! output is a starting point, not a pixel-exact translation.
+
+use figcraft_color::{Color, PaintKind};
+use figcraft_doc::*;
+use serde_json::json;
+
+use crate::cmd::CommandSpec;
+use crate::component_codegen::{Component, Param};
+use crate::params::*;
+use crate::{bad, spec};
+
+mod arkui;
+mod compose;
+mod css;
+mod flutter;
+mod html;
+mod swift;
+
+pub(crate) use arkui::arkui;
+pub(crate) use compose::{compose, kotlin_color};
+pub(crate) use css::Tokens;
+#[cfg(test)]
+pub(crate) use css::css_decls;
+use css::{css, tok};
+pub use css::{css_var_name, css_var_of};
+pub(crate) use flutter::{FLUTTER_IMPORT, Place, flutter, flutter_indent};
+use html::html;
+pub(crate) use html::{Markup, class_name};
+pub(crate) use swift::swift;
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![spec!(
+        "inspect.code",
+        "Code for layer",
+        "{id?, language?: css|html|react|leptos|vue|tailwind|swiftui|compose|arkui|flutter (default css; html, react, leptos and vue are the whole layer tree; components take their properties as parameters, instances pass their values; a component connected to code (codeConnect.set) gives its import and snippet instead; tailwind is React with Tailwind CSS v4 utilities for pages: fluid auto layout boxes, instances inlined with their overrides, bound variables as theme utilities), mobile? (tailwind: a mobile frame with the same layer names; the code is mobile first with the desktop layer's classes behind lg:), unit?: px|rem (CSS, HTML, React, Leptos and Vue; default px), rootFontSize? (rem: pixels per rem, default 16)} → {code, language, connected}",
+        false,
+        |s, p| {
+            let cmd = "inspect.code";
+            let id = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a layer"))?;
+            let lang = match string(p, "language") {
+                Some(l) => {
+                    CodeLang::from_id(&l).ok_or_else(|| bad(cmd, "language: css|html|react|leptos|vue|tailwind|swiftui|compose|arkui|flutter"))?
+                }
+                None => CodeLang::Css,
+            };
+            let rem = match string(p, "unit").map(|u| u.to_ascii_lowercase()).as_deref() {
+                None | Some("px") => None,
+                Some("rem") => Some(num_or(p, "rootFontSize", 16.0)).filter(|r| r.is_finite() && *r > 0.0 && *r <= 1000.0),
+                Some(_) => return Err(bad(cmd, "unit: px|rem")),
+            };
+            if string(p, "unit").is_some_and(|u| u.eq_ignore_ascii_case("rem")) && rem.is_none() {
+                return Err(bad(cmd, "rootFontSize: a positive number of pixels (up to 1000)"));
+            }
+            let doc = s.doc()?;
+            if !doc.contains(id) {
+                return Err(bad(cmd, "no such layer"));
+            }
+            let connected = crate::code_connect::link(doc, id, lang).is_some();
+            let mobile = match get(p, "mobile") {
+                None | Some(serde_json::Value::Null) => None,
+                Some(v) => Some(id_of(v).filter(|m| doc.contains(*m)).ok_or_else(|| bad(cmd, "mobile: the id of a mobile frame"))?),
+            };
+            let code = match (lang, mobile) {
+                (CodeLang::Tailwind, Some(m)) => crate::tailwind::code(doc, id, Some(m)),
+                _ => code_for(doc, id, lang),
+            };
+            let code = match rem {
+                Some(root) if lang.is_web() => px_to_rem(&code, root),
+                _ => code,
+            };
+            Ok(json!({"code": code, "language": lang.id(), "connected": connected}))
+        }
+    )]
+}
+
+/// Languages the Inspect panel offers.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
+pub enum CodeLang {
+    #[default]
+    Css,
+    /// The whole layer tree as nested HTML elements with a stylesheet.
+    Html,
+    /// A React function component (TSX) with its stylesheet.
+    React,
+    /// A Leptos component (`view!` markup) with its stylesheet.
+    Leptos,
+    /// A Vue single-file component (`<template>`, `<script setup>`, `<style scoped>`).
+    Vue,
+    /// A React function component styled with Tailwind CSS v4 utilities (no stylesheet).
+    Tailwind,
+    SwiftUi,
+    Compose,
+    /// HarmonyOS ArkUI: an ArkTS struct (`@Component`, `build`).
+    ArkUi,
+    /// A Flutter `StatelessWidget` (Dart) with its widget tree.
+    Flutter,
+}
+
+impl CodeLang {
+    pub const ALL: [CodeLang; 10] = [
+        CodeLang::Css,
+        CodeLang::Html,
+        CodeLang::React,
+        CodeLang::Leptos,
+        CodeLang::Vue,
+        CodeLang::Tailwind,
+        CodeLang::SwiftUi,
+        CodeLang::Compose,
+        CodeLang::ArkUi,
+        CodeLang::Flutter,
+    ];
+    pub fn id(self) -> &'static str {
+        match self {
+            CodeLang::Css => "css",
+            CodeLang::Html => "html",
+            CodeLang::React => "react",
+            CodeLang::Leptos => "leptos",
+            CodeLang::Vue => "vue",
+            CodeLang::Tailwind => "tailwind",
+            CodeLang::SwiftUi => "swiftui",
+            CodeLang::Compose => "compose",
+            CodeLang::ArkUi => "arkui",
+            CodeLang::Flutter => "flutter",
+        }
+    }
+    pub fn label(self) -> &'static str {
+        match self {
+            CodeLang::Css => "CSS",
+            CodeLang::Html => "HTML + CSS",
+            CodeLang::React => "React",
+            CodeLang::Leptos => "Leptos",
+            CodeLang::Vue => "Vue",
+            CodeLang::Tailwind => "React + Tailwind",
+            CodeLang::SwiftUi => "SwiftUI",
+            CodeLang::Compose => "Compose",
+            CodeLang::ArkUi => "ArkUI",
+            CodeLang::Flutter => "Flutter",
+        }
+    }
+    /// Languages whose lengths are CSS pixels that can be shown in rem (not Tailwind: its lengths
+    /// are utility classes).
+    pub fn is_web(self) -> bool {
+        matches!(self, CodeLang::Css | CodeLang::Html | CodeLang::React | CodeLang::Leptos | CodeLang::Vue)
+    }
+    /// Languages whose strings interpolate `$` (Kotlin's `$name`, Dart's `$name`), where a literal
+    /// `$` has to be escaped.
+    pub fn escapes_dollar(self) -> bool {
+        matches!(self, CodeLang::Compose | CodeLang::Flutter)
+    }
+    pub fn from_id(s: &str) -> Option<CodeLang> {
+        if s.eq_ignore_ascii_case("tsx") || s.eq_ignore_ascii_case("jsx") {
+            return Some(CodeLang::React);
+        }
+        if s.eq_ignore_ascii_case("sfc") || s.eq_ignore_ascii_case("vue3") {
+            return Some(CodeLang::Vue);
+        }
+        if s.eq_ignore_ascii_case("arkts") {
+            return Some(CodeLang::ArkUi);
+        }
+        if s.eq_ignore_ascii_case("dart") {
+            return Some(CodeLang::Flutter);
+        }
+        CodeLang::ALL.into_iter().find(|l| l.id().eq_ignore_ascii_case(s) || l.label().eq_ignore_ascii_case(s))
+    }
+}
+
+/// Layers deeper than this (or past this many children) are summarised.
+const MAX_DEPTH: usize = 12;
+const MAX_CHILDREN: usize = 200;
+
+/// `v` without trailing zeros (2 decimals).
+pub(crate) fn num(v: f64) -> String {
+    if !v.is_finite() {
+        return "0".into();
+    }
+    let r = (v * 100.0).round() / 100.0;
+    if (r - r.round()).abs() < 1e-9 {
+        // `as i64` saturates past 2^63, so larger whole values are printed from the float.
+        if r.abs() < 9e18 { format!("{}", r.round() as i64) } else { format!("{:.0}", r.round()) }
+    } else {
+        format!("{r}")
+    }
+}
+
+/// `v` without trailing zeros (6 decimals), for lengths that must convert back to the same pixels.
+fn num6(v: f64) -> String {
+    let r = (v * 1_000_000.0).round() / 1_000_000.0;
+    if r.is_finite() && r != 0.0 { format!("{r}") } else { "0".into() }
+}
+
+/// `code` with every pixel length (`12px`) in rem of `root` pixels (`0.75rem`); names that end
+/// in "px", markup lines (layer text), string literals and comments are left alone.
+pub fn px_to_rem(code: &str, root: f64) -> String {
+    let mut out = String::with_capacity(code.len());
+    let mut in_comment = false;
+    for line in code.split_inclusive('\n') {
+        if !in_comment && line.trim_start().starts_with('<') {
+            out.push_str(line);
+            continue;
+        }
+        // Lengths outside strings and comments convert; `plain` is where that stretch starts.
+        let mut plain = 0;
+        let mut chars = line.char_indices().peekable();
+        while let Some((i, c)) = chars.next() {
+            if in_comment {
+                if c == '*' && chars.peek().is_some_and(|(_, n)| *n == '/') {
+                    chars.next();
+                    out.push_str(line.get(plain..i + 2).unwrap_or(""));
+                    plain = i + 2;
+                    in_comment = false;
+                }
+            } else if c == '/' && chars.peek().is_some_and(|(_, n)| *n == '*') {
+                chars.next();
+                out.push_str(&lengths_to_rem(line.get(plain..i).unwrap_or(""), root));
+                plain = i;
+                in_comment = true;
+            } else if c == '"' {
+                out.push_str(&lengths_to_rem(line.get(plain..i).unwrap_or(""), root));
+                let mut end = line.len();
+                while let Some((j, s)) = chars.next() {
+                    if s == '\\' {
+                        chars.next();
+                    } else if s == '"' {
+                        end = j + 1;
+                        break;
+                    }
+                }
+                out.push_str(line.get(i..end).unwrap_or(""));
+                plain = end;
+            }
+        }
+        let rest = line.get(plain..).unwrap_or("");
+        if in_comment {
+            out.push_str(rest);
+        } else {
+            out.push_str(&lengths_to_rem(rest, root));
+        }
+    }
+    out
+}
+
+/// `code` with every pixel length in rem of `root` pixels; names that end in "px" are left alone.
+fn lengths_to_rem(code: &str, root: f64) -> String {
+    let ident = |c: char| c.is_alphanumeric() || c == '_';
+    let mut out = String::with_capacity(code.len());
+    let mut rest = code;
+    while let Some(i) = rest.find("px") {
+        let (head, tail) = (rest.get(..i).unwrap_or(""), rest.get(i + 2..).unwrap_or(""));
+        // The number right before "px".
+        let start = head.char_indices().rev().take_while(|(_, c)| c.is_ascii_digit() || *c == '.' || *c == '-').last().map_or(head.len(), |(j, _)| j);
+        let (before, number) = (head.get(..start).unwrap_or(""), head.get(start..).unwrap_or(""));
+        let free = !before.chars().next_back().is_some_and(ident) && !tail.chars().next().is_some_and(|c| ident(c) || c == '-');
+        match number.parse::<f64>() {
+            Ok(v) if free && v.is_finite() => {
+                out.push_str(before);
+                out.push_str(&format!("{}rem", num6(v / root)));
+            }
+            _ => {
+                out.push_str(head);
+                out.push_str("px");
+            }
+        }
+        rest = tail;
+    }
+    out.push_str(rest);
+    out
+}
+
+pub fn code_for(doc: &Document, id: NodeId, lang: CodeLang) -> String {
+    match lang {
+        CodeLang::Css => css(doc, id),
+        CodeLang::Html => html(doc, id),
+        CodeLang::Tailwind => crate::tailwind::code(doc, id, None),
+        CodeLang::React | CodeLang::Leptos | CodeLang::Vue | CodeLang::SwiftUi | CodeLang::Compose | CodeLang::ArkUi | CodeLang::Flutter => {
+            crate::component_codegen::code(doc, id, lang)
+        }
+    }
+}
+
+/// What a tree walk generates for: the document, the layer the code is for (instances under it
+/// become calls), and the component whose properties are parameters.
+pub(crate) struct Ctx<'a> {
+    pub doc: &'a Document,
+    pub root: NodeId,
+    pub comp: Option<&'a Component>,
+    /// Indentation the walk starts at (the depth cap counts from it).
+    pub base: usize,
+}
+
+impl<'a> Ctx<'a> {
+    pub fn new(doc: &'a Document, root: NodeId) -> Self {
+        Ctx { doc, root, comp: None, base: 0 }
+    }
+
+    /// The component parameter controlling `field` ("visible", "characters", "mainComponent",
+    /// "slot") of `n`.
+    pub fn param(&self, n: &Node, field: &str) -> Option<&'a Param> {
+        let name = n.prop_refs.get(field)?;
+        self.comp?.params.iter().find(|p| &p.prop == name)
+    }
+
+    /// Visible children in paint order (bottom first), capped; in component code, hidden layers a
+    /// boolean parameter shows are included.
+    pub fn kids(&self, n: &Node) -> Vec<NodeId> {
+        n.children
+            .iter()
+            .copied()
+            .filter(|c| self.doc.node(*c).is_some_and(|k| k.visible || self.param(k, "visible").is_some()))
+            .take(MAX_CHILDREN)
+            .collect()
+    }
+
+    pub(crate) fn too_deep(&self, depth: usize) -> bool {
+        depth > self.base + MAX_DEPTH
+    }
+
+    /// A call for an instance below the root (`None` for other layers, or a missing main), with
+    /// the CSS its slot content generated.
+    fn call(&self, n: &Node, lang: CodeLang, depth: usize) -> Option<(String, String)> {
+        if n.id == self.root || !matches!(n.kind, NodeKind::Instance { .. }) {
+            return None;
+        }
+        crate::component_codegen::usage_with_styles(self.doc, n.id, lang, depth)
+    }
+}
+
+fn first_fill(n: &Node) -> Option<Color> {
+    n.fills.iter().filter(|p| p.visible).find_map(|p| match &p.kind {
+        PaintKind::Solid { color } => Some(color.with_alpha(color.a * p.opacity)),
+        PaintKind::Gradient(g) => g.sorted_stops().first().map(|s| s.color),
+        PaintKind::Image(_) | PaintKind::Pattern(_) => None,
+    })
+}
+
+fn stroke_color(n: &Node) -> Option<Color> {
+    if !n.has_visible_stroke() {
+        return None;
+    }
+    n.strokes.iter().filter(|p| p.visible).find_map(|p| p.solid_color())
+}
+
+/// The CSS borders a solid stroke makes: one `border`, or with individual stroke sides a border
+/// on each side that has a weight.
+fn css_borders(doc: &Document, n: &Node, t: &mut Tokens) -> Vec<(String, String)> {
+    let Some(c) = stroke_color(n) else { return Vec::new() };
+    let Some(sides) = n.stroke.sides else {
+        let weight = tok(doc, n, &["strokeWeight"], format!("{}px", num(n.stroke.weight)), t);
+        return vec![("border".into(), format!("{weight} solid {}", tok(doc, n, &["stroke"], c.to_css(), t)))];
+    };
+    let color = tok(doc, n, &["stroke"], c.to_css(), t);
+    let named = ["top", "right", "bottom", "left"].into_iter().zip(crate::cmd::props::STROKE_SIDES);
+    named
+        .zip(sides)
+        .filter(|(_, weight)| *weight > 0.0)
+        .map(|((side, field), weight)| {
+            (format!("border-{side}"), format!("{} solid {color}", tok(doc, n, &[field], format!("{}px", num(weight)), t)))
+        })
+        .collect()
+}
+
+fn drop_shadow(n: &Node) -> Option<&Shadow> {
+    n.effects.iter().filter(|e| e.visible).find_map(|e| match &e.kind {
+        EffectKind::DropShadow(s) => Some(s),
+        _ => None,
+    })
+}
+
+fn radius(n: &Node) -> f64 {
+    n.corners.uniform().unwrap_or_else(|| n.corners.radii.iter().copied().fold(0.0, f64::max))
+}
+
+/// Text content as a string literal (escaped for Swift; Kotlin also escapes `$`).
+pub(crate) fn literal(s: &str, kotlin: bool) -> String {
+    let mut out = String::from("\"");
+    for c in s.chars().take(10_000) {
+        match c {
+            '"' => out.push_str("\\\""),
+            '\\' => out.push_str("\\\\"),
+            '\n' | '\u{2028}' => out.push_str("\\n"),
+            '\r' => {}
+            '\t' => out.push_str("\\t"),
+            '$' if kotlin => out.push_str("\\$"),
+            c if c.is_control() => {}
+            c => out.push(c),
+        }
+    }
+    out.push('"');
+    out
+}
+
+pub(crate) fn indent(depth: usize) -> String {
+    "    ".repeat(depth)
+}
+
+/// The index of `markup`'s first tag-closing `>`, skipping `>` inside quoted attribute values.
+fn tag_end(markup: &str) -> Option<usize> {
+    let mut quote = None;
+    for (i, c) in markup.char_indices() {
+        match quote {
+            Some(q) => {
+                if c == q {
+                    quote = None;
+                }
+            }
+            None => match c {
+                '"' | '\'' => quote = Some(c),
+                '>' => return Some(i),
+                _ => {}
+            },
+        }
+    }
+    None
+}
+
+/// `markup`'s first element with a Vue `v-if` attribute (a call with no placing wrapper).
+fn with_v_if(markup: &str, guard: Option<&str>) -> String {
+    let Some(guard) = guard else { return markup.to_string() };
+    let Some(end) = tag_end(markup) else { return markup.to_string() };
+    let before = markup[..end].trim_end();
+    let at = if before.ends_with('/') { before.len() - 1 } else { end };
+    format!("{} v-if=\"{guard}\"{}", &markup[..at], &markup[at..])
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::Session;
+    use crate::params::id_of;
+    use serde_json::json;
+
+    #[test]
+    fn num_keeps_huge_whole_numbers() {
+        assert_eq!(num(1e20), "100000000000000000000");
+        assert_eq!(num(-1e20), "-100000000000000000000");
+        assert_eq!(num(1e18), "1000000000000000000");
+        assert_eq!(num(-0.0), "0");
+    }
+
+    fn card(s: &mut Session) -> NodeId {
+        let f = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Card"})).unwrap()["id"]).unwrap();
+        s.execute("node.set", &json!({"id": f, "props": {"fills": ["#FFFFFF"], "cornerRadius": 12}})).unwrap();
+        s.execute("text.create", &json!({"text": "Say \"hi\" $5\nnow", "x": 0, "y": 0, "parent": f})).unwrap();
+        s.execute("shape.ellipse", &json!({"x": 0, "y": 0, "width": 24, "height": 24, "parent": f})).unwrap();
+        s.execute("layout.add", &json!({"ids": [f]})).unwrap();
+        f
+    }
+
+    #[test]
+    fn swiftui_and_compose_for_an_auto_layout_card() {
+        let mut s = Session::new();
+        let f = card(&mut s);
+        let doc = s.doc().unwrap();
+        let sw = code_for(doc, f, CodeLang::SwiftUi);
+        assert!(sw.contains("Stack(alignment:"), "{sw}");
+        assert!(sw.contains("Text(\"Say \\\"hi\\\" $5\\nnow\")"), "escaped: {sw}");
+        assert!(sw.contains("Ellipse()"));
+        assert!(sw.contains(".clipShape(RoundedRectangle(cornerRadius: 12))"));
+        let kt = code_for(doc, f, CodeLang::Compose);
+        assert!(kt.contains("Arrangement.spacedBy("), "{kt}");
+        assert!(kt.contains("\\$5"), "Kotlin escapes $: {kt}");
+        assert!(kt.contains("CircleShape"));
+        assert!(kt.contains("RoundedCornerShape(12.dp)"));
+        let css = code_for(doc, f, CodeLang::Css);
+        assert!(css.contains("display: flex;") && css.contains("border-radius: 12px;"));
+        // Through the command.
+        let v = s.execute("inspect.code", &json!({"id": f, "language": "compose"})).unwrap();
+        assert_eq!(v["code"].as_str().unwrap(), kt);
+        assert!(s.execute("inspect.code", &json!({"id": f, "language": "cobol"})).is_err());
+    }
+
+    #[test]
+    fn arkui_for_an_auto_layout_card() {
+        let mut s = Session::new();
+        let f = card(&mut s);
+        let doc = s.doc().unwrap();
+        let ark = code_for(doc, f, CodeLang::ArkUi);
+        for want in [
+            "Row({ space: ",
+            "Text(\"Say \\\"hi\\\" $5\\nnow\")",
+            ".fontSize(",
+            ".fontWeight(",
+            "Ellipse({ width: 24, height: 24 })",
+            ".backgroundColor('#FFFFFF')",
+            ".borderRadius(12)",
+            ".width(",
+            ".height(100)",
+            ".clip(true)",
+        ] {
+            assert!(ark.contains(want), "ArkUI has {want:?}:\n{ark}");
+        }
+        // Through the command, and "arkts" reads as ArkUI too.
+        let v = s.execute("inspect.code", &json!({"id": f, "language": "arkui"})).unwrap();
+        assert_eq!(v["code"].as_str().unwrap(), ark);
+        assert_eq!(v["language"], "arkui");
+        assert_eq!(s.execute("inspect.code", &json!({"id": f, "language": "arkts"})).unwrap()["language"], "arkui");
+    }
+
+    #[test]
+    fn free_children_get_offsets_and_deep_trees_are_capped() {
+        let mut s = Session::new();
+        let mut parent = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 50, "height": 50})).unwrap()["id"]).unwrap();
+        let root = parent;
+        s.execute("shape.rectangle", &json!({"x": 7, "y": 9, "width": 5, "height": 5, "parent": root})).unwrap();
+        for _ in 0..20 {
+            parent = id_of(&s.execute("frame.create", &json!({"x": 1, "y": 1, "width": 40, "height": 40, "parent": parent})).unwrap()["id"]).unwrap();
+        }
+        let doc = s.doc().unwrap();
+        let sw = code_for(doc, root, CodeLang::SwiftUi);
+        assert!(sw.contains(".offset(x: 7, y: 9)"), "{sw}");
+        assert!(sw.contains("…"), "depth capped");
+        let kt = code_for(doc, root, CodeLang::Compose);
+        assert!(kt.contains("Modifier.offset(7.dp, 9.dp)"));
+        let ark = code_for(doc, root, CodeLang::ArkUi);
+        assert!(ark.contains(".position({ x: 7, y: 9 })"), "{ark}");
+        assert!(ark.contains("…"), "depth capped");
+        assert!(code_for(doc, NodeId(999_999), CodeLang::Css).is_empty());
+    }
+
+    #[test]
+    fn arkui_aligned_text_gets_the_layers_width() {
+        let mut s = Session::new();
+        let f = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 200, "height": 100})).unwrap()["id"]).unwrap();
+        let t = id_of(&s.execute("text.create", &json!({"text": "Hi", "x": 0, "y": 0, "parent": f})).unwrap()["id"]).unwrap();
+        s.execute("node.set", &json!({"id": t, "props": {"textAlign": "center", "width": 120.0}})).unwrap();
+        let doc = s.doc().unwrap();
+        let ark = code_for(doc, f, CodeLang::ArkUi);
+        assert!(ark.contains(".textAlign(TextAlign.Center)"), "{ark}");
+        let width = doc.node(t).map(|n| n.width).unwrap_or_default();
+        assert!(ark.contains(&format!(".width({})", num(width))), "the alignment has a box: {ark}");
+    }
+
+    #[test]
+    fn arkui_places_a_child_that_ignores_its_auto_layout_parent() {
+        let mut s = Session::new();
+        let f = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 200, "height": 100})).unwrap()["id"]).unwrap();
+        let c = id_of(&s.execute("shape.rectangle", &json!({"x": 7, "y": 9, "width": 20, "height": 20, "parent": f})).unwrap()["id"]).unwrap();
+        s.execute("node.set", &json!({"id": c, "props": {"absolute": true}})).unwrap();
+        s.execute("layout.add", &json!({"ids": [f]})).unwrap();
+        let doc = s.doc().unwrap();
+        let [_, _, _, _, x, y] = doc.node(c).unwrap().transform.as_coeffs();
+        let ark = code_for(doc, f, CodeLang::ArkUi);
+        assert!(ark.contains("Row(") || ark.contains("Column("), "the parent is still auto layout: {ark}");
+        assert!(ark.contains(&format!(".position({{ x: {}, y: {} }})", num(x), num(y))), "the absolute child keeps its place: {ark}");
+    }
+
+    #[test]
+    fn flutter_builds_a_widget_tree() {
+        let mut s = Session::new();
+        let f = card(&mut s);
+        let doc = s.doc().unwrap();
+        let dart = code_for(doc, f, CodeLang::Flutter);
+        // The card hugs its content, so its width is the layout's, not the 200 it was created with.
+        let w = doc.node(f).map(|n| n.width).unwrap_or_default();
+        assert!(dart.starts_with(&format!("Container(\n  width: {},\n  height: 100,\n", num(w))), "{dart}");
+        assert!(dart.contains("borderRadius: BorderRadius.circular(12)"), "{dart}");
+        assert!(dart.contains("child: Row(\n"), "{dart}");
+        assert!(dart.contains("      Text(\n        \"Say \\\"hi\\\" \\$5\\nnow\",\n"), "escaped: {dart}");
+        assert!(dart.contains("fontWeight: FontWeight.w400,"), "{dart}");
+        assert!(dart.contains("shape: BoxShape.circle"), "{dart}");
+        assert!(dart.ends_with(')'), "a bare expression, like the other native targets: {dart}");
+        // Through the command: `dart` names the same language, and rem is for the web only.
+        let v = s.execute("inspect.code", &json!({"id": f, "language": "flutter"})).unwrap();
+        assert_eq!(v["code"].as_str().unwrap(), dart);
+        assert_eq!(v["language"], "flutter");
+        assert_eq!(s.execute("inspect.code", &json!({"id": f, "language": "dart"})).unwrap()["language"], "flutter");
+        let rem = s.execute("inspect.code", &json!({"id": f, "language": "flutter", "unit": "rem"})).unwrap();
+        assert_eq!(rem["code"].as_str().unwrap(), dart, "rem doesn't apply to Dart");
+    }
+
+    #[test]
+    fn flutter_positions_free_children_and_bounds_the_tree() {
+        let mut s = Session::new();
+        let root = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 50, "height": 50})).unwrap()["id"]).unwrap();
+        s.execute("shape.rectangle", &json!({"x": 7, "y": 9, "width": 5, "height": 5, "parent": root})).unwrap();
+        let mut parent = root;
+        for _ in 0..20 {
+            parent = id_of(&s.execute("frame.create", &json!({"x": 1, "y": 1, "width": 40, "height": 40, "parent": parent})).unwrap()["id"]).unwrap();
+        }
+        let dart = code_for(s.doc().unwrap(), root, CodeLang::Flutter);
+        assert!(dart.contains("Stack(\n    alignment: Alignment.topLeft,\n"), "{dart}");
+        assert!(dart.contains("Positioned(\n        left: 7,\n        top: 9,\n"), "{dart}");
+        // A wrapper's closing parenthesis sits on its own line, not glued to the widget's.
+        assert!(dart.contains("        )\n      ),\n"), "{dart}");
+        assert!(dart.contains("…"), "the depth is capped: {dart}");
+        assert!(dart.contains("const SizedBox()"), "a capped layer is still a widget in the list: {dart}");
+    }
+
+    #[test]
+    fn flutter_expands_and_stretches_fill_children() {
+        let mut s = Session::new();
+        let row = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 200, "height": 40})).unwrap()["id"]).unwrap();
+        let a = id_of(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 50, "height": 20, "parent": row})).unwrap()["id"]).unwrap();
+        s.execute("shape.rectangle", &json!({"x": 60, "y": 0, "width": 50, "height": 20, "parent": row})).unwrap();
+        s.execute("layout.add", &json!({"ids": [row], "direction": "horizontal"})).unwrap();
+        s.execute("node.set", &json!({"id": a, "props": {"sizingH": "fill", "sizingV": "fill"}})).unwrap();
+        let dart = code_for(s.doc().unwrap(), row, CodeLang::Flutter);
+        assert!(dart.contains("child: Row(\n"), "{dart}");
+        assert!(dart.contains("Expanded(\n"), "a child filling the main axis takes the room left: {dart}");
+        assert!(dart.contains("crossAxisAlignment: CrossAxisAlignment.stretch,"), "a child filling the cross axis stretches the line: {dart}");
+    }
+
+    #[test]
+    fn flutter_lifts_a_child_that_ignores_its_auto_layout_parent_out_of_the_line() {
+        let mut s = Session::new();
+        let row = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 200, "height": 40})).unwrap()["id"]).unwrap();
+        let flow = id_of(&s.execute("shape.rectangle", &json!({"x": 4, "y": 4, "width": 50, "height": 20, "parent": row})).unwrap()["id"]).unwrap();
+        let over = id_of(&s.execute("shape.ellipse", &json!({"x": 150, "y": 6, "width": 30, "height": 30, "parent": row})).unwrap()["id"]).unwrap();
+        s.execute("layout.add", &json!({"ids": [row], "direction": "horizontal"})).unwrap();
+        s.execute("node.set", &json!({"id": row, "props": {"padding": [4, 4, 4, 4]}})).unwrap();
+        // It asks for both axes, which the line would read as "stretch me and take the room left".
+        s.execute("node.set", &json!({"id": over, "props": {"absolute": true, "sizingH": "fill", "sizingV": "fill"}})).unwrap();
+        let doc = s.doc().unwrap();
+        let dart = code_for(doc, row, CodeLang::Flutter);
+        let at = |needle: &str| dart.find(needle).unwrap_or_else(|| panic!("no {needle:?}: {dart}"));
+        // Over the line, in a Stack at the parent's own box, at its own offsets.
+        let [_, _, _, _, x, y] = doc.node(over).unwrap().transform.as_coeffs();
+        assert!(
+            dart.contains(&format!("Positioned(\n        left: {},\n        top: {},\n", num(x), num(y))),
+            "the absolute child keeps its place: {dart}"
+        );
+        let stack = at("child: Stack(\n");
+        let fill = at("Positioned.fill(\n");
+        let padding = at("padding: EdgeInsets.all(4),");
+        let line = at("child: Row(\n");
+        assert!(stack < fill && fill < padding && padding < line, "the line sits in the Stack, padded: {dart}");
+        assert!(!dart[..padding].contains("padding: "), "the parent's padding would offset the absolute child: {dart}");
+        // Only the flow child is in the line, so neither `Expanded` nor a stretch comes from it.
+        let over_at = at("\n      Positioned(\n");
+        let line_part = &dart[line..over_at];
+        assert!(line_part.contains("width: 50,"), "the flow child is in the line: {dart}");
+        assert!(!line_part.contains("width: 30,"), "the absolute child left the line: {dart}");
+        assert!(!dart.contains("Expanded(\n"), "it takes no room in the line either: {dart}");
+        assert!(dart.contains("crossAxisAlignment: CrossAxisAlignment.start,"), "{dart}");
+        assert!(doc.node(flow).is_some());
+    }
+
+    #[test]
+    fn arkui_wraps_a_positioned_instance_swap_so_the_position_lands_on_a_container() {
+        let mut s = Session::new();
+        let icon = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 400, "width": 24, "height": 24, "name": "Icon"})).unwrap()["id"]).unwrap();
+        s.execute("shape.star", &json!({"x": 0, "y": 0, "width": 24, "height": 24, "parent": icon})).unwrap();
+        let heart = id_of(&s.execute("component.create", &json!({"ids": [icon]})).unwrap()["id"]).unwrap();
+        let f = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 120, "height": 40, "name": "Chip"})).unwrap()["id"]).unwrap();
+        let nested = id_of(&s.execute("instance.create", &json!({"component": heart, "x": 8, "y": 8, "parent": f})).unwrap()["id"]).unwrap();
+        let chip = id_of(&s.execute("component.create", &json!({"ids": [f]})).unwrap()["id"]).unwrap();
+        s.execute("component.addProperty", &json!({"id": chip, "name": "Icon", "type": "instanceSwap", "default": heart, "layer": nested})).unwrap();
+        let doc = s.doc().unwrap();
+        let ark = code_for(doc, chip, CodeLang::ArkUi);
+        assert!(ark.contains("Stack() {\n"), "the builder is wrapped: {ark}");
+        assert!(ark.contains("this.icon()"), "{ark}");
+        // The position follows the wrapper's closing brace, not the void builder call.
+        let lines: Vec<&str> = ark.lines().collect();
+        let at = lines.iter().position(|l| l.contains(".position({ x: 8, y: 8 })")).unwrap_or_else(|| panic!("no position: {ark}"));
+        assert_eq!(lines[at - 1].trim(), "}", "the position is on a container: {ark}");
+    }
+
+    #[test]
+    fn too_deep_placeholder_keeps_a_multiline_layer_name_in_the_comment() {
+        let mut s = Session::new();
+        let name = "deep\nevil()\r\u{2028}more()";
+        let mut parent = id_of(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 50, "height": 50, "name": name})).unwrap()["id"]).unwrap();
+        let root = parent;
+        for _ in 0..16 {
+            parent =
+                id_of(&s.execute("frame.create", &json!({"x": 1, "y": 1, "width": 40, "height": 40, "parent": parent, "name": name})).unwrap()["id"])
+                    .unwrap();
+        }
+        let doc = s.doc().unwrap();
+        for lang in [CodeLang::SwiftUi, CodeLang::Compose, CodeLang::ArkUi] {
+            let code = code_for(doc, root, lang);
+            assert!(code.contains("// deep evil()  more() …\n"), "{code}");
+            for line in code.lines() {
+                let t = line.trim_start();
+                assert!(!t.starts_with("evil()") && !t.starts_with("more()"), "layer name leaked as code:\n{code}");
+            }
+        }
+    }
+}
diff --git a/crates/engine/src/dev/codegen/arkui.rs b/crates/engine/src/dev/codegen/arkui.rs
new file mode 100644
index 00000000..1d9816f6
--- /dev/null
+++ b/crates/engine/src/dev/codegen/arkui.rs
@@ -0,0 +1,228 @@
+use super::swift::one_line;
+use super::*;
+
+// ------------------------------------------------------------------ ArkUI (ArkTS)
+
+/// A colour as ArkUI writes it: `'#RRGGBB'`, or `'#AARRGGBB'` with transparency.
+fn ark_color(c: Color) -> String {
+    let [r, g, b, a] = c.to_rgba8();
+    if a == 255 { format!("'#{r:02X}{g:02X}{b:02X}'") } else { format!("'#{a:02X}{r:02X}{g:02X}{b:02X}'") }
+}
+
+/// A layer's corner radii as `.borderRadius(...)` (uniform or per corner).
+fn ark_radius(n: &Node, mods: &mut Vec<String>) {
+    if let Some(r) = n.corners.uniform() {
+        if r > 0.0 {
+            mods.push(format!(".borderRadius({})", num(r)));
+        }
+    } else if n.corners.radii.iter().any(|r| *r > 0.0) {
+        let [tl, tr, br, bl] = n.corners.radii;
+        mods.push(format!(".borderRadius({{ topLeft: {}, topRight: {}, bottomRight: {}, bottomLeft: {} }})", num(tl), num(tr), num(br), num(bl)));
+    }
+}
+
+/// ArkUI for a layer and its subtree at `depth`; `extra` attributes go last (a free child's
+/// position). A layer a boolean parameter shows sits in an `if`.
+pub(crate) fn arkui(ctx: &Ctx, id: NodeId, depth: usize, out: &mut String, extra: &[String]) {
+    let Some(n) = ctx.doc.node(id) else { return };
+    if id != ctx.root
+        && let Some(p) = ctx.param(n, "visible")
+    {
+        let pad = indent(depth);
+        out.push_str(&format!("{pad}if (this.{}) {{\n", p.ident));
+        arkui_layer(ctx, n, depth + 1, out, extra);
+        out.push_str(&format!("{pad}}}\n"));
+        return;
+    }
+    arkui_layer(ctx, n, depth, out, extra);
+}
+
+fn arkui_layer(ctx: &Ctx, n: &Node, depth: usize, out: &mut String, extra: &[String]) {
+    let doc = ctx.doc;
+    let pad = indent(depth);
+    if ctx.too_deep(depth) {
+        out.push_str(&format!("{pad}// {} …\n", one_line(&n.name)));
+        return;
+    }
+    // Nested instances are calls; an instance swap parameter is a builder.
+    let swap = ctx.param(n, "mainComponent").filter(|_| n.id != ctx.root);
+    let call = match swap {
+        Some(p) => Some(format!("{pad}this.{}()\n", p.ident)),
+        None => ctx.call(n, CodeLang::ArkUi, depth).map(|(code, _)| code),
+    };
+    if let Some(call) = call {
+        if let Some(p) = swap.filter(|_| !extra.is_empty()) {
+            // The builder returns nothing, so a position goes on a container around the call.
+            out.push_str(&format!("{pad}Stack() {{\n{pad}    this.{}()\n{pad}}}\n", p.ident));
+            for m in extra {
+                out.push_str(&format!("{pad}{m}\n"));
+            }
+            return;
+        }
+        out.push_str(&call);
+        for m in extra {
+            out.push_str(&format!("{pad}    {m}\n"));
+        }
+        return;
+    }
+    let mut mods: Vec<String> = Vec::new();
+    match &n.kind {
+        NodeKind::Text(t) => {
+            let text = ctx.param(n, "characters").map_or_else(|| literal(&t.characters, false), |p| format!("this.{}", p.ident));
+            out.push_str(&format!("{pad}Text({text})\n"));
+            let s = &t.style;
+            mods.push(format!(".fontSize({})", num(s.font_size)));
+            mods.push(format!(".fontWeight({})", s.weight().clamp(100, 900)));
+            mods.push(format!(".fontFamily({})", literal(&s.font_family, false)));
+            if s.italic() {
+                mods.push(".fontStyle(FontStyle.Italic)".into());
+            }
+            if let Some(c) = first_fill(n) {
+                mods.push(format!(".fontColor({})", ark_color(c)));
+            }
+            match s.line_height {
+                LineHeight::Pixels(v) => mods.push(format!(".lineHeight({})", num(v))),
+                LineHeight::Percent(p) => mods.push(format!(".lineHeight('{}%')", num(p))),
+                LineHeight::Auto => {}
+            }
+            match s.letter_spacing {
+                LetterSpacing::Pixels(v) if v != 0.0 => mods.push(format!(".letterSpacing({})", num(v))),
+                LetterSpacing::Percent(p) if p != 0.0 => mods.push(format!(".letterSpacing('{}%')", num(p))),
+                _ => {}
+            }
+            match t.align_h {
+                TextAlignH::Left => {}
+                TextAlignH::Center => mods.push(".textAlign(TextAlign.Center)".into()),
+                TextAlignH::Right => mods.push(".textAlign(TextAlign.End)".into()),
+                TextAlignH::Justified => mods.push(".textAlign(TextAlign.JUSTIFY)".into()),
+            }
+            // Aligning needs a box to align in: the text layer's own width.
+            if !matches!(t.align_h, TextAlignH::Left) {
+                mods.push(format!(".width({})", num(n.width)));
+            }
+            match s.case {
+                TextCase::Upper => mods.push(".textCase(TextCase.UpperCase)".into()),
+                TextCase::Lower => mods.push(".textCase(TextCase.LowerCase)".into()),
+                _ => {}
+            }
+            match s.decoration {
+                TextDecoration::Underline => mods.push(".decoration({ type: TextDecorationType.Underline })".into()),
+                TextDecoration::Strikethrough => mods.push(".decoration({ type: TextDecorationType.LineThrough })".into()),
+                TextDecoration::None => {}
+            }
+        }
+        NodeKind::Ellipse { .. } => {
+            out.push_str(&format!("{pad}Ellipse({{ width: {}, height: {} }})\n", num(n.width), num(n.height)));
+            if let Some(c) = first_fill(n) {
+                mods.push(format!(".fill({})", ark_color(c)));
+            }
+            if let Some(c) = stroke_color(n) {
+                mods.push(format!(".stroke({})", ark_color(c)));
+                mods.push(format!(".strokeWidth({})", num(n.stroke.weight)));
+            }
+        }
+        NodeKind::Rectangle => {
+            out.push_str(&format!("{pad}Column()\n"));
+            if let Some(c) = first_fill(n) {
+                mods.push(format!(".backgroundColor({})", ark_color(c)));
+            }
+            ark_radius(n, &mut mods);
+            mods.push(format!(".width({})", num(n.width)));
+            mods.push(format!(".height({})", num(n.height)));
+        }
+        k if k.is_frame_like() || matches!(k, NodeKind::Group) => {
+            let open = match n.layout.as_ref().map(|l| (l.mode, l)) {
+                Some((LayoutMode::Vertical, l)) => format!("Column({{ space: {} }})", num(l.gap)),
+                Some((_, l)) => format!("Row({{ space: {} }})", num(l.gap)),
+                None => "Stack({ alignContent: Alignment.TopStart })".to_string(),
+            };
+            out.push_str(&format!("{pad}{open} {{\n"));
+            match ctx.param(n, "slot") {
+                // A slot shows the instance's content, or else the main's (its default builder).
+                Some(p) => out.push_str(&format!("{pad}    this.{}()\n", p.ident)),
+                None => {
+                    for c in ctx.kids(n) {
+                        // Free children sit at their position inside a Stack, and so does a child
+                        // that ignores its auto layout parent.
+                        let pos: Vec<String> = match doc.node(c).filter(|cn| n.layout.is_none() || cn.child_layout.absolute) {
+                            Some(cn) => {
+                                let [_, _, _, _, x, y] = cn.transform.as_coeffs();
+                                vec![format!(".position({{ x: {}, y: {} }})", num(x), num(y))]
+                            }
+                            None => Vec::new(),
+                        };
+                        arkui(ctx, c, depth + 1, out, &pos);
+                    }
+                }
+            }
+            out.push_str(&format!("{pad}}}\n"));
+            if let Some(l) = &n.layout {
+                let [t, r, b, lft] = l.padding;
+                if [t, r, b, lft].iter().any(|v| *v > 0.0) {
+                    mods.push(format!(".padding({{ top: {}, right: {}, bottom: {}, left: {} }})", num(t), num(r), num(b), num(lft)));
+                }
+                let justify = match l.main_align {
+                    MainAlign::Min => None,
+                    MainAlign::Center => Some("FlexAlign.Center"),
+                    MainAlign::Max => Some("FlexAlign.End"),
+                    MainAlign::SpaceBetween => Some("FlexAlign.SpaceBetween"),
+                    MainAlign::SpaceAround => Some("FlexAlign.SpaceAround"),
+                    MainAlign::SpaceEvenly => Some("FlexAlign.SpaceEvenly"),
+                };
+                if let Some(j) = justify {
+                    mods.push(format!(".justifyContent({j})"));
+                }
+                let cross = match l.cross_align {
+                    CrossAlign::Min => None,
+                    CrossAlign::Center => Some("Center"),
+                    CrossAlign::Max => Some(if l.mode == LayoutMode::Vertical { "End" } else { "Bottom" }),
+                    CrossAlign::Baseline => None,
+                };
+                if let Some(c) = cross {
+                    let ty = if l.mode == LayoutMode::Vertical { "HorizontalAlign" } else { "VerticalAlign" };
+                    mods.push(format!(".alignItems({ty}.{c})"));
+                }
+            }
+            mods.push(format!(".width({})", num(n.width)));
+            mods.push(format!(".height({})", num(n.height)));
+            if let Some(c) = first_fill(n) {
+                mods.push(format!(".backgroundColor({})", ark_color(c)));
+            }
+            if radius(n) > 0.0 {
+                mods.push(".clip(true)".into());
+            }
+            ark_radius(n, &mut mods);
+        }
+        _ => {
+            out.push_str(&format!("{pad}// {}: export as an image asset\n{pad}Image($r('app.media.asset'))\n", n.kind.label()));
+            mods.push(format!(".width({})", num(n.width)));
+            mods.push(format!(".height({})", num(n.height)));
+        }
+    }
+    // Ellipses take their stroke as a shape attribute (above).
+    if !matches!(n.kind, NodeKind::Ellipse { .. })
+        && let Some(c) = stroke_color(n)
+    {
+        mods.push(format!(".border({{ width: {}, color: {} }})", num(n.stroke.weight), ark_color(c)));
+    }
+    if let Some(s) = drop_shadow(n) {
+        mods.push(format!(
+            ".shadow({{ radius: {}, color: {}, offsetX: {}, offsetY: {} }})",
+            num(s.radius / 2.0),
+            ark_color(s.color),
+            num(s.offset.0),
+            num(s.offset.1)
+        ));
+    }
+    if n.opacity < 1.0 {
+        mods.push(format!(".opacity({})", num(f64::from(n.opacity))));
+    }
+    let rot = figcraft_geom::rotation_degrees(n.transform);
+    if rot.abs() > 0.01 && rot.is_finite() {
+        mods.push(format!(".rotate({{ angle: {} }})", num(-rot)));
+    }
+    mods.extend(extra.iter().cloned());
+    for m in mods {
+        out.push_str(&format!("{pad}    {m}\n"));
+    }
+}
diff --git a/crates/engine/src/dev/codegen/compose.rs b/crates/engine/src/dev/codegen/compose.rs
new file mode 100644
index 00000000..5915ca9b
--- /dev/null
+++ b/crates/engine/src/dev/codegen/compose.rs
@@ -0,0 +1,131 @@
+use super::swift::one_line;
+use super::*;
+
+// ------------------------------------------------------------------ Jetpack Compose
+
+/// `Color(0xAARRGGBB)`, as Compose and Flutter both write a colour.
+pub(crate) fn kotlin_color(c: Color) -> String {
+    let [r, g, b, a] = c.to_rgba8();
+    format!("Color(0x{a:02X}{r:02X}{g:02X}{b:02X})")
+}
+
+/// The Modifier chain for a layer (size, shadow, background, border, alpha, padding).
+fn modifier(n: &Node, shape: &str, padding: bool) -> String {
+    let mut m = format!("Modifier.size({}.dp, {}.dp)", num(n.width), num(n.height));
+    if let Some(s) = drop_shadow(n) {
+        m.push_str(&format!(".shadow({}.dp, {shape})", num(s.radius / 2.0)));
+    }
+    if let Some(c) = first_fill(n) {
+        m.push_str(&format!(".background({}, {shape})", kotlin_color(c)));
+    }
+    if let Some(c) = stroke_color(n) {
+        m.push_str(&format!(".border({}.dp, {}, {shape})", num(n.stroke.weight), kotlin_color(c)));
+    }
+    if n.opacity < 1.0 {
+        m.push_str(&format!(".alpha({}f)", num(f64::from(n.opacity))));
+    }
+    if padding && let Some(l) = &n.layout {
+        let [t, r, b, lft] = l.padding;
+        if [t, r, b, lft].iter().any(|v| *v > 0.0) {
+            m.push_str(&format!(".padding(start = {}.dp, top = {}.dp, end = {}.dp, bottom = {}.dp)", num(lft), num(t), num(r), num(b)));
+        }
+    }
+    m
+}
+
+/// Jetpack Compose for a layer and its subtree at `depth`. A layer a boolean parameter shows sits
+/// in an `if`.
+pub(crate) fn compose(ctx: &Ctx, id: NodeId, depth: usize, out: &mut String) {
+    let Some(n) = ctx.doc.node(id) else { return };
+    if id != ctx.root
+        && let Some(p) = ctx.param(n, "visible")
+    {
+        let pad = indent(depth);
+        out.push_str(&format!("{pad}if ({}) {{\n", p.ident));
+        compose_layer(ctx, n, depth + 1, out);
+        out.push_str(&format!("{pad}}}\n"));
+        return;
+    }
+    compose_layer(ctx, n, depth, out);
+}
+
+fn compose_layer(ctx: &Ctx, n: &Node, depth: usize, out: &mut String) {
+    let doc = ctx.doc;
+    let pad = indent(depth);
+    if ctx.too_deep(depth) {
+        out.push_str(&format!("{pad}// {} …\n", one_line(&n.name)));
+        return;
+    }
+    // Nested instances are calls; an instance swap parameter is a composable.
+    let call = match ctx.param(n, "mainComponent").filter(|_| n.id != ctx.root) {
+        Some(p) => Some(format!("{pad}{}()\n", p.ident)),
+        None => ctx.call(n, CodeLang::Compose, depth).map(|(code, _)| code),
+    };
+    if let Some(call) = call {
+        out.push_str(&call);
+        return;
+    }
+    let shape = if radius(n) > 0.0 { format!("RoundedCornerShape({}.dp)", num(radius(n))) } else { "RectangleShape".to_string() };
+    match &n.kind {
+        NodeKind::Text(t) => {
+            let color = first_fill(n).map(kotlin_color).unwrap_or_else(|| "Color.Unspecified".into());
+            let text = ctx.param(n, "characters").map_or_else(|| literal(&t.characters, true), |p| p.ident.clone());
+            out.push_str(&format!(
+                "{pad}Text(\n{pad}    text = {text},\n{pad}    fontSize = {}.sp,\n{pad}    fontWeight = FontWeight.W{},\n{pad}    color = {color},\n{pad})\n",
+                num(t.style.font_size),
+                (t.style.weight().clamp(100, 900) / 100) * 100
+            ));
+        }
+        NodeKind::Ellipse { .. } => out.push_str(&format!("{pad}Box(modifier = {})\n", modifier(n, "CircleShape", false))),
+        NodeKind::Rectangle => out.push_str(&format!("{pad}Box(modifier = {})\n", modifier(n, &shape, false))),
+        k if k.is_frame_like() || matches!(k, NodeKind::Group) => {
+            let children = ctx.kids(n);
+            let open = match n.layout.as_ref().map(|l| (l.mode, l)) {
+                Some((LayoutMode::Vertical, l)) => format!(
+                    "Column(\n{pad}    modifier = {},\n{pad}    verticalArrangement = Arrangement.spacedBy({}.dp),\n{pad}) {{",
+                    modifier(n, &shape, true),
+                    num(l.gap)
+                ),
+                Some((_, l)) => format!(
+                    "Row(\n{pad}    modifier = {},\n{pad}    horizontalArrangement = Arrangement.spacedBy({}.dp),\n{pad}    verticalAlignment = Alignment.CenterVertically,\n{pad}) {{",
+                    modifier(n, &shape, true),
+                    num(l.gap)
+                ),
+                None => format!("Box(modifier = {}) {{", modifier(n, &shape, false)),
+            };
+            out.push_str(&format!("{pad}{open}\n"));
+            // A slot shows the instance's content, or else the main's.
+            let slot = ctx.param(n, "slot");
+            let base = match slot {
+                Some(p) => {
+                    out.push_str(&format!("{pad}    if ({0} != null) {{\n{pad}        {0}()\n{pad}    }} else {{\n", p.ident));
+                    depth + 1
+                }
+                None => depth,
+            };
+            for c in &children {
+                if n.layout.is_none()
+                    && let Some(cn) = doc.node(*c)
+                {
+                    let [_, _, _, _, x, y] = cn.transform.as_coeffs();
+                    out.push_str(&format!("{}Box(modifier = Modifier.offset({}.dp, {}.dp)) {{\n", indent(base + 1), num(x), num(y)));
+                    compose(ctx, *c, base + 2, out);
+                    out.push_str(&format!("{}}}\n", indent(base + 1)));
+                } else {
+                    compose(ctx, *c, base + 1, out);
+                }
+            }
+            if slot.is_some() {
+                out.push_str(&format!("{pad}    }}\n"));
+            }
+            out.push_str(&format!("{pad}}}\n"));
+        }
+        _ => out.push_str(&format!(
+            "{pad}// {}: export as an image asset\n{pad}Image(painter = painterResource(R.drawable.asset), contentDescription = {}, modifier = Modifier.size({}.dp, {}.dp))\n",
+            n.kind.label(),
+            literal(&n.name, true),
+            num(n.width),
+            num(n.height)
+        )),
+    }
+}
diff --git a/crates/engine/src/dev/codegen/css.rs b/crates/engine/src/dev/codegen/css.rs
new file mode 100644
index 00000000..c7982652
--- /dev/null
+++ b/crates/engine/src/dev/codegen/css.rs
@@ -0,0 +1,288 @@
+use super::*;
+
+// ------------------------------------------------------------------ CSS
+
+/// The CSS custom properties generated code uses: name → fallback value, in first-use order.
+#[derive(Default)]
+pub(crate) struct Tokens {
+    vars: Vec<(String, String)>,
+    /// Name variables as Tailwind theme variables (`--color-accent`), not by their CSS name.
+    pub tailwind: bool,
+    /// The file's theme names (computed on first use).
+    theme: Option<crate::tailwind::Theme>,
+}
+
+impl Tokens {
+    /// `var(--name, value)`, remembering the variable.
+    fn var(&mut self, doc: &Document, variable: &Variable, value: String) -> String {
+        let name =
+            if self.tailwind { self.theme.get_or_insert_with(|| crate::tailwind::Theme::new(doc)).name(variable) } else { css_var_of(variable) };
+        let out = format!("var({name}, {value})");
+        if !self.vars.iter().any(|(n, _)| *n == name) {
+            self.vars.push((name, value));
+        }
+        out
+    }
+
+    /// A `:root` rule declaring the variables (empty without any).
+    pub fn root_rule(&self) -> String {
+        if self.vars.is_empty() {
+            return String::new();
+        }
+        let decls: String = self.vars.iter().map(|(n, v)| format!("  {n}: {v};\n")).collect();
+        format!(":root {{\n{decls}}}\n")
+    }
+}
+
+/// A variable's CSS custom property name: "Colors/Brand 500" → `--colors-brand-500`.
+pub fn css_var_name(variable: &str) -> String {
+    let mut out = String::from("--");
+    for c in variable.chars().flat_map(char::to_lowercase).take(80) {
+        if c.is_alphanumeric() || c == '_' {
+            out.push(c);
+        } else if !out.ends_with('-') {
+            out.push('-');
+        }
+    }
+    let trimmed = out.trim_end_matches('-');
+    if trimmed.len() <= 2 { "--variable".into() } else { trimmed.to_string() }
+}
+
+/// A variable's CSS custom property: its Web code syntax (`var(--x)` or `--x`) when it has one,
+/// else made from its name.
+pub fn css_var_of(v: &Variable) -> String {
+    let Some(web) = v.code_syntax.get("WEB").map(|w| w.trim()) else { return css_var_name(&v.name) };
+    let inner = web.strip_prefix("var(").map_or(web, |r| r.split([',', ')']).next().unwrap_or("").trim());
+    let valid = inner.len() > 2 && inner.starts_with("--") && inner.chars().all(|c| c.is_alphanumeric() || c == '-' || c == '_');
+    if valid { inner.chars().take(80).collect() } else { css_var_name(inner) }
+}
+
+/// `value`, or a reference to the variable bound to the first of `fields` that has one.
+pub(super) fn tok(doc: &Document, n: &Node, fields: &[&str], value: String, t: &mut Tokens) -> String {
+    match fields.iter().find_map(|f| crate::devinspect::bound_variable(doc, n, f)) {
+        Some(v) => t.var(doc, v, value),
+        None => value,
+    }
+}
+
+pub(super) fn css(doc: &Document, id: NodeId) -> String {
+    let Some(n) = doc.node(id) else { return String::new() };
+    let mut t = Tokens::default();
+    let decls = css_decls(doc, n, &mut t, (false, false));
+    format!("/* {} */\n{decls}", n.name.replace("*/", "* /"))
+}
+
+/// The CSS declarations for `n`'s own look and size, one per line; `hug` leaves out the width
+/// and/or height (they follow the content). Bound variables become `var(--name, value)`.
+pub(crate) fn css_decls(doc: &Document, n: &Node, t: &mut Tokens, hug: (bool, bool)) -> String {
+    let px = |v: f64| format!("{}px", num(v));
+    let mut out = String::new();
+    let mut put = |key: &str, value: String| out.push_str(&format!("{key}: {value};\n"));
+    if !hug.0 {
+        put("width", tok(doc, n, &["width"], px(n.width), t));
+    }
+    if !hug.1 {
+        put("height", tok(doc, n, &["height"], px(n.height), t));
+    }
+    if let Some(l) = &n.layout {
+        put("display", "flex".into());
+        put("flex-direction", if l.mode == LayoutMode::Vertical { "column" } else { "row" }.into());
+        if l.wrap {
+            put("flex-wrap", "wrap".into());
+        }
+        put("gap", tok(doc, n, &["gap"], px(l.gap), t));
+        let [pt, pr, pb, pl] = l.padding;
+        let sides = [
+            tok(doc, n, &["paddingTop", "paddingVertical", "padding"], px(pt), t),
+            tok(doc, n, &["paddingRight", "paddingHorizontal", "padding"], px(pr), t),
+            tok(doc, n, &["paddingBottom", "paddingVertical", "padding"], px(pb), t),
+            tok(doc, n, &["paddingLeft", "paddingHorizontal", "padding"], px(pl), t),
+        ];
+        put("padding", sides.join(" "));
+        let justify = match l.main_align {
+            MainAlign::Min => "flex-start",
+            MainAlign::Center => "center",
+            MainAlign::Max => "flex-end",
+            MainAlign::SpaceBetween => "space-between",
+            MainAlign::SpaceAround => "space-around",
+            MainAlign::SpaceEvenly => "space-evenly",
+        };
+        put("justify-content", justify.into());
+        let align = match l.cross_align {
+            CrossAlign::Min => "flex-start",
+            CrossAlign::Center => "center",
+            CrossAlign::Max => "flex-end",
+            CrossAlign::Baseline => "baseline",
+        };
+        put("align-items", align.into());
+        if l.wrap {
+            // The lines: spread, or packed where the items align (baseline: at the start).
+            let spread = l.content_align == ContentAlign::SpaceBetween;
+            put(
+                "align-content",
+                if spread {
+                    "space-between"
+                } else if align == "baseline" {
+                    "flex-start"
+                } else {
+                    align
+                }
+                .into(),
+            );
+        }
+    }
+    if matches!(n.kind, NodeKind::Ellipse { .. }) {
+        put("border-radius", "50%".into());
+    } else if let Some(r) = n.corners.uniform().filter(|r| *r > 0.0) {
+        put("border-radius", tok(doc, n, &["cornerRadius"], px(r), t));
+    } else if n.corners.radii.iter().any(|r| *r > 0.0) {
+        let fields = ["topLeftRadius", "topRightRadius", "bottomRightRadius", "bottomLeftRadius"];
+        let corners: Vec<String> = n.corners.radii.iter().zip(fields).map(|(r, f)| tok(doc, n, &[f, "cornerRadius"], px(*r), t)).collect();
+        put("border-radius", corners.join(" "));
+    }
+    if n.opacity < 1.0 {
+        put("opacity", tok(doc, n, &["opacity"], num(f64::from(n.opacity)), t));
+    }
+    if !matches!(n.blend, figcraft_color::BlendMode::Normal | figcraft_color::BlendMode::PassThrough) {
+        put("mix-blend-mode", n.blend.css().into());
+    }
+    // Rotation turns counter-clockwise about the top-left corner (the position given); CSS
+    // rotate turns clockwise.
+    let rot = figcraft_geom::rotation_degrees(n.transform);
+    if rot.abs() > 0.01 && rot.is_finite() {
+        put("transform", format!("rotate({}deg)", num(-rot)));
+        put("transform-origin", "top left".into());
+    }
+    for (i, p) in n.fills.iter().enumerate().filter(|(_, p)| p.visible) {
+        match &p.kind {
+            PaintKind::Solid { color } => {
+                let key = if matches!(n.kind, NodeKind::Text(_)) { "color" } else { "background" };
+                let c = color.with_alpha(color.a * p.opacity).to_css();
+                // A variable binds the first paint's colour.
+                put(key, if i == 0 { tok(doc, n, &["fill"], c, t) } else { c });
+            }
+            PaintKind::Gradient(g) => put("background", css_gradient(g, n.width, n.height)),
+            PaintKind::Image(_) => put("background", "url(image.png) center / cover".into()),
+            PaintKind::Pattern(_) => put("background", "url(pattern.png) repeat".into()),
+        }
+    }
+    for (key, value) in css_borders(doc, n, t) {
+        put(&key, value);
+    }
+    let shadows: Vec<String> = n
+        .effects
+        .iter()
+        .filter(|e| e.visible)
+        .filter_map(|e| match &e.kind {
+            EffectKind::DropShadow(s) => {
+                Some(format!("{}px {}px {}px {}px {}", num(s.offset.0), num(s.offset.1), num(s.radius), num(s.spread), s.color.to_css()))
+            }
+            EffectKind::InnerShadow(s) => {
+                Some(format!("inset {}px {}px {}px {}px {}", num(s.offset.0), num(s.offset.1), num(s.radius), num(s.spread), s.color.to_css()))
+            }
+            _ => None,
+        })
+        .collect();
+    if !shadows.is_empty() {
+        put("box-shadow", shadows.join(", "));
+    }
+    for e in n.effects.iter().filter(|e| e.visible) {
+        match e.kind {
+            // CSS blurs are uniform: a progressive blur has no CSS equivalent and is left out.
+            EffectKind::LayerBlur(ref b) if !b.is_progressive() => put("filter", format!("blur({}px)", num(b.radius / 2.0))),
+            EffectKind::BackgroundBlur(ref b) if !b.is_progressive() => put("backdrop-filter", format!("blur({}px)", num(b.radius / 2.0))),
+            // CSS has no refraction: the frost is the nearest.
+            EffectKind::Glass(ref g) => put("backdrop-filter", format!("blur({}px)", num(g.sanitized().frost / 2.0))),
+            _ => {}
+        }
+    }
+    if let NodeKind::Text(tx) = &n.kind {
+        let s = &tx.style;
+        put("font-family", tok(doc, n, &["fontFamily"], format!("\"{}\"", s.font_family.replace('"', "'")), t));
+        put("font-size", tok(doc, n, &["fontSize"], px(s.font_size), t));
+        put("font-weight", s.weight().to_string());
+        if s.italic() {
+            put("font-style", "italic".into());
+        }
+        match s.line_height {
+            LineHeight::Pixels(v) => put("line-height", tok(doc, n, &["lineHeight"], px(v), t)),
+            LineHeight::Percent(p) => put("line-height", format!("{}%", num(p))),
+            LineHeight::Auto => {}
+        }
+        match s.letter_spacing {
+            LetterSpacing::Pixels(v) if v != 0.0 => put("letter-spacing", tok(doc, n, &["letterSpacing"], px(v), t)),
+            LetterSpacing::Percent(p) if p != 0.0 => put("letter-spacing", format!("{}em", num(p / 100.0))),
+            _ => {}
+        }
+        match tx.align_h {
+            TextAlignH::Left => {}
+            TextAlignH::Center => put("text-align", "center".into()),
+            TextAlignH::Right => put("text-align", "right".into()),
+            TextAlignH::Justified => put("text-align", "justify".into()),
+        }
+        match s.case {
+            TextCase::Original => {}
+            TextCase::Upper => put("text-transform", "uppercase".into()),
+            TextCase::Lower => put("text-transform", "lowercase".into()),
+            TextCase::Title => put("text-transform", "capitalize".into()),
+            TextCase::SmallCaps => put("font-variant", "small-caps".into()),
+        }
+        match s.decoration {
+            TextDecoration::None => {}
+            TextDecoration::Underline => put("text-decoration", "underline".into()),
+            TextDecoration::Strikethrough => put("text-decoration", "line-through".into()),
+        }
+        if s.decoration != TextDecoration::None {
+            let l = s.look();
+            let len = |m: LineHeight| match m {
+                LineHeight::Auto => None,
+                LineHeight::Pixels(v) => Some(px(v)),
+                LineHeight::Percent(p) => Some(format!("{}%", num(p))),
+            };
+            match l.style {
+                figcraft_doc::DecorationStyle::Solid => {}
+                figcraft_doc::DecorationStyle::Dotted => put("text-decoration-style", "dotted".into()),
+                figcraft_doc::DecorationStyle::Wavy => put("text-decoration-style", "wavy".into()),
+            }
+            if let Some(v) = len(l.thickness) {
+                put("text-decoration-thickness", v);
+            }
+            if let Some(c) = l.color {
+                put("text-decoration-color", c.to_css());
+            }
+            if s.decoration == TextDecoration::Underline {
+                if let Some(v) = len(l.offset) {
+                    put("text-underline-offset", v);
+                }
+                // Browsers skip ink by default; the canvas only when asked.
+                if !l.skip_ink {
+                    put("text-decoration-skip-ink", "none".into());
+                }
+            }
+        }
+        if tx.leading_trim == figcraft_doc::LeadingTrim::CapHeight {
+            put("text-box", "trim-both cap alphabetic".into());
+        }
+    }
+    out
+}
+
+/// A gradient fill on a `w`×`h` box as a CSS background: linear along its handles' direction
+/// (CSS angles: 0deg up, 90deg right), radial with its handles' radii, angular as a conic
+/// gradient from its start direction.
+fn css_gradient(g: &figcraft_color::Gradient, w: f64, h: f64) -> String {
+    let stops = g.sorted_stops().iter().map(|s| format!("{} {}%", s.color.to_css(), (s.position * 100.0).round())).collect::<Vec<_>>().join(", ");
+    let (dx, dy) = ((g.to.0 - g.from.0) * w, (g.to.1 - g.from.1) * h);
+    let angle = if dx == 0.0 && dy == 0.0 { 180.0 } else { dx.atan2(-dy).to_degrees().rem_euclid(360.0) };
+    let pct = |v: f64| format!("{}%", num(v * 100.0));
+    let at = format!("at {} {}", pct(g.from.0), pct(g.from.1));
+    match g.kind {
+        figcraft_color::GradientKind::Linear => format!("linear-gradient({}deg, {stops})", num(angle)),
+        figcraft_color::GradientKind::Radial | figcraft_color::GradientKind::Diamond => {
+            let (rx, ry) = (((g.width.0 - g.from.0) * w).hypot((g.width.1 - g.from.1) * h), dx.hypot(dy));
+            let rel = |r: f64, side: f64| if side > 0.0 { pct(r / side) } else { "50%".into() };
+            format!("radial-gradient({} {} {at}, {stops})", rel(rx, w), rel(ry, h))
+        }
+        figcraft_color::GradientKind::Angular => format!("conic-gradient(from {}deg {at}, {stops})", num(angle)),
+    }
+}
diff --git a/crates/engine/src/dev/codegen/flutter.rs b/crates/engine/src/dev/codegen/flutter.rs
new file mode 100644
index 00000000..df300abd
--- /dev/null
+++ b/crates/engine/src/dev/codegen/flutter.rs
@@ -0,0 +1,358 @@
+use super::*;
+
+// ------------------------------------------------------------------ Flutter (Dart)
+
+/// The import a generated Flutter unit starts with (a widget tree on its own needs it too).
+pub(crate) const FLUTTER_IMPORT: &str = "import 'package:flutter/material.dart';\n\n";
+
+/// Dart indents by two spaces.
+pub(crate) fn flutter_indent(depth: usize) -> String {
+    "  ".repeat(depth)
+}
+
+/// Where a child sits in its parent: in a Stack at its position in the frame, taking the room left
+/// in a Row or Column, or wherever the parent puts it.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(crate) enum Place {
+    Flow,
+    At(f64, f64),
+    Fill,
+}
+
+/// A child and where its parent puts it.
+type Placed = (NodeId, Place);
+
+/// Dart's `FontWeight.w600` (a weight is hundreds).
+fn flutter_weight(w: u16) -> String {
+    format!("FontWeight.w{}", (w.clamp(100, 900) / 100) * 100)
+}
+
+/// A Row or Column's main-axis alignment (`None` for the default, the start).
+fn flutter_main_align(a: MainAlign) -> Option<&'static str> {
+    match a {
+        MainAlign::Min => None,
+        MainAlign::Center => Some("MainAxisAlignment.center"),
+        MainAlign::Max => Some("MainAxisAlignment.end"),
+        MainAlign::SpaceBetween => Some("MainAxisAlignment.spaceBetween"),
+        MainAlign::SpaceAround => Some("MainAxisAlignment.spaceAround"),
+        MainAlign::SpaceEvenly => Some("MainAxisAlignment.spaceEvenly"),
+    }
+}
+
+/// A Row or Column's cross-axis alignment; a flow child that fills it stretches the line instead.
+fn flutter_cross_align(a: CrossAlign, stretch: bool) -> &'static str {
+    if stretch {
+        return "CrossAxisAlignment.stretch";
+    }
+    match a {
+        CrossAlign::Min => "CrossAxisAlignment.start",
+        CrossAlign::Center => "CrossAxisAlignment.center",
+        CrossAlign::Max => "CrossAxisAlignment.end",
+        CrossAlign::Baseline => "CrossAxisAlignment.baseline",
+    }
+}
+
+/// A frame's auto layout padding as `EdgeInsets` (`None` when it has none).
+fn flutter_padding(n: &Node) -> Option<String> {
+    let l = n.layout.as_ref()?;
+    let [t, r, b, left] = l.padding;
+    if ![t, r, b, left].iter().any(|v| *v > 0.0) {
+        return None;
+    }
+    Some(if t == r && r == b && b == left {
+        format!("EdgeInsets.all({})", num(t))
+    } else if t == b && left == r {
+        format!("EdgeInsets.symmetric(vertical: {}, horizontal: {})", num(t), num(left))
+    } else {
+        format!("EdgeInsets.fromLTRB({}, {}, {}, {})", num(left), num(t), num(r), num(b))
+    })
+}
+
+/// A layer's fill, shape, corner radius, stroke and shadow as a `BoxDecoration`; `None` when it has
+/// none of them. `pad` is the indentation of the constructor itself.
+fn box_decoration(n: &Node, pad: &str) -> Option<String> {
+    let mut parts: Vec<String> = Vec::new();
+    if let Some(c) = first_fill(n) {
+        parts.push(format!("color: {}", kotlin_color(c)));
+    }
+    if matches!(n.kind, NodeKind::Ellipse { .. }) {
+        parts.push("shape: BoxShape.circle".into());
+    } else if radius(n) > 0.0 {
+        parts.push(format!("borderRadius: BorderRadius.circular({})", num(radius(n))));
+    }
+    if let Some(c) = stroke_color(n) {
+        parts.push(format!("border: Border.all(color: {}, width: {})", kotlin_color(c), num(n.stroke.weight)));
+    }
+    if let Some(s) = drop_shadow(n) {
+        parts.push(format!(
+            "boxShadow: [BoxShadow(color: {}, blurRadius: {}, offset: Offset({}, {}))]",
+            kotlin_color(s.color),
+            num(s.radius / 2.0),
+            num(s.offset.0),
+            num(s.offset.1)
+        ));
+    }
+    if parts.is_empty() {
+        return None;
+    }
+    let inner = format!("{pad}  ");
+    Some(format!("BoxDecoration(\n{}{pad})", parts.iter().map(|p| format!("{inner}{p},\n")).collect::<String>()))
+}
+
+/// Flutter for a layer and its subtree at `depth`. A layer a boolean parameter shows sits behind an
+/// `if (…)`: Dart's lists take conditions, so the element itself carries it.
+pub(crate) fn flutter(ctx: &Ctx, id: NodeId, depth: usize, out: &mut String, place: Place) {
+    let Some(n) = ctx.doc.node(id) else { return };
+    if id != ctx.root
+        && let Some(p) = ctx.param(n, "visible")
+    {
+        out.push_str(&format!("{}if ({})\n", flutter_indent(depth), p.ident));
+        flutter_placed(ctx, n, depth + 1, out, place);
+        return;
+    }
+    flutter_placed(ctx, n, depth, out, place);
+}
+
+/// A layer at `depth` and what wraps it: where its parent puts it, then its opacity. Every closing
+/// parenthesis sits at its own level, so the caller can end the element with a comma in a list.
+fn flutter_placed(ctx: &Ctx, n: &Node, depth: usize, out: &mut String, place: Place) {
+    if ctx.too_deep(depth) {
+        let pad = flutter_indent(depth);
+        out.push_str(&format!("{pad}// {} …\n{pad}const SizedBox()", n.name));
+        return;
+    }
+    let mut depth = depth;
+    let mut close: Vec<String> = Vec::new();
+    match place {
+        Place::Flow => {}
+        Place::At(x, y) => {
+            let (pad, inner) = (flutter_indent(depth), flutter_indent(depth + 1));
+            out.push_str(&format!("{pad}Positioned(\n{inner}left: {},\n{inner}top: {},\n{inner}child: ", num(x), num(y)));
+            close.push(format!("\n{pad})"));
+            depth += 1;
+        }
+        Place::Fill => {
+            let (pad, inner) = (flutter_indent(depth), flutter_indent(depth + 1));
+            out.push_str(&format!("{pad}Expanded(\n{inner}child: "));
+            close.push(format!("\n{pad})"));
+            depth += 1;
+        }
+    }
+    if n.opacity < 1.0 {
+        let (pad, inner) = (flutter_indent(depth), flutter_indent(depth + 1));
+        out.push_str(&format!("{pad}Opacity(\n{inner}opacity: {},\n{inner}child: ", num(f64::from(n.opacity))));
+        close.push(format!("\n{pad})"));
+        depth += 1;
+    }
+    // A wrapper leaves its line open ("child: "), so the widget carries no indentation of its own.
+    let mut body = String::new();
+    flutter_widget(ctx, n, depth, &mut body);
+    out.push_str(if close.is_empty() { body.as_str() } else { body.trim_start() });
+    for c in close.iter().rev() {
+        out.push_str(c);
+    }
+}
+
+/// A layer's own look and its subtree as a Flutter widget at `depth`: a complete expression whose
+/// closing parenthesis sits at `depth`.
+fn flutter_widget(ctx: &Ctx, n: &Node, depth: usize, out: &mut String) {
+    let (pad, inner) = (flutter_indent(depth), flutter_indent(depth + 1));
+    // Nested instances are calls; an instance swap parameter is a widget.
+    let call = match ctx.param(n, "mainComponent").filter(|_| n.id != ctx.root) {
+        Some(p) => Some(p.ident.clone()),
+        None => ctx.call(n, CodeLang::Flutter, depth).map(|(code, _)| code),
+    };
+    if let Some(call) = call {
+        out.push_str(call.trim_end_matches('\n'));
+        return;
+    }
+    match &n.kind {
+        NodeKind::Text(t) => {
+            let text = ctx.param(n, "characters").map_or_else(|| literal(&t.characters, true), |p| p.ident.clone());
+            out.push_str(&format!("{pad}Text(\n{inner}{text},\n"));
+            match t.align_h {
+                TextAlignH::Left => {}
+                TextAlignH::Center => out.push_str(&format!("{inner}textAlign: TextAlign.center,\n")),
+                TextAlignH::Right => out.push_str(&format!("{inner}textAlign: TextAlign.right,\n")),
+                TextAlignH::Justified => out.push_str(&format!("{inner}textAlign: TextAlign.justify,\n")),
+            }
+            let s = &t.style;
+            let mut style: Vec<String> = Vec::new();
+            if !s.font_family.is_empty() {
+                style.push(format!("fontFamily: {}", literal(&s.font_family, true)));
+            }
+            style.push(format!("fontSize: {}", num(s.font_size)));
+            style.push(format!("fontWeight: {}", flutter_weight(s.weight())));
+            if let Some(c) = first_fill(n) {
+                style.push(format!("color: {}", kotlin_color(c)));
+            }
+            if s.italic() {
+                style.push("fontStyle: FontStyle.italic".into());
+            }
+            match s.line_height {
+                // Dart's height is a multiple of the font size, not a length.
+                LineHeight::Pixels(v) if v > 0.0 && s.font_size > 0.0 => style.push(format!("height: {}", num(v / s.font_size))),
+                LineHeight::Percent(p) if p > 0.0 => style.push(format!("height: {}", num(p / 100.0))),
+                _ => {}
+            }
+            match s.letter_spacing {
+                LetterSpacing::Pixels(v) if v != 0.0 => style.push(format!("letterSpacing: {}", num(v))),
+                LetterSpacing::Percent(p) if p != 0.0 && s.font_size > 0.0 => style.push(format!("letterSpacing: {}", num(p / 100.0 * s.font_size))),
+                _ => {}
+            }
+            match s.decoration {
+                TextDecoration::None => {}
+                TextDecoration::Underline => style.push("decoration: TextDecoration.underline".into()),
+                TextDecoration::Strikethrough => style.push("decoration: TextDecoration.lineThrough".into()),
+            }
+            let sp = flutter_indent(depth + 2);
+            out.push_str(&format!("{inner}style: TextStyle(\n{}{inner}),\n{pad})", style.iter().map(|x| format!("{sp}{x},\n")).collect::<String>()));
+        }
+        NodeKind::Ellipse { .. } | NodeKind::Rectangle => {
+            out.push_str(&format!("{pad}Container(\n{inner}width: {},\n{inner}height: {},\n", num(n.width), num(n.height)));
+            if let Some(d) = box_decoration(n, &inner) {
+                out.push_str(&format!("{inner}decoration: {d},\n"));
+            }
+            out.push_str(&format!("{pad})"));
+        }
+        k if k.is_frame_like() || matches!(k, NodeKind::Group) => {
+            let children = ctx.kids(n);
+            let slot = ctx.param(n, "slot");
+            // The children block says whether it kept the padding for itself (an absolute child
+            // puts the line in a Stack at the parent's own box).
+            let mut kids = String::new();
+            let padded_inside = !(children.is_empty() && slot.is_none()) && flutter_children(ctx, n, &children, slot, depth + 1, &mut kids);
+            out.push_str(&format!("{pad}Container(\n{inner}width: {},\n{inner}height: {},\n", num(n.width), num(n.height)));
+            if !padded_inside && let Some(p) = flutter_padding(n) {
+                out.push_str(&format!("{inner}padding: {p},\n"));
+            }
+            if let Some(d) = box_decoration(n, &inner) {
+                out.push_str(&format!("{inner}decoration: {d},\n"));
+            }
+            if children.is_empty() && slot.is_none() {
+                out.push_str(&format!("{pad})"));
+                return;
+            }
+            out.push_str(&format!("{inner}alignment: Alignment.topLeft,\n{inner}child: "));
+            out.push_str(kids.trim_start());
+            out.push_str(&format!(",\n{pad})"));
+        }
+        _ => out.push_str(&format!(
+            "{pad}// {}: export as an image asset\n{pad}Image.asset({}, width: {}, height: {})",
+            n.kind.label(),
+            literal(&format!("{}.png", n.name), true),
+            num(n.width),
+            num(n.height)
+        )),
+    }
+}
+
+/// The Row, Column or Stack holding a frame-like layer's children, at `depth`. Returns whether it
+/// took the parent's padding over (see [`flutter_widget`]).
+fn flutter_children(ctx: &Ctx, n: &Node, children: &[NodeId], slot: Option<&Param>, depth: usize, out: &mut String) -> bool {
+    let doc = ctx.doc;
+    let (pad, inner) = (flutter_indent(depth), flutter_indent(depth + 1));
+    // Where each child sits, and whether one of the children in the line asks it to stretch.
+    let mut placed: Vec<Placed> = Vec::new();
+    let mut stretch = false;
+    for c in children {
+        let Some(cn) = doc.node(*c) else { continue };
+        let place = match n.layout.as_ref() {
+            // A child that ignores its auto layout parent keeps its own offsets: it leaves the
+            // line, so it neither stretches it nor takes the room left in it.
+            Some(_) if cn.child_layout.absolute => {
+                let [_, _, _, _, x, y] = cn.transform.as_coeffs();
+                Place::At(x, y)
+            }
+            Some(l) => {
+                let vertical = l.mode == LayoutMode::Vertical;
+                let (main, cross) = if vertical {
+                    (cn.child_layout.sizing_v, cn.child_layout.sizing_h)
+                } else {
+                    (cn.child_layout.sizing_h, cn.child_layout.sizing_v)
+                };
+                stretch |= cross == Sizing::Fill;
+                if main == Sizing::Fill { Place::Fill } else { Place::Flow }
+            }
+            // Free children sit at their position in the frame.
+            None => {
+                let [_, _, _, _, x, y] = cn.transform.as_coeffs();
+                Place::At(x, y)
+            }
+        };
+        placed.push((*c, place));
+    }
+    let Some(l) = n.layout.as_ref() else {
+        out.push_str(&format!("{pad}Stack(\n{inner}alignment: Alignment.topLeft,\n{inner}children: [\n"));
+        flutter_items(ctx, &placed, slot, depth + 2, out);
+        out.push_str(&format!("{inner}],\n{pad})"));
+        return false;
+    };
+    let (over, flow): (Vec<Placed>, Vec<Placed>) = placed.into_iter().partition(|(_, p)| matches!(p, Place::At(..)));
+    if over.is_empty() {
+        out.push_str(&flutter_line(ctx, l, &flow, slot, stretch, depth));
+        return false;
+    }
+    // A child at its own offsets goes over the line, in a Stack at the parent's own box, so its
+    // offsets stay the parent's and the line keeps the parent's padding.
+    let pad_edges = flutter_padding(n);
+    let list = flutter_indent(depth + 2);
+    let line_depth = depth + 3 + usize::from(pad_edges.is_some());
+    out.push_str(&format!("{pad}Stack(\n{inner}alignment: Alignment.topLeft,\n{inner}children: [\n"));
+    if !flow.is_empty() || slot.is_some() {
+        // Filling the Stack gives the line the parent's size, which `Expanded` children need.
+        out.push_str(&format!("{list}Positioned.fill(\n{list}  child: "));
+        match pad_edges {
+            Some(p) => {
+                out.push_str(&format!("Padding(\n{list}    padding: {p},\n{list}    child: "));
+                out.push_str(flutter_line(ctx, l, &flow, slot, stretch, line_depth).trim_start());
+                out.push_str(&format!(",\n{list}  )"));
+            }
+            None => out.push_str(flutter_line(ctx, l, &flow, slot, stretch, line_depth).trim_start()),
+        }
+        out.push_str(&format!(",\n{list}),\n"));
+    }
+    flutter_items(ctx, &over, None, depth + 2, out);
+    out.push_str(&format!("{inner}],\n{pad})"));
+    true
+}
+
+/// The Row or Column holding a frame's flow children, at `depth`: a complete widget expression.
+fn flutter_line(ctx: &Ctx, l: &AutoLayout, flow: &[Placed], slot: Option<&Param>, stretch: bool, depth: usize) -> String {
+    let (pad, inner) = (flutter_indent(depth), flutter_indent(depth + 1));
+    let mut out = format!("{pad}{}(\n", if l.mode == LayoutMode::Vertical { "Column" } else { "Row" });
+    if let Some(m) = flutter_main_align(l.main_align) {
+        out.push_str(&format!("{inner}mainAxisAlignment: {m},\n"));
+    }
+    out.push_str(&format!("{inner}crossAxisAlignment: {},\n", flutter_cross_align(l.cross_align, stretch)));
+    if !stretch && matches!(l.cross_align, CrossAlign::Baseline) {
+        out.push_str(&format!("{inner}textBaseline: TextBaseline.alphabetic,\n"));
+    }
+    // The gap between the children; the space distributions already spread them.
+    if l.gap > 0.0 && flutter_main_align(l.main_align).is_none_or(|m| !m.contains("Space")) {
+        out.push_str(&format!("{inner}spacing: {},\n", num(l.gap)));
+    }
+    out.push_str(&format!("{inner}children: [\n"));
+    flutter_items(ctx, flow, slot, depth + 2, &mut out);
+    out.push_str(&format!("{inner}],\n{pad})"));
+    out
+}
+
+/// A children list (`[` already open) at `depth`; a slot shows the instance's content, or else the
+/// main's.
+fn flutter_items(ctx: &Ctx, kids: &[Placed], slot: Option<&Param>, depth: usize, out: &mut String) {
+    let list = flutter_indent(depth);
+    if let Some(p) = slot {
+        let name = &p.ident;
+        out.push_str(&format!("{list}...?{name},\n"));
+        out.push_str(&format!("{list}if ({name} == null) ...[\n"));
+    }
+    let kid = depth + usize::from(slot.is_some());
+    for (id, place) in kids {
+        flutter(ctx, *id, kid, out, *place);
+        out.push_str(",\n");
+    }
+    if slot.is_some() {
+        out.push_str(&format!("{list}],\n"));
+    }
+}
diff --git a/crates/engine/src/dev/codegen/html.rs b/crates/engine/src/dev/codegen/html.rs
new file mode 100644
index 00000000..3ae746f1
--- /dev/null
+++ b/crates/engine/src/dev/codegen/html.rs
@@ -0,0 +1,390 @@
+use super::css::{Tokens, css_decls};
+use super::*;
+
+// ------------------------------------------------------------------ HTML and React markup
+
+/// A word for the node's kind, naming layers whose name transliterates to nothing ("###" →
+/// `.text`, `.frame`), instead of the anonymous `layer-`.
+fn kind_word(n: &Node) -> &str {
+    match &n.kind {
+        NodeKind::Page { .. } => "page",
+        NodeKind::Frame => "frame",
+        NodeKind::Group => "group",
+        NodeKind::Section { .. } => "section",
+        NodeKind::Rectangle => "rectangle",
+        NodeKind::Ellipse { .. } => "ellipse",
+        NodeKind::Polygon { .. } => "polygon",
+        NodeKind::Star { .. } => "star",
+        NodeKind::Line => "line",
+        NodeKind::Vector { .. } => "vector",
+        NodeKind::Text(_) => "text",
+        NodeKind::BooleanOp { .. } => "boolean",
+        NodeKind::Component { .. } | NodeKind::ComponentSet { .. } => "component",
+        NodeKind::Instance { .. } => "instance",
+        NodeKind::Slice => "slice",
+    }
+}
+
+/// A CSS class name from a layer name ("Card / Title" → "card-title"), unique in `used`. The name
+/// is transliterated to ASCII first, so non-Latin names stay readable: 로그인 화면 →
+/// `rogeuin-hwamyeon`, кнопка → `knopka`, über → `uber` (per-codepoint transliteration, the slug
+/// libraries' way); a name left with nothing (symbols only) takes `kind`, and one starting with a
+/// digit keeps the `layer-` prefix.
+pub(crate) fn class_name(name: &str, kind: &str, used: &mut Vec<String>) -> String {
+    let mut base = String::new();
+    for c in deunicode::deunicode(name).chars().flat_map(char::to_lowercase) {
+        if c.is_ascii_alphanumeric() {
+            base.push(c);
+        } else if !base.ends_with('-') && !base.is_empty() {
+            base.push('-');
+        }
+    }
+    // The 40-character cut lands on a word boundary when there is one past the first word.
+    let base = if base.chars().count() > 40 {
+        let cut: String = base.chars().take(40).collect();
+        match cut.rfind('-') {
+            Some(i) if i > 0 => cut[..i].to_string(),
+            _ => cut,
+        }
+    } else {
+        base
+    };
+    let base = base.trim_end_matches('-');
+    let base = if base.is_empty() {
+        kind.to_string()
+    } else if base.starts_with(|c: char| c.is_ascii_digit()) {
+        format!("layer-{base}")
+    } else {
+        base.to_string()
+    };
+    let name = (1..).map(|k| if k == 1 { base.clone() } else { format!("{base}-{k}") }).find(|n| !used.contains(n)).unwrap_or(base);
+    used.push(name.clone());
+    name
+}
+
+fn html_escape(s: &str) -> String {
+    s.replace('&', "&amp;").replace('<', "&lt;").replace('>', "&gt;").replace('\n', "<br>")
+}
+
+/// Text as JSX children: HTML escapes, braces as expressions, line breaks as `<br />`.
+fn jsx_text(s: &str) -> String {
+    let mut out = String::new();
+    for c in s.chars().take(10_000) {
+        match c {
+            '&' => out.push_str("&amp;"),
+            '<' => out.push_str("&lt;"),
+            '>' => out.push_str("&gt;"),
+            '{' => out.push_str("{\"{\"}"),
+            '}' => out.push_str("{\"}\"}"),
+            '\n' => out.push_str("<br />"),
+            '\r' => {}
+            c => out.push(c),
+        }
+    }
+    out
+}
+
+/// The whole tree under `id` as nested HTML with a stylesheet: auto layout frames become
+/// flexboxes, other children are placed absolutely in their parent, text becomes paragraphs.
+pub(super) fn html(doc: &Document, id: NodeId) -> String {
+    let ctx = Ctx::new(doc, id);
+    let mut out = Markup::new(&ctx, CodeLang::Html);
+    out.node(id, None, 0, "");
+    format!("{}\n<style>\n{}{}</style>\n", out.markup, out.tokens.root_rule(), out.styles)
+}
+
+/// Markup being built for a layer tree: HTML (`class`), React JSX (`className`), Vue
+/// (`{{ }}` interpolation, `v-if`, `:attr` bindings) or Leptos `view!` markup (text as Rust
+/// string literals); the last three with component parameters and instances as calls. With its
+/// stylesheet.
+pub(crate) struct Markup<'c, 'a> {
+    ctx: &'c Ctx<'a>,
+    /// Html, React, Vue or Leptos.
+    lang: CodeLang,
+    used: Vec<String>,
+    pub markup: String,
+    pub styles: String,
+    pub tokens: Tokens,
+    /// The root's class (default: from its name) and extra JSX attributes.
+    pub root_class: Option<String>,
+    pub root_attrs: String,
+    /// A Vue `v-if` guard for the element about to be written: Vue templates can't wrap an
+    /// element in an expression, so a boolean parameter's layer carries the condition itself.
+    v_if: Option<String>,
+    /// A prefix for every generated class name (slot content joins the caller's stylesheet, where
+    /// two slots' layer names may repeat).
+    pub class_prefix: Option<String>,
+    /// Each layer's path in the tree (names with sibling counts), class and declarations, so
+    /// variants can be compared layer by layer.
+    pub rules: Vec<(String, String, String)>,
+    /// Instances as their own (overridden) layers instead of component calls, except those
+    /// connected to code (page code).
+    pub inline: bool,
+    /// Auto layout frames and text as fluid boxes (`width: 100%` up to their width) for pages.
+    pub fluid: bool,
+    /// With `fluid`, other layers at least this share of the root's width are fluid too (a
+    /// divider, a banner image); smaller ones (icons) keep their size. Default: none.
+    pub fluid_leaves: f64,
+}
+
+impl<'c, 'a> Markup<'c, 'a> {
+    pub fn new(ctx: &'c Ctx<'a>, lang: CodeLang) -> Self {
+        Markup {
+            ctx,
+            lang,
+            used: Vec::new(),
+            markup: String::new(),
+            styles: String::new(),
+            tokens: Tokens::default(),
+            root_class: None,
+            root_attrs: String::new(),
+            v_if: None,
+            class_prefix: None,
+            rules: Vec::new(),
+            inline: false,
+            fluid: false,
+            fluid_leaves: f64::INFINITY,
+        }
+    }
+
+    /// JSX and Vue templates indent by two spaces, HTML and Leptos by four.
+    fn pad(&self, depth: usize) -> String {
+        if matches!(self.lang, CodeLang::React | CodeLang::Vue) { "  ".repeat(depth) } else { indent(depth) }
+    }
+
+    /// Component code (React or Leptos): parameters and instances as calls.
+    fn code(&self) -> bool {
+        self.lang != CodeLang::Html
+    }
+
+    /// A parameter's name in the generated code.
+    fn ident(&self, p: &Param) -> String {
+        if self.lang == CodeLang::Leptos { crate::component_codegen::rust_ident(&p.ident) } else { p.ident.clone() }
+    }
+
+    /// A layer, shown only while its boolean parameter is on (component code).
+    pub fn node(&mut self, id: NodeId, parent: Option<&Node>, depth: usize, path: &str) {
+        let Some(n) = self.ctx.doc.node(id) else { return };
+        if self.code()
+            && id != self.ctx.root
+            && let Some(p) = self.ctx.param(n, "visible")
+        {
+            // A Vue template holds no arbitrary expressions, so the guard rides on the element.
+            if self.lang == CodeLang::Vue {
+                self.v_if = Some(self.ident(p));
+                self.element(n, parent, depth, path);
+                self.v_if = None;
+                return;
+            }
+            let (pad, p) = (self.pad(depth), self.ident(p));
+            let (open, close) =
+                if self.lang == CodeLang::Leptos { (format!("{{{p}.then(|| view! {{"), "})}") } else { (format!("{{{p} && ("), ")}") };
+            self.markup.push_str(&format!("{pad}{open}\n"));
+            self.element(n, parent, depth + 1, path);
+            self.markup.push_str(&format!("{pad}{close}\n"));
+            return;
+        }
+        self.element(n, parent, depth, path);
+    }
+
+    fn rule(&mut self, path: &str, class: &str, decls: String) {
+        self.styles.push_str(&format!(".{class} {{\n"));
+        for line in decls.lines() {
+            self.styles.push_str(&format!("  {line}\n"));
+        }
+        self.styles.push_str("}\n");
+        self.rules.push((path.to_string(), class.to_string(), decls));
+    }
+
+    fn element(&mut self, n: &Node, parent: Option<&Node>, depth: usize, path: &str) {
+        let doc = self.ctx.doc;
+        let root = n.id == self.ctx.root;
+        let class = match self.root_class.take().filter(|_| root) {
+            Some(c) => {
+                self.used.push(c.clone());
+                c
+            }
+            None => {
+                let class = class_name(&n.name, kind_word(n), &mut self.used);
+                match &self.class_prefix {
+                    Some(prefix) => format!("{prefix}{class}"),
+                    None => class,
+                }
+            }
+        };
+        let pad = self.pad(depth);
+        let attr = if self.lang == CodeLang::React { "className" } else { "class" };
+        // How it sits in its parent: in the flex flow, or placed at its position.
+        let mut decls = String::new();
+        let in_flow = parent.is_some_and(|p| p.layout.is_some()) && !n.child_layout.absolute;
+        if root {
+            decls.push_str("position: relative;\n");
+        } else if in_flow {
+            let vertical = parent.and_then(|p| p.layout.as_ref()).is_some_and(|l| l.mode == LayoutMode::Vertical);
+            let (main, cross) =
+                if vertical { (n.child_layout.sizing_v, n.child_layout.sizing_h) } else { (n.child_layout.sizing_h, n.child_layout.sizing_v) };
+            if main == Sizing::Fill {
+                decls.push_str("flex: 1 1 0;\n");
+            }
+            if cross == Sizing::Fill {
+                decls.push_str("align-self: stretch;\n");
+            }
+        } else {
+            let c = n.transform.as_coeffs();
+            decls.push_str(&format!("position: absolute;\nleft: {}px;\ntop: {}px;\n", num(c[4]), num(c[5])));
+            let rot = figcraft_geom::rotation_degrees(n.transform);
+            if rot.abs() > 0.01 {
+                decls.push_str(&format!("transform: rotate({}deg);\ntransform-origin: 0 0;\n", num(-rot)));
+            }
+        }
+        // Nested instances are calls (component code), in a wrapper that places them when needed.
+        // Page code inlines instances, except those connected to code (codeConnect.set): their
+        // snippet, e.g. a design-system `<Button>`.
+        let connected = self.inline && crate::code_connect::link(doc, n.id, CodeLang::React).is_some();
+        if self.code() && (!self.inline || connected) && !root && matches!(n.kind, NodeKind::Instance { .. }) {
+            let at = depth + usize::from(!decls.is_empty());
+            let run = if self.lang == CodeLang::Leptos { ".run()" } else { "" };
+            let (inner, css) = match self.ctx.param(n, "mainComponent") {
+                Some(p) if self.lang == CodeLang::Vue => (Some(format!("{}<component :is=\"{}\" />\n", self.pad(at), self.ident(p))), String::new()),
+                Some(p) => (Some(format!("{}{{{}{run}}}\n", self.pad(at), self.ident(p))), String::new()),
+                None => self.ctx.call(n, self.lang, at).map_or((None, String::new()), |(code, css)| (Some(code), css)),
+            };
+            self.styles.push_str(&css);
+            if let Some(inner) = inner {
+                // A Vue guard set by `node` rides on the call when there is no wrapper.
+                let guard = if self.lang == CodeLang::Vue { self.v_if.take() } else { None };
+                if decls.is_empty() {
+                    self.markup.push_str(&with_v_if(&inner, guard.as_deref()));
+                } else {
+                    let guard = guard.map(|g| format!(" v-if=\"{g}\"")).unwrap_or_default();
+                    self.markup.push_str(&format!("{pad}<div {attr}=\"{class}\"{guard}>\n{inner}{pad}</div>\n"));
+                    self.rule(path, &class, decls);
+                }
+                return;
+            }
+        }
+        let hugs = n.layout.is_some() || matches!(n.kind, NodeKind::Text(_));
+        let hug = (hugs && n.child_layout.sizing_h == Sizing::Hug, hugs && n.child_layout.sizing_v == Sizing::Hug);
+        let mut own = css_decls(doc, n, &mut self.tokens, hug);
+        let page = self.ctx.doc.node(self.ctx.root).map_or(f64::INFINITY, |r| r.width);
+        if self.fluid && (n.layout.is_some() || matches!(n.kind, NodeKind::Text(_)) || (!root && n.width >= page * self.fluid_leaves)) {
+            // Full width, or sized by the flex row (`flex: 1`): no cap needed.
+            own = fluid(&own, n.width >= page - 0.5 || decls.contains("flex: 1 1 0;"), n.layout.is_some());
+        }
+        if n.layout.is_none() && !n.children.is_empty() && !root && in_flow {
+            own.push_str("position: relative;\n");
+        }
+        decls.push_str(&own);
+        self.rule(path, &class, decls);
+        // The root's variant attributes, and a Vue `v-if` guard, ride on the open tag.
+        let mut attrs = if root { self.root_attrs.clone() } else { String::new() };
+        if self.lang == CodeLang::Vue
+            && let Some(guard) = self.v_if.take()
+        {
+            attrs.push_str(&format!(" v-if=\"{guard}\""));
+        }
+        let open = |tag: &str| format!("{pad}<{tag} {attr}=\"{class}\"{attrs}>");
+        match &n.kind {
+            NodeKind::Text(t) => {
+                let body = match (self.ctx.param(n, "characters").filter(|_| self.code()), self.lang) {
+                    (Some(p), CodeLang::Leptos) => format!("{{{}.clone()}}", self.ident(p)),
+                    (Some(p), CodeLang::Vue) => format!("{{{{ {} }}}}", self.ident(p)),
+                    (Some(p), _) => format!("{{{}}}", p.ident),
+                    (None, CodeLang::React) => jsx_text(&t.characters),
+                    // `view!` takes text as string literals and void elements self-closed.
+                    (None, CodeLang::Leptos) => {
+                        t.characters.chars().take(10_000).collect::<String>().lines().map(|l| format!("{l:?}")).collect::<Vec<_>>().join("<br/>")
+                    }
+                    // A Vue template reads `{{ }}` as interpolation, so braces are escaped.
+                    (None, CodeLang::Vue) => html_escape(&t.characters).replace('{', "&#123;").replace('}', "&#125;"),
+                    (None, _) => html_escape(&t.characters),
+                };
+                self.markup.push_str(&format!("{}{body}</p>\n", open("p")));
+            }
+            _ => {
+                let kids = self.ctx.kids(n);
+                let slot = self.ctx.param(n, "slot").filter(|_| self.code());
+                let vue = self.lang == CodeLang::Vue;
+                let leptos = self.lang == CodeLang::Leptos;
+                let open = open("div");
+                let slot_ident = slot.map(|p| match self.ctx.comp {
+                    Some(c) => crate::component_codegen::slot_name(c, p),
+                    None => class_name(&p.ident, "slot", &mut Vec::new()),
+                });
+                if let Some(p) = slot.filter(|_| kids.is_empty()) {
+                    let content = if leptos {
+                        format!("{{{}}}.as_ref().map(|c| c.run())", self.ident(p))
+                    } else if vue {
+                        // Vue's own slot element, named so an instance's content lands in the right one.
+                        match slot_ident.clone() {
+                            Some(name) => format!("<slot name=\"{name}\" />"),
+                            None => "<slot />".into(),
+                        }
+                    } else {
+                        format!("{{{}}}", p.ident)
+                    };
+                    self.markup.push_str(&format!("{open}{content}</div>\n"));
+                } else if kids.is_empty() || self.ctx.too_deep(depth) {
+                    self.markup.push_str(&format!("{open}</div>\n"));
+                } else {
+                    self.markup.push_str(&format!("{open}\n"));
+                    // A slot shows the instance's content, or else the main's.
+                    let (p1, p2) = (self.pad(depth + 1), self.pad(depth + 2));
+                    let inner = match slot {
+                        Some(_) if vue => {
+                            let name = slot_ident.clone().map(|n| format!(" name=\"{n}\"")).unwrap_or_default();
+                            self.markup.push_str(&format!("{p1}<slot{name}>\n"));
+                            depth + 2
+                        }
+                        Some(p) if leptos => {
+                            self.markup.push_str(&format!("{p1}{{match &{} {{ Some(c) => c.run(), None => view! {{\n", self.ident(p)));
+                            depth + 2
+                        }
+                        Some(p) => {
+                            self.markup.push_str(&format!("{p1}{{{} ?? (\n{p2}<>\n", p.ident));
+                            depth + 3
+                        }
+                        None => depth + 1,
+                    };
+                    let mut seen: Vec<&str> = Vec::new();
+                    // Bottom layer first: later elements paint on top, like the layer order.
+                    for k in kids {
+                        let Some(kn) = doc.node(k) else { continue };
+                        let count = seen.iter().filter(|s| **s == kn.name).count();
+                        seen.push(&kn.name);
+                        self.node(k, Some(n), inner, &format!("{path}/{}#{count}", kn.name));
+                    }
+                    match slot {
+                        Some(_) if vue => self.markup.push_str(&format!("{p1}</slot>\n")),
+                        Some(_) if leptos => self.markup.push_str(&format!("{p1}}}.into_any() }}}}\n")),
+                        Some(_) => self.markup.push_str(&format!("{p2}</>\n{p1})}}\n")),
+                        None => {}
+                    }
+                    self.markup.push_str(&format!("{pad}</div>\n"));
+                }
+            }
+        }
+    }
+}
+
+/// `decls` for a box that follows the page: a fixed width becomes `width: 100%` capped at that
+/// width (or just the full width for boxes as wide as the page), and a frame's fixed height a
+/// minimum, so content can wrap and grow.
+// ponytail: width-based heuristic; fixed-size leaves (icons, images, shapes) keep their pixels.
+fn fluid(decls: &str, full: bool, frame: bool) -> String {
+    let mut out = String::with_capacity(decls.len() + 32);
+    for line in decls.lines() {
+        if let Some(w) = line.strip_prefix("width: ") {
+            out.push_str("width: 100%;\n");
+            if !full {
+                out.push_str(&format!("max-width: {w}\n"));
+            }
+        } else if let Some(h) = line.strip_prefix("height: ").filter(|_| frame) {
+            out.push_str(&format!("min-height: {h}\n"));
+        } else {
+            out.push_str(line);
+            out.push('\n');
+        }
+    }
+    out
+}
diff --git a/crates/engine/src/dev/codegen/swift.rs b/crates/engine/src/dev/codegen/swift.rs
new file mode 100644
index 00000000..a9f8eaaa
--- /dev/null
+++ b/crates/engine/src/dev/codegen/swift.rs
@@ -0,0 +1,168 @@
+use super::*;
+
+// ------------------------------------------------------------------ SwiftUI
+
+fn swift_color(c: Color) -> String {
+    format!("Color(red: {}, green: {}, blue: {}, opacity: {})", num(f64::from(c.r)), num(f64::from(c.g)), num(f64::from(c.b)), num(f64::from(c.a)))
+}
+
+fn swift_weight(w: u16) -> &'static str {
+    match w {
+        0..=150 => ".thin",
+        151..=250 => ".ultraLight",
+        251..=350 => ".light",
+        351..=450 => ".regular",
+        451..=550 => ".medium",
+        551..=650 => ".semibold",
+        651..=750 => ".bold",
+        751..=850 => ".heavy",
+        _ => ".black",
+    }
+}
+
+/// SwiftUI for a layer and its subtree at `depth`; `extra` modifiers go last (a free child's
+/// offset). A layer a boolean parameter shows sits in an `if`.
+pub(crate) fn swift(ctx: &Ctx, id: NodeId, depth: usize, out: &mut String, extra: &[String]) {
+    let Some(n) = ctx.doc.node(id) else { return };
+    if id != ctx.root
+        && let Some(p) = ctx.param(n, "visible")
+    {
+        let pad = indent(depth);
+        out.push_str(&format!("{pad}if {} {{\n", p.ident));
+        swift_layer(ctx, n, depth + 1, out, extra);
+        out.push_str(&format!("{pad}}}\n"));
+        return;
+    }
+    swift_layer(ctx, n, depth, out, extra);
+}
+
+/// A layer name safe for a single-line `//` comment: line breaks become spaces.
+pub(super) fn one_line(name: &str) -> String {
+    name.replace(['\n', '\r', '\u{85}', '\u{2028}', '\u{2029}'], " ")
+}
+
+fn swift_layer(ctx: &Ctx, n: &Node, depth: usize, out: &mut String, extra: &[String]) {
+    let doc = ctx.doc;
+    let pad = indent(depth);
+    if ctx.too_deep(depth) {
+        out.push_str(&format!("{pad}// {} …\n", one_line(&n.name)));
+        return;
+    }
+    // Nested instances are calls; an instance swap parameter is a view.
+    let call = match ctx.param(n, "mainComponent").filter(|_| n.id != ctx.root) {
+        Some(p) => Some(format!("{pad}{}\n", p.ident)),
+        None => ctx.call(n, CodeLang::SwiftUi, depth).map(|(code, _)| code),
+    };
+    if let Some(call) = call {
+        out.push_str(&call);
+        for m in extra {
+            out.push_str(&format!("{pad}    {m}\n"));
+        }
+        return;
+    }
+    let mut mods: Vec<String> = Vec::new();
+    match &n.kind {
+        NodeKind::Text(t) => {
+            let text = ctx.param(n, "characters").map_or_else(|| literal(&t.characters, false), |p| p.ident.clone());
+            out.push_str(&format!("{pad}Text({text})\n"));
+            mods.push(format!(
+                ".font(.custom({}, size: {}).weight({}))",
+                literal(&t.style.font_family, false),
+                num(t.style.font_size),
+                swift_weight(t.style.weight())
+            ));
+            if let Some(c) = first_fill(n) {
+                mods.push(format!(".foregroundColor({})", swift_color(c)));
+            }
+        }
+        NodeKind::Ellipse { .. } => {
+            out.push_str(&format!("{pad}Ellipse()\n"));
+            if let Some(c) = first_fill(n) {
+                mods.push(format!(".fill({})", swift_color(c)));
+            }
+            mods.push(format!(".frame(width: {}, height: {})", num(n.width), num(n.height)));
+        }
+        NodeKind::Rectangle => {
+            out.push_str(&format!("{pad}RoundedRectangle(cornerRadius: {})\n", num(radius(n))));
+            if let Some(c) = first_fill(n) {
+                mods.push(format!(".fill({})", swift_color(c)));
+            }
+            mods.push(format!(".frame(width: {}, height: {})", num(n.width), num(n.height)));
+        }
+        k if k.is_frame_like() || matches!(k, NodeKind::Group) => {
+            let children = ctx.kids(n);
+            let open = match n.layout.as_ref().map(|l| (l.mode, l)) {
+                Some((LayoutMode::Vertical, l)) => format!("VStack(alignment: .leading, spacing: {}) {{", num(l.gap)),
+                Some((_, l)) => format!("HStack(alignment: .center, spacing: {}) {{", num(l.gap)),
+                None => "ZStack(alignment: .topLeading) {".to_string(),
+            };
+            out.push_str(&format!("{pad}{open}\n"));
+            // A slot shows the instance's content, or else the main's.
+            let slot = ctx.param(n, "slot");
+            let inner = match slot {
+                Some(p) => {
+                    out.push_str(&format!("{pad}    if let {0} {{\n{pad}        {0}\n{pad}    }} else {{\n", p.ident));
+                    depth + 2
+                }
+                None => depth + 1,
+            };
+            for c in &children {
+                // Free children sit at their offset inside a ZStack.
+                let offset: Vec<String> = match doc.node(*c).filter(|_| n.layout.is_none()) {
+                    Some(cn) => {
+                        let [_, _, _, _, x, y] = cn.transform.as_coeffs();
+                        vec![format!(".offset(x: {}, y: {})", num(x), num(y))]
+                    }
+                    None => Vec::new(),
+                };
+                swift(ctx, *c, inner, out, &offset);
+            }
+            if slot.is_some() {
+                out.push_str(&format!("{pad}    }}\n"));
+            }
+            out.push_str(&format!("{pad}}}\n"));
+            if let Some(l) = &n.layout {
+                let [t, r, b, lft] = l.padding;
+                if [t, r, b, lft].iter().any(|v| *v > 0.0) {
+                    mods.push(format!(".padding(EdgeInsets(top: {}, leading: {}, bottom: {}, trailing: {}))", num(t), num(lft), num(b), num(r)));
+                }
+            }
+            mods.push(format!(".frame(width: {}, height: {}, alignment: .topLeading)", num(n.width), num(n.height)));
+            if let Some(c) = first_fill(n) {
+                mods.push(format!(".background({})", swift_color(c)));
+            }
+            if radius(n) > 0.0 {
+                mods.push(format!(".clipShape(RoundedRectangle(cornerRadius: {}))", num(radius(n))));
+            }
+        }
+        _ => {
+            out.push_str(&format!("{pad}// {}: export as an image asset\n{pad}Image({})\n", n.kind.label(), literal(&n.name, false)));
+            mods.push(".resizable()".into());
+            mods.push(format!(".frame(width: {}, height: {})", num(n.width), num(n.height)));
+        }
+    }
+    if let Some(c) = stroke_color(n) {
+        mods.push(format!(
+            ".overlay(RoundedRectangle(cornerRadius: {}).stroke({}, lineWidth: {}))",
+            num(radius(n)),
+            swift_color(c),
+            num(n.stroke.weight)
+        ));
+    }
+    if let Some(s) = drop_shadow(n) {
+        mods.push(format!(
+            ".shadow(color: {}, radius: {}, x: {}, y: {})",
+            swift_color(s.color),
+            num(s.radius / 2.0),
+            num(s.offset.0),
+            num(s.offset.1)
+        ));
+    }
+    if n.opacity < 1.0 {
+        mods.push(format!(".opacity({})", num(f64::from(n.opacity))));
+    }
+    mods.extend(extra.iter().cloned());
+    for m in mods {
+        out.push_str(&format!("{pad}    {m}\n"));
+    }
+}
diff --git a/crates/engine/src/component_codegen.rs b/crates/engine/src/dev/component_codegen.rs
similarity index 70%
rename from crates/engine/src/component_codegen.rs
rename to crates/engine/src/dev/component_codegen.rs
index fe879acd..2b178bb0 100644
--- a/crates/engine/src/component_codegen.rs
+++ b/crates/engine/src/dev/component_codegen.rs
@@ -1,17 +1,17 @@
-//! Component code: a component (or component set) becomes a React, Leptos, SwiftUI, Jetpack
-//! Compose or Flutter component whose properties are its parameters (a variant property → a union
-//! or enum, boolean →
-//! a flag showing the layers bound to it, text → a string, instance swap → a view parameter, slot →
-//! optional content), and an instance becomes a call passing the values it sets. Variants of a set
-//! share one definition (the set's default variant); in React and Leptos their differences become CSS
-//! rules on `data-*` attributes. Returned by `inspect.componentCode` and used by `inspect.code`. A component
-//! connected to code (see [`crate::code_connect`]) shows its real snippet instead.
+//! Component code: a component (or component set) becomes a React, Leptos, Vue, SwiftUI, Jetpack
+//! Compose, ArkUI or Flutter component whose properties are its parameters (a variant property → a
+//! union or enum, boolean → a flag showing the layers bound to it, text → a string, instance swap →
+//! a view parameter, slot → optional content), and an instance becomes a call passing the values it
+//! sets. Variants of a set share one definition (the set's default variant); in React and Leptos
+//! their differences become CSS rules on `data-*` attributes. Returned by `inspect.componentCode`
+//! and used by `inspect.code`. A component connected to code (see [`crate::code_connect`]) shows
+//! its real snippet instead.
 
 use figcraft_doc::*;
 use serde_json::{Value, json};
 
 use crate::cmd::CommandSpec;
-use crate::codegen::{CodeLang, Ctx, FLUTTER_IMPORT, Markup, Place, class_name, compose, flutter, flutter_indent, indent, literal, swift};
+use crate::codegen::{CodeLang, Ctx, FLUTTER_IMPORT, Markup, Place, arkui, class_name, compose, flutter, flutter_indent, indent, literal, swift};
 use crate::components::{prop_default_value, slot_edited, slots_of, variant_options, variant_props, variant_set};
 use crate::params::*;
 use crate::{bad, spec};
@@ -68,14 +68,14 @@ pub fn specs() -> Vec<CommandSpec> {
     vec![spec!(
         "inspect.componentCode",
         "Component code",
-        "{id? (component, set or instance; default the selection), language?: react|leptos|swiftui|compose|flutter (default react)} → {component, name, set, properties: [{name, param, type, default, value? (instances)}], definition, usage? (instances; the connected snippet when the component is connected to code), connected: {importPath, name, template, import, code} | null}",
+        "{id? (component, set or instance; default the selection), language?: react|leptos|vue|swiftui|compose|arkui|flutter (default react)} → {component, name, set, properties: [{name, param, type, default, value? (instances)}], definition, usage? (instances; the connected snippet when the component is connected to code), connected: {importPath, name, template, import, code} | null}",
         false,
         |s, p| {
             let cmd = "inspect.componentCode";
             let id = targets(s, p).first().copied().ok_or_else(|| bad(cmd, "select a component or instance"))?;
-            let lang = match string(p, "language").map(|l| CodeLang::from_id(&l)) {
-                Some(Some(l @ (CodeLang::React | CodeLang::Leptos | CodeLang::SwiftUi | CodeLang::Compose | CodeLang::Flutter))) => l,
-                Some(_) => return Err(bad(cmd, "language: react|leptos|swiftui|compose|flutter")),
+            let lang = match string(p, "language") {
+                // One list of code languages, shared with codeConnect (see `code_connect::language`).
+                Some(l) => crate::code_connect::language(&l).ok_or_else(|| bad(cmd, "language: react|leptos|vue|swiftui|compose|arkui|flutter"))?,
                 None => CodeLang::React,
             };
             let doc = s.doc()?;
@@ -108,16 +108,17 @@ pub fn specs() -> Vec<CommandSpec> {
     )]
 }
 
-/// Code for any layer in React, Leptos, SwiftUI, Compose or Flutter: an instance's call and its
-/// component's definition, a component's (or set's) definition, or the layer tree (React and Leptos
-/// wrap it in a function component).
+/// Code for any layer in React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter: an instance's call
+/// and its component's definition, a component's (or set's) definition, or the layer tree (React
+/// and Leptos wrap it in a function component), with the imports of the connected components it
+/// calls at the top.
 pub fn code(doc: &Document, id: NodeId, lang: CodeLang) -> String {
     let Some(n) = doc.node(id) else { return String::new() };
     if let Some(code) = crate::code_connect::link(doc, id, lang).and_then(|l| crate::code_connect::connected_code(doc, id, lang, l)) {
         return code;
     }
     let comp = main_of(doc, id).and_then(|m| describe(doc, m));
-    match (&n.kind, comp) {
+    let code = match (&n.kind, comp) {
         (NodeKind::Instance { .. }, Some(c)) => {
             let call = usage(doc, id, lang, 0).unwrap_or_default();
             let def = definition(doc, &c, lang);
@@ -129,15 +130,24 @@ pub fn code(doc: &Document, id: NodeId, lang: CodeLang) -> String {
         }
         (NodeKind::Component { .. } | NodeKind::ComponentSet { .. }, Some(c)) => definition(doc, &c, lang),
         _ => match lang {
-            CodeLang::React | CodeLang::Leptos => {
+            CodeLang::React | CodeLang::Leptos | CodeLang::Vue => {
                 let c = Component { comp: id, set: None, type_name: component_type_name(&n.name), params: Vec::new() };
-                if lang == CodeLang::Leptos { leptos(doc, &c) } else { react(doc, &c) }
+                match lang {
+                    CodeLang::Leptos => leptos(doc, &c),
+                    CodeLang::Vue => vue(doc, &c),
+                    _ => react(doc, &c),
+                }
             }
             CodeLang::SwiftUi => {
                 let mut out = String::new();
                 swift(&Ctx::new(doc, id), id, 0, &mut out, &[]);
                 out
             }
+            CodeLang::ArkUi => {
+                let mut out = String::new();
+                arkui(&Ctx::new(doc, id), id, 0, &mut out, &[]);
+                out
+            }
             CodeLang::Flutter => {
                 let mut out = String::new();
                 flutter(&Ctx::new(doc, id), id, 0, &mut out, Place::Flow);
@@ -149,6 +159,29 @@ pub fn code(doc: &Document, id: NodeId, lang: CodeLang) -> String {
                 out
             }
         },
+    };
+    let imports = crate::code_connect::tree_imports(doc, id, lang);
+    if lang == CodeLang::Vue && !imports.is_empty() {
+        return vue_with_imports(&imports, code);
+    }
+    crate::code_connect::with_imports(&imports, code)
+}
+
+/// A Vue single-file component imports in its `<script setup>`, which is added when it has none.
+fn vue_with_imports(imports: &[String], code: String) -> String {
+    const SETUP: &str = "<script setup lang=\"ts\">\n\n";
+    let lines = imports.join("\n");
+    // `find` returns char boundaries, so the splits below are safe.
+    if let Some(at) = code.find(SETUP).map(|at| at + SETUP.len()) {
+        let (head, tail) = code.split_at(at);
+        return format!("{head}{lines}\n\n{tail}");
+    }
+    match code.find("<template>") {
+        Some(at) => {
+            let (head, tail) = code.split_at(at);
+            format!("{head}{SETUP}{lines}\n\n</script>\n\n{tail}")
+        }
+        None => crate::code_connect::with_imports(imports, code),
     }
 }
 
@@ -238,7 +271,9 @@ pub fn type_name(name: &str) -> String {
 /// Words no generated parameter may be called (keywords of TypeScript, Swift and Kotlin, and
 /// names the generated code uses).
 const RESERVED: &[&str] = &[
+    "arguments",
     "as",
+    "await",
     "body",
     "break",
     "case",
@@ -252,6 +287,7 @@ const RESERVED: &[&str] = &[
     "do",
     "else",
     "enum",
+    "eval",
     "export",
     "extends",
     "extension",
@@ -262,6 +298,7 @@ const RESERVED: &[&str] = &[
     "function",
     "guard",
     "if",
+    "implements",
     "import",
     "in",
     "init",
@@ -277,6 +314,7 @@ const RESERVED: &[&str] = &[
     "operator",
     "package",
     "private",
+    "protected",
     "protocol",
     "public",
     "ref",
@@ -303,7 +341,7 @@ const RESERVED: &[&str] = &[
     "yield",
 ];
 
-/// Types the generated SwiftUI, Compose and Flutter code names: a variant enum may not shadow them.
+/// Types the generated SwiftUI, Compose, ArkUI and Flutter code names: a variant enum may not shadow them.
 const TYPES: &[&str] = &[
     "Alignment",
     "AnyView",
@@ -319,6 +357,7 @@ const TYPES: &[&str] = &[
     "BoxShape",
     "BuildContext",
     "CaseIterable",
+    "Circle",
     "CircleShape",
     "Color",
     "Column",
@@ -329,17 +368,20 @@ const TYPES: &[&str] = &[
     "Ellipse",
     "EmptyView",
     "Expanded",
+    "FlexAlign",
     "Font",
     "FontStyle",
     "FontWeight",
     "Group",
     "HStack",
+    "HorizontalAlign",
     "Image",
     "MainAxisAlignment",
     "Modifier",
     "Offset",
     "Opacity",
     "Positioned",
+    "Rect",
     "RectangleShape",
     "RoundedCornerShape",
     "RoundedRectangle",
@@ -352,10 +394,13 @@ const TYPES: &[&str] = &[
     "Text",
     "TextAlign",
     "TextBaseline",
+    "TextCase",
     "TextDecoration",
+    "TextDecorationType",
     "TextStyle",
     "Unit",
     "VStack",
+    "VerticalAlign",
     "View",
     "ZStack",
 ];
@@ -485,6 +530,23 @@ pub(crate) fn js_string(s: &str) -> String {
     serde_json::to_string(&s).unwrap_or_else(|_| "\"\"".into())
 }
 
+/// A JavaScript string literal safe inside a Vue single-file component: `<` is escaped, so a
+/// default containing `</script>` can't close the `<script setup>` block early.
+pub(crate) fn vue_string(s: &str) -> String {
+    js_string(s).replace('<', "\\u003C")
+}
+
+/// A plain Vue attribute value: its JS string quotes stay as the attribute delimiters, and HTML
+/// entities inside are escaped so the value reads back unchanged.
+fn html_attr_value(s: &str) -> String {
+    s.replace('&', "&amp;").replace('<', "&lt;").replace('>', "&gt;")
+}
+
+/// A Vue binding expression inside a double-quoted attribute.
+fn html_attr_expr(s: &str) -> String {
+    s.replace('&', "&amp;").replace('<', "&lt;").replace('>', "&gt;").replace('"', "&quot;")
+}
+
 /// The type name of a component (a variant's set) by id.
 pub(crate) fn component_type(doc: &Document, comp: NodeId) -> Option<String> {
     let n = doc.node(comp).filter(|n| matches!(n.kind, NodeKind::Component { .. } | NodeKind::ComponentSet { .. }))?;
@@ -498,8 +560,11 @@ fn enum_name(c: &Component, p: &Param, swift: bool) -> String {
 
 /// `value` of a parameter as an expression in `lang`.
 pub(crate) fn value_expr(doc: &Document, c: &Component, p: &Param, value: &Value, lang: CodeLang) -> String {
+    // React and Vue both take JavaScript: strings, and variant values as plain strings.
+    let js = matches!(lang, CodeLang::React | CodeLang::Vue);
     match (&p.kind, lang) {
         (ParamKind::Boolean, _) => value.as_bool().unwrap_or(false).to_string(),
+        (ParamKind::Text, CodeLang::Vue) => vue_string(value.as_str().unwrap_or("")),
         (ParamKind::Text, CodeLang::React) => js_string(value.as_str().unwrap_or("")),
         (ParamKind::Text, CodeLang::Leptos) => rust_string(value.as_str().unwrap_or("")),
         (ParamKind::Variant(opts), CodeLang::Leptos) => {
@@ -509,6 +574,9 @@ pub(crate) fn value_expr(doc: &Document, c: &Component, p: &Param, value: &Value
         (ParamKind::Text, l) => literal(value.as_str().unwrap_or(""), l.escapes_dollar()),
         (ParamKind::Variant(opts), l) => {
             let v = value.as_str().unwrap_or("");
+            if l == CodeLang::Vue {
+                return vue_string(v);
+            }
             if l == CodeLang::React {
                 return js_string(v);
             }
@@ -522,13 +590,18 @@ pub(crate) fn value_expr(doc: &Document, c: &Component, p: &Param, value: &Value
         (ParamKind::InstanceSwap, l) => {
             let t = id_of(value).and_then(|i| component_type(doc, i));
             match (t, l) {
-                (Some(t), CodeLang::React) => format!("<{t} />"),
+                // A Vue binding takes the component itself, not an element.
+                (Some(t), CodeLang::Vue) => t,
+                (Some(t), _) if js => format!("<{t} />"),
                 (Some(t), CodeLang::Leptos) => format!("|| view! {{ <{} /> }}", rust_type(&t)),
                 (None, CodeLang::Leptos) => "|| ()".into(),
                 (Some(t), CodeLang::SwiftUi) => format!("AnyView({t}())"),
                 (Some(t), CodeLang::Flutter) => format!("{t}()"),
+                // ArkUI takes a builder: `@BuilderParam` is a `() => void`.
+                (Some(t), CodeLang::ArkUi) => format!("() => {{ {t}() }}"),
+                (None, CodeLang::ArkUi) => "() => {}".into(),
                 (Some(t), _) => format!("{{ {t}() }}"),
-                (None, CodeLang::React) => "null".into(),
+                (None, _) if js => "null".into(),
                 (None, CodeLang::SwiftUi) => "AnyView(EmptyView())".into(),
                 (None, CodeLang::Flutter) => "const SizedBox.shrink()".into(),
                 (None, _) => "{}".into(),
@@ -540,6 +613,19 @@ pub(crate) fn value_expr(doc: &Document, c: &Component, p: &Param, value: &Value
 
 // ------------------------------------------------------------------ instances
 
+/// The `<slot name="…">` of a slot parameter: unique among the component's slot parameters, unlike
+/// `class_name` called with a fresh list per parameter (two idents can lowercase alike).
+pub(crate) fn slot_name(c: &Component, p: &Param) -> String {
+    let mut used = Vec::new();
+    for q in c.params.iter().filter(|q| matches!(q.kind, ParamKind::Slot)) {
+        let name = class_name(&q.ident, "slot", &mut used);
+        if q.ident == p.ident {
+            return name;
+        }
+    }
+    class_name(&p.ident, "slot", &mut Vec::new())
+}
+
 /// The values an instance sets for `c`'s parameters, in order (`None` for other layers): variant
 /// values from the variant it shows, slots as whether they hold its own content.
 pub(crate) fn instance_values(doc: &Document, id: NodeId, c: &Component) -> Option<Vec<(String, Value)>> {
@@ -564,23 +650,32 @@ pub(crate) fn instance_values(doc: &Document, id: NodeId, c: &Component) -> Opti
 /// The call for instance `id` at `depth`, passing the values that differ from the defaults and the
 /// content of slots it fills (`None` when it isn't an instance of an existing component).
 pub fn usage(doc: &Document, id: NodeId, lang: CodeLang, depth: usize) -> Option<String> {
+    usage_with_styles(doc, id, lang, depth).map(|(code, _)| code)
+}
+
+/// `usage` and the CSS generated for the slot content it carries (the caller's stylesheet needs
+/// those rules; `usage` alone drops them at a snippet boundary).
+pub(crate) fn usage_with_styles(doc: &Document, id: NodeId, lang: CodeLang, depth: usize) -> Option<(String, String)> {
     let c = main_of(doc, id).and_then(|m| describe(doc, m))?;
     let values = instance_values(doc, id, &c)?;
-    let pad = if matches!(lang, CodeLang::React | CodeLang::Flutter) { "  ".repeat(depth) } else { indent(depth) };
-    // A connected component: its real snippet. shortcut: inside a layer tree it brings no import
-    // line; collect them at the top of the tree's code when people ask for it.
+    let pad = if matches!(lang, CodeLang::React | CodeLang::Vue | CodeLang::Flutter) { "  ".repeat(depth) } else { indent(depth) };
+    // A connected component: its real snippet (its import is at the top of the code: `code`).
     if let Some(link) = crate::code_connect::link(doc, id, lang) {
-        return Some(crate::code_connect::render(doc, &c, &values, link, lang, &pad));
+        return Some((crate::code_connect::render(doc, &c, &values, link, lang, &pad), String::new()));
     }
     let slots = slots_of(doc, id);
     // (parameter, expression, whether it's a plain string literal)
     let mut args: Vec<(&str, String, bool)> = Vec::new();
+    let mut slot_css = String::new();
     for (p, (_, v)) in c.params.iter().zip(&values) {
         if let ParamKind::Slot = p.kind {
             if v.as_bool() == Some(true)
                 && let Some((layer, _)) = slots.iter().find(|(_, name)| *name == p.prop)
             {
-                args.push((&p.ident, slot_content(doc, *layer, lang, depth), false));
+                let prefix = format!("slot-{}-", slot_name(&c, p));
+                let (content, css) = slot_content(doc, *layer, lang, depth, &prefix);
+                slot_css.push_str(&css);
+                args.push((&p.ident, content, false));
             }
             continue;
         }
@@ -592,7 +687,7 @@ pub fn usage(doc: &Document, id: NodeId, lang: CodeLang, depth: usize) -> Option
         args.push((&p.ident, expr, plain));
     }
     let t = &c.type_name;
-    Some(match lang {
+    let code = match lang {
         CodeLang::React | CodeLang::Leptos => {
             let leptos = lang == CodeLang::Leptos;
             // Plain strings read best as attribute values.
@@ -606,40 +701,91 @@ pub fn usage(doc: &Document, id: NodeId, lang: CodeLang, depth: usize) -> Option
             let t = if leptos { rust_type(t) } else { t.clone() };
             format!("{pad}<{t}{attrs} />\n")
         }
+        CodeLang::Vue => {
+            // A plain string is an attribute value and anything else a `:name` binding, named as
+            // the definition declares the prop; a slot is a `<template #name>` child instead,
+            // named as its `<slot>` element is.
+            let is_slot = |name: &str| c.params.iter().any(|p| p.ident == name && matches!(p.kind, ParamKind::Slot));
+            let attrs: String = args
+                .iter()
+                .filter(|(name, _, _)| !is_slot(name))
+                .map(
+                    |(name, expr, plain)| {
+                        if *plain { format!(" {name}={}", html_attr_value(expr)) } else { format!(" :{name}=\"{}\"", html_attr_expr(expr)) }
+                    },
+                )
+                .collect();
+            let slots: String = args
+                .iter()
+                .filter(|(name, _, _)| is_slot(name))
+                .map(|(name, expr, _)| {
+                    let slot = c.params.iter().find(|q| q.ident == *name);
+                    let name = slot.map(|p| slot_name(&c, p)).unwrap_or_else(|| class_name(name, "slot", &mut Vec::new()));
+                    format!("{pad}  <template #{name}>\n{expr}{pad}  </template>\n")
+                })
+                .collect();
+            if slots.is_empty() { format!("{pad}<{t}{attrs} />\n") } else { format!("{pad}<{t}{attrs}>\n{slots}{pad}</{t}>\n") }
+        }
         CodeLang::SwiftUi | CodeLang::Flutter => {
             format!("{pad}{t}({})\n", args.iter().map(|(n, e, _)| format!("{n}: {e}")).collect::<Vec<_>>().join(", "))
         }
+        CodeLang::ArkUi => {
+            let list = args.iter().map(|(n, e, _)| format!("{n}: {e}")).collect::<Vec<_>>().join(", ");
+            // ArkTS calls take an object literal, or nothing at all.
+            if list.is_empty() { format!("{pad}{t}()\n") } else { format!("{pad}{t}({{ {list} }})\n") }
+        }
         _ => format!("{pad}{t}({})\n", args.iter().map(|(n, e, _)| format!("{n} = {e}")).collect::<Vec<_>>().join(", ")),
-    })
+    };
+    Some((code, slot_css))
 }
 
-/// The content an instance put in one of its slots, as an expression spanning lines.
-fn slot_content(doc: &Document, slot: NodeId, lang: CodeLang, depth: usize) -> String {
-    let Some(n) = doc.node(slot) else { return String::new() };
+/// The content an instance put in one of its slots, as an expression spanning lines, and the CSS
+/// its layers generated (so the caller's stylesheet keeps it). `prefix` keeps two slots' class
+/// names apart when their layers share a name.
+fn slot_content(doc: &Document, slot: NodeId, lang: CodeLang, depth: usize, prefix: &str) -> (String, String) {
+    let Some(n) = doc.node(slot) else { return (String::new(), String::new()) };
     let ctx = Ctx { doc, root: slot, comp: None, base: depth };
     let kids = ctx.kids(n);
     match lang {
         CodeLang::React => {
             let mut m = Markup::new(&ctx, CodeLang::React);
+            m.class_prefix = Some(prefix.to_string());
             for k in kids {
                 m.node(k, Some(n), depth + 2, "");
             }
             let (p1, p2) = ("  ".repeat(depth), "  ".repeat(depth + 1));
-            format!("(\n{p2}<>\n{}{p2}</>\n{p1})", m.markup)
+            (format!("(\n{p2}<>\n{}{p2}</>\n{p1})", m.markup), m.styles)
         }
         CodeLang::Leptos => {
             let mut m = Markup::new(&ctx, CodeLang::Leptos);
+            m.class_prefix = Some(prefix.to_string());
             for k in kids {
                 m.node(k, Some(n), depth + 1, "");
             }
-            format!("|| view! {{\n{}{}}}", m.markup, indent(depth))
+            (format!("|| view! {{\n{}{}}}", m.markup, indent(depth)), m.styles)
+        }
+        CodeLang::Vue => {
+            // Just the markup: `usage` wraps it in the `<template #name>` of that slot.
+            let mut m = Markup::new(&ctx, CodeLang::Vue);
+            m.class_prefix = Some(prefix.to_string());
+            for k in kids {
+                m.node(k, Some(n), depth + 2, "");
+            }
+            (m.markup, m.styles)
         }
         CodeLang::SwiftUi => {
             let mut out = String::new();
             for k in kids {
                 swift(&ctx, k, depth + 2, &mut out, &[]);
             }
-            format!("AnyView(Group {{\n{out}{}}})", indent(depth + 1))
+            (format!("AnyView(Group {{\n{out}{}}})", indent(depth + 1)), String::new())
+        }
+        CodeLang::ArkUi => {
+            let mut out = String::new();
+            for k in kids {
+                arkui(&ctx, k, depth + 2, &mut out, &[]);
+            }
+            (format!("() => {{\n{out}{}}}", indent(depth + 1)), String::new())
         }
         CodeLang::Flutter => {
             // A slot holds a list of widgets, so it takes however many layers the slot has.
@@ -648,14 +794,14 @@ fn slot_content(doc: &Document, slot: NodeId, lang: CodeLang, depth: usize) -> S
                 flutter(&ctx, k, depth + 1, &mut out, Place::Flow);
                 out.push_str(",\n");
             }
-            format!("[\n{out}{}]", flutter_indent(depth))
+            (format!("[\n{out}{}]", flutter_indent(depth)), String::new())
         }
         _ => {
             let mut out = String::new();
             for k in kids {
                 compose(&ctx, k, depth + 2, &mut out);
             }
-            format!("{{\n{out}{}}}", indent(depth + 1))
+            (format!("{{\n{out}{}}}", indent(depth + 1)), String::new())
         }
     }
 }
@@ -669,6 +815,8 @@ pub fn definition(doc: &Document, c: &Component, lang: CodeLang) -> String {
         CodeLang::Compose => compose_definition(doc, c),
         CodeLang::Flutter => flutter_definition(doc, c),
         CodeLang::Leptos => leptos(doc, c),
+        CodeLang::Vue => vue(doc, c),
+        CodeLang::ArkUi => arkui_definition(doc, c),
         _ => react(doc, c),
     }
 }
@@ -676,7 +824,7 @@ pub fn definition(doc: &Document, c: &Component, lang: CodeLang) -> String {
 /// `data-*` attribute names for variant parameters, unique among them (in order).
 fn data_attrs(variants: &[&Param]) -> Vec<String> {
     let mut used = Vec::new();
-    variants.iter().map(|p| format!("data-{}", class_name(&p.prop, &mut used))).collect()
+    variants.iter().map(|p| format!("data-{}", class_name(&p.prop, "prop", &mut used))).collect()
 }
 
 /// `c`'s markup in React or Leptos (two levels in) and its stylesheet (variables as custom
@@ -684,7 +832,7 @@ fn data_attrs(variants: &[&Param]) -> Vec<String> {
 fn web(doc: &Document, c: &Component, lang: CodeLang) -> (String, String, String) {
     let ctx = Ctx { doc, root: c.comp, comp: Some(c), base: 2 };
     let root_name = c.set.and_then(|s| doc.node(s)).or_else(|| doc.node(c.comp)).map(|n| n.name.clone()).unwrap_or_default();
-    let root_class = class_name(&root_name, &mut Vec::new());
+    let root_class = class_name(&root_name, "component", &mut Vec::new());
     let variants: Vec<&Param> = c.params.iter().filter(|p| matches!(p.kind, ParamKind::Variant(_))).collect();
     let attr_names = data_attrs(&variants);
     let pass = |root: NodeId| {
@@ -701,6 +849,7 @@ fn web(doc: &Document, c: &Component, lang: CodeLang) -> (String, String, String
         .zip(&attr_names)
         .map(|(p, attr)| match lang {
             CodeLang::Leptos => format!(" {attr}={{{}.as_str()}}", rust_ident(&p.ident)),
+            CodeLang::Vue => format!(" :{attr}=\"{}\"", p.ident),
             _ => format!(" {attr}={{{}}}", p.ident),
         })
         .collect();
@@ -764,6 +913,39 @@ fn react(doc: &Document, c: &Component) -> String {
     out
 }
 
+/// A Vue single-file component: `<script setup>` with typed props and their defaults, the
+/// template, and a scoped stylesheet. Slots become Vue's own `<slot>` elements, so they are not
+/// props. Variants switch on the `data-*` attributes of the root element, as on the web.
+fn vue(doc: &Document, c: &Component) -> String {
+    // The stylesheet sits inline in the SFC, so the root class name isn't needed here.
+    let (_, markup, css) = web(doc, c, CodeLang::Vue);
+    // A slot layer is a `<slot>` element in the template, so it takes no prop.
+    let props: Vec<&Param> = c.params.iter().filter(|p| !matches!(p.kind, ParamKind::Slot)).collect();
+    let mut out = String::new();
+    if !props.is_empty() {
+        // `__props` can't be a generated prop name (idents are camelCase words), so a property
+        // named `Props` isn't shadowed by the binding.
+        out.push_str("<script setup lang=\"ts\">\n\nconst __props = withDefaults(\n  defineProps<{\n");
+        for p in &props {
+            let ty = match &p.kind {
+                ParamKind::Variant(opts) => opts.iter().map(|o| vue_string(o)).collect::<Vec<_>>().join(" | "),
+                ParamKind::Boolean => "boolean".into(),
+                ParamKind::Text => "string".into(),
+                ParamKind::InstanceSwap | ParamKind::Slot => "unknown".into(),
+            };
+            out.push_str(&format!("    {}?: {ty};\n", p.ident));
+        }
+        out.push_str("  }>(),\n  {\n");
+        for p in &props {
+            // An instance swap defaults to its component reference; a slot isn't in `props`.
+            out.push_str(&format!("    {}: {},\n", p.ident, value_expr(doc, c, p, &p.default, CodeLang::Vue)));
+        }
+        out.push_str("  },\n);\n\n</script>\n\n");
+    }
+    out.push_str(&format!("<template>\n{markup}</template>\n\n<style scoped>\n{css}</style>\n"));
+    out
+}
+
 /// A Leptos `#[component]` with its variant enums and props (defaults as `#[prop]` attributes),
 /// and its stylesheet.
 fn leptos(doc: &Document, c: &Component) -> String {
@@ -925,3 +1107,67 @@ fn flutter_default(doc: &Document, c: &Component, p: &Param) -> Option<String> {
         _ => Some(value_expr(doc, c, p, &p.default, CodeLang::Flutter)),
     }
 }
+
+/// An ArkUI (`@Component`) struct: variant enums, `@Prop` parameters, a default builder for each
+/// instance swap and slot, and the `build` body.
+fn arkui_definition(doc: &Document, c: &Component) -> String {
+    let ctx = Ctx { doc, root: c.comp, comp: Some(c), base: 1 };
+    let mut out = String::new();
+    for p in &c.params {
+        if let ParamKind::Variant(opts) = &p.kind {
+            out.push_str(&format!("export enum {} {{ {} }}\n\n", enum_name(c, p, false), cases(opts, false).join(", ")));
+        }
+    }
+    // A default builder per instance swap or slot, named apart from every parameter.
+    let mut used: Vec<String> = c.params.iter().map(|p| p.ident.clone()).collect();
+    let mut builders: Vec<(String, String)> = Vec::new();
+    for p in &c.params {
+        if !matches!(p.kind, ParamKind::InstanceSwap | ParamKind::Slot) {
+            continue;
+        }
+        let base = format!("default{}Builder", capitalized(&p.ident));
+        let name = (1..).map(|k| if k == 1 { base.clone() } else { format!("{base}{k}") }).find(|n| !used.contains(n)).unwrap_or(base);
+        used.push(name.clone());
+        builders.push((p.ident.clone(), name));
+    }
+    out.push_str("@Component\nexport struct ");
+    out.push_str(&c.type_name);
+    out.push_str(" {\n");
+    for p in &c.params {
+        match &p.kind {
+            ParamKind::Variant(_) => {
+                out.push_str(&format!("    @Prop {}: {} = {}\n", p.ident, enum_name(c, p, false), value_expr(doc, c, p, &p.default, CodeLang::ArkUi)))
+            }
+            ParamKind::Boolean => out.push_str(&format!("    @Prop {}: boolean = {}\n", p.ident, p.default.as_bool().unwrap_or(false))),
+            ParamKind::Text => out.push_str(&format!("    @Prop {}: string = {}\n", p.ident, value_expr(doc, c, p, &p.default, CodeLang::ArkUi))),
+            ParamKind::InstanceSwap | ParamKind::Slot => {
+                let name = builders.iter().find(|(ident, _)| *ident == p.ident).map_or("", |(_, name)| name.as_str());
+                out.push_str(&format!("    @BuilderParam {}: () => void = this.{name}\n", p.ident));
+            }
+        }
+    }
+    for (ident, name) in &builders {
+        let Some(p) = c.params.iter().find(|p| p.ident == *ident) else { continue };
+        out.push_str(&format!("\n    @Builder\n    {name}() {{\n"));
+        match &p.kind {
+            ParamKind::InstanceSwap => {
+                if let Some(t) = id_of(&p.default).and_then(|i| component_type(doc, i)) {
+                    out.push_str(&format!("        {t}()\n"));
+                }
+            }
+            ParamKind::Slot => {
+                let layer = slots_of(doc, c.comp).into_iter().find(|(_, slot)| slot == &p.prop).map(|(layer, _)| layer);
+                let kids = layer.and_then(|l| doc.node(l)).map(|n| ctx.kids(n)).unwrap_or_default();
+                for k in kids {
+                    arkui(&ctx, k, 2, &mut out, &[]);
+                }
+            }
+            _ => {}
+        }
+        out.push_str("    }\n");
+    }
+    out.push_str("\n    build() {\n");
+    arkui(&ctx, c.comp, 2, &mut out, &[]);
+    out.push_str("    }\n}\n");
+    out
+}
diff --git a/crates/engine/src/dev/dev_measurements.rs b/crates/engine/src/dev/dev_measurements.rs
new file mode 100644
index 00000000..c5df56ea
--- /dev/null
+++ b/crates/engine/src/dev/dev_measurements.rs
@@ -0,0 +1,222 @@
+//! Measurements kept on the canvas (Dev Mode): a developer places one between two layers, or
+//! across one side of a layer, and everyone who opens the file sees it. Each is stored on the layer
+//! it starts from (`Node::measurements`: saved, synced, undoable) and drawn from the layers'
+//! current bounds, so it follows them when they move or resize. One whose other layer was deleted
+//! or moved to another page is neither drawn nor listed (undoing the deletion brings it back).
+
+use figcraft_doc::{Document, Measurement, Node, NodeId, Side};
+use figcraft_geom::{Point, Rect};
+use serde_json::{Value, json};
+
+use crate::cmd::CommandSpec;
+use crate::distance::{between, measured};
+use crate::params::{get, opt_id, opt_index};
+use crate::snap::Guide;
+use crate::{EngineError, Result, Session, bad, spec};
+
+/// Most measurements starting from one layer.
+pub const MAX_PER_LAYER: usize = 64;
+/// Most measurements listed or drawn for one page.
+pub const MAX_LISTED: usize = 2_000;
+
+/// A measurement on a page: the layer it starts from, its index there, what it measures and the
+/// lines it draws (page space).
+#[derive(Clone, Debug, PartialEq)]
+pub struct Placed {
+    pub from: NodeId,
+    pub index: usize,
+    pub measurement: Measurement,
+    pub lines: Vec<Guide>,
+}
+
+impl Placed {
+    /// Whether it starts or ends at layer `id`.
+    pub fn touches(&self, id: NodeId) -> bool {
+        self.from == id || self.measurement.to == Some(id)
+    }
+
+    /// The distances it shows, as on its labels.
+    pub fn labels(&self) -> Vec<&str> {
+        self.lines.iter().filter_map(|g| g.label.as_deref()).collect()
+    }
+}
+
+/// The line along side `side` of box `b`, labelled with that side's length.
+fn side_line(b: Rect, side: Side) -> Vec<Guide> {
+    let (p, q) = match side {
+        Side::Top => (Point::new(b.x0, b.y0), Point::new(b.x1, b.y0)),
+        Side::Bottom => (Point::new(b.x0, b.y1), Point::new(b.x1, b.y1)),
+        Side::Left => (Point::new(b.x0, b.y0), Point::new(b.x0, b.y1)),
+        Side::Right => (Point::new(b.x1, b.y0), Point::new(b.x1, b.y1)),
+        Side::Auto => return Vec::new(),
+    };
+    let mut out = Vec::new();
+    measured(&mut out, p, q);
+    out
+}
+
+/// The lines measurement `m` from layer `from` draws, in page space (none when a layer is gone).
+pub fn lines(doc: &Document, from: NodeId, m: Measurement) -> Vec<Guide> {
+    let Some(a) = doc.world_bounds(from) else { return Vec::new() };
+    match (m.to, m.side) {
+        (Some(to), _) => doc.world_bounds(to).map(|b| between(a, b)).unwrap_or_default(),
+        (None, Some(side)) => side_line(a, side),
+        (None, None) => Vec::new(),
+    }
+}
+
+/// The measurements on `page` whose layers are both there, in layer order (bounded).
+pub fn on_page(doc: &Document, page: NodeId) -> Vec<Placed> {
+    let mut out = Vec::new();
+    let mut stack = vec![page];
+    let mut visited = 0usize;
+    while let Some(id) = stack.pop() {
+        visited += 1;
+        if out.len() >= MAX_LISTED || visited > 200_000 {
+            break;
+        }
+        let Some(n) = doc.node(id) else { continue };
+        for (index, m) in n.measurements.iter().enumerate() {
+            if m.to.is_some_and(|t| t == id || doc.page_of(t) != Some(page)) {
+                continue;
+            }
+            out.push(Placed { from: id, index, measurement: *m, lines: lines(doc, id, *m) });
+        }
+        stack.extend(n.children.iter().rev().copied());
+    }
+    out
+}
+
+fn placed_json(doc: &Document, p: &Placed) -> Value {
+    let name = |id: NodeId| doc.node(id).map(|n| n.name.clone()).unwrap_or_default();
+    let mut j = json!({"from": p.from, "fromName": name(p.from), "index": p.index, "labels": p.labels(), "lines": p.lines});
+    if let Some(t) = p.measurement.to {
+        j["to"] = json!(t);
+        j["toName"] = json!(name(t));
+    }
+    if let Some(s) = p.measurement.side {
+        j["side"] = json!(s);
+    }
+    j
+}
+
+/// The layer a command starts from: `from`, else the first selected layer; never a page.
+fn from_layer(cmd: &str, s: &Session, p: &Value) -> Result<NodeId> {
+    let id = match opt_id(cmd, p, "from")? {
+        Some(id) => id,
+        None => s.selection().first().copied().ok_or_else(|| bad(cmd, "select a layer or pass `from`"))?,
+    };
+    let n = s.doc()?.node(id).ok_or(EngineError::NoNode(id))?;
+    if n.is_page() {
+        return Err(bad(cmd, "measure from a layer, not a page"));
+    }
+    Ok(id)
+}
+
+/// The `side` parameter: top, right, bottom or left.
+fn side_param(cmd: &str, p: &Value) -> Result<Option<Side>> {
+    match get(p, "side") {
+        None | Some(Value::Null) => Ok(None),
+        Some(Value::String(v)) => Side::from_id(v).filter(|s| *s != Side::Auto).map(Some).ok_or_else(|| bad(cmd, "side: top, right, bottom or left")),
+        Some(_) => Err(bad(cmd, "side: top, right, bottom or left")),
+    }
+}
+
+fn add(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "devMode.addMeasurement";
+    let from = from_layer(cmd, s, p)?;
+    let (to, side) = (opt_id(cmd, p, "to")?, side_param(cmd, p)?);
+    let doc = s.doc()?;
+    let n = doc.node(from).ok_or(EngineError::NoNode(from))?;
+    let to = match (to, side) {
+        (Some(_), Some(_)) => return Err(bad(cmd, "pass `to` or `side`, not both")),
+        (Some(t), None) => Some(t),
+        (None, Some(_)) => None,
+        // Neither: to the layer around it.
+        (None, None) => Some(
+            n.parent
+                .filter(|q| doc.node(*q).is_some_and(|q| !q.is_page()))
+                .ok_or_else(|| bad(cmd, "pass `to` or `side` (the layer is at the top of its page)"))?,
+        ),
+    };
+    if let Some(t) = to {
+        let target = doc.node(t).ok_or(EngineError::NoNode(t))?;
+        if t == from {
+            return Err(bad(cmd, "measure to another layer, or across a `side` of this one"));
+        }
+        if target.is_page() || doc.page_of(t) != doc.page_of(from) {
+            return Err(bad(cmd, "measure to a layer on the same page"));
+        }
+    }
+    let m = Measurement { to, side };
+    // The same two layers measured from the other end are the same measurement.
+    let back = to.and_then(|t| doc.node(t)).is_some_and(|t| t.measurements.contains(&Measurement { to: Some(from), side: None }));
+    if n.measurements.contains(&m) || back {
+        return Err(bad(cmd, "that measurement is already there"));
+    }
+    if n.measurements.len() >= MAX_PER_LAYER {
+        return Err(bad(cmd, format!("a layer starts at most {MAX_PER_LAYER} measurements")));
+    }
+    let drawn = lines(doc, from, m);
+    let n = s.doc_mut()?.get_mut(from)?;
+    n.measurements.push(m);
+    Ok(json!({"from": from, "index": n.measurements.len() - 1, "lines": drawn}))
+}
+
+fn remove(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "devMode.removeMeasurement";
+    let from = from_layer(cmd, s, p)?;
+    let index = opt_index(cmd, p, "index")?;
+    let n = s.doc_mut()?.get_mut(from)?;
+    let count = n.measurements.len();
+    if count == 0 {
+        return Err(bad(cmd, "no measurement starts from this layer"));
+    }
+    let removed = match index {
+        Some(i) if i < count => {
+            n.measurements.remove(i);
+            1
+        }
+        Some(i) => return Err(bad(cmd, format!("no measurement {i} (the layer starts {count})"))),
+        None => std::mem::take(&mut n.measurements).len(),
+    };
+    Ok(json!({"removed": removed}))
+}
+
+fn list(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "devMode.measurements";
+    let doc = s.doc()?;
+    let page = match opt_id(cmd, p, "page")? {
+        Some(pg) if doc.node(pg).is_some_and(Node::is_page) => pg,
+        Some(_) => return Err(bad(cmd, "`page` must be a page id")),
+        None => s.page()?,
+    };
+    let only = opt_id(cmd, p, "id")?;
+    Ok(Value::Array(on_page(doc, page).iter().filter(|m| only.is_none_or(|id| m.touches(id))).map(|m| placed_json(doc, m)).collect()))
+}
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        spec!(
+            "devMode.addMeasurement",
+            "Add measurement",
+            "{from? (default the first selected layer), to? (a layer on the same page), side? (top|right|bottom|left)}  keeps a measurement on the canvas: between `from` and `to`, across one side of `from`, or (neither) to the layer around it; Dev Mode draws it and it follows the layers → {from, index, lines}",
+            true,
+            add
+        ),
+        spec!(
+            "devMode.removeMeasurement",
+            "Remove measurement",
+            "{from? (default the first selected layer), index? (omit: every measurement starting from the layer)}  → {removed}",
+            true,
+            remove
+        ),
+        spec!(
+            "devMode.measurements",
+            "List measurements",
+            "{page? (default the current page), id? (only those from or to this layer)}  → [{from, fromName, index, to?, toName?, side?, labels, lines: [{x0, y0, x1, y1, label, dashed}]}] (page space)",
+            false,
+            list
+        ),
+    ]
+}
diff --git a/crates/engine/src/dev_resources.rs b/crates/engine/src/dev/dev_resources.rs
similarity index 100%
rename from crates/engine/src/dev_resources.rs
rename to crates/engine/src/dev/dev_resources.rs
diff --git a/crates/engine/src/devcompare.rs b/crates/engine/src/dev/devcompare.rs
similarity index 92%
rename from crates/engine/src/devcompare.rs
rename to crates/engine/src/dev/devcompare.rs
index 58cf9aa8..ef40a2fb 100644
--- a/crates/engine/src/devcompare.rs
+++ b/crates/engine/src/dev/devcompare.rs
@@ -1,6 +1,7 @@
 //! Dev Mode "Compare changes": what changed in a ready-for-dev frame or section since it was
-//! marked. The document keeps a snapshot of the layer from just before its first change
-//! ([`figcraft_doc::handoff`]); this compares it with the layer as it is now, layer by layer
+//! marked, or in any frame or section since a saved version. The document keeps a snapshot of a
+//! ready-for-dev layer from just before its first change ([`figcraft_doc::handoff`]); this compares
+//! it (or the layer in the version) with the layer as it is now, layer by layer
 //! (matched by id): layers added and removed, and for the others their properties formatted the
 //! way Inspect shows them (`width 120 → 136`, `fill #FF0000 → #E03030`).
 
@@ -93,20 +94,25 @@ pub struct Comparison {
     pub truncated: bool,
 }
 
-/// The changes to layer `id` since it was marked ready for dev (empty when it hasn't changed).
-pub fn compare(doc: &Document, id: NodeId) -> Comparison {
-    let n = doc.node(id);
-    let mut out = Comparison {
+/// Nothing compared yet for layer `id` of `doc` (`snapshot` false: the before isn't known).
+pub fn empty(doc: &Document, id: NodeId) -> Comparison {
+    Comparison {
         id,
-        name: n.map(|n| n.name.clone()).unwrap_or_default(),
-        changed: n.is_some_and(|n| n.dev_status == DevStatus::ReadyForDev && n.dev_changed),
+        name: doc.node(id).map(|n| n.name.clone()).unwrap_or_default(),
+        changed: false,
         snapshot: false,
         changes: Vec::new(),
         added: 0,
         removed: 0,
         modified: 0,
         truncated: false,
-    };
+    }
+}
+
+/// The changes to layer `id` since it was marked ready for dev (empty when it hasn't changed).
+pub fn compare(doc: &Document, id: NodeId) -> Comparison {
+    let mut out = empty(doc, id);
+    out.changed = doc.node(id).is_some_and(|n| n.dev_status == DevStatus::ReadyForDev && n.dev_changed);
     if !out.changed {
         return out;
     }
@@ -117,6 +123,21 @@ pub fn compare(doc: &Document, id: NodeId) -> Comparison {
     out
 }
 
+/// The changes to layer `id` of `now` since `before` (a saved version of the same file: layers
+/// match by id). A layer the version doesn't have was added as a whole.
+pub fn compare_with(before: &Document, now: &Document, id: NodeId) -> Comparison {
+    let mut out = empty(now, id);
+    out.snapshot = true;
+    let mut w = Walk { before, now, now_ids: bounded_set(now, id), before_ids: bounded_set(before, id), out: &mut out };
+    if before.contains(id) {
+        w.layer(id, 0);
+    } else {
+        w.whole(now, id, 0, ChangeKind::Added);
+    }
+    out.changed = !out.changes.is_empty();
+    out
+}
+
 /// The before and after documents of layer `id` (the snapshot's copy and the document), for
 /// rendering the two side by side.
 pub fn before_doc(doc: &Document, id: NodeId) -> Option<Document> {
@@ -127,17 +148,7 @@ pub fn before_doc(doc: &Document, id: NodeId) -> Option<Document> {
 /// Every layer that changed between two versions of a whole document, page by page (pages added
 /// or removed as a whole), for reviewing a branch.
 pub fn compare_docs(before: &Document, now: &Document) -> Comparison {
-    let mut out = Comparison {
-        id: NodeId(0),
-        name: now.name.clone(),
-        changed: false,
-        snapshot: true,
-        changes: Vec::new(),
-        added: 0,
-        removed: 0,
-        modified: 0,
-        truncated: false,
-    };
+    let mut out = Comparison { name: now.name.clone(), snapshot: true, ..empty(now, NodeId(0)) };
     let mut w = Walk { before, now, now_ids: now.ids().collect(), before_ids: before.ids().collect(), out: &mut out };
     for p in &now.pages {
         if before.contains(*p) {
diff --git a/crates/engine/src/devinspect.rs b/crates/engine/src/dev/devinspect.rs
similarity index 92%
rename from crates/engine/src/devinspect.rs
rename to crates/engine/src/dev/devinspect.rs
index fe400989..78aa5553 100644
--- a/crates/engine/src/devinspect.rs
+++ b/crates/engine/src/dev/devinspect.rs
@@ -214,6 +214,23 @@ pub struct DevItem {
     pub name: String,
     pub page: NodeId,
     pub status: DevStatus,
+    /// Ready for dev and changed since it was marked.
+    pub changed: bool,
+}
+
+/// Whether Dev Mode runs command `id` from the menus and shortcuts: commands that don't edit the
+/// document, and Dev Mode's own edits (annotations, statuses, dev resources, measurements, code
+/// connections, comments). Choosing a tool other than moving around and commenting is refused too,
+/// and so is Revert to saved, which isn't an undo step but throws the design's unsaved edits away.
+pub fn dev_mode_allows(id: &str) -> bool {
+    const OWN: [&str; 6] = ["annotation.", "dev.", "devMode.", "devResource.", "codeConnect.", "comment."];
+    // Edits recorded as one grouped undo step, so their spec says no history of its own.
+    const GROUPED: [&str; 1] = ["data.fill"];
+    match id.strip_prefix("tool.") {
+        Some(t) => matches!(t, "move" | "hand" | "comment"),
+        None if id == "file.revert" || GROUPED.contains(&id) => false,
+        None => OWN.iter().any(|p| id.starts_with(p)) || crate::cmd::find_command(id).is_none_or(|c| !c.history),
+    }
 }
 
 /// Most items listed.
@@ -244,7 +261,8 @@ pub fn dev_items(doc: &Document, status: Option<DevStatus>, page: Option<NodeId>
             }
             let Some(n) = doc.node(id) else { continue };
             if !n.dev_status.is_none() && status.is_none_or(|s| s == n.dev_status) && has_status(doc, id) {
-                out.push(DevItem { id, name: n.name.clone(), page: pg, status: n.dev_status });
+                let changed = n.dev_status == DevStatus::ReadyForDev && n.dev_changed;
+                out.push(DevItem { id, name: n.name.clone(), page: pg, status: n.dev_status, changed });
             }
             stack.extend(n.children.iter().rev().copied());
         }
@@ -257,18 +275,21 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "inspect.readyForDev",
             "Ready for dev",
-            "{status?: readyForDev|completed|any (default readyForDev), page? (page id; default every page)} → {items: [{id, name, page, status}]}  frames and sections by handoff status (set it with `node.set {devStatus}`)",
+            "{status?: readyForDev|changed|completed|any (default readyForDev; changed: ready for dev and changed since marked), page? (page id; default every page)} → {items: [{id, name, page, status, changed}]}  frames and sections by handoff status (set it with `node.set {devStatus}`)",
             false,
             |s, p| {
                 let cmd = "inspect.readyForDev";
-                let status = match string(p, "status").as_deref() {
+                let wanted = string(p, "status");
+                let changed_only = wanted.as_deref().is_some_and(|v| v.eq_ignore_ascii_case("changed"));
+                let status = match wanted.as_deref() {
                     None => Some(DevStatus::ReadyForDev),
+                    _ if changed_only => Some(DevStatus::ReadyForDev),
                     Some(v) if v.eq_ignore_ascii_case("any") || v.eq_ignore_ascii_case("all") => None,
                     Some(v) => Some(
                         DevStatus::ALL
                             .into_iter()
                             .find(|d| !d.is_none() && d.id().eq_ignore_ascii_case(v))
-                            .ok_or_else(|| crate::bad(cmd, "status: readyForDev|completed|any"))?,
+                            .ok_or_else(|| crate::bad(cmd, "status: readyForDev|changed|completed|any"))?,
                     ),
                 };
                 let doc = s.doc()?;
@@ -276,7 +297,9 @@ pub fn specs() -> Vec<CommandSpec> {
                     Some(v) => Some(id_of(v).filter(|pg| doc.pages.contains(pg)).ok_or_else(|| crate::bad(cmd, "page: a page id"))?),
                     None => None,
                 };
-                Ok(json!({"items": serde_json::to_value(dev_items(doc, status, page)).unwrap_or(Value::Null)}))
+                let mut items = dev_items(doc, status, page);
+                items.retain(|i| i.changed || !changed_only);
+                Ok(json!({"items": serde_json::to_value(items).unwrap_or(Value::Null)}))
             }
         ),
         spec!(
diff --git a/crates/engine/src/dev/tailwind.rs b/crates/engine/src/dev/tailwind.rs
new file mode 100644
index 00000000..70a562a9
--- /dev/null
+++ b/crates/engine/src/dev/tailwind.rs
@@ -0,0 +1,519 @@
+//! React + Tailwind CSS v4 for a layer tree, ready to drop into a web project: every layer's look
+//! as utility classes instead of a stylesheet, bound variables as theme utilities (`bg-accent`,
+//! `rounded-card`) that `variable.export {format: "tailwind"}` declares in an `@theme` block, auto
+//! layout frames and text that grow with the page (`w-full max-w-[…]`) instead of fixed pixel
+//! boxes, and instances inlined with their overrides. Given a mobile frame too, the code is mobile
+//! first: the mobile frame's classes, and the desktop frame's where they differ behind `lg:`.
+
+use std::collections::{BTreeMap, HashMap};
+
+use figcraft_doc::{Document, NodeId, NodeKind, Variable, VariableId, VariableType};
+
+use crate::codegen::{CodeLang, Ctx, Markup, css_var_name, css_var_of, num};
+use crate::component_codegen::component_type_name;
+use crate::token_roles::{NumberRole, Roles};
+
+/// The breakpoint desktop classes sit behind in responsive code.
+// ponytail: one breakpoint (lg = 1024px); a tablet frame would need a second pass and `md:`.
+const BREAKPOINT: &str = "lg";
+
+/// The roles and Tailwind theme names of a file's variables, computed once per export so code
+/// and the `@theme` block always agree.
+#[derive(Default)]
+pub struct Theme {
+    roles: Roles,
+    names: HashMap<VariableId, String>,
+}
+
+impl Theme {
+    pub fn new(doc: &Document) -> Self {
+        let vars = &doc.variables.variables;
+        let roles = Roles::new(doc);
+        let mut t = Theme { roles, names: HashMap::new() };
+        // Short names ("accent") where they are unique, the full path ("palette-accent") where two
+        // variables would share one, and a numeric suffix as a last resort.
+        let short: Vec<String> = vars.iter().map(|v| t.candidate(v, false)).collect();
+        // Linear in the number of variables: counts for clashes, a set of names taken and the next
+        // suffix per base, so a file with very many variables can't make this quadratic.
+        let mut count: HashMap<&str, usize> = HashMap::new();
+        for n in &short {
+            *count.entry(n.as_str()).or_default() += 1;
+        }
+        let mut taken: std::collections::HashSet<String> = std::collections::HashSet::new();
+        let mut next: HashMap<String, usize> = HashMap::new();
+        for (v, s) in vars.iter().zip(&short) {
+            let base = if count.get(s.as_str()).copied().unwrap_or(0) > 1 { t.candidate(v, true) } else { s.clone() };
+            let mut name = base.clone();
+            if taken.contains(&name) {
+                let k = next.entry(base.clone()).or_insert(1);
+                loop {
+                    *k += 1;
+                    name = format!("{base}-{k}");
+                    if !taken.contains(&name) {
+                        break;
+                    }
+                }
+            }
+            taken.insert(name.clone());
+            t.names.insert(v.id.clone(), name);
+        }
+        t
+    }
+
+    /// What a number variable measures; a number nothing tells about is a length.
+    pub fn role(&self, v: &Variable) -> NumberRole {
+        self.roles.role(v)
+    }
+
+    /// The theme variable for `v`, unique in the file (see [`Theme::new`]).
+    pub fn name(&self, v: &Variable) -> String {
+        self.names.get(&v.id).cloned().unwrap_or_else(|| self.candidate(v, false))
+    }
+
+    /// `--color-*` for colours, `--radius-*`, `--text-*`, `--spacing-*` for numbers by role,
+    /// `--font-*` for font families, others their CSS name; from the last path segment, or the
+    /// whole path (`full`). A name already in the namespace isn't prefixed twice.
+    fn candidate(&self, v: &Variable, full: bool) -> String {
+        let ns = match v.kind {
+            VariableType::Color => Some("color"),
+            VariableType::Number => match self.role(v) {
+                NumberRole::Radius => Some("radius"),
+                NumberRole::FontSize => Some("text"),
+                NumberRole::Spacing => Some("spacing"),
+                NumberRole::Length | NumberRole::Unitless => None,
+            },
+            VariableType::String if v.scopes.as_ref().is_some_and(|s| s.iter().any(|s| s == "FONT_FAMILY")) => Some("font"),
+            _ => None,
+        };
+        let Some(ns) = ns else {
+            return if full { css_var_name(&v.name) } else { css_var_of(v) };
+        };
+        let source = if full { v.name.as_str() } else { v.name.rsplit('/').next().unwrap_or(&v.name) };
+        let slug = css_var_name(source);
+        let slug = slug.trim_start_matches('-');
+        let slug = [format!("{ns}s-"), format!("{ns}-")].iter().find_map(|p| slug.strip_prefix(p.as_str())).unwrap_or(slug);
+        // A variable named after its namespace ("radius", "colors") is the namespace's base value.
+        let slug = if slug == ns || slug == format!("{ns}s") { "base" } else { slug };
+        format!("--{ns}-{slug}")
+    }
+}
+
+// ------------------------------------------------------------------ declarations → classes
+
+/// An arbitrary value: spaces become underscores (Tailwind's escape), underscores are escaped.
+fn arb(v: &str) -> String {
+    format!("[{}]", v.trim().replace('_', "\\_").replace(' ', "_"))
+}
+
+/// The custom property a `var(--name, fallback)` value reads, when that one call is the whole
+/// value (not `var(--a, 4px) 8px`, four corners of which only the first is a variable).
+fn var_name(v: &str) -> Option<&str> {
+    let inner = v.trim().strip_prefix("var(")?;
+    let mut depth = 1usize;
+    let close = inner.char_indices().find_map(|(i, c)| {
+        match c {
+            '(' => depth += 1,
+            ')' => depth -= 1,
+            _ => {}
+        }
+        (depth == 0).then_some(i)
+    })?;
+    if close + 1 != inner.len() {
+        return None;
+    }
+    Some(inner.split([',', ')']).next()?.trim())
+}
+
+/// `util` with `value`: a theme utility when the value reads a variable of the namespace
+/// (`bg-accent`), else the variable in parentheses (`bg-(--x)`, with a type hint for `text-`
+/// sizes), else an arbitrary value.
+fn util(util: &str, ns: &str, value: &str, hint: &str) -> String {
+    match var_name(value) {
+        Some(name) => match name.strip_prefix(&format!("--{ns}-")) {
+            Some(key) if !ns.is_empty() => format!("{util}-{key}"),
+            _ => format!("{util}-({hint}{name})"),
+        },
+        None => format!("{util}-{}", arb(value)),
+    }
+}
+
+/// A length on the spacing scale (4px steps) when it fits one, else arbitrary.
+fn spacing(prefix: &str, value: &str) -> String {
+    if var_name(value).is_some() {
+        return util(prefix, "spacing", value, "");
+    }
+    match value.strip_suffix("px").and_then(|n| n.parse::<f64>().ok()) {
+        Some(0.0) => format!("{prefix}-0"),
+        Some(px) if px > 0.0 && px <= 384.0 && (px / 4.0).fract() == 0.0 => format!("{prefix}-{}", num(px / 4.0)),
+        Some(px) if px < 0.0 && (px / 4.0).fract() == 0.0 => format!("-{prefix}-{}", num(-px / 4.0)),
+        _ => format!("{prefix}-{}", arb(value)),
+    }
+}
+
+/// The values of a `padding` shorthand (top right bottom left), as utilities.
+fn padding(value: &str) -> Vec<(String, String)> {
+    let mut parts = Vec::new();
+    let mut depth = 0usize;
+    let mut cur = String::new();
+    for c in value.chars() {
+        match c {
+            '(' => depth += 1,
+            ')' => depth = depth.saturating_sub(1),
+            ' ' if depth == 0 => {
+                parts.push(std::mem::take(&mut cur));
+                continue;
+            }
+            _ => {}
+        }
+        cur.push(c);
+    }
+    parts.push(cur);
+    let [t, r, b, l] = match parts.as_slice() {
+        [a] => [a, a, a, a],
+        [t, r, b, l] => [t, r, b, l],
+        _ => return vec![("padding".into(), format!("p-{}", arb(value)))],
+    };
+    let zero = |v: &str| v == "0px" || v == "0";
+    let mut out = Vec::new();
+    if t == r && r == b && b == l {
+        if !zero(t) {
+            out.push(("padding".into(), spacing("p", t)));
+        }
+    } else if t == b && l == r {
+        for (k, p, v) in [("padding-y", "py", t), ("padding-x", "px", l)] {
+            if !zero(v) {
+                out.push((k.into(), spacing(p, v)));
+            }
+        }
+    } else {
+        for (k, p, v) in [("padding-top", "pt", t), ("padding-right", "pr", r), ("padding-bottom", "pb", b), ("padding-left", "pl", l)] {
+            if !zero(v) {
+                out.push((k.into(), spacing(p, v)));
+            }
+        }
+    }
+    out
+}
+
+fn font_weight(v: &str) -> String {
+    let named = match v.trim() {
+        "100" => "thin",
+        "200" => "extralight",
+        "300" => "light",
+        "400" => "normal",
+        "500" => "medium",
+        "600" => "semibold",
+        "700" => "bold",
+        "800" => "extrabold",
+        "900" => "black",
+        _ => return format!("font-{}", arb(v)),
+    };
+    format!("font-{named}")
+}
+
+/// A border shorthand (`1px solid c`) on `side` ("" or "t", "r", "b", "l") as width + colour.
+fn border(side: &str, value: &str) -> Vec<(String, String)> {
+    // `<width> solid <colour>`, where the width may be `var(--w, 2px)`: split at the style.
+    let (width, color) = value.split_once(" solid ").unwrap_or((value, ""));
+    let (width, color) = (width.trim(), color.trim());
+    let b = if side.is_empty() { "border".to_string() } else { format!("border-{side}") };
+    let key = format!("border{}", if side.is_empty() { String::new() } else { format!("-{side}") });
+    let w = match width {
+        "1px" => b.clone(),
+        "0px" => format!("{b}-0"),
+        w => match var_name(w) {
+            // `border-(--w)` would read as a colour; the hint makes it a width.
+            Some(name) => format!("{b}-(length:{name})"),
+            None => format!("{b}-{}", arb(w)),
+        },
+    };
+    let mut out = vec![(format!("{key}-width"), w)];
+    if !color.is_empty() {
+        out.push(("border-color".into(), util("border", "color", color, "")));
+    }
+    out
+}
+
+/// One CSS declaration as utilities, keyed by the property they set (so responsive code can tell
+/// which mobile class a desktop class replaces).
+fn decl(key: &str, value: &str) -> Vec<(String, String)> {
+    let one = |c: String| vec![(key.to_string(), c)];
+    let kw = |c: &str| vec![(key.to_string(), c.to_string())];
+    match (key, value) {
+        ("display", "flex") => kw("flex"),
+        ("display", "block") => kw("block"),
+        ("flex-direction", "column") => kw("flex-col"),
+        ("flex-direction", _) => kw("flex-row"),
+        ("flex-wrap", "wrap") => kw("flex-wrap"),
+        // Defaults flexbox already has.
+        ("justify-content", "flex-start") | ("gap", "0px") => Vec::new(),
+        ("justify-content", v) => one(format!("justify-{}", v.trim_start_matches("flex-").trim_start_matches("space-"))),
+        ("align-items", v) => one(format!("items-{}", v.trim_start_matches("flex-"))),
+        ("align-content", v) => one(format!("content-{}", v.trim_start_matches("flex-").trim_start_matches("space-"))),
+        ("align-self", "stretch") => kw("self-stretch"),
+        ("flex", "1 1 0") => kw("flex-1"),
+        ("position", v) => one(v.to_string()),
+        ("left" | "top" | "right" | "bottom", v) => one(spacing(key, v)),
+        ("width", "100%") => kw("w-full"),
+        ("width", v) => one(spacing("w", v)),
+        ("height", v) => one(spacing("h", v)),
+        ("max-width", v) => one(format!("max-w-{}", arb(v))),
+        ("min-height", v) => one(format!("min-h-{}", arb(v))),
+        ("margin-inline", "auto") => kw("mx-auto"),
+        ("gap", v) => one(spacing("gap", v)),
+        ("padding", v) => padding(v),
+        ("border-radius", "50%") => kw("rounded-full"),
+        ("border-radius", v) if v.strip_suffix("px").and_then(|n| n.parse::<f64>().ok()).is_some_and(|r| r >= 999.0) => kw("rounded-full"),
+        ("border-radius", v) if v.contains(' ') && var_name(v).is_none() => one(format!("rounded-{}", arb(v))),
+        ("border-radius", v) => one(util("rounded", "radius", v, "")),
+        ("opacity", v) => match v.parse::<f64>() {
+            Ok(o) if ((o * 100.0).round() - o * 100.0).abs() < 1e-9 => one(format!("opacity-{}", num(o * 100.0))),
+            _ => one(util("opacity", "", v, "")),
+        },
+        ("background", v) if v.contains("gradient(") => one(format!("bg-{}", arb(v))),
+        // An image shorthand (`url(…) center / cover`) is a whole `background`, not a bg colour.
+        ("background", v) if v.starts_with("url(") => one(format!("[background:{}]", arb(v).trim_matches(['[', ']']))),
+        ("background", v) => one(util("bg", "color", v, "color:")),
+        ("color", v) => one(util("text", "color", v, "color:")),
+        ("border", v) => border("", v),
+        ("border-top", v) => border("t", v),
+        ("border-right", v) => border("r", v),
+        ("border-bottom", v) => border("b", v),
+        ("border-left", v) => border("l", v),
+        ("box-shadow", v) => one(format!("shadow-{}", arb(v))),
+        ("filter", v) => one(match v.strip_prefix("blur(").and_then(|r| r.strip_suffix(')')) {
+            Some(r) => format!("blur-{}", arb(r)),
+            None => format!("[filter:{}]", arb(v).trim_matches(['[', ']'])),
+        }),
+        ("backdrop-filter", v) => one(match v.strip_prefix("blur(").and_then(|r| r.strip_suffix(')')) {
+            Some(r) => format!("backdrop-blur-{}", arb(r)),
+            None => format!("[backdrop-filter:{}]", arb(v).trim_matches(['[', ']'])),
+        }),
+        ("mix-blend-mode", v) => one(format!("mix-blend-{v}")),
+        ("transform", v) => match v.strip_prefix("rotate(").and_then(|r| r.strip_suffix(')')) {
+            Some(r) => one(format!("rotate-{}", arb(r))),
+            None => one(format!("[transform:{}]", arb(v).trim_matches(['[', ']']))),
+        },
+        ("transform-origin", "top left" | "0 0") => kw("origin-top-left"),
+        // `font-(--x)` would read as a weight; the hint makes an un-namespaced variable a family.
+        ("font-family", v) if var_name(v).is_some() => one(util("font", "font", v, "family-name:")),
+        ("font-family", v) => one(format!("font-{}", arb(&format!("'{}'", v.trim_matches('"'))))),
+        ("font-size", v) => one(util("text", "text", v, "length:")),
+        ("font-weight", v) => one(font_weight(v)),
+        ("font-style", "italic") => kw("italic"),
+        ("line-height", v) => match v.strip_suffix('%').and_then(|p| p.parse::<f64>().ok()) {
+            Some(p) => one(format!("leading-{}", arb(&num(p / 100.0)))),
+            None => one(util("leading", "", v, "")),
+        },
+        ("letter-spacing", v) => one(util("tracking", "", v, "")),
+        ("text-align", v) => one(format!("text-{v}")),
+        ("text-transform", "uppercase") => kw("uppercase"),
+        ("text-transform", "lowercase") => kw("lowercase"),
+        ("text-transform", "capitalize") => kw("capitalize"),
+        ("text-decoration", "underline") => kw("underline"),
+        ("text-decoration", "line-through") => kw("line-through"),
+        _ => one(format!("[{key}:{}]", arb(value).trim_matches(['[', ']']))),
+    }
+}
+
+/// A rule's declarations (`key: value;` lines) as (property, utility) pairs in order.
+pub fn classes(decls: &str) -> Vec<(String, String)> {
+    decls
+        .lines()
+        .filter_map(|l| {
+            let (k, v) = l.trim().trim_end_matches(';').split_once(':')?;
+            Some(decl(k.trim(), v.trim()))
+        })
+        .flatten()
+        .collect()
+}
+
+/// The utility that undoes a mobile class at the breakpoint when desktop sets nothing for it.
+fn reset(key: &str) -> Option<String> {
+    // Border widths by side: `border-t-width` → `border-t-0`.
+    if let Some(side) = key.strip_prefix("border").and_then(|k| k.strip_suffix("-width")) {
+        return Some(format!("border{side}-0"));
+    }
+    Some(String::from(match key {
+        "display" => "block",
+        "flex-direction" => "flex-row",
+        "flex-wrap" => "flex-nowrap",
+        "flex" => "flex-initial",
+        "align-self" => "self-auto",
+        "width" => "w-auto",
+        "height" => "h-auto",
+        "max-width" => "max-w-none",
+        "min-height" => "min-h-0",
+        "text-align" => "text-left",
+        "justify-content" => "justify-start",
+        "gap" => "gap-0",
+        "position" => "static",
+        "text-transform" => "normal-case",
+        "opacity" => "opacity-100",
+        "border-radius" => "rounded-none",
+        "box-shadow" => "shadow-none",
+        "font-style" => "not-italic",
+        // The whole background: a mobile image or gradient would survive a colour-only reset.
+        "background" => "bg-none bg-transparent",
+        "border-color" => "border-current",
+        "letter-spacing" => "tracking-normal",
+        "line-height" => "leading-normal",
+        "text-decoration" => "no-underline",
+        "align-items" => "items-stretch",
+        "filter" => "filter-none",
+        "backdrop-filter" => "backdrop-filter-none",
+        "transform" => "rotate-0",
+        "left" | "top" | "right" | "bottom" => return Some(format!("{key}-auto")),
+        "mix-blend-mode" => "mix-blend-normal",
+        _ => return None,
+    }))
+}
+
+/// The sides (top, right, bottom, left) a padding utility's property sets.
+fn padding_sides(key: &str) -> [bool; 4] {
+    match key {
+        "padding" => [true; 4],
+        "padding-x" => [false, true, false, true],
+        "padding-y" => [true, false, true, false],
+        "padding-top" => [true, false, false, false],
+        "padding-right" => [false, true, false, false],
+        "padding-bottom" => [false, false, true, false],
+        "padding-left" => [false, false, false, true],
+        _ => [false; 4],
+    }
+}
+
+/// Utilities zeroing `sides` (as few as cover them: `py-0`, `px-0`, else per side).
+fn zero_padding(sides: [bool; 4]) -> Vec<&'static str> {
+    let [t, r, b, l] = sides;
+    let mut out = Vec::new();
+    match (t, b) {
+        (true, true) => out.push("py-0"),
+        (true, false) => out.push("pt-0"),
+        (false, true) => out.push("pb-0"),
+        _ => {}
+    }
+    match (r, l) {
+        (true, true) => out.push("px-0"),
+        (true, false) => out.push("pr-0"),
+        (false, true) => out.push("pl-0"),
+        _ => {}
+    }
+    out
+}
+
+/// Mobile classes plus, behind the breakpoint, the desktop ones that differ (and resets for what
+/// desktop leaves unset). A layer missing on mobile is hidden there.
+pub(crate) fn merge(mobile: Option<&[(String, String)]>, desktop: &[(String, String)]) -> Vec<String> {
+    let hidden = [("display".to_string(), "hidden".to_string())];
+    // A mobile frame's widths are the phone's, not caps: below the breakpoint boxes fill the page.
+    let fluid: Vec<(String, String)>;
+    let mobile = match mobile {
+        Some(m) => {
+            fluid = m.iter().filter(|(k, _)| k != "max-width").cloned().collect();
+            fluid.as_slice()
+        }
+        None => &hidden,
+    };
+    let mut out: Vec<String> = mobile.iter().map(|(_, c)| c.clone()).collect();
+    let bp = |c: &str| format!("{BREAKPOINT}:{c}");
+    for (_, c) in desktop {
+        if !mobile.iter().any(|(_, m)| m == c) {
+            out.push(bp(c));
+        }
+    }
+    for (k, _) in mobile.iter().filter(|(k, _)| !k.starts_with("padding")) {
+        if !desktop.iter().any(|(d, _)| d == k)
+            && let Some(r) = reset(k)
+        {
+            out.extend(r.split_whitespace().map(bp));
+        }
+    }
+    // Padding utilities overlap (p, px/py, pt…): compare side by side, and zero on desktop the
+    // sides mobile pads and desktop doesn't.
+    let cover = |list: &[(String, String)]| {
+        list.iter().fold([false; 4], |mut acc, (k, _)| {
+            for (a, s) in acc.iter_mut().zip(padding_sides(k)) {
+                *a |= s;
+            }
+            acc
+        })
+    };
+    let (m, d) = (cover(mobile), cover(desktop));
+    let missing = [m[0] && !d[0], m[1] && !d[1], m[2] && !d[2], m[3] && !d[3]];
+    out.extend(zero_padding(missing).into_iter().map(bp));
+    out.dedup();
+    out
+}
+
+/// The markup walk for `id` in Tailwind mode: (markup, rules by path).
+fn walk(doc: &Document, id: NodeId) -> (String, Vec<(String, String, String)>) {
+    let ctx = Ctx::new(doc, id);
+    let mut m = Markup::new(&ctx, CodeLang::React);
+    m.inline = true;
+    m.fluid = true;
+    m.fluid_leaves = 0.5;
+    m.tokens.tailwind = true;
+    m.node(id, None, 2, "");
+    (m.markup, m.rules)
+}
+
+/// React + Tailwind for `id` (with `mobile`, mobile first with desktop classes behind `lg:`).
+pub fn code(doc: &Document, id: NodeId, mobile: Option<NodeId>) -> String {
+    let Some(n) = doc.node(id) else { return String::new() };
+    let (mut markup, rules) = walk(doc, id);
+    let small: Option<BTreeMap<String, Vec<(String, String)>>> =
+        mobile.filter(|m| doc.contains(*m) && *m != id).map(|m| walk(doc, m).1.into_iter().map(|(p, _, d)| (p, classes(&d))).collect());
+    // ponytail: layers only on mobile are listed, not merged in; their place in the tree is ambiguous.
+    let only_mobile: Vec<String> = small
+        .iter()
+        .flat_map(BTreeMap::keys)
+        .filter(|p| !rules.iter().any(|(d, _, _)| d == *p))
+        .map(|p| p.trim_start_matches('/').split('/').map(|seg| seg.rsplit_once('#').map_or(seg, |(n, _)| n)).collect::<Vec<_>>().join(" › "))
+        .take(20)
+        .collect();
+    // Longest class names first, so "card" never rewrites inside "card-2"'s attribute.
+    let mut rules = rules;
+    rules.sort_by_key(|(_, c, _)| std::cmp::Reverse(c.len()));
+    let paths: Vec<String> = rules.iter().map(|(p, _, _)| p.clone()).collect();
+    for (path, class, decls) in &rules {
+        let own = classes(decls);
+        // Layer names may contain "/": the parent is the longest other path this one extends.
+        let parent =
+            paths.iter().filter(|p| p.len() < path.len() && path.starts_with(&format!("{p}/"))).max_by_key(|p| p.len()).map_or("", String::as_str);
+        let list = match &small {
+            // Inside a layer hidden on mobile: desktop's classes as they are.
+            Some(m) if !path.is_empty() && !m.contains_key(parent) => own.into_iter().map(|(_, c)| c).collect(),
+            Some(m) => merge(m.get(path).map(Vec::as_slice), &own),
+            None => own.into_iter().map(|(_, c)| c).collect(),
+        };
+        markup = markup.replace(&format!("className=\"{class}\""), &format!("className=\"{}\"", list.join(" ")));
+    }
+    // Imports of the instances written as their connected code component, once each.
+    let mut imports: Vec<String> = Vec::new();
+    for i in doc.subtree(id).into_iter().take(20_000) {
+        if i != id
+            && doc.node(i).is_some_and(|k| matches!(k.kind, NodeKind::Instance { .. }))
+            && let Some(l) = crate::code_connect::link(doc, i, CodeLang::React)
+        {
+            let line = crate::code_connect::import_line(l, CodeLang::React);
+            if !line.is_empty() && !imports.contains(&line) {
+                imports.push(line);
+            }
+        }
+    }
+    let imports = if imports.is_empty() { String::new() } else { format!("{}\n\n", imports.join("\n")) };
+    let name = component_type_name(&n.name);
+    let mut mode = if small.is_some() { format!(", mobile first; desktop from {BREAKPOINT}") } else { String::new() };
+    if !only_mobile.is_empty() {
+        mode.push_str(&format!(". Only in the mobile frame, add by hand with {BREAKPOINT}:hidden: {}", only_mobile.join(", ")));
+    }
+    let header = comment_safe(&format!("{} as React + Tailwind CSS v4{mode}. Theme: variable.export {{format: \"tailwind\"}}.", n.name));
+    format!("// {header}\n{imports}export function {name}() {{\n  return (\n{markup}  );\n}}\n")
+}
+
+/// `text` for one `//` comment line: every JS line terminator (control characters, U+2028,
+/// U+2029) becomes a space, so layer names in it can't end the comment and inject code.
+fn comment_safe(text: &str) -> String {
+    text.chars().take(2_000).map(|c| if c.is_control() || matches!(c, '\u{2028}' | '\u{2029}') { ' ' } else { c }).collect()
+}
diff --git a/crates/engine/src/dev_measurements_tests.rs b/crates/engine/src/dev_measurements_tests.rs
new file mode 100644
index 00000000..695b8a7e
--- /dev/null
+++ b/crates/engine/src/dev_measurements_tests.rs
@@ -0,0 +1,204 @@
+//! Measurements kept on the canvas: placed between two layers, across a side or to the layer
+//! around one, following the layers, removed, undoable, copied with what they measure, refused on
+//! bad input, synced, saved (old files without them still open) and allowed in Dev Mode.
+
+use figcraft_collab::{Change, Prop, Replica};
+use figcraft_doc::NodeId;
+use serde_json::{Value, json};
+
+use crate::Session;
+use crate::params::id_of;
+
+fn ok(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd} {p}: {e}"))
+}
+
+fn rect(s: &mut Session, x: f64, w: f64, parent: Option<NodeId>) -> NodeId {
+    let mut p = json!({"x": x, "y": 20, "width": w, "height": 40});
+    if let Some(parent) = parent {
+        p["parent"] = json!(parent);
+    }
+    id_of(&ok(s, "shape.rectangle", p)["id"]).unwrap()
+}
+
+/// A frame with two rectangles 30 apart: (frame, a, b).
+fn setup() -> (Session, NodeId, NodeId, NodeId) {
+    let mut s = Session::new();
+    let f = id_of(&ok(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 100}))["id"]).unwrap();
+    let a = rect(&mut s, 20.0, 50.0, Some(f));
+    let b = rect(&mut s, 100.0, 60.0, Some(f));
+    (s, f, a, b)
+}
+
+fn labels(s: &mut Session, id: Option<NodeId>) -> Vec<Vec<String>> {
+    let p = id.map_or(json!({}), |i| json!({"id": i}));
+    ok(s, "devMode.measurements", p)
+        .as_array()
+        .unwrap()
+        .iter()
+        .map(|m| m["labels"].as_array().unwrap().iter().map(|l| l.as_str().unwrap().to_string()).collect())
+        .collect()
+}
+
+#[test]
+fn measurements_are_placed_follow_their_layers_and_are_removed() {
+    let (mut s, f, a, b) = setup();
+    let m = ok(&mut s, "devMode.addMeasurement", json!({"from": a, "to": b}));
+    assert_eq!((&m["from"], &m["index"]), (&json!(a), &json!(0)));
+    assert_eq!(m["lines"][0]["label"], "30", "the gap between them");
+    // Across a side: the side's length; with neither, to the frame around it.
+    ok(&mut s, "devMode.addMeasurement", json!({"from": b, "side": "top"}));
+    ok(&mut s, "select.set", json!({"ids": [a]}));
+    ok(&mut s, "devMode.addMeasurement", json!({}));
+    assert_eq!(labels(&mut s, None), [vec!["30"], vec!["20", "230", "20", "40"], vec!["60"]]);
+    let listed = ok(&mut s, "devMode.measurements", json!({"id": b}));
+    assert_eq!(listed.as_array().unwrap().len(), 2, "from or to the layer");
+    assert_eq!((&listed[1]["side"], &listed[1]["to"]), (&json!("top"), &Value::Null));
+    assert_eq!(listed[0]["toName"], s.doc().unwrap().node(b).unwrap().name.as_str());
+    // They follow the layers.
+    ok(&mut s, "node.set", json!({"id": b, "props": {"x": 110, "width": 80}}));
+    assert_eq!(labels(&mut s, Some(b)), [vec!["40"], vec!["80"]]);
+    // Undo takes back an edit, and a placement.
+    ok(&mut s, "edit.undo", json!({}));
+    assert_eq!(labels(&mut s, Some(b)), [vec!["30"], vec!["60"]]);
+    ok(&mut s, "edit.undo", json!({}));
+    assert_eq!(labels(&mut s, None).len(), 2);
+    ok(&mut s, "edit.redo", json!({}));
+    // A deleted layer takes its measurements off the canvas; undo brings them back.
+    ok(&mut s, "edit.delete", json!({"ids": [b]}));
+    assert_eq!(labels(&mut s, None), [vec!["20", "230", "20", "40"]]);
+    ok(&mut s, "edit.undo", json!({}));
+    assert_eq!(labels(&mut s, None).len(), 3);
+    // Removed one by one, or all of a layer's.
+    assert_eq!(ok(&mut s, "devMode.removeMeasurement", json!({"from": a, "index": 1}))["removed"], 1);
+    assert_eq!(labels(&mut s, None), [vec!["30"], vec!["60"]]);
+    ok(&mut s, "devMode.addMeasurement", json!({"from": a, "side": "left"}));
+    assert_eq!(ok(&mut s, "devMode.removeMeasurement", json!({"from": a}))["removed"], 2);
+    assert!(s.execute("devMode.removeMeasurement", &json!({"from": a})).is_err(), "nothing left");
+    assert_eq!(labels(&mut s, None), [vec!["60"]]);
+    let _ = f;
+}
+
+#[test]
+fn bad_measurements_are_refused() {
+    let (mut s, f, a, b) = setup();
+    let page = s.page().unwrap();
+    let other = id_of(&ok(&mut s, "page.add", json!({}))["id"]).unwrap();
+    let far = rect(&mut s, 0.0, 10.0, Some(other));
+    ok(&mut s, "page.select", json!({"id": page}));
+    let top = rect(&mut s, 400.0, 10.0, None);
+    ok(&mut s, "select.none", json!({}));
+    for p in [
+        json!({"from": a, "to": a}),
+        json!({"from": a, "to": page}),
+        json!({"from": a, "to": far}),
+        json!({"from": a, "to": 99_999}),
+        json!({"from": page, "side": "top"}),
+        json!({"from": a, "to": b, "side": "top"}),
+        json!({"from": a, "side": "middle"}),
+        json!({"from": a, "side": "auto"}),
+        json!({"from": a, "side": 3}),
+        json!({"from": "x", "side": "top"}),
+        json!({"from": top}),
+        json!({"side": "top"}),
+    ] {
+        assert!(s.execute("devMode.addMeasurement", &p).is_err(), "{p}");
+    }
+    ok(&mut s, "devMode.addMeasurement", json!({"from": a, "to": b}));
+    assert!(s.execute("devMode.addMeasurement", &json!({"from": a, "to": b})).is_err(), "already there");
+    assert!(s.execute("devMode.addMeasurement", &json!({"from": b, "to": a})).is_err(), "the same two layers");
+    assert!(s.execute("devMode.removeMeasurement", &json!({"from": a, "index": 5})).is_err());
+    assert!(s.execute("devMode.measurements", &json!({"page": a})).is_err());
+    assert_eq!(ok(&mut s, "devMode.measurements", json!({"page": other})), json!([]));
+    // A layer starts a bounded number.
+    for _ in 1..crate::dev_measurements::MAX_PER_LAYER {
+        let t = rect(&mut s, 200.0, 5.0, Some(f));
+        ok(&mut s, "devMode.addMeasurement", json!({"from": a, "to": t}));
+    }
+    assert!(s.execute("devMode.addMeasurement", &json!({"from": a, "side": "top"})).is_err(), "capped");
+    assert_eq!(s.doc().unwrap().node(a).unwrap().measurements.len(), crate::dev_measurements::MAX_PER_LAYER);
+}
+
+#[test]
+fn copies_measure_what_was_copied_with_them() {
+    let (mut s, f, a, b) = setup();
+    ok(&mut s, "devMode.addMeasurement", json!({"from": a, "to": b}));
+    ok(&mut s, "devMode.addMeasurement", json!({"from": a, "side": "bottom"}));
+    // The frame copied: the copy of `a` measures to the copy of `b`.
+    ok(&mut s, "edit.duplicate", json!({"ids": [f]}));
+    let copy = s.selection()[0];
+    let doc = s.doc().unwrap();
+    let kids = doc.node(copy).unwrap().children.clone();
+    let ca = doc.node(kids[0]).unwrap();
+    assert_eq!(ca.measurements.len(), 2);
+    assert_eq!(ca.measurements[0].to, Some(kids[1]));
+    // `a` alone copied: only its side measurement comes along.
+    ok(&mut s, "edit.duplicate", json!({"ids": [a]}));
+    let lone = s.selection()[0];
+    let m = &s.doc().unwrap().node(lone).unwrap().measurements;
+    assert_eq!((m.len(), m[0].to, m[0].side), (1, None, Some(figcraft_doc::Side::Bottom)));
+}
+
+#[test]
+fn measurements_sync_save_and_old_files_open() {
+    let (mut s, _, a, b) = setup();
+    let before = s.doc().unwrap().clone();
+    ok(&mut s, "devMode.addMeasurement", json!({"from": a, "to": b}));
+    ok(&mut s, "devMode.addMeasurement", json!({"from": b, "side": "right"}));
+    // A change collaborators receive.
+    let d = figcraft_collab::diff(&Replica::new(before), s.doc().unwrap()).unwrap();
+    assert!(d.changes.iter().any(|c| matches!(c, Change::Set { id, prop: Prop::Measurements, .. } if *id == a)), "{:?}", d.changes);
+    // What agents inspect.
+    assert_eq!(crate::inspect::node_json(s.doc().unwrap(), b, 0)["measurements"], json!([{"side": "right"}]));
+    // Saved and opened again.
+    let doc = s.doc().unwrap();
+    let bytes = figcraft_format::save_bytes(doc, None).unwrap();
+    let (back, _) = figcraft_format::load_bytes(&bytes).unwrap();
+    assert_eq!(back.node(a).unwrap().measurements, doc.node(a).unwrap().measurements);
+    assert_eq!(back.node(b).unwrap().measurements, doc.node(b).unwrap().measurements);
+    // A file from before measurements (no such field) opens with none.
+    fn strip(v: &mut Value) {
+        match v {
+            Value::Object(o) => {
+                o.remove("measurements");
+                o.values_mut().for_each(strip);
+            }
+            Value::Array(a) => a.iter_mut().for_each(strip),
+            _ => {}
+        }
+    }
+    let mut old = figcraft_format::to_json(doc).unwrap();
+    assert!(old.to_string().contains("\"measurements\""));
+    strip(&mut old);
+    let (back, _) = figcraft_format::from_json(&old.to_string()).unwrap();
+    assert!(back.node(a).unwrap().measurements.is_empty() && back.node(b).unwrap().name == doc.node(b).unwrap().name);
+}
+
+#[test]
+fn dev_mode_places_measurements() {
+    use crate::devinspect::dev_mode_allows;
+    for id in ["devMode.addMeasurement", "devMode.removeMeasurement", "devMode.measurements"] {
+        assert!(dev_mode_allows(id), "{id}");
+    }
+}
+
+#[test]
+fn instances_keep_their_own_measurements_across_main_edits() {
+    let mut s = Session::new();
+    let f = id_of(&ok(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 40}))["id"]).unwrap();
+    let r = rect(&mut s, 5.0, 10.0, Some(f));
+    ok(&mut s, "devMode.addMeasurement", json!({"from": r, "side": "top"}));
+    let main = id_of(&ok(&mut s, "component.create", json!({"ids": [f]}))["id"]).unwrap();
+    let inst = id_of(&ok(&mut s, "instance.create", json!({"component": main, "x": 200, "y": 0}))["id"]).unwrap();
+    let inner = s.doc().unwrap().node(inst).unwrap().children[0];
+    // The main's measurements aren't copied onto its instances.
+    assert!(s.doc().unwrap().node(inner).unwrap().measurements.is_empty());
+    ok(&mut s, "devMode.addMeasurement", json!({"from": inner}));
+    ok(&mut s, "devMode.addMeasurement", json!({"from": inst, "side": "left"}));
+    ok(&mut s, "node.set", json!({"id": r, "props": {"opacity": 0.5}}));
+    ok(&mut s, "node.set", json!({"id": main, "props": {"width": 120}}));
+    let doc = s.doc().unwrap();
+    assert_eq!(doc.node(inner).unwrap().measurements[0].to, Some(inst), "kept across a main edit");
+    assert_eq!(doc.node(inst).unwrap().measurements.len(), 1);
+    assert_eq!(doc.node(r).unwrap().measurements.len(), 1);
+}
diff --git a/crates/engine/src/devfocus_tests.rs b/crates/engine/src/devfocus_tests.rs
index 1607ce56..0801746d 100644
--- a/crates/engine/src/devfocus_tests.rs
+++ b/crates/engine/src/devfocus_tests.rs
@@ -99,8 +99,9 @@ fn nested_frames_stay_out_of_the_ready_list_and_its_navigation() {
     let mut s = Session::new();
     let screen = frame(&mut s, 0.0, "Screen");
     let card = idv(&ex(&mut s, "frame.create", json!({"parent": screen, "width": 100, "height": 50, "name": "Card"})));
-    // A status a nested frame already stores (an older file, or set through node.set) is ignored.
-    ex(&mut s, "node.set", json!({"id": card, "props": {"devStatus": "readyForDev"}}));
+    // node.set refuses a status on a nested frame, and one an older file already stores is ignored.
+    assert!(s.execute("node.set", &json!({"id": card, "props": {"devStatus": "readyForDev"}})).is_err());
+    s.doc_mut().unwrap().node_mut(card).unwrap().dev_status = DevStatus::ReadyForDev;
     assert_eq!(ex(&mut s, "inspect.readyForDev", json!({"status": "any"}))["items"], json!([]));
     assert!(s.execute("dev.focus", &json!({"direction": "next"})).is_err(), "nothing is ready");
     ex(&mut s, "node.set", json!({"id": screen, "props": {"devStatus": "readyForDev"}}));
diff --git a/crates/engine/src/devinspect_tests.rs b/crates/engine/src/devinspect_tests.rs
index be25e02c..5ee590cc 100644
--- a/crates/engine/src/devinspect_tests.rs
+++ b/crates/engine/src/devinspect_tests.rs
@@ -79,7 +79,7 @@ fn redlines_measure_on_hover_without_alt() {
         s.tool.overlay.guides.len()
     };
     assert_eq!(hover(&mut s), 0, "plain hover doesn't measure");
-    s.tool.redlines = true;
+    s.tool.dev_mode = true;
     assert!(hover(&mut s) > 0, "Inspect measures on hover");
 }
 
diff --git a/crates/engine/src/devmode_behaviour_tests.rs b/crates/engine/src/devmode_behaviour_tests.rs
new file mode 100644
index 00000000..38d1a9fb
--- /dev/null
+++ b/crates/engine/src/devmode_behaviour_tests.rs
@@ -0,0 +1,225 @@
+//! Dev Mode behaviour suite, written from the public documentation of handoff tools (in our own
+//! words): the canvas inspects and never edits, what the menus and shortcuts may run there, the
+//! list of what's ready for development, statuses (ready, changed, completed) and the focus view.
+
+use crate::Session;
+use crate::components::tests::{ex, idv};
+use crate::devinspect::dev_mode_allows;
+use crate::tools::{PointerEvent, PointerKind, ToolId};
+use figcraft_doc::{DevStatus, NodeId};
+use serde_json::{Value, json};
+
+fn ev(kind: PointerKind, x: f64, y: f64) -> PointerEvent {
+    PointerEvent::at(kind, x, y, 1.0)
+}
+
+fn drag(s: &mut Session, from: (f64, f64), to: (f64, f64)) {
+    s.pointer(&ev(PointerKind::Down, from.0, from.1)).unwrap();
+    for k in 1..=4 {
+        let t = f64::from(k) / 4.0;
+        s.pointer(&ev(PointerKind::Move, from.0 + (to.0 - from.0) * t, from.1 + (to.1 - from.1) * t)).unwrap();
+    }
+    s.pointer(&ev(PointerKind::Up, to.0, to.1)).unwrap();
+}
+
+fn frame(s: &mut Session, x: f64, name: &str) -> NodeId {
+    idv(&ex(s, "frame.create", json!({"x": x, "y": 0, "width": 200, "height": 200, "name": name})))
+}
+
+fn rect(s: &mut Session, parent: NodeId, x: f64) -> NodeId {
+    idv(&ex(s, "shape.rectangle", json!({"x": x, "y": 20, "width": 40, "height": 40, "parent": parent})))
+}
+
+fn names(v: &Value) -> Vec<String> {
+    v["items"].as_array().map(|a| a.iter().filter_map(|i| i["name"].as_str().map(String::from)).collect()).unwrap_or_default()
+}
+
+fn status(s: &mut Session, ids: &[NodeId], st: &str) {
+    ex(s, "node.set", json!({"ids": ids, "props": {"devStatus": st}}));
+}
+
+#[test]
+fn the_dev_mode_canvas_selects_and_pans_but_never_edits() {
+    let mut s = Session::new();
+    let f = frame(&mut s, 0.0, "Screen");
+    let r = rect(&mut s, f, 20.0);
+    let t = idv(&ex(&mut s, "text.create", json!({"text": "Hello", "x": 100, "y": 120, "parent": f})));
+    s.tool.dev_mode = true;
+    let before = s.doc().unwrap().clone();
+    let steps = s.undo_labels(100).len();
+    // A press selects; dragging it moves nothing.
+    drag(&mut s, (40.0, 40.0), (140.0, 90.0));
+    assert_eq!(s.selection(), vec![r]);
+    // Nor do its resize handles.
+    drag(&mut s, (60.0, 60.0), (120.0, 120.0));
+    // Drawing tools only select there.
+    for tool in [ToolId::Rectangle, ToolId::Frame, ToolId::Text, ToolId::Pen, ToolId::Pencil, ToolId::Scale] {
+        s.set_tool(tool);
+        drag(&mut s, (300.0, 300.0), (360.0, 360.0));
+    }
+    s.set_tool(ToolId::Move);
+    // A double-click on text doesn't start typing; on a frame's layer it selects into it.
+    ex(&mut s, "select.set", json!({"ids": [t]}));
+    s.pointer(&ev(PointerKind::DoubleClick, 110.0, 128.0)).unwrap();
+    assert!(s.ds().unwrap().text_edit.is_none(), "no text editing");
+    ex(&mut s, "select.set", json!({"ids": [r]}));
+    s.pointer(&ev(PointerKind::DoubleClick, 40.0, 40.0)).unwrap();
+    assert!(s.ds().unwrap().vector_edit.is_none(), "no vector editing");
+    assert!(*s.doc().unwrap() == before, "the design is untouched");
+    assert_eq!(s.undo_labels(100).len(), steps, "nothing to undo");
+    // Keys that edit with a tool (a selected guide's Delete) go to the commands instead.
+    assert!(!s.tool_key("Delete", false, false, false).unwrap());
+    // The hand still pans; comments still start.
+    s.set_tool(ToolId::Hand);
+    let cx = s.ds().unwrap().view.cx;
+    s.pointer(&ev(PointerKind::Down, 500.0, 500.0)).unwrap();
+    s.pointer(&PointerEvent { sx: 550.0, ..ev(PointerKind::Move, 500.0, 500.0) }).unwrap();
+    s.pointer(&ev(PointerKind::Up, 500.0, 500.0)).unwrap();
+    assert_ne!(s.ds().unwrap().view.cx, cx, "panned");
+    s.set_tool(ToolId::Comment);
+    s.pointer(&ev(PointerKind::Down, 500.0, 500.0)).unwrap();
+    assert!(s.ui_requests.iter().any(|u| u.kind == "comment.new"));
+    // Back in the design: the same drag moves.
+    s.tool.dev_mode = false;
+    s.set_tool(ToolId::Move);
+    drag(&mut s, (40.0, 40.0), (140.0, 90.0));
+    assert!(s.doc().unwrap().node(r).is_some_and(|n| n.transform.as_coeffs()[4] > 100.0), "moved");
+}
+
+#[test]
+fn dev_mode_runs_its_own_edits_and_refuses_design_edits_from_menus_and_shortcuts() {
+    for id in [
+        "annotation.add",
+        "annotation.edit",
+        "dev.resolveChange",
+        "dev.focus",
+        "devResource.add",
+        "codeConnect.set",
+        "comment.add",
+        "edit.undo",
+        "edit.redo",
+        "edit.copy",
+        "edit.copyAsCss",
+        "select.all",
+        "view.zoomIn",
+        "view.devMode",
+        "file.export",
+        "file.save",
+        "tool.move",
+        "tool.hand",
+        "tool.comment",
+        "inspect.code",
+    ] {
+        assert!(dev_mode_allows(id), "{id} runs in Dev Mode");
+    }
+    for id in [
+        "edit.delete",
+        "edit.paste",
+        "edit.cut",
+        "edit.duplicate",
+        "transform.nudge",
+        "object.group",
+        "tool.rectangle",
+        "tool.text",
+        "tool.place",
+        "file.import",
+        "file.revert",
+        "data.fill",
+    ] {
+        assert!(!dev_mode_allows(id), "{id} edits the design");
+    }
+}
+
+#[test]
+fn the_ready_list_shows_frames_and_sections_with_a_status_across_pages() {
+    let mut s = Session::new();
+    let a = frame(&mut s, 0.0, "Login");
+    let b = frame(&mut s, 300.0, "Signup");
+    let nested = idv(&ex(&mut s, "frame.create", json!({"x": 10, "y": 10, "width": 50, "height": 50, "parent": a, "name": "Card"})));
+    status(&mut s, &[a], "readyForDev");
+    status(&mut s, &[b], "completed");
+    // A layer inside a frame takes no status of its own (its frame's covers it).
+    assert!(s.execute("node.set", &json!({"id": nested, "props": {"devStatus": "readyForDev"}})).is_err());
+    assert!(s.execute("node.set", &json!({"ids": [a, nested], "props": {"devStatus": "completed"}})).is_err(), "all or nothing");
+    assert_eq!(s.doc().unwrap().node(a).map(|n| n.dev_status), Some(DevStatus::ReadyForDev));
+    // Clearing one is always fine.
+    ex(&mut s, "node.set", json!({"id": nested, "props": {"devStatus": null}}));
+    let pg2 = idv(&ex(&mut s, "page.add", json!({"name": "Settings"})));
+    ex(&mut s, "page.select", json!({"id": pg2}));
+    let c = frame(&mut s, 0.0, "Profile");
+    status(&mut s, &[c], "readyForDev");
+    assert_eq!(names(&ex(&mut s, "inspect.readyForDev", json!({}))), vec!["Login", "Profile"]);
+    assert_eq!(names(&ex(&mut s, "inspect.readyForDev", json!({"status": "completed"}))), vec!["Signup"]);
+    assert_eq!(names(&ex(&mut s, "inspect.readyForDev", json!({"status": "any"}))), vec!["Login", "Signup", "Profile"]);
+    // Statuses are undoable.
+    s.undo().unwrap();
+    assert_eq!(names(&ex(&mut s, "inspect.readyForDev", json!({}))), vec!["Login"]);
+}
+
+#[test]
+fn ready_frames_edited_after_marking_show_as_changed_until_resolved_or_completed() {
+    let mut s = Session::new();
+    let a = frame(&mut s, 0.0, "Login");
+    let b = frame(&mut s, 300.0, "Signup");
+    let r = rect(&mut s, a, 20.0);
+    let outside = idv(&ex(&mut s, "shape.rectangle", json!({"x": 900, "y": 0, "width": 10, "height": 10})));
+    status(&mut s, &[a, b], "readyForDev");
+    let changed = |s: &mut Session| names(&ex(s, "inspect.readyForDev", json!({"status": "changed"})));
+    assert!(changed(&mut s).is_empty(), "marking isn't a change");
+    // Edits elsewhere don't count; an edit inside does.
+    ex(&mut s, "node.set", json!({"id": outside, "props": {"width": 30}}));
+    assert!(changed(&mut s).is_empty());
+    ex(&mut s, "node.set", json!({"id": r, "props": {"width": 60}}));
+    assert_eq!(changed(&mut s), vec!["Login"]);
+    let items = ex(&mut s, "inspect.readyForDev", json!({}));
+    assert_eq!(items["items"][0]["changed"], true, "the list says which changed: {items}");
+    assert_eq!(items["items"][1]["changed"], false);
+    // Still ready for dev (the status itself stays).
+    assert_eq!(names(&items), vec!["Login", "Signup"]);
+    // Resolving goes back to plain ready; so does marking it again, or completing it.
+    ex(&mut s, "dev.resolveChange", json!({"ids": [a]}));
+    assert!(changed(&mut s).is_empty());
+    ex(&mut s, "node.set", json!({"id": r, "props": {"width": 70}}));
+    status(&mut s, &[a], "completed");
+    assert!(changed(&mut s).is_empty());
+    let all = ex(&mut s, "inspect.readyForDev", json!({"status": "any"}));
+    assert_eq!(all["items"][0]["changed"], false, "a completed frame isn't changed: {all}");
+    // Completed frames don't turn changed when edited.
+    ex(&mut s, "node.set", json!({"id": r, "props": {"width": 80}}));
+    assert!(!s.doc().unwrap().node(a).unwrap().dev_changed);
+}
+
+#[test]
+fn the_focus_view_steps_through_what_is_ready_and_skips_completed_frames() {
+    let mut s = Session::new();
+    let a = frame(&mut s, 0.0, "Login");
+    let b = frame(&mut s, 300.0, "Signup");
+    let c = frame(&mut s, 600.0, "Profile");
+    let r = rect(&mut s, c, 620.0);
+    status(&mut s, &[a, c], "readyForDev");
+    status(&mut s, &[b], "completed");
+    ex(&mut s, "node.set", json!({"id": r, "props": {"width": 60}}));
+    let step = |s: &mut Session, d: &str| ex(s, "dev.focus", json!({"direction": d}));
+    let v = ex(&mut s, "dev.focus", json!({"id": a}));
+    assert_eq!((v["index"].clone(), v["count"].clone()), (json!(0), json!(2)));
+    assert_eq!(step(&mut s, "next")["id"], json!(c), "completed ones are skipped, changed ones aren't");
+    assert_eq!(step(&mut s, "previous")["id"], json!(a));
+    // Any top-level frame opens in it, even one that's completed.
+    assert_eq!(ex(&mut s, "dev.focus", json!({"id": b}))["index"], json!(null));
+}
+
+#[test]
+fn a_drag_under_way_when_dev_mode_starts_moves_nothing() {
+    let mut s = Session::new();
+    let f = frame(&mut s, 0.0, "Screen");
+    let r = rect(&mut s, f, 20.0);
+    ex(&mut s, "select.set", json!({"ids": [r]}));
+    let before = s.doc().unwrap().world_bounds(r);
+    s.pointer(&ev(PointerKind::Down, 40.0, 40.0)).unwrap();
+    s.pointer(&ev(PointerKind::Move, 90.0, 40.0)).unwrap();
+    s.drop_gesture().unwrap();
+    s.tool.dev_mode = true;
+    s.pointer(&ev(PointerKind::Move, 120.0, 40.0)).unwrap();
+    s.pointer(&ev(PointerKind::Up, 120.0, 40.0)).unwrap();
+    assert_eq!(s.doc().unwrap().world_bounds(r), before, "the drag was dropped, not committed");
+}
diff --git a/crates/engine/src/devmode_tail_tests.rs b/crates/engine/src/devmode_tail_tests.rs
new file mode 100644
index 00000000..b8f1b019
--- /dev/null
+++ b/crates/engine/src/devmode_tail_tests.rs
@@ -0,0 +1,163 @@
+//! Dev Mode, the tail: import lines for the connected components a layer tree calls.
+
+use crate::Session;
+use crate::components::tests::{ex, idv};
+use figcraft_doc::NodeId;
+use serde_json::json;
+
+fn code(s: &mut Session, id: NodeId, lang: &str) -> String {
+    ex(s, "inspect.code", json!({"id": id, "language": lang}))["code"].as_str().unwrap_or_default().to_string()
+}
+
+/// A component named `name` (an empty frame) at `x`.
+fn component(s: &mut Session, name: &str, x: f64) -> NodeId {
+    let f = idv(&ex(s, "frame.create", json!({"x": x, "y": 1000, "width": 40, "height": 20, "name": name})));
+    idv(&ex(s, "component.create", json!({"ids": [f]})))
+}
+
+fn instance(s: &mut Session, c: NodeId, parent: NodeId) -> NodeId {
+    idv(&ex(s, "instance.create", json!({"component": c, "x": 0, "y": 0, "parent": parent})))
+}
+
+fn frame(s: &mut Session, name: &str, parent: Option<NodeId>) -> NodeId {
+    idv(&ex(s, "frame.create", json!({"x": 0, "y": 0, "width": 400, "height": 300, "name": name, "parent": parent})))
+}
+
+fn count(code: &str, line: &str) -> usize {
+    code.lines().filter(|l| *l == line).count()
+}
+
+#[test]
+fn layer_trees_import_the_connected_components_they_call_once_at_the_top() {
+    let mut s = Session::new();
+    let badge = component(&mut s, "Badge", 0.0);
+    let button = component(&mut s, "Button", 100.0);
+    let toast = component(&mut s, "Toast", 200.0);
+    let divider = component(&mut s, "Divider", 300.0);
+    for (lang, path) in [("react", "@acme/ui"), ("swiftui", "AcmeUI"), ("leptos", "crate::ui"), ("compose", "com.acme.ui.Badge")] {
+        ex(&mut s, "codeConnect.set", json!({"id": badge, "language": lang, "importPath": path}));
+    }
+    ex(&mut s, "codeConnect.set", json!({"id": button, "importPath": "@acme/buttons"}));
+    ex(&mut s, "codeConnect.set", json!({"id": toast, "importPath": "@acme/toast"}));
+    let screen = frame(&mut s, "Screen", None);
+    let row = frame(&mut s, "Row", Some(screen));
+    for (c, parent) in [(badge, screen), (button, screen), (badge, screen), (divider, screen), (badge, row)] {
+        instance(&mut s, c, parent);
+    }
+    let hidden = instance(&mut s, toast, row);
+    ex(&mut s, "node.set", json!({"id": hidden, "props": {"visible": false}}));
+
+    let react = code(&mut s, screen, "react");
+    assert!(react.starts_with("import { Badge } from \"@acme/ui\";\nimport { Button } from \"@acme/buttons\";\nimport \"./"), "{react}");
+    assert_eq!(count(&react, "import { Badge } from \"@acme/ui\";"), 1, "once each: {react}");
+    assert!(!react.contains("@acme/toast"), "hidden layers aren't in the code: {react}");
+    let swift = code(&mut s, screen, "swiftui");
+    assert!(swift.starts_with("import AcmeUI\n\n") && count(&swift, "import AcmeUI") == 1, "per language: {swift}");
+    assert!(!swift.contains("acme/buttons"), "{swift}");
+    let leptos = code(&mut s, screen, "leptos");
+    assert!(leptos.starts_with("use crate::ui::Badge;\nuse leptos::prelude::*;\n"), "joined to the code's own imports: {leptos}");
+    assert!(code(&mut s, screen, "compose").starts_with("import com.acme.ui.Badge\n\n"));
+    assert!(!code(&mut s, screen, "css").contains("import"), "CSS has no imports");
+    // The Inspect panel shows inspect.code's text (the same function).
+    let doc = s.doc().unwrap();
+    assert_eq!(crate::codegen::code_for(doc, screen, crate::codegen::CodeLang::React), react);
+
+    // A connected layer itself: its import and snippet, unchanged.
+    assert_eq!(code(&mut s, badge, "react"), "import { Badge } from \"@acme/ui\";\n\n<Badge />\n");
+
+    // A component's definition, and an instance of it (its call, then the definition).
+    let card_frame = frame(&mut s, "Card", None);
+    instance(&mut s, badge, card_frame);
+    let card = idv(&ex(&mut s, "component.create", json!({"ids": [card_frame]})));
+    assert!(
+        code(&mut s, card, "react").starts_with("import { Badge } from \"@acme/ui\";\nimport \"./card.css\";"),
+        "{}",
+        code(&mut s, card, "react")
+    );
+    let page = frame(&mut s, "Page", None);
+    let card_i = instance(&mut s, card, page);
+    assert!(code(&mut s, card_i, "react").starts_with("import { Badge } from \"@acme/ui\";\n\n<Card />"), "{}", code(&mut s, card_i, "react"));
+    assert!(code(&mut s, page, "react").starts_with("import \"./"), "an unconnected call's insides aren't in the code");
+}
+
+#[test]
+fn slots_and_instance_swaps_bring_their_connected_imports() {
+    let mut s = Session::new();
+    let badge = component(&mut s, "Badge", 0.0);
+    ex(&mut s, "codeConnect.set", json!({"id": badge, "importPath": "@acme/ui"}));
+    // A panel whose slot an instance fills with a badge.
+    let f = frame(&mut s, "Panel", None);
+    let content = frame(&mut s, "Content", Some(f));
+    let panel = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    ex(&mut s, "component.makeSlot", json!({"id": content}));
+    let screen = frame(&mut s, "Screen", None);
+    let p = instance(&mut s, panel, screen);
+    assert!(!code(&mut s, screen, "react").contains("@acme/ui"), "an empty slot");
+    ex(&mut s, "instance.slotInsert", json!({"id": p, "slot": "Content", "component": badge, "replace": true}));
+    assert!(code(&mut s, screen, "react").starts_with("import { Badge } from \"@acme/ui\";\n"), "{}", code(&mut s, screen, "react"));
+    assert!(code(&mut s, p, "react").starts_with("import { Badge } from \"@acme/ui\";\n\n<Panel content={("), "{}", code(&mut s, p, "react"));
+
+    // A connected chip whose template places its icon: the swapped-in connected component's import.
+    let heart = component(&mut s, "Heart", 300.0);
+    let chip_frame = frame(&mut s, "Chip", None);
+    let nested = instance(&mut s, heart, chip_frame);
+    let chip = idv(&ex(&mut s, "component.create", json!({"ids": [chip_frame]})));
+    ex(&mut s, "component.addProperty", json!({"id": chip, "name": "Icon", "type": "instanceSwap", "default": heart, "layer": nested}));
+    ex(&mut s, "codeConnect.set", json!({"id": chip, "importPath": "@acme/chip", "template": "<Chip icon={Icon} />"}));
+    let c = instance(&mut s, chip, screen);
+    ex(&mut s, "instance.setProperties", json!({"ids": [c], "properties": {"Icon": badge}}));
+    assert_eq!(code(&mut s, c, "react"), "import { Chip } from \"@acme/chip\";\nimport { Badge } from \"@acme/ui\";\n\n<Chip icon={<Badge />} />\n");
+    let tree = code(&mut s, screen, "react");
+    assert!(tree.starts_with("import { Badge } from \"@acme/ui\";\nimport { Chip } from \"@acme/chip\";\nimport \"./"), "{tree}");
+    // An unconnected swap target brings nothing; the default (Heart) isn't connected.
+    ex(&mut s, "instance.setProperties", json!({"ids": [c], "properties": {"Icon": heart}}));
+    assert_eq!(code(&mut s, c, "react"), "import { Chip } from \"@acme/chip\";\n\n<Chip icon={<Heart />} />\n");
+}
+
+#[test]
+fn compare_changes_takes_any_saved_version_as_the_before() {
+    let mut s = Session::new();
+    let screen = frame(&mut s, "Screen", None);
+    let button =
+        idv(&ex(&mut s, "shape.rectangle", json!({"x": 20, "y": 20, "width": 120, "height": 40, "parent": screen, "props": {"name": "Button"}})));
+    let old = idv(&ex(&mut s, "shape.ellipse", json!({"x": 200, "y": 20, "width": 20, "height": 20, "parent": screen, "props": {"name": "Dot"}})));
+    let v1 = ex(&mut s, "file.saveVersion", json!({"name": "Kickoff"}))["id"].as_str().unwrap().to_string();
+    ex(&mut s, "node.set", json!({"id": button, "props": {"width": 136}}));
+    ex(&mut s, "edit.delete", json!({"ids": [old]}));
+    let added = idv(&ex(&mut s, "text.create", json!({"text": "Hi", "x": 20, "y": 100, "parent": screen, "props": {"name": "Note"}})));
+    let v2 = ex(&mut s, "file.saveVersion", json!({"name": "Review"}))["id"].as_str().unwrap().to_string();
+    ex(&mut s, "node.set", json!({"id": button, "props": {"width": 150}}));
+
+    // Any frame, ready for dev or not.
+    let c = ex(&mut s, "dev.compare", json!({"id": screen, "version": v1}));
+    assert_eq!(c["version"]["name"], "Kickoff");
+    assert_eq!(
+        (c["changed"].as_bool(), c["added"].as_u64(), c["removed"].as_u64(), c["modified"].as_u64()),
+        (Some(true), Some(1), Some(1), Some(1)),
+        "{c}"
+    );
+    let change =
+        |c: &serde_json::Value, id: NodeId| c["changes"].as_array().unwrap().iter().find(|l| l["id"] == json!(id)).cloned().unwrap_or_default();
+    assert_eq!(change(&c, button)["properties"][0]["text"], "width 120 → 150");
+    assert_eq!(change(&c, old)["change"], "removed");
+    assert_eq!(change(&c, added)["change"], "added");
+    // A later version: only what changed since then.
+    let c = ex(&mut s, "dev.compare", json!({"id": screen, "version": v2}));
+    assert_eq!(c["changes"].as_array().map(Vec::len), Some(1), "{c}");
+    assert_eq!(change(&c, button)["properties"][0]["text"], "width 136 → 150");
+    // A frame the version doesn't have was added as a whole.
+    let fresh = frame(&mut s, "Settings", None);
+    let c = ex(&mut s, "dev.compare", json!({"id": fresh, "version": v1}));
+    assert_eq!(c["changes"][0]["change"], "added");
+    // The snapshot from when it was marked stays the default, for ready-for-dev layers only.
+    assert!(s.execute("dev.compare", &json!({"id": screen})).is_err(), "not ready for dev");
+    ex(&mut s, "node.set", json!({"id": screen, "props": {"devStatus": "readyForDev"}}));
+    let c = ex(&mut s, "dev.compare", json!({"id": screen}));
+    assert_eq!((c["changed"].as_bool(), c["version"].is_null()), (Some(false), true), "{c}");
+    for bad in [json!({"id": screen, "version": "nope"}), json!({"id": screen, "version": 5}), json!({"id": button, "version": v1})] {
+        assert!(s.execute("dev.compare", &bad).is_err(), "{bad}");
+    }
+    // The app opens on the version asked for.
+    ex(&mut s, "dev.compare", json!({"id": screen, "version": v2, "show": true}));
+    assert!(s.ui_requests.iter().any(|u| u.kind == "view.devCompare" && u.data["version"] == json!(v2)));
+}
diff --git a/crates/engine/src/doc_state.rs b/crates/engine/src/doc_state.rs
new file mode 100644
index 00000000..4f9509a7
--- /dev/null
+++ b/crates/engine/src/doc_state.rs
@@ -0,0 +1,348 @@
+use super::view_state::ViewState;
+use super::*;
+
+/// One undo step.
+#[derive(Clone, Debug)]
+pub struct HistoryEntry {
+    pub label: String,
+    pub doc: Arc<Document>,
+    pub selection: Vec<NodeId>,
+    pub page: NodeId,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct History {
+    pub undo: Vec<HistoryEntry>,
+    pub redo: Vec<HistoryEntry>,
+    pub limit: usize,
+}
+
+/// An in-progress gesture: the document before it started, so previews re-apply from scratch.
+#[derive(Clone, Debug)]
+pub struct Interaction {
+    pub label: String,
+    pub doc: Arc<Document>,
+    pub selection: Vec<NodeId>,
+}
+
+/// The text being edited on the canvas.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct TextEdit {
+    pub id: NodeId,
+    /// Caret position and selection anchor (char indices).
+    pub caret: usize,
+    pub anchor: usize,
+    /// The node was created by this edit (deleted if left empty).
+    pub created: bool,
+    /// Identity of this editing session (`textedit::begin` assigns a fresh one).
+    ///
+    /// The IME owner is `(document uid, node)`, which stays the same through ordinary edits
+    /// and caret moves; this token changes only when editing is started again, so an IME
+    /// context is never silently inherited by a replaced target that reuses the same node.
+    ///
+    /// It is deliberately not serialized: current consumers only inspect a live session. A
+    /// serialized `TextEdit` restored from data would get zero here, so it must not be restored
+    /// into a live editor without minting (or otherwise invalidating) a new session.
+    #[serde(default, skip_serializing)]
+    pub editing_session: u64,
+    /// An IME composition in progress, shown inline at the caret; the document gets it on commit.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub preedit: Option<Preedit>,
+}
+
+/// IME composition text (not yet in the document) and the IME's cursor inside it (chars).
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Preedit {
+    pub text: String,
+    pub cursor: usize,
+}
+
+/// Per-document editing state.
+#[derive(Clone, Debug)]
+pub struct DocState {
+    pub doc: Arc<Document>,
+    pub selection: Vec<NodeId>,
+    pub page: NodeId,
+    pub history: History,
+    pub(crate) saved_doc: Arc<Document>,
+    pub path: Option<String>,
+    pub revision: u64,
+    pub view: ViewState,
+    pub interaction: Option<Interaction>,
+    pub text_edit: Option<TextEdit>,
+    /// Hovered node (canvas hover outline).
+    pub hover: Option<NodeId>,
+    /// Vector edit mode: the vector being edited, its selected points and the edit tool.
+    pub vector_edit: Option<vectoredit::VectorEdit>,
+    pub uid: u64,
+    /// The file's version history, oldest first (saved in the `.figcraft` file; not undoable).
+    pub versions: Vec<figcraft_format::Version>,
+    /// The file's branches (saved in the `.figcraft` file; not undoable).
+    pub branches: Vec<figcraft_format::Branch>,
+    /// This tab shows a branch: the `uid` of its main file's tab and the branch id. Its edits go
+    /// into the main file's branch (and are saved with the main file).
+    pub branch_of: Option<(u64, String)>,
+    /// The version history or the branches changed since the last save.
+    pub(crate) versions_changed: bool,
+    /// A version shown in place of the document (read-only).
+    pub preview: Option<VersionPreview>,
+    /// The document under a live text preview (a hovered font family or style, text style or
+    /// font instance, a dragged axis slider): `doc` shows the preview until [`textpreview::end`] puts this back.
+    pub text_preview: Option<Arc<Document>>,
+    /// The document as of the last version saved or restored (none yet): autosaves, restores and
+    /// merges only add a checkpoint for changes since.
+    checkpoint: Option<Arc<Document>>,
+    /// Dev Mode focus view: the frame or section shown alone on the canvas (see [`Self::focused`]).
+    pub focus: Option<NodeId>,
+    /// The ruler guide clicked last: its page or frame and index (see [`Self::selected_guide`]).
+    pub guide: Option<(NodeId, usize)>,
+    /// The selection's rotation origin, when moved or shown (see [`rotation_origin`]; not saved).
+    pub(crate) rotation_origin: Option<rotation_origin::RotationOrigin>,
+    /// The View toggles the preferences keep were applied ([`Session::apply_view_prefs`]).
+    pub(crate) view_from_prefs: bool,
+    /// The last duplicate while its copies are the selection: Duplicate repeats its offset (see
+    /// [`cmd::edit::Duplicated`]; not saved).
+    pub(crate) last_duplicate: Option<cmd::edit::Duplicated>,
+    images_left_in_file: Option<(String, usize)>,
+    /// The file on disk as this tab last read or wrote it: a save refuses to replace what another
+    /// app (figcraft-cli, say) wrote to it since (#1330).
+    pub(crate) on_disk: Option<library::Stamp>,
+}
+
+/// A version shown on the canvas in place of the document: read-only until it's restored or the
+/// preview ends, which puts the document back as it was.
+#[derive(Clone, Debug)]
+pub struct VersionPreview {
+    pub id: String,
+    pub name: String,
+    /// When the version was saved (Unix seconds).
+    pub time: u64,
+    pub(crate) doc: Arc<Document>,
+    pub(crate) selection: Vec<NodeId>,
+    pub(crate) page: NodeId,
+}
+
+/// Why edits are refused while a version is shown.
+pub const PREVIEW_READ_ONLY: &str = "you're viewing an earlier version: restore it or go back to the current version to edit";
+
+/// Commands that first end a version preview: they act on the document itself. Saving does so
+/// only with a native destination; export copies and pending format choices keep the preview.
+pub(crate) const ENDS_PREVIEW: &[&str] =
+    &["file.save", "file.saveAs", "file.markSaved", "file.close", "file.revert", "file.saveVersion", "file.duplicate", "version.restore"];
+
+static NEXT_UID: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1);
+
+impl DocState {
+    pub fn new(mut doc: Document, path: Option<String>) -> Self {
+        if doc.pages.is_empty() {
+            doc.repair();
+        }
+        doc.link_layer_text_styles();
+        cmd::styles::apply_paint_bindings_on_load(&mut doc);
+        components::mark_layer_modes(&mut doc);
+        // Initial import settlement belongs to the saved baseline, not the user's first edit.
+        let page = doc.current_page.filter(|p| doc.pages.contains(p)).or_else(|| doc.first_page()).unwrap_or(NodeId(0));
+        let doc = Arc::new(doc);
+        let mut st = Self {
+            checkpoint: None,
+            saved_doc: doc.clone(),
+            doc,
+            selection: Vec::new(),
+            page,
+            history: History { limit: 1000, ..Default::default() },
+            path,
+            revision: 1,
+            view: ViewState::default(),
+            interaction: None,
+            text_edit: None,
+            hover: None,
+            vector_edit: None,
+            uid: NEXT_UID.fetch_add(1, std::sync::atomic::Ordering::Relaxed),
+            versions: Vec::new(),
+            branches: Vec::new(),
+            branch_of: None,
+            versions_changed: false,
+            preview: None,
+            text_preview: None,
+            focus: None,
+            guide: None,
+            rotation_origin: None,
+            view_from_prefs: false,
+            last_duplicate: None,
+            images_left_in_file: None,
+            on_disk: None,
+        };
+        st.zoom_to_fit();
+        st
+    }
+
+    pub fn with_images_left_in_file(mut self, path: &str, count: usize) -> Self {
+        self.images_left_in_file = (count > 0).then(|| (path.to_string(), count));
+        self
+    }
+
+    /// The tab's file now holds what this tab read or wrote.
+    pub(crate) fn note_on_disk(&mut self) {
+        self.on_disk = self.path.as_deref().and_then(|p| library::stat(p).ok());
+    }
+
+    pub fn images_lost_saving_to(&self, path: &str) -> Option<usize> {
+        self.images_left_in_file.as_ref().filter(|(file, _)| file_access::same_file(file, path)).map(|(_, count)| *count)
+    }
+
+    /// The selected ruler guide (its owner and index): it counts while no layer is selected and it
+    /// is still there on this page.
+    pub fn selected_guide(&self) -> Option<(NodeId, usize)> {
+        let (owner, i) = self.guide.filter(|_| self.selection.is_empty())?;
+        let on_page = owner == self.page || self.doc.top_level_frame(owner).is_some_and(|f| self.doc.ancestors(f).contains(&self.page));
+        (on_page && guides::keeps_guides(&self.doc, owner) && self.doc.node(owner).is_some_and(|n| i < n.guides().len())).then_some((owner, i))
+    }
+
+    /// With the version history read from its file.
+    pub fn with_versions(mut self, versions: Vec<figcraft_format::Version>) -> Self {
+        self.versions = versions;
+        self
+    }
+
+    /// With the branches read from its file.
+    pub fn with_branches(mut self, branches: Vec<figcraft_format::Branch>) -> Self {
+        self.branches = branches;
+        self
+    }
+
+    /// The branches, for editing (the file then has unsaved changes).
+    pub fn branches_mut(&mut self) -> &mut Vec<figcraft_format::Branch> {
+        self.versions_changed = true;
+        &mut self.branches
+    }
+
+    /// The document itself, not a version or live text preview shown in its place.
+    pub fn document_itself(&self) -> &Arc<Document> {
+        self.preview.as_ref().map(|p| &p.doc).or(self.text_preview.as_ref()).unwrap_or(&self.doc)
+    }
+
+    /// The version history, for editing (the file then has unsaved changes).
+    pub fn versions_mut(&mut self) -> &mut Vec<figcraft_format::Version> {
+        self.versions_changed = true;
+        &mut self.versions
+    }
+
+    /// The document changed since the last version was saved or restored (always, before one).
+    pub fn changed_since_checkpoint(&self) -> bool {
+        let doc = self.preview.as_ref().map_or(&self.doc, |p| &p.doc);
+        // Normalising after a command can copy a document without changing it: compare contents then.
+        self.checkpoint.as_ref().is_none_or(|c| !Arc::ptr_eq(doc, c) && **doc != **c)
+    }
+
+    /// Note that a version of the current document was just saved (or restored).
+    pub(crate) fn mark_checkpoint(&mut self) {
+        self.checkpoint = Some(self.doc.clone());
+    }
+
+    /// Push a snapshot undo step: the document was `before` (shown with `selection` on `page`).
+    pub(crate) fn push_undo(&mut self, label: &str, before: Arc<Document>, selection: Vec<NodeId>, page: NodeId) {
+        self.history.undo.push(HistoryEntry { label: label.to_string(), doc: before, selection, page });
+        if self.history.undo.len() > self.history.limit.max(1) {
+            self.history.undo.remove(0);
+        }
+        self.history.redo.clear();
+    }
+
+    pub fn is_dirty(&self) -> bool {
+        !Arc::ptr_eq(self.document_itself(), &self.saved_doc) || self.versions_changed
+    }
+
+    /// Show `version` in place of the document (or switch to it from another preview).
+    pub fn start_preview(&mut self, id: &str, name: &str, time: u64, doc: Arc<Document>) {
+        self.end_preview();
+        self.preview = Some(VersionPreview {
+            id: id.to_string(),
+            name: name.to_string(),
+            time,
+            doc: std::mem::replace(&mut self.doc, doc),
+            selection: std::mem::take(&mut self.selection),
+            page: self.page,
+        });
+        self.page = Some(self.page)
+            .filter(|pg| self.doc.pages.contains(pg))
+            .or_else(|| self.doc.current_page.filter(|pg| self.doc.pages.contains(pg)))
+            .or_else(|| self.doc.first_page())
+            .unwrap_or(self.page);
+        self.text_edit = None;
+        self.vector_edit = None;
+        self.interaction = None;
+        self.revision += 1;
+    }
+
+    /// End a version preview, putting the document, selection and page back. False when none.
+    pub fn end_preview(&mut self) -> bool {
+        let Some(p) = self.preview.take() else { return false };
+        self.doc = p.doc;
+        self.selection = p.selection;
+        self.page = p.page;
+        self.text_edit = None;
+        self.vector_edit = None;
+        self.interaction = None;
+        self.clean_selection();
+        self.revision += 1;
+        true
+    }
+
+    /// Shown as having unsaved changes until it is saved (a document recovered after a crash).
+    pub fn unsaved(mut self) -> Self {
+        self.saved_doc = Arc::new(Document::new(self.doc.name.clone()));
+        self
+    }
+
+    pub fn mark_saved(&mut self) {
+        self.saved_doc = self.doc.clone();
+        self.versions_changed = false;
+    }
+
+    pub fn doc_mut(&mut self) -> &mut Document {
+        Arc::make_mut(&mut self.doc)
+    }
+
+    /// Fit the current page's content (or centre on the origin when empty).
+    pub fn zoom_to_fit(&mut self) {
+        match self.doc.page_content_bounds(self.page) {
+            Some(b) => self.view.fit(b, 1.0),
+            None => {
+                self.view.zoom = 1.0;
+                self.view.cx = self.view.vw / 2.0 - 100.0;
+                self.view.cy = self.view.vh / 2.0 - 100.0;
+            }
+        }
+    }
+
+    /// The layer the focus view shows, while it exists on the current page.
+    pub fn focused(&self) -> Option<NodeId> {
+        self.focus.filter(|f| self.doc.page_of(*f) == Some(self.page))
+    }
+
+    /// Drop selected ids that no longer exist or aren't on the current page.
+    pub fn clean_selection(&mut self) {
+        let doc = self.doc.clone();
+        let page = self.page;
+        self.selection.retain(|id| doc.contains(*id) && doc.page_of(*id) == Some(page) && *id != page);
+        let mut seen = BTreeSet::new();
+        self.selection.retain(|id| seen.insert(*id));
+        if let Some(te) = &self.text_edit
+            && !doc.contains(te.id)
+        {
+            self.text_edit = None;
+        }
+        // Vector edit mode ends when its layer is gone (or no longer a vector, e.g. undone).
+        if self.vector_edit.as_mut().is_some_and(|ve| doc.page_of(ve.id) != Some(page) || !ve.clamp_doc(&doc)) {
+            self.vector_edit = None;
+        }
+        // A moved rotation origin lasts as long as its selection.
+        if self.rotation_origin.as_ref().is_some_and(|o| o.ids != self.selection) {
+            self.rotation_origin = None;
+        }
+        // So does the last duplicate (undo reuses ids: a new layer could take a copy's).
+        if self.last_duplicate.as_ref().is_some_and(|d| !d.is_selection(&self.selection)) {
+            self.last_duplicate = None;
+        }
+    }
+}
diff --git a/crates/engine/src/doc_urls_tests.rs b/crates/engine/src/doc_urls_tests.rs
new file mode 100644
index 00000000..d42029a0
--- /dev/null
+++ b/crates/engine/src/doc_urls_tests.rs
@@ -0,0 +1,87 @@
+//! A URL stored in a document reaches the browser or the system opener, so only the schemes a
+//! browser follows on a plain link are allowed ([`crate::doc_urls`]).
+
+use crate::doc_urls::openable;
+
+#[test]
+fn web_links_are_opened() {
+    for url in [
+        "http://example.com",
+        "https://example.com",
+        "https://example.com/a/b?c=d#e",
+        "HTTPS://EXAMPLE.COM",
+        "HtTp://example.com",
+        "mailto:a@b.c",
+        "mailto:a@b.c?subject=hi",
+        "  https://example.com  ",
+        "https://user:pw@example.com:8443/p",
+    ] {
+        assert!(openable(url), "{url:?} should open");
+    }
+}
+
+#[test]
+fn script_and_handler_schemes_are_refused() {
+    for url in [
+        // Runs in the app's own origin on the web build: a saved document would be stored XSS.
+        "javascript:alert(1)",
+        "JavaScript:alert(1)",
+        "jAvAsCrIpT:alert(document.cookie)",
+        "vbscript:msgbox(1)",
+        "data:text/html,<script>alert(1)</script>",
+        "blob:https://example.com/x",
+        // Reach the file system; a UNC host also sends Windows credentials.
+        "file:///etc/passwd",
+        "file://attacker.example/share/x",
+        "smb://attacker.example/share/x",
+        "webdav://attacker.example/x",
+        // Windows application handlers.
+        "ms-msdt:/id PCWDiagnostic",
+        "ms-officecmd:x",
+        "search-ms:query=x",
+        "shell:startup",
+        // Anything else a platform may have registered.
+        "tel:+1234",
+        "sms:+1234",
+        "ssh://host",
+        "ftp://host/x",
+        "figcraft://join?host=127.0.0.1",
+        "zoommtg://zoom.us/join?x",
+        "view-source:https://example.com",
+        "jar:https://example.com/x!/y",
+    ] {
+        assert!(!openable(url), "{url:?} must be refused");
+    }
+}
+
+#[test]
+fn a_scheme_is_required_and_control_characters_are_refused() {
+    for url in [
+        // No scheme: the web opener would resolve these against the app's own page.
+        "",
+        "   ",
+        "example.com",
+        "/etc/passwd",
+        "//example.com",
+        "\\\\host\\share\\x",
+        "about",
+        // Browsers ignore some control characters inside a scheme, so a smuggled one must not
+        // leave `javascript` looking like an unknown scheme that we then refuse by luck.
+        "java\tscript:alert(1)",
+        "java\nscript:alert(1)",
+        "java\rscript:alert(1)",
+        "javascript\u{0}:alert(1)",
+        "https://example.com/\u{0}",
+        // A colon in ordinary text is not a scheme.
+        "see page 2: the diagram",
+        "1https://example.com",
+        // The allowed schemes still need their own part.
+        "mailto:",
+        "http:",
+        "http:example.com",
+        "http:///p",
+        "https://",
+    ] {
+        assert!(!openable(url), "{url:?} must be refused");
+    }
+}
diff --git a/crates/engine/src/draw_tools_tests.rs b/crates/engine/src/draw_tools_tests.rs
index d67b0af4..c5b84d21 100644
--- a/crates/engine/src/draw_tools_tests.rs
+++ b/crates/engine/src/draw_tools_tests.rs
@@ -60,6 +60,161 @@ fn text_goes_onto_a_path_and_off_again() {
     assert!(s.doc().unwrap().node(v).is_some() && text_path(&s, t).is_none(), "undo brings the path back");
 }
 
+/// A click (press and release) at (`x`, `y`) at 100%.
+fn click(s: &mut Session, x: f64, y: f64) {
+    use crate::tools::{PointerEvent, PointerKind};
+    s.pointer(&PointerEvent::at(PointerKind::Down, x, y, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, x, y, 1.0)).unwrap();
+}
+
+fn editing(s: &Session) -> Option<NodeId> {
+    s.ds().unwrap().text_edit.as_ref().map(|te| te.id)
+}
+
+#[test]
+fn the_text_on_a_path_tool_types_new_text_onto_the_path_it_clicks() {
+    let mut s = Session::new();
+    let v = id(s.execute("vector.create", &json!({"path": "M0 0 L200 0", "x": 40, "y": 100, "props": {"fill": "#FF0000"}})).unwrap());
+    s.execute("effect.add", &json!({"ids": [v], "type": "dropShadow"})).unwrap();
+    let (vxf, vw, fills, effects) = {
+        let n = s.doc().unwrap().node(v).unwrap();
+        (n.transform, n.width, n.fills.clone(), n.effects.clone())
+    };
+    assert!(!fills.is_empty() && !effects.is_empty());
+    s.set_tool(crate::tools::ToolId::TextOnPath);
+    // Away from the path a click does nothing.
+    click(&mut s, 140.0, 160.0);
+    assert!(editing(&s).is_none() && s.doc().unwrap().node(v).is_some(), "only a path takes text");
+    // A quarter of the way along, a few pixels off the line.
+    click(&mut s, 90.0, 103.0);
+    let t = editing(&s).expect("typing starts on the path");
+    assert!(s.doc().unwrap().node(v).is_none(), "the path layer became the text's path");
+    crate::textedit::insert(&mut s, "Along").unwrap();
+    crate::textedit::end(&mut s).unwrap();
+    let doc = s.doc().unwrap();
+    let n = doc.node(t).unwrap();
+    assert_eq!((n.transform, n.width), (vxf, vw), "in the path's place");
+    assert_eq!(n.kind.text().map(|t| t.characters.as_str()), Some("Along"));
+    assert_eq!((&n.fills, &n.effects), (&fills, &effects), "the path's fill and effects carry over to the text");
+    let tp = text_path(&s, t).unwrap();
+    assert!((tp.start - 0.25).abs() < 0.01, "the text starts where the path was clicked: {}", tp.start);
+    assert_eq!(s.tool.tool, crate::tools::ToolId::Move, "back to Move after placing, as with the Text tool");
+    s.execute("edit.undo", &json!({})).unwrap();
+    let doc = s.doc().unwrap();
+    assert!(doc.node(v).is_some() && doc.node(t).is_none(), "one undo step brings the path back");
+}
+
+#[test]
+fn a_shape_in_front_whose_path_is_away_from_the_click_does_not_hide_the_path_behind() {
+    let mut s = Session::new();
+    let back = id(s.execute("vector.create", &json!({"path": "M0 0 L200 0", "x": 40, "y": 100})).unwrap());
+    // A filled square over the line: the click is inside it, 20 or more from its outline.
+    let front = id(s.execute("shape.rectangle", &json!({"x": 60, "y": 80, "width": 100, "height": 60})).unwrap());
+    s.set_tool(crate::tools::ToolId::TextOnPath);
+    click(&mut s, 90.0, 100.0);
+    assert!(editing(&s).is_some(), "typing starts on the path behind");
+    let doc = s.doc().unwrap();
+    assert!(doc.node(back).is_none() && doc.node(front).is_some(), "the clicked path took the text");
+}
+
+#[test]
+fn a_path_scaled_more_one_way_is_reached_where_it_shows() {
+    let mut s = Session::new();
+    let v = id(s.execute("vector.create", &json!({"path": "M0 0 L100 100", "x": 0, "y": 0})).unwrap());
+    // Ten times wider than tall: on the page the line runs from (0, 0) to (1000, 100).
+    s.doc_mut().unwrap().get_mut(v).unwrap().transform = figcraft_geom::Affine::scale_non_uniform(10.0, 1.0);
+    s.set_tool(crate::tools::ToolId::TextOnPath);
+    // 5 below the line on the page, halfway along it.
+    click(&mut s, 500.0, 55.0);
+    let t = editing(&s).expect("typing starts on the path");
+    let tp = text_path(&s, t).unwrap();
+    assert!((tp.start - 0.5).abs() < 0.01, "{}", tp.start);
+    // A layer shown at a tenth of its size: its outline is still reached 5 screen pixels away.
+    let mut s = Session::new();
+    let r = id(s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 1000, "height": 1000})).unwrap());
+    s.doc_mut().unwrap().get_mut(r).unwrap().transform = figcraft_geom::Affine::scale(0.1);
+    s.set_tool(crate::tools::ToolId::TextOnPath);
+    click(&mut s, 105.0, 50.0);
+    assert!(editing(&s).is_some() && s.doc().unwrap().node(r).is_none(), "typing starts on the small square's path");
+}
+
+#[test]
+fn paths_a_mask_or_a_turned_clipping_frame_hides_take_no_text() {
+    let mut s = Session::new();
+    // A square masked by a circle in its top-left corner: its right edge doesn't show.
+    let m = id(s.execute("shape.ellipse", &json!({"x": 0, "y": 0, "width": 50, "height": 50})).unwrap());
+    let r = id(s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 100})).unwrap());
+    s.execute("object.mask", &json!({"ids": [m, r]})).unwrap();
+    // A clipping frame turned 45°, with a line outside it: inside the frame's bounding box, but clipped.
+    let f = id(s.execute("frame.create", &json!({"x": 300, "y": 0, "width": 100, "height": 100, "props": {"clip": true}})).unwrap());
+    let l = id(s.execute("vector.create", &json!({"path": "M0 0 L40 0", "x": -60, "y": 50, "parent": f})).unwrap());
+    s.execute("node.set", &json!({"id": f, "props": {"rotation": 45}})).unwrap();
+    let hidden = s.doc().unwrap().world_transform(l) * figcraft_geom::Point::new(20.0, 0.0);
+    let frame_box = s.doc().unwrap().world_bounds(f).unwrap();
+    assert!(frame_box.contains(hidden), "the line's middle is inside the frame's bounding box");
+    s.set_tool(crate::tools::ToolId::TextOnPath);
+    for (x, y) in [(100.0, 50.0), (hidden.x, hidden.y)] {
+        click(&mut s, x, y);
+        assert!(editing(&s).is_none(), "nothing shows at ({x}, {y})");
+    }
+    let doc = s.doc().unwrap();
+    assert!(doc.node(r).is_some() && doc.node(l).is_some());
+}
+
+#[test]
+fn text_on_a_stroke_only_path_gets_the_usual_fill() {
+    let mut s = Session::new();
+    let v = id(s.execute("vector.create", &json!({"path": "M0 0 C50 -50 150 -50 200 0", "x": 40, "y": 100, "props": {"fills": []}})).unwrap());
+    assert!(!s.doc().unwrap().node(v).unwrap().fills.iter().any(|f| f.visible), "a path with a stroke only");
+    s.set_tool(crate::tools::ToolId::TextOnPath);
+    click(&mut s, 40.0, 100.0);
+    let t = editing(&s).expect("typing starts on the path");
+    assert!(s.doc().unwrap().node(t).unwrap().fills.iter().any(|f| f.visible), "the text can be seen");
+}
+
+#[test]
+fn text_on_a_path_left_empty_puts_the_path_back_without_an_undo_step() {
+    let mut s = Session::new();
+    let r = id(s.execute("shape.rectangle", &json!({"x": 100, "y": 100, "width": 100, "height": 100})).unwrap());
+    let locked = id(s.execute("shape.rectangle", &json!({"x": 400, "y": 100, "width": 100, "height": 100, "props": {"locked": true}})).unwrap());
+    let before = (s.doc().unwrap().clone(), s.undo_labels(100).len());
+    s.set_tool(crate::tools::ToolId::TextOnPath);
+    click(&mut s, 400.0, 150.0);
+    assert!(editing(&s).is_none(), "a locked layer's path doesn't take text");
+    // Inside the square, away from its outline, nothing happens either.
+    click(&mut s, 150.0, 150.0);
+    assert!(editing(&s).is_none());
+    click(&mut s, 100.0, 150.0);
+    assert!(editing(&s).is_some() && s.doc().unwrap().node(r).is_none());
+    crate::textedit::end(&mut s).unwrap();
+    assert_eq!(*s.doc().unwrap(), before.0, "the square is back as it was");
+    assert_eq!(s.undo_labels(100).len(), before.1, "no undo step");
+    assert!(s.doc().unwrap().node(locked).is_some());
+    // A double-click on the path, then nothing typed: the same (with this tool and the Text tool).
+    use crate::tools::{PointerEvent, PointerKind, ToolId};
+    for tool in [ToolId::TextOnPath, ToolId::Text] {
+        s.set_tool(tool);
+        click(&mut s, 100.0, 150.0);
+        s.pointer(&PointerEvent::at(PointerKind::DoubleClick, 100.0, 150.0, 1.0)).unwrap();
+        assert!(editing(&s).is_some(), "{tool:?}");
+        crate::textedit::end(&mut s).unwrap();
+        assert_eq!(*s.doc().unwrap(), before.0, "{tool:?}: the file is back as it was");
+        assert_eq!(s.undo_labels(100).len(), before.1, "{tool:?}: no undo step");
+    }
+}
+
+#[test]
+fn scaling_text_scales_its_path() {
+    let mut s = Session::new();
+    let t = id(s.execute("text.create", &json!({"text": "Around", "x": 0, "y": 0})).unwrap());
+    let v = id(s.execute("vector.create", &json!({"path": "M0 0 C50 -50 150 -50 200 0", "x": 40, "y": 100})).unwrap());
+    s.execute("text.onPath", &json!({"ids": [t, v]})).unwrap();
+    let w0 = figcraft_geom::Shape::bounding_box(&text_path(&s, t).unwrap().path()).width();
+    s.execute("transform.scale", &json!({"ids": [t], "factor": 2.0})).unwrap();
+    let w1 = figcraft_geom::Shape::bounding_box(&text_path(&s, t).unwrap().path()).width();
+    assert!((w1 - w0 * 2.0).abs() < 1.0, "path width {w0} -> {w1}");
+}
+
 #[test]
 fn svg_text_paths_import_as_text_on_a_path() {
     // SVG text is parsed with Inter standing in for every family (CI has no fonts).
@@ -79,6 +234,83 @@ fn svg_text_paths_import_as_text_on_a_path() {
     assert_eq!(t.align_h, figcraft_doc::TextAlignH::Center);
 }
 
+/// A text layer with its own green fill bound to `ink` and a layer blur, and a curve; the
+/// variables `ink` and `shadow` exist.
+fn text_and_curve(s: &mut Session, path_props: Value) -> (NodeId, NodeId) {
+    let t = id(s.execute("text.create", &json!({"text": "Around", "x": 0, "y": 0})).unwrap());
+    let v = id(s.execute("vector.create", &json!({"path": "M0 0 C50 -50 150 -50 200 0", "x": 40, "y": 100, "props": path_props})).unwrap());
+    s.execute("variable.createCollection", &json!({"name": "Paint"})).unwrap();
+    for (name, value) in [("ink", "#00FF00"), ("shadow", "#FF000080")] {
+        s.execute("variable.create", &json!({"collection": "Paint", "name": name, "type": "color", "value": value})).unwrap();
+    }
+    s.execute("variable.bind", &json!({"ids": [t], "field": "fills/0/color", "variable": "ink"})).unwrap();
+    s.execute("effect.add", &json!({"ids": [t], "type": "layerBlur"})).unwrap();
+    (t, v)
+}
+
+#[test]
+fn text_put_on_a_filled_path_takes_its_fill_and_effects() {
+    let mut s = Session::new();
+    let (t, v) = text_and_curve(&mut s, json!({"fill": "#FF0000"}));
+    let brand = s.execute("style.create", &json!({"type": "paint", "name": "Brand", "value": "#3366FF"})).unwrap()["id"].clone();
+    s.execute("style.apply", &json!({"ids": [v], "style": brand})).unwrap();
+    s.execute("effect.add", &json!({"ids": [v], "type": "dropShadow"})).unwrap();
+    s.execute("variable.bind", &json!({"ids": [v], "field": "effects/0/color", "variable": "shadow"})).unwrap();
+    let path = s.doc().unwrap().node(v).unwrap().clone();
+    let text = s.doc().unwrap().node(t).unwrap().clone();
+    assert!(path.styles.fill.is_some() && path.bound.contains_key("effects/0/color"));
+    s.execute("text.onPath", &json!({"ids": [t, v]})).unwrap();
+    let n = s.doc().unwrap().node(t).unwrap();
+    // "the vector object's fill and effects are automatically transferred to the text layer"
+    assert_eq!((&n.fills, &n.styles.fill), (&path.fills, &path.styles.fill), "the path's fill and its style");
+    assert_eq!((&n.effects, &n.styles.effect), (&path.effects, &path.styles.effect), "the path's effects");
+    assert_eq!(n.bound, path.bound, "the path's bindings replace the text's fill binding");
+    s.execute("edit.undo", &json!({})).unwrap();
+    let n = s.doc().unwrap().node(t).unwrap();
+    assert_eq!((&n.fills, &n.styles.fill), (&text.fills, &text.styles.fill), "undo gives the text its own fill back");
+    assert_eq!((&n.effects, &n.styles.effect), (&text.effects, &text.styles.effect), "undo gives the text its own effects back");
+    assert_eq!(n.bound, text.bound, "undo gives the text its own fill binding back");
+}
+
+#[test]
+fn text_put_on_a_stroke_only_path_keeps_its_own_fill_and_effects() {
+    let mut s = Session::new();
+    let (t, v) = text_and_curve(&mut s, json!({"fills": []}));
+    let text = s.doc().unwrap().node(t).unwrap().clone();
+    assert!(!text.fills.is_empty() && !text.effects.is_empty());
+    s.execute("text.onPath", &json!({"ids": [t, v]})).unwrap();
+    let n = s.doc().unwrap().node(t).unwrap();
+    assert_eq!((&n.fills, &n.effects, &n.bound), (&text.fills, &text.effects, &text.bound), "a path with no fill or effects to give");
+}
+
+#[test]
+fn text_put_on_a_path_with_an_empty_effect_style_keeps_its_own_effects() {
+    let mut s = Session::new();
+    let (t, v) = text_and_curve(&mut s, json!({"fills": []}));
+    let none = s.execute("style.create", &json!({"type": "effect", "name": "None", "value": []})).unwrap()["id"].clone();
+    s.execute("style.apply", &json!({"ids": [v], "style": none})).unwrap();
+    let path = s.doc().unwrap().node(v).unwrap().clone();
+    assert!(path.effects.is_empty() && path.styles.effect.is_some());
+    let text = s.doc().unwrap().node(t).unwrap().clone();
+    s.execute("text.onPath", &json!({"ids": [t, v]})).unwrap();
+    let n = s.doc().unwrap().node(t).unwrap();
+    assert_eq!((&n.effects, &n.styles.effect), (&text.effects, &text.styles.effect), "a path whose effect style draws no effects");
+}
+
+#[test]
+fn text_put_on_a_path_takes_a_fill_binding_made_through_fills() {
+    let mut s = Session::new();
+    let (t, v) = text_and_curve(&mut s, json!({"fill": "#FF0000"}));
+    s.execute("variable.bind", &json!({"ids": [v], "field": "fills", "variable": "shadow"})).unwrap();
+    s.execute("variable.bind", &json!({"ids": [t], "field": "fills", "variable": "ink"})).unwrap();
+    let path = s.doc().unwrap().node(v).unwrap().clone();
+    assert!(path.bound.contains_key("fills"));
+    s.execute("text.onPath", &json!({"ids": [t, v]})).unwrap();
+    let n = s.doc().unwrap().node(t).unwrap();
+    assert_eq!(n.bound, path.bound, "the path's `fills` binding replaces the text's");
+    assert_eq!(n.fills, path.fills);
+}
+
 #[test]
 fn pattern_fills_tile_their_source_live() {
     let mut s = Session::new();
@@ -131,3 +363,18 @@ fn a_pattern_of_itself_draws_nothing_instead_of_recursing() {
     assert!(figcraft_svg::export_svg(doc, &[r], &figcraft_svg::SvgOptions::default()).is_some());
     assert!(figcraft_pdf::export_nodes_pdf(doc, &[r]).is_ok());
 }
+
+#[test]
+fn the_text_on_a_path_tool_carries_a_fill_bound_through_fills() {
+    let mut s = Session::new();
+    let v = id(s.execute("vector.create", &json!({"path": "M0 0 L200 0", "x": 40, "y": 100, "props": {"fill": "#FF0000"}})).unwrap());
+    s.execute("variable.createCollection", &json!({"name": "Paint"})).unwrap();
+    s.execute("variable.create", &json!({"collection": "Paint", "name": "ink", "type": "color", "value": "#00FF00"})).unwrap();
+    s.execute("variable.bind", &json!({"ids": [v], "field": "fills", "variable": "ink"})).unwrap();
+    let bound = s.doc().unwrap().node(v).unwrap().bound.clone();
+    assert!(bound.contains_key("fills"));
+    s.set_tool(crate::tools::ToolId::TextOnPath);
+    click(&mut s, 90.0, 103.0);
+    let t = editing(&s).expect("typing starts on the path");
+    assert_eq!(s.doc().unwrap().node(t).unwrap().bound, bound, "the fill keeps following its variable");
+}
diff --git a/crates/engine/src/duplicate_spacing_tests.rs b/crates/engine/src/duplicate_spacing_tests.rs
index b65fbb64..4c62179a 100644
--- a/crates/engine/src/duplicate_spacing_tests.rs
+++ b/crates/engine/src/duplicate_spacing_tests.rs
@@ -157,3 +157,49 @@ fn an_alt_drag_into_auto_layout_sets_no_step() {
     cmd_d(&mut s);
     assert_eq!(s.doc().unwrap().node(f).unwrap().children.len(), n + 1, "Duplicate still adds one to the flow");
 }
+
+/// Drag `from` by `by` with no modifier: moving the selection, not copying it.
+fn drag_move(s: &mut Session, from: (f64, f64), by: (f64, f64)) {
+    let ev = |kind, (x, y): (f64, f64)| PointerEvent::at(kind, x, y, 1.0);
+    s.pointer(&ev(PointerKind::Down, from)).unwrap();
+    for k in 1..=4 {
+        let t = f64::from(k) / 4.0;
+        s.pointer(&ev(PointerKind::Move, (from.0 + by.0 * t, from.1 + by.1 * t))).unwrap();
+    }
+    s.pointer(&ev(PointerKind::Up, (from.0 + by.0, from.1 + by.1))).unwrap();
+}
+
+/// The reported path (#567): Cmd+D, drag the copy with the mouse, Cmd+D again. The other tests
+/// here set the copy's position with `node.set` or Alt-drag it; dragging is how it is usually done,
+/// and the step is measured from where the copy ended up, whichever way it got there.
+#[test]
+fn duplicate_repeats_the_step_set_by_dragging_the_copy() {
+    let mut s = Session::new();
+    let a = rect(&mut s, 0.0, 0.0);
+    ex(&mut s, "select.set", json!({"ids": [a]}));
+    let c1 = cmd_d(&mut s);
+    assert_eq!(at(&s, c1), (0.0, 0.0), "the first copy lands in place");
+
+    drag_move(&mut s, (50.0, 50.0), (150.0, 20.0));
+    assert_eq!(at(&s, c1), (150.0, 20.0), "the drag moved the copy, it did not make another one");
+    assert_eq!(s.selection(), vec![c1], "and left it selected");
+    assert_eq!(at(&s, a), (0.0, 0.0), "the original stays");
+
+    let c2 = cmd_d(&mut s);
+    assert_eq!(at(&s, c2), (300.0, 40.0), "the next one as far again");
+    let c3 = cmd_d(&mut s);
+    assert_eq!(at(&s, c3), (450.0, 60.0), "and again");
+}
+
+/// And a step set with the arrow keys, which is how a small offset is usually made exact.
+#[test]
+fn duplicate_repeats_a_nudged_step() {
+    let mut s = Session::new();
+    let a = rect(&mut s, 0.0, 0.0);
+    ex(&mut s, "select.set", json!({"ids": [a]}));
+    let c1 = cmd_d(&mut s);
+    ex(&mut s, "transform.nudge", json!({"dx": 40, "dy": 0}));
+    assert_eq!(at(&s, c1), (40.0, 0.0));
+    let c2 = cmd_d(&mut s);
+    assert_eq!(at(&s, c2), (80.0, 0.0), "the nudge is the step");
+}
diff --git a/crates/engine/src/effects_tests.rs b/crates/engine/src/effects_tests.rs
index be69fac2..607b7711 100644
--- a/crates/engine/src/effects_tests.rs
+++ b/crates/engine/src/effects_tests.rs
@@ -51,6 +51,32 @@ fn effect_set_edits_noise_texture_and_glass() {
     assert!(s.execute("effect.set", &json!({"ids": [r], "index": 0, "effect": {"type": "glass", "depth": "deep"}})).is_err());
 }
 
+/// A key an effect doesn't have is refused, naming what it takes: serde dropped it without a word,
+/// so a shadow given `offsetX`/`offsetY` (the names variable bindings use) kept the default offset.
+#[test]
+fn effects_refuse_keys_they_dont_have() {
+    let mut s = Session::new();
+    let r = rect(&mut s);
+    let shadow = json!({"type": "dropShadow", "color": "#00000040", "offsetX": 0, "offsetY": 1, "radius": 3});
+    let err = s.execute("node.set", &json!({"ids": [r], "props": {"effects": [shadow]}})).unwrap_err().to_string();
+    assert!(err.contains("effects[0]") && err.contains("offsetX, offsetY") && err.contains("offset"), "{err}");
+    assert!(s.doc().unwrap().node(r).unwrap().effects.is_empty(), "nothing stored");
+    let err = s.execute("effect.add", &json!({"ids": [r], "effect": {"type": "layerBlur", "radious": 8}})).unwrap_err().to_string();
+    assert!(err.contains("radious"), "{err}");
+    s.execute("effect.add", &json!({"ids": [r], "type": "dropShadow"})).unwrap();
+    let err = s.execute("effect.set", &json!({"ids": [r], "index": 0, "effect": {"type": "dropShadow", "spred": 2}})).unwrap_err().to_string();
+    assert!(err.contains("spred"), "{err}");
+    // Every kind's own keys still go in, camelCase or snake_case, and so does what inspect reports.
+    for ty in ["innerShadow", "layerBlur", "backgroundBlur", "noise", "texture", "glass"] {
+        s.execute("effect.add", &json!({"ids": [r], "type": ty})).unwrap();
+    }
+    let reported = crate::inspect::node_json(s.doc().unwrap(), r, 0)["effects"].clone();
+    s.execute("node.set", &json!({"ids": [r], "props": {"effects": reported}})).unwrap();
+    let camel = json!({"type": "dropShadow", "offset": [0, 1], "showBehind": true, "visible": true});
+    let snake = json!({"type": "innerShadow", "offset": [0, 1], "show_behind": false});
+    s.execute("node.set", &json!({"ids": [r], "props": {"effects": [camel, snake]}})).unwrap();
+}
+
 #[test]
 fn scaling_scales_grain_and_glass() {
     let mut s = Session::new();
diff --git a/crates/engine/src/error.rs b/crates/engine/src/error.rs
new file mode 100644
index 00000000..7f2ab1d4
--- /dev/null
+++ b/crates/engine/src/error.rs
@@ -0,0 +1,51 @@
+use super::*;
+
+#[derive(Debug, thiserror::Error)]
+pub enum EngineError {
+    #[error("unknown command `{0}`")]
+    UnknownCommand(String),
+    #[error("command `{0}` is not available right now: {1}")]
+    Disabled(String, String),
+    #[error("invalid parameters for `{cmd}`: {msg}")]
+    BadParams { cmd: String, msg: String },
+    #[error("no open document")]
+    NoDocument,
+    #[error("no such node {0}")]
+    NoNode(NodeId),
+    #[error("{0}")]
+    Other(String),
+    /// A command run in the background sent a request to a server and runs again with the answer
+    /// ([`background`]); never returned to other callers.
+    #[error("waiting for the server")]
+    Waiting,
+    /// A bug: the command panicked. The document was rolled back.
+    #[error("internal error in `{cmd}`: {msg} (the document was left as it was before; please report this bug)")]
+    Internal { cmd: String, msg: String },
+}
+
+impl From<figcraft_doc::DocError> for EngineError {
+    fn from(e: figcraft_doc::DocError) -> Self {
+        match e {
+            figcraft_doc::DocError::NoNode(id) => EngineError::NoNode(id),
+            other => EngineError::Other(other.to_string()),
+        }
+    }
+}
+
+impl EngineError {
+    /// This error from step `step` of a batch, saying so in its message; the kind stays (errors
+    /// without a message stay as they are).
+    pub(crate) fn at_step(self, step: usize) -> Self {
+        match self {
+            EngineError::BadParams { cmd, msg } => EngineError::BadParams { cmd, msg: format!("step {step}: {msg}") },
+            EngineError::Other(msg) => EngineError::Other(format!("step {step}: {msg}")),
+            e => e,
+        }
+    }
+}
+
+pub type Result<T> = std::result::Result<T, EngineError>;
+
+pub fn bad(cmd: &str, msg: impl Into<String>) -> EngineError {
+    EngineError::BadParams { cmd: cmd.to_string(), msg: msg.into() }
+}
diff --git a/crates/engine/src/export_behaviour_tests.rs b/crates/engine/src/export_behaviour_tests.rs
index 6896ce3e..ec1a56e9 100644
--- a/crates/engine/src/export_behaviour_tests.rs
+++ b/crates/engine/src/export_behaviour_tests.rs
@@ -256,6 +256,43 @@ fn masks_and_slices_export_what_shows() {
     let _ = under;
 }
 
+/// Ignore overlapping layers (contents only) on a slice: inside a frame or group the slice exports
+/// only what is in that container; off, or on the page, everything in its area.
+#[test]
+fn a_slice_in_a_frame_or_group_exports_only_that_container() {
+    let mut s = Session::new();
+    let slice_in = |s: &mut Session, parent: Option<NodeId>, x: f64| {
+        let mut p = json!({"type": "slice", "x": x, "y": 25, "width": 50, "height": 50});
+        if let Some(parent) = parent {
+            p["parent"] = json!(parent);
+        }
+        id(&ex(s, "node.create", p))
+    };
+    let at = |s: &mut Session, p: Value| pixels(&export(s, p)).get_pixel(40, 40).0;
+    // A frame holding a red square and a slice, with a blue square on the page above it.
+    let f = frame(&mut s, 0.0, 0.0, 100.0, 100.0, false);
+    rect(&mut s, 0.0, 0.0, 100.0, 100.0, "#FF0000", Some(f));
+    let in_frame = slice_in(&mut s, Some(f), 25.0);
+    rect(&mut s, 50.0, 50.0, 100.0, 100.0, "#0000FF", None);
+    assert_eq!(png_size(&export(&mut s, json!({"ids": [in_frame]}))), (50, 50), "the slice still exports its own area");
+    assert_eq!(at(&mut s, json!({"ids": [in_frame]})), [255, 0, 0, 255], "on by default: only the frame's content, the blue square left out");
+    assert_eq!(at(&mut s, json!({"ids": [in_frame], "contentsOnly": false})), [0, 0, 255, 255], "off: everything in the slice's area");
+    // The same in a group.
+    let red = rect(&mut s, 300.0, 0.0, 100.0, 100.0, "#FF0000", None);
+    let grouped = slice_in(&mut s, None, 325.0);
+    let g = id(&ex(&mut s, "object.group", json!({"ids": [red, grouped]})));
+    assert_eq!(s.doc().unwrap().node(grouped).unwrap().parent, Some(g));
+    rect(&mut s, 350.0, 50.0, 100.0, 100.0, "#0000FF", None);
+    assert_eq!(at(&mut s, json!({"ids": [grouped]})), [255, 0, 0, 255], "in a group: only the group's content");
+    assert_eq!(at(&mut s, json!({"ids": [grouped], "contentsOnly": false})), [0, 0, 255, 255], "off: everything in its area");
+    // On the page the option has no effect.
+    rect(&mut s, 600.0, 0.0, 100.0, 100.0, "#FF0000", None);
+    let top = slice_in(&mut s, None, 625.0);
+    rect(&mut s, 650.0, 50.0, 100.0, 100.0, "#0000FF", None);
+    assert_eq!(at(&mut s, json!({"ids": [top]})), [0, 0, 255, 255], "on the page: everything in its area, with the option on");
+    assert_eq!(at(&mut s, json!({"ids": [top], "contentsOnly": false})), [0, 0, 255, 255], "on the page: everything in its area, with it off");
+}
+
 #[test]
 fn several_layers_and_frames_to_pdf() {
     let mut s = Session::new();
diff --git a/crates/engine/src/extensions.rs b/crates/engine/src/extensions.rs
new file mode 100644
index 00000000..aeac5e34
--- /dev/null
+++ b/crates/engine/src/extensions.rs
@@ -0,0 +1,3 @@
+pub mod plugin_directory;
+pub mod plugins;
+pub mod widgets;
diff --git a/crates/engine/src/plugin_directory.rs b/crates/engine/src/extensions/plugin_directory.rs
similarity index 95%
rename from crates/engine/src/plugin_directory.rs
rename to crates/engine/src/extensions/plugin_directory.rs
index c3bf7dc4..2f721fea 100644
--- a/crates/engine/src/plugin_directory.rs
+++ b/crates/engine/src/extensions/plugin_directory.rs
@@ -147,6 +147,9 @@ fn install(s: &mut Session, p: &Value) -> Result<Value> {
 /// Keep an installed plugin's files in its own folder under the install folder (named by the hash
 /// of its id, so no id reaches the file system), its module renamed; the manifest's path. Without
 /// an install folder (the browser, the CLI and tests) the plugin lasts for the session.
+// The install folder is the app's own (set by the desktop app, never by a command), so automation
+// roots don't apply to it.
+#[allow(clippy::disallowed_methods)]
 fn save(s: &Session, m: &mut Manifest, b: &Bundle) -> std::result::Result<Option<String>, String> {
     let Some(root) = s.plugins.install_dir.clone() else { return Ok(None) };
     #[cfg(not(target_arch = "wasm32"))]
@@ -189,6 +192,7 @@ fn save(s: &Session, m: &mut Manifest, b: &Bundle) -> std::result::Result<Option
 }
 
 /// Delete the folder of a plugin installed from a directory (only one inside the install folder).
+#[allow(clippy::disallowed_methods)]
 pub(crate) fn delete_installed(s: &Session, p: &InstalledPlugin) {
     #[cfg(not(target_arch = "wasm32"))]
     if let (Some(_), Some(path), Some(root)) = (&p.source, &p.path, &s.plugins.install_dir)
@@ -208,7 +212,7 @@ pub(crate) fn delete_installed(s: &Session, p: &InstalledPlugin) {
 fn bundle_from_disk(cmd: &str, path: &str) -> Result<Bundle> {
     use crate::plugins::{module_file, read_file};
     let mut file = std::path::PathBuf::from(crate::library::absolute_path(path.trim()));
-    if file.is_dir() {
+    if crate::file_access::is_dir(&file) {
         file.push(MANIFEST_FILE);
     }
     let text =
@@ -217,9 +221,12 @@ fn bundle_from_disk(cmd: &str, path: &str) -> Result<Bundle> {
     let wasm = module_file(&file, &m)?;
     let mut assets = Vec::new();
     let dir = file.parent().map(|d| d.join(ASSETS));
-    if let Some(entries) = dir.as_ref().and_then(|d| std::fs::read_dir(d).ok()) {
-        let mut names: Vec<(String, std::path::PathBuf)> =
-            entries.flatten().filter(|e| e.path().is_file()).map(|e| (e.file_name().to_string_lossy().into_owned(), e.path())).collect();
+    if let Some(entries) = dir.as_ref().and_then(|d| crate::file_access::read_dir(d).ok()) {
+        let mut names: Vec<(String, std::path::PathBuf)> = entries
+            .into_iter()
+            .filter(|p| crate::file_access::metadata(p).is_ok_and(|m| m.is_file()))
+            .map(|p| (p.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default(), p))
+            .collect();
         names.sort();
         if names.len() > MAX_ASSETS {
             return Err(bad(cmd, format!("a plugin's assets folder holds at most {MAX_ASSETS} files")));
diff --git a/crates/engine/src/plugins.rs b/crates/engine/src/extensions/plugins.rs
similarity index 78%
rename from crates/engine/src/plugins.rs
rename to crates/engine/src/extensions/plugins.rs
index f1c4075e..4dbfa7e6 100644
--- a/crates/engine/src/plugins.rs
+++ b/crates/engine/src/extensions/plugins.rs
@@ -107,10 +107,18 @@ const DENIED: &[&str] = &[
     "plugins.",
     "libraries.",
     "library.add",
+    // Uploads the open document to a server.
+    "library.publishToServer",
     "edit.undo",
     "edit.redo",
     "edit.repeat",
     "command.batch",
+    // Runs other commands inside (duplicate, edit, export), past this policy, like a batch.
+    "data.fill",
+    // Network sessions, online files and their recovery copies on disk.
+    "collab.",
+    // Opens files in new windows.
+    "window.",
     "view.theme",
 ];
 /// Read-only exceptions to [`DENIED`].
@@ -128,6 +136,20 @@ fn refusal(m: &Manifest, command: &str, params: &Value) -> Option<String> {
     if command == "image.place" && get(params, "path").is_some() {
         return Some("plugins can't read files: pass the image as `data`".into());
     }
+    if command == "text.loadFont" && get(params, "path").is_some() {
+        return Some("plugins can't read files: pass the font as `data`".into());
+    }
+    // `path` here is a file on disk (elsewhere it is a vector path or an action's place).
+    if matches!(command, "variable.export" | "codeConnect.export" | "component.playground") && get(params, "path").is_some() {
+        return Some("plugins can't write files: leave out `path` to get the result back".into());
+    }
+    if command == "codeConnect.import" && get(params, "path").is_some() {
+        return Some("plugins can't read files: pass the connections as `json`".into());
+    }
+    // Variables JSON may be given as a path: only objects and JSON text for plugins.
+    if command == "variable.import" && get(params, "variables").and_then(Value::as_str).is_some_and(|t| !t.trim_start().starts_with('{')) {
+        return Some("plugins can't read files: pass the variables JSON itself".into());
+    }
     if !m.permissions.allows(command) {
         return Some(format!("`{command}` isn't in the commands {} asked permission for", m.name));
     }
@@ -140,7 +162,8 @@ fn refusal(m: &Manifest, command: &str, params: &Value) -> Option<String> {
 /// Whether `params` set layer data (`pluginData`, anywhere in them) under a widget's own keys.
 fn writes_widget_data(params: &Value, depth: usize) -> bool {
     let own = |data: &Value| data.as_object().is_some_and(|m| m.keys().any(|k| k.starts_with(crate::widgets::DATA_PREFIX)));
-    depth < 64
+    // serde_json refuses nesting past 128, so nothing deeper can reach here.
+    depth < 128
         && match params {
             Value::Object(m) => m.iter().any(|(k, v)| (k == "pluginData" && own(v)) || writes_widget_data(v, depth + 1)),
             Value::Array(a) => a.iter().any(|v| writes_widget_data(v, depth + 1)),
@@ -153,6 +176,39 @@ fn writes_widget_data(params: &Value, depth: usize) -> bool {
 struct EngineHost<'s> {
     s: &'s mut Session,
     manifest: &'s Manifest,
+    /// Files offered for saving in this call.
+    saves: u32,
+}
+
+/// Longest file name a plugin may suggest, in characters.
+const MAX_SAVE_NAME: usize = 128;
+/// Longest MIME type a plugin may name, in bytes.
+const MAX_SAVE_MIME: usize = 100;
+/// Largest file a plugin may offer for saving, in bytes (the sandbox's message limit).
+const MAX_SAVE_BYTES: usize = 16 * 1024 * 1024;
+/// Files a plugin may offer per call.
+const MAX_SAVES: u32 = 1;
+
+/// A file name a plugin suggested, cleaned up: a bare name without folders, drive letters, `..` or
+/// characters no file system takes. `None` when nothing usable is left.
+pub(crate) fn sanitize_save_name(name: &str) -> Option<String> {
+    let name = name.trim();
+    let bad = name.is_empty()
+        || name.chars().count() > MAX_SAVE_NAME
+        || name == "."
+        || name.contains("..")
+        || name.chars().any(|c| c.is_control() || crate::cmd::file::FORBIDDEN_FILE_NAME_CHARS.contains(c));
+    if bad { None } else { Some(name.to_string()) }
+}
+
+/// `mime` when it looks like `type/subtype` in ASCII, else the generic binary type.
+fn sanitize_mime(mime: &str) -> String {
+    let mime = mime.trim();
+    let token = |t: &str| !t.is_empty() && t.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '.' | '+' | '-' | '_'));
+    match mime.split_once('/') {
+        Some((a, b)) if mime.len() <= MAX_SAVE_MIME && token(a) && token(b) => mime.to_ascii_lowercase(),
+        _ => "application/octet-stream".into(),
+    }
 }
 
 impl figcraft_plugin::Host for EngineHost<'_> {
@@ -226,6 +282,27 @@ impl figcraft_plugin::Host for EngineHost<'_> {
         }
         Ok(())
     }
+
+    fn save_file(&mut self, name: &str, mime: &str, data: &[u8]) -> std::result::Result<(), String> {
+        if !self.manifest.permissions.save_file {
+            return Err(format!("{} didn't ask permission to save files (`permissions.saveFile`)", self.manifest.name));
+        }
+        let name = sanitize_save_name(name).ok_or_else(|| {
+            format!("not a usable file name: use a plain name of 1–{MAX_SAVE_NAME} characters without folders or `/ \\ : .. < > \" | ? *`")
+        })?;
+        if data.len() > MAX_SAVE_BYTES {
+            return Err(format!("a file to save is limited to {} MB", MAX_SAVE_BYTES / (1024 * 1024)));
+        }
+        if self.saves >= MAX_SAVES {
+            return Err("a plugin can offer one file per run".into());
+        }
+        self.saves += 1;
+        use base64::Engine as _;
+        let data = base64::engine::general_purpose::STANDARD.encode(data);
+        // The app asks the user where it goes; programmatic callers drop the request.
+        self.s.request_ui("dialog.pluginSave", json!({"plugin": self.manifest.id, "name": name, "mime": sanitize_mime(mime), "data": data}));
+        Ok(())
+    }
 }
 
 /// The installed plugin `id`.
@@ -236,12 +313,11 @@ pub(crate) fn installed<'a>(s: &'a Session, cmd: &str, id: &str) -> Result<&'a I
 /// Read a file of at most `max` bytes.
 #[cfg(not(target_arch = "wasm32"))]
 pub(crate) fn read_file(path: &std::path::Path, max: usize) -> Result<Vec<u8>> {
-    let shown = path.display();
-    let meta = std::fs::metadata(path).map_err(|e| EngineError::Other(format!("{shown}: {e}")))?;
+    let meta = crate::file_access::metadata(path)?;
     if !meta.is_file() || meta.len() > max as u64 {
-        return Err(EngineError::Other(format!("{shown}: not a file of at most {} KB", max / 1024)));
+        return Err(EngineError::Other(format!("{}: not a file of at most {} KB", path.display(), max / 1024)));
     }
-    std::fs::read(path).map_err(|e| EngineError::Other(format!("{shown}: {e}")))
+    crate::file_access::read(path)
 }
 
 /// The manifest at `path` (the file, or the folder holding `figcraft-plugin.json`), its absolute
@@ -249,7 +325,7 @@ pub(crate) fn read_file(path: &std::path::Path, max: usize) -> Result<Vec<u8>> {
 #[cfg(not(target_arch = "wasm32"))]
 fn load_from_disk(cmd: &str, path: &str) -> Result<(Manifest, String, Vec<u8>)> {
     let mut file = std::path::PathBuf::from(crate::library::absolute_path(path.trim()));
-    if file.is_dir() {
+    if crate::file_access::is_dir(&file) {
         file.push(MANIFEST_FILE);
     }
     let text = read_file(&file, figcraft_plugin::manifest::MAX_MANIFEST_BYTES)?;
@@ -280,10 +356,22 @@ pub(crate) fn module_of(s: &Session, p: &InstalledPlugin) -> Result<Arc<Vec<u8>>
     let Some(path) = &p.path else {
         return Err(EngineError::Other(format!("{} was imported without a manifest file: import it again", p.manifest.name)));
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    return module_file(std::path::Path::new(path), &p.manifest).map(Arc::new);
-    #[cfg(target_arch = "wasm32")]
-    return Err(EngineError::Other(format!("{path}: there are no files in the browser")));
+    module_from_disk(s, p, path)
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn module_from_disk(s: &Session, p: &InstalledPlugin, path: &str) -> Result<Arc<Vec<u8>>> {
+    let file = std::path::Path::new(path);
+    let read = || module_file(file, &p.manifest).map(Arc::new);
+    // A plugin installed from a directory lives in the app's own install folder, not among the
+    // files automation roots confine.
+    let own = p.source.is_some() && s.plugins.install_dir.as_deref().is_some_and(|d| crate::file_access::within_app_folder(file, d));
+    if own { crate::file_access::app_owned(read) } else { read() }
+}
+
+#[cfg(target_arch = "wasm32")]
+fn module_from_disk(_: &Session, _: &InstalledPlugin, path: &str) -> Result<Arc<Vec<u8>>> {
+    Err(EngineError::Other(format!("{path}: there are no files in the browser")))
 }
 
 /// The sandbox limits for a run, with `fuel` lowering the instruction budget.
@@ -359,6 +447,7 @@ pub(crate) fn register(s: &mut Session, entry: InstalledPlugin, wasm: Vec<u8>) -
     match list.iter_mut().find(|x| x.manifest.id == id) {
         Some(slot) => {
             *slot = entry;
+            s.prefs.plugin_settings.remove(&id);
             true
         }
         None => {
@@ -424,14 +513,21 @@ pub(crate) fn call_plugin(
     input: &str,
 ) -> std::result::Result<RunOutput, (EngineError, bool)> {
     let mut usable = false;
-    s.grouped(label, |s| {
-        let mut host = EngineHost { s, manifest: m };
-        instance.call(input, &mut host).map_err(|e| {
-            usable = matches!(e, PluginError::Failed(_));
-            plugin_error(&m.name, e)
+    let ui_before = s.ui_requests.len();
+    let r = s
+        .grouped(label, |s| {
+            let mut host = EngineHost { s, manifest: m, saves: 0 };
+            instance.call(input, &mut host).map_err(|e| {
+                usable = matches!(e, PluginError::Failed(_));
+                plugin_error(&m.name, e)
+            })
         })
-    })
-    .map_err(|e| (e, usable))
+        .map_err(|e| (e, usable));
+    // A failed run opens no dialog (a file it offered to save is dropped with it).
+    if r.is_err() {
+        s.ui_requests.truncate(ui_before);
+    }
+    r
 }
 
 /// What `plugin.run` and `plugin.event` return.
@@ -566,3 +662,28 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!("plugins.manage", "Manage plugins…", "{}  opens the plugins window; returns the list like `plugin.list`", false, manage),
     ]
 }
+
+#[cfg(test)]
+mod refusal_tests {
+    use super::*;
+
+    #[test]
+    fn read_only_plugin_cannot_publish_to_server() {
+        let m = Manifest::parse(r#"{"id":"x.y","name":"X","main":"plugin.wasm"}"#).unwrap();
+        let r = refusal(&m, "library.publishToServer", &json!({}));
+        assert!(r.is_some(), "library.publishToServer uploads the document and must be refused");
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn widget_data_is_found_at_any_depth_serde_accepts() {
+        let depth = 100;
+        let text = format!("{}{{\"pluginData\":{{\"{}x\":1}}}}{}", "{\"a\":".repeat(depth), crate::widgets::DATA_PREFIX, "}".repeat(depth));
+        let v: Value = serde_json::from_str(&text).unwrap();
+        assert!(writes_widget_data(&v, 0));
+    }
+}
diff --git a/crates/engine/src/widgets.rs b/crates/engine/src/extensions/widgets.rs
similarity index 61%
rename from crates/engine/src/widgets.rs
rename to crates/engine/src/extensions/widgets.rs
index c1ccd2a3..5d824363 100644
--- a/crates/engine/src/widgets.rs
+++ b/crates/engine/src/extensions/widgets.rs
@@ -6,13 +6,18 @@
 //! of it the plugin named as a target calls the plugin back with that state, in a fresh sandbox
 //! (deterministic: the state is all it remembers), as one undo step; the plugin hands back the new
 //! state and layers. A callback can only rebuild its own widget; other layers change only through
-//! the commands its manifest permits. See `docs/plugins.md`.
+//! the commands its manifest permits. Since API 4 a text layer can be an editable field (edited on
+//! the canvas like any text, or with `widget.setText`: the value goes into the state under the
+//! field's name and the plugin is called back), and a widget can have a small property menu
+//! (actions, toggles, a colour from a few) shown while it's selected (`widget.menu`). See
+//! `docs/plugins.md`.
 
 use figcraft_color::{ImageScaleMode, Paint};
 use figcraft_doc::{Document, Node, NodeId, NodeKind, TextData};
 use figcraft_geom::{Affine, Point};
-use figcraft_plugin::widget::{MAX_IMAGE_BYTES, MAX_STATE_BYTES};
+use figcraft_plugin::widget::{MAX_IMAGE_BYTES, MAX_STATE_BYTES, check_menu, check_state, clean_field};
 use figcraft_plugin::{Instance, Manifest, RunOutput, WidgetKind, WidgetNode, WidgetRender};
+pub use figcraft_plugin::{MenuItem, MenuKind};
 use serde_json::{Map, Value, json};
 
 use crate::cmd::CommandSpec;
@@ -25,8 +30,12 @@ pub const DATA_PREFIX: &str = "figcraft.widget";
 /// On a widget's own layer: its plugin's id, and its state (JSON).
 const PLUGIN: &str = "figcraft.widget";
 const STATE: &str = "figcraft.widget.state";
+/// On a widget's own layer: its property menu (JSON).
+const MENU: &str = "figcraft.widget.menu";
 /// On a layer inside a widget: the name its plugin gets when it's clicked.
 const TARGET: &str = "figcraft.widget.target";
+/// On a text layer inside a widget: the name of the editable field it is.
+const FIELD: &str = "figcraft.widget.field";
 /// Images in a widget are at most this many pixels on a side.
 const MAX_IMAGE_SIDE: u32 = 4096;
 
@@ -40,18 +49,44 @@ pub fn widget_of(doc: &Document, id: NodeId) -> Option<NodeId> {
     std::iter::once(id).chain(doc.ancestors(id)).find(|a| doc.node(*a).is_some_and(is_widget))
 }
 
-/// The clickable part of a widget at page point `p`, given the layer a click there hits: the widget
-/// and its target. The layers inside a widget are locked, so the hit stops at the widget itself;
-/// the front-most target whose box holds the point wins.
-pub fn target_at(doc: &Document, hit: NodeId, p: Point) -> Option<(NodeId, String)> {
+/// The part of a widget at page point `p` marked with layer data `key`, given the layer a click
+/// there hits: the widget, the part and its name. The layers inside a widget are locked, so the
+/// hit stops at the widget itself; the front-most part whose box holds the point wins.
+fn part_at(doc: &Document, hit: NodeId, p: Point, key: &str) -> Option<(NodeId, NodeId, String)> {
     let w = widget_of(doc, hit)?;
-    let target = doc
-        .subtree(w)
+    doc.subtree(w)
         .into_iter()
         .filter(|i| doc.world_bounds(*i).is_some_and(|b| b.contains(p)))
-        .filter_map(|i| doc.node(i).filter(|n| n.visible)?.plugin_data.get(TARGET).cloned())
-        .last()?;
-    Some((w, target))
+        .filter_map(|i| Some((w, i, doc.node(i).filter(|n| n.visible)?.plugin_data.get(key).cloned()?)))
+        .last()
+}
+
+/// The clickable part of a widget at page point `p`, given the layer a click there hits: the widget
+/// and its target.
+pub fn target_at(doc: &Document, hit: NodeId, p: Point) -> Option<(NodeId, String)> {
+    part_at(doc, hit, p, TARGET).map(|(w, _, t)| (w, t))
+}
+
+/// The editable text field of a widget at page point `p`, given the layer a click there hits: its
+/// text layer.
+pub fn field_at(doc: &Document, hit: NodeId, p: Point) -> Option<NodeId> {
+    part_at(doc, hit, p, FIELD).map(|(_, f, _)| f).filter(|f| field_of(doc, *f).is_some())
+}
+
+/// The widget and field name text layer `id` is the editable field of.
+pub fn field_of(doc: &Document, id: NodeId) -> Option<(NodeId, String)> {
+    let field = doc.node(id).filter(|n| matches!(n.kind, NodeKind::Text(_)))?.plugin_data.get(FIELD)?.clone();
+    Some((widget_of(doc, id)?, field))
+}
+
+/// Widget `w`'s property menu (empty when it has none or it's unusable: it may come from a file).
+pub fn menu_of(doc: &Document, w: NodeId) -> Vec<MenuItem> {
+    doc.node(w)
+        .and_then(|n| n.plugin_data.get(MENU))
+        .filter(|s| s.len() <= MAX_STATE_BYTES)
+        .and_then(|s| serde_json::from_str::<Vec<MenuItem>>(s).ok())
+        .and_then(|mut m| check_menu(&mut m).is_ok().then_some(m))
+        .unwrap_or_default()
 }
 
 /// A widget's state (an empty object when it has none or it's unusable).
@@ -67,10 +102,11 @@ fn state_of(doc: &Document, w: NodeId) -> Map<String, Value> {
         .unwrap_or_default()
 }
 
-/// The targets inside widget `w`, each once, in layer order.
-fn targets(doc: &Document, w: NodeId) -> Vec<String> {
+/// The names of the parts inside widget `w` marked with layer data `key` (its targets or its
+/// fields), each once, in layer order.
+fn names(doc: &Document, w: NodeId, key: &str) -> Vec<String> {
     let mut out: Vec<String> = Vec::new();
-    for t in doc.subtree(w).into_iter().filter_map(|i| doc.node(i)?.plugin_data.get(TARGET).cloned()) {
+    for t in doc.subtree(w).into_iter().filter_map(|i| doc.node(i)?.plugin_data.get(key).cloned()) {
         if !out.contains(&t) {
             out.push(t);
         }
@@ -89,20 +125,22 @@ fn widget_plugin(s: &Session, cmd: &str, plugin: &str) -> Result<InstalledPlugin
     Ok(p)
 }
 
-/// Call widget `w`'s plugin `p` back (`target`: what was clicked; none when it's inserted) and
-/// build what it hands back. Part of the caller's undo step; a failure rolls the whole step back.
-fn callback(s: &mut Session, p: &InstalledPlugin, w: NodeId, target: Option<&str>, fuel: Option<f64>) -> Result<RunOutput> {
+/// Call widget `w`'s plugin `p` back (`event`: what happened, a click, an edit or a menu item;
+/// none when it's inserted) and build what it hands back. Part of the caller's undo step; a failure
+/// rolls the whole step back.
+fn callback(s: &mut Session, p: &InstalledPlugin, w: NodeId, event: Option<Value>, fuel: Option<f64>) -> Result<RunOutput> {
     let m = &p.manifest;
     let wasm = module_of(s, p)?;
-    let event = target.map(|t| json!({"target": t}));
+    let inserting = event.is_none();
     let state = state_of(s.doc()?, w);
     let input =
         json!({"api": m.api, "command": "widget", "params": {}, "selection": s.selection(), "widget": {"id": w, "state": state, "event": event}});
     let mut instance = Instance::new(&wasm, &limits(fuel)).map_err(|e| plugin_error(&m.name, e))?;
     let mut out = call_plugin(s, m, &m.name, &mut instance, &input.to_string()).map_err(|(e, _)| e)?;
     match out.widget.take() {
+        Some(r) if m.api < 4 && r.uses_api_4() => return Err(bad("widget.render", format!("{}: fields and menus need plugin API 4", m.name))),
         Some(r) => build(s, &m.id, w, &r)?,
-        None if target.is_none() => return Err(bad("widget.insert", format!("{} drew no widget", m.name))),
+        None if inserting => return Err(bad("widget.insert", format!("{} drew no widget", m.name))),
         None => {}
     }
     Ok(out)
@@ -130,6 +168,10 @@ fn build(s: &mut Session, plugin: &str, w: NodeId, r: &WidgetRender) -> Result<(
     if let Some(state) = &r.state {
         n.plugin_data.insert(STATE.into(), Value::Object(state.clone()).to_string());
     }
+    match serde_json::to_string(&r.menu) {
+        Ok(menu) if !r.menu.is_empty() => n.plugin_data.insert(MENU.into(), menu),
+        _ => n.plugin_data.remove(MENU),
+    };
     for c in &r.root.children {
         add(doc, w, c, cmd)?;
     }
@@ -154,6 +196,9 @@ fn add(doc: &mut Document, parent: NodeId, d: &WidgetNode, cmd: &str) -> Result<
     if !d.target.is_empty() {
         n.plugin_data.insert(TARGET.into(), d.target.clone());
     }
+    if !d.field.is_empty() {
+        n.plugin_data.insert(FIELD.into(), d.field.clone());
+    }
     if d.kind == WidgetKind::Image {
         use base64::Engine as _;
         let bytes = base64::engine::general_purpose::STANDARD.decode(d.data.trim()).map_err(|e| bad(cmd, format!("an image's `data`: {e}")))?;
@@ -230,12 +275,13 @@ fn props(d: &WidgetNode, root: bool) -> Map<String, Value> {
     p
 }
 
-/// What `widget.insert` and `widget.click` return.
+/// What `widget.insert` and the callbacks return.
 fn report(s: &Session, w: NodeId, m: &Manifest, out: RunOutput) -> Result<Value> {
     let doc = s.doc()?;
     let output = serde_json::from_str::<Value>(&out.output).unwrap_or(Value::String(out.output));
+    let (targets, fields, menu) = (names(doc, w, TARGET), names(doc, w, FIELD), menu_of(doc, w));
     Ok(
-        json!({"id": w, "plugin": m.id, "state": state_of(doc, w), "targets": targets(doc, w), "output": output, "logs": out.logs, "calls": out.calls, "fuel": out.fuel}),
+        json!({"id": w, "plugin": m.id, "state": state_of(doc, w), "targets": targets, "fields": fields, "menu": menu, "output": output, "logs": out.logs, "calls": out.calls, "fuel": out.fuel}),
     )
 }
 
@@ -272,21 +318,87 @@ fn insert(s: &mut Session, p: &Value) -> Result<Value> {
     report(s, w, m, out)
 }
 
+/// The widget param `id` is, or is inside.
+fn widget_param(s: &Session, cmd: &str, p: &Value) -> Result<NodeId> {
+    let nid = id(p, "id").ok_or_else(|| bad(cmd, "`id` required (a widget, or a layer in one)"))?;
+    widget_of(s.doc()?, nid).ok_or_else(|| bad(cmd, format!("{nid} isn't a widget or inside one")))
+}
+
+/// Call widget `w`'s plugin back with `ev`, after `prep` (which may change the widget first), as
+/// one undo step.
+fn event(s: &mut Session, cmd: &str, w: NodeId, ev: Value, p: &Value, prep: impl FnOnce(&mut Session) -> Result<()>) -> Result<Value> {
+    let plugin = s.doc()?.node(w).and_then(|n| n.plugin_data.get(PLUGIN)).cloned().unwrap_or_default();
+    let wp = widget_plugin(s, cmd, &plugin)?;
+    let out = s.grouped(&wp.manifest.name, |s| {
+        prep(s)?;
+        callback(s, &wp, w, Some(ev), num(p, "fuel"))
+    })?;
+    report(s, w, &wp.manifest, out)
+}
+
 fn click(s: &mut Session, p: &Value) -> Result<Value> {
     let cmd = "widget.click";
-    let nid = id(p, "id").ok_or_else(|| bad(cmd, "`id` required (a widget, or a layer in one)"))?;
+    let w = widget_param(s, cmd, p)?;
     let target = string(p, "target").ok_or_else(|| bad(cmd, "`target` required (see widget.list)"))?;
-    let doc = s.doc()?;
-    let w = widget_of(doc, nid).ok_or_else(|| bad(cmd, format!("{nid} isn't a widget or inside one")))?;
-    let all = targets(doc, w);
+    let all = names(s.doc()?, w, TARGET);
     if !all.contains(&target) {
         return Err(bad(cmd, format!("the widget has no `{target}` to click (it has: {})", all.join(", "))));
     }
-    let plugin = doc.node(w).and_then(|n| n.plugin_data.get(PLUGIN)).cloned().unwrap_or_default();
-    let fuel = num(p, "fuel");
-    let wp = widget_plugin(s, cmd, &plugin)?;
-    let out = s.grouped(&wp.manifest.name, |s| callback(s, &wp, w, Some(&target), fuel))?;
-    report(s, w, &wp.manifest, out)
+    event(s, cmd, w, json!({"target": target}), p, |_| Ok(()))
+}
+
+fn set_text(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "widget.setText";
+    let w = widget_param(s, cmd, p)?;
+    let field = string(p, "field").ok_or_else(|| bad(cmd, "`field` required (see widget.list)"))?;
+    let all = names(s.doc()?, w, FIELD);
+    if !all.contains(&field) {
+        return Err(bad(cmd, format!("the widget has no field `{field}` (it has: {})", all.join(", "))));
+    }
+    let value = match p.get("value") {
+        Some(Value::String(v)) => clean_field(v).map_err(|e| bad(cmd, e))?,
+        _ => return Err(bad(cmd, "`value` required (text)")),
+    };
+    let ev = json!({"field": field, "value": value});
+    // The value goes into the state and the field's text before the plugin hears of it, so a
+    // plugin that doesn't redraw still keeps (and shows) it.
+    event(s, cmd, w, ev, p, |s| {
+        let ds = s.ds_mut()?;
+        let before = ds.doc.clone();
+        let mut state = state_of(&ds.doc, w);
+        state.insert(field.clone(), Value::String(value.clone()));
+        check_state(&state).map_err(|e| bad(cmd, e))?;
+        let doc = ds.doc_mut();
+        let text = Map::from_iter([("characters".to_string(), Value::String(value))]);
+        for l in doc.subtree(w) {
+            if doc.node(l).is_some_and(|n| n.plugin_data.get(FIELD) == Some(&field) && matches!(n.kind, NodeKind::Text(_))) {
+                crate::cmd::props::apply(cmd, doc, l, &text)?;
+            }
+        }
+        doc.get_mut(w)?.plugin_data.insert(STATE.into(), Value::Object(state).to_string());
+        crate::normalize(doc, &before);
+        Ok(())
+    })
+}
+
+fn menu(s: &mut Session, p: &Value) -> Result<Value> {
+    let cmd = "widget.menu";
+    let w = widget_param(s, cmd, p)?;
+    let item = string(p, "item").ok_or_else(|| bad(cmd, "`item` required (see widget.list)"))?;
+    let all = menu_of(s.doc()?, w);
+    let Some(m) = all.iter().find(|m| m.item == item) else {
+        let names: Vec<&str> = all.iter().map(|m| m.item.as_str()).collect();
+        return Err(bad(cmd, format!("the widget has no menu item `{item}` (it has: {})", names.join(", "))));
+    };
+    let value = match m.kind {
+        MenuKind::Action => Value::Null,
+        MenuKind::Toggle => json!(p.get("value").and_then(Value::as_bool).unwrap_or(!m.checked)),
+        MenuKind::Color => {
+            let hex = string(p, "value").filter(|v| v.len() <= 9).and_then(|v| figcraft_color::Color::from_hex(&v)).map(|c| c.to_css_hex());
+            json!(hex.filter(|h| m.options.contains(h)).ok_or_else(|| bad(cmd, format!("`value` must be one of {}", m.options.join(", "))))?)
+        }
+    };
+    event(s, cmd, w, json!({"menu": item, "value": value}), p, |_| Ok(()))
 }
 
 /// Click `target` of the widget `id` is (or is in) on `doc`, a document that isn't one of the
@@ -311,7 +423,10 @@ fn list(s: &mut Session, _p: &Value) -> Result<Value> {
         .filter_map(|i| {
             let n = doc.node(i).filter(|n| is_widget(n))?;
             let state = Value::Object(state_of(doc, i));
-            Some(json!({"id": i, "plugin": n.plugin_data.get(PLUGIN), "name": n.name, "page": doc.page_of(i), "state": state, "targets": targets(doc, i)}))
+            let (targets, fields, menu) = (names(doc, i, TARGET), names(doc, i, FIELD), menu_of(doc, i));
+            Some(
+                json!({"id": i, "plugin": n.plugin_data.get(PLUGIN), "name": n.name, "page": doc.page_of(i), "state": state, "targets": targets, "fields": fields, "menu": menu}),
+            )
         })
         .collect();
     Ok(json!({"widgets": widgets}))
@@ -333,6 +448,20 @@ pub fn specs() -> Vec<CommandSpec> {
             false,
             click
         ),
-        spec!("widget.list", "List widgets", "{} → {widgets: [{id, plugin, name, page, state, targets}]}", false, list),
+        spec!(
+            "widget.setText",
+            "Edit widget field",
+            "{id (a widget or a layer in one), field (see widget.list), value (text, up to 1000 characters), fuel?} sets an editable field as typing in it would: the value goes into the state under the field's name and the plugin is called back; one undo step → like widget.insert",
+            false,
+            set_text
+        ),
+        spec!(
+            "widget.menu",
+            "Widget menu",
+            "{id (a widget or a layer in one), item (see widget.list), value? (a toggle: on or off, default the opposite of now; a colour: one of its options), fuel?} picks an item of the widget's property menu: the plugin is called back; one undo step → like widget.insert",
+            false,
+            menu
+        ),
+        spec!("widget.list", "List widgets", "{} → {widgets: [{id, plugin, name, page, state, targets, fields, menu}]}", false, list),
     ]
 }
diff --git a/crates/engine/src/facilitate_tests.rs b/crates/engine/src/facilitate_tests.rs
new file mode 100644
index 00000000..1db0b67a
--- /dev/null
+++ b/crates/engine/src/facilitate_tests.rs
@@ -0,0 +1,324 @@
+//! A board's timer and votes: the commands, what undo leaves alone, saving, live sessions, clicks
+//! that vote, and junk parameters.
+
+use figcraft_doc::{BoardTimer, NodeId, VoteScope};
+use serde_json::{Value, json};
+
+use crate::board_tests::{board, id};
+use crate::cmd::facilitate::{clock, timer_after, timer_state};
+use crate::collab_live_tests::Room;
+use crate::tools::{PointerEvent, PointerKind};
+use crate::{EngineError, Session};
+
+const MIN: u64 = 60_000;
+
+fn ex(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd} {p}: {e}"))
+}
+
+fn sticky(s: &mut Session, x: f64, text: &str) -> NodeId {
+    id(&ex(s, "board.sticky", json!({"x": x, "y": 0, "text": text})), "id")
+}
+
+#[test]
+fn the_timer_counts_from_its_end_time() {
+    let now = 1_000_000;
+    let none = json!({});
+    let t = timer_after("t", None, "start", &json!({"minutes": 2}), now).unwrap();
+    assert_eq!(t, Some(BoardTimer::Running { ends: now + 2 * MIN }));
+    assert_eq!(timer_state(t, now + MIN), "running");
+    assert_eq!(timer_state(t, now + 3 * MIN), "done", "run out: done until stopped");
+    // Paused half way: the time left stays put however long the pause.
+    let p = timer_after("t", t, "pause", &none, now + MIN).unwrap();
+    assert_eq!(p, Some(BoardTimer::Paused { left: MIN }));
+    assert_eq!(p.unwrap().left(now + 100 * MIN), MIN);
+    // A minute more while paused, then on again.
+    let p = timer_after("t", p, "add", &none, now + 5 * MIN).unwrap();
+    assert_eq!(p, Some(BoardTimer::Paused { left: 2 * MIN }));
+    let r = timer_after("t", p, "resume", &none, now + 10 * MIN).unwrap();
+    assert_eq!(r, Some(BoardTimer::Running { ends: now + 12 * MIN }));
+    // Adding to a timer that ran out starts from now.
+    let r = timer_after("t", r, "add", &json!({"minutes": 0.5}), now + 20 * MIN).unwrap();
+    assert_eq!(r, Some(BoardTimer::Running { ends: now + 20 * MIN + MIN / 2 }));
+    assert_eq!(timer_after("t", r, "stop", &none, now).unwrap(), None);
+    // What can't be done says so.
+    assert!(timer_after("t", None, "pause", &none, now).is_err());
+    assert!(timer_after("t", None, "add", &none, now).is_err());
+    assert!(timer_after("t", r, "resume", &none, now).is_err());
+    assert!(timer_after("t", Some(BoardTimer::Running { ends: now }), "pause", &none, now).is_err(), "nothing left to pause");
+    for m in [json!(0), json!(-1), json!(1441), json!("NaN"), json!(1e308), json!("x"), json!([1])] {
+        assert!(timer_after("t", None, "start", &json!({"minutes": m}), now).is_err(), "{m}");
+    }
+    // At most a day, also by adding.
+    let long = timer_after("t", None, "start", &json!({"minutes": 1440}), now).unwrap();
+    assert_eq!(timer_after("t", long, "add", &none, now).unwrap().unwrap().left(now), 1440 * MIN);
+    assert!(timer_after("t", None, "start", &json!({"minutes": 1}), u64::MAX).is_ok(), "no overflow");
+}
+
+#[test]
+fn clocks_read_minutes_and_seconds() {
+    assert_eq!(clock(0), "0:00");
+    assert_eq!(clock(1), "0:01", "a part of a second left still shows");
+    assert_eq!(clock(5 * MIN), "5:00");
+    assert_eq!(clock(65_000), "1:05");
+    assert_eq!(clock(3_723_000), "1:02:03");
+}
+
+#[test]
+fn timer_commands_drive_the_boards_timer() {
+    let mut s = board();
+    assert_eq!(ex(&mut s, "board.timerState", json!({}))["state"], "off");
+    let r = ex(&mut s, "board.timer", json!({"action": "start", "minutes": 3}));
+    assert_eq!(r["state"], "running");
+    let left = r["left"].as_u64().unwrap();
+    assert!(left > 3 * MIN - 5000 && left <= 3 * MIN, "{r}");
+    assert!(r["ends"].as_u64().is_some());
+    assert_eq!(ex(&mut s, "board.timer", json!({"action": "pause"}))["state"], "paused");
+    let r = ex(&mut s, "board.timer", json!({"action": "add"}));
+    assert!(r["left"].as_u64().unwrap() > 4 * MIN - 5000, "{r}");
+    assert_eq!(ex(&mut s, "board.timer", json!({"action": "resume"}))["state"], "running");
+    assert_eq!(ex(&mut s, "board.timer", json!({"action": "stop"}))["state"], "off");
+    assert!(s.doc().unwrap().timer.is_none());
+    // Not an undo step.
+    assert_eq!(s.undo_depth().0, 0);
+    assert!(matches!(s.execute("board.timer", &json!({"action": "pause"})), Err(EngineError::Disabled(..))));
+    assert!(s.execute("board.timer", &json!({"action": "jump"})).is_err());
+    // Boards only.
+    let mut d = Session::new();
+    d.execute("file.new", &json!({})).unwrap();
+    for (cmd, p) in [
+        ("board.timer", json!({"action": "start"})),
+        ("board.timerState", json!({})),
+        ("board.vote", json!({"action": "start"})),
+        ("board.voteResults", json!({})),
+    ] {
+        assert!(matches!(d.execute(cmd, &p), Err(EngineError::Disabled(..))), "{cmd}");
+    }
+}
+
+#[test]
+fn votes_are_capped_hidden_until_the_end_and_ranked() {
+    let mut s = board();
+    let a = sticky(&mut s, 0.0, "Ship it");
+    let b = sticky(&mut s, 300.0, "Wait");
+    let c = sticky(&mut s, 600.0, "Rethink");
+    let shape = id(&ex(&mut s, "board.shape", json!({"x": 0, "y": 400})), "id");
+    let r = ex(&mut s, "board.vote", json!({"action": "start", "votes": 2, "on": "stickies"}));
+    assert_eq!((r["state"].as_str(), r["left"].as_u64(), r["on"].as_str()), (Some("running"), Some(2), Some("stickies")));
+    assert!(matches!(s.execute("board.vote", &json!({"action": "start"})), Err(EngineError::Disabled(..))), "one vote at a time");
+    let cast = |s: &mut Session, who: &str, on: NodeId| s.execute("board.vote", &json!({"action": "cast", "id": on, "voter": who}));
+    // Ada puts both her votes on one sticky; a third is refused, and so is a shape.
+    cast(&mut s, "Ada", a).unwrap();
+    let r = cast(&mut s, "Ada", a).unwrap();
+    assert_eq!((r["left"].as_u64(), r["mine"].clone()), (Some(0), json!([{"id": a.0, "votes": 2}])));
+    assert!(matches!(cast(&mut s, "Ada", b), Err(EngineError::Disabled(..))), "no votes left");
+    assert!(matches!(cast(&mut s, "Bo", shape), Err(EngineError::Disabled(..))), "stickies only");
+    assert!(matches!(cast(&mut s, "Bo", NodeId(99_999)), Err(EngineError::NoNode(_))));
+    cast(&mut s, "Bo", b).unwrap();
+    cast(&mut s, "Bo", c).unwrap();
+    cast(&mut s, "Cy", b).unwrap();
+    cast(&mut s, "Cy", c).unwrap();
+    // Cy takes one back and puts it elsewhere.
+    s.execute("board.vote", &json!({"action": "retract", "id": c, "voter": "Cy"})).unwrap();
+    assert!(s.execute("board.vote", &json!({"action": "retract", "id": c, "voter": "Cy"})).is_err(), "no vote there any more");
+    cast(&mut s, "Cy", a).unwrap();
+    // While it runs, you see your own votes only.
+    let r = ex(&mut s, "board.voteResults", json!({"voter": "Bo"}));
+    assert!(r.get("results").is_none(), "{r}");
+    assert_eq!(r["mine"], json!([{"id": b.0, "votes": 1}, {"id": c.0, "votes": 1}]));
+    assert_eq!(r["voters"], 3);
+    assert_eq!(s.undo_depth().0, 4, "votes are no undo steps (only the four objects)");
+    ex(&mut s, "board.vote", json!({"action": "end"}));
+    assert!(s.execute("board.vote", &json!({"action": "cast", "id": b, "voter": "Dee"})).is_err(), "ended");
+    let r = ex(&mut s, "board.voteResults", json!({}));
+    assert_eq!(r["state"], "ended");
+    assert_eq!(
+        r["results"],
+        json!([
+            {"id": a.0, "name": "Ship it", "votes": 3, "rank": 1},
+            {"id": b.0, "name": "Wait", "votes": 2, "rank": 2},
+            {"id": c.0, "name": "Rethink", "votes": 1, "rank": 3},
+        ])
+    );
+    // A deleted object's votes no longer count.
+    ex(&mut s, "edit.delete", json!({"ids": [a]}));
+    assert_eq!(ex(&mut s, "board.voteResults", json!({}))["results"][0]["id"], b.0);
+    ex(&mut s, "board.vote", json!({"action": "clear"}));
+    assert_eq!(ex(&mut s, "board.voteResults", json!({}))["state"], "off");
+    assert!(s.doc().unwrap().votes.is_empty());
+}
+
+#[test]
+fn a_vote_on_the_selection_takes_only_those() {
+    let mut s = board();
+    let a = sticky(&mut s, 0.0, "A");
+    let b = sticky(&mut s, 300.0, "B");
+    ex(&mut s, "select.set", json!({"ids": [a]}));
+    let r = ex(&mut s, "board.vote", json!({"action": "start", "on": "selection"}));
+    assert_eq!(r["on"], json!({"selection": [a.0]}));
+    assert_eq!(r["votesPerPerson"], 3);
+    assert!(s.execute("board.vote", &json!({"action": "cast", "id": b})).is_err());
+    ex(&mut s, "board.vote", json!({"action": "cast", "id": a}));
+    // A finished vote may be replaced by a new one, which starts with no votes.
+    ex(&mut s, "board.vote", json!({"action": "end"}));
+    ex(&mut s, "board.vote", json!({"action": "start", "on": "all", "votes": 1}));
+    assert!(s.doc().unwrap().votes.is_empty());
+    assert_eq!(s.doc().unwrap().vote.as_ref().unwrap().scope, VoteScope::All);
+    for bad in [json!({"votes": 0}), json!({"votes": 100}), json!({"votes": 1.5}), json!({"on": "pages"}), json!({"on": "selection", "ids": []})] {
+        let mut p = bad.clone();
+        p["action"] = json!("start");
+        ex(&mut s, "board.vote", json!({"action": "clear"}));
+        assert!(s.execute("board.vote", &p).is_err(), "{p}");
+    }
+}
+
+#[test]
+fn undo_leaves_the_timer_and_the_vote_alone() {
+    let mut s = board();
+    let a = sticky(&mut s, 0.0, "A");
+    ex(&mut s, "board.timer", json!({"action": "start"}));
+    ex(&mut s, "board.vote", json!({"action": "start"}));
+    ex(&mut s, "board.vote", json!({"action": "cast", "id": a}));
+    let b = sticky(&mut s, 300.0, "B");
+    s.undo().unwrap();
+    s.undo().unwrap();
+    let doc = s.doc().unwrap();
+    assert!(doc.node(a).is_none() && doc.node(b).is_none(), "the stickies are undone");
+    assert!(doc.timer.is_some() && doc.vote.is_some() && doc.votes.len() == 1, "the timer and the vote stay");
+    ex(&mut s, "board.timer", json!({"action": "stop"}));
+    s.redo().unwrap();
+    assert!(s.doc().unwrap().timer.is_none(), "redo doesn't bring a stopped timer back");
+    assert!(s.doc().unwrap().node(a).is_some());
+}
+
+#[test]
+fn the_timer_and_votes_save_and_old_files_open() {
+    let mut s = board();
+    let a = sticky(&mut s, 0.0, "A");
+    ex(&mut s, "board.timer", json!({"action": "start"}));
+    ex(&mut s, "board.timer", json!({"action": "pause"}));
+    ex(&mut s, "board.vote", json!({"action": "start", "on": "stickies"}));
+    ex(&mut s, "board.vote", json!({"action": "cast", "id": a}));
+    let doc = s.doc().unwrap().clone();
+    let bytes = figcraft_format::save_bytes(&doc, None).unwrap();
+    let (back, _) = figcraft_format::load_bytes(&bytes).unwrap();
+    assert_eq!((back.timer, &back.vote, &back.votes), (doc.timer, &doc.vote, &doc.votes));
+    // A file from before: none of the fields.
+    let mut v = figcraft_format::to_json(&doc).unwrap();
+    for k in ["timer", "vote", "votes"] {
+        assert!(v.as_object_mut().unwrap().remove(k).is_some(), "{k} is saved");
+    }
+    let (old, _) = figcraft_format::from_json(&v.to_string()).unwrap();
+    assert!(old.timer.is_none() && old.vote.is_none() && old.votes.is_empty());
+    // Design files don't write them.
+    let plain = figcraft_format::to_json(&figcraft_doc::Document::new("D")).unwrap();
+    assert!(plain.get("timer").is_none() && plain.get("vote").is_none() && plain.get("votes").is_none());
+}
+
+#[test]
+fn everyone_in_a_live_session_shares_the_timer_and_the_vote() {
+    let mut s = board();
+    let a = sticky(&mut s, 0.0, "A");
+    let b = sticky(&mut s, 300.0, "B");
+    ex(&mut s, "board.timer", json!({"action": "start", "minutes": 10}));
+    let mut room = Room::new(s.doc().unwrap().clone(), 2, 11);
+    assert!(room.s(1).doc().unwrap().timer.is_some(), "joiners get the running timer");
+    let t0 = room.s(0).doc().unwrap().timer;
+    assert_eq!(room.s(1).doc().unwrap().timer, t0);
+    ex(room.s(1), "board.timer", json!({"action": "pause"}));
+    ex(room.s(0), "board.vote", json!({"action": "start", "votes": 2}));
+    room.settle();
+    room.check();
+    assert!(matches!(room.s(0).doc().unwrap().timer, Some(BoardTimer::Paused { .. })), "a pause reaches everyone");
+    // Both vote at once: each ballot is its own entry, so neither is lost.
+    ex(room.s(0), "board.vote", json!({"action": "cast", "id": a}));
+    ex(room.s(1), "board.vote", json!({"action": "cast", "id": a}));
+    ex(room.s(1), "board.vote", json!({"action": "cast", "id": b}));
+    room.settle();
+    room.check();
+    assert_eq!(room.server.document().votes.len(), 2, "two voters, apart though both are called the same");
+    assert_eq!(ex(room.s(0), "board.voteResults", json!({}))["mine"], json!([{"id": a.0, "votes": 1}]));
+    ex(room.s(1), "board.vote", json!({"action": "end"}));
+    room.settle();
+    let r = ex(room.s(0), "board.voteResults", json!({}));
+    assert_eq!(r["results"], json!([{"id": a.0, "name": "A", "votes": 2, "rank": 1}, {"id": b.0, "name": "B", "votes": 1, "rank": 2}]));
+    // Undo in a session takes back your own edits only, not the vote.
+    room.s(0).undo().unwrap();
+    room.settle();
+    room.check();
+    assert!(room.server.document().vote.is_some());
+}
+
+#[test]
+fn clicks_vote_while_a_vote_runs() {
+    let mut s = board();
+    let a = sticky(&mut s, 0.0, "A");
+    ex(&mut s, "select.none", json!({}));
+    let click = |s: &mut Session, x: f64, y: f64, alt: bool| {
+        let mut down = PointerEvent::at(PointerKind::Down, x, y, 1.0);
+        down.alt = alt;
+        s.pointer(&down).unwrap();
+        s.pointer(&PointerEvent::at(PointerKind::Up, x, y, 1.0)).unwrap();
+    };
+    // No vote: a click selects.
+    click(&mut s, 100.0, 100.0, false);
+    assert_eq!(s.selection(), vec![a]);
+    ex(&mut s, "select.none", json!({}));
+    ex(&mut s, "board.vote", json!({"action": "start"}));
+    click(&mut s, 100.0, 100.0, false);
+    click(&mut s, 50.0, 150.0, false);
+    assert!(s.selection().is_empty(), "votes, not selection");
+    assert_eq!(crate::cmd::facilitate::mine(s.doc().unwrap(), "You"), vec![(a, 2)]);
+    // Alt takes one back; so does a click on your badge (the sticky's top-right corner).
+    click(&mut s, 100.0, 100.0, true);
+    click(&mut s, 199.0, 1.0, false);
+    assert!(s.doc().unwrap().votes.is_empty());
+    // Empty canvas is the tool's as ever.
+    click(&mut s, 900.0, 900.0, false);
+    assert!(s.doc().unwrap().votes.is_empty());
+}
+
+#[test]
+fn facilitation_commands_survive_junk() {
+    let junk = [
+        json!({}),
+        json!(null),
+        json!([1]),
+        json!({"action": 5, "minutes": "NaN", "votes": -1, "on": [1], "id": "x", "voter": {"a": 1}}),
+        json!({"action": "start", "minutes": 1e308, "votes": 1e308, "on": "selection", "ids": ["x", -1]}),
+        json!({"action": "add", "minutes": -1e308}),
+        json!({"action": "cast", "id": 99_999, "voter": "\u{0}\u{7}"}),
+        json!({"action": "retract", "id": -1, "voter": "x".repeat(10_000)}),
+        json!({"action": "end"}),
+        json!({"action": "clear", "ids": 7}),
+        json!({"action": "resume", "minutes": [1]}),
+    ];
+    for cmd in ["board.timer", "board.timerState", "board.vote", "board.voteResults"] {
+        for j in &junk {
+            let mut s = board();
+            let a = sticky(&mut s, 0.0, "A");
+            ex(&mut s, "board.timer", json!({"action": "start"}));
+            ex(&mut s, "board.vote", json!({"action": "start"}));
+            ex(&mut s, "board.vote", json!({"action": "cast", "id": a}));
+            if let Err(EngineError::Internal { cmd, msg }) = s.execute(cmd, j) {
+                panic!("{cmd} panicked on {j}: {msg}");
+            }
+            // A voter name is kept short.
+            assert!(s.doc().unwrap().votes.keys().all(|k| k.chars().count() <= 64));
+        }
+    }
+}
+
+#[test]
+fn ties_share_a_rank() {
+    let mut s = board();
+    let ids: Vec<NodeId> = (0..4).map(|i| sticky(&mut s, f64::from(i) * 300.0, "x")).collect();
+    ex(&mut s, "board.vote", json!({"action": "start", "votes": 2}));
+    for (who, on) in [("a", 0), ("a", 1), ("b", 1), ("b", 0), ("c", 2), ("c", 3), ("d", 2)] {
+        ex(&mut s, "board.vote", json!({"action": "cast", "id": ids[on], "voter": who}));
+    }
+    ex(&mut s, "board.vote", json!({"action": "end"}));
+    let r = ex(&mut s, "board.voteResults", json!({}));
+    let ranks: Vec<u64> = r["results"].as_array().unwrap().iter().map(|x| x["rank"].as_u64().unwrap()).collect();
+    assert_eq!(ranks, vec![1, 1, 1, 4], "{r}");
+}
diff --git a/crates/engine/src/fig_import_tests.rs b/crates/engine/src/fig_import_tests.rs
index d6241448..f0ea0886 100644
--- a/crates/engine/src/fig_import_tests.rs
+++ b/crates/engine/src/fig_import_tests.rs
@@ -50,3 +50,43 @@ fn local_samples_match_their_exports() {
         }
     }
 }
+
+/// Layers of an instance copy keep their link to the layer they stand for when the file is
+/// opened, also after they were renamed in the copy (a name is no identity), and the override
+/// that a rename is stays an override.
+#[test]
+fn opened_fig_links_instance_layers_by_identity_not_by_name() {
+    use base64::Engine as _;
+    let mut s = Session::new();
+    let make = |s: &mut Session, cmd: &str, p: serde_json::Value| s.execute(cmd, &p).unwrap()["id"].as_u64().map(figcraft_doc::NodeId).unwrap();
+    let body = make(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 40, "height": 20, "name": "Inner"}));
+    let label = make(&mut s, "text.create", json!({"text": "Label", "x": 2, "y": 2, "parent": body, "props": {"name": "Label"}}));
+    let inner = make(&mut s, "component.create", json!({"ids": [body]}));
+    let frame = make(&mut s, "frame.create", json!({"x": 100, "y": 0, "width": 200, "height": 60, "name": "Outer"}));
+    let outer = make(&mut s, "component.create", json!({"ids": [frame]}));
+    let slot = make(&mut s, "instance.create", json!({"component": inner, "x": 0, "y": 0, "parent": outer}));
+    s.execute("node.set", &json!({"id": slot, "props": {"name": "Slot"}})).unwrap();
+    let copy = make(&mut s, "instance.create", json!({"component": outer, "x": 0, "y": 200}));
+    let copy_slot = s.doc().unwrap().node(copy).unwrap().children[0];
+    let copy_label = s.doc().unwrap().node(copy_slot).unwrap().children[0];
+    s.execute("node.set", &json!({"id": copy_slot, "props": {"name": "Renamed slot"}})).unwrap();
+    s.execute("node.set", &json!({"id": copy_label, "props": {"name": "Renamed label"}})).unwrap();
+    let _ = label;
+
+    let exported = s.execute("file.export", &json!({"format": "fig"})).unwrap();
+    let path = std::env::temp_dir().join(format!("figcraft-slots-{}.fig", std::process::id()));
+    std::fs::write(&path, base64::engine::general_purpose::STANDARD.decode(exported["data"].as_str().unwrap()).unwrap()).unwrap();
+    let mut opened = Session::new();
+    let result = opened.execute("file.open", &json!({"path": path.to_string_lossy()}));
+    let _ = std::fs::remove_file(&path);
+    result.unwrap();
+    let doc = opened.doc().unwrap();
+    let outer = doc.nodes().find(|n| n.name == "Outer" && matches!(n.kind, NodeKind::Component { .. })).unwrap();
+    let copy = doc.nodes().find(|n| n.name == "Outer" && matches!(n.kind, NodeKind::Instance { .. })).unwrap();
+    let slot = doc.node(copy.children[0]).unwrap();
+    let label = doc.node(slot.children[0]).unwrap();
+    assert_eq!((slot.name.as_str(), label.name.as_str()), ("Renamed slot", "Renamed label"));
+    assert_eq!(slot.source, Some(outer.children[0]));
+    assert_eq!(label.source, Some(doc.node(outer.children[0]).unwrap().children[0]));
+    assert!(slot.overrides.contains("name") && label.overrides.contains("name"));
+}
diff --git a/crates/engine/src/fill_none_tests.rs b/crates/engine/src/fill_none_tests.rs
new file mode 100644
index 00000000..74fe6231
--- /dev/null
+++ b/crates/engine/src/fill_none_tests.rs
@@ -0,0 +1,88 @@
+//! `props.fill` and `props.stroke` accept `"none"` (either case) and `null` as no paint, the
+//! same as an empty `fills`/`strokes` list (#1036): an outline-only shape in one call.
+
+use figcraft_doc::NodeId;
+use serde_json::{Value, json};
+
+use crate::Session;
+
+fn id(v: Value) -> NodeId {
+    NodeId(v["id"].as_u64().unwrap())
+}
+
+fn ex(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd} {p}: {e}"))
+}
+
+fn create_rect(s: &mut Session, fill: Value) -> NodeId {
+    id(ex(
+        s,
+        "node.create",
+        json!({
+            "type": "rectangle", "x": 0, "y": 0, "width": 10, "height": 10,
+            "props": {"fill": fill, "stroke": "#000000", "strokeWeight": 1}
+        }),
+    ))
+}
+
+#[test]
+fn fill_none_or_null_makes_an_outline_only_shape_in_one_call() {
+    for none in [json!("none"), json!("None"), json!("NONE"), json!(null)] {
+        let mut s = Session::new();
+        let r = create_rect(&mut s, none.clone());
+        let n = s.doc().unwrap().node(r).unwrap().clone();
+        assert!(n.fills.is_empty(), "{none:?}: fills not empty");
+        assert_eq!(n.strokes.len(), 1, "{none:?}: stroke kept");
+    }
+}
+
+#[test]
+fn fill_none_clears_an_existing_fill_as_one_undo_step() {
+    let mut s = Session::new();
+    let r = create_rect(&mut s, json!("#FF0000"));
+    assert_eq!(s.doc().unwrap().node(r).unwrap().fills.len(), 1);
+    ex(&mut s, "node.set", json!({"id": r, "props": {"fill": "none"}}));
+    assert!(s.doc().unwrap().node(r).unwrap().fills.is_empty());
+    ex(&mut s, "edit.undo", json!({}));
+    assert_eq!(s.doc().unwrap().node(r).unwrap().fills.len(), 1);
+}
+
+#[test]
+fn stroke_none_or_null_clears_the_strokes() {
+    for none in [json!("none"), json!(null)] {
+        let mut s = Session::new();
+        let r = create_rect(&mut s, json!("#FF0000"));
+        ex(&mut s, "node.set", json!({"id": r, "props": {"stroke": none}}));
+        assert!(s.doc().unwrap().node(r).unwrap().strokes.is_empty(), "{none:?}");
+        assert_eq!(s.doc().unwrap().node(r).unwrap().fills.len(), 1, "{none:?}");
+    }
+}
+
+#[test]
+fn text_with_fill_none_gets_no_automatic_colour() {
+    let mut s = Session::new();
+    let t = id(ex(
+        &mut s,
+        "node.create",
+        json!({
+            "type": "text", "x": 0, "y": 0, "text": "Hi", "props": {"fill": "none"}
+        }),
+    ));
+    assert!(s.doc().unwrap().node(t).unwrap().fills.is_empty());
+}
+
+#[test]
+fn an_unknown_string_still_names_the_key() {
+    let mut s = Session::new();
+    let e = s
+        .execute(
+            "node.create",
+            &json!({
+                "type": "rectangle", "x": 0, "y": 0, "width": 10, "height": 10,
+                "props": {"fill": "nope"}
+            }),
+        )
+        .unwrap_err();
+    let msg = e.to_string();
+    assert!(msg.contains("`fill`") && msg.contains("none"), "{msg}");
+}
diff --git a/crates/engine/src/finite_geometry_tests.rs b/crates/engine/src/finite_geometry_tests.rs
new file mode 100644
index 00000000..416b250c
--- /dev/null
+++ b/crates/engine/src/finite_geometry_tests.rs
@@ -0,0 +1,40 @@
+//! Commands never leave a layer with a non-finite position or size: such a file saves but can't be
+//! reopened (JSON writes NaN and infinity as null).
+
+use serde_json::json;
+
+use crate::Session;
+
+fn rect(s: &mut Session) -> crate::NodeId {
+    let r = s.execute("node.create", &json!({"type": "rectangle", "x": 0, "y": 10, "width": 100, "height": 50})).unwrap();
+    crate::params::id_of(&r["id"]).unwrap()
+}
+
+fn assert_roundtrips(s: &Session) {
+    let bytes = figcraft_format::save_bytes(s.doc().unwrap(), None).unwrap();
+    assert!(figcraft_format::load_bytes(&bytes).is_ok(), "the saved file reopens");
+}
+
+#[test]
+fn huge_moves_are_refused_and_the_file_still_reopens() {
+    let mut s = Session::new();
+    let r = rect(&mut s);
+    s.execute("transform.move", &json!({"ids": [r], "dx": 1e308, "dy": 0})).ok();
+    let second = s.execute("transform.move", &json!({"ids": [r], "dx": 1e308, "dy": 1e308}));
+    assert!(second.is_err(), "a move past the f64 range is refused");
+    let n = s.doc().unwrap().node(r).unwrap();
+    assert!(n.transform.as_coeffs().iter().all(|c| c.is_finite()), "{:?}", n.transform);
+    assert_roundtrips(&s);
+}
+
+#[test]
+fn huge_scale_is_refused_and_the_file_still_reopens() {
+    let mut s = Session::new();
+    let r = rect(&mut s);
+    s.execute("transform.scale", &json!({"ids": [r], "factor": 1e300})).ok();
+    let second = s.execute("transform.scale", &json!({"ids": [r], "factor": 1e300}));
+    assert!(second.is_err(), "a size past the f64 range is refused");
+    let n = s.doc().unwrap().node(r).unwrap();
+    assert!(n.width.is_finite() && n.height.is_finite(), "{} x {}", n.width, n.height);
+    assert_roundtrips(&s);
+}
diff --git a/crates/engine/src/fonts.rs b/crates/engine/src/fonts.rs
new file mode 100644
index 00000000..dee5d1f7
--- /dev/null
+++ b/crates/engine/src/fonts.rs
@@ -0,0 +1,163 @@
+//! Fonts a document names that this machine doesn't have (#752): text layers, their styled
+//! ranges, text styles and the string variables bound to a font family. Text in such a family
+//! is drawn in a fallback font, so the user is told which ones are missing. Once such a font is
+//! there, [`refit`] lets auto-sizing text measure its box in it again.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use figcraft_doc::{Document, NodeId, NodeKind, StyleKind, VariableValue, Variables};
+use serde_json::{Value, json};
+
+use crate::cmd::CommandSpec;
+use crate::params::{get, req_targets};
+use crate::{Result, Session, spec};
+
+/// A family the document names that no installed or built-in font provides.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Missing {
+    /// As the document spells it.
+    pub family: String,
+    /// Text layers that use it (0: only a text style or a variable names it).
+    pub layers: usize,
+}
+
+/// The families `doc` names that the font database doesn't have, by name. On the desktop the
+/// installed fonts are indexed in the background: ask once that's done
+/// (`figcraft_text::installed_fonts_known`), or every installed family counts as missing.
+pub fn missing(doc: &Document) -> Vec<Missing> {
+    // Lower-case family → (spelling, layers).
+    let mut used: BTreeMap<String, (String, usize)> = BTreeMap::new();
+    let mut add = |family: &str, layer: bool| {
+        let family = family.trim();
+        if family.is_empty() {
+            return;
+        }
+        let e = used.entry(family.to_lowercase()).or_insert_with(|| (family.to_string(), 0));
+        e.1 += usize::from(layer);
+    };
+    for n in doc.nodes() {
+        if let NodeKind::Text(t) = &n.kind {
+            let mut families: Vec<&str> = t.spans().into_iter().map(|(_, _, st)| st.font_family.as_str()).collect();
+            families.push(&t.style.font_family);
+            families.sort_by_key(|f| f.trim().to_lowercase());
+            families.dedup_by_key(|f| f.trim().to_lowercase());
+            for f in families {
+                add(f, true);
+            }
+        }
+        if let Some(var) = n.bound.get("fontFamily") {
+            for f in string_values(&doc.variables, var) {
+                add(&f, false);
+            }
+        }
+    }
+    for st in &doc.styles {
+        if let StyleKind::Text { style } = &st.kind {
+            add(&style.font_family, false);
+        }
+        if let Some(var) = st.bound.get("fontFamily") {
+            for f in string_values(&doc.variables, var) {
+                add(&f, false);
+            }
+        }
+    }
+    used.into_values().filter(|(family, _)| !figcraft_text::has_family(family)).map(|(family, layers)| Missing { family, layers }).collect()
+}
+
+/// Every string value of variable `id` in any mode, following aliases (each variable once).
+fn string_values(vars: &Variables, id: &str) -> Vec<String> {
+    let mut out = Vec::new();
+    let mut seen = BTreeSet::new();
+    let mut todo = vec![id.to_string()];
+    while let Some(id) = todo.pop() {
+        if !seen.insert(id.clone()) {
+            continue;
+        }
+        let Some(var) = vars.get(&id) else { continue };
+        for v in var.values.values() {
+            match v {
+                VariableValue::String(s) => out.push(s.clone()),
+                VariableValue::Alias(a) => todo.push(a.clone()),
+                _ => {}
+            }
+        }
+    }
+    out
+}
+
+/// Auto-sizing text layers measure their boxes again: a box measured while its family was missing
+/// (in a fallback font) follows the real face once that's installed or loaded. Only layers under
+/// `under` (every layer: `None`) that use one of `families` (any family: `None`). Returns the
+/// layers whose size changed.
+pub fn refit(doc: &mut Document, under: Option<&[NodeId]>, families: Option<&[String]>) -> Vec<NodeId> {
+    let want: Option<BTreeSet<String>> = families.map(|f| f.iter().map(|x| x.trim().to_lowercase()).collect());
+    let scope: Option<BTreeSet<NodeId>> = under.map(|ids| ids.iter().flat_map(|i| doc.subtree(*i)).collect());
+    let ids: Vec<NodeId> = doc
+        .nodes()
+        .filter(|n| scope.as_ref().is_none_or(|s| s.contains(&n.id)))
+        .filter(|n| {
+            let NodeKind::Text(t) = &n.kind else { return false };
+            let uses = |w: &BTreeSet<String>| {
+                w.contains(&t.style.font_family.trim().to_lowercase())
+                    || t.spans().iter().any(|(_, _, st)| w.contains(&st.font_family.trim().to_lowercase()))
+            };
+            want.as_ref().is_none_or(uses)
+                && figcraft_text::auto_size(n).is_some_and(|(w, h)| (w - n.width).abs() > 1e-6 || (h - n.height).abs() > 1e-6)
+        })
+        .map(|n| n.id)
+        .collect();
+    if !ids.is_empty() {
+        let before = doc.clone();
+        doc.mark_dirty(ids.iter().copied());
+        crate::normalize(doc, &before);
+    }
+    ids
+}
+
+/// [`refit`] in the open document, if there is one.
+pub(crate) fn refit_open(s: &mut Session, under: Option<&[NodeId]>, families: Option<&[String]>) -> Vec<NodeId> {
+    match s.doc_mut() {
+        Ok(doc) => refit(doc, under, families),
+        Err(_) => Vec::new(),
+    }
+}
+
+/// `text.refit`: the layers `ids` names (an `ids` that isn't a list of layers is refused), else the
+/// whole document.
+fn refit_text(s: &mut Session, p: &Value) -> Result<Value> {
+    let under = match get(p, "ids") {
+        None | Some(Value::Null) => None,
+        Some(_) => Some(req_targets("text.refit", s, p)?),
+    };
+    s.doc()?;
+    Ok(json!({"refitted": refit_open(s, under.as_deref(), None)}))
+}
+
+fn missing_fonts(s: &mut Session, _: &Value) -> Result<Value> {
+    let families: Vec<Value> = missing(s.doc()?).into_iter().map(|m| json!({"family": m.family, "layers": m.layers})).collect();
+    s.request_ui("dialog.missingFonts", json!({}));
+    Ok(json!({"families": families}))
+}
+
+/// The font commands: `text.missingFonts` and `text.refit`.
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        spec!(
+            "text.missingFonts",
+            "Missing fonts",
+            "{}  fonts the open document names that aren't installed (text layers, styled ranges, text styles, font family variables); the app shows them → {families: [{family, layers}]}",
+            false,
+            missing_fonts
+        ),
+        spec!(
+            "text.refit",
+            "Fit text to fonts",
+            "{ids? (these layers and the text in them; default: the whole document)}  auto-sizing text measures its box again, e.g. a box measured in a fallback font while its family was missing → {refitted: [ids whose size changed]}",
+            true,
+            refit_text
+        ),
+    ]
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/engine/src/fonts/tests.rs b/crates/engine/src/fonts/tests.rs
new file mode 100644
index 00000000..5df9a854
--- /dev/null
+++ b/crates/engine/src/fonts/tests.rs
@@ -0,0 +1,234 @@
+use serde_json::json;
+
+use super::*;
+use crate::params::id_of;
+use figcraft_doc::{Style, StyleRun, TextStyle};
+
+fn text(s: &mut Session, family: &str) -> figcraft_doc::NodeId {
+    let id = id_of(&s.execute("text.create", &json!({"text": "Hamburgefonstiv", "x": 0, "y": 0})).unwrap()["id"]).unwrap();
+    if let NodeKind::Text(t) = &mut s.doc_mut().unwrap().get_mut(id).unwrap().kind {
+        t.style.font_family = family.into();
+    }
+    id
+}
+
+fn families(s: &mut Session) -> Vec<(String, u64)> {
+    let r = s.execute("text.missingFonts", &json!({})).unwrap();
+    r["families"].as_array().unwrap().iter().map(|f| (f["family"].as_str().unwrap().to_string(), f["layers"].as_u64().unwrap())).collect()
+}
+
+/// An installed family (built in, or found by the system scan), if this machine has any.
+fn installed() -> Option<String> {
+    figcraft_text::scan_system_fonts();
+    figcraft_text::family_names().into_iter().next()
+}
+
+#[test]
+fn lists_families_of_layers_ranges_styles_and_variables_once_each() {
+    let mut s = Session::new();
+    text(&mut s, "FigCraft Missing A");
+    let b = text(&mut s, "figcraft missing a");
+    if let NodeKind::Text(t) = &mut s.doc_mut().unwrap().get_mut(b).unwrap().kind {
+        let style = TextStyle { font_family: "FigCraft Missing B".into(), ..t.style.clone() };
+        t.runs.push(StyleRun { start: 0, end: 3, style });
+    }
+    let doc = s.doc_mut().unwrap();
+    doc.styles.push(Style {
+        id: "S:1".into(),
+        name: "Heading".into(),
+        description: String::new(),
+        kind: StyleKind::Text { style: TextStyle { font_family: "FigCraft Missing C".into(), ..TextStyle::default() } },
+        bound: Default::default(),
+    });
+    s.execute("variable.createCollection", &json!({"name": "Type", "modes": ["Light", "Dark"]})).unwrap();
+    s.execute("variable.create", &json!({"collection": "Type", "name": "Family", "type": "string", "value": "FigCraft Missing D"})).unwrap();
+    s.execute("variable.set", &json!({"variable": "Family", "mode": "Dark", "value": "FigCraft Missing H"})).unwrap();
+    let var = s.doc().unwrap().variables.get("Family").unwrap().id.clone();
+    s.doc_mut().unwrap().get_mut(b).unwrap().bound.insert("fontFamily".into(), var);
+
+    assert_eq!(
+        families(&mut s),
+        vec![
+            ("FigCraft Missing A".to_string(), 2),
+            ("FigCraft Missing B".to_string(), 1),
+            ("FigCraft Missing C".to_string(), 0),
+            ("FigCraft Missing D".to_string(), 0),
+            ("FigCraft Missing H".to_string(), 0),
+        ]
+    );
+    assert!(s.ui_requests.iter().any(|r| r.kind == "dialog.missingFonts"));
+}
+
+#[test]
+fn installed_families_are_not_listed() {
+    let Some(family) = installed() else {
+        eprintln!("skipped: no fonts on this machine");
+        return;
+    };
+    let mut s = Session::new();
+    text(&mut s, &family);
+    text(&mut s, &family.to_uppercase());
+    text(&mut s, "FigCraft Missing E");
+    assert_eq!(families(&mut s), vec![("FigCraft Missing E".to_string(), 1)]);
+}
+
+#[test]
+fn a_family_found_only_by_the_system_scan_is_not_missing() {
+    figcraft_text::scan_system_fonts();
+    let embedded: Vec<String> = figcraft_text::CRAFT_FONTS.iter().map(|f| f.family.to_lowercase()).collect();
+    let Some(family) = figcraft_text::family_names().into_iter().find(|f| !embedded.contains(&f.to_lowercase())) else {
+        eprintln!("skipped: no system fonts on this machine");
+        return;
+    };
+    let mut s = Session::new();
+    text(&mut s, &family);
+    assert!(families(&mut s).is_empty(), "{family} is installed");
+}
+
+#[test]
+fn blank_families_and_aliases_are_handled() {
+    let mut s = Session::new();
+    text(&mut s, "  ");
+    s.execute("variable.createCollection", &json!({"name": "Type"})).unwrap();
+    s.execute("variable.create", &json!({"collection": "Type", "name": "Base", "type": "string", "value": "FigCraft Missing F"})).unwrap();
+    let base = s.doc().unwrap().variables.get("Base").unwrap().id.clone();
+    let t = text(&mut s, "FigCraft Missing G");
+    let doc = s.doc_mut().unwrap();
+    // A variable that only aliases another, and one aliasing itself.
+    let mut alias = doc.variables.get(&base).unwrap().clone();
+    alias.id = "V:alias".into();
+    alias.name = "Alias".into();
+    for v in alias.values.values_mut() {
+        *v = VariableValue::Alias(base.clone());
+    }
+    let mut cycle = alias.clone();
+    cycle.id = "V:cycle".into();
+    cycle.name = "Cycle".into();
+    for v in cycle.values.values_mut() {
+        *v = VariableValue::Alias("V:cycle".into());
+    }
+    doc.variables.variables.push(alias);
+    doc.variables.variables.push(cycle);
+    doc.get_mut(t).unwrap().bound.insert("fontFamily".into(), "V:alias".into());
+    let other = text(&mut s, "FigCraft Missing G");
+    s.doc_mut().unwrap().get_mut(other).unwrap().bound.insert("fontFamily".into(), "V:cycle".into());
+    // The bound layer takes the value its alias resolves to (bindings are applied after the next
+    // command); the cycle resolves to nothing.
+    let NodeKind::Text(bound) = &s.doc().unwrap().node(t).unwrap().kind else { panic!() };
+    assert_eq!(bound.style.font_family, "FigCraft Missing F");
+    assert_eq!(families(&mut s), vec![("FigCraft Missing F".to_string(), 1), ("FigCraft Missing G".to_string(), 1)]);
+}
+
+/// Aliases in several modes are followed once per variable: a chain that branches in every mode
+/// would otherwise grow to billions of steps (a file can hold one).
+#[test]
+fn branching_alias_chains_are_walked_once_per_variable() {
+    let mut s = Session::new();
+    s.execute("variable.createCollection", &json!({"name": "Type"})).unwrap();
+    for i in 0..32 {
+        s.execute("variable.create", &json!({"collection": "Type", "name": format!("V{i}"), "type": "string", "value": "x"})).unwrap();
+    }
+    let doc = s.doc_mut().unwrap();
+    let ids: Vec<String> = doc.variables.variables.iter().map(|v| v.id.clone()).collect();
+    for (i, var) in doc.variables.variables.iter_mut().enumerate() {
+        let next = ids.get(i + 1).cloned().unwrap_or_else(|| "FigCraft Missing H".into());
+        let leaf = |v: String| if i + 1 < ids.len() { VariableValue::Alias(v) } else { VariableValue::String(v) };
+        var.values = [("m1".to_string(), leaf(next.clone())), ("m2".to_string(), leaf(next))].into();
+    }
+    assert_eq!(string_values(&doc.variables, &ids[0]), vec!["FigCraft Missing H", "FigCraft Missing H"]);
+}
+
+#[test]
+fn needs_an_open_document() {
+    let mut s = Session::empty();
+    assert!(s.execute("text.missingFonts", &json!({})).is_err());
+}
+
+/// Make `id`'s box stale, as if it was measured in another font: `dw` wider than its content.
+fn stale(s: &mut Session, id: figcraft_doc::NodeId, dw: f64) -> f64 {
+    let doc = s.doc_mut().unwrap();
+    let n = doc.get_mut(id).unwrap();
+    let want = figcraft_text::auto_size(n).unwrap().0;
+    n.width = want + dw;
+    doc.take_dirty();
+    want
+}
+
+/// The width of layer `id`.
+fn width(s: &Session, id: figcraft_doc::NodeId) -> f64 {
+    s.doc().unwrap().node(id).unwrap().width
+}
+
+/// The ids a refit reports.
+fn refitted(r: &Value) -> Vec<u64> {
+    r["refitted"].as_array().unwrap().iter().map(|v| v.as_u64().unwrap()).collect()
+}
+
+/// Stale boxes fit their text again, by family, by layer or everywhere; fixed boxes keep theirs.
+#[test]
+fn refit_measures_stale_text_boxes_again() {
+    let mut s = Session::new();
+    let a = text(&mut s, "FigCraft Refit A");
+    let b = text(&mut s, "FigCraft Refit B");
+    let fixed = text(&mut s, "FigCraft Refit A");
+    if let NodeKind::Text(t) = &mut s.doc_mut().unwrap().get_mut(fixed).unwrap().kind {
+        t.auto_resize = figcraft_doc::TextAutoResize::None;
+    }
+    s.execute("select.none", &json!({})).unwrap();
+    let want_a = stale(&mut s, a, -30.0);
+    let want_b = stale(&mut s, b, 25.0);
+    s.doc_mut().unwrap().get_mut(fixed).unwrap().width = 7.0;
+    s.doc_mut().unwrap().take_dirty();
+    // Only the families asked for.
+    let only_a = super::refit(s.doc_mut().unwrap(), None, Some(&["figcraft refit a".to_string()]));
+    assert_eq!(only_a, vec![a]);
+    assert_eq!(width(&s, a), want_a);
+    assert_eq!(width(&s, b), want_b + 25.0);
+    // Only the layers asked for, then everything; a fixed box keeps its size.
+    stale(&mut s, a, 12.0);
+    assert!(refitted(&s.execute("text.refit", &json!({"ids": [b]})).unwrap()) == vec![b.0]);
+    assert_eq!((width(&s, a), width(&s, b)), (want_a + 12.0, want_b));
+    assert!(refitted(&s.execute("text.refit", &json!({})).unwrap()) == vec![a.0]);
+    assert_eq!(width(&s, a), want_a);
+    assert_eq!(width(&s, fixed), 7.0);
+    // Nothing stale: nothing changes.
+    assert!(refitted(&s.execute("text.refit", &json!({})).unwrap()).is_empty());
+    assert!(s.execute("text.refit", &json!({"ids": ["nope"]})).is_err());
+    // An `ids` that isn't a list is refused, not taken as the whole document.
+    stale(&mut s, a, 9.0);
+    assert!(s.execute("text.refit", &json!({"ids": a.0.to_string()})).is_err());
+    assert_eq!(width(&s, a), want_a + 9.0);
+    assert!(Session::empty().execute("text.refit", &json!({})).is_err());
+}
+
+/// Text inside an instance is refitted too.
+#[test]
+fn refit_reaches_text_in_instances() {
+    let mut s = Session::new();
+    let t = text(&mut s, "FigCraft Refit C");
+    let comp = id_of(&s.execute("component.create", &json!({"ids": [t]})).unwrap()["id"]).unwrap();
+    let inst = id_of(&s.execute("instance.create", &json!({"component": comp, "x": 300, "y": 0})).unwrap()["id"]).unwrap();
+    let copy = s.doc().unwrap().node(inst).unwrap().children[0];
+    let want = stale(&mut s, copy, -20.0);
+    let r = s.execute("text.refit", &json!({"ids": [inst]})).unwrap();
+    assert_eq!(refitted(&r), vec![copy.0]);
+    assert_eq!(width(&s, copy), want);
+}
+
+/// `text.loadFont` refuses what isn't a font file; `text.rescanFonts` reports what it added.
+#[test]
+fn fonts_load_from_files_and_rescans_report_new_families() {
+    let mut s = Session::new();
+    assert!(s.execute("text.loadFont", &json!({})).is_err());
+    assert!(s.execute("text.loadFont", &json!({"data": "bm90IGEgZm9udA=="})).is_err(), "not a font file");
+    assert!(s.execute("text.loadFont", &json!({"data": "%%%"})).is_err());
+    assert!(s.execute("text.loadFont", &json!({"path": "no-such-dir/x.ttf"})).is_err());
+    if let Some(f) = figcraft_text::CRAFT_FONTS.first() {
+        use base64::Engine as _;
+        let data = base64::engine::general_purpose::STANDARD.encode(f.bytes);
+        let r = s.execute("text.loadFont", &json!({"data": data})).unwrap();
+        assert_eq!(r["families"].as_array().map(Vec::len), Some(1));
+    }
+    let r = s.execute("text.rescanFonts", &json!({})).unwrap();
+    assert!(r["added"].is_array());
+}
diff --git a/crates/engine/src/frame_label_tests.rs b/crates/engine/src/frame_label_tests.rs
index 8e9ede7b..3da9522f 100644
--- a/crates/engine/src/frame_label_tests.rs
+++ b/crates/engine/src/frame_label_tests.rs
@@ -1,6 +1,7 @@
 //! Frame name labels as pointer targets: a press on a label (its area as the canvas drew it,
 //! turned with a rotated frame) selects the frame and drags it in one undo step, hovering it
-//! highlights the frame, and labels of locked, hidden, deleted or other pages' frames do nothing.
+//! highlights the frame, a double-click asks the UI to rename it there, and labels of locked,
+//! hidden, deleted or other pages' frames do nothing.
 
 use figcraft_doc::NodeId;
 use figcraft_geom::Point;
@@ -90,3 +91,24 @@ fn labels_of_frames_that_cant_be_picked_do_nothing() {
     let flat = [Point::new(1.0, 1.0); 4];
     assert_eq!(label_at(s.doc().unwrap(), page, &[(f, nan), (f, flat)], Point::new(1.0, 1.0)), None);
 }
+
+#[test]
+fn double_clicking_a_label_asks_to_rename_its_frame() {
+    let (mut s, f, q) = setup();
+    let c = center(&q);
+    let before = s.doc().unwrap().world_bounds(f).unwrap();
+    let undo = s.ds().unwrap().history.undo.len();
+    for kind in [PointerKind::Down, PointerKind::Up, PointerKind::Down, PointerKind::DoubleClick] {
+        s.pointer(&ev(kind, c)).unwrap();
+    }
+    assert_eq!(s.selection(), vec![f]);
+    let asked = s.ui_requests.iter().find(|r| r.kind == "canvas.renameLabel").map(|r| id_of(&r.data["id"]));
+    assert_eq!(asked, Some(Some(f)), "the UI renames the frame at its label");
+    assert_eq!(s.doc().unwrap().world_bounds(f), Some(before), "not moved");
+    assert_eq!(s.ds().unwrap().history.undo.len(), undo, "nothing to undo yet");
+    // Other tools ignore the label.
+    s.ui_requests.clear();
+    s.set_tool(crate::tools::ToolId::Hand);
+    s.pointer(&ev(PointerKind::DoubleClick, c)).unwrap();
+    assert!(s.ui_requests.iter().all(|r| r.kind != "canvas.renameLabel"));
+}
diff --git a/crates/engine/src/fx_behaviour_tests.rs b/crates/engine/src/fx_behaviour_tests.rs
index eb8da9b2..d9d93592 100644
--- a/crates/engine/src/fx_behaviour_tests.rs
+++ b/crates/engine/src/fx_behaviour_tests.rs
@@ -53,6 +53,29 @@ fn the_eyedropper_picks_the_colour_seen_and_fills_the_selection() {
     assert_eq!(s.doc().unwrap().node(b).unwrap().fills[0].solid_color().map(|c| c.to_hex()), Some("00FF00".into()));
 }
 
+#[test]
+fn the_eyedropper_of_a_colour_picker_samples_without_filling() {
+    // Opened from a colour picker (`apply: false`), the eyedropper hands the colour to the picker,
+    // which writes it to its own paint (a stroke, an effect...): the fill stays as it was.
+    let mut s = Session::new();
+    s.execute("page.setBackground", &json!({"color": "#FFFFFF"})).unwrap();
+    rect(&mut s, None, (0.0, 0.0, 100.0, 100.0), "#FF0000");
+    let b = rect(&mut s, None, (200.0, 0.0, 50.0, 50.0), "#00FF00");
+    s.execute("select.set", &json!({"ids": [b]})).unwrap();
+    let undo = s.undo_depth().0;
+    s.execute("edit.pickColor", &json!({"apply": false})).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Down, 50.0, 50.0, 1.0)).unwrap();
+    assert_eq!(s.doc().unwrap().node(b).unwrap().fills[0].solid_color().map(|c| c.to_hex()), Some("00FF00".into()));
+    assert_eq!(s.undo_depth().0, undo, "nothing to undo");
+    assert_eq!(s.tool.picked.take().map(|c| c.to_hex()), Some("FF0000".into()));
+    assert_eq!(s.tool.tool, ToolId::Move, "picking ends the eyedropper");
+    // The I key's eyedropper fills the selection again.
+    s.execute("edit.pickColor", &json!({})).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Down, 50.0, 50.0, 1.0)).unwrap();
+    assert_eq!(s.doc().unwrap().node(b).unwrap().fills[0].solid_color().map(|c| c.to_hex()), Some("FF0000".into()));
+    assert_eq!(s.tool.picked, None);
+}
+
 #[test]
 fn blend_modes_and_effects_through_commands() {
     let mut s = Session::new();
diff --git a/crates/engine/src/guard.rs b/crates/engine/src/guard.rs
index 6161f46b..d77a1bfc 100644
--- a/crates/engine/src/guard.rs
+++ b/crates/engine/src/guard.rs
@@ -9,7 +9,7 @@ pub fn run<T>(cmd: &str, f: impl FnOnce() -> Result<T>) -> Result<T> {
         Err(payload) => {
             let msg = payload
                 .downcast_ref::<&str>()
-                .map(|s| s.to_string())
+                .map(ToString::to_string)
                 .or_else(|| payload.downcast_ref::<String>().cloned())
                 .unwrap_or_else(|| "panic".to_string());
             log::error!("command `{cmd}` panicked: {msg}");
diff --git a/crates/engine/src/history_behaviour_tests.rs b/crates/engine/src/history_behaviour_tests.rs
index e20f1bd1..45e0c7bf 100644
--- a/crates/engine/src/history_behaviour_tests.rs
+++ b/crates/engine/src/history_behaviour_tests.rs
@@ -547,7 +547,11 @@ fn branches_and_the_version_history() {
     // On the branch tab.
     // A branch keeps its own version history: a version saved on its tab is listed there only.
     ex(&mut s, "file.saveVersion", json!({"name": "On the branch"}));
-    assert_eq!(versions(&mut s).iter().map(|v| v["name"].clone()).collect::<Vec<_>>(), [json!("On the branch")], "a branch's own history");
+    assert_eq!(
+        versions(&mut s).iter().map(|v| v["name"].clone()).collect::<Vec<_>>(),
+        [json!("Branch created"), json!("On the branch")],
+        "a branch's own history"
+    );
     rect(&mut s, 900.0, 900.0, None);
     ex(&mut s, "doc.switch", json!({"index": 0}));
     let made_on_main = rect(&mut s, -500.0, 0.0, None);
diff --git a/crates/engine/src/html_codegen_tests.rs b/crates/engine/src/html_codegen_tests.rs
index b7fbb9ac..cd1318ee 100644
--- a/crates/engine/src/html_codegen_tests.rs
+++ b/crates/engine/src/html_codegen_tests.rs
@@ -53,11 +53,57 @@ fn class_names_are_valid_and_deep_trees_are_bounded() {
         parent = id(s.execute("frame.create", &json!({"x": 1, "y": 1, "width": 90, "height": 90, "parent": parent})).unwrap());
     }
     let code = code_for(s.doc().unwrap(), root, CodeLang::Html);
-    assert!(code.starts_with("<div class=\"layer-1-n-code-name\">"), "{}", code.lines().next().unwrap());
+    assert!(code.starts_with("<div class=\"layer-1-unicode-name\">"), "{}", code.lines().next().unwrap());
     // Nesting stops at the depth limit instead of running away.
     assert!(code.matches("<div").count() <= 14, "{}", code.matches("<div").count());
 }
 
+#[test]
+fn non_ascii_layer_names_transliterate_into_readable_classes() {
+    let mut s = Session::new();
+    // Korean reads as its romanization instead of layer- (#1235), with duplicates numbered.
+    let f = id(s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 300, "height": 200})).unwrap());
+    s.execute("node.set", &json!({"id": f, "props": {"name": "로그인 화면"}})).unwrap();
+    let a = id(s.execute("text.create", &json!({"text": "Login", "x": 0, "y": 0, "parent": f})).unwrap());
+    let b = id(s.execute("text.create", &json!({"text": "Login", "x": 0, "y": 40, "parent": f})).unwrap());
+    s.execute("node.set", &json!({"id": a, "props": {"name": "로그인"}})).unwrap();
+    s.execute("node.set", &json!({"id": b, "props": {"name": "로그인"}})).unwrap();
+    let code = code_for(s.doc().unwrap(), f, CodeLang::Html);
+    assert!(code.contains("<div class=\"rogeuin-hwamyeon\">"), "{code}");
+    assert!(code.contains("<p class=\"rogeuin\">") && code.contains("<p class=\"rogeuin-2\">"), "{code}");
+}
+
+#[test]
+fn other_scripts_and_symbol_names_transliterate_or_fall_back_to_the_kind() {
+    let mut s = Session::new();
+    let f = id(s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 100, "height": 100, "name": "按钮"})).unwrap());
+    let k = id(s.execute("text.create", &json!({"text": "Ok", "x": 0, "y": 0, "parent": f})).unwrap());
+    s.execute("node.set", &json!({"id": k, "props": {"name": "кнопка"}})).unwrap();
+    let hash = id(s.execute("text.create", &json!({"text": "###", "x": 0, "y": 20, "parent": f})).unwrap());
+    s.execute("node.set", &json!({"id": hash, "props": {"name": "###"}})).unwrap();
+    let digit = id(s.execute("shape.rectangle", &json!({"x": 0, "y": 40, "width": 10, "height": 10, "parent": f})).unwrap());
+    s.execute("node.set", &json!({"id": digit, "props": {"name": "4버튼"}})).unwrap();
+    let code = code_for(s.doc().unwrap(), f, CodeLang::Html);
+    assert!(code.contains("<div class=\"an-niu\">"), "Chinese: {code}");
+    assert!(code.contains("<p class=\"knopka\">"), "Cyrillic: {code}");
+    assert!(code.contains("<p class=\"text\">"), "symbols fall back to the kind: {code}");
+    assert!(code.contains("layer-4beoteun"), "a leading digit keeps the layer- prefix: {code}");
+}
+
+#[test]
+fn long_names_cut_at_a_word_boundary() {
+    let mut s = Session::new();
+    let long = format!("{}-{}", "a".repeat(30), "b".repeat(30));
+    let f = id(s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 10, "height": 10, "name": long})).unwrap());
+    let code = code_for(s.doc().unwrap(), f, CodeLang::Html);
+    let word = "a".repeat(30);
+    assert!(code.contains(&format!("<div class=\"{word}\">")), "cut back to the first word: {code}");
+    let unbroken = "c".repeat(50);
+    let g = id(s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 10, "height": 10, "name": unbroken})).unwrap());
+    let code = code_for(s.doc().unwrap(), g, CodeLang::Html);
+    assert!(code.contains(&format!("class=\"{}\"", "c".repeat(40))), "one long word cuts at 40: {code}");
+}
+
 #[test]
 fn leptos_wraps_the_markup_in_a_component_with_text_as_string_literals() {
     let mut s = Session::new();
diff --git a/crates/engine/src/huge_stroke_tests.rs b/crates/engine/src/huge_stroke_tests.rs
new file mode 100644
index 00000000..7efabb48
--- /dev/null
+++ b/crates/engine/src/huge_stroke_tests.rs
@@ -0,0 +1,28 @@
+//! An absurd stroke weight must not take the renderer down with it: saving (thumbnail) and exporting still work.
+
+use serde_json::{Value, json};
+
+use crate::Session;
+use crate::params::id_of;
+use figcraft_doc::NodeId;
+
+fn id(v: Value) -> NodeId {
+    id_of(&v["id"]).unwrap()
+}
+
+#[test]
+fn huge_stroke_weight_with_round_caps_still_saves_and_exports() {
+    for weight in [1e6, 1e7, 1e10, 1e30] {
+        let mut s = Session::new();
+        let f = id(s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 100, "height": 100})).unwrap());
+        let v = id(s.execute("vector.create", &json!({"parent": f, "path": "M0 0.8333 L7.5 6.25 L15 0.8333"})).unwrap());
+        s.execute("node.set", &json!({"id": v, "props": {"stroke": "#ff0000", "strokeWeight": weight, "strokeCap": "round", "strokeJoin": "round"}}))
+            .unwrap();
+        let path = std::env::temp_dir().join(format!("figcraft-huge-stroke-{}-{weight}.figcraft", std::process::id()));
+        let saved = s.execute("file.saveAs", &json!({"path": path.to_string_lossy()}));
+        let _ = std::fs::remove_file(&path);
+        assert!(saved.is_ok(), "saveAs at weight {weight}: {:?}", saved.err());
+        let exported = s.execute("file.export", &json!({"ids": [f], "format": "png"}));
+        assert!(exported.is_ok(), "export at weight {weight}: {:?}", exported.err());
+    }
+}
diff --git a/crates/engine/src/id_params_behaviour_tests.rs b/crates/engine/src/id_params_behaviour_tests.rs
new file mode 100644
index 00000000..c5207b44
--- /dev/null
+++ b/crates/engine/src/id_params_behaviour_tests.rs
@@ -0,0 +1,161 @@
+//! Layer ids in params: naming something that isn't a layer is a mistake, and says so, rather than
+//! quietly meaning "none".
+//!
+//! `node.create`'s `parent` was `id(p, "parent").unwrap_or(page)`, so any value that isn't an id —
+//! a `{"$step": n}` nothing had resolved, a name, a negative number — became "no parent" and the
+//! layer landed on the page while the call reported success. The same shape sat on `image.place`
+//! and `instance.create`'s parents, on `index`, and on the `ids` of every command that targets
+//! layers (an entry that wasn't an id was dropped and the rest ran).
+
+use crate::params::id_of;
+use crate::{EngineError, Session};
+use figcraft_doc::*;
+use serde_json::{Value, json};
+
+/// The page's children, by name (bottom first).
+fn top(s: &Session) -> Vec<String> {
+    let doc = s.doc().unwrap();
+    let page = s.page().unwrap();
+    doc.node(page).unwrap().children.iter().filter_map(|c| doc.node(*c).map(|n| n.name.clone())).collect()
+}
+
+/// The message of a failure, or `None` when the call went through.
+fn failed(r: std::result::Result<Value, EngineError>) -> Option<String> {
+    match r {
+        Ok(_) => None,
+        Err(e) => Some(e.to_string()),
+    }
+}
+
+fn rect(parent: Value) -> Value {
+    json!({"type": "rectangle", "name": "child", "parent": parent, "x": 0, "y": 0, "width": 10, "height": 10})
+}
+
+fn card(s: &mut Session) -> NodeId {
+    let v = s.execute("node.create", &json!({"type": "frame", "name": "Card", "x": 0, "y": 0, "width": 100, "height": 100})).unwrap();
+    id_of(&v["id"]).unwrap()
+}
+
+#[test]
+fn a_parent_that_is_not_an_id_is_refused_rather_than_becoming_the_page() {
+    let mut s = Session::new();
+    let card = card(&mut s);
+    for parent in [json!({"$step": 0}), json!("Card"), json!(-1), json!(true)] {
+        let msg = failed(s.execute("node.create", &rect(parent.clone()))).unwrap_or_else(|| panic!("{parent} must be refused"));
+        assert!(msg.contains("`parent` must be a node id"), "{parent}: {msg}");
+    }
+    assert_eq!(top(&s), ["Card"], "nothing landed on the page");
+    let doc = s.doc().unwrap();
+    assert!(doc.node(card).unwrap().children.is_empty(), "nor inside the frame");
+}
+
+#[test]
+fn leaving_the_parent_out_or_null_still_means_the_page() {
+    let mut s = Session::new();
+    let card = card(&mut s);
+    for parent in [None, Some(json!(null))] {
+        let mut p = rect(json!(0));
+        match parent {
+            None => _ = p.as_object_mut().unwrap().remove("parent"),
+            Some(v) => p["parent"] = v,
+        }
+        s.execute("node.create", &p).unwrap();
+    }
+    assert_eq!(top(&s), ["Card", "child", "child"]);
+    let doc = s.doc().unwrap();
+    assert!(doc.node(card).unwrap().children.is_empty());
+}
+
+#[test]
+fn a_parent_id_that_names_nothing_is_still_reported() {
+    let mut s = Session::new();
+    card(&mut s);
+    let msg = failed(s.execute("node.create", &rect(json!(99999)))).unwrap_or_else(|| panic!("a missing layer must fail"));
+    assert!(msg.contains("no such node 99999"), "{msg}");
+}
+
+#[test]
+fn an_index_that_is_not_a_whole_non_negative_number_is_refused() {
+    let mut s = Session::new();
+    let card = card(&mut s);
+    // (A boolean is a number to `f64_of` — `true` reads as 1 — as for `x`, `width` and every
+    // other number, so it is deliberately not in this list.)
+    for index in [json!("last"), json!(1.5), json!(-1), json!(-0.5), json!(1e12)] {
+        let mut p = rect(json!(card));
+        p["index"] = index.clone();
+        let msg = failed(s.execute("node.create", &p)).unwrap_or_else(|| panic!("index {index} must be refused"));
+        assert!(msg.contains("`index`"), "{index}: {msg}");
+    }
+    let doc = s.doc().unwrap();
+    assert!(doc.node(card).unwrap().children.is_empty(), "nothing was inserted");
+}
+
+#[test]
+fn a_whole_index_still_inserts_where_it_says() {
+    let mut s = Session::new();
+    let card = card(&mut s);
+    for name in ["a", "b"] {
+        s.execute("node.create", &json!({"type": "rectangle", "name": name, "parent": card, "x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+    }
+    s.execute("node.create", &json!({"type": "rectangle", "name": "mid", "parent": card, "index": 1, "x": 0, "y": 0, "width": 10, "height": 10}))
+        .unwrap();
+    let doc = s.doc().unwrap();
+    let names: Vec<&str> = doc.node(card).unwrap().children.iter().filter_map(|c| doc.node(*c).map(|n| n.name.as_str())).collect();
+    assert_eq!(names, ["a", "mid", "b"]);
+}
+
+#[test]
+fn ids_entries_that_are_not_ids_are_refused_instead_of_being_dropped() {
+    let mut s = Session::new();
+    let card = card(&mut s);
+    // The junk used to be dropped and the rest applied, so `["nope", card]` renamed the frame.
+    for ids in [json!(["nope"]), json!(["nope", card]), json!([{"$step": 0}, card]), json!([null])] {
+        let msg =
+            failed(s.execute("node.set", &json!({"ids": ids, "props": {"name": "renamed"}}))).unwrap_or_else(|| panic!("{ids} must be refused"));
+        assert!(msg.contains("`ids`"), "{ids}: {msg}");
+    }
+    let doc = s.doc().unwrap();
+    assert_eq!(doc.node(card).unwrap().name, "Card", "nothing was renamed");
+}
+
+#[test]
+fn an_ids_that_is_not_an_array_is_refused_but_null_means_the_selection() {
+    let mut s = Session::new();
+    let card = card(&mut s);
+    let msg =
+        failed(s.execute("node.set", &json!({"ids": "nope", "props": {"name": "renamed"}}))).unwrap_or_else(|| panic!("a non-array ids must fail"));
+    assert!(msg.contains("`ids` must be an array"), "{msg}");
+    // An explicit null says the same as leaving it out: the selection.
+    s.execute("select.set", &json!({"ids": [card]})).unwrap();
+    s.execute("node.set", &json!({"ids": null, "props": {"name": "Selected"}})).unwrap();
+    assert_eq!(s.doc().unwrap().node(card).unwrap().name, "Selected");
+}
+
+#[test]
+fn a_single_id_that_is_not_an_id_is_refused() {
+    let mut s = Session::new();
+    card(&mut s);
+    let msg =
+        failed(s.execute("node.set", &json!({"id": {"$step": 0}, "props": {"name": "renamed"}}))).unwrap_or_else(|| panic!("a bad id must fail"));
+    assert!(msg.contains("`id` must be a node id"), "{msg}");
+}
+
+#[test]
+fn an_image_and_an_instance_parent_are_checked_the_same_way() {
+    let mut s = Session::new();
+    card(&mut s);
+    let img = failed(s.execute("image.place", &json!({"data": "aGk=", "parent": {"$step": 0}})));
+    assert!(img.unwrap_or_default().contains("`parent` must be a node id"), "image.place");
+    let inst = failed(s.execute("instance.create", &json!({"component": 99999, "parent": {"$step": 0}})));
+    assert!(inst.is_some(), "instance.create refuses both a bad component and a bad parent");
+}
+
+#[test]
+fn a_huge_bad_value_is_cut_short_in_the_error() {
+    let mut s = Session::new();
+    card(&mut s);
+    let junk = "é".repeat(10_000);
+    let msg = failed(s.execute("node.set", &json!({"ids": junk, "props": {"name": "renamed"}}))).unwrap_or_else(|| panic!("must fail"));
+    assert!(msg.contains("`ids` must be an array") && msg.ends_with("…)"), "{msg}");
+    assert!(msg.chars().count() < 200, "{} chars", msg.chars().count());
+}
diff --git a/crates/engine/src/images_left_in_file_tests.rs b/crates/engine/src/images_left_in_file_tests.rs
new file mode 100644
index 00000000..98e1cd8b
--- /dev/null
+++ b/crates/engine/src/images_left_in_file_tests.rs
@@ -0,0 +1,81 @@
+use serde_json::json;
+
+use crate::Session;
+use crate::cmd::file::FileSnapshot;
+
+fn rect(s: &mut Session, x: f64) {
+    s.execute("shape.rectangle", &json!({"x": x, "y": 0, "width": 10, "height": 10})).unwrap();
+}
+
+fn opened_with_images_left_in_file(name: &str) -> (std::path::PathBuf, String, Session) {
+    let dir = std::env::temp_dir().join(format!("figcraft-images-left-{name}-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("big.figcraft").to_string_lossy().to_string();
+    let mut s = Session::new();
+    rect(&mut s, 0.0);
+    s.execute("file.save", &json!({"path": path})).unwrap();
+    let mut t = Session::empty();
+    t.execute("file.open", &json!({"path": path})).unwrap();
+    let i = t.active;
+    let tab = t.docs.remove(i).with_images_left_in_file(&path, 3);
+    t.docs.insert(i, tab);
+    (dir, path, t)
+}
+
+#[test]
+fn a_file_with_images_left_out_is_not_saved_over() {
+    let (dir, path, mut s) = opened_with_images_left_in_file("save");
+    let before = std::fs::read(&path).unwrap();
+    rect(&mut s, 20.0);
+    let err = s.execute("file.save", &json!({})).unwrap_err().to_string();
+    assert!(err.contains("3 of its images") && err.contains("another name"), "{err}");
+    assert_eq!(std::fs::read(&path).unwrap(), before);
+    assert!(s.ds().unwrap().is_dirty());
+
+    let copy = dir.join("copy.figcraft").to_string_lossy().to_string();
+    s.execute("file.saveAs", &json!({"path": copy})).unwrap();
+    assert!(!s.ds().unwrap().is_dirty());
+    rect(&mut s, 40.0);
+    s.execute("file.save", &json!({})).unwrap();
+    assert!(s.execute("file.saveAs", &json!({"path": path})).is_err());
+    assert_eq!(std::fs::read(&path).unwrap(), before);
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn a_snapshot_encoded_in_the_background_does_not_save_over_it() {
+    let (dir, path, mut s) = opened_with_images_left_in_file("snapshot");
+    let before = std::fs::read(&path).unwrap();
+    rect(&mut s, 20.0);
+    let file = FileSnapshot::of(s.ds().unwrap());
+    let bytes = file.encode().unwrap();
+    assert!(file.save(&mut s, &bytes).is_err());
+    assert_eq!(std::fs::read(&path).unwrap(), before);
+    assert!(s.ds().unwrap().is_dirty());
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn a_file_without_images_left_out_saves_as_before() {
+    let (dir, path, mut s) = opened_with_images_left_in_file("none");
+    let i = s.active;
+    let tab = s.docs.remove(i).with_images_left_in_file(&path, 0);
+    s.docs.insert(i, tab);
+    rect(&mut s, 20.0);
+    s.execute("file.save", &json!({})).unwrap();
+    assert!(!s.ds().unwrap().is_dirty());
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn a_hard_link_to_the_file_is_not_saved_over() {
+    let (dir, path, mut s) = opened_with_images_left_in_file("hard-link");
+    let link = dir.join("link.figcraft");
+    let _ = std::fs::remove_file(&link);
+    std::fs::hard_link(&path, &link).unwrap();
+    let before = std::fs::read(&path).unwrap();
+    rect(&mut s, 20.0);
+    assert!(s.execute("file.saveAs", &json!({"path": link.to_string_lossy()})).is_err());
+    assert_eq!(std::fs::read(&path).unwrap(), before);
+    let _ = std::fs::remove_dir_all(&dir);
+}
diff --git a/crates/engine/src/import_journal_tests.rs b/crates/engine/src/import_journal_tests.rs
new file mode 100644
index 00000000..f8fa84ef
--- /dev/null
+++ b/crates/engine/src/import_journal_tests.rs
@@ -0,0 +1,51 @@
+//! Imported file bytes already live in the document: the command log keeps no second copy.
+
+use base64::Engine as _;
+use serde_json::{Value, json};
+
+use crate::Session;
+
+const SVG: &str = r##"<svg xmlns="http://www.w3.org/2000/svg" width="40" height="20"><rect width="40" height="20" fill="#3366cc"/></svg>"##;
+
+fn payload() -> String {
+    base64::engine::general_purpose::STANDARD.encode(SVG)
+}
+
+fn holds_payload(journal: &[(String, Value)]) -> bool {
+    let payload = payload();
+    journal.iter().any(|(_, params)| params.to_string().contains(&payload))
+}
+
+#[test]
+fn byte_imports_keep_no_payload_in_the_journal() {
+    let mut s = Session::new();
+    let before = s.doc().unwrap().node_count();
+    s.execute("file.import", &json!({"data": payload(), "name": "pasted.svg"})).unwrap();
+    assert!(!holds_payload(&s.journal), "the journal must not retain the Base64 file");
+    // Not journaling is no change to the edit itself: still one undo step.
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(s.doc().unwrap().node_count(), before);
+}
+
+#[test]
+fn batch_wrappers_do_not_retain_import_payloads() {
+    let mut s = Session::new();
+    let nested =
+        json!({"command": "command.batch", "params": {"commands": [{"command": "file.import", "params": {"data": payload(), "name": "a.svg"}}]}});
+    s.execute("command.batch", &json!({"commands": [nested]})).unwrap();
+    assert!(!holds_payload(&s.journal));
+}
+
+#[test]
+fn path_imports_and_ordinary_edits_are_still_journaled() {
+    let dir = std::env::temp_dir().join(format!("figcraft-import-journal-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("kit.svg");
+    std::fs::write(&path, SVG).unwrap();
+    let mut s = Session::new();
+    s.execute("file.import", &json!({"path": path.to_string_lossy()})).unwrap();
+    s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+    let ids: Vec<_> = s.journal.iter().map(|(id, _)| id.as_str()).collect();
+    assert_eq!(ids, ["file.import", "shape.rectangle"]);
+    std::fs::remove_dir_all(&dir).ok();
+}
diff --git a/crates/engine/src/inspect_behaviour_tests.rs b/crates/engine/src/inspect_behaviour_tests.rs
index 09304ec6..ec6a89bc 100644
--- a/crates/engine/src/inspect_behaviour_tests.rs
+++ b/crates/engine/src/inspect_behaviour_tests.rs
@@ -215,6 +215,26 @@ fn css_for_common_layers() {
     }
 }
 
+/// Individual stroke sides are borders on those sides only: a header with a divider under it isn't
+/// boxed in, and a side bound to a variable names it.
+#[test]
+fn css_borders_follow_individual_stroke_sides() {
+    let mut s = Session::new();
+    let r = rect(&mut s, 0.0, 0.0, 100.0, 50.0, None);
+    set(&mut s, &[r], json!({"strokes": ["#000000"], "strokeWeight": 1, "strokeSides": [0, 0, 2, 0]}));
+    let c = css(&mut s, r);
+    assert!(c.contains("border-bottom: 2px solid #000000;"), "{c}");
+    assert!(!c.contains("border:") && !c.contains("border-top") && !c.contains("border-right") && !c.contains("border-left"), "{c}");
+
+    let col = ex(&mut s, "variable.createCollection", json!({"name": "Borders"}));
+    let col = col["id"].as_str().unwrap().to_string();
+    ex(&mut s, "variable.create", json!({"collection": col, "name": "border/top", "type": "number", "value": 3}));
+    ex(&mut s, "variable.bind", json!({"ids": [r], "field": "strokeTopWeight", "variable": "border/top"}));
+    let c = css(&mut s, r);
+    assert!(c.contains("border-top: var(--border-top, 3px) solid #000000;"), "{c}");
+    assert!(c.contains("border-bottom: 2px solid #000000;"), "{c}");
+}
+
 #[test]
 fn native_code_for_a_simple_layer() {
     let mut s = Session::new();
@@ -325,6 +345,13 @@ fn rem_conversion_leaves_names_alone() {
     let f = crate::codegen::px_to_rem;
     // Lengths convert, names ending in "px" don't.
     assert_eq!(f("width: 32px; --gap-8px: 1; margin: -8px 0px;", 16.0), "width: 2rem; --gap-8px: 1; margin: -0.5rem 0rem;");
-    assert_eq!(f("épx 1px px", 16.0), "épx 0.06rem px");
+    assert_eq!(f("épx 1px px", 16.0), "épx 0.0625rem px");
     assert_eq!(f("", 16.0), "");
 }
+
+#[test]
+fn rem_conversion_keeps_the_original_pixels() {
+    let f = crate::codegen::px_to_rem;
+    assert_eq!(f("padding: 3px;", 16.0), "padding: 0.1875rem;");
+    assert_eq!(f("gap: 0.5px;", 16.0), "gap: 0.03125rem;");
+}
diff --git a/crates/engine/src/instance_modes_tests.rs b/crates/engine/src/instance_modes_tests.rs
new file mode 100644
index 00000000..43de3ca4
--- /dev/null
+++ b/crates/engine/src/instance_modes_tests.rs
@@ -0,0 +1,196 @@
+//! Variable modes on instances: an instance is on the modes its main component sets, under the
+//! ones set on the instance itself, so switching variants or changing the main's mode reaches it.
+
+use serde_json::{Value, json};
+
+use crate::Session;
+use crate::params::id_of;
+use figcraft_doc::NodeId;
+
+fn run(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd} {p}: {e}"))
+}
+
+fn id(v: Value) -> NodeId {
+    id_of(&v["id"]).unwrap()
+}
+
+fn fill(s: &Session, n: NodeId) -> String {
+    s.doc().unwrap().node(n).unwrap().fills.first().and_then(|p| p.solid_color()).map(|c| c.to_hex()).unwrap_or_default()
+}
+
+fn set_mode(s: &mut Session, n: NodeId, mode: Value) {
+    run(s, "variable.setMode", json!({"ids": [n], "collection": "Tone", "mode": mode}));
+}
+
+/// A "Tone" collection whose variable `c` is red in mode A and blue in mode B.
+fn tone(s: &mut Session) {
+    run(s, "variable.createCollection", json!({"name": "Tone", "modes": ["A", "B"]}));
+    run(s, "variable.create", json!({"collection": "Tone", "name": "c", "type": "color", "values": {"A": "#FF0000", "B": "#0000FF"}}));
+}
+
+/// A component filled from `c`, on `mode` when one is given.
+fn swatch(s: &mut Session, name: &str, mode: Option<&str>) -> NodeId {
+    let f = id(run(s, "frame.create", json!({"x": 0, "y": 0, "width": 40, "height": 40, "name": name})));
+    run(s, "variable.bind", json!({"ids": [f], "field": "fill", "variable": "c"}));
+    if let Some(m) = mode {
+        set_mode(s, f, json!(m));
+    }
+    id(run(s, "component.create", json!({"ids": [f]})))
+}
+
+/// A set "Kind" whose variants A and B each set their own Tone mode.
+fn kinds(s: &mut Session) -> (NodeId, NodeId) {
+    tone(s);
+    let a = swatch(s, "Kind=A", Some("A"));
+    let b = swatch(s, "Kind=B", Some("B"));
+    let set = id(run(s, "component.combineVariants", json!({"ids": [a, b]})));
+    (set, b)
+}
+
+fn instance(s: &mut Session, component: NodeId) -> NodeId {
+    id(run(s, "instance.create", json!({"component": component, "x": 200, "y": 0})))
+}
+
+fn switch(s: &mut Session, i: NodeId, kind: &str) {
+    run(s, "instance.setProperties", json!({"ids": [i], "properties": {"Kind": kind}}));
+}
+
+#[test]
+fn switching_variants_takes_the_new_variants_mode() {
+    let mut s = Session::new();
+    let (set, _) = kinds(&mut s);
+    let i = instance(&mut s, set);
+    assert_eq!(fill(&s, i), "FF0000");
+    switch(&mut s, i, "B");
+    assert_eq!(fill(&s, i), "0000FF", "variant B sets mode B");
+    switch(&mut s, i, "A");
+    assert_eq!(fill(&s, i), "FF0000");
+    assert!(s.doc().unwrap().node(i).unwrap().var_modes.is_empty(), "the instance sets no mode of its own");
+}
+
+#[test]
+fn instances_follow_a_mode_their_main_sets_later() {
+    let mut s = Session::new();
+    tone(&mut s);
+    let main = swatch(&mut s, "Chip", None);
+    let i = instance(&mut s, main);
+    assert_eq!(fill(&s, i), "FF0000", "no mode set: the collection's default");
+    set_mode(&mut s, main, json!("B"));
+    assert_eq!(fill(&s, i), "0000FF");
+    set_mode(&mut s, main, Value::Null);
+    assert_eq!(fill(&s, i), "FF0000", "the main back on Auto");
+}
+
+#[test]
+fn a_mode_set_on_the_instance_wins_and_stays_through_variant_switches() {
+    let mut s = Session::new();
+    let (set, _) = kinds(&mut s);
+    let i = instance(&mut s, set);
+    set_mode(&mut s, i, json!("B"));
+    assert_eq!(fill(&s, i), "0000FF");
+    for kind in ["B", "A"] {
+        switch(&mut s, i, kind);
+        assert_eq!(fill(&s, i), "0000FF", "own mode B on variant {kind}");
+    }
+    set_mode(&mut s, i, Value::Null);
+    assert_eq!(fill(&s, i), "FF0000", "back on Auto: variant A's mode");
+}
+
+#[test]
+fn a_main_mode_is_closer_than_the_frame_around_the_instance() {
+    let mut s = Session::new();
+    let (_, b) = kinds(&mut s);
+    let frame = id(run(&mut s, "frame.create", json!({"x": 0, "y": 300, "width": 200, "height": 100})));
+    set_mode(&mut s, frame, json!("A"));
+    let i = id(run(&mut s, "instance.create", json!({"component": b, "x": 10, "y": 10, "parent": frame})));
+    assert_eq!(fill(&s, i), "0000FF", "the main's mode B, not the frame's A");
+    // Nested: an outer component on mode A holding an instance of B.
+    let outer_frame = id(run(&mut s, "frame.create", json!({"x": 0, "y": 500, "width": 100, "height": 100, "name": "Outer"})));
+    run(&mut s, "instance.create", json!({"component": b, "x": 0, "y": 0, "parent": outer_frame}));
+    set_mode(&mut s, outer_frame, json!("A"));
+    let outer = id(run(&mut s, "component.create", json!({"ids": [outer_frame]})));
+    let copy = instance(&mut s, outer);
+    let nested = s.doc().unwrap().node(copy).unwrap().children[0];
+    assert_eq!(fill(&s, nested), "0000FF");
+}
+
+#[test]
+fn detaching_keeps_the_mode_it_took_from_its_main() {
+    let mut s = Session::new();
+    let (set, b) = kinds(&mut s);
+    let i = instance(&mut s, set);
+    switch(&mut s, i, "B");
+    run(&mut s, "component.detach", json!({"ids": [i]}));
+    set_mode(&mut s, b, json!("A"));
+    assert_eq!(fill(&s, i), "0000FF", "the detached frame keeps mode B");
+    assert_eq!(s.doc().unwrap().node(i).unwrap().var_modes.len(), 1);
+}
+
+/// A "Button" holding an instance of a swatch "Icon" on mode A, and a "Modal" holding a Button
+/// instance whose icon copy was set to mode B: (the Button main, its icon layer, the copy in Modal).
+fn modal(s: &mut Session) -> (NodeId, NodeId, NodeId) {
+    tone(s);
+    let icon = swatch(s, "Icon", None);
+    let frame = id(run(s, "frame.create", json!({"x": 100, "y": 0, "width": 60, "height": 40, "name": "Button"})));
+    let button_icon = id(run(s, "instance.create", json!({"component": icon, "x": 10, "y": 10, "parent": frame})));
+    set_mode(s, button_icon, json!("A"));
+    let button = id(run(s, "component.create", json!({"ids": [frame]})));
+    let outer = id(run(s, "frame.create", json!({"x": 300, "y": 0, "width": 200, "height": 100, "name": "Modal"})));
+    let close = id(run(s, "instance.create", json!({"component": button, "x": 10, "y": 10, "parent": outer})));
+    let nested = s.doc().unwrap().node(close).unwrap().children[0];
+    set_mode(s, nested, json!("B"));
+    run(s, "component.create", json!({"ids": [outer]}));
+    (button, button_icon, nested)
+}
+
+#[test]
+fn a_mode_set_on_a_layer_inside_an_instance_is_an_override() {
+    let mut s = Session::new();
+    let (button, button_icon, nested) = modal(&mut s);
+    assert_eq!(fill(&s, nested), "0000FF");
+    // An edit the copies can't take as they are rebuilds the Button instance.
+    run(&mut s, "node.set", json!({"ids": [button], "layout": "horizontal"}));
+    assert_eq!(fill(&s, nested), "0000FF", "a rebuild keeps the mode set on the copy");
+    // The main's layer choosing another mode doesn't reach it either.
+    set_mode(&mut s, button_icon, json!("B"));
+    set_mode(&mut s, button_icon, Value::Null);
+    assert_eq!(fill(&s, nested), "0000FF");
+    run(&mut s, "component.resetOverride", json!({"id": nested, "group": "modes"}));
+    assert_eq!(fill(&s, nested), "FF0000", "reset: the main's layer is on Auto (mode A)");
+    assert!(s.doc().unwrap().node(nested).unwrap().var_modes.is_empty());
+}
+
+#[test]
+fn a_mode_set_on_an_icon_inside_a_placed_instance_survives_main_edits() {
+    let mut s = Session::new();
+    let (button, _, _) = modal(&mut s);
+    // A Button placed on the page, its icon recoloured through the icon's mode.
+    let placed = instance(&mut s, button);
+    let icon = s.doc().unwrap().node(placed).unwrap().children[0];
+    set_mode(&mut s, icon, json!("B"));
+    assert!(s.doc().unwrap().node(icon).unwrap().overrides.contains("modes"), "it shows as an override");
+    run(&mut s, "node.set", json!({"ids": [button], "layout": "vertical"}));
+    assert_eq!(fill(&s, icon), "0000FF", "a rebuild of the Button keeps it");
+    run(&mut s, "component.resetInstance", json!({"ids": [placed]}));
+    assert_eq!(fill(&s, icon), "FF0000", "reset all brings back the main's mode");
+}
+
+#[test]
+fn a_file_from_before_modes_were_overrides_keeps_the_modes_chosen_inside_its_instances() {
+    let mut s = Session::new();
+    let (button, _, nested) = modal(&mut s);
+    // Saved before `modes` was an override group: the copy has its mode but no marker.
+    s.doc_mut().unwrap().node_mut(nested).unwrap().overrides.remove("modes");
+    let path = std::env::temp_dir().join(format!("figcraft-instance-modes-{}.figcraft", std::process::id()));
+    let p = path.to_string_lossy().into_owned();
+    run(&mut s, "file.saveAs", json!({"path": p}));
+    let mut s = Session::new();
+    run(&mut s, "file.open", json!({"path": p}));
+    let _ = std::fs::remove_file(&path);
+    let doc = s.doc().unwrap();
+    assert!(doc.node(nested).unwrap().overrides.contains("modes"), "opening it marks the mode the copy chose");
+    assert!(doc.nodes().filter(|n| n.id != nested).all(|n| !n.overrides.contains("modes")), "layers on their main's modes stay unmarked");
+    run(&mut s, "node.set", json!({"ids": [button], "layout": "horizontal"}));
+    assert_eq!(fill(&s, nested), "0000FF", "a rebuild keeps it");
+}
diff --git a/crates/engine/src/instance_resizing_tests.rs b/crates/engine/src/instance_resizing_tests.rs
new file mode 100644
index 00000000..43386af9
--- /dev/null
+++ b/crates/engine/src/instance_resizing_tests.rs
@@ -0,0 +1,190 @@
+//! Size and resizing overrides of layers inside instances: a layer in an instance can hug, fill or
+//! keep a fixed size of its own, and that override is kept through relayout, edits of the main
+//! (only the overridden property stays), undo, save and reopen (native and .fig), REST import,
+//! detach and reset.
+
+use base64::Engine;
+use serde_json::{Value, json};
+
+use crate::Session;
+use crate::components::tests::{copy_of, ex, healthy, idv, node};
+use figcraft_doc::*;
+
+/// A "Field" component: a 240×40 fixed horizontal auto layout frame (no padding or gap) holding
+/// "Atom", an auto layout frame hugging its 20×20 "Dot" with a min width of 100; and an instance of
+/// it. Returns (component, atom, dot, instance).
+fn field(s: &mut Session) -> (NodeId, NodeId, NodeId, NodeId) {
+    let f = idv(&ex(s, "frame.create", json!({"x": 0, "y": 0, "width": 240, "height": 40, "name": "Field"})));
+    ex(s, "node.set", json!({"id": f, "props": {"layout": "horizontal", "padding": 0, "gap": 0, "sizingH": "fixed", "sizingV": "fixed"}}));
+    let atom = idv(&ex(s, "frame.create", json!({"x": 0, "y": 0, "width": 50, "height": 20, "parent": f, "name": "Atom"})));
+    ex(
+        s,
+        "node.set",
+        json!({"id": atom, "props": {"layout": "horizontal", "padding": 0, "gap": 0, "sizingH": "hug", "sizingV": "hug", "minWidth": 100}}),
+    );
+    let dot = idv(&ex(s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 20, "height": 20, "parent": atom, "props": {"name": "Dot"}})));
+    let c = idv(&ex(s, "component.create", json!({"ids": [f]})));
+    let i = idv(&ex(s, "instance.create", json!({"component": c, "x": 0, "y": 100})));
+    (c, atom, dot, i)
+}
+
+fn sizing_h(s: &Session, id: NodeId) -> Sizing {
+    node(s, id).child_layout.sizing_h
+}
+
+/// The layer named `name` below instance `inst`.
+fn named(s: &Session, inst: NodeId, name: &str) -> NodeId {
+    let doc = s.doc().unwrap();
+    doc.subtree(inst).into_iter().find(|d| *d != inst && doc.node(*d).is_some_and(|n| n.name == name)).unwrap()
+}
+
+/// The first instance in the document.
+fn instance(s: &Session) -> NodeId {
+    s.doc().unwrap().nodes().find(|n| matches!(n.kind, NodeKind::Instance { .. })).unwrap().id
+}
+
+fn open(s: &mut Session, bytes: &[u8], name: &str) {
+    ex(s, "file.open", json!({"data": base64::engine::general_purpose::STANDARD.encode(bytes), "name": name}));
+}
+
+#[test]
+fn a_layer_in_an_instance_fills_and_keeps_it_through_main_edits() {
+    let mut s = Session::new();
+    let (c, atom, dot, i) = field(&mut s);
+    let (ia, idot) = (copy_of(&s, i, atom), copy_of(&s, i, dot));
+    assert_eq!((sizing_h(&s, ia), node(&s, ia).width), (Sizing::Hug, 100.0), "hugs its dot, at least 100 wide");
+    ex(&mut s, "node.set", json!({"id": ia, "props": {"sizingH": "fill"}}));
+    assert_eq!((sizing_h(&s, ia), node(&s, ia).width), (Sizing::Fill, 240.0), "fills the instance");
+    assert!(node(&s, ia).overrides.contains("resizing"), "{:?}", node(&s, ia).overrides);
+    // Edits of the main relay the instance out: the override stays, other properties follow.
+    ex(&mut s, "node.set", json!({"id": dot, "props": {"width": 30, "fill": "#ff0000"}}));
+    assert_eq!((node(&s, ia).width, node(&s, idot).width), (240.0, 30.0));
+    ex(&mut s, "node.set", json!({"id": atom, "props": {"minWidth": 120, "fill": "#00ff00"}}));
+    assert_eq!(node(&s, atom).width, 120.0);
+    assert_eq!((sizing_h(&s, ia), node(&s, ia).width, node(&s, ia).child_layout.min_w), (Sizing::Fill, 240.0, Some(100.0)));
+    assert_eq!(node(&s, ia).fills, node(&s, atom).fills, "the fill isn't overridden: it follows the main");
+    // The main fixing its own width is the same property: the instance keeps filling.
+    ex(&mut s, "node.set", json!({"id": atom, "props": {"width": 80}}));
+    assert_eq!((sizing_h(&s, atom), sizing_h(&s, ia), node(&s, ia).width), (Sizing::Fixed, Sizing::Fill, 240.0));
+    // A structure edit of the main rebuilds the instance: the atom fills what the new layer leaves.
+    ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 5, "height": 5, "parent": c}));
+    assert_eq!((sizing_h(&s, ia), node(&s, ia).width), (Sizing::Fill, 235.0));
+    healthy(&s);
+    // Back to the main's resizing: no override left.
+    ex(&mut s, "component.resetOverride", json!({"id": ia, "group": "resizing"}));
+    assert_eq!((sizing_h(&s, ia), node(&s, ia).width), (Sizing::Fixed, node(&s, atom).width));
+    assert!(!node(&s, ia).overrides.contains("resizing"));
+    healthy(&s);
+}
+
+#[test]
+fn size_and_resizing_overrides_undo_reset_and_detach() {
+    let mut s = Session::new();
+    let (_, atom, dot, i) = field(&mut s);
+    let (ia, idot) = (copy_of(&s, i, atom), copy_of(&s, i, dot));
+    ex(&mut s, "node.set", json!({"id": ia, "props": {"sizingH": "fill"}}));
+    ex(&mut s, "edit.undo", json!({}));
+    assert_eq!((sizing_h(&s, ia), node(&s, ia).width), (Sizing::Hug, 100.0));
+    assert!(node(&s, ia).overrides.is_empty());
+    // A fixed size of its own: kept when the main resizes the layer.
+    ex(&mut s, "node.set", json!({"id": idot, "props": {"width": 50, "height": 10}}));
+    assert!(node(&s, idot).overrides.contains("size"));
+    ex(&mut s, "node.set", json!({"id": dot, "props": {"width": 30}}));
+    assert_eq!((node(&s, idot).width, node(&s, idot).height, node(&s, dot).width), (50.0, 10.0, 30.0));
+    // A min width of its own.
+    ex(&mut s, "node.set", json!({"id": ia, "props": {"minWidth": 150}}));
+    assert_eq!(node(&s, ia).width, 150.0);
+    ex(&mut s, "node.set", json!({"id": atom, "props": {"minWidth": 90}}));
+    assert_eq!(node(&s, ia).width, 150.0);
+    healthy(&s);
+    // Reset all changes: the main's values again.
+    ex(&mut s, "component.resetInstance", json!({"ids": [i]}));
+    assert_eq!((node(&s, ia).width, node(&s, idot).width), (90.0, 30.0));
+    assert!(node(&s, ia).overrides.is_empty() && node(&s, idot).overrides.is_empty());
+    // Detaching keeps what the instance showed.
+    ex(&mut s, "node.set", json!({"id": ia, "props": {"sizingH": "fill"}}));
+    ex(&mut s, "component.detach", json!({"ids": [i]}));
+    assert_eq!((sizing_h(&s, ia), node(&s, ia).width, node(&s, ia).source), (Sizing::Fill, 240.0, None));
+    healthy(&s);
+}
+
+#[test]
+fn layers_in_instances_resize_but_keep_their_place() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Card"})));
+    let title = idv(&ex(&mut s, "text.create", json!({"text": "Hello", "x": 10, "y": 10, "parent": f, "props": {"name": "Title"}})));
+    let c = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": c, "x": 300, "y": 0})));
+    let it = copy_of(&s, i, title);
+    ex(&mut s, "node.set", json!({"id": it, "props": {"width": 150}}));
+    assert_eq!(node(&s, it).width, 150.0, "a text box resizes");
+    assert!(node(&s, it).overrides.contains("size"));
+    // Its place, rotation and constraints are still the main's.
+    for props in [json!({"x": 50}), json!({"rotation": 15}), json!({"constraints": {"horizontal": "right"}})] {
+        assert!(s.execute("node.set", &json!({"id": it, "props": props})).is_err(), "{props} is refused");
+    }
+    // The instance's own resizing is its own, not an override.
+    ex(&mut s, "node.set", json!({"id": i, "props": {"minWidth": 100}}));
+    assert!(!node(&s, i).overrides.contains("resizing"));
+    healthy(&s);
+}
+
+#[test]
+fn resizing_overrides_survive_save_and_reopen() {
+    let mut s = Session::new();
+    let (_, atom, dot, i) = field(&mut s);
+    let (ia, idot) = (copy_of(&s, i, atom), copy_of(&s, i, dot));
+    ex(&mut s, "node.set", json!({"id": ia, "props": {"sizingH": "fill"}}));
+    ex(&mut s, "node.set", json!({"id": idot, "props": {"width": 40}}));
+    let native = figcraft_format::save_bytes(s.doc().unwrap(), None).unwrap();
+    let (fig, _) = figcraft_format::fig::export(s.doc().unwrap(), None).unwrap();
+    for (bytes, name) in [(native, "field.figcraft"), (fig, "field.fig")] {
+        let mut s = Session::new();
+        open(&mut s, &bytes, name);
+        let i = instance(&s);
+        let (ia, idot) = (named(&s, i, "Atom"), named(&s, i, "Dot"));
+        assert!(node(&s, ia).overrides.contains("resizing"), "{name}: {:?}", node(&s, ia).overrides);
+        assert!(node(&s, idot).overrides.contains("size"), "{name}: {:?}", node(&s, idot).overrides);
+        // An edit of the main relays the instance out.
+        let main = |s: &Session, id: NodeId| node(s, id).source.unwrap();
+        let (atom, dot) = (main(&s, ia), main(&s, idot));
+        ex(&mut s, "node.set", json!({"id": atom, "props": {"minWidth": 120}}));
+        ex(&mut s, "node.set", json!({"id": dot, "props": {"width": 30}}));
+        assert_eq!((sizing_h(&s, ia), node(&s, ia).width, node(&s, idot).width), (Sizing::Fill, 240.0, 40.0), "{name}");
+        healthy(&s);
+    }
+}
+
+#[test]
+fn imported_resizing_overrides_survive_relayout() {
+    let at = |x: f64, y: f64| json!([[1, 0, x], [0, 1, y]]);
+    let dot = |id: &str| json!({"id": id, "name": "Dot", "type": "RECTANGLE", "relativeTransform": at(0.0, 0.0), "size": {"x": 20, "y": 20}});
+    let atom = |id: &str, dot_id: &str, w: f64, more: Value| {
+        let mut a = json!({"id": id, "name": "Atom", "type": "FRAME", "relativeTransform": at(0.0, 0.0), "size": {"x": w, "y": 20},
+            "layoutMode": "HORIZONTAL", "primaryAxisSizingMode": "AUTO", "counterAxisSizingMode": "AUTO", "minWidth": 100, "children": [dot(dot_id)]});
+        a.as_object_mut().unwrap().extend(more.as_object().unwrap().clone());
+        a
+    };
+    let field = |id: &str, ty: &str, y: f64, kids: Value| {
+        json!({"id": id, "name": "Field", "type": ty, "relativeTransform": at(0.0, y), "size": {"x": 240, "y": 40}, "layoutMode": "HORIZONTAL",
+            "primaryAxisSizingMode": "FIXED", "counterAxisSizingMode": "FIXED", "children": kids})
+    };
+    let mut inst =
+        field("2:1", "INSTANCE", 100.0, json!([atom("I2:1;1:2", "I2:1;1:3", 240.0, json!({"layoutSizingHorizontal": "FILL", "layoutGrow": 1}))]));
+    inst["componentId"] = json!("1:1");
+    inst["overrides"] = json!([{"id": "I2:1;1:2", "overriddenFields": ["layoutSizingHorizontal", "layoutGrow"]}]);
+    let file = json!({"name": "Field", "document": {"id": "0:0", "type": "DOCUMENT", "children": [
+        {"id": "0:1", "name": "Page", "type": "CANVAS", "children": [field("1:1", "COMPONENT", 0.0, json!([atom("1:2", "1:3", 100.0, json!({}))])), inst]}
+    ]}, "components": {"1:1": {"key": "k", "name": "Field", "description": ""}}, "styles": {}});
+    let mut s = Session::new();
+    open(&mut s, file.to_string().as_bytes(), "field.json");
+    let i = instance(&s);
+    let ia = named(&s, i, "Atom");
+    assert_eq!((sizing_h(&s, ia), node(&s, ia).width), (Sizing::Fill, 240.0));
+    assert!(node(&s, ia).overrides.contains("resizing"), "{:?}", node(&s, ia).overrides);
+    // The main's first edit relays every instance out from it.
+    let main_atom = node(&s, ia).source.unwrap();
+    ex(&mut s, "node.set", json!({"id": main_atom, "props": {"minWidth": 120}}));
+    assert_eq!((sizing_h(&s, ia), node(&s, ia).width), (Sizing::Fill, 240.0));
+    healthy(&s);
+}
diff --git a/crates/engine/src/keymap.rs b/crates/engine/src/keymap.rs
index c5e3c334..6f0641db 100644
--- a/crates/engine/src/keymap.rs
+++ b/crates/engine/src/keymap.rs
@@ -193,6 +193,15 @@ pub static KEYS: &[Binding] = &[
     k(Tools, "tool.text", &["T"]),
     k(Tools, "tool.comment", &["C"]),
     k(Tools, "tool.shapeBuilder", &["Shift+M"]),
+    // Board tools (on boards only), on keys nothing else uses.
+    k(Tools, "tool.sticky", &["Q"]),
+    k(Tools, "tool.shape", &["B"]),
+    k(Tools, "tool.connector", &["X"]),
+    k(Tools, "tool.marker", &["M"]),
+    k(Tools, "tool.highlighter", &["U"]),
+    k(Tools, "tool.eraser", &["E"]),
+    k(Tools, "tool.stamp", &["W"]),
+    k(Tools, "board.nextSticky", &["Shift+Cmd+Enter"]).label("Board: a new sticky beside the selected one").both(),
     // View
     // The documentation gives both keys for the pixel grid in different places.
     k(View, "view.pixelGrid", &["Shift+'", "Cmd+'"]),
@@ -220,8 +229,10 @@ pub static KEYS: &[Binding] = &[
     k(View, "view.prevPage", &["PageUp"]),
     k(View, "view.nextPage", &["PageDown"]),
     // Zoom
-    k(Zoom, "view.zoomIn", &["Cmd+=", "Shift+=", "Shift+Cmd+="]),
-    k(Zoom, "view.zoomOut", &["Cmd+-", "-", "Shift+-"]),
+    // Each zoom-in key has its zoom-out twin on the key beside it: `-` alone zooms out, so `=`
+    // alone (the `+` key without Shift) zooms in (#973).
+    k(Zoom, "view.zoomIn", &["Cmd+=", "Shift+=", "Shift+Cmd+=", "="]),
+    k(Zoom, "view.zoomOut", &["Cmd+-", "-", "Shift+-", "Shift+Cmd+-"]),
     k(Zoom, "view.zoom100", &["Shift+0", "Cmd+0"]),
     k(Zoom, "view.zoomFit", &["Shift+1"]),
     k(Zoom, "view.zoomSelection", &["Shift+2"]),
diff --git a/crates/engine/src/keymap_tests.rs b/crates/engine/src/keymap_tests.rs
index 38775d3b..f624ecfb 100644
--- a/crates/engine/src/keymap_tests.rs
+++ b/crates/engine/src/keymap_tests.rs
@@ -168,6 +168,25 @@ fn display_per_platform() {
     assert_eq!(primary("polygon.none", mac), None);
 }
 
+/// Each way of zooming in has its zoom-out twin on the key beside it, as the keys arrive from a US
+/// keyboard (#973: `-` alone zoomed out but `=` alone did nothing, so zooming back in was stuck).
+#[test]
+fn zoom_keys_come_in_pairs() {
+    let none = Mods::default();
+    let shift = mods(true, false, false, false);
+    let cmd = mods(false, false, true, false);
+    let shift_cmd = mods(true, false, true, false);
+    for p in PLATFORMS {
+        for (zoom_in, zoom_out, m) in [("Equals", "Minus", none), ("Equals", "Minus", cmd), ("Plus", "Minus", shift_cmd), ("Plus", "Minus", shift)] {
+            assert_eq!(id_for(p, Context::Canvas, zoom_in, m), Some("view.zoomIn"), "{zoom_in} {m:?} on {p:?}");
+            assert_eq!(id_for(p, Context::Canvas, zoom_out, m), Some("view.zoomOut"), "{zoom_out} {m:?} on {p:?}");
+        }
+        // The menus still show Cmd/Ctrl and `+`.
+        assert_eq!(primary("view.zoomIn", p), Some("Cmd+="));
+        assert_eq!(primary("view.zoomOut", p), Some("Cmd+-"));
+    }
+}
+
 #[test]
 fn tool_keys_come_from_the_keymap() {
     assert_eq!(ToolId::Move.shortcut(), "V");
diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index 34653bd5..60f240cb 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -6,56 +6,83 @@
 //! change is one undo step. Pointer tools ([`tools`]) and text editing reduce to the same document
 //! edits and are journaled the same way.
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
+// Tests make and inspect files directly; shipped code goes through `file_access` (clippy.toml).
+#![cfg_attr(test, allow(clippy::disallowed_methods))]
 
-pub mod al_keys;
-pub mod annotations;
-pub mod arc_handles;
-pub mod background;
-pub mod booleans;
-pub mod branches;
+mod assets;
+mod automation;
+mod boards;
+mod canvas;
 pub mod catalog;
 pub mod cmd;
-pub mod code_connect;
-pub mod codegen;
-pub mod collab;
-pub mod component_codegen;
-pub mod components;
-pub mod dev_resources;
-pub mod devcompare;
-pub mod devinspect;
-pub mod distance;
-pub mod drop;
+mod content;
+mod dev;
+mod extensions;
+pub mod fonts;
 pub mod guard;
-pub mod guides;
-pub mod inspect;
-pub mod invite_links;
 pub mod keymap;
-pub mod library;
-pub mod library_server;
-pub mod library_swap;
-pub mod live;
 pub mod measure;
-pub mod online;
-pub mod params;
-pub mod playground;
-pub mod plugin_directory;
-pub mod plugins;
 pub mod proto_run;
-pub mod rename;
-pub mod rotation_origin;
-pub mod shape_handles;
-pub mod shapebuilder;
-pub mod snap;
-pub mod style_vars;
-pub mod synthetic;
-pub mod synthetic_ds;
-pub mod templates;
-pub mod textedit;
-pub mod textpreview;
-pub mod tools;
-pub mod vectoredit;
-pub mod widgets;
+mod selection;
+mod sharing;
+pub use assets::components;
+pub use assets::library;
+pub use assets::library_server;
+pub use assets::library_swap;
+pub use assets::playground;
+pub use assets::style_vars;
+pub use assets::token_roles;
+pub use automation::batch;
+pub use automation::doc_urls;
+pub use automation::file_access;
+pub use automation::inspect;
+pub use automation::params;
+pub use boards::board;
+pub use boards::board_table;
+pub use boards::board_templates;
+pub use canvas::al_keys;
+pub use canvas::arc_handles;
+pub use canvas::booleans;
+pub use canvas::distance;
+pub use canvas::drop;
+pub use canvas::guides;
+pub use canvas::rotation_origin;
+pub use canvas::shape_handles;
+pub use canvas::shapebuilder;
+pub use canvas::snap;
+pub use canvas::textedit;
+pub use canvas::textpreview;
+pub use canvas::tools;
+pub use canvas::vectoredit;
+pub use content::datafill;
+pub use content::synthetic;
+pub use content::synthetic_ds;
+pub use content::templates;
+pub use content::textfit;
+pub use dev::annotations;
+pub use dev::code_connect;
+pub use dev::codegen;
+pub use dev::component_codegen;
+pub use dev::dev_measurements;
+pub use dev::dev_resources;
+pub use dev::devcompare;
+pub use dev::devinspect;
+pub use dev::tailwind;
+pub use extensions::plugin_directory;
+pub use extensions::plugins;
+pub use extensions::widgets;
+pub use selection::rename;
+pub use selection::selection_colors;
+pub use selection::selection_reorder;
+pub use selection::selection_spacing;
+pub use sharing::background;
+pub use sharing::branches;
+pub use sharing::collab;
+pub use sharing::invite_links;
+pub use sharing::live;
+pub use sharing::online;
 
+pub use batch::{BatchScope, BatchStep};
 pub use cmd::{CommandSpec, all_commands, find_command};
 pub use figcraft_collab;
 pub use figcraft_doc as doc;
@@ -69,645 +96,18 @@ use figcraft_doc::{Document, Node, NodeId};
 use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 
-#[derive(Debug, thiserror::Error)]
-pub enum EngineError {
-    #[error("unknown command `{0}`")]
-    UnknownCommand(String),
-    #[error("command `{0}` is not available right now: {1}")]
-    Disabled(String, String),
-    #[error("invalid parameters for `{cmd}`: {msg}")]
-    BadParams { cmd: String, msg: String },
-    #[error("no open document")]
-    NoDocument,
-    #[error("no such node {0}")]
-    NoNode(NodeId),
-    #[error("{0}")]
-    Other(String),
-    /// A command run in the background sent a request to a server and runs again with the answer
-    /// ([`background`]); never returned to other callers.
-    #[error("waiting for the server")]
-    Waiting,
-    /// A bug: the command panicked. The document was rolled back.
-    #[error("internal error in `{cmd}`: {msg} (the document was left as it was before; please report this bug)")]
-    Internal { cmd: String, msg: String },
-}
+mod derived;
+mod doc_state;
+mod error;
+mod prefs;
+mod session;
+mod view_state;
 
-impl From<figcraft_doc::DocError> for EngineError {
-    fn from(e: figcraft_doc::DocError) -> Self {
-        match e {
-            figcraft_doc::DocError::NoNode(id) => EngineError::NoNode(id),
-            other => EngineError::Other(other.to_string()),
-        }
-    }
-}
-
-pub type Result<T> = std::result::Result<T, EngineError>;
-
-pub fn bad(cmd: &str, msg: impl Into<String>) -> EngineError {
-    EngineError::BadParams { cmd: cmd.to_string(), msg: msg.into() }
-}
-
-/// Deepest params nesting `resolve_step_refs` walks before giving up.
-const STEP_REF_MAX_DEPTH: usize = 64;
-
-/// Replace every `{"$step": n}` / `{"$step": n, "field": "…"}` in `v` with that field (default
-/// `id`) of `results[n]`, the result of an earlier batch step.
-fn resolve_step_refs(v: &Value, results: &[Value], step: usize, depth: usize) -> Result<Value> {
-    if depth > STEP_REF_MAX_DEPTH {
-        return Err(bad("command.batch", format!("step {step}: params nest deeper than {STEP_REF_MAX_DEPTH} levels")));
-    }
-    match v {
-        Value::Object(o) if o.contains_key("$step") => {
-            if let Some(k) = o.keys().find(|k| *k != "$step" && *k != "field") {
-                return Err(bad("command.batch", format!("step {step}: a `$step` reference takes only `field`, not `{k}`")));
-            }
-            let n = o
-                .get("$step")
-                .and_then(Value::as_u64)
-                .ok_or_else(|| bad("command.batch", format!("step {step}: `$step` must be a step index (0, 1, …)")))?;
-            let field = match o.get("field") {
-                None => "id",
-                Some(Value::String(f)) => f.as_str(),
-                Some(_) => return Err(bad("command.batch", format!("step {step}: `field` must be a string"))),
-            };
-            let Some(result) = usize::try_from(n).ok().and_then(|n| results.get(n)) else {
-                let range = if step == 0 { "there is none before step 0".to_string() } else { format!("0 to {}", step - 1) };
-                return Err(bad("command.batch", format!("step {step}: `$step` {n} must be an earlier step ({range})")));
-            };
-            result.get(field).cloned().ok_or_else(|| bad("command.batch", format!("step {step}: step {n}'s result has no `{field}`")))
-        }
-        Value::Object(o) => {
-            let mut out = serde_json::Map::with_capacity(o.len());
-            for (k, x) in o {
-                out.insert(k.clone(), resolve_step_refs(x, results, step, depth + 1)?);
-            }
-            Ok(Value::Object(out))
-        }
-        Value::Array(a) => a.iter().map(|x| resolve_step_refs(x, results, step, depth + 1)).collect::<Result<Vec<_>>>().map(Value::Array),
-        _ => Ok(v.clone()),
-    }
-}
-
-/// One undo step.
-#[derive(Clone, Debug)]
-pub struct HistoryEntry {
-    pub label: String,
-    pub doc: Arc<Document>,
-    pub selection: Vec<NodeId>,
-    pub page: NodeId,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct History {
-    pub undo: Vec<HistoryEntry>,
-    pub redo: Vec<HistoryEntry>,
-    pub limit: usize,
-}
-
-/// The canvas view of a document: what's at the centre of the viewport and the zoom.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(default)]
-pub struct ViewState {
-    /// Page coordinate at the viewport centre.
-    pub cx: f64,
-    pub cy: f64,
-    /// Zoom (1 = 100%).
-    pub zoom: f64,
-    /// Viewport size in logical pixels (set by the UI; used by zoom-to-fit).
-    pub vw: f64,
-    pub vh: f64,
-    pub pixel_grid: bool,
-    pub layout_grids: bool,
-    pub rulers: bool,
-    pub outlines: bool,
-    /// Outline mode for the selected layers only (the rest draws normally).
-    pub outlines_selection: bool,
-    /// Outline mode also outlines hidden layers (View ▸ Outlines ▸ Include hidden layers).
-    pub outline_hidden: bool,
-    /// Outline mode also draws every layer's box (View ▸ Outlines ▸ Include object bounds).
-    pub outline_bounds: bool,
-    /// Outline the masks (they don't draw themselves).
-    pub mask_outlines: bool,
-    pub pixel_preview: bool,
-    /// Pixel preview resolution: rendered pixels per page pixel (1 or 2).
-    pub pixel_scale: u8,
-    pub show_slices: bool,
-    pub comments: bool,
-    /// Others' cursors in a live session (View ▸ Multiplayer cursors).
-    pub multiplayer_cursors: bool,
-    pub frame_outlines: bool,
-    /// Soft-proof sRGB: the canvas marks the colours of a Display P3 file that sRGB can't show.
-    pub proof_srgb: bool,
-    pub snap_geometry: bool,
-    pub snap_objects: bool,
-    pub snap_pixel: bool,
-    pub ui_hidden: bool,
-}
-
-impl Default for ViewState {
-    fn default() -> Self {
-        Self {
-            cx: 0.0,
-            cy: 0.0,
-            zoom: 1.0,
-            vw: 1200.0,
-            vh: 800.0,
-            pixel_grid: true,
-            layout_grids: true,
-            rulers: false,
-            outlines: false,
-            outlines_selection: false,
-            outline_hidden: false,
-            outline_bounds: false,
-            mask_outlines: false,
-            pixel_preview: false,
-            pixel_scale: 1,
-            show_slices: false,
-            comments: true,
-            multiplayer_cursors: true,
-            frame_outlines: false,
-            proof_srgb: false,
-            snap_geometry: true,
-            snap_objects: true,
-            snap_pixel: true,
-            ui_hidden: false,
-        }
-    }
-}
-
-impl ViewState {
-    pub const MIN_ZOOM: f64 = 0.02;
-    pub const MAX_ZOOM: f64 = 256.0;
-    /// Page coordinate at the viewport's top-left.
-    pub fn origin(&self) -> (f64, f64) {
-        let z = self.zoom.max(1e-9);
-        (self.cx - self.vw / 2.0 / z, self.cy - self.vh / 2.0 / z)
-    }
-    pub fn set_zoom_at(&mut self, zoom: f64, anchor: (f64, f64)) {
-        let z = if zoom.is_finite() { zoom.clamp(Self::MIN_ZOOM, Self::MAX_ZOOM) } else { self.zoom };
-        let old = self.zoom.max(1e-9);
-        // Keep the page point under `anchor` fixed.
-        self.cx = anchor.0 + (self.cx - anchor.0) * old / z;
-        self.cy = anchor.1 + (self.cy - anchor.1) * old / z;
-        self.zoom = z;
-    }
-    /// Fit a page rectangle into the viewport with margin.
-    pub fn fit(&mut self, r: figcraft_geom::Rect, max_zoom: f64) {
-        if !(r.width() > 0.0 || r.height() > 0.0) || !r.x0.is_finite() {
-            self.cx = r.center().x;
-            self.cy = r.center().y;
-            return;
-        }
-        let margin = 64.0;
-        let zx = (self.vw - margin * 2.0).max(50.0) / r.width().max(1e-6);
-        let zy = (self.vh - margin * 2.0).max(50.0) / r.height().max(1e-6);
-        self.zoom = zx.min(zy).clamp(Self::MIN_ZOOM, max_zoom);
-        self.cx = r.center().x;
-        self.cy = r.center().y;
-    }
-    /// The zoom from which the pixel grid shows (400%).
-    pub const PIXEL_GRID_ZOOM: f64 = 4.0;
-    /// Whether the pixel grid draws: it's on and the canvas is zoomed in to 400% or more.
-    pub fn pixel_grid_shown(&self) -> bool {
-        self.pixel_grid && self.zoom >= Self::PIXEL_GRID_ZOOM - 1e-9
-    }
-    /// Pixel preview's resolution (rendered pixels per page pixel) when it's on and zoomed in past
-    /// it; below that the canvas is already coarser than the preview.
-    pub fn pixel_preview_scale(&self) -> Option<f64> {
-        let k = f64::from(self.pixel_scale.clamp(1, 2));
-        (self.pixel_preview && self.zoom > k).then_some(k)
-    }
-    /// A wheel or trackpad scroll of (`dx`, `dy`) screen points: the canvas pans with it (content
-    /// follows the fingers); with Shift a plain vertical wheel pans sideways.
-    pub fn scroll(&mut self, dx: f64, dy: f64, shift: bool) {
-        let (dx, dy) = if shift && dx == 0.0 { (dy, 0.0) } else { (dx, dy) };
-        if !(dx.is_finite() && dy.is_finite()) {
-            return;
-        }
-        let z = self.zoom.max(1e-6);
-        self.cx -= dx / z;
-        self.cy -= dy / z;
-    }
-    pub fn page_to_screen(&self, x: f64, y: f64) -> (f64, f64) {
-        let (ox, oy) = self.origin();
-        ((x - ox) * self.zoom, (y - oy) * self.zoom)
-    }
-    pub fn screen_to_page(&self, x: f64, y: f64) -> (f64, f64) {
-        let (ox, oy) = self.origin();
-        let z = self.zoom.max(1e-9);
-        (ox + x / z, oy + y / z)
-    }
-}
-
-/// An in-progress gesture: the document before it started, so previews re-apply from scratch.
-#[derive(Clone, Debug)]
-pub struct Interaction {
-    pub label: String,
-    pub doc: Arc<Document>,
-    pub selection: Vec<NodeId>,
-}
-
-/// The text being edited on the canvas.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct TextEdit {
-    pub id: NodeId,
-    /// Caret position and selection anchor (char indices).
-    pub caret: usize,
-    pub anchor: usize,
-    /// The node was created by this edit (deleted if left empty).
-    pub created: bool,
-    /// An IME composition in progress, shown inline at the caret; the document gets it on commit.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub preedit: Option<Preedit>,
-}
-
-/// IME composition text (not yet in the document) and the IME's cursor inside it (chars).
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Preedit {
-    pub text: String,
-    pub cursor: usize,
-}
-
-/// Per-document editing state.
-#[derive(Clone, Debug)]
-pub struct DocState {
-    pub doc: Arc<Document>,
-    pub selection: Vec<NodeId>,
-    pub page: NodeId,
-    pub history: History,
-    saved_doc: Arc<Document>,
-    pub path: Option<String>,
-    pub revision: u64,
-    pub view: ViewState,
-    pub interaction: Option<Interaction>,
-    pub text_edit: Option<TextEdit>,
-    /// Hovered node (canvas hover outline).
-    pub hover: Option<NodeId>,
-    /// Vector edit mode: the vector being edited, its selected points and the edit tool.
-    pub vector_edit: Option<vectoredit::VectorEdit>,
-    pub uid: u64,
-    /// The file's version history, oldest first (saved in the `.figcraft` file; not undoable).
-    pub versions: Vec<figcraft_format::Version>,
-    /// The file's branches (saved in the `.figcraft` file; not undoable).
-    pub branches: Vec<figcraft_format::Branch>,
-    /// This tab shows a branch: the `uid` of its main file's tab and the branch id. Its edits go
-    /// into the main file's branch (and are saved with the main file).
-    pub branch_of: Option<(u64, String)>,
-    /// The version history or the branches changed since the last save.
-    versions_changed: bool,
-    /// A version shown in place of the document (read-only).
-    pub preview: Option<VersionPreview>,
-    /// The document under a live text preview (a hovered text style or font instance, a dragged
-    /// axis slider): `doc` shows the preview until [`textpreview::end`] puts this back.
-    pub text_preview: Option<Arc<Document>>,
-    /// The document as of the last version saved or restored (none yet): autosaves, restores and
-    /// merges only add a checkpoint for changes since.
-    checkpoint: Option<Arc<Document>>,
-    /// Dev Mode focus view: the frame or section shown alone on the canvas (see [`Self::focused`]).
-    pub focus: Option<NodeId>,
-    /// The ruler guide clicked last: its page or frame and index (see [`Self::selected_guide`]).
-    pub guide: Option<(NodeId, usize)>,
-    /// The selection's rotation origin, when moved or shown (see [`rotation_origin`]; not saved).
-    pub(crate) rotation_origin: Option<rotation_origin::RotationOrigin>,
-    /// The last duplicate while its copies are the selection: Duplicate repeats its offset (see
-    /// [`cmd::edit::Duplicated`]; not saved).
-    pub(crate) last_duplicate: Option<cmd::edit::Duplicated>,
-}
-
-/// A version shown on the canvas in place of the document: read-only until it's restored or the
-/// preview ends, which puts the document back as it was.
-#[derive(Clone, Debug)]
-pub struct VersionPreview {
-    pub id: String,
-    pub name: String,
-    /// When the version was saved (Unix seconds).
-    pub time: u64,
-    doc: Arc<Document>,
-    selection: Vec<NodeId>,
-    page: NodeId,
-}
-
-/// Why edits are refused while a version is shown.
-pub const PREVIEW_READ_ONLY: &str = "you're viewing an earlier version: restore it or go back to the current version to edit";
-
-/// Commands that first end a version preview: they act on the document itself.
-const ENDS_PREVIEW: &[&str] = &["file.save", "file.saveAs", "file.close", "file.revert", "file.saveVersion", "file.duplicate", "version.restore"];
-
-static NEXT_UID: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1);
-
-impl DocState {
-    pub fn new(mut doc: Document, path: Option<String>) -> Self {
-        if doc.pages.is_empty() {
-            doc.repair();
-        }
-        doc.link_layer_text_styles();
-        let page = doc.current_page.filter(|p| doc.pages.contains(p)).or_else(|| doc.first_page()).unwrap_or(NodeId(0));
-        let doc = Arc::new(doc);
-        let mut st = Self {
-            checkpoint: None,
-            saved_doc: doc.clone(),
-            doc,
-            selection: Vec::new(),
-            page,
-            history: History { limit: 1000, ..Default::default() },
-            path,
-            revision: 1,
-            view: ViewState::default(),
-            interaction: None,
-            text_edit: None,
-            hover: None,
-            vector_edit: None,
-            uid: NEXT_UID.fetch_add(1, std::sync::atomic::Ordering::Relaxed),
-            versions: Vec::new(),
-            branches: Vec::new(),
-            branch_of: None,
-            versions_changed: false,
-            preview: None,
-            text_preview: None,
-            focus: None,
-            guide: None,
-            rotation_origin: None,
-            last_duplicate: None,
-        };
-        st.zoom_to_fit();
-        st
-    }
-
-    /// The selected ruler guide (its owner and index): it counts while no layer is selected and it
-    /// is still there on this page.
-    pub fn selected_guide(&self) -> Option<(NodeId, usize)> {
-        let (owner, i) = self.guide.filter(|_| self.selection.is_empty())?;
-        let on_page = owner == self.page || self.doc.top_level_frame(owner).is_some_and(|f| self.doc.ancestors(f).contains(&self.page));
-        (on_page && guides::keeps_guides(&self.doc, owner) && self.doc.node(owner).is_some_and(|n| i < n.guides().len())).then_some((owner, i))
-    }
-
-    /// With the version history read from its file.
-    pub fn with_versions(mut self, versions: Vec<figcraft_format::Version>) -> Self {
-        self.versions = versions;
-        self
-    }
-
-    /// With the branches read from its file.
-    pub fn with_branches(mut self, branches: Vec<figcraft_format::Branch>) -> Self {
-        self.branches = branches;
-        self
-    }
-
-    /// The branches, for editing (the file then has unsaved changes).
-    pub fn branches_mut(&mut self) -> &mut Vec<figcraft_format::Branch> {
-        self.versions_changed = true;
-        &mut self.branches
-    }
-
-    /// The document itself, not a version or live text preview shown in its place.
-    pub fn document_itself(&self) -> &Arc<Document> {
-        self.preview.as_ref().map(|p| &p.doc).or(self.text_preview.as_ref()).unwrap_or(&self.doc)
-    }
-
-    /// The version history, for editing (the file then has unsaved changes).
-    pub fn versions_mut(&mut self) -> &mut Vec<figcraft_format::Version> {
-        self.versions_changed = true;
-        &mut self.versions
-    }
-
-    /// The document changed since the last version was saved or restored (always, before one).
-    pub fn changed_since_checkpoint(&self) -> bool {
-        let doc = self.preview.as_ref().map_or(&self.doc, |p| &p.doc);
-        // Normalising after a command can copy a document without changing it: compare contents then.
-        self.checkpoint.as_ref().is_none_or(|c| !Arc::ptr_eq(doc, c) && **doc != **c)
-    }
-
-    /// Note that a version of the current document was just saved (or restored).
-    pub(crate) fn mark_checkpoint(&mut self) {
-        self.checkpoint = Some(self.doc.clone());
-    }
-
-    /// Push a snapshot undo step: the document was `before` (shown with `selection` on `page`).
-    pub(crate) fn push_undo(&mut self, label: &str, before: Arc<Document>, selection: Vec<NodeId>, page: NodeId) {
-        self.history.undo.push(HistoryEntry { label: label.to_string(), doc: before, selection, page });
-        if self.history.undo.len() > self.history.limit.max(1) {
-            self.history.undo.remove(0);
-        }
-        self.history.redo.clear();
-    }
-
-    pub fn is_dirty(&self) -> bool {
-        !Arc::ptr_eq(self.document_itself(), &self.saved_doc) || self.versions_changed
-    }
-
-    /// Show `version` in place of the document (or switch to it from another preview).
-    pub fn start_preview(&mut self, id: &str, name: &str, time: u64, doc: Arc<Document>) {
-        self.end_preview();
-        self.preview = Some(VersionPreview {
-            id: id.to_string(),
-            name: name.to_string(),
-            time,
-            doc: std::mem::replace(&mut self.doc, doc),
-            selection: std::mem::take(&mut self.selection),
-            page: self.page,
-        });
-        self.page = Some(self.page)
-            .filter(|pg| self.doc.pages.contains(pg))
-            .or_else(|| self.doc.current_page.filter(|pg| self.doc.pages.contains(pg)))
-            .or_else(|| self.doc.first_page())
-            .unwrap_or(self.page);
-        self.text_edit = None;
-        self.vector_edit = None;
-        self.interaction = None;
-        self.revision += 1;
-    }
-
-    /// End a version preview, putting the document, selection and page back. False when none.
-    pub fn end_preview(&mut self) -> bool {
-        let Some(p) = self.preview.take() else { return false };
-        self.doc = p.doc;
-        self.selection = p.selection;
-        self.page = p.page;
-        self.text_edit = None;
-        self.vector_edit = None;
-        self.interaction = None;
-        self.clean_selection();
-        self.revision += 1;
-        true
-    }
-
-    /// Shown as having unsaved changes until it is saved (a document recovered after a crash).
-    pub fn unsaved(mut self) -> Self {
-        self.saved_doc = Arc::new(Document::new(self.doc.name.clone()));
-        self
-    }
-
-    pub fn mark_saved(&mut self) {
-        self.saved_doc = self.doc.clone();
-        self.versions_changed = false;
-    }
-
-    pub fn doc_mut(&mut self) -> &mut Document {
-        Arc::make_mut(&mut self.doc)
-    }
-
-    /// Fit the current page's content (or centre on the origin when empty).
-    pub fn zoom_to_fit(&mut self) {
-        match self.doc.page_content_bounds(self.page) {
-            Some(b) => self.view.fit(b, 1.0),
-            None => {
-                self.view.zoom = 1.0;
-                self.view.cx = self.view.vw / 2.0 - 100.0;
-                self.view.cy = self.view.vh / 2.0 - 100.0;
-            }
-        }
-    }
-
-    /// The layer the focus view shows, while it exists on the current page.
-    pub fn focused(&self) -> Option<NodeId> {
-        self.focus.filter(|f| self.doc.page_of(*f) == Some(self.page))
-    }
-
-    /// Drop selected ids that no longer exist or aren't on the current page.
-    pub fn clean_selection(&mut self) {
-        let doc = self.doc.clone();
-        let page = self.page;
-        self.selection.retain(|id| doc.contains(*id) && doc.page_of(*id) == Some(page) && *id != page);
-        let mut seen = BTreeSet::new();
-        self.selection.retain(|id| seen.insert(*id));
-        if let Some(te) = &self.text_edit
-            && !doc.contains(te.id)
-        {
-            self.text_edit = None;
-        }
-        // Vector edit mode ends when its layer is gone (or no longer a vector, e.g. undone).
-        if self.vector_edit.as_mut().is_some_and(|ve| doc.page_of(ve.id) != Some(page) || !ve.clamp_doc(&doc)) {
-            self.vector_edit = None;
-        }
-        // A moved rotation origin lasts as long as its selection.
-        if self.rotation_origin.as_ref().is_some_and(|o| o.ids != self.selection) {
-            self.rotation_origin = None;
-        }
-        // So does the last duplicate (undo reuses ids: a new layer could take a copy's).
-        if self.last_duplicate.as_ref().is_some_and(|d| !d.is_selection(&self.selection)) {
-            self.last_duplicate = None;
-        }
-    }
-}
-
-/// App-wide preferences that commands read (nudge amounts, behaviours).
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(default)]
-pub struct Prefs {
-    pub nudge_small: f64,
-    pub nudge_big: f64,
-    pub keep_tool: bool,
-    pub rename_duplicates: bool,
-    pub highlight_on_hover: bool,
-    pub number_keys_opacity: bool,
-    pub show_dimensions: bool,
-    /// "system" by default; an explicit "light" or "dark" choice stays saved.
-    pub theme: String,
-    /// The widths of the main window's left and right panels (the interface keeps them within its
-    /// limits; other windows have their own while they are open).
-    pub panel_widths: (f32, f32),
-    /// The interface language: a language code ("en", "es", "pt-BR") or "system" (the OS or browser
-    /// language). Languages without a catalog show English.
-    pub language: String,
-    /// The name comments are signed with (and whose comments count as yours).
-    pub user_name: String,
-    /// Reduce motion: the interface's own animations are off (the system's setting turns them off
-    /// too). Prototype transitions still play.
-    pub reduce_motion: bool,
-    /// Files that have a path are saved by themselves a few seconds after they change (the app's
-    /// timer; off: only File ▸ Save writes them).
-    pub auto_save: bool,
-    /// `figcraft://` invite links open this app (`collab.registerLinks`); `None`: on for installed
-    /// builds, off for development builds.
-    pub invite_links: Option<bool>,
-    /// Installed plugins (Plugins menu), in menu order.
-    #[serde(serialize_with = "plugins::persisted")]
-    pub plugins: Vec<plugins::InstalledPlugin>,
-    /// Plugins' own settings (`setting_set`), by plugin id, then key: JSON values, capped per
-    /// plugin.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    pub plugin_settings: BTreeMap<String, BTreeMap<String, Value>>,
-    /// The plugin directory browsed last (`ws://host:port/`, never with a key).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub plugin_directory: Option<String>,
-    /// The server files are shared through online (Share ▸ Online, join codes; Publish to server
-    /// suggests it too): `wss://host/`, never with a key. [`live::DEFAULT_SERVER`] unless the user
-    /// chose another; empty: online sharing is off (saved as empty, so it stays off).
-    pub publish_server: String,
-    /// Recently opened or saved files, newest first (File ▸ Open recent; at most
-    /// [`cmd::file::MAX_RECENT`]).
-    pub recent_files: Vec<String>,
-    /// The files you put on a server without its key, with their owner tokens (passwords: see
-    /// [`online`]), most recently opened first, at most [`online::MAX_ONLINE_FILES`].
-    #[serde(skip_serializing_if = "Vec::is_empty", deserialize_with = "online::read")]
-    pub online_files: Vec<online::OnlineFile>,
-    /// The Getting started tips on the home screen were closed (Help ▸ Getting started shows them
-    /// again).
-    pub getting_started_dismissed: bool,
-    /// How each home screen section shows its files, by section id (`"recents"`): `"grid"` (cards
-    /// with the picture each file carries) or `"list"` (a table). Missing: the grid.
-    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    pub home_views: BTreeMap<String, String>,
-    /// What the home screen's recent files are ordered by: `"modified"`, `"name"` or `"created"`.
-    pub home_sort: String,
-    /// Which way: `"desc"` (newest first, Z to A) or `"asc"`.
-    pub home_order: String,
-}
-
-impl Default for Prefs {
-    fn default() -> Self {
-        Self {
-            nudge_small: 1.0,
-            nudge_big: 10.0,
-            keep_tool: false,
-            rename_duplicates: false,
-            highlight_on_hover: true,
-            number_keys_opacity: true,
-            show_dimensions: true,
-            theme: "system".into(),
-            panel_widths: (240.0, 240.0),
-            language: "system".into(),
-            user_name: cmd::comment::DEFAULT_AUTHOR.into(),
-            reduce_motion: false,
-            auto_save: false,
-            invite_links: None,
-            plugins: Vec::new(),
-            plugin_settings: BTreeMap::new(),
-            plugin_directory: None,
-            publish_server: live::DEFAULT_SERVER.into(),
-            recent_files: Vec::new(),
-            online_files: Vec::new(),
-            getting_started_dismissed: false,
-            home_views: BTreeMap::new(),
-            home_sort: "modified".into(),
-            home_order: "desc".into(),
-        }
-    }
-}
-
-/// A request from a command to the UI (open a dialog or panel, show a message). Programmatic
-/// callers ignore them.
-#[derive(Clone, Debug, PartialEq, Serialize)]
-pub struct UiRequest {
-    pub kind: String,
-    pub data: Value,
-}
-
-/// Clipboard contents (internal; the UI mirrors to the system clipboard).
-#[derive(Clone, Debug, Default)]
-pub struct Clipboard {
-    /// Copied subtrees: (root, nodes) in z-order.
-    pub nodes: Vec<(NodeId, Vec<figcraft_doc::Node>)>,
-    pub images: std::collections::BTreeMap<String, figcraft_doc::ImageData>,
-    /// Copied properties (Copy properties / Paste properties).
-    pub props: Option<Value>,
-    /// The page-space bounds of the copied selection.
-    pub bounds: Option<figcraft_geom::Rect>,
-    pub source_doc: u64,
-    /// The document copied from (pastes into other files follow its mains) and its file path.
-    pub source: Option<Arc<Document>>,
-    pub source_path: Option<String>,
-}
+pub use derived::{changed_nodes, normalize};
+pub use doc_state::{DocState, History, HistoryEntry, Interaction, PREVIEW_READ_ONLY, Preedit, TextEdit, VersionPreview};
+pub use error::{EngineError, Result, bad};
+pub use prefs::{Clipboard, MAX_RECENT_ACTIONS, Prefs, UI_SCALE_MAX, UI_SCALE_MIN, UiRequest, clamp_ui_scale};
+pub use view_state::ViewState;
 
 /// The editing session: open documents, the current tool, clipboard and prefs.
 pub struct Session {
@@ -721,8 +121,13 @@ pub struct Session {
     /// dark page colour while it is dark (added pages take the current page's). Headless sessions (CLI, MCP, exports) have no
     /// theme, so what scripts make is the same everywhere.
     pub ui_dark: Option<bool>,
-    /// Command log (id + params) for actions/automation.
+    /// Command log (id + params) for actions/automation. File imports that carry the file bytes
+    /// (`file.import` with `data`) are not logged, so the log never holds a copy of a pasted file.
     pub journal: Vec<(String, Value)>,
+    /// Nesting depth of [`Session::grouped`]; tabs closed while it is above zero are kept in
+    /// `closed_in_group` so a failed group can bring them back.
+    group_depth: usize,
+    closed_in_group: Vec<DocState>,
     /// Recently used colours.
     pub recent_colors: Vec<figcraft_color::Color>,
     /// The last undoable command executed through [`Session::execute`], excluding "Repeat".
@@ -746,697 +151,6 @@ impl Default for Session {
     }
 }
 
-impl Session {
-    /// A session with one new document.
-    pub fn new() -> Self {
-        let mut s = Self::empty();
-        s.docs.push(DocState::new(Document::new("Untitled"), None));
-        s
-    }
-
-    /// A session with no documents (the home screen).
-    pub fn empty() -> Self {
-        Self {
-            docs: Vec::new(),
-            active: 0,
-            clipboard: Clipboard::default(),
-            prefs: Prefs::default(),
-            tool: tools::ToolState::default(),
-            ui_requests: Vec::new(),
-            ui_dark: None,
-            journal: Vec::new(),
-            recent_colors: Vec::new(),
-            last_command: None,
-            message: None,
-            libraries: library::Cache::default(),
-            plugins: plugins::Runtime::default(),
-            live: live::Lives::default(),
-            background: background::Background::default(),
-        }
-    }
-
-    /// The background a new file's page gets: the dark page colour while the interface is dark.
-    pub fn new_page_background(&self) -> figcraft_color::Color {
-        if self.ui_dark == Some(true) { figcraft_color::Color::DARK_PAGE } else { figcraft_color::Color::DEFAULT_PAGE }
-    }
-
-    /// Tell the engine the interface's theme (the UI does, every frame). The first time, a new
-    /// file nothing was done to yet (the one the app opened with, made before the theme was
-    /// known) takes the theme's page colour; later changes of theme leave existing pages alone.
-    pub fn set_ui_dark(&mut self, dark: bool) {
-        if self.ui_dark.replace(dark).is_some() || !dark {
-            return;
-        }
-        for ds in &mut self.docs {
-            let untouched = ds.path.is_none() && ds.history.undo.is_empty() && ds.history.redo.is_empty() && !ds.is_dirty() && ds.versions.is_empty();
-            let pages = ds.doc.pages.clone();
-            let blank = pages.iter().all(|p| {
-                ds.doc.node(*p).is_some_and(|n| {
-                    n.children.is_empty()
-                        && matches!(n.kind, figcraft_doc::NodeKind::Page { background, .. } if background == figcraft_color::Color::DEFAULT_PAGE)
-                })
-            });
-            if !(untouched && blank) {
-                continue;
-            }
-            let mut doc = (*ds.doc).clone();
-            for p in pages {
-                if let Some(figcraft_doc::NodeKind::Page { background, .. }) = doc.node_mut(p).map(|n| &mut n.kind) {
-                    *background = figcraft_color::Color::DARK_PAGE;
-                }
-            }
-            // Still a file without changes.
-            ds.doc = Arc::new(doc);
-            ds.saved_doc = ds.doc.clone();
-            ds.revision += 1;
-        }
-    }
-
-    pub fn with_document(doc: Document) -> Self {
-        let mut s = Self::empty();
-        s.docs.push(DocState::new(doc, None));
-        s
-    }
-
-    pub fn ds(&self) -> Result<&DocState> {
-        self.docs.get(self.active).ok_or(EngineError::NoDocument)
-    }
-
-    pub fn ds_mut(&mut self) -> Result<&mut DocState> {
-        self.docs.get_mut(self.active).ok_or(EngineError::NoDocument)
-    }
-
-    pub fn doc(&self) -> Result<&Document> {
-        Ok(self.ds()?.doc.as_ref())
-    }
-
-    pub fn doc_mut(&mut self) -> Result<&mut Document> {
-        Ok(self.ds_mut()?.doc_mut())
-    }
-
-    pub fn selection(&self) -> Vec<NodeId> {
-        self.ds().map(|d| d.selection.clone()).unwrap_or_default()
-    }
-
-    pub fn set_selection(&mut self, ids: Vec<NodeId>) {
-        if let Ok(ds) = self.ds_mut() {
-            ds.selection = ids;
-            ds.clean_selection();
-            ds.revision += 1;
-        }
-    }
-
-    pub fn page(&self) -> Result<NodeId> {
-        Ok(self.ds()?.page)
-    }
-
-    /// Run a command by id. Mutations become one undo step; a failure or panic leaves the document
-    /// as it was.
-    pub fn execute(&mut self, id: &str, params: &Value) -> Result<Value> {
-        let spec = find_command(id).ok_or_else(|| EngineError::UnknownCommand(id.to_string()))?;
-        // Revert replaces the document's uid: refuse before ending previews or syncing branches.
-        if id == "file.revert" && self.live().doc_uid.is_some() {
-            return Err(EngineError::Disabled(id.into(), "leave the live session before reverting to the saved file".into()));
-        }
-        branches::sync(self);
-        if textpreview::COMMANDS.contains(&id) {
-            // A live preview is no edit: no undo step, normalisation or rollback here.
-            let r = guard::run(id, || (spec.run)(self, params));
-            if r.is_err() {
-                textpreview::end(self);
-            }
-            return r;
-        }
-        // Every other command acts on the document itself, not on a live text preview.
-        textpreview::end(self);
-        if ENDS_PREVIEW.contains(&id)
-            && let Ok(ds) = self.ds_mut()
-        {
-            ds.end_preview();
-        }
-        let before = self.ds().ok().map(|d| (d.doc.clone(), d.selection.clone(), d.page, d.uid));
-        let result = guard::run(id, || (spec.run)(self, params))
-            .and_then(|v| self.check_instance_structure(id, &before).map(|()| v))
-            .and_then(|v| self.check_preview(id, &before).map(|()| v))
-            .and_then(|v| self.check_live_access(id, &before).map(|()| v));
-        match &result {
-            Ok(_) => {
-                self.after_command(spec, before);
-                if spec.history && id != "edit.repeat" {
-                    self.last_command = Some((id.to_string(), params.clone()));
-                }
-                self.journal.push((id.to_string(), params.clone()));
-                if self.journal.len() > 5000 {
-                    self.journal.drain(..1000);
-                }
-            }
-            Err(_) => {
-                // Roll back any partial edit — also during an interaction, where `before` is the
-                // interaction's last valid preview: restore it and leave the gesture itself (its
-                // own snapshot) alone.
-                if let Some((doc, sel, page, uid)) = before
-                    && let Some(ds) = self.docs.iter_mut().find(|d| d.uid == uid)
-                {
-                    ds.doc = doc;
-                    ds.selection = sel;
-                    ds.page = page;
-                }
-            }
-        }
-        result
-    }
-
-    /// A version shown in place of the document is read-only: refuse an edit (it is rolled back).
-    fn check_preview(&self, id: &str, before: &Option<(Arc<Document>, Vec<NodeId>, NodeId, u64)>) -> Result<()> {
-        let Some((bdoc, _, _, uid)) = before else { return Ok(()) };
-        let Some(ds) = self.docs.iter().find(|d| d.uid == *uid) else { return Ok(()) };
-        if ds.preview.is_none() || Arc::ptr_eq(&ds.doc, bdoc) || id == "version.preview" {
-            return Ok(());
-        }
-        Err(EngineError::Disabled(id.to_string(), PREVIEW_READ_ONLY.into()))
-    }
-
-    /// A live session's document you may only view (or that is on its way to a server) is
-    /// read-only: refuse an edit (it is rolled back).
-    fn check_live_access(&self, id: &str, before: &Option<(Arc<Document>, Vec<NodeId>, NodeId, u64)>) -> Result<()> {
-        let Some((bdoc, _, _, uid)) = before else { return Ok(()) };
-        let Some(ds) = self.docs.iter().find(|d| d.uid == *uid) else { return Ok(()) };
-        match self.live_read_only(*uid) {
-            Some(why) if !Arc::ptr_eq(&ds.doc, bdoc) => Err(EngineError::Disabled(id.to_string(), why.into())),
-            _ => Ok(()),
-        }
-    }
-
-    /// Instances can't gain, lose or reorder layers, nor move, resize or re-constrain the layers in
-    /// them, and library copies are read-only: refuse such an edit (it is rolled back).
-    fn check_instance_structure(&self, id: &str, before: &Option<(Arc<Document>, Vec<NodeId>, NodeId, u64)>) -> Result<()> {
-        let Some((bdoc, _, _, uid)) = before else { return Ok(()) };
-        let Some(ds) = self.docs.iter().find(|d| d.uid == *uid) else { return Ok(()) };
-        if Arc::ptr_eq(&ds.doc, bdoc) {
-            return Ok(());
-        }
-        // "Repeat" runs the repeated command.
-        let effective = match (&self.last_command, id) {
-            (Some((last, _)), "edit.repeat") => last.as_str(),
-            _ => id,
-        };
-        library::check_read_only(effective, bdoc, &ds.doc)
-            .and_then(|()| components::check_structure_edit(bdoc, &ds.doc))
-            .and_then(|()| components::check_override_edit(bdoc, &ds.doc))
-            .map_err(|m| EngineError::Disabled(id.to_string(), m))
-    }
-
-    /// Bookkeeping after a successful command: normalise what changed, push undo, bump revision.
-    fn after_command(&mut self, spec: &CommandSpec, before: Option<(Arc<Document>, Vec<NodeId>, NodeId, u64)>) {
-        let Some((bdoc, bsel, bpage, uid)) = before else {
-            if let Ok(ds) = self.ds_mut() {
-                ds.revision += 1;
-            }
-            return;
-        };
-        let Some(ds) = self.docs.iter_mut().find(|d| d.uid == uid) else { return };
-        let changed = !Arc::ptr_eq(&ds.doc, &bdoc);
-        if changed {
-            normalize(ds.doc_mut(), &bdoc);
-        }
-        let edit = changed && ds.interaction.is_none();
-        ds.clean_selection();
-        ds.revision += 1;
-        if edit {
-            self.record(uid, spec.history.then_some(spec.label), bdoc, bsel, bpage);
-        }
-    }
-
-    /// Record an edit of document `uid` (it was `before`, shown with `selection` on `page`) as one
-    /// undo step called `label` (`None`: not undoable). On a live session's document the edit is
-    /// synced and the step is the user's own ([`live`]); otherwise it is a snapshot of `before`.
-    pub(crate) fn record(&mut self, uid: u64, label: Option<&str>, before: Arc<Document>, selection: Vec<NodeId>, page: NodeId) {
-        if self.live_doc(uid) {
-            return self.live_edit(uid, label);
-        }
-        if let (Some(label), Some(ds)) = (label, self.docs.iter_mut().find(|d| d.uid == uid)) {
-            ds.push_undo(label, before, selection, page);
-        }
-    }
-
-    /// How many undo and redo steps the active document has (the user's own in a live session).
-    pub fn undo_depth(&self) -> (usize, usize) {
-        match self.ds() {
-            Ok(ds) if self.live_doc(ds.uid) => self.live().client().map_or((0, 0), figcraft_collab::Client::history_len),
-            Ok(ds) => (ds.history.undo.len(), ds.history.redo.len()),
-            Err(_) => (0, 0),
-        }
-    }
-
-    /// The labels of the active document's last `n` undo steps, the next one first.
-    pub fn undo_labels(&self, n: usize) -> Vec<String> {
-        match self.ds() {
-            Ok(ds) if self.live_doc(ds.uid) => {
-                self.live().client().map(|c| c.undo_labels().rev().take(n).map(str::to_string).collect()).unwrap_or_default()
-            }
-            Ok(ds) => ds.history.undo.iter().rev().take(n).map(|h| h.label.clone()).collect(),
-            Err(_) => Vec::new(),
-        }
-    }
-
-    /// Start a gesture: later [`preview`](Self::preview) calls re-apply edits to this snapshot.
-    pub fn begin_interaction(&mut self, label: &str) -> Result<()> {
-        textpreview::end(self);
-        if let Some(why) = self.active_read_only() {
-            return Err(EngineError::Disabled(label.to_string(), why.into()));
-        }
-        let ds = self.ds_mut()?;
-        if ds.preview.is_some() {
-            return Err(EngineError::Disabled(label.to_string(), PREVIEW_READ_ONLY.into()));
-        }
-        if ds.interaction.is_none() {
-            ds.interaction = Some(Interaction { label: label.to_string(), doc: ds.doc.clone(), selection: ds.selection.clone() });
-        }
-        Ok(())
-    }
-
-    /// Replace the document with `f(snapshot)` for a live preview during a gesture.
-    pub fn preview(&mut self, f: impl FnOnce(&mut Document, &mut Vec<NodeId>) -> Result<()>) -> Result<()> {
-        let ds = self.ds_mut()?;
-        let Some(it) = ds.interaction.clone() else { return Err(EngineError::Other("no gesture in progress".into())) };
-        let mut doc = (*it.doc).clone();
-        let mut sel = it.selection.clone();
-        let res = f(&mut doc, &mut sel);
-        if res.is_ok() {
-            normalize(&mut doc, &it.doc);
-            // The same preview again (a handle held still) keeps the document: a new one would
-            // re-render the canvas for nothing.
-            if doc == *ds.doc && sel == ds.selection {
-                return res;
-            }
-            ds.doc = Arc::new(doc);
-            ds.selection = sel;
-            ds.clean_selection();
-            ds.revision += 1;
-        }
-        res
-    }
-
-    /// Finish a gesture as one undo step (no step if nothing changed).
-    pub fn commit_interaction(&mut self) -> Result<()> {
-        let ds = self.ds_mut()?;
-        let Some(it) = ds.interaction.take() else { return Ok(()) };
-        let (uid, page) = (ds.uid, ds.page);
-        ds.revision += 1;
-        if !Arc::ptr_eq(&it.doc, &ds.doc) && *it.doc != *ds.doc {
-            self.record(uid, Some(&it.label), it.doc, it.selection, page);
-        } else {
-            ds.doc = it.doc;
-        }
-        Ok(())
-    }
-
-    /// Abandon a gesture, restoring the document.
-    pub fn cancel_interaction(&mut self) -> Result<()> {
-        let ds = self.ds_mut()?;
-        if let Some(it) = ds.interaction.take() {
-            ds.doc = it.doc;
-            ds.selection = it.selection;
-            ds.revision += 1;
-        }
-        Ok(())
-    }
-
-    pub fn undo(&mut self) -> Result<bool> {
-        textpreview::end(self);
-        let live = self.ds().is_ok_and(|d| self.live_doc(d.uid));
-        let ds = self.ds_mut()?;
-        if ds.preview.is_some() {
-            return Err(EngineError::Disabled("edit.undo".into(), PREVIEW_READ_ONLY.into()));
-        }
-        if let Some(it) = ds.interaction.take()
-            && live
-        {
-            // The gesture in progress is dropped (it was never synced).
-            ds.doc = it.doc;
-        }
-        ds.text_edit = None;
-        if live {
-            return Ok(self.live_travel(true));
-        }
-        let Some(e) = ds.history.undo.pop() else { return Ok(false) };
-        let redo = HistoryEntry { label: e.label.clone(), doc: ds.doc.clone(), selection: ds.selection.clone(), page: ds.page };
-        ds.history.redo.push(redo);
-        ds.doc = e.doc;
-        ds.selection = e.selection;
-        if ds.doc.pages.contains(&e.page) {
-            ds.page = e.page;
-        }
-        ds.clean_selection();
-        ds.revision += 1;
-        Ok(true)
-    }
-
-    pub fn redo(&mut self) -> Result<bool> {
-        textpreview::end(self);
-        let live = self.ds().is_ok_and(|d| self.live_doc(d.uid));
-        let ds = self.ds_mut()?;
-        if ds.preview.is_some() {
-            return Err(EngineError::Disabled("edit.redo".into(), PREVIEW_READ_ONLY.into()));
-        }
-        if let Some(it) = ds.interaction.take()
-            && live
-        {
-            ds.doc = it.doc;
-        }
-        ds.text_edit = None;
-        if live {
-            return Ok(self.live_travel(false));
-        }
-        let Some(e) = ds.history.redo.pop() else { return Ok(false) };
-        let undo = HistoryEntry { label: e.label.clone(), doc: ds.doc.clone(), selection: ds.selection.clone(), page: ds.page };
-        ds.history.undo.push(undo);
-        ds.doc = e.doc;
-        ds.selection = e.selection;
-        if ds.doc.pages.contains(&e.page) {
-            ds.page = e.page;
-        }
-        ds.clean_selection();
-        ds.revision += 1;
-        Ok(true)
-    }
-
-    /// Queue a UI request (dialogs etc.).
-    pub fn request_ui(&mut self, kind: &str, data: Value) {
-        self.ui_requests.push(UiRequest { kind: kind.to_string(), data });
-    }
-
-    /// Run several commands as one undo step. A param value `{"$step": n}` is replaced by the `id`
-    /// in the result of the earlier step `n` (`{"$step": n, "field": "…"}` picks another field),
-    /// so a step can target a layer that an earlier step of the same batch created. Any object
-    /// with a `$step` key in a step's params is such a reference, except inside a nested
-    /// `command.batch` step: its references are to its own steps.
-    pub fn batch(&mut self, label: &str, cmds: &[(String, Value)]) -> Result<Vec<Value>> {
-        self.grouped(label, |s| {
-            let mut results: Vec<Value> = Vec::with_capacity(cmds.len());
-            for (step, (id, p)) in cmds.iter().enumerate() {
-                let p = if id == "command.batch" { p.clone() } else { resolve_step_refs(p, &results, step, 0)? };
-                results.push(s.execute(id, &p)?);
-            }
-            Ok(results)
-        })
-    }
-
-    /// Run `f` as one undo step called `label`: the commands it executes push no steps of their
-    /// own, and when it fails the documents stay at their group-start state.
-    pub fn grouped<T>(&mut self, label: &str, f: impl FnOnce(&mut Self) -> Result<T>) -> Result<T> {
-        self.ds()?;
-        let before: Vec<_> =
-            self.docs.iter().map(|ds| (ds.uid, ds.doc.clone(), ds.selection.clone(), ds.page, ds.history.undo.len(), ds.history.limit)).collect();
-        // An edit inside clears the redo steps; a failed group has to bring them back.
-        let redo_before: Vec<_> = self.docs.iter().map(|ds| ds.history.redo.clone()).collect();
-        let active = self.active;
-        let journal_len = self.journal.len();
-
-        // The steps inside are dropped again below, so they mustn't push the oldest ones out.
-        for ds in &mut self.docs {
-            ds.history.limit = usize::MAX;
-        }
-        for (uid, _, _, _, _, _) in &before {
-            self.live_hold(*uid, true);
-        }
-        let result = f(self);
-        for (uid, _, _, _, _, _) in &before {
-            self.live_hold(*uid, false);
-        }
-
-        if result.is_err() {
-            self.docs.retain(|ds| before.iter().any(|(uid, _, _, _, _, _)| *uid == ds.uid));
-            for ((uid, doc, selection, page, undo_len, limit), redo) in before.iter().zip(redo_before) {
-                if let Some(ds) = self.docs.iter_mut().find(|ds| ds.uid == *uid) {
-                    ds.history.redo = redo;
-                    ds.doc = doc.clone();
-                    ds.selection = selection.clone();
-                    ds.page = *page;
-                    ds.history.undo.truncate(*undo_len);
-                    ds.history.limit = *limit;
-                }
-            }
-            self.active = active;
-            self.journal.truncate(journal_len);
-            return result;
-        }
-
-        let changed: Vec<_> = before
-            .iter()
-            .filter_map(|(uid, doc, selection, page, _, _)| {
-                let ds = self.docs.iter().find(|d| d.uid == *uid)?;
-                (!Arc::ptr_eq(doc, &ds.doc) && ds.interaction.is_none()).then(|| (*uid, doc.clone(), selection.clone(), *page))
-            })
-            .collect();
-        for ds in &mut self.docs {
-            if let Some((_, _, _, _, undo_len, limit)) = before.iter().find(|before| before.0 == ds.uid) {
-                ds.history.limit = *limit;
-                ds.history.undo.truncate(*undo_len);
-            }
-        }
-        for (uid, doc, selection, page) in changed {
-            self.record(uid, Some(label), doc, selection, page);
-        }
-        result
-    }
-
-    /// A summary for status displays.
-    pub fn status(&self) -> Value {
-        match self.ds() {
-            Ok(ds) => json!({
-                "document": ds.doc.name,
-                "path": ds.path,
-                "dirty": ds.is_dirty(),
-                "page": ds.page,
-                "selection": ds.selection,
-                "tool": self.tool.tool.id(),
-                "zoom": ds.view.zoom,
-                "undo": self.undo_depth().0,
-                "redo": self.undo_depth().1,
-                "documents": self.docs.len(),
-            }),
-            Err(_) => json!({"documents": 0}),
-        }
-    }
-}
-
-/// Nodes whose `Arc` differs from `before` (new or edited).
-pub fn changed_nodes(doc: &Document, before: &Document) -> Vec<NodeId> {
-    doc.ids()
-        .filter(|id| match (doc.node_arc(*id), before.node_arc(*id)) {
-            (Some(a), Some(b)) => !Arc::ptr_eq(a, b),
-            _ => true,
-        })
-        .collect()
-}
-
-/// Keep derived state consistent after edits: text boxes resize to their content, groups wrap
-/// their children, instances follow their main components, auto layout re-flows.
-pub fn normalize(doc: &mut Document, before: &Document) {
-    // Only what was touched since the last normalisation (edited, added or removed).
-    let mut touched: BTreeSet<NodeId> = doc.take_dirty();
-    // A variable or style edit changes no layer directly, but bound and linked layers must follow it.
-    if touched.is_empty() && doc.variables == before.variables && doc.styles == before.styles {
-        return;
-    }
-    let m = measure::TextMeasure;
-    // 0. Variable bindings and style links feed node values.
-    let scope = binding_scope(doc, before, &touched);
-    if doc.variables != before.variables || doc.styles != before.styles {
-        style_vars::settle(doc);
-    }
-    cmd::styles::apply_bindings_to(doc, scope.as_ref());
-    style_vars::refresh(doc, Some(before), scope.as_ref());
-    if doc.styles != before.styles {
-        let changed_styles: Vec<String> = doc.styles.iter().filter(|s| !before.styles.contains(s)).map(|s| s.id.clone()).collect();
-        for sid in changed_styles {
-            cmd::styles::propagate_style(doc, &sid);
-        }
-    }
-    touched.extend(doc.take_dirty());
-    // Lists and text chars edited away from their style unlink from it.
-    let live_now: Vec<NodeId> = touched.iter().copied().filter(|i| doc.contains(*i)).collect();
-    cmd::styles::sync_list_styles(doc, before, &live_now);
-    cmd::styles::sync_text_styles(doc, &live_now);
-    touched.extend(doc.take_dirty());
-    let live = |doc: &Document, t: &BTreeSet<NodeId>| -> Vec<NodeId> { t.iter().copied().filter(|i| doc.contains(*i)).collect() };
-    // 0b. Fill and hug only where they can apply (a layer moved out of auto layout, a parent that
-    // started to hug or lost auto layout): the rest becomes fixed at its current size.
-    for id in live(doc, &touched) {
-        figcraft_layout::coherent_sizing(doc, id);
-    }
-    touched.extend(doc.take_dirty());
-    // 1. Text auto-size.
-    for id in live(doc, &touched) {
-        let Some(n) = doc.node(id) else { continue };
-        if let Some((w, h)) = figcraft_text::auto_size(n)
-            && ((w - n.width).abs() > 1e-6 || (h - n.height).abs() > 1e-6)
-        {
-            figcraft_layout::set_size(doc, id, w, h);
-        }
-    }
-    touched.extend(doc.take_dirty());
-    // 2. Instances follow edited main components (and record overrides inside instances).
-    let changed = live(doc, &touched);
-    components::sync_after_edit(doc, before, &changed, &touched);
-    // Rebuilt copies took their mains' values: their bindings resolve in their own modes.
-    let synced = doc.take_dirty();
-    if !synced.is_empty() {
-        cmd::styles::apply_bindings_to(doc, Some(&synced));
-        style_vars::refresh(doc, Some(before), Some(&synced));
-        touched.extend(synced);
-    }
-    touched.extend(doc.take_dirty());
-    // Parents of removed nodes (as they were before) count as touched.
-    let removed_parents: Vec<NodeId> =
-        touched.iter().filter(|i| !doc.contains(**i)).filter_map(|i| before.node(*i).and_then(|n| n.parent)).filter(|p| doc.contains(*p)).collect();
-    // 3. Groups / booleans wrap their children.
-    let mut fit: BTreeSet<NodeId> = BTreeSet::new();
-    for id in live(doc, &touched).into_iter().chain(removed_parents.iter().copied()) {
-        if doc.node(id).is_some_and(|n| n.kind.bounds_follow_children()) {
-            fit.insert(id);
-        }
-        for a in doc.ancestors(id) {
-            if doc.node(a).is_some_and(|n| n.kind.bounds_follow_children()) {
-                fit.insert(a);
-            } else {
-                break;
-            }
-        }
-    }
-    let mut fit: Vec<NodeId> = fit.into_iter().collect();
-    fit.sort_by_key(|id| std::cmp::Reverse(doc.ancestors(*id).len()));
-    for id in fit {
-        if doc.node(id).is_some_and(|n| n.children.is_empty()) {
-            // Empty groups disappear, like the incumbent.
-            let _ = doc.remove(id);
-        } else {
-            let _ = doc.fit_to_children(id);
-        }
-    }
-    touched.extend(doc.take_dirty());
-    // 4. Auto layout for frames where something that sizes or places layers changed.
-    let mut frames: BTreeSet<NodeId> = BTreeSet::new();
-    let moved = live(doc, &touched).into_iter().filter(|id| affects_layout(before, doc, *id));
-    for id in moved.chain(removed_parents) {
-        if !doc.contains(id) {
-            continue;
-        }
-        let mut chain = vec![id];
-        chain.extend(doc.ancestors(id));
-        for c in chain {
-            if doc.node(c).is_some_and(|n| n.layout.is_some()) {
-                frames.insert(c);
-            }
-        }
-    }
-    let mut frames: Vec<NodeId> = frames.into_iter().collect();
-    frames.sort_by_key(|id| std::cmp::Reverse(doc.ancestors(*id).len()));
-    for f in frames {
-        // Layers the layout leaves where they were stay untouched.
-        let kept: Vec<(Arc<Node>, bool)> = doc
-            .node(f)
-            .map(|n| std::iter::once(f).chain(n.children.iter().copied()).collect::<Vec<_>>())
-            .unwrap_or_default()
-            .into_iter()
-            .filter_map(|i| doc.node_arc(i).map(|a| (a.clone(), doc.dirty().contains(&i))))
-            .collect();
-        figcraft_layout::layout_frame(doc, f, &m);
-        for (a, was_dirty) in kept {
-            doc.keep_if_unchanged(a, was_dirty);
-        }
-    }
-    touched.extend(doc.take_dirty());
-    // 5. Ready-for-dev layers whose contents changed show "Changed".
-    mark_dev_changes(doc, before, &touched);
-    doc.take_dirty();
-    // 5. Comment pins follow their layers to other pages and stay put when the layers are deleted.
-    cmd::comment::follow_anchors(doc, before);
-}
-
-/// Whether layer `id` changed (since `before`) in a way that can move or resize layers in an auto
-/// layout frame around it: new, resized, moved, shown or hidden, restructured, other text or
-/// layout settings.
-fn affects_layout(before: &Document, doc: &Document, id: NodeId) -> bool {
-    let (Some(a), Some(b)) = (before.node(id), doc.node(id)) else { return true };
-    a.width != b.width
-        || a.height != b.height
-        || a.transform != b.transform
-        || a.visible != b.visible
-        || a.parent != b.parent
-        || a.children != b.children
-        || a.layout != b.layout
-        || a.child_layout != b.child_layout
-        || a.stroke != b.stroke
-        || a.strokes.len() != b.strokes.len()
-        || a.kind != b.kind
-}
-
-/// The layers whose variable bindings an edit may have changed: every bound layer when a variable
-/// changed, else the touched layers and everything below those that moved, are new or chose
-/// another variable mode (modes are inherited).
-fn binding_scope(doc: &Document, before: &Document, touched: &BTreeSet<NodeId>) -> Option<BTreeSet<NodeId>> {
-    if doc.variables != before.variables {
-        return None;
-    }
-    let mut out = BTreeSet::new();
-    for &id in touched {
-        let Some(n) = doc.node(id) else { continue };
-        let inherited = before.node(id).is_none_or(|b| b.var_modes != n.var_modes || b.parent != n.parent);
-        if inherited {
-            out.extend(doc.subtree(id));
-        } else {
-            out.insert(id);
-        }
-    }
-    Some(out)
-}
-
-/// Flag the frames and sections marked ready for dev (before this edit) that contain a layer whose
-/// design `touched` changed (added, removed or edited; the handoff status itself and hiding a
-/// section's contents don't count).
-fn mark_dev_changes(doc: &mut Document, before: &Document, touched: &BTreeSet<NodeId>) {
-    let ready = |d: &Document, id: NodeId| d.node(id).is_some_and(|n| n.dev_status == figcraft_doc::DevStatus::ReadyForDev);
-    let mut changed: BTreeSet<NodeId> = BTreeSet::new();
-    for &id in touched {
-        // Ready-for-dev frames around it first (the cheap test).
-        let mut chain = vec![id];
-        chain.extend(if doc.contains(id) { doc.ancestors(id) } else { before.ancestors(id) });
-        chain.retain(|m| ready(before, *m) && ready(doc, *m));
-        if chain.is_empty() {
-            continue;
-        }
-        let differs = match (before.node(id), doc.node(id)) {
-            (Some(a), Some(b)) => !a.same_design(b),
-            (None, None) => false,
-            _ => true,
-        };
-        if differs {
-            changed.extend(chain);
-        }
-    }
-    for m in changed {
-        if doc.node(m).is_some_and(|n| !n.dev_changed) {
-            // Its first change since it was marked: keep what it looked like (for Compare changes).
-            if let Some(snap) = before.snapshot_subtree(m) {
-                doc.dev_snapshots.insert(m, Arc::new(snap));
-            }
-            if let Some(n) = doc.node_mut(m) {
-                n.dev_changed = true;
-            }
-        }
-    }
-    // Snapshots last until the change is resolved, the layer is marked again or it's deleted.
-    if !doc.dev_snapshots.is_empty() {
-        let keep = |d: &Document, id: NodeId| d.node(id).is_some_and(|n| n.dev_status == figcraft_doc::DevStatus::ReadyForDev && n.dev_changed);
-        let stale: Vec<NodeId> = doc.dev_snapshots.keys().copied().filter(|id| !keep(doc, *id)).collect();
-        for id in stale {
-            doc.dev_snapshots.remove(&id);
-        }
-    }
-}
-
 #[cfg(test)]
 mod a11y_keys_tests;
 #[cfg(test)]
@@ -1466,8 +180,20 @@ mod batch_step_ref_tests;
 #[cfg(test)]
 mod binding_lists_tests;
 #[cfg(test)]
+mod board_connector_tests;
+#[cfg(test)]
+mod board_tables_tests;
+#[cfg(test)]
+mod board_tests;
+#[cfg(test)]
+mod board_tools_tests;
+#[cfg(test)]
 mod booleans_tests;
 #[cfg(test)]
+mod bound_alpha_tests;
+#[cfg(test)]
+mod branch_live_tests;
+#[cfg(test)]
 mod branch_tests;
 #[cfg(test)]
 mod branch_versions_tests;
@@ -1500,6 +226,12 @@ mod cursor_tests;
 #[cfg(test)]
 mod dark_page_text_tests;
 #[cfg(test)]
+mod datafill_tests;
+#[cfg(test)]
+mod design_paste_tests;
+#[cfg(test)]
+mod dev_measurements_tests;
+#[cfg(test)]
 mod dev_resources_tests;
 #[cfg(test)]
 mod devcompare_tests;
@@ -1508,6 +240,12 @@ mod devfocus_tests;
 #[cfg(test)]
 mod devinspect_tests;
 #[cfg(test)]
+mod devmode_behaviour_tests;
+#[cfg(test)]
+mod devmode_tail_tests;
+#[cfg(test)]
+mod doc_urls_tests;
+#[cfg(test)]
 mod double_click_tests;
 #[cfg(test)]
 mod draw_tools_tests;
@@ -1522,12 +260,18 @@ mod export_depth_tests;
 #[cfg(test)]
 mod extended_chain_tests;
 #[cfg(test)]
+mod facilitate_tests;
+#[cfg(test)]
 mod fig_export_assets_tests;
 #[cfg(test)]
 mod fig_export_tests;
 #[cfg(test)]
 mod fig_import_tests;
 #[cfg(test)]
+mod fill_none_tests;
+#[cfg(test)]
+mod finite_geometry_tests;
+#[cfg(test)]
 mod frame_guides_tests;
 #[cfg(test)]
 mod frame_label_tests;
@@ -1548,16 +292,30 @@ mod history_behaviour_tests;
 #[cfg(test)]
 mod html_codegen_tests;
 #[cfg(test)]
+mod huge_stroke_tests;
+#[cfg(test)]
+mod id_params_behaviour_tests;
+#[cfg(test)]
+mod images_left_in_file_tests;
+#[cfg(test)]
 mod import_export_tests;
 #[cfg(test)]
+mod import_journal_tests;
+#[cfg(test)]
 mod inspect_behaviour_tests;
 #[cfg(test)]
+mod instance_modes_tests;
+#[cfg(test)]
+mod instance_resizing_tests;
+#[cfg(test)]
 mod interaction_rollback_tests;
 #[cfg(test)]
 mod invite_links_tests;
 #[cfg(test)]
 mod keymap_tests;
 #[cfg(test)]
+mod library_path_tests;
+#[cfg(test)]
 mod library_range_styles_tests;
 #[cfg(test)]
 mod library_variables_tests;
@@ -1584,16 +342,22 @@ mod menu_gaps_tests;
 #[cfg(test)]
 mod nested_override_tests;
 #[cfg(test)]
+mod node_set_refusals_tests;
+#[cfg(test)]
 mod online_tests;
 #[cfg(test)]
 mod open_issues_tests;
 #[cfg(test)]
 mod outline_options_tests;
 #[cfg(test)]
+mod page_clipboard_tests;
+#[cfg(test)]
 mod page_copy_navigation_tests;
 #[cfg(test)]
 mod page_target_tests;
 #[cfg(test)]
+mod paint_index_tests;
+#[cfg(test)]
 mod paint_reorder_tests;
 #[cfg(test)]
 mod paint_tests;
@@ -1602,12 +366,16 @@ mod panels_behaviour_tests;
 #[cfg(test)]
 mod pdf_print_tests;
 #[cfg(test)]
+mod pen_end_tests;
+#[cfg(test)]
 mod pen_overlay_tests;
 #[cfg(test)]
 mod pixel_preview_tests;
 #[cfg(test)]
 mod playground_tests;
 #[cfg(test)]
+mod plugin_data_tests;
+#[cfg(test)]
 mod plugin_directory_tests;
 #[cfg(test)]
 mod plugin_panels_tests;
@@ -1616,6 +384,8 @@ pub(crate) mod plugins_tests;
 #[cfg(test)]
 mod progressive_blur_tests;
 #[cfg(test)]
+mod property_copy_tests;
+#[cfg(test)]
 mod proto_behaviour_tests;
 #[cfg(test)]
 mod proto_conditional_tests;
@@ -1624,6 +394,8 @@ mod proto_delay_tests;
 #[cfg(test)]
 mod proto_multi_tests;
 #[cfg(test)]
+mod proto_overlay_anchor_tests;
+#[cfg(test)]
 mod proto_polish_tests;
 #[cfg(test)]
 mod proto_present_tests;
@@ -1634,6 +406,8 @@ mod proto_run_tests;
 #[cfg(test)]
 mod proto_tail_tests;
 #[cfg(test)]
+mod rest_slot_tests;
+#[cfg(test)]
 mod retained_walk_tests;
 #[cfg(test)]
 mod rotated_guides_tests;
@@ -1642,6 +416,10 @@ mod rotated_select_tests;
 #[cfg(test)]
 mod rotation_origin_tests;
 #[cfg(test)]
+mod save_disk_changes_tests;
+#[cfg(test)]
+mod save_format_tests;
+#[cfg(test)]
 mod scale_tool_tests;
 #[cfg(test)]
 mod section_contents_tests;
@@ -1664,6 +442,8 @@ mod shapes_behaviour_tests;
 #[cfg(test)]
 mod shortcut_parity_tests;
 #[cfg(test)]
+mod sketch_import_tests;
+#[cfg(test)]
 mod slot_tests;
 #[cfg(test)]
 mod stroke_style_tests;
@@ -1676,6 +456,8 @@ mod styles_behaviour_tests;
 #[cfg(test)]
 mod svg_import_tests;
 #[cfg(test)]
+mod tailwind_tests;
+#[cfg(test)]
 mod templates_tests;
 #[cfg(test)]
 mod tests;
@@ -1692,6 +474,8 @@ mod text_style_picker_tests;
 #[cfg(test)]
 mod text_tail_tests;
 #[cfg(test)]
+mod textfit_tests;
+#[cfg(test)]
 mod theme_pages_tests;
 #[cfg(test)]
 mod tiff_tests;
@@ -1704,16 +488,37 @@ mod variables_behaviour_tests;
 #[cfg(test)]
 mod variables_editor_tests;
 #[cfg(test)]
+mod variables_import_shapes_tests;
+#[cfg(test)]
 mod variables_io_tests;
 #[cfg(test)]
+mod variants_discovery_tests;
+#[cfg(test)]
 mod vector_behaviour_tests;
 #[cfg(test)]
+mod vector_drawable_export_tests;
+#[cfg(test)]
+mod vector_fill_rule_tests;
+#[cfg(test)]
 mod vector_multi_behaviour_tests;
 #[cfg(test)]
+mod vector_offset_tests;
+#[cfg(test)]
+mod vector_path_set_tests;
+#[cfg(test)]
 mod version_preview_tests;
 #[cfg(test)]
 mod version_tests;
 #[cfg(test)]
 mod view_behaviour_tests;
 #[cfg(test)]
+mod vue_codegen_tests;
+#[cfg(test)]
+mod widget_input_tests;
+#[cfg(test)]
 mod widgets_tests;
+
+#[cfg(test)]
+mod selection_reorder_tests;
+#[cfg(test)]
+mod selection_spacing_tests;
diff --git a/crates/engine/src/library_path_tests.rs b/crates/engine/src/library_path_tests.rs
new file mode 100644
index 00000000..de40128a
--- /dev/null
+++ b/crates/engine/src/library_path_tests.rs
@@ -0,0 +1,39 @@
+//! A library link is stored in the document, so it is followed only on this computer
+//! ([`crate::library_server`]): a path on another server would make opening someone else's file
+//! contact that server, and on Windows send the credentials of whoever opened it.
+
+use crate::Session;
+
+#[test]
+fn a_library_is_opened_only_from_this_computer() {
+    let mut s = Session::new();
+    for path in [
+        r"\\attacker.example\share\lib.figcraft",
+        "//attacker.example/share/lib.figcraft",
+        "file://attacker.example/share/lib.figcraft",
+        r"\\?\UNC\attacker.example\share\lib.figcraft",
+        r"\\.\pipe\lib",
+        "https://attacker.example/lib.figcraft",
+    ] {
+        let e = s.fetch_library(path, false).expect_err(&format!("{path} must be refused"));
+        assert!(e.to_string().contains("only from this computer"), "{path}: {e}");
+    }
+}
+
+#[test]
+fn a_local_library_path_is_still_followed() {
+    let mut s = Session::new();
+    // Refused for being absent, not for where it is: the gate let it through.
+    let missing = std::env::temp_dir().join("figcraft-no-such-library.figcraft");
+    let e = s.fetch_library(&missing.to_string_lossy(), false).expect_err("the file does not exist");
+    assert!(!e.to_string().contains("only from this computer"), "a local path must not be refused as remote: {e}");
+}
+
+#[test]
+fn the_library_cache_refuses_a_path_off_this_computer() {
+    let mut cache = crate::library::Cache::default();
+    for path in [r"\\attacker.example\share\lib.figcraft", "//attacker.example/share/lib.figcraft"] {
+        let e = cache.load(path).expect_err(&format!("{path} must be refused"));
+        assert!(e.to_string().contains("only from this computer"), "{path}: {e}");
+    }
+}
diff --git a/crates/engine/src/library_variables_tests.rs b/crates/engine/src/library_variables_tests.rs
index 4fc778a7..b4a4171a 100644
--- a/crates/engine/src/library_variables_tests.rs
+++ b/crates/engine/src/library_variables_tests.rs
@@ -344,3 +344,67 @@ fn library_style_bindings_ignore_unrelated_local_variables() {
     healthy(&s);
     let _ = std::fs::remove_dir_all(&d);
 }
+
+/// A library "Modal" holding a Button instance whose icon copy is on mode Dark: (the Button main,
+/// the icon copy in Modal).
+fn nested_mode_kit(lib: &mut Session) -> (NodeId, NodeId) {
+    theme(lib);
+    let f = idv(&ex(lib, "frame.create", json!({"x": 0, "y": 0, "width": 20, "height": 20, "name": "Icon"})));
+    ex(lib, "variable.bind", json!({"ids": [f], "field": "fill", "variable": "primary"}));
+    let icon = idv(&ex(lib, "component.create", json!({"ids": [f]})));
+    let b = idv(&ex(lib, "frame.create", json!({"x": 100, "y": 0, "width": 60, "height": 40, "name": "Button"})));
+    ex(lib, "instance.create", json!({"component": icon, "x": 10, "y": 10, "parent": b}));
+    let button = idv(&ex(lib, "component.create", json!({"ids": [b]})));
+    let m = idv(&ex(lib, "frame.create", json!({"x": 300, "y": 0, "width": 200, "height": 100, "name": "Modal"})));
+    let close = idv(&ex(lib, "instance.create", json!({"component": button, "x": 10, "y": 10, "parent": m})));
+    let nested = lib.doc().unwrap().node(close).unwrap().children[0];
+    ex(lib, "variable.setMode", json!({"ids": [nested], "collection": "Theme", "mode": "Dark"}));
+    ex(lib, "component.create", json!({"ids": [m]}));
+    (button, nested)
+}
+
+/// The icon inside the Button inside library Modal instance `inst`.
+fn modal_icon(s: &Session, inst: NodeId) -> NodeId {
+    let doc = s.doc().unwrap();
+    doc.node(doc.node(inst).unwrap().children[0]).unwrap().children[0]
+}
+
+#[test]
+fn modes_set_inside_nested_instances_come_along() {
+    let d = dir("nested-modes");
+    let lib_path = path_str(&d.join("kit.figcraft"));
+    let mut lib = Session::new();
+    let (button, _) = nested_mode_kit(&mut lib);
+    let lid = publish_to(&mut lib, &lib_path);
+
+    let mut s = Session::new();
+    ex(&mut s, "library.add", json!({"path": lib_path}));
+    let inst = idv(&ex(&mut s, "library.place", json!({"library": lid, "component": "Modal", "x": 0, "y": 0})));
+    let copy = |s: &Session| modal_icon(s, inst);
+    assert_eq!(fill(&s, copy(&s)), "FFFFFF", "the Dark mode set on the nested icon comes along");
+    // An update that rebuilds the Button copies keeps it too.
+    ex(&mut lib, "node.set", json!({"ids": [button], "layout": "horizontal"}));
+    republish(&mut lib);
+    ex(&mut s, "library.acceptUpdates", json!({}));
+    assert_eq!(fill(&s, copy(&s)), "FFFFFF");
+    healthy(&s);
+    let _ = std::fs::remove_dir_all(&d);
+}
+
+#[test]
+fn a_library_published_before_modes_were_overrides_keeps_the_modes_set_inside_nested_instances() {
+    let d = dir("nested-modes-old");
+    let lib_path = path_str(&d.join("kit.figcraft"));
+    let mut lib = Session::new();
+    let (_, nested) = nested_mode_kit(&mut lib);
+    // Published before `modes` was an override group: the copy has its mode but no marker.
+    lib.doc_mut().unwrap().node_mut(nested).unwrap().overrides.remove("modes");
+    let lid = publish_to(&mut lib, &lib_path);
+
+    let mut s = Session::new();
+    ex(&mut s, "library.add", json!({"path": lib_path}));
+    let inst = idv(&ex(&mut s, "library.place", json!({"library": lid, "component": "Modal", "x": 0, "y": 0})));
+    assert_eq!(fill(&s, modal_icon(&s, inst)), "FFFFFF", "the Dark mode comes along");
+    healthy(&s);
+    let _ = std::fs::remove_dir_all(&d);
+}
diff --git a/crates/engine/src/live.rs b/crates/engine/src/live.rs
deleted file mode 100644
index 4001b156..00000000
--- a/crates/engine/src/live.rs
+++ /dev/null
@@ -1,2087 +0,0 @@
-//! Live sessions (milestone M9, step 2 of `docs/collab-protocol.md`): people edit the same file
-//! together and see each other's cursors, selections and viewports, and can follow one another.
-//!
-//! The engine holds what everyone sees ([`Live`]: status, peers and their presence, who you
-//! follow) and the `collab.*` commands. The networking lives in a higher layer
-//! (`figcraft-collab-net`), which the app installs as a [`LiveLink`]: the engine never opens a
-//! socket, so nothing below the UI layer depends on networking. Without a link (the CLI, tests)
-//! the commands say live sessions aren't available.
-//!
-//! Peers, presence and document changes are the wire types of the collaboration core
-//! ([`figcraft_collab::message`]). Each participant runs a core [`Client`]: the host's session
-//! document is the one it shared, a guest gets the host's file as a new tab from the welcome.
-//! Every command, gesture or group on the session document is synced as one batch and is one step
-//! of the user's own undo history ([`Session::record`]); undo and redo there take back only the
-//! user's own steps ([`figcraft_collab::Client::undo`]). Batches from the host's server are applied
-//! through the client and installed with [`Session::apply_remote`], which never touches the undo
-//! history. After a dropped connection the client resumes with its id and catches up; what it
-//! made meanwhile goes out then.
-//!
-//! A file can also live on a `figcraft-server`: `collab.publish` uploads the open document and
-//! syncs that tab through the server, whose share links let others edit or only view. A view link
-//! makes the synced document read-only here (every edit is refused before it is sent; the server
-//! refuses it too).
-//!
-//! Sessions are per document ([`Lives`]): each open document has its own session or none, several
-//! run at once (host one file, join another, publish a third), and they keep syncing while their
-//! tab isn't in front. The commands act on the active document's session ([`Session::live`]);
-//! closing a document ends its session only. One link carries them all, each under its
-//! [`SessionId`].
-//!
-//! Sharing with a join code (`collab.share`): online, the open document is published to the
-//! server in Preferences and the server names its links with short codes; on the local network
-//! the app hosts and the code carries the host's address and the session's secret
-//! ([`figcraft_collab::code`]). `collab.join` takes a code of either kind, or an invite link.
-//!
-//! Cursor chat (`collab.cursorChat`) and spotlights (`collab.spotlight`) travel as signals:
-//! short-lived presence the host passes on to everyone, never stored. A spotlight makes everyone
-//! follow the person who started it; moving your own view stops following, as with any follow.
-
-use std::collections::BTreeMap;
-use std::net::IpAddr;
-use std::sync::Arc;
-
-use figcraft_collab::Client;
-use figcraft_collab::code::{self, Code};
-pub use figcraft_collab::message::Signal;
-use figcraft_collab::message::{Admin, AdminReply, ClientMsg, EditingText, LibraryReply, LibraryReq, PluginReply, PluginReq, ServerMsg};
-
-pub use figcraft_collab::message::{Access, HostInfo, Resume, utc_date};
-use figcraft_doc::{Document, NodeId};
-use serde::Serialize;
-use serde_json::{Value, json};
-
-pub use figcraft_collab::message::{Peer, Presence};
-
-use crate::cmd::CommandSpec;
-use crate::collab::EngineRecompute;
-use crate::params::{get, num, req_string, string};
-use crate::tools::ToolId;
-use crate::{DocState, EngineError, Result, Session, TextEdit, ViewState, bad, spec};
-
-/// The server files are shared through online unless Preferences name another: the only place
-/// its address is written.
-///
-/// A build can ship another one, or none: set `FIGCRAFT_DEFAULT_SERVER` when compiling to a
-/// server's address (`wss://host/`), or to nothing (`FIGCRAFT_DEFAULT_SERVER=`) for a build whose
-/// online sharing stays off until the user enters a server in Preferences.
-pub const DEFAULT_SERVER: &str = match option_env!("FIGCRAFT_DEFAULT_SERVER") {
-    Some(server) => server,
-    None => "wss://collab.craftapps.dev/",
-};
-
-/// Most selected ids one presence update carries (the rest aren't shown to others).
-pub const MAX_SELECTION: usize = 10_000;
-/// Longest name shown to others (characters).
-pub const MAX_NAME: usize = 64;
-
-/// The colours people get in a session, in the order the host hands them out (`#RRGGBB`, white
-/// text reads on each).
-pub const PEOPLE: [&str; 8] = ["#0D99FF", "#9747FF", "#14AE5C", "#F24822", "#D9730D", "#E83E8C", "#00A3A3", "#665CE0"];
-
-/// `#RRGGBB` → (r, g, b); `None` for anything else.
-pub fn parse_color(s: &str) -> Option<(u8, u8, u8)> {
-    let hex = s.strip_prefix('#').filter(|h| h.len() == 6 && h.is_ascii())?;
-    let byte = |i: usize| hex.get(i..i + 2).and_then(|b| u8::from_str_radix(b, 16).ok());
-    Some((byte(0)?, byte(2)?, byte(4)?))
-}
-
-/// The connection to a live session.
-#[derive(Clone, Debug, Default, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase", tag = "state")]
-pub enum Status {
-    /// Not in a session.
-    #[default]
-    Off,
-    /// Joining (connecting to the host, waiting for its welcome).
-    Connecting,
-    /// In the session.
-    Live,
-    /// The connection dropped; trying again (`attempt` from 1).
-    Reconnecting { attempt: u32 },
-    /// Couldn't join, or the connection was lost for good.
-    Failed { reason: String },
-}
-
-impl Status {
-    pub fn id(&self) -> &'static str {
-        match self {
-            Status::Off => "off",
-            Status::Connecting => "connecting",
-            Status::Live => "live",
-            Status::Reconnecting { .. } => "reconnecting",
-            Status::Failed { .. } => "failed",
-        }
-    }
-
-    /// In a session or on the way into one.
-    pub fn active(&self) -> bool {
-        matches!(self, Status::Connecting | Status::Live | Status::Reconnecting { .. })
-    }
-
-    /// What the Share popover says about it.
-    pub fn label(&self) -> String {
-        match self {
-            Status::Off => "Not in a live session".into(),
-            Status::Connecting => "Joining…".into(),
-            Status::Live => "Live".into(),
-            Status::Reconnecting { attempt } => format!("Connection lost, reconnecting (attempt {attempt})…"),
-            Status::Failed { reason } => reason.clone(),
-        }
-    }
-}
-
-/// Your part in the session.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Role {
-    Host,
-    Guest,
-}
-
-/// A page of the shared file.
-#[derive(Clone, Debug, PartialEq, Serialize)]
-pub struct PageInfo {
-    pub id: u64,
-    pub name: String,
-}
-
-/// The session you're in.
-#[derive(Clone, Debug, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SessionInfo {
-    pub role: Role,
-    /// Your client id, name and colour as the others see them.
-    pub me: u32,
-    pub name: String,
-    pub color: String,
-    /// The shared file's name and pages (the host's).
-    pub file_name: String,
-    pub pages: Vec<PageInfo>,
-    /// The invite link (`figcraft://join?host=…&file=…&token=…`) and the same as a plain
-    /// WebSocket URL. Both carry the session's secret token: share them only with people you
-    /// invite.
-    pub link: String,
-    pub url: String,
-    /// `ip:port` the session listens on (host) or connects to (guest); a server's URL when it
-    /// isn't plain `ws://` at `/`.
-    pub address: String,
-    /// Reachable from other machines (the host listens on a network address, not loopback).
-    pub network: bool,
-    /// What you may do: edit, or only view (a server's view link).
-    pub access: Access,
-}
-
-/// A file you published to a server: where, and its first share links (they carry their tokens:
-/// share them like passwords; the server keeps only hashes).
-#[derive(Clone, Debug, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Published {
-    /// The server's address.
-    pub server: String,
-    /// The file's id and name on the server.
-    pub file: String,
-    pub name: String,
-    /// The link that lets people edit, and the one that lets them only view.
-    pub edit: String,
-    pub view: String,
-    /// Published without the server's key: the owner token that revokes links, renames or removes
-    /// the file (shown this once; the server keeps only its hash).
-    pub owner: Option<String>,
-    /// When the server deletes the file if nobody opens it (seconds since 1970).
-    pub expires: Option<u64>,
-}
-
-/// How a file is shared with a join code.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Via {
-    /// Through a server: the file is kept there and the server hands out the codes.
-    Online,
-    /// From this app, to people on the same network.
-    Local,
-}
-
-/// One way into a shared file: an invite link, and the join code that stands for it.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, serde::Deserialize)]
-#[serde(default)]
-pub struct SharedLink {
-    /// The link's id on its server (what revokes it; empty for a session this app hosts).
-    pub id: String,
-    /// The invite link (it carries its secret).
-    pub link: String,
-    /// Its join code's symbols. `None`: there is none (a server from before join codes, a host
-    /// without an IPv4 address): the link is shared instead.
-    pub code: Option<String>,
-}
-
-/// What others join a shared file with: to edit it and, on a server, to only view it.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, serde::Deserialize)]
-#[serde(default)]
-pub struct Shared {
-    pub edit: SharedLink,
-    pub view: Option<SharedLink>,
-}
-
-/// A file shared with a join code (`collab.share`). Online, the file is its owner's on the
-/// server: sharing gives others links (and codes) of their own, and stopping takes those away
-/// while the owner stays in the file.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Share {
-    pub via: Via,
-    /// Online: the server's address as it was given (it may carry the server's key: never shown).
-    pub server: String,
-    /// What the code shown lets people do.
-    pub access: Access,
-    /// What others join with now. `None`: on its way, or (online) not shared at the moment: the
-    /// file is on the server, open only to its owner.
-    pub links: Option<Shared>,
-}
-
-impl Share {
-    /// The way in to show: the one for [`access`](Self::access).
-    fn shown(&self) -> Option<&SharedLink> {
-        let links = self.links.as_ref()?;
-        if self.access == Access::View { links.view.as_ref() } else { Some(&links.edit) }
-    }
-
-    /// The code to show, grouped (`K7M-2QX-9TD`).
-    pub fn code(&self) -> Option<String> {
-        self.shown()?.code.as_deref().map(code::grouped)
-    }
-
-    /// The invite link to give with (or in place of) the code.
-    pub fn link(&self) -> Option<&str> {
-        self.shown().map(|l| l.link.as_str())
-    }
-}
-
-/// What someone typed to join, as what the link joins: an invite link as it is, a local network
-/// code as the link it stands for, an online code with `server` to ask about it.
-pub fn join_target(server: &str, typed: &str) -> std::result::Result<String, String> {
-    let typed = typed.trim();
-    if typed.contains("://") || typed.contains('?') {
-        return Ok(typed.to_string());
-    }
-    match code::parse(typed)? {
-        Code::Local(local) => Ok(local.link()),
-        Code::Online(_) if server.trim().is_empty() => Err(format!("that is an online join code, and {ONLINE_OFF}")),
-        Code::Online(code) => Ok(format!("figcraft://join?server={}&code={code}", server.trim())),
-    }
-}
-
-/// Why nothing can be shared or joined online.
-pub const ONLINE_OFF: &str = "online sharing is off: choose a server in Preferences (or share on the local network)";
-
-/// A session's number on the link: the engine picks it (from 1) when it starts the session.
-pub type SessionId = u64;
-/// The [`SessionId`] of events that aren't about a session (answers to background requests).
-pub const NO_SESSION: SessionId = 0;
-
-/// What happened in a session since the last [`LiveLink::poll`].
-#[derive(Clone, Debug, PartialEq)]
-pub enum Event {
-    Status(Status),
-    /// Joined, or joined again after a reconnect: who you are and who else is here.
-    Welcome {
-        info: SessionInfo,
-        peers: Vec<Peer>,
-    },
-    PeerJoined(Peer),
-    PeerLeft(u32),
-    Presence(u32, Presence),
-    /// Someone's cursor chat or spotlight, or (about you) the host's [`Signal::READY`].
-    Signal(u32, Signal),
-    /// For the document sync client: the welcome (with the whole document), or a batch of
-    /// changes the server ordered, or the rejection of one of yours.
-    Sync(ServerMsg),
-    /// The host ended the session.
-    Ended {
-        reason: String,
-    },
-    /// The document is on the server (`collab.publish`); joining it follows.
-    Published(Published),
-    /// The published file is shared (`collab.share`): the links and codes others join with, or
-    /// why the server made none.
-    Shared(std::result::Result<Shared, String>),
-    /// What the server says about its hosting (operator, terms, this file's expiry).
-    Hosting(HostInfo),
-    /// The server's answer to `collab.report`: kept, or why not.
-    Reported(Option<String>),
-    /// The answer to a team library request sent in the background
-    /// ([`LiveLink::library_background`]) about the file behind share link `link`.
-    Library {
-        link: String,
-        reply: std::result::Result<LibraryReply, String>,
-    },
-    /// The answer to request `job` sent in the background ([`LiveLink::background`]).
-    Net {
-        job: u64,
-        reply: Box<NetReply>,
-    },
-}
-
-/// A request to a server outside a live session: its plugin directory, a team library, or keeping
-/// a file there.
-#[derive(Clone, Debug)]
-pub enum NetRequest {
-    /// To the plugin directory of the server at `server` (`ws://host:port/`, with `?key=…` to
-    /// publish).
-    Plugins { server: String, req: PluginReq },
-    /// About the team library of the file behind share link `link`.
-    Library { link: String, req: LibraryReq },
-    /// Keep a file on a server without joining it ([`LiveLink::upload`]).
-    Upload(PublishOptions),
-    /// Change who else gets into `file` on the server at `server` (its address, with `?key=…`, or
-    /// the file's `owner` token): revoke the links with these ids, then, to `create`, make a new
-    /// edit link and view link with their join codes ([`LiveLink::share`]).
-    Share { server: String, file: String, owner: String, revoke: Vec<String>, create: bool },
-    /// Ask the server at `server` about its hosting and, with a file's owner token, manage that
-    /// file ([`LiveLink::hosting`]).
-    Hosting { server: String, file: String, owner: String, req: Option<Admin> },
-}
-
-impl NetRequest {
-    /// What a session without the network says.
-    pub(crate) fn unavailable(&self) -> &'static str {
-        match self {
-            NetRequest::Plugins { .. } => crate::plugin_directory::NO_DIRECTORY,
-            NetRequest::Library { .. } | NetRequest::Upload(_) => NO_TEAM_LIBRARIES,
-            NetRequest::Hosting { .. } | NetRequest::Share { .. } => NO_HOSTING,
-        }
-    }
-
-    /// How to answer that this request failed (and why).
-    pub fn failure(&self) -> fn(String) -> NetReply {
-        match self {
-            NetRequest::Plugins { .. } => |why| NetReply::Plugins(Err(why)),
-            NetRequest::Library { .. } => |why| NetReply::Library(Err(why)),
-            NetRequest::Upload(_) => |why| NetReply::Upload(Err(why)),
-            NetRequest::Hosting { .. } => |why| NetReply::Hosting(Err(why)),
-            NetRequest::Share { .. } => |why| NetReply::Share(Err(why)),
-        }
-    }
-
-    /// The answer to this request stands for `other` when a command runs again: the same kind of
-    /// request to the same place (what it carries may differ: a usage report, a fresh timestamp).
-    pub(crate) fn stands_for(&self, other: &NetRequest) -> bool {
-        use std::mem::discriminant;
-        match (self, other) {
-            (NetRequest::Plugins { server: a, req: x }, NetRequest::Plugins { server: b, req: y }) => a == b && discriminant(x) == discriminant(y),
-            (NetRequest::Library { link: a, req: x }, NetRequest::Library { link: b, req: y }) => a == b && discriminant(x) == discriminant(y),
-            (NetRequest::Upload(a), NetRequest::Upload(b)) => a.server == b.server,
-            (NetRequest::Hosting { server: a, file: f, req: x, .. }, NetRequest::Hosting { server: b, file: g, req: y, .. }) => {
-                a == b && f == g && x.as_ref().map(discriminant) == y.as_ref().map(discriminant)
-            }
-            (NetRequest::Share { server: a, file: f, create: x, .. }, NetRequest::Share { server: b, file: g, create: y, .. }) => {
-                a == b && f == g && x == y
-            }
-            _ => false,
-        }
-    }
-}
-
-/// The answer to a [`NetRequest`] (an error: the server couldn't be reached or refused).
-#[derive(Clone, Debug, PartialEq)]
-pub enum NetReply {
-    Plugins(std::result::Result<PluginReply, String>),
-    Library(std::result::Result<LibraryReply, String>),
-    /// The new links, when some were asked for.
-    Share(std::result::Result<Option<Shared>, String>),
-    Upload(std::result::Result<Published, String>),
-    /// What the server says about its hosting, and its answer to the request, if one was sent.
-    Hosting(std::result::Result<(HostInfo, Option<AdminReply>), String>),
-}
-
-/// What a session without the network says about servers' hosting.
-pub const NO_HOSTING: &str = "publishing to a server needs the desktop app or the MCP server";
-
-/// Which network interface a hosted session listens on.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Bind {
-    /// This machine only (127.0.0.1): the default.
-    Local,
-    /// The machine's address on the local network (only when the user chooses to share there).
-    Lan,
-    /// A given interface address (e.g. a VPN's).
-    Addr(IpAddr),
-}
-
-/// What [`LiveLink::host`] needs to start a session for the open file.
-#[derive(Clone, Debug)]
-pub struct HostOptions {
-    /// `None`: the default port, or any free one when it's taken.
-    pub port: Option<u16>,
-    pub bind: Bind,
-    /// Your name (empty: the host picks one).
-    pub name: String,
-    /// The shared file (the session's authoritative copy starts from it).
-    pub doc: Arc<Document>,
-    /// Shared with a join code (`collab.share`): the session's secret is short enough to type.
-    pub short: bool,
-}
-
-/// What [`LiveLink::publish`] needs to put the open file on a server.
-#[derive(Clone, Debug)]
-pub struct PublishOptions {
-    /// The server's address (`ws://host:port/`, `wss://host/path/`), which may carry its key
-    /// (`?key=…`).
-    pub server: String,
-    /// The server's key, when the address doesn't carry it. Without one the file is published
-    /// as anyone may, on a server open to the public (with an owner token).
-    pub key: Option<String>,
-    /// The file's name on the server.
-    pub name: String,
-    /// Your name in the session (empty: the server picks one).
-    pub me: String,
-    pub doc: Arc<Document>,
-    /// Share the file once it is there: links and join codes for others ([`Event::Shared`];
-    /// `collab.share`).
-    pub share: bool,
-}
-
-/// The networking behind live sessions, installed by the app ([`Lives::install`]). It carries
-/// any number of sessions at once, each under the [`SessionId`] it was started with. Calls return
-/// at once; what happens later arrives through [`poll`](Self::poll).
-pub trait LiveLink: Send {
-    /// Sessions can be hosted here (the browser build can only join).
-    fn can_host(&self) -> bool {
-        true
-    }
-    /// Start hosting session `session` for `opts.doc`.
-    fn host(&mut self, session: SessionId, opts: HostOptions) -> std::result::Result<SessionInfo, String>;
-    /// Start joining the session behind an invite link, as session `session`. Errors are for
-    /// links that can't be used; they never echo the link (it holds the token).
-    fn join(&mut self, session: SessionId, link: &str, name: &str) -> std::result::Result<(), String>;
-    /// [`join`](Self::join) as the client `resume` names, when the server still knows it (an app
-    /// that starts over after a crash keeps its id, so what it made before is its own to send).
-    /// A link that can't resume joins as someone new.
-    fn join_resuming(&mut self, session: SessionId, link: &str, name: &str, _resume: Option<Resume>) -> std::result::Result<(), String> {
-        self.join(session, link, name)
-    }
-    /// Start uploading `opts.doc` to a server as a new file, then join it with its edit link, as
-    /// session `session`: [`Event::Published`] with its links, then the welcome. Errors are for
-    /// addresses that can't be used; they never echo the key.
-    fn publish(&mut self, _session: SessionId, _opts: PublishOptions) -> std::result::Result<(), String> {
-        Err("publishing to a server needs the desktop app or the MCP server".into())
-    }
-    /// Keep `opts.doc` on a server as a new file without joining it: where, and its links
-    /// (`library.publishToServer` with the server's key). Waits for the server. Errors never echo
-    /// the key.
-    fn upload(&mut self, _opts: PublishOptions) -> std::result::Result<Published, String> {
-        Err(NO_TEAM_LIBRARIES.into())
-    }
-    /// One request about the team library of the file behind share link `link`; waits for the
-    /// server's answer (a few seconds at most when it can't be reached). Errors never echo the
-    /// link.
-    fn library(&mut self, _link: &str, _req: LibraryReq) -> std::result::Result<LibraryReply, String> {
-        Err(NO_TEAM_LIBRARIES.into())
-    }
-    /// Send library requests `(link, request)` in the background, in order; each answer arrives as
-    /// [`Event::Library`]. Ignored while an earlier call's requests are still out.
-    fn library_background(&mut self, _jobs: Vec<(String, LibraryReq)>) {}
-    /// One request to the plugin directory of the server at `server` (`ws://host:port/`, with
-    /// `?key=…` to publish); waits for the answer (a few seconds at most when it can't be
-    /// reached). Errors never echo the key.
-    fn plugins(&mut self, _server: &str, _req: PluginReq) -> std::result::Result<PluginReply, String> {
-        Err(crate::plugin_directory::NO_DIRECTORY.into())
-    }
-    /// What the server at `server` says about its hosting, and with a file's owner token
-    /// (`file` and `owner`) its answer to `req` about that file; waits for the server. Errors
-    /// never echo the token.
-    fn hosting(
-        &mut self,
-        _server: &str,
-        _file: &str,
-        _owner: &str,
-        _req: Option<Admin>,
-    ) -> std::result::Result<(HostInfo, Option<AdminReply>), String> {
-        Err(NO_HOSTING.into())
-    }
-    /// See [`NetRequest::Share`]; waits for the server. Errors never echo the key or the token.
-    fn share(&mut self, _server: &str, _file: &str, _owner: &str, _revoke: &[String], _create: bool) -> std::result::Result<Option<Shared>, String> {
-        Err(NO_HOSTING.into())
-    }
-    /// Send `req` and wait for the answer (through the methods above).
-    fn request(&mut self, req: NetRequest) -> NetReply {
-        match req {
-            NetRequest::Share { server, file, owner, revoke, create } => NetReply::Share(self.share(&server, &file, &owner, &revoke, create)),
-            NetRequest::Plugins { server, req } => NetReply::Plugins(self.plugins(&server, req)),
-            NetRequest::Library { link, req } => NetReply::Library(self.library(&link, req)),
-            NetRequest::Upload(o) => NetReply::Upload(self.upload(o)),
-            NetRequest::Hosting { server, file, owner, req } => NetReply::Hosting(self.hosting(&server, &file, &owner, req)),
-        }
-    }
-    /// Send `req` on a thread of its own and return at once: the answer arrives as [`Event::Net`]
-    /// with `job` (a failure to send too). False when this link can't, and nothing was sent.
-    fn background(&mut self, _job: u64, _req: NetRequest) -> bool {
-        false
-    }
-    /// Remove client `client` from session `session`, which this link hosts: they are
-    /// disconnected and can't join again from their address while it runs. Returns at once.
-    fn remove(&mut self, _session: SessionId, _client: u32) -> std::result::Result<(), String> {
-        Err("removing people needs the desktop app or the MCP server".into())
-    }
-    /// End session `session` (stop hosting or leave); the others go on. Nothing for a session
-    /// that is over already.
-    fn leave(&mut self, session: SessionId);
-    /// Your latest presence in `session` (the link throttles and coalesces).
-    fn presence(&mut self, session: SessionId, p: &Presence);
-    /// A message for `session`'s server (document changes), sent in order.
-    fn send(&mut self, session: SessionId, msg: ClientMsg);
-    /// Events since the last call, each with its session ([`NO_SESSION`] for answers to
-    /// background requests); never blocks.
-    fn poll(&mut self) -> Vec<(SessionId, Event)>;
-}
-
-/// The view a follow last applied: any other view means the user moved.
-#[derive(Clone, Copy, Debug, PartialEq)]
-struct FollowedView {
-    page: NodeId,
-    cx: f64,
-    cy: f64,
-    zoom: f64,
-}
-
-/// One live session (see the module docs): a document's, or a join on its way to its own tab.
-#[derive(Default)]
-pub struct Live {
-    /// Its number on the link (0: no session, the state of a document that isn't in one).
-    pub id: SessionId,
-    pub status: Status,
-    pub info: Option<SessionInfo>,
-    /// Everyone else in the session, by client id.
-    pub peers: BTreeMap<u32, Peer>,
-    /// Their latest presence (only while they're in the session).
-    pub presence: BTreeMap<u32, Presence>,
-    /// The peer whose viewport you follow.
-    pub follow: Option<u32>,
-    followed: Option<FollowedView>,
-    /// Your pointer over the canvas (page coordinates): the UI sets it, or `collab.cursor`.
-    pub cursor: Option<(f64, f64)>,
-    /// The presence last handed to the link.
-    sent: Option<Presence>,
-    /// The document sync client (from the welcome).
-    client: Option<Client>,
-    /// The open document the session syncs (its `DocState::uid`).
-    pub doc_uid: Option<u64>,
-    /// The document whose tab shows the session: `doc_uid`, or for a join the document it was
-    /// started from, until the session's file opens in a tab of its own (`None`: none was open).
-    pub tab: Option<u64>,
-    /// The session document as last sent or installed: a different one has local edits to send.
-    synced: Option<Arc<Document>>,
-    /// Server batches waiting for a gesture or preview on the session document to end.
-    deferred: Vec<ServerMsg>,
-    /// Nesting of [`Session::grouped`] on the session document: its edits sync once, at the end.
-    hold: u32,
-    /// The address of the server this session's file was published to, or is yours on (empty
-    /// otherwise; it may carry the server's key: never shown).
-    pub server: String,
-    /// The file you published to a server in this session, or one of yours you opened again
-    /// (`collab.openFile`: without its owner token, which stays in the record), with its links.
-    pub published: Option<Published>,
-    /// The session was started by sharing with a join code (`collab.share`): how, and its codes.
-    pub share: Option<Share>,
-    /// What the server of the file you're in says about its hosting (operator, terms, expiry);
-    /// a server that says it takes reports (`collab.report`).
-    pub hosting: Option<HostInfo>,
-    /// The host passes cursor chat and spotlights on (it said so after the welcome).
-    pub signals: bool,
-    /// Others' open cursor chat messages.
-    pub chats: BTreeMap<u32, String>,
-    /// Your cursor chat message (empty: none).
-    pub chat: String,
-    /// Who spotlights (you follow them until you move your view).
-    pub spotlight: Option<u32>,
-    /// You spotlight: everyone follows you.
-    pub spotlighting: bool,
-}
-
-impl Live {
-    pub fn role(&self) -> Option<Role> {
-        self.info.as_ref().map(|i| i.role)
-    }
-
-    /// Stop following. False when you weren't following anyone.
-    fn unfollow(&mut self) -> bool {
-        self.followed = None;
-        self.follow.take().is_some()
-    }
-
-    /// Back to no session, still shown on its tab (a failure's reason stays there).
-    fn reset(&mut self) {
-        *self = Live { id: self.id, tab: self.tab, ..Live::default() };
-    }
-
-    /// The document sync client (once the welcome arrived): peers, pending batches, the user's
-    /// undo history.
-    pub fn client(&self) -> Option<&Client> {
-        self.client.as_ref()
-    }
-
-    /// Document changes are syncing (the welcome arrived).
-    pub fn syncing(&self) -> bool {
-        self.client.is_some()
-    }
-
-    /// What the file's tab says about its session: `Some(true)` others get in (a session this app
-    /// hosts, one you joined, a file of yours shared with a code or links), `Some(false)` a file of
-    /// yours on a server that only you get into now, `None` no session (or one still on its way).
-    pub fn shared(&self) -> Option<bool> {
-        let there = matches!(self.status, Status::Live | Status::Reconnecting { .. });
-        there.then(|| self.share.as_ref().is_none_or(|s| s.links.is_some()))
-    }
-
-    /// The name of the session's file, once known.
-    fn file_name(&self) -> Option<&str> {
-        self.info.as_ref().map(|i| i.file_name.as_str()).or(self.published.as_ref().map(|p| p.name.as_str())).filter(|n| !n.is_empty())
-    }
-}
-
-/// The app's live sessions, one per document at most, and what they share: the networking and
-/// the invite-link registration.
-#[derive(Default)]
-pub struct Lives {
-    link: Option<Box<dyn LiveLink>>,
-    sessions: BTreeMap<SessionId, Live>,
-    /// The last session id handed out.
-    last: SessionId,
-    /// What a document that isn't in a session shows.
-    off: Live,
-    /// Registers the app as the opener of `figcraft://` invite links (the desktop app on Windows
-    /// installs one; see [`crate::invite_links`]).
-    pub links: Option<Box<dyn crate::invite_links::LinkRegistrar>>,
-    /// The recorded online files changed since the app last saved the preferences (it saves them
-    /// at once: a crash must not lose an owner token).
-    pub unsaved: bool,
-    /// Servers that couldn't say what became of your files at the last `collab.files {refresh}`.
-    pub servers: crate::online::Problems,
-    /// Recovery copies of your online files waiting for their file to arrive from its server
-    /// (`collab.recoverFile`).
-    pub(crate) recovering: Vec<crate::online::Recovering>,
-}
-
-impl Lives {
-    /// Install the networking (the app does this once at startup).
-    pub fn install(&mut self, link: Box<dyn LiveLink>) {
-        self.link = Some(link);
-    }
-
-    /// The installed networking, if any.
-    pub(crate) fn link(&mut self) -> Option<&mut (dyn LiveLink + 'static)> {
-        self.link.as_deref_mut()
-    }
-
-    /// A link is installed: sessions can be joined (and hosted, when [`can_host`](Self::can_host)).
-    pub fn available(&self) -> bool {
-        self.link.is_some()
-    }
-
-    /// Sessions can be hosted from here (a link is installed and it isn't the browser's).
-    pub fn can_host(&self) -> bool {
-        self.link.as_ref().is_some_and(|l| l.can_host())
-    }
-
-    /// Session `id`, while it runs or shows why it failed.
-    pub fn get(&self, id: SessionId) -> Option<&Live> {
-        self.sessions.get(&id)
-    }
-
-    /// A recovery copy started with session `id` still waits for its outcome (the app keeps the
-    /// copy's file until it doesn't).
-    pub fn recovering(&self, id: SessionId) -> bool {
-        self.recovering.iter().any(|r| r.session == id)
-    }
-
-    /// Every session, oldest first.
-    pub fn iter(&self) -> impl Iterator<Item = &Live> {
-        self.sessions.values()
-    }
-
-    pub(crate) fn sessions_mut(&mut self) -> impl Iterator<Item = &mut Live> {
-        self.sessions.values_mut()
-    }
-
-    /// The session the tab of document `tab` shows (`None`: no document is open): the one that
-    /// syncs it, else the latest join started from it.
-    fn shown(&self, tab: Option<u64>) -> Option<SessionId> {
-        self.sessions.values().filter(|l| l.tab == tab).max_by_key(|l| (l.doc_uid.is_some(), l.id)).map(|l| l.id)
-    }
-
-    /// What the tab of document `tab` shows: its session, or no session.
-    fn on(&self, tab: Option<u64>) -> &Live {
-        self.shown(tab).and_then(|id| self.sessions.get(&id)).unwrap_or(&self.off)
-    }
-
-    /// The session of document `uid`: the one that syncs it, or will once it is published.
-    fn doc(&self, uid: u64) -> Option<&Live> {
-        self.sessions.values().find(|l| l.doc_uid == Some(uid))
-    }
-
-    fn doc_mut(&mut self, uid: u64) -> Option<&mut Live> {
-        self.sessions.values_mut().find(|l| l.doc_uid == Some(uid))
-    }
-
-    /// Start a session on the link for command `cmd`: `start` gets the link and the new
-    /// session's id, which comes back with what it returned.
-    fn start<T>(&mut self, cmd: &str, start: impl FnOnce(&mut dyn LiveLink, SessionId) -> Result<T>) -> Result<(SessionId, T)> {
-        let link = self.link.as_deref_mut().ok_or_else(|| unavailable(cmd))?;
-        let id = self.last.saturating_add(1);
-        let out = start(link, id)?;
-        self.last = id;
-        Ok((id, out))
-    }
-
-    /// Session `live` started on the link: it takes its tab over from what was there (a session
-    /// that failed; for a document's own session, the one it was in). Joins on their way from
-    /// that tab go on.
-    fn open(&mut self, live: Live) {
-        let own = live.doc_uid.is_some();
-        let over: Vec<SessionId> =
-            self.sessions.values().filter(|l| l.tab == live.tab && (!l.status.active() || (own && l.doc_uid.is_some()))).map(|l| l.id).collect();
-        for id in over {
-            self.end(id);
-        }
-        self.sessions.insert(live.id, live);
-    }
-
-    /// End session `id` (stop hosting or leave) and forget it.
-    pub(crate) fn end(&mut self, id: SessionId) -> Option<Live> {
-        self.leave(id);
-        self.sessions.remove(&id)
-    }
-
-    /// Tell the link session `id` is over.
-    fn leave(&mut self, id: SessionId) {
-        if let Some(l) = self.link.as_mut() {
-            l.leave(id);
-        }
-    }
-
-    /// Messages for session `id`'s server, in order.
-    fn send(&mut self, id: SessionId, msgs: impl IntoIterator<Item = ClientMsg>) {
-        if let Some(l) = self.link.as_mut() {
-            for m in msgs {
-                l.send(id, m);
-            }
-        }
-    }
-}
-
-impl Drop for Lives {
-    fn drop(&mut self) {
-        for id in std::mem::take(&mut self.sessions).into_keys() {
-            self.leave(id);
-        }
-    }
-}
-
-/// The page a presence is on (its viewport's, else its cursor's).
-pub fn presence_page(p: &Presence) -> Option<NodeId> {
-    p.viewport.map(|v| v.0).or(p.cursor.map(|c| c.0))
-}
-
-/// Presence ready to send: non-finite numbers and empty viewports dropped, the selection capped.
-pub fn sanitize(mut p: Presence) -> Presence {
-    p.cursor = p.cursor.filter(|c| c.1.is_finite() && c.2.is_finite());
-    p.viewport = p.viewport.filter(|v| v.1.is_finite() && v.2.is_finite() && v.3.is_finite() && v.4.is_finite() && v.3 > 0.0 && v.4 > 0.0);
-    if let Some(s) = p.selection.as_mut() {
-        s.truncate(MAX_SELECTION);
-    }
-    p
-}
-
-/// The name others see: the name from Preferences, or empty for the default ("You"), which the
-/// host replaces.
-pub fn display_name(prefs: &crate::Prefs) -> String {
-    let n = prefs.user_name.trim();
-    if n == crate::cmd::comment::DEFAULT_AUTHOR { String::new() } else { n.chars().filter(|c| !c.is_control()).take(MAX_NAME).collect() }
-}
-
-/// Initials for an avatar ("Ada Lovelace" → "AL"; "?" for none).
-pub fn initials(name: &str) -> String {
-    let mut out: String = name.split_whitespace().filter_map(|w| w.chars().next()).take(2).collect();
-    if out.is_empty() {
-        out.push('?');
-    }
-    out.to_uppercase()
-}
-
-fn close(a: f64, b: f64) -> bool {
-    (a - b).abs() <= 1e-9 * a.abs().max(b.abs()).max(1.0)
-}
-
-/// What others are told about your text editing: the layer, caret and selected characters.
-fn editing_of(t: &TextEdit) -> EditingText {
-    let (a, b) = (t.anchor.min(t.caret), t.anchor.max(t.caret));
-    EditingText { node: t.id, caret: t.caret, selection: (a != b).then_some((a, b)) }
-}
-
-/// The note shown while others type in the text layer you look at: "Hana is editing this text",
-/// "Hana and Ada are…", "Hana and 2 others are…" (`None`: nobody).
-pub fn editing_hint(names: &[&str]) -> Option<String> {
-    let verb = "editing this text";
-    Some(match names {
-        [] => return None,
-        [one] => format!("{one} is {verb}"),
-        [a, b] => format!("{a} and {b} are {verb}"),
-        [first, rest @ ..] => format!("{first} and {} others are {verb}", rest.len()),
-    })
-}
-
-/// Why team libraries aren't available (no network link, or the browser build).
-pub const NO_TEAM_LIBRARIES: &str = "team libraries on a server need the desktop app or the MCP server";
-
-/// Why an edit of a server file you joined with a view link is refused.
-pub const VIEW_ONLY: &str = "View only: the link you joined with lets you see this file, not change it";
-/// Why an edit of a file on its way to a server is refused.
-pub const PUBLISHING: &str = "The file is being published: you can edit it again once it is on the server";
-
-/// A gesture, version preview or live text preview shows a document that isn't the edit to
-/// sync yet.
-fn busy(ds: &DocState) -> bool {
-    ds.interaction.is_some() || ds.preview.is_some() || ds.text_preview.is_some()
-}
-
-impl Session {
-    /// The active document (`None`: no document is open).
-    fn tab(&self) -> Option<u64> {
-        self.ds().ok().map(|d| d.uid)
-    }
-
-    /// The active document's live session (status off when it isn't in one). Everything the
-    /// window shows and the `collab.*` commands act on is this one.
-    pub fn live(&self) -> &Live {
-        self.live.on(self.tab())
-    }
-
-    /// The active document's live session, when it has one (running, on its way or failed).
-    pub fn live_mut(&mut self) -> Option<&mut Live> {
-        let id = self.live.shown(self.tab())?;
-        self.live.sessions.get_mut(&id)
-    }
-
-    /// Document `uid`'s live session (status off when it isn't in one).
-    pub fn live_of(&self, uid: u64) -> &Live {
-        self.live.on(Some(uid))
-    }
-
-    /// The active document is its session's synced document: page and layer ids in others'
-    /// presence refer to it.
-    pub fn live_shared(&self) -> bool {
-        self.tab().is_some_and(|uid| self.live_doc(uid))
-    }
-
-    /// Install a document that came from the session (others' edits): the selection, page and view
-    /// stay where they can, and the undo history isn't touched.
-    pub fn apply_remote(&mut self, uid: u64, doc: Arc<Document>) {
-        let Some(ds) = self.docs.iter_mut().find(|d| d.uid == uid) else { return };
-        ds.doc = doc;
-        if !ds.doc.pages.contains(&ds.page) {
-            ds.page = ds.doc.first_page().unwrap_or(ds.page);
-        }
-        if ds.text_edit.as_ref().is_some_and(|t| !ds.doc.contains(t.id)) {
-            ds.text_edit = None;
-        }
-        if ds.vector_edit.as_ref().is_some_and(|v| !ds.doc.contains(v.id)) {
-            ds.vector_edit = None;
-        }
-        ds.clean_selection();
-        ds.revision += 1;
-    }
-
-    /// Your presence in the active document's session now: its page, selection, viewport and
-    /// edited text, and the pointer.
-    pub fn live_presence(&self) -> Presence {
-        self.presence_in(self.live())
-    }
-
-    /// Your presence in `live` (nothing while another document than its own is in front).
-    fn presence_in(&self, live: &Live) -> Presence {
-        let Some(ds) = self.ds().ok().filter(|ds| live.tab == Some(ds.uid)) else { return Presence::default() };
-        let (x0, y0) = ds.view.origin();
-        let z = ds.view.zoom.max(1e-9);
-        sanitize(Presence {
-            cursor: live.cursor.map(|(x, y)| (ds.page, x, y)),
-            selection: Some(ds.selection.clone()),
-            viewport: Some((ds.page, x0, y0, ds.view.vw / z, ds.view.vh / z)),
-            editing_text: ds.text_edit.as_ref().map(|t| Box::new(editing_of(t))),
-        })
-    }
-
-    /// The others typing in text layer `id` of the active document, in its session.
-    pub fn live_text_editors(&self, id: NodeId) -> Vec<&Peer> {
-        if !self.live_shared() {
-            return Vec::new();
-        }
-        let live = self.live();
-        live.presence.iter().filter(|(_, p)| p.editing_text.as_ref().is_some_and(|e| e.node == id)).filter_map(|(c, _)| live.peers.get(c)).collect()
-    }
-
-    /// You started typing in text layer `id`: say so when someone else is typing in it too (both
-    /// edits sync when they finish; the one finished last wins).
-    pub(crate) fn live_text_notice(&mut self, id: NodeId) {
-        let names: Vec<&str> = self.live_text_editors(id).iter().map(|p| p.name.as_str()).collect();
-        if let Some(hint) = editing_hint(&names) {
-            self.message = Some(format!("{hint} too: the version finished last is kept"));
-        }
-    }
-
-    /// Take in what happened in every session (the UI calls it every frame; the network wakes the
-    /// UI when something arrives). Returns whether anything changed.
-    pub fn live_poll(&mut self) -> bool {
-        let Some(link) = self.live.link.as_mut() else { return false };
-        let events = link.poll();
-        if events.is_empty() {
-            return false;
-        }
-        for (id, e) in events {
-            self.live_event(id, e);
-        }
-        self.live_closed();
-        for id in self.live.sessions.keys().copied().collect::<Vec<_>>() {
-            self.live_deferred(id);
-            self.live_follow_apply(id);
-        }
-        self.online_recoveries();
-        true
-    }
-
-    fn live_event(&mut self, id: SessionId, e: Event) {
-        let e = match e {
-            Event::Library { link, reply } => return self.library_answer(&link, reply),
-            Event::Net { job, reply } => return self.background_answer(job, *reply),
-            e => e,
-        };
-        // A session left meanwhile: what was still on its way is dropped.
-        let front = self.tab();
-        let Some(live) = self.live.sessions.get_mut(&id) else { return };
-        // What happens in a file that isn't in front says which file (by its tab's name).
-        let open = self.docs.iter().find(|d| Some(d.uid) == live.doc_uid).map(|d| d.doc.name.as_str());
-        let behind = open.or(live.file_name()).filter(|_| live.tab != front).map(|n| format!(" {n}")).unwrap_or_default();
-        match e {
-            Event::Status(Status::Failed { reason }) => self.live_fail(id, reason),
-            Event::Status(Status::Off) => {
-                self.live.end(id);
-            }
-            Event::Status(st) => {
-                // Who's here comes again with the next welcome; edits wait for it.
-                if let Status::Reconnecting { .. } = st {
-                    live.peers.clear();
-                    live.presence.clear();
-                    live.sent = None;
-                    // Until the host says it reads them again (a spotlight of yours goes out
-                    // again then).
-                    live.signals = false;
-                    live.chats.clear();
-                    live.chat.clear();
-                    live.spotlight = None;
-                    if let Some(c) = live.client.as_mut() {
-                        c.disconnect();
-                    }
-                }
-                live.status = st;
-            }
-            Event::Welcome { mut info, peers } => {
-                // The shared file's name and pages come with the document (the sync welcome).
-                if let Some(old) = live.info.as_ref().filter(|_| info.file_name.is_empty()) {
-                    info.file_name = old.file_name.clone();
-                    info.pages = old.pages.clone();
-                }
-                live.status = Status::Live;
-                live.info = Some(info);
-                live.peers = peers.into_iter().map(|p| (p.client_id, p)).collect();
-                live.presence.retain(|id, _| live.peers.contains_key(id));
-                if live.follow.is_some_and(|f| !live.peers.contains_key(&f)) {
-                    live.unfollow();
-                }
-                // Others need your presence again.
-                live.sent = None;
-            }
-            Event::PeerJoined(p) => {
-                self.message = Some(format!("{} joined{behind}", p.name));
-                live.peers.insert(p.client_id, p);
-            }
-            Event::PeerLeft(peer) => {
-                live.presence.remove(&peer);
-                live.chats.remove(&peer);
-                if live.spotlight == Some(peer) {
-                    live.spotlight = None;
-                }
-                if let Some(p) = live.peers.remove(&peer) {
-                    self.message = Some(format!("{} left{behind}", p.name));
-                }
-                if live.follow == Some(peer) {
-                    live.unfollow();
-                }
-            }
-            Event::Presence(peer, p) => {
-                if live.peers.contains_key(&peer) {
-                    live.presence.insert(peer, p);
-                }
-            }
-            Event::Signal(peer, sig) => self.live_signal_in(id, peer, sig),
-            Event::Sync(welcome @ ServerMsg::Welcome { .. }) if live.client.is_none() => self.live_welcome(id, welcome),
-            // Batches, and the welcome back after a dropped connection: the client catches up in
-            // order.
-            Event::Sync(msg) => live.deferred.push(msg),
-            Event::Ended { reason } => {
-                self.message = Some(if behind.is_empty() { reason } else { format!("{}: {reason}", behind.trim_start()) });
-                self.live.end(id);
-            }
-            Event::Published(p) => {
-                // Shared with a code: the popover shows it, nothing more to say.
-                if live.share.is_none() {
-                    self.message = Some(format!("Published {} to the server", p.name));
-                }
-                let server = live.server.clone();
-                live.published = Some(p.clone());
-                self.online_published(&server, &p);
-            }
-            Event::Shared(Ok(links)) => {
-                let links = clean_shared(links);
-                match live.server_file() {
-                    Some((server, file)) => self.online_shared(&server, &file, Some(links)),
-                    None => {
-                        if let Some(share) = live.share.as_mut() {
-                            share.links = Some(links);
-                        }
-                    }
-                }
-            }
-            Event::Shared(Err(why)) => self.message = Some(format!("The file is on the server, but couldn't be shared: {why}")),
-            Event::Hosting(info) => live.hosting = Some(clean_hosting(info)),
-            Event::Reported(error) => {
-                self.message =
-                    Some(error.map_or_else(|| "Your report was sent to the server's operator".into(), |e| format!("The report wasn't sent: {e}")));
-            }
-            // Answered above.
-            Event::Library { .. } | Event::Net { .. } => {}
-        }
-    }
-
-    /// Someone's cursor chat or spotlight in session `id` (checked again: the host is untrusted
-    /// too), or the host saying it reads them.
-    fn live_signal_in(&mut self, id: SessionId, peer: u32, sig: Signal) {
-        let Some(sig) = sig.clean() else { return };
-        let Some(live) = self.live.sessions.get_mut(&id) else { return };
-        let name = live.peers.get(&peer).map(|p| p.name.clone());
-        match (sig.kind.as_str(), name) {
-            (Signal::READY, _) if live.info.as_ref().is_some_and(|i| i.me == peer) => {
-                live.signals = true;
-                if live.spotlighting {
-                    self.live.send(id, [ClientMsg::Signal(Signal::spotlight(true))]);
-                }
-            }
-            (Signal::CHAT, Some(_)) if sig.text.is_empty() => {
-                live.chats.remove(&peer);
-            }
-            (Signal::CHAT, Some(_)) => {
-                live.chats.insert(peer, sig.text);
-            }
-            (Signal::SPOTLIGHT, Some(name)) if sig.on() => {
-                // Theirs takes over from yours or anyone else's.
-                live.spotlight = Some(peer);
-                live.spotlighting = false;
-                live.follow = Some(peer);
-                live.followed = None;
-                self.message = Some(format!("{name} is spotlighting: you follow their view (move it to stop)"));
-            }
-            (Signal::SPOTLIGHT, Some(name)) if live.spotlight == Some(peer) => {
-                live.spotlight = None;
-                if live.follow == Some(peer) {
-                    live.unfollow();
-                }
-                self.message = Some(format!("{name} stopped spotlighting"));
-            }
-            _ => {}
-        }
-    }
-
-    /// Why cursor chat or a spotlight can't go out now, if it can't.
-    fn signal_blocker(&self) -> Option<&'static str> {
-        let live = self.live();
-        if live.status != Status::Live {
-            Some("cursor chat and spotlight need a live session")
-        } else if !live.signals {
-            Some("the session's host runs an older version without cursor chat and spotlight")
-        } else {
-            None
-        }
-    }
-
-    /// Show `text` next to your pointer for everyone (empty closes it); returns it as sent
-    /// (control characters out, at most [`Signal::MAX_CHAT`] characters).
-    pub fn live_chat(&mut self, text: &str) -> Result<String> {
-        let sig = Signal::chat(text).clean().unwrap_or_default();
-        if sig.text.is_empty() && self.live().chat.is_empty() {
-            return Ok(String::new());
-        }
-        if let Some(why) = self.signal_blocker() {
-            return Err(EngineError::Disabled("collab.cursorChat".into(), why.into()));
-        }
-        let Some(live) = self.live_mut() else { return Ok(String::new()) };
-        if sig.text != live.chat {
-            live.chat.clone_from(&sig.text);
-            let id = live.id;
-            self.live.send(id, [ClientMsg::Signal(sig.clone())]);
-        }
-        Ok(sig.text)
-    }
-
-    /// Start (`on`) or stop asking everyone to follow your view.
-    pub fn live_spotlight(&mut self, on: bool) -> Result<()> {
-        if on == self.live().spotlighting {
-            return Ok(());
-        }
-        if on && let Some(why) = self.signal_blocker() {
-            return Err(EngineError::Disabled("collab.spotlight".into(), why.into()));
-        }
-        let Some(live) = self.live_mut() else { return Ok(()) };
-        if on {
-            live.unfollow();
-            live.spotlight = None;
-        }
-        live.spotlighting = on;
-        let id = live.id;
-        self.live.send(id, [ClientMsg::Signal(Signal::spotlight(on))]);
-        Ok(())
-    }
-
-    /// Session `id`'s welcome: start the sync client; the host keeps editing the document it
-    /// shared, a guest opens the host's file as a new tab (or gets it again in that tab after a
-    /// reconnect).
-    fn live_welcome(&mut self, id: SessionId, welcome: ServerMsg) {
-        let client = match Client::join(welcome) {
-            Ok(c) => c,
-            Err(e) => return self.live_fail(id, format!("Couldn't open the shared file: {e}")),
-        };
-        let Some(live) = self.live.sessions.get(&id) else { return };
-        let existing = live.doc_uid.filter(|u| self.docs.iter().any(|d| d.uid == *u));
-        let (uid, synced) = match (live.role(), existing) {
-            (Some(Role::Host), Some(uid)) => {
-                if let Some(ds) = self.docs.iter_mut().find(|d| d.uid == uid) {
-                    let was_dirty = ds.is_dirty();
-                    // Undo is per user from now on: earlier whole-document steps would revert
-                    // others' edits.
-                    ds.history.undo.clear();
-                    ds.history.redo.clear();
-                    ds.doc_mut().set_client_id(client.id());
-                    if !was_dirty {
-                        ds.mark_saved();
-                    }
-                }
-                // Edits made since hosting started go out with the first sync.
-                (uid, None)
-            }
-            (Some(Role::Guest), Some(uid)) => {
-                // Joining again in this tab, or the file you published arriving from the server.
-                let doc = Arc::new(client.document().clone());
-                let was_dirty = self.docs.iter().find(|d| d.uid == uid).is_some_and(DocState::is_dirty);
-                self.apply_remote(uid, doc.clone());
-                if let Some(ds) = self.docs.iter_mut().find(|d| d.uid == uid) {
-                    // Undo is per user from now on: earlier whole-document steps would revert
-                    // others' edits.
-                    ds.history.undo.clear();
-                    ds.history.redo.clear();
-                    if !was_dirty {
-                        ds.mark_saved();
-                    }
-                }
-                (uid, Some(doc))
-            }
-            (Some(Role::Guest), None) => {
-                // The session's file gets a tab of its own, in front.
-                let ds = DocState::new(client.document().clone(), None);
-                self.message = Some(format!("Joined {}", ds.doc.name));
-                let opened = (ds.uid, Some(ds.doc.clone()));
-                self.active = self.docs.len();
-                self.docs.push(ds);
-                opened
-            }
-            _ => return,
-        };
-        // A view link: the editing tools are off.
-        if client.access() == Access::View && self.tab() == Some(uid) && !matches!(self.tool.tool, ToolId::Move | ToolId::Hand) {
-            self.set_tool(ToolId::Move);
-        }
-        let Some(live) = self.live.sessions.get_mut(&id) else { return };
-        let doc = client.document();
-        if let Some(info) = live.info.as_mut() {
-            info.file_name = doc.name.clone();
-            info.pages = doc.pages.iter().map(|p| PageInfo { id: p.0, name: doc.node(*p).map(|n| n.name.clone()).unwrap_or_default() }).collect();
-        }
-        live.doc_uid = Some(uid);
-        live.tab = Some(uid);
-        live.synced = synced;
-        live.client = Some(client);
-        live.deferred.clear();
-    }
-
-    /// Session `id` is over with a message: it couldn't be joined, the connection was lost for
-    /// good or sync broke. Its tab shows why.
-    fn live_fail(&mut self, id: SessionId, reason: String) {
-        log::warn!("live session: {reason}");
-        self.live.leave(id);
-        if let Some(live) = self.live.sessions.get_mut(&id) {
-            live.reset();
-            live.status = Status::Failed { reason: reason.clone() };
-        }
-        self.message = Some(reason);
-    }
-
-    /// Why document `uid` can't be edited now, if it can't: you may only view it in its session,
-    /// or it is on its way to a server.
-    pub fn live_read_only(&self, uid: u64) -> Option<&'static str> {
-        let live = self.live.doc(uid)?;
-        match &live.client {
-            Some(c) if c.access() == Access::View => Some(VIEW_ONLY),
-            Some(_) => None,
-            None if live.status.active() && live.role() != Some(Role::Host) => Some(PUBLISHING),
-            None => None,
-        }
-    }
-
-    /// The active document can't be edited now (see [`live_read_only`](Self::live_read_only)).
-    pub fn active_read_only(&self) -> Option<&'static str> {
-        self.tab().and_then(|uid| self.live_read_only(uid))
-    }
-
-    /// Whether document `uid` is a live session's synced document: its edits sync and its undo
-    /// history is the user's own.
-    pub fn live_doc(&self, uid: u64) -> bool {
-        self.live.doc(uid).is_some_and(Live::syncing)
-    }
-
-    /// Sync the edits of session document `uid` as one batch: one step of the user's undo history
-    /// called `label`, or not undoable (`None`: also what changed it outside a command). Nothing
-    /// while a gesture or preview shows, or inside a group (it syncs when the group ends).
-    pub(crate) fn live_edit(&mut self, uid: u64, label: Option<&str>) {
-        let Some(ds) = self.docs.iter().find(|d| d.uid == uid) else { return };
-        let Some(live) = self.live.doc(uid) else { return };
-        if live.hold > 0 || busy(ds) || live.synced.as_ref().is_some_and(|s| Arc::ptr_eq(s, &ds.doc)) {
-            return;
-        }
-        let (id, doc, synced) = (live.id, ds.doc.clone(), live.synced.clone());
-        if self.live_read_only(uid).is_some() {
-            // Nothing goes out: what changed outside a command is put back.
-            if let Some(s) = synced {
-                self.apply_remote(uid, s);
-            }
-            return;
-        }
-        let Some(live) = self.live.sessions.get_mut(&id) else { return };
-        let Some(client) = live.client.as_mut() else { return };
-        match client.edit_with(&doc, label) {
-            Ok(msg) => {
-                live.synced = Some(doc);
-                self.live.send(id, msg);
-            }
-            Err(e) => self.live_fail(id, format!("Couldn't sync an edit: {e}")),
-        }
-    }
-
-    /// A group of commands on document `uid` starts (`on`) or ends: in between its edits don't
-    /// sync on their own.
-    pub(crate) fn live_hold(&mut self, uid: u64, on: bool) {
-        if let Some(live) = self.live.doc_mut(uid).filter(|l| l.syncing()) {
-            live.hold = if on { live.hold.saturating_add(1) } else { live.hold.saturating_sub(1) };
-        }
-    }
-
-    /// Undo (`back`) or redo the user's own last step on the active document, in its session:
-    /// what it wrote goes back where nobody else wrote since. Returns whether there was a step to
-    /// take back.
-    pub(crate) fn live_travel(&mut self, back: bool) -> bool {
-        let Some(uid) = self.tab() else { return false };
-        // Edits not synced yet go first.
-        self.live_edit(uid, None);
-        let Some(live) = self.live.doc_mut(uid) else { return false };
-        let Some(client) = live.client.as_mut() else { return false };
-        let (undo, redo) = client.history_len();
-        let msgs = match if back { client.undo(&EngineRecompute) } else { client.redo(&EngineRecompute) } {
-            Ok(m) => m,
-            Err(e) => {
-                log::warn!("live session: {} failed: {e}", if back { "undo" } else { "redo" });
-                return false;
-            }
-        };
-        let (u, r) = client.history_len();
-        let did = if back { r > redo } else { u > undo };
-        let doc = Arc::new(client.document().clone());
-        if did {
-            live.synced = Some(doc.clone());
-        }
-        let id = live.id;
-        self.live.send(id, msgs);
-        if did {
-            self.apply_remote(uid, doc);
-        }
-        did
-    }
-
-    /// Apply the server's batches that waited in session `id` (none while a gesture or preview
-    /// shows on its document).
-    fn live_deferred(&mut self, id: SessionId) {
-        let Some(live) = self.live.sessions.get(&id).filter(|l| !l.deferred.is_empty() && l.syncing()) else { return };
-        let Some(uid) = live.doc_uid else { return };
-        if self.docs.iter().find(|d| d.uid == uid).is_none_or(busy) {
-            return;
-        }
-        // Your own edits first: the client replays them over what others did.
-        self.live_edit(uid, None);
-        let Some(live) = self.live.sessions.get_mut(&id) else { return };
-        let Some(client) = live.client.as_mut() else { return };
-        let mut out = Vec::new();
-        for m in std::mem::take(&mut live.deferred) {
-            match client.receive(m, &EngineRecompute) {
-                Ok(more) => out.extend(more),
-                Err(e) => return self.live_fail(id, format!("The live session got out of step ({e}); join again")),
-            }
-        }
-        let doc = Arc::new(client.document().clone());
-        // Edits the server refused were rolled back: say why (the UI's toast).
-        let notices: Vec<String> = client.take_notices().iter().map(figcraft_collab::Notice::message).collect();
-        live.synced = Some(doc.clone());
-        if !notices.is_empty() {
-            self.message = Some(notices.join("; "));
-        }
-        self.live.send(id, out);
-        self.apply_remote(uid, doc);
-    }
-
-    /// Show the peer followed in session `id`: their viewport (and their page, in the session's
-    /// document) on the session's tab.
-    fn live_follow_apply(&mut self, id: SessionId) {
-        let Some(live) = self.live.sessions.get_mut(&id) else { return };
-        let Some(peer) = live.follow else { return };
-        if !live.peers.contains_key(&peer) {
-            live.unfollow();
-            return;
-        }
-        let Some((page, x, y, w, h)) = live.presence.get(&peer).and_then(|p| p.viewport) else { return };
-        let Some(ds) = self.docs.iter_mut().find(|d| Some(d.uid) == live.tab) else { return };
-        if live.syncing() && page != ds.page && ds.doc.pages.contains(&page) {
-            ds.page = page;
-            ds.selection.clear();
-            ds.text_edit = None;
-        }
-        if !(w > 0.0 && h > 0.0 && x.is_finite() && y.is_finite()) {
-            return;
-        }
-        ds.view.cx = x + w / 2.0;
-        ds.view.cy = y + h / 2.0;
-        let zoom = (ds.view.vw / w).min(ds.view.vh / h);
-        if zoom.is_finite() {
-            ds.view.zoom = zoom.clamp(ViewState::MIN_ZOOM, ViewState::MAX_ZOOM);
-        }
-        ds.revision += 1;
-        live.followed = Some(FollowedView { page: ds.page, cx: ds.view.cx, cy: ds.view.cy, zoom: ds.view.zoom });
-    }
-
-    /// Sessions whose tab was closed end (hosts stop hosting, guests leave); the others go on. A
-    /// join still on its way from a closed tab shows on the one in front.
-    fn live_closed(&mut self) {
-        let (docs, tab) = (&self.docs, self.tab());
-        let mut gone = Vec::new();
-        for l in self.live.sessions.values_mut().filter(|l| l.tab != tab && !docs.iter().any(|d| Some(d.uid) == l.tab)) {
-            if l.doc_uid.is_none() && l.status.active() {
-                l.tab = tab;
-            } else {
-                gone.push((l.id, l.status == Status::Live));
-            }
-        }
-        for (id, was_live) in gone {
-            self.live.end(id);
-            if was_live {
-                self.message = Some("The live session's file was closed, so you left the session".into());
-            }
-        }
-    }
-
-    /// Send your edits and presence in every session when they changed (headless sessions call
-    /// it after each command). A view you moved yourself stops following.
-    pub fn live_sync(&mut self) {
-        self.live_sync_in(|_| true);
-    }
-
-    /// [`live_sync`](Self::live_sync) for the sessions whose document (`None`: a join on its way)
-    /// `mine` picks: a window calls it every frame it draws, after input, for the documents it
-    /// holds.
-    pub fn live_sync_in(&mut self, mine: impl Fn(Option<u64>) -> bool) {
-        // A recovery copy whose session was left has its outcome too.
-        if !self.live.recovering.is_empty() {
-            self.online_recoveries();
-        }
-        if self.live.sessions.is_empty() {
-            return;
-        }
-        self.live_closed();
-        let ids: Vec<SessionId> = self.live.sessions.values().filter(|l| l.status == Status::Live && mine(l.doc_uid)).map(|l| l.id).collect();
-        for id in ids {
-            self.live_deferred(id);
-            if let Some(uid) = self.live.get(id).and_then(|l| l.doc_uid) {
-                self.live_edit(uid, None);
-            }
-            self.live_present(id);
-        }
-    }
-
-    /// Hand your presence in session `id` to the link when it changed.
-    fn live_present(&mut self, id: SessionId) {
-        let Some(live) = self.live.get(id).filter(|l| l.status == Status::Live) else { return };
-        let moved = live.followed.is_some_and(|f| {
-            self.docs
-                .iter()
-                .find(|d| Some(d.uid) == live.tab)
-                .is_some_and(|ds| ds.page != f.page || !close(ds.view.cx, f.cx) || !close(ds.view.cy, f.cy) || !close(ds.view.zoom, f.zoom))
-        });
-        let p = self.presence_in(live);
-        let changed = live.sent.as_ref() != Some(&p);
-        let Some(live) = self.live.sessions.get_mut(&id) else { return };
-        if moved {
-            live.unfollow();
-        }
-        if changed {
-            if let Some(link) = self.live.link.as_mut() {
-                link.presence(id, &p);
-            }
-            live.sent = Some(p);
-        }
-    }
-
-    /// Stop following in the active document's session (Escape, `collab.follow {}`). False when
-    /// you weren't following anyone.
-    pub fn live_unfollow(&mut self) -> bool {
-        self.live_mut().is_some_and(Live::unfollow)
-    }
-
-    /// Follow `peer`'s viewport in the active document's session (shown at once when known).
-    pub fn live_follow(&mut self, peer: u32) -> Result<()> {
-        let Some(live) = self.live_mut().filter(|l| l.peers.contains_key(&peer)) else {
-            return Err(bad("collab.follow", format!("nobody with client id {peer} is in the session")));
-        };
-        live.follow = Some(peer);
-        live.followed = None;
-        let id = live.id;
-        self.live_follow_apply(id);
-        Ok(())
-    }
-
-    /// The active document's session as JSON (`collab.peers`), with every session in brief.
-    pub fn live_summary(&self) -> Value {
-        self.summary(self.live())
-    }
-
-    /// The index of the open document session `l` syncs.
-    fn live_index(&self, l: &Live) -> Option<usize> {
-        l.doc_uid.and_then(|u| self.docs.iter().position(|d| d.uid == u))
-    }
-
-    fn summary(&self, l: &Live) -> Value {
-        let info = l.info.as_ref();
-        let reason = |l: &Live| match &l.status {
-            Status::Failed { reason } => Some(reason.clone()),
-            _ => None,
-        };
-        let synced = self.live_index(l).and_then(|i| self.docs.get(i));
-        // Who types in which layer of the session document.
-        let editing = |e: &EditingText| {
-            let layer = synced.and_then(|d| d.doc.node(e.node)).map(|n| n.name.as_str());
-            json!({"node": e.node, "layer": layer, "caret": e.caret, "selection": e.selection})
-        };
-        let peers: Vec<Value> = l
-            .peers
-            .values()
-            .map(|p| {
-                let presence = l.presence.get(&p.client_id);
-                let typing = presence.and_then(|pr| pr.editing_text.as_deref()).map(editing);
-                let chat = l.chats.get(&p.client_id);
-                json!({"id": p.client_id, "name": p.name, "color": p.color, "editing": typing, "chat": chat, "presence": presence})
-            })
-            .collect();
-        let mine = synced.and_then(|d| d.text_edit.as_ref()).map(|t| editing(&editing_of(t)));
-        let sessions: Vec<Value> = self
-            .live
-            .iter()
-            .map(|o| {
-                let info = o.info.as_ref();
-                json!({
-                    "session": o.id,
-                    "document": self.live_index(o),
-                    "status": o.status.id(),
-                    "reason": reason(o),
-                    "role": o.role(),
-                    "fileName": info.map(|i| i.file_name.as_str()),
-                    "link": info.map(|i| i.link.as_str()),
-                    "peers": o.peers.len(),
-                })
-            })
-            .collect();
-        json!({
-            "available": self.live.available(),
-            "canHost": self.live.can_host(),
-            "session": (l.id != NO_SESSION).then_some(l.id),
-            "status": l.status.id(),
-            "reason": reason(l),
-            "attempt": match l.status { Status::Reconnecting { attempt } => Some(attempt), _ => None },
-            "role": info.map(|i| i.role),
-            "me": info.map(|i| i.me),
-            "name": info.map(|i| i.name.as_str()),
-            "color": info.map(|i| i.color.as_str()),
-            "fileName": info.map(|i| i.file_name.as_str()),
-            "pages": info.map(|i| &i.pages),
-            "link": info.map(|i| i.link.as_str()),
-            "url": info.map(|i| i.url.as_str()),
-            "address": info.map(|i| i.address.as_str()),
-            "network": info.map(|i| i.network),
-            "access": l.client.as_ref().map(Client::access).or(info.map(|i| i.access)),
-            "readOnly": l.doc_uid.is_some_and(|u| self.live_read_only(u).is_some()),
-            "published": l.published,
-            "code": l.share.as_ref().and_then(Share::code),
-            "share": l.share.as_ref().map(|sh| {
-                let (edit, view) = (sh.links.as_ref().map(|s| &s.edit), sh.links.as_ref().and_then(|s| s.view.as_ref()));
-                let code = |l: Option<&SharedLink>| l.and_then(|l| l.code.as_deref()).map(code::grouped);
-                json!({
-                    "via": sh.via,
-                    "access": sh.access.id(),
-                    "shared": sh.links.is_some(),
-                    "editCode": code(edit),
-                    "viewCode": code(view),
-                    "editLink": edit.map(|l| l.link.as_str()),
-                    "viewLink": view.map(|l| l.link.as_str()),
-                })
-            }),
-            "hosting": l.hosting.as_ref().map(hosting_json),
-            "follow": l.follow,
-            "signals": l.signals,
-            "chat": l.chat,
-            "spotlight": l.spotlight,
-            "spotlighting": l.spotlighting,
-            "syncing": l.syncing(),
-            "document": self.live_index(l),
-            "editing": mine,
-            "peers": peers,
-            "sessions": sessions,
-        })
-    }
-}
-
-/// What a server says about its hosting, made safe to show: no control characters, short, and a
-/// terms address only when it is a web page (`http(s)://`).
-fn clean_hosting(mut info: HostInfo) -> HostInfo {
-    let clean = |s: &str, n: usize| s.trim().chars().filter(|c| !c.is_control()).take(n).collect::<String>();
-    info.operator = clean(&info.operator, 120);
-    info.terms = clean(&info.terms, 500);
-    let web = info.terms.starts_with("https://") || info.terms.starts_with("http://");
-    if !web || info.terms.contains(char::is_whitespace) {
-        info.terms.clear();
-    }
-    info
-}
-
-/// A server's hosting as JSON (`collab.peers`, `collab.serverInfo`).
-pub fn hosting_json(h: &HostInfo) -> Value {
-    json!({
-        "open": h.open,
-        "operator": h.operator,
-        "terms": h.terms,
-        "idleDays": (h.idle_secs > 0).then(|| (h.idle_secs as f64 / 86_400.0 * 100.0).round() / 100.0),
-        "maxFileMb": h.max_file_mb,
-        "expires": h.expires,
-    })
-}
-
-fn unavailable(cmd: &str) -> EngineError {
-    EngineError::Disabled(
-        cmd.to_string(),
-        "live sessions aren't available here (the desktop app and the MCP server host and join them; the web build joins)".into(),
-    )
-}
-
-fn host(s: &mut Session, p: &Value) -> Result<Value> {
-    start_host(s, "collab.host", p, Bind::Local, false)?;
-    Ok(s.live_summary())
-}
-
-/// Start hosting the open file for command `cmd` (on `bind` unless `p` says where; `short`: with
-/// a secret a join code can carry): the new session.
-fn start_host(s: &mut Session, cmd: &str, p: &Value, bind: Bind, short: bool) -> Result<SessionId> {
-    let port = match get(p, "port") {
-        None => None,
-        Some(v) => Some(v.as_u64().and_then(|n| u16::try_from(n).ok()).ok_or_else(|| bad(cmd, "`port` must be a whole number from 0 to 65535"))?),
-    };
-    let bind = match string(p, "bind").as_deref().map(str::trim) {
-        None => bind,
-        Some("local") => Bind::Local,
-        Some("lan") => Bind::Lan,
-        Some(other) => other.parse::<IpAddr>().map(Bind::Addr).map_err(|_| bad(cmd, "`bind` must be \"local\", \"lan\" or an IP address"))?,
-    };
-    let (doc, uid) = s.ds().map(|ds| (ds.doc.clone(), ds.uid))?;
-    let opts = HostOptions { port, bind, name: display_name(&s.prefs), doc, short };
-    let (id, info) = s.live.start(cmd, |l, id| l.host(id, opts).map_err(|e| EngineError::Other(format!("couldn't start the live session: {e}"))))?;
-    s.live.open(Live { id, status: Status::Live, info: Some(info), doc_uid: Some(uid), tab: Some(uid), ..Live::default() });
-    Ok(id)
-}
-
-fn publish(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "collab.publish";
-    let server = req_string(CMD, p, "server")?;
-    start_publish(s, CMD, &server, p, false)?;
-    Ok(s.live_summary())
-}
-
-/// Start publishing the open file to `server` for command `cmd` (`share`: with links and join
-/// codes for others too): the new session.
-fn start_publish(s: &mut Session, cmd: &str, server: &str, p: &Value, share: bool) -> Result<SessionId> {
-    let key = string(p, "key").map(|k| k.trim().to_string()).filter(|k| !k.is_empty());
-    let (doc, uid) = s.ds().map(|ds| (ds.doc.clone(), ds.uid))?;
-    let name = string(p, "name").map(|n| n.trim().chars().filter(|c| !c.is_control()).take(256).collect::<String>()).filter(|n| !n.is_empty());
-    let me = display_name(&s.prefs);
-    let opts = PublishOptions { server: server.trim().to_string(), key, name: name.unwrap_or_else(|| doc.name.clone()), me, doc, share };
-    let (id, ()) = s.live.start(cmd, |l, id| l.publish(id, opts).map_err(|e| bad(cmd, e)))?;
-    // This tab becomes the server file's synced document once it is there.
-    s.live.open(Live { id, status: Status::Connecting, doc_uid: Some(uid), tab: Some(uid), server: server.trim().to_string(), ..Live::default() });
-    Ok(id)
-}
-
-/// Why a local network share has no view-only code.
-const LOCAL_EDITS: &str = "everyone who joins a file shared on the local network can edit it: share it online for a view-only code";
-
-fn share(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "collab.share";
-    let via = match string(p, "via").as_deref().map(str::trim) {
-        None | Some("online") => Via::Online,
-        Some("local") => Via::Local,
-        Some(_) => return Err(bad(CMD, "`via` must be \"online\" or \"local\"")),
-    };
-    let access = match string(p, "access") {
-        None => None,
-        Some(a) => Some(Access::parse(&a).ok_or_else(|| bad(CMD, "`access` must be \"edit\" or \"view\""))?),
-    };
-    // A share of this file is there already: only which code is shown changes, or (the file is
-    // on the server, not shared at the moment) it gets new links and codes. Nothing is published
-    // twice.
-    if let Some(shared) = s.live().share.as_ref().filter(|_| s.live().status.active()).map(|sh| sh.via) {
-        if get(p, "via").is_some() && shared != via {
-            return Err(bad(
-                CMD,
-                "this file is shared the other way already: stop sharing it first (collab.stop), or leave its session (collab.leave)",
-            ));
-        }
-        if access == Some(Access::View) && shared == Via::Local {
-            return Err(bad(CMD, LOCAL_EDITS));
-        }
-        if let Some(req) = share_request(s, Vec::new(), true).filter(|_| s.live().share.as_ref().is_some_and(|sh| sh.links.is_none())) {
-            let links = share_answer(s, req)?.ok_or_else(|| EngineError::Other("the server made no links".into()))?;
-            shared_now(s, Some(clean_shared(links)));
-        }
-        if let (Some(a), Some(sh)) = (access, s.live_mut().and_then(|l| l.share.as_mut())) {
-            sh.access = a;
-        }
-        return Ok(s.live_summary());
-    }
-    let access = access.unwrap_or_default();
-    let mut server = String::new();
-    let id = match via {
-        Via::Local if access == Access::View => return Err(bad(CMD, LOCAL_EDITS)),
-        Via::Local => start_host(s, CMD, p, Bind::Lan, true)?,
-        Via::Online => {
-            server = string(p, "server").unwrap_or_else(|| s.prefs.publish_server.clone()).trim().to_string();
-            if server.is_empty() {
-                return Err(EngineError::Disabled(CMD.into(), ONLINE_OFF.into()));
-            }
-            start_publish(s, CMD, &server, p, true)?
-        }
-    };
-    if let Some(live) = s.live.sessions.get_mut(&id) {
-        // On the local network the session's own link is what others join with, and the code says
-        // what the link says: where the session is and its secret. (Online they arrive with the file.)
-        let links = live.info.as_ref().filter(|_| via == Via::Local).map(|i| {
-            let code = code::Local::from_link(&i.link).map(|l| l.code());
-            Shared { edit: SharedLink { id: String::new(), link: i.link.clone(), code }, view: None }
-        });
-        live.share = Some(Share { via, server, access, links });
-    }
-    Ok(s.live_summary())
-}
-
-/// What others join the open file's server file with changed: in its session and its record.
-fn shared_now(s: &mut Session, links: Option<Shared>) {
-    if let Some((server, file)) = s.live().server_file() {
-        s.online_shared(&server, &file, links);
-    }
-}
-
-/// Links and codes as a server gave them, with only codes that are codes (nine symbols).
-pub(crate) fn clean_shared(mut links: Shared) -> Shared {
-    let clean = |l: &mut SharedLink| l.code = l.code.take().and_then(|c| code::normalize(&c).ok()).filter(|c| c.len() == code::ONLINE_LEN);
-    clean(&mut links.edit);
-    links.view.as_mut().map(clean);
-    links
-}
-
-/// The request that changes who else gets into the server file the open file's session is its
-/// owner's session of (`None`: it isn't one, or the file isn't there yet).
-fn share_request(s: &Session, revoke: Vec<String>, create: bool) -> Option<NetRequest> {
-    let live = s.live();
-    let (share, published) = (live.share.as_ref().filter(|s| s.via == Via::Online)?, live.published.as_ref()?);
-    if live.status != Status::Live {
-        return None;
-    }
-    // The token this session got when it published the file, else the recorded one.
-    let owner = published.owner.clone().or_else(|| s.online_owner(&share.server, &published.file)).unwrap_or_default();
-    Some(NetRequest::Share { server: share.server.clone(), file: published.file.clone(), owner, revoke, create })
-}
-
-/// Send `req` ([`NetRequest::Share`]): the new links, if it made any.
-pub(crate) fn share_answer(s: &mut Session, req: NetRequest) -> Result<Option<Shared>> {
-    match s.net(req)?.0 {
-        NetReply::Share(Ok(links)) => Ok(links),
-        NetReply::Share(Err(why)) => Err(EngineError::Other(why)),
-        _ => Err(EngineError::Other("the server answered something else".into())),
-    }
-}
-
-/// What the server at `server` says about its hosting, and its answer to `req` about `file` with
-/// its owner token (`collab.serverInfo`, `collab.manageFile`).
-fn hosting_request(s: &mut Session, cmd: &str, server: &str, file: &str, owner: &str, req: Option<Admin>) -> Result<(HostInfo, Option<AdminReply>)> {
-    let req = NetRequest::Hosting { server: server.to_string(), file: file.to_string(), owner: owner.to_string(), req };
-    match s.net(req)?.0 {
-        // The server's refusals say why themselves.
-        NetReply::Hosting(Ok((_, Some(AdminReply::Failed { reason })))) | NetReply::Hosting(Err(reason)) => Err(EngineError::Other(reason)),
-        NetReply::Hosting(Ok((info, reply))) => Ok((clean_hosting(info), reply)),
-        _ => Err(EngineError::Other(format!("{cmd}: the server answered something else"))),
-    }
-}
-
-fn server_info(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "collab.serverInfo";
-    let server = req_string(CMD, p, "server")?;
-    let (info, _) = hosting_request(s, CMD, server.trim(), "", "", None)?;
-    Ok(hosting_json(&info))
-}
-
-fn manage_file(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "collab.manageFile";
-    let file = req_string(CMD, p, "file")?.trim().to_string();
-    let (server, owner) = crate::online::manager(s, CMD, p, &file)?;
-    let action = req_string(CMD, p, "action")?;
-    let mut renamed = None;
-    let req = match action.trim() {
-        "share" => return crate::online::set_shared(s, CMD, &server, &file, &owner, true),
-        "unshare" => return crate::online::set_shared(s, CMD, &server, &file, &owner, false),
-        "links" => Admin::Links { file: file.clone() },
-        "createLink" => {
-            let access = match string(p, "access").as_deref().map(str::trim) {
-                None | Some("view") => Access::View,
-                Some("edit") => Access::Edit,
-                Some(_) => return Err(bad(CMD, "`access` must be \"edit\" or \"view\"")),
-            };
-            Admin::CreateLink { file: file.clone(), access, label: string(p, "label").unwrap_or_default() }
-        }
-        "revoke" => Admin::Revoke { file: file.clone(), link: req_string(CMD, p, "link")?.trim().to_string() },
-        "rename" => {
-            let name = req_string(CMD, p, "name")?;
-            renamed = Some(name.clone());
-            Admin::Rename { file: file.clone(), name }
-        }
-        "remove" => Admin::Remove { file: file.clone() },
-        _ => return Err(bad(CMD, "`action` must be links, createLink, revoke, share, unshare, rename or remove")),
-    };
-    let changes = matches!(req, Admin::Rename { .. } | Admin::Remove { .. });
-    let reply = hosting_request(s, CMD, &server, &file, &owner, Some(req))?.1;
-    // The record follows what the server did.
-    if changes && reply == Some(AdminReply::Done) {
-        crate::online::managed(s, &server, &file, renamed.as_deref());
-        if renamed.is_none() {
-            crate::online::removed(s, &server, &file);
-        }
-    }
-    match reply {
-        Some(AdminReply::Links(links)) => Ok(json!({"links": links.iter().map(|l| json!({
-            "id": l.id, "access": l.access.id(), "label": l.label, "created": l.created
-        })).collect::<Vec<_>>()})),
-        // The link layer gives the new link whole in place of its token.
-        Some(AdminReply::Link(l)) => Ok(json!({"id": l.link.id, "access": l.link.access.id(), "link": l.token})),
-        Some(AdminReply::Done) => Ok(json!({"done": true})),
-        _ => Err(bad(CMD, "the server answered something else")),
-    }
-}
-
-fn report(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "collab.report";
-    let reason: String = req_string(CMD, p, "reason")?.trim().chars().map(|c| if c.is_control() { ' ' } else { c }).take(MAX_REPORT).collect();
-    if reason.is_empty() {
-        return Err(bad(CMD, "say in a few words what is wrong with the file (`reason`)"));
-    }
-    let live = s.live();
-    if live.status != Status::Live || live.role() != Some(Role::Guest) {
-        return Err(bad(CMD, "join a file on a FigCraft server first: reports go to that server's operator"));
-    }
-    if live.hosting.is_none() {
-        return Err(bad(CMD, "this server doesn't take reports (it is older than this app); contact its operator another way"));
-    }
-    let id = live.id;
-    s.live.send(id, [ClientMsg::Report { reason }]);
-    Ok(json!({"sent": true}))
-}
-
-/// Longest report sent (characters).
-pub const MAX_REPORT: usize = 500;
-
-fn join(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "collab.join";
-    let typed = match string(p, "code") {
-        Some(code) => code,
-        None => req_string(CMD, p, "link").map_err(|_| bad(CMD, "give the join `code` you were told, or the invite `link`"))?,
-    };
-    let link = join_target(&s.prefs.publish_server, &typed).map_err(|e| bad(CMD, e))?;
-    let id = start_join(s, CMD, &link, None, None, None)?;
-    Ok(s.live.get(id).map_or(Value::Null, |l| s.summary(l)))
-}
-
-/// Start joining the session behind `link` for command `cmd`: the new session. `published` and
-/// `share`: the file is yours on a server (`collab.openFile`), with what others join it with;
-/// `resume`: as the client you were there.
-pub(crate) fn start_join(
-    s: &mut Session,
-    cmd: &str,
-    link: &str,
-    published: Option<Published>,
-    share: Option<Share>,
-    resume: Option<Resume>,
-) -> Result<SessionId> {
-    let (name, tab) = (display_name(&s.prefs), s.tab());
-    let (id, ()) = s.live.start(cmd, |l, id| l.join_resuming(id, link, &name, resume).map_err(|e| bad(cmd, e)))?;
-    let server = share.as_ref().map(|s| s.server.clone()).unwrap_or_default();
-    // The session's file opens in a tab of its own; until then the join shows on this one.
-    s.live.open(Live { id, status: Status::Connecting, tab, server, published, share, ..Live::default() });
-    Ok(id)
-}
-
-fn leave(s: &mut Session, _: &Value) -> Result<Value> {
-    let ended = s.live.shown(s.tab()).and_then(|id| s.live.end(id));
-    if ended.as_ref().is_some_and(|l| l.syncing() && l.role() == Some(Role::Guest)) {
-        s.message = Some("You left the session; your copy stays open here".into());
-    }
-    Ok(json!({"ended": ended.is_some_and(|l| l.status.active())}))
-}
-
-fn stop(s: &mut Session, p: &Value) -> Result<Value> {
-    // A file shared online stays its owner's on the server: stopping takes the others' links (and
-    // their codes) away, which disconnects whoever joined with them, and the owner stays in the
-    // file. Anything else (a session this app hosts, one it joined, a file not shared now) ends.
-    let shared = s.live().share.as_ref().and_then(|sh| sh.links.as_ref());
-    let ids: Vec<String> = shared.into_iter().flat_map(|l| [Some(&l.edit), l.view.as_ref()]).flatten().map(|l| l.id.clone()).collect();
-    let Some(req) = share_request(s, ids, false).filter(|_| shared.is_some()) else { return leave(s, p) };
-    share_answer(s, req).map_err(|e| EngineError::Other(format!("couldn't stop sharing (the others can still get in): {e}")))?;
-    shared_now(s, None);
-    s.message = Some("Sharing stopped: the file stays on the server, open only to you".into());
-    Ok(json!({"ended": false, "shared": false}))
-}
-
-fn follow(s: &mut Session, p: &Value) -> Result<Value> {
-    match get(p, "client") {
-        None => {
-            s.live_unfollow();
-        }
-        Some(v) => {
-            let id = v.as_u64().and_then(|n| u32::try_from(n).ok()).ok_or_else(|| bad("collab.follow", "`client` must be a client id"))?;
-            s.live_follow(id)?;
-        }
-    }
-    Ok(json!({"follow": s.live().follow}))
-}
-
-/// Remove someone from the open file's session: in a session this app hosts, the hub drops them;
-/// in a file of yours on a server, the server does (with the file's owner token). They are told
-/// the session is over for them, keep their copy, and can't join again from their address while
-/// the session (or the server) runs.
-fn remove_person(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "collab.removePerson";
-    let client =
-        get(p, "client").and_then(Value::as_u64).and_then(|n| u32::try_from(n).ok()).ok_or_else(|| bad(CMD, "`client` must be a client id"))?;
-    let live = s.live();
-    if live.status != Status::Live {
-        return Err(bad(CMD, "the open file isn't in a live session"));
-    }
-    let name =
-        live.peers.get(&client).map(|p| p.name.clone()).ok_or_else(|| bad(CMD, format!("nobody with client id {client} is in the session")))?;
-    let (id, role, server_file) = (live.id, live.role(), live.server_file());
-    match (role, server_file) {
-        (Some(Role::Host), _) => {
-            let link = s.live.link.as_deref_mut().ok_or_else(|| unavailable(CMD))?;
-            link.remove(id, client).map_err(EngineError::Other)?;
-        }
-        (Some(Role::Guest), Some((server, file))) => {
-            let owner =
-                s.live().published.as_ref().and_then(|p| p.owner.clone()).or_else(|| s.online_owner(&server, &file)).filter(|o| !o.is_empty());
-            let owner = owner.ok_or_else(|| bad(CMD, "only the file's owner can remove people from it"))?;
-            let req = Some(Admin::RemovePeer { file: file.clone(), client });
-            match hosting_request(s, CMD, &server, &file, &owner, req) {
-                Ok((_, Some(AdminReply::Done))) => {}
-                Ok(_) => return Err(EngineError::Other(format!("couldn't remove {name}: the server answered something else"))),
-                // A server older than this request can't read it.
-                Err(e) => return Err(EngineError::Other(format!("couldn't remove {name}: {e} (the server may be older than removing people)"))),
-            }
-        }
-        _ => return Err(bad(CMD, "only the person hosting the session, or the file's owner, can remove people")),
-    }
-    s.message = Some(format!("{name} was removed from the session"));
-    Ok(json!({"removed": client, "name": name}))
-}
-
-/// You may remove others from the open file's session: you host it, or it is your file on a
-/// server.
-pub fn can_remove_people(s: &Session) -> bool {
-    let live = s.live();
-    live.status == Status::Live
-        && match live.role() {
-            Some(Role::Host) => true,
-            Some(Role::Guest) => live.server_file().is_some_and(|(server, file)| {
-                live.published.as_ref().and_then(|p| p.owner.as_deref()).is_some_and(|o| !o.is_empty())
-                    || s.online_owner(&server, &file).is_some_and(|o| !o.is_empty())
-            }),
-            None => false,
-        }
-}
-
-fn cursor(s: &mut Session, p: &Value) -> Result<Value> {
-    let at = match (num(p, "x"), num(p, "y")) {
-        (Some(x), Some(y)) => Some((x, y)),
-        (None, None) => None,
-        _ => return Err(bad("collab.cursor", "give both `x` and `y` (page coordinates), or neither to hide the cursor")),
-    };
-    if let Some(l) = s.live_mut() {
-        l.cursor = at;
-    }
-    s.live_sync();
-    Ok(json!({"cursor": s.live().cursor.map(|(x, y)| [x, y])}))
-}
-
-fn cursor_chat(s: &mut Session, p: &Value) -> Result<Value> {
-    let Some(v) = get(p, "text") else {
-        // The app's chat box (programmatic calls never open dialogs).
-        let open = s.signal_blocker().is_none();
-        if open {
-            s.request_ui("dialog.cursorChat", json!({}));
-        }
-        return Ok(json!({"open": open, "chat": s.live().chat}));
-    };
-    let text = v.as_str().ok_or_else(|| bad("collab.cursorChat", "`text` must be a string (empty closes the chat)"))?;
-    Ok(json!({"chat": s.live_chat(text)?}))
-}
-
-fn spotlight(s: &mut Session, p: &Value) -> Result<Value> {
-    let on = match get(p, "on") {
-        None => !s.live().spotlighting,
-        Some(v) => v.as_bool().ok_or_else(|| bad("collab.spotlight", "`on` must be true or false"))?,
-    };
-    s.live_spotlight(on)?;
-    Ok(json!({"spotlighting": s.live().spotlighting}))
-}
-
-pub fn specs() -> Vec<CommandSpec> {
-    vec![
-        spec!(
-            "collab.host",
-            "Start live session",
-            "{port? (default 47900, else any free port), bind?: \"local\" (this machine, default) | \"lan\" (the local network) | an IP address} → the open file's session: {session, link, url (invites: they carry the secret token), address, …}; sessions are per file, so other files' sessions go on (a session this file was in ends)",
-            false,
-            host
-        ),
-        spec!(
-            "collab.share",
-            "Share with a join code",
-            "{via?: \"online\" (default: the open file is kept on the server in Preferences, `pref.publishServer`, and the server hands out the codes) | \"local\" (this app hosts it for people on the same network; no server), access?: \"edit\" (default) | \"view\" (online only: which code `code` is), server? (online: another server's address, with ?key=… when it needs its key), name? (online: the file's name there), port?, bind?: \"lan\" (default) | \"local\" (this machine only) | an IP address (local)} → the open file's session as `collab.peers` gives it: `code` is what others type to join (`collab.join {code}`, the Join field), `link` an invite link. Local: at once, the code carries the host's IPv4 address, port and secret (K7M2Q-…, 20 symbols). Online: status \"connecting\" first; once live `code` is the server's (K7M-2QX-9TD) and `share` is {via, access, shared, editCode, viewCode, editLink, viewLink}: links made for others (the file's own links in `published` stay yours); `code` stays null when the server is older than join codes (give `share.editLink` / `share.viewLink` instead). Called again while shared: only switches which code `code` is (`access`). Called after `collab.stop` on a file that is still on the server: new links and codes for that same file (nothing is published twice). `collab.stop` stops sharing",
-            false,
-            share
-        ),
-        spec!(
-            "collab.stop",
-            "Stop live session",
-            "{} → {ended}: the open file's session ends (a session this app hosts stops for everyone; a joined one is left). A file shared online with `collab.share` is different: its sharing stops → {ended: false, shared: false}: the links and codes others got are revoked on the server, whoever joined with them is disconnected at once (they keep their copy), and you stay in the file, which stays on the server, open only to you (`collab.share` shares it again with new codes; `collab.leave` leaves it there; `collab.manageFile {action: \"remove\"}` with its owner token takes it off the server)",
-            false,
-            stop
-        ),
-        spec!(
-            "collab.join",
-            "Join live session",
-            "{code: a join code (K7M-2QX-9TD from a server, asked at the server in Preferences; a longer one for the local network; spaces, dashes and case don't matter, O reads as 0 and I or L as 1) | link: figcraft://join?host=…&file=…&token=…, figcraft://join?server=ws(s)://…&file=…&token=… or ws(s)://host:port/?file=…&token=… (a session an app hosts, or a server's share link; a code here works too)} → the new session: {session, status: \"connecting\", …}; its file opens in a tab of its own (other files' sessions go on) and `collab.peers` tells when it's live (`sessions` lists it until then, and if it fails)",
-            false,
-            join
-        ),
-        spec!(
-            "collab.leave",
-            "Leave live session",
-            "{} (the open file's session; the synced file stays open as a local copy) → {ended}",
-            false,
-            leave
-        ),
-        spec!(
-            "collab.publish",
-            "Publish to server",
-            "{server: ws://host:port/?key=… or wss://host/path/?key=… (the server's address with its key; `figcraft-server key` prints it; without a key on a server open to the public), key? (when the address has none), name? (default: the file's name)} → status \"connecting\": the open file is uploaded as a new file and this tab syncs through the server; `collab.peers` then has `published: {server, file, name, edit, view, owner (published without a key: the owner token, shown once), expires (seconds since 1970, or null)}` and `hosting` (the server's operator, terms and idle expiry)",
-            false,
-            publish
-        ),
-        spec!(
-            "collab.serverInfo",
-            "Server info",
-            "{server: ws://host:port/ or wss://host/path/} → {open (anyone may publish without the key), operator, terms (a web address), idleDays (files published without the key are deleted after this many days unopened; null: kept), maxFileMb, expires}",
-            false,
-            server_info
-        ),
-        spec!(
-            "collab.manageFile",
-            "Manage published file",
-            "{file (its id), server?, owner? (the server's address and the owner token you got when you published the file without the key; each defaults to what is recorded for one of your online files, see `collab.files`), action: links | createLink {access?: view (default) | edit, label?} | revoke {link (a link's id)} | share (others get new links and join codes) | unshare (the links and codes others got are revoked; the file stays yours on the server) | rename {name} | remove (the file is deleted from the server and leaves your online files)} → {links: [{id, access, label, created}]} | {id, access, link (a new share link, shown once)} | {shared, code, viewCode, editLink, viewLink} | {done}",
-            false,
-            manage_file
-        ),
-        spec!(
-            "collab.report",
-            "Report file to server operator",
-            "{reason (a few words, at most 500 characters)} → {sent}: the file you joined on a server is reported to its operator; the session's message says when the server kept it (servers older than this app don't take reports)",
-            false,
-            report
-        ),
-        spec!(
-            "collab.peers",
-            "People in this file",
-            "{} → the open file's session (each open file has its own or none): {available, canHost (false in the browser: it can only join), session (its id; null: this file isn't in a session), status: off|connecting|live|reconnecting|failed, reason?, role, me, name, color, fileName, pages, link, url, address, network, access: edit|view (view: a server's view link; edits are refused), readOnly (the open file can't be edited now: view only, or being published), published (a file you published: {server, file, name, edit, view}), code (the join code to give others, when the file was shared with `collab.share`; null otherwise or while it is on its way), share ({via: online|local, access, shared (false: a file of yours on a server that nobody else gets into now), editCode, viewCode, editLink, viewLink (what others join with; null when not shared)} or null), follow, syncing, document (index of the synced open document), editing (the text layer you type in: {node, layer, caret, selection}), peers: [{id, name, color, editing (theirs, same shape, or null), presence: {cursor: [page, x, y], selection, viewport: [page, x, y, w, h], editing_text}}], sessions: [{session, document (index of its open document; null for a join on its way), status, reason, role, fileName, link, peers (how many others)}] (every session of the app)}",
-            false,
-            |s, _| Ok(s.live_summary())
-        ),
-        spec!("collab.follow", "Follow", "{client? (a peer's id; omit to stop following)} → {follow}", false, follow),
-        spec!(
-            "collab.removePerson",
-            "Remove from session",
-            "{client (a peer's id)} → {removed, name}: they are disconnected (they keep their copy) and can't join again from their address while the session runs; only the person hosting, or the owner of a file on a server, can do it",
-            false,
-            remove_person
-        ),
-        spec!(
-            "collab.cursor",
-            "Show cursor at",
-            "{x?, y? (page coordinates on the current page; omit both to hide)} → {cursor} (agents; in the app the pointer drives it): your pointer in the open file's session (null when the file isn't in one)",
-            false,
-            cursor
-        ),
-        spec!(
-            "collab.cursorChat",
-            "Cursor chat",
-            "{text? (shown next to your cursor for everyone, at most 100 characters; empty closes it; omit to open the chat box in the app)} → {chat} (or {open}); others see it fade after 5 s without changes",
-            false,
-            cursor_chat
-        ),
-        spec!(
-            "collab.spotlight",
-            "Spotlight me",
-            "{on? (default: toggle)} → {spotlighting}: everyone in the session follows your view and page until they move theirs",
-            false,
-            spotlight
-        ),
-    ]
-}
diff --git a/crates/engine/src/live_access_tests.rs b/crates/engine/src/live_access_tests.rs
index 7f5a4488..52a08cfd 100644
--- a/crates/engine/src/live_access_tests.rs
+++ b/crates/engine/src/live_access_tests.rs
@@ -105,6 +105,13 @@ fn a_view_link_makes_the_file_read_only() {
     refused(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 5, "height": 5}), VIEW_ONLY);
     refused(&mut s, "node.set", json!({"ids": [card.0], "props": {"name": "Mine"}}), VIEW_ONLY);
     refused(&mut s, "edit.delete", json!({"ids": [card.0]}), VIEW_ONLY);
+    // Refused before it makes copies or writes files, which no rollback takes back.
+    let dir = std::env::temp_dir().join(format!("figcraft-view-fill-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    refused(&mut s, "data.fill", json!({"id": card.0, "rows": [{"name": "Copy"}], "dir": dir.to_string_lossy()}), VIEW_ONLY);
+    assert_eq!(std::fs::read_dir(&dir).unwrap().count(), 0, "no file was written");
+    let _ = std::fs::remove_dir_all(&dir);
     refused(&mut s, "tool.set", json!({"tool": "text"}), VIEW_ONLY);
     assert!(matches!(s.begin_interaction("Move"), Err(EngineError::Disabled(..))));
     assert_eq!(*s.doc().unwrap(), before);
@@ -265,7 +272,7 @@ fn revert_offline_file_works_while_another_file_is_live_and_after_leaving() {
     s.execute("file.new", &json!({})).unwrap();
     let offline_path = saved_file(&mut s);
     s.execute("file.revert", &json!({})).unwrap();
-    assert_eq!(s.doc().unwrap().name, "Untitled");
+    assert_eq!(s.doc().unwrap().name, offline_path.file_stem().unwrap().to_string_lossy());
     assert!(!s.ds().unwrap().is_dirty());
     assert_eq!(s.ds().unwrap().versions.len(), 1);
     assert_eq!(s.live_of(uid).doc_uid, Some(uid));
@@ -273,7 +280,7 @@ fn revert_offline_file_works_while_another_file_is_live_and_after_leaving() {
     s.execute("doc.switch", &json!({"index": 0})).unwrap();
     s.execute("collab.leave", &json!({})).unwrap();
     s.execute("file.revert", &json!({})).unwrap();
-    assert_eq!(s.doc().unwrap().name, "Untitled");
+    assert_eq!(s.doc().unwrap().name, path.file_stem().unwrap().to_string_lossy());
     assert!(!s.ds().unwrap().is_dirty());
     assert_eq!(s.ds().unwrap().versions.len(), 1);
     assert_eq!(s.live().doc_uid, None);
diff --git a/crates/engine/src/live_share_tests.rs b/crates/engine/src/live_share_tests.rs
index c52e1ccb..f486250f 100644
--- a/crates/engine/src/live_share_tests.rs
+++ b/crates/engine/src/live_share_tests.rs
@@ -272,6 +272,23 @@ fn sharing_online_publishes_to_the_server_in_preferences_and_shows_its_code() {
     assert_eq!((&r["status"], &r["code"], &r["share"]), (&json!("off"), &Value::Null, &Value::Null));
 }
 
+#[test]
+fn sharing_online_uses_a_separate_key_param() {
+    // The Share popover sends the server key as its own field when the address (from Preferences,
+    // which never holds a key) needs one. It must reach `publish` and not leak into the summary.
+    let (mut s, script) = session();
+    ex(&mut s, "pref.publishServer", json!({"url": "wss://share.example/"}));
+    let r = ex(&mut s, "collab.share", json!({"key": "KeyKeyKeyKeyKeyKeyKey1"}));
+    assert_eq!(r["status"], "connecting");
+    {
+        let sc = script.lock().unwrap();
+        let [p] = sc.published.as_slice() else { panic!("published {}", sc.published.len()) };
+        assert_eq!(p.server, "wss://share.example/");
+        assert_eq!(p.key.as_deref(), Some("KeyKeyKeyKeyKeyKeyKey1"));
+    }
+    assert!(!r.to_string().contains("KeyKey"), "the server's key is nowhere in the summary");
+}
+
 #[test]
 fn a_server_without_join_codes_leaves_the_links() {
     let (mut s, script) = session();
diff --git a/crates/engine/src/live_tests.rs b/crates/engine/src/live_tests.rs
index cacc4f37..5cdccf69 100644
--- a/crates/engine/src/live_tests.rs
+++ b/crates/engine/src/live_tests.rs
@@ -507,3 +507,11 @@ fn hosting_commands_check_what_they_are_given() {
     assert!(e.contains("join a file"), "{e}");
     assert!(s.execute("collab.report", &json!({"reason": " \n "})).unwrap_err().to_string().contains("few words"));
 }
+
+#[test]
+fn parse_color_rejects_signs_and_non_hex() {
+    use crate::live::parse_color;
+    assert_eq!(parse_color("#+1+2+3"), None);
+    assert_eq!(parse_color("#-1-2-3"), None);
+    assert_eq!(parse_color("#0D99FF"), Some((13, 153, 255)));
+}
diff --git a/crates/engine/src/measure_tests.rs b/crates/engine/src/measure_tests.rs
index 539386bd..9f793721 100644
--- a/crates/engine/src/measure_tests.rs
+++ b/crates/engine/src/measure_tests.rs
@@ -250,3 +250,21 @@ fn measure_distances_command() {
     assert!(s.execute("measure.distances", &json!({"ids": [f]})).is_err(), "top level: pass `to`");
     assert!(s.execute("measure.distances", &json!({"ids": [r], "to": 99999})).is_err());
 }
+
+#[test]
+fn leaving_the_canvas_clears_the_hover_measurement() {
+    let mut s = Session::new();
+    let a = rect(&mut s, 0.0, 0.0, 50.0, 50.0, None);
+    rect(&mut s, 100.0, 0.0, 50.0, 50.0, None);
+    ex(&mut s, "select.set", json!({"ids": [a]}));
+    assert!(!hover(&mut s, 125.0, 25.0, true, false, false).is_empty());
+    assert!(s.tool.overlay.measure_box.is_some());
+    s.pointer_left();
+    assert!(s.tool.overlay.guides.is_empty(), "{:?}", s.tool.overlay.guides);
+    assert_eq!(s.tool.overlay.measure_box, None);
+    // Dev Mode measures without Alt; leaving clears those too.
+    s.tool.dev_mode = true;
+    assert!(!hover(&mut s, 125.0, 25.0, false, false, false).is_empty());
+    s.pointer_left();
+    assert!(s.tool.overlay.guides.is_empty());
+}
diff --git a/crates/engine/src/nested_override_tests.rs b/crates/engine/src/nested_override_tests.rs
index f684a693..0d61edf7 100644
--- a/crates/engine/src/nested_override_tests.rs
+++ b/crates/engine/src/nested_override_tests.rs
@@ -198,3 +198,179 @@ fn copied_instances_keep_their_overrides() {
     assert!(node(&s, t).source.is_none() && node(&s, t).overrides.is_empty());
     healthy(&s);
 }
+
+/// `button()` with the main's copy of the icon's Shape filled red, and an instance-swap property
+/// `Icon` on the nested icon: (icon, shape, button, nested).
+fn button_with_icon_override(s: &mut Session) -> (NodeId, NodeId, NodeId, NodeId) {
+    let (icon_main, shape, button, nested) = button(s);
+    let main_shape = copy_of(s, nested, shape);
+    ex(s, "node.set", json!({"id": main_shape, "props": {"fill": "#ff0000"}}));
+    ex(s, "component.addProperty", json!({"id": button, "name": "Icon", "type": "instanceSwap", "default": icon_main, "layer": nested}));
+    (icon_main, shape, button, nested)
+}
+
+/// Swap instance `i`'s icon to `to` by its instance-swap property `Icon`.
+fn swap_icon(s: &mut Session, i: NodeId, to: NodeId) {
+    ex(s, "instance.setProperties", json!({"ids": [i], "properties": {"Icon": to}}));
+    healthy(s);
+}
+
+#[test]
+fn a_main_override_carries_onto_a_swapped_nested_instance() {
+    // Documented: overrides survive a swap when layer names match, and a swapped icon takes the
+    // colour the main component set (forum thread with staff replies). Rows: by the instance-swap
+    // property and by instance.swap, onto a matching and an unmatched name. The main's size
+    // override is geometry and stays out; the instance's own override wins over the main's.
+    let mut s = Session::new();
+    let (_icon, shape, button, nested) = button_with_icon_override(&mut s);
+    let main_shape = copy_of(&s, nested, shape);
+    ex(&mut s, "node.set", json!({"id": main_shape, "props": {"width": 10}}));
+    let other = icon(&mut s, 200.0, "Other", "Shape");
+    let unmatched = icon(&mut s, 300.0, "Unmatched", "Glyph");
+    for (by_property, to, want) in [(true, other, "FF0000"), (false, other, "FF0000"), (true, unmatched, "111111"), (false, unmatched, "111111")] {
+        let i = idv(&ex(&mut s, "instance.create", json!({"component": button, "x": 300, "y": 400})));
+        if by_property {
+            swap_icon(&mut s, i, to);
+        } else {
+            let inested = copy_of(&s, i, nested);
+            ex(&mut s, "instance.swap", json!({"ids": [inested], "component": to}));
+            healthy(&s);
+        }
+        let glyph = kids(&s, copy_of(&s, i, nested))[0];
+        assert_eq!(fill(&s, glyph), want, "by property {by_property}, to {to}");
+        assert_eq!(node(&s, glyph).width, 20.0, "the main's size override stays out");
+    }
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": button, "x": 300, "y": 600})));
+    let glyph = kids(&s, copy_of(&s, i, nested))[0];
+    ex(&mut s, "node.set", json!({"id": glyph, "props": {"fill": "#0000ff"}}));
+    swap_icon(&mut s, i, other);
+    assert_eq!(fill(&s, kids(&s, copy_of(&s, i, nested))[0]), "0000FF", "the instance's own override wins");
+}
+
+#[test]
+fn a_main_override_carries_onto_a_swap_one_level_deeper() {
+    // As above for a Button instance inside a Toolbar main, swapped in a Toolbar instance.
+    let mut s = Session::new();
+    let (_icon, _shape, button, nested) = button_with_icon_override(&mut s);
+    let other = icon(&mut s, 200.0, "Other", "Shape");
+    let bar = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 600, "width": 300, "height": 60, "name": "Toolbar"})));
+    let inner = idv(&ex(&mut s, "instance.create", json!({"component": button, "x": 10, "y": 10, "parent": bar})));
+    let toolbar = idv(&ex(&mut s, "component.create", json!({"ids": [bar]})));
+    let t = idv(&ex(&mut s, "instance.create", json!({"component": toolbar, "x": 0, "y": 800})));
+    let icon_in_t = copy_of(&s, t, copy_of(&s, inner, nested));
+    ex(&mut s, "instance.swap", json!({"ids": [icon_in_t], "component": other}));
+    healthy(&s);
+    assert_eq!(fill(&s, kids(&s, icon_in_t)[0]), "FF0000");
+}
+
+#[test]
+fn a_swapped_nested_instance_keeps_the_main_override_it_took() {
+    // Documented (staff reply): later edits of the main's icon colour don't reach instances that
+    // swapped, and do reach the rest. Undo and redo follow; resetting the override shows the icon
+    // main's own fill.
+    let mut s = Session::new();
+    let (_icon, shape, button, nested) = button_with_icon_override(&mut s);
+    let other = icon(&mut s, 200.0, "Other", "Shape");
+    let swapped = idv(&ex(&mut s, "instance.create", json!({"component": button, "x": 300, "y": 400})));
+    let kept = idv(&ex(&mut s, "instance.create", json!({"component": button, "x": 300, "y": 500})));
+    swap_icon(&mut s, swapped, other);
+    let glyph = |s: &Session, i: NodeId| fill(s, kids(s, copy_of(s, i, nested))[0]);
+    let main_shape = copy_of(&s, nested, shape);
+    ex(&mut s, "node.set", json!({"id": main_shape, "props": {"fill": "#00ff00"}}));
+    healthy(&s);
+    assert_eq!((glyph(&s, swapped), glyph(&s, kept)), ("FF0000".into(), "00FF00".into()));
+    s.undo().unwrap();
+    assert_eq!((glyph(&s, swapped), glyph(&s, kept)), ("FF0000".into(), "FF0000".into()));
+    s.redo().unwrap();
+    assert_eq!((glyph(&s, swapped), glyph(&s, kept)), ("FF0000".into(), "00FF00".into()));
+    let swapped_glyph = kids(&s, copy_of(&s, swapped, nested))[0];
+    ex(&mut s, "component.resetOverride", json!({"id": swapped_glyph, "group": "fills"}));
+    healthy(&s);
+    assert_eq!(glyph(&s, swapped), "111111");
+}
+
+#[test]
+fn a_swapped_in_icon_keeps_its_own_overrides_to_itself() {
+    // Docs silent; pinned: what an icon main overrides inside itself stays that main's. After a
+    // swap to it, its edits still reach the instance; a second swap doesn't carry them on.
+    let mut s = Session::new();
+    let (_icon, _shape, button, nested) = button_with_icon_override(&mut s);
+    let dot = icon(&mut s, 200.0, "Dot", "Shape");
+    let with_dot = |s: &mut Session, x: f64, name: &str, fill: Option<&str>| {
+        let f = idv(&ex(s, "frame.create", json!({"x": x, "y": 300, "width": 24, "height": 24, "name": name})));
+        let d = idv(&ex(s, "instance.create", json!({"component": dot, "x": 0, "y": 0, "parent": f})));
+        if let Some(c) = fill {
+            let shape = kids(s, d)[0];
+            ex(s, "node.set", json!({"id": shape, "props": {"fill": c}}));
+        }
+        (idv(&ex(s, "component.create", json!({"ids": [f]}))), d)
+    };
+    let (other2, dot2) = with_dot(&mut s, 300.0, "Other2", Some("#0000ff"));
+    let (other3, _) = with_dot(&mut s, 400.0, "Other3", None);
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": button, "x": 300, "y": 400})));
+    swap_icon(&mut s, i, other2);
+    let shape_in = |s: &Session| kids(s, kids(s, copy_of(s, i, nested))[0])[0];
+    assert_eq!(fill(&s, shape_in(&s)), "0000FF");
+    let shape2 = kids(&s, dot2)[0];
+    ex(&mut s, "node.set", json!({"id": shape2, "props": {"fill": "#00ffff"}}));
+    healthy(&s);
+    assert_eq!(fill(&s, shape_in(&s)), "00FFFF", "Other2's own edit reaches it");
+    swap_icon(&mut s, i, other3);
+    assert_eq!(fill(&s, shape_in(&s)), "111111", "Other2's override doesn't carry onto Other3");
+}
+
+#[test]
+fn a_swapped_out_icons_own_overrides_stay_with_it() {
+    // Docs silent; pinned: what the Button's default icon main overrides inside itself isn't the
+    // Button main's to carry. Icon A colours its Base's Shape green; swapping to icon B, also built
+    // on Base, shows Base's own fill.
+    let mut s = Session::new();
+    let base = icon(&mut s, 0.0, "Base", "Shape");
+    let on_base = |s: &mut Session, x: f64, name: &str| {
+        let f = idv(&ex(s, "frame.create", json!({"x": x, "y": 500, "width": 24, "height": 24, "name": name})));
+        let b = idv(&ex(s, "instance.create", json!({"component": base, "x": 0, "y": 0, "parent": f})));
+        (idv(&ex(s, "component.create", json!({"ids": [f]}))), b)
+    };
+    let (a, a_base) = on_base(&mut s, 100.0, "A");
+    let (b, _) = on_base(&mut s, 200.0, "B");
+    let a_shape = kids(&s, a_base)[0];
+    ex(&mut s, "node.set", json!({"id": a_shape, "props": {"fill": "#00ff00"}}));
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 700, "width": 40, "height": 40, "name": "Button"})));
+    let nested = idv(&ex(&mut s, "instance.create", json!({"component": a, "x": 4, "y": 4, "parent": f})));
+    let button = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    ex(&mut s, "component.addProperty", json!({"id": button, "name": "Icon", "type": "instanceSwap", "default": a, "layer": nested}));
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": button, "x": 0, "y": 800})));
+    swap_icon(&mut s, i, b);
+    let shape = kids(&s, kids(&s, copy_of(&s, i, nested))[0])[0];
+    assert_eq!(fill(&s, shape), "111111");
+    assert!(node(&s, shape).overrides.is_empty());
+}
+
+#[test]
+fn a_slot_the_main_filled_shows_the_swapped_in_mains_content() {
+    // Docs silent on slot content across a swap; pinned: a Chip the Panel main put in its card's
+    // slot doesn't carry onto the swapped-in card, which shows its own default content.
+    let mut s = Session::new();
+    let card = |s: &mut Session, x: f64, name: &str| {
+        let f = idv(&ex(s, "frame.create", json!({"x": x, "y": 0, "width": 100, "height": 60, "name": name})));
+        let content = idv(&ex(s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 60, "parent": f, "name": "Content"})));
+        ex(s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 40, "height": 20, "parent": content, "props": {"name": format!("{name} default")}}));
+        let c = idv(&ex(s, "component.create", json!({"ids": [f]})));
+        ex(s, "component.makeSlot", json!({"id": content}));
+        c
+    };
+    let (a, b) = (card(&mut s, 0.0, "A"), card(&mut s, 200.0, "B"));
+    let chip = icon(&mut s, 400.0, "Chip", "Dot");
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 400, "width": 200, "height": 100, "name": "Panel"})));
+    let nested = idv(&ex(&mut s, "instance.create", json!({"component": a, "x": 0, "y": 0, "parent": f})));
+    let panel = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    ex(&mut s, "instance.slotInsert", json!({"id": nested, "slot": "Content", "component": chip, "replace": true}));
+    ex(&mut s, "component.addProperty", json!({"id": panel, "name": "Card", "type": "instanceSwap", "default": a, "layer": nested}));
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": panel, "x": 0, "y": 700})));
+    ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Card": b}}));
+    healthy(&s);
+    let content = kids(&s, copy_of(&s, i, nested))[0];
+    let names: Vec<String> = kids(&s, content).into_iter().map(|k| node(&s, k).name.clone()).collect();
+    assert_eq!(names, ["B default"]);
+    assert!(!node(&s, content).overrides.contains(SLOT));
+}
diff --git a/crates/engine/src/node_set_refusals_tests.rs b/crates/engine/src/node_set_refusals_tests.rs
new file mode 100644
index 00000000..ce316d30
--- /dev/null
+++ b/crates/engine/src/node_set_refusals_tests.rs
@@ -0,0 +1,95 @@
+//! `node.set` doesn't store what can't apply: auto layout keys go only to layers that can have auto
+//! layout (the others are named in `warnings`, and with none of them the call is refused), and a
+//! `fontStyle` the family lacks says which face draws instead.
+
+use serde_json::{Value, json};
+
+use crate::{EngineError, Session};
+
+fn ex(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd}: {e}"))
+}
+
+fn id(v: &Value) -> crate::NodeId {
+    crate::params::id_of(v).unwrap()
+}
+
+fn bad_msg(r: crate::Result<Value>) -> String {
+    match r {
+        Err(EngineError::BadParams { msg, .. }) => msg,
+        other => panic!("expected BadParams, got {other:?}"),
+    }
+}
+
+#[test]
+fn auto_layout_keys_on_layers_without_auto_layout_are_refused() {
+    let mut s = Session::new();
+    let t = id(&ex(&mut s, "node.create", json!({"type": "text", "text": "Hi"}))["id"]);
+    let r = id(&ex(&mut s, "node.create", json!({"type": "rectangle"}))["id"]);
+    for (target, key, value) in [(t, "gap", json!(8)), (r, "padding", json!(4)), (t, "mainAlign", json!("center")), (r, "wrap", json!(true))] {
+        let msg = bad_msg(s.execute("node.set", &json!({"ids": [target], "props": {key: value}})));
+        assert!(msg.contains(key) && msg.contains("auto layout"), "{msg}");
+        assert!(s.doc().unwrap().node(target).unwrap().layout.is_none(), "no hidden auto layout on {target}");
+    }
+    // Frames still take them, with or without a layout mode first.
+    let f = id(&ex(&mut s, "node.create", json!({"type": "frame"}))["id"]);
+    let out = ex(&mut s, "node.set", json!({"ids": [f], "props": {"gap": 8, "padding": 4}}));
+    assert_eq!(s.doc().unwrap().node(f).unwrap().layout.as_ref().map(|l| l.gap), Some(8.0));
+    assert!(out.get("warnings").is_none(), "{out}");
+}
+
+#[test]
+fn with_several_layers_the_frames_take_auto_layout_keys_and_the_others_are_named() {
+    let mut s = Session::new();
+    let f = id(&ex(&mut s, "node.create", json!({"type": "frame", "name": "Card"}))["id"]);
+    let t = id(&ex(&mut s, "node.create", json!({"type": "text", "text": "Hi", "name": "Title"}))["id"]);
+    let out = ex(&mut s, "node.set", json!({"ids": [f, t], "props": {"gap": 8, "opacity": 0.5}}));
+    let doc = s.doc().unwrap();
+    assert_eq!(doc.node(f).unwrap().layout.as_ref().map(|l| l.gap), Some(8.0));
+    assert!(doc.node(t).unwrap().layout.is_none(), "no hidden auto layout on the text");
+    assert_eq!(doc.node(t).unwrap().opacity, 0.5, "the text still gets the other keys");
+    let w = out["warnings"][0].as_str().unwrap();
+    assert!(w.contains("`gap`") && w.contains(&format!("{t} “Title”")) && w.contains("TEXT"), "{w}");
+    // One undo step for all of it.
+    ex(&mut s, "edit.undo", json!({}));
+    assert!(s.doc().unwrap().node(f).unwrap().layout.as_ref().is_none_or(|l| l.gap != 8.0));
+}
+
+#[test]
+fn a_font_style_draws_in_the_nearest_face_and_says_so_when_it_differs() {
+    figcraft_text::scan_system_fonts();
+    // Any installed family with a regular and a bold face and nothing heavier (CI machines differ).
+    let pick = figcraft_text::family_names().into_iter().find_map(|f| {
+        let st = figcraft_text::family_styles(&f);
+        let has = |w: u16| st.iter().any(|x| figcraft_doc::style_weight(x) == w && !x.to_lowercase().contains("italic"));
+        (has(400) && has(700) && !st.iter().any(|x| figcraft_doc::style_weight(x) > 700)).then_some((f, st))
+    });
+    let Some((family, styles)) = pick else { return };
+    let mut s = Session::new();
+    let t = id(&ex(&mut s, "node.create", json!({"type": "text", "text": "Hi", "props": {"fontFamily": family}}))["id"]);
+    let set = |s: &mut Session, style: &str| ex(s, "node.set", json!({"ids": [t], "props": {"fontStyle": style}}));
+    // Any spelling of a style it has, and names that resolve to the weight they ask for, say nothing.
+    let bold = styles.iter().find(|x| figcraft_doc::style_weight(x) == 700).unwrap().clone();
+    for style in [bold.clone(), bold.to_uppercase(), bold.replace(' ', ""), "Roman".into(), "Normal".into()] {
+        let out = set(&mut s, &style);
+        assert!(out.get("warnings").is_none(), "{style}: {out}");
+    }
+    // A heavier weight than the family has applies (as a text layer resolves it) and says which face draws.
+    let out = set(&mut s, "Black");
+    let w = out["warnings"][0].as_str().unwrap();
+    assert!(w.contains(&family) && w.contains("`Black`") && w.contains("nearest"), "{w}");
+    assert_eq!(s.doc().unwrap().node(t).unwrap().kind.text().unwrap().spans()[0].2.font_style, "Black");
+    // A family that isn't installed keeps any style name without a word (files from elsewhere name theirs).
+    let out = ex(&mut s, "node.set", json!({"ids": [t], "props": {"fontFamily": "No Such Family 7f3a", "fontStyle": "Hairline"}}));
+    assert!(out.get("warnings").is_none(), "{out}");
+}
+
+#[test]
+fn a_refused_call_changes_nothing() {
+    let mut s = Session::new();
+    let t = id(&ex(&mut s, "node.create", json!({"type": "text", "text": "Hi"}))["id"]);
+    let before = s.doc().unwrap().node(t).unwrap().fills.clone();
+    // `fill` comes before `gap` (keys apply in order), so this checks the rollback.
+    assert!(s.execute("node.set", &json!({"ids": [t], "props": {"fill": "#FF0000", "gap": 8}})).is_err());
+    assert_eq!(s.doc().unwrap().node(t).unwrap().fills, before);
+}
diff --git a/crates/engine/src/online_tests.rs b/crates/engine/src/online_tests.rs
index 1e341b14..c211c505 100644
--- a/crates/engine/src/online_tests.rs
+++ b/crates/engine/src/online_tests.rs
@@ -583,3 +583,11 @@ fn debug_output_of_a_record_leaves_the_secrets_out() {
     no_secrets("debug", &text);
     assert!(text.contains("share.example") && text.contains(".."), "{text}");
 }
+
+#[test]
+fn same_server_ignores_the_default_port_before_a_path() {
+    use crate::online::same_server;
+    assert!(same_server("wss://share.example:443/figcraft/", "wss://share.example/figcraft/"));
+    assert!(same_server("ws://host:80/x", "ws://host/x"));
+    assert!(!same_server("wss://share.example:8443/figcraft/", "wss://share.example/figcraft/"));
+}
diff --git a/crates/engine/src/page_clipboard_tests.rs b/crates/engine/src/page_clipboard_tests.rs
new file mode 100644
index 00000000..79ff7419
--- /dev/null
+++ b/crates/engine/src/page_clipboard_tests.rs
@@ -0,0 +1,36 @@
+//! `edit.copy` / `edit.cut` skip pages (they aren't layers and can't be pasted), and refuse a
+//! selection of only pages under their own command id.
+
+use serde_json::json;
+
+use crate::{EngineError, Session};
+
+#[test]
+fn copy_and_cut_ignore_pages_so_paste_keeps_the_document_valid() {
+    for cmd in ["edit.copy", "edit.cut"] {
+        let mut s = Session::new();
+        let page = s.page().unwrap();
+        s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+        match s.execute(cmd, &json!({"ids": [page.0]})) {
+            Err(EngineError::Disabled(id, _)) => assert_eq!(id, cmd),
+            r => panic!("{cmd} on a page: {r:?}"),
+        }
+        let _ = s.execute("edit.paste", &json!({}));
+        let doc = s.doc().unwrap();
+        assert!(doc.validate().is_empty(), "{cmd}: {:?}", doc.validate());
+        assert!(doc.node(page).is_some(), "{cmd} removed the page");
+    }
+}
+
+#[test]
+fn cut_of_a_page_and_a_layer_moves_only_the_layer() {
+    let mut s = Session::new();
+    let page = s.page().unwrap();
+    let r = s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+    let rect = crate::params::id_of(&r["id"]).unwrap();
+    s.execute("edit.cut", &json!({"ids": [page.0, rect.0]})).unwrap();
+    assert!(s.doc().unwrap().node(page).is_some());
+    assert!(s.doc().unwrap().node(rect).is_none());
+    s.execute("edit.paste", &json!({})).unwrap();
+    assert!(s.doc().unwrap().validate().is_empty());
+}
diff --git a/crates/engine/src/paint_index_tests.rs b/crates/engine/src/paint_index_tests.rs
new file mode 100644
index 00000000..eddea306
--- /dev/null
+++ b/crates/engine/src/paint_index_tests.rs
@@ -0,0 +1,39 @@
+//! `fill.set` / `stroke.set` reject a negative, fractional or non-finite `index` instead of
+//! clamping or truncating it onto another paint (like `fill.remove` / `stroke.remove`).
+
+use figcraft_doc::NodeId;
+use serde_json::{Value, json};
+
+use crate::Session;
+
+fn ex(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd} {p}: {e}"))
+}
+
+fn paints(s: &Session, id: NodeId) -> String {
+    let n = s.doc().unwrap().node(id).unwrap();
+    format!("{:?} {:?}", n.fills, n.strokes)
+}
+
+#[test]
+fn paint_set_rejects_bad_index_and_leaves_the_paints_alone() {
+    let mut s = Session::new();
+    let r = NodeId(ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 10, "height": 10}))["id"].as_u64().unwrap());
+    for add in ["fill.add", "stroke.add"] {
+        for c in ["#0000FF", "#FFFF00"] {
+            ex(&mut s, add, json!({"ids": [r], "color": c}));
+        }
+    }
+    let before = paints(&s, r);
+    for cmd in ["fill.set", "stroke.set"] {
+        for bad in [json!(-1), json!(0.5), json!(1.9), json!("-1"), json!("1.5"), json!("NaN"), json!("inf"), json!("abc")] {
+            let res = s.execute(cmd, &json!({"ids": [r], "index": bad, "color": "#FF0000"}));
+            assert!(res.is_err(), "{cmd} index {bad} was accepted: {res:?}");
+            assert_eq!(paints(&s, r), before, "{cmd} index {bad} changed the document");
+        }
+        ex(&mut s, cmd, json!({"ids": [r], "index": 1, "color": "#FF0000"}));
+        assert_ne!(paints(&s, r), before, "{cmd} with a valid index still edits");
+        ex(&mut s, "edit.undo", json!({}));
+        assert_eq!(paints(&s, r), before);
+    }
+}
diff --git a/crates/engine/src/panels_behaviour_tests.rs b/crates/engine/src/panels_behaviour_tests.rs
index d299b0df..9870aa31 100644
--- a/crates/engine/src/panels_behaviour_tests.rs
+++ b/crates/engine/src/panels_behaviour_tests.rs
@@ -99,16 +99,18 @@ fn scene(s: &mut Session) -> Scene {
 
 #[test]
 fn dragging_in_the_layers_panel_reorders_by_the_documented_rules() {
-    // The panel drops layers with `node.reparent {ids, parent, index}`: `index` counts the
-    // parent's children bottom first, as they are before the move.
+    // The panel drops layers with `node.reparent {ids, parent, index}`: `index` is where the first
+    // moved layer ends up among the parent's children, bottom first, counted after the move.
     // (moved, index in F, F's children after (bottom first), derivation)
-    let rows: [(&[&str], usize, [&str; 4], &str); 6] = [
-        (&["a"], 4, ["b", "c", "d", "a"], "a layer dragged to the top of its parent's list comes to the front"),
+    let rows: [(&[&str], usize, [&str; 4], &str); 8] = [
+        (&["a"], 3, ["b", "c", "d", "a"], "a layer dragged to the top of its parent's list comes to the front"),
+        (&["a"], 9, ["b", "c", "d", "a"], "an index past the end is the front"),
         (&["d"], 0, ["d", "a", "b", "c"], "a layer dragged to the bottom of the list goes to the back"),
-        (&["a"], 2, ["b", "a", "c", "d"], "a layer dropped between two layers lands between them"),
-        (&["a", "b"], 4, ["c", "d", "a", "b"], "several selected layers move together, keeping their order"),
-        (&["a", "d"], 2, ["b", "a", "d", "c"], "several layers from apart land together where they are dropped"),
-        (&["b", "c"], 1, ["a", "b", "c", "d"], "silent: dropping a block of layers onto itself changes nothing (pinned)"),
+        (&["a"], 1, ["b", "a", "c", "d"], "a layer moved up one place goes up one place (#992)"),
+        (&["a"], 0, ["a", "b", "c", "d"], "silent: a layer asked to stay where it is stays (pinned)"),
+        (&["a", "b"], 2, ["c", "d", "a", "b"], "several selected layers move together, keeping their order"),
+        (&["a", "d"], 1, ["b", "a", "d", "c"], "several layers from apart land together where they are asked to"),
+        (&["b", "c"], 1, ["a", "b", "c", "d"], "silent: moving a block of layers to where it is changes nothing (pinned)"),
     ];
     for (moved, index, after, why) in rows {
         let mut s = Session::new();
@@ -172,6 +174,32 @@ fn dragging_into_frames_groups_and_auto_layout() {
     );
 }
 
+#[test]
+fn reparent_index_is_the_final_position_in_auto_layout_and_across_parents() {
+    // #992: `index` is the layer's place among the parent's children after the move.
+    let mut s = Session::new();
+    let row = id(&ex(&mut s, "node.create", json!({"type": "frame", "name": "Row", "props": {"layout": "horizontal"}})));
+    let text = |s: &mut Session, t: &str, parent: NodeId| id(&ex(s, "node.create", json!({"type": "text", "name": t, "text": t, "parent": parent})));
+    let (first, second, third) = (text(&mut s, "first", row), text(&mut s, "second", row), text(&mut s, "third", row));
+    let names = |s: &Session, p: NodeId| kids(s, p).iter().map(|i| name(s, *i)).collect::<Vec<_>>();
+    ex(&mut s, "node.reparent", json!({"ids": [first], "parent": row, "index": 1}));
+    assert_eq!(names(&s, row), ["second", "first", "third"], "moved down one place");
+    ex(&mut s, "node.reparent", json!({"ids": [first], "parent": row, "index": 2}));
+    assert_eq!(names(&s, row), ["second", "third", "first"], "moved to the end");
+    ex(&mut s, "node.reparent", json!({"ids": [first], "parent": row, "index": 0}));
+    assert_eq!(names(&s, row), ["first", "second", "third"], "moved to the start");
+    let x = |s: &Session, i: NodeId| s.doc().unwrap().node(i).unwrap().transform.as_coeffs()[4];
+    assert!(x(&s, first) < x(&s, second) && x(&s, second) < x(&s, third), "the flow follows the new order");
+    // Into another parent, `index` means the same thing.
+    let other = id(&ex(&mut s, "node.create", json!({"type": "frame", "name": "Other", "props": {"layout": "horizontal"}})));
+    let (p, q) = (text(&mut s, "p", other), text(&mut s, "q", other));
+    ex(&mut s, "node.reparent", json!({"ids": [second], "parent": other, "index": 1}));
+    assert_eq!(kids(&s, other), [p, second, q], "lands at index 1 of the new parent");
+    ex(&mut s, "node.reparent", json!({"ids": [first, third], "parent": other, "index": 3}));
+    assert_eq!(kids(&s, other), [p, second, q, first, third], "several layers start at index 3, keeping their order");
+    assert!(kids(&s, row).is_empty());
+}
+
 #[test]
 fn renaming_several_layers_by_the_documented_codes() {
     // Three layers named `names`, bottom to top; (names, params, new names, derivation).
diff --git a/crates/engine/src/pen_end_tests.rs b/crates/engine/src/pen_end_tests.rs
new file mode 100644
index 00000000..a5d24f61
--- /dev/null
+++ b/crates/engine/src/pen_end_tests.rs
@@ -0,0 +1,72 @@
+//! Ending a pen path with Escape or Enter (#760): the path's vector stays in edit mode with the pen,
+//! so the next path is drawn into the same layer; another Escape leaves edit mode.
+
+use crate::Session;
+use crate::tools::{PointerEvent, PointerKind, ToolId};
+use crate::vectoredit::VTool;
+use figcraft_doc::NodeKind;
+
+fn click(s: &mut Session, x: f64, y: f64) {
+    for kind in [PointerKind::Down, PointerKind::Up] {
+        s.pointer(&PointerEvent::at(kind, x, y, 1.0)).unwrap();
+    }
+}
+
+fn layers(s: &Session) -> usize {
+    s.doc().unwrap().node(s.page().unwrap()).unwrap().children.len()
+}
+
+/// (points, segments) of vector `id`.
+fn shape(s: &Session, id: figcraft_doc::NodeId) -> (usize, usize) {
+    match &s.doc().unwrap().node(id).unwrap().kind {
+        NodeKind::Vector { network } => (network.vertices.len(), network.segments.len()),
+        k => panic!("not a vector: {k:?}"),
+    }
+}
+
+/// A two-point pen path, ended with `end`.
+fn drawn(end: fn(&mut Session)) -> (Session, figcraft_doc::NodeId) {
+    let mut s = Session::new();
+    s.set_tool(ToolId::Pen);
+    click(&mut s, 100.0, 100.0);
+    click(&mut s, 200.0, 100.0);
+    let id = s.tool.pen.as_ref().and_then(|p| p.id).unwrap();
+    let undo = s.undo_depth().0;
+    end(&mut s);
+    assert!(s.tool.pen.is_none(), "the path ended");
+    assert_eq!(s.undo_depth().0, undo + 1, "the path is one undo step");
+    let ve = s.ds().unwrap().vector_edit.clone().expect("still editing the vector");
+    assert_eq!((ve.id, ve.tool, ve.anchor), (id, VTool::Pen, None), "the pen, with no open end");
+    (s, id)
+}
+
+#[test]
+fn escape_and_enter_keep_the_vector_in_edit_mode_with_the_pen() {
+    // Escape, and Enter (its key runs `pen_end`).
+    let ends: [fn(&mut Session); 2] = [|s| s.escape().unwrap(), |s| s.pen_end().unwrap()];
+    for end in ends {
+        let (mut s, id) = drawn(end);
+        // The next path goes into the same layer, unconnected to the first.
+        click(&mut s, 100.0, 300.0);
+        click(&mut s, 200.0, 300.0);
+        assert_eq!(layers(&s), 1, "no new layer");
+        assert_eq!(shape(&s, id), (4, 2), "two separate paths in one vector network");
+        // Escape ends that path, the next one leaves edit mode.
+        s.escape().unwrap();
+        assert!(s.ds().unwrap().vector_edit.is_some());
+        s.escape().unwrap();
+        assert!(s.ds().unwrap().vector_edit.is_none(), "the second Escape leaves edit mode");
+        assert_eq!(s.ds().unwrap().selection, vec![id]);
+    }
+}
+
+#[test]
+fn escape_before_a_segment_leaves_nothing_to_edit() {
+    let mut s = Session::new();
+    s.set_tool(ToolId::Pen);
+    click(&mut s, 100.0, 100.0);
+    s.escape().unwrap();
+    assert!(s.tool.pen.is_none());
+    assert!(s.ds().unwrap().vector_edit.is_none());
+    assert_eq!(layers(&s), 0);
+}
diff --git a/crates/engine/src/pen_overlay_tests.rs b/crates/engine/src/pen_overlay_tests.rs
index 7e0064d2..7f6dba3c 100644
--- a/crates/engine/src/pen_overlay_tests.rs
+++ b/crates/engine/src/pen_overlay_tests.rs
@@ -63,3 +63,24 @@ fn finishing_the_path_clears_its_handles_and_band() {
     let ov = &s.tool.overlay;
     assert!(ov.pen.is_empty() && ov.pen_handles.is_empty() && ov.rubber.is_none() && ov.rubber_handle.is_none());
 }
+
+#[test]
+fn shift_keeps_the_band_and_the_next_point_at_45_degree_steps() {
+    // #970: with Shift the band shows where the point will land, at a 45° step from the last
+    // anchor (the same length as the pointer is away), not under the pointer.
+    let mut s = Session::new();
+    s.set_tool(ToolId::Pen);
+    at(&mut s, PointerKind::Down, 100.0, 100.0);
+    at(&mut s, PointerKind::Up, 100.0, 100.0);
+    let shifted = |kind, x, y| PointerEvent { shift: true, ..PointerEvent::at(kind, x, y, 1.0) };
+    s.pointer(&shifted(PointerKind::Hover, 300.0, 120.0)).unwrap();
+    let [x0, y0, x1, y1] = s.tool.overlay.rubber.unwrap();
+    assert_eq!([x0, y0, y1], [100.0, 100.0, 100.0], "level with the last anchor");
+    assert!((x1 - (100.0 + 200f64.hypot(20.0))).abs() < 1e-9, "{x1}");
+    s.pointer(&shifted(PointerKind::Down, 300.0, 120.0)).unwrap();
+    s.pointer(&shifted(PointerKind::Up, 300.0, 120.0)).unwrap();
+    s.pointer(&shifted(PointerKind::Hover, 400.0, 230.0)).unwrap();
+    let [x0, y0, x1, y1] = s.tool.overlay.rubber.unwrap();
+    assert_eq!(y0, 100.0, "the point landed on the band");
+    assert!((x1 - x0 - (y1 - y0)).abs() < 1e-9, "45° down to the right: {:?}", [x0, y0, x1, y1]);
+}
diff --git a/crates/engine/src/plugin_data_tests.rs b/crates/engine/src/plugin_data_tests.rs
new file mode 100644
index 00000000..076786b7
--- /dev/null
+++ b/crates/engine/src/plugin_data_tests.rs
@@ -0,0 +1,30 @@
+//! Layer data (`pluginData`) reads back through `node.get` and `document.inspect` (#879): what
+//! `node.set` writes on a layer or a page comes back as `{key: value}`, a removed key goes, and a
+//! layer without any reports none.
+
+use crate::Session;
+use crate::components::tests::{ex, idv};
+use serde_json::json;
+
+#[test]
+fn node_get_reports_the_layer_data_node_set_wrote() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100})));
+    let r = idv(&ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 10, "height": 10})));
+    let page = s.ds().unwrap().page;
+    assert!(ex(&mut s, "node.get", json!({"id": f})).get("pluginData").is_none(), "no data, no field");
+    ex(&mut s, "node.set", json!({"ids": [f], "props": {"pluginData": {"com.example.sync": "{\"v\":1}", "n": 2}}}));
+    ex(&mut s, "node.set", json!({"ids": [page], "props": {"pluginData": {"com.example.sync": "page"}}}));
+    let got = ex(&mut s, "node.get", json!({"id": f}))["pluginData"].clone();
+    assert_eq!(got, json!({"com.example.sync": "{\"v\":1}", "n": "2"}), "values read back as the strings stored");
+    assert_eq!(ex(&mut s, "node.get", json!({"id": page}))["pluginData"], json!({"com.example.sync": "page"}), "pages keep data too");
+    assert!(ex(&mut s, "node.get", json!({"id": r})).get("pluginData").is_none(), "other layers report none");
+    // The document tree reports it as well (the page and its children).
+    let tree = crate::inspect::document(&s, 2, false);
+    assert_eq!(tree["pages"][0]["pluginData"], json!({"com.example.sync": "page"}));
+    // A null removes a key; undo brings it back.
+    ex(&mut s, "node.set", json!({"ids": [f], "props": {"pluginData": {"n": null}}}));
+    assert_eq!(ex(&mut s, "node.get", json!({"id": f}))["pluginData"], json!({"com.example.sync": "{\"v\":1}"}));
+    ex(&mut s, "edit.undo", json!({}));
+    assert_eq!(ex(&mut s, "node.get", json!({"id": f}))["pluginData"]["n"], "2");
+}
diff --git a/crates/engine/src/plugins_tests.rs b/crates/engine/src/plugins_tests.rs
index 102d675a..dd60f834 100644
--- a/crates/engine/src/plugins_tests.rs
+++ b/crates/engine/src/plugins_tests.rs
@@ -164,11 +164,20 @@ fn files_dialogs_history_and_plugins_are_off_limits() {
         ("file.saveAs", json!({"path": target})),
         ("file.open", json!({"path": "C:/Windows/win.ini"})),
         ("image.place", json!({"path": "secret.png"})),
+        ("text.loadFont", json!({"path": "/etc/hosts"})),
         ("library.add", json!({"path": "lib.figcraft"})),
         ("plugin.run", json!({"id": "org.test.deny"})),
         ("plugin.remove", json!({"id": "org.test.deny"})),
         ("edit.undo", json!({})),
         ("command.batch", json!({"commands": [{"command": "file.saveAs", "params": {"path": target}}]})),
+        ("data.fill", json!({"id": a, "rows": [{}], "dir": dir.to_string_lossy()})),
+        ("variable.export", json!({"format": "css", "path": target})),
+        ("codeConnect.export", json!({"path": target})),
+        ("codeConnect.import", json!({"path": "/etc/passwd"})),
+        ("component.playground", json!({"id": a, "path": target})),
+        ("variable.import", json!({"variables": "/etc/passwd"})),
+        ("collab.recoverFile", json!({"path": "copy.figcraft", "file": "x", "session": 1, "client": 1, "seq": 0})),
+        ("window.new", json!({"path": "C:/Windows/win.ini"})),
         ("doc.switch", json!({"index": 0})),
         ("pref.keepTool", json!({})),
         // Without a name it would open inline renaming in the layers panel: a UI request.
@@ -397,3 +406,139 @@ fn a_full_undo_history_keeps_its_steps_and_tampered_manifests_are_refused() {
     s.prefs.plugins[0].manifest.main = "../../elsewhere.wasm".into();
     assert!(matches!(s.execute("plugin.run", &json!({"id": "org.test.many"})), Err(EngineError::BadParams { .. })));
 }
+
+/// A module that offers `files` (name, mime, data) with `save_file` in order, outputs the last
+/// refusal and returns `exit`.
+fn saver(files: &[(&str, &str, &[u8])], exit: i32) -> Vec<u8> {
+    let hex = |b: &[u8]| b.iter().map(|b| format!("\\{b:02x}")).collect::<String>();
+    let mut data = String::new();
+    let mut body = String::new();
+    let mut at = 0usize;
+    for (name, mime, bytes) in files {
+        let (n, m) = (at, at + name.len());
+        let d = m + mime.len();
+        data += &format!(
+            "(data (i32.const {n}) \"{}\") (data (i32.const {m}) \"{}\") (data (i32.const {d}) \"{}\")\n",
+            hex(name.as_bytes()),
+            hex(mime.as_bytes()),
+            hex(bytes)
+        );
+        body += &format!(
+            "(local.set $st (call $save_file (i32.const {n}) (i32.const {}) (i32.const {m}) (i32.const {}) (i32.const {d}) (i32.const {})))
+             (if (local.get $st) (then (call $set_output (i32.const 30000) (call $reply_read (i32.const 30000) (i32.const 500)))))\n",
+            name.len(),
+            mime.len(),
+            bytes.len()
+        );
+        at = d + bytes.len();
+    }
+    let wat = format!(
+        r#"(module
+          (import "figcraft" "save_file" (func $save_file (param i32 i32 i32 i32 i32 i32) (result i32)))
+          (import "figcraft" "reply_read" (func $reply_read (param i32 i32) (result i32)))
+          (import "figcraft" "set_output" (func $set_output (param i32 i32)))
+          (memory (export "memory") 1)
+          {data}
+          (func (export "figcraft_run") (param $n i32) (result i32) (local $st i32)
+            {body}
+            (i32.const {exit})))"#
+    );
+    wat::parse_str(&wat).unwrap_or_else(|e| panic!("{e}\n{wat}"))
+}
+
+fn save_manifest(id: &str, save_file: bool) -> Value {
+    json!({"id": id, "name": "Saver", "version": "1.0.0", "main": "plugin.wasm", "api": 4, "permissions": {"access": "read", "saveFile": save_file}})
+}
+
+fn saves(s: &Session) -> Vec<&crate::UiRequest> {
+    s.ui_requests.iter().filter(|r| r.kind == "dialog.pluginSave").collect()
+}
+
+#[test]
+fn a_plugin_without_the_permission_cannot_save() {
+    let mut s = Session::new();
+    install(&mut s, save_manifest("org.test.nosave", false), &saver(&[("a.txt", "text/plain", b"hi")], 0));
+    let out = ex(&mut s, "plugin.run", json!({"id": "org.test.nosave"}));
+    assert!(out["output"].as_str().unwrap_or_default().contains("permission"), "{out}");
+    assert!(saves(&s).is_empty(), "no dialog without the permission");
+}
+
+#[test]
+fn a_plugin_with_the_permission_requests_one_save_dialog_with_its_bytes() {
+    let mut s = Session::new();
+    install(&mut s, save_manifest("org.test.save", true), &saver(&[("out.jsx", "TEXT/Javascript", b"\x00hi\xff")], 0));
+    ex(&mut s, "plugin.run", json!({"id": "org.test.save"}));
+    let reqs = saves(&s);
+    let [r] = reqs.as_slice() else { panic!("one request, got {}", reqs.len()) };
+    assert_eq!(r.data["plugin"], "org.test.save");
+    assert_eq!(r.data["name"], "out.jsx");
+    assert_eq!(r.data["mime"], "text/javascript");
+    assert_eq!(r.data["data"], b64(b"\x00hi\xff"));
+    // Nothing in the request is a path.
+    assert!(r.data.get("path").is_none());
+}
+
+#[test]
+fn a_second_file_in_one_run_and_bad_names_are_refused() {
+    let mut s = Session::new();
+    install(&mut s, save_manifest("org.test.two", true), &saver(&[("a.txt", "text/plain", b"1"), ("b.txt", "text/plain", b"2")], 0));
+    let out = ex(&mut s, "plugin.run", json!({"id": "org.test.two"}));
+    assert_eq!(saves(&s).len(), 1, "only the first file");
+    assert!(out["output"].as_str().unwrap_or_default().contains("one file"), "{out}");
+    s.ui_requests.clear();
+    install(&mut s, save_manifest("org.test.bad", true), &saver(&[("../etc/passwd", "text/plain", b"1")], 0));
+    let out = ex(&mut s, "plugin.run", json!({"id": "org.test.bad"}));
+    assert!(saves(&s).is_empty());
+    assert!(out["output"].as_str().unwrap_or_default().contains("file name"), "{out}");
+}
+
+#[test]
+fn an_odd_mime_type_becomes_generic_binary() {
+    let mut s = Session::new();
+    install(&mut s, save_manifest("org.test.mime", true), &saver(&[("a.bin", "not a type", b"1")], 0));
+    ex(&mut s, "plugin.run", json!({"id": "org.test.mime"}));
+    assert_eq!(saves(&s)[0].data["mime"], "application/octet-stream");
+}
+
+#[test]
+fn a_run_that_fails_afterwards_leaves_no_dialog_behind() {
+    let mut s = Session::new();
+    install(&mut s, save_manifest("org.test.late", true), &saver(&[("a.txt", "text/plain", b"1")], 1));
+    run_err(&mut s, "org.test.late");
+    assert!(saves(&s).is_empty(), "a failed run opens no dialog");
+}
+
+#[test]
+fn file_commands_stay_closed_to_plugins() {
+    let mut s = Session::new();
+    let calls = [("file.saveAs", json!({"path": "/tmp/x.figcraft"}))];
+    install(&mut s, manifest("org.test.files", "read", &[]), &script(&calls, OnRefusal::Report, ""));
+    let out = ex(&mut s, "plugin.run", json!({"id": "org.test.files"}));
+    assert!(out["output"].as_str().unwrap_or_default().contains("isn't available to plugins"), "{out}");
+}
+
+#[test]
+fn save_names_are_plain_file_names() {
+    use crate::plugins::sanitize_save_name as clean;
+    let long = "a".repeat(129);
+    let max = "a".repeat(128);
+    // 128 two-byte characters are within the limit even though they take 256 bytes.
+    let wide = "é".repeat(128);
+    for bad in ["", "   ", ".", "..", "../x", "a/b", "a\\b", "C:x", "a..b", "a\nb", "a\u{0}b", "a\u{7f}b", "a*b", long.as_str()] {
+        assert_eq!(clean(bad), None, "{bad:?}");
+    }
+    assert_eq!(clean(" out.jsx ").as_deref(), Some("out.jsx"));
+    assert_eq!(clean(&max).as_deref(), Some(max.as_str()));
+    assert_eq!(clean(&wide).as_deref(), Some(wide.as_str()));
+    assert_eq!(clean("Entwurf – Büro.jsx").as_deref(), Some("Entwurf – Büro.jsx"));
+}
+
+#[test]
+fn reinstalling_under_an_existing_id_drops_the_old_settings() {
+    let mut s = Session::new();
+    let m = manifest("org.test.reuse", "read", &[]);
+    install(&mut s, m.clone(), &script(&[], OnRefusal::Fail, ""));
+    s.prefs.plugin_settings.entry("org.test.reuse".into()).or_default().insert("key".into(), json!("v"));
+    install(&mut s, m, &script(&[], OnRefusal::Fail, ""));
+    assert!(!s.prefs.plugin_settings.contains_key("org.test.reuse"), "{:?}", s.prefs.plugin_settings);
+}
diff --git a/crates/engine/src/prefs.rs b/crates/engine/src/prefs.rs
new file mode 100644
index 00000000..6bfedcba
--- /dev/null
+++ b/crates/engine/src/prefs.rs
@@ -0,0 +1,181 @@
+use super::*;
+
+/// The smallest and largest interface size, relative to the system's display scale (1.0 is the
+/// system's own size).
+pub const UI_SCALE_MIN: f64 = 0.75;
+
+pub const UI_SCALE_MAX: f64 = 3.0;
+
+/// `scale` kept between [`UI_SCALE_MIN`] and [`UI_SCALE_MAX`]; not a finite number: `None`.
+pub fn clamp_ui_scale(scale: f64) -> Option<f64> {
+    scale.is_finite().then(|| scale.clamp(UI_SCALE_MIN, UI_SCALE_MAX))
+}
+
+/// Reads the saved interface size. Anything but a number reads as 1 (the system's size) and a
+/// number out of range is clamped, so a settings file edited by hand never costs the other
+/// preferences.
+fn read_ui_scale<'de, D: serde::Deserializer<'de>>(d: D) -> std::result::Result<f64, D::Error> {
+    Ok(Value::deserialize(d)?.as_f64().and_then(clamp_ui_scale).unwrap_or(1.0))
+}
+
+/// App-wide preferences that commands read (nudge amounts, behaviours).
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(default)]
+pub struct Prefs {
+    pub nudge_small: f64,
+    pub nudge_big: f64,
+    pub keep_tool: bool,
+    pub rename_duplicates: bool,
+    pub highlight_on_hover: bool,
+    pub number_keys_opacity: bool,
+    pub show_dimensions: bool,
+    /// "system" by default; an explicit "light" or "dark" choice stays saved.
+    pub theme: String,
+    /// The widths of the main window's left and right panels (the interface keeps them within its
+    /// limits; other windows have their own while they are open).
+    pub panel_widths: (f32, f32),
+    /// The height asked for the main window's pages list, dragged at its lower edge (`None`: a
+    /// share of the panel; the interface keeps it within its limits).
+    pub pages_height: Option<f32>,
+    /// The interface language: a language code ("en", "es", "pt-BR") or "system" (the OS or browser
+    /// language). Languages without a catalog show English.
+    pub language: String,
+    /// The name comments are signed with (and whose comments count as yours).
+    pub user_name: String,
+    /// Reduce motion: the interface's own animations are off (the system's setting turns them off
+    /// too). Prototype transitions still play.
+    pub reduce_motion: bool,
+    /// How large the whole interface is drawn, relative to the system's display scale: 1.0 is the
+    /// system's own size, 1.25 a quarter larger (kept between [`UI_SCALE_MIN`] and
+    /// [`UI_SCALE_MAX`]). The canvas zoom is separate.
+    #[serde(deserialize_with = "read_ui_scale")]
+    pub ui_scale: f64,
+    /// Files that have a path are saved by themselves a few seconds after they change (the app's
+    /// timer; off: only File ▸ Save writes them).
+    pub auto_save: bool,
+    /// The desktop app starts on the Home screen instead of in a new file.
+    pub start_on_home: bool,
+    /// `figcraft://` invite links open this app (`collab.registerLinks`); `None`: on for installed
+    /// builds, off for development builds.
+    pub invite_links: Option<bool>,
+    /// Installed plugins (Plugins menu), in menu order.
+    #[serde(serialize_with = "plugins::persisted")]
+    pub plugins: Vec<plugins::InstalledPlugin>,
+    /// Plugins' own settings (`setting_set`), by plugin id, then key: JSON values, capped per
+    /// plugin.
+    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    pub plugin_settings: BTreeMap<String, BTreeMap<String, Value>>,
+    /// The plugin directory browsed last (`ws://host:port/`, never with a key).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plugin_directory: Option<String>,
+    /// The server files are shared through online (Share ▸ Online, join codes; Publish to server
+    /// suggests it too): `wss://host/`, never with a key. [`live::DEFAULT_SERVER`] unless the user
+    /// chose another; empty: online sharing is off (saved as empty, so it stays off).
+    pub publish_server: String,
+    /// Recently opened or saved files, newest first (File ▸ Open recent; at most
+    /// [`cmd::file::MAX_RECENT`]).
+    pub recent_files: Vec<String>,
+    /// The files you put on a server without its key, with their owner tokens (passwords: see
+    /// [`online`]), most recently opened first, at most [`online::MAX_ONLINE_FILES`].
+    #[serde(skip_serializing_if = "Vec::is_empty", deserialize_with = "online::read")]
+    pub online_files: Vec<online::OnlineFile>,
+    /// The Getting started tips on the home screen were closed (Help ▸ Getting started shows them
+    /// again).
+    pub getting_started_dismissed: bool,
+    /// A prototype's Open link goes to a website without first telling the viewer that it leaves
+    /// the prototype (the notice's "Don't show this again"; `proto.linkNotice` shows it again).
+    pub link_notice_skipped: bool,
+    /// How each home screen section shows its files, by section id (`"recents"`): `"grid"` (cards
+    /// with the picture each file carries) or `"list"` (a table). Missing: the grid.
+    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    pub home_views: BTreeMap<String, String>,
+    /// What the home screen's recent files are ordered by: `"modified"`, `"name"` or `"created"`.
+    pub home_sort: String,
+    /// Which way: `"desc"` (newest first, Z to A) or `"asc"`.
+    pub home_order: String,
+    /// The View menu's toggles turned on or off (rulers, pixel grid, snapping…), by command id:
+    /// files opened or made later start with them. Missing: the toggle's default.
+    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    pub view: BTreeMap<String, bool>,
+    /// Recently run actions (the Actions palette's Recents), newest first, at most
+    /// [`MAX_RECENT_ACTIONS`]. Entries are `command:<id>`, `plugin:<plugin>/<command>` or
+    /// `widget:<plugin>`.
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub recent_actions: Vec<String>,
+}
+
+/// Recently run actions kept for the Actions palette (newest first).
+pub const MAX_RECENT_ACTIONS: usize = 5;
+
+impl Default for Prefs {
+    fn default() -> Self {
+        Self {
+            nudge_small: 1.0,
+            nudge_big: 10.0,
+            keep_tool: false,
+            rename_duplicates: false,
+            highlight_on_hover: true,
+            number_keys_opacity: true,
+            show_dimensions: true,
+            theme: "system".into(),
+            panel_widths: (240.0, 240.0),
+            pages_height: None,
+            language: "system".into(),
+            user_name: cmd::comment::DEFAULT_AUTHOR.into(),
+            reduce_motion: false,
+            ui_scale: 1.0,
+            auto_save: false,
+            start_on_home: false,
+            invite_links: None,
+            plugins: Vec::new(),
+            plugin_settings: BTreeMap::new(),
+            plugin_directory: None,
+            publish_server: live::DEFAULT_SERVER.into(),
+            recent_files: Vec::new(),
+            online_files: Vec::new(),
+            getting_started_dismissed: false,
+            link_notice_skipped: false,
+            home_views: BTreeMap::new(),
+            home_sort: "modified".into(),
+            home_order: "desc".into(),
+            view: BTreeMap::new(),
+            recent_actions: Vec::new(),
+        }
+    }
+}
+
+/// A request from a command to the UI (open a dialog or panel, show a message). Programmatic
+/// callers ignore them.
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub struct UiRequest {
+    pub kind: String,
+    pub data: Value,
+}
+
+/// Clipboard contents (internal; the UI mirrors to the system clipboard).
+#[derive(Clone, Debug, Default)]
+pub struct Clipboard {
+    /// Copied subtrees: (root, nodes) in z-order.
+    pub nodes: Vec<(NodeId, Vec<figcraft_doc::Node>)>,
+    pub images: std::collections::BTreeMap<String, figcraft_doc::ImageData>,
+    /// Copied properties (Copy properties / Paste properties).
+    pub props: Option<Value>,
+    /// A copied fill or stroke row (`fill.copy`, `stroke.copy`): whether it's a fill, and the paint.
+    pub paint: Option<(bool, figcraft_color::Paint)>,
+    /// The stroke settings (`weight`, alignment, sides…) copied with a stroke's paint.
+    pub stroke: Option<figcraft_doc::StrokeProps>,
+    /// A copied effect row (`effect.copy`).
+    pub effect: Option<figcraft_doc::Effect>,
+    /// The page-space bounds of the copied selection.
+    pub bounds: Option<figcraft_geom::Rect>,
+    pub source_doc: u64,
+    /// Copied component/set roots, excluding cuts and originals discarded by undo (ids are reused).
+    pub copied_components: std::collections::BTreeSet<NodeId>,
+    /// Monotonic generation of the copied layers (contents, images, bounds and source). A UI
+    /// clipboard mirror records it, so a later programmatic copy that never touched the system
+    /// clipboard is not mistaken for the user's own copy just because the text still matches.
+    pub layers_generation: u64,
+    /// The document copied from (pastes into other files follow its mains) and its file path.
+    pub source: Option<Arc<Document>>,
+    pub source_path: Option<String>,
+}
diff --git a/crates/engine/src/property_copy_tests.rs b/crates/engine/src/property_copy_tests.rs
new file mode 100644
index 00000000..df639034
--- /dev/null
+++ b/crates/engine/src/property_copy_tests.rs
@@ -0,0 +1,120 @@
+//! Copying one fill, stroke or effect row (`fill.copy`, `stroke.copy`, `effect.copy`) and pasting
+//! it onto other layers (`fill.paste`, `stroke.paste`, `effect.paste`): the Design panel's row
+//! menus.
+
+use figcraft_color::{Color, Paint};
+use figcraft_doc::{Effect, EffectKind, NodeId};
+use serde_json::{Value, json};
+
+use crate::Session;
+
+fn id(v: Value) -> NodeId {
+    NodeId(v["id"].as_u64().unwrap())
+}
+
+fn ex(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd} {p}: {e}"))
+}
+
+fn rect(s: &mut Session) -> NodeId {
+    id(ex(s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 10, "height": 10})))
+}
+
+fn node(s: &Session, id: NodeId) -> figcraft_doc::Node {
+    s.doc().unwrap().node(id).unwrap().clone()
+}
+
+#[test]
+fn a_copied_fill_replaces_a_fill_row_or_adds_one() {
+    let mut s = Session::new();
+    let a = rect(&mut s);
+    let b = rect(&mut s);
+    let red = Paint::solid(Color::from_hex("#FF0000").unwrap());
+    ex(&mut s, "fill.add", json!({"ids": [a], "paint": red}));
+    let copied = ex(&mut s, "fill.copy", json!({"id": a, "index": 1}));
+    assert_eq!(copied["type"], "solid", "the copy reports the paint it took");
+    // Onto b's fill row: it replaces that paint.
+    ex(&mut s, "fill.paste", json!({"ids": [b], "index": 0}));
+    assert_eq!(node(&s, b).fills, vec![red.clone()]);
+    // With no row: it adds one on top.
+    ex(&mut s, "fill.paste", json!({"ids": [b]}));
+    assert_eq!(node(&s, b).fills, [red.clone(), red]);
+    // Each paste is one undo step.
+    ex(&mut s, "edit.undo", json!({}));
+    assert_eq!(node(&s, b).fills.len(), 1);
+}
+
+#[test]
+fn a_copied_stroke_pastes_as_a_stroke_only() {
+    let mut s = Session::new();
+    let a = rect(&mut s);
+    let b = rect(&mut s);
+    let blue = Paint::solid(Color::from_hex("#0000FF").unwrap());
+    ex(&mut s, "stroke.add", json!({"ids": [a], "paint": blue}));
+    ex(&mut s, "node.set", json!({"ids": [a], "props": {"strokeWeight": 3.0, "strokeAlign": "outside"}}));
+    ex(&mut s, "stroke.copy", json!({"id": a, "index": 0}));
+    ex(&mut s, "stroke.add", json!({"ids": [b]}));
+    ex(&mut s, "stroke.paste", json!({"ids": [b], "index": 0}));
+    assert_eq!(node(&s, b).strokes, [blue]);
+    assert_eq!(node(&s, b).stroke, node(&s, a).stroke, "the weight and alignment come with the paint");
+    assert_eq!((node(&s, b).stroke.weight, node(&s, b).stroke.align), (3.0, figcraft_doc::StrokeAlign::Outside));
+    // A copied fill doesn't paste as a stroke, and the target keeps its stroke.
+    ex(&mut s, "fill.copy", json!({"id": a}));
+    assert!(s.execute("stroke.paste", &json!({"ids": [b]})).is_err());
+    assert_eq!(node(&s, b).strokes.len(), 1);
+    // A layer with no stroke has nothing to copy.
+    assert!(s.execute("stroke.copy", &json!({"id": b, "index": 1})).is_err());
+}
+
+#[test]
+fn a_copied_effect_replaces_an_effect_row_or_adds_one() {
+    let mut s = Session::new();
+    let a = rect(&mut s);
+    let b = rect(&mut s);
+    ex(&mut s, "effect.add", json!({"ids": [a], "effect": {"type": "dropShadow", "radius": 7, "offset": [2, 3]}}));
+    ex(&mut s, "effect.copy", json!({"id": a, "index": 0}));
+    let e = node(&s, a).effects[0].clone();
+    // Onto b's effect row: it replaces that effect.
+    ex(&mut s, "effect.add", json!({"ids": [b], "type": "layerBlur"}));
+    ex(&mut s, "effect.paste", json!({"ids": [b], "index": 0}));
+    assert_eq!(node(&s, b).effects, vec![e.clone()]);
+    // With no row: it adds one on top.
+    ex(&mut s, "effect.paste", json!({"ids": [b]}));
+    assert_eq!(node(&s, b).effects, [e.clone(), e]);
+    ex(&mut s, "edit.undo", json!({}));
+    assert_eq!(node(&s, b).effects.len(), 1);
+    let Effect { kind: EffectKind::DropShadow(shadow), visible } = node(&s, b).effects[0].clone() else {
+        panic!("the pasted effect is a drop shadow")
+    };
+    assert_eq!((shadow.radius, shadow.offset, visible), (7.0, (2.0, 3.0), true));
+}
+
+#[test]
+fn pasting_design_layers_keeps_a_copied_row() {
+    let mut s = Session::new();
+    let a = rect(&mut s);
+    ex(&mut s, "fill.copy", json!({"id": a}));
+    // Layers pasted from another app replace the copied layers, not the copied fill row.
+    let mut other = Session::new();
+    other.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+    let exported = other.execute("file.export", &json!({"format": "fig"})).unwrap();
+    ex(&mut s, "edit.pasteDesignLayers", json!({"data": exported["data"]}));
+    let b = rect(&mut s);
+    ex(&mut s, "fill.paste", json!({"ids": [b], "index": 0}));
+}
+
+#[test]
+fn a_copied_pattern_cannot_paste_into_a_layer_it_draws() {
+    let mut s = Session::new();
+    let outer = id(ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100})));
+    let inner = id(ex(&mut s, "node.create", json!({"type": "rectangle", "x": 10, "y": 10, "width": 20, "height": 20, "parent": outer})));
+    // A pattern taken from the frame's child, on a layer beside the frame.
+    let source = rect(&mut s);
+    ex(&mut s, "fill.pattern", json!({"ids": [source], "source": inner}));
+    ex(&mut s, "fill.copy", json!({"id": source}));
+    // Onto the frame that holds the pattern's source it would draw itself, as `fill.pattern` refuses.
+    assert!(s.execute("fill.paste", &json!({"ids": [outer]})).is_err());
+    // Onto a layer that doesn't hold the pattern's source it still pastes.
+    let other = rect(&mut s);
+    ex(&mut s, "fill.paste", json!({"ids": [other], "index": 0}));
+}
diff --git a/crates/engine/src/proto_overlay_anchor_tests.rs b/crates/engine/src/proto_overlay_anchor_tests.rs
new file mode 100644
index 00000000..ebf9a30c
--- /dev/null
+++ b/crates/engine/src/proto_overlay_anchor_tests.rs
@@ -0,0 +1,70 @@
+use serde_json::{Value, json};
+
+use crate::params::id_of;
+use crate::{EngineError, Session};
+use figcraft_doc::NodeId;
+use figcraft_doc::proto::{Action, OverlayAnchor, OverlayPosition};
+
+fn frame(s: &mut Session, x: f64, w: f64, h: f64, name: &str) -> NodeId {
+    id_of(&s.execute("frame.create", &json!({"x": x, "y": 0, "width": w, "height": h, "name": name})).unwrap()["id"]).unwrap()
+}
+
+fn button(s: &mut Session, parent: NodeId) -> NodeId {
+    let r = s.execute("node.create", &json!({"type": "rectangle", "x": 10, "y": 30, "width": 100, "height": 40, "parent": parent, "name": "Button"}));
+    id_of(&r.unwrap()["id"]).unwrap()
+}
+
+fn action(s: &Session, id: NodeId) -> Action {
+    s.doc().unwrap().node(id).unwrap().interactions[0].actions[0].clone()
+}
+
+fn dropdown(s: &mut Session) -> (NodeId, NodeId) {
+    let screen = frame(s, 0.0, 400.0, 800.0, "Screen");
+    let menu = frame(s, 600.0, 60.0, 200.0, "Menu");
+    let b = button(s, screen);
+    let open = json!({"type": "openOverlay", "dest": menu, "position": "bottomLeft", "anchor": "triggerOutside"});
+    s.execute("proto.interaction.add", &json!({"id": b, "action": open})).unwrap();
+    (b, menu)
+}
+
+#[test]
+fn the_anchor_is_set_read_and_undone() {
+    let mut s = Session::new();
+    let (b, menu) = dropdown(&mut s);
+    assert!(matches!(action(&s, b), Action::OpenOverlay { anchor: OverlayAnchor::TriggerOutside, position: OverlayPosition::BottomLeft, .. }));
+    s.execute(
+        "proto.interaction.set",
+        &json!({"id": b, "index": 0, "action": {"type": "openOverlay", "dest": menu, "position": "topCenter", "anchor": "triggerInside"}}),
+    )
+    .unwrap();
+    assert!(matches!(action(&s, b), Action::OpenOverlay { anchor: OverlayAnchor::TriggerInside, position: OverlayPosition::TopCenter, .. }));
+    assert!(s.undo().unwrap());
+    assert!(matches!(action(&s, b), Action::OpenOverlay { anchor: OverlayAnchor::TriggerOutside, .. }));
+}
+
+#[test]
+fn fig_writes_a_manual_offset_from_the_trigger() {
+    let mut s = Session::new();
+    let (b, _) = dropdown(&mut s);
+    let (bytes, _) = figcraft_format::fig::export(s.doc().unwrap(), None).unwrap();
+    let (back, _) = figcraft_format::fig::import(&bytes, "x").unwrap();
+    let hot = back.nodes().find(|n| n.name == "Button").unwrap();
+    assert!(
+        matches!(hot.interactions[0].actions[0], Action::OpenOverlay { position: OverlayPosition::Manual, offset: Some([0.0, 40.0]), .. }),
+        "{:?} (from {b:?})",
+        hot.interactions[0].actions
+    );
+}
+
+#[test]
+fn junk_anchors_are_refused_not_fatal() {
+    let junk = [json!(true), json!(-1), json!("above"), json!([1, 2]), json!({"a": 1}), json!("x".repeat(10_000))];
+    for j in &junk {
+        let mut s = Session::new();
+        let (a, menu) = (frame(&mut s, 0.0, 100.0, 100.0, "A"), frame(&mut s, 200.0, 50.0, 50.0, "M"));
+        let p: Value = json!({"id": a, "action": {"type": "openOverlay", "dest": menu, "anchor": j}});
+        let r = s.execute("proto.interaction.add", &p);
+        assert!(!matches!(r, Err(EngineError::Internal { .. })), "{p}: {r:?}");
+        assert!(s.doc().unwrap().node(a).unwrap().interactions.is_empty(), "{j}");
+    }
+}
diff --git a/crates/engine/src/rest_slot_tests.rs b/crates/engine/src/rest_slot_tests.rs
new file mode 100644
index 00000000..e272c3a7
--- /dev/null
+++ b/crates/engine/src/rest_slot_tests.rs
@@ -0,0 +1,91 @@
+//! Slots opened from REST file JSON: instances keep their own slot content through edits and
+//! moves of the mains, and through saving.
+
+use crate::Session;
+use crate::components::tests::{ex, healthy, idv};
+use crate::components::*;
+use base64::Engine as _;
+use figcraft_doc::*;
+use serde_json::{Value, json};
+
+fn at(x: f64, y: f64) -> Value {
+    json!([[1, 0, x], [0, 1, y]])
+}
+
+fn text(id: &str, s: &str) -> Value {
+    json!({"id": id, "name": s, "type": "TEXT", "characters": s, "relativeTransform": at(0.0, 0.0), "size": {"x": 100, "y": 20}})
+}
+
+/// A Chip main, a Container main with an empty "Slot", and an instance of Container whose slot
+/// holds a text and a chip.
+fn file() -> Value {
+    let slot = |id: &str, kids: Value| json!({"id": id, "name": "Slot", "type": "SLOT", "relativeTransform": at(10.0, 40.0), "size": {"x": 280, "y": 100}, "children": kids});
+    let guid = |l: u32| json!({"guid": {"sessionID": 5, "localID": l}});
+    let chip = json!({"id": "2:3", "name": "Chip", "type": "INSTANCE", "componentId": "1:9", "relativeTransform": at(0.0, 30.0), "size": {"x": 40, "y": 20},
+        "children": [{"id": "I2:3;1:10", "name": "Dot", "type": "ELLIPSE", "relativeTransform": at(2.0, 2.0), "size": {"x": 16, "y": 16}}]});
+    json!({"name": "Slots", "document": {"id": "0:0", "type": "DOCUMENT", "children": [{"id": "0:1", "name": "Page", "type": "CANVAS", "children": [
+        {"id": "1:9", "name": "Chip", "type": "COMPONENT", "relativeTransform": at(0.0, 400.0), "size": {"x": 40, "y": 20}, "children": [
+            {"id": "1:10", "name": "Dot", "type": "ELLIPSE", "relativeTransform": at(2.0, 2.0), "size": {"x": 16, "y": 16}}
+        ]},
+        {"id": "1:2", "name": "Container", "type": "COMPONENT", "relativeTransform": at(0.0, 0.0), "size": {"x": 300, "y": 160},
+         "componentPropertyDefinitions": {"Slot#1:3": {"type": "SLOT", "defaultValue": guid(1)}},
+         "children": [text("1:4", "Title"), slot("1:5", json!([]))]},
+        {"id": "2:1", "name": "Container", "type": "INSTANCE", "componentId": "1:2", "relativeTransform": at(400.0, 0.0), "size": {"x": 300, "y": 160},
+         "componentProperties": {"Slot#1:3": {"type": "SLOT", "value": guid(7)}},
+         "children": [text("I2:1;1:4", "Title"), slot("I2:1;1:5", json!([text("2:2", "Reports in progress"), chip]))]}
+    ]}]}})
+}
+
+fn named(doc: &Document, kind: fn(&NodeKind) -> bool, name: &str) -> NodeId {
+    doc.nodes().find(|n| n.name == name && kind(&n.kind)).map(|n| n.id).unwrap_or_else(|| panic!("no {name}"))
+}
+
+/// The instance's slot and the names of what it holds.
+fn slot_content(s: &Session) -> (NodeId, Vec<String>) {
+    let doc = s.doc().unwrap();
+    let inst = named(doc, |k| matches!(k, NodeKind::Instance { .. }), "Container");
+    let (slot, _) = slots_of(doc, inst).into_iter().next().expect("the instance has its slot");
+    let names = doc.node(slot).unwrap().children.iter().map(|c| doc.node(*c).unwrap().name.clone()).collect();
+    (slot, names)
+}
+
+#[test]
+fn rest_slot_content_survives_main_edits_moves_and_saving() {
+    let mut s = Session::new();
+    let data = base64::engine::general_purpose::STANDARD.encode(serde_json::to_vec(&file()).unwrap());
+    ex(&mut s, "file.open", json!({"data": data, "name": "slots.json"}));
+    healthy(&s);
+    let want = vec!["Reports in progress".to_string(), "Chip".to_string()];
+    let (slot, names) = slot_content(&s);
+    assert_eq!(names, want);
+    let doc = s.doc().unwrap();
+    assert_eq!(slot_name(doc, slot).as_deref(), Some("Slot"));
+    assert!(slot_edited(doc, slot), "the instance's own content");
+    let chip = named(doc, |k| matches!(k, NodeKind::Instance { .. }), "Chip");
+    assert!(!inside_instance(doc, chip), "content stands alone");
+
+    // Edit and move both mains (the container's and the one used in the content).
+    let main = named(doc, |k| matches!(k, NodeKind::Component { .. }), "Container");
+    let chip_main = named(doc, |k| matches!(k, NodeKind::Component { .. }), "Chip");
+    let title = doc.node(main).unwrap().children[0];
+    ex(&mut s, "node.set", json!({"id": title, "props": {"fill": "#ff0000"}}));
+    ex(&mut s, "node.set", json!({"id": main, "props": {"width": 320}}));
+    let holder = idv(&ex(&mut s, "frame.create", json!({"x": -1000, "y": 0, "width": 900, "height": 900, "name": "Design system"})));
+    ex(&mut s, "node.reparent", json!({"ids": [main, chip_main], "parent": holder}));
+    healthy(&s);
+    assert_eq!(slot_content(&s).1, want, "kept across syncs");
+
+    // Saving and opening again keeps it.
+    let bytes = figcraft_format::save_bytes(s.doc().unwrap(), None).unwrap();
+    let data = base64::engine::general_purpose::STANDARD.encode(bytes);
+    let mut again = Session::new();
+    ex(&mut again, "file.open", json!({"data": data, "name": "slots.figcraft"}));
+    healthy(&again);
+    let (slot, names) = slot_content(&again);
+    assert_eq!(names, want);
+    assert!(slot_edited(again.doc().unwrap(), slot));
+
+    // Resetting the slot shows the main's (empty) default content.
+    ex(&mut again, "instance.resetSlot", json!({"id": slot}));
+    assert!(slot_content(&again).1.is_empty());
+}
diff --git a/crates/engine/src/save_disk_changes_tests.rs b/crates/engine/src/save_disk_changes_tests.rs
new file mode 100644
index 00000000..807daa9e
--- /dev/null
+++ b/crates/engine/src/save_disk_changes_tests.rs
@@ -0,0 +1,76 @@
+//! Saving never silently replaces what another app wrote to the open file since it was opened or
+//! saved here (#1330): Save and auto-save refuse, `overwrite` and Revert to saved settle it.
+
+use serde_json::json;
+
+use crate::Session;
+use crate::cmd::file::FileSnapshot;
+
+fn temp_file(name: &str) -> String {
+    let dir = std::env::temp_dir().join(format!("figcraft-disk-changes-{}-{name}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    dir.join("TESTE.figcraft").to_string_lossy().into_owned()
+}
+
+/// What the file on disk names its first page.
+fn page_on_disk(path: &str) -> String {
+    let mut s = Session::new();
+    s.execute("file.open", &json!({"path": path})).unwrap();
+    let ds = s.ds().unwrap();
+    ds.doc.node(ds.page).unwrap().name.clone()
+}
+
+/// The app has `path` open with an unsaved edit, after figcraft-cli renamed its page on disk.
+fn app_and_cli(path: &str) -> Session {
+    let mut setup = Session::new();
+    setup.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+    setup.execute("file.save", &json!({"path": path})).unwrap();
+    let mut app = Session::new();
+    app.execute("file.open", &json!({"path": path})).unwrap();
+    let mut cli = Session::new();
+    cli.execute("file.open", &json!({"path": path})).unwrap();
+    cli.execute("page.rename", &json!({"name": "CLI VENCEU"})).unwrap();
+    cli.execute("file.save", &json!({})).unwrap();
+    app.execute("shape.rectangle", &json!({"x": 20, "y": 0, "width": 10, "height": 10})).unwrap();
+    app
+}
+
+#[test]
+fn saving_over_changes_made_on_disk_is_refused_until_asked() {
+    let path = temp_file("save");
+    let mut app = app_and_cli(&path);
+    let err = app.execute("file.save", &json!({})).unwrap_err().to_string();
+    assert!(err.contains("changed on disk"), "{err}");
+    assert_eq!(page_on_disk(&path), "CLI VENCEU", "the CLI's change is still in the file");
+    assert!(app.ds().unwrap().is_dirty(), "the app's edit stays unsaved");
+    // Asked to, the save replaces it; from then on the file is the app's again.
+    app.execute("file.save", &json!({"overwrite": true})).unwrap();
+    assert_ne!(page_on_disk(&path), "CLI VENCEU");
+    app.execute("shape.rectangle", &json!({"x": 40, "y": 0, "width": 10, "height": 10})).unwrap();
+    app.execute("file.save", &json!({})).unwrap();
+    let _ = std::fs::remove_file(&path);
+}
+
+#[test]
+fn reverting_loads_the_changes_made_on_disk_and_saves_again() {
+    let path = temp_file("revert");
+    let mut app = app_and_cli(&path);
+    app.execute("file.revert", &json!({})).unwrap();
+    let ds = app.ds().unwrap();
+    assert_eq!(ds.doc.node(ds.page).unwrap().name, "CLI VENCEU");
+    app.execute("shape.rectangle", &json!({"x": 20, "y": 0, "width": 10, "height": 10})).unwrap();
+    app.execute("file.save", &json!({})).unwrap();
+    assert_eq!(page_on_disk(&path), "CLI VENCEU", "saved on top of the CLI's change");
+    let _ = std::fs::remove_file(&path);
+}
+
+#[test]
+fn auto_save_leaves_changes_made_on_disk_alone() {
+    let path = temp_file("auto");
+    let mut app = app_and_cli(&path);
+    let snapshot = FileSnapshot::of(app.ds().unwrap());
+    let bytes = snapshot.encode().unwrap();
+    assert!(snapshot.save(&mut app, &bytes).is_err());
+    assert_eq!(page_on_disk(&path), "CLI VENCEU");
+    let _ = std::fs::remove_file(&path);
+}
diff --git a/crates/engine/src/save_format_tests.rs b/crates/engine/src/save_format_tests.rs
new file mode 100644
index 00000000..37f22ce7
--- /dev/null
+++ b/crates/engine/src/save_format_tests.rs
@@ -0,0 +1,410 @@
+//! Save As can write an experimental `.fig` copy without replacing native save state.
+
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use figcraft_format::Version;
+use serde_json::{Value, json};
+
+use crate::{DocState, EngineError, Session};
+
+struct SaveFiles {
+    dir: PathBuf,
+    files: Vec<PathBuf>,
+}
+
+impl SaveFiles {
+    fn new() -> Self {
+        // Tests run in parallel and the clock can read the same for two of them (macOS counts
+        // microseconds), so a counter keeps their folders apart.
+        static NEXT: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
+        let n = NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+        let stamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+        let dir = std::env::temp_dir().join(format!("figcraft-save-formats-{}-{stamp}-{n}", std::process::id()));
+        std::fs::create_dir(&dir).unwrap();
+        Self { dir, files: Vec::new() }
+    }
+
+    fn path(&mut self, name: &str) -> PathBuf {
+        let path = self.dir.join(name);
+        self.files.push(path.clone());
+        path
+    }
+}
+
+impl Drop for SaveFiles {
+    fn drop(&mut self) {
+        for path in &self.files {
+            let _ = std::fs::remove_file(path);
+            let _ = std::fs::remove_dir(path);
+        }
+        let _ = std::fs::remove_dir(&self.dir);
+    }
+}
+
+fn rect(s: &mut Session, name: &str) {
+    s.execute("shape.rectangle", &json!({"name": name, "x": 10, "y": 20, "width": 30, "height": 40})).unwrap();
+}
+
+fn assert_versions_unchanged(after: &[Version], before: &[Version]) {
+    assert_eq!(after.len(), before.len());
+    for (after, before) in after.iter().zip(before) {
+        assert_eq!(
+            (&after.id, &after.name, &after.description, after.time, after.auto),
+            (&before.id, &before.name, &before.description, before.time, before.auto)
+        );
+        assert_eq!(*after.document().unwrap(), *before.document().unwrap());
+    }
+}
+
+fn assert_save_state_unchanged(s: &Session, before: &DocState, recent: &[String]) {
+    let after = s.ds().unwrap();
+    assert_eq!(after.path, before.path);
+    assert_eq!(after.is_dirty(), before.is_dirty());
+    assert_eq!(after.versions_changed, before.versions_changed);
+    assert!(Arc::ptr_eq(&after.doc, &before.doc));
+    assert!(Arc::ptr_eq(&after.saved_doc, &before.saved_doc));
+    assert_eq!(
+        after.preview.as_ref().map(|p| (&p.id, &p.name, p.time, &p.selection, p.page)),
+        before.preview.as_ref().map(|p| (&p.id, &p.name, p.time, &p.selection, p.page))
+    );
+    if let (Some(after), Some(before)) = (&after.preview, &before.preview) {
+        assert!(Arc::ptr_eq(&after.doc, &before.doc));
+    }
+    assert_eq!((&after.selection, after.page), (&before.selection, before.page));
+    assert_versions_unchanged(&after.versions, &before.versions);
+    assert_eq!(after.branches.len(), before.branches.len());
+    for (after, before) in after.branches.iter().zip(&before.branches) {
+        assert_eq!(
+            (&after.id, &after.name, after.time, after.client, after.state),
+            (&before.id, &before.name, before.time, before.client, before.state)
+        );
+        assert_eq!(*after.base, *before.base);
+        assert_eq!(*after.head, *before.head);
+        assert_versions_unchanged(&after.versions, &before.versions);
+    }
+    for (after, before) in [(&after.history.undo, &before.history.undo), (&after.history.redo, &before.history.redo)] {
+        assert_eq!(after.len(), before.len());
+        for (after, before) in after.iter().zip(before) {
+            assert_eq!((&after.label, &after.selection, after.page), (&before.label, &before.selection, before.page));
+            assert!(Arc::ptr_eq(&after.doc, &before.doc));
+        }
+    }
+    assert_eq!(s.prefs.recent_files, recent);
+}
+
+#[test]
+fn first_native_save_uses_chosen_filename_for_an_untitled_document() {
+    let mut files = SaveFiles::new();
+    let path = files.path("Redis.figcraft");
+    let copy = files.path("Redis copy.figcraft");
+    let manual_copy = files.path("Other.figcraft");
+    let mut s = Session::new();
+    s.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
+    assert_eq!(s.ds().unwrap().doc.name, "Redis");
+    assert!(!s.ds().unwrap().is_dirty());
+    assert_eq!(figcraft_format::load_bytes(&std::fs::read(&path).unwrap()).unwrap().0.name, "Redis");
+
+    let mut reopened = Session::empty();
+    reopened.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap();
+    assert_eq!(reopened.ds().unwrap().doc.name, "Redis");
+
+    s.execute("file.saveAs", &json!({"path": copy.to_string_lossy()})).unwrap();
+    assert_eq!(s.ds().unwrap().doc.name, "Redis copy");
+    s.execute("file.rename", &json!({"name": "Chosen title"})).unwrap();
+    s.execute("file.saveAs", &json!({"path": manual_copy.to_string_lossy()})).unwrap();
+    assert_eq!(s.ds().unwrap().doc.name, "Chosen title");
+}
+
+#[test]
+fn opening_an_older_file_uses_its_filename_only_for_the_default_title() {
+    let mut files = SaveFiles::new();
+    let old_path = files.path("Redis.figcraft");
+    let named_path = files.path("Other.figcraft");
+    let mut original = Session::new();
+    std::fs::write(&old_path, crate::cmd::file::file_bytes(original.ds().unwrap()).unwrap()).unwrap();
+    original.execute("file.rename", &json!({"name": "Chosen title"})).unwrap();
+    std::fs::write(&named_path, crate::cmd::file::file_bytes(original.ds().unwrap()).unwrap()).unwrap();
+
+    let mut reopened = Session::empty();
+    reopened.execute("file.open", &json!({"path": old_path.to_string_lossy()})).unwrap();
+    assert_eq!(reopened.ds().unwrap().doc.name, "Redis");
+    reopened.execute("file.open", &json!({"path": named_path.to_string_lossy()})).unwrap();
+    assert_eq!(reopened.ds().unwrap().doc.name, "Chosen title");
+}
+
+fn read_fig(path: &std::path::Path, result: &Value) -> figcraft_doc::Document {
+    let bytes = std::fs::read(path).unwrap();
+    assert_eq!(result["format"], "fig");
+    assert_eq!(result["bytes"], bytes.len());
+    assert!(result["warnings"].is_array());
+    assert!(figcraft_format::load_bytes(&bytes).is_err(), "a .fig copy must not contain native FigCraft data");
+    figcraft_format::fig::import(&bytes, "Copy").unwrap().0
+}
+
+#[test]
+fn fig_save_as_keeps_native_path_dirty_state_and_history() {
+    let mut files = SaveFiles::new();
+    let native = files.path("design.figcraft");
+    let copy = files.path("copy.fig");
+    let mut s = Session::new();
+    rect(&mut s, "Saved rectangle");
+    s.execute("file.saveAs", &json!({"path": native.to_string_lossy()})).unwrap();
+    let saved = std::fs::read(&native).unwrap();
+    rect(&mut s, "New rectangle");
+    s.execute("comment.add", &json!({"x": 0, "y": 0, "text": "Copy warning"})).unwrap();
+    s.execute("file.saveVersion", &json!({"name": "Before copy"})).unwrap();
+    rect(&mut s, "Undone rectangle");
+    s.undo().unwrap();
+    let before = s.ds().unwrap().clone();
+    let recent = s.prefs.recent_files.clone();
+    assert!(before.is_dirty());
+    assert!(!before.history.redo.is_empty());
+
+    let result = s.execute("file.saveAs", &json!({"path": copy.to_string_lossy()})).unwrap();
+    let imported = read_fig(&copy, &result);
+    assert!(imported.nodes().any(|n| n.name == "New rectangle"));
+    assert!(!imported.nodes().any(|n| n.name == "Undone rectangle"));
+    assert!(result["warnings"].as_array().unwrap().iter().any(|w| w == "comments were left out"));
+    assert_save_state_unchanged(&s, &before, &recent);
+    assert_eq!(std::fs::read(&native).unwrap(), saved);
+
+    s.execute("file.save", &json!({})).unwrap();
+    assert!(!s.ds().unwrap().is_dirty());
+    assert_eq!(s.ds().unwrap().path.as_deref(), native.to_str());
+    let persisted = figcraft_format::load_bytes_with_versions(&std::fs::read(&native).unwrap()).unwrap();
+    assert!(persisted.doc.nodes().any(|n| n.name == "New rectangle"));
+    assert_eq!(persisted.versions[0].name, "Before copy");
+    assert_eq!(std::fs::read(&copy).unwrap().len(), result["bytes"].as_u64().unwrap() as usize);
+}
+
+#[test]
+fn unsaved_fig_copy_remains_unsaved() {
+    let mut files = SaveFiles::new();
+    let copy = files.path("unsaved.fig");
+    let mut s = Session::new();
+    rect(&mut s, "Unsaved rectangle");
+    let before = s.ds().unwrap().clone();
+    let recent = s.prefs.recent_files.clone();
+    let result = s.execute("file.saveAs", &json!({"path": copy.to_string_lossy()})).unwrap();
+    assert!(read_fig(&copy, &result).nodes().any(|n| n.name == "Unsaved rectangle"));
+    assert_save_state_unchanged(&s, &before, &recent);
+    assert!(matches!(s.execute("file.save", &json!({})), Err(EngineError::Disabled(..))));
+    assert_eq!(s.ui_requests.last().unwrap().kind, "dialog.saveAs");
+}
+
+#[test]
+fn empty_document_fig_copy_keeps_clean_state() {
+    let mut files = SaveFiles::new();
+    let copy = files.path("empty.fig");
+    let mut s = Session::new();
+    let before = s.ds().unwrap().clone();
+    assert!(!before.is_dirty());
+    let result = s.execute("file.saveAs", &json!({"path": copy.to_string_lossy()})).unwrap();
+    let imported = read_fig(&copy, &result);
+    assert_eq!(imported.pages.len(), 1);
+    assert_eq!(imported.node_count(), 1);
+    assert_save_state_unchanged(&s, &before, &[]);
+}
+
+#[test]
+fn fig_save_commands_accept_uppercase_extension() {
+    let mut files = SaveFiles::new();
+    for (index, command) in ["file.save", "file.saveAs"].into_iter().enumerate() {
+        let copy = files.path(&format!("copy-{index}.FIG"));
+        let mut s = Session::new();
+        rect(&mut s, command);
+        let before = s.ds().unwrap().clone();
+        let result = s.execute(command, &json!({"path": copy.to_string_lossy()})).unwrap();
+        assert!(read_fig(&copy, &result).nodes().any(|n| n.name == command));
+        assert_save_state_unchanged(&s, &before, &[]);
+    }
+}
+
+#[test]
+fn fig_copy_from_branch_exports_active_document_without_saving_main() {
+    let mut files = SaveFiles::new();
+    let native = files.path("main.figcraft");
+    let copy = files.path("branch.fig");
+    let mut s = Session::new();
+    rect(&mut s, "Main rectangle");
+    s.execute("file.save", &json!({"path": native.to_string_lossy()})).unwrap();
+    let saved = std::fs::read(&native).unwrap();
+    s.execute("branch.create", &json!({"name": "Explore"})).unwrap();
+    rect(&mut s, "Branch rectangle");
+    s.execute("file.saveVersion", &json!({"name": "Branch version"})).unwrap();
+    // Branch edits normally sync to main before commands; capture that state before exporting.
+    s.execute("branch.list", &json!({})).unwrap();
+    let branch = s.ds().unwrap().clone();
+    let main = s.docs[0].clone();
+    let recent = s.prefs.recent_files.clone();
+
+    let result = s.execute("file.saveAs", &json!({"path": copy.to_string_lossy()})).unwrap();
+    assert!(read_fig(&copy, &result).nodes().any(|n| n.name == "Branch rectangle"));
+    assert_save_state_unchanged(&s, &branch, &recent);
+    assert_eq!(s.docs[0].path, main.path);
+    assert_eq!(s.docs[0].is_dirty(), main.is_dirty());
+    assert!(Arc::ptr_eq(&s.docs[0].saved_doc, &main.saved_doc));
+    assert!(Arc::ptr_eq(&s.docs[0].doc, &main.doc));
+    assert_eq!(std::fs::read(&native).unwrap(), saved);
+
+    s.execute("file.save", &json!({})).unwrap();
+    let persisted = figcraft_format::load_bytes_with_versions(&std::fs::read(&native).unwrap()).unwrap();
+    assert!(!persisted.doc.nodes().any(|n| n.name == "Branch rectangle"));
+    assert!(persisted.branches[0].head.nodes().any(|n| n.name == "Branch rectangle"));
+    assert_eq!(persisted.branches[0].versions.last().unwrap().name, "Branch version");
+    assert!(!s.ds().unwrap().is_dirty());
+    assert!(!s.docs[0].is_dirty());
+}
+
+#[test]
+fn fig_copy_write_failure_keeps_save_state() {
+    let mut files = SaveFiles::new();
+    let blocked = files.path("blocked.fig");
+    std::fs::create_dir(&blocked).unwrap();
+    let missing = files.path("missing/copy.fig");
+    let mut s = Session::new();
+    rect(&mut s, "Kept rectangle");
+    s.execute("file.saveVersion", &json!({"name": "Kept version"})).unwrap();
+    rect(&mut s, "Later rectangle");
+    s.execute("version.preview", &json!({"index": 0})).unwrap();
+    let before = s.ds().unwrap().clone();
+    for command in ["file.save", "file.saveAs"] {
+        for path in [&blocked, &missing] {
+            assert!(s.execute(command, &json!({"path": path.to_string_lossy()})).is_err());
+            assert_save_state_unchanged(&s, &before, &[]);
+            assert!(!PathBuf::from(format!("{}.tmp-figcraft", path.display())).exists());
+        }
+    }
+}
+
+#[test]
+fn save_as_without_extension_stays_native() {
+    let mut files = SaveFiles::new();
+    let requested = files.dir.join("native");
+    let native = files.path("native.figcraft");
+    let mut s = Session::new();
+    rect(&mut s, "Native rectangle");
+    let result = s.execute("file.saveAs", &json!({"path": requested.to_string_lossy()})).unwrap();
+    assert_eq!(result["path"], native.to_string_lossy().as_ref());
+    assert_eq!(s.ds().unwrap().path.as_deref(), native.to_str());
+    assert!(!s.ds().unwrap().is_dirty());
+    assert!(!requested.exists());
+    let loaded = figcraft_format::load_bytes(&std::fs::read(native).unwrap()).unwrap();
+    assert!(loaded.0.nodes().any(|n| n.name == "Native rectangle"));
+}
+
+#[test]
+fn fig_copy_of_version_preview_keeps_visible_version_and_save_state() {
+    let mut files = SaveFiles::new();
+    for (index, command) in ["file.save", "file.saveAs"].into_iter().enumerate() {
+        let native = files.path(&format!("current-{index}.figcraft"));
+        let copy = files.path(&format!("version-{index}.FIG"));
+        let mut s = Session::new();
+        rect(&mut s, "A");
+        s.execute("file.saveVersion", &json!({"name": "A only"})).unwrap();
+        s.execute("file.save", &json!({"path": native.to_string_lossy()})).unwrap();
+        let saved = std::fs::read(&native).unwrap();
+        rect(&mut s, "B");
+        s.execute("version.preview", &json!({"index": 0})).unwrap();
+        let before = s.ds().unwrap().clone();
+        let recent = s.prefs.recent_files.clone();
+        assert!(before.preview.is_some());
+        assert!(before.is_dirty());
+
+        let result = s.execute(command, &json!({"path": copy.to_string_lossy()})).unwrap();
+        let imported = read_fig(&copy, &result);
+        assert!(imported.nodes().any(|n| n.name == "A"));
+        assert!(!imported.nodes().any(|n| n.name == "B"), "the copy must export the version shown");
+        assert_save_state_unchanged(&s, &before, &recent);
+        assert_eq!(std::fs::read(&native).unwrap(), saved);
+        s.execute("version.exitPreview", &json!({})).unwrap();
+        assert!(s.doc().unwrap().nodes().any(|n| n.name == "B"));
+    }
+}
+
+#[test]
+fn pending_save_choice_keeps_version_preview() {
+    let mut files = SaveFiles::new();
+    for (index, (command, native_path)) in [("file.saveAs", false), ("file.saveAs", true), ("file.save", false)].into_iter().enumerate() {
+        let mut s = Session::new();
+        rect(&mut s, "A");
+        s.execute("file.saveVersion", &json!({"name": "A only"})).unwrap();
+        if native_path {
+            let native = files.path(&format!("saved-{index}.figcraft"));
+            s.execute("file.save", &json!({"path": native.to_string_lossy()})).unwrap();
+        }
+        rect(&mut s, "B");
+        s.execute("version.preview", &json!({"index": 0})).unwrap();
+        let before = s.ds().unwrap().clone();
+        let recent = s.prefs.recent_files.clone();
+        assert!(matches!(s.execute(command, &json!({})), Err(EngineError::Disabled(..))));
+        assert_eq!(s.ui_requests.last().unwrap().kind, "dialog.saveAs");
+        assert_save_state_unchanged(&s, &before, &recent);
+    }
+}
+
+#[test]
+fn native_save_from_version_preview_writes_current_document() {
+    let mut files = SaveFiles::new();
+    for (index, (command, explicit)) in [("file.save", false), ("file.save", true), ("file.saveAs", true)].into_iter().enumerate() {
+        let native = files.path(&format!("native-version-{index}.figcraft"));
+        let mut s = Session::new();
+        rect(&mut s, "A");
+        s.execute("file.saveVersion", &json!({"name": "A only"})).unwrap();
+        s.execute("file.save", &json!({"path": native.to_string_lossy()})).unwrap();
+        rect(&mut s, "B");
+        s.execute("version.preview", &json!({"index": 0})).unwrap();
+        let undo = s.ds().unwrap().history.undo.len();
+        let params = if explicit { json!({"path": native.to_string_lossy()}) } else { json!({}) };
+        s.execute(command, &params).unwrap();
+        assert!(s.ds().unwrap().preview.is_none());
+        assert!(!s.ds().unwrap().is_dirty());
+        assert_eq!(s.ds().unwrap().history.undo.len(), undo);
+        assert_eq!(s.ds().unwrap().path.as_deref(), native.to_str());
+        let loaded = figcraft_format::load_bytes_with_versions(&std::fs::read(&native).unwrap()).unwrap();
+        assert!(loaded.doc.nodes().any(|n| n.name == "A"));
+        assert!(loaded.doc.nodes().any(|n| n.name == "B"));
+        assert!(!loaded.versions[0].document().unwrap().nodes().any(|n| n.name == "B"));
+    }
+}
+
+#[test]
+fn implicit_save_protects_legacy_fig_destination() {
+    let mut files = SaveFiles::new();
+    for (index, command) in ["file.save", "file.saveAs"].into_iter().enumerate() {
+        let legacy = files.path(&format!("legacy-{index}.FIG"));
+        let native = files.path(&format!("corrected-{index}.figcraft"));
+        let mut s = Session::new();
+        rect(&mut s, "A");
+        s.execute("file.saveVersion", &json!({"name": "A only"})).unwrap();
+        // Earlier builds could write native data under .fig; keep those bytes safe on plain Save.
+        let sentinel = crate::cmd::file::file_bytes(s.ds().unwrap()).unwrap();
+        std::fs::write(&legacy, &sentinel).unwrap();
+        s.ds_mut().unwrap().path = Some(legacy.to_string_lossy().into_owned());
+        s.ds_mut().unwrap().mark_saved();
+        rect(&mut s, "B");
+        s.execute("version.preview", &json!({"index": 0})).unwrap();
+        let before = s.ds().unwrap().clone();
+        let recent = s.prefs.recent_files.clone();
+
+        assert!(matches!(s.execute("file.save", &json!({})), Err(EngineError::Disabled(..))));
+        assert_eq!(s.ui_requests.last().unwrap().kind, "dialog.saveAs");
+        assert_save_state_unchanged(&s, &before, &recent);
+        assert_eq!(std::fs::read(&legacy).unwrap(), sentinel);
+
+        s.execute(command, &json!({"path": native.to_string_lossy()})).unwrap();
+        assert!(s.ds().unwrap().preview.is_none());
+        assert!(!s.ds().unwrap().is_dirty());
+        assert_eq!(s.ds().unwrap().path.as_deref(), native.to_str());
+        let loaded = figcraft_format::load_bytes_with_versions(&std::fs::read(&native).unwrap()).unwrap();
+        assert!(loaded.doc.nodes().any(|n| n.name == "A"));
+        assert!(loaded.doc.nodes().any(|n| n.name == "B"));
+        assert_eq!(loaded.versions[0].name, "A only");
+        rect(&mut s, "C");
+        s.execute("file.save", &json!({})).unwrap();
+        let loaded = figcraft_format::load_bytes(&std::fs::read(&native).unwrap()).unwrap();
+        assert!(loaded.0.nodes().any(|n| n.name == "C"));
+        assert_eq!(std::fs::read(&legacy).unwrap(), sentinel);
+    }
+}
diff --git a/crates/engine/src/scale_tool_tests.rs b/crates/engine/src/scale_tool_tests.rs
index 647a7ce1..f61eba93 100644
--- a/crates/engine/src/scale_tool_tests.rs
+++ b/crates/engine/src/scale_tool_tests.rs
@@ -240,3 +240,17 @@ fn the_scale_tool_only_acts_on_handles() {
     assert_rect(bounds(&s, r), [10.0, 10.0, 110.0, 60.0]);
     assert!(near(s.doc().unwrap().node(r).unwrap().width, 100.0));
 }
+
+#[test]
+fn scale_node_scales_vector_point_corner_radius() {
+    let mut s = Session::new();
+    let v = id_of(&ex(&mut s, "vector.create", json!({"points": [[0, 0], [100, 0], [100, 100], [0, 100]], "closed": true}))["id"]).unwrap();
+    ex(&mut s, "node.set", json!({"id": v, "props": {"cornerRadius": 10}}));
+    ex(&mut s, "transform.scale", json!({"ids": [v], "factor": 2}));
+    let d = s.doc().unwrap();
+    let NodeKind::Vector { network } = &d.node(v).unwrap().kind else { panic!("not a vector") };
+    assert!(!network.vertices.is_empty());
+    for vx in &network.vertices {
+        assert_eq!(vx.radius, 20.0, "corner radius scaled with the layer");
+    }
+}
diff --git a/crates/engine/src/selection.rs b/crates/engine/src/selection.rs
new file mode 100644
index 00000000..08ab6456
--- /dev/null
+++ b/crates/engine/src/selection.rs
@@ -0,0 +1,4 @@
+pub mod rename;
+pub mod selection_colors;
+pub mod selection_reorder;
+pub mod selection_spacing;
diff --git a/crates/engine/src/rename.rs b/crates/engine/src/selection/rename.rs
similarity index 97%
rename from crates/engine/src/rename.rs
rename to crates/engine/src/selection/rename.rs
index 8d44f5ab..b4952475 100644
--- a/crates/engine/src/rename.rs
+++ b/crates/engine/src/selection/rename.rs
@@ -81,6 +81,9 @@ impl BatchRename {
                     out.push_str(name.get(last..m.start()).unwrap_or_default());
                     let (before, after) = (name.get(..m.start()).unwrap_or_default(), name.get(m.end()..).unwrap_or_default());
                     expand(&self.replace, &Ctx { matched: m.as_str(), before, after, groups: Some(&caps), up, down }, &mut out);
+                    if out.len() >= MAX_NAME * 4 {
+                        break;
+                    }
                     last = m.end();
                 }
                 out.push_str(name.get(last..).unwrap_or_default());
@@ -110,6 +113,9 @@ impl BatchRename {
 fn expand(template: &str, c: &Ctx, out: &mut String) {
     let mut it = template.chars().peekable();
     while let Some(ch) = it.next() {
+        if out.len() >= MAX_NAME * 4 {
+            break;
+        }
         if ch != '$' {
             out.push(ch);
             continue;
diff --git a/crates/engine/src/selection/selection_colors.rs b/crates/engine/src/selection/selection_colors.rs
new file mode 100644
index 00000000..56bc4b35
--- /dev/null
+++ b/crates/engine/src/selection/selection_colors.rs
@@ -0,0 +1,344 @@
+//! Paints used by the selection, including descendants and effective text-range fills.
+//! Targets name paint slots rather than colors: a live edit must not capture other slots when
+//! its color happens to become equal to another selection color.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use figcraft_color::{Paint, PaintKind};
+use figcraft_doc::{Document, NodeId, NodeKind, StyleKind, VariableType, VariableValue};
+use serde::{Deserialize, Serialize};
+use serde_json::{Value, json};
+
+use crate::cmd::lists::{BoundList, list_binding, rebind_edited_paint};
+use crate::cmd::styles::rebind_paint_alpha;
+use crate::params::*;
+use crate::{CommandSpec, Result, Session, bad, spec};
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", deny_unknown_fields)]
+pub struct PaintTarget {
+    pub id: NodeId,
+    pub fills: bool,
+    pub index: usize,
+    /// Character offsets, not byte offsets. None means the node's fill or stroke list.
+    pub range: Option<(usize, usize)>,
+}
+
+impl PaintTarget {
+    pub fn paints(&self, doc: &Document) -> Option<Vec<Paint>> {
+        let n = doc.node(self.id)?;
+        if let Some((start, end)) = self.range {
+            let t = n.kind.text()?;
+            if !self.fills || start > end || end > t.char_count() || (start == end && end != 0) {
+                return None;
+            }
+            Some(t.style_at(start).fills.clone().unwrap_or_else(|| n.fills.clone()))
+        } else {
+            Some(if self.fills { n.fills.clone() } else { n.strokes.clone() })
+        }
+    }
+
+    pub fn paint(&self, doc: &Document) -> Option<Paint> {
+        self.paints(doc)?.get(self.index).cloned()
+    }
+}
+
+#[derive(Clone, Debug, Serialize)]
+pub struct SelectionColor {
+    pub paint: Paint,
+    pub style: Option<String>,
+    pub variable: Option<String>,
+    pub targets: Vec<PaintTarget>,
+}
+
+/// Deterministic order, one target per slot even when a parent and child are both selected.
+/// Images and patterns are assets rather than selection colors. Hidden paints are omitted.
+pub fn collect(doc: &Document, ids: &[NodeId]) -> Vec<SelectionColor> {
+    let mut groups: Vec<SelectionColor> = Vec::new();
+    let mut seen = BTreeSet::new();
+    let mut by_paint: BTreeMap<(Option<String>, Option<String>, String), usize> = BTreeMap::new();
+    let mut pending: Vec<_> = ids.iter().rev().copied().collect();
+    while let Some(id) = pending.pop() {
+        if !seen.insert(id) {
+            continue;
+        }
+        let Some(n) = doc.node(id) else { continue };
+        if n.is_mask {
+            continue;
+        }
+        if !matches!(n.kind, NodeKind::BooleanOp { .. }) {
+            pending.extend(n.children.iter().rev().copied());
+        }
+        let mut add = |paints: &[Paint], fills: bool, range: Option<(usize, usize)>| {
+            for (index, paint) in paints.iter().enumerate() {
+                if !paint.visible || !matches!(paint.kind, PaintKind::Solid { .. } | PaintKind::Gradient(_)) {
+                    continue;
+                }
+                let target = PaintTarget { id, fills, index, range };
+                let inherited = range.is_none_or(|(start, _)| n.kind.text().is_some_and(|t| t.style_at(start).fills.is_none()));
+                let style = inherited.then(|| if fills { n.styles.fill.clone() } else { n.styles.stroke.clone() }).flatten();
+                let list = if fills { BoundList::Fills } else { BoundList::Strokes };
+                let variable = inherited
+                    .then(|| {
+                        n.bound.iter().find_map(|(key, var)| {
+                            list_binding(key).filter(|(l, i, field)| *l == list && *i == index && *field == "color").map(|_| var.clone())
+                        })
+                    })
+                    .flatten();
+                let Ok(value) = serde_json::to_string(paint) else { continue };
+                let key = (style.clone(), variable.clone(), value);
+                if let Some(index) = by_paint.get(&key).copied() {
+                    if let Some(g) = groups.get_mut(index) {
+                        g.targets.push(target);
+                    }
+                } else {
+                    by_paint.insert(key, groups.len());
+                    groups.push(SelectionColor { paint: paint.clone(), style, variable, targets: vec![target] });
+                }
+            }
+        };
+        if let NodeKind::Text(t) = &n.kind {
+            let spans = t.spans();
+            if spans.iter().all(|(_, _, style)| style.fills.is_none()) {
+                add(&n.fills, true, None);
+            } else {
+                for (start, end, style) in spans {
+                    add(style.fills.as_deref().unwrap_or(&n.fills), true, Some((start, end)));
+                }
+            }
+        } else {
+            add(&n.fills, true, None);
+        }
+        add(&n.strokes, false, None);
+    }
+    groups
+}
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        spec!(
+            "selection.colors",
+            "Selection colors",
+            "{ids?} → {colors: [{paint, targets}]}; includes descendants and text ranges",
+            false,
+            |s, p| { Ok(json!({"colors": collect(s.doc()?, &targets(s, p))})) }
+        ),
+        spec!("selection.setPaint", "Change selection color", "{targets: [{id, fills, index, range: [start,end] | null}], paint}", true, set_paint),
+        spec!(
+            "selection.applyColorStyle",
+            "Apply selection color style",
+            "{targets, style}; applies the color style to matching fill/stroke lists (text ranges keep typography)",
+            true,
+            apply_style
+        ),
+        spec!(
+            "selection.bindColorVariable",
+            "Apply selection color variable",
+            "{targets, variable (id or name)}; binds the color variable to matching solid fill/stroke slots, replacing a color style there (text ranges with fills of their own take its value in the layer's modes)",
+            true,
+            bind_variable
+        ),
+        spec!(
+            "selection.detachColor",
+            "Detach selection color",
+            "{targets}; unlinks the color style or variable of matching fill/stroke lists, keeping their values",
+            true,
+            detach
+        ),
+        spec!(
+            "selection.selectColor",
+            "Select layers with color",
+            "{targets} → {ids}; selects the layers owning these paint slots",
+            false,
+            select_color
+        ),
+    ]
+}
+
+fn checked_targets(s: &Session, p: &Value, cmd: &str) -> Result<Vec<PaintTarget>> {
+    let ts: Vec<PaintTarget> = parse(cmd, p, "targets")?.ok_or_else(|| bad(cmd, "`targets` is required"))?;
+    if ts.is_empty() {
+        return Err(bad(cmd, "`targets` must not be empty"));
+    }
+    for t in &ts {
+        if t.paint(s.doc()?).is_none() {
+            return Err(bad(cmd, "a selection color target no longer exists"));
+        }
+    }
+    Ok(ts)
+}
+
+fn set_paint(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "selection.setPaint";
+    let targets = checked_targets(s, p, CMD)?;
+    let paint = get(p, "paint").and_then(paint_of).ok_or_else(|| bad(CMD, "`paint` must be a paint"))?;
+    for target in &targets {
+        let mut paints = target.paints(s.doc()?).ok_or_else(|| bad(CMD, "invalid target"))?;
+        let Some(slot) = paints.get_mut(target.index) else { return Err(bad(CMD, "invalid paint index")) };
+        if *slot == paint {
+            continue;
+        }
+        let old = slot.clone();
+        *slot = paint.clone();
+        let n = s.doc_mut()?.get_mut(target.id)?;
+        // Variables detach only where the edit changed their value; range fills override the node's
+        // paints, whose bindings still belong to the other characters.
+        if let Some((start, end)) = target.range {
+            if let NodeKind::Text(t) = &mut n.kind {
+                t.restyle(start, end, |style| style.fills = Some(paints.clone()));
+            }
+            continue;
+        }
+        if target.fills {
+            n.fills = paints;
+            n.styles.fill = None;
+        } else {
+            n.strokes = paints;
+            n.styles.stroke = None;
+        }
+        rebind_edited_paint(n, target.fills, target.index, &old);
+    }
+    Ok(json!({"ok": true}))
+}
+
+fn apply_style(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "selection.applyColorStyle";
+    let targets = checked_targets(s, p, CMD)?;
+    let name = req_string(CMD, p, "style")?;
+    let style = s.doc()?.style(&name).cloned().ok_or_else(|| bad(CMD, "no such color style"))?;
+    if !matches!(style.kind, StyleKind::Paint { .. }) {
+        return Err(bad(CMD, "a color style is required"));
+    }
+    for target in &targets {
+        if let Some((start, end)) = target.range {
+            // Text ranges have typography-style links, not paint-style links. Copy resolved paint
+            // values just as an explicit range fill does; never replace its font or size.
+            let StyleKind::Paint { paints } = crate::style_vars::kind_for(s.doc()?, &style, target.id).into_owned() else { continue };
+            let n = s.doc_mut()?.get_mut(target.id)?;
+            if let NodeKind::Text(t) = &mut n.kind {
+                t.restyle(start, end, |st| st.fills = Some(paints.clone()));
+            }
+        } else {
+            crate::cmd::styles::apply_style_ref(s.doc_mut()?, target.id, if target.fills { "fillStyle" } else { "strokeStyle" }, Some(&style.id))?;
+        }
+    }
+    Ok(json!({"ok": true}))
+}
+
+/// The binding key (`fills/<i>/color` or `strokes/<i>/color`) of the slot a target stands for, when the
+/// target is the node's own list or a text range that shows the node's fills. Returns None for a range
+/// with fills of its own, since those fills hold no link.
+fn list_field(doc: &Document, target: &PaintTarget) -> Option<String> {
+    if let Some((start, _)) = target.range
+        && doc.node(target.id)?.kind.text()?.style_at(start).fills.is_some()
+    {
+        return None;
+    }
+    let list = if target.fills { BoundList::Fills } else { BoundList::Strokes };
+    Some(format!("{}/{}/color", list.prefix(), target.index))
+}
+
+/// Remove every binding key of the slot (`fill` and `fills/0/color` name the same one); true when
+/// one was there.
+fn unbind_slot(n: &mut figcraft_doc::Node, fills: bool, index: usize) -> bool {
+    let list = if fills { BoundList::Fills } else { BoundList::Strokes };
+    let before = n.bound.len();
+    n.bound.retain(|key, _| list_binding(key).is_none_or(|(l, i, field)| !(l == list && i == index && field == "color")));
+    n.bound.len() != before
+}
+
+/// Why `variable` can't be applied to `targets` (`selection.bindColorVariable`), if it can't: a
+/// variable that isn't a color, or a gradient. Scopes don't refuse, as with `variable.bind`; they
+/// only filter what the menu offers ([`in_scope`]).
+pub fn bind_refusal(doc: &Document, targets: &[PaintTarget], variable: &str) -> Option<String> {
+    let Some(var) = doc.variables.get(variable) else { return Some("no such variable".into()) };
+    if var.kind != VariableType::Color {
+        return Some("a color variable is required".into());
+    }
+    for target in targets {
+        if !target.paint(doc).is_some_and(|paint| matches!(paint.kind, PaintKind::Solid { .. })) {
+            return Some("color variables bind to solid paints".into());
+        }
+        let list = if target.fills { BoundList::Fills } else { BoundList::Strokes };
+        let field = format!("{}/{}/color", list.prefix(), target.index);
+        if !crate::cmd::variables::field_takes(doc, target.id, &field, var.kind) {
+            return Some(format!("`{field}` doesn't take a color variable"));
+        }
+    }
+    None
+}
+
+/// Whether `variable`'s scopes cover every slot of `targets` (a variable hidden from pickers has
+/// none), so the Selection colors menu offers it there.
+pub fn in_scope(doc: &Document, targets: &[PaintTarget], variable: &str) -> bool {
+    let Some(var) = doc.variables.get(variable) else { return false };
+    targets.iter().all(|target| {
+        let list = if target.fills { BoundList::Fills } else { BoundList::Strokes };
+        let field = format!("{}/{}/color", list.prefix(), target.index);
+        crate::cmd::variables::field_scope(doc, target.id, &field).is_none_or(|scope| var.in_scope(scope))
+    })
+}
+
+fn bind_variable(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "selection.bindColorVariable";
+    let targets = checked_targets(s, p, CMD)?;
+    let name = req_string(CMD, p, "variable")?;
+    let doc = s.doc()?;
+    if let Some(why) = bind_refusal(doc, &targets, &name) {
+        return Err(bad(CMD, why));
+    }
+    let vid = doc.variables.get(&name).map(|v| v.id.clone()).ok_or_else(|| bad(CMD, "no such variable"))?;
+    for target in &targets {
+        if let Some(field) = list_field(s.doc()?, target) {
+            let n = s.doc_mut()?.get_mut(target.id)?;
+            if target.fills {
+                n.styles.fill = None;
+            } else {
+                n.styles.stroke = None;
+            }
+            if !unbind_slot(n, target.fills, target.index) {
+                rebind_paint_alpha(&mut n.fills, &mut n.strokes, &field, true);
+            }
+            n.bound.insert(field, vid.clone());
+            continue;
+        }
+        // A range's own fills can't hold a binding: they take the value, as a range edit does.
+        let doc = s.doc()?;
+        let Some(VariableValue::Color(color)) = doc.variables.resolve(&vid, &doc.modes_for(target.id)) else { continue };
+        let mut paints = target.paints(doc).ok_or_else(|| bad(CMD, "invalid target"))?;
+        let Some(slot) = paints.get_mut(target.index) else { return Err(bad(CMD, "invalid paint index")) };
+        let own = if slot.color_alpha > 0.0 { (slot.opacity / slot.color_alpha).clamp(0.0, 1.0) } else { 1.0 };
+        slot.kind = PaintKind::Solid { color: color.with_alpha(1.0) };
+        slot.opacity = own * color.a;
+        slot.color_alpha = color.a;
+        let Some((start, end)) = target.range else { continue };
+        if let NodeKind::Text(t) = &mut s.doc_mut()?.get_mut(target.id)?.kind {
+            t.restyle(start, end, |style| style.fills = Some(paints.clone()));
+        }
+    }
+    Ok(json!({"ok": true}))
+}
+
+fn detach(s: &mut Session, p: &Value) -> Result<Value> {
+    let targets = checked_targets(s, p, "selection.detachColor")?;
+    for target in &targets {
+        let Some(field) = list_field(s.doc()?, target) else { continue };
+        let n = s.doc_mut()?.get_mut(target.id)?;
+        if target.fills {
+            n.styles.fill = None;
+        } else {
+            n.styles.stroke = None;
+        }
+        if unbind_slot(n, target.fills, target.index) {
+            rebind_paint_alpha(&mut n.fills, &mut n.strokes, &field, false);
+        }
+    }
+    Ok(json!({"ok": true}))
+}
+
+fn select_color(s: &mut Session, p: &Value) -> Result<Value> {
+    let ts = checked_targets(s, p, "selection.selectColor")?;
+    let ids: Vec<_> = ts.iter().map(|t| t.id).collect::<BTreeSet<_>>().into_iter().collect();
+    crate::cmd::edit::select_and_page(s, ids.clone())?;
+    Ok(json!({"ids": ids}))
+}
diff --git a/crates/engine/src/selection/selection_reorder.rs b/crates/engine/src/selection/selection_reorder.rs
new file mode 100644
index 00000000..d54109c7
--- /dev/null
+++ b/crates/engine/src/selection/selection_reorder.rs
@@ -0,0 +1,106 @@
+//! Geometry for reordering a smart selection. Only regular, non-overlapping rows, columns
+//! and complete top-left-aligned grids have unambiguous insertion slots.
+//! Marking several items and irregular grids are out of scope.
+use figcraft_doc::{Document, NodeId};
+use figcraft_geom::{Point, Rect};
+
+use crate::selection_spacing::selection_spacing;
+
+#[derive(Clone, Debug)]
+pub struct ReorderLayout {
+    /// Visual order, independent of selection order and layer stacking.
+    pub slots: Vec<(NodeId, Rect)>,
+    columns: usize,
+    rows: usize,
+    gap_x: f64,
+    gap_y: f64,
+}
+
+impl ReorderLayout {
+    pub fn new(doc: &Document, ids: &[NodeId]) -> Option<Self> {
+        let layout = selection_spacing(doc, ids);
+        let h = layout.horizontal.as_ref();
+        let v = layout.vertical.as_ref();
+        let gap = |axis: Option<&crate::selection_spacing::Axis>| match axis {
+            Some(a) => a.value.filter(|v| *v >= 0.0),
+            None => Some(0.0),
+        };
+        let (gap_x, gap_y) = (gap(h)?, gap(v)?);
+        let columns = h.map_or(1, |a| a.tracks.len());
+        let rows = v.map_or(1, |a| a.tracks.len());
+        if ids.len() < 2 || columns.checked_mul(rows)? != ids.len() {
+            return None;
+        }
+        let mut cells = std::collections::BTreeMap::new();
+        for id in ids {
+            let col = match h {
+                Some(a) => a.tracks.iter().position(|t| t.ids.contains(id))?,
+                None => 0,
+            };
+            let row = match v {
+                Some(a) => a.tracks.iter().position(|t| t.ids.contains(id))?,
+                None => 0,
+            };
+            let b = doc.world_bounds(*id)?;
+            if columns > 1 && rows > 1 {
+                let x = h?.tracks.get(col)?.bounds.x0;
+                let y = v?.tracks.get(row)?.bounds.y0;
+                if (b.x0 - x).abs() > 0.01 || (b.y0 - y).abs() > 0.01 {
+                    return None;
+                }
+            }
+            if cells.insert((row, col), (*id, b)).is_some() {
+                return None;
+            }
+        }
+        Some(Self { slots: cells.into_values().collect(), columns, rows, gap_x, gap_y })
+    }
+
+    /// Insertion shifts intervening items; swapping exchanges just two entries. Sizes and
+    /// original gaps are retained, so unequal-sized layers reflow instead of overlapping.
+    pub fn positions(&self, source: NodeId, target: NodeId, swap: bool) -> Option<Vec<(NodeId, Point)>> {
+        let from = self.slots.iter().position(|(id, _)| *id == source)?;
+        let to = self.slots.iter().position(|(id, _)| *id == target)?;
+        if from == to {
+            return Some(self.slots.iter().map(|(id, b)| (*id, Point::new(b.x0, b.y0))).collect());
+        }
+        let mut order = self.slots.clone();
+        if swap {
+            order.swap(from, to);
+        } else {
+            let item = order.remove(from);
+            order.insert(to, item);
+        }
+        let mut widths = vec![0.0_f64; self.columns];
+        let mut heights = vec![0.0_f64; self.rows];
+        for (i, (_, b)) in order.iter().enumerate() {
+            let w = widths.get_mut(i % self.columns)?;
+            *w = w.max(b.width());
+            let h = heights.get_mut(i / self.columns)?;
+            *h = h.max(b.height());
+        }
+        let x0 = self.slots.iter().map(|(_, b)| b.x0).fold(f64::INFINITY, f64::min);
+        let y0 = self.slots.iter().map(|(_, b)| b.y0).fold(f64::INFINITY, f64::min);
+        let starts = |sizes: &[f64], mut at: f64, gap: f64| {
+            sizes
+                .iter()
+                .map(|size| {
+                    let start = at;
+                    at += size + gap;
+                    start
+                })
+                .collect::<Vec<_>>()
+        };
+        let xs = starts(&widths, x0, self.gap_x);
+        let ys = starts(&heights, y0, self.gap_y);
+        order
+            .iter()
+            .enumerate()
+            .map(|(i, (id, b))| {
+                let x = if self.columns == 1 { b.x0 } else { *xs.get(i % self.columns)? };
+                let y = if self.rows == 1 { b.y0 } else { *ys.get(i / self.columns)? };
+                Some((*id, Point::new(x, y)))
+            })
+            .collect()
+    }
+}
diff --git a/crates/engine/src/selection/selection_spacing.rs b/crates/engine/src/selection/selection_spacing.rs
new file mode 100644
index 00000000..8592a453
--- /dev/null
+++ b/crates/engine/src/selection/selection_spacing.rs
@@ -0,0 +1,132 @@
+//! Smart-selection spacing in page coordinates. Tracks contain aligned siblings (columns for
+//! horizontal spacing, rows for vertical spacing); moving a track preserves its internal layout.
+use figcraft_doc::{Document, NodeId, NodeKind};
+use figcraft_geom::Rect;
+
+const EPS: f64 = 0.01;
+
+#[derive(Clone, Debug)]
+pub struct Track {
+    pub ids: Vec<NodeId>,
+    pub bounds: Rect,
+    anchor: Rect,
+}
+
+#[derive(Clone, Debug)]
+pub struct Axis {
+    pub tracks: Vec<Track>,
+    pub vertical: bool,
+    /// None means the existing distances are mixed; setting a value makes them uniform.
+    pub value: Option<f64>,
+}
+
+impl Axis {
+    pub fn start(&self, b: Rect) -> f64 {
+        if self.vertical { b.y0 } else { b.x0 }
+    }
+    pub fn end(&self, b: Rect) -> f64 {
+        if self.vertical { b.y1 } else { b.x1 }
+    }
+    pub fn gap(&self, a: &Track, b: &Track) -> f64 {
+        self.start(b.bounds) - self.end(a.bounds)
+    }
+    /// Desired page-space translations, keeping the first track fixed.
+    pub fn offsets(&self, value: f64) -> Vec<(NodeId, f64)> {
+        let mut pos = self.tracks.first().map_or(0.0, |t| self.start(t.bounds));
+        let mut out = Vec::new();
+        for t in &self.tracks {
+            let delta = pos - self.start(t.bounds);
+            out.extend(t.ids.iter().map(|id| (*id, delta)));
+            pos += self.end(t.bounds) - self.start(t.bounds) + value;
+        }
+        out
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct SelectionSpacing {
+    pub horizontal: Option<Axis>,
+    pub vertical: Option<Axis>,
+}
+
+/// Available only for movable, visible siblings outside normal auto-layout flow. Parent/child
+/// selections, instance internals and locked layers must not be moved indirectly by a gap edit.
+pub fn selection_spacing(doc: &Document, ids: &[NodeId]) -> SelectionSpacing {
+    let Some(first) = ids.first().and_then(|id| doc.node(*id)) else { return SelectionSpacing::default() };
+    if ids.len() < 2 || ids.len() > 2000 {
+        return SelectionSpacing::default();
+    }
+    let mut items = Vec::new();
+    for id in ids {
+        let Some(n) = doc.node(*id) else { return SelectionSpacing::default() };
+        if n.parent != first.parent
+            || !n.visible
+            || doc.ancestors(*id).into_iter().any(|a| doc.node(a).is_some_and(|n| !n.visible))
+            || crate::tools::locked_in(doc, *id)
+            || crate::components::inside_instance(doc, *id)
+            || matches!(n.kind, NodeKind::Page { .. })
+            || n.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some() && !n.child_layout.absolute)
+        {
+            return SelectionSpacing::default();
+        }
+        let determinant = n.parent.map(|p| doc.world_transform(p).determinant()).unwrap_or(1.0);
+        if !determinant.is_finite() || determinant.abs() < 1e-12 {
+            return SelectionSpacing::default();
+        }
+        let Some(b) = doc.world_bounds(*id) else { return SelectionSpacing::default() };
+        if ![b.x0, b.y0, b.x1, b.y1].into_iter().all(f64::is_finite) || b.width() <= EPS || b.height() <= EPS {
+            return SelectionSpacing::default();
+        }
+        if !items.iter().any(|(i, _)| i == id) {
+            items.push((*id, b));
+        }
+    }
+    SelectionSpacing { horizontal: axis(&items, false), vertical: axis(&items, true) }
+}
+
+fn axis(items: &[(NodeId, Rect)], vertical: bool) -> Option<Axis> {
+    let edges = |b: Rect| if vertical { (b.y0, b.y1) } else { (b.x0, b.x1) };
+    let mut items = items.to_vec();
+    items.sort_by(|a, b| edges(a.1).0.total_cmp(&edges(b.1).0).then(a.0.cmp(&b.0)));
+    let mut tracks: Vec<Track> = Vec::new();
+    for (id, b) in items {
+        let (lo, hi) = edges(b);
+        let aligned = tracks.iter_mut().find(|t| {
+            let (a, z) = edges(t.anchor);
+            (lo - a).abs() <= EPS || (hi - z).abs() <= EPS || ((lo + hi - a - z) * 0.5).abs() <= EPS
+        });
+        if let Some(t) = aligned {
+            t.ids.push(id);
+            t.bounds = t.bounds.union(b);
+        } else {
+            tracks.push(Track { ids: vec![id], bounds: b, anchor: b });
+        }
+    }
+    if tracks.len() < 2 {
+        return None;
+    }
+    tracks.sort_by(|a, b| edges(a.bounds).0.total_cmp(&edges(b.bounds).0));
+    // Diagonally scattered layers aren't a row/column/grid selection.
+    let cross = |b: Rect| if vertical { (b.x0, b.x1) } else { (b.y0, b.y1) };
+    let low = tracks.iter().map(|t| cross(t.bounds).0).fold(f64::NEG_INFINITY, f64::max);
+    let high = tracks.iter().map(|t| cross(t.bounds).1).fold(f64::INFINITY, f64::min);
+    if high - low <= EPS {
+        return None;
+    }
+    let mut result = Axis { tracks, vertical, value: None };
+    let gaps: Vec<f64> = result.tracks.windows(2).filter_map(|p| p.first().zip(p.get(1)).map(|(a, b)| result.gap(a, b))).collect();
+    result.value = gaps.first().copied().filter(|v| gaps.iter().all(|g| (g - v).abs() <= EPS));
+    Some(result)
+}
+
+/// A spacing gesture never changes selection. Roll it back in its owning document, preserving
+/// a subsequent tab/page/selection change and leaving another document's gesture alone.
+pub fn cancel_gesture(session: &mut crate::Session, uid: u64) {
+    if let Some(ds) = session.docs.iter_mut().find(|d| d.uid == uid)
+        && let Some(it) = ds.interaction.take()
+    {
+        ds.doc = it.doc;
+        ds.revision += 1;
+        ds.clean_selection();
+    }
+}
diff --git a/crates/engine/src/selection_behaviour_tests.rs b/crates/engine/src/selection_behaviour_tests.rs
index b65b7936..02abbfb7 100644
--- a/crates/engine/src/selection_behaviour_tests.rs
+++ b/crates/engine/src/selection_behaviour_tests.rs
@@ -175,6 +175,30 @@ fn double_click_enters_one_level() {
     assert_eq!(s.ds().unwrap().vector_edit.as_ref().map(|v| v.id), Some(k.r), "double-click on a shape edits its points");
 }
 
+#[test]
+fn a_double_click_anywhere_on_the_selected_shape_edits_its_points() {
+    let mut s = Session::new();
+    let r = id(&ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 100, "height": 100})));
+    ex(&mut s, "node.set", json!({"ids": [r], "props": {"fills": []}}));
+    ex(&mut s, "stroke.add", json!({"ids": [r]}));
+    // Selected by its outline; the empty middle is no hit at all (the shape has no fill).
+    click(&mut s, 0.0, 50.0, NONE);
+    assert_eq!(s.selection(), vec![r]);
+    s.pointer(&ev(PointerKind::DoubleClick, 50.0, 50.0, NONE)).unwrap();
+    assert_eq!(s.ds().unwrap().vector_edit.as_ref().map(|v| v.id), Some(r), "a double-click on the shape edits its points");
+}
+
+#[test]
+fn a_double_click_on_an_unselected_shape_edits_it_without_a_selecting_click() {
+    let mut s = Session::new();
+    let r = id(&ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 100, "height": 100})));
+    ex(&mut s, "select.none", json!({}));
+    // The press and release of the click that selects it, and the double-click, came in one frame:
+    // only the double-click reached the tool, with nothing selected.
+    s.pointer(&ev(PointerKind::DoubleClick, 50.0, 50.0, NONE)).unwrap();
+    assert_eq!(s.ds().unwrap().vector_edit.as_ref().map(|v| v.id), Some(r));
+}
+
 #[test]
 fn marquee_selects_what_it_touches() {
     let mut s = Session::new();
@@ -275,3 +299,186 @@ fn locked_layers_selected_in_the_layers_panel_stay_put() {
     ex(&mut s, "object.toggleLock", json!({"ids": [k.g], "locked": true}));
     assert_eq!(handle_at(s.doc().unwrap(), &[k.a], Point::new(60.0, 60.0), 1.0), None);
 }
+
+#[test]
+fn shift_drag_moves_the_selection() {
+    let mut s = Session::new();
+    let k = scene(&mut s);
+    let at = |s: &Session, i: NodeId| s.doc().unwrap().world_bounds(i).unwrap().origin();
+    let home = (Point::new(500.0, 0.0), Point::new(600.0, 0.0));
+    // (selection before, Shift-drag to (from r at 520,20), selection after, where r and empty end up, derivation)
+    let rows: Vec<(Vec<NodeId>, (f64, f64), Vec<NodeId>, (Point, Point), &str)> = vec![
+        (
+            vec![k.r],
+            (560.0, 22.0),
+            vec![k.r],
+            (Point::new(540.0, 0.0), Point::new(600.0, 0.0)),
+            "Shift-drag on the selected layer moves it along one axis and keeps it selected",
+        ),
+        (
+            vec![k.r, k.empty],
+            (560.0, 22.0),
+            vec![k.r, k.empty],
+            (Point::new(540.0, 0.0), Point::new(640.0, 0.0)),
+            "Shift-drag on one of several selected layers moves them all",
+        ),
+        (
+            vec![k.empty],
+            (560.0, 22.0),
+            vec![k.r, k.empty],
+            (Point::new(540.0, 0.0), Point::new(640.0, 0.0)),
+            "Shift-drag on an unselected layer adds it and moves the selection",
+        ),
+        (vec![k.r, k.empty], (521.0, 21.0), vec![k.empty], home, "a Shift-press that wobbles under the drag threshold is a click: the layer leaves"),
+    ];
+    for (before, to, after, end, why) in rows {
+        ex(&mut s, "select.set", json!({"ids": before}));
+        drag(&mut s, (520.0, 20.0), to, SHIFT);
+        assert_eq!(sorted(s.selection()), sorted(after), "{why}");
+        assert_eq!((at(&s, k.r), at(&s, k.empty)), end, "{why}");
+        if end != home {
+            assert!(s.undo().unwrap(), "{why}: one undo step");
+            assert_eq!((at(&s, k.r), at(&s, k.empty)), home, "{why}: undone");
+        }
+    }
+    // Shift let go before the button: still a Shift-click.
+    ex(&mut s, "select.set", json!({"ids": [k.r, k.empty]}));
+    s.pointer(&ev(PointerKind::Down, 520.0, 20.0, SHIFT)).unwrap();
+    s.pointer(&ev(PointerKind::Up, 520.0, 20.0, NONE)).unwrap();
+    assert_eq!(s.selection(), vec![k.empty], "Shift let go before the button still takes the layer out");
+}
+
+#[test]
+fn a_drag_inside_the_selection_box_moves_it_where_nothing_is_hit() {
+    let mut s = Session::new();
+    let k = scene(&mut s);
+    for i in [k.r, k.c] {
+        ex(&mut s, "node.set", json!({"ids": [i], "props": {"fills": [], "strokes": ["#000000"], "strokeWeight": 1}}));
+    }
+    let at = |s: &Session, i: NodeId| s.doc().unwrap().world_bounds(i).unwrap().origin();
+    // (selection before, drag from, selection after, the layers that move by (10, 10), derivation)
+    let rows: Vec<(Vec<NodeId>, (f64, f64), Vec<NodeId>, Vec<NodeId>, &str)> = vec![
+        (vec![k.r], (520.0, 20.0), vec![k.r], vec![k.r], "a selected unfilled shape drags from its inside, not only its stroke"),
+        (vec![k.c], (40.0, 140.0), vec![k.c], vec![k.c], "the same in a top-level frame, whose background is under the inside"),
+        (vec![k.r, k.empty], (570.0, 20.0), vec![k.r, k.empty], vec![k.r, k.empty], "a gap inside a multiple selection's box drags them all"),
+        (vec![], (520.0, 20.0), vec![k.r], vec![], "an unselected unfilled shape is hit on its stroke only: the drag is a marquee, which touches it"),
+    ];
+    for (before, from, after, moved, why) in rows {
+        let home: Vec<Point> = [k.r, k.c, k.empty].iter().map(|i| at(&s, *i)).collect();
+        ex(&mut s, "select.set", json!({"ids": before}));
+        drag(&mut s, from, (from.0 + 10.0, from.1 + 10.0), NONE);
+        assert_eq!(sorted(s.selection()), sorted(after), "{why}");
+        for (i, h) in [k.r, k.c, k.empty].iter().zip(&home) {
+            let d = if moved.contains(i) { 10.0 } else { 0.0 };
+            assert_eq!(at(&s, *i), Point::new(h.x + d, h.y + d), "{why}");
+        }
+        if !moved.is_empty() {
+            assert!(s.undo().unwrap(), "{why}: one undo step");
+        }
+    }
+    // A turned layer's box is turned with it: the corners of its page-aligned bounds are outside.
+    ex(&mut s, "node.set", json!({"ids": [k.r], "props": {"rotation": 45}}));
+    let b = s.doc().unwrap().world_bounds(k.r).unwrap();
+    ex(&mut s, "select.set", json!({"ids": [k.r]}));
+    drag(&mut s, (b.x0 + 2.0, b.y0 + 2.0), (b.x0 + 12.0, b.y0 + 12.0), NONE);
+    assert_eq!(at(&s, k.r), b.origin(), "a press outside a turned layer's box is a marquee: it doesn't move the layer");
+    ex(&mut s, "select.set", json!({"ids": [k.r]}));
+    let c = b.center();
+    drag(&mut s, (c.x, c.y), (c.x + 10.0, c.y + 10.0), NONE);
+    assert_eq!(s.selection(), vec![k.r], "inside the turned box it drags");
+    // Pixel snapping rounds the turned box's origin, so the move is about the pointer's.
+    let d = at(&s, k.r) - b.origin();
+    assert!((d.x - 10.0).abs() < 2.0 && (d.y - 10.0).abs() < 2.0, "it moves with the pointer: {d:?}");
+}
+
+#[test]
+fn a_layer_stacked_below_the_selection_doesnt_take_a_drag_from_inside_it() {
+    // #1370: inside a selected unfilled shape, a filled layer behind it doesn't take the press (the
+    // selection drags); a filled layer above it still does.
+    let mut s = Session::new();
+    let at = |s: &Session, i: NodeId| s.doc().unwrap().world_bounds(i).unwrap().origin();
+    let frame = id(&ex(&mut s, "frame.create", json!({"x": 300, "y": 0, "width": 200, "height": 200})));
+    for (parent, dx, where_) in [(None, 0.0, "on the canvas"), (Some(frame), 300.0, "in a top-level frame")] {
+        // `back` (0,0) filled, `front` (20,20) stroke only, `top` (60,60) filled; each 100×100, so
+        // the presses are well clear of the stroke.
+        let square = |s: &mut Session, x: f64| {
+            let mut p = json!({"x": x, "y": x, "width": 100, "height": 100});
+            if let Some(parent) = parent {
+                p["parent"] = json!(parent);
+            }
+            id(&ex(s, "shape.rectangle", p))
+        };
+        let back = square(&mut s, 0.0);
+        let front = square(&mut s, 20.0);
+        ex(&mut s, "node.set", json!({"ids": [front], "props": {"fills": [], "strokes": ["#000000"], "strokeWeight": 1}}));
+        let top = square(&mut s, 60.0);
+        // (drag from, selection after (the layer that moves by (10, 10)), derivation)
+        let rows = [
+            ((dx + 40.0, 40.0), front, "a filled layer behind the selected shape doesn't take the press: the selection drags"),
+            ((dx + 90.0, 90.0), top, "a filled layer above the selected shape still takes the press"),
+        ];
+        for (from, moved, why) in rows {
+            let home: Vec<Point> = [back, front, top].iter().map(|i| at(&s, *i)).collect();
+            ex(&mut s, "select.set", json!({"ids": [front]}));
+            drag(&mut s, from, (from.0 + 10.0, from.1 + 10.0), NONE);
+            assert_eq!(s.selection(), vec![moved], "{why} ({where_})");
+            for (i, h) in [back, front, top].iter().zip(&home) {
+                let d = if *i == moved { 10.0 } else { 0.0 };
+                assert_eq!(at(&s, *i), Point::new(h.x + d, h.y + d), "{why} ({where_})");
+            }
+            assert!(s.undo().unwrap(), "{why}: one undo step");
+        }
+    }
+    // A filled layer below two selected shapes, in the gap between them (inside the selection's
+    // box but neither shape's), is still hit there.
+    let rect_at = |s: &mut Session, x: f64, w: f64| id(&ex(s, "shape.rectangle", json!({"x": x, "y": 400, "width": w, "height": 100})));
+    let gap = rect_at(&mut s, 720.0, 60.0);
+    let (a, b) = (rect_at(&mut s, 600.0, 100.0), rect_at(&mut s, 800.0, 100.0));
+    ex(&mut s, "node.set", json!({"ids": [a, b], "props": {"fills": [], "strokes": ["#000000"], "strokeWeight": 1}}));
+    ex(&mut s, "select.set", json!({"ids": [a, b]}));
+    let home = at(&s, gap);
+    drag(&mut s, (750.0, 450.0), (760.0, 460.0), NONE);
+    assert_eq!(s.selection(), vec![gap], "a layer in the gap between selected layers takes the press");
+    assert_eq!(at(&s, gap), Point::new(home.x + 10.0, home.y + 10.0));
+}
+
+#[test]
+fn alt_shift_drag_on_a_selected_layer_duplicates_it() {
+    let mut s = Session::new();
+    let k = scene(&mut s);
+    let layers = |s: &Session| s.doc().unwrap().node(s.page().unwrap()).unwrap().children.len();
+    let n = layers(&s);
+    let alt_shift = |kind, x, y| {
+        let mut e = ev(kind, x, y, SHIFT);
+        e.alt = true;
+        e
+    };
+    ex(&mut s, "select.set", json!({"ids": [k.r]}));
+    s.pointer(&alt_shift(PointerKind::Down, 520.0, 20.0)).unwrap();
+    s.pointer(&alt_shift(PointerKind::Up, 520.0, 20.0)).unwrap();
+    assert_eq!(s.selection(), Vec::<NodeId>::new(), "an Alt+Shift-click is a Shift-click: the layer leaves the selection");
+    assert_eq!(layers(&s), n, "and nothing is copied");
+    ex(&mut s, "select.set", json!({"ids": [k.r]}));
+    s.pointer(&alt_shift(PointerKind::Down, 520.0, 20.0)).unwrap();
+    s.pointer(&alt_shift(PointerKind::Move, 560.0, 22.0)).unwrap();
+    s.pointer(&alt_shift(PointerKind::Up, 560.0, 22.0)).unwrap();
+    let sel = s.selection();
+    assert_eq!(layers(&s), n + 1, "an Alt+Shift-drag copies the layer");
+    assert!(sel.len() == 1 && sel[0] != k.r, "the copy is selected");
+    let doc = s.doc().unwrap();
+    assert_eq!(doc.world_bounds(sel[0]).unwrap().origin(), Point::new(540.0, 0.0), "the copy moves along one axis");
+    assert_eq!(doc.world_bounds(k.r).unwrap().origin(), Point::new(500.0, 0.0), "the original stays");
+}
+
+#[test]
+fn shift_click_takes_a_layer_out_where_nothing_can_move() {
+    let mut s = Session::new();
+    let k = scene(&mut s);
+    // A version being viewed is read-only: the press can't start a move.
+    let v = ex(&mut s, "file.saveVersion", json!({"name": "v"}));
+    ex(&mut s, "version.preview", json!({"id": v["id"]}));
+    ex(&mut s, "select.set", json!({"ids": [k.r, k.empty]}));
+    assert!(s.pointer(&ev(PointerKind::Down, 520.0, 20.0, SHIFT)).is_err(), "a version being viewed can't be edited");
+    s.pointer(&ev(PointerKind::Up, 520.0, 20.0, SHIFT)).unwrap();
+    assert_eq!(s.selection(), vec![k.empty], "Shift-click still takes the layer out");
+}
diff --git a/crates/engine/src/selection_reorder_tests.rs b/crates/engine/src/selection_reorder_tests.rs
new file mode 100644
index 00000000..83ae5b31
--- /dev/null
+++ b/crates/engine/src/selection_reorder_tests.rs
@@ -0,0 +1,152 @@
+use crate::{Session, selection_reorder::ReorderLayout};
+use figcraft_doc::NodeId;
+use serde_json::json;
+
+fn rect(s: &mut Session, x: f64, y: f64, w: f64, h: f64, parent: Option<NodeId>) -> NodeId {
+    NodeId(s.execute("shape.rectangle", &json!({"x":x,"y":y,"width":w,"height":h,"parent":parent})).unwrap()["id"].as_u64().unwrap())
+}
+fn xy(s: &Session, id: NodeId) -> (f64, f64) {
+    let b = s.doc().unwrap().world_bounds(id).unwrap();
+    (b.x0, b.y0)
+}
+
+#[test]
+fn insertion_reflows_unequal_sizes_with_original_gaps_and_hierarchy() {
+    for vertical in [false, true] {
+        let mut s = Session::new();
+        let mut ids = vec![];
+        for (at, size) in [(0., 40.), (50., 60.), (120., 20.)] {
+            ids.push(rect(
+                &mut s,
+                if vertical { 0. } else { at },
+                if vertical { at } else { 0. },
+                if vertical { 30. } else { size },
+                if vertical { size } else { 30. },
+                None,
+            ));
+        }
+        let before = s.doc().unwrap().clone();
+        // Explicit selection order must not determine visual order.
+        s.execute("arrange.reorder", &json!({"ids":[ids[2],ids[0],ids[1]],"source":ids[0],"target":ids[2]})).unwrap();
+        for (id, at) in [(ids[1], 0.), (ids[2], 70.), (ids[0], 100.)] {
+            assert_eq!(xy(&s, id), if vertical { (0., at) } else { (at, 0.) });
+            let old = before.node(id).unwrap();
+            let new = s.doc().unwrap().node(id).unwrap();
+            assert_eq!((new.width, new.height, new.parent), (old.width, old.height, old.parent));
+        }
+        assert_eq!(s.doc().unwrap().node(s.ds().unwrap().page).unwrap().children, before.node(s.ds().unwrap().page).unwrap().children);
+        s.undo().unwrap();
+        assert_eq!(s.doc().unwrap(), &before);
+        s.redo().unwrap();
+        assert_eq!(xy(&s, ids[0]), if vertical { (0., 100.) } else { (100., 0.) });
+    }
+}
+
+#[test]
+fn grids_insert_across_rows_and_swap_only_the_two_entries() {
+    let mut s = Session::new();
+    let mut ids = vec![];
+    for row in 0..2 {
+        for col in 0..3 {
+            ids.push(rect(&mut s, col as f64 * 70., row as f64 * 60., 50., 40., None));
+        }
+    }
+    let before = s.doc().unwrap().clone();
+    s.execute("arrange.reorder", &json!({"ids":ids,"source":ids[0],"target":ids[4]})).unwrap();
+    assert_eq!(xy(&s, ids[0]), (70., 60.));
+    assert_eq!(xy(&s, ids[3]), (140., 0.));
+    assert_eq!(xy(&s, ids[5]), (140., 60.));
+    s.undo().unwrap();
+    s.execute("arrange.reorder", &json!({"ids":ids,"source":ids[0],"target":ids[4],"swap":true})).unwrap();
+    assert_eq!(xy(&s, ids[0]), (70., 60.));
+    assert_eq!(xy(&s, ids[4]), (0., 0.));
+    for id in [ids[1], ids[2], ids[3], ids[5]] {
+        assert_eq!(s.doc().unwrap().node(id), before.node(id));
+    }
+}
+
+#[test]
+fn grid_reflow_keeps_gaps_with_different_sizes() {
+    let mut s = Session::new();
+    let a = rect(&mut s, 0., 0., 40., 30., None);
+    let b = rect(&mut s, 50., 0., 60., 30., None);
+    let c = rect(&mut s, 0., 50., 40., 50., None);
+    let d = rect(&mut s, 50., 50., 60., 50., None);
+    s.execute("arrange.reorder", &json!({"ids":[a,b,c,d],"source":a,"target":d})).unwrap();
+    assert_eq!(xy(&s, b), (0., 0.));
+    assert_eq!(xy(&s, c), (70., 0.));
+    assert_eq!(xy(&s, d), (0., 70.));
+    assert_eq!(xy(&s, a), (70., 70.));
+}
+
+#[test]
+fn previews_are_absolute_and_returning_to_start_is_a_noop() {
+    let mut s = Session::new();
+    let ids: Vec<_> = (0..3).map(|i| rect(&mut s, i as f64 * 70., 0., 50., 40., None)).collect();
+    s.execute("select.set", &json!({"ids":ids})).unwrap();
+    let before = s.doc().unwrap().clone();
+    let history = s.undo_depth().0;
+    s.begin_interaction("Reorder selection").unwrap();
+    for target in [ids[2], ids[1], ids[0]] {
+        s.execute("arrange.reorder", &json!({"ids":ids,"source":ids[0],"target":target,"fromGesture":true})).unwrap();
+    }
+    s.commit_interaction().unwrap();
+    assert_eq!(s.doc().unwrap(), &before);
+    assert_eq!(s.undo_depth().0, history);
+    s.begin_interaction("Reorder selection").unwrap();
+    for target in [ids[1], ids[2]] {
+        s.execute("arrange.reorder", &json!({"ids":ids,"source":ids[0],"target":target,"fromGesture":true})).unwrap();
+    }
+    s.commit_interaction().unwrap();
+    assert_eq!(s.undo_depth().0, history + 1);
+    assert_eq!(s.selection(), ids);
+    s.undo().unwrap();
+    assert_eq!(s.doc().unwrap(), &before);
+}
+
+#[test]
+fn invalid_selections_and_targets_do_not_edit_the_document() {
+    let mut s = Session::new();
+    let a = rect(&mut s, 0., 0., 50., 40., None);
+    let b = rect(&mut s, 70., 0., 50., 40., None);
+    let c = rect(&mut s, 160., 0., 50., 40., None);
+    for args in [
+        json!({"ids":[a,b,c],"source":a,"target":b}), // Mixed gaps.
+        json!({"ids":[a,b],"source":c,"target":b}),
+        json!({"ids":[a,b],"source":a,"target":999999}),
+        json!({"ids":[a,a,b],"source":a,"target":b}),
+        json!({"ids":[a,b],"source":[],"target":b}),
+    ] {
+        let before = s.doc().unwrap().clone();
+        assert!(s.execute("arrange.reorder", &args).is_err());
+        assert_eq!(s.doc().unwrap(), &before);
+    }
+    for props in [json!({"locked":true}), json!({"visible":false})] {
+        s.execute("node.set", &json!({"id":b,"props":props})).unwrap();
+        assert!(ReorderLayout::new(s.doc().unwrap(), &[a, b]).is_none());
+        s.execute("node.set", &json!({"id":b,"props":{"locked":false,"visible":true}})).unwrap();
+    }
+    let d = rect(&mut s, 0., 70., 50., 40., None);
+    assert!(ReorderLayout::new(s.doc().unwrap(), &[a, b, d]).is_none(), "an incomplete grid has no slots");
+    let frame =
+        NodeId(s.execute("frame.create", &json!({"width":300,"height":100,"props":{"layout":"horizontal"}})).unwrap()["id"].as_u64().unwrap());
+    let x = rect(&mut s, 0., 0., 50., 40., Some(frame));
+    let y = rect(&mut s, 70., 0., 50., 40., Some(frame));
+    assert!(ReorderLayout::new(s.doc().unwrap(), &[x, y]).is_none());
+    assert!(ReorderLayout::new(s.doc().unwrap(), &[a, x]).is_none());
+}
+
+#[test]
+fn reordering_children_of_a_rotated_parent_uses_page_coordinates() {
+    let mut s = Session::new();
+    let frame = NodeId(
+        s.execute("frame.create", &json!({"x":200,"y":200,"width":300,"height":100,"props":{"rotation":90}})).unwrap()["id"].as_u64().unwrap(),
+    );
+    let a = rect(&mut s, 0., 0., 50., 40., Some(frame));
+    let b = rect(&mut s, 70., 0., 50., 40., Some(frame));
+    let (pa, pb) = (xy(&s, a), xy(&s, b));
+    s.execute("arrange.reorder", &json!({"ids":[a,b],"source":a,"target":b})).unwrap();
+    let (qa, qb) = (xy(&s, a), xy(&s, b));
+    assert!((qa.0 - pb.0).abs() < 1e-7 && (qa.1 - pb.1).abs() < 1e-7);
+    assert!((qb.0 - pa.0).abs() < 1e-7 && (qb.1 - pa.1).abs() < 1e-7);
+}
diff --git a/crates/engine/src/selection_spacing_tests.rs b/crates/engine/src/selection_spacing_tests.rs
new file mode 100644
index 00000000..ac36f3c3
--- /dev/null
+++ b/crates/engine/src/selection_spacing_tests.rs
@@ -0,0 +1,123 @@
+use crate::{Session, selection_spacing::selection_spacing};
+use figcraft_doc::NodeId;
+use serde_json::json;
+
+fn rect(s: &mut Session, x: f64, y: f64, w: f64, h: f64, parent: Option<NodeId>) -> NodeId {
+    NodeId(s.execute("shape.rectangle", &json!({"x":x,"y":y,"width":w,"height":h,"parent":parent})).unwrap()["id"].as_u64().unwrap())
+}
+fn xy(s: &Session, id: NodeId) -> (f64, f64) {
+    let b = s.doc().unwrap().world_bounds(id).unwrap();
+    (b.x0, b.y0)
+}
+
+#[test]
+fn rows_columns_and_grids_keep_track_contents_and_sizes() {
+    let mut s = Session::new();
+    // Unequal widths, left-aligned columns. The column widths are 50 and 80; gaps 30 and 20.
+    let a = rect(&mut s, 100., 100., 50., 40., None);
+    let b = rect(&mut s, 180., 100., 80., 40., None);
+    let c = rect(&mut s, 100., 160., 30., 60., None);
+    let d = rect(&mut s, 180., 160., 40., 60., None);
+    let ids = [a, b, c, d];
+    let layout = selection_spacing(s.doc().unwrap(), &ids);
+    assert_eq!(layout.horizontal.unwrap().value, Some(30.));
+    assert_eq!(layout.vertical.unwrap().value, Some(20.));
+    s.execute("arrange.spacing", &json!({"ids":ids,"horizontal":12,"vertical":25})).unwrap();
+    assert_eq!(xy(&s, a), (100., 100.));
+    assert_eq!(xy(&s, b), (162., 100.));
+    assert_eq!(xy(&s, c), (100., 165.));
+    assert_eq!(xy(&s, d), (162., 165.));
+
+    assert_eq!(s.doc().unwrap().node(d).unwrap().width, 40.);
+    s.undo().unwrap();
+    assert_eq!(xy(&s, d), (180., 160.));
+    s.redo().unwrap();
+    assert_eq!(xy(&s, d), (162., 165.));
+    s.begin_interaction("Spacing").unwrap();
+    s.execute("arrange.spacing", &json!({"ids":ids,"horizontal":22,"fromGesture":true})).unwrap();
+    s.execute("arrange.spacing", &json!({"ids":ids,"vertical":35,"fromGesture":true})).unwrap();
+    assert_eq!(xy(&s, d), (172., 175.), "the unrequested axis keeps the earlier edit");
+    s.commit_interaction().unwrap();
+}
+
+#[test]
+fn mixed_gaps_normalize_and_fractional_negative_gaps_are_supported() {
+    let mut s = Session::new();
+    let a = rect(&mut s, 0., 0., 50., 40., None);
+    let b = rect(&mut s, 70., 0., 50., 40., None);
+    let c = rect(&mut s, 160., 0., 50., 40., None);
+    assert_eq!(selection_spacing(s.doc().unwrap(), &[a, b, c]).horizontal.unwrap().value, None);
+    s.execute("arrange.spacing", &json!({"ids":[a,b,c],"horizontal":-5.5})).unwrap();
+    assert_eq!(xy(&s, b), (44.5, 0.));
+    assert_eq!(xy(&s, c), (89., 0.));
+    assert_eq!(selection_spacing(s.doc().unwrap(), &[a, b, c]).horizontal.unwrap().value, Some(-5.5));
+}
+
+#[test]
+fn a_scrub_uses_the_original_tracks_after_crossing_and_makes_one_undo_step() {
+    let mut s = Session::new();
+    let a = rect(&mut s, 0., 0., 50., 40., None);
+    let b = rect(&mut s, 70., 0., 50., 40., None);
+    let c = rect(&mut s, 140., 0., 50., 40., None);
+    let before = s.undo_depth().0;
+    s.begin_interaction("Spacing").unwrap();
+    for v in [-100., 0., 30.] {
+        s.execute("arrange.spacing", &json!({"ids":[a,b,c],"horizontal":v,"fromGesture":true})).unwrap();
+    }
+    assert_eq!(xy(&s, b), (80., 0.));
+    assert_eq!(xy(&s, c), (160., 0.));
+    s.commit_interaction().unwrap();
+    assert_eq!(s.undo_depth().0, before + 1);
+    s.undo().unwrap();
+    assert_eq!(xy(&s, c), (140., 0.));
+}
+
+#[test]
+fn unsafe_selections_and_invalid_axes_are_rejected_without_changes() {
+    let mut s = Session::new();
+    let a = rect(&mut s, 0., 0., 50., 40., None);
+    let b = rect(&mut s, 70., 0., 50., 40., None);
+    for props in [json!({"locked":true}), json!({"visible":false})] {
+        s.execute("node.set", &json!({"id":b,"props":props})).unwrap();
+        assert!(s.execute("arrange.spacing", &json!({"ids":[a,b],"horizontal":5})).is_err());
+        s.execute("node.set", &json!({"id":b,"props":{"locked":false,"visible":true}})).unwrap();
+    }
+    for args in [
+        json!({"ids":[a,b],"vertical":5}),
+        json!({"ids":[a,b],"horizontal":5,"vertical":5}),
+        json!({"ids":[a,b],"horizontal":"bad"}),
+        json!({"ids":[a,b],"horizontal":1e300}),
+    ] {
+        assert!(s.execute("arrange.spacing", &args).is_err());
+        assert_eq!(xy(&s, b), (70., 0.));
+    }
+    let f = NodeId(
+        s.execute("frame.create", &json!({"x":0,"y":0,"width":300,"height":100,"props":{"layout":"horizontal"}})).unwrap()["id"].as_u64().unwrap(),
+    );
+    let x = rect(&mut s, 0., 0., 50., 40., Some(f));
+    let y = rect(&mut s, 70., 0., 50., 40., Some(f));
+    assert!(selection_spacing(s.doc().unwrap(), &[x, y]).horizontal.is_none());
+    assert!(selection_spacing(s.doc().unwrap(), &[a, x]).horizontal.is_none());
+}
+
+#[test]
+fn rotated_parents_use_page_space_and_cancellation_stays_with_its_document() {
+    let mut s = Session::new();
+    let f = NodeId(
+        s.execute("frame.create", &json!({"x":100,"y":100,"width":300,"height":200,"props":{"rotation":90}})).unwrap()["id"].as_u64().unwrap(),
+    );
+    let a = rect(&mut s, 0., 0., 50., 40., Some(f));
+    let b = rect(&mut s, 70., 0., 50., 40., Some(f));
+    let before = xy(&s, b);
+    let uid = s.ds().unwrap().uid;
+    s.begin_interaction("Spacing").unwrap();
+    s.execute("arrange.spacing", &json!({"ids":[a,b],"vertical":40,"fromGesture":true})).unwrap();
+    assert!(((xy(&s, b).1 - xy(&s, a).1).abs() - 90.0).abs() < 1e-7, "50-high rotated rectangles must have a 40-point gap");
+    s.execute("file.new", &json!({})).unwrap();
+    s.begin_interaction("Unrelated").unwrap();
+    crate::selection_spacing::cancel_gesture(&mut s, uid);
+    assert!(s.ds().unwrap().interaction.is_some());
+    s.active = 0;
+    assert_eq!(xy(&s, b), before);
+    assert!(s.ds().unwrap().interaction.is_none());
+}
diff --git a/crates/engine/src/session.rs b/crates/engine/src/session.rs
new file mode 100644
index 00000000..acafd229
--- /dev/null
+++ b/crates/engine/src/session.rs
@@ -0,0 +1,10 @@
+use super::derived::normalize;
+use super::doc_state::{DocState, ENDS_PREVIEW, HistoryEntry, Interaction, PREVIEW_READ_ONLY};
+use super::error::{EngineError, Result, bad};
+use super::prefs::{Clipboard, Prefs, UiRequest};
+use super::*;
+
+mod access;
+mod exec;
+mod new;
+mod undo;
diff --git a/crates/engine/src/session/access.rs b/crates/engine/src/session/access.rs
new file mode 100644
index 00000000..af9fd7f5
--- /dev/null
+++ b/crates/engine/src/session/access.rs
@@ -0,0 +1,54 @@
+use super::*;
+
+impl Session {
+    pub fn ds(&self) -> Result<&DocState> {
+        self.docs.get(self.active).ok_or(EngineError::NoDocument)
+    }
+
+    pub fn ds_mut(&mut self) -> Result<&mut DocState> {
+        self.docs.get_mut(self.active).ok_or(EngineError::NoDocument)
+    }
+
+    pub fn doc(&self) -> Result<&Document> {
+        Ok(self.ds()?.doc.as_ref())
+    }
+
+    pub fn doc_mut(&mut self) -> Result<&mut Document> {
+        Ok(self.ds_mut()?.doc_mut())
+    }
+
+    pub fn selection(&self) -> Vec<NodeId> {
+        self.ds().map(|d| d.selection.clone()).unwrap_or_default()
+    }
+
+    pub fn set_selection(&mut self, ids: Vec<NodeId>) {
+        if let Ok(ds) = self.ds_mut() {
+            ds.selection = ids;
+            ds.clean_selection();
+            ds.revision += 1;
+        }
+    }
+
+    pub fn page(&self) -> Result<NodeId> {
+        Ok(self.ds()?.page)
+    }
+
+    /// A summary for status displays.
+    pub fn status(&self) -> Value {
+        match self.ds() {
+            Ok(ds) => json!({
+                "document": ds.doc.name,
+                "path": ds.path,
+                "dirty": ds.is_dirty(),
+                "page": ds.page,
+                "selection": ds.selection,
+                "tool": self.tool.tool.id(),
+                "zoom": ds.view.zoom,
+                "undo": self.undo_depth().0,
+                "redo": self.undo_depth().1,
+                "documents": self.docs.len(),
+            }),
+            Err(_) => json!({"documents": 0}),
+        }
+    }
+}
diff --git a/crates/engine/src/session/exec.rs b/crates/engine/src/session/exec.rs
new file mode 100644
index 00000000..add12ac5
--- /dev/null
+++ b/crates/engine/src/session/exec.rs
@@ -0,0 +1,175 @@
+use super::*;
+
+/// Whether a command, or a batch wrapping one, imports a file passed as Base64 `data`.
+fn command_carries_import_bytes(id: &str, params: &Value) -> bool {
+    match id {
+        "file.import" => params::get(params, "data").is_some(),
+        "command.batch" => params.get("commands").and_then(Value::as_array).is_some_and(|commands| {
+            commands.iter().any(|c| {
+                c.get("command").and_then(Value::as_str).zip(c.get("params")).is_some_and(|(id, params)| command_carries_import_bytes(id, params))
+            })
+        }),
+        _ => false,
+    }
+}
+
+impl Session {
+    /// Run a command by id. Mutations become one undo step; a failure or panic leaves the document
+    /// as it was.
+    pub fn execute(&mut self, id: &str, params: &Value) -> Result<Value> {
+        let spec = find_command(id).ok_or_else(|| EngineError::UnknownCommand(id.to_string()))?;
+        board::refuse_on_board(self, id)?;
+        // Revert replaces the document's uid: refuse before ending previews or syncing branches.
+        if id == "file.revert" && self.live().doc_uid.is_some() {
+            return Err(EngineError::Disabled(id.into(), "leave the live session before reverting to the saved file".into()));
+        }
+        branches::sync(self);
+        self.apply_view_prefs();
+        if textpreview::COMMANDS.contains(&id) {
+            // A live preview is no edit: no undo step, normalisation or rollback here.
+            let r = guard::run(id, || (spec.run)(self, params));
+            if r.is_err() {
+                textpreview::end(self);
+            }
+            return r;
+        }
+        // Every other command acts on the document itself, not on a live text preview.
+        textpreview::end(self);
+        if ENDS_PREVIEW.contains(&id)
+            && (!matches!(id, "file.save" | "file.saveAs") || cmd::file::save_ends_preview(self, id, params))
+            && let Ok(ds) = self.ds_mut()
+        {
+            ds.end_preview();
+        }
+        let before = self.ds().ok().map(|d| (d.doc.clone(), d.selection.clone(), d.page, d.uid));
+        // Cut and copy write the clipboard before a later check can refuse the command.
+        let clipboard_before = self.clipboard.clone();
+        let result = guard::run(id, || (spec.run)(self, params))
+            .and_then(|v| self.check_instance_structure(id, &before).map(|()| v))
+            .and_then(|v| self.check_preview(id, &before).map(|()| v))
+            .and_then(|v| self.check_live_access(id, &before).map(|()| v))
+            .and_then(|v| self.check_finite_geometry(id, &before).map(|()| v));
+        match &result {
+            Ok(_) => {
+                self.after_command(spec, before);
+                self.apply_view_prefs();
+                if spec.history && id != "edit.repeat" {
+                    self.last_command = Some((id.to_string(), params.clone()));
+                }
+                // Imported bytes already live in the document: a Base64 copy in the log would stay
+                // for the whole session.
+                if !command_carries_import_bytes(id, params) {
+                    self.journal.push((id.to_string(), params.clone()));
+                    if self.journal.len() > 5000 {
+                        self.journal.drain(..1000);
+                    }
+                }
+            }
+            Err(_) => {
+                // Roll back any partial edit — also during an interaction, where `before` is the
+                // interaction's last valid preview: restore it and leave the gesture itself (its
+                // own snapshot) alone.
+                if let Some((doc, sel, page, uid)) = before
+                    && let Some(ds) = self.docs.iter_mut().find(|d| d.uid == uid)
+                {
+                    ds.doc = doc;
+                    ds.selection = sel;
+                    ds.page = page;
+                }
+                self.clipboard = clipboard_before;
+            }
+        }
+        result
+    }
+
+    /// A version shown in place of the document is read-only: refuse an edit (it is rolled back).
+    fn check_preview(&self, id: &str, before: &Option<(Arc<Document>, Vec<NodeId>, NodeId, u64)>) -> Result<()> {
+        let Some((bdoc, _, _, uid)) = before else { return Ok(()) };
+        let Some(ds) = self.docs.iter().find(|d| d.uid == *uid) else { return Ok(()) };
+        if ds.preview.is_none() || Arc::ptr_eq(&ds.doc, bdoc) || id == "version.preview" {
+            return Ok(());
+        }
+        Err(EngineError::Disabled(id.to_string(), PREVIEW_READ_ONLY.into()))
+    }
+
+    /// A layer's position and size stay finite: infinity and NaN are written as `null`, so a file
+    /// holding them saves but can't be reopened. Refuse such an edit (it is rolled back).
+    fn check_finite_geometry(&self, id: &str, before: &Option<(Arc<Document>, Vec<NodeId>, NodeId, u64)>) -> Result<()> {
+        let Some((bdoc, _, _, uid)) = before else { return Ok(()) };
+        let Some(ds) = self.docs.iter().find(|d| d.uid == *uid) else { return Ok(()) };
+        if Arc::ptr_eq(&ds.doc, bdoc) {
+            return Ok(());
+        }
+        let broken = |n: &Node| !(n.transform.as_coeffs().iter().all(|c| c.is_finite()) && n.width.is_finite() && n.height.is_finite());
+        let untouched = |n: &Node| bdoc.node_arc(n.id).zip(ds.doc.node_arc(n.id)).is_some_and(|(a, b)| Arc::ptr_eq(a, b));
+        match ds.doc.nodes().find(|n| broken(n) && !untouched(n)) {
+            Some(n) => Err(bad(id, format!("\"{}\" would get a position or size beyond the number range", n.name))),
+            None => Ok(()),
+        }
+    }
+
+    /// A live session's document you may only view (or that is on its way to a server) is
+    /// read-only: refuse an edit (it is rolled back).
+    fn check_live_access(&self, id: &str, before: &Option<(Arc<Document>, Vec<NodeId>, NodeId, u64)>) -> Result<()> {
+        let Some((bdoc, _, _, uid)) = before else { return Ok(()) };
+        let Some(ds) = self.docs.iter().find(|d| d.uid == *uid) else { return Ok(()) };
+        match self.live_read_only(*uid) {
+            Some(why) if !Arc::ptr_eq(&ds.doc, bdoc) => Err(EngineError::Disabled(id.to_string(), why.into())),
+            _ => Ok(()),
+        }
+    }
+
+    /// Instances can't gain, lose or reorder layers, nor move, resize or re-constrain the layers in
+    /// them, and library copies are read-only: refuse such an edit (it is rolled back).
+    pub(crate) fn check_instance_structure(&self, id: &str, before: &Option<(Arc<Document>, Vec<NodeId>, NodeId, u64)>) -> Result<()> {
+        let Some((bdoc, _, _, uid)) = before else { return Ok(()) };
+        let Some(ds) = self.docs.iter().find(|d| d.uid == *uid) else { return Ok(()) };
+        if Arc::ptr_eq(&ds.doc, bdoc) {
+            return Ok(());
+        }
+        // "Repeat" runs the repeated command.
+        let effective = match (&self.last_command, id) {
+            (Some((last, _)), "edit.repeat") => last.as_str(),
+            _ => id,
+        };
+        library::check_read_only(effective, bdoc, &ds.doc)
+            .and_then(|()| components::check_structure_edit(bdoc, &ds.doc))
+            .and_then(|()| components::check_override_edit(bdoc, &ds.doc))
+            .map_err(|m| EngineError::Disabled(id.to_string(), m))
+    }
+
+    /// Bookkeeping after a successful command: normalise what changed, push undo, bump revision.
+    fn after_command(&mut self, spec: &CommandSpec, before: Option<(Arc<Document>, Vec<NodeId>, NodeId, u64)>) {
+        let Some((bdoc, bsel, bpage, uid)) = before else {
+            if let Ok(ds) = self.ds_mut() {
+                ds.revision += 1;
+            }
+            return;
+        };
+        let Some(ds) = self.docs.iter_mut().find(|d| d.uid == uid) else { return };
+        let changed = !Arc::ptr_eq(&ds.doc, &bdoc);
+        // Saving may adopt the chosen filename as the document title. The encoded snapshot is
+        // already final; normalising it again would detach it from the saved baseline.
+        if changed && !matches!(spec.id, "file.save" | "file.saveAs") {
+            normalize(ds.doc_mut(), &bdoc);
+        }
+        let edit = changed && ds.interaction.is_none();
+        ds.clean_selection();
+        ds.revision += 1;
+        if edit {
+            self.record(uid, spec.history.then_some(spec.label), bdoc, bsel, bpage);
+        }
+    }
+
+    /// Record an edit of document `uid` (it was `before`, shown with `selection` on `page`) as one
+    /// undo step called `label` (`None`: not undoable). On a live session's document the edit is
+    /// synced and the step is the user's own ([`live`]); otherwise it is a snapshot of `before`.
+    pub(crate) fn record(&mut self, uid: u64, label: Option<&str>, before: Arc<Document>, selection: Vec<NodeId>, page: NodeId) {
+        if self.live_doc(uid) {
+            return self.live_edit(uid, label);
+        }
+        if let (Some(label), Some(ds)) = (label, self.docs.iter_mut().find(|d| d.uid == uid)) {
+            ds.push_undo(label, before, selection, page);
+        }
+    }
+}
diff --git a/crates/engine/src/session/new.rs b/crates/engine/src/session/new.rs
new file mode 100644
index 00000000..8790c83b
--- /dev/null
+++ b/crates/engine/src/session/new.rs
@@ -0,0 +1,84 @@
+use super::*;
+
+impl Session {
+    /// A session with one new document.
+    pub fn new() -> Self {
+        let mut s = Self::empty();
+        s.docs.push(DocState::new(Document::new("Untitled"), None));
+        s
+    }
+
+    /// A session with no documents (the home screen).
+    pub fn empty() -> Self {
+        Self {
+            docs: Vec::new(),
+            active: 0,
+            clipboard: Clipboard::default(),
+            prefs: Prefs::default(),
+            tool: tools::ToolState::default(),
+            ui_requests: Vec::new(),
+            ui_dark: None,
+            journal: Vec::new(),
+            group_depth: 0,
+            closed_in_group: Vec::new(),
+            recent_colors: Vec::new(),
+            last_command: None,
+            message: None,
+            libraries: library::Cache::default(),
+            plugins: plugins::Runtime::default(),
+            live: live::Lives::default(),
+            background: background::Background::default(),
+        }
+    }
+
+    /// The background a new file's page gets: the dark page colour while the interface is dark.
+    pub fn new_page_background(&self) -> figcraft_color::Color {
+        if self.ui_dark == Some(true) { figcraft_color::Color::DARK_PAGE } else { figcraft_color::Color::DEFAULT_PAGE }
+    }
+
+    /// Tell the engine the interface's theme (the UI does, every frame). The first time, a new
+    /// file nothing was done to yet (the one the app opened with, made before the theme was
+    /// known) takes the theme's page colour; later changes of theme leave existing pages alone.
+    pub fn set_ui_dark(&mut self, dark: bool) {
+        if self.ui_dark.replace(dark).is_some() || !dark {
+            return;
+        }
+        for ds in &mut self.docs {
+            let untouched = ds.path.is_none() && ds.history.undo.is_empty() && ds.history.redo.is_empty() && !ds.is_dirty() && ds.versions.is_empty();
+            let pages = ds.doc.pages.clone();
+            let blank = pages.iter().all(|p| {
+                ds.doc.node(*p).is_some_and(|n| {
+                    n.children.is_empty()
+                        && matches!(n.kind, figcraft_doc::NodeKind::Page { background, .. } if background == figcraft_color::Color::DEFAULT_PAGE)
+                })
+            });
+            if !(untouched && blank) {
+                continue;
+            }
+            let mut doc = (*ds.doc).clone();
+            for p in pages {
+                if let Some(figcraft_doc::NodeKind::Page { background, .. }) = doc.node_mut(p).map(|n| &mut n.kind) {
+                    *background = figcraft_color::Color::DARK_PAGE;
+                }
+            }
+            // Still a file without changes.
+            ds.doc = Arc::new(doc);
+            ds.saved_doc = ds.doc.clone();
+            ds.revision += 1;
+        }
+    }
+
+    pub fn with_document(doc: Document) -> Self {
+        let mut s = Self::empty();
+        s.docs.push(DocState::new(doc, None));
+        s
+    }
+
+    /// Files new to the session start with the View toggles the preferences keep.
+    pub fn apply_view_prefs(&mut self) {
+        for ds in self.docs.iter_mut().filter(|d| !d.view_from_prefs) {
+            cmd::view::apply_kept(&self.prefs, &mut ds.view);
+            ds.view_from_prefs = true;
+        }
+    }
+}
diff --git a/crates/engine/src/session/undo.rs b/crates/engine/src/session/undo.rs
new file mode 100644
index 00000000..a354ea27
--- /dev/null
+++ b/crates/engine/src/session/undo.rs
@@ -0,0 +1,275 @@
+use super::*;
+
+impl Session {
+    /// How many undo and redo steps the active document has (the user's own in a live session).
+    pub fn undo_depth(&self) -> (usize, usize) {
+        match self.ds() {
+            Ok(ds) if self.live_doc(ds.uid) => self.live().client().map_or((0, 0), figcraft_collab::Client::history_len),
+            Ok(ds) => (ds.history.undo.len(), ds.history.redo.len()),
+            Err(_) => (0, 0),
+        }
+    }
+
+    /// The labels of the active document's last `n` undo steps, the next one first.
+    pub fn undo_labels(&self, n: usize) -> Vec<String> {
+        match self.ds() {
+            Ok(ds) if self.live_doc(ds.uid) => {
+                self.live().client().map(|c| c.undo_labels().rev().take(n).map(str::to_string).collect()).unwrap_or_default()
+            }
+            Ok(ds) => ds.history.undo.iter().rev().take(n).map(|h| h.label.clone()).collect(),
+            Err(_) => Vec::new(),
+        }
+    }
+
+    /// Start a gesture: later [`preview`](Self::preview) calls re-apply edits to this snapshot.
+    pub fn begin_interaction(&mut self, label: &str) -> Result<()> {
+        textpreview::end(self);
+        if let Some(why) = self.active_read_only() {
+            return Err(EngineError::Disabled(label.to_string(), why.into()));
+        }
+        let ds = self.ds_mut()?;
+        if ds.preview.is_some() {
+            return Err(EngineError::Disabled(label.to_string(), PREVIEW_READ_ONLY.into()));
+        }
+        if ds.interaction.is_none() {
+            ds.interaction = Some(Interaction { label: label.to_string(), doc: ds.doc.clone(), selection: ds.selection.clone() });
+        }
+        Ok(())
+    }
+
+    /// Replace the document with `f(snapshot)` for a live preview during a gesture.
+    pub fn preview(&mut self, f: impl FnOnce(&mut Document, &mut Vec<NodeId>) -> Result<()>) -> Result<()> {
+        let ds = self.ds_mut()?;
+        let Some(it) = ds.interaction.clone() else { return Err(EngineError::Other("no gesture in progress".into())) };
+        let mut doc = (*it.doc).clone();
+        let mut sel = it.selection.clone();
+        // What the gesture changes on the selected layers is an explicit edit.
+        let before = cmd::styles::bound_before(&doc, &it.selection);
+        let res = f(&mut doc, &mut sel);
+        if res.is_ok() {
+            cmd::styles::detach_edited(&mut doc, &before);
+            normalize(&mut doc, &it.doc);
+            // The same preview again (a handle held still) keeps the document: a new one would
+            // re-render the canvas for nothing.
+            if doc == *ds.doc && sel == ds.selection {
+                return res;
+            }
+            ds.doc = Arc::new(doc);
+            ds.selection = sel;
+            ds.clean_selection();
+            ds.revision += 1;
+        }
+        res
+    }
+
+    /// Finish a gesture as one undo step (no step if nothing changed).
+    pub fn commit_interaction(&mut self) -> Result<()> {
+        let ds = self.ds_mut()?;
+        let Some(it) = ds.interaction.take() else { return Ok(()) };
+        let (uid, page) = (ds.uid, ds.page);
+        ds.revision += 1;
+        if !Arc::ptr_eq(&it.doc, &ds.doc) && *it.doc != *ds.doc {
+            self.record(uid, Some(&it.label), it.doc, it.selection, page);
+        } else {
+            ds.doc = it.doc;
+        }
+        Ok(())
+    }
+
+    /// Abandon a gesture, restoring the document.
+    pub fn cancel_interaction(&mut self) -> Result<()> {
+        let ds = self.ds_mut()?;
+        if let Some(it) = ds.interaction.take() {
+            ds.doc = it.doc;
+            ds.selection = it.selection;
+            ds.revision += 1;
+        }
+        Ok(())
+    }
+
+    pub fn undo(&mut self) -> Result<bool> {
+        textpreview::end(self);
+        let live = self.ds().is_ok_and(|d| self.live_doc(d.uid));
+        let ds = self.ds_mut()?;
+        if ds.preview.is_some() {
+            return Err(EngineError::Disabled("edit.undo".into(), PREVIEW_READ_ONLY.into()));
+        }
+        if let Some(it) = ds.interaction.take()
+            && live
+        {
+            // The gesture in progress is dropped (it was never synced).
+            ds.doc = it.doc;
+        }
+        ds.text_edit = None;
+        if live {
+            return Ok(self.live_travel(true));
+        }
+        let Some(e) = ds.history.undo.pop() else { return Ok(false) };
+        let redo = HistoryEntry { label: e.label.clone(), doc: ds.doc.clone(), selection: ds.selection.clone(), page: ds.page };
+        ds.doc = e.doc;
+        cmd::facilitate::keep(&redo.doc, &mut ds.doc);
+        ds.history.redo.push(redo);
+        ds.selection = e.selection;
+        if ds.doc.pages.contains(&e.page) {
+            ds.page = e.page;
+        }
+        ds.clean_selection();
+        ds.revision += 1;
+        let (uid, doc) = (ds.uid, ds.doc.clone());
+        if self.clipboard.source_doc == uid {
+            self.clipboard.copied_components.retain(|id| {
+                doc.node(*id)
+                    .is_some_and(|n| matches!(n.kind, figcraft_doc::NodeKind::Component { .. } | figcraft_doc::NodeKind::ComponentSet { .. }))
+            });
+        }
+        Ok(true)
+    }
+
+    pub fn redo(&mut self) -> Result<bool> {
+        textpreview::end(self);
+        let live = self.ds().is_ok_and(|d| self.live_doc(d.uid));
+        let ds = self.ds_mut()?;
+        if ds.preview.is_some() {
+            return Err(EngineError::Disabled("edit.redo".into(), PREVIEW_READ_ONLY.into()));
+        }
+        if let Some(it) = ds.interaction.take()
+            && live
+        {
+            ds.doc = it.doc;
+        }
+        ds.text_edit = None;
+        if live {
+            return Ok(self.live_travel(false));
+        }
+        let Some(e) = ds.history.redo.pop() else { return Ok(false) };
+        let undo = HistoryEntry { label: e.label.clone(), doc: ds.doc.clone(), selection: ds.selection.clone(), page: ds.page };
+        ds.doc = e.doc;
+        cmd::facilitate::keep(&undo.doc, &mut ds.doc);
+        ds.history.undo.push(undo);
+        ds.selection = e.selection;
+        if ds.doc.pages.contains(&e.page) {
+            ds.page = e.page;
+        }
+        ds.clean_selection();
+        ds.revision += 1;
+        Ok(true)
+    }
+
+    /// Queue a UI request (dialogs etc.).
+    pub fn request_ui(&mut self, kind: &str, data: Value) {
+        self.ui_requests.push(UiRequest { kind: kind.to_string(), data });
+    }
+
+    /// Run several commands as one undo step. A param value `{"$step": n}` is replaced by the `id`
+    /// in the result of the earlier step `n`, and `{"$ref": "name"}` by the `id` in the result of
+    /// the earlier step whose `as` is `name`; either takes a `field`, a key or slash path (`ids/0`)
+    /// into that result. So a step can target a layer that an earlier step of the same batch
+    /// created. Any object with a `$step` or `$ref` key in a step's params is such a reference,
+    /// except inside a nested `command.batch` step: its references are to its own steps.
+    pub fn batch(&mut self, label: &str, steps: &[BatchStep]) -> Result<Vec<Value>> {
+        let mut scope = BatchScope::new(steps)?;
+        self.grouped(label, |s| {
+            for step in steps {
+                s.batch_step(&mut scope, &step.command, &step.params)?;
+            }
+            Ok(scope.into_results())
+        })
+    }
+
+    /// The next step of a batch: the references in `params` resolve against `scope` (the steps
+    /// before it), the command runs and its result joins `scope`. [`Session::batch`] runs a list
+    /// of these as one undo step; a caller with its own list — the CLI's script runner — uses this
+    /// so its steps resolve references the same way, inside its own [`Session::grouped`].
+    pub fn batch_step(&mut self, scope: &mut BatchScope, cmd: &str, params: &Value) -> Result<()> {
+        let p = if cmd == "command.batch" { params.clone() } else { scope.resolve(params)? };
+        // Say which step failed; a nested batch names its own steps.
+        let v = self.execute(cmd, &p).map_err(|e| if cmd == "command.batch" { e } else { e.at_step(scope.next_step()) })?;
+        scope.push(v);
+        Ok(())
+    }
+
+    /// Take the tabs `pred` matches out of `docs`; inside a group they are kept so that a failed
+    /// group can reopen them.
+    pub(crate) fn remove_tabs(&mut self, mut pred: impl FnMut(&DocState) -> bool) {
+        let (gone, keep): (Vec<_>, Vec<_>) = std::mem::take(&mut self.docs).into_iter().partition(|d| pred(d));
+        self.docs = keep;
+        if self.group_depth > 0 {
+            self.closed_in_group.extend(gone);
+        }
+    }
+
+    /// Run `f` as one undo step called `label`: the commands it executes push no steps of their
+    /// own, and when it fails the documents stay at their group-start state.
+    pub fn grouped<T>(&mut self, label: &str, f: impl FnOnce(&mut Self) -> Result<T>) -> Result<T> {
+        self.ds()?;
+        let before: Vec<_> =
+            self.docs.iter().map(|ds| (ds.uid, ds.doc.clone(), ds.selection.clone(), ds.page, ds.history.undo.len(), ds.history.limit)).collect();
+        // An edit inside clears the redo steps; a failed group has to bring them back.
+        let redo_before: Vec<_> = self.docs.iter().map(|ds| ds.history.redo.clone()).collect();
+        let active = self.active;
+        let journal_len = self.journal.len();
+
+        // The steps inside are dropped again below, so they mustn't push the oldest ones out.
+        for ds in &mut self.docs {
+            ds.history.limit = usize::MAX;
+        }
+        for (uid, _, _, _, _, _) in &before {
+            self.live_hold(*uid, true);
+        }
+        self.group_depth += 1;
+        let result = f(self);
+        self.group_depth -= 1;
+        for (uid, _, _, _, _, _) in &before {
+            self.live_hold(*uid, false);
+        }
+
+        if result.is_err() {
+            // Tabs the group closed come back from the stash, and the group-start order returns.
+            let mut current = std::mem::take(&mut self.docs);
+            for (uid, ..) in &before {
+                let tab = match current.iter().position(|d| d.uid == *uid) {
+                    Some(i) => Some(current.swap_remove(i)),
+                    None => self.closed_in_group.iter().position(|d| d.uid == *uid).map(|i| self.closed_in_group.swap_remove(i)),
+                };
+                self.docs.extend(tab);
+            }
+            for ((uid, doc, selection, page, undo_len, limit), redo) in before.iter().zip(redo_before) {
+                if let Some(ds) = self.docs.iter_mut().find(|ds| ds.uid == *uid) {
+                    ds.history.redo = redo;
+                    ds.doc = doc.clone();
+                    ds.selection = selection.clone();
+                    ds.page = *page;
+                    ds.history.undo.truncate(*undo_len);
+                    ds.history.limit = *limit;
+                }
+            }
+            self.active = active;
+            self.journal.truncate(journal_len);
+            if self.group_depth == 0 {
+                self.closed_in_group.clear();
+            }
+            return result;
+        }
+        if self.group_depth == 0 {
+            self.closed_in_group.clear();
+        }
+
+        let changed: Vec<_> = before
+            .iter()
+            .filter_map(|(uid, doc, selection, page, _, _)| {
+                let ds = self.docs.iter().find(|d| d.uid == *uid)?;
+                (!Arc::ptr_eq(doc, &ds.doc) && ds.interaction.is_none()).then(|| (*uid, doc.clone(), selection.clone(), *page))
+            })
+            .collect();
+        for ds in &mut self.docs {
+            if let Some((_, _, _, _, undo_len, limit)) = before.iter().find(|before| before.0 == ds.uid) {
+                ds.history.limit = *limit;
+                ds.history.undo.truncate(*undo_len);
+            }
+        }
+        for (uid, doc, selection, page) in changed {
+            self.record(uid, Some(label), doc, selection, page);
+        }
+        result
+    }
+}
diff --git a/crates/engine/src/shapebuilder_strokes_tests.rs b/crates/engine/src/shapebuilder_strokes_tests.rs
index 259dedb1..19aa2c9c 100644
--- a/crates/engine/src/shapebuilder_strokes_tests.rs
+++ b/crates/engine/src/shapebuilder_strokes_tests.rs
@@ -137,6 +137,35 @@ fn a_stroked_shape_gives_its_ring_and_keeps_its_look() {
     assert!(kids.iter().position(|k| *k == o) > kids.iter().position(|k| *k == r), "the outline sits above the shape");
 }
 
+#[test]
+fn a_centred_stroke_on_a_sharp_star_makes_three_regions() {
+    let mut s = Session::new();
+    // Five sharp tips: a centred stroke's outline folds over itself at each one and meets the
+    // star's fill, which used to give overlapping regions and a spiked outline along them.
+    let mut pts = Vec::new();
+    for i in 0..10 {
+        let a = -std::f64::consts::FRAC_PI_2 + i as f64 * std::f64::consts::PI / 5.0;
+        let r = if i % 2 == 0 { 100.0 } else { 40.0 };
+        pts.push([150.0 + r * a.cos(), 150.0 + r * a.sin()]);
+    }
+    let v = id(&ex(&mut s, "vector.create", json!({"points": pts, "closed": true})));
+    ex(&mut s, "node.set", json!({"id": v, "props": {"fill": "#ff0000", "strokes": ["#0000ff"], "strokeWeight": 8, "strokeAlign": "center"}}));
+    s.set_selection(vec![v]);
+    let out = ex(&mut s, "shapeBuilder.regions", json!({}));
+    assert_eq!(out["regions"].as_array().unwrap().len(), 3, "the inside and the stroke's two halves: {out}");
+    let a = crate::shapebuilder::arrangement(&mut s, &[v]).unwrap();
+    for (i, r) in a.regions.iter().enumerate() {
+        for (j, o) in a.regions.iter().enumerate() {
+            if let (false, Some(p)) = (i == j, r.point) {
+                assert_eq!(o.path.winding(p), 0, "regions {i} and {j} overlap at {p:?}");
+            }
+        }
+    }
+    let mut covers: Vec<(bool, bool)> = a.regions.iter().map(|r| (r.parts.iter().any(|p| p.stroke), r.parts.iter().any(|p| !p.stroke))).collect();
+    covers.sort();
+    assert_eq!(covers, vec![(false, true), (true, false), (true, true)], "fill only, stroke only, both");
+}
+
 #[test]
 fn stroke_regions_survive_junk() {
     for j in [
diff --git a/crates/engine/src/shapes_behaviour_tests.rs b/crates/engine/src/shapes_behaviour_tests.rs
index 154c5ae1..e628e168 100644
--- a/crates/engine/src/shapes_behaviour_tests.rs
+++ b/crates/engine/src/shapes_behaviour_tests.rs
@@ -205,6 +205,42 @@ fn corner_radius_follows_the_documented_rules() {
     );
 }
 
+#[test]
+fn corner_smoothing_follows_the_documented_rules() {
+    // Smoothing applies to any shape a radius applies to, and only to the entire shape.
+    // (layer, radius, derivation)
+    let rows: Vec<(&str, f64, &str)> = vec![
+        ("shape.rectangle", 20.0, "rectangles smooth their rounded corners"),
+        ("shape.polygon", 12.0, "polygons smooth their rounded corners"),
+        ("shape.star", 4.0, "stars smooth their rounded corners"),
+    ];
+    for (cmd, radius, why) in rows {
+        let mut s = Session::new();
+        let id = create(&mut s, cmd, json!({"x": 0, "y": 0, "width": 100, "height": 100}));
+        ex(&mut s, "node.set", json!({"ids": [id], "props": {"cornerRadius": radius}}));
+        let round = figcraft_doc::geometry::shape_path(&node(&s, id)).unwrap().area().abs();
+        ex(&mut s, "node.set", json!({"ids": [id], "props": {"cornerSmoothing": 0.6}}));
+        let smooth = figcraft_doc::geometry::shape_path(&node(&s, id)).unwrap().area().abs();
+        assert!((smooth - round).abs() > 1.0, "{why}: {round} then {smooth}");
+        ex(&mut s, "node.set", json!({"ids": [id], "props": {"cornerRadius": 0}}));
+        let sharp = figcraft_doc::geometry::shape_path(&node(&s, id)).unwrap();
+        ex(&mut s, "node.set", json!({"ids": [id], "props": {"cornerSmoothing": 0}}));
+        assert_eq!(sharp, figcraft_doc::geometry::shape_path(&node(&s, id)).unwrap(), "{why}: smoothing needs a radius");
+    }
+    // (kind, takes smoothing, derivation)
+    let doc_rows: Vec<(NodeKind, bool, &str)> = vec![
+        (NodeKind::Rectangle, true, "rectangles"),
+        (NodeKind::Frame, true, "frames"),
+        (NodeKind::Polygon { count: 5 }, true, "polygons"),
+        (NodeKind::Star { count: 5, inner_ratio: 0.4 }, true, "stars"),
+        (NodeKind::Vector { network: Default::default() }, false, "documented for closed vectors; their points round without it here"),
+        (NodeKind::Line, false, "lines take no radius, so no smoothing"),
+    ];
+    for (kind, smoothing, why) in doc_rows {
+        assert_eq!(kind.has_corner_smoothing(), smoothing, "{why}");
+    }
+}
+
 #[test]
 fn rounded_vector_points_are_drawn() {
     // A converted 100 × 100 square: a point's radius rounds that corner only (it wasn't drawn).
@@ -396,6 +432,30 @@ fn boolean_results_and_the_look_they_take() {
     assert!(path.area().abs() < 1e-6, "no overlap, nothing to show");
 }
 
+#[test]
+fn flatten_keeps_open_paths() {
+    // #377: open paths have no fill outline, so two pen paths flattened to "nothing to flatten"
+    // and next to a closed shape they disappeared.
+    let mut s = Session::new();
+    let a = create(&mut s, "vector.create", json!({"points": [[0, 0], [100, 50], [200, 0]]}));
+    let b = create(&mut s, "vector.create", json!({"points": [[0, 100], [100, 150], [200, 100]]}));
+    let tri = create(&mut s, "vector.create", json!({"points": [[300, 0], [400, 0], [400, 100]], "closed": true}));
+    let v = create(&mut s, "vector.flatten", json!({"ids": [a, b, tri]}));
+    let NodeKind::Vector { network } = node(&s, v).kind else { panic!("flatten makes one vector") };
+    assert_eq!((network.vertices.len(), network.segments.len()), (9, 7), "both open paths and the triangle");
+    assert_eq!(network.regions.len(), 1, "only the triangle is filled");
+    let bb = s.doc().unwrap().world_bounds(v).unwrap();
+    assert_eq!((bb.x0, bb.y0, bb.x1, bb.y1), (0.0, 0.0, 400.0, 150.0), "nothing moves");
+
+    // Joining two open paths goes the same way.
+    let mut s = Session::new();
+    let a = create(&mut s, "vector.create", json!({"points": [[0, 0], [100, 0]]}));
+    let b = create(&mut s, "vector.create", json!({"points": [[0, 50], [100, 50]]}));
+    let v = create(&mut s, "vector.join", json!({"ids": [a, b]}));
+    let NodeKind::Vector { network } = node(&s, v).kind else { panic!("join makes one vector") };
+    assert_eq!(network.segments.len(), 2);
+}
+
 #[test]
 fn flatten_and_outline_stroke() {
     // Flatten: one vector layer from the selection, in one step; Alt+Shift+F does it.
diff --git a/crates/engine/src/sharing.rs b/crates/engine/src/sharing.rs
new file mode 100644
index 00000000..27d1e560
--- /dev/null
+++ b/crates/engine/src/sharing.rs
@@ -0,0 +1,6 @@
+pub mod background;
+pub mod branches;
+pub mod collab;
+pub mod invite_links;
+pub mod live;
+pub mod online;
diff --git a/crates/engine/src/background.rs b/crates/engine/src/sharing/background.rs
similarity index 99%
rename from crates/engine/src/background.rs
rename to crates/engine/src/sharing/background.rs
index aa2eef0f..1a29c2d1 100644
--- a/crates/engine/src/background.rs
+++ b/crates/engine/src/sharing/background.rs
@@ -148,5 +148,4 @@ impl Session {
 }
 
 #[cfg(test)]
-#[path = "background_tests.rs"]
 mod tests;
diff --git a/crates/engine/src/background_tests.rs b/crates/engine/src/sharing/background/tests.rs
similarity index 100%
rename from crates/engine/src/background_tests.rs
rename to crates/engine/src/sharing/background/tests.rs
diff --git a/crates/engine/src/branches.rs b/crates/engine/src/sharing/branches.rs
similarity index 77%
rename from crates/engine/src/branches.rs
rename to crates/engine/src/sharing/branches.rs
index 8bff0568..4c9faa4a 100644
--- a/crates/engine/src/branches.rs
+++ b/crates/engine/src/sharing/branches.rs
@@ -4,6 +4,13 @@
 //! both sides with it. Branches are saved in the main file ([`figcraft_format::Branch`]); a
 //! branch tab's edits and its own version history go into its branch ([`sync`]) and are saved with
 //! the main file. Merging adds a version to the main file's history; the branch keeps its own.
+//!
+//! In a live session a branch stays with the person who made it (others don't see it), and
+//! merging it is one edit of the session document, which syncs to everyone like any other. The
+//! session server takes new layers only in the sender's own id space, so a branch made in the
+//! session makes its ids in yours, far above the ids the main file makes there ([`WINDOW`]).
+//! Merging a branch made outside the session is refused when it adds layers, styles, variables or
+//! comments (their ids are in another space).
 
 use std::collections::BTreeMap;
 use std::sync::Arc;
@@ -11,6 +18,7 @@ use std::sync::Arc;
 pub use figcraft_collab::merge::Side;
 use figcraft_collab::merge::{self, Conflict, Key, Plan};
 use figcraft_collab::{Change, Entry, Prop, Target};
+use figcraft_doc::ids::space_of;
 use figcraft_doc::{Document, NodeId};
 use figcraft_format::Branch;
 pub use figcraft_format::BranchState;
@@ -27,7 +35,7 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "branch.create",
             "Create branch",
-            "{name?}  a copy of the file to work on separately, opened in a new tab; it remembers the file as it is now (its base) → {id, name, index (its tab)}",
+            "{name?}  a copy of the file to work on separately, opened in a new tab; it remembers the file as it is now (its base); in a live session it stays yours → {id, name, index (its tab)}",
             false,
             create
         ),
@@ -53,14 +61,14 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "branch.updateFromMain",
             "Update from main",
-            "{id?, resolutions? ({<conflict key>: \"branch\" | \"main\"})}  bring the main file's changes since the branch was made into the branch; refused while a conflict has no resolution. Not undoable (the branch tab's undo history starts over) → {updated, changes, conflicts}",
+            "{id?, resolutions? ({<conflict key>: \"branch\" | \"main\"})}  bring the main file's changes since the branch was made into the branch (a version in its history); refused while a conflict has no resolution. Not undoable (the branch tab's undo history starts over) → {updated, changes, conflicts}",
             false,
             |s, p| combine(s, p, Side::Main)
         ),
         spec!(
             "branch.merge",
             "Merge branch",
-            "{id?, resolutions? ({<conflict key>: \"branch\" | \"main\"})}  merge the branch into the main file as one undo step, then archive it and show the main file; refused while a conflict has no resolution → {merged, changes, conflicts, index}",
+            "{id?, resolutions? ({<conflict key>: \"branch\" | \"main\"})}  merge the branch into the main file as one undo step (in a live session one edit everyone gets; refused on a view link), then archive it and show the main file; refused while a conflict has no resolution → {merged, changes, conflicts, index}",
             false,
             |s, p| combine(s, p, Side::Branch)
         ),
@@ -186,7 +194,7 @@ pub fn tab_of(s: &Session, main: u64, id: &str) -> Option<usize> {
 /// branch's). Their edits are already in the branches ([`sync`]).
 pub(crate) fn close_tabs(s: &mut Session, main: u64, id: Option<&str>) {
     let active = s.docs.get(s.active).map(|d| d.uid);
-    s.docs.retain(|d| !d.branch_of.as_ref().is_some_and(|(m, b)| *m == main && id.is_none_or(|i| i == b)));
+    s.remove_tabs(|d| d.branch_of.as_ref().is_some_and(|(m, b)| *m == main && id.is_none_or(|i| i == b)));
     s.active = active.and_then(|a| s.docs.iter().position(|d| d.uid == a)).unwrap_or(s.active).min(s.docs.len().saturating_sub(1));
 }
 
@@ -219,11 +227,42 @@ fn disabled(cmd: &str, why: impl Into<String>) -> EngineError {
     EngineError::Disabled(cmd.into(), why.into())
 }
 
-/// shortcut: branches of a file in a live session are refused (its participants' client ids
-/// aren't known here, so a branch's id space could clash); allow them once the server hands out
-/// branch id spaces.
-fn refuse_live(s: &Session, cmd: &str, uid: u64) -> Result<()> {
-    if s.live_doc(uid) { Err(disabled(cmd, "branches aren't available in a live session")) } else { Ok(()) }
+/// shortcut: in a live session a branch makes ids in your own client space starting this far
+/// above every id made there on the main file or its other branches, so neither side makes the
+/// other's ids before the merge unless one makes 16 million first; have the server hand out
+/// branch id spaces if that ever matters.
+const WINDOW: u64 = 1 << 24;
+
+/// Where a new branch of the file in tab `main` starts making ids in your live session's client
+/// space `client`: [`WINDOW`] above the main file's and every branch's next id there (`None`: the
+/// space is full).
+fn live_window(s: &Session, main: u64, client: u32) -> Option<NodeId> {
+    let m = s.docs.iter().find(|d| d.uid == main)?;
+    let tabs = s.docs.iter().filter(|d| d.branch_of.as_ref().is_some_and(|(t, _)| *t == main)).map(|d| d.doc.next_id());
+    let next = m.branches.iter().map(|b| b.head.next_id()).chain(tabs).chain([m.doc.next_id()]);
+    let top = next.filter(|n| space_of(n.0) == client).max()?;
+    let start = top.0.checked_add(WINDOW)?;
+    (space_of(start) == client).then_some(NodeId(start))
+}
+
+/// What merging into a live session's document would add that its server won't take from client
+/// `client`: a new layer outside your id space (unless it is a layer of a base taken in this
+/// session, `in_session`, that main deleted since: the server takes those back), or a new style,
+/// variable, collection or comment in another client's space. `None`: everything goes through.
+fn foreign(plan: &Plan, base: &Document, main: &Document, merged: &Document, client: u32, in_session: bool) -> Option<String> {
+    let outside = |n: NodeId| space_of(n.0) != client && !(in_session && base.contains(n));
+    if let Some(n) = merged.nodes().find(|n| !main.contains(n.id) && outside(n.id)) {
+        return Some(format!("layer “{}”", n.name));
+    }
+    plan.changes(Side::Branch).iter().find_map(|c| match c {
+        Change::Put { entry, .. }
+            if entry.id_space().is_some_and(|sp| sp != 0 && sp != client)
+                && plan.base().value(&Target::Entry(entry.clone())).ok().flatten().is_none() =>
+        {
+            Some(entry.describe())
+        }
+        _ => None,
+    })
 }
 
 fn create(s: &mut Session, p: &Value) -> Result<Value> {
@@ -232,7 +271,7 @@ fn create(s: &mut Session, p: &Value) -> Result<Value> {
     if ds.branch_of.is_some() {
         return Err(disabled(CMD, "this tab is a branch: make branches from the main file"));
     }
-    refuse_live(s, CMD, ds.uid)?;
+    let live = s.live_client_id(CMD, ds.uid)?;
     if ds.branches.len() >= figcraft_format::MAX_BRANCHES {
         return Err(disabled(CMD, format!("the file has the most branches it can keep ({})", figcraft_format::MAX_BRANCHES)));
     }
@@ -240,12 +279,22 @@ fn create(s: &mut Session, p: &Value) -> Result<Value> {
         string(p, "name").map(|n| n.trim().to_string()).filter(|n| !n.is_empty()).unwrap_or_else(|| format!("Branch {}", ds.branches.len() + 1));
     let name = figcraft_format::clip(&name, figcraft_format::MAX_VERSION_NAME);
     let base = ds.document_itself().clone();
-    // Its own id space, above every space the file, its live sessions and its branches used.
-    let client = ds.branches.iter().map(|b| b.client).chain([base.highest_id_space(), base.client_id()]).max().unwrap_or(0);
-    let client = client.checked_add(1).ok_or_else(|| disabled(CMD, "no id space left for a new branch"))?;
+    let no_space = || disabled(CMD, "no id space left for a new branch");
+    // In a live session: your own client space, far above the main file's ids there. Otherwise its
+    // own id space, above every space the file, its live sessions and its branches used.
+    let (client, start) = match live {
+        Some(c) => (c, Some(live_window(s, ds.uid, c).ok_or_else(no_space)?)),
+        None => {
+            let top = ds.branches.iter().map(|b| b.client).chain([base.highest_id_space(), base.client_id()]).max().unwrap_or(0);
+            (top.checked_add(1).ok_or_else(no_space)?, None)
+        }
+    };
     let mut head = (*base).clone();
     head.name = name.clone();
     head.set_client_id(client);
+    if let Some(start) = start {
+        head.reserve_ids(NodeId(start.0 - 1));
+    }
     let id = crate::cmd::file::unique_id(|id| ds.branches.iter().any(|b| b.id == id));
     let uid = ds.uid;
     let time = crate::cmd::comment::now_secs();
@@ -259,7 +308,13 @@ fn create(s: &mut Session, p: &Value) -> Result<Value> {
         head: Arc::new(head),
         versions: Vec::new(),
     });
+    if live.is_some() {
+        s.live_branch_base(uid, &id);
+    }
     let index = open_tab(s, uid, &id)?;
+    if let Some(tab) = s.docs.get_mut(index) {
+        crate::cmd::file::add_version(tab, CREATED, "", false);
+    }
     Ok(json!({"id": id, "name": name, "index": index}))
 }
 
@@ -269,11 +324,22 @@ fn open_tab(s: &mut Session, main: u64, id: &str) -> Result<usize> {
         s.active = i;
         return Ok(i);
     }
-    let m = s.docs.iter_mut().find(|d| d.uid == main).ok_or(EngineError::NoDocument)?;
-    let b = m.branches.iter_mut().find(|b| b.id == id).ok_or_else(|| bad("branch.open", format!("no branch `{id}`")))?;
+    let live = s.live_client_id("branch.open", main)?;
+    let m = s.docs.iter().find(|d| d.uid == main).ok_or(EngineError::NoDocument)?;
+    let b = m.branches.iter().find(|b| b.id == id).ok_or_else(|| bad("branch.open", format!("no branch `{id}`")))?;
     let mut doc = (*b.head).clone();
     // A branch read from a file has no client id yet.
     doc.set_client_id(b.client);
+    // In your live session, a branch that would make ids right where the main file makes them (one
+    // read from a file that made none yet) moves up.
+    if live == Some(b.client)
+        && doc.next_id().0.abs_diff(m.doc.next_id().0) < WINDOW
+        && let Some(start) = live_window(s, main, b.client)
+    {
+        doc.reserve_ids(NodeId(start.0 - 1));
+    }
+    let m = s.docs.iter_mut().find(|d| d.uid == main).ok_or(EngineError::NoDocument)?;
+    let b = m.branches.iter_mut().find(|b| b.id == id).ok_or_else(|| bad("branch.open", format!("no branch `{id}`")))?;
     // The branch's own version history: the tab's versions while it is open ([`sync`]).
     let mut tab = DocState::new(doc, None).with_versions(b.versions.clone());
     tab.branch_of = Some((main, id.to_string()));
@@ -340,7 +406,13 @@ fn combine(s: &mut Session, p: &Value, from: Side) -> Result<Value> {
     }
     // The main file itself, not a version shown in its place.
     m.end_preview();
-    refuse_live(s, cmd, main_uid)?;
+    // Merging edits the session document, which a view link (or a file on its way) can't.
+    if from == Side::Branch
+        && let Some(why) = s.live_read_only(main_uid)
+    {
+        return Err(disabled(cmd, why));
+    }
+    let live = s.live_client_id(cmd, main_uid)?;
     let picks = resolutions(cmd, p)?;
     let (base, head, main) = documents(s, mi, bi).ok_or(EngineError::NoDocument)?;
     let plan = merge::plan(&base, &head, &main).map_err(|e| EngineError::Other(e.to_string()))?;
@@ -351,6 +423,14 @@ fn combine(s: &mut Session, p: &Value, from: Side) -> Result<Value> {
     }
     let into = if from == Side::Branch { &main } else { &head };
     let (mut doc, touched) = plan.merge(into, from, &pick).map_err(|e| EngineError::Other(format!("can't merge: {e}")))?;
+    if let Some(client) = live.filter(|_| from == Side::Branch)
+        && let Some(what) = foreign(&plan, &base, &main, &doc, client, s.live_branch_in_session(main_uid, &id))
+    {
+        let why = format!(
+            "the branch adds {what}, made outside this live session, which the session can't take: merge it once the file has left the session"
+        );
+        return Err(disabled(cmd, why));
+    }
     doc.mark_dirty(touched);
     normalize(&mut doc, into);
     let doc = Arc::new(doc);
@@ -383,11 +463,33 @@ fn combine(s: &mut Session, p: &Value, from: Side) -> Result<Value> {
             b.base = main;
             b.head = doc;
         }
+        if live.is_some() {
+            s.live_branch_base(main_uid, &id);
+        }
+        note(s, mi, bi, UPDATED);
         out["updated"] = json!(true);
     }
     Ok(out)
 }
 
+/// The branch's own history entries for its creation and its updates from main.
+const CREATED: &str = "Branch created";
+const UPDATED: &str = "Updated from main";
+
+/// Add version `name` to the history of branch `bi` of the file in tab `mi`: its tab's when it is
+/// open (it goes into the branch with [`sync`]), else the branch's.
+fn note(s: &mut Session, mi: usize, bi: usize, name: &str) {
+    let Some((uid, id)) = s.docs.get(mi).and_then(|m| Some((m.uid, m.branches.get(bi)?.id.clone()))) else { return };
+    if let Some(tab) = tab_of(s, uid, &id).and_then(|t| s.docs.get_mut(t)) {
+        crate::cmd::file::add_version(tab, name, "", false);
+        return;
+    }
+    let Some(b) = s.docs.get_mut(mi).and_then(|m| m.branches_mut().get_mut(bi)) else { return };
+    let mut tab = DocState::new((*b.head).clone(), None).with_versions(std::mem::take(&mut b.versions));
+    crate::cmd::file::add_version(&mut tab, name, "", false);
+    b.versions = tab.versions;
+}
+
 /// Show merged `doc` in tab `ds`.
 fn show(ds: &mut DocState, doc: Arc<Document>) {
     ds.doc = doc;
@@ -458,7 +560,7 @@ fn entry_label(plan: &Plan, entry: &Entry, value: Option<&Value>) -> Option<(&'s
         Entry::Variable(_) => "variable",
         Entry::Collection(_) => "variable collection",
         Entry::Comment(_) => "comment",
-        Entry::DevSnapshot(_) | Entry::Image(_) => return None,
+        Entry::DevSnapshot(_) | Entry::Image(_) | Entry::Ballot(_) => return None,
     };
     let base = plan.base().value(&Target::Entry(entry.clone())).ok().flatten();
     let named = value.or(base.as_ref().map(|j| &j.0)).and_then(|v| v.get("name").or_else(|| v.get("text"))).and_then(Value::as_str);
diff --git a/crates/engine/src/collab.rs b/crates/engine/src/sharing/collab.rs
similarity index 100%
rename from crates/engine/src/collab.rs
rename to crates/engine/src/sharing/collab.rs
diff --git a/crates/engine/src/invite_links.rs b/crates/engine/src/sharing/invite_links.rs
similarity index 100%
rename from crates/engine/src/invite_links.rs
rename to crates/engine/src/sharing/invite_links.rs
diff --git a/crates/engine/src/sharing/live.rs b/crates/engine/src/sharing/live.rs
new file mode 100644
index 00000000..a469b28e
--- /dev/null
+++ b/crates/engine/src/sharing/live.rs
@@ -0,0 +1,389 @@
+//! Live sessions (milestone M9, step 2 of `docs/collab-protocol.md`): people edit the same file
+//! together and see each other's cursors, selections and viewports, and can follow one another.
+//!
+//! The engine holds what everyone sees ([`Live`]: status, peers and their presence, who you
+//! follow) and the `collab.*` commands. The networking lives in a higher layer
+//! (`figcraft-collab-net`), which the app installs as a [`LiveLink`]: the engine never opens a
+//! socket, so nothing below the UI layer depends on networking. Without a link (the CLI, tests)
+//! the commands say live sessions aren't available.
+//!
+//! Peers, presence and document changes are the wire types of the collaboration core
+//! ([`figcraft_collab::message`]). Each participant runs a core [`Client`]: the host's session
+//! document is the one it shared, a guest gets the host's file as a new tab from the welcome.
+//! Every command, gesture or group on the session document is synced as one batch and is one step
+//! of the user's own undo history ([`Session::record`]); undo and redo there take back only the
+//! user's own steps ([`figcraft_collab::Client::undo`]). Batches from the host's server are applied
+//! through the client and installed with [`Session::apply_remote`], which never touches the undo
+//! history. After a dropped connection the client resumes with its id and catches up; what it
+//! made meanwhile goes out then.
+//!
+//! A file can also live on a `figcraft-server`: `collab.publish` uploads the open document and
+//! syncs that tab through the server, whose share links let others edit or only view. A view link
+//! makes the synced document read-only here (every edit is refused before it is sent; the server
+//! refuses it too).
+//!
+//! Sessions are per document ([`Lives`]): each open document has its own session or none, several
+//! run at once (host one file, join another, publish a third), and they keep syncing while their
+//! tab isn't in front. The commands act on the active document's session ([`Session::live`]);
+//! closing a document ends its session only. One link carries them all, each under its
+//! [`SessionId`].
+//!
+//! Sharing with a join code (`collab.share`): online, the open document is published to the
+//! server in Preferences and the server names its links with short codes; on the local network
+//! the app hosts and the code carries the host's address and the session's secret
+//! ([`figcraft_collab::code`]). `collab.join` takes a code of either kind, or an invite link.
+//!
+//! Cursor chat (`collab.cursorChat`) and spotlights (`collab.spotlight`) travel as signals:
+//! short-lived presence the host passes on to everyone, never stored. A spotlight makes everyone
+//! follow the person who started it; moving your own view stops following, as with any follow.
+
+use std::collections::{BTreeMap, BTreeSet};
+use std::net::IpAddr;
+use std::sync::Arc;
+
+use figcraft_collab::Client;
+use figcraft_collab::code::{self, Code};
+pub use figcraft_collab::message::Signal;
+use figcraft_collab::message::{Admin, AdminReply, ClientMsg, EditingText, LibraryReply, LibraryReq, PluginReply, PluginReq, ServerMsg};
+
+pub use figcraft_collab::message::{Access, HostInfo, Resume, utc_date};
+use figcraft_doc::{Document, NodeId};
+use serde::Serialize;
+use serde_json::{Value, json};
+
+pub use figcraft_collab::message::{Peer, Presence};
+
+use crate::cmd::CommandSpec;
+use crate::collab::EngineRecompute;
+use crate::params::{get, num, req_string, string};
+use crate::tools::ToolId;
+use crate::{DocState, EngineError, Result, Session, TextEdit, ViewState, bad, spec};
+
+mod events;
+mod host;
+mod join;
+mod sync;
+mod types;
+
+use host::unavailable;
+pub use host::{MAX_REPORT, hosting_json};
+pub(crate) use host::{clean_shared, share_answer};
+pub(crate) use join::start_join;
+pub use join::{can_remove_people, specs};
+pub use types::{
+    Bind, DEFAULT_SERVER, Event, HostOptions, LiveLink, MAX_NAME, MAX_SELECTION, NO_HOSTING, NO_SESSION, NetReply, NetRequest, ONLINE_OFF, PEOPLE,
+    PageInfo, PublishOptions, Published, Role, SessionId, SessionInfo, Share, Shared, SharedLink, Status, TOO_LARGE_TO_JOIN, Via, join_target,
+    parse_color,
+};
+
+/// The view a follow last applied: any other view means the user moved.
+#[derive(Clone, Copy, Debug, PartialEq)]
+struct FollowedView {
+    page: NodeId,
+    cx: f64,
+    cy: f64,
+    zoom: f64,
+}
+
+/// One live session (see the module docs): a document's, or a join on its way to its own tab.
+#[derive(Default)]
+pub struct Live {
+    /// Its number on the link (0: no session, the state of a document that isn't in one).
+    pub id: SessionId,
+    pub status: Status,
+    pub info: Option<SessionInfo>,
+    /// Everyone else in the session, by client id.
+    pub peers: BTreeMap<u32, Peer>,
+    /// Their latest presence (only while they're in the session).
+    pub presence: BTreeMap<u32, Presence>,
+    /// The peer whose viewport you follow.
+    pub follow: Option<u32>,
+    followed: Option<FollowedView>,
+    /// Your pointer over the canvas (page coordinates): the UI sets it, or `collab.cursor`.
+    pub cursor: Option<(f64, f64)>,
+    /// The presence last handed to the link.
+    sent: Option<Presence>,
+    /// The document sync client (from the welcome).
+    client: Option<Client>,
+    /// The open document the session syncs (its `DocState::uid`).
+    pub doc_uid: Option<u64>,
+    /// The document whose tab shows the session: `doc_uid`, or for a join the document it was
+    /// started from, until the session's file opens in a tab of its own (`None`: none was open).
+    pub tab: Option<u64>,
+    /// The session document as last sent or installed: a different one has local edits to send.
+    synced: Option<Arc<Document>>,
+    /// Server batches waiting for a gesture or preview on the session document to end.
+    deferred: Vec<ServerMsg>,
+    /// Nesting of [`Session::grouped`] on the session document: its edits sync once, at the end.
+    hold: u32,
+    /// The address of the server this session's file was published to, or is yours on (empty
+    /// otherwise; it may carry the server's key: never shown).
+    pub server: String,
+    /// The file you published to a server in this session, or one of yours you opened again
+    /// (`collab.openFile`: without its owner token, which stays in the record), with its links.
+    pub published: Option<Published>,
+    /// The session was started by sharing with a join code (`collab.share`): how, and its codes.
+    pub share: Option<Share>,
+    /// What the server of the file you're in says about its hosting (operator, terms, expiry);
+    /// a server that says it takes reports (`collab.report`).
+    pub hosting: Option<HostInfo>,
+    /// The host passes cursor chat and spotlights on (it said so after the welcome).
+    pub signals: bool,
+    /// Others' open cursor chat messages.
+    pub chats: BTreeMap<u32, String>,
+    /// Your cursor chat message (empty: none).
+    pub chat: String,
+    /// Who spotlights (you follow them until you move your view).
+    pub spotlight: Option<u32>,
+    /// You spotlight: everyone follows you.
+    pub spotlighting: bool,
+    /// The branches of the session's file made or last updated from main in this session: every
+    /// layer of their base was in it (see [`crate::branches`]).
+    branch_bases: BTreeSet<String>,
+}
+
+impl Live {
+    pub fn role(&self) -> Option<Role> {
+        self.info.as_ref().map(|i| i.role)
+    }
+
+    /// Stop following. False when you weren't following anyone.
+    fn unfollow(&mut self) -> bool {
+        self.followed = None;
+        self.follow.take().is_some()
+    }
+
+    /// Back to no session, still shown on its tab (a failure's reason stays there).
+    fn reset(&mut self) {
+        *self = Live { id: self.id, tab: self.tab, ..Live::default() };
+    }
+
+    /// The document sync client (once the welcome arrived): peers, pending batches, the user's
+    /// undo history.
+    pub fn client(&self) -> Option<&Client> {
+        self.client.as_ref()
+    }
+
+    /// Document changes are syncing (the welcome arrived).
+    pub fn syncing(&self) -> bool {
+        self.client.is_some()
+    }
+
+    /// What the file's tab says about its session: `Some(true)` others get in (a session this app
+    /// hosts, one you joined, a file of yours shared with a code or links), `Some(false)` a file of
+    /// yours on a server that only you get into now, `None` no session (or one still on its way).
+    pub fn shared(&self) -> Option<bool> {
+        let there = matches!(self.status, Status::Live | Status::Reconnecting { .. });
+        there.then(|| self.share.as_ref().is_none_or(|s| s.links.is_some()))
+    }
+
+    /// The name of the session's file, once known.
+    fn file_name(&self) -> Option<&str> {
+        self.info.as_ref().map(|i| i.file_name.as_str()).or(self.published.as_ref().map(|p| p.name.as_str())).filter(|n| !n.is_empty())
+    }
+}
+
+/// The app's live sessions, one per document at most, and what they share: the networking and
+/// the invite-link registration.
+#[derive(Default)]
+pub struct Lives {
+    link: Option<Box<dyn LiveLink>>,
+    sessions: BTreeMap<SessionId, Live>,
+    /// The last session id handed out.
+    last: SessionId,
+    /// What a document that isn't in a session shows.
+    off: Live,
+    /// Registers the app as the opener of `figcraft://` invite links (the desktop app on Windows
+    /// installs one; see [`crate::invite_links`]).
+    pub links: Option<Box<dyn crate::invite_links::LinkRegistrar>>,
+    /// The recorded online files changed since the app last saved the preferences (it saves them
+    /// at once: a crash must not lose an owner token).
+    pub unsaved: bool,
+    /// Servers that couldn't say what became of your files at the last `collab.files {refresh}`.
+    pub servers: crate::online::Problems,
+    /// Recovery copies of your online files waiting for their file to arrive from its server
+    /// (`collab.recoverFile`).
+    pub(crate) recovering: Vec<crate::online::Recovering>,
+}
+
+impl Lives {
+    /// Install the networking (the app does this once at startup).
+    pub fn install(&mut self, link: Box<dyn LiveLink>) {
+        self.link = Some(link);
+    }
+
+    /// The installed networking, if any.
+    pub(crate) fn link(&mut self) -> Option<&mut (dyn LiveLink + 'static)> {
+        self.link.as_deref_mut()
+    }
+
+    /// A link is installed: sessions can be joined (and hosted, when [`can_host`](Self::can_host)).
+    pub fn available(&self) -> bool {
+        self.link.is_some()
+    }
+
+    /// Sessions can be hosted from here (a link is installed and it isn't the browser's).
+    pub fn can_host(&self) -> bool {
+        self.link.as_ref().is_some_and(|l| l.can_host())
+    }
+
+    /// Session `id`, while it runs or shows why it failed.
+    pub fn get(&self, id: SessionId) -> Option<&Live> {
+        self.sessions.get(&id)
+    }
+
+    /// A recovery copy started with session `id` still waits for its outcome (the app keeps the
+    /// copy's file until it doesn't).
+    pub fn recovering(&self, id: SessionId) -> bool {
+        self.recovering.iter().any(|r| r.session == id)
+    }
+
+    /// Every session, oldest first.
+    pub fn iter(&self) -> impl Iterator<Item = &Live> {
+        self.sessions.values()
+    }
+
+    pub(crate) fn sessions_mut(&mut self) -> impl Iterator<Item = &mut Live> {
+        self.sessions.values_mut()
+    }
+
+    /// The session the tab of document `tab` shows (`None`: no document is open): the one that
+    /// syncs it, else the latest join started from it.
+    fn shown(&self, tab: Option<u64>) -> Option<SessionId> {
+        self.sessions.values().filter(|l| l.tab == tab).max_by_key(|l| (l.doc_uid.is_some(), l.id)).map(|l| l.id)
+    }
+
+    /// What the tab of document `tab` shows: its session, or no session.
+    fn on(&self, tab: Option<u64>) -> &Live {
+        self.shown(tab).and_then(|id| self.sessions.get(&id)).unwrap_or(&self.off)
+    }
+
+    /// The session of document `uid`: the one that syncs it, or will once it is published.
+    fn doc(&self, uid: u64) -> Option<&Live> {
+        self.sessions.values().find(|l| l.doc_uid == Some(uid))
+    }
+
+    fn doc_mut(&mut self, uid: u64) -> Option<&mut Live> {
+        self.sessions.values_mut().find(|l| l.doc_uid == Some(uid))
+    }
+
+    /// Start a session on the link for command `cmd`: `start` gets the link and the new
+    /// session's id, which comes back with what it returned.
+    fn start<T>(&mut self, cmd: &str, start: impl FnOnce(&mut dyn LiveLink, SessionId) -> Result<T>) -> Result<(SessionId, T)> {
+        let link = self.link.as_deref_mut().ok_or_else(|| unavailable(cmd))?;
+        let id = self.last.saturating_add(1);
+        let out = start(link, id)?;
+        self.last = id;
+        Ok((id, out))
+    }
+
+    /// Session `live` started on the link: it takes its tab over from what was there (a session
+    /// that failed; for a document's own session, the one it was in). Joins on their way from
+    /// that tab go on.
+    fn open(&mut self, live: Live) {
+        let own = live.doc_uid.is_some();
+        let over: Vec<SessionId> =
+            self.sessions.values().filter(|l| l.tab == live.tab && (!l.status.active() || (own && l.doc_uid.is_some()))).map(|l| l.id).collect();
+        for id in over {
+            self.end(id);
+        }
+        self.sessions.insert(live.id, live);
+    }
+
+    /// End session `id` (stop hosting or leave) and forget it.
+    pub(crate) fn end(&mut self, id: SessionId) -> Option<Live> {
+        self.leave(id);
+        self.sessions.remove(&id)
+    }
+
+    /// Tell the link session `id` is over.
+    fn leave(&mut self, id: SessionId) {
+        if let Some(l) = self.link.as_mut() {
+            l.leave(id);
+        }
+    }
+
+    /// Messages for session `id`'s server, in order.
+    fn send(&mut self, id: SessionId, msgs: impl IntoIterator<Item = ClientMsg>) {
+        if let Some(l) = self.link.as_mut() {
+            for m in msgs {
+                l.send(id, m);
+            }
+        }
+    }
+}
+
+impl Drop for Lives {
+    fn drop(&mut self) {
+        for id in std::mem::take(&mut self.sessions).into_keys() {
+            self.leave(id);
+        }
+    }
+}
+
+/// The page a presence is on (its viewport's, else its cursor's).
+pub fn presence_page(p: &Presence) -> Option<NodeId> {
+    p.viewport.map(|v| v.0).or(p.cursor.map(|c| c.0))
+}
+
+/// Presence ready to send: non-finite numbers and empty viewports dropped, the selection capped.
+pub fn sanitize(mut p: Presence) -> Presence {
+    p.cursor = p.cursor.filter(|c| c.1.is_finite() && c.2.is_finite());
+    p.viewport = p.viewport.filter(|v| v.1.is_finite() && v.2.is_finite() && v.3.is_finite() && v.4.is_finite() && v.3 > 0.0 && v.4 > 0.0);
+    if let Some(s) = p.selection.as_mut() {
+        s.truncate(MAX_SELECTION);
+    }
+    p
+}
+
+/// The name others see: the name from Preferences, or empty for the default ("You"), which the
+/// host replaces.
+pub fn display_name(prefs: &crate::Prefs) -> String {
+    let n = prefs.user_name.trim();
+    if n == crate::cmd::comment::DEFAULT_AUTHOR { String::new() } else { n.chars().filter(|c| !c.is_control()).take(MAX_NAME).collect() }
+}
+
+/// Initials for an avatar ("Ada Lovelace" → "AL"; "?" for none).
+pub fn initials(name: &str) -> String {
+    let mut out: String = name.split_whitespace().filter_map(|w| w.chars().next()).take(2).collect();
+    if out.is_empty() {
+        out.push('?');
+    }
+    out.to_uppercase()
+}
+
+fn close(a: f64, b: f64) -> bool {
+    (a - b).abs() <= 1e-9 * a.abs().max(b.abs()).max(1.0)
+}
+
+/// What others are told about your text editing: the layer, caret and selected characters.
+fn editing_of(t: &TextEdit) -> EditingText {
+    let (a, b) = (t.anchor.min(t.caret), t.anchor.max(t.caret));
+    EditingText { node: t.id, caret: t.caret, selection: (a != b).then_some((a, b)) }
+}
+
+/// The note shown while others type in the text layer you look at: "Hana is editing this text",
+/// "Hana and Ada are…", "Hana and 2 others are…" (`None`: nobody).
+pub fn editing_hint(names: &[&str]) -> Option<String> {
+    let verb = "editing this text";
+    Some(match names {
+        [] => return None,
+        [one] => format!("{one} is {verb}"),
+        [a, b] => format!("{a} and {b} are {verb}"),
+        [first, rest @ ..] => format!("{first} and {} others are {verb}", rest.len()),
+    })
+}
+
+/// Why team libraries aren't available (no network link, or the browser build).
+pub const NO_TEAM_LIBRARIES: &str = "team libraries on a server need the desktop app or the MCP server";
+
+/// Why an edit of a server file you joined with a view link is refused.
+pub const VIEW_ONLY: &str = "View only: the link you joined with lets you see this file, not change it";
+/// Why an edit of a file on its way to a server is refused.
+pub const PUBLISHING: &str = "The file is being published: you can edit it again once it is on the server";
+
+/// A gesture, version preview or live text preview shows a document that isn't the edit to
+/// sync yet.
+fn busy(ds: &DocState) -> bool {
+    ds.interaction.is_some() || ds.preview.is_some() || ds.text_preview.is_some()
+}
diff --git a/crates/engine/src/sharing/live/events.rs b/crates/engine/src/sharing/live/events.rs
new file mode 100644
index 00000000..5b6008f8
--- /dev/null
+++ b/crates/engine/src/sharing/live/events.rs
@@ -0,0 +1,408 @@
+use super::host::{clean_hosting, clean_shared};
+use super::types::{Event, PageInfo, Role, SessionId, Status};
+use super::*;
+
+impl Session {
+    /// The active document (`None`: no document is open).
+    pub(super) fn tab(&self) -> Option<u64> {
+        self.ds().ok().map(|d| d.uid)
+    }
+
+    /// The active document's live session (status off when it isn't in one). Everything the
+    /// window shows and the `collab.*` commands act on is this one.
+    pub fn live(&self) -> &Live {
+        self.live.on(self.tab())
+    }
+
+    /// The active document's live session, when it has one (running, on its way or failed).
+    pub fn live_mut(&mut self) -> Option<&mut Live> {
+        let id = self.live.shown(self.tab())?;
+        self.live.sessions.get_mut(&id)
+    }
+
+    /// Document `uid`'s live session (status off when it isn't in one).
+    pub fn live_of(&self, uid: u64) -> &Live {
+        self.live.on(Some(uid))
+    }
+
+    /// The active document is its session's synced document: page and layer ids in others'
+    /// presence refer to it.
+    pub fn live_shared(&self) -> bool {
+        self.tab().is_some_and(|uid| self.live_doc(uid))
+    }
+
+    /// Install a document that came from the session (others' edits): the selection, page and view
+    /// stay where they can, and the undo history isn't touched.
+    pub fn apply_remote(&mut self, uid: u64, doc: Arc<Document>) {
+        let Some(ds) = self.docs.iter_mut().find(|d| d.uid == uid) else { return };
+        ds.doc = doc;
+        if !ds.doc.pages.contains(&ds.page) {
+            ds.page = ds.doc.first_page().unwrap_or(ds.page);
+        }
+        if ds.text_edit.as_ref().is_some_and(|t| !ds.doc.contains(t.id)) {
+            ds.text_edit = None;
+        }
+        if ds.vector_edit.as_ref().is_some_and(|v| !ds.doc.contains(v.id)) {
+            ds.vector_edit = None;
+        }
+        ds.clean_selection();
+        ds.revision += 1;
+    }
+
+    /// Your presence in the active document's session now: its page, selection, viewport and
+    /// edited text, and the pointer.
+    pub fn live_presence(&self) -> Presence {
+        self.presence_in(self.live())
+    }
+
+    /// Your presence in `live` (nothing while another document than its own is in front).
+    pub(super) fn presence_in(&self, live: &Live) -> Presence {
+        let Some(ds) = self.ds().ok().filter(|ds| live.tab == Some(ds.uid)) else { return Presence::default() };
+        let (x0, y0) = ds.view.origin();
+        let z = ds.view.zoom.max(1e-9);
+        sanitize(Presence {
+            cursor: live.cursor.map(|(x, y)| (ds.page, x, y)),
+            selection: Some(ds.selection.clone()),
+            viewport: Some((ds.page, x0, y0, ds.view.vw / z, ds.view.vh / z)),
+            editing_text: ds.text_edit.as_ref().map(|t| Box::new(editing_of(t))),
+        })
+    }
+
+    /// The others typing in text layer `id` of the active document, in its session.
+    pub fn live_text_editors(&self, id: NodeId) -> Vec<&Peer> {
+        if !self.live_shared() {
+            return Vec::new();
+        }
+        let live = self.live();
+        live.presence.iter().filter(|(_, p)| p.editing_text.as_ref().is_some_and(|e| e.node == id)).filter_map(|(c, _)| live.peers.get(c)).collect()
+    }
+
+    /// You started typing in text layer `id`: say so when someone else is typing in it too (both
+    /// edits sync when they finish; the one finished last wins).
+    pub(crate) fn live_text_notice(&mut self, id: NodeId) {
+        let names: Vec<&str> = self.live_text_editors(id).iter().map(|p| p.name.as_str()).collect();
+        if let Some(hint) = editing_hint(&names) {
+            self.message = Some(format!("{hint} too: the version finished last is kept"));
+        }
+    }
+
+    /// Take in what happened in every session (the UI calls it every frame; the network wakes the
+    /// UI when something arrives). Returns whether anything changed.
+    pub fn live_poll(&mut self) -> bool {
+        let Some(link) = self.live.link.as_mut() else { return false };
+        let events = link.poll();
+        if events.is_empty() {
+            return false;
+        }
+        for (id, e) in events {
+            self.live_event(id, e);
+        }
+        self.live_closed();
+        for id in self.live.sessions.keys().copied().collect::<Vec<_>>() {
+            self.live_deferred(id);
+            self.live_follow_apply(id);
+        }
+        self.online_recoveries();
+        true
+    }
+
+    fn live_event(&mut self, id: SessionId, e: Event) {
+        let e = match e {
+            Event::Library { link, reply } => return self.library_answer(&link, reply),
+            Event::Net { job, reply } => return self.background_answer(job, *reply),
+            e => e,
+        };
+        // A session left meanwhile: what was still on its way is dropped.
+        let front = self.tab();
+        let Some(live) = self.live.sessions.get_mut(&id) else { return };
+        // What happens in a file that isn't in front says which file (by its tab's name).
+        let open = self.docs.iter().find(|d| Some(d.uid) == live.doc_uid).map(|d| d.doc.name.as_str());
+        let behind = open.or(live.file_name()).filter(|_| live.tab != front).map(|n| format!(" {n}")).unwrap_or_default();
+        match e {
+            Event::Status(Status::Failed { reason }) => self.live_fail(id, reason),
+            Event::Status(Status::Off) => {
+                self.live.end(id);
+            }
+            Event::Status(st) => {
+                // Who's here comes again with the next welcome; edits wait for it.
+                if let Status::Reconnecting { .. } = st {
+                    live.peers.clear();
+                    live.presence.clear();
+                    live.sent = None;
+                    // Until the host says it reads them again (a spotlight of yours goes out
+                    // again then).
+                    live.signals = false;
+                    live.chats.clear();
+                    live.chat.clear();
+                    live.spotlight = None;
+                    if let Some(c) = live.client.as_mut() {
+                        c.disconnect();
+                    }
+                }
+                live.status = st;
+            }
+            Event::Welcome { mut info, peers } => {
+                // The shared file's name and pages come with the document (the sync welcome).
+                if let Some(old) = live.info.as_ref().filter(|_| info.file_name.is_empty()) {
+                    info.file_name = old.file_name.clone();
+                    info.pages = old.pages.clone();
+                }
+                live.status = Status::Live;
+                live.info = Some(info);
+                live.peers = peers.into_iter().map(|p| (p.client_id, p)).collect();
+                live.presence.retain(|id, _| live.peers.contains_key(id));
+                if live.follow.is_some_and(|f| !live.peers.contains_key(&f)) {
+                    live.unfollow();
+                }
+                // Others need your presence again.
+                live.sent = None;
+            }
+            Event::PeerJoined(p) => {
+                self.message = Some(format!("{} joined{behind}", p.name));
+                live.peers.insert(p.client_id, p);
+            }
+            Event::PeerLeft(peer) => {
+                live.presence.remove(&peer);
+                live.chats.remove(&peer);
+                if live.spotlight == Some(peer) {
+                    live.spotlight = None;
+                }
+                if let Some(p) = live.peers.remove(&peer) {
+                    self.message = Some(format!("{} left{behind}", p.name));
+                }
+                if live.follow == Some(peer) {
+                    live.unfollow();
+                }
+            }
+            Event::Presence(peer, p) => {
+                if live.peers.contains_key(&peer) {
+                    live.presence.insert(peer, p);
+                }
+            }
+            Event::Signal(peer, sig) => self.live_signal_in(id, peer, sig),
+            Event::Sync(welcome @ ServerMsg::Welcome { .. }) if live.client.is_none() => self.live_welcome(id, welcome),
+            // Batches, and the welcome back after a dropped connection: the client catches up in
+            // order.
+            Event::Sync(msg) => live.deferred.push(msg),
+            Event::Ended { reason } => {
+                self.message = Some(if behind.is_empty() { reason } else { format!("{}: {reason}", behind.trim_start()) });
+                self.live.end(id);
+            }
+            Event::Published(p) => {
+                // Shared with a code: the popover shows it, nothing more to say.
+                if live.share.is_none() {
+                    self.message = Some(format!("Published {} to the server", p.name));
+                }
+                let server = live.server.clone();
+                live.published = Some(p.clone());
+                self.online_published(&server, &p);
+            }
+            Event::Shared(Ok(links)) => {
+                let links = clean_shared(links);
+                match live.server_file() {
+                    Some((server, file)) => self.online_shared(&server, &file, Some(links)),
+                    None => {
+                        if let Some(share) = live.share.as_mut() {
+                            share.links = Some(links);
+                        }
+                    }
+                }
+            }
+            Event::Shared(Err(why)) => self.message = Some(format!("The file is on the server, but couldn't be shared: {why}")),
+            Event::Hosting(info) => live.hosting = Some(clean_hosting(info)),
+            Event::Reported(error) => {
+                self.message =
+                    Some(error.map_or_else(|| "Your report was sent to the server's operator".into(), |e| format!("The report wasn't sent: {e}")));
+            }
+            // Answered above.
+            Event::Library { .. } | Event::Net { .. } => {}
+        }
+    }
+
+    /// Someone's cursor chat or spotlight in session `id` (checked again: the host is untrusted
+    /// too), or the host saying it reads them.
+    fn live_signal_in(&mut self, id: SessionId, peer: u32, sig: Signal) {
+        let Some(sig) = sig.clean() else { return };
+        let Some(live) = self.live.sessions.get_mut(&id) else { return };
+        let name = live.peers.get(&peer).map(|p| p.name.clone());
+        match (sig.kind.as_str(), name) {
+            (Signal::READY, _) if live.info.as_ref().is_some_and(|i| i.me == peer) => {
+                live.signals = true;
+                if live.spotlighting {
+                    self.live.send(id, [ClientMsg::Signal(Signal::spotlight(true))]);
+                }
+            }
+            (Signal::CHAT, Some(_)) if sig.text.is_empty() => {
+                live.chats.remove(&peer);
+            }
+            (Signal::CHAT, Some(_)) => {
+                live.chats.insert(peer, sig.text);
+            }
+            (Signal::SPOTLIGHT, Some(name)) if sig.on() => {
+                // Theirs takes over from yours or anyone else's.
+                live.spotlight = Some(peer);
+                live.spotlighting = false;
+                live.follow = Some(peer);
+                live.followed = None;
+                self.message = Some(format!("{name} is spotlighting: you follow their view (move it to stop)"));
+            }
+            (Signal::SPOTLIGHT, Some(name)) if live.spotlight == Some(peer) => {
+                live.spotlight = None;
+                if live.follow == Some(peer) {
+                    live.unfollow();
+                }
+                self.message = Some(format!("{name} stopped spotlighting"));
+            }
+            _ => {}
+        }
+    }
+
+    /// Why cursor chat or a spotlight can't go out now, if it can't.
+    pub(super) fn signal_blocker(&self) -> Option<&'static str> {
+        let live = self.live();
+        if live.status != Status::Live {
+            Some("cursor chat and spotlight need a live session")
+        } else if !live.signals {
+            Some("the session's host runs an older version without cursor chat and spotlight")
+        } else {
+            None
+        }
+    }
+
+    /// Show `text` next to your pointer for everyone (empty closes it); returns it as sent
+    /// (control characters out, at most [`Signal::MAX_CHAT`] characters).
+    pub fn live_chat(&mut self, text: &str) -> Result<String> {
+        let sig = Signal::chat(text).clean().unwrap_or_default();
+        if sig.text.is_empty() && self.live().chat.is_empty() {
+            return Ok(String::new());
+        }
+        if let Some(why) = self.signal_blocker() {
+            return Err(EngineError::Disabled("collab.cursorChat".into(), why.into()));
+        }
+        let Some(live) = self.live_mut() else { return Ok(String::new()) };
+        if sig.text != live.chat {
+            live.chat.clone_from(&sig.text);
+            let id = live.id;
+            self.live.send(id, [ClientMsg::Signal(sig.clone())]);
+        }
+        Ok(sig.text)
+    }
+
+    /// Start (`on`) or stop asking everyone to follow your view.
+    pub fn live_spotlight(&mut self, on: bool) -> Result<()> {
+        if on == self.live().spotlighting {
+            return Ok(());
+        }
+        if on && let Some(why) = self.signal_blocker() {
+            return Err(EngineError::Disabled("collab.spotlight".into(), why.into()));
+        }
+        let Some(live) = self.live_mut() else { return Ok(()) };
+        if on {
+            live.unfollow();
+            live.spotlight = None;
+        }
+        live.spotlighting = on;
+        let id = live.id;
+        self.live.send(id, [ClientMsg::Signal(Signal::spotlight(on))]);
+        Ok(())
+    }
+
+    /// Session `id`'s welcome: start the sync client; the host keeps editing the document it
+    /// shared, a guest opens the host's file as a new tab (or gets it again in that tab after a
+    /// reconnect).
+    fn live_welcome(&mut self, id: SessionId, welcome: ServerMsg) {
+        let client = match Client::join(welcome) {
+            Ok(c) => c,
+            Err(e) => return self.live_fail(id, format!("Couldn't open the shared file: {e}")),
+        };
+        let Some(live) = self.live.sessions.get(&id) else { return };
+        let existing = live.doc_uid.filter(|u| self.docs.iter().any(|d| d.uid == *u));
+        let (uid, synced) = match (live.role(), existing) {
+            (Some(Role::Host), Some(uid)) => {
+                if let Some(ds) = self.docs.iter_mut().find(|d| d.uid == uid) {
+                    let was_dirty = ds.is_dirty();
+                    // Undo is per user from now on: earlier whole-document steps would revert
+                    // others' edits.
+                    ds.history.undo.clear();
+                    ds.history.redo.clear();
+                    ds.doc_mut().set_client_id(client.id());
+                    if !was_dirty {
+                        ds.mark_saved();
+                    }
+                }
+                // Edits made since hosting started go out with the first sync.
+                (uid, None)
+            }
+            (Some(Role::Guest), Some(uid)) => {
+                // Joining again in this tab, or the file you published arriving from the server.
+                let doc = Arc::new(client.document().clone());
+                let was_dirty = self.docs.iter().find(|d| d.uid == uid).is_some_and(DocState::is_dirty);
+                self.apply_remote(uid, doc.clone());
+                if let Some(ds) = self.docs.iter_mut().find(|d| d.uid == uid) {
+                    // Undo is per user from now on: earlier whole-document steps would revert
+                    // others' edits.
+                    ds.history.undo.clear();
+                    ds.history.redo.clear();
+                    if !was_dirty {
+                        ds.mark_saved();
+                    }
+                }
+                (uid, Some(doc))
+            }
+            (Some(Role::Guest), None) => {
+                // The session's file gets a tab of its own, in front.
+                let ds = DocState::new(client.document().clone(), None);
+                self.message = Some(format!("Joined {}", ds.doc.name));
+                let opened = (ds.uid, Some(ds.doc.clone()));
+                self.active = self.docs.len();
+                self.docs.push(ds);
+                opened
+            }
+            _ => return,
+        };
+        // A view link: the editing tools are off.
+        if client.access() == Access::View && self.tab() == Some(uid) && !matches!(self.tool.tool, ToolId::Move | ToolId::Hand) {
+            self.set_tool(ToolId::Move);
+        }
+        let Some(live) = self.live.sessions.get_mut(&id) else { return };
+        let doc = client.document();
+        if let Some(info) = live.info.as_mut() {
+            info.file_name = doc.name.clone();
+            info.pages = doc.pages.iter().map(|p| PageInfo { id: p.0, name: doc.node(*p).map(|n| n.name.clone()).unwrap_or_default() }).collect();
+        }
+        live.doc_uid = Some(uid);
+        live.tab = Some(uid);
+        live.synced = synced;
+        live.client = Some(client);
+        live.deferred.clear();
+    }
+
+    /// Session `id` is over with a message: it couldn't be joined, the connection was lost for
+    /// good or sync broke. Its tab shows why.
+    pub(super) fn live_fail(&mut self, id: SessionId, reason: String) {
+        log::warn!("live session: {reason}");
+        self.live.leave(id);
+        if let Some(live) = self.live.sessions.get_mut(&id) {
+            live.reset();
+            live.status = Status::Failed { reason: reason.clone() };
+        }
+        self.message = Some(reason);
+    }
+
+    /// Why document `uid` can't be edited now, if it can't: you may only view it in its session,
+    /// or it is on its way to a server.
+    pub fn live_read_only(&self, uid: u64) -> Option<&'static str> {
+        let live = self.live.doc(uid)?;
+        match &live.client {
+            Some(c) if c.access() == Access::View => Some(VIEW_ONLY),
+            Some(_) => None,
+            None if live.status.active() && live.role() != Some(Role::Host) => Some(PUBLISHING),
+            None => None,
+        }
+    }
+
+    /// The active document can't be edited now (see [`live_read_only`](Self::live_read_only)).
+    pub fn active_read_only(&self) -> Option<&'static str> {
+        self.tab().and_then(|uid| self.live_read_only(uid))
+    }
+}
diff --git a/crates/engine/src/sharing/live/host.rs b/crates/engine/src/sharing/live/host.rs
new file mode 100644
index 00000000..685ab5c0
--- /dev/null
+++ b/crates/engine/src/sharing/live/host.rs
@@ -0,0 +1,272 @@
+use super::types::{Bind, HostOptions, NetReply, NetRequest, ONLINE_OFF, PublishOptions, Role, SessionId, Share, Shared, SharedLink, Status, Via};
+use super::*;
+
+/// What a server says about its hosting, made safe to show: no control characters, short, and a
+/// terms address only when it is a web page (`http(s)://`).
+pub(super) fn clean_hosting(mut info: HostInfo) -> HostInfo {
+    let clean = |s: &str, n: usize| s.trim().chars().filter(|c| !c.is_control()).take(n).collect::<String>();
+    info.operator = clean(&info.operator, 120);
+    info.terms = clean(&info.terms, 500);
+    let web = info.terms.starts_with("https://") || info.terms.starts_with("http://");
+    if !web || info.terms.contains(char::is_whitespace) {
+        info.terms.clear();
+    }
+    info
+}
+
+/// A server's hosting as JSON (`collab.peers`, `collab.serverInfo`).
+pub fn hosting_json(h: &HostInfo) -> Value {
+    json!({
+        "open": h.open,
+        "operator": h.operator,
+        "terms": h.terms,
+        "idleDays": (h.idle_secs > 0).then(|| (h.idle_secs as f64 / 86_400.0 * 100.0).round() / 100.0),
+        "maxFileMb": h.max_file_mb,
+        "expires": h.expires,
+    })
+}
+
+pub(super) fn unavailable(cmd: &str) -> EngineError {
+    EngineError::Disabled(
+        cmd.to_string(),
+        "live sessions aren't available here (the desktop app and the MCP server host and join them; the web build joins)".into(),
+    )
+}
+
+pub(super) fn host(s: &mut Session, p: &Value) -> Result<Value> {
+    start_host(s, "collab.host", p, Bind::Local, false)?;
+    Ok(s.live_summary())
+}
+
+/// Start hosting the open file for command `cmd` (on `bind` unless `p` says where; `short`: with
+/// a secret a join code can carry): the new session.
+fn start_host(s: &mut Session, cmd: &str, p: &Value, bind: Bind, short: bool) -> Result<SessionId> {
+    let port = match get(p, "port") {
+        None => None,
+        Some(v) => Some(v.as_u64().and_then(|n| u16::try_from(n).ok()).ok_or_else(|| bad(cmd, "`port` must be a whole number from 0 to 65535"))?),
+    };
+    let bind = match string(p, "bind").as_deref().map(str::trim) {
+        None => bind,
+        Some("local") => Bind::Local,
+        Some("lan") => Bind::Lan,
+        Some(other) => other.parse::<IpAddr>().map(Bind::Addr).map_err(|_| bad(cmd, "`bind` must be \"local\", \"lan\" or an IP address"))?,
+    };
+    let (doc, uid) = s.ds().map(|ds| (ds.doc.clone(), ds.uid))?;
+    let opts = HostOptions { port, bind, name: display_name(&s.prefs), doc, short };
+    let (id, info) = s.live.start(cmd, |l, id| l.host(id, opts).map_err(|e| EngineError::Other(format!("couldn't start the live session: {e}"))))?;
+    s.live.open(Live { id, status: Status::Live, info: Some(info), doc_uid: Some(uid), tab: Some(uid), ..Live::default() });
+    Ok(id)
+}
+
+pub(super) fn publish(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "collab.publish";
+    let server = req_string(CMD, p, "server")?;
+    start_publish(s, CMD, &server, p, false)?;
+    Ok(s.live_summary())
+}
+
+/// Start publishing the open file to `server` for command `cmd` (`share`: with links and join
+/// codes for others too): the new session.
+fn start_publish(s: &mut Session, cmd: &str, server: &str, p: &Value, share: bool) -> Result<SessionId> {
+    let key = string(p, "key").map(|k| k.trim().to_string()).filter(|k| !k.is_empty());
+    let (doc, uid) = s.ds().map(|ds| (ds.doc.clone(), ds.uid))?;
+    let name = string(p, "name").map(|n| n.trim().chars().filter(|c| !c.is_control()).take(256).collect::<String>()).filter(|n| !n.is_empty());
+    let me = display_name(&s.prefs);
+    let opts = PublishOptions { server: server.trim().to_string(), key, name: name.unwrap_or_else(|| doc.name.clone()), me, doc, share };
+    let (id, ()) = s.live.start(cmd, |l, id| l.publish(id, opts).map_err(|e| bad(cmd, e)))?;
+    // This tab becomes the server file's synced document once it is there.
+    s.live.open(Live { id, status: Status::Connecting, doc_uid: Some(uid), tab: Some(uid), server: server.trim().to_string(), ..Live::default() });
+    Ok(id)
+}
+
+/// Why a local network share has no view-only code.
+const LOCAL_EDITS: &str = "everyone who joins a file shared on the local network can edit it: share it online for a view-only code";
+
+pub(super) fn share(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "collab.share";
+    let via = match string(p, "via").as_deref().map(str::trim) {
+        None | Some("online") => Via::Online,
+        Some("local") => Via::Local,
+        Some(_) => return Err(bad(CMD, "`via` must be \"online\" or \"local\"")),
+    };
+    let access = match string(p, "access") {
+        None => None,
+        Some(a) => Some(Access::parse(&a).ok_or_else(|| bad(CMD, "`access` must be \"edit\" or \"view\""))?),
+    };
+    // A share of this file is there already: only which code is shown changes, or (the file is
+    // on the server, not shared at the moment) it gets new links and codes. Nothing is published
+    // twice.
+    if let Some(shared) = s.live().share.as_ref().filter(|_| s.live().status.active()).map(|sh| sh.via) {
+        if get(p, "via").is_some() && shared != via {
+            return Err(bad(
+                CMD,
+                "this file is shared the other way already: stop sharing it first (collab.stop), or leave its session (collab.leave)",
+            ));
+        }
+        if access == Some(Access::View) && shared == Via::Local {
+            return Err(bad(CMD, LOCAL_EDITS));
+        }
+        if let Some(req) = share_request(s, Vec::new(), true).filter(|_| s.live().share.as_ref().is_some_and(|sh| sh.links.is_none())) {
+            let links = share_answer(s, req)?.ok_or_else(|| EngineError::Other("the server made no links".into()))?;
+            shared_now(s, Some(clean_shared(links)));
+        }
+        if let (Some(a), Some(sh)) = (access, s.live_mut().and_then(|l| l.share.as_mut())) {
+            sh.access = a;
+        }
+        return Ok(s.live_summary());
+    }
+    let access = access.unwrap_or_default();
+    let mut server = String::new();
+    let id = match via {
+        Via::Local if access == Access::View => return Err(bad(CMD, LOCAL_EDITS)),
+        Via::Local => start_host(s, CMD, p, Bind::Lan, true)?,
+        Via::Online => {
+            server = string(p, "server").unwrap_or_else(|| s.prefs.publish_server.clone()).trim().to_string();
+            if server.is_empty() {
+                return Err(EngineError::Disabled(CMD.into(), ONLINE_OFF.into()));
+            }
+            start_publish(s, CMD, &server, p, true)?
+        }
+    };
+    if let Some(live) = s.live.sessions.get_mut(&id) {
+        // On the local network the session's own link is what others join with, and the code says
+        // what the link says: where the session is and its secret. (Online they arrive with the file.)
+        let links = live.info.as_ref().filter(|_| via == Via::Local).map(|i| {
+            let code = code::Local::from_link(&i.link).map(|l| l.code());
+            Shared { edit: SharedLink { id: String::new(), link: i.link.clone(), code }, view: None }
+        });
+        live.share = Some(Share { via, server, access, links });
+    }
+    Ok(s.live_summary())
+}
+
+/// What others join the open file's server file with changed: in its session and its record.
+pub(super) fn shared_now(s: &mut Session, links: Option<Shared>) {
+    if let Some((server, file)) = s.live().server_file() {
+        s.online_shared(&server, &file, links);
+    }
+}
+
+/// Links and codes as a server gave them, with only codes that are codes (nine symbols).
+pub(crate) fn clean_shared(mut links: Shared) -> Shared {
+    let clean = |l: &mut SharedLink| l.code = l.code.take().and_then(|c| code::normalize(&c).ok()).filter(|c| c.len() == code::ONLINE_LEN);
+    clean(&mut links.edit);
+    links.view.as_mut().map(clean);
+    links
+}
+
+/// The request that changes who else gets into the server file the open file's session is its
+/// owner's session of (`None`: it isn't one, or the file isn't there yet).
+pub(super) fn share_request(s: &Session, revoke: Vec<String>, create: bool) -> Option<NetRequest> {
+    let live = s.live();
+    let (share, published) = (live.share.as_ref().filter(|s| s.via == Via::Online)?, live.published.as_ref()?);
+    if live.status != Status::Live {
+        return None;
+    }
+    // The token this session got when it published the file, else the recorded one.
+    let owner = published.owner.clone().or_else(|| s.online_owner(&share.server, &published.file)).unwrap_or_default();
+    Some(NetRequest::Share { server: share.server.clone(), file: published.file.clone(), owner, revoke, create })
+}
+
+/// Send `req` ([`NetRequest::Share`]): the new links, if it made any.
+pub(crate) fn share_answer(s: &mut Session, req: NetRequest) -> Result<Option<Shared>> {
+    match s.net(req)?.0 {
+        NetReply::Share(Ok(links)) => Ok(links),
+        NetReply::Share(Err(why)) => Err(EngineError::Other(why)),
+        _ => Err(EngineError::Other("the server answered something else".into())),
+    }
+}
+
+/// What the server at `server` says about its hosting, and its answer to `req` about `file` with
+/// its owner token (`collab.serverInfo`, `collab.manageFile`).
+pub(super) fn hosting_request(
+    s: &mut Session,
+    cmd: &str,
+    server: &str,
+    file: &str,
+    owner: &str,
+    req: Option<Admin>,
+) -> Result<(HostInfo, Option<AdminReply>)> {
+    let req = NetRequest::Hosting { server: server.to_string(), file: file.to_string(), owner: owner.to_string(), req };
+    match s.net(req)?.0 {
+        // The server's refusals say why themselves.
+        NetReply::Hosting(Ok((_, Some(AdminReply::Failed { reason })))) | NetReply::Hosting(Err(reason)) => Err(EngineError::Other(reason)),
+        NetReply::Hosting(Ok((info, reply))) => Ok((clean_hosting(info), reply)),
+        _ => Err(EngineError::Other(format!("{cmd}: the server answered something else"))),
+    }
+}
+
+pub(super) fn server_info(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "collab.serverInfo";
+    let server = req_string(CMD, p, "server")?;
+    let (info, _) = hosting_request(s, CMD, server.trim(), "", "", None)?;
+    Ok(hosting_json(&info))
+}
+
+pub(super) fn manage_file(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "collab.manageFile";
+    let file = req_string(CMD, p, "file")?.trim().to_string();
+    let (server, owner) = crate::online::manager(s, CMD, p, &file)?;
+    let action = req_string(CMD, p, "action")?;
+    let mut renamed = None;
+    let req = match action.trim() {
+        "share" => return crate::online::set_shared(s, CMD, &server, &file, &owner, true),
+        "unshare" => return crate::online::set_shared(s, CMD, &server, &file, &owner, false),
+        "links" => Admin::Links { file: file.clone() },
+        "createLink" => {
+            let access = match string(p, "access").as_deref().map(str::trim) {
+                None | Some("view") => Access::View,
+                Some("edit") => Access::Edit,
+                Some(_) => return Err(bad(CMD, "`access` must be \"edit\" or \"view\"")),
+            };
+            Admin::CreateLink { file: file.clone(), access, label: string(p, "label").unwrap_or_default() }
+        }
+        "revoke" => Admin::Revoke { file: file.clone(), link: req_string(CMD, p, "link")?.trim().to_string() },
+        "rename" => {
+            let name = req_string(CMD, p, "name")?;
+            renamed = Some(name.clone());
+            Admin::Rename { file: file.clone(), name }
+        }
+        "remove" => Admin::Remove { file: file.clone() },
+        _ => return Err(bad(CMD, "`action` must be links, createLink, revoke, share, unshare, rename or remove")),
+    };
+    let changes = matches!(req, Admin::Rename { .. } | Admin::Remove { .. });
+    let reply = hosting_request(s, CMD, &server, &file, &owner, Some(req))?.1;
+    // The record follows what the server did.
+    if changes && reply == Some(AdminReply::Done) {
+        crate::online::managed(s, &server, &file, renamed.as_deref());
+        if renamed.is_none() {
+            crate::online::removed(s, &server, &file);
+        }
+    }
+    match reply {
+        Some(AdminReply::Links(links)) => Ok(json!({"links": links.iter().map(|l| json!({
+            "id": l.id, "access": l.access.id(), "label": l.label, "created": l.created
+        })).collect::<Vec<_>>()})),
+        // The link layer gives the new link whole in place of its token.
+        Some(AdminReply::Link(l)) => Ok(json!({"id": l.link.id, "access": l.link.access.id(), "link": l.token})),
+        Some(AdminReply::Done) => Ok(json!({"done": true})),
+        _ => Err(bad(CMD, "the server answered something else")),
+    }
+}
+
+pub(super) fn report(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "collab.report";
+    let reason: String = req_string(CMD, p, "reason")?.trim().chars().map(|c| if c.is_control() { ' ' } else { c }).take(MAX_REPORT).collect();
+    if reason.is_empty() {
+        return Err(bad(CMD, "say in a few words what is wrong with the file (`reason`)"));
+    }
+    let live = s.live();
+    if live.status != Status::Live || live.role() != Some(Role::Guest) {
+        return Err(bad(CMD, "join a file on a FigCraft server first: reports go to that server's operator"));
+    }
+    if live.hosting.is_none() {
+        return Err(bad(CMD, "this server doesn't take reports (it is older than this app); contact its operator another way"));
+    }
+    let id = live.id;
+    s.live.send(id, [ClientMsg::Report { reason }]);
+    Ok(json!({"sent": true}))
+}
+
+/// Longest report sent (characters).
+pub const MAX_REPORT: usize = 500;
diff --git a/crates/engine/src/sharing/live/join.rs b/crates/engine/src/sharing/live/join.rs
new file mode 100644
index 00000000..972198ef
--- /dev/null
+++ b/crates/engine/src/sharing/live/join.rs
@@ -0,0 +1,259 @@
+use super::host::{host, hosting_request, manage_file, publish, report, server_info, share, share_answer, share_request, shared_now, unavailable};
+use super::types::{Published, Role, SessionId, Share, Status, join_target};
+use super::*;
+
+fn join(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "collab.join";
+    let typed = match string(p, "code") {
+        Some(code) => code,
+        None => req_string(CMD, p, "link").map_err(|_| bad(CMD, "give the join `code` you were told, or the invite `link`"))?,
+    };
+    let link = join_target(&s.prefs.publish_server, &typed).map_err(|e| bad(CMD, e))?;
+    let id = start_join(s, CMD, &link, None, None, None)?;
+    Ok(s.live.get(id).map_or(Value::Null, |l| s.summary(l)))
+}
+
+/// Start joining the session behind `link` for command `cmd`: the new session. `published` and
+/// `share`: the file is yours on a server (`collab.openFile`), with what others join it with;
+/// `resume`: as the client you were there.
+pub(crate) fn start_join(
+    s: &mut Session,
+    cmd: &str,
+    link: &str,
+    published: Option<Published>,
+    share: Option<Share>,
+    resume: Option<Resume>,
+) -> Result<SessionId> {
+    let (name, tab) = (display_name(&s.prefs), s.tab());
+    let (id, ()) = s.live.start(cmd, |l, id| l.join_resuming(id, link, &name, resume).map_err(|e| bad(cmd, e)))?;
+    let server = share.as_ref().map(|s| s.server.clone()).unwrap_or_default();
+    // The session's file opens in a tab of its own; until then the join shows on this one.
+    s.live.open(Live { id, status: Status::Connecting, tab, server, published, share, ..Live::default() });
+    Ok(id)
+}
+
+fn leave(s: &mut Session, _: &Value) -> Result<Value> {
+    let ended = s.live.shown(s.tab()).and_then(|id| s.live.end(id));
+    if ended.as_ref().is_some_and(|l| l.syncing() && l.role() == Some(Role::Guest)) {
+        s.message = Some("You left the session; your copy stays open here".into());
+    }
+    Ok(json!({"ended": ended.is_some_and(|l| l.status.active())}))
+}
+
+fn stop(s: &mut Session, p: &Value) -> Result<Value> {
+    // A file shared online stays its owner's on the server: stopping takes the others' links (and
+    // their codes) away, which disconnects whoever joined with them, and the owner stays in the
+    // file. Anything else (a session this app hosts, one it joined, a file not shared now) ends.
+    let shared = s.live().share.as_ref().and_then(|sh| sh.links.as_ref());
+    let ids: Vec<String> = shared.into_iter().flat_map(|l| [Some(&l.edit), l.view.as_ref()]).flatten().map(|l| l.id.clone()).collect();
+    let Some(req) = share_request(s, ids, false).filter(|_| shared.is_some()) else { return leave(s, p) };
+    share_answer(s, req).map_err(|e| EngineError::Other(format!("couldn't stop sharing (the others can still get in): {e}")))?;
+    shared_now(s, None);
+    s.message = Some("Sharing stopped: the file stays on the server, open only to you".into());
+    Ok(json!({"ended": false, "shared": false}))
+}
+
+fn follow(s: &mut Session, p: &Value) -> Result<Value> {
+    match get(p, "client") {
+        None => {
+            s.live_unfollow();
+        }
+        Some(v) => {
+            let id = v.as_u64().and_then(|n| u32::try_from(n).ok()).ok_or_else(|| bad("collab.follow", "`client` must be a client id"))?;
+            s.live_follow(id)?;
+        }
+    }
+    Ok(json!({"follow": s.live().follow}))
+}
+
+/// Remove someone from the open file's session: in a session this app hosts, the hub drops them;
+/// in a file of yours on a server, the server does (with the file's owner token). They are told
+/// the session is over for them, keep their copy, and can't join again from their address while
+/// the session (or the server) runs.
+fn remove_person(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "collab.removePerson";
+    let client =
+        get(p, "client").and_then(Value::as_u64).and_then(|n| u32::try_from(n).ok()).ok_or_else(|| bad(CMD, "`client` must be a client id"))?;
+    let live = s.live();
+    if live.status != Status::Live {
+        return Err(bad(CMD, "the open file isn't in a live session"));
+    }
+    let name =
+        live.peers.get(&client).map(|p| p.name.clone()).ok_or_else(|| bad(CMD, format!("nobody with client id {client} is in the session")))?;
+    let (id, role, server_file) = (live.id, live.role(), live.server_file());
+    match (role, server_file) {
+        (Some(Role::Host), _) => {
+            let link = s.live.link.as_deref_mut().ok_or_else(|| unavailable(CMD))?;
+            link.remove(id, client).map_err(EngineError::Other)?;
+        }
+        (Some(Role::Guest), Some((server, file))) => {
+            let owner =
+                s.live().published.as_ref().and_then(|p| p.owner.clone()).or_else(|| s.online_owner(&server, &file)).filter(|o| !o.is_empty());
+            let owner = owner.ok_or_else(|| bad(CMD, "only the file's owner can remove people from it"))?;
+            let req = Some(Admin::RemovePeer { file: file.clone(), client });
+            match hosting_request(s, CMD, &server, &file, &owner, req) {
+                Ok((_, Some(AdminReply::Done))) => {}
+                Ok(_) => return Err(EngineError::Other(format!("couldn't remove {name}: the server answered something else"))),
+                // A server older than this request can't read it.
+                Err(e) => return Err(EngineError::Other(format!("couldn't remove {name}: {e} (the server may be older than removing people)"))),
+            }
+        }
+        _ => return Err(bad(CMD, "only the person hosting the session, or the file's owner, can remove people")),
+    }
+    s.message = Some(format!("{name} was removed from the session"));
+    Ok(json!({"removed": client, "name": name}))
+}
+
+/// You may remove others from the open file's session: you host it, or it is your file on a
+/// server.
+pub fn can_remove_people(s: &Session) -> bool {
+    let live = s.live();
+    live.status == Status::Live
+        && match live.role() {
+            Some(Role::Host) => true,
+            Some(Role::Guest) => live.server_file().is_some_and(|(server, file)| {
+                live.published.as_ref().and_then(|p| p.owner.as_deref()).is_some_and(|o| !o.is_empty())
+                    || s.online_owner(&server, &file).is_some_and(|o| !o.is_empty())
+            }),
+            None => false,
+        }
+}
+
+fn cursor(s: &mut Session, p: &Value) -> Result<Value> {
+    let at = match (num(p, "x"), num(p, "y")) {
+        (Some(x), Some(y)) => Some((x, y)),
+        (None, None) => None,
+        _ => return Err(bad("collab.cursor", "give both `x` and `y` (page coordinates), or neither to hide the cursor")),
+    };
+    if let Some(l) = s.live_mut() {
+        l.cursor = at;
+    }
+    s.live_sync();
+    Ok(json!({"cursor": s.live().cursor.map(|(x, y)| [x, y])}))
+}
+
+fn cursor_chat(s: &mut Session, p: &Value) -> Result<Value> {
+    let Some(v) = get(p, "text") else {
+        // The app's chat box (programmatic calls never open dialogs).
+        let open = s.signal_blocker().is_none();
+        if open {
+            s.request_ui("dialog.cursorChat", json!({}));
+        }
+        return Ok(json!({"open": open, "chat": s.live().chat}));
+    };
+    let text = v.as_str().ok_or_else(|| bad("collab.cursorChat", "`text` must be a string (empty closes the chat)"))?;
+    Ok(json!({"chat": s.live_chat(text)?}))
+}
+
+fn spotlight(s: &mut Session, p: &Value) -> Result<Value> {
+    let on = match get(p, "on") {
+        None => !s.live().spotlighting,
+        Some(v) => v.as_bool().ok_or_else(|| bad("collab.spotlight", "`on` must be true or false"))?,
+    };
+    s.live_spotlight(on)?;
+    Ok(json!({"spotlighting": s.live().spotlighting}))
+}
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        spec!(
+            "collab.host",
+            "Start live session",
+            "{port? (default 47900, else any free port), bind?: \"local\" (this machine, default) | \"lan\" (the local network) | an IP address} → the open file's session: {session, link, url (invites: they carry the secret token), address, …}; sessions are per file, so other files' sessions go on (a session this file was in ends)",
+            false,
+            host
+        ),
+        spec!(
+            "collab.share",
+            "Share with a join code",
+            "{via?: \"online\" (default: the open file is kept on the server in Preferences, `pref.publishServer`, and the server hands out the codes) | \"local\" (this app hosts it for people on the same network; no server), access?: \"edit\" (default) | \"view\" (online only: which code `code` is), server? (online: another server's address, with ?key=… when it needs its key), name? (online: the file's name there), port?, bind?: \"lan\" (default) | \"local\" (this machine only) | an IP address (local)} → the open file's session as `collab.peers` gives it: `code` is what others type to join (`collab.join {code}`, the Join field), `link` an invite link. Local: at once, the code carries the host's IPv4 address, port and secret (K7M2Q-…, 20 symbols). Online: status \"connecting\" first; once live `code` is the server's (K7M-2QX-9TD) and `share` is {via, access, shared, editCode, viewCode, editLink, viewLink}: links made for others (the file's own links in `published` stay yours); `code` stays null when the server is older than join codes (give `share.editLink` / `share.viewLink` instead). Called again while shared: only switches which code `code` is (`access`). Called after `collab.stop` on a file that is still on the server: new links and codes for that same file (nothing is published twice). `collab.stop` stops sharing",
+            false,
+            share
+        ),
+        spec!(
+            "collab.stop",
+            "Stop live session",
+            "{} → {ended}: the open file's session ends (a session this app hosts stops for everyone; a joined one is left). A file shared online with `collab.share` is different: its sharing stops → {ended: false, shared: false}: the links and codes others got are revoked on the server, whoever joined with them is disconnected at once (they keep their copy), and you stay in the file, which stays on the server, open only to you (`collab.share` shares it again with new codes; `collab.leave` leaves it there; `collab.manageFile {action: \"remove\"}` with its owner token takes it off the server)",
+            false,
+            stop
+        ),
+        spec!(
+            "collab.join",
+            "Join live session",
+            "{code: a join code (K7M-2QX-9TD from a server, asked at the server in Preferences; a longer one for the local network; spaces, dashes and case don't matter, O reads as 0 and I or L as 1) | link: figcraft://join?host=…&file=…&token=…, figcraft://join?server=ws(s)://…&file=…&token=… or ws(s)://host:port/?file=…&token=… (a session an app hosts, or a server's share link; a code here works too)} → the new session: {session, status: \"connecting\", …}; its file opens in a tab of its own (other files' sessions go on) and `collab.peers` tells when it's live (`sessions` lists it until then, and if it fails)",
+            false,
+            join
+        ),
+        spec!(
+            "collab.leave",
+            "Leave live session",
+            "{} (the open file's session; the synced file stays open as a local copy) → {ended}",
+            false,
+            leave
+        ),
+        spec!(
+            "collab.publish",
+            "Publish to server",
+            "{server: ws://host:port/?key=… or wss://host/path/?key=… (the server's address with its key; `figcraft-server key` prints it; without a key on a server open to the public), key? (when the address has none), name? (default: the file's name)} → status \"connecting\": the open file is uploaded as a new file and this tab syncs through the server; `collab.peers` then has `published: {server, file, name, edit, view, owner (published without a key: the owner token, shown once), expires (seconds since 1970, or null)}` and `hosting` (the server's operator, terms and idle expiry)",
+            false,
+            publish
+        ),
+        spec!(
+            "collab.serverInfo",
+            "Server info",
+            "{server: ws://host:port/ or wss://host/path/} → {open (anyone may publish without the key), operator, terms (a web address), idleDays (files published without the key are deleted after this many days unopened; null: kept), maxFileMb, expires}",
+            false,
+            server_info
+        ),
+        spec!(
+            "collab.manageFile",
+            "Manage published file",
+            "{file (its id), server?, owner? (the server's address and the owner token you got when you published the file without the key; each defaults to what is recorded for one of your online files, see `collab.files`), action: links | createLink {access?: view (default) | edit, label?} | revoke {link (a link's id)} | share (others get new links and join codes) | unshare (the links and codes others got are revoked; the file stays yours on the server) | rename {name} | remove (the file is deleted from the server and leaves your online files)} → {links: [{id, access, label, created}]} | {id, access, link (a new share link, shown once)} | {shared, code, viewCode, editLink, viewLink} | {done}",
+            false,
+            manage_file
+        ),
+        spec!(
+            "collab.report",
+            "Report file to server operator",
+            "{reason (a few words, at most 500 characters)} → {sent}: the file you joined on a server is reported to its operator; the session's message says when the server kept it (servers older than this app don't take reports)",
+            false,
+            report
+        ),
+        spec!(
+            "collab.peers",
+            "People in this file",
+            "{} → the open file's session (each open file has its own or none): {available, canHost (false in the browser: it can only join), session (its id; null: this file isn't in a session), status: off|connecting|live|reconnecting|failed, reason?, role, me, name, color, fileName, pages, link, url, address, network, access: edit|view (view: a server's view link; edits are refused), readOnly (the open file can't be edited now: view only, or being published), published (a file you published: {server, file, name, edit, view}), code (the join code to give others, when the file was shared with `collab.share`; null otherwise or while it is on its way), share ({via: online|local, access, shared (false: a file of yours on a server that nobody else gets into now), editCode, viewCode, editLink, viewLink (what others join with; null when not shared)} or null), follow, syncing, document (index of the synced open document), editing (the text layer you type in: {node, layer, caret, selection}), peers: [{id, name, color, editing (theirs, same shape, or null), presence: {cursor: [page, x, y], selection, viewport: [page, x, y, w, h], editing_text}}], sessions: [{session, document (index of its open document; null for a join on its way), status, reason, role, fileName, link, peers (how many others)}] (every session of the app)}",
+            false,
+            |s, _| Ok(s.live_summary())
+        ),
+        spec!("collab.follow", "Follow", "{client? (a peer's id; omit to stop following)} → {follow}", false, follow),
+        spec!(
+            "collab.removePerson",
+            "Remove from session",
+            "{client (a peer's id)} → {removed, name}: they are disconnected (they keep their copy) and can't join again from their address while the session runs; only the person hosting, or the owner of a file on a server, can do it",
+            false,
+            remove_person
+        ),
+        spec!(
+            "collab.cursor",
+            "Show cursor at",
+            "{x?, y? (page coordinates on the current page; omit both to hide)} → {cursor} (agents; in the app the pointer drives it): your pointer in the open file's session (null when the file isn't in one)",
+            false,
+            cursor
+        ),
+        spec!(
+            "collab.cursorChat",
+            "Cursor chat",
+            "{text? (shown next to your cursor for everyone, at most 100 characters; empty closes it; omit to open the chat box in the app)} → {chat} (or {open}); others see it fade after 5 s without changes",
+            false,
+            cursor_chat
+        ),
+        spec!(
+            "collab.spotlight",
+            "Spotlight me",
+            "{on? (default: toggle)} → {spotlighting}: everyone in the session follows your view and page until they move theirs",
+            false,
+            spotlight
+        ),
+    ]
+}
diff --git a/crates/engine/src/sharing/live/sync.rs b/crates/engine/src/sharing/live/sync.rs
new file mode 100644
index 00000000..f2fd3c54
--- /dev/null
+++ b/crates/engine/src/sharing/live/sync.rs
@@ -0,0 +1,347 @@
+use super::host::hosting_json;
+use super::types::{NO_SESSION, SessionId, Share, SharedLink, Status};
+use super::*;
+
+impl Session {
+    /// Your client id in document `uid`'s live session (`None`: it isn't in one). Refused for
+    /// `cmd` while the session is on its way: there is no id yet.
+    pub(crate) fn live_client_id(&self, cmd: &str, uid: u64) -> Result<Option<u32>> {
+        let Some(live) = self.live.doc(uid) else { return Ok(None) };
+        match &live.client {
+            Some(c) => Ok(Some(c.id())),
+            None if live.status.active() => Err(EngineError::Disabled(cmd.into(), "wait until the file's live session has started".into())),
+            None => Ok(None),
+        }
+    }
+
+    /// Branch `id` of document `uid` got its base from the session document just now.
+    pub(crate) fn live_branch_base(&mut self, uid: u64, id: &str) {
+        if let Some(live) = self.live.doc_mut(uid).filter(|l| l.syncing()) {
+            live.branch_bases.insert(id.to_string());
+        }
+    }
+
+    /// Whether branch `id` of document `uid` got its base in the live session it is in now.
+    pub(crate) fn live_branch_in_session(&self, uid: u64, id: &str) -> bool {
+        self.live.doc(uid).is_some_and(|l| l.syncing() && l.branch_bases.contains(id))
+    }
+
+    /// Whether document `uid` is a live session's synced document: its edits sync and its undo
+    /// history is the user's own.
+    pub fn live_doc(&self, uid: u64) -> bool {
+        self.live.doc(uid).is_some_and(Live::syncing)
+    }
+
+    /// Sync the edits of session document `uid` as one batch: one step of the user's undo history
+    /// called `label`, or not undoable (`None`: also what changed it outside a command). Nothing
+    /// while a gesture or preview shows, or inside a group (it syncs when the group ends).
+    pub(crate) fn live_edit(&mut self, uid: u64, label: Option<&str>) {
+        let Some(ds) = self.docs.iter().find(|d| d.uid == uid) else { return };
+        let Some(live) = self.live.doc(uid) else { return };
+        if live.hold > 0 || busy(ds) || live.synced.as_ref().is_some_and(|s| Arc::ptr_eq(s, &ds.doc)) {
+            return;
+        }
+        let (id, doc, synced) = (live.id, ds.doc.clone(), live.synced.clone());
+        if self.live_read_only(uid).is_some() {
+            // Nothing goes out: what changed outside a command is put back.
+            if let Some(s) = synced {
+                self.apply_remote(uid, s);
+            }
+            return;
+        }
+        let Some(live) = self.live.sessions.get_mut(&id) else { return };
+        let Some(client) = live.client.as_mut() else { return };
+        match client.edit_with(&doc, label) {
+            Ok(msg) => {
+                live.synced = Some(doc);
+                self.live.send(id, msg);
+            }
+            Err(e) => self.live_fail(id, format!("Couldn't sync an edit: {e}")),
+        }
+    }
+
+    /// A group of commands on document `uid` starts (`on`) or ends: in between its edits don't
+    /// sync on their own.
+    pub(crate) fn live_hold(&mut self, uid: u64, on: bool) {
+        if let Some(live) = self.live.doc_mut(uid).filter(|l| l.syncing()) {
+            live.hold = if on { live.hold.saturating_add(1) } else { live.hold.saturating_sub(1) };
+        }
+    }
+
+    /// Undo (`back`) or redo the user's own last step on the active document, in its session:
+    /// what it wrote goes back where nobody else wrote since. Returns whether there was a step to
+    /// take back.
+    pub(crate) fn live_travel(&mut self, back: bool) -> bool {
+        let Some(uid) = self.tab() else { return false };
+        // Edits not synced yet go first.
+        self.live_edit(uid, None);
+        let Some(live) = self.live.doc_mut(uid) else { return false };
+        let Some(client) = live.client.as_mut() else { return false };
+        let (undo, redo) = client.history_len();
+        let msgs = match if back { client.undo(&EngineRecompute) } else { client.redo(&EngineRecompute) } {
+            Ok(m) => m,
+            Err(e) => {
+                log::warn!("live session: {} failed: {e}", if back { "undo" } else { "redo" });
+                return false;
+            }
+        };
+        let (u, r) = client.history_len();
+        let did = if back { r > redo } else { u > undo };
+        let doc = Arc::new(client.document().clone());
+        if did {
+            live.synced = Some(doc.clone());
+        }
+        let id = live.id;
+        self.live.send(id, msgs);
+        if did {
+            self.apply_remote(uid, doc);
+        }
+        did
+    }
+
+    /// Apply the server's batches that waited in session `id` (none while a gesture or preview
+    /// shows on its document).
+    pub(super) fn live_deferred(&mut self, id: SessionId) {
+        let Some(live) = self.live.sessions.get(&id).filter(|l| !l.deferred.is_empty() && l.syncing()) else { return };
+        let Some(uid) = live.doc_uid else { return };
+        if self.docs.iter().find(|d| d.uid == uid).is_none_or(busy) {
+            return;
+        }
+        // Your own edits first: the client replays them over what others did.
+        self.live_edit(uid, None);
+        let Some(live) = self.live.sessions.get_mut(&id) else { return };
+        let Some(client) = live.client.as_mut() else { return };
+        let mut out = Vec::new();
+        for m in std::mem::take(&mut live.deferred) {
+            match client.receive(m, &EngineRecompute) {
+                Ok(more) => out.extend(more),
+                Err(e) => return self.live_fail(id, format!("The live session got out of step ({e}); join again")),
+            }
+        }
+        let doc = Arc::new(client.document().clone());
+        // Edits the server refused were rolled back: say why (the UI's toast).
+        let notices: Vec<String> = client.take_notices().iter().map(figcraft_collab::Notice::message).collect();
+        live.synced = Some(doc.clone());
+        if !notices.is_empty() {
+            self.message = Some(notices.join("; "));
+        }
+        self.live.send(id, out);
+        self.apply_remote(uid, doc);
+    }
+
+    /// Show the peer followed in session `id`: their viewport (and their page, in the session's
+    /// document) on the session's tab.
+    pub(super) fn live_follow_apply(&mut self, id: SessionId) {
+        let Some(live) = self.live.sessions.get_mut(&id) else { return };
+        let Some(peer) = live.follow else { return };
+        if !live.peers.contains_key(&peer) {
+            live.unfollow();
+            return;
+        }
+        let Some((page, x, y, w, h)) = live.presence.get(&peer).and_then(|p| p.viewport) else { return };
+        let Some(ds) = self.docs.iter_mut().find(|d| Some(d.uid) == live.tab) else { return };
+        if live.syncing() && page != ds.page && ds.doc.pages.contains(&page) {
+            ds.page = page;
+            ds.selection.clear();
+            ds.text_edit = None;
+        }
+        if !(w > 0.0 && h > 0.0 && x.is_finite() && y.is_finite()) {
+            return;
+        }
+        ds.view.cx = x + w / 2.0;
+        ds.view.cy = y + h / 2.0;
+        let zoom = (ds.view.vw / w).min(ds.view.vh / h);
+        if zoom.is_finite() {
+            ds.view.zoom = zoom.clamp(ViewState::MIN_ZOOM, ViewState::MAX_ZOOM);
+        }
+        ds.revision += 1;
+        live.followed = Some(FollowedView { page: ds.page, cx: ds.view.cx, cy: ds.view.cy, zoom: ds.view.zoom });
+    }
+
+    /// Sessions whose tab was closed end (hosts stop hosting, guests leave); the others go on. A
+    /// join still on its way from a closed tab shows on the one in front.
+    pub(super) fn live_closed(&mut self) {
+        let (docs, tab) = (&self.docs, self.tab());
+        let mut gone = Vec::new();
+        for l in self.live.sessions.values_mut().filter(|l| l.tab != tab && !docs.iter().any(|d| Some(d.uid) == l.tab)) {
+            if l.doc_uid.is_none() && l.status.active() {
+                l.tab = tab;
+            } else {
+                gone.push((l.id, l.status == Status::Live));
+            }
+        }
+        for (id, was_live) in gone {
+            self.live.end(id);
+            if was_live {
+                self.message = Some("The live session's file was closed, so you left the session".into());
+            }
+        }
+    }
+
+    /// Send your edits and presence in every session when they changed (headless sessions call
+    /// it after each command). A view you moved yourself stops following.
+    pub fn live_sync(&mut self) {
+        self.live_sync_in(|_| true);
+    }
+
+    /// [`live_sync`](Self::live_sync) for the sessions whose document (`None`: a join on its way)
+    /// `mine` picks: a window calls it every frame it draws, after input, for the documents it
+    /// holds.
+    pub fn live_sync_in(&mut self, mine: impl Fn(Option<u64>) -> bool) {
+        // A recovery copy whose session was left has its outcome too.
+        if !self.live.recovering.is_empty() {
+            self.online_recoveries();
+        }
+        if self.live.sessions.is_empty() {
+            return;
+        }
+        self.live_closed();
+        let ids: Vec<SessionId> = self.live.sessions.values().filter(|l| l.status == Status::Live && mine(l.doc_uid)).map(|l| l.id).collect();
+        for id in ids {
+            self.live_deferred(id);
+            if let Some(uid) = self.live.get(id).and_then(|l| l.doc_uid) {
+                self.live_edit(uid, None);
+            }
+            self.live_present(id);
+        }
+    }
+
+    /// Hand your presence in session `id` to the link when it changed.
+    fn live_present(&mut self, id: SessionId) {
+        let Some(live) = self.live.get(id).filter(|l| l.status == Status::Live) else { return };
+        let moved = live.followed.is_some_and(|f| {
+            self.docs
+                .iter()
+                .find(|d| Some(d.uid) == live.tab)
+                .is_some_and(|ds| ds.page != f.page || !close(ds.view.cx, f.cx) || !close(ds.view.cy, f.cy) || !close(ds.view.zoom, f.zoom))
+        });
+        let p = self.presence_in(live);
+        let changed = live.sent.as_ref() != Some(&p);
+        let Some(live) = self.live.sessions.get_mut(&id) else { return };
+        if moved {
+            live.unfollow();
+        }
+        if changed {
+            if let Some(link) = self.live.link.as_mut() {
+                link.presence(id, &p);
+            }
+            live.sent = Some(p);
+        }
+    }
+
+    /// Stop following in the active document's session (Escape, `collab.follow {}`). False when
+    /// you weren't following anyone.
+    pub fn live_unfollow(&mut self) -> bool {
+        self.live_mut().is_some_and(Live::unfollow)
+    }
+
+    /// Follow `peer`'s viewport in the active document's session (shown at once when known).
+    pub fn live_follow(&mut self, peer: u32) -> Result<()> {
+        let Some(live) = self.live_mut().filter(|l| l.peers.contains_key(&peer)) else {
+            return Err(bad("collab.follow", format!("nobody with client id {peer} is in the session")));
+        };
+        live.follow = Some(peer);
+        live.followed = None;
+        let id = live.id;
+        self.live_follow_apply(id);
+        Ok(())
+    }
+
+    /// The active document's session as JSON (`collab.peers`), with every session in brief.
+    pub fn live_summary(&self) -> Value {
+        self.summary(self.live())
+    }
+
+    /// The index of the open document session `l` syncs.
+    fn live_index(&self, l: &Live) -> Option<usize> {
+        l.doc_uid.and_then(|u| self.docs.iter().position(|d| d.uid == u))
+    }
+
+    pub(super) fn summary(&self, l: &Live) -> Value {
+        let info = l.info.as_ref();
+        let reason = |l: &Live| match &l.status {
+            Status::Failed { reason } => Some(reason.clone()),
+            _ => None,
+        };
+        let synced = self.live_index(l).and_then(|i| self.docs.get(i));
+        // Who types in which layer of the session document.
+        let editing = |e: &EditingText| {
+            let layer = synced.and_then(|d| d.doc.node(e.node)).map(|n| n.name.as_str());
+            json!({"node": e.node, "layer": layer, "caret": e.caret, "selection": e.selection})
+        };
+        let peers: Vec<Value> = l
+            .peers
+            .values()
+            .map(|p| {
+                let presence = l.presence.get(&p.client_id);
+                let typing = presence.and_then(|pr| pr.editing_text.as_deref()).map(editing);
+                let chat = l.chats.get(&p.client_id);
+                json!({"id": p.client_id, "name": p.name, "color": p.color, "editing": typing, "chat": chat, "presence": presence})
+            })
+            .collect();
+        let mine = synced.and_then(|d| d.text_edit.as_ref()).map(|t| editing(&editing_of(t)));
+        let sessions: Vec<Value> = self
+            .live
+            .iter()
+            .map(|o| {
+                let info = o.info.as_ref();
+                json!({
+                    "session": o.id,
+                    "document": self.live_index(o),
+                    "status": o.status.id(),
+                    "reason": reason(o),
+                    "role": o.role(),
+                    "fileName": info.map(|i| i.file_name.as_str()),
+                    "link": info.map(|i| i.link.as_str()),
+                    "peers": o.peers.len(),
+                })
+            })
+            .collect();
+        json!({
+            "available": self.live.available(),
+            "canHost": self.live.can_host(),
+            "session": (l.id != NO_SESSION).then_some(l.id),
+            "status": l.status.id(),
+            "reason": reason(l),
+            "attempt": match l.status { Status::Reconnecting { attempt } => Some(attempt), _ => None },
+            "role": info.map(|i| i.role),
+            "me": info.map(|i| i.me),
+            "name": info.map(|i| i.name.as_str()),
+            "color": info.map(|i| i.color.as_str()),
+            "fileName": info.map(|i| i.file_name.as_str()),
+            "pages": info.map(|i| &i.pages),
+            "link": info.map(|i| i.link.as_str()),
+            "url": info.map(|i| i.url.as_str()),
+            "address": info.map(|i| i.address.as_str()),
+            "network": info.map(|i| i.network),
+            "access": l.client.as_ref().map(Client::access).or(info.map(|i| i.access)),
+            "readOnly": l.doc_uid.is_some_and(|u| self.live_read_only(u).is_some()),
+            "published": l.published,
+            "code": l.share.as_ref().and_then(Share::code),
+            "share": l.share.as_ref().map(|sh| {
+                let (edit, view) = (sh.links.as_ref().map(|s| &s.edit), sh.links.as_ref().and_then(|s| s.view.as_ref()));
+                let code = |l: Option<&SharedLink>| l.and_then(|l| l.code.as_deref()).map(code::grouped);
+                json!({
+                    "via": sh.via,
+                    "access": sh.access.id(),
+                    "shared": sh.links.is_some(),
+                    "editCode": code(edit),
+                    "viewCode": code(view),
+                    "editLink": edit.map(|l| l.link.as_str()),
+                    "viewLink": view.map(|l| l.link.as_str()),
+                })
+            }),
+            "hosting": l.hosting.as_ref().map(hosting_json),
+            "follow": l.follow,
+            "signals": l.signals,
+            "chat": l.chat,
+            "spotlight": l.spotlight,
+            "spotlighting": l.spotlighting,
+            "syncing": l.syncing(),
+            "document": self.live_index(l),
+            "editing": mine,
+            "peers": peers,
+            "sessions": sessions,
+        })
+    }
+}
diff --git a/crates/engine/src/sharing/live/types.rs b/crates/engine/src/sharing/live/types.rs
new file mode 100644
index 00000000..16a237d5
--- /dev/null
+++ b/crates/engine/src/sharing/live/types.rs
@@ -0,0 +1,482 @@
+use super::*;
+
+/// The server files are shared through online unless Preferences name another: the only place
+/// its address is written.
+///
+/// A build can ship another one, or none: set `FIGCRAFT_DEFAULT_SERVER` when compiling to a
+/// server's address (`wss://host/`), or to nothing (`FIGCRAFT_DEFAULT_SERVER=`) for a build whose
+/// online sharing stays off until the user enters a server in Preferences.
+pub const DEFAULT_SERVER: &str = match option_env!("FIGCRAFT_DEFAULT_SERVER") {
+    Some(server) => server,
+    None => "wss://collab.craftapps.dev/",
+};
+
+/// Most selected ids one presence update carries (the rest aren't shown to others).
+pub const MAX_SELECTION: usize = 10_000;
+
+/// Longest name shown to others (characters).
+pub const MAX_NAME: usize = 64;
+
+/// The colours people get in a session, in the order the host hands them out (`#RRGGBB`, white
+/// text reads on each).
+pub const PEOPLE: [&str; 8] = ["#0D99FF", "#9747FF", "#14AE5C", "#F24822", "#D9730D", "#E83E8C", "#00A3A3", "#665CE0"];
+
+/// `#RRGGBB` → (r, g, b); `None` for anything else.
+pub fn parse_color(s: &str) -> Option<(u8, u8, u8)> {
+    let hex = s.strip_prefix('#').filter(|h| h.len() == 6 && h.bytes().all(|b| b.is_ascii_hexdigit()))?;
+    let byte = |i: usize| hex.get(i..i + 2).and_then(|b| u8::from_str_radix(b, 16).ok());
+    Some((byte(0)?, byte(2)?, byte(4)?))
+}
+
+/// Why a join failed when a message from the host is over this app's size limit (`{mb}`: the
+/// limit in MB). The UI translates it.
+pub const TOO_LARGE_TO_JOIN: &str = "This file is too large to join here (up to {mb} MB)";
+
+/// The connection to a live session.
+#[derive(Clone, Debug, Default, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase", tag = "state")]
+pub enum Status {
+    /// Not in a session.
+    #[default]
+    Off,
+    /// Joining (connecting to the host, waiting for its welcome).
+    Connecting,
+    /// In the session.
+    Live,
+    /// The connection dropped; trying again (`attempt` from 1).
+    Reconnecting { attempt: u32 },
+    /// Couldn't join, or the connection was lost for good.
+    Failed { reason: String },
+}
+
+impl Status {
+    pub fn id(&self) -> &'static str {
+        match self {
+            Status::Off => "off",
+            Status::Connecting => "connecting",
+            Status::Live => "live",
+            Status::Reconnecting { .. } => "reconnecting",
+            Status::Failed { .. } => "failed",
+        }
+    }
+
+    /// In a session or on the way into one.
+    pub fn active(&self) -> bool {
+        matches!(self, Status::Connecting | Status::Live | Status::Reconnecting { .. })
+    }
+
+    /// What the Share popover says about it.
+    pub fn label(&self) -> String {
+        match self {
+            Status::Off => "Not in a live session".into(),
+            Status::Connecting => "Joining…".into(),
+            Status::Live => "Live".into(),
+            Status::Reconnecting { attempt } => format!("Connection lost, reconnecting (attempt {attempt})…"),
+            Status::Failed { reason } => reason.clone(),
+        }
+    }
+}
+
+/// Your part in the session.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Role {
+    Host,
+    Guest,
+}
+
+/// A page of the shared file.
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub struct PageInfo {
+    pub id: u64,
+    pub name: String,
+}
+
+/// The session you're in.
+#[derive(Clone, Debug, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionInfo {
+    pub role: Role,
+    /// Your client id, name and colour as the others see them.
+    pub me: u32,
+    pub name: String,
+    pub color: String,
+    /// The shared file's name and pages (the host's).
+    pub file_name: String,
+    pub pages: Vec<PageInfo>,
+    /// The invite link (`figcraft://join?host=…&file=…&token=…`) and the same as a plain
+    /// WebSocket URL. Both carry the session's secret token: share them only with people you
+    /// invite.
+    pub link: String,
+    pub url: String,
+    /// `ip:port` the session listens on (host) or connects to (guest); a server's URL when it
+    /// isn't plain `ws://` at `/`.
+    pub address: String,
+    /// Reachable from other machines (the host listens on a network address, not loopback).
+    pub network: bool,
+    /// What you may do: edit, or only view (a server's view link).
+    pub access: Access,
+}
+
+/// A file you published to a server: where, and its first share links (they carry their tokens:
+/// share them like passwords; the server keeps only hashes).
+#[derive(Clone, Debug, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Published {
+    /// The server's address.
+    pub server: String,
+    /// The file's id and name on the server.
+    pub file: String,
+    pub name: String,
+    /// The link that lets people edit, and the one that lets them only view.
+    pub edit: String,
+    pub view: String,
+    /// Published without the server's key: the owner token that revokes links, renames or removes
+    /// the file (shown this once; the server keeps only its hash).
+    pub owner: Option<String>,
+    /// When the server deletes the file if nobody opens it (seconds since 1970).
+    pub expires: Option<u64>,
+}
+
+/// How a file is shared with a join code.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Via {
+    /// Through a server: the file is kept there and the server hands out the codes.
+    Online,
+    /// From this app, to people on the same network.
+    Local,
+}
+
+/// One way into a shared file: an invite link, and the join code that stands for it.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, serde::Deserialize)]
+#[serde(default)]
+pub struct SharedLink {
+    /// The link's id on its server (what revokes it; empty for a session this app hosts).
+    pub id: String,
+    /// The invite link (it carries its secret).
+    pub link: String,
+    /// Its join code's symbols. `None`: there is none (a server from before join codes, a host
+    /// without an IPv4 address): the link is shared instead.
+    pub code: Option<String>,
+}
+
+/// What others join a shared file with: to edit it and, on a server, to only view it.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, serde::Deserialize)]
+#[serde(default)]
+pub struct Shared {
+    pub edit: SharedLink,
+    pub view: Option<SharedLink>,
+}
+
+/// A file shared with a join code (`collab.share`). Online, the file is its owner's on the
+/// server: sharing gives others links (and codes) of their own, and stopping takes those away
+/// while the owner stays in the file.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Share {
+    pub via: Via,
+    /// Online: the server's address as it was given (it may carry the server's key: never shown).
+    pub server: String,
+    /// What the code shown lets people do.
+    pub access: Access,
+    /// What others join with now. `None`: on its way, or (online) not shared at the moment: the
+    /// file is on the server, open only to its owner.
+    pub links: Option<Shared>,
+}
+
+impl Share {
+    /// The way in to show: the one for [`access`](Self::access).
+    fn shown(&self) -> Option<&SharedLink> {
+        let links = self.links.as_ref()?;
+        if self.access == Access::View { links.view.as_ref() } else { Some(&links.edit) }
+    }
+
+    /// The code to show, grouped (`K7M-2QX-9TD`).
+    pub fn code(&self) -> Option<String> {
+        self.shown()?.code.as_deref().map(code::grouped)
+    }
+
+    /// The invite link to give with (or in place of) the code.
+    pub fn link(&self) -> Option<&str> {
+        self.shown().map(|l| l.link.as_str())
+    }
+}
+
+/// What someone typed to join, as what the link joins: an invite link as it is, a local network
+/// code as the link it stands for, an online code with `server` to ask about it.
+pub fn join_target(server: &str, typed: &str) -> std::result::Result<String, String> {
+    let typed = typed.trim();
+    if typed.contains("://") || typed.contains('?') {
+        return Ok(typed.to_string());
+    }
+    match code::parse(typed)? {
+        Code::Local(local) => Ok(local.link()),
+        Code::Online(_) if server.trim().is_empty() => Err(format!("that is an online join code, and {ONLINE_OFF}")),
+        Code::Online(code) => Ok(format!("figcraft://join?server={}&code={code}", server.trim())),
+    }
+}
+
+/// Why nothing can be shared or joined online.
+pub const ONLINE_OFF: &str = "online sharing is off: choose a server in Preferences (or share on the local network)";
+
+/// A session's number on the link: the engine picks it (from 1) when it starts the session.
+pub type SessionId = u64;
+
+/// The [`SessionId`] of events that aren't about a session (answers to background requests).
+pub const NO_SESSION: SessionId = 0;
+
+/// What happened in a session since the last [`LiveLink::poll`].
+#[derive(Clone, Debug, PartialEq)]
+pub enum Event {
+    Status(Status),
+    /// Joined, or joined again after a reconnect: who you are and who else is here.
+    Welcome {
+        info: SessionInfo,
+        peers: Vec<Peer>,
+    },
+    PeerJoined(Peer),
+    PeerLeft(u32),
+    Presence(u32, Presence),
+    /// Someone's cursor chat or spotlight, or (about you) the host's [`Signal::READY`].
+    Signal(u32, Signal),
+    /// For the document sync client: the welcome (with the whole document), or a batch of
+    /// changes the server ordered, or the rejection of one of yours.
+    Sync(ServerMsg),
+    /// The host ended the session.
+    Ended {
+        reason: String,
+    },
+    /// The document is on the server (`collab.publish`); joining it follows.
+    Published(Published),
+    /// The published file is shared (`collab.share`): the links and codes others join with, or
+    /// why the server made none.
+    Shared(std::result::Result<Shared, String>),
+    /// What the server says about its hosting (operator, terms, this file's expiry).
+    Hosting(HostInfo),
+    /// The server's answer to `collab.report`: kept, or why not.
+    Reported(Option<String>),
+    /// The answer to a team library request sent in the background
+    /// ([`LiveLink::library_background`]) about the file behind share link `link`.
+    Library {
+        link: String,
+        reply: std::result::Result<LibraryReply, String>,
+    },
+    /// The answer to request `job` sent in the background ([`LiveLink::background`]).
+    Net {
+        job: u64,
+        reply: Box<NetReply>,
+    },
+}
+
+/// A request to a server outside a live session: its plugin directory, a team library, or keeping
+/// a file there.
+#[derive(Clone, Debug)]
+pub enum NetRequest {
+    /// To the plugin directory of the server at `server` (`ws://host:port/`, with `?key=…` to
+    /// publish).
+    Plugins { server: String, req: PluginReq },
+    /// About the team library of the file behind share link `link`.
+    Library { link: String, req: LibraryReq },
+    /// Keep a file on a server without joining it ([`LiveLink::upload`]).
+    Upload(PublishOptions),
+    /// Change who else gets into `file` on the server at `server` (its address, with `?key=…`, or
+    /// the file's `owner` token): revoke the links with these ids, then, to `create`, make a new
+    /// edit link and view link with their join codes ([`LiveLink::share`]).
+    Share { server: String, file: String, owner: String, revoke: Vec<String>, create: bool },
+    /// Ask the server at `server` about its hosting and, with a file's owner token, manage that
+    /// file ([`LiveLink::hosting`]).
+    Hosting { server: String, file: String, owner: String, req: Option<Admin> },
+}
+
+impl NetRequest {
+    /// What a session without the network says.
+    pub(crate) fn unavailable(&self) -> &'static str {
+        match self {
+            NetRequest::Plugins { .. } => crate::plugin_directory::NO_DIRECTORY,
+            NetRequest::Library { .. } | NetRequest::Upload(_) => NO_TEAM_LIBRARIES,
+            NetRequest::Hosting { .. } | NetRequest::Share { .. } => NO_HOSTING,
+        }
+    }
+
+    /// How to answer that this request failed (and why).
+    pub fn failure(&self) -> fn(String) -> NetReply {
+        match self {
+            NetRequest::Plugins { .. } => |why| NetReply::Plugins(Err(why)),
+            NetRequest::Library { .. } => |why| NetReply::Library(Err(why)),
+            NetRequest::Upload(_) => |why| NetReply::Upload(Err(why)),
+            NetRequest::Hosting { .. } => |why| NetReply::Hosting(Err(why)),
+            NetRequest::Share { .. } => |why| NetReply::Share(Err(why)),
+        }
+    }
+
+    /// The answer to this request stands for `other` when a command runs again: the same kind of
+    /// request to the same place (what it carries may differ: a usage report, a fresh timestamp).
+    pub(crate) fn stands_for(&self, other: &NetRequest) -> bool {
+        use std::mem::discriminant;
+        match (self, other) {
+            (NetRequest::Plugins { server: a, req: x }, NetRequest::Plugins { server: b, req: y }) => a == b && discriminant(x) == discriminant(y),
+            (NetRequest::Library { link: a, req: x }, NetRequest::Library { link: b, req: y }) => a == b && discriminant(x) == discriminant(y),
+            (NetRequest::Upload(a), NetRequest::Upload(b)) => a.server == b.server,
+            (NetRequest::Hosting { server: a, file: f, req: x, .. }, NetRequest::Hosting { server: b, file: g, req: y, .. }) => {
+                a == b && f == g && x.as_ref().map(discriminant) == y.as_ref().map(discriminant)
+            }
+            (NetRequest::Share { server: a, file: f, create: x, .. }, NetRequest::Share { server: b, file: g, create: y, .. }) => {
+                a == b && f == g && x == y
+            }
+            _ => false,
+        }
+    }
+}
+
+/// The answer to a [`NetRequest`] (an error: the server couldn't be reached or refused).
+#[derive(Clone, Debug, PartialEq)]
+pub enum NetReply {
+    Plugins(std::result::Result<PluginReply, String>),
+    Library(std::result::Result<LibraryReply, String>),
+    /// The new links, when some were asked for.
+    Share(std::result::Result<Option<Shared>, String>),
+    Upload(std::result::Result<Published, String>),
+    /// What the server says about its hosting, and its answer to the request, if one was sent.
+    Hosting(std::result::Result<(HostInfo, Option<AdminReply>), String>),
+}
+
+/// What a session without the network says about servers' hosting.
+pub const NO_HOSTING: &str = "publishing to a server needs the desktop app or the MCP server";
+
+/// Which network interface a hosted session listens on.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Bind {
+    /// This machine only (127.0.0.1): the default.
+    Local,
+    /// The machine's address on the local network (only when the user chooses to share there).
+    Lan,
+    /// A given interface address (e.g. a VPN's).
+    Addr(IpAddr),
+}
+
+/// What [`LiveLink::host`] needs to start a session for the open file.
+#[derive(Clone, Debug)]
+pub struct HostOptions {
+    /// `None`: the default port, or any free one when it's taken.
+    pub port: Option<u16>,
+    pub bind: Bind,
+    /// Your name (empty: the host picks one).
+    pub name: String,
+    /// The shared file (the session's authoritative copy starts from it).
+    pub doc: Arc<Document>,
+    /// Shared with a join code (`collab.share`): the session's secret is short enough to type.
+    pub short: bool,
+}
+
+/// What [`LiveLink::publish`] needs to put the open file on a server.
+#[derive(Clone, Debug)]
+pub struct PublishOptions {
+    /// The server's address (`ws://host:port/`, `wss://host/path/`), which may carry its key
+    /// (`?key=…`).
+    pub server: String,
+    /// The server's key, when the address doesn't carry it. Without one the file is published
+    /// as anyone may, on a server open to the public (with an owner token).
+    pub key: Option<String>,
+    /// The file's name on the server.
+    pub name: String,
+    /// Your name in the session (empty: the server picks one).
+    pub me: String,
+    pub doc: Arc<Document>,
+    /// Share the file once it is there: links and join codes for others ([`Event::Shared`];
+    /// `collab.share`).
+    pub share: bool,
+}
+
+/// The networking behind live sessions, installed by the app ([`Lives::install`]). It carries
+/// any number of sessions at once, each under the [`SessionId`] it was started with. Calls return
+/// at once; what happens later arrives through [`poll`](Self::poll).
+pub trait LiveLink: Send {
+    /// Sessions can be hosted here (the browser build can only join).
+    fn can_host(&self) -> bool {
+        true
+    }
+    /// Start hosting session `session` for `opts.doc`.
+    fn host(&mut self, session: SessionId, opts: HostOptions) -> std::result::Result<SessionInfo, String>;
+    /// Start joining the session behind an invite link, as session `session`. Errors are for
+    /// links that can't be used; they never echo the link (it holds the token).
+    fn join(&mut self, session: SessionId, link: &str, name: &str) -> std::result::Result<(), String>;
+    /// [`join`](Self::join) as the client `resume` names, when the server still knows it (an app
+    /// that starts over after a crash keeps its id, so what it made before is its own to send).
+    /// A link that can't resume joins as someone new.
+    fn join_resuming(&mut self, session: SessionId, link: &str, name: &str, _resume: Option<Resume>) -> std::result::Result<(), String> {
+        self.join(session, link, name)
+    }
+    /// Start uploading `opts.doc` to a server as a new file, then join it with its edit link, as
+    /// session `session`: [`Event::Published`] with its links, then the welcome. Errors are for
+    /// addresses that can't be used; they never echo the key.
+    fn publish(&mut self, _session: SessionId, _opts: PublishOptions) -> std::result::Result<(), String> {
+        Err("publishing to a server needs the desktop app or the MCP server".into())
+    }
+    /// Keep `opts.doc` on a server as a new file without joining it: where, and its links
+    /// (`library.publishToServer` with the server's key). Waits for the server. Errors never echo
+    /// the key.
+    fn upload(&mut self, _opts: PublishOptions) -> std::result::Result<Published, String> {
+        Err(NO_TEAM_LIBRARIES.into())
+    }
+    /// One request about the team library of the file behind share link `link`; waits for the
+    /// server's answer (a few seconds at most when it can't be reached). Errors never echo the
+    /// link.
+    fn library(&mut self, _link: &str, _req: LibraryReq) -> std::result::Result<LibraryReply, String> {
+        Err(NO_TEAM_LIBRARIES.into())
+    }
+    /// Send library requests `(link, request)` in the background, in order; each answer arrives as
+    /// [`Event::Library`]. Ignored while an earlier call's requests are still out.
+    fn library_background(&mut self, _jobs: Vec<(String, LibraryReq)>) {}
+    /// One request to the plugin directory of the server at `server` (`ws://host:port/`, with
+    /// `?key=…` to publish); waits for the answer (a few seconds at most when it can't be
+    /// reached). Errors never echo the key.
+    fn plugins(&mut self, _server: &str, _req: PluginReq) -> std::result::Result<PluginReply, String> {
+        Err(crate::plugin_directory::NO_DIRECTORY.into())
+    }
+    /// What the server at `server` says about its hosting, and with a file's owner token
+    /// (`file` and `owner`) its answer to `req` about that file; waits for the server. Errors
+    /// never echo the token.
+    fn hosting(
+        &mut self,
+        _server: &str,
+        _file: &str,
+        _owner: &str,
+        _req: Option<Admin>,
+    ) -> std::result::Result<(HostInfo, Option<AdminReply>), String> {
+        Err(NO_HOSTING.into())
+    }
+    /// See [`NetRequest::Share`]; waits for the server. Errors never echo the key or the token.
+    fn share(&mut self, _server: &str, _file: &str, _owner: &str, _revoke: &[String], _create: bool) -> std::result::Result<Option<Shared>, String> {
+        Err(NO_HOSTING.into())
+    }
+    /// Send `req` and wait for the answer (through the methods above).
+    fn request(&mut self, req: NetRequest) -> NetReply {
+        match req {
+            NetRequest::Share { server, file, owner, revoke, create } => NetReply::Share(self.share(&server, &file, &owner, &revoke, create)),
+            NetRequest::Plugins { server, req } => NetReply::Plugins(self.plugins(&server, req)),
+            NetRequest::Library { link, req } => NetReply::Library(self.library(&link, req)),
+            NetRequest::Upload(o) => NetReply::Upload(self.upload(o)),
+            NetRequest::Hosting { server, file, owner, req } => NetReply::Hosting(self.hosting(&server, &file, &owner, req)),
+        }
+    }
+    /// Send `req` on a thread of its own and return at once: the answer arrives as [`Event::Net`]
+    /// with `job` (a failure to send too). False when this link can't, and nothing was sent.
+    fn background(&mut self, _job: u64, _req: NetRequest) -> bool {
+        false
+    }
+    /// Remove client `client` from session `session`, which this link hosts: they are
+    /// disconnected and can't join again from their address while it runs. Returns at once.
+    fn remove(&mut self, _session: SessionId, _client: u32) -> std::result::Result<(), String> {
+        Err("removing people needs the desktop app or the MCP server".into())
+    }
+    /// End session `session` (stop hosting or leave); the others go on. Nothing for a session
+    /// that is over already.
+    fn leave(&mut self, session: SessionId);
+    /// Your latest presence in `session` (the link throttles and coalesces).
+    fn presence(&mut self, session: SessionId, p: &Presence);
+    /// A message for `session`'s server (document changes), sent in order.
+    fn send(&mut self, session: SessionId, msg: ClientMsg);
+    /// Events since the last call, each with its session ([`NO_SESSION`] for answers to
+    /// background requests); never blocks.
+    fn poll(&mut self) -> Vec<(SessionId, Event)>;
+}
diff --git a/crates/engine/src/online.rs b/crates/engine/src/sharing/online.rs
similarity index 96%
rename from crates/engine/src/online.rs
rename to crates/engine/src/sharing/online.rs
index b982580e..c2a0868d 100644
--- a/crates/engine/src/online.rs
+++ b/crates/engine/src/sharing/online.rs
@@ -120,7 +120,12 @@ pub fn same_server(a: &str, b: &str) -> bool {
         let s = plain_server(s).to_ascii_lowercase();
         let s = s.trim_end_matches('/');
         let port = if s.starts_with("wss://") { ":443" } else { ":80" };
-        s.strip_suffix(port).unwrap_or(s).to_string()
+        let start = s.find("://").map_or(0, |i| i + 3);
+        let end = s[start..].find('/').map_or(s.len(), |i| start + i);
+        match s[start..end].strip_suffix(port) {
+            Some(host) => format!("{}{}{}", &s[..start], host, &s[end..]),
+            None => s.to_string(),
+        }
     };
     norm(a) == norm(b)
 }
@@ -516,7 +521,8 @@ fn recover_file(s: &mut Session, p: &Value) -> Result<Value> {
     let i = named(s, CMD, p)?;
     let num = |key: &str| p.get(key).and_then(Value::as_u64).ok_or_else(|| bad(CMD, format!("`{key}` must be a whole number")));
     let client_id = u32::try_from(num("client")?).map_err(|_| bad(CMD, "`client` must be a client id"))?;
-    let at = Resume { session: num("session")?, client_id, seq: num("seq")? };
+    let secret = p.get("secret").and_then(Value::as_u64).unwrap_or(0);
+    let at = Resume { session: num("session")?, client_id, seq: num("seq")?, secret };
     if s.prefs.online_files.get(i).is_some_and(|f| s.online_session(f).is_some()) {
         return Err(bad(CMD, "this file is open already"));
     }
@@ -637,7 +643,7 @@ pub fn specs() -> Vec<CommandSpec> {
         spec!(
             "collab.recoverFile",
             "Recover online file",
-            "{path (a recovery copy of one of your online files), file, server?, session, client, seq (who the app was in the file when the copy was written, and the server's last change it had: from the note beside the copy)} → {session, status: \"connecting\"}: joins the file again as its owner and keeps the copy until the file arrives. Then: the server has everything in the copy → nothing more; the copy has changes of yours the server never confirmed and nothing else changed there → they are applied on top as one edit (\"Recovered changes\", synced to everyone); anything else changed meanwhile → the copy opens beside the file as “<name> (recovered copy)”; the file can't be joined → the copy opens as an unsaved document. The session's message says which",
+            "{path (a recovery copy of one of your online files), file, server?, session, client, seq, secret? (who the app was in the file when the copy was written, and the server's last change it had: from the note beside the copy)} → {session, status: \"connecting\"}: joins the file again as its owner and keeps the copy until the file arrives. Then: the server has everything in the copy → nothing more; the copy has changes of yours the server never confirmed and nothing else changed there → they are applied on top as one edit (\"Recovered changes\", synced to everyone); anything else changed meanwhile → the copy opens beside the file as “<name> (recovered copy)”; the file can't be joined → the copy opens as an unsaved document. The session's message says which",
             false,
             recover_file
         ),
diff --git a/crates/engine/src/shortcut_parity_tests.rs b/crates/engine/src/shortcut_parity_tests.rs
index cf7d5d47..cb2faf13 100644
--- a/crates/engine/src/shortcut_parity_tests.rs
+++ b/crates/engine/src/shortcut_parity_tests.rs
@@ -120,6 +120,15 @@ static ROWS: &[Row] = &[
     pin(Tools, "tool.slice", &["S"], &[]),
     pin(Tools, "file.placeImage", &["Shift+Cmd+K"], &[]),
     pin(Tools, "tool.shapeBuilder", &["Shift+M"], &[]),
+    // Board tools (boards only), on keys no design-file shortcut uses.
+    pin(Tools, "tool.sticky", &["Q"], &[]),
+    pin(Tools, "tool.shape", &["B"], &[]),
+    pin(Tools, "tool.connector", &["X"], &[]),
+    pin(Tools, "tool.marker", &["M"], &[]),
+    pin(Tools, "tool.highlighter", &["U"], &[]),
+    pin(Tools, "tool.eraser", &["E"], &[]),
+    pin(Tools, "tool.stamp", &["W"], &[]),
+    pin(Tools, "board.nextSticky", &["Shift+Cmd+Enter"], &[]),
     // Vector edit mode
     doc(Selection, "Edit the selected shape's points", &["Enter"], &[], Bound("select.children"), "Enter on a shape edits it; on a frame or group it selects the children"),
     doc(Shape, "Vector edit: move", &["V"], &[], VectorTool(VTool::Move), ""),
@@ -162,8 +171,8 @@ static ROWS: &[Row] = &[
     doc(Zoom, "Zoom out", &["Cmd+-", "-"], &[], Bound("view.zoomOut"), ""),
     doc(Zoom, "Zoom to fit", &["Shift+1"], &[], Bound("view.zoomFit"), ""),
     doc(Zoom, "Zoom to the selection", &["Shift+2"], &[], Bound("view.zoomSelection"), ""),
-    pin(Zoom, "view.zoomIn", &["Shift+Cmd+="], &[]),
-    pin(Zoom, "view.zoomOut", &["Shift+-"], &[]),
+    pin(Zoom, "view.zoomIn", &["Shift+Cmd+=", "="], &[]),
+    pin(Zoom, "view.zoomOut", &["Shift+-", "Shift+Cmd+-"], &[]),
     pin(Zoom, "view.zoom100", &["Shift+0", "Cmd+0"], &[]),
     pin(Zoom, "view.prevFrame", &["Shift+N", "Home"], &[]),
     pin(Zoom, "view.nextFrame", &["N", "End"], &[]),
@@ -398,7 +407,7 @@ fn counts_match_the_docs() {
     let reserved = documented.iter().filter(|r| !r.reserved.is_empty()).count();
     let pinned = ROWS.len() - documented.len();
     // docs/ui-parity.md quotes these.
-    assert_eq!((documented.len(), bound, moved, missing, reserved, pinned), (129, 128, 1, 0, 2, 49));
+    assert_eq!((documented.len(), bound, moved, missing, reserved, pinned), (129, 128, 1, 0, 2, 57));
 }
 
 #[test]
diff --git a/crates/engine/src/sketch_import_tests.rs b/crates/engine/src/sketch_import_tests.rs
new file mode 100644
index 00000000..f9d3f14b
--- /dev/null
+++ b/crates/engine/src/sketch_import_tests.rs
@@ -0,0 +1,529 @@
+//! `.sketch` files through the file commands. The importer's own tests (fixtures built in code)
+//! are in `figcraft_format::sketch`.
+
+use std::io::Write;
+
+use base64::Engine;
+use serde_json::{Value, json};
+
+use figcraft_doc::NodeKind;
+
+use crate::Session;
+
+/// A minimal `.sketch` zip with one page per `(id, name)`, saved by `app_version`.
+fn sketch(app_version: &str, pages: &[(&str, &str)]) -> Vec<u8> {
+    sketch_with(app_version, pages, &[])
+}
+
+/// [`sketch`] with `layers` on the first page.
+fn sketch_with(app_version: &str, pages: &[(&str, &str)], layers: &[Value]) -> Vec<u8> {
+    sketch_with_doc(app_version, pages, layers, json!({}))
+}
+
+/// [`sketch_with`] with the fields of `extra` added to `document.json` (shared styles…).
+fn sketch_with_doc(app_version: &str, pages: &[(&str, &str)], layers: &[Value], extra: Value) -> Vec<u8> {
+    let refs: Vec<Value> = pages.iter().map(|(id, _)| json!({"_class": "MSJSONFileReference", "_ref": format!("pages/{id}")})).collect();
+    let mut document = json!({"_class": "document", "pages": refs});
+    for (k, v) in extra.as_object().into_iter().flatten() {
+        document[k] = v.clone();
+    }
+    let mut out = Vec::new();
+    {
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(&mut out));
+        let o = zip::write::SimpleFileOptions::default();
+        z.start_file("document.json", o).unwrap();
+        z.write_all(document.to_string().as_bytes()).unwrap();
+        z.start_file("meta.json", o).unwrap();
+        // The format version that Sketch writes (103 for 50; 110 and up from 52).
+        let version = if app_version.split('.').next().and_then(|v| v.parse::<u32>().ok()).is_some_and(|v| v >= 52) { 125 } else { 103 };
+        z.write_all(json!({"app": "com.bohemiancoding.sketch3", "appVersion": app_version, "version": version}).to_string().as_bytes()).unwrap();
+        for (i, (id, name)) in pages.iter().enumerate() {
+            let ls = if i == 0 { layers.to_vec() } else { Vec::new() };
+            z.start_file(format!("pages/{id}.json"), o).unwrap();
+            z.write_all(json!({"_class": "page", "do_objectID": id, "name": name, "layers": ls}).to_string().as_bytes()).unwrap();
+        }
+        z.finish().unwrap();
+    }
+    out
+}
+
+fn temp(name: &str, bytes: &[u8]) -> (std::path::PathBuf, std::path::PathBuf) {
+    let dir = std::env::temp_dir().join(format!("figcraft-sketch-test-{}-{name}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join(name);
+    std::fs::write(&path, bytes).unwrap();
+    (dir, path)
+}
+
+fn page_names(s: &Session) -> Vec<String> {
+    let doc = s.doc().unwrap();
+    doc.pages.iter().map(|p| doc.node(*p).unwrap().name.clone()).collect()
+}
+
+#[test]
+fn opened_sketch_files_have_their_pages_and_no_path() {
+    let (dir, path) = temp("design.sketch", &sketch("50.2", &[("A", "Screens"), ("B", "Symbols")]));
+    let mut s = Session::new();
+    let r = s.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap();
+    assert!(r.get("summary").is_some());
+    assert_eq!(page_names(&s), ["Screens", "Symbols"]);
+    // Never saved over: the document has no path, so Save asks for one.
+    assert!(s.docs[s.active].path.is_none());
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn sketch_import_appends_pages() {
+    let (dir, path) = temp("more.sketch", &sketch("83.2", &[("A", "Imported")]));
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let before = page_names(&s).len();
+    s.execute("file.import", &json!({"path": path.to_string_lossy()})).unwrap();
+    let names = page_names(&s);
+    assert_eq!(names.len(), before + 1);
+    assert_eq!(names.last().unwrap(), "Imported");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn sketch_data_opens_with_a_summary() {
+    let data = base64::engine::general_purpose::STANDARD.encode(sketch("50.2", &[("A", "Page")]));
+    let mut s = Session::new();
+    let r = s.execute("file.open", &json!({"data": data, "name": "x.sketch"})).unwrap();
+    assert!(r.get("summary").is_some());
+    assert_eq!(page_names(&s), ["Page"]);
+}
+
+#[test]
+fn old_and_damaged_sketch_files_fail_cleanly() {
+    let mut s = Session::new();
+    let (dir, path) = temp("old.sketch", &sketch("47.1", &[("A", "P")]));
+    let e = s.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap_err().to_string();
+    assert!(e.contains("older than 48"), "{e}");
+    let mut broken = sketch("50.2", &[("A", "P")]);
+    broken.truncate(broken.len() / 2);
+    std::fs::write(&path, &broken).unwrap();
+    assert!(s.execute("file.open", &json!({"path": path.to_string_lossy()})).is_err());
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+fn shape(class: &str, name: &str, frame: [f64; 4], extra: Value) -> Value {
+    let mut l = json!({"_class": class, "do_objectID": name, "name": name, "isVisible": true, "resizingConstraint": 63,
+        "frame": {"x": frame[0], "y": frame[1], "width": frame[2], "height": frame[3]}, "style": {"fills": []}});
+    for (k, v) in extra.as_object().unwrap() {
+        l[k] = v.clone();
+    }
+    l
+}
+
+fn fill(grey: f64) -> Value {
+    json!({"style": {"fills": [{"isEnabled": true, "fillType": 0, "color": {"red": grey, "green": grey, "blue": grey, "alpha": 1}}]}})
+}
+
+/// Sketch draws a mask's own fill under what it clips; the clipped layers show inside it.
+#[test]
+fn sketch_masks_show_their_content() {
+    let oval = shape("oval", "Ring", [0.0, 0.0, 60.0, 60.0], json!({"booleanOperation": -1, "points": []}));
+    let mut mask = shape("shapeGroup", "Circle", [0.0, 0.0, 60.0, 60.0], fill(0.8));
+    mask["hasClippingMask"] = json!(true);
+    mask["layers"] = json!([oval]);
+    let pts = ["{0, 0}", "{1, 0}", "{1, 1}", "{0, 1}"].map(|p| json!({"point": p, "curveFrom": p, "curveTo": p, "curveMode": 1}));
+    let body = shape("shapePath", "Square", [0.0, 0.0, 20.0, 20.0], json!({"points": pts, "isClosed": true, "booleanOperation": -1}));
+    let mut content = shape("shapeGroup", "Body", [20.0, 20.0, 20.0, 20.0], fill(0.2));
+    content["layers"] = json!([body]);
+    let icon = shape("group", "Icon", [0.0, 0.0, 60.0, 60.0], json!({"layers": [mask, content]}));
+    let data = base64::engine::general_purpose::STANDARD.encode(sketch_with("50.2", &[("A", "Page")], &[icon]));
+    let mut s = Session::new();
+    s.execute("file.open", &json!({"data": data, "name": "x.sketch"})).unwrap();
+    let doc = s.doc().unwrap();
+    let icon = doc.nodes().find(|n| n.name == "Icon").unwrap().id;
+    let pix = figcraft_render::render_node(doc, icon, 1.0).unwrap();
+    let px = |x: u32, y: u32| pix.pixel(x, y).unwrap();
+    // The square in the middle, dark grey.
+    let c = px(30, 30);
+    assert!(c.alpha() > 200 && c.red() < 100, "content: {c:?}");
+    // The mask's own fill around it, light grey; outside the circle nothing.
+    let m = px(30, 8);
+    assert!(m.alpha() > 200 && m.red() > 150, "mask fill: {m:?}");
+    assert!(px(2, 2).alpha() < 50);
+}
+
+/// Family names guessed from PostScript names find the installed family whatever its spaces.
+#[test]
+fn sketch_font_families_match_installed_ones() {
+    let installed = ["PingFang SC".to_string(), "Helvetica Neue".to_string(), "IBM Plex Sans".to_string()];
+    let m = |f: &str| crate::cmd::file::installed_family(f, &installed);
+    assert_eq!(m("Ping Fang SC").as_deref(), Some("PingFang SC"));
+    assert_eq!(m("Helvetica Neue"), None, "already right");
+    assert_eq!(m("IBMPlex Sans").as_deref(), Some("IBM Plex Sans"));
+    assert_eq!(m("Comic Sans"), None);
+}
+
+/// Editing a master changes its instances, and a resized instance's layout isn't an override.
+#[test]
+fn sketch_instances_stay_live() {
+    let tag = shape("rectangle", "Tag", [80.0, 0.0, 20.0, 40.0], json!({"resizingConstraint": 60, "points": []}));
+    let master = shape("symbolMaster", "Bar", [0.0, 0.0, 100.0, 40.0], json!({"symbolID": "S", "layers": [tag]}));
+    let inst = shape("symbolInstance", "Wide", [0.0, 100.0, 200.0, 40.0], json!({"symbolID": "S", "overrideValues": []}));
+    let data = base64::engine::general_purpose::STANDARD.encode(sketch_with("64", &[("A", "Page")], &[master, inst]));
+    let mut s = Session::new();
+    s.execute("file.open", &json!({"data": data, "name": "x.sketch"})).unwrap();
+    let find = |s: &Session, inst: bool| {
+        let doc = s.doc().unwrap();
+        let root = doc
+            .nodes()
+            .find(|n| if inst { matches!(n.kind, NodeKind::Instance { .. }) } else { matches!(n.kind, NodeKind::Component { .. }) })
+            .unwrap()
+            .id;
+        doc.subtree(root).into_iter().find(|id| doc.node(*id).is_some_and(|n| n.name == "Tag")).unwrap()
+    };
+    let (main_tag, inst_tag) = (find(&s, false), find(&s, true));
+    assert!(s.doc().unwrap().node(inst_tag).unwrap().overrides.is_empty(), "{:?}", s.doc().unwrap().node(inst_tag).unwrap().overrides);
+    s.execute("node.set", &json!({"id": main_tag, "props": {"fill": "#ff0000"}})).unwrap();
+    let doc = s.doc().unwrap();
+    let fill = &doc.node(inst_tag).unwrap().fills;
+    assert!(fill.iter().any(|p| matches!(p.kind, figcraft_doc::color::PaintKind::Solid { color } if color.r > 0.99 && color.g < 0.01)), "{fill:?}");
+    let b = doc.world_bounds(inst_tag).unwrap();
+    assert!((b.x0 - 180.0).abs() < 1e-6, "{b:?}");
+}
+
+/// Local only (`FIGCRAFT_SKETCH_SAMPLES` names a folder of `.sketch` files): each opens (Sketch 48
+/// and newer) with its instances linked and finite geometry, or is refused as too old.
+#[test]
+fn local_sketch_samples_open() {
+    let Ok(dir) = std::env::var("FIGCRAFT_SKETCH_SAMPLES") else { return };
+    let mut files: Vec<std::path::PathBuf> = std::fs::read_dir(&dir).unwrap().filter_map(|e| e.ok().map(|e| e.path())).collect();
+    files.retain(|p| p.extension().is_some_and(|e| e.eq_ignore_ascii_case("sketch")));
+    files.sort();
+    assert!(!files.is_empty(), "no .sketch files in {dir}");
+    for path in files {
+        let started = std::time::Instant::now();
+        let mut s = Session::new();
+        match s.execute("file.open", &json!({"path": path.to_string_lossy()})) {
+            Err(e) => {
+                let e = e.to_string();
+                assert!(e.contains("older than 48"), "{}: {e}", path.display());
+                eprintln!("{}: refused as too old", path.display());
+            }
+            Ok(r) => {
+                let doc = s.doc().unwrap();
+                let (mut layers, mut instances, mut unlinked) = (0, 0, 0);
+                for n in doc.nodes() {
+                    layers += 1;
+                    assert!(
+                        n.width.is_finite() && n.height.is_finite() && n.transform.as_coeffs().iter().all(|c| c.is_finite()),
+                        "{}: {}",
+                        path.display(),
+                        n.name
+                    );
+                    if let NodeKind::Instance { component, .. } = n.kind {
+                        instances += 1;
+                        if !doc.contains(component) {
+                            unlinked += 1;
+                        }
+                    }
+                }
+                assert_eq!(unlinked, 0, "{}", path.display());
+                let notes = r.get("warnings").and_then(|w| w.as_array()).map_or(0, Vec::len);
+                eprintln!("{}: {layers} layers, {instances} instances, {notes} notes, {:?}", path.display(), started.elapsed());
+            }
+        }
+    }
+}
+
+/// Local only (`FIGCRAFT_SKETCH_SAMPLES` and `FIGCRAFT_SKETCHTOOL`, the path of Sketch's
+/// `sketchtool`): every artboard of each sample (Sketch 48 and newer) drawn by FigCraft is compared
+/// with Sketch's own export of it. Prints the share of pixels that differ per artboard (a channel
+/// off by more than 40, on white); fails past 10% (a broken artboard, not antialiasing or fonts).
+#[test]
+fn local_sketch_samples_match_sketch() {
+    let (Ok(dir), Ok(tool)) = (std::env::var("FIGCRAFT_SKETCH_SAMPLES"), std::env::var("FIGCRAFT_SKETCHTOOL")) else { return };
+    // Text draws in the fonts Sketch uses only once the system fonts are known.
+    figcraft_text::fontdb::scan_system_fonts();
+    let mut files: Vec<std::path::PathBuf> = std::fs::read_dir(&dir).unwrap().filter_map(|e| e.ok().map(|e| e.path())).collect();
+    files.retain(|p| p.extension().is_some_and(|e| e.eq_ignore_ascii_case("sketch")));
+    files.sort();
+    let mut worst: Vec<(f64, String)> = Vec::new();
+    for path in files {
+        let mut s = Session::new();
+        if s.execute("file.open", &json!({"path": path.to_string_lossy()})).is_err() {
+            continue;
+        }
+        let out = std::env::temp_dir().join(format!("figcraft-sketch-ref-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&out);
+        let status = std::process::Command::new(&tool)
+            .args(["export", "artboards"])
+            .arg(&path)
+            .arg(format!("--output={}", out.display()))
+            .args(["--formats=png", "--scales=1", "--use-id-for-name=YES", "--include-symbols=NO"])
+            .output()
+            .unwrap();
+        assert!(status.status.success(), "sketchtool failed on {}", path.display());
+        // Artboards by page and order, from the file itself.
+        let archive = zip::ZipArchive::new(std::fs::File::open(&path).unwrap()).unwrap();
+        let mut archive = archive;
+        let mut read = |name: &str| -> Value {
+            let mut s = String::new();
+            std::io::Read::read_to_string(&mut archive.by_name(name).unwrap(), &mut s).unwrap();
+            serde_json::from_str(&s).unwrap()
+        };
+        let document = read("document.json");
+        let doc = s.doc().unwrap();
+        let refs: Vec<String> = document["pages"].as_array().unwrap().iter().map(|r| r["_ref"].as_str().unwrap().to_string()).collect();
+        for (page_ref, page_id) in refs.iter().zip(doc.pages.iter()) {
+            let page = read(&format!("{page_ref}.json"));
+            let boards: Vec<String> = page["layers"]
+                .as_array()
+                .unwrap()
+                .iter()
+                .filter(|l| l["_class"] == "artboard")
+                .map(|l| l["do_objectID"].as_str().unwrap().to_string())
+                .collect();
+            let frames: Vec<figcraft_doc::NodeId> =
+                doc.node(*page_id).unwrap().children.iter().copied().filter(|c| matches!(doc.node(*c).unwrap().kind, NodeKind::Frame)).collect();
+            assert_eq!(boards.len(), frames.len(), "{}: artboards of {page_ref}", path.display());
+            for (id, frame) in boards.iter().zip(frames) {
+                let Ok(reference) = image::open(out.join(format!("{id}.png"))) else { continue };
+                let reference = reference.to_rgba8();
+                let ours = figcraft_render::render_node(doc, frame, 1.0).unwrap();
+                let (w, h) = (reference.width().min(ours.width()), reference.height().min(ours.height()));
+                let ours_rgba = figcraft_render::to_rgba8(&ours);
+                // Both on white, straight alpha.
+                let on_white = |c: &[u8], i: usize| {
+                    let a = f64::from(c[3]) / 255.0;
+                    f64::from(c[i]) * a + 255.0 * (1.0 - a)
+                };
+                let mut bad = 0u64;
+                for y in 0..h {
+                    for x in 0..w {
+                        let r = reference.get_pixel(x, y).0;
+                        let at = ((y * ours.width() + x) * 4) as usize;
+                        let Some(o) = ours_rgba.get(at..at + 4) else { continue };
+                        if (0..3).any(|i| (on_white(&r, i) - on_white(o, i)).abs() > 40.0) {
+                            bad += 1;
+                        }
+                    }
+                }
+                let share = bad as f64 * 100.0 / (f64::from(w) * f64::from(h)).max(1.0);
+                let name = doc.node(frame).unwrap().name.clone();
+                eprintln!("{share:6.2}%  {}  {name}", path.file_name().unwrap().to_string_lossy());
+                worst.push((share, format!("{}: {name}", path.display())));
+            }
+        }
+        let _ = std::fs::remove_dir_all(&out);
+    }
+    worst.sort_by(|a, b| b.0.total_cmp(&a.0));
+    assert!(worst.first().is_none_or(|w| w.0 < 10.0), "{worst:?}");
+}
+
+/// Sketch draws Apple's fonts with the tracking their `trak` table gives at each size (the
+/// platform does it on its own); the imported text carries it as letter spacing (macOS only).
+#[test]
+fn sketch_text_keeps_the_platform_tracking() {
+    if !std::path::Path::new("/System/Library/Fonts/SFNS.ttf").exists() {
+        return;
+    }
+    figcraft_text::fontdb::scan_system_fonts();
+    let font = json!({"name": "SFUIText-Regular", "size": 13});
+    let run = json!({"location": 0, "length": 2, "attributes": {"MSAttributedStringFontAttribute": {"attributes": font}}});
+    let t = shape("text", "Label", [0.0, 0.0, 100.0, 20.0], json!({"attributedString": {"string": "Hi", "attributes": [run]}, "textBehaviour": 0}));
+    let data = base64::engine::general_purpose::STANDARD.encode(sketch_with("64", &[("A", "Page")], &[t]));
+    let mut s = Session::new();
+    s.execute("file.open", &json!({"data": data, "name": "x.sketch"})).unwrap();
+    let doc = s.doc().unwrap();
+    let NodeKind::Text(td) = &doc.nodes().find(|n| n.name == "Label").unwrap().kind else { panic!("not text") };
+    let ls = td.style.letter_spacing.resolve(13.0);
+    assert!((ls - (-12.0 * 13.0 / 2048.0)).abs() < 1e-6, "{ls}");
+    // A named style's optical size follows the size there: the text carries it.
+    let f = figcraft_text::fontdb::find_face(&td.style.font_family, &td.style.font_style).unwrap();
+    let named = f.axis("opsz").is_some() && f.instance(&td.style.font_style).is_some();
+    assert_eq!(td.style.variations.get("opsz").copied(), named.then_some(13.0), "{:?}", td.style);
+}
+
+/// A text an override changed is measured again, and the stack around it re-flows: a hugging chip
+/// grows to its new label.
+#[test]
+fn sketch_overridden_text_reflows_its_stack() {
+    let font = json!({"name": "Helvetica", "size": 12});
+    let run = json!({"location": 0, "length": 2, "attributes": {"MSAttributedStringFontAttribute": {"attributes": font}}});
+    let label = shape(
+        "text",
+        "Label",
+        [20.0, 4.0, 14.0, 16.0],
+        json!({"attributedString": {"string": "Go", "attributes": [run]}, "horizontalSizing": 1, "verticalSizing": 1}),
+    );
+    let dot = shape("oval", "Dot", [8.0, 9.0, 6.0, 6.0], json!({"points": []}));
+    let layout = json!({"_class": "MSImmutableFlexGroupLayout", "flexDirection": 0, "justifyContent": 0, "alignItems": 1, "allGuttersGap": 6, "stackingOrder": 0});
+    let master = shape(
+        "symbolMaster",
+        "Chip",
+        [0.0, 0.0, 44.0, 24.0],
+        json!({"symbolID": "S", "groupBehavior": 1, "groupLayout": layout, "horizontalSizing": 1, "verticalSizing": 1,
+            "leftPadding": 8, "rightPadding": 10, "topPadding": 4, "bottomPadding": 4, "layers": [label, dot]}),
+    );
+    let ov = json!([{"_class": "overrideValue", "overrideName": "Label_stringValue", "value": "A much longer label here"}]);
+    let inst = shape(
+        "symbolInstance",
+        "Long",
+        [0.0, 100.0, 160.0, 24.0],
+        json!({"symbolID": "S", "overrideValues": ov, "horizontalSizing": 1, "verticalSizing": 1}),
+    );
+    let data = base64::engine::general_purpose::STANDARD.encode(sketch_with("2026.3.1", &[("A", "Page")], &[master, inst]));
+    let mut s = Session::new();
+    s.execute("file.open", &json!({"data": data, "name": "x.sketch"})).unwrap();
+    let doc = s.doc().unwrap();
+    let inst = doc.nodes().find(|n| n.name == "Long").unwrap().id;
+    let label = doc.subtree(inst).into_iter().find(|id| doc.node(*id).is_some_and(|n| n.name == "Label")).unwrap();
+    let dot = doc.subtree(inst).into_iter().find(|id| doc.node(*id).is_some_and(|n| n.name == "Dot")).unwrap();
+    let (i, l, d) = (doc.world_bounds(inst).unwrap(), doc.world_bounds(label).unwrap(), doc.world_bounds(dot).unwrap());
+    assert!(l.x1 - l.x0 > 60.0, "the label was measured: {l:?}");
+    assert!((d.x0 - i.x0 - 8.0).abs() < 0.5, "the dot after the padding: {d:?} in {i:?}");
+    assert!((l.x0 - d.x1 - 6.0).abs() < 0.5, "the label after the gap: {l:?}");
+    assert!((i.x1 - l.x1 - 10.0).abs() < 0.5, "the chip hugs: {i:?} {l:?}");
+}
+
+/// An instance sized apart from its master lays its master's stack out at its own size: a wide
+/// button keeps its label and icon together in the middle.
+#[test]
+fn sketch_resized_stack_instances_reflow() {
+    let a = shape("rectangle", "A", [22.0, 12.0, 40.0, 20.0], json!({"points": []}));
+    let b = shape("rectangle", "B", [70.0, 12.0, 20.0, 20.0], json!({"points": []}));
+    let layout = json!({"_class": "MSImmutableFlexGroupLayout", "flexDirection": 0, "justifyContent": 1, "alignItems": 1, "allGuttersGap": 8, "stackingOrder": 0});
+    let master = shape(
+        "symbolMaster",
+        "Button",
+        [0.0, 0.0, 112.0, 44.0],
+        json!({"symbolID": "S", "groupBehavior": 1, "groupLayout": layout, "horizontalSizing": 1, "verticalSizing": 1,
+            "leftPadding": 22, "rightPadding": 22, "topPadding": 12, "bottomPadding": 12, "layers": [b, a]}),
+    );
+    let inst = shape(
+        "symbolInstance",
+        "Wide",
+        [0.0, 100.0, 342.0, 44.0],
+        json!({"symbolID": "S", "overrideValues": [], "horizontalSizing": 0, "verticalSizing": 1}),
+    );
+    let data = base64::engine::general_purpose::STANDARD.encode(sketch_with("2026.3.1", &[("A", "Page")], &[master, inst]));
+    let mut s = Session::new();
+    s.execute("file.open", &json!({"data": data, "name": "x.sketch"})).unwrap();
+    let doc = s.doc().unwrap();
+    let inst = doc.nodes().find(|n| n.name == "Wide").unwrap().id;
+    let at = |name: &str| doc.world_bounds(doc.subtree(inst).into_iter().find(|id| doc.node(*id).is_some_and(|n| n.name == name)).unwrap()).unwrap();
+    let (a, b) = (at("A"), at("B"));
+    // 40 + 8 + 20 = 68 wide, centred in 342: from 137.
+    assert!((a.x0 - 137.0).abs() < 0.5, "{a:?}");
+    assert!((b.x0 - a.x1 - 8.0).abs() < 0.5, "{a:?} {b:?}");
+    assert!((doc.world_bounds(inst).unwrap().x1 - 342.0).abs() < 1e-6);
+}
+
+/// Sketch's natural line: the font's ascent and descent each rounded to whole pixels, without its
+/// line gap, the baseline at the rounded ascent; the classic Mac fonts get a fifth more, all of it
+/// above the text.
+#[test]
+fn sketch_natural_line_rule() {
+    use crate::cmd::file::sketch_line;
+    // Helvetica Neue Medium (975 + 217 of 1000, a gap of 29 left out) at 17 px: 16.575 → 17 and
+    // 3.689 → 4, a line of 21 with the baseline at 17. FigCraft puts the baseline at
+    // (21 − 20.264) / 2 + 16.575 = 16.943, so the text moves down 0.057.
+    let (line, down) = sketch_line(975.0, 217.0, 1000.0, "Helvetica Neue", 17.0);
+    assert!((line - 21.0).abs() < 1e-9 && (down - 0.057).abs() < 1e-9, "{line} {down}");
+    // Helvetica at 100 px: 77 + 23 and a fifth more, 120, all of it above: the baseline at 97
+    // where FigCraft centres it at 87.
+    let (line, down) = sketch_line(1577.0, 471.0, 2048.0, "helvetica", 100.0);
+    assert!((line - 120.0).abs() < 1e-9 && (down - 10.0).abs() < 0.05, "{line} {down}");
+    assert_eq!(sketch_line(0.0, 0.0, 0.0, "X", 12.0), (0.0, 0.0), "no metrics, no change");
+    assert_eq!(sketch_line(900.0, 200.0, 1000.0, "X", f64::NAN), (0.0, 0.0));
+}
+
+/// Text without a fixed line height gets Sketch's natural line as a share of its size, in the
+/// layer and in shared text styles.
+#[test]
+fn sketch_text_gets_sketchs_natural_line() {
+    if !std::path::Path::new("/System/Library/Fonts/HelveticaNeue.ttc").exists() {
+        return;
+    }
+    figcraft_text::fontdb::scan_system_fonts();
+    let font = json!({"name": "HelveticaNeue", "size": 100});
+    let run = json!({"location": 0, "length": 2, "attributes": {"MSAttributedStringFontAttribute": {"attributes": font}}});
+    let t = shape("text", "Label", [0.0, 0.0, 200.0, 120.0], json!({"attributedString": {"string": "Hi", "attributes": [run]}, "textBehaviour": 0}));
+    let data = base64::engine::general_purpose::STANDARD.encode(sketch_with("64", &[("A", "Page")], &[t]));
+    let mut s = Session::new();
+    s.execute("file.open", &json!({"data": data, "name": "x.sketch"})).unwrap();
+    let doc = s.doc().unwrap();
+    let NodeKind::Text(td) = &doc.nodes().find(|n| n.name == "Label").unwrap().kind else { panic!("not text") };
+    // 95.2 → 95 and 21.3 → 21: 116 px, as a share of the size.
+    let figcraft_doc::LineHeight::Percent(p) = td.style.line_height else { panic!("{:?}", td.style.line_height) };
+    assert!((p - 116.0).abs() < 1e-9, "{p}");
+}
+
+/// A text an auto layout places isn't moved to Sketch's baseline (the next layout pass would take
+/// the move back): laying the stack out again leaves it where the import put it.
+#[test]
+fn sketch_text_in_a_stack_stays_put() {
+    if !std::path::Path::new("/System/Library/Fonts/Helvetica.ttc").exists() {
+        return;
+    }
+    figcraft_text::fontdb::scan_system_fonts();
+    let font = json!({"name": "Helvetica", "size": 40});
+    let run = json!({"location": 0, "length": 2, "attributes": {"MSAttributedStringFontAttribute": {"attributes": font}}});
+    let label = shape(
+        "text",
+        "Label",
+        [10.0, 10.0, 50.0, 48.0],
+        json!({"attributedString": {"string": "Hi", "attributes": [run]}, "horizontalSizing": 1, "verticalSizing": 1}),
+    );
+    let layout = json!({"_class": "MSImmutableFlexGroupLayout", "flexDirection": 1, "justifyContent": 0, "alignItems": 0, "allGuttersGap": 0, "stackingOrder": 0});
+    let stack = shape(
+        "group",
+        "Stack",
+        [0.0, 0.0, 200.0, 68.0],
+        json!({"groupBehavior": 1, "groupLayout": layout, "leftPadding": 10, "topPadding": 10, "rightPadding": 10, "bottomPadding": 10, "layers": [label]}),
+    );
+    let data = base64::engine::general_purpose::STANDARD.encode(sketch_with("2026.3.1", &[("A", "Page")], &[stack]));
+    let mut s = Session::new();
+    s.execute("file.open", &json!({"data": data, "name": "x.sketch"})).unwrap();
+    let mut doc = s.doc().unwrap().clone();
+    let stack = doc.nodes().find(|n| n.name == "Stack").unwrap().id;
+    let label = doc.nodes().find(|n| n.name == "Label").unwrap().id;
+    let before = doc.world_bounds(label).unwrap();
+    figcraft_layout::layout_frame(&mut doc, stack, &crate::measure::TextMeasure);
+    let after = doc.world_bounds(label).unwrap();
+    assert!((before.y0 - after.y0).abs() < 1e-6, "{before:?} → {after:?}");
+}
+
+/// Shared text styles get what their linked layers get on import: the installed family's name and
+/// the platform's tracking (a layer and its style stay alike).
+#[test]
+fn sketch_shared_text_styles_match_their_layers() {
+    if !std::path::Path::new("/System/Library/Fonts/SFNS.ttf").exists() {
+        return;
+    }
+    figcraft_text::fontdb::scan_system_fonts();
+    let attrs = json!({"MSAttributedStringFontAttribute": {"attributes": {"name": "SFUIText-Regular", "size": 13}}});
+    let style = json!({"_class": "style", "textStyle": {"_class": "textStyle", "encodedAttributes": attrs.clone()}});
+    let shared = json!({"_class": "sharedStyle", "do_objectID": "TS", "name": "Body", "value": style.clone()});
+    let run = json!({"location": 0, "length": 2, "attributes": attrs});
+    let mut linked = style;
+    linked["sharedObjectID"] = json!("TS");
+    let t = shape(
+        "text",
+        "Label",
+        [0.0, 0.0, 100.0, 20.0],
+        json!({"attributedString": {"string": "Hi", "attributes": [run]}, "textBehaviour": 0, "style": linked}),
+    );
+    let extra = json!({"layerTextStyles": {"_class": "sharedTextStyleContainer", "objects": [shared]}});
+    let data = base64::engine::general_purpose::STANDARD.encode(sketch_with_doc("64", &[("A", "Page")], &[t], extra));
+    let mut s = Session::new();
+    s.execute("file.open", &json!({"data": data, "name": "x.sketch"})).unwrap();
+    let doc = s.doc().unwrap();
+    let NodeKind::Text(td) = &doc.nodes().find(|n| n.name == "Label").unwrap().kind else { panic!("not text") };
+    let st = doc
+        .styles
+        .iter()
+        .find_map(|st| match &st.kind {
+            figcraft_doc::StyleKind::Text { style } if st.name == "Body" => Some(style.clone()),
+            _ => None,
+        })
+        .unwrap();
+    assert_eq!(st.font_family, td.style.font_family);
+    assert_eq!(st.letter_spacing.resolve(13.0), td.style.letter_spacing.resolve(13.0), "{st:?}");
+}
diff --git a/crates/engine/src/slot_tests.rs b/crates/engine/src/slot_tests.rs
index 516cb9d6..cbf824d9 100644
--- a/crates/engine/src/slot_tests.rs
+++ b/crates/engine/src/slot_tests.rs
@@ -41,6 +41,17 @@ fn props_of(s: &mut Session, id: NodeId) -> Vec<Value> {
     ex(s, "component.properties", json!({"id": id}))["properties"].as_array().cloned().unwrap_or_default()
 }
 
+/// A refused slot is reported by `component.makeSlot`, the command that was run, not by the
+/// property command it adds its slot property through.
+#[test]
+fn a_refused_slot_names_make_slot() {
+    let mut s = Session::new();
+    let (c, ..) = slot_card(&mut s);
+    let other = idv(&ex(&mut s, "frame.create", json!({"x": 150, "y": 10, "width": 40, "height": 30, "parent": c, "name": "Other"})));
+    let err = s.execute("component.makeSlot", &json!({"id": other, "name": "Content"})).unwrap_err().to_string();
+    assert!(err.contains("`component.makeSlot`") && err.contains("a property named `Content` already exists"), "{err}");
+}
+
 #[test]
 fn slots_are_frames_of_a_main_with_a_slot_property() {
     let mut s = Session::new();
diff --git a/crates/engine/src/style_vars_tests.rs b/crates/engine/src/style_vars_tests.rs
index dae9ef56..66768daa 100644
--- a/crates/engine/src/style_vars_tests.rs
+++ b/crates/engine/src/style_vars_tests.rs
@@ -182,6 +182,46 @@ fn what_a_style_cannot_bind_is_refused() {
     }
 }
 
+#[test]
+fn style_fields_offer_their_properties_scopes() {
+    let mut s = Session::new();
+    let (_, _, a, _, sid) = two_modes(&mut s);
+    run(&mut s, "effect.add", json!({"ids": [a], "type": "dropShadow"}));
+    let fx = run(&mut s, "style.create", json!({"type": "effect", "name": "Drop", "from": a}))["id"].as_str().unwrap().to_string();
+    let light = node(&s, a).parent.unwrap();
+    run(&mut s, "grid.add", json!({"ids": [light]}));
+    let grid = run(&mut s, "style.create", json!({"type": "grid", "name": "Base", "from": light}))["id"].as_str().unwrap().to_string();
+    let body = run(&mut s, "style.create", json!({"type": "text", "name": "Body", "value": {"fontFamily": "Inter", "fontSize": 14}}))["id"]
+        .as_str()
+        .unwrap()
+        .to_string();
+    let doc = s.doc().unwrap();
+    let scopes = |st: &str, key: &str| crate::style_vars::field_scopes(&doc.style(st).unwrap().kind, key);
+    let fills: &[&str] = &["FRAME_FILL", "SHAPE_FILL", "TEXT_FILL", "STROKE_COLOR"];
+    for (st, key, want) in [
+        (&sid, "fill", Some(fills)),
+        (&sid, "fills/0/color", Some(fills)),
+        (&fx, "effects/0/color", Some(&["EFFECT_COLOR"][..])),
+        (&fx, "effects/0/radius", Some(&["EFFECT_FLOAT"][..])),
+        (&fx, "effects/0/offsetX", Some(&["EFFECT_FLOAT"][..])),
+        (&body, "fontSize", Some(&["FONT_SIZE"][..])),
+        (&body, "lineHeight", Some(&["LINE_HEIGHT"][..])),
+        (&body, "letterSpacing", Some(&["LETTER_SPACING"][..])),
+        (&body, "fontFamily", Some(&["FONT_FAMILY"][..])),
+        (&body, "fontStyle", Some(&["FONT_STYLE"][..])),
+        // Grid fields take any number variable, as on layers; fields a style lacks take none.
+        (&grid, "layoutGrids/0/size", None),
+        (&sid, "fills/3/color", None),
+        (&body, "opacity", None),
+    ] {
+        assert_eq!(scopes(st, key), want, "{st} {key}");
+    }
+    // As on layers, scopes limit pickers only: an out-of-scope variable still binds.
+    run(&mut s, "variable.update", json!({"variable": "size", "scopes": ["CORNER_RADIUS"]}));
+    run(&mut s, "style.bind", json!({"style": body, "field": "fontSize", "variable": "size"}));
+    assert!(s.doc().unwrap().style(&body).unwrap().bound.contains_key("fontSize"));
+}
+
 #[test]
 fn rest_and_fig_carry_style_bindings() {
     let mut s = Session::new();
diff --git a/crates/engine/src/styles_behaviour_tests.rs b/crates/engine/src/styles_behaviour_tests.rs
index ff7af50b..de9da5a5 100644
--- a/crates/engine/src/styles_behaviour_tests.rs
+++ b/crates/engine/src/styles_behaviour_tests.rs
@@ -80,6 +80,20 @@ fn link(s: &Session, n: NodeId, kind: &str) -> Option<String> {
     }
 }
 
+/// The key linking a style of `kind` (a paint style links fills).
+fn style_key(kind: &str) -> String {
+    if kind == "paint" { "fillStyle".into() } else { format!("{kind}Style") }
+}
+
+/// `node.create` params for an unselected layer that takes `kind` styles, with `props`.
+fn new_layer(kind: &str, props: Value) -> Value {
+    if kind == "text" {
+        json!({"type": "text", "text": "Hej", "select": false, "props": props})
+    } else {
+        json!({"type": "frame", "select": false, "props": props})
+    }
+}
+
 #[test]
 fn a_style_holds_the_whole_property_and_links_its_source() {
     // Documented: colour styles can hold several fills (gradients, images); effect styles combine
@@ -234,6 +248,59 @@ fn editing_a_styled_property_detaches_that_style_only() {
     let _ = st;
 }
 
+#[test]
+fn a_style_link_wins_over_values_in_the_same_call() {
+    // Docs silent on one call setting both (a linked layer shows its style's values; editing one
+    // detaches it); pinned: the link wins whatever the keys are called, on node.create and
+    // node.set, and a deviation set in a later call unlinks as before.
+    let mut s = Session::new();
+    let rows = styled(&mut s);
+    let pairs: [(&str, &str, Value); 12] = [
+        ("paint", "fill", json!("#123456")),
+        ("paint", "fills", json!(["#123456"])),
+        ("stroke", "stroke", json!("#123456")),
+        ("stroke", "strokes", json!(["#123456"])),
+        ("effect", "effects", json!([])),
+        ("grid", "grids", json!([])),
+        ("grid", "layoutGrids", json!([])),
+        ("text", "fontStyle", json!("Bold")),
+        ("text", "lineHeight", json!(40)),
+        ("text", "textDecoration", json!("underline")),
+        ("text", "letterSpacing", json!(5)),
+        ("text", "variationSettings", json!({"wght": 700})),
+    ];
+    for (kind, key, value) in pairs {
+        let (source, st, _) = rows.iter().find(|r| r.2 == kind).unwrap().clone();
+        let link_key = style_key(kind);
+        let props = json!({key: value.clone(), link_key.as_str(): st.clone()});
+        let made = id(run(&mut s, "node.create", new_layer(kind, props.clone())));
+        let set = if kind == "text" { text(&mut s, 400.0) } else { rect(&mut s, 400.0) };
+        run(&mut s, "node.set", json!({"id": set, "props": props}));
+        for (how, layer) in [("node.create", made), ("node.set", set)] {
+            assert_eq!(link(&s, layer, kind).as_deref(), Some(st.as_str()), "{how} `{key}` + `{link_key}`: linked");
+            assert_eq!(shown(&s, layer, kind), shown(&s, source, kind), "{how} `{key}` + `{link_key}`: the style's values");
+        }
+        run(&mut s, "node.set", json!({"id": set, "props": {key: value}}));
+        assert_eq!(link(&s, set, kind), None, "`{key}` in a later call unlinks");
+        assert_ne!(shown(&s, set, kind), shown(&s, source, kind), "`{key}` in a later call applies");
+    }
+}
+
+#[test]
+fn a_style_link_leaves_values_its_style_does_not_set() {
+    // Docs silent; pinned: alignment given beside a text style applies, on node.create and node.set.
+    let mut s = Session::new();
+    let st = styled(&mut s).into_iter().find(|r| r.2 == "text").unwrap().1;
+    let props = json!({"textStyle": st, "textAlign": "center"});
+    let made = id(run(&mut s, "node.create", new_layer("text", props.clone())));
+    let set = text(&mut s, 400.0);
+    run(&mut s, "node.set", json!({"id": set, "props": props}));
+    for (how, layer) in [("node.create", made), ("node.set", set)] {
+        assert_eq!(link(&s, layer, "text").as_deref(), Some(st.as_str()), "{how}: linked");
+        assert_eq!(node(&s, layer).kind.text().unwrap().align_h, figcraft_doc::TextAlignH::Center, "{how}: `textAlign` applies");
+    }
+}
+
 #[test]
 fn applying_a_style_replaces_variables_bound_to_that_property() {
     // Documented: applying a style sets the property to the style's values. Docs silent on bound
diff --git a/crates/engine/src/tailwind_tests.rs b/crates/engine/src/tailwind_tests.rs
new file mode 100644
index 00000000..9e41fecc
--- /dev/null
+++ b/crates/engine/src/tailwind_tests.rs
@@ -0,0 +1,342 @@
+//! React + Tailwind code for pages: utilities instead of a stylesheet, theme utilities for bound
+//! variables, fluid boxes, inlined instances, per-side borders, mobile-first responsive merges and
+//! the Tailwind theme export.
+
+use crate::Session;
+use crate::components::tests::{ex, idv};
+use crate::tailwind::{classes, merge};
+use figcraft_doc::NodeId;
+use serde_json::json;
+
+fn code(s: &mut Session, id: NodeId, extra: serde_json::Value) -> String {
+    let mut p = json!({"id": id, "language": "tailwind"});
+    if let (Some(p), Some(e)) = (p.as_object_mut(), extra.as_object()) {
+        p.extend(e.clone());
+    }
+    ex(s, "inspect.code", p)["code"].as_str().unwrap_or_default().to_string()
+}
+
+/// A 1440 "Page" (vertical auto layout, bg bound to Brand/Accent) holding a 960 "Hero" text and a
+/// horizontal "Row" of two "Card" frames that fill it. Returns (page, row).
+fn page(s: &mut Session, name: &str, width: f64, row_dir: &str) -> (NodeId, NodeId) {
+    let p = idv(&ex(s, "frame.create", json!({"x": 0, "y": 0, "width": width, "height": 900, "name": name})));
+    ex(s, "layout.add", json!({"ids": [p], "direction": "vertical"}));
+    ex(s, "node.set", json!({"id": p, "props": {"gap": 24, "padding": 32}}));
+    let t = idv(&ex(s, "text.create", json!({"text": "Seu site em 7 dias", "x": 0, "y": 0, "parent": p, "props": {"name": "Hero"}})));
+    ex(s, "node.set", json!({"id": t, "props": {"width": 960, "textAutoResize": "height"}}));
+    let row = idv(&ex(s, "frame.create", json!({"x": 0, "y": 0, "width": 800, "height": 200, "parent": p, "name": "Row"})));
+    ex(s, "layout.add", json!({"ids": [row], "direction": row_dir}));
+    for _ in 0..2 {
+        let c = idv(&ex(s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100, "parent": row, "name": "Card"})));
+        ex(s, "node.set", json!({"id": c, "props": {"sizingH": "fill"}}));
+    }
+    (p, row)
+}
+
+fn brand(s: &mut Session) {
+    ex(s, "variable.createCollection", json!({"name": "Brand"}));
+    ex(s, "variable.create", json!({"collection": "Brand", "name": "Brand/Accent", "type": "color", "value": "#3DDC97"}));
+    ex(s, "variable.create", json!({"collection": "Brand", "name": "card", "type": "number", "value": 12}));
+    ex(s, "variable.create", json!({"collection": "Brand", "name": "fade", "type": "number", "value": 0.5}));
+}
+
+#[test]
+fn utilities_replace_the_stylesheet_and_variables_become_theme_utilities() {
+    let mut s = Session::new();
+    brand(&mut s);
+    let (p, row) = page(&mut s, "Landing", 1440.0, "horizontal");
+    ex(&mut s, "variable.bind", json!({"ids": [p], "field": "fill", "variable": "Brand/Accent"}));
+    ex(&mut s, "node.set", json!({"id": row, "props": {"cornerRadius": 12}}));
+    ex(&mut s, "variable.bind", json!({"ids": [row], "field": "cornerRadius", "variable": "card"}));
+    let out = code(&mut s, p, json!({}));
+    assert!(out.contains("export function Landing() {"), "{out}");
+    assert!(!out.contains("import") && !out.contains("<style") && !out.contains(".css"), "no stylesheet: {out}");
+    for want in ["flex flex-col", "gap-6", "p-8", "bg-accent", "rounded-card", "flex-1", "w-full"] {
+        assert!(out.contains(want), "{want} in {out}");
+    }
+    // The page is as wide as itself: just full width; the 960 text is capped, not fixed.
+    assert!(out.contains("max-w-[960px]") && !out.contains("w-[1440px]") && !out.contains("max-w-[1440px]"), "{out}");
+}
+
+#[test]
+fn per_side_strokes_are_borders_on_those_sides() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 60, "name": "Nav"})));
+    ex(&mut s, "node.set", json!({"id": f, "props": {"strokes": ["#262A31"], "strokeWeight": 1, "strokeSides": [0, 0, 1, 0]}}));
+    let css = ex(&mut s, "inspect.code", json!({"id": f, "language": "css"}))["code"].as_str().unwrap_or_default().to_string();
+    assert!(css.contains("border-bottom: 1px solid") && !css.contains("border:"), "{css}");
+    let tw = code(&mut s, f, json!({}));
+    assert!(tw.contains("border-b ") && (tw.contains("border-[#262a31]") || tw.contains("border-[#262A31]")), "{tw}");
+    // Without per-side weights it is one border.
+    ex(&mut s, "node.set", json!({"id": f, "props": {"strokeSides": null, "strokeWeight": 2}}));
+    let css = ex(&mut s, "inspect.code", json!({"id": f, "language": "css"}))["code"].as_str().unwrap_or_default().to_string();
+    assert!(css.contains("border: 2px solid"), "{css}");
+}
+
+#[test]
+fn instances_are_inlined_with_their_overrides() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Benefit"})));
+    ex(&mut s, "layout.add", json!({"ids": [f], "direction": "vertical"}));
+    ex(&mut s, "text.create", json!({"text": "Original", "x": 0, "y": 0, "parent": f, "props": {"name": "Title"}}));
+    let comp = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    let holder = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 400, "width": 600, "height": 200, "name": "Benefits"})));
+    ex(&mut s, "layout.add", json!({"ids": [holder], "direction": "horizontal"}));
+    let inst = idv(&ex(&mut s, "instance.create", json!({"component": comp, "x": 0, "y": 0, "parent": holder})));
+    let doc = s.doc().unwrap();
+    let title = doc.node(inst).unwrap().children[0];
+    ex(&mut s, "text.set", json!({"id": title, "characters": "Agenda sozinha"}));
+    let out = code(&mut s, holder, json!({}));
+    assert!(out.contains("Agenda sozinha") && !out.contains("<Benefit"), "inlined with override: {out}");
+}
+
+#[test]
+fn a_mobile_frame_makes_the_code_mobile_first() {
+    let mut s = Session::new();
+    let (desk, _) = page(&mut s, "Landing", 1440.0, "horizontal");
+    let (mob, _) = page(&mut s, "Landing mobile", 390.0, "vertical");
+    // A layer only on desktop is hidden on mobile.
+    ex(&mut s, "text.create", json!({"text": "Só no desktop", "x": 0, "y": 0, "parent": desk, "props": {"name": "Aside"}}));
+    let out = code(&mut s, desk, json!({"mobile": mob}));
+    assert!(out.contains("mobile first"), "{out}");
+    assert!(out.contains("flex flex-col") && out.contains("lg:flex-row"), "row stacks on mobile: {out}");
+    assert!(out.contains("hidden") && out.contains("lg:block"), "desktop-only layer: {out}");
+    assert!(s.execute("inspect.code", &json!({"id": desk, "language": "tailwind", "mobile": 999_999})).is_err(), "a missing mobile frame is refused");
+}
+
+#[test]
+fn declarations_map_to_idiomatic_utilities() {
+    let got: Vec<String> = classes(
+        "display: flex;\njustify-content: space-between;\nalign-items: center;\npadding: 8px 16px 8px 16px;\nfont-weight: 600;\nfont-size: 18px;\nline-height: 120%;\nopacity: 0.5;\ncolor: var(--color-muted, #9aa3ae);\nbox-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.25);\nwhite-space: nowrap;\n",
+    )
+    .into_iter()
+    .map(|(_, c)| c)
+    .collect();
+    let want = [
+        "flex",
+        "justify-between",
+        "items-center",
+        "py-2",
+        "px-4",
+        "font-semibold",
+        "text-[18px]",
+        "leading-[1.2]",
+        "opacity-50",
+        "text-muted",
+        "shadow-[0px_4px_12px_0px_rgba(0,_0,_0,_0.25)]",
+        "[white-space:nowrap]",
+    ];
+    assert_eq!(got, want);
+}
+
+#[test]
+fn variables_export_with_units_and_as_a_tailwind_theme() {
+    let mut s = Session::new();
+    brand(&mut s);
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100})));
+    ex(&mut s, "node.set", json!({"id": f, "props": {"cornerRadius": 12, "opacity": 0.5}}));
+    ex(&mut s, "variable.bind", json!({"ids": [f], "field": "cornerRadius", "variable": "card"}));
+    ex(&mut s, "variable.bind", json!({"ids": [f], "field": "opacity", "variable": "fade"}));
+    let css = ex(&mut s, "variable.export", json!({"format": "css"}))["text"].as_str().unwrap_or_default().to_string();
+    assert!(css.contains("--card: 12px;") && css.contains("--fade: 0.5;"), "{css}");
+    let tw = ex(&mut s, "variable.export", json!({"format": "tailwind"}))["text"].as_str().unwrap_or_default().to_string();
+    for want in ["@import \"tailwindcss\";", "@theme static {", "--color-accent: #3ddc97;", "--radius-card: 12px;", "--fade: 0.5;"] {
+        assert!(tw.to_lowercase().contains(&want.to_lowercase()), "{want} in {tw}");
+    }
+}
+
+#[test]
+fn desktop_padding_on_other_sides_is_not_reset_away() {
+    let mut s = Session::new();
+    let (desk, _) = page(&mut s, "Landing", 1440.0, "horizontal");
+    let (mob, _) = page(&mut s, "Landing mobile", 390.0, "vertical");
+    ex(&mut s, "node.set", json!({"id": desk, "props": {"paddingTop": 24, "paddingBottom": 24, "paddingLeft": 64, "paddingRight": 64}}));
+    ex(&mut s, "node.set", json!({"id": mob, "props": {"padding": 24}}));
+    let out = code(&mut s, desk, json!({"mobile": mob}));
+    assert!(out.contains("p-6 ") && out.contains("lg:py-6 lg:px-16"), "{out}");
+    assert!(!out.contains("lg:p-0"), "a reset would undo lg:px-16: {out}");
+}
+
+#[test]
+fn a_layer_name_cant_break_out_of_the_header_comment() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100, "name": "A\rB\u{2028}alert(1)\u{2029}C\nD"})));
+    let out = code(&mut s, f, json!({}));
+    let header = out.lines().next().unwrap_or_default();
+    assert!(header.starts_with("// ") && header.contains("alert(1)"), "{out}");
+    assert!(!out.contains(['\r', '\u{2028}', '\u{2029}']), "{out:?}");
+    let name = out.lines().nth(1).and_then(|l| l.strip_prefix("export function ")).and_then(|l| l.strip_suffix("() {")).unwrap_or_default();
+    assert!(!name.is_empty() && name.chars().all(|c| c.is_ascii_alphanumeric() || c == '_'), "an identifier: {name:?}");
+}
+
+#[test]
+fn slashed_layer_names_and_phone_widths_merge_right() {
+    let mut s = Session::new();
+    let mut frames = Vec::new();
+    for (name, width, dir, sizing) in [("Landing", 1440.0, "horizontal", "hug"), ("Landing mobile", 390.0, "vertical", "fill")] {
+        let p = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": width, "height": 600, "name": name})));
+        ex(&mut s, "layout.add", json!({"ids": [p], "direction": "vertical"}));
+        let ctas = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 342, "height": 120, "parent": p, "name": "CTAs"})));
+        ex(&mut s, "layout.add", json!({"ids": [ctas], "direction": dir}));
+        let b = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 48, "parent": ctas, "name": "Button/Primary"})));
+        ex(&mut s, "layout.add", json!({"ids": [b], "direction": "horizontal"}));
+        ex(&mut s, "node.set", json!({"id": b, "props": {"sizingH": sizing}}));
+        ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": width * 0.8, "height": 1, "parent": p, "props": {"name": "Divider"}}));
+        frames.push(p);
+    }
+    // A layer only the mobile frame has.
+    ex(&mut s, "text.create", json!({"text": "7 dias", "x": 0, "y": 0, "parent": frames[1], "props": {"name": "Tag"}}));
+    let out = code(&mut s, frames[0], json!({"mobile": frames[1]}));
+    let button =
+        out.lines().find(|l| l.contains("lg:") && l.contains("rounded") || l.contains("self-stretch") && l.contains("flex-row")).unwrap_or_default();
+    assert!(button.contains("self-stretch") && button.contains("lg:self-auto"), "the slashed name keeps its mobile classes: {out}");
+    assert!(!out.contains("max-w-[342px] ") || out.contains("lg:max-w-[342px]"), "no phone-width cap below lg: {out}");
+    assert!(out.contains("Only in the mobile frame") && out.contains("Tag"), "{out}");
+    let divider = out.lines().filter(|l| l.contains("<div") && (l.contains("h-[1px]") || l.contains("h-px"))).count();
+    assert!(out.contains("w-full") && divider <= 2, "{out}");
+}
+
+#[test]
+fn a_variable_named_after_its_namespace_is_its_base() {
+    let mut s = Session::new();
+    ex(&mut s, "variable.createCollection", json!({"name": "Brand"}));
+    ex(&mut s, "variable.create", json!({"collection": "Brand", "name": "radius", "type": "number", "value": 12}));
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100})));
+    ex(&mut s, "node.set", json!({"id": f, "props": {"cornerRadius": 12}}));
+    ex(&mut s, "variable.bind", json!({"ids": [f], "field": "cornerRadius", "variable": "radius"}));
+    assert!(code(&mut s, f, json!({})).contains("rounded-base"));
+    let tw = ex(&mut s, "variable.export", json!({"format": "tailwind"}))["text"].as_str().unwrap_or_default().to_string();
+    assert!(tw.contains("--radius-base: 12px;") && !tw.contains("--radius-radius"), "{tw}");
+}
+
+#[test]
+fn mobile_only_layer_names_cant_break_out_of_the_header_comment() {
+    let mut s = Session::new();
+    let (desk, _) = page(&mut s, "Landing", 1440.0, "horizontal");
+    let (mob, _) = page(&mut s, "Landing mobile", 390.0, "vertical");
+    ex(&mut s, "text.create", json!({"text": "x", "x": 0, "y": 0, "parent": mob, "props": {"name": "Tag\nalert(1)\u{2028}y"}}));
+    let out = code(&mut s, desk, json!({"mobile": mob}));
+    let header = out.lines().next().unwrap_or_default();
+    assert!(header.starts_with("// ") && header.contains("alert(1)"), "listed inside the comment: {out}");
+    assert!(out.lines().nth(1).is_some_and(|l| l.starts_with("export function ")), "{out}");
+    assert!(!out.contains(['\r', '\u{2028}', '\u{2029}']), "{out:?}");
+}
+
+#[test]
+fn page_code_leaves_resets_to_tailwind_preflight() {
+    let mut s = Session::new();
+    let (p, _) = page(&mut s, "Landing", 1440.0, "horizontal");
+    let out = code(&mut s, p, json!({}));
+    for leak in ["box-sizing", "[margin:0]", "text-decoration", "cursor"] {
+        assert!(!out.contains(leak), "{leak} in {out}");
+    }
+}
+
+#[test]
+fn instances_connected_to_code_are_their_snippet_with_one_import() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 160, "height": 44, "name": "Button"})));
+    ex(&mut s, "layout.add", json!({"ids": [f], "direction": "horizontal"}));
+    let label = idv(&ex(&mut s, "text.create", json!({"text": "Botão", "x": 0, "y": 0, "parent": f, "props": {"name": "Label"}})));
+    let comp = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    ex(&mut s, "component.addProperty", json!({"id": comp, "name": "Label", "type": "text", "layer": label}));
+    ex(
+        &mut s,
+        "codeConnect.set",
+        json!({"id": comp, "language": "react", "importPath": "@/components/ui/button", "name": "Button", "template": "<Button size=\"lg\">{Label}</Button>"}),
+    );
+    let p = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 300, "width": 1440, "height": 400, "name": "Landing"})));
+    ex(&mut s, "layout.add", json!({"ids": [p], "direction": "vertical"}));
+    for text in ["Agendar diagnóstico", "Ver exemplos"] {
+        let i = idv(&ex(&mut s, "instance.create", json!({"component": comp, "x": 0, "y": 0, "parent": p})));
+        ex(&mut s, "instance.setProperties", json!({"id": i, "properties": {"Label": text}}));
+    }
+    let out = code(&mut s, p, json!({}));
+    assert_eq!(out.matches("import { Button } from \"@/components/ui/button\";").count(), 1, "{out}");
+    assert!(out.contains("<Button size=\"lg\">") && out.contains("Agendar diagnóstico") && out.contains("Ver exemplos"), "{out}");
+    assert!(!out.contains(">Botão<"), "the component's own layers aren't inlined: {out}");
+    // Unconnected instances are still inlined.
+    ex(&mut s, "codeConnect.remove", json!({"id": comp, "language": "react"}));
+    let out = code(&mut s, p, json!({}));
+    assert!(!out.contains("import ") && out.contains(">Agendar diagnóstico<"), "{out}");
+}
+
+#[test]
+fn review_same_named_variables_keep_distinct_theme_names() {
+    let mut s = Session::new();
+    ex(&mut s, "variable.createCollection", json!({"name": "Brand"}));
+    ex(&mut s, "variable.create", json!({"collection": "Brand", "name": "Palette/Accent", "type": "color", "value": "#3DDC97"}));
+    ex(&mut s, "variable.create", json!({"collection": "Brand", "name": "Semantic/Accent", "type": "color", "value": "#7C5CFF"}));
+    ex(&mut s, "variable.create", json!({"collection": "Brand", "name": "Muted", "type": "color", "value": "#9AA3AE"}));
+    let p = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 400, "height": 200, "name": "Page"})));
+    ex(&mut s, "layout.add", json!({"ids": [p], "direction": "vertical"}));
+    let a = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 50, "parent": p, "name": "A"})));
+    let b = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 50, "parent": p, "name": "B"})));
+    ex(&mut s, "variable.bind", json!({"ids": [a], "field": "fill", "variable": "Palette/Accent"}));
+    ex(&mut s, "variable.bind", json!({"ids": [b], "field": "fill", "variable": "Semantic/Accent"}));
+    let out = code(&mut s, p, json!({}));
+    assert!(out.contains("bg-palette-accent") && out.contains("bg-semantic-accent"), "{out}");
+    let tw = ex(&mut s, "variable.export", json!({"format": "tailwind"}))["text"].as_str().unwrap_or_default().to_lowercase();
+    assert!(tw.contains("--color-palette-accent: #3ddc97;") && tw.contains("--color-semantic-accent: #7c5cff;"), "{tw}");
+    assert!(tw.contains("--color-muted:"), "unique short names stay short: {tw}");
+}
+
+#[test]
+fn review_an_alias_target_takes_its_readers_role() {
+    let mut s = Session::new();
+    ex(&mut s, "variable.createCollection", json!({"name": "Brand"}));
+    ex(&mut s, "variable.create", json!({"collection": "Brand", "name": "half", "type": "number", "value": 0.5}));
+    ex(&mut s, "variable.create", json!({"collection": "Brand", "name": "fade", "type": "number", "value": 1}));
+    ex(&mut s, "variable.set", json!({"variable": "fade", "value": {"alias": "half"}}));
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100})));
+    ex(&mut s, "variable.bind", json!({"ids": [f], "field": "opacity", "variable": "fade"}));
+    let css = ex(&mut s, "variable.export", json!({"format": "css"}))["text"].as_str().unwrap_or_default().to_string();
+    assert!(css.contains("--half: 0.5;") && !css.contains("0.5px"), "{css}");
+}
+
+#[test]
+fn review_borders_images_and_fonts_from_variables_are_valid_utilities() {
+    let got: Vec<String> = classes(
+        "border: var(--stroke, 2px) solid #000000;\nborder-bottom: var(--hair, 1px) solid var(--color-border, #262a31);\nbackground: url(image.png) center / cover;\nfont-family: var(--brand-font, \"Inter\");\n",
+    )
+    .into_iter()
+    .map(|(_, c)| c)
+    .collect();
+    assert_eq!(
+        got,
+        [
+            "border-(length:--stroke)",
+            "border-[#000000]",
+            "border-b-(length:--hair)",
+            "border-border",
+            "[background:url(image.png)_center_/_cover]",
+            "font-(family-name:--brand-font)"
+        ]
+    );
+}
+
+#[test]
+fn review_desktop_defaults_reset_mobile_values_and_padding_per_side() {
+    let mut s = Session::new();
+    let (desk, _) = page(&mut s, "Landing", 1440.0, "horizontal");
+    let (mob, _) = page(&mut s, "Landing mobile", 390.0, "vertical");
+    ex(&mut s, "node.set", json!({"id": mob, "props": {"opacity": 0.5, "padding": 24}}));
+    ex(&mut s, "node.set", json!({"id": desk, "props": {"paddingTop": 0, "paddingBottom": 0, "paddingLeft": 64, "paddingRight": 64}}));
+    let out = code(&mut s, desk, json!({"mobile": mob}));
+    let root = out.lines().nth(3).unwrap_or_default();
+    assert!(root.contains("opacity-50") && root.contains("lg:opacity-100"), "{root}");
+    assert!(root.contains("p-6") && root.contains("lg:px-16") && root.contains("lg:py-0"), "{root}");
+}
+
+#[test]
+fn review_desktop_without_fill_clears_a_mobile_image_or_gradient() {
+    let got = merge(Some(&[("background".to_string(), "[background:url(image.png)_center_/_cover]".to_string())]), &[]);
+    assert!(got.contains(&"lg:bg-none".to_string()) && got.contains(&"lg:bg-transparent".to_string()), "{got:?}");
+}
+
+#[test]
+fn per_corner_radii_with_a_variable_first_keep_every_corner() {
+    let got: Vec<String> =
+        classes("border-radius: var(--radius-a, 4px) 8px 8px 8px;\nborder-radius: var(--radius-card, 4px);\n").into_iter().map(|(_, c)| c).collect();
+    assert_eq!(got, ["rounded-[var(--radius-a,_4px)_8px_8px_8px]", "rounded-card"]);
+}
diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs
index dbf432d4..811724f2 100644
--- a/crates/engine/src/tests.rs
+++ b/crates/engine/src/tests.rs
@@ -275,6 +275,20 @@ fn align_distribute_zorder() {
     assert_eq!(s.doc().unwrap().node(page).unwrap().children[0], c);
 }
 
+#[test]
+fn distribute_spans_the_outermost_edge() {
+    let mut s = sess();
+    let a = id(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap());
+    let b = id(&s.execute("shape.rectangle", &json!({"x": 150, "y": 150, "width": 500, "height": 500})).unwrap());
+    let c = id(&s.execute("shape.rectangle", &json!({"x": 160, "y": 160, "width": 10, "height": 10})).unwrap());
+    s.execute("distribute.horizontal", &json!({"ids": [a, b, c]})).unwrap();
+    let xs: Vec<f64> = [a, b, c].iter().map(|i| s.doc().unwrap().world_bounds(*i).unwrap().x0).collect();
+    assert_eq!(xs, [0.0, 75.0, 640.0]);
+    s.execute("distribute.vertical", &json!({"ids": [a, b, c]})).unwrap();
+    let ys: Vec<f64> = [a, b, c].iter().map(|i| s.doc().unwrap().world_bounds(*i).unwrap().y0).collect();
+    assert_eq!(ys, [0.0, 75.0, 640.0]);
+}
+
 #[test]
 fn a_layer_alone_on_the_page_has_nothing_to_align_to() {
     use crate::cmd::arrange::can_align;
@@ -376,6 +390,7 @@ fn pointer_draw_move_resize() {
     assert_eq!(s.selection(), vec![r]);
 }
 
+/// No command panics on junk parameters.
 #[test]
 fn every_command_survives_junk_params() {
     // A junk-parameter sweep: no command may panic (guard turns panics into Internal errors,
@@ -394,8 +409,15 @@ fn every_command_survives_junk_params() {
         // Links (dev resources) and indexes as junk.
         json!({"id": 2, "url": "javascript:alert(1)", "index": 1e308, "name": {"x": 1}}),
         json!({"id": 2, "url": "https://\u{0}x", "index": -1, "name": ""}),
+        // Dev Mode measurements: layers, sides, pages and indexes as junk.
+        json!({"from": "x", "to": -1, "side": [1], "index": 1e308, "page": {"x": 1}}),
+        json!({"from": 2, "to": 2, "side": "middle", "index": -1, "page": 2, "id": "nope"}),
+        json!({"from": 2, "to": 1, "side": "auto"}),
         // Widgets: plugins, targets and fuel as junk.
         json!({"id": 1, "plugin": {"x": 1}, "target": [1], "fuel": -1e308, "x": 1e308}),
+        // Widget fields and menus: fields, items and values as junk.
+        json!({"id": 1, "field": {"x": 1}, "item": [1], "value": {"x": "\u{0}"}, "fuel": 1e308}),
+        json!({"id": [1], "field": "label\u{0}", "item": "", "value": "\u{7}".repeat(5000)}),
         // Plugin directories: ids, versions, servers and confirmations as junk.
         json!({"id": "../../x", "version": {"x": 1}, "server": "ws://\u{0}/?key=", "confirm": "yes", "path": [5], "plugin": [1], "query": 7, "sha256": 3}),
         json!({"id": "org.example.x", "version": "1.0.0", "server": "wss://[::1", "confirm": true, "plugin": "nope"}),
@@ -415,9 +437,28 @@ fn every_command_survives_junk_params() {
         // Online files: ids, servers, refreshes, actions and names as junk.
         json!({"file": [1], "server": 7, "refresh": "maybe", "action": "share", "name": {"x": 1}}),
         json!({"file": "../x", "server": "wss://\u{0}", "refresh": true, "action": "unshare", "name": 5}),
+        // Files as base64 data: a damaged `.sketch` (zip magic, then junk) and an old one (SQLite).
+        json!({"data": "UEsDBBQAAAAIAP////8=", "name": "x.sketch"}),
+        json!({"data": "U1FMaXRlIGZvcm1hdCAzAA==", "name": "x.sketch", "path": null}),
+        // Selection color slots: malformed indexes, ranges and paints.
+        json!({"targets": [{"id": 2, "fills": true, "index": -1, "range": [0, 1e308]}], "paint": {"type": "solid", "color": "invalid"}}),
+        json!({"targets": [{"id": 2, "fills": "yes", "index": 0, "range": [4, 1]}], "style": 5}),
+        json!({"targets": [{"id": 2, "fills": false, "index": 99999999999u64, "range": null}], "variable": ["x"]}),
+        // Smart-selection reorder targets and modes as junk.
+        json!({"ids": [2, 3], "source": -1, "target": {"id": 3}, "swap": [], "fromGesture": true}),
+        json!({"source": 1e308, "target": "NaN", "swap": "yes", "fromGesture": []}),
         // Rotation origins and placing with a tool as junk.
         json!({"tool": [1], "x": 1e308, "y": "NaN", "reset": "maybe", "on": {"x": 1}}),
         json!({"tool": "frame", "x": -1e308, "y": 1e308, "reset": true, "on": "yes"}),
+        // Vector paths (`node.set {path}`) as junk. (Not a string `path` at the top: file commands
+        // would write to it.)
+        json!({"ids": [2, 3], "type": "vector", "path": [5], "width": -1e308, "props": {"path": "M0 0 L1e308 0 L-1e308 1e308", "height": "NaN", "x": 1e308}}),
+        json!({"id": 2, "type": "vector", "path": {"d": 1}, "props": {"path": "M NaN 0 Z", "width": 1e-308}}),
+        // Batch step names and reference paths as junk.
+        json!({"commands": [{"command": "select.none", "as": "a"}, {"command": "select.none", "as": [1]}, {"command": "select.none", "as": "a"}]}),
+        json!({"commands": [{"command": "select.all", "as": "\u{0}"}, {"command": "node.set", "params": {"ids": [
+            {"$ref": "\u{0}", "field": "ids/18446744073709551616/x"}, {"$ref": {"x": 1}}, {"$step": 0, "field": "//"}, {"$ref": "\u{0}", "field": "/"}],
+            "props": {"name": {"$ref": "nope", "field": 5}}}}]}),
     ];
     for spec in all_commands() {
         if matches!(
@@ -431,6 +472,8 @@ fn every_command_survives_junk_params() {
                 | "file.placeImage"
                 | "image.place"
                 | "file.revert"
+                // Takes no params and walks the font folders: one walk per junk is slow.
+                | "text.rescanFonts"
         ) {
             continue;
         }
@@ -621,3 +664,16 @@ fn find_replace_changing_only_the_case_replaces_every_occurrence() {
     assert_eq!(s.doc().unwrap().node(t).unwrap().kind.text().unwrap().characters, "FigCraft and FigCraft, FigCraft");
     assert_eq!(s.doc().unwrap().node(f).unwrap().name, "FigCraft / FigCraft");
 }
+
+/// Damaged and too-old `.sketch` data sent to the file commands (which the junk sweep skips) fail
+/// with an ordinary error, not a caught panic.
+#[test]
+fn damaged_sketch_data_fails_without_panicking() {
+    for data in ["UEsDBBQAAAAIAP////8=", "U1FMaXRlIGZvcm1hdCAzAA=="] {
+        for cmd in ["file.open", "file.import"] {
+            let mut s = sess();
+            let r = s.execute(cmd, &json!({"data": data, "name": "x.sketch"}));
+            assert!(matches!(r, Err(ref e) if !matches!(e, EngineError::Internal { .. })), "{cmd}: {r:?}");
+        }
+    }
+}
diff --git a/crates/engine/src/text_behaviour_tests.rs b/crates/engine/src/text_behaviour_tests.rs
index 84315f1f..8b33e303 100644
--- a/crates/engine/src/text_behaviour_tests.rs
+++ b/crates/engine/src/text_behaviour_tests.rs
@@ -60,11 +60,14 @@ fn arrows_and_deletes_step_over_whole_clusters() {
     key(&mut s, "Right", true, false, false).unwrap();
     assert_eq!(caret(&s), (1, 6));
     key(&mut s, "Left", false, false, false).unwrap();
-    // Delete and Backspace remove a whole cluster.
+    // Delete removes a whole cluster; Backspace takes a letter's marks one at a time (#1220) and
+    // an emoji cluster whole.
     key(&mut s, "Delete", false, false, false).unwrap();
     assert_eq!(chars(&s, t), "ab\u{1F1EF}\u{1F1F5}e\u{0301}");
     key(&mut s, "Right", false, false, true).unwrap(); // to the end
     key(&mut s, "Backspace", false, false, false).unwrap();
+    assert_eq!(chars(&s, t), "ab\u{1F1EF}\u{1F1F5}e");
+    key(&mut s, "Backspace", false, false, false).unwrap();
     assert_eq!(chars(&s, t), "ab\u{1F1EF}\u{1F1F5}");
     key(&mut s, "Backspace", false, false, false).unwrap();
     assert_eq!(chars(&s, t), "ab");
@@ -134,6 +137,63 @@ fn ime_composition_with_cjk() {
     assert!(s.ds().unwrap().text_edit.as_ref().unwrap().preedit.is_none());
 }
 
+/// Asserts `delete_surrounding_bytes` removes an exact UTF-8 byte range across CJK and a
+/// supplementary emoji, leaves nothing past the start, and the whole edit is one undo step.
+#[test]
+fn ime_delete_surrounding_bytes_is_exact_and_one_undo_step() {
+    // 0.37's `DeleteSurroundingBytes` counts UTF-8 bytes around the selection, before the paired
+    // commit. Multibyte CJK and a supplementary emoji must be removed exactly, not as tofu or
+    // extended to grapheme clusters, and the whole edit remains one undo step.
+    let mut s = Session::new();
+    let t = text(&mut s, "ab\u{4F60}\u{597D}c\u{1F600}d", json!({"fontSize": 24}));
+    begin(&mut s, t, Some(4), false).unwrap();
+    assert!(crate::textedit::delete_surrounding_bytes(&mut s, 6, 1).unwrap(), "你好 before and c after");
+    assert_eq!(chars(&s, t), "ab\u{1F600}d");
+    assert_eq!(caret(&s), (2, 2));
+    crate::textedit::set_caret(&mut s, 3, false).unwrap();
+    assert!(crate::textedit::delete_surrounding_bytes(&mut s, 4, 0).unwrap(), "the emoji is four bytes");
+    assert_eq!(chars(&s, t), "abd");
+    assert_eq!(caret(&s), (2, 2));
+    // Past the start of the text: nothing more to delete, not an error.
+    assert!(!crate::textedit::delete_surrounding_bytes(&mut s, 0, 0).unwrap());
+    crate::textedit::end(&mut s).unwrap();
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(chars(&s, t), "ab\u{4F60}\u{597D}c\u{1F600}d", "one undo restores the whole session");
+}
+
+/// Asserts a byte range that only partly covers a character leaves it in place, while an
+/// exact range deletes it, and a selection survives for the paired commit with its
+/// direction preserved.
+#[test]
+fn ime_delete_surrounding_bytes_keeps_partial_characters_and_selection() {
+    // The fork deletes the byte range exactly and leaves a character the range only partly
+    // covers. FigCraft's editor counts characters with the same rule (mirroring egui's
+    // `surrounding_bytes_to_chars`), including around a selection.
+    let mut s = Session::new();
+    let t = text(&mut s, "\u{e9}x\u{1F600}", json!({"fontSize": 24}));
+    let del = |s: &mut Session, b: usize, a: usize| crate::textedit::delete_surrounding_bytes(s, b, a).unwrap();
+    begin(&mut s, t, Some(1), false).unwrap();
+    assert!(!del(&mut s, 1, 0), "one byte ends inside 'é' (two bytes): leave it");
+    assert_eq!(chars(&s, t), "\u{e9}x\u{1F600}");
+    crate::textedit::set_caret(&mut s, 2, false).unwrap();
+    assert!(!del(&mut s, 0, 2), "two bytes start inside the four-byte emoji: leave it");
+    assert_eq!(chars(&s, t), "\u{e9}x\u{1F600}");
+    assert!(del(&mut s, 0, 4), "its four bytes cover it exactly");
+    assert_eq!(chars(&s, t), "\u{e9}x");
+    assert_eq!(caret(&s), (2, 2));
+    // Complete bytes before the selection go; a character the range only partly covers stays,
+    // and the selection itself is kept for the paired commit.
+    crate::textedit::set_caret(&mut s, 1, false).unwrap();
+    crate::textedit::set_caret(&mut s, 1, true).unwrap();
+    crate::textedit::set_caret(&mut s, 2, true).unwrap();
+    assert!(del(&mut s, 2, 2), "é before (two bytes); two bytes start inside the four-byte emoji");
+    // The selected 'x' is kept for the paired commit, as in stock `TextEdit`; the caret moves left
+    // with the deleted prefix and the selection direction is preserved.
+    assert_eq!(chars(&s, t), "x");
+    assert_eq!(caret(&s), (0, 1));
+    crate::textedit::end(&mut s).unwrap();
+}
+
 #[test]
 fn vertical_trim_through_node_set() {
     let mut s = Session::new();
@@ -177,20 +237,19 @@ fn vertical_trim_through_node_set() {
 
 #[test]
 fn paragraph_indent_only_moves_left_aligned_text() {
+    figcraft_text::scan_system_fonts();
     let mut s = Session::new();
     let t = text(&mut s, "Indented paragraph", json!({"fontSize": 20, "paragraphIndent": 30}));
     let first_x = |s: &Session| {
         let (l, _) = figcraft_text::layout_node(s.doc().unwrap().node(t).unwrap()).unwrap();
-        (l.glyphs.first().map_or(0.0, |g| g.x), l.width)
+        (l.glyphs.first().map(|g| g.x), l.width)
     };
-    let (x, w) = first_x(&s);
-    if w <= 0.0 {
-        return;
-    }
+    // Without any font there are no glyphs, but the indent alone still gives the box a width.
+    let (Some(x), w) = first_x(&s) else { return };
     assert!((x - 30.0).abs() < 1e-6, "left: indented");
     s.execute("node.set", &json!({"id": t, "props": {"textAlign": "center"}})).unwrap();
     let (x, w2) = first_x(&s);
-    assert!((w2 - (w - 30.0)).abs() < 1e-6 && x.abs() < 1e-6, "centered auto-width text: no indent, the box shrinks by it");
+    assert!((w2 - (w - 30.0)).abs() < 1e-6 && x.is_some_and(|x| x.abs() < 1e-6), "centered auto-width text: no indent, the box shrinks by it");
 }
 
 /// A new text made with the Text tool by a press at `from`, a drag to `to` and a release, holding
@@ -229,3 +288,85 @@ fn a_drag_with_the_text_tool_makes_a_fixed_size_box() {
     let (b3, _) = text_tool((100.0, 100.0), (180.0, 101.0), "A");
     assert_eq!((b3.width(), b3.height()), (80.0, line.height()));
 }
+
+#[test]
+fn new_text_starts_in_the_builds_default_font() {
+    // `text.create` without a fontFamily and a click with the Text tool both start in
+    // `figcraft_doc::DEFAULT_FONT` (Inter, unless the build names another with
+    // `FIGCRAFT_DEFAULT_FONT`), and the family is written with the text.
+    use crate::tools::{PointerEvent, PointerKind, ToolId};
+    let mut s = Session::new();
+    let made = text(&mut s, "Text", json!({}));
+    s.set_tool(ToolId::Text);
+    s.pointer(&PointerEvent::at(PointerKind::Down, 300.0, 300.0, 1.0)).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, 300.0, 300.0, 1.0)).unwrap();
+    crate::textedit::insert(&mut s, "Tool").unwrap();
+    let typed = s.ds().unwrap().text_edit.as_ref().unwrap().id;
+    assert_ne!(made, typed);
+    let doc = s.doc().unwrap();
+    for t in [made, typed] {
+        let td = doc.node(t).unwrap().kind.text().unwrap();
+        assert_eq!(td.style.font_family, figcraft_doc::DEFAULT_FONT);
+        assert_eq!(serde_json::to_value(td).unwrap()["style"]["font_family"], figcraft_doc::DEFAULT_FONT);
+    }
+}
+
+fn resize_mode(s: &Session, t: NodeId) -> figcraft_doc::TextAutoResize {
+    s.doc().unwrap().node(t).unwrap().kind.text().unwrap().auto_resize
+}
+
+#[test]
+fn a_truncated_text_keeps_truncating_when_its_box_is_resized() {
+    // #1376: a truncating text is already fixed both ways, so an explicit size changes its box only.
+    use figcraft_doc::TextAutoResize;
+    let mut s = Session::new();
+    let t = text(&mut s, "Lorem consectetur", json!({"textAutoResize": "truncate", "width": 100, "height": 24}));
+    assert_eq!(resize_mode(&s, t), TextAutoResize::Truncate);
+    for (cmd, p, why) in [
+        ("node.set", json!({"id": t, "props": {"height": 24}}), "node.set height (the value it has)"),
+        ("node.set", json!({"id": t, "props": {"width": 120, "height": 30}}), "node.set width and height"),
+        ("transform.resize", json!({"ids": [t], "height": 40}), "transform.resize height"),
+        ("transform.resize", json!({"ids": [t], "width": 90}), "transform.resize width"),
+        ("node.set", json!({"id": t, "props": {"sizingV": "fixed"}}), "fixed vertical sizing"),
+    ] {
+        s.execute(cmd, &p).unwrap();
+        assert_eq!(resize_mode(&s, t), TextAutoResize::Truncate, "{why}");
+    }
+    // Text that doesn't truncate still turns fixed size.
+    let plain = text(&mut s, "Lorem consectetur", json!({"textAutoResize": "height", "width": 100}));
+    s.execute("node.set", &json!({"id": plain, "props": {"height": 24}})).unwrap();
+    assert_eq!(resize_mode(&s, plain), TextAutoResize::None);
+}
+
+#[test]
+fn max_lines_on_auto_height_text_hugs_that_many_lines() {
+    // #1377: an auto-height text with max lines grows up to that many lines and ends in an
+    // ellipsis; the layer reports its max lines.
+    use figcraft_doc::TextAutoResize;
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text(&mut s, "Lorem ipsum dolor sit amet consectetur", json!({"fontSize": 16, "lineHeight": 24}));
+    s.execute("node.set", &json!({"id": t, "props": {"textAutoResize": "height", "width": 100}})).unwrap();
+    assert!(crate::inspect::node_json(s.doc().unwrap(), t, 0).get("maxLines").is_none(), "no limit: not reported");
+    // Wrapping needs a font (CI may have none).
+    if size(&s, t).1 < 48.0 {
+        return;
+    }
+    s.execute("text.maxLines", &json!({"ids": [t], "lines": 1})).unwrap();
+    assert_eq!(resize_mode(&s, t), TextAutoResize::Height, "max lines keep auto height");
+    assert_eq!(size(&s, t), (100.0, 24.0), "one line tall");
+    assert_eq!(crate::inspect::node_json(s.doc().unwrap(), t, 0)["maxLines"], json!(1));
+    s.execute("node.set", &json!({"id": t, "props": {"maxLines": 2}})).unwrap();
+    assert_eq!(size(&s, t).1, 48.0, "two lines tall");
+    // No limit: it grows to all of its lines again.
+    s.execute("node.set", &json!({"id": t, "props": {"maxLines": 0}})).unwrap();
+    assert!(size(&s, t).1 > 48.0);
+    // An explicit height on a text that truncates makes a truncating box.
+    s.execute("node.set", &json!({"id": t, "props": {"maxLines": 1}})).unwrap();
+    s.execute("node.set", &json!({"id": t, "props": {"height": 30}})).unwrap();
+    assert_eq!((resize_mode(&s, t), size(&s, t).1), (TextAutoResize::Truncate, 30.0));
+    // Other text still becomes a truncating box with max lines.
+    let fixed = text(&mut s, "Lorem", json!({"textAutoResize": "none", "width": 100, "height": 100}));
+    s.execute("text.maxLines", &json!({"ids": [fixed], "lines": 2})).unwrap();
+    assert_eq!(resize_mode(&s, fixed), TextAutoResize::Truncate);
+}
diff --git a/crates/engine/src/text_style_picker_tests.rs b/crates/engine/src/text_style_picker_tests.rs
index 37c7dc5c..6ee8cc2c 100644
--- a/crates/engine/src/text_style_picker_tests.rs
+++ b/crates/engine/src/text_style_picker_tests.rs
@@ -212,6 +212,31 @@ fn previews_while_editing_keep_the_edit() {
     assert!(links(&s, t).iter().all(Option::is_none));
 }
 
+#[test]
+fn previews_show_a_hovered_font_family() {
+    let mut s = new_session();
+    let t = text(&mut s, "Preview me");
+    s.ds_mut().unwrap().mark_saved();
+    let before = s.doc().unwrap().clone();
+    let undo = s.ds().unwrap().history.undo.len();
+    // Hovering a font family shows it on the canvas: no undo step, not dirty.
+    s.execute("text.preview", &json!({"command": "text.style", "params": {"ids": [t], "fontFamily": "Arial"}})).unwrap();
+    assert_eq!(data(&s, t).style_at(0).font_family, "Arial");
+    assert_eq!(s.ds().unwrap().history.undo.len(), undo);
+    assert!(!s.ds().unwrap().is_dirty());
+    // Moving to another family replaces the preview, from the document itself.
+    s.execute("text.preview", &json!({"command": "text.style", "params": {"ids": [t], "fontFamily": "Georgia"}})).unwrap();
+    assert_eq!(data(&s, t).style_at(0).font_family, "Georgia");
+    // Closing without picking puts the document back as it was.
+    assert_eq!(s.execute("text.endPreview", &json!({})).unwrap()["ended"], json!(true));
+    assert_eq!(*s.doc().unwrap(), before);
+    // Clicking commits it as one undo step.
+    s.execute("text.style", &json!({"ids": [t], "fontFamily": "Georgia"})).unwrap();
+    assert_eq!(data(&s, t).style_at(0).font_family, "Georgia");
+    assert_eq!(s.ds().unwrap().history.undo.len(), undo + 1);
+    assert!(s.ds().unwrap().text_preview.is_none());
+}
+
 #[test]
 fn previews_refuse_what_they_cant_show() {
     let mut s = new_session();
diff --git a/crates/engine/src/text_tail_tests.rs b/crates/engine/src/text_tail_tests.rs
index b951bfc7..81d05ed2 100644
--- a/crates/engine/src/text_tail_tests.rs
+++ b/crates/engine/src/text_tail_tests.rs
@@ -57,6 +57,24 @@ fn list_buttons_act_on_the_selected_paragraphs() {
     assert_eq!(data(&s, t).list, P, "toggled off");
 }
 
+#[test]
+fn a_list_with_a_start_number_toggles_off() {
+    // An imported list that starts at 2 has the start on its first item only; it is still one
+    // numbered list, so the button turns it back to plain (#686).
+    let mut s = Session::new();
+    let t = text(&mut s, "two\nthree\nfour");
+    if let figcraft_doc::NodeKind::Text(td) = &mut s.doc_mut().unwrap().get_mut(t).unwrap().kind {
+        let n = |start_offset| ParaList { list: N, indent: 0, start_offset };
+        td.paragraphs = vec![n(1), n(0), n(0)];
+    }
+    let j = crate::inspect::node_json(s.doc().unwrap(), t, 0);
+    assert_eq!(j["listStartOffsets"], json!([1, 0, 0]), "inspect reports the start");
+    s.execute("text.numberList", &json!({"ids": [t]})).unwrap();
+    assert_eq!(lists(&s, t), [(P, 0); 3]);
+    assert_eq!(data(&s, t).para_list(0).start_offset, 0, "a plain paragraph has no start");
+    assert!(crate::inspect::node_json(s.doc().unwrap(), t, 0).get("listStartOffsets").is_none());
+}
+
 #[test]
 fn typed_list_starts() {
     // Typing "- " or "* " at the start of a paragraph starts a bulleted list, "1. " a numbered one
@@ -117,7 +135,7 @@ fn list_keys_at_list_items() {
     for (chars, before, caret, k, shift, after, want, why) in cases {
         let mut s = Session::new();
         let t = text(&mut s, chars);
-        let ps: Vec<ParaList> = before.iter().map(|(list, indent)| ParaList { list: *list, indent: *indent }).collect();
+        let ps: Vec<ParaList> = before.iter().map(|(list, indent)| ParaList { list: *list, indent: *indent, start_offset: 0 }).collect();
         if let figcraft_doc::NodeKind::Text(td) = &mut s.doc_mut().unwrap().get_mut(t).unwrap().kind {
             td.paragraphs = ps;
         }
@@ -141,7 +159,7 @@ fn paragraph_lists_follow_edits() {
     // A paragraph's list stays with it as text is typed, pasted and deleted: new paragraphs copy
     // the one they split from; joined paragraphs keep the first one's.
     let mut t = TextData::new("ab\ncd\nef");
-    t.paragraphs = vec![ParaList { list: B, indent: 1 }, ParaList::default(), ParaList { list: N, indent: 0 }];
+    t.paragraphs = vec![ParaList { list: B, indent: 1, start_offset: 0 }, ParaList::default(), ParaList { list: N, indent: 0, start_offset: 0 }];
     let get = |t: &TextData| (0..t.paragraph_count()).map(|p| (t.para_list(p).list, t.para_list(p).indent)).collect::<Vec<_>>();
     t.replace_range(1, 1, "x\ny");
     assert_eq!(get(&t), [(B, 1), (B, 1), (P, 0), (N, 0)], "a pasted newline: a new item like it");
@@ -156,7 +174,7 @@ fn paragraph_lists_follow_edits() {
         (seed >> 33) as usize % n.max(1)
     };
     let mut t = TextData::new("a\nb\nc\nd");
-    t.paragraphs = vec![ParaList { list: B, indent: 2 }; 4];
+    t.paragraphs = vec![ParaList { list: B, indent: 2, start_offset: 0 }; 4];
     for _ in 0..500 {
         let n = t.char_count();
         let (a, b) = (rnd(n + 2), rnd(n + 2));
diff --git a/crates/engine/src/textedit.rs b/crates/engine/src/textedit.rs
deleted file mode 100644
index 76b353a0..00000000
--- a/crates/engine/src/textedit.rs
+++ /dev/null
@@ -1,807 +0,0 @@
-//! On-canvas text editing: caret, selection, typing. A whole editing session is one undo step.
-
-use figcraft_doc::{Document, ListStyle, NodeId, NodeKind, TextData};
-
-use crate::{EngineError, Preedit, Result, Session, TextEdit};
-
-fn text_of(s: &Session, id: NodeId) -> Result<TextData> {
-    match &s.doc()?.get(id)?.kind {
-        NodeKind::Text(t) => Ok(t.clone()),
-        _ => Err(EngineError::Other(format!("{id} is not a text layer"))),
-    }
-}
-
-/// Start editing text node `id` with the caret at `caret` (None = select all).
-pub fn begin(s: &mut Session, id: NodeId, caret: Option<usize>, created: bool) -> Result<()> {
-    let t = text_of(s, id)?;
-    let n = t.char_count();
-    s.begin_interaction("Edit text")?;
-    let ds = s.ds_mut()?;
-    let (caret, anchor) = match caret {
-        Some(c) => (c.min(n), c.min(n)),
-        None => (n, 0),
-    };
-    ds.text_edit = Some(TextEdit { id, caret, anchor, created, preedit: None });
-    ds.selection = vec![id];
-    ds.revision += 1;
-    s.live_text_notice(id);
-    Ok(())
-}
-
-/// Finish editing: an empty new text layer is removed; the session becomes one undo step.
-pub fn end(s: &mut Session) -> Result<()> {
-    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(()) };
-    s.ds_mut()?.text_edit = None;
-    let empty = text_of(s, te.id).map(|t| t.characters.trim().is_empty()).unwrap_or(false);
-    if empty {
-        let doc = s.doc_mut()?;
-        let _ = doc.remove(te.id);
-        s.ds_mut()?.selection.clear();
-    }
-    if empty && te.created {
-        // Nothing to undo for a text box that was never filled. The gesture snapshot was taken
-        // after the layer was added, so it still holds it: re-base it on the document without the
-        // layer, and committing then records no step (and leaves the redo stack alone).
-        let ds = s.ds_mut()?;
-        let doc = ds.doc.clone();
-        if let Some(it) = ds.interaction.as_mut() {
-            it.doc = doc;
-        }
-    }
-    s.commit_interaction()?;
-    let ds = s.ds_mut()?;
-    ds.revision += 1;
-    Ok(())
-}
-
-fn range(te: &TextEdit) -> (usize, usize) {
-    (te.caret.min(te.anchor), te.caret.max(te.anchor))
-}
-
-fn edit(s: &mut Session, f: impl FnOnce(&mut TextData, &mut TextEdit)) -> Result<()> {
-    let ds = s.ds_mut()?;
-    let Some(mut te) = ds.text_edit.clone() else { return Err(EngineError::Other("not editing text".into())) };
-    let before = ds.doc.clone();
-    let doc = ds.doc_mut();
-    let n = doc.get_mut(te.id)?;
-    let NodeKind::Text(t) = &mut n.kind else { return Err(EngineError::Other("not a text layer".into())) };
-    f(t, &mut te);
-    // Any edit ends a composition (a commit replaces it with the final text).
-    te.preedit = None;
-    let len = t.char_count();
-    te.caret = te.caret.min(len);
-    te.anchor = te.anchor.min(len);
-    if n.source.is_some() {
-        n.overrides.insert("characters".into());
-    }
-    crate::normalize(doc, &before);
-    ds.text_edit = Some(te);
-    ds.revision += 1;
-    Ok(())
-}
-
-/// Type (or paste) `text` replacing the selection. Line endings are normalised and other control
-/// characters dropped, so pasted plain text from any platform lands cleanly.
-pub fn insert(s: &mut Session, text: &str) -> Result<()> {
-    let text: String = crate::cmd::props::normalize_line_endings(text).chars().filter(|c| !c.is_control() || matches!(c, '\n' | '\t')).collect();
-    if text.is_empty() {
-        return Ok(());
-    }
-    edit(s, |t, te| {
-        let (a, b) = range(te);
-        // "- ", "* " or "1. " typed at the start of a plain paragraph starts a list.
-        if text == " " && a == b && t.para_list(t.para_of(a)).list == ListStyle::None {
-            let chars: Vec<char> = t.characters.chars().collect();
-            let start = line_start(&chars, a);
-            let typed: String = chars.get(start..a).unwrap_or(&[]).iter().collect();
-            let list = match typed.as_str() {
-                "-" | "*" => ListStyle::Bulleted,
-                "1." => ListStyle::Numbered,
-                _ => ListStyle::None,
-            };
-            if list != ListStyle::None {
-                t.replace_range(start, a, "");
-                t.set_para_lists(start, start, |pl| pl.list = list);
-                (te.caret, te.anchor) = (start, start);
-                return;
-            }
-        }
-        t.replace_range(a, b, &text);
-        te.caret = a + text.chars().count();
-        te.anchor = te.caret;
-    })
-}
-
-/// List keys: Tab nests the selected list items a level deeper; Shift+Tab, Backspace at an item's
-/// start and Enter on an empty item move it a level out (at the top: out of the list). Returns
-/// whether the key was taken.
-fn list_key(s: &mut Session, key: &str, shift: bool) -> Result<bool> {
-    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(false) };
-    let t = text_of(s, te.id)?;
-    let (a, b) = range(&te);
-    let chars: Vec<char> = t.characters.chars().collect();
-    let at_start = a == b && line_start(&chars, a) == a;
-    let item = t.para_list(t.para_of(a)).list != ListStyle::None;
-    let (pa, pb) = t.para_span(a, b);
-    let any_item = (pa..=pb).any(|p| t.para_list(p).list != ListStyle::None);
-    let deeper = match key {
-        "Tab" if any_item => !shift,
-        "Backspace" if item && at_start => false,
-        "Enter" if item && at_start && chars.get(a).is_none_or(|c| *c == '\n') => false,
-        _ => return Ok(false),
-    };
-    edit(s, |t, _| {
-        t.set_para_lists(a, b, |pl| match pl.list {
-            ListStyle::None => {}
-            _ if deeper => pl.indent = pl.indent.saturating_add(1),
-            _ if pl.indent > 0 => pl.indent -= 1,
-            _ => pl.list = ListStyle::None,
-        })
-    })?;
-    Ok(true)
-}
-
-/// Cmd/Ctrl+] and Cmd/Ctrl+[ while editing: the selected list items a level deeper or out, like
-/// Tab and Shift+Tab. Returns whether anything changed (text that isn't a list and items already
-/// at the deepest level stay as they are).
-pub fn list_indent(s: &mut Session, out: bool) -> Result<bool> {
-    let Some(id) = s.ds()?.text_edit.as_ref().map(|te| te.id) else { return Ok(false) };
-    let before = text_of(s, id)?;
-    if !list_key(s, "Tab", out)? {
-        return Ok(false);
-    }
-    Ok(text_of(s, id)? != before)
-}
-
-/// The kind of word char `i` belongs to: 0 for spaces and punctuation, else its script, so a word
-/// ends where the script changes (Han, hiragana, katakana and Hangul runs are words of their own in
-/// text without spaces). Combining marks and voicing marks belong to the char before them.
-fn word_class(chars: &[char], mut i: usize) -> u8 {
-    while i > 0
-        && chars.get(i).is_some_and(
-            |c| matches!(*c as u32, 0x0300..=0x036F | 0x1AB0..=0x1AFF | 0x1DC0..=0x1DFF | 0x20D0..=0x20FF | 0x3099..=0x309A | 0xFE20..=0xFE2F),
-        )
-    {
-        i -= 1;
-    }
-    match chars.get(i).copied() {
-        Some(
-            '\u{3005}'
-            | '\u{3006}'
-            | '\u{3007}'
-            | '\u{3400}'..='\u{4DBF}'
-            | '\u{4E00}'..='\u{9FFF}'
-            | '\u{F900}'..='\u{FAFF}'
-            | '\u{20000}'..='\u{3FFFF}',
-        ) => 2,
-        Some('\u{3041}'..='\u{309F}') => 3,
-        Some('\u{30A0}'..='\u{30FF}' | '\u{31F0}'..='\u{31FF}' | '\u{FF66}'..='\u{FF9F}') => 4,
-        Some('\u{1100}'..='\u{11FF}' | '\u{3130}'..='\u{318F}' | '\u{AC00}'..='\u{D7AF}') => 5,
-        Some(c) if c.is_alphanumeric() || c == '_' => 1,
-        _ => 0,
-    }
-}
-
-fn is_word(chars: &[char], i: usize) -> bool {
-    word_class(chars, i) != 0
-}
-
-/// The start of the word before `i` (skipping spaces and punctuation first).
-fn word_left(chars: &[char], mut i: usize) -> usize {
-    while i > 0 && !is_word(chars, i - 1) {
-        i -= 1;
-    }
-    let class = word_class(chars, i.saturating_sub(1));
-    while i > 0 && word_class(chars, i - 1) == class && class != 0 {
-        i -= 1;
-    }
-    i
-}
-
-/// The end of the word after `i` (skipping spaces and punctuation first).
-fn word_right(chars: &[char], mut i: usize) -> usize {
-    let n = chars.len();
-    while i < n && !is_word(chars, i) {
-        i += 1;
-    }
-    let class = word_class(chars, i);
-    while i < n && word_class(chars, i) == class && class != 0 {
-        i += 1;
-    }
-    i
-}
-
-/// A named key: Backspace, Delete, Left, Right, Up, Down, Home, End, Enter, Escape, SelectAll.
-/// `word` moves or deletes by word, `line` to the line's ends (Up/Down, Home/End: the text's ends);
-/// [`crate::keymap::text_motion`] gives them for the platform's keys. `ArrowLeft` etc. also work.
-pub fn key(s: &mut Session, key: &str, shift: bool, word: bool, line: bool) -> Result<()> {
-    let key = key.strip_prefix("Arrow").unwrap_or(key);
-    let Some(te) = s.ds()?.text_edit.clone() else { return Err(EngineError::Other("not editing text".into())) };
-    let t = text_of(s, te.id)?;
-    let chars: Vec<char> = t.characters.chars().collect();
-    let n = chars.len();
-    if matches!(key, "Tab" | "Backspace" | "Enter") && !word && !line && list_key(s, key, shift)? {
-        return Ok(());
-    }
-    match key {
-        "Escape" => return end(s),
-        "Enter" => return insert(s, "\n"),
-        "Tab" => return insert(s, "\t"),
-        "Backspace" | "Delete" => {
-            return edit(s, |t, te| {
-                let (a, b) = range(te);
-                let (a, b) = if a != b {
-                    (a, b)
-                } else if key == "Backspace" {
-                    let from = if line {
-                        line_start(&chars, a)
-                    } else if word {
-                        word_left(&chars, a)
-                    } else {
-                        figcraft_text::grapheme_step(&t.characters, a, false)
-                    };
-                    (from, a)
-                } else {
-                    let to = if line {
-                        line_end(&chars, a)
-                    } else if word {
-                        word_right(&chars, a)
-                    } else {
-                        figcraft_text::grapheme_step(&t.characters, a, true).min(n)
-                    };
-                    (a, to)
-                };
-                t.replace_range(a, b, "");
-                te.caret = a;
-                te.anchor = a;
-            });
-        }
-        _ => {}
-    }
-    // Caret movement.
-    let layout = {
-        let doc = s.doc()?;
-        let node = doc.get(te.id)?;
-        figcraft_text::layout_node(node).map(|(l, _)| l)
-    };
-    let (a, b) = range(&te);
-    // Without Shift, a selection collapses first: plain arrows stop at its edge, word/line moves
-    // continue from that edge.
-    let cur = match key {
-        "Left" | "Up" | "Home" if !shift && a != b => a,
-        "Right" | "Down" | "End" if !shift && a != b => b,
-        _ => te.caret,
-    };
-    let next = match key {
-        "Left" if !shift && a != b && !word && !line => a,
-        "Right" if !shift && a != b && !word && !line => b,
-        "Left" if line => line_start(&chars, cur),
-        "Right" if line => line_end(&chars, cur),
-        "Left" if word => word_left(&chars, cur),
-        "Right" if word => word_right(&chars, cur),
-        // Plain arrows move on screen through right-to-left runs, by char elsewhere.
-        "Left" | "Right" => match layout.as_ref().and_then(|l| l.visual_step(cur, key == "Right")) {
-            Some(i) => i.min(n),
-            None => figcraft_text::grapheme_step(&t.characters, cur, key == "Right").min(n),
-        },
-        "Home" if line => 0,
-        "End" if line => n,
-        "Home" => line_start(&chars, cur),
-        "End" => line_end(&chars, cur),
-        "Up" | "Down" => match &layout {
-            _ if line => {
-                if key == "Up" {
-                    0
-                } else {
-                    n
-                }
-            }
-            Some(l) => {
-                let (x, li) = l.caret(cur);
-                let target = if key == "Up" { li.checked_sub(1) } else { Some(li + 1).filter(|k| *k < l.lines.len()) };
-                match target.and_then(|k| l.lines.get(k)) {
-                    Some(line) => l.hit(x, line.top + line.height / 2.0),
-                    None => {
-                        if key == "Up" {
-                            0
-                        } else {
-                            n
-                        }
-                    }
-                }
-            }
-            None => cur,
-        },
-        "SelectAll" => return select(s, 0, n),
-        _ => return Ok(()),
-    };
-    let anchor = if shift { te.anchor } else { next };
-    select(s, anchor, next)
-}
-
-/// Set the selection (`anchor`..`caret`, clamped to the text). Moving the caret abandons any
-/// composition in progress.
-fn select(s: &mut Session, anchor: usize, caret: usize) -> Result<()> {
-    let Some(id) = s.ds()?.text_edit.as_ref().map(|te| te.id) else { return Ok(()) };
-    let len = s.doc()?.node(id).and_then(|n| n.kind.text()).map_or(0, TextData::char_count);
-    let ds = s.ds_mut()?;
-    if let Some(te) = ds.text_edit.as_mut() {
-        te.anchor = anchor.min(len);
-        te.caret = caret.min(len);
-        te.preedit = None;
-    }
-    ds.revision += 1;
-    Ok(())
-}
-
-/// Show an IME composition inline at the caret (`cursor` = the IME's cursor inside it, in chars;
-/// default its end). The document doesn't change until the composition is committed with
-/// [`insert`]; an empty `text` cancels it. Starting to compose over a selection deletes it, as
-/// typing would.
-pub fn preedit(s: &mut Session, text: &str, cursor: Option<usize>) -> Result<()> {
-    let Some(te) = s.ds()?.text_edit.clone() else { return Err(EngineError::Other("not editing text".into())) };
-    let text: String = text.chars().filter(|c| !c.is_control()).take(MAX_PREEDIT).collect();
-    if text.is_empty() && te.preedit.is_none() {
-        return Ok(()); // IMEs send empty compositions when idle
-    }
-    if !text.is_empty() && te.preedit.is_none() && te.caret != te.anchor {
-        edit(s, |t, te| {
-            let (a, b) = range(te);
-            t.replace_range(a, b, "");
-            te.caret = a;
-            te.anchor = a;
-        })?;
-    }
-    let n = text.chars().count();
-    let ds = s.ds_mut()?;
-    if let Some(te) = ds.text_edit.as_mut() {
-        te.preedit = (n > 0).then(|| Preedit { text, cursor: cursor.unwrap_or(n).min(n) });
-    }
-    ds.revision += 1;
-    Ok(())
-}
-
-/// Longest composition shown (IMEs compose a phrase at a time).
-const MAX_PREEDIT: usize = 1000;
-
-/// The document as it looks while composing: the composition inserted at the caret, with text
-/// auto-size and layout applied. Also returns the composition's char range and the IME cursor's
-/// index in that document. `None` when nothing is being composed.
-pub fn preedit_doc(s: &Session) -> Option<(Document, (usize, usize), usize)> {
-    let ds = s.ds().ok()?;
-    let te = ds.text_edit.as_ref()?;
-    let pe = te.preedit.as_ref()?;
-    let mut doc = (*ds.doc).clone();
-    let NodeKind::Text(t) = &mut doc.get_mut(te.id).ok()?.kind else { return None };
-    let at = te.caret.min(t.char_count());
-    t.replace_range(at, at, &pe.text);
-    crate::normalize(&mut doc, &ds.doc);
-    let n = pe.text.chars().count();
-    Some((doc, (at, at + n), at + pe.cursor.min(n)))
-}
-
-fn line_start(chars: &[char], mut i: usize) -> usize {
-    while i > 0 && chars.get(i - 1).is_some_and(|c| *c != '\n') {
-        i -= 1;
-    }
-    i
-}
-
-fn line_end(chars: &[char], mut i: usize) -> usize {
-    while i < chars.len() && chars.get(i).is_some_and(|c| *c != '\n') {
-        i += 1;
-    }
-    i
-}
-
-/// Place the caret (and optionally extend the selection) at char `index`.
-pub fn set_caret(s: &mut Session, index: usize, extend: bool) -> Result<()> {
-    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(()) };
-    select(s, if extend { te.anchor } else { index }, index)
-}
-
-/// Select the word at `index` (double-click).
-pub fn select_word(s: &mut Session, index: usize) -> Result<()> {
-    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(()) };
-    let chars: Vec<char> = text_of(s, te.id)?.characters.chars().collect();
-    let mut a = index.min(chars.len());
-    // Double-clicking just after a word's last char (or at the end) selects that word.
-    if a > 0 && !is_word(&chars, a) && is_word(&chars, a - 1) {
-        a -= 1;
-    }
-    let mut b = a;
-    // Words by script (see `word_class`), then runs of spaces (10) and of punctuation (11).
-    let class = |i: usize| match word_class(&chars, i) {
-        0 if chars.get(i).is_some_and(|c| c.is_whitespace()) => 10,
-        0 => 11,
-        k => k,
-    };
-    // A word, a run of spaces or a run of punctuation, like the incumbent; newlines stay unselected.
-    if let Some(k) = chars.get(a).filter(|c| **c != '\n').map(|_| class(a)) {
-        while a > 0 && chars.get(a - 1).is_some_and(|c| *c != '\n') && class(a - 1) == k {
-            a -= 1;
-        }
-        while b < chars.len() && chars.get(b).is_some_and(|c| *c != '\n') && class(b) == k {
-            b += 1;
-        }
-    }
-    select(s, a, b)
-}
-
-/// Select the line (paragraph) containing `index` (triple-click).
-pub fn select_line(s: &mut Session, index: usize) -> Result<()> {
-    let Some(te) = s.ds()?.text_edit.clone() else { return Ok(()) };
-    let chars: Vec<char> = text_of(s, te.id)?.characters.chars().collect();
-    let i = index.min(chars.len());
-    select(s, line_start(&chars, i), line_end(&chars, i))
-}
-
-/// The selected text while editing (for copy).
-pub fn selected_text(s: &Session) -> Option<String> {
-    let (id, a, b) = selected_range(s)?;
-    let doc = s.doc().ok()?;
-    let t = doc.node(id)?.kind.text()?;
-    Some(t.characters.chars().skip(a).take(b.saturating_sub(a)).collect())
-}
-
-/// The selected range while editing (for styling commands), or None.
-pub fn selected_range(s: &Session) -> Option<(NodeId, usize, usize)> {
-    let te = s.ds().ok()?.text_edit.clone()?;
-    let (a, b) = range(&te);
-    Some((te.id, a, b))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::tools::{PointerEvent, PointerKind};
-    use figcraft_doc::{ListStyle, TextAutoResize, TextCase, TextDecoration};
-    use serde_json::json;
-
-    fn setup(text: &str) -> (Session, NodeId) {
-        let mut s = Session::new();
-        let r = s.execute("text.create", &json!({"text": text, "x": 0, "y": 0, "props": {"fontSize": 24}})).unwrap();
-        let id = crate::params::id_of(&r["id"]).unwrap();
-        (s, id)
-    }
-
-    fn data(s: &Session, id: NodeId) -> TextData {
-        s.doc().unwrap().node(id).unwrap().kind.text().unwrap().clone()
-    }
-
-    fn sel(s: &Session) -> (usize, usize) {
-        let te = s.ds().unwrap().text_edit.clone().unwrap();
-        (te.anchor, te.caret)
-    }
-
-    #[test]
-    fn whole_editing_session_is_one_undo_step() {
-        let (mut s, id) = setup("Hello");
-        let undo_before = s.ds().unwrap().history.undo.len();
-        begin(&mut s, id, Some(5), false).unwrap();
-        insert(&mut s, " big").unwrap();
-        insert(&mut s, " world").unwrap();
-        key(&mut s, "Backspace", false, false, false).unwrap();
-        // Styling a range mid-session joins the same step.
-        set_caret(&mut s, 0, false).unwrap();
-        set_caret(&mut s, 5, true).unwrap();
-        s.execute("text.bold", &json!({})).unwrap();
-        s.execute("text.alignCenter", &json!({})).unwrap();
-        end(&mut s).unwrap();
-        let t = data(&s, id);
-        assert_eq!(t.characters, "Hello big worl");
-        assert_eq!(t.style_at(0).font_style, "Bold");
-        assert_eq!(t.style_at(6).font_style, "Regular");
-        assert_eq!(s.ds().unwrap().history.undo.len(), undo_before + 1);
-        s.undo().unwrap();
-        let t = data(&s, id);
-        assert_eq!(t.characters, "Hello");
-        assert!(t.runs.is_empty());
-        assert_eq!(t.align_h, figcraft_doc::TextAlignH::Left);
-    }
-
-    #[test]
-    fn typing_replaces_selection_and_paste_is_plain() {
-        let (mut s, id) = setup("Hello world");
-        begin(&mut s, id, None, false).unwrap();
-        assert_eq!(sel(&s), (0, 11), "begin without caret selects all");
-        select_word(&mut s, 7).unwrap();
-        assert_eq!(sel(&s), (6, 11));
-        insert(&mut s, "there").unwrap();
-        assert_eq!(data(&s, id).characters, "Hello there");
-        assert_eq!(sel(&s), (11, 11));
-        // Pasted text: CRLF / CR / Unicode separators become newlines, other controls are dropped.
-        insert(&mut s, "\r\na\rb\u{2029}c\u{0}\u{7}\td").unwrap();
-        assert_eq!(data(&s, id).characters, "Hello there\na\nb\nc\td");
-        insert(&mut s, "\u{1}").unwrap();
-        assert_eq!(data(&s, id).characters, "Hello there\na\nb\nc\td");
-        // Select the line (paragraph) then type over it.
-        select_line(&mut s, 0).unwrap();
-        assert_eq!(sel(&s), (0, 11));
-        insert(&mut s, "Hi").unwrap();
-        assert_eq!(data(&s, id).characters, "Hi\na\nb\nc\td");
-        assert_eq!(selected_text(&s).as_deref(), Some(""));
-        end(&mut s).unwrap();
-    }
-
-    #[test]
-    fn word_selection_classes() {
-        let (mut s, id) = setup("foo,  bar_baz!\nnext");
-        begin(&mut s, id, Some(0), false).unwrap();
-        select_word(&mut s, 1).unwrap();
-        assert_eq!(sel(&s), (0, 3));
-        // Right after a word's last char selects the word.
-        select_word(&mut s, 13).unwrap();
-        assert_eq!(sel(&s), (6, 13));
-        // A run of spaces.
-        select_word(&mut s, 4).unwrap();
-        assert_eq!(sel(&s), (4, 6));
-        select_line(&mut s, 16).unwrap();
-        assert_eq!(sel(&s), (15, 19));
-        select_line(&mut s, 999).unwrap();
-        assert_eq!(sel(&s), (15, 19));
-        select_word(&mut s, 999).unwrap();
-        assert_eq!(sel(&s), (15, 19));
-        set_caret(&mut s, 999, false).unwrap();
-        assert_eq!(sel(&s), (19, 19), "carets clamp to the text");
-    }
-
-    #[test]
-    fn keyboard_navigation_and_extension() {
-        let (mut s, id) = setup("one two\nthree");
-        begin(&mut s, id, Some(0), false).unwrap();
-        key(&mut s, "Right", false, true, false).unwrap(); // Alt+Right: end of word
-        assert_eq!(sel(&s), (3, 3));
-        key(&mut s, "Right", true, true, false).unwrap(); // Shift+Alt+Right extends
-        assert_eq!(sel(&s), (3, 7));
-        key(&mut s, "Left", false, false, false).unwrap(); // collapses to the start
-        assert_eq!(sel(&s), (3, 3));
-        key(&mut s, "Right", false, false, true).unwrap(); // Cmd+Right: line end
-        assert_eq!(sel(&s), (7, 7));
-        key(&mut s, "Down", true, false, true).unwrap(); // Shift+Cmd+Down: to the end
-        assert_eq!(sel(&s), (7, 13));
-        key(&mut s, "Left", false, false, true).unwrap(); // Cmd+Left from the collapsed start
-        assert_eq!(sel(&s), (0, 0));
-        key(&mut s, "Delete", false, true, false).unwrap(); // Alt+Delete: word forward
-        assert_eq!(data(&s, id).characters, " two\nthree");
-        key(&mut s, "SelectAll", false, false, false).unwrap();
-        assert_eq!(sel(&s), (0, 10));
-        end(&mut s).unwrap();
-    }
-
-    fn ev(kind: PointerKind, x: f64, y: f64, shift: bool) -> PointerEvent {
-        let mut e = PointerEvent::at(kind, x, y, 1.0);
-        e.shift = shift;
-        e
-    }
-
-    #[test]
-    fn pointer_double_click_drag_and_shift_click() {
-        let (mut s, id) = setup("Hello world");
-        let Some((l, _)) = figcraft_text::layout_node(s.doc().unwrap().node(id).unwrap()) else { return };
-        if l.glyphs.is_empty() {
-            return; // no fonts
-        }
-        let y = l.lines[0].top + l.lines[0].height / 2.0;
-        let x_of = |i: usize| l.caret(i).0;
-        // Double-click inside "world" edits with all the text selected; another one there
-        // selects the word.
-        let mid = (x_of(7) + x_of(8)) / 2.0;
-        s.pointer(&ev(PointerKind::Down, mid, y, false)).unwrap();
-        s.pointer(&ev(PointerKind::Up, mid, y, false)).unwrap();
-        s.pointer(&ev(PointerKind::DoubleClick, mid, y, false)).unwrap();
-        assert_eq!(sel(&s), (0, 11));
-        s.pointer(&ev(PointerKind::Down, mid, y, false)).unwrap();
-        s.pointer(&ev(PointerKind::DoubleClick, mid, y, false)).unwrap();
-        s.pointer(&ev(PointerKind::Up, mid, y, false)).unwrap();
-        assert_eq!(sel(&s), (6, 11));
-        // Drag-select from the start of "Hello" to the middle.
-        s.pointer(&ev(PointerKind::Down, x_of(0) + 0.5, y, false)).unwrap();
-        assert_eq!(sel(&s), (0, 0));
-        s.pointer(&ev(PointerKind::Move, (x_of(3) + x_of(4)) / 2.0 - 1.0, y, false)).unwrap();
-        s.pointer(&ev(PointerKind::Up, (x_of(3) + x_of(4)) / 2.0 - 1.0, y, false)).unwrap();
-        assert_eq!(sel(&s), (0, 3));
-        // Shift+click extends.
-        s.pointer(&ev(PointerKind::Down, x_of(9) + 0.5, y, true)).unwrap();
-        s.pointer(&ev(PointerKind::Up, x_of(9) + 0.5, y, true)).unwrap();
-        assert_eq!(sel(&s), (0, 9));
-        insert(&mut s, "J").unwrap();
-        assert_eq!(data(&s, id).characters, "Jld");
-    }
-
-    #[test]
-    fn text_commands_apply_to_edited_range() {
-        let (mut s, id) = setup("Hello world");
-        begin(&mut s, id, Some(0), false).unwrap();
-        set_caret(&mut s, 6, true).unwrap(); // "Hello "
-        for (cmd, p) in [
-            ("text.underline", json!({})),
-            ("text.italic", json!({})),
-            ("text.sizeUp", json!({})),
-            ("text.trackingUp", json!({})),
-            ("text.lineHeightUp", json!({})),
-            ("text.caseSmallCaps", json!({})),
-            ("text.link", json!({"url": "https://example.com"})),
-        ] {
-            s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd}: {e}"));
-        }
-        let t = data(&s, id);
-        let (a, b) = (t.style_at(0), t.style_at(8));
-        assert_eq!(a.decoration, TextDecoration::Underline);
-        assert!(a.italic() && !b.italic());
-        assert_eq!(a.font_size, 25.0);
-        assert_eq!(b.font_size, 24.0);
-        assert_eq!(a.case, TextCase::SmallCaps);
-        assert_eq!(a.link.as_deref(), Some("https://example.com"));
-        assert!(b.link.is_none());
-        // text.style with an explicit range (what the panel sends).
-        s.execute("text.style", &json!({"id": id, "start": 6, "end": 11, "fontSize": 40, "textCase": "upper"})).unwrap();
-        let t = data(&s, id);
-        assert_eq!(t.style_at(8).font_size, 40.0);
-        assert_eq!(t.style_at(8).case, TextCase::Upper);
-        // Paragraph commands hit the edited node.
-        s.execute("text.listStyle", &json!({"style": "numbered"})).unwrap();
-        assert_eq!(data(&s, id).list, ListStyle::Numbered);
-        // Every Text-menu command runs while editing.
-        for item in crate::catalog::MENU.iter().filter(|i| i.id.starts_with("text.")) {
-            let p = if item.id == "text.link" { json!({"url": "u"}) } else { json!({}) };
-            if crate::find_command(item.id).is_some() {
-                s.execute(item.id, &p).unwrap_or_else(|e| panic!("{}: {e}", item.id));
-            }
-        }
-        end(&mut s).unwrap();
-    }
-
-    #[test]
-    fn paragraph_and_feature_commands_on_nodes() {
-        let (mut s, id) = setup("Hello");
-        let ids = json!([id]);
-        s.execute("text.setFeatures", &json!({"ids": ids, "features": {"liga": false, "tnum": true}})).unwrap();
-        assert_eq!(data(&s, id).features.get("liga"), Some(&false));
-        s.execute("text.setFeatures", &json!({"ids": ids, "features": {"liga": null, "ss01": 1}})).unwrap();
-        let f = data(&s, id).features;
-        assert_eq!(f.get("liga"), None);
-        assert_eq!(f.get("ss01"), Some(&true));
-        assert_eq!(f.get("tnum"), Some(&true));
-        s.execute("text.setFeatures", &json!({"ids": ids, "features": {"zero": true}, "replace": true})).unwrap();
-        assert_eq!(data(&s, id).features.len(), 1);
-        assert!(s.execute("text.setFeatures", &json!({"ids": ids, "features": {"ligatures": true}})).is_err());
-        assert!(s.execute("text.setFeatures", &json!({"ids": ids, "features": {"liga": "yes"}})).is_err());
-        assert!(s.execute("text.setFeatures", &json!({"ids": ids})).is_err());
-        s.execute("node.set", &json!({"id": id, "props": {"features": {"calt": false}}})).unwrap();
-        assert_eq!(data(&s, id).features.len(), 1);
-        s.execute("text.paragraphIndent", &json!({"ids": ids, "indent": 16})).unwrap();
-        s.execute("text.paragraphSpacing", &json!({"ids": ids, "spacing": 8})).unwrap();
-        s.execute("text.maxLines", &json!({"ids": ids, "lines": 2})).unwrap();
-        s.execute("text.decoration", &json!({"ids": ids, "decoration": "strikethrough"})).unwrap();
-        s.execute("text.case", &json!({"ids": ids, "case": "smallCaps"})).unwrap();
-        s.execute("text.listStyle", &json!({"ids": ids, "style": "bulleted"})).unwrap();
-        let t = data(&s, id);
-        assert_eq!((t.paragraph_indent, t.paragraph_spacing, t.max_lines), (16.0, 8.0, 2));
-        assert_eq!(t.auto_resize, TextAutoResize::Truncate);
-        assert_eq!(t.style.decoration, TextDecoration::Strikethrough);
-        assert_eq!(t.style.case, TextCase::SmallCaps);
-        assert_eq!(t.list, ListStyle::Bulleted);
-        assert!(s.execute("text.listStyle", &json!({"ids": ids, "style": "zigzag"})).is_err());
-        assert!(s.execute("text.paragraphIndent", &json!({"ids": ids, "indent": "NaN"})).is_err());
-        s.execute("node.set", &json!({"id": id, "props": {"textCase": "smallCaps", "paragraphIndent": 4, "maxLines": 0}})).unwrap();
-        assert_eq!(data(&s, id).paragraph_indent, 4.0);
-    }
-
-    fn preedit_state(s: &Session) -> Option<Preedit> {
-        s.ds().unwrap().text_edit.clone().unwrap().preedit
-    }
-
-    #[test]
-    fn ime_composition_is_shown_but_not_in_the_document_until_committed() {
-        let (mut s, id) = setup("Hello world");
-        let undo_before = s.ds().unwrap().history.undo.len();
-        begin(&mut s, id, Some(5), false).unwrap();
-        let doc_before = s.ds().unwrap().doc.clone();
-        s.execute("text.edit.preedit", &json!({"text": "にほ", "cursor": 1})).unwrap();
-        assert_eq!(preedit_state(&s), Some(Preedit { text: "にほ".into(), cursor: 1 }));
-        assert!(std::sync::Arc::ptr_eq(&doc_before, &s.ds().unwrap().doc), "composing leaves the document alone");
-        let (shown, range, cursor) = preedit_doc(&s).unwrap();
-        assert_eq!(shown.node(id).unwrap().kind.text().unwrap().characters, "Helloにほ world");
-        assert_eq!((range, cursor), ((5, 7), 6));
-        let info = s.execute("text.edit.selection", &json!({})).unwrap();
-        assert_eq!(info["preedit"]["text"], "にほ");
-        // Updating the composition replaces it; an empty one cancels it.
-        preedit(&mut s, "にほん", None).unwrap();
-        assert_eq!(preedit_doc(&s).unwrap().2, 8);
-        preedit(&mut s, "", None).unwrap();
-        assert!(preedit_state(&s).is_none() && preedit_doc(&s).is_none());
-        assert_eq!(data(&s, id).characters, "Hello world");
-        // Commit puts the final text at the caret.
-        preedit(&mut s, "にほん", None).unwrap();
-        s.execute("text.edit.insert", &json!({"text": "日本"})).unwrap();
-        assert!(preedit_state(&s).is_none());
-        assert_eq!(data(&s, id).characters, "Hello日本 world");
-        assert_eq!(sel(&s), (7, 7));
-        // Composing over a selection replaces it; moving the caret abandons the composition.
-        set_caret(&mut s, 7, false).unwrap();
-        set_caret(&mut s, 13, true).unwrap();
-        preedit(&mut s, "x", None).unwrap();
-        assert_eq!(data(&s, id).characters, "Hello日本");
-        set_caret(&mut s, 0, false).unwrap();
-        assert!(preedit_state(&s).is_none());
-        assert_eq!(data(&s, id).characters, "Hello日本");
-        // Ending the edit drops an uncommitted composition; the session stays one undo step.
-        preedit(&mut s, "zz", None).unwrap();
-        end(&mut s).unwrap();
-        assert_eq!(data(&s, id).characters, "Hello日本");
-        assert_eq!(s.ds().unwrap().history.undo.len(), undo_before + 1);
-        // Not editing: an error, not a crash.
-        assert!(preedit(&mut s, "a", None).is_err());
-    }
-
-    #[test]
-    fn variable_font_axes_as_commands_and_props() {
-        let (mut s, id) = setup("Hello world");
-        let ids = json!([id]);
-        s.execute("text.setVariations", &json!({"ids": ids, "variations": {"wght": 550, "wdth": 85}})).unwrap();
-        let st = data(&s, id).style;
-        assert_eq!((st.variations.get("wght"), st.variations.get("wdth")), (Some(&550.0), Some(&85.0)));
-        assert_eq!(st.weight(), 550);
-        // null removes one axis; replace clears the rest.
-        s.execute("text.setVariations", &json!({"ids": ids, "variations": {"wdth": null}})).unwrap();
-        assert_eq!(data(&s, id).style.variations.len(), 1);
-        s.execute("text.setVariations", &json!({"ids": ids, "variations": {"opsz": 14}, "replace": true})).unwrap();
-        assert_eq!(data(&s, id).style.variations.keys().collect::<Vec<_>>(), ["opsz"]);
-        // Undo restores the previous values.
-        s.undo().unwrap();
-        assert_eq!(data(&s, id).style.variations.keys().collect::<Vec<_>>(), ["wght"]);
-        // Junk is rejected.
-        assert!(s.execute("text.setVariations", &json!({"ids": ids, "variations": {"weight": 500}})).is_err());
-        assert!(s.execute("text.setVariations", &json!({"ids": ids, "variations": {"wght": "bold"}})).is_err());
-        assert!(s.execute("text.setVariations", &json!({"ids": ids})).is_err());
-        // node.set props (whole text or a range) replace the custom values.
-        s.execute("node.set", &json!({"id": id, "props": {"fontVariations": {"wght": 300}, "start": 6, "end": 11}})).unwrap();
-        let t = data(&s, id);
-        assert_eq!(t.style_at(0).variations.get("wght"), Some(&550.0));
-        assert_eq!(t.style_at(7).variations.get("wght"), Some(&300.0));
-        s.execute("node.set", &json!({"id": id, "props": {"variationSettings": null}})).unwrap();
-        assert!(data(&s, id).runs.is_empty() && data(&s, id).style.variations.is_empty());
-        // Picking a named style (Bold, weight steps) drops the custom weight but keeps width.
-        s.execute("text.setVariations", &json!({"ids": ids, "variations": {"wght": 650, "wdth": 90}})).unwrap();
-        s.execute("text.bold", &json!({"ids": ids})).unwrap();
-        let st = data(&s, id).style;
-        assert_eq!(st.font_style, "Bold", "650 is lighter than bold, so Bold applies");
-        assert!(!st.variations.contains_key("wght"));
-        assert_eq!(st.variations.get("wdth"), Some(&90.0));
-        // While editing, the command styles the selected range only.
-        begin(&mut s, id, Some(0), false).unwrap();
-        set_caret(&mut s, 5, true).unwrap();
-        s.execute("text.setVariations", &json!({"variations": {"wdth": 75}})).unwrap();
-        end(&mut s).unwrap();
-        let t = data(&s, id);
-        assert_eq!(t.style_at(0).variations.get("wdth"), Some(&75.0));
-        assert_eq!(t.style_at(8).variations.get("wdth"), Some(&90.0));
-        // The axes query answers without fonts too.
-        let r = s.execute("text.fonts", &json!({"family": "Inter", "axes": true})).unwrap();
-        assert!(r.is_null() || r["axes"].is_array());
-    }
-
-    #[test]
-    fn text_commands_survive_junk_while_editing() {
-        let junk = [
-            json!({}),
-            json!(null),
-            json!({"index": -5, "features": {"": 1}}),
-            json!({"index": 1e300, "style": 3, "case": null}),
-            json!([1]),
-            json!({"variations": {"wght": "heavy", "toolong": 1}, "text": "\u{0}\u{7}", "cursor": 1e300}),
-            json!({"variations": {"wght": 1e300, "opsz": -1e300}, "replace": "yes", "text": "日本語", "cursor": -1}),
-        ];
-        for spec in crate::cmd::all_commands().iter().filter(|c| c.id.starts_with("text.")) {
-            for j in &junk {
-                let (mut s, id) = setup("Hi there\nyou");
-                begin(&mut s, id, Some(2), false).unwrap();
-                set_caret(&mut s, 5, true).unwrap();
-                if let Err(EngineError::Internal { cmd, msg }) = s.execute(spec.id, j) {
-                    panic!("{cmd} panicked on {j}: {msg}");
-                }
-            }
-        }
-    }
-}
diff --git a/crates/engine/src/textfit_tests.rs b/crates/engine/src/textfit_tests.rs
new file mode 100644
index 00000000..e35f810c
--- /dev/null
+++ b/crates/engine/src/textfit_tests.rs
@@ -0,0 +1,135 @@
+//! `text.fit`: the largest size that fits the box and a line limit, orphans avoided, and
+//! data.fill sizing each copy's text.
+
+use crate::Session;
+use crate::components::tests::{ex, idv};
+use figcraft_doc::{NodeId, NodeKind};
+use serde_json::json;
+
+/// A fixed-width (auto-height) headline of `width` px at 64px. Returns its id.
+fn headline(s: &mut Session, text: &str, width: f64) -> NodeId {
+    figcraft_text::scan_system_fonts();
+    let t = idv(&ex(s, "text.create", json!({"text": text, "x": 0, "y": 0, "props": {"name": "Headline", "fontSize": 64}})));
+    ex(s, "node.set", json!({"id": t, "props": {"width": width, "textAutoResize": "height"}}));
+    t
+}
+
+fn size(s: &Session, id: NodeId) -> f64 {
+    match &s.doc().unwrap().node(id).unwrap().kind {
+        NodeKind::Text(t) => t.style.font_size,
+        _ => 0.0,
+    }
+}
+
+#[test]
+fn text_shrinks_to_its_line_limit_and_no_further() {
+    let mut s = Session::new();
+    let t = headline(&mut s, "Seu site e seu WhatsApp com IA, prontos em 7 dias", 600.0);
+    let r = ex(&mut s, "text.fit", json!({"ids": [t], "maxLines": 2}));
+    let f = &r["fitted"][0];
+    assert_eq!(f["lines"], 2, "{r}");
+    assert!(f["fits"].as_bool().unwrap());
+    let fitted = size(&s, t);
+    assert!((64.0 * 0.6..64.0).contains(&fitted), "{fitted}");
+    // The largest that fits: a pixel more breaks the limit.
+    ex(&mut s, "node.set", json!({"id": t, "props": {"fontSize": fitted + 1.0}}));
+    let again = ex(&mut s, "text.fit", json!({"ids": [t], "maxLines": 2}));
+    assert!((again["fitted"][0]["fontSize"].as_f64().unwrap() - fitted).abs() <= 0.2, "{again}");
+    // Text that already fits keeps its size; one undo restores the original.
+    let short = headline(&mut s, "7 dias", 600.0);
+    ex(&mut s, "text.fit", json!({"ids": [short], "maxLines": 1}));
+    assert_eq!(size(&s, short), 64.0);
+    // A floor that can't fit reports it instead of going below (fit never grows text).
+    ex(&mut s, "node.set", json!({"id": t, "props": {"fontSize": 64}}));
+    let r = ex(&mut s, "text.fit", json!({"ids": [t], "maxLines": 1, "minSize": 50}));
+    assert_eq!(r["fitted"][0]["fits"], false);
+    assert_eq!(size(&s, t), 50.0);
+    // Text that grows to its content has no box to fit.
+    let auto = idv(&ex(&mut s, "text.create", json!({"text": "x", "x": 0, "y": 0})));
+    assert!(s.execute("text.fit", &json!({"ids": [auto]})).is_err());
+}
+
+#[test]
+fn a_one_word_last_line_is_avoided() {
+    let mut s = Session::new();
+    // At 64px in 520px this breaks with "1s." alone on the last line.
+    let t = headline(&mut s, "Lighthouse 100, abre em menos de 1s.", 520.0);
+    let r = ex(&mut s, "text.fit", json!({"ids": [t]}));
+    assert_eq!(r["fitted"][0]["orphan"], false, "{r}");
+    let doc = s.doc().unwrap();
+    let NodeKind::Text(tx) = &doc.node(t).unwrap().kind else { panic!() };
+    let l = figcraft_text::layout(tx, Some(520.0), None);
+    let last = l.lines.last().unwrap();
+    let words = tx.characters.chars().skip(last.char_start).take(last.char_end - last.char_start).collect::<String>();
+    assert!(l.lines.len() == 1 || words.split_whitespace().count() > 1 || words.contains('\u{a0}'), "{words:?}");
+}
+
+/// Asserts `data.fill` keeps a short copy's font size, shrinks a long copy, and leaves the
+/// source text layer untouched.
+#[test]
+fn data_fill_sizes_each_copys_text() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 1080, "height": 1350, "name": "Post"})));
+    let t = idv(&ex(&mut s, "text.create", json!({"text": "Curto", "x": 80, "y": 80, "parent": f, "props": {"name": "Headline", "fontSize": 96}})));
+    ex(&mut s, "node.set", json!({"id": t, "props": {"width": 920, "textAutoResize": "height"}}));
+    let r = ex(
+        &mut s,
+        "data.fill",
+        json!({"id": f, "rows": [
+            {"Headline": {"text": "Curto", "fit": {"maxLines": 2}}},
+            {"Headline": {"text": "Landing page e atendente de WhatsApp com IA, prontos em sete dias úteis", "fit": {"maxLines": 2}}}
+        ]}),
+    );
+    let ids: Vec<NodeId> = r["ids"].as_array().unwrap().iter().map(|v| NodeId(v.as_u64().unwrap())).collect();
+    let head = |s: &Session, frame: NodeId| s.doc().unwrap().node(frame).unwrap().children[0];
+    assert_eq!(size(&s, head(&s, ids[0])), 96.0, "short copy keeps its size");
+    assert!(size(&s, head(&s, ids[1])) < 96.0, "long copy shrinks");
+    assert_eq!(size(&s, t), 96.0, "the source is untouched");
+}
+
+#[test]
+fn review_fits_is_reported_from_the_final_text() {
+    let mut s = Session::new();
+    for (text, width, lines) in [
+        ("Seu site e seu WhatsApp com IA, prontos em 7 dias", 600.0, 2.0),
+        ("Lighthouse 100, abre em menos de 1s.", 520.0, 2.0),
+        ("Curto", 300.0, 1.0),
+    ] {
+        let t = headline(&mut s, text, width);
+        let r = ex(&mut s, "text.fit", json!({"ids": [t], "maxLines": lines}));
+        let f = &r["fitted"][0];
+        let doc = s.doc().unwrap();
+        let NodeKind::Text(tx) = &doc.node(t).unwrap().kind else { panic!() };
+        let real = figcraft_text::layout(tx, Some(width), None).lines.len();
+        assert_eq!(f["lines"].as_u64().unwrap() as usize, real, "{r}");
+        assert_eq!(f["fits"].as_bool().unwrap(), real as f64 <= lines, "{r}");
+    }
+}
+
+#[test]
+fn review_sizes_off_the_tenth_grid_keep_their_size_and_floor() {
+    let mut s = Session::new();
+    // Fits already: 14.25px stays 14.25px, not 14.2 or 14.3.
+    let t = headline(&mut s, "Curto", 600.0);
+    ex(&mut s, "node.set", json!({"id": t, "props": {"fontSize": 14.25}}));
+    ex(&mut s, "text.fit", json!({"ids": [t], "maxLines": 1}));
+    assert_eq!(size(&s, t), 14.25);
+    // Can't fit: it stops at the floor, not a tenth below it.
+    let long = headline(&mut s, "Seu site e seu WhatsApp com IA, prontos em 7 dias", 200.0);
+    let r = ex(&mut s, "text.fit", json!({"ids": [long], "maxLines": 1, "minSize": 12.34}));
+    assert_eq!(r["fitted"][0]["fits"], false, "{r}");
+    assert!(size(&s, long) >= 12.34, "{}", size(&s, long));
+}
+
+#[test]
+fn review_a_one_word_paragraph_is_not_an_orphan() {
+    let mut s = Session::new();
+    let t = headline(&mut s, "Two words\nOne", 600.0);
+    let r = ex(&mut s, "text.fit", json!({"ids": [t]}));
+    assert_eq!(r["fitted"][0]["orphan"], false, "{r}");
+    assert_eq!(size(&s, t), 64.0, "nothing to fix, so nothing shrinks");
+    let doc = s.doc().unwrap();
+    let NodeKind::Text(tx) = &doc.node(t).unwrap().kind else { panic!() };
+    assert_eq!(tx.characters, "Two words\nOne", "no no-break space in an earlier paragraph");
+}
diff --git a/crates/engine/src/tools.rs b/crates/engine/src/tools.rs
deleted file mode 100644
index 3d3b9acb..00000000
--- a/crates/engine/src/tools.rs
+++ /dev/null
@@ -1,2400 +0,0 @@
-//! Pointer tools. The UI (or an agent through the control channel) feeds [`PointerEvent`]s in page
-//! coordinates; tools turn gestures into document edits through interactions (one undo step per
-//! gesture) and publish overlay hints (marquee, guides, size label, cursor) for the canvas.
-
-use std::collections::BTreeMap;
-
-use figcraft_doc::geometry::select_target;
-use figcraft_doc::*;
-use figcraft_geom::{Affine, Point, Rect, Vec2};
-use serde::Serialize;
-use serde_json::json;
-
-use crate::arc_handles::{ArcHandle, ArcHint};
-use crate::cmd::arrange::move_world;
-use crate::cmd::create::frame_at;
-use crate::cmd::edit::roots;
-use crate::shape_handles::{ShapeHandle, ShapeHint};
-use crate::snap::{Guide, Targets};
-use crate::{Result, Session, textedit};
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Default)]
-pub enum ToolId {
-    #[default]
-    Move,
-    Scale,
-    Hand,
-    Frame,
-    Section,
-    Slice,
-    Rectangle,
-    Line,
-    Arrow,
-    Ellipse,
-    Polygon,
-    Star,
-    Pen,
-    Pencil,
-    Text,
-    Comment,
-    Eyedropper,
-    ShapeBuilder,
-}
-
-impl ToolId {
-    pub const ALL: [ToolId; 18] = [
-        ToolId::Move,
-        ToolId::Scale,
-        ToolId::Hand,
-        ToolId::Frame,
-        ToolId::Section,
-        ToolId::Slice,
-        ToolId::Rectangle,
-        ToolId::Line,
-        ToolId::Arrow,
-        ToolId::Ellipse,
-        ToolId::Polygon,
-        ToolId::Star,
-        ToolId::Pen,
-        ToolId::Pencil,
-        ToolId::Text,
-        ToolId::Comment,
-        ToolId::Eyedropper,
-        ToolId::ShapeBuilder,
-    ];
-    pub fn id(self) -> &'static str {
-        match self {
-            ToolId::Move => "move",
-            ToolId::Scale => "scale",
-            ToolId::Hand => "hand",
-            ToolId::Frame => "frame",
-            ToolId::Section => "section",
-            ToolId::Slice => "slice",
-            ToolId::Rectangle => "rectangle",
-            ToolId::Line => "line",
-            ToolId::Arrow => "arrow",
-            ToolId::Ellipse => "ellipse",
-            ToolId::Polygon => "polygon",
-            ToolId::Star => "star",
-            ToolId::Pen => "pen",
-            ToolId::Pencil => "pencil",
-            ToolId::Text => "text",
-            ToolId::Comment => "comment",
-            ToolId::Eyedropper => "eyedropper",
-            ToolId::ShapeBuilder => "shapeBuilder",
-        }
-    }
-    pub fn from_id(s: &str) -> Option<ToolId> {
-        ToolId::ALL.into_iter().find(|t| t.id().eq_ignore_ascii_case(s))
-    }
-    pub fn label(self) -> &'static str {
-        match self {
-            ToolId::Move => "Move",
-            ToolId::Scale => "Scale",
-            ToolId::Hand => "Hand tool",
-            ToolId::Frame => "Frame",
-            ToolId::Section => "Section",
-            ToolId::Slice => "Slice",
-            ToolId::Rectangle => "Rectangle",
-            ToolId::Line => "Line",
-            ToolId::Arrow => "Arrow",
-            ToolId::Ellipse => "Ellipse",
-            ToolId::Polygon => "Polygon",
-            ToolId::Star => "Star",
-            ToolId::Pen => "Pen",
-            ToolId::Pencil => "Pencil",
-            ToolId::Text => "Text",
-            ToolId::Comment => "Comment",
-            ToolId::Eyedropper => "Pick color",
-            ToolId::ShapeBuilder => "Shape builder",
-        }
-    }
-    /// The tool's key (from [`crate::keymap`]; empty when it has none).
-    pub fn shortcut(self) -> &'static str {
-        let id = self.id();
-        crate::keymap::KEYS
-            .iter()
-            .find(|b| if self == ToolId::Eyedropper { b.id == "edit.pickColor" } else { b.id.strip_prefix("tool.") == Some(id) })
-            .and_then(|b| b.keys(crate::keymap::Platform::current()).first().copied())
-            .unwrap_or("")
-    }
-
-    /// The size a click (or Enter, `tool.place`) makes with a shape or frame tool.
-    pub fn click_size(self) -> (f64, f64) {
-        match self {
-            ToolId::Line | ToolId::Arrow => (100.0, 0.0),
-            ToolId::Section => (400.0, 300.0),
-            _ => (100.0, 100.0),
-        }
-    }
-
-    pub fn draws_shape(self) -> bool {
-        matches!(
-            self,
-            ToolId::Frame
-                | ToolId::Section
-                | ToolId::Slice
-                | ToolId::Rectangle
-                | ToolId::Ellipse
-                | ToolId::Polygon
-                | ToolId::Star
-                | ToolId::Line
-                | ToolId::Arrow
-        )
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
-pub enum PointerKind {
-    Down,
-    Move,
-    Up,
-    /// Pointer moved without a button.
-    Hover,
-    DoubleClick,
-}
-
-/// A pointer event in page coordinates (and screen coordinates for panning).
-#[derive(Clone, Debug, PartialEq, Serialize)]
-pub struct PointerEvent {
-    pub kind: PointerKind,
-    pub x: f64,
-    pub y: f64,
-    /// Screen position (logical pixels).
-    pub sx: f64,
-    pub sy: f64,
-    pub shift: bool,
-    pub alt: bool,
-    /// Cmd on macOS, Ctrl elsewhere.
-    pub cmd: bool,
-    pub ctrl: bool,
-    /// Screen pixels per page unit.
-    pub zoom: f64,
-    /// Pen pressure, 0..1, where the device reports it (`None`: a mouse, or a platform that doesn't).
-    pub pressure: Option<f32>,
-}
-
-/// The pointer is still within [`DRAG_SLOP_PX`] of where it was pressed.
-fn within_slop(ev: &PointerEvent, start: Point) -> bool {
-    (ev.p() - start).hypot() * ev.zoom.max(1e-6) < DRAG_SLOP_PX
-}
-
-impl PointerEvent {
-    pub fn at(kind: PointerKind, x: f64, y: f64, zoom: f64) -> Self {
-        Self { kind, x, y, sx: x * zoom, sy: y * zoom, shift: false, alt: false, cmd: false, ctrl: false, zoom, pressure: None }
-    }
-    pub(crate) fn p(&self) -> Point {
-        Point::new(self.x, self.y)
-    }
-    fn tol(&self) -> f64 {
-        1.0 / self.zoom.max(1e-6)
-    }
-}
-
-/// Cursor hint for the UI.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Default)]
-pub enum Cursor {
-    #[default]
-    Default,
-    Crosshair,
-    Move,
-    /// Resize along an angle (degrees, 0 = horizontal).
-    Resize(f64),
-    /// Rotate, turned to the corner it is near: the direction from the box's centre to the corner
-    /// (while rotating: to the pointer), in degrees, 0 = right and 90 = down.
-    Rotate(f64),
-    Grab,
-    Grabbing,
-    Text,
-    Pen(PenCursor),
-    /// A drag here makes a copy (Alt).
-    Copy,
-    /// Over a clickable part of a widget.
-    Pointer,
-    Eyedropper,
-    Comment,
-    /// What the gesture is doing will be undone when it ends (an edit only a main component can
-    /// make).
-    NotAllowed,
-}
-
-/// What a click with the pen would do.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Default)]
-pub enum PenCursor {
-    /// A new point.
-    #[default]
-    New,
-    /// On a point: closes the path, connects to the point or goes on from it.
-    Close,
-    /// On a segment: adds a point there.
-    Add,
-    /// Bends the segment or the point's handles (the Bend tool; Cmd/Ctrl in vector edit mode).
-    Bend,
-}
-
-impl ToolId {
-    /// The tool's cursor over empty canvas.
-    pub fn cursor(self) -> Cursor {
-        match self {
-            ToolId::Hand => Cursor::Grab,
-            ToolId::Pen => Cursor::Pen(PenCursor::New),
-            ToolId::Comment => Cursor::Comment,
-            ToolId::Eyedropper => Cursor::Eyedropper,
-            ToolId::Move | ToolId::Scale => Cursor::Default,
-            // The other tools make something where they are pressed: shapes, frames, slices, pencil
-            // strokes, a new text (over a text the Text tool shows the I-beam instead).
-            _ => Cursor::Crosshair,
-        }
-    }
-}
-
-/// Selection handle kinds: corners (0 tl, 1 tr, 2 br, 3 bl), edges (0 t, 1 r, 2 b, 3 l) and the
-/// rotation zones outside the corners.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize)]
-pub enum Handle {
-    Corner(u8),
-    Edge(u8),
-    Rotate(u8),
-}
-
-/// What the canvas should draw on top of the scene.
-#[derive(Clone, Debug, Default, Serialize)]
-pub struct Overlay {
-    pub marquee: Option<[f64; 4]>,
-    pub guides: Vec<Guide>,
-    pub cursor: Cursor,
-    /// Pen tool: the in-progress path's anchor points and the rubber band to the pointer.
-    pub pen: Vec<[f64; 2]>,
-    pub rubber: Option<[f64; 4]>,
-    /// Pen tool: the handles shaping the segments at the pen (anchor x, y, handle x, y): the last
-    /// anchor's in and out handles and the one before's out handle.
-    pub pen_handles: Vec<[f64; 4]>,
-    /// Pen tool: where the last anchor's out handle ends, when it has one: the rubber band is the
-    /// curve a click would make, leaving along it.
-    pub rubber_handle: Option<[f64; 2]>,
-    /// Frame/section the pointer is drawing or dropping into (highlighted).
-    pub drop_target: Option<NodeId>,
-    /// Auto layout insertion indicator (x0, y0, x1, y1).
-    pub insert_line: Option<[f64; 4]>,
-    /// The instance an Alt-drop of a component from the Assets panel would swap (highlighted).
-    pub swap_target: Option<NodeId>,
-    /// Auto layout grid cell a drag would drop into (x0, y0, x1, y1).
-    pub drop_cell: Option<[f64; 4]>,
-    /// Vector edit mode: what the pointer is over, the lasso being drawn and the closed area the
-    /// paint bucket would fill (page-space polygons).
-    pub vector_hover: Option<crate::vectoredit::VHit>,
-    /// The edited layer `vector_hover` is on (several layers can be in edit mode).
-    pub vector_hover_on: Option<NodeId>,
-    /// Vector edit mode, Variable width tool: the width point, handle or path under the pointer.
-    pub width_hover: Option<crate::vectoredit::WHit>,
-    pub lasso: Vec<[f64; 2]>,
-    /// The eraser brush under the pointer (x, y, radius in page units).
-    pub brush: Option<[f64; 3]>,
-    pub face: Vec<Vec<[f64; 2]>>,
-    /// Shape builder: the regions under the pointer or collected by the drag (indexes into
-    /// [`crate::shapebuilder::current`]) and whether releasing removes them.
-    pub builder_regions: Vec<usize>,
-    pub builder_remove: bool,
-    /// Measuring (Alt): the box of the layer or frame measured to (x0, y0, x1, y1), outlined.
-    pub measure_box: Option<[f64; 4]>,
-    /// Scale tool drag: the factor so far and the point that stays put.
-    pub scale: Option<ScaleHint>,
-    /// The selected ellipse's arc handle under the pointer, and the readout while one is dragged
-    /// (see [`crate::arc_handles`]).
-    pub arc_hover: Option<ArcHandle>,
-    pub arc: Option<ArcHint>,
-    /// The selected shape's corner radius or star ratio handle under the pointer, and the readout
-    /// while one is dragged (see [`crate::shape_handles`]).
-    pub shape_hover: Option<ShapeHandle>,
-    pub shape: Option<ShapeHint>,
-}
-
-/// The Scale tool's live readout while dragging a handle.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize)]
-pub struct ScaleHint {
-    pub factor: f64,
-    pub pivot: [f64; 2],
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct ResizeStart {
-    /// Node id → (world transform, w, h) at the start.
-    nodes: Vec<(NodeId, Affine, f64, f64)>,
-    /// The handle box: page transform of its top-left corner (axes along the box) and its size.
-    frame: (Affine, f64, f64),
-    /// One layer (resized in place) rather than several (mapped from the old box to the new).
-    single: bool,
-    handle: Handle,
-}
-
-#[derive(Clone, Debug, Default)]
-pub(crate) enum Gesture {
-    #[default]
-    None,
-    Marquee {
-        start: Point,
-        /// Shift: toggle what it touches in the selection it started from (`base`).
-        additive: bool,
-        base: Vec<NodeId>,
-        within: Option<NodeId>,
-    },
-    Move {
-        start: Point,
-        ids: Vec<NodeId>,
-        targets: Targets,
-        duplicate: bool,
-        moved: bool,
-    },
-    Resize {
-        start: Point,
-        r: Box<ResizeStart>,
-        scale_tool: bool,
-        moved: bool,
-    },
-    Rotate {
-        center: Point,
-        start_angle: f64,
-        ids: Vec<NodeId>,
-    },
-    Draw {
-        start: Point,
-        id: Option<NodeId>,
-        parent: NodeId,
-        targets: Targets,
-    },
-    Pan {
-        sx: f64,
-        sy: f64,
-        cx: f64,
-        cy: f64,
-    },
-    Pencil {
-        points: Vec<Point>,
-        /// The pen pressure at each point, where the device reports it.
-        pressure: Vec<Option<f32>>,
-    },
-    TextSelect {
-        id: NodeId,
-    },
-    /// A new text from the Text tool, still pressed: a drag makes it a box the size of the drag
-    /// (at least `line`, the height of its first line, tall).
-    TextBox {
-        id: NodeId,
-        start: Point,
-        line: f64,
-    },
-    PenDrag {
-        anchor: Point,
-    },
-    /// Vector edit mode gestures (handled in `vectoredit`).
-    Vector(crate::vectoredit::VGesture),
-    /// Dragging an ellipse's arc handle: the arc so far (see [`crate::arc_handles`]).
-    Arc {
-        id: NodeId,
-        handle: ArcHandle,
-        arc: crate::arc_handles::Arc,
-    },
-    /// Dragging a shape's corner radius or star ratio handle (see [`crate::shape_handles`]).
-    Shape {
-        id: NodeId,
-        handle: ShapeHandle,
-    },
-    /// Dragging the rotation origin handle (see [`crate::rotation_origin`]).
-    Origin,
-    /// Shape builder: regions collected so far (handled in `shapebuilder`).
-    ShapeBuild {
-        picked: Vec<usize>,
-        remove: bool,
-        start: Point,
-        last: Point,
-    },
-}
-
-/// The handles a pen path shows while it is drawn ([`Overlay::pen_handles`]): the last anchor's in
-/// and out handles and the one before's out handle, those that aren't zero.
-fn pen_handles(points: &[(Point, Vec2, Vec2)]) -> Vec<[f64; 4]> {
-    let last = points.last().into_iter().flat_map(|(p, i, o)| [(p, i), (p, o)]);
-    let before = points.len().checked_sub(2).and_then(|k| points.get(k)).into_iter().map(|(p, _, o)| (p, o));
-    before.chain(last).filter(|(_, h)| h.hypot() > 0.0).map(|(p, h)| [p.x, p.y, p.x + h.x, p.y + h.y]).collect()
-}
-
-/// The pen tool's in-progress path (page coordinates).
-#[derive(Clone, Debug, Default)]
-pub struct PenPath {
-    pub id: Option<NodeId>,
-    pub parent: Option<NodeId>,
-    /// Anchors with (in, out) handle offsets.
-    pub points: Vec<(Point, Vec2, Vec2)>,
-    pub closed: bool,
-    /// The path ends connected to this anchor of its own (a vector network).
-    pub join: Option<usize>,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct ToolState {
-    pub tool: ToolId,
-    pub(crate) gesture: Gesture,
-    pub overlay: Overlay,
-    pub pen: Option<PenPath>,
-    /// Tool to return to after a temporary tool (space → hand).
-    pub temp_from: Option<ToolId>,
-    /// Last click (for double-click detection by agents that only send downs).
-    pub last_hover: Option<NodeId>,
-    /// Shape builder: the cached arrangement of the selection, and Remove mode (a plain click
-    /// removes; Alt merges).
-    pub shape_builder: Option<std::sync::Arc<crate::shapebuilder::Arrangement>>,
-    pub builder_remove: bool,
-    /// Show distances from the selection on hover without holding Alt (Dev mode inspection).
-    pub redlines: bool,
-    /// Pen snap targets, kept while hovering (see `vectoredit::point_snap`).
-    pub(crate) pen_targets: Option<crate::vectoredit::point_snap::PenTargets>,
-    /// The Scale tool's anchor: column and row (0 start, 1 middle, 2 end) of the point of the
-    /// selection box that stays put (`tool.scaleAnchor`).
-    pub scale_anchor: (u8, u8),
-    /// The last drag move handled (a held button repeats it every frame).
-    pub(crate) last_move: Option<PointerEvent>,
-    /// The name labels of top-level frames and sections as the canvas last drew them (each label's
-    /// corners on the page, turned with its frame): the Move and Scale tools treat a press or
-    /// hover on one as on its frame.
-    pub labels: Vec<(NodeId, [Point; 4])>,
-    /// The brush the Pencil draws with (`tool.pencilBrush`; `None`: a plain stroke).
-    pub pencil_brush: Option<figcraft_doc::Brush>,
-}
-
-/// Pen pressure along drawn samples as width profile points `[t, scale]`: `t` by length, at most
-/// 32 points, medium pressure (0.5) at the stroke weight, from a tenth to twice it. `None` when no
-/// sample has pressure.
-pub(crate) fn pressure_profile(points: &[Point], pressure: &[Option<f32>]) -> Option<Vec<[f64; 2]>> {
-    if pressure.iter().all(Option::is_none) {
-        return None;
-    }
-    let mut lengths = vec![0.0];
-    for w in points.windows(2) {
-        let (Some(a), Some(b)) = (w.first(), w.get(1)) else { continue };
-        lengths.push(lengths.last().copied().unwrap_or(0.0) + (*b - *a).hypot());
-    }
-    let total = lengths.last().copied().unwrap_or(0.0);
-    if !(total.is_finite() && total > 0.0) {
-        return None;
-    }
-    let at = |i: usize| f64::from(pressure.get(i).copied().flatten().filter(|p| p.is_finite()).unwrap_or(0.5).clamp(0.0, 1.0));
-    let n = points.len().clamp(2, 32);
-    let profile = (0..n).map(|k| {
-        let t = k as f64 / (n - 1) as f64;
-        let s = t * total;
-        let i = lengths.partition_point(|l| *l < s).min(lengths.len().saturating_sub(1));
-        let p = match (i.checked_sub(1).and_then(|j| lengths.get(j)), lengths.get(i)) {
-            (Some(a), Some(b)) if b > a => at(i - 1) + (at(i) - at(i - 1)) * ((s - a) / (b - a)),
-            _ => at(i),
-        };
-        [t, (p / 0.5).clamp(0.1, 2.0)]
-    });
-    Some(profile.collect())
-}
-
-/// A frame or section drawn around layers takes those of its siblings that lie fully inside it
-/// (visible and unlocked ones, in their order; a frame never takes a section). Not in auto layout,
-/// where the new frame is one more item of the flow.
-fn take_enclosed(doc: &mut Document, drawn: NodeId) -> Result<()> {
-    let Some(n) = doc.node(drawn) else { return Ok(()) };
-    let section = matches!(n.kind, NodeKind::Section { .. });
-    let (Some(parent), Some(area)) = (n.parent.and_then(|p| doc.node(p)), doc.world_bounds(drawn)) else { return Ok(()) };
-    if parent.layout.is_some() {
-        return Ok(());
-    }
-    let inside: Vec<NodeId> = parent
-        .children
-        .iter()
-        .copied()
-        .filter(|c| *c != drawn && doc.node(*c).is_some_and(|k| k.visible && !k.locked && (section || !matches!(k.kind, NodeKind::Section { .. }))))
-        .filter(|c| doc.world_bounds(*c).is_some_and(|b| area.contains(b.origin()) && area.contains(Point::new(b.x1, b.y1))))
-        .collect();
-    for c in inside {
-        doc.reparent(c, drawn, None)?;
-    }
-    Ok(())
-}
-
-/// The frame whose name label (see [`ToolState::labels`]) is under `p` on `page`: the topmost
-/// one drawn, if it can be selected (still there, on the page, visible and unlocked).
-pub fn label_at(doc: &Document, page: NodeId, labels: &[(NodeId, [Point; 4])], p: Point) -> Option<NodeId> {
-    labels
-        .iter()
-        .rev()
-        .find(|(id, q)| in_quad(q, p) && doc.page_of(*id) == Some(page) && doc.node(*id).is_some_and(|n| n.visible && !n.locked))
-        .map(|(id, _)| *id)
-}
-
-/// Whether `p` is inside the convex quadrilateral `q` (either winding; edges included).
-fn in_quad(q: &[Point; 4], p: Point) -> bool {
-    let (mut left, mut right) = (false, false);
-    for (a, b) in q.iter().zip(q.iter().cycle().skip(1)) {
-        let side = (*b - *a).cross(p - *a);
-        if !side.is_finite() {
-            return false;
-        }
-        left |= side < 0.0;
-        right |= side > 0.0;
-    }
-    // On one side of every edge (a point can't be on all four edges of a quad with an area).
-    left != right
-}
-
-/// An anchor name (`tl`, `t`, `tr`, `l`, `c`, `r`, `bl`, `b`, `br`) as column and row (0 start,
-/// 1 middle, 2 end).
-pub fn anchor_of(name: &str) -> Option<(u8, u8)> {
-    ANCHORS.iter().position(|a| a.eq_ignore_ascii_case(name.trim())).map(|i| ((i % 3) as u8, (i / 3) as u8))
-}
-
-/// The name of anchor `(column, row)`.
-pub fn anchor_name(a: (u8, u8)) -> &'static str {
-    ANCHORS.get(usize::from(a.1.min(2)) * 3 + usize::from(a.0.min(2))).copied().unwrap_or("tl")
-}
-
-/// The fill new text takes to be readable where it is drawn, in `parent`: white on a dark
-/// background (None: the model's default, black). The background is the nearest layer from `parent`
-/// out whose top visible fill is a mostly opaque solid colour, else the page (#362). For text made
-/// in the app: by the Text tool, or by a command that names no fill while the interface is up.
-pub(crate) fn readable_text_fills(doc: &Document, parent: NodeId) -> Option<Vec<figcraft_color::Paint>> {
-    let dark = std::iter::once(parent).chain(doc.ancestors(parent)).filter_map(|id| doc.node(id)).find_map(|n| match &n.kind {
-        NodeKind::Page { background, .. } => Some(background.is_dark()),
-        _ => n.fills.iter().rev().find(|p| p.visible).and_then(|p| p.solid_color()).filter(|c| c.a >= 0.5).map(|c| c.is_dark()),
-    });
-    dark.unwrap_or(false).then(|| vec![figcraft_color::Paint::solid(figcraft_color::Color::WHITE)])
-}
-
-const ANCHORS: [&str; 9] = ["tl", "t", "tr", "l", "c", "r", "bl", "b", "br"];
-
-impl ToolState {
-    pub fn busy(&self) -> bool {
-        !matches!(self.gesture, Gesture::None)
-    }
-}
-
-const HANDLE_PX: f64 = 5.0;
-const ROTATE_PX: f64 = 18.0;
-/// Snap distance in screen pixels.
-pub(crate) const SNAP_PX: f64 = 5.0;
-/// Screen pixels the pointer travels after a press before a move or resize starts: a click or a
-/// double-click made with an unsteady hand doesn't drag what it lands on.
-const DRAG_SLOP_PX: f64 = 3.0;
-
-/// Corners of the selection's handle box in page coordinates (tl, tr, br, bl).
-pub fn selection_box(doc: &Document, sel: &[NodeId]) -> Option<[Point; 4]> {
-    let (f, w, h) = selection_frame(doc, sel)?;
-    Some([f * Point::ZERO, f * Point::new(w, 0.0), f * Point::new(w, h), f * Point::new(0.0, h)])
-}
-
-/// The selection's handle box: the page transform of its top-left corner (axes along the box) and
-/// its size. One layer: its own box; several sharing a rotation: a box turned with them;
-/// otherwise the page-aligned bounds.
-pub fn selection_frame(doc: &Document, sel: &[NodeId]) -> Option<(Affine, f64, f64)> {
-    let ids = roots(doc, sel);
-    if let [id] = ids.as_slice() {
-        let n = doc.node(*id)?;
-        return Some((doc.world_transform(*id), n.width, n.height));
-    }
-    let Some(angle) = shared_rotation(doc, &ids) else {
-        let b = doc.bounds_of(&ids)?;
-        return Some((Affine::translate((b.x0, b.y0)), b.width(), b.height()));
-    };
-    let rot = Affine::rotate(angle);
-    let inv = rot.inverse();
-    let b = ids
-        .iter()
-        .filter_map(|i| Some(figcraft_geom::transform_rect_bbox(inv * doc.world_transform(*i), doc.node(*i)?.local_rect())))
-        .reduce(|a, b| a.union(b))?;
-    Some((rot * Affine::translate((b.x0, b.y0)), b.width(), b.height()))
-}
-
-/// The rotation (radians) every layer in `ids` shares, unless it's a multiple of 90 degrees (the
-/// page-aligned box is then the same box). Flipped layers count by their axis, not its direction.
-fn shared_rotation(doc: &Document, ids: &[NodeId]) -> Option<f64> {
-    use std::f64::consts::{FRAC_PI_2, PI};
-    const EPS: f64 = 1e-4;
-    let mut angles = ids.iter().map(|i| {
-        let c = doc.world_transform(*i).as_coeffs();
-        c[1].atan2(c[0])
-    });
-    let a = angles.next()?;
-    let same = |b: f64| {
-        let d = (b - a).rem_euclid(PI);
-        d.min(PI - d) < EPS
-    };
-    let axis_aligned = (a - (a / FRAC_PI_2).round() * FRAC_PI_2).abs() < EPS;
-    (a.is_finite() && !axis_aligned && angles.all(same)).then_some(a)
-}
-
-/// Whether layer `id` is locked or inside a locked layer: it can be selected in the layers panel
-/// but not moved or resized on the canvas.
-pub fn locked_in(doc: &Document, id: NodeId) -> bool {
-    std::iter::once(id).chain(doc.ancestors(id)).any(|a| doc.node(a).is_some_and(|n| n.locked))
-}
-
-/// Which handle (if any) is under `p`. A selection with a locked layer has none.
-pub fn handle_at(doc: &Document, sel: &[NodeId], p: Point, zoom: f64) -> Option<Handle> {
-    if sel.is_empty() || sel.iter().any(|i| locked_in(doc, *i)) {
-        return None;
-    }
-    let corners = selection_box(doc, sel)?;
-    // Lines (zero height) only get end handles.
-    let is_line = sel.len() == 1 && sel.first().and_then(|i| doc.node(*i)).is_some_and(|n| matches!(n.kind, NodeKind::Line));
-    handle_at_corners(&corners, p, zoom, is_line)
-}
-
-/// Half the side of the square the canvas draws on each corner of the handle box (screen pixels,
-/// upright whatever the box's rotation).
-const CORNER_SQUARE_PX: f64 = 4.0;
-
-/// Whether `p` is on a corner square of the selection's handle box as drawn: there the corner
-/// resizes, although a corner-radius handle 10 px in reaches that far too.
-fn on_corner_square(doc: &Document, sel: &[NodeId], p: Point, zoom: f64) -> bool {
-    let reach = CORNER_SQUARE_PX / zoom.max(1e-6);
-    matches!(handle_at(doc, sel, p, zoom), Some(Handle::Corner(_)))
-        && selection_box(doc, sel).is_some_and(|c| c.iter().any(|c| (c.x - p.x).abs() <= reach && (c.y - p.y).abs() <= reach))
-}
-
-/// A box whose sides are both shorter than this on screen (pixels) would be covered by its
-/// handles: the canvas draws just its outline (the handles still answer just outside it).
-pub const SMALL_BOX_PX: f64 = 16.0;
-
-/// The shorter and longer sides, in screen pixels, of the box with `corners` (tl, tr, br, bl).
-pub fn box_sides_px(corners: &[Point; 4], zoom: f64) -> (f64, f64) {
-    let [a, b, _, d] = corners;
-    let (w, h) = ((*b - *a).hypot() * zoom, (*d - *a).hypot() * zoom);
-    (w.min(h), w.max(h))
-}
-
-/// Which handle of the box with `corners` (tl, tr, br, bl in page coordinates) is under `p`;
-/// `is_line` keeps only the two end handles.
-pub fn handle_at_corners(corners: &[Point; 4], p: Point, zoom: f64, is_line: bool) -> Option<Handle> {
-    let tol = HANDLE_PX / zoom.max(1e-6);
-    // Inside the box, handles reach in at most a quarter of its shorter side, so that a press in
-    // the middle of a small layer moves it; outside it they reach as far as ever.
-    let inner = if !is_line && in_quad(corners, p) { box_sides_px(corners, zoom).0 / 4.0 / zoom.max(1e-6) } else { f64::INFINITY };
-    let (corner_reach, edge_reach) = ((tol * 1.6).min(inner), tol.min(inner));
-    // The nearest corner, then the nearest edge, in reach (a small box's reaches overlap).
-    let nearest = |hits: &mut dyn Iterator<Item = (f64, Handle)>| hits.min_by(|a, b| a.0.total_cmp(&b.0)).map(|(_, h)| h);
-    let corner = nearest(
-        &mut corners
-            .iter()
-            .enumerate()
-            .filter(|(i, _)| !(is_line && *i >= 2))
-            .map(|(i, c)| ((*c - p).hypot(), Handle::Corner(i as u8)))
-            .filter(|(d, _)| *d <= corner_reach),
-    );
-    if corner.is_some() {
-        return corner;
-    }
-    if !is_line {
-        use figcraft_geom::kurbo::ParamCurveNearest;
-        let edge = nearest(&mut (0..4).filter_map(|i| {
-            let (a, b) = (corners.get(i)?, corners.get((i + 1) % 4)?);
-            let near = figcraft_geom::kurbo::Line::new(*a, *b).nearest(p, 0.001);
-            let d = near.distance_sq.sqrt();
-            (d <= edge_reach && near.t > 0.05 && near.t < 0.95).then_some((d, Handle::Edge(i as u8)))
-        }));
-        if edge.is_some() {
-            return edge;
-        }
-    }
-    // Rotation zones: just outside each corner.
-    let center = Point::new(corners.iter().map(|c| c.x).sum::<f64>() / 4.0, corners.iter().map(|c| c.y).sum::<f64>() / 4.0);
-    let rot = ROTATE_PX / zoom.max(1e-6);
-    for (i, c) in corners.iter().enumerate() {
-        let d = (*c - p).hypot();
-        let outward = (p - *c).dot(*c - center) > 0.0;
-        if d <= rot && d > tol && outward {
-            return Some(Handle::Rotate(i as u8));
-        }
-    }
-    None
-}
-
-fn resize_cursor(doc: &Document, sel: &[NodeId], h: Handle) -> Cursor {
-    selection_box(doc, sel).map_or(Cursor::Default, |c| handle_cursor(&c, h))
-}
-
-/// The cursor over handle `h` of the box with corners `c`.
-pub(crate) fn handle_cursor(c: &[Point; 4], h: Handle) -> Cursor {
-    let angle = |a: Point, b: Point| (b - a).atan2().to_degrees();
-    match h {
-        Handle::Corner(i) => {
-            let a = c.get(i as usize).copied().unwrap_or_default();
-            let b = c.get((i as usize + 2) % 4).copied().unwrap_or_default();
-            // Along the box's own axes at 45°, not the diagonal, so wide or tall boxes still get a
-            // diagonal cursor. A box with no width or height falls back to the diagonal.
-            let unit = |v: figcraft_geom::kurbo::Vec2| {
-                let len = v.hypot();
-                (len.is_finite() && len > 1e-9).then(|| v / len)
-            };
-            let next = c.get((i as usize + 1) % 4).copied().unwrap_or_default();
-            let prev = c.get((i as usize + 3) % 4).copied().unwrap_or_default();
-            match (unit(next - a), unit(prev - a)) {
-                (Some(u), Some(v)) => Cursor::Resize((u + v).atan2().to_degrees()),
-                _ => Cursor::Resize(angle(a, b)),
-            }
-        }
-        Handle::Edge(i) => {
-            let a = c.get(i as usize).copied().unwrap_or_default();
-            let b = c.get((i as usize + 1) % 4).copied().unwrap_or_default();
-            Cursor::Resize(angle(a, b) + 90.0)
-        }
-        Handle::Rotate(i) => {
-            let centre = Point::new(c.iter().map(|p| p.x).sum::<f64>() / 4.0, c.iter().map(|p| p.y).sum::<f64>() / 4.0);
-            Cursor::Rotate(angle(centre, c.get(i as usize).copied().unwrap_or_default()))
-        }
-    }
-}
-
-/// The box (x0, y0, x1, y1) a `w0`×`h0` handle box becomes when `handle` is dragged to `q`, all in
-/// the box's own axes: `keep` constrains proportions, `from_center` resizes about the centre (the
-/// opposite side mirrors the dragged one). Edges that cross over come back reversed (x1 < x0 or
-/// y1 < y0: a flip).
-pub(crate) fn resized_box(handle: Handle, q: Point, w0: f64, h0: f64, keep: bool, from_center: bool) -> (f64, f64, f64, f64) {
-    let (mut x0, mut y0, mut x1, mut y1) = (0.0, 0.0, w0, h0);
-    // The dragged sides: x0 or x1 (`Some(false)` / `Some(true)`), y0 or y1.
-    let (sx, sy) = match handle {
-        Handle::Corner(0) => (Some(false), Some(false)),
-        Handle::Corner(1) => (Some(true), Some(false)),
-        Handle::Corner(2) => (Some(true), Some(true)),
-        Handle::Corner(_) => (Some(false), Some(true)),
-        Handle::Edge(0) => (None, Some(false)),
-        Handle::Edge(1) => (Some(true), None),
-        Handle::Edge(2) => (None, Some(true)),
-        Handle::Edge(_) => (Some(false), None),
-        Handle::Rotate(_) => (None, None),
-    };
-    match sx {
-        Some(false) => (x0, x1) = (q.x, if from_center { w0 - q.x } else { w0 }),
-        Some(true) => (x0, x1) = (if from_center { w0 - q.x } else { 0.0 }, q.x),
-        None => {}
-    }
-    match sy {
-        Some(false) => (y0, y1) = (q.y, if from_center { h0 - q.y } else { h0 }),
-        Some(true) => (y0, y1) = (if from_center { h0 - q.y } else { 0.0 }, q.y),
-        None => {}
-    }
-    if keep && w0 > 1e-9 && h0 > 1e-9 && !matches!(handle, Handle::Rotate(_)) {
-        // One factor for both axes: the dragged axis's (a corner: the one that moved the most),
-        // about the point that stays put (the opposite handle, or the centre).
-        let (kx, ky) = ((x1 - x0) / w0, (y1 - y0) / h0);
-        let k = match (sx, sy) {
-            (None, _) => ky,
-            (_, None) => kx,
-            _ if kx.abs() > ky.abs() => kx,
-            _ => ky,
-        };
-        let pivot = if from_center { Point::new(w0 / 2.0, h0 / 2.0) } else { handle_point(opposite(handle), w0, h0) };
-        (x0, x1) = (pivot.x * (1.0 - k), pivot.x + (w0 - pivot.x) * k);
-        (y0, y1) = (pivot.y * (1.0 - k), pivot.y + (h0 - pivot.y) * k);
-    }
-    (x0, y0, x1, y1)
-}
-
-/// A handle's point in its box's axes (`w0`×`h0`): a corner or an edge's middle.
-fn handle_point(h: Handle, w0: f64, h0: f64) -> Point {
-    match h {
-        Handle::Corner(0) | Handle::Rotate(0) => Point::new(0.0, 0.0),
-        Handle::Corner(1) | Handle::Rotate(1) => Point::new(w0, 0.0),
-        Handle::Corner(2) | Handle::Rotate(2) => Point::new(w0, h0),
-        Handle::Corner(_) | Handle::Rotate(_) => Point::new(0.0, h0),
-        Handle::Edge(0) => Point::new(w0 / 2.0, 0.0),
-        Handle::Edge(1) => Point::new(w0, h0 / 2.0),
-        Handle::Edge(2) => Point::new(w0 / 2.0, h0),
-        Handle::Edge(_) => Point::new(0.0, h0 / 2.0),
-    }
-}
-
-/// Anchor `(column, row)` of a `w`×`h` box, in its axes.
-fn anchor_in_box(anchor: (u8, u8), w: f64, h: f64) -> Point {
-    Point::new(w * f64::from(anchor.0.min(2)) / 2.0, h * f64::from(anchor.1.min(2)) / 2.0)
-}
-
-/// The Scale tool's anchor point on the selection's handle box, in page coordinates.
-pub fn scale_anchor_point(doc: &Document, sel: &[NodeId], anchor: (u8, u8)) -> Option<Point> {
-    let (f, w, h) = selection_frame(doc, sel)?;
-    Some(f * anchor_in_box(anchor, w, h))
-}
-
-/// The handle across the box from `h`.
-fn opposite(h: Handle) -> Handle {
-    match h {
-        Handle::Corner(i) => Handle::Corner((i + 2) % 4),
-        Handle::Edge(i) => Handle::Edge((i + 2) % 4),
-        Handle::Rotate(i) => Handle::Rotate((i + 2) % 4),
-    }
-}
-
-/// The Scale tool's factor and pivot (in the box's axes) for dragging `handle` of a `w0`×`h0` box
-/// to `q`. The pivot is the anchor point (`anchor`: column, row), or the opposite handle when the
-/// anchor lies on the side being dragged, or the centre (`from_center`). Corners follow the axis
-/// that moved the most; a negative factor flips. None when the box has no size to scale by.
-pub(crate) fn scale_factor(handle: Handle, q: Point, w0: f64, h0: f64, anchor: (u8, u8), from_center: bool) -> Option<(f64, Point)> {
-    const EPS: f64 = 1e-9;
-    if !(q.x.is_finite() && q.y.is_finite() && w0.is_finite() && h0.is_finite()) || matches!(handle, Handle::Rotate(_)) {
-        return None;
-    }
-    let h = handle_point(handle, w0, h0);
-    let anchor_pt = anchor_in_box(anchor, w0, h0);
-    // The axes the handle moves along.
-    let (ax_x, ax_y) = match handle {
-        Handle::Edge(0) | Handle::Edge(2) => (false, true),
-        Handle::Edge(_) => (true, false),
-        _ => (true, true),
-    };
-    let on_side = (ax_x && (anchor_pt.x - h.x).abs() < EPS) || (ax_y && (anchor_pt.y - h.y).abs() < EPS);
-    let pivot = if from_center {
-        Point::new(w0 / 2.0, h0 / 2.0)
-    } else if on_side {
-        handle_point(opposite(handle), w0, h0)
-    } else {
-        anchor_pt
-    };
-    let ratio = |on: bool, to: f64, from: f64, p: f64| (on && (from - p).abs() > EPS).then(|| (to - p) / (from - p));
-    let kx = ratio(ax_x, q.x, h.x, pivot.x);
-    let ky = ratio(ax_y, q.y, h.y, pivot.y);
-    let k = match (kx, ky) {
-        (Some(a), Some(b)) => {
-            if a.abs() > b.abs() {
-                a
-            } else {
-                b
-            }
-        }
-        (Some(a), None) | (None, Some(a)) => a,
-        (None, None) => return None,
-    };
-    if !k.is_finite() {
-        return None;
-    }
-    // Never collapse to nothing (or blow up past a usable size); 0 counts as positive.
-    Some((k.signum() * k.abs().clamp(0.01, 1000.0), pivot))
-}
-
-impl Session {
-    /// What a marquee starting at page point `p` selects inside: the top-level frame it starts in
-    /// (its children), or the focus view's frame.
-    pub(crate) fn marquee_within(&self, p: Point) -> Result<Option<NodeId>> {
-        let (doc, page) = (self.doc()?, self.page()?);
-        let within = frame_at(doc, page, p, &[]).filter(|f| doc.node(*f).is_some_and(|n| n.parent == Some(page)));
-        let within = within.filter(|f| doc.world_bounds(*f).is_some_and(|b| b.contains(p)));
-        Ok(self.ds()?.focused().or(within))
-    }
-
-    /// The selection a marquee over page rect `r` makes from `base` (what was selected before):
-    /// the layers it touches (`deep`: nested ones too); `additive` (Shift) toggles them.
-    pub(crate) fn marquee_selection(&self, r: Rect, within: Option<NodeId>, deep: bool, base: &[NodeId], additive: bool) -> Result<Vec<NodeId>> {
-        let (doc, page) = (self.doc()?, self.page()?);
-        let mut hits =
-            if deep { figcraft_doc::geometry::marquee_deep(doc, page, r) } else { figcraft_doc::geometry::marquee_select(doc, page, r, within) };
-        if let Some(f) = self.ds()?.focused() {
-            hits.retain(|h| *h != f && doc.is_ancestor(f, *h));
-        }
-        // A marquee over a frame from outside selects the frame only when it covers it fully.
-        if within.is_none() && !deep {
-            hits.retain(|h| {
-                let full = doc.world_bounds(*h).is_some_and(|b| r.contains(b.origin()) && r.contains(Point::new(b.x1, b.y1)));
-                full || !doc.node(*h).is_some_and(|n| n.kind.is_frame_like() || matches!(n.kind, NodeKind::Section { .. }))
-            });
-        }
-        // Shift toggles: what was selected and is touched again comes out.
-        let mut sel: Vec<NodeId> = base.iter().copied().filter(|b| !(additive && hits.contains(b))).collect();
-        for h in hits {
-            if !base.contains(&h) && !sel.contains(&h) {
-                sel.push(h);
-            }
-        }
-        Ok(sel)
-    }
-
-    pub fn set_tool(&mut self, t: ToolId) {
-        if self.tool.tool == ToolId::Pen && t != ToolId::Pen {
-            let _ = self.pen_finish();
-        }
-        if !matches!(t, ToolId::Move | ToolId::Scale | ToolId::Hand) && self.ds().is_ok_and(|d| d.vector_edit.is_some()) {
-            let _ = crate::vectoredit::end(self);
-        }
-        self.tool.tool = t;
-        self.tool.gesture = Gesture::None;
-        // The tool's cursor shows before the pointer moves.
-        self.tool.overlay =
-            Overlay { builder_remove: self.tool.builder_remove && t == ToolId::ShapeBuilder, cursor: t.cursor(), ..Overlay::default() };
-        self.tool.shape_builder = None;
-        if t == ToolId::ShapeBuilder {
-            // Regions show straight away, before the pointer moves.
-            let sel = self.selection();
-            let _ = crate::shapebuilder::arrangement(self, &sel);
-        }
-        if let Ok(ds) = self.ds_mut() {
-            if t != ToolId::Text && t != ToolId::Move {
-                ds.text_edit = None;
-            }
-            ds.revision += 1;
-        }
-    }
-
-    /// Feed one pointer event to the current tool.
-    pub fn pointer(&mut self, ev: &PointerEvent) -> Result<()> {
-        // A held button sends the same move every frame: running the gesture again would only
-        // rebuild the same preview (a new document, and a canvas render, every frame).
-        if ev.kind != PointerKind::Move {
-            self.tool.last_move = None;
-        } else if self.tool.busy() {
-            if self.tool.last_move.as_ref() == Some(ev) {
-                return Ok(());
-            }
-            self.tool.last_move = Some(ev.clone());
-        }
-        let tool = self.tool.tool;
-        if matches!(tool, ToolId::Move | ToolId::Scale) && self.origin_pointer(ev)? {
-            return Ok(());
-        }
-        if matches!(tool, ToolId::Move | ToolId::Scale) && self.ds().is_ok_and(|d| d.vector_edit.is_some()) && self.vector_pointer(ev)? {
-            return Ok(());
-        }
-        if tool == ToolId::ShapeBuilder {
-            return self.shape_builder_pointer(ev);
-        }
-        match ev.kind {
-            PointerKind::Hover => self.hover(ev),
-            PointerKind::Down => match tool {
-                ToolId::Move | ToolId::Scale => {
-                    // A click on the canvas deselects a ruler guide (the UI selects guides itself).
-                    self.ds_mut()?.guide = None;
-                    self.move_down(ev)
-                }
-                ToolId::Hand => {
-                    let v = &self.ds()?.view;
-                    self.tool.gesture = Gesture::Pan { sx: ev.sx, sy: ev.sy, cx: v.cx, cy: v.cy };
-                    self.tool.overlay.cursor = Cursor::Grabbing;
-                    Ok(())
-                }
-                ToolId::Text => self.text_down(ev),
-                ToolId::Pen => self.pen_down(ev),
-                ToolId::Pencil => {
-                    self.tool.gesture = Gesture::Pencil { points: vec![ev.p()], pressure: vec![ev.pressure] };
-                    Ok(())
-                }
-                ToolId::Comment => {
-                    self.request_ui("comment.new", json!({"x": ev.x, "y": ev.y}));
-                    Ok(())
-                }
-                ToolId::Eyedropper => self.eyedrop(ev),
-                t if t.draws_shape() => self.draw_down(ev),
-                _ => Ok(()),
-            },
-            PointerKind::Move => self.drag(ev),
-            PointerKind::Up => self.up(ev),
-            PointerKind::DoubleClick => self.double_click(ev),
-        }
-    }
-
-    /// The rotation origin handle while it shows: a press drags it, a double-click puts it back
-    /// at the centre. True when the event was the handle's.
-    fn origin_pointer(&mut self, ev: &PointerEvent) -> Result<bool> {
-        let dragging = matches!(self.tool.gesture, Gesture::Origin);
-        if !dragging && !self.ds()?.on_origin_handle(ev.p(), ev.zoom) {
-            return Ok(false);
-        }
-        match ev.kind {
-            PointerKind::Down if !dragging => self.tool.gesture = Gesture::Origin,
-            PointerKind::Move if dragging => self.drag_origin_to(ev.p(), ev.zoom)?,
-            PointerKind::Up if dragging => self.tool.gesture = Gesture::None,
-            PointerKind::DoubleClick => self.set_rotation_origin(None)?,
-            PointerKind::Hover => {}
-            _ => return Ok(false),
-        }
-        self.tool.overlay.cursor = Cursor::Move;
-        Ok(true)
-    }
-
-    fn hover(&mut self, ev: &PointerEvent) -> Result<()> {
-        let tool = self.tool.tool;
-        let ds = self.ds()?;
-        let (doc, sel, page) = (ds.doc.clone(), ds.selection.clone(), ds.page);
-        let mut cursor = tool.cursor();
-        // The text being edited, and with the Text tool any text, takes the I-beam: a click there
-        // puts the caret.
-        let on_edited = ds
-            .text_edit
-            .as_ref()
-            .is_some_and(|te| doc.world_bounds(te.id).is_some_and(|b| b.inflate(ev.tol() * 4.0, ev.tol() * 4.0).contains(ev.p())));
-        let on_text =
-            |s: &Self| s.hit(&doc, page, ev.p(), ev.tol() * 2.0).and_then(|l| doc.node(l)).is_some_and(|n| matches!(n.kind, NodeKind::Text(_)));
-        if tool == ToolId::Text && (on_edited || on_text(self)) {
-            cursor = Cursor::Text;
-        }
-        let mut hover = None;
-        let mut guides = Vec::new();
-        let mut measure_box = None;
-        let arc_hover = if self.arc_handles_shown() { crate::arc_handles::hit(&doc, &sel, ev.p(), ev.zoom).map(|(_, h)| h) } else { None };
-        self.tool.overlay.arc_hover = arc_hover;
-        let shape_hover = if self.arc_handles_shown() && !on_corner_square(&doc, &sel, ev.p(), ev.zoom) {
-            crate::shape_handles::hit(&doc, &sel, ev.p(), ev.zoom).map(|(_, h)| h)
-        } else {
-            None
-        };
-        self.tool.overlay.shape_hover = shape_hover;
-        if matches!(tool, ToolId::Move | ToolId::Scale) && on_edited {
-            cursor = Cursor::Text;
-        } else if matches!(tool, ToolId::Move | ToolId::Scale) && arc_hover.is_none() && shape_hover.is_none() {
-            if let Some(h) = handle_at(&doc, &sel, ev.p(), ev.zoom) {
-                cursor = resize_cursor(&doc, &sel, h);
-            } else {
-                let leaf = self.hit(&doc, page, ev.p(), ev.tol() * 2.0);
-                if leaf.and_then(|l| crate::widgets::target_at(&doc, l, ev.p())).is_some() {
-                    cursor = Cursor::Pointer;
-                }
-                hover = label_at(&doc, page, &self.tool.labels, ev.p()).or_else(|| leaf.map(|leaf| select_target(&doc, leaf, &sel, ev.cmd)));
-                // Alt over a selected layer: a drag from here duplicates it.
-                if ev.alt && tool == ToolId::Move && hover.is_some_and(|h| sel.contains(&h) && !locked_in(&doc, h)) {
-                    cursor = Cursor::Copy;
-                }
-                if ev.alt || self.tool.redlines {
-                    use crate::distance::{Hover, guide_at, hover_lines, padding_frame, parent_of};
-                    // Shift+Alt over an auto layout frame: its padding and gaps. Otherwise from the
-                    // selection to a ruler guide, the hovered layer or (over empty canvas) the parent.
-                    let around: Vec<NodeId> = sel.iter().copied().chain(hover).collect();
-                    let what = hover.filter(|_| ev.alt && ev.shift).and_then(|t| padding_frame(&doc, t)).map(Hover::Padding).or_else(|| {
-                        if sel.is_empty() {
-                            return None;
-                        }
-                        let guide = guide_at(&doc, page, &around, ev.p(), ev.tol() * 4.0).map(|(vertical, at)| Hover::Guide { vertical, at });
-                        guide.or_else(|| hover.or_else(|| parent_of(&doc, page, &sel)).map(Hover::Layer))
-                    });
-                    if let Some(what) = what {
-                        let (g, b) = hover_lines(&doc, page, &sel, what);
-                        guides = g;
-                        measure_box = b.map(|b| [b.x0, b.y0, b.x1, b.y1]);
-                    }
-                }
-            }
-        }
-        self.tool.overlay.measure_box = measure_box;
-        self.tool.overlay.cursor = cursor;
-        if tool == ToolId::Pen {
-            // Where a click would land (snapped), with its guides.
-            let (to, g) = if ev.shift { (ev.p(), Vec::new()) } else { self.snap_pen_tool(ev)? };
-            guides = g;
-            self.tool.overlay.cursor = Cursor::Pen(self.pen_cursor(&doc, &sel, to, ev.zoom));
-            if let Some((last, _, out)) = self.tool.pen.as_ref().and_then(|pen| pen.points.last()) {
-                self.tool.overlay.rubber = Some([last.x, last.y, to.x, to.y]);
-                self.tool.overlay.rubber_handle = (out.hypot() > 0.0).then_some([last.x + out.x, last.y + out.y]);
-            }
-        }
-        self.tool.overlay.guides = guides;
-        let ds = self.ds_mut()?;
-        if ds.hover != hover {
-            ds.hover = hover;
-            ds.revision += 1;
-        }
-        Ok(())
-    }
-
-    /// What a click with the Pen tool at `p` (where it snaps) would do: close the path on its first
-    /// point, connect to another of its points, go on from a selected open path's end, or add a
-    /// new point (the same tests as [`Self::pen_down`]).
-    fn pen_cursor(&self, doc: &Document, sel: &[NodeId], p: Point, zoom: f64) -> PenCursor {
-        let near = |q: &Point| (*q - p).hypot() * zoom < 8.0;
-        let on_point = match &self.tool.pen {
-            None => selected_end_at(doc, sel, p, 8.0 / zoom.max(1e-6)).is_some(),
-            Some(pen) => {
-                let n = pen.points.len();
-                (n > 2 && pen.points.first().is_some_and(|(q, _, _)| near(q)))
-                    || (1..n.saturating_sub(1)).any(|k| pen.points.get(k).is_some_and(|(q, _, _)| near(q)))
-            }
-        };
-        if on_point { PenCursor::Close } else { PenCursor::New }
-    }
-
-    /// Whether what the gesture did to `ids` so far is an edit only a main component can make
-    /// (`moved`: their place among the layers counts too): it is undone when the gesture ends.
-    fn refused(&self, ids: &[NodeId], moved: bool) -> bool {
-        let Ok(ds) = self.ds() else { return false };
-        ds.interaction.as_ref().is_some_and(|it| {
-            ids.iter().any(|m| {
-                (moved && !crate::components::move_allowed(&it.doc, &ds.doc, *m))
-                    || crate::components::refused_override(&it.doc, &ds.doc, *m).is_some()
-            })
-        })
-    }
-
-    fn move_down(&mut self, ev: &PointerEvent) -> Result<()> {
-        let ds = self.ds()?;
-        let (doc, sel, page) = (ds.doc.clone(), ds.selection.clone(), ds.page);
-        // Clicking outside the text being edited ends editing.
-        if let Some(te) = ds.text_edit.clone() {
-            let inside = doc.world_bounds(te.id).is_some_and(|b| b.inflate(ev.tol() * 4.0, ev.tol() * 4.0).contains(ev.p()));
-            if inside {
-                return self.text_click(te.id, ev, ev.shift);
-            }
-            textedit::end(self)?;
-        }
-        // Handles first: a selected ellipse's arc handles (drawn over the box), then the box's.
-        if self.arc_handles_shown()
-            && let Some((id, handle)) = crate::arc_handles::hit(&doc, &sel, ev.p(), ev.zoom)
-            && let Some(arc) = crate::arc_handles::arc_of(&doc, id)
-        {
-            self.begin_interaction("Arc")?;
-            self.tool.gesture = Gesture::Arc { id, handle, arc };
-            self.tool.overlay.arc =
-                crate::arc_handles::handle_at(&doc, id, handle, arc, ev.zoom).map(|at| ArcHint { handle, label: arc.label(handle), at });
-            return Ok(());
-        }
-        if self.arc_handles_shown()
-            && !on_corner_square(&doc, &sel, ev.p(), ev.zoom)
-            && let Some((id, handle)) = crate::shape_handles::hit(&doc, &sel, ev.p(), ev.zoom)
-        {
-            self.begin_interaction("Corner radius")?;
-            self.tool.gesture = Gesture::Shape { id, handle };
-            self.tool.overlay.shape = shape_hint(&doc, id, handle, ev.zoom);
-            return Ok(());
-        }
-        if let Some(h) = handle_at(&doc, &sel, ev.p(), ev.zoom) {
-            let ids = roots(&doc, &sel);
-            if let Handle::Rotate(_) = h {
-                let Some(b) = selection_box(&doc, &ids) else { return Ok(()) };
-                let center = self
-                    .ds()?
-                    .moved_origin()
-                    .unwrap_or_else(|| Point::new(b.iter().map(|c| c.x).sum::<f64>() / 4.0, b.iter().map(|c| c.y).sum::<f64>() / 4.0));
-                self.begin_interaction("Rotate")?;
-                self.tool.gesture = Gesture::Rotate { center, start_angle: (ev.p() - center).atan2(), ids };
-                return Ok(());
-            }
-            let nodes: Vec<(NodeId, Affine, f64, f64)> =
-                ids.iter().filter_map(|i| doc.node(*i).map(|n| (*i, doc.world_transform(*i), n.width, n.height))).collect();
-            let Some(frame) = selection_frame(&doc, &ids) else { return Ok(()) };
-            let single = ids.len() == 1;
-            self.begin_interaction(if self.tool.tool == ToolId::Scale { "Scale" } else { "Resize" })?;
-            self.tool.gesture = Gesture::Resize {
-                start: ev.p(),
-                r: Box::new(ResizeStart { nodes, frame, single, handle: h }),
-                scale_tool: self.tool.tool == ToolId::Scale,
-                moved: false,
-            };
-            return Ok(());
-        }
-        // A frame's name label picks the frame itself. The background of a top-level frame with
-        // layers in it is like the canvas (a press starts a marquee inside it) unless the frame is
-        // selected; an empty frame (or a widget) is picked and dragged.
-        let board_background = |leaf: NodeId| {
-            !sel.contains(&leaf)
-                && doc
-                    .node(leaf)
-                    .is_some_and(|n| n.parent == Some(page) && n.kind.is_frame_like() && !n.children.is_empty() && !crate::widgets::is_widget(n))
-        };
-        let target = label_at(&doc, page, &self.tool.labels, ev.p()).or_else(|| {
-            self.hit(&doc, page, ev.p(), ev.tol() * 2.0)
-                .filter(|leaf| ev.cmd || !board_background(*leaf))
-                .map(|leaf| select_target(&doc, leaf, &sel, ev.cmd))
-        });
-        match target {
-            Some(target) => {
-                // Clicking inside the current selection's box keeps it (drag them all).
-                let in_sel_box = sel.len() > 1 && doc.bounds_of(&sel).is_some_and(|b| b.contains(ev.p())) && !ev.shift;
-                let new_sel = if in_sel_box && (sel.contains(&target) || sel.iter().any(|s| doc.is_ancestor(*s, target))) {
-                    sel.clone()
-                } else if ev.shift {
-                    let mut s2 = sel.clone();
-                    if let Some(pos) = s2.iter().position(|x| *x == target) {
-                        s2.remove(pos);
-                    } else {
-                        s2.push(target);
-                    }
-                    s2
-                } else if sel.contains(&target) {
-                    sel.clone()
-                } else {
-                    vec![target]
-                };
-                self.set_selection(new_sel.clone());
-                if new_sel.is_empty() || doc.node(target).is_some_and(|n| n.locked) {
-                    return Ok(());
-                }
-                // Locked layers selected in the layers panel stay put.
-                let ids: Vec<NodeId> = roots(&doc, &new_sel).into_iter().filter(|i| !locked_in(&doc, *i)).collect();
-                if ids.is_empty() {
-                    return Ok(());
-                }
-                let mut targets = Targets::gather(&doc, page, &ids);
-                // A copy dragged out with Alt snaps to the layers it came from too (they stay put).
-                if ev.alt
-                    && let Some(b) = targets.moving
-                {
-                    targets.add_box(b);
-                }
-                self.begin_interaction(if ev.alt { "Duplicate" } else { "Move" })?;
-                self.tool.gesture = Gesture::Move { start: ev.p(), ids, targets, duplicate: ev.alt, moved: false };
-                self.tool.overlay.cursor = if ev.alt { Cursor::Copy } else { Cursor::Default };
-            }
-            None => {
-                let within = self.marquee_within(ev.p())?;
-                if !ev.shift {
-                    self.set_selection(vec![]);
-                }
-                self.tool.gesture = Gesture::Marquee { start: ev.p(), additive: ev.shift, base: if ev.shift { sel } else { vec![] }, within };
-            }
-        }
-        Ok(())
-    }
-
-    fn drag(&mut self, ev: &PointerEvent) -> Result<()> {
-        let g = std::mem::take(&mut self.tool.gesture);
-        let res = match &g {
-            Gesture::None => return self.hover(ev),
-            Gesture::Marquee { start, additive, base, within } => {
-                let r = Rect::from_points(*start, ev.p());
-                self.tool.overlay.marquee = Some([r.x0, r.y0, r.x1, r.y1]);
-                // Cmd/Ctrl: the nested layers it touches.
-                let sel = self.marquee_selection(r, *within, ev.cmd, base, *additive)?;
-                self.set_selection(sel);
-                Ok(())
-            }
-            Gesture::Move { start, moved: false, .. } | Gesture::Resize { start, moved: false, .. } if within_slop(ev, *start) => Ok(()),
-            Gesture::Move { start, ids, targets, duplicate, .. } => {
-                let mut d = ev.p() - *start;
-                if ev.shift {
-                    if d.x.abs() > d.y.abs() {
-                        d.y = 0.0;
-                    } else {
-                        d.x = 0.0;
-                    }
-                }
-                // Cmd/Ctrl (and Control on macOS) held while dragging suspends snapping.
-                let snap_on = self.ds().map(|ds| ds.view.snap_objects).unwrap_or(true) && !ev.cmd && !ev.ctrl;
-                let mut guides = Vec::new();
-                if snap_on {
-                    let (c, g2) = targets.snap_move(d, SNAP_PX / ev.zoom.max(1e-6));
-                    d += c;
-                    guides = g2;
-                }
-                if self.ds().map(|ds| ds.view.snap_pixel).unwrap_or(true) {
-                    // Keep the box's origin on whole pixels (a rotated parent frame's, inside one).
-                    d = targets.round_move(d);
-                }
-                let ids = ids.clone();
-                let dup = *duplicate;
-                let page = self.page()?;
-                let mut drop_cell = None;
-                let mut drop_target = None;
-                let mut in_flow = false;
-                // Placed in a row or column: (is it a column, its gap) for the insertion line.
-                let mut slot_axis: Option<(bool, f64)> = None;
-                self.preview(|doc, sel| {
-                    let mut moving = ids.clone();
-                    if dup {
-                        let mut copies = Vec::new();
-                        for i in &ids {
-                            let parent = doc.get(*i)?.parent.unwrap_or(page);
-                            let idx = doc.index_in_parent(*i).map(|x| x + 1);
-                            copies.push(doc.duplicate_into(*i, parent, idx)?);
-                        }
-                        moving = copies;
-                        *sel = moving.clone();
-                    }
-                    let p = ev.p();
-                    let home = moving.first().and_then(|i| doc.node(*i)).and_then(|n| n.parent);
-                    // Absolute children of an auto layout frame stay in it, and so do the layers of
-                    // groups, boolean groups and instances ([`crate::drop::keeps_layers`]); the
-                    // rest may change parent.
-                    let flow = moving.iter().all(|i| doc.node(*i).is_some_and(|n| !n.child_layout.absolute))
-                        && !home.is_some_and(|h| crate::drop::keeps_layers(doc, h));
-                    let target = if flow { crate::drop::drag_parent(doc, page, p, &moving) } else { home.unwrap_or(page) };
-                    let mode = doc.node(target).and_then(|n| n.layout.as_ref()).map(|l| l.mode);
-                    if let (true, Some(mode)) = (flow, mode) {
-                        // Into (or within) an auto layout frame: the layers take the slot (a grid: the
-                        // cell) under the pointer, as the frame shows it now. A frame other than the
-                        // one they come from is outlined too.
-                        let cell = if mode == LayoutMode::Grid { crate::drop::grid_cell_at(doc, target, p) } else { None };
-                        let idx =
-                            if mode == LayoutMode::Grid { 0 } else { crate::drop::auto_layout_slot(doc, target, p, &moving).map_or(0, |(i, _)| i) };
-                        for m in &moving {
-                            if doc.get(*m)?.parent != Some(target) {
-                                doc.reparent(*m, target, None)?;
-                            }
-                        }
-                        if let (Some(first), Some((col, row, rect))) = (moving.first().copied(), cell) {
-                            let cl = &mut doc.get_mut(first)?.child_layout;
-                            cl.grid_column = Some(col);
-                            cl.grid_row = Some(row);
-                            drop_cell = Some(rect);
-                        } else if mode != LayoutMode::Grid {
-                            let mut kids: Vec<NodeId> = doc.get(target)?.children.iter().copied().filter(|c| !moving.contains(c)).collect();
-                            for (k, m) in moving.iter().enumerate() {
-                                kids.insert((idx + k).min(kids.len()), *m);
-                            }
-                            let gap = doc.node(target).and_then(|n| n.layout.as_ref()).map_or(0.0, |l| l.gap);
-                            doc.get_mut(target)?.children = kids;
-                            slot_axis = Some((mode == LayoutMode::Vertical, gap));
-                        }
-                        drop_target = (Some(target) != home).then_some(target);
-                        in_flow = true;
-                        return Ok(());
-                    }
-                    // A free move. Layers dragged out of an auto layout flow leave it (onto the page
-                    // while dragging; the drop puts them in the frame under the pointer).
-                    for m in &moving {
-                        let in_al = doc.node(*m).and_then(|n| n.parent).and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some());
-                        if flow && in_al {
-                            doc.reparent(*m, page, None)?;
-                        }
-                        move_world(doc, *m, d.x, d.y)?;
-                    }
-                    drop_target = (flow && target != page).then_some(target);
-                    Ok(())
-                })?;
-                let placed = if dup { self.selection() } else { ids };
-                // Snapping guides mean nothing while the layout places the layers; with Alt held,
-                // live distances to the neighbours replace them.
-                self.tool.overlay.guides = if in_flow {
-                    Vec::new()
-                } else if ev.alt {
-                    let doc = self.doc()?;
-                    doc.bounds_of(&placed).map(|b| crate::distance::neighbours(doc, page, &placed, b)).unwrap_or_default()
-                } else {
-                    guides
-                };
-                // The preview already shows the layers in their slot: the line marks it there, in
-                // the middle of the gap before them (clear of the selection box).
-                self.tool.overlay.insert_line = slot_axis.and_then(|(vertical, gap)| {
-                    let off = if gap.is_finite() { (gap / 2.0).clamp(3.0, 24.0) } else { 3.0 };
-                    self.doc().ok()?.bounds_of(&placed).map(|b| crate::drop::line_before(b, vertical, off))
-                });
-                self.tool.overlay.drop_cell = drop_cell;
-                self.tool.overlay.drop_target = drop_target;
-                self.tool.overlay.cursor = if self.refused(&placed, true) {
-                    Cursor::NotAllowed
-                } else if dup {
-                    Cursor::Copy
-                } else {
-                    Cursor::Default
-                };
-                self.tool.gesture = g.clone();
-                if let Gesture::Move { moved, .. } = &mut self.tool.gesture {
-                    *moved = true;
-                }
-                return Ok(());
-            }
-            Gesture::Resize { start, r, scale_tool, .. } => {
-                let res = self.resize_drag(ev, *start, r, *scale_tool);
-                self.tool.gesture = Gesture::Resize { start: *start, r: r.clone(), scale_tool: *scale_tool, moved: true };
-                if self.refused(&self.selection(), false) {
-                    self.tool.overlay.cursor = Cursor::NotAllowed;
-                }
-                return res;
-            }
-            Gesture::Rotate { center, start_angle, ids } => {
-                let mut a = ((ev.p() - *center).atan2() - start_angle).to_degrees();
-                if ev.shift {
-                    a = (a / 15.0).round() * 15.0;
-                }
-                let (c, ids) = (*center, ids.clone());
-                self.preview(|doc, _| {
-                    for i in &ids {
-                        crate::cmd::arrange::rotate_world(doc, *i, c, -a)?;
-                    }
-                    Ok(())
-                })?;
-                // The cursor turns with the pointer about the centre.
-                self.tool.overlay.cursor =
-                    if self.refused(&ids, false) { Cursor::NotAllowed } else { Cursor::Rotate((ev.p() - c).atan2().to_degrees()) };
-                Ok(())
-            }
-            Gesture::Draw { start, id, parent, targets } => {
-                let (start, id, parent, targets) = (*start, *id, *parent, targets.clone());
-                self.tool.gesture = g;
-                return self.draw_drag(ev, start, id, parent, &targets);
-            }
-            Gesture::TextBox { id, start, line } => {
-                let (id, start, line) = (*id, *start, *line);
-                self.tool.gesture = g;
-                return self.text_box_drag(ev, id, start, line);
-            }
-            Gesture::Arc { id, handle, arc } => {
-                let (id, handle, arc) = (*id, *handle, *arc);
-                self.tool.gesture = g;
-                return self.arc_drag(ev, id, handle, arc);
-            }
-            Gesture::Shape { id, handle } => {
-                let (id, handle) = (*id, *handle);
-                let doc = self.doc()?.clone();
-                if let Some(props) = crate::shape_handles::drag(&doc, id, handle, ev.p(), ev.alt) {
-                    self.preview(|doc, _| crate::cmd::props::apply("node.set", doc, id, &props))?;
-                }
-                self.tool.overlay.shape = shape_hint(self.doc()?, id, handle, ev.zoom);
-                self.tool.overlay.shape_hover = Some(handle);
-                Ok(())
-            }
-            Gesture::Pan { sx, sy, cx, cy } => {
-                let ds = self.ds_mut()?;
-                let z = ds.view.zoom.max(1e-6);
-                ds.view.cx = cx - (ev.sx - sx) / z;
-                ds.view.cy = cy - (ev.sy - sy) / z;
-                ds.revision += 1;
-                Ok(())
-            }
-            Gesture::Pencil { points, pressure } => {
-                let (mut pts, mut pressure) = (points.clone(), pressure.clone());
-                if pts.last().is_none_or(|l| (*l - ev.p()).hypot() > 0.5 / ev.zoom.max(1e-6)) {
-                    pts.push(ev.p());
-                    pressure.push(ev.pressure);
-                }
-                self.tool.overlay.pen = pts.iter().map(|p| [p.x, p.y]).collect();
-                self.tool.gesture = Gesture::Pencil { points: pts, pressure };
-                if let Ok(ds) = self.ds_mut() {
-                    ds.revision += 1;
-                }
-                return Ok(());
-            }
-            Gesture::TextSelect { id } => {
-                let id = *id;
-                let idx = self.text_index_at(id, ev.p())?;
-                textedit::set_caret(self, idx, true)?;
-                Ok(())
-            }
-            Gesture::Vector(_) | Gesture::ShapeBuild { .. } | Gesture::Origin => Ok(()),
-            Gesture::PenDrag { anchor } => {
-                // A click's wobble pulls out no handle.
-                let out = if within_slop(ev, *anchor) { Vec2::ZERO } else { ev.p() - *anchor };
-                if let Some(pen) = self.tool.pen.as_mut()
-                    && let Some(last) = pen.points.last_mut()
-                {
-                    last.2 = out;
-                    last.1 = -out;
-                }
-                self.pen_update()?;
-                Ok(())
-            }
-        };
-        self.tool.gesture = g;
-        res
-    }
-
-    /// An arc handle drag: the new arc, written through `node.set`'s keys.
-    fn arc_drag(&mut self, ev: &PointerEvent, id: NodeId, handle: ArcHandle, arc: crate::arc_handles::Arc) -> Result<()> {
-        let doc = self.doc()?.clone();
-        let Some(next) = crate::arc_handles::drag(&doc, id, handle, arc, ev.p(), ev.shift, ev.zoom) else { return Ok(()) };
-        let props = crate::arc_handles::props(next);
-        self.preview(|doc, _| crate::cmd::props::apply("node.set", doc, id, &props))?;
-        self.tool.gesture = Gesture::Arc { id, handle, arc: next };
-        let at = crate::arc_handles::handle_at(self.doc()?, id, handle, next, ev.zoom);
-        self.tool.overlay.arc = at.map(|at| ArcHint { handle, label: next.label(handle), at });
-        self.tool.overlay.arc_hover = Some(handle);
-        Ok(())
-    }
-
-    fn resize_drag(&mut self, ev: &PointerEvent, start: Point, r: &ResizeStart, scale_tool: bool) -> Result<()> {
-        let page = self.page()?;
-        let snap = self.ds().map(|d| d.view.snap_objects).unwrap_or(true) && !ev.cmd && !ev.ctrl;
-        let ids: Vec<NodeId> = r.nodes.iter().map(|n| n.0).collect();
-        let targets = if snap { Some(Targets::gather(self.doc()?, page, &ids)) } else { None };
-        let mut p = ev.p();
-        let mut guides = Vec::new();
-        if let Some(t) = &targets {
-            let (dx, dy, g) = t.snap_point(p.x, p.y, SNAP_PX / ev.zoom.max(1e-6));
-            p.x += dx;
-            p.y += dy;
-            guides = g;
-        }
-        let _ = start;
-        // In the handle box's own axes (one layer: its local space).
-        let (frame, w0, h0) = r.frame;
-        // The pixel grid: an upright box's dragged sides land on whole pixels (the Scale tool
-        // scales by the factor as dragged).
-        if !scale_tool && self.ds().map(|d| d.view.snap_pixel).unwrap_or(true) && crate::guides::axis_aligned(frame) {
-            p = Point::new(p.x.round(), p.y.round());
-        }
-        let q = frame.inverse() * p;
-        let is_line = r.single && ids.first().and_then(|i| self.doc().ok()?.node(*i).map(|n| matches!(n.kind, NodeKind::Line))).unwrap_or(false);
-        if scale_tool {
-            return self.scale_drag(ev, r, q, guides);
-        }
-        if is_line {
-            // Line end handles: move the end point freely (length + angle).
-            let (a, b) = match r.handle {
-                Handle::Corner(0) => (p, frame * Point::new(w0, 0.0)),
-                _ => (frame * Point::new(0.0, 0.0), p),
-            };
-            let id = ids.first().copied().unwrap_or(NodeId(0));
-            self.preview(|doc, _| {
-                let mut v = b - a;
-                if ev.shift {
-                    let ang = (v.atan2() / (std::f64::consts::PI / 4.0)).round() * std::f64::consts::PI / 4.0;
-                    v = Vec2::from_angle(ang) * v.hypot();
-                }
-                let len = v.hypot();
-                let world = Affine::translate(a.to_vec2()) * Affine::rotate(v.atan2());
-                doc.set_world_transform(id, world)?;
-                figcraft_layout::set_size(doc, id, len, 0.0);
-                Ok(())
-            })?;
-            self.tool.overlay.guides = guides;
-            return Ok(());
-        }
-        // Constrain proportions (Shift, or the node's lock).
-        let keep = ev.shift || r.single && ids.first().and_then(|i| self.doc().ok()?.node(*i).map(|n| n.constrain_proportions)).unwrap_or(false);
-        let (x0, y0, x1, y1) = resized_box(r.handle, q, w0, h0, keep, ev.alt);
-        let (flip_x, flip_y) = (x1 < x0, y1 < y0);
-        let (nx0, ny0) = (x0.min(x1), y0.min(y1));
-        let (nw, nh) = ((x1 - x0).abs(), (y1 - y0).abs());
-        let nodes = r.nodes.clone();
-        let single = r.single;
-        let handle = r.handle;
-        // What's in a section stays where it is on the page, and so does what's in a frame resized
-        // with Cmd/Ctrl held (its constraints are ignored).
-        let keeps = |doc: &Document, id: NodeId| {
-            doc.node(id).is_some_and(|n| matches!(n.kind, NodeKind::Section { .. }) || (ev.cmd && single && n.kind.is_frame_like()))
-        };
-        self.preview(|doc, _| {
-            if single {
-                let Some((id, world, _, _)) = nodes.first() else { return Ok(()) };
-                let kept = if keeps(doc, *id) { crate::cmd::props::children_worlds(doc, *id) } else { Vec::new() };
-                let mut t = *world * Affine::translate((nx0, ny0));
-                if flip_x {
-                    t *= Affine::new([-1.0, 0.0, 0.0, 1.0, nw, 0.0]);
-                }
-                if flip_y {
-                    t *= Affine::new([1.0, 0.0, 0.0, -1.0, 0.0, nh]);
-                }
-                doc.set_world_transform(*id, t)?;
-                if kept.is_empty() {
-                    crate::cmd::props::resize_node(doc, *id, nw.max(0.01), nh.max(0.01))?;
-                } else {
-                    figcraft_layout::set_size(doc, *id, nw.max(0.01), nh.max(0.01));
-                    crate::cmd::props::restore_worlds(doc, &kept)?;
-                }
-                let n = doc.get_mut(*id)?;
-                if matches!(handle, Handle::Corner(_) | Handle::Edge(1) | Handle::Edge(3)) {
-                    n.child_layout.sizing_h = Sizing::Fixed;
-                }
-                if matches!(handle, Handle::Corner(_) | Handle::Edge(0) | Handle::Edge(2)) {
-                    n.child_layout.sizing_v = Sizing::Fixed;
-                }
-                if let NodeKind::Text(t) = &mut n.kind {
-                    t.auto_resize = match handle {
-                        Handle::Edge(1) | Handle::Edge(3) => TextAutoResize::Height,
-                        _ => TextAutoResize::None,
-                    };
-                }
-                return Ok(());
-            }
-            // Several layers: map the old box onto the new one, in the box's axes. Each layer's
-            // centre follows the box (mirrored when it flips); each keeps its rotation and scales
-            // along its own axes (see `axis_factors`), turning over with the box.
-            let (sx, sy) = (if w0 > 1e-9 { (x1 - x0) / w0 } else { 1.0 }, if h0 > 1e-9 { (y1 - y0) / h0 } else { 1.0 });
-            let mirror = Affine::new([sx.signum(), 0.0, 0.0, sy.signum(), 0.0, 0.0]);
-            let inv = frame.inverse();
-            for (id, world, w, h) in &nodes {
-                let local = inv * *world;
-                let center = local * Point::new(w / 2.0, h / 2.0);
-                let (kw, kh) = figcraft_layout::axis_factors(local, sx, sy);
-                let (w2, h2) = (w * kw, h * kh);
-                let lin = (mirror * local).with_translation(Vec2::ZERO);
-                let origin = Point::new(x0 + center.x * sx, y0 + center.y * sy) - lin * Point::new(w2 / 2.0, h2 / 2.0);
-                let kept = if keeps(doc, *id) { crate::cmd::props::children_worlds(doc, *id) } else { Vec::new() };
-                doc.set_world_transform(*id, frame * lin.with_translation(origin))?;
-                crate::cmd::props::resize_node(doc, *id, w2, h2)?;
-                crate::cmd::props::restore_worlds(doc, &kept)?;
-            }
-            Ok(())
-        })?;
-        self.tool.overlay.guides = guides;
-        Ok(())
-    }
-
-    /// Scale tool handle drag (`q`: the snapped pointer in the handle box's axes): everything
-    /// scales by one factor about the anchor point (Alt: the centre), strokes, effects, radii and
-    /// text included, children by the same factor whatever their constraints.
-    fn scale_drag(&mut self, ev: &PointerEvent, r: &ResizeStart, q: Point, guides: Vec<Guide>) -> Result<()> {
-        let (frame, w0, h0) = r.frame;
-        let Some((k, pivot)) = scale_factor(r.handle, q, w0, h0, self.tool.scale_anchor, ev.alt) else { return Ok(()) };
-        let nodes = r.nodes.clone();
-        let inv = frame.inverse();
-        // A layer's place in the box scales about the pivot; a negative factor turns it over.
-        let about = frame * Affine::translate(pivot.to_vec2() * (1.0 - k));
-        let sign = k.signum();
-        self.preview(|doc, _| {
-            for (id, world, _, _) in &nodes {
-                let c = (inv * *world).as_coeffs();
-                doc.set_world_transform(*id, about * Affine::new([sign * c[0], sign * c[1], sign * c[2], sign * c[3], k * c[4], k * c[5]]))?;
-                crate::cmd::arrange::scale_node(doc, *id, k.abs())?;
-            }
-            Ok(())
-        })?;
-        let p = frame * pivot;
-        self.tool.overlay.scale = Some(ScaleHint { factor: k, pivot: [p.x, p.y] });
-        self.tool.overlay.guides = guides;
-        Ok(())
-    }
-
-    fn draw_down(&mut self, ev: &PointerEvent) -> Result<()> {
-        let ds = self.ds()?;
-        let doc = ds.doc.clone();
-        let page = ds.page;
-        if ds.text_edit.is_some() {
-            textedit::end(self)?;
-        }
-        // Frames drawn inside frames nest; sections only at the top or in sections.
-        let parent = match self.tool.tool {
-            ToolId::Section => {
-                frame_at(&doc, page, ev.p(), &[]).filter(|f| doc.node(*f).is_some_and(|n| matches!(n.kind, NodeKind::Section { .. }))).unwrap_or(page)
-            }
-            _ => frame_at(&doc, page, ev.p(), &[]).unwrap_or(page),
-        };
-        let targets = Targets::gather(&doc, page, &[]);
-        self.begin_interaction(self.tool.tool.label())?;
-        self.tool.gesture = Gesture::Draw { start: ev.p(), id: None, parent, targets };
-        Ok(())
-    }
-
-    fn draw_drag(&mut self, ev: &PointerEvent, start: Point, id: Option<NodeId>, parent: NodeId, targets: &Targets) -> Result<()> {
-        let tool = self.tool.tool;
-        let mut p = ev.p();
-        let mut guides = Vec::new();
-        if self.ds().map(|d| d.view.snap_objects).unwrap_or(true) && !ev.cmd && !ev.ctrl {
-            let (dx, dy, g) = targets.snap_point(p.x, p.y, SNAP_PX / ev.zoom.max(1e-6));
-            p.x += dx;
-            p.y += dy;
-            guides = g;
-        }
-        let pixel = self.ds().map(|d| d.view.snap_pixel).unwrap_or(true);
-        let mut created = id;
-        let page = self.page()?;
-        self.preview(|doc, sel| {
-            let (mut a, mut b) = (start, p);
-            if pixel {
-                a = Point::new(a.x.round(), a.y.round());
-                b = Point::new(b.x.round(), b.y.round());
-            }
-            let pw = doc.world_transform(parent);
-            let (kind, base) = match tool {
-                ToolId::Frame => (NodeKind::Frame, "Frame"),
-                ToolId::Section => (NodeKind::Section { contents_hidden: false }, "Section"),
-                ToolId::Slice => (NodeKind::Slice, "Slice"),
-                ToolId::Rectangle => (NodeKind::Rectangle, "Rectangle"),
-                ToolId::Ellipse => (NodeKind::Ellipse { start: 0.0, sweep: std::f64::consts::TAU, inner: 0.0 }, "Ellipse"),
-                ToolId::Polygon => (NodeKind::Polygon { count: 3 }, "Polygon"),
-                ToolId::Star => (NodeKind::Star { count: 5, inner_ratio: 0.38 }, "Star"),
-                ToolId::Line => (NodeKind::Line, "Line"),
-                ToolId::Arrow => (NodeKind::Line, "Arrow"),
-                _ => return Ok(()),
-            };
-            let name = match tool {
-                ToolId::Frame | ToolId::Section | ToolId::Slice => doc.next_name(base),
-                _ => base.to_string(),
-            };
-            let nid = doc.alloc_id();
-            let mut n = if tool == ToolId::Section { Node::new_section(nid, name, 0.0, 0.0) } else { Node::new(nid, kind, name, 0.0, 0.0) };
-            if tool == ToolId::Arrow {
-                n.stroke.cap_end = StrokeCap::LineArrow;
-            }
-            if matches!(tool, ToolId::Line | ToolId::Arrow) {
-                let mut v = b - a;
-                if ev.shift {
-                    let ang = (v.atan2() / (std::f64::consts::PI / 4.0)).round() * std::f64::consts::PI / 4.0;
-                    v = Vec2::from_angle(ang) * v.hypot();
-                }
-                // Alt draws from the centre, as for the other shapes.
-                let (a, v) = if ev.alt { (a - v, v * 2.0) } else { (a, v) };
-                n.width = v.hypot();
-                n.transform = pw.inverse() * Affine::translate(a.to_vec2()) * Affine::rotate(v.atan2());
-            } else {
-                let mut d = b - a;
-                if ev.shift {
-                    let m = d.x.abs().max(d.y.abs());
-                    d = Vec2::new(m * d.x.signum(), m * d.y.signum());
-                }
-                let (x0, y0, x1, y1) = if ev.alt { (a.x - d.x, a.y - d.y, a.x + d.x, a.y + d.y) } else { (a.x, a.y, a.x + d.x, a.y + d.y) };
-                let r = Rect::new(x0.min(x1), y0.min(y1), x0.max(x1), y0.max(y1));
-                n.width = r.width();
-                n.height = r.height();
-                n.transform = pw.inverse() * Affine::translate((r.x0, r.y0));
-            }
-            doc.insert(n, parent, None)?;
-            *sel = vec![nid];
-            created = Some(nid);
-            let _ = page;
-            Ok(())
-        })?;
-        self.tool.overlay.guides = guides;
-        self.tool.gesture = Gesture::Draw { start, id: created, parent, targets: targets.clone() };
-        Ok(())
-    }
-
-    fn up(&mut self, ev: &PointerEvent) -> Result<()> {
-        let g = std::mem::take(&mut self.tool.gesture);
-        self.tool.overlay.marquee = None;
-        self.tool.overlay.guides.clear();
-        self.tool.overlay.scale = None;
-        self.tool.overlay.arc = None;
-        self.tool.overlay.shape = None;
-        self.tool.overlay.measure_box = None;
-        self.tool.overlay.insert_line = None;
-        self.tool.overlay.drop_cell = None;
-        let drop_target = self.tool.overlay.drop_target.take();
-        match g {
-            Gesture::Move { ids, moved, duplicate, start, .. } => {
-                if moved {
-                    // A free move lands in the frame under the pointer (or the page) where it was
-                    // dropped; layers in an auto layout frame already sit in their slot.
-                    let page = self.page()?;
-                    let sel = self.selection();
-                    let sources = if duplicate { ids.clone() } else { Vec::new() };
-                    let moving = if duplicate { sel } else { ids };
-                    let doc = self.doc()?.clone();
-                    let in_al =
-                        moving.iter().any(|m| doc.node(*m).and_then(|n| n.parent).and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some()));
-                    let target = drop_target.unwrap_or(page);
-                    let current = moving.first().and_then(|m| doc.node(*m)).and_then(|n| n.parent);
-                    if !in_al && current != Some(target) {
-                        let ds = self.ds_mut()?;
-                        let before = ds.doc.clone();
-                        let d = ds.doc_mut();
-                        for m in &moving {
-                            // Group, boolean group and instance layers stay put: they only move.
-                            let from = d.node(*m).and_then(|n| n.parent);
-                            if from.is_some_and(|f| crate::drop::keeps_layers(d, f)) || crate::components::structure_locked(d, target) {
-                                continue;
-                            }
-                            // A layer can't go into itself; it stays where it is.
-                            let _ = d.reparent(*m, target, None);
-                        }
-                        crate::normalize(ds.doc_mut(), &before);
-                    }
-                    // Reordering or dragging layers out of an instance (outside its slots), or
-                    // moving layers inside one, are edits only its main can make: the gesture is
-                    // undone.
-                    if self.refused(&moving, true) {
-                        self.cancel_interaction()?;
-                    } else {
-                        self.commit_interaction()?;
-                        // Duplicate repeats a free Alt-drag's step (an auto layout places its own).
-                        if duplicate && !in_al && moving.len() == sources.len() {
-                            self.ds_mut()?.last_duplicate = Some(crate::cmd::edit::Duplicated { sources, copies: moving });
-                        }
-                    }
-                } else {
-                    self.cancel_interaction()?;
-                    if !(ev.shift || ev.cmd || duplicate) {
-                        self.widget_click(start, ev.tol() * 2.0)?;
-                    }
-                }
-            }
-            Gesture::Resize { .. } | Gesture::Rotate { .. } | Gesture::Arc { .. } | Gesture::Shape { .. } => {
-                // Layers inside an instance keep their main's size and rotation.
-                if self.refused(&self.selection(), false) {
-                    self.cancel_interaction()?;
-                } else {
-                    self.commit_interaction()?;
-                }
-            }
-            Gesture::Draw { start, id, parent, .. } => {
-                let tiny = (ev.p() - start).hypot() * ev.zoom < 3.0;
-                if tiny || id.is_none() {
-                    // Click without drag: Figma makes a 100×100 shape (frames 100×100 too).
-                    self.cancel_interaction()?;
-                    self.begin_interaction(self.tool.tool.label())?;
-                    let (w, h) = self.tool.tool.click_size();
-                    let target = start + Vec2::new(w, h);
-                    let mut fake = ev.clone();
-                    fake.x = target.x;
-                    fake.y = target.y;
-                    fake.shift = false;
-                    fake.alt = false;
-                    self.tool.gesture = Gesture::None;
-                    let targets = Targets::default();
-                    self.draw_drag(&fake, start, None, parent, &targets)?;
-                    self.tool.gesture = Gesture::None;
-                }
-                if matches!(self.tool.tool, ToolId::Frame | ToolId::Section)
-                    && let Some(drawn) = self.selection().first().copied()
-                {
-                    let ds = self.ds_mut()?;
-                    let before = ds.doc.clone();
-                    take_enclosed(ds.doc_mut(), drawn)?;
-                    crate::normalize(ds.doc_mut(), &before);
-                }
-                self.commit_interaction()?;
-                if !self.prefs.keep_tool {
-                    self.set_tool(ToolId::Move);
-                }
-            }
-            Gesture::Pan { .. } => {
-                self.tool.overlay.cursor = Cursor::Grab;
-                if let Some(t) = self.tool.temp_from.take() {
-                    self.tool.tool = t;
-                }
-            }
-            Gesture::Pencil { points, pressure } => {
-                self.tool.overlay.pen.clear();
-                self.pencil_finish(&points, &pressure)?;
-            }
-            Gesture::TextSelect { .. } | Gesture::TextBox { .. } | Gesture::Marquee { .. } | Gesture::None => {}
-            Gesture::PenDrag { .. } | Gesture::ShapeBuild { .. } | Gesture::Origin => {}
-            Gesture::Vector(_) => self.commit_interaction()?,
-        }
-        if let Ok(ds) = self.ds_mut() {
-            ds.revision += 1;
-        }
-        Ok(())
-    }
-
-    fn double_click(&mut self, ev: &PointerEvent) -> Result<()> {
-        let ds = self.ds()?;
-        let (doc, sel, page) = (ds.doc.clone(), ds.selection.clone(), ds.page);
-        if self.tool.tool == ToolId::Pen {
-            return self.pen_finish();
-        }
-        // Quick clicks on a widget's clickable part are clicks, one by one.
-        if matches!(self.tool.tool, ToolId::Move | ToolId::Scale)
-            && !(ev.shift || ev.cmd || ev.alt)
-            && self.hit(&doc, page, ev.p(), ev.tol() * 2.0).and_then(|hit| crate::widgets::target_at(&doc, hit, ev.p())).is_some()
-        {
-            self.tool.gesture = Gesture::None;
-            self.cancel_interaction()?;
-            self.widget_click(ev.p(), ev.tol() * 2.0)?;
-            return Ok(());
-        }
-        // The second press began a move, a resize, a shape or a marquee: a double-click isn't one.
-        if matches!(self.tool.gesture, Gesture::Move { .. } | Gesture::Resize { .. } | Gesture::Draw { .. } | Gesture::Marquee { .. }) {
-            self.tool.gesture = Gesture::None;
-            self.tool.overlay.marquee = None;
-            self.cancel_interaction()?;
-        }
-        let Some(leaf) = self.hit(&doc, page, ev.p(), ev.tol() * 2.0) else { return Ok(()) };
-        let target = select_target(&doc, leaf, &sel, true);
-        // Text: edit at the click.
-        if doc.node(target).is_some_and(|n| matches!(n.kind, NodeKind::Text(_)))
-            && (sel.contains(&target) || select_target(&doc, leaf, &sel, false) == target)
-        {
-            // Entering a text selects all of it; in the text being edited, the word.
-            let editing = self.ds()?.text_edit.as_ref().is_some_and(|te| te.id == target);
-            let idx = self.text_index_at(target, ev.p())?;
-            textedit::begin(self, target, Some(idx), false)?;
-            if editing {
-                textedit::select_word(self, idx)?;
-            } else {
-                textedit::key(self, "SelectAll", false, false, false)?;
-            }
-            return Ok(());
-        }
-        // Shapes and vectors: enter vector edit mode (every selected shape, the clicked one active).
-        if doc.node(target).is_some_and(|n| n.kind.is_shape()) && sel.contains(&target) {
-            let mut ids = crate::vectoredit::enter_targets(&doc, &sel).unwrap_or_default();
-            ids.retain(|i| *i != target);
-            ids.insert(0, target);
-            return crate::vectoredit::begin_many(self, &ids);
-        }
-        // Groups, frames and boolean groups: select one level deeper (the layer under the pointer).
-        let deeper = figcraft_doc::geometry::enter_target(&doc, leaf, &sel);
-        if deeper != target || !sel.contains(&deeper) {
-            self.set_selection(vec![deeper]);
-        }
-        Ok(())
-    }
-
-    /// A plain click at `p` on a clickable part of a widget calls its plugin back (a failure is
-    /// shown as a message).
-    fn widget_click(&mut self, p: Point, tol: f64) -> Result<()> {
-        let (doc, page) = (self.doc()?.clone(), self.page()?);
-        let Some((id, target)) = self.hit(&doc, page, p, tol).and_then(|hit| crate::widgets::target_at(&doc, hit, p)) else { return Ok(()) };
-        if let Err(e) = self.execute("widget.click", &serde_json::json!({"id": id, "target": target})) {
-            self.message = Some(e.to_string());
-        }
-        Ok(())
-    }
-
-    /// The char index in text node `id` at page point `p`.
-    pub fn text_index_at(&self, id: NodeId, p: Point) -> Result<usize> {
-        let doc = self.doc()?;
-        let n = doc.get(id)?;
-        let local = doc.world_transform(id).inverse() * p;
-        let Some((layout, dy)) = figcraft_text::layout_node(n) else { return Ok(0) };
-        Ok(layout.hit(local.x, local.y - dy))
-    }
-
-    fn text_click(&mut self, id: NodeId, ev: &PointerEvent, extend: bool) -> Result<()> {
-        let idx = self.text_index_at(id, ev.p())?;
-        textedit::set_caret(self, idx, extend)?;
-        self.tool.gesture = Gesture::TextSelect { id };
-        Ok(())
-    }
-
-    fn text_down(&mut self, ev: &PointerEvent) -> Result<()> {
-        let ds = self.ds()?;
-        let (doc, page) = (ds.doc.clone(), ds.page);
-        if let Some(te) = ds.text_edit.clone() {
-            if doc.world_bounds(te.id).is_some_and(|b| b.contains(ev.p())) {
-                return self.text_click(te.id, ev, ev.shift);
-            }
-            textedit::end(self)?;
-        }
-        // Clicking existing text edits it.
-        if let Some(leaf) = self.hit(&doc, page, ev.p(), ev.tol() * 2.0)
-            && doc.node(leaf).is_some_and(|n| matches!(n.kind, NodeKind::Text(_)))
-        {
-            let idx = self.text_index_at(leaf, ev.p())?;
-            textedit::begin(self, leaf, Some(idx), false)?;
-            self.tool.gesture = Gesture::TextSelect { id: leaf };
-            return Ok(());
-        }
-        // New text at the click (Figma puts the baseline-ish top-left there).
-        let parent = frame_at(&doc, page, ev.p(), &[]).unwrap_or(page);
-        let ds = self.ds_mut()?;
-        let d = ds.doc_mut();
-        let id = d.alloc_id();
-        let mut n = Node::new(id, NodeKind::Text(TextData::default()), "Text", 1.0, 14.0);
-        let pw = d.world_transform(parent);
-        let at = Point::new(ev.x.round(), (ev.y - 7.0).round());
-        n.transform = pw.inverse() * Affine::translate(at.to_vec2());
-        n.name = String::new();
-        if let Some(fills) = readable_text_fills(d, parent) {
-            n.fills = fills;
-        }
-        if let Some((w, h)) = figcraft_text::auto_size(&n) {
-            n.width = w.max(1.0);
-            n.height = h;
-        }
-        let line = n.height;
-        d.insert(n, parent, None)?;
-        ds.selection = vec![id];
-        textedit::begin(self, id, Some(0), true)?;
-        self.tool.gesture = Gesture::TextBox { id, start: ev.p(), line };
-        if !self.prefs.keep_tool {
-            self.tool.tool = ToolId::Move;
-        }
-        Ok(())
-    }
-
-    /// Drag out a new text box: past the drag slop it has the drag's size (at least one line
-    /// tall) and its top-left, and that size is fixed.
-    fn text_box_drag(&mut self, ev: &PointerEvent, id: NodeId, start: Point, line: f64) -> Result<()> {
-        if within_slop(ev, start) {
-            return Ok(());
-        }
-        let r = Rect::from_points(start, ev.p());
-        let d = self.ds_mut()?.doc_mut();
-        let pw = d.node(id).and_then(|n| n.parent).map(|p| d.world_transform(p)).unwrap_or_default();
-        let n = d.get_mut(id)?;
-        n.transform = pw.inverse() * Affine::translate((r.x0.round(), r.y0.round()));
-        n.width = r.width().round().max(1.0);
-        n.height = r.height().round().max(line);
-        n.child_layout.sizing_h = Sizing::Fixed;
-        n.child_layout.sizing_v = Sizing::Fixed;
-        if let NodeKind::Text(t) = &mut n.kind {
-            t.auto_resize = TextAutoResize::None;
-        }
-        self.ds_mut()?.revision += 1;
-        Ok(())
-    }
-
-    fn eyedrop(&mut self, ev: &PointerEvent) -> Result<()> {
-        let ds = self.ds()?;
-        let doc = ds.doc.clone();
-        let view = figcraft_render::View { origin: (ev.x, ev.y), scale: ev.zoom.max(0.01), width: 1, height: 1 };
-        let Some(pix) = figcraft_render::render_view(&doc, ds.page, &view, &Default::default()) else { return Ok(()) };
-        let rgba = figcraft_render::to_rgba8(&pix);
-        let c = figcraft_color::Color::from_rgba8(
-            rgba.first().copied().unwrap_or(0),
-            rgba.get(1).copied().unwrap_or(0),
-            rgba.get(2).copied().unwrap_or(0),
-            255,
-        );
-        let sel = ds.selection.clone();
-        if !sel.is_empty() {
-            self.execute("node.set", &json!({"ids": sel, "props": {"fill": c.to_css_hex()}}))?;
-        }
-        self.recent_colors.retain(|x| *x != c);
-        self.recent_colors.insert(0, c);
-        self.recent_colors.truncate(16);
-        self.message = Some(format!("Picked #{}", c.to_hex()));
-        self.set_tool(ToolId::Move);
-        Ok(())
-    }
-
-    /// The pen tool's snapped position for `ev`: its path's vector (or, before it has one, its first
-    /// point) counts among the targets.
-    fn snap_pen_tool(&mut self, ev: &PointerEvent) -> Result<(Point, Vec<Guide>)> {
-        let (id, extra) = match &self.tool.pen {
-            Some(pen) if pen.id.is_some() => (pen.id, Vec::new()),
-            Some(pen) => (None, pen.points.iter().map(|(p, _, _)| *p).collect()),
-            None => (None, Vec::new()),
-        };
-        self.snap_pen(ev, id, &extra)
-    }
-
-    fn pen_down(&mut self, ev: &PointerEvent) -> Result<()> {
-        self.tool.overlay.guides.clear();
-        // The segment being placed shows as itself while the press lasts.
-        self.tool.overlay.rubber = None;
-        self.tool.overlay.rubber_handle = None;
-        let p = if ev.shift { ev.p() } else { self.snap_pen_tool(ev)?.0 };
-        let (doc, page) = {
-            let ds = self.ds()?;
-            (ds.doc.clone(), ds.page)
-        };
-        // With an open path selected, a click on one of its end points continues it in edit mode.
-        if self.tool.pen.is_none()
-            && let Some((id, v)) = selected_end_at(&doc, &self.selection(), ev.p(), 8.0 / ev.zoom.max(1e-6))
-        {
-            self.set_tool(ToolId::Move);
-            crate::vectoredit::begin(self, id)?;
-            crate::vectoredit::set_tool(self, crate::vectoredit::VTool::Pen)?;
-            return crate::vectoredit::set_state(self, |e| {
-                e.anchor = Some(v);
-                e.vertices = vec![v];
-            });
-        }
-        let pen = self.tool.pen.get_or_insert_with(PenPath::default);
-        // Clicking the first anchor closes the path.
-        if pen.points.len() > 2
-            && let Some((first, _, _)) = pen.points.first()
-            && (*first - p).hypot() * ev.zoom < 8.0
-        {
-            pen.closed = true;
-            self.pen_update()?;
-            return self.pen_finish();
-        }
-        // Clicking another of its own anchors (not the last) connects there and ends the path.
-        let near = |q: &Point| (*q - p).hypot() * ev.zoom < 8.0;
-        if let Some(k) = (1..pen.points.len().saturating_sub(1)).find(|k| pen.points.get(*k).is_some_and(|(q, _, _)| near(q))) {
-            pen.join = Some(k);
-            self.pen_update()?;
-            return self.pen_finish();
-        }
-        if pen.parent.is_none() {
-            pen.parent = Some(frame_at(&doc, page, p, &[]).unwrap_or(page));
-        }
-        let mut p = p;
-        if ev.shift
-            && let Some((last, _, _)) = pen.points.last()
-        {
-            let v = p - *last;
-            let ang = (v.atan2() / (std::f64::consts::PI / 4.0)).round() * std::f64::consts::PI / 4.0;
-            p = *last + Vec2::from_angle(ang) * v.hypot();
-        }
-        pen.points.push((p, Vec2::ZERO, Vec2::ZERO));
-        self.tool.gesture = Gesture::PenDrag { anchor: p };
-        self.pen_update()
-    }
-
-    /// Rebuild the pen's vector node from its anchors.
-    fn pen_update(&mut self) -> Result<()> {
-        let Some(pen) = self.tool.pen.clone() else { return Ok(()) };
-        self.tool.overlay.pen = pen.points.iter().map(|(p, _, _)| [p.x, p.y]).collect();
-        self.tool.overlay.pen_handles = pen_handles(&pen.points);
-        if pen.points.len() < 2 {
-            if let Ok(ds) = self.ds_mut() {
-                ds.revision += 1;
-            }
-            return Ok(());
-        }
-        let page = self.page()?;
-        let parent = pen.parent.unwrap_or(page);
-        if pen.id.is_none() {
-            self.begin_interaction("Pen")?;
-        }
-        let ds = self.ds_mut()?;
-        let doc = ds.doc_mut();
-        let pw = doc.world_transform(parent);
-        let inv = pw.inverse();
-        // Anchors and handles into the parent's space.
-        let pts: Vec<(Point, Point, Point)> = pen.points.iter().map(|(p, i, o)| (inv * *p, inv * (*p + *i), inv * (*p + *o))).collect();
-        let mut path = figcraft_geom::BezPath::new();
-        for (k, (p, _, _)) in pts.iter().enumerate() {
-            if k == 0 {
-                path.move_to(*p);
-            } else if let (Some(prev), Some(cur)) = (pts.get(k - 1), pts.get(k)) {
-                path.curve_to(prev.2, cur.1, *p);
-            }
-        }
-        if pen.closed
-            && let (Some(last), Some(first)) = (pts.last(), pts.first())
-        {
-            path.curve_to(last.2, first.1, first.0);
-            path.close_path();
-        }
-        use figcraft_geom::Shape;
-        let bb = path.bounding_box();
-        path.apply_affine(Affine::translate((-bb.x0, -bb.y0)));
-        let mut net = VectorNetwork::from_path(&path);
-        // Straight segments stay straight.
-        for s in &mut net.segments {
-            if (s.ta.0.abs() + s.ta.1.abs()) < 1e-9 && (s.tb.0.abs() + s.tb.1.abs()) < 1e-9 {
-                s.ta = (0.0, 0.0);
-                s.tb = (0.0, 0.0);
-            }
-        }
-        if !pen.closed {
-            net.regions.clear();
-        }
-        // Anchor k is vertex k of the open path.
-        if let (Some(k), Some((last, _, out))) = (pen.join, pts.last()) {
-            let from = pts.len() - 1;
-            crate::vectoredit::ops::connect(&mut net, from, k, (out.x - last.x, out.y - last.y), (0.0, 0.0));
-        }
-        let id = match pen.id {
-            Some(id) if doc.contains(id) => id,
-            _ => {
-                let id = doc.alloc_id();
-                let mut n = Node::new(id, NodeKind::Vector { network: VectorNetwork::default() }, "Vector", 0.0, 0.0);
-                n.fills.clear();
-                n.strokes = vec![figcraft_color::Paint::solid(figcraft_color::Color::BLACK)];
-                n.stroke.align = StrokeAlign::Center;
-                doc.insert(n, parent, None)?;
-                id
-            }
-        };
-        let n = doc.get_mut(id)?;
-        n.kind = NodeKind::Vector { network: net };
-        n.width = bb.width();
-        n.height = bb.height();
-        n.transform = Affine::translate((bb.x0, bb.y0));
-        if pen.closed && n.fills.is_empty() {
-            n.fills = vec![figcraft_color::Paint::solid(figcraft_color::Color::DEFAULT_SHAPE)];
-        }
-        ds.selection = vec![id];
-        ds.revision += 1;
-        if let Some(p) = self.tool.pen.as_mut() {
-            p.id = Some(id);
-        }
-        Ok(())
-    }
-
-    /// Finish the pen path (Enter/Escape/double-click).
-    pub fn pen_finish(&mut self) -> Result<()> {
-        let pen = self.tool.pen.take();
-        self.tool.overlay.pen.clear();
-        self.tool.overlay.pen_handles.clear();
-        self.tool.overlay.rubber = None;
-        self.tool.overlay.rubber_handle = None;
-        self.tool.gesture = Gesture::None;
-        if pen.as_ref().is_some_and(|p| p.id.is_some()) {
-            self.commit_interaction()?;
-        }
-        Ok(())
-    }
-
-    fn pencil_finish(&mut self, points: &[Point], pressure: &[Option<f32>]) -> Result<()> {
-        if points.len() < 2 {
-            return Ok(());
-        }
-        // Smooth: fit a curve through the samples.
-        let mut poly = figcraft_geom::BezPath::new();
-        for (k, p) in points.iter().enumerate() {
-            if k == 0 {
-                poly.move_to(*p);
-            } else {
-                poly.line_to(*p);
-            }
-        }
-        let fitted = figcraft_geom::kurbo::simplify::simplify_bezpath(poly.iter(), 0.75, &Default::default());
-        let d = fitted.to_svg();
-        let page = self.page()?;
-        let parent = frame_at(self.doc()?, page, points.first().copied().unwrap_or_default(), &[]).unwrap_or(page);
-        let pw = self.doc()?.world_transform(parent);
-        let mut local = fitted.clone();
-        local.apply_affine(pw.inverse());
-        let _ = d;
-        let mut props =
-            json!({"fills": [], "strokes": ["#000000"], "strokeWeight": 2, "strokeCap": "round", "strokeJoin": "round", "strokeAlign": "center"});
-        // Pen pressure becomes the stroke's width profile (brushes follow it too).
-        if let Some(points) = pressure_profile(points, pressure) {
-            props["widthProfile"] = json!(points);
-        }
-        if let Some(b) = &self.tool.pencil_brush {
-            props["brush"] = serde_json::to_value(b).unwrap_or_default();
-        }
-        self.execute(
-            "node.create",
-            &json!({"type": "vector", "path": local.to_svg(), "closed": false, "parent": parent, "name": "Vector", "props": props}),
-        )?;
-        Ok(())
-    }
-
-    /// Keys the current mode handles before menu shortcuts (vector edit mode's tools and point
-    /// keys, Enter to finish the shape builder). Returns whether the key was used.
-    pub fn tool_key(&mut self, name: &str, shift: bool, alt: bool, cmd: bool) -> Result<bool> {
-        if self.ds().is_ok_and(|d| d.vector_edit.is_some()) {
-            return crate::vectoredit::key(self, name, shift, alt, cmd);
-        }
-        if !alt && !cmd && self.guide_key(name, shift)? {
-            return Ok(true);
-        }
-        crate::shapebuilder::key(self, name)
-    }
-
-    /// Keys for a selected ruler guide: Delete removes it, arrows across it nudge it (Shift: the big
-    /// nudge), Escape deselects it.
-    fn guide_key(&mut self, name: &str, shift: bool) -> Result<bool> {
-        let Some((owner, index)) = self.ds()?.selected_guide() else { return Ok(false) };
-        // Backspace is Delete, `Left` is `ArrowLeft`, and so on.
-        let name = crate::keymap::normalize(name).map_or(name, |(k, _)| k);
-        let page = self.page()?;
-        let at = |mut p: serde_json::Value| {
-            if owner != page {
-                p["frame"] = json!(owner);
-            }
-            p
-        };
-        let Some(g) = self.doc()?.node(owner).and_then(|n| n.guides().get(index).cloned()) else { return Ok(false) };
-        let step = if shift { self.prefs.nudge_big } else { self.prefs.nudge_small };
-        let d = match (name, g.vertical) {
-            ("Delete", _) => {
-                self.execute("guide.remove", &at(json!({"index": index})))?;
-                return Ok(true);
-            }
-            ("Escape", _) => {
-                self.execute("guide.select", &json!({}))?;
-                return Ok(true);
-            }
-            ("ArrowLeft", true) | ("ArrowUp", false) => -step,
-            ("ArrowRight", true) | ("ArrowDown", false) => step,
-            _ => return Ok(false),
-        };
-        self.execute("guide.move", &at(json!({"index": index, "offset": g.offset + d})))?;
-        Ok(true)
-    }
-
-    /// The layer under `p` for a click: the topmost on `page`, or in the focus view the focused
-    /// frame's. Boolean groups are hit by their results ([`crate::booleans::result_outline`]); in
-    /// outline mode shapes only on their outlines.
-    pub fn hit(&self, doc: &Document, page: NodeId, p: Point, tol: f64) -> Option<NodeId> {
-        let sel = self.selection();
-        let result = crate::booleans::result_outline(doc, &sel);
-        let focus = self.ds().ok().and_then(crate::DocState::focused);
-        // Outline mode draws no fills: shapes are clicked on their outlines, reaching what's behind.
-        if let Some(v) = self.ds().ok().map(|d| &d.view).filter(|v| v.outlines) {
-            // What it draws besides the shapes can be clicked too.
-            let also = figcraft_doc::geometry::OutlineHits { hidden: v.outline_hidden, bounds: v.outline_bounds };
-            return figcraft_doc::geometry::hit_outlines(doc, focus.unwrap_or(page), p, tol, Some(&result), also);
-        }
-        match focus {
-            Some(f) => figcraft_doc::geometry::hit_in(doc, f, p, tol, Some(&result)),
-            None => doc.hit_test(page, p, tol, Some(&result)),
-        }
-    }
-
-    /// Enter with a shape or frame tool (`tool.place`): what a click with it makes, centred on `at`
-    /// (default the middle of the view) and selected.
-    pub fn place(&mut self, at: Option<Point>) -> Result<()> {
-        let tool = self.tool.tool;
-        let refuse = |why: &str| Err(crate::EngineError::Disabled("tool.place".into(), why.into()));
-        if !tool.draws_shape() {
-            return refuse("choose a shape or frame tool first");
-        }
-        if self.tool.busy() {
-            return refuse("finish the drag first");
-        }
-        let v = &self.ds()?.view;
-        let (c, zoom) = (at.unwrap_or(Point::new(v.cx, v.cy)), v.zoom);
-        let (w, h) = tool.click_size();
-        let ev = |kind| PointerEvent::at(kind, c.x - w / 2.0, c.y - h / 2.0, zoom);
-        let r = self.pointer(&ev(PointerKind::Down)).and_then(|()| self.pointer(&ev(PointerKind::Up)));
-        if r.is_err() {
-            self.tool.gesture = Gesture::None;
-            let _ = self.cancel_interaction();
-        }
-        r
-    }
-
-    /// Keyboard Escape: cancel gestures, finish pens, leave text editing, then deselect (in the
-    /// focus view, once the focused frame or nothing is selected, it ends the focus view).
-    pub fn escape(&mut self) -> Result<()> {
-        // Following someone in a live session: Escape stops that first.
-        if self.live_unfollow() {
-            return Ok(());
-        }
-        if self.tool.pen.is_some() {
-            return self.pen_finish();
-        }
-        if self.tool.busy() {
-            self.tool.gesture = Gesture::None;
-            self.tool.overlay = Overlay::default();
-            return self.cancel_interaction();
-        }
-        if self.end_origin_edit() {
-            return Ok(());
-        }
-        if self.ds()?.text_edit.is_some() {
-            return textedit::end(self);
-        }
-        if self.ds()?.vector_edit.is_some() {
-            return crate::vectoredit::escape(self);
-        }
-        if self.tool.tool != ToolId::Move {
-            self.set_tool(ToolId::Move);
-            return Ok(());
-        }
-        let sel = self.selection();
-        if let Some(f) = self.ds()?.focused()
-            && (sel.is_empty() || sel == [f])
-        {
-            self.ds_mut()?.focus = None;
-            return Ok(());
-        }
-        // Escape selects the parent, then nothing.
-        let doc = self.doc()?;
-        let parents: Vec<NodeId> =
-            sel.iter().filter_map(|i| doc.node(*i).and_then(|n| n.parent)).filter(|p| !doc.node(*p).is_some_and(Node::is_page)).collect();
-        if !parents.is_empty() {
-            let mut uniq = Vec::new();
-            for p in parents {
-                if !uniq.contains(&p) {
-                    uniq.push(p);
-                }
-            }
-            self.set_selection(uniq);
-        } else {
-            self.set_selection(vec![]);
-        }
-        Ok(())
-    }
-
-    /// Whether the Move tool shows arc and shape handles now (not while another gesture runs, nor
-    /// in vector or text edit mode).
-    fn arc_handles_shown(&self) -> bool {
-        let arc_drag = matches!(self.tool.gesture, Gesture::Arc { .. } | Gesture::Shape { .. });
-        self.tool.tool == ToolId::Move
-            && (arc_drag || !self.tool.busy())
-            && self.ds().is_ok_and(|ds| ds.vector_edit.is_none() && ds.text_edit.is_none())
-    }
-
-    /// The selected ellipse's arc handles as the canvas shows them at the current zoom.
-    pub fn arc_handles(&self) -> Option<crate::arc_handles::ArcHandles> {
-        let ds = self.ds().ok()?;
-        self.arc_handles_shown().then(|| crate::arc_handles::handles(&ds.doc, &ds.selection, ds.view.zoom)).flatten()
-    }
-
-    /// The selected shape's corner radius and star ratio handles as the canvas shows them now.
-    pub fn shape_handles(&self) -> Vec<(ShapeHandle, [f64; 2])> {
-        let Ok(ds) = self.ds() else { return vec![] };
-        if self.arc_handles_shown() { crate::shape_handles::handles(&ds.doc, &ds.selection, ds.view.zoom) } else { vec![] }
-    }
-
-    /// Snapshot of tool state for the UI / inspect.
-    pub fn tool_info(&self) -> serde_json::Value {
-        let shapes: Vec<serde_json::Value> = self.shape_handles().into_iter().map(|(h, at)| json!({"handle": h, "at": at})).collect();
-        json!({"tool": self.tool.tool.id(), "busy": self.tool.busy(), "overlay": self.tool.overlay, "arcHandles": self.arc_handles(), "shapeHandles": shapes})
-    }
-}
-
-/// The readout of a shape handle drag on `id`.
-fn shape_hint(doc: &Document, id: NodeId, handle: ShapeHandle, zoom: f64) -> Option<ShapeHint> {
-    Some(ShapeHint { handle, value: crate::shape_handles::value(doc, id, handle)?, at: crate::shape_handles::handle_at(doc, id, handle, zoom)? })
-}
-
-#[allow(dead_code)]
-fn unused(_: BTreeMap<u8, u8>) {}
-
-/// An end point of a selected open vector within `tol` of page point `p`: (layer, point).
-fn selected_end_at(doc: &Document, sel: &[NodeId], p: Point, tol: f64) -> Option<(NodeId, usize)> {
-    sel.iter().find_map(|id| {
-        let net = crate::vectoredit::network(doc, *id)?;
-        let w = doc.world_transform(*id);
-        let near = |v: &usize| net.vertices.get(*v).is_some_and(|x| (w * x.point() - p).hypot() <= tol);
-        (0..net.vertices.len()).filter(near).find(|v| net.incident(*v).len() == 1).map(|v| (*id, v))
-    })
-}
diff --git a/crates/engine/src/transform_behaviour_tests.rs b/crates/engine/src/transform_behaviour_tests.rs
index 47270a42..3e724244 100644
--- a/crates/engine/src/transform_behaviour_tests.rs
+++ b/crates/engine/src/transform_behaviour_tests.rs
@@ -98,6 +98,224 @@ const ALT: Mods = Mods { shift: false, alt: true, cmd: false };
 const BOTH: Mods = Mods { shift: true, alt: true, cmd: false };
 const CMD: Mods = Mods { shift: false, alt: false, cmd: true };
 
+/// An asymmetric synthetic image: every column is different, so recentering is visible.
+fn image_layer(s: &mut Session) -> NodeId {
+    use base64::Engine as _;
+    let image = image::RgbaImage::from_fn(200, 100, |x, y| image::Rgba([x as u8, y as u8, 120, 255]));
+    let mut bytes = std::io::Cursor::new(Vec::new());
+    image.write_to(&mut bytes, image::ImageFormat::Png).unwrap();
+    id(&ex(
+        s,
+        "file.import",
+        json!({"data": base64::engine::general_purpose::STANDARD.encode(bytes.into_inner()), "name": "crop.png", "x": 0, "y": 0}),
+    ))
+}
+
+#[test]
+fn command_resize_crops_image_pixels_and_round_trips() {
+    let mut s = session();
+    let layer = image_layer(&mut s);
+    let original = s.doc().unwrap().clone();
+    let before = figcraft_render::render_node(&original, layer, 1.0).unwrap();
+    let steps = undo_steps(&s);
+    // Public crop documentation: Command (macOS) / Ctrl (elsewhere) quickly crops an image.
+    // Moving the right edge must keep the left half's pixels, not recenter or scale them.
+    s.pointer(&ev(PointerKind::Down, Point::new(200.0, 50.0), CMD)).unwrap();
+    for x in [150.0, 100.0] {
+        s.pointer(&ev(PointerKind::Move, Point::new(x, 50.0), CMD)).unwrap();
+    }
+    s.pointer(&ev(PointerKind::Up, Point::new(100.0, 50.0), CMD)).unwrap();
+    assert_eq!(size(&s, layer), (100.0, 100.0));
+    let after = figcraft_render::render_node(s.doc().unwrap(), layer, 1.0).unwrap();
+    for y in 0..100usize {
+        assert_eq!(&after.data()[y * 400..(y + 1) * 400], &before.data()[y * 800..y * 800 + 400], "row {y}: the image stays put");
+    }
+    assert_eq!(s.doc().unwrap().images, original.images, "cropping keeps the source bytes");
+    assert_eq!(undo_steps(&s), steps + 1);
+    let cropped = s.doc().unwrap().clone();
+    ex(&mut s, "edit.undo", json!({}));
+    assert_eq!(s.doc().unwrap(), &original);
+    ex(&mut s, "edit.redo", json!({}));
+    assert_eq!(s.doc().unwrap(), &cropped);
+    let path = std::env::temp_dir().join(format!("figcraft-command-crop-{}.figcraft", std::process::id()));
+    ex(&mut s, "file.saveAs", json!({"path": path}));
+    let mut reopened = session();
+    ex(&mut reopened, "file.open", json!({"path": path}));
+    assert_eq!(reopened.doc().unwrap().node(layer), cropped.node(layer));
+    assert_eq!(reopened.doc().unwrap().images, cropped.images);
+    assert_eq!(figcraft_render::render_node(reopened.doc().unwrap(), layer, 1.0).unwrap().data(), after.data());
+    std::fs::remove_file(path).unwrap();
+}
+
+#[test]
+fn command_crop_keeps_image_placement_in_the_layers_axes() {
+    use figcraft_doc::color::{ImageScaleMode, PaintKind};
+    use figcraft_geom::Affine;
+    // Each row exercises a distinct placement: Fill, Fit, and an existing affine Crop.
+    // Geometry follows the existing resize rules; image pixels stay fixed in page space.
+    let rows = [
+        ("fill", None, 0.0, Point::new(0.0, 50.0), Point::new(40.0, 50.0), CMD, (40.0, 0.0, 160.0, 150.0)),
+        ("fit", None, 30.0, Point::new(100.0, 0.0), Point::new(100.0, 20.0), CMD, (0.0, 20.0, 200.0, 130.0)),
+        ("fill", None, 0.0, Point::new(0.0, 50.0), Point::new(240.0, 50.0), CMD, (240.0, 0.0, 40.0, 150.0)),
+        (
+            "crop",
+            Some([0.8, 0.1, -0.2, 0.9, 0.1, 0.05]),
+            30.0,
+            Point::new(200.0, 150.0),
+            Point::new(150.0, 112.5),
+            Mods { alt: true, ..CMD },
+            (50.0, 37.5, 100.0, 75.0),
+        ),
+    ];
+    for (mode, crop, angle, from, to, mods, (x, y, w, h)) in rows {
+        let mut s = session();
+        let layer = image_layer(&mut s);
+        let mut fills = s.doc().unwrap().node(layer).unwrap().fills.clone();
+        let PaintKind::Image(img) = &mut fills[0].kind else { panic!("image fill") };
+        img.scale_mode = match mode {
+            "fit" => ImageScaleMode::Fit,
+            "crop" => ImageScaleMode::Crop,
+            _ => ImageScaleMode::Fill,
+        };
+        img.crop = crop;
+        set(&mut s, &[layer], json!({"height": 150, "rotation": angle, "fills": fills}));
+        let doc = s.doc().unwrap();
+        let world = doc.world_transform(layer);
+        let n = doc.node(layer).unwrap();
+        let old_crop = crop.unwrap_or(if mode == "fit" { [1.0, 0.0, 0.0, 1.5, 0.0, -0.25] } else { [2.0 / 3.0, 0.0, 0.0, 1.0, 1.0 / 6.0, 0.0] });
+        let old_mapping = Affine::new(old_crop) * Affine::scale_non_uniform(1.0 / n.width, 1.0 / n.height) * world.inverse();
+        drag(&mut s, world * from, world * to, mods);
+        let doc = s.doc().unwrap();
+        let n = doc.node(layer).unwrap();
+        assert!(near(n.width, w) && near(n.height, h), "{mode}: crop box size");
+        assert!((doc.world_transform(layer) * Point::ZERO - world * Point::new(x, y)).hypot() < 1e-6, "{mode}: crop box anchor");
+        let PaintKind::Image(img) = &n.fills[0].kind else { panic!("image fill") };
+        assert_eq!(img.scale_mode, ImageScaleMode::Crop, "{mode}");
+        let mapping =
+            Affine::new(img.crop.unwrap()) * Affine::scale_non_uniform(1.0 / n.width, 1.0 / n.height) * doc.world_transform(layer).inverse();
+        for p in [Point::ZERO, Point::new(80.0, 60.0), Point::new(170.0, 90.0)] {
+            assert!((mapping * p - old_mapping * p).hypot() < 1e-6, "{mode}: same page point samples the same source pixel");
+        }
+    }
+}
+
+#[test]
+fn ordinary_resize_and_scale_keep_image_fill_settings() {
+    for (tool, cmd, ctrl) in [("move", false, false), ("move", false, true), ("scale", true, false)] {
+        let mut s = session();
+        let layer = image_layer(&mut s);
+        let fills = s.doc().unwrap().node(layer).unwrap().fills.clone();
+        ex(&mut s, "tool.set", json!({"tool": tool}));
+        let to = Point::new(100.0, 50.0);
+        for (kind, p) in [(PointerKind::Down, Point::new(200.0, 100.0)), (PointerKind::Move, to), (PointerKind::Up, to)] {
+            let mut event = ev(kind, p, Mods { cmd, ..NONE });
+            event.ctrl = ctrl;
+            s.pointer(&event).unwrap();
+        }
+        assert_eq!(s.doc().unwrap().node(layer).unwrap().fills, fills, "{tool}, cmd={cmd}, ctrl={ctrl}");
+        assert_eq!(size(&s, layer), (100.0, 50.0));
+    }
+}
+
+#[test]
+fn command_crop_preserves_each_image_fill_and_leaves_tiles() {
+    use figcraft_doc::color::{Color, ImageScaleMode, Paint, PaintKind};
+    let mut s = session();
+    let layer = image_layer(&mut s);
+    let image = s.doc().unwrap().node(layer).unwrap().fills[0].clone();
+    let mut rotated = image.clone();
+    rotated.opacity = 0.4;
+    let PaintKind::Image(img) = &mut rotated.kind else { panic!("image fill") };
+    img.rotation = 1;
+    let mut tile = image.clone();
+    let PaintKind::Image(img) = &mut tile.kind else { panic!("image fill") };
+    img.scale_mode = ImageScaleMode::Tile;
+    let mut expected = vec![Paint::solid(Color::from_rgba8(20, 40, 60, 255)), rotated, image, tile];
+    set(&mut s, &[layer], json!({"fills": expected}));
+    drag(&mut s, Point::new(200.0, 50.0), Point::new(100.0, 50.0), CMD);
+    for (i, crop) in [(1, [0.5, 0.0, 0.0, 0.25, 0.0, 0.375]), (2, [0.5, 0.0, 0.0, 1.0, 0.0, 0.0])] {
+        let PaintKind::Image(img) = &mut expected[i].kind else { panic!("image fill") };
+        img.scale_mode = ImageScaleMode::Crop;
+        img.crop = Some(crop);
+    }
+    assert_eq!(s.doc().unwrap().node(layer).unwrap().fills, expected);
+}
+
+#[test]
+fn command_resize_leaves_fills_when_text_or_auto_layout_recomputes_the_box() {
+    for case in ["text", "child", "frame"] {
+        let mut s = session();
+        let image = image_layer(&mut s);
+        let fills = s.doc().unwrap().node(image).unwrap().fills.clone();
+        let layer = match case {
+            "text" => id(&ex(
+                &mut s,
+                "text.create",
+                json!({"text": "hello world hello world hello world", "props": {
+                    "width": 200, "height": 100, "fontSize": 24, "textAutoResize": "none", "fills": fills
+                }}),
+            )),
+            _ => {
+                let frame = id(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100})));
+                set(&mut s, &[frame], json!({"layout": "horizontal", "padding": 20}));
+                if case == "child" {
+                    ex(&mut s, "node.reparent", json!({"ids": [image], "parent": frame}));
+                    set(&mut s, &[image], json!({"minWidth": 150}));
+                    image
+                } else {
+                    set(&mut s, &[frame], json!({"fills": fills}));
+                    frame
+                }
+            }
+        };
+        ex(&mut s, "select.set", json!({"ids": [layer]}));
+        let doc = s.doc().unwrap();
+        let world = doc.world_transform(layer);
+        let n = doc.node(layer).unwrap();
+        let from = world * Point::new(n.width, n.height / 2.0);
+        let to = world * Point::new(10.0, n.height / 2.0);
+        drag(&mut s, from, to, CMD);
+        assert_eq!(s.doc().unwrap().node(layer).unwrap().fills, fills, "{case}: keep the existing resize behaviour");
+    }
+}
+
+/// A resize is an explicit edit of the size: a size bound to a variable lets go of it (#809), so
+/// Cmd/Ctrl crops a bound layer's image as any other's; other bindings stay.
+#[test]
+fn image_crop_detaches_a_bound_size_and_crops() {
+    for (field, value, from, to, (w, h)) in [
+        ("width", 200, Point::new(200.0, 50.0), Point::new(100.0, 50.0), (100usize, 100usize)),
+        ("height", 100, Point::new(100.0, 100.0), Point::new(100.0, 50.0), (200, 50)),
+        ("w", 200, Point::new(200.0, 50.0), Point::new(100.0, 50.0), (100, 100)),
+        ("h", 100, Point::new(100.0, 100.0), Point::new(100.0, 50.0), (200, 50)),
+        ("opacity", 100, Point::new(200.0, 50.0), Point::new(100.0, 50.0), (100, 100)),
+    ] {
+        for mods in [CMD, NONE] {
+            let mut s = session();
+            let layer = image_layer(&mut s);
+            ex(&mut s, "variable.createCollection", json!({"name": "Tokens"}));
+            ex(&mut s, "variable.create", json!({"collection": "Tokens", "name": "bound", "type": "number", "value": value}));
+            ex(&mut s, "variable.bind", json!({"ids": [layer], "field": field, "variable": "bound"}));
+            let before = s.doc().unwrap().clone();
+            let pixels = figcraft_render::render_node(&before, layer, 1.0).unwrap();
+            drag(&mut s, from, to, mods);
+            let doc = s.doc().unwrap();
+            let n = doc.node(layer).unwrap();
+            assert_eq!(n.bound.is_empty(), field != "opacity", "{field}: a size binding goes, others stay");
+            assert_eq!(doc.variables, before.variables, "{field}: do not edit the variable");
+            assert_eq!((n.width, n.height), (w as f64, h as f64), "{field}");
+            if mods.cmd {
+                let after = figcraft_render::render_node(doc, layer, 1.0).unwrap();
+                for y in 0..h {
+                    assert_eq!(&after.data()[y * w * 4..(y + 1) * w * 4], &pixels.data()[y * 800..y * 800 + w * 4], "{field}: the image stays put");
+                }
+            } else {
+                assert_eq!(n.fills, before.node(layer).unwrap().fills, "{field}: keep the existing resize behaviour");
+            }
+        }
+    }
+}
+
 #[test]
 fn handle_drags_resize_by_the_documented_rules() {
     // A 100×50 box; (handle, pointer in the box's axes, modifiers, new box x0 y0 x1 y1, derivation).
diff --git a/crates/engine/src/variable_tests.rs b/crates/engine/src/variable_tests.rs
index 536b2699..dcdd04e3 100644
--- a/crates/engine/src/variable_tests.rs
+++ b/crates/engine/src/variable_tests.rs
@@ -5,6 +5,79 @@ use serde_json::json;
 use crate::Session;
 use crate::params::id_of;
 
+fn stale_bound_color_document() -> (figcraft_doc::Document, figcraft_doc::NodeId) {
+    let mut s = Session::new();
+    let id = id_of(&s.execute("shape.rectangle", &json!({"x": 4000, "y": 4000, "width": 23, "height": 17})).unwrap()["id"]).unwrap();
+    let page = s.doc().unwrap().first_page().unwrap();
+    s.execute("variable.createCollection", &json!({"name": "Theme", "modes": ["Light", "Dark"]})).unwrap();
+    s.execute("variable.create", &json!({"collection": "Theme", "name": "surface", "type": "color", "value": "#FFFFFF"})).unwrap();
+    s.execute("variable.create", &json!({"collection": "Theme", "name": "size", "type": "number", "value": 23})).unwrap();
+    s.execute("variable.set", &json!({"variable": "surface", "mode": "Dark", "value": "#202124"})).unwrap();
+    s.execute("variable.set", &json!({"variable": "size", "mode": "Dark", "value": 99})).unwrap();
+    s.execute("variable.bind", &json!({"ids": [id], "field": "fill", "variable": "surface"})).unwrap();
+    s.execute("variable.bind", &json!({"ids": [id], "field": "width", "variable": "size"})).unwrap();
+    s.execute("variable.setMode", &json!({"collection": "Theme", "mode": "Dark"})).unwrap();
+    let mut doc = s.doc().unwrap().clone();
+    let node = doc.get_mut(id).unwrap();
+    node.name = "load-binding-sentinel".into();
+    node.fills = vec![figcraft_color::Paint::solid(figcraft_color::Color::WHITE)];
+    node.width = 5.0;
+    node.source = Some(page);
+    node.overrides.insert("sentinel".into());
+    doc.take_dirty();
+    (doc, id)
+}
+
+fn assert_dark_bound_color(doc: &figcraft_doc::Document, transform: figcraft_doc::geom::Affine) -> figcraft_doc::NodeId {
+    let node = doc.nodes().find(|n| n.name == "load-binding-sentinel").unwrap();
+    assert_eq!(node.fills.first().and_then(|p| p.solid_color()).map(|c| c.to_hex()), Some("202124".into()));
+    assert_eq!((node.transform, node.width, node.height), (transform, 5.0, 17.0));
+    assert!(node.bound.contains_key("fills/0/color") || node.bound.contains_key("fill"));
+    node.id
+}
+
+#[test]
+fn initial_color_bindings_settle_in_constructor_and_loaders() {
+    let (stale, _id) = stale_bound_color_document();
+    let name_transform = stale.nodes().find(|n| n.name == "load-binding-sentinel").unwrap().transform;
+
+    let mut state = Session::with_document(stale.clone());
+    let id = assert_dark_bound_color(state.doc().unwrap(), name_transform);
+    assert_eq!(state.doc().unwrap().node(id).unwrap().source, stale.first_page());
+    assert!(state.doc().unwrap().node(id).unwrap().overrides.contains("sentinel"));
+    assert!(!state.ds().unwrap().is_dirty());
+    assert!(state.doc().unwrap().dirty().is_empty());
+    assert_eq!(state.undo_depth(), (0, 0));
+    state.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 2, "height": 2})).unwrap();
+    assert_dark_bound_color(state.doc().unwrap(), name_transform);
+
+    let native = figcraft_format::save_bytes(&stale, None).unwrap();
+    let (loaded, _) = crate::cmd::file::load_bytes(&native, "bindings.figcraft").unwrap();
+    // A native file settles when it opens as a document, not in the loader.
+    let opened = Session::with_document(loaded);
+    let loaded = opened.doc().unwrap();
+    let loaded_id = assert_dark_bound_color(loaded, name_transform);
+    assert_eq!(loaded_id, id);
+    assert_eq!(loaded.node(id).unwrap().source, stale.first_page());
+    assert!(loaded.node(id).unwrap().overrides.contains("sentinel"));
+    assert!(loaded.dirty().is_empty());
+
+    let (fig, _) = figcraft_format::fig::export(&stale, None).unwrap();
+    let (loaded, _) = crate::cmd::file::load_bytes(&fig, "bindings.fig").unwrap();
+    assert_dark_bound_color(&loaded, name_transform);
+}
+
+#[test]
+fn initial_paint_settlement_preserves_existing_dirty_nodes() {
+    let (mut doc, _) = stale_bound_color_document();
+    let page = doc.first_page().unwrap();
+    doc.mark_dirty([page]);
+
+    crate::cmd::styles::apply_paint_bindings_on_load(&mut doc);
+
+    assert_eq!(doc.dirty().iter().copied().collect::<Vec<_>>(), [page]);
+}
+
 #[test]
 fn bound_layers_follow_variable_values_and_unbind() {
     let mut s = Session::new();
diff --git a/crates/engine/src/variables_behaviour_tests.rs b/crates/engine/src/variables_behaviour_tests.rs
index 5a868a63..3fe156f8 100644
--- a/crates/engine/src/variables_behaviour_tests.rs
+++ b/crates/engine/src/variables_behaviour_tests.rs
@@ -279,6 +279,34 @@ fn bindings_by_field_and_type() {
     }
 }
 
+#[test]
+fn auto_layout_bindings_go_with_the_auto_layout() {
+    // Docs silent; pinned (#810): removing a frame's auto layout drops its gap and padding bindings,
+    // and a binding never brings an auto layout back. One made without auto layout waits for it.
+    let mut s = Session::new();
+    run(&mut s, "variable.createCollection", json!({"name": "C"}));
+    run(&mut s, "variable.create", json!({"collection": "C", "name": "g", "type": "number", "value": 12}));
+    let removals =
+        [("layout.remove", json!({})), ("node.set", json!({"props": {"layout": null}})), ("node.set", json!({"props": {"layout": "none"}}))];
+    for (cmd, mut p) in removals {
+        let f = frame(&mut s, None);
+        run(&mut s, "layout.add", json!({"ids": [f]}));
+        for field in ["gap", "crossGap", "paddingTop"] {
+            run(&mut s, "variable.bind", json!({"ids": [f], "field": field, "variable": "g"}));
+        }
+        p["ids"] = json!([f]);
+        run(&mut s, cmd, p.clone());
+        let n = node(&s, f);
+        assert!(n.layout.is_none(), "{cmd} {p}: auto layout stays removed");
+        assert!(n.bound.is_empty(), "{cmd} {p}: layout bindings dropped");
+    }
+    let f = frame(&mut s, None);
+    run(&mut s, "variable.bind", json!({"ids": [f], "field": "gap", "variable": "g"}));
+    assert!(node(&s, f).layout.is_none(), "binding gap adds no auto layout");
+    run(&mut s, "layout.add", json!({"ids": [f]}));
+    assert_eq!(node(&s, f).layout.map(|l| l.gap), Some(12.0), "the waiting binding applies to the new auto layout");
+}
+
 #[test]
 fn deleting_a_bound_variable_keeps_the_last_value() {
     // Documented: deleting a variable unbinds what used it, which keeps showing its last value.
@@ -365,3 +393,90 @@ fn number_variables_are_pixels_and_edits_are_one_undo_step() {
     s.undo().unwrap();
     assert_eq!(lh(&s), LineHeight::Pixels(20.0), "the value and the bound layer go back together");
 }
+
+#[test]
+fn create_collection_keeps_at_least_one_named_mode() {
+    // A collection keeps at least one mode (removeMode) and mode names can't be empty (renameMode),
+    // so createCollection refuses an empty mode list, blank mode names and a blank collection name.
+    let mut s = Session::new();
+    for p in [
+        json!({"name": "C", "modes": []}),
+        json!({"name": "C", "modes": [1]}),
+        json!({"name": "C", "modes": ["", "  "]}),
+        json!({"name": "C", "modes": ["A", " "]}),
+        json!({"name": "  "}),
+        json!({"name": ""}),
+    ] {
+        assert!(s.execute("variable.createCollection", &p).is_err(), "{p} should be refused");
+    }
+    assert!(s.doc().unwrap().variables.collections.is_empty(), "a refused call creates nothing");
+    run(&mut s, "variable.createCollection", json!({"name": "C", "modes": [" Light ", "Dark"]}));
+    let names: Vec<String> = s.doc().unwrap().variables.collections[0].modes.iter().map(|m| m.name.clone()).collect();
+    assert_eq!(names, ["Light", "Dark"]);
+}
+
+#[test]
+fn explicit_edits_of_bound_fields_stick_and_detach_that_binding() {
+    // #809: an edit of a bound field detaches its binding (as a paint edit does) instead of
+    // the variable's value coming back; bindings whose value the edit kept stay.
+    let mut s = Session::new();
+    run(&mut s, "variable.createCollection", json!({"name": "C"}));
+    let w = vid(run(&mut s, "variable.create", json!({"collection": "C", "name": "w", "type": "number", "value": 48})));
+    let o = vid(run(&mut s, "variable.create", json!({"collection": "C", "name": "o", "type": "number", "value": 40})));
+    let r = rect(&mut s, None);
+    for (field, v) in [("width", &w), ("height", &w), ("opacity", &o)] {
+        run(&mut s, "variable.bind", json!({"ids": [r], "field": field, "variable": v}));
+    }
+    assert_eq!((node(&s, r).width, node(&s, r).opacity), (48.0, 0.4));
+
+    run(&mut s, "node.set", json!({"ids": [r], "width": 100, "opacity": 0.4}));
+    let n = node(&s, r);
+    assert_eq!(n.width, 100.0);
+    assert!(!n.bound.contains_key("width"));
+    assert!(n.bound.contains_key("height") && n.bound.contains_key("opacity"), "unchanged values keep their bindings");
+
+    run(&mut s, "transform.resize", json!({"ids": [r], "height": 30}));
+    assert_eq!(node(&s, r).height, 30.0);
+    assert!(!node(&s, r).bound.contains_key("height"));
+
+    run(&mut s, "object.opacityKeys", json!({"ids": [r], "digits": "9"}));
+    assert_eq!(node(&s, r).opacity, 0.9);
+    assert!(node(&s, r).bound.is_empty());
+
+    // A value set with its binding in the same call keeps the new binding.
+    run(&mut s, "node.set", json!({"ids": [r], "width": 5, "boundVariables": {"width": w}}));
+    assert_eq!((node(&s, r).width, node(&s, r).bound.get("width")), (48.0, Some(&w)));
+}
+
+#[test]
+fn a_gesture_or_a_text_style_on_a_bound_field_detaches_it() {
+    let mut s = Session::new();
+    run(&mut s, "variable.createCollection", json!({"name": "C"}));
+    let v = vid(run(&mut s, "variable.create", json!({"collection": "C", "name": "r", "type": "number", "value": 8})));
+    let r = rect(&mut s, None);
+    run(&mut s, "variable.bind", json!({"ids": [r], "field": "cornerRadius", "variable": v}));
+    s.begin_interaction("Edit").unwrap();
+    let props = serde_json::Map::from_iter([("cornerRadius".to_string(), json!(2))]);
+    s.preview(|d, _| crate::cmd::props::apply("node.set", d, r, &props)).unwrap();
+    s.commit_interaction().unwrap();
+    assert_eq!(node(&s, r).corners.radii, [2.0; 4]);
+    assert!(node(&s, r).bound.is_empty());
+
+    let t = id(run(&mut s, "text.create", json!({"x": 0, "y": 0, "text": "Hi"})));
+    run(&mut s, "variable.bind", json!({"ids": [t], "field": "fontSize", "variable": v}));
+    run(&mut s, "text.style", json!({"id": t, "fontSize": 20}));
+    assert!(node(&s, t).bound.is_empty());
+    assert_eq!(node(&s, t).kind.text().unwrap().style.font_size, 20.0);
+
+    // The font size/weight/tracking shortcuts and text content edits detach too.
+    run(&mut s, "variable.bind", json!({"ids": [t], "field": "fontSize", "variable": v}));
+    assert_eq!(node(&s, t).kind.text().unwrap().style.font_size, 8.0);
+    run(&mut s, "text.sizeUp", json!({"ids": [t]}));
+    assert_eq!(node(&s, t).kind.text().unwrap().style.font_size, 9.0);
+    assert!(node(&s, t).bound.is_empty());
+    let c = vid(run(&mut s, "variable.create", json!({"collection": "C", "name": "c", "type": "string", "value": "Hello"})));
+    run(&mut s, "variable.bind", json!({"ids": [t], "field": "characters", "variable": c}));
+    run(&mut s, "text.set", json!({"id": t, "characters": "Bye"}));
+    assert_eq!(node(&s, t).kind.text().unwrap().characters, "Bye");
+    assert!(node(&s, t).bound.is_empty());
+}
diff --git a/crates/engine/src/variables_import_shapes_tests.rs b/crates/engine/src/variables_import_shapes_tests.rs
new file mode 100644
index 00000000..067ccab2
--- /dev/null
+++ b/crates/engine/src/variables_import_shapes_tests.rs
@@ -0,0 +1,60 @@
+//! `variable.import` reads `variables` next to `variableCollections`, under `meta` or at the top
+//! level, and never imports nothing without saying so (#790).
+
+use serde_json::{Value, json};
+
+use crate::Session;
+
+fn collections() -> Value {
+    json!({"VC:1": {"id": "VC:1", "name": "Theme", "modes": [{"modeId": "1:0", "name": "Light"}], "defaultModeId": "1:0",
+                    "variableIds": ["VariableID:1"]}})
+}
+
+fn variables() -> Value {
+    json!({"VariableID:1": {"id": "VariableID:1", "name": "bg", "variableCollectionId": "VC:1", "resolvedType": "COLOR",
+                            "valuesByMode": {"1:0": {"r": 1.0, "g": 1.0, "b": 1.0, "a": 1.0}}}})
+}
+
+fn import(json: Value) -> Value {
+    let mut s = Session::new();
+    match s.execute("variable.import", &json!({"variables": json})) {
+        Ok(r) => r,
+        Err(e) => panic!("{e}"),
+    }
+}
+
+#[test]
+fn variables_import_reads_every_shape() {
+    for shape in [
+        json!({"meta": {"variableCollections": collections(), "variables": variables()}}),
+        json!({"variableCollections": collections(), "variables": variables()}),
+        json!({"meta": {"variableCollections": collections()}, "variables": variables()}),
+        json!({"variableCollections": collections(), "meta": {"variables": variables()}}),
+    ] {
+        let r = import(shape.clone());
+        assert_eq!((r["collections"].as_u64(), r["variables"].as_u64()), (Some(1), Some(1)), "{shape}: {r}");
+        assert_eq!(r["warnings"], json!([]), "{shape}: {r}");
+    }
+}
+
+#[test]
+fn variables_import_never_imports_nothing_silently() {
+    // Collections without variables: they are added, with a warning saying where variables go.
+    let r = import(json!({"meta": {"variableCollections": collections()}}));
+    assert_eq!((r["collections"].as_u64(), r["variables"].as_u64()), (Some(1), Some(0)), "{r}");
+    assert!(r["warnings"].to_string().contains("no variables found: expected `meta.variables`"), "{r}");
+    // An empty file's export reads back with the same warning, not an error.
+    let mut s = Session::new();
+    let text = s.execute("variable.export", &json!({})).unwrap()["text"].as_str().unwrap().to_string();
+    let r = s.execute("variable.import", &json!({"variables": text})).unwrap();
+    assert!(r["warnings"].to_string().contains("no variables found"), "{r}");
+    // Collections listing variables that aren't there.
+    let mut colls = collections();
+    colls["VC:1"]["variableIds"] = json!(["VariableID:1", "VariableID:2"]);
+    let r = import(json!({"meta": {"variableCollections": colls, "variables": variables()}}));
+    assert_eq!(r["variables"].as_u64(), Some(1), "{r}");
+    assert!(r["warnings"].to_string().contains("1 of the 2 variables the collections list in `variableIds` weren't imported"), "{r}");
+    // No collections anywhere: an error naming the expected shape.
+    let e = Session::new().execute("variable.import", &json!({"variables": {"variables": variables()}})).unwrap_err().to_string();
+    assert!(e.contains("(`meta.variableCollections` and `meta.variables`)"), "{e}");
+}
diff --git a/crates/engine/src/variables_io_tests.rs b/crates/engine/src/variables_io_tests.rs
index 5c7305bb..e8a0239e 100644
--- a/crates/engine/src/variables_io_tests.rs
+++ b/crates/engine/src/variables_io_tests.rs
@@ -1,5 +1,5 @@
 //! Extended variable collections (overrides, library updates, reset), variables import and
-//! export (JSON round trip, merging by name, CSS, junk), gradient stops bound to variables and
+//! export (JSON round trip, merging by name, CSS, Dart, junk), gradient stops bound to variables and
 //! variant properties driven by string variables.
 
 use figcraft_color::{Color, ColorStop, Gradient, GradientKind, Paint, PaintKind};
@@ -214,9 +214,9 @@ fn variables_export_and_import_round_trip() {
     let css = ex(&mut s, "variable.export", json!({"format": "css", "collections": ["Theme"]}))["text"].as_str().unwrap().to_string();
     for want in [
         ":root {\n",
-        "  --radius: 4;\n",
+        "  --radius: 4px;\n",
         "[data-theme=\"Dark\"] {\n",
-        "  --radius: 6.5;\n",
+        "  --radius: 6.5px;\n",
         "  --accent: var(--color-primary);\n",
         "  --label: \"Say  hi \";\n",
     ] {
@@ -371,3 +371,145 @@ fn variant_properties_follow_string_variables() {
     assert_eq!(main(&s), variants[1]);
     healthy(&s);
 }
+
+#[test]
+fn variables_export_as_dart_constants_for_flutter() {
+    let mut s = Session::new();
+    theme(&mut s);
+    let dart = ex(&mut s, "variable.export", json!({"format": "dart"}))["text"].as_str().unwrap().to_string();
+    for want in [
+        "import 'dart:ui';\n",
+        "/// Theme · Light\nabstract final class Theme {\n",
+        "  static const Color colorPrimary = Color(0x800000FF);\n",
+        "  static const double radius = 4;\n",
+        "  static const String label = 'Say \"hi\"';\n",
+        "  static const bool on = false;\n",
+        "  static const Color accent = Color(0xFF000000);\n",
+        "/// Theme · Dark\nabstract final class ThemeDark {\n",
+        "  static const double radius = 6.5;\n",
+        // An alias is its target's value in that mode.
+        "  static const Color accent = Color(0xFFFFFFFF);\n",
+    ] {
+        assert!(dart.contains(want), "{want:?} in\n{dart}");
+    }
+    // Every class lists every variable once.
+    assert_eq!(dart.matches("static const").count(), 10, "{dart}");
+}
+
+#[test]
+fn dart_export_names_are_valid_dart() {
+    let mut s = Session::new();
+    ex(&mut s, "variable.createCollection", json!({"name": "2 brand-tokens", "modes": ["Default", "high contrast"]}));
+    ex(&mut s, "variable.createCollection", json!({"name": "Brand tokens"}));
+    for name in ["space/2xl", "class", "a b", "a-b", "\u{65e5}\u{672c}", "it's $5\\"] {
+        ex(&mut s, "variable.create", json!({"collection": "2 brand-tokens", "name": name, "type": "string", "value": name}));
+    }
+    let dart = ex(&mut s, "variable.export", json!({"format": "dart"}))["text"].as_str().unwrap().to_string();
+    for want in [
+        "abstract final class V2BrandTokens {",
+        "abstract final class V2BrandTokensHighContrast {",
+        "abstract final class BrandTokens {",
+        "static const String space2xl = 'space/2xl';",
+        "static const String class_ = 'class';",
+        // Two names that read the same in Dart stay apart.
+        "static const String aB = 'a b';",
+        "static const String aB2 = 'a-b';",
+        // Nothing usable in a name: still a name.
+        "static const String v = '\u{65e5}\u{672c}';",
+        "static const String itS5 = 'it\\'s \\$5\\\\';",
+    ] {
+        assert!(dart.contains(want), "{want:?} in\n{dart}");
+    }
+}
+
+#[test]
+fn dart_export_names_never_shadow_dart_types() {
+    let mut s = Session::new();
+    ex(&mut s, "variable.createCollection", json!({"name": "Color"}));
+    ex(&mut s, "variable.createCollection", json!({"name": "String"}));
+    for name in ["double", "int", "bool", "num"] {
+        ex(&mut s, "variable.create", json!({"collection": "Color", "name": name, "type": "number", "value": 1}));
+    }
+    ex(&mut s, "variable.create", json!({"collection": "Color", "name": "ratio", "type": "number", "value": 0.125}));
+    ex(&mut s, "variable.create", json!({"collection": "Color", "name": "third", "type": "number", "value": 1.0 / 3.0}));
+    ex(&mut s, "variable.create", json!({"collection": "Color", "name": "huge", "type": "number", "value": 1.5e21}));
+    let dart = ex(&mut s, "variable.export", json!({"format": "dart"}))["text"].as_str().unwrap().to_string();
+    // A class `Color` would hide dart:ui's `Color`, a constant `double` the type of those after it.
+    for want in [
+        "abstract final class Color_ {",
+        "abstract final class String_ {",
+        "static const double double_ = 1;",
+        "static const double int_ = 1;",
+        "static const double bool_ = 1;",
+        "static const double num_ = 1;",
+        // Numbers keep their full precision.
+        "static const double ratio = 0.125;",
+        "static const double third = 0.3333333333333333;",
+        // Too big for an exact integer literal: an exponent, still a double.
+        "static const double huge = 1.5e21;",
+    ] {
+        assert!(dart.contains(want), "{want:?} in\n{dart}");
+    }
+}
+
+#[test]
+fn paints_replaced_through_node_set_keep_unchanged_stop_bindings() {
+    let mut s = Session::new();
+    let r = gradient_rect(&mut s);
+    ex(&mut s, "variable.bind", json!({"ids": [r], "field": "fills/0/stops/2/color", "variable": "brand"}));
+    ex(&mut s, "variable.bind", json!({"ids": [r], "field": "fills/0/stops/1/color", "variable": "ink"}));
+    let cur = |s: &Session| s.doc().unwrap().node(r).unwrap().fills[0].clone();
+    // Removing the first stop moves both bindings down with their stops.
+    let mut p = cur(&s);
+    if let PaintKind::Gradient(g) = &mut p.kind {
+        g.stops.remove(0);
+    }
+    ex(&mut s, "node.set", json!({"ids": [r], "props": {"fills": [p]}}));
+    assert_eq!(bound_keys(&s, r), ["fills/0/stops/0/color", "fills/0/stops/1/color"]);
+    // Recolouring one bound stop detaches that stop only.
+    let mut p = cur(&s);
+    if let PaintKind::Gradient(g) = &mut p.kind {
+        g.stops[0].color = Color::WHITE;
+    }
+    ex(&mut s, "node.set", json!({"ids": [r], "props": {"fills": [p]}}));
+    assert_eq!(bound_keys(&s, r), ["fills/0/stops/1/color"]);
+    ex(&mut s, "variable.set", json!({"variable": "brand", "value": "#0000ff"}));
+    assert_eq!(stops(&s, r), ["FFFFFF", "0000FF"]);
+    healthy(&s);
+}
+
+#[test]
+fn css_export_gives_lengths_a_unit_and_keeps_opacity_bare() {
+    let mut s = Session::new();
+    ex(&mut s, "variable.createCollection", json!({"name": "Brand"}));
+    ex(&mut s, "variable.create", json!({"collection": "Brand", "name": "card", "type": "number", "value": 12}));
+    ex(&mut s, "variable.create", json!({"collection": "Brand", "name": "fade", "type": "number", "value": 0.5}));
+    ex(&mut s, "variable.create", json!({"collection": "Brand", "name": "half", "type": "number", "value": 0.5}));
+    ex(&mut s, "variable.create", json!({"collection": "Brand", "name": "dim", "type": "number", "value": 1}));
+    ex(&mut s, "variable.set", json!({"variable": "dim", "value": {"alias": "half"}}));
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100})));
+    let g = idv(&ex(&mut s, "frame.create", json!({"x": 200, "y": 0, "width": 100, "height": 100})));
+    ex(&mut s, "node.set", json!({"id": f, "props": {"cornerRadius": 12, "opacity": 0.5}}));
+    ex(&mut s, "variable.bind", json!({"ids": [f], "field": "cornerRadius", "variable": "card"}));
+    ex(&mut s, "variable.bind", json!({"ids": [f], "field": "opacity", "variable": "fade"}));
+    ex(&mut s, "variable.bind", json!({"ids": [g], "field": "opacity", "variable": "dim"}));
+    let css = ex(&mut s, "variable.export", json!({"format": "css"}))["text"].as_str().unwrap_or_default().to_string();
+    // A radius is a length; opacity stays a number, also through an alias it reads.
+    assert!(css.contains("--card: 12px;") && css.contains("--fade: 0.5;") && css.contains("--half: 0.5;"), "{css}");
+}
+
+#[test]
+fn review_a_long_alias_chain_keeps_its_role_to_the_end() {
+    let mut s = Session::new();
+    ex(&mut s, "variable.createCollection", json!({"name": "Brand"}));
+    ex(&mut s, "variable.create", json!({"collection": "Brand", "name": "o0", "type": "number", "value": 0.5}));
+    // o12 -> o11 -> … -> o0: longer than any fixed number of rounds would reach.
+    for i in 1..=12 {
+        ex(&mut s, "variable.create", json!({"collection": "Brand", "name": format!("o{i}"), "type": "number", "value": 1}));
+        ex(&mut s, "variable.set", json!({"variable": format!("o{i}"), "value": {"alias": format!("o{}", i - 1)}}));
+    }
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100})));
+    ex(&mut s, "variable.bind", json!({"ids": [f], "field": "opacity", "variable": "o12"}));
+    let css = ex(&mut s, "variable.export", json!({"format": "css"}))["text"].as_str().unwrap_or_default().to_string();
+    assert!(css.contains("--o0: 0.5;"), "{css}");
+}
diff --git a/crates/engine/src/variants_discovery_tests.rs b/crates/engine/src/variants_discovery_tests.rs
new file mode 100644
index 00000000..b792e727
--- /dev/null
+++ b/crates/engine/src/variants_discovery_tests.rs
@@ -0,0 +1,179 @@
+//! Combine as variants and Add variant where people look for them (#903): the predicates the
+//! context menu and the Design panel offer them by, combining refusing components that are
+//! variants already (it used to put a set inside a set), and Add variant on a main component that
+//! isn't in a set yet making it one.
+
+use serde_json::json;
+
+use crate::Session;
+use crate::cmd::component::{can_add_variant, can_combine_variants};
+use crate::components::tests::{ex, healthy, idv, kids, node};
+use figcraft_doc::*;
+
+/// A main component named `name` at `x`, made from a 120×40 frame with a "Bg" rectangle.
+fn component(s: &mut Session, name: &str, x: f64) -> NodeId {
+    let f = idv(&ex(s, "frame.create", json!({"x": x, "y": 0, "width": 120, "height": 40, "name": name})));
+    ex(s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 120, "height": 40, "parent": f, "props": {"name": "Bg"}}));
+    idv(&ex(s, "component.create", json!({"ids": [f]})))
+}
+
+fn undo_len(s: &Session) -> usize {
+    s.ds().unwrap().history.undo.len()
+}
+
+fn sets(s: &Session) -> usize {
+    s.doc().unwrap().nodes().filter(|n| matches!(n.kind, NodeKind::ComponentSet { .. })).count()
+}
+
+#[test]
+fn combine_is_offered_for_two_or_more_main_components_only() {
+    let mut s = Session::new();
+    let a = component(&mut s, "A", 0.0);
+    let b = component(&mut s, "B", 200.0);
+    let frame = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 300, "width": 50, "height": 50})));
+    let inst = idv(&ex(&mut s, "instance.create", json!({"component": a, "x": 0, "y": 400})));
+    let doc = s.doc().unwrap();
+    assert!(can_combine_variants(doc, &[a, b]));
+    assert!(!can_combine_variants(doc, &[]), "nothing selected");
+    assert!(!can_combine_variants(doc, &[a]), "one component (the command still takes it)");
+    assert!(!can_combine_variants(doc, &[a, a]), "the same component twice");
+    assert!(!can_combine_variants(doc, &[a, frame]), "a frame isn't a component");
+    assert!(!can_combine_variants(doc, &[a, inst]), "an instance isn't a main component");
+
+    let c = component(&mut s, "C", 400.0);
+    let d = component(&mut s, "D", 600.0);
+    let set = idv(&ex(&mut s, "component.combineVariants", json!({"ids": [c, d]})));
+    let doc = s.doc().unwrap();
+    assert!(!can_combine_variants(doc, &[c, d]), "variants of one set");
+    assert!(!can_combine_variants(doc, &[c, a]), "a variant and a lone component");
+    assert!(!can_combine_variants(doc, &[set, a]), "a set isn't a component");
+
+    // Components in different frames still combine.
+    let holder = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 600, "width": 300, "height": 100})));
+    let e = component(&mut s, "E", 0.0);
+    ex(&mut s, "node.reparent", json!({"ids": [e], "parent": holder}));
+    assert!(can_combine_variants(s.doc().unwrap(), &[a, e]));
+}
+
+#[test]
+fn add_variant_is_offered_for_sets_variants_and_lone_components() {
+    let mut s = Session::new();
+    let a = component(&mut s, "A", 0.0);
+    let b = component(&mut s, "B", 200.0);
+    let lone = component(&mut s, "Lone", 400.0);
+    let set = idv(&ex(&mut s, "component.combineVariants", json!({"ids": [a, b]})));
+    let frame = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 300, "width": 50, "height": 50})));
+    let inst = idv(&ex(&mut s, "instance.create", json!({"component": lone, "x": 0, "y": 400})));
+    let doc = s.doc().unwrap();
+    assert!(can_add_variant(doc, set));
+    assert!(can_add_variant(doc, a));
+    assert!(can_add_variant(doc, lone));
+    assert!(!can_add_variant(doc, frame));
+    assert!(!can_add_variant(doc, inst));
+    assert!(!can_add_variant(doc, kids(&s, inst)[0]), "a layer inside an instance");
+    assert!(!can_add_variant(doc, NodeId(999_999)));
+}
+
+#[test]
+fn combining_variants_again_is_refused_instead_of_nesting_sets() {
+    let mut s = Session::new();
+    let a = component(&mut s, "State=Default", 0.0);
+    let b = component(&mut s, "State=Hover", 200.0);
+    let lone = component(&mut s, "State=Pressed", 400.0);
+    let set = idv(&ex(&mut s, "component.combineVariants", json!({"ids": [a, b]})));
+    let before = s.doc().unwrap().clone();
+    let steps = undo_len(&s);
+    for ids in [vec![a, b], vec![a, lone]] {
+        let err = s.execute("component.combineVariants", &json!({"ids": ids})).unwrap_err();
+        assert!(err.to_string().contains("variants already"), "{err}");
+    }
+    assert_eq!(*s.doc().unwrap(), before, "a refused combine changes nothing");
+    assert_eq!(undo_len(&s), steps);
+    assert_eq!(sets(&s), 1);
+    assert_eq!(kids(&s, set), vec![a, b]);
+    // One lone component still makes a set of one (other commands rely on it).
+    ex(&mut s, "component.combineVariants", json!({"ids": [lone]}));
+    assert_eq!(sets(&s), 2);
+    healthy(&s);
+}
+
+#[test]
+fn combining_refuses_nested_components_and_components_inside_instances() {
+    let mut s = Session::new();
+    // A "Card" component holding an "Icon" component.
+    let card = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Card"})));
+    let icon = idv(&ex(&mut s, "frame.create", json!({"x": 10, "y": 10, "width": 20, "height": 20, "name": "Icon", "parent": card})));
+    let icon = idv(&ex(&mut s, "component.create", json!({"ids": [icon]})));
+    let card = idv(&ex(&mut s, "component.create", json!({"ids": [card]})));
+    let other = component(&mut s, "Other", 300.0);
+    let inst = idv(&ex(&mut s, "instance.create", json!({"component": card, "x": 0, "y": 300})));
+    let inner = kids(&s, inst).into_iter().find(|c| matches!(node(&s, *c).kind, NodeKind::Component { .. })).expect("the instance's copy of Icon");
+
+    let doc = s.doc().unwrap();
+    assert!(!can_combine_variants(doc, &[card, icon]), "a component and one inside it");
+    assert!(can_combine_variants(doc, &[icon, other]), "a nested component with another one is fine");
+    assert!(!can_combine_variants(doc, &[inner, other]), "a component inside an instance");
+    let before = s.doc().unwrap().clone();
+    let err = s.execute("component.combineVariants", &json!({"ids": [card, icon]})).unwrap_err();
+    assert!(err.to_string().contains("inside it"), "{err}");
+    assert_eq!(*s.doc().unwrap(), before);
+}
+
+#[test]
+fn add_variant_on_a_lone_component_makes_it_a_set_in_one_step() {
+    let mut s = Session::new();
+    let c = component(&mut s, "Button", 0.0);
+    let inst = idv(&ex(&mut s, "instance.create", json!({"component": c, "x": 0, "y": 300})));
+    let before = s.doc().unwrap().clone();
+    let steps = undo_len(&s);
+
+    let v = idv(&ex(&mut s, "component.addVariant", json!({"id": c})));
+    let set = node(&s, c).parent.unwrap();
+    let set_node = node(&s, set);
+    assert!(matches!(set_node.kind, NodeKind::ComponentSet { .. }));
+    assert_eq!(set_node.name, "Button", "the set takes the component's name");
+    assert_eq!(kids(&s, set), vec![c, v]);
+    assert_eq!(node(&s, c).name, "Property 1=Default");
+    assert_eq!(node(&s, v).name, "Property 1=Variant2");
+    assert_eq!(s.selection(), vec![v]);
+    assert!(set_node.height >= 40.0 * 2.0 + 20.0, "the set wraps both variants: {}", set_node.height);
+    assert!(matches!(node(&s, inst).kind, NodeKind::Instance { component, .. } if component == c), "instances keep their main");
+    assert_eq!(undo_len(&s), steps + 1, "wrapping and adding are one undo step");
+    healthy(&s);
+
+    s.undo().unwrap();
+    assert_eq!(*s.doc().unwrap(), before, "undo puts the lone component back");
+}
+
+#[test]
+fn add_variant_on_a_lone_component_keeps_prop_value_names_and_rolls_back_on_errors() {
+    let mut s = Session::new();
+    let c = component(&mut s, "Size=Small", 0.0);
+    let before = s.doc().unwrap().clone();
+    let steps = undo_len(&s);
+    assert!(s.execute("component.addVariant", &json!({"id": c, "property": "Nope", "value": "x"})).is_err());
+    assert_eq!(*s.doc().unwrap(), before, "a refused Add variant leaves no set behind");
+    assert_eq!(undo_len(&s), steps);
+
+    let v = idv(&ex(&mut s, "component.addVariant", json!({"id": c, "property": "Size", "value": "Large"})));
+    assert_eq!(node(&s, c).name, "Size=Small");
+    assert_eq!(node(&s, v).name, "Size=Large");
+    healthy(&s);
+}
+
+#[test]
+fn add_variant_on_a_lone_component_in_auto_layout_keeps_its_place() {
+    let mut s = Session::new();
+    let row = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 400, "height": 100, "name": "Row"})));
+    ex(&mut s, "layout.add", json!({"ids": [row]}));
+    let first = idv(&ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 40, "height": 40, "parent": row})));
+    let c = component(&mut s, "Chip", 0.0);
+    ex(&mut s, "node.reparent", json!({"ids": [c], "parent": row}));
+    let last = idv(&ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 40, "height": 40, "parent": row})));
+
+    ex(&mut s, "component.addVariant", json!({"id": c}));
+    let set = node(&s, c).parent.unwrap();
+    assert_eq!(kids(&s, row), vec![first, set, last], "the set takes the component's place in the row");
+    assert_eq!(kids(&s, set).len(), 2);
+    healthy(&s);
+}
diff --git a/crates/engine/src/vector_behaviour_tests.rs b/crates/engine/src/vector_behaviour_tests.rs
index 0c472ecc..60cf960e 100644
--- a/crates/engine/src/vector_behaviour_tests.rs
+++ b/crates/engine/src/vector_behaviour_tests.rs
@@ -94,7 +94,8 @@ fn entering_and_leaving_vector_edit_mode() {
         ("Enter", false, "Enter leaves edit mode"),
         ("Escape", false, "Escape leaves edit mode"),
         ("Escape with an open pen path", true, "Escape first ends the pen's path and stays in edit mode"),
-        ("click outside", false, "silent: a click away from the shape leaves edit mode (pinned)"),
+        ("click outside", true, "silent: a click away from the shape only clears the points (pinned)"),
+        ("double-click outside", false, "a double-click away from the shape leaves edit mode"),
     ];
     for (how, after, why) in rows {
         let mut s = Session::new();
@@ -113,6 +114,7 @@ fn entering_and_leaving_vector_edit_mode() {
                 key(&mut s, "Escape", false);
                 assert!(editing(&s).is_some_and(|e| e.anchor.is_none()), "{why}: the path ended");
             }
+            "double-click outside" => s.pointer(&ev(PointerKind::DoubleClick, (600.0, 600.0), NONE)).unwrap(),
             _ => click(&mut s, (600.0, 600.0), NONE),
         }
         assert_eq!(editing(&s).is_some(), after, "{why}");
@@ -133,6 +135,50 @@ fn entering_and_leaving_vector_edit_mode() {
     assert!(matches!(s.doc().unwrap().node(id).unwrap().kind, NodeKind::Rectangle), "converting is one undo step");
 }
 
+#[test]
+fn thin_strokes_are_easy_to_enter_and_bend() {
+    use crate::tools::ToolId;
+    // A diagonal line from (100, 100) to (200, 50); `off` steps away from its middle, square to it.
+    let at = |off: f64| (150.0 + off * 50.0 / 125f64.sqrt() / 10.0, 75.0 + off * 100.0 / 125f64.sqrt() / 10.0);
+    // (layer, screen px off the stroke, in edit mode after a double-click, derivation)
+    let rows: Vec<(&str, f64, bool, &str)> = vec![
+        ("line", 0.0, true, "double-clicking a selected line edits it as a vector"),
+        ("line", 4.0, true, "a 1 px line reaches a few pixels, so a double-click near it still lands (#646)"),
+        ("line", 8.0, false, "a double-click well away from it does not"),
+        ("path", 4.0, true, "a stroke-only path reaches as far as a line does"),
+        ("path", 8.0, false, "and no further"),
+    ];
+    for (layer, off, after, why) in rows {
+        let mut s = Session::new();
+        let id = if layer == "line" {
+            s.set_tool(ToolId::Line);
+            drag(&mut s, (100.0, 100.0), (200.0, 50.0), NONE);
+            *s.selection().first().unwrap()
+        } else {
+            let id = id_of(&ex(&mut s, "vector.create", json!({"points": [[100, 100], [200, 50]], "closed": false}))["id"]).unwrap();
+            // Styled like a pen stroke: 1 px, no fill.
+            ex(&mut s, "node.set", json!({"ids": [id], "props": {"fills": [], "strokes": ["#000000"], "strokeWeight": 1}}));
+            s.set_selection(vec![id]);
+            id
+        };
+        assert!(!s.doc().unwrap().node(id).unwrap().fills.iter().any(|f| f.visible), "{why}: the {layer} only has a stroke");
+        let p = at(off);
+        click(&mut s, p, NONE);
+        s.pointer(&ev(PointerKind::Down, p, NONE)).unwrap();
+        s.pointer(&ev(PointerKind::DoubleClick, p, NONE)).unwrap();
+        s.pointer(&ev(PointerKind::Up, p, NONE)).unwrap();
+        assert_eq!(editing(&s).is_some(), after, "{why}");
+        if after {
+            // Cmd/Ctrl then bends it through the pointer.
+            drag(&mut s, at(0.0), (170.0, 115.0), Mods { cmd: true, ..NONE });
+            let w = s.doc().unwrap().world_transform(id);
+            let n = net(&s, id);
+            assert!(!n.segments[0].is_straight(), "{why}: Cmd/Ctrl bends it");
+            assert!((w * n.cubic(0).unwrap().eval(0.5) - Point::new(170.0, 115.0)).hypot() < 1.0, "{why}: through the pointer");
+        }
+    }
+}
+
 #[test]
 fn the_pen_follows_the_documented_rules() {
     let mut s = Session::new();
@@ -192,7 +238,7 @@ fn selecting_points_and_segments() {
         match what {
             "click tl" => click(&mut s, (0.0, 0.0), m),
             "click tr" => click(&mut s, (100.0, 0.0), m),
-            "click top" => click(&mut s, (50.0, 0.0), m),
+            "click top" => click(&mut s, (30.0, 0.0), m),
             "marquee top" => drag(&mut s, (-20.0, -20.0), (110.0, 10.0), m),
             _ => {
                 ex(&mut s, "vector.edit.tool", json!({"tool": "lasso"}));
@@ -266,7 +312,7 @@ fn deleting_points_vs_delete_and_heal() {
     // Deleting a selected segment keeps its points when others use them.
     let mut s = Session::new();
     let id = square(&mut s, true);
-    click(&mut s, (50.0, 0.0), NONE);
+    click(&mut s, (30.0, 0.0), NONE);
     key(&mut s, "Delete", false);
     let n = net(&s, id);
     assert_eq!((n.vertices.len(), n.segments.len()), (4, 3), "deleting a segment leaves its points");
@@ -395,3 +441,61 @@ fn bend_paint_bucket_cut_join_and_eraser_tools() {
     assert_eq!(net(&s, id).segments.len(), 2, "the eraser removes what it passes over");
     assert_eq!(s.doc().unwrap().node(page).unwrap().children, vec![id], "and the pieces stay one layer");
 }
+
+#[test]
+fn vector_paths_take_the_requested_size_and_refuse_empty_geometry() {
+    let mut s = Session::new();
+    let path = "M0 0 L24 0 L24 24 L0 24 Z";
+    let intrinsic = id_of(&ex(&mut s, "vector.create", json!({"path": path}))["id"]).unwrap();
+    let n = s.doc().unwrap().node(intrinsic).unwrap();
+    assert_eq!((n.width, n.height), (24.0, 24.0), "a path without a size keeps its intrinsic box");
+    // Both sides: each scales independently, like resizing a vector.
+    let both = id_of(&ex(&mut s, "vector.create", json!({"path": path, "width": 16, "height": 8}))["id"]).unwrap();
+    let n = s.doc().unwrap().node(both).unwrap();
+    assert_eq!((n.width, n.height), (16.0, 8.0));
+    let n = net(&s, both);
+    let max = n.vertices.iter().fold((0.0f64, 0.0f64), |(x, y), v| (x.max(v.x), y.max(v.y)));
+    assert!((max.0 - 16.0).abs() < 1e-9 && (max.1 - 8.0).abs() < 1e-9, "{max:?}: the geometry itself is scaled");
+    // One side: the other keeps its proportion.
+    let width = id_of(&ex(&mut s, "vector.create", json!({"path": path, "width": 16}))["id"]).unwrap();
+    let n = s.doc().unwrap().node(width).unwrap();
+    assert_eq!((n.width, n.height), (16.0, 16.0));
+    // A path or point set that draws nothing is an error, not an invisible zero-size layer.
+    let e = s.execute("vector.create", &json!({"path": "M5 5"})).unwrap_err().to_string();
+    assert!(e.contains("draws nothing"), "{e}");
+    let e = s.execute("vector.create", &json!({"points": [[5, 5], [5, 5]]})).unwrap_err().to_string();
+    assert!(e.contains("draws nothing"), "{e}");
+    // A size on an axis the geometry has none of is refused, not silently ignored.
+    let e = s.execute("vector.create", &json!({"path": "M0 0 L0 24", "width": 16})).unwrap_err().to_string();
+    assert!(e.contains("horizontal extent"), "{e}");
+    let e = s.execute("vector.create", &json!({"path": "M0 0 L24 0", "height": 16})).unwrap_err().to_string();
+    assert!(e.contains("vertical extent"), "{e}");
+    // But 0 on an axis it has none of is what it already is: a horizontal line with height 0.
+    let line = id_of(&ex(&mut s, "vector.create", json!({"path": "M0 0 L24 0", "width": 16, "height": 0}))["id"]).unwrap();
+    let n = s.doc().unwrap().node(line).unwrap();
+    assert_eq!((n.width, n.height), (16.0, 0.0));
+    // A size of 0 or less on an axis it has would flatten it, so it is refused, alone or with the other.
+    for p in [json!({"path": path, "width": 0}), json!({"path": path, "width": 16, "height": 0}), json!({"path": path, "width": -4, "height": 8})] {
+        let e = s.execute("vector.create", &p).unwrap_err().to_string();
+        assert!(e.contains("positive"), "{p}: {e}");
+    }
+}
+
+#[test]
+fn vector_points_take_the_requested_size() {
+    let mut s = Session::new();
+    let points = json!([[10, 20], [34, 20], [34, 32]]);
+    let corners = |s: &Session, id: NodeId| net(s, id).vertices.iter().map(|v| (v.x, v.y)).collect::<Vec<_>>();
+    // Both sides: each axis scales on its own; the vertices move with the box.
+    let both = id_of(&ex(&mut s, "vector.create", json!({"points": points, "x": 10, "y": 20, "width": 48, "height": 6}))["id"]).unwrap();
+    let n = s.doc().unwrap().node(both).unwrap();
+    assert_eq!((n.width, n.height), (48.0, 6.0));
+    assert_eq!(corners(&s, both), vec![(0.0, 0.0), (48.0, 0.0), (48.0, 6.0)]);
+    // One side: the other keeps its proportion.
+    let one = id_of(&ex(&mut s, "vector.create", json!({"points": points, "height": 24}))["id"]).unwrap();
+    let n = s.doc().unwrap().node(one).unwrap();
+    assert_eq!((n.width, n.height), (48.0, 24.0));
+    assert_eq!(corners(&s, one), vec![(0.0, 0.0), (48.0, 0.0), (48.0, 24.0)]);
+    let e = s.execute("vector.create", &json!({"points": points, "width": 16, "height": -1})).unwrap_err().to_string();
+    assert!(e.contains("positive"), "{e}");
+}
diff --git a/crates/engine/src/vector_drawable_export_tests.rs b/crates/engine/src/vector_drawable_export_tests.rs
new file mode 100644
index 00000000..4be39980
--- /dev/null
+++ b/crates/engine/src/vector_drawable_export_tests.rs
@@ -0,0 +1,108 @@
+//! Android Vector Drawable (XML) export through the commands: one-off exports with their
+//! warnings, export settings with a compatibility mode (stored, saved, edited), export layers,
+//! and bad values refused.
+
+use base64::Engine as _;
+use figcraft_doc::*;
+use serde_json::{Value, json};
+
+use crate::Session;
+use crate::params::id_of;
+
+/// A session with a 48 × 24 frame holding two overlapping rectangles at 50% opacity.
+fn session() -> (Session, NodeId) {
+    let mut s = Session::new();
+    let r = s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 48, "height": 24, "name": "Badge"})).unwrap();
+    let f = id_of(&r["id"]).unwrap();
+    for x in [0, 12] {
+        s.execute("shape.rectangle", &json!({"x": x, "y": 0, "width": 24, "height": 24, "parent": f})).unwrap();
+    }
+    s.execute("node.set", &json!({"ids": [f], "props": {"opacity": 0.5}})).unwrap();
+    s.set_selection(vec![f]);
+    (s, f)
+}
+
+fn xml(r: &Value) -> String {
+    let bytes = base64::engine::general_purpose::STANDARD.decode(r["data"].as_str().unwrap()).unwrap();
+    String::from_utf8(bytes).unwrap()
+}
+
+#[test]
+fn a_one_off_export_returns_the_drawable_and_its_warnings() {
+    let (mut s, f) = session();
+    let r = s.execute("file.export", &json!({"ids": [f], "format": "xml"})).unwrap();
+    assert_eq!(r["format"], "xml");
+    let x = xml(&r);
+    assert!(x.starts_with("<?xml") && x.contains("<vector") && x.contains("android:width=\"48dp\""), "{x}");
+    assert_eq!(r["warnings"], json!(["layer opacity was applied to each shape: where shapes overlap they look denser (Badge)"]));
+    // Exact leaves the faded frame out; ignore draws it opaque, without warnings.
+    let r = s.execute("file.export", &json!({"ids": [f], "format": "xml", "vdCompat": "exact"})).unwrap();
+    assert!(!xml(&r).contains("fillColor"), "{}", xml(&r));
+    // Still a valid (empty) drawable, and it says so.
+    assert_eq!(r["warnings"].as_array().map(Vec::len), Some(2));
+    assert_eq!(r["warnings"][1], "nothing in it could be drawn: the drawable is empty (Badge)");
+    let r = s.execute("file.export", &json!({"ids": [f], "format": "xml", "vdCompat": "ignore"})).unwrap();
+    assert_eq!(r["warnings"], json!([]));
+    // Names only when asked.
+    assert!(!xml(&r).contains("android:name"));
+    let r = s.execute("file.export", &json!({"ids": [f], "format": "xml", "svgIdAttribute": true})).unwrap();
+    assert!(xml(&r).contains("android:name=\"Badge\""), "{}", xml(&r));
+    // Other formats don't grow a `warnings` field.
+    assert!(s.execute("file.export", &json!({"ids": [f], "format": "svg"})).unwrap().get("warnings").is_none());
+}
+
+#[test]
+fn a_path_ending_in_xml_picks_the_format() {
+    let (mut s, f) = session();
+    let dir = std::env::temp_dir().join(format!("figcraft-vd-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("badge.xml");
+    let r = s.execute("file.export", &json!({"ids": [f], "path": path.to_string_lossy()})).unwrap();
+    assert_eq!(r["format"], "xml");
+    assert!(std::fs::read_to_string(&path).unwrap().contains("<vector"));
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn export_settings_keep_their_compatibility_mode() {
+    let (mut s, f) = session();
+    s.execute("export.add", &json!({"ids": [f], "setting": {"format": "xml", "vdCompat": "exact"}})).unwrap();
+    let e = s.doc().unwrap().node(f).unwrap().exports[0].clone();
+    assert_eq!((e.format, e.vd_compat), (ExportFormat::VectorDrawable, VdCompat::Exact));
+    // Stored camelCase, the default left out.
+    let v = serde_json::to_value(&e).unwrap();
+    assert_eq!((v["format"].as_str(), v["vdCompat"].as_str()), (Some("vectorDrawable"), Some("exact")));
+    assert!(serde_json::to_value(ExportSetting::default()).unwrap().get("vdCompat").is_none());
+    // Saved and loaded.
+    let bytes = figcraft_format::save_bytes(s.doc().unwrap(), None).unwrap();
+    let (back, _) = figcraft_format::load_bytes(&bytes).unwrap();
+    assert_eq!(back.node(f).unwrap().exports[0], e);
+    // Edited and undone.
+    s.execute("export.update", &json!({"ids": [f], "index": 0, "vdCompat": "ignore"})).unwrap();
+    assert_eq!(s.doc().unwrap().node(f).unwrap().exports[0].vd_compat, VdCompat::Ignore);
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(s.doc().unwrap().node(f).unwrap().exports[0].vd_compat, VdCompat::Exact);
+    // Export layers: one .xml file with its warnings; a vdCompat passed there wins.
+    let r = s.execute("file.exportLayers", &json!({"ids": [f]})).unwrap();
+    let file = &r["files"][0];
+    assert_eq!(file["name"], "Badge.xml");
+    assert_eq!(file["warnings"].as_array().map(Vec::len), Some(2), "exact: left out, so empty");
+    let r = s.execute("file.exportLayers", &json!({"ids": [f], "vdCompat": "ignore"})).unwrap();
+    assert_eq!(r["files"][0]["warnings"], json!([]));
+}
+
+#[test]
+fn bad_values_are_refused_and_change_nothing() {
+    let (mut s, f) = session();
+    s.execute("export.add", &json!({"ids": [f], "setting": {"format": "xml"}})).unwrap();
+    for junk in [json!("loose"), json!(3), json!(true), json!("BESTEFFORT"), json!({})] {
+        assert!(s.execute("file.export", &json!({"ids": [f], "format": "xml", "vdCompat": junk})).is_err(), "{junk}");
+        assert!(s.execute("export.update", &json!({"ids": [f], "index": 0, "vdCompat": junk})).is_err(), "{junk}");
+        assert!(s.execute("export.add", &json!({"ids": [f], "setting": {"vdCompat": junk}})).is_err(), "{junk}");
+        assert!(s.execute("file.exportLayers", &json!({"ids": [f], "vdCompat": junk})).is_err(), "{junk}");
+    }
+    let n = s.doc().unwrap().node(f).unwrap();
+    assert_eq!((n.exports.len(), n.exports[0].vd_compat), (1, VdCompat::BestEffort));
+    let err = s.execute("file.export", &json!({"ids": [f], "format": "vml"})).unwrap_err().to_string();
+    assert!(err.contains("xml"), "{err}");
+}
diff --git a/crates/engine/src/vector_fill_rule_tests.rs b/crates/engine/src/vector_fill_rule_tests.rs
new file mode 100644
index 00000000..8a8fe850
--- /dev/null
+++ b/crates/engine/src/vector_fill_rule_tests.rs
@@ -0,0 +1,306 @@
+//! Fill rules on vectors: `vector.fillRule` sets the rule a filled area fills by and
+//! `vector.reverseLoop` turns one of its loops round — which is how a hole is made and unmade.
+//! The numbers come from the two rules' definitions: non-zero fills where the winding count is not
+//! zero (so a hole is a loop running against its outer loop), even-odd where it is odd (so the
+//! direction of a loop doesn't matter).
+
+use figcraft_doc::{NodeId, NodeKind, Region, Segment, VectorNetwork, Vertex, WindingRule};
+use figcraft_geom::{BezPath, Point};
+use serde_json::{Value, json};
+
+use crate::Session;
+
+fn ex(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd}: {e}"))
+}
+
+fn net(s: &Session, id: NodeId) -> VectorNetwork {
+    match &s.doc().unwrap().node(id).unwrap().kind {
+        NodeKind::Vector { network } => network.clone(),
+        other => panic!("not a vector: {other:?}"),
+    }
+}
+
+/// A 100 × 100 square with a 25…75 hole, both loops in one area: the outer one clockwise, the inner
+/// one the same way round (so non-zero fills the hole too until it is turned round).
+fn ring() -> VectorNetwork {
+    let mut path = BezPath::new();
+    for (x0, y0, x1, y1) in [(0.0, 0.0, 100.0, 100.0), (25.0, 25.0, 75.0, 75.0)] {
+        path.move_to((x0, y0));
+        path.line_to((x1, y0));
+        path.line_to((x1, y1));
+        path.line_to((x0, y1));
+        path.close_path();
+    }
+    let mut net = VectorNetwork::from_path(&path);
+    net.regions[0].winding = WindingRule::NonZero;
+    net
+}
+
+/// A selected vector layer holding `network`.
+fn vector_layer(s: &mut Session, network: VectorNetwork) -> NodeId {
+    let id = s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 100})).unwrap()["id"].as_u64().unwrap();
+    let id = NodeId(id);
+    ex(s, "vector.edit.begin", json!({"id": id}));
+    ex(s, "vector.edit.end", json!({}));
+    {
+        let doc = s.doc_mut().unwrap();
+        match &mut doc.get_mut(id).unwrap().kind {
+            NodeKind::Vector { network: net } => *net = network,
+            other => panic!("not a vector: {other:?}"),
+        }
+    }
+    ex(s, "select.set", json!({"ids": [id]}));
+    id
+}
+
+/// A selected vector layer holding `ring()`.
+fn ringed(s: &mut Session) -> NodeId {
+    vector_layer(s, ring())
+}
+
+/// Two 50 × 100 squares side by side share the vertical edge between them: one segment listed by
+/// both areas' single loops. A segment shared between areas is the case `vector.reverseLoop` must
+/// not flip, or a neighbour's fill or stroke would turn round with it.
+fn two_squares() -> VectorNetwork {
+    // 0:A(0,0) 1:B(50,0) 2:C(100,0) 3:D(100,100) 4:E(50,100) 5:F(0,100)
+    // s0 A→B (left bottom), s1 B→E (the shared vertical edge), s2 E→F (left top),
+    // s3 F→A (left left), s4 B→C (right bottom), s5 C→D (right right), s6 D→E (right top);
+    // the right area's left edge is s1 walked the other way, so the squares share one segment.
+    // region 0: left square A→B→E→F→A = [s0, s1, s2, s3].
+    // region 1: right square B→C→D→E→B = [s4, s5, s6, s1] (s1 walked backwards).
+    VectorNetwork {
+        vertices: vec![
+            Vertex::new(0.0, 0.0),
+            Vertex::new(50.0, 0.0),
+            Vertex::new(100.0, 0.0),
+            Vertex::new(100.0, 100.0),
+            Vertex::new(50.0, 100.0),
+            Vertex::new(0.0, 100.0),
+        ],
+        segments: vec![
+            Segment::line(0, 1),
+            Segment::line(1, 4),
+            Segment::line(4, 5),
+            Segment::line(5, 0),
+            Segment::line(1, 2),
+            Segment::line(2, 3),
+            Segment::line(3, 4),
+        ],
+        regions: vec![
+            Region { loops: vec![vec![0, 1, 2, 3]], winding: WindingRule::NonZero },
+            Region { loops: vec![vec![4, 5, 6, 1]], winding: WindingRule::NonZero },
+        ],
+    }
+}
+
+/// A selected vector layer holding [`two_squares`].
+fn squared(s: &mut Session) -> NodeId {
+    vector_layer(s, two_squares())
+}
+
+/// Two areas of two segments each over the same line: one curve above it and one below. Both areas
+/// list the line's segment — the first area first (`[line, above]`), the second area last
+/// (`[below, line]`) — and a two-segment ring reads the same whichever way its list is turned, so
+/// these only turn round when a segment is stored the other way.
+fn two_lenses() -> VectorNetwork {
+    // 0:A(0,0) 1:B(100,0)
+    // s0 A→B the straight line both areas use; s1 B→A curving above it; s2 A→B curving below it.
+    VectorNetwork {
+        vertices: vec![Vertex::new(0.0, 0.0), Vertex::new(100.0, 0.0)],
+        segments: vec![
+            Segment::line(0, 1),
+            Segment { a: 1, b: 0, ta: (0.0, -50.0), tb: (0.0, -50.0) },
+            Segment { a: 0, b: 1, ta: (0.0, 50.0), tb: (0.0, 50.0) },
+        ],
+        regions: vec![
+            Region { loops: vec![vec![0, 1]], winding: WindingRule::NonZero },
+            Region { loops: vec![vec![2, 0]], winding: WindingRule::NonZero },
+        ],
+    }
+}
+
+/// A selected vector layer holding [`two_lenses`].
+fn lensed(s: &mut Session) -> NodeId {
+    vector_layer(s, two_lenses())
+}
+
+/// Two areas whose only loop is the same closed segment (a curve the path closes with a straight
+/// line): a one-segment loop's direction is its segment's stored ends, and both areas read them.
+fn one_shared_segment() -> VectorNetwork {
+    VectorNetwork {
+        vertices: vec![Vertex::new(0.0, 0.0), Vertex::new(100.0, 0.0)],
+        segments: vec![Segment { a: 0, b: 1, ta: (0.0, -60.0), tb: (0.0, -60.0) }],
+        regions: vec![Region { loops: vec![vec![0]], winding: WindingRule::NonZero }, Region { loops: vec![vec![0]], winding: WindingRule::NonZero }],
+    }
+}
+
+/// The point in the middle of the hole, and one on the square's left band.
+const HOLE: Point = Point::new(50.0, 50.0);
+const BAND: Point = Point::new(10.0, 50.0);
+
+#[test]
+fn a_loop_running_with_its_outer_loop_fills_the_hole_until_it_is_turned_round() {
+    let mut s = Session::new();
+    let id = ringed(&mut s);
+    let n = net(&s, id);
+    assert_eq!(n.regions.len(), 1);
+    assert_eq!(n.regions[0].loops.len(), 2, "an outer loop and the hole's");
+    assert!(n.region_contains(0, BAND), "the band fills");
+    assert!(n.region_contains(0, HOLE), "the hole fills while its loop runs the same way");
+    // Turning the inner loop round makes it a hole under non-zero.
+    let r = ex(&mut s, "vector.reverseLoop", json!({"id": id, "region": 0, "loop": 1}));
+    assert_eq!(r["reversed"], json!(true));
+    let n = net(&s, id);
+    assert!(n.region_contains(0, BAND), "the band still fills");
+    assert!(!n.region_contains(0, HOLE), "the hole is empty");
+    assert_eq!(n.region_winding(0, HOLE), Some(0), "its loops cancel out there");
+    // Undo turns it back.
+    s.undo().unwrap();
+    assert!(net(&s, id).region_contains(0, HOLE), "one undo step restores the loop");
+}
+
+#[test]
+fn the_rule_switches_every_area_or_only_the_one_asked_for() {
+    let mut s = Session::new();
+    let id = ringed(&mut s);
+    // Even-odd leaves the hole empty whatever way its loop runs.
+    let r = ex(&mut s, "vector.fillRule", json!({"id": id, "rule": "evenOdd"}));
+    assert_eq!((r["regions"].clone(), r["rule"].clone()), (json!(1), json!("evenOdd")));
+    let n = net(&s, id);
+    assert_eq!(n.regions[0].winding, WindingRule::EvenOdd);
+    assert!(!n.region_contains(0, HOLE), "even-odd counts the hole's loop as a second crossing");
+    // And back.
+    ex(&mut s, "vector.fillRule", json!({"id": id, "rule": "nonZero"}));
+    assert!(net(&s, id).region_contains(0, HOLE), "non-zero fills it again");
+    // One area of several, by index.
+    let n = net(&s, id);
+    let mut two = n.clone();
+    two.regions.push(n.regions[0].clone());
+    {
+        let doc = s.doc_mut().unwrap();
+        match &mut doc.get_mut(id).unwrap().kind {
+            NodeKind::Vector { network } => *network = two,
+            other => panic!("not a vector: {other:?}"),
+        }
+    }
+    ex(&mut s, "vector.fillRule", json!({"id": id, "region": 1, "rule": "evenOdd"}));
+    let n = net(&s, id);
+    assert_eq!(n.regions[0].winding, WindingRule::NonZero, "the other area keeps its rule");
+    assert_eq!(n.regions[1].winding, WindingRule::EvenOdd);
+    // Every area at once.
+    ex(&mut s, "vector.fillRule", json!({"id": id, "rule": "evenOdd"}));
+    assert!(net(&s, id).regions.iter().all(|r| r.winding == WindingRule::EvenOdd));
+}
+
+#[test]
+fn junk_parameters_are_refused_and_change_nothing() {
+    let mut s = Session::new();
+    let id = ringed(&mut s);
+    let before = net(&s, id);
+    for p in [
+        json!({"id": id, "rule": "nope"}),
+        json!({"id": id}),
+        json!({"id": id, "rule": 7}),
+        json!({"id": id, "rule": "evenOdd", "region": -1}),
+        json!({"id": id, "rule": "evenOdd", "region": 1.5}),
+        json!({"id": id, "rule": "evenOdd", "region": "x"}),
+        json!({"id": id, "rule": "evenOdd", "region": 99}),
+    ] {
+        assert!(s.execute("vector.fillRule", &p).is_err(), "{p} is refused");
+    }
+    for p in [
+        json!({"id": id}),
+        json!({"id": id, "region": 0}),
+        json!({"id": id, "region": 0, "loop": 99}),
+        json!({"id": id, "region": 99, "loop": 0}),
+        json!({"id": id, "region": -2, "loop": 0}),
+    ] {
+        assert!(s.execute("vector.reverseLoop", &p).is_err(), "{p} is refused");
+    }
+    assert_eq!(net(&s, id), before, "nothing changed");
+    // A rectangle that was never a vector is refused too.
+    let rect = s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap()["id"].as_u64().unwrap();
+    assert!(s.execute("vector.fillRule", &json!({"id": rect, "rule": "evenOdd"})).is_err());
+    assert!(s.execute("vector.reverseLoop", &json!({"id": rect, "region": 0, "loop": 0})).is_err());
+}
+
+#[test]
+fn reversing_a_loop_shared_with_a_neighbour_leaves_its_segment_and_fill_alone() {
+    let mut s = Session::new();
+    let id = squared(&mut s);
+    let n = net(&s, id);
+    assert_eq!(n.regions.len(), 2, "two areas, side by side");
+    // Both areas fill under non-zero: a point in each.
+    assert!(n.region_contains(0, Point::new(25.0, 50.0)), "the left area fills");
+    assert!(n.region_contains(1, Point::new(75.0, 50.0)), "the right area fills");
+    // The vertical edge between them is one segment listed by both areas' loops.
+    const SHARED: usize = 1;
+    assert!(n.regions[0].loops[0].contains(&SHARED) && n.regions[1].loops[0].contains(&SHARED), "one segment is shared");
+    let before = n.segments[SHARED];
+    let left_winding = n.region_winding(0, Point::new(25.0, 50.0)).unwrap();
+    assert_ne!(left_winding, 0, "the left area winds once");
+    // Reverse the left area's only loop.
+    let r = ex(&mut s, "vector.reverseLoop", json!({"id": id, "region": 0, "loop": 0}));
+    assert_eq!(r["reversed"], json!(true));
+    let n = net(&s, id);
+    // The shared segment's stored ends are untouched: reversing the loop must not flip a neighbour's
+    // segment (reversing the list already turns this loop's traversal of it the other way).
+    assert_eq!(n.segments[SHARED], before, "the shared segment is left as it was");
+    // The neighbour's fill is unchanged: it still fills its interior.
+    assert!(n.region_contains(1, Point::new(75.0, 50.0)), "the neighbour still fills");
+    // The reversed loop really turned round: its winding at a left-area point flipped sign.
+    assert_eq!(n.region_winding(0, Point::new(25.0, 50.0)), Some(-left_winding), "the left loop reversed");
+    // Undo restores the shared segment and the loop.
+    s.undo().unwrap();
+    assert_eq!(net(&s, id).segments[SHARED], before, "undo restores the shared segment too");
+}
+
+#[test]
+fn a_two_segment_loop_turns_round_with_its_shared_segment_listed_first_or_last() {
+    let mut s = Session::new();
+    let id = lensed(&mut s);
+    const SHARED: usize = 0;
+    const ABOVE: Point = Point::new(50.0, -25.0);
+    const BELOW: Point = Point::new(50.0, 25.0);
+    let n = net(&s, id);
+    assert_eq!(n.regions.len(), 2, "two areas over the same line");
+    assert_eq!((n.regions[0].loops[0][0], n.regions[0].loops[0].len()), (SHARED, 2), "the shared segment is listed first");
+    assert_eq!((n.regions[1].loops[0][1], n.regions[1].loops[0].len()), (SHARED, 2), "and last");
+    assert!(n.region_contains(0, ABOVE), "the area above the line fills");
+    assert!(n.region_contains(1, BELOW), "the area below it fills");
+    let (above, below) = (n.region_winding(0, ABOVE).unwrap(), n.region_winding(1, BELOW).unwrap());
+    assert_ne!(above, 0, "the area above winds once");
+    assert_ne!(below, 0, "the area below winds once");
+    let shared = n.segments[SHARED];
+    // Turn the area that lists the shared segment first round: a two-segment ring reads the same
+    // either way, so this only works by storing one of its segments the other way.
+    assert_eq!(ex(&mut s, "vector.reverseLoop", json!({"id": id, "region": 0, "loop": 0}))["reversed"], json!(true));
+    let n = net(&s, id);
+    assert_eq!(n.segments[SHARED], shared, "the shared segment keeps its ends");
+    assert!(n.region_contains(0, ABOVE), "the area still fills");
+    assert_eq!(n.region_winding(0, ABOVE), Some(-above), "it really turned round");
+    assert_eq!(n.region_winding(1, BELOW), Some(below), "the neighbour did not");
+    // And the area that lists it last.
+    ex(&mut s, "vector.reverseLoop", json!({"id": id, "region": 1, "loop": 0}));
+    let n = net(&s, id);
+    assert_eq!(n.segments[SHARED], shared, "still untouched");
+    assert_eq!(n.region_winding(1, BELOW), Some(-below), "the second area really turned round");
+    assert_eq!(n.region_winding(0, ABOVE), Some(-above), "the first stays as it was");
+    // Undo turns each back.
+    s.undo().unwrap();
+    assert_eq!(net(&s, id).region_winding(1, BELOW), Some(below), "undo turns the second back");
+    s.undo().unwrap();
+    assert_eq!(net(&s, id).region_winding(0, ABOVE), Some(above), "and the first");
+}
+
+#[test]
+fn a_one_segment_loop_shared_with_another_is_refused_instead_of_claiming_a_turn() {
+    let mut s = Session::new();
+    let id = vector_layer(&mut s, one_shared_segment());
+    let before = net(&s, id);
+    let err = s.execute("vector.reverseLoop", &json!({"id": id, "region": 0, "loop": 0})).unwrap_err();
+    let message = err.to_string();
+    assert!(message.contains("shares its segments"), "the error says why: {message}");
+    assert_eq!(net(&s, id), before, "nothing changed");
+}
diff --git a/crates/engine/src/vector_multi_behaviour_tests.rs b/crates/engine/src/vector_multi_behaviour_tests.rs
index 1d2075b1..2afaf9a2 100644
--- a/crates/engine/src/vector_multi_behaviour_tests.rs
+++ b/crates/engine/src/vector_multi_behaviour_tests.rs
@@ -169,13 +169,19 @@ fn editing_several_vectors_at_once() {
     assert!(near(page_pos(&s, a, atl), (1.0, 0.0)) && near(page_pos(&s, b, btl), (201.0, 0.0)), "an arrow nudges the points in every layer");
     s.undo().unwrap();
     assert!(near(page_pos(&s, a, atl), (0.0, 0.0)) && near(page_pos(&s, b, btl), (200.0, 0.0)), "one undo step for every layer");
-    // Dragging one selected point drags them all.
-    let active = editing(&s).unwrap().id;
-    let grab = if active == a { (0.0, 0.0) } else { (200.0, 0.0) };
-    drag(&mut s, grab, (grab.0 + 10.0, grab.1 + 20.0), NONE);
-    assert!(near(page_pos(&s, a, atl), (10.0, 20.0)) && near(page_pos(&s, b, btl), (210.0, 20.0)), "dragging one selected point moves them all");
+    // Dragging one selected point drags them all (one on the transform box's edge: its corners
+    // scale, as with points of one layer).
+    let atr = point_at(&s, a, (100.0, 0.0));
+    ex(&mut s, "vector.edit.select", json!({"id": a, "vertices": [atr], "add": true}));
+    drag(&mut s, (100.0, 0.0), (110.0, 20.0), NONE);
+    assert!(
+        near(page_pos(&s, a, atl), (10.0, 20.0)) && near(page_pos(&s, a, atr), (110.0, 20.0)) && near(page_pos(&s, b, btl), (210.0, 20.0)),
+        "dragging one selected point moves them all"
+    );
     s.undo().unwrap();
     assert!(near(page_pos(&s, a, atl), (0.0, 0.0)) && near(page_pos(&s, b, btl), (200.0, 0.0)), "the drag is one undo step");
+    ex(&mut s, "vector.edit.select", json!({"vertices": [atl]}));
+    ex(&mut s, "vector.edit.select", json!({"id": b, "vertices": [btl], "add": true}));
     // Corner radius, mirroring and deleting reach every layer's selected points.
     ex(&mut s, "vector.edit.cornerRadius", json!({"radius": 10}));
     assert!(net(&s, a).vertices[atl].radius == 10.0 && net(&s, b).vertices[btl].radius == 10.0, "the corner radius applies to every layer");
@@ -203,13 +209,16 @@ fn editing_several_vectors_at_once() {
     assert_eq!((net(&s, a).vertices.len(), net(&s, b).vertices.len()), (5, 4), "silent: the pen adds to the active layer (pinned)");
     ex(&mut s, "vector.edit.penEnd", json!({}));
     ex(&mut s, "vector.edit.tool", json!({"tool": "move"}));
-    // A click on empty canvas inside an edited layer's area keeps edit mode; far away it ends.
+    // A click on empty canvas inside an edited layer's area keeps edit mode; so does one far
+    // away, which only clears the points (a double-click or Escape leaves).
     click(&mut s, (250.0, 50.0), NONE);
     assert!(editing(&s).is_some(), "a click inside an edited layer clears the points and stays");
     let st = ex(&mut s, "vector.edit.state", json!({}));
     assert_eq!(st["layers"].as_array().map(Vec::len), Some(2), "the state lists every edited layer");
     click(&mut s, (900.0, 900.0), NONE);
-    assert!(editing(&s).is_none(), "a click away from every edited layer leaves edit mode");
+    assert!(editing(&s).is_some(), "a click away from every edited layer keeps edit mode");
+    s.pointer(&ev(PointerKind::DoubleClick, (900.0, 900.0), NONE)).unwrap();
+    assert!(editing(&s).is_none(), "a double-click away from every edited layer leaves edit mode");
 }
 
 #[test]
diff --git a/crates/engine/src/vector_offset_tests.rs b/crates/engine/src/vector_offset_tests.rs
new file mode 100644
index 00000000..e47158f2
--- /dev/null
+++ b/crates/engine/src/vector_offset_tests.rs
@@ -0,0 +1,49 @@
+//! `vector.offset` on layers with children: containers are left alone.
+
+use serde_json::{Value, json};
+
+use crate::Session;
+use crate::params::id_of;
+use figcraft_doc::{NodeId, NodeKind};
+
+fn id(v: &Value) -> NodeId {
+    id_of(&v["id"]).unwrap()
+}
+
+/// No node that holds children may be a non-container.
+fn assert_children_only_in_containers(s: &Session, ids: &[NodeId]) {
+    let doc = s.doc().unwrap();
+    for &i in ids {
+        let n = doc.node(i).unwrap();
+        assert!(n.kind.is_container() || n.kind.is_frame_like() || n.children.is_empty(), "a non-container layer now holds children");
+    }
+}
+
+#[test]
+fn offset_path_leaves_containers_with_children_alone() {
+    let mut s = Session::new();
+    let f = id(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 100, "height": 100})).unwrap());
+    let inner = id(&s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 10, "height": 10, "parent": f})).unwrap());
+    let a = id(&s.execute("shape.rectangle", &json!({"x": 200, "y": 0, "width": 10, "height": 10})).unwrap());
+    let b = id(&s.execute("shape.rectangle", &json!({"x": 220, "y": 0, "width": 10, "height": 10})).unwrap());
+    let g = id(&s.execute("object.group", &json!({"ids": [a, b]})).unwrap());
+    for target in [f, g] {
+        s.execute("vector.offset", &json!({"ids": [target], "offset": 5})).unwrap();
+        assert_children_only_in_containers(&s, &[f, g, inner, a, b]);
+    }
+    let doc = s.doc().unwrap();
+    assert!(doc.node(f).unwrap().kind.is_container());
+    assert_eq!(doc.node(f).unwrap().children, vec![inner]);
+    assert!(doc.node(g).unwrap().kind.is_container());
+    assert_eq!(doc.node(g).unwrap().children.len(), 2);
+}
+
+#[test]
+fn offset_path_still_converts_a_plain_rectangle() {
+    let mut s = Session::new();
+    let r = id(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap());
+    s.execute("vector.offset", &json!({"ids": [r], "offset": 5})).unwrap();
+    let n = s.doc().unwrap().node(r).unwrap().clone();
+    assert!(matches!(n.kind, NodeKind::Vector { .. }));
+    assert!(n.width > 10.0);
+}
diff --git a/crates/engine/src/vector_path_set_tests.rs b/crates/engine/src/vector_path_set_tests.rs
new file mode 100644
index 00000000..7e714853
--- /dev/null
+++ b/crates/engine/src/vector_path_set_tests.rs
@@ -0,0 +1,263 @@
+//! `node.set {path}` replaces a vector's geometry and keeps the layer (#1001): its id, name, place in
+//! the layer list, paints, effects, styles, bindings and constraints. The path is read as
+//! `node.create` reads it (`width`/`height` scale it), its own box goes at the layer's origin (or at
+//! `x`/`y` plus the box's offset, as create places it), undo brings the old path back, and data that
+//! can't draw, layers that aren't vectors and layers inside an instance are refused.
+
+use figcraft_doc::{NodeId, NodeKind, VectorNetwork};
+use serde_json::{Value, json};
+
+use crate::{EngineError, Session};
+
+fn ex(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd}: {e}"))
+}
+
+fn id(v: &Value) -> NodeId {
+    crate::params::id_of(&v["id"]).unwrap()
+}
+
+fn vector(s: &mut Session, p: Value) -> NodeId {
+    let mut p = p;
+    p["type"] = json!("vector");
+    id(&ex(s, "node.create", p))
+}
+
+fn net(s: &Session, v: NodeId) -> VectorNetwork {
+    crate::vectoredit::network(s.doc().unwrap(), v).unwrap().clone()
+}
+
+/// The layer's x, y, width and height as `get_node` reports them.
+fn frame(s: &Session, v: NodeId) -> (f64, f64, f64, f64) {
+    let d = crate::cmd::props::describe(s.doc().unwrap(), v);
+    let f = |k: &str| d[k].as_f64().unwrap();
+    (f("x"), f("y"), f("width"), f("height"))
+}
+
+fn bad_msg(r: crate::Result<Value>) -> String {
+    match r {
+        Err(EngineError::BadParams { msg, .. }) => msg,
+        other => panic!("expected BadParams, got {other:?}"),
+    }
+}
+
+#[test]
+fn a_new_path_keeps_the_layer() {
+    let mut s = Session::new();
+    ex(&mut s, "variable.createCollection", json!({"name": "T"}));
+    ex(&mut s, "variable.create", json!({"collection": "T", "name": "brand", "type": "color", "value": "#FF0000"}));
+    let below = vector(&mut s, json!({"path": "M0 0 L5 5"}));
+    let v = vector(&mut s, json!({"name": "Chart line", "path": "M0 0 L10 10", "x": 40, "y": 30}));
+    let above = vector(&mut s, json!({"path": "M0 0 L5 5"}));
+    ex(
+        &mut s,
+        "node.set",
+        json!({"id": v, "props": {"stroke": "#00FF00", "strokeWeight": 3, "opacity": 0.5,
+            "effects": [{"type": "dropShadow", "color": "#00000040", "offset": [0, 2], "radius": 4}],
+            "constraints": {"horizontal": "right", "vertical": "bottom"}}}),
+    );
+    ex(&mut s, "variable.bind", json!({"ids": [v], "field": "fill", "variable": "brand"}));
+    let before = s.doc().unwrap().node(v).unwrap().clone();
+
+    let out = ex(&mut s, "node.set", json!({"ids": [v], "props": {"path": "M0 0 L20 0 L20 8 Z"}}));
+    assert!(out.get("warnings").is_none(), "{out}");
+    let doc = s.doc().unwrap();
+    let n = doc.node(v).unwrap();
+    assert_eq!((n.id, n.name.as_str()), (v, "Chart line"));
+    assert_eq!((&n.fills, &n.strokes, &n.stroke, &n.effects), (&before.fills, &before.strokes, &before.stroke, &before.effects));
+    assert_eq!((n.opacity, &n.bound, &n.styles, &n.constraints), (before.opacity, &before.bound, &before.styles, &before.constraints));
+    assert!(n.bound.contains_key("fill"), "the fill stays bound");
+    let page = doc.node(n.parent.unwrap()).unwrap();
+    assert_eq!(page.children, [below, v, above], "same place in the layer list");
+    // The new geometry, at the layer's origin.
+    assert_eq!(frame(&s, v), (40.0, 30.0, 20.0, 8.0));
+    let net = net(&s, v);
+    assert_eq!((net.vertices.len(), net.regions.len()), (3, 1), "a closed triangle: {net:?}");
+}
+
+#[test]
+fn width_height_and_x_y_follow_node_create() {
+    // Each row: props given with the path, and the frame node.set gives a layer at (100, 50).
+    let rows: [(Value, (f64, f64, f64, f64)); 6] = [
+        // The path's own box goes at the layer's origin: its offset (5, 5) doesn't move it.
+        (json!({}), (100.0, 50.0, 10.0, 20.0)),
+        // Both sides scale independently; one keeps the proportion.
+        (json!({"width": 30, "height": 10}), (100.0, 50.0, 30.0, 10.0)),
+        (json!({"w": 20}), (100.0, 50.0, 20.0, 40.0)),
+        // With x/y the path's offset is added, as create places it.
+        (json!({"x": 0, "y": 0}), (5.0, 5.0, 10.0, 20.0)),
+        (json!({"x": 10, "height": 10}), (15.0, 50.0, 5.0, 10.0)),
+        (json!({"x": 10, "y": 20, "width": 20, "height": 10}), (15.0, 25.0, 20.0, 10.0)),
+    ];
+    for (extra, want) in rows {
+        let mut s = Session::new();
+        let v = vector(&mut s, json!({"path": "M0 0 L1 1", "x": 100, "y": 50}));
+        let mut props = json!({"path": "M5 5 L15 5 L15 25 Z"});
+        props.as_object_mut().unwrap().extend(extra.as_object().unwrap().clone());
+        ex(&mut s, "node.set", json!({"ids": [v], "props": props}));
+        assert_eq!(frame(&s, v), want, "{extra}");
+        // With both x and y, create makes the same layer. (With one, the other axis keeps the
+        // layer's current place.)
+        if extra.get("x").is_some() && extra.get("y").is_some() {
+            let c = vector(&mut s, props.clone());
+            assert_eq!(frame(&s, c), want, "create {extra}");
+        }
+    }
+}
+
+#[test]
+fn rotation_stays_and_turns_about_the_new_box() {
+    let mut s = Session::new();
+    let v = vector(&mut s, json!({"path": "M0 0 L10 10", "x": 0, "y": 0}));
+    ex(&mut s, "node.set", json!({"ids": [v], "props": {"rotation": 90}}));
+    let t = s.doc().unwrap().node(v).unwrap().transform;
+    ex(&mut s, "node.set", json!({"ids": [v], "props": {"path": "M0 0 L40 0 L40 20 Z"}}));
+    let n = s.doc().unwrap().node(v).unwrap();
+    assert_eq!(n.transform, t, "the layer keeps its origin and rotation");
+    assert_eq!((n.width, n.height), (40.0, 20.0));
+}
+
+#[test]
+fn undo_brings_the_old_path_back() {
+    let mut s = Session::new();
+    let v = vector(&mut s, json!({"path": "M0 0 L10 10", "x": 3, "y": 4}));
+    let (old_net, old_frame) = (net(&s, v), frame(&s, v));
+    ex(&mut s, "node.set", json!({"ids": [v], "props": {"path": "M0 0 C10 0 20 10 20 20", "width": 50}}));
+    let (new_net, new_frame) = (net(&s, v), frame(&s, v));
+    assert_ne!(new_net, old_net);
+    ex(&mut s, "edit.undo", json!({}));
+    assert_eq!((net(&s, v), frame(&s, v)), (old_net, old_frame));
+    ex(&mut s, "edit.redo", json!({}));
+    assert_eq!((net(&s, v), frame(&s, v)), (new_net, new_frame));
+}
+
+#[test]
+fn data_that_cant_draw_is_refused_and_nothing_changes() {
+    let mut s = Session::new();
+    let v = vector(&mut s, json!({"path": "M0 0 L10 10", "name": "V"}));
+    let before = s.doc().unwrap().node(v).unwrap().clone();
+    for (props, says) in [
+        (json!({"path": "not a path"}), "not valid SVG path data"),
+        (json!({"path": "M0 0 L10"}), "not valid SVG path data"),
+        (json!({"path": ""}), "draws nothing"),
+        (json!({"path": "M5 5"}), "draws nothing"),
+        (json!({"path": "M5 5 L5 5 Z"}), "draws nothing"),
+        (json!({"path": "M0 0 L1e308 0 L-1e308 0"}), "too large"),
+        (json!({"path": 5}), "must be SVG path data"),
+        (json!({"path": null}), "must be SVG path data"),
+        (json!({"path": "M0 0 L10 10", "width": 0}), "positive"),
+        (json!({"path": "M0 0 L10 10", "height": -4}), "positive"),
+        (json!({"path": "M0 0 L10 10", "width": "wide"}), "must be a number"),
+        // A size on an axis the path has none of.
+        (json!({"path": "M0 0 L10 0", "height": 5}), "no vertical extent"),
+        (json!({"path": "M0 0 L10 10", "name": "renamed", "width": -1}), "positive"),
+    ] {
+        let msg = bad_msg(s.execute("node.set", &json!({"ids": [v], "props": props})));
+        assert!(msg.contains(says), "{props}: {msg}");
+        assert_eq!(s.doc().unwrap().node(v).unwrap(), &before, "{props} changed nothing");
+    }
+    // A horizontal line can still be given height 0, as create allows.
+    ex(&mut s, "node.set", json!({"ids": [v], "props": {"path": "M0 0 L10 0", "height": 0}}));
+    assert_eq!(frame(&s, v).2, 10.0);
+}
+
+#[test]
+fn layers_that_arent_vectors_are_refused_alone_and_skipped_among_vectors() {
+    let mut s = Session::new();
+    let r = id(&ex(&mut s, "node.create", json!({"type": "rectangle", "name": "Box"})));
+    let star = id(&ex(&mut s, "node.create", json!({"type": "star"})));
+    let msg = bad_msg(s.execute("node.set", &json!({"ids": [r], "props": {"path": "M0 0 L5 5"}})));
+    assert!(msg.contains("vector") && msg.contains("Box"), "{msg}");
+    assert!(s.execute("node.set", &json!({"ids": [r, star], "props": {"path": "M0 0 L5 5"}})).is_err(), "no vector among them");
+    assert!(matches!(s.doc().unwrap().node(r).unwrap().kind, NodeKind::Rectangle));
+
+    let v = vector(&mut s, json!({"path": "M0 0 L10 10"}));
+    let out = ex(&mut s, "node.set", json!({"ids": [r, v], "props": {"path": "M0 0 L30 0", "opacity": 0.5}}));
+    let w = out["warnings"][0].as_str().unwrap();
+    assert!(w.contains("`path` skipped on") && w.contains("Box") && w.contains("vector"), "{w}");
+    let doc = s.doc().unwrap();
+    assert_eq!((doc.node(r).unwrap().width, doc.node(r).unwrap().opacity), (100.0, 0.5), "the rectangle gets the other keys");
+    assert_eq!(frame(&s, v).2, 30.0);
+}
+
+#[test]
+fn a_vector_inside_an_instance_is_refused_and_its_main_reaches_it() {
+    let mut s = Session::new();
+    let f = id(&ex(&mut s, "node.create", json!({"type": "frame", "width": 50, "height": 50})));
+    let v = vector(&mut s, json!({"path": "M0 0 L10 10", "parent": f}));
+    let comp = id(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    let inst = id(&ex(&mut s, "instance.create", json!({"component": comp, "x": 200, "y": 0})));
+    let copy = s.doc().unwrap().node(inst).unwrap().children[0];
+    assert!(matches!(s.doc().unwrap().node(copy).unwrap().kind, NodeKind::Vector { .. }));
+    let msg = bad_msg(s.execute("node.set", &json!({"ids": [copy], "props": {"path": "M0 0 L30 0"}})));
+    assert!(msg.contains("inside an instance"), "{msg}");
+    // The main's vector takes it, and the instance follows.
+    let main_vector = s.doc().unwrap().node(comp).unwrap().children[0];
+    assert_eq!(main_vector, v);
+    ex(&mut s, "node.set", json!({"ids": [main_vector], "props": {"path": "M0 0 L30 0 L30 12 Z"}}));
+    assert_eq!(net(&s, copy), net(&s, main_vector));
+    assert_eq!((frame(&s, copy).2, frame(&s, copy).3), (30.0, 12.0));
+}
+
+#[test]
+fn a_boolean_operand_takes_a_new_path_and_the_group_follows() {
+    let mut s = Session::new();
+    let a = vector(&mut s, json!({"path": "M0 0 L40 0 L40 40 L0 40 Z"}));
+    let b = vector(&mut s, json!({"path": "M0 0 L40 0 L40 40 L0 40 Z", "x": 20, "y": 20}));
+    let g = id(&ex(&mut s, "bool.union", json!({"ids": [a, b]})));
+    assert_eq!(s.doc().unwrap().node(b).unwrap().parent, Some(g));
+    ex(&mut s, "node.set", json!({"ids": [b], "props": {"path": "M0 0 L100 0 L100 100 L0 100 Z"}}));
+    let bounds = s.doc().unwrap().world_bounds(g).unwrap();
+    assert_eq!((bounds.width(), bounds.height()), (120.0, 120.0), "{bounds:?}");
+}
+
+#[test]
+fn junk_paths_never_panic() {
+    let long = "M0 0 ".to_string() + &"L1 1 ".repeat(5000);
+    let junk = [
+        json!("M"),
+        json!("Z"),
+        json!("M0 0 Z Z Z"),
+        json!("M NaN 0 L 1 1"),
+        json!("M inf 0 L 1 1"),
+        json!("M0 0 L1e308 1e308"),
+        json!("M-1e308 -1e308 L1e308 1e308"),
+        json!("M0 0 A 1e308 1e308 0 1 1 10 10"),
+        json!("M0 0 A 0 0 0 0 0 10 10"),
+        json!("m0 0 l1 1 h-1e308 v1e308 z"),
+        json!("M0 0 Q 5 5"),
+        json!("M0,0L10,10\u{0}"),
+        json!("\u{1F4A5}"),
+        json!(long),
+        json!([1, 2]),
+        json!({"d": "M0 0 L1 1"}),
+        json!(true),
+    ];
+    let sizes = [json!(null), json!(1e308), json!(-1e308), json!(1e-308), json!("NaN"), json!([1])];
+    let mut s = Session::new();
+    let v = vector(&mut s, json!({"path": "M0 0 L10 10"}));
+    for path in &junk {
+        for size in &sizes {
+            for props in [json!({"path": path, "width": size}), json!({"path": path, "height": size, "x": size, "rotation": size})] {
+                if let Err(EngineError::Internal { msg, .. }) = s.execute("node.set", &json!({"ids": [v], "props": props})) {
+                    panic!("node.set panicked on {props}: {msg}");
+                }
+                let n = s.doc().unwrap().node(v).unwrap();
+                assert!(n.width.is_finite() && n.height.is_finite() && n.transform.as_coeffs().iter().all(|c| c.is_finite()), "{props}");
+            }
+        }
+    }
+}
+
+#[test]
+fn a_new_path_while_editing_drops_points_that_are_gone() {
+    let mut s = Session::new();
+    let v = vector(&mut s, json!({"path": "M0 0 L10 0 L10 10 L0 10 Z"}));
+    ex(&mut s, "vector.edit.begin", json!({"id": v}));
+    ex(&mut s, "vector.edit.selectAll", json!({}));
+    ex(&mut s, "node.set", json!({"ids": [v], "props": {"path": "M0 0 L20 0"}}));
+    let ve = s.ds().unwrap().vector_edit.clone().expect("still editing");
+    let n = net(&s, v);
+    assert!(ve.vertices.iter().all(|i| *i < n.vertices.len()) && ve.segments.iter().all(|i| *i < n.segments.len()), "{ve:?}");
+    ex(&mut s, "vector.edit.state", json!({}));
+}
diff --git a/crates/engine/src/version_preview_tests.rs b/crates/engine/src/version_preview_tests.rs
index e910006c..9423c34e 100644
--- a/crates/engine/src/version_preview_tests.rs
+++ b/crates/engine/src/version_preview_tests.rs
@@ -97,3 +97,22 @@ fn preview_keeps_the_unsaved_state_and_saving_saves_the_document() {
     assert_eq!(count(&s), three);
     let _ = std::fs::remove_dir_all(&dir);
 }
+
+#[test]
+fn a_refused_cut_leaves_the_clipboard_as_it_was() {
+    let mut s = Session::new();
+    let a = rect(&mut s, 0.0);
+    s.execute("file.saveVersion", &json!({"name": "One"})).unwrap();
+    let b = rect(&mut s, 20.0);
+    s.execute("edit.copy", &json!({"ids": [b]})).unwrap();
+    let roots = |s: &Session| s.clipboard.nodes.iter().map(|(r, _)| *r).collect::<Vec<_>>();
+    assert_eq!(roots(&s), vec![b]);
+    let source = s.clipboard.source.clone().unwrap();
+    let depth = s.undo_depth();
+    s.execute("version.preview", &json!({"index": 0})).unwrap();
+    let err = s.execute("edit.cut", &json!({"ids": [a]})).unwrap_err();
+    assert!(matches!(err, EngineError::Disabled(..)), "{err:?}");
+    assert_eq!(roots(&s), vec![b], "failed edit.cut changed the clipboard");
+    assert!(std::sync::Arc::ptr_eq(s.clipboard.source.as_ref().unwrap(), &source));
+    assert_eq!(s.undo_depth(), depth, "history untouched");
+}
diff --git a/crates/engine/src/view_behaviour_tests.rs b/crates/engine/src/view_behaviour_tests.rs
index 27bc3771..7f9e5a84 100644
--- a/crates/engine/src/view_behaviour_tests.rs
+++ b/crates/engine/src/view_behaviour_tests.rs
@@ -742,3 +742,32 @@ fn alt_measures_between_layers() {
         assert_eq!(measured(&mut s, p, m), want, "{why}");
     }
 }
+
+#[test]
+fn view_toggles_are_kept_for_the_next_launch() {
+    let mut s = Session::new();
+    // (command, turned to, ViewState field, derivation)
+    let rows: Vec<(&str, bool, fn(&ViewState) -> bool, &str)> = vec![
+        ("view.rulers", true, |v| v.rulers, "rulers shown stay shown"),
+        ("view.pixelGrid", false, |v| v.pixel_grid, "a hidden pixel grid stays hidden"),
+        ("view.layoutGrids", false, |v| v.layout_grids, "hidden layout grids stay hidden"),
+        ("view.snapPixel", false, |v| v.snap_pixel, "snapping to the pixel grid off stays off"),
+    ];
+    for (cmd, on, _, _) in &rows {
+        ex(&mut s, cmd, json!({"on": on}));
+    }
+    // Modes stay with their file: a new one never opens in outline mode or soft-proofing.
+    for cmd in ["view.outlines", "view.outlinesSelection", "view.proofSrgb"] {
+        ex(&mut s, cmd, json!({"on": true}));
+    }
+    // The app writes its preferences as JSON and reads them back at the next launch.
+    let saved = serde_json::to_value(&s.prefs).unwrap();
+    let mut next = Session::empty();
+    next.prefs = serde_json::from_value(saved).unwrap();
+    ex(&mut next, "file.new", json!({}));
+    let view = &next.ds().unwrap().view;
+    for (cmd, on, get, why) in rows {
+        assert_eq!(get(view), on, "{cmd}: {why}");
+    }
+    assert!(!view.outlines && !view.outlines_selection && !view.proof_srgb, "{view:?}");
+}
diff --git a/crates/engine/src/view_state.rs b/crates/engine/src/view_state.rs
new file mode 100644
index 00000000..e162f039
--- /dev/null
+++ b/crates/engine/src/view_state.rs
@@ -0,0 +1,136 @@
+use super::*;
+
+/// The canvas view of a document: what's at the centre of the viewport and the zoom.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(default)]
+pub struct ViewState {
+    /// Page coordinate at the viewport centre.
+    pub cx: f64,
+    pub cy: f64,
+    /// Zoom (1 = 100%).
+    pub zoom: f64,
+    /// Viewport size in logical pixels (set by the UI; used by zoom-to-fit).
+    pub vw: f64,
+    pub vh: f64,
+    pub pixel_grid: bool,
+    pub layout_grids: bool,
+    pub rulers: bool,
+    pub outlines: bool,
+    /// Outline mode for the selected layers only (the rest draws normally).
+    pub outlines_selection: bool,
+    /// Outline mode also outlines hidden layers (View ▸ Outlines ▸ Include hidden layers).
+    pub outline_hidden: bool,
+    /// Outline mode also draws every layer's box (View ▸ Outlines ▸ Include object bounds).
+    pub outline_bounds: bool,
+    /// Outline the masks (they don't draw themselves).
+    pub mask_outlines: bool,
+    pub pixel_preview: bool,
+    /// Pixel preview resolution: rendered pixels per page pixel (1 or 2).
+    pub pixel_scale: u8,
+    pub show_slices: bool,
+    pub comments: bool,
+    /// Others' cursors in a live session (View ▸ Multiplayer cursors).
+    pub multiplayer_cursors: bool,
+    pub frame_outlines: bool,
+    /// Soft-proof sRGB: the canvas marks the colours of a Display P3 file that sRGB can't show.
+    pub proof_srgb: bool,
+    pub snap_geometry: bool,
+    pub snap_objects: bool,
+    pub snap_pixel: bool,
+    pub ui_hidden: bool,
+}
+
+impl Default for ViewState {
+    fn default() -> Self {
+        Self {
+            cx: 0.0,
+            cy: 0.0,
+            zoom: 1.0,
+            vw: 1200.0,
+            vh: 800.0,
+            pixel_grid: true,
+            layout_grids: true,
+            rulers: false,
+            outlines: false,
+            outlines_selection: false,
+            outline_hidden: false,
+            outline_bounds: false,
+            mask_outlines: false,
+            pixel_preview: false,
+            pixel_scale: 1,
+            show_slices: false,
+            comments: true,
+            multiplayer_cursors: true,
+            frame_outlines: false,
+            proof_srgb: false,
+            snap_geometry: true,
+            snap_objects: true,
+            snap_pixel: true,
+            ui_hidden: false,
+        }
+    }
+}
+
+impl ViewState {
+    pub const MIN_ZOOM: f64 = 0.02;
+    pub const MAX_ZOOM: f64 = 256.0;
+    /// Page coordinate at the viewport's top-left.
+    pub fn origin(&self) -> (f64, f64) {
+        let z = self.zoom.max(1e-9);
+        (self.cx - self.vw / 2.0 / z, self.cy - self.vh / 2.0 / z)
+    }
+    pub fn set_zoom_at(&mut self, zoom: f64, anchor: (f64, f64)) {
+        let z = if zoom.is_finite() { zoom.clamp(Self::MIN_ZOOM, Self::MAX_ZOOM) } else { self.zoom };
+        let old = self.zoom.max(1e-9);
+        // Keep the page point under `anchor` fixed.
+        self.cx = anchor.0 + (self.cx - anchor.0) * old / z;
+        self.cy = anchor.1 + (self.cy - anchor.1) * old / z;
+        self.zoom = z;
+    }
+    /// Fit a page rectangle into the viewport with margin.
+    pub fn fit(&mut self, r: figcraft_geom::Rect, max_zoom: f64) {
+        if !(r.width() > 0.0 || r.height() > 0.0) || !r.x0.is_finite() {
+            self.cx = r.center().x;
+            self.cy = r.center().y;
+            return;
+        }
+        let margin = 64.0;
+        let zx = (self.vw - margin * 2.0).max(50.0) / r.width().max(1e-6);
+        let zy = (self.vh - margin * 2.0).max(50.0) / r.height().max(1e-6);
+        self.zoom = zx.min(zy).clamp(Self::MIN_ZOOM, max_zoom);
+        self.cx = r.center().x;
+        self.cy = r.center().y;
+    }
+    /// The zoom from which the pixel grid shows (400%).
+    pub const PIXEL_GRID_ZOOM: f64 = 4.0;
+    /// Whether the pixel grid draws: it's on and the canvas is zoomed in to 400% or more.
+    pub fn pixel_grid_shown(&self) -> bool {
+        self.pixel_grid && self.zoom >= Self::PIXEL_GRID_ZOOM - 1e-9
+    }
+    /// Pixel preview's resolution (rendered pixels per page pixel) when it's on and zoomed in past
+    /// it; below that the canvas is already coarser than the preview.
+    pub fn pixel_preview_scale(&self) -> Option<f64> {
+        let k = f64::from(self.pixel_scale.clamp(1, 2));
+        (self.pixel_preview && self.zoom > k).then_some(k)
+    }
+    /// A wheel or trackpad scroll of (`dx`, `dy`) screen points: the canvas pans with it (content
+    /// follows the fingers); with Shift a plain vertical wheel pans sideways.
+    pub fn scroll(&mut self, dx: f64, dy: f64, shift: bool) {
+        let (dx, dy) = if shift && dx == 0.0 { (dy, 0.0) } else { (dx, dy) };
+        if !(dx.is_finite() && dy.is_finite()) {
+            return;
+        }
+        let z = self.zoom.max(1e-6);
+        self.cx -= dx / z;
+        self.cy -= dy / z;
+    }
+    pub fn page_to_screen(&self, x: f64, y: f64) -> (f64, f64) {
+        let (ox, oy) = self.origin();
+        ((x - ox) * self.zoom, (y - oy) * self.zoom)
+    }
+    pub fn screen_to_page(&self, x: f64, y: f64) -> (f64, f64) {
+        let (ox, oy) = self.origin();
+        let z = self.zoom.max(1e-9);
+        (ox + x / z, oy + y / z)
+    }
+}
diff --git a/crates/engine/src/vue_codegen_tests.rs b/crates/engine/src/vue_codegen_tests.rs
new file mode 100644
index 00000000..a9916a65
--- /dev/null
+++ b/crates/engine/src/vue_codegen_tests.rs
@@ -0,0 +1,305 @@
+//! Vue code: `inspect.code {language: "vue"}` writes a single-file component — `<template>`, a
+//! `<script setup>` with typed props, and a `<style scoped>` — for a layer tree, and a component
+//! with its properties as props, its variants as `data-*` attributes and its slots as
+//! `<slot>` elements. A Vue template holds no arbitrary expressions, so what React writes as a
+//! braced expression (an interpolation, a `v-if`, a `:prop` binding) has its own spelling here.
+
+use crate::Session;
+use crate::codegen::CodeLang;
+use crate::components::tests::{ex, idv};
+use figcraft_doc::*;
+use serde_json::json;
+
+fn code(s: &mut Session, id: NodeId, lang: &str) -> String {
+    ex(s, "inspect.code", json!({"id": id, "language": lang}))["code"].as_str().unwrap_or_default().to_string()
+}
+
+fn vue(s: &mut Session, id: NodeId) -> String {
+    code(s, id, "vue")
+}
+
+fn component_code(s: &mut Session, id: NodeId, lang: &str) -> serde_json::Value {
+    ex(s, "inspect.componentCode", json!({"id": id, "language": lang}))
+}
+
+/// A "Card" component with a "Title" text (text property) and a "Dot" ellipse (boolean
+/// property "Show dot"). Returns (card, title, dot).
+fn card(s: &mut Session) -> (NodeId, NodeId, NodeId) {
+    let f = idv(&ex(s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Card"})));
+    ex(s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 200, "height": 100, "parent": f, "props": {"name": "Bg", "fill": "#eeeeee"}}));
+    let title = idv(&ex(s, "text.create", json!({"text": "Hello", "x": 10, "y": 10, "parent": f, "props": {"name": "Title"}})));
+    let dot = idv(&ex(s, "shape.ellipse", json!({"x": 170, "y": 10, "width": 20, "height": 20, "parent": f, "props": {"name": "Dot"}})));
+    let c = idv(&ex(s, "component.create", json!({"ids": [f]})));
+    ex(s, "component.addProperty", json!({"id": dot, "name": "Show dot", "type": "boolean", "default": true}));
+    ex(s, "component.addProperty", json!({"id": c, "name": "Title", "type": "text", "layer": title}));
+    (c, title, dot)
+}
+
+#[test]
+fn a_layer_tree_becomes_a_single_file_component() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 200, "name": "Panel"})));
+    ex(&mut s, "text.create", json!({"text": "Hi", "x": 10, "y": 10, "parent": f, "props": {"name": "Label"}}));
+    let out = vue(&mut s, f);
+    // The three blocks of an SFC, in order, with the tree in the template and the CSS scoped.
+    assert!(out.starts_with("<template>\n"), "{out}");
+    assert!(out.contains("</template>\n\n<style scoped>\n"), "{out}");
+    assert!(out.ends_with("</style>\n"), "{out}");
+    assert!(out.contains("<div class=\"panel\">"), "{out}");
+    assert!(out.contains(">Hi</p>"), "{out}");
+    // A tree without properties needs no script block.
+    assert!(!out.contains("<script"), "{out}");
+}
+
+#[test]
+fn components_take_their_properties_as_props() {
+    let mut s = Session::new();
+    let (c, _, _) = card(&mut s);
+    let out = vue(&mut s, c);
+    // Typed props with their defaults, and the template below.
+    assert!(out.starts_with("<script setup lang=\"ts\">\n"), "{out}");
+    assert!(out.contains("withDefaults(\n  defineProps<{\n"), "{out}");
+    assert!(out.contains("showDot?: boolean;"), "{out}");
+    assert!(out.contains("title?: string;"), "{out}");
+    assert!(out.contains("showDot: true,"), "{out}");
+    assert!(out.contains("title: \"Hello\","), "{out}");
+    assert!(out.contains("</script>\n\n<template>\n"), "{out}");
+    // A text property is an interpolation, not React's braced expression.
+    assert!(out.contains("{{ title }}"), "{out}");
+}
+
+#[test]
+fn a_boolean_property_guards_its_layer_with_v_if() {
+    let mut s = Session::new();
+    let (c, _, _) = card(&mut s);
+    let out = vue(&mut s, c);
+    // Vue can't wrap an element in an expression: the guard rides on the element itself.
+    assert!(out.contains("v-if=\"showDot\""), "{out}");
+    assert!(!out.contains("showDot &&"), "{out}");
+}
+
+#[test]
+fn variants_switch_on_data_attributes() {
+    let mut s = Session::new();
+    let mut variants = Vec::new();
+    for (k, (state, color)) in [("Default", "#ff0000"), ("Hover", "#0000ff")].iter().enumerate() {
+        let f =
+            idv(&ex(&mut s, "frame.create", json!({"x": k as f64 * 150.0, "y": 0, "width": 100, "height": 40, "name": format!("State={state}")})));
+        ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 100, "height": 40, "parent": f, "props": {"name": "Bg", "fill": color}}));
+        variants.push(idv(&ex(&mut s, "component.create", json!({"ids": [f]}))));
+    }
+    let set = idv(&ex(&mut s, "component.combineVariants", json!({"ids": variants})));
+    let out = vue(&mut s, set);
+    // A variant property is a string union, bound to the root's data attribute.
+    assert!(out.contains("state?: \"Default\" | \"Hover\";"), "{out}");
+    assert!(out.contains(":data-state=\"state\""), "{out}");
+    // What the other variant changes is a rule on that attribute, as on the web.
+    assert!(out.contains("[data-state=\"Hover\"]"), "{out}");
+}
+
+#[test]
+fn instances_are_calls_passing_the_values_they_set() {
+    let mut s = Session::new();
+    let (c, _, _) = card(&mut s);
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": c, "x": 400, "y": 0})));
+    // Values left at the definition's default aren't passed.
+    assert_eq!(component_code(&mut s, i, "vue")["usage"], "<Card />\n");
+    ex(&mut s, "instance.setProperties", json!({"ids": [i], "properties": {"Show dot": false, "Title": "Buy"}}));
+    // A plain string is an attribute value; anything else is a `:name` binding.
+    assert_eq!(component_code(&mut s, i, "vue")["usage"], "<Card :showDot=\"false\" title=\"Buy\" />\n");
+    let out = code(&mut s, i, "vue");
+    assert!(out.starts_with("<Card :showDot=\"false\" title=\"Buy\" />\n"), "{out}");
+    assert!(out.contains("defineProps<{"), "{out}");
+}
+
+#[test]
+fn a_layer_tree_with_an_instance_calls_it() {
+    let mut s = Session::new();
+    let (c, _, _) = card(&mut s);
+    let parent = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 500, "height": 300, "name": "Page"})));
+    ex(&mut s, "instance.create", json!({"component": c, "x": 10, "y": 10, "parent": parent}));
+    let out = vue(&mut s, parent);
+    assert!(out.contains("<Card "), "{out}");
+}
+
+#[test]
+fn slots_become_slot_elements() {
+    let mut s = Session::new();
+    let frame = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Shell"})));
+    let body = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "parent": frame, "name": "Body"})));
+    let c = idv(&ex(&mut s, "component.create", json!({"ids": [frame]})));
+    ex(&mut s, "component.makeSlot", json!({"id": body, "name": "Content"}));
+    let out = vue(&mut s, c);
+    // An empty slot is Vue's own element, and a slot takes no prop.
+    assert!(out.contains("<slot name=\"content\" />"), "{out}");
+    assert!(!out.contains("content?: "), "{out}");
+    assert!(!out.contains("props"), "{out}");
+
+    // Content in the slot is its fallback, shown until an instance fills it.
+    let mut s = Session::new();
+    let frame = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Shell2"})));
+    let body = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "parent": frame, "name": "Body2"})));
+    ex(&mut s, "text.create", json!({"text": "Empty", "x": 0, "y": 0, "parent": body, "props": {"name": "Hint"}}));
+    let c = idv(&ex(&mut s, "component.create", json!({"ids": [frame]})));
+    ex(&mut s, "component.makeSlot", json!({"id": body, "name": "Content"}));
+    let out = vue(&mut s, c);
+    assert!(out.contains("<slot name=\"content\">"), "{out}");
+    assert!(out.contains("</slot>"), "{out}");
+    assert!(out.contains("Empty"), "{out}");
+}
+
+#[test]
+fn identifiers_are_escaped_and_the_language_round_trips() {
+    let mut s = Session::new();
+    let (c, _, _) = card(&mut s);
+    // "Show dot" is not an identifier: it becomes camelCase in the props and the template alike.
+    let out = vue(&mut s, c);
+    assert!(out.contains("showDot"), "{out}");
+    assert!(!out.contains("Show dot"), "{out}");
+    // The id is discoverable from what the Inspect panel offers.
+    assert_eq!(CodeLang::from_id("vue"), Some(CodeLang::Vue));
+    assert_eq!(CodeLang::from_id("sfc"), Some(CodeLang::Vue));
+    assert!(CodeLang::Vue.is_web());
+    assert_eq!(CodeLang::Vue.id(), "vue");
+    assert!(CodeLang::ALL.contains(&CodeLang::Vue));
+}
+
+#[test]
+fn rem_converts_lengths_in_the_vue_template_and_its_style() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 320, "height": 64, "name": "Bar"})));
+    let out = ex(&mut s, "inspect.code", json!({"id": f, "language": "vue", "unit": "rem"}))["code"].as_str().unwrap_or_default().to_string();
+    assert!(out.contains("20rem"), "{out}");
+}
+
+#[test]
+fn a_keyword_property_name_stays_usable() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Row"})));
+    let c = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    // "default" is a JavaScript keyword: the prop is renamed, and the template follows.
+    ex(&mut s, "component.addProperty", json!({"id": c, "name": "default", "type": "text", "default": "x"}));
+    let out = vue(&mut s, c);
+    assert!(out.contains("defaultValue"), "{out}");
+}
+
+#[test]
+fn a_property_named_props_is_not_shadowed() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Card"})));
+    let text = idv(&ex(&mut s, "text.create", json!({"text": "Hello", "x": 0, "y": 0, "parent": f, "props": {"name": "Label"}})));
+    let c = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    ex(&mut s, "component.addProperty", json!({"id": c, "name": "Props", "type": "text", "layer": text}));
+    let out = vue(&mut s, c);
+    // No top-level `const props` that the template would resolve to instead of the property.
+    assert!(!out.contains("const props"), "{out}");
+    assert!(out.contains("props?: string;"), "{out}");
+    assert!(out.contains("{{ props }}"), "{out}");
+}
+
+#[test]
+fn a_nested_instance_keeps_its_v_if_guard() {
+    let mut s = Session::new();
+    let (card, _, _) = card(&mut s);
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 200, "name": "Toolbar"})));
+    ex(&mut s, "layout.add", json!({"ids": [f], "direction": "vertical"}));
+    let nested = idv(&ex(&mut s, "instance.create", json!({"component": card, "x": 10, "y": 10, "parent": f})));
+    let c = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    ex(&mut s, "component.addProperty", json!({"id": c, "name": "Show card", "type": "boolean", "default": true, "layer": nested}));
+    ex(&mut s, "instance.setProperties", json!({"ids": [nested], "properties": {"Title": "a > b"}}));
+    let out = vue(&mut s, c);
+    // The call's early return must not swallow the guard `node` put on it, and the `>` inside a
+    // quoted value must not be mistaken for the tag's end.
+    assert!(out.contains("v-if=\"showCard\""), "{out}");
+    assert_eq!(out.matches("v-if=\"showCard\"").count(), 1, "{out}");
+    assert!(!out.contains("/ v-if"), "the guard must come before a self-closing slash: {out}");
+    assert!(out.contains("title=\"a &gt; b\"") || out.contains("title=\"a > b\""), "{out}");
+}
+
+#[test]
+fn a_text_default_cannot_close_the_script_block() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "name": "Card"})));
+    let text = idv(&ex(&mut s, "text.create", json!({"text": "Hello", "x": 0, "y": 0, "parent": f, "props": {"name": "Title"}})));
+    let c = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    ex(
+        &mut s,
+        "component.addProperty",
+        json!({"id": c, "name": "Title", "type": "text", "layer": text, "default": "</script><script>alert(1)</script>"}),
+    );
+    let out = vue(&mut s, c);
+    assert!(out.contains("\\u003C/script>"), "{out}");
+    assert_eq!(out.matches("</script>").count(), 1, "only the SFC's own closing tag: {out}");
+}
+
+#[test]
+fn slot_names_stay_distinct_when_idents_lowercase_alike() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 200, "name": "Shell"})));
+    let a = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100, "parent": f, "name": "A"})));
+    let b = idv(&ex(&mut s, "frame.create", json!({"x": 100, "y": 0, "width": 100, "height": 100, "parent": f, "name": "B"})));
+    let c = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    ex(&mut s, "component.makeSlot", json!({"id": a, "name": "Foo Bar"}));
+    ex(&mut s, "component.makeSlot", json!({"id": b, "name": "Foobar"}));
+    let out = vue(&mut s, c);
+    assert!(out.contains("<slot name=\"foobar\""), "{out}");
+    assert!(out.contains("<slot name=\"foobar-2\""), "{out}");
+    // The instance's templates use the same names.
+    let g = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 300, "width": 20, "height": 20, "name": "Badge"})));
+    let badge = idv(&ex(&mut s, "component.create", json!({"ids": [g]})));
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": c, "x": 400, "y": 0})));
+    ex(&mut s, "instance.slotInsert", json!({"id": i, "slot": "Foo Bar", "component": badge, "replace": true}));
+    ex(&mut s, "instance.slotInsert", json!({"id": i, "slot": "Foobar", "component": badge, "replace": true}));
+    let usage = component_code(&mut s, i, "vue")["usage"].as_str().unwrap_or_default().to_string();
+    assert!(usage.contains("<template #foobar>"), "{usage}");
+    assert!(usage.contains("<template #foobar-2>"), "{usage}");
+}
+
+#[test]
+fn slot_content_css_reaches_the_parent_stylesheet() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 200, "name": "Panel"})));
+    let content = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 200, "height": 100, "parent": f, "name": "Content"})));
+    let panel = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    ex(&mut s, "component.makeSlot", json!({"id": content, "name": "Content"}));
+    let screen = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 400, "width": 400, "height": 300, "name": "Screen"})));
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": panel, "x": 10, "y": 10, "parent": screen})));
+    let slot = {
+        let doc = s.doc().unwrap();
+        crate::components::slots_of(doc, i).first().map(|(l, _)| *l).unwrap()
+    };
+    ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 10, "height": 10, "parent": slot, "props": {"name": "Swatch", "fill": "#FF0000"}}));
+    // The layer's class rules belong to the tree that holds the instance, not to a discarded
+    // snippet: both web targets keep them in their stylesheet.
+    let out = vue(&mut s, screen);
+    assert!(out.contains(".slot-content-swatch {"), "{out}");
+    assert!(out.contains("#FF0000"), "{out}");
+    assert!(code(&mut s, screen, "react").contains(".slot-content-swatch {"));
+}
+
+#[test]
+fn slot_content_classes_are_unique_across_slots() {
+    let mut s = Session::new();
+    let f = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 200, "name": "Panel"})));
+    let one = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 100, "parent": f, "name": "One"})));
+    let two = idv(&ex(&mut s, "frame.create", json!({"x": 100, "y": 0, "width": 100, "height": 100, "parent": f, "name": "Two"})));
+    let panel = idv(&ex(&mut s, "component.create", json!({"ids": [f]})));
+    ex(&mut s, "component.makeSlot", json!({"id": one, "name": "One"}));
+    ex(&mut s, "component.makeSlot", json!({"id": two, "name": "Two"}));
+    let screen = idv(&ex(&mut s, "frame.create", json!({"x": 0, "y": 400, "width": 400, "height": 300, "name": "Screen"})));
+    let i = idv(&ex(&mut s, "instance.create", json!({"component": panel, "x": 10, "y": 10, "parent": screen})));
+    let slots = {
+        let doc = s.doc().unwrap();
+        crate::components::slots_of(doc, i)
+    };
+    for (name, fill) in [("One", "#FF0000"), ("Two", "#0000FF")] {
+        let slot = slots.iter().find(|(_, n)| n.as_str() == name).map(|(l, _)| *l).unwrap();
+        ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 10, "height": 10, "parent": slot, "props": {"name": "Swatch", "fill": fill}}));
+    }
+    let out = vue(&mut s, screen);
+    // Same layer name in two slots: each slot's rules keep their own class.
+    assert!(out.contains(".slot-one-swatch {"), "{out}");
+    assert!(out.contains(".slot-two-swatch {"), "{out}");
+    assert!(out.contains("#FF0000"), "{out}");
+    assert!(out.contains("#0000FF"), "{out}");
+}
diff --git a/crates/engine/src/widget_input_tests.rs b/crates/engine/src/widget_input_tests.rs
new file mode 100644
index 00000000..ba202987
--- /dev/null
+++ b/crates/engine/src/widget_input_tests.rs
@@ -0,0 +1,211 @@
+//! Widget fields and property menus (plugin API 4): `widget.setText` and `widget.menu` call the
+//! plugin back as one undo step each, from commands and from the canvas (a double-click edits a
+//! field like any text); values, items and descriptions from plugins and files are checked, and
+//! junk is refused and rolled back. The test plugin outputs its input; on a field edit it draws
+//! nothing (the host keeps the value), on `reset` it redraws without a menu.
+
+use serde_json::{Value, json};
+
+use crate::components::tests::{ex, idv, node};
+use crate::plugins_tests::{install, undo_len};
+use crate::tools::{PointerEvent, PointerKind};
+use crate::widgets_tests::{W, err, state};
+use crate::{Session, textedit};
+use figcraft_doc::NodeId;
+
+const ID: &str = "org.test.note";
+
+fn manifest(id: &str, api: u32) -> Value {
+    json!({"id": id, "name": "Note", "version": "1.0.0", "main": "n.wasm", "api": api, "widget": true, "permissions": {"access": "read"}})
+}
+
+/// The note widget: a label field, a clickable square and (unless `bare`) a menu.
+fn look(bare: bool) -> Value {
+    let root = json!({"type": "frame", "name": "Note", "layout": "vertical", "gap": 8, "padding": 10, "fill": "#FFFFFF", "children": [
+        {"type": "text", "name": "Label", "field": "label", "text": "Label", "size": 14, "width": 120, "color": "#111111"},
+        {"type": "rectangle", "target": "inc", "width": 20, "height": 20, "fill": "#0D99FF"},
+    ]});
+    if bare {
+        return json!({"state": {"n": 0}, "root": root});
+    }
+    json!({"root": root, "menu": [
+        {"item": "reset"},
+        {"item": "big", "label": "Big", "type": "toggle", "checked": true},
+        {"item": "color", "label": "Colour", "type": "color", "options": ["#ff0000", "#00FF00"], "value": "#FF0000"},
+    ]})
+}
+
+/// The note plugin's module; `on_field` runs on a field edit (default: return without drawing).
+fn note(on_field: &str) -> Vec<u8> {
+    let mut w = W::default();
+    let (field, reset) = (w.has(r#""field":"label""#), w.has(r#""menu":"reset""#));
+    let (bare, full) = (w.render(&look(true)), w.render(&look(false)));
+    let on_field = if on_field.is_empty() { "(return (i32.const 0))" } else { on_field };
+    w.build(&format!("(if {field} (then {on_field})) (if {reset} (then {bare} (return (i32.const 0)))) {full}"))
+}
+
+fn session() -> (Session, NodeId) {
+    let mut s = Session::new();
+    install(&mut s, manifest(ID, 4), &note(""));
+    let w = idv(&ex(&mut s, "widget.insert", json!({"plugin": ID, "x": 40, "y": 40})));
+    (s, w)
+}
+
+/// The text of widget `w`'s label field.
+fn label(s: &Session, w: NodeId) -> String {
+    let first = node(s, w).children[0];
+    node(s, first).kind.text().unwrap().characters.clone()
+}
+
+#[test]
+fn a_field_edit_reaches_the_state_the_layer_and_the_plugin_as_one_undo_step() {
+    let (mut s, w) = session();
+    let list = ex(&mut s, "widget.list", json!({}));
+    let item = &list["widgets"][0];
+    assert_eq!((item["fields"].clone(), item["targets"].clone()), (json!(["label"]), json!(["inc"])));
+    assert_eq!(item["menu"][0], json!({"item": "reset", "label": "reset", "type": "action"}), "a label defaults to the item's name");
+    assert_eq!(item["menu"][2]["options"], json!(["#FF0000", "#00FF00"]), "colours are normalised");
+    let undo = undo_len(&s);
+    // Tabs become spaces and other control characters are dropped.
+    let inner = node(&s, w).children[1];
+    let r = ex(&mut s, "widget.setText", json!({"id": inner, "field": "label", "value": "Hello\tworld\u{7}"}));
+    assert_eq!(r["output"]["widget"]["event"], json!({"field": "label", "value": "Hello world"}));
+    assert_eq!(r["output"]["widget"]["state"], json!({"label": "Hello world"}), "the plugin sees the value in the state too");
+    assert_eq!((state(&mut s, w), label(&s, w), undo_len(&s)), (json!({"label": "Hello world"}), "Hello world".into(), undo + 1));
+    ex(&mut s, "edit.undo", json!({}));
+    assert_eq!((state(&mut s, w), label(&s, w)), (json!({}), "Label".into()));
+    // Bad edits are refused and change nothing.
+    for (p, why) in [
+        (json!({"id": w, "field": "nope", "value": "x"}), "it has: label"),
+        (json!({"id": w, "field": "label"}), "`value` required"),
+        (json!({"id": w, "field": "label", "value": 5}), "`value` required"),
+        (json!({"id": w, "field": "label", "value": "x".repeat(1001)}), "longer than 1000"),
+        (json!({"id": w, "value": "x"}), "`field` required"),
+        (json!({"id": 999_999, "field": "label", "value": "x"}), "isn't a widget"),
+    ] {
+        assert!(err(&mut s, "widget.setText", p.clone()).contains(why), "{p}");
+    }
+    assert_eq!((state(&mut s, w), undo_len(&s)), (json!({}), undo));
+    assert_eq!(
+        ex(&mut s, "widget.setText", json!({"id": w, "field": "label", "value": "x".repeat(1000)}))["state"]["label"].as_str().map(str::len),
+        Some(1000)
+    );
+}
+
+#[test]
+fn a_runaway_or_failing_field_callback_rolls_the_value_back() {
+    let mut s = Session::new();
+    install(&mut s, manifest(ID, 4), &note("(loop $l (br $l))"));
+    let w = idv(&ex(&mut s, "widget.insert", json!({"plugin": ID})));
+    let undo = undo_len(&s);
+    assert!(err(&mut s, "widget.setText", json!({"id": w, "field": "label", "value": "Hi", "fuel": 100_000})).contains("instruction budget"));
+    assert_eq!((state(&mut s, w), label(&s, w), undo_len(&s)), (json!({}), "Label".into(), undo));
+    // A plugin that returns an error.
+    install(&mut s, manifest(ID, 4), &note("(return (i32.const 1))"));
+    assert!(s.execute("widget.setText", &json!({"id": w, "field": "label", "value": "Hi"})).is_err());
+    assert_eq!((state(&mut s, w), undo_len(&s)), (json!({}), undo));
+}
+
+#[test]
+fn menu_items_call_the_plugin_back_with_their_values() {
+    let (mut s, w) = session();
+    let event = |s: &mut Session, p: Value| ex(s, "widget.menu", p)["output"]["widget"]["event"].clone();
+    // A toggle flips by default, or takes the value given; a colour is matched in any case.
+    assert_eq!(event(&mut s, json!({"id": w, "item": "big"})), json!({"menu": "big", "value": false}));
+    assert_eq!(event(&mut s, json!({"id": w, "item": "big", "value": true})), json!({"menu": "big", "value": true}));
+    assert_eq!(event(&mut s, json!({"id": w, "item": "color", "value": "#00ff00"})), json!({"menu": "color", "value": "#00FF00"}));
+    let undo = undo_len(&s);
+    for (p, why) in [
+        (json!({"id": w, "item": "color", "value": "#0000FF"}), "must be one of #FF0000, #00FF00"),
+        (json!({"id": w, "item": "color"}), "must be one of"),
+        (json!({"id": w, "item": "color", "value": "#".repeat(5000)}), "must be one of"),
+        (json!({"id": w, "item": "nope"}), "it has: reset, big, color"),
+        (json!({"id": w}), "`item` required"),
+    ] {
+        assert!(err(&mut s, "widget.menu", p.clone()).contains(why), "{p}");
+    }
+    assert_eq!(undo_len(&s), undo);
+    // An action; this one redraws without a menu, which then has nothing to choose.
+    let r = ex(&mut s, "widget.menu", json!({"id": w, "item": "reset"}));
+    assert_eq!(
+        (r["output"]["widget"]["event"].clone(), r["state"].clone(), r["menu"].clone()),
+        (json!({"menu": "reset", "value": null}), json!({"n": 0}), json!([]))
+    );
+    assert_eq!(undo_len(&s), undo + 1);
+    assert!(err(&mut s, "widget.menu", json!({"id": w, "item": "reset"})).contains("no menu item"));
+    ex(&mut s, "edit.undo", json!({}));
+    assert_eq!(crate::widgets::menu_of(s.doc().unwrap(), w).len(), 3, "undo brings the menu back");
+}
+
+#[test]
+fn fields_and_menus_need_api_4_and_forged_menus_are_ignored() {
+    let mut s = Session::new();
+    install(&mut s, manifest("org.test.old", 3), &note(""));
+    assert!(err(&mut s, "widget.insert", json!({"plugin": "org.test.old"})).contains("need plugin API 4"));
+    assert!(ex(&mut s, "widget.list", json!({}))["widgets"].as_array().unwrap().is_empty(), "rolled back");
+    // A file (or a peer) can carry anything in a widget's menu data: junk reads as no menu.
+    let (mut s, w) = session();
+    let deep = "[".repeat(100_000);
+    for junk in ["not json", r#"[{"item": "has space"}]"#, r#"[{"item": "c", "type": "color"}]"#, "{}", deep.as_str()] {
+        s.ds_mut().unwrap().doc_mut().get_mut(w).unwrap().plugin_data.insert("figcraft.widget.menu".into(), junk.to_string());
+        assert!(crate::widgets::menu_of(s.doc().unwrap(), w).is_empty(), "{}", &junk[..junk.len().min(40)]);
+        assert!(err(&mut s, "widget.menu", json!({"id": w, "item": "c"})).contains("no menu item"));
+    }
+}
+
+#[test]
+fn double_clicking_a_field_edits_it_on_the_canvas() {
+    let (mut s, w) = session();
+    let field = node(&s, w).children[0];
+    // Without any font a text may have no size to click on.
+    let Some(b) = s.doc().unwrap().world_bounds(field).filter(|b| b.width() > 1.0 && b.height() > 1.0) else { return };
+    let p = b.center();
+    let at = |kind| PointerEvent::at(kind, p.x, p.y, 1.0);
+    s.pointer(&at(PointerKind::Down)).unwrap();
+    s.pointer(&at(PointerKind::Up)).unwrap();
+    assert_eq!(s.selection(), vec![w], "a click selects the widget");
+    s.pointer(&at(PointerKind::Down)).unwrap();
+    s.pointer(&at(PointerKind::DoubleClick)).unwrap();
+    assert_eq!(s.ds().unwrap().text_edit.as_ref().map(|te| te.id), Some(field), "a double-click edits the field");
+    let undo = undo_len(&s);
+    // Ending without a change makes no undo step and doesn't call the plugin.
+    textedit::end(&mut s).unwrap();
+    assert_eq!((undo_len(&s), state(&mut s, w), s.selection()), (undo, json!({}), vec![w]));
+    // Typing replaces the text (it's all selected); ending sends it to the plugin, one undo step.
+    s.pointer(&at(PointerKind::Down)).unwrap();
+    s.pointer(&at(PointerKind::DoubleClick)).unwrap();
+    textedit::insert(&mut s, "Hi").unwrap();
+    ex(&mut s, "text.edit.end", json!({}));
+    assert_eq!((state(&mut s, w), label(&s, w), undo_len(&s)), (json!({"label": "Hi"}), "Hi".into(), undo + 1));
+    assert_eq!((s.selection(), s.ds().unwrap().text_edit.is_none()), (vec![w], true));
+    ex(&mut s, "edit.undo", json!({}));
+    assert_eq!(label(&s, w), "Label");
+    // A failed callback leaves the field as it was and says why.
+    ex(&mut s, "plugin.remove", json!({"id": ID}));
+    s.pointer(&at(PointerKind::Down)).unwrap();
+    s.pointer(&at(PointerKind::DoubleClick)).unwrap();
+    textedit::insert(&mut s, "Lost").unwrap();
+    textedit::end(&mut s).unwrap();
+    assert_eq!(label(&s, w), "Label");
+    assert!(s.message.as_deref().is_some_and(|m| m.contains("no plugin")), "{:?}", s.message);
+}
+
+#[test]
+fn a_field_edit_syncs_in_a_live_session() {
+    use crate::live_tests::{push, relay, serve_as, session as live};
+    let (mut s, script) = live();
+    install(&mut s, manifest(ID, 4), &note(""));
+    s.execute("collab.host", &json!({})).unwrap();
+    let (mut server, me, welcome) = serve_as(s.doc().unwrap(), crate::live::Access::Edit);
+    push(&script, vec![welcome]);
+    s.live_poll();
+    let w = idv(&ex(&mut s, "widget.insert", json!({"plugin": ID})));
+    ex(&mut s, "widget.setText", json!({"id": w, "field": "label", "value": "Shared"}));
+    s.live_sync();
+    let back = relay(&script, &mut server, me);
+    push(&script, back);
+    s.live_poll();
+    let theirs = server.document().node(w).unwrap();
+    assert_eq!(theirs.plugin_data.get("figcraft.widget.state").map(String::as_str), Some(r#"{"label":"Shared"}"#));
+    assert!(theirs.plugin_data.contains_key("figcraft.widget.menu"), "the menu travels with the widget");
+}
diff --git a/crates/engine/src/widgets_tests.rs b/crates/engine/src/widgets_tests.rs
index 7079905f..bc952acd 100644
--- a/crates/engine/src/widgets_tests.rs
+++ b/crates/engine/src/widgets_tests.rs
@@ -17,13 +17,13 @@ const REPLY: usize = 200_000;
 
 /// Lays out a test plugin's strings and builds its module.
 #[derive(Default)]
-struct W {
+pub(crate) struct W {
     data: String,
     at: usize,
 }
 
 impl W {
-    fn s(&mut self, text: &str) -> (usize, usize) {
+    pub(crate) fn s(&mut self, text: &str) -> (usize, usize) {
         let a = 1000 + self.at;
         self.data += &format!("(data (i32.const {a}) \"{}\")\n", lit(text));
         self.at += text.len();
@@ -32,7 +32,7 @@ impl W {
     }
 
     /// Draw `v`; when it's refused, output why and fail.
-    fn render(&mut self, v: &Value) -> String {
+    pub(crate) fn render(&mut self, v: &Value) -> String {
         let (a, l) = self.s(&v.to_string());
         format!(
             "(if (call $render (i32.const {a}) (i32.const {l})) (then (call $set_output (i32.const {REPLY}) (call $reply_read (i32.const {REPLY}) (i32.const 50000))) (return (i32.const 1))))"
@@ -40,13 +40,13 @@ impl W {
     }
 
     /// Whether the input contains `needle`.
-    fn has(&mut self, needle: &str) -> String {
+    pub(crate) fn has(&mut self, needle: &str) -> String {
         let (a, l) = self.s(needle);
         format!("(call $has (i32.const {a}) (i32.const {l}) (local.get $n))")
     }
 
     /// Call `cmd`; a refusal becomes the output and the run stops (successfully).
-    fn call(&mut self, cmd: &str, params: &Value) -> String {
+    pub(crate) fn call(&mut self, cmd: &str, params: &Value) -> String {
         let ((a, l), (b, m)) = (self.s(cmd), self.s(&params.to_string()));
         format!(
             "(if (call $call (i32.const {a}) (i32.const {l}) (i32.const {b}) (i32.const {m}))
@@ -55,7 +55,7 @@ impl W {
     }
 
     /// The module: it reads and outputs its input, then runs `body`.
-    fn build(self, body: &str) -> Vec<u8> {
+    pub(crate) fn build(self, body: &str) -> Vec<u8> {
         let wat = format!(
             r#"(module
               (import "figcraft" "call" (func $call (param i32 i32 i32 i32) (result i32)))
@@ -108,7 +108,7 @@ fn tally(extra: impl FnOnce(&mut W) -> String) -> Vec<u8> {
     w.build(&format!("{pre} (if {inc} (then {two} (return (i32.const 0)))) (if {dec} (then {zero} (return (i32.const 0)))) {one}"))
 }
 
-fn widget_manifest(id: &str, access: &str) -> Value {
+pub(crate) fn widget_manifest(id: &str, access: &str) -> Value {
     json!({"id": id, "name": "Tally", "version": "1.0.0", "main": "w.wasm", "api": 3, "widget": true, "permissions": {"access": access}})
 }
 
@@ -128,7 +128,7 @@ fn click(s: &mut Session, w: NodeId, target: &str) -> Value {
     ex(s, "widget.click", json!({"id": w, "target": target}))
 }
 
-fn state(s: &mut Session, w: NodeId) -> Value {
+pub(crate) fn state(s: &mut Session, w: NodeId) -> Value {
     let list = ex(s, "widget.list", json!({}));
     list["widgets"].as_array().unwrap().iter().find(|x| x["id"] == json!(w)).map(|x| x["state"].clone()).unwrap_or(Value::Null)
 }
@@ -139,7 +139,7 @@ fn label(s: &Session, w: NodeId) -> String {
     node(s, first).kind.text().unwrap().characters.clone()
 }
 
-fn err(s: &mut Session, cmd: &str, p: Value) -> String {
+pub(crate) fn err(s: &mut Session, cmd: &str, p: Value) -> String {
     match s.execute(cmd, &p) {
         Ok(v) => panic!("{cmd} accepted {p}: {v}"),
         Err(e) => {
@@ -248,6 +248,19 @@ fn clicking_a_widget_on_the_canvas_calls_its_plugin_back() {
     assert!(after.x - before.x > 30.0 && state(&mut s, w) == json!({"n": 2}), "{before:?} → {after:?}");
 }
 
+#[test]
+fn a_shift_click_on_a_selected_widget_only_deselects_it() {
+    let mut s = session();
+    let (w, _) = insert(&mut s);
+    let target = s.doc().unwrap().world_bounds(node(&s, w).children[1]).unwrap().center();
+    let mut down = PointerEvent::at(PointerKind::Down, target.x, target.y, 1.0);
+    down.shift = true;
+    // Shift let go before the button: still a Shift-click, not a click on the widget.
+    s.pointer(&down).unwrap();
+    s.pointer(&PointerEvent::at(PointerKind::Up, target.x, target.y, 1.0)).unwrap();
+    assert_eq!((s.selection(), state(&mut s, w)), (vec![], json!({"n": 1})));
+}
+
 #[test]
 fn bad_widgets_and_clicks_are_refused_and_roll_back() {
     let mut s = session();
diff --git a/crates/engine/tests/empty_text_box_undo.rs b/crates/engine/tests/it/empty_text_box_undo.rs
similarity index 96%
rename from crates/engine/tests/empty_text_box_undo.rs
rename to crates/engine/tests/it/empty_text_box_undo.rs
index ec73b83a..0a302ac2 100644
--- a/crates/engine/tests/empty_text_box_undo.rs
+++ b/crates/engine/tests/it/empty_text_box_undo.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
-
 use figcraft_engine::{
     Session,
     doc::NodeKind,
diff --git a/crates/engine/tests/library_style_acceptance.rs b/crates/engine/tests/it/library_style_acceptance.rs
similarity index 98%
rename from crates/engine/tests/library_style_acceptance.rs
rename to crates/engine/tests/it/library_style_acceptance.rs
index 8398fc72..07940132 100644
--- a/crates/engine/tests/library_style_acceptance.rs
+++ b/crates/engine/tests/it/library_style_acceptance.rs
@@ -1,5 +1,4 @@
 //! Accepting a library update that changes only a paint style refreshes the layers linked to it.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use figcraft_doc::{NodeId, StyleKind};
 use figcraft_engine::Session;
diff --git a/crates/engine/tests/list_indent_response.rs b/crates/engine/tests/it/list_indent_response.rs
similarity index 97%
rename from crates/engine/tests/list_indent_response.rs
rename to crates/engine/tests/it/list_indent_response.rs
index 1dae8754..e6d47956 100644
--- a/crates/engine/tests/list_indent_response.rs
+++ b/crates/engine/tests/it/list_indent_response.rs
@@ -1,5 +1,4 @@
 //! `text.listIndent` / `text.listOutdent` report `changed` only when the document changed.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use figcraft_engine::{
     Session,
diff --git a/crates/engine/tests/it/main.rs b/crates/engine/tests/it/main.rs
new file mode 100644
index 00000000..34a12847
--- /dev/null
+++ b/crates/engine/tests/it/main.rs
@@ -0,0 +1,16 @@
+//! The crate's integration tests, built as one test binary.
+
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod empty_text_box_undo;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::disallowed_methods)]
+mod library_style_acceptance;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod list_indent_response;
+#[allow(clippy::unwrap_used)]
+mod outline_stroke;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod scope_reset;
+#[allow(clippy::unwrap_used)]
+mod selection_colors;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod shape_builder_response;
diff --git a/crates/engine/tests/it/outline_stroke.rs b/crates/engine/tests/it/outline_stroke.rs
new file mode 100644
index 00000000..9efb58c9
--- /dev/null
+++ b/crates/engine/tests/it/outline_stroke.rs
@@ -0,0 +1,172 @@
+//! Outline stroke keeps the renderer's holes and existing property ownership.
+
+use figcraft_doc::{Document, NodeId, NodeKind};
+use figcraft_engine::Session;
+use figcraft_render::{Options, View, render_view};
+use serde_json::{Value, json};
+
+fn run(s: &mut Session, command: &str, params: Value) -> Value {
+    s.execute(command, &params).unwrap()
+}
+
+fn rectangle(s: &mut Session, opacity: f64) -> NodeId {
+    NodeId(
+        run(
+            s,
+            "shape.rectangle",
+            json!({
+                "x": 24, "y": 24, "width": 64, "height": 64,
+                "props": {"fill": "#FF0000", "stroke": "#0000FF", "strokeWeight": 8, "opacity": opacity}
+            }),
+        )["id"]
+            .as_u64()
+            .unwrap(),
+    )
+}
+
+fn pixels(doc: &Document) -> Vec<u8> {
+    render_view(doc, doc.first_page().unwrap(), &View { origin: (0.0, 0.0), scale: 1.0, width: 112, height: 112 }, &Options::default())
+        .unwrap()
+        .data()
+        .to_vec()
+}
+
+fn outlined(s: &mut Session, id: NodeId) -> NodeId {
+    NodeId(run(s, "vector.outlineStroke", json!({"ids": [id]}))["ids"][0].as_u64().unwrap())
+}
+
+fn same_pixels(actual: &[u8], expected: &[u8]) {
+    assert_eq!(actual.len(), expected.len());
+    let differences: Vec<_> = actual.iter().zip(expected).enumerate().filter(|(_, (a, b))| a != b).take(8).collect();
+    assert!(differences.is_empty(), "rendered channels changed (byte, actual/expected): {differences:?}");
+}
+
+#[test]
+fn outline_keeps_rings_through_undo_and_native_reopen() {
+    for vector in [false, true] {
+        let mut s = Session::new();
+        let mut id = rectangle(&mut s, 1.0);
+        if vector {
+            id = NodeId(run(&mut s, "vector.flatten", json!({"ids": [id]}))["id"].as_u64().unwrap());
+        }
+        let before = s.doc().unwrap().clone();
+        let expected = pixels(&before);
+        let depth = s.undo_depth();
+        let group = outlined(&mut s, id);
+        let after = s.doc().unwrap().clone();
+        same_pixels(&pixels(&after), &expected);
+        assert!(after.node(id).unwrap().strokes.is_empty());
+        assert_eq!(s.selection(), vec![group]);
+        assert_eq!(s.undo_depth(), (depth.0 + 1, 0));
+        let (loaded, notes) = figcraft_format::load_bytes(&figcraft_format::save_bytes(&after, None).unwrap()).unwrap();
+        assert!(notes.is_empty(), "{notes:?}");
+        same_pixels(&pixels(&loaded), &expected);
+        assert!(s.undo().unwrap());
+        assert_eq!(serde_json::to_value(s.doc().unwrap()).unwrap(), serde_json::to_value(&before).unwrap());
+        assert!(s.redo().unwrap());
+        assert_eq!(serde_json::to_value(s.doc().unwrap()).unwrap(), serde_json::to_value(&after).unwrap());
+    }
+}
+
+#[test]
+fn stroke_only_keeps_holes_at_each_opacity() {
+    for opacity in [0.0, 0.25, 0.5, 1.0] {
+        let mut s = Session::new();
+        let id = rectangle(&mut s, opacity);
+        run(&mut s, "object.removeFill", json!({"ids": [id]}));
+        let before = pixels(s.doc().unwrap());
+        let vector = outlined(&mut s, id);
+        let doc = s.doc().unwrap();
+        assert!(matches!(doc.node(vector).unwrap().kind, NodeKind::Vector { .. }));
+        assert_eq!(doc.node(vector).unwrap().opacity, opacity as f32);
+        same_pixels(&pixels(doc), &before);
+    }
+}
+
+#[test]
+fn outline_keeps_stroke_holes_and_alignment() {
+    for props in [
+        json!({"strokeAlign": "inside"}),
+        json!({"strokeAlign": "outside"}),
+        json!({"strokeAlign": "center"}),
+        json!({"strokeSides": [2, 4, 8, 16]}),
+        json!({"strokeAlign": "center", "dashes": [8, 4]}),
+    ] {
+        for filled in [false, true] {
+            let mut s = Session::new();
+            let id = rectangle(&mut s, 1.0);
+            run(&mut s, "node.set", json!({"ids": [id], "props": props}));
+            if !filled {
+                run(&mut s, "object.removeFill", json!({"ids": [id]}));
+            }
+            let before = pixels(s.doc().unwrap());
+            outlined(&mut s, id);
+            same_pixels(&pixels(s.doc().unwrap()), &before);
+        }
+    }
+}
+
+#[test]
+fn outlining_an_instance_keeps_its_inherited_opacity_link() {
+    let mut s = Session::new();
+    let component = NodeId(
+        run(
+            &mut s,
+            "frame.create",
+            json!({
+                "width": 64, "height": 64,
+                "props": {"fill": "#FF0000", "stroke": "#0000FF", "strokeWeight": 8, "opacity": 0.5}
+            }),
+        )["id"]
+            .as_u64()
+            .unwrap(),
+    );
+    run(&mut s, "component.create", json!({"ids": [component]}));
+    let instance = NodeId(run(&mut s, "instance.create", json!({"component": component, "x": 200}))["id"].as_u64().unwrap());
+    outlined(&mut s, instance);
+    assert_eq!(s.doc().unwrap().node(instance).unwrap().opacity, 0.5);
+    assert!(!s.doc().unwrap().node(instance).unwrap().overrides.contains("opacity"));
+    run(&mut s, "node.set", json!({"id": component, "props": {"opacity": 0.25}}));
+    let n = s.doc().unwrap().node(instance).unwrap();
+    assert_eq!(n.opacity, 0.25, "the instance still follows its main");
+    assert!(!n.overrides.contains("opacity"));
+}
+
+#[test]
+fn outlining_a_main_layer_keeps_its_instance_override() {
+    let mut s = Session::new();
+    let frame = NodeId(run(&mut s, "frame.create", json!({"width": 100, "height": 100}))["id"].as_u64().unwrap());
+    let layer = NodeId(
+        run(
+            &mut s,
+            "shape.rectangle",
+            json!({
+                "parent": frame, "x": 24, "y": 24, "width": 64, "height": 64,
+                "props": {"fill": "#FF0000", "stroke": "#0000FF", "strokeWeight": 8}
+            }),
+        )["id"]
+            .as_u64()
+            .unwrap(),
+    );
+    let component = run(&mut s, "component.create", json!({"ids": [frame]}))["id"].clone();
+    run(&mut s, "instance.create", json!({"component": component, "x": 200}));
+    let copy = s.doc().unwrap().nodes().find(|n| n.source == Some(layer)).unwrap().id;
+    run(&mut s, "node.set", json!({"id": copy, "props": {"opacity": 0.25}}));
+    let before = s.doc().unwrap().clone();
+    let view = View { origin: (0.0, 0.0), scale: 1.0, width: 312, height: 112 };
+    let expected = render_view(&before, s.page().unwrap(), &view, &Options::default()).unwrap();
+    let group = outlined(&mut s, layer);
+    let doc = s.doc().unwrap();
+    let actual = render_view(doc, s.page().unwrap(), &view, &Options::default()).unwrap();
+    same_pixels(actual.data(), expected.data());
+    let instance_group = doc.node(copy).unwrap();
+    assert!(matches!(instance_group.kind, NodeKind::Group));
+    assert_eq!(instance_group.source, Some(group));
+    assert_eq!(instance_group.opacity, 0.25);
+    assert!(instance_group.overrides.contains("opacity"));
+    assert!(s.undo().unwrap());
+    assert_eq!(serde_json::to_value(s.doc().unwrap()).unwrap(), serde_json::to_value(&before).unwrap());
+    assert!(s.redo().unwrap());
+    let actual = render_view(s.doc().unwrap(), s.page().unwrap(), &view, &Options::default()).unwrap();
+    same_pixels(actual.data(), expected.data());
+}
diff --git a/crates/engine/tests/scope_reset.rs b/crates/engine/tests/it/scope_reset.rs
similarity index 95%
rename from crates/engine/tests/scope_reset.rs
rename to crates/engine/tests/it/scope_reset.rs
index 6d875d12..1838e8a9 100644
--- a/crates/engine/tests/scope_reset.rs
+++ b/crates/engine/tests/it/scope_reset.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
-
 use figcraft_engine::Session;
 use serde_json::json;
 
diff --git a/crates/engine/tests/it/selection_colors.rs b/crates/engine/tests/it/selection_colors.rs
new file mode 100644
index 00000000..c3fc4f97
--- /dev/null
+++ b/crates/engine/tests/it/selection_colors.rs
@@ -0,0 +1,423 @@
+use figcraft_color::Paint;
+use figcraft_doc::NodeId;
+use figcraft_engine::{
+    Session,
+    selection_colors::{SelectionColor, collect},
+};
+use serde_json::{Value, json};
+
+fn run(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap()
+}
+fn rectangle(s: &mut Session, color: &str) -> NodeId {
+    NodeId(run(s, "shape.rectangle", json!({"width":40,"height":40,"props":{"fill":color}}))["id"].as_u64().unwrap())
+}
+fn group(s: &Session, ids: &[NodeId], hex: &str) -> SelectionColor {
+    collect(s.doc().unwrap(), ids).into_iter().find(|g| g.paint.solid_color().is_some_and(|c| c.to_hex() == hex)).unwrap()
+}
+fn fill(s: &Session, id: NodeId) -> String {
+    s.doc().unwrap().node(id).unwrap().fills[0].solid_color().unwrap().to_hex()
+}
+
+#[test]
+fn aggregate_descendants_deduplicate_roots_and_ignore_images_and_hidden_paints() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let b = rectangle(&mut s, "#00ff00");
+    run(&mut s, "stroke.add", json!({"id":b,"color":"#ff0000"}));
+    let parent = NodeId(run(&mut s, "object.group", json!({"ids":[a,b]}))["id"].as_u64().unwrap());
+    let colors = collect(s.doc().unwrap(), &[parent, a]);
+    assert_eq!(colors.len(), 2);
+    assert_eq!(group(&s, &[parent, a], "FF0000").targets.len(), 2);
+    run(&mut s, "fill.add", json!({"id":a,"paint":Paint::image("synthetic",figcraft_color::ImageScaleMode::Fill)}));
+    run(&mut s, "fill.add", json!({"id":a,"paint":{"type":"solid","color":"#0000ff","visible":false}}));
+    assert_eq!(collect(s.doc().unwrap(), &[parent]).len(), 2);
+    run(&mut s, "select.set", json!({"ids":[parent]}));
+    assert_eq!(run(&mut s, "selection.colors", json!({}))["colors"].as_array().unwrap().len(), 2);
+}
+
+#[test]
+fn editing_only_matching_slots_is_one_undo_step_and_keeps_selection() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let b = rectangle(&mut s, "#0000ff");
+    let c = rectangle(&mut s, "#00ff00");
+    run(&mut s, "stroke.add", json!({"id":b,"color":"#ff0000"}));
+    run(&mut s, "select.set", json!({"ids":[a,b]}));
+    let red = group(&s, &[a, b], "FF0000");
+    let before = s.undo_depth();
+    run(&mut s, "selection.setPaint", json!({"targets":red.targets,"paint":"#ffff00"}));
+    assert_eq!(fill(&s, a), "FFFF00");
+    assert_eq!(fill(&s, b), "0000FF");
+    assert_eq!(fill(&s, c), "00FF00");
+    assert_eq!(s.doc().unwrap().node(b).unwrap().strokes[0].solid_color().unwrap().to_hex(), "FFFF00");
+    assert_eq!(s.selection(), vec![a, b]);
+    assert_eq!(s.undo_depth().0, before.0 + 1);
+    s.undo().unwrap();
+    assert_eq!(fill(&s, a), "FF0000");
+    s.redo().unwrap();
+    assert_eq!(fill(&s, a), "FFFF00");
+}
+
+#[test]
+fn live_picker_targets_do_not_expand_when_colors_merge() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let b = rectangle(&mut s, "#0000ff");
+    let red = group(&s, &[a, b], "FF0000");
+    let before = s.undo_depth();
+    s.begin_interaction("Color").unwrap();
+    for hex in ["#0000ff", "#00ff00"] {
+        run(&mut s, "selection.setPaint", json!({"targets":red.targets,"paint":hex}));
+    }
+    s.commit_interaction().unwrap();
+    assert_eq!(fill(&s, a), "00FF00");
+    assert_eq!(fill(&s, b), "0000FF");
+    assert_eq!(s.undo_depth().0, before.0 + 1);
+    s.undo().unwrap();
+    assert_eq!(fill(&s, a), "FF0000");
+}
+
+#[test]
+fn text_range_colors_use_character_offsets_and_preserve_typography() {
+    let mut s = Session::new();
+    let id = NodeId(run(&mut s, "text.create", json!({"text":"Яab","props":{"fill":"#ff0000"}}))["id"].as_u64().unwrap());
+    run(&mut s, "text.style", json!({"id":id,"start":1,"end":2,"fontSize":30,"textFills":["#0000ff"]}));
+    let blue = group(&s, &[id], "0000FF");
+    assert_eq!(blue.targets[0].range, Some((1, 2)));
+    run(&mut s, "selection.setPaint", json!({"targets":blue.targets,"paint":"#00ff00"}));
+    let n = s.doc().unwrap().node(id).unwrap();
+    let t = n.kind.text().unwrap();
+    assert_eq!(t.characters, "Яab");
+    assert_eq!(t.style_at(1).font_size, 30.0);
+    assert_eq!(t.style_at(1).fills.as_ref().unwrap()[0].solid_color().unwrap().to_hex(), "00FF00");
+    assert_eq!(t.style_at(0).fills.as_deref().unwrap_or(&n.fills)[0].solid_color().unwrap().to_hex(), "FF0000");
+    assert_eq!(t.style_at(2).fills.as_deref().unwrap_or(&n.fills)[0].solid_color().unwrap().to_hex(), "FF0000");
+}
+
+#[test]
+fn selecting_color_selects_its_unique_owners_without_document_history() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let b = rectangle(&mut s, "#0000ff");
+    run(&mut s, "stroke.add", json!({"id":a,"color":"#ff0000"}));
+    let red = group(&s, &[a, b], "FF0000");
+    let before = s.undo_depth();
+    run(&mut s, "selection.selectColor", json!({"targets":red.targets}));
+    assert_eq!(s.selection(), vec![a]);
+    assert_eq!(s.undo_depth(), before);
+}
+
+#[test]
+fn applying_color_styles_links_matching_fill_and_stroke_lists_only() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let b = rectangle(&mut s, "#0000ff");
+    run(&mut s, "stroke.add", json!({"id":b,"color":"#ff0000"}));
+    let red = group(&s, &[a, b], "FF0000");
+    let style = run(&mut s, "style.create", json!({"type":"paint","name":"Brand","value":"#00ff00"}))["id"].clone();
+    let before = s.undo_depth();
+    run(&mut s, "selection.applyColorStyle", json!({"targets":red.targets,"style":style}));
+    assert_eq!(fill(&s, a), "00FF00");
+    assert_eq!(fill(&s, b), "0000FF");
+    assert_eq!(s.doc().unwrap().node(a).unwrap().styles.fill.as_deref(), style.as_str());
+    assert_eq!(s.doc().unwrap().node(b).unwrap().styles.stroke.as_deref(), style.as_str());
+    assert_eq!(s.undo_depth().0, before.0 + 1);
+    run(&mut s, "style.update", json!({"style":style,"value":"#ffff00"}));
+    assert_eq!(fill(&s, a), "FFFF00");
+    assert_eq!(fill(&s, b), "0000FF");
+}
+
+#[test]
+fn explicit_color_detaches_its_binding_but_keeps_other_bindings() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    run(&mut s, "variable.createCollection", json!({"name":"Theme"}));
+    let v = run(&mut s, "variable.create", json!({"collection":"Theme","name":"Brand","type":"color","value":"#ff0000"}))["id"].clone();
+    run(&mut s, "variable.bind", json!({"id":a,"field":"fill","variable":v}));
+    let red = group(&s, &[a], "FF0000");
+    run(&mut s, "selection.setPaint", json!({"targets":red.targets,"paint":"#0000ff"}));
+    assert_eq!(fill(&s, a), "0000FF");
+    assert!(s.doc().unwrap().node(a).unwrap().bound.is_empty());
+    s.undo().unwrap();
+    assert_eq!(fill(&s, a), "FF0000");
+    assert!(!s.doc().unwrap().node(a).unwrap().bound.is_empty());
+}
+
+#[test]
+fn invalid_or_stale_targets_roll_back_atomically() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let mut red = group(&s, &[a], "FF0000");
+    let mut bad = red.targets[0].clone();
+    bad.index = 999;
+    red.targets.push(bad);
+    let before = s.undo_depth();
+    assert!(s.execute("selection.setPaint", &json!({"targets":red.targets,"paint":"#0000ff"})).is_err());
+    assert_eq!(fill(&s, a), "FF0000");
+    assert_eq!(s.undo_depth(), before);
+    for command in
+        ["selection.setPaint", "selection.selectColor", "selection.applyColorStyle", "selection.bindColorVariable", "selection.detachColor"]
+    {
+        for params in [json!({}), json!({"targets":[]}), json!({"targets":[{"id":a,"fills":true,"index":0,"range":[0,1]}]})] {
+            assert!(s.execute(command, &params).is_err());
+        }
+    }
+}
+
+#[test]
+fn equal_resolved_colors_from_different_styles_or_variables_stay_separate() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let b = rectangle(&mut s, "#ff0000");
+    let c = rectangle(&mut s, "#ff0000");
+    let style = run(&mut s, "style.create", json!({"type":"paint","name":"Brand","value":"#ff0000"}))["id"].clone();
+    run(&mut s, "style.apply", json!({"id":a,"style":style,"target":"fill"}));
+    run(&mut s, "variable.createCollection", json!({"name":"Theme"}));
+    let variable = run(&mut s, "variable.create", json!({"collection":"Theme","name":"Accent","type":"color","value":"#ff0000"}))["id"].clone();
+    run(&mut s, "variable.bind", json!({"id":b,"field":"fill","variable":variable}));
+    let colors = collect(s.doc().unwrap(), &[a, b, c]);
+    assert_eq!(colors.len(), 3);
+    assert_eq!(colors[0].style.as_deref(), style.as_str());
+    assert_eq!(colors[1].variable.as_deref(), variable.as_str());
+    assert!(colors[2].style.is_none() && colors[2].variable.is_none());
+}
+
+#[test]
+fn gradients_and_multiple_paints_are_edited_without_replacing_other_slots() {
+    use figcraft_color::{Color, Gradient, GradientKind};
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let paint = Paint::gradient(Gradient::default_for(GradientKind::Linear, Color::BLACK));
+    run(&mut s, "fill.add", json!({"id":a,"paint":paint}));
+    let colors = collect(s.doc().unwrap(), &[a]);
+    assert_eq!(colors.len(), 2);
+    let gradient = colors.iter().find(|g| g.paint == paint).unwrap();
+    run(&mut s, "selection.setPaint", json!({"targets":gradient.targets,"paint":"#00ff00"}));
+    let paints = &s.doc().unwrap().node(a).unwrap().fills;
+    assert_eq!(paints.len(), 2);
+    assert_eq!(paints[0].solid_color().unwrap().to_hex(), "FF0000");
+    assert_eq!(paints[1].solid_color().unwrap().to_hex(), "00FF00");
+}
+
+#[test]
+fn masks_and_boolean_operands_are_not_selection_colors() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let b = rectangle(&mut s, "#00ff00");
+    let boolean = NodeId(run(&mut s, "bool.union", json!({"ids":[a,b]}))["id"].as_u64().unwrap());
+    run(&mut s, "fill.set", json!({"id":boolean,"color":"#0000ff"}));
+    let colors = collect(s.doc().unwrap(), &[boolean]);
+    assert_eq!(colors.len(), 1);
+    assert_eq!(colors[0].paint.solid_color().unwrap().to_hex(), "0000FF");
+    s.doc_mut().unwrap().get_mut(boolean).unwrap().is_mask = true;
+    assert!(collect(s.doc().unwrap(), &[boolean]).is_empty());
+}
+
+#[test]
+fn range_edit_keeps_a_node_binding_that_other_characters_inherit() {
+    let mut s = Session::new();
+    let id = NodeId(run(&mut s, "text.create", json!({"text":"abc","props":{"fill":"#ff0000"}}))["id"].as_u64().unwrap());
+    run(&mut s, "variable.createCollection", json!({"name":"Theme"}));
+    let v = run(&mut s, "variable.create", json!({"collection":"Theme","name":"Brand","type":"color","value":"#ff0000"}))["id"].clone();
+    run(&mut s, "variable.bind", json!({"id":id,"field":"fill","variable":v}));
+    run(&mut s, "text.style", json!({"id":id,"start":1,"end":2,"textFills":["#0000ff"]}));
+    let blue = group(&s, &[id], "0000FF");
+    run(&mut s, "selection.setPaint", json!({"targets":blue.targets,"paint":"#00ff00"}));
+    assert!(!s.doc().unwrap().node(id).unwrap().bound.is_empty());
+    assert_eq!(fill(&s, id), "FF0000");
+    assert_eq!(
+        s.doc().unwrap().node(id).unwrap().kind.text().unwrap().style_at(1).fills.as_ref().unwrap()[0].solid_color().unwrap().to_hex(),
+        "00FF00"
+    );
+}
+
+#[test]
+fn selection_color_edits_respect_read_only_version_previews() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    run(&mut s, "file.saveVersion", json!({"name":"Before"}));
+    run(&mut s, "version.preview", json!({"index":0}));
+    let red = group(&s, &[a], "FF0000");
+    let before = s.undo_depth();
+    assert!(s.execute("selection.setPaint", &json!({"targets":red.targets,"paint":"#0000ff"})).is_err());
+    assert_eq!(fill(&s, a), "FF0000");
+    assert_eq!(s.undo_depth(), before);
+}
+
+#[test]
+fn opacity_edits_keep_the_color_variable_binding() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    run(&mut s, "variable.createCollection", json!({"name":"Theme"}));
+    let v = run(&mut s, "variable.create", json!({"collection":"Theme","name":"Brand","type":"color","value":"#ff0000"}))["id"].clone();
+    run(&mut s, "variable.bind", json!({"id":a,"field":"fill","variable":v}));
+    let mut red = group(&s, &[a], "FF0000");
+    red.paint.opacity = 0.5;
+    run(&mut s, "selection.setPaint", json!({"targets":red.targets,"paint":red.paint}));
+    let n = s.doc().unwrap().node(a).unwrap();
+    assert_eq!(n.fills[0].opacity, 0.5);
+    assert!(!n.bound.is_empty());
+}
+
+#[test]
+fn whole_text_fill_keeps_a_color_style_link() {
+    let mut s = Session::new();
+    let id = NodeId(run(&mut s, "text.create", json!({"text":"Text","props":{"fill":"#ff0000"}}))["id"].as_u64().unwrap());
+    let red = group(&s, &[id], "FF0000");
+    assert_eq!(red.targets[0].range, None);
+    let style = run(&mut s, "style.create", json!({"type":"paint","name":"Brand","value":"#0000ff"}))["id"].clone();
+    run(&mut s, "selection.applyColorStyle", json!({"targets":red.targets,"style":style}));
+    assert_eq!(s.doc().unwrap().node(id).unwrap().styles.fill.as_deref(), style.as_str());
+    run(&mut s, "style.update", json!({"style":style,"value":"#00ff00"}));
+    assert_eq!(fill(&s, id), "00FF00");
+}
+
+fn theme_variable(s: &mut Session, name: &str, hex: &str) -> Value {
+    if s.doc().unwrap().variables.collection("Theme").is_none() {
+        run(s, "variable.createCollection", json!({"name":"Theme"}));
+    }
+    run(s, "variable.create", json!({"collection":"Theme","name":name,"type":"color","value":hex}))["id"].clone()
+}
+
+#[test]
+fn applying_a_color_variable_binds_matching_fill_and_stroke_slots_only() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let b = rectangle(&mut s, "#0000ff");
+    run(&mut s, "stroke.add", json!({"id":b,"color":"#ff0000"}));
+    let v = theme_variable(&mut s, "Brand", "#00ff00");
+    let red = group(&s, &[a, b], "FF0000");
+    let before = s.undo_depth();
+    run(&mut s, "selection.bindColorVariable", json!({"targets":red.targets,"variable":"Brand"}));
+    assert_eq!(fill(&s, a), "00FF00");
+    assert_eq!(fill(&s, b), "0000FF");
+    assert_eq!(s.doc().unwrap().node(b).unwrap().strokes[0].solid_color().unwrap().to_hex(), "00FF00");
+    assert_eq!(s.doc().unwrap().node(a).unwrap().bound.get("fills/0/color").map(String::as_str), v.as_str());
+    assert_eq!(s.doc().unwrap().node(b).unwrap().bound.get("strokes/0/color").map(String::as_str), v.as_str());
+    assert_eq!(s.undo_depth().0, before.0 + 1);
+    run(&mut s, "variable.set", json!({"variable":v,"value":"#ffff00"}));
+    assert_eq!(fill(&s, a), "FFFF00");
+    assert_eq!(fill(&s, b), "0000FF");
+    let bound = collect(s.doc().unwrap(), &[a, b]).into_iter().find(|g| g.variable.is_some()).unwrap();
+    assert_eq!(bound.targets.len(), 2);
+    s.undo().unwrap();
+    s.undo().unwrap();
+    assert_eq!(fill(&s, a), "FF0000");
+    assert!(s.doc().unwrap().node(a).unwrap().bound.is_empty());
+}
+
+#[test]
+fn a_color_variable_replaces_a_style_link_and_an_earlier_binding() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let b = rectangle(&mut s, "#ff0000");
+    let style = run(&mut s, "style.create", json!({"type":"paint","name":"Brand","value":"#ff0000"}))["id"].clone();
+    run(&mut s, "style.apply", json!({"id":a,"style":style,"target":"fill"}));
+    let old = theme_variable(&mut s, "Old", "#ff0000");
+    run(&mut s, "variable.bind", json!({"id":b,"field":"fill","variable":old}));
+    let new = theme_variable(&mut s, "New", "#0000ff");
+    let targets: Vec<_> = collect(s.doc().unwrap(), &[a, b]).into_iter().flat_map(|g| g.targets).collect();
+    run(&mut s, "selection.bindColorVariable", json!({"targets":targets,"variable":new}));
+    for id in [a, b] {
+        let n = s.doc().unwrap().node(id).unwrap();
+        assert!(n.styles.fill.is_none());
+        assert_eq!(n.bound.len(), 1, "one binding for the slot: {:?}", n.bound);
+        assert_eq!(n.bound.values().next().map(String::as_str), new.as_str());
+        assert_eq!(fill(&s, id), "0000FF");
+    }
+    assert_eq!(collect(s.doc().unwrap(), &[a, b]).len(), 1);
+}
+
+#[test]
+fn a_color_variable_on_a_text_range_with_its_own_fills_takes_its_value() {
+    let mut s = Session::new();
+    let id = NodeId(run(&mut s, "text.create", json!({"text":"abc","props":{"fill":"#ff0000"}}))["id"].as_u64().unwrap());
+    run(&mut s, "text.style", json!({"id":id,"start":1,"end":2,"fontSize":30,"textFills":["#0000ff"]}));
+    theme_variable(&mut s, "Brand", "#00ff0080");
+    let blue = group(&s, &[id], "0000FF");
+    run(&mut s, "selection.bindColorVariable", json!({"targets":blue.targets,"variable":"Brand"}));
+    let n = s.doc().unwrap().node(id).unwrap();
+    let t = n.kind.text().unwrap();
+    let paint = &t.style_at(1).fills.as_ref().unwrap()[0];
+    assert_eq!(paint.solid_color().unwrap().to_css_hex(), "#00FF0080");
+    assert_eq!(t.style_at(1).font_size, 30.0);
+    assert!(n.bound.is_empty());
+    assert_eq!(fill(&s, id), "FF0000");
+}
+
+#[test]
+fn detaching_a_selection_color_keeps_its_value() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let b = rectangle(&mut s, "#ff0000");
+    let c = rectangle(&mut s, "#0000ff");
+    let style = run(&mut s, "style.create", json!({"type":"paint","name":"Brand","value":"#00ff00"}))["id"].clone();
+    run(&mut s, "style.apply", json!({"id":a,"style":style,"target":"fill"}));
+    let v = theme_variable(&mut s, "Accent", "#ffff0080");
+    run(&mut s, "variable.bind", json!({"id":b,"field":"fill","variable":v}));
+    run(&mut s, "variable.bind", json!({"id":c,"field":"fill","variable":v}));
+    let colors = collect(s.doc().unwrap(), &[a, b]);
+    assert_eq!(colors.len(), 2);
+    let before = s.undo_depth();
+    for g in &colors {
+        run(&mut s, "selection.detachColor", json!({"targets":g.targets}));
+    }
+    assert_eq!(s.undo_depth().0, before.0 + 2);
+    assert!(s.doc().unwrap().node(a).unwrap().styles.fill.is_none());
+    assert!(s.doc().unwrap().node(b).unwrap().bound.is_empty());
+    assert!(!s.doc().unwrap().node(c).unwrap().bound.is_empty());
+    assert_eq!(fill(&s, a), "00FF00");
+    assert_eq!(s.doc().unwrap().node(b).unwrap().fills[0].solid_color().unwrap().to_css_hex(), "#FFFF0080");
+    run(&mut s, "variable.set", json!({"variable":v,"value":"#000000"}));
+    assert_eq!(fill(&s, b), "FFFF00");
+    assert!(collect(s.doc().unwrap(), &[a, b]).iter().all(|g| g.style.is_none() && g.variable.is_none()));
+}
+
+#[test]
+fn color_variables_refuse_gradients_other_types_and_unknown_names() {
+    use figcraft_color::{Color, Gradient, GradientKind};
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    let gradient = Paint::gradient(Gradient::default_for(GradientKind::Linear, Color::BLACK));
+    run(&mut s, "fill.add", json!({"id":a,"paint":gradient}));
+    theme_variable(&mut s, "Brand", "#00ff00");
+    run(&mut s, "variable.create", json!({"collection":"Theme","name":"Gap","type":"number","value":8}));
+    let colors = collect(s.doc().unwrap(), &[a]);
+    let solid = colors.iter().find(|g| g.paint.solid_color().is_some()).unwrap();
+    let ramp = colors.iter().find(|g| g.paint.solid_color().is_none()).unwrap();
+    let before = s.undo_depth();
+    for (targets, variable) in [(&ramp.targets, "Brand"), (&solid.targets, "Gap"), (&solid.targets, "Missing")] {
+        assert!(s.execute("selection.bindColorVariable", &json!({"targets":targets,"variable":variable})).is_err());
+    }
+    assert!(s.execute("selection.bindColorVariable", &json!({"targets":solid.targets})).is_err());
+    assert!(s.doc().unwrap().node(a).unwrap().bound.is_empty());
+    assert_eq!(s.undo_depth(), before);
+    run(&mut s, "selection.bindColorVariable", json!({"targets":solid.targets,"variable":"Brand"}));
+    assert_eq!(s.doc().unwrap().node(a).unwrap().bound.len(), 1);
+    assert_eq!(s.undo_depth().0, before.0 + 1);
+}
+
+#[test]
+fn scopes_filter_the_menu_but_the_command_binds_anyway() {
+    let mut s = Session::new();
+    let a = rectangle(&mut s, "#ff0000");
+    run(&mut s, "stroke.add", json!({"id":a,"color":"#ff0000"}));
+    theme_variable(&mut s, "Line", "#00ff00");
+    theme_variable(&mut s, "Hidden", "#0000ff");
+    run(&mut s, "variable.update", json!({"variable":"Line","scopes":["STROKE_COLOR"]}));
+    run(&mut s, "variable.update", json!({"variable":"Hidden","scopes":[]}));
+    let red = group(&s, &[a], "FF0000");
+    let fill_slot: Vec<_> = red.targets.iter().filter(|t| t.fills).cloned().collect();
+    let stroke_slot: Vec<_> = red.targets.iter().filter(|t| !t.fills).cloned().collect();
+    let doc = s.doc().unwrap();
+    let offered = |targets: &[figcraft_engine::selection_colors::PaintTarget], v: &str| figcraft_engine::selection_colors::in_scope(doc, targets, v);
+    assert!(offered(&stroke_slot, "Line"));
+    assert!(!offered(&red.targets, "Line") && !offered(&fill_slot, "Line") && !offered(&stroke_slot, "Hidden"));
+    run(&mut s, "selection.bindColorVariable", json!({"targets":stroke_slot,"variable":"Line"}));
+    assert_eq!(s.doc().unwrap().node(a).unwrap().strokes[0].solid_color().unwrap().to_hex(), "00FF00");
+    assert_eq!(fill(&s, a), "FF0000");
+    // As with `variable.bind`, the command itself binds outside the scopes.
+    run(&mut s, "selection.bindColorVariable", json!({"targets":fill_slot,"variable":"Line"}));
+    assert_eq!(fill(&s, a), "00FF00");
+}
diff --git a/crates/engine/tests/shape_builder_response.rs b/crates/engine/tests/it/shape_builder_response.rs
similarity index 95%
rename from crates/engine/tests/shape_builder_response.rs
rename to crates/engine/tests/it/shape_builder_response.rs
index e1426823..6187e556 100644
--- a/crates/engine/tests/shape_builder_response.rs
+++ b/crates/engine/tests/it/shape_builder_response.rs
@@ -1,4 +1,3 @@
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 use figcraft_engine::Session;
 use serde_json::{Value, json};
 
diff --git a/crates/format/Cargo.toml b/crates/format/Cargo.toml
index 3dca3912..b144465f 100644
--- a/crates/format/Cargo.toml
+++ b/crates/format/Cargo.toml
@@ -16,5 +16,6 @@ serde_json = { workspace = true }
 zip = { workspace = true }
 flate2 = { workspace = true }
 ruzstd = { workspace = true }
+sha1 = { workspace = true }
 sha2 = { workspace = true }
 image = { workspace = true }
diff --git a/crates/format/src/fig/mod.rs b/crates/format/src/fig.rs
similarity index 62%
rename from crates/format/src/fig/mod.rs
rename to crates/format/src/fig.rs
index ec2a0e23..d81a5856 100644
--- a/crates/format/src/fig/mod.rs
+++ b/crates/format/src/fig.rs
@@ -6,23 +6,46 @@
 //! zstd: a binary schema in the kiwi format ([`kiwi`]), then a message encoded with it. Every file
 //! carries its own schema, so the message is decoded generically and read by field name: a list
 //! of node changes (each with its id, parent id and position among its siblings) that make up the
-//! layer tree, plus blobs (vector outlines and editable vector networks, [`network`]). [`map`]
+//! layer tree, plus blobs (vector outlines and editable vector networks, [`network`], and the bytes
+//! of images that travel inside the message, [`embedded_images`]). [`map`]
 //! turns that into the REST API file JSON shape and the REST importer builds the document, so both
 //! imports share one mapping. Layer kinds the editor doesn't have (sticky notes, connectors,
 //! tables, …) come in as the closest frames, text and vectors. Anything not understood is skipped
 //! with a warning; malformed input never panics.
 
+#[cfg(test)]
+mod auto_layout_sizing_tests;
+#[cfg(test)]
+mod connector_label_tests;
 mod export;
 #[cfg(test)]
 mod export_tests;
 #[cfg(test)]
 mod interop_tests;
 pub mod kiwi;
+#[cfg(test)]
+mod layer_cap_tests;
 mod map;
 mod network;
 #[cfg(test)]
+mod prop_value_tests;
+#[cfg(test)]
+mod slot_tests;
+#[cfg(test)]
+mod source_identity_tests;
+#[cfg(test)]
 mod tests;
+#[cfg(test)]
+mod text_paragraph_tests;
+mod text_path;
+#[cfg(test)]
+mod text_path_tests;
+#[cfg(test)]
+mod text_skip_ink_tests;
+#[cfg(test)]
+mod text_style_tests;
 
+use std::collections::BTreeMap;
 use std::io::Read;
 
 use figcraft_doc::Document;
@@ -30,7 +53,7 @@ use figcraft_doc::Document;
 pub use export::export;
 
 use crate::FormatError;
-use kiwi::Schema;
+use kiwi::{Kv, Schema};
 
 /// Largest `canvas.fig` member read, and largest decompressed chunk.
 const MAX_CANVAS: u64 = 256 * 1024 * 1024;
@@ -39,6 +62,21 @@ const MAX_CHUNK: u64 = 512 * 1024 * 1024;
 const MAX_IMAGE: u64 = 256 * 1024 * 1024;
 /// Most chunks read from `canvas.fig`.
 const MAX_CHUNKS: usize = 16;
+/// Most layers imported from a `.fig` file: one per [`PACKED_BYTES_PER_LAYER`] bytes of its
+/// compressed canvas, at least the REST import's cap and at most [`MAX_FIG_NODES`]. Instances
+/// expand into a layer per layer of their component, and chunks inflate up to [`MAX_CHUNK`], so the
+/// budget follows what the file takes, not what it unpacks to: a small file can't claim a large
+/// count, however it's built; a large one gets room. Design systems are mostly instances, which
+/// pack tightly: a 7.8 MB canvas stopped at 244 248 layers at 32 bytes a layer (#981). At 8, files
+/// under about 1.6 MB keep the floor and the ceiling comes at a 16 MB canvas (about 11 GB and 40 s
+/// to import 2 million synthetic layers; memory grows with the count, about 5.4 KB a layer).
+const PACKED_BYTES_PER_LAYER: usize = 8;
+const MAX_FIG_NODES: usize = 2_000_000;
+
+/// Most layers imported from a `.fig` file whose compressed canvas is `packed` bytes.
+pub(crate) fn layer_budget(packed: usize) -> usize {
+    (packed / PACKED_BYTES_PER_LAYER).clamp(crate::rest::MAX_NODES, MAX_FIG_NODES)
+}
 
 /// Whether `bytes` look like a `.fig` file: a zip holding `canvas.fig`, or a bare canvas.
 pub fn is_fig(bytes: &[u8]) -> bool {
@@ -57,22 +95,38 @@ pub fn try_import(bytes: &[u8], name: &str) -> Option<Result<(Document, Vec<Stri
 /// Build a document from a `.fig` file. Returns it with the warnings about what was skipped or
 /// approximated. `name`: the document name when the file doesn't carry one.
 pub fn import(bytes: &[u8], name: &str) -> Result<(Document, Vec<String>), FormatError> {
-    let archive = Archive::open(bytes)?;
-    let (schema, message) = decode_canvas(&archive.canvas)?;
+    let mut archive = Archive::open(bytes)?;
+    // The budgets follow the compressed canvas, which the file itself bounds (its zip member may
+    // inflate too).
+    let packed = archive.canvas.len().min(bytes.len());
+    // Each stage's input is dropped as soon as the next one is built: in a large file every one
+    // of them takes gigabytes, and holding them all at once runs out of memory.
+    let (schema, message) = decode_canvas(&std::mem::take(&mut archive.canvas))?;
     let root = schema.find("Message").ok_or_else(|| corrupt("the schema has no Message definition"))?;
-    let msg = schema.decode_message(root, &message).map_err(|e| corrupt(e.to_string()))?;
+    let msg = schema.decode_message_within(root, &message, kiwi::value_budget(packed)).map_err(|e| corrupt(e.to_string()))?;
+    let max_nodes = layer_budget(packed);
+    drop(message);
     let file_name = archive.file_name.as_deref().filter(|n| !n.trim().is_empty()).unwrap_or(name);
-    let (json, mut warnings) = map::to_rest(&msg, file_name);
-    let images = |r: &str| archive.image(r);
-    let (doc, more) = crate::rest::import(&json, &images)?;
-    warnings.extend(more.into_iter().filter_map(map::adapt_warning));
+    let (json, mut warnings, networks) = map::to_rest(&msg, file_name, max_nodes);
+    // The message goes before the layers are built, so the images it carries are copied out first.
+    let embedded: BTreeMap<String, Vec<u8>> = embedded_images(&msg).into_iter().map(|(hash, bytes)| (hash, bytes.to_vec())).collect();
+    drop(msg);
+    let images = |r: &str| archive.image(r).or_else(|| embedded.get(r).cloned());
+    let (doc, more) = crate::rest::import_with_networks(&json, &images, networks, max_nodes)?;
+    // Both stages stop at the same cap and say so in the same words: one note (#981).
+    for w in more.into_iter().filter_map(map::adapt_warning) {
+        let base = w.rsplit_once(" (×").map_or(w.as_str(), |(b, _)| b);
+        if !warnings.iter().any(|seen| seen == base) {
+            warnings.push(w);
+        }
+    }
     Ok((doc, warnings))
 }
 
 /// A font style under the name the format uses: the standard weight names as words ("SemiBold"
 /// → "Semi Bold", "ExtraBoldItalic" → "Extra Bold Italic", "Regular Italic" → "Italic"). Other
 /// names stay as they are.
-fn style_name(style: &str) -> String {
+pub(crate) fn style_name(style: &str) -> String {
     const WEIGHTS: [&str; 12] =
         ["Thin", "Extra Light", "Ultra Light", "Light", "Regular", "Medium", "Semi Bold", "Demi Bold", "Bold", "Extra Bold", "Ultra Bold", "Black"];
     let compact = |s: &str| s.chars().filter(|c| !matches!(c, ' ' | '-' | '_')).flat_map(char::to_lowercase).collect::<String>();
@@ -94,6 +148,41 @@ fn corrupt(msg: impl Into<String>) -> FormatError {
     FormatError::Corrupt(format!(".fig file: {}", msg.into()))
 }
 
+/// Image bytes that travel inside the message, by image hash (lowercase hex): a paint's
+/// `image.dataBlob` indexes the message's `blobs`. Copies written by plugins and other tools embed
+/// their images this way, and a bare canvas (what the clipboard carries) has no `images/`. The
+/// walk is iterative (no recursion on nested data) and skips blobs larger than [`MAX_IMAGE`]. The
+/// bytes stay borrowed from the message.
+fn embedded_images<'m>(msg: &'m Kv) -> BTreeMap<String, &'m [u8]> {
+    let blobs = msg.get("blobs").map(Kv::list).unwrap_or_default();
+    let mut found = BTreeMap::new();
+    let mut pending = vec![msg];
+    while let Some(value) = pending.pop() {
+        match value {
+            Kv::Object(fields) => {
+                if let Some((hash, bytes)) = value.get("image").and_then(|image| embedded_image(image, blobs)) {
+                    found.entry(hash).or_insert(bytes);
+                }
+                pending.extend(fields.iter().filter(|(name, _)| *name != "blobs").map(|(_, field)| field));
+            }
+            Kv::Array(items) => pending.extend(items),
+            _ => {}
+        }
+    }
+    found
+}
+
+/// The hash and bytes of an `Image` value whose `dataBlob` points at a usable blob.
+fn embedded_image<'k>(image: &Kv, blobs: &'k [Kv]) -> Option<(String, &'k [u8])> {
+    let hash = image.get("hash").and_then(Kv::bytes).filter(|h| !h.is_empty() && h.len() <= 64)?;
+    let Some(Kv::Uint(index)) = image.get("dataBlob") else { return None };
+    let bytes = blobs.get(usize::try_from(*index).ok()?)?.get("bytes").and_then(Kv::bytes)?;
+    if bytes.is_empty() || bytes.len() as u64 > MAX_IMAGE {
+        return None;
+    }
+    Some((hash.iter().map(|b| format!("{b:02x}")).collect(), bytes))
+}
+
 /// The parts of a `.fig` archive the import reads.
 struct Archive<'b> {
     canvas: Vec<u8>,
diff --git a/crates/format/src/fig/assets_tests.rs b/crates/format/src/fig/assets_tests.rs
index 4777be18..a271a908 100644
--- a/crates/format/src/fig/assets_tests.rs
+++ b/crates/format/src/fig/assets_tests.rs
@@ -104,7 +104,10 @@ fn themed() -> Document {
     add(&mut doc, frame, NodeKind::Rectangle, "Swatch", (10.0, 10.0), (80.0, 60.0), &|n| {
         let mut g = Gradient::default_for(GradientKind::Linear, Color::BLACK);
         g.stops = vec![ColorStop { position: 0.0, color: Color::BLACK }, ColorStop { position: 1.0, color: Color::WHITE }];
-        n.fills = vec![solid(0.5, 0.5, 0.5), Paint { kind: PaintKind::Gradient(g), opacity: 1.0, visible: true, blend: BlendMode::Normal }];
+        n.fills = vec![
+            solid(0.5, 0.5, 0.5),
+            Paint { kind: PaintKind::Gradient(g), opacity: 1.0, visible: true, blend: BlendMode::Normal, color_alpha: 1.0 },
+        ];
         n.strokes = vec![solid(0.0, 0.0, 0.0), solid(1.0, 0.0, 0.0)];
         n.effects = vec![Effect {
             kind: EffectKind::DropShadow(Shadow {
diff --git a/crates/format/src/fig/auto_layout_sizing_tests.rs b/crates/format/src/fig/auto_layout_sizing_tests.rs
new file mode 100644
index 00000000..29580afb
--- /dev/null
+++ b/crates/format/src/fig/auto_layout_sizing_tests.rs
@@ -0,0 +1,218 @@
+//! How auto layout frames and text size on import (hug or fixed), on encoded `.fig` files built in
+//! code and REST file JSON: the sizing a file records, an auto layout frame that records none, and
+//! text that hugs by its resize mode. Also how distributed main-axis alignment reads.
+
+use figcraft_doc::{Document, MainAlign, Sizing};
+use serde_json::{Value, json};
+
+use super::kiwi::{Kv, Schema};
+
+const SCHEMA: &str = "
+enum NodeType NONE DOCUMENT CANVAS FRAME TEXT SYMBOL INSTANCE
+enum StackMode NONE HORIZONTAL VERTICAL
+enum StackSize FIXED RESIZE_TO_FIT RESIZE_TO_FIT_WITH_IMPLICIT_SIZE
+enum StackJustify MIN CENTER MAX SPACE_EVENLY SPACE_BETWEEN SPACE_AROUND SPACE_EVENLY_CSS
+enum TextAutoResize NONE WIDTH_AND_HEIGHT HEIGHT
+struct GUID uint sessionID, uint localID
+struct Vector float x, float y
+struct Matrix float m00, float m01, float m02, float m10, float m11, float m12
+message ParentIndex GUID guid, string position
+message TextData string characters
+message SymbolData GUID symbolID
+message NodeChange GUID guid, ParentIndex parentIndex, NodeType type, string name, Vector size, Matrix transform, StackMode stackMode, StackSize stackPrimarySizing, StackSize stackCounterSizing, StackJustify stackPrimaryAlignItems, TextAutoResize textAutoResize, float fontSize, TextData textData, SymbolData symbolData
+message Message NodeChange[] nodeChanges
+";
+
+type Fields = Vec<(&'static str, Kv<'static>)>;
+
+fn o(fields: Fields) -> Kv<'static> {
+    Kv::Object(fields)
+}
+
+fn g(id: u64) -> Kv<'static> {
+    o(vec![("sessionID", Kv::Uint(1)), ("localID", Kv::Uint(id))])
+}
+
+fn xy(x: f64, y: f64) -> Kv<'static> {
+    o(vec![("x", Kv::Float(x as f32)), ("y", Kv::Float(y as f32))])
+}
+
+fn at(x: f64, y: f64) -> Kv<'static> {
+    let f = |v: f64| Kv::Float(v as f32);
+    o(vec![("m00", f(1.0)), ("m01", f(0.0)), ("m02", f(x)), ("m10", f(0.0)), ("m11", f(1.0)), ("m12", f(y))])
+}
+
+fn node(id: u64, parent: u64, pos: &str, ty: &'static str, name: &str, mut more: Fields) -> Kv<'static> {
+    let mut v = vec![("guid", g(id)), ("parentIndex", o(vec![("guid", g(parent)), ("position", Kv::Str(pos.into()))]))];
+    v.extend([("type", Kv::Enum(ty)), ("name", Kv::Str(name.into()))]);
+    v.append(&mut more);
+    o(v)
+}
+
+/// An auto layout frame's fields: its direction and the sizing it records (`None`: none).
+fn stack(mode: &'static str, primary: Option<&'static str>, counter: Option<&'static str>) -> Fields {
+    let mut f = vec![("stackMode", Kv::Enum(mode))];
+    f.extend(primary.map(|p| ("stackPrimarySizing", Kv::Enum(p))));
+    f.extend(counter.map(|c| ("stackCounterSizing", Kv::Enum(c))));
+    f
+}
+
+/// A text layer "<name> text" in `parent`, with resize mode `resize` (`None`: none recorded).
+fn label(id: u64, parent: u64, name: &str, resize: Option<&'static str>) -> Kv<'static> {
+    let mut f = vec![("size", xy(40.0, 16.0)), ("transform", at(0.0, 0.0)), ("fontSize", Kv::Float(12.0))];
+    f.push(("textData", o(vec![("characters", Kv::Str(name.into()))])));
+    f.extend(resize.map(|r| ("textAutoResize", Kv::Enum(r))));
+    node(id, parent, "!", "TEXT", &format!("{name} text"), f)
+}
+
+/// A component at `x` holding a text layer, with `fields` of its own.
+fn component(id: u64, x: f64, name: &str, fields: Fields, resize: Option<&'static str>) -> Vec<Kv<'static>> {
+    let mut f = vec![("size", xy(40.0, 16.0)), ("transform", at(x, 0.0))];
+    f.extend(fields);
+    vec![node(id, 1, &format!("{id}"), "SYMBOL", name, f), label(id + 1, id, name, resize)]
+}
+
+fn import(nodes: Vec<Kv<'static>>) -> Document {
+    let mut all = vec![
+        o(vec![
+            ("guid", o(vec![("sessionID", Kv::Uint(0)), ("localID", Kv::Uint(0))])),
+            ("type", Kv::Enum("DOCUMENT")),
+            ("name", Kv::Str("D".into())),
+        ]),
+        o(vec![
+            ("guid", g(1)),
+            ("parentIndex", o(vec![("guid", o(vec![("sessionID", Kv::Uint(0)), ("localID", Kv::Uint(0))])), ("position", Kv::Str("!".into()))])),
+            ("type", Kv::Enum("CANVAS")),
+            ("name", Kv::Str("Page".into())),
+        ]),
+    ];
+    all.extend(nodes);
+    let schema = Schema::parse(SCHEMA).unwrap();
+    let bytes = super::tests::canvas(&schema, &o(vec![("nodeChanges", Kv::Array(all))]));
+    super::import(&bytes, "sizing").unwrap().0
+}
+
+fn sizing(doc: &Document, name: &str) -> (Sizing, Sizing) {
+    let n = doc.nodes().find(|n| n.name == name).unwrap_or_else(|| panic!("no layer {name}"));
+    (n.child_layout.sizing_h, n.child_layout.sizing_v)
+}
+
+#[test]
+fn auto_layout_frames_hug_as_recorded_and_by_default_on_their_primary_axis() {
+    use Sizing::{Fixed, Hug};
+    let fit = Some("RESIZE_TO_FIT");
+    // (component, its auto layout fields, expected (horizontal, vertical), derivation)
+    let rows: Vec<(&str, Fields, (Sizing, Sizing), &str)> = vec![
+        ("Button", stack("HORIZONTAL", fit, fit), (Hug, Hug), "both axes hug, as recorded"),
+        ("Implicit", stack("HORIZONTAL", Some("RESIZE_TO_FIT_WITH_IMPLICIT_SIZE"), fit), (Hug, Hug), "hugging with an implicit size"),
+        ("Fixed", stack("HORIZONTAL", Some("FIXED"), Some("FIXED")), (Fixed, Fixed), "both axes fixed, as recorded"),
+        ("Legacy", stack("HORIZONTAL", None, fit), (Hug, Hug), "no primary sizing: the primary axis sizes by its content"),
+        ("Legacy column", stack("VERTICAL", None, None), (Fixed, Hug), "no sizing: the primary (vertical) axis hugs, the counter axis is fixed"),
+    ];
+    let mut nodes = Vec::new();
+    for (k, (name, fields, _, _)) in rows.iter().enumerate() {
+        nodes.extend(component(10 * (k as u64 + 1), 60.0 * k as f64, name, fields.clone(), Some("WIDTH_AND_HEIGHT")));
+    }
+    let doc = import(nodes);
+    for (name, _, want, why) in rows {
+        assert_eq!(sizing(&doc, name), want, "{name}: {why}");
+    }
+}
+
+#[test]
+fn text_hugs_by_its_resize_mode() {
+    use Sizing::{Fixed, Hug};
+    let fit = Some("RESIZE_TO_FIT");
+    let mut nodes = Vec::new();
+    for (k, (name, resize)) in
+        [("Auto width", Some("WIDTH_AND_HEIGHT")), ("Auto height", Some("HEIGHT")), ("Fixed box", Some("NONE")), ("Unset", None)]
+            .into_iter()
+            .enumerate()
+    {
+        nodes.extend(component(10 * (k as u64 + 1), 60.0 * k as f64, name, stack("HORIZONTAL", fit, fit), resize));
+    }
+    // An instance of the auto width one: it hugs, and so does its copy of the text.
+    nodes.push(node(
+        90,
+        1,
+        "~",
+        "INSTANCE",
+        "Auto width instance",
+        [vec![("size", xy(40.0, 16.0)), ("transform", at(0.0, 100.0)), ("symbolData", o(vec![("symbolID", g(10))]))], stack("HORIZONTAL", fit, fit)]
+            .concat(),
+    ));
+    // One that records nothing of its auto layout: it has its main's.
+    nodes.push(node(
+        91,
+        1,
+        "~~",
+        "INSTANCE",
+        "Bare instance",
+        vec![("size", xy(40.0, 16.0)), ("transform", at(0.0, 150.0)), ("symbolData", o(vec![("symbolID", g(10))]))],
+    ));
+    let doc = import(nodes);
+    for (name, want) in
+        [("Auto width text", (Hug, Hug)), ("Auto height text", (Fixed, Hug)), ("Fixed box text", (Fixed, Fixed)), ("Unset text", (Fixed, Fixed))]
+    {
+        assert_eq!(sizing(&doc, name), want, "{name}");
+    }
+    let inst = doc.nodes().find(|n| n.name == "Auto width instance").unwrap();
+    assert_eq!((inst.child_layout.sizing_h, inst.child_layout.sizing_v), (Hug, Hug));
+    let copy = inst.children.first().and_then(|c| doc.node(*c)).unwrap();
+    assert_eq!((copy.child_layout.sizing_h, copy.child_layout.sizing_v), (Hug, Hug));
+    let bare = doc.nodes().find(|n| n.name == "Bare instance").unwrap();
+    assert_eq!(bare.layout.as_ref().map(|l| l.mode), Some(figcraft_doc::LayoutMode::Horizontal));
+    assert_eq!((bare.child_layout.sizing_h, bare.child_layout.sizing_v), (Hug, Hug));
+}
+
+#[test]
+fn rest_files_read_left_out_sizing_modes_as_hug_and_text_by_its_resize_mode() {
+    use Sizing::{Fixed, Hug};
+    let at = json!([[1, 0, 0], [0, 1, 0]]);
+    let text = |id: &str, name: &str, more: Value| {
+        let mut t = json!({"id": id, "name": name, "type": "TEXT", "relativeTransform": at, "size": {"x": 40, "y": 16}, "characters": name,
+            "style": {"fontFamily": "Inter", "fontSize": 12, "textAutoResize": "WIDTH_AND_HEIGHT"}});
+        t.as_object_mut().unwrap().extend(more.as_object().unwrap().clone());
+        t
+    };
+    let frame = |id: &str, name: &str, more: Value, kids: Value| {
+        let mut f = json!({"id": id, "name": name, "type": "COMPONENT", "relativeTransform": at, "size": {"x": 40, "y": 16},
+            "layoutMode": "HORIZONTAL", "children": kids});
+        f.as_object_mut().unwrap().extend(more.as_object().unwrap().clone());
+        f
+    };
+    let file = json!({"name": "Sizing", "document": {"id": "0:0", "type": "DOCUMENT", "children": [{"id": "0:1", "name": "Page", "type": "CANVAS", "children": [
+        frame("1:1", "Defaults", json!({}), json!([text("1:2", "Label", json!({}))])),
+        frame("2:1", "Fixed", json!({"primaryAxisSizingMode": "FIXED", "counterAxisSizingMode": "FIXED"}),
+            json!([text("2:2", "Fixed label", json!({"layoutSizingHorizontal": "FIXED"}))])),
+    ]}]}});
+    let (doc, _) = crate::rest::import(&file, &crate::rest::no_images).unwrap();
+    // The REST API leaves out the default sizing modes (AUTO); explicit per-axis sizing wins.
+    for (name, want) in [("Defaults", (Hug, Hug)), ("Label", (Hug, Hug)), ("Fixed", (Fixed, Fixed)), ("Fixed label", (Fixed, Hug))] {
+        assert_eq!(sizing(&doc, name), want, "{name}");
+    }
+}
+
+#[test]
+fn distributed_alignment_reads_the_older_evenly_name_as_space_between() {
+    let rows = [
+        ("Between", "SPACE_BETWEEN", MainAlign::SpaceBetween),
+        ("Older evenly", "SPACE_EVENLY", MainAlign::SpaceBetween),
+        ("Around", "SPACE_AROUND", MainAlign::SpaceAround),
+        ("Evenly", "SPACE_EVENLY_CSS", MainAlign::SpaceEvenly),
+    ];
+    let nodes = rows
+        .iter()
+        .enumerate()
+        .flat_map(|(i, (name, align, _))| {
+            let mut fields = stack("HORIZONTAL", None, None);
+            fields.push(("stackPrimaryAlignItems", Kv::Enum(align)));
+            component(10 + 2 * i as u64, 50.0 * i as f64, name, fields, None)
+        })
+        .collect();
+    let doc = import(nodes);
+    for (name, _, want) in rows {
+        let n = doc.nodes().find(|n| n.name == name).unwrap_or_else(|| panic!("no layer {name}"));
+        assert_eq!(n.layout.as_ref().map(|l| l.main_align), Some(want), "{name}");
+    }
+}
diff --git a/crates/format/src/fig/connector_label_tests.rs b/crates/format/src/fig/connector_label_tests.rs
new file mode 100644
index 00000000..de0c4f2f
--- /dev/null
+++ b/crates/format/src/fig/connector_label_tests.rs
@@ -0,0 +1,243 @@
+use super::{kiwi::Kv, map};
+
+fn obj(fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    Kv::Object(fields)
+}
+
+fn scalar(value: f32) -> Kv<'static> {
+    Kv::Float(value)
+}
+
+fn guid(local_id: u64) -> Kv<'static> {
+    obj(vec![("sessionID", Kv::Uint(40_000_000)), ("localID", Kv::Uint(local_id))])
+}
+
+fn record(local_id: u64, children: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    let mut fields = vec![("guidPath", obj(vec![("guids", Kv::Array(vec![guid(local_id)]))]))];
+    fields.extend(children);
+    obj(fields)
+}
+
+fn transform(x: f32, y: f32) -> Kv<'static> {
+    obj(vec![("m00", scalar(1.0)), ("m01", scalar(0.0)), ("m02", scalar(x)), ("m10", scalar(0.0)), ("m11", scalar(1.0)), ("m12", scalar(y))])
+}
+
+fn point(x: f32, y: f32) -> Kv<'static> {
+    obj(vec![("x", scalar(x)), ("y", scalar(y))])
+}
+
+fn path_blob() -> Vec<u8> {
+    let mut bytes = vec![1]; // MoveTo
+    bytes.extend(0.0f32.to_le_bytes());
+    bytes.extend(0.0f32.to_le_bytes());
+    bytes.push(2); // LineTo
+    bytes.extend(20.0f32.to_le_bytes());
+    bytes.extend(10.0f32.to_le_bytes());
+    bytes
+}
+
+fn paint() -> Kv<'static> {
+    obj(vec![
+        ("type", Kv::Enum("SOLID")),
+        ("color", obj(vec![("r", scalar(0.1)), ("g", scalar(0.2)), ("b", scalar(0.8)), ("a", scalar(1.0))])),
+        ("visible", Kv::Bool(true)),
+    ])
+}
+
+fn synthetic_connector(version: f32, include_text: bool, text_x: f32) -> Kv<'static> {
+    let line_geometry = Kv::Array(vec![obj(vec![("commandsBlob", Kv::Uint(0))])]);
+    let line = record(0, vec![("transform", transform(7.0, 9.0)), ("size", point(20.0, 10.0)), ("fillGeometry", line_geometry)]);
+    let text = record(1, vec![("transform", transform(text_x, 3.0)), ("size", point(80.0, 24.0))]);
+    let background = record(2, vec![("transform", transform(100.0, 30.0)), ("size", point(90.0, 30.0))]);
+    let mut derived = vec![line];
+    if include_text {
+        derived.extend([text, background]);
+    }
+    let line_style = record(0, vec![("strokePaints", Kv::Array(vec![paint()]))]);
+    let text_style = record(
+        1,
+        vec![
+            ("textData", obj(vec![("characters", Kv::Str("synthetic label".into()))])),
+            ("fontSize", scalar(24.0)),
+            ("fontName", obj(vec![("family", Kv::Str("Inter".into())), ("style", Kv::Str("Regular".into()))])),
+            ("fillPaints", Kv::Array(vec![paint()])),
+            ("visible", Kv::Bool(false)),
+        ],
+    );
+    let bg_style = record(2, vec![("fillPaints", Kv::Array(vec![])), ("visible", Kv::Bool(false))]);
+    let mut styles = vec![line_style];
+    if include_text {
+        styles.extend([text_style, bg_style]);
+    }
+    obj(vec![
+        (
+            "nodeChanges",
+            Kv::Array(vec![
+                obj(vec![("guid", guid(0)), ("type", Kv::Enum("DOCUMENT")), ("name", Kv::Str("Doc".into()))]),
+                obj(vec![
+                    ("guid", guid(1)),
+                    ("parentIndex", obj(vec![("guid", guid(0)), ("position", Kv::Str("!".into()))])),
+                    ("type", Kv::Enum("CANVAS")),
+                    ("name", Kv::Str("Page".into())),
+                ]),
+                obj(vec![
+                    ("guid", obj(vec![("sessionID", Kv::Uint(1)), ("localID", Kv::Uint(123))])),
+                    ("parentIndex", obj(vec![("guid", guid(1)), ("position", Kv::Str("!".into()))])),
+                    ("type", Kv::Enum("CONNECTOR")),
+                    ("name", Kv::Str("synthetic connector".into())),
+                    ("size", point(140.0, 50.0)),
+                    ("opacity", scalar(0.5)),
+                    ("connectorType", Kv::Enum("MANUAL")),
+                    ("connectorVersion", scalar(version)),
+                    ("connectorLineStyle", Kv::Enum("STRAIGHT")),
+                    ("connectorStartCap", Kv::Enum("NONE")),
+                    ("connectorEndCap", Kv::Enum("ARROW")),
+                    ("derivedImmutableFrameData", obj(vec![("version", scalar(1.0)), ("overrides", Kv::Array(derived))])),
+                    ("nodeGenerationData", obj(vec![("overrides", Kv::Array(styles))])),
+                ]),
+            ]),
+        ),
+        ("blobs", Kv::Array(vec![obj(vec![("bytes", Kv::Bytes(path_blob()))])])),
+    ])
+}
+
+fn map_synthetic(version: f32, include_text: bool, text_x: f32) -> (serde_json::Value, Vec<String>) {
+    let (rest, warnings, _) = map::to_rest(&synthetic_connector(version, include_text, text_x), "synthetic", crate::rest::MAX_NODES);
+    (rest, warnings)
+}
+
+fn find_node<'a>(doc: &'a figcraft_doc::Document, name: &str) -> &'a figcraft_doc::Node {
+    doc.nodes().find(|node| node.name == name).expect("native node")
+}
+
+#[test]
+fn synthetic_label_style_transform_and_container_opacity_survive_native_roundtrip() {
+    let (rest, warnings) = map_synthetic(1.0, true, 8.5);
+    let connector = &rest["document"]["children"][0]["children"][0];
+    assert_eq!(connector["type"], "FRAME");
+    assert_eq!(connector["opacity"], 0.5);
+    assert_eq!(connector["children"].as_array().unwrap().len(), 2, "empty/hidden background is omitted; hidden text remains explicit");
+    let text = &connector["children"][1];
+    assert_eq!(text["type"], "TEXT");
+    assert_eq!(text["visible"], false);
+    assert_eq!(text["fills"].as_array().unwrap().len(), 1);
+    assert!((text["fills"][0]["color"]["b"].as_f64().unwrap() - 0.8).abs() < 1e-6);
+    assert_eq!(text["style"]["fontSize"], 24.0);
+    assert_eq!(text["relativeTransform"], serde_json::json!([[1.0, 0.0, 108.5], [0.0, 1.0, 33.0]]));
+    assert!(warnings.iter().any(|warning| warning.contains("live endpoint bindings are not retained")));
+
+    let (native, _) = crate::rest::import_fig(&rest, &|_| None).unwrap();
+    let bytes = crate::save_bytes(&native, None).unwrap();
+    let (reopened, _) = crate::load_bytes(&bytes).unwrap();
+    let frame = find_node(&reopened, "synthetic connector");
+    assert_eq!(frame.opacity, 0.5);
+    let text = find_node(&reopened, "synthetic label");
+    assert!(!text.visible);
+    assert_eq!(text.opacity, 1.0, "root opacity must not be copied to child");
+    assert_eq!(text.transform.as_coeffs()[4..], [108.5, 33.0]);
+    assert_eq!(text.fills.len(), 1);
+    let figcraft_doc::NodeKind::Text(data) = &text.kind else { panic!("text child kind") };
+    assert_eq!(data.style.font_size, 24.0);
+}
+
+#[test]
+fn synthetic_connector_missing_optional_derived_label_keeps_vector() {
+    let (rest, warnings) = map_synthetic(1.0, false, 0.0);
+    let connector = &rest["document"]["children"][0]["children"][0];
+    assert_eq!(connector["type"], "VECTOR", "an unlabelled connector keeps the single-vector shape");
+    assert!(connector.get("children").is_none());
+    assert!(warnings.iter().all(|warning| !warning.contains("connector labels were skipped")));
+}
+
+#[test]
+fn synthetic_unlabelled_connector_imports_as_one_vector_with_line_style() {
+    let (rest, warnings) = map_synthetic(1.0, false, 0.0);
+    let connector = &rest["document"]["children"][0]["children"][0];
+    assert_eq!(connector["type"], "VECTOR");
+    assert_eq!(connector["name"], "synthetic connector");
+    assert_eq!(connector["opacity"], 0.5);
+    assert_eq!(connector["strokes"].as_array().map(Vec::len), Some(1));
+    assert_eq!(connector["strokeCapEnd"], "ARROW");
+    assert!(warnings.iter().all(|warning| !warning.contains("connector label")), "{warnings:?}");
+
+    let (native, _) = crate::rest::import_fig(&rest, &|_| None).unwrap();
+    let node = find_node(&native, "synthetic connector");
+    assert!(matches!(node.kind, figcraft_doc::NodeKind::Vector { .. }));
+}
+
+#[test]
+fn synthetic_connector_unsupported_version_uses_legacy_warning() {
+    let (rest, warnings) = map_synthetic(2.0, true, 8.5);
+    let connector = &rest["document"]["children"][0]["children"][0];
+    assert_eq!(connector["type"], "VECTOR");
+    assert!(warnings.iter().any(|warning| warning == "connector labels were skipped"));
+}
+
+#[test]
+fn synthetic_connector_malformed_label_bounds_or_transform_keep_vector() {
+    let mut malformed_bounds = synthetic_connector(1.0, true, 8.5);
+    set_override_field(&mut malformed_bounds, "derivedImmutableFrameData", 1, "size", point(f32::NAN, 24.0));
+    let (rest, warnings, _) = map::to_rest(&malformed_bounds, "synthetic", crate::rest::MAX_NODES);
+    let connector = &rest["document"]["children"][0]["children"][0];
+    assert_eq!(connector["children"].as_array().unwrap().len(), 1);
+    assert_eq!(connector["children"][0]["type"], "VECTOR");
+    assert!(warnings.iter().any(|warning| warning == "connector label was skipped: text bounds are invalid"));
+
+    let mut malformed_transform = synthetic_connector(1.0, true, 8.5);
+    set_override_field(&mut malformed_transform, "derivedImmutableFrameData", 1, "transform", transform(f32::NAN, 3.0));
+    let (rest, warnings, _) = map::to_rest(&malformed_transform, "synthetic", crate::rest::MAX_NODES);
+    let connector = &rest["document"]["children"][0]["children"][0];
+    assert_eq!(connector["children"].as_array().unwrap().len(), 1);
+    assert_eq!(connector["children"][0]["type"], "VECTOR");
+    assert!(warnings.iter().any(|warning| warning == "connector label was skipped: text transform is invalid"));
+}
+
+#[test]
+fn synthetic_connector_authored_hidden_background_is_retained() {
+    let mut message = synthetic_connector(1.0, true, 8.5);
+    set_override_field(&mut message, "nodeGenerationData", 2, "fillPaints", Kv::Array(vec![paint()]));
+    let (rest, _, _) = map::to_rest(&message, "synthetic", crate::rest::MAX_NODES);
+    let connector = &rest["document"]["children"][0]["children"][0];
+    let background = connector["children"].as_array().unwrap().iter().find(|child| child["type"] == "RECTANGLE").expect("authored background");
+    assert_eq!(background["visible"], false);
+    assert_eq!(background["fills"].as_array().unwrap().len(), 1);
+}
+
+fn field_mut<'a, 's>(value: &'a mut Kv<'s>, key: &str) -> Option<&'a mut Kv<'s>> {
+    let Kv::Object(fields) = value else { return None };
+    fields.iter_mut().find(|(name, _)| *name == key).map(|(_, value)| value)
+}
+
+fn connector_mut<'a, 's>(message: &'a mut Kv<'s>, local_id: u64) -> Option<&'a mut Kv<'s>> {
+    let Kv::Object(fields) = message else { return None };
+    let node_changes = fields.iter_mut().find(|(name, _)| *name == "nodeChanges").map(|(_, value)| value)?;
+    let Kv::Array(nodes) = node_changes else { return None };
+    nodes.iter_mut().find(|node| {
+        node.get("type").and_then(Kv::str) == Some("CONNECTOR")
+            && node.get("guid").and_then(|guid| guid.get("localID")).and_then(Kv::f64) == Some(local_id as f64)
+    })
+}
+
+fn set_override_field(message: &mut Kv<'_>, field: &str, local_id: u64, key: &'static str, value: Kv<'static>) {
+    let connector = connector_mut(message, 123).expect("synthetic connector");
+    let section = field_mut(connector, field).expect("connector override section");
+    let overrides = field_mut(section, "overrides").expect("override list");
+    let Kv::Array(rows) = overrides else { panic!("override list array") };
+    let row = rows
+        .iter_mut()
+        .find(|row| {
+            row.get("guidPath")
+                .and_then(|path| path.get("guids"))
+                .and_then(|ids| ids.list().first())
+                .and_then(|id| id.get("localID"))
+                .and_then(Kv::f64)
+                == Some(local_id as f64)
+        })
+        .expect("override row");
+    let Kv::Object(fields) = row else { panic!("override row object") };
+    if let Some((_, current)) = fields.iter_mut().find(|(name, _)| *name == key) {
+        *current = value;
+    } else {
+        fields.push((key, value));
+    }
+}
diff --git a/crates/format/src/fig/export.rs b/crates/format/src/fig/export.rs
index bfd0b615..b475a9cb 100644
--- a/crates/format/src/fig/export.rs
+++ b/crates/format/src/fig/export.rs
@@ -25,17 +25,26 @@ use figcraft_doc::proto::{
     Action, Direction, Easing, GAMEPAD_BUTTONS, Interaction, KeyMods, Overflow, OverlayPosition, ScrollPosition, Transition, Trigger,
 };
 use figcraft_doc::{
-    AutoLayout, BoolOp, ContentAlign, CrossAlign, Document, EffectKind, ExportSize, GridAlign, GridKind, HConstraint, LayoutMode, LetterSpacing,
-    LineHeight, ListStyle, MainAlign, MaskType, Node, NodeId, NodeKind, NoiseMode, PropDef, Sizing, StrokeAlign, StrokeCap, StrokeJoin, StyleKind,
-    TextAlignH, TextAlignV, TextAutoResize, TextCase, TextData, TextDecoration, TextStyle, VConstraint, VariableType, VariableValue, VectorNetwork,
-    WindingRule,
+    AutoLayout, BoolOp, ContentAlign, CrossAlign, Document, EffectKind, ExportSize, GridAlign, GridKind, GridTrack, HConstraint, LayoutMode,
+    LetterSpacing, LineHeight, ListStyle, MainAlign, MaskType, Node, NodeId, NodeKind, NoiseMode, PropDef, Sizing, StrokeAlign, StrokeCap,
+    StrokeJoin, StyleKind, TextAlignH, TextAlignV, TextAutoResize, TextCase, TextData, TextDecoration, TextStyle, VConstraint, VariableType,
+    VariableValue, VectorNetwork, WindingRule,
 };
 use serde_json::Value;
+use sha1::Digest;
 
 use super::kiwi::{Kv, Schema, encode};
 use super::network;
 use crate::FormatError;
 
+mod assets;
+mod common;
+mod component;
+mod layer;
+mod paint;
+mod prototype;
+mod shape;
+
 /// Most layers written, and deepest nesting followed (the import's limits).
 const MAX_NODES: usize = crate::rest::MAX_NODES;
 const MAX_DEPTH: usize = 256;
@@ -73,7 +82,7 @@ enum StrokeJoin MITER=0 BEVEL=1 ROUND=2
 enum ConstraintType MIN=0 CENTER=1 MAX=2 STRETCH=3 SCALE=4
 enum StackMode NONE=0 HORIZONTAL=1 VERTICAL=2 GRID=3
 enum StackAlign MIN=0 CENTER=1 MAX=2 BASELINE=3
-enum StackJustify MIN=0 CENTER=1 MAX=2 SPACE_EVENLY=3 SPACE_BETWEEN=4 SPACE_AROUND=5
+enum StackJustify MIN=0 CENTER=1 MAX=2 SPACE_EVENLY=3 SPACE_BETWEEN=4 SPACE_AROUND=5 SPACE_EVENLY_CSS=6
 enum StackCounterAlign MIN=0 CENTER=1 MAX=2 STRETCH=3 AUTO=4 BASELINE=5
 enum StackSize FIXED=0 RESIZE_TO_FIT=1
 enum StackWrap NO_WRAP=0 WRAP=1
@@ -104,7 +113,7 @@ enum ImageType PNG=0 JPEG=1 SVG=2 PDF=3
 enum ExportConstraintType CONTENT_SCALE=0 CONTENT_WIDTH=1 CONTENT_HEIGHT=2
 enum ComponentPropType BOOL=0 TEXT=1 INSTANCE_SWAP=3 VARIANT=4
 enum VariableField MISSING=0 CORNER_RADIUS=1 PARAGRAPH_SPACING=2 PARAGRAPH_INDENT=3 STROKE_WEIGHT=4 STACK_SPACING=5 STACK_PADDING_LEFT=6 STACK_PADDING_TOP=7 STACK_PADDING_RIGHT=8 STACK_PADDING_BOTTOM=9 VISIBLE=10 TEXT_DATA=11 WIDTH=12 HEIGHT=13 RECTANGLE_TOP_LEFT_CORNER_RADIUS=14 RECTANGLE_TOP_RIGHT_CORNER_RADIUS=15 RECTANGLE_BOTTOM_LEFT_CORNER_RADIUS=16 RECTANGLE_BOTTOM_RIGHT_CORNER_RADIUS=17 BORDER_TOP_WEIGHT=18 BORDER_BOTTOM_WEIGHT=19 BORDER_LEFT_WEIGHT=20 BORDER_RIGHT_WEIGHT=21 STACK_COUNTER_SPACING=23 MIN_WIDTH=24 MAX_WIDTH=25 MIN_HEIGHT=26 MAX_HEIGHT=27 FONT_FAMILY=28 FONT_STYLE=29 OPACITY=31 FONT_SIZE=32 LETTER_SPACING=34 LINE_HEIGHT=36 OVERRIDDEN_SYMBOL_ID=37
-enum VariableDataType BOOLEAN=0 FLOAT=1 STRING=2 ALIAS=3 COLOR=4 PROP_REF=13
+enum VariableDataType BOOLEAN=0 FLOAT=1 STRING=2 ALIAS=3 COLOR=4 SYMBOL_ID=7 TEXT_DATA=9 PROP_REF=13
 enum VariableScope ALL_SCOPES=0 TEXT_CONTENT=1 CORNER_RADIUS=2 WIDTH_HEIGHT=3 GAP=4 ALL_FILLS=5 FRAME_FILL=6 SHAPE_FILL=7 TEXT_FILL=8 STROKE=9 STROKE_FLOAT=10 EFFECT_FLOAT=11 EFFECT_COLOR=12 OPACITY=13 FONT_STYLE=14 FONT_FAMILY=15 FONT_SIZE=16 LINE_HEIGHT=17 LETTER_SPACING=18 PARAGRAPH_SPACING=19 PARAGRAPH_INDENT=20
 enum StyleType NONE=0 FILL=1 STROKE=2 TEXT=3 EFFECT=4 EXPORT=5 GRID=6
 enum InteractionType ON_CLICK=0 DRAG=9 ON_HOVER=4 ON_PRESS=7 MOUSE_IN=2 MOUSE_OUT=3 MOUSE_DOWN=5 MOUSE_UP=6 AFTER_TIMEOUT=1 ON_KEY_DOWN=10
@@ -148,10 +157,16 @@ message ExportSettings string suffix=1, ImageType imageType=2, ExportConstraint
 message GUIDPath GUID[] guids=1
 message SymbolData GUID symbolID=1, NodeChange[] symbolOverrides=2, float uniformScaleFactor=3
 message ComponentPropValue bool boolValue=1, TextData textValue=2, GUID guidValue=3
-message ComponentPropDef GUID id=1, string name=2, ComponentPropValue initialValue=3, ComponentPropType type=6
-message ComponentPropAssignment GUID defID=1, ComponentPropValue value=2
+message ComponentPropPreferredValues string[] stringValues=1
+message ComponentPropDef GUID id=1, string name=2, ComponentPropValue initialValue=3, string sortPosition=4, GUID parentPropDefId=5, ComponentPropType type=6, ComponentPropPreferredValues preferredValues=8, VariableData varValue=9
+message ComponentPropAssignment GUID defID=1, ComponentPropValue value=2, VariableData varValue=3
+enum ComponentPropNodeField VISIBLE=0 TEXT_DATA=1 OVERRIDDEN_SYMBOL_ID=2
+message ComponentPropRef GUID defID=2, ComponentPropNodeField componentPropNodeField=4
+message VariantPropSpec GUID propDefId=1, string value=2
+message StateGroupPropertyValueOrder string property=1, string[] values=2
 message PropRefValue GUID defId=1
-message VariableAnyValue bool boolValue=1, string textValue=2, float floatValue=3, VariableID alias=4, Color colorValue=5, PropRefValue propRefValue=13
+message SymbolId GUID guid=1
+message VariableAnyValue bool boolValue=1, string textValue=2, float floatValue=3, VariableID alias=4, Color colorValue=5, SymbolId symbolIdValue=8, TextData textDataValue=10, PropRefValue propRefValue=13
 message VariableData VariableAnyValue value=1, VariableDataType dataType=2, VariableResolvedDataType resolvedDataType=3
 message VariableDataMapEntry uint nodeField=1, VariableData variableData=2, VariableField variableField=3
 message VariableDataMap VariableDataMapEntry[] entries=1
@@ -168,7 +183,12 @@ message PrototypeStartingPoint string name=1, string position=3
 message OverlayBackgroundAppearance OverlayBackgroundType backgroundType=1, Color backgroundColor=2
 message GUIDPositionMapEntry GUID id=1, string position=2
 message GUIDPositionMap GUIDPositionMapEntry[] entries=1
-message NodeChange GUID guid=1, NodePhase phase=2, ParentIndex parentIndex=3, NodeType type=4, string name=5, bool visible=6, bool locked=7, float opacity=8, BlendMode blendMode=9, Vector size=11, Matrix transform=12, bool mask=16, MaskType maskType=317, float backgroundOpacity=19, bool backgroundEnabled=15, bool internalOnly=142, string description=318, StyleType styleType=163, string sortPosition=320, StyleId styleIdForFill=332, StyleId styleIdForStrokeFill=333, StyleId styleIdForText=334, StyleId styleIdForEffect=335, StyleId styleIdForGrid=336, VariableDataMap variableConsumptionMap=307, VariableModeBySetMap variableModeBySetMap=316, VariableSetMode[] variableSetModes=312, VariableSetID variableSetID=313, VariableResolvedDataType variableResolvedType=314, VariableDataValues variableDataValues=315, VariableScope[] variableScopes=353, DocumentColorProfile documentColorProfile=349, Paint[] fillPaints=38, Paint[] strokePaints=39, float strokeWeight=26, StrokeAlign strokeAlign=29, StrokeJoin strokeJoin=31, StrokeCap strokeCap=30, float[] dashPattern=13, float miterLimit=25, bool borderStrokeWeightsIndependent=299, float borderTopWeight=295, float borderRightWeight=298, float borderBottomWeight=296, float borderLeftWeight=297, Effect[] effects=43, float cornerRadius=20, float cornerSmoothing=160, bool rectangleCornerRadiiIndependent=149, float rectangleTopLeftCornerRadius=145, float rectangleTopRightCornerRadius=146, float rectangleBottomRightCornerRadius=148, float rectangleBottomLeftCornerRadius=147, ConstraintType horizontalConstraint=28, ConstraintType verticalConstraint=37, bool frameMaskDisabled=115, bool resizeToFit=117, bool isStateGroup=225, bool sectionContentsHidden=283, Color backgroundColor=50, StackMode stackMode=105, float stackSpacing=107, float stackCounterSpacing=324, StackWrap stackWrap=323, StackCounterAlignContent stackCounterAlignContent=343, float stackHorizontalPadding=209, float stackVerticalPadding=210, float stackPaddingRight=233, float stackPaddingBottom=234, StackJustify stackPrimaryAlignItems=230, StackAlign stackCounterAlignItems=231, StackSize stackPrimarySizing=229, StackSize stackCounterSizing=221, bool bordersTakeSpace=294, bool stackReverseZIndex=271, float gridColumnGap=438, float gridRowGap=437, GUIDPositionMap gridColumns=436, GUIDPositionMap gridRows=435, float stackChildPrimaryGrow=232, StackCounterAlign stackChildAlignSelf=236, StackPositioning stackPositioning=269, OptionalVector minSize=325, OptionalVector maxSize=326, GUID gridColumnAnchor=440, GUID gridRowAnchor=439, uint gridColumnSpan=442, uint gridRowSpan=441, LayoutGrid[] layoutGrids=47, ExportSettings[] exportSettings=45, TextData textData=42, FontName fontName=41, float fontSize=21, Number lineHeight=40, Number letterSpacing=165, TextCase textCase=34, TextDecoration textDecoration=35, TextAlignHorizontal textAlignHorizontal=32, TextAlignVertical textAlignVertical=33, TextAutoResize textAutoResize=46, TextTruncation textTruncation=280, int maxLines=351, float paragraphSpacing=23, float paragraphIndent=22, Hyperlink hyperlink=223, bool autoRename=14, bool fontVariantCommonLigatures=127, bool fontVariantContextualLigatures=128, string fontVersion=202, uint textUserLayoutVersion=203, uint textExplicitLayoutVersion=396, uint textBidiVersion=279, float textTracking=27, bool textDecorationSkipInk=412, EmojiImageSet emojiImageSet=391, uint styleID=49, Path[] fillGeometry=51, Path[] strokeGeometry=52, VectorData vectorData=48, VectorMirror handleMirroring=44, uint count=10, float starInnerScale=24, ArcData arcData=195, BooleanOperation booleanOperation=36, string symbolDescription=144, VariableWidthPoint[] variableWidthPoints=447, PluginData[] pluginData=204, SymbolData symbolData=113, NodeChange[] derivedSymbolData=125, GUID overriddenSymbolID=143, ComponentPropDef[] componentPropDefs=266, ComponentPropAssignment[] componentPropAssignments=268, VariableDataMap parameterConsumptionMap=445, GUIDPath guidPath=111, PrototypeInteraction[] prototypeInteractions=226, PrototypeStartingPoint prototypeStartingPoint=249, ScrollDirection scrollDirection=159, ScrollBehavior scrollBehavior=186, OverlayPositionType overlayPositionType=198, OverlayBackgroundInteraction overlayBackgroundInteraction=200, OverlayBackgroundAppearance overlayBackgroundAppearance=201
+enum GridTrackSizingType FLEX=0 FIXED=1 HUG=2 UNKNOWN=3
+message GridTrackSizingFunction GridTrackSizingType type=1, float value=2
+message GridTrackSize GridTrackSizingFunction minSizing=1, GridTrackSizingFunction maxSizing=2
+message GUIDGridTrackSizeMapEntry GUID id=1, GridTrackSize trackSize=2
+message GUIDGridTrackSizeMap GUIDGridTrackSizeMapEntry[] entries=1
+message NodeChange GUID guid=1, NodePhase phase=2, ParentIndex parentIndex=3, NodeType type=4, string name=5, bool visible=6, bool locked=7, float opacity=8, BlendMode blendMode=9, Vector size=11, Matrix transform=12, bool mask=16, MaskType maskType=317, float backgroundOpacity=19, bool backgroundEnabled=15, bool internalOnly=142, string description=318, StyleType styleType=163, string sortPosition=320, StyleId styleIdForFill=332, StyleId styleIdForStrokeFill=333, StyleId styleIdForText=334, StyleId styleIdForEffect=335, StyleId styleIdForGrid=336, VariableDataMap variableConsumptionMap=307, VariableModeBySetMap variableModeBySetMap=316, VariableSetMode[] variableSetModes=312, VariableSetID variableSetID=313, VariableResolvedDataType variableResolvedType=314, VariableDataValues variableDataValues=315, VariableScope[] variableScopes=353, DocumentColorProfile documentColorProfile=349, Paint[] fillPaints=38, Paint[] strokePaints=39, float strokeWeight=26, StrokeAlign strokeAlign=29, StrokeJoin strokeJoin=31, StrokeCap strokeCap=30, float[] dashPattern=13, float miterLimit=25, bool borderStrokeWeightsIndependent=299, float borderTopWeight=295, float borderRightWeight=298, float borderBottomWeight=296, float borderLeftWeight=297, Effect[] effects=43, float cornerRadius=20, float cornerSmoothing=160, bool rectangleCornerRadiiIndependent=149, float rectangleTopLeftCornerRadius=145, float rectangleTopRightCornerRadius=146, float rectangleBottomRightCornerRadius=148, float rectangleBottomLeftCornerRadius=147, ConstraintType horizontalConstraint=28, ConstraintType verticalConstraint=37, bool frameMaskDisabled=115, bool resizeToFit=117, bool isStateGroup=225, StateGroupPropertyValueOrder[] stateGroupPropertyValueOrders=238, bool sectionContentsHidden=283, Color backgroundColor=50, StackMode stackMode=105, float stackSpacing=107, float stackCounterSpacing=324, StackWrap stackWrap=323, StackCounterAlignContent stackCounterAlignContent=343, float stackHorizontalPadding=209, float stackVerticalPadding=210, float stackPaddingRight=233, float stackPaddingBottom=234, StackJustify stackPrimaryAlignItems=230, StackAlign stackCounterAlignItems=231, StackSize stackPrimarySizing=229, StackSize stackCounterSizing=221, bool bordersTakeSpace=294, bool stackReverseZIndex=271, float gridColumnGap=438, float gridRowGap=437, GUIDPositionMap gridColumns=436, GUIDPositionMap gridRows=435, GUIDGridTrackSizeMap gridColumnsSizing=474, GUIDGridTrackSizeMap gridRowsSizing=475, float stackChildPrimaryGrow=232, StackCounterAlign stackChildAlignSelf=236, StackPositioning stackPositioning=269, OptionalVector minSize=325, OptionalVector maxSize=326, GUID gridColumnAnchor=440, GUID gridRowAnchor=439, uint gridColumnSpan=442, uint gridRowSpan=441, LayoutGrid[] layoutGrids=47, ExportSettings[] exportSettings=45, TextData textData=42, FontName fontName=41, float fontSize=21, Number lineHeight=40, Number letterSpacing=165, TextCase textCase=34, TextDecoration textDecoration=35, TextAlignHorizontal textAlignHorizontal=32, TextAlignVertical textAlignVertical=33, TextAutoResize textAutoResize=46, TextTruncation textTruncation=280, int maxLines=351, float paragraphSpacing=23, float paragraphIndent=22, Hyperlink hyperlink=223, bool autoRename=14, bool fontVariantCommonLigatures=127, bool fontVariantContextualLigatures=128, string fontVersion=202, uint textUserLayoutVersion=203, uint textExplicitLayoutVersion=396, uint textBidiVersion=279, float textTracking=27, bool textDecorationSkipInk=412, EmojiImageSet emojiImageSet=391, uint styleID=49, Path[] fillGeometry=51, Path[] strokeGeometry=52, VectorData vectorData=48, VectorMirror handleMirroring=44, uint count=10, float starInnerScale=24, ArcData arcData=195, BooleanOperation booleanOperation=36, string symbolDescription=144, VariableWidthPoint[] variableWidthPoints=447, PluginData[] pluginData=204, SymbolData symbolData=113, NodeChange[] derivedSymbolData=125, GUID overriddenSymbolID=143, ComponentPropDef[] componentPropDefs=266, ComponentPropRef[] componentPropRefs=267, ComponentPropAssignment[] componentPropAssignments=268, VariantPropSpec[] variantPropSpecs=483, VariableDataMap parameterConsumptionMap=445, GUIDPath guidPath=111, PrototypeInteraction[] prototypeInteractions=226, PrototypeStartingPoint prototypeStartingPoint=249, ScrollDirection scrollDirection=159, ScrollBehavior scrollBehavior=186, OverlayPositionType overlayPositionType=198, OverlayBackgroundInteraction overlayBackgroundInteraction=200, OverlayBackgroundAppearance overlayBackgroundAppearance=201
 struct Blob byte[] bytes
 message Message MessageType type=1, uint sessionID=2, NodeChange[] nodeChanges=4, Blob[] blobs=6
 ";
@@ -277,6 +297,37 @@ fn s(x: &str) -> Kv<'static> {
 fn b(x: bool) -> Kv<'static> {
     Kv::Bool(x)
 }
+
+/// A track's size as the format's enum name and value, when both sizing functions agree (the
+/// importer keeps only those). `None`: the format has no name for it, so an equal track stands in.
+fn grid_track_size(track: &GridTrack) -> Option<(&'static str, f64)> {
+    let value = track.value;
+    let fits = value.is_finite() && (0.0..=crate::fig::map::MAX_GRID_TRACK_VALUE).contains(&value);
+    match track.sizing {
+        Sizing::Fixed if fits => Some(("FIXED", value)),
+        Sizing::Fill if fits && value > 0.0 => Some(("FLEX", value)),
+        Sizing::Hug => Some(("HUG", 0.0)),
+        _ => None,
+    }
+}
+
+/// A grid axis's track sizes, keyed by track id like the order map. A track the document doesn't
+/// set is left out, and one the format can't hold keeps its id (the import equalises it) and sets
+/// `dropped`.
+fn grid_sizing(tracks: &[GridTrack], ids: &[u32], dropped: &mut bool) -> Option<Kv<'static>> {
+    let mut entries = Vec::new();
+    for (track, id) in tracks.iter().zip(ids) {
+        match grid_track_size(track) {
+            Some((kind, value)) => {
+                let size = || o(vec![("type", e(kind)), ("value", fl(value))]);
+                entries.push(o(vec![("id", guid(AUX, *id)), ("trackSize", o(vec![("minSizing", size()), ("maxSizing", size())]))]));
+            }
+            None => *dropped = true,
+        }
+    }
+    (!entries.is_empty()).then(|| o(vec![("entries", arr(entries))]))
+}
+
 fn guid(session: u32, local: u32) -> Kv<'static> {
     o(vec![("sessionID", u(session)), ("localID", u(local))])
 }
@@ -406,12 +457,18 @@ struct Exporter<'d> {
     images: BTreeMap<String, Option<String>>,
     /// `images/<hash>` members.
     files: Vec<(String, Arc<Vec<u8>>)>,
-    /// Component property (name, type) → local id of its definition's GUID (session [`AUX`]).
-    defs: BTreeMap<(String, &'static str), u32>,
+    /// Component property (owner, name, type) → local id of its definition's GUID (session [`AUX`]).
+    /// The owner is the component, or the set for a variant (variant properties included, type
+    /// `VARIANT`).
+    defs: BTreeMap<(NodeId, String, &'static str), u32>,
+    /// A variant's own definition of each of its set's properties (variant, name, type) → local
+    /// id (session [`AUX`]): what its layers and its instances refer to.
+    child_defs: BTreeMap<(NodeId, String, &'static str), u32>,
     /// Grid tracks of written grid frames: (columns, rows) local ids (session [`AUX`]).
     tracks: BTreeMap<NodeId, (Vec<u32>, Vec<u32>)>,
     aux: u32,
     overlays: BTreeMap<NodeId, Overlay>,
+    trigger_size: [f64; 2],
     /// Flow starting points: layer → (order, name).
     starts: BTreeMap<NodeId, (usize, String)>,
     /// Shared styles, variable collections and variables → local id of their node's GUID (session
@@ -447,9 +504,11 @@ impl<'d> Exporter<'d> {
             images: BTreeMap::new(),
             files: Vec::new(),
             defs: BTreeMap::new(),
+            child_defs: BTreeMap::new(),
             tracks: BTreeMap::new(),
             aux: 0,
             overlays: BTreeMap::new(),
+            trigger_size: [0.0, 0.0],
             starts: BTreeMap::new(),
             style_ids: BTreeMap::new(),
             set_ids: BTreeMap::new(),
@@ -474,6 +533,54 @@ impl<'d> Exporter<'d> {
         self.ids.get(&id).map(|l| guid(LAYERS, *l))
     }
 
+    /// The component set component `id` is a variant of.
+    fn set_of(&self, id: NodeId) -> Option<NodeId> {
+        let parent = self.doc.node(id)?.parent.and_then(|p| self.doc.node(p))?;
+        matches!(parent.kind, NodeKind::ComponentSet { .. }).then_some(parent.id)
+    }
+
+    /// The local id a layer of component `comp` (or an instance of it) uses for its property
+    /// `name` of type `ty`: a variant's own definition, else the component's.
+    fn def_for(&self, comp: NodeId, name: &str, ty: &'static str) -> Option<u32> {
+        let key = (comp, name.to_string(), ty);
+        let defs = if self.set_of(comp).is_some() { &self.child_defs } else { &self.defs };
+        defs.get(&key).copied()
+    }
+
+    /// The main component a layer belongs to (itself when it is one). A layer inside an instance
+    /// mirrors its main's layer (`source`, through nested instances): that layer's component, so
+    /// the instance's layers refer to what the main's do. An instance placed in a component is the
+    /// component's own layer (its `source` is its main, which it doesn't belong to).
+    fn component_of(&self, n: &Node) -> Option<NodeId> {
+        let in_instance = |x: &Node| {
+            let mut p = x.parent.and_then(|p| self.doc.node(p));
+            for _ in 0..MAX_DEPTH {
+                match p {
+                    Some(a) if matches!(a.kind, NodeKind::Instance { .. }) => return true,
+                    Some(a) => p = a.parent.and_then(|q| self.doc.node(q)),
+                    None => return false,
+                }
+            }
+            false
+        };
+        let mut n = n;
+        for _ in 0..MAX_DEPTH {
+            match n.source.and_then(|s| self.doc.node(s)) {
+                Some(src) if in_instance(n) => n = src,
+                _ => break,
+            }
+        }
+        let mut cur = Some(n);
+        for _ in 0..MAX_DEPTH {
+            let c = cur?;
+            if matches!(c.kind, NodeKind::Component { .. }) {
+                return Some(c.id);
+            }
+            cur = c.parent.and_then(|p| self.doc.node(p));
+        }
+        None
+    }
+
     /// The message: the document, its pages and their layers, and the blobs.
     fn message(&mut self) -> Kv<'static> {
         let doc = self.doc;
@@ -499,1979 +606,26 @@ impl<'d> Exporter<'d> {
             ("blobs", arr(blobs.into_iter().map(|(_, bytes)| o(vec![("bytes", Kv::Bytes(bytes))])).collect())),
         ])
     }
-
-    /// GUIDs for every layer (pages first, then depth-first), component property definitions,
-    /// flow starting points and overlay settings, before anything refers to them.
-    fn assign(&mut self) {
-        let doc = self.doc;
-        let mut stack: Vec<NodeId> = doc.pages.iter().rev().copied().collect();
-        while let Some(id) = stack.pop() {
-            let Some(n) = doc.node(id) else { continue };
-            if self.ids.len() >= MAX_NODES {
-                self.warn("the document has more layers than a .fig file is read with; the rest were left out");
-                break;
-            }
-            let local = u32::try_from(self.ids.len() + 1).unwrap_or(u32::MAX);
-            self.ids.insert(id, local);
-            // An instance's layers aren't written (its main says them), so nothing may refer to them.
-            let mirrored = matches!(&n.kind, NodeKind::Instance { component, .. } if doc.node(*component).is_some_and(|c| matches!(c.kind, NodeKind::Component { .. })));
-            if !mirrored {
-                stack.extend(n.children.iter().rev());
-            }
-            match &n.kind {
-                NodeKind::Component { props, .. } => {
-                    for (name, d) in props {
-                        if let Some(ty) = prop_type(d) {
-                            let key = (name.clone(), ty);
-                            if !self.defs.contains_key(&key) {
-                                let id = self.next_aux();
-                                self.defs.insert(key, id);
-                            }
-                        }
-                    }
-                }
-                NodeKind::Page { flows, .. } => {
-                    for (i, f) in flows.iter().enumerate() {
-                        self.starts.entry(f.start).or_insert((i, f.name.clone()));
-                    }
-                }
-                _ => {}
-            }
-            for a in n.interactions.iter().flat_map(|it| figcraft_doc::proto::walk(&it.actions)) {
-                if let Action::OpenOverlay { dest, position, close_on_outside, background, .. } = a {
-                    let o = Overlay { position: *position, close_on_outside: *close_on_outside, background: *background };
-                    match self.overlays.get(dest) {
-                        Some(old) if (old.position, old.close_on_outside, old.background) != (o.position, o.close_on_outside, o.background) => {
-                            self.warn("overlays opened with different settings keep the first one's");
-                        }
-                        Some(_) => {}
-                        None => {
-                            self.overlays.insert(*dest, o);
-                        }
-                    }
-                }
-            }
-        }
-        // The page that holds styles and variables takes the next id, then their nodes.
-        let mut next = u32::try_from(self.ids.len() + 1).unwrap_or(u32::MAX);
-        let mut node = || {
-            next = next.saturating_add(1);
-            next
-        };
-        for st in &doc.styles {
-            self.style_ids.entry(st.id.as_str()).or_insert_with(&mut node);
-        }
-        for c in &doc.variables.collections {
-            self.set_ids.entry(c.id.as_str()).or_insert_with(&mut node);
-        }
-        for v in &doc.variables.variables {
-            if self.set_ids.contains_key(v.collection.as_str()) {
-                self.var_ids.entry(v.id.as_str()).or_insert_with(&mut node);
-            }
-        }
-        for c in &doc.variables.collections {
-            for m in &c.modes {
-                if !self.mode_ids.contains_key(&(c.id.as_str(), m.id.as_str())) {
-                    let id = self.next_aux();
-                    self.mode_ids.insert((c.id.as_str(), m.id.as_str()), id);
-                }
-            }
-        }
-    }
-
-    /// The hidden page after the `pages` real ones that holds the shared styles, the variable
-    /// collections and the variables, each a node of its own.
-    fn assets(&mut self, pages: usize) {
-        let doc = self.doc;
-        if self.style_ids.is_empty() && self.set_ids.is_empty() {
-            return;
-        }
-        let page = u32::try_from(self.ids.len() + 1).unwrap_or(u32::MAX);
-        let mut f: Fields = vec![
-            ("guid", guid(LAYERS, page)),
-            ("phase", e("CREATED")),
-            ("parentIndex", o(vec![("guid", guid(0, 0)), ("position", s(&position(pages)))])),
-            ("type", e("CANVAS")),
-            ("name", s("Internal Only Canvas")),
-        ];
-        f.extend(root_fields().into_iter().map(|(k, v)| if k == "visible" { (k, b(false)) } else { (k, v) }));
-        f.push(("internalOnly", b(true)));
-        self.nodes.push(o(f));
-        let mut index = 0usize;
-        let mut head = |local: u32, ty: &'static str, name: &str| -> Fields {
-            index += 1;
-            vec![
-                ("guid", guid(LAYERS, local)),
-                ("phase", e("CREATED")),
-                ("parentIndex", o(vec![("guid", guid(LAYERS, page)), ("position", s(&position(index)))])),
-                ("type", e(ty)),
-                ("name", s(name)),
-                ("sortPosition", s(&position(index))),
-            ]
-        };
-        for st in &doc.styles {
-            let Some(&local) = self.style_ids.get(st.id.as_str()) else { continue };
-            // A sample layer that shows the style: a square for paints and effects, a frame for
-            // grids, two letters for text.
-            let (ty, kind) = match &st.kind {
-                StyleKind::Paint { .. } => ("ROUNDED_RECTANGLE", "FILL"),
-                StyleKind::Effect { .. } => ("ROUNDED_RECTANGLE", "EFFECT"),
-                StyleKind::Grid { .. } => ("FRAME", "GRID"),
-                StyleKind::Text { .. } => ("TEXT", "TEXT"),
-            };
-            let mut f = head(local, ty, &st.name);
-            f.extend([
-                ("styleType", e(kind)),
-                ("visible", b(true)),
-                ("opacity", fl(1.0)),
-                ("size", xy(100.0, 100.0)),
-                ("transform", matrix(Affine::IDENTITY)),
-                ("strokeWeight", fl(0.0)),
-                ("strokeAlign", e("INSIDE")),
-                ("strokeJoin", e("MITER")),
-            ]);
-            if !st.description.is_empty() {
-                f.push(("description", s(&st.description)));
-            }
-            // The style's variable bindings ride on its sample layer, as a layer's do.
-            let none = if st.bound.is_empty() {
-                Bound::default()
-            } else {
-                let mut sample = Node::new(NodeId(0), NodeKind::Rectangle, "", 0.0, 0.0);
-                if let StyleKind::Text { style } = &st.kind {
-                    sample.kind = NodeKind::Text(TextData { style: style.as_text_style(), ..TextData::new("Ag") });
-                }
-                sample.bound.clone_from(&st.bound);
-                self.bound(&sample)
-            };
-            let entries = none.entries.clone();
-            if !entries.is_empty() {
-                f.push(("variableConsumptionMap", o(vec![("entries", arr(entries))])));
-            }
-            match &st.kind {
-                StyleKind::Paint { paints } => f.push(("fillPaints", self.paints(paints, true, &none))),
-                StyleKind::Effect { effects } => {
-                    let list = effects.iter().enumerate().map(|(i, x)| self.effect(x, i, &none)).collect();
-                    f.extend([("fillPaints", arr(Vec::new())), ("effects", arr(list))]);
-                }
-                StyleKind::Grid { grids } => {
-                    let list = grids.iter().enumerate().map(|(i, g)| layout_grid(g, i, &none)).collect();
-                    f.extend([("fillPaints", arr(Vec::new())), ("layoutGrids", arr(list))]);
-                }
-                StyleKind::Text { style } => {
-                    let td = TextData { style: style.as_text_style(), ..TextData::new("Ag") };
-                    let fills = [Paint::solid(Color::BLACK)];
-                    f.push(("fillPaints", self.paints(style.fills.as_deref().unwrap_or(&fills), true, &none)));
-                    self.text(&td, &fills, &mut f);
-                }
-            }
-            self.nodes.push(o(f));
-        }
-        for c in &doc.variables.collections {
-            let Some(&local) = self.set_ids.get(c.id.as_str()) else { continue };
-            let mut f = head(local, "VARIABLE_SET", &c.name);
-            let modes = c.modes.iter().enumerate().filter_map(|(i, m)| {
-                let id = self.mode_ids.get(&(c.id.as_str(), m.id.as_str()))?;
-                Some(o(vec![("id", guid(AUX, *id)), ("name", s(&m.name)), ("sortPosition", s(&position(i)))]))
-            });
-            f.push(("variableSetModes", arr(modes.collect())));
-            self.nodes.push(o(f));
-            if c.extends.is_some() {
-                self.warn("extended variable collections were written as collections of their own");
-            }
-        }
-        for v in &doc.variables.variables {
-            let ids = (self.var_ids.get(v.id.as_str()), self.set_ids.get(v.collection.as_str()));
-            let (Some(&local), Some(&set), Some(c)) = (ids.0, ids.1, doc.variables.collections.iter().find(|c| c.id == v.collection)) else {
-                self.warn("variables whose collection isn't in the document were left out");
-                continue;
-            };
-            let resolved = resolved_type(v.kind);
-            let mut values = Vec::new();
-            for m in &c.modes {
-                let (Some(mode), Some(val)) = (self.mode_ids.get(&(c.id.as_str(), m.id.as_str())), v.values.get(&m.id)) else { continue };
-                let (ty, value) = match val {
-                    VariableValue::Color(x) => ("COLOR", ("colorValue", color(*x))),
-                    VariableValue::Number(x) => ("FLOAT", ("floatValue", fl(*x))),
-                    // NULs can't be stored in a string.
-                    VariableValue::String(x) => ("STRING", ("textValue", s(&x.replace('\0', "")))),
-                    VariableValue::Boolean(x) => ("BOOLEAN", ("boolValue", b(*x))),
-                    VariableValue::Alias(a) => match self.var_ids.get(a.as_str()) {
-                        Some(t) => ("ALIAS", ("alias", o(vec![("guid", guid(LAYERS, *t))]))),
-                        None => {
-                            self.warn("variable aliases to variables that aren't in the document were left out");
-                            continue;
-                        }
-                    },
-                };
-                let data = o(vec![("value", o(vec![value])), ("dataType", e(ty)), ("resolvedDataType", e(resolved))]);
-                values.push(o(vec![("modeID", guid(AUX, *mode)), ("variableData", data)]));
-            }
-            let mut f = head(local, "VARIABLE", &v.name);
-            f.extend([
-                ("variableSetID", o(vec![("guid", guid(LAYERS, set))])),
-                ("variableResolvedType", e(resolved)),
-                ("variableDataValues", o(vec![("entries", arr(values))])),
-            ]);
-            if !v.description.is_empty() {
-                f.push(("description", s(&v.description)));
-            }
-            if let Some(scopes) = &v.scopes {
-                let known: Vec<Kv> = scopes.iter().filter_map(|sc| scope_name(sc)).map(e).collect();
-                if known.len() < scopes.len() {
-                    self.warn("variable scopes the format has no name for were left out");
-                }
-                f.push(("variableScopes", arr(known)));
-            }
-            if v.hidden_from_publishing || !v.code_syntax.is_empty() || v.extends.is_some() {
-                self.warn("variables' publishing, code syntax and inheritance settings were left out");
-            }
-            self.nodes.push(o(f));
-        }
-    }
-
-    /// A reference to variable `var` (its id or name) as variable data.
-    fn alias(&mut self, var: &str) -> Option<Kv<'static>> {
-        let found = self.doc.variables.get(var).and_then(|v| Some((v.kind, *self.var_ids.get(v.id.as_str())?)));
-        let Some((kind, local)) = found else {
-            self.warn("bindings to variables that aren't in the document were written as their values");
-            return None;
-        };
-        Some(o(vec![
-            ("value", o(vec![("alias", o(vec![("guid", guid(LAYERS, local))]))])),
-            ("dataType", e("ALIAS")),
-            ("resolvedDataType", e(resolved_type(kind))),
-        ]))
-    }
-
-    /// Layer `n`'s variable bindings, sorted into the fields that carry them. What the format has
-    /// no field for stays as the value the layer already shows, with a warning.
-    fn bound(&mut self, n: &Node) -> Bound {
-        const BAKED: &str = "variables bound to properties the format has no field for were written as their values";
-        let mut out = Bound::default();
-        for (key, var) in &n.bound {
-            let parts: Vec<&str> = key.split('/').collect();
-            let index = |i: &str| i.parse::<usize>().ok().filter(|_| i.bytes().all(|c| c.is_ascii_digit()));
-            let fields: &[&'static str] = match (parts.as_slice(), key.as_str()) {
-                (_, "fill" | "fills" | "fills/0" | "stroke") => {
-                    if let Some(a) = self.alias(var) {
-                        out.paints.insert((key != "stroke", 0), a);
-                    }
-                    continue;
-                }
-                ([list @ ("fills" | "strokes"), i, "color"], _) => {
-                    if let (Some(i), Some(a)) = (index(i), self.alias(var)) {
-                        out.paints.insert((*list == "fills", i), a);
-                    }
-                    continue;
-                }
-                ([list @ ("fills" | "strokes"), i, "stops", j, "color"], _) => {
-                    if let (Some(i), Some(j), Some(a)) = (index(i), index(j), self.alias(var)) {
-                        out.stops.insert((*list == "fills", i, j), a);
-                    }
-                    continue;
-                }
-                ([list @ ("effects" | "layoutGrids"), i, field], _) => {
-                    let names: &[&'static str] = if *list == "effects" {
-                        &["color", "radius", "spread", "offsetX", "offsetY", "startRadius"]
-                    } else {
-                        &["size", "count", "gutter", "offset"]
-                    };
-                    match (index(i), names.iter().find(|f| *f == field)) {
-                        (Some(i), Some(name)) => {
-                            if let Some(a) = self.alias(var) {
-                                if *list == "effects" { &mut out.effects } else { &mut out.grids }.insert((i, *name), a);
-                            }
-                        }
-                        _ => self.warn(BAKED),
-                    }
-                    continue;
-                }
-                (_, "width") => &["WIDTH"],
-                (_, "height") => &["HEIGHT"],
-                (_, "gap") => &["STACK_SPACING"],
-                (_, "crossGap") => &["STACK_COUNTER_SPACING"],
-                (_, "paddingLeft") => &["STACK_PADDING_LEFT"],
-                (_, "paddingTop") => &["STACK_PADDING_TOP"],
-                (_, "paddingRight") => &["STACK_PADDING_RIGHT"],
-                (_, "paddingBottom") => &["STACK_PADDING_BOTTOM"],
-                (_, "paddingHorizontal") => &["STACK_PADDING_LEFT", "STACK_PADDING_RIGHT"],
-                (_, "paddingVertical") => &["STACK_PADDING_TOP", "STACK_PADDING_BOTTOM"],
-                (_, "padding") => &["STACK_PADDING_LEFT", "STACK_PADDING_TOP", "STACK_PADDING_RIGHT", "STACK_PADDING_BOTTOM"],
-                (_, "cornerRadius") => &[
-                    "CORNER_RADIUS",
-                    "RECTANGLE_TOP_LEFT_CORNER_RADIUS",
-                    "RECTANGLE_TOP_RIGHT_CORNER_RADIUS",
-                    "RECTANGLE_BOTTOM_LEFT_CORNER_RADIUS",
-                    "RECTANGLE_BOTTOM_RIGHT_CORNER_RADIUS",
-                ],
-                (_, "topLeftRadius") => &["RECTANGLE_TOP_LEFT_CORNER_RADIUS"],
-                (_, "topRightRadius") => &["RECTANGLE_TOP_RIGHT_CORNER_RADIUS"],
-                (_, "bottomLeftRadius") => &["RECTANGLE_BOTTOM_LEFT_CORNER_RADIUS"],
-                (_, "bottomRightRadius") => &["RECTANGLE_BOTTOM_RIGHT_CORNER_RADIUS"],
-                (_, "opacity") => &["OPACITY"],
-                (_, "visible") => &["VISIBLE"],
-                (_, "characters") => &["TEXT_DATA"],
-                (_, "strokeWeight") => &["STROKE_WEIGHT"],
-                (_, "strokeTopWeight") => &["BORDER_TOP_WEIGHT"],
-                (_, "strokeRightWeight") => &["BORDER_RIGHT_WEIGHT"],
-                (_, "strokeBottomWeight") => &["BORDER_BOTTOM_WEIGHT"],
-                (_, "strokeLeftWeight") => &["BORDER_LEFT_WEIGHT"],
-                (_, "minWidth") => &["MIN_WIDTH"],
-                (_, "maxWidth") => &["MAX_WIDTH"],
-                (_, "minHeight") => &["MIN_HEIGHT"],
-                (_, "maxHeight") => &["MAX_HEIGHT"],
-                (_, "fontSize") => &["FONT_SIZE"],
-                (_, "fontFamily") => &["FONT_FAMILY"],
-                (_, "fontStyle") => &["FONT_STYLE"],
-                (_, "letterSpacing") => &["LETTER_SPACING"],
-                (_, "lineHeight") => &["LINE_HEIGHT"],
-                (_, "paragraphSpacing") => &["PARAGRAPH_SPACING"],
-                (_, "paragraphIndent") => &["PARAGRAPH_INDENT"],
-                _ => {
-                    self.warn(BAKED);
-                    continue;
-                }
-            };
-            // Each entry names the bound property and the number of the layer field that holds it.
-            for field in fields {
-                if let Some(a) = self.alias(var) {
-                    let mut entry: Fields = node_field(field).into_iter().map(|id| ("nodeField", u(id))).collect();
-                    entry.extend([("variableData", a), ("variableField", e(field))]);
-                    out.entries.push(o(entry));
-                }
-            }
-        }
-        out
-    }
-
-    /// Write layer `id` (child `index` of the layer with GUID `parent_guid`) and its subtree.
-    fn emit(&mut self, id: NodeId, parent_guid: Kv<'static>, index: usize, parent: Option<&Node>, depth: usize) {
-        let doc = self.doc;
-        let (Some(&local), Some(n)) = (self.ids.get(&id), doc.node(id)) else { return };
-        if depth > MAX_DEPTH {
-            self.warn("layers nested deeper than 256 levels were left out");
-            return;
-        }
-        let mut f: Fields = vec![
-            ("guid", guid(LAYERS, local)),
-            ("phase", e("CREATED")),
-            ("parentIndex", o(vec![("guid", parent_guid), ("position", s(&position(index)))])),
-        ];
-        let children = if let NodeKind::Page { background, guides, prototype, .. } = &n.kind {
-            f.extend([("type", e("CANVAS")), ("name", s(&n.name))]);
-            f.extend(root_fields());
-            f.extend([("backgroundColor", color(*background)), ("backgroundOpacity", fl(background.a.into())), ("backgroundEnabled", b(true))]);
-            if !guides.is_empty() {
-                self.warn("ruler guides were left out");
-            }
-            if *prototype != Default::default() {
-                self.warn("prototype device settings were left out");
-            }
-            self.modes(n, &mut f);
-            true
-        } else {
-            self.layer(n, parent, &mut f, false)
-        };
-        self.nodes.push(o(f));
-        if children {
-            for (i, c) in n.children.iter().enumerate() {
-                self.emit(*c, guid(LAYERS, local), i, Some(n), depth + 1);
-            }
-        }
-    }
-
-    /// The fields of layer `n` (whose parent is `parent`). `nested`: for an instance's override
-    /// (no type, no instance or component data). Returns whether its children are written as
-    /// layers (an instance's come from its main).
-    fn layer(&mut self, n: &Node, parent: Option<&Node>, f: &mut Fields, nested: bool) -> bool {
-        let doc = self.doc;
-        if let Some((outline, original)) = outlined(n) {
-            // The format's variable width is the same on both sides of the path: a stroke wider on
-            // one side is written as the area it paints, with the stroke itself kept as plugin data
-            // (which the import puts back).
-            self.warn("strokes wider on one side of their path were written as filled outlines (the stroke itself is kept for FigCraft)");
-            let children = self.layer(&outline, parent, f, nested);
-            f.push(("pluginData", arr(vec![o(vec![("pluginID", s(STASH.0)), ("value", s(&original)), ("key", s(STASH.1))])])));
-            return children;
-        }
-        let main = match &n.kind {
-            NodeKind::Instance { component, .. } => {
-                let found = self.ids.contains_key(component) && doc.node(*component).is_some_and(|c| matches!(c.kind, NodeKind::Component { .. }));
-                if !found && !nested {
-                    self.warn("instances of components that aren't in the file were written as frames");
-                }
-                found.then_some(*component)
-            }
-            _ => None,
-        };
-        let ty = match &n.kind {
-            NodeKind::Page { .. } | NodeKind::Frame | NodeKind::Group | NodeKind::ComponentSet { .. } => "FRAME",
-            NodeKind::Instance { .. } if main.is_none() => "FRAME",
-            NodeKind::Section { .. } => "SECTION",
-            NodeKind::Rectangle => "ROUNDED_RECTANGLE",
-            NodeKind::Ellipse { .. } => "ELLIPSE",
-            NodeKind::Polygon { .. } => "REGULAR_POLYGON",
-            NodeKind::Star { .. } => "STAR",
-            NodeKind::Line => "LINE",
-            NodeKind::Vector { .. } => "VECTOR",
-            NodeKind::Text(_) => "TEXT",
-            NodeKind::BooleanOp { .. } => "BOOLEAN_OPERATION",
-            NodeKind::Component { .. } => "SYMBOL",
-            NodeKind::Instance { .. } => "INSTANCE",
-            NodeKind::Slice => "SLICE",
-        };
-        if !nested {
-            f.push(("type", e(ty)));
-        }
-        f.push(("name", s(&n.name)));
-        self.common(n, parent, f);
-        match &n.kind {
-            NodeKind::Group => f.push(("resizeToFit", b(true))),
-            NodeKind::Section { contents_hidden } => f.push(("sectionContentsHidden", b(*contents_hidden))),
-            NodeKind::Ellipse { start, sweep, inner } => {
-                f.push(("arcData", o(vec![("startingAngle", fl(*start)), ("endingAngle", fl(start + sweep)), ("innerRadius", fl(*inner))])))
-            }
-            NodeKind::Polygon { count } => f.push(("count", u(*count))),
-            NodeKind::Star { count, inner_ratio } => f.extend([("count", u(*count)), ("starInnerScale", fl(*inner_ratio))]),
-            NodeKind::Vector { network } => self.vector(n, network, f),
-            NodeKind::Text(td) => self.text(td, &n.fills, f),
-            NodeKind::BooleanOp { op } => {
-                let name = match op {
-                    BoolOp::Union => "UNION",
-                    BoolOp::Subtract => "SUBTRACT",
-                    BoolOp::Intersect => "INTERSECT",
-                    BoolOp::Exclude => "XOR",
-                };
-                f.push(("booleanOperation", e(name)));
-                if n.children.iter().filter_map(|c| doc.node(*c)).any(|c| c.bool_op.is_some()) {
-                    self.warn("boolean groups whose layers combine in different ways use the group's operation");
-                }
-            }
-            NodeKind::Component { description, props } if !nested => {
-                let defs: Vec<Kv> = props.iter().filter_map(|(name, d)| self.prop_def(name, d)).collect();
-                if !defs.is_empty() {
-                    f.push(("componentPropDefs", arr(defs)));
-                }
-                if props.values().any(|d| matches!(d, PropDef::Slot { .. })) {
-                    self.warn("slot properties were left out");
-                }
-                if !description.is_empty() {
-                    f.push(("symbolDescription", s(description)));
-                }
-            }
-            NodeKind::ComponentSet { description } if !nested => {
-                f.push(("isStateGroup", b(true)));
-                if !description.is_empty() {
-                    f.push(("symbolDescription", s(description)));
-                }
-            }
-            NodeKind::Instance { props, .. } if !nested => {
-                if let Some(main) = main {
-                    self.instance(n, main, props, f);
-                }
-            }
-            _ => {}
-        }
-        let boxy = n.kind.is_frame_like() || matches!(n.kind, NodeKind::Rectangle | NodeKind::Section { .. });
-        if (boxy || matches!(n.kind, NodeKind::Ellipse { .. } | NodeKind::Polygon { .. } | NodeKind::Star { .. }))
-            && let Some(p) = figcraft_doc::geometry::shape_path(n)
-        {
-            self.geometry("fillGeometry", &p, WindingRule::NonZero, f);
-        }
-        self.stroke_geometry(n, boxy, f);
-        main.is_none()
-    }
-
-    /// Fields every layer kind shares.
-    fn common(&mut self, n: &Node, parent: Option<&Node>, f: &mut Fields) {
-        f.extend([
-            ("visible", b(n.visible)),
-            ("locked", b(n.locked)),
-            ("opacity", fl(n.opacity.into())),
-            ("blendMode", e(blend_name(n.blend))),
-            ("size", xy(n.width, n.height)),
-            ("transform", matrix(n.transform)),
-        ]);
-        if n.is_mask {
-            let ty = match n.mask_type {
-                MaskType::Alpha => "ALPHA",
-                MaskType::Vector => "OUTLINE",
-                MaskType::Luminance => "LUMINANCE",
-            };
-            f.extend([("mask", b(true)), ("maskType", e(ty))]);
-        }
-        let bound = self.bound(n);
-        // Text whose own style sets fills paints with them (the layer's fills only show through
-        // runs); a variable bound to the layer's fill colours the layer's.
-        let fills = match &n.kind {
-            NodeKind::Text(TextData { style: TextStyle { fills: Some(own), .. }, .. }) => self.paints(own, true, &Bound::default()),
-            _ => self.paints(&n.fills, true, &bound),
-        };
-        let strokes = self.paints(&n.strokes, false, &bound);
-        f.extend([("fillPaints", fills), ("strokePaints", strokes)]);
-        self.stroke(n, f);
-        if !n.effects.is_empty() {
-            let effects = n.effects.iter().enumerate().map(|(i, x)| self.effect(x, i, &bound)).collect();
-            f.push(("effects", arr(effects)));
-        }
-        if n.kind.has_corner_radius() {
-            let r = n.corners.radii;
-            f.push(("cornerRadius", fl(r[0])));
-            let differ = r.iter().any(|x| *x != r[0]);
-            if n.kind.has_independent_corners() && (differ || r[0] > 0.0) {
-                f.extend(differ.then(|| ("rectangleCornerRadiiIndependent", b(true))));
-                f.extend([
-                    ("rectangleTopLeftCornerRadius", fl(r[0])),
-                    ("rectangleTopRightCornerRadius", fl(r[1])),
-                    ("rectangleBottomRightCornerRadius", fl(r[2])),
-                    ("rectangleBottomLeftCornerRadius", fl(r[3])),
-                ]);
-            }
-            if n.corners.smoothing > 0.0 {
-                f.push(("cornerSmoothing", fl(n.corners.smoothing)));
-            }
-        }
-        let h = match n.constraints.horizontal {
-            HConstraint::Left => "MIN",
-            HConstraint::Right => "MAX",
-            HConstraint::LeftRight => "STRETCH",
-            HConstraint::Center => "CENTER",
-            HConstraint::Scale => "SCALE",
-        };
-        let v = match n.constraints.vertical {
-            VConstraint::Top => "MIN",
-            VConstraint::Bottom => "MAX",
-            VConstraint::TopBottom => "STRETCH",
-            VConstraint::Center => "CENTER",
-            VConstraint::Scale => "SCALE",
-        };
-        f.extend([("horizontalConstraint", e(h)), ("verticalConstraint", e(v))]);
-        if n.kind.is_frame_like() || matches!(n.kind, NodeKind::Section { .. }) {
-            f.push(("frameMaskDisabled", b(!n.clip)));
-        }
-        if n.kind.is_frame_like() {
-            if let Some(l) = &n.layout {
-                self.auto_layout(n, l, f);
-            }
-            if !n.grids.is_empty() {
-                f.push(("layoutGrids", arr(n.grids.iter().enumerate().map(|(i, g)| layout_grid(g, i, &bound)).collect())));
-            }
-        }
-        self.child_layout(n, parent, f);
-        if !n.exports.is_empty() {
-            if n.exports.iter().any(|x| x.format == figcraft_doc::ExportFormat::Webp) {
-                self.warn("WebP export settings were written as PNG");
-            }
-            f.push(("exportSettings", arr(n.exports.iter().map(export_setting).collect())));
-        }
-        self.prototype(n, f);
-        let refs: Vec<Kv> = n.prop_refs.iter().filter_map(|(field, prop)| self.prop_ref(field, prop)).collect();
-        if !refs.is_empty() {
-            f.push(("parameterConsumptionMap", o(vec![("entries", arr(refs))])));
-        }
-        let text = matches!(n.kind, NodeKind::Text(_));
-        let links = [
-            ("styleIdForFill", &n.styles.fill, true),
-            ("styleIdForStrokeFill", &n.styles.stroke, true),
-            ("styleIdForEffect", &n.styles.effect, true),
-            ("styleIdForGrid", &n.styles.grid, n.kind.is_frame_like()),
-            ("styleIdForText", &n.styles.text, text),
-        ];
-        for (key, id, fits) in links {
-            let Some(id) = id else { continue };
-            match self.style_ids.get(id.as_str()).filter(|_| fits) {
-                Some(local) => f.push((key, o(vec![("guid", guid(LAYERS, *local))]))),
-                None => self.warn("links to shared styles that aren't in the document were left out (their layers keep the values)"),
-            }
-        }
-        if let NodeKind::Text(td) = &n.kind
-            && n.styles.text.is_none()
-            && std::iter::once(&td.style).chain(td.runs.iter().map(|r| &r.style)).any(|st| st.style_id.is_some())
-        {
-            self.warn("text styles applied to part of a text were written as their values");
-        }
-        if !bound.entries.is_empty() {
-            f.push(("variableConsumptionMap", o(vec![("entries", arr(bound.entries))])));
-        }
-        self.modes(n, f);
-        if !n.guides.is_empty() {
-            self.warn("ruler guides were left out");
-        }
-        if !n.annotations.is_empty() || !n.dev_resources.is_empty() || !n.code_links.is_empty() || !n.dev_status.is_none() {
-            self.warn("Dev Mode annotations, statuses, resources and code links were left out");
-        }
-        if !n.plugin_data.is_empty() {
-            self.warn("plugin data was left out");
-        }
-    }
-
-    /// The variable modes layer (or page) `n` sets for what is in it.
-    fn modes(&mut self, n: &Node, f: &mut Fields) {
-        let mut entries = Vec::new();
-        for (coll, mode) in &n.var_modes {
-            match (self.set_ids.get(coll.as_str()), self.mode_ids.get(&(coll.as_str(), mode.as_str()))) {
-                (Some(set), Some(mode)) => {
-                    entries.push(o(vec![("variableSetID", o(vec![("guid", guid(LAYERS, *set))])), ("variableModeID", guid(AUX, *mode))]));
-                }
-                _ => self.warn("variable modes of collections that aren't in the document were left out"),
-            }
-        }
-        if !entries.is_empty() {
-            f.push(("variableModeBySetMap", o(vec![("entries", arr(entries))])));
-        }
-    }
-
-    /// A paint list: a layer's fills (`fills`) or strokes with the variables `bound` to them.
-    fn paints(&mut self, list: &[Paint], fills: bool, bound: &Bound) -> Kv<'static> {
-        arr(list.iter().enumerate().filter_map(|(i, p)| self.paint(p, (fills, i), bound)).collect())
-    }
-
-    fn paint(&mut self, p: &Paint, at: (bool, usize), bound: &Bound) -> Option<Kv<'static>> {
-        let mut f: Fields = vec![("visible", b(p.visible)), ("blendMode", e(blend_name(p.blend)))];
-        let mut opacity = f64::from(p.opacity);
-        match &p.kind {
-            PaintKind::Solid { color: c } => {
-                opacity *= f64::from(c.a);
-                f.extend([("type", e("SOLID")), ("color", color(c.with_alpha(1.0)))]);
-                f.extend(bound.paints.get(&at).map(|a| ("colorVar", a.clone())));
-            }
-            PaintKind::Gradient(g) => {
-                let ty = match g.kind {
-                    GradientKind::Linear => "GRADIENT_LINEAR",
-                    GradientKind::Radial => "GRADIENT_RADIAL",
-                    GradientKind::Angular => "GRADIENT_ANGULAR",
-                    GradientKind::Diamond => "GRADIENT_DIAMOND",
-                };
-                // The handles in the unit box come from the inverse of the paint transform: it maps
-                // (0, ½) → start, (1, ½) → end, (0, 1) → width for linear gradients, and the centre
-                // (½, ½) and the points half a box away from it for the others.
-                let (from, to, width) = (g.from, g.to, g.width);
-                let (ax, ay) =
-                    if g.kind == GradientKind::Linear { (to.0 - from.0, to.1 - from.1) } else { (2.0 * (to.0 - from.0), 2.0 * (to.1 - from.1)) };
-                let (cx, cy) = (2.0 * (width.0 - from.0), 2.0 * (width.1 - from.1));
-                let (ex, ey) = if g.kind == GradientKind::Linear {
-                    (from.0 - 0.5 * cx, from.1 - 0.5 * cy)
-                } else {
-                    (from.0 - 0.5 * (ax + cx), from.1 - 0.5 * (ay + cy))
-                };
-                let handles = Affine::new([ax, ay, cx, cy, ex, ey]);
-                let t = if handles.determinant().abs() > 1e-12 && handles.as_coeffs().iter().all(|x| x.is_finite()) {
-                    handles.inverse()
-                } else {
-                    self.warn("gradients with handles on one line were written with the default direction");
-                    Affine::IDENTITY
-                };
-                let stops = g.stops.iter().map(|st| o(vec![("color", color(st.color)), ("position", fl(st.position.into()))])).collect();
-                f.extend([("type", e(ty)), ("stops", arr(stops)), ("transform", matrix(t))]);
-                // Stops bound to variables: every stop again, the bound ones with their variable.
-                if bound.stops.range((at.0, at.1, 0)..=(at.0, at.1, usize::MAX)).next().is_some() {
-                    let vars = g.stops.iter().enumerate().map(|(j, st)| {
-                        let mut sf: Fields = vec![("color", color(st.color))];
-                        sf.extend(bound.stops.get(&(at.0, at.1, j)).map(|a| ("colorVar", a.clone())));
-                        sf.push(("position", fl(st.position.into())));
-                        o(sf)
-                    });
-                    f.push(("stopsVar", arr(vars.collect())));
-                }
-            }
-            PaintKind::Image(img) => {
-                let hash = self.image(&img.image);
-                let mode = match img.scale_mode {
-                    ImageScaleMode::Fill => "FILL",
-                    ImageScaleMode::Fit => "FIT",
-                    ImageScaleMode::Crop => "STRETCH",
-                    ImageScaleMode::Tile => "TILE",
-                };
-                f.extend([
-                    ("type", e("IMAGE")),
-                    ("image", o(vec![("hash", Kv::Bytes(hash)), ("name", s(""))])),
-                    ("imageScaleMode", e(mode)),
-                    ("rotation", fl(f64::from(img.rotation.rem_euclid(4)) * 90.0)),
-                    ("scale", fl(img.scale)),
-                ]);
-                if let (ImageScaleMode::Crop, Some(c)) = (img.scale_mode, img.crop) {
-                    f.push(("transform", matrix(Affine::new(c))));
-                }
-                if img.filters != Default::default() {
-                    self.warn("image adjustments (exposure, contrast, …) were left out");
-                }
-            }
-            PaintKind::Pattern(_) => {
-                self.warn("pattern fills were left out");
-                return None;
-            }
-        }
-        f.push(("opacity", fl(opacity)));
-        Some(o(f))
-    }
-
-    /// The hash bytes of image `key`, writing its file once (empty when its bytes aren't there).
-    fn image(&mut self, key: &str) -> Vec<u8> {
-        let hex = match self.images.get(key) {
-            Some(h) => h.clone(),
-            None => {
-                let h = match self.doc.images.get(key) {
-                    Some(img) if img.bytes.len() as u64 <= MAX_IMAGE => {
-                        let h = crate::image_hash(&img.bytes);
-                        if !self.files.iter().any(|(x, _)| *x == h) {
-                            self.files.push((h.clone(), img.bytes.clone()));
-                        }
-                        Some(h)
-                    }
-                    Some(_) => {
-                        self.warn("images larger than 256 MB were left out");
-                        None
-                    }
-                    None => {
-                        self.warn("image fills whose image isn't in the document were written without one");
-                        None
-                    }
-                };
-                self.images.insert(key.to_string(), h.clone());
-                h
-            }
-        };
-        let hex = hex.unwrap_or_default();
-        (0..hex.len() / 2).filter_map(|i| hex.get(2 * i..2 * i + 2).and_then(|d| u8::from_str_radix(d, 16).ok())).collect()
-    }
-
-    fn stroke(&mut self, n: &Node, f: &mut Fields) {
-        let sp = &n.stroke;
-        let align = match sp.align {
-            StrokeAlign::Inside => "INSIDE",
-            StrokeAlign::Center => "CENTER",
-            StrokeAlign::Outside => "OUTSIDE",
-        };
-        f.extend([
-            ("strokeWeight", fl(sp.weight)),
-            ("strokeAlign", e(align)),
-            ("strokeJoin", e(join_name(sp.join))),
-            ("strokeCap", e(cap_name(sp.cap_start))),
-            ("miterLimit", fl(sp.miter_limit)),
-        ]);
-        if !sp.dashes.is_empty() {
-            f.push(("dashPattern", arr(sp.dashes.iter().map(|d| fl(*d)).collect())));
-        }
-        if let Some([t, r, bo, l]) = sp.sides {
-            f.extend([
-                ("borderStrokeWeightsIndependent", b(true)),
-                ("borderTopWeight", fl(t)),
-                ("borderRightWeight", fl(r)),
-                ("borderBottomWeight", fl(bo)),
-                ("borderLeftWeight", fl(l)),
-            ]);
-        }
-        // A variable width: how far the stroke reaches on each side of the path at positions along
-        // its length, as a share of the stroke weight (half of it each for the full weight). The
-        // two sides are the same: a reader draws nothing for a point with unequal sides.
-        if let Some(p) = sp.profile().filter(|_| sp.weight.is_finite() && sp.weight > 0.0) {
-            let point = |q: &figcraft_doc::WidthPoint| o(vec![("position", fl(q.t)), ("ascent", fl(q.scale / 2.0)), ("descent", fl(q.scale / 2.0))]);
-            let p = p.sanitized();
-            if one_sided(&p) {
-                self.warn("strokes wider on one side of their path were written with that width on both sides");
-            }
-            f.push(("variableWidthPoints", arr(p.points.iter().map(point).collect())));
-        }
-        if sp.brush.is_some() {
-            self.warn("brush strokes were written as plain strokes");
-        }
-        if [sp.cap_start, sp.cap_end].contains(&StrokeCap::ReversedTriangle) {
-            self.warn("reversed triangle stroke ends were written as triangle arrows");
-        }
-        // Vectors keep each end's cap on their end points; other layers have one cap.
-        if sp.cap_start != sp.cap_end && !matches!(n.kind, NodeKind::Vector { .. }) {
-            self.warn("lines with different stroke ends use the start's at both ends");
-        }
-    }
-
-    /// Effect `index` of a layer, with the variables `bound` to its fields.
-    fn effect(&mut self, x: &figcraft_doc::Effect, index: usize, bound: &Bound) -> Kv<'static> {
-        let mut f: Fields = vec![("visible", b(x.visible))];
-        let vars = [
-            ("color", "colorVar"),
-            ("radius", "radiusVar"),
-            ("spread", "spreadVar"),
-            ("offsetX", "xVar"),
-            ("offsetY", "yVar"),
-            ("startRadius", "startRadiusVar"),
-        ];
-        f.extend(vars.into_iter().filter_map(|(ours, key)| Some((key, bound.effects.get(&(index, ours))?.clone()))));
-        let blur = |f: &mut Fields, ty: &'static str, bl: &figcraft_doc::Blur| {
-            f.extend([("type", e(ty)), ("radius", fl(bl.radius))]);
-            if bl.blur_type == figcraft_doc::BlurType::Progressive {
-                f.extend([
-                    ("blurOpType", e("PROGRESSIVE")),
-                    ("startRadius", fl(bl.start_radius)),
-                    ("startOffset", xy(bl.start.0, bl.start.1)),
-                    ("endOffset", xy(bl.end.0, bl.end.1)),
-                ]);
-            }
-        };
-        let grain = |size: f64, size_y: Option<f64>| xy(size, size_y.unwrap_or(size));
-        match &x.kind {
-            EffectKind::DropShadow(sh) | EffectKind::InnerShadow(sh) => {
-                let ty = if matches!(x.kind, EffectKind::DropShadow(_)) { "DROP_SHADOW" } else { "INNER_SHADOW" };
-                f.extend([
-                    ("type", e(ty)),
-                    ("color", color(sh.color)),
-                    ("offset", xy(sh.offset.0, sh.offset.1)),
-                    ("radius", fl(sh.radius)),
-                    ("spread", fl(sh.spread)),
-                    ("blendMode", e(blend_name(sh.blend))),
-                    ("showShadowBehindNode", b(sh.show_behind)),
-                ]);
-            }
-            EffectKind::LayerBlur(bl) => blur(&mut f, "FOREGROUND_BLUR", bl),
-            EffectKind::BackgroundBlur(bl) => blur(&mut f, "BACKGROUND_BLUR", bl),
-            EffectKind::Noise(nz) => {
-                let mode = match nz.mode {
-                    NoiseMode::Mono => "MONOTONE",
-                    NoiseMode::Duo => "DUOTONE",
-                    NoiseMode::Multi => "MULTITONE",
-                };
-                f.extend([
-                    ("type", e("NOISE")),
-                    ("noiseType", e(mode)),
-                    ("noiseSize", grain(nz.size, nz.size_y)),
-                    ("density", fl(nz.density)),
-                    ("color", color(nz.color)),
-                    ("secondaryColor", color(nz.secondary)),
-                    ("opacity", fl(nz.opacity.into())),
-                    ("blendMode", e(blend_name(nz.blend))),
-                ]);
-            }
-            EffectKind::Texture(t) => {
-                f.extend([
-                    ("type", e("GRAIN")),
-                    ("noiseSize", grain(t.size, t.size_y)),
-                    ("radius", fl(t.radius)),
-                    ("clipToShape", b(t.clip_to_shape)),
-                ]);
-            }
-            EffectKind::Glass(g) => {
-                self.warn("glass effects keep only their frost");
-                f.extend([("type", e("GLASS")), ("radius", fl(g.frost))]);
-            }
-        }
-        o(f)
-    }
-
-    fn auto_layout(&mut self, n: &Node, l: &AutoLayout, f: &mut Fields) {
-        let grid = l.mode == LayoutMode::Grid;
-        let mode = match l.mode {
-            LayoutMode::Horizontal => "HORIZONTAL",
-            LayoutMode::Vertical => "VERTICAL",
-            LayoutMode::Grid => "GRID",
-        };
-        let [top, right, bottom, left] = l.padding;
-        let main = match l.main_align {
-            MainAlign::Min => "MIN",
-            MainAlign::Center => "CENTER",
-            MainAlign::Max => "MAX",
-            MainAlign::SpaceBetween => "SPACE_BETWEEN",
-            MainAlign::SpaceAround => "SPACE_AROUND",
-            MainAlign::SpaceEvenly => "SPACE_EVENLY",
-        };
-        let cross = match l.cross_align {
-            CrossAlign::Min => "MIN",
-            CrossAlign::Center => "CENTER",
-            CrossAlign::Max => "MAX",
-            CrossAlign::Baseline => "BASELINE",
-        };
-        // The main axis is the width for horizontal and grid layouts.
-        let (main_hug, cross_hug) = {
-            let (h, v) = (n.child_layout.sizing_h == Sizing::Hug, n.child_layout.sizing_v == Sizing::Hug);
-            if l.mode == LayoutMode::Vertical { (v, h) } else { (h, v) }
-        };
-        let size = |hug: bool| e(if hug { "RESIZE_TO_FIT" } else { "FIXED" });
-        f.extend([
-            ("stackMode", e(mode)),
-            ("stackWrap", e(if l.wrap { "WRAP" } else { "NO_WRAP" })),
-            ("stackHorizontalPadding", fl(left)),
-            ("stackVerticalPadding", fl(top)),
-            ("stackPaddingRight", fl(right)),
-            ("stackPaddingBottom", fl(bottom)),
-            ("stackPrimaryAlignItems", e(main)),
-            ("stackCounterAlignItems", e(cross)),
-            ("stackPrimarySizing", size(main_hug)),
-            ("stackCounterSizing", size(cross_hug)),
-            ("bordersTakeSpace", b(l.strokes_included)),
-            ("stackReverseZIndex", b(l.reverse_z)),
-        ]);
-        if grid {
-            // Instance layers share their main layer's track ids, so unchanged tracks and the cells
-            // their layers sit in still match.
-            let key = self.main_layer(n.id);
-            let (want_c, want_r) = (l.grid_columns.min(1000) as usize, l.grid_rows.min(1000) as usize);
-            let (cols, rows) = match self.tracks.get(&key) {
-                Some((c, r)) if (c.len(), r.len()) == (want_c, want_r) => (c.clone(), r.clone()),
-                _ => ((0..want_c).map(|_| self.next_aux()).collect(), (0..want_r).map(|_| self.next_aux()).collect()),
-            };
-            let map = |ids: &[u32]| {
-                o(vec![(
-                    "entries",
-                    arr(ids.iter().enumerate().map(|(i, t)| o(vec![("id", guid(AUX, *t)), ("position", s(&position(i)))])).collect()),
-                )])
-            };
-            f.extend([("gridColumnGap", fl(l.gap)), ("gridRowGap", fl(l.cross_gap)), ("gridColumns", map(&cols)), ("gridRows", map(&rows))]);
-            if l.column_tracks.iter().chain(&l.row_tracks).any(|t| t.sizing != Sizing::Fill) {
-                self.warn("grid tracks of fixed or content size were written as equal tracks");
-            }
-            self.tracks.insert(key, (cols, rows));
-        } else {
-            let spread = l.content_align == ContentAlign::SpaceBetween;
-            f.extend([
-                ("stackSpacing", fl(l.gap)),
-                ("stackCounterSpacing", fl(l.cross_gap)),
-                ("stackCounterAlignContent", e(if spread { "SPACE_BETWEEN" } else { "AUTO" })),
-            ]);
-        }
-    }
-
-    /// How a layer sizes and sits in its auto layout parent. Min/max sizes are the layer's own
-    /// and are written whatever its parent is.
-    fn child_layout(&mut self, n: &Node, parent: Option<&Node>, f: &mut Fields) {
-        let cl = &n.child_layout;
-        for (key, w, h) in [("minSize", cl.min_w, cl.min_h), ("maxSize", cl.max_w, cl.max_h)] {
-            if w.is_some() || h.is_some() {
-                f.push((key, o(vec![("value", xy(w.unwrap_or(0.0), h.unwrap_or(0.0)))])));
-            }
-        }
-        let Some(pl) = parent.and_then(|p| p.layout.as_ref()) else { return };
-        let (fill_h, fill_v) = (cl.sizing_h == Sizing::Fill, cl.sizing_v == Sizing::Fill);
-        let (grow, stretch) = if pl.mode == LayoutMode::Vertical { (fill_v, fill_h) } else { (fill_h, fill_v) };
-        if grow {
-            f.push(("stackChildPrimaryGrow", fl(1.0)));
-        }
-        if stretch {
-            f.push(("stackChildAlignSelf", e("STRETCH")));
-        }
-        if cl.absolute {
-            f.push(("stackPositioning", e("ABSOLUTE")));
-        }
-        if pl.mode == LayoutMode::Grid
-            && let Some((cols, rows)) = parent.and_then(|p| self.tracks.get(&self.main_layer(p.id)))
-        {
-            let anchor = |ids: &[u32], i: Option<u32>| i.and_then(|i| ids.get(i as usize)).map(|t| guid(AUX, *t));
-            let (c, r) = (anchor(cols, cl.grid_column), anchor(rows, cl.grid_row));
-            f.extend(c.map(|g| ("gridColumnAnchor", g)));
-            f.extend(r.map(|g| ("gridRowAnchor", g)));
-            if cl.grid_column_span > 0 {
-                f.push(("gridColumnSpan", int(cl.grid_column_span.into())));
-            }
-            if cl.grid_row_span > 0 {
-                f.push(("gridRowSpan", int(cl.grid_row_span.into())));
-            }
-        }
-    }
-
-    /// Text: its style, box settings, and characters with their styled runs. `fills`: the layer's
-    /// (what runs without fills of their own show when the text's own style sets other fills).
-    fn text(&mut self, td: &TextData, fills: &[Paint], f: &mut Fields) {
-        style_fields(&td.style, f);
-        let (ha, va) = (
-            match td.align_h {
-                TextAlignH::Left => "LEFT",
-                TextAlignH::Center => "CENTER",
-                TextAlignH::Right => "RIGHT",
-                TextAlignH::Justified => "JUSTIFIED",
-            },
-            match td.align_v {
-                TextAlignV::Top => "TOP",
-                TextAlignV::Middle => "CENTER",
-                TextAlignV::Bottom => "BOTTOM",
-            },
-        );
-        let resize = match td.auto_resize {
-            TextAutoResize::WidthAndHeight => "WIDTH_AND_HEIGHT",
-            TextAutoResize::Height => "HEIGHT",
-            TextAutoResize::None | TextAutoResize::Truncate => "NONE",
-        };
-        f.extend([
-            ("textAlignHorizontal", e(ha)),
-            ("textAlignVertical", e(va)),
-            ("textAutoResize", e(resize)),
-            ("paragraphSpacing", fl(td.paragraph_spacing)),
-            ("paragraphIndent", fl(td.paragraph_indent)),
-            ("autoRename", b(false)),
-            ("fontVariantCommonLigatures", b(true)),
-            ("fontVariantContextualLigatures", b(true)),
-            ("fontVersion", s("")),
-            ("textUserLayoutVersion", u(5)),
-            ("textExplicitLayoutVersion", u(1)),
-            ("textBidiVersion", u(1)),
-            ("textTracking", fl(0.0)),
-            ("textDecorationSkipInk", b(true)),
-            ("emojiImageSet", e("APPLE")),
-        ]);
-        if td.auto_resize == TextAutoResize::Truncate {
-            f.push(("textTruncation", e("ENDING")));
-        }
-        if td.max_lines > 0 {
-            f.push(("maxLines", int(td.max_lines.into())));
-        }
-        // Styles per UTF-16 unit: 0 for the base style, else an entry of the override table.
-        if td.char_count() > MAX_CHARS {
-            self.warn("text longer than 1,048,576 characters was cut");
-        }
-        let spans = td.spans();
-        let mut table: Vec<&TextStyle> = Vec::new();
-        let mut span_ids = Vec::with_capacity(spans.len());
-        for (_, _, st) in &spans {
-            span_ids.push(if **st == td.style {
-                0
-            } else {
-                let i = table.iter().position(|t| *t == *st).unwrap_or_else(|| {
-                    table.push(st);
-                    table.len() - 1
-                });
-                i as u32 + 1
-            });
-        }
-        let mut chars = String::new();
-        let mut ids: Vec<Kv> = Vec::new();
-        let mut span = 0;
-        for (i, ch) in td.characters.chars().take(MAX_CHARS).enumerate() {
-            while spans.get(span).is_some_and(|sp| i >= sp.1) {
-                span += 1;
-            }
-            // NULs can't be stored in a string.
-            if ch == '\0' {
-                continue;
-            }
-            chars.push(ch);
-            let id = span_ids.get(span).copied().unwrap_or(0);
-            ids.extend((0..ch.len_utf16()).map(|_| u(id)));
-        }
-        let mut data: Fields = vec![("characters", Kv::Str(chars))];
-        if !table.is_empty() {
-            let entries = table
-                .iter()
-                .zip(1u32..)
-                .map(|(st, id)| {
-                    let mut ef: Fields = vec![("styleID", u(id))];
-                    style_fields(st, &mut ef);
-                    // An empty link clears the text's own (a missing one would inherit it).
-                    if st.link.is_none() && td.style.link.is_some() {
-                        ef.push(("hyperlink", o(vec![("url", s(""))])));
-                    }
-                    if let Some(p) = st.fills.as_deref().or(td.style.fills.as_ref().map(|_| fills)) {
-                        ef.push(("fillPaints", self.paints(p, true, &Bound::default())));
-                    }
-                    o(ef)
-                })
-                .collect();
-            data.extend([("characterStyleIDs", arr(ids)), ("styleOverrideTable", arr(entries))]);
-        }
-        let lists: Vec<ListStyle> = (0..td.paragraph_count()).map(|p| td.para_list(p).list).collect();
-        // One entry per paragraph, each with every field a reader expects.
-        let line = |(i, l): (usize, &ListStyle)| {
-            let ty = match l {
-                ListStyle::None => "PLAIN",
-                ListStyle::Numbered => "ORDERED_LIST",
-                ListStyle::Bulleted => "UNORDERED_LIST",
-            };
-            let listed = *l != ListStyle::None;
-            let first = listed && (i == 0 || lists.get(i - 1) != Some(l));
-            o(vec![
-                ("lineType", e(ty)),
-                ("styleId", int(0)),
-                ("indentationLevel", int(i64::from(listed))),
-                ("sourceDirectionality", e("AUTO")),
-                ("listStartOffset", int(0)),
-                ("isFirstLineOfList", b(first)),
-            ])
-        };
-        data.push(("lines", arr(lists.iter().enumerate().map(line).collect())));
-        f.push(("textData", o(data)));
-        if (0..td.paragraph_count()).any(|p| td.para_list(p).indent > 0) {
-            self.warn("nested list levels were written as the first level");
-        }
-        let styles = std::iter::once(&td.style).chain(td.runs.iter().map(|r| &r.style));
-        if styles.clone().any(|st| st.decoration_look.is_some() || !st.variations.is_empty()) {
-            self.warn("text decoration looks and variable font settings were left out");
-        }
-        if td.path.is_some() {
-            self.warn("text on a path was written as plain text");
-        }
-        if td.list_spacing != 0.0 || td.hanging_punctuation || td.hanging_list || td.leading_trim != Default::default() || !td.features.is_empty() {
-            self.warn("list spacing, hanging punctuation, leading trim and OpenType features were left out");
-        }
-    }
-
-    /// The editable network (with per-point corner radii, handle mirroring and end caps) and,
-    /// when it has filled areas, their outline.
-    fn vector(&mut self, n: &Node, net: &VectorNetwork, f: &mut Fields) {
-        let entries: usize = net.regions.iter().flat_map(|r| &r.loops).map(Vec::len).sum();
-        if net.vertices.len() + net.segments.len() + entries > MAX_NETWORK {
-            self.warn("vector networks too large for the format were written as outlines");
-        } else {
-            // The stroke starts at the first end point and stops at the last: the layer's end caps go
-            // there (where the point has none of its own).
-            let mut degree = vec![0usize; net.vertices.len()];
-            for sg in &net.segments {
-                for i in [sg.a, sg.b] {
-                    if let Some(d) = degree.get_mut(i) {
-                        *d += 1;
-                    }
-                }
-            }
-            let ends: Vec<usize> = (0..degree.len()).filter(|i| degree.get(*i) == Some(&1)).collect();
-            let (first, last) = (ends.first().copied(), ends.last().copied());
-            let caps_differ = n.stroke.cap_start != n.stroke.cap_end || net.vertices.iter().any(|v| v.cap.is_some());
-            let mut styles: Vec<Fields> = Vec::new();
-            let mut style_of = |fields: Fields| -> u32 {
-                if fields.is_empty() {
-                    return 0;
-                }
-                let i = styles.iter().position(|x| *x == fields).unwrap_or_else(|| {
-                    styles.push(fields);
-                    styles.len() - 1
-                });
-                i as u32 + 1
-            };
-            let vertices = net
-                .vertices
-                .iter()
-                .enumerate()
-                .map(|(i, v)| {
-                    let mut st: Fields = Vec::new();
-                    if v.radius > 0.0 {
-                        st.push(("cornerRadius", fl(v.radius)));
-                    }
-                    if let Some(m) = v.mirror {
-                        st.push((
-                            "handleMirroring",
-                            e(match m {
-                                figcraft_doc::HandleMirroring::None => "NONE",
-                                figcraft_doc::HandleMirroring::Angle => "ANGLE",
-                                figcraft_doc::HandleMirroring::AngleAndLength => "ANGLE_AND_LENGTH",
-                            }),
-                        ));
-                    }
-                    let end_cap = if Some(i) == first {
-                        Some(n.stroke.cap_start)
-                    } else if Some(i) == last {
-                        Some(n.stroke.cap_end)
-                    } else {
-                        None
-                    };
-                    if let Some(c) = v.cap.or(end_cap.filter(|_| caps_differ)) {
-                        st.push(("strokeCap", e(cap_name(c))));
-                    }
-                    if let Some(j) = v.join {
-                        st.push(("strokeJoin", e(join_name(j))));
-                    }
-                    network::Vertex { style: style_of(st), x: finite(v.x), y: finite(v.y) }
-                })
-                .collect();
-            let segments = net
-                .segments
-                .iter()
-                .map(|sg| network::Segment { a: sg.a, ta: (finite(sg.ta.0), finite(sg.ta.1)), b: sg.b, tb: (finite(sg.tb.0), finite(sg.tb.1)) })
-                .collect();
-            let regions = net
-                .regions
-                .iter()
-                .map(|r| network::Region { style: 0, non_zero: r.winding == WindingRule::NonZero, loops: r.loops.clone() })
-                .collect();
-            let blob = network::encode(&network::Network { vertices, segments, regions });
-            let table = styles.into_iter().zip(1u32..).map(|(mut st, id)| {
-                st.insert(0, ("styleID", u(id)));
-                o(st)
-            });
-            let table: Vec<Kv> = table.collect();
-            if let Some(i) = self.blob(blob) {
-                f.push((
-                    "vectorData",
-                    o(vec![("vectorNetworkBlob", u(i)), ("normalizedSize", xy(n.width, n.height)), ("styleOverrideTable", arr(table))]),
-                ));
-            }
-        }
-        if !net.regions.is_empty() {
-            let winding = net.regions.first().map(|r| r.winding).unwrap_or_default();
-            if net.regions.iter().any(|r| r.winding != winding) {
-                self.warn("vectors whose filled areas use different winding rules use the first one's in their outline");
-            }
-            self.geometry("fillGeometry", &net.fill_path(), winding, f);
-        }
-    }
-
-    /// `fillGeometry` or `strokeGeometry` (`key`) from a local path.
-    fn geometry(&mut self, key: &'static str, p: &BezPath, winding: WindingRule, f: &mut Fields) {
-        if p.elements().is_empty() {
-            return;
-        }
-        if let Some(i) = self.blob(path_blob(p)) {
-            let rule = if winding == WindingRule::EvenOdd { "ODD" } else { "NONZERO" };
-            f.push((key, arr(vec![o(vec![("windingRule", e(rule)), ("commandsBlob", u(i)), ("styleID", u(0))])])));
-        }
-    }
-
-    /// `strokeGeometry`, the outline of a plain stroke: a ring around boxes and whole ellipses, the
-    /// widened path of other centred strokes. Dashed, per-side and other strokes get none (a reader
-    /// builds theirs from the stroke settings).
-    fn stroke_geometry(&mut self, n: &Node, boxy: bool, f: &mut Fields) {
-        let sp = &n.stroke;
-        let (w, h, weight) = (n.width, n.height, sp.weight);
-        let plain = n.strokes.iter().any(|p| p.visible) && sp.dashes.is_empty() && sp.sides.is_none() && sp.profile().is_none() && sp.brush.is_none();
-        if !plain || !(weight.is_finite() && weight > 0.0 && w.is_finite() && h.is_finite()) {
-            return;
-        }
-        let whole = matches!(n.kind, NodeKind::Ellipse { sweep, inner, .. } if inner == 0.0 && sweep.abs() >= std::f64::consts::TAU - 1e-9);
-        if boxy || whole {
-            let (out, inset) = match sp.align {
-                StrokeAlign::Inside => (0.0, weight),
-                StrokeAlign::Center => (weight / 2.0, weight / 2.0),
-                StrokeAlign::Outside => (weight, 0.0),
-            };
-            // The shape grown by `d` (shrunk when negative), or nothing when it shrinks away.
-            let grown = |d: f64| -> Option<BezPath> {
-                let (gw, gh) = (w + 2.0 * d, h + 2.0 * d);
-                if gw <= 0.0 || gh <= 0.0 {
-                    return None;
-                }
-                let mut p = if whole {
-                    figcraft_doc::geom::ellipse(gw, gh, 0.0, std::f64::consts::TAU, 0.0)
-                } else {
-                    let radii = n.corners.radii.map(|r| if r > 0.0 { (r + d).max(0.0) } else { 0.0 });
-                    figcraft_doc::geom::rounded_rect(gw, gh, radii, n.corners.smoothing)
-                };
-                p.apply_affine(Affine::translate((-d, -d)));
-                Some(p)
-            };
-            let Some(mut ring) = grown(out) else { return };
-            ring.extend(grown(-inset).iter().flat_map(|p| p.elements().iter().copied()));
-            self.geometry("strokeGeometry", &ring, WindingRule::EvenOdd, f);
-        } else if sp.align == StrokeAlign::Center {
-            let path = match &n.kind {
-                NodeKind::Vector { network } => Some(network.stroke_path()),
-                NodeKind::Text(_) => None,
-                _ => figcraft_doc::geometry::shape_path(n),
-            };
-            let Some(path) = path.filter(|p| !p.elements().is_empty()) else { return };
-            use figcraft_doc::geom::kurbo::{Cap, Join, Stroke, StrokeOpts, stroke};
-            let cap = match sp.cap_start {
-                StrokeCap::Round => Cap::Round,
-                StrokeCap::Square => Cap::Square,
-                _ => Cap::Butt,
-            };
-            let join = match sp.join {
-                StrokeJoin::Miter => Join::Miter,
-                StrokeJoin::Bevel => Join::Bevel,
-                StrokeJoin::Round => Join::Round,
-            };
-            let limit = if sp.miter_limit.is_finite() { sp.miter_limit.max(1.0) } else { 4.0 };
-            let style = Stroke::new(weight).with_caps(cap).with_join(join).with_miter_limit(limit);
-            self.geometry("strokeGeometry", &stroke(path, &style, &StrokeOpts::default(), 0.05), WindingRule::NonZero, f);
-        }
-    }
-
-    /// Add a blob; its index (`None` once the blobs would make the file too large).
-    fn blob(&mut self, bytes: Vec<u8>) -> Option<u32> {
-        if let Some(i) = self.blobs.get(&bytes) {
-            return Some(*i);
-        }
-        self.blob_bytes += bytes.len() as u64;
-        if self.blob_bytes > MAX_CANVAS {
-            self.warn("vector data too large for the format was left out");
-            return None;
-        }
-        let i = u32::try_from(self.blobs.len()).ok()?;
-        self.blobs.insert(bytes, i);
-        Some(i)
-    }
-
-    /// A component property definition (variant properties are implied by the variants' names).
-    fn prop_def(&mut self, name: &str, d: &PropDef) -> Option<Kv<'static>> {
-        let ty = prop_type(d)?;
-        let id = *self.defs.get(&(name.to_string(), ty))?;
-        let value = match d {
-            PropDef::Boolean { default } => o(vec![("boolValue", b(*default))]),
-            PropDef::Text { default } => o(vec![("textValue", o(vec![("characters", s(default))]))]),
-            PropDef::InstanceSwap { default, preferred } => {
-                if !preferred.is_empty() {
-                    self.warn("preferred values of instance swap properties were left out");
-                }
-                o(vec![("guidValue", self.guid_of(*default)?)])
-            }
-            PropDef::Variant { .. } | PropDef::Slot { .. } => return None,
-        };
-        Some(o(vec![("id", guid(AUX, id)), ("name", s(name)), ("initialValue", value), ("type", e(ty))]))
-    }
-
-    /// Which property controls a layer's `field`.
-    fn prop_ref(&mut self, field: &str, prop: &str) -> Option<Kv<'static>> {
-        let (var_field, ty, resolved) = match field {
-            "visible" => ("VISIBLE", "BOOL", "BOOLEAN"),
-            "characters" => ("TEXT_DATA", "TEXT", "TEXT_DATA"),
-            "mainComponent" => ("OVERRIDDEN_SYMBOL_ID", "INSTANCE_SWAP", "SYMBOL_ID"),
-            _ => {
-                self.warn("slot layers were written as plain layers");
-                return None;
-            }
-        };
-        let id = *self.defs.get(&(prop.to_string(), ty))?;
-        let data = o(vec![
-            ("value", o(vec![("propRefValue", o(vec![("defId", guid(AUX, id))]))])),
-            ("dataType", e("PROP_REF")),
-            ("resolvedDataType", e(resolved)),
-        ]);
-        Some(o(vec![("variableData", data), ("variableField", e(var_field))]))
-    }
-
-    /// An instance: its main, the fields it and its layers override, the size, place and outline
-    /// its layers get from that (derived data), its property values. `f`: its own fields so far.
-    fn instance(&mut self, n: &Node, main: NodeId, props: &BTreeMap<String, Value>, f: &mut Fields) {
-        const OWN: [&str; 7] = ["guid", "phase", "parentIndex", "type", "transform", "fillGeometry", "strokeGeometry"];
-        let doc = self.doc;
-        let (Some(m), Some(symbol)) = (doc.node(main), self.guid_of(main)) else { return };
-        // What the instance itself changes from its main (its size, its paints, …) is an override
-        // addressed by the main's id: a reader takes everything else from the main. Where it sits
-        // is its own.
-        let mut root_theirs = Vec::new();
-        self.layer(m, m.parent.and_then(|p| doc.node(p)), &mut root_theirs, true);
-        root_theirs.retain(|(k, _)| !OWN.contains(k));
-        // An instance is named after its component (the set, for a variant) until renamed.
-        let set = m.parent.and_then(|p| doc.node(p)).filter(|p| matches!(p.kind, NodeKind::ComponentSet { .. }));
-        let named = set.is_none_or(|s| s.name != n.name);
-        let root_mine: Fields = f.iter().filter(|(k, _)| !OWN.contains(k) && (named || *k != "name")).cloned().collect();
-        // Each layer below: its id path, the fields that differ from the main's layer, that layer's
-        // fields, and the component a nested instance was swapped for.
-        struct Row {
-            path: Kv<'static>,
-            changed: Fields,
-            theirs: Fields,
-            nested: bool,
-            swap: Option<Kv<'static>>,
-        }
-        let mut rows: Vec<Row> = Vec::new();
-        let mut stack: Vec<(NodeId, NodeId)> = n.children.iter().rev().map(|c| (*c, n.id)).collect();
-        let mut seen = 0usize;
-        while let Some((id, parent)) = stack.pop() {
-            let Some(d) = doc.node(id) else { continue };
-            seen += 1;
-            if seen > MAX_NODES {
-                break;
-            }
-            stack.extend(d.children.iter().rev().map(|c| (*c, id)));
-            let path = self.layer_path(d, n.id, main, 0);
-            let guids: Option<Vec<Kv>> = path.and_then(|p| p.iter().map(|x| self.guid_of(*x)).collect());
-            let (Some(guids), Some(src)) = (guids, d.source.and_then(|src| doc.node(src))) else {
-                self.warn("instance layers that don't come from their main component were left out");
-                continue;
-            };
-            let (mut mine, mut theirs) = (Vec::new(), Vec::new());
-            self.layer(d, doc.node(parent), &mut mine, true);
-            self.layer(src, src.parent.and_then(|p| doc.node(p)), &mut theirs, true);
-            // A nested instance swapped for another component.
-            let swap = match (&d.kind, &src.kind) {
-                (NodeKind::Instance { component, .. }, NodeKind::Instance { component: was, .. }) if component == was => None,
-                (NodeKind::Instance { component, .. }, _) => self.guid_of(*component),
-                _ => None,
-            };
-            let nested = matches!(d.kind, NodeKind::Instance { .. });
-            rows.push(Row { path: o(vec![("guids", arr(guids))]), changed: changed(mine, &theirs), theirs, nested, swap });
-        }
-        // An instance scaled as a whole (the Scale tool) is `factor` times its main in every length:
-        // sizes, places and stroke weights, its own and its layers'. A resized one keeps its weights.
-        let field = |fields: &Fields, key: &str| fields.iter().find(|(k, _)| *k == key).map(|(_, v)| v.clone());
-        let factor = Some(n.width / m.width).filter(|k| k.is_finite() && *k > 0.0 && (k - 1.0).abs() > 1e-6).filter(|k| {
-            let grown = |mine: &Fields, theirs: &Fields| {
-                let weight = field(theirs, "strokeWeight").and_then(|w| w.f64()).unwrap_or(0.0);
-                (weight == 0.0 || field(mine, "strokeWeight").is_some_and(|w| scaled(&w, &fl(weight), *k, 0.0)))
-                    && field(mine, "size").zip(field(theirs, "size")).is_some_and(|(a, b)| scaled(&a, &b, *k, 1.0))
-                    && field(mine, "transform").zip(field(theirs, "transform")).is_none_or(|(a, b)| scaled(&a, &b, *k, 1.0))
-            };
-            (n.height / m.height - k).abs() <= 1e-6 * k.max(1.0)
-                && grown(&changed(root_mine.clone(), &root_theirs), &root_theirs)
-                && rows.iter().all(|r| grown(&r.changed, &r.theirs))
-        });
-        // What follows from the overrides goes with the derived data: a layer's size, place and
-        // outline (a vector's network is the main's, drawn at the layer's size), the colours its
-        // variables give here, and what the scale factor makes of the main's values.
-        let follows = |k: &str, v: &Kv<'static>, theirs: &Fields| {
-            ["size", "transform", "fillGeometry", "strokeGeometry", "vectorData"].contains(&k)
-                || resolved_alike(k, v, theirs)
-                || factor.is_some_and(|x| field(theirs, k).is_some_and(|t| scaled(v, &t, x, 0.0)))
-        };
-        let mut overrides = Vec::new();
-        let mut derived = Vec::new();
-        let mut of: Fields = vec![("guidPath", o(vec![("guids", arr(vec![symbol.clone()]))]))];
-        of.extend(changed(root_mine, &root_theirs).into_iter().filter(|(k, v)| *k == "size" || !follows(k, v, &root_theirs)));
-        if of.len() > 1 {
-            overrides.push(o(of));
-        }
-        for r in rows {
-            let (mut of, mut df): (Fields, Fields) = (vec![("guidPath", r.path.clone())], vec![("guidPath", r.path)]);
-            for (k, v) in r.changed {
-                let follows = follows(k, &v, &r.theirs);
-                // A nested instance's size is its own to set.
-                if follows && r.nested && k == "size" {
-                    of.push((k, v.clone()));
-                }
-                if follows { &mut df } else { &mut of }.push((k, v));
-            }
-            if df.len() > 1 {
-                derived.push(o(df));
-            }
-            of.extend(r.swap.map(|g| ("overriddenSymbolID", g)));
-            if of.len() > 1 {
-                overrides.push(o(of));
-            }
-        }
-        f.push(("symbolData", o(vec![("symbolID", symbol), ("symbolOverrides", arr(overrides)), ("uniformScaleFactor", fl(factor.unwrap_or(1.0)))])));
-        if !derived.is_empty() {
-            f.push(("derivedSymbolData", arr(derived)));
-        }
-        let mut assignments = Vec::new();
-        for (name, v) in props {
-            let (ty, value) = match v {
-                Value::Bool(x) => ("BOOL", Some(o(vec![("boolValue", b(*x))]))),
-                Value::String(t) => ("TEXT", Some(o(vec![("textValue", o(vec![("characters", s(t))]))]))),
-                Value::Number(c) => ("INSTANCE_SWAP", c.as_u64().and_then(|c| self.guid_of(NodeId(c))).map(|g| o(vec![("guidValue", g)]))),
-                _ => continue,
-            };
-            // Variant values have no definition of their own: the main they show says them.
-            if let (Some(&id), Some(value)) = (self.defs.get(&(name.clone(), ty)), value) {
-                assignments.push(o(vec![("defID", guid(AUX, id)), ("value", value)]));
-            }
-        }
-        if !assignments.is_empty() {
-            f.push(("componentPropAssignments", arr(assignments)));
-        }
-        if n.children.iter().filter_map(|c| doc.node(*c)).any(|c| c.source.is_none()) {
-            self.warn("instance layers that don't come from their main component were left out");
-        }
-    }
-
-    /// The main component layer an instance or instance layer mirrors (through nested instances),
-    /// or `id` itself.
-    fn main_layer(&self, id: NodeId) -> NodeId {
-        let mut cur = id;
-        for _ in 0..32 {
-            let next = self.doc.node(cur).and_then(|n| match &n.kind {
-                _ if n.source.is_some() => n.source,
-                NodeKind::Instance { component, .. } => Some(*component),
-                _ => None,
-            });
-            match next.filter(|s| self.doc.contains(*s)) {
-                Some(s) => cur = s,
-                None => break,
-            }
-        }
-        cur
-    }
-
-    /// The id path of layer `d` of instance `inst` (of `main`): that of the main's layer it mirrors,
-    /// or, inside a nested instance swapped for another component, the path of that instance and
-    /// then the one inside its new main.
-    fn layer_path(&self, d: &Node, inst: NodeId, main: NodeId, depth: usize) -> Option<Vec<NodeId>> {
-        let src = d.source?;
-        if let Some(p) = self.path_in(src, main, 0) {
-            return Some(p);
-        }
-        if depth > 32 {
-            return None;
-        }
-        let doc = self.doc;
-        let nested = doc.ancestors(d.id).into_iter().take_while(|a| *a != inst).filter_map(|a| doc.node(a)).find_map(|a| match &a.kind {
-            NodeKind::Instance { component, .. } => Some((a, *component)),
-            _ => None,
-        });
-        let (outer, component) = nested?;
-        let mut p = self.layer_path(outer, inst, main, depth + 1)?;
-        p.extend(self.path_in(src, component, 0)?);
-        Some(p)
-    }
-
-    /// The id path of layer `s` inside component `comp`: `s` itself, or through the nested
-    /// instance it is expanded in, then on inside that instance's main.
-    fn path_in(&self, s: NodeId, comp: NodeId, depth: usize) -> Option<Vec<NodeId>> {
-        if depth > 32 {
-            return None;
-        }
-        let doc = self.doc;
-        let up = doc.ancestors(s);
-        let below: Vec<NodeId> = up.iter().take_while(|a| **a != comp).copied().collect();
-        if below.len() == up.len() {
-            return None;
-        }
-        // The outermost nested instance between the component and the layer.
-        match below.iter().rev().find_map(|a| match doc.node(*a).map(|n| &n.kind) {
-            Some(NodeKind::Instance { component, .. }) => Some((*a, *component)),
-            _ => None,
-        }) {
-            None => Some(vec![s]),
-            Some((inst, main)) => {
-                let mut p = vec![inst];
-                p.extend(self.path_in(doc.node(s)?.source?, main, depth + 1)?);
-                Some(p)
-            }
-        }
-    }
-
-    /// Interactions, scrolling, flow starts and the overlay settings this layer is opened with.
-    fn prototype(&mut self, n: &Node, f: &mut Fields) {
-        let list: Vec<Kv> = n.interactions.iter().filter_map(|it| self.interaction(it)).collect();
-        if !list.is_empty() {
-            f.push(("prototypeInteractions", arr(list)));
-        }
-        let dir = match n.overflow {
-            Overflow::None => None,
-            Overflow::Horizontal => Some("HORIZONTAL"),
-            Overflow::Vertical => Some("VERTICAL"),
-            Overflow::Both => Some("BOTH"),
-        };
-        f.extend(dir.map(|d| ("scrollDirection", e(d))));
-        let behavior = match n.scroll_position {
-            ScrollPosition::Scrolls => None,
-            ScrollPosition::Fixed => Some("FIXED_WHEN_CHILD_OF_SCROLLING_FRAME"),
-            ScrollPosition::Sticky => Some("STICKY_SCROLLS"),
-        };
-        f.extend(behavior.map(|x| ("scrollBehavior", e(x))));
-        if let Some((i, name)) = self.starts.get(&n.id) {
-            f.push(("prototypeStartingPoint", o(vec![("name", s(name)), ("position", s(&position(*i)))])));
-        }
-        if let Some(ov) = self.overlays.get(&n.id) {
-            const POSITIONS: [&str; 8] = ["CENTER", "TOP_LEFT", "TOP_CENTER", "TOP_RIGHT", "BOTTOM_LEFT", "BOTTOM_CENTER", "BOTTOM_RIGHT", "MANUAL"];
-            let pos = POSITIONS.into_iter().find(|p| crate::rest::proto::overlay_position(p) == Some(ov.position)).unwrap_or("CENTER");
-            let bg = match ov.background {
-                Some(c) => o(vec![("backgroundType", e("SOLID_COLOR")), ("backgroundColor", color(c))]),
-                None => o(vec![("backgroundType", e("NONE"))]),
-            };
-            f.extend([
-                ("overlayPositionType", e(pos)),
-                ("overlayBackgroundInteraction", e(if ov.close_on_outside { "CLOSE_ON_CLICK_OUTSIDE" } else { "NONE" })),
-                ("overlayBackgroundAppearance", bg),
-            ]);
-        }
-    }
-
-    fn interaction(&mut self, it: &Interaction) -> Option<Kv<'static>> {
-        let mut event: Fields = Vec::new();
-        let ty = match &it.trigger {
-            Trigger::OnClick => "ON_CLICK",
-            Trigger::OnHover => "ON_HOVER",
-            Trigger::OnPress => "ON_PRESS",
-            Trigger::OnDrag => "DRAG",
-            Trigger::MouseEnter => "MOUSE_IN",
-            Trigger::MouseLeave => "MOUSE_OUT",
-            Trigger::MouseDown => "MOUSE_DOWN",
-            Trigger::MouseUp => "MOUSE_UP",
-            Trigger::AfterDelay { ms } => {
-                event.push(("transitionTimeout", fl(f64::from(*ms) / 1000.0)));
-                "AFTER_TIMEOUT"
-            }
-            Trigger::KeyPress { key } => {
-                let Some((codes, pad)) = key_codes(key) else {
-                    self.warn("key triggers on keys the format has no code for were left out");
-                    return None;
-                };
-                let device = e(if pad { "UNKNOWN_CONTROLLER" } else { "KEYBOARD" });
-                event.push(("keyTrigger", o(vec![("keyCodes", arr(codes.into_iter().map(int).collect())), ("triggerDevice", device)])));
-                "ON_KEY_DOWN"
-            }
-        };
-        // A mouse trigger's delay is the event's timeout.
-        if it.delay_secs() > 0.0 {
-            event.push(("transitionTimeout", fl(it.delay_secs())));
-        }
-        event.insert(0, ("interactionType", e(ty)));
-        let actions: Vec<Kv> = it.actions.iter().filter_map(|a| self.action(a, it)).collect();
-        (!actions.is_empty()).then(|| o(vec![("event", o(event)), ("actions", arr(actions))]))
-    }
-
-    fn action(&mut self, a: &Action, it: &Interaction) -> Option<Kv<'static>> {
-        let node = |x: &mut Self, dest: &NodeId, nav: &'static str| -> Option<Kv<'static>> {
-            let Some(g) = x.guid_of(*dest) else {
-                x.warn("prototype actions whose destination isn't written were left out");
-                return None;
-            };
-            let mut f: Fields = vec![("transitionNodeID", g), ("connectionType", e("INTERNAL_NODE")), ("navigationType", e(nav))];
-            x.transition(it, &mut f);
-            Some(o(f))
-        };
-        let plain = |ty: &'static str| Some(o(vec![("connectionType", e(ty))]));
-        match a {
-            Action::Navigate { dest, preserve_scroll } => {
-                let mut act = node(self, dest, "NAVIGATE")?;
-                if let Kv::Object(f) = &mut act {
-                    f.push(("transitionPreserveScroll", b(*preserve_scroll)));
-                }
-                Some(act)
-            }
-            Action::OpenOverlay { dest, position, offset, .. } => {
-                let mut act = node(self, dest, "OVERLAY")?;
-                if let (Kv::Object(f), OverlayPosition::Manual, Some([x, y])) = (&mut act, position, offset) {
-                    f.push(("overlayRelativePosition", o(vec![("x", fl(*x)), ("y", fl(*y))])));
-                }
-                Some(act)
-            }
-            Action::SwapOverlay { dest } => node(self, dest, "SWAP"),
-            Action::ChangeTo { dest } => node(self, dest, "SWAP_STATE"),
-            Action::ScrollTo { dest, offset } => {
-                if *offset != [0.0, 0.0] {
-                    self.warn("scroll-to offsets were left out");
-                }
-                node(self, dest, "SCROLL_TO")
-            }
-            Action::Back => plain("BACK"),
-            Action::CloseOverlay => plain("CLOSE"),
-            Action::OpenUrl { url } => Some(o(vec![("connectionType", e("URL")), ("connectionURL", s(url))])),
-            Action::SetVariable { .. } | Action::SetVariableMode { .. } | Action::Conditional { .. } => {
-                self.warn("variable and conditional prototype actions were left out");
-                None
-            }
-        }
-    }
-
-    /// An interaction's transition on one of its actions.
-    fn transition(&mut self, it: &Interaction, f: &mut Fields) {
-        let side_from = |d: Direction, l: &'static str, r: &'static str, t: &'static str, bo: &'static str| match d {
-            // The direction names where the incoming screen moves: it comes from the other side.
-            Direction::Right => l,
-            Direction::Left => r,
-            Direction::Bottom => t,
-            Direction::Top => bo,
-        };
-        let side_to = |d: Direction, l: &'static str, r: &'static str, t: &'static str, bo: &'static str| match d {
-            Direction::Left => l,
-            Direction::Right => r,
-            Direction::Top => t,
-            Direction::Bottom => bo,
-        };
-        let ty = match it.transition {
-            Transition::Instant => "INSTANT_TRANSITION",
-            Transition::Dissolve => "DISSOLVE",
-            Transition::SmartAnimate => "SMART_ANIMATE",
-            Transition::SlideIn { direction } => side_from(direction, "SLIDE_FROM_LEFT", "SLIDE_FROM_RIGHT", "SLIDE_FROM_TOP", "SLIDE_FROM_BOTTOM"),
-            Transition::Push { direction } => side_from(direction, "PUSH_FROM_LEFT", "PUSH_FROM_RIGHT", "PUSH_FROM_TOP", "PUSH_FROM_BOTTOM"),
-            Transition::MoveIn { direction } => side_from(direction, "MOVE_FROM_LEFT", "MOVE_FROM_RIGHT", "MOVE_FROM_TOP", "MOVE_FROM_BOTTOM"),
-            Transition::SlideOut { direction } => {
-                side_to(direction, "SLIDE_OUT_TO_LEFT", "SLIDE_OUT_TO_RIGHT", "SLIDE_OUT_TO_TOP", "SLIDE_OUT_TO_BOTTOM")
-            }
-            Transition::MoveOut { direction } => side_to(direction, "MOVE_OUT_TO_LEFT", "MOVE_OUT_TO_RIGHT", "MOVE_OUT_TO_TOP", "MOVE_OUT_TO_BOTTOM"),
-        };
-        let easing = match it.easing {
-            Easing::Linear => "LINEAR",
-            Easing::EaseIn => "IN_CUBIC",
-            Easing::EaseOut => "OUT_CUBIC",
-            Easing::EaseInOut => "INOUT_CUBIC",
-            Easing::EaseInBack => "IN_BACK_CUBIC",
-            Easing::EaseOutBack => "OUT_BACK_CUBIC",
-            Easing::EaseInOutBack => "INOUT_BACK_CUBIC",
-            Easing::Gentle => "GENTLE_SPRING",
-            Easing::CustomBezier { .. } => "CUSTOM_CUBIC",
-            Easing::Quick | Easing::Bouncy | Easing::Slow | Easing::CustomSpring { .. } => {
-                self.warn("spring animations other than Gentle were written as ease out");
-                "OUT_CUBIC"
-            }
-        };
-        f.extend([("transitionType", e(ty)), ("transitionDuration", fl(f64::from(it.duration_ms) / 1000.0)), ("easingType", e(easing))]);
-        if let Easing::CustomBezier { x1, y1, x2, y2 } = it.easing {
-            f.push(("easingFunction", arr(vec![fl(x1), fl(y1), fl(x2), fl(y2)])));
-        }
-    }
 }
 
 /// The plugin id and key under which a layer written as an outline keeps what it was.
 pub(super) const STASH: (&str, &str) = ("figcraft", "stroke");
-/// Longest kept description of such a layer (bytes of JSON).
-const MAX_STASH: usize = 1 << 20;
 
-/// Whether a width profile reaches further on one side of the path than on the other.
-fn one_sided(p: &figcraft_doc::WidthProfile) -> bool {
-    p.points.iter().any(|q| q.bias.abs() > 1e-6)
+/// An image's name in the file: the SHA-1 of its bytes (lowercase hex). Paints refer to images by
+/// these 20 bytes, and readers reject other hash lengths (the document's own SHA-256 key is not
+/// used here).
+pub(super) fn sha1_hex(bytes: &[u8]) -> String {
+    sha1::Sha1::digest(bytes).iter().map(|b| format!("{b:02x}")).collect()
 }
 
-/// A shape whose stroke is wider on one side of its path, as the area that stroke paints (a vector
-/// filled with the stroke's paints), with what it was as JSON: its kind, paints and stroke. Only
-/// for shapes that show nothing but that stroke; `None` for every other layer.
-fn outlined(n: &Node) -> Option<(Node, String)> {
-    let sp = &n.stroke;
-    let shape = matches!(
-        n.kind,
-        NodeKind::Line | NodeKind::Vector { .. } | NodeKind::Ellipse { .. } | NodeKind::Polygon { .. } | NodeKind::Star { .. } | NodeKind::Rectangle
-    );
-    let shown = |paints: &[Paint]| paints.iter().any(|p| p.visible);
-    if !shape
-        || sp.brush.is_some()
-        || !sp.profile().is_some_and(one_sided)
-        || !(sp.weight.is_finite() && sp.weight > 0.0)
-        || !shown(&n.strokes)
-        || shown(&n.fills)
-    {
-        return None;
+/// A style name as readers look the face up: the standard name ([`super::style_name`]) with the
+/// compound weights spelt the way most font families name their faces ("SemiBold", "ExtraBold",
+/// "ExtraLight Italic"), except Inter, whose faces are named with a space ("Semi Bold"). A name
+/// the family doesn't have reads as a missing font, and its text isn't drawn.
+pub(super) fn face_style(family: &str, style: &str) -> String {
+    let standard = super::style_name(style);
+    if family == "Inter" || family.starts_with("Inter ") {
+        return standard;
     }
-    let path = figcraft_doc::geometry::stroke_geometry(n)?;
-    let net = match &n.kind {
-        NodeKind::Vector { network } => Some(network),
-        _ => None,
-    };
-    let area = figcraft_pathops::stroke_outline_of(&path, sp, figcraft_doc::geometry::is_closed(n), net);
-    if area.elements().is_empty() || area.elements().len() > MAX_NETWORK / 4 {
-        return None;
-    }
-    let original = serde_json::json!({"kind": n.kind, "fills": n.fills, "strokes": n.strokes, "stroke": n.stroke}).to_string();
-    if original.len() > MAX_STASH {
-        return None;
-    }
-    let mut network = VectorNetwork::from_path(&area);
-    for r in &mut network.regions {
-        r.winding = WindingRule::NonZero;
-    }
-    let mut v = n.clone();
-    v.kind = NodeKind::Vector { network };
-    v.fills = std::mem::take(&mut v.strokes);
-    v.stroke = Default::default();
-    v.styles.fill = v.styles.stroke.take();
-    // Bindings name the stroke's paints, which are the fills now: the values stay.
-    v.bound.retain(|k, _| !(k == "stroke" || k == "fill" || k.starts_with("strokes/") || k.starts_with("fills/") || k.starts_with("stroke")));
-    Some((v, original))
-}
-
-/// The number of the layer field a bound property (`VariableField`) is held in.
-fn node_field(field: &str) -> Option<u32> {
-    let name = match field {
-        "WIDTH" | "HEIGHT" => "size",
-        "MIN_WIDTH" | "MIN_HEIGHT" => "minSize",
-        "MAX_WIDTH" | "MAX_HEIGHT" => "maxSize",
-        "STACK_SPACING" => "stackSpacing",
-        "STACK_COUNTER_SPACING" => "stackCounterSpacing",
-        "STACK_PADDING_LEFT" => "stackHorizontalPadding",
-        "STACK_PADDING_TOP" => "stackVerticalPadding",
-        "STACK_PADDING_RIGHT" => "stackPaddingRight",
-        "STACK_PADDING_BOTTOM" => "stackPaddingBottom",
-        "CORNER_RADIUS" => "cornerRadius",
-        "RECTANGLE_TOP_LEFT_CORNER_RADIUS" => "rectangleTopLeftCornerRadius",
-        "RECTANGLE_TOP_RIGHT_CORNER_RADIUS" => "rectangleTopRightCornerRadius",
-        "RECTANGLE_BOTTOM_LEFT_CORNER_RADIUS" => "rectangleBottomLeftCornerRadius",
-        "RECTANGLE_BOTTOM_RIGHT_CORNER_RADIUS" => "rectangleBottomRightCornerRadius",
-        "OPACITY" => "opacity",
-        "VISIBLE" => "visible",
-        "TEXT_DATA" => "textData",
-        "STROKE_WEIGHT" => "strokeWeight",
-        "BORDER_TOP_WEIGHT" => "borderTopWeight",
-        "BORDER_RIGHT_WEIGHT" => "borderRightWeight",
-        "BORDER_BOTTOM_WEIGHT" => "borderBottomWeight",
-        "BORDER_LEFT_WEIGHT" => "borderLeftWeight",
-        "FONT_SIZE" => "fontSize",
-        "FONT_FAMILY" | "FONT_STYLE" => "fontName",
-        "LETTER_SPACING" => "letterSpacing",
-        "LINE_HEIGHT" => "lineHeight",
-        "PARAGRAPH_SPACING" => "paragraphSpacing",
-        "PARAGRAPH_INDENT" => "paragraphIndent",
-        _ => return None,
-    };
-    // The numbers are the schema's.
-    let layer = SCHEMA.lines().find(|l| l.starts_with("message NodeChange "))?;
-    layer.split(", ").find_map(|f| f.rsplit_once(' ')?.1.strip_prefix(name)?.strip_prefix('=')?.parse().ok())
-}
-
-/// Whether `a` is `b` with its lengths scaled by `k`: every number is `k` times the other's (within
-/// `slack`, for sizes that snap to whole pixels) or the same, and the rest is equal.
-fn scaled(a: &Kv<'static>, b: &Kv<'static>, k: f64, slack: f64) -> bool {
-    match (a, b) {
-        (Kv::Float(x), Kv::Float(y)) => {
-            let (x, y) = (f64::from(*x), f64::from(*y));
-            x == y || (x - y * k).abs() <= slack + 1e-3 * x.abs().max(1.0)
-        }
-        (Kv::Array(x), Kv::Array(y)) => x.len() == y.len() && x.iter().zip(y).all(|(p, q)| scaled(p, q, k, slack)),
-        (Kv::Object(x), Kv::Object(y)) => x.len() == y.len() && x.iter().zip(y).all(|((kp, p), (kq, q))| kp == kq && scaled(p, q, k, slack)),
-        _ => a == b,
-    }
-}
-
-/// The fields of `mine` that differ from `theirs` (a layer and the main's layer it mirrors), and
-/// the ones only `theirs` has at their empty values.
-fn changed(mine: Fields, theirs: &Fields) -> Fields {
-    let cleared: Fields = theirs.iter().filter(|(k, _)| !mine.iter().any(|(mk, _)| mk == k)).filter_map(|(k, _)| Some((*k, unset(k)?))).collect();
-    let mut out: Fields = mine.into_iter().filter(|(k, v)| !theirs.iter().any(|(tk, tv)| tk == k && tv == v)).collect();
-    out.extend(cleared);
-    out
-}
-
-/// Whether paint list `v` (field `key`) is `theirs` but for the colours variables give: two layers
-/// bound alike are the same, whatever mode each one shows.
-fn resolved_alike(key: &str, v: &Kv<'static>, theirs: &Fields) -> bool {
-    fn unresolved(v: &Kv<'static>) -> Vec<Kv<'static>> {
-        let bare = |p: &Kv<'static>| match p {
-            Kv::Object(f) if f.iter().any(|(k, _)| *k == "colorVar") => o(f.iter().filter(|(k, _)| *k != "color").cloned().collect()),
-            other => other.clone(),
-        };
-        v.list().iter().map(bare).collect()
-    }
-    matches!(key, "fillPaints" | "strokePaints") && theirs.iter().any(|(k, t)| *k == key && unresolved(t) == unresolved(v))
-}
-
-/// The format's name of a variable type.
-fn resolved_type(kind: VariableType) -> &'static str {
-    match kind {
-        VariableType::Color => "COLOR",
-        VariableType::Number => "FLOAT",
-        VariableType::String => "STRING",
-        VariableType::Boolean => "BOOLEAN",
-    }
-}
-
-/// The format's name of a variable scope (`None`: it has none).
-fn scope_name(scope: &str) -> Option<&'static str> {
-    const NAMES: [&str; 20] = [
-        "ALL_SCOPES",
-        "TEXT_CONTENT",
-        "CORNER_RADIUS",
-        "WIDTH_HEIGHT",
-        "GAP",
-        "ALL_FILLS",
-        "FRAME_FILL",
-        "SHAPE_FILL",
-        "TEXT_FILL",
-        "STROKE_FLOAT",
-        "EFFECT_FLOAT",
-        "EFFECT_COLOR",
-        "OPACITY",
-        "FONT_STYLE",
-        "FONT_FAMILY",
-        "FONT_SIZE",
-        "LINE_HEIGHT",
-        "LETTER_SPACING",
-        "PARAGRAPH_SPACING",
-        "PARAGRAPH_INDENT",
-    ];
-    if scope == "STROKE_COLOR" {
-        return Some("STROKE");
-    }
-    NAMES.into_iter().find(|n| *n == scope)
-}
-
-/// The empty value of a field only written when set (an override clears it with this).
-fn unset(key: &str) -> Option<Kv<'static>> {
-    Some(match key {
-        "styleIdForFill" | "styleIdForStrokeFill" | "styleIdForEffect" | "styleIdForGrid" | "styleIdForText" => {
-            o(vec![("guid", guid(u32::MAX, u32::MAX))])
-        }
-        "variableConsumptionMap" | "variableModeBySetMap" => o(vec![("entries", arr(Vec::new()))]),
-        "mask" | "rectangleCornerRadiiIndependent" | "borderStrokeWeightsIndependent" => b(false),
-        "effects" | "dashPattern" | "layoutGrids" | "exportSettings" | "prototypeInteractions" | "fillGeometry" | "variableWidthPoints" => {
-            arr(Vec::new())
-        }
-        "cornerSmoothing" | "stackChildPrimaryGrow" => fl(0.0),
-        "stackMode" => e("NONE"),
-        "stackChildAlignSelf" | "stackPositioning" => e("AUTO"),
-        "minSize" | "maxSize" => o(vec![("value", xy(0.0, 0.0))]),
-        "gridColumnSpan" | "gridRowSpan" | "maxLines" => int(0),
-        "scrollDirection" => e("NONE"),
-        "scrollBehavior" => e("SCROLLS"),
-        "parameterConsumptionMap" => o(vec![("entries", arr(Vec::new()))]),
-        "textTruncation" => e("DISABLED"),
-        "hyperlink" => o(vec![("url", s(""))]),
-        _ => return None,
-    })
-}
-
-/// The format's type of a component property (`None`: not written).
-fn prop_type(d: &PropDef) -> Option<&'static str> {
-    match d {
-        PropDef::Boolean { .. } => Some("BOOL"),
-        PropDef::Text { .. } => Some("TEXT"),
-        PropDef::InstanceSwap { .. } => Some("INSTANCE_SWAP"),
-        PropDef::Variant { .. } | PropDef::Slot { .. } => None,
-    }
-}
-
-/// The key codes of a key trigger (modifiers first), and whether it's a controller button.
-fn key_codes(key: &str) -> Option<(Vec<i64>, bool)> {
-    if let Some(i) = GAMEPAD_BUTTONS.iter().position(|g| g.eq_ignore_ascii_case(key.trim())) {
-        return Some((vec![i as i64], true));
-    }
-    let (mods, k): (KeyMods, &str) = KeyMods::split(key);
-    let code = (0..=255).find(|c| crate::rest::proto::key_name(f64::from(*c)).is_some_and(|n| n.eq_ignore_ascii_case(k)))?;
-    let mut codes: Vec<i64> = [(mods.shift, 16), (mods.ctrl, 17), (mods.alt, 18), (mods.cmd, 91)].into_iter().filter(|m| m.0).map(|m| m.1).collect();
-    codes.push(i64::from(code));
-    Some((codes, false))
-}
-
-/// The text style fields of a layer or of an override table entry.
-fn style_fields(st: &TextStyle, f: &mut Fields) {
-    let line_height = match st.line_height {
-        // Percent units count from the font's own line height (100 % is "auto"); a share of the
-        // font size is a raw multiplier.
-        LineHeight::Auto => o(vec![("value", fl(100.0)), ("units", e("PERCENT"))]),
-        LineHeight::Percent(p) => o(vec![("value", fl(p / 100.0)), ("units", e("RAW"))]),
-        LineHeight::Pixels(v) => o(vec![("value", fl(v)), ("units", e("PIXELS"))]),
-    };
-    let letter_spacing = match st.letter_spacing {
-        LetterSpacing::Percent(p) => o(vec![("value", fl(p)), ("units", e("PERCENT"))]),
-        LetterSpacing::Pixels(v) => o(vec![("value", fl(v)), ("units", e("PIXELS"))]),
-    };
-    let case = match st.case {
-        TextCase::Original => "ORIGINAL",
-        TextCase::Upper => "UPPER",
-        TextCase::Lower => "LOWER",
-        TextCase::Title => "TITLE",
-        TextCase::SmallCaps => "SMALL_CAPS",
-    };
-    let decoration = match st.decoration {
-        TextDecoration::None => "NONE",
-        TextDecoration::Underline => "UNDERLINE",
-        TextDecoration::Strikethrough => "STRIKETHROUGH",
-    };
-    f.extend([
-        ("fontName", o(vec![("family", s(&st.font_family)), ("style", s(&super::style_name(&st.font_style))), ("postscript", s(""))])),
-        ("fontSize", fl(st.font_size)),
-        ("lineHeight", line_height),
-        ("letterSpacing", letter_spacing),
-        ("textCase", e(case)),
-        ("textDecoration", e(decoration)),
-    ]);
-    if let Some(url) = &st.link {
-        f.push(("hyperlink", o(vec![("url", s(url))])));
-    }
-}
-
-/// Layout grid `index` of a layer, with the variables `bound` to its fields.
-fn layout_grid(g: &figcraft_doc::LayoutGrid, index: usize, bound: &Bound) -> Kv<'static> {
-    let (pattern, axis) = match g.kind {
-        GridKind::Grid => ("GRID", "X"),
-        GridKind::Columns => ("STRIPES", "X"),
-        GridKind::Rows => ("STRIPES", "Y"),
-    };
-    let align = match g.align {
-        GridAlign::Stretch => "STRETCH",
-        GridAlign::Min => "MIN",
-        GridAlign::Center => "CENTER",
-        GridAlign::Max => "MAX",
-    };
-    let mut f: Fields = vec![
-        ("type", e(align)),
-        ("axis", e(axis)),
-        ("visible", b(g.visible)),
-        ("numSections", int(g.count.into())),
-        ("offset", fl(g.offset)),
-        ("sectionSize", fl(g.size)),
-        ("gutterSize", fl(g.gutter)),
-        ("color", color(g.color)),
-        ("pattern", e(pattern)),
-    ];
-    let vars = [("count", "numSectionsVar"), ("offset", "offsetVar"), ("size", "sectionSizeVar"), ("gutter", "gutterSizeVar")];
-    f.extend(vars.into_iter().filter_map(|(ours, key)| Some((key, bound.grids.get(&(index, ours))?.clone()))));
-    o(f)
-}
-
-fn export_setting(x: &figcraft_doc::ExportSetting) -> Kv<'static> {
-    let format = match x.format {
-        // The format has no WebP export setting.
-        figcraft_doc::ExportFormat::Png | figcraft_doc::ExportFormat::Webp => "PNG",
-        figcraft_doc::ExportFormat::Jpg => "JPEG",
-        figcraft_doc::ExportFormat::Svg => "SVG",
-        figcraft_doc::ExportFormat::Pdf => "PDF",
-    };
-    let (ty, value) = match x.size {
-        ExportSize::Scale { value } => ("CONTENT_SCALE", value),
-        ExportSize::Width { value } => ("CONTENT_WIDTH", value),
-        ExportSize::Height { value } => ("CONTENT_HEIGHT", value),
-    };
-    o(vec![("suffix", s(&x.suffix)), ("imageType", e(format)), ("constraint", o(vec![("type", e(ty)), ("value", fl(value))]))])
+    ["Extra", "Ultra", "Semi", "Demi"].iter().fold(standard, |acc, p| acc.replace(&format!("{p} "), p))
 }
diff --git a/crates/format/src/fig/export/assets.rs b/crates/format/src/fig/export/assets.rs
new file mode 100644
index 00000000..00c84639
--- /dev/null
+++ b/crates/format/src/fig/export/assets.rs
@@ -0,0 +1,365 @@
+use super::common::{layout_grid, node_field, prop_type, resolved_type, scope_name, variant_pairs};
+use super::*;
+
+impl<'d> Exporter<'d> {
+    /// GUIDs for every layer (pages first, then depth-first), component property definitions,
+    /// flow starting points and overlay settings, before anything refers to them.
+    pub(super) fn assign(&mut self) {
+        let doc = self.doc;
+        let mut stack: Vec<NodeId> = doc.pages.iter().rev().copied().collect();
+        while let Some(id) = stack.pop() {
+            let Some(n) = doc.node(id) else { continue };
+            if self.ids.len() >= MAX_NODES {
+                self.warn("the document has more layers than a .fig file is read with; the rest were left out");
+                break;
+            }
+            let local = u32::try_from(self.ids.len() + 1).unwrap_or(u32::MAX);
+            self.ids.insert(id, local);
+            // An instance's layers aren't written (its main says them), so nothing may refer to them.
+            let mirrored = matches!(&n.kind, NodeKind::Instance { component, .. } if doc.node(*component).is_some_and(|c| matches!(c.kind, NodeKind::Component { .. })));
+            if !mirrored {
+                stack.extend(n.children.iter().rev());
+            }
+            match &n.kind {
+                NodeKind::Component { props, .. } => {
+                    let set = self.set_of(id);
+                    let owner = set.unwrap_or(id);
+                    for (name, d) in props {
+                        if let Some(ty) = prop_type(d) {
+                            let key = (owner, name.clone(), ty);
+                            if !self.defs.contains_key(&key) {
+                                let def = self.next_aux();
+                                self.defs.insert(key, def);
+                            }
+                            if set.is_some() {
+                                let child = self.next_aux();
+                                self.child_defs.insert((id, name.clone(), ty), child);
+                            }
+                        }
+                    }
+                    if let Some(set) = set {
+                        for (prop, _) in variant_pairs(&n.name) {
+                            let key = (set, prop, "VARIANT");
+                            if !self.defs.contains_key(&key) {
+                                let def = self.next_aux();
+                                self.defs.insert(key, def);
+                            }
+                        }
+                    }
+                }
+                NodeKind::Page { flows, .. } => {
+                    for (i, f) in flows.iter().enumerate() {
+                        self.starts.entry(f.start).or_insert((i, f.name.clone()));
+                    }
+                }
+                _ => {}
+            }
+            for a in n.interactions.iter().flat_map(|it| figcraft_doc::proto::walk(&it.actions)) {
+                if let Action::OpenOverlay { dest, position, close_on_outside, background, anchor, .. } = a {
+                    let position = if !anchor.is_screen() && *position != OverlayPosition::Manual { OverlayPosition::Manual } else { *position };
+                    let o = Overlay { position, close_on_outside: *close_on_outside, background: *background };
+                    match self.overlays.get(dest) {
+                        Some(old) if (old.position, old.close_on_outside, old.background) != (o.position, o.close_on_outside, o.background) => {
+                            self.warn("overlays opened with different settings keep the first one's");
+                        }
+                        Some(_) => {}
+                        None => {
+                            self.overlays.insert(*dest, o);
+                        }
+                    }
+                }
+            }
+        }
+        // The page that holds styles and variables takes the next id, then their nodes.
+        let mut next = u32::try_from(self.ids.len() + 1).unwrap_or(u32::MAX);
+        let mut node = || {
+            next = next.saturating_add(1);
+            next
+        };
+        for st in &doc.styles {
+            self.style_ids.entry(st.id.as_str()).or_insert_with(&mut node);
+        }
+        for c in &doc.variables.collections {
+            self.set_ids.entry(c.id.as_str()).or_insert_with(&mut node);
+        }
+        for v in &doc.variables.variables {
+            if self.set_ids.contains_key(v.collection.as_str()) {
+                self.var_ids.entry(v.id.as_str()).or_insert_with(&mut node);
+            }
+        }
+        for c in &doc.variables.collections {
+            for m in &c.modes {
+                if !self.mode_ids.contains_key(&(c.id.as_str(), m.id.as_str())) {
+                    let id = self.next_aux();
+                    self.mode_ids.insert((c.id.as_str(), m.id.as_str()), id);
+                }
+            }
+        }
+    }
+
+    /// The hidden page after the `pages` real ones that holds the shared styles, the variable
+    /// collections and the variables, each a node of its own.
+    pub(super) fn assets(&mut self, pages: usize) {
+        let doc = self.doc;
+        if self.style_ids.is_empty() && self.set_ids.is_empty() {
+            return;
+        }
+        let page = u32::try_from(self.ids.len() + 1).unwrap_or(u32::MAX);
+        let mut f: Fields = vec![
+            ("guid", guid(LAYERS, page)),
+            ("phase", e("CREATED")),
+            ("parentIndex", o(vec![("guid", guid(0, 0)), ("position", s(&position(pages)))])),
+            ("type", e("CANVAS")),
+            ("name", s("Internal Only Canvas")),
+        ];
+        f.extend(root_fields().into_iter().map(|(k, v)| if k == "visible" { (k, b(false)) } else { (k, v) }));
+        f.push(("internalOnly", b(true)));
+        self.nodes.push(o(f));
+        let mut index = 0usize;
+        let mut head = |local: u32, ty: &'static str, name: &str| -> Fields {
+            index += 1;
+            vec![
+                ("guid", guid(LAYERS, local)),
+                ("phase", e("CREATED")),
+                ("parentIndex", o(vec![("guid", guid(LAYERS, page)), ("position", s(&position(index)))])),
+                ("type", e(ty)),
+                ("name", s(name)),
+                ("sortPosition", s(&position(index))),
+            ]
+        };
+        for st in &doc.styles {
+            let Some(&local) = self.style_ids.get(st.id.as_str()) else { continue };
+            // A sample layer that shows the style: a square for paints and effects, a frame for
+            // grids, two letters for text.
+            let (ty, kind) = match &st.kind {
+                StyleKind::Paint { .. } => ("ROUNDED_RECTANGLE", "FILL"),
+                StyleKind::Effect { .. } => ("ROUNDED_RECTANGLE", "EFFECT"),
+                StyleKind::Grid { .. } => ("FRAME", "GRID"),
+                StyleKind::Text { .. } => ("TEXT", "TEXT"),
+            };
+            let mut f = head(local, ty, &st.name);
+            f.extend([
+                ("styleType", e(kind)),
+                ("visible", b(true)),
+                ("opacity", fl(1.0)),
+                ("size", xy(100.0, 100.0)),
+                ("transform", matrix(Affine::IDENTITY)),
+                ("strokeWeight", fl(0.0)),
+                ("strokeAlign", e("INSIDE")),
+                ("strokeJoin", e("MITER")),
+            ]);
+            if !st.description.is_empty() {
+                f.push(("description", s(&st.description)));
+            }
+            // The style's variable bindings ride on its sample layer, as a layer's do.
+            let none = if st.bound.is_empty() {
+                Bound::default()
+            } else {
+                let mut sample = Node::new(NodeId(0), NodeKind::Rectangle, "", 0.0, 0.0);
+                if let StyleKind::Text { style } = &st.kind {
+                    sample.kind = NodeKind::Text(TextData { style: style.as_text_style(), ..TextData::new("Ag") });
+                }
+                sample.bound.clone_from(&st.bound);
+                self.bound(&sample)
+            };
+            let entries = none.entries.clone();
+            if !entries.is_empty() {
+                f.push(("variableConsumptionMap", o(vec![("entries", arr(entries))])));
+            }
+            match &st.kind {
+                StyleKind::Paint { paints } => f.push(("fillPaints", self.paints(paints, true, &none))),
+                StyleKind::Effect { effects } => {
+                    let list = effects.iter().enumerate().map(|(i, x)| self.effect(x, i, &none)).collect();
+                    f.extend([("fillPaints", arr(Vec::new())), ("effects", arr(list))]);
+                }
+                StyleKind::Grid { grids } => {
+                    let list = grids.iter().enumerate().map(|(i, g)| layout_grid(g, i, &none)).collect();
+                    f.extend([("fillPaints", arr(Vec::new())), ("layoutGrids", arr(list))]);
+                }
+                StyleKind::Text { style } => {
+                    let td = TextData { style: style.as_text_style(), ..TextData::new("Ag") };
+                    let fills = [Paint::solid(Color::BLACK)];
+                    f.push(("fillPaints", self.paints(style.fills.as_deref().unwrap_or(&fills), true, &none)));
+                    self.text(&td, &fills, &mut f);
+                }
+            }
+            self.nodes.push(o(f));
+        }
+        for c in &doc.variables.collections {
+            let Some(&local) = self.set_ids.get(c.id.as_str()) else { continue };
+            let mut f = head(local, "VARIABLE_SET", &c.name);
+            let modes = c.modes.iter().enumerate().filter_map(|(i, m)| {
+                let id = self.mode_ids.get(&(c.id.as_str(), m.id.as_str()))?;
+                Some(o(vec![("id", guid(AUX, *id)), ("name", s(&m.name)), ("sortPosition", s(&position(i)))]))
+            });
+            f.push(("variableSetModes", arr(modes.collect())));
+            self.nodes.push(o(f));
+            if c.extends.is_some() {
+                self.warn("extended variable collections were written as collections of their own");
+            }
+        }
+        for v in &doc.variables.variables {
+            let ids = (self.var_ids.get(v.id.as_str()), self.set_ids.get(v.collection.as_str()));
+            let (Some(&local), Some(&set), Some(c)) = (ids.0, ids.1, doc.variables.collections.iter().find(|c| c.id == v.collection)) else {
+                self.warn("variables whose collection isn't in the document were left out");
+                continue;
+            };
+            let resolved = resolved_type(v.kind);
+            let mut values = Vec::new();
+            for m in &c.modes {
+                let (Some(mode), Some(val)) = (self.mode_ids.get(&(c.id.as_str(), m.id.as_str())), v.values.get(&m.id)) else { continue };
+                let (ty, value) = match val {
+                    VariableValue::Color(x) => ("COLOR", ("colorValue", color(*x))),
+                    VariableValue::Number(x) => ("FLOAT", ("floatValue", fl(*x))),
+                    // NULs can't be stored in a string.
+                    VariableValue::String(x) => ("STRING", ("textValue", s(&x.replace('\0', "")))),
+                    VariableValue::Boolean(x) => ("BOOLEAN", ("boolValue", b(*x))),
+                    VariableValue::Alias(a) => match self.var_ids.get(a.as_str()) {
+                        Some(t) => ("ALIAS", ("alias", o(vec![("guid", guid(LAYERS, *t))]))),
+                        None => {
+                            self.warn("variable aliases to variables that aren't in the document were left out");
+                            continue;
+                        }
+                    },
+                };
+                let data = o(vec![("value", o(vec![value])), ("dataType", e(ty)), ("resolvedDataType", e(resolved))]);
+                values.push(o(vec![("modeID", guid(AUX, *mode)), ("variableData", data)]));
+            }
+            let mut f = head(local, "VARIABLE", &v.name);
+            f.extend([
+                ("variableSetID", o(vec![("guid", guid(LAYERS, set))])),
+                ("variableResolvedType", e(resolved)),
+                ("variableDataValues", o(vec![("entries", arr(values))])),
+            ]);
+            if !v.description.is_empty() {
+                f.push(("description", s(&v.description)));
+            }
+            if let Some(scopes) = &v.scopes {
+                let known: Vec<Kv> = scopes.iter().filter_map(|sc| scope_name(sc)).map(e).collect();
+                if known.len() < scopes.len() {
+                    self.warn("variable scopes the format has no name for were left out");
+                }
+                f.push(("variableScopes", arr(known)));
+            }
+            if v.hidden_from_publishing || !v.code_syntax.is_empty() || v.extends.is_some() {
+                self.warn("variables' publishing, code syntax and inheritance settings were left out");
+            }
+            self.nodes.push(o(f));
+        }
+    }
+
+    /// A reference to variable `var` (its id or name) as variable data.
+    fn alias(&mut self, var: &str) -> Option<Kv<'static>> {
+        let found = self.doc.variables.get(var).and_then(|v| Some((v.kind, *self.var_ids.get(v.id.as_str())?)));
+        let Some((kind, local)) = found else {
+            self.warn("bindings to variables that aren't in the document were written as their values");
+            return None;
+        };
+        Some(o(vec![
+            ("value", o(vec![("alias", o(vec![("guid", guid(LAYERS, local))]))])),
+            ("dataType", e("ALIAS")),
+            ("resolvedDataType", e(resolved_type(kind))),
+        ]))
+    }
+
+    /// Layer `n`'s variable bindings, sorted into the fields that carry them. What the format has
+    /// no field for stays as the value the layer already shows, with a warning.
+    pub(super) fn bound(&mut self, n: &Node) -> Bound {
+        const BAKED: &str = "variables bound to properties the format has no field for were written as their values";
+        let mut out = Bound::default();
+        for (key, var) in &n.bound {
+            let parts: Vec<&str> = key.split('/').collect();
+            let index = |i: &str| i.parse::<usize>().ok().filter(|_| i.bytes().all(|c| c.is_ascii_digit()));
+            let fields: &[&'static str] = match (parts.as_slice(), key.as_str()) {
+                (_, "fill" | "fills" | "fills/0" | "stroke") => {
+                    if let Some(a) = self.alias(var) {
+                        out.paints.insert((key != "stroke", 0), a);
+                    }
+                    continue;
+                }
+                ([list @ ("fills" | "strokes"), i, "color"], _) => {
+                    if let (Some(i), Some(a)) = (index(i), self.alias(var)) {
+                        out.paints.insert((*list == "fills", i), a);
+                    }
+                    continue;
+                }
+                ([list @ ("fills" | "strokes"), i, "stops", j, "color"], _) => {
+                    if let (Some(i), Some(j), Some(a)) = (index(i), index(j), self.alias(var)) {
+                        out.stops.insert((*list == "fills", i, j), a);
+                    }
+                    continue;
+                }
+                ([list @ ("effects" | "layoutGrids"), i, field], _) => {
+                    let names: &[&'static str] = if *list == "effects" {
+                        &["color", "radius", "spread", "offsetX", "offsetY", "startRadius"]
+                    } else {
+                        &["size", "count", "gutter", "offset"]
+                    };
+                    match (index(i), names.iter().find(|f| *f == field)) {
+                        (Some(i), Some(name)) => {
+                            if let Some(a) = self.alias(var) {
+                                if *list == "effects" { &mut out.effects } else { &mut out.grids }.insert((i, *name), a);
+                            }
+                        }
+                        _ => self.warn(BAKED),
+                    }
+                    continue;
+                }
+                (_, "width") => &["WIDTH"],
+                (_, "height") => &["HEIGHT"],
+                (_, "gap") => &["STACK_SPACING"],
+                (_, "crossGap") => &["STACK_COUNTER_SPACING"],
+                (_, "paddingLeft") => &["STACK_PADDING_LEFT"],
+                (_, "paddingTop") => &["STACK_PADDING_TOP"],
+                (_, "paddingRight") => &["STACK_PADDING_RIGHT"],
+                (_, "paddingBottom") => &["STACK_PADDING_BOTTOM"],
+                (_, "paddingHorizontal") => &["STACK_PADDING_LEFT", "STACK_PADDING_RIGHT"],
+                (_, "paddingVertical") => &["STACK_PADDING_TOP", "STACK_PADDING_BOTTOM"],
+                (_, "padding") => &["STACK_PADDING_LEFT", "STACK_PADDING_TOP", "STACK_PADDING_RIGHT", "STACK_PADDING_BOTTOM"],
+                (_, "cornerRadius") => &[
+                    "CORNER_RADIUS",
+                    "RECTANGLE_TOP_LEFT_CORNER_RADIUS",
+                    "RECTANGLE_TOP_RIGHT_CORNER_RADIUS",
+                    "RECTANGLE_BOTTOM_LEFT_CORNER_RADIUS",
+                    "RECTANGLE_BOTTOM_RIGHT_CORNER_RADIUS",
+                ],
+                (_, "topLeftRadius") => &["RECTANGLE_TOP_LEFT_CORNER_RADIUS"],
+                (_, "topRightRadius") => &["RECTANGLE_TOP_RIGHT_CORNER_RADIUS"],
+                (_, "bottomLeftRadius") => &["RECTANGLE_BOTTOM_LEFT_CORNER_RADIUS"],
+                (_, "bottomRightRadius") => &["RECTANGLE_BOTTOM_RIGHT_CORNER_RADIUS"],
+                (_, "opacity") => &["OPACITY"],
+                (_, "visible") => &["VISIBLE"],
+                (_, "characters") => &["TEXT_DATA"],
+                (_, "strokeWeight") => &["STROKE_WEIGHT"],
+                (_, "strokeTopWeight") => &["BORDER_TOP_WEIGHT"],
+                (_, "strokeRightWeight") => &["BORDER_RIGHT_WEIGHT"],
+                (_, "strokeBottomWeight") => &["BORDER_BOTTOM_WEIGHT"],
+                (_, "strokeLeftWeight") => &["BORDER_LEFT_WEIGHT"],
+                (_, "minWidth") => &["MIN_WIDTH"],
+                (_, "maxWidth") => &["MAX_WIDTH"],
+                (_, "minHeight") => &["MIN_HEIGHT"],
+                (_, "maxHeight") => &["MAX_HEIGHT"],
+                (_, "fontSize") => &["FONT_SIZE"],
+                (_, "fontFamily") => &["FONT_FAMILY"],
+                (_, "fontStyle") => &["FONT_STYLE"],
+                (_, "letterSpacing") => &["LETTER_SPACING"],
+                (_, "lineHeight") => &["LINE_HEIGHT"],
+                (_, "paragraphSpacing") => &["PARAGRAPH_SPACING"],
+                (_, "paragraphIndent") => &["PARAGRAPH_INDENT"],
+                _ => {
+                    self.warn(BAKED);
+                    continue;
+                }
+            };
+            // Each entry names the bound property and the number of the layer field that holds it.
+            for field in fields {
+                if let Some(a) = self.alias(var) {
+                    let mut entry: Fields = node_field(field).into_iter().map(|id| ("nodeField", u(id))).collect();
+                    entry.extend([("variableData", a), ("variableField", e(field))]);
+                    out.entries.push(o(entry));
+                }
+            }
+        }
+        out
+    }
+}
diff --git a/crates/format/src/fig/export/common.rs b/crates/format/src/fig/export/common.rs
new file mode 100644
index 00000000..2853dd72
--- /dev/null
+++ b/crates/format/src/fig/export/common.rs
@@ -0,0 +1,365 @@
+use super::*;
+
+/// Longest kept description of such a layer (bytes of JSON).
+const MAX_STASH: usize = 1 << 20;
+
+/// Whether a width profile reaches further on one side of the path than on the other.
+pub(super) fn one_sided(p: &figcraft_doc::WidthProfile) -> bool {
+    p.points.iter().any(|q| q.bias.abs() > 1e-6)
+}
+
+/// A shape whose stroke is wider on one side of its path, as the area that stroke paints (a vector
+/// filled with the stroke's paints), with what it was as JSON: its kind, paints and stroke. Only
+/// for shapes that show nothing but that stroke; `None` for every other layer.
+pub(super) fn outlined(n: &Node) -> Option<(Node, String)> {
+    let sp = &n.stroke;
+    let shape = matches!(
+        n.kind,
+        NodeKind::Line | NodeKind::Vector { .. } | NodeKind::Ellipse { .. } | NodeKind::Polygon { .. } | NodeKind::Star { .. } | NodeKind::Rectangle
+    );
+    let shown = |paints: &[Paint]| paints.iter().any(|p| p.visible);
+    if !(shape
+        && sp.brush.is_none()
+        && sp.profile().is_some_and(one_sided)
+        && sp.weight.is_finite()
+        && sp.weight > 0.0
+        && shown(&n.strokes)
+        && !shown(&n.fills))
+    {
+        return None;
+    }
+    let path = figcraft_doc::geometry::stroke_geometry(n)?;
+    let net = match &n.kind {
+        NodeKind::Vector { network } => Some(network),
+        _ => None,
+    };
+    let area = figcraft_pathops::stroke_outline_of(&path, sp, figcraft_doc::geometry::is_closed(n), net);
+    if area.elements().is_empty() || area.elements().len() > MAX_NETWORK / 4 {
+        return None;
+    }
+    let original = serde_json::json!({"kind": n.kind, "fills": n.fills, "strokes": n.strokes, "stroke": n.stroke}).to_string();
+    if original.len() > MAX_STASH {
+        return None;
+    }
+    let mut network = VectorNetwork::from_path(&area);
+    for r in &mut network.regions {
+        r.winding = WindingRule::NonZero;
+    }
+    let mut v = n.clone();
+    v.kind = NodeKind::Vector { network };
+    v.fills = std::mem::take(&mut v.strokes);
+    v.stroke = Default::default();
+    v.styles.fill = v.styles.stroke.take();
+    // Bindings name the stroke's paints, which are the fills now: the values stay.
+    v.bound.retain(|k, _| !(k == "stroke" || k == "fill" || k.starts_with("strokes/") || k.starts_with("fills/") || k.starts_with("stroke")));
+    Some((v, original))
+}
+
+/// The number of the layer field a bound property (`VariableField`) is held in.
+pub(super) fn node_field(field: &str) -> Option<u32> {
+    let name = match field {
+        "WIDTH" | "HEIGHT" => "size",
+        "MIN_WIDTH" | "MIN_HEIGHT" => "minSize",
+        "MAX_WIDTH" | "MAX_HEIGHT" => "maxSize",
+        "STACK_SPACING" => "stackSpacing",
+        "STACK_COUNTER_SPACING" => "stackCounterSpacing",
+        "STACK_PADDING_LEFT" => "stackHorizontalPadding",
+        "STACK_PADDING_TOP" => "stackVerticalPadding",
+        "STACK_PADDING_RIGHT" => "stackPaddingRight",
+        "STACK_PADDING_BOTTOM" => "stackPaddingBottom",
+        "CORNER_RADIUS" => "cornerRadius",
+        "RECTANGLE_TOP_LEFT_CORNER_RADIUS" => "rectangleTopLeftCornerRadius",
+        "RECTANGLE_TOP_RIGHT_CORNER_RADIUS" => "rectangleTopRightCornerRadius",
+        "RECTANGLE_BOTTOM_LEFT_CORNER_RADIUS" => "rectangleBottomLeftCornerRadius",
+        "RECTANGLE_BOTTOM_RIGHT_CORNER_RADIUS" => "rectangleBottomRightCornerRadius",
+        "OPACITY" => "opacity",
+        "VISIBLE" => "visible",
+        "TEXT_DATA" => "textData",
+        "STROKE_WEIGHT" => "strokeWeight",
+        "BORDER_TOP_WEIGHT" => "borderTopWeight",
+        "BORDER_RIGHT_WEIGHT" => "borderRightWeight",
+        "BORDER_BOTTOM_WEIGHT" => "borderBottomWeight",
+        "BORDER_LEFT_WEIGHT" => "borderLeftWeight",
+        "FONT_SIZE" => "fontSize",
+        "FONT_FAMILY" | "FONT_STYLE" => "fontName",
+        "LETTER_SPACING" => "letterSpacing",
+        "LINE_HEIGHT" => "lineHeight",
+        "PARAGRAPH_SPACING" => "paragraphSpacing",
+        "PARAGRAPH_INDENT" => "paragraphIndent",
+        _ => return None,
+    };
+    // The numbers are the schema's.
+    let layer = SCHEMA.lines().find(|l| l.starts_with("message NodeChange "))?;
+    layer.split(", ").find_map(|f| f.rsplit_once(' ')?.1.strip_prefix(name)?.strip_prefix('=')?.parse().ok())
+}
+
+/// Whether `a` is `b` with its lengths scaled by `k`: every number is `k` times the other's (within
+/// `slack`, for sizes that snap to whole pixels) or the same, and the rest is equal.
+pub(super) fn scaled(a: &Kv<'static>, b: &Kv<'static>, k: f64, slack: f64) -> bool {
+    match (a, b) {
+        (Kv::Float(x), Kv::Float(y)) => {
+            let (x, y) = (f64::from(*x), f64::from(*y));
+            x == y || (x - y * k).abs() <= slack + 1e-3 * x.abs().max(1.0)
+        }
+        (Kv::Array(x), Kv::Array(y)) => x.len() == y.len() && x.iter().zip(y).all(|(p, q)| scaled(p, q, k, slack)),
+        (Kv::Object(x), Kv::Object(y)) => x.len() == y.len() && x.iter().zip(y).all(|((kp, p), (kq, q))| kp == kq && scaled(p, q, k, slack)),
+        _ => a == b,
+    }
+}
+
+/// The fields of `mine` that differ from `theirs` (a layer and the main's layer it mirrors), and
+/// the ones only `theirs` has at their empty values.
+pub(super) fn changed(mine: Fields, theirs: &Fields) -> Fields {
+    let cleared: Fields = theirs.iter().filter(|(k, _)| !mine.iter().any(|(mk, _)| mk == k)).filter_map(|(k, _)| Some((*k, unset(k)?))).collect();
+    let mut out: Fields = mine.into_iter().filter(|(k, v)| !theirs.iter().any(|(tk, tv)| tk == k && tv == v)).collect();
+    out.extend(cleared);
+    out
+}
+
+/// Whether paint list `v` (field `key`) is `theirs` but for the colours variables give: two layers
+/// bound alike are the same, whatever mode each one shows.
+pub(super) fn resolved_alike(key: &str, v: &Kv<'static>, theirs: &Fields) -> bool {
+    fn unresolved(v: &Kv<'static>) -> Vec<Kv<'static>> {
+        let bare = |p: &Kv<'static>| match p {
+            Kv::Object(f) if f.iter().any(|(k, _)| *k == "colorVar") => o(f.iter().filter(|(k, _)| *k != "color").cloned().collect()),
+            other => other.clone(),
+        };
+        v.list().iter().map(bare).collect()
+    }
+    matches!(key, "fillPaints" | "strokePaints") && theirs.iter().any(|(k, t)| *k == key && unresolved(t) == unresolved(v))
+}
+
+/// The format's name of a variable type.
+pub(super) fn resolved_type(kind: VariableType) -> &'static str {
+    match kind {
+        VariableType::Color => "COLOR",
+        VariableType::Number => "FLOAT",
+        VariableType::String => "STRING",
+        VariableType::Boolean => "BOOLEAN",
+    }
+}
+
+/// The format's name of a variable scope (`None`: it has none).
+pub(super) fn scope_name(scope: &str) -> Option<&'static str> {
+    const NAMES: [&str; 20] = [
+        "ALL_SCOPES",
+        "TEXT_CONTENT",
+        "CORNER_RADIUS",
+        "WIDTH_HEIGHT",
+        "GAP",
+        "ALL_FILLS",
+        "FRAME_FILL",
+        "SHAPE_FILL",
+        "TEXT_FILL",
+        "STROKE_FLOAT",
+        "EFFECT_FLOAT",
+        "EFFECT_COLOR",
+        "OPACITY",
+        "FONT_STYLE",
+        "FONT_FAMILY",
+        "FONT_SIZE",
+        "LINE_HEIGHT",
+        "LETTER_SPACING",
+        "PARAGRAPH_SPACING",
+        "PARAGRAPH_INDENT",
+    ];
+    if scope == "STROKE_COLOR" {
+        return Some("STROKE");
+    }
+    NAMES.into_iter().find(|n| *n == scope)
+}
+
+/// The empty value of a field only written when set (an override clears it with this).
+fn unset(key: &str) -> Option<Kv<'static>> {
+    Some(match key {
+        "styleIdForFill" | "styleIdForStrokeFill" | "styleIdForEffect" | "styleIdForGrid" | "styleIdForText" => {
+            o(vec![("guid", guid(u32::MAX, u32::MAX))])
+        }
+        "variableConsumptionMap" | "variableModeBySetMap" | "gridColumnsSizing" | "gridRowsSizing" => o(vec![("entries", arr(Vec::new()))]),
+        "mask" | "rectangleCornerRadiiIndependent" | "borderStrokeWeightsIndependent" => b(false),
+        "effects" | "dashPattern" | "layoutGrids" | "exportSettings" | "prototypeInteractions" | "fillGeometry" | "variableWidthPoints" => {
+            arr(Vec::new())
+        }
+        "cornerSmoothing" | "stackChildPrimaryGrow" => fl(0.0),
+        "stackMode" => e("NONE"),
+        "stackChildAlignSelf" | "stackPositioning" => e("AUTO"),
+        "minSize" => o(vec![("value", xy(0.0, 0.0))]),
+        // No maximum is infinite (a maximum of 0 collapses the layer).
+        "maxSize" => o(vec![("value", o(vec![("x", Kv::Float(f32::INFINITY)), ("y", Kv::Float(f32::INFINITY))]))]),
+        "gridColumnSpan" | "gridRowSpan" | "maxLines" => int(0),
+        "scrollDirection" => e("NONE"),
+        "scrollBehavior" => e("SCROLLS"),
+        "parameterConsumptionMap" => o(vec![("entries", arr(Vec::new()))]),
+        "textTruncation" => e("DISABLED"),
+        "hyperlink" => o(vec![("url", s(""))]),
+        _ => return None,
+    })
+}
+
+/// The pairs of a variant's name, `Property=Value, …` (parts without `=` are left out).
+pub(super) fn variant_pairs(name: &str) -> Vec<(String, String)> {
+    name.split(',')
+        .filter_map(|part| {
+            let (p, v) = part.split_once('=')?;
+            let (p, v) = (p.trim(), v.trim());
+            (!p.is_empty()).then(|| (p.to_string(), v.to_string()))
+        })
+        .collect()
+}
+
+/// The `index`-th sort position of a list: one printable character from `"` on, two past the end
+/// of that range.
+pub(super) fn sort_position(index: usize) -> String {
+    const FIRST: u32 = 34;
+    const SPAN: usize = 93;
+    let ch = |i: usize| char::from_u32(FIRST + u32::try_from(i % SPAN).unwrap_or(0)).unwrap_or('"');
+    if index < SPAN { ch(index).to_string() } else { format!("~{}", ch(index - SPAN)) }
+}
+
+/// Text as a property value: its characters and one plain line per paragraph.
+pub(super) fn text_value(t: &str) -> Kv<'static> {
+    let line = || {
+        o(vec![
+            ("lineType", e("PLAIN")),
+            ("styleId", int(0)),
+            ("indentationLevel", int(0)),
+            ("sourceDirectionality", e("AUTO")),
+            ("listStartOffset", int(0)),
+            ("isFirstLineOfList", b(false)),
+        ])
+    };
+    o(vec![("characters", s(t)), ("lines", arr(t.split('\n').map(|_| line()).collect()))])
+}
+
+/// A property value as variable data (`varValue`).
+pub(super) fn var_data(value: (&'static str, Kv<'static>), ty: &'static str, resolved: &'static str) -> Kv<'static> {
+    o(vec![("value", o(vec![value])), ("dataType", e(ty)), ("resolvedDataType", e(resolved))])
+}
+
+pub(super) fn bool_data(x: bool) -> Kv<'static> {
+    var_data(("boolValue", b(x)), "BOOLEAN", "BOOLEAN")
+}
+
+pub(super) fn text_data(t: &str) -> Kv<'static> {
+    var_data(("textDataValue", text_value(t)), "TEXT_DATA", "TEXT_DATA")
+}
+
+pub(super) fn symbol_data(main: Kv<'static>) -> Kv<'static> {
+    var_data(("symbolIdValue", o(vec![("guid", main)])), "SYMBOL_ID", "SYMBOL_ID")
+}
+
+/// The format's type of a component property (`None`: not written).
+pub(super) fn prop_type(d: &PropDef) -> Option<&'static str> {
+    match d {
+        PropDef::Boolean { .. } => Some("BOOL"),
+        PropDef::Text { .. } => Some("TEXT"),
+        PropDef::InstanceSwap { .. } => Some("INSTANCE_SWAP"),
+        PropDef::Variant { .. } | PropDef::Slot { .. } => None,
+    }
+}
+
+/// The key codes of a key trigger (modifiers first), and whether it's a controller button.
+pub(super) fn key_codes(key: &str) -> Option<(Vec<i64>, bool)> {
+    if let Some(i) = GAMEPAD_BUTTONS.iter().position(|g| g.eq_ignore_ascii_case(key.trim())) {
+        return Some((vec![i as i64], true));
+    }
+    let (mods, k): (KeyMods, &str) = KeyMods::split(key);
+    let code = (0..=255).find(|c| crate::rest::proto::key_name(f64::from(*c)).is_some_and(|n| n.eq_ignore_ascii_case(k)))?;
+    let mut codes: Vec<i64> = [(mods.shift, 16), (mods.ctrl, 17), (mods.alt, 18), (mods.cmd, 91)].into_iter().filter(|m| m.0).map(|m| m.1).collect();
+    codes.push(i64::from(code));
+    Some((codes, false))
+}
+
+/// Whether the decoration look has more than skip ink, which the file can't hold.
+pub(super) fn unsupported_decoration_look(st: &TextStyle) -> bool {
+    let mut look = st.look();
+    look.skip_ink = false;
+    look != Default::default()
+}
+
+/// The text style fields of a layer or of an override table entry.
+pub(super) fn style_fields(st: &TextStyle, f: &mut Fields) {
+    let line_height = match st.line_height {
+        // Percent units count from the font's own line height (100 % is "auto"); a share of the
+        // font size is a raw multiplier.
+        LineHeight::Auto => o(vec![("value", fl(100.0)), ("units", e("PERCENT"))]),
+        LineHeight::Percent(p) => o(vec![("value", fl(p / 100.0)), ("units", e("RAW"))]),
+        LineHeight::Pixels(v) => o(vec![("value", fl(v)), ("units", e("PIXELS"))]),
+    };
+    let letter_spacing = match st.letter_spacing {
+        LetterSpacing::Percent(p) => o(vec![("value", fl(p)), ("units", e("PERCENT"))]),
+        LetterSpacing::Pixels(v) => o(vec![("value", fl(v)), ("units", e("PIXELS"))]),
+    };
+    let case = match st.case {
+        TextCase::Original => "ORIGINAL",
+        TextCase::Upper => "UPPER",
+        TextCase::Lower => "LOWER",
+        TextCase::Title => "TITLE",
+        TextCase::SmallCaps => "SMALL_CAPS",
+    };
+    let decoration = match st.decoration {
+        TextDecoration::None => "NONE",
+        TextDecoration::Underline => "UNDERLINE",
+        TextDecoration::Strikethrough => "STRIKETHROUGH",
+    };
+    f.extend([
+        ("fontName", o(vec![("family", s(&st.font_family)), ("style", s(&face_style(&st.font_family, &st.font_style))), ("postscript", s(""))])),
+        ("fontSize", fl(st.font_size)),
+        ("lineHeight", line_height),
+        ("letterSpacing", letter_spacing),
+        ("textCase", e(case)),
+        ("textDecoration", e(decoration)),
+        // Skip ink only shows on an underline; other text gets the files' default (on), the value
+        // the import leaves out again.
+        ("textDecorationSkipInk", b(st.look().skip_ink || st.decoration != TextDecoration::Underline)),
+    ]);
+    if let Some(url) = &st.link {
+        f.push(("hyperlink", o(vec![("url", s(url))])));
+    }
+}
+
+/// Layout grid `index` of a layer, with the variables `bound` to its fields.
+pub(super) fn layout_grid(g: &figcraft_doc::LayoutGrid, index: usize, bound: &Bound) -> Kv<'static> {
+    let (pattern, axis) = match g.kind {
+        GridKind::Grid => ("GRID", "X"),
+        GridKind::Columns => ("STRIPES", "X"),
+        GridKind::Rows => ("STRIPES", "Y"),
+    };
+    let align = match g.align {
+        GridAlign::Stretch => "STRETCH",
+        GridAlign::Min => "MIN",
+        GridAlign::Center => "CENTER",
+        GridAlign::Max => "MAX",
+    };
+    let mut f: Fields = vec![
+        ("type", e(align)),
+        ("axis", e(axis)),
+        ("visible", b(g.visible)),
+        ("numSections", int(g.count.into())),
+        ("offset", fl(g.offset)),
+        ("sectionSize", fl(g.size)),
+        ("gutterSize", fl(g.gutter)),
+        ("color", color(g.color)),
+        ("pattern", e(pattern)),
+    ];
+    let vars = [("count", "numSectionsVar"), ("offset", "offsetVar"), ("size", "sectionSizeVar"), ("gutter", "gutterSizeVar")];
+    f.extend(vars.into_iter().filter_map(|(ours, key)| Some((key, bound.grids.get(&(index, ours))?.clone()))));
+    o(f)
+}
+
+pub(super) fn export_setting(x: &figcraft_doc::ExportSetting) -> Kv<'static> {
+    let format = match x.format {
+        // The format has no WebP export setting.
+        figcraft_doc::ExportFormat::Png | figcraft_doc::ExportFormat::Webp => "PNG",
+        figcraft_doc::ExportFormat::Jpg => "JPEG",
+        // Nor an Android Vector Drawable one: the nearest is the other vector format.
+        figcraft_doc::ExportFormat::Svg | figcraft_doc::ExportFormat::VectorDrawable => "SVG",
+        figcraft_doc::ExportFormat::Pdf => "PDF",
+    };
+    let (ty, value) = match x.size {
+        ExportSize::Scale { value } => ("CONTENT_SCALE", value),
+        ExportSize::Width { value } => ("CONTENT_WIDTH", value),
+        ExportSize::Height { value } => ("CONTENT_HEIGHT", value),
+    };
+    o(vec![("suffix", s(&x.suffix)), ("imageType", e(format)), ("constraint", o(vec![("type", e(ty)), ("value", fl(value))]))])
+}
diff --git a/crates/format/src/fig/export/component.rs b/crates/format/src/fig/export/component.rs
new file mode 100644
index 00000000..7d88dcc8
--- /dev/null
+++ b/crates/format/src/fig/export/component.rs
@@ -0,0 +1,324 @@
+use super::common::{
+    bool_data, changed, prop_type, resolved_alike, scaled, sort_position, symbol_data, text_data, text_value, var_data, variant_pairs,
+};
+use super::*;
+
+impl<'d> Exporter<'d> {
+    /// A component property definition of `owner` (a component, or a set), `index`-th in its list.
+    /// The default value is written twice: as `initialValue` and as `varValue`, which is what
+    /// readers that know variables take.
+    pub(super) fn prop_def(&mut self, owner: NodeId, name: &str, d: &PropDef, index: usize) -> Option<Kv<'static>> {
+        let ty = prop_type(d)?;
+        let id = *self.defs.get(&(owner, name.to_string(), ty))?;
+        let (value, var) = match d {
+            PropDef::Boolean { default } => (o(vec![("boolValue", b(*default))]), bool_data(*default)),
+            PropDef::Text { default } => (o(vec![("textValue", text_value(default))]), text_data(default)),
+            PropDef::InstanceSwap { default, preferred } => {
+                if !preferred.is_empty() {
+                    self.warn("preferred values of instance swap properties were left out");
+                }
+                let main = self.guid_of(*default)?;
+                (o(vec![("guidValue", main.clone())]), symbol_data(main))
+            }
+            PropDef::Variant { .. } | PropDef::Slot { .. } => return None,
+        };
+        Some(o(vec![
+            ("id", guid(AUX, id)),
+            ("name", s(name)),
+            ("initialValue", value),
+            ("sortPosition", s(&sort_position(index))),
+            ("type", e(ty)),
+            ("preferredValues", o(Vec::new())),
+            ("varValue", var),
+        ]))
+    }
+
+    /// A component set's property definitions: its variant properties (from the variants' names,
+    /// in the order they first appear, with their values in order) and the other properties its
+    /// variants share; written on the set, as the format keeps them.
+    pub(super) fn set_props(&mut self, set: &Node, f: &mut Fields) {
+        let doc = self.doc;
+        let variants: Vec<&Node> =
+            set.children.iter().filter_map(|c| doc.node(*c)).filter(|c| matches!(c.kind, NodeKind::Component { .. })).collect();
+        let mut order: Vec<(String, Vec<String>)> = Vec::new();
+        for v in &variants {
+            for (prop, value) in variant_pairs(&v.name) {
+                let i = match order.iter().position(|(p, _)| *p == prop) {
+                    Some(i) => i,
+                    None => {
+                        order.push((prop, Vec::new()));
+                        order.len() - 1
+                    }
+                };
+                if let Some((_, values)) = order.get_mut(i)
+                    && !values.contains(&value)
+                {
+                    values.push(value);
+                }
+            }
+        }
+        let mut defs = Vec::new();
+        for (prop, _) in &order {
+            if let Some(&id) = self.defs.get(&(set.id, prop.clone(), "VARIANT")) {
+                defs.push(o(vec![
+                    ("id", guid(AUX, id)),
+                    ("name", s(prop)),
+                    ("initialValue", o(Vec::new())),
+                    ("sortPosition", s(&sort_position(defs.len()))),
+                    ("type", e("VARIANT")),
+                    ("preferredValues", o(Vec::new())),
+                    ("varValue", var_data(("textValue", s("")), "STRING", "STRING")),
+                ]));
+            }
+        }
+        // The format keeps one default per property of a set (a variant's copy holds none): the first
+        // variant's, with a warning when another variant's differs.
+        // A name used with two types is two properties (their definitions have their own ids).
+        let mut seen: BTreeMap<(String, &'static str), PropDef> = BTreeMap::new();
+        for v in &variants {
+            let NodeKind::Component { props, .. } = &v.kind else { continue };
+            for (name, d) in props {
+                let Some(ty) = prop_type(d) else { continue };
+                match seen.get(&(name.clone(), ty)) {
+                    Some(first) if first != d => self.warn("variants with different defaults for one property were written with the first variant's"),
+                    Some(_) => {}
+                    None => {
+                        seen.insert((name.clone(), ty), d.clone());
+                        let index = defs.len();
+                        defs.extend(self.prop_def(set.id, name, d, index));
+                    }
+                }
+            }
+        }
+        if !defs.is_empty() {
+            f.push(("componentPropDefs", arr(defs)));
+        }
+        if !order.is_empty() {
+            let orders = order.into_iter().map(|(p, values)| o(vec![("property", s(&p)), ("values", arr(values.iter().map(|x| s(x)).collect()))]));
+            f.push(("stateGroupPropertyValueOrders", arr(orders.collect())));
+        }
+    }
+
+    /// Which property controls a layer's `field`: the entry of its parameter consumption map and
+    /// its component property reference (readers take one or the other), both naming the
+    /// definition of the component the layer is in (a variant's own copy, in a set).
+    pub(super) fn prop_ref(&mut self, n: &Node, field: &str, prop: &str) -> Option<(Kv<'static>, Kv<'static>)> {
+        let (var_field, ty, resolved) = match field {
+            "visible" => ("VISIBLE", "BOOL", "BOOLEAN"),
+            "characters" => ("TEXT_DATA", "TEXT", "TEXT_DATA"),
+            "mainComponent" => ("OVERRIDDEN_SYMBOL_ID", "INSTANCE_SWAP", "SYMBOL_ID"),
+            _ => {
+                self.warn("slot layers were written as plain layers");
+                return None;
+            }
+        };
+        let id = self.def_for(self.component_of(n)?, prop, ty)?;
+        let data = o(vec![
+            ("value", o(vec![("propRefValue", o(vec![("defId", guid(AUX, id))]))])),
+            ("dataType", e("PROP_REF")),
+            ("resolvedDataType", e(resolved)),
+        ]);
+        let entry = o(vec![("variableData", data), ("variableField", e(var_field))]);
+        let reference = o(vec![("defID", guid(AUX, id)), ("componentPropNodeField", e(var_field))]);
+        Some((entry, reference))
+    }
+
+    /// An instance: its main, the fields it and its layers override, the size, place and outline
+    /// its layers get from that (derived data), its property values. `f`: its own fields so far.
+    pub(super) fn instance(&mut self, n: &Node, main: NodeId, props: &BTreeMap<String, Value>, f: &mut Fields) {
+        // Which properties control the instance itself (a nested instance in a main component) is
+        // its own too, not an override of its main.
+        const OWN: [&str; 9] =
+            ["guid", "phase", "parentIndex", "type", "transform", "fillGeometry", "strokeGeometry", "parameterConsumptionMap", "componentPropRefs"];
+        let doc = self.doc;
+        let (Some(m), Some(symbol)) = (doc.node(main), self.guid_of(main)) else { return };
+        // What the instance itself changes from its main (its size, its paints, …) is an override
+        // addressed by the main's id: a reader takes everything else from the main. Where it sits
+        // is its own.
+        let mut root_theirs = Vec::new();
+        self.layer(m, m.parent.and_then(|p| doc.node(p)), &mut root_theirs, true);
+        root_theirs.retain(|(k, _)| !OWN.contains(k));
+        // An instance is named after its component (the set, for a variant) until renamed.
+        let set = m.parent.and_then(|p| doc.node(p)).filter(|p| matches!(p.kind, NodeKind::ComponentSet { .. }));
+        let named = set.is_none_or(|s| s.name != n.name);
+        let root_mine: Fields = f.iter().filter(|(k, _)| !OWN.contains(k) && (named || *k != "name")).cloned().collect();
+        // Each layer below: its id path, the fields that differ from the main's layer, that layer's
+        // fields, whether its size is its own (a nested instance, a size override) and the
+        // component a nested instance was swapped for.
+        struct Row {
+            path: Kv<'static>,
+            changed: Fields,
+            theirs: Fields,
+            sized: bool,
+            swap: Option<Kv<'static>>,
+        }
+        let mut rows: Vec<Row> = Vec::new();
+        let mut stack: Vec<(NodeId, NodeId)> = n.children.iter().rev().map(|c| (*c, n.id)).collect();
+        let mut seen = 0usize;
+        while let Some((id, parent)) = stack.pop() {
+            let Some(d) = doc.node(id) else { continue };
+            seen += 1;
+            if seen > MAX_NODES {
+                break;
+            }
+            stack.extend(d.children.iter().rev().map(|c| (*c, id)));
+            let path = self.layer_path(d, n.id, main, 0);
+            let guids: Option<Vec<Kv>> = path.and_then(|p| p.iter().map(|x| self.guid_of(*x)).collect());
+            let (Some(guids), Some(src)) = (guids, d.source.and_then(|src| doc.node(src))) else {
+                self.warn("instance layers that don't come from their main component were left out");
+                continue;
+            };
+            let (mut mine, mut theirs) = (Vec::new(), Vec::new());
+            self.layer(d, doc.node(parent), &mut mine, true);
+            self.layer(src, src.parent.and_then(|p| doc.node(p)), &mut theirs, true);
+            // A nested instance swapped for another component.
+            let swap = match (&d.kind, &src.kind) {
+                (NodeKind::Instance { component, .. }, NodeKind::Instance { component: was, .. }) if component == was => None,
+                (NodeKind::Instance { component, .. }, _) => self.guid_of(*component),
+                _ => None,
+            };
+            let sized = matches!(d.kind, NodeKind::Instance { .. }) || d.overrides.contains("size");
+            rows.push(Row { path: o(vec![("guids", arr(guids))]), changed: changed(mine, &theirs), theirs, sized, swap });
+        }
+        // An instance scaled as a whole (the Scale tool) is `factor` times its main in every length:
+        // sizes, places and stroke weights, its own and its layers'. A resized one keeps its weights.
+        let field = |fields: &Fields, key: &str| fields.iter().find(|(k, _)| *k == key).map(|(_, v)| v.clone());
+        let factor = Some(n.width / m.width).filter(|k| k.is_finite() && *k > 0.0 && (k - 1.0).abs() > 1e-6).filter(|k| {
+            let grown = |mine: &Fields, theirs: &Fields| {
+                let weight = field(theirs, "strokeWeight").and_then(|w| w.f64()).unwrap_or(0.0);
+                (weight == 0.0 || field(mine, "strokeWeight").is_some_and(|w| scaled(&w, &fl(weight), *k, 0.0)))
+                    && field(mine, "size").zip(field(theirs, "size")).is_some_and(|(a, b)| scaled(&a, &b, *k, 1.0))
+                    && field(mine, "transform").zip(field(theirs, "transform")).is_none_or(|(a, b)| scaled(&a, &b, *k, 1.0))
+            };
+            (n.height / m.height - k).abs() <= 1e-6 * k.max(1.0)
+                && grown(&changed(root_mine.clone(), &root_theirs), &root_theirs)
+                && rows.iter().all(|r| grown(&r.changed, &r.theirs))
+        });
+        // What follows from the overrides goes with the derived data: a layer's size, place and
+        // outline (a vector's network is the main's, drawn at the layer's size), the colours its
+        // variables give here, and what the scale factor makes of the main's values.
+        let follows = |k: &str, v: &Kv<'static>, theirs: &Fields| {
+            ["size", "transform", "fillGeometry", "strokeGeometry", "vectorData"].contains(&k)
+                || resolved_alike(k, v, theirs)
+                || factor.is_some_and(|x| field(theirs, k).is_some_and(|t| scaled(v, &t, x, 0.0)))
+        };
+        let mut overrides = Vec::new();
+        let mut derived = Vec::new();
+        let mut of: Fields = vec![("guidPath", o(vec![("guids", arr(vec![symbol.clone()]))]))];
+        of.extend(changed(root_mine, &root_theirs).into_iter().filter(|(k, v)| *k == "size" || !follows(k, v, &root_theirs)));
+        if of.len() > 1 {
+            overrides.push(o(of));
+        }
+        for r in rows {
+            let (mut of, mut df): (Fields, Fields) = (vec![("guidPath", r.path.clone())], vec![("guidPath", r.path)]);
+            for (k, v) in r.changed {
+                let follows = follows(k, &v, &r.theirs);
+                // A nested instance's size is its own to set, as is a size the layer overrides.
+                if follows && r.sized && k == "size" {
+                    of.push((k, v.clone()));
+                }
+                if follows { &mut df } else { &mut of }.push((k, v));
+            }
+            if df.len() > 1 {
+                derived.push(o(df));
+            }
+            of.extend(r.swap.map(|g| ("overriddenSymbolID", g)));
+            if of.len() > 1 {
+                overrides.push(o(of));
+            }
+        }
+        f.push(("symbolData", o(vec![("symbolID", symbol), ("symbolOverrides", arr(overrides)), ("uniformScaleFactor", fl(factor.unwrap_or(1.0)))])));
+        if !derived.is_empty() {
+            f.push(("derivedSymbolData", arr(derived)));
+        }
+        let mut assignments = Vec::new();
+        for (name, v) in props {
+            let (ty, value, var) = match v {
+                Value::Bool(x) => ("BOOL", o(vec![("boolValue", b(*x))]), bool_data(*x)),
+                Value::String(t) => ("TEXT", o(vec![("textValue", text_value(t))]), text_data(t)),
+                Value::Number(c) => {
+                    let Some(g) = c.as_u64().and_then(|c| self.guid_of(NodeId(c))) else { continue };
+                    ("INSTANCE_SWAP", o(vec![("guidValue", g.clone())]), symbol_data(g))
+                }
+                _ => continue,
+            };
+            // Variant values have no definition of their own: the main they show says them. A
+            // variant's instance names the variant's own copy of the definition.
+            if let Some(id) = self.def_for(main, name, ty) {
+                assignments.push(o(vec![("defID", guid(AUX, id)), ("value", value), ("varValue", var)]));
+            }
+        }
+        if !assignments.is_empty() {
+            f.push(("componentPropAssignments", arr(assignments)));
+        }
+        if n.children.iter().filter_map(|c| doc.node(*c)).any(|c| c.source.is_none()) {
+            self.warn("instance layers that don't come from their main component were left out");
+        }
+    }
+
+    /// The main component layer an instance or instance layer mirrors (through nested instances),
+    /// or `id` itself.
+    pub(super) fn main_layer(&self, id: NodeId) -> NodeId {
+        let mut cur = id;
+        for _ in 0..32 {
+            let next = self.doc.node(cur).and_then(|n| match &n.kind {
+                _ if n.source.is_some() => n.source,
+                NodeKind::Instance { component, .. } => Some(*component),
+                _ => None,
+            });
+            match next.filter(|s| self.doc.contains(*s)) {
+                Some(s) => cur = s,
+                None => break,
+            }
+        }
+        cur
+    }
+
+    /// The id path of layer `d` of instance `inst` (of `main`): that of the main's layer it mirrors,
+    /// or, inside a nested instance swapped for another component, the path of that instance and
+    /// then the one inside its new main.
+    fn layer_path(&self, d: &Node, inst: NodeId, main: NodeId, depth: usize) -> Option<Vec<NodeId>> {
+        let src = d.source?;
+        if let Some(p) = self.path_in(src, main, 0) {
+            return Some(p);
+        }
+        if depth > 32 {
+            return None;
+        }
+        let doc = self.doc;
+        let nested = doc.ancestors(d.id).into_iter().take_while(|a| *a != inst).filter_map(|a| doc.node(a)).find_map(|a| match &a.kind {
+            NodeKind::Instance { component, .. } => Some((a, *component)),
+            _ => None,
+        });
+        let (outer, component) = nested?;
+        let mut p = self.layer_path(outer, inst, main, depth + 1)?;
+        p.extend(self.path_in(src, component, 0)?);
+        Some(p)
+    }
+
+    /// The id path of layer `s` inside component `comp`: `s` itself, or through the nested
+    /// instance it is expanded in, then on inside that instance's main.
+    fn path_in(&self, s: NodeId, comp: NodeId, depth: usize) -> Option<Vec<NodeId>> {
+        if depth > 32 {
+            return None;
+        }
+        let doc = self.doc;
+        let up = doc.ancestors(s);
+        let below: Vec<NodeId> = up.iter().take_while(|a| **a != comp).copied().collect();
+        if below.len() == up.len() {
+            return None;
+        }
+        // The outermost nested instance between the component and the layer.
+        match below.iter().rev().find_map(|a| match doc.node(*a).map(|n| &n.kind) {
+            Some(NodeKind::Instance { component, .. }) => Some((*a, *component)),
+            _ => None,
+        }) {
+            None => Some(vec![s]),
+            Some((inst, main)) => {
+                let mut p = vec![inst];
+                p.extend(self.path_in(doc.node(s)?.source?, main, depth + 1)?);
+                Some(p)
+            }
+        }
+    }
+}
diff --git a/crates/format/src/fig/export/layer.rs b/crates/format/src/fig/export/layer.rs
new file mode 100644
index 00000000..9925042f
--- /dev/null
+++ b/crates/format/src/fig/export/layer.rs
@@ -0,0 +1,440 @@
+use super::common::{export_setting, layout_grid, outlined, prop_type, variant_pairs};
+use super::*;
+
+impl<'d> Exporter<'d> {
+    /// Write layer `id` (child `index` of the layer with GUID `parent_guid`) and its subtree.
+    pub(super) fn emit(&mut self, id: NodeId, parent_guid: Kv<'static>, index: usize, parent: Option<&Node>, depth: usize) {
+        let doc = self.doc;
+        let (Some(&local), Some(n)) = (self.ids.get(&id), doc.node(id)) else { return };
+        if depth > MAX_DEPTH {
+            self.warn("layers nested deeper than 256 levels were left out");
+            return;
+        }
+        let mut f: Fields = vec![
+            ("guid", guid(LAYERS, local)),
+            ("phase", e("CREATED")),
+            ("parentIndex", o(vec![("guid", parent_guid), ("position", s(&position(index)))])),
+        ];
+        let children = if let NodeKind::Page { background, guides, prototype, .. } = &n.kind {
+            f.extend([("type", e("CANVAS")), ("name", s(&n.name))]);
+            f.extend(root_fields());
+            f.extend([("backgroundColor", color(*background)), ("backgroundOpacity", fl(background.a.into())), ("backgroundEnabled", b(true))]);
+            if !guides.is_empty() {
+                self.warn("ruler guides were left out");
+            }
+            if *prototype != Default::default() {
+                self.warn("prototype device settings were left out");
+            }
+            self.modes(n, &mut f);
+            true
+        } else {
+            self.layer(n, parent, &mut f, false)
+        };
+        self.nodes.push(o(f));
+        if children {
+            for (i, c) in n.children.iter().enumerate() {
+                self.emit(*c, guid(LAYERS, local), i, Some(n), depth + 1);
+            }
+        }
+    }
+
+    /// The fields of layer `n` (whose parent is `parent`). `nested`: for an instance's override
+    /// (no type, no instance or component data). Returns whether its children are written as
+    /// layers (an instance's come from its main).
+    pub(super) fn layer(&mut self, n: &Node, parent: Option<&Node>, f: &mut Fields, nested: bool) -> bool {
+        let doc = self.doc;
+        if let Some((outline, original)) = outlined(n) {
+            // The format's variable width is the same on both sides of the path: a stroke wider on
+            // one side is written as the area it paints, with the stroke itself kept as plugin data
+            // (which the import puts back).
+            self.warn("strokes wider on one side of their path were written as filled outlines (the stroke itself is kept for FigCraft)");
+            let children = self.layer(&outline, parent, f, nested);
+            f.push(("pluginData", arr(vec![o(vec![("pluginID", s(STASH.0)), ("value", s(&original)), ("key", s(STASH.1))])])));
+            return children;
+        }
+        let main = match &n.kind {
+            NodeKind::Instance { component, .. } => {
+                let found = self.ids.contains_key(component) && doc.node(*component).is_some_and(|c| matches!(c.kind, NodeKind::Component { .. }));
+                if !found && !nested {
+                    self.warn("instances of components that aren't in the file were written as frames");
+                }
+                found.then_some(*component)
+            }
+            _ => None,
+        };
+        let ty = match &n.kind {
+            NodeKind::Page { .. } | NodeKind::Frame | NodeKind::Group | NodeKind::ComponentSet { .. } => "FRAME",
+            NodeKind::Instance { .. } if main.is_none() => "FRAME",
+            NodeKind::Section { .. } => "SECTION",
+            NodeKind::Rectangle => "ROUNDED_RECTANGLE",
+            NodeKind::Ellipse { .. } => "ELLIPSE",
+            NodeKind::Polygon { .. } => "REGULAR_POLYGON",
+            NodeKind::Star { .. } => "STAR",
+            NodeKind::Line => "LINE",
+            NodeKind::Vector { .. } => "VECTOR",
+            NodeKind::Text(_) => "TEXT",
+            NodeKind::BooleanOp { .. } => "BOOLEAN_OPERATION",
+            NodeKind::Component { .. } => "SYMBOL",
+            NodeKind::Instance { .. } => "INSTANCE",
+            NodeKind::Slice => "SLICE",
+        };
+        if !nested {
+            f.push(("type", e(ty)));
+        }
+        f.push(("name", s(&n.name)));
+        self.common(n, parent, f);
+        match &n.kind {
+            NodeKind::Group => f.push(("resizeToFit", b(true))),
+            NodeKind::Section { contents_hidden } => f.push(("sectionContentsHidden", b(*contents_hidden))),
+            NodeKind::Ellipse { start, sweep, inner } => {
+                f.push(("arcData", o(vec![("startingAngle", fl(*start)), ("endingAngle", fl(start + sweep)), ("innerRadius", fl(*inner))])))
+            }
+            NodeKind::Polygon { count } => f.push(("count", u(*count))),
+            NodeKind::Star { count, inner_ratio } => f.extend([("count", u(*count)), ("starInnerScale", fl(*inner_ratio))]),
+            NodeKind::Vector { network } => self.vector(n, network, f),
+            NodeKind::Text(td) => self.text(td, &n.fills, f),
+            NodeKind::BooleanOp { op } => {
+                let name = match op {
+                    BoolOp::Union => "UNION",
+                    BoolOp::Subtract => "SUBTRACT",
+                    BoolOp::Intersect => "INTERSECT",
+                    BoolOp::Exclude => "XOR",
+                };
+                f.push(("booleanOperation", e(name)));
+                if n.children.iter().filter_map(|c| doc.node(*c)).any(|c| c.bool_op.is_some()) {
+                    self.warn("boolean groups whose layers combine in different ways use the group's operation");
+                }
+            }
+            NodeKind::Component { description, props } if !nested => {
+                if let Some(set) = self.set_of(n.id) {
+                    // A variant: its set holds the definitions; the variant has its own copy of
+                    // each (pointing at the set's), and its values of the variant properties.
+                    let own: Vec<Kv> = props
+                        .iter()
+                        .filter_map(|(name, d)| {
+                            let ty = prop_type(d)?;
+                            let id = *self.child_defs.get(&(n.id, name.clone(), ty))?;
+                            let parent = *self.defs.get(&(set, name.clone(), ty))?;
+                            Some(o(vec![("id", guid(AUX, id)), ("parentPropDefId", guid(AUX, parent))]))
+                        })
+                        .collect();
+                    if !own.is_empty() {
+                        f.push(("componentPropDefs", arr(own)));
+                    }
+                    let specs: Vec<Kv> = variant_pairs(&n.name)
+                        .into_iter()
+                        .filter_map(|(prop, value)| {
+                            let id = *self.defs.get(&(set, prop, "VARIANT"))?;
+                            Some(o(vec![("propDefId", guid(AUX, id)), ("value", s(&value))]))
+                        })
+                        .collect();
+                    if !specs.is_empty() {
+                        f.push(("variantPropSpecs", arr(specs)));
+                    }
+                } else {
+                    let defs: Vec<Kv> = props.iter().enumerate().filter_map(|(i, (name, d))| self.prop_def(n.id, name, d, i)).collect();
+                    if !defs.is_empty() {
+                        f.push(("componentPropDefs", arr(defs)));
+                    }
+                }
+                if props.values().any(|d| matches!(d, PropDef::Slot { .. })) {
+                    self.warn("slot properties were left out");
+                }
+                if !description.is_empty() {
+                    f.push(("symbolDescription", s(description)));
+                }
+            }
+            NodeKind::ComponentSet { description } if !nested => {
+                f.push(("isStateGroup", b(true)));
+                self.set_props(n, f);
+                if !description.is_empty() {
+                    f.push(("symbolDescription", s(description)));
+                }
+            }
+            NodeKind::Instance { props, .. } if !nested => {
+                if let Some(main) = main {
+                    self.instance(n, main, props, f);
+                }
+            }
+            _ => {}
+        }
+        let boxy = n.kind.is_frame_like() || matches!(n.kind, NodeKind::Rectangle | NodeKind::Section { .. });
+        if (boxy || matches!(n.kind, NodeKind::Ellipse { .. } | NodeKind::Polygon { .. } | NodeKind::Star { .. }))
+            && let Some(p) = figcraft_doc::geometry::shape_path(n)
+        {
+            self.geometry("fillGeometry", &p, WindingRule::NonZero, f);
+        }
+        self.stroke_geometry(n, boxy, f);
+        main.is_none()
+    }
+
+    /// Fields every layer kind shares.
+    fn common(&mut self, n: &Node, parent: Option<&Node>, f: &mut Fields) {
+        f.extend([
+            ("visible", b(n.visible)),
+            ("locked", b(n.locked)),
+            ("opacity", fl(n.opacity.into())),
+            ("blendMode", e(blend_name(n.blend))),
+            ("size", xy(n.width, n.height)),
+            ("transform", matrix(n.transform)),
+        ]);
+        if n.is_mask {
+            let ty = match n.mask_type {
+                MaskType::Alpha => "ALPHA",
+                MaskType::Vector => "OUTLINE",
+                MaskType::Luminance => "LUMINANCE",
+            };
+            f.extend([("mask", b(true)), ("maskType", e(ty))]);
+        }
+        let bound = self.bound(n);
+        // Text whose own style sets fills paints with them (the layer's fills only show through
+        // runs); a variable bound to the layer's fill colours the layer's.
+        let fills = match &n.kind {
+            NodeKind::Text(TextData { style: TextStyle { fills: Some(own), .. }, .. }) => self.paints(own, true, &Bound::default()),
+            _ => self.paints(&n.fills, true, &bound),
+        };
+        let strokes = self.paints(&n.strokes, false, &bound);
+        f.extend([("fillPaints", fills), ("strokePaints", strokes)]);
+        self.stroke(n, f);
+        if !n.effects.is_empty() {
+            let effects = n.effects.iter().enumerate().map(|(i, x)| self.effect(x, i, &bound)).collect();
+            f.push(("effects", arr(effects)));
+        }
+        if n.kind.has_corner_radius() {
+            let r = n.corners.radii;
+            f.push(("cornerRadius", fl(r[0])));
+            let differ = r.iter().any(|x| *x != r[0]);
+            if n.kind.has_independent_corners() && (differ || r[0] > 0.0) {
+                f.extend(differ.then(|| ("rectangleCornerRadiiIndependent", b(true))));
+                f.extend([
+                    ("rectangleTopLeftCornerRadius", fl(r[0])),
+                    ("rectangleTopRightCornerRadius", fl(r[1])),
+                    ("rectangleBottomRightCornerRadius", fl(r[2])),
+                    ("rectangleBottomLeftCornerRadius", fl(r[3])),
+                ]);
+            }
+            if n.corners.smoothing > 0.0 {
+                f.push(("cornerSmoothing", fl(n.corners.smoothing)));
+            }
+        }
+        let h = match n.constraints.horizontal {
+            HConstraint::Left => "MIN",
+            HConstraint::Right => "MAX",
+            HConstraint::LeftRight => "STRETCH",
+            HConstraint::Center => "CENTER",
+            HConstraint::Scale => "SCALE",
+        };
+        let v = match n.constraints.vertical {
+            VConstraint::Top => "MIN",
+            VConstraint::Bottom => "MAX",
+            VConstraint::TopBottom => "STRETCH",
+            VConstraint::Center => "CENTER",
+            VConstraint::Scale => "SCALE",
+        };
+        f.extend([("horizontalConstraint", e(h)), ("verticalConstraint", e(v))]);
+        if n.kind.is_frame_like() || matches!(n.kind, NodeKind::Section { .. }) {
+            f.push(("frameMaskDisabled", b(!n.clip)));
+        }
+        if n.kind.is_frame_like() {
+            if let Some(l) = &n.layout {
+                self.auto_layout(n, l, f);
+            }
+            if !n.grids.is_empty() {
+                f.push(("layoutGrids", arr(n.grids.iter().enumerate().map(|(i, g)| layout_grid(g, i, &bound)).collect())));
+            }
+        }
+        self.child_layout(n, parent, f);
+        if !n.exports.is_empty() {
+            if n.exports.iter().any(|x| x.format == figcraft_doc::ExportFormat::Webp) {
+                self.warn("WebP export settings were written as PNG");
+            }
+            if n.exports.iter().any(|x| x.format == figcraft_doc::ExportFormat::VectorDrawable) {
+                self.warn("Android Vector Drawable (XML) export settings were written as SVG");
+            }
+            f.push(("exportSettings", arr(n.exports.iter().map(export_setting).collect())));
+        }
+        self.prototype(n, f);
+        let (entries, refs): (Vec<Kv>, Vec<Kv>) = n.prop_refs.iter().filter_map(|(field, prop)| self.prop_ref(n, field, prop)).unzip();
+        if !entries.is_empty() {
+            f.push(("parameterConsumptionMap", o(vec![("entries", arr(entries))])));
+            f.push(("componentPropRefs", arr(refs)));
+        }
+        let text = matches!(n.kind, NodeKind::Text(_));
+        let links = [
+            ("styleIdForFill", &n.styles.fill, true),
+            ("styleIdForStrokeFill", &n.styles.stroke, true),
+            ("styleIdForEffect", &n.styles.effect, true),
+            ("styleIdForGrid", &n.styles.grid, n.kind.is_frame_like()),
+            ("styleIdForText", &n.styles.text, text),
+        ];
+        for (key, id, fits) in links {
+            let Some(id) = id else { continue };
+            match self.style_ids.get(id.as_str()).filter(|_| fits) {
+                Some(local) => f.push((key, o(vec![("guid", guid(LAYERS, *local))]))),
+                None => self.warn("links to shared styles that aren't in the document were left out (their layers keep the values)"),
+            }
+        }
+        if let NodeKind::Text(td) = &n.kind
+            && n.styles.text.is_none()
+            && std::iter::once(&td.style).chain(td.runs.iter().map(|r| &r.style)).any(|st| st.style_id.is_some())
+        {
+            self.warn("text styles applied to part of a text were written as their values");
+        }
+        if !bound.entries.is_empty() {
+            f.push(("variableConsumptionMap", o(vec![("entries", arr(bound.entries))])));
+        }
+        self.modes(n, f);
+        if !n.guides.is_empty() {
+            self.warn("ruler guides were left out");
+        }
+        if !n.annotations.is_empty()
+            || !n.dev_resources.is_empty()
+            || !n.code_links.is_empty()
+            || !n.measurements.is_empty()
+            || !n.dev_status.is_none()
+        {
+            self.warn("Dev Mode annotations, statuses, resources, measurements and code links were left out");
+        }
+        if !n.plugin_data.is_empty() {
+            self.warn("plugin data was left out");
+        }
+    }
+
+    /// The variable modes layer (or page) `n` sets for what is in it.
+    fn modes(&mut self, n: &Node, f: &mut Fields) {
+        let mut entries = Vec::new();
+        for (coll, mode) in &n.var_modes {
+            match (self.set_ids.get(coll.as_str()), self.mode_ids.get(&(coll.as_str(), mode.as_str()))) {
+                (Some(set), Some(mode)) => {
+                    entries.push(o(vec![("variableSetID", o(vec![("guid", guid(LAYERS, *set))])), ("variableModeID", guid(AUX, *mode))]));
+                }
+                _ => self.warn("variable modes of collections that aren't in the document were left out"),
+            }
+        }
+        if !entries.is_empty() {
+            f.push(("variableModeBySetMap", o(vec![("entries", arr(entries))])));
+        }
+    }
+
+    fn auto_layout(&mut self, n: &Node, l: &AutoLayout, f: &mut Fields) {
+        let grid = l.mode == LayoutMode::Grid;
+        let mode = match l.mode {
+            LayoutMode::Horizontal => "HORIZONTAL",
+            LayoutMode::Vertical => "VERTICAL",
+            LayoutMode::Grid => "GRID",
+        };
+        let [top, right, bottom, left] = l.padding;
+        let main = match l.main_align {
+            MainAlign::Min => "MIN",
+            MainAlign::Center => "CENTER",
+            MainAlign::Max => "MAX",
+            MainAlign::SpaceBetween => "SPACE_BETWEEN",
+            MainAlign::SpaceAround => "SPACE_AROUND",
+            MainAlign::SpaceEvenly => "SPACE_EVENLY_CSS",
+        };
+        let cross = match l.cross_align {
+            CrossAlign::Min => "MIN",
+            CrossAlign::Center => "CENTER",
+            CrossAlign::Max => "MAX",
+            CrossAlign::Baseline => "BASELINE",
+        };
+        // The main axis is the width for horizontal and grid layouts.
+        let (main_hug, cross_hug) = {
+            let (h, v) = (n.child_layout.sizing_h == Sizing::Hug, n.child_layout.sizing_v == Sizing::Hug);
+            if l.mode == LayoutMode::Vertical { (v, h) } else { (h, v) }
+        };
+        let size = |hug: bool| e(if hug { "RESIZE_TO_FIT" } else { "FIXED" });
+        f.extend([
+            ("stackMode", e(mode)),
+            ("stackWrap", e(if l.wrap { "WRAP" } else { "NO_WRAP" })),
+            ("stackHorizontalPadding", fl(left)),
+            ("stackVerticalPadding", fl(top)),
+            ("stackPaddingRight", fl(right)),
+            ("stackPaddingBottom", fl(bottom)),
+            ("stackPrimaryAlignItems", e(main)),
+            ("stackCounterAlignItems", e(cross)),
+            ("stackPrimarySizing", size(main_hug)),
+            ("stackCounterSizing", size(cross_hug)),
+            ("bordersTakeSpace", b(l.strokes_included)),
+            ("stackReverseZIndex", b(l.reverse_z)),
+        ]);
+        if grid {
+            self.grid_layout(n, l, f);
+        } else {
+            let spread = l.content_align == ContentAlign::SpaceBetween;
+            f.extend([
+                ("stackSpacing", fl(l.gap)),
+                ("stackCounterSpacing", fl(l.cross_gap)),
+                ("stackCounterAlignContent", e(if spread { "SPACE_BETWEEN" } else { "AUTO" })),
+            ]);
+        }
+    }
+
+    /// A grid layout's track gaps, order and sizes.
+    fn grid_layout(&mut self, n: &Node, l: &AutoLayout, f: &mut Fields) {
+        // Instance layers share their main layer's track ids, so unchanged tracks and the cells
+        // their layers sit in still match.
+        let key = self.main_layer(n.id);
+        let (want_c, want_r) = (l.grid_columns.min(1000) as usize, l.grid_rows.min(1000) as usize);
+        let (cols, rows) = match self.tracks.get(&key) {
+            Some((c, r)) if (c.len(), r.len()) == (want_c, want_r) => (c.clone(), r.clone()),
+            _ => ((0..want_c).map(|_| self.next_aux()).collect(), (0..want_r).map(|_| self.next_aux()).collect()),
+        };
+        let map = |ids: &[u32]| {
+            o(vec![("entries", arr(ids.iter().enumerate().map(|(i, t)| o(vec![("id", guid(AUX, *t)), ("position", s(&position(i)))])).collect()))])
+        };
+        f.extend([("gridColumnGap", fl(l.gap)), ("gridRowGap", fl(l.cross_gap)), ("gridColumns", map(&cols)), ("gridRows", map(&rows))]);
+        let mut dropped = false;
+        let column_sizing = grid_sizing(&l.column_tracks, &cols, &mut dropped);
+        let row_sizing = grid_sizing(&l.row_tracks, &rows, &mut dropped);
+        if dropped {
+            self.warn("grid tracks whose size the format can't hold were written as equal tracks");
+        }
+        for (name, sizing) in [("gridColumnsSizing", column_sizing), ("gridRowsSizing", row_sizing)] {
+            if let Some(v) = sizing {
+                f.push((name, v));
+            }
+        }
+        self.tracks.insert(key, (cols, rows));
+    }
+
+    /// How a layer sizes and sits in its auto layout parent. Min/max sizes are the layer's own
+    /// and are written whatever its parent is.
+    fn child_layout(&mut self, n: &Node, parent: Option<&Node>, f: &mut Fields) {
+        let cl = &n.child_layout;
+        // An axis without a minimum is 0; one without a maximum is infinite (0 would be a maximum
+        // of 0, which collapses the layer in readers that apply it).
+        for (key, w, h, none) in [("minSize", cl.min_w, cl.min_h, 0.0), ("maxSize", cl.max_w, cl.max_h, f32::INFINITY)] {
+            if w.is_some() || h.is_some() {
+                let axis = |x: Option<f64>| x.map_or(Kv::Float(none), fl);
+                f.push((key, o(vec![("value", o(vec![("x", axis(w)), ("y", axis(h))]))])));
+            }
+        }
+        let Some(pl) = parent.and_then(|p| p.layout.as_ref()) else { return };
+        let (fill_h, fill_v) = (cl.sizing_h == Sizing::Fill, cl.sizing_v == Sizing::Fill);
+        let (grow, stretch) = if pl.mode == LayoutMode::Vertical { (fill_v, fill_h) } else { (fill_h, fill_v) };
+        if grow {
+            f.push(("stackChildPrimaryGrow", fl(1.0)));
+        }
+        if stretch {
+            f.push(("stackChildAlignSelf", e("STRETCH")));
+        }
+        if cl.absolute {
+            f.push(("stackPositioning", e("ABSOLUTE")));
+        }
+        if pl.mode == LayoutMode::Grid
+            && let Some((cols, rows)) = parent.and_then(|p| self.tracks.get(&self.main_layer(p.id)))
+        {
+            let anchor = |ids: &[u32], i: Option<u32>| i.and_then(|i| ids.get(i as usize)).map(|t| guid(AUX, *t));
+            let (c, r) = (anchor(cols, cl.grid_column), anchor(rows, cl.grid_row));
+            f.extend(c.map(|g| ("gridColumnAnchor", g)));
+            f.extend(r.map(|g| ("gridRowAnchor", g)));
+            if cl.grid_column_span > 0 {
+                f.push(("gridColumnSpan", int(cl.grid_column_span.into())));
+            }
+            if cl.grid_row_span > 0 {
+                f.push(("gridRowSpan", int(cl.grid_row_span.into())));
+            }
+        }
+    }
+}
diff --git a/crates/format/src/fig/export/paint.rs b/crates/format/src/fig/export/paint.rs
new file mode 100644
index 00000000..f0f40c18
--- /dev/null
+++ b/crates/format/src/fig/export/paint.rs
@@ -0,0 +1,239 @@
+use super::common::one_sided;
+use super::*;
+
+impl<'d> Exporter<'d> {
+    /// A paint list: a layer's fills (`fills`) or strokes with the variables `bound` to them.
+    pub(super) fn paints(&mut self, list: &[Paint], fills: bool, bound: &Bound) -> Kv<'static> {
+        arr(list.iter().enumerate().filter_map(|(i, p)| self.paint(p, (fills, i), bound)).collect())
+    }
+
+    fn paint(&mut self, p: &Paint, at: (bool, usize), bound: &Bound) -> Option<Kv<'static>> {
+        let mut f: Fields = vec![("visible", b(p.visible)), ("blendMode", e(blend_name(p.blend)))];
+        let mut opacity = f64::from(p.opacity);
+        match &p.kind {
+            PaintKind::Solid { color: c } => {
+                opacity *= f64::from(c.a);
+                f.extend([("type", e("SOLID")), ("color", color(c.with_alpha(1.0)))]);
+                f.extend(bound.paints.get(&at).map(|a| ("colorVar", a.clone())));
+            }
+            PaintKind::Gradient(g) => {
+                let ty = match g.kind {
+                    GradientKind::Linear => "GRADIENT_LINEAR",
+                    GradientKind::Radial => "GRADIENT_RADIAL",
+                    GradientKind::Angular => "GRADIENT_ANGULAR",
+                    GradientKind::Diamond => "GRADIENT_DIAMOND",
+                };
+                // The handles in the unit box come from the inverse of the paint transform: it maps
+                // (0, ½) → start, (1, ½) → end, (0, 1) → width for linear gradients, and the centre
+                // (½, ½) and the points half a box away from it for the others.
+                let (from, to, width) = (g.from, g.to, g.width);
+                let (ax, ay) =
+                    if g.kind == GradientKind::Linear { (to.0 - from.0, to.1 - from.1) } else { (2.0 * (to.0 - from.0), 2.0 * (to.1 - from.1)) };
+                let (cx, cy) = (2.0 * (width.0 - from.0), 2.0 * (width.1 - from.1));
+                let (ex, ey) = if g.kind == GradientKind::Linear {
+                    (from.0 - 0.5 * cx, from.1 - 0.5 * cy)
+                } else {
+                    (from.0 - 0.5 * (ax + cx), from.1 - 0.5 * (ay + cy))
+                };
+                let handles = Affine::new([ax, ay, cx, cy, ex, ey]);
+                let t = if handles.determinant().abs() > 1e-12 && handles.as_coeffs().iter().all(|x| x.is_finite()) {
+                    handles.inverse()
+                } else {
+                    self.warn("gradients with handles on one line were written with the default direction");
+                    Affine::IDENTITY
+                };
+                let stops = g.stops.iter().map(|st| o(vec![("color", color(st.color)), ("position", fl(st.position.into()))])).collect();
+                f.extend([("type", e(ty)), ("stops", arr(stops)), ("transform", matrix(t))]);
+                // Stops bound to variables: every stop again, the bound ones with their variable.
+                if bound.stops.range((at.0, at.1, 0)..=(at.0, at.1, usize::MAX)).next().is_some() {
+                    let vars = g.stops.iter().enumerate().map(|(j, st)| {
+                        let mut sf: Fields = vec![("color", color(st.color))];
+                        sf.extend(bound.stops.get(&(at.0, at.1, j)).map(|a| ("colorVar", a.clone())));
+                        sf.push(("position", fl(st.position.into())));
+                        o(sf)
+                    });
+                    f.push(("stopsVar", arr(vars.collect())));
+                }
+            }
+            PaintKind::Image(img) => {
+                let hash = self.image(&img.image);
+                let mode = match img.scale_mode {
+                    ImageScaleMode::Fill => "FILL",
+                    ImageScaleMode::Fit => "FIT",
+                    ImageScaleMode::Crop => "STRETCH",
+                    ImageScaleMode::Tile => "TILE",
+                };
+                f.extend([
+                    ("type", e("IMAGE")),
+                    ("image", o(vec![("hash", Kv::Bytes(hash)), ("name", s(""))])),
+                    ("imageScaleMode", e(mode)),
+                    ("rotation", fl(f64::from(img.rotation.rem_euclid(4)) * 90.0)),
+                    ("scale", fl(img.scale)),
+                ]);
+                if let (ImageScaleMode::Crop, Some(c)) = (img.scale_mode, img.crop) {
+                    f.push(("transform", matrix(Affine::new(c))));
+                }
+                if img.filters != Default::default() {
+                    self.warn("image adjustments (exposure, contrast, …) were left out");
+                }
+            }
+            PaintKind::Pattern(_) => {
+                self.warn("pattern fills were left out");
+                return None;
+            }
+        }
+        f.push(("opacity", fl(opacity)));
+        Some(o(f))
+    }
+
+    /// The hash bytes of image `key`, writing its file once (empty when its bytes aren't there).
+    fn image(&mut self, key: &str) -> Vec<u8> {
+        let hex = match self.images.get(key) {
+            Some(h) => h.clone(),
+            None => {
+                let h = match self.doc.images.get(key) {
+                    Some(img) if img.bytes.len() as u64 <= MAX_IMAGE => {
+                        let h = sha1_hex(&img.bytes);
+                        if !self.files.iter().any(|(x, _)| *x == h) {
+                            self.files.push((h.clone(), img.bytes.clone()));
+                        }
+                        Some(h)
+                    }
+                    Some(_) => {
+                        self.warn("images larger than 256 MB were left out");
+                        None
+                    }
+                    None => {
+                        self.warn("image fills whose image isn't in the document were written without one");
+                        None
+                    }
+                };
+                self.images.insert(key.to_string(), h.clone());
+                h
+            }
+        };
+        let hex = hex.unwrap_or_default();
+        (0..hex.len() / 2).filter_map(|i| hex.get(2 * i..2 * i + 2).and_then(|d| u8::from_str_radix(d, 16).ok())).collect()
+    }
+
+    pub(super) fn stroke(&mut self, n: &Node, f: &mut Fields) {
+        let sp = &n.stroke;
+        let align = match sp.align {
+            StrokeAlign::Inside => "INSIDE",
+            StrokeAlign::Center => "CENTER",
+            StrokeAlign::Outside => "OUTSIDE",
+        };
+        f.extend([
+            ("strokeWeight", fl(sp.weight)),
+            ("strokeAlign", e(align)),
+            ("strokeJoin", e(join_name(sp.join))),
+            ("strokeCap", e(cap_name(sp.cap_start))),
+            ("miterLimit", fl(sp.miter_limit)),
+        ]);
+        if !sp.dashes.is_empty() {
+            f.push(("dashPattern", arr(sp.dashes.iter().map(|d| fl(*d)).collect())));
+        }
+        if let Some([t, r, bo, l]) = sp.sides {
+            f.extend([
+                ("borderStrokeWeightsIndependent", b(true)),
+                ("borderTopWeight", fl(t)),
+                ("borderRightWeight", fl(r)),
+                ("borderBottomWeight", fl(bo)),
+                ("borderLeftWeight", fl(l)),
+            ]);
+        }
+        // A variable width: how far the stroke reaches on each side of the path at positions along
+        // its length, as a share of the stroke weight (half of it each for the full weight). The
+        // two sides are the same: a reader draws nothing for a point with unequal sides.
+        if let Some(p) = sp.profile().filter(|_| sp.weight.is_finite() && sp.weight > 0.0) {
+            let point = |q: &figcraft_doc::WidthPoint| o(vec![("position", fl(q.t)), ("ascent", fl(q.scale / 2.0)), ("descent", fl(q.scale / 2.0))]);
+            let p = p.sanitized();
+            if one_sided(&p) {
+                self.warn("strokes wider on one side of their path were written with that width on both sides");
+            }
+            f.push(("variableWidthPoints", arr(p.points.iter().map(point).collect())));
+        }
+        if sp.brush.is_some() {
+            self.warn("brush strokes were written as plain strokes");
+        }
+        if [sp.cap_start, sp.cap_end].contains(&StrokeCap::ReversedTriangle) {
+            self.warn("reversed triangle stroke ends were written as triangle arrows");
+        }
+        // Vectors keep each end's cap on their end points; other layers have one cap.
+        if sp.cap_start != sp.cap_end && !matches!(n.kind, NodeKind::Vector { .. }) {
+            self.warn("lines with different stroke ends use the start's at both ends");
+        }
+    }
+
+    /// Effect `index` of a layer, with the variables `bound` to its fields.
+    pub(super) fn effect(&mut self, x: &figcraft_doc::Effect, index: usize, bound: &Bound) -> Kv<'static> {
+        let mut f: Fields = vec![("visible", b(x.visible))];
+        let vars = [
+            ("color", "colorVar"),
+            ("radius", "radiusVar"),
+            ("spread", "spreadVar"),
+            ("offsetX", "xVar"),
+            ("offsetY", "yVar"),
+            ("startRadius", "startRadiusVar"),
+        ];
+        f.extend(vars.into_iter().filter_map(|(ours, key)| Some((key, bound.effects.get(&(index, ours))?.clone()))));
+        let blur = |f: &mut Fields, ty: &'static str, bl: &figcraft_doc::Blur| {
+            f.extend([("type", e(ty)), ("radius", fl(bl.radius))]);
+            if bl.blur_type == figcraft_doc::BlurType::Progressive {
+                f.extend([
+                    ("blurOpType", e("PROGRESSIVE")),
+                    ("startRadius", fl(bl.start_radius)),
+                    ("startOffset", xy(bl.start.0, bl.start.1)),
+                    ("endOffset", xy(bl.end.0, bl.end.1)),
+                ]);
+            }
+        };
+        let grain = |size: f64, size_y: Option<f64>| xy(size, size_y.unwrap_or(size));
+        match &x.kind {
+            EffectKind::DropShadow(sh) | EffectKind::InnerShadow(sh) => {
+                let ty = if matches!(x.kind, EffectKind::DropShadow(_)) { "DROP_SHADOW" } else { "INNER_SHADOW" };
+                f.extend([
+                    ("type", e(ty)),
+                    ("color", color(sh.color)),
+                    ("offset", xy(sh.offset.0, sh.offset.1)),
+                    ("radius", fl(sh.radius)),
+                    ("spread", fl(sh.spread)),
+                    ("blendMode", e(blend_name(sh.blend))),
+                    ("showShadowBehindNode", b(sh.show_behind)),
+                ]);
+            }
+            EffectKind::LayerBlur(bl) => blur(&mut f, "FOREGROUND_BLUR", bl),
+            EffectKind::BackgroundBlur(bl) => blur(&mut f, "BACKGROUND_BLUR", bl),
+            EffectKind::Noise(nz) => {
+                let mode = match nz.mode {
+                    NoiseMode::Mono => "MONOTONE",
+                    NoiseMode::Duo => "DUOTONE",
+                    NoiseMode::Multi => "MULTITONE",
+                };
+                f.extend([
+                    ("type", e("NOISE")),
+                    ("noiseType", e(mode)),
+                    ("noiseSize", grain(nz.size, nz.size_y)),
+                    ("density", fl(nz.density)),
+                    ("color", color(nz.color)),
+                    ("secondaryColor", color(nz.secondary)),
+                    ("opacity", fl(nz.opacity.into())),
+                    ("blendMode", e(blend_name(nz.blend))),
+                ]);
+            }
+            EffectKind::Texture(t) => {
+                f.extend([
+                    ("type", e("GRAIN")),
+                    ("noiseSize", grain(t.size, t.size_y)),
+                    ("radius", fl(t.radius)),
+                    ("clipToShape", b(t.clip_to_shape)),
+                ]);
+            }
+            EffectKind::Glass(g) => {
+                self.warn("glass effects keep only their frost");
+                f.extend([("type", e("GLASS")), ("radius", fl(g.frost))]);
+            }
+        }
+        o(f)
+    }
+}
diff --git a/crates/format/src/fig/export/prototype.rs b/crates/format/src/fig/export/prototype.rs
new file mode 100644
index 00000000..866b03c4
--- /dev/null
+++ b/crates/format/src/fig/export/prototype.rs
@@ -0,0 +1,174 @@
+use super::common::key_codes;
+use super::*;
+
+impl<'d> Exporter<'d> {
+    /// Interactions, scrolling, flow starts and the overlay settings this layer is opened with.
+    pub(super) fn prototype(&mut self, n: &Node, f: &mut Fields) {
+        self.trigger_size = [n.width, n.height];
+        let list: Vec<Kv> = n.interactions.iter().filter_map(|it| self.interaction(it)).collect();
+        if !list.is_empty() {
+            f.push(("prototypeInteractions", arr(list)));
+        }
+        let dir = match n.overflow {
+            Overflow::None => None,
+            Overflow::Horizontal => Some("HORIZONTAL"),
+            Overflow::Vertical => Some("VERTICAL"),
+            Overflow::Both => Some("BOTH"),
+        };
+        f.extend(dir.map(|d| ("scrollDirection", e(d))));
+        let behavior = match n.scroll_position {
+            ScrollPosition::Scrolls => None,
+            ScrollPosition::Fixed => Some("FIXED_WHEN_CHILD_OF_SCROLLING_FRAME"),
+            ScrollPosition::Sticky => Some("STICKY_SCROLLS"),
+        };
+        f.extend(behavior.map(|x| ("scrollBehavior", e(x))));
+        if let Some((i, name)) = self.starts.get(&n.id) {
+            f.push(("prototypeStartingPoint", o(vec![("name", s(name)), ("position", s(&position(*i)))])));
+        }
+        if let Some(ov) = self.overlays.get(&n.id) {
+            const POSITIONS: [&str; 8] = ["CENTER", "TOP_LEFT", "TOP_CENTER", "TOP_RIGHT", "BOTTOM_LEFT", "BOTTOM_CENTER", "BOTTOM_RIGHT", "MANUAL"];
+            let pos = POSITIONS.into_iter().find(|p| crate::rest::proto::overlay_position(p) == Some(ov.position)).unwrap_or("CENTER");
+            let bg = match ov.background {
+                Some(c) => o(vec![("backgroundType", e("SOLID_COLOR")), ("backgroundColor", color(c))]),
+                None => o(vec![("backgroundType", e("NONE"))]),
+            };
+            f.extend([
+                ("overlayPositionType", e(pos)),
+                ("overlayBackgroundInteraction", e(if ov.close_on_outside { "CLOSE_ON_CLICK_OUTSIDE" } else { "NONE" })),
+                ("overlayBackgroundAppearance", bg),
+            ]);
+        }
+    }
+
+    fn interaction(&mut self, it: &Interaction) -> Option<Kv<'static>> {
+        let mut event: Fields = Vec::new();
+        let ty = match &it.trigger {
+            Trigger::OnClick => "ON_CLICK",
+            Trigger::OnHover => "ON_HOVER",
+            Trigger::OnPress => "ON_PRESS",
+            Trigger::OnDrag => "DRAG",
+            Trigger::MouseEnter => "MOUSE_IN",
+            Trigger::MouseLeave => "MOUSE_OUT",
+            Trigger::MouseDown => "MOUSE_DOWN",
+            Trigger::MouseUp => "MOUSE_UP",
+            Trigger::AfterDelay { ms } => {
+                event.push(("transitionTimeout", fl(f64::from(*ms) / 1000.0)));
+                "AFTER_TIMEOUT"
+            }
+            Trigger::KeyPress { key } => {
+                let Some((codes, pad)) = key_codes(key) else {
+                    self.warn("key triggers on keys the format has no code for were left out");
+                    return None;
+                };
+                let device = e(if pad { "UNKNOWN_CONTROLLER" } else { "KEYBOARD" });
+                event.push(("keyTrigger", o(vec![("keyCodes", arr(codes.into_iter().map(int).collect())), ("triggerDevice", device)])));
+                "ON_KEY_DOWN"
+            }
+        };
+        // A mouse trigger's delay is the event's timeout.
+        if it.delay_secs() > 0.0 {
+            event.push(("transitionTimeout", fl(it.delay_secs())));
+        }
+        event.insert(0, ("interactionType", e(ty)));
+        let actions: Vec<Kv> = it.actions.iter().filter_map(|a| self.action(a, it)).collect();
+        (!actions.is_empty()).then(|| o(vec![("event", o(event)), ("actions", arr(actions))]))
+    }
+
+    fn action(&mut self, a: &Action, it: &Interaction) -> Option<Kv<'static>> {
+        let node = |x: &mut Self, dest: &NodeId, nav: &'static str| -> Option<Kv<'static>> {
+            let Some(g) = x.guid_of(*dest) else {
+                x.warn("prototype actions whose destination isn't written were left out");
+                return None;
+            };
+            let mut f: Fields = vec![("transitionNodeID", g), ("connectionType", e("INTERNAL_NODE")), ("navigationType", e(nav))];
+            x.transition(it, &mut f);
+            Some(o(f))
+        };
+        let plain = |ty: &'static str| Some(o(vec![("connectionType", e(ty))]));
+        match a {
+            Action::Navigate { dest, preserve_scroll } => {
+                let mut act = node(self, dest, "NAVIGATE")?;
+                if let Kv::Object(f) = &mut act {
+                    f.push(("transitionPreserveScroll", b(*preserve_scroll)));
+                }
+                Some(act)
+            }
+            Action::OpenOverlay { dest, position, offset, anchor, .. } => {
+                let mut act = node(self, dest, "OVERLAY")?;
+                let size = self.doc.node(*dest).map_or([0.0, 0.0], |d| [d.width, d.height]);
+                let offset = match anchor.offset(*position, self.trigger_size, size) {
+                    Some(o) => Some(o),
+                    None if *position == OverlayPosition::Manual => *offset,
+                    None => None,
+                };
+                if let (Kv::Object(f), Some([x, y])) = (&mut act, offset) {
+                    f.push(("overlayRelativePosition", o(vec![("x", fl(x)), ("y", fl(y))])));
+                }
+                Some(act)
+            }
+            Action::SwapOverlay { dest } => node(self, dest, "SWAP"),
+            Action::ChangeTo { dest } => node(self, dest, "SWAP_STATE"),
+            Action::ScrollTo { dest, offset } => {
+                if *offset != [0.0, 0.0] {
+                    self.warn("scroll-to offsets were left out");
+                }
+                node(self, dest, "SCROLL_TO")
+            }
+            Action::Back => plain("BACK"),
+            Action::CloseOverlay => plain("CLOSE"),
+            Action::OpenUrl { url } => Some(o(vec![("connectionType", e("URL")), ("connectionURL", s(url))])),
+            Action::SetVariable { .. } | Action::SetVariableMode { .. } | Action::Conditional { .. } => {
+                self.warn("variable and conditional prototype actions were left out");
+                None
+            }
+        }
+    }
+
+    /// An interaction's transition on one of its actions.
+    fn transition(&mut self, it: &Interaction, f: &mut Fields) {
+        let side_from = |d: Direction, l: &'static str, r: &'static str, t: &'static str, bo: &'static str| match d {
+            // The direction names where the incoming screen moves: it comes from the other side.
+            Direction::Right => l,
+            Direction::Left => r,
+            Direction::Bottom => t,
+            Direction::Top => bo,
+        };
+        let side_to = |d: Direction, l: &'static str, r: &'static str, t: &'static str, bo: &'static str| match d {
+            Direction::Left => l,
+            Direction::Right => r,
+            Direction::Top => t,
+            Direction::Bottom => bo,
+        };
+        let ty = match it.transition {
+            Transition::Instant => "INSTANT_TRANSITION",
+            Transition::Dissolve => "DISSOLVE",
+            Transition::SmartAnimate => "SMART_ANIMATE",
+            Transition::SlideIn { direction } => side_from(direction, "SLIDE_FROM_LEFT", "SLIDE_FROM_RIGHT", "SLIDE_FROM_TOP", "SLIDE_FROM_BOTTOM"),
+            Transition::Push { direction } => side_from(direction, "PUSH_FROM_LEFT", "PUSH_FROM_RIGHT", "PUSH_FROM_TOP", "PUSH_FROM_BOTTOM"),
+            Transition::MoveIn { direction } => side_from(direction, "MOVE_FROM_LEFT", "MOVE_FROM_RIGHT", "MOVE_FROM_TOP", "MOVE_FROM_BOTTOM"),
+            Transition::SlideOut { direction } => {
+                side_to(direction, "SLIDE_OUT_TO_LEFT", "SLIDE_OUT_TO_RIGHT", "SLIDE_OUT_TO_TOP", "SLIDE_OUT_TO_BOTTOM")
+            }
+            Transition::MoveOut { direction } => side_to(direction, "MOVE_OUT_TO_LEFT", "MOVE_OUT_TO_RIGHT", "MOVE_OUT_TO_TOP", "MOVE_OUT_TO_BOTTOM"),
+        };
+        let easing = match it.easing {
+            Easing::Linear => "LINEAR",
+            Easing::EaseIn => "IN_CUBIC",
+            Easing::EaseOut => "OUT_CUBIC",
+            Easing::EaseInOut => "INOUT_CUBIC",
+            Easing::EaseInBack => "IN_BACK_CUBIC",
+            Easing::EaseOutBack => "OUT_BACK_CUBIC",
+            Easing::EaseInOutBack => "INOUT_BACK_CUBIC",
+            Easing::Gentle => "GENTLE_SPRING",
+            Easing::CustomBezier { .. } => "CUSTOM_CUBIC",
+            Easing::Quick | Easing::Bouncy | Easing::Slow | Easing::CustomSpring { .. } => {
+                self.warn("spring animations other than Gentle were written as ease out");
+                "OUT_CUBIC"
+            }
+        };
+        f.extend([("transitionType", e(ty)), ("transitionDuration", fl(f64::from(it.duration_ms) / 1000.0)), ("easingType", e(easing))]);
+        if let Easing::CustomBezier { x1, y1, x2, y2 } = it.easing {
+            f.push(("easingFunction", arr(vec![fl(x1), fl(y1), fl(x2), fl(y2)])));
+        }
+    }
+}
diff --git a/crates/format/src/fig/export/shape.rs b/crates/format/src/fig/export/shape.rs
new file mode 100644
index 00000000..7ef79a78
--- /dev/null
+++ b/crates/format/src/fig/export/shape.rs
@@ -0,0 +1,341 @@
+use super::common::{style_fields, unsupported_decoration_look};
+use super::*;
+
+impl<'d> Exporter<'d> {
+    /// Text: its style, box settings, and characters with their styled runs. `fills`: the layer's
+    /// (what runs without fills of their own show when the text's own style sets other fills).
+    pub(super) fn text(&mut self, td: &TextData, fills: &[Paint], f: &mut Fields) {
+        style_fields(&td.style, f);
+        let (ha, va) = (
+            match td.align_h {
+                TextAlignH::Left => "LEFT",
+                TextAlignH::Center => "CENTER",
+                TextAlignH::Right => "RIGHT",
+                TextAlignH::Justified => "JUSTIFIED",
+            },
+            match td.align_v {
+                TextAlignV::Top => "TOP",
+                TextAlignV::Middle => "CENTER",
+                TextAlignV::Bottom => "BOTTOM",
+            },
+        );
+        let resize = match td.auto_resize {
+            TextAutoResize::WidthAndHeight => "WIDTH_AND_HEIGHT",
+            TextAutoResize::Height => "HEIGHT",
+            TextAutoResize::None | TextAutoResize::Truncate => "NONE",
+        };
+        f.extend([
+            ("textAlignHorizontal", e(ha)),
+            ("textAlignVertical", e(va)),
+            ("textAutoResize", e(resize)),
+            ("paragraphSpacing", fl(td.paragraph_spacing)),
+            ("paragraphIndent", fl(td.paragraph_indent)),
+            ("autoRename", b(false)),
+            ("fontVariantCommonLigatures", b(true)),
+            ("fontVariantContextualLigatures", b(true)),
+            ("fontVersion", s("")),
+            ("textUserLayoutVersion", u(5)),
+            ("textExplicitLayoutVersion", u(1)),
+            ("textBidiVersion", u(1)),
+            ("textTracking", fl(0.0)),
+            ("emojiImageSet", e("APPLE")),
+        ]);
+        if td.truncates() {
+            f.push(("textTruncation", e("ENDING")));
+        }
+        if td.max_lines > 0 {
+            f.push(("maxLines", int(td.max_lines.into())));
+        }
+        // Styles per UTF-16 unit: 0 for the base style, else an entry of the override table.
+        if td.char_count() > MAX_CHARS {
+            self.warn("text longer than 1,048,576 characters was cut");
+        }
+        let spans = td.spans();
+        let mut table: Vec<&TextStyle> = Vec::new();
+        let mut span_ids = Vec::with_capacity(spans.len());
+        for (_, _, st) in &spans {
+            span_ids.push(if **st == td.style {
+                0
+            } else {
+                let i = table.iter().position(|t| *t == *st).unwrap_or_else(|| {
+                    table.push(st);
+                    table.len() - 1
+                });
+                i as u32 + 1
+            });
+        }
+        let mut chars = String::new();
+        let mut ids: Vec<Kv> = Vec::new();
+        let mut span = 0;
+        for (i, ch) in td.characters.chars().take(MAX_CHARS).enumerate() {
+            while spans.get(span).is_some_and(|sp| i >= sp.1) {
+                span += 1;
+            }
+            // NULs can't be stored in a string.
+            if ch == '\0' {
+                continue;
+            }
+            chars.push(ch);
+            let id = span_ids.get(span).copied().unwrap_or(0);
+            ids.extend((0..ch.len_utf16()).map(|_| u(id)));
+        }
+        let mut data: Fields = vec![("characters", Kv::Str(chars))];
+        if !table.is_empty() {
+            let entries = table
+                .iter()
+                .zip(1u32..)
+                .map(|(st, id)| {
+                    let mut ef: Fields = vec![("styleID", u(id))];
+                    style_fields(st, &mut ef);
+                    // An empty link clears the text's own (a missing one would inherit it).
+                    if st.link.is_none() && td.style.link.is_some() {
+                        ef.push(("hyperlink", o(vec![("url", s(""))])));
+                    }
+                    if let Some(p) = st.fills.as_deref().or(td.style.fills.as_ref().map(|_| fills)) {
+                        ef.push(("fillPaints", self.paints(p, true, &Bound::default())));
+                    }
+                    o(ef)
+                })
+                .collect();
+            data.extend([("characterStyleIDs", arr(ids)), ("styleOverrideTable", arr(entries))]);
+        }
+        let lists: Vec<ListStyle> = (0..td.paragraph_count()).map(|p| td.para_list(p).list).collect();
+        let first = |i: usize, l: &ListStyle| *l != ListStyle::None && (i == 0 || lists.get(i - 1) != Some(l));
+        // Where each line's numbered list starts counting, less one: its first item's start, on
+        // every line of the list.
+        let mut run = 0;
+        let starts: Vec<u32> = lists
+            .iter()
+            .enumerate()
+            .map(|(i, l)| {
+                if first(i, l) {
+                    run = td.para_list(i).start_offset;
+                }
+                if *l == ListStyle::Numbered { run } else { 0 }
+            })
+            .collect();
+        // One entry per paragraph, each with every field a reader expects.
+        let line = |(i, l): (usize, &ListStyle)| {
+            let ty = match l {
+                ListStyle::None => "PLAIN",
+                ListStyle::Numbered => "ORDERED_LIST",
+                ListStyle::Bulleted => "UNORDERED_LIST",
+            };
+            let listed = *l != ListStyle::None;
+            let begins = first(i, l);
+            let start = starts.get(i).copied().unwrap_or(0);
+            o(vec![
+                ("lineType", e(ty)),
+                ("styleId", int(0)),
+                ("indentationLevel", int(i64::from(listed))),
+                ("sourceDirectionality", e("AUTO")),
+                ("listStartOffset", int(i64::from(start))),
+                ("isFirstLineOfList", b(begins)),
+            ])
+        };
+        data.push(("lines", arr(lists.iter().enumerate().map(line).collect())));
+        f.push(("textData", o(data)));
+        if (0..td.paragraph_count()).any(|p| td.para_list(p).indent > 0) {
+            self.warn("nested list levels were written as the first level");
+        }
+        let styles = std::iter::once(&td.style).chain(td.runs.iter().map(|r| &r.style));
+        if styles.clone().any(|st| unsupported_decoration_look(st) || !st.variations.is_empty()) {
+            self.warn("text decoration looks and variable font settings were left out");
+        }
+        if td.path.is_some() {
+            self.warn("text on a path was written as plain text");
+        }
+        if td.list_spacing != 0.0 || td.hanging_punctuation || td.hanging_list || td.leading_trim != Default::default() || !td.features.is_empty() {
+            self.warn("list spacing, hanging punctuation, leading trim and OpenType features were left out");
+        }
+    }
+
+    /// The editable network (with per-point corner radii, handle mirroring and end caps) and,
+    /// when it has filled areas, their outline.
+    pub(super) fn vector(&mut self, n: &Node, net: &VectorNetwork, f: &mut Fields) {
+        let entries: usize = net.regions.iter().flat_map(|r| &r.loops).map(Vec::len).sum();
+        if net.vertices.len() + net.segments.len() + entries > MAX_NETWORK {
+            self.warn("vector networks too large for the format were written as outlines");
+        } else {
+            // The stroke starts at the first end point and stops at the last: the layer's end caps go
+            // there (where the point has none of its own).
+            let mut degree = vec![0usize; net.vertices.len()];
+            for sg in &net.segments {
+                for i in [sg.a, sg.b] {
+                    if let Some(d) = degree.get_mut(i) {
+                        *d += 1;
+                    }
+                }
+            }
+            let ends: Vec<usize> = (0..degree.len()).filter(|i| degree.get(*i) == Some(&1)).collect();
+            let (first, last) = (ends.first().copied(), ends.last().copied());
+            let caps_differ = n.stroke.cap_start != n.stroke.cap_end || net.vertices.iter().any(|v| v.cap.is_some());
+            let mut styles: Vec<Fields> = Vec::new();
+            let mut style_of = |fields: Fields| -> u32 {
+                if fields.is_empty() {
+                    return 0;
+                }
+                let i = styles.iter().position(|x| *x == fields).unwrap_or_else(|| {
+                    styles.push(fields);
+                    styles.len() - 1
+                });
+                i as u32 + 1
+            };
+            let vertices = net
+                .vertices
+                .iter()
+                .enumerate()
+                .map(|(i, v)| {
+                    let mut st: Fields = Vec::new();
+                    if v.radius > 0.0 {
+                        st.push(("cornerRadius", fl(v.radius)));
+                    }
+                    if let Some(m) = v.mirror {
+                        st.push((
+                            "handleMirroring",
+                            e(match m {
+                                figcraft_doc::HandleMirroring::None => "NONE",
+                                figcraft_doc::HandleMirroring::Angle => "ANGLE",
+                                figcraft_doc::HandleMirroring::AngleAndLength => "ANGLE_AND_LENGTH",
+                            }),
+                        ));
+                    }
+                    let end_cap = if Some(i) == first {
+                        Some(n.stroke.cap_start)
+                    } else if Some(i) == last {
+                        Some(n.stroke.cap_end)
+                    } else {
+                        None
+                    };
+                    if let Some(c) = v.cap.or(end_cap.filter(|_| caps_differ)) {
+                        st.push(("strokeCap", e(cap_name(c))));
+                    }
+                    if let Some(j) = v.join {
+                        st.push(("strokeJoin", e(join_name(j))));
+                    }
+                    network::Vertex { style: style_of(st), x: finite(v.x), y: finite(v.y) }
+                })
+                .collect();
+            let segments = net
+                .segments
+                .iter()
+                .map(|sg| network::Segment {
+                    style: 0,
+                    a: sg.a,
+                    ta: (finite(sg.ta.0), finite(sg.ta.1)),
+                    b: sg.b,
+                    tb: (finite(sg.tb.0), finite(sg.tb.1)),
+                })
+                .collect();
+            let regions = net
+                .regions
+                .iter()
+                .map(|r| network::Region { style: 0, non_zero: r.winding == WindingRule::NonZero, loops: r.loops.clone() })
+                .collect();
+            let blob = network::encode(&network::Network { vertices, segments, regions });
+            let table = styles.into_iter().zip(1u32..).map(|(mut st, id)| {
+                st.insert(0, ("styleID", u(id)));
+                o(st)
+            });
+            let table: Vec<Kv> = table.collect();
+            if let Some(i) = self.blob(blob) {
+                f.push((
+                    "vectorData",
+                    o(vec![("vectorNetworkBlob", u(i)), ("normalizedSize", xy(n.width, n.height)), ("styleOverrideTable", arr(table))]),
+                ));
+            }
+        }
+        if !net.regions.is_empty() {
+            let winding = net.regions.first().map(|r| r.winding).unwrap_or_default();
+            if net.regions.iter().any(|r| r.winding != winding) {
+                self.warn("vectors whose filled areas use different winding rules use the first one's in their outline");
+            }
+            self.geometry("fillGeometry", &net.fill_path(), winding, f);
+        }
+    }
+
+    /// `fillGeometry` or `strokeGeometry` (`key`) from a local path.
+    pub(super) fn geometry(&mut self, key: &'static str, p: &BezPath, winding: WindingRule, f: &mut Fields) {
+        if p.elements().is_empty() {
+            return;
+        }
+        if let Some(i) = self.blob(path_blob(p)) {
+            let rule = if winding == WindingRule::EvenOdd { "ODD" } else { "NONZERO" };
+            f.push((key, arr(vec![o(vec![("windingRule", e(rule)), ("commandsBlob", u(i)), ("styleID", u(0))])])));
+        }
+    }
+
+    /// `strokeGeometry`, the outline of a plain stroke: a ring around boxes and whole ellipses, the
+    /// widened path of other centred strokes. Dashed, per-side and other strokes get none (a reader
+    /// builds theirs from the stroke settings).
+    pub(super) fn stroke_geometry(&mut self, n: &Node, boxy: bool, f: &mut Fields) {
+        let sp = &n.stroke;
+        let (w, h, weight) = (n.width, n.height, sp.weight);
+        let plain = n.strokes.iter().any(|p| p.visible) && sp.dashes.is_empty() && sp.sides.is_none() && sp.profile().is_none() && sp.brush.is_none();
+        if !(plain && weight.is_finite() && weight > 0.0 && w.is_finite() && h.is_finite()) {
+            return;
+        }
+        let whole = matches!(n.kind, NodeKind::Ellipse { sweep, inner, .. } if inner == 0.0 && sweep.abs() >= std::f64::consts::TAU - 1e-9);
+        if boxy || whole {
+            let (out, inset) = match sp.align {
+                StrokeAlign::Inside => (0.0, weight),
+                StrokeAlign::Center => (weight / 2.0, weight / 2.0),
+                StrokeAlign::Outside => (weight, 0.0),
+            };
+            // The shape grown by `d` (shrunk when negative), or nothing when it shrinks away.
+            let grown = |d: f64| -> Option<BezPath> {
+                let (gw, gh) = (w + 2.0 * d, h + 2.0 * d);
+                if gw <= 0.0 || gh <= 0.0 {
+                    return None;
+                }
+                let mut p = if whole {
+                    figcraft_doc::geom::ellipse(gw, gh, 0.0, std::f64::consts::TAU, 0.0)
+                } else {
+                    let radii = n.corners.radii.map(|r| if r > 0.0 { (r + d).max(0.0) } else { 0.0 });
+                    figcraft_doc::geom::rounded_rect(gw, gh, radii, n.corners.smoothing)
+                };
+                p.apply_affine(Affine::translate((-d, -d)));
+                Some(p)
+            };
+            let Some(mut ring) = grown(out) else { return };
+            ring.extend(grown(-inset).iter().flat_map(|p| p.elements().iter().copied()));
+            self.geometry("strokeGeometry", &ring, WindingRule::EvenOdd, f);
+        } else if sp.align == StrokeAlign::Center {
+            let path = match &n.kind {
+                NodeKind::Vector { network } => Some(network.stroke_path()),
+                NodeKind::Text(_) => None,
+                _ => figcraft_doc::geometry::shape_path(n),
+            };
+            let Some(path) = path.filter(|p| !p.elements().is_empty()) else { return };
+            use figcraft_doc::geom::kurbo::{Cap, Join, Stroke, StrokeOpts, stroke};
+            let cap = match sp.cap_start {
+                StrokeCap::Round => Cap::Round,
+                StrokeCap::Square => Cap::Square,
+                _ => Cap::Butt,
+            };
+            let join = match sp.join {
+                StrokeJoin::Miter => Join::Miter,
+                StrokeJoin::Bevel => Join::Bevel,
+                StrokeJoin::Round => Join::Round,
+            };
+            let limit = if sp.miter_limit.is_finite() { sp.miter_limit.max(1.0) } else { 4.0 };
+            let style = Stroke::new(weight).with_caps(cap).with_join(join).with_miter_limit(limit);
+            self.geometry("strokeGeometry", &stroke(path, &style, &StrokeOpts::default(), 0.05), WindingRule::NonZero, f);
+        }
+    }
+
+    /// Add a blob; its index (`None` once the blobs would make the file too large).
+    fn blob(&mut self, bytes: Vec<u8>) -> Option<u32> {
+        if let Some(i) = self.blobs.get(&bytes) {
+            return Some(*i);
+        }
+        self.blob_bytes += bytes.len() as u64;
+        if self.blob_bytes > MAX_CANVAS {
+            self.warn("vector data too large for the format was left out");
+            return None;
+        }
+        let i = u32::try_from(self.blobs.len()).ok()?;
+        self.blobs.insert(bytes, i);
+        Some(i)
+    }
+}
diff --git a/crates/format/src/fig/export_tests.rs b/crates/format/src/fig/export_tests.rs
index 67215b0c..4198b1cc 100644
--- a/crates/format/src/fig/export_tests.rs
+++ b/crates/format/src/fig/export_tests.rs
@@ -7,7 +7,9 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use figcraft_doc::color::{BlendMode, Color, ColorStop, Gradient, GradientKind, ImageScaleMode, Paint, PaintKind};
 use figcraft_doc::geom::{Affine, Point};
-use figcraft_doc::proto::{Action, Direction, Easing, Flow, Interaction, KeyMods, Overflow, OverlayPosition, ScrollPosition, Transition, Trigger};
+use figcraft_doc::proto::{
+    Action, Direction, Easing, Flow, Interaction, KeyMods, Overflow, OverlayAnchor, OverlayPosition, ScrollPosition, Transition, Trigger,
+};
 use figcraft_doc::*;
 use serde_json::Value;
 
@@ -74,7 +76,7 @@ fn paint(r: &mut Lcg, image: &str) -> Paint {
             p.kind
         }
     };
-    Paint { kind, opacity: r.pick(&[1.0, 0.5, 0.25]), visible: r.chance(85), blend: r.pick(&BLENDS) }
+    Paint { kind, opacity: r.pick(&[1.0, 0.5, 0.25]), visible: r.chance(85), blend: r.pick(&BLENDS), color_alpha: 1.0 }
 }
 
 fn effect(r: &mut Lcg) -> Effect {
@@ -511,6 +513,7 @@ impl Gen {
                     close_on_outside: true,
                     background: Some(Color::new(0.0, 0.0, 0.0, 0.5)),
                     offset: None,
+                    anchor: OverlayAnchor::Screen,
                 },
                 3 => Action::SwapOverlay { dest },
                 4 => Action::ChangeTo { dest },
@@ -595,6 +598,17 @@ fn normalize(n: &mut Node, ix: &dyn Fn(NodeId) -> NodeId) {
     n.source = None;
     n.overrides.clear();
     n.constrain_proportions = false;
+    // A text's resize mode is its sizing (the editor keeps them together; generated documents
+    // don't): auto width hugs both axes, auto height its height.
+    if let NodeKind::Text(t) = &n.kind {
+        let cl = &mut n.child_layout;
+        let hug = |s: &mut Sizing| *s = if *s == Sizing::Fixed { Sizing::Hug } else { *s };
+        match t.auto_resize {
+            TextAutoResize::WidthAndHeight => [&mut cl.sizing_h, &mut cl.sizing_v].into_iter().for_each(hug),
+            TextAutoResize::Height => hug(&mut cl.sizing_v),
+            _ => {}
+        }
+    }
     let fold = |ps: &mut Vec<Paint>| {
         for p in ps.iter_mut() {
             if let PaintKind::Solid { color } = &mut p.kind {
@@ -619,14 +633,17 @@ fn normalize(n: &mut Node, ix: &dyn Fn(NodeId) -> NodeId) {
         }
     }
     if let Some(l) = &mut n.layout {
-        if matches!(l.main_align, MainAlign::SpaceAround | MainAlign::SpaceEvenly) {
-            l.main_align = MainAlign::SpaceBetween;
-        }
         // Track counts only matter (and are only written) for grids.
         if l.mode != LayoutMode::Grid {
             let d = AutoLayout::default();
             (l.grid_columns, l.grid_rows) = (d.grid_columns, d.grid_rows);
         }
+        // Equal (one-share) tracks say what no track list says.
+        for tracks in [&mut l.column_tracks, &mut l.row_tracks] {
+            if tracks.iter().all(|t| *t == GridTrack::default()) {
+                tracks.clear();
+            }
+        }
     }
     n.child_layout.grid_align_h = None;
     n.child_layout.grid_align_v = None;
@@ -680,7 +697,7 @@ fn normalize(n: &mut Node, ix: &dyn Fn(NodeId) -> NodeId) {
             for r in &mut td.runs {
                 px(&mut r.style);
             }
-            td.paragraphs = (0..td.paragraph_count()).map(|p| ParaList { list: td.para_list(p).list, indent: 0 }).collect();
+            td.paragraphs = (0..td.paragraph_count()).map(|p| ParaList { indent: 0, ..td.para_list(p) }).collect();
             td.list = ListStyle::None;
         }
         NodeKind::Vector { network } => {
@@ -1014,6 +1031,81 @@ fn junk_documents_never_panic() {
     }
 }
 
+/// Grid track sizes reach the file and come back: fixed px, fractional fill and hug tracks, and a
+/// track the format has no name for leaves an equal track behind instead of failing the write.
+#[test]
+fn grid_track_sizes_round_trip() {
+    let mut doc = Document::new("File");
+    let page = doc.first_page().unwrap();
+    let grid = doc.create(page, NodeKind::Frame, "Grid", 0.0, 0.0, 400.0, 200.0).unwrap();
+    {
+        let node = doc.node_mut(grid).unwrap();
+        node.layout = Some(AutoLayout {
+            mode: LayoutMode::Grid,
+            grid_columns: 3,
+            grid_rows: 2,
+            column_tracks: vec![GridTrack::fixed(120.0), GridTrack::fill(2.0), GridTrack::hug()],
+            row_tracks: vec![GridTrack::fill(1.0), GridTrack::fixed(50.0)],
+            ..AutoLayout::default()
+        });
+    }
+    let (bytes, warnings) = export(&doc, None).unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let (back, iw) = import(&bytes, "File").unwrap();
+    assert!(iw.is_empty(), "{iw:?}");
+    let l = back.node(back.pages[0]).and_then(|p| p.children.first()).and_then(|c| back.node(*c)).and_then(|n| n.layout.clone()).unwrap();
+    assert_eq!(l.column_tracks, vec![GridTrack::fixed(120.0), GridTrack::fill(2.0), GridTrack::hug()]);
+    assert_eq!(l.row_tracks, vec![GridTrack::fill(1.0), GridTrack::fixed(50.0)]);
+
+    // A negative fixed track is no size the format can name: the write still succeeds, the track
+    // falls back to an equal one, and the warning says so.
+    let mut odd = doc.clone();
+    if let Some(l) = odd.node_mut(grid).and_then(|n| n.layout.as_mut()) {
+        l.column_tracks[0] = GridTrack::fixed(-5.0);
+    }
+    let (bytes, warnings) = export(&odd, None).unwrap();
+    assert_eq!(warnings, vec!["grid tracks whose size the format can't hold were written as equal tracks".to_string()]);
+    let (back, _) = import(&bytes, "File").unwrap();
+    let l = back.node(back.pages[0]).and_then(|p| p.children.first()).and_then(|c| back.node(*c)).and_then(|n| n.layout.clone()).unwrap();
+    assert_eq!(l.column_tracks[0], GridTrack::fill(1.0), "an unwritable track reads back equal");
+}
+
+/// An instance layer whose grid tracks are equal doesn't read back its main layer's track sizes.
+#[test]
+fn instance_grid_tracks_clear_the_mains_sizes() {
+    let mut doc = Document::new("File");
+    let page = doc.first_page().unwrap();
+    let main = doc.create(page, NodeKind::Component { description: String::new(), props: BTreeMap::new() }, "Main", 0.0, 0.0, 400.0, 200.0).unwrap();
+    let grid = doc.create(main, NodeKind::Frame, "Grid", 0.0, 0.0, 400.0, 200.0).unwrap();
+    let layout = AutoLayout {
+        mode: LayoutMode::Grid,
+        grid_columns: 2,
+        grid_rows: 1,
+        column_tracks: vec![GridTrack::fixed(120.0); 2],
+        ..AutoLayout::default()
+    };
+    doc.node_mut(grid).unwrap().layout = Some(layout.clone());
+    let inst = doc.alloc_id();
+    let mut n = doc.node(main).unwrap().clone();
+    (n.id, n.kind, n.parent, n.children) = (inst, NodeKind::Instance { component: main, props: BTreeMap::new() }, None, Vec::new());
+    doc.insert(n, page, None).unwrap();
+    let mut layer = doc.node(grid).unwrap().clone();
+    (layer.id, layer.parent, layer.source) = (doc.alloc_id(), None, Some(grid));
+    layer.layout = Some(AutoLayout { column_tracks: Vec::new(), ..layout });
+    doc.insert(layer, inst, None).unwrap();
+    let (bytes, _) = export(&doc, None).unwrap();
+    let (back, _) = import(&bytes, "File").unwrap();
+    let tracks = |inside: bool| {
+        let n = back.nodes().find(|n| {
+            n.name == "Grid"
+                && back.ancestors(n.id).iter().any(|a| matches!(back.node(*a).map(|p| &p.kind), Some(NodeKind::Instance { .. }))) == inside
+        });
+        n.and_then(|n| n.layout.clone()).unwrap().column_tracks
+    };
+    assert_eq!(tracks(false), vec![GridTrack::fixed(120.0); 2]);
+    assert!(tracks(true).iter().all(|t| *t == GridTrack::fill(1.0)), "{:?}", tracks(true));
+}
+
 /// A frame's own min/max size survives whatever its parent is, not only under auto layout.
 #[test]
 fn frame_size_limits_survive_without_auto_layout_parent() {
@@ -1095,3 +1187,332 @@ fn local_samples_round_trip() {
         assert_same(&a, &b, &format!("{} (export warnings: {warnings:?})", p.display()));
     }
 }
+
+#[test]
+fn a_vector_drawable_export_setting_is_written_as_svg_with_a_warning() {
+    let mut doc = Document::new("vd");
+    let page = doc.first_page().unwrap();
+    let r = doc.create(page, NodeKind::Rectangle, "Icon", 0.0, 0.0, 24.0, 24.0).unwrap();
+    doc.get_mut(r).unwrap().exports = vec![ExportSetting { format: ExportFormat::VectorDrawable, ..Default::default() }];
+    let (bytes, warnings) = export(&doc, None).unwrap();
+    assert_eq!(warnings, ["Android Vector Drawable (XML) export settings were written as SVG"]);
+    let (back, _) = import(&bytes, "x").unwrap();
+    let icon = back.nodes().find(|n| n.name == "Icon").unwrap();
+    assert_eq!(icon.exports.iter().map(|x| x.format).collect::<Vec<_>>(), [ExportFormat::Svg]);
+}
+
+#[test]
+fn images_are_named_by_the_sha1_of_their_bytes() {
+    // FIPS 180 test vectors.
+    assert_eq!(export::sha1_hex(b""), "da39a3ee5e6b4b0d3255bfef95601890afd80709");
+    assert_eq!(export::sha1_hex(b"abc"), "a9993e364706816aba3e25717850c26c9cd0d89d");
+    assert_eq!(export::sha1_hex(b"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"), "84983e441c3bd26ebaae4aa1f95129e5e54670f1");
+    assert_eq!(export::sha1_hex(&vec![b'a'; 1_000_000]), "34aa973cd4c4daa4f61eeb2bdbad27316534016f");
+    let (bytes, _) = export(&generate(3), None).unwrap();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(&bytes[..])).unwrap();
+    let names: Vec<String> = z.file_names().filter(|n| n.starts_with("images/")).map(str::to_string).collect();
+    assert!(!names.is_empty());
+    for name in names {
+        let data = crate::read_member(&mut z, &name, 1 << 26).unwrap();
+        assert_eq!(name.strip_prefix("images/"), Some(export::sha1_hex(&data).as_str()));
+    }
+    // Paints name the image by its 20 bytes.
+    let archive = Archive::open(&bytes).unwrap();
+    let (schema, message) = decode_canvas(&archive.canvas).unwrap();
+    let msg = schema.decode_message(schema.find("Message").unwrap(), &message).unwrap();
+    let mut hashes = 0;
+    for nc in msg.get("nodeChanges").unwrap().list() {
+        for p in nc.get("fillPaints").map(Kv::list).unwrap_or_default() {
+            if let Some(h) = p.get("image").and_then(|i| i.get("hash")).and_then(Kv::bytes) {
+                assert_eq!(h.len(), 20);
+                hashes += 1;
+            }
+        }
+    }
+    assert!(hashes > 0);
+}
+
+#[test]
+fn an_axis_without_a_maximum_size_is_written_as_infinite() {
+    let mut doc = Document::new("File");
+    let page = doc.first_page().unwrap();
+    let id = doc.create(page, NodeKind::Frame, "Subject", 0.0, 0.0, 100.0, 100.0).unwrap();
+    let node = doc.node_mut(id).unwrap();
+    node.layout = Some(AutoLayout::default());
+    node.child_layout.max_w = Some(1200.0);
+    node.child_layout.min_h = Some(40.0);
+    let (bytes, _) = export(&doc, None).unwrap();
+    let archive = Archive::open(&bytes).unwrap();
+    let (schema, message) = decode_canvas(&archive.canvas).unwrap();
+    let msg = schema.decode_message(schema.find("Message").unwrap(), &message).unwrap();
+    let nc = msg.get("nodeChanges").unwrap().list().iter().find(|n| n.get("name").and_then(Kv::str) == Some("Subject")).unwrap();
+    let axes = |k: &str| {
+        let v = nc.get(k).unwrap().get("value").unwrap();
+        (v.get("x").cloned().unwrap(), v.get("y").cloned().unwrap())
+    };
+    assert_eq!(axes("maxSize"), (Kv::Float(1200.0), Kv::Float(f32::INFINITY)));
+    assert_eq!(axes("minSize"), (Kv::Float(0.0), Kv::Float(40.0)));
+    let (back, _) = import(&bytes, "File").unwrap();
+    let cl = &back.nodes().find(|n| n.name == "Subject").unwrap().child_layout;
+    assert_eq!([cl.min_w, cl.max_w, cl.min_h, cl.max_h], [None, Some(1200.0), Some(40.0), None]);
+}
+
+#[test]
+fn compound_weights_are_spelt_the_way_font_families_name_their_faces() {
+    assert_eq!(export::face_style("Libre Franklin", "Semi Bold"), "SemiBold");
+    assert_eq!(export::face_style("Fira Sans", "SemiBold"), "SemiBold");
+    assert_eq!(export::face_style("Roboto", "Extra Light Italic"), "ExtraLight Italic");
+    assert_eq!(export::face_style("Roboto", "Bold"), "Bold");
+    assert_eq!(export::face_style("Inter", "SemiBold"), "Semi Bold");
+    assert_eq!(export::face_style("Inter Display", "Extra Bold"), "Extra Bold");
+}
+
+/// A component set whose variants share a text and a boolean property, its layers bound to them,
+/// and an instance of the second variant with its own label.
+fn set_with_properties() -> (Document, NodeId) {
+    fn mirror(doc: &mut Document, src: NodeId, parent: NodeId) {
+        let mut n = doc.node(src).unwrap().clone();
+        let kids = std::mem::take(&mut n.children);
+        n.id = doc.alloc_id();
+        n.source = Some(src);
+        let id = doc.insert(n, parent, None).unwrap();
+        for k in kids {
+            mirror(doc, k, id);
+        }
+    }
+    let mut doc = Document::new("File");
+    let page = doc.first_page().unwrap();
+    let glyph =
+        doc.create(page, NodeKind::Component { description: String::new(), props: BTreeMap::new() }, "Glyph", 400.0, 0.0, 16.0, 16.0).unwrap();
+    doc.create(glyph, NodeKind::Rectangle, "Shape", 0.0, 0.0, 16.0, 16.0).unwrap();
+    let set = doc.create(page, NodeKind::ComponentSet { description: String::new() }, "Button", 0.0, 0.0, 300.0, 120.0).unwrap();
+    let mut variants = Vec::new();
+    for (i, name) in ["Size=Small", "Size=Large"].into_iter().enumerate() {
+        let props = BTreeMap::from([
+            ("Label".to_string(), PropDef::Text { default: "Button".into() }),
+            ("Show icon".to_string(), PropDef::Boolean { default: true }),
+        ]);
+        let v = doc.create(set, NodeKind::Component { description: String::new(), props }, name, 0.0, 60.0 * i as f64, 120.0, 40.0).unwrap();
+        let label = doc.create(v, NodeKind::Text(TextData::new("Button")), "Label", 0.0, 0.0, 60.0, 20.0).unwrap();
+        doc.node_mut(label).unwrap().prop_refs.insert("characters".into(), "Label".into());
+        // The icon is an instance placed in the variant: like the editor's, its `source` is its
+        // main, which the binding doesn't belong to.
+        let icon = doc.create(v, NodeKind::Instance { component: glyph, props: BTreeMap::new() }, "Icon", 70.0, 0.0, 16.0, 16.0).unwrap();
+        let n = doc.node_mut(icon).unwrap();
+        n.source = Some(glyph);
+        n.prop_refs.insert("visible".into(), "Show icon".into());
+        variants.push(v);
+    }
+    let large = variants[1];
+    let main = doc.node(large).unwrap().clone();
+    let id = doc.alloc_id();
+    let mut n = main.clone();
+    let props = BTreeMap::from([("Label".to_string(), Value::String("Hi".into()))]);
+    (n.id, n.kind, n.name, n.parent, n.source) = (id, NodeKind::Instance { component: large, props }, "Button".into(), None, None);
+    n.children.clear();
+    n.transform = Affine::translate((0.0, 200.0));
+    doc.insert(n, page, None).unwrap();
+    for k in main.children {
+        mirror(&mut doc, k, id);
+    }
+    let kids = doc.node(id).unwrap().children.clone();
+    for k in kids {
+        let n = doc.node_mut(k).unwrap();
+        if let NodeKind::Text(td) = &mut n.kind {
+            td.characters = "Hi".into();
+            td.runs.clear();
+            n.overrides.insert("characters".into());
+        }
+    }
+    (doc, id)
+}
+
+#[test]
+fn set_properties_live_on_the_set_with_a_copy_per_variant() {
+    let (doc, _) = set_with_properties();
+    let (bytes, _) = export(&doc, None).unwrap();
+    let archive = Archive::open(&bytes).unwrap();
+    let (schema, message) = decode_canvas(&archive.canvas).unwrap();
+    let msg = schema.decode_message(schema.find("Message").unwrap(), &message).unwrap();
+    let changes = msg.get("nodeChanges").unwrap().list();
+    let key = |g: &Kv| format!("{}:{}", g.get("sessionID").unwrap().f64().unwrap(), g.get("localID").unwrap().f64().unwrap());
+    let named = |name: &str| changes.iter().filter(|n| n.get("name").and_then(Kv::str) == Some(name)).collect::<Vec<_>>();
+    let id_of = |n: &Kv| key(n.get("guid").unwrap());
+    let parent_of = |n: &Kv| key(n.get("parentIndex").unwrap().get("guid").unwrap());
+
+    // The set: every definition, the variant property first, with its values in order.
+    let set = named("Button").into_iter().find(|n| n.get("isStateGroup").is_some()).unwrap();
+    let defs = set.get("componentPropDefs").unwrap().list();
+    let def = |name: &str| defs.iter().find(|d| d.get("name").and_then(Kv::str) == Some(name)).unwrap();
+    assert_eq!(def("Size").get("type").and_then(Kv::str), Some("VARIANT"));
+    assert_eq!(def("Label").get("type").and_then(Kv::str), Some("TEXT"));
+    assert_eq!(def("Show icon").get("type").and_then(Kv::str), Some("BOOL"));
+    assert_eq!(defs.first().and_then(|d| d.get("name")).and_then(Kv::str), Some("Size"));
+    for d in defs {
+        assert!(d.get("varValue").is_some() && d.get("sortPosition").is_some(), "{d:?}");
+    }
+    let label_default = def("Label").get("varValue").unwrap().get("value").unwrap().get("textDataValue").unwrap();
+    assert_eq!(label_default.get("characters").and_then(Kv::str), Some("Button"));
+    assert_eq!(label_default.get("lines").map(|l| l.list().len()), Some(1));
+    let orders = set.get("stateGroupPropertyValueOrders").unwrap().list();
+    assert_eq!(orders.len(), 1);
+    let values: Vec<&str> = orders[0].get("values").unwrap().list().iter().filter_map(Kv::str).collect();
+    assert_eq!((orders[0].get("property").and_then(Kv::str), values), (Some("Size"), vec!["Small", "Large"]));
+
+    // Each variant: its own copy of each definition and its variant value; its layers name the copy.
+    let set_ids: BTreeMap<String, String> =
+        defs.iter().map(|d| (key(d.get("id").unwrap()), d.get("name").and_then(Kv::str).unwrap().to_string())).collect();
+    let mut copies = BTreeSet::new();
+    let mut large_label = None;
+    for (name, value) in [("Size=Small", "Small"), ("Size=Large", "Large")] {
+        let v = named(name)[0];
+        let mut own = BTreeMap::new();
+        for d in v.get("componentPropDefs").unwrap().list() {
+            let parent = set_ids.get(&key(d.get("parentPropDefId").unwrap())).unwrap().clone();
+            assert!(copies.insert(key(d.get("id").unwrap())), "copies are the variant's own");
+            own.insert(parent, key(d.get("id").unwrap()));
+        }
+        assert_eq!(own.keys().map(String::as_str).collect::<Vec<_>>(), ["Label", "Show icon"]);
+        let specs = v.get("variantPropSpecs").unwrap().list();
+        assert_eq!(set_ids.get(&key(specs[0].get("propDefId").unwrap())).map(String::as_str), Some("Size"));
+        assert_eq!(specs[0].get("value").and_then(Kv::str), Some(value));
+        for (layer, prop, field) in [("Label", "Label", "TEXT_DATA"), ("Icon", "Show icon", "VISIBLE")] {
+            let l = named(layer).into_iter().find(|l| parent_of(l) == id_of(v)).unwrap();
+            let r = &l.get("componentPropRefs").unwrap().list()[0];
+            assert_eq!((key(r.get("defID").unwrap()), r.get("componentPropNodeField").and_then(Kv::str)), (own[prop].clone(), Some(field)));
+            let entry = &l.get("parameterConsumptionMap").unwrap().get("entries").unwrap().list()[0];
+            let def_id = entry.get("variableData").unwrap().get("value").unwrap().get("propRefValue").unwrap().get("defId").unwrap();
+            assert_eq!(key(def_id), own[prop]);
+        }
+        if value == "Large" {
+            large_label = Some(own["Label"].clone());
+        }
+    }
+
+    // The instance names the large variant's copy, with the value as variable data too.
+    let inst = named("Button").into_iter().find(|n| n.get("type").and_then(Kv::str) == Some("INSTANCE")).unwrap();
+    let a = &inst.get("componentPropAssignments").unwrap().list()[0];
+    assert_eq!(Some(key(a.get("defID").unwrap())), large_label);
+    let chars = a.get("varValue").unwrap().get("value").unwrap().get("textDataValue").unwrap().get("characters");
+    assert_eq!(chars.and_then(Kv::str), Some("Hi"));
+}
+
+#[test]
+fn set_properties_round_trip() {
+    let (doc, inst) = set_with_properties();
+    let (bytes, warnings) = export(&doc, None).unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let (back, _) = import(&bytes, "File").unwrap();
+    for name in ["Size=Small", "Size=Large"] {
+        let v = back.nodes().find(|n| n.name == name).unwrap();
+        let NodeKind::Component { props, .. } = &v.kind else { panic!("{name} is a component") };
+        assert_eq!(props.get("Label"), Some(&PropDef::Text { default: "Button".into() }), "{name}");
+        assert_eq!(props.get("Show icon"), Some(&PropDef::Boolean { default: true }), "{name}");
+        let label = v.children.iter().filter_map(|c| back.node(*c)).find(|c| c.name == "Label").unwrap();
+        assert_eq!(label.prop_refs.get("characters").map(String::as_str), Some("Label"));
+    }
+    let name = &doc.node(inst).unwrap().name;
+    let i = back.nodes().find(|n| &n.name == name && matches!(n.kind, NodeKind::Instance { .. })).unwrap();
+    let NodeKind::Instance { props, .. } = &i.kind else { panic!() };
+    assert_eq!(props.get("Label"), Some(&Value::String("Hi".into())));
+}
+
+#[test]
+fn an_instance_without_its_mains_maximum_size_overrides_it_with_infinity() {
+    let mut doc = Document::new("File");
+    let page = doc.first_page().unwrap();
+    let main = doc.create(page, NodeKind::Component { description: String::new(), props: BTreeMap::new() }, "Box", 0.0, 0.0, 100.0, 40.0).unwrap();
+    doc.node_mut(main).unwrap().child_layout.max_w = Some(300.0);
+    doc.create(page, NodeKind::Instance { component: main, props: BTreeMap::new() }, "Box", 0.0, 100.0, 100.0, 40.0).unwrap();
+    let (bytes, _) = export(&doc, None).unwrap();
+    let archive = Archive::open(&bytes).unwrap();
+    let (schema, message) = decode_canvas(&archive.canvas).unwrap();
+    let msg = schema.decode_message(schema.find("Message").unwrap(), &message).unwrap();
+    let inst = msg.get("nodeChanges").unwrap().list().iter().find(|n| n.get("type").and_then(Kv::str) == Some("INSTANCE")).unwrap();
+    let overrides = inst.get("symbolData").unwrap().get("symbolOverrides").unwrap().list();
+    let max = overrides.iter().find_map(|o| o.get("maxSize")).unwrap().get("value").unwrap();
+    assert_eq!((max.get("x"), max.get("y")), (Some(&Kv::Float(f32::INFINITY)), Some(&Kv::Float(f32::INFINITY))));
+}
+
+#[test]
+fn grid_track_sizes_are_written_and_read_back() {
+    let mut doc = Document::new("File");
+    let page = doc.first_page().unwrap();
+    let id = doc.create(page, NodeKind::Frame, "Row", 0.0, 0.0, 720.0, 70.0).unwrap();
+    let columns = vec![GridTrack::fixed(320.0), GridTrack::hug(), GridTrack { sizing: Sizing::Fill, value: 2.0 }, GridTrack::fixed(34.0)];
+    doc.node_mut(id).unwrap().layout = Some(AutoLayout {
+        mode: LayoutMode::Grid,
+        grid_columns: 4,
+        grid_rows: 1,
+        column_tracks: columns.clone(),
+        row_tracks: vec![GridTrack::fixed(69.0)],
+        ..AutoLayout::default()
+    });
+    let (bytes, warnings) = export(&doc, None).unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let archive = Archive::open(&bytes).unwrap();
+    let (schema, message) = decode_canvas(&archive.canvas).unwrap();
+    let msg = schema.decode_message(schema.find("Message").unwrap(), &message).unwrap();
+    let row = msg.get("nodeChanges").unwrap().list().iter().find(|n| n.get("name").and_then(Kv::str) == Some("Row")).unwrap();
+    let key = |g: &Kv| format!("{}:{}", g.get("sessionID").unwrap().f64().unwrap(), g.get("localID").unwrap().f64().unwrap());
+    let order: Vec<String> = row.get("gridColumns").unwrap().get("entries").unwrap().list().iter().map(|e| key(e.get("id").unwrap())).collect();
+    let sizes = row.get("gridColumnsSizing").unwrap().get("entries").unwrap().list();
+    let written: Vec<(String, f64)> = order
+        .iter()
+        .map(|id| {
+            let size = sizes.iter().find(|e| key(e.get("id").unwrap()) == *id).unwrap().get("trackSize").unwrap();
+            let (min, max) = (size.get("minSizing").unwrap(), size.get("maxSizing").unwrap());
+            assert_eq!(min, max);
+            (min.get("type").and_then(Kv::str).unwrap().to_string(), min.get("value").unwrap().f64().unwrap())
+        })
+        .collect();
+    let types: Vec<(&str, f64)> = written.iter().map(|(t, v)| (t.as_str(), *v)).collect();
+    assert_eq!(types, [("FIXED", 320.0), ("HUG", 0.0), ("FLEX", 2.0), ("FIXED", 34.0)]);
+    let (back, _) = import(&bytes, "File").unwrap();
+    let l = back.nodes().find(|n| n.name == "Row").unwrap().layout.clone().unwrap();
+    assert_eq!(l.column_tracks, columns);
+    assert_eq!(l.row_tracks, vec![GridTrack::fixed(69.0)]);
+}
+
+#[test]
+fn variants_that_disagree_on_a_default_are_a_warning() {
+    let (mut doc, _) = set_with_properties();
+    let large = doc.nodes().find(|n| n.name == "Size=Large").unwrap().id;
+    if let NodeKind::Component { props, .. } = &mut doc.node_mut(large).unwrap().kind {
+        props.insert("Label".into(), PropDef::Text { default: "Large".into() });
+    }
+    let (_, warnings) = export(&doc, None).unwrap();
+    assert!(warnings.iter().any(|w| w.contains("different defaults")), "{warnings:?}");
+}
+
+#[test]
+fn a_name_used_with_two_types_in_a_set_writes_both_definitions() {
+    let (mut doc, _) = set_with_properties();
+    let large = doc.nodes().find(|n| n.name == "Size=Large").unwrap().id;
+    if let NodeKind::Component { props, .. } = &mut doc.node_mut(large).unwrap().kind {
+        props.insert("Label".into(), PropDef::Boolean { default: true });
+    }
+    let (bytes, _) = export(&doc, None).unwrap();
+    let archive = Archive::open(&bytes).unwrap();
+    let (schema, message) = decode_canvas(&archive.canvas).unwrap();
+    let msg = schema.decode_message(schema.find("Message").unwrap(), &message).unwrap();
+    let changes = msg.get("nodeChanges").unwrap().list();
+    let key = |g: &Kv| format!("{}:{}", g.get("sessionID").unwrap().f64().unwrap(), g.get("localID").unwrap().f64().unwrap());
+    let set = changes.iter().find(|n| n.get("isStateGroup").is_some()).unwrap();
+    let written: BTreeSet<String> = set.get("componentPropDefs").unwrap().list().iter().map(|d| key(d.get("id").unwrap())).collect();
+    let labels: Vec<&str> = set
+        .get("componentPropDefs")
+        .unwrap()
+        .list()
+        .iter()
+        .filter(|d| d.get("name").and_then(Kv::str) == Some("Label"))
+        .filter_map(|d| d.get("type").and_then(Kv::str))
+        .collect();
+    assert_eq!(labels.len(), 2, "{labels:?}");
+    // Every variant copy names a definition the set holds.
+    for v in changes.iter().filter(|n| n.get("variantPropSpecs").is_some()) {
+        for d in v.get("componentPropDefs").unwrap().list() {
+            assert!(written.contains(&key(d.get("parentPropDefId").unwrap())));
+        }
+    }
+}
diff --git a/crates/format/src/fig/image_filter_tests.rs b/crates/format/src/fig/image_filter_tests.rs
new file mode 100644
index 00000000..3fa50a20
--- /dev/null
+++ b/crates/format/src/fig/image_filter_tests.rs
@@ -0,0 +1,104 @@
+//! Image paint filters read from `.fig` files, on fixtures built in code with the parent module's
+//! helpers.
+
+use super::*;
+
+/// The shared schema plus the image filter containers only these tests use.
+fn image_filter_schema() -> Schema {
+    let text = SCHEMA
+        .replace(
+            "message Paint ",
+            "message FilterColorAdjust float tint, float shadows, float highlights, float detail, float exposure, float vignette, float temperature, float vibrance\n\
+             message PaintFilterMessage float tint, float shadows, float highlights, float detail, float exposure, float vignette, float temperature, float vibrance, float contrast, float brightness, float mystery\n\
+             message Paint ",
+        )
+        .replace("message Paint PaintType type,", "message Paint PaintFilterMessage paintFilter, FilterColorAdjust filterColorAdjust, PaintType type,");
+    Schema::parse(&text).unwrap()
+}
+
+#[test]
+fn image_filters_import_from_current_container_and_skip_ambiguous_data() {
+    let filter = |fields: Vec<(&'static str, Kv<'static>)>| o(fields);
+    let image_paint = |id: u64, name: &'static str, mut extra: Vec<(&'static str, Kv<'static>)>| {
+        let mut paint = vec![("type", e("IMAGE")), ("image", o(vec![("hash", Kv::Bytes(HASH.to_vec()))]))];
+        paint.append(&mut extra);
+        node(id, Some((1, "!")), "RECTANGLE", name, vec![("size", xy(2.0, 1.0)), ("fillPaints", arr(vec![o(paint)]))])
+    };
+    let nodes = vec![
+        node(0, None, "DOCUMENT", "Document", vec![]),
+        node(1, Some((0, "!")), "CANVAS", "Page", vec![]),
+        image_paint(
+            2,
+            "Current",
+            vec![(
+                "paintFilter",
+                filter(vec![
+                    ("exposure", f(0.25)),
+                    ("contrast", f(0.3)),
+                    ("vibrance", f(-0.4)),
+                    ("temperature", f(0.5)),
+                    ("tint", f(1.0)),
+                    ("highlights", f(-0.6)),
+                    ("shadows", f(0.7)),
+                ]),
+            )],
+        ),
+        image_paint(3, "Negative tint", vec![("paintFilter", filter(vec![("tint", f(-1.0)), ("contrast", f(-0.3))]))]),
+        image_paint(4, "Neutral", vec![]),
+        image_paint(5, "Explicit neutral", vec![("paintFilter", filter(vec![("exposure", f(0.0)), ("vibrance", f(0.0))]))]),
+        image_paint(6, "Legacy", vec![("filterColorAdjust", filter(vec![("exposure", f(0.8))]))]),
+        image_paint(7, "Both", vec![("filterColorAdjust", filter(vec![("exposure", f(0.8))])), ("paintFilter", filter(vec![("contrast", f(0.2))]))]),
+        image_paint(
+            8,
+            "Unsupported",
+            vec![("paintFilter", filter(vec![("brightness", f(0.4)), ("detail", f(-0.2)), ("vignette", f(0.3)), ("mystery", f(0.1))]))],
+        ),
+    ];
+    let bytes = zip_file(&canvas(&image_filter_schema(), &o(vec![("nodeChanges", arr(nodes))])));
+    let (doc, warnings) = import(&bytes, "ImageFilters.fig").unwrap();
+    let get = |name: &str| {
+        let node = doc.nodes().find(|node| node.name == name).unwrap();
+        let figcraft_doc::color::PaintKind::Image(image) = &node.fills[0].kind else { panic!("{name} is not an image fill") };
+        image
+    };
+    let current = get("Current");
+    assert!((current.filters.exposure - 0.25).abs() < 1e-6);
+    assert!((current.filters.contrast - 0.3).abs() < 1e-6, "observed raw contrast remains 0.3");
+    assert!((current.filters.saturation + 0.4).abs() < 1e-6, "vibrance maps to saturation");
+    assert!((current.filters.temperature - 0.5).abs() < 1e-6);
+    assert!((current.filters.tint + 1.0).abs() < 1e-6, "a positive (magenta) tint in the file is a negative native tint");
+    assert!((current.filters.highlights + 0.6).abs() < 1e-6);
+    assert!((current.filters.shadows - 0.7).abs() < 1e-6);
+    assert!((get("Negative tint").filters.tint - 1.0).abs() < 1e-6);
+    assert!((get("Negative tint").filters.contrast + 0.3).abs() < 1e-6);
+    assert_eq!(get("Neutral").filters, Default::default());
+    assert_eq!(get("Explicit neutral").filters, Default::default());
+    assert_eq!(doc.images.get(&current.image).map(|image| image.bytes.as_slice()), Some(png().as_slice()));
+    assert!(warnings.iter().any(|w| w.contains("legacy image filter container is unsupported")), "{warnings:?}");
+    assert!(warnings.iter().any(|w| w.contains("both filter containers are present")), "{warnings:?}");
+    for field in ["brightness", "detail", "vignette", "mystery"] {
+        assert!(warnings.iter().any(|w| w.contains(field)), "missing {field} warning: {warnings:?}");
+    }
+    assert_eq!(warnings.iter().filter(|w| w.contains("approximate renderer")).count(), 1, "deduplicated approximation warning: {warnings:?}");
+}
+
+#[test]
+fn warnings_naming_unknown_filter_fields_are_capped() {
+    // A schema can name any number of fields; each nonzero unknown one is a warning of its own.
+    let names: Vec<&'static str> = (0..300).map(|i| &*Box::leak(format!("unknown{i}").into_boxed_str())).collect();
+    let fields: Vec<String> = names.iter().map(|n| format!("float {n}")).collect();
+    let text = SCHEMA
+        .replace("message Paint ", &format!("message ManyFilters {}\nmessage Paint ", fields.join(", ")))
+        .replace("message Paint PaintType type,", "message Paint ManyFilters paintFilter, PaintType type,");
+    let filters = o(names.iter().map(|n| (*n, f(0.5))).collect());
+    let paint = o(vec![("type", e("IMAGE")), ("image", o(vec![("hash", Kv::Bytes(HASH.to_vec()))])), ("paintFilter", filters)]);
+    let nodes = vec![
+        node(0, None, "DOCUMENT", "Document", vec![]),
+        node(1, Some((0, "!")), "CANVAS", "Page", vec![]),
+        node(2, Some((1, "!")), "RECTANGLE", "Photo", vec![("size", xy(2.0, 1.0)), ("fillPaints", arr(vec![paint]))]),
+    ];
+    let bytes = zip_file(&canvas(&Schema::parse(&text).unwrap(), &o(vec![("nodeChanges", arr(nodes))])));
+    let (_, warnings) = import(&bytes, "ManyFilters.fig").unwrap();
+    let named = warnings.iter().filter(|w| w.contains("unsupported image filter")).count();
+    assert!((100..=crate::rest::MAX_WARNINGS).contains(&named), "{named} of {} warnings", warnings.len());
+}
diff --git a/crates/format/src/fig/kiwi.rs b/crates/format/src/fig/kiwi.rs
index 528dbbf0..0f431082 100644
--- a/crates/format/src/fig/kiwi.rs
+++ b/crates/format/src/fig/kiwi.rs
@@ -10,8 +10,16 @@ use std::fmt;
 
 /// Deepest struct/message nesting decoded.
 const MAX_DEPTH: usize = 64;
-/// Most values decoded from one message (every scalar, array element and field counts).
-const MAX_VALUES: usize = 20_000_000;
+/// Most values decoded from one message (every scalar, array element and field counts): at least
+/// [`MIN_VALUES`], and one per byte of the file's compressed canvas up to [`MAX_VALUES`], so a
+/// large real file decodes while a small one can't expand into a huge tree, however far its
+/// chunks inflate. 32-bit targets (wasm32) have a 4 GB address space in all, so their ceiling is
+/// lower: past it the file is refused cleanly instead of running out of memory.
+const MIN_VALUES: usize = 20_000_000;
+#[cfg(not(target_pointer_width = "32"))]
+const MAX_VALUES: usize = 128 << 20;
+#[cfg(target_pointer_width = "32")]
+const MAX_VALUES: usize = 32 << 20;
 /// Most definitions in a schema, and fields in one definition.
 const MAX_DEFS: usize = 10_000;
 const MAX_FIELDS: usize = 10_000;
@@ -284,13 +292,23 @@ impl Schema {
         self.defs.iter().position(|d| d.name == name)
     }
 
-    /// Decode a message of definition `root`.
+    /// Decode a message of definition `root`, within [`MIN_VALUES`] values.
     pub fn decode_message<'s>(&'s self, root: usize, data: &[u8]) -> Result<Kv<'s>, KiwiError> {
-        let mut d = Decoder { schema: self, r: Reader { data, pos: 0 }, budget: MAX_VALUES };
+        self.decode_message_within(root, data, MIN_VALUES)
+    }
+
+    /// [`Self::decode_message`] within `budget` values (see [`value_budget`]).
+    pub fn decode_message_within<'s>(&'s self, root: usize, data: &[u8], budget: usize) -> Result<Kv<'s>, KiwiError> {
+        let mut d = Decoder { schema: self, r: Reader { data, pos: 0 }, budget };
         d.def(root, 0)
     }
 }
 
+/// Most values decoded from a file whose compressed canvas is `packed` bytes.
+pub(crate) fn value_budget(packed: usize) -> usize {
+    packed.clamp(MIN_VALUES, MAX_VALUES)
+}
+
 struct Decoder<'s, 'b> {
     schema: &'s Schema,
     r: Reader<'b>,
@@ -327,6 +345,8 @@ impl<'s> Decoder<'s, '_> {
                 loop {
                     let id = self.r.var_uint()?;
                     if id == 0 {
+                        // Grown by doubling: trimmed, a large file's tree takes a good part less.
+                        out.shrink_to_fit();
                         return Ok(Kv::Object(out));
                     }
                     let f = d.fields.iter().find(|f| f.value == id).ok_or_else(|| KiwiError(format!("message: {} has no field {id}", d.name)))?;
@@ -339,6 +359,10 @@ impl<'s> Decoder<'s, '_> {
     fn field(&mut self, f: &Field, depth: usize) -> Result<Kv<'s>, KiwiError> {
         let ty = f.ty.ok_or_else(|| KiwiError("message: untyped field".into()))?;
         if !f.array {
+            // A nested definition spends its own value in `def`.
+            if !matches!(ty, Type::Def(_)) {
+                self.spend(1)?;
+            }
             return self.value(ty, depth);
         }
         let n = self.r.var_uint()? as usize;
@@ -539,7 +563,11 @@ pub mod encode {
             Type::Byte => w.byte(ranged(0, 255)? as u8),
             Type::Int => w.var_int(ranged(i32::MIN.into(), i32::MAX.into())? as i32),
             Type::Uint => w.var_uint(ranged(0, u32::MAX.into())? as u32),
-            Type::Float => w.var_float(v.f64().map(|x| x as f32).filter(|x| x.is_finite()).ok_or_else(bad)?),
+            // Infinity is a value of its own (an axis with no maximum size); NaN is not.
+            Type::Float => w.var_float(match v {
+                Kv::Float(f) if f.is_infinite() => *f,
+                _ => v.f64().map(|x| x as f32).filter(|x| x.is_finite()).ok_or_else(bad)?,
+            }),
             Type::Str => w.string(v.str().ok_or_else(bad)?),
             Type::Int64 => w.var_int64(ranged(i64::MIN.into(), i64::MAX.into())? as i64),
             Type::Uint64 => w.var_uint64(ranged(0, u64::MAX.into())? as u64),
diff --git a/crates/format/src/fig/layer_cap_tests.rs b/crates/format/src/fig/layer_cap_tests.rs
new file mode 100644
index 00000000..1b869ea2
--- /dev/null
+++ b/crates/format/src/fig/layer_cap_tests.rs
@@ -0,0 +1,148 @@
+//! Large `.fig` files at the layer cap (#981): the budget a design-system file gets, the library
+//! copies its instances need kept ahead of the pages, honest notes for what the cap kept out, and
+//! one note for the cap itself.
+
+use figcraft_doc::{Document, NodeKind};
+
+use super::kiwi::{Kv, Schema};
+use super::{MAX_FIG_NODES, export, import, layer_budget, map};
+
+type Fields = Vec<(&'static str, Kv<'static>)>;
+
+fn o(fields: Fields) -> Kv<'static> {
+    Kv::Object(fields)
+}
+
+fn g(id: u64) -> Kv<'static> {
+    o(vec![("sessionID", Kv::Uint(1)), ("localID", Kv::Uint(id))])
+}
+
+fn xy(x: f64, y: f64) -> Kv<'static> {
+    o(vec![("x", Kv::Float(x as f32)), ("y", Kv::Float(y as f32))])
+}
+
+/// A layer under `parent`; siblings come in id order.
+fn node(id: u64, parent: Option<u64>, ty: &'static str, name: &str, more: Fields) -> Kv<'static> {
+    let mut fields = vec![("guid", g(id)), ("phase", Kv::Enum("CREATED")), ("type", Kv::Enum(ty)), ("name", Kv::Str(name.into()))];
+    if let Some(parent) = parent {
+        fields.push(("parentIndex", o(vec![("guid", g(parent)), ("position", Kv::Str(format!("{id:08}")))])));
+    }
+    fields.extend(more);
+    o(fields)
+}
+
+fn instance(id: u64, page: u64, main: u64) -> Kv<'static> {
+    node(id, Some(page), "INSTANCE", "Instance", vec![("symbolData", o(vec![("symbolID", g(main))]))])
+}
+
+/// A main `id` of `layers` rectangles under `parent`.
+fn main_component(id: u64, parent: u64, name: &str, layers: u64) -> Vec<Kv<'static>> {
+    let mut out = vec![node(id, Some(parent), "SYMBOL", name, vec![("size", xy(10.0, 10.0))])];
+    out.extend((1..=layers).map(|i| node(id * 10_000 + i, Some(id), "RECTANGLE", "R", vec![("size", xy(1.0, 1.0))])));
+    out
+}
+
+/// A page (2) of `count` instances of a main kept on the file's hidden library canvas (3), as a
+/// design system's file carries the library components it uses.
+fn library_message(count: u64, main_layers: u64) -> Kv<'static> {
+    let mut nodes = vec![
+        node(1, None, "DOCUMENT", "Document", vec![]),
+        node(2, Some(1), "CANVAS", "Screens", vec![]),
+        node(3, Some(1), "CANVAS", "Internal", vec![("internalOnly", Kv::Bool(true))]),
+    ];
+    nodes.extend(main_component(20, 3, "Library main", main_layers));
+    nodes.extend((0..count).map(|i| instance(1_000 + i, 2, 20)));
+    o(vec![("nodeChanges", Kv::Array(nodes))])
+}
+
+/// The `.fig` import's two stages at layer cap `cap`.
+fn import_at(msg: &Kv, cap: usize) -> (Document, Vec<String>) {
+    let (json, mut warnings, networks) = map::to_rest(msg, "Capped", cap);
+    let (doc, more) = crate::rest::import_with_networks(&json, &|_: &str| None, networks, cap).unwrap();
+    warnings.extend(more);
+    (doc, warnings)
+}
+
+fn linked_to(doc: &Document, main_name: &str) -> usize {
+    doc.nodes().filter(|n| matches!(n.kind, NodeKind::Instance { component, .. } if doc.node(component).is_some_and(|c| c.name == main_name))).count()
+}
+
+#[test]
+fn a_design_system_sized_canvas_gets_room() {
+    // The file in #981 stopped at 244 248 layers: a 7.8 MB canvas at 32 bytes a layer.
+    let reported = 244_248 * 32;
+    assert!(layer_budget(reported) >= 4 * 244_248, "{}", layer_budget(reported));
+    // Small files still can't claim more than the REST import's cap, nor any file the ceiling.
+    assert_eq!(layer_budget(1 << 20), crate::rest::MAX_NODES);
+    assert_eq!(layer_budget(usize::MAX), MAX_FIG_NODES);
+}
+
+#[test]
+fn library_mains_come_before_the_pages_at_the_cap() {
+    // 40 instances of an 11-layer library main on a page, with room for 100 layers: mapped after
+    // the pages, the main found no room and every instance became a frame of "a component that
+    // isn't in the file".
+    let (doc, warnings) = import_at(&library_message(40, 10), 100);
+    assert!(warnings.iter().any(|w| w.contains("more than 100 layers")), "{warnings:?}");
+    assert!(!warnings.iter().any(|w| w.contains("aren't in the file")), "{warnings:?}");
+    let linked = linked_to(&doc, "Library main");
+    assert!(linked >= 5, "{linked} instances linked to the library main: {warnings:?}");
+    assert!(doc.nodes().any(|n| n.name == "Library main" && doc.is_remote(n.id)));
+}
+
+#[test]
+fn instances_of_a_main_the_cap_kept_out_say_so() {
+    // The page's instances come before their main: at the cap, the main is skipped though the
+    // file has it.
+    let mut nodes = vec![node(1, None, "DOCUMENT", "Document", vec![]), node(2, Some(1), "CANVAS", "Page", vec![])];
+    nodes.extend((0..20).map(|i| instance(100 + i, 2, 900)));
+    nodes.extend(main_component(900, 2, "Local main", 10));
+    let (doc, warnings) = import_at(&o(vec![("nodeChanges", Kv::Array(nodes))]), 60);
+    assert!(warnings.iter().any(|w| w.starts_with("instances whose component was past the layer limit were imported as frames")), "{warnings:?}");
+    assert!(!warnings.iter().any(|w| w.contains("aren't in the file")), "{warnings:?}");
+    assert!(!doc.nodes().any(|n| n.name == "Local main"));
+}
+
+#[test]
+fn swap_defaults_the_cap_kept_out_say_so() {
+    // A kept main's instance swap default names a main with no instances, which comes after
+    // enough layers to be skipped at the cap.
+    let swap = o(vec![
+        ("id", g(70)),
+        ("name", Kv::Str("Icon".into())),
+        ("type", Kv::Enum("INSTANCE_SWAP")),
+        ("initialValue", o(vec![("guidValue", g(900))])),
+    ]);
+    let mut nodes = vec![node(1, None, "DOCUMENT", "Document", vec![]), node(2, Some(1), "CANVAS", "Page", vec![])];
+    nodes.push(node(50, Some(2), "SYMBOL", "Card", vec![("size", xy(10.0, 10.0)), ("componentPropDefs", Kv::Array(vec![swap]))]));
+    nodes.extend(main_component(60, 2, "Filler", 40));
+    nodes.extend(main_component(900, 2, "Icon main", 10));
+    let (doc, warnings) = import_at(&o(vec![("nodeChanges", Kv::Array(nodes))]), 30);
+    assert!(doc.nodes().any(|n| n.name == "Card"));
+    assert!(!doc.nodes().any(|n| n.name == "Icon main"));
+    assert!(warnings.iter().any(|w| w.starts_with("instance swap properties whose default component was past the layer limit")), "{warnings:?}");
+    assert!(!warnings.iter().any(|w| w.contains("isn't in the file")), "{warnings:?}");
+}
+
+#[test]
+fn a_whole_file_past_the_cap_keeps_its_library_links_and_says_so_once() {
+    // A 1 001-layer library main used 210 times: about 210 000 layers in a file far too small to
+    // lift the cap above the REST import's 200 000.
+    let file = super::tests::canvas(&Schema::parse(export::SCHEMA).unwrap(), &library_message(210, 1_000));
+    assert_eq!(layer_budget(file.len()), crate::rest::MAX_NODES);
+    let (doc, warnings) = import(&file, "Design system.fig").unwrap();
+    let cap: Vec<_> = warnings.iter().filter(|w| w.contains("layers; the rest were skipped")).collect();
+    assert_eq!(cap.len(), 1, "{warnings:?}");
+    assert!(!warnings.iter().any(|w| w.contains("aren't in the file")), "{warnings:?}");
+    assert!(linked_to(&doc, "Library main") >= 190, "{warnings:?}");
+}
+
+#[test]
+fn a_library_main_larger_than_the_cap_leaves_the_pages_room() {
+    // A main of 300 layers with room for 100: mapped first, it took the whole budget and the page
+    // came out empty.
+    let (doc, warnings) = import_at(&library_message(5, 300), 100);
+    let page = doc.nodes().find(|n| n.name == "Screens").expect("the page");
+    let top = page.children.len();
+    assert!(top >= 1, "the page kept {top} layers: {warnings:?}");
+}
diff --git a/crates/format/src/fig/map.rs b/crates/format/src/fig/map.rs
index 66a00129..06cfdb8b 100644
--- a/crates/format/src/fig/map.rs
+++ b/crates/format/src/fig/map.rs
@@ -6,9 +6,10 @@
 //! are expanded here from the main component (overrides and derived layout matched by id path,
 //! component property values applied) so the import looks as saved.
 
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet, HashMap};
 use std::rc::Rc;
 
+use figcraft_doc::VectorNetwork;
 use figcraft_doc::geom::{Affine, Point};
 use figcraft_doc::proto::{MAX_ACTION_DEPTH, MAX_EXPR_DEPTH};
 use serde_json::{Map, Value, json};
@@ -16,23 +17,53 @@ use serde_json::{Map, Value, json};
 use super::kiwi::Kv;
 use super::network;
 
+mod component;
+mod connector;
+mod document;
+mod layer;
+mod layout;
+mod paint;
+mod proto;
+mod text;
+mod variables;
+
+use component::OverrideScope;
+#[cfg(test)]
+use paint::paint;
+
 type Obj = Map<String, Value>;
 
-/// Most layers produced (instance expansion included) and deepest nesting followed.
-const MAX_NODES: usize = crate::rest::MAX_NODES;
+/// Deepest nesting followed.
 const MAX_DEPTH: usize = 256;
 /// Most path commands read from one geometry blob.
 const MAX_COMMANDS: usize = 200_000;
+const MAX_GRID_TRACKS: usize = 1_000;
+pub(super) const MAX_GRID_TRACK_VALUE: f64 = 1e6;
 /// Id of "no style".
 const NO_STYLE: &str = "4294967295:4294967295";
 /// Longest asset `key` or `version` kept for resolving references given as assets.
 const MAX_ASSET_PART: usize = 256;
 
-/// The REST API file JSON for message `msg`, with the warnings about what was skipped.
-pub(super) fn to_rest(msg: &Kv, name: &str) -> (Value, Vec<String>) {
-    let mut m = Mapper::new(msg);
+/// The REST API file JSON for message `msg`, with the warnings about what was skipped and the
+/// vector networks its layers name by `vectorNetworkRef` (for [`crate::rest::import_with_networks`]).
+pub(super) fn to_rest(msg: &Kv, name: &str, max_nodes: usize) -> (Value, Vec<String>, Vec<Option<VectorNetwork>>) {
+    let mut m = Mapper::new(msg, max_nodes);
     let doc = m.document();
-    let mut out = json!({"name": name, "document": doc});
+    // Large values are moved in, never passed through `json!`, which serialises its arguments:
+    // a deep copy of the whole tree, briefly holding it twice.
+    let mut out = json!({"name": name});
+    out["document"] = doc;
+    if !m.library_contexts.is_empty() {
+        out[crate::rest::FIG_LIBRARY_CONTEXTS_FIELD] = Value::Array(std::mem::take(&mut m.library_contexts));
+    }
+    // Mains in the file that the layer cap kept out: their instances are told apart from those of
+    // components the file doesn't have (#981).
+    if m.count >= m.max_nodes {
+        let capped: Vec<Value> = m.referenced_mains.difference(&m.mapped_mains).map(|id| json!(id)).collect();
+        if !capped.is_empty() {
+            out[crate::rest::FIG_CAPPED_MAINS_FIELD] = Value::Array(capped);
+        }
+    }
     if !m.styles.is_empty() {
         out["styles"] = Value::Object(std::mem::take(&mut m.styles));
     }
@@ -49,9 +80,12 @@ pub(super) fn to_rest(msg: &Kv, name: &str) -> (Value, Vec<String>) {
     if !styles.is_empty() {
         out["styleDefinitions"] = Value::Array(styles);
     }
-    (out, m.warnings)
+    (out, m.warnings.finish(), m.networks)
 }
 
+#[cfg(test)]
+mod image_filter_tests;
+
 /// REST importer warnings reworded for a `.fig` import (`None`: drop it).
 pub(super) fn adapt_warning(w: String) -> Option<String> {
     if w.contains("geometry=paths") {
@@ -74,16 +108,14 @@ fn guid(v: &Kv) -> Option<String> {
     Some(format!("{}:{}", num(v, "sessionID")? as u64, num(v, "localID")? as u64))
 }
 
+#[cfg(test)]
+mod connector_snapshot_budget_tests;
+
 /// A `GUID`-holding reference (`StyleId`, `VariableID`, …): its `guid`.
 fn ref_guid(v: &Kv) -> Option<String> {
     v.get("guid").and_then(guid).filter(|g| g != NO_STYLE)
 }
 
-fn color(c: &Kv) -> Value {
-    let ch = |k: &str| num(c, k).unwrap_or(0.0);
-    json!({"r": ch("r"), "g": ch("g"), "b": ch("b"), "a": num(c, "a").unwrap_or(1.0)})
-}
-
 fn vec2(v: &Kv) -> Option<Value> {
     Some(json!({"x": num(v, "x")?, "y": num(v, "y")?}))
 }
@@ -142,6 +174,16 @@ impl<'a> View<'a> {
         v
     }
 
+    /// This view with `style` just above the node itself: the style beats the node's own copy of
+    /// its fields (stale when the style changed since), and override rows beat both.
+    fn styled(&self, style: Option<&'a Kv<'a>>) -> Self {
+        let mut v = self.clone();
+        if let Some(s) = style {
+            v.layers.insert(v.layers.len().min(1), s);
+        }
+        v
+    }
+
     fn get(&self, k: &str) -> Option<&'a Kv<'a>> {
         self.layers.iter().rev().find_map(|l| l.get(k))
     }
@@ -163,94 +205,15 @@ impl<'a> View<'a> {
     }
 }
 
-/// How the layers of a resized container follow it when the file gives no derived layout for
-/// them: a frame's by their constraints, from its main's size to its own; a group's scale with it.
-#[derive(Clone, Copy)]
-enum Fit {
-    Frame { from: (f64, f64), to: (f64, f64) },
-    Scale(f64, f64),
-}
-
-impl Fit {
-    fn frame(from: Option<(f64, f64)>, to: Option<(f64, f64)>) -> Option<Self> {
-        let (from, to) = (from?, to?);
-        ((from.0 - to.0).abs() > 1e-9 || (from.1 - to.1).abs() > 1e-9).then_some(Fit::Frame { from, to })
-    }
-
-    fn scale(from: Option<(f64, f64)>, to: Option<(f64, f64)>) -> Option<Self> {
-        let (from, to) = (from?, to?);
-        let k = |a: f64, b: f64| if a > 1e-9 { b / a } else { 1.0 };
-        let (kx, ky) = (k(from.0, to.0), k(from.1, to.1));
-        ((kx - 1.0).abs() > 1e-9 || (ky - 1.0).abs() > 1e-9).then_some(Fit::Scale(kx, ky))
-    }
-
-    /// The size and transform (in the parent's coordinates) of a `w` × `h` layer at `t` with
-    /// constraints `h_con`, `v_con`. Like the editor's constraint solver, a layer keeps its
-    /// rotation and flip and stretches along its own axes.
-    fn apply(self, w: f64, h: f64, t: Affine, h_con: Option<&str>, v_con: Option<&str>) -> ((f64, f64), Affine) {
-        let [a, b, c, d, _, _] = t.as_coeffs();
-        let lin = Affine::new([a, b, c, d, 0.0, 0.0]);
-        let bb = figcraft_doc::geom::transform_rect_bbox(t, figcraft_doc::geom::Rect::new(0.0, 0.0, w, h));
-        // Where the new box goes: its top-left (constraints) or its centre (a group's scale).
-        let (kx, ky, x0, y0, centred) = match self {
-            Fit::Frame { from, to } => {
-                let axis = |con: Option<&str>, lo: f64, hi: f64, old: f64, new: f64| match con {
-                    Some("MAX" | "FIXED_MAX") => (lo + new - old, hi + new - old),
-                    Some("STRETCH") => (lo, hi + new - old),
-                    Some("CENTER") => (lo + (new - old) / 2.0, hi + (new - old) / 2.0),
-                    Some("SCALE") if old > 1e-9 => (lo * new / old, hi * new / old),
-                    _ => (lo, hi),
-                };
-                let (x0, x1) = axis(h_con, bb.x0, bb.x1, from.0, to.0);
-                let (y0, y1) = axis(v_con, bb.y0, bb.y1, from.1, to.1);
-                let k = |new: f64, old: f64| if old > 1e-9 { (new / old).max(0.0) } else { 1.0 };
-                (k(x1 - x0, bb.width()), k(y1 - y0, bb.height()), x0, y0, false)
-            }
-            Fit::Scale(kx, ky) => (kx, ky, bb.center().x * kx, bb.center().y * ky, true),
-        };
-        let along = |x: f64, y: f64, fallback: f64| {
-            let len = x.hypot(y);
-            let k = (kx * x).hypot(ky * y) / len;
-            if len > 1e-12 && k.is_finite() { k } else { fallback }
-        };
-        let size = (w * along(a, b, kx), h * along(c, d, ky));
-        let nb = figcraft_doc::geom::transform_rect_bbox(lin, figcraft_doc::geom::Rect::new(0.0, 0.0, size.0, size.1));
-        let at = if centred { nb.center() } else { figcraft_doc::geom::Point::new(nb.x0, nb.y0) };
-        (size, Affine::translate((x0 - at.x, y0 - at.y)) * lin)
-    }
-}
-
-/// Overrides and derived layout by id path.
-type Overrides<'a> = BTreeMap<Vec<String>, Vec<(Entry, &'a Kv<'a>)>>;
-
-/// Where an override entry comes from.
-#[derive(Clone, Copy, PartialEq)]
-enum Entry {
-    Override,
-    Derived,
-    /// Derived layout of a nested instance for a size it no longer has: its size and place no
-    /// longer hold, the rest (resolved colours, text) still does.
-    Stale,
-}
-
-/// Where an instance's expanded layers are: the overrides and derived layout of the outermost
-/// instance (by id path), the path of the instance being expanded, and the property values.
-#[derive(Clone)]
-struct Inst<'a> {
-    root: String,
-    path: Vec<String>,
-    overrides: Rc<Overrides<'a>>,
-    props: Rc<BTreeMap<String, &'a Kv<'a>>>,
-    /// Mains being expanded (an instance inside its own main stops there).
-    symbols: Vec<String>,
-}
-
 struct Mapper<'a> {
     nodes: BTreeMap<String, &'a Kv<'a>>,
     kids: BTreeMap<String, Vec<(&'a str, String)>>,
     blobs: Vec<&'a [u8]>,
     /// Component property definitions: id → (REST name "Name#id", type).
     prop_defs: BTreeMap<String, (String, &'a str)>,
+    /// The copies of a set's definitions each variant keeps (no name or type of their own; the
+    /// variant's layers and its instances' assignments use them): copy id → the definition's id.
+    prop_parents: BTreeMap<String, String>,
     /// File nodes by asset `key` and `version`: references can name a collection, variable or
     /// style as the asset instead of the guid, and the file carries the resources to resolve
     /// them (the collection node itself says the same `key`).
@@ -259,18 +222,53 @@ struct Mapper<'a> {
     /// Descriptions of components and component sets (REST `components` / `componentSets`).
     components: Obj,
     sets: Obj,
-    warnings: Vec<String>,
+    /// Layers and keys of each main, built when an instance of it first needs them.
+    override_scopes: BTreeMap<String, Rc<OverrideScope>>,
+    /// Entries held by `override_scopes` (bounded by `max_nodes` together).
+    override_scope_entries: usize,
+    /// Component-bearing branches of the file's internal canvases (cached library definitions).
+    library_contexts: Vec<Value>,
+    /// Layers visited while scanning internal canvases, across all of them.
+    library_scan_count: usize,
+    warnings: crate::rest::Warnings,
     count: usize,
+    /// The mains in the file that instances or instance swap defaults name, and the mains mapped
+    /// as layers: the difference is what the layer cap kept out.
+    referenced_mains: BTreeSet<String>,
+    mapped_mains: BTreeSet<String>,
+    /// Most layers produced or scanned, instance expansion included; the one place the cap comes
+    /// from (see [`super::layer_budget`]).
+    max_nodes: usize,
+    /// Layers kept back for the visible pages' top level while library copies are mapped, so the
+    /// copies can't take the whole budget and leave the pages empty.
+    reserved: usize,
+    /// Vector networks, each built once: the layers that show one (every instance of a main
+    /// holding it) name it by `vectorNetworkRef`. Kept out of the JSON, where a large file's
+    /// networks took gigabytes.
+    networks: Vec<Option<VectorNetwork>>,
+    /// Index in `networks` by what a network is made from: its blob, its scale and its style table.
+    network_ids: HashMap<(usize, u64, u64, usize), usize>,
 }
 
 impl<'a> Mapper<'a> {
-    fn new(msg: &'a Kv<'a>) -> Self {
+    fn new(msg: &'a Kv<'a>, max_nodes: usize) -> Self {
         let mut nodes = BTreeMap::new();
         let mut kids: BTreeMap<String, Vec<(&'a str, String)>> = BTreeMap::new();
         let mut prop_defs = BTreeMap::new();
-        for n in msg.get("nodeChanges").map(Kv::list).unwrap_or_default() {
+        let mut prop_parents = BTreeMap::new();
+        let changes = msg.get("nodeChanges").map(Kv::list).unwrap_or_default();
+        // The last change of a GUID wins; a REMOVED change deletes what came before it.
+        for n in changes {
             let Some(id) = n.get("guid").and_then(guid) else { continue };
             if n.get("phase").and_then(Kv::str) == Some("REMOVED") {
+                nodes.remove(&id);
+            } else {
+                nodes.insert(id, n);
+            }
+        }
+        for n in changes {
+            let Some(id) = n.get("guid").and_then(guid) else { continue };
+            if !nodes.get(&id).is_some_and(|latest| std::ptr::eq(*latest, n)) {
                 continue;
             }
             if let Some(p) = n.get("parentIndex")
@@ -279,13 +277,13 @@ impl<'a> Mapper<'a> {
                 kids.entry(parent).or_default().push((p.get("position").and_then(Kv::str).unwrap_or(""), id.clone()));
             }
             for d in n.get("componentPropDefs").map(Kv::list).unwrap_or_default() {
-                if let (Some(did), Some(name), Some(ty)) =
-                    (d.get("id").and_then(guid), d.get("name").and_then(Kv::str), d.get("type").and_then(Kv::str))
-                {
+                let Some(did) = d.get("id").and_then(guid) else { continue };
+                if let (Some(name), Some(ty)) = (d.get("name").and_then(Kv::str), d.get("type").and_then(Kv::str)) {
                     prop_defs.insert(did.clone(), (format!("{name}#{did}"), ty));
+                } else if let Some(parent) = d.get("parentPropDefId").and_then(guid) {
+                    prop_parents.insert(did, parent);
                 }
             }
-            nodes.insert(id, n);
         }
         for list in kids.values_mut() {
             list.sort();
@@ -302,7 +300,29 @@ impl<'a> Mapper<'a> {
             let version = n.get("version").and_then(Kv::str).filter(|v| !v.is_empty() && v.len() <= MAX_ASSET_PART).unwrap_or("");
             assets.entry(key.to_string()).or_default().entry(version.to_string()).or_insert(id);
         }
-        Self { nodes, kids, blobs, prop_defs, assets, styles: Obj::new(), components: Obj::new(), sets: Obj::new(), warnings: Vec::new(), count: 0 }
+        Self {
+            nodes,
+            kids,
+            blobs,
+            prop_defs,
+            prop_parents,
+            assets,
+            styles: Obj::new(),
+            components: Obj::new(),
+            sets: Obj::new(),
+            override_scopes: BTreeMap::new(),
+            override_scope_entries: 0,
+            library_contexts: Vec::new(),
+            library_scan_count: 0,
+            warnings: crate::rest::Warnings::default(),
+            count: 0,
+            referenced_mains: BTreeSet::new(),
+            mapped_mains: BTreeSet::new(),
+            max_nodes,
+            reserved: 0,
+            networks: Vec::new(),
+            network_ids: HashMap::new(),
+        }
     }
 
     /// The id of the resource a `VariableSetID` (or `VariableID`, `StyleId`) names: its `guid`,
@@ -326,1622 +346,22 @@ impl<'a> Mapper<'a> {
         .cloned()
     }
 
+    /// A note about what this file's mapping left out or changed. Counted, as the REST importer
+    /// counts its own: these notes are met once per layer, so the kinds were named once each with
+    /// no sign of how much of the file they covered -- a file whose every text layer lost a
+    /// setting read the same as one where a single layer did (#467). The collector keeps the
+    /// first-seen order and the same cap, since some notes name fields of the file (image
+    /// filters).
     fn warn(&mut self, w: impl Into<String>) {
-        let w = w.into();
-        if !self.warnings.contains(&w) {
-            self.warnings.push(w);
-        }
+        self.warnings.add(w.into());
     }
 
     fn children(&self, id: &str) -> Vec<String> {
         self.kids.get(id).map(|k| k.iter().map(|(_, c)| c.clone()).collect()).unwrap_or_default()
     }
 
-    /// The DOCUMENT with its pages.
-    fn document(&mut self) -> Value {
-        let doc_id = self.nodes.iter().find(|(_, n)| n.get("type").and_then(Kv::str) == Some("DOCUMENT")).map(|(id, _)| id.clone());
-        let pages: Vec<String> = match &doc_id {
-            Some(d) => self.children(d),
-            None => self.nodes.iter().filter(|(_, n)| n.get("type").and_then(Kv::str) == Some("CANVAS")).map(|(id, _)| id.clone()).collect(),
-        };
-        let mut out = Vec::new();
-        for p in pages {
-            let Some(&n) = self.nodes.get(&p) else { continue };
-            if n.get("type").and_then(Kv::str) != Some("CANVAS") {
-                self.warn("document children other than pages were skipped");
-                continue;
-            }
-            // The hidden page that holds styles, variables and library copies.
-            if n.get("internalOnly").and_then(Kv::bool) == Some(true) {
-                continue;
-            }
-            out.push(self.page(&p, n));
-        }
-        if out.is_empty() {
-            self.warn("the file has no pages");
-        }
-        json!({"id": doc_id.unwrap_or_else(|| "0:0".into()), "type": "DOCUMENT", "children": out})
-    }
-
-    fn page(&mut self, id: &str, n: &'a Kv<'a>) -> Value {
-        let v = View::of(n);
-        let mut o = Obj::new();
-        o.insert("id".into(), json!(id));
-        o.insert("type".into(), json!("CANVAS"));
-        copy_str(&mut o, &v, "name", "name");
-        if let Some(c) = v.get("backgroundColor") {
-            o.insert("backgroundColor".into(), color(c));
-        }
-        if let Some(c) = v.get("prototypeBackgroundColor") {
-            o.insert("prototypeBackgrounds".into(), json!([color(c)]));
-        }
-        self.variable_bindings(&mut o, &v);
-        let mut flows: Vec<(&str, Value)> = Vec::new();
-        let mut kids = Vec::new();
-        for c in self.children(id) {
-            if let Some(sp) = self.nodes.get(&c).and_then(|k| k.get("prototypeStartingPoint")) {
-                let name = sp.get("name").and_then(Kv::str).filter(|s| !s.is_empty()).unwrap_or("Flow");
-                flows.push((sp.get("position").and_then(Kv::str).unwrap_or(""), json!({"nodeId": c, "name": name})));
-            }
-            kids.extend(self.layer(&c, None, Affine::IDENTITY, None, None, 0));
-        }
-        flows.sort_by(|a, b| a.0.cmp(b.0));
-        if !flows.is_empty() {
-            o.insert("flowStartingPoints".into(), Value::Array(flows.into_iter().map(|f| f.1).collect()));
-        }
-        o.insert("children".into(), Value::Array(kids));
-        Value::Object(o)
-    }
-
-    /// Layer `id` (inside instance `inst` when expanding one) and its subtree. `space`: from the
-    /// parent's coordinates to the enclosing frame's (groups and booleans place their children in
-    /// the frame's space, like the REST JSON). `parent`: the parent's view (grid tracks).
-    fn layer(
-        &mut self,
-        id: &str,
-        inst: Option<&Inst<'a>>,
-        space: Affine,
-        parent: Option<&View<'a>>,
-        fit: Option<Fit>,
-        depth: usize,
-    ) -> Option<Value> {
-        if depth > MAX_DEPTH {
-            self.warn(format!("layers nested deeper than {MAX_DEPTH} levels were skipped"));
-            return None;
-        }
-        if self.count >= MAX_NODES {
-            self.warn(format!("the file has more than {MAX_NODES} layers; the rest were skipped"));
-            return None;
-        }
-        let base = *self.nodes.get(id)?;
-        let path = inst.map(|i| [i.path.as_slice(), &[id.to_string()]].concat());
-        let entries = match (inst, &path) {
-            (Some(i), Some(p)) => i.overrides.get(p).map(Vec::as_slice).unwrap_or_default(),
-            _ => &[],
-        };
-        let mut view = View::of(base).with(entries.iter().map(|e| e.1));
-        // A layer of a resized instance the file gives no derived layout for follows its
-        // constraints from the main's geometry, then takes the size and place overridden on it
-        // (auto layout places the others, as in the editor).
-        let derived = entries.iter().any(|(d, l)| *d == Entry::Derived && (l.get("size").is_some() || l.get("transform").is_some()));
-        let stacked = parent.and_then(|p| p.str("stackMode")).is_some_and(|m| matches!(m, "HORIZONTAL" | "VERTICAL" | "GRID"))
-            && view.str("stackPositioning") != Some("ABSOLUTE");
-        let main = View::of(base);
-        let set = |k: &str| entries.iter().rev().filter(|e| e.0 != Entry::Stale).find_map(|(_, l)| l.get(k));
-        if let (Some(f), false, false, Some((w, h))) = (fit, derived, stacked, main.size()) {
-            let t = main.transform().unwrap_or_default();
-            let (fw, ft) = f.apply(w, h, t, view.str("horizontalConstraint"), view.str("verticalConstraint"));
-            view.fitted = Some((set("size").and_then(size).unwrap_or(fw), set("transform").and_then(matrix).unwrap_or(ft)));
-        } else if entries.iter().any(|(d, l)| *d == Entry::Stale && (l.get("size").is_some() || l.get("transform").is_some()))
-            && let Some(s) = set("size").and_then(size).or_else(|| main.size())
-        {
-            view.fitted = Some((s, set("transform").and_then(matrix).or_else(|| main.transform()).unwrap_or_default()));
-        }
-        let rest_id = match (inst, &path) {
-            (Some(i), Some(p)) => format!("I{};{}", i.root, p.join(";")),
-            _ => id.to_string(),
-        };
-        let own = view.str("type").unwrap_or("");
-        let stand = stand_in(own);
-        let ty = match own {
-            "ROUNDED_RECTANGLE" => "RECTANGLE",
-            "SYMBOL" => "COMPONENT",
-            "FRAME" if view.flag("isStateGroup") == Some(true) => "COMPONENT_SET",
-            "FRAME" if view.flag("resizeToFit") == Some(true) => "GROUP",
-            "VARIABLE" | "VARIABLE_SET" => return None,
-            t => stand.map_or(t, |s| s.0),
-        };
-        if let Some((_, what)) = stand {
-            self.warn(format!("{} layers import as {what}", own.to_ascii_lowercase().replace('_', " ")));
-        }
-        self.count += 1;
-        let mut o = Obj::new();
-        o.insert("id".into(), json!(rest_id));
-        o.insert("type".into(), json!(ty));
-        copy_str(&mut o, &view, "name", "name");
-        self.common(&mut o, &view, ty, space, parent);
-        match ty {
-            "TEXT" => self.text(&mut o, &view),
-            "VECTOR" | "STAR" | "REGULAR_POLYGON" => self.geometry(&mut o, &view),
-            "ELLIPSE" => {
-                if let Some(a) = view.get("arcData") {
-                    let arc: Obj =
-                        ["startingAngle", "endingAngle", "innerRadius"].iter().filter_map(|k| Some((k.to_string(), json!(num(a, k)?)))).collect();
-                    o.insert("arcData".into(), Value::Object(arc));
-                }
-            }
-            "BOOLEAN_OPERATION" => {
-                if let Some(op) = view.str("booleanOperation") {
-                    o.insert("booleanOperation".into(), json!(if op == "XOR" { "EXCLUDE" } else { op }));
-                }
-            }
-            _ => {}
-        }
-        if own == "CONNECTOR" {
-            self.connector(&mut o, &view, space);
-        }
-        if ty == "COMPONENT" || ty == "COMPONENT_SET" {
-            self.component(&mut o, &view, &rest_id);
-        }
-        self.prop_refs(&mut o, &view, inst);
-        let child_space = if matches!(ty, "GROUP" | "BOOLEAN_OPERATION") { space * view.transform().unwrap_or_default() } else { Affine::IDENTITY };
-        let mut kids = Vec::new();
-        if ty == "INSTANCE" {
-            if let Some((sub, sym)) = self.instance(&mut o, &view, id, inst, &rest_id) {
-                let main = self.nodes.get(&sym).map(|m| View::of(m));
-                let fit = Fit::frame(main.and_then(|m| m.size()), view.size());
-                for c in self.children(&sym) {
-                    kids.extend(self.layer(&c, Some(&sub), child_space, Some(&view), fit, depth + 1));
-                }
-            }
-        } else {
-            // Inside an instance a layer's children are its main's: they follow it from the main's
-            // size to its own.
-            let fit = match (inst, ty) {
-                (None, _) => None,
-                (Some(_), "GROUP" | "BOOLEAN_OPERATION") => Fit::scale(View::of(base).size(), view.size()),
-                (Some(_), _) => Fit::frame(View::of(base).size(), view.size()),
-            };
-            for c in self.children(id) {
-                kids.extend(self.layer(&c, inst, child_space, Some(&view), fit, depth + 1));
-            }
-        }
-        if stand.is_some_and(|s| s.0 == "FRAME") {
-            kids.splice(0..0, self.shape_with_text(&mut o, &view, own, &rest_id));
-            kids.extend(self.inner_text(&o, &view, &rest_id, own == "STICKY"));
-        }
-        if !kids.is_empty() {
-            o.insert("children".into(), Value::Array(kids));
-        }
-        Some(Value::Object(o))
-    }
-
-    /// A non-rectangular shape-with-text's shape, as a vector under its frame (which gives up its
-    /// paints to it).
-    fn shape_with_text(&mut self, o: &mut Obj, v: &View<'a>, own: &str, rest_id: &str) -> Option<Value> {
-        let shape = v.str("shapeWithTextType").unwrap_or("SQUARE");
-        let outlined = !v.list("fillGeometry").is_empty() || !v.list("strokeGeometry").is_empty();
-        if own != "SHAPE_WITH_TEXT" || matches!(shape, "SQUARE" | "ROUNDED_RECTANGLE") || !outlined || self.count >= MAX_NODES {
-            return None;
-        }
-        let mut s = Obj::new();
-        s.insert("id".into(), json!(format!("{rest_id};shape")));
-        s.insert("type".into(), json!("VECTOR"));
-        s.insert("name".into(), json!(shape.to_ascii_lowercase().replace('_', " ")));
-        for k in ["size", "strokeWeight", "strokeAlign", "strokeJoin", "strokeDashes"] {
-            if let Some(x) = o.get(k) {
-                s.insert(k.into(), x.clone());
-            }
-        }
-        for k in ["fills", "strokes"] {
-            s.insert(k.into(), o.insert(k.into(), json!([])).unwrap_or_else(|| json!([])));
-        }
-        s.insert("relativeTransform".into(), rows(Affine::IDENTITY));
-        self.geometry(&mut s, v);
-        if !s.contains_key("fillGeometry") && !s.contains_key("strokeGeometry") {
-            // Damaged outlines: the frame keeps its paints and box.
-            for k in ["fills", "strokes"] {
-                o.insert(k.into(), s.remove(k).unwrap_or_else(|| json!([])));
-            }
-            return None;
-        }
-        self.count += 1;
-        Some(Value::Object(s))
-    }
-
-    /// The text a stand-in frame holds (a sticky note's, a shape's, a table cell's) as a text
-    /// layer filling it, inset a little; centred unless it's a note.
-    fn inner_text(&mut self, o: &Obj, v: &View<'a>, rest_id: &str, note: bool) -> Option<Value> {
-        let chars = own_text(v)?;
-        if self.count >= MAX_NODES {
-            return None;
-        }
-        self.count += 1;
-        let size = |k: &str| o.get("size").and_then(|s| s.get(k)).and_then(Value::as_f64).unwrap_or(0.0);
-        let (w, h) = (size("x"), size("y"));
-        let pad = (w.min(h) / 4.0).clamp(0.0, 16.0);
-        let mut t = Obj::new();
-        t.insert("id".into(), json!(format!("{rest_id};text")));
-        t.insert("type".into(), json!("TEXT"));
-        t.insert("name".into(), json!(chars.chars().take(40).collect::<String>()));
-        t.insert("size".into(), json!({"x": (w - 2.0 * pad).max(1.0), "y": (h - 2.0 * pad).max(1.0)}));
-        t.insert("relativeTransform".into(), rows(Affine::translate((pad, pad))));
-        self.text(&mut t, v);
-        if let Some(Value::Object(st)) = t.get_mut("style") {
-            let (hor, ver) = if note { ("LEFT", "TOP") } else { ("CENTER", "CENTER") };
-            st.entry("textAlignHorizontal").or_insert_with(|| json!(hor));
-            st.entry("textAlignVertical").or_insert_with(|| json!(ver));
-            st.insert("textAutoResize".into(), json!("NONE"));
-        }
-        Some(Value::Object(t))
-    }
-
-    /// A connector's end caps, and when it has no saved outline or network a straight line
-    /// between its ends: free points, or a point (the centre unless given) of a sibling layer.
-    fn connector(&mut self, o: &mut Obj, v: &View<'a>, space: Affine) {
-        for (from, to) in [("connectorStartCap", "strokeCapStart"), ("connectorEndCap", "strokeCapEnd")] {
-            if let Some(c) = v.str(from) {
-                o.insert(to.into(), json!(cap_name(c)));
-            }
-        }
-        if own_text(v).is_some() {
-            self.warn("connector labels were skipped");
-        }
-        if ["vectorNetwork", "fillGeometry", "strokeGeometry"].iter().any(|k| o.contains_key(*k)) {
-            return;
-        }
-        let parent = v.get("parentIndex").and_then(|p| p.get("guid")).and_then(guid);
-        let end = |k: &str| -> Option<Point> {
-            let e = v.get(k)?;
-            let p = match e.get("endpointNodeID").and_then(guid).filter(|g| g != NO_STYLE) {
-                Some(id) => {
-                    let n = *self.nodes.get(&id)?;
-                    // Only siblings share the connector's coordinates.
-                    if n.get("parentIndex").and_then(|p| p.get("guid")).and_then(guid) != parent {
-                        return None;
-                    }
-                    let (w, h) = n.get("size").map_or((0.0, 0.0), |s| (num(s, "x").unwrap_or(0.0), num(s, "y").unwrap_or(0.0)));
-                    let (rx, ry) = e.get("relativePosition").and_then(|r| Some((num(r, "x")?, num(r, "y")?))).unwrap_or((0.5, 0.5));
-                    n.get("transform").and_then(matrix).unwrap_or_default() * Point::new(w * rx, h * ry)
-                }
-                None => e.get("position").and_then(|p| Some(Point::new(num(p, "x")?, num(p, "y")?)))?,
-            };
-            (p.x.is_finite() && p.y.is_finite()).then_some(p)
-        };
-        let (Some(a), Some(b)) = (end("connectorStart"), end("connectorEnd")) else {
-            self.warn("connectors whose ends can't be placed are empty");
-            return;
-        };
-        if v.str("connectorLineStyle").is_some_and(|s| s != "STRAIGHT") {
-            self.warn("elbowed and curved connectors without a saved path import as straight lines");
-        }
-        let (x0, y0) = (a.x.min(b.x), a.y.min(b.y));
-        o.insert("relativeTransform".into(), rows(space * Affine::translate((x0, y0))));
-        o.insert("size".into(), json!({"x": (a.x - b.x).abs(), "y": (a.y - b.y).abs()}));
-        o.insert(
-            "vectorNetwork".into(),
-            json!({"vertices": [{"x": a.x - x0, "y": a.y - y0}, {"x": b.x - x0, "y": b.y - y0}], "segments": [{"a": 0, "b": 1}]}),
-        );
-    }
-
-    /// Fields every layer type shares.
-    fn common(&mut self, o: &mut Obj, v: &View<'a>, ty: &str, space: Affine, parent: Option<&View<'a>>) {
-        for (from, to) in [("visible", "visible"), ("locked", "locked"), ("mask", "isMask")] {
-            if let Some(b) = v.flag(from) {
-                o.insert(to.into(), json!(b));
-            }
-        }
-        if let Some(m) = v.str("maskType") {
-            o.insert("maskType".into(), json!(if m == "OUTLINE" { "VECTOR" } else { m }));
-        }
-        copy_num(o, v, "opacity", "opacity");
-        if let Some(b) = v.str("blendMode").filter(|b| *b != "UNSET") {
-            o.insert("blendMode".into(), json!(b));
-        }
-        if let Some((x, y)) = v.size() {
-            o.insert("size".into(), json!({"x": x, "y": y}));
-        }
-        let t = v.transform().unwrap_or_default();
-        o.insert("relativeTransform".into(), rows(space * t));
-        // Paints, from the shared style when one is linked (the layer's own copy can be stale),
-        // unless the layer's own paints are bound to variables: those bindings must not be lost.
-        let mut styles = Obj::new();
-        let own = |k: &str| Some(v.list(k)).filter(|l| l.iter().any(paint_bound));
-        let fill_style = self.style(v, "styleIdForFill", "inheritFillStyleID", "fill", &mut styles);
-        let fills = own("fillPaints")
-            .unwrap_or_else(|| fill_style.map_or_else(|| v.list("fillPaints"), |s| s.get("fillPaints").map(Kv::list).unwrap_or_default()));
-        o.insert("fills".into(), Value::Array(fills.iter().filter_map(paint).collect()));
-        let stroke_style = self.style(v, "styleIdForStrokeFill", "inheritFillStyleIDForStroke", "stroke", &mut styles);
-        let strokes = own("strokePaints")
-            .unwrap_or_else(|| stroke_style.map_or_else(|| v.list("strokePaints"), |s| s.get("fillPaints").map(Kv::list).unwrap_or_default()));
-        o.insert("strokes".into(), Value::Array(strokes.iter().filter_map(paint).collect()));
-        let effect_style = self.style(v, "styleIdForEffect", "inheritEffectStyleID", "effect", &mut styles);
-        let effects = effect_style.map_or_else(|| v.list("effects"), |s| s.get("effects").map(Kv::list).unwrap_or_default());
-        if !effects.is_empty() {
-            o.insert("effects".into(), Value::Array(effects.iter().filter_map(effect).collect()));
-        }
-        let grid_style = self.style(v, "styleIdForGrid", "inheritGridStyleID", "grid", &mut styles);
-        let grids = grid_style.map_or_else(|| v.list("layoutGrids"), |s| s.get("layoutGrids").map(Kv::list).unwrap_or_default());
-        if !grids.is_empty() {
-            o.insert("layoutGrids".into(), Value::Array(grids.iter().map(layout_grid).collect()));
-        }
-        if ty == "TEXT" {
-            self.style(v, "styleIdForText", "inheritTextStyleID", "text", &mut styles);
-        }
-        if !styles.is_empty() {
-            o.insert("styles".into(), Value::Object(styles));
-        }
-        stroke(o, v);
-        copy_num(o, v, "cornerRadius", "cornerRadius");
-        copy_num(o, v, "cornerSmoothing", "cornerSmoothing");
-        if v.flag("rectangleCornerRadiiIndependent") == Some(true) {
-            let r = |k: &str| v.num(k).unwrap_or(0.0);
-            o.insert(
-                "rectangleCornerRadii".into(),
-                json!([
-                    r("rectangleTopLeftCornerRadius"),
-                    r("rectangleTopRightCornerRadius"),
-                    r("rectangleBottomRightCornerRadius"),
-                    r("rectangleBottomLeftCornerRadius")
-                ]),
-            );
-        }
-        let constraint = |k: &str, min: &'static str, max: &'static str, both: &'static str| match v.str(k) {
-            Some("CENTER") => "CENTER",
-            Some("MAX" | "FIXED_MAX") => max,
-            Some("STRETCH") => both,
-            Some("SCALE") => "SCALE",
-            _ => min,
-        };
-        o.insert(
-            "constraints".into(),
-            json!({
-                "horizontal": constraint("horizontalConstraint", "LEFT", "RIGHT", "LEFT_RIGHT"),
-                "vertical": constraint("verticalConstraint", "TOP", "BOTTOM", "TOP_BOTTOM"),
-            }),
-        );
-        if matches!(ty, "FRAME" | "COMPONENT" | "COMPONENT_SET" | "INSTANCE" | "SECTION") {
-            o.insert("clipsContent".into(), json!(!v.flag("frameMaskDisabled").unwrap_or(false)));
-            self.auto_layout(o, v);
-        }
-        child_layout(o, v, parent);
-        let exports: Vec<Value> = v.list("exportSettings").iter().map(export_setting).collect();
-        if !exports.is_empty() {
-            o.insert("exportSettings".into(), Value::Array(exports));
-        }
-        if let Some(b) = v.flag("sectionContentsHidden") {
-            o.insert("sectionContentsHidden".into(), json!(b));
-        }
-        self.prototype(o, v);
-        self.variable_bindings(o, v);
-    }
-
-    /// The style node a layer links in `key` (or the older `legacy` field), recorded for the REST
-    /// `styles` map under `slot`.
-    fn style(&mut self, v: &View<'a>, key: &str, legacy: &str, slot: &str, out: &mut Obj) -> Option<&'a Kv<'a>> {
-        let id = v.get(key).and_then(ref_guid).or_else(|| v.get(legacy).and_then(guid).filter(|g| g != NO_STYLE))?;
-        let node = *self.nodes.get(&id)?;
-        node.get("styleType").and_then(Kv::str)?;
-        out.insert(slot.into(), json!(id));
-        if !self.styles.contains_key(&id) {
-            let name = node.get("name").and_then(Kv::str).unwrap_or("Style");
-            let desc = node.get("styleDescription").or_else(|| node.get("description")).and_then(Kv::str).unwrap_or("");
-            self.styles.insert(id, json!({"name": name, "description": desc}));
-        }
-        Some(node)
-    }
-
-    fn auto_layout(&mut self, o: &mut Obj, v: &View<'a>) {
-        let Some(mode) = v.str("stackMode").filter(|m| matches!(*m, "HORIZONTAL" | "VERTICAL" | "GRID")) else { return };
-        o.insert("layoutMode".into(), json!(mode));
-        copy_num(o, v, "stackSpacing", "itemSpacing");
-        copy_num(o, v, "stackCounterSpacing", "counterAxisSpacing");
-        if v.str("stackWrap") == Some("WRAP") {
-            o.insert("layoutWrap".into(), json!("WRAP"));
-        }
-        if v.str("stackCounterAlignContent") == Some("SPACE_BETWEEN") {
-            o.insert("counterAxisAlignContent".into(), json!("SPACE_BETWEEN"));
-        }
-        let (h, vert) = (v.num("stackHorizontalPadding").unwrap_or(0.0), v.num("stackVerticalPadding").unwrap_or(0.0));
-        o.insert("paddingLeft".into(), json!(h));
-        o.insert("paddingTop".into(), json!(vert));
-        o.insert("paddingRight".into(), json!(v.num("stackPaddingRight").unwrap_or(h)));
-        o.insert("paddingBottom".into(), json!(v.num("stackPaddingBottom").unwrap_or(vert)));
-        let main = match v.str("stackPrimaryAlignItems").or_else(|| v.str("stackJustify")) {
-            Some("CENTER") => "CENTER",
-            Some("MAX") => "MAX",
-            Some("SPACE_BETWEEN" | "SPACE_EVENLY" | "SPACE_AROUND" | "SPACE_EVENLY_CSS") => "SPACE_BETWEEN",
-            _ => "MIN",
-        };
-        o.insert("primaryAxisAlignItems".into(), json!(main));
-        let cross = match v.str("stackCounterAlignItems").or_else(|| v.str("stackAlign")) {
-            Some("CENTER") => "CENTER",
-            Some("MAX") => "MAX",
-            Some("BASELINE") => "BASELINE",
-            _ => "MIN",
-        };
-        o.insert("counterAxisAlignItems".into(), json!(cross));
-        let sizing = |k: &str| if v.str(k).is_some_and(|s| s.starts_with("RESIZE_TO_FIT")) { "AUTO" } else { "FIXED" };
-        o.insert("primaryAxisSizingMode".into(), json!(sizing("stackPrimarySizing")));
-        o.insert("counterAxisSizingMode".into(), json!(sizing("stackCounterSizing")));
-        if let Some(b) = v.flag("bordersTakeSpace") {
-            o.insert("strokesIncludedInLayout".into(), json!(b));
-        }
-        if let Some(b) = v.flag("stackReverseZIndex") {
-            o.insert("itemReverseZIndex".into(), json!(b));
-        }
-        if mode == "GRID" {
-            copy_num(o, v, "gridColumnGap", "gridColumnGap");
-            copy_num(o, v, "gridRowGap", "gridRowGap");
-            o.insert("gridColumnCount".into(), json!(tracks(v, "gridColumns").len()));
-            o.insert("gridRowCount".into(), json!(tracks(v, "gridRows").len()));
-            let sizes = ["gridColumnsSizing", "gridRowsSizing"]
-                .iter()
-                .flat_map(|k| v.get(k).and_then(|m| m.get("entries")).map(Kv::list).unwrap_or_default());
-            let flexible = sizes.into_iter().all(|e| {
-                let t = e.get("trackSize");
-                ["minSizing", "maxSizing"]
-                    .iter()
-                    .all(|s| t.and_then(|t| t.get(s)).and_then(|s| s.get("type")).and_then(Kv::str).is_none_or(|x| x == "FLEX"))
-            });
-            if !flexible {
-                self.warn("grid tracks of fixed or content size import as equal tracks");
-            }
-        }
-    }
-
-    fn text(&mut self, o: &mut Obj, v: &View<'a>) {
-        let style_node = v
-            .get("styleIdForText")
-            .and_then(ref_guid)
-            .or_else(|| v.get("inheritTextStyleID").and_then(guid))
-            .and_then(|s| self.nodes.get(&s).copied());
-        let sv = v.with(style_node.filter(|s| s.get("styleType").and_then(Kv::str) == Some("TEXT")));
-        let td = v.get("textData");
-        let chars = td.and_then(|t| t.get("characters")).and_then(Kv::str).unwrap_or("");
-        o.insert("characters".into(), json!(chars));
-        let mut style = text_style(&sv, None);
-        for k in ["textAlignHorizontal", "textAlignVertical", "textAutoResize", "textTruncation"] {
-            copy_str(&mut style, v, k, k);
-        }
-        if let Some(n) = v.num("maxLines").filter(|n| *n >= 1.0) {
-            style.insert("maxLines".into(), json!(n));
-        }
-        let size = sv.num("fontSize");
-        if let Some(b) = o.get_mut("style").and_then(|s| s.get_mut("boundVariables")).map(Value::take) {
-            style.insert("boundVariables".into(), b);
-        }
-        o.insert("style".into(), Value::Object(style));
-        let Some(td) = td else { return };
-        let ids: Vec<u64> = td.get("characterStyleIDs").map(Kv::list).unwrap_or_default().iter().filter_map(Kv::f64).map(|i| i as u64).collect();
-        if ids.iter().any(|i| *i != 0) {
-            let mut table = Obj::new();
-            for e in td.get("styleOverrideTable").map(Kv::list).unwrap_or_default() {
-                let Some(sid) = num(e, "styleID") else { continue };
-                let mut s = text_style(&View::of(e), size);
-                if let Some(fills) = e.get("fillPaints") {
-                    s.insert("fills".into(), Value::Array(fills.list().iter().filter_map(paint).collect()));
-                }
-                table.insert((sid as u64).to_string(), Value::Object(s));
-            }
-            o.insert("characterStyleOverrides".into(), json!(ids));
-            o.insert("styleOverrideTable".into(), Value::Object(table));
-        }
-        let lines: Vec<&str> = td
-            .get("lines")
-            .map(Kv::list)
-            .unwrap_or_default()
-            .iter()
-            .map(|l| match l.get("lineType").and_then(Kv::str) {
-                Some("ORDERED_LIST") => "ORDERED",
-                Some("UNORDERED_LIST") => "UNORDERED",
-                _ => "NONE",
-            })
-            .collect();
-        if lines.iter().any(|l| *l != "NONE") {
-            o.insert("lineTypes".into(), json!(lines));
-        }
-    }
-
-    /// `fillGeometry` / `strokeGeometry` as SVG path data, and star/polygon parameters.
-    fn geometry(&mut self, o: &mut Obj, v: &View<'a>) {
-        for key in ["fillGeometry", "strokeGeometry"] {
-            let mut out = Vec::new();
-            for p in v.list(key) {
-                let Some(blob) = num(p, "commandsBlob").and_then(|i| self.blobs.get(i as usize)).copied() else { continue };
-                let Some(d) = svg_path(blob) else {
-                    self.warn("damaged vector geometry was skipped");
-                    continue;
-                };
-                if d.is_empty() {
-                    continue;
-                }
-                let winding = if p.get("windingRule").and_then(Kv::str) == Some("ODD") { "EVENODD" } else { "NONZERO" };
-                out.push(json!({"path": d, "windingRule": winding}));
-            }
-            if !out.is_empty() {
-                o.insert(key.into(), Value::Array(out));
-            }
-        }
-        let vector = o.get("type").and_then(Value::as_str) == Some("VECTOR");
-        if vector && !self.network(o, v) && !o.contains_key("fillGeometry") && !o.contains_key("strokeGeometry") && v.str("type") != Some("CONNECTOR")
-        {
-            self.warn("vectors without geometry are empty");
-        }
-        if !vector {
-            copy_num(o, v, "count", "pointCount");
-            copy_num(o, v, "starInnerScale", "innerRadius");
-        }
-    }
-
-    /// The editable network of `vectorData` as `vectorNetwork` (the REST importer's extension),
-    /// scaled to the layer's size, with per-point corner radii, handle mirroring and end caps.
-    /// False when there's none or it's damaged (the outlines stand in).
-    fn network(&mut self, o: &mut Obj, v: &View<'a>) -> bool {
-        let Some(vd) = v.get("vectorData") else { return false };
-        let Some(blob) = num(vd, "vectorNetworkBlob").and_then(|i| self.blobs.get(i as usize)).copied() else { return false };
-        let Some(net) = network::decode(blob) else {
-            self.warn("damaged vector networks import as outlines");
-            return false;
-        };
-        // An open path shows its fill, which regions can't hold: the outline keeps the look.
-        let fills_shown =
-            o.get("fills").and_then(Value::as_array).is_some_and(|f| f.iter().any(|p| p.get("visible").and_then(Value::as_bool) != Some(false)));
-        if net.segments.is_empty() || (net.regions.is_empty() && fills_shown && o.contains_key("fillGeometry")) {
-            return false;
-        }
-        let styles: BTreeMap<u64, &Kv> =
-            vd.get("styleOverrideTable").map(Kv::list).unwrap_or_default().iter().filter_map(|s| Some((num(s, "styleID")? as u64, s))).collect();
-        let style = |id: u32| styles.get(&u64::from(id)).copied().filter(|_| id != 0);
-        let scale = |k: &str| {
-            let size = v.size().map(|s| if k == "x" { s.0 } else { s.1 });
-            let norm = vd.get("normalizedSize").and_then(|s| num(s, k));
-            size.zip(norm).filter(|(s, n)| s.is_finite() && *n > 1e-9).map_or(1.0, |(s, n)| s / n)
-        };
-        let (sx, sy) = (scale("x"), scale("y"));
-        let vertices: Vec<Value> = net
-            .vertices
-            .iter()
-            .map(|p| {
-                let mut out = json!({"x": p.x * sx, "y": p.y * sy});
-                let st = style(p.style);
-                if let Some(r) = st.and_then(|s| num(s, "cornerRadius")).filter(|r| *r > 0.0) {
-                    out["radius"] = json!(r);
-                }
-                match st.and_then(|s| s.get("handleMirroring")).and_then(Kv::str) {
-                    Some("ANGLE") => out["mirror"] = json!("angle"),
-                    Some("ANGLE_AND_LENGTH") => out["mirror"] = json!("angleAndLength"),
-                    Some("NONE") => out["mirror"] = json!("none"),
-                    _ => {}
-                }
-                out
-            })
-            .collect();
-        let segments: Vec<Value> =
-            net.segments.iter().map(|s| json!({"a": s.a, "b": s.b, "ta": [s.ta.0 * sx, s.ta.1 * sy], "tb": [s.tb.0 * sx, s.tb.1 * sy]})).collect();
-        let regions: Vec<Value> =
-            net.regions.iter().map(|r| json!({"loops": r.loops, "winding": if r.non_zero { "nonZero" } else { "evenOdd" }})).collect();
-        if net.regions.iter().any(|r| style(r.style).is_some_and(|s| s.get("fillPaints").is_some())) {
-            self.warn("filled areas of a vector with their own fill use the layer's fill");
-        }
-        let join = v.str("strokeJoin");
-        if net.vertices.iter().any(|p| style(p.style).and_then(|s| s.get("strokeJoin")).and_then(Kv::str).is_some_and(|j| Some(j) != join)) {
-            self.warn("points with their own stroke join use the layer's");
-        }
-        // The stroke starts at the first end point and stops at the last (as the editor draws it).
-        let mut degree = vec![0usize; net.vertices.len()];
-        for s in &net.segments {
-            for i in [s.a, s.b] {
-                if let Some(d) = degree.get_mut(i) {
-                    *d += 1;
-                }
-            }
-        }
-        let ends: Vec<usize> = (0..degree.len()).filter(|i| degree.get(*i) == Some(&1)).collect();
-        let cap =
-            |i: Option<&usize>| i.and_then(|i| net.vertices.get(*i)).and_then(|p| style(p.style)).and_then(|s| s.get("strokeCap")).and_then(Kv::str);
-        let (first, last) = (cap(ends.first()), cap(ends.last()));
-        if first.is_some() || last.is_some() {
-            let node = v.str("strokeCap").unwrap_or("NONE");
-            o.insert("strokeCapStart".into(), json!(cap_name(first.unwrap_or(node))));
-            o.insert("strokeCapEnd".into(), json!(cap_name(last.unwrap_or(node))));
-        }
-        o.insert("vectorNetwork".into(), json!({"vertices": vertices, "segments": segments, "regions": regions}));
-        true
-    }
-
-    /// Component property definitions and description.
-    fn component(&mut self, o: &mut Obj, v: &View<'a>, id: &str) {
-        let mut defs = Obj::new();
-        for d in v.list("componentPropDefs") {
-            if d.get("isDeleted").and_then(Kv::bool) == Some(true) {
-                continue;
-            }
-            let Some((name, ty)) = d.get("id").and_then(guid).and_then(|i| self.prop_defs.get(&i).cloned()) else { continue };
-            let init = d.get("initialValue");
-            let def = match ty {
-                "BOOL" => json!({"type": "BOOLEAN", "defaultValue": init.and_then(|i| i.get("boolValue")).and_then(Kv::bool).unwrap_or(true)}),
-                "TEXT" => json!({"type": "TEXT", "defaultValue": init.and_then(prop_text).unwrap_or("")}),
-                "INSTANCE_SWAP" => match init.and_then(|i| i.get("guidValue")).and_then(guid) {
-                    Some(g) => json!({"type": "INSTANCE_SWAP", "defaultValue": g}),
-                    None => continue,
-                },
-                "VARIANT" => json!({"type": "VARIANT"}),
-                _ => {
-                    self.warn(format!("{} component properties are not supported and were skipped", ty.to_ascii_lowercase()));
-                    continue;
-                }
-            };
-            defs.insert(name, def);
-        }
-        if !defs.is_empty() {
-            o.insert("componentPropertyDefinitions".into(), Value::Object(defs));
-        }
-        if let Some(d) = v.str("symbolDescription").or_else(|| v.str("description")).filter(|d| !d.is_empty()) {
-            let into = if o.get("type").and_then(Value::as_str) == Some("COMPONENT_SET") { &mut self.sets } else { &mut self.components };
-            into.insert(id.to_string(), json!({"description": d}));
-        }
-    }
-
-    /// A layer's component property references, and inside an instance the values they take.
-    fn prop_refs(&mut self, o: &mut Obj, v: &View<'a>, inst: Option<&Inst<'a>>) {
-        let mut refs = Obj::new();
-        for e in v.get("parameterConsumptionMap").and_then(|m| m.get("entries")).map(Kv::list).unwrap_or_default() {
-            let field = match e.get("variableField").and_then(Kv::str) {
-                Some("VISIBLE") => "visible",
-                Some("TEXT_DATA") => "characters",
-                Some("OVERRIDDEN_SYMBOL_ID") => "mainComponent",
-                _ => continue,
-            };
-            let Some(def) =
-                e.get("variableData").and_then(|d| d.get("value")).and_then(|x| x.get("propRefValue")).and_then(|p| p.get("defId")).and_then(guid)
-            else {
-                continue;
-            };
-            if let Some((name, _)) = self.prop_defs.get(&def) {
-                refs.insert(field.into(), json!(name));
-            }
-            let Some(val) = inst.and_then(|i| i.props.get(&def)) else { continue };
-            match field {
-                "visible" => {
-                    if let Some(b) = val.get("boolValue").and_then(Kv::bool) {
-                        o.insert("visible".into(), json!(b));
-                    }
-                }
-                "characters" => {
-                    if let Some(t) = prop_text(val) {
-                        o.insert("characters".into(), json!(t));
-                    }
-                }
-                _ => {}
-            }
-        }
-        if !refs.is_empty() {
-            o.insert("componentPropertyReferences".into(), Value::Object(refs));
-        }
-    }
-
-    /// An instance's main and properties; the context its expanded layers are built in.
-    fn instance(&mut self, o: &mut Obj, v: &View<'a>, id: &str, outer: Option<&Inst<'a>>, rest_id: &str) -> Option<(Inst<'a>, String)> {
-        let sd = v.get("symbolData");
-        let mut sym = v.get("overriddenSymbolID").and_then(guid).or_else(|| sd.and_then(|s| s.get("symbolID")).and_then(guid));
-        // An instance swap property value picks the main.
-        if let Some(i) = outer
-            && let Some(def) = prop_ref(v, "OVERRIDDEN_SYMBOL_ID")
-            && let Some(g) = i.props.get(&def).and_then(|p| p.get("guidValue")).and_then(guid)
-        {
-            sym = Some(g);
-        }
-        let Some(sym) = sym else {
-            self.warn("instances without a main component were imported as empty frames");
-            return None;
-        };
-        o.insert("componentId".into(), json!(sym));
-        let assignments = v.list("componentPropAssignments");
-        let mut props = Obj::new();
-        for a in assignments {
-            let Some((name, ty)) = a.get("defID").and_then(guid).and_then(|d| self.prop_defs.get(&d).cloned()) else { continue };
-            let val = a.get("value");
-            let p = match ty {
-                "BOOL" => val.and_then(|x| x.get("boolValue")).and_then(Kv::bool).map(|b| json!({"type": "BOOLEAN", "value": b})),
-                "TEXT" => val.and_then(prop_text).map(|t| json!({"type": "TEXT", "value": t})),
-                "INSTANCE_SWAP" => val.and_then(|x| x.get("guidValue")).and_then(guid).map(|g| json!({"type": "INSTANCE_SWAP", "value": g})),
-                _ => None,
-            };
-            if let Some(p) = p {
-                props.insert(name, p);
-            }
-        }
-        if !props.is_empty() {
-            o.insert("componentProperties".into(), Value::Object(props));
-        }
-        if !self.nodes.contains_key(&sym) {
-            self.warn("instances of components that aren't in the file show no layers");
-            return None;
-        }
-        if outer.is_some_and(|i| i.symbols.contains(&sym)) {
-            return None;
-        }
-        // Overrides by id path below this instance (the instance itself is addressed by its main's id).
-        let own_path: Vec<String> = outer.map(|i| [i.path.as_slice(), &[id.to_string()]].concat()).unwrap_or_default();
-        let mut overrides: Overrides<'a> = outer.map(|i| (*i.overrides).clone()).unwrap_or_default();
-        // A nested instance's derived layout is for the size it has in its main: resized here, the
-        // sizes and places in it no longer hold and its layers follow their constraints instead.
-        let differs = |a: f64, b: f64| (a - b).abs() > 1e-6 * a.abs().max(b.abs()).max(1.0);
-        let resized = outer.is_some()
-            && match (self.nodes.get(id).and_then(|b| View::of(b).size()), v.size()) {
-                (Some(a), Some(b)) => differs(a.0, b.0) || differs(a.1, b.1),
-                (a, b) => a.is_some() != b.is_some(),
-            };
-        let lists = [sd.and_then(|s| s.get("symbolOverrides")).map(Kv::list).unwrap_or_default(), v.list("derivedSymbolData")];
-        for (layer, list) in lists.into_iter().enumerate() {
-            for ov in list {
-                let rel: Vec<String> =
-                    ov.get("guidPath").and_then(|g| g.get("guids")).map(Kv::list).unwrap_or_default().iter().filter_map(guid).collect();
-                if rel.is_empty() || rel == [sym.clone()] {
-                    continue;
-                }
-                let e = overrides.entry([own_path.as_slice(), &rel].concat()).or_default();
-                // The outer instance's overrides win over this one's own; derived layout comes last.
-                if layer == 0 && outer.is_some() {
-                    e.insert(0, (Entry::Override, ov));
-                } else {
-                    e.push((
-                        match (layer, resized) {
-                            (0, _) => Entry::Override,
-                            (_, false) => Entry::Derived,
-                            (_, true) => Entry::Stale,
-                        },
-                        ov,
-                    ));
-                }
-            }
-        }
-        let mut all_props: BTreeMap<String, &'a Kv<'a>> = outer.map(|i| (*i.props).clone()).unwrap_or_default();
-        for a in assignments {
-            if let (Some(d), Some(val)) = (a.get("defID").and_then(guid), a.get("value")) {
-                all_props.entry(d).or_insert(val);
-            }
-        }
-        let mut symbols = outer.map(|i| i.symbols.clone()).unwrap_or_default();
-        symbols.push(sym.clone());
-        let root = outer.map_or_else(|| rest_id.to_string(), |i| i.root.clone());
-        Some((Inst { root, path: own_path, overrides: Rc::new(overrides), props: Rc::new(all_props), symbols }, sym))
-    }
-
-    fn prototype(&mut self, o: &mut Obj, v: &View<'a>) {
-        let mut list = Vec::new();
-        for it in v.list("prototypeInteractions") {
-            if it.get("isDeleted").and_then(Kv::bool) == Some(true) {
-                continue;
-            }
-            if let Some(i) = self.interaction(it) {
-                list.push(i);
-            }
-        }
-        if !list.is_empty() {
-            o.insert("interactions".into(), Value::Array(list));
-        }
-        let overflow = match v.str("scrollDirection") {
-            Some("HORIZONTAL") => Some("HORIZONTAL_SCROLLING"),
-            Some("VERTICAL") => Some("VERTICAL_SCROLLING"),
-            Some("BOTH") => Some("HORIZONTAL_AND_VERTICAL_SCROLLING"),
-            _ => None,
-        };
-        if let Some(d) = overflow {
-            o.insert("overflowDirection".into(), json!(d));
-        }
-        let behavior = match v.str("scrollBehavior") {
-            Some("FIXED_WHEN_CHILD_OF_SCROLLING_FRAME") => Some("FIXED"),
-            Some("STICKY_SCROLLS") => Some("STICKY_SCROLLS"),
-            _ => None,
-        };
-        if let Some(b) = behavior {
-            o.insert("scrollBehavior".into(), json!(b));
-        }
-        copy_str(o, v, "overlayPositionType", "overlayPositionType");
-        copy_str(o, v, "overlayBackgroundInteraction", "overlayBackgroundInteraction");
-        if let Some(a) = v.get("overlayBackgroundAppearance") {
-            let ty = a.get("backgroundType").and_then(Kv::str).unwrap_or("NONE");
-            o.insert("overlayBackground".into(), json!({"type": ty, "color": a.get("backgroundColor").map_or(Value::Null, color)}));
-        }
-    }
-
-    fn interaction(&mut self, it: &Kv) -> Option<Value> {
-        let ev = it.get("event");
-        let ty = match ev.and_then(|e| e.get("interactionType")).and_then(Kv::str).unwrap_or("ON_CLICK") {
-            "DRAG" => "ON_DRAG",
-            "MOUSE_IN" => "MOUSE_ENTER",
-            "MOUSE_OUT" => "MOUSE_LEAVE",
-            t => t,
-        };
-        let mut trigger = json!({"type": ty});
-        if let Some(t) = ev.and_then(|e| num(e, "transitionTimeout")) {
-            // Seconds as 32-bit floats: whole milliseconds.
-            trigger["timeout"] = json!((t * 1000.0).round());
-        }
-        if let Some(k) = ev.and_then(|e| e.get("keyTrigger")) {
-            let codes: Vec<f64> = k.get("keyCodes").map(Kv::list).unwrap_or_default().iter().filter_map(Kv::f64).collect();
-            trigger["keyCodes"] = json!(codes);
-            if let Some(d) = k.get("triggerDevice").and_then(Kv::str) {
-                trigger["device"] = json!(if d.contains("KEYBOARD") { "KEYBOARD" } else { d });
-            }
-        }
-        let actions: Vec<Value> = it.get("actions").map(Kv::list).unwrap_or_default().iter().filter_map(|a| self.action(a, 0)).collect();
-        (!actions.is_empty()).then(|| json!({"trigger": trigger, "actions": actions}))
-    }
-
-    /// One prototype action in the REST shape (`depth`: conditionals it's nested in).
-    fn action(&mut self, a: &Kv, depth: usize) -> Option<Value> {
-        Some(match a.get("connectionType").and_then(Kv::str) {
-            Some("INTERNAL_NODE") | None => {
-                let dest = a.get("transitionNodeID").and_then(guid)?;
-                let nav = match a.get("navigationType").and_then(Kv::str) {
-                    Some("SWAP_STATE") => "CHANGE_TO",
-                    Some(n) => n,
-                    None => "NAVIGATE",
-                };
-                let mut act = json!({"type": "NODE", "destinationId": dest, "navigation": nav});
-                if let Some(t) = transition(a) {
-                    act["transition"] = t;
-                }
-                if let Some(b) = a.get("transitionPreserveScroll").and_then(Kv::bool) {
-                    act["preserveScrollPosition"] = json!(b);
-                }
-                if let Some(p) = a.get("overlayRelativePosition") {
-                    act["overlayRelativePosition"] = json!({"x": num(p, "x"), "y": num(p, "y")});
-                }
-                act
-            }
-            Some("URL") => json!({"type": "URL", "url": a.get("connectionURL").and_then(Kv::str)?}),
-            Some("BACK") => json!({"type": "BACK"}),
-            Some("CLOSE") => json!({"type": "CLOSE"}),
-            Some("NONE") => return None,
-            Some("SET_VARIABLE") => {
-                let var = a.get("targetVariable").and_then(|t| t.get("id")).and_then(ref_guid).or_else(|| a.get("targetVariableID").and_then(guid));
-                // Missing parts are left out: the REST importer skips the action with a warning.
-                let mut act = json!({"type": "SET_VARIABLE", "variableId": var});
-                if let Some(d) = a.get("targetVariableData").and_then(|d| variable_data(d, 0)) {
-                    act["variableValue"] = d;
-                }
-                act
-            }
-            Some("SET_VARIABLE_MODE") => json!({
-                "type": "SET_VARIABLE_MODE",
-                "variableCollectionId": a.get("targetVariableSetID").and_then(ref_guid),
-                "variableModeId": a.get("targetVariableModeID").and_then(guid),
-            }),
-            Some("CONDITIONAL") if depth < MAX_ACTION_DEPTH => {
-                let mut blocks = Vec::new();
-                for b in a.get("conditionalActions").map(Kv::list).unwrap_or_default() {
-                    let actions: Vec<Value> =
-                        b.get("actions").map(Kv::list).unwrap_or_default().iter().filter_map(|x| self.action(x, depth + 1)).collect();
-                    let mut block = json!({"actions": actions});
-                    // A condition that can't be read must not turn the block into an "else".
-                    if let Some(c) = b.get("condition") {
-                        block["condition"] = variable_data(c, 0).unwrap_or_else(|| json!({}));
-                    }
-                    blocks.push(block);
-                }
-                json!({"type": "CONDITIONAL", "conditionalBlocks": blocks})
-            }
-            Some(other) => {
-                self.warn(format!("{} prototype actions are not imported from .fig files yet", other.to_ascii_lowercase().replace('_', " ")));
-                return None;
-            }
-        })
-    }
-
-    fn variable_bindings(&mut self, o: &mut Obj, v: &View<'a>) {
-        let mut bound = Obj::new();
-        let mut text_bound = Obj::new();
-        for e in v.get("variableConsumptionMap").and_then(|m| m.get("entries")).map(Kv::list).unwrap_or_default() {
-            let Some(var) = alias(e.get("variableData")) else { continue };
-            let a = json!({"type": "VARIABLE_ALIAS", "id": var});
-            let field = e.get("variableField").and_then(Kv::str).unwrap_or("");
-            match (binding_key(field), text_binding_key(field)) {
-                (Some(k), _) => {
-                    bound.insert(k.into(), a);
-                }
-                (_, Some(k)) => {
-                    text_bound.insert(k.into(), a);
-                }
-                _ if field == "CORNER_RADIUS" => {
-                    for k in ["topLeftRadius", "topRightRadius", "bottomLeftRadius", "bottomRightRadius"] {
-                        bound.insert(k.into(), a.clone());
-                    }
-                }
-                _ if field.starts_with("BORDER_") => {
-                    let side = match field {
-                        "BORDER_TOP_WEIGHT" => "strokeTopWeight",
-                        "BORDER_RIGHT_WEIGHT" => "strokeRightWeight",
-                        "BORDER_BOTTOM_WEIGHT" => "strokeBottomWeight",
-                        _ => "strokeLeftWeight",
-                    };
-                    bound.insert(side.into(), a);
-                }
-                _ if field == "WIDTH" || field == "HEIGHT" => {
-                    let axis = if field == "WIDTH" { "x" } else { "y" };
-                    let size = bound.entry("size").or_insert_with(|| json!({}));
-                    size[axis] = a;
-                }
-                _ => self.warn(format!("variables bound to {} are not imported from .fig files yet", field.to_ascii_lowercase().replace('_', " "))),
-            }
-        }
-        if !bound.is_empty() {
-            o.insert("boundVariables".into(), Value::Object(bound));
-        }
-        // (The text style itself is added after this: it keeps these.)
-        if !text_bound.is_empty() {
-            o.insert("style".into(), json!({"boundVariables": text_bound}));
-        }
-        let mut modes = Obj::new();
-        let mut lost = false;
-        for e in v.get("variableModeBySetMap").and_then(|m| m.get("entries")).map(Kv::list).unwrap_or_default() {
-            let (Some(set), Some(mode)) = (e.get("variableSetID"), e.get("variableModeID").and_then(guid)) else { continue };
-            match self.resource_id(set) {
-                Some(id) => {
-                    modes.insert(id, json!(mode));
-                }
-                // A mode of a collection neither named by guid nor resolvable in the file.
-                None if set.get("guid").is_some() || set.get("assetRef").is_some() => lost = true,
-                None => {}
-            }
-        }
-        if lost {
-            self.warn("variable modes of collections that aren't in the file were skipped");
-        }
-        if !modes.is_empty() {
-            o.insert("explicitVariableModes".into(), Value::Object(modes));
-        }
-    }
-
-    /// The shared styles the file defines, in their order: each with the sample layer that holds
-    /// its values (`styleDefinitions`, our extension of the file JSON; the REST importer reads it).
-    fn style_definitions(&mut self) -> Vec<Value> {
-        let mut found: Vec<(&'a str, String, &'a Kv<'a>)> = Vec::new();
-        for (id, n) in &self.nodes {
-            let live = n.get("isSoftDeleted").and_then(Kv::bool) != Some(true) && n.get("isSoftDeletedStyle").and_then(Kv::bool) != Some(true);
-            if live && n.get("styleType").and_then(Kv::str).is_some_and(|t| matches!(t, "FILL" | "TEXT" | "EFFECT" | "GRID")) {
-                found.push((n.get("sortPosition").and_then(Kv::str).unwrap_or(""), id.clone(), n));
-            }
-        }
-        found.sort_by(|a, b| (a.0, &a.1).cmp(&(b.0, &b.1)));
-        let mut out = Vec::new();
-        for (_, id, n) in found {
-            let Some(node) = self.layer(&id, None, Affine::IDENTITY, None, None, 0) else { break };
-            let name = n.get("name").and_then(Kv::str).unwrap_or("Style");
-            let desc = n.get("styleDescription").or_else(|| n.get("description")).and_then(Kv::str).unwrap_or("");
-            let ty = n.get("styleType").and_then(Kv::str).unwrap_or("");
-            out.push(json!({"id": id, "name": name, "description": desc, "styleType": ty, "node": node}));
-        }
-        out
-    }
-
-    /// Collections and variables, as the local variables response's `meta`, with their ids in the
-    /// file's order (`collectionOrder` and `variableOrder`, our extensions).
-    fn variables(&self) -> Option<Value> {
-        let of_type = |t: &'static str, key: &'static str| {
-            let live = move |n: &Kv| n.get("type").and_then(Kv::str) == Some(t) && n.get("isSoftDeleted").and_then(Kv::bool) != Some(true);
-            let mut list: Vec<(&str, &String, &'a Kv<'a>)> = self
-                .nodes
-                .iter()
-                .filter(|(_, n)| live(n))
-                .map(|(id, n)| (n.get(key).and_then(|p| p.get("position").or(Some(p))).and_then(Kv::str).unwrap_or(""), id, *n))
-                .collect();
-            list.sort_by(|a, b| (a.0, a.1).cmp(&(b.0, b.1)));
-            list.into_iter().map(|(_, id, n)| (id, n))
-        };
-        let mut order = Vec::new();
-        let mut collections = Obj::new();
-        for (id, n) in of_type("VARIABLE_SET", "parentIndex") {
-            order.push(json!(id));
-            let mut modes: Vec<(&str, Value)> = n
-                .get("variableSetModes")
-                .map(Kv::list)
-                .unwrap_or_default()
-                .iter()
-                .filter_map(|m| {
-                    let mode = json!({"modeId": m.get("id").and_then(guid)?, "name": m.get("name").and_then(Kv::str).unwrap_or("Mode")});
-                    Some((m.get("sortPosition").and_then(Kv::str).unwrap_or(""), mode))
-                })
-                .collect();
-            modes.sort_by(|a, b| a.0.cmp(b.0));
-            let default = modes.first().map_or(Value::Null, |m| m.1["modeId"].clone());
-            let name = n.get("name").and_then(Kv::str).unwrap_or("Collection");
-            let modes: Vec<Value> = modes.into_iter().map(|m| m.1).collect();
-            collections.insert(id.clone(), json!({"id": id, "name": name, "modes": modes, "defaultModeId": default}));
-        }
-        let mut variable_order = Vec::new();
-        let mut variables = Obj::new();
-        for (id, n) in of_type("VARIABLE", "sortPosition") {
-            let Some(set) = n.get("variableSetID").and_then(|s| self.resource_id(s)).filter(|s| collections.contains_key(s)) else { continue };
-            let ty = n.get("variableResolvedType").and_then(Kv::str).unwrap_or("");
-            if !matches!(ty, "BOOLEAN" | "FLOAT" | "STRING" | "COLOR") {
-                continue;
-            }
-            let mut values = Obj::new();
-            for e in n.get("variableDataValues").and_then(|m| m.get("entries")).map(Kv::list).unwrap_or_default() {
-                if let (Some(mode), Some(val)) = (e.get("modeID").and_then(guid), e.get("variableData").and_then(variable_value)) {
-                    values.insert(mode, val);
-                }
-            }
-            let name = n.get("name").and_then(Kv::str).unwrap_or("Variable");
-            let desc = n.get("description").and_then(Kv::str).unwrap_or("");
-            let mut var =
-                json!({"id": id, "name": name, "variableCollectionId": set, "resolvedType": ty, "valuesByMode": values, "description": desc});
-            // The properties pickers offer the variable for, under the REST names.
-            if let Some(scopes) = n.get("variableScopes") {
-                var["scopes"] = scopes.list().iter().filter_map(Kv::str).map(|s| if s == "STROKE" { "STROKE_COLOR" } else { s }).collect();
-            }
-            variable_order.push(json!(id));
-            variables.insert(id.clone(), var);
-        }
-        (!collections.is_empty())
-            .then(|| json!({"variableCollections": collections, "variables": variables, "collectionOrder": order, "variableOrder": variable_order}))
+    /// How many layers may be produced now: the cap, less what is kept for the visible pages.
+    fn budget(&self) -> usize {
+        self.max_nodes.saturating_sub(self.reserved)
     }
 }
-
-/// The REST `boundVariables` key of a bound layer field.
-fn binding_key(field: &str) -> Option<&'static str> {
-    Some(match field {
-        "STROKE_WEIGHT" => "strokeWeight",
-        "STACK_SPACING" => "itemSpacing",
-        "STACK_COUNTER_SPACING" => "counterAxisSpacing",
-        "STACK_PADDING_LEFT" => "paddingLeft",
-        "STACK_PADDING_TOP" => "paddingTop",
-        "STACK_PADDING_RIGHT" => "paddingRight",
-        "STACK_PADDING_BOTTOM" => "paddingBottom",
-        "VISIBLE" => "visible",
-        "TEXT_DATA" => "characters",
-        "OPACITY" => "opacity",
-        "MIN_WIDTH" => "minWidth",
-        "MAX_WIDTH" => "maxWidth",
-        "MIN_HEIGHT" => "minHeight",
-        "MAX_HEIGHT" => "maxHeight",
-        "RECTANGLE_TOP_LEFT_CORNER_RADIUS" => "topLeftRadius",
-        "RECTANGLE_TOP_RIGHT_CORNER_RADIUS" => "topRightRadius",
-        "RECTANGLE_BOTTOM_LEFT_CORNER_RADIUS" => "bottomLeftRadius",
-        "RECTANGLE_BOTTOM_RIGHT_CORNER_RADIUS" => "bottomRightRadius",
-        _ => return None,
-    })
-}
-
-/// The REST text style `boundVariables` key of a bound text field.
-fn text_binding_key(field: &str) -> Option<&'static str> {
-    Some(match field {
-        "FONT_SIZE" => "fontSize",
-        "FONT_FAMILY" => "fontFamily",
-        "FONT_STYLE" => "fontStyle",
-        "LETTER_SPACING" => "letterSpacing",
-        "LINE_HEIGHT" => "lineHeight",
-        "PARAGRAPH_SPACING" => "paragraphSpacing",
-        "PARAGRAPH_INDENT" => "paragraphIndent",
-        _ => return None,
-    })
-}
-
-fn stroke(o: &mut Obj, v: &View) {
-    copy_num(o, v, "strokeWeight", "strokeWeight");
-    if let Some(a) = v.str("strokeAlign").filter(|a| *a != "OFFSET") {
-        o.insert("strokeAlign".into(), json!(a));
-    }
-    copy_str(o, v, "strokeJoin", "strokeJoin");
-    if let Some(cap) = v.str("strokeCap") {
-        o.insert("strokeCap".into(), json!(cap_name(cap)));
-    }
-    // A layer written as the outline of its stroke keeps what it was as plugin data
-    // (`outlinedStroke`, our extension of the file JSON).
-    let (id, key) = super::export::STASH;
-    let kept = v.list("pluginData").iter().find(|p| p.get("pluginID").and_then(Kv::str) == Some(id) && p.get("key").and_then(Kv::str) == Some(key));
-    if let Some(original) = kept.and_then(|p| p.get("value")).and_then(Kv::str).and_then(|s| serde_json::from_str::<Value>(s).ok()) {
-        o.insert("outlinedStroke".into(), original);
-    }
-    // A variable width: each point's reach on the two sides of the path (shares of the stroke
-    // weight), as `[t, scale, bias]` (`strokeWidthProfile`, our extension of the file JSON).
-    let profile: Vec<Value> = v
-        .list("variableWidthPoints")
-        .iter()
-        .filter_map(|p| {
-            let (left, right) = (num(p, "ascent")?.max(0.0), num(p, "descent")?.max(0.0));
-            let bias = if left + right > 0.0 { (right - left) / (left + right) } else { 0.0 };
-            Some(json!([num(p, "position")?, left + right, bias]))
-        })
-        .collect();
-    if !profile.is_empty() {
-        o.insert("strokeWidthProfile".into(), Value::Array(profile));
-    }
-    let dashes: Vec<f64> = v.list("dashPattern").iter().filter_map(Kv::f64).collect();
-    if !dashes.is_empty() {
-        o.insert("strokeDashes".into(), json!(dashes));
-    }
-    // A miter limit L bevels joins sharper than 2·asin(1/L).
-    if let Some(l) = v.num("miterLimit").filter(|l| *l > 1.0) {
-        o.insert("strokeMiterAngle".into(), json!((2.0 * (1.0 / l).asin()).to_degrees()));
-    }
-    if v.flag("borderStrokeWeightsIndependent") == Some(true) {
-        // A side that isn't written has no border.
-        let side = |k: &str| v.num(k).unwrap_or(0.0);
-        o.insert(
-            "individualStrokeWeights".into(),
-            json!({"top": side("borderTopWeight"), "right": side("borderRightWeight"), "bottom": side("borderBottomWeight"), "left": side("borderLeftWeight")}),
-        );
-    }
-}
-
-/// A `VariableData` (literal, variable reference or expression) in the REST shape; `None` for
-/// kinds a prototype can't evaluate.
-fn variable_data(d: &Kv, depth: usize) -> Option<Value> {
-    let v = d.get("value")?;
-    let ty = d.get("dataType").and_then(Kv::str)?;
-    let value = match ty {
-        "ALIAS" => json!({"type": "VARIABLE_ALIAS", "id": v.get("alias").and_then(ref_guid)?}),
-        "EXPRESSION" if depth < MAX_EXPR_DEPTH => {
-            let e = v.get("expressionValue")?;
-            let function = match e.get("expressionFunction").and_then(Kv::str)? {
-                "MULTIPLY" => "MULTIPLICATION",
-                "DIVIDE" => "DIVISION",
-                f => f,
-            };
-            let args = e.get("expressionArguments").map(Kv::list).unwrap_or_default();
-            let args = args.iter().map(|x| variable_data(x, depth + 1)).collect::<Option<Vec<Value>>>()?;
-            json!({"expressionFunction": function, "expressionArguments": args})
-        }
-        "BOOLEAN" => json!(v.get("boolValue").and_then(Kv::bool)?),
-        "FLOAT" => json!(num(v, "floatValue").filter(|x| x.is_finite())?),
-        "STRING" => json!(v.get("textValue").and_then(Kv::str)?),
-        "COLOR" => color(v.get("colorValue")?),
-        _ => return None,
-    };
-    let mut out = json!({"type": ty, "value": value});
-    if let Some(r) = d.get("resolvedDataType").and_then(Kv::str) {
-        out["resolvedType"] = json!(r);
-    }
-    Some(out)
-}
-
-/// The text a layer that isn't a text layer carries (a note's, a shape's), unless blank.
-fn own_text<'a>(v: &View<'a>) -> Option<&'a str> {
-    v.get("textData").and_then(|t| t.get("characters")).and_then(Kv::str).filter(|c| !c.trim().is_empty())
-}
-
-/// The REST name of a stroke cap.
-fn cap_name(cap: &str) -> &str {
-    match cap {
-        "ARROW_LINES" => "LINE_ARROW",
-        "ARROW_EQUILATERAL" => "TRIANGLE_ARROW",
-        c => c,
-    }
-}
-
-/// The layer kind (and how the warning names it) that a layer the editor has no counterpart for
-/// imports as: frames for notes, shapes, tables, slides and the like (their text as a text layer),
-/// vectors for connectors and marker strokes, plain text for text on a path.
-fn stand_in(ty: &str) -> Option<(&'static str, &'static str)> {
-    Some(match ty {
-        "STICKY"
-        | "SHAPE_WITH_TEXT"
-        | "CODE_BLOCK"
-        | "TABLE"
-        | "TABLE_CELL"
-        | "STAMP"
-        | "MEDIA"
-        | "WIDGET"
-        | "SLIDE"
-        | "SLIDE_GRID"
-        | "SLIDE_ROW"
-        | "INTERACTIVE_SLIDE_ELEMENT"
-        | "MODULE" => ("FRAME", "frames with their text"),
-        "CONNECTOR" | "HIGHLIGHT" | "WASHI_TAPE" => ("VECTOR", "vectors"),
-        "TEXT_PATH" => ("TEXT", "text off its path"),
-        _ => return None,
-    })
-}
-
-/// How a layer sizes and sits in an auto layout parent.
-fn child_layout(o: &mut Obj, v: &View, parent: Option<&View>) {
-    copy_num(o, v, "stackChildPrimaryGrow", "layoutGrow");
-    if v.str("stackChildAlignSelf") == Some("STRETCH") {
-        o.insert("layoutAlign".into(), json!("STRETCH"));
-    }
-    if v.str("stackPositioning") == Some("ABSOLUTE") {
-        o.insert("layoutPositioning".into(), json!("ABSOLUTE"));
-    }
-    for (k, w, h) in [("minSize", "minWidth", "minHeight"), ("maxSize", "maxWidth", "maxHeight")] {
-        if let Some(val) = v.get(k).and_then(|s| s.get("value")) {
-            for (axis, to) in [("x", w), ("y", h)] {
-                if let Some(x) = num(val, axis).filter(|x| *x > 0.0 && *x < 1e9) {
-                    o.insert(to.into(), json!(x));
-                }
-            }
-        }
-    }
-    if let Some(p) = parent.filter(|p| p.str("stackMode") == Some("GRID")) {
-        for (anchor, list, to) in [("gridColumnAnchor", "gridColumns", "gridColumnAnchorIndex"), ("gridRowAnchor", "gridRows", "gridRowAnchorIndex")]
-        {
-            if let Some(i) = v.get(anchor).and_then(guid).and_then(|g| tracks(p, list).iter().position(|t| *t == g)) {
-                o.insert(to.into(), json!(i));
-            }
-        }
-        copy_num(o, v, "gridColumnSpan", "gridColumnSpan");
-        copy_num(o, v, "gridRowSpan", "gridRowSpan");
-    }
-}
-
-/// Whether a paint's colour or one of its gradient stops is bound to a variable.
-fn paint_bound(p: &Kv) -> bool {
-    alias(p.get("colorVar")).is_some() || p.get("stopsVar").map(Kv::list).unwrap_or_default().iter().any(|s| alias(s.get("colorVar")).is_some())
-}
-
-fn paint(p: &Kv) -> Option<Value> {
-    let ty = p.get("type").and_then(Kv::str)?;
-    let mut o = Obj::new();
-    o.insert("type".into(), json!(ty));
-    if let Some(x) = num(p, "opacity") {
-        o.insert("opacity".into(), json!(x));
-    }
-    if let Some(b) = p.get("visible").and_then(Kv::bool) {
-        o.insert("visible".into(), json!(b));
-    }
-    if let Some(b) = p.get("blendMode").and_then(Kv::str) {
-        o.insert("blendMode".into(), json!(b));
-    }
-    let t = p.get("transform").and_then(matrix);
-    match ty {
-        "SOLID" => {
-            if let Some(c) = p.get("color") {
-                o.insert("color".into(), color(c));
-            }
-            if let Some(var) = alias(p.get("colorVar")) {
-                o.insert("boundVariables".into(), json!({"color": {"type": "VARIABLE_ALIAS", "id": var}}));
-            }
-        }
-        _ if ty.starts_with("GRADIENT_") => {
-            // The paint transform maps the layer's unit box to gradient space, where a linear
-            // gradient runs from (0, ½) to (1, ½) and the others are centred on (½, ½).
-            let inv = t.filter(|t| t.determinant().abs() > 1e-12).map_or(Affine::IDENTITY, Affine::inverse);
-            let pts = if ty == "GRADIENT_LINEAR" { [(0.0, 0.5), (1.0, 0.5), (0.0, 1.0)] } else { [(0.5, 0.5), (1.0, 0.5), (0.5, 1.0)] };
-            let handles: Vec<Value> = pts
-                .iter()
-                .map(|(x, y)| {
-                    let q = inv * Point::new(*x, *y);
-                    json!({"x": q.x, "y": q.y})
-                })
-                .collect();
-            o.insert("gradientHandlePositions".into(), Value::Array(handles));
-            // Stops bound to variables are listed again, each with its variable.
-            let vars = p.get("stopsVar").map(Kv::list).unwrap_or_default();
-            let stops: Vec<Value> = p
-                .get("stops")
-                .map(Kv::list)
-                .unwrap_or_default()
-                .iter()
-                .enumerate()
-                .map(|(i, s)| {
-                    let mut stop = json!({"position": num(s, "position").unwrap_or(0.0), "color": s.get("color").map_or(Value::Null, color)});
-                    if let Some(b) = bound(vars.get(i), &[("colorVar", "color")]) {
-                        stop["boundVariables"] = b;
-                    }
-                    stop
-                })
-                .collect();
-            o.insert("gradientStops".into(), Value::Array(stops));
-        }
-        "IMAGE" => {
-            let hash: String =
-                p.get("image").and_then(|i| i.get("hash")).and_then(Kv::bytes).unwrap_or_default().iter().map(|b| format!("{b:02x}")).collect();
-            o.insert("imageRef".into(), json!(hash));
-            let mode = p.get("imageScaleMode").and_then(Kv::str).unwrap_or("FILL");
-            o.insert("scaleMode".into(), json!(mode));
-            if let (Some(t), "STRETCH") = (t, mode) {
-                o.insert("imageTransform".into(), rows(t));
-            }
-            if let Some(s) = num(p, "scale") {
-                o.insert("scalingFactor".into(), json!(s));
-            }
-            if let Some(r) = num(p, "rotation") {
-                o.insert("rotation".into(), json!(r));
-            }
-        }
-        _ => {}
-    }
-    Some(Value::Object(o))
-}
-
-/// The variables bound to the fields of a paint stop, an effect or a layout grid, as its REST
-/// `boundVariables`: `fields` pairs the format's field with the REST name.
-fn bound(v: Option<&Kv>, fields: &[(&str, &str)]) -> Option<Value> {
-    let v = v?;
-    let found: Obj =
-        fields.iter().filter_map(|(from, to)| Some((to.to_string(), json!({"type": "VARIABLE_ALIAS", "id": alias(v.get(from))?})))).collect();
-    (!found.is_empty()).then_some(Value::Object(found))
-}
-
-/// The track ids of a grid's columns or rows, in order.
-fn tracks(v: &View, key: &str) -> Vec<String> {
-    let mut t: Vec<(&str, String)> = v
-        .get(key)
-        .and_then(|m| m.get("entries"))
-        .map(Kv::list)
-        .unwrap_or_default()
-        .iter()
-        .filter_map(|e| Some((e.get("position").and_then(Kv::str).unwrap_or(""), e.get("id").and_then(guid)?)))
-        .collect();
-    t.sort();
-    t.into_iter().map(|e| e.1).collect()
-}
-
-/// The variable an `ALIAS` variable data points at.
-fn alias(d: Option<&Kv>) -> Option<String> {
-    let d = d?;
-    if d.get("dataType").and_then(Kv::str) != Some("ALIAS") {
-        return None;
-    }
-    d.get("value").and_then(|v| v.get("alias")).and_then(ref_guid)
-}
-
-fn variable_value(d: &Kv) -> Option<Value> {
-    if let Some(a) = alias(Some(d)) {
-        return Some(json!({"type": "VARIABLE_ALIAS", "id": a}));
-    }
-    let v = d.get("value")?;
-    if let Some(c) = v.get("colorValue") {
-        return Some(color(c));
-    }
-    if let Some(b) = v.get("boolValue").and_then(Kv::bool) {
-        return Some(json!(b));
-    }
-    if let Some(x) = num(v, "floatValue") {
-        return Some(json!(x));
-    }
-    v.get("textValue").and_then(Kv::str).map(|s| json!(s))
-}
-
-/// The text of a component property value.
-fn prop_text<'k>(v: &'k Kv) -> Option<&'k str> {
-    v.get("textValue").and_then(|t| t.get("characters")).and_then(Kv::str)
-}
-
-/// The property a layer's `field` is bound to (`parameterConsumptionMap`).
-fn prop_ref(v: &View, field: &str) -> Option<String> {
-    v.get("parameterConsumptionMap")?.get("entries")?.list().iter().find_map(|e| {
-        if e.get("variableField").and_then(Kv::str) != Some(field) {
-            return None;
-        }
-        e.get("variableData")?.get("value")?.get("propRefValue")?.get("defId").and_then(guid)
-    })
-}
-
-/// The REST TypeStyle fields a node (or text override entry) sets. `size`: the font size that
-/// letter spacing in percent refers to when the entry doesn't set one.
-fn text_style(v: &View, size: Option<f64>) -> Obj {
-    let mut s = Obj::new();
-    if let Some(f) = v.get("fontName") {
-        for (from, to) in [("family", "fontFamily"), ("style", "fontStyle"), ("postscript", "fontPostScriptName")] {
-            if let Some(x) = f.get(from).and_then(Kv::str).filter(|x| !x.is_empty()) {
-                // Compact and spaced style names ("SemiBold", "Semi Bold") are the same style.
-                s.insert(to.into(), if from == "style" { json!(super::style_name(x)) } else { json!(x) });
-            }
-        }
-    }
-    copy_num(&mut s, v, "fontSize", "fontSize");
-    copy_num(&mut s, v, "paragraphSpacing", "paragraphSpacing");
-    copy_num(&mut s, v, "paragraphIndent", "paragraphIndent");
-    copy_str(&mut s, v, "textCase", "textCase");
-    copy_str(&mut s, v, "textDecoration", "textDecoration");
-    let font_size = v.num("fontSize").or(size).unwrap_or(12.0);
-    if let Some(ls) = v.get("letterSpacing") {
-        let val = num(ls, "value").unwrap_or(0.0);
-        let px = match ls.get("units").and_then(Kv::str) {
-            Some("PIXELS") => val,
-            Some("PERCENT") => val / 100.0 * font_size,
-            _ => val * font_size,
-        };
-        s.insert("letterSpacing".into(), json!(px));
-    }
-    if let Some(lh) = v.get("lineHeight") {
-        let val = num(lh, "value").unwrap_or(100.0);
-        match lh.get("units").and_then(Kv::str) {
-            Some("PIXELS") => {
-                s.insert("lineHeightUnit".into(), json!("PIXELS"));
-                s.insert("lineHeightPx".into(), json!(val));
-            }
-            // shortcut: percent units count from the font's own line height (100 % is "auto"), which
-            // the document can only say for 100 %; other values read as % of the font size. Upgrade
-            // when line heights can be a share of the font's own.
-            Some("PERCENT") if (val - 100.0).abs() < 1e-6 => {
-                s.insert("lineHeightUnit".into(), json!("INTRINSIC_%"));
-            }
-            Some("PERCENT") => {
-                s.insert("lineHeightUnit".into(), json!("FONT_SIZE_%"));
-                s.insert("lineHeightPercentFontSize".into(), json!(val));
-            }
-            _ => {
-                s.insert("lineHeightUnit".into(), json!("FONT_SIZE_%"));
-                s.insert("lineHeightPercentFontSize".into(), json!(val * 100.0));
-            }
-        }
-    }
-    // An empty URL is kept: on an override entry it clears the text's own link.
-    if let Some(u) = v.get("hyperlink").and_then(|h| h.get("url")).and_then(Kv::str) {
-        s.insert("hyperlink".into(), json!({"type": "URL", "url": u}));
-    }
-    s
-}
-
-fn effect(e: &Kv) -> Option<Value> {
-    let ty = match e.get("type").and_then(Kv::str)? {
-        "FOREGROUND_BLUR" => "LAYER_BLUR",
-        "GRAIN" => "TEXTURE",
-        t => t,
-    };
-    let mut o = Obj::new();
-    o.insert("type".into(), json!(ty));
-    for k in ["radius", "spread", "startRadius", "density", "opacity"] {
-        if let Some(x) = num(e, k) {
-            o.insert(k.into(), json!(x));
-        }
-    }
-    for k in ["visible", "showShadowBehindNode", "clipToShape"] {
-        if let Some(b) = e.get(k).and_then(Kv::bool) {
-            o.insert(k.into(), json!(b));
-        }
-    }
-    for k in ["blendMode", "noiseType"] {
-        if let Some(s) = e.get(k).and_then(Kv::str) {
-            o.insert(k.into(), json!(s));
-        }
-    }
-    for k in ["color", "secondaryColor"] {
-        if let Some(c) = e.get(k) {
-            o.insert(k.into(), color(c));
-        }
-    }
-    for (from, to) in [("offset", "offset"), ("startOffset", "startOffset"), ("endOffset", "endOffset"), ("noiseSize", "noiseSizeVector")] {
-        if let Some(p) = e.get(from).and_then(vec2) {
-            o.insert(to.into(), p);
-        }
-    }
-    if e.get("blurOpType").and_then(Kv::str) == Some("PROGRESSIVE") {
-        o.insert("blurType".into(), json!("PROGRESSIVE"));
-    }
-    let vars = [
-        ("colorVar", "color"),
-        ("radiusVar", "radius"),
-        ("spreadVar", "spread"),
-        ("xVar", "offsetX"),
-        ("yVar", "offsetY"),
-        ("startRadiusVar", "startRadius"),
-    ];
-    if let Some(b) = bound(Some(e), &vars) {
-        o.insert("boundVariables".into(), b);
-    }
-    Some(Value::Object(o))
-}
-
-fn layout_grid(g: &Kv) -> Value {
-    let pattern = match (g.get("pattern").and_then(Kv::str), g.get("axis").and_then(Kv::str)) {
-        (Some("GRID"), _) => "GRID",
-        (_, Some("Y")) => "ROWS",
-        _ => "COLUMNS",
-    };
-    let mut o = json!({"pattern": pattern, "alignment": g.get("type").and_then(Kv::str).unwrap_or("STRETCH")});
-    for (from, to) in [("sectionSize", "sectionSize"), ("numSections", "count"), ("gutterSize", "gutterSize"), ("offset", "offset")] {
-        if let Some(x) = num(g, from) {
-            o[to] = json!(x);
-        }
-    }
-    if let Some(c) = g.get("color") {
-        o["color"] = color(c);
-    }
-    if let Some(b) = g.get("visible").and_then(Kv::bool) {
-        o["visible"] = json!(b);
-    }
-    let vars = [("numSectionsVar", "count"), ("offsetVar", "offset"), ("sectionSizeVar", "sectionSize"), ("gutterSizeVar", "gutterSize")];
-    if let Some(b) = bound(Some(g), &vars) {
-        o["boundVariables"] = b;
-    }
-    o
-}
-
-fn export_setting(e: &Kv) -> Value {
-    let c = e.get("constraint");
-    let ty = match c.and_then(|c| c.get("type")).and_then(Kv::str) {
-        Some("CONTENT_WIDTH") => "WIDTH",
-        Some("CONTENT_HEIGHT") => "HEIGHT",
-        _ => "SCALE",
-    };
-    json!({
-        "format": e.get("imageType").and_then(Kv::str).unwrap_or("PNG"),
-        "suffix": e.get("suffix").and_then(Kv::str).unwrap_or(""),
-        "constraint": {"type": ty, "value": c.and_then(|c| num(c, "value")).unwrap_or(1.0)},
-    })
-}
-
-/// A prototype action's transition (`None`: instant).
-fn transition(a: &Kv) -> Option<Value> {
-    let ty = a.get("transitionType").and_then(Kv::str)?;
-    // Directions name where the incoming screen moves (SLIDE_FROM_LEFT moves right).
-    let (kind, dir) = match ty {
-        "INSTANT_TRANSITION" => return None,
-        "DISSOLVE" | "FADE" => ("DISSOLVE", None),
-        "SMART_ANIMATE" | "MAGIC_MOVE" => ("SMART_ANIMATE", None),
-        "SCROLL_ANIMATE" => ("SCROLL_ANIMATE", None),
-        t => {
-            let prefixes = [
-                ("SLIDE_FROM_", "SLIDE_IN"),
-                ("PUSH_FROM_", "PUSH"),
-                ("MOVE_FROM_", "MOVE_IN"),
-                ("SLIDE_OUT_TO_", "SLIDE_OUT"),
-                ("MOVE_OUT_TO_", "MOVE_OUT"),
-            ];
-            let (kind, side) = prefixes.iter().find_map(|(p, k)| t.strip_prefix(p).map(|r| (*k, r)))?;
-            let incoming = matches!(kind, "SLIDE_IN" | "PUSH" | "MOVE_IN");
-            let dir = match (side, incoming) {
-                ("LEFT", true) | ("RIGHT", false) => "RIGHT",
-                ("RIGHT", true) | ("LEFT", false) => "LEFT",
-                ("TOP", true) | ("BOTTOM", false) => "BOTTOM",
-                _ => "TOP",
-            };
-            (kind, Some(dir))
-        }
-    };
-    let easing = match a.get("easingType").and_then(Kv::str) {
-        Some("IN_CUBIC" | "EASE_IN") => "EASE_IN",
-        Some("INOUT_CUBIC") => "EASE_IN_AND_OUT",
-        Some("LINEAR") => "LINEAR",
-        Some("IN_BACK_CUBIC") => "EASE_IN_BACK",
-        Some("OUT_BACK_CUBIC") => "EASE_OUT_BACK",
-        Some("INOUT_BACK_CUBIC") => "EASE_IN_AND_OUT_BACK",
-        Some("GENTLE_SPRING") => "GENTLE",
-        Some("CUSTOM_CUBIC") => "CUSTOM_CUBIC_BEZIER",
-        _ => "EASE_OUT",
-    };
-    let mut e = json!({"type": easing});
-    let f: Vec<f64> = a.get("easingFunction").map(Kv::list).unwrap_or_default().iter().filter_map(Kv::f64).collect();
-    if let (true, [x1, y1, x2, y2, ..]) = (easing == "CUSTOM_CUBIC_BEZIER", f.as_slice()) {
-        e["easingFunctionCubicBezier"] = json!({"x1": x1, "y1": y1, "x2": x2, "y2": y2});
-    }
-    let mut t = json!({"type": kind, "duration": (num(a, "transitionDuration").unwrap_or(0.3) * 1000.0).round(), "easing": e});
-    if let Some(d) = dir {
-        t["direction"] = json!(d);
-    }
-    Some(t)
-}
-
-/// SVG path data of a geometry blob: commands `0` close, `1` move, `2` line, `3` quadratic and
-/// `4` cubic, each followed by its points as little-endian `f32` pairs. `None` when damaged.
-fn svg_path(b: &[u8]) -> Option<String> {
-    let mut out = String::new();
-    let mut i = 0usize;
-    let mut n = 0usize;
-    while i < b.len() {
-        n += 1;
-        if n > MAX_COMMANDS {
-            return None;
-        }
-        let (letter, points) = match *b.get(i)? {
-            0 => ('Z', 0),
-            1 => ('M', 1),
-            2 => ('L', 1),
-            3 => ('Q', 2),
-            4 => ('C', 3),
-            _ => return None,
-        };
-        i += 1;
-        if !out.is_empty() {
-            out.push(' ');
-        }
-        out.push(letter);
-        for _ in 0..points * 2 {
-            let bytes: [u8; 4] = b.get(i..i + 4)?.try_into().ok()?;
-            let x = f32::from_le_bytes(bytes);
-            if !x.is_finite() {
-                return None;
-            }
-            out.push_str(&format!(" {x}"));
-            i += 4;
-        }
-    }
-    Some(out)
-}
diff --git a/crates/format/src/fig/map/component.rs b/crates/format/src/fig/map/component.rs
new file mode 100644
index 00000000..abc2225e
--- /dev/null
+++ b/crates/format/src/fig/map/component.rs
@@ -0,0 +1,441 @@
+use super::layer::own_text;
+use super::text::char_styles;
+use super::*;
+
+/// An override row names a layer of the main by its current GUID or by the `overrideKey` the
+/// layer had when the row was written: the key becomes the current GUID, unless the layer is
+/// current already or the key is ambiguous.
+fn normalize_override_segment(path: &mut [String], index: usize, scope: &OverrideScope) {
+    let Some(segment) = path.get(index) else { return };
+    if scope.current.contains(segment) {
+        return;
+    }
+    if let Some(Some(current)) = scope.aliases.get(segment) {
+        path[index] = current.clone();
+    }
+}
+
+/// Overrides and derived layout by id path.
+type Overrides<'a> = BTreeMap<Vec<String>, Vec<OverrideRow<'a>>>;
+
+/// Where an override entry comes from.
+#[derive(Clone, Copy, PartialEq)]
+pub(super) enum Entry {
+    Override,
+    Derived,
+    /// Derived layout of a nested instance for a size it no longer has: its size and place no
+    /// longer hold, the rest (resolved colours, text) still does.
+    Stale,
+}
+
+/// One override or derived-layout row addressed to a layer.
+#[derive(Clone)]
+pub(super) struct OverrideRow<'a> {
+    pub(super) row: &'a Kv<'a>,
+    pub(super) entry: Entry,
+    /// How many mains are being expanded around the instance that wrote the row: the rows of
+    /// the enclosing (outer) instances win over those of the inner ones.
+    source_depth: usize,
+    /// Position among the rows of the instance that wrote it; later rows win.
+    ordinal: usize,
+}
+
+/// The layers of a main by current GUID, and the old `overrideKey` of each that has one
+/// (`None` when two layers claim the same key).
+pub(super) struct OverrideScope {
+    current: BTreeSet<String>,
+    aliases: BTreeMap<String, Option<String>>,
+}
+
+/// Where an instance's expanded layers are: the overrides and derived layout of the outermost
+/// instance (by id path), the path of the instance being expanded, and the property values.
+#[derive(Clone)]
+pub(super) struct Inst<'a> {
+    pub(super) root: String,
+    pub(super) path: Vec<String>,
+    pub(super) overrides: Rc<Overrides<'a>>,
+    props: Rc<BTreeMap<String, &'a Kv<'a>>>,
+    /// Slot property GUID → private slot-content node GUID.
+    pub(super) slot_contents: Rc<BTreeMap<String, String>>,
+    /// Layers imported from a slot's independent content subtree.
+    pub(super) slot_content: bool,
+    /// Mains being expanded (an instance inside its own main stops there).
+    symbols: Vec<String>,
+}
+
+impl<'a> Mapper<'a> {
+    /// The layers of main `main` by current GUID and by `overrideKey`. An instance nested in the
+    /// main is not entered: its layers belong to another main.
+    fn override_scope(&mut self, main: &str) -> Rc<OverrideScope> {
+        if let Some(scope) = self.override_scopes.get(main) {
+            return Rc::clone(scope);
+        }
+        let mut current = BTreeSet::new();
+        let mut aliases: BTreeMap<String, Option<String>> = BTreeMap::new();
+        let mut visited = BTreeSet::new();
+        let mut pending: Vec<(String, usize)> = self.children(main).into_iter().map(|id| (id, 1)).collect();
+        let mut complete = true;
+        while let Some((id, depth)) = pending.pop() {
+            if depth > MAX_DEPTH || visited.len() >= self.max_nodes {
+                complete = false;
+                break;
+            }
+            if !visited.insert(id.clone()) {
+                continue;
+            }
+            let Some(node) = self.nodes.get(&id) else { continue };
+            current.insert(id.clone());
+            if let Some(alias) = node.get("overrideKey").and_then(guid) {
+                let target = aliases.entry(alias).or_insert_with(|| Some(id.clone()));
+                if target.as_deref().is_some_and(|target| target != id) {
+                    *target = None;
+                }
+            }
+            if node.get("type").and_then(Kv::str) != Some("INSTANCE") {
+                pending.extend(self.children(&id).into_iter().map(|child| (child, depth + 1)));
+            }
+        }
+        // A scope cut short could name the wrong layer for a key: use none of the keys.
+        if !complete {
+            aliases.clear();
+        }
+        let scope = Rc::new(OverrideScope { current, aliases });
+        let cost = scope.current.len() + scope.aliases.len();
+        if cost <= self.max_nodes.saturating_sub(self.override_scope_entries) {
+            self.override_scope_entries += cost;
+            self.override_scopes.insert(main.to_string(), Rc::clone(&scope));
+        }
+        scope
+    }
+
+    pub(super) fn is_instance_swap(&self, def: &Kv) -> Option<()> {
+        matches!(self.prop_def(&guid(def)?), Some((_, "INSTANCE_SWAP"))).then_some(())
+    }
+
+    /// The definition a copy of it was made from, followed to the original: the values an instance
+    /// sets are kept under it, since an assignment and the layers that read it may name different
+    /// copies of one definition.
+    pub(super) fn prop_root(&self, def: &str) -> String {
+        let mut def = def;
+        for _ in 0..=MAX_DEPTH {
+            let Some(parent) = self.prop_parents.get(def) else { break };
+            def = parent;
+        }
+        def.to_string()
+    }
+
+    /// The definition `def` names: its own, or the set's for a variant's copy of it.
+    fn prop_def(&self, def: &str) -> Option<&(String, &'a str)> {
+        let mut def = def;
+        for _ in 0..=MAX_DEPTH {
+            if let Some(found) = self.prop_defs.get(def) {
+                return Some(found);
+            }
+            def = self.prop_parents.get(def)?;
+        }
+        None
+    }
+
+    /// Component property definitions and description.
+    pub(super) fn component(&mut self, o: &mut Obj, v: &View<'a>, id: &str) {
+        let mut defs = Obj::new();
+        for d in v.list("componentPropDefs") {
+            if d.get("isDeleted").and_then(Kv::bool) == Some(true) {
+                continue;
+            }
+            let Some((name, ty)) = d.get("id").and_then(guid).and_then(|i| self.prop_defs.get(&i).cloned()) else { continue };
+            let init = d.get("initialValue");
+            let def = match ty {
+                "BOOL" => json!({"type": "BOOLEAN", "defaultValue": init.and_then(|i| i.get("boolValue")).and_then(Kv::bool).unwrap_or(true)}),
+                "TEXT" => json!({"type": "TEXT", "defaultValue": init.and_then(prop_text).unwrap_or("")}),
+                "INSTANCE_SWAP" => match init.and_then(|i| i.get("guidValue")).and_then(guid) {
+                    Some(g) => {
+                        if self.nodes.contains_key(&g) {
+                            self.referenced_mains.insert(g.clone());
+                        }
+                        json!({"type": "INSTANCE_SWAP", "defaultValue": g})
+                    }
+                    None => continue,
+                },
+                "VARIANT" => json!({"type": "VARIANT"}),
+                "SLOT" => {
+                    self.warn_non_default_slot_config(d);
+                    self.warn_dropped_slot_preferred_values(d);
+                    json!({"type": "SLOT"})
+                }
+                _ => {
+                    self.warn(format!("{} component properties are not supported and were skipped", ty.to_ascii_lowercase()));
+                    continue;
+                }
+            };
+            defs.insert(name, def);
+        }
+        if !defs.is_empty() {
+            o.insert("componentPropertyDefinitions".into(), Value::Object(defs));
+        }
+        if let Some(d) = v.str("symbolDescription").or_else(|| v.str("description")).filter(|d| !d.is_empty()) {
+            let into = if o.get("type").and_then(Value::as_str) == Some("COMPONENT_SET") { &mut self.sets } else { &mut self.components };
+            into.insert(id.to_string(), json!({"description": d}));
+        }
+    }
+
+    /// Preferred slot values are source component keys, but this mapper has no proven way to map
+    /// those keys to file GUIDs. They are dropped instead of guessing native NodeIds.
+    fn warn_dropped_slot_preferred_values(&mut self, def: &Kv<'a>) {
+        let entries = def.get("preferredValues").and_then(|v| v.get("instanceSwapValues")).map(Kv::list).unwrap_or_default();
+        if !entries.is_empty() {
+            self.warn("preferred slot component keys cannot be resolved to file nodes and were skipped");
+        }
+    }
+
+    fn warn_non_default_slot_config(&mut self, def: &Kv<'a>) {
+        let Some(config) = def.get("slotPropConfig") else { return };
+        let non_default = [
+            ("stretchChildOnInsert", Some(false)),
+            ("displayByDefault", Some(false)),
+            ("minChildren", None),
+            ("maxChildren", None),
+            ("allowPreferredValuesOnly", Some(false)),
+        ]
+        .into_iter()
+        .any(|(field, bool_default)| {
+            let Some(value) = config.get(field) else { return false };
+            if let Some(default) = bool_default { value.bool() != Some(default) } else { value.f64() != Some(0.0) }
+        });
+        if non_default {
+            self.warn("non-default slot settings are not represented and were skipped");
+        }
+    }
+
+    /// A layer's component property references, and inside an instance the values they take.
+    pub(super) fn prop_refs(&mut self, o: &mut Obj, v: &View<'a>, inst: Option<&Inst<'a>>) {
+        let mut refs = Obj::new();
+        for e in v.get("parameterConsumptionMap").and_then(|m| m.get("entries")).map(Kv::list).unwrap_or_default() {
+            let field = match e.get("variableField").and_then(Kv::str) {
+                Some("VISIBLE") => "visible",
+                Some("TEXT_DATA") => "characters",
+                Some("OVERRIDDEN_SYMBOL_ID") => "mainComponent",
+                Some("SLOT_CONTENT_ID") => "slot",
+                _ => continue,
+            };
+            let Some(def) =
+                e.get("variableData").and_then(|d| d.get("value")).and_then(|x| x.get("propRefValue")).and_then(|p| p.get("defId")).and_then(guid)
+            else {
+                continue;
+            };
+            // Expanded frames must follow their main frame's source link. A direct slot reference
+            // makes the engine resolve ownership against the instance, where the property is not defined.
+            if !(field == "slot" && inst.is_some())
+                && let Some((name, _)) = self.prop_def(&def)
+            {
+                refs.insert(field.into(), json!(name));
+            }
+            let Some(val) = inst.and_then(|i| i.props.get(&self.prop_root(&def))) else { continue };
+            match field {
+                "visible" => {
+                    if let Some(b) = val.get("boolValue").and_then(Kv::bool) {
+                        o.insert("visible".into(), json!(b));
+                    }
+                }
+                "characters" => {
+                    if let Some(t) = prop_text(val) {
+                        o.insert("characters".into(), json!(t));
+                        // Run styles count the chars they were made for: for other chars only
+                        // the value's own apply.
+                        if own_text(v) != Some(t) {
+                            o.remove("characterStyleOverrides");
+                            o.remove("styleOverrideTable");
+                            if let Some(tv) = prop_text_data(val) {
+                                let size = o.get("style").and_then(|s| s.get("fontSize")).and_then(Value::as_f64);
+                                char_styles(o, tv, size, &mut |w| self.warn(w));
+                            }
+                        }
+                    }
+                }
+                _ => {}
+            }
+        }
+        if !refs.is_empty() {
+            o.insert("componentPropertyReferences".into(), Value::Object(refs));
+        }
+    }
+
+    /// An instance's main and properties; the context its expanded layers are built in.
+    pub(super) fn instance(&mut self, o: &mut Obj, v: &View<'a>, id: &str, outer: Option<&Inst<'a>>, rest_id: &str) -> Option<(Inst<'a>, String)> {
+        let sd = v.get("symbolData");
+        let mut sym = v.get("overriddenSymbolID").and_then(guid).or_else(|| sd.and_then(|s| s.get("symbolID")).and_then(guid));
+        // An instance swap property value picks the main.
+        if let Some(i) = outer
+            && let Some(def) = prop_ref(v, "OVERRIDDEN_SYMBOL_ID")
+            && let Some(g) = i.props.get(&self.prop_root(&def)).and_then(|p| prop_guid(p))
+        {
+            sym = Some(g);
+        }
+        let Some(sym) = sym else {
+            self.warn("instances without a main component were imported as empty frames");
+            return None;
+        };
+        o.insert("componentId".into(), json!(sym));
+        let assignments = v.list("componentPropAssignments");
+        let mut props = Obj::new();
+        for a in assignments {
+            let Some((name, ty)) = a.get("defID").and_then(guid).and_then(|d| self.prop_def(&d).cloned()) else { continue };
+            let val = assigned(a);
+            let p = match ty {
+                "BOOL" => val.and_then(|x| x.get("boolValue")).and_then(Kv::bool).map(|b| json!({"type": "BOOLEAN", "value": b})),
+                "TEXT" => val.and_then(prop_text).map(|t| json!({"type": "TEXT", "value": t})),
+                "INSTANCE_SWAP" => val.and_then(prop_guid).map(|g| json!({"type": "INSTANCE_SWAP", "value": g})),
+                _ => None,
+            };
+            if let Some(p) = p {
+                props.insert(name, p);
+            }
+        }
+        if !props.is_empty() {
+            o.insert("componentProperties".into(), Value::Object(props));
+        }
+        if !self.nodes.contains_key(&sym) {
+            self.warn("instances of components that aren't in the file show no layers");
+            return None;
+        }
+        if !self.referenced_mains.contains(&sym) {
+            self.referenced_mains.insert(sym.clone());
+        }
+        if outer.is_some_and(|i| i.symbols.contains(&sym)) {
+            return None;
+        }
+        // Overrides by id path below this instance (the instance itself is addressed by its main's id).
+        let own_path: Vec<String> = outer.map(|i| [i.path.as_slice(), &[id.to_string()]].concat()).unwrap_or_default();
+        let scope = self.override_scope(&sym);
+        let mut overrides: Overrides<'a> = BTreeMap::new();
+        if let Some(inherited) = outer {
+            for (path, rows) in inherited.overrides.iter() {
+                let mut path = path.clone();
+                // Rows an outer instance wrote for this instance's layers may use their old keys.
+                if path.starts_with(&own_path) && path.len() > own_path.len() {
+                    normalize_override_segment(&mut path, own_path.len(), &scope);
+                }
+                overrides.entry(path).or_default().extend(rows.iter().cloned());
+            }
+        }
+        // A nested instance's derived layout is for the size it has in its main: resized here, the
+        // sizes and places in it no longer hold and its layers follow their constraints instead.
+        let differs = |a: f64, b: f64| (a - b).abs() > 1e-6 * a.abs().max(b.abs()).max(1.0);
+        let resized = outer.is_some()
+            && match (self.nodes.get(id).and_then(|b| View::of(b).size()), v.size()) {
+                (Some(a), Some(b)) => differs(a.0, b.0) || differs(a.1, b.1),
+                (a, b) => a.is_some() != b.is_some(),
+            };
+        let mut local: Overrides<'a> = BTreeMap::new();
+        let lists = [sd.and_then(|s| s.get("symbolOverrides")).map(Kv::list).unwrap_or_default(), v.list("derivedSymbolData")];
+        let source_depth = outer.map_or(0, |i| i.symbols.len());
+        let mut ordinal = 0;
+        for (layer, list) in lists.into_iter().enumerate() {
+            for ov in list {
+                let row_ordinal = ordinal;
+                ordinal += 1;
+                let mut rel: Vec<String> =
+                    ov.get("guidPath").and_then(|g| g.get("guids")).map(Kv::list).unwrap_or_default().iter().filter_map(guid).collect();
+                if rel.is_empty() || rel == [sym.clone()] {
+                    continue;
+                }
+                normalize_override_segment(&mut rel, 0, &scope);
+                // Explicit overrides, then derived layout (stale once the instance is resized).
+                let entry = match (layer, resized) {
+                    (0, _) => Entry::Override,
+                    (_, false) => Entry::Derived,
+                    (_, true) => Entry::Stale,
+                };
+                local.entry([own_path.as_slice(), &rel].concat()).or_default().push(OverrideRow {
+                    row: ov,
+                    entry,
+                    source_depth,
+                    ordinal: row_ordinal,
+                });
+            }
+        }
+        for (path, rows) in local {
+            overrides.entry(path).or_default().extend(rows);
+        }
+        for rows in overrides.values_mut() {
+            // Deeper source rows apply first; outer rows win, with wire order preserved per source.
+            rows.sort_by_key(|row| (std::cmp::Reverse(row.source_depth), row.ordinal));
+        }
+        let mut all_props: BTreeMap<String, &'a Kv<'a>> = outer.map(|i| (*i.props).clone()).unwrap_or_default();
+        let mut slot_contents: BTreeMap<String, String> = outer.map(|i| (*i.slot_contents).clone()).unwrap_or_default();
+        for a in assignments {
+            if let (Some(d), Some(val)) = (a.get("defID").and_then(guid), assigned(a)) {
+                all_props.entry(self.prop_root(&d)).or_insert(val);
+            }
+            let Some(def) = a.get("defID").and_then(guid) else { continue };
+            if self.prop_def(&def).is_none_or(|(_, ty)| *ty != "SLOT") {
+                continue;
+            }
+            let var_value = a.get("varValue");
+            if var_value.and_then(|v| v.get("dataType")).and_then(Kv::str) != Some("SLOT_CONTENT_ID") {
+                self.warn("malformed slot content assignment was skipped");
+                continue;
+            }
+            let target = var_value.and_then(|v| v.get("value")).and_then(|v| v.get("slotContentIdValue")).and_then(|v| v.get("guid")).and_then(guid);
+            let Some(target) = target else {
+                self.warn("malformed slot content assignment was skipped");
+                continue;
+            };
+            if target == "4294967295:4294967295" {
+                self.warn("slot content assignment uses the empty GUID sentinel and was skipped");
+                continue;
+            }
+            if self.nodes.get(&target).is_none_or(|n| n.get("isSlotContent").and_then(Kv::bool) != Some(true)) {
+                self.warn("slot content assignment target is missing or is not slot content");
+                continue;
+            }
+            slot_contents.entry(self.prop_root(&def)).or_insert(target);
+        }
+        let mut symbols = outer.map(|i| i.symbols.clone()).unwrap_or_default();
+        symbols.push(sym.clone());
+        let root = outer.map_or_else(|| rest_id.to_string(), |i| i.root.clone());
+        Some((
+            Inst {
+                root,
+                path: own_path,
+                overrides: Rc::new(overrides),
+                props: Rc::new(all_props),
+                slot_contents: Rc::new(slot_contents),
+                slot_content: false,
+                symbols,
+            },
+            sym,
+        ))
+    }
+}
+
+/// The text of a component property value.
+fn prop_text<'k>(v: &'k Kv) -> Option<&'k str> {
+    prop_text_data(v).and_then(|t| t.get("characters")).and_then(Kv::str)
+}
+
+/// The text data of a component property value: `textValue`, or `textDataValue` in the variable form.
+fn prop_text_data<'k, 's>(v: &'k Kv<'s>) -> Option<&'k Kv<'s>> {
+    v.get("textValue").or_else(|| v.get("textDataValue"))
+}
+
+/// The main an instance swap value names: `guidValue`, or `symbolIdValue` in the variable form.
+pub(super) fn prop_guid(v: &Kv) -> Option<String> {
+    v.get("guidValue").and_then(guid).or_else(|| v.get("symbolIdValue")?.get("guid").and_then(guid))
+}
+
+/// The value a component property assignment sets: `value`, or the variable form `varValue` holds
+/// when `value` is empty, as current files write many booleans and instance swaps.
+pub(super) fn assigned<'k, 's>(assignment: &'k Kv<'s>) -> Option<&'k Kv<'s>> {
+    assignment.get("value").filter(|v| !matches!(v, Kv::Object(fields) if fields.is_empty())).or_else(|| assignment.get("varValue")?.get("value"))
+}
+
+/// The property a layer's `field` is bound to (`parameterConsumptionMap`).
+pub(super) fn prop_ref(v: &View, field: &str) -> Option<String> {
+    v.get("parameterConsumptionMap")?.get("entries")?.list().iter().find_map(|e| {
+        if e.get("variableField").and_then(Kv::str) != Some(field) {
+            return None;
+        }
+        e.get("variableData")?.get("value")?.get("propRefValue")?.get("defId").and_then(guid)
+    })
+}
diff --git a/crates/format/src/fig/map/connector.rs b/crates/format/src/fig/map/connector.rs
new file mode 100644
index 00000000..172616dc
--- /dev/null
+++ b/crates/format/src/fig/map/connector.rs
@@ -0,0 +1,271 @@
+use super::layer::{cap_name, own_text, svg_path, valid_size};
+use super::*;
+
+impl<'a> Mapper<'a> {
+    /// A connector's end caps, and when it has no saved outline or network a straight line
+    /// between its ends: free points, or a point (the centre unless given) of a sibling layer.
+    pub(super) fn connector(&mut self, o: &mut Obj, v: &View<'a>, space: Affine) {
+        for (from, to) in [("connectorStartCap", "strokeCapStart"), ("connectorEndCap", "strokeCapEnd")] {
+            if let Some(c) = v.str(from) {
+                o.insert(to.into(), json!(cap_name(c)));
+            }
+        }
+        if connector_has_saved_label(v) {
+            self.warn("connector labels were skipped");
+        }
+        if ["vectorNetwork", "vectorNetworkRef", "fillGeometry", "strokeGeometry"].iter().any(|k| o.contains_key(*k)) {
+            return;
+        }
+        let parent = v.get("parentIndex").and_then(|p| p.get("guid")).and_then(guid);
+        let end = |k: &str| -> Option<Point> {
+            let e = v.get(k)?;
+            let p = match e.get("endpointNodeID").and_then(guid).filter(|g| g != NO_STYLE) {
+                Some(id) => {
+                    let n = *self.nodes.get(&id)?;
+                    // Only siblings share the connector's coordinates.
+                    if n.get("parentIndex").and_then(|p| p.get("guid")).and_then(guid) != parent {
+                        return None;
+                    }
+                    let (w, h) = n.get("size").map_or((0.0, 0.0), |s| (num(s, "x").unwrap_or(0.0), num(s, "y").unwrap_or(0.0)));
+                    let (rx, ry) = e.get("relativePosition").and_then(|r| Some((num(r, "x")?, num(r, "y")?))).unwrap_or((0.5, 0.5));
+                    n.get("transform").and_then(matrix).unwrap_or_default() * Point::new(w * rx, h * ry)
+                }
+                None => e.get("position").and_then(|p| Some(Point::new(num(p, "x")?, num(p, "y")?)))?,
+            };
+            (p.x.is_finite() && p.y.is_finite()).then_some(p)
+        };
+        let (Some(a), Some(b)) = (end("connectorStart"), end("connectorEnd")) else {
+            self.warn("connectors whose ends can't be placed are empty");
+            return;
+        };
+        if v.str("connectorLineStyle").is_some_and(|s| s != "STRAIGHT") {
+            self.warn("elbowed and curved connectors without a saved path import as straight lines");
+        }
+        let (x0, y0) = (a.x.min(b.x), a.y.min(b.y));
+        o.insert("relativeTransform".into(), rows(space * Affine::translate((x0, y0))));
+        o.insert("size".into(), json!({"x": (a.x - b.x).abs(), "y": (a.y - b.y).abs()}));
+        o.insert(
+            "vectorNetwork".into(),
+            json!({"vertices": [{"x": a.x - x0, "y": a.y - y0}, {"x": b.x - x0, "y": b.y - y0}], "segments": [{"a": 0, "b": 1}]}),
+        );
+    }
+
+    pub(super) fn connector_snapshot_supported(&self, v: &View<'a>) -> bool {
+        if v.str("connectorType") != Some("MANUAL")
+            || v.get("connectorVersion").and_then(Kv::f64) != Some(1.0)
+            || v.str("connectorLineStyle") != Some("STRAIGHT")
+            || v.get("derivedImmutableFrameData").and_then(|data| data.get("version")).and_then(Kv::f64) != Some(1.0)
+        {
+            return false;
+        }
+        let Some(line) = connector_record(v, "derivedImmutableFrameData", 0) else { return false };
+        if line.get("transform").and_then(matrix).is_none() || valid_size(line.get("size")).is_none() {
+            return false;
+        }
+        let geometry = ["fillGeometry", "strokeGeometry"].iter().any(|key| {
+            line.get(key).map(Kv::list).unwrap_or_default().iter().any(|path| {
+                num(path, "commandsBlob")
+                    .and_then(|index| self.blobs.get(index as usize))
+                    .and_then(|blob| svg_path(blob))
+                    .is_some_and(|data| !data.is_empty())
+            })
+        });
+        let network = line
+            .get("vectorData")
+            .and_then(|data| num(data, "vectorNetworkBlob"))
+            .and_then(|index| self.blobs.get(index as usize))
+            .and_then(|blob| network::decode(blob))
+            .is_some_and(|network| !network.segments.is_empty());
+        (geometry || network) && connector_record(v, "nodeGenerationData", 0).is_some()
+    }
+
+    pub(super) fn connector_snapshot_flatten(&mut self, out: &mut Obj, v: &View<'a>, rest_id: &str, space: Affine) {
+        let parent = space * v.get("transform").and_then(matrix).unwrap_or_default();
+        let Some(vector) = self.connector_snapshot_vector(v, rest_id, parent, false) else {
+            self.warn("connector snapshot vector data is missing; connector was left empty");
+            return;
+        };
+        for key in [
+            "size",
+            "relativeTransform",
+            "fills",
+            "strokes",
+            "strokeWeight",
+            "strokeAlign",
+            "strokeJoin",
+            "strokeDashes",
+            "strokeCap",
+            "strokeCapStart",
+            "strokeCapEnd",
+            "styles",
+            "fillGeometry",
+            "strokeGeometry",
+            "vectorNetwork",
+        ] {
+            if let Some(value) = vector.get(key) {
+                out.insert(key.to_string(), value.clone());
+            }
+        }
+        if vector.get("visible").and_then(Value::as_bool) == Some(false) {
+            out.insert("visible".into(), json!(false));
+        }
+        if let Some(line_opacity) = vector.get("opacity").and_then(Value::as_f64) {
+            let root_opacity = out.get("opacity").and_then(Value::as_f64).unwrap_or(1.0);
+            out.insert("opacity".into(), json!(root_opacity * line_opacity));
+        }
+        if connector_has_saved_label(v) {
+            let reason = if self.count >= self.budget() { "node budget" } else { "depth limit" };
+            self.warn(format!("connector label was skipped: {reason} prevents nested snapshot children"));
+        }
+    }
+
+    /// Build the saved vector child or flattened terminal connector from the same child-only view.
+    fn connector_snapshot_vector(&mut self, v: &View<'a>, rest_id: &str, space: Affine, nested: bool) -> Option<Obj> {
+        let (Some(line), Some(line_style)) = (connector_record(v, "derivedImmutableFrameData", 0), connector_record(v, "nodeGenerationData", 0))
+        else {
+            return None;
+        };
+        let mut vector = Obj::new();
+        vector.insert("id".into(), json!(if nested { format!("{rest_id};vector") } else { rest_id.to_string() }));
+        vector.insert("type".into(), json!("VECTOR"));
+        if let Some(name) = v.str("name") {
+            vector.insert("name".into(), json!(if nested { format!("{name} vector") } else { name.to_string() }));
+        }
+        let line_view = View::of(line).with([line_style]);
+        self.common(&mut vector, &line_view, "VECTOR", space, None);
+        self.geometry(&mut vector, &line_view);
+        for (from, to) in [("connectorStartCap", "strokeCapStart"), ("connectorEndCap", "strokeCapEnd")] {
+            if let Some(cap) = v.str(from) {
+                vector.entry(to).or_insert_with(|| json!(cap_name(cap)));
+            }
+        }
+        Some(vector)
+    }
+
+    /// Snapshot the straight, manual connector contract carried by its generated children.
+    pub(crate) fn connector_snapshot_children(&mut self, v: &View<'a>, rest_id: &str) -> Vec<Value> {
+        if self.count >= self.budget() {
+            self.warn(format!("the file has more than {} layers; connector snapshot children were skipped", self.max_nodes));
+            return Vec::new();
+        }
+        let Some(vector) = self.connector_snapshot_vector(v, rest_id, Affine::IDENTITY, true) else {
+            self.warn("connector snapshot vector data is missing; connector was left empty");
+            return Vec::new();
+        };
+        let mut children = Vec::new();
+        children.push(Value::Object(vector));
+        self.count += 1;
+
+        let Some(text_frame) = connector_record(v, "derivedImmutableFrameData", 1) else {
+            if connector_has_saved_label(v) {
+                self.warn("connector label was skipped: derived text bounds are missing");
+            }
+            return children;
+        };
+        let Some(background) = connector_record(v, "derivedImmutableFrameData", 2) else {
+            if connector_has_saved_label(v) || valid_size(text_frame.get("size")).is_some_and(|(w, h)| w > 0.0 && h > 0.0) {
+                self.warn("connector label was skipped: derived background bounds are missing");
+            }
+            return children;
+        };
+        let Some(text_style) = connector_record(v, "nodeGenerationData", 1) else {
+            if valid_size(text_frame.get("size")).is_some_and(|(w, h)| w > 0.0 && h > 0.0) {
+                self.warn("connector label was skipped: text style data is missing");
+            }
+            return children;
+        };
+        let text_view = View::of(text_frame).with([text_style]);
+        let Some(characters) = text_view.get("textData").and_then(|d| d.get("characters")).and_then(Kv::str).filter(|s| !s.trim().is_empty()) else {
+            return children;
+        };
+        let Some(text_transform) = text_frame.get("transform").and_then(matrix) else {
+            self.warn("connector label was skipped: text transform is invalid");
+            return children;
+        };
+        let Some(background_transform) = background.get("transform").and_then(matrix) else {
+            self.warn("connector label was skipped: background transform is invalid");
+            return children;
+        };
+        let Some(text_size) = valid_size(text_frame.get("size")) else {
+            self.warn("connector label was skipped: text bounds are invalid");
+            return children;
+        };
+        let Some(background_size) = valid_size(background.get("size")) else {
+            self.warn("connector label was skipped: background bounds are invalid");
+            return children;
+        };
+        let composed_text_transform = background_transform * text_transform;
+        if !composed_text_transform.as_coeffs().iter().all(|coefficient| coefficient.is_finite()) {
+            self.warn("connector label was skipped: composed text transform is invalid");
+            return children;
+        }
+
+        let Some(background_style) = connector_record(v, "nodeGenerationData", 2) else {
+            self.warn("connector label background was skipped: style data is missing");
+            self.add_connector_text(&mut children, rest_id, characters, text_size, composed_text_transform, &text_view);
+            return children;
+        };
+        let background_view = View::of(background).with([background_style]);
+        if !background_view.list("fillPaints").is_empty() {
+            if self.count >= self.budget() {
+                self.warn(format!("the file has more than {} layers; connector label background was skipped", self.max_nodes));
+            } else {
+                let mut rect = Obj::new();
+                rect.insert("id".into(), json!(format!("{rest_id};label-background")));
+                rect.insert("type".into(), json!("RECTANGLE"));
+                rect.insert("name".into(), json!("connector label background"));
+                self.common(&mut rect, &background_view, "RECTANGLE", Affine::IDENTITY, None);
+                rect.insert("size".into(), json!({"x": background_size.0, "y": background_size.1}));
+                rect.insert("relativeTransform".into(), rows(background_transform));
+                rect.insert("clipsContent".into(), json!(false));
+                children.push(Value::Object(rect));
+                self.count += 1;
+            }
+        }
+        self.add_connector_text(&mut children, rest_id, characters, text_size, composed_text_transform, &text_view);
+        children
+    }
+
+    fn add_connector_text(
+        &mut self,
+        children: &mut Vec<Value>,
+        rest_id: &str,
+        characters: &str,
+        size: (f64, f64),
+        transform: Affine,
+        view: &View<'a>,
+    ) {
+        if self.count >= self.budget() {
+            self.warn(format!("the file has more than {} layers; connector label was skipped", self.max_nodes));
+            return;
+        }
+        let mut text = Obj::new();
+        text.insert("id".into(), json!(format!("{rest_id};label-text")));
+        text.insert("type".into(), json!("TEXT"));
+        text.insert("name".into(), json!(characters));
+        text.insert("size".into(), json!({"x": size.0, "y": size.1}));
+        self.common(&mut text, view, "TEXT", Affine::IDENTITY, None);
+        text.insert("relativeTransform".into(), rows(transform));
+        self.text(&mut text, view);
+        children.push(Value::Object(text));
+        self.count += 1;
+    }
+}
+
+/// A generated connector child is identified by one exact template GUID, not its array position.
+fn connector_record<'a>(v: &View<'a>, field: &str, local_id: u32) -> Option<&'a Kv<'a>> {
+    v.get(field)?.get("overrides")?.list().iter().find(|row| {
+        row.get("guidPath").and_then(|path| path.get("guids")).map(Kv::list).is_some_and(|guids| {
+            guids.len() == 1 && num(&guids[0], "sessionID") == Some(40_000_000.0) && num(&guids[0], "localID") == Some(f64::from(local_id))
+        })
+    })
+}
+
+pub(super) fn connector_has_saved_label(v: &View<'_>) -> bool {
+    own_text(v).is_some()
+        || connector_record(v, "nodeGenerationData", 1)
+            .and_then(|r| r.get("textData"))
+            .and_then(|d| d.get("characters"))
+            .and_then(Kv::str)
+            .is_some_and(|s| !s.trim().is_empty())
+}
diff --git a/crates/format/src/fig/map/connector_snapshot_budget_tests.rs b/crates/format/src/fig/map/connector_snapshot_budget_tests.rs
new file mode 100644
index 00000000..8727c31b
--- /dev/null
+++ b/crates/format/src/fig/map/connector_snapshot_budget_tests.rs
@@ -0,0 +1,178 @@
+//! Connector snapshot flattening stays within the node and depth budgets.
+
+use super::{MAX_DEPTH, Mapper, View};
+use crate::fig::kiwi::Kv;
+use crate::rest::MAX_NODES;
+use figcraft_doc::geom::Affine;
+
+fn obj(fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    Kv::Object(fields)
+}
+
+fn guid(local_id: u64) -> Kv<'static> {
+    obj(vec![("sessionID", Kv::Uint(40_000_000)), ("localID", Kv::Uint(local_id))])
+}
+
+fn path_blob() -> Vec<u8> {
+    let mut bytes = vec![1];
+    bytes.extend(0.0f32.to_le_bytes());
+    bytes.extend(0.0f32.to_le_bytes());
+    bytes.push(2);
+    bytes.extend(20.0f32.to_le_bytes());
+    bytes.extend(10.0f32.to_le_bytes());
+    bytes
+}
+
+fn record(local_id: u64, mut fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    fields.push(("guidPath", obj(vec![("guids", Kv::Array(vec![guid(local_id)]))])));
+    obj(fields)
+}
+
+fn message() -> Kv<'static> {
+    let line = record(
+        0,
+        vec![
+            (
+                "transform",
+                obj(vec![
+                    ("m00", Kv::Float(1.0)),
+                    ("m01", Kv::Float(0.0)),
+                    ("m02", Kv::Float(0.0)),
+                    ("m10", Kv::Float(0.0)),
+                    ("m11", Kv::Float(1.0)),
+                    ("m12", Kv::Float(0.0)),
+                ]),
+            ),
+            ("size", obj(vec![("x", Kv::Float(20.0)), ("y", Kv::Float(10.0))])),
+            ("fillGeometry", Kv::Array(vec![obj(vec![("commandsBlob", Kv::Uint(0))])])),
+        ],
+    );
+    let text = record(
+        1,
+        vec![
+            (
+                "transform",
+                obj(vec![
+                    ("m00", Kv::Float(1.0)),
+                    ("m01", Kv::Float(0.0)),
+                    ("m02", Kv::Float(0.0)),
+                    ("m10", Kv::Float(0.0)),
+                    ("m11", Kv::Float(1.0)),
+                    ("m12", Kv::Float(0.0)),
+                ]),
+            ),
+            ("size", obj(vec![("x", Kv::Float(50.0)), ("y", Kv::Float(20.0))])),
+        ],
+    );
+    let background = record(
+        2,
+        vec![
+            (
+                "transform",
+                obj(vec![
+                    ("m00", Kv::Float(1.0)),
+                    ("m01", Kv::Float(0.0)),
+                    ("m02", Kv::Float(0.0)),
+                    ("m10", Kv::Float(0.0)),
+                    ("m11", Kv::Float(1.0)),
+                    ("m12", Kv::Float(0.0)),
+                ]),
+            ),
+            ("size", obj(vec![("x", Kv::Float(60.0)), ("y", Kv::Float(30.0))])),
+        ],
+    );
+    let line_style = record(0, vec![]);
+    let text_style = record(1, vec![("textData", obj(vec![("characters", Kv::Str("budget label".into()))]))]);
+    let background_style = record(2, vec![("fillPaints", Kv::Array(vec![]))]);
+    obj(vec![
+        (
+            "nodeChanges",
+            Kv::Array(vec![obj(vec![
+                ("guid", obj(vec![("sessionID", Kv::Uint(1)), ("localID", Kv::Uint(123))])),
+                ("type", Kv::Enum("CONNECTOR")),
+                ("name", Kv::Str("budget connector".into())),
+                ("connectorType", Kv::Enum("MANUAL")),
+                ("connectorVersion", Kv::Float(1.0)),
+                ("connectorLineStyle", Kv::Enum("STRAIGHT")),
+                ("derivedImmutableFrameData", obj(vec![("version", Kv::Float(1.0)), ("overrides", Kv::Array(vec![line, text, background]))])),
+                ("nodeGenerationData", obj(vec![("overrides", Kv::Array(vec![line_style, text_style, background_style]))])),
+            ])]),
+        ),
+        ("blobs", Kv::Array(vec![obj(vec![("bytes", Kv::Bytes(path_blob()))])])),
+    ])
+}
+
+#[test]
+fn connector_snapshot_respects_last_and_zero_child_slots() {
+    let message = message();
+    let node = message.get("nodeChanges").unwrap().list().first().unwrap();
+    let view = View::of(node);
+    let mut mapper = Mapper::new(&message, MAX_NODES);
+    mapper.count = MAX_NODES - 1;
+    let children = mapper.connector_snapshot_children(&view, "1:123");
+    assert_eq!(children.len(), 1, "the final available slot preserves the saved vector");
+    assert_eq!(children[0]["type"], "VECTOR");
+    assert!(!children[0]["fillGeometry"].as_array().unwrap().is_empty(), "saved outline survives the budget limit");
+    assert_eq!(children[0]["fillGeometry"][0]["path"], "M 0 0 L 20 10");
+    assert_eq!(mapper.count, MAX_NODES);
+    assert!(mapper.warnings.seen().any(|warning| warning == format!("the file has more than {MAX_NODES} layers; connector label was skipped")));
+
+    let mut mapper = Mapper::new(&message, MAX_NODES);
+    mapper.count = MAX_NODES;
+    let children = mapper.connector_snapshot_children(&view, "1:123");
+    assert!(children.is_empty());
+    assert_eq!(mapper.count, MAX_NODES, "the node budget is never exceeded");
+    assert!(mapper.warnings.seen().any(|warning| warning.contains("connector snapshot children were skipped")));
+}
+
+#[test]
+fn connector_snapshot_flattens_vector_at_depth_and_node_limits() {
+    let message = message();
+    let mut mapper = Mapper::new(&message, MAX_NODES);
+    let depth_limited = mapper.layer("1:123", None, Affine::IDENTITY, None, None, MAX_DEPTH).expect("terminal connector");
+    assert_eq!(depth_limited["type"], "VECTOR");
+    assert!(!depth_limited["fillGeometry"].as_array().unwrap().is_empty());
+    assert!(depth_limited.get("children").is_none());
+    assert!(mapper.warnings.seen().any(|warning| warning == "connector label was skipped: depth limit prevents nested snapshot children"));
+
+    let mut mapper = Mapper::new(&message, MAX_NODES);
+    mapper.count = MAX_NODES - 1;
+    let budget_limited = mapper.layer("1:123", None, Affine::IDENTITY, None, None, 0).expect("last allowed connector");
+    assert_eq!(budget_limited["type"], "VECTOR");
+    assert!(!budget_limited["fillGeometry"].as_array().unwrap().is_empty());
+    assert!(budget_limited.get("children").is_none());
+    assert_eq!(mapper.count, MAX_NODES);
+    assert!(mapper.warnings.seen().any(|warning| warning == "connector label was skipped: node budget prevents nested snapshot children"));
+}
+
+/// A mapper note is met once per layer, so the kinds were named once each with no sign of how much
+/// of the file they covered: a file whose every layer lost a setting read the same as one where a
+/// single layer did (#467). They are counted now, with the `(×n)` the REST importer already uses
+/// and the import report already reads back off before translating a note.
+#[test]
+fn a_note_met_more_than_once_carries_its_count() {
+    let message = message();
+
+    let mut mapper = Mapper::new(&message, MAX_NODES);
+    for _ in 0..2 {
+        mapper.layer("1:123", None, Affine::IDENTITY, None, None, MAX_DEPTH).expect("terminal connector");
+    }
+    let notes = std::mem::take(&mut mapper.warnings).finish();
+    let counted: Vec<&String> = notes.iter().filter(|n| n.contains("(×")).collect();
+    assert!(
+        counted.iter().any(|n| n.ends_with("(×2)") && n.contains("connector label was skipped: depth limit")),
+        "the note met twice says so: {notes:?}"
+    );
+    assert!(notes.iter().all(|n| !n.ends_with("(×1)")), "a count of one is left off: {notes:?}");
+
+    // One layer, and the same notes have no count at all.
+    let mut mapper = Mapper::new(&message, MAX_NODES);
+    mapper.layer("1:123", None, Affine::IDENTITY, None, None, MAX_DEPTH).expect("terminal connector");
+    let once = std::mem::take(&mut mapper.warnings).finish();
+    assert!(once.iter().all(|n| !n.contains("(×")), "{once:?}");
+    assert_eq!(
+        once.len(),
+        counted.len() + notes.iter().filter(|n| !n.contains("(×")).count(),
+        "the same kinds, counted or not: {once:?} vs {notes:?}"
+    );
+}
diff --git a/crates/format/src/fig/map/document.rs b/crates/format/src/fig/map/document.rs
new file mode 100644
index 00000000..d31ef5c6
--- /dev/null
+++ b/crates/format/src/fig/map/document.rs
@@ -0,0 +1,308 @@
+use super::component::{assigned, prop_guid};
+use super::paint::color;
+use super::variables::variable_value;
+use super::*;
+
+impl<'a> Mapper<'a> {
+    /// The DOCUMENT with its pages.
+    pub(super) fn document(&mut self) -> Value {
+        let doc_id = self.nodes.iter().find(|(_, n)| n.get("type").and_then(Kv::str) == Some("DOCUMENT")).map(|(id, _)| id.clone());
+        let pages: Vec<String> = match &doc_id {
+            Some(d) => self.children(d),
+            None => self.nodes.iter().filter(|(_, n)| n.get("type").and_then(Kv::str) == Some("CANVAS")).map(|(id, _)| id.clone()).collect(),
+        };
+        let mut internal = Vec::new();
+        let mut visible = Vec::new();
+        for p in pages {
+            let Some(&n) = self.nodes.get(&p) else { continue };
+            if n.get("type").and_then(Kv::str) != Some("CANVAS") {
+                self.warn("document children other than pages were skipped");
+                continue;
+            }
+            // The hidden page that holds styles, variables and library copies.
+            if n.get("internalOnly").and_then(Kv::bool) == Some(true) {
+                internal.push((p, n));
+            } else {
+                visible.push((p, n));
+            }
+        }
+        // The library copies the pages use come first: in a file past the layer cap, the pages'
+        // last layers are skipped rather than the mains every instance of them needs (#981).
+        let visible_pages: Vec<String> = visible.iter().map(|(p, _)| p.clone()).collect();
+        let required_mains = self.referenced_component_mains(&visible_pages);
+        // The pages and their top-level layers, up to half the cap, stay for the pages.
+        let top: usize = visible_pages.iter().map(|p| 1 + self.children(p).len()).sum();
+        self.reserved = top.min(self.max_nodes / 2);
+        for (id, canvas) in internal {
+            if let Some(context) = self.library_context(&id, canvas, &required_mains) {
+                self.library_contexts.push(context);
+            }
+        }
+        self.reserved = 0;
+        let out: Vec<Value> = visible.into_iter().map(|(p, n)| self.page(&p, n)).collect();
+        if out.is_empty() {
+            self.warn("the file has no pages");
+        }
+        let mut doc = json!({"id": doc_id.unwrap_or_else(|| "0:0".into()), "type": "DOCUMENT"});
+        doc["children"] = Value::Array(out);
+        doc
+    }
+
+    /// The ids of the components the visible pages use, directly or through the components they
+    /// use in turn (nested instances, swap targets, overrides naming another main).
+    fn referenced_component_mains(&mut self, visible_pages: &[String]) -> BTreeSet<String> {
+        let mut mains = BTreeSet::new();
+        let mut visited = BTreeSet::new();
+        let mut pending: Vec<(String, usize)> = visible_pages.iter().flat_map(|page| self.children(page)).map(|id| (id, 1)).collect();
+        while let Some((id, depth)) = pending.pop() {
+            if depth > MAX_DEPTH {
+                self.warn(format!("component references below {MAX_DEPTH} layer levels were skipped"));
+                continue;
+            }
+            if !visited.insert(id.clone()) {
+                continue;
+            }
+            if visited.len() > self.max_nodes {
+                let max = self.max_nodes;
+                self.warn(format!("the component reference scan reached the {max}-layer limit"));
+                break;
+            }
+            let Some(node) = self.nodes.get(&id) else { continue };
+            for target in self.component_main_targets(node) {
+                if mains.insert(target.clone()) {
+                    pending.push((target, 1));
+                }
+            }
+            pending.extend(self.children(&id).into_iter().map(|child| (child, depth + 1)));
+        }
+        mains
+    }
+
+    /// The mains a layer names: an instance's own, the ones its overrides swap in, the instance-swap
+    /// defaults and values of component properties.
+    fn component_main_targets(&self, node: &Kv<'a>) -> Vec<String> {
+        let mut targets: Vec<String> = node
+            .get("componentPropDefs")
+            .map(Kv::list)
+            .unwrap_or_default()
+            .iter()
+            .filter_map(|definition| {
+                self.is_instance_swap(definition.get("id")?)?;
+                definition.get("initialValue")?.get("guidValue").and_then(guid)
+            })
+            .collect();
+        if node.get("type").and_then(Kv::str) != Some("INSTANCE") {
+            return targets;
+        }
+        // The instance and the override rows below it (rows carry the same fields, nested).
+        let mut pending: Vec<(&Kv<'a>, usize)> = vec![(node, 0)];
+        let mut rows = 0usize;
+        while let Some((row, depth)) = pending.pop() {
+            rows += 1;
+            if depth > MAX_DEPTH || rows > self.max_nodes {
+                break;
+            }
+            let data = row.get("symbolData");
+            targets.extend(row.get("overriddenSymbolID").and_then(guid));
+            targets.extend(data.and_then(|d| d.get("symbolID")).and_then(guid));
+            for assignment in row.get("componentPropAssignments").map(Kv::list).unwrap_or_default() {
+                if assignment.get("defID").is_some_and(|def| self.is_instance_swap(def).is_some()) {
+                    targets.extend(assigned(assignment).and_then(prop_guid));
+                }
+            }
+            let overrides = data.and_then(|d| d.get("symbolOverrides")).map(Kv::list).unwrap_or_default();
+            let derived = row.get("derivedSymbolData").map(Kv::list).unwrap_or_default();
+            pending.extend(overrides.iter().chain(derived).map(|row| (row, depth + 1)));
+        }
+        targets
+    }
+
+    /// The branches of the internal canvas `id` that hold the `required_mains` (with the frames
+    /// they sit in), as a frame of its own: the cached definitions of components that come from a
+    /// library. `None` when it holds none.
+    fn library_context(&mut self, id: &str, canvas: &'a Kv<'a>, required_mains: &BTreeSet<String>) -> Option<Value> {
+        let mut included = BTreeSet::new();
+        let mut parents: BTreeMap<String, String> = BTreeMap::new();
+        // The canvas itself is never a layer of the walk, whatever the parent links say.
+        let mut visited = BTreeSet::from([id.to_string()]);
+        // Each entry: layer, depth, inside a required definition.
+        let mut pending: Vec<(String, usize, bool)> = self.children(id).into_iter().map(|child| (child, 1, false)).collect();
+        while let Some((node_id, depth, in_definition)) = pending.pop() {
+            if depth > MAX_DEPTH {
+                self.warn(format!("internal library branches deeper than {MAX_DEPTH} levels were skipped"));
+                continue;
+            }
+            if !visited.insert(node_id.clone()) {
+                continue;
+            }
+            self.library_scan_count += 1;
+            if self.library_scan_count > self.max_nodes {
+                let max = self.max_nodes;
+                self.warn(format!("the internal library scan reached the {max}-layer limit; the remaining branches were skipped"));
+                break;
+            }
+            let Some(node) = self.nodes.get(&node_id) else { continue };
+            let kind = node.get("type").and_then(Kv::str);
+            let definition = (kind == Some("SYMBOL") || (kind == Some("FRAME") && node.get("isStateGroup").and_then(Kv::bool) == Some(true)))
+                && required_mains.contains(&node_id);
+            let in_definition = in_definition || definition;
+            if in_definition {
+                included.insert(node_id.clone());
+            }
+            if definition {
+                // The frames around it keep the path its layers are addressed by.
+                let mut ancestor = parents.get(&node_id);
+                for _ in 0..=MAX_DEPTH {
+                    let Some(parent) = ancestor else { break };
+                    if !included.insert(parent.clone()) {
+                        break;
+                    }
+                    ancestor = parents.get(parent);
+                }
+            }
+            for child in self.children(&node_id).into_iter().rev() {
+                // A layer reached again keeps the parent it was first reached by, so the parents
+                // lead back to the canvas.
+                if visited.contains(&child) {
+                    continue;
+                }
+                parents.entry(child.clone()).or_insert_with(|| node_id.clone());
+                pending.push((child, depth + 1, in_definition));
+            }
+        }
+        if included.is_empty() {
+            return None;
+        }
+        let mut context = Obj::new();
+        context.insert("id".into(), json!(id));
+        context.insert("type".into(), json!("FRAME"));
+        copy_str(&mut context, &View::of(canvas), "name", "name");
+        context.insert("size".into(), json!({"x": 0.0, "y": 0.0}));
+        context.insert("relativeTransform".into(), rows(Affine::IDENTITY));
+        context.insert(crate::rest::FIG_SOURCE_FIELD.into(), json!({"origin": id, "expanded": false, "wireFrame": true, "wireInstance": false}));
+        self.variable_bindings(&mut context, &View::of(canvas));
+        let mut children = Vec::new();
+        for child in self.children(id) {
+            children.extend(self.layer_filtered(&child, None, Affine::IDENTITY, None, None, 0, Some(&included)));
+        }
+        if !children.is_empty() {
+            context.insert("children".into(), Value::Array(children));
+        }
+        Some(Value::Object(context))
+    }
+
+    fn page(&mut self, id: &str, n: &'a Kv<'a>) -> Value {
+        let v = View::of(n);
+        let mut o = Obj::new();
+        o.insert("id".into(), json!(id));
+        o.insert("type".into(), json!("CANVAS"));
+        copy_str(&mut o, &v, "name", "name");
+        if let Some(c) = v.get("backgroundColor") {
+            o.insert("backgroundColor".into(), color(c));
+        }
+        if let Some(c) = v.get("prototypeBackgroundColor") {
+            o.insert("prototypeBackgrounds".into(), json!([color(c)]));
+        }
+        self.variable_bindings(&mut o, &v);
+        let mut flows: Vec<(&str, Value)> = Vec::new();
+        let mut kids = Vec::new();
+        for c in self.children(id) {
+            if let Some(sp) = self.nodes.get(&c).and_then(|k| k.get("prototypeStartingPoint")) {
+                let name = sp.get("name").and_then(Kv::str).filter(|s| !s.is_empty()).unwrap_or("Flow");
+                flows.push((sp.get("position").and_then(Kv::str).unwrap_or(""), json!({"nodeId": c, "name": name})));
+            }
+            kids.extend(self.layer(&c, None, Affine::IDENTITY, None, None, 0));
+        }
+        flows.sort_by(|a, b| a.0.cmp(b.0));
+        if !flows.is_empty() {
+            o.insert("flowStartingPoints".into(), Value::Array(flows.into_iter().map(|f| f.1).collect()));
+        }
+        o.insert("children".into(), Value::Array(kids));
+        Value::Object(o)
+    }
+
+    /// The shared styles the file defines, in their order: each with the sample layer that holds
+    /// its values (`styleDefinitions`, our extension of the file JSON; the REST importer reads it).
+    pub(super) fn style_definitions(&mut self) -> Vec<Value> {
+        let mut found: Vec<(&'a str, String, &'a Kv<'a>)> = Vec::new();
+        for (id, n) in &self.nodes {
+            let live = n.get("isSoftDeleted").and_then(Kv::bool) != Some(true) && n.get("isSoftDeletedStyle").and_then(Kv::bool) != Some(true);
+            if live && n.get("styleType").and_then(Kv::str).is_some_and(|t| matches!(t, "FILL" | "TEXT" | "EFFECT" | "GRID")) {
+                found.push((n.get("sortPosition").and_then(Kv::str).unwrap_or(""), id.clone(), n));
+            }
+        }
+        found.sort_by(|a, b| (a.0, &a.1).cmp(&(b.0, &b.1)));
+        let mut out = Vec::new();
+        for (_, id, n) in found {
+            let Some(node) = self.layer(&id, None, Affine::IDENTITY, None, None, 0) else { break };
+            let name = n.get("name").and_then(Kv::str).unwrap_or("Style");
+            let desc = n.get("styleDescription").or_else(|| n.get("description")).and_then(Kv::str).unwrap_or("");
+            let ty = n.get("styleType").and_then(Kv::str).unwrap_or("");
+            out.push(json!({"id": id, "name": name, "description": desc, "styleType": ty, "node": node}));
+        }
+        out
+    }
+
+    /// Collections and variables, as the local variables response's `meta`, with their ids in the
+    /// file's order (`collectionOrder` and `variableOrder`, our extensions).
+    pub(super) fn variables(&self) -> Option<Value> {
+        let of_type = |t: &'static str, key: &'static str| {
+            let live = move |n: &Kv| n.get("type").and_then(Kv::str) == Some(t) && n.get("isSoftDeleted").and_then(Kv::bool) != Some(true);
+            let mut list: Vec<(&str, &String, &'a Kv<'a>)> = self
+                .nodes
+                .iter()
+                .filter(|(_, n)| live(n))
+                .map(|(id, n)| (n.get(key).and_then(|p| p.get("position").or(Some(p))).and_then(Kv::str).unwrap_or(""), id, *n))
+                .collect();
+            list.sort_by(|a, b| (a.0, a.1).cmp(&(b.0, b.1)));
+            list.into_iter().map(|(_, id, n)| (id, n))
+        };
+        let mut order = Vec::new();
+        let mut collections = Obj::new();
+        for (id, n) in of_type("VARIABLE_SET", "parentIndex") {
+            order.push(json!(id));
+            let mut modes: Vec<(&str, Value)> = n
+                .get("variableSetModes")
+                .map(Kv::list)
+                .unwrap_or_default()
+                .iter()
+                .filter_map(|m| {
+                    let mode = json!({"modeId": m.get("id").and_then(guid)?, "name": m.get("name").and_then(Kv::str).unwrap_or("Mode")});
+                    Some((m.get("sortPosition").and_then(Kv::str).unwrap_or(""), mode))
+                })
+                .collect();
+            modes.sort_by(|a, b| a.0.cmp(b.0));
+            let default = modes.first().map_or(Value::Null, |m| m.1["modeId"].clone());
+            let name = n.get("name").and_then(Kv::str).unwrap_or("Collection");
+            let modes: Vec<Value> = modes.into_iter().map(|m| m.1).collect();
+            collections.insert(id.clone(), json!({"id": id, "name": name, "modes": modes, "defaultModeId": default}));
+        }
+        let mut variable_order = Vec::new();
+        let mut variables = Obj::new();
+        for (id, n) in of_type("VARIABLE", "sortPosition") {
+            let Some(set) = n.get("variableSetID").and_then(|s| self.resource_id(s)).filter(|s| collections.contains_key(s)) else { continue };
+            let ty = n.get("variableResolvedType").and_then(Kv::str).unwrap_or("");
+            if !matches!(ty, "BOOLEAN" | "FLOAT" | "STRING" | "COLOR") {
+                continue;
+            }
+            let mut values = Obj::new();
+            for e in n.get("variableDataValues").and_then(|m| m.get("entries")).map(Kv::list).unwrap_or_default() {
+                if let (Some(mode), Some(val)) = (e.get("modeID").and_then(guid), e.get("variableData").and_then(variable_value)) {
+                    values.insert(mode, val);
+                }
+            }
+            let name = n.get("name").and_then(Kv::str).unwrap_or("Variable");
+            let desc = n.get("description").and_then(Kv::str).unwrap_or("");
+            let mut var =
+                json!({"id": id, "name": name, "variableCollectionId": set, "resolvedType": ty, "valuesByMode": values, "description": desc});
+            // The properties pickers offer the variable for, under the REST names.
+            if let Some(scopes) = n.get("variableScopes") {
+                var["scopes"] = scopes.list().iter().filter_map(Kv::str).map(|s| if s == "STROKE" { "STROKE_COLOR" } else { s }).collect();
+            }
+            variable_order.push(json!(id));
+            variables.insert(id.clone(), var);
+        }
+        (!collections.is_empty())
+            .then(|| json!({"variableCollections": collections, "variables": variables, "collectionOrder": order, "variableOrder": variable_order}))
+    }
+}
diff --git a/crates/format/src/fig/map/image_filter_tests.rs b/crates/format/src/fig/map/image_filter_tests.rs
new file mode 100644
index 00000000..a8db39a7
--- /dev/null
+++ b/crates/format/src/fig/map/image_filter_tests.rs
@@ -0,0 +1,27 @@
+//! Malformed image paint filters are skipped with a warning.
+
+use super::*;
+
+#[test]
+fn malformed_non_finite_filter_is_skipped_with_warning() {
+    let paint = Kv::Object(vec![("type", Kv::Enum("IMAGE")), ("paintFilter", Kv::Object(vec![("exposure", Kv::Float(f32::NAN))]))]);
+    let mut warnings = Vec::new();
+    let value = super::paint(&paint, &mut |warning| warnings.push(warning)).unwrap();
+    assert!(value.get("filters").is_none(), "{value}");
+    assert!(warnings.iter().any(|warning| warning.contains("malformed image filter `exposure`")), "{warnings:?}");
+}
+
+#[test]
+fn boolean_filter_values_are_malformed_even_when_false() {
+    for (field, value, expected_warning) in [
+        ("exposure", Kv::Bool(true), "malformed image filter `exposure`"),
+        ("exposure", Kv::Bool(false), "malformed image filter `exposure`"),
+        ("mystery", Kv::Bool(false), "malformed unsupported image filter `mystery`"),
+    ] {
+        let paint = Kv::Object(vec![("type", Kv::Enum("IMAGE")), ("paintFilter", Kv::Object(vec![(field, value)]))]);
+        let mut warnings = Vec::new();
+        let value = super::paint(&paint, &mut |warning| warnings.push(warning)).unwrap();
+        assert!(value.get("filters").is_none(), "{value}");
+        assert!(warnings.iter().any(|warning| warning.contains(expected_warning)), "{warnings:?}");
+    }
+}
diff --git a/crates/format/src/fig/map/layer.rs b/crates/format/src/fig/map/layer.rs
new file mode 100644
index 00000000..e4793d48
--- /dev/null
+++ b/crates/format/src/fig/map/layer.rs
@@ -0,0 +1,699 @@
+use super::component::{Entry, Inst, OverrideRow, prop_ref};
+use super::connector::connector_has_saved_label;
+use super::layout::{layout_grid, tracks};
+use super::paint::{effect, export_setting, paint, paint_bound, stroke};
+use super::*;
+
+/// How the layers of a resized container follow it when the file gives no derived layout for
+/// them: a frame's by their constraints, from its main's size to its own; a group's scale with it.
+#[derive(Clone, Copy)]
+pub(super) enum Fit {
+    Frame { from: (f64, f64), to: (f64, f64) },
+    Scale(f64, f64),
+}
+
+impl Fit {
+    fn frame(from: Option<(f64, f64)>, to: Option<(f64, f64)>) -> Option<Self> {
+        let (from, to) = (from?, to?);
+        ((from.0 - to.0).abs() > 1e-9 || (from.1 - to.1).abs() > 1e-9).then_some(Fit::Frame { from, to })
+    }
+
+    fn scale(from: Option<(f64, f64)>, to: Option<(f64, f64)>) -> Option<Self> {
+        let (from, to) = (from?, to?);
+        let k = |a: f64, b: f64| if a > 1e-9 { b / a } else { 1.0 };
+        let (kx, ky) = (k(from.0, to.0), k(from.1, to.1));
+        ((kx - 1.0).abs() > 1e-9 || (ky - 1.0).abs() > 1e-9).then_some(Fit::Scale(kx, ky))
+    }
+
+    /// The size and transform (in the parent's coordinates) of a `w` × `h` layer at `t` with
+    /// constraints `h_con`, `v_con`. Like the editor's constraint solver, a layer keeps its
+    /// rotation and flip and stretches along its own axes.
+    fn apply(self, w: f64, h: f64, t: Affine, h_con: Option<&str>, v_con: Option<&str>) -> ((f64, f64), Affine) {
+        let [a, b, c, d, _, _] = t.as_coeffs();
+        let lin = Affine::new([a, b, c, d, 0.0, 0.0]);
+        let bb = figcraft_doc::geom::transform_rect_bbox(t, figcraft_doc::geom::Rect::new(0.0, 0.0, w, h));
+        // Where the new box goes: its top-left (constraints) or its centre (a group's scale).
+        let (kx, ky, x0, y0, centred) = match self {
+            Fit::Frame { from, to } => {
+                let axis = |con: Option<&str>, lo: f64, hi: f64, old: f64, new: f64| match con {
+                    Some("MAX" | "FIXED_MAX") => (lo + new - old, hi + new - old),
+                    Some("STRETCH") => (lo, hi + new - old),
+                    Some("CENTER") => (lo + (new - old) / 2.0, hi + (new - old) / 2.0),
+                    Some("SCALE") if old > 1e-9 => (lo * new / old, hi * new / old),
+                    _ => (lo, hi),
+                };
+                let (x0, x1) = axis(h_con, bb.x0, bb.x1, from.0, to.0);
+                let (y0, y1) = axis(v_con, bb.y0, bb.y1, from.1, to.1);
+                let k = |new: f64, old: f64| if old > 1e-9 { (new / old).max(0.0) } else { 1.0 };
+                (k(x1 - x0, bb.width()), k(y1 - y0, bb.height()), x0, y0, false)
+            }
+            Fit::Scale(kx, ky) => (kx, ky, bb.center().x * kx, bb.center().y * ky, true),
+        };
+        let along = |x: f64, y: f64, fallback: f64| {
+            let len = x.hypot(y);
+            let k = (kx * x).hypot(ky * y) / len;
+            if len > 1e-12 && k.is_finite() { k } else { fallback }
+        };
+        let size = (w * along(a, b, kx), h * along(c, d, ky));
+        let nb = figcraft_doc::geom::transform_rect_bbox(lin, figcraft_doc::geom::Rect::new(0.0, 0.0, size.0, size.1));
+        let at = if centred { nb.center() } else { figcraft_doc::geom::Point::new(nb.x0, nb.y0) };
+        (size, Affine::translate((x0 - at.x, y0 - at.y)) * lin)
+    }
+}
+
+impl<'a> Mapper<'a> {
+    /// Layer `id` (inside instance `inst` when expanding one) and its subtree. `space`: from the
+    /// parent's coordinates to the enclosing frame's (groups and booleans place their children in
+    /// the frame's space, like the REST JSON). `parent`: the parent's view (grid tracks).
+    pub(crate) fn layer(
+        &mut self,
+        id: &str,
+        inst: Option<&Inst<'a>>,
+        space: Affine,
+        parent: Option<&View<'a>>,
+        fit: Option<Fit>,
+        depth: usize,
+    ) -> Option<Value> {
+        self.layer_filtered(id, inst, space, parent, fit, depth, None)
+    }
+
+    /// [`Self::layer`], keeping only the layers in `included` (all when `None`) below the
+    /// top-level one: the cached library definitions of an internal canvas.
+    pub(super) fn layer_filtered(
+        &mut self,
+        id: &str,
+        inst: Option<&Inst<'a>>,
+        space: Affine,
+        parent: Option<&View<'a>>,
+        fit: Option<Fit>,
+        depth: usize,
+        included: Option<&BTreeSet<String>>,
+    ) -> Option<Value> {
+        if included.is_some_and(|ids| !ids.contains(id)) {
+            return None;
+        }
+        if depth > MAX_DEPTH {
+            self.warn(format!("layers nested deeper than {MAX_DEPTH} levels were skipped"));
+            return None;
+        }
+        if self.count >= self.budget() {
+            let max = self.max_nodes;
+            self.warn(format!("the file has more than {max} layers; the rest were skipped"));
+            return None;
+        }
+        let base = *self.nodes.get(id)?;
+        let path = inst.map(|i| [i.path.as_slice(), &[id.to_string()]].concat());
+        let entries: &[OverrideRow<'a>] = match (inst, &path) {
+            (Some(i), Some(p)) => i.overrides.get(p).map(Vec::as_slice).unwrap_or_default(),
+            _ => &[],
+        };
+        let mut view = View::of(base).with(entries.iter().map(|e| e.row));
+        // A layer of a resized instance the file gives no derived layout for follows its
+        // constraints from the main's geometry, then takes the size and place overridden on it
+        // (auto layout places the others, as in the editor).
+        let derived = entries.iter().any(|e| e.entry == Entry::Derived && (e.row.get("size").is_some() || e.row.get("transform").is_some()));
+        let stacked = parent.and_then(|p| p.str("stackMode")).is_some_and(|m| matches!(m, "HORIZONTAL" | "VERTICAL" | "GRID"))
+            && view.str("stackPositioning") != Some("ABSOLUTE");
+        let main = View::of(base);
+        let set = |k: &str| entries.iter().rev().filter(|e| e.entry != Entry::Stale).find_map(|e| e.row.get(k));
+        if let (Some(f), false, false, Some((w, h))) = (fit, derived, stacked, main.size()) {
+            let t = main.transform().unwrap_or_default();
+            let (fw, ft) = f.apply(w, h, t, view.str("horizontalConstraint"), view.str("verticalConstraint"));
+            view.fitted = Some((set("size").and_then(size).unwrap_or(fw), set("transform").and_then(matrix).unwrap_or(ft)));
+        } else if entries.iter().any(|e| e.entry == Entry::Stale && (e.row.get("size").is_some() || e.row.get("transform").is_some()))
+            && let Some(s) = set("size").and_then(size).or_else(|| main.size())
+        {
+            view.fitted = Some((s, set("transform").and_then(matrix).or_else(|| main.transform()).unwrap_or_default()));
+        }
+        let rest_id = match (inst, &path) {
+            (Some(i), Some(p)) => format!("I{};{}", i.root, p.join(";")),
+            _ => id.to_string(),
+        };
+        let own = view.str("type").unwrap_or("");
+        let connector_snapshot = own == "CONNECTOR" && self.connector_snapshot_supported(&view);
+        // Only a connector with a saved label needs the frame wrapper; an unlabelled one stays a single vector.
+        let connector_terminal =
+            connector_snapshot && (!connector_has_saved_label(&view) || depth >= MAX_DEPTH || self.count.saturating_add(1) >= self.budget());
+        // A supported connector snapshot has its own note below instead of the generic stand-in one.
+        let stand = stand_in(own).filter(|_| !connector_snapshot);
+        let ty = match own {
+            "ROUNDED_RECTANGLE" => "RECTANGLE",
+            "SYMBOL" => "COMPONENT",
+            "FRAME" if view.flag("isStateGroup") == Some(true) => "COMPONENT_SET",
+            "FRAME" if view.flag("resizeToFit") == Some(true) => "GROUP",
+            "VARIABLE" | "VARIABLE_SET" => return None,
+            "CONNECTOR" if connector_snapshot && connector_terminal => "VECTOR",
+            "CONNECTOR" if connector_snapshot => "FRAME",
+            t => stand.map_or(t, |s| s.0),
+        };
+        if let Some((_, what)) = stand.filter(|_| own != "TEXT_PATH") {
+            self.warn(format!("{} layers import as {what}", own.to_ascii_lowercase().replace('_', " ")));
+        }
+        if connector_snapshot {
+            self.warn("connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained");
+        }
+        self.count += 1;
+        if own == "SYMBOL" && inst.is_none() {
+            self.mapped_mains.insert(id.to_string());
+        }
+        let mut o = Obj::new();
+        o.insert("id".into(), json!(rest_id));
+        // Private provenance for the .fig importer; ordinary REST import ignores it.
+        o.insert(
+            crate::rest::FIG_SOURCE_FIELD.into(),
+            json!({
+                "origin": id,
+                "expanded": inst.is_some(),
+                "wireFrame": own == "FRAME",
+                "wireInstance": own == "INSTANCE",
+                "slotContent": inst.is_some_and(|i| i.slot_content),
+                // A size the instance gives this layer itself (kept when the instance relays out).
+                "sizeOverride": entries.iter().any(|e| e.entry == Entry::Override && e.row.get("size").is_some()),
+            }),
+        );
+        o.insert("type".into(), json!(ty));
+        copy_str(&mut o, &view, "name", "name");
+        self.common(&mut o, &view, ty, space, parent);
+        match ty {
+            "TEXT" => {
+                self.text(&mut o, &view);
+                if own == "TEXT_PATH" {
+                    self.text_path(&mut o, &view);
+                }
+            }
+            "VECTOR" | "STAR" | "REGULAR_POLYGON" => self.geometry(&mut o, &view),
+            "ELLIPSE" => {
+                if let Some(a) = view.get("arcData") {
+                    let arc: Obj =
+                        ["startingAngle", "endingAngle", "innerRadius"].iter().filter_map(|k| Some((k.to_string(), json!(num(a, k)?)))).collect();
+                    o.insert("arcData".into(), Value::Object(arc));
+                }
+            }
+            "BOOLEAN_OPERATION" => {
+                if let Some(op) = view.str("booleanOperation") {
+                    o.insert("booleanOperation".into(), json!(if op == "XOR" { "EXCLUDE" } else { op }));
+                }
+            }
+            _ => {}
+        }
+        if own == "CONNECTOR" && connector_snapshot {
+            if connector_terminal {
+                self.connector_snapshot_flatten(&mut o, &view, &rest_id, space);
+            } else {
+                o.insert("fills".into(), json!([]));
+                o.insert("strokes".into(), json!([]));
+                for key in ["styles", "strokeWeight", "strokeAlign", "strokeJoin", "strokeDashes", "strokeCap"] {
+                    o.remove(key);
+                }
+                o.insert("clipsContent".into(), json!(false));
+            }
+        } else if own == "CONNECTOR" {
+            self.connector(&mut o, &view, space);
+        }
+        if ty == "COMPONENT" || ty == "COMPONENT_SET" {
+            self.component(&mut o, &view, &rest_id);
+        }
+        self.prop_refs(&mut o, &view, inst);
+        let slot_content = if own == "FRAME" {
+            prop_ref(&view, "SLOT_CONTENT_ID").and_then(|def| inst.and_then(|i| i.slot_contents.get(&self.prop_root(&def)).cloned()))
+        } else {
+            None
+        };
+        if slot_content.is_some()
+            && let Some(source) = o.get_mut(crate::rest::FIG_SOURCE_FIELD).and_then(Value::as_object_mut)
+        {
+            source.insert("slotOverride".into(), json!(true));
+        }
+        let child_space = if matches!(ty, "GROUP" | "BOOLEAN_OPERATION") { space * view.transform().unwrap_or_default() } else { Affine::IDENTITY };
+        let mut kids = if connector_snapshot && !connector_terminal { self.connector_snapshot_children(&view, &rest_id) } else { Vec::new() };
+        if connector_terminal {
+            // The saved vector is flattened into the connector node when no child slot remains.
+        } else if ty == "INSTANCE" {
+            if let Some((sub, sym)) = self.instance(&mut o, &view, id, inst, &rest_id) {
+                let main = self.nodes.get(&sym).map(|m| View::of(m));
+                let fit = Fit::frame(main.as_ref().and_then(View::size), view.size());
+                // An instance that records no auto layout of its own has its main's.
+                let view = match main {
+                    Some(m) if view.get("stackMode").is_none() && m.get("stackMode").is_some() => {
+                        let layered = View { fitted: view.fitted, ..m.with(view.layers.iter().copied()) };
+                        self.auto_layout(&mut o, &layered);
+                        layered
+                    }
+                    _ => view.clone(),
+                };
+                for c in self.children(&sym) {
+                    // The main's branch can live outside the cached context being mapped.
+                    kids.extend(self.layer_filtered(&c, Some(&sub), child_space, Some(&view), fit, depth + 1, None));
+                }
+            }
+        } else if let Some(content) = slot_content {
+            let mut content_inst = inst.cloned();
+            if let Some(content_inst) = &mut content_inst {
+                content_inst.slot_content = true;
+            }
+            for c in self.children(&content) {
+                kids.extend(self.layer_filtered(&c, content_inst.as_ref(), child_space, Some(&view), None, depth + 1, included));
+            }
+        } else {
+            // Inside an instance a layer's children are its main's: they follow it from the main's
+            // size to its own.
+            let fit = match (inst, ty) {
+                (None, _) => None,
+                (Some(_), "GROUP" | "BOOLEAN_OPERATION") => Fit::scale(View::of(base).size(), view.size()),
+                (Some(_), _) => Fit::frame(View::of(base).size(), view.size()),
+            };
+            for c in self.children(id) {
+                kids.extend(self.layer_filtered(&c, inst, child_space, Some(&view), fit, depth + 1, included));
+            }
+        }
+        if stand.is_some_and(|s| s.0 == "FRAME") {
+            kids.splice(0..0, self.shape_with_text(&mut o, &view, own, &rest_id));
+            kids.extend(self.inner_text(&o, &view, &rest_id, own == "STICKY"));
+        }
+        if !kids.is_empty() {
+            o.insert("children".into(), Value::Array(kids));
+        }
+        Some(Value::Object(o))
+    }
+
+    /// A non-rectangular shape-with-text's shape, as a vector under its frame (which gives up its
+    /// paints to it).
+    fn shape_with_text(&mut self, o: &mut Obj, v: &View<'a>, own: &str, rest_id: &str) -> Option<Value> {
+        let shape = v.str("shapeWithTextType").unwrap_or("SQUARE");
+        let outlined = !v.list("fillGeometry").is_empty() || !v.list("strokeGeometry").is_empty();
+        if own != "SHAPE_WITH_TEXT" || matches!(shape, "SQUARE" | "ROUNDED_RECTANGLE") || !outlined || self.count >= self.budget() {
+            return None;
+        }
+        let mut s = Obj::new();
+        s.insert("id".into(), json!(format!("{rest_id};shape")));
+        s.insert("type".into(), json!("VECTOR"));
+        s.insert("name".into(), json!(shape.to_ascii_lowercase().replace('_', " ")));
+        for k in ["size", "strokeWeight", "strokeAlign", "strokeJoin", "strokeDashes"] {
+            if let Some(x) = o.get(k) {
+                s.insert(k.into(), x.clone());
+            }
+        }
+        for k in ["fills", "strokes"] {
+            s.insert(k.into(), o.insert(k.into(), json!([])).unwrap_or_else(|| json!([])));
+        }
+        s.insert("relativeTransform".into(), rows(Affine::IDENTITY));
+        self.geometry(&mut s, v);
+        if !s.contains_key("fillGeometry") && !s.contains_key("strokeGeometry") {
+            // Damaged outlines: the frame keeps its paints and box.
+            for k in ["fills", "strokes"] {
+                o.insert(k.into(), s.remove(k).unwrap_or_else(|| json!([])));
+            }
+            return None;
+        }
+        self.count += 1;
+        Some(Value::Object(s))
+    }
+
+    /// The text a stand-in frame holds (a sticky note's, a shape's, a table cell's) as a text
+    /// layer filling it, inset a little; centred unless it's a note.
+    fn inner_text(&mut self, o: &Obj, v: &View<'a>, rest_id: &str, note: bool) -> Option<Value> {
+        let chars = own_text(v)?;
+        if self.count >= self.budget() {
+            return None;
+        }
+        self.count += 1;
+        let size = |k: &str| o.get("size").and_then(|s| s.get(k)).and_then(Value::as_f64).unwrap_or(0.0);
+        let (w, h) = (size("x"), size("y"));
+        let pad = (w.min(h) / 4.0).clamp(0.0, 16.0);
+        let mut t = Obj::new();
+        t.insert("id".into(), json!(format!("{rest_id};text")));
+        t.insert("type".into(), json!("TEXT"));
+        t.insert("name".into(), json!(chars.chars().take(40).collect::<String>()));
+        t.insert("size".into(), json!({"x": (w - 2.0 * pad).max(1.0), "y": (h - 2.0 * pad).max(1.0)}));
+        t.insert("relativeTransform".into(), rows(Affine::translate((pad, pad))));
+        self.text(&mut t, v);
+        if let Some(Value::Object(st)) = t.get_mut("style") {
+            let (hor, ver) = if note { ("LEFT", "TOP") } else { ("CENTER", "CENTER") };
+            st.entry("textAlignHorizontal").or_insert_with(|| json!(hor));
+            st.entry("textAlignVertical").or_insert_with(|| json!(ver));
+            st.insert("textAutoResize".into(), json!("NONE"));
+        }
+        Some(Value::Object(t))
+    }
+
+    /// Fields every layer type shares.
+    pub(super) fn common(&mut self, o: &mut Obj, v: &View<'a>, ty: &str, space: Affine, parent: Option<&View<'a>>) {
+        for (from, to) in [("visible", "visible"), ("locked", "locked"), ("mask", "isMask")] {
+            if let Some(b) = v.flag(from) {
+                o.insert(to.into(), json!(b));
+            }
+        }
+        if let Some(m) = v.str("maskType") {
+            o.insert("maskType".into(), json!(if m == "OUTLINE" { "VECTOR" } else { m }));
+        }
+        copy_num(o, v, "opacity", "opacity");
+        if let Some(b) = v.str("blendMode").filter(|b| *b != "UNSET") {
+            o.insert("blendMode".into(), json!(b));
+        }
+        if let Some((x, y)) = v.size() {
+            o.insert("size".into(), json!({"x": x, "y": y}));
+        }
+        let t = v.transform().unwrap_or_default();
+        o.insert("relativeTransform".into(), rows(space * t));
+        // Paints, from the shared style when one is linked (the layer's own copy can be stale),
+        // unless the layer's own paints are bound to variables: those bindings must not be lost.
+        let mut styles = Obj::new();
+        let own = |k: &str| Some(v.list(k)).filter(|l| l.iter().any(paint_bound));
+        let fill_style = self.style(v, "styleIdForFill", "inheritFillStyleID", "fill", &mut styles);
+        let fills = own("fillPaints")
+            .unwrap_or_else(|| fill_style.map_or_else(|| v.list("fillPaints"), |s| s.get("fillPaints").map(Kv::list).unwrap_or_default()));
+        o.insert("fills".into(), Value::Array(fills.iter().filter_map(|p| paint(p, &mut |w| self.warn(w))).collect()));
+        let stroke_style = self.style(v, "styleIdForStrokeFill", "inheritFillStyleIDForStroke", "stroke", &mut styles);
+        let strokes = own("strokePaints")
+            .unwrap_or_else(|| stroke_style.map_or_else(|| v.list("strokePaints"), |s| s.get("fillPaints").map(Kv::list).unwrap_or_default()));
+        o.insert("strokes".into(), Value::Array(strokes.iter().filter_map(|p| paint(p, &mut |w| self.warn(w))).collect()));
+        let effect_style = self.style(v, "styleIdForEffect", "inheritEffectStyleID", "effect", &mut styles);
+        let effects = effect_style.map_or_else(|| v.list("effects"), |s| s.get("effects").map(Kv::list).unwrap_or_default());
+        if !effects.is_empty() {
+            o.insert("effects".into(), Value::Array(effects.iter().filter_map(effect).collect()));
+        }
+        let grid_style = self.style(v, "styleIdForGrid", "inheritGridStyleID", "grid", &mut styles);
+        let grids = grid_style.map_or_else(|| v.list("layoutGrids"), |s| s.get("layoutGrids").map(Kv::list).unwrap_or_default());
+        if !grids.is_empty() {
+            o.insert("layoutGrids".into(), Value::Array(grids.iter().map(layout_grid).collect()));
+        }
+        if ty == "TEXT" {
+            self.style(v, "styleIdForText", "inheritTextStyleID", "text", &mut styles);
+        }
+        if !styles.is_empty() {
+            o.insert("styles".into(), Value::Object(styles));
+        }
+        stroke(o, v);
+        copy_num(o, v, "cornerRadius", "cornerRadius");
+        copy_num(o, v, "cornerSmoothing", "cornerSmoothing");
+        if v.flag("rectangleCornerRadiiIndependent") == Some(true) {
+            let r = |k: &str| v.num(k).unwrap_or(0.0);
+            o.insert(
+                "rectangleCornerRadii".into(),
+                json!([
+                    r("rectangleTopLeftCornerRadius"),
+                    r("rectangleTopRightCornerRadius"),
+                    r("rectangleBottomRightCornerRadius"),
+                    r("rectangleBottomLeftCornerRadius")
+                ]),
+            );
+        }
+        let constraint = |k: &str, min: &'static str, max: &'static str, both: &'static str| match v.str(k) {
+            Some("CENTER") => "CENTER",
+            Some("MAX" | "FIXED_MAX") => max,
+            Some("STRETCH") => both,
+            Some("SCALE") => "SCALE",
+            _ => min,
+        };
+        o.insert(
+            "constraints".into(),
+            json!({
+                "horizontal": constraint("horizontalConstraint", "LEFT", "RIGHT", "LEFT_RIGHT"),
+                "vertical": constraint("verticalConstraint", "TOP", "BOTTOM", "TOP_BOTTOM"),
+            }),
+        );
+        if matches!(ty, "FRAME" | "COMPONENT" | "COMPONENT_SET" | "INSTANCE" | "SECTION") {
+            o.insert("clipsContent".into(), json!(!v.flag("frameMaskDisabled").unwrap_or(false)));
+            self.auto_layout(o, v);
+        }
+        child_layout(o, v, parent);
+        let exports: Vec<Value> = v.list("exportSettings").iter().map(export_setting).collect();
+        if !exports.is_empty() {
+            o.insert("exportSettings".into(), Value::Array(exports));
+        }
+        if let Some(b) = v.flag("sectionContentsHidden") {
+            o.insert("sectionContentsHidden".into(), json!(b));
+        }
+        self.prototype(o, v);
+        self.variable_bindings(o, v);
+    }
+
+    /// `fillGeometry` / `strokeGeometry` as SVG path data, and star/polygon parameters.
+    pub(super) fn geometry(&mut self, o: &mut Obj, v: &View<'a>) {
+        for key in ["fillGeometry", "strokeGeometry"] {
+            let mut out = Vec::new();
+            for p in v.list(key) {
+                let Some(blob) = num(p, "commandsBlob").and_then(|i| self.blobs.get(i as usize)).copied() else { continue };
+                let Some(d) = svg_path(blob) else {
+                    self.warn("damaged vector geometry was skipped");
+                    continue;
+                };
+                if d.is_empty() {
+                    continue;
+                }
+                let winding = if p.get("windingRule").and_then(Kv::str) == Some("ODD") { "EVENODD" } else { "NONZERO" };
+                out.push(json!({"path": d, "windingRule": winding}));
+            }
+            if !out.is_empty() {
+                o.insert(key.into(), Value::Array(out));
+            }
+        }
+        let vector = o.get("type").and_then(Value::as_str) == Some("VECTOR");
+        if vector && !self.network(o, v) && !o.contains_key("fillGeometry") && !o.contains_key("strokeGeometry") && v.str("type") != Some("CONNECTOR")
+        {
+            self.warn("vectors without geometry are empty");
+        }
+        if !vector {
+            copy_num(o, v, "count", "pointCount");
+            copy_num(o, v, "starInnerScale", "innerRadius");
+        }
+    }
+
+    /// The editable network of `vectorData` as `vectorNetwork` (the REST importer's extension),
+    /// scaled to the layer's size, with per-point corner radii, handle mirroring and end caps.
+    /// False when there's none or it's damaged (the outlines stand in).
+    fn network(&mut self, o: &mut Obj, v: &View<'a>) -> bool {
+        let Some(vd) = v.get("vectorData") else { return false };
+        let Some(blob_id) = num(vd, "vectorNetworkBlob").map(|i| i as usize) else { return false };
+        let Some(blob) = self.blobs.get(blob_id).copied() else { return false };
+        let Some(net) = network::decode(blob) else {
+            self.warn("damaged vector networks import as outlines");
+            return false;
+        };
+        let styles: BTreeMap<u64, &Kv> =
+            vd.get("styleOverrideTable").map(Kv::list).unwrap_or_default().iter().filter_map(|s| Some((num(s, "styleID")? as u64, s))).collect();
+        let mut has_uninterpreted = false;
+        let mut has_missing = false;
+        for segment in &net.segments {
+            if segment.style == 0 {
+                continue;
+            }
+            if styles.contains_key(&u64::from(segment.style)) {
+                has_uninterpreted = true;
+            } else {
+                has_missing = true;
+            }
+        }
+        if has_uninterpreted {
+            self.warn("style settings of some vector segments aren't supported; those segments use the layer's stroke");
+        }
+        if has_missing {
+            self.warn("some vector segments refer to style settings missing from the file; they use the layer's stroke");
+        }
+        // An open path shows its fill, which regions can't hold: the outline keeps the look.
+        let fills_shown =
+            o.get("fills").and_then(Value::as_array).is_some_and(|f| f.iter().any(|p| p.get("visible").and_then(Value::as_bool) != Some(false)));
+        if net.segments.is_empty() || (net.regions.is_empty() && fills_shown && o.contains_key("fillGeometry")) {
+            return false;
+        }
+        let style = |id: u32| styles.get(&u64::from(id)).copied().filter(|_| id != 0);
+        let scale = |k: &str| {
+            let size = v.size().map(|s| if k == "x" { s.0 } else { s.1 });
+            let norm = vd.get("normalizedSize").and_then(|s| num(s, k));
+            size.zip(norm).filter(|(s, n)| s.is_finite() && *n > 1e-9).map_or(1.0, |(s, n)| s / n)
+        };
+        let (sx, sy) = (scale("x"), scale("y"));
+        // An absent layer join is the source default.
+        let layer_join = v.str("strokeJoin").unwrap_or("MITER");
+        let point_join = |p: &network::Vertex| style(p.style).and_then(|s| s.get("strokeJoin"));
+        let known = |j: &str| matches!(j, "MITER" | "BEVEL" | "ROUND");
+        let unresolved_style = net.vertices.iter().any(|p| p.style != 0 && style(p.style).is_none());
+        let unknown_join = net.vertices.iter().any(|p| point_join(p).is_some_and(|j| !j.str().is_some_and(known)));
+        let unsupported_join = net.vertices.iter().any(|p| point_join(p).and_then(Kv::str).is_some_and(|j| known(j) && j != layer_join));
+        if net.regions.iter().any(|r| style(r.style).is_some_and(|s| s.get("fillPaints").is_some())) {
+            self.warn("filled areas of a vector with their own fill use the layer's fill");
+        }
+        if unresolved_style {
+            self.warn("some vector points refer to point settings missing from the file; they use the layer's joins and plain corners");
+        }
+        if unknown_join {
+            self.warn("vector points with unknown stroke joins use the layer join");
+        }
+        if unsupported_join && (o.contains_key("strokeDashes") || o.contains_key("strokeWidthProfile")) {
+            self.warn("point stroke joins were preserved; dashed or variable-width strokes render with the layer join");
+        }
+        // The stroke starts at the first end point and stops at the last (as the editor draws it).
+        let mut degree = vec![0usize; net.vertices.len()];
+        for s in &net.segments {
+            for i in [s.a, s.b] {
+                if let Some(d) = degree.get_mut(i) {
+                    *d += 1;
+                }
+            }
+        }
+        let ends: Vec<usize> = (0..degree.len()).filter(|i| degree.get(*i) == Some(&1)).collect();
+        let cap =
+            |i: Option<&usize>| i.and_then(|i| net.vertices.get(*i)).and_then(|p| style(p.style)).and_then(|s| s.get("strokeCap")).and_then(Kv::str);
+        let (first, last) = (cap(ends.first()), cap(ends.last()));
+        if first.is_some() || last.is_some() {
+            let node = v.str("strokeCap").unwrap_or("NONE");
+            o.insert("strokeCapStart".into(), json!(cap_name(first.unwrap_or(node))));
+            o.insert("strokeCapEnd".into(), json!(cap_name(last.unwrap_or(node))));
+        }
+        // Every instance of a main shows the same network: it is written once and shared.
+        let key = (blob_id, sx.to_bits(), sy.to_bits(), std::ptr::from_ref(vd) as usize);
+        let id = match self.network_ids.get(&key) {
+            Some(id) => *id,
+            None => {
+                let vertices: Vec<Value> = net
+                    .vertices
+                    .iter()
+                    .map(|p| {
+                        let mut out = json!({"x": p.x * sx, "y": p.y * sy});
+                        let st = style(p.style);
+                        if let Some(r) = st.and_then(|s| num(s, "cornerRadius")).filter(|r| *r > 0.0) {
+                            out["radius"] = json!(r);
+                        }
+                        match st.and_then(|s| s.get("handleMirroring")).and_then(Kv::str) {
+                            Some("ANGLE") => out["mirror"] = json!("angle"),
+                            Some("ANGLE_AND_LENGTH") => out["mirror"] = json!("angleAndLength"),
+                            Some("NONE") => out["mirror"] = json!("none"),
+                            _ => {}
+                        }
+                        if let Some(join @ ("MITER" | "BEVEL" | "ROUND")) = st.and_then(|s| s.get("strokeJoin")).and_then(Kv::str) {
+                            out["join"] = json!(join.to_ascii_lowercase());
+                        }
+                        out
+                    })
+                    .collect();
+                let segments: Vec<Value> = net
+                    .segments
+                    .iter()
+                    .map(|s| json!({"a": s.a, "b": s.b, "ta": [s.ta.0 * sx, s.ta.1 * sy], "tb": [s.tb.0 * sx, s.tb.1 * sy]}))
+                    .collect();
+                let regions: Vec<Value> =
+                    net.regions.iter().map(|r| json!({"loops": r.loops, "winding": if r.non_zero { "nonZero" } else { "evenOdd" }})).collect();
+                let mut entry = json!({});
+                entry["vertices"] = Value::Array(vertices);
+                entry["segments"] = Value::Array(segments);
+                entry["regions"] = Value::Array(regions);
+                self.networks.push(crate::rest::network(&entry));
+                self.network_ids.insert(key, self.networks.len() - 1);
+                self.networks.len() - 1
+            }
+        };
+        o.insert("vectorNetworkRef".into(), json!(id));
+        true
+    }
+}
+
+/// The text a layer that isn't a text layer carries (a note's, a shape's), unless blank.
+pub(super) fn own_text<'a>(v: &View<'a>) -> Option<&'a str> {
+    v.get("textData").and_then(|t| t.get("characters")).and_then(Kv::str).filter(|c| !c.trim().is_empty())
+}
+
+pub(super) fn valid_size(value: Option<&Kv<'_>>) -> Option<(f64, f64)> {
+    let x = num(value?, "x")?;
+    let y = num(value?, "y")?;
+    (x.is_finite() && y.is_finite() && x >= 0.0 && y >= 0.0).then_some((x, y))
+}
+
+/// The REST name of a stroke cap.
+pub(super) fn cap_name(cap: &str) -> &str {
+    match cap {
+        "ARROW_LINES" => "LINE_ARROW",
+        "ARROW_EQUILATERAL" => "TRIANGLE_ARROW",
+        c => c,
+    }
+}
+
+/// The layer kind (and how the warning names it) that a layer the editor has no counterpart for
+/// imports as: frames for notes, shapes, tables, slides and the like (their text as a text layer),
+/// vectors for connectors and marker strokes, plain text for text on a path.
+fn stand_in(ty: &str) -> Option<(&'static str, &'static str)> {
+    Some(match ty {
+        "STICKY"
+        | "SHAPE_WITH_TEXT"
+        | "CODE_BLOCK"
+        | "TABLE"
+        | "TABLE_CELL"
+        | "STAMP"
+        | "MEDIA"
+        | "WIDGET"
+        | "SLIDE"
+        | "SLIDE_GRID"
+        | "SLIDE_ROW"
+        | "INTERACTIVE_SLIDE_ELEMENT"
+        | "MODULE" => ("FRAME", "frames with their text"),
+        "CONNECTOR" | "HIGHLIGHT" | "WASHI_TAPE" => ("VECTOR", "vectors"),
+        "TEXT_PATH" => ("TEXT", "text off its path"),
+        _ => return None,
+    })
+}
+
+/// How a layer sizes and sits in an auto layout parent.
+fn child_layout(o: &mut Obj, v: &View, parent: Option<&View>) {
+    copy_num(o, v, "stackChildPrimaryGrow", "layoutGrow");
+    if v.str("stackChildAlignSelf") == Some("STRETCH") {
+        o.insert("layoutAlign".into(), json!("STRETCH"));
+    }
+    if v.str("stackPositioning") == Some("ABSOLUTE") {
+        o.insert("layoutPositioning".into(), json!("ABSOLUTE"));
+    }
+    for (k, w, h) in [("minSize", "minWidth", "minHeight"), ("maxSize", "maxWidth", "maxHeight")] {
+        if let Some(val) = v.get(k).and_then(|s| s.get("value")) {
+            for (axis, to) in [("x", w), ("y", h)] {
+                if let Some(x) = num(val, axis).filter(|x| *x > 0.0 && *x < 1e9) {
+                    o.insert(to.into(), json!(x));
+                }
+            }
+        }
+    }
+    if let Some(p) = parent.filter(|p| p.str("stackMode") == Some("GRID")) {
+        for (anchor, list, to) in [("gridColumnAnchor", "gridColumns", "gridColumnAnchorIndex"), ("gridRowAnchor", "gridRows", "gridRowAnchorIndex")]
+        {
+            if let Some(i) = v.get(anchor).and_then(guid).and_then(|g| tracks(p, list).iter().position(|t| *t == g)) {
+                o.insert(to.into(), json!(i));
+            }
+        }
+        copy_num(o, v, "gridColumnSpan", "gridColumnSpan");
+        copy_num(o, v, "gridRowSpan", "gridRowSpan");
+    }
+}
+
+/// SVG path data of a geometry blob: commands `0` close, `1` move, `2` line, `3` quadratic and
+/// `4` cubic, each followed by its points as little-endian `f32` pairs. `None` when damaged.
+pub(super) fn svg_path(b: &[u8]) -> Option<String> {
+    let mut out = String::new();
+    let mut i = 0usize;
+    let mut n = 0usize;
+    while i < b.len() {
+        n += 1;
+        if n > MAX_COMMANDS {
+            return None;
+        }
+        let (letter, points) = match *b.get(i)? {
+            0 => ('Z', 0),
+            1 => ('M', 1),
+            2 => ('L', 1),
+            3 => ('Q', 2),
+            4 => ('C', 3),
+            _ => return None,
+        };
+        i += 1;
+        if !out.is_empty() {
+            out.push(' ');
+        }
+        out.push(letter);
+        for _ in 0..points * 2 {
+            let bytes: [u8; 4] = b.get(i..i + 4)?.try_into().ok()?;
+            let x = f32::from_le_bytes(bytes);
+            if !x.is_finite() {
+                return None;
+            }
+            out.push_str(&format!(" {x}"));
+            i += 4;
+        }
+    }
+    Some(out)
+}
diff --git a/crates/format/src/fig/map/layout.rs b/crates/format/src/fig/map/layout.rs
new file mode 100644
index 00000000..f4d50891
--- /dev/null
+++ b/crates/format/src/fig/map/layout.rs
@@ -0,0 +1,188 @@
+use super::paint::{bound, color};
+use super::*;
+
+impl<'a> Mapper<'a> {
+    pub(super) fn auto_layout(&mut self, o: &mut Obj, v: &View<'a>) {
+        let Some(mode) = v.str("stackMode").filter(|m| matches!(*m, "HORIZONTAL" | "VERTICAL" | "GRID")) else { return };
+        o.insert("layoutMode".into(), json!(mode));
+        copy_num(o, v, "stackSpacing", "itemSpacing");
+        copy_num(o, v, "stackCounterSpacing", "counterAxisSpacing");
+        if v.str("stackWrap") == Some("WRAP") {
+            o.insert("layoutWrap".into(), json!("WRAP"));
+        }
+        if v.str("stackCounterAlignContent") == Some("SPACE_BETWEEN") {
+            o.insert("counterAxisAlignContent".into(), json!("SPACE_BETWEEN"));
+        }
+        let (h, vert) = (v.num("stackHorizontalPadding").unwrap_or(0.0), v.num("stackVerticalPadding").unwrap_or(0.0));
+        o.insert("paddingLeft".into(), json!(h));
+        o.insert("paddingTop".into(), json!(vert));
+        o.insert("paddingRight".into(), json!(v.num("stackPaddingRight").unwrap_or(h)));
+        o.insert("paddingBottom".into(), json!(v.num("stackPaddingBottom").unwrap_or(vert)));
+        let main = match v.str("stackPrimaryAlignItems").or_else(|| v.str("stackJustify")) {
+            Some("CENTER") => "CENTER",
+            Some("MAX") => "MAX",
+            Some("SPACE_AROUND") => "SPACE_AROUND",
+            // `SPACE_EVENLY` is the format's older name for equal gaps without edge space.
+            Some("SPACE_EVENLY_CSS") => "SPACE_EVENLY",
+            Some("SPACE_BETWEEN" | "SPACE_EVENLY") => "SPACE_BETWEEN",
+            _ => "MIN",
+        };
+        o.insert("primaryAxisAlignItems".into(), json!(main));
+        let cross = match v.str("stackCounterAlignItems").or_else(|| v.str("stackAlign")) {
+            Some("CENTER") => "CENTER",
+            Some("MAX") => "MAX",
+            Some("BASELINE") => "BASELINE",
+            _ => "MIN",
+        };
+        o.insert("counterAxisAlignItems".into(), json!(cross));
+        let sizing = |k: &str| if v.str(k).is_some_and(|s| s.starts_with("RESIZE_TO_FIT")) { "AUTO" } else { "FIXED" };
+        // A flow that records no sizing for its primary axis sizes it by its content: auto layout
+        // did before that axis could be fixed.
+        let primary = if v.get("stackPrimarySizing").is_none() && mode != "GRID" { "AUTO" } else { sizing("stackPrimarySizing") };
+        o.insert("primaryAxisSizingMode".into(), json!(primary));
+        o.insert("counterAxisSizingMode".into(), json!(sizing("stackCounterSizing")));
+        if let Some(b) = v.flag("bordersTakeSpace") {
+            o.insert("strokesIncludedInLayout".into(), json!(b));
+        }
+        if let Some(b) = v.flag("stackReverseZIndex") {
+            o.insert("itemReverseZIndex".into(), json!(b));
+        }
+        if mode == "GRID" {
+            copy_num(o, v, "gridColumnGap", "gridColumnGap");
+            copy_num(o, v, "gridRowGap", "gridRowGap");
+            o.insert("gridColumnCount".into(), json!(tracks(v, "gridColumns").len()));
+            o.insert("gridRowCount".into(), json!(tracks(v, "gridRows").len()));
+            let track_data = [("columnTracks", "gridColumns", "gridColumnsSizing"), ("rowTracks", "gridRows", "gridRowsSizing")]
+                .into_iter()
+                .filter_map(|(out_key, order_key, sizing_key)| {
+                    self.map_grid_tracks(v, order_key, sizing_key).map(|mapped| (out_key.to_string(), mapped))
+                })
+                .collect::<Obj>();
+            if !track_data.is_empty() {
+                let source = o.entry(crate::rest::FIG_SOURCE_FIELD).or_insert_with(|| json!({}));
+                if let Some(source) = source.as_object_mut() {
+                    source.insert("gridTracks".into(), Value::Object(track_data));
+                }
+            }
+        }
+    }
+
+    /// Track sizing maps are keyed by GUID; their order comes from the separate track list.
+    fn map_grid_tracks(&mut self, v: &View<'a>, order_key: &str, sizing_key: &str) -> Option<Value> {
+        let track_entries = v.get(order_key).and_then(|m| m.get("entries")).map(Kv::list).unwrap_or_default();
+        let sizes = v.get(sizing_key).and_then(|m| m.get("entries")).map(Kv::list).unwrap_or_default();
+        if track_entries.len() > MAX_GRID_TRACKS {
+            self.warn("grid track list exceeds 1000 entries; the tracks use the default equal sizing");
+            return None;
+        }
+        if sizes.is_empty() {
+            return None;
+        }
+        if sizes.len() > MAX_GRID_TRACKS {
+            self.warn("grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing");
+            return None;
+        }
+        let ordered = tracks(v, order_key);
+        let ordered_ids: BTreeSet<&str> = ordered.iter().map(String::as_str).collect();
+        let mut size_by_id: BTreeMap<String, Option<&Kv<'a>>> = BTreeMap::new();
+        for entry in sizes {
+            let Some(id) = entry.get("id").and_then(guid) else {
+                self.warn("stale or invalid grid track sizing entries were ignored");
+                continue;
+            };
+            if !ordered_ids.contains(id.as_str()) {
+                self.warn("stale or invalid grid track sizing entries were ignored");
+                continue;
+            }
+            match size_by_id.entry(id) {
+                std::collections::btree_map::Entry::Vacant(slot) => {
+                    slot.insert(Some(entry));
+                }
+                std::collections::btree_map::Entry::Occupied(mut slot) => {
+                    slot.insert(None);
+                    self.warn("duplicate grid track sizing entries use equal tracks");
+                }
+            }
+        }
+        let mut mapped = Vec::with_capacity(ordered.len());
+        for id in ordered {
+            if let Some(Some(entry)) = size_by_id.get(&id) {
+                match grid_track_sizing(entry.get("trackSize")) {
+                    Some(track) => mapped.push(track),
+                    None => {
+                        self.warn("grid track sizing is unsupported or malformed; affected tracks use equal sizing");
+                        mapped.push(json!({"sizing": "fill", "value": 1.0}));
+                    }
+                }
+            } else {
+                mapped.push(json!({"sizing": "fill", "value": 1.0}));
+            }
+        }
+        Some(Value::Array(mapped))
+    }
+}
+
+/// The track ids of a grid's columns or rows, in order.
+pub(super) fn tracks(v: &View, key: &str) -> Vec<String> {
+    let mut t: Vec<(&str, String)> = v
+        .get(key)
+        .and_then(|m| m.get("entries"))
+        .map(Kv::list)
+        .unwrap_or_default()
+        .iter()
+        .filter_map(|e| Some((e.get("position").and_then(Kv::str).unwrap_or(""), e.get("id").and_then(guid)?)))
+        .collect();
+    t.sort();
+    t.into_iter().map(|e| e.1).collect()
+}
+
+/// Convert only unconstrained tracks, whose min and max sizing functions agree.
+fn grid_track_sizing(size: Option<&Kv<'_>>) -> Option<Value> {
+    let size = size?;
+    let min = size.get("minSizing")?;
+    let max = size.get("maxSizing")?;
+    let min_type = min.get("type").and_then(Kv::str)?;
+    let max_type = max.get("type").and_then(Kv::str)?;
+    if min_type != max_type {
+        return None;
+    }
+    match min_type {
+        "FIXED" => {
+            let px = num(min, "value")?;
+            let max_px = num(max, "value")?;
+            (px == max_px && px.is_finite() && (0.0..=MAX_GRID_TRACK_VALUE).contains(&px)).then(|| json!({"sizing": "fixed", "value": px}))
+        }
+        "FLEX" => {
+            let fr = num(min, "value")?;
+            let max_fr = num(max, "value")?;
+            (fr == max_fr && fr.is_finite() && fr > 0.0 && fr <= MAX_GRID_TRACK_VALUE).then(|| json!({"sizing": "fill", "value": fr}))
+        }
+        "HUG" => Some(json!({"sizing": "hug", "value": 0.0})),
+        _ => None,
+    }
+}
+
+pub(super) fn layout_grid(g: &Kv) -> Value {
+    let pattern = match (g.get("pattern").and_then(Kv::str), g.get("axis").and_then(Kv::str)) {
+        (Some("GRID"), _) => "GRID",
+        (_, Some("Y")) => "ROWS",
+        _ => "COLUMNS",
+    };
+    let mut o = json!({"pattern": pattern, "alignment": g.get("type").and_then(Kv::str).unwrap_or("STRETCH")});
+    for (from, to) in [("sectionSize", "sectionSize"), ("numSections", "count"), ("gutterSize", "gutterSize"), ("offset", "offset")] {
+        if let Some(x) = num(g, from) {
+            o[to] = json!(x);
+        }
+    }
+    if let Some(c) = g.get("color") {
+        o["color"] = color(c);
+    }
+    if let Some(b) = g.get("visible").and_then(Kv::bool) {
+        o["visible"] = json!(b);
+    }
+    let vars = [("numSectionsVar", "count"), ("offsetVar", "offset"), ("sectionSizeVar", "sectionSize"), ("gutterSizeVar", "gutterSize")];
+    if let Some(b) = bound(Some(g), &vars) {
+        o["boundVariables"] = b;
+    }
+    o
+}
diff --git a/crates/format/src/fig/map/paint.rs b/crates/format/src/fig/map/paint.rs
new file mode 100644
index 00000000..fe8cfa7b
--- /dev/null
+++ b/crates/format/src/fig/map/paint.rs
@@ -0,0 +1,291 @@
+use super::layer::cap_name;
+use super::variables::alias;
+use super::*;
+
+fn filter_number(value: &Kv) -> Option<f64> {
+    let number = match value {
+        Kv::Float(value) => f64::from(*value),
+        Kv::Int(value) => *value as f64,
+        Kv::Uint(value) => *value as f64,
+        _ => return None,
+    };
+    number.is_finite().then_some(number)
+}
+
+/// The style a layer links in `key`, or in the older `legacy` field when `key` names none. An
+/// explicit NO_STYLE in `key` is a detach and wins over the legacy field.
+pub(super) fn style_link(v: &View, key: &str, legacy: &str) -> Option<String> {
+    match v.get(key).and_then(|r| r.get("guid")).and_then(guid) {
+        Some(id) => Some(id).filter(|g| g != NO_STYLE),
+        None => v.get(legacy).and_then(guid).filter(|g| g != NO_STYLE),
+    }
+}
+
+pub(super) fn color(c: &Kv) -> Value {
+    let ch = |k: &str| num(c, k).unwrap_or(0.0);
+    json!({"r": ch("r"), "g": ch("g"), "b": ch("b"), "a": num(c, "a").unwrap_or(1.0)})
+}
+
+impl<'a> Mapper<'a> {
+    /// The style node a layer links in `key` (or the older `legacy` field), recorded for the REST
+    /// `styles` map under `slot`.
+    pub(super) fn style(&mut self, v: &View<'a>, key: &str, legacy: &str, slot: &str, out: &mut Obj) -> Option<&'a Kv<'a>> {
+        let id = style_link(v, key, legacy)?;
+        let node = *self.nodes.get(&id)?;
+        node.get("styleType").and_then(Kv::str)?;
+        out.insert(slot.into(), json!(id));
+        if !self.styles.contains_key(&id) {
+            let name = node.get("name").and_then(Kv::str).unwrap_or("Style");
+            let desc = node.get("styleDescription").or_else(|| node.get("description")).and_then(Kv::str).unwrap_or("");
+            self.styles.insert(id, json!({"name": name, "description": desc}));
+        }
+        Some(node)
+    }
+}
+
+pub(super) fn stroke(o: &mut Obj, v: &View) {
+    copy_num(o, v, "strokeWeight", "strokeWeight");
+    if let Some(a) = v.str("strokeAlign").filter(|a| *a != "OFFSET") {
+        o.insert("strokeAlign".into(), json!(a));
+    }
+    copy_str(o, v, "strokeJoin", "strokeJoin");
+    if let Some(cap) = v.str("strokeCap") {
+        o.insert("strokeCap".into(), json!(cap_name(cap)));
+    }
+    // A layer written as the outline of its stroke keeps what it was as plugin data
+    // (`outlinedStroke`, our extension of the file JSON).
+    let (id, key) = crate::fig::export::STASH;
+    let kept = v.list("pluginData").iter().find(|p| p.get("pluginID").and_then(Kv::str) == Some(id) && p.get("key").and_then(Kv::str) == Some(key));
+    if let Some(original) = kept.and_then(|p| p.get("value")).and_then(Kv::str).and_then(|s| serde_json::from_str::<Value>(s).ok()) {
+        o.insert("outlinedStroke".into(), original);
+    }
+    // A variable width: each point's reach on the two sides of the path (shares of the stroke
+    // weight), as `[t, scale, bias]` (`strokeWidthProfile`, our extension of the file JSON).
+    let profile: Vec<Value> = v
+        .list("variableWidthPoints")
+        .iter()
+        .filter_map(|p| {
+            let (left, right) = (num(p, "ascent")?.max(0.0), num(p, "descent")?.max(0.0));
+            let bias = if left + right > 0.0 { (right - left) / (left + right) } else { 0.0 };
+            Some(json!([num(p, "position")?, left + right, bias]))
+        })
+        .collect();
+    if !profile.is_empty() {
+        o.insert("strokeWidthProfile".into(), Value::Array(profile));
+    }
+    let dashes: Vec<f64> = v.list("dashPattern").iter().filter_map(Kv::f64).collect();
+    if !dashes.is_empty() {
+        o.insert("strokeDashes".into(), json!(dashes));
+    }
+    // A miter limit L bevels joins sharper than 2·asin(1/L).
+    if let Some(l) = v.num("miterLimit").filter(|l| *l > 1.0) {
+        o.insert("strokeMiterAngle".into(), json!((2.0 * (1.0 / l).asin()).to_degrees()));
+    }
+    if v.flag("borderStrokeWeightsIndependent") == Some(true) {
+        // A side that isn't written has no border.
+        let side = |k: &str| v.num(k).unwrap_or(0.0);
+        o.insert(
+            "individualStrokeWeights".into(),
+            json!({"top": side("borderTopWeight"), "right": side("borderRightWeight"), "bottom": side("borderBottomWeight"), "left": side("borderLeftWeight")}),
+        );
+    }
+}
+
+/// Whether a paint's colour or one of its gradient stops is bound to a variable.
+pub(super) fn paint_bound(p: &Kv) -> bool {
+    alias(p.get("colorVar")).is_some() || p.get("stopsVar").map(Kv::list).unwrap_or_default().iter().any(|s| alias(s.get("colorVar")).is_some())
+}
+
+pub(crate) fn paint(p: &Kv, warn: &mut dyn FnMut(String)) -> Option<Value> {
+    let ty = p.get("type").and_then(Kv::str)?;
+    let mut o = Obj::new();
+    o.insert("type".into(), json!(ty));
+    if let Some(x) = num(p, "opacity") {
+        o.insert("opacity".into(), json!(x));
+    }
+    if let Some(b) = p.get("visible").and_then(Kv::bool) {
+        o.insert("visible".into(), json!(b));
+    }
+    if let Some(b) = p.get("blendMode").and_then(Kv::str) {
+        o.insert("blendMode".into(), json!(b));
+    }
+    let t = p.get("transform").and_then(matrix);
+    match ty {
+        "SOLID" => {
+            if let Some(c) = p.get("color") {
+                o.insert("color".into(), color(c));
+            }
+            if let Some(var) = alias(p.get("colorVar")) {
+                o.insert("boundVariables".into(), json!({"color": {"type": "VARIABLE_ALIAS", "id": var}}));
+            }
+        }
+        _ if ty.starts_with("GRADIENT_") => {
+            // The paint transform maps the layer's unit box to gradient space, where a linear
+            // gradient runs from (0, ½) to (1, ½) and the others are centred on (½, ½).
+            let inv = t.filter(|t| t.determinant().abs() > 1e-12).map_or(Affine::IDENTITY, Affine::inverse);
+            let pts = if ty == "GRADIENT_LINEAR" { [(0.0, 0.5), (1.0, 0.5), (0.0, 1.0)] } else { [(0.5, 0.5), (1.0, 0.5), (0.5, 1.0)] };
+            let handles: Vec<Value> = pts
+                .iter()
+                .map(|(x, y)| {
+                    let q = inv * Point::new(*x, *y);
+                    json!({"x": q.x, "y": q.y})
+                })
+                .collect();
+            o.insert("gradientHandlePositions".into(), Value::Array(handles));
+            // Stops bound to variables are listed again, each with its variable.
+            let vars = p.get("stopsVar").map(Kv::list).unwrap_or_default();
+            let stops: Vec<Value> = p
+                .get("stops")
+                .map(Kv::list)
+                .unwrap_or_default()
+                .iter()
+                .enumerate()
+                .map(|(i, s)| {
+                    let mut stop = json!({"position": num(s, "position").unwrap_or(0.0), "color": s.get("color").map_or(Value::Null, color)});
+                    if let Some(b) = bound(vars.get(i), &[("colorVar", "color")]) {
+                        stop["boundVariables"] = b;
+                    }
+                    stop
+                })
+                .collect();
+            o.insert("gradientStops".into(), Value::Array(stops));
+        }
+        "IMAGE" => {
+            let hash: String =
+                p.get("image").and_then(|i| i.get("hash")).and_then(Kv::bytes).unwrap_or_default().iter().map(|b| format!("{b:02x}")).collect();
+            o.insert("imageRef".into(), json!(hash));
+            let mode = p.get("imageScaleMode").and_then(Kv::str).unwrap_or("FILL");
+            o.insert("scaleMode".into(), json!(mode));
+            if let (Some(t), "STRETCH") = (t, mode) {
+                o.insert("imageTransform".into(), rows(t));
+            }
+            if let Some(s) = num(p, "scale") {
+                o.insert("scalingFactor".into(), json!(s));
+            }
+            if let Some(r) = num(p, "rotation") {
+                o.insert("rotation".into(), json!(r));
+            }
+            match (p.get("filterColorAdjust"), p.get("paintFilter")) {
+                (Some(_), Some(_)) => {
+                    warn("image filters are ambiguous because both filter containers are present; filter conversion was skipped".into())
+                }
+                (Some(_), None) => warn("legacy image filter container is unsupported; filter conversion was skipped".into()),
+                (None, Some(filters)) => {
+                    let mut mapped = Obj::new();
+                    let fields = [
+                        ("exposure", "exposure"),
+                        ("contrast", "contrast"),
+                        ("vibrance", "saturation"),
+                        ("temperature", "temperature"),
+                        ("tint", "tint"),
+                        ("highlights", "highlights"),
+                        ("shadows", "shadows"),
+                    ];
+                    if let Kv::Object(values) = filters {
+                        for (source, target) in fields {
+                            if let Some(value) = filters.get(source) {
+                                match filter_number(value) {
+                                    Some(value) => {
+                                        mapped.insert(target.into(), json!(value));
+                                    }
+                                    None => warn(format!("malformed image filter `{source}` was skipped")),
+                                }
+                            }
+                        }
+                        for (name, value) in values {
+                            if fields.iter().any(|(known, _)| *known == *name) {
+                                continue;
+                            }
+                            match filter_number(value) {
+                                Some(0.0) => {}
+                                Some(_) => warn(format!("nonzero unsupported image filter `{}` was skipped", crate::rest::props::clip_str(name))),
+                                None => warn(format!("malformed unsupported image filter `{}` was skipped", crate::rest::props::clip_str(name))),
+                            }
+                        }
+                    } else {
+                        warn("malformed image paintFilter container was skipped".into());
+                    }
+                    if !mapped.is_empty() {
+                        o.insert("filters".into(), Value::Object(mapped));
+                    }
+                }
+                (None, None) => {}
+            }
+        }
+        _ => {}
+    }
+    Some(Value::Object(o))
+}
+
+/// The variables bound to the fields of a paint stop, an effect or a layout grid, as its REST
+/// `boundVariables`: `fields` pairs the format's field with the REST name.
+pub(super) fn bound(v: Option<&Kv>, fields: &[(&str, &str)]) -> Option<Value> {
+    let v = v?;
+    let found: Obj =
+        fields.iter().filter_map(|(from, to)| Some((to.to_string(), json!({"type": "VARIABLE_ALIAS", "id": alias(v.get(from))?})))).collect();
+    (!found.is_empty()).then_some(Value::Object(found))
+}
+
+pub(super) fn effect(e: &Kv) -> Option<Value> {
+    let ty = match e.get("type").and_then(Kv::str)? {
+        "FOREGROUND_BLUR" => "LAYER_BLUR",
+        "GRAIN" => "TEXTURE",
+        t => t,
+    };
+    let mut o = Obj::new();
+    o.insert("type".into(), json!(ty));
+    for k in ["radius", "spread", "startRadius", "density", "opacity"] {
+        if let Some(x) = num(e, k) {
+            o.insert(k.into(), json!(x));
+        }
+    }
+    for k in ["visible", "showShadowBehindNode", "clipToShape"] {
+        if let Some(b) = e.get(k).and_then(Kv::bool) {
+            o.insert(k.into(), json!(b));
+        }
+    }
+    for k in ["blendMode", "noiseType"] {
+        if let Some(s) = e.get(k).and_then(Kv::str) {
+            o.insert(k.into(), json!(s));
+        }
+    }
+    for k in ["color", "secondaryColor"] {
+        if let Some(c) = e.get(k) {
+            o.insert(k.into(), color(c));
+        }
+    }
+    for (from, to) in [("offset", "offset"), ("startOffset", "startOffset"), ("endOffset", "endOffset"), ("noiseSize", "noiseSizeVector")] {
+        if let Some(p) = e.get(from).and_then(vec2) {
+            o.insert(to.into(), p);
+        }
+    }
+    if e.get("blurOpType").and_then(Kv::str) == Some("PROGRESSIVE") {
+        o.insert("blurType".into(), json!("PROGRESSIVE"));
+    }
+    let vars = [
+        ("colorVar", "color"),
+        ("radiusVar", "radius"),
+        ("spreadVar", "spread"),
+        ("xVar", "offsetX"),
+        ("yVar", "offsetY"),
+        ("startRadiusVar", "startRadius"),
+    ];
+    if let Some(b) = bound(Some(e), &vars) {
+        o.insert("boundVariables".into(), b);
+    }
+    Some(Value::Object(o))
+}
+
+pub(super) fn export_setting(e: &Kv) -> Value {
+    let c = e.get("constraint");
+    let ty = match c.and_then(|c| c.get("type")).and_then(Kv::str) {
+        Some("CONTENT_WIDTH") => "WIDTH",
+        Some("CONTENT_HEIGHT") => "HEIGHT",
+        _ => "SCALE",
+    };
+    json!({
+        "format": e.get("imageType").and_then(Kv::str).unwrap_or("PNG"),
+        "suffix": e.get("suffix").and_then(Kv::str).unwrap_or(""),
+        "constraint": {"type": ty, "value": c.and_then(|c| num(c, "value")).unwrap_or(1.0)},
+    })
+}
diff --git a/crates/format/src/fig/map/proto.rs b/crates/format/src/fig/map/proto.rs
new file mode 100644
index 00000000..d3f5c022
--- /dev/null
+++ b/crates/format/src/fig/map/proto.rs
@@ -0,0 +1,179 @@
+use super::paint::color;
+use super::variables::variable_data;
+use super::*;
+
+impl<'a> Mapper<'a> {
+    pub(super) fn prototype(&mut self, o: &mut Obj, v: &View<'a>) {
+        let mut list = Vec::new();
+        for it in v.list("prototypeInteractions") {
+            if it.get("isDeleted").and_then(Kv::bool) == Some(true) {
+                continue;
+            }
+            if let Some(i) = self.interaction(it) {
+                list.push(i);
+            }
+        }
+        if !list.is_empty() {
+            o.insert("interactions".into(), Value::Array(list));
+        }
+        let overflow = match v.str("scrollDirection") {
+            Some("HORIZONTAL") => Some("HORIZONTAL_SCROLLING"),
+            Some("VERTICAL") => Some("VERTICAL_SCROLLING"),
+            Some("BOTH") => Some("HORIZONTAL_AND_VERTICAL_SCROLLING"),
+            _ => None,
+        };
+        if let Some(d) = overflow {
+            o.insert("overflowDirection".into(), json!(d));
+        }
+        let behavior = match v.str("scrollBehavior") {
+            Some("FIXED_WHEN_CHILD_OF_SCROLLING_FRAME") => Some("FIXED"),
+            Some("STICKY_SCROLLS") => Some("STICKY_SCROLLS"),
+            _ => None,
+        };
+        if let Some(b) = behavior {
+            o.insert("scrollBehavior".into(), json!(b));
+        }
+        copy_str(o, v, "overlayPositionType", "overlayPositionType");
+        copy_str(o, v, "overlayBackgroundInteraction", "overlayBackgroundInteraction");
+        if let Some(a) = v.get("overlayBackgroundAppearance") {
+            let ty = a.get("backgroundType").and_then(Kv::str).unwrap_or("NONE");
+            o.insert("overlayBackground".into(), json!({"type": ty, "color": a.get("backgroundColor").map_or(Value::Null, color)}));
+        }
+    }
+
+    fn interaction(&mut self, it: &Kv) -> Option<Value> {
+        let ev = it.get("event");
+        let ty = match ev.and_then(|e| e.get("interactionType")).and_then(Kv::str).unwrap_or("ON_CLICK") {
+            "DRAG" => "ON_DRAG",
+            "MOUSE_IN" => "MOUSE_ENTER",
+            "MOUSE_OUT" => "MOUSE_LEAVE",
+            t => t,
+        };
+        let mut trigger = json!({"type": ty});
+        if let Some(t) = ev.and_then(|e| num(e, "transitionTimeout")) {
+            // Seconds as 32-bit floats: whole milliseconds.
+            trigger["timeout"] = json!((t * 1000.0).round());
+        }
+        if let Some(k) = ev.and_then(|e| e.get("keyTrigger")) {
+            let codes: Vec<f64> = k.get("keyCodes").map(Kv::list).unwrap_or_default().iter().filter_map(Kv::f64).collect();
+            trigger["keyCodes"] = json!(codes);
+            if let Some(d) = k.get("triggerDevice").and_then(Kv::str) {
+                trigger["device"] = json!(if d.contains("KEYBOARD") { "KEYBOARD" } else { d });
+            }
+        }
+        let actions: Vec<Value> = it.get("actions").map(Kv::list).unwrap_or_default().iter().filter_map(|a| self.action(a, 0)).collect();
+        (!actions.is_empty()).then(|| json!({"trigger": trigger, "actions": actions}))
+    }
+
+    /// One prototype action in the REST shape (`depth`: conditionals it's nested in).
+    fn action(&mut self, a: &Kv, depth: usize) -> Option<Value> {
+        Some(match a.get("connectionType").and_then(Kv::str) {
+            Some("INTERNAL_NODE") | None => {
+                let dest = a.get("transitionNodeID").and_then(guid)?;
+                let nav = match a.get("navigationType").and_then(Kv::str) {
+                    Some("SWAP_STATE") => "CHANGE_TO",
+                    Some(n) => n,
+                    None => "NAVIGATE",
+                };
+                let mut act = json!({"type": "NODE", "destinationId": dest, "navigation": nav});
+                if let Some(t) = transition(a) {
+                    act["transition"] = t;
+                }
+                if let Some(b) = a.get("transitionPreserveScroll").and_then(Kv::bool) {
+                    act["preserveScrollPosition"] = json!(b);
+                }
+                if let Some(p) = a.get("overlayRelativePosition") {
+                    act["overlayRelativePosition"] = json!({"x": num(p, "x"), "y": num(p, "y")});
+                }
+                act
+            }
+            Some("URL") => json!({"type": "URL", "url": a.get("connectionURL").and_then(Kv::str)?}),
+            Some("BACK") => json!({"type": "BACK"}),
+            Some("CLOSE") => json!({"type": "CLOSE"}),
+            Some("NONE") => return None,
+            Some("SET_VARIABLE") => {
+                let var = a.get("targetVariable").and_then(|t| t.get("id")).and_then(ref_guid).or_else(|| a.get("targetVariableID").and_then(guid));
+                // Missing parts are left out: the REST importer skips the action with a warning.
+                let mut act = json!({"type": "SET_VARIABLE", "variableId": var});
+                if let Some(d) = a.get("targetVariableData").and_then(|d| variable_data(d, 0)) {
+                    act["variableValue"] = d;
+                }
+                act
+            }
+            Some("SET_VARIABLE_MODE") => json!({
+                "type": "SET_VARIABLE_MODE",
+                "variableCollectionId": a.get("targetVariableSetID").and_then(ref_guid),
+                "variableModeId": a.get("targetVariableModeID").and_then(guid),
+            }),
+            Some("CONDITIONAL") if depth < MAX_ACTION_DEPTH => {
+                let mut blocks = Vec::new();
+                for b in a.get("conditionalActions").map(Kv::list).unwrap_or_default() {
+                    let actions: Vec<Value> =
+                        b.get("actions").map(Kv::list).unwrap_or_default().iter().filter_map(|x| self.action(x, depth + 1)).collect();
+                    let mut block = json!({"actions": actions});
+                    // A condition that can't be read must not turn the block into an "else".
+                    if let Some(c) = b.get("condition") {
+                        block["condition"] = variable_data(c, 0).unwrap_or_else(|| json!({}));
+                    }
+                    blocks.push(block);
+                }
+                json!({"type": "CONDITIONAL", "conditionalBlocks": blocks})
+            }
+            Some(other) => {
+                self.warn(format!("{} prototype actions are not imported from .fig files yet", other.to_ascii_lowercase().replace('_', " ")));
+                return None;
+            }
+        })
+    }
+}
+
+/// A prototype action's transition (`None`: instant).
+fn transition(a: &Kv) -> Option<Value> {
+    let ty = a.get("transitionType").and_then(Kv::str)?;
+    // Directions name where the incoming screen moves (SLIDE_FROM_LEFT moves right).
+    let (kind, dir) = match ty {
+        "INSTANT_TRANSITION" => return None,
+        "DISSOLVE" | "FADE" => ("DISSOLVE", None),
+        "SMART_ANIMATE" | "MAGIC_MOVE" => ("SMART_ANIMATE", None),
+        "SCROLL_ANIMATE" => ("SCROLL_ANIMATE", None),
+        t => {
+            let prefixes = [
+                ("SLIDE_FROM_", "SLIDE_IN"),
+                ("PUSH_FROM_", "PUSH"),
+                ("MOVE_FROM_", "MOVE_IN"),
+                ("SLIDE_OUT_TO_", "SLIDE_OUT"),
+                ("MOVE_OUT_TO_", "MOVE_OUT"),
+            ];
+            let (kind, side) = prefixes.iter().find_map(|(p, k)| t.strip_prefix(p).map(|r| (*k, r)))?;
+            let incoming = matches!(kind, "SLIDE_IN" | "PUSH" | "MOVE_IN");
+            let dir = match (side, incoming) {
+                ("LEFT", true) | ("RIGHT", false) => "RIGHT",
+                ("RIGHT", true) | ("LEFT", false) => "LEFT",
+                ("TOP", true) | ("BOTTOM", false) => "BOTTOM",
+                _ => "TOP",
+            };
+            (kind, Some(dir))
+        }
+    };
+    let easing = match a.get("easingType").and_then(Kv::str) {
+        Some("IN_CUBIC" | "EASE_IN") => "EASE_IN",
+        Some("INOUT_CUBIC") => "EASE_IN_AND_OUT",
+        Some("LINEAR") => "LINEAR",
+        Some("IN_BACK_CUBIC") => "EASE_IN_BACK",
+        Some("OUT_BACK_CUBIC") => "EASE_OUT_BACK",
+        Some("INOUT_BACK_CUBIC") => "EASE_IN_AND_OUT_BACK",
+        Some("GENTLE_SPRING") => "GENTLE",
+        Some("CUSTOM_CUBIC") => "CUSTOM_CUBIC_BEZIER",
+        _ => "EASE_OUT",
+    };
+    let mut e = json!({"type": easing});
+    let f: Vec<f64> = a.get("easingFunction").map(Kv::list).unwrap_or_default().iter().filter_map(Kv::f64).collect();
+    if let (true, [x1, y1, x2, y2, ..]) = (easing == "CUSTOM_CUBIC_BEZIER", f.as_slice()) {
+        e["easingFunctionCubicBezier"] = json!({"x1": x1, "y1": y1, "x2": x2, "y2": y2});
+    }
+    let mut t = json!({"type": kind, "duration": (num(a, "transitionDuration").unwrap_or(0.3) * 1000.0).round(), "easing": e});
+    if let Some(d) = dir {
+        t["direction"] = json!(d);
+    }
+    Some(t)
+}
diff --git a/crates/format/src/fig/map/text.rs b/crates/format/src/fig/map/text.rs
new file mode 100644
index 00000000..7431fbb5
--- /dev/null
+++ b/crates/format/src/fig/map/text.rs
@@ -0,0 +1,270 @@
+use super::paint::{paint, style_link};
+use super::*;
+
+/// The value from the last override layer holding a valid one for an optional text setting; invalid instance rows fall through.
+fn text_num(v: &View, key: &str) -> Option<f64> {
+    v.layers.iter().rev().find_map(|layer| {
+        layer.get(key).and_then(|value| match value {
+            Kv::Bool(_) => None,
+            _ => value.f64(),
+        })
+    })
+}
+
+fn text_flag(v: &View, key: &str) -> Option<bool> {
+    v.layers.iter().rev().find_map(|layer| layer.get(key).and_then(Kv::bool))
+}
+
+fn insert_text_options(style: &mut Obj, v: &View) {
+    if let Some(value) = text_num(v, "listSpacing") {
+        style.insert("listSpacing".into(), json!(value));
+    }
+    for k in ["hangingList", "hangingPunctuation"] {
+        if let Some(value) = text_flag(v, k) {
+            style.insert(k.into(), json!(value));
+        }
+    }
+    if let Some(value) = leading_trim(v) {
+        style.insert("leadingTrim".into(), json!(value));
+    }
+}
+
+fn leading_trim<'a>(v: &View<'a>) -> Option<&'a str> {
+    v.layers.iter().rev().find_map(|layer| match layer.get("leadingTrim").and_then(Kv::str) {
+        Some(value @ ("NONE" | "CAP_HEIGHT")) => Some(value),
+        _ => None,
+    })
+}
+
+impl<'a> Mapper<'a> {
+    pub(super) fn text(&mut self, o: &mut Obj, v: &View<'a>) {
+        let style_node = style_link(v, "styleIdForText", "inheritTextStyleID").and_then(|s| self.nodes.get(&s).copied());
+        // Instance overrides beat the shared style; the style beats the layer's own copy.
+        let sv = v.styled(style_node.filter(|s| s.get("styleType").and_then(Kv::str) == Some("TEXT")));
+        let td = v.get("textData");
+        let chars = td.and_then(|t| t.get("characters")).and_then(Kv::str).unwrap_or("");
+        o.insert("characters".into(), json!(chars));
+        let mut style = text_style(&sv, None);
+        // The style's typography beats the layer's own copy of it (the copy is stale when the style
+        // changed). The file cannot tell a stale copy of these four values from a deliberate local
+        // one, and "original", "none" and 0 could never be set locally if the style always won, so
+        // a value the layer or an override sets itself is taken as deliberate.
+        if let Some(decoration @ ("NONE" | "UNDERLINE" | "STRIKETHROUGH")) = v.str("textDecoration") {
+            style.insert("textDecoration".into(), json!(decoration));
+        }
+        if let Some(skip_ink) = v.flag("textDecorationSkipInk") {
+            style.insert("textDecorationSkipInk".into(), json!(skip_ink));
+        }
+        if let Some(case @ ("ORIGINAL" | "UPPER" | "LOWER" | "TITLE" | "SMALL_CAPS" | "SMALL_CAPS_FORCED")) = v.str("textCase") {
+            style.insert("textCase".into(), json!(case));
+        }
+        for k in ["textAlignHorizontal", "textAlignVertical", "textAutoResize", "textTruncation"] {
+            copy_str(&mut style, v, k, k);
+        }
+        // Paragraph settings belong to the effective text layer, including explicit zero clears.
+        for k in ["paragraphSpacing", "paragraphIndent"] {
+            copy_num(&mut style, v, k, k);
+        }
+        insert_text_options(&mut style, v);
+        if let Some(n) = v.num("maxLines").filter(|n| *n >= 1.0) {
+            style.insert("maxLines".into(), json!(n));
+        }
+        let size = sv.num("fontSize");
+        if let Some(b) = o.get_mut("style").and_then(|s| s.get_mut("boundVariables")).map(Value::take) {
+            style.insert("boundVariables".into(), b);
+        }
+        o.insert("style".into(), Value::Object(style));
+        let Some(td) = td else { return };
+        char_styles(o, td, size, &mut |w| self.warn(w));
+        let raw = td.get("lines").map(Kv::list).unwrap_or_default();
+        let lines: Vec<&str> = raw
+            .iter()
+            .map(|l| match l.get("lineType").and_then(Kv::str) {
+                Some("ORDERED_LIST") => "ORDERED",
+                Some("UNORDERED_LIST") => "UNORDERED",
+                _ => "NONE",
+            })
+            .collect();
+        if lines.iter().any(|l| *l != "NONE") {
+            o.insert("lineTypes".into(), json!(lines));
+        }
+        // Where a numbered list starts counting, less one (not a REST field).
+        let starts: Vec<u32> =
+            raw.iter().map(|l| num(l, "listStartOffset").filter(|n| n.is_finite()).map_or(0, |n| n.clamp(0.0, f64::from(u32::MAX)) as u32)).collect();
+        if starts.iter().any(|n| *n > 0) {
+            o.insert("listStartOffsets".into(), json!(starts));
+        }
+    }
+
+    /// Carry supported text-path data through the private .fig REST ingress only.
+    pub(super) fn text_path(&mut self, o: &mut Obj, v: &View<'a>) {
+        let fail = |this: &mut Self, reason: &str| {
+            this.warn(format!("text path {reason}; text imports off its path"));
+        };
+        let Some(start) = v.get("textPathStart") else {
+            fail(self, "has no start data");
+            return;
+        };
+        let (Some(t), Some(forward)) = (num(start, "tValue"), start.get("forward").and_then(Kv::bool)) else {
+            fail(self, "has invalid start data");
+            return;
+        };
+        let Some(vd) = v.get("vectorData") else {
+            fail(self, "has no vector data");
+            return;
+        };
+        let Some(blob) = num(vd, "vectorNetworkBlob")
+            .filter(|i| i.is_finite() && *i >= 0.0 && i.fract() == 0.0)
+            .and_then(|i| usize::try_from(i as u64).ok())
+            .and_then(|i| self.blobs.get(i))
+            .copied()
+        else {
+            fail(self, "has no vector network");
+            return;
+        };
+        let Some(net) = network::decode(blob) else {
+            fail(self, "has damaged vector data");
+            return;
+        };
+        let Some(norm) = vd.get("normalizedSize") else {
+            fail(self, "has invalid normalized size");
+            return;
+        };
+        let Some(size) = v.get("size") else {
+            fail(self, "has invalid dimensions");
+            return;
+        };
+        let (Some(nx), Some(ny), Some(w), Some(h)) = (num(norm, "x"), num(norm, "y"), num(size, "x"), num(size, "y")) else {
+            fail(self, "has invalid dimensions");
+            return;
+        };
+        let axis_scale = |size: f64, normalized: f64, values: &[f64]| -> Option<f64> {
+            if !size.is_finite() || size < 0.0 || !normalized.is_finite() || normalized < 0.0 {
+                return None;
+            }
+            if normalized > 1e-9 {
+                if size <= 0.0 {
+                    return None;
+                }
+                return Some(size / normalized);
+            }
+            (size == 0.0 && values.iter().all(|v| *v == 0.0)).then_some(1.0)
+        };
+        let xs: Vec<f64> = net.vertices.iter().map(|p| p.x).chain(net.segments.iter().flat_map(|s| [s.ta.0, s.tb.0])).collect();
+        let ys: Vec<f64> = net.vertices.iter().map(|p| p.y).chain(net.segments.iter().flat_map(|s| [s.ta.1, s.tb.1])).collect();
+        let sx = axis_scale(w, nx, &xs);
+        let sy = axis_scale(h, ny, &ys);
+        let (Some(sx), Some(sy)) = (sx, sy) else {
+            fail(self, "has invalid path scale");
+            return;
+        };
+        if v.str("textAlignVertical").is_some_and(|x| x != "TOP") {
+            fail(self, "uses unsupported vertical placement");
+            return;
+        }
+        if v.get("textData").and_then(|td| td.get("characters")).and_then(Kv::str).is_some_and(|s| s.chars().any(|c| matches!(c, '\n' | '\r'))) {
+            fail(self, "contains multiple lines");
+            return;
+        }
+        let path = match crate::fig::text_path::from_network(&net, sx, sy, t, forward) {
+            Ok(path) => path,
+            Err(reason) => {
+                fail(self, reason);
+                return;
+            }
+        };
+        let has_decoration = |style: &Value| style.get("textDecoration").and_then(Value::as_str).is_some_and(|x| x != "NONE");
+        let decorated = o.get("style").is_some_and(has_decoration)
+            || o.get("styleOverrideTable").and_then(Value::as_object).into_iter().flat_map(|styles| styles.values()).any(has_decoration);
+        if decorated {
+            self.warn("text path underline or strikethrough decoration is not rendered");
+        }
+        o.insert("_figTextPath".into(), json!({"d": path.d, "start": path.start, "flip": path.flip}));
+    }
+}
+
+/// Per-character styles of text data `td` (`characterStyleIDs` + `styleOverrideTable`) as REST
+/// `characterStyleOverrides` + `styleOverrideTable`; `size`: the base font size.
+pub(super) fn char_styles(o: &mut Obj, td: &Kv, size: Option<f64>, warn: &mut dyn FnMut(String)) {
+    let ids: Vec<u64> = td.get("characterStyleIDs").map(Kv::list).unwrap_or_default().iter().filter_map(Kv::f64).map(|i| i as u64).collect();
+    if ids.iter().all(|i| *i == 0) {
+        return;
+    }
+    let mut table = Obj::new();
+    for e in td.get("styleOverrideTable").map(Kv::list).unwrap_or_default() {
+        let Some(sid) = num(e, "styleID") else { continue };
+        let mut s = text_style(&View::of(e), size);
+        if let Some(fills) = e.get("fillPaints") {
+            s.insert("fills".into(), Value::Array(fills.list().iter().filter_map(|p| paint(p, warn)).collect()));
+        }
+        table.insert((sid as u64).to_string(), Value::Object(s));
+    }
+    o.insert("characterStyleOverrides".into(), json!(ids));
+    o.insert("styleOverrideTable".into(), Value::Object(table));
+}
+
+/// The REST TypeStyle fields a node (or text override entry) sets. `size`: the font size that
+/// letter spacing in percent refers to when the entry doesn't set one.
+fn text_style(v: &View, size: Option<f64>) -> Obj {
+    let mut s = Obj::new();
+    if let Some(f) = v.get("fontName") {
+        for (from, to) in [("family", "fontFamily"), ("style", "fontStyle"), ("postscript", "fontPostScriptName")] {
+            if let Some(x) = f.get(from).and_then(Kv::str).filter(|x| !x.is_empty()) {
+                // Compact and spaced style names ("SemiBold", "Semi Bold") are the same style.
+                s.insert(to.into(), if from == "style" { json!(crate::fig::style_name(x)) } else { json!(x) });
+            }
+        }
+    }
+    copy_num(&mut s, v, "fontSize", "fontSize");
+    copy_num(&mut s, v, "paragraphSpacing", "paragraphSpacing");
+    copy_num(&mut s, v, "paragraphIndent", "paragraphIndent");
+    insert_text_options(&mut s, v);
+    copy_str(&mut s, v, "textCase", "textCase");
+    copy_str(&mut s, v, "textDecoration", "textDecoration");
+    if let Some(skip_ink) = v.flag("textDecorationSkipInk") {
+        s.insert("textDecorationSkipInk".into(), json!(skip_ink));
+    }
+    copy_str(&mut s, v, "leadingTrim", "leadingTrim");
+    let font_size = v.num("fontSize").or(size).unwrap_or(12.0);
+    if let Some(ls) = v.get("letterSpacing") {
+        let val = num(ls, "value").unwrap_or(0.0);
+        let px = match ls.get("units").and_then(Kv::str) {
+            Some("PIXELS") => val,
+            Some("PERCENT") => {
+                // Private (read by `rest/text.rs`): REST spacing is in pixels; keep the percent.
+                s.insert("_letterSpacingPercent".into(), json!(val));
+                val / 100.0 * font_size
+            }
+            _ => val * font_size,
+        };
+        s.insert("letterSpacing".into(), json!(px));
+    }
+    if let Some(lh) = v.get("lineHeight") {
+        let val = num(lh, "value").unwrap_or(100.0);
+        match lh.get("units").and_then(Kv::str) {
+            Some("PIXELS") => {
+                s.insert("lineHeightUnit".into(), json!("PIXELS"));
+                s.insert("lineHeightPx".into(), json!(val));
+            }
+            // shortcut: percent units count from the font's own line height (100 % is "auto"), which
+            // the document can only say for 100 %; other values read as % of the font size. Upgrade
+            // when line heights can be a share of the font's own.
+            Some("PERCENT") if (val - 100.0).abs() < 1e-6 => {
+                s.insert("lineHeightUnit".into(), json!("INTRINSIC_%"));
+            }
+            Some("PERCENT") => {
+                s.insert("lineHeightUnit".into(), json!("FONT_SIZE_%"));
+                s.insert("lineHeightPercentFontSize".into(), json!(val));
+            }
+            _ => {
+                s.insert("lineHeightUnit".into(), json!("FONT_SIZE_%"));
+                s.insert("lineHeightPercentFontSize".into(), json!(val * 100.0));
+            }
+        }
+    }
+    // An empty URL is kept: on an override entry it clears the text's own link.
+    if let Some(u) = v.get("hyperlink").and_then(|h| h.get("url")).and_then(Kv::str) {
+        s.insert("hyperlink".into(), json!({"type": "URL", "url": u}));
+    }
+    s
+}
diff --git a/crates/format/src/fig/map/variables.rs b/crates/format/src/fig/map/variables.rs
new file mode 100644
index 00000000..d27c834b
--- /dev/null
+++ b/crates/format/src/fig/map/variables.rs
@@ -0,0 +1,164 @@
+use super::paint::color;
+use super::*;
+
+impl<'a> Mapper<'a> {
+    pub(super) fn variable_bindings(&mut self, o: &mut Obj, v: &View<'a>) {
+        let mut bound = Obj::new();
+        let mut text_bound = Obj::new();
+        for e in v.get("variableConsumptionMap").and_then(|m| m.get("entries")).map(Kv::list).unwrap_or_default() {
+            let Some(var) = alias(e.get("variableData")) else { continue };
+            let a = json!({"type": "VARIABLE_ALIAS", "id": var});
+            let field = e.get("variableField").and_then(Kv::str).unwrap_or("");
+            match (binding_key(field), text_binding_key(field)) {
+                (Some(k), _) => {
+                    bound.insert(k.into(), a);
+                }
+                (_, Some(k)) => {
+                    text_bound.insert(k.into(), a);
+                }
+                _ if field == "CORNER_RADIUS" => {
+                    for k in ["topLeftRadius", "topRightRadius", "bottomLeftRadius", "bottomRightRadius"] {
+                        bound.insert(k.into(), a.clone());
+                    }
+                }
+                _ if field.starts_with("BORDER_") => {
+                    let side = match field {
+                        "BORDER_TOP_WEIGHT" => "strokeTopWeight",
+                        "BORDER_RIGHT_WEIGHT" => "strokeRightWeight",
+                        "BORDER_BOTTOM_WEIGHT" => "strokeBottomWeight",
+                        _ => "strokeLeftWeight",
+                    };
+                    bound.insert(side.into(), a);
+                }
+                _ if field == "WIDTH" || field == "HEIGHT" => {
+                    let axis = if field == "WIDTH" { "x" } else { "y" };
+                    let size = bound.entry("size").or_insert_with(|| json!({}));
+                    size[axis] = a;
+                }
+                _ => self.warn(format!("variables bound to {} are not imported from .fig files yet", field.to_ascii_lowercase().replace('_', " "))),
+            }
+        }
+        if !bound.is_empty() {
+            o.insert("boundVariables".into(), Value::Object(bound));
+        }
+        // (The text style itself is added after this: it keeps these.)
+        if !text_bound.is_empty() {
+            o.insert("style".into(), json!({"boundVariables": text_bound}));
+        }
+        let mut modes = Obj::new();
+        let mut lost = false;
+        for e in v.get("variableModeBySetMap").and_then(|m| m.get("entries")).map(Kv::list).unwrap_or_default() {
+            let (Some(set), Some(mode)) = (e.get("variableSetID"), e.get("variableModeID").and_then(guid)) else { continue };
+            match self.resource_id(set) {
+                Some(id) => {
+                    modes.insert(id, json!(mode));
+                }
+                // A mode of a collection neither named by guid nor resolvable in the file.
+                None if set.get("guid").is_some() || set.get("assetRef").is_some() => lost = true,
+                None => {}
+            }
+        }
+        if lost {
+            self.warn("variable modes of collections that aren't in the file were skipped");
+        }
+        if !modes.is_empty() {
+            o.insert("explicitVariableModes".into(), Value::Object(modes));
+        }
+    }
+}
+
+/// The REST `boundVariables` key of a bound layer field.
+fn binding_key(field: &str) -> Option<&'static str> {
+    Some(match field {
+        "STROKE_WEIGHT" => "strokeWeight",
+        "STACK_SPACING" => "itemSpacing",
+        "STACK_COUNTER_SPACING" => "counterAxisSpacing",
+        "STACK_PADDING_LEFT" => "paddingLeft",
+        "STACK_PADDING_TOP" => "paddingTop",
+        "STACK_PADDING_RIGHT" => "paddingRight",
+        "STACK_PADDING_BOTTOM" => "paddingBottom",
+        "VISIBLE" => "visible",
+        "TEXT_DATA" => "characters",
+        "OPACITY" => "opacity",
+        "MIN_WIDTH" => "minWidth",
+        "MAX_WIDTH" => "maxWidth",
+        "MIN_HEIGHT" => "minHeight",
+        "MAX_HEIGHT" => "maxHeight",
+        "RECTANGLE_TOP_LEFT_CORNER_RADIUS" => "topLeftRadius",
+        "RECTANGLE_TOP_RIGHT_CORNER_RADIUS" => "topRightRadius",
+        "RECTANGLE_BOTTOM_LEFT_CORNER_RADIUS" => "bottomLeftRadius",
+        "RECTANGLE_BOTTOM_RIGHT_CORNER_RADIUS" => "bottomRightRadius",
+        _ => return None,
+    })
+}
+
+/// The REST text style `boundVariables` key of a bound text field.
+fn text_binding_key(field: &str) -> Option<&'static str> {
+    Some(match field {
+        "FONT_SIZE" => "fontSize",
+        "FONT_FAMILY" => "fontFamily",
+        "FONT_STYLE" => "fontStyle",
+        "LETTER_SPACING" => "letterSpacing",
+        "LINE_HEIGHT" => "lineHeight",
+        "PARAGRAPH_SPACING" => "paragraphSpacing",
+        "PARAGRAPH_INDENT" => "paragraphIndent",
+        _ => return None,
+    })
+}
+
+/// A `VariableData` (literal, variable reference or expression) in the REST shape; `None` for
+/// kinds a prototype can't evaluate.
+pub(super) fn variable_data(d: &Kv, depth: usize) -> Option<Value> {
+    let v = d.get("value")?;
+    let ty = d.get("dataType").and_then(Kv::str)?;
+    let value = match ty {
+        "ALIAS" => json!({"type": "VARIABLE_ALIAS", "id": v.get("alias").and_then(ref_guid)?}),
+        "EXPRESSION" if depth < MAX_EXPR_DEPTH => {
+            let e = v.get("expressionValue")?;
+            let function = match e.get("expressionFunction").and_then(Kv::str)? {
+                "MULTIPLY" => "MULTIPLICATION",
+                "DIVIDE" => "DIVISION",
+                f => f,
+            };
+            let args = e.get("expressionArguments").map(Kv::list).unwrap_or_default();
+            let args = args.iter().map(|x| variable_data(x, depth + 1)).collect::<Option<Vec<Value>>>()?;
+            json!({"expressionFunction": function, "expressionArguments": args})
+        }
+        "BOOLEAN" => json!(v.get("boolValue").and_then(Kv::bool)?),
+        "FLOAT" => json!(num(v, "floatValue").filter(|x| x.is_finite())?),
+        "STRING" => json!(v.get("textValue").and_then(Kv::str)?),
+        "COLOR" => color(v.get("colorValue")?),
+        _ => return None,
+    };
+    let mut out = json!({"type": ty, "value": value});
+    if let Some(r) = d.get("resolvedDataType").and_then(Kv::str) {
+        out["resolvedType"] = json!(r);
+    }
+    Some(out)
+}
+
+/// The variable an `ALIAS` variable data points at.
+pub(super) fn alias(d: Option<&Kv>) -> Option<String> {
+    let d = d?;
+    if d.get("dataType").and_then(Kv::str) != Some("ALIAS") {
+        return None;
+    }
+    d.get("value").and_then(|v| v.get("alias")).and_then(ref_guid)
+}
+
+pub(super) fn variable_value(d: &Kv) -> Option<Value> {
+    if let Some(a) = alias(Some(d)) {
+        return Some(json!({"type": "VARIABLE_ALIAS", "id": a}));
+    }
+    let v = d.get("value")?;
+    if let Some(c) = v.get("colorValue") {
+        return Some(color(c));
+    }
+    if let Some(b) = v.get("boolValue").and_then(Kv::bool) {
+        return Some(json!(b));
+    }
+    if let Some(x) = num(v, "floatValue") {
+        return Some(json!(x));
+    }
+    v.get("textValue").and_then(Kv::str).map(|s| json!(s))
+}
diff --git a/crates/format/src/fig/network.rs b/crates/format/src/fig/network.rs
index 112a767a..ccb5c291 100644
--- a/crates/format/src/fig/network.rs
+++ b/crates/format/src/fig/network.rs
@@ -17,6 +17,7 @@ pub(super) struct Vertex {
 }
 
 pub(super) struct Segment {
+    pub style: u32,
     pub a: usize,
     pub ta: (f64, f64),
     pub b: usize,
@@ -76,8 +77,8 @@ pub(super) fn decode(b: &[u8]) -> Option<Network> {
         net.vertices.push(Vertex { style: r.u32()?, x: r.f32()?, y: r.f32()? });
     }
     for _ in 0..ns {
-        r.u32()?;
-        net.segments.push(Segment { a: r.index(nv)?, ta: (r.f32()?, r.f32()?), b: r.index(nv)?, tb: (r.f32()?, r.f32()?) });
+        let style = r.u32()?;
+        net.segments.push(Segment { style, a: r.index(nv)?, ta: (r.f32()?, r.f32()?), b: r.index(nv)?, tb: (r.f32()?, r.f32()?) });
     }
     let mut entries = 0usize;
     for _ in 0..nr {
@@ -110,7 +111,7 @@ pub(super) fn encode(net: &Network) -> Vec<u8> {
         fl(v.y, &mut out);
     }
     for s in &net.segments {
-        u(0, &mut out);
+        u(s.style, &mut out);
         u(s.a as u32, &mut out);
         fl(s.ta.0, &mut out);
         fl(s.ta.1, &mut out);
diff --git a/crates/format/src/fig/prop_value_tests.rs b/crates/format/src/fig/prop_value_tests.rs
new file mode 100644
index 00000000..24248d32
--- /dev/null
+++ b/crates/format/src/fig/prop_value_tests.rs
@@ -0,0 +1,188 @@
+//! Component properties as current `.fig` files write them, on synthetic messages: the copy of a
+//! set's definitions each variant keeps (`parentPropDefId`, no name or type of its own), and
+//! assignments that carry their value only in the variable form (`varValue`).
+
+use figcraft_doc::NodeKind;
+use serde_json::Value;
+
+use super::kiwi::Kv;
+use super::map::to_rest;
+
+fn g(local: u32) -> Kv<'static> {
+    Kv::Object(vec![("sessionID", Kv::Uint(9)), ("localID", Kv::Uint(u64::from(local)))])
+}
+
+fn o(fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    Kv::Object(fields)
+}
+
+fn s(text: &str) -> Kv<'static> {
+    Kv::Str(text.into())
+}
+
+fn node(local: u32, kind: &'static str, name: &str, parent: Option<u32>, mut fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    let mut all = vec![("guid", g(local)), ("type", Kv::Enum(kind)), ("name", s(name))];
+    if let Some(parent) = parent {
+        all.push(("parentIndex", o(vec![("guid", g(parent)), ("position", s("!"))])));
+    }
+    all.append(&mut fields);
+    o(all)
+}
+
+/// A layer's `field` bound to property definition `def`.
+fn bound(field: &'static str, def: u32) -> (&'static str, Kv<'static>) {
+    let entry = o(vec![
+        ("variableField", Kv::Enum(field)),
+        ("variableData", o(vec![("value", o(vec![("propRefValue", o(vec![("defId", g(def))]))])), ("dataType", Kv::Enum("PROP_REF"))])),
+    ]);
+    ("parameterConsumptionMap", o(vec![("entries", Kv::Array(vec![entry]))]))
+}
+
+fn definition(id: u32, name: &str, kind: &'static str, initial: Kv<'static>) -> Kv<'static> {
+    o(vec![("id", g(id)), ("name", s(name)), ("type", Kv::Enum(kind)), ("initialValue", initial)])
+}
+
+/// An assignment of `def` that leaves `value` empty and says it in `varValue` only.
+fn variable_assignment(def: u32, data_type: &'static str, value: Kv<'static>) -> Kv<'static> {
+    o(vec![
+        ("defID", g(def)),
+        ("value", o(vec![])),
+        ("varValue", o(vec![("value", value), ("dataType", Kv::Enum(data_type)), ("resolvedDataType", Kv::Enum(data_type))])),
+    ])
+}
+
+fn message(nodes: Vec<Kv<'static>>) -> Kv<'static> {
+    let mut all = vec![node(1, "DOCUMENT", "Document", None, vec![]), node(2, "CANVAS", "Page", Some(1), vec![])];
+    all.extend(nodes);
+    o(vec![("nodeChanges", Kv::Array(all))])
+}
+
+fn by_id<'v>(v: &'v Value, id: &str) -> &'v Value {
+    fn find<'v>(v: &'v Value, id: &str) -> Option<&'v Value> {
+        if v.get("id").and_then(Value::as_str) == Some(id) {
+            return Some(v);
+        }
+        v.get("children").and_then(Value::as_array).into_iter().flatten().find_map(|v| find(v, id))
+    }
+    find(v, id).unwrap_or_else(|| panic!("no layer {id}"))
+}
+
+fn instance_props(doc: &figcraft_doc::Document) -> &std::collections::BTreeMap<String, Value> {
+    let instance = doc.ids().filter_map(|id| doc.node(id)).find(|n| n.name == "Instance").unwrap();
+    let NodeKind::Instance { props, .. } = &instance.kind else { panic!("not an instance") };
+    props
+}
+
+/// A "Field" set with a BOOL definition (9:70), a variant whose "Hint text" reads its copy (9:71),
+/// and an instance of the variant that sets the property false through definition `assigned`.
+fn field_set(assigned: u32) -> Kv<'static> {
+    message(vec![
+        node(
+            9,
+            "FRAME",
+            "Field",
+            Some(2),
+            vec![
+                ("isStateGroup", Kv::Bool(true)),
+                ("componentPropDefs", Kv::Array(vec![definition(70, "Hint", "BOOL", o(vec![("boolValue", Kv::Bool(true))]))])),
+            ],
+        ),
+        node(
+            10,
+            "SYMBOL",
+            "State=Default",
+            Some(9),
+            vec![("componentPropDefs", Kv::Array(vec![o(vec![("id", g(71)), ("parentPropDefId", g(70))])]))],
+        ),
+        node(11, "TEXT", "Hint text", Some(10), vec![bound("VISIBLE", 71)]),
+        node(
+            20,
+            "INSTANCE",
+            "Instance",
+            Some(2),
+            vec![
+                ("symbolData", o(vec![("symbolID", g(10))])),
+                ("componentPropAssignments", Kv::Array(vec![o(vec![("defID", g(assigned)), ("value", o(vec![("boolValue", Kv::Bool(false))]))])])),
+            ],
+        ),
+    ])
+}
+
+#[test]
+fn variant_layers_bind_to_the_set_properties_their_copies_name() {
+    let msg = field_set(71);
+    let (rest, _, _) = to_rest(&msg, "Synthetic", crate::rest::MAX_NODES);
+    assert_eq!(by_id(&rest["document"], "9:9")["componentPropertyDefinitions"]["Hint#9:70"]["type"], "BOOLEAN");
+    assert_eq!(by_id(&rest["document"], "9:11")["componentPropertyReferences"]["visible"], "Hint#9:70");
+    assert_eq!(by_id(&rest["document"], "9:20")["componentProperties"]["Hint#9:70"]["value"], false);
+
+    let (doc, _) = crate::rest::import_fig(&rest, &crate::rest::no_images).unwrap();
+    let hint = doc.ids().filter_map(|id| doc.node(id)).find(|n| n.name == "Hint text" && n.source.is_none()).unwrap();
+    assert_eq!(hint.prop_refs.get("visible").map(String::as_str), Some("Hint"));
+    assert_eq!(instance_props(&doc).get("Hint"), Some(&Value::Bool(false)));
+}
+
+/// An assignment reaches layers that read another copy of its definition: here the instance sets
+/// the set's own definition while the variant's layer reads the variant's copy.
+#[test]
+fn assignments_reach_layers_that_read_another_copy_of_their_definition() {
+    let (rest, _, _) = to_rest(&field_set(70), "Synthetic", crate::rest::MAX_NODES);
+    let instance = by_id(&rest["document"], "9:20");
+    assert_eq!(instance["componentProperties"]["Hint#9:70"]["value"], false);
+    assert_eq!(by_id(instance, "I9:20;9:11")["visible"], false);
+}
+
+#[test]
+fn property_values_written_only_as_variables_are_applied() {
+    let msg = message(vec![
+        node(
+            10,
+            "SYMBOL",
+            "Field",
+            Some(2),
+            vec![(
+                "componentPropDefs",
+                Kv::Array(vec![
+                    definition(70, "Hint", "BOOL", o(vec![("boolValue", Kv::Bool(true))])),
+                    definition(71, "Label", "TEXT", o(vec![("textValue", o(vec![("characters", s("Label"))]))])),
+                    definition(72, "Icon", "INSTANCE_SWAP", o(vec![("guidValue", g(40))])),
+                ]),
+            )],
+        ),
+        node(11, "TEXT", "Hint text", Some(10), vec![bound("VISIBLE", 70)]),
+        node(12, "TEXT", "Label", Some(10), vec![("textData", o(vec![("characters", s("Label"))])), bound("TEXT_DATA", 71)]),
+        node(13, "INSTANCE", "Icon", Some(10), vec![("symbolData", o(vec![("symbolID", g(40))])), bound("OVERRIDDEN_SYMBOL_ID", 72)]),
+        node(40, "SYMBOL", "Mail", Some(2), vec![]),
+        node(41, "SYMBOL", "Card", Some(2), vec![]),
+        node(
+            20,
+            "INSTANCE",
+            "Instance",
+            Some(2),
+            vec![
+                ("symbolData", o(vec![("symbolID", g(10))])),
+                (
+                    "componentPropAssignments",
+                    Kv::Array(vec![
+                        variable_assignment(70, "BOOLEAN", o(vec![("boolValue", Kv::Bool(false))])),
+                        variable_assignment(71, "TEXT_DATA", o(vec![("textDataValue", o(vec![("characters", s("Name on card"))]))])),
+                        variable_assignment(72, "SYMBOL_ID", o(vec![("symbolIdValue", o(vec![("guid", g(41))]))])),
+                    ]),
+                ),
+            ],
+        ),
+    ]);
+    let (rest, _, _) = to_rest(&msg, "Synthetic", crate::rest::MAX_NODES);
+    let instance = by_id(&rest["document"], "9:20");
+    assert_eq!(instance["componentProperties"]["Hint#9:70"]["value"], false);
+    assert_eq!(instance["componentProperties"]["Label#9:71"]["value"], "Name on card");
+    assert_eq!(instance["componentProperties"]["Icon#9:72"]["value"], "9:41");
+    assert_eq!(by_id(instance, "I9:20;9:11")["visible"], false);
+    assert_eq!(by_id(instance, "I9:20;9:12")["characters"], "Name on card");
+    assert_eq!(by_id(instance, "I9:20;9:13")["componentId"], "9:41");
+
+    let (doc, _) = crate::rest::import_fig(&rest, &crate::rest::no_images).unwrap();
+    let props = instance_props(&doc);
+    assert_eq!(props.get("Hint"), Some(&Value::Bool(false)));
+    assert_eq!(props.get("Label"), Some(&Value::String("Name on card".into())));
+}
diff --git a/crates/format/src/fig/slot_tests.rs b/crates/format/src/fig/slot_tests.rs
new file mode 100644
index 00000000..17c75464
--- /dev/null
+++ b/crates/format/src/fig/slot_tests.rs
@@ -0,0 +1,225 @@
+//! Component slot content from `.fig` files: SLOT definitions, the frames that reference them and
+//! the content subtrees that instances assign, on synthetic messages.
+
+use serde_json::Value;
+
+use super::kiwi::Kv;
+use super::map::to_rest;
+
+fn g(local: u32) -> Kv<'static> {
+    Kv::Object(vec![("sessionID", Kv::Uint(9)), ("localID", Kv::Uint(u64::from(local)))])
+}
+
+fn o(fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    Kv::Object(fields)
+}
+
+fn node(local: u32, kind: &'static str, parent: Option<u32>, mut fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    let mut all = vec![("guid", g(local)), ("type", Kv::Enum(kind)), ("name", Kv::Str("Synthetic".into()))];
+    if let Some(parent) = parent {
+        all.push(("parentIndex", o(vec![("guid", g(parent)), ("position", Kv::Str("!".into()))])));
+    }
+    all.append(&mut fields);
+    o(all)
+}
+
+fn mapped(msg: &Kv<'_>) -> Value {
+    to_rest(msg, "Synthetic resources", crate::rest::MAX_NODES).0
+}
+
+fn named_id<'b>(v: &'b Value, id: &str) -> Option<&'b Value> {
+    if v.get("id").and_then(Value::as_str) == Some(id) {
+        return Some(v);
+    }
+    v.get("children").and_then(Value::as_array).into_iter().flatten().find_map(|v| named_id(v, id))
+}
+
+fn changes<'a>(msg: &'a mut Kv<'static>) -> &'a mut Vec<Kv<'static>> {
+    let Kv::Object(fields) = msg else { panic!() };
+    let (_, Kv::Array(rows)) = fields.iter_mut().find(|(key, _)| *key == "nodeChanges").unwrap() else { panic!() };
+    rows
+}
+
+fn slot_message(content: Option<u32>, preferred: bool) -> Kv<'static> {
+    let slot_ref = o(vec![
+        ("variableField", Kv::Enum("SLOT_CONTENT_ID")),
+        ("variableData", o(vec![("value", o(vec![("propRefValue", o(vec![("defId", g(70))]))]))])),
+    ]);
+    let mut instance_fields = vec![("symbolData", o(vec![("symbolID", g(10))]))];
+    if let Some(content) = content {
+        instance_fields.push((
+            "componentPropAssignments",
+            Kv::Array(vec![o(vec![
+                ("defID", g(70)),
+                ("value", o(vec![])),
+                (
+                    "varValue",
+                    o(vec![
+                        ("value", o(vec![("slotContentIdValue", o(vec![("guid", g(content))]))])),
+                        ("dataType", Kv::Enum("SLOT_CONTENT_ID")),
+                        ("resolvedDataType", Kv::Enum("SLOT_CONTENT_ID")),
+                    ]),
+                ),
+            ])]),
+        ));
+    }
+    let mut definition = vec![("id", g(70)), ("name", Kv::Str("Content".into())), ("type", Kv::Enum("SLOT"))];
+    if preferred {
+        definition.push((
+            "preferredValues",
+            o(vec![("instanceSwapValues", Kv::Array(vec![o(vec![("type", Kv::Enum("COMPONENT")), ("key", Kv::Str("unresolved-key".into()))])]))]),
+        ));
+    }
+    o(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, "DOCUMENT", None, vec![]),
+            node(2, "CANVAS", Some(1), vec![]),
+            node(3, "CANVAS", Some(1), vec![("internalOnly", Kv::Bool(true))]),
+            node(10, "SYMBOL", Some(2), vec![("componentPropDefs", Kv::Array(vec![o(definition)]))]),
+            node(12, "FRAME", Some(10), vec![("parameterConsumptionMap", o(vec![("entries", Kv::Array(vec![slot_ref]))]))]),
+            node(13, "RECTANGLE", Some(12), vec![]),
+            node(20, "INSTANCE", Some(2), instance_fields),
+            node(30, "FRAME", Some(3), vec![("isSlotContent", Kv::Bool(true))]),
+            node(31, "RECTANGLE", Some(30), vec![]),
+            node(32, "ELLIPSE", Some(30), vec![]),
+            node(33, "FRAME", Some(3), vec![("isSlotContent", Kv::Bool(true))]),
+        ]),
+    )])
+}
+#[test]
+fn slot_definition_reference_and_arbitrary_override_children_are_imported() {
+    let rest = mapped(&slot_message(Some(30), false));
+    let main = named_id(&rest["document"], "9:10").unwrap();
+    assert_eq!(main["componentPropertyDefinitions"]["Content#9:70"]["type"], "SLOT");
+    let main_slot = named_id(&rest["document"], "9:12").unwrap();
+    assert_eq!(main_slot["componentPropertyReferences"]["slot"], "Content#9:70");
+    let slot = named_id(&rest["document"], "I9:20;9:12").unwrap();
+    assert!(slot.get("componentPropertyReferences").is_none());
+    assert_eq!(slot[crate::rest::FIG_SOURCE_FIELD]["slotOverride"], true);
+    let kids = slot["children"].as_array().unwrap();
+    assert_eq!(kids.len(), 2);
+    assert_eq!(kids[0]["id"], "I9:20;9:31");
+    assert_eq!(kids[1]["id"], "I9:20;9:32");
+
+    let (doc, warnings) = crate::rest::import_fig(&rest, &crate::rest::no_images).unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let main = doc
+        .node(*doc.pages.first().unwrap())
+        .unwrap()
+        .children
+        .iter()
+        .find_map(|id| doc.node(*id).filter(|n| n.name == "Synthetic" && matches!(n.kind, figcraft_doc::NodeKind::Component { .. })))
+        .unwrap();
+    assert!(
+        matches!(&main.kind, figcraft_doc::NodeKind::Component { props, .. } if matches!(props.get("Content"), Some(figcraft_doc::PropDef::Slot { preferred }) if preferred.is_empty()))
+    );
+    let instance = doc.ids().filter_map(|id| doc.node(id)).find(|n| matches!(n.kind, figcraft_doc::NodeKind::Instance { .. })).unwrap();
+    let slot = doc.node(instance.children[0]).unwrap();
+    assert!(!slot.prop_refs.contains_key("slot"));
+    assert_eq!(slot.source, Some(main.children[0]));
+    assert!(slot.overrides.contains("slot"));
+    assert_eq!(slot.children.len(), 2);
+    assert!(slot.children.iter().all(|id| doc.node(*id).is_some_and(|child| child.source.is_none())));
+
+    let (public, _) = crate::rest::import(&rest, &crate::rest::no_images).unwrap();
+    let public_instance = public.ids().filter_map(|id| public.node(id)).find(|n| matches!(n.kind, figcraft_doc::NodeKind::Instance { .. })).unwrap();
+    let public_slot = public.node(public_instance.children[0]).unwrap();
+    assert!(!public_slot.overrides.contains("slot"));
+}
+#[test]
+fn nested_instance_in_own_slot_content_keeps_its_own_source_tree() {
+    let mut msg = slot_message(Some(30), false);
+    let rows = changes(&mut msg);
+    let slot_frame = rows.iter_mut().find(|row| row.get("guid").and_then(|guid| guid.get("localID")).and_then(Kv::f64) == Some(31.0)).unwrap();
+    let Kv::Object(fields) = slot_frame else { panic!() };
+    fields.iter_mut().find(|(key, _)| *key == "type").unwrap().1 = Kv::Enum("FRAME");
+    rows.extend([
+        node(34, "INSTANCE", Some(31), vec![("symbolData", o(vec![("symbolID", g(40))]))]),
+        node(40, "SYMBOL", Some(2), vec![]),
+        node(41, "FRAME", Some(40), vec![]),
+        node(42, "RECTANGLE", Some(41), vec![]),
+    ]);
+
+    let rest = mapped(&msg);
+    let (doc, warnings) = crate::rest::import_fig(&rest, &crate::rest::no_images).unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let outer = doc
+        .ids()
+        .filter_map(|id| doc.node(id))
+        .find(|n| {
+            matches!(n.kind, figcraft_doc::NodeKind::Instance { .. })
+                && !doc.ancestors(n.id).iter().any(|a| doc.node(*a).is_some_and(|p| matches!(p.kind, figcraft_doc::NodeKind::Instance { .. })))
+        })
+        .unwrap();
+    let slot = doc.node(outer.children[0]).unwrap();
+    let own_frame = slot.children.iter().filter_map(|id| doc.node(*id)).find(|n| matches!(n.kind, figcraft_doc::NodeKind::Frame)).unwrap();
+    assert!(own_frame.source.is_none());
+
+    let nested = slot
+        .children
+        .iter()
+        .filter_map(|id| doc.node(*id))
+        .flat_map(|n| n.children.iter())
+        .filter_map(|id| doc.node(*id))
+        .find(|n| matches!(n.kind, figcraft_doc::NodeKind::Instance { .. }))
+        .unwrap();
+    let figcraft_doc::NodeKind::Instance { component, .. } = nested.kind else { panic!("not an instance") };
+    assert_eq!(nested.source, Some(component));
+    let main_frame = doc.node(doc.node(component).unwrap().children[0]).unwrap();
+    let expanded_frame = doc.node(nested.children[0]).unwrap();
+    assert_eq!(expanded_frame.source, Some(main_frame.id));
+    assert_eq!(expanded_frame.children.len(), 1);
+    assert_eq!(doc.node(expanded_frame.children[0]).unwrap().source, Some(main_frame.children[0]));
+}
+#[test]
+fn outer_slot_assignment_wins_over_a_nested_instances_own() {
+    let mut msg = slot_message(Some(30), false);
+    let assignment = |content: u32| {
+        Kv::Array(vec![o(vec![
+            ("defID", g(70)),
+            ("value", o(vec![])),
+            (
+                "varValue",
+                o(vec![
+                    ("value", o(vec![("slotContentIdValue", o(vec![("guid", g(content))]))])),
+                    ("dataType", Kv::Enum("SLOT_CONTENT_ID")),
+                    ("resolvedDataType", Kv::Enum("SLOT_CONTENT_ID")),
+                ]),
+            ),
+        ])])
+    };
+    // The nested instance inside the main assigns the empty slot content; the outer instance's content wins.
+    let slot_ref = o(vec![
+        ("variableField", Kv::Enum("SLOT_CONTENT_ID")),
+        ("variableData", o(vec![("value", o(vec![("propRefValue", o(vec![("defId", g(70))]))]))])),
+    ]);
+    changes(&mut msg).extend([
+        node(14, "INSTANCE", Some(10), vec![("symbolData", o(vec![("symbolID", g(40))])), ("componentPropAssignments", assignment(33))]),
+        node(40, "SYMBOL", Some(2), vec![]),
+        node(41, "FRAME", Some(40), vec![("parameterConsumptionMap", o(vec![("entries", Kv::Array(vec![slot_ref]))]))]),
+    ]);
+    let rest = mapped(&msg);
+    let slot = named_id(&rest["document"], "I9:20;9:14;9:41").unwrap();
+    assert_eq!(slot["children"].as_array().map_or(0, Vec::len), 2, "{slot}");
+}
+#[test]
+fn unassigned_slot_keeps_default_and_bad_content_target_warns() {
+    let rest = mapped(&slot_message(None, false));
+    let slot = named_id(&rest["document"], "I9:20;9:12").unwrap();
+    assert_eq!(slot["children"].as_array().unwrap().len(), 1);
+    assert!(slot.get("overrides").is_none());
+
+    let (rest, warnings, _) = to_rest(&slot_message(Some(999), false), "Synthetic", crate::rest::MAX_NODES);
+    assert!(warnings.iter().any(|w| w.contains("slot content assignment target is missing or is not slot content")), "{warnings:?}");
+    let slot = named_id(&rest["document"], "I9:20;9:12").unwrap();
+    assert_eq!(slot["children"].as_array().unwrap().len(), 1);
+
+    let (rest, warnings, _) = to_rest(&slot_message(Some(33), true), "Synthetic", crate::rest::MAX_NODES);
+    let main = named_id(&rest["document"], "9:10").unwrap();
+    assert_eq!(main["componentPropertyDefinitions"]["Content#9:70"]["type"], "SLOT");
+    assert!(warnings.iter().any(|w| w.contains("preferred slot component keys cannot be resolved")), "{warnings:?}");
+    let empty = named_id(&rest["document"], "I9:20;9:12").unwrap();
+    assert_eq!(empty["children"].as_array().map_or(0, Vec::len), 0);
+    assert_eq!(empty[crate::rest::FIG_SOURCE_FIELD]["slotOverride"], true);
+}
diff --git a/crates/format/src/fig/source_identity_tests.rs b/crates/format/src/fig/source_identity_tests.rs
new file mode 100644
index 00000000..927b0227
--- /dev/null
+++ b/crates/format/src/fig/source_identity_tests.rs
@@ -0,0 +1,1120 @@
+//! Synthetic .fig source identity: cached library components, contextual sources, main switches
+//! and invalid provenance.
+
+use figcraft_doc::color::PaintKind;
+use figcraft_doc::{Document, NodeId, NodeKind, PropDef};
+use serde_json::{Value, json};
+
+use super::kiwi::{Kv, Schema};
+use super::*;
+
+type Fields = Vec<(&'static str, Kv<'static>)>;
+
+fn o(fields: Fields) -> Kv<'static> {
+    Kv::Object(fields)
+}
+
+fn g(id: u64) -> Kv<'static> {
+    o(vec![("sessionID", Kv::Uint(1)), ("localID", Kv::Uint(id))])
+}
+
+fn s(value: &str) -> Kv<'static> {
+    Kv::Str(value.into())
+}
+
+fn matrix(x: f32) -> Kv<'static> {
+    o(vec![
+        ("m00", Kv::Float(1.0)),
+        ("m01", Kv::Float(0.0)),
+        ("m02", Kv::Float(x)),
+        ("m10", Kv::Float(0.0)),
+        ("m11", Kv::Float(1.0)),
+        ("m12", Kv::Float(0.0)),
+    ])
+}
+
+fn node(id: u64, parent: Option<u64>, ty: &'static str, name: &str, more: Fields) -> Kv<'static> {
+    let mut fields = vec![("guid", g(id)), ("phase", Kv::Enum("CREATED")), ("type", Kv::Enum(ty)), ("name", s(name))];
+    if let Some(parent) = parent {
+        fields.push(("parentIndex", o(vec![("guid", g(parent)), ("position", s(&format!("{id:04}")))])));
+    }
+    fields.extend(more);
+    o(fields)
+}
+
+fn symbol(main: u64, overrides: Vec<Kv<'static>>) -> Kv<'static> {
+    o(vec![("symbolID", g(main)), ("symbolOverrides", Kv::Array(overrides))])
+}
+
+fn row(path: &[u64], more: Fields) -> Kv<'static> {
+    let mut fields = vec![("guidPath", o(vec![("guids", Kv::Array(path.iter().map(|id| g(*id)).collect()))]))];
+    fields.extend(more);
+    o(fields)
+}
+
+fn solid(r: f32, g: f32, b: f32) -> Kv<'static> {
+    o(vec![
+        ("type", Kv::Enum("SOLID")),
+        ("color", o(vec![("r", Kv::Float(r)), ("g", Kv::Float(g)), ("b", Kv::Float(b)), ("a", Kv::Float(1.0))])),
+        ("opacity", Kv::Float(1.0)),
+        ("visible", Kv::Bool(true)),
+    ])
+}
+
+fn schema() -> Schema {
+    Schema::parse(export::SCHEMA).unwrap()
+}
+
+fn cached_component_message() -> Kv<'static> {
+    o(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, None, "DOCUMENT", "Document", vec![]),
+            node(2, Some(1), "CANVAS", "Visible page", vec![]),
+            node(
+                3,
+                Some(1),
+                "CANVAS",
+                "Remote library",
+                vec![
+                    ("internalOnly", Kv::Bool(true)),
+                    (
+                        "variableModeBySetMap",
+                        o(vec![("entries", Kv::Array(vec![o(vec![("variableSetID", o(vec![("guid", g(30))])), ("variableModeID", g(52))])]))]),
+                    ),
+                ],
+            ),
+            node(
+                30,
+                Some(3),
+                "VARIABLE_SET",
+                "Remote theme",
+                vec![(
+                    "variableSetModes",
+                    Kv::Array(vec![
+                        o(vec![("id", g(51)), ("name", s("Light")), ("sortPosition", s("!"))]),
+                        o(vec![("id", g(52)), ("name", s("Dark")), ("sortPosition", s("\""))]),
+                    ]),
+                )],
+            ),
+            node(
+                9,
+                Some(3),
+                "FRAME",
+                "Cached component set",
+                vec![("isStateGroup", Kv::Bool(true)), ("size", o(vec![("x", Kv::Float(24.0)), ("y", Kv::Float(24.0))])), ("transform", matrix(0.0))],
+            ),
+            node(
+                10,
+                Some(9),
+                "SYMBOL",
+                "Cached remote icon",
+                vec![("size", o(vec![("x", Kv::Float(24.0)), ("y", Kv::Float(24.0))])), ("transform", matrix(0.0))],
+            ),
+            node(
+                11,
+                Some(10),
+                "ROUNDED_RECTANGLE",
+                "Cached path",
+                vec![("size", o(vec![("x", Kv::Float(24.0)), ("y", Kv::Float(24.0))])), ("transform", matrix(0.0))],
+            ),
+            node(
+                12,
+                Some(10),
+                "INSTANCE",
+                "Nested cached instance",
+                vec![
+                    ("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])),
+                    ("transform", matrix(0.0)),
+                    ("symbolData", symbol(22, vec![row(&[23], vec![("fillPaints", Kv::Array(vec![solid(0.2, 0.7, 0.1)]))])])),
+                ],
+            ),
+            node(
+                13,
+                Some(9),
+                "SYMBOL",
+                "Nested cached main",
+                vec![("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])), ("transform", matrix(0.0))],
+            ),
+            node(
+                14,
+                Some(13),
+                "ROUNDED_RECTANGLE",
+                "Nested cached path",
+                vec![("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])), ("transform", matrix(0.0))],
+            ),
+            node(
+                15,
+                Some(10),
+                "INSTANCE",
+                "Nested internal instance",
+                vec![
+                    ("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])),
+                    ("transform", matrix(0.0)),
+                    ("symbolData", symbol(13, vec![])),
+                ],
+            ),
+            node(
+                20,
+                Some(2),
+                "INSTANCE",
+                "Visible icon instance",
+                vec![
+                    ("size", o(vec![("x", Kv::Float(24.0)), ("y", Kv::Float(24.0))])),
+                    ("transform", matrix(0.0)),
+                    ("symbolData", symbol(10, vec![])),
+                ],
+            ),
+            node(
+                22,
+                Some(2),
+                "SYMBOL",
+                "Visible nested main",
+                vec![("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])), ("transform", matrix(0.0))],
+            ),
+            node(
+                23,
+                Some(22),
+                "ROUNDED_RECTANGLE",
+                "Visible nested path",
+                vec![("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])), ("transform", matrix(0.0))],
+            ),
+        ]),
+    )])
+}
+
+fn cached_component_fixture() -> Vec<u8> {
+    let schema = schema();
+    super::tests::canvas(&schema, &cached_component_message())
+}
+
+fn cached_component_override_fixture() -> Vec<u8> {
+    let mut message = cached_component_message();
+    let Kv::Object(fields) = &mut message else { panic!("cached component fixture has an unexpected wire shape") };
+    let changes = &mut fields.iter_mut().find(|(key, _)| *key == "nodeChanges").unwrap().1;
+    let Kv::Array(nodes) = changes else { panic!("cached component fixture has an unexpected wire shape") };
+    let instance = nodes.iter_mut().find(|node| node.get("name").and_then(Kv::str) == Some("Visible icon instance")).unwrap();
+    let Kv::Object(fields) = instance else { panic!("cached component fixture has an unexpected wire shape") };
+    fields.iter_mut().find(|(key, _)| *key == "symbolData").unwrap().1 =
+        symbol(10, vec![row(&[12], vec![("symbolData", symbol(22, vec![row(&[26], vec![("overriddenSymbolID", g(24))])]))])]);
+    nodes.extend([
+        node(
+            24,
+            Some(3),
+            "SYMBOL",
+            "Overridden cached main",
+            vec![("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])), ("transform", matrix(0.0))],
+        ),
+        node(
+            25,
+            Some(24),
+            "ROUNDED_RECTANGLE",
+            "Overridden cached path",
+            vec![("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])), ("transform", matrix(0.0))],
+        ),
+        node(
+            26,
+            Some(22),
+            "INSTANCE",
+            "Deep cached instance",
+            vec![("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])), ("transform", matrix(0.0)), ("symbolData", symbol(27, vec![]))],
+        ),
+        node(
+            27,
+            Some(3),
+            "SYMBOL",
+            "Base deep main",
+            vec![("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])), ("transform", matrix(0.0))],
+        ),
+        node(
+            28,
+            Some(27),
+            "ROUNDED_RECTANGLE",
+            "Base deep path",
+            vec![("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])), ("transform", matrix(0.0))],
+        ),
+    ]);
+    super::tests::canvas(&schema(), &message)
+}
+
+fn cached_component_default_swap_fixture() -> Vec<u8> {
+    let mut message = cached_component_message();
+    let Kv::Object(fields) = &mut message else { panic!("cached component fixture has an unexpected wire shape") };
+    let changes = &mut fields.iter_mut().find(|(key, _)| *key == "nodeChanges").unwrap().1;
+    let Kv::Array(nodes) = changes else { panic!("cached component fixture has an unexpected wire shape") };
+    let owner = nodes.iter_mut().find(|node| node.get("name").and_then(Kv::str) == Some("Visible nested main")).unwrap();
+    let Kv::Object(fields) = owner else { panic!("cached component fixture has an unexpected wire shape") };
+    fields.push((
+        "componentPropDefs",
+        Kv::Array(vec![o(vec![
+            ("id", g(90)),
+            ("name", s("Icon")),
+            ("type", Kv::Enum("INSTANCE_SWAP")),
+            ("initialValue", o(vec![("guidValue", g(24))])),
+        ])]),
+    ));
+    nodes.extend([
+        node(
+            24,
+            Some(3),
+            "SYMBOL",
+            "Default cached main",
+            vec![("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])), ("transform", matrix(0.0))],
+        ),
+        node(
+            25,
+            Some(24),
+            "ROUNDED_RECTANGLE",
+            "Default cached path",
+            vec![("size", o(vec![("x", Kv::Float(12.0)), ("y", Kv::Float(12.0))])), ("transform", matrix(0.0))],
+        ),
+    ]);
+    super::tests::canvas(&schema(), &message)
+}
+
+fn assert_default_swap(doc: &Document) {
+    let owner = named_node(doc, "Visible nested main");
+    let target = named_node(doc, "Default cached main");
+    let NodeKind::Component { props, .. } = &doc.node(owner).unwrap().kind else { panic!("visible component lost its property definition") };
+    assert_eq!(props.get("Icon"), Some(&PropDef::InstanceSwap { default: target, preferred: Vec::new() }), "{props:?}");
+    assert!(doc.is_remote(target));
+}
+
+fn named_node(doc: &Document, name: &str) -> NodeId {
+    doc.nodes().find(|node| node.name == name).unwrap().id
+}
+
+fn assert_dark_remote_mode(doc: &Document, node: NodeId) {
+    let collection = doc.variables.collections.iter().find(|collection| collection.name == "Remote theme").unwrap();
+    let dark = collection.modes.iter().find(|mode| mode.name == "Dark").unwrap();
+    assert_eq!(doc.modes_for(node).get(&collection.id), Some(&dark.id));
+}
+
+fn assert_no_linked_library_records(doc: &Document) {
+    assert!(doc.libraries.enabled.is_empty());
+    assert!(doc.libraries.components.is_empty());
+    assert!(doc.libraries.styles.is_empty());
+    assert!(doc.libraries.collections.is_empty());
+    assert!(doc.libraries.variables.is_empty());
+}
+
+#[test]
+fn hidden_cached_component_is_retained_and_linked() {
+    let (doc, warnings) = import(&cached_component_fixture(), "Cached library.fig").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    assert_eq!(doc.pages.len(), 1, "hidden cache must not become a visible page");
+    let check = |doc: &Document| {
+        let store = doc.library_store().expect("private .fig cache is retained");
+        let component = named_node(doc, "Cached remote icon");
+        let path = doc.node(component).unwrap().children[0];
+        let set = doc.node(component).unwrap().parent.unwrap();
+        assert!(matches!(doc.node(set).unwrap().kind, NodeKind::ComponentSet { .. }));
+        assert_eq!(doc.node(doc.node(set).unwrap().parent.unwrap()).unwrap().parent, Some(store));
+        assert!(doc.is_remote(component) && doc.is_remote(path));
+        assert!(matches!(doc.node(component).unwrap().kind, NodeKind::Component { .. }));
+        assert_dark_remote_mode(doc, component);
+        assert_no_linked_library_records(doc);
+        // The visible instance resolves to the cached main, and its layer to the main's layer.
+        let instance = named_node(doc, "Visible icon instance");
+        assert!(matches!(doc.node(instance).unwrap().kind, NodeKind::Instance { component: linked, .. } if linked == component));
+        assert_eq!(doc.node(doc.node(instance).unwrap().children[0]).unwrap().source, Some(path));
+        // A cached main nested in another cached main is kept too, and so is an instance in the
+        // cache of a visible main, with the override its row carries.
+        let nested_main = named_node(doc, "Nested cached main");
+        let nested = named_node(doc, "Nested internal instance");
+        assert!(doc.is_remote(nested_main));
+        assert!(matches!(doc.node(nested).unwrap().kind, NodeKind::Instance { component: linked, .. } if linked == nested_main));
+        let external_main = named_node(doc, "Visible nested main");
+        let external = doc
+            .node(component)
+            .unwrap()
+            .children
+            .iter()
+            .copied()
+            .find(|id| doc.node(*id).is_some_and(|n| n.name == "Nested cached instance"))
+            .unwrap();
+        assert!(matches!(doc.node(external).unwrap().kind, NodeKind::Instance { component: linked, .. } if linked == external_main));
+        let external_child = doc.node(external).unwrap().children[0];
+        assert_eq!(doc.node(external_child).unwrap().source, Some(doc.node(external_main).unwrap().children[0]));
+        assert_eq!(fill_rgb_node(doc, external_child), Some([f64::from(0.2_f32), f64::from(0.7_f32), f64::from(0.1_f32)]));
+    };
+    check(&doc);
+    let (saved, warnings) = crate::load_bytes(&crate::save_bytes(&doc, None).unwrap()).unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    check(&saved);
+}
+
+#[test]
+fn visible_instance_override_retains_and_links_hidden_cached_main() {
+    let (doc, warnings) = import(&cached_component_override_fixture(), "Cached override.fig").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let nested = named_node(&doc, "Nested cached instance");
+    let deep = named_node(&doc, "Deep cached instance");
+    assert_eq!(doc.node(deep).unwrap().parent, Some(nested));
+    let NodeKind::Instance { component: overridden, .. } = doc.node(deep).unwrap().kind else { panic!("nested-row override lost its instance") };
+    let overridden = doc.node(overridden).unwrap();
+    assert_eq!(overridden.name, "Overridden cached main");
+    assert!(doc.is_remote(overridden.id));
+    assert_eq!(doc.node(doc.node(deep).unwrap().children[0]).unwrap().source, Some(overridden.children[0]));
+}
+
+#[test]
+fn visible_component_default_swap_retains_hidden_cached_main() {
+    let (doc, warnings) = import(&cached_component_default_swap_fixture(), "Cached default swap.fig").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    assert_default_swap(&doc);
+    let (saved, _) = crate::load_bytes(&crate::save_bytes(&doc, None).unwrap()).unwrap();
+    assert_default_swap(&saved);
+}
+
+#[test]
+fn public_rest_import_ignores_private_fig_provenance() {
+    let value = json!({
+        "name": "Public REST",
+        "document": {"type": "DOCUMENT", "children": [{"type": "CANVAS", "name": "Page", "children": []}]},
+        "_figLibraryContexts": [{"type": "FRAME", "name": "Private cache", "children": [{"type": "COMPONENT", "name": "Must not import", "children": []}]}]
+    });
+    let (doc, warnings) = crate::rest::import(&value, &|_| None).unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    assert!(doc.library_store().is_none() && doc.nodes().all(|node| node.name != "Must not import"));
+    // Valid provenance on mapped layers links nothing either.
+    for message in [message(false), external_namespace_message()] {
+        let (json, _, _) = super::map::to_rest(&message, "Identity", crate::rest::MAX_NODES);
+        let (doc, _) = crate::rest::import(&json, &|_| None).unwrap();
+        assert!(doc.nodes().all(|n| n.source.is_none()));
+    }
+}
+
+#[test]
+fn the_last_change_of_a_guid_wins_and_removed_changes_delete() {
+    let moved = node(12, Some(11), "FRAME", "Moved frame", vec![]);
+    let mut removed = node(13, Some(10), "FRAME", "Removed frame", vec![]);
+    let Kv::Object(fields) = &mut removed else { panic!() };
+    fields.iter_mut().find(|(key, _)| *key == "phase").unwrap().1 = Kv::Enum("REMOVED");
+    let message = o(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, None, "DOCUMENT", "Document", vec![]),
+            node(2, Some(1), "CANVAS", "Page", vec![]),
+            node(10, Some(2), "FRAME", "Left", vec![]),
+            node(11, Some(2), "FRAME", "Right", vec![]),
+            node(12, Some(10), "FRAME", "Moved frame", vec![]),
+            node(13, Some(10), "FRAME", "Removed frame", vec![]),
+            moved,
+            removed,
+        ]),
+    )]);
+    let (doc, _) = import(&super::tests::canvas(&schema(), &message), "Changes.fig").unwrap();
+    assert_eq!(doc.node(named_node(&doc, "Moved frame")).unwrap().parent, Some(named_node(&doc, "Right")));
+    assert!(doc.nodes().all(|n| n.name != "Removed frame"));
+    assert!(doc.node(named_node(&doc, "Left")).unwrap().children.is_empty());
+}
+
+#[test]
+fn internal_library_parent_cycles_are_bounded() {
+    let message = o(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, None, "CANVAS", "Visible page", vec![]),
+            node(2, Some(1), "INSTANCE", "Visible cyclic main", vec![("symbolData", symbol(11, vec![]))]),
+            node(3, Some(9), "CANVAS", "Cyclic library", vec![("internalOnly", Kv::Bool(true))]),
+            node(9, Some(11), "FRAME", "Loop frame", vec![]),
+            node(10, Some(3), "SYMBOL", "Unrelated component", vec![]),
+            node(11, Some(3), "SYMBOL", "Loop component", vec![]),
+        ]),
+    )]);
+    let (doc, warnings) = import(&super::tests::canvas(&schema(), &message), "Cyclic library.fig").unwrap();
+    assert!(warnings.iter().any(|warning| warning.contains("deeper than")), "{warnings:?}");
+    assert!(doc.node_count() < 1000, "the loop is cut at the nesting limit");
+}
+
+#[test]
+fn parent_loops_through_the_internal_canvas_end() {
+    // The canvas is a child of a frame inside one of its own symbols, and the used main sits below
+    // that frame: the walk up from the main reaches the canvas again.
+    let message = o(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, None, "CANVAS", "Visible page", vec![]),
+            node(2, Some(1), "INSTANCE", "Uses the main", vec![("symbolData", symbol(12, vec![]))]),
+            node(3, Some(9), "CANVAS", "Loop library", vec![("internalOnly", Kv::Bool(true))]),
+            node(9, Some(11), "FRAME", "Loop frame", vec![]),
+            node(11, Some(3), "SYMBOL", "Loop symbol", vec![]),
+            node(12, Some(9), "SYMBOL", "Used main", vec![]),
+        ]),
+    )]);
+    let (doc, _) = import(&super::tests::canvas(&schema(), &message), "Loop.fig").unwrap();
+    assert!(doc.nodes().any(|n| n.name == "Used main"));
+}
+
+fn fill_rgb_node(doc: &Document, id: NodeId) -> Option<[f64; 3]> {
+    let node = doc.node(id)?;
+    match &node.fills.first()?.kind {
+        PaintKind::Solid { color } => Some([f64::from(color.r), f64::from(color.g), f64::from(color.b)]),
+        _ => None,
+    }
+}
+
+fn alias_schema() -> Schema {
+    let schema = export::SCHEMA.replace("message NodeChange GUID guid=1,", "message NodeChange GUID guid=1, GUID overrideKey=500,");
+    Schema::parse(&schema).unwrap()
+}
+
+fn alias(id: u64) -> Fields {
+    vec![("overrideKey", g(id))]
+}
+
+fn import_alias_message(message: Kv<'static>) -> Document {
+    let schema = alias_schema();
+    let bytes = super::tests::canvas(&schema, &message);
+    let (doc, warnings) = import(&bytes, "Alias.fig").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    doc
+}
+
+fn fill_rgb(doc: &Document, name: &str) -> Option<[f64; 3]> {
+    let node = doc.nodes().find(|n| n.name == name)?;
+    fill_rgb_node(doc, node.id)
+}
+
+fn alias_priority_message() -> Kv<'static> {
+    let nested_local = symbol(10, vec![row(&[112], vec![("fillPaints", Kv::Array(vec![solid(0.0, 0.0, 1.0)]))])]);
+    o(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, None, "DOCUMENT", "Document", vec![]),
+            node(2, Some(1), "CANVAS", "Page", vec![]),
+            node(10, Some(2), "SYMBOL", "Inner main", vec![]),
+            node(11, Some(10), "FRAME", "Normal frame", vec![]),
+            node(12, Some(11), "ROUNDED_RECTANGLE", "Alias leaf", alias(112)),
+            node(20, Some(2), "SYMBOL", "Outer main", vec![]),
+            node(
+                21,
+                Some(20),
+                "INSTANCE",
+                "Nested slot",
+                vec![
+                    ("overrideKey", g(221)),
+                    ("symbolData", nested_local),
+                    ("derivedSymbolData", Kv::Array(vec![row(&[112], vec![("opacity", Kv::Float(0.25))])])),
+                ],
+            ),
+            node(
+                30,
+                Some(2),
+                "INSTANCE",
+                "Alias copy",
+                vec![
+                    (
+                        "symbolData",
+                        symbol(
+                            20,
+                            vec![
+                                row(&[221, 112], vec![("fillPaints", Kv::Array(vec![solid(0.0, 1.0, 0.0)]))]),
+                                row(&[21, 12], vec![("fillPaints", Kv::Array(vec![solid(1.0, 0.0, 0.0)]))]),
+                            ],
+                        ),
+                    ),
+                    ("derivedSymbolData", Kv::Array(vec![row(&[221, 112], vec![("fillPaints", Kv::Array(vec![solid(1.0, 0.5, 0.0)]))])])),
+                ],
+            ),
+        ]),
+    )])
+}
+
+#[test]
+fn override_aliases_normalize_lazily_and_keep_outer_wire_order() {
+    let doc = import_alias_message(alias_priority_message());
+    let main = named(&doc, "Inner main");
+    let leaf = child(&doc, child(&doc, main, 0), 0);
+    let outer_main = named(&doc, "Outer main");
+    let main_slot = child(&doc, outer_main, 0);
+    let main_leaf = child(&doc, child(&doc, main_slot, 0), 0);
+    let copy = named(&doc, "Alias copy");
+    let nested = child(&doc, copy, 0);
+    let frame = child(&doc, nested, 0);
+    let expanded_leaf = child(&doc, frame, 0);
+    assert_eq!(doc.node(main_leaf).unwrap().source, Some(leaf));
+    assert_eq!(doc.node(expanded_leaf).unwrap().source, Some(main_leaf));
+    assert_eq!(fill_rgb_node(&doc, expanded_leaf), Some([1.0, 0.5, 0.0]));
+    assert_eq!(doc.node(expanded_leaf).unwrap().opacity, 0.25);
+    assert_eq!(fill_rgb_node(&doc, leaf), None, "source node stays unchanged");
+}
+
+#[test]
+fn selected_swapped_main_owns_alias_resolution_scope() {
+    let message = o(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, None, "DOCUMENT", "Document", vec![]),
+            node(2, Some(1), "CANVAS", "Page", vec![]),
+            node(10, Some(2), "SYMBOL", "Old main", vec![]),
+            node(11, Some(10), "ROUNDED_RECTANGLE", "Old leaf", alias(112)),
+            node(20, Some(2), "SYMBOL", "Swapped main", vec![]),
+            node(21, Some(20), "ROUNDED_RECTANGLE", "Swapped leaf", alias(112)),
+            node(
+                30,
+                Some(2),
+                "INSTANCE",
+                "Swap",
+                vec![
+                    ("overriddenSymbolID", g(20)),
+                    ("symbolData", symbol(10, vec![row(&[112], vec![("fillPaints", Kv::Array(vec![solid(1.0, 0.0, 0.0)]))])])),
+                ],
+            ),
+        ]),
+    )]);
+    let doc = import_alias_message(message);
+    let copy = named(&doc, "Swap");
+    let source = named(&doc, "Swapped leaf");
+    let expanded = child(&doc, copy, 0);
+    assert_eq!(doc.node(expanded).unwrap().source, Some(source));
+    assert_eq!(fill_rgb_node(&doc, expanded), Some([1.0, 0.0, 0.0]));
+    assert_eq!(fill_rgb(&doc, "Old leaf"), None);
+}
+
+#[test]
+fn ambiguous_alias_is_ignored_but_current_guid_still_matches() {
+    let message = o(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, None, "DOCUMENT", "Document", vec![]),
+            node(2, Some(1), "CANVAS", "Page", vec![]),
+            node(10, Some(2), "SYMBOL", "Main", vec![]),
+            node(11, Some(10), "ROUNDED_RECTANGLE", "First", alias(13)),
+            node(12, Some(10), "ROUNDED_RECTANGLE", "Second", alias(112)),
+            node(13, Some(10), "ROUNDED_RECTANGLE", "Current GUID", alias(112)),
+            node(
+                20,
+                Some(2),
+                "INSTANCE",
+                "Copy",
+                vec![(
+                    "symbolData",
+                    symbol(
+                        10,
+                        vec![
+                            row(&[112], vec![("fillPaints", Kv::Array(vec![solid(1.0, 0.0, 0.0)]))]),
+                            row(&[13], vec![("fillPaints", Kv::Array(vec![solid(0.0, 0.0, 1.0)]))]),
+                        ],
+                    ),
+                )],
+            ),
+        ]),
+    )]);
+    let doc = import_alias_message(message);
+    let copy = named(&doc, "Copy");
+    let first = child(&doc, copy, 0);
+    let second = child(&doc, copy, 1);
+    let current = child(&doc, copy, 2);
+    assert_eq!(doc.node(first).unwrap().source, Some(named(&doc, "First")));
+    assert_eq!(fill_rgb_node(&doc, first), None, "ambiguous alias must not be guessed");
+    assert_eq!(doc.node(second).unwrap().source, Some(named(&doc, "Second")));
+    assert_eq!(fill_rgb_node(&doc, second), None, "ambiguous alias must not match either target");
+    assert_eq!(doc.node(current).unwrap().source, Some(named(&doc, "Current GUID")));
+    assert_eq!(fill_rgb_node(&doc, current), Some([0.0, 0.0, 1.0]), "a current GUID outranks an alias with the same key");
+}
+
+fn message(swapped: bool) -> Kv<'static> {
+    let shape = |id, parent, x| node(id, Some(parent), "ROUNDED_RECTANGLE", "Same layer", vec![("transform", matrix(x))]);
+    let mut changes = vec![
+        node(1, None, "DOCUMENT", "Identity", vec![]),
+        node(2, Some(1), "CANVAS", "Page", vec![]),
+        node(10, Some(2), "SYMBOL", "Renamed Left main", vec![]),
+        node(11, Some(10), "FRAME", "Frame", vec![("transform", matrix(2.0))]),
+        shape(12, 11, 2.0),
+        shape(13, 11, 4.0),
+        shape(14, 11, 6.0),
+        node(15, Some(11), "FRAME", "Deep frame", vec![]),
+        node(16, Some(15), "FRAME", "Deeper frame", vec![]),
+        shape(17, 16, 8.0),
+        node(
+            20,
+            Some(2),
+            "SYMBOL",
+            "State=Right, Renamed=Yes",
+            vec![(
+                "componentPropDefs",
+                Kv::Array(vec![o(vec![
+                    ("id", g(200)),
+                    ("name", s("Enabled")),
+                    ("type", Kv::Enum("BOOL")),
+                    ("initialValue", o(vec![("boolValue", Kv::Bool(true))])),
+                ])]),
+            )],
+        ),
+        node(21, Some(20), "FRAME", "Frame", vec![("transform", matrix(if swapped { 23.0 } else { 2.0 }))]),
+        shape(22, 21, 2.0),
+        shape(23, 21, 4.0),
+        shape(24, 21, 6.0),
+        node(30, Some(2), "SYMBOL", "Outer", vec![]),
+        node(40, Some(30), "INSTANCE", "Original wrapper", vec![("symbolData", symbol(50, vec![row(&[60, 21], vec![("transform", matrix(3.0))])]))]),
+        node(50, Some(2), "SYMBOL", "Renamed wrapper main", vec![]),
+        node(
+            60,
+            Some(50),
+            "INSTANCE",
+            "Same nested slot",
+            vec![
+                ("symbolData", symbol(20, vec![])),
+                ("visible", Kv::Bool(false)),
+                ("opacity", Kv::Float(0.3)),
+                ("mask", Kv::Bool(true)),
+                ("componentPropAssignments", Kv::Array(vec![o(vec![("defID", g(200)), ("value", o(vec![("boolValue", Kv::Bool(false))]))])])),
+            ],
+        ),
+        node(61, Some(50), "INSTANCE", "Same nested slot", vec![("symbolData", symbol(20, vec![]))]),
+    ];
+    let mut nested = vec![
+        ("name", s("Renamed nested slot")),
+        ("visible", Kv::Bool(true)),
+        ("opacity", Kv::Float(1.0)),
+        ("mask", Kv::Bool(false)),
+        ("componentPropAssignments", Kv::Array(vec![])),
+    ];
+    if swapped {
+        nested.push(("overriddenSymbolID", g(10)));
+    }
+    changes.push(node(
+        70,
+        Some(2),
+        "INSTANCE",
+        "Copy",
+        vec![(
+            "symbolData",
+            symbol(
+                30,
+                vec![
+                    row(&[40], vec![("name", s("Renamed wrapper"))]),
+                    row(&[40, 60], nested),
+                    row(&[40, 60, if swapped { 11 } else { 21 }], vec![("transform", matrix(2.0))]),
+                ],
+            ),
+        )],
+    ));
+    o(vec![("nodeChanges", Kv::Array(changes))])
+}
+
+fn import_message(swapped: bool) -> Document {
+    let schema = Schema::parse(export::SCHEMA).unwrap();
+    let bytes = super::tests::canvas(&schema, &message(swapped));
+    let (doc, notes) = import(&bytes, "Identity.fig").unwrap();
+    assert!(notes.is_empty(), "{notes:?}");
+    doc
+}
+
+fn named(doc: &Document, name: &str) -> NodeId {
+    doc.nodes().find(|n| n.name == name).unwrap().id
+}
+
+fn child(doc: &Document, id: NodeId, index: usize) -> NodeId {
+    doc.node(id).unwrap().children[index]
+}
+
+fn assert_contextual(doc: &Document) {
+    let outer = named(doc, "Outer");
+    let right = named(doc, "State=Right, Renamed=Yes");
+    let wrapper_main = named(doc, "Renamed wrapper main");
+    let copy = named(doc, "Copy");
+    let main_wrapper = child(doc, outer, 0);
+    let copy_wrapper = child(doc, copy, 0);
+    assert_eq!(doc.node(copy).unwrap().source, Some(outer));
+    assert_eq!(doc.node(copy_wrapper).unwrap().source, Some(main_wrapper));
+    assert!(matches!(&doc.node(copy_wrapper).unwrap().kind, NodeKind::Instance {component, ..} if *component == wrapper_main));
+    for index in 0..2 {
+        let default_slot = child(doc, main_wrapper, index);
+        let copy_slot = child(doc, copy_wrapper, index);
+        assert_eq!(doc.node(copy_slot).unwrap().source, Some(default_slot), "slot {index}");
+        assert!(matches!(&doc.node(default_slot).unwrap().kind, NodeKind::Instance {component, ..} if *component == right));
+        assert!(matches!(&doc.node(copy_slot).unwrap().kind, NodeKind::Instance {component, ..} if *component == right));
+    }
+    let default_slot = child(doc, main_wrapper, 0);
+    let copy_slot = child(doc, copy_wrapper, 0);
+    let inherited = child(doc, default_slot, 0);
+    let copy_frame = child(doc, copy_slot, 0);
+    assert!(matches!(doc.node(copy_frame).unwrap().kind, NodeKind::Frame));
+    assert_eq!(doc.node(inherited).unwrap().transform.translation().x, 3.0);
+    assert_eq!(doc.node(copy_frame).unwrap().transform.translation().x, 2.0);
+    assert_eq!(doc.node(copy_frame).unwrap().source, Some(inherited));
+    for index in 0..3 {
+        assert_eq!(doc.node(child(doc, copy_frame, index)).unwrap().source, Some(child(doc, inherited, index)));
+        assert_eq!(doc.node(child(doc, copy_frame, index)).unwrap().transform.translation().x, 2.0 + 2.0 * index as f64);
+    }
+    let a = doc.node(default_slot).unwrap();
+    let b = doc.node(copy_slot).unwrap();
+    assert!(!a.visible && a.is_mask && a.opacity < 1.0);
+    assert!(b.visible && !b.is_mask && b.opacity == 1.0);
+    assert!(matches!(&a.kind, NodeKind::Instance {props, ..} if props.len() == 1 && props.values().all(|p| p == &json!(false))));
+    assert!(matches!(&b.kind, NodeKind::Instance {props, ..} if props.is_empty()));
+}
+
+#[test]
+fn contextual_sources_preserve_inherited_geometry_and_explicit_clears() {
+    assert_contextual(&import_message(false));
+}
+
+fn assert_swapped(doc: &Document) {
+    let outer = named(doc, "Outer");
+    let right = named(doc, "State=Right, Renamed=Yes");
+    let copy = named(doc, "Copy");
+    let main_wrapper = child(doc, outer, 0);
+    let copy_wrapper = child(doc, copy, 0);
+    let copy_slot = child(doc, copy_wrapper, 0);
+    let default_slot = child(doc, main_wrapper, 0);
+    let left = named(doc, "Renamed Left main");
+    assert_eq!(doc.node(copy).unwrap().source, Some(outer));
+    assert_eq!(doc.node(copy_wrapper).unwrap().source, Some(main_wrapper));
+    assert_eq!(doc.node(copy_slot).unwrap().source, Some(default_slot));
+    assert!(matches!(&doc.node(copy_slot).unwrap().kind, NodeKind::Instance {component, props} if *component == left && props.is_empty()));
+    assert!(matches!(&doc.node(default_slot).unwrap().kind, NodeKind::Instance {component, ..} if *component == right));
+    let current_frame = child(doc, copy_slot, 0);
+    let left_frame = child(doc, left, 0);
+    assert!(matches!(doc.node(current_frame).unwrap().kind, NodeKind::Frame));
+    assert_eq!(doc.node(current_frame).unwrap().source, Some(left_frame));
+    assert_eq!(doc.node(current_frame).unwrap().transform.translation().x, 2.0);
+    assert_eq!(doc.node(child(doc, right, 0)).unwrap().transform.translation().x, 23.0);
+    for index in 0..3 {
+        assert_eq!(doc.node(child(doc, current_frame, index)).unwrap().source, Some(child(doc, left_frame, index)));
+        assert_eq!(doc.node(child(doc, current_frame, index)).unwrap().transform.translation().x, 2.0 + 2.0 * index as f64);
+    }
+    let deep_copy = child(doc, child(doc, child(doc, current_frame, 3), 0), 0);
+    let deep_main = child(doc, child(doc, child(doc, left_frame, 3), 0), 0);
+    assert_eq!(doc.node(deep_copy).unwrap().source, Some(deep_main));
+    assert_eq!(doc.node(deep_copy).unwrap().transform.translation().x, 8.0);
+    let other = child(doc, copy_wrapper, 1);
+    assert_eq!(doc.node(other).unwrap().source, Some(child(doc, main_wrapper, 1)));
+    assert!(matches!(&doc.node(other).unwrap().kind, NodeKind::Instance {component, ..} if *component == right));
+    assert!(doc.node(copy_slot).unwrap().visible && !doc.node(copy_slot).unwrap().is_mask && doc.node(copy_slot).unwrap().opacity == 1.0);
+}
+
+#[test]
+fn swapped_children_use_current_main_through_frames_and_multiple_siblings() {
+    assert_swapped(&import_message(true));
+}
+
+fn edit_node(value: &mut Value, id: &str, edit: &mut dyn FnMut(&mut Value)) {
+    if value.get("id").and_then(Value::as_str) == Some(id) {
+        edit(value);
+    }
+    if let Some(kids) = value.get_mut("children").and_then(Value::as_array_mut) {
+        for child in kids {
+            edit_node(child, id, edit);
+        }
+    }
+}
+
+#[test]
+fn missing_foreign_self_and_wrong_namespace_provenance_is_not_guessed() {
+    for (origin, id) in [("1:99999", "I1:70;1:40"), ("1:12", "I1:70;1:40"), ("1:70", "1:70"), ("1:40", "I1:70;1:40")] {
+        let (mut json, _, _) = super::map::to_rest(&message(false), "Identity", crate::rest::MAX_NODES);
+        edit_node(&mut json["document"]["children"][0], id, &mut |node| {
+            node[crate::rest::FIG_SOURCE_FIELD]["origin"] = json!(origin);
+            if id == "1:70" {
+                node["componentId"] = json!("1:70"); // a root cannot be its own component
+            } else if origin == "1:40" {
+                node["id"] = json!("I1:999;1:40");
+            } else {
+                node["id"] = json!(format!("I1:70;{origin}")); // valid namespace, but missing/foreign target
+            }
+        });
+        let (doc, _) = crate::rest::import_fig(&json, &|_| None).unwrap();
+        let target = if id == "1:70" { named(&doc, "Copy") } else { named(&doc, "Renamed wrapper") };
+        assert!(doc.node(target).unwrap().source.is_none(), "{origin}/{id}");
+    }
+}
+
+#[test]
+fn forward_main_references_and_duplicate_ids_are_conservative() {
+    let (mut json, _, _) = super::map::to_rest(&message(false), "Identity", crate::rest::MAX_NODES);
+    json["document"]["children"][0]["children"].as_array_mut().unwrap().rotate_right(1);
+    let (doc, _) = crate::rest::import_fig(&json, &|_| None).unwrap();
+    assert!(doc.node(named(&doc, "Copy")).unwrap().source.is_some());
+    // 1:40 is nested inside Outer, so duplicate that actual template at page level.
+    let template = json["document"]["children"][0]["children"].as_array().unwrap().iter().find(|n| n["id"] == "1:30").unwrap()["children"][0].clone();
+    json["document"]["children"][0]["children"].as_array_mut().unwrap().push(template);
+    let (doc, _) = crate::rest::import_fig(&json, &|_| None).unwrap();
+    assert!(doc.node(named(&doc, "Renamed wrapper")).unwrap().source.is_none());
+}
+
+#[test]
+fn missing_contextual_targets_do_not_fall_back_to_a_global_slot() {
+    let (mut json, _, _) = super::map::to_rest(&message(false), "Identity", crate::rest::MAX_NODES);
+    edit_node(&mut json["document"]["children"][0], "1:40", &mut |node| {
+        node["children"].as_array_mut().unwrap().retain(|n| n["id"] != "I1:40;1:60");
+    });
+    let (doc, _) = crate::rest::import_fig(&json, &|_| None).unwrap();
+    let copy_slot = child(&doc, child(&doc, named(&doc, "Copy"), 0), 0);
+    assert!(doc.node(copy_slot).unwrap().source.is_none());
+    assert!(doc.nodes().any(|n| n.name == "Same nested slot"), "the raw slot still exists");
+}
+
+#[test]
+fn instance_to_empty_frame_keeps_its_source_identity() {
+    let mut msg = message(false);
+    let Kv::Object(top) = &mut msg else { panic!() };
+    let Kv::Array(nodes) = &mut top.iter_mut().find(|(key, _)| *key == "nodeChanges").unwrap().1 else { panic!() };
+    let copy = nodes.iter_mut().find(|n| n.get("name").and_then(Kv::str) == Some("Copy")).unwrap();
+    let Kv::Object(fields) = copy else { panic!() };
+    let Kv::Object(symbol) = &mut fields.iter_mut().find(|(key, _)| *key == "symbolData").unwrap().1 else { panic!() };
+    let Kv::Array(overrides) = &mut symbol.iter_mut().find(|(key, _)| *key == "symbolOverrides").unwrap().1 else { panic!() };
+    overrides.push(row(&[40, 61], vec![("type", Kv::Enum("FRAME"))]));
+    let (doc, _) = import(&super::tests::canvas(&schema(), &msg), "Identity.fig").unwrap();
+    let main = child(&doc, named(&doc, "Outer"), 0);
+    let copy = child(&doc, named(&doc, "Copy"), 0);
+    let frame = child(&doc, copy, 1);
+    assert!(matches!(doc.node(frame).unwrap().kind, NodeKind::Frame));
+    assert!(doc.node(frame).unwrap().children.is_empty());
+    assert_eq!(doc.node(frame).unwrap().source, Some(child(&doc, main, 1)));
+}
+
+#[test]
+fn explicit_frame_to_instance_resets_children_to_the_resolved_main() {
+    let mut msg = message(false);
+    let Kv::Object(top) = &mut msg else { panic!() };
+    let Kv::Array(nodes) = &mut top.iter_mut().find(|(key, _)| *key == "nodeChanges").unwrap().1 else { panic!() };
+    nodes.push(node(80, Some(30), "FRAME", "Original frame", vec![]));
+    nodes.push(node(81, Some(80), "ROUNDED_RECTANGLE", "Old frame child", vec![]));
+    let copy = nodes.iter_mut().find(|n| n.get("name").and_then(Kv::str) == Some("Copy")).unwrap();
+    let Kv::Object(fields) = copy else { panic!() };
+    let Kv::Object(symbol) = &mut fields.iter_mut().find(|(key, _)| *key == "symbolData").unwrap().1 else { panic!() };
+    let Kv::Array(overrides) = &mut symbol.iter_mut().find(|(key, _)| *key == "symbolOverrides").unwrap().1 else { panic!() };
+    overrides.push(row(&[80], vec![("type", Kv::Enum("INSTANCE")), ("overriddenSymbolID", g(10))]));
+    let (doc, notes) = import(&super::tests::canvas(&schema(), &msg), "Identity.fig").unwrap();
+    assert!(notes.is_empty(), "{notes:?}");
+    let original = child(&doc, named(&doc, "Outer"), 1);
+    let current = child(&doc, named(&doc, "Copy"), 1);
+    let left = named(&doc, "Renamed Left main");
+    assert!(matches!(doc.node(original).unwrap().kind, NodeKind::Frame));
+    assert_eq!(doc.node(current).unwrap().source, Some(original));
+    assert!(matches!(&doc.node(current).unwrap().kind, NodeKind::Instance {component, ..} if *component == left));
+    assert_eq!(doc.node(child(&doc, current, 0)).unwrap().source, Some(child(&doc, left, 0)));
+}
+
+// The orphan symbol is decoded and expanded but is not a layer on any imported page. This
+// matches an external main: its instance becomes a frame while the rendered body survives.
+fn external_namespace_message() -> Kv<'static> {
+    o(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, None, "DOCUMENT", "External namespace", vec![]),
+            node(2, Some(1), "CANVAS", "Page", vec![]),
+            node(
+                10,
+                Some(2),
+                "SYMBOL",
+                "Known main",
+                vec![(
+                    "componentPropDefs",
+                    Kv::Array(vec![o(vec![
+                        ("id", g(200)),
+                        ("name", s("Enabled")),
+                        ("type", Kv::Enum("BOOL")),
+                        ("initialValue", o(vec![("boolValue", Kv::Bool(true))])),
+                    ])]),
+                )],
+            ),
+            node(11, Some(10), "FRAME", "Known frame", vec![("transform", matrix(2.0))]),
+            node(12, Some(11), "ROUNDED_RECTANGLE", "Known leaf", vec![("transform", matrix(4.0))]),
+            node(30, Some(2), "SYMBOL", "Outer external", vec![]),
+            node(
+                90,
+                Some(30),
+                "INSTANCE",
+                "External body",
+                vec![("symbolData", symbol(99, vec![row(&[110, 11], vec![("transform", matrix(3.0))])]))],
+            ),
+            node(99, None, "SYMBOL", "External orphan", vec![]),
+            node(100, Some(99), "FRAME", "Body frame", vec![]),
+            node(101, Some(99), "FRAME", "Other body frame", vec![]),
+            node(
+                110,
+                Some(100),
+                "INSTANCE",
+                "Same slot",
+                vec![
+                    ("symbolData", symbol(10, vec![])),
+                    ("visible", Kv::Bool(false)),
+                    ("opacity", Kv::Float(0.3)),
+                    ("mask", Kv::Bool(true)),
+                    ("componentPropAssignments", Kv::Array(vec![o(vec![("defID", g(200)), ("value", o(vec![("boolValue", Kv::Bool(false))]))])])),
+                ],
+            ),
+            node(111, Some(100), "INSTANCE", "Same slot", vec![("symbolData", symbol(10, vec![]))]),
+            node(
+                70,
+                Some(2),
+                "INSTANCE",
+                "External copy",
+                vec![(
+                    "symbolData",
+                    symbol(
+                        30,
+                        vec![
+                            row(
+                                &[90, 110],
+                                vec![
+                                    ("name", s("Renamed owned slot")),
+                                    ("visible", Kv::Bool(true)),
+                                    ("opacity", Kv::Float(1.0)),
+                                    ("mask", Kv::Bool(false)),
+                                    ("componentPropAssignments", Kv::Array(vec![])),
+                                ],
+                            ),
+                            row(&[90, 110, 11], vec![("transform", matrix(2.0))]),
+                        ],
+                    ),
+                )],
+            ),
+        ]),
+    )])
+}
+
+fn assert_external_namespace(doc: &Document) {
+    let outer = named(doc, "Outer external");
+    let copy = named(doc, "External copy");
+    let main = named(doc, "Known main");
+    let body = child(doc, outer, 0);
+    let copied_body = child(doc, copy, 0);
+    assert!(matches!(doc.node(body).unwrap().kind, NodeKind::Frame));
+    assert!(matches!(doc.node(copied_body).unwrap().kind, NodeKind::Frame));
+    assert_eq!(doc.node(body).unwrap().source, None, "the absent external main must not acquire a guessed native node");
+    assert_eq!(doc.node(copied_body).unwrap().source, Some(body));
+    let frame = child(doc, body, 0);
+    let copied_frame = child(doc, copied_body, 0);
+    assert_eq!(doc.node(frame).unwrap().source, None, "materialized ordinary layers are owned by the frame");
+    assert_eq!(doc.node(copied_frame).unwrap().source, Some(frame));
+    for index in 0..2 {
+        let slot = child(doc, frame, index);
+        let copied_slot = child(doc, copied_frame, index);
+        assert_eq!(doc.node(slot).unwrap().source, Some(main), "known owned instance has its real root main");
+        assert_eq!(doc.node(copied_slot).unwrap().source, Some(slot), "copied slots preserve the contextual owned layer identity");
+        assert!(matches!(&doc.node(slot).unwrap().kind, NodeKind::Instance {component, ..} if *component == main));
+        assert!(matches!(&doc.node(copied_slot).unwrap().kind, NodeKind::Instance {component, ..} if *component == main));
+        let inherited = child(doc, slot, 0);
+        let current = child(doc, copied_slot, 0);
+        assert_eq!(doc.node(inherited).unwrap().source, Some(child(doc, main, 0)));
+        assert_eq!(doc.node(current).unwrap().source, Some(inherited));
+        assert_eq!(doc.node(inherited).unwrap().transform.translation().x, if index == 0 { 3.0 } else { 2.0 });
+        assert_eq!(doc.node(current).unwrap().transform.translation().x, 2.0);
+        assert_eq!(doc.node(child(doc, current, 0)).unwrap().source, Some(child(doc, inherited, 0)));
+        assert_eq!(doc.node(child(doc, current, 0)).unwrap().transform.translation().x, 4.0);
+    }
+    let old = doc.node(child(doc, frame, 0)).unwrap();
+    let current = doc.node(child(doc, copied_frame, 0)).unwrap();
+    assert!(!old.visible && old.is_mask && old.opacity < 1.0);
+    assert!(current.visible && !current.is_mask && current.opacity == 1.0);
+    assert_eq!(current.name, "Renamed owned slot");
+    assert!(matches!(&old.kind, NodeKind::Instance {props, ..} if props.len() == 1));
+    assert!(matches!(&current.kind, NodeKind::Instance {props, ..} if props.is_empty()));
+}
+
+#[test]
+fn absent_external_mains_keep_known_owned_instances_and_contextual_copies() {
+    let (doc, notes) = import(&super::tests::canvas(&schema(), &external_namespace_message()), "External.fig").unwrap();
+    assert!(notes.iter().any(|w| w.contains("components that aren't in the file")), "{notes:?}");
+    assert!(!notes.iter().any(|w| w.contains("source link")), "materialized own layers are not unresolved copies: {notes:?}");
+    assert_external_namespace(&doc);
+}
+
+#[test]
+fn external_namespace_is_private_and_requires_actual_wire_instances() {
+    for mode in 0..3 {
+        let (mut json, _, _) = super::map::to_rest(&external_namespace_message(), "External", crate::rest::MAX_NODES);
+        if mode == 0 {
+            let (doc, _) = crate::rest::import(&json, &|_| None).unwrap();
+            assert!(doc.nodes().all(|n| n.source.is_none()));
+            continue;
+        }
+        edit_node(&mut json["document"]["children"][0], "1:90", &mut |node| {
+            if mode == 1 {
+                node["type"] = json!("FRAME");
+            } else {
+                node[crate::rest::FIG_SOURCE_FIELD]["wireInstance"] = json!(false);
+                node[crate::rest::FIG_SOURCE_FIELD]["wireFrame"] = json!(true);
+            }
+        });
+        let (doc, _) = crate::rest::import_fig(&json, &|_| None).unwrap();
+        let raw_slot = child(&doc, child(&doc, child(&doc, named(&doc, "Outer external"), 0), 0), 0);
+        assert!(doc.node(raw_slot).unwrap().source.is_none(), "ordinary/fake frame mode {mode} must not establish a namespace");
+    }
+}
+
+#[test]
+fn external_namespace_does_not_cover_present_wrong_kind_or_blocked_main() {
+    for mode in 0..3 {
+        let (mut json, _, _) = super::map::to_rest(&external_namespace_message(), "External", crate::rest::MAX_NODES);
+        let page = &mut json["document"]["children"][0];
+        match mode {
+            0 => page["children"].as_array_mut().unwrap().push(json!({"id":"1:99", "type":"FRAME", "name":"Wrong kind",
+                "_figSource":{"origin":"1:99","expanded":false,"wireFrame":true,"wireInstance":false}})),
+            1 => edit_node(page, "1:90", &mut |node| {
+                node["componentId"] = json!("1:30");
+            }),
+            _ => page["children"].as_array_mut().unwrap().push(json!({"id":"1:99", "type":"COMPONENT", "name":"Cycle main",
+                "_figSource":{"origin":"1:99","expanded":false,"wireFrame":false,"wireInstance":false},
+                "children":[{"id":"1:199", "type":"INSTANCE", "name":"Cycle edge", "componentId":"1:30",
+                    "_figSource":{"origin":"1:199","expanded":false,"wireFrame":false,"wireInstance":true}}]})),
+        }
+        let (doc, _) = crate::rest::import_fig(&json, &|_| None).unwrap();
+        let body = child(&doc, named(&doc, "Outer external"), 0);
+        assert!(matches!(doc.node(body).unwrap().kind, NodeKind::Frame));
+        let slot = child(&doc, child(&doc, body, 0), 0);
+        assert!(doc.node(slot).unwrap().source.is_none(), "existing invalid/cycle/self main mode {mode} must not become a materialized namespace");
+    }
+}
+
+#[test]
+fn external_namespace_rejects_foreign_siblings_duplicates_and_bad_paths() {
+    for mode in 0..4 {
+        let (mut json, _, _) = super::map::to_rest(&external_namespace_message(), "External", crate::rest::MAX_NODES);
+        let page = &mut json["document"]["children"][0];
+        match mode {
+            0 => {
+                // Same root namespace and GUID, but physically under a different frame slot.
+                let mut moved = None;
+                edit_node(page, "I1:70;1:90;1:100", &mut |node| {
+                    moved = Some(node["children"].as_array_mut().unwrap().remove(0));
+                });
+                edit_node(page, "I1:70;1:90;1:101", &mut |node| {
+                    node["children"] = json!([moved.take().unwrap()]);
+                });
+            }
+            1 => edit_node(page, "I1:70;1:90;1:110", &mut |node| {
+                node["id"] = json!("I1:70;1:999;1:110");
+            }),
+            2 => {
+                let duplicate = page["children"].as_array().unwrap().iter().find(|n| n["id"] == "1:30").unwrap()["children"][0].clone();
+                page["children"].as_array_mut().unwrap().push(duplicate);
+            }
+            _ => edit_node(page, "I1:90;1:100", &mut |node| {
+                node["id"] = json!("I1:999;1:100");
+            }),
+        }
+        let (doc, warnings) = crate::rest::import_fig(&json, &|_| None).unwrap();
+        let slot = named(&doc, "Renamed owned slot");
+        assert!(doc.node(slot).unwrap().source.is_none(), "invalid frame namespace mode {mode}");
+        assert!(warnings.iter().any(|w| w.contains("source link")), "invalid expanded paths remain reported: {warnings:?}");
+    }
+}
+
+fn no_style() -> Kv<'static> {
+    o(vec![("sessionID", Kv::Uint(4_294_967_295)), ("localID", Kv::Uint(4_294_967_295))])
+}
+
+#[test]
+fn an_explicit_no_style_detaches_and_beats_the_older_style_field() {
+    let message = o(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, None, "DOCUMENT", "Document", vec![]),
+            node(2, Some(1), "CANVAS", "Page", vec![]),
+            node(5, Some(2), "RECTANGLE", "Red", vec![("styleType", Kv::Enum("FILL"))]),
+            node(6, Some(2), "RECTANGLE", "Box", vec![("styleIdForFill", o(vec![("guid", no_style())])), ("inheritFillStyleID", g(5))]),
+            node(7, Some(2), "RECTANGLE", "Linked", vec![("inheritFillStyleID", g(5))]),
+        ]),
+    )]);
+    let (json, _, _) = super::map::to_rest(&message, "Detach", crate::rest::MAX_NODES);
+    let find = |name: &str| json["document"]["children"][0]["children"].as_array().unwrap().iter().find(|n| n["name"] == name).unwrap().clone();
+    assert!(find("Box")["styles"].get("fill").is_none(), "{}", find("Box")["styles"]);
+    assert!(find("Linked")["styles"].get("fill").is_some(), "the older field still links when nothing detaches");
+}
diff --git a/crates/format/src/fig/tail_tests.rs b/crates/format/src/fig/tail_tests.rs
index fc0c5815..abc90d73 100644
--- a/crates/format/src/fig/tail_tests.rs
+++ b/crates/format/src/fig/tail_tests.rs
@@ -3,13 +3,13 @@
 //! fixtures built in code with the parent module's helpers.
 
 use figcraft_doc::proto::Action;
-use figcraft_doc::{HandleMirroring, StrokeCap, WindingRule};
+use figcraft_doc::{HandleMirroring, StrokeCap, StrokeJoin, WindingRule};
 
 use super::super::network::{self, Network, Region, Segment, Vertex};
 use super::*;
 
 fn seg(a: usize, b: usize, ta: (f64, f64), tb: (f64, f64)) -> Segment {
-    Segment { a, ta, b, tb }
+    Segment { style: 0, a, ta, b, tb }
 }
 
 fn vtx(style: u32, x: f64, y: f64) -> Vertex {
@@ -19,7 +19,7 @@ fn vtx(style: u32, x: f64, y: f64) -> Vertex {
 /// A square with one curved side and a rounded, mirrored corner, filled even-odd.
 fn square_blob() -> Vec<u8> {
     network::encode(&Network {
-        vertices: vec![vtx(0, 0.0, 0.0), vtx(1, 50.0, 0.0), vtx(0, 50.0, 50.0), vtx(0, 0.0, 50.0)],
+        vertices: vec![vtx(0, 0.0, 0.0), vtx(1, 50.0, 0.0), vtx(2, 50.0, 50.0), vtx(3, 0.0, 50.0)],
         segments: vec![
             seg(0, 1, (10.0, 0.0), (-10.0, 0.0)),
             seg(1, 2, (0.0, 0.0), (0.0, 0.0)),
@@ -39,6 +39,15 @@ fn arrow_blob() -> Vec<u8> {
     })
 }
 
+/// An open path with one missing style ID and one unsupported point join.
+fn join_fallback_blob() -> Vec<u8> {
+    network::encode(&Network {
+        vertices: vec![vtx(4, 0.0, 0.0), vtx(5, 50.0, 0.0), vtx(0, 100.0, 0.0)],
+        segments: vec![seg(0, 1, (0.0, 0.0), (0.0, 0.0)), seg(1, 2, (0.0, 0.0), (0.0, 0.0))],
+        regions: vec![],
+    })
+}
+
 fn vector_data(blob: u64, nx: f64, ny: f64, styles: Vec<Kv<'static>>) -> Kv<'static> {
     o(vec![("vectorNetworkBlob", u(blob)), ("normalizedSize", xy(nx, ny)), ("styleOverrideTable", arr(styles))])
 }
@@ -121,13 +130,24 @@ fn tail_message() -> Kv<'static> {
                 ("transform", at(700.0, 0.0)),
                 ("fillPaints", arr(vec![solid(1.0, 0.0, 0.0)])),
                 ("fillGeometry", outline(0)),
+                ("strokeJoin", e("MITER")),
+                ("dashPattern", arr(vec![f(4.0), f(2.0)])),
                 (
                     "vectorData",
                     vector_data(
                         1,
                         100.0,
                         50.0,
-                        vec![o(vec![("styleID", u(1)), ("cornerRadius", f(4.0)), ("handleMirroring", e("ANGLE_AND_LENGTH"))])],
+                        vec![
+                            o(vec![
+                                ("styleID", u(1)),
+                                ("cornerRadius", f(4.0)),
+                                ("handleMirroring", e("ANGLE_AND_LENGTH")),
+                                ("strokeJoin", e("BEVEL")),
+                            ]),
+                            o(vec![("styleID", u(2)), ("strokeJoin", e("MITER"))]),
+                            o(vec![("styleID", u(3)), ("strokeJoin", e("ROUND"))]),
+                        ],
                     ),
                 ),
             ],
@@ -146,6 +166,19 @@ fn tail_message() -> Kv<'static> {
                 ("vectorData", vector_data(2, 100.0, 0.0, vec![o(vec![("styleID", u(2)), ("strokeCap", e("ARROW_LINES"))])])),
             ],
         ),
+        node(
+            42,
+            Some((1, "#")),
+            "VECTOR",
+            "Join Fallbacks",
+            vec![
+                ("size", xy(100.0, 10.0)),
+                ("transform", at(0.0, 330.0)),
+                stroke(),
+                ("strokeJoin", e("MITER")),
+                ("vectorData", vector_data(4, 100.0, 10.0, vec![o(vec![("styleID", u(5)), ("strokeJoin", u(999))])])),
+            ],
+        ),
         node(
             32,
             Some((1, "#")),
@@ -223,7 +256,7 @@ fn tail_message() -> Kv<'static> {
     ];
     let mut broken = square_blob();
     broken.truncate(30);
-    let blobs = [triangle_blob(), square_blob(), arrow_blob(), broken];
+    let blobs = [triangle_blob(), square_blob(), arrow_blob(), broken, join_fallback_blob()];
     o(vec![("nodeChanges", arr(nodes)), ("blobs", arr(blobs.into_iter().map(|b| o(vec![("bytes", Kv::Bytes(b))])).collect()))])
 }
 
@@ -247,6 +280,11 @@ fn vectors_import_as_editable_networks() {
     assert_eq!(pts, [(0.0, 0.0), (100.0, 0.0), (100.0, 100.0), (0.0, 100.0)]);
     assert_eq!((wave.vertices[1].radius, wave.vertices[1].mirror), (4.0, Some(HandleMirroring::AngleAndLength)));
     assert_eq!(wave.vertices[0].mirror, None);
+    assert_eq!(
+        wave.vertices.iter().map(|v| v.join).collect::<Vec<_>>(),
+        [None, Some(StrokeJoin::Bevel), Some(StrokeJoin::Miter), Some(StrokeJoin::Round)]
+    );
+    assert_eq!(named(&doc, "Wave").stroke.join, StrokeJoin::Miter);
     assert_eq!((wave.segments[0].ta, wave.segments[0].tb), ((20.0, 0.0), (-20.0, 0.0)));
     assert_eq!(wave.regions.len(), 1);
     assert_eq!((wave.regions[0].loops.clone(), wave.regions[0].winding), (vec![vec![0, 1, 2, 3]], WindingRule::EvenOdd));
@@ -260,6 +298,48 @@ fn vectors_import_as_editable_networks() {
     // A damaged network falls back to the outline.
     assert_eq!(network_of(&doc, "Broken").regions.len(), 1);
     assert!(warnings.iter().any(|w| w.contains("damaged vector networks import as outlines")), "{warnings:?}");
+    let fallback = network_of(&doc, "Join Fallbacks");
+    assert!(fallback.vertices.iter().all(|v| v.join.is_none()));
+    assert_eq!(named(&doc, "Join Fallbacks").stroke.join, StrokeJoin::Miter);
+    assert!(
+        warnings
+            .iter()
+            .any(|w| w.contains("vector points refer to point settings missing from the file; they use the layer's joins and plain corners")),
+        "{warnings:?}"
+    );
+    assert!(warnings.iter().any(|w| w.contains("unknown stroke joins use the layer join")), "{warnings:?}");
+    assert!(warnings.iter().any(|w| w.contains("dashed or variable-width strokes render with the layer join")), "{warnings:?}");
+}
+
+#[test]
+fn per_segment_stroke_styles_are_reported() {
+    let styled_import = |segment_style: u32| {
+        let mut blob = square_blob();
+        // The first segment's style id follows the counts and the vertices (12 bytes each).
+        blob[12 + 4 * 12..12 + 4 * 12 + 4].copy_from_slice(&segment_style.to_le_bytes());
+        let net = network::decode(&blob).unwrap();
+        assert_eq!((net.segments.len(), net.segments[0].style), (4, segment_style));
+        let mut message = tail_message();
+        let Kv::Object(fields) = &mut message else { panic!() };
+        let Kv::Array(blobs) = &mut fields.iter_mut().find(|(key, _)| *key == "blobs").unwrap().1 else { panic!() };
+        blobs[1] = o(vec![("bytes", Kv::Bytes(blob))]);
+        let (doc, warnings) = import(&canvas(&schema(), &message), "Tail").unwrap();
+        assert_eq!(network_of(&doc, "Wave").segments.len(), 4);
+        warnings
+    };
+    assert!(network::decode(&square_blob()).unwrap().segments.iter().all(|s| s.style == 0));
+    let plain = import(&tail_canvas(), "Tail").unwrap().1;
+    assert!(!plain.iter().any(|w| w.contains("vector segments")), "{plain:?}");
+    let uninterpreted = |w: &String| w.contains("style settings of some vector segments aren't supported; those segments use the layer's stroke");
+    let missing = |w: &String| w.contains("some vector segments refer to style settings missing from the file; they use the layer's stroke");
+    // Style 1 has a row in the layer's override table; its contents are not applied.
+    let known = styled_import(1);
+    assert_eq!(known.iter().filter(|w| uninterpreted(w)).count(), 1, "{known:?}");
+    assert!(!known.iter().any(missing), "{known:?}");
+    // Style 7 names no row at all.
+    let unknown = styled_import(7);
+    assert_eq!(unknown.iter().filter(|w| missing(w)).count(), 1, "{unknown:?}");
+    assert!(!unknown.iter().any(uninterpreted), "{unknown:?}");
 }
 
 #[test]
@@ -366,6 +446,29 @@ fn damaged_network_blobs_never_panic() {
     }
 }
 
+#[test]
+fn segment_styles_round_trip_without_changing_geometry() {
+    let original = Network {
+        vertices: vec![vtx(0, 2.0, 3.0), vtx(0, 10.0, 20.0), vtx(0, 40.0, 50.0), vtx(0, 60.0, 70.0)],
+        segments: vec![
+            seg(0, 1, (1.0, 2.0), (3.0, 4.0)),
+            Segment { style: 17, a: 1, ta: (5.0, 6.0), b: 2, tb: (7.0, 8.0) },
+            Segment { style: 27, a: 2, ta: (9.0, 10.0), b: 3, tb: (11.0, 12.0) },
+        ],
+        regions: vec![],
+    };
+    let bytes = network::encode(&original);
+    let decoded = network::decode(&bytes).unwrap();
+    assert_eq!(decoded.segments.len(), 3);
+    for (got, want) in decoded.segments.iter().zip(&original.segments) {
+        assert_eq!(got.style, want.style);
+        assert_eq!((got.a, got.ta, got.b, got.tb), (want.a, want.ta, want.b, want.tb));
+    }
+    for cut in 0..bytes.len() {
+        assert!(network::decode(&bytes[..cut]).is_none(), "truncated at {cut}");
+    }
+}
+
 #[test]
 fn mangled_tail_files_never_panic() {
     let c = tail_canvas();
@@ -392,8 +495,8 @@ fn mangled_tail_files_never_panic() {
             m[i] = r.next() as u8;
         }
         if let Ok(kv) = sc.decode_message(root, &m) {
-            let (json, _) = map::to_rest(&kv, "x");
-            let _ = crate::rest::import(&json, &crate::rest::no_images);
+            let (json, _, networks) = map::to_rest(&kv, "x", crate::rest::MAX_NODES);
+            let _ = crate::rest::import_with_networks(&json, &crate::rest::no_images, networks, crate::rest::MAX_NODES);
         }
     }
 }
diff --git a/crates/format/src/fig/tests.rs b/crates/format/src/fig/tests.rs
index 19c4fc15..35d8d08a 100644
--- a/crates/format/src/fig/tests.rs
+++ b/crates/format/src/fig/tests.rs
@@ -33,12 +33,13 @@ enum NavigationType NAVIGATE OVERLAY
 enum TransitionType INSTANT_TRANSITION DISSOLVE SMART_ANIMATE
 enum EasingType IN_CUBIC OUT_CUBIC
 enum ConstraintType MIN CENTER MAX STRETCH SCALE
+enum LeadingTrim NONE CAP_HEIGHT
 struct GUID uint sessionID, uint localID
 struct Color float r, float g, float b, float a
 struct Vector float x, float y
 struct Matrix float m00, float m01, float m02, float m10, float m11, float m12
 struct ColorStop Color color, float position
-message Image byte[] hash, string name
+message Image byte[] hash, string name, uint dataBlob
 message AssetRef string key, string version
 message VariableID GUID guid, AssetRef assetRef
 message PropRefValue GUID defId
@@ -72,7 +73,7 @@ message Event InteractionType interactionType
 message Action GUID transitionNodeID, TransitionType transitionType, float transitionDuration, EasingType easingType, ConnectionType connectionType, NavigationType navigationType, VariableTarget targetVariable, VariableData targetVariableData, VariableSetID targetVariableSetID, GUID targetVariableModeID, ConditionalActions[] conditionalActions
 message Interaction Event event, Action[] actions
 message StartingPoint string name, string position
-message NodeChange GUID guid, ParentIndex parentIndex, NodeType type, string name, bool visible, float opacity, Vector size, Matrix transform, Paint[] fillPaints, Paint[] strokePaints, float strokeWeight, float cornerRadius, bool resizeToFit, bool internalOnly, float fontSize, FontName fontName, TextData textData, uint styleID, Path[] fillGeometry, Path[] strokeGeometry, StyleType styleType, StyleId styleIdForFill, SymbolData symbolData, PropDef[] componentPropDefs, PropAssignment[] componentPropAssignments, VariableDataMap parameterConsumptionMap, SetMode[] variableSetModes, VariableID variableSetID, ResolvedType variableResolvedType, Values variableDataValues, ModeMap variableModeBySetMap, Interaction[] prototypeInteractions, StartingPoint prototypeStartingPoint, GUIDPath guidPath, StackMode stackMode, float stackSpacing, float stackHorizontalPadding, float stackVerticalPadding, uint count, float starInnerScale, VectorData vectorData, StrokeCap strokeCap, StrokeJoin strokeJoin, VectorMirror handleMirroring, ShapeWithTextType shapeWithTextType, ConnectorEndpoint connectorStart, ConnectorEndpoint connectorEnd, StrokeCap connectorStartCap, StrokeCap connectorEndCap, ConnectorLineStyle connectorLineStyle, ConstraintType horizontalConstraint, ConstraintType verticalConstraint, NodeChange[] derivedSymbolData, string key, string version
+message NodeChange GUID guid, ParentIndex parentIndex, NodeType type, string name, bool visible, float opacity, Vector size, Matrix transform, Paint[] fillPaints, Paint[] strokePaints, float strokeWeight, float cornerRadius, bool resizeToFit, bool internalOnly, float fontSize, FontName fontName, TextData textData, uint styleID, Path[] fillGeometry, Path[] strokeGeometry, StyleType styleType, StyleId styleIdForFill, SymbolData symbolData, PropDef[] componentPropDefs, PropAssignment[] componentPropAssignments, VariableDataMap parameterConsumptionMap, SetMode[] variableSetModes, VariableID variableSetID, ResolvedType variableResolvedType, Values variableDataValues, ModeMap variableModeBySetMap, Interaction[] prototypeInteractions, StartingPoint prototypeStartingPoint, GUIDPath guidPath, StackMode stackMode, float stackSpacing, float stackHorizontalPadding, float stackVerticalPadding, uint count, float starInnerScale, VectorData vectorData, StrokeCap strokeCap, StrokeJoin strokeJoin, VectorMirror handleMirroring, ShapeWithTextType shapeWithTextType, ConnectorEndpoint connectorStart, ConnectorEndpoint connectorEnd, StrokeCap connectorStartCap, StrokeCap connectorEndCap, ConnectorLineStyle connectorLineStyle, ConstraintType horizontalConstraint, ConstraintType verticalConstraint, NodeChange[] derivedSymbolData, string key, string version, LeadingTrim leadingTrim, float[] dashPattern
 message Blob byte[] bytes
 message Message NodeChange[] nodeChanges, Blob[] blobs
 ";
@@ -283,6 +284,7 @@ fn message() -> Kv<'static> {
                 ("fillPaints", arr(vec![solid(0.0, 0.0, 0.0)])),
                 ("fontSize", f(16.0)),
                 ("fontName", font("Regular")),
+                ("leadingTrim", e("CAP_HEIGHT")),
                 ("textData", text),
             ],
         ),
@@ -390,6 +392,175 @@ fn named<'d>(doc: &'d figcraft_doc::Document, name: &str) -> &'d figcraft_doc::N
     doc.nodes().find(|n| n.name == name).unwrap_or_else(|| panic!("no layer {name}"))
 }
 
+/// The shared schema plus the grid sizing definitions only these tests use.
+fn grid_schema() -> Schema {
+    const NODE_FIELDS: &str = ", GridTrackMap gridColumns, GridTrackMap gridRows, GridTrackSizeMap gridColumnsSizing, GridTrackSizeMap gridRowsSizing, GUID gridColumnAnchor, GUID gridRowAnchor, uint gridColumnSpan, uint gridRowSpan, float gridColumnGap, float gridRowGap";
+    const TYPES: &str = "
+enum GridTrackSizingType FLEX FIXED HUG UNKNOWN
+message GridTrackSizeFunction GridTrackSizingType type, float value
+message GridTrackSize GridTrackSizeFunction minSizing, GridTrackSizeFunction maxSizing
+message GridTrackSizeEntry GUID id, GridTrackSize trackSize
+message GridTrackSizeMap GridTrackSizeEntry[] entries
+message GridTrackEntry GUID id, string position
+message GridTrackMap GridTrackEntry[] entries
+message Blob ";
+    let text = SCHEMA.replace("enum StackMode NONE HORIZONTAL VERTICAL\n", "enum StackMode NONE HORIZONTAL VERTICAL GRID\n").replacen(
+        "\nmessage Blob ",
+        &format!("{NODE_FIELDS}{TYPES}"),
+        1,
+    );
+    Schema::parse(&text).unwrap()
+}
+
+fn track_size(kind: &'static str, value: f64) -> Kv<'static> {
+    let sizing = || o(vec![("type", e(kind)), ("value", f(value))]);
+    o(vec![("minSizing", sizing()), ("maxSizing", sizing())])
+}
+
+fn ranged_track_size(min: Kv<'static>, max: Kv<'static>) -> Kv<'static> {
+    o(vec![("minSizing", min), ("maxSizing", max)])
+}
+
+fn track_map_entry(id: u64, size: Kv<'static>) -> Kv<'static> {
+    o(vec![("id", g(id)), ("trackSize", size)])
+}
+
+fn positioned_track(id: u64, position: &'static str) -> Kv<'static> {
+    o(vec![("id", g(id)), ("position", s(position))])
+}
+
+fn unpositioned_track(id: u64) -> Kv<'static> {
+    o(vec![("id", g(id))])
+}
+
+#[test]
+fn grid_tracks_import_by_guid_and_keep_track_order() {
+    let cols = arr(vec![positioned_track(13, "$"), unpositioned_track(10), positioned_track(12, "#"), unpositioned_track(11)]);
+    let rows = arr(vec![positioned_track(21, "\""), positioned_track(20, "!")]);
+    // Sizing entries intentionally differ from track order. Their GUIDs define the join.
+    let col_sizes = arr(vec![
+        track_map_entry(12, track_size("FLEX", 1.0)),
+        track_map_entry(10, track_size("FIXED", 120.0)),
+        track_map_entry(13, track_size("FLEX", 2.0)),
+        track_map_entry(11, track_size("HUG", 80.0)),
+    ]);
+    let row_sizes = arr(vec![track_map_entry(21, track_size("HUG", 30.0)), track_map_entry(20, track_size("FIXED", 50.0))]);
+    let nodes = vec![
+        node(0, None, "DOCUMENT", "Document", vec![]),
+        node(1, Some((0, "!")), "CANVAS", "Page", vec![]),
+        node(
+            2,
+            Some((1, "!")),
+            "FRAME",
+            "Grid",
+            vec![
+                ("size", xy(600.0, 300.0)),
+                ("transform", at(0.0, 0.0)),
+                ("stackMode", e("GRID")),
+                ("gridColumns", o(vec![("entries", cols)])),
+                ("gridRows", o(vec![("entries", rows)])),
+                ("gridColumnsSizing", o(vec![("entries", col_sizes)])),
+                ("gridRowsSizing", o(vec![("entries", row_sizes)])),
+                ("gridColumnGap", f(10.0)),
+                ("gridRowGap", f(12.0)),
+            ],
+        ),
+        node(
+            3,
+            Some((2, "!")),
+            "RECTANGLE",
+            "Hug child",
+            vec![
+                ("size", xy(80.0, 30.0)),
+                ("transform", at(0.0, 0.0)),
+                ("gridColumnAnchor", g(11)),
+                ("gridRowAnchor", g(21)),
+                ("gridColumnSpan", u(2)),
+                ("gridRowSpan", u(1)),
+            ],
+        ),
+    ];
+    let bytes = canvas(&grid_schema(), &o(vec![("nodeChanges", arr(nodes))]));
+    let (doc, warnings) = import(&bytes, "Grid tracks").unwrap();
+    let grid = named(&doc, "Grid").layout.as_ref().unwrap();
+    assert_eq!((grid.mode, grid.grid_columns, grid.grid_rows, grid.gap, grid.cross_gap), (figcraft_doc::LayoutMode::Grid, 4, 2, 10.0, 12.0));
+    assert_eq!(
+        grid.column_tracks,
+        vec![
+            figcraft_doc::GridTrack::fixed(120.0),
+            figcraft_doc::GridTrack::hug(),
+            figcraft_doc::GridTrack::fill(1.0),
+            figcraft_doc::GridTrack::fill(2.0),
+        ]
+    );
+    assert_eq!(grid.row_tracks, vec![figcraft_doc::GridTrack::fixed(50.0), figcraft_doc::GridTrack::hug()]);
+    let child = &named(&doc, "Hug child").child_layout;
+    assert_eq!((child.grid_column, child.grid_row, child.grid_column_span, child.grid_row_span), (Some(1), Some(1), 2, 1));
+    assert!(!warnings.iter().any(|w| w.contains("grid track")), "{warnings:?}");
+}
+
+#[test]
+fn malformed_grid_tracks_warn_and_keep_equal_track_fallbacks() {
+    let tracks = arr(vec![positioned_track(30, "!"), positioned_track(31, "\""), positioned_track(32, "#"), positioned_track(33, "$")]);
+    let sizing = arr(vec![
+        track_map_entry(30, track_size("FIXED", -1.0)),
+        track_map_entry(31, ranged_track_size(o(vec![("type", e("FLEX")), ("value", f(1.0))]), o(vec![("type", e("FLEX")), ("value", f(2.0))]))),
+        track_map_entry(33, track_size("UNKNOWN", 5.0)),
+        track_map_entry(34, track_size("FLEX", 3.0)),
+    ]);
+    let nodes = vec![
+        node(0, None, "DOCUMENT", "Document", vec![]),
+        node(1, Some((0, "!")), "CANVAS", "Page", vec![]),
+        node(
+            2,
+            Some((1, "!")),
+            "FRAME",
+            "Grid",
+            vec![
+                ("size", xy(100.0, 100.0)),
+                ("transform", at(0.0, 0.0)),
+                ("stackMode", e("GRID")),
+                ("gridColumns", o(vec![("entries", tracks)])),
+                ("gridColumnsSizing", o(vec![("entries", sizing)])),
+            ],
+        ),
+    ];
+    let bytes = canvas(&grid_schema(), &o(vec![("nodeChanges", arr(nodes))]));
+    let (doc, warnings) = import(&bytes, "Malformed grid tracks").unwrap();
+    let layout = named(&doc, "Grid").layout.as_ref().unwrap();
+    assert_eq!(layout.column_tracks, vec![figcraft_doc::GridTrack::default(); 4]);
+    assert!(warnings.iter().any(|w| w.contains("grid track sizing is unsupported or malformed")), "{warnings:?}");
+    assert!(warnings.iter().any(|w| w.contains("stale or invalid grid track sizing entries")), "{warnings:?}");
+}
+
+#[test]
+fn oversized_grid_track_lists_warn_and_use_default_tracks() {
+    let oversized: Vec<Kv<'static>> = (0..1_001).map(|i| unpositioned_track(100 + i)).collect();
+    let sizing = vec![track_map_entry(100, track_size("FIXED", 40.0))];
+    let nodes = vec![
+        node(0, None, "DOCUMENT", "Document", vec![]),
+        node(1, Some((0, "!")), "CANVAS", "Page", vec![]),
+        node(
+            2,
+            Some((1, "!")),
+            "FRAME",
+            "Grid",
+            vec![
+                ("size", xy(100.0, 100.0)),
+                ("transform", at(0.0, 0.0)),
+                ("stackMode", e("GRID")),
+                ("gridColumns", o(vec![("entries", arr(oversized))])),
+                ("gridColumnsSizing", o(vec![("entries", arr(sizing))])),
+            ],
+        ),
+    ];
+    let bytes = canvas(&grid_schema(), &o(vec![("nodeChanges", arr(nodes))]));
+    let (doc, warnings) = import(&bytes, "Oversized grid tracks").unwrap();
+    let layout = named(&doc, "Grid").layout.as_ref().unwrap();
+    assert!(layout.column_tracks.is_empty(), "{:?}", layout.column_tracks.len());
+    assert!(warnings.iter().any(|w| w.contains("grid track list exceeds 1000 entries")), "{warnings:?}");
+}
+
 #[test]
 fn kiwi_round_trip() {
     let sc = schema();
@@ -477,6 +648,7 @@ fn imports_the_fixture() {
     let NodeKind::Text(t) = &named(&doc, "Title").kind else { panic!("not text") };
     assert_eq!(t.characters, "Hi there");
     assert_eq!(t.style.font_size, 16.0);
+    assert_eq!(t.leading_trim, figcraft_doc::LeadingTrim::CapHeight, "vertical trim (#466)");
     assert_eq!(t.runs.len(), 1);
     assert_eq!((t.runs[0].start, t.runs[0].end, t.runs[0].style.font_style.as_str()), (3, 6, "Bold"));
     // The group's children keep their place on the page (group at 100, 100).
@@ -539,6 +711,53 @@ fn bare_canvas_and_zlib_chunks_open() {
     assert!(import(&out, "Z").is_ok());
 }
 
+/// The fixture message with the photo's image bytes in its own blobs, as copies written by plugins
+/// and tools carry them: the PNG goes at the end of `blobs` and `image.dataBlob` points `shift`
+/// places past it (0 is the PNG itself).
+fn message_with_image_in_blobs(shift: u64) -> Kv<'static> {
+    fn point_images_at(value: &mut Kv<'static>, blob: u64) {
+        match value {
+            Kv::Object(fields) => {
+                for (name, field) in fields.iter_mut() {
+                    match field {
+                        Kv::Object(image) if *name == "image" => image.push(("dataBlob", u(blob))),
+                        _ => point_images_at(field, blob),
+                    }
+                }
+            }
+            Kv::Array(items) => items.iter_mut().for_each(|item| point_images_at(item, blob)),
+            _ => {}
+        }
+    }
+    let mut msg = message();
+    let index = {
+        let Kv::Object(fields) = &mut msg else { panic!("the message is an object") };
+        let Some((_, Kv::Array(blobs))) = fields.iter_mut().find(|(name, _)| *name == "blobs") else { panic!("no blobs") };
+        blobs.push(o(vec![("bytes", Kv::Bytes(png()))]));
+        blobs.len() as u64 - 1
+    };
+    point_images_at(&mut msg, index + shift);
+    msg
+}
+
+#[test]
+fn a_bare_canvas_reads_images_carried_in_its_blobs() {
+    // The clipboard holds a bare canvas (no `images/`); the image comes from `image.dataBlob`.
+    let c = canvas(&schema(), &message_with_image_in_blobs(0));
+    let (doc, warnings) = import(&c, "Pasted").unwrap();
+    let photo = named(&doc, "Photo");
+    let figcraft_doc::color::PaintKind::Image(img) = &photo.fills[0].kind else { panic!("not an image fill") };
+    assert_eq!(doc.images.get(&img.image).map(|i| (i.width, i.height)), Some((2, 1)));
+    assert!(!warnings.iter().any(|w| w.contains("isn't in the file")), "{warnings:?}");
+}
+
+#[test]
+fn a_data_blob_past_the_blobs_stays_a_placeholder() {
+    let c = canvas(&schema(), &message_with_image_in_blobs(5));
+    let (_, warnings) = import(&c, "Pasted").unwrap();
+    assert!(warnings.iter().any(|w| w.contains("isn't in the file")), "{warnings:?}");
+}
+
 #[test]
 fn other_files_are_not_fig() {
     assert!(try_import(b"{\"document\": {}}", "x").is_none());
@@ -588,7 +807,7 @@ fn mangled_kiwi_never_panics() {
     }
     for cut in (0..msg.len()).step_by(3) {
         if let Ok(kv) = sc.decode_message(root, &msg[..cut]) {
-            let _ = map::to_rest(&kv, "x");
+            let _ = map::to_rest(&kv, "x", crate::rest::MAX_NODES);
         }
     }
     for _ in 0..2000 {
@@ -598,8 +817,8 @@ fn mangled_kiwi_never_panics() {
             m[i] = r.next() as u8;
         }
         if let Ok(kv) = sc.decode_message(root, &m) {
-            let (json, _) = map::to_rest(&kv, "x");
-            let _ = crate::rest::import(&json, &crate::rest::no_images);
+            let (json, _, networks) = map::to_rest(&kv, "x", crate::rest::MAX_NODES);
+            let _ = crate::rest::import_with_networks(&json, &crate::rest::no_images, networks, crate::rest::MAX_NODES);
         }
         let mut sbytes = schema_bytes.clone();
         let i = (r.next() as usize) % sbytes.len();
@@ -621,6 +840,73 @@ fn mangled_kiwi_never_panics() {
     }
 }
 
+#[test]
+fn large_files_get_a_larger_value_budget() {
+    // Small files keep the fixed floor: a few bytes can't expand into a huge tree.
+    assert_eq!(kiwi::value_budget(0), 20_000_000);
+    assert_eq!(kiwi::value_budget(1 << 20), 20_000_000);
+    // A real 400 000-layer file: an 83.5 MB canvas whose message unpacks to 334 MB and holds
+    // 30.5 million values was refused as "too many values".
+    assert!(kiwi::value_budget(83_491_232) > 30_514_899);
+    // A real 194 MB design-system file (UX4G): a 39.5 MB canvas holding 29.7 million values.
+    assert!(kiwi::value_budget(39_528_420) > 29_703_730);
+    // Still bounded by the largest canvas read.
+    assert!(kiwi::value_budget(MAX_CANVAS as usize) <= 128 << 20);
+}
+
+#[test]
+fn the_layer_cap_follows_the_file_size() {
+    // A small (or broken) file keeps the REST import's cap: instances expand into a layer per
+    // layer of their component, and a few bytes mustn't claim millions of layers.
+    assert_eq!(layer_budget(0), crate::rest::MAX_NODES);
+    assert_eq!(layer_budget(1 << 20), crate::rest::MAX_NODES);
+    // A real 894 004-layer file (an 83.5 MB canvas) stopped at 200 000 and came in with 27 of
+    // its 30 pages empty.
+    assert!(layer_budget(83_491_232) > 894_004);
+    // No file gets more than the ceiling.
+    assert_eq!(layer_budget(MAX_CANVAS as usize), MAX_FIG_NODES);
+}
+
+#[test]
+fn a_small_file_that_unpacks_large_gets_no_larger_budgets() {
+    // 40 MB of zeros in a blob pack into a few KB. Keyed to the unpacked message, they lifted the
+    // layer cap above the 231 231 layers its instances expand into; keyed to the file, the cap
+    // stays at the REST import's.
+    let mut nodes = vec![node(0, None, "DOCUMENT", "D", vec![]), node(1, Some((0, "!")), "CANVAS", "P", vec![])];
+    nodes.push(node(5, Some((1, "!")), "SYMBOL", "Main", vec![("size", xy(10.0, 10.0))]));
+    nodes.extend((10..1010).map(|i| node(i, Some((5, "!")), "RECTANGLE", "R", vec![("size", xy(1.0, 1.0))])));
+    nodes.extend((2000..2230).map(|i| node(i, Some((1, "!")), "INSTANCE", "I", vec![("symbolData", o(vec![("symbolID", g(5))]))])));
+    let blob = o(vec![("bytes", Kv::Bytes(vec![0; 40 << 20]))]);
+    let file = canvas(&schema(), &o(vec![("nodeChanges", arr(nodes)), ("blobs", arr(vec![blob]))]));
+    assert!(file.len() < 1 << 20, "{} bytes", file.len());
+    let (doc, warnings) = import(&file, "x").unwrap();
+    assert!(warnings.iter().any(|w| w.contains("more than 200000 layers")), "{warnings:?}");
+    assert!(doc.node_count() <= crate::rest::MAX_NODES + 10);
+}
+
+#[test]
+fn the_mapper_stops_at_the_layer_cap_it_is_given() {
+    let mut nodes = vec![node(0, None, "DOCUMENT", "D", vec![]), node(1, Some((0, "!")), "CANVAS", "P", vec![])];
+    nodes.extend((2..12).map(|i| node(i, Some((1, "!")), "RECTANGLE", "R", vec![("size", xy(1.0, 1.0))])));
+    let msg = o(vec![("nodeChanges", arr(nodes))]);
+    let (_, warnings, _) = map::to_rest(&msg, "x", 5);
+    assert!(warnings.iter().any(|w| w.contains("more than 5 layers")), "{warnings:?}");
+    let (_, warnings, _) = map::to_rest(&msg, "x", crate::rest::MAX_NODES);
+    assert!(!warnings.iter().any(|w| w.contains("more than")), "{warnings:?}");
+}
+
+#[test]
+fn scalar_fields_count_against_the_value_budget() {
+    // A message of 1000 scalar fields (id 1, `true`) is 1001 values: a budget of 10 refuses it.
+    let fields = vec![Field { name: "b".into(), ty: Some(Type::Bool), array: false, value: 1 }];
+    let sc = Schema { defs: vec![Def { name: "Message".into(), kind: Kind::Message, fields }] };
+    let mut data = [1u8, 1].repeat(1000);
+    data.push(0);
+    let e = sc.decode_message_within(0, &data, 10).unwrap_err();
+    assert_eq!(e.0, "message: too many values");
+    assert!(sc.decode_message_within(0, &data, 1001).is_ok());
+}
+
 #[test]
 fn hostile_input_is_refused() {
     // A message that contains itself, nested past the depth cap.
@@ -873,6 +1159,12 @@ fn nested_instances_resized_again_drop_the_layout_derived_for_their_old_size() {
 #[path = "tail_tests.rs"]
 mod tail;
 
+#[path = "image_filter_tests.rs"]
+mod image_filters;
+
+#[path = "text_list_tests.rs"]
+mod text_list;
+
 /// `.fig` files in the folder `FIGCRAFT_FIG_SAMPLES` names (none when it's unset).
 pub(super) fn samples() -> Vec<std::path::PathBuf> {
     let Some(dir) = std::env::var_os("FIGCRAFT_FIG_SAMPLES") else { return Vec::new() };
@@ -916,7 +1208,7 @@ fn dump_samples() {
         std::fs::write(format!("{out}/{stem}.schema.txt"), txt).unwrap();
         let msg = schema.decode_message(schema.find("Message").unwrap(), &message).unwrap();
         std::fs::write(format!("{out}/{stem}.json"), serde_json::to_string_pretty(&debug_json(&msg)).unwrap()).unwrap();
-        let (rest, _) = map::to_rest(&msg, &stem);
+        let (rest, ..) = map::to_rest(&msg, &stem, super::layer_budget(message.len()));
         std::fs::write(format!("{out}/{stem}.rest.json"), serde_json::to_string_pretty(&rest).unwrap()).unwrap();
     }
 }
diff --git a/crates/format/src/fig/text_list_tests.rs b/crates/format/src/fig/text_list_tests.rs
new file mode 100644
index 00000000..eca7b0dc
--- /dev/null
+++ b/crates/format/src/fig/text_list_tests.rs
@@ -0,0 +1,93 @@
+//! Numbered lists that start past 1 (#686): each text line says where its list starts counting,
+//! less one (`listStartOffset`). Fixtures built in code with the parent module's helpers.
+
+use figcraft_doc::{ListStyle, NodeKind, ParaList};
+
+use super::*;
+
+const LIST_SCHEMA: &str = "
+enum NodeType NONE DOCUMENT CANVAS TEXT
+enum LineType PLAIN ORDERED_LIST UNORDERED_LIST
+struct GUID uint sessionID, uint localID
+struct Vector float x, float y
+struct Matrix float m00, float m01, float m02, float m10, float m11, float m12
+message ParentIndex GUID guid, string position
+message TextLineData LineType lineType, int indentationLevel, int listStartOffset, bool isFirstLineOfList
+message TextData string characters, TextLineData[] lines
+message NodeChange GUID guid, ParentIndex parentIndex, NodeType type, string name, Vector size, Matrix transform, float fontSize, TextData textData
+message Message NodeChange[] nodeChanges
+";
+
+/// A list line: type, start offset, first of its list.
+fn line(ty: &'static str, offset: i64, first: bool) -> Kv<'static> {
+    let level = i64::from(ty != "PLAIN");
+    o(vec![("lineType", e(ty)), ("indentationLevel", Kv::Int(level)), ("listStartOffset", Kv::Int(offset)), ("isFirstLineOfList", Kv::Bool(first))])
+}
+
+fn text_node(id: u64, name: &str, chars: &str, lines: Vec<Kv<'static>>) -> Kv<'static> {
+    let pos = ["!", "\"", "#", "$", "%", "&"][id as usize % 6];
+    node(
+        id,
+        Some((1, pos)),
+        "TEXT",
+        name,
+        vec![
+            ("size", xy(200.0, 60.0)),
+            ("transform", at(0.0, 0.0)),
+            ("fontSize", f(16.0)),
+            ("textData", o(vec![("characters", s(chars)), ("lines", arr(lines))])),
+        ],
+    )
+}
+
+fn starts(doc: &figcraft_doc::Document, name: &str) -> Vec<(ListStyle, u32)> {
+    let NodeKind::Text(t) = &named(doc, name).kind else { panic!("{name} is no text") };
+    (0..t.paragraph_count()).map(|p| t.para_list(p)).map(|p: ParaList| (p.list, p.start_offset)).collect()
+}
+
+#[test]
+fn numbered_lists_keep_their_start() {
+    use ListStyle::{Bulleted as B, None as P, Numbered as N};
+    let nodes = vec![
+        node(0, None, "DOCUMENT", "Document", vec![]),
+        node(1, Some((0, "!")), "CANVAS", "Page", vec![]),
+        text_node(2, "From 1", "Start here", vec![line("ORDERED_LIST", 0, true)]),
+        text_node(3, "From 2", "Next try this", vec![line("ORDERED_LIST", 1, true)]),
+        text_node(4, "First only", "a\nb\nc", vec![line("ORDERED_LIST", 3, true), line("ORDERED_LIST", 0, false), line("ORDERED_LIST", 0, false)]),
+        text_node(5, "Every line", "a\nb\nc", vec![line("ORDERED_LIST", 3, true), line("ORDERED_LIST", 3, false), line("ORDERED_LIST", 3, false)]),
+        text_node(6, "Mixed", "x\na\nb", vec![line("PLAIN", 0, false), line("ORDERED_LIST", 4, true), line("UNORDERED_LIST", 2, true)]),
+        text_node(7, "Junk", "a", vec![line("ORDERED_LIST", -5, true)]),
+    ];
+    let sc = Schema::parse(LIST_SCHEMA).unwrap();
+    let (doc, warnings) = import(&canvas(&sc, &o(vec![("nodeChanges", arr(nodes))])), "x").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    assert_eq!(starts(&doc, "From 1"), [(N, 0)]);
+    assert_eq!(starts(&doc, "From 2"), [(N, 1)], "shows 2.");
+    assert_eq!(starts(&doc, "First only"), [(N, 3), (N, 0), (N, 0)]);
+    assert_eq!(starts(&doc, "Every line"), [(N, 3), (N, 3), (N, 3)]);
+    assert_eq!(starts(&doc, "Mixed"), [(P, 0), (N, 4), (B, 0)], "bullets have no number, so no start");
+    assert_eq!(starts(&doc, "Junk"), [(N, 0)], "a negative offset counts from 1");
+}
+
+#[test]
+fn the_export_writes_where_a_list_starts() {
+    let mut doc = figcraft_doc::Document::new("Lists");
+    let page = doc.first_page().unwrap();
+    use ListStyle::{Bulleted as B, None as P, Numbered as N};
+    let mut td = figcraft_doc::TextData::new("two\nthree\nplain\nsix\ndot");
+    let pl = |list, start_offset| ParaList { list, indent: 0, start_offset };
+    td.paragraphs = vec![pl(N, 1), pl(N, 0), pl(P, 0), pl(N, 5), pl(B, 4)];
+    doc.create(page, NodeKind::Text(td), "List", 0.0, 0.0, 200.0, 80.0).unwrap();
+    let (bytes, _) = super::super::export(&doc, None).unwrap();
+    let a = Archive::open(&bytes).unwrap();
+    let (schema, message) = decode_canvas(&a.canvas).unwrap();
+    let msg = schema.decode_message(schema.find("Message").unwrap(), &message).unwrap();
+    let text = msg.get("nodeChanges").unwrap().list().iter().find(|n| n.get("name").and_then(Kv::str) == Some("List")).unwrap();
+    let lines = text.get("textData").and_then(|d| d.get("lines")).map(Kv::list).unwrap();
+    let offsets: Vec<f64> = lines.iter().map(|l| l.get("listStartOffset").and_then(Kv::f64).unwrap()).collect();
+    // Every line of a numbered list carries its first item's start (a reader that takes it per
+    // line or per list counts the same); bullets and plain lines carry none.
+    assert_eq!(offsets, [1.0, 1.0, 0.0, 5.0, 0.0]);
+    let (back, _) = import(&bytes, "x").unwrap();
+    assert_eq!(starts(&back, "List"), [(N, 1), (N, 1), (P, 0), (N, 5), (B, 0)]);
+}
diff --git a/crates/format/src/fig/text_paragraph_tests.rs b/crates/format/src/fig/text_paragraph_tests.rs
new file mode 100644
index 00000000..b3f05b05
--- /dev/null
+++ b/crates/format/src/fig/text_paragraph_tests.rs
@@ -0,0 +1,288 @@
+//! Paragraph options (list spacing, hanging list and punctuation, leading trim) in encoded `.fig`
+//! files: the highest valid value wins, invalid instance rows fall through, native saves keep them.
+
+use super::kiwi::Kv;
+use super::{export, import};
+
+fn paragraph_fig(shared: Vec<(&'static str, Kv<'static>)>, local: Vec<(&'static str, Kv<'static>)>) -> Vec<u8> {
+    use super::kiwi::{Schema, encode};
+
+    let schema = Schema::parse(
+        "enum NodeType NONE DOCUMENT CANVAS TEXT\n\
+         enum StyleType NONE FILL TEXT\n\
+         enum LeadingTrim NONE CAP_HEIGHT\n\
+         struct GUID uint sessionID, uint localID\n\
+         struct ParentIndex GUID guid, string position\n\
+         struct FontName string family, string style, string postscript\n\
+         struct StyleId GUID guid\n\
+         message TextData string characters\n\
+         message NodeChange GUID guid, ParentIndex parentIndex, NodeType type, string name, StyleType styleType, FontName fontName, float fontSize, StyleId styleIdForText, TextData textData, float paragraphSpacing, float paragraphIndent, float listSpacing, bool hangingList, bool hangingPunctuation, LeadingTrim leadingTrim\n\
+         message Message NodeChange[] nodeChanges",
+    )
+    .unwrap();
+    fn object(fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+        Kv::Object(fields)
+    }
+    fn guid(id: u64) -> Kv<'static> {
+        object(vec![("sessionID", Kv::Uint(7)), ("localID", Kv::Uint(id))])
+    }
+    fn node(id: u64, ty: &'static str, name: &str, parent: Option<u64>, fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+        let mut out = vec![("guid", guid(id)), ("type", Kv::Enum(ty)), ("name", Kv::Str(name.into()))];
+        if let Some(parent) = parent {
+            out.push(("parentIndex", object(vec![("guid", guid(parent)), ("position", Kv::Str("a".into()))])));
+        }
+        out.extend(fields);
+        object(out)
+    }
+    fn font(family: &str) -> Kv<'static> {
+        object(vec![("family", Kv::Str(family.into())), ("style", Kv::Str("Regular".into())), ("postscript", Kv::Str(String::new()))])
+    }
+    let mut base = vec![("styleType", Kv::Enum("TEXT")), ("fontName", font("Inter")), ("fontSize", Kv::Float(20.0))];
+    base.extend(shared);
+    let mut layer = vec![
+        ("fontName", font("Stale")),
+        ("fontSize", Kv::Float(40.0)),
+        ("styleIdForText", object(vec![("guid", guid(10))])),
+        ("textData", object(vec![("characters", Kv::Str("a\nb".into()))])),
+    ];
+    layer.extend(local);
+    let msg = object(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, "DOCUMENT", "Document", None, vec![]),
+            node(2, "CANVAS", "Page", Some(1), vec![]),
+            node(10, "TEXT", "Shared", Some(2), base),
+            node(11, "TEXT", "Label", Some(2), layer),
+        ]),
+    )]);
+    let root = schema.find("Message").unwrap();
+    let mut deflated = flate2::write::DeflateEncoder::new(Vec::new(), flate2::Compression::default());
+    use std::io::Write;
+    deflated.write_all(&encode::schema(&schema)).unwrap();
+    let schema_chunk = deflated.finish().unwrap();
+    let message = encode::message(&schema, root, &msg).unwrap();
+    let message_chunk = ruzstd::encoding::compress_to_vec(message.as_slice(), ruzstd::encoding::CompressionLevel::Fastest);
+    let mut bytes = b"fig-kiwi".to_vec();
+    bytes.extend_from_slice(&101u32.to_le_bytes());
+    for chunk in [schema_chunk, message_chunk] {
+        bytes.extend_from_slice(&(chunk.len() as u32).to_le_bytes());
+        bytes.extend_from_slice(&chunk);
+    }
+    bytes
+}
+
+#[test]
+fn encoded_fig_maps_paragraph_list_fields_through_native_round_trip() {
+    let shared = vec![
+        ("listSpacing", Kv::Float(18.0)),
+        ("hangingList", Kv::Bool(false)),
+        ("hangingPunctuation", Kv::Bool(false)),
+        ("leadingTrim", Kv::Enum("CAP_HEIGHT")),
+    ];
+    let (inherited, warnings) = import(&paragraph_fig(shared.clone(), vec![]), "Synthetic paragraph options").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let text = inherited.nodes().find(|node| node.name == "Label").unwrap().kind.text().unwrap();
+    assert_eq!(text.list_spacing, 18.0);
+    assert!(!text.hanging_list);
+    assert!(!text.hanging_punctuation);
+    assert_eq!(text.leading_trim, figcraft_doc::LeadingTrim::CapHeight);
+    assert_eq!(text.style.font_family, "Inter");
+
+    let reset = vec![
+        ("listSpacing", Kv::Float(0.0)),
+        ("hangingList", Kv::Bool(false)),
+        ("hangingPunctuation", Kv::Bool(false)),
+        ("leadingTrim", Kv::Enum("NONE")),
+    ];
+    let (cleared, warnings) = import(&paragraph_fig(shared, reset), "Synthetic paragraph resets").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let text = cleared.nodes().find(|node| node.name == "Label").unwrap().kind.text().unwrap();
+    assert_eq!(text.list_spacing, 0.0);
+    assert!(!text.hanging_list);
+    assert!(!text.hanging_punctuation);
+    assert_eq!(text.leading_trim, figcraft_doc::LeadingTrim::None);
+    assert_eq!(text.style.font_family, "Inter");
+
+    let bytes = crate::save_bytes(&inherited, None).unwrap();
+    let (back, warnings) = crate::load_bytes(&bytes).unwrap();
+    assert!(warnings.is_empty(), "native round trip: {warnings:?}");
+    let text = back.nodes().find(|node| node.name == "Label").unwrap().kind.text().unwrap();
+    assert_eq!(text.list_spacing, 18.0);
+    assert!(!text.hanging_list);
+    assert!(!text.hanging_punctuation);
+    assert_eq!(text.leading_trim, figcraft_doc::LeadingTrim::CapHeight);
+
+    let (_, export_warnings) = export(&inherited, None).unwrap();
+    assert!(
+        export_warnings.iter().any(|warning| warning.contains("list spacing, hanging punctuation, leading trim")),
+        "existing .fig export loss must remain visible: {export_warnings:?}"
+    );
+}
+
+fn instance_paragraph_fig(overrides: Vec<(&'static str, Kv<'static>)>, nonfinite_spacing: bool) -> Vec<u8> {
+    use super::kiwi::{Schema, encode};
+
+    let schema = Schema::parse(
+        "enum NodeType NONE DOCUMENT CANVAS TEXT SYMBOL INSTANCE\n\
+         enum StyleType NONE FILL TEXT\n\
+         enum LeadingTrim NONE CAP_HEIGHT\n\
+         struct GUID uint sessionID, uint localID\n\
+         struct ParentIndex GUID guid, string position\n\
+         struct FontName string family, string style, string postscript\n\
+         struct StyleId GUID guid\n\
+         struct GUIDPath GUID[] guids\n\
+         struct SymbolOverride GUIDPath guidPath, float listSpacing, bool hangingList, bool hangingPunctuation, LeadingTrim leadingTrim\n\
+         struct SymbolData GUID symbolID, SymbolOverride[] symbolOverrides\n\
+         message TextData string characters\n\
+         message NodeChange GUID guid, ParentIndex parentIndex, NodeType type, string name, StyleType styleType, FontName fontName, float fontSize, StyleId styleIdForText, TextData textData, float listSpacing, bool hangingList, bool hangingPunctuation, LeadingTrim leadingTrim, SymbolData symbolData\n\
+         message Message NodeChange[] nodeChanges",
+    )
+    .unwrap();
+    fn object(fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+        Kv::Object(fields)
+    }
+    fn guid(id: u64) -> Kv<'static> {
+        object(vec![("sessionID", Kv::Uint(7)), ("localID", Kv::Uint(id))])
+    }
+    fn node(id: u64, ty: &'static str, name: &str, parent: Option<u64>, fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+        let mut out = vec![("guid", guid(id)), ("type", Kv::Enum(ty)), ("name", Kv::Str(name.into()))];
+        if let Some(parent) = parent {
+            out.push(("parentIndex", object(vec![("guid", guid(parent)), ("position", Kv::Str("a".into()))])));
+        }
+        out.extend(fields);
+        object(out)
+    }
+    fn font() -> Kv<'static> {
+        object(vec![("family", Kv::Str("Inter".into())), ("style", Kv::Str("Regular".into())), ("postscript", Kv::Str(String::new()))])
+    }
+    let main_text = node(
+        21,
+        "TEXT",
+        "Label",
+        Some(20),
+        vec![
+            ("fontName", font()),
+            ("fontSize", Kv::Float(20.0)),
+            ("styleIdForText", object(vec![("guid", guid(10))])),
+            ("textData", object(vec![("characters", Kv::Str("a\nb".into()))])),
+        ],
+    );
+    let mut override_fields = vec![("guidPath", object(vec![("guids", Kv::Array(vec![guid(21)]))]))];
+    override_fields.extend(overrides);
+    let instance = node(
+        30,
+        "INSTANCE",
+        "Copy",
+        Some(2),
+        vec![("symbolData", object(vec![("symbolID", guid(20)), ("symbolOverrides", Kv::Array(vec![object(override_fields)]))]))],
+    );
+    let message = object(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, "DOCUMENT", "Document", None, vec![]),
+            node(2, "CANVAS", "Page", Some(1), vec![]),
+            node(
+                10,
+                "TEXT",
+                "Shared",
+                Some(2),
+                vec![
+                    ("styleType", Kv::Enum("TEXT")),
+                    ("fontName", font()),
+                    ("fontSize", Kv::Float(20.0)),
+                    ("listSpacing", Kv::Float(18.0)),
+                    ("hangingList", Kv::Bool(true)),
+                    ("hangingPunctuation", Kv::Bool(true)),
+                    ("leadingTrim", Kv::Enum("CAP_HEIGHT")),
+                ],
+            ),
+            node(20, "SYMBOL", "Main", Some(2), vec![]),
+            main_text,
+            instance,
+        ]),
+    )]);
+    let root = schema.find("Message").unwrap();
+    let mut deflated = flate2::write::DeflateEncoder::new(Vec::new(), flate2::Compression::default());
+    use std::io::Write;
+    deflated.write_all(&encode::schema(&schema)).unwrap();
+    let schema_chunk = deflated.finish().unwrap();
+    let mut message = encode::message(&schema, root, &message).unwrap();
+    if nonfinite_spacing {
+        let finite = 37.0_f32.to_bits().rotate_right(23).to_le_bytes();
+        let nan = f32::NAN.to_bits().rotate_right(23).to_le_bytes();
+        let matches: Vec<usize> = message.windows(finite.len()).enumerate().filter_map(|(i, w)| (w == finite).then_some(i)).collect();
+        assert_eq!(matches.len(), 1, "finite test token must identify the instance listSpacing field");
+        let offset = matches[0];
+        message[offset..offset + nan.len()].copy_from_slice(&nan);
+    }
+    let message_chunk = ruzstd::encoding::compress_to_vec(message.as_slice(), ruzstd::encoding::CompressionLevel::Fastest);
+    let mut bytes = b"fig-kiwi".to_vec();
+    bytes.extend_from_slice(&101u32.to_le_bytes());
+    for chunk in [schema_chunk, message_chunk] {
+        bytes.extend_from_slice(&(chunk.len() as u32).to_le_bytes());
+        bytes.extend_from_slice(&chunk);
+    }
+    bytes
+}
+
+#[test]
+fn encoded_instance_paragraph_overrides_fall_back_only_when_invalid() {
+    let valid = vec![
+        ("listSpacing", Kv::Float(24.0)),
+        ("hangingList", Kv::Bool(false)),
+        ("hangingPunctuation", Kv::Bool(false)),
+        ("leadingTrim", Kv::Enum("NONE")),
+    ];
+    let (doc, warnings) = import(&instance_paragraph_fig(valid, false), "Synthetic instance paragraph values").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let copy = doc.nodes().find(|node| node.name == "Copy").unwrap();
+    let label = doc.node(*copy.children.first().unwrap()).unwrap();
+    let text = label.kind.text().unwrap();
+    assert_eq!(text.list_spacing, 24.0);
+    assert!(!text.hanging_list);
+    assert!(!text.hanging_punctuation);
+    assert_eq!(text.leading_trim, figcraft_doc::LeadingTrim::None);
+
+    let reset = vec![
+        ("listSpacing", Kv::Float(0.0)),
+        ("hangingList", Kv::Bool(false)),
+        ("hangingPunctuation", Kv::Bool(false)),
+        ("leadingTrim", Kv::Enum("NONE")),
+    ];
+    let (doc, warnings) = import(&instance_paragraph_fig(reset, false), "Synthetic instance paragraph resets").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let copy = doc.nodes().find(|node| node.name == "Copy").unwrap();
+    let label = doc.node(*copy.children.first().unwrap()).unwrap();
+    let text = label.kind.text().unwrap();
+    assert_eq!(text.list_spacing, 0.0);
+    assert!(!text.hanging_list);
+    assert!(!text.hanging_punctuation);
+    assert_eq!(text.leading_trim, figcraft_doc::LeadingTrim::None);
+
+    let invalid = vec![
+        ("listSpacing", Kv::Float(37.0)),
+        ("hangingList", Kv::Bool(false)),
+        ("hangingPunctuation", Kv::Bool(false)),
+        ("leadingTrim", Kv::Uint(77)),
+    ];
+    let (doc, warnings) = import(&instance_paragraph_fig(invalid, true), "Synthetic malformed instance paragraph values").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let copy = doc.nodes().find(|node| node.name == "Copy").unwrap();
+    let label = doc.node(*copy.children.first().unwrap()).unwrap();
+    let text = label.kind.text().unwrap();
+    assert_eq!(text.list_spacing, 18.0);
+    assert!(!text.hanging_list);
+    assert!(!text.hanging_punctuation);
+    assert_eq!(text.leading_trim, figcraft_doc::LeadingTrim::CapHeight);
+
+    let bytes = crate::save_bytes(&doc, None).unwrap();
+    let (back, warnings) = crate::load_bytes(&bytes).unwrap();
+    assert!(warnings.is_empty(), "native round trip: {warnings:?}");
+    let copy = back.nodes().find(|node| node.name == "Copy").unwrap();
+    let label = back.node(*copy.children.first().unwrap()).unwrap();
+    let text = label.kind.text().unwrap();
+    assert_eq!(text.list_spacing, 18.0);
+    assert!(!text.hanging_list);
+    assert!(!text.hanging_punctuation);
+    assert_eq!(text.leading_trim, figcraft_doc::LeadingTrim::CapHeight);
+}
diff --git a/crates/format/src/fig/text_path.rs b/crates/format/src/fig/text_path.rs
new file mode 100644
index 00000000..8a93f7e4
--- /dev/null
+++ b/crates/format/src/fig/text_path.rs
@@ -0,0 +1,315 @@
+//! Convert the simple vector network used by text-on-path layers in `.fig` files into a native text path.
+
+use figcraft_doc::{
+    TextPath,
+    geom::{
+        BezPath,
+        kurbo::{CubicBez, Line, ParamCurve, ParamCurveArclen, Point},
+    },
+};
+
+use super::network::{Network, Segment};
+
+const START_SEGMENT_STYLE: u32 = 0x01ff_ffff;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+struct Use {
+    segment: usize,
+    forward: bool,
+}
+
+/// Build a native path from a validated connected chain or cycle. The marked source segment is
+/// oriented a→b; `t` is local to that line/cubic. Coordinates are scaled into layer space.
+pub(super) fn from_network(net: &Network, sx: f64, sy: f64, t: f64, forward: bool) -> Result<TextPath, &'static str> {
+    if !t.is_finite() || !(0.0..=1.0).contains(&t) {
+        return Err("invalid start parameter");
+    }
+    if !sx.is_finite() || !sy.is_finite() || sx <= 0.0 || sy <= 0.0 {
+        return Err("invalid path scale");
+    }
+    let markers: Vec<usize> = net.segments.iter().enumerate().filter_map(|(i, s)| (s.style == START_SEGMENT_STYLE).then_some(i)).collect();
+    let [marked] = markers.as_slice() else {
+        return Err("missing or ambiguous start segment marker");
+    };
+
+    let (uses, closed) = ordered_chain(net, *marked)?;
+    let mut d = BezPath::new();
+    let mut total = 0.0;
+    let mut prefix = 0.0;
+    let mut start_segment_length = 0.0;
+    for use_ in &uses {
+        let (p0, p1, p2, p3) = cubic(net, *use_, sx, sy)?;
+        if d.elements().is_empty() {
+            d.move_to((p0.0, p0.1));
+        }
+        let line = p1 == p0 && p2 == p3;
+        let (length, partial) = if line {
+            d.line_to((p3.0, p3.1));
+            let line = Line::new(Point::new(p0.0, p0.1), Point::new(p3.0, p3.1));
+            (line.arclen(1e-9), line.arclen(1e-9) * t)
+        } else {
+            d.curve_to((p1.0, p1.1), (p2.0, p2.1), (p3.0, p3.1));
+            let curve = CubicBez::new((p0.0, p0.1), (p1.0, p1.1), (p2.0, p2.1), (p3.0, p3.1));
+            let partial = if t <= 0.0 { 0.0 } else { curve.subsegment(0.0..t).arclen(1e-9) };
+            (curve.arclen(1e-9), partial)
+        };
+        if !length.is_finite() || length <= 1e-10 {
+            return Err("zero-length path segment");
+        }
+        if use_.segment == *marked {
+            start_segment_length = partial;
+            if !start_segment_length.is_finite() {
+                return Err("invalid path length");
+            }
+            prefix = total;
+        }
+        total += length;
+    }
+    if closed {
+        d.close_path();
+    }
+    if !total.is_finite() || total <= 1e-10 {
+        return Err("zero-length path");
+    }
+    let mut start = ((prefix + start_segment_length) / total).clamp(0.0, 1.0);
+    let flip = !forward;
+    if flip {
+        start = 1.0 - start;
+    }
+    let path = TextPath { d: d.to_svg(), start, flip };
+    let lines = figcraft_doc::geom::measure::polylines(&path.path()).ok_or("cannot be measured by text renderer")?;
+    if lines.first().is_none_or(|line| line.length() <= 1e-9) {
+        return Err("cannot be measured by text renderer");
+    }
+    Ok(path)
+}
+
+/// Return every segment in chain order. Open chains are oriented so the marked segment runs a→b;
+/// cycles start at the marked segment's a vertex and traverse it first.
+fn ordered_chain(net: &Network, marked: usize) -> Result<(Vec<Use>, bool), &'static str> {
+    let marker = net.segments.get(marked).ok_or("invalid start segment index")?;
+    let mut adjacency = vec![Vec::<usize>::new(); net.vertices.len()];
+    for (i, s) in net.segments.iter().enumerate() {
+        if s.a >= adjacency.len() || s.b >= adjacency.len() {
+            return Err("invalid path vertex index");
+        }
+        if s.a == s.b {
+            return Err("path contains a segment that starts and ends at the same vertex");
+        }
+        adjacency[s.a].push(i);
+        adjacency[s.b].push(i);
+    }
+    let mut endpoints = Vec::new();
+    for edges in &adjacency {
+        if edges.len() > 2 {
+            return Err("branched path network");
+        }
+        if edges.len() == 1 {
+            endpoints.push(edges[0]);
+        }
+    }
+    if !endpoints.is_empty() && endpoints.len() != 2 {
+        return Err("disconnected or malformed path network");
+    }
+    let cycle = endpoints.is_empty();
+    let mut used = vec![false; net.segments.len()];
+    let mut out = Vec::with_capacity(net.segments.len());
+    if cycle {
+        out.push(Use { segment: marked, forward: true });
+        used[marked] = true;
+        let mut at = marker.b;
+        let mut visited = vec![false; net.vertices.len()];
+        visited[marker.a] = true;
+        visited[marker.b] = true;
+        while at != marker.a {
+            let next = adjacency[at].iter().copied().find(|i| !used[*i]).ok_or("disconnected path cycle")?;
+            used[next] = true;
+            let s = &net.segments[next];
+            let is_forward = s.a == at;
+            at = if is_forward { s.b } else { s.a };
+            if at != marker.a && std::mem::replace(&mut visited[at], true) {
+                return Err("path cycle is not simple");
+            }
+            out.push(Use { segment: next, forward: is_forward });
+            if out.len() > net.segments.len() {
+                return Err("invalid path cycle");
+            }
+        }
+    } else {
+        let endpoint = adjacency.iter().position(|e| e.len() == 1).ok_or("missing path endpoint")?;
+        let mut at = endpoint;
+        while let Some(next) = adjacency[at].iter().copied().find(|i| !used[*i]) {
+            used[next] = true;
+            let s = &net.segments[next];
+            let is_forward = s.a == at;
+            at = if is_forward { s.b } else { s.a };
+            out.push(Use { segment: next, forward: is_forward });
+        }
+        let Some(marker_use) = out.iter().find(|u| u.segment == marked) else { return Err("disconnected start segment") };
+        if !marker_use.forward {
+            out.reverse();
+            for u in &mut out {
+                u.forward = !u.forward;
+            }
+        }
+    }
+    if !used.iter().all(|x| *x) {
+        return Err("disconnected path network");
+    }
+    Ok((out, cycle))
+}
+
+type P = (f64, f64);
+
+fn cubic(net: &Network, use_: Use, sx: f64, sy: f64) -> Result<(P, P, P, P), &'static str> {
+    let s: &Segment = net.segments.get(use_.segment).ok_or("invalid path segment index")?;
+    let a = net.vertices.get(s.a).ok_or("invalid path vertex index")?;
+    let b = net.vertices.get(s.b).ok_or("invalid path vertex index")?;
+    let p0 = (a.x * sx, a.y * sy);
+    let p3 = (b.x * sx, b.y * sy);
+    let ta = (s.ta.0 * sx, s.ta.1 * sy);
+    let tb = (s.tb.0 * sx, s.tb.1 * sy);
+    if [p0.0, p0.1, p3.0, p3.1, ta.0, ta.1, tb.0, tb.1].iter().any(|x| !x.is_finite()) {
+        return Err("invalid path coordinates");
+    }
+    let (p0, p1, p2, p3) =
+        if ta == (0.0, 0.0) && tb == (0.0, 0.0) { (p0, p0, p3, p3) } else { (p0, (p0.0 + ta.0, p0.1 + ta.1), (p3.0 + tb.0, p3.1 + tb.1), p3) };
+    if use_.forward { Ok((p0, p1, p2, p3)) } else { Ok((p3, p2, p1, p0)) }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::fig::network::{Segment, Vertex};
+    use figcraft_doc::geom::kurbo::PathEl;
+
+    fn vertex(x: f64, y: f64) -> Vertex {
+        Vertex { style: 0, x, y }
+    }
+
+    fn segment(style: u32, a: usize, b: usize, ta: (f64, f64), tb: (f64, f64)) -> Segment {
+        Segment { style, a, ta, b, tb }
+    }
+
+    fn curved() -> Network {
+        Network {
+            vertices: vec![vertex(0.0, 82.5), vertex(300.0, 82.5), vertex(600.0, 82.5)],
+            segments: vec![segment(START_SEGMENT_STYLE, 0, 1, (70.0, -110.0), (-70.0, -110.0)), segment(0, 1, 2, (70.0, 110.0), (-70.0, 110.0))],
+            ..Network::default()
+        }
+    }
+
+    #[test]
+    fn local_cubic_parameter_converts_to_path_distance() {
+        let path = from_network(&curved(), 1.0, 1.0, 0.0086954795, true).unwrap();
+        assert!((path.start - 0.004744078).abs() < 0.00001);
+        // Cubic t is not its fraction of total path length.
+        assert!((path.start - 0.0086954795).abs() > 0.003);
+        let elements = path.path().elements().to_vec();
+        assert!(matches!(elements.first(), Some(PathEl::MoveTo(p)) if p.x == 0.0 && p.y == 82.5));
+        assert!(matches!(elements.get(1), Some(PathEl::CurveTo(..))));
+    }
+
+    #[test]
+    fn second_segment_marker_and_t_are_respected() {
+        let mut net = curved();
+        net.segments[0].style = 0;
+        net.segments[1].style = START_SEGMENT_STYLE;
+        let path = from_network(&net, 1.0, 1.0, 0.49800667, true).unwrap();
+        assert!((path.start - 0.7490379757).abs() < 0.00002);
+    }
+
+    #[test]
+    fn reverse_direction_inverts_normalized_start() {
+        let net = Network {
+            vertices: vec![vertex(0.0, 0.0), vertex(600.0, 0.0)],
+            segments: vec![segment(START_SEGMENT_STYLE, 0, 1, (0.0, 0.0), (0.0, 0.0))],
+            ..Network::default()
+        };
+        let path = from_network(&net, 1.0, 1.0, 0.83986014, false).unwrap();
+        assert!(path.flip);
+        assert!((path.start - 0.16013986).abs() < 1e-8);
+        assert!(matches!(path.path().elements().get(1), Some(PathEl::LineTo(p)) if p.x == 600.0 && p.y == 0.0));
+    }
+
+    #[test]
+    fn rejects_missing_duplicate_and_zero_length_segments() {
+        let mut net = curved();
+        net.segments[0].style = 0;
+        assert_eq!(from_network(&net, 1.0, 1.0, 0.5, true), Err("missing or ambiguous start segment marker"));
+        net.segments[1].style = START_SEGMENT_STYLE;
+        net.segments[0].style = START_SEGMENT_STYLE;
+        assert_eq!(from_network(&net, 1.0, 1.0, 0.5, true), Err("missing or ambiguous start segment marker"));
+        let zero = Network {
+            vertices: vec![vertex(0.0, 0.0), vertex(0.0, 0.0)],
+            segments: vec![segment(START_SEGMENT_STYLE, 0, 1, (0.0, 0.0), (0.0, 0.0))],
+            ..Network::default()
+        };
+        assert_eq!(from_network(&zero, 1.0, 1.0, 0.5, true), Err("zero-length path segment"));
+    }
+
+    #[test]
+    fn rejects_branching_and_disconnected_segments() {
+        let branch = Network {
+            vertices: vec![vertex(0.0, 0.0), vertex(1.0, 0.0), vertex(2.0, 0.0), vertex(1.0, 1.0)],
+            segments: vec![
+                segment(START_SEGMENT_STYLE, 0, 1, (0.0, 0.0), (0.0, 0.0)),
+                segment(0, 1, 2, (0.0, 0.0), (0.0, 0.0)),
+                segment(0, 1, 3, (0.0, 0.0), (0.0, 0.0)),
+            ],
+            ..Network::default()
+        };
+        assert_eq!(from_network(&branch, 1.0, 1.0, 0.5, true), Err("branched path network"));
+        let disconnected = Network {
+            vertices: vec![vertex(0.0, 0.0), vertex(1.0, 0.0), vertex(2.0, 0.0), vertex(3.0, 0.0)],
+            segments: vec![segment(START_SEGMENT_STYLE, 0, 1, (0.0, 0.0), (0.0, 0.0)), segment(0, 2, 3, (0.0, 0.0), (0.0, 0.0))],
+            ..Network::default()
+        };
+        assert_eq!(from_network(&disconnected, 1.0, 1.0, 0.5, true), Err("disconnected or malformed path network"));
+    }
+
+    #[test]
+    fn scales_geometry_and_accepts_closed_cycles() {
+        let cycle = Network {
+            vertices: vec![vertex(0.0, 0.0), vertex(100.0, 0.0), vertex(100.0, 100.0)],
+            segments: vec![
+                segment(START_SEGMENT_STYLE, 0, 1, (0.0, 0.0), (0.0, 0.0)),
+                segment(0, 1, 2, (0.0, 0.0), (0.0, 0.0)),
+                segment(0, 2, 0, (0.0, 0.0), (0.0, 0.0)),
+            ],
+            ..Network::default()
+        };
+        let path = from_network(&cycle, 2.0, 3.0, 0.5, true).unwrap();
+        let elements = path.path().elements().to_vec();
+        assert!(matches!(elements.first(), Some(PathEl::MoveTo(p)) if p.x == 0.0 && p.y == 0.0));
+        assert!(matches!(elements.get(1), Some(PathEl::LineTo(p)) if p.x == 200.0 && p.y == 0.0));
+        let total = 200.0 + 300.0 + 130_000.0_f64.sqrt();
+        assert!((path.start - 100.0 / total).abs() < 1e-8);
+        assert!(matches!(elements.last(), Some(PathEl::ClosePath)));
+    }
+
+    #[test]
+    fn rejects_paths_the_native_renderer_cannot_measure() {
+        let count = 40_000usize;
+        let many_lines = Network {
+            vertices: (0..=count).map(|i| vertex(i as f64, 0.0)).collect(),
+            segments: (0..count).map(|i| segment(if i == 0 { START_SEGMENT_STYLE } else { 0 }, i, i + 1, (0.0, 0.0), (0.0, 0.0))).collect(),
+            ..Network::default()
+        };
+        assert_eq!(from_network(&many_lines, 1.0, 1.0, 0.5, true), Err("cannot be measured by text renderer"));
+
+        let huge = Network {
+            vertices: vec![vertex(0.0, 0.0), vertex(1e9, 0.0)],
+            segments: vec![segment(START_SEGMENT_STYLE, 0, 1, (0.0, 0.0), (0.0, 0.0))],
+            ..Network::default()
+        };
+        assert_eq!(from_network(&huge, 1.0, 1.0, 0.5, true), Err("cannot be measured by text renderer"));
+
+        let tiny = Network {
+            vertices: vec![vertex(0.0, 0.0), vertex(5e-10, 0.0)],
+            segments: vec![segment(START_SEGMENT_STYLE, 0, 1, (0.0, 0.0), (0.0, 0.0))],
+            ..Network::default()
+        };
+        assert_eq!(from_network(&tiny, 1.0, 1.0, 0.5, true), Err("cannot be measured by text renderer"));
+    }
+}
diff --git a/crates/format/src/fig/text_path_tests.rs b/crates/format/src/fig/text_path_tests.rs
new file mode 100644
index 00000000..c94c6aa3
--- /dev/null
+++ b/crates/format/src/fig/text_path_tests.rs
@@ -0,0 +1,211 @@
+//! Mapper → private REST ingress tests for source text-path fields.
+
+use super::kiwi::Kv;
+
+const SCHEMA: &str = "
+enum NodeType DOCUMENT CANVAS TEXT TEXT_PATH
+enum StyleType NONE TEXT
+enum TextDecoration NONE UNDERLINE STRIKETHROUGH
+struct GUID uint sessionID, uint localID
+struct StyleId GUID guid
+struct ParentIndex GUID guid, string position
+struct Vector float x, float y
+struct Matrix float m00, float m01, float m02, float m10, float m11, float m12
+struct FontName string family, string style
+message TextOverride uint styleID, FontName fontName, float fontSize
+message TextData string characters, uint[] characterStyleIDs, TextOverride[] styleOverrideTable
+message TextPathStart float tValue, bool forward
+message VectorData uint vectorNetworkBlob, Vector normalizedSize
+message Blob byte[] bytes
+message NodeChange GUID guid, ParentIndex parentIndex, NodeType type, string name, Vector size, Matrix transform, TextData textData, float fontSize, FontName fontName, TextPathStart textPathStart, VectorData vectorData, StyleType styleType, StyleId styleIdForText, TextDecoration textDecoration
+message Message NodeChange[] nodeChanges, Blob[] blobs
+";
+use figcraft_doc::{NodeKind, TextPath};
+
+fn o(fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    Kv::Object(fields)
+}
+
+fn a(values: Vec<Kv<'static>>) -> Kv<'static> {
+    Kv::Array(values)
+}
+
+fn f(value: f32) -> Kv<'static> {
+    Kv::Float(value)
+}
+
+fn u(value: u64) -> Kv<'static> {
+    Kv::Uint(value)
+}
+
+fn s(value: &'static str) -> Kv<'static> {
+    Kv::Str(value.into())
+}
+
+fn point(x: f32, y: f32) -> Kv<'static> {
+    o(vec![("x", f(x)), ("y", f(y))])
+}
+
+fn guid(id: u64) -> Kv<'static> {
+    o(vec![("sessionID", u(1)), ("localID", u(id))])
+}
+
+fn node(id: u64, parent: Option<u64>, ty: &'static str, fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    let mut node = vec![("guid", guid(id)), ("type", s(ty))];
+    if let Some(parent) = parent {
+        node.push(("parentIndex", o(vec![("guid", guid(parent)), ("position", s("!"))])));
+    }
+    node.extend(fields);
+    o(node)
+}
+
+fn blob() -> Vec<u8> {
+    let mut bytes = Vec::new();
+    let u32le = |out: &mut Vec<u8>, n: u32| out.extend_from_slice(&n.to_le_bytes());
+    let f32le = |out: &mut Vec<u8>, n: f32| out.extend_from_slice(&n.to_le_bytes());
+    u32le(&mut bytes, 2); // vertices
+    u32le(&mut bytes, 1); // segments
+    u32le(&mut bytes, 0); // regions
+    for (x, y) in [(0.0, 0.0), (100.0, 0.0)] {
+        u32le(&mut bytes, 0);
+        f32le(&mut bytes, x);
+        f32le(&mut bytes, y);
+    }
+    u32le(&mut bytes, 0x01ff_ffff); // source start-segment marker
+    u32le(&mut bytes, 0);
+    f32le(&mut bytes, 0.0);
+    f32le(&mut bytes, 0.0);
+    u32le(&mut bytes, 1);
+    f32le(&mut bytes, 0.0);
+    f32le(&mut bytes, 0.0);
+    bytes
+}
+
+fn canvas() -> Vec<u8> {
+    let schema = super::kiwi::Schema::parse(SCHEMA).unwrap();
+    let message = message(true);
+    let message = super::kiwi::encode::message(&schema, schema.find("Message").unwrap(), &message).unwrap();
+    let mut out = b"fig-kiwi\0\0\0\0".to_vec();
+    for raw in [super::kiwi::encode::schema(&schema), message] {
+        let mut encoder = flate2::write::DeflateEncoder::new(Vec::new(), flate2::Compression::default());
+        std::io::Write::write_all(&mut encoder, &raw).unwrap();
+        let compressed = encoder.finish().unwrap();
+        out.extend_from_slice(&(compressed.len() as u32).to_le_bytes());
+        out.extend_from_slice(&compressed);
+    }
+    out
+}
+
+fn message(with_path: bool) -> Kv<'static> {
+    let mut nodes = vec![node(0, None, "DOCUMENT", vec![]), node(1, Some(0), "CANVAS", vec![])];
+    let mut blobs = Vec::new();
+    if with_path {
+        blobs.push(o(vec![("bytes", Kv::Bytes(blob()))]));
+        let text = o(vec![
+            ("characters", s("alpha")),
+            ("characterStyleIDs", a(vec![u(0), u(0), u(0), u(2), u(2)])),
+            (
+                "styleOverrideTable",
+                a(vec![o(vec![("styleID", u(2)), ("fontName", o(vec![("family", s("Inter")), ("style", s("Medium"))])), ("fontSize", f(30.0))])]),
+            ),
+        ]);
+        nodes.push(node(
+            2,
+            Some(1),
+            "TEXT_PATH",
+            vec![
+                ("name", s("alpha path")),
+                ("size", point(100.0, 0.0)),
+                ("transform", o(vec![("m00", f(1.0)), ("m01", f(0.0)), ("m02", f(0.0)), ("m10", f(0.0)), ("m11", f(1.0)), ("m12", f(0.0))])),
+                ("textData", text),
+                ("fontSize", f(24.0)),
+                ("fontName", o(vec![("family", s("Inter")), ("style", s("Regular"))])),
+                ("textPathStart", o(vec![("tValue", f(0.5)), ("forward", Kv::Bool(true))])),
+                ("vectorData", o(vec![("vectorNetworkBlob", u(0)), ("normalizedSize", point(100.0, 0.0))])),
+            ],
+        ));
+    } else {
+        nodes.push(node(2, Some(1), "TEXT_PATH", vec![("name", s("broken path")), ("textData", o(vec![("characters", s("fallback"))]))]));
+    }
+    o(vec![("nodeChanges", a(nodes)), ("blobs", a(blobs))])
+}
+
+fn linked_underline_message() -> Kv<'static> {
+    let Kv::Object(mut root) = message(true) else { panic!("expected message object") };
+    let (_, Kv::Array(nodes)) = root.iter_mut().find(|(key, _)| *key == "nodeChanges").unwrap() else { panic!("expected node changes array") };
+    let text = nodes.iter_mut().find(|n| n.get("name").and_then(Kv::str) == Some("alpha path")).unwrap();
+    let Kv::Object(fields) = text else { panic!("expected text node object") };
+    fields.push(("styleIdForText", o(vec![("guid", guid(3))])));
+    nodes.push(node(
+        3,
+        Some(1),
+        "TEXT",
+        vec![
+            ("name", s("Shared style")),
+            ("styleType", s("TEXT")),
+            ("fontName", o(vec![("family", s("Inter")), ("style", s("Regular"))])),
+            ("fontSize", f(24.0)),
+            ("textDecoration", s("UNDERLINE")),
+        ],
+    ));
+    Kv::Object(root)
+}
+
+#[test]
+fn mapped_text_path_reaches_native_model_with_runs_and_no_standin_warning() {
+    let message = message(true);
+    let (json, warnings, _) = super::map::to_rest(&message, "Text path", crate::rest::MAX_NODES);
+    assert!(!warnings.iter().any(|w| w.contains("text off its path")), "{warnings:?}");
+    let (doc, warnings) = crate::rest::import_fig(&json, &|_| None).unwrap();
+    assert!(!warnings.iter().any(|w| w.contains("text off its path")), "{warnings:?}");
+    let node = doc.nodes().find(|n| n.name == "alpha path").unwrap();
+    let NodeKind::Text(text) = &node.kind else { panic!("expected text") };
+    let path = text.path.as_deref().unwrap();
+    assert_eq!(path, &TextPath { d: "M0,0 L100,0".into(), start: 0.5, flip: false });
+    assert_eq!(text.characters, "alpha");
+    assert_eq!(text.runs.len(), 1);
+    assert_eq!(text.runs[0].start, 3);
+    assert_eq!(text.runs[0].end, 5);
+}
+
+#[test]
+fn public_rest_import_ignores_private_fig_text_path_field() {
+    let message = message(true);
+    let (json, _, _) = super::map::to_rest(&message, "Text path", crate::rest::MAX_NODES);
+    // The mapper's private field is accepted only by import_fig, never by public REST import.
+    let path = json["document"]["children"][0]["children"][0]["_figTextPath"].clone();
+    assert!(path.is_object());
+    let (doc, _) = crate::rest::import(&json, &|_| None).unwrap();
+    let node = doc.nodes().find(|n| n.name == "alpha path").unwrap();
+    let NodeKind::Text(text) = &node.kind else { panic!("expected text") };
+    assert!(text.path.is_none());
+}
+
+#[test]
+fn serialized_kiwi_canvas_import_decodes_start_and_builds_native_path() {
+    let (doc, warnings) = super::import(&canvas(), "Serialized text path").unwrap();
+    let node = doc.nodes().find(|n| n.name == "alpha path").unwrap();
+    let NodeKind::Text(text) = &node.kind else { panic!("expected text") };
+    let path = text.path.as_deref().unwrap();
+    assert_eq!(path, &TextPath { d: "M0,0 L100,0".into(), start: 0.5, flip: false });
+    assert_eq!(text.characters, "alpha");
+    assert!(!warnings.iter().any(|w| w.contains("text off its path")), "{warnings:?}");
+}
+
+#[test]
+fn malformed_text_path_falls_back_with_specific_warning() {
+    let message = message(false);
+    let (json, warnings, _) = super::map::to_rest(&message, "Text path", crate::rest::MAX_NODES);
+    assert!(warnings.iter().any(|w| w.contains("text path has no start data") && w.contains("text imports off its path")), "{warnings:?}");
+    let (doc, _) = crate::rest::import_fig(&json, &|_| None).unwrap();
+    let node = doc.nodes().find(|n| n.name == "broken path").unwrap();
+    assert!(matches!(&node.kind, NodeKind::Text(text) if text.path.is_none()));
+}
+
+#[test]
+fn linked_text_style_decoration_warns_from_effective_mapped_style() {
+    let message = linked_underline_message();
+    let (json, warnings, _) = super::map::to_rest(&message, "Text path", crate::rest::MAX_NODES);
+    assert_eq!(json["document"]["children"][0]["children"][0]["style"]["textDecoration"], "UNDERLINE");
+    assert!(warnings.iter().any(|w| w == "text path underline or strikethrough decoration is not rendered"), "{warnings:?}");
+}
diff --git a/crates/format/src/fig/text_skip_ink_tests.rs b/crates/format/src/fig/text_skip_ink_tests.rs
new file mode 100644
index 00000000..48566384
--- /dev/null
+++ b/crates/format/src/fig/text_skip_ink_tests.rs
@@ -0,0 +1,272 @@
+//! `.fig` text skip-ink values map, inherit and round-trip as native decoration look state. Skip
+//! ink only shows on an underline, so the fixtures are underlined.
+
+use super::kiwi::Kv;
+use super::{export, import};
+use figcraft_doc::{Document, NodeKind, StyleKind, StyleRun, TextData, TextDecoration, TextStyle};
+use serde_json::Value;
+
+fn object(fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    Kv::Object(fields)
+}
+
+fn guid(id: u64) -> Kv<'static> {
+    object(vec![("sessionID", Kv::Uint(8)), ("localID", Kv::Uint(id))])
+}
+
+fn node(id: u64, ty: &'static str, name: &str, parent: Option<u64>, mut fields: Vec<(&'static str, Kv<'static>)>) -> Kv<'static> {
+    let mut out = vec![("guid", guid(id)), ("type", Kv::Enum(ty)), ("name", Kv::Str(name.into()))];
+    if let Some(parent) = parent {
+        out.push(("parentIndex", object(vec![("guid", guid(parent)), ("position", Kv::Str("a".into()))])));
+    }
+    out.append(&mut fields);
+    object(out)
+}
+
+fn font() -> Kv<'static> {
+    object(vec![("family", Kv::Str("Inter".into())), ("style", Kv::Str("Regular".into())), ("postscript", Kv::Str(String::new()))])
+}
+
+fn raw(base: Option<Kv<'static>>, runs: Vec<Kv<'static>>, chars: &str, ids: Vec<u64>, shared: Option<Option<Kv<'static>>>) -> Value {
+    let mut layer = vec![
+        ("fontName", font()),
+        ("fontSize", Kv::Float(20.0)),
+        ("textDecoration", Kv::Enum("UNDERLINE")),
+        (
+            "textData",
+            object(vec![
+                ("characters", Kv::Str(chars.into())),
+                ("characterStyleIDs", Kv::Array(ids.into_iter().map(Kv::Uint).collect())),
+                ("styleOverrideTable", Kv::Array(runs)),
+            ]),
+        ),
+    ];
+    if let Some(value) = base {
+        layer.push(("textDecorationSkipInk", value));
+    }
+    let mut nodes = vec![node(1, "DOCUMENT", "Document", None, vec![]), node(2, "CANVAS", "Page", Some(1), vec![])];
+    if let Some(shared) = shared {
+        let mut fields =
+            vec![("styleType", Kv::Enum("TEXT")), ("fontName", font()), ("fontSize", Kv::Float(20.0)), ("textDecoration", Kv::Enum("UNDERLINE"))];
+        if let Some(value) = shared {
+            fields.push(("textDecorationSkipInk", value));
+        }
+        nodes.push(node(10, "TEXT", "Body", Some(2), fields));
+        layer.push(("styleIdForText", object(vec![("guid", guid(10))])));
+    }
+    nodes.push(node(11, "TEXT", "Label", Some(2), layer));
+    let message = object(vec![("nodeChanges", Kv::Array(nodes))]);
+    super::map::to_rest(&message, "Synthetic skip ink", crate::rest::MAX_NODES).0
+}
+
+fn imported(value: &Value) -> Document {
+    let (doc, warnings) = crate::rest::import_fig(value, &|_| None).unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    doc
+}
+
+fn label(doc: &Document) -> &TextData {
+    doc.nodes().find(|n| n.name == "Label").unwrap().kind.text().unwrap()
+}
+
+fn skip_at(text: &TextData, index: usize) -> bool {
+    text.runs.iter().find(|r| r.start <= index && index < r.end).map_or_else(|| text.style.look().skip_ink, |r| r.style.look().skip_ink)
+}
+
+#[test]
+fn node_boolean_false_true_omitted_and_malformed_keep_typed_semantics() {
+    for (raw_value, expected) in [(Some(Kv::Bool(true)), true), (Some(Kv::Bool(false)), false), (None, false), (Some(Kv::Str("true".into())), false)]
+    {
+        let doc = imported(&raw(raw_value.clone(), vec![], "A", vec![0], None));
+        assert_eq!(label(&doc).style.look().skip_ink, expected, "source value {raw_value:?}");
+    }
+}
+
+#[test]
+fn runs_inherit_explicit_false_and_true_by_utf16_character_ids() {
+    let table = vec![
+        object(vec![("styleID", Kv::Uint(1))]),
+        object(vec![("styleID", Kv::Uint(2)), ("textDecorationSkipInk", Kv::Bool(false))]),
+        object(vec![("styleID", Kv::Uint(3)), ("textDecorationSkipInk", Kv::Bool(true))]),
+    ];
+    let doc = imported(&raw(Some(Kv::Bool(true)), table, "A😀BC", vec![0, 1, 1, 2, 3], None));
+    let text = label(&doc);
+    assert_eq!(text.characters.chars().count(), 4);
+    assert_eq!(text.characters.encode_utf16().count(), 5, "the emoji occupies two source style-ID units");
+    assert_eq!((0..text.char_count()).map(|i| skip_at(text, i)).collect::<Vec<_>>(), vec![true, true, false, true]);
+
+    let false_base = imported(&raw(
+        Some(Kv::Bool(false)),
+        vec![object(vec![("styleID", Kv::Uint(1)), ("textDecorationSkipInk", Kv::Bool(true))])],
+        "ab",
+        vec![1, 0],
+        None,
+    ));
+    assert_eq!((0..2).map(|i| skip_at(label(&false_base), i)).collect::<Vec<_>>(), vec![true, false]);
+}
+
+#[test]
+fn local_skip_ink_override_preserves_shared_style_and_omitted_value_inherits() {
+    for (local, expected) in [(Some(false), false), (None, true)] {
+        let value = raw(local.map(Kv::Bool), vec![], "ab", vec![0, 0], Some(Some(Kv::Bool(true))));
+        let doc = imported(&value);
+        let node = doc.nodes().find(|n| n.name == "Label").unwrap();
+        assert_eq!(node.kind.text().unwrap().style.look().skip_ink, expected);
+        let linked = doc.style(node.styles.text.as_deref().unwrap()).unwrap();
+        let StyleKind::Text { style } = &linked.kind else { panic!("linked definition must remain text") };
+        assert!(style.look().skip_ink, "local value must not alter definition");
+    }
+}
+
+#[test]
+fn instance_path_override_preserves_explicit_false_over_true_main() {
+    let main_text = node(
+        21,
+        "TEXT",
+        "Label",
+        Some(20),
+        vec![
+            ("fontName", font()),
+            ("fontSize", Kv::Float(20.0)),
+            ("textDecoration", Kv::Enum("UNDERLINE")),
+            ("textDecorationSkipInk", Kv::Bool(true)),
+            ("textData", object(vec![("characters", Kv::Str("A".into()))])),
+        ],
+    );
+    let instance = node(
+        30,
+        "INSTANCE",
+        "Copy",
+        Some(2),
+        vec![(
+            "symbolData",
+            object(vec![
+                ("symbolID", guid(20)),
+                (
+                    "symbolOverrides",
+                    Kv::Array(vec![object(vec![
+                        ("guidPath", object(vec![("guids", Kv::Array(vec![guid(21)]))])),
+                        ("textDecorationSkipInk", Kv::Bool(false)),
+                    ])]),
+                ),
+            ]),
+        )],
+    );
+    let message = object(vec![(
+        "nodeChanges",
+        Kv::Array(vec![
+            node(1, "DOCUMENT", "Document", None, vec![]),
+            node(2, "CANVAS", "Page", Some(1), vec![]),
+            node(20, "SYMBOL", "Main", Some(2), vec![]),
+            main_text,
+            instance,
+        ]),
+    )]);
+    let value = super::map::to_rest(&message, "Instance skip ink", crate::rest::MAX_NODES).0;
+    let copy = value["document"]["children"][0]["children"].as_array().unwrap().iter().find(|n| n["name"] == "Copy").unwrap();
+    let label = copy["children"].as_array().unwrap().iter().find(|n| n["name"] == "Label").unwrap();
+    assert_eq!(label["style"]["textDecorationSkipInk"], false);
+    let doc = imported(&value);
+    let copy = doc.nodes().find(|n| n.name == "Copy").unwrap();
+    let instance_label = doc.node(*copy.children.first().unwrap()).unwrap();
+    assert!(!instance_label.kind.text().unwrap().style.look().skip_ink);
+}
+
+#[test]
+fn export_writes_one_actual_node_value_and_complete_run_values_without_skip_only_warning() {
+    let mut doc = Document::new("Skip ink export");
+    let mut text = TextData::new("abcd");
+    text.style.decoration = TextDecoration::Underline;
+    text.style.set_look(|look| look.skip_ink = false);
+    let mut skipped = text.style.clone();
+    skipped.set_look(|look| look.skip_ink = true);
+    text.runs = vec![StyleRun { start: 1, end: 3, style: skipped }];
+    doc.create(doc.first_page().unwrap(), NodeKind::Text(text), "Label", 0.0, 0.0, 100.0, 30.0).unwrap();
+
+    let (bytes, warnings) = export(&doc, None).unwrap();
+    assert!(warnings.is_empty(), "skip-ink is supported: {warnings:?}");
+    let archive = super::Archive::open(&bytes).unwrap();
+    let (schema, body) = super::decode_canvas(&archive.canvas).unwrap();
+    let message = schema.decode_message(schema.find("Message").unwrap(), &body).unwrap();
+    let value = super::debug_json(&message);
+    let layer = value["nodeChanges"].as_array().unwrap().iter().find(|n| n["name"] == "Label").unwrap();
+    assert_eq!(layer["textDecorationSkipInk"], false);
+    assert_eq!(layer.as_object().unwrap().keys().filter(|k| *k == "textDecorationSkipInk").count(), 1);
+    let rows = layer["textData"]["styleOverrideTable"].as_array().unwrap();
+    assert_eq!(rows.len(), 1);
+    assert_eq!(rows[0]["textDecorationSkipInk"], true);
+    let (back, warnings) = import(&bytes, "Skip ink export").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    assert_eq!((0..4).map(|i| skip_at(label(&back), i)).collect::<Vec<_>>(), vec![false, true, true, false]);
+
+    let mut custom = TextData::new("x");
+    custom.style.set_look(|look| look.skip_ink = true);
+    custom.style.set_look(|look| look.thickness = figcraft_doc::DecorationLength::Pixels(2.0));
+    let mut custom_doc = Document::new("Unsupported decoration");
+    custom_doc.create(custom_doc.first_page().unwrap(), NodeKind::Text(custom), "Custom", 0.0, 0.0, 100.0, 30.0).unwrap();
+    let (_, warnings) = export(&custom_doc, None).unwrap();
+    assert!(warnings.iter().any(|w| w.contains("text decoration looks")), "custom look warning missing: {warnings:?}");
+
+    let mut variable = TextData::new("x");
+    variable.style.variations.insert("wght".into(), 400.0);
+    let mut variable_doc = Document::new("Variable font warning");
+    variable_doc.create(variable_doc.first_page().unwrap(), NodeKind::Text(variable), "Variable", 0.0, 0.0, 100.0, 30.0).unwrap();
+    let (_, warnings) = export(&variable_doc, None).unwrap();
+    assert!(warnings.iter().any(|w| w.contains("variable font settings")), "variation warning missing: {warnings:?}");
+
+    let mut shared = TextStyle { decoration: TextDecoration::Underline, ..TextStyle::default() };
+    shared.set_look(|look| look.skip_ink = true);
+    let mut local = TextStyle { decoration: TextDecoration::Underline, ..TextStyle::default() };
+    local.set_look(|look| look.skip_ink = false);
+    let mut linked_doc = Document::new("Shared skip ink");
+    linked_doc.styles.push(figcraft_doc::Style {
+        id: "body".into(),
+        name: "Body".into(),
+        description: String::new(),
+        kind: StyleKind::Text { style: shared },
+        bound: Default::default(),
+    });
+    let id = linked_doc
+        .create(linked_doc.first_page().unwrap(), NodeKind::Text(TextData { style: local, ..TextData::new("x") }), "Label", 0.0, 0.0, 100.0, 30.0)
+        .unwrap();
+    linked_doc.node_mut(id).unwrap().styles.text = Some("body".into());
+    let (bytes, warnings) = export(&linked_doc, None).unwrap();
+    assert!(warnings.is_empty(), "skip-ink-only shared styles are supported: {warnings:?}");
+    let (back, warnings) = import(&bytes, "Shared skip ink").unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let node = back.nodes().find(|n| n.name == "Label").unwrap();
+    assert!(!node.kind.text().unwrap().style.look().skip_ink);
+    let linked = back.style(node.styles.text.as_deref().unwrap()).unwrap();
+    let StyleKind::Text { style } = &linked.kind else { panic!("shared style link must remain text") };
+    assert!(style.look().skip_ink, "local false must not alter the shared definition");
+}
+
+#[test]
+fn skip_ink_without_an_underline_stays_out_of_the_look_and_exports_the_default() {
+    // Plain text with the files' default value imports with the default look...
+    let mut value = raw(Some(Kv::Bool(true)), vec![], "ab", vec![0, 0], None);
+    value["document"]["children"][0]["children"][0]["style"].as_object_mut().unwrap().remove("textDecoration");
+    let doc = imported(&value);
+    assert_eq!(label(&doc).style.decoration, TextDecoration::None);
+    assert!(label(&doc).style.decoration_look.is_none());
+
+    // ...an underlined run of it keeps the layer's value...
+    let mut value =
+        raw(Some(Kv::Bool(true)), vec![object(vec![("styleID", Kv::Uint(1)), ("textDecoration", Kv::Enum("UNDERLINE"))])], "ab", vec![1, 0], None);
+    value["document"]["children"][0]["children"][0]["style"].as_object_mut().unwrap().remove("textDecoration");
+    let doc = imported(&value);
+    assert_eq!((0..2).map(|i| skip_at(label(&doc), i)).collect::<Vec<_>>(), vec![true, false]);
+
+    // ...and default native text writes the default, which reads back as the default look.
+    let mut doc = Document::new("Plain");
+    doc.create(doc.first_page().unwrap(), NodeKind::Text(TextData::new("x")), "Label", 0.0, 0.0, 100.0, 30.0).unwrap();
+    let (bytes, _) = export(&doc, None).unwrap();
+    let archive = super::Archive::open(&bytes).unwrap();
+    let (schema, body) = super::decode_canvas(&archive.canvas).unwrap();
+    let message = schema.decode_message(schema.find("Message").unwrap(), &body).unwrap();
+    let value = super::debug_json(&message);
+    let layer = value["nodeChanges"].as_array().unwrap().iter().find(|n| n["name"] == "Label").unwrap();
+    assert_eq!(layer["textDecorationSkipInk"], true);
+    let (back, _) = import(&bytes, "Plain").unwrap();
+    assert!(label(&back).style.decoration_look.is_none());
+}
diff --git a/crates/format/src/fig/text_style_tests.rs b/crates/format/src/fig/text_style_tests.rs
new file mode 100644
index 00000000..b2c4ed59
--- /dev/null
+++ b/crates/format/src/fig/text_style_tests.rs
@@ -0,0 +1,292 @@
+//! Text layers and their shared text styles on import: which of the style, the layer's own
+//! values and an instance's overrides win, on messages built in code.
+
+use figcraft_doc::{Document, LetterSpacing, StyleKind, TextCase, TextDecoration};
+use serde_json::Value;
+
+use super::kiwi::Kv;
+
+type Fields = Vec<(&'static str, Kv<'static>)>;
+
+const NO_STYLE: u64 = 4_294_967_295;
+
+fn object(fields: Fields) -> Kv<'static> {
+    Kv::Object(fields)
+}
+
+fn guid(id: u64) -> Kv<'static> {
+    object(vec![("sessionID", Kv::Uint(9)), ("localID", Kv::Uint(id))])
+}
+
+fn link(id: u64) -> Kv<'static> {
+    object(vec![("guid", guid(id))])
+}
+
+fn node(id: u64, ty: &'static str, name: &str, parent: Option<u64>, mut more: Fields) -> Kv<'static> {
+    let mut fields = vec![("guid", guid(id)), ("type", Kv::Enum(ty)), ("name", Kv::Str(name.into()))];
+    if let Some(parent) = parent {
+        fields.push(("parentIndex", object(vec![("guid", guid(parent)), ("position", Kv::Str("a".into()))])));
+    }
+    fields.append(&mut more);
+    object(fields)
+}
+
+fn font(family: &str) -> Kv<'static> {
+    object(vec![("family", Kv::Str(family.into())), ("style", Kv::Str("Regular".into())), ("postscript", Kv::Str(String::new()))])
+}
+
+fn chars(text: &str) -> Kv<'static> {
+    object(vec![("characters", Kv::Str(text.into()))])
+}
+
+/// The REST JSON of a page holding `nodes`.
+fn rest(nodes: Vec<Kv<'static>>) -> Value {
+    let base = vec![node(1, "DOCUMENT", "Document", None, vec![]), node(2, "CANVAS", "Page", Some(1), vec![])];
+    let message = object(vec![("nodeChanges", Kv::Array(base.into_iter().chain(nodes).collect()))]);
+    super::map::to_rest(&message, "Synthetic text", crate::rest::MAX_NODES).0
+}
+
+fn import(value: &Value) -> Document {
+    let (doc, warnings) = crate::rest::import_fig(value, &|_| None).unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    doc
+}
+
+/// Depth-first search for a REST node by name below `v`.
+fn find<'v>(v: &'v Value, name: &str) -> Option<&'v Value> {
+    if v["name"] == name {
+        return Some(v);
+    }
+    v["children"].as_array()?.iter().find_map(|c| find(c, name))
+}
+
+/// A shared text style (Inter, 20 px, with `shared` fields) and a layer linking it whose own
+/// copy of the typography is stale (40 px, another family) and which sets `local`.
+fn linked(shared: Fields, local: Fields) -> Document {
+    let mut definition = vec![("styleType", Kv::Enum("TEXT")), ("fontName", font("Inter")), ("fontSize", Kv::Float(20.0))];
+    definition.extend(shared);
+    let mut layer = vec![("fontName", font("Stale copy")), ("fontSize", Kv::Float(40.0)), ("styleIdForText", link(10)), ("textData", chars("a\nb"))];
+    layer.extend(local);
+    import(&rest(vec![node(10, "TEXT", "Shared", Some(2), definition), node(11, "TEXT", "Label", Some(2), layer)]))
+}
+
+struct Seen {
+    case: TextCase,
+    decoration: TextDecoration,
+    spacing: f64,
+    indent: f64,
+    shared_case: TextCase,
+}
+
+fn seen(doc: &Document) -> Seen {
+    let label = doc.nodes().find(|n| n.name == "Label").unwrap();
+    let text = label.kind.text().unwrap();
+    // The shared style's typography beats the layer's stale copy, whatever the layer sets locally.
+    assert_eq!((text.style.font_family.as_str(), text.style.font_size), ("Inter", 20.0));
+    let linked = doc.style(label.styles.text.as_deref().unwrap()).unwrap();
+    assert_eq!(linked.name, "Shared");
+    let StyleKind::Text { style } = &linked.kind else { panic!("the linked definition must stay a text style") };
+    Seen {
+        case: text.style.case,
+        decoration: text.style.decoration,
+        spacing: text.paragraph_spacing,
+        indent: text.paragraph_indent,
+        shared_case: style.case,
+    }
+}
+
+#[test]
+fn local_case_decoration_and_paragraph_values_beat_the_shared_style() {
+    let shared = vec![
+        ("textCase", Kv::Enum("UPPER")),
+        ("textDecoration", Kv::Enum("UNDERLINE")),
+        ("paragraphSpacing", Kv::Float(24.0)),
+        ("paragraphIndent", Kv::Float(12.0)),
+    ];
+    // Nothing set on the layer: the style's values stay.
+    let s = seen(&linked(shared.clone(), vec![]));
+    assert_eq!((s.case, s.decoration, s.spacing, s.indent), (TextCase::Upper, TextDecoration::Underline, 24.0, 12.0));
+    // Explicit values on the layer win, and "original", "none" and zero clear the style's.
+    let cleared = vec![
+        ("textCase", Kv::Enum("ORIGINAL")),
+        ("textDecoration", Kv::Enum("NONE")),
+        ("paragraphSpacing", Kv::Float(0.0)),
+        ("paragraphIndent", Kv::Float(0.0)),
+    ];
+    let s = seen(&linked(shared.clone(), cleared));
+    assert_eq!((s.case, s.decoration, s.spacing, s.indent), (TextCase::Original, TextDecoration::None, 0.0, 0.0));
+    assert_eq!(s.shared_case, TextCase::Upper, "a local value must not change the definition");
+    let local = vec![
+        ("textCase", Kv::Enum("SMALL_CAPS_FORCED")),
+        ("textDecoration", Kv::Enum("STRIKETHROUGH")),
+        ("paragraphSpacing", Kv::Float(6.0)),
+        ("paragraphIndent", Kv::Float(3.0)),
+    ];
+    let s = seen(&linked(vec![], local));
+    assert_eq!((s.case, s.decoration, s.spacing, s.indent), (TextCase::SmallCaps, TextDecoration::Strikethrough, 6.0, 3.0));
+    // A value the importer does not know leaves the style's in place.
+    let s = seen(&linked(shared, vec![("textCase", Kv::Enum("UNSUPPORTED_CASE")), ("textDecoration", Kv::Enum("WAVY"))]));
+    assert_eq!((s.case, s.decoration), (TextCase::Upper, TextDecoration::Underline));
+}
+
+#[test]
+fn an_instance_override_beats_the_shared_style_and_a_detach_unlinks_it() {
+    let value = rest(vec![
+        node(10, "TEXT", "Body", Some(2), vec![("styleType", Kv::Enum("TEXT")), ("fontName", font("Inter")), ("fontSize", Kv::Float(14.0))]),
+        node(20, "SYMBOL", "Main", Some(2), vec![]),
+        node(
+            21,
+            "TEXT",
+            "Label",
+            Some(20),
+            vec![("fontName", font("Inter")), ("fontSize", Kv::Float(14.0)), ("styleIdForText", link(10)), ("textData", chars("Hi"))],
+        ),
+        node(
+            30,
+            "INSTANCE",
+            "Inst",
+            Some(2),
+            vec![(
+                "symbolData",
+                object(vec![
+                    ("symbolID", guid(20)),
+                    (
+                        "symbolOverrides",
+                        Kv::Array(vec![object(vec![
+                            ("guidPath", object(vec![("guids", Kv::Array(vec![guid(21)]))])),
+                            ("fontSize", Kv::Float(30.0)),
+                        ])]),
+                    ),
+                ]),
+            )],
+        ),
+        // An explicit "no style" detaches, even when the older field still names a style.
+        node(
+            40,
+            "TEXT",
+            "Detached",
+            Some(2),
+            vec![
+                ("fontName", font("Roboto")),
+                ("fontSize", Kv::Float(40.0)),
+                ("styleIdForText", object(vec![("guid", object(vec![("sessionID", Kv::Uint(NO_STYLE)), ("localID", Kv::Uint(NO_STYLE))]))])),
+                ("inheritTextStyleID", guid(10)),
+                ("textData", chars("ab")),
+            ],
+        ),
+    ]);
+    let label = find(find(&value["document"], "Inst").unwrap(), "Label").unwrap();
+    assert_eq!(label["style"]["fontSize"].as_f64(), Some(30.0), "the override beats the style");
+    let detached = find(&value["document"], "Detached").unwrap();
+    assert!(detached["styles"].get("text").is_none(), "{}", detached["styles"]);
+    assert_eq!(detached["style"]["fontSize"].as_f64(), Some(40.0));
+}
+
+#[test]
+fn a_text_property_value_drops_the_run_styles_made_for_the_main_text() {
+    let ids = [0u64, 0, 0, 1, 1, 1].map(Kv::Uint).to_vec();
+    let value = rest(vec![
+        node(
+            20,
+            "SYMBOL",
+            "Main",
+            Some(2),
+            vec![(
+                "componentPropDefs",
+                Kv::Array(vec![object(vec![
+                    ("id", guid(70)),
+                    ("name", Kv::Str("Text".into())),
+                    ("type", Kv::Enum("TEXT")),
+                    ("initialValue", object(vec![("textValue", chars("Hi you"))])),
+                ])]),
+            )],
+        ),
+        node(
+            21,
+            "TEXT",
+            "Label",
+            Some(20),
+            vec![
+                ("fontName", font("Inter")),
+                ("fontSize", Kv::Float(12.0)),
+                (
+                    "textData",
+                    object(vec![
+                        ("characters", Kv::Str("Hi you".into())),
+                        ("characterStyleIDs", Kv::Array(ids)),
+                        ("styleOverrideTable", Kv::Array(vec![object(vec![("styleID", Kv::Uint(1)), ("fontSize", Kv::Float(30.0))])])),
+                    ]),
+                ),
+                (
+                    "parameterConsumptionMap",
+                    object(vec![(
+                        "entries",
+                        Kv::Array(vec![object(vec![
+                            ("variableField", Kv::Enum("TEXT_DATA")),
+                            ("variableData", object(vec![("value", object(vec![("propRefValue", object(vec![("defId", guid(70))]))]))])),
+                        ])]),
+                    )]),
+                ),
+            ],
+        ),
+        node(
+            30,
+            "INSTANCE",
+            "Inst",
+            Some(2),
+            vec![
+                ("symbolData", object(vec![("symbolID", guid(20))])),
+                (
+                    "componentPropAssignments",
+                    Kv::Array(vec![object(vec![("defID", guid(70)), ("value", object(vec![("textValue", chars("Goodbye"))]))])]),
+                ),
+            ],
+        ),
+    ]);
+    let main = find(find(&value["document"], "Main").unwrap(), "Label").unwrap();
+    let kept: Vec<u64> = main["characterStyleOverrides"].as_array().map(|a| a.iter().filter_map(Value::as_u64).collect()).unwrap_or_default();
+    assert_eq!(kept, [0, 0, 0, 1, 1, 1], "the main keeps its run styles");
+    let inst = find(&value["document"], "Inst").unwrap();
+    let layer = find(inst, "Label").unwrap();
+    assert_eq!(layer["characters"], "Goodbye");
+    assert!(layer.get("characterStyleOverrides").is_none(), "positions of the main's runs do not fit the property text");
+}
+
+#[test]
+fn percent_letter_spacing_stays_a_percentage() {
+    let spacing = |units: &'static str, value: f32| object(vec![("value", Kv::Float(value)), ("units", Kv::Enum(units))]);
+    let layer = |id, name: &str, letter: Kv<'static>| {
+        node(
+            id,
+            "TEXT",
+            name,
+            Some(2),
+            vec![("fontName", font("Inter")), ("fontSize", Kv::Float(20.0)), ("letterSpacing", letter), ("textData", chars("Hello"))],
+        )
+    };
+    let doc = import(&rest(vec![layer(10, "Percent", spacing("PERCENT", 5.0)), layer(11, "Pixels", spacing("PIXELS", 2.0))]));
+    let spacing = |name: &str| doc.nodes().find(|n| n.name == name).unwrap().kind.text().unwrap().style.letter_spacing;
+    assert_eq!(spacing("Percent"), LetterSpacing::Percent(5.0));
+    assert_eq!(spacing("Pixels"), LetterSpacing::Pixels(2.0));
+}
+
+#[test]
+fn the_private_percent_is_read_for_fig_imports_only() {
+    let value = rest(vec![node(
+        10,
+        "TEXT",
+        "Label",
+        Some(2),
+        vec![
+            ("fontName", font("Inter")),
+            ("fontSize", Kv::Float(20.0)),
+            ("letterSpacing", object(vec![("value", Kv::Float(5.0)), ("units", Kv::Enum("PERCENT"))])),
+            ("textData", chars("Hello")),
+        ],
+    )]);
+    let spacing = |doc: &Document| doc.nodes().find(|n| n.name == "Label").unwrap().kind.text().unwrap().style.letter_spacing;
+    assert_eq!(spacing(&import(&value)), LetterSpacing::Percent(5.0));
+    // The same JSON through the public REST import is pixels.
+    let (public, _) = crate::rest::import(&value, &|_| None).unwrap();
+    assert_eq!(spacing(&public), LetterSpacing::Pixels(1.0));
+}
diff --git a/crates/format/src/image_budget_tests.rs b/crates/format/src/image_budget_tests.rs
index 58bb4da1..8e10cd71 100644
--- a/crates/format/src/image_budget_tests.rs
+++ b/crates/format/src/image_budget_tests.rs
@@ -66,6 +66,19 @@ fn images_past_the_byte_budget_are_left_out_and_reported() {
     assert!(loaded.issues.iter().any(|i| i.contains(lost[0].as_str()) && i.contains("together")), "{:?}", loaded.issues);
 }
 
+#[test]
+fn images_past_the_budget_are_counted_and_stay_in_the_file() {
+    let (bytes, _, total) = file_with_images(3);
+    let loaded = load_within(&bytes, ImageBudget { images: 100, bytes: total - 1 }).unwrap();
+    assert_eq!(loaded.images_past_budget, 1);
+    assert!(loaded.issues.iter().any(|i| i.contains("stays in the file")), "{:?}", loaded.issues);
+    assert!(!loaded.issues.iter().any(|i| i.contains("drops it")), "{:?}", loaded.issues);
+    let counted = load_within(&bytes, ImageBudget { images: 2, bytes: u64::MAX }).unwrap();
+    assert_eq!(counted.images_past_budget, 1);
+    let within = load_within(&bytes, ImageBudget { images: 3, bytes: total }).unwrap();
+    assert_eq!(within.images_past_budget, 0);
+}
+
 #[test]
 fn images_past_the_count_budget_are_left_out_and_reported() {
     let (bytes, _, _) = file_with_images(4);
diff --git a/crates/format/src/image_tests.rs b/crates/format/src/image_tests.rs
index bc925efb..e58a4ab1 100644
--- a/crates/format/src/image_tests.rs
+++ b/crates/format/src/image_tests.rs
@@ -86,3 +86,29 @@ fn many_lost_images_are_counted_not_listed_one_by_one() {
     assert_eq!(issues.len(), MAX_IMAGE_ISSUES + 1, "{issues:?}");
     assert_eq!(issues.last().map(String::as_str), Some("20 more images couldn't be loaded"));
 }
+
+#[test]
+fn image_members_with_path_like_names_are_dropped_and_not_saved_back() {
+    let (d, hash) = doc_with_image();
+    let bytes = save_bytes(&d, None).unwrap();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(&bytes)).unwrap();
+    let doc_json = read_member(&mut z, "document.json", u64::MAX).unwrap();
+    let mut buf = std::io::Cursor::new(Vec::new());
+    let mut w = zip::ZipWriter::new(&mut buf);
+    let opts = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
+    w.start_file("document.json", opts).unwrap();
+    w.write_all(&doc_json).unwrap();
+    for n in ["images/../../x", "images/a/b"] {
+        w.start_file(n, opts).unwrap();
+        w.write_all(&png()).unwrap();
+    }
+    w.finish().unwrap();
+    let hostile = buf.into_inner();
+    let loaded = load_bytes_with_versions(&hostile).unwrap();
+    assert!(loaded.doc.images.keys().all(|k| k != "../../x" && k != "a/b"), "{:?}", loaded.doc.images.keys());
+    assert!(!loaded.issues.is_empty());
+    let saved = save_bytes_with_history(&loaded.doc, None, &loaded.versions, &loaded.branches).unwrap();
+    let z = zip::ZipArchive::new(std::io::Cursor::new(saved)).unwrap();
+    assert!(z.file_names().all(|n| !n.contains("..") && n.matches('/').count() <= 1), "{:?}", z.file_names().collect::<Vec<_>>());
+    let _ = hash;
+}
diff --git a/crates/format/src/large_tests.rs b/crates/format/src/large_tests.rs
index 3ff352ac..889074f1 100644
--- a/crates/format/src/large_tests.rs
+++ b/crates/format/src/large_tests.rs
@@ -202,3 +202,20 @@ fn the_header_is_read_on_its_own() {
     let (_, _, index) = parse_json(&d.replacen("\"imageIndex\":[]", "\"imageIndex\":[{\"hash\":\"ab\"},{\"nope\":1}]", 1)).unwrap();
     assert_eq!(index, Some(["ab".to_string()].into_iter().collect()));
 }
+
+#[test]
+fn document_json_may_unpack_in_proportion_to_its_packed_size() {
+    const MB: u64 = 1024 * 1024;
+    // A small archive keeps the member cap: it can't unpack into gigabytes.
+    assert_eq!(document_limit(0, 0), MAX_MEMBER);
+    assert_eq!(document_limit(MB, 2 * MB), MAX_MEMBER);
+    // A real 900 000-layer document saved by us packs 1 477 139 810 bytes into 244 362 923, and
+    // didn't open again under the 512 MB cap.
+    if cfg!(not(target_pointer_width = "32")) {
+        assert!(document_limit(244_362_923, 260 * MB) > 1_477_139_810);
+    }
+    // The packed size an archive claims counts only up to the archive's own size.
+    assert_eq!(document_limit(u64::MAX, MB), MAX_MEMBER);
+    // Never more than the ceiling.
+    assert_eq!(document_limit(u64::MAX, u64::MAX), MAX_DOCUMENT);
+}
diff --git a/crates/format/src/lib.rs b/crates/format/src/lib.rs
index f88416e2..30f6e548 100644
--- a/crates/format/src/lib.rs
+++ b/crates/format/src/lib.rs
@@ -20,6 +20,7 @@
 pub mod fig;
 pub mod library;
 pub mod rest;
+pub mod sketch;
 pub mod thumbnail;
 
 pub use library::{is_valid_library_id, read_library, read_library_within};
@@ -39,6 +40,15 @@ pub const FORMAT: &str = "figcraft";
 pub const VERSION: u32 = 1;
 /// Largest archive member we read (guards against zip bombs).
 const MAX_MEMBER: u64 = 512 * 1024 * 1024;
+/// `document.json` may unpack to [`DOCUMENT_RATIO`] times what it takes in the archive, within
+/// [`MAX_MEMBER`] and [`MAX_DOCUMENT`]: a large document saved by us (a 900 000-layer file packs
+/// 1.48 GB into 244 MB) opens again, while a small archive still can't unpack into gigabytes.
+/// 32-bit targets (wasm32) have a 4 GB address space in all, so their ceiling is lower.
+const DOCUMENT_RATIO: u64 = 16;
+#[cfg(not(target_pointer_width = "32"))]
+const MAX_DOCUMENT: u64 = 4 * 1024 * 1024 * 1024;
+#[cfg(target_pointer_width = "32")]
+const MAX_DOCUMENT: u64 = 1024 * 1024 * 1024;
 /// Most versions a file keeps: saving more is refused, extra entries in a file are skipped.
 pub const MAX_VERSIONS: usize = 100;
 /// Longest version name and description kept (chars).
@@ -181,11 +191,12 @@ pub struct Loaded {
     pub issues: Vec<String>,
     pub versions: Vec<Version>,
     pub branches: Vec<Branch>,
+    pub images_past_budget: usize,
 }
 
 impl From<Document> for Loaded {
     fn from(doc: Document) -> Self {
-        Self { doc, issues: Vec::new(), versions: Vec::new(), branches: Vec::new() }
+        Self { doc, issues: Vec::new(), versions: Vec::new(), branches: Vec::new(), images_past_budget: 0 }
     }
 }
 
@@ -243,14 +254,193 @@ fn image_index<S: Serializer>(images: &&BTreeMap<String, ImageData>, s: S) -> Re
     s.collect_seq(images.iter().map(|(hash, i)| Entry { hash, width: i.width, height: i.height }))
 }
 
+/// A serializer adapter that writes `0` in place of every NaN or infinite float. JSON has no such
+/// numbers (`serde_json` writes `null`, which the reader rejects), so one bad value must not stop
+/// Save, autosave or recovery copies of the whole document. Everything else passes through.
+struct Finite<S>(S);
+
+/// Serializes a value through a [`Finite`] adapter around the serializer it is written with.
+struct FiniteValue<'a, T: ?Sized>(&'a T);
+
+impl<T: ?Sized + Serialize> Serialize for FiniteValue<'_, T> {
+    fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
+        self.0.serialize(Finite(s))
+    }
+}
+
+macro_rules! finite_pass {
+    ($($name:ident($ty:ty)),* $(,)?) => {
+        $(fn $name(self, v: $ty) -> Result<S::Ok, S::Error> { self.0.$name(v) })*
+    };
+}
+
+impl<S: Serializer> Serializer for Finite<S> {
+    type Ok = S::Ok;
+    type Error = S::Error;
+    type SerializeSeq = Finite<S::SerializeSeq>;
+    type SerializeTuple = Finite<S::SerializeTuple>;
+    type SerializeTupleStruct = Finite<S::SerializeTupleStruct>;
+    type SerializeTupleVariant = Finite<S::SerializeTupleVariant>;
+    type SerializeMap = Finite<S::SerializeMap>;
+    type SerializeStruct = Finite<S::SerializeStruct>;
+    type SerializeStructVariant = Finite<S::SerializeStructVariant>;
+
+    finite_pass!(
+        serialize_bool(bool),
+        serialize_i8(i8),
+        serialize_i16(i16),
+        serialize_i32(i32),
+        serialize_i64(i64),
+        serialize_u8(u8),
+        serialize_u16(u16),
+        serialize_u32(u32),
+        serialize_u64(u64),
+        serialize_i128(i128),
+        serialize_u128(u128),
+        serialize_char(char),
+        serialize_str(&str),
+        serialize_bytes(&[u8])
+    );
+
+    fn serialize_f32(self, v: f32) -> Result<S::Ok, S::Error> {
+        self.0.serialize_f32(if v.is_finite() { v } else { 0.0 })
+    }
+    fn serialize_f64(self, v: f64) -> Result<S::Ok, S::Error> {
+        self.0.serialize_f64(if v.is_finite() { v } else { 0.0 })
+    }
+    fn serialize_none(self) -> Result<S::Ok, S::Error> {
+        self.0.serialize_none()
+    }
+    fn serialize_some<T: ?Sized + Serialize>(self, v: &T) -> Result<S::Ok, S::Error> {
+        self.0.serialize_some(&FiniteValue(v))
+    }
+    fn serialize_unit(self) -> Result<S::Ok, S::Error> {
+        self.0.serialize_unit()
+    }
+    fn serialize_unit_struct(self, name: &'static str) -> Result<S::Ok, S::Error> {
+        self.0.serialize_unit_struct(name)
+    }
+    fn serialize_unit_variant(self, name: &'static str, idx: u32, variant: &'static str) -> Result<S::Ok, S::Error> {
+        self.0.serialize_unit_variant(name, idx, variant)
+    }
+    fn serialize_newtype_struct<T: ?Sized + Serialize>(self, name: &'static str, v: &T) -> Result<S::Ok, S::Error> {
+        self.0.serialize_newtype_struct(name, &FiniteValue(v))
+    }
+    fn serialize_newtype_variant<T: ?Sized + Serialize>(self, name: &'static str, idx: u32, variant: &'static str, v: &T) -> Result<S::Ok, S::Error> {
+        self.0.serialize_newtype_variant(name, idx, variant, &FiniteValue(v))
+    }
+    fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, S::Error> {
+        self.0.serialize_seq(len).map(Finite)
+    }
+    fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, S::Error> {
+        self.0.serialize_tuple(len).map(Finite)
+    }
+    fn serialize_tuple_struct(self, name: &'static str, len: usize) -> Result<Self::SerializeTupleStruct, S::Error> {
+        self.0.serialize_tuple_struct(name, len).map(Finite)
+    }
+    fn serialize_tuple_variant(
+        self,
+        name: &'static str,
+        idx: u32,
+        variant: &'static str,
+        len: usize,
+    ) -> Result<Self::SerializeTupleVariant, S::Error> {
+        self.0.serialize_tuple_variant(name, idx, variant, len).map(Finite)
+    }
+    fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap, S::Error> {
+        self.0.serialize_map(len).map(Finite)
+    }
+    fn serialize_struct(self, name: &'static str, len: usize) -> Result<Self::SerializeStruct, S::Error> {
+        self.0.serialize_struct(name, len).map(Finite)
+    }
+    fn serialize_struct_variant(
+        self,
+        name: &'static str,
+        idx: u32,
+        variant: &'static str,
+        len: usize,
+    ) -> Result<Self::SerializeStructVariant, S::Error> {
+        self.0.serialize_struct_variant(name, idx, variant, len).map(Finite)
+    }
+    fn is_human_readable(&self) -> bool {
+        self.0.is_human_readable()
+    }
+}
+
+macro_rules! finite_elements {
+    ($($trait:ident::$method:ident),* $(,)?) => {
+        $(impl<S: serde::ser::$trait> serde::ser::$trait for Finite<S> {
+            type Ok = S::Ok;
+            type Error = S::Error;
+            fn $method<T: ?Sized + Serialize>(&mut self, v: &T) -> Result<(), S::Error> {
+                self.0.$method(&FiniteValue(v))
+            }
+            fn end(self) -> Result<S::Ok, S::Error> {
+                self.0.end()
+            }
+        })*
+    };
+}
+
+finite_elements!(
+    SerializeSeq::serialize_element,
+    SerializeTuple::serialize_element,
+    SerializeTupleStruct::serialize_field,
+    SerializeTupleVariant::serialize_field
+);
+
+impl<S: serde::ser::SerializeMap> serde::ser::SerializeMap for Finite<S> {
+    type Ok = S::Ok;
+    type Error = S::Error;
+    fn serialize_key<T: ?Sized + Serialize>(&mut self, k: &T) -> Result<(), S::Error> {
+        self.0.serialize_key(&FiniteValue(k))
+    }
+    fn serialize_value<T: ?Sized + Serialize>(&mut self, v: &T) -> Result<(), S::Error> {
+        self.0.serialize_value(&FiniteValue(v))
+    }
+    fn end(self) -> Result<S::Ok, S::Error> {
+        self.0.end()
+    }
+}
+
+impl<S: serde::ser::SerializeStruct> serde::ser::SerializeStruct for Finite<S> {
+    type Ok = S::Ok;
+    type Error = S::Error;
+    fn serialize_field<T: ?Sized + Serialize>(&mut self, key: &'static str, v: &T) -> Result<(), S::Error> {
+        self.0.serialize_field(key, &FiniteValue(v))
+    }
+    fn skip_field(&mut self, key: &'static str) -> Result<(), S::Error> {
+        self.0.skip_field(key)
+    }
+    fn end(self) -> Result<S::Ok, S::Error> {
+        self.0.end()
+    }
+}
+
+impl<S: serde::ser::SerializeStructVariant> serde::ser::SerializeStructVariant for Finite<S> {
+    type Ok = S::Ok;
+    type Error = S::Error;
+    fn serialize_field<T: ?Sized + Serialize>(&mut self, key: &'static str, v: &T) -> Result<(), S::Error> {
+        self.0.serialize_field(key, &FiniteValue(v))
+    }
+    fn skip_field(&mut self, key: &'static str) -> Result<(), S::Error> {
+        self.0.skip_field(key)
+    }
+    fn end(self) -> Result<S::Ok, S::Error> {
+        self.0.end()
+    }
+}
+
 /// Serialize the document (without images) to the JSON value stored in `document.json`.
+/// NaN and infinite numbers are written as `0`.
 pub fn to_json(doc: &Document) -> Result<Value, FormatError> {
-    serde_json::to_value(DocumentJson::new(doc)).map_err(io_err)
+    DocumentJson::new(doc).serialize(Finite(serde_json::value::Serializer)).map_err(io_err)
 }
 
 /// Write the document (without images) as `document.json` content to `w`.
+/// NaN and infinite numbers are written as `0`.
 pub fn write_json(doc: &Document, w: impl Write) -> Result<(), FormatError> {
-    serde_json::to_writer(w, &DocumentJson::new(doc)).map_err(io_err)
+    DocumentJson::new(doc).serialize(Finite(&mut serde_json::Serializer::new(w))).map_err(io_err)
 }
 
 /// Parse `document.json` content.
@@ -334,6 +524,20 @@ pub(crate) fn put<W: Write + Seek>(
     z.write_all(bytes).map_err(io_err)
 }
 
+/// `files` (name, bytes; a `/` in a name makes a folder) as one zip archive: several exports
+/// delivered as a single download (#969).
+pub fn zip_files<'a>(files: impl IntoIterator<Item = (&'a str, &'a [u8])>) -> Result<Vec<u8>, FormatError> {
+    let mut buf = std::io::Cursor::new(Vec::new());
+    {
+        let mut z = zip::ZipWriter::new(&mut buf);
+        for (name, bytes) in files {
+            put(&mut z, name, zip::write::SimpleFileOptions::default(), bytes)?;
+        }
+        z.finish().map_err(io_err)?;
+    }
+    Ok(buf.into_inner())
+}
+
 /// Add `doc` as a `document.json`-style member, serialized straight into the compressor.
 fn put_json<W: Write + Seek>(z: &mut zip::ZipWriter<W>, name: &str, doc: &Document) -> Result<(), FormatError> {
     z.start_file(name, json_options()).map_err(io_err)?;
@@ -455,6 +659,11 @@ pub(crate) fn read_member<R: Read + Seek>(z: &mut zip::ZipArchive<R>, name: &str
     Ok(data)
 }
 
+/// Largest `document.json` read from an archive of `len` bytes in which it takes `packed`.
+pub(crate) fn document_limit(packed: u64, len: u64) -> u64 {
+    packed.min(len).saturating_mul(DOCUMENT_RATIO).clamp(MAX_MEMBER, MAX_DOCUMENT)
+}
+
 /// How many images, and how many bytes of them together, one file may give.
 #[derive(Clone, Copy, Debug)]
 pub(crate) struct ImageBudget {
@@ -476,10 +685,13 @@ pub(crate) fn load_within(bytes: &[u8], budget: ImageBudget) -> Result<Loaded, F
         return Ok(Loaded { issues, ..Loaded::from(doc) });
     }
     let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).map_err(|e| FormatError::Corrupt(e.to_string()))?;
-    let text = String::from_utf8(read_member(&mut z, "document.json", MAX_MEMBER)?).map_err(|e| FormatError::Corrupt(e.to_string()))?;
+    let packed = z.by_name("document.json").map(|f| f.compressed_size()).unwrap_or(0);
+    let limit = document_limit(packed, bytes.len() as u64);
+    let text = String::from_utf8(read_member(&mut z, "document.json", limit)?).map_err(|e| FormatError::Corrupt(e.to_string()))?;
     let (mut doc, mut issues, own_images) = parse_json(&text)?;
-    let (images, unread) = read_images(&mut z, own_images.as_ref(), budget);
-    report_lost_images(&mut issues, &unread, own_images.as_ref(), &images);
+    let ImagesRead { images, unread, past_budget } = read_images(&mut z, own_images.as_ref(), budget);
+    report_lost_images(&mut issues, &unread, &past_budget, own_images.as_ref(), &images);
+    let images_past_budget = past_budget.len();
     match library::read(&mut z, &images, u64::MAX) {
         Ok(lib) => doc.published = lib.map(Arc::new),
         Err(e) => issues.push(format!("the published library was skipped: {e}")),
@@ -497,30 +709,37 @@ pub(crate) fn load_within(bytes: &[u8], budget: ImageBudget) -> Result<Loaded, F
         .filter(|h| own_images.as_ref().is_some_and(|o| !o.contains(*h)))
         .collect();
     doc.images = images.into_iter().filter(|(h, _)| !history_only.contains(h)).collect();
-    Ok(Loaded { doc, issues, versions, branches })
+    Ok(Loaded { doc, issues, versions, branches, images_past_budget })
 }
 
 /// The archive's `images/` members by hash, within `budget`, and the ones that couldn't be read
 /// with why. The document's own images (`own`) are read first, so a file past the budget loses
 /// the images only its history uses before its own.
-fn read_images<R: Read + Seek>(
-    z: &mut zip::ZipArchive<R>,
-    own: Option<&BTreeSet<String>>,
-    budget: ImageBudget,
-) -> (BTreeMap<String, ImageData>, Vec<(String, FormatError)>) {
-    let mut hashes: Vec<String> = z.file_names().filter_map(|n| n.strip_prefix("images/")).map(str::to_string).collect();
+fn read_images<R: Read + Seek>(z: &mut zip::ZipArchive<R>, own: Option<&BTreeSet<String>>, budget: ImageBudget) -> ImagesRead {
+    let mut hashes: Vec<String> = z.file_names().filter_map(|n| n.strip_prefix("images/")).filter(|h| !h.is_empty()).map(str::to_string).collect();
     hashes.sort_by_key(|h| !own.is_some_and(|o| o.contains(h)));
     let mut images = BTreeMap::new();
     let mut unread = Vec::new();
+    // Member names that aren't plain hashes (`../x`, `a/b`) are never read, so never written back.
+    hashes.retain(|h| {
+        let ok = library::is_valid_hash(h);
+        if !ok {
+            unread.push((h.clone(), FormatError::Corrupt("its name isn't a valid image hash".to_string())));
+        }
+        ok
+    });
     let mut left = budget.bytes;
+    let mut past_budget = BTreeSet::new();
     for (i, hash) in hashes.into_iter().enumerate() {
         let name = format!("images/{hash}");
         if i >= budget.images {
+            past_budget.insert(hash.clone());
             unread.push((hash, FormatError::Corrupt(format!("the file has more than {} images", budget.images))));
             continue;
         }
         if z.by_name(&name).is_ok_and(|f| f.size() > left) {
             let mb = budget.bytes / (1024 * 1024);
+            past_budget.insert(hash.clone());
             unread.push((hash, FormatError::Corrupt(format!("the file's images together pass {mb} MB"))));
             continue;
         }
@@ -532,18 +751,22 @@ fn read_images<R: Read + Seek>(
             Err(e) => unread.push((hash, e)),
         }
     }
-    (images, unread)
+    ImagesRead { images, unread, past_budget }
+}
+
+struct ImagesRead {
+    images: BTreeMap<String, ImageData>,
+    unread: Vec<(String, FormatError)>,
+    past_budget: BTreeSet<String>,
 }
 
 /// Most lost images reported one by one (the rest as a count).
 const MAX_IMAGE_ISSUES: usize = 20;
 
-/// Report the images a file lost on loading: members that couldn't be read (damaged, too large)
-/// and images its document lists but the archive doesn't hold. They are left out, so saving the
-/// file again would drop them for good.
 fn report_lost_images(
     issues: &mut Vec<String>,
     unread: &[(String, FormatError)],
+    past_budget: &BTreeSet<String>,
     listed: Option<&BTreeSet<String>>,
     images: &BTreeMap<String, ImageData>,
 ) {
@@ -554,7 +777,11 @@ fn report_lost_images(
                 FormatError::Corrupt(m) | FormatError::Io(m) => m.clone(),
                 FormatError::Newer(v) => format!("format version {v}"),
             };
-            format!("image {hash} couldn't be read ({why}): it is left out, and saving this file again drops it")
+            if past_budget.contains(hash) {
+                format!("image {hash} couldn't be read ({why}): it is left out and stays in the file, which can't be saved over without losing it")
+            } else {
+                format!("image {hash} couldn't be read ({why}): it is left out, and saving this file again drops it")
+            }
         })
         .collect();
     let unread_hashes: BTreeSet<&str> = unread.iter().map(|(h, _)| h.as_str()).collect();
@@ -792,6 +1019,37 @@ mod tests {
         assert!(load_bytes(&json).is_ok());
     }
 
+    #[test]
+    fn non_finite_numbers_are_saved_as_zero() {
+        let mut d = Document::new("NaN");
+        let p = d.first_page().unwrap();
+        let r = d.create(p, NodeKind::Rectangle, "R", 1.0, 2.0, 3.0, 4.0).unwrap();
+        assert!(save_bytes(&d, None).is_ok());
+        d.get_mut(r).unwrap().width = f64::NAN;
+        d.get_mut(r).unwrap().opacity = f32::INFINITY;
+        // Saving never fails; non-finite numbers are written as 0 and the file reopens.
+        let bytes = save_bytes(&d, None).unwrap();
+        let (back, _) = load_bytes(&bytes).unwrap();
+        assert_eq!(back.node_count(), d.node_count());
+        let n = back.get(r).unwrap();
+        assert_eq!(n.width, 0.0);
+        assert_eq!(n.opacity, 0.0);
+        assert_eq!(n.height, 4.0);
+        let mut out = Vec::new();
+        write_json(&d, &mut out).unwrap();
+        let (back, _) = from_json(std::str::from_utf8(&out).unwrap()).unwrap();
+        let n = back.get(r).unwrap();
+        assert_eq!(n.width, 0.0);
+        assert_eq!(n.opacity, 0.0);
+        assert_eq!(n.height, 4.0);
+        let v = to_json(&d).unwrap();
+        let (back, _) = from_json(&v.to_string()).unwrap();
+        let n = back.get(r).unwrap();
+        assert_eq!(n.width, 0.0);
+        assert_eq!(n.opacity, 0.0);
+        assert_eq!(n.height, 4.0);
+    }
+
     #[test]
     fn garbage_is_an_error() {
         assert!(load_bytes(b"not a zip").is_err());
diff --git a/crates/format/src/library.rs b/crates/format/src/library.rs
index 06dcc99e..daec05e2 100644
--- a/crates/format/src/library.rs
+++ b/crates/format/src/library.rs
@@ -39,7 +39,7 @@ pub fn is_valid_library_id(id: &str) -> bool {
 }
 
 /// Image hashes become archive member names: only plain hex-like names are looked up.
-fn is_valid_hash(h: &str) -> bool {
+pub(crate) fn is_valid_hash(h: &str) -> bool {
     (1..=128).contains(&h.len()) && h.bytes().all(|b| b.is_ascii_alphanumeric())
 }
 
diff --git a/crates/format/src/rest/mod.rs b/crates/format/src/rest.rs
similarity index 74%
rename from crates/format/src/rest/mod.rs
rename to crates/format/src/rest.rs
index 798b2645..15fbce9d 100644
--- a/crates/format/src/rest/mod.rs
+++ b/crates/format/src/rest.rs
@@ -6,8 +6,8 @@
 //! (`relativeTransform`, else `absoluteBoundingBox` + `rotation`), paints, strokes, effects,
 //! corners, constraints, auto layout, layout grids, export settings, text with styled runs,
 //! vectors from `fillGeometry` / `strokeGeometry`, components, component sets, instances and
-//! component properties are imported. Image fills keep their `imageRef` as the image key and
-//! show a grey placeholder unless an [`ImageResolver`] supplies the bytes (nothing is fetched).
+//! component properties (slots included) are imported. Image fills keep their `imageRef` as the
+//! image key and show a grey placeholder unless an [`ImageResolver`] supplies the bytes (nothing is fetched).
 //! Prototyping comes along: interactions (triggers, actions, transitions, easing), flows,
 //! scrolling and the prototype device. Variables come from the local variables response
 //! (`GET /v1/files/:key/variables/local`), embedded next to the file JSON or passed separately
@@ -16,7 +16,8 @@
 //!
 //! Instances come out with their own layers as the file lists them. Linking those layers to the
 //! main component's (`source`) and deriving overrides is left to the caller (the engine does it
-//! after loading), since that needs the component model.
+//! after loading), since that needs the component model. The private .fig entry point additionally
+//! preserves explicit GUID/expansion provenance before the engine derives overrides.
 
 #[cfg(test)]
 mod blur_tests;
@@ -24,13 +25,20 @@ mod blur_tests;
 mod conditional_tests;
 #[cfg(test)]
 mod effects_tests;
+mod fig_sources;
 #[cfg(test)]
 mod gamepad_tests;
+#[cfg(test)]
+mod grid_track_tests;
+#[cfg(test)]
+mod import_regression_tests;
 pub(crate) mod props;
 pub(crate) mod proto;
 #[cfg(test)]
 mod proto_variable_tests;
 #[cfg(test)]
+pub(crate) mod slot_tests;
+#[cfg(test)]
 mod tests;
 mod text;
 mod variables;
@@ -49,16 +57,22 @@ use crate::FormatError;
 use props::{MAX_COORD, MAX_SIZE, clip_str, flag, list, num, text};
 pub use variables::export as export_variables;
 
-/// Most layers imported from one file.
+/// Most layers imported from one file. The `.fig` import sets its own, from the file's size.
 pub const MAX_NODES: usize = 200_000;
 /// Deepest layer nesting followed.
 const MAX_DEPTH: usize = 256;
+/// Private .fig provenance, consumed only by the `.fig` import ([`import_with_networks`]).
+pub(crate) const FIG_SOURCE_FIELD: &str = "_figSource";
+/// Hidden .fig library context; accepted only by the `.fig` import ([`import_with_networks`]).
+pub(crate) const FIG_LIBRARY_CONTEXTS_FIELD: &str = "_figLibraryContexts";
+/// Ids of mains in a `.fig` file that its layer cap kept out; read only by the `.fig` import.
+pub(crate) const FIG_CAPPED_MAINS_FIELD: &str = "_figCappedMains";
 /// Longest SVG path string read from one geometry entry.
 const MAX_PATH_BYTES: usize = 4 << 20;
 /// Most path elements in one vector.
 const MAX_PATH_ELEMENTS: usize = 200_000;
 /// Most distinct warnings reported.
-const MAX_WARNINGS: usize = 200;
+pub(crate) const MAX_WARNINGS: usize = 200;
 /// Most shared style definitions read.
 const MAX_STYLES: usize = 10_000;
 /// Image key used for image fills without an `imageRef`.
@@ -96,12 +110,25 @@ pub fn is_variables_json(v: &Value) -> bool {
 }
 
 /// The collections and variables of a local variables response (or its `meta`), checked like a
-/// file's, with the warnings about what was skipped; None when `v` isn't one.
+/// file's, with the warnings about what was skipped (and when it holds no variables at all, or
+/// fewer than its collections list); None when `v` isn't one.
 pub fn read_variables(v: &Value) -> Option<(figcraft_doc::Variables, Vec<String>)> {
-    let src = variables::source(v)?;
+    variables::source(v)?;
     let mut cx = Ctx::new(Document::new("Variables"), &no_images);
-    cx.variables(src);
-    Some((std::mem::take(&mut cx.doc.variables), cx.warnings.finish()))
+    cx.variables(v);
+    let vars = std::mem::take(&mut cx.doc.variables);
+    let mut warnings = cx.warnings.finish();
+    if vars.variables.is_empty() {
+        warnings.push("no variables found: expected `meta.variables` (an object of variables by id, next to `meta.variableCollections`)".into());
+    } else {
+        let listed = variables::listed_ids(v);
+        let read: BTreeSet<&str> = vars.variables.iter().map(|x| x.id.as_str()).collect();
+        let missing = listed.difference(&read).count();
+        if missing > 0 {
+            warnings.push(format!("{missing} of the {} variables the collections list in `variableIds` weren't imported", listed.len()));
+        }
+    }
+    Some((vars, warnings))
 }
 
 /// Import `bytes` when they are REST API file JSON; `None` when they are something else (the
@@ -138,25 +165,77 @@ pub fn import(v: &Value, images: ImageResolver) -> Result<(Document, Vec<String>
 /// in the file JSON (a `meta` with `variableCollections`, or `variableCollections` and
 /// `variables` at the top level) are read too; the first definition of an id wins.
 pub fn import_with(v: &Value, variables: Option<&Value>, images: ImageResolver) -> Result<(Document, Vec<String>), FormatError> {
+    import_parts(v, variables, images, Vec::new(), MAX_NODES, false)
+}
+
+/// Internal .fig JSON path: GUID provenance is not part of the public REST import contract.
+/// The `.fig` import itself goes through [`import_with_networks`].
+#[cfg(test)]
+pub(crate) fn import_fig(v: &Value, images: ImageResolver) -> Result<(Document, Vec<String>), FormatError> {
+    import_with_networks(v, images, Vec::new(), MAX_NODES)
+}
+
+/// [`import_fig`] for the `.fig` import's JSON, whose vectors name their networks by
+/// `vectorNetworkRef`, an index in `networks` (built once each, and far smaller than as JSON).
+/// `max_nodes`: the layer cap, set by the `.fig` import in place of [`MAX_NODES`].
+pub(crate) fn import_with_networks(
+    v: &Value,
+    images: ImageResolver,
+    networks: Vec<Option<VectorNetwork>>,
+    max_nodes: usize,
+) -> Result<(Document, Vec<String>), FormatError> {
+    import_parts(v, None, images, networks, max_nodes, true)
+}
+
+/// [`import_with_networks`] for imports other than `.fig` (no `.fig` source identities): the
+/// `.sketch` import.
+pub(crate) fn import_with_networks_plain(
+    v: &Value,
+    images: ImageResolver,
+    networks: Vec<Option<VectorNetwork>>,
+    max_nodes: usize,
+) -> Result<(Document, Vec<String>), FormatError> {
+    import_parts(v, None, images, networks, max_nodes, false)
+}
+
+fn import_parts(
+    v: &Value,
+    variables: Option<&Value>,
+    images: ImageResolver,
+    networks: Vec<Option<VectorNetwork>>,
+    max_nodes: usize,
+    fig_sources: bool,
+) -> Result<(Document, Vec<String>), FormatError> {
     let entries: Vec<&Value> = if is_document(v) { vec![v] } else { nodes_entries(v).collect() };
     if entries.is_empty() {
         return Err(FormatError::Corrupt("not a REST API file JSON (no `document`)".into()));
     }
     let name = text(v, "name").filter(|n| !n.trim().is_empty()).map_or("Imported file", clip_str);
     let mut cx = Ctx::new(Document::new(name), images);
+    cx.fig_sources = fig_sources.then(|| fig_sources::Sources::new(max_nodes));
     let blank = cx.doc.first_page();
     let mut loose: Option<NodeId> = None;
     for e in &entries {
         cx.collect_meta(e);
     }
     // Variables first: layers link to them as they are built.
-    for src in [variables::source(v), variables.and_then(variables::source)].into_iter().flatten() {
+    for src in [Some(v), variables].into_iter().flatten() {
         cx.variables(src);
     }
     if variables.is_some_and(|x| variables::source(x).is_none()) {
         cx.warn("the variables JSON has no `variableCollections` (expected the local variables response) and was ignored");
     }
     cx.style_definitions(v);
+    cx.networks = networks;
+    cx.max_nodes = max_nodes;
+    // The `.fig` mapper already kept the layers, library copies included, within the cap; each
+    // library copy's wrapper frame is the one layer here it doesn't count (#981).
+    let contexts = if fig_sources { v.get(FIG_LIBRARY_CONTEXTS_FIELD).and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default() } else { &[] };
+    if fig_sources {
+        cx.capped_mains =
+            v.get(FIG_CAPPED_MAINS_FIELD).and_then(Value::as_array).into_iter().flatten().filter_map(Value::as_str).map(str::to_owned).collect();
+        cx.max_nodes = max_nodes.saturating_add(contexts.len());
+    }
     for e in entries {
         let Some(root) = e.get("document") else { continue };
         match text(root, "type") {
@@ -178,6 +257,10 @@ pub fn import_with(v: &Value, variables: Option<&Value>, images: ImageResolver)
             None => cx.warn("entries without a node type were skipped"),
         }
     }
+    for context in contexts {
+        let store = cx.doc.ensure_library_store();
+        cx.build(context, store, Space::default(), None, 0, false);
+    }
     // Drop the empty page the new document started with once real pages exist.
     if let Some(p) = blank
         && cx.doc.pages.len() > 1
@@ -210,7 +293,7 @@ fn style_binding(slot: &str, key: &str) -> Option<String> {
 /// Put back the shape a layer was before the `.fig` export wrote it as the outline of its stroke
 /// (`outlinedStroke`: `{kind, fills, strokes, stroke}` as the document holds them). Anything that
 /// isn't such a shape is ignored.
-fn restore_stroke(n: &mut Node, original: &Value) {
+fn restore_stroke(n: &mut Node, original: &Value) -> bool {
     #[derive(serde::Deserialize)]
     struct Original {
         kind: NodeKind,
@@ -218,16 +301,16 @@ fn restore_stroke(n: &mut Node, original: &Value) {
         strokes: Vec<figcraft_doc::color::Paint>,
         stroke: figcraft_doc::StrokeProps,
     }
-    let Ok(mut o) = serde_json::from_value::<Original>(original.clone()) else { return };
+    let Ok(mut o) = serde_json::from_value::<Original>(original.clone()) else { return false };
     match &mut o.kind {
         NodeKind::Vector { network } => {
             if network.vertices.len() + network.segments.len() > MAX_PATH_ELEMENTS {
-                return;
+                return false;
             }
             network.sanitize();
         }
         NodeKind::Line | NodeKind::Ellipse { .. } | NodeKind::Polygon { .. } | NodeKind::Star { .. } | NodeKind::Rectangle => {}
-        _ => return,
+        _ => return false,
     }
     let sp = &mut o.stroke;
     sp.weight = sp.weight.clamp(0.0, props::MAX_SIZE);
@@ -237,21 +320,44 @@ fn restore_stroke(n: &mut Node, original: &Value) {
     o.fills.truncate(64);
     o.strokes.truncate(64);
     (n.kind, n.fills, n.strokes, n.stroke) = (o.kind, o.fills, o.strokes, o.stroke);
+    true
+}
+
+/// A stroke-only vector imported as the outline of its stroke: the stroke paints fill the
+/// outline, and the stroke's shared style and colour variables move with them. The hidden fills
+/// it replaces go, with their style and bindings.
+fn outline_stroke(n: &mut Node) {
+    n.fills = std::mem::take(&mut n.strokes);
+    n.styles.fill = n.styles.stroke.take();
+    let bound = std::mem::take(&mut n.bound);
+    for (key, var) in bound {
+        let moved = match key.as_str() {
+            "fill" => continue,
+            k if k.starts_with("fills/") => continue,
+            "stroke" => "fill".to_string(),
+            k => match k.strip_prefix("strokes/") {
+                Some(rest) => format!("fills/{rest}"),
+                None => key,
+            },
+        };
+        n.bound.insert(moved, var);
+    }
 }
 
 fn children(v: &Value) -> &[Value] {
     v.get("children").and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default()
 }
 
-/// Distinct warnings in first-seen order, with repeat counts.
+/// Distinct warnings in first-seen order, with repeat counts. Shared with the `.fig` mapper
+/// (`crate::fig::map`), whose notes repeat per layer in the same way.
 #[derive(Default)]
-struct Warnings {
+pub(crate) struct Warnings {
     list: Vec<(String, usize)>,
     index: BTreeMap<String, usize>,
 }
 
 impl Warnings {
-    fn add(&mut self, msg: String) {
+    pub(crate) fn add(&mut self, msg: String) {
         if let Some(i) = self.index.get(&msg) {
             if let Some(e) = self.list.get_mut(*i) {
                 e.1 += 1;
@@ -262,7 +368,17 @@ impl Warnings {
         }
     }
 
-    fn finish(self) -> Vec<String> {
+    /// The notes met so far, without their counts, for the tests that ask whether one was met
+    /// (the product reads them through [`Self::finish`], with the counts).
+    #[cfg(test)]
+    pub(crate) fn seen(&self) -> impl Iterator<Item = &str> {
+        self.list.iter().map(|(msg, _)| msg.as_str())
+    }
+
+    /// The notes, each with `(×n)` after it where it was met more than once. The import report
+    /// reads that suffix off before it looks the note up in the catalogue, so a counted note is
+    /// still translated (`ui-egui`'s `note_text`).
+    pub(crate) fn finish(self) -> Vec<String> {
         self.list.into_iter().map(|(m, n)| if n > 1 { format!("{m} (×{n})") } else { m }).collect()
     }
 }
@@ -291,11 +407,16 @@ pub(crate) struct Ctx<'a> {
     count: usize,
     /// REST node id → imported node.
     ids: BTreeMap<String, NodeId>,
+    fig_sources: Option<fig_sources::Sources<'a>>,
     component_meta: BTreeMap<&'a str, &'a Value>,
     set_meta: BTreeMap<&'a str, &'a Value>,
     style_meta: BTreeMap<&'a str, &'a Value>,
     /// Instances (imported as frames until their main is resolved) with their JSON.
     instances: Vec<(NodeId, &'a Value)>,
+    /// `SLOT` layers (imported as frames until their slot property is resolved) with their JSON.
+    slots: Vec<(NodeId, &'a Value)>,
+    /// Slot property defaults (the main's slot content id): (component or set, property) → value.
+    slot_defaults: BTreeMap<(NodeId, String), &'a Value>,
     /// Instance-swap property defaults: (component or set, property, REST id of the default).
     swap_defaults: Vec<(NodeId, String, String)>,
     /// Property definitions of component sets, shared by their variants.
@@ -309,6 +430,12 @@ pub(crate) struct Ctx<'a> {
     /// Imported variables by id, and the mode ids of imported collections (default first).
     var_kinds: BTreeMap<String, VariableType>,
     var_modes: BTreeMap<String, Vec<String>>,
+    /// Vector networks built by the `.fig` import, named by layers' `vectorNetworkRef`.
+    networks: Vec<Option<VectorNetwork>>,
+    /// Most layers imported: [`MAX_NODES`], or the `.fig` import's own cap.
+    max_nodes: usize,
+    /// Mains the `.fig` file has but its layer cap kept out ([`FIG_CAPPED_MAINS_FIELD`]).
+    capped_mains: BTreeSet<String>,
 }
 
 impl<'a> Ctx<'a> {
@@ -321,10 +448,13 @@ impl<'a> Ctx<'a> {
             warnings: Warnings::default(),
             count: 0,
             ids: BTreeMap::new(),
+            fig_sources: None,
             component_meta: BTreeMap::new(),
             set_meta: BTreeMap::new(),
             style_meta: BTreeMap::new(),
             instances: Vec::new(),
+            slots: Vec::new(),
+            slot_defaults: BTreeMap::new(),
             swap_defaults: Vec::new(),
             set_defs: BTreeMap::new(),
             flows: Vec::new(),
@@ -332,6 +462,9 @@ impl<'a> Ctx<'a> {
             overlay_meta: BTreeMap::new(),
             var_kinds: BTreeMap::new(),
             var_modes: BTreeMap::new(),
+            networks: Vec::new(),
+            max_nodes: MAX_NODES,
+            capped_mains: BTreeSet::new(),
         }
     }
 
@@ -387,8 +520,9 @@ impl<'a> Ctx<'a> {
             self.warn(format!("layers nested deeper than {MAX_DEPTH} levels were skipped"));
             return;
         }
-        if self.count >= MAX_NODES {
-            self.warn(format!("the file has more than {MAX_NODES} layers; the rest were skipped"));
+        if self.count >= self.max_nodes {
+            let max = self.max_nodes;
+            self.warn(format!("the file has more than {max} layers; the rest were skipped"));
             return;
         }
         let Some(ty) = text(j, "type") else {
@@ -403,6 +537,12 @@ impl<'a> Ctx<'a> {
         let id = self.doc.alloc_id();
         let label = kind.label();
         let mut n = Node::new(id, kind, text(j, "name").map_or(label, clip_str), w, h);
+        // Overrides the .fig names explicitly (the rest are found by comparing with the main).
+        for (flag, group) in [("slotOverride", "slot"), ("sizeOverride", "size")] {
+            if self.fig_sources.is_some() && j.get(FIG_SOURCE_FIELD).and_then(|source| source.get(flag)).and_then(Value::as_bool) == Some(true) {
+                n.overrides.insert(group.into());
+            }
+        }
         n.transform = local(space.world, world);
         self.common(&mut n, j, parent_mode);
         let (container, follows, mode) = (n.kind.is_container(), n.kind.bounds_follow_children(), n.layout.as_ref().map(|l| l.mode));
@@ -411,10 +551,15 @@ impl<'a> Ctx<'a> {
         }
         self.count += 1;
         if let Some(rid) = text(j, "id") {
-            self.ids.entry(rid.to_string()).or_insert(id);
+            let primary = *self.ids.entry(rid.to_string()).or_insert(id) == id;
+            if let Some(sources) = &mut self.fig_sources {
+                sources.record(id, j, primary);
+            }
         }
-        if ty == "INSTANCE" {
-            self.instances.push((id, j));
+        match ty {
+            "INSTANCE" => self.instances.push((id, j)),
+            "SLOT" => self.slots.push((id, j)),
+            _ => {}
         }
         let kids = children(j);
         if kids.is_empty() {
@@ -437,8 +582,8 @@ impl<'a> Ctx<'a> {
         let point_count = || num(j, "pointCount").filter(|c| *c >= 3.0).map(|c| c.min(1000.0) as u32);
         let has_geometry = !list(j, "fillGeometry").is_empty() || !list(j, "strokeGeometry").is_empty();
         Some(match ty {
-            // Instances start as frames; `finish` links them to their main.
-            "FRAME" | "INSTANCE" => NodeKind::Frame,
+            // Instances and slots start as frames; `finish` links them to their main and property.
+            "FRAME" | "INSTANCE" | "SLOT" => NodeKind::Frame,
             "GROUP" => NodeKind::Group,
             "SECTION" => NodeKind::Section { contents_hidden: flag(j, "sectionContentsHidden").unwrap_or(false) },
             "RECTANGLE" => NodeKind::Rectangle,
@@ -548,19 +693,18 @@ impl<'a> Ctx<'a> {
             if let Some(c) = flag(j, "clipsContent") {
                 n.clip = c;
             }
-            n.layout = props::auto_layout(j);
+            n.layout = props::auto_layout(j, self.fig_sources.is_some());
             n.grids = props::layout_grids(j);
         }
         n.child_layout = props::child_layout(j, n.layout.as_ref().map(|l| l.mode), parent_mode);
         n.exports = props::export_settings(j);
         for (field, prop) in j.get("componentPropertyReferences").and_then(Value::as_object).into_iter().flatten() {
-            if let (Some(p), true) = (prop.as_str(), matches!(field.as_str(), "visible" | "characters" | "mainComponent")) {
+            let supported = matches!(field.as_str(), "visible" | "characters" | "mainComponent") || (field == "slot" && self.fig_sources.is_some());
+            if let (Some(p), true) = (prop.as_str(), supported) {
                 n.prop_refs.insert(field.clone(), p.to_string());
             }
         }
-        if matches!(n.kind, NodeKind::Vector { .. }) {
-            self.vector(n, j);
-        }
+        let outlined = matches!(n.kind, NodeKind::Vector { .. }) && self.vector(n, j);
         if matches!(n.kind, NodeKind::Component { .. } | NodeKind::ComponentSet { .. }) {
             let defs = self.prop_defs(n.id, j);
             match &mut n.kind {
@@ -581,20 +725,28 @@ impl<'a> Ctx<'a> {
             self.overlay_meta.entry(rid).or_insert(j);
         }
         self.bindings(n, j);
-        if let Some(original) = j.get("outlinedStroke") {
-            restore_stroke(n, original);
+        let restored = j.get("outlinedStroke").is_some_and(|original| restore_stroke(n, original));
+        // Styles and bindings were read against the stroke: they follow its paints to the fill.
+        if outlined && !restored {
+            outline_stroke(n);
         }
     }
 
-    /// A vector's network: the editable one when the JSON carries it (`vectorNetwork`, our
-    /// extension, written by the `.fig` import), else from its geometry. A stroke-only vector
-    /// uses the stroke outline, painted with the stroke paints (exact look, editable as a shape).
-    fn vector(&mut self, n: &mut Node, j: &Value) {
-        if let Some(net) = j.get("vectorNetwork") {
-            match network(net) {
+    /// A vector's network: the editable one when the JSON carries it (`vectorNetwork`, or
+    /// `vectorNetworkRef` naming one built by the `.fig` import: our extensions), else from its
+    /// geometry. A stroke-only vector uses the stroke outline, painted with the stroke paints
+    /// (exact look, editable as a shape): returns whether it does, and the caller moves the paints
+    /// with [`outline_stroke`] once the styles and variables of the stroke are read.
+    fn vector(&mut self, n: &mut Node, j: &Value) -> bool {
+        let net = match j.get("vectorNetworkRef") {
+            Some(r) => Some(r.as_u64().and_then(|i| self.networks.get(usize::try_from(i).ok()?).cloned().flatten())),
+            None => j.get("vectorNetwork").map(network),
+        };
+        if let Some(net) = net {
+            match net {
                 Some(network) => {
                     n.kind = NodeKind::Vector { network };
-                    return;
+                    return false;
                 }
                 None => self.warn("invalid or oversized vector networks import as outlines"),
             }
@@ -609,17 +761,15 @@ impl<'a> Ctx<'a> {
             (None, Some(s)) => (s, true),
             (None, None) => {
                 self.warn("vectors without geometry are empty (export the file JSON with geometry=paths)");
-                return;
+                return false;
             }
         };
         let mut network = VectorNetwork::from_path(&path);
         for r in &mut network.regions {
             r.winding = winding;
         }
-        if outline {
-            n.fills = std::mem::take(&mut n.strokes);
-        }
         n.kind = NodeKind::Vector { network };
+        outline
     }
 
     /// The paths of a `fillGeometry` / `strokeGeometry` list (node-local SVG path data).
@@ -644,7 +794,7 @@ impl<'a> Ctx<'a> {
     }
 
     /// Component property definitions (variant ones are implied by the variant names).
-    fn prop_defs(&mut self, owner: NodeId, j: &Value) -> BTreeMap<String, PropDef> {
+    fn prop_defs(&mut self, owner: NodeId, j: &'a Value) -> BTreeMap<String, PropDef> {
         let mut out = BTreeMap::new();
         for (name, d) in j.get("componentPropertyDefinitions").and_then(Value::as_object).into_iter().flatten().take(256) {
             let default = d.get("defaultValue");
@@ -658,6 +808,13 @@ impl<'a> Ctx<'a> {
                     continue;
                 }
                 Some("VARIANT") => continue,
+                Some("SLOT") => {
+                    if let Some(d) = default {
+                        self.slot_defaults.insert((owner, name.clone()), d);
+                    }
+                    self.slot_notes(d);
+                    PropDef::Slot { preferred: Vec::new() }
+                }
                 _ => {
                     self.warn("unknown component property types were skipped");
                     continue;
@@ -668,6 +825,20 @@ impl<'a> Ctx<'a> {
         out
     }
 
+    /// Notes on what a slot property sets that the editor doesn't keep: preferred components (keys
+    /// of library components, not layers of the file) and limits on its content.
+    fn slot_notes(&mut self, d: &Value) {
+        if !list(d, "preferredValues").is_empty() {
+            self.warn("preferred slot component keys cannot be resolved to file nodes and were skipped");
+        }
+        // Insertion and empty-slot display only change editing aids, not what the file shows.
+        let s = d.get("slotSettings");
+        let limit = |k: &str| s.and_then(|s| num(s, k)).is_some_and(|n| n != 0.0);
+        if limit("minChildren") || limit("maxChildren") || s.and_then(|s| flag(s, "allowPreferredValuesOnly")) == Some(true) {
+            self.warn("non-default slot settings are not represented and were skipped");
+        }
+    }
+
     /// Shared styles with their values (`styleDefinitions`, written by the `.fig` import: a list of
     /// `{id, name, description, styleType, node}`, the node being a layer that shows the style), in
     /// the file's order. Layers then link to them; styles that no layer uses come across too.
@@ -822,6 +993,12 @@ impl<'a> Ctx<'a> {
             }
         }
         self.resolve_instances();
+        if let Some(sources) = self.fig_sources.take() {
+            let missing = sources.apply(&mut self.doc, &self.ids);
+            if missing > 0 {
+                self.warn(format!("{missing} .fig instance source link(s) could not be resolved and were left unlinked"));
+            }
+        }
         self.rename_props();
         for (id, j) in std::mem::take(&mut self.protos) {
             let list = self.interactions(j);
@@ -854,7 +1031,11 @@ impl<'a> Ctx<'a> {
     fn resolve_swap_defaults(&mut self) {
         for (owner, name, rest_id) in std::mem::take(&mut self.swap_defaults) {
             let Some(c) = self.component(&rest_id) else {
-                self.warn("instance swap properties whose default component isn't in the file were skipped");
+                if self.capped_mains.contains(&rest_id) {
+                    self.warn("instance swap properties whose default component was past the layer limit were skipped");
+                } else {
+                    self.warn("instance swap properties whose default component isn't in the file were skipped");
+                }
                 continue;
             };
             let def = PropDef::InstanceSwap { default: c, preferred: Vec::new() };
@@ -870,9 +1051,14 @@ impl<'a> Ctx<'a> {
     /// outside components, and instances that would nest a component inside itself (directly or
     /// through other components), stay frames.
     fn resolve_instances(&mut self) {
+        let frames: BTreeSet<NodeId> = self.instances.iter().map(|(i, _)| *i).collect();
         let mut links: Vec<(NodeId, NodeId, &'a Value)> = Vec::new();
         for (inst, j) in std::mem::take(&mut self.instances) {
-            match text(j, "componentId").and_then(|r| self.component(r)) {
+            let main = text(j, "componentId");
+            match main.and_then(|r| self.component(r)) {
+                None if main.is_some_and(|r| self.capped_mains.contains(r)) => {
+                    self.warn("instances whose component was past the layer limit were imported as frames");
+                }
                 None => self.warn("instances of components that aren't in the file were imported as frames"),
                 Some(c) if self.doc.is_ancestor(c, inst) => self.warn("instances inside their own main component were imported as frames"),
                 Some(c) => links.push((inst, c, j)),
@@ -899,6 +1085,7 @@ impl<'a> Ctx<'a> {
                 linked.push((inst, j));
             }
         }
+        self.resolve_slots(&frames, &linked);
         // Overridden fields the file lists, on the instance and its layers.
         for (inst, j) in linked {
             for o in list(j, "overrides") {
@@ -914,6 +1101,70 @@ impl<'a> Ctx<'a> {
         }
     }
 
+    /// `SLOT` layers. In a main component a slot is bound to its slot property: the one the layer
+    /// references, else the one named like it, else the main's only slot property left. In an
+    /// instance it follows its main's slot, and holds the instance's own content (kept across syncs)
+    /// unless the instance's value of the property is the main's default content (without the
+    /// values to compare, a slot holding layers keeps them as its own). A slot without a property
+    /// stays a frame. `frames`: every instance
+    /// layer of the file, `linked`: those that became instances.
+    fn resolve_slots(&mut self, frames: &BTreeSet<NodeId>, linked: &[(NodeId, &'a Value)]) {
+        let linked: BTreeMap<NodeId, &Value> = linked.iter().copied().collect();
+        let mut bound: BTreeSet<(NodeId, String)> = BTreeSet::new();
+        for (id, j) in std::mem::take(&mut self.slots) {
+            // The nearest main component or instance above the slot owns it; in an instance whose
+            // main isn't in the file (a frame), the slot stays a frame too.
+            let owner = self.doc.ancestors(id).into_iter().find_map(|a| match self.doc.node(a).map(|n| &n.kind) {
+                Some(NodeKind::Instance { component, .. }) => Some(linked.get(&a).map(|j| (*component, Some(*j)))),
+                Some(NodeKind::Component { .. }) => Some(Some((a, None))),
+                _ => frames.contains(&a).then_some(None),
+            });
+            let Some(owner) = owner else {
+                self.warn("slot layers without a matching slot property were imported as frames");
+                continue;
+            };
+            let Some((main, inst)) = owner else { continue };
+            let Some(NodeKind::Component { props, .. }) = self.doc.node(main).map(|n| &n.kind) else { continue };
+            let defs: Vec<&String> = props.iter().filter(|(_, d)| matches!(d, PropDef::Slot { .. })).map(|(k, _)| k).collect();
+            let layer = text(j, "name").unwrap_or_default();
+            let refs: Vec<&str> =
+                j.get("componentPropertyReferences").and_then(Value::as_object).into_iter().flatten().filter_map(|(_, v)| v.as_str()).collect();
+            // An instance's slot is matched against all of its main's slot properties.
+            let free: Vec<&&String> = defs.iter().filter(|d| inst.is_some() || !bound.contains(&(main, (**d).clone()))).collect();
+            let name = defs
+                .iter()
+                .find(|d| refs.contains(&d.as_str()))
+                .or_else(|| defs.iter().find(|d| short_prop_name(d) == layer))
+                .or_else(|| if free.len() == 1 { free.first().copied() } else { None })
+                .map(|d| (*d).clone());
+            let Some(n) = self.doc.node(id) else { continue };
+            let has_content = !n.children.is_empty();
+            let Some(inst) = inst else {
+                match name.filter(|p| bound.insert((main, p.clone()))) {
+                    Some(p) => {
+                        if let Some(n) = self.doc.node_mut(id) {
+                            n.prop_refs.insert("slot".into(), p);
+                        }
+                    }
+                    None => self.warn("slot layers without a matching slot property were imported as frames"),
+                }
+                continue;
+            };
+            let set = self.doc.node(main).and_then(|n| n.parent);
+            let default =
+                name.as_ref().and_then(|p| [Some(main), set].into_iter().flatten().find_map(|o| self.slot_defaults.get(&(o, p.clone())).copied()));
+            let value = name.as_ref().and_then(|p| inst.get("componentProperties")?.get(p)?.get("value"));
+            let own = name.is_some()
+                && match (value, default) {
+                    (Some(v), Some(d)) => v != d,
+                    _ => has_content,
+                };
+            if own && let Some(n) = self.doc.node_mut(id) {
+                n.overrides.insert("slot".into());
+            }
+        }
+    }
+
     /// An instance's property values (variant values are implied by the main it shows).
     fn instance_props(&self, j: &Value) -> BTreeMap<String, Value> {
         let mut out = BTreeMap::new();
@@ -1055,6 +1306,16 @@ fn override_group(field: &str) -> Option<&'static str> {
         | "textDecorationSkipInk"
         | "textDecorationColor" => "textStyle",
         "width" | "height" | "size" => "size",
+        "layoutSizingHorizontal"
+        | "layoutSizingVertical"
+        | "layoutGrow"
+        | "layoutAlign"
+        | "primaryAxisSizingMode"
+        | "counterAxisSizingMode"
+        | "minWidth"
+        | "maxWidth"
+        | "minHeight"
+        | "maxHeight" => "resizing",
         "paddingLeft" | "paddingRight" | "paddingTop" | "paddingBottom" | "horizontalPadding" | "verticalPadding" => "padding",
         "itemSpacing" | "counterAxisSpacing" => "gap",
         "primaryAxisAlignItems" | "counterAxisAlignItems" => "alignment",
@@ -1110,7 +1371,7 @@ fn local(parent: Affine, world: Affine) -> Affine {
 
 /// Finite path data within the coordinate cap.
 /// A vector network in our own JSON shape, when it's within bounds and refers only to what it has.
-fn network(v: &Value) -> Option<VectorNetwork> {
+pub(crate) fn network(v: &Value) -> Option<VectorNetwork> {
     use serde::Deserialize;
     let mut net = VectorNetwork::deserialize(v).ok()?;
     let entries: usize = net.regions.iter().flat_map(|r| &r.loops).map(Vec::len).sum();
diff --git a/crates/format/src/rest/fig_sources.rs b/crates/format/src/rest/fig_sources.rs
new file mode 100644
index 00000000..2793f932
--- /dev/null
+++ b/crates/format/src/rest/fig_sources.rs
@@ -0,0 +1,321 @@
+//! Explicit .fig GUID provenance projected through instance expansion contexts.
+//! All strings borrow the bounded JSON; no names, node-kind similarity or child order match links.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use figcraft_doc::{Document, NodeId, NodeKind};
+use serde_json::Value;
+
+use super::{FIG_SOURCE_FIELD, MAX_DEPTH};
+
+// A GUID has at most two 20-digit u64 parts and a colon; instance paths contain at most
+// MAX_DEPTH + 2 GUIDs. Check before constructing any projected path string.
+const MAX_SOURCE_ID_BYTES: usize = 44 * (MAX_DEPTH + 2);
+
+#[derive(Clone, Copy)]
+struct Origin<'a> {
+    rest: &'a str,
+    guid: &'a str,
+    expanded: bool,
+    slot_content: bool,
+    wire_frame: bool,
+    wire_instance: bool,
+    component: Option<&'a str>,
+}
+
+pub(super) struct Sources<'a> {
+    /// Most layers recorded.
+    max_nodes: usize,
+    nodes: BTreeMap<NodeId, Origin<'a>>,
+    duplicate_ids: BTreeSet<&'a str>,
+    rejected: usize,
+}
+
+fn guid(s: &str) -> bool {
+    let Some((session, local)) = s.split_once(':') else { return false };
+    s.len() <= 41
+        && [session, local].into_iter().all(|part| !part.is_empty() && part.bytes().all(|c| c.is_ascii_digit()) && part.parse::<u64>().is_ok())
+}
+
+fn expanded_id(instance: &str, origin: &str) -> Option<String> {
+    let bytes = instance.len().checked_add(origin.len())?.checked_add(2)?;
+    if bytes > MAX_SOURCE_ID_BYTES {
+        return None;
+    }
+    Some(if instance.starts_with('I') { format!("{instance};{origin}") } else { format!("I{instance};{origin}") })
+}
+
+impl<'a> Sources<'a> {
+    pub(super) fn new(max_nodes: usize) -> Self {
+        Self { max_nodes, nodes: BTreeMap::new(), duplicate_ids: BTreeSet::new(), rejected: 0 }
+    }
+
+    pub(super) fn record(&mut self, id: NodeId, node: &'a Value, primary: bool) {
+        let Some(rest) = node.get("id").and_then(Value::as_str) else { return };
+        if !primary {
+            self.duplicate_ids.insert(rest);
+            return;
+        }
+        let Some(meta) = node.get(FIG_SOURCE_FIELD) else { return };
+        let parsed = meta.get("origin").and_then(Value::as_str).zip(meta.get("expanded").and_then(Value::as_bool));
+        let Some((origin, expanded)) = parsed else {
+            self.rejected += 1;
+            return;
+        };
+        if self.nodes.len() >= self.max_nodes
+            || rest.len() > MAX_SOURCE_ID_BYTES
+            || !guid(origin)
+            || (!expanded && rest != origin)
+            || (expanded && !rest.starts_with('I'))
+        {
+            self.rejected += 1;
+            return;
+        }
+        let wire_frame = meta.get("wireFrame").and_then(Value::as_bool).unwrap_or(false);
+        let wire_instance = !wire_frame
+            && meta.get("wireInstance").and_then(Value::as_bool) == Some(true)
+            && node.get("type").and_then(Value::as_str) == Some("INSTANCE");
+        let component = wire_instance.then(|| node.get("componentId").and_then(Value::as_str).filter(|id| guid(id))).flatten();
+        let slot_content = meta.get("slotContent").and_then(Value::as_bool).unwrap_or(false);
+        self.nodes.insert(id, Origin { rest, guid: origin, expanded, slot_content, wire_frame, wire_instance, component });
+    }
+
+    fn origin(&self, id: NodeId) -> Option<Origin<'a>> {
+        let meta = *self.nodes.get(&id)?;
+        (!self.duplicate_ids.contains(meta.rest)).then_some(meta)
+    }
+
+    fn raw_in_main(&self, origin: &str, main: NodeId, doc: &Document, ids: &BTreeMap<String, NodeId>) -> Option<NodeId> {
+        let target = *ids.get(origin)?;
+        let meta = self.origin(target)?;
+        (!meta.expanded && meta.rest == origin && target != main && doc.is_ancestor(main, target)).then_some(target)
+    }
+
+    fn root_source(&self, id: NodeId, doc: &Document) -> Option<NodeId> {
+        let NodeKind::Instance { component, .. } = &doc.node(id)?.kind else { return None };
+        let main_meta = self.origin(*component)?;
+        (!main_meta.expanded
+            && matches!(doc.node(*component)?.kind, NodeKind::Component { .. })
+            && *component != id
+            && !doc.is_ancestor(id, *component)
+            && !doc.is_ancestor(*component, id))
+        .then_some(*component)
+    }
+
+    fn missing_frame(&self, id: NodeId, doc: &Document, ids: &BTreeMap<String, NodeId>) -> bool {
+        self.origin(id).is_some_and(|meta| {
+            meta.wire_instance
+                && matches!(doc.node(id).map(|n| &n.kind), Some(NodeKind::Frame))
+                // An existing target of the wrong kind or a cycle-blocked main is not missing.
+                && meta.component.is_some_and(|main| !ids.contains_key(main))
+        })
+    }
+
+    fn owner(&self, id: NodeId, doc: &Document, ids: &BTreeMap<String, NodeId>) -> Option<NodeId> {
+        let mut current = doc.node(id)?.parent;
+        let mut seen = BTreeSet::from([id]);
+        for _ in 0..512 {
+            let parent = current?;
+            if !seen.insert(parent) {
+                return None;
+            }
+            let node = doc.node(parent)?;
+            if matches!(node.kind, NodeKind::Instance { .. }) || self.missing_frame(parent, doc, ids) {
+                return Some(parent);
+            }
+            current = node.parent;
+        }
+        None
+    }
+
+    fn namespace(&self, id: NodeId, owner: NodeId, doc: &Document) -> bool {
+        let Some(owner_meta) = self.origin(owner) else { return false };
+        let mut current = id;
+        let mut seen = BTreeSet::new();
+        for _ in 0..512 {
+            if current == owner {
+                return true;
+            }
+            if !seen.insert(current) {
+                return false;
+            }
+            let Some(meta) = self.origin(current) else { return false };
+            if !meta.expanded || expanded_id(owner_meta.rest, meta.guid).as_deref() != Some(meta.rest) {
+                return false;
+            }
+            let Some(parent) = doc.node(current).and_then(|n| n.parent) else { return false };
+            current = parent;
+        }
+        false
+    }
+
+    // A missing-main instance is materialized as a frame. Outside real instances its children
+    // are owned layers; known instances there become ordinary roots with their own actual main.
+    fn owned_layer(&self, id: NodeId, doc: &Document, ids: &BTreeMap<String, NodeId>) -> bool {
+        if doc.ancestors(id).into_iter().any(|p| doc.node(p).is_some_and(|n| matches!(n.kind, NodeKind::Instance { .. }))) {
+            return false;
+        }
+        let mut current = id;
+        for _ in 0..=MAX_DEPTH {
+            let Some(owner) = self.owner(current, doc, ids) else { return false };
+            if !self.missing_frame(owner, doc, ids) || !self.namespace(current, owner, doc) {
+                return false;
+            }
+            let Some(meta) = self.origin(owner) else { return false };
+            if !meta.expanded {
+                return true;
+            }
+            current = owner;
+        }
+        false
+    }
+
+    fn frame_target(&self, id: NodeId, owner: NodeId, source_owner: NodeId, doc: &Document, ids: &BTreeMap<String, NodeId>) -> Option<NodeId> {
+        let meta = self.origin(id)?;
+        let owner_meta = self.origin(owner)?;
+        let source_meta = self.origin(source_owner)?;
+        if !self.missing_frame(source_owner, doc, ids) || owner_meta.component != source_meta.component {
+            return None;
+        }
+        let target = *ids.get(expanded_id(source_meta.rest, meta.guid)?.as_str())?;
+        let target_meta = self.origin(target)?;
+        if !target_meta.expanded
+            || target_meta.guid != meta.guid
+            || self.owner(target, doc, ids) != Some(source_owner)
+            || !self.namespace(target, source_owner, doc)
+        {
+            return None;
+        }
+        let parent = doc.node(id)?.parent?;
+        let target_parent = doc.node(target)?.parent?;
+        if parent == owner {
+            (target_parent == source_owner).then_some(target)
+        } else {
+            (target_parent != source_owner && self.origin(parent)?.guid == self.origin(target_parent)?.guid).then_some(target)
+        }
+    }
+
+    fn source(
+        &self,
+        id: NodeId,
+        doc: &Document,
+        ids: &BTreeMap<String, NodeId>,
+        memo: &mut BTreeMap<NodeId, Option<NodeId>>,
+        active: &mut BTreeSet<NodeId>,
+        depth: usize,
+    ) -> Option<NodeId> {
+        if let Some(source) = memo.get(&id) {
+            return *source;
+        }
+        if depth > MAX_DEPTH || !active.insert(id) {
+            return None;
+        }
+        let found = (|| {
+            let meta = self.origin(id)?;
+            let _ = doc.node(id)?;
+            if meta.slot_content {
+                return if matches!(doc.node(id)?.kind, NodeKind::Instance { .. }) { self.root_source(id, doc) } else { None };
+            }
+            if !meta.expanded {
+                return self.root_source(id, doc);
+            }
+            // An actual wire INSTANCE whose main is absent remains a namespace owner even
+            // when the REST importer materializes it as a frame. Ordinary frames never do.
+            let owner = self.owner(id, doc, ids)?;
+            if !self.namespace(id, owner, doc) {
+                return None;
+            }
+            let source_owner = self.source(owner, doc, ids, memo, active, depth + 1);
+            if self.missing_frame(owner, doc, ids) {
+                let target = match source_owner {
+                    Some(source_owner) => self.frame_target(id, owner, source_owner, doc, ids)?,
+                    None if self.owned_layer(id, doc, ids) => return self.root_source(id, doc),
+                    _ => return None,
+                };
+                return (target != id && !doc.is_ancestor(id, target)).then_some(target);
+            }
+            let NodeKind::Instance { component: main, .. } = &doc.node(owner)?.kind else { return None };
+            let source_owner = source_owner?;
+            let target = match &doc.node(source_owner)?.kind {
+                NodeKind::Component { .. } if source_owner == *main => self.raw_in_main(meta.guid, *main, doc, ids)?,
+                NodeKind::Instance { component: source_main, .. } if source_main != main => {
+                    // A resolved main switch is evidence for resetting to that CURRENT main.
+                    self.raw_in_main(meta.guid, *main, doc, ids)?
+                }
+                NodeKind::Instance { component: source_main, .. } if source_main == main => {
+                    let source_meta = self.origin(source_owner)?;
+                    let target = *ids.get(expanded_id(source_meta.rest, meta.guid)?.as_str())?;
+                    let target_meta = self.origin(target)?;
+                    let target_owner = self.owner(target, doc, ids);
+                    if !target_meta.expanded || target_meta.guid != meta.guid || target_owner != Some(source_owner) {
+                        return None;
+                    }
+                    target
+                }
+                NodeKind::Frame if self.origin(source_owner)?.wire_frame => {
+                    // An actual wire FRAME becoming INSTANCE has no previous main. Its resolved
+                    // current main is the only proven namespace for its newly expanded children.
+                    self.raw_in_main(meta.guid, *main, doc, ids)?
+                }
+                _ => return None,
+            };
+            (target != id && !doc.is_ancestor(id, target)).then_some(target)
+        })();
+        active.remove(&id);
+        memo.insert(id, found);
+        found
+    }
+
+    pub(super) fn apply(self, doc: &mut Document, ids: &BTreeMap<String, NodeId>) -> usize {
+        let mut links = BTreeMap::new();
+        let mut active = BTreeSet::new();
+        for &id in self.nodes.keys() {
+            let _ = self.source(id, doc, ids, &mut links, &mut active, 0);
+        }
+        let mut missing = self.rejected;
+        for (&id, meta) in &self.nodes {
+            let needs_source = (!meta.slot_content && meta.expanded && !self.owned_layer(id, doc, ids))
+                || doc.node(id).is_some_and(|n| matches!(n.kind, NodeKind::Instance { .. }));
+            if !needs_source {
+                continue;
+            }
+            let target = links.get(&id).copied().flatten().filter(|_| acyclic(id, &links));
+            if let Some(target) = target {
+                if let Some(node) = doc.node_mut(id) {
+                    node.source = Some(target);
+                }
+            } else {
+                missing += 1;
+            }
+        }
+        missing
+    }
+}
+
+fn acyclic(id: NodeId, links: &BTreeMap<NodeId, Option<NodeId>>) -> bool {
+    let mut current = id;
+    for _ in 0..=MAX_DEPTH {
+        let Some(next) = links.get(&current).copied().flatten() else { return true };
+        if next == id {
+            return false;
+        }
+        current = next;
+    }
+    false
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn self_cycles_and_overlong_source_chains_are_rejected() {
+        let self_link = BTreeMap::from([(NodeId(1), Some(NodeId(1)))]);
+        assert!(!acyclic(NodeId(1), &self_link));
+        let cycle = BTreeMap::from([(NodeId(1), Some(NodeId(2))), (NodeId(2), Some(NodeId(1)))]);
+        assert!(!acyclic(NodeId(1), &cycle));
+        let long = (1..=MAX_DEPTH as u64 + 2).map(|i| (NodeId(i), Some(NodeId(i + 1)))).collect();
+        assert!(!acyclic(NodeId(1), &long));
+        assert!(expanded_id(&"x".repeat(MAX_SOURCE_ID_BYTES), "1:2").is_none());
+    }
+}
diff --git a/crates/format/src/rest/grid_track_tests.rs b/crates/format/src/rest/grid_track_tests.rs
new file mode 100644
index 00000000..a11780ca
--- /dev/null
+++ b/crates/format/src/rest/grid_track_tests.rs
@@ -0,0 +1,42 @@
+//! REST import of grid track sizes (`gridColumnsSizing`, `gridRowsSizing`: CSS
+//! `grid-template-columns`/`-rows` strings). Fixtures are synthetic, written by hand.
+
+use super::*;
+use figcraft_doc::GridTrack;
+use serde_json::json;
+
+fn tracks(columns: Value, rows: Value) -> (Vec<GridTrack>, Vec<GridTrack>) {
+    let file = json!({"name": "Fixture", "document": {"id": "0:0", "name": "Document", "type": "DOCUMENT", "children": [
+        {"id": "0:1", "name": "Page", "type": "CANVAS", "children": [
+            {"id": "1", "name": "Grid", "type": "FRAME", "relativeTransform": [[1, 0, 0], [0, 1, 0]], "size": {"x": 400, "y": 200},
+             "layoutMode": "GRID", "gridColumnCount": 7, "gridRowCount": 2, "gridColumnsSizing": columns, "gridRowsSizing": rows}
+        ]}
+    ]}});
+    let (doc, _) = import(&file, &no_images).unwrap();
+    let layout = doc.nodes().find(|n| n.name == "Grid").unwrap().layout.clone().unwrap();
+    (layout.column_tracks, layout.row_tracks)
+}
+
+#[test]
+fn css_track_strings_set_the_track_sizes() {
+    let (cols, rows) = tracks(json!("120px 2fr auto"), json!("repeat(2, minmax(0, 1fr))"));
+    assert_eq!(cols, [GridTrack::fixed(120.0), GridTrack::fill(2.0), GridTrack::hug()]);
+    assert_eq!(rows, [GridTrack::fill(1.0); 2]);
+    let (cols, rows) = tracks(json!(" repeat(2, 40px 1.5fr)  minmax(64px, 64px) "), json!("min-content max-content"));
+    assert_eq!(cols, [GridTrack::fixed(40.0), GridTrack::fill(1.5), GridTrack::fixed(40.0), GridTrack::fill(1.5), GridTrack::fixed(64.0)]);
+    assert_eq!(rows, [GridTrack::hug(); 2]);
+}
+
+#[test]
+fn unsupported_or_junk_tracks_are_equal_tracks() {
+    // Ranges the grid can't express, units it doesn't have and junk keep their place as 1fr.
+    let (cols, rows) = tracks(json!("minmax(10px, 80px) 5em -3px 0fr NaNpx repeat(x, 1px) 10px"), json!(7));
+    assert_eq!(cols, [[GridTrack::default(); 6].as_slice(), &[GridTrack::fixed(10.0)]].concat());
+    assert!(rows.is_empty(), "a non-string is ignored");
+    // Tracks past the grid's own count are left out; huge repeats and deep nesting stay bounded.
+    let (cols, rows) = tracks(json!(format!("repeat(999999999999, 1px) {}", "minmax(".repeat(10_000))), json!("1px 2px 3px"));
+    assert_eq!(cols, [GridTrack::fixed(1.0); 7]);
+    assert_eq!(rows, [GridTrack::fixed(1.0), GridTrack::fixed(2.0)]);
+    let (cols, rows) = tracks(json!("1e9px"), json!("( ) )) repeat(2,)"));
+    assert_eq!((cols, rows.len()), (vec![GridTrack::default()], 2));
+}
diff --git a/crates/format/src/rest/import_regression_tests.rs b/crates/format/src/rest/import_regression_tests.rs
new file mode 100644
index 00000000..2d6364be
--- /dev/null
+++ b/crates/format/src/rest/import_regression_tests.rs
@@ -0,0 +1,59 @@
+//! Stroke-only vectors that import as the outline of their stroke keep the stroke's style and variables.
+
+use super::proto_variable_tests::{BRAND, alias, variables_json};
+use super::*;
+use serde_json::json;
+
+fn at(x: f64, y: f64) -> Value {
+    json!([[1, 0, x], [0, 1, y]])
+}
+
+fn file(children: Value) -> Value {
+    json!({"name": "Fixture", "schemaVersion": 0, "document": {"id": "0:0", "name": "Document", "type": "DOCUMENT", "children": [
+        {"id": "0:1", "name": "Page", "type": "CANVAS", "children": children}
+    ]}})
+}
+
+fn named<'a>(doc: &'a Document, name: &str) -> &'a Node {
+    doc.nodes().find(|n| n.name == name).unwrap_or_else(|| panic!("no node {name}"))
+}
+
+/// A stroke-only icon vector as `geometry=paths` returns it: no fills, one visible stroke.
+fn stroke_only_vector(id: &str, name: &str, stroke: Value) -> Value {
+    json!({"id": id, "name": name, "type": "VECTOR", "relativeTransform": at(0.0, 0.0), "size": {"x": 10, "y": 10},
+           "fills": [], "strokes": [stroke], "strokeWeight": 2,
+           "fillGeometry": [],
+           "strokeGeometry": [{"path": "M 0 0 L 10 0 L 10 2 L 0 2 Z", "windingRule": "NONZERO"}],
+           "styles": {"stroke": "S:stroke"}})
+}
+
+#[test]
+fn stroke_only_vector_shared_stroke_style_keeps_paints() {
+    let stroke = json!({"type": "SOLID", "color": {"r": 1, "g": 0, "b": 0, "a": 1}});
+    let mut v = file(json!([stroke_only_vector("1:1", "Icon", stroke)]));
+    v["styles"] = json!({"S:stroke": {"key": "k", "name": "Brand/Stroke", "styleType": "FILL"}});
+    let (doc, _) = import(&v, &no_images).unwrap();
+    let icon = named(&doc, "Icon");
+    assert!(matches!(icon.kind, NodeKind::Vector { .. }));
+    let style = doc.style("S:stroke").expect("shared stroke style is created");
+    match &style.kind {
+        StyleKind::Paint { paints } => assert_eq!(paints.len(), 1, "shared stroke style must keep the stroke paint, got {paints:?}"),
+        k => panic!("unexpected style kind {k:?}"),
+    }
+}
+
+#[test]
+fn stroke_colour_variable_on_outlined_vector_is_kept() {
+    let stroke = json!({"type": "SOLID", "color": {"r": 1, "g": 0, "b": 0, "a": 1}, "boundVariables": {"color": alias(BRAND)}});
+    let mut node = stroke_only_vector("1:1", "Icon", stroke);
+    node.as_object_mut().unwrap().remove("styles");
+    node["boundVariables"] = json!({"strokes": [alias(BRAND)]});
+    let (doc, warnings) = import_with(&file(json!([node])), Some(&variables_json()), &no_images).unwrap();
+    let icon = named(&doc, "Icon");
+    // The stroke paint now paints the outline as its fill: its colour token must follow it.
+    assert!(
+        icon.bound.values().any(|v| v == BRAND),
+        "colour variable bound on the outlined stroke was dropped; bound={:?} warnings={warnings:?}",
+        icon.bound
+    );
+}
diff --git a/crates/format/src/rest/props.rs b/crates/format/src/rest/props.rs
index 67ec8063..f5be3d27 100644
--- a/crates/format/src/rest/props.rs
+++ b/crates/format/src/rest/props.rs
@@ -5,8 +5,8 @@ use figcraft_doc::color::{BlendMode, Color, ColorStop, Gradient, GradientKind, I
 use figcraft_doc::geom::Affine;
 use figcraft_doc::{
     AutoLayout, Blur, BlurType, CellAlign, ChildLayout, Constraints, ContentAlign, CrossAlign, Effect, EffectKind, ExportFormat, ExportSetting,
-    ExportSize, Glass, GridAlign, GridKind, HConstraint, LayoutGrid, LayoutMode, MainAlign, Noise, NoiseMode, Shadow, Sizing, StrokeAlign, StrokeCap,
-    StrokeJoin, StrokeProps, Texture, VConstraint, WidthPoint, WidthProfile,
+    ExportSize, Glass, GridAlign, GridKind, GridTrack, HConstraint, LayoutGrid, LayoutMode, MainAlign, Noise, NoiseMode, Shadow, Sizing, StrokeAlign,
+    StrokeCap, StrokeJoin, StrokeProps, Texture, VConstraint, WidthPoint, WidthProfile,
 };
 use serde_json::Value;
 
@@ -123,10 +123,13 @@ pub(super) fn paints(cx: &mut Ctx, v: &Value, k: &str) -> Option<Vec<Paint>> {
 fn paint(cx: &mut Ctx, p: &Value) -> Option<Paint> {
     let ty = text(p, "type")?;
     let mut opacity = num(p, "opacity").unwrap_or(1.0).clamp(0.0, 1.0) as f32;
+    // The colour's alpha goes into the opacity as for a typed colour (`Paint::solid`).
+    let mut color_alpha = 1.0;
     let kind = match ty {
         "SOLID" => {
             let c = p.get("color").and_then(color).unwrap_or(Color::BLACK);
             opacity *= c.a;
+            color_alpha = c.a;
             PaintKind::Solid { color: c.with_alpha(1.0) }
         }
         "GRADIENT_LINEAR" => PaintKind::Gradient(gradient(GradientKind::Linear, p)),
@@ -139,7 +142,7 @@ fn paint(cx: &mut Ctx, p: &Value) -> Option<Paint> {
             return None;
         }
     };
-    Some(Paint { kind, opacity, visible: flag(p, "visible").unwrap_or(true), blend: paint_blend(p) })
+    Some(Paint { kind, opacity, visible: flag(p, "visible").unwrap_or(true), blend: paint_blend(p), color_alpha })
 }
 
 /// Gradient handles are already in the node's unit box (start, end, width), like ours.
@@ -178,6 +181,24 @@ fn image(cx: &mut Ctx, p: &Value) -> ImagePaint {
         .filter(|c| c[0].abs() > 1e-9 && c[3].abs() > 1e-9);
     let f = p.get("filters");
     let filter = |k: &str| f.and_then(|f| num(f, k)).unwrap_or(0.0).clamp(-1.0, 1.0) as f32;
+    let filter_fields = ["exposure", "contrast", "saturation", "temperature", "tint", "highlights", "shadows"];
+    let mut has_filters = false;
+    if let Some(filters) = f.and_then(Value::as_object) {
+        for (key, value) in filters {
+            match value.as_f64().filter(|value| value.is_finite()) {
+                Some(value) if filter_fields.contains(&key.as_str()) => has_filters |= value != 0.0,
+                Some(0.0) => {}
+                Some(_) => cx.warn(format!("nonzero unsupported image filter `{}` was skipped", clip_str(key))),
+                None => cx.warn(format!("malformed image filter `{}` was skipped", clip_str(key))),
+            }
+        }
+    } else if f.is_some_and(|filters| !filters.is_null()) {
+        cx.warn("malformed image filters container was skipped");
+    }
+    let fig = cx.fig_sources.is_some();
+    if has_filters && fig {
+        cx.warn("image filters use FigCraft's approximate renderer");
+    }
     ImagePaint {
         image: cx.image_key(text(p, "imageRef").unwrap_or("")),
         scale_mode,
@@ -189,7 +210,9 @@ fn image(cx: &mut Ctx, p: &Value) -> ImagePaint {
             contrast: filter("contrast"),
             saturation: filter("saturation"),
             temperature: filter("temperature"),
-            tint: filter("tint"),
+            // The files' tint runs from green (negative) to magenta (positive), in REST file JSON and
+            // .fig alike; a positive native tint adds green. (`0 - x`: no negative zero.)
+            tint: 0.0 - filter("tint"),
             highlights: filter("highlights"),
             shadows: filter("shadows"),
         },
@@ -394,7 +417,7 @@ pub(super) fn constraints(v: &Value) -> Option<Constraints> {
 // ---- auto layout ----
 
 /// The auto layout of a frame-like node (`layoutMode` other than `NONE`).
-pub(super) fn auto_layout(v: &Value) -> Option<AutoLayout> {
+pub(super) fn auto_layout(v: &Value, fig_tracks: bool) -> Option<AutoLayout> {
     let mode = match text(v, "layoutMode")? {
         "HORIZONTAL" => LayoutMode::Horizontal,
         "VERTICAL" => LayoutMode::Vertical,
@@ -404,6 +427,7 @@ pub(super) fn auto_layout(v: &Value) -> Option<AutoLayout> {
     let pad = |k: &str| len(v, k).unwrap_or(0.0);
     let count = |k: &str, d: u32| num(v, k).filter(|n| *n >= 1.0).map_or(d, |n| n.min(1000.0) as u32);
     let grid = mode == LayoutMode::Grid;
+    let (columns, rows) = (count("gridColumnCount", 2), count("gridRowCount", 2));
     Some(AutoLayout {
         mode,
         wrap: text(v, "layoutWrap") == Some("WRAP"),
@@ -428,14 +452,104 @@ pub(super) fn auto_layout(v: &Value) -> Option<AutoLayout> {
             Some("SPACE_BETWEEN") => ContentAlign::SpaceBetween,
             _ => ContentAlign::Auto,
         },
-        grid_columns: count("gridColumnCount", 2),
-        grid_rows: count("gridRowCount", 2),
+        grid_columns: columns,
+        grid_rows: rows,
         strokes_included: flag(v, "strokesIncludedInLayout").unwrap_or(false),
         reverse_z: flag(v, "itemReverseZIndex").unwrap_or(false),
-        ..AutoLayout::default()
+        column_tracks: grid_tracks(v, grid, fig_tracks, "columnTracks", "gridColumnsSizing", columns),
+        row_tracks: grid_tracks(v, grid, fig_tracks, "rowTracks", "gridRowsSizing", rows),
     })
 }
 
+/// A grid axis's track sizes: from the `.fig` source when there is one, else the API's CSS
+/// `grid-template-*` string (at most `count` tracks, the axis's own).
+fn grid_tracks(v: &Value, grid: bool, fig_tracks: bool, fig_axis: &str, css_key: &str, count: u32) -> Vec<GridTrack> {
+    match (grid, fig_tracks) {
+        (false, _) => Vec::new(),
+        (true, true) => fig_grid_tracks(v, fig_axis),
+        (true, false) => text(v, css_key).map(|css| css_grid_tracks(css, count as usize)).unwrap_or_default(),
+    }
+}
+
+/// The first `max` tracks of a CSS `grid-template-columns`/`-rows` value: `120px`, `2fr`, `auto`
+/// (hug), `minmax(0, 1fr)` and `repeat(3, …)`; any other track is an equal (1fr) one.
+fn css_grid_tracks(css: &str, max: usize) -> Vec<GridTrack> {
+    let mut out = Vec::new();
+    for item in css_split(css, char::is_whitespace) {
+        let repeated = item.strip_prefix("repeat(").and_then(|r| r.strip_suffix(')')).and_then(|r| {
+            let (count, tracks) = r.split_once(',')?;
+            Some((count.trim().parse::<usize>().ok()?, css_split(tracks, char::is_whitespace)))
+        });
+        let (count, tracks) = repeated.unwrap_or((1, vec![item]));
+        for t in tracks.iter().cycle().take(count.saturating_mul(tracks.len())) {
+            if out.len() >= max {
+                return out;
+            }
+            out.push(css_track(t));
+        }
+    }
+    out
+}
+
+fn css_track(t: &str) -> GridTrack {
+    let Some(args) = t.strip_prefix("minmax(").and_then(|r| r.strip_suffix(')')) else { return css_size(t).unwrap_or_default() };
+    // A flexible maximum is the track's share whatever its minimum; other ranges only when both ends agree.
+    match css_split(args, |c| c == ',').iter().map(|a| css_size(a.trim())).collect::<Vec<_>>()[..] {
+        [_, Some(max)] if max.sizing == Sizing::Fill => max,
+        [Some(min), Some(max)] if min == max => min,
+        _ => GridTrack::default(),
+    }
+}
+
+fn css_size(t: &str) -> Option<GridTrack> {
+    let n = |s: &str| s.parse::<f64>().ok().filter(|n| n.is_finite() && (0.0..=MAX_SIZE).contains(n));
+    if let Some(px) = t.strip_suffix("px").and_then(n) {
+        Some(GridTrack::fixed(px))
+    } else if let Some(fr) = t.strip_suffix("fr").and_then(n) {
+        (fr > 0.0).then(|| GridTrack::fill(fr))
+    } else {
+        matches!(t, "auto" | "min-content" | "max-content").then(GridTrack::hug)
+    }
+}
+
+/// `s` split at the `sep` characters outside parentheses, empty parts dropped.
+fn css_split(s: &str, sep: fn(char) -> bool) -> Vec<&str> {
+    let (mut parts, mut depth, mut start) = (Vec::new(), 0usize, 0);
+    for (i, c) in s.char_indices() {
+        match c {
+            '(' => depth += 1,
+            ')' => depth = depth.saturating_sub(1),
+            c if depth == 0 && sep(c) => {
+                parts.extend(s.get(start..i).filter(|p| !p.trim().is_empty()));
+                start = i + c.len_utf8();
+            }
+            _ => {}
+        }
+    }
+    parts.extend(s.get(start..).filter(|p| !p.trim().is_empty()));
+    parts
+}
+
+fn fig_grid_tracks(v: &Value, axis: &str) -> Vec<GridTrack> {
+    v.get(crate::rest::FIG_SOURCE_FIELD)
+        .and_then(|source| source.get("gridTracks"))
+        .and_then(|tracks| tracks.get(axis))
+        .and_then(Value::as_array)
+        .into_iter()
+        .flatten()
+        .take(1_000)
+        .map(|track| {
+            let value = track.get("value").and_then(Value::as_f64).filter(|n| n.is_finite() && (0.0..=MAX_SIZE).contains(n));
+            match (track.get("sizing").and_then(Value::as_str), value) {
+                (Some("fixed"), Some(px)) => GridTrack::fixed(px),
+                (Some("fill"), Some(fr)) if fr > 0.0 => GridTrack::fill(fr),
+                (Some("hug"), _) => GridTrack::hug(),
+                _ => GridTrack::default(),
+            }
+        })
+        .collect()
+}
+
 /// How the node sizes and sits in its parent: its own hug/fixed axes (auto layout frames), its
 /// fill/fixed axes as a child of an auto layout `parent_mode`, absolute positioning, min/max sizes
 /// and grid cells.
@@ -443,8 +557,17 @@ pub(super) fn child_layout(v: &Value, own: Option<LayoutMode>, parent_mode: Opti
     let mut cl = ChildLayout::default();
     let horizontal_main = |m: LayoutMode| m != LayoutMode::Vertical;
     // Legacy fields first, the explicit per-axis sizing wins.
+    // A text's resize mode is its sizing: auto width hugs both axes, auto height its height.
+    if text(v, "type") == Some("TEXT") && v.get("style").and_then(|s| text(s, "textTruncation")) != Some("ENDING") {
+        match v.get("style").and_then(|s| text(s, "textAutoResize")) {
+            Some("WIDTH_AND_HEIGHT") => (cl.sizing_h, cl.sizing_v) = (Sizing::Hug, Sizing::Hug),
+            Some("HEIGHT") => cl.sizing_v = Sizing::Hug,
+            _ => {}
+        }
+    }
     if let Some(m) = own {
-        let hug = |k: &str| text(v, k) == Some("AUTO");
+        // Both default to AUTO (hug) when the file leaves them out.
+        let hug = |k: &str| text(v, k) != Some("FIXED");
         let (main, cross) = (hug("primaryAxisSizingMode"), hug("counterAxisSizingMode"));
         let (h, w) = if horizontal_main(m) { (main, cross) } else { (cross, main) };
         if h {
@@ -550,6 +673,6 @@ pub(super) fn export_settings(v: &Value) -> Vec<ExportSetting> {
 }
 
 /// At most 200 chars of `s` (names and labels from the file stay readable in warnings).
-pub(super) fn clip_str(s: &str) -> &str {
+pub(crate) fn clip_str(s: &str) -> &str {
     s.char_indices().nth(200).and_then(|(i, _)| s.get(..i)).unwrap_or(s)
 }
diff --git a/crates/format/src/rest/proto.rs b/crates/format/src/rest/proto.rs
index 56e50e5e..61869916 100644
--- a/crates/format/src/rest/proto.rs
+++ b/crates/format/src/rest/proto.rs
@@ -4,7 +4,7 @@
 
 use figcraft_doc::proto::{
     Action, ConditionalBlock, DeviceRotation, Direction, Easing, Expr, ExprOp, Interaction, KeyMods, MAX_ACTION_DEPTH, MAX_EXPR_DEPTH, Overflow,
-    OverlayPosition, PrototypeSettings, ScrollPosition, Transition, Trigger, gamepad_button,
+    OverlayAnchor, OverlayPosition, PrototypeSettings, ScrollPosition, Transition, Trigger, gamepad_button,
 };
 use figcraft_doc::{Node, NodeId, VariableType, VariableValue};
 use serde_json::{Value, json};
@@ -322,7 +322,7 @@ impl Ctx<'_> {
                     .and_then(|v| Some([num(v, "x")?, num(v, "y")?]))
                     .filter(|o| o.iter().all(|c| c.is_finite()))
                     .map(|o| o.map(|c| c.clamp(-MAX_OFFSET, MAX_OFFSET)));
-                Action::OpenOverlay { dest, position, close_on_outside, background, offset }
+                Action::OpenOverlay { dest, position, close_on_outside, background, offset, anchor: OverlayAnchor::Screen }
             }
             Some(_) => {
                 self.warn("prototype navigations of unknown types were skipped");
diff --git a/crates/format/src/rest/slot_tests.rs b/crates/format/src/rest/slot_tests.rs
new file mode 100644
index 00000000..d85d15c6
--- /dev/null
+++ b/crates/format/src/rest/slot_tests.rs
@@ -0,0 +1,229 @@
+//! `SLOT` layers of the REST file JSON: bound to their slot property in a main component, and
+//! holding each instance's own content (synthetic files).
+
+use super::*;
+use serde_json::json;
+
+fn at(x: f64, y: f64) -> Value {
+    json!([[1, 0, x], [0, 1, y]])
+}
+
+pub(crate) fn file(children: Value) -> Value {
+    json!({"name": "Slots", "schemaVersion": 0, "document": {"id": "0:0", "name": "Document", "type": "DOCUMENT", "children": [
+        {"id": "0:1", "name": "Page", "type": "CANVAS", "children": children}
+    ]}})
+}
+
+fn content_id(local: u32) -> Value {
+    json!({"guid": {"sessionID": 5, "localID": local}})
+}
+
+fn slot(id: &str, name: &str, children: Value) -> Value {
+    json!({"id": id, "name": name, "type": "SLOT", "relativeTransform": at(10.0, 40.0), "size": {"x": 280, "y": 100}, "children": children})
+}
+
+fn label(id: &str, text: &str) -> Value {
+    json!({"id": id, "name": text, "type": "TEXT", "characters": text, "relativeTransform": at(0.0, 0.0), "size": {"x": 100, "y": 20}})
+}
+
+/// A "Chip" component (`1:9`), a "Container" component (`1:2`) with a "Title" text and an empty
+/// "Slot" (property `Slot#1:3`, default content 5:1), and the given layers after them.
+pub(crate) fn container_file(more: Vec<Value>) -> Value {
+    let mut layers = vec![
+        json!({"id": "1:9", "name": "Chip", "type": "COMPONENT", "relativeTransform": at(0.0, 400.0), "size": {"x": 40, "y": 20}, "children": [
+            {"id": "1:10", "name": "Dot", "type": "ELLIPSE", "relativeTransform": at(2.0, 2.0), "size": {"x": 16, "y": 16}}
+        ]}),
+        json!({"id": "1:2", "name": "Container", "type": "COMPONENT", "relativeTransform": at(0.0, 0.0), "size": {"x": 300, "y": 160},
+               "componentPropertyDefinitions": {"Slot#1:3": {"type": "SLOT", "defaultValue": content_id(1)}},
+               "children": [label("1:4", "Title"), slot("1:5", "Slot", json!([]))]}),
+    ];
+    layers.extend(more);
+    file(Value::Array(layers))
+}
+
+/// An instance `id` of Container at `x` whose slot holds `content` (property value `value`).
+pub(crate) fn container(id: &str, x: f64, value: Value, content: Value) -> Value {
+    json!({"id": id, "name": "Container", "type": "INSTANCE", "componentId": "1:2", "relativeTransform": at(x, 0.0), "size": {"x": 300, "y": 160},
+           "componentProperties": {"Slot#1:3": {"type": "SLOT", "value": value}},
+           "children": [label(&format!("I{id};1:4"), "Title"), slot(&format!("I{id};1:5"), "Slot", content)]})
+}
+
+pub(crate) fn chip(id: &str) -> Value {
+    json!({"id": id, "name": "Chip", "type": "INSTANCE", "componentId": "1:9", "relativeTransform": at(0.0, 30.0), "size": {"x": 40, "y": 20}, "children": [
+        {"id": format!("I{id};1:10"), "name": "Dot", "type": "ELLIPSE", "relativeTransform": at(2.0, 2.0), "size": {"x": 16, "y": 16}}
+    ]})
+}
+
+fn by_rest<'d>(doc: &'d Document, v: &Value, rest: &str) -> &'d Node {
+    // Names repeat across copies: find by position in the file's tree instead.
+    fn path(v: &Value, rest: &str, out: &mut Vec<usize>) -> bool {
+        if v.get("id").and_then(Value::as_str) == Some(rest) {
+            return true;
+        }
+        for (i, c) in v.get("children").and_then(Value::as_array).into_iter().flatten().enumerate() {
+            out.push(i);
+            if path(c, rest, out) {
+                return true;
+            }
+            out.pop();
+        }
+        false
+    }
+    let mut p = Vec::new();
+    assert!(path(&v["document"]["children"][0], rest, &mut p), "no {rest} in the file");
+    let mut id = doc.pages[0];
+    for i in p {
+        id = doc.node(id).unwrap().children[i];
+    }
+    doc.node(id).unwrap()
+}
+
+fn names(doc: &Document, n: &Node) -> Vec<String> {
+    n.children.iter().map(|c| doc.node(*c).unwrap().name.clone()).collect()
+}
+
+#[test]
+fn slot_layers_bind_to_their_property_and_keep_instance_content() {
+    let v = container_file(vec![
+        container("2:1", 400.0, content_id(7), json!([label("2:2", "Reports in progress"), chip("2:3")])),
+        container("3:1", 800.0, content_id(1), json!([])),
+    ]);
+    let (doc, warnings) = import(&v, &no_images).unwrap();
+    assert!(warnings.iter().all(|w| !w.contains("SLOT") && !w.contains("slot")), "{warnings:?}");
+
+    let main = by_rest(&doc, &v, "1:2");
+    let NodeKind::Component { props, .. } = &main.kind else { panic!("{:?}", main.kind) };
+    assert_eq!(props.get("Slot"), Some(&PropDef::Slot { preferred: Vec::new() }), "named without its #id suffix");
+    let main_slot = by_rest(&doc, &v, "1:5");
+    assert!(matches!(main_slot.kind, NodeKind::Frame));
+    assert_eq!(main_slot.prop_refs.get("slot").map(String::as_str), Some("Slot"));
+    assert!(main_slot.children.is_empty(), "the main's slot stays empty");
+
+    let filled = by_rest(&doc, &v, "I2:1;1:5");
+    assert!(filled.overrides.contains("slot"), "the instance's own content");
+    assert!(filled.prop_refs.is_empty(), "an instance's slot follows its main's");
+    assert_eq!(names(&doc, filled), ["Reports in progress", "Chip"]);
+    let chip = by_rest(&doc, &v, "2:3");
+    assert!(matches!(chip.kind, NodeKind::Instance { .. }), "instances in slot content link to their own main");
+
+    let default = by_rest(&doc, &v, "I3:1;1:5");
+    assert!(!default.overrides.contains("slot"), "the main's default content follows the main");
+}
+
+#[test]
+fn slot_ownership_without_values_follows_the_content() {
+    let mut owned = container("2:1", 400.0, json!(null), json!([label("2:2", "Own")]));
+    owned["componentProperties"] = json!({});
+    let mut empty = container("3:1", 800.0, json!(null), json!([]));
+    empty["componentProperties"] = json!({});
+    let v = container_file(vec![owned, empty]);
+    let (doc, _) = import(&v, &no_images).unwrap();
+    assert!(by_rest(&doc, &v, "I2:1;1:5").overrides.contains("slot"));
+    assert!(!by_rest(&doc, &v, "I3:1;1:5").overrides.contains("slot"));
+}
+
+#[test]
+fn slots_match_by_reference_then_name_then_the_one_left() {
+    let comp = json!({"id": "1:2", "name": "Card", "type": "COMPONENT", "relativeTransform": at(0.0, 0.0), "size": {"x": 300, "y": 300},
+    "componentPropertyDefinitions": {
+        "Header#1:3": {"type": "SLOT", "defaultValue": content_id(1)},
+        "Body#1:4": {"type": "SLOT", "defaultValue": content_id(2)},
+        "Footer#1:5": {"type": "SLOT", "defaultValue": content_id(3)},
+        "Visible#1:6": {"type": "BOOLEAN", "defaultValue": true}
+    },
+    "children": [
+        {"id": "1:7", "name": "Top", "type": "SLOT", "componentPropertyReferences": {"visible": "Visible#1:6", "slot": "Header#1:3"},
+         "relativeTransform": at(0.0, 0.0), "size": {"x": 300, "y": 50}},
+        {"id": "1:8", "name": "Body", "type": "SLOT", "relativeTransform": at(0.0, 50.0), "size": {"x": 300, "y": 50}},
+        {"id": "1:9", "name": "Bottom", "type": "SLOT", "relativeTransform": at(0.0, 100.0), "size": {"x": 300, "y": 50}}
+    ]});
+    let v = file(json!([comp]));
+    let (doc, warnings) = import(&v, &no_images).unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    let bound = |rest: &str| by_rest(&doc, &v, rest).prop_refs.get("slot").cloned();
+    assert_eq!(bound("1:7").as_deref(), Some("Header"));
+    assert_eq!(by_rest(&doc, &v, "1:7").prop_refs.get("visible").map(String::as_str), Some("Visible"));
+    assert_eq!(bound("1:8").as_deref(), Some("Body"));
+    assert_eq!(bound("1:9").as_deref(), Some("Footer"));
+}
+
+#[test]
+fn variants_share_their_set_slot_property() {
+    let variant = |id: &str, name: &str, x: f64| {
+        json!({"id": id, "name": name, "type": "COMPONENT", "relativeTransform": at(x, 0.0), "size": {"x": 100, "y": 100},
+               "children": [slot(&format!("{id}s"), "Content", json!([]))]})
+    };
+    let set = json!({"id": "1:1", "name": "Panel", "type": "COMPONENT_SET", "relativeTransform": at(0.0, 0.0), "size": {"x": 300, "y": 100},
+        "componentPropertyDefinitions": {"Size": {"type": "VARIANT", "defaultValue": "Small"}, "Content#2:1": {"type": "SLOT", "defaultValue": content_id(1)}},
+        "children": [variant("1:2", "Size=Small", 0.0), variant("1:3", "Size=Large", 150.0)]});
+    let inst = json!({"id": "4:1", "name": "Panel", "type": "INSTANCE", "componentId": "1:3", "relativeTransform": at(0.0, 300.0), "size": {"x": 100, "y": 100},
+        "componentProperties": {"Content#2:1": {"type": "SLOT", "value": content_id(9)}},
+        "children": [slot("I4:1;1:3s", "Content", json!([label("4:2", "Mine")]))]});
+    let v = file(json!([set, inst]));
+    let (doc, warnings) = import(&v, &no_images).unwrap();
+    assert!(warnings.is_empty(), "{warnings:?}");
+    for rest in ["1:2s", "1:3s"] {
+        assert_eq!(by_rest(&doc, &v, rest).prop_refs.get("slot").map(String::as_str), Some("Content"), "{rest}");
+    }
+    assert!(by_rest(&doc, &v, "I4:1;1:3s").overrides.contains("slot"));
+}
+
+#[test]
+fn nested_instances_own_the_slots_of_their_main() {
+    // A "Screen" main places a Container whose slot holds a chip; an instance of Screen places
+    // other content in that nested slot.
+    let screen = json!({"id": "6:1", "name": "Screen", "type": "COMPONENT", "relativeTransform": at(0.0, 600.0), "size": {"x": 300, "y": 160},
+        "children": [container("6:2", 0.0, content_id(7), json!([chip("6:3")]))]});
+    let nested = container("I7:1;6:2", 0.0, content_id(8), json!([label("7:2", "Other")]));
+    let outer = json!({"id": "7:1", "name": "Screen", "type": "INSTANCE", "componentId": "6:1", "relativeTransform": at(400.0, 600.0), "size": {"x": 300, "y": 160},
+        "children": [nested]});
+    let v = container_file(vec![screen, outer]);
+    let (doc, _) = import(&v, &no_images).unwrap();
+    let in_main = by_rest(&doc, &v, "I6:2;1:5");
+    assert!(in_main.overrides.contains("slot") && in_main.prop_refs.is_empty());
+    assert!(matches!(by_rest(&doc, &v, "6:3").kind, NodeKind::Instance { .. }));
+    let in_outer = by_rest(&doc, &v, "II7:1;6:2;1:5");
+    assert!(in_outer.overrides.contains("slot"));
+    assert_eq!(names(&doc, in_outer), ["Other"]);
+}
+
+#[test]
+fn slots_outside_components_or_without_a_property_stay_frames() {
+    let mut no_def = container_file(Vec::new());
+    no_def["document"]["children"][0]["children"][1].as_object_mut().unwrap().remove("componentPropertyDefinitions");
+    let loose = slot("8:1", "Loose", json!([label("8:2", "Kept")]));
+    no_def["document"]["children"][0]["children"].as_array_mut().unwrap().push(loose);
+    let (doc, warnings) = import(&no_def, &no_images).unwrap();
+    assert!(warnings.iter().any(|w| w.starts_with("slot layers without a matching slot property were imported as frames (×2)")), "{warnings:?}");
+    let kept = by_rest(&doc, &no_def, "8:1");
+    assert!(matches!(kept.kind, NodeKind::Frame) && kept.prop_refs.is_empty());
+    assert_eq!(names(&doc, kept), ["Kept"]);
+    assert!(by_rest(&doc, &no_def, "1:5").prop_refs.is_empty());
+}
+
+#[test]
+fn slot_settings_the_editor_cannot_keep_are_noted() {
+    let mut v = container_file(Vec::new());
+    v["document"]["children"][0]["children"][1]["componentPropertyDefinitions"]["Slot#1:3"]["slotSettings"] =
+        json!({"stretchChildOnInsert": true, "displayEmptyByDefault": true, "minChildren": null, "maxChildren": 3});
+    v["document"]["children"][0]["children"][1]["componentPropertyDefinitions"]["Slot#1:3"]["preferredValues"] =
+        json!([{"type": "COMPONENT", "key": "abc"}]);
+    let (_, warnings) = import(&v, &no_images).unwrap();
+    assert!(warnings.iter().any(|w| w == "non-default slot settings are not represented and were skipped"), "{warnings:?}");
+    assert!(warnings.iter().any(|w| w == "preferred slot component keys cannot be resolved to file nodes and were skipped"), "{warnings:?}");
+    let mut plain = container_file(Vec::new());
+    plain["document"]["children"][0]["children"][1]["componentPropertyDefinitions"]["Slot#1:3"]["slotSettings"] =
+        json!({"stretchChildOnInsert": true, "minChildren": null, "maxChildren": null, "allowPreferredValuesOnly": false});
+    assert!(import(&plain, &no_images).unwrap().1.is_empty());
+}
+
+#[test]
+fn junk_slot_json_never_panics() {
+    for junk in [json!(null), json!(1), json!("x"), json!([]), json!({"guid": null}), json!({"type": "SLOT"})] {
+        let mut v = container_file(vec![container("2:1", 400.0, junk.clone(), json!([label("2:2", "A")]))]);
+        v["document"]["children"][0]["children"][1]["componentPropertyDefinitions"]["Slot#1:3"] =
+            json!({"type": "SLOT", "defaultValue": junk.clone(), "slotSettings": junk.clone(), "preferredValues": junk.clone()});
+        v["document"]["children"][0]["children"][1]["children"][1]["componentPropertyReferences"] = json!({"slot": junk});
+        assert!(import(&v, &no_images).is_ok());
+    }
+}
diff --git a/crates/format/src/rest/tests.rs b/crates/format/src/rest/tests.rs
index d7117fd0..5ea5264f 100644
--- a/crates/format/src/rest/tests.rs
+++ b/crates/format/src/rest/tests.rs
@@ -162,6 +162,7 @@ fn paints_gradients_and_image_placeholders() {
     let s = &named(&doc, "Solid").fills[0];
     assert!(matches!(s.kind, PaintKind::Solid { color } if color.r == 1.0 && color.a == 1.0));
     assert!(close(f64::from(s.opacity), 0.25), "paint opacity × colour alpha");
+    assert!(close(f64::from(s.color_alpha), 0.5), "the colour's part, which a bound variable replaces");
     assert!(!s.visible && s.blend == BlendMode::Screen);
     let PaintKind::Gradient(g) = &named(&doc, "Linear").fills[0].kind else { panic!() };
     assert_eq!((g.kind, g.from, g.to, g.width), (GradientKind::Linear, (0.0, 0.5), (1.0, 0.5), (0.0, 1.0)));
@@ -186,6 +187,26 @@ fn paints_gradients_and_image_placeholders() {
     assert!(warnings.iter().any(|w| w.starts_with("1 image without image data shows")), "{warnings:?}");
 }
 
+#[test]
+fn image_filter_tint_turns_magenta_positive_into_native_green_positive() {
+    let rect = |name: &str, tint: f64| {
+        json!({
+            "id": name, "name": name, "type": "RECTANGLE", "relativeTransform": at(0.0, 0.0), "size": {"x": 10, "y": 10},
+            "fills": [{"type": "IMAGE", "imageRef": "tint", "filters": {"tint": tint}}]
+        })
+    };
+    let (doc, warnings) = one(json!([rect("Magenta", 0.75), rect("Green", -0.5), rect("Neutral", 0.0)]));
+    let image = |name: &str| {
+        let PaintKind::Image(image) = &named(&doc, name).fills[0].kind else { panic!("{name} is not an image fill") };
+        image
+    };
+    // The same sign as a `.fig` import (`fig::tests::image_filters`).
+    assert!(close(f64::from(image("Magenta").filters.tint), -0.75));
+    assert!(close(f64::from(image("Green").filters.tint), 0.5));
+    assert!(image("Neutral").filters.tint.is_sign_positive(), "no negative zero");
+    assert!(!warnings.iter().any(|w| w.contains("approximate renderer")), "{warnings:?}");
+}
+
 #[test]
 fn image_bytes_come_from_the_resolver() {
     let png = {
@@ -344,6 +365,17 @@ fn text_styles_and_runs() {
     assert!(!named(&doc, "NoFills").fills.is_empty(), "text keeps its default fill");
 }
 
+#[test]
+fn max_lines_apply_only_while_truncating() {
+    let (doc, _) = one(json!([
+        {"id": "1", "name": "Auto", "type": "TEXT", "relativeTransform": at(0.0, 0.0), "size": {"x": 100, "y": 20}, "characters": "a",
+         "style": {"textAutoResize": "HEIGHT", "textTruncation": "DISABLED", "maxLines": 2}}
+    ]));
+    let NodeKind::Text(td) = &named(&doc, "Auto").kind else { panic!() };
+    assert_eq!((td.auto_resize, td.max_lines), (TextAutoResize::Height, 0));
+    assert!(!td.truncates());
+}
+
 #[test]
 fn auto_layout_constraints_and_grids() {
     let (doc, _) = one(json!([
@@ -363,6 +395,7 @@ fn auto_layout_constraints_and_grids() {
          ]},
         {"id": "4", "name": "Grid", "type": "FRAME", "relativeTransform": at(200.0, 0.0), "size": {"x": 300, "y": 200},
          "layoutMode": "GRID", "gridColumnCount": 3, "gridRowCount": 2, "gridColumnGap": 4, "gridRowGap": 6,
+         "_figSource": {"gridTracks": {"columnTracks": [{"sizing": "fixed", "value": 120}] }},
          "children": [{"id": "5", "name": "Cell", "type": "RECTANGLE", "relativeTransform": at(0.0, 0.0), "size": {"x": 10, "y": 10},
                        "gridColumnAnchorIndex": 1, "gridRowAnchorIndex": 0, "gridColumnSpan": 2, "gridRowSpan": 1}]}
     ]));
@@ -389,6 +422,7 @@ fn auto_layout_constraints_and_grids() {
     assert_eq!((abs.constraints.horizontal, abs.constraints.vertical), (HConstraint::LeftRight, VConstraint::Bottom));
     let grid = named(&doc, "Grid").layout.clone().unwrap();
     assert_eq!((grid.mode, grid.grid_columns, grid.grid_rows, grid.gap, grid.cross_gap), (LayoutMode::Grid, 3, 2, 4.0, 6.0));
+    assert!(grid.column_tracks.is_empty(), "private .fig track metadata is ignored by the public REST importer");
     let cell = &named(&doc, "Cell").child_layout;
     assert_eq!((cell.grid_column, cell.grid_row, cell.grid_column_span, cell.grid_row_span), (Some(1), Some(0), 2, 1));
 }
@@ -707,3 +741,18 @@ fn layer_count_is_capped() {
     assert_eq!(doc.node_count(), MAX_NODES + 1);
     assert!(warnings.iter().any(|w| w.contains("more than")), "{warnings:?}");
 }
+
+#[test]
+fn the_fig_import_sets_its_own_layer_cap() {
+    // The `.fig` import passes a cap from the file's size: above `MAX_NODES` every layer comes in.
+    let kids: Vec<Value> = (0..MAX_NODES + 5).map(|i| json!({"id": i.to_string(), "type": "RECTANGLE", "name": "R"})).collect();
+    let json = file(json!([page("Page", Value::Array(kids))]));
+    let (doc, warnings) = import_with_networks(&json, &no_images, Vec::new(), MAX_NODES + 10).unwrap();
+    assert_eq!(doc.node_count(), MAX_NODES + 6);
+    assert!(!warnings.iter().any(|w| w.contains("more than")), "{warnings:?}");
+    // Below it, the import stops at the cap it was given.
+    let few: Vec<Value> = (0..10).map(|i| json!({"id": i.to_string(), "type": "RECTANGLE", "name": "R"})).collect();
+    let (doc, warnings) = import_with_networks(&file(json!([page("Page", Value::Array(few))])), &no_images, Vec::new(), 4).unwrap();
+    assert_eq!(doc.node_count(), 5);
+    assert!(warnings.iter().any(|w| w.contains("more than 4 layers")), "{warnings:?}");
+}
diff --git a/crates/format/src/rest/text.rs b/crates/format/src/rest/text.rs
index c5381bb2..18e5015e 100644
--- a/crates/format/src/rest/text.rs
+++ b/crates/format/src/rest/text.rs
@@ -5,7 +5,7 @@ use std::collections::BTreeMap;
 
 use figcraft_doc::{
     DecorationLength, DecorationStyle, LetterSpacing, LineHeight, ListStyle, ParaList, StyleRun, TextAlignH, TextAlignV, TextAutoResize, TextCase,
-    TextData, TextDecoration, TextStyle,
+    TextData, TextDecoration, TextPath, TextStyle,
 };
 use serde_json::Value;
 
@@ -27,8 +27,25 @@ pub(super) fn text_data(cx: &mut Ctx, v: &Value) -> TextData {
     let mut td = TextData { characters, style: base, ..TextData::default() };
     paragraph(style_json, &mut td);
     td.runs = runs(cx, v, &td);
+    // Skip ink only shows on an underline. A file can carry it on any text, so elsewhere it stays out
+    // of the look (runs have inherited the base value by now).
+    for st in std::iter::once(&mut td.style).chain(td.runs.iter_mut().map(|r| &mut r.style)) {
+        if st.decoration != TextDecoration::Underline && st.look().skip_ink {
+            st.set_look(|l| l.skip_ink = false);
+        }
+    }
     td.normalize();
     lists(v, &mut td);
+    if cx.fig_sources.is_some()
+        && let Some(path) = v.get("_figTextPath")
+    {
+        match (path.get("d").and_then(Value::as_str), path.get("start").and_then(Value::as_f64), path.get("flip").and_then(Value::as_bool)) {
+            (Some(d), Some(start), Some(flip)) if !d.is_empty() && start.is_finite() && (0.0..=1.0).contains(&start) => {
+                td.path = Some(Box::new(TextPath { d: d.to_owned(), start, flip }));
+            }
+            _ => cx.warn("invalid internal .fig text path data was ignored"),
+        }
+    }
     td
 }
 
@@ -52,10 +69,13 @@ fn paragraph(s: &Value, td: &mut TextData) {
         // Missing means a fixed box.
         _ => TextAutoResize::None,
     };
-    if text(s, "textTruncation") == Some("ENDING") {
+    // A line limit applies only while truncation is on; a leftover `maxLines` is ignored.
+    let ending = text(s, "textTruncation") == Some("ENDING");
+    td.max_lines = num(s, "maxLines").filter(|n| ending && *n >= 1.0).map_or(0, |n| n.min(10_000.0) as u32);
+    // Auto height with a line limit keeps hugging its lines up to the limit.
+    if ending && !td.truncates() {
         td.auto_resize = TextAutoResize::Truncate;
     }
-    td.max_lines = num(s, "maxLines").filter(|n| *n >= 1.0).map_or(0, |n| n.min(10_000.0) as u32);
     td.paragraph_spacing = len(s, "paragraphSpacing").unwrap_or(0.0);
     td.paragraph_indent = len(s, "paragraphIndent").unwrap_or(0.0);
     td.list_spacing = len(s, "listSpacing").unwrap_or(0.0).min(10_000.0);
@@ -85,6 +105,15 @@ fn type_style(cx: &mut Ctx, s: &Value, base: &TextStyle) -> TextStyle {
         let weight = num(s, "fontWeight").map_or_else(|| t.weight(), |w| w.clamp(1.0, 1000.0) as u16);
         t.font_style = style_name(weight, flag(s, "italic").unwrap_or_else(|| t.italic()));
     }
+    // Variable font axes, `{tag: value}` (FigCraft's own key; the Sketch importer writes it).
+    if let Some(axes) = s.get("fontVariations").and_then(Value::as_object) {
+        t.variations = axes
+            .iter()
+            .take(64)
+            .filter(|(k, _)| k.len() == 4 && k.is_ascii())
+            .filter_map(|(k, v)| Some((k.clone(), v.as_f64().filter(|x| x.is_finite())?.clamp(-1e5, 1e5))))
+            .collect();
+    }
     if let Some(size) = num(s, "fontSize").filter(|x| *x > 0.0) {
         t.font_size = size.clamp(0.5, 10_000.0);
     }
@@ -106,6 +135,12 @@ fn type_style(cx: &mut Ctx, s: &Value, base: &TextStyle) -> TextStyle {
     if let Some(ls) = num(s, "letterSpacing") {
         t.letter_spacing = if ls == 0.0 { LetterSpacing::default() } else { LetterSpacing::Pixels(ls.clamp(-1e4, 1e4)) };
     }
+    // Private, from the .fig mapper: the spacing was a share of the font size.
+    if cx.fig_sources.is_some()
+        && let Some(p) = num(s, "_letterSpacingPercent")
+    {
+        t.letter_spacing = LetterSpacing::Percent(p.clamp(-1e4, 1e4));
+    }
     match text(s, "textCase") {
         Some("ORIGINAL") => t.case = TextCase::Original,
         Some("UPPER") => t.case = TextCase::Upper,
@@ -210,10 +245,12 @@ fn runs(cx: &mut Ctx, v: &Value, td: &TextData) -> Vec<StyleRun> {
     out
 }
 
-/// Each paragraph's list type and nesting level from `lineTypes` and `lineIndentations`.
+/// Each paragraph's list type, nesting level and start number from `lineTypes`,
+/// `lineIndentations` and (from `.fig` files) `listStartOffsets`.
 fn lists(v: &Value, td: &mut TextData) {
     let types = list(v, "lineTypes");
     let indents = list(v, "lineIndentations");
+    let starts = list(v, "listStartOffsets");
     td.paragraphs = types
         .iter()
         .enumerate()
@@ -224,6 +261,7 @@ fn lists(v: &Value, td: &mut TextData) {
                 _ => ListStyle::None,
             },
             indent: indents.get(i).and_then(Value::as_f64).filter(|d| d.is_finite()).map_or(0, |d| d.clamp(0.0, 255.0) as u8),
+            start_offset: starts.get(i).and_then(Value::as_f64).filter(|n| n.is_finite()).map_or(0, |n| n.clamp(0.0, f64::from(u32::MAX)) as u32),
         })
         .collect();
     // Clamp the levels and fold one style for all back into the layer's list style.
diff --git a/crates/format/src/rest/variables.rs b/crates/format/src/rest/variables.rs
index 91d14001..d58da409 100644
--- a/crates/format/src/rest/variables.rs
+++ b/crates/format/src/rest/variables.rs
@@ -27,6 +27,16 @@ pub fn source(v: &Value) -> Option<&Value> {
     [v.get("meta"), Some(v)].into_iter().flatten().find(|m| m.get("variableCollections").is_some_and(Value::is_object))
 }
 
+/// The variable ids the collections of a local variables response list in `variableIds`.
+pub(super) fn listed_ids(v: &Value) -> BTreeSet<&str> {
+    source(v)
+        .into_iter()
+        .flat_map(|src| objects(src, "variableCollections", MAX_COLLECTIONS))
+        .flat_map(|(_, c)| list(c, "variableIds").iter().filter_map(Value::as_str).map(clip_str))
+        .take(MAX_VARIABLES)
+        .collect()
+}
+
 pub(super) fn kind_of(t: &str) -> Option<VariableType> {
     Some(match t {
         "COLOR" => VariableType::Color,
@@ -118,14 +128,18 @@ fn objects<'v>(v: &'v Value, key: &str, max: usize) -> impl Iterator<Item = (&'v
 }
 
 impl Ctx<'_> {
-    /// Add the collections and variables of a local variables response (or its `meta`).
-    pub(super) fn variables(&mut self, src: &Value) {
+    /// Add the collections and variables of a local variables response (or its `meta`); nothing
+    /// when `v` isn't one. The `variables` map is read next to `variableCollections`, or from
+    /// `meta` or the top level when it sits on the other side.
+    pub(super) fn variables(&mut self, v: &Value) {
+        let Some(src) = source(v) else { return };
         for (key, c) in objects(src, "variableCollections", MAX_COLLECTIONS) {
             self.collection(key, c);
         }
+        let holder = [Some(src), v.get("meta"), Some(v)].into_iter().flatten().find(|m| m.get("variables").is_some_and(Value::is_object));
         let mut found: Vec<Variable> = Vec::new();
         let mut seen: BTreeSet<String> = BTreeSet::new();
-        for (key, v) in objects(src, "variables", MAX_VARIABLES) {
+        for (key, v) in holder.into_iter().flat_map(|h| objects(h, "variables", MAX_VARIABLES)) {
             if let Some(var) = self.variable(key, v)
                 && seen.insert(var.id.clone())
             {
diff --git a/crates/format/src/sketch.rs b/crates/format/src/sketch.rs
new file mode 100644
index 00000000..985541b1
--- /dev/null
+++ b/crates/format/src/sketch.rs
@@ -0,0 +1,277 @@
+//! Import of `.sketch` files saved by Sketch 48 or newer (best effort), written from the public
+//! description of the format only.
+//!
+//! A `.sketch` file is a zip archive holding `document.json` (the document: its pages in order,
+//! shared styles, swatches and library symbols copied into it), `meta.json` (the app version and
+//! format version that saved it), one `pages/<id>.json` per page (the layer tree), `images/` and,
+//! in newer files, `fonts/`. Every object carries its kind in `_class`. [`tree`] maps the layers
+//! onto the REST API file JSON shape and the REST importer builds the document, so this import
+//! shares its mapping, budgets and import report with `.fig` and file JSON imports. Files older
+//! than Sketch 48 (a SQLite database before 43, text as binary property lists until 47) are
+//! refused with a message saying how to convert them. Anything not understood is skipped with a
+//! warning; malformed input never panics.
+
+#[cfg(test)]
+mod fixture;
+#[cfg(test)]
+mod frames_tests;
+mod path;
+#[cfg(test)]
+mod path_tests;
+mod proto;
+#[cfg(test)]
+mod proto_tests;
+mod shared;
+#[cfg(test)]
+mod shared_tests;
+mod stack;
+mod style;
+#[cfg(test)]
+mod style_tests;
+mod symbols;
+#[cfg(test)]
+mod symbols_tests;
+#[cfg(test)]
+mod tests;
+mod text;
+#[cfg(test)]
+mod text_tests;
+mod tree;
+#[cfg(test)]
+mod tree_tests;
+
+use std::collections::BTreeSet;
+
+use figcraft_doc::Document;
+use serde_json::{Value, json};
+
+use crate::FormatError;
+
+/// The oldest Sketch whose files open: from 48 on, text is plain JSON too.
+pub const MIN_SKETCH: u32 = 48;
+/// The newest `meta.json` format version checked against real files (Sketch 83); newer files
+/// open with a warning.
+pub const NEWEST_TESTED_VERSION: u64 = 139;
+/// What opening a file saved by an older Sketch says.
+pub const TOO_OLD: &str = "saved by a Sketch older than 48; open it in a newer Sketch and save it again";
+/// Largest JSON member read (a real page of a few thousand layers takes 33 MB).
+const MAX_JSON_MEMBER: u64 = 512 * 1024 * 1024;
+/// Most bytes JSON members may unpack to, per compressed byte (real files pack 5–20 times; a
+/// zero-filled array a thousand times), with a floor for small members.
+const MAX_JSON_RATIO: u64 = 100;
+const MIN_JSON_ALLOWANCE: u64 = 16 * 1024 * 1024;
+/// Most JSON read from one file in all.
+#[cfg(not(target_pointer_width = "32"))]
+const MAX_JSON_TOTAL: u64 = 2 * 1024 * 1024 * 1024;
+#[cfg(target_pointer_width = "32")]
+const MAX_JSON_TOTAL: u64 = 512 * 1024 * 1024;
+/// Largest image member read.
+const MAX_IMAGE: u64 = 256 * 1024 * 1024;
+/// Most pages read from one file.
+const MAX_PAGES: usize = 1000;
+
+/// Whether `bytes` look like a `.sketch` file: a zip holding `document.json` and `meta.json`, or
+/// the SQLite database Sketch wrote before version 43 (so that it gets the "too old" message).
+pub fn is_sketch(bytes: &[u8]) -> bool {
+    bytes.starts_with(b"SQLite format 3\0")
+        || (bytes.starts_with(b"PK")
+            && zip::ZipArchive::new(std::io::Cursor::new(bytes)).is_ok_and(|z| {
+                let names: BTreeSet<&str> = z.file_names().collect();
+                names.contains("document.json") && names.contains("meta.json")
+            }))
+}
+
+/// Finds the installed face a PostScript name belongs to: its family and style.
+pub type FontLookup = Box<dyn Fn(&str) -> Option<(String, String)>>;
+
+/// Import `bytes` when they are a `.sketch` file; `None` when they are something else.
+pub fn try_import(bytes: &[u8], name: &str) -> Option<Result<(Document, Vec<String>), FormatError>> {
+    try_import_with_fonts(bytes, name, None)
+}
+
+/// [`try_import`] with `fonts` finding the installed faces the file's fonts (PostScript names)
+/// belong to; families of fonts it doesn't find are read from their names.
+pub fn try_import_with_fonts(bytes: &[u8], name: &str, fonts: Option<FontLookup>) -> Option<Result<(Document, Vec<String>), FormatError>> {
+    is_sketch(bytes).then(|| import_with_fonts(bytes, name, fonts))
+}
+
+/// Build a document from a `.sketch` file. Returns it with the warnings about what was skipped or
+/// approximated. `name`: the document name.
+pub fn import(bytes: &[u8], name: &str) -> Result<(Document, Vec<String>), FormatError> {
+    import_with_fonts(bytes, name, None)
+}
+
+/// [`import`] with a font lookup (see [`try_import_with_fonts`]).
+pub fn import_with_fonts(bytes: &[u8], name: &str, fonts: Option<FontLookup>) -> Result<(Document, Vec<String>), FormatError> {
+    import_parts(bytes, name, MAX_JSON_MEMBER, crate::fig::layer_budget(bytes.len()), fonts)
+}
+
+/// [`import`] reading pages of at most `max_member` bytes of JSON each.
+#[cfg(test)]
+pub(crate) fn import_within(bytes: &[u8], name: &str, max_member: u64) -> Result<(Document, Vec<String>), FormatError> {
+    import_parts(bytes, name, max_member, crate::fig::layer_budget(bytes.len()), None)
+}
+
+/// [`import`] with at most `max_nodes` layers.
+#[cfg(test)]
+pub(crate) fn import_within_nodes(bytes: &[u8], name: &str, max_nodes: usize) -> Result<(Document, Vec<String>), FormatError> {
+    import_parts(bytes, name, MAX_JSON_MEMBER, max_nodes, None)
+}
+
+fn import_parts(
+    bytes: &[u8],
+    name: &str,
+    max_member: u64,
+    max_nodes: usize,
+    fonts: Option<FontLookup>,
+) -> Result<(Document, Vec<String>), FormatError> {
+    if bytes.starts_with(b"SQLite format 3\0") {
+        return Err(FormatError::Io(TOO_OLD.into()));
+    }
+    let archive = Archive::open(bytes, max_member)?;
+    let map = tree::to_rest(&archive, name, max_nodes, fonts);
+    if map.too_old {
+        return Err(FormatError::Io(TOO_OLD.into()));
+    }
+    let mut warnings = archive.warnings.clone();
+    warnings.extend(map.warnings);
+    if let Some(note) = embedded_fonts(&archive.document) {
+        warnings.push(note);
+    }
+    let images = |r: &str| archive.image(r);
+    let (mut doc, more) = crate::rest::import_with_networks_plain(&map.json, &images, map.networks, max_nodes)?;
+    if archive.document.get("colorSpace").and_then(Value::as_i64) == Some(2) {
+        doc.color_profile = figcraft_doc::color::ColorProfile::DisplayP3;
+    }
+    warnings.extend(more);
+    Ok((doc, warnings))
+}
+
+/// The note about fonts the file carries (Sketch 7x and newer can embed them, as `fontReferences`
+/// with `fontData`): FigCraft doesn't use fonts from inside documents, so their text shows in
+/// installed fonts. To do once `.figcraft` documents can carry fonts (loading them only for the
+/// session would lose them on the first save and reopen).
+fn embedded_fonts(document: &Value) -> Option<String> {
+    let refs = document.get("fontReferences").and_then(Value::as_array)?;
+    // A reference without font data only names a font the document uses.
+    let families: BTreeSet<String> = refs
+        .iter()
+        .filter(|r| r.get("fontData").is_some())
+        .filter_map(|r| r.get("fontFamilyName").and_then(Value::as_str))
+        .map(|f| f.chars().take(64).collect())
+        .take(20)
+        .collect();
+    if families.is_empty() {
+        return None;
+    }
+    let list: Vec<&str> = families.iter().map(String::as_str).collect();
+    Some(format!("the file has embedded fonts FigCraft doesn't use ({}); install them to see the text as designed", list.join(", ")))
+}
+
+fn corrupt(msg: impl Into<String>) -> FormatError {
+    FormatError::Corrupt(format!("Sketch file: {}", msg.into()))
+}
+
+/// The parts of a `.sketch` archive: the document, the pages in document order and the images.
+pub(crate) struct Archive<'b> {
+    pub document: Value,
+    /// `meta.json`'s format version (0 when missing).
+    pub version: u64,
+    /// `(id, page JSON)` in the document's order.
+    pub pages: Vec<(String, Value)>,
+    /// Problems met while reading (pages skipped).
+    pub warnings: Vec<String>,
+    zip: zip::ZipArchive<std::io::Cursor<&'b [u8]>>,
+}
+
+impl<'b> Archive<'b> {
+    fn open(bytes: &'b [u8], max_member: u64) -> Result<Self, FormatError> {
+        let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).map_err(|e| corrupt(e.to_string()))?;
+        let mut total = 0u64;
+        let meta = json_member(&mut z, "meta.json", MAX_JSON_MEMBER, &mut total)?;
+        if !meta.is_object() {
+            return Err(corrupt("meta.json is not an object"));
+        }
+        if app_major(&meta).is_some_and(|v| v < MIN_SKETCH) {
+            return Err(FormatError::Io(TOO_OLD.into()));
+        }
+        let mut warnings = Vec::new();
+        if meta.get("version").and_then(Value::as_u64).is_some_and(|v| v > NEWEST_TESTED_VERSION) {
+            warnings.push("the file was saved by a newer Sketch than the import was checked with; some layers may differ".to_string());
+        }
+        // A document.json that can't be read (nested too deep, damaged) loses its shared styles and
+        // library copies, not the pages: they are then taken in archive order.
+        let document = match json_member(&mut z, "document.json", MAX_JSON_MEMBER, &mut total) {
+            Ok(d) if d.is_object() => d,
+            other => {
+                let why = other.err().map_or_else(|| "not an object".to_string(), |e| e.to_string());
+                warnings.push(format!(
+                    "the document's shared styles and library symbols were skipped: {}",
+                    why.trim_start_matches("not a valid FigCraft file: ")
+                ));
+                let pages: Vec<Value> = z
+                    .file_names()
+                    .filter_map(|n| n.strip_prefix("pages/")?.strip_suffix(".json"))
+                    .map(|id| json!({"_ref": format!("pages/{id}")}))
+                    .collect();
+                json!({"pages": pages})
+            }
+        };
+        let refs = document.get("pages").and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default();
+        let mut pages = Vec::new();
+        for r in refs.iter().take(MAX_PAGES) {
+            let Some(id) = r.get("_ref").and_then(Value::as_str).and_then(|s| s.strip_prefix("pages/")).filter(|id| valid_id(id)) else {
+                warnings.push("pages the document lists without a valid reference were skipped".into());
+                continue;
+            };
+            match json_member(&mut z, &format!("pages/{id}.json"), max_member, &mut total) {
+                Ok(page) if page.is_object() => pages.push((id.to_string(), page)),
+                Ok(_) => warnings.push("pages that aren't JSON objects were skipped".into()),
+                Err(e) => warnings.push(format!("a page was skipped: {}", e.to_string().trim_start_matches("not a valid FigCraft file: "))),
+            }
+        }
+        if refs.len() > MAX_PAGES {
+            warnings.push(format!("the file has more than {MAX_PAGES} pages; the rest were skipped"));
+        }
+        let version = meta.get("version").and_then(Value::as_u64).unwrap_or(0);
+        Ok(Archive { document, version, pages, warnings, zip: z })
+    }
+
+    /// The bytes of the image a layer references (`images/<name>`).
+    pub(crate) fn image(&self, r: &str) -> Option<Vec<u8>> {
+        let name = r.strip_prefix("images/").unwrap_or(r);
+        if !valid_id(name.split('.').next().unwrap_or("")) || name.split('.').count() > 2 {
+            return None;
+        }
+        // A clone shares the parsed directory and the bytes; the resolver only has shared access.
+        let mut z = self.zip.clone();
+        crate::read_member(&mut z, &format!("images/{name}"), MAX_IMAGE).ok()
+    }
+}
+
+/// JSON member `name`, refused before unpacking when it would be larger than `limit`, than
+/// [`MAX_JSON_RATIO`] times what it takes in the archive (past a floor), or than what is left of
+/// the file's [`MAX_JSON_TOTAL`] (`total`: read so far).
+fn json_member(z: &mut zip::ZipArchive<std::io::Cursor<&[u8]>>, name: &str, limit: u64, total: &mut u64) -> Result<Value, FormatError> {
+    let (size, packed) = {
+        let f = z.by_name(name).map_err(|e| corrupt(format!("{name}: {e}")))?;
+        (f.size(), f.compressed_size())
+    };
+    let allowed = limit.min(packed.saturating_mul(MAX_JSON_RATIO).max(MIN_JSON_ALLOWANCE)).min(MAX_JSON_TOTAL.saturating_sub(*total));
+    if size > allowed {
+        return Err(corrupt(format!("{name} is too large")));
+    }
+    let data = crate::read_member(z, name, allowed)?;
+    *total += data.len() as u64;
+    serde_json::from_slice(&data).map_err(|e| corrupt(format!("{name}: {e}")))
+}
+
+/// The major version of the Sketch that saved the file (`meta.json` `appVersion`, "50.2" → 50).
+fn app_major(meta: &Value) -> Option<u32> {
+    meta.get("appVersion").and_then(Value::as_str)?.split('.').next()?.trim().parse().ok()
+}
+
+/// Ids name archive members: letters, digits, `-` and `_` only, never a path.
+fn valid_id(id: &str) -> bool {
+    !id.is_empty() && id.len() <= 128 && id.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-' || b == b'_')
+}
diff --git a/crates/format/src/sketch/fixture.rs b/crates/format/src/sketch/fixture.rs
new file mode 100644
index 00000000..19d23eca
--- /dev/null
+++ b/crates/format/src/sketch/fixture.rs
@@ -0,0 +1,206 @@
+//! Synthetic `.sketch` files for the tests: the JSON of a document, its pages and `meta.json`,
+//! zipped the way Sketch writes them. Layers are built with small helpers and adjusted with
+//! [`with`].
+
+use std::io::Write;
+
+use serde_json::{Value, json};
+
+/// A `.sketch` zip: `document.json`, `meta.json` saying `app_version` / `version`, one
+/// `pages/<id>.json` per page and any other `files` (images, fonts).
+pub(crate) fn sketch_zip(app_version: &str, version: u64, document: Value, pages: &[Value], files: &[(&str, &[u8])]) -> Vec<u8> {
+    let meta = json!({
+        "app": "com.bohemiancoding.sketch3",
+        "appVersion": app_version,
+        "version": version,
+        "compatibilityVersion": 99,
+        "pagesAndArtboards": {},
+    });
+    raw_zip(&document, &meta, pages, files)
+}
+
+/// A `.sketch` zip with the given `meta.json` as is.
+pub(crate) fn raw_zip(document: &Value, meta: &Value, pages: &[Value], files: &[(&str, &[u8])]) -> Vec<u8> {
+    let mut out = Vec::new();
+    {
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(&mut out));
+        let opts = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);
+        z.start_file("document.json", opts).unwrap();
+        z.write_all(document.to_string().as_bytes()).unwrap();
+        z.start_file("meta.json", opts).unwrap();
+        z.write_all(meta.to_string().as_bytes()).unwrap();
+        for p in pages {
+            let id = p["do_objectID"].as_str().unwrap_or("page");
+            z.start_file(format!("pages/{id}.json"), opts).unwrap();
+            z.write_all(p.to_string().as_bytes()).unwrap();
+        }
+        for (name, bytes) in files {
+            z.start_file(*name, opts).unwrap();
+            z.write_all(bytes).unwrap();
+        }
+        z.finish().unwrap();
+    }
+    out
+}
+
+/// `document.json` listing `pages` (ids) in order, with empty shared-style containers.
+pub(crate) fn document(pages: &[&str]) -> Value {
+    json!({
+        "_class": "document",
+        "do_objectID": "DOC",
+        "colorSpace": 1,
+        "currentPageIndex": 0,
+        "foreignLayerStyles": [],
+        "foreignSymbols": [],
+        "foreignTextStyles": [],
+        "layerStyles": {"_class": "sharedStyleContainer", "objects": []},
+        "layerTextStyles": {"_class": "sharedTextStyleContainer", "objects": []},
+        "layerSymbols": {"_class": "symbolContainer", "objects": []},
+        "pages": pages.iter().map(|p| json!({
+            "_class": "MSJSONFileReference",
+            "_ref_class": "MSImmutablePage",
+            "_ref": format!("pages/{p}"),
+        })).collect::<Vec<_>>(),
+    })
+}
+
+fn frame(x: f64, y: f64, w: f64, h: f64) -> Value {
+    json!({"_class": "rect", "constrainProportions": false, "x": x, "y": y, "width": w, "height": h})
+}
+
+fn layer(class: &str, id: &str, name: &str, x: f64, y: f64, w: f64, h: f64) -> Value {
+    json!({
+        "_class": class,
+        "do_objectID": id,
+        "name": name,
+        "frame": frame(x, y, w, h),
+        "isVisible": true,
+        "isLocked": false,
+        "rotation": 0,
+        "isFlippedHorizontal": false,
+        "isFlippedVertical": false,
+        "resizingConstraint": 63,
+        "style": {"_class": "style", "fills": [], "borders": [], "shadows": [], "innerShadows": []},
+    })
+}
+
+pub(crate) fn page(id: &str, name: &str, layers: Vec<Value>) -> Value {
+    with(layer("page", id, name, 0.0, 0.0, 0.0, 0.0), "layers", Value::Array(layers))
+}
+
+pub(crate) fn artboard(id: &str, name: &str, x: f64, y: f64, w: f64, h: f64, layers: Vec<Value>) -> Value {
+    with(layer("artboard", id, name, x, y, w, h), "layers", Value::Array(layers))
+}
+
+pub(crate) fn group(id: &str, x: f64, y: f64, w: f64, h: f64, layers: Vec<Value>) -> Value {
+    with(layer("group", id, id, x, y, w, h), "layers", Value::Array(layers))
+}
+
+/// A rectangle with its four generated corner points.
+pub(crate) fn rect(id: &str, x: f64, y: f64, w: f64, h: f64) -> Value {
+    let pts = [(0.0, 0.0), (1.0, 0.0), (1.0, 1.0), (0.0, 1.0)].map(|(px, py)| point(px, py));
+    let mut l = with(layer("rectangle", id, id, x, y, w, h), "points", Value::Array(pts.to_vec()));
+    l["isClosed"] = json!(true);
+    l["fixedRadius"] = json!(0);
+    l
+}
+
+/// A straight curve point at `(x, y)` in 0–1 of the layer's frame.
+pub(crate) fn point(x: f64, y: f64) -> Value {
+    let p = format!("{{{x}, {y}}}");
+    json!({"_class": "curvePoint", "cornerRadius": 0, "curveFrom": p, "curveTo": p, "curveMode": 1, "hasCurveFrom": false, "hasCurveTo": false, "point": p})
+}
+
+/// `l` with `key` set to `value`.
+pub(crate) fn with(mut l: Value, key: &str, value: Value) -> Value {
+    if let Some(m) = l.as_object_mut() {
+        m.insert(key.to_string(), value);
+    }
+    l
+}
+
+/// A `shapePath` through `points` (`(x, y)` in 0–1 of its frame), straight segments.
+pub(crate) fn shape_path(id: &str, x: f64, y: f64, w: f64, h: f64, points: &[(f64, f64)], closed: bool) -> Value {
+    let pts: Vec<Value> = points.iter().map(|(px, py)| point(*px, *py)).collect();
+    let mut l = with(layer("shapePath", id, id, x, y, w, h), "points", Value::Array(pts));
+    l["isClosed"] = json!(closed);
+    l["booleanOperation"] = json!(-1);
+    l
+}
+
+/// A `shapeGroup` (Sketch 51 and older wrap every shape in one) holding `layers`.
+pub(crate) fn shape_group(id: &str, x: f64, y: f64, w: f64, h: f64, layers: Vec<Value>) -> Value {
+    with(layer("shapeGroup", id, id, x, y, w, h), "layers", Value::Array(layers))
+}
+
+/// A Sketch colour.
+pub(crate) fn color(r: f64, g: f64, b: f64, a: f64) -> Value {
+    json!({"_class": "color", "red": r, "green": g, "blue": b, "alpha": a})
+}
+
+/// An enabled solid fill.
+pub(crate) fn solid_fill(r: f64, g: f64, b: f64, a: f64) -> Value {
+    json!({"_class": "fill", "isEnabled": true, "fillType": 0, "color": color(r, g, b, a),
+           "contextSettings": {"_class": "graphicsContextSettings", "blendMode": 0, "opacity": 1}})
+}
+
+/// `l` with `style.<key>` set to `value`.
+pub(crate) fn styled(mut l: Value, key: &str, value: Value) -> Value {
+    l["style"][key] = value;
+    l
+}
+
+/// A text layer showing `string`, one run per `(location, length, font, size, rgba)`; locations and
+/// lengths count UTF-16 code units, as Sketch does.
+pub(crate) fn text(id: &str, x: f64, y: f64, w: f64, h: f64, string: &str, runs: &[(usize, usize, &str, f64, [f64; 4])]) -> Value {
+    let attrs: Vec<Value> = runs
+        .iter()
+        .map(|(loc, len, font, size, [r, g, b, a])| {
+            json!({"_class": "stringAttribute", "location": loc, "length": len, "attributes": {
+                "MSAttributedStringFontAttribute": {"_class": "fontDescriptor", "attributes": {"name": font, "size": size}},
+                "MSAttributedStringColorAttribute": color(*r, *g, *b, *a),
+                "paragraphStyle": {"_class": "paragraphStyle", "alignment": 0},
+            }})
+        })
+        .collect();
+    let mut l = layer("text", id, id, x, y, w, h);
+    l["attributedString"] = json!({"_class": "attributedString", "string": string, "attributes": attrs});
+    l["textBehaviour"] = json!(1);
+    l
+}
+
+/// A symbol master `symbol_id` holding `layers`.
+pub(crate) fn master(id: &str, symbol_id: &str, name: &str, w: f64, h: f64, layers: Vec<Value>) -> Value {
+    let mut l = artboard(id, name, 0.0, 0.0, w, h, layers);
+    l["_class"] = json!("symbolMaster");
+    l["symbolID"] = json!(symbol_id);
+    l
+}
+
+/// An instance of symbol `symbol_id` with `overrides` (`overrideName`, value).
+pub(crate) fn instance(id: &str, symbol_id: &str, x: f64, y: f64, w: f64, h: f64, overrides: &[(&str, Value)]) -> Value {
+    let mut l = layer("symbolInstance", id, id, x, y, w, h);
+    l["symbolID"] = json!(symbol_id);
+    l["scale"] = json!(1);
+    l["overrideValues"] =
+        Value::Array(overrides.iter().map(|(name, value)| json!({"_class": "overrideValue", "overrideName": name, "value": value})).collect());
+    l
+}
+
+/// A Sketch 2025+ frame (a group that behaves as a frame) holding `layers`.
+pub(crate) fn frame_group(id: &str, x: f64, y: f64, w: f64, h: f64, layers: Vec<Value>) -> Value {
+    let mut l = group(id, x, y, w, h, layers);
+    l["groupBehavior"] = json!(1);
+    l["clippingBehavior"] = json!(0);
+    l
+}
+
+/// `l` as a stack (Sketch 2025+): `direction` 0 row, 1 column.
+pub(crate) fn stack(mut l: Value, direction: i64, justify: i64, align: i64, gap: f64, padding: [f64; 4]) -> Value {
+    l["groupLayout"] = json!({"_class": "MSImmutableFlexGroupLayout", "flexDirection": direction, "justifyContent": justify, "alignItems": align,
+        "allGuttersGap": gap, "crossAxisGutterGap": 0, "wrappingEnabled": false, "alignContent": 0, "stackingOrder": 0, "bordersAffectLayout": false});
+    for (k, v) in ["leftPadding", "topPadding", "rightPadding", "bottomPadding"].iter().zip(padding) {
+        l[*k] = json!(v);
+    }
+    l
+}
diff --git a/crates/format/src/sketch/frames_tests.rs b/crates/format/src/sketch/frames_tests.rs
new file mode 100644
index 00000000..5a5cefca
--- /dev/null
+++ b/crates/format/src/sketch/frames_tests.rs
@@ -0,0 +1,443 @@
+//! Sketch 2025 and newer: frames and graphics (groups with a `groupBehavior`), stacks, corners in
+//! the style, pins and sizing, border sides.
+
+use figcraft_doc::{Document, LayoutMode, Node, NodeKind};
+use serde_json::{Value, json};
+
+use super::fixture::*;
+use super::import;
+
+fn open(layers: Vec<Value>) -> (Document, Vec<String>) {
+    let z = sketch_zip("2026.3.1", 196, document(&["P"]), &[page("P", "Page", layers)], &[]);
+    import(&z, "f").unwrap()
+}
+
+fn node<'d>(doc: &'d Document, name: &str) -> &'d Node {
+    doc.nodes().find(|n| n.name == name).unwrap_or_else(|| panic!("no {name}"))
+}
+
+#[test]
+fn frames_graphics_and_clipping() {
+    let mut clip_none = frame_group("Loose", 0.0, 0.0, 50.0, 50.0, vec![]);
+    clip_none["clippingBehavior"] = json!(2);
+    let mut graphic = frame_group("Icon", 100.0, 0.0, 24.0, 24.0, vec![]);
+    graphic["groupBehavior"] = json!(2);
+    let mut plain = group("Plain", 200.0, 0.0, 10.0, 10.0, vec![rect("Inside", 0.0, 0.0, 10.0, 10.0)]);
+    plain["groupBehavior"] = json!(0);
+    let mut filled = frame_group("Filled", 300.0, 0.0, 50.0, 50.0, vec![]);
+    filled["style"]["fills"] = json!([solid_fill(1.0, 0.0, 0.0, 1.0)]);
+    let (doc, _) = open(vec![frame_group("Screen", 0.0, 100.0, 390.0, 844.0, vec![]), clip_none, graphic, plain, filled]);
+    assert!(matches!(node(&doc, "Screen").kind, NodeKind::Frame) && node(&doc, "Screen").clip);
+    assert!(!node(&doc, "Loose").clip);
+    assert!(matches!(node(&doc, "Icon").kind, NodeKind::Frame) && node(&doc, "Icon").clip);
+    assert!(matches!(node(&doc, "Plain").kind, NodeKind::Group));
+    assert_eq!(node(&doc, "Filled").fills.len(), 1);
+    // Frames show what their style says: no white background of their own.
+    assert!(node(&doc, "Screen").fills.is_empty());
+}
+
+#[test]
+fn corners_from_the_style() {
+    let mut a = rect("Each", 0.0, 0.0, 40.0, 40.0);
+    a["style"]["corners"] =
+        json!({"_class": "MSImmutableStyleCorners", "radii": [1, 2, 3, 4], "style": 0, "smoothing": 0.6, "prefersConcentric": false});
+    let mut b = rect("Smooth", 50.0, 0.0, 40.0, 40.0);
+    b["style"]["corners"] = json!({"_class": "MSImmutableStyleCorners", "radii": [12], "style": 1, "smoothing": 0.6, "prefersConcentric": false});
+    let mut f = frame_group("Card", 100.0, 0.0, 100.0, 100.0, vec![]);
+    f["style"]["corners"] = json!({"_class": "MSImmutableStyleCorners", "radii": [16, 16, 16, 16], "style": 0, "smoothing": 0.6});
+    let (doc, _) = open(vec![a, b, f]);
+    assert_eq!(node(&doc, "Each").corners.radii, [1.0, 2.0, 3.0, 4.0]);
+    assert_eq!(node(&doc, "Smooth").corners.radii, [12.0; 4]);
+    assert!((node(&doc, "Smooth").corners.smoothing - 0.6).abs() < 1e-9);
+    assert_eq!(node(&doc, "Each").corners.smoothing, 0.0);
+    assert_eq!(node(&doc, "Card").corners.radii, [16.0; 4]);
+}
+
+#[test]
+fn stacks_become_auto_layout() {
+    // A row: Sketch lists the first item last (on top); justify evenly, centred, gap 8.
+    let a = rect("First", 0.0, 0.0, 20.0, 20.0);
+    let b = with(rect("Second", 0.0, 0.0, 30.0, 10.0), "horizontalSizing", json!(2));
+    let mut free = rect("Free", 0.0, 0.0, 5.0, 5.0);
+    free["flexItem"] = json!({"_class": "MSImmutableFlexItem", "ignoreLayout": true, "alignSelf": 5, "preserveSpaceWhenHidden": false});
+    let mut row = stack(frame_group("Row", 0.0, 0.0, 200.0, 40.0, vec![free, b, a]), 0, 5, 1, 8.0, [4.0, 6.0, 10.0, 2.0]);
+    row["horizontalSizing"] = json!(0);
+    row["verticalSizing"] = json!(1);
+    let col = stack(frame_group("Column", 0.0, 100.0, 100.0, 100.0, vec![rect("One", 0.0, 0.0, 10.0, 10.0)]), 1, 3, 3, 0.0, [0.0; 4]);
+    let (doc, _) = open(vec![row, col]);
+    let r = node(&doc, "Row");
+    let l = r.layout.as_ref().expect("auto layout");
+    assert_eq!(l.mode, LayoutMode::Horizontal);
+    assert_eq!(l.gap, 8.0);
+    assert_eq!(l.padding, [6.0, 10.0, 2.0, 4.0], "top, right, bottom, left");
+    assert!(l.reverse_z, "the first item is on top, as in Sketch");
+    let text = format!("{l:?}");
+    assert!(text.contains("SpaceEvenly") || text.contains("Evenly"), "{text}");
+    let order: Vec<&str> = r.children.iter().map(|c| doc.node(*c).unwrap().name.as_str()).collect();
+    assert_eq!(order, ["First", "Second", "Free"], "flow order is the reverse of Sketch's list");
+    assert!(node(&doc, "Free").child_layout.absolute);
+    assert_eq!(node(&doc, "Second").child_layout.sizing_h, figcraft_doc::Sizing::Fill);
+    assert_eq!(r.child_layout.sizing_v, figcraft_doc::Sizing::Hug);
+    let c = node(&doc, "Column").layout.as_ref().unwrap();
+    assert_eq!(c.mode, LayoutMode::Vertical);
+    assert!(format!("{c:?}").contains("SpaceBetween"), "{c:?}");
+}
+
+/// A frame resized as an instance's layer follows its pins and sizing (Sketch 2025+ keep them in
+/// `horizontalPins`/`horizontalSizing`, `resizingConstraint` stays 63).
+#[test]
+fn pins_and_sizing_resize_instances() {
+    let mut r = rect("R", 20.0, 30.0, 100.0, 40.0);
+    r["horizontalPins"] = json!(1); // left
+    r["horizontalSizing"] = json!(0); // fixed
+    r["verticalPins"] = json!(0);
+    r["verticalSizing"] = json!(3); // relative
+    let mut m = master("M", "S", "Box", 200.0, 100.0, vec![r]);
+    m["groupBehavior"] = json!(1);
+    let (doc, _) = {
+        let z = sketch_zip(
+            "2026.3.1",
+            196,
+            document(&["P", "S"]),
+            &[page("P", "Page", vec![instance("I", "S", 0.0, 0.0, 320.0, 60.0, &[])]), page("S", "Symbols", vec![m])],
+            &[],
+        );
+        import(&z, "f").unwrap()
+    };
+    let inst = doc.nodes().find(|n| n.name == "I").unwrap();
+    let r = doc.subtree(inst.id).into_iter().filter_map(|i| doc.node(i)).find(|n| n.name == "R").unwrap();
+    let b = doc.world_bounds(r.id).unwrap();
+    assert!((b.x0 - 20.0).abs() < 0.5 && (b.width() - 100.0).abs() < 0.5, "{b:?}");
+    assert!((b.y0 - 18.0).abs() < 0.5 && (b.height() - 24.0).abs() < 0.5, "{b:?}");
+}
+
+#[test]
+fn graphics_scale_their_layers() {
+    let mut r = rect("R", 20.0, 30.0, 100.0, 40.0);
+    r["horizontalPins"] = json!(5);
+    r["horizontalSizing"] = json!(0);
+    let mut m = master("M", "S", "Glyph", 200.0, 100.0, vec![r]);
+    m["groupBehavior"] = json!(2);
+    let z = sketch_zip(
+        "2026.3.1",
+        196,
+        document(&["P", "S"]),
+        &[page("P", "Page", vec![instance("I", "S", 0.0, 0.0, 400.0, 200.0, &[])]), page("S", "Symbols", vec![m])],
+        &[],
+    );
+    let (doc, _) = import(&z, "f").unwrap();
+    let inst = doc.nodes().find(|n| n.name == "I").unwrap();
+    let r = doc.subtree(inst.id).into_iter().filter_map(|i| doc.node(i)).find(|n| n.name == "R").unwrap();
+    let b = doc.world_bounds(r.id).unwrap();
+    assert!((b.x0 - 40.0).abs() < 0.5 && (b.width() - 200.0).abs() < 0.5, "{b:?}");
+}
+
+#[test]
+fn border_sides() {
+    let r = styled(
+        rect("Sided", 0.0, 0.0, 40.0, 40.0),
+        "borders",
+        json!([{"_class": "border", "isEnabled": true, "fillType": 0, "color": color(0.0, 0.0, 0.0, 1.0), "position": 1, "thickness": 8,
+            "sides": {"_class": "MSImmutableStyleBorderSides", "leftInset": 7, "rightInset": 7, "topInset": 0, "bottomInset": 5}}]),
+    );
+    // A side is as thick as the border less its inset.
+    let (doc, _) = open(vec![r]);
+    assert_eq!(node(&doc, "Sided").stroke.sides, Some([8.0, 1.0, 3.0, 1.0]));
+}
+
+#[test]
+fn swatches_bind_solid_fills_only() {
+    let mut d = document(&["P"]);
+    d["sharedSwatches"] = json!({"_class": "swatchContainer", "objects": [{"_class": "swatch", "do_objectID": "SW", "name": "Brand", "value": color(0.0, 0.0, 1.0, 1.0)}]});
+    let mut g = json!({"_class": "fill", "isEnabled": true, "fillType": 1, "color": color(0.0, 0.0, 1.0, 1.0),
+        "gradient": {"_class": "gradient", "gradientType": 0, "from": "{0.5, 0}", "to": "{0.5, 1}", "stops": [
+            {"_class": "gradientStop", "position": 0, "color": color(1.0, 0.0, 0.0, 1.0)}, {"_class": "gradientStop", "position": 1, "color": color(0.0, 0.0, 1.0, 1.0)}]}});
+    g["color"]["swatchID"] = json!("SW");
+    let z = sketch_zip("2026.3.1", 196, d, &[page("P", "Page", vec![styled(rect("G", 0.0, 0.0, 10.0, 10.0), "fills", json!([g]))])], &[]);
+    let (_, warnings) = import(&z, "f").unwrap();
+    assert!(!warnings.iter().any(|w| w.contains("not supported")), "{warnings:?}");
+}
+
+/// Sketch 2025+ masters keep their background, corners and stack in their style and layout, and
+/// their instances show the same.
+#[test]
+fn masters_and_instances_keep_frame_styles_and_stacks() {
+    let mut m = master("M", "S", "Button", 120.0, 44.0, vec![rect("Icon", 0.0, 0.0, 20.0, 20.0), rect("Label", 0.0, 0.0, 60.0, 20.0)]);
+    m["groupBehavior"] = json!(1);
+    m["clippingBehavior"] = json!(2);
+    m["style"]["fills"] = json!([solid_fill(0.0, 0.0, 1.0, 1.0)]);
+    m["style"]["corners"] = json!({"_class": "MSImmutableStyleCorners", "radii": [8], "style": 1, "smoothing": 0.6});
+    let m = stack(m, 0, 1, 1, 10.0, [16.0, 12.0, 16.0, 12.0]);
+    let z = sketch_zip(
+        "2026.3.1",
+        196,
+        document(&["P", "S"]),
+        &[page("P", "Page", vec![instance("I", "S", 0.0, 0.0, 120.0, 44.0, &[])]), page("S", "Symbols", vec![m])],
+        &[],
+    );
+    let (doc, _) = import(&z, "f").unwrap();
+    let main = doc.nodes().find(|n| matches!(n.kind, NodeKind::Component { .. })).unwrap();
+    let inst = doc.nodes().find(|n| matches!(n.kind, NodeKind::Instance { .. })).unwrap();
+    for n in [main, inst] {
+        assert_eq!(n.fills.len(), 1, "{}", n.name);
+        assert_eq!(n.corners.radii, [8.0; 4], "{}", n.name);
+        assert!(n.layout.is_some(), "{}", n.name);
+        assert!(!n.clip, "{}", n.name);
+        let order: Vec<&str> = n.children.iter().map(|c| doc.node(*c).unwrap().name.as_str()).collect();
+        assert_eq!(order, ["Label", "Icon"], "{}", n.name);
+    }
+}
+
+fn solid_of(n: &Node) -> Option<[f32; 3]> {
+    n.fills.iter().find_map(|p| match &p.kind {
+        figcraft_doc::color::PaintKind::Solid { color } => Some([color.r, color.g, color.b]),
+        _ => None,
+    })
+}
+
+fn open_symbols(layers: Vec<Value>, masters: Vec<Value>) -> Document {
+    let z = sketch_zip("2026.3.1", 196, document(&["P", "S"]), &[page("P", "Page", layers), page("S", "Symbols", masters)], &[]);
+    import(&z, "f").unwrap().0
+}
+
+fn in_instance<'d>(doc: &'d Document, inst: &str, name: &str) -> &'d Node {
+    let i = doc.nodes().find(|n| n.name == inst && matches!(n.kind, NodeKind::Instance { .. })).unwrap_or_else(|| panic!("no {inst}"));
+    doc.subtree(i.id).into_iter().filter_map(|id| doc.node(id)).find(|n| n.name == name).unwrap_or_else(|| panic!("no {name} in {inst}"))
+}
+
+/// A graphic's fill tints its layers (it's no background); an instance's fill, or a `fillColor`
+/// override, tints the instance's layers.
+#[test]
+fn fills_of_graphics_and_instances_are_tints() {
+    let glyph = styled(rect("Glyph", 0.0, 0.0, 24.0, 24.0), "fills", json!([solid_fill(0.0, 0.0, 0.0, 1.0)]));
+    let mut icon = master("MI", "SI", "Icon", 24.0, 24.0, vec![glyph]);
+    icon["groupBehavior"] = json!(2);
+    let mut tint = solid_fill(1.0, 0.0, 0.0, 1.0);
+    tint["layeringType"] = json!(1);
+    icon["style"]["fills"] = json!([tint]);
+    let nested = instance("N", "SI", 0.0, 0.0, 24.0, 24.0, &[]);
+    let mut button = master("MB", "SB", "Button", 100.0, 40.0, vec![nested]);
+    button["groupBehavior"] = json!(1);
+    let own = instance("Own", "SI", 0.0, 0.0, 24.0, 24.0, &[("Own_fillColor", color(0.0, 0.0, 1.0, 1.0))]);
+    let via = instance("Via", "SB", 0.0, 100.0, 100.0, 40.0, &[("N_fillColor", color(0.0, 1.0, 0.0, 1.0))]);
+    let doc = open_symbols(vec![own, via], vec![icon, button]);
+    let main = doc.nodes().find(|n| n.name == "Icon" && matches!(n.kind, NodeKind::Component { .. })).unwrap();
+    assert!(main.fills.is_empty(), "a graphic's fill isn't its background");
+    let in_main = doc.subtree(main.id).into_iter().filter_map(|i| doc.node(i)).find(|n| n.name == "Glyph").unwrap();
+    assert_eq!(solid_of(in_main), Some([1.0, 0.0, 0.0]));
+    assert_eq!(solid_of(in_instance(&doc, "Own", "Glyph")), Some([0.0, 0.0, 1.0]));
+    assert!(doc.nodes().find(|n| n.name == "Own").unwrap().fills.is_empty());
+    assert_eq!(solid_of(in_instance(&doc, "Via", "Glyph")), Some([0.0, 1.0, 0.0]));
+}
+
+#[test]
+fn text_color_overrides() {
+    let label = text("Label", 0.0, 0.0, 80.0, 20.0, "Go", &[(0, 2, "Helvetica", 14.0, [0.0, 0.0, 0.0, 1.0])]);
+    let m = master("M", "S", "Button", 100.0, 40.0, vec![label]);
+    let doc = open_symbols(vec![instance("I", "S", 0.0, 0.0, 100.0, 40.0, &[("Label_textColor", color(1.0, 0.0, 0.0, 1.0))])], vec![m]);
+    let n = in_instance(&doc, "I", "Label");
+    let red = |p: &figcraft_doc::color::Paint| matches!(p.kind, figcraft_doc::color::PaintKind::Solid { color } if color.r == 1.0 && color.g == 0.0);
+    let NodeKind::Text(td) = &n.kind else { panic!("not text") };
+    assert!(n.fills.iter().any(red) || td.style.fills.as_ref().is_some_and(|f| f.iter().any(red)), "{:?} {:?}", n.fills, td.style.fills);
+}
+
+#[test]
+fn blurs_list() {
+    let blur = |ty: i64, r: f64| json!({"_class": "blur", "isEnabled": true, "type": ty, "radius": r, "center": "{0.5, 0.5}", "motionAngle": 25});
+    let g = styled(rect("Glow", 0.0, 0.0, 40.0, 40.0), "blurs", json!([blur(0, 90.0)]));
+    let m = styled(rect("Comet", 50.0, 0.0, 40.0, 4.0), "blurs", json!([blur(1, 6.0)]));
+    let b = styled(rect("Glass", 100.0, 0.0, 40.0, 40.0), "blurs", json!([blur(3, 10.0)]));
+    let (doc, warnings) = open(vec![g, m, b]);
+    assert!(matches!(node(&doc, "Glow").effects[0].kind, figcraft_doc::EffectKind::LayerBlur(_)));
+    assert!(matches!(node(&doc, "Glass").effects[0].kind, figcraft_doc::EffectKind::BackgroundBlur(_)));
+    assert!(matches!(node(&doc, "Comet").effects[0].kind, figcraft_doc::EffectKind::LayerBlur(_)), "motion blur drawn as a layer blur");
+    assert!(warnings.iter().any(|w| w.contains("motion")), "{warnings:?}");
+}
+
+#[test]
+fn text_sizing_2025() {
+    let mut fixed = text("Fixed", 0.0, 0.0, 100.0, 40.0, "Wraps here", &[(0, 10, "Helvetica", 14.0, [0.0, 0.0, 0.0, 1.0])]);
+    fixed.as_object_mut().unwrap().remove("textBehaviour");
+    fixed["horizontalSizing"] = json!(0);
+    fixed["verticalSizing"] = json!(1);
+    let mut fit = text("Fit", 0.0, 50.0, 100.0, 20.0, "Grows", &[(0, 5, "Helvetica", 14.0, [0.0, 0.0, 0.0, 1.0])]);
+    fit.as_object_mut().unwrap().remove("textBehaviour");
+    fit["horizontalSizing"] = json!(1);
+    fit["verticalSizing"] = json!(1);
+    let (doc, _) = open(vec![fixed, fit]);
+    let auto = |n: &str| match &node(&doc, n).kind {
+        NodeKind::Text(td) => td.auto_resize,
+        _ => panic!("not text"),
+    };
+    assert_eq!(auto("Fixed"), figcraft_doc::TextAutoResize::Height);
+    assert_eq!(auto("Fit"), figcraft_doc::TextAutoResize::WidthAndHeight);
+}
+
+#[test]
+fn stacks_are_no_smart_layout_note() {
+    let (_, warnings) = open(vec![stack(frame_group("Row", 0.0, 0.0, 100.0, 40.0, vec![rect("A", 0.0, 0.0, 10.0, 10.0)]), 0, 0, 0, 0.0, [0.0; 4])]);
+    assert!(!warnings.iter().any(|w| w.contains("Smart Layout")), "{warnings:?}");
+}
+
+/// Sketch 2025+: a fill with `layeringType` 1 is a tint (of a frame or master too), 0 a background.
+#[test]
+fn layering_type_decides_tint_or_background() {
+    let dot = styled(rect("Dot", 0.0, 0.0, 10.0, 10.0), "fills", json!([solid_fill(0.0, 0.0, 0.0, 1.0)]));
+    let mut tint = solid_fill(0.0, 0.0, 1.0, 1.0);
+    tint["layeringType"] = json!(1);
+    let mut bar = master("MB", "SB", "Bar", 100.0, 20.0, vec![dot]);
+    bar["groupBehavior"] = json!(1);
+    bar["style"]["fills"] = json!([tint]);
+    let mut bg = solid_fill(1.0, 0.0, 0.0, 1.0);
+    bg["layeringType"] = json!(0);
+    let mut btn = master("MC", "SC", "Btn", 100.0, 20.0, vec![]);
+    btn["groupBehavior"] = json!(1);
+    btn["style"]["fills"] = json!([bg]);
+    let doc = open_symbols(vec![instance("B", "SB", 0.0, 0.0, 100.0, 20.0, &[]), instance("C", "SC", 0.0, 50.0, 100.0, 20.0, &[])], vec![bar, btn]);
+    let b = doc.nodes().find(|n| n.name == "B").unwrap();
+    assert!(b.fills.is_empty(), "a tint isn't a background");
+    assert_eq!(solid_of(in_instance(&doc, "B", "Dot")), Some([0.0, 0.0, 1.0]));
+    assert_eq!(solid_of(doc.nodes().find(|n| n.name == "C").unwrap()), Some([1.0, 0.0, 0.0]));
+}
+
+#[test]
+fn inner_shadows_in_the_shadow_list() {
+    let mut sh =
+        json!({"_class": "shadow", "isEnabled": true, "blurRadius": 4, "offsetX": 0, "offsetY": 2, "spread": 0, "color": color(0.0, 0.0, 0.0, 0.5)});
+    sh["isInnerShadow"] = json!(true);
+    let (doc, _) = open(vec![styled(rect("Inset", 0.0, 0.0, 40.0, 40.0), "shadows", json!([sh]))]);
+    assert!(matches!(node(&doc, "Inset").effects[0].kind, figcraft_doc::EffectKind::InnerShadow(_)));
+}
+
+#[test]
+fn visibility_overrides() {
+    let m = master("M", "S", "Input", 100.0, 40.0, vec![rect("Label", 0.0, 0.0, 50.0, 10.0)]);
+    let doc = open_symbols(vec![instance("I", "S", 0.0, 0.0, 100.0, 40.0, &[("Label_isVisible", json!("0"))])], vec![m]);
+    assert!(!in_instance(&doc, "I", "Label").visible);
+}
+
+/// An instance that fits its content hugs it even when its master has a fixed size.
+#[test]
+fn instance_sizing_is_its_own() {
+    let m = stack(master("M", "S", "Chip", 60.0, 24.0, vec![rect("A", 0.0, 0.0, 20.0, 20.0)]), 0, 0, 1, 0.0, [0.0; 4]);
+    let mut i = instance("I", "S", 0.0, 0.0, 60.0, 24.0, &[]);
+    i["horizontalSizing"] = json!(1);
+    let doc = open_symbols(vec![i], vec![m]);
+    let n = doc.nodes().find(|n| n.name == "I").unwrap();
+    assert_eq!(n.layout.as_ref().map(|_| format!("{:?}", n.child_layout.sizing_h)), Some("Hug".to_string()));
+}
+
+/// A tint keeps each layer's own opacity.
+#[test]
+fn tints_keep_opacity() {
+    let faint = styled(rect("Faint", 0.0, 0.0, 10.0, 10.0), "fills", json!([solid_fill(0.0, 0.0, 0.0, 0.25)]));
+    let mut g = group("Tinted", 0.0, 0.0, 10.0, 10.0, vec![faint]);
+    let mut tint = solid_fill(1.0, 0.0, 0.0, 1.0);
+    tint["layeringType"] = json!(1);
+    g["groupBehavior"] = json!(0);
+    g["style"] = json!({"_class": "style", "fills": [tint]});
+    let (doc, _) = open(vec![g]);
+    let f = &node(&doc, "Faint").fills[0];
+    let figcraft_doc::color::PaintKind::Solid { color } = &f.kind else { panic!("not solid") };
+    assert_eq!((color.r, color.g), (1.0, 0.0));
+    assert!((color.a * f.opacity - 0.25).abs() < 1e-3, "{color:?} {}", f.opacity);
+    assert!(node(&doc, "Tinted").fills.is_empty());
+}
+
+#[test]
+fn glass_and_progressive_blurs() {
+    let glass = json!({"_class": "blur", "isEnabled": true, "type": 4, "radius": 10, "distortion": 0.6, "depth": 0.7, "center": "{0.5, 0.5}"});
+    let prog = json!({"_class": "blur", "isEnabled": true, "type": 3, "radius": 24, "isProgressive": true, "center": "{0.5, 0.5}",
+        "gradient": {"_class": "gradient", "gradientType": 0, "from": "{0.5, 0}", "to": "{0.5, 1}", "stops": [
+            {"_class": "gradientStop", "position": 0, "color": color(0.0, 0.0, 0.0, 1.0)}, {"_class": "gradientStop", "position": 1, "color": color(0.0, 0.0, 0.0, 0.0)}]}});
+    let (doc, warnings) = open(vec![
+        styled(rect("Glass", 0.0, 0.0, 40.0, 40.0), "blurs", json!([glass])),
+        styled(rect("Prog", 50.0, 0.0, 40.0, 40.0), "blurs", json!([prog])),
+    ]);
+    assert!(matches!(node(&doc, "Glass").effects[0].kind, figcraft_doc::EffectKind::Glass(_)), "{warnings:?}");
+    let figcraft_doc::EffectKind::BackgroundBlur(b) = &node(&doc, "Prog").effects[0].kind else { panic!("not a background blur") };
+    assert_eq!(b.blur_type, figcraft_doc::BlurType::Progressive);
+    assert_eq!((b.start_radius, b.radius), (24.0, 0.0));
+}
+
+/// Angled (2), inside-square (3) and inside-arc (4) corners make the rectangle a path of that outline.
+#[test]
+fn cut_corners_become_paths() {
+    let cut = |name: &str, style: i64| {
+        let mut r = rect(name, 0.0, 0.0, 100.0, 80.0);
+        r["style"]["corners"] = json!({"_class": "MSImmutableStyleCorners", "radii": [10], "style": style, "smoothing": 0.6});
+        r
+    };
+    let (doc, _) = open(vec![cut("Angled", 2), cut("Square", 3), cut("Arc", 4)]);
+    let net = |n: &str| match &node(&doc, n).kind {
+        NodeKind::Vector { network } => network.clone(),
+        other => panic!("{n}: {other:?}"),
+    };
+    let a = net("Angled");
+    assert_eq!(a.vertices.len(), 8);
+    assert!(a.vertices.iter().any(|v| (v.x, v.y) == (0.0, 10.0)) && a.vertices.iter().any(|v| (v.x, v.y) == (10.0, 0.0)));
+    let s = net("Square");
+    assert_eq!(s.vertices.len(), 12);
+    assert!(s.vertices.iter().any(|v| (v.x, v.y) == (10.0, 10.0)) && s.vertices.iter().any(|v| (v.x, v.y) == (90.0, 70.0)));
+    let arc = net("Arc");
+    assert_eq!(arc.vertices.len(), 8);
+    assert!(arc.segments.iter().any(|g| g.ta != (0.0, 0.0)), "the corners are arcs");
+}
+
+/// Tints and colour overrides that aren't colours, and fills that aren't objects, are junk: left
+/// alone, never a panic.
+#[test]
+fn junk_tints_and_colour_overrides() {
+    let child = styled(rect("Child", 0.0, 0.0, 10.0, 10.0), "fills", json!([solid_fill(0.0, 0.0, 0.0, 1.0)]));
+    let mut g = group("G", 0.0, 0.0, 10.0, 10.0, vec![child.clone()]);
+    g["style"] = json!({"_class": "style", "fills": [{"_class": "fill", "isEnabled": true, "fillType": 0, "layeringType": 1, "color": 5}]});
+    let (_, _) = open(vec![g]);
+    let mut odd = rect("L", 0.0, 0.0, 10.0, 10.0);
+    odd["style"]["fills"] = json!([true]);
+    let m = master("M", "S", "Odd", 10.0, 10.0, vec![odd]);
+    let _ = open_symbols(vec![instance("I", "S", 0.0, 0.0, 10.0, 10.0, &[("L_fillColor", color(1.0, 0.0, 0.0, 1.0))])], vec![m]);
+}
+
+/// Tinting copies a group's layers: the copies count against the import's work budget, so nested
+/// tinted groups of large layers can't make the import copy without end; past the budget, tints
+/// are skipped with a note.
+#[test]
+fn nested_tints_are_budgeted() {
+    // Text that doesn't compress, so the page stays within the archive's size checks.
+    let mut seed = 0x2545_f491_u32;
+    let big: String = (0..1_000_000)
+        .map(|_| {
+            seed ^= seed << 13;
+            seed ^= seed >> 17;
+            seed ^= seed << 5;
+            char::from(b'a' + (seed % 26) as u8)
+        })
+        .collect();
+    let mut l = styled(rect("Leaf", 0.0, 0.0, 10.0, 10.0), "fills", json!([solid_fill(0.0, 0.0, 0.0, 1.0)]));
+    for i in 0..35 {
+        let mut pad = rect(&big, 0.0, 0.0, 1.0, 1.0);
+        pad["do_objectID"] = json!(format!("pad{i}"));
+        let mut g = group(&format!("G{i}"), 0.0, 0.0, 10.0, 10.0, vec![l, pad]);
+        let mut t = solid_fill(1.0, 0.0, 0.0, 1.0);
+        t["layeringType"] = json!(1);
+        g["style"] = json!({"_class": "style", "fills": [t]});
+        l = g;
+    }
+    let (_, warnings) = open(vec![l]);
+    assert!(warnings.iter().any(|w| w.contains("tint")), "{warnings:?}");
+}
+
+/// A faded layer in a stack keeps its place in the stack: the group the fade makes takes the
+/// layer's id, and with it its sizing.
+#[test]
+fn faded_stack_items_keep_their_sizing() {
+    let fade = json!({"_class": "graphicsContextSettings", "opacity": 1, "isProgressive": true,
+        "gradient": {"_class": "gradient", "gradientType": 0, "from": "{0.5, 0}", "to": "{0.5, 1}", "stops": [
+            {"_class": "gradientStop", "position": 0, "color": color(0.0, 0.0, 0.0, 1.0)}, {"_class": "gradientStop", "position": 1, "color": color(0.0, 0.0, 0.0, 0.0)}]}});
+    let mut item = styled(rect("Item", 0.0, 0.0, 50.0, 20.0), "contextSettings", fade);
+    item["horizontalSizing"] = json!(2);
+    let (doc, _) = open(vec![stack(frame_group("Row", 0.0, 0.0, 200.0, 20.0, vec![item]), 0, 0, 0, 0.0, [0.0; 4])]);
+    let row = node(&doc, "Row");
+    let wrap = doc.node(row.children[0]).unwrap();
+    assert_eq!(format!("{:?}", wrap.child_layout.sizing_h), "Fill", "{:?}", wrap.child_layout);
+}
diff --git a/crates/format/src/sketch/path.rs b/crates/format/src/sketch/path.rs
new file mode 100644
index 00000000..24ceca15
--- /dev/null
+++ b/crates/format/src/sketch/path.rs
@@ -0,0 +1,387 @@
+//! Sketch curve points → vector networks; shape groups → shapes and boolean operations.
+//!
+//! A path's `points` are `curvePoint`s whose `point`, `curveFrom` (the handle leaving the point)
+//! and `curveTo` (the handle arriving at it) are `"{x, y}"` strings in 0–1 of the layer's frame;
+//! values outside that range are allowed. Sketch 51 and older wrap every shape in a `shapeGroup`
+//! that carries the style; its children combine left to right, each with its own
+//! `booleanOperation` (0 union, 1 subtract, 2 intersect, 3 difference). Children with −1 (none)
+//! don't combine: they join the path before them into one compound path, filled by the winding
+//! rule (`windingRule` on the layer, 1 even-odd: inner paths are holes). Sketch fills an open path
+//! as if it were closed.
+
+use figcraft_doc::geom::{Affine, polygon_points, star_points};
+use figcraft_doc::{Region, Segment, VectorNetwork, Vertex, WindingRule};
+use serde_json::{Map as JsonMap, Value, json};
+
+use super::tree::{Cx, base, layer, layers, local, size};
+
+/// Farthest a point or handle may be from its layer (the REST importer's own range).
+const MAX_COORD: f64 = 1e7;
+/// Most points read from one path.
+const MAX_POINTS: usize = 100_000;
+
+/// What a path layer becomes.
+pub(crate) enum Shape {
+    Vector(VectorNetwork),
+    Star { count: u32, ratio: f64 },
+    Polygon { count: u32 },
+}
+
+/// `"{x, y}"` → `(x, y)`, both finite.
+pub(crate) fn parse_point(s: &str) -> Option<(f64, f64)> {
+    let inner = s.trim().strip_prefix('{')?.strip_suffix('}')?;
+    let (x, y) = inner.split_once(',')?;
+    let n = |t: &str| t.trim().parse::<f64>().ok().filter(|v| v.is_finite());
+    Some((n(x)?, n(y)?))
+}
+
+/// A layer's winding rule: on the layer (Sketch 51 and older), else in its style.
+pub(crate) fn winding(l: &Value) -> WindingRule {
+    let rule = l.get("windingRule").or_else(|| l.get("style").and_then(|s| s.get("windingRule")));
+    match rule.and_then(Value::as_i64) {
+        Some(1) => WindingRule::EvenOdd,
+        _ => WindingRule::NonZero,
+    }
+}
+
+/// Whether a style shows any fill or border.
+fn shows(style: Option<&Value>, key: &str) -> bool {
+    style
+        .and_then(|s| s.get(key))
+        .and_then(Value::as_array)
+        .is_some_and(|l| l.iter().any(|f| f.get("isEnabled").and_then(Value::as_bool) != Some(false)))
+}
+
+/// The network of a path layer of `w`×`h` (`None` when it has no usable points). `fill_open`: an
+/// open path gets a closing segment and a fill region, as Sketch fills it.
+pub(crate) fn network(cx: &mut Cx, l: &Value, w: f64, h: f64, fill_open: bool) -> Option<VectorNetwork> {
+    let pts = l.get("points").and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default();
+    if pts.len() > MAX_POINTS {
+        cx.warn(format!("paths with more than {MAX_POINTS} points were cut"));
+    }
+    // Far points stay within the importer's coordinate range (a product could overflow).
+    let fit = |v: f64| if v.is_finite() { v.clamp(-MAX_COORD, MAX_COORD) } else { 0.0 };
+    let at = |p: &Value, key: &str| p.get(key).and_then(Value::as_str).and_then(parse_point).map(|(x, y)| (fit(x * w), fit(y * h)));
+    let mut vertices = Vec::new();
+    // Per vertex: its handles (relative to it) when it has them.
+    let mut handles: Vec<((f64, f64), (f64, f64))> = Vec::new();
+    for p in pts.iter().take(MAX_POINTS) {
+        let Some((x, y)) = at(p, "point") else {
+            cx.warn("path points that couldn't be read were skipped");
+            continue;
+        };
+        let curved = p.get("curveMode").and_then(Value::as_i64).is_some_and(|m| m != 1);
+        let has = |flag: &str| p.get(flag).and_then(Value::as_bool).unwrap_or(curved);
+        let handle = |flag: &str, key: &str| if has(flag) { at(p, key).map_or((0.0, 0.0), |(hx, hy)| (hx - x, hy - y)) } else { (0.0, 0.0) };
+        handles.push((handle("hasCurveFrom", "curveFrom"), handle("hasCurveTo", "curveTo")));
+        let mut v = Vertex::new(x, y);
+        v.radius = p.get("cornerRadius").and_then(Value::as_f64).filter(|r| r.is_finite()).map_or(0.0, |r| r.clamp(0.0, 1e6));
+        vertices.push(v);
+    }
+    let n = vertices.len();
+    if n == 0 {
+        return None;
+    }
+    let open = !l.get("isClosed").and_then(Value::as_bool).unwrap_or(false);
+    let closed = n > 1 && (!open || (fill_open && n > 2));
+    let count = if closed { n } else { n - 1 };
+    let segments: Vec<Segment> = (0..count)
+        .map(|i| {
+            let j = (i + 1) % n;
+            // The edge that closes an open path for its fill is straight.
+            let closing = open && j == 0;
+            let ta = if closing { (0.0, 0.0) } else { handles.get(i).map_or((0.0, 0.0), |h| h.0) };
+            let tb = if closing { (0.0, 0.0) } else { handles.get(j).map_or((0.0, 0.0), |h| h.1) };
+            Segment { a: i, b: j, ta, tb }
+        })
+        .collect();
+    let winding = winding(l);
+    let regions = if closed { vec![Region { loops: vec![(0..segments.len()).collect()], winding }] } else { Vec::new() };
+    Some(VectorNetwork { vertices, segments, regions })
+}
+
+/// Rectangle `l` with angled (corner style 2), inside-square (3) or inside-arc (4) corners in its
+/// style (Sketch 2025 and newer) as an edited rectangle whose points draw that outline, the
+/// corners' `radii` (top left, top right, bottom right, bottom left; repeating) being how far
+/// each cut reaches along both edges. `None` for any other layer.
+pub(crate) fn cut_corners(l: &Value) -> Option<Value> {
+    if l.get("_class").and_then(Value::as_str) != Some("rectangle") || l.get("edited").and_then(Value::as_bool) == Some(true) {
+        return None;
+    }
+    let c = l.get("style")?.get("corners")?;
+    let style = c.get("style").and_then(Value::as_i64).filter(|s| (2..=4).contains(s))?;
+    let radii: Vec<f64> = c.get("radii")?.as_array()?.iter().filter_map(Value::as_f64).filter(|r| r.is_finite()).take(4).collect();
+    if radii.iter().all(|r| *r <= 0.0) {
+        return None;
+    }
+    let (w, h) = size(l);
+    if w <= 0.0 || h <= 0.0 {
+        return None;
+    }
+    // Arc handles: a quarter circle's.
+    const K: f64 = 0.552_284_749_8;
+    let fmt = |(x, y): (f64, f64)| format!("{{{}, {}}}", x / w, y / h);
+    let curve = |p: (f64, f64), from: Option<(f64, f64)>, to: Option<(f64, f64)>| {
+        json!({"_class": "curvePoint", "cornerRadius": 0, "point": fmt(p), "curveMode": if from.or(to).is_some() { 4 } else { 1 },
+            "hasCurveFrom": from.is_some(), "hasCurveTo": to.is_some(), "curveFrom": fmt(from.unwrap_or(p)), "curveTo": fmt(to.unwrap_or(p))})
+    };
+    // Corners clockwise from the top left, each with the directions to the edge before and after.
+    let corners = [
+        ((0.0, 0.0), (0.0, 1.0), (1.0, 0.0)),
+        ((w, 0.0), (-1.0, 0.0), (0.0, 1.0)),
+        ((w, h), (0.0, -1.0), (-1.0, 0.0)),
+        ((0.0, h), (1.0, 0.0), (0.0, -1.0)),
+    ];
+    let mut points = Vec::new();
+    for (i, ((cx, cy), (px, py), (nx, ny))) in corners.into_iter().enumerate() {
+        let r = radii.get(i % radii.len()).copied().unwrap_or(0.0).clamp(0.0, w.min(h) / 2.0);
+        if r <= 0.0 {
+            points.push(curve((cx, cy), None, None));
+            continue;
+        }
+        let a = (cx + r * px, cy + r * py);
+        let b = (cx + r * nx, cy + r * ny);
+        match style {
+            2 => points.extend([curve(a, None, None), curve(b, None, None)]),
+            3 => points.extend([curve(a, None, None), curve((cx + r * (px + nx), cy + r * (py + ny)), None, None), curve(b, None, None)]),
+            // A quarter circle about the corner, bulging into the shape.
+            _ => points
+                .extend([curve(a, Some((a.0 + K * r * nx, a.1 + K * r * ny)), None), curve(b, None, Some((b.0 + K * r * px, b.1 + K * r * py)))]),
+        }
+    }
+    let mut out = l.clone();
+    out["edited"] = json!(true);
+    out["isClosed"] = json!(true);
+    out["points"] = Value::Array(points);
+    if let Some(st) = out.get_mut("style").and_then(Value::as_object_mut) {
+        st.remove("corners");
+    }
+    Some(out)
+}
+
+/// A path, star, polygon or triangle layer: a star or polygon while its points are still the
+/// generated ones (same as FigCraft's, within half a percent), else an editable vector.
+pub(crate) fn shape(cx: &mut Cx, l: &Value, w: f64, h: f64) -> Option<Shape> {
+    // Inside a shape group the group's fill decides; a shape of its own, its style.
+    let style = l.get("style");
+    let filled = cx.operand_fill.unwrap_or_else(|| shows(style, "fills"));
+    let open = !l.get("isClosed").and_then(Value::as_bool).unwrap_or(false);
+    if open && filled && (shows(style, "borders") || cx.operand_border) {
+        cx.warn("open paths with both a fill and a border were closed; the border runs along the closing edge too");
+    }
+    let net = network(cx, l, w, h, filled)?;
+    let class = l.get("_class").and_then(Value::as_str).unwrap_or("");
+    let count = l.get("numberOfPoints").and_then(Value::as_u64).filter(|c| (3..=120).contains(c)).and_then(|c| u32::try_from(c).ok());
+    let plain = net.vertices.iter().all(|v| v.radius == 0.0) && net.segments.iter().all(|s| s.ta == (0.0, 0.0) && s.tb == (0.0, 0.0));
+    let matches = |pts: Vec<figcraft_doc::geom::Point>| {
+        let tol = 0.005 * w.max(h) + 1e-6;
+        pts.len() == net.vertices.len() && pts.iter().zip(&net.vertices).all(|(p, v)| (p.x - v.x).abs() <= tol && (p.y - v.y).abs() <= tol)
+    };
+    match (class, count) {
+        ("star", Some(count)) if plain => {
+            let ratio = l.get("radius").and_then(Value::as_f64).filter(|r| r.is_finite() && *r > 0.0).map_or(0.5, |r| r.min(1.0));
+            if matches(star_points(w, h, count, ratio)) {
+                return Some(Shape::Star { count, ratio });
+            }
+        }
+        ("polygon", Some(count)) if plain && matches(polygon_points(w, h, count)) => return Some(Shape::Polygon { count }),
+        _ => {}
+    }
+    Some(Shape::Vector(net))
+}
+
+/// Write `shape` into `node` (its type and geometry).
+pub(crate) fn put_shape(cx: &mut Cx, shape: Shape, node: &mut JsonMap<String, Value>) {
+    match shape {
+        Shape::Vector(net) => {
+            node.insert("type".into(), json!("VECTOR"));
+            node.insert("vectorNetworkRef".into(), json!(cx.networks.len()));
+            cx.networks.push(Some(net));
+        }
+        Shape::Star { count, ratio } => {
+            node.insert("type".into(), json!("STAR"));
+            node.insert("pointCount".into(), json!(count));
+            node.insert("innerRadius".into(), json!(ratio));
+        }
+        Shape::Polygon { count } => {
+            node.insert("type".into(), json!("REGULAR_POLYGON"));
+            node.insert("pointCount".into(), json!(count));
+        }
+    }
+}
+
+/// A `shapeGroup`: its only child carrying the group's place, name and style; its children joined
+/// into one compound path when none of them combines; else boolean operations over runs of
+/// children (a run: a child with an operation and the ones without that follow it), mixed
+/// operations nesting from the left.
+pub(crate) fn shape_group(cx: &mut Cx, l: &Value, parent: Affine, depth: usize, root: bool) -> Option<Value> {
+    let (w, h) = size(l);
+    let world = parent * local(l, w, h);
+    let kids = layers(l);
+    let saved = (cx.operand_fill, cx.operand_border);
+    cx.operand_border = shows(l.get("style"), "borders");
+    let out = if let [only] = kids {
+        cx.operand_fill = Some(shows(l.get("style"), "fills"));
+        single(cx, l, only, parent, world, depth, root)
+    } else {
+        // Operands of a boolean operation (or a compound path) give area: open ones close.
+        cx.operand_fill = Some(true);
+        combined(cx, l, kids, parent, world, (w, h), depth, root)
+    };
+    (cx.operand_fill, cx.operand_border) = saved;
+    out
+}
+
+/// A shape group of one shape: that shape in the group's place, with its name and style.
+fn single(cx: &mut Cx, l: &Value, only: &Value, parent: Affine, world: Affine, depth: usize, root: bool) -> Option<Value> {
+    let mut node = layer(cx, only, world, depth + 1, false)?;
+    let (cw, ch) = size(only);
+    let child_world = world * local(only, cw, ch);
+    let group = base(l, "GROUP", parent, child_world, cw, ch, root);
+    if let Some(m) = node.as_object_mut() {
+        for key in ["id", "name", "relativeTransform", "absoluteBoundingBox", "constraints", "locked"] {
+            match group.get(key) {
+                Some(v) => m.insert(key.into(), v.clone()),
+                None => m.remove(key),
+            };
+        }
+        let visible = group.get("visible").and_then(Value::as_bool).unwrap_or(true) && m.get("visible").and_then(Value::as_bool).unwrap_or(true);
+        m.insert("visible".into(), json!(visible));
+        if l.get("style").is_some() {
+            super::style::clear(m);
+            m.remove("styles");
+            super::tree::styles(cx, l, cw, ch, m);
+            super::tree::extras(cx, l, ch, m);
+        }
+        super::tree::mask(l, m);
+    }
+    Some(node)
+}
+
+/// A shape group of several shapes: one compound path, or boolean operations over runs.
+fn combined(cx: &mut Cx, l: &Value, kids: &[Value], parent: Affine, world: Affine, (w, h): (f64, f64), depth: usize, root: bool) -> Option<Value> {
+    // Runs: a child with an operation starts one, children without (−1) join it.
+    let mut runs: Vec<Vec<&Value>> = Vec::new();
+    for (i, c) in kids.iter().enumerate() {
+        match runs.last_mut() {
+            Some(run) if i > 0 && c.get("booleanOperation").and_then(Value::as_i64).unwrap_or(-1) < 0 => run.push(c),
+            _ => runs.push(vec![c]),
+        }
+    }
+    let winding = winding(l);
+    if let [run] = runs.as_slice()
+        && let Some(net) = compound(cx, run, winding)
+    {
+        // No operations at all: the group is one path.
+        let mut node = base(l, "VECTOR", parent, world, w, h, root);
+        node.insert("vectorNetworkRef".into(), json!(cx.networks.len()));
+        cx.networks.push(Some(net));
+        super::tree::mask(l, &mut node);
+        super::tree::styles(cx, l, w, h, &mut node);
+        super::tree::extras(cx, l, h, &mut node);
+        return Some(Value::Object(node));
+    }
+    let mut chain: Vec<Value> = Vec::new();
+    let mut op = "UNION";
+    for (i, run) in runs.iter().enumerate() {
+        let operands: Vec<Value> = match run.as_slice() {
+            [one] => layer(cx, one, world, depth + 2, false).into_iter().collect(),
+            more => match compound(cx, more, winding) {
+                Some(net) => {
+                    let mut node = base(more.first().copied().unwrap_or(l), "VECTOR", world, world, w, h, false);
+                    node.remove("id");
+                    node.insert("vectorNetworkRef".into(), json!(cx.networks.len()));
+                    cx.networks.push(Some(net));
+                    vec![Value::Object(node)]
+                }
+                // Not all paths: each one an operand of its own.
+                None => more.iter().filter_map(|c| layer(cx, c, world, depth + 2, false)).collect(),
+            },
+        };
+        if operands.is_empty() {
+            continue;
+        }
+        let this = run.first().map_or("UNION", |c| boolean_op(c));
+        if i > 0 && this != op && chain.len() > 1 {
+            let inner = synthetic(l, op, parent, world, w, h, std::mem::take(&mut chain));
+            chain.push(inner);
+        }
+        if i > 0 {
+            op = this;
+        }
+        chain.extend(operands);
+    }
+    if chain.is_empty() {
+        return None;
+    }
+    let mut node = base(l, "BOOLEAN_OPERATION", parent, world, w, h, root);
+    node.insert("booleanOperation".into(), json!(op));
+    node.insert("children".into(), Value::Array(chain));
+    super::tree::mask(l, &mut node);
+    super::tree::styles(cx, l, w, h, &mut node);
+    super::tree::extras(cx, l, h, &mut node);
+    Some(Value::Object(node))
+}
+
+/// The paths `run` as one network in their group's space, filled by `winding`; `None` when one of
+/// them isn't a path (a group, text, …).
+fn compound(cx: &mut Cx, run: &[&Value], winding: WindingRule) -> Option<VectorNetwork> {
+    const PATHS: [&str; 6] = ["shapePath", "rectangle", "oval", "star", "polygon", "triangle"];
+    if run.iter().any(|c| !c.get("_class").and_then(Value::as_str).is_some_and(|k| PATHS.contains(&k))) {
+        return None;
+    }
+    let mut out = VectorNetwork::default();
+    let mut loops = Vec::new();
+    for c in run {
+        let (cw, ch) = size(c);
+        let Some(net) = network(cx, c, cw, ch, true) else { continue };
+        let xf = local(c, cw, ch);
+        let [a, b, cc, d, _, _] = xf.as_coeffs();
+        let lin = |(x, y): (f64, f64)| (a * x + cc * y, b * x + d * y);
+        let (v0, s0) = (out.vertices.len(), out.segments.len());
+        for v in net.vertices {
+            let p = xf * figcraft_doc::geom::Point::new(v.x, v.y);
+            out.vertices.push(Vertex { x: p.x, y: p.y, ..v });
+        }
+        for sg in net.segments {
+            out.segments.push(Segment { a: sg.a + v0, b: sg.b + v0, ta: lin(sg.ta), tb: lin(sg.tb) });
+        }
+        for r in net.regions {
+            loops.extend(r.loops.into_iter().map(|lp| lp.into_iter().map(|i| i + s0).collect::<Vec<_>>()));
+        }
+    }
+    if out.vertices.is_empty() {
+        return None;
+    }
+    if !loops.is_empty() {
+        out.regions.push(Region { loops, winding });
+    }
+    Some(out)
+}
+
+/// A boolean operation the shape group doesn't have as a layer of its own: placed like the group.
+fn synthetic(l: &Value, op: &str, parent: Affine, world: Affine, w: f64, h: f64, children: Vec<Value>) -> Value {
+    let mut node = base(l, "BOOLEAN_OPERATION", parent, world, w, h, false);
+    node.remove("id");
+    let name = match op {
+        "SUBTRACT" => "Subtract",
+        "INTERSECT" => "Intersect",
+        "EXCLUDE" => "Exclude",
+        _ => "Union",
+    };
+    node.insert("name".into(), json!(name));
+    // Placed where the group is: inside it, that's no move at all.
+    node.insert("relativeTransform".into(), json!([[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]]));
+    node.insert("booleanOperation".into(), json!(op));
+    node.insert("children".into(), Value::Array(children));
+    Value::Object(node)
+}
+
+fn boolean_op(l: &Value) -> &'static str {
+    match l.get("booleanOperation").and_then(Value::as_i64) {
+        Some(1) => "SUBTRACT",
+        Some(2) => "INTERSECT",
+        Some(3) => "EXCLUDE",
+        _ => "UNION",
+    }
+}
diff --git a/crates/format/src/sketch/path_tests.rs b/crates/format/src/sketch/path_tests.rs
new file mode 100644
index 00000000..70ad9527
--- /dev/null
+++ b/crates/format/src/sketch/path_tests.rs
@@ -0,0 +1,235 @@
+//! Sketch paths → editable vector networks; shape groups → shapes and boolean operations; stars
+//! and polygons.
+
+use figcraft_doc::{BoolOp, Document, NodeKind};
+use serde_json::{Value, json};
+
+use super::fixture::*;
+use super::import;
+use super::path::parse_point;
+
+fn open(layers: Vec<Value>) -> Document {
+    let z = sketch_zip("50.2", 103, document(&["P"]), &[page("P", "Page", vec![artboard("A", "Board", 0.0, 0.0, 400.0, 400.0, layers)])], &[]);
+    import(&z, "f").unwrap().0
+}
+
+fn node<'d>(doc: &'d Document, name: &str) -> &'d figcraft_doc::Node {
+    doc.nodes().find(|n| n.name == name).unwrap_or_else(|| panic!("no layer named {name}"))
+}
+
+fn with_op(mut l: Value, op: i64) -> Value {
+    l["booleanOperation"] = json!(op);
+    l
+}
+
+#[test]
+fn parse_point_accepts_sketch_strings() {
+    assert_eq!(parse_point("{0.5, 1}"), Some((0.5, 1.0)));
+    assert_eq!(parse_point("{-0.25,2e-1}"), Some((-0.25, 0.2)));
+    assert_eq!(parse_point("{1e400, 0}"), None);
+    assert_eq!(parse_point("garbage"), None);
+    assert_eq!(parse_point("{0.1}"), None);
+    assert_eq!(parse_point(""), None);
+}
+
+#[test]
+fn triangle_path_is_editable_vector() {
+    let tri = shape_path("Tri", 10.0, 10.0, 100.0, 100.0, &[(0.5, 0.0), (1.0, 1.0), (0.0, 1.0)], true);
+    let open_line = shape_path("Line", 10.0, 200.0, 100.0, 50.0, &[(0.0, 0.0), (1.0, 1.0)], false);
+    let doc = open(vec![tri, open_line]);
+    let NodeKind::Vector { network } = &node(&doc, "Tri").kind else { panic!("not a vector") };
+    let pts: Vec<(f64, f64)> = network.vertices.iter().map(|v| (v.x, v.y)).collect();
+    assert_eq!(pts, [(50.0, 0.0), (100.0, 100.0), (0.0, 100.0)]);
+    assert_eq!(network.segments.len(), 3);
+    assert_eq!(network.regions.len(), 1);
+    let NodeKind::Vector { network } = &node(&doc, "Line").kind else { panic!("not a vector") };
+    assert_eq!(network.segments.len(), 1);
+    assert!(network.regions.is_empty());
+}
+
+#[test]
+fn curve_handles_and_corner_radius_are_kept() {
+    let mut p = shape_path("Curve", 0.0, 0.0, 100.0, 100.0, &[(0.0, 0.0), (1.0, 0.0)], false);
+    p["points"][0]["curveMode"] = json!(2);
+    p["points"][0]["hasCurveFrom"] = json!(true);
+    p["points"][0]["curveFrom"] = json!("{0.25, 0.5}");
+    p["points"][1]["curveMode"] = json!(2);
+    p["points"][1]["hasCurveTo"] = json!(true);
+    p["points"][1]["curveTo"] = json!("{0.75, 0.5}");
+    p["points"][1]["cornerRadius"] = json!(6);
+    let doc = open(vec![p]);
+    let NodeKind::Vector { network } = &node(&doc, "Curve").kind else { panic!("not a vector") };
+    let s = network.segments[0];
+    assert_eq!((s.ta, s.tb), ((25.0, 50.0), (-25.0, 50.0)));
+    assert_eq!(network.vertices[1].radius, 6.0);
+}
+
+#[test]
+fn single_child_shape_group_collapses() {
+    let inner = with_op(rect("Inner", 0.0, 0.0, 50.0, 30.0), -1);
+    let doc = open(vec![shape_group("Button", 20.0, 40.0, 50.0, 30.0, vec![inner])]);
+    let b = node(&doc, "Button");
+    assert!(matches!(b.kind, NodeKind::Rectangle));
+    assert!(doc.nodes().all(|n| n.name != "Inner"));
+    let bb = doc.world_bounds(b.id).unwrap();
+    assert_eq!((bb.x0, bb.y0, bb.width(), bb.height()), (20.0, 40.0, 50.0, 30.0));
+}
+
+#[test]
+fn mixed_boolean_ops_chain_left() {
+    let a = with_op(rect("A", 0.0, 0.0, 50.0, 50.0), -1);
+    let b = with_op(rect("B", 10.0, 10.0, 20.0, 20.0), 1);
+    let c = with_op(rect("C", 60.0, 0.0, 20.0, 20.0), 0);
+    let doc = open(vec![shape_group("Combined", 0.0, 0.0, 80.0, 50.0, vec![a, b, c])]);
+    let outer = node(&doc, "Combined");
+    assert!(matches!(outer.kind, NodeKind::BooleanOp { op: BoolOp::Union }));
+    let kids: Vec<&figcraft_doc::Node> = outer.children.iter().map(|c| doc.node(*c).unwrap()).collect();
+    assert_eq!(kids.len(), 2);
+    assert!(matches!(kids[0].kind, NodeKind::BooleanOp { op: BoolOp::Subtract }));
+    assert_eq!(kids[1].name, "C");
+    let inner: Vec<&str> = kids[0].children.iter().map(|c| doc.node(*c).unwrap().name.as_str()).collect();
+    assert_eq!(inner, ["A", "B"]);
+    let bb = doc.world_bounds(node(&doc, "B").id).unwrap();
+    assert_eq!((bb.x0, bb.y0), (10.0, 10.0));
+}
+
+#[test]
+fn intersect_and_difference_ops() {
+    let a = with_op(rect("A", 0.0, 0.0, 50.0, 50.0), -1);
+    let b = with_op(rect("B", 10.0, 10.0, 50.0, 50.0), 2);
+    let doc = open(vec![shape_group("Both", 0.0, 0.0, 60.0, 60.0, vec![a.clone(), b])]);
+    assert!(matches!(node(&doc, "Both").kind, NodeKind::BooleanOp { op: BoolOp::Intersect }));
+    let b = with_op(rect("B", 10.0, 10.0, 50.0, 50.0), 3);
+    let doc = open(vec![shape_group("Either", 0.0, 0.0, 60.0, 60.0, vec![a, b])]);
+    assert!(matches!(node(&doc, "Either").kind, NodeKind::BooleanOp { op: BoolOp::Exclude }));
+}
+
+#[test]
+fn standalone_shapes_52_plus() {
+    let doc = open(vec![shape_path("Free", 5.0, 5.0, 10.0, 10.0, &[(0.0, 0.0), (1.0, 0.0), (1.0, 1.0)], true)]);
+    assert!(matches!(node(&doc, "Free").kind, NodeKind::Vector { .. }));
+}
+
+#[test]
+fn star_and_polygon() {
+    let unit = |pts: Vec<figcraft_doc::geom::Point>, w: f64, h: f64| -> Vec<(f64, f64)> { pts.iter().map(|p| (p.x / w, p.y / h)).collect() };
+    let mut star = shape_path("Star", 0.0, 0.0, 100.0, 80.0, &unit(figcraft_doc::geom::star_points(100.0, 80.0, 5, 0.5), 100.0, 80.0), true);
+    star["_class"] = json!("star");
+    star["numberOfPoints"] = json!(5);
+    star["radius"] = json!(0.5);
+    let mut poly = shape_path("Hexagon", 0.0, 100.0, 60.0, 60.0, &unit(figcraft_doc::geom::polygon_points(60.0, 60.0, 6), 60.0, 60.0), true);
+    poly["_class"] = json!("polygon");
+    poly["numberOfPoints"] = json!(6);
+    let mut edited = star.clone();
+    edited["do_objectID"] = json!("Edited");
+    edited["name"] = json!("Edited");
+    edited["points"][2]["point"] = json!("{0.9, 0.9}");
+    let mut tri = shape_path("Triangle", 200.0, 0.0, 50.0, 50.0, &[(0.5, 0.0), (1.0, 1.0), (0.0, 1.0)], true);
+    tri["_class"] = json!("triangle");
+    let doc = open(vec![star, poly, edited, tri]);
+    assert!(matches!(node(&doc, "Star").kind, NodeKind::Star { count: 5, .. }));
+    if let NodeKind::Star { inner_ratio, .. } = node(&doc, "Star").kind {
+        assert!((inner_ratio - 0.5).abs() < 1e-9);
+    }
+    assert!(matches!(node(&doc, "Hexagon").kind, NodeKind::Polygon { count: 6 }));
+    assert!(matches!(node(&doc, "Edited").kind, NodeKind::Vector { .. }));
+    assert!(matches!(node(&doc, "Triangle").kind, NodeKind::Vector { .. }));
+}
+
+#[test]
+fn points_outside_unit_are_kept_finite() {
+    let doc = open(vec![shape_path("Over", 0.0, 0.0, 10.0, 10.0, &[(-0.5, 2.0), (1.0, 0.0), (0.0, 0.0)], true)]);
+    let NodeKind::Vector { network } = &node(&doc, "Over").kind else { panic!("not a vector") };
+    assert!(network.vertices.iter().all(|v| v.x.is_finite() && v.y.is_finite()));
+    assert_eq!((network.vertices[0].x, network.vertices[0].y), (-5.0, 20.0));
+}
+
+#[test]
+fn even_odd_winding() {
+    let mut p = shape_path("Holes", 0.0, 0.0, 10.0, 10.0, &[(0.0, 0.0), (1.0, 0.0), (1.0, 1.0)], true);
+    p["style"]["windingRule"] = json!(1);
+    let doc = open(vec![p]);
+    let NodeKind::Vector { network } = &node(&doc, "Holes").kind else { panic!("not a vector") };
+    assert_eq!(network.regions[0].winding, figcraft_doc::WindingRule::EvenOdd);
+}
+
+#[test]
+fn huge_points_stay_finite() {
+    let mut p = shape_path("Huge", 0.0, 0.0, 1e6, 1e6, &[(0.0, 0.0), (1.0, 0.0), (1.0, 1.0)], true);
+    p["points"][1]["point"] = json!("{1e308, 0}");
+    p["points"][1]["curveMode"] = json!(2);
+    p["points"][1]["curveFrom"] = json!("{-1e308, 1e308}");
+    let doc = open(vec![p]);
+    if let NodeKind::Vector { network } = &node(&doc, "Huge").kind {
+        assert!(network.vertices.iter().all(|v| v.x.is_finite() && v.y.is_finite()));
+        assert!(network.segments.iter().all(|s| [s.ta.0, s.ta.1, s.tb.0, s.tb.1].iter().all(|c| c.is_finite())));
+    }
+}
+
+/// Sketch 51 and older: a shape group whose children have no operation (−1) is one compound path,
+/// filled by the group's winding rule (stored on the layer itself).
+#[test]
+fn compound_shape_group_has_holes() {
+    let outer = with_op(rect("Outer", 0.0, 0.0, 100.0, 100.0), -1);
+    let inner = with_op(rect("Inner", 25.0, 25.0, 50.0, 50.0), -1);
+    let mut g = shape_group("Ring", 10.0, 10.0, 100.0, 100.0, vec![outer, inner]);
+    g["windingRule"] = json!(1);
+    let doc = open(vec![g]);
+    let n = node(&doc, "Ring");
+    let NodeKind::Vector { network } = &n.kind else { panic!("not one vector: {:?}", n.kind) };
+    assert_eq!(network.regions.len(), 1);
+    assert_eq!(network.regions[0].loops.len(), 2);
+    assert_eq!(network.regions[0].winding, figcraft_doc::WindingRule::EvenOdd);
+    let b = doc.world_bounds(n.id).unwrap();
+    assert_eq!((b.x0, b.y0, b.width(), b.height()), (10.0, 10.0, 100.0, 100.0));
+}
+
+#[test]
+fn compound_runs_are_boolean_operands() {
+    let a = with_op(rect("A", 0.0, 0.0, 50.0, 50.0), -1);
+    let b = with_op(rect("B", 60.0, 0.0, 20.0, 20.0), -1);
+    let c = with_op(rect("C", 10.0, 10.0, 10.0, 10.0), 1);
+    let doc = open(vec![shape_group("Mixed", 0.0, 0.0, 80.0, 50.0, vec![a, b, c])]);
+    let n = node(&doc, "Mixed");
+    assert!(matches!(n.kind, NodeKind::BooleanOp { op: BoolOp::Subtract }), "{:?}", n.kind);
+    let first = doc.node(n.children[0]).unwrap();
+    let NodeKind::Vector { network } = &first.kind else { panic!("first operand isn't the compound path") };
+    assert_eq!(network.regions[0].loops.len(), 2);
+}
+
+#[test]
+fn layer_winding_rule_counts() {
+    let mut p = shape_path("Wound", 0.0, 0.0, 10.0, 10.0, &[(0.0, 0.0), (1.0, 0.0), (1.0, 1.0)], true);
+    p["windingRule"] = json!(1);
+    let doc = open(vec![p]);
+    let NodeKind::Vector { network } = &node(&doc, "Wound").kind else { panic!("not a vector") };
+    assert_eq!(network.regions[0].winding, figcraft_doc::WindingRule::EvenOdd);
+}
+
+/// Sketch fills an open path as if it were closed.
+#[test]
+fn filled_open_paths_are_closed() {
+    let open_path = shape_path("Lid", 0.0, 0.0, 40.0, 20.0, &[(0.0, 1.0), (0.5, 0.0), (1.0, 1.0)], false);
+    let filled = styled(shape_group("Filled", 0.0, 0.0, 40.0, 20.0, vec![open_path.clone()]), "fills", json!([solid_fill(0.0, 0.0, 0.0, 1.0)]));
+    let stroked = styled(
+        shape_group("Stroked", 0.0, 50.0, 40.0, 20.0, vec![open_path]),
+        "borders",
+        json!([{"_class": "border", "isEnabled": true, "fillType": 0, "color": color(0.0, 0.0, 0.0, 1.0), "position": 0, "thickness": 1}]),
+    );
+    let doc = open(vec![filled, stroked]);
+    let NodeKind::Vector { network } = &node(&doc, "Filled").kind else { panic!("not a vector") };
+    assert_eq!(network.regions.len(), 1);
+    assert_eq!(network.segments.len(), 3);
+    let NodeKind::Vector { network } = &node(&doc, "Stroked").kind else { panic!("not a vector") };
+    assert!(network.regions.is_empty());
+    assert_eq!(network.segments.len(), 2);
+}
+
+#[test]
+fn open_operands_of_booleans_are_closed() {
+    let a = with_op(rect("A", 0.0, 0.0, 50.0, 50.0), -1);
+    let b = with_op(shape_path("Snout", 40.0, 10.0, 30.0, 20.0, &[(0.0, 0.0), (1.0, 0.5), (0.0, 1.0)], false), 0);
+    let doc = open(vec![styled(shape_group("Head", 0.0, 0.0, 70.0, 50.0, vec![a, b]), "fills", json!([solid_fill(0.0, 0.0, 0.0, 1.0)]))]);
+    let NodeKind::Vector { network } = &node(&doc, "Snout").kind else { panic!("not a vector") };
+    assert_eq!(network.regions.len(), 1);
+}
diff --git a/crates/format/src/sketch/proto.rs b/crates/format/src/sketch/proto.rs
new file mode 100644
index 00000000..8574ab34
--- /dev/null
+++ b/crates/format/src/sketch/proto.rs
@@ -0,0 +1,119 @@
+//! Sketch prototype links, hotspots, export options and layout grids → REST.
+//!
+//! A layer's `flow` links it to an artboard (`destinationArtboardID`, or `back`) with an
+//! `animationType` (0 none, 1–4 slide from the right, left, bottom, top); hotspots are layers that
+//! only carry a link; `isFlowHome` marks an artboard where a prototype starts.
+
+use serde_json::{Map as JsonMap, Value, json};
+
+use super::tree::{Cx, bool_field, str_field};
+
+/// Most export settings read from one layer.
+const MAX_EXPORTS: usize = 64;
+
+/// The click interaction of layer `l`'s `flow`, if it has one.
+pub(crate) fn interactions(l: &Value, node: &mut JsonMap<String, Value>) {
+    let Some(flow) = l.get("flow") else { return };
+    let Some(dest) = str_field(flow, "destinationArtboardID").filter(|d| !d.is_empty()) else { return };
+    let action = if dest == "back" {
+        json!({"type": "BACK"})
+    } else {
+        let direction = match flow.get("animationType").and_then(Value::as_i64) {
+            Some(1) => Some("LEFT"),
+            Some(2) => Some("RIGHT"),
+            Some(3) => Some("TOP"),
+            Some(4) => Some("BOTTOM"),
+            _ => None,
+        };
+        let transition =
+            direction.map_or(Value::Null, |d| json!({"type": "SLIDE_IN", "direction": d, "duration": 0.3, "easing": {"type": "EASE_IN_AND_OUT"}}));
+        json!({"type": "NODE", "destinationId": dest, "navigation": "NAVIGATE", "transition": transition})
+    };
+    node.insert("interactions".into(), json!([{"trigger": {"type": "ON_CLICK"}, "actions": [action]}]));
+}
+
+/// The artboards of a page marked as where a prototype starts, as REST `flowStartingPoints`.
+pub(crate) fn starting_points(page: &Value) -> Vec<Value> {
+    super::tree::layers(page)
+        .iter()
+        .filter(|a| bool_field(a, "isFlowHome") == Some(true))
+        .filter_map(|a| Some(json!({"nodeId": str_field(a, "do_objectID")?, "name": str_field(a, "name").unwrap_or("Flow")})))
+        .collect()
+}
+
+/// Layer `l`'s export options as REST `exportSettings`.
+pub(crate) fn export_settings(cx: &mut Cx, l: &Value, node: &mut JsonMap<String, Value>) {
+    let formats = l.get("exportOptions").and_then(|o| o.get("exportFormats")).and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default();
+    let mut out = Vec::new();
+    for f in formats.iter().take(MAX_EXPORTS) {
+        let format = match str_field(f, "fileFormat").unwrap_or("png").to_ascii_lowercase().as_str() {
+            "png" => "PNG",
+            "jpg" | "jpeg" => "JPG",
+            "svg" => "SVG",
+            "pdf" => "PDF",
+            "webp" => "WEBP",
+            _ => {
+                cx.warn("export settings in formats FigCraft doesn't export (TIFF, EPS, HEIC) were skipped");
+                continue;
+            }
+        };
+        let num = |k: &str| f.get(k).and_then(Value::as_f64).filter(|v| v.is_finite() && *v > 0.0);
+        let constraint = match (f.get("visibleScaleType").and_then(Value::as_i64), num("absoluteSize")) {
+            (Some(1), Some(s)) => json!({"type": "WIDTH", "value": s.min(16_384.0)}),
+            (Some(2), Some(s)) => json!({"type": "HEIGHT", "value": s.min(16_384.0)}),
+            _ => json!({"type": "SCALE", "value": num("scale").unwrap_or(1.0).min(64.0)}),
+        };
+        let name: String = str_field(f, "name").unwrap_or("").chars().take(200).collect();
+        if f.get("namingScheme").and_then(Value::as_i64) == Some(1) && !name.is_empty() {
+            cx.warn("export names Sketch puts before the layer name come after it");
+        }
+        out.push(json!({"format": format, "suffix": name, "constraint": constraint}));
+    }
+    if !out.is_empty() {
+        node.insert("exportSettings".into(), Value::Array(out));
+    }
+}
+
+/// An artboard's layout grid (columns, rows) and square grid as REST `layoutGrids`, hidden: Sketch
+/// shows them only while its layout (or grid) view is turned on.
+pub(crate) fn layout_grids(l: &Value, h: f64, node: &mut JsonMap<String, Value>) {
+    let mut out = Vec::new();
+    if let Some(g) = l.get("layout").filter(|g| bool_field(g, "isEnabled") != Some(false)) {
+        let num = |k: &str| g.get(k).and_then(Value::as_f64).filter(|v| v.is_finite() && *v >= 0.0);
+        if bool_field(g, "drawVertical") != Some(false)
+            && let (Some(count), Some(width)) = (num("numberOfColumns"), num("columnWidth"))
+        {
+            out.push(json!({"pattern": "COLUMNS", "alignment": "MIN", "count": count.min(1000.0), "sectionSize": width.min(1e5),
+                "gutterSize": num("gutterWidth").unwrap_or(0.0).min(1e5), "offset": num("horizontalOffset").unwrap_or(0.0).min(1e5), "visible": false}));
+        }
+        if bool_field(g, "drawHorizontal") == Some(true) {
+            let gutter = num("gutterHeight").unwrap_or(0.0).min(1e5);
+            let section = (gutter * num("rowHeightMultiplication").unwrap_or(1.0)).min(1e5);
+            if section > 0.0 {
+                let count = (h / (section + gutter)).floor().clamp(1.0, 1000.0);
+                out.push(json!({"pattern": "ROWS", "alignment": "MIN", "count": count, "sectionSize": section, "gutterSize": gutter, "offset": 0, "visible": false}));
+            }
+        }
+    }
+    if let Some(g) = l.get("grid").filter(|g| bool_field(g, "isEnabled") != Some(false))
+        && let Some(size) = g.get("gridSize").and_then(Value::as_f64).filter(|v| v.is_finite() && *v > 0.0)
+    {
+        out.push(json!({"pattern": "GRID", "sectionSize": size.min(1e5), "visible": false}));
+    }
+    if !out.is_empty() {
+        node.insert("layoutGrids".into(), Value::Array(out));
+    }
+}
+
+/// Notes about what the layer has that FigCraft keeps only as laid out: Smart Layout,
+/// and overrides a master locks.
+pub(crate) fn notes(cx: &mut Cx, l: &Value) {
+    // Stacks become auto layout; the older Smart Layout doesn't.
+    if l.get("groupLayout").and_then(|g| str_field(g, "_class")) == Some("MSImmutableInferredGroupLayout") {
+        cx.warn("Smart Layout was imported as laid out; it doesn't resize with its content");
+    }
+    let locked = l.get("overrideProperties").and_then(Value::as_array).is_some_and(|p| p.iter().any(|o| bool_field(o, "canOverride") == Some(false)));
+    if locked {
+        cx.warn("overrides Sketch symbols locked can be changed in FigCraft");
+    }
+}
diff --git a/crates/format/src/sketch/proto_tests.rs b/crates/format/src/sketch/proto_tests.rs
new file mode 100644
index 00000000..facef17a
--- /dev/null
+++ b/crates/format/src/sketch/proto_tests.rs
@@ -0,0 +1,127 @@
+//! Sketch prototype links, hotspots, export options, layout grids, smart layout and locked
+//! overrides.
+
+use figcraft_doc::{Document, ExportFormat, Node, NodeKind};
+use serde_json::{Value, json};
+
+use super::fixture::*;
+use super::import;
+
+fn open(layers: Vec<Value>) -> (Document, Vec<String>) {
+    let z = sketch_zip("50.2", 103, document(&["P"]), &[page("P", "Page", layers)], &[]);
+    import(&z, "f").unwrap()
+}
+
+fn node<'d>(doc: &'d Document, name: &str) -> &'d Node {
+    doc.nodes().find(|n| n.name == name).unwrap_or_else(|| panic!("no {name}"))
+}
+
+fn screens(button: Value) -> Vec<Value> {
+    vec![artboard("A1", "Home", 0.0, 0.0, 100.0, 100.0, vec![button]), artboard("A2", "Detail", 200.0, 0.0, 100.0, 100.0, vec![])]
+}
+
+#[test]
+fn flow_navigates() {
+    let b = with(
+        rect("Go", 0.0, 0.0, 20.0, 20.0),
+        "flow",
+        json!({"_class": "MSImmutableFlowConnection", "destinationArtboardID": "A2", "animationType": 1}),
+    );
+    let (doc, _) = open(screens(b));
+    let go = node(&doc, "Go");
+    assert_eq!(go.interactions.len(), 1, "{:?}", go.interactions);
+    let detail = node(&doc, "Detail").id;
+    let text = format!("{:?}", go.interactions[0]);
+    assert!(text.contains(&format!("{detail:?}")), "{text}");
+}
+
+#[test]
+fn flow_back() {
+    let b = with(
+        rect("Back", 0.0, 0.0, 20.0, 20.0),
+        "flow",
+        json!({"_class": "MSImmutableFlowConnection", "destinationArtboardID": "back", "animationType": 0}),
+    );
+    let (doc, _) = open(screens(b));
+    let text = format!("{:?}", node(&doc, "Back").interactions);
+    assert!(text.contains("Back"), "{text}");
+}
+
+#[test]
+fn hotspot_is_transparent_frame_with_interaction() {
+    let mut h = with(
+        rect("Hot", 0.0, 0.0, 20.0, 20.0),
+        "flow",
+        json!({"_class": "MSImmutableFlowConnection", "destinationArtboardID": "A2", "animationType": 0}),
+    );
+    h["_class"] = json!("MSImmutableHotspotLayer");
+    let (doc, _) = open(screens(h));
+    let n = node(&doc, "Hot");
+    assert!(matches!(n.kind, NodeKind::Frame));
+    assert!(n.fills.is_empty());
+    assert_eq!(n.interactions.len(), 1);
+}
+
+#[test]
+fn flow_home_is_starting_point() {
+    let mut home = artboard("A1", "Home", 0.0, 0.0, 100.0, 100.0, vec![]);
+    home["isFlowHome"] = json!(true);
+    let (doc, _) = open(vec![home]);
+    let page = doc.node(doc.pages[0]).unwrap();
+    let NodeKind::Page { flows, .. } = &page.kind else { panic!("not a page") };
+    assert_eq!(flows.len(), 1);
+    assert_eq!(flows[0].start, node(&doc, "Home").id);
+}
+
+#[test]
+fn export_options() {
+    let mut r = rect("Icon", 0.0, 0.0, 20.0, 20.0);
+    r["exportOptions"] = json!({"_class": "exportOptions", "exportFormats": [
+        {"_class": "exportFormat", "fileFormat": "png", "scale": 2, "name": "@2x", "namingScheme": 0, "absoluteSize": 0, "visibleScaleType": 0},
+        {"_class": "exportFormat", "fileFormat": "svg", "scale": 1, "name": "", "namingScheme": 0, "absoluteSize": 0, "visibleScaleType": 0},
+        {"_class": "exportFormat", "fileFormat": "png", "scale": 1, "name": "", "namingScheme": 0, "absoluteSize": 64, "visibleScaleType": 1},
+    ]});
+    let (doc, _) = open(vec![artboard("A", "Board", 0.0, 0.0, 100.0, 100.0, vec![r])]);
+    let e = &node(&doc, "Icon").exports;
+    assert_eq!(e.len(), 3);
+    assert_eq!(e[0].format, ExportFormat::Png);
+    assert_eq!(e[0].suffix, "@2x");
+    assert_eq!(e[1].format, ExportFormat::Svg);
+    let text = format!("{:?}", e[2]);
+    assert!(text.contains("64"), "{text}");
+}
+
+#[test]
+fn layout_and_square_grids() {
+    let mut a = artboard("A", "Board", 0.0, 0.0, 1200.0, 800.0, vec![]);
+    a["layout"] = json!({"_class": "layoutGrid", "isEnabled": true, "columnWidth": 84, "gutterWidth": 16, "horizontalOffset": 24, "numberOfColumns": 12,
+        "totalWidth": 1152, "guttersOutside": false, "drawVertical": true, "drawHorizontal": false, "gutterHeight": 8, "rowHeightMultiplication": 3});
+    a["grid"] = json!({"_class": "simpleGrid", "isEnabled": true, "gridSize": 8, "thickGridTimes": 0});
+    let (doc, _) = open(vec![a]);
+    let grids = format!("{:?}", node(&doc, "Board").grids);
+    assert_eq!(node(&doc, "Board").grids.len(), 2, "{grids}");
+    assert!(grids.contains("12") && grids.contains("16"), "{grids}");
+    // Hidden, as Sketch shows them only when its layout view is on.
+    assert!(node(&doc, "Board").grids.iter().all(|g| !g.visible), "{grids}");
+}
+
+#[test]
+fn smart_layout_warns_once() {
+    let g = |id: &str| {
+        with(
+            group(id, 0.0, 0.0, 10.0, 10.0, vec![rect(&format!("{id}r"), 0.0, 0.0, 10.0, 10.0)]),
+            "groupLayout",
+            json!({"_class": "MSImmutableInferredGroupLayout", "axis": 0}),
+        )
+    };
+    let (_, warnings) = open(vec![artboard("A", "Board", 0.0, 0.0, 100.0, 100.0, vec![g("G1"), g("G2"), g("G3")])]);
+    assert_eq!(warnings.iter().filter(|w| w.contains("Smart Layout")).count(), 1, "{warnings:?}");
+}
+
+#[test]
+fn locked_overrides_are_noted() {
+    let mut m = master("M", "S", "Locked", 50.0, 20.0, vec![text("L", 0.0, 0.0, 50.0, 20.0, "x", &[(0, 1, "Helvetica", 9.0, [0.0, 0.0, 0.0, 1.0])])]);
+    m["overrideProperties"] = json!([{"_class": "MSImmutableOverrideProperty", "overrideName": "L_stringValue", "canOverride": false}]);
+    let (_, warnings) = open(vec![m]);
+    assert!(warnings.iter().any(|w| w.contains("locked")), "{warnings:?}");
+}
diff --git a/crates/format/src/sketch/shared.rs b/crates/format/src/sketch/shared.rs
new file mode 100644
index 00000000..ee122148
--- /dev/null
+++ b/crates/format/src/sketch/shared.rs
@@ -0,0 +1,149 @@
+//! Sketch shared styles and swatches → REST style definitions and colour variables.
+//!
+//! A Sketch layer style holds fills, borders and effects together; FigCraft styles hold one kind
+//! each, so a layer style becomes up to three styles named after it: its fills (a paint style),
+//! its border colours (a paint style for strokes; widths stay on the layers) and its effects. A
+//! text style becomes a text style; its colour stays on the layers, as FigCraft text styles carry
+//! none. Layers link to them by `style.sharedObjectID`. Swatches (Color Variables, Sketch 69+)
+//! become colour variables in one collection; colours name theirs by `swatchID`.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use serde_json::{Map as JsonMap, Value, json};
+
+use super::tree::{Cx, color, str_field};
+
+/// Most shared styles or swatches read from one file.
+const MAX_SHARED: usize = 20_000;
+/// The collection swatches become variables in.
+const COLLECTION: &str = "sketch-color-variables";
+const MODE: &str = "default";
+
+/// A file's shared styles and swatches.
+#[derive(Default)]
+pub(crate) struct Shared {
+    /// `(id, name, style)` of layer styles, then text styles.
+    layer: Vec<(String, String, Value)>,
+    text: Vec<(String, String, Value)>,
+    /// Positions in `layer` and `text` by id.
+    layer_index: BTreeMap<String, usize>,
+    text_index: BTreeMap<String, usize>,
+    swatches: BTreeMap<String, (String, Value)>,
+}
+
+impl Shared {
+    pub(crate) fn read(document: &Value) -> Shared {
+        let mut s = Shared::default();
+        let objects =
+            |key: &str| -> Vec<Value> { document.get(key).and_then(|c| c.get("objects")).and_then(Value::as_array).cloned().unwrap_or_default() };
+        let foreign = |key: &str, inner: &str| -> Vec<Value> {
+            document.get(key).and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default().iter().filter_map(|f| f.get(inner).cloned()).collect()
+        };
+        let entry = |o: &Value| {
+            Some((
+                str_field(o, "do_objectID")?.to_string(),
+                str_field(o, "name").unwrap_or("Style").chars().take(200).collect(),
+                o.get("value")?.clone(),
+            ))
+        };
+        for o in objects("layerStyles").iter().chain(&foreign("foreignLayerStyles", "localSharedStyle")).take(MAX_SHARED) {
+            if let Some(e) = entry(o).filter(|e| !s.layer_index.contains_key(&e.0)) {
+                s.layer_index.insert(e.0.clone(), s.layer.len());
+                s.layer.push(e);
+            }
+        }
+        for o in objects("layerTextStyles").iter().chain(&foreign("foreignTextStyles", "localSharedStyle")).take(MAX_SHARED) {
+            if let Some(e) = entry(o).filter(|e| !s.text_index.contains_key(&e.0)) {
+                s.text_index.insert(e.0.clone(), s.text.len());
+                s.text.push(e);
+            }
+        }
+        let foreign_swatches = [foreign("foreignSwatches", "localSwatch"), foreign("foreignSwatches", "localSharedSwatch")].concat();
+        for o in objects("sharedSwatches").iter().chain(&foreign_swatches).take(MAX_SHARED) {
+            if let Some((id, name, value)) = entry(o)
+                && let Some(c) = color(&value)
+            {
+                s.swatches.entry(id).or_insert((name, c));
+            }
+        }
+        s
+    }
+
+    /// The style of shared text (`text`) or layer style `id`.
+    pub(crate) fn style(&self, text: bool, id: &str) -> Option<&Value> {
+        let (index, list) = if text { (&self.text_index, &self.text) } else { (&self.layer_index, &self.layer) };
+        list.get(*index.get(id)?).map(|e| &e.2)
+    }
+
+    pub(crate) fn has_swatch(&self, id: &str) -> bool {
+        self.swatches.contains_key(id)
+    }
+
+    /// The REST `styleDefinitions` of every shared style.
+    pub(crate) fn definitions(cx: &mut Cx) -> Vec<Value> {
+        let layer = cx.shared.layer.clone();
+        let text = cx.shared.text.clone();
+        let mut out = Vec::new();
+        for (id, name, style) in &layer {
+            let fills = super::style::fills(cx, style, 100.0, 100.0);
+            if !fills.is_empty() {
+                out.push(json!({"id": format!("{id}:fill"), "name": name, "styleType": "FILL", "node": {"fills": fills}}));
+            }
+            let strokes = super::style::border_paints(cx, style, 100.0, 100.0);
+            if !strokes.is_empty() {
+                out.push(json!({"id": format!("{id}:stroke"), "name": format!("{name} border"), "styleType": "FILL", "node": {"fills": strokes}}));
+            }
+            let effects = super::style::effects(cx, style);
+            if !effects.is_empty() {
+                out.push(json!({"id": format!("{id}:effect"), "name": name, "styleType": "EFFECT", "node": {"effects": effects}}));
+            }
+        }
+        for (id, name, style) in &text {
+            let Some(enc) = style.get("textStyle").and_then(|t| t.get("encodedAttributes")) else { continue };
+            let mut ts = super::text::type_style(cx, enc);
+            if let Some(m) = ts.as_object_mut() {
+                m.remove("fills");
+            }
+            out.push(json!({"id": id, "name": name, "styleType": "TEXT", "node": {"type": "TEXT", "characters": "", "style": ts}}));
+        }
+        out
+    }
+
+    /// Link `node` (layer `l`) to the styles made from its shared style.
+    pub(crate) fn link(&self, cx_defs: &BTreeSet<String>, l: &Value, node: &mut JsonMap<String, Value>) {
+        let Some(sid) = l.get("style").and_then(|s| str_field(s, "sharedObjectID")) else { return };
+        let mut refs = JsonMap::new();
+        let is_text = str_field(l, "_class") == Some("text");
+        if is_text && self.text_index.contains_key(sid) {
+            refs.insert("text".into(), json!(sid));
+        } else if self.layer_index.contains_key(sid) {
+            for slot in ["fill", "stroke", "effect"] {
+                let id = format!("{sid}:{slot}");
+                if cx_defs.contains(&id) {
+                    refs.insert(slot.into(), json!(id));
+                }
+            }
+        }
+        if !refs.is_empty() {
+            node.insert("styles".into(), Value::Object(refs));
+        }
+    }
+
+    /// The REST `variableCollections` and `variables` for the swatches (none without swatches).
+    pub(crate) fn variables(&self) -> Option<(Value, Value)> {
+        if self.swatches.is_empty() {
+            return None;
+        }
+        let ids: Vec<&String> = self.swatches.keys().collect();
+        let collections = json!({COLLECTION: {"id": COLLECTION, "name": "Color Variables", "modes": [{"modeId": MODE, "name": "Default"}],
+            "defaultModeId": MODE, "variableIds": ids}});
+        let vars: JsonMap<String, Value> = self
+            .swatches
+            .iter()
+            .map(|(id, (name, c))| {
+                (id.clone(), json!({"id": id, "name": name, "resolvedType": "COLOR", "variableCollectionId": COLLECTION, "valuesByMode": {MODE: c}}))
+            })
+            .collect();
+        Some((collections, Value::Object(vars)))
+    }
+}
diff --git a/crates/format/src/sketch/shared_tests.rs b/crates/format/src/sketch/shared_tests.rs
new file mode 100644
index 00000000..571a6d2e
--- /dev/null
+++ b/crates/format/src/sketch/shared_tests.rs
@@ -0,0 +1,150 @@
+//! Sketch shared styles → FigCraft styles; Color Variables (swatches) → colour variables.
+
+use figcraft_doc::color::PaintKind;
+use figcraft_doc::{Document, Node, StyleKind};
+use serde_json::{Value, json};
+
+use super::fixture::*;
+use super::import;
+
+const BLACK: [f64; 4] = [0.0, 0.0, 0.0, 1.0];
+
+fn open(doc_json: Value, layers: Vec<Value>) -> (Document, Vec<String>) {
+    let z = sketch_zip("83.2", 139, doc_json, &[page("P", "Page", vec![artboard("A", "Board", 0.0, 0.0, 400.0, 400.0, layers)])], &[]);
+    import(&z, "f").unwrap()
+}
+
+fn node<'d>(doc: &'d Document, name: &str) -> &'d Node {
+    doc.nodes().find(|n| n.name == name).unwrap_or_else(|| panic!("no {name}"))
+}
+
+fn style<'d>(doc: &'d Document, id: &str) -> &'d figcraft_doc::Style {
+    doc.styles.iter().find(|s| s.id == id).unwrap_or_else(|| panic!("no style {id}: {:?}", doc.styles.iter().map(|s| &s.id).collect::<Vec<_>>()))
+}
+
+fn card_style() -> Value {
+    json!({"_class": "style", "fills": [solid_fill(0.0, 0.0, 1.0, 1.0)], "borders": [],
+           "shadows": [{"_class": "shadow", "isEnabled": true, "blurRadius": 4, "offsetX": 0, "offsetY": 2, "spread": 0, "color": color(0.0, 0.0, 0.0, 0.3)}],
+           "innerShadows": []})
+}
+
+fn with_shared(d: &mut Value, layer_styles: Vec<Value>, text_styles: Vec<Value>) {
+    d["layerStyles"]["objects"] = Value::Array(layer_styles);
+    d["layerTextStyles"]["objects"] = Value::Array(text_styles);
+}
+
+fn shared(id: &str, name: &str, value: Value) -> Value {
+    json!({"_class": "sharedStyle", "do_objectID": id, "name": name, "value": value})
+}
+
+fn linked(mut l: Value, style: Value, shared_id: &str) -> Value {
+    l["style"] = style;
+    l["style"]["sharedObjectID"] = json!(shared_id);
+    l
+}
+
+#[test]
+fn layer_style_splits() {
+    let mut d = document(&["P"]);
+    with_shared(&mut d, vec![shared("CARD", "Card", card_style())], vec![]);
+    let (doc, _) = open(d, vec![linked(rect("R", 0.0, 0.0, 50.0, 50.0), card_style(), "CARD")]);
+    let n = node(&doc, "R");
+    let fill = n.styles.fill.clone().expect("fill style linked");
+    let effect = n.styles.effect.clone().expect("effect style linked");
+    assert_eq!(style(&doc, &fill).name, "Card");
+    assert!(matches!(style(&doc, &fill).kind, StyleKind::Paint { .. }));
+    assert!(matches!(style(&doc, &effect).kind, StyleKind::Effect { .. }));
+    assert_eq!(style(&doc, &effect).name, "Card");
+}
+
+#[test]
+fn layer_style_borders_become_a_stroke_style() {
+    let mut st = card_style();
+    st["borders"] =
+        json!([{"_class": "border", "isEnabled": true, "fillType": 0, "color": color(1.0, 0.0, 0.0, 1.0), "position": 1, "thickness": 2}]);
+    let mut d = document(&["P"]);
+    with_shared(&mut d, vec![shared("CARD", "Card", st.clone())], vec![]);
+    let (doc, _) = open(d, vec![linked(rect("R", 0.0, 0.0, 50.0, 50.0), st, "CARD")]);
+    let stroke = node(&doc, "R").styles.stroke.clone().expect("stroke style linked");
+    assert!(style(&doc, &stroke).name.starts_with("Card"));
+}
+
+#[test]
+fn unused_shared_styles_are_listed() {
+    let mut d = document(&["P"]);
+    with_shared(&mut d, vec![shared("CARD", "Card", card_style())], vec![]);
+    let (doc, _) = open(d, vec![]);
+    assert!(doc.styles.iter().any(|s| s.name == "Card"));
+}
+
+#[test]
+fn text_style_links() {
+    let enc = json!({"MSAttributedStringFontAttribute": {"_class": "fontDescriptor", "attributes": {"name": "Helvetica-Bold", "size": 32}},
+                     "MSAttributedStringColorAttribute": color(1.0, 0.0, 0.0, 1.0),
+                     "paragraphStyle": {"_class": "paragraphStyle", "alignment": 0, "maximumLineHeight": 40, "minimumLineHeight": 40}});
+    let st = json!({"_class": "style", "textStyle": {"_class": "textStyle", "encodedAttributes": enc, "verticalAlignment": 0}});
+    let mut d = document(&["P"]);
+    with_shared(&mut d, vec![], vec![shared("H1", "Heading/H1", st.clone())]);
+    let t = linked(text("Title", 0.0, 0.0, 200.0, 40.0, "Hello", &[(0, 5, "Helvetica-Bold", 32.0, [1.0, 0.0, 0.0, 1.0])]), st, "H1");
+    let (doc, _) = open(d, vec![t]);
+    let n = node(&doc, "Title");
+    let sid = n.styles.text.clone().expect("text style linked");
+    let s = style(&doc, &sid);
+    assert_eq!(s.name, "Heading/H1");
+    let StyleKind::Text { style: ts } = &s.kind else { panic!("not a text style") };
+    assert_eq!((ts.font_family.as_str(), ts.font_style.as_str(), ts.font_size), ("Helvetica", "Bold", 32.0));
+    assert!(n.fills.iter().any(|p| matches!(p.kind, PaintKind::Solid { color } if color.r == 1.0 && color.g == 0.0)));
+}
+
+#[test]
+fn locally_changed_style_keeps_link() {
+    let mut local = card_style();
+    local["fills"] = json!([solid_fill(0.0, 1.0, 0.0, 1.0)]);
+    let mut d = document(&["P"]);
+    with_shared(&mut d, vec![shared("CARD", "Card", card_style())], vec![]);
+    let (doc, _) = open(d, vec![linked(rect("R", 0.0, 0.0, 50.0, 50.0), local, "CARD")]);
+    let n = node(&doc, "R");
+    assert!(n.styles.fill.is_some());
+    assert!(matches!(n.fills[0].kind, PaintKind::Solid { color } if color.g == 1.0 && color.b == 0.0));
+}
+
+#[test]
+fn foreign_styles_too() {
+    let mut d = document(&["P"]);
+    d["foreignLayerStyles"] = json!([{"_class": "MSImmutableForeignLayerStyle", "sourceLibraryName": "Kit", "localSharedStyle": shared("FCARD", "Kit card", card_style())}]);
+    let (doc, _) = open(d, vec![linked(rect("R", 0.0, 0.0, 50.0, 50.0), card_style(), "FCARD")]);
+    assert_eq!(style(&doc, node(&doc, "R").styles.fill.as_deref().unwrap()).name, "Kit card");
+}
+
+#[test]
+fn swatches_are_color_variables() {
+    let mut d = document(&["P"]);
+    d["sharedSwatches"] = json!({"_class": "swatchContainer", "objects": [{"_class": "swatch", "do_objectID": "SW1", "name": "Brand/Blue", "value": color(0.06, 0.38, 1.0, 1.0)}]});
+    d["foreignSwatches"] = json!([{"_class": "MSImmutableForeignSwatch", "sourceLibraryName": "Kit", "localSwatch": {"_class": "swatch", "do_objectID": "SW2", "name": "Kit/Red", "value": color(1.0, 0.0, 0.0, 1.0)}}]);
+    let mut fill = solid_fill(0.06, 0.38, 1.0, 1.0);
+    fill["color"]["swatchID"] = json!("SW1");
+    let mut fill2 = solid_fill(1.0, 0.0, 0.0, 1.0);
+    fill2["color"]["swatchID"] = json!("SW2");
+    let (doc, _) = open(
+        d,
+        vec![styled(rect("R", 0.0, 0.0, 50.0, 50.0), "fills", json!([fill])), styled(rect("S", 0.0, 0.0, 50.0, 50.0), "fills", json!([fill2]))],
+    );
+    let coll = doc.variables.collections.iter().find(|c| c.name == "Color Variables").expect("collection");
+    let var = doc.variables.variables.iter().find(|v| v.name == "Brand/Blue").expect("variable");
+    assert_eq!(var.collection, coll.id);
+    assert!(doc.variables.variables.iter().any(|v| v.name == "Kit/Red"));
+    assert_eq!(node(&doc, "R").bound.get("fill"), Some(&var.id));
+    assert!(node(&doc, "S").bound.contains_key("fill"));
+}
+
+#[test]
+fn unknown_shared_ids_are_ignored() {
+    let (doc, _) = open(document(&["P"]), vec![linked(rect("R", 0.0, 0.0, 50.0, 50.0), card_style(), "NOPE")]);
+    let n = node(&doc, "R");
+    assert!(n.styles.fill.is_none());
+    let mut f = solid_fill(0.0, 0.0, 0.0, 1.0);
+    f["color"]["swatchID"] = json!("NOPE");
+    let (doc, _) =
+        open(document(&["P"]), vec![styled(text("T", 0.0, 0.0, 10.0, 10.0, "x", &[(0, 1, "Helvetica", 9.0, BLACK)]), "fills", json!([f]))]);
+    assert!(node(&doc, "T").bound.is_empty());
+}
diff --git a/crates/format/src/sketch/stack.rs b/crates/format/src/sketch/stack.rs
new file mode 100644
index 00000000..89f67ca8
--- /dev/null
+++ b/crates/format/src/sketch/stack.rs
@@ -0,0 +1,104 @@
+//! Sketch 2025+ stacks (`groupLayout` `MSImmutableFlexGroupLayout`) → REST auto layout.
+//!
+//! The enums follow the order Sketch's plugin API documents them in (checked against files):
+//! direction row, column; justify start, center, end, between, around, evenly; align items start,
+//! center, end, stretch, none; stacking order first on top, last on top. Sizing (`horizontalSizing`,
+//! `verticalSizing`) is fixed, fit (hug), fill, relative. Sketch lists a stack's first item last
+//! (on top in the layer list), so the flow order is the reverse of its `layers`.
+
+use serde_json::{Map as JsonMap, Value, json};
+
+/// Whether `l` is a stack.
+pub(crate) fn is_stack(l: &Value) -> bool {
+    l.get("groupLayout").and_then(|g| g.get("_class")).and_then(Value::as_str) == Some("MSImmutableFlexGroupLayout")
+}
+
+/// Make `node` (the REST node of frame `l`, its children already built in Sketch's order) an auto
+/// layout frame when `l` is a stack.
+pub(crate) fn apply(l: &Value, node: &mut JsonMap<String, Value>) {
+    if !is_stack(l) || !matches!(node.get("type").and_then(Value::as_str), Some("FRAME" | "COMPONENT" | "INSTANCE")) {
+        return;
+    }
+    let Some(g) = l.get("groupLayout") else { return };
+    let int = |k: &str| g.get(k).and_then(Value::as_i64).unwrap_or(0);
+    let num = |v: &Value, k: &str| v.get(k).and_then(Value::as_f64).filter(|x| x.is_finite()).unwrap_or(0.0).clamp(0.0, 1e5);
+    let row = int("flexDirection") == 0;
+    node.insert("layoutMode".into(), json!(if row { "HORIZONTAL" } else { "VERTICAL" }));
+    node.insert("itemSpacing".into(), json!(num(g, "allGuttersGap")));
+    node.insert(
+        "primaryAxisAlignItems".into(),
+        json!(match int("justifyContent") {
+            1 => "CENTER",
+            2 => "MAX",
+            3 => "SPACE_BETWEEN",
+            4 => "SPACE_AROUND",
+            5 => "SPACE_EVENLY",
+            _ => "MIN",
+        }),
+    );
+    let stretch = int("alignItems") == 3;
+    node.insert(
+        "counterAxisAlignItems".into(),
+        json!(match int("alignItems") {
+            1 => "CENTER",
+            2 => "MAX",
+            _ => "MIN",
+        }),
+    );
+    if g.get("wrappingEnabled").and_then(Value::as_bool) == Some(true) {
+        node.insert("layoutWrap".into(), json!("WRAP"));
+        node.insert("counterAxisSpacing".into(), json!(num(g, "crossAxisGutterGap")));
+    }
+    for (k, rest) in
+        [("leftPadding", "paddingLeft"), ("topPadding", "paddingTop"), ("rightPadding", "paddingRight"), ("bottomPadding", "paddingBottom")]
+    {
+        node.insert(rest.into(), json!(num(l, k)));
+    }
+    node.insert("itemReverseZIndex".into(), json!(int("stackingOrder") == 0));
+    node.insert("strokesIncludedInLayout".into(), json!(g.get("bordersAffectLayout").and_then(Value::as_bool) == Some(true)));
+    // The stack's own sizing: fit hugs its content.
+    let (main, cross) = if row { ("horizontalSizing", "verticalSizing") } else { ("verticalSizing", "horizontalSizing") };
+    let mode = |k: &str| if l.get(k).and_then(Value::as_i64) == Some(1) { "AUTO" } else { "FIXED" };
+    node.insert("primaryAxisSizingMode".into(), json!(mode(main)));
+    node.insert("counterAxisSizingMode".into(), json!(mode(cross)));
+    // Items: flow order, sizing, absolute ones.
+    // Source layers by id (the first of a repeated id).
+    let mut sources: std::collections::BTreeMap<&str, &Value> = std::collections::BTreeMap::new();
+    for src in super::tree::layers(l) {
+        if let Some(id) = src.get("do_objectID").and_then(Value::as_str) {
+            sources.entry(id).or_insert(src);
+        }
+    }
+    if let Some(kids) = node.get_mut("children").and_then(Value::as_array_mut) {
+        // Children were built one per source layer, skipped ones aside: match them by id.
+        for kid in kids.iter_mut() {
+            let Some(src) = kid.get("id").and_then(Value::as_str).and_then(|id| sources.get(id).copied()) else { continue };
+            let Some(m) = kid.as_object_mut() else { continue };
+            item(src, m, row, stretch);
+        }
+        kids.reverse();
+    }
+}
+
+/// An item's place in its stack: absolute, or sized fixed, hugging or filling.
+fn item(src: &Value, m: &mut JsonMap<String, Value>, row: bool, stretch: bool) {
+    if src.get("flexItem").and_then(|f| f.get("ignoreLayout")).and_then(Value::as_bool) == Some(true) {
+        m.insert("layoutPositioning".into(), json!("ABSOLUTE"));
+        return;
+    }
+    let sizing = |k: &str| match src.get(k).and_then(Value::as_i64) {
+        Some(1) => "HUG",
+        Some(2) => "FILL",
+        _ => "FIXED",
+    };
+    let (h, v) = (sizing("horizontalSizing"), sizing("verticalSizing"));
+    m.insert("layoutSizingHorizontal".into(), json!(h));
+    m.insert("layoutSizingVertical".into(), json!(v));
+    let (main, cross) = if row { (h, v) } else { (v, h) };
+    if main == "FILL" {
+        m.insert("layoutGrow".into(), json!(1));
+    }
+    if cross == "FILL" || stretch {
+        m.insert("layoutAlign".into(), json!("STRETCH"));
+    }
+}
diff --git a/crates/format/src/sketch/style.rs b/crates/format/src/sketch/style.rs
new file mode 100644
index 00000000..5e476803
--- /dev/null
+++ b/crates/format/src/sketch/style.rs
@@ -0,0 +1,434 @@
+//! Sketch styles → REST paints, strokes, effects, opacity and blend modes.
+//!
+//! A layer's `style` lists `fills` and `borders` (each a colour, gradient or, for fills, an image
+//! pattern, with its own `contextSettings` opacity and blend mode), `borderOptions` (dashes, caps,
+//! joins), `shadows`, `innerShadows`, one `blur` and the layer's own `contextSettings`. Every
+//! border has its own thickness and position; FigCraft strokes share one, so the first enabled
+//! border's is used.
+
+use serde_json::{Map as JsonMap, Value, json};
+
+use super::path::parse_point;
+use super::tree::{Cx, color};
+
+/// Most paints or effects read from one list.
+const MAX_LIST: usize = 64;
+
+/// Write the paints, strokes, effects, opacity and blend mode of `style` into `node`, a layer of
+/// `w`×`h`. Lists the style doesn't have are left as they are.
+pub(crate) fn apply(cx: &mut Cx, style: &Value, w: f64, h: f64, node: &mut JsonMap<String, Value>) {
+    let fills = fills(cx, style, w, h);
+    if !fills.is_empty() {
+        node.insert("fills".into(), Value::Array(fills));
+    }
+    borders(cx, style, w, h, node);
+    let effects = effects(cx, style);
+    if !effects.is_empty() {
+        node.insert("effects".into(), Value::Array(effects));
+    }
+    if let Some(ctx) = style.get("contextSettings") {
+        if let Some(o) = num(ctx, "opacity") {
+            node.insert("opacity".into(), json!(o.clamp(0.0, 1.0)));
+        }
+        if let Some(b) = ctx.get("blendMode").and_then(Value::as_i64).filter(|b| *b != 0).and_then(blend) {
+            node.insert("blendMode".into(), json!(b));
+        }
+    }
+}
+
+/// A style's fills as REST paints.
+pub(crate) fn fills(cx: &mut Cx, style: &Value, w: f64, h: f64) -> Vec<Value> {
+    // Tints (`layeringType` 1) colour the layers inside; they aren't paints of the layer.
+    list(style, "fills").iter().filter(|f| f.get("layeringType").and_then(Value::as_i64) != Some(1)).filter_map(|f| paint(cx, f, w, h)).collect()
+}
+
+/// A style's borders as REST paints.
+pub(crate) fn border_paints(cx: &mut Cx, style: &Value, w: f64, h: f64) -> Vec<Value> {
+    list(style, "borders").iter().filter_map(|b| paint(cx, b, w, h)).collect()
+}
+
+/// Remove what [`apply`] writes, so another style can take its place.
+pub(crate) fn clear(node: &mut JsonMap<String, Value>) {
+    for key in [
+        "fills",
+        "strokes",
+        "strokeWeight",
+        "strokeAlign",
+        "strokeDashes",
+        "strokeCap",
+        "strokeCapStart",
+        "strokeCapEnd",
+        "strokeJoin",
+        "effects",
+        "opacity",
+        "blendMode",
+    ] {
+        node.remove(key);
+    }
+}
+
+/// One fill or border as a REST paint; `None` for kinds FigCraft doesn't have (with a warning).
+fn paint(cx: &mut Cx, f: &Value, w: f64, h: f64) -> Option<Value> {
+    let mut p = match f.get("fillType").and_then(Value::as_i64).unwrap_or(0) {
+        0 => json!({"type": "SOLID", "color": f.get("color").and_then(color).unwrap_or_else(|| json!({"r": 0.0, "g": 0.0, "b": 0.0, "a": 1.0}))}),
+        1 => gradient(f.get("gradient")?, w, h)?,
+        4 => {
+            let Some(r) = f.get("image").and_then(|i| i.get("_ref")).and_then(Value::as_str) else {
+                cx.warn("image fills stored inside the JSON were skipped");
+                return None;
+            };
+            let mut p = json!({"type": "IMAGE", "imageRef": r});
+            match f.get("patternFillType").and_then(Value::as_i64).unwrap_or(1) {
+                0 => {
+                    p["scaleMode"] = json!("TILE");
+                    p["scalingFactor"] = json!(num(f, "patternTileScale").filter(|s| *s > 0.0).unwrap_or(1.0));
+                }
+                2 => {
+                    p["scaleMode"] = json!("STRETCH");
+                    p["imageTransform"] = json!([[1, 0, 0], [0, 1, 0]]);
+                }
+                3 => p["scaleMode"] = json!("FIT"),
+                _ => p["scaleMode"] = json!("FILL"),
+            }
+            p
+        }
+        5 => {
+            cx.warn("noise fills were skipped");
+            return None;
+        }
+        other => {
+            cx.warn(format!("fills of type {other} were skipped"));
+            return None;
+        }
+    };
+    p["visible"] = json!(f.get("isEnabled").and_then(Value::as_bool).unwrap_or(true));
+    // A colour variable binds a plain colour (a gradient's or image's `color` is unused).
+    if f.get("fillType").and_then(Value::as_i64).unwrap_or(0) == 0
+        && let Some(var) = swatch(cx, f.get("color"))
+    {
+        p["boundVariables"] = var;
+    }
+    if let Some(ctx) = f.get("contextSettings") {
+        if let Some(o) = num(ctx, "opacity") {
+            p["opacity"] = json!(o.clamp(0.0, 1.0));
+        }
+        if let Some(b) = ctx.get("blendMode").and_then(Value::as_i64).and_then(blend) {
+            p["blendMode"] = json!(b);
+        }
+    }
+    Some(p)
+}
+
+/// A gradient fill: `from` and `to` in 0–1 of the layer; a radial gradient's `elipseLength` is its
+/// width across the main axis as a share of the main axis, measured in pixels.
+fn gradient(g: &Value, w: f64, h: f64) -> Option<Value> {
+    let point = |k: &str| g.get(k).and_then(Value::as_str).and_then(parse_point);
+    let (from, to) = (point("from").unwrap_or((0.5, 0.0)), point("to").unwrap_or((0.5, 1.0)));
+    let stops: Vec<Value> = list(g, "stops")
+        .iter()
+        .filter_map(|s| Some(json!({"position": num(s, "position")?.clamp(0.0, 1.0), "color": s.get("color").and_then(color)?})))
+        .collect();
+    let (ty, handles) = match g.get("gradientType").and_then(Value::as_i64).unwrap_or(0) {
+        1 => {
+            let e = num(g, "elipseLength").filter(|e| *e > 0.0).unwrap_or(1.0);
+            let (dx, dy) = ((to.0 - from.0) * w, (to.1 - from.1) * h);
+            let across = if w > 0.0 && h > 0.0 { (from.0 - dy * e / w, from.1 + dx * e / h) } else { from };
+            ("GRADIENT_RADIAL", json!([pt(from), pt(to), pt(across)]))
+        }
+        // Sketch starts on the right and turns clockwise; from/to don't change it.
+        2 => ("GRADIENT_ANGULAR", json!([pt((0.5, 0.5)), pt((1.0, 0.5)), pt((0.5, 1.0))])),
+        // Square to the line in pixels, as Sketch draws it (FigCraft's default is square in 0–1).
+        _ => {
+            let (dx, dy) = ((to.0 - from.0) * w, (to.1 - from.1) * h);
+            let across = if w > 0.0 && h > 0.0 { (from.0 - dy / w, from.1 + dx / h) } else { (from.0 - (to.1 - from.1), from.1 + (to.0 - from.0)) };
+            ("GRADIENT_LINEAR", json!([pt(from), pt(to), pt(across)]))
+        }
+    };
+    Some(json!({"type": ty, "gradientHandlePositions": handles, "gradientStops": stops}))
+}
+
+fn pt((x, y): (f64, f64)) -> Value {
+    json!({"x": x, "y": y})
+}
+
+/// Borders → stroke paints, and the first enabled border's thickness and position.
+fn borders(cx: &mut Cx, style: &Value, w: f64, h: f64, node: &mut JsonMap<String, Value>) {
+    let list = list(style, "borders");
+    let strokes = border_paints(cx, style, w, h);
+    if strokes.is_empty() {
+        return;
+    }
+    let enabled: Vec<&Value> = list.iter().filter(|b| b.get("isEnabled").and_then(Value::as_bool).unwrap_or(true)).collect();
+    let first = enabled.first().copied().or(list.first());
+    let shape = |b: &Value| (num(b, "thickness").unwrap_or(1.0), b.get("position").and_then(Value::as_i64).unwrap_or(0));
+    if let Some(b) = first {
+        let (t, pos) = shape(b);
+        if enabled.iter().any(|o| shape(o) != (t, pos)) {
+            cx.warn("layers with several borders of different widths or positions use the first one's");
+        }
+        node.insert("strokeWeight".into(), json!(t.clamp(0.0, 1e6)));
+        node.insert(
+            "strokeAlign".into(),
+            json!(match pos {
+                1 => "INSIDE",
+                2 => "OUTSIDE",
+                _ => "CENTER",
+            }),
+        );
+    }
+    node.insert("strokes".into(), Value::Array(strokes));
+    // Per-side thickness (Sketch 2025+): a side is as thick as the border less its inset.
+    let first = list.iter().find(|b| b.get("isEnabled").and_then(Value::as_bool) != Some(false));
+    if let Some(b) = first
+        && let Some(sides) = b.get("sides")
+    {
+        let t = num(b, "thickness").unwrap_or(1.0).clamp(0.0, 1e6);
+        let side = |k: &str| (t - num(sides, k).unwrap_or(0.0)).clamp(0.0, 1e6);
+        node.insert(
+            "individualStrokeWeights".into(),
+            json!({"top": side("topInset"), "right": side("rightInset"), "bottom": side("bottomInset"), "left": side("leftInset")}),
+        );
+    }
+    if let Some(o) = style.get("borderOptions") {
+        let dashes: Vec<f64> = o
+            .get("dashPattern")
+            .and_then(Value::as_array)
+            .map(Vec::as_slice)
+            .unwrap_or_default()
+            .iter()
+            .filter_map(Value::as_f64)
+            .filter(|d| d.is_finite() && *d >= 0.0)
+            .take(MAX_LIST)
+            .collect();
+        if !dashes.is_empty() {
+            node.insert("strokeDashes".into(), json!(dashes));
+        }
+        node.insert(
+            "strokeCap".into(),
+            json!(match o.get("lineCapStyle").and_then(Value::as_i64) {
+                Some(1) => "ROUND",
+                Some(2) => "SQUARE",
+                _ => "NONE",
+            }),
+        );
+        node.insert(
+            "strokeJoin".into(),
+            json!(match o.get("lineJoinStyle").and_then(Value::as_i64) {
+                Some(1) => "ROUND",
+                Some(2) => "BEVEL",
+                _ => "MITER",
+            }),
+        );
+    }
+    for (key, field) in [("startMarkerType", "strokeCapStart"), ("endMarkerType", "strokeCapEnd")] {
+        let cap = match style.get(key).and_then(Value::as_i64).unwrap_or(0) {
+            0 => continue,
+            1 => "LINE_ARROW",
+            2 => "TRIANGLE_ARROW",
+            5 => "CIRCLE_FILLED",
+            _ => {
+                cx.warn("line ends other than arrows and filled circles were drawn without an end");
+                continue;
+            }
+        };
+        node.insert(field.into(), json!(cap));
+    }
+}
+
+/// Shadows, inner shadows and the blur as REST effects.
+pub(crate) fn effects(cx: &mut Cx, style: &Value) -> Vec<Value> {
+    let mut out = Vec::new();
+    for (key, ty) in [("shadows", "DROP_SHADOW"), ("innerShadows", "INNER_SHADOW")] {
+        for s in list(style, key) {
+            // Sketch 2025 and newer keep inner shadows in the one list, marked.
+            let ty = if s.get("isInnerShadow").and_then(Value::as_bool) == Some(true) { "INNER_SHADOW" } else { ty };
+            let mut c = s.get("color").and_then(color).unwrap_or_else(|| json!({"r": 0.0, "g": 0.0, "b": 0.0, "a": 0.5}));
+            let o = s.get("contextSettings").and_then(|c| num(c, "opacity")).unwrap_or(1.0).clamp(0.0, 1.0);
+            c["a"] = json!(c["a"].as_f64().unwrap_or(1.0) * o);
+            out.push(json!({
+                "type": ty,
+                "visible": s.get("isEnabled").and_then(Value::as_bool).unwrap_or(true),
+                "radius": num(s, "blurRadius").unwrap_or(0.0).clamp(0.0, 1e6),
+                "spread": num(s, "spread").unwrap_or(0.0),
+                "offset": {"x": num(s, "offsetX").unwrap_or(0.0), "y": num(s, "offsetY").unwrap_or(0.0)},
+                "color": c,
+            }));
+        }
+    }
+    // One `blur` (older files) or a list of `blurs` (Sketch 2025 and newer).
+    let one = style.get("blur").into_iter();
+    let many = style.get("blurs").and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default().iter().take(MAX_LIST);
+    for b in one.chain(many).filter(|b| b.get("isEnabled").and_then(Value::as_bool) == Some(true)) {
+        let radius = num(b, "radius").unwrap_or(0.0).clamp(0.0, 1e6);
+        match b.get("type").and_then(Value::as_i64).unwrap_or(0) {
+            0 => out.push(json!({"type": "LAYER_BLUR", "visible": true, "radius": radius})),
+            3 => out.push(background_blur(b, radius)),
+            4 => out.push(json!({
+                "type": "GLASS",
+                "visible": true,
+                "radius": radius,
+                "refraction": num(b, "distortion").unwrap_or(0.5).clamp(0.0, 1.0),
+                "depth": num(b, "depth").unwrap_or(0.5).clamp(0.0, 1.0),
+            })),
+            _ => {
+                // Motion and zoom blurs: a plain blur of half the radius softens about as much.
+                cx.warn("motion and zoom blurs were drawn as plain blurs");
+                out.push(json!({"type": "LAYER_BLUR", "visible": true, "radius": radius / 2.0}));
+            }
+        }
+    }
+    out.truncate(MAX_LIST);
+    out
+}
+
+/// A background blur; a progressive one (`isProgressive`) ramps along its gradient, whose stops'
+/// opacity scales the radius at each end.
+fn background_blur(b: &Value, radius: f64) -> Value {
+    let g = b.get("gradient").filter(|_| b.get("isProgressive").and_then(Value::as_bool) == Some(true));
+    let Some(g) = g else { return json!({"type": "BACKGROUND_BLUR", "visible": true, "radius": radius}) };
+    let stops = g.get("stops").and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default();
+    let at = |s: Option<&Value>| s.and_then(|s| s.get("color")).and_then(|c| num(c, "alpha")).unwrap_or(1.0).clamp(0.0, 1.0) * radius;
+    let end = |k: &str, d: (f64, f64)| {
+        let (x, y) = g.get(k).and_then(Value::as_str).and_then(super::path::parse_point).unwrap_or(d);
+        json!({"x": x.clamp(-1e3, 1e3), "y": y.clamp(-1e3, 1e3)})
+    };
+    json!({
+        "type": "BACKGROUND_BLUR",
+        "visible": true,
+        "blurType": "PROGRESSIVE",
+        "startRadius": at(stops.first()),
+        "radius": at(stops.last()),
+        "startOffset": end("from", (0.5, 0.0)),
+        "endOffset": end("to", (0.5, 1.0)),
+    })
+}
+
+/// A bitmap's colour adjustments (`colorControls`: saturation and contrast 0–2 with 1 neutral,
+/// brightness −1–1, hue in radians) as REST image filters; hue has no filter (a note).
+pub(crate) fn color_controls(cx: &mut Cx, style: Option<&Value>) -> Option<Value> {
+    let c = style?.get("colorControls").filter(|c| c.get("isEnabled").and_then(Value::as_bool) == Some(true))?;
+    let get = |k: &str, neutral: f64| num(c, k).unwrap_or(neutral);
+    if get("hue", 0.0).abs() > 1e-6 {
+        cx.warn("hue changes of bitmaps were skipped");
+    }
+    Some(json!({
+        "saturation": (get("saturation", 1.0) - 1.0).clamp(-1.0, 1.0),
+        "contrast": (get("contrast", 1.0) - 1.0).clamp(-1.0, 1.0),
+        "exposure": get("brightness", 0.0).clamp(-1.0, 1.0),
+    }))
+}
+
+/// The variable binding of a colour that names a swatch the file has (`{color: alias}`).
+pub(crate) fn swatch(cx: &Cx, c: Option<&Value>) -> Option<Value> {
+    let id = c?.get("swatchID").and_then(Value::as_str).filter(|id| cx.shared.has_swatch(id))?;
+    Some(json!({"color": {"type": "VARIABLE_ALIAS", "id": id}}))
+}
+
+/// The tint a style gives the layers inside: its first enabled plain fill with `layeringType` 1
+/// (Sketch 2025 and newer), or with no `layeringType` when `legacy` (older files: a group's or
+/// instance's fill was its tint). Sketch draws a tint as the colour of everything inside.
+pub(crate) fn tint_of(style: Option<&Value>, legacy: bool) -> Option<Value> {
+    let fills = style?.get("fills")?.as_array()?;
+    let f = fills.iter().filter(|f| f.get("isEnabled").and_then(Value::as_bool) != Some(false)).find(|f| {
+        match f.get("layeringType").and_then(Value::as_i64) {
+            Some(t) => t == 1,
+            None => legacy,
+        }
+    })?;
+    (f.get("fillType").and_then(Value::as_i64).unwrap_or(0) == 0).then(|| f.get("color").filter(|c| c.is_object()).cloned()).flatten()
+}
+
+/// Recolour `layers` (Sketch JSON) with tint `color`: every enabled fill and border takes it,
+/// text takes it, nested instances take it as their own tint. Opacity stays as it was.
+pub(crate) fn tint_layers(layers: &mut [Value], color: &Value, depth: usize) {
+    if depth > 64 {
+        return;
+    }
+    for l in layers {
+        if let Some(st) = l.get_mut("style").and_then(Value::as_object_mut) {
+            for key in ["fills", "borders"] {
+                for p in st.get_mut(key).and_then(Value::as_array_mut).into_iter().flatten() {
+                    if let Some(m) = p.as_object_mut()
+                        && m.get("isEnabled").and_then(Value::as_bool) != Some(false)
+                        && !matches!(m.get("fillType").and_then(Value::as_i64), Some(4))
+                    {
+                        let c = tinted(m.get("color"), color);
+                        m.insert("fillType".into(), json!(0));
+                        m.insert("color".into(), c);
+                    }
+                }
+            }
+            if let Some(enc) = st.get_mut("textStyle").and_then(|t| t.get_mut("encodedAttributes")).and_then(Value::as_object_mut) {
+                let c = tinted(enc.get("MSAttributedStringColorAttribute"), color);
+                enc.insert("MSAttributedStringColorAttribute".into(), c);
+            }
+        }
+        if let Some(runs) = l.get_mut("attributedString").and_then(|a| a.get_mut("attributes")).and_then(Value::as_array_mut) {
+            for r in runs.iter_mut().filter_map(|r| r.get_mut("attributes")).filter_map(Value::as_object_mut) {
+                let c = tinted(r.get("MSAttributedStringColorAttribute"), color);
+                r.insert("MSAttributedStringColorAttribute".into(), c);
+            }
+        }
+        if l.get("_class").and_then(Value::as_str) == Some("symbolInstance") {
+            set_tint(l, color);
+        }
+        if let Some(kids) = l.get_mut("layers").and_then(Value::as_array_mut) {
+            tint_layers(kids, color, depth + 1);
+        }
+    }
+}
+
+/// Colour `old` (Sketch JSON) tinted with `tint`: the tint's colour, with both opacities.
+fn tinted(old: Option<&Value>, tint: &Value) -> Value {
+    let alpha = |c: Option<&Value>| c.and_then(|c| num(c, "alpha")).unwrap_or(1.0).clamp(0.0, 1.0);
+    let mut c = tint.clone();
+    if let Some(m) = c.as_object_mut() {
+        m.insert("alpha".into(), json!(alpha(Some(tint)) * alpha(old)));
+    }
+    c
+}
+
+/// Give layer `l` (Sketch JSON) tint `color`: as its one fill.
+pub(crate) fn set_tint(l: &mut Value, color: &Value) {
+    let fill = json!({"_class": "fill", "isEnabled": true, "fillType": 0, "color": color});
+    if let Some(m) = l.as_object_mut() {
+        let st = m.entry("style").or_insert_with(|| json!({"_class": "style"}));
+        if let Some(st) = st.as_object_mut() {
+            st.insert("fills".into(), json!([fill]));
+        }
+    }
+}
+
+/// Sketch's blend modes (0 normal … 17 plus lighter) by REST name.
+fn blend(mode: i64) -> Option<&'static str> {
+    const MODES: [&str; 18] = [
+        "NORMAL",
+        "DARKEN",
+        "MULTIPLY",
+        "COLOR_BURN",
+        "LIGHTEN",
+        "SCREEN",
+        "COLOR_DODGE",
+        "OVERLAY",
+        "SOFT_LIGHT",
+        "HARD_LIGHT",
+        "DIFFERENCE",
+        "EXCLUSION",
+        "HUE",
+        "SATURATION",
+        "COLOR",
+        "LUMINOSITY",
+        "LINEAR_BURN",
+        "LINEAR_DODGE",
+    ];
+    MODES.get(usize::try_from(mode).ok()?).copied()
+}
+
+fn list<'v>(v: &'v Value, key: &str) -> &'v [Value] {
+    let l = v.get(key).and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default();
+    l.get(..MAX_LIST).unwrap_or(l)
+}
+
+fn num(v: &Value, key: &str) -> Option<f64> {
+    v.get(key).and_then(Value::as_f64).filter(|x| x.is_finite())
+}
diff --git a/crates/format/src/sketch/style_tests.rs b/crates/format/src/sketch/style_tests.rs
new file mode 100644
index 00000000..e553ab6b
--- /dev/null
+++ b/crates/format/src/sketch/style_tests.rs
@@ -0,0 +1,366 @@
+//! Sketch styles → paints, strokes, effects, opacity, blend modes and masks.
+
+use figcraft_doc::color::{BlendMode, ColorProfile, GradientKind, ImageScaleMode, PaintKind};
+use figcraft_doc::{Document, EffectKind, NodeKind, StrokeAlign, StrokeCap, StrokeJoin};
+use serde_json::{Value, json};
+
+use super::fixture::*;
+use super::import;
+
+fn open_doc(document_json: Value, layers: Vec<Value>, files: &[(&str, &[u8])]) -> (Document, Vec<String>) {
+    let z = sketch_zip("50.2", 103, document_json, &[page("P", "Page", vec![artboard("A", "Board", 0.0, 0.0, 400.0, 400.0, layers)])], files);
+    import(&z, "f").unwrap()
+}
+
+fn open(layers: Vec<Value>) -> (Document, Vec<String>) {
+    open_doc(document(&["P"]), layers, &[])
+}
+
+fn node<'d>(doc: &'d Document, name: &str) -> &'d figcraft_doc::Node {
+    doc.nodes().find(|n| n.name == name).unwrap_or_else(|| panic!("no layer named {name}"))
+}
+
+fn r(name: &str) -> Value {
+    rect(name, 0.0, 0.0, 100.0, 50.0)
+}
+
+#[test]
+fn solid_and_disabled_fills() {
+    let mut second = solid_fill(0.0, 0.0, 1.0, 1.0);
+    second["isEnabled"] = json!(false);
+    let mut half = solid_fill(1.0, 0.0, 0.0, 1.0);
+    half["contextSettings"]["opacity"] = json!(0.5);
+    let (doc, _) = open(vec![styled(r("Two"), "fills", json!([half, second]))]);
+    let fills = &node(&doc, "Two").fills;
+    assert_eq!(fills.len(), 2);
+    assert!(matches!(fills[0].kind, PaintKind::Solid { color } if color.r == 1.0 && color.b == 0.0));
+    assert!((fills[0].opacity - 0.5).abs() < 1e-6 && fills[0].visible);
+    assert!(!fills[1].visible);
+}
+
+#[test]
+fn collapsed_shape_group_takes_the_groups_style() {
+    let inner = with(r("Inner"), "booleanOperation", json!(-1));
+    let g = styled(shape_group("Button", 0.0, 0.0, 100.0, 50.0, vec![inner]), "fills", json!([solid_fill(1.0, 0.0, 0.0, 1.0)]));
+    let (doc, _) = open(vec![g]);
+    assert!(matches!(node(&doc, "Button").fills[0].kind, PaintKind::Solid { color } if color.r == 1.0 && color.g == 0.0));
+}
+
+#[test]
+fn boolean_shape_group_takes_the_groups_style() {
+    let a = with(rect("A", 0.0, 0.0, 50.0, 50.0), "booleanOperation", json!(-1));
+    let b = with(rect("B", 10.0, 10.0, 20.0, 20.0), "booleanOperation", json!(1));
+    let g = styled(shape_group("Ring", 0.0, 0.0, 50.0, 50.0, vec![a, b]), "fills", json!([solid_fill(0.0, 1.0, 0.0, 1.0)]));
+    let (doc, _) = open(vec![g]);
+    assert_eq!(node(&doc, "Ring").fills.len(), 1);
+}
+
+#[test]
+fn gradients() {
+    let stops = json!([{"_class": "gradientStop", "position": 0, "color": color(1.0, 0.0, 0.0, 1.0)},
+                       {"_class": "gradientStop", "position": 1, "color": color(0.0, 0.0, 1.0, 1.0)}]);
+    let grad = |ty: i64, ellipse: f64| {
+        json!({"_class": "fill", "isEnabled": true, "fillType": 1, "color": color(0.0, 0.0, 0.0, 1.0),
+        "gradient": {"_class": "gradient", "gradientType": ty, "from": "{0.5, 0}", "to": "{0.5, 1}", "elipseLength": ellipse, "stops": stops.clone()}})
+    };
+    let (doc, _) = open(vec![
+        styled(r("Linear"), "fills", json!([grad(0, 0.0)])),
+        styled(r("Radial"), "fills", json!([grad(1, 0.5)])),
+        styled(r("Angular"), "fills", json!([grad(2, 0.0)])),
+    ]);
+    let g = |name: &str| match &node(&doc, name).fills[0].kind {
+        PaintKind::Gradient(g) => g.clone(),
+        other => panic!("{name}: {other:?}"),
+    };
+    let lin = g("Linear");
+    assert_eq!(lin.kind, GradientKind::Linear);
+    assert_eq!((lin.from, lin.to), ((0.5, 0.0), (0.5, 1.0)));
+    assert_eq!(lin.stops.len(), 2);
+    assert_eq!(lin.stops[1].color.b, 1.0);
+    assert_eq!(g("Radial").kind, GradientKind::Radial);
+    // Sketch starts an angular gradient on the right and turns clockwise, whatever its from/to.
+    let ang = g("Angular");
+    assert_eq!(ang.kind, GradientKind::Angular);
+    assert_eq!((ang.from, ang.to, ang.width), ((0.5, 0.5), (1.0, 0.5), (0.5, 1.0)));
+    // The radial gradient's width handle: half the length, across the main axis (in pixels).
+    let rad = g("Radial");
+    let (dx, dy) = ((rad.width.0 - rad.from.0) * 100.0, (rad.width.1 - rad.from.1) * 50.0);
+    assert!(((dx * dx + dy * dy).sqrt() - 25.0).abs() < 1e-6, "{rad:?}");
+}
+
+#[test]
+fn pattern_fill_modes() {
+    let png = {
+        let mut out = Vec::new();
+        image::RgbaImage::new(2, 2).write_to(&mut std::io::Cursor::new(&mut out), image::ImageFormat::Png).unwrap();
+        out
+    };
+    let pat = |mode: i64| {
+        json!({"_class": "fill", "isEnabled": true, "fillType": 4, "patternFillType": mode, "patternTileScale": 1,
+        "image": {"_class": "MSJSONFileReference", "_ref": "images/p1.png"}})
+    };
+    let layers = (0..4).map(|m| styled(r(&format!("M{m}")), "fills", json!([pat(m)]))).collect();
+    let (doc, _) = open_doc(document(&["P"]), layers, &[("images/p1.png", &png)]);
+    let mode = |name: &str| match &node(&doc, name).fills[0].kind {
+        PaintKind::Image(i) => i.scale_mode,
+        other => panic!("{other:?}"),
+    };
+    assert_eq!(mode("M0"), ImageScaleMode::Tile);
+    assert_eq!(mode("M1"), ImageScaleMode::Fill);
+    assert_eq!(mode("M2"), ImageScaleMode::Crop);
+    assert_eq!(mode("M3"), ImageScaleMode::Fit);
+    assert_eq!(doc.images.len(), 1);
+}
+
+#[test]
+fn noise_fill_warns() {
+    let noise = json!({"_class": "fill", "isEnabled": true, "fillType": 5, "noiseIntensity": 0.3});
+    let (_, warnings) = open(vec![styled(r("Noisy"), "fills", json!([noise]))]);
+    assert!(warnings.iter().any(|w| w.contains("noise")), "{warnings:?}");
+}
+
+#[test]
+fn borders() {
+    let border = |pos: i64, t: f64| json!({"_class": "border", "isEnabled": true, "fillType": 0, "color": color(0.0, 0.0, 0.0, 1.0), "position": pos, "thickness": t});
+    let opts = json!({"_class": "borderOptions", "isEnabled": true, "dashPattern": [4, 2], "lineCapStyle": 1, "lineJoinStyle": 2});
+    let (doc, warnings) = open(vec![
+        styled(r("Center"), "borders", json!([border(0, 2.0)])),
+        styled(styled(r("Inside"), "borders", json!([border(1, 3.0)])), "borderOptions", opts),
+        styled(r("Outside"), "borders", json!([border(2, 1.0)])),
+        styled(r("Two"), "borders", json!([border(1, 1.0), border(1, 5.0)])),
+    ]);
+    let s = |n: &str| node(&doc, n).stroke.clone();
+    assert_eq!((s("Center").align, s("Center").weight), (StrokeAlign::Center, 2.0));
+    assert_eq!((s("Inside").align, s("Inside").weight), (StrokeAlign::Inside, 3.0));
+    assert_eq!(s("Inside").dashes, vec![4.0, 2.0]);
+    assert_eq!((s("Inside").cap_start, s("Inside").join), (StrokeCap::Round, StrokeJoin::Bevel));
+    assert_eq!(s("Outside").align, StrokeAlign::Outside);
+    assert_eq!(node(&doc, "Two").strokes.len(), 2);
+    assert_eq!(s("Two").weight, 1.0);
+    assert!(warnings.iter().any(|w| w.contains("borders")), "{warnings:?}");
+}
+
+#[test]
+fn shadows_and_blurs() {
+    let shadow = json!({"_class": "shadow", "isEnabled": true, "blurRadius": 8, "offsetX": 2, "offsetY": 4, "spread": 1, "color": color(0.0, 0.0, 0.0, 0.5),
+        "contextSettings": {"_class": "graphicsContextSettings", "blendMode": 0, "opacity": 1}});
+    let mut off = shadow.clone();
+    off["isEnabled"] = json!(false);
+    let blur = |ty: i64| json!({"_class": "blur", "isEnabled": true, "radius": 6, "type": ty});
+    let (doc, warnings) = open(vec![
+        styled(styled(r("Shadowed"), "shadows", json!([shadow, off])), "innerShadows", json!([shadow])),
+        styled(r("Blurred"), "blur", blur(0)),
+        styled(r("Frosted"), "blur", blur(3)),
+        styled(r("Moving"), "blur", blur(1)),
+    ]);
+    let fx = &node(&doc, "Shadowed").effects;
+    assert_eq!(fx.len(), 3);
+    match &fx[0].kind {
+        EffectKind::DropShadow(s) => assert_eq!((s.offset, s.radius, s.spread, s.color.a), ((2.0, 4.0), 8.0, 1.0, 0.5)),
+        other => panic!("{other:?}"),
+    }
+    assert!(!fx[1].visible);
+    assert!(matches!(fx[2].kind, EffectKind::InnerShadow(_)));
+    assert!(matches!(node(&doc, "Blurred").effects[0].kind, EffectKind::LayerBlur(_)));
+    assert!(matches!(node(&doc, "Frosted").effects[0].kind, EffectKind::BackgroundBlur(_)));
+    // Motion blur: drawn as a plain blur of half the radius.
+    assert!(matches!(node(&doc, "Moving").effects[0].kind, EffectKind::LayerBlur(_)));
+    assert!(warnings.iter().any(|w| w.contains("motion")), "{warnings:?}");
+}
+
+#[test]
+fn opacity_and_blend() {
+    let modes = [
+        BlendMode::Normal,
+        BlendMode::Darken,
+        BlendMode::Multiply,
+        BlendMode::ColorBurn,
+        BlendMode::Lighten,
+        BlendMode::Screen,
+        BlendMode::ColorDodge,
+        BlendMode::Overlay,
+        BlendMode::SoftLight,
+        BlendMode::HardLight,
+        BlendMode::Difference,
+        BlendMode::Exclusion,
+        BlendMode::Hue,
+        BlendMode::Saturation,
+        BlendMode::Color,
+        BlendMode::Luminosity,
+        BlendMode::PlusDarker,
+        BlendMode::PlusLighter,
+    ];
+    let layers = (0..modes.len())
+        .map(|i| styled(r(&format!("B{i}")), "contextSettings", json!({"_class": "graphicsContextSettings", "opacity": 0.3, "blendMode": i})))
+        .collect();
+    let (doc, _) = open(layers);
+    for (i, m) in modes.iter().enumerate() {
+        let n = node(&doc, &format!("B{i}"));
+        assert!((n.opacity - 0.3).abs() < 1e-6);
+        // A normal layer passes through like any other.
+        if i > 0 {
+            assert_eq!(n.blend, *m, "mode {i}");
+        }
+    }
+}
+
+#[test]
+fn clipping_mask_chain() {
+    let mask = with(r("Mask"), "hasClippingMask", json!(true));
+    let a = r("A");
+    let b = with(r("B"), "shouldBreakMaskChain", json!(true));
+    let c = r("C");
+    let (doc, _) = open(vec![group("G", 0.0, 0.0, 100.0, 50.0, vec![mask, a, b, c])]);
+    let m = node(&doc, "Mask");
+    assert!(m.is_mask);
+    // The mask and what it clips share a group of their own, so B and C stay unclipped.
+    let holder = m.parent.unwrap();
+    let kids: Vec<&str> = doc.node(holder).unwrap().children.iter().map(|c| doc.node(*c).unwrap().name.as_str()).collect();
+    assert_eq!(kids, ["Mask", "A"]);
+    assert_ne!(node(&doc, "B").parent, Some(holder));
+    let bb = doc.world_bounds(node(&doc, "A").id).unwrap();
+    assert_eq!((bb.x0, bb.y0), (0.0, 0.0));
+}
+
+#[test]
+fn display_p3_document() {
+    let mut d = document(&["P"]);
+    d["colorSpace"] = json!(2);
+    let (doc, _) = open_doc(d, vec![], &[]);
+    assert_eq!(doc.color_profile, ColorProfile::DisplayP3);
+}
+
+#[test]
+fn style_on_frames_and_text_kinds_untouched() {
+    // An artboard keeps its background when its style has no fills.
+    let (doc, _) = open(vec![]);
+    assert!(matches!(node(&doc, "Board").kind, NodeKind::Frame));
+    assert_eq!(node(&doc, "Board").fills.len(), 1);
+}
+
+#[test]
+fn shape_group_masks_clip() {
+    // Sketch 51 and older: the mask is a shape group.
+    let inner = with(r("Outline"), "booleanOperation", json!(-1));
+    let mask = with(shape_group("Card", 0.0, 0.0, 100.0, 50.0, vec![inner]), "hasClippingMask", json!(true));
+    let a = rect("A", 0.0, 0.0, 300.0, 300.0);
+    let b = with(r("B"), "shouldBreakMaskChain", json!(true));
+    let (doc, _) = open(vec![group("G", 0.0, 0.0, 300.0, 300.0, vec![mask, a, b])]);
+    let m = node(&doc, "Card");
+    assert!(m.is_mask);
+    let holder = doc.node(m.parent.unwrap()).unwrap();
+    let kids: Vec<&str> = holder.children.iter().map(|c| doc.node(*c).unwrap().name.as_str()).collect();
+    assert_eq!(kids, ["Card", "A"]);
+}
+
+#[test]
+fn masked_icon_keeps_its_geometry() {
+    let oval = {
+        let mut o = with(rect("Path", 0.0, 0.0, 67.0, 67.0), "booleanOperation", json!(-1));
+        o["_class"] = json!("oval");
+        o
+    };
+    let mask = styled(
+        with(shape_group("Circle", 0.0, 0.0, 67.0, 67.0, vec![oval]), "hasClippingMask", json!(true)),
+        "fills",
+        json!([solid_fill(0.9, 0.9, 0.9, 1.0)]),
+    );
+    let p = |id: &str, x: f64, y: f64, w: f64, h: f64, op: i64| {
+        with(shape_path(id, x, y, w, h, &[(0.0, 0.0), (1.0, 0.0), (1.0, 1.0)], true), "booleanOperation", json!(op))
+    };
+    let content = styled(
+        shape_group(
+            "Body",
+            12.0,
+            12.0,
+            45.0,
+            62.0,
+            vec![p("P1", 9.0, 9.0, 22.0, 22.0, -1), p("P2", 25.0, 15.0, 20.0, 15.0, 0), p("P3", 0.0, 17.0, 31.0, 45.0, 0)],
+        ),
+        "fills",
+        json!([solid_fill(0.5, 0.5, 0.5, 1.0)]),
+    );
+    let (doc, _) = open(vec![group("Icon", 152.0, 20.0, 67.0, 67.0, vec![mask, content])]);
+    let b = doc.world_bounds(node(&doc, "Circle").id).unwrap();
+    assert_eq!((b.x0, b.y0, b.width(), b.height()), (152.0, 20.0, 67.0, 67.0), "mask");
+    let b = doc.world_bounds(node(&doc, "Body").id).unwrap();
+    assert!((b.x0 - 164.0).abs() < 1e-6 && (b.y0 - 41.0).abs() < 1e-6 && (b.width() - 45.0).abs() < 1e-6, "body {b:?}");
+    assert!(matches!(node(&doc, "Circle").kind, NodeKind::Ellipse { .. }));
+}
+
+#[test]
+fn two_styled_masks_each_draw() {
+    let fill = json!([solid_fill(0.5, 0.5, 0.5, 1.0)]);
+    let m1 = styled(with(r("Mask1"), "hasClippingMask", json!(true)), "fills", fill.clone());
+    let m2 = styled(with(rect("Mask2", 200.0, 0.0, 100.0, 50.0), "hasClippingMask", json!(true)), "fills", fill);
+    let (doc, _) = open(vec![group("G", 0.0, 0.0, 300.0, 50.0, vec![m1, r("A"), m2, rect("B", 200.0, 0.0, 10.0, 10.0)])]);
+    // The drawn copy of the second mask isn't inside the first mask's group.
+    let copy = doc.nodes().find(|n| n.name == "Mask2 (drawn)").unwrap();
+    let first_group = node(&doc, "Mask1").parent.unwrap();
+    assert_ne!(copy.parent, Some(first_group));
+}
+
+#[test]
+fn bitmap_color_controls_become_filters() {
+    let png = {
+        let mut out = Vec::new();
+        image::RgbaImage::new(2, 2).write_to(&mut std::io::Cursor::new(&mut out), image::ImageFormat::Png).unwrap();
+        out
+    };
+    let mut bitmap = r("Photo");
+    bitmap["_class"] = json!("bitmap");
+    bitmap["image"] = json!({"_class": "MSJSONFileReference", "_ref": "images/a.png"});
+    bitmap["style"]["colorControls"] =
+        json!({"_class": "colorControls", "isEnabled": true, "brightness": 0, "contrast": 1, "hue": 0.5, "saturation": 0});
+    let (doc, warnings) = open_doc(document(&["P"]), vec![bitmap], &[("images/a.png", &png)]);
+    let PaintKind::Image(img) = &node(&doc, "Photo").fills[0].kind else { panic!("no image") };
+    assert_eq!(img.filters.saturation, -1.0);
+    assert_eq!(img.filters.contrast, 0.0);
+    assert!(warnings.iter().any(|w| w.contains("hue")), "{warnings:?}");
+}
+
+/// An alpha mask (`clippingMaskMode` 1) only masks: Sketch doesn't draw its fill under the content.
+#[test]
+fn alpha_masks_draw_no_copy() {
+    let fill = json!([solid_fill(0.0, 0.0, 0.0, 1.0)]);
+    let m = styled(with(with(r("Fade"), "hasClippingMask", json!(true)), "clippingMaskMode", json!(1)), "fills", fill);
+    let (doc, _) = open(vec![group("G", 0.0, 0.0, 100.0, 50.0, vec![m, r("Photo")])]);
+    assert!(!doc.nodes().any(|n| n.name == "Fade (drawn)"));
+    assert_eq!(node(&doc, "Fade").mask_type, figcraft_doc::MaskType::Alpha);
+}
+
+/// A progressive opacity (Fade: `contextSettings.isProgressive` with a gradient) becomes an alpha
+/// mask of that gradient over the layer, in a group in the layer's place.
+#[test]
+fn fades_become_alpha_masks() {
+    let fade = json!({"_class": "graphicsContextSettings", "blendMode": 0, "opacity": 1, "isProgressive": true,
+        "gradient": {"_class": "gradient", "gradientType": 0, "from": "{0.5, 0}", "to": "{0.5, 1}", "stops": [
+            {"_class": "gradientStop", "position": 0, "color": color(0.0, 0.0, 0.0, 1.0)}, {"_class": "gradientStop", "position": 1, "color": color(0.0, 0.0, 0.0, 0.0)}]}});
+    let l = styled(rect("Photo", 30.0, 40.0, 100.0, 50.0), "contextSettings", fade);
+    let (doc, _) = open(vec![group("G", 0.0, 0.0, 200.0, 200.0, vec![l])]);
+    // The group takes the layer's name too.
+    let photo = doc.nodes().find(|n| n.name == "Photo" && matches!(n.kind, NodeKind::Rectangle)).unwrap();
+    let wrap = doc.node(photo.parent.unwrap()).unwrap();
+    assert_eq!(wrap.name, "Photo");
+    assert!(matches!(wrap.kind, NodeKind::Group), "{:?}", wrap.kind);
+    let mask = doc.node(wrap.children[0]).unwrap();
+    assert!(mask.is_mask && mask.mask_type == figcraft_doc::MaskType::Alpha);
+    assert!(matches!(mask.fills[0].kind, PaintKind::Gradient(_)));
+    assert_eq!(doc.world_bounds(mask.id), doc.world_bounds(photo.id));
+    let b = doc.world_bounds(photo.id).unwrap();
+    assert_eq!((b.x0, b.y0, b.width(), b.height()), (30.0, 40.0, 100.0, 50.0));
+}
+
+/// Sketch's linear gradients run square in pixels: on a 200×100 layer, from the top left to the
+/// bottom right, the stripes are at right angles to that line in pixels, not in the layer's 0–1.
+#[test]
+fn linear_gradients_are_square_in_pixels() {
+    let g = json!({"_class": "fill", "isEnabled": true, "fillType": 1, "color": color(0.0, 0.0, 0.0, 1.0),
+        "gradient": {"_class": "gradient", "gradientType": 0, "from": "{0, 0}", "to": "{1, 1}", "stops": [
+            {"_class": "gradientStop", "position": 0, "color": color(0.0, 0.0, 0.0, 1.0)}, {"_class": "gradientStop", "position": 1, "color": color(1.0, 1.0, 1.0, 1.0)}]}});
+    let (doc, _) = open(vec![styled(rect("Wide", 0.0, 0.0, 200.0, 100.0), "fills", json!([g]))]);
+    let PaintKind::Gradient(g) = &node(&doc, "Wide").fills[0].kind else { panic!("not a gradient") };
+    // The line runs (200, 100) in pixels; square to it, (−100, 200), is (−0.5, 2) in 0–1.
+    let (wx, wy) = ((g.width.0 - g.from.0) * 200.0, (g.width.1 - g.from.1) * 100.0);
+    assert!((wx * 200.0 + wy * 100.0).abs() < 1e-6, "{g:?}");
+}
diff --git a/crates/format/src/sketch/symbols.rs b/crates/format/src/sketch/symbols.rs
new file mode 100644
index 00000000..dd806282
--- /dev/null
+++ b/crates/format/src/sketch/symbols.rs
@@ -0,0 +1,520 @@
+//! Sketch symbols → REST components and instances.
+//!
+//! A `symbolMaster` (on any page, or copied from a library into `document.foreignSymbols`) is a
+//! component; a `symbolInstance` names it by `symbolID`. REST instances carry their layers, so an
+//! instance is its master's layers with the instance's `overrideValues` applied, laid out at the
+//! master's size (the import then resizes them to the instance by their constraints). An override
+//! is named `<path>_<property>`: `path` is the `do_objectID` of a layer of the master, or of
+//! nested instances and then a layer of theirs, joined by `/`; properties: `stringValue` (text),
+//! `symbolID` (swap a nested instance; empty hides it), `image`, `layerStyle` and `textStyle`
+//! (shared style ids).
+
+use std::collections::BTreeMap;
+
+use figcraft_doc::geom::Affine;
+use serde_json::{Map as JsonMap, Value, json};
+
+use super::shared::Shared;
+use super::tree::{Cx, base, bool_field, children, local, size, str_field};
+
+/// Work units an override handed on to a nested instance costs (the JSON values it adds).
+const OVERRIDE_COST: u64 = 8;
+/// Most masters read from one file.
+const MAX_MASTERS: usize = 100_000;
+
+/// Every symbol master of a file by `symbolID`, and the library ones no page holds.
+#[derive(Default)]
+pub(crate) struct Symbols {
+    masters: BTreeMap<String, Value>,
+    /// What expanding each master costs (see [`weight`]).
+    weights: BTreeMap<String, u64>,
+    /// Masters copied from libraries that no page holds (they get a page of their own), with the
+    /// libraries' names.
+    pub foreign: Vec<Value>,
+    pub libraries: Vec<String>,
+}
+
+impl Symbols {
+    /// The masters of `pages` and of the document's library copies.
+    pub(crate) fn read(document: &Value, pages: &[(String, Value)]) -> Symbols {
+        let mut s = Symbols::default();
+        let mut found = Vec::new();
+        for (_, p) in pages {
+            masters_in(p, &mut found, 0);
+        }
+        for m in found {
+            s.add(m.clone());
+        }
+        for f in document.get("foreignSymbols").and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default() {
+            let Some(m) = f.get("symbolMaster") else { continue };
+            let Some(id) = str_field(m, "symbolID") else { continue };
+            if s.masters.contains_key(id) {
+                continue;
+            }
+            if let Some(lib) = str_field(f, "sourceLibraryName")
+                && !s.libraries.iter().any(|l| l == lib)
+            {
+                s.libraries.push(lib.chars().take(64).collect());
+            }
+            s.add(m.clone());
+            s.foreign.push(m.clone());
+        }
+        s
+    }
+
+    fn add(&mut self, m: Value) {
+        if self.masters.len() >= MAX_MASTERS {
+            return;
+        }
+        if let Some(id) = str_field(&m, "symbolID")
+            && !self.masters.contains_key(id)
+        {
+            self.weights.insert(id.to_string(), weight(&m, 0));
+            self.masters.insert(id.to_string(), m);
+        }
+    }
+
+    fn master(&self, symbol_id: &str) -> Option<&Value> {
+        self.masters.get(symbol_id)
+    }
+}
+
+/// What copying and mapping `v` costs, in work units: one per JSON value, one per 8 bytes of text.
+pub(crate) fn weight(v: &Value, depth: usize) -> u64 {
+    if depth > 256 {
+        return 1;
+    }
+    match v {
+        Value::String(s) => 1 + s.len() as u64 / 8,
+        Value::Array(a) => 1 + a.iter().map(|x| weight(x, depth + 1)).sum::<u64>(),
+        Value::Object(o) => 1 + o.iter().map(|(k, x)| k.len() as u64 / 8 + weight(x, depth + 1)).sum::<u64>(),
+        _ => 1,
+    }
+}
+
+fn masters_in<'v>(l: &'v Value, out: &mut Vec<&'v Value>, depth: usize) {
+    if depth > 64 {
+        return;
+    }
+    for c in super::tree::layers(l) {
+        if str_field(c, "_class") == Some("symbolMaster") {
+            out.push(c);
+        } else {
+            masters_in(c, out, depth + 1);
+        }
+    }
+}
+
+/// A master's background as REST fills (masters show one only when they have it on).
+pub(crate) fn master_fills(m: &Value) -> Option<Value> {
+    if bool_field(m, "hasBackgroundColor") != Some(true) {
+        return None;
+    }
+    let c = m.get("backgroundColor").and_then(super::tree::color)?;
+    Some(json!([{"type": "SOLID", "color": c}]))
+}
+
+/// What a master shows as a frame (its instances the same): clipping, and in Sketch 2025 and newer
+/// its style (fills, borders, effects) and corners.
+fn frame_look(cx: &mut Cx, m: &Value, w: f64, h: f64, node: &mut JsonMap<String, Value>) {
+    // `clippingBehavior` 2 doesn't clip.
+    node.insert("clipsContent".into(), json!(m.get("clippingBehavior").and_then(Value::as_i64) != Some(2)));
+    if m.get("groupBehavior").is_some()
+        && let Some(st) = m.get("style")
+    {
+        // Tint fills aren't painted (see `style::fills`).
+        super::style::apply(cx, st, w, h, node);
+    }
+    super::tree::style_corners(m, node);
+}
+
+/// A symbol master as a COMPONENT node.
+pub(crate) fn component(cx: &mut Cx, l: &Value, parent: Affine, depth: usize, root: bool) -> Option<Value> {
+    let (w, h) = size(l);
+    let world = parent * local(l, w, h);
+    let mut node = base(l, "COMPONENT", parent, world, w, h, root);
+    frame_look(cx, l, w, h, &mut node);
+    if let Some(f) = master_fills(l) {
+        node.insert("fills".into(), f);
+    }
+    super::tree::extras(cx, l, h, &mut node);
+    let sid = str_field(l, "symbolID").unwrap_or("").to_string();
+    // A graphic's fill tints its layers.
+    let tinted;
+    let l = match super::style::tint_of(l.get("style"), false).filter(|_| super::tree::spend_on_tint(cx, l)) {
+        Some(t) => {
+            let mut c = l.clone();
+            if let Some(kids) = c.get_mut("layers").and_then(Value::as_array_mut) {
+                super::style::tint_layers(kids, &t, 0);
+            }
+            tinted = c;
+            &tinted
+        }
+        _ => l,
+    };
+    cx.chain.push(sid);
+    let kids = children(cx, l, world, (w, h), depth, false);
+    cx.chain.pop();
+    node.insert("children".into(), Value::Array(kids));
+    super::stack::apply(l, &mut node);
+    Some(Value::Object(node))
+}
+
+/// A symbol instance as an INSTANCE node holding its master's layers with its overrides, or an
+/// empty frame when its master isn't in the file.
+pub(crate) fn instance(cx: &mut Cx, l: &Value, parent: Affine, depth: usize, root: bool) -> Option<Value> {
+    let (w, h) = size(l);
+    let world = parent * local(l, w, h);
+    let sid = str_field(l, "symbolID").unwrap_or("");
+    let cost = cx.symbols.weights.get(sid).copied().unwrap_or(0);
+    if cx.symbols.master(sid).is_some() && !cx.spend(cost) {
+        let mut node = base(l, "FRAME", parent, world, w, h, root);
+        node.insert("children".into(), json!([]));
+        return Some(Value::Object(node));
+    }
+    let Some(m) = cx.symbols.master(sid).cloned() else {
+        cx.warn("instances of symbols that aren't in the file were imported as empty frames");
+        let mut node = base(l, "FRAME", parent, world, w, h, root);
+        node.insert("children".into(), json!([]));
+        return Some(Value::Object(node));
+    };
+    if cx.chain.iter().any(|c| c == sid) {
+        let name: String = str_field(&m, "name").unwrap_or("").chars().take(64).collect();
+        cx.warn(format!("symbol {name} contains itself; the inner copy was left out"));
+        return None;
+    }
+    // Sketch 50 stores "not scaled" as 0.
+    if l.get("scale").and_then(Value::as_f64).is_some_and(|s| s.is_finite() && s != 0.0 && (s - 1.0).abs() > 1e-9) {
+        cx.warn("scaled symbol instances were imported at their size, unscaled");
+    }
+    let mut node = base(l, "INSTANCE", parent, world, w, h, root);
+    node.insert("componentId".into(), json!(str_field(&m, "do_objectID").unwrap_or(sid)));
+    frame_look(cx, &m, w, h, &mut node);
+    // Instances show the master's background only when it says so.
+    if bool_field(&m, "includeBackgroundColorInInstance") == Some(true)
+        && let Some(f) = master_fills(&m)
+    {
+        node.insert("fills".into(), f);
+    }
+    // An instance's fill is a tint for its layers, not a paint of its own.
+    if let Some(st) = l.get("style") {
+        let mut st = st.clone();
+        if let Some(o) = st.as_object_mut() {
+            o.remove("fills");
+        }
+        super::style::apply(cx, &st, w, h, &mut node);
+    }
+    super::tree::extras(cx, l, h, &mut node);
+    // An instance shows its master's grids (else they'd differ, and count as an override).
+    super::proto::layout_grids(&m, h, &mut node);
+    let overrides = overrides(l);
+    let nested = nested(&overrides);
+    let mut copy = m;
+    let mut budget = cx.work_left();
+    if let Some(layers) = copy.get_mut("layers").and_then(Value::as_array_mut) {
+        apply(layers, &overrides, &nested, &cx.shared, &cx.symbols, 0, &mut budget);
+    }
+    let used = cx.work_left().saturating_sub(budget);
+    cx.spend(used);
+    if budget == 0 {
+        // The budget ran out handing overrides on: noted.
+        cx.spend(1);
+    }
+    // The tint: the instance's own (a colour override on it, or its fill), else a graphic master's.
+    let own = str_field(l, "do_objectID").map(|id| format!("{id}_fillColor"));
+    let tint = own
+        .and_then(|k| overrides.get(&k).filter(|c| c.is_object()).cloned())
+        .or_else(|| super::style::tint_of(l.get("style"), true))
+        .or_else(|| super::style::tint_of(copy.get("style"), false));
+    if let Some(t) = tint
+        && let Some(layers) = copy.get_mut("layers").and_then(Value::as_array_mut)
+    {
+        super::style::tint_layers(layers, &t, 0);
+    }
+    // The master's layers laid out for the instance's size, as Sketch does it.
+    let (mw, mh) = size(&copy);
+    // A graphic's layers resize in proportion, whatever their pins.
+    let graphic = copy.get("groupBehavior").and_then(Value::as_i64) == Some(2);
+    // A stack's layers are placed by its auto layout (when the file is opened), not by their pins.
+    let stacked = !graphic && super::stack::is_stack(&copy);
+    if ((mw - w).abs() > 1e-9 || (mh - h).abs() > 1e-9)
+        && !stacked
+        && let Some(layers) = copy.get_mut("layers").and_then(Value::as_array_mut)
+    {
+        resize(layers, (mw, mh), (w, h), cx.legacy_resize || graphic, 0);
+    }
+    cx.chain.push(sid.to_string());
+    let mut kids = children(cx, &copy, world, (w, h), depth, false);
+    cx.chain.pop();
+    node.insert("children".into(), Value::Array(std::mem::take(&mut kids)));
+    // The master's stack lays the instance out too (matched by the master's layer ids), sized as
+    // the instance says.
+    for k in ["horizontalSizing", "verticalSizing"] {
+        if let Some(v) = l.get(k) {
+            copy[k] = v.clone();
+        }
+    }
+    super::stack::apply(&copy, &mut node);
+    let prefix = str_field(l, "do_objectID").unwrap_or("I").to_string();
+    for k in node.get_mut("children").and_then(Value::as_array_mut).into_iter().flatten() {
+        prefix_ids(k, &prefix, 0);
+    }
+    Some(Value::Object(node))
+}
+
+/// Lay `layers` (the children of a box of `old` size) out for the box at `new` size, the way Sketch
+/// resizes a symbol instance's layers: groups pass the change on to their own layers. Files older
+/// than format 110 scale everything; newer ones follow each layer's `resizingConstraint`.
+fn resize(layers: &mut [Value], old: (f64, f64), new: (f64, f64), legacy: bool, depth: usize) {
+    if depth > 64 {
+        return;
+    }
+    for l in layers {
+        let mask = if legacy { 63 } else { super::tree::pin_mask(l) };
+        let Some(f) = l.get_mut("frame").and_then(Value::as_object_mut) else { continue };
+        let n = |k: &str| f.get(k).and_then(Value::as_f64).filter(|v| v.is_finite()).unwrap_or(0.0);
+        let (x, y, w, h) = (n("x"), n("y"), n("width").max(0.0), n("height").max(0.0));
+        // A cleared bit pins: right 1, width 2, left 4, bottom 8, height 16, top 32.
+        let pinned = |bit: i64| mask & bit == 0;
+        let (nx, nw) = resize_axis(x, w, old.0, new.0, (pinned(4), pinned(2), pinned(1)));
+        let (ny, nh) = resize_axis(y, h, old.1, new.1, (pinned(32), pinned(16), pinned(8)));
+        for (k, v) in [("x", nx), ("y", ny), ("width", nw), ("height", nh)] {
+            f.insert(k.into(), json!(v));
+        }
+        // A graphic's layers resize in proportion, whatever their pins.
+        let graphic = l.get("groupBehavior").and_then(Value::as_i64) == Some(2);
+        if let Some(kids) = l.get_mut("layers").and_then(Value::as_array_mut) {
+            resize(kids, (w, h), (nw, nh), legacy || graphic, depth + 1);
+        }
+    }
+}
+
+/// One axis of [`resize`]: a layer at `pos` of `size` in a parent going from `old` to `new`, with
+/// its start, size and end pinned or not. Nothing pinned (or everything): it scales. One side
+/// pinned: the size and the free side share the change, in proportion to their lengths. Only the
+/// size fixed: its centre scales. Both sides pinned: the size takes the change.
+fn resize_axis(pos: f64, size: f64, old: f64, new: f64, (start, fixed, end): (bool, bool, bool)) -> (f64, f64) {
+    if old <= 1e-9 || !new.is_finite() {
+        return (pos, size);
+    }
+    let k = new / old;
+    let d = new - old;
+    let far = old - pos - size;
+    let share = |part: f64, other: f64| if part + other > 1e-9 { d * part / (part + other) } else { d };
+    let (p, s) = match (start, fixed, end) {
+        (true, false, false) => (pos, size + share(size, far)),
+        (false, false, true) => {
+            let s = size + share(size, pos);
+            (new - far - s, s)
+        }
+        (false, true, false) => ((pos + size / 2.0) * k - size / 2.0, size),
+        (true, false, true) => (pos, size + d),
+        (true, true, false) => (pos, size),
+        (false, true, true) => (new - far - size, size),
+        _ => (pos * k, size * k),
+    };
+    (if p.is_finite() { p } else { pos }, if s.is_finite() { s.max(0.0) } else { size })
+}
+
+/// An instance's overrides by name (`<path>_<property>` → value).
+fn overrides(l: &Value) -> BTreeMap<String, Value> {
+    l.get("overrideValues")
+        .and_then(Value::as_array)
+        .map(Vec::as_slice)
+        .unwrap_or_default()
+        .iter()
+        .take(100_000)
+        .filter_map(|o| Some((str_field(o, "overrideName")?.to_string(), o.get("value")?.clone())))
+        .collect()
+}
+
+/// The overrides of layers inside nested instances, by the nested instance's id: `X/rest_prop` →
+/// `X` → [(`rest_prop`, value)].
+fn nested(ov: &BTreeMap<String, Value>) -> BTreeMap<&str, Vec<(&str, &Value)>> {
+    let mut out: BTreeMap<&str, Vec<(&str, &Value)>> = BTreeMap::new();
+    for (k, v) in ov {
+        if let Some((first, rest)) = k.split_once('/') {
+            out.entry(first).or_default().push((rest, v));
+        }
+    }
+    out
+}
+
+/// Apply `ov` to the layers of a master's copy: to the layers it names, and passed on to nested
+/// instances for the layers inside them (an outer override wins over the nested instance's own).
+/// Each override handed to a nested instance costs [`OVERRIDE_COST`] units of `budget` plus its
+/// value's [`weight`]; once it is spent, the rest aren't handed on.
+fn apply(
+    layers: &mut [Value],
+    ov: &BTreeMap<String, Value>,
+    nested: &BTreeMap<&str, Vec<(&str, &Value)>>,
+    shared: &Shared,
+    symbols: &Symbols,
+    depth: usize,
+    budget: &mut u64,
+) {
+    if depth > 64 || ov.is_empty() {
+        return;
+    }
+    for l in layers {
+        let Some(id) = str_field(l, "do_objectID").map(str::to_string) else { continue };
+        let get = |prop: &str| ov.get(&format!("{id}_{prop}"));
+        match str_field(l, "_class") {
+            Some("symbolInstance") => {
+                match get("symbolID").map(|v| v.as_str().unwrap_or("")) {
+                    Some("") => l["isVisible"] = json!(false),
+                    // A swap to a symbol the file doesn't have keeps the original, as in Sketch.
+                    Some(other) if symbols.master(other).is_some() => l["symbolID"] = json!(other),
+                    _ => {}
+                }
+                let inner = nested.get(id.as_str()).map(Vec::as_slice).unwrap_or_default();
+                // Each costs its copy's size: deep chains of large overrides use up the budget.
+                let mut take = 0;
+                for (_, v) in inner {
+                    let cost = OVERRIDE_COST + weight(v, 0);
+                    if cost > *budget {
+                        break;
+                    }
+                    *budget -= cost;
+                    take += 1;
+                }
+                if take > 0 {
+                    let mut own = l.get("overrideValues").and_then(Value::as_array).cloned().unwrap_or_default();
+                    own.extend(inner.iter().take(take).map(|(rest, v)| json!({"_class": "overrideValue", "overrideName": rest, "value": v})));
+                    l["overrideValues"] = Value::Array(own);
+                }
+                if let Some(v) = get("isVisible") {
+                    l["isVisible"] = json!(visible(v));
+                }
+                // A colour override on an instance is its tint.
+                if let Some(c) = get("fillColor").filter(|c| c.is_object()) {
+                    super::style::set_tint(l, c);
+                }
+                continue;
+            }
+            Some("text") => {
+                if let Some(v) = get("isVisible") {
+                    l["isVisible"] = json!(visible(v));
+                }
+                if let Some(s) = get("stringValue").and_then(Value::as_str) {
+                    set_string(l, s);
+                }
+                if let Some(c) = get("textColor").filter(|c| c.is_object()) {
+                    super::style::tint_layers(std::slice::from_mut(l), c, 0);
+                }
+            }
+            Some("bitmap") => {
+                if let Some(v) = get("isVisible") {
+                    l["isVisible"] = json!(visible(v));
+                }
+                if let Some(img) = get("image").filter(|v| v.get("_ref").is_some()) {
+                    l["image"] = img.clone();
+                }
+            }
+            _ => {
+                if let Some(v) = get("isVisible") {
+                    l["isVisible"] = json!(visible(v));
+                }
+                // A colour override on a shape or group: its first fill's colour.
+                if let Some(c) = get("fillColor").filter(|c| c.is_object())
+                    && let Some(f) = l
+                        .get_mut("style")
+                        .and_then(|s| s.get_mut("fills"))
+                        .and_then(Value::as_array_mut)
+                        .and_then(|f| f.first_mut())
+                        .and_then(Value::as_object_mut)
+                {
+                    f.insert("fillType".into(), json!(0));
+                    f.insert("color".into(), c.clone());
+                }
+            }
+        }
+        for (prop, text) in [("layerStyle", false), ("textStyle", true)] {
+            let sid = get(prop).and_then(Value::as_str);
+            // Shared styles that aren't objects are junk: left alone.
+            let Some((sid, style)) = sid.and_then(|sid| Some((sid, shared.style(text, sid).filter(|s| s.is_object())?))) else { continue };
+            let mut style = style.clone();
+            if let Some(m) = style.as_object_mut() {
+                // The layer now uses that shared style: it links to it.
+                m.insert("sharedObjectID".into(), json!(sid));
+            }
+            if text
+                && let Some(enc) = style.get("textStyle").and_then(|t| t.get("encodedAttributes"))
+                && let Some(runs) = l.get_mut("attributedString").and_then(|a| a.get_mut("attributes")).and_then(Value::as_array_mut)
+            {
+                for r in runs.iter_mut().filter_map(Value::as_object_mut) {
+                    r.insert("attributes".into(), enc.clone());
+                }
+            }
+            if let Some(m) = l.as_object_mut() {
+                m.insert("style".into(), style);
+            }
+        }
+        if let Some(kids) = l.get_mut("layers").and_then(Value::as_array_mut) {
+            apply(kids, ov, nested, shared, symbols, depth + 1, budget);
+        }
+    }
+}
+
+/// A visibility override's value: "0", 0 or false hide.
+fn visible(v: &Value) -> bool {
+    !matches!(v, Value::Bool(false)) && v.as_str() != Some("0") && v.as_i64() != Some(0)
+}
+
+/// A text layer's string replaced, in the style of its first run.
+fn set_string(l: &mut Value, s: &str) {
+    let units = s.encode_utf16().count();
+    let first = l.get("attributedString").and_then(|a| a.get("attributes")).and_then(Value::as_array).and_then(|a| a.first()).cloned();
+    let Some(a) = l.get_mut("attributedString").and_then(Value::as_object_mut) else { return };
+    a.insert("string".into(), json!(s));
+    let runs = match first {
+        Some(Value::Object(mut r)) => {
+            r.insert("location".into(), json!(0));
+            r.insert("length".into(), json!(units));
+            vec![Value::Object(r)]
+        }
+        _ => Vec::new(),
+    };
+    a.insert("attributes".into(), Value::Array(runs));
+}
+
+/// Make the ids of an instance's layers its own (`<instance>;<layer>`): the master's layers keep
+/// theirs.
+fn prefix_ids(v: &mut Value, prefix: &str, depth: usize) {
+    if depth > 256 {
+        return;
+    }
+    let Some(m) = v.as_object_mut() else { return };
+    if let Some(id) = m.get("id").and_then(Value::as_str).map(str::to_string) {
+        m.insert("id".into(), json!(format!("{prefix};{id}")));
+    }
+    if let Some(kids) = m.get_mut("children").and_then(Value::as_array_mut) {
+        for k in kids {
+            prefix_ids(k, prefix, depth + 1);
+        }
+    }
+}
+
+/// Library masters no page holds: a page of their own, side by side.
+pub(crate) fn library_page(cx: &mut Cx, masters: &[Value]) -> Value {
+    let mut x = 0.0;
+    let mut kids = Vec::new();
+    for m in masters {
+        let mut placed = m.clone();
+        let (w, _) = size(m);
+        if let Some(f) = placed.get_mut("frame").and_then(Value::as_object_mut) {
+            f.insert("x".into(), json!(x));
+            f.insert("y".into(), json!(0.0));
+        }
+        x += w + 100.0;
+        if let Some(node) = component(cx, &placed, Affine::IDENTITY, 0, true) {
+            kids.push(node);
+        }
+    }
+    let mut page = JsonMap::new();
+    page.insert("type".into(), json!("CANVAS"));
+    page.insert("id".into(), json!("library-symbols"));
+    page.insert("name".into(), json!("Library symbols"));
+    page.insert("children".into(), Value::Array(kids));
+    Value::Object(page)
+}
diff --git a/crates/format/src/sketch/symbols_tests.rs b/crates/format/src/sketch/symbols_tests.rs
new file mode 100644
index 00000000..7c2d73db
--- /dev/null
+++ b/crates/format/src/sketch/symbols_tests.rs
@@ -0,0 +1,303 @@
+//! Sketch symbols → components and instances with overrides.
+
+use figcraft_doc::{Document, Node, NodeKind};
+use serde_json::{Value, json};
+
+use super::fixture::*;
+use super::{import, import_within_nodes};
+
+const BLACK: [f64; 4] = [0.0, 0.0, 0.0, 1.0];
+
+/// One page with `layers`, one "Symbols" page with `masters`, and `document` changes.
+fn open_doc(doc_json: Value, layers: Vec<Value>, masters: Vec<Value>) -> (Document, Vec<String>) {
+    let z = sketch_zip("50.2", 103, doc_json, &[page("P", "Page", layers), page("S", "Symbols", masters)], &[]);
+    import(&z, "f").unwrap()
+}
+
+/// [`open`] for a file saved by another Sketch.
+fn open_version(app: &str, version: u64, layers: Vec<Value>, masters: Vec<Value>) -> (Document, Vec<String>) {
+    let z = sketch_zip(app, version, document(&["P", "S"]), &[page("P", "Page", layers), page("S", "Symbols", masters)], &[]);
+    import(&z, "f").unwrap()
+}
+
+fn open(layers: Vec<Value>, masters: Vec<Value>) -> (Document, Vec<String>) {
+    let mut d = document(&["P", "S"]);
+    d["do_objectID"] = json!("DOC");
+    open_doc(d, layers, masters)
+}
+
+fn named<'d>(doc: &'d Document, name: &str) -> Vec<&'d Node> {
+    doc.nodes().filter(|n| n.name == name).collect()
+}
+
+fn inside<'d>(doc: &'d Document, root: &Node, name: &str) -> &'d Node {
+    doc.subtree(root.id).into_iter().filter_map(|id| doc.node(id)).find(|n| n.name == name).unwrap_or_else(|| panic!("no {name}"))
+}
+
+fn chars(n: &Node) -> &str {
+    match &n.kind {
+        NodeKind::Text(td) => &td.characters,
+        other => panic!("{other:?}"),
+    }
+}
+
+fn instance_of<'d>(doc: &'d Document, name: &str) -> (&'d Node, &'d Node) {
+    let inst = named(doc, name).into_iter().find(|n| matches!(n.kind, NodeKind::Instance { .. })).unwrap_or_else(|| panic!("no instance {name}"));
+    let NodeKind::Instance { component, .. } = inst.kind else { panic!("not an instance") };
+    (inst, doc.node(component).unwrap())
+}
+
+fn button() -> Value {
+    master("M1", "S1", "Button", 100.0, 40.0, vec![text("Label", 10.0, 10.0, 80.0, 20.0, "Go", &[(0, 2, "Helvetica", 14.0, BLACK)])])
+}
+
+#[test]
+fn master_is_component_instance_links() {
+    let (doc, _) = open(vec![instance("I1", "S1", 0.0, 0.0, 100.0, 40.0, &[])], vec![button()]);
+    let (inst, main) = instance_of(&doc, "I1");
+    assert!(matches!(main.kind, NodeKind::Component { .. }));
+    assert_eq!(main.name, "Button");
+    assert_eq!(chars(inside(&doc, inst, "Label")), "Go");
+}
+
+#[test]
+fn string_override() {
+    let (doc, _) = open(vec![instance("I1", "S1", 0.0, 0.0, 100.0, 40.0, &[("Label_stringValue", json!("OK"))])], vec![button()]);
+    let (inst, main) = instance_of(&doc, "I1");
+    assert_eq!(chars(inside(&doc, inst, "Label")), "OK");
+    assert_eq!(chars(inside(&doc, main, "Label")), "Go");
+}
+
+#[test]
+fn nested_symbol_swap_and_hide() {
+    let icon_a = master("MA", "SA", "Icon A", 20.0, 20.0, vec![rect("Dot A", 0.0, 0.0, 20.0, 20.0)]);
+    let icon_b = master("MB", "SB", "Icon B", 20.0, 20.0, vec![rect("Dot B", 0.0, 0.0, 20.0, 20.0)]);
+    let card = master("MC", "SC", "Card", 100.0, 40.0, vec![instance("N", "SA", 0.0, 0.0, 20.0, 20.0, &[])]);
+    let swapped = instance("Swapped", "SC", 0.0, 0.0, 100.0, 40.0, &[("N_symbolID", json!("SB"))]);
+    let hidden = instance("Hidden", "SC", 0.0, 100.0, 100.0, 40.0, &[("N_symbolID", json!(""))]);
+    let (doc, _) = open(vec![swapped, hidden], vec![icon_a, icon_b, card]);
+    let (sw, _) = instance_of(&doc, "Swapped");
+    assert!(doc.subtree(sw.id).into_iter().filter_map(|i| doc.node(i)).any(|n| n.name == "Dot B"));
+    assert!(!doc.subtree(sw.id).into_iter().filter_map(|i| doc.node(i)).any(|n| n.name == "Dot A"));
+    let (hd, _) = instance_of(&doc, "Hidden");
+    let nested = doc.node(hd.children[0]).unwrap();
+    assert!(!nested.visible);
+}
+
+#[test]
+fn nested_path_override() {
+    let inner = master("MB", "SB", "Badge", 50.0, 20.0, vec![text("Count", 0.0, 0.0, 50.0, 20.0, "1", &[(0, 1, "Helvetica", 12.0, BLACK)])]);
+    let outer = master("MA", "SA", "Row", 100.0, 20.0, vec![instance("N", "SB", 50.0, 0.0, 50.0, 20.0, &[])]);
+    let (doc, _) = open(vec![instance("I1", "SA", 0.0, 0.0, 100.0, 20.0, &[("N/Count_stringValue", json!("42"))])], vec![inner, outer]);
+    let (inst, _) = instance_of(&doc, "I1");
+    assert_eq!(chars(inside(&doc, inst, "Count")), "42");
+}
+
+#[test]
+fn image_override() {
+    let mut bitmap = rect("Photo", 0.0, 0.0, 40.0, 40.0);
+    bitmap["_class"] = json!("bitmap");
+    bitmap["image"] = json!({"_class": "MSJSONFileReference", "_ref": "images/a.png"});
+    let m = master("M", "S", "Avatar", 40.0, 40.0, vec![bitmap]);
+    let png = {
+        let mut out = Vec::new();
+        image::RgbaImage::new(1, 1).write_to(&mut std::io::Cursor::new(&mut out), image::ImageFormat::Png).unwrap();
+        out
+    };
+    let mut png2 = Vec::new();
+    image::RgbaImage::new(2, 1).write_to(&mut std::io::Cursor::new(&mut png2), image::ImageFormat::Png).unwrap();
+    let inst = instance("I1", "S", 0.0, 0.0, 40.0, 40.0, &[("Photo_image", json!({"_class": "MSJSONFileReference", "_ref": "images/b.png"}))]);
+    let z = sketch_zip(
+        "50.2",
+        103,
+        document(&["P", "S"]),
+        &[page("P", "Page", vec![inst]), page("S", "Symbols", vec![m])],
+        &[("images/a.png", &png), ("images/b.png", &png2)],
+    );
+    let (doc, _) = import(&z, "f").unwrap();
+    assert_eq!(doc.images.len(), 2);
+}
+
+#[test]
+fn foreign_symbols_are_components() {
+    let mut d = document(&["P", "S"]);
+    d["foreignSymbols"] = json!([{"_class": "MSImmutableForeignSymbol", "sourceLibraryName": "Kit", "symbolMaster": button()}]);
+    let (doc, warnings) = open_doc(d, vec![instance("I1", "S1", 0.0, 0.0, 100.0, 40.0, &[])], vec![]);
+    let (_, main) = instance_of(&doc, "I1");
+    assert_eq!(main.name, "Button");
+    let page = doc.pages.iter().copied().find(|p| doc.is_ancestor(*p, main.id)).unwrap();
+    assert_eq!(doc.node(page).unwrap().name, "Library symbols");
+    assert!(warnings.iter().any(|w| w.contains("Kit")), "{warnings:?}");
+}
+
+#[test]
+fn missing_master_warns() {
+    let (doc, warnings) = open(vec![instance("Lost", "NOPE", 0.0, 0.0, 30.0, 30.0, &[])], vec![]);
+    let n = named(&doc, "Lost")[0];
+    assert!(matches!(n.kind, NodeKind::Frame));
+    assert_eq!((n.width, n.height), (30.0, 30.0));
+    assert!(warnings.iter().any(|w| w.contains("symbol")), "{warnings:?}");
+}
+
+#[test]
+fn self_containing_master_stops() {
+    let a = master("MA", "SA", "Loop A", 50.0, 50.0, vec![instance("Self", "SA", 0.0, 0.0, 10.0, 10.0, &[])]);
+    let b = master("MB", "SB", "Loop B", 50.0, 50.0, vec![instance("ToC", "SC", 0.0, 0.0, 10.0, 10.0, &[])]);
+    let c = master("MC", "SC", "Loop C", 50.0, 50.0, vec![instance("ToB", "SB", 0.0, 0.0, 10.0, 10.0, &[])]);
+    let (_, warnings) = open(vec![instance("I1", "SA", 0.0, 0.0, 50.0, 50.0, &[]), instance("I2", "SB", 100.0, 0.0, 50.0, 50.0, &[])], vec![a, b, c]);
+    assert!(warnings.iter().any(|w| w.contains("contains itself")), "{warnings:?}");
+}
+
+#[test]
+fn instance_explosion_is_bounded() {
+    let big = master("M", "S", "Big", 100.0, 100.0, (0..1000).map(|i| rect(&format!("R{i}"), 0.0, 0.0, 1.0, 1.0)).collect());
+    let many: Vec<Value> = (0..1000).map(|i| instance(&format!("I{i}"), "S", 0.0, 0.0, 100.0, 100.0, &[])).collect();
+    let z = sketch_zip("50.2", 103, document(&["P", "S"]), &[page("P", "Page", many), page("S", "Symbols", vec![big])], &[]);
+    let (doc, warnings) = import_within_nodes(&z, "f", 20_000).unwrap();
+    assert!(doc.nodes().count() <= 20_100);
+    assert!(warnings.iter().any(|w| w.contains("more than")), "{warnings:?}");
+}
+
+#[test]
+fn resized_instance_follows_constraints() {
+    // Pinned right with a fixed width (bits 1 and 2 cleared); a Sketch 64 file.
+    let pinned = with(rect("Tag", 80.0, 0.0, 20.0, 40.0), "resizingConstraint", json!(60));
+    let m = master("M", "S", "Bar", 100.0, 40.0, vec![pinned]);
+    let (doc, _) = open_version("64", 125, vec![instance("Wide", "S", 0.0, 0.0, 200.0, 40.0, &[])], vec![m]);
+    let (inst, _) = instance_of(&doc, "Wide");
+    let tag = inside(&doc, inst, "Tag");
+    let b = doc.world_bounds(tag.id).unwrap();
+    assert!((b.x0 - 180.0).abs() < 1e-6 && (b.width() - 20.0).abs() < 1e-6, "{b:?}");
+}
+
+/// Overrides pointing at junk (a shared style that isn't an object, text runs that aren't) never
+/// panic.
+#[test]
+fn override_application_survives_junk() {
+    let mut d = document(&["P", "S"]);
+    d["layerStyles"]["objects"] = json!([{"_class": "sharedStyle", "do_objectID": "S1", "name": "Junk", "value": 5}]);
+    d["layerTextStyles"]["objects"] =
+        json!([{"_class": "sharedStyle", "do_objectID": "T1", "name": "Junk text", "value": {"textStyle": {"encodedAttributes": {}}}}]);
+    let mut t = text("Label", 0.0, 0.0, 50.0, 20.0, "x", &[(0, 1, "Helvetica", 9.0, BLACK)]);
+    t["attributedString"]["attributes"] = json!([5, "x", null]);
+    let m = master("M", "S", "Junk master", 50.0, 20.0, vec![rect("C", 0.0, 0.0, 10.0, 10.0), t]);
+    let inst = instance(
+        "I1",
+        "S",
+        0.0,
+        0.0,
+        50.0,
+        20.0,
+        &[("C_layerStyle", json!("S1")), ("Label_textStyle", json!("T1")), ("Label_stringValue", json!("y"))],
+    );
+    let z = sketch_zip("50.2", 103, d, &[page("P", "Page", vec![inst]), page("S", "Symbols", vec![m])], &[]);
+    assert!(import(&z, "f").is_ok());
+}
+
+/// A huge master expanded by many instances stops at the file's work budget.
+#[test]
+fn expansion_work_is_bounded() {
+    let long = "x".repeat(200_000);
+    let m = master("M", "S", "Heavy", 50.0, 20.0, vec![text("Long", 0.0, 0.0, 50.0, 20.0, &long, &[(0, 200_000, "Helvetica", 9.0, BLACK)])]);
+    let many: Vec<Value> = (0..3000).map(|i| instance(&format!("I{i}"), "S", 0.0, 0.0, 50.0, 20.0, &[])).collect();
+    let z = sketch_zip("50.2", 103, document(&["P", "S"]), &[page("P", "Page", many), page("S", "Symbols", vec![m])], &[]);
+    let (_, warnings) = import(&z, "f").unwrap();
+    assert!(warnings.iter().any(|w| w.contains("expand")), "{warnings:?}");
+}
+
+/// Outer overrides fanned out to many nested instances stop at the work budget.
+#[test]
+fn override_fan_out_is_bounded() {
+    let inner = master("MB", "SB", "Cell", 10.0, 10.0, vec![text("T", 0.0, 0.0, 10.0, 10.0, "1", &[(0, 1, "Helvetica", 9.0, BLACK)])]);
+    let cells: Vec<Value> = (0..3000).map(|_| instance("X", "SB", 0.0, 0.0, 10.0, 10.0, &[])).collect();
+    let grid = master("MA", "SA", "Grid", 100.0, 100.0, cells);
+    let overrides: Vec<(String, Value)> = (0..3000).map(|i| (format!("X/N{i}_stringValue"), json!("v"))).collect();
+    let refs: Vec<(&str, Value)> = overrides.iter().map(|(k, v)| (k.as_str(), v.clone())).collect();
+    let z = sketch_zip(
+        "50.2",
+        103,
+        document(&["P", "S"]),
+        &[page("P", "Page", vec![instance("I", "SA", 0.0, 0.0, 100.0, 100.0, &refs)]), page("S", "Symbols", vec![inner, grid])],
+        &[],
+    );
+    let (_, warnings) = import(&z, "f").unwrap();
+    assert!(warnings.iter().any(|w| w.contains("expand")), "{warnings:?}");
+}
+
+/// Sketch 50 stores "not scaled" as `scale: 0`.
+#[test]
+fn scale_zero_is_unscaled() {
+    let mut i = instance("I1", "S1", 0.0, 0.0, 100.0, 40.0, &[]);
+    i["scale"] = json!(0);
+    let (_, warnings) = open(vec![i], vec![button()]);
+    assert!(!warnings.iter().any(|w| w.contains("scaled")), "{warnings:?}");
+}
+
+/// A master's background shows in its instances only when Sketch says so.
+#[test]
+fn master_background_in_instances_only_when_included() {
+    let bg = |id: &str, sid: &str, include: bool| {
+        let mut m = master(id, sid, id, 20.0, 20.0, vec![]);
+        m["hasBackgroundColor"] = json!(true);
+        m["backgroundColor"] = json!({"_class": "color", "red": 0, "green": 0, "blue": 0, "alpha": 1});
+        m["includeBackgroundColorInInstance"] = json!(include);
+        m
+    };
+    let (doc, _) = open(
+        vec![instance("Hidden", "SH", 0.0, 0.0, 20.0, 20.0, &[]), instance("Shown", "SS", 50.0, 0.0, 20.0, 20.0, &[])],
+        vec![bg("MH", "SH", false), bg("MS", "SS", true)],
+    );
+    let (hidden, main) = instance_of(&doc, "Hidden");
+    assert!(hidden.fills.is_empty(), "{:?}", hidden.fills);
+    assert_eq!(main.fills.len(), 1, "the master shows its background");
+    assert_eq!(instance_of(&doc, "Shown").0.fills.len(), 1);
+}
+
+/// How Sketch lays out a resized instance's layers, measured on its renders: a master of 200×100
+/// with a 100×40 rectangle at (20, 30), shown at 320×60.
+#[test]
+fn resized_instances_lay_out_like_sketch() {
+    let case = |mask: i64, version: u64| {
+        let r = with(rect("R", 20.0, 30.0, 100.0, 40.0), "resizingConstraint", json!(mask));
+        let m = master("M", "S", "Box", 200.0, 100.0, vec![r]);
+        let (doc, _) = open_version("64", version, vec![instance("I", "S", 0.0, 0.0, 320.0, 60.0, &[])], vec![m]);
+        let (inst, _) = instance_of(&doc, "I");
+        let b = doc.world_bounds(inside(&doc, inst, "R").id).unwrap();
+        (b.x0, b.y0, b.width(), b.height())
+    };
+    let near = |a: (f64, f64, f64, f64), b: (f64, f64, f64, f64)| {
+        (a.0 - b.0).abs() < 0.5 && (a.1 - b.1).abs() < 0.5 && (a.2 - b.2).abs() < 0.5 && (a.3 - b.3).abs() < 0.5
+    };
+    // Sketch 52 and newer (format 110+).
+    for (mask, want) in [
+        (63, (32.0, 18.0, 160.0, 24.0)),
+        (59, (20.0, 18.0, 166.67, 24.0)),
+        (62, (40.0, 18.0, 200.0, 24.0)),
+        (61, (62.0, 18.0, 100.0, 24.0)),
+        (58, (20.0, 18.0, 220.0, 24.0)),
+        (57, (20.0, 18.0, 100.0, 24.0)),
+        (60, (140.0, 18.0, 100.0, 24.0)),
+        (54, (40.0, 12.86, 200.0, 17.14)),
+        (0, (32.0, 18.0, 160.0, 24.0)),
+        (47, (32.0, 10.0, 160.0, 40.0)),
+    ] {
+        let got = case(mask, 125);
+        assert!(near(got, want), "mask {mask}: {got:?} vs {want:?}");
+    }
+    // Older files: everything scales.
+    for mask in [59, 62, 61, 0] {
+        let got = case(mask, 103);
+        assert!(near(got, (32.0, 18.0, 160.0, 24.0)), "legacy mask {mask}: {got:?}");
+    }
+}
+
+/// A nested swap to a symbol the file doesn't have keeps the original, as Sketch shows it.
+#[test]
+fn swap_to_a_missing_symbol_keeps_the_original() {
+    let icon = master("MA", "SA", "Icon A", 20.0, 20.0, vec![rect("Dot A", 0.0, 0.0, 20.0, 20.0)]);
+    let card = master("MC", "SC", "Card", 100.0, 40.0, vec![instance("N", "SA", 0.0, 0.0, 20.0, 20.0, &[])]);
+    let (doc, warnings) = open(vec![instance("I", "SC", 0.0, 0.0, 100.0, 40.0, &[("N_symbolID", json!("GONE"))])], vec![icon, card]);
+    let (inst, _) = instance_of(&doc, "I");
+    assert!(doc.subtree(inst.id).into_iter().filter_map(|i| doc.node(i)).any(|n| n.name == "Dot A"));
+    assert!(!warnings.iter().any(|w| w.contains("empty frames")), "{warnings:?}");
+}
diff --git a/crates/format/src/sketch/tests.rs b/crates/format/src/sketch/tests.rs
new file mode 100644
index 00000000..b4368de1
--- /dev/null
+++ b/crates/format/src/sketch/tests.rs
@@ -0,0 +1,201 @@
+//! `.sketch` import: detection, the archive, the version cut and pages, on fixtures built in code.
+
+use serde_json::json;
+
+use super::fixture::*;
+use super::*;
+
+fn page_names(doc: &Document) -> Vec<String> {
+    doc.pages.iter().map(|p| doc.node(*p).unwrap().name.clone()).collect()
+}
+
+#[test]
+fn detects_sketch_and_not_others() {
+    let z = sketch_zip("50.2", 103, document(&["P1"]), &[page("P1", "Page 1", vec![])], &[]);
+    assert!(is_sketch(&z));
+    assert!(!is_sketch(b"fig-kiwi...."));
+    assert!(!is_sketch(b"{}"));
+    assert!(!is_sketch(b""));
+    // A zip that isn't a Sketch file.
+    let mut other = Vec::new();
+    {
+        use std::io::Write;
+        let mut w = zip::ZipWriter::new(std::io::Cursor::new(&mut other));
+        w.start_file("canvas.fig", zip::write::SimpleFileOptions::default()).unwrap();
+        w.write_all(b"x").unwrap();
+        w.finish().unwrap();
+    }
+    assert!(!is_sketch(&other));
+}
+
+#[test]
+fn pages_become_pages_in_document_order() {
+    let z = sketch_zip("50.2", 103, document(&["B", "A"]), &[page("A", "Alpha", vec![]), page("B", "Beta", vec![])], &[]);
+    let (doc, _) = import(&z, "f").unwrap();
+    assert_eq!(page_names(&doc), ["Beta", "Alpha"]);
+}
+
+#[test]
+fn older_than_48_is_refused() {
+    let z = sketch_zip("47.1", 95, document(&["P"]), &[page("P", "P", vec![])], &[]);
+    let e = import(&z, "f").unwrap_err().to_string();
+    assert!(e.contains(TOO_OLD), "{e}");
+    let mut sqlite = b"SQLite format 3\0".to_vec();
+    sqlite.resize(512, 0);
+    assert!(is_sketch(&sqlite));
+    assert!(import(&sqlite, "f").unwrap_err().to_string().contains(TOO_OLD));
+}
+
+#[test]
+fn archived_text_without_meta_version_is_refused() {
+    let text = json!({
+        "_class": "text", "do_objectID": "T", "name": "T",
+        "frame": {"_class": "rect", "x": 0, "y": 0, "width": 10, "height": 10},
+        "attributedString": {"_class": "MSAttributedString", "archivedAttributedString": {"_archive": "YnBsaXN0MDA="}},
+    });
+    let z = raw_zip(&document(&["P"]), &json!({"app": "com.bohemiancoding.sketch3"}), &[page("P", "P", vec![text])], &[]);
+    let e = import(&z, "f").unwrap_err().to_string();
+    assert!(e.contains(TOO_OLD), "{e}");
+}
+
+#[test]
+fn newer_than_tested_imports_with_one_warning() {
+    let z = sketch_zip("2099.1", NEWEST_TESTED_VERSION + 1, document(&["P"]), &[page("P", "P", vec![])], &[]);
+    let (_, warnings) = import(&z, "f").unwrap();
+    assert_eq!(warnings.iter().filter(|w| w.contains("newer Sketch")).count(), 1, "{warnings:?}");
+}
+
+#[test]
+fn junk_never_panics() {
+    let z = sketch_zip("50.2", 103, document(&["P"]), &[page("P", "P", vec![rect("R", 0.0, 0.0, 10.0, 10.0)])], &[]);
+    for cut in (0..z.len()).step_by(7) {
+        let _ = import(&z[..cut], "f");
+    }
+    let mut seed = 0x2545_f491_u32;
+    for _ in 0..200 {
+        let mut b = z.clone();
+        for _ in 0..8 {
+            seed ^= seed << 13;
+            seed ^= seed >> 17;
+            seed ^= seed << 5;
+            let i = seed as usize % b.len();
+            b[i] = (seed >> 8) as u8;
+        }
+        let _ = import(&b, "f");
+    }
+    for doc in [json!([]), json!(null), json!({"pages": 5}), json!({"pages": [{"_ref": 7}, {"_ref": "pages/../../x"}]})] {
+        let _ = import(&sketch_zip("50.2", 103, doc, &[json!(5), json!({"do_objectID": "Q", "layers": "x"})], &[]), "f");
+    }
+    let _ = import(&raw_zip(&document(&["P"]), &json!("x"), &[], &[]), "f");
+}
+
+/// A file using most of what the importer reads (Sketch 2025 frames and stacks, tints, symbols
+/// with overrides, text, paths, gradients, masks, fades, grids) with each of its values in turn
+/// replaced by a value of another type: every import ends without a panic.
+#[test]
+fn junk_values_never_panic() {
+    let text_layer = text("T", 0.0, 0.0, 80.0, 20.0, "Go", &[(0, 2, "Helvetica", 14.0, [0.0, 0.0, 0.0, 1.0])]);
+    let dot = styled(rect("Dot", 0.0, 0.0, 10.0, 10.0), "fills", json!([solid_fill(0.0, 0.0, 0.0, 1.0)]));
+    let mut tint = solid_fill(1.0, 0.0, 0.0, 1.0);
+    tint["layeringType"] = json!(1);
+    let mut icon = master("MI", "SI", "Icon", 24.0, 24.0, vec![dot.clone()]);
+    icon["groupBehavior"] = json!(2);
+    icon["style"]["fills"] = json!([tint]);
+    let mut chip = stack(
+        master("MC", "SC", "Chip", 60.0, 24.0, vec![text_layer.clone(), instance("N", "SI", 0.0, 0.0, 24.0, 24.0, &[])]),
+        0,
+        1,
+        1,
+        6.0,
+        [8.0, 4.0, 10.0, 4.0],
+    );
+    chip["style"]["corners"] = json!({"_class": "MSImmutableStyleCorners", "radii": [12], "style": 2, "smoothing": 0.6});
+    let over = [
+        ("T_stringValue", json!("Longer")),
+        ("N_fillColor", color(0.0, 1.0, 0.0, 1.0)),
+        ("T_textColor", color(0.0, 0.0, 1.0, 1.0)),
+        ("N_isVisible", json!("0")),
+    ];
+    let inst = instance("I", "SC", 0.0, 100.0, 200.0, 24.0, &over);
+    let grad = json!({"_class": "fill", "isEnabled": true, "fillType": 1, "color": color(0.0, 0.0, 0.0, 1.0),
+        "gradient": {"_class": "gradient", "gradientType": 0, "from": "{0, 0}", "to": "{1, 1}", "stops": [
+            {"_class": "gradientStop", "position": 0, "color": color(0.0, 0.0, 0.0, 1.0)}, {"_class": "gradientStop", "position": 1, "color": color(1.0, 1.0, 1.0, 0.0)}]}});
+    let mut faded = styled(rect("Faded", 0.0, 0.0, 30.0, 30.0), "fills", json!([grad.clone()]));
+    faded["style"]["contextSettings"] =
+        json!({"_class": "graphicsContextSettings", "opacity": 1, "isProgressive": true, "gradient": grad["gradient"].clone()});
+    let mask =
+        with(with(styled(rect("Mask", 0.0, 0.0, 30.0, 30.0), "fills", json!([grad])), "hasClippingMask", json!(true)), "clippingMaskMode", json!(1));
+    let path = shape_path("P", 0.0, 0.0, 20.0, 20.0, &[(0.0, 0.0), (1.0, 0.0), (0.5, 1.0)], true);
+    let mut g = group("G", 0.0, 0.0, 100.0, 100.0, vec![mask, faded, path, dot, text_layer]);
+    g["style"] = json!({"_class": "style", "fills": [tint_fill()]});
+    let mut frame = stack(frame_group("F", 0.0, 0.0, 300.0, 300.0, vec![g, inst]), 1, 0, 3, 8.0, [0.0; 4]);
+    frame["layout"] =
+        json!({"_class": "layoutGrid", "isEnabled": true, "columnWidth": 20, "gutterWidth": 10, "numberOfColumns": 4, "drawVertical": true});
+    let pages = [page("P", "Page", vec![frame]), page("S", "Symbols", vec![icon, chip])];
+    // Every value's path, with each junk value in turn (a deterministic sample keeps it quick).
+    fn paths(v: &serde_json::Value, at: &mut Vec<String>, out: &mut Vec<Vec<String>>) {
+        out.push(at.clone());
+        match v {
+            serde_json::Value::Object(m) => {
+                for (k, c) in m {
+                    at.push(k.clone());
+                    paths(c, at, out);
+                    at.pop();
+                }
+            }
+            serde_json::Value::Array(a) => {
+                for (i, c) in a.iter().enumerate() {
+                    at.push(i.to_string());
+                    paths(c, at, out);
+                    at.pop();
+                }
+            }
+            _ => {}
+        }
+    }
+    let junk = [json!(null), json!(5), json!(-1e300), json!("x"), json!(true), json!([]), json!({}), json!([1, "a"])];
+    for (pi, p) in pages.iter().enumerate() {
+        let mut all = Vec::new();
+        paths(p, &mut Vec::new(), &mut all);
+        for (n, at) in all.iter().enumerate().skip(1) {
+            let mut changed = pages.clone();
+            let mut v = &mut changed[pi];
+            for k in at {
+                v = match v {
+                    serde_json::Value::Object(m) => m.get_mut(k).unwrap(),
+                    serde_json::Value::Array(a) => &mut a[k.parse::<usize>().unwrap()],
+                    _ => panic!("a path only runs through objects and arrays"),
+                };
+            }
+            *v = junk[n % junk.len()].clone();
+            let _ = import(&sketch_zip("2026.3.1", 196, document(&["P", "S"]), &changed, &[]), "f");
+        }
+    }
+}
+
+fn tint_fill() -> serde_json::Value {
+    let mut f = solid_fill(0.0, 0.0, 1.0, 1.0);
+    f["layeringType"] = json!(1);
+    f
+}
+
+#[test]
+fn deep_nesting_does_not_fail_the_file() {
+    let mut deep = rect("R", 0.0, 0.0, 1.0, 1.0);
+    for i in 0..300 {
+        deep = group(&format!("G{i}"), 0.0, 0.0, 1.0, 1.0, vec![deep]);
+    }
+    let z = sketch_zip("50.2", 103, document(&["A", "B"]), &[page("A", "Deep", vec![deep]), page("B", "Normal", vec![])], &[]);
+    let (doc, warnings) = import(&z, "f").unwrap();
+    assert!(page_names(&doc).contains(&"Normal".to_string()));
+    assert!(!warnings.is_empty());
+}
+
+#[test]
+fn members_over_budget_are_skipped() {
+    let z = sketch_zip("50.2", 103, document(&["A", "B"]), &[page("A", "Big", vec![]), page("B", "Small", vec![])], &[]);
+    let (doc, warnings) = import_within(&z, "f", 200).unwrap();
+    // Each page JSON is larger than 200 bytes: both are skipped, with a warning; nothing panics.
+    assert!(warnings.iter().any(|w| w.contains("too large")), "{warnings:?}");
+    assert!(!page_names(&doc).contains(&"Big".to_string()));
+}
diff --git a/crates/format/src/sketch/text.rs b/crates/format/src/sketch/text.rs
new file mode 100644
index 00000000..74cfa21c
--- /dev/null
+++ b/crates/format/src/sketch/text.rs
@@ -0,0 +1,236 @@
+//! Sketch text layers → REST text nodes.
+//!
+//! A text layer's `attributedString` holds the `string` and `attributes`: runs given by `location`
+//! and `length` in UTF-16 code units (like the REST importer's per-character style ids), each with
+//! a font (PostScript name and size), colour, kerning, paragraph style, decorations and text
+//! transform. `textBehaviour` sizes the box (0 auto width, 1 fixed width, 2 fixed); the style's
+//! `textStyle` gives the vertical alignment.
+
+use serde_json::{Map as JsonMap, Value, json};
+
+use super::tree::{Cx, color};
+
+/// Most characters read from one text layer (the REST importer's own limit).
+const MAX_CHARS: usize = 1 << 20;
+/// Most runs read from one text layer.
+const MAX_RUNS: usize = 10_000;
+
+/// Fill `node` (a TEXT node) from text layer `l`.
+pub(crate) fn node(cx: &mut Cx, l: &Value, node: &mut JsonMap<String, Value>) {
+    let a = l.get("attributedString");
+    let string: String = a.and_then(|a| a.get("string")).and_then(Value::as_str).unwrap_or("").chars().take(MAX_CHARS).collect();
+    let units = string.encode_utf16().count();
+    let runs: &[Value] = a.and_then(|a| a.get("attributes")).and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default();
+    if runs.len() > MAX_RUNS {
+        cx.warn(format!("text with more than {MAX_RUNS} styled runs keeps the first ones"));
+    }
+    let fallback = l.get("style").and_then(|s| s.get("textStyle")).and_then(|t| t.get("encodedAttributes"));
+    let styles: Vec<(usize, usize, Value)> = runs
+        .iter()
+        .take(MAX_RUNS)
+        .filter_map(|r| {
+            let start = usize::try_from(r.get("location")?.as_u64()?).ok()?.min(units);
+            let len = usize::try_from(r.get("length")?.as_u64()?).unwrap_or(usize::MAX);
+            Some((start, start.saturating_add(len).min(units), type_style(cx, r.get("attributes")?)))
+        })
+        .collect();
+    let base = styles.first().map(|s| s.2.clone()).or_else(|| fallback.map(|f| type_style(cx, f))).unwrap_or_else(|| type_style(cx, &json!({})));
+    let mut style = base.clone();
+    let mut fills = None;
+    if let Some(m) = style.as_object_mut() {
+        fills = m.remove("fills");
+        // Paragraph settings are the first run's.
+        let paragraph = runs.first().and_then(|r| r.get("attributes")).or(fallback).and_then(|a| a.get("paragraphStyle"));
+        let align = match paragraph.and_then(|p| p.get("alignment")).and_then(Value::as_i64) {
+            Some(1) => "RIGHT",
+            Some(2) => "CENTER",
+            Some(3) => "JUSTIFIED",
+            _ => "LEFT",
+        };
+        m.insert("textAlignHorizontal".into(), json!(align));
+        if let Some(sp) = paragraph.and_then(|p| p.get("paragraphSpacing")).and_then(Value::as_f64).filter(|v| v.is_finite() && *v > 0.0) {
+            m.insert("paragraphSpacing".into(), json!(sp.min(1e4)));
+        }
+        let vertical = l.get("style").and_then(|s| s.get("textStyle")).and_then(|t| t.get("verticalAlignment")).and_then(Value::as_i64);
+        m.insert(
+            "textAlignVertical".into(),
+            json!(match vertical {
+                Some(1) => "CENTER",
+                Some(2) => "BOTTOM",
+                _ => "TOP",
+            }),
+        );
+        // Sketch 2025 and newer size text by `horizontalSizing`/`verticalSizing` (1 fits).
+        let fits = |k: &str| l.get(k).and_then(Value::as_i64) == Some(1);
+        let resize = match l.get("textBehaviour").and_then(Value::as_i64) {
+            Some(1) => "HEIGHT",
+            Some(2) => "NONE",
+            Some(_) => "WIDTH_AND_HEIGHT",
+            None if l.get("horizontalSizing").is_none() || fits("horizontalSizing") => "WIDTH_AND_HEIGHT",
+            None if fits("verticalSizing") => "HEIGHT",
+            None => "NONE",
+        };
+        m.insert("textAutoResize".into(), json!(resize));
+    }
+    node.insert("characters".into(), json!(string));
+    node.insert("style".into(), style);
+    if let Some(f) = fills {
+        node.insert("fills".into(), f);
+    }
+    // Runs that differ from the first: a style id per UTF-16 unit.
+    let mut ids = vec![0u64; units];
+    let mut table = JsonMap::new();
+    for (start, end, s) in &styles {
+        if *s == base {
+            continue;
+        }
+        let id = table.len() as u64 + 1;
+        table.insert(id.to_string(), s.clone());
+        for slot in ids.get_mut(*start..*end).into_iter().flatten() {
+            *slot = id;
+        }
+    }
+    if !table.is_empty() {
+        node.insert("characterStyleOverrides".into(), json!(ids));
+        node.insert("styleOverrideTable".into(), Value::Object(table));
+    }
+}
+
+/// How far a text layer moves so its lines sit where Sketch draws them. With a fixed line height,
+/// Sketch puts a line's extra height (line height − the font's own, taken as 1.2 × its size) above
+/// the text (`lineSpacingBehaviour` 0) or below it (1); FigCraft, like Sketch's default (2), puts
+/// half on each side. Every line gets the same extra, so the whole layer moves.
+pub(crate) fn baseline_shift(l: &Value) -> f64 {
+    let first = l
+        .get("attributedString")
+        .and_then(|a| a.get("attributes"))
+        .and_then(Value::as_array)
+        .and_then(|r| r.first())
+        .and_then(|r| r.get("attributes"));
+    let Some(a) = first else { return 0.0 };
+    let size = a.get("MSAttributedStringFontAttribute").and_then(|f| f.get("attributes")).and_then(|f| f.get("size")).and_then(Value::as_f64);
+    let line = a.get("paragraphStyle").and_then(|p| p.get("maximumLineHeight").or_else(|| p.get("minimumLineHeight"))).and_then(Value::as_f64);
+    let (Some(size), Some(line)) = (size.filter(|s| s.is_finite() && *s > 0.0), line.filter(|v| v.is_finite() && *v > 0.0)) else { return 0.0 };
+    let extra = (line - size * 1.2).clamp(-1e4, 1e4);
+    match l.get("lineSpacingBehaviour").and_then(Value::as_i64) {
+        Some(0) => extra / 2.0,
+        Some(1) => -extra / 2.0,
+        _ => 0.0,
+    }
+}
+
+/// A run's attributes as a REST type style (with its colour as `fills`).
+pub(crate) fn type_style(cx: &mut Cx, a: &Value) -> Value {
+    let font = a.get("MSAttributedStringFontAttribute").and_then(|f| f.get("attributes"));
+    let ps = font.and_then(|f| f.get("name")).and_then(Value::as_str).unwrap_or("");
+    let size = font.and_then(|f| f.get("size")).and_then(Value::as_f64).filter(|s| s.is_finite() && *s > 0.0).unwrap_or(12.0);
+    let (family, style) = installed(cx, ps).unwrap_or_else(|| font_name(ps));
+    if ps.is_empty() {
+        cx.warn("text without a font uses Helvetica");
+    }
+    let mut s = json!({"fontFamily": family, "fontStyle": style, "fontSize": size.min(10_000.0)});
+    // Every field is written, neutral when the run has none: a run's style starts from the text's
+    // (its first run's), and an unwritten field would keep that one's value.
+    s["fontVariations"] = font.and_then(|f| f.get("variation")).and_then(variations).unwrap_or_else(|| json!({}));
+    let p = a.get("paragraphStyle");
+    let line = |k: &str| p.and_then(|p| p.get(k)).and_then(Value::as_f64).filter(|v| v.is_finite() && *v > 0.0);
+    if let Some(lh) = line("maximumLineHeight").or_else(|| line("minimumLineHeight")) {
+        s["lineHeightPx"] = json!(lh.min(1e4));
+        s["lineHeightUnit"] = json!("PIXELS");
+    } else {
+        s["lineHeightUnit"] = json!("INTRINSIC_%");
+    }
+    s["letterSpacing"] = json!(a.get("kerning").and_then(Value::as_f64).filter(|k| k.is_finite()).unwrap_or(0.0).clamp(-1e4, 1e4));
+    let set = |k: &str| a.get(k).and_then(Value::as_i64).is_some_and(|v| v != 0);
+    s["textDecoration"] = json!(if set("underlineStyle") {
+        "UNDERLINE"
+    } else if set("strikethroughStyle") {
+        "STRIKETHROUGH"
+    } else {
+        "NONE"
+    });
+    s["textCase"] = json!(match a.get("MSAttributedStringTextTransformAttribute").and_then(Value::as_i64) {
+        Some(1) => "UPPER",
+        Some(2) => "LOWER",
+        _ => "ORIGINAL",
+    });
+    let c = a.get("MSAttributedStringColorAttribute").and_then(color).unwrap_or_else(|| json!({"r": 0.0, "g": 0.0, "b": 0.0, "a": 1.0}));
+    let mut paint = json!({"type": "SOLID", "color": c});
+    if let Some(var) = super::style::swatch(cx, a.get("MSAttributedStringColorAttribute")) {
+        paint["boundVariables"] = var;
+    }
+    s["fills"] = json!([paint]);
+    s
+}
+
+/// A font's `variation` (axis values keyed by the axis tag read as a big-endian number, as Apple's
+/// text engine keys them: 2003265652 is `wght`) as `{tag: value}`; `None` when it has none.
+fn variations(v: &Value) -> Option<Value> {
+    let axes: JsonMap<String, Value> = v
+        .as_object()?
+        .iter()
+        .take(64)
+        .filter_map(|(k, val)| {
+            let tag = u32::try_from(k.parse::<u64>().ok()?).ok()?.to_be_bytes();
+            let tag = std::str::from_utf8(&tag).ok().filter(|t| t.chars().all(|c| c.is_ascii_graphic()))?.to_string();
+            let val = val.as_f64().filter(|x| x.is_finite())?;
+            Some((tag, json!(val.clamp(-1e5, 1e5))))
+        })
+        .collect();
+    (!axes.is_empty()).then_some(Value::Object(axes))
+}
+
+/// The installed family and style of PostScript name `ps`, when the import has a font lookup and
+/// the font is installed.
+fn installed(cx: &mut Cx, ps: &str) -> Option<(String, String)> {
+    if ps.is_empty() {
+        return None;
+    }
+    if let Some(found) = cx.font_cache.get(ps) {
+        return found.clone();
+    }
+    let found = cx.fonts.as_ref().and_then(|f| f(ps));
+    // A file names a few hundred fonts at most; junk ones don't grow the cache past that.
+    if cx.font_cache.len() < 4096 {
+        cx.font_cache.insert(ps.to_string(), found.clone());
+    }
+    found
+}
+
+/// Family and style of a font from its PostScript name: "HelveticaNeue-Bold" → ("Helvetica Neue",
+/// "Bold"). Words of the family are split at case changes, which can't always match the real name
+/// (a CJK family would split as "Ping Fang SC"); the engine matches families against the installed
+/// fonts ignoring spaces. Apple's system fonts take the SF Pro names, PingFang its own.
+pub(crate) fn font_name(ps: &str) -> (String, String) {
+    let (family, style) = ps.split_once('-').unwrap_or((ps, ""));
+    let style = if style.is_empty() { "Regular".to_string() } else { crate::fig::style_name(style) };
+    let family = match family {
+        "" => "Helvetica".to_string(),
+        ".SFNSText" | ".SFUIText" | "SanFranciscoText" | ".SFProText" => "SF Pro Text".into(),
+        ".SFNSDisplay" | ".SFUIDisplay" | "SanFranciscoDisplay" | ".SFProDisplay" => "SF Pro Display".into(),
+        // Apple's CJK families whose names don't split at case changes.
+        "PingFangSC" | "PingFangTC" | "PingFangHK" => format!("PingFang {}", family.get(8..).unwrap_or("")),
+        // Apple's SF families: "SF" and then words ("SFUIText" → "SF UI Text").
+        f if f.starts_with("SF") && f.chars().nth(2).is_some_and(char::is_uppercase) => format!("SF {}", words(f.get(2..).unwrap_or(""))),
+        f => words(f.trim_start_matches('.')),
+    };
+    (family, style)
+}
+
+/// "IBMPlexSans" → "IBM Plex Sans": a space before a capital that follows a small letter, and
+/// before the last capital of a run of capitals followed by a small letter.
+fn words(s: &str) -> String {
+    let chars: Vec<char> = s.chars().collect();
+    let mut out = String::with_capacity(s.len() + 4);
+    for (i, c) in chars.iter().enumerate() {
+        let prev = i.checked_sub(1).and_then(|p| chars.get(p));
+        let next = chars.get(i + 1);
+        let split = c.is_uppercase()
+            && (prev.is_some_and(|p| p.is_lowercase()) || (prev.is_some_and(|p| p.is_uppercase()) && next.is_some_and(|n| n.is_lowercase())));
+        if split {
+            out.push(' ');
+        }
+        out.push(*c);
+    }
+    out
+}
diff --git a/crates/format/src/sketch/text_tests.rs b/crates/format/src/sketch/text_tests.rs
new file mode 100644
index 00000000..0e8a4a27
--- /dev/null
+++ b/crates/format/src/sketch/text_tests.rs
@@ -0,0 +1,273 @@
+//! Sketch text layers → text with styled runs; font PostScript names → family and style.
+
+use figcraft_doc::color::PaintKind;
+use figcraft_doc::{Document, LetterSpacing, LineHeight, NodeKind, TextAlignH, TextAlignV, TextAutoResize, TextCase, TextData, TextDecoration};
+use serde_json::{Value, json};
+
+use super::fixture::*;
+use super::import;
+use super::text::font_name;
+
+const BLACK: [f64; 4] = [0.0, 0.0, 0.0, 1.0];
+const RED: [f64; 4] = [1.0, 0.0, 0.0, 1.0];
+
+fn open(layers: Vec<Value>) -> (Document, Vec<String>) {
+    let z = sketch_zip("50.2", 103, document(&["P"]), &[page("P", "Page", vec![artboard("A", "Board", 0.0, 0.0, 400.0, 400.0, layers)])], &[]);
+    import(&z, "f").unwrap()
+}
+
+fn data<'d>(doc: &'d Document, name: &str) -> &'d TextData {
+    match &doc.nodes().find(|n| n.name == name).unwrap().kind {
+        NodeKind::Text(td) => td,
+        other => panic!("{name}: {other:?}"),
+    }
+}
+
+fn red(fills: &Option<Vec<figcraft_doc::color::Paint>>) -> bool {
+    fills.as_ref().is_some_and(|f| f.iter().any(|p| matches!(p.kind, PaintKind::Solid { color } if color.r == 1.0 && color.g == 0.0)))
+}
+
+#[test]
+fn two_runs() {
+    let t = text("Hi", 0.0, 0.0, 200.0, 20.0, "Hello world", &[(0, 5, "HelveticaNeue-Bold", 16.0, RED), (5, 6, "HelveticaNeue", 12.0, BLACK)]);
+    let (doc, _) = open(vec![t]);
+    let td = data(&doc, "Hi");
+    assert_eq!(td.characters, "Hello world");
+    let style_at = |i: usize| td.runs.iter().find(|r| r.start <= i && i < r.end).map_or(&td.style, |r| &r.style);
+    let (a, b) = (style_at(0), style_at(7));
+    assert_eq!((a.font_family.as_str(), a.font_style.as_str(), a.font_size), ("Helvetica Neue", "Bold", 16.0));
+    assert_eq!((b.font_family.as_str(), b.font_style.as_str(), b.font_size), ("Helvetica Neue", "Regular", 12.0));
+    let node = doc.nodes().find(|n| n.name == "Hi").unwrap();
+    assert!(red(&a.fills) || (red(&Some(node.fills.clone())) && !red(&b.fills)));
+}
+
+#[test]
+fn utf16_ranges() {
+    // "a😀b": the emoji takes two UTF-16 units.
+    let t = text(
+        "Emoji",
+        0.0,
+        0.0,
+        200.0,
+        20.0,
+        "a😀b",
+        &[(0, 1, "Helvetica", 10.0, BLACK), (1, 2, "Helvetica", 20.0, BLACK), (3, 1, "Helvetica", 30.0, BLACK)],
+    );
+    let (doc, _) = open(vec![t]);
+    let td = data(&doc, "Emoji");
+    let size_at = |i: usize| td.runs.iter().find(|r| r.start <= i && i < r.end).map_or(td.style.font_size, |r| r.style.font_size);
+    assert_eq!((size_at(0), size_at(1), size_at(2)), (10.0, 20.0, 30.0));
+    // A range splitting the emoji and one past the end: no panic, the text stays whole.
+    let t = text(
+        "Split",
+        0.0,
+        50.0,
+        200.0,
+        20.0,
+        "a😀b",
+        &[(0, 2, "Helvetica", 10.0, BLACK), (2, 99, "Helvetica", 20.0, BLACK), (500, 3, "Helvetica", 5.0, BLACK)],
+    );
+    let (doc, _) = open(vec![t]);
+    assert_eq!(data(&doc, "Split").characters, "a😀b");
+}
+
+#[test]
+fn paragraph_and_spacing() {
+    let mut t = text("Para", 0.0, 0.0, 200.0, 40.0, "Centered", &[(0, 8, "Helvetica", 14.0, BLACK)]);
+    let a = &mut t["attributedString"]["attributes"][0]["attributes"];
+    a["paragraphStyle"] =
+        json!({"_class": "paragraphStyle", "alignment": 2, "maximumLineHeight": 24, "minimumLineHeight": 24, "paragraphSpacing": 8});
+    a["kerning"] = json!(0.5);
+    let (doc, _) = open(vec![t]);
+    let td = data(&doc, "Para");
+    assert_eq!(td.align_h, TextAlignH::Center);
+    assert_eq!(td.style.line_height, LineHeight::Pixels(24.0));
+    assert_eq!(td.paragraph_spacing, 8.0);
+    assert_eq!(td.style.letter_spacing, LetterSpacing::Pixels(0.5));
+    for (code, want) in [(0, TextAlignH::Left), (1, TextAlignH::Right), (3, TextAlignH::Justified), (4, TextAlignH::Left)] {
+        let mut t = text("A", 0.0, 0.0, 100.0, 20.0, "x", &[(0, 1, "Helvetica", 14.0, BLACK)]);
+        t["attributedString"]["attributes"][0]["attributes"]["paragraphStyle"]["alignment"] = json!(code);
+        let (doc, _) = open(vec![t]);
+        assert_eq!(data(&doc, "A").align_h, want, "alignment {code}");
+    }
+}
+
+#[test]
+fn behaviour_and_vertical_alignment() {
+    let cases = [(0, TextAutoResize::WidthAndHeight), (1, TextAutoResize::Height), (2, TextAutoResize::None)];
+    for (b, want) in cases {
+        let mut t = text("T", 0.0, 0.0, 100.0, 20.0, "x", &[(0, 1, "Helvetica", 14.0, BLACK)]);
+        t["textBehaviour"] = json!(b);
+        let (doc, _) = open(vec![t]);
+        assert_eq!(data(&doc, "T").auto_resize, want, "behaviour {b}");
+    }
+    for (v, want) in [(0, TextAlignV::Top), (1, TextAlignV::Middle), (2, TextAlignV::Bottom)] {
+        let mut t = text("V", 0.0, 0.0, 100.0, 60.0, "x", &[(0, 1, "Helvetica", 14.0, BLACK)]);
+        t["textBehaviour"] = json!(2);
+        t["style"]["textStyle"] = json!({"_class": "textStyle", "verticalAlignment": v, "encodedAttributes": {}});
+        let (doc, _) = open(vec![t]);
+        assert_eq!(data(&doc, "V").align_v, want, "vertical {v}");
+    }
+}
+
+#[test]
+fn decorations_and_case() {
+    let mut t = text(
+        "Deco",
+        0.0,
+        0.0,
+        200.0,
+        20.0,
+        "abcdef",
+        &[(0, 2, "Helvetica", 14.0, BLACK), (2, 2, "Helvetica", 14.0, BLACK), (4, 2, "Helvetica", 14.0, BLACK)],
+    );
+    t["attributedString"]["attributes"][0]["attributes"]["underlineStyle"] = json!(1);
+    t["attributedString"]["attributes"][1]["attributes"]["strikethroughStyle"] = json!(1);
+    t["attributedString"]["attributes"][2]["attributes"]["MSAttributedStringTextTransformAttribute"] = json!(1);
+    let (doc, _) = open(vec![t]);
+    let td = data(&doc, "Deco");
+    let at = |i: usize| td.runs.iter().find(|r| r.start <= i && i < r.end).map_or(&td.style, |r| &r.style);
+    assert_eq!(at(0).decoration, TextDecoration::Underline);
+    assert_eq!(at(2).decoration, TextDecoration::Strikethrough);
+    assert_eq!(at(4).case, TextCase::Upper);
+}
+
+#[test]
+fn text_layer_fill_wins_over_run_colour() {
+    let t = styled(text("Filled", 0.0, 0.0, 100.0, 20.0, "x", &[(0, 1, "Helvetica", 14.0, BLACK)]), "fills", json!([solid_fill(1.0, 0.0, 0.0, 1.0)]));
+    let (doc, _) = open(vec![t]);
+    let n = doc.nodes().find(|n| n.name == "Filled").unwrap();
+    assert!(red(&Some(n.fills.clone())));
+}
+
+#[test]
+fn font_names() {
+    let cases = [
+        ("HelveticaNeue-Bold", "Helvetica Neue", "Bold"),
+        ("HelveticaNeue", "Helvetica Neue", "Regular"),
+        ("HelveticaNeue-Medium", "Helvetica Neue", "Medium"),
+        ("PingFangSC-Semibold", "PingFang SC", "Semi Bold"),
+        ("PingFangTC-Regular", "PingFang TC", "Regular"),
+        (".SFNSText", "SF Pro Text", "Regular"),
+        (".SFNSDisplay-Bold", "SF Pro Display", "Bold"),
+        ("SanFranciscoText-Semibold", "SF Pro Text", "Semi Bold"),
+        ("Impact", "Impact", "Regular"),
+        ("SFUIText-Semibold", "SF UI Text", "Semi Bold"),
+        ("SFUIDisplay-Regular", "SF UI Display", "Regular"),
+        ("SFCompactDisplay-Semibold", "SF Compact Display", "Semi Bold"),
+        ("SFProText-Bold", "SF Pro Text", "Bold"),
+        ("IBMPlexSans-MediumItalic", "IBM Plex Sans", "Medium Italic"),
+        ("Roboto-Italic", "Roboto", "Italic"),
+        ("", "Helvetica", "Regular"),
+    ];
+    for (ps, family, style) in cases {
+        assert_eq!(font_name(ps), (family.to_string(), style.to_string()), "{ps}");
+    }
+}
+
+#[test]
+fn long_and_odd_text_is_safe() {
+    let long = "x".repeat(10_000);
+    let t = text("Long", 0.0, 0.0, 100.0, 20.0, &long, &[(0, usize::MAX >> 1, "Helvetica", 14.0, BLACK)]);
+    let mut odd = text("Odd", 0.0, 0.0, 100.0, 20.0, "abc", &[(0, 3, "Helvetica", -5.0, BLACK)]);
+    odd["attributedString"]["attributes"][0]["attributes"]["MSAttributedStringFontAttribute"] = json!("junk");
+    let mut empty = text("Empty", 0.0, 0.0, 100.0, 20.0, "", &[]);
+    empty["attributedString"]["string"] = json!(5);
+    let (doc, _) = open(vec![t, odd, empty]);
+    assert_eq!(data(&doc, "Long").characters.len(), 10_000);
+    assert!(data(&doc, "Odd").style.font_size > 0.0);
+}
+
+#[test]
+fn embedded_fonts_are_reported() {
+    let mut d = document(&["P"]);
+    d["fontReferences"] = json!([
+        {"_class": "fontReference", "fontFamilyName": "IBM Plex Sans", "fontFileName": "IBMPlexSans-Regular.otf", "fontData": {"_ref": "fonts/abc"}},
+        {"_class": "fontReference", "fontFamilyName": "IBM Plex Sans", "fontFileName": "IBMPlexSans-Bold.otf", "fontData": {"_ref": "fonts/def"}},
+        {"_class": "fontReference", "fontFamilyName": "IBM Plex Mono", "fontData": {"_ref": "fonts/ghi"}},
+    ]);
+    let z = sketch_zip("83.2", 139, d, &[page("P", "Page", vec![])], &[("fonts/abc", b"x")]);
+    let (_, warnings) = import(&z, "f").unwrap();
+    let w = warnings.iter().find(|w| w.contains("embedded")).expect("a note about embedded fonts");
+    assert!(w.contains("IBM Plex Mono") && w.contains("IBM Plex Sans"), "{w}");
+}
+
+/// Where Sketch puts a line's extra height: above the text (`lineSpacingBehaviour` 0), below it
+/// (1) or around it (2, like FigCraft); the text layer moves by the difference.
+#[test]
+fn line_spacing_behaviour_moves_text() {
+    let mk = |name: &str, beh: i64| {
+        let mut t = text(name, 0.0, 100.0, 100.0, 30.0, "Hg", &[(0, 2, "Helvetica", 14.0, BLACK)]);
+        t["lineSpacingBehaviour"] = json!(beh);
+        let a = &mut t["attributedString"]["attributes"][0]["attributes"]["paragraphStyle"];
+        a["maximumLineHeight"] = json!(30);
+        a["minimumLineHeight"] = json!(30);
+        t
+    };
+    let (doc, _) = open(vec![mk("B0", 0), mk("B1", 1), mk("B2", 2)]);
+    let y = |n: &str| doc.world_transform(doc.nodes().find(|x| x.name == n).unwrap().id).as_coeffs()[5];
+    // Extra height: 30 − 14 × 1.2 = 13.2; half of it either way.
+    assert!((y("B2") - 100.0).abs() < 1e-6, "{}", y("B2"));
+    assert!((y("B0") - 106.6).abs() < 1e-6, "{}", y("B0"));
+    assert!((y("B1") - 93.4).abs() < 1e-6, "{}", y("B1"));
+}
+
+/// A variable font's axes (Sketch keys them by the tag as a number: 2003265652 is `wght`).
+#[test]
+fn font_variations() {
+    let mut t = text("Wide", 0.0, 0.0, 200.0, 50.0, "Orbit", &[(0, 5, "Skia", 40.0, BLACK)]);
+    t["attributedString"]["attributes"][0]["attributes"]["MSAttributedStringFontAttribute"]["attributes"]["variation"] =
+        json!({"2003265652": 3, "2003072104": 0.65, "junk": 1, "1": "x"});
+    let (doc, _) = open(vec![t]);
+    let v = &data(&doc, "Wide").style.variations;
+    assert_eq!(v.get("wght"), Some(&3.0));
+    assert_eq!(v.get("wdth"), Some(&0.65));
+    assert_eq!(v.len(), 2, "{v:?}");
+}
+
+/// Font references without font data are only the fonts the document uses: no note.
+#[test]
+fn font_references_without_data_are_no_embedded_fonts() {
+    let mut d = document(&["P"]);
+    d["fontReferences"] =
+        json!([{"_class": "fontReference", "fontFamilyName": "Skia", "fontFileName": "Skia.ttf", "postscriptNames": ["Skia-Regular"]}]);
+    let z = sketch_zip("2026.3.1", 196, d, &[page("P", "Page", vec![])], &[]);
+    let (_, warnings) = import(&z, "f").unwrap();
+    assert!(!warnings.iter().any(|w| w.contains("embedded")), "{warnings:?}");
+}
+
+/// With a font lookup, a PostScript name gives the installed family and style it belongs to (the
+/// name alone can't always tell: "CourierNewPSMT" is Courier New Regular); without one, or for a
+/// font that isn't installed, the family is read from the name.
+#[test]
+fn postscript_names_find_installed_fonts() {
+    let mk = |name: &str, ps: &str| text(name, 0.0, 0.0, 100.0, 20.0, "Hi", &[(0, 2, ps, 14.0, BLACK)]);
+    let z = sketch_zip("83.2", 139, document(&["P"]), &[page("P", "Page", vec![mk("A", "CourierNewPSMT"), mk("B", "BrandSans-Bold")])], &[]);
+    let lookup: crate::sketch::FontLookup = Box::new(|ps: &str| (ps == "CourierNewPSMT").then(|| ("Courier New".to_string(), "Regular".to_string())));
+    let (doc, _) = crate::sketch::import_with_fonts(&z, "f", Some(lookup)).unwrap();
+    assert_eq!((data(&doc, "A").style.font_family.as_str(), data(&doc, "A").style.font_style.as_str()), ("Courier New", "Regular"));
+    assert_eq!(data(&doc, "B").style.font_family, "Brand Sans");
+    let (doc, _) = import(&z, "f").unwrap();
+    assert_eq!(data(&doc, "A").style.font_family, "Courier New PSMT");
+}
+
+/// A run without kerning, a fixed line height or font axes has none: it doesn't take the first
+/// run's (the text's base style) as its own.
+#[test]
+fn later_runs_dont_inherit_the_first_runs_settings() {
+    let mut t = text("Mixed", 0.0, 0.0, 200.0, 40.0, "AaBb", &[(0, 2, "Skia", 20.0, BLACK), (2, 2, "Helvetica", 14.0, BLACK)]);
+    let first = &mut t["attributedString"]["attributes"][0]["attributes"];
+    first["kerning"] = json!(2);
+    first["paragraphStyle"]["minimumLineHeight"] = json!(24);
+    first["paragraphStyle"]["maximumLineHeight"] = json!(24);
+    first["MSAttributedStringFontAttribute"]["attributes"]["variation"] = json!({"2003265652": 3});
+    let (doc, _) = open(vec![t]);
+    let td = data(&doc, "Mixed");
+    let at = |i: usize| td.runs.iter().find(|r| r.start <= i && i < r.end).map_or(&td.style, |r| &r.style);
+    assert_eq!(at(0).letter_spacing.resolve(20.0), 2.0);
+    let second = at(2);
+    assert_eq!(second.font_family, "Helvetica");
+    assert_eq!(second.letter_spacing.resolve(14.0), 0.0, "{second:?}");
+    assert_eq!(second.line_height, figcraft_doc::LineHeight::Auto, "{second:?}");
+    assert!(second.variations.is_empty(), "{second:?}");
+}
diff --git a/crates/format/src/sketch/tree.rs b/crates/format/src/sketch/tree.rs
new file mode 100644
index 00000000..8bad4c6c
--- /dev/null
+++ b/crates/format/src/sketch/tree.rs
@@ -0,0 +1,618 @@
+//! Sketch pages and layers → REST API file JSON nodes.
+
+use figcraft_doc::VectorNetwork;
+use figcraft_doc::geom::{Affine, Rect};
+use serde_json::{Map as JsonMap, Value, json};
+
+use super::Archive;
+
+/// Most distinct notes kept.
+const MAX_NOTES: usize = 200;
+/// Work units symbol expansion may spend on one file (one per JSON value copied, see
+/// `symbols::weight`): about three times what the largest design kit checked spends (21M, with
+/// 2 GB at its peak), well below what runs out of memory; less on 32-bit targets (the web), where
+/// such a kit keeps its first instances and notes the rest.
+#[cfg(not(target_pointer_width = "32"))]
+const MAX_WORK: u64 = 60_000_000;
+#[cfg(target_pointer_width = "32")]
+const MAX_WORK: u64 = 15_000_000;
+/// Deepest layer nesting followed (deeper layers are skipped with a warning).
+const MAX_DEPTH: usize = 200;
+/// Largest size and farthest position kept (the REST importer's own bounds).
+const MAX_SIZE: f64 = 1e6;
+const MAX_COORD: f64 = 1e7;
+
+/// The REST JSON of a Sketch file, with what the mapping noticed.
+pub(crate) struct Map {
+    pub json: Value,
+    pub warnings: Vec<String>,
+    /// Vector networks the JSON references by `vectorNetworkRef`.
+    pub networks: Vec<Option<VectorNetwork>>,
+    /// A text layer stored the pre-48 way was met: the file is refused.
+    pub too_old: bool,
+}
+
+/// The mapping's state while walking the file.
+pub(crate) struct Cx {
+    pub symbols: super::symbols::Symbols,
+    pub shared: super::shared::Shared,
+    /// Ids of the styles made from the shared styles.
+    pub style_defs: std::collections::BTreeSet<String>,
+    /// Work spent expanding symbols, and the most the file may take (see `symbols::weight`).
+    pub work: u64,
+    pub max_work: u64,
+    /// Notes given so far (each once).
+    pub seen: std::collections::BTreeSet<String>,
+    /// Inside a shape group: whether its shapes are filled (open ones then close) and whether the
+    /// group has a border. Outside one: `None` / false (a shape's own style decides).
+    pub operand_fill: Option<bool>,
+    pub operand_border: bool,
+    /// The file is older than format 110 (Sketch 52): Sketch scales a resized instance's layers
+    /// instead of following their pins.
+    pub legacy_resize: bool,
+    /// The symbols being expanded, outermost first (a symbol inside itself stops there).
+    pub chain: Vec<String>,
+    pub warnings: Vec<String>,
+    pub networks: Vec<Option<VectorNetwork>>,
+    pub too_old: bool,
+    /// Layers mapped so far, and the most the file may give.
+    pub nodes: usize,
+    pub max_nodes: usize,
+    /// Finds installed faces by PostScript name, and what it found (or didn't) so far.
+    pub fonts: Option<super::FontLookup>,
+    pub font_cache: std::collections::BTreeMap<String, Option<(String, String)>>,
+}
+
+impl Cx {
+    pub(crate) fn warn(&mut self, msg: impl Into<String>) {
+        let msg = msg.into();
+        if self.seen.len() > MAX_NOTES || !self.seen.insert(msg.clone()) {
+            return;
+        }
+        if self.seen.len() > MAX_NOTES {
+            self.warnings.push("more notes were left out".into());
+        } else {
+            self.warnings.push(msg);
+        }
+    }
+
+    /// Spend `n` units of the work budget; false (with a note, once) when it would run out.
+    pub(crate) fn spend(&mut self, n: u64) -> bool {
+        if self.work.saturating_add(n) > self.max_work {
+            self.work = self.max_work;
+            self.warn("the file's symbols expand to more than the import handles; the instances past that were imported as empty frames");
+            return false;
+        }
+        self.work += n;
+        true
+    }
+
+    /// Spend `n` units of the work budget on tinting; false (with a note, once) when it would run
+    /// out.
+    pub(crate) fn spend_on_tint(&mut self, n: u64) -> bool {
+        if self.work.saturating_add(n) > self.max_work {
+            self.warn("tints past what the import handles were skipped; those layers keep their own colours");
+            return false;
+        }
+        self.work += n;
+        true
+    }
+
+    pub(crate) fn work_left(&self) -> u64 {
+        self.max_work.saturating_sub(self.work)
+    }
+}
+
+/// Charge the copy tinting layer `l` makes against the work budget: whether it may be tinted.
+pub(crate) fn spend_on_tint(cx: &mut Cx, l: &Value) -> bool {
+    cx.spend_on_tint(super::symbols::weight(l, 0))
+}
+
+/// Map the pages of `archive` to a REST file JSON named `name`.
+pub(crate) fn to_rest(archive: &Archive, name: &str, max_nodes: usize, fonts: Option<super::FontLookup>) -> Map {
+    let symbols = super::symbols::Symbols::read(&archive.document, &archive.pages);
+    let shared = super::shared::Shared::read(&archive.document);
+    let mut cx = Cx {
+        symbols,
+        shared,
+        style_defs: std::collections::BTreeSet::new(),
+        work: 0,
+        max_work: MAX_WORK,
+        seen: std::collections::BTreeSet::new(),
+        operand_fill: None,
+        operand_border: false,
+        legacy_resize: archive.version > 0 && archive.version < 110,
+        chain: Vec::new(),
+        warnings: Vec::new(),
+        networks: Vec::new(),
+        too_old: false,
+        nodes: 0,
+        max_nodes,
+        fonts,
+        font_cache: std::collections::BTreeMap::new(),
+    };
+    let defs = super::shared::Shared::definitions(&mut cx);
+    cx.style_defs = defs.iter().filter_map(|d| d.get("id").and_then(Value::as_str).map(str::to_string)).collect();
+    let mut canvases = Vec::new();
+    for (id, page) in &archive.pages {
+        let mut node = JsonMap::new();
+        node.insert("type".into(), json!("CANVAS"));
+        node.insert("id".into(), json!(id));
+        node.insert("name".into(), json!(str_field(page, "name").unwrap_or("Page")));
+        let kids = children(&mut cx, page, Affine::IDENTITY, (0.0, 0.0), 0, true);
+        node.insert("children".into(), Value::Array(kids));
+        let starts = super::proto::starting_points(page);
+        if !starts.is_empty() {
+            node.insert("flowStartingPoints".into(), Value::Array(starts));
+        }
+        canvases.push(Value::Object(node));
+    }
+    let foreign = std::mem::take(&mut cx.symbols.foreign);
+    if !foreign.is_empty() {
+        canvases.push(super::symbols::library_page(&mut cx, &foreign));
+        let libraries = cx.symbols.libraries.join(", ");
+        cx.warn(format!("symbols from the libraries {libraries} became local components on the page Library symbols"));
+    }
+    let mut json = json!({"name": name, "document": {"type": "DOCUMENT", "id": "0:0", "children": canvases}, "styleDefinitions": defs});
+    if let Some((collections, variables)) = cx.shared.variables() {
+        json["variableCollections"] = collections;
+        json["variables"] = variables;
+    }
+    Map { json, warnings: cx.warnings, networks: cx.networks, too_old: cx.too_old }
+}
+
+/// One Sketch layer as a REST node (with its children), or `None` when it is skipped. `parent`:
+/// the parent layer's transform to the page; `root`: the layer sits on the page itself.
+pub(crate) fn layer(cx: &mut Cx, l: &Value, parent: Affine, depth: usize, root: bool) -> Option<Value> {
+    if depth > MAX_DEPTH {
+        cx.warn(format!("layers nested deeper than {MAX_DEPTH} levels were skipped"));
+        return None;
+    }
+    if is_archived_text(l) {
+        cx.too_old = true;
+        return None;
+    }
+    // A rectangle with angled or inside corners is a path of that outline.
+    let outlined;
+    let l = match super::path::cut_corners(l) {
+        Some(p) => {
+            outlined = p;
+            &outlined
+        }
+        None => l,
+    };
+    let class = str_field(l, "_class")?;
+    if class == "shapeGroup" {
+        return count(cx).then(|| super::path::shape_group(cx, l, parent, depth, root)).flatten();
+    }
+    if class == "symbolMaster" {
+        return count(cx).then(|| super::symbols::component(cx, l, parent, depth, root)).flatten();
+    }
+    if class == "symbolInstance" {
+        return count(cx).then(|| super::symbols::instance(cx, l, parent, depth, root)).flatten();
+    }
+    let ty = match class {
+        "artboard" | "frame" => "FRAME",
+        // Sketch 2025 and newer: a group that behaves as a frame (1) or a graphic (2), or clips.
+        "group" if is_frame(l) => "FRAME",
+        "group" | "graphic" => "GROUP",
+        // Shapes whose points were moved are paths.
+        "rectangle" | "oval" if bool_field(l, "edited") == Some(true) => "VECTOR",
+        "rectangle" | "bitmap" => "RECTANGLE",
+        "oval" => "ELLIPSE",
+        "slice" => "SLICE",
+        "shapePath" | "star" | "polygon" | "triangle" => "VECTOR",
+        "text" => "TEXT",
+        "MSImmutableHotspotLayer" | "hotspot" => "FRAME",
+        other => {
+            cx.warn(format!("Sketch {} layers are not supported yet and were skipped", clip(other)));
+            return None;
+        }
+    };
+    if !count(cx) {
+        return None;
+    }
+    let (w, h) = size(l);
+    let mut world = parent * local(l, w, h);
+    if ty == "TEXT" {
+        world *= Affine::translate((0.0, super::text::baseline_shift(l)));
+    }
+    let mut node = base(l, ty, parent, world, w, h, root);
+    if ty == "TEXT" {
+        super::text::node(cx, l, &mut node);
+    }
+    if ty == "VECTOR" {
+        let shape = super::path::shape(cx, l, w, h)?;
+        super::path::put_shape(cx, shape, &mut node);
+    }
+    mask(l, &mut node);
+    match class {
+        "artboard" | "frame" => {
+            let clips = if class == "artboard" { true } else { bool_field(l, "clipsContent").unwrap_or(true) };
+            node.insert("clipsContent".into(), json!(clips));
+            let background = (bool_field(l, "hasBackgroundColor") == Some(true)).then(|| l.get("backgroundColor").and_then(color)).flatten();
+            if class == "artboard" || background.is_some() {
+                let c = background.unwrap_or_else(|| json!({"r": 1.0, "g": 1.0, "b": 1.0, "a": 1.0}));
+                node.insert("fills".into(), json!([{"type": "SOLID", "color": c}]));
+            }
+        }
+        "group" if ty == "FRAME" => {
+            // `clippingBehavior`: 0 the default (frames clip), 1 clip, 2 don't.
+            node.insert("clipsContent".into(), json!(l.get("clippingBehavior").and_then(Value::as_i64) != Some(2)));
+        }
+        "rectangle" => corner_radii(l, &mut node),
+        "bitmap" => match l.get("image").and_then(|i| str_field(i, "_ref")) {
+            Some(r) => {
+                let mut paint = json!({"type": "IMAGE", "scaleMode": "STRETCH", "imageRef": r, "imageTransform": [[1, 0, 0], [0, 1, 0]]});
+                if let Some(f) = super::style::color_controls(cx, l.get("style")) {
+                    paint["filters"] = f;
+                }
+                node.insert("fills".into(), json!([paint]));
+            }
+            None => cx.warn("images stored inside the JSON were skipped"),
+        },
+        _ => {}
+    }
+    styles(cx, l, w, h, &mut node);
+    extras(cx, l, h, &mut node);
+    style_corners(l, &mut node);
+    if class == "MSImmutableHotspotLayer" || class == "hotspot" {
+        node.insert("clipsContent".into(), json!(false));
+        node.remove("fills");
+    }
+    // A group's or graphic's fill tints its layers (a frame's is its background).
+    let tinted;
+    let gb = l.get("groupBehavior").and_then(Value::as_i64);
+    let tint = if class == "group" { super::style::tint_of(l.get("style"), gb != Some(1)) } else { None };
+    let l = match tint.filter(|_| spend_on_tint(cx, l)) {
+        Some(t) => {
+            // A plain group's legacy fill is all tint; a frame keeps its background fills.
+            if gb != Some(1) {
+                node.remove("fills");
+            }
+            let mut c = l.clone();
+            if let Some(kids) = c.get_mut("layers").and_then(Value::as_array_mut) {
+                super::style::tint_layers(kids, &t, 0);
+            }
+            tinted = c;
+            &tinted
+        }
+        _ => l,
+    };
+    if matches!(ty, "FRAME" | "GROUP") {
+        let kids = children(cx, l, world, (w, h), depth, false);
+        node.insert("children".into(), Value::Array(kids));
+        super::stack::apply(l, &mut node);
+    }
+    Some(fade(cx, l, node, world, w, h))
+}
+
+/// Layer `node` with a progressive opacity (Fade: the style's `contextSettings` with
+/// `isProgressive` and a gradient whose stops' opacity is the layer's) as a group in its place
+/// holding an alpha mask of that gradient over it; FigCraft has no progressive opacity. Other
+/// layers as they are.
+fn fade(cx: &mut Cx, l: &Value, node: JsonMap<String, Value>, world: Affine, w: f64, h: f64) -> Value {
+    let ctx = l.get("style").and_then(|s| s.get("contextSettings"));
+    let gradient = ctx.filter(|c| c.get("isProgressive").and_then(Value::as_bool) == Some(true)).and_then(|c| c.get("gradient"));
+    // A mask stays as it is: its group would stop masking the layers above it.
+    let Some(gradient) = gradient.filter(|_| node.get("isMask").and_then(Value::as_bool) != Some(true)) else { return Value::Object(node) };
+    let fill = json!({"_class": "fill", "isEnabled": true, "fillType": 1, "gradient": gradient});
+    let fills = super::style::fills(cx, &json!({"fills": [fill]}), w, h);
+    if fills.is_empty() {
+        return Value::Object(node);
+    }
+    let id = str_field(l, "do_objectID").unwrap_or("layer");
+    let identity = json!([[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]]);
+    let bb = world.transform_rect_bbox(Rect::new(0.0, 0.0, w, h));
+    let abs = json!({"x": bb.x0, "y": bb.y0, "width": bb.width(), "height": bb.height()});
+    // The group takes the layer's id (stacks, links and overrides find it), the layer a new one.
+    let mut inner = node;
+    let mut group = JsonMap::new();
+    for k in ["relativeTransform", "absoluteBoundingBox", "constraints", "visible", "locked"] {
+        if let Some(v) = inner.get(k) {
+            group.insert(k.into(), v.clone());
+        }
+    }
+    group.insert("type".into(), json!("GROUP"));
+    group.insert("id".into(), json!(id));
+    group.insert("name".into(), inner.get("name").cloned().unwrap_or_else(|| json!("Fade")));
+    group.insert("size".into(), json!({"x": w, "y": h}));
+    group.insert("absoluteBoundingBox".into(), abs.clone());
+    inner.insert("id".into(), json!(format!("{id}-faded")));
+    inner.insert("relativeTransform".into(), identity.clone());
+    inner.insert("absoluteBoundingBox".into(), abs.clone());
+    inner.insert("visible".into(), json!(true));
+    let mask = json!({"type": "RECTANGLE", "id": format!("{id}-fade-mask"), "name": "Fade", "visible": true, "size": {"x": w, "y": h},
+        "relativeTransform": identity, "absoluteBoundingBox": abs, "fills": fills, "isMask": true, "maskType": "ALPHA"});
+    group.insert("children".into(), json!([mask, Value::Object(inner)]));
+    Value::Object(group)
+}
+
+/// A Sketch 2025+ group that is a frame: it behaves as a frame or a graphic, or clips.
+pub(crate) fn is_frame(l: &Value) -> bool {
+    matches!(l.get("groupBehavior").and_then(Value::as_i64), Some(1 | 2)) || l.get("clippingBehavior").and_then(Value::as_i64) == Some(1)
+}
+
+/// Corners kept in the style (Sketch 2025+: one radius for all, or one per corner from the top
+/// left, clockwise) on shapes and frames that have corners; smooth corners keep their smoothing.
+pub(crate) fn style_corners(l: &Value, node: &mut JsonMap<String, Value>) {
+    let Some(c) = l.get("style").and_then(|s| s.get("corners")) else { return };
+    if !matches!(node.get("type").and_then(Value::as_str), Some("RECTANGLE" | "FRAME" | "COMPONENT" | "INSTANCE")) {
+        return;
+    }
+    let radii: Vec<f64> = c
+        .get("radii")
+        .and_then(Value::as_array)
+        .map(Vec::as_slice)
+        .unwrap_or_default()
+        .iter()
+        .filter_map(Value::as_f64)
+        .filter(|r| r.is_finite())
+        .map(|r| r.clamp(0.0, MAX_SIZE))
+        .take(4)
+        .collect();
+    match radii.as_slice() {
+        [] => return,
+        [r] => {
+            node.insert("cornerRadius".into(), json!(r));
+            node.remove("rectangleCornerRadii");
+        }
+        more => {
+            // Values repeat to fill the four corners.
+            let all: Vec<f64> = (0..4).map(|i| more.get(i % more.len()).copied().unwrap_or(0.0)).collect();
+            node.insert("rectangleCornerRadii".into(), json!(all));
+        }
+    }
+    // Style 1 is smooth: its smoothing applies.
+    if c.get("style").and_then(Value::as_i64) == Some(1)
+        && let Some(sm) = c.get("smoothing").and_then(Value::as_f64).filter(|v| v.is_finite())
+    {
+        node.insert("cornerSmoothing".into(), json!(sm.clamp(0.0, 1.0)));
+    }
+}
+
+/// Layer `l`'s style into `node`, and its links to the styles made from its shared style.
+pub(crate) fn styles(cx: &mut Cx, l: &Value, w: f64, h: f64, node: &mut JsonMap<String, Value>) {
+    // An artboard shows its background colour only; Sketch doesn't draw a style it carries.
+    if str_field(l, "_class") == Some("artboard") {
+        return;
+    }
+    if let Some(st) = l.get("style") {
+        super::style::apply(cx, st, w, h, node);
+    }
+    cx.shared.link(&cx.style_defs, l, node);
+}
+
+/// Layer `l`'s prototype link, export settings, layout grids (frames) and notes.
+pub(crate) fn extras(cx: &mut Cx, l: &Value, h: f64, node: &mut JsonMap<String, Value>) {
+    super::proto::interactions(l, node);
+    super::proto::export_settings(cx, l, node);
+    if matches!(node.get("type").and_then(Value::as_str), Some("FRAME" | "COMPONENT" | "INSTANCE")) {
+        super::proto::layout_grids(l, h, node);
+    }
+    super::proto::notes(cx, l);
+}
+
+/// A clipping mask's flag and kind (outline or alpha).
+pub(crate) fn mask(l: &Value, node: &mut JsonMap<String, Value>) {
+    if bool_field(l, "hasClippingMask") == Some(true) {
+        node.insert("isMask".into(), json!(true));
+        node.insert("maskType".into(), json!(if l.get("clippingMaskMode").and_then(Value::as_i64) == Some(1) { "ALPHA" } else { "VECTOR" }));
+    }
+}
+
+/// Count one more layer; false (with a warning) once the file's budget is spent.
+fn count(cx: &mut Cx) -> bool {
+    if cx.nodes >= cx.max_nodes {
+        cx.warn(format!("the file has more than {} layers; the rest were skipped", cx.max_nodes));
+        return false;
+    }
+    cx.nodes += 1;
+    true
+}
+
+/// The properties every REST node of layer `l` has: its type, id, name, visibility, lock, size,
+/// place (`world`, relative to `parent`) and constraints.
+pub(crate) fn base(l: &Value, ty: &str, parent: Affine, world: Affine, w: f64, h: f64, root: bool) -> JsonMap<String, Value> {
+    let mut node = JsonMap::new();
+    node.insert("type".into(), json!(ty));
+    if let Some(id) = str_field(l, "do_objectID") {
+        node.insert("id".into(), json!(id));
+    }
+    let class = str_field(l, "_class").unwrap_or("Layer");
+    node.insert("name".into(), json!(str_field(l, "name").unwrap_or(class)));
+    node.insert("visible".into(), json!(bool_field(l, "isVisible").unwrap_or(true)));
+    node.insert("locked".into(), json!(bool_field(l, "isLocked").unwrap_or(false)));
+    node.insert("size".into(), json!({"x": w, "y": h}));
+    let [a, b, c, d, e, f] = (parent.inverse() * world).as_coeffs();
+    node.insert("relativeTransform".into(), json!([[a, c, e], [b, d, f]]));
+    // The page places top-level layers by their transform; deeper ones also say where they end up,
+    // which tells the importer their transform is relative to their group.
+    if !root {
+        let bb = world.transform_rect_bbox(Rect::new(0.0, 0.0, w, h));
+        node.insert("absoluteBoundingBox".into(), json!({"x": bb.x0, "y": bb.y0, "width": bb.width(), "height": bb.height()}));
+    }
+    node.insert("constraints".into(), constraints(pin_mask(l)));
+    node
+}
+
+/// A layer's size from its `frame` (finite, not negative, at most [`MAX_SIZE`]).
+pub(crate) fn size(l: &Value) -> (f64, f64) {
+    let f = l.get("frame");
+    let n = |k: &str| f.and_then(|f| f.get(k)).and_then(Value::as_f64).filter(|v| v.is_finite()).unwrap_or(0.0).clamp(0.0, MAX_SIZE);
+    (n("width"), n("height"))
+}
+
+/// A layer's transform within its parent: its frame's position, then its rotation (degrees,
+/// counter-clockwise on screen) and flips about its centre. Sketch flips on screen, after rotating
+/// (a quarter-turned layer flipped left to right mirrors its own up and down).
+pub(crate) fn local(l: &Value, w: f64, h: f64) -> Affine {
+    let f = l.get("frame");
+    let n = |k: &str| f.and_then(|f| f.get(k)).and_then(Value::as_f64).filter(|v| v.is_finite()).unwrap_or(0.0).clamp(-MAX_COORD, MAX_COORD);
+    let rot = l.get("rotation").and_then(Value::as_f64).filter(|v| v.is_finite()).unwrap_or(0.0) % 360.0;
+    let sx = if bool_field(l, "isFlippedHorizontal") == Some(true) { -1.0 } else { 1.0 };
+    let sy = if bool_field(l, "isFlippedVertical") == Some(true) { -1.0 } else { 1.0 };
+    Affine::translate((n("x") + w / 2.0, n("y") + h / 2.0))
+        * Affine::scale_non_uniform(sx, sy)
+        * Affine::rotate(-rot.to_radians())
+        * Affine::translate((-w / 2.0, -h / 2.0))
+}
+
+/// A layer's pins as a `resizingConstraint` mask. Sketch 2025 and newer keep them in
+/// `horizontalPins`/`verticalPins` (bits: 1 the start, 4 the end) and `horizontalSizing`/
+/// `verticalSizing` (fixed and fit keep the size; fill and relative don't), with
+/// `resizingConstraint` left at 63.
+pub(crate) fn pin_mask(l: &Value) -> i64 {
+    if l.get("horizontalPins").is_none() && l.get("horizontalSizing").is_none() {
+        return l.get("resizingConstraint").and_then(Value::as_i64).unwrap_or(63);
+    }
+    let int = |k: &str| l.get(k).and_then(Value::as_i64).unwrap_or(0);
+    let fixed = |k: &str| matches!(int(k), 0 | 1);
+    let mut mask = 63;
+    // A cleared bit pins: right 1, width 2, left 4, bottom 8, height 16, top 32.
+    for (on, bit) in [
+        (int("horizontalPins") & 1 != 0, 4),
+        (int("horizontalPins") & 4 != 0, 1),
+        (fixed("horizontalSizing"), 2),
+        (int("verticalPins") & 1 != 0, 32),
+        (int("verticalPins") & 4 != 0, 8),
+        (fixed("verticalSizing"), 16),
+    ] {
+        if on {
+            mask &= !bit;
+        }
+    }
+    mask
+}
+
+/// REST constraints from Sketch's `resizingConstraint`: six bits, a cleared bit pins that side or
+/// fixes that size (right 1, width 2, left 4, bottom 8, height 16, top 32). A layer pinned on
+/// neither side keeps its place in proportion (scale) unless its size is fixed (centre).
+fn constraints(mask: i64) -> Value {
+    let pinned = |bit: i64| mask & bit == 0;
+    let axis = |low: i64, size: i64, high: i64, low_name: &str, high_name: &str, both: &str| match (pinned(low), pinned(high)) {
+        // Both sides and the size pinned can't all hold: Sketch scales such a layer.
+        (true, true) if pinned(size) => "SCALE".into(),
+        (true, true) => both.to_string(),
+        (true, false) => low_name.to_string(),
+        (false, true) => high_name.to_string(),
+        (false, false) if pinned(size) => "CENTER".into(),
+        (false, false) => "SCALE".into(),
+    };
+    json!({
+        "horizontal": axis(4, 2, 1, "LEFT", "RIGHT", "LEFT_RIGHT"),
+        "vertical": axis(32, 16, 8, "TOP", "BOTTOM", "TOP_BOTTOM"),
+    })
+}
+
+/// A rectangle's corner radii: per corner from its points (top left, top right, bottom right,
+/// bottom left), else its `fixedRadius`.
+fn corner_radii(l: &Value, node: &mut JsonMap<String, Value>) {
+    let radius = |v: Option<&Value>| v.and_then(Value::as_f64).filter(|r| r.is_finite()).map_or(0.0, |r| r.clamp(0.0, MAX_SIZE));
+    let pts = l.get("points").and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default();
+    let each: Vec<f64> = pts.iter().map(|p| radius(p.get("cornerRadius"))).collect();
+    if each.len() == 4 && each.iter().any(|r| *r > 0.0) {
+        node.insert("rectangleCornerRadii".into(), json!(each));
+    } else if radius(l.get("fixedRadius")) > 0.0 {
+        node.insert("cornerRadius".into(), json!(radius(l.get("fixedRadius"))));
+    }
+}
+
+/// A Sketch colour (`red`, `green`, `blue`, `alpha` in 0–1) as a REST colour.
+pub(crate) fn color(c: &Value) -> Option<Value> {
+    let n = |k: &str| c.get(k).and_then(Value::as_f64).filter(|v| v.is_finite()).map(|v| v.clamp(0.0, 1.0));
+    Some(json!({"r": n("red")?, "g": n("green")?, "b": n("blue")?, "a": n("alpha").unwrap_or(1.0)}))
+}
+
+pub(crate) fn bool_field(v: &Value, key: &str) -> Option<bool> {
+    v.get(key).and_then(Value::as_bool)
+}
+
+/// At most 64 characters of a name read from the file, for warnings.
+fn clip(s: &str) -> String {
+    s.chars().take(64).collect()
+}
+
+/// The child layers of `l` (placed at `world`, `size`) as REST nodes. A clipping mask clips the
+/// layers after it up to one that breaks the chain (or the next mask); when that happens before
+/// the end, the mask and what it clips are wrapped in a group of their own, since a FigCraft mask
+/// clips everything above it.
+pub(crate) fn children(cx: &mut Cx, l: &Value, world: Affine, size: (f64, f64), depth: usize, root: bool) -> Vec<Value> {
+    let built: Vec<(bool, Value)> = layers(l)
+        .iter()
+        .filter_map(|c| {
+            let breaks = bool_field(c, "shouldBreakMaskChain") == Some(true) || bool_field(c, "hasClippingMask") == Some(true);
+            layer(cx, c, world, depth + 1, root).map(|n| (breaks, n))
+        })
+        .flat_map(|(breaks, n)| match drawn_mask(&n) {
+            // Sketch also draws a mask with its own style, under what it clips; a FigCraft mask
+            // only clips, so a plain copy of it goes underneath.
+            // The copy ends an earlier mask's chain as the mask itself would.
+            Some(copy) => vec![(breaks, copy), (breaks, n)],
+            None => vec![(breaks, n)],
+        })
+        .collect();
+    let mut out = Vec::new();
+    let mut i = 0;
+    while let Some((_, n)) = built.get(i) {
+        let end = if n.get("isMask").and_then(Value::as_bool) == Some(true) {
+            built.iter().skip(i + 1).position(|(b, _)| *b).map(|k| i + 1 + k)
+        } else {
+            None
+        };
+        let Some(end) = end else {
+            out.push(n.clone());
+            i += 1;
+            continue;
+        };
+        let masked: Vec<Value> = built.get(i..end).unwrap_or_default().iter().map(|(_, n)| n.clone()).collect();
+        let mut g = JsonMap::new();
+        g.insert("type".into(), json!("GROUP"));
+        g.insert("name".into(), json!("Mask group"));
+        g.insert("relativeTransform".into(), json!([[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]]));
+        g.insert("size".into(), json!({"x": size.0, "y": size.1}));
+        if !root {
+            let bb = world.transform_rect_bbox(Rect::new(0.0, 0.0, size.0, size.1));
+            g.insert("absoluteBoundingBox".into(), json!({"x": bb.x0, "y": bb.y0, "width": bb.width(), "height": bb.height()}));
+        }
+        g.insert("children".into(), Value::Array(masked));
+        out.push(Value::Object(g));
+        i = end;
+    }
+    out
+}
+
+/// A plain copy of outline mask `n` when its style shows something (fills, borders or effects).
+/// An alpha mask only masks.
+fn drawn_mask(n: &Value) -> Option<Value> {
+    if n.get("isMask").and_then(Value::as_bool) != Some(true) || n.get("maskType").and_then(Value::as_str) == Some("ALPHA") {
+        return None;
+    }
+    let shows =
+        |key: &str| n.get(key).and_then(Value::as_array).is_some_and(|l| l.iter().any(|p| p.get("visible").and_then(Value::as_bool) != Some(false)));
+    if !(shows("fills") || shows("strokes") || shows("effects")) {
+        return None;
+    }
+    let mut copy = n.clone();
+    let m = copy.as_object_mut()?;
+    m.remove("isMask");
+    m.remove("maskType");
+    m.remove("id");
+    let name = m.get("name").and_then(Value::as_str).unwrap_or("Mask").to_string();
+    m.insert("name".into(), json!(format!("{name} (drawn)")));
+    Some(copy)
+}
+
+/// A text layer whose string is a binary property list (Sketch 43–47).
+fn is_archived_text(l: &Value) -> bool {
+    l.get("attributedString").is_some_and(|a| a.get("archivedAttributedString").is_some())
+}
+
+/// The child layers of a page or layer.
+pub(crate) fn layers(l: &Value) -> &[Value] {
+    l.get("layers").and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default()
+}
+
+pub(crate) fn str_field<'v>(v: &'v Value, key: &str) -> Option<&'v str> {
+    v.get(key).and_then(Value::as_str)
+}
diff --git a/crates/format/src/sketch/tree_tests.rs b/crates/format/src/sketch/tree_tests.rs
new file mode 100644
index 00000000..5399a3df
--- /dev/null
+++ b/crates/format/src/sketch/tree_tests.rs
@@ -0,0 +1,274 @@
+//! Sketch layers → document layers: kinds, positions, transforms, constraints, visibility.
+
+use figcraft_doc::color::PaintKind;
+use figcraft_doc::{Document, HConstraint, NodeKind, VConstraint};
+use serde_json::{Value, json};
+
+use super::fixture::*;
+use super::import;
+
+/// Import one page holding `layers`, with extra archive `files`.
+fn open_with(layers: Vec<Value>, files: &[(&str, &[u8])]) -> (Document, Vec<String>) {
+    let z = sketch_zip("50.2", 103, document(&["P"]), &[page("P", "Page", layers)], files);
+    import(&z, "f").unwrap()
+}
+
+fn open(layers: Vec<Value>) -> (Document, Vec<String>) {
+    open_with(layers, &[])
+}
+
+fn node<'d>(doc: &'d Document, name: &str) -> &'d figcraft_doc::Node {
+    doc.nodes().find(|n| n.name == name).unwrap_or_else(|| panic!("no layer named {name}"))
+}
+
+fn solid(doc: &Document, name: &str) -> Option<[f32; 4]> {
+    node(doc, name).fills.iter().find_map(|p| match &p.kind {
+        PaintKind::Solid { color } => Some([color.r, color.g, color.b, p.opacity]),
+        _ => None,
+    })
+}
+
+#[test]
+fn artboard_is_frame_with_white_fill_unless_background() {
+    let plain = artboard("A", "Plain", 0.0, 0.0, 100.0, 50.0, vec![]);
+    let red = with(artboard("B", "Red", 200.0, 0.0, 100.0, 50.0, vec![]), "hasBackgroundColor", json!(true));
+    let red = with(red, "backgroundColor", json!({"_class": "color", "red": 1, "green": 0, "blue": 0, "alpha": 1}));
+    let (doc, _) = open(vec![plain, red]);
+    assert!(matches!(node(&doc, "Plain").kind, NodeKind::Frame));
+    assert!(node(&doc, "Plain").clip);
+    assert_eq!(solid(&doc, "Plain"), Some([1.0, 1.0, 1.0, 1.0]));
+    assert_eq!(solid(&doc, "Red"), Some([1.0, 0.0, 0.0, 1.0]));
+    let b = doc.world_bounds(node(&doc, "Red").id).unwrap();
+    assert_eq!((b.x0, b.y0, b.width(), b.height()), (200.0, 0.0, 100.0, 50.0));
+}
+
+#[test]
+fn group_children_positions_accumulate() {
+    let r = rect("R", 5.0, 5.0, 10.0, 10.0);
+    let g = group("G", 10.0, 20.0, 15.0, 15.0, vec![r]);
+    let (doc, _) = open(vec![artboard("A", "Board", 100.0, 100.0, 300.0, 300.0, vec![g])]);
+    assert!(matches!(node(&doc, "G").kind, NodeKind::Group));
+    let b = doc.world_bounds(node(&doc, "R").id).unwrap();
+    assert!((b.x0 - 115.0).abs() < 1e-6 && (b.y0 - 125.0).abs() < 1e-6, "{b:?}");
+}
+
+#[test]
+fn rotation_and_flip() {
+    let rotated = with(rect("Turned", 0.0, 0.0, 40.0, 20.0), "rotation", json!(90));
+    let flipped = with(rect("Flipped", 100.0, 0.0, 40.0, 20.0), "isFlippedHorizontal", json!(true));
+    let (doc, _) = open(vec![artboard("A", "Board", 0.0, 0.0, 300.0, 300.0, vec![rotated, flipped])]);
+    let b = doc.world_bounds(node(&doc, "Turned").id).unwrap();
+    assert!((b.width() - 20.0).abs() < 1e-6 && (b.height() - 40.0).abs() < 1e-6, "{b:?}");
+    assert!((b.center().x - 20.0).abs() < 1e-6 && (b.center().y - 10.0).abs() < 1e-6, "{b:?}");
+    // Counter-clockwise on screen: the box's x axis points up.
+    let t = doc.world_transform(node(&doc, "Turned").id).as_coeffs();
+    assert!(t[1] < -0.99, "{t:?}");
+    let t = doc.world_transform(node(&doc, "Flipped").id).as_coeffs();
+    assert!(t[0] < -0.99, "{t:?}");
+    let b = doc.world_bounds(node(&doc, "Flipped").id).unwrap();
+    assert!((b.x0 - 100.0).abs() < 1e-6 && (b.width() - 40.0).abs() < 1e-6, "{b:?}");
+}
+
+#[test]
+fn resizing_constraint_bits() {
+    use HConstraint as H;
+    use VConstraint as V;
+    // A cleared bit pins: right 1, width 2, left 4, bottom 8, height 16, top 32.
+    let cases = [
+        (63, H::Scale, V::Scale),
+        (63 - 4 - 32, H::Left, V::Top),
+        (63 - 1 - 8, H::Right, V::Bottom),
+        (63 - 1 - 4, H::LeftRight, V::Scale),
+        (63 - 8 - 32, H::Scale, V::TopBottom),
+        (63 - 2 - 16, H::Center, V::Center),
+        (63 - 1 - 2, H::Right, V::Scale),
+        // Everything pinned is over-constrained: Sketch scales it.
+        (0, H::Scale, V::Scale),
+    ];
+    let layers: Vec<Value> = cases
+        .iter()
+        .enumerate()
+        .map(|(i, (mask, _, _))| with(rect(&format!("R{i}"), 0.0, 0.0, 10.0, 10.0), "resizingConstraint", json!(mask)))
+        .collect();
+    let (doc, _) = open(vec![artboard("A", "Board", 0.0, 0.0, 100.0, 100.0, layers)]);
+    for (i, (mask, h, v)) in cases.iter().enumerate() {
+        let c = node(&doc, &format!("R{i}")).constraints;
+        assert_eq!((c.horizontal, c.vertical), (*h, *v), "mask {mask}");
+    }
+}
+
+#[test]
+fn hidden_locked_named() {
+    let r = with(with(rect("Hidden", 0.0, 0.0, 10.0, 10.0), "isVisible", json!(false)), "isLocked", json!(true));
+    let (doc, _) = open(vec![artboard("A", "Board", 0.0, 0.0, 100.0, 100.0, vec![r])]);
+    let n = node(&doc, "Hidden");
+    assert!(!n.visible && n.locked);
+}
+
+#[test]
+fn bad_numbers_are_sane() {
+    let mut nan = rect("Junk", 0.0, 0.0, 10.0, 10.0);
+    nan["frame"]["width"] = json!("NaN");
+    nan["frame"]["x"] = json!(1e300);
+    let mut neg = rect("Negative", 0.0, 0.0, 10.0, 10.0);
+    neg["frame"]["height"] = json!(-5);
+    neg["rotation"] = json!("x");
+    let mut none = rect("Frameless", 0.0, 0.0, 10.0, 10.0);
+    none.as_object_mut().unwrap().remove("frame");
+    let (doc, _) = open(vec![artboard("A", "Board", 0.0, 0.0, 100.0, 100.0, vec![nan, neg, none])]);
+    for n in doc.nodes() {
+        assert!(n.width.is_finite() && n.height.is_finite() && n.width >= 0.0 && n.height >= 0.0, "{}", n.name);
+        assert!(n.transform.as_coeffs().iter().all(|c| c.is_finite()), "{}", n.name);
+    }
+}
+
+#[test]
+fn rectangle_corner_radii() {
+    let mut each = rect("Each", 0.0, 0.0, 40.0, 40.0);
+    for (i, r) in [1, 2, 3, 4].iter().enumerate() {
+        each["points"][i]["cornerRadius"] = json!(r);
+    }
+    let fixed = with(rect("Fixed", 50.0, 0.0, 40.0, 40.0), "fixedRadius", json!(8));
+    let (doc, _) = open(vec![artboard("A", "Board", 0.0, 0.0, 100.0, 100.0, vec![each, fixed])]);
+    assert!(matches!(node(&doc, "Each").kind, NodeKind::Rectangle));
+    assert_eq!(node(&doc, "Each").corners.radii, [1.0, 2.0, 3.0, 4.0]);
+    assert_eq!(node(&doc, "Fixed").corners.radii, [8.0; 4]);
+}
+
+#[test]
+fn oval_slice_and_bitmap() {
+    let mut oval = rect("Round", 0.0, 0.0, 30.0, 20.0);
+    oval["_class"] = json!("oval");
+    let mut slice = rect("Cut", 0.0, 0.0, 30.0, 20.0);
+    slice["_class"] = json!("slice");
+    let mut bitmap = rect("Photo", 0.0, 0.0, 30.0, 20.0);
+    bitmap["_class"] = json!("bitmap");
+    bitmap["image"] = json!({"_class": "MSJSONFileReference", "_ref_class": "MSImageData", "_ref": "images/abc123.png"});
+    let png = {
+        let mut out = Vec::new();
+        image::RgbaImage::new(2, 2).write_to(&mut std::io::Cursor::new(&mut out), image::ImageFormat::Png).unwrap();
+        out
+    };
+    let (doc, _) = open_with(vec![artboard("A", "Board", 0.0, 0.0, 100.0, 100.0, vec![oval, slice, bitmap])], &[("images/abc123.png", &png)]);
+    assert!(matches!(node(&doc, "Round").kind, NodeKind::Ellipse { .. }));
+    assert!(matches!(node(&doc, "Cut").kind, NodeKind::Slice));
+    let photo = node(&doc, "Photo");
+    assert!(matches!(photo.kind, NodeKind::Rectangle));
+    assert!(photo.fills.iter().any(|p| matches!(&p.kind, PaintKind::Image(_))));
+    assert_eq!(doc.images.len(), 1);
+}
+
+#[test]
+fn unknown_class_is_a_warning() {
+    let mut odd = rect("Odd", 0.0, 0.0, 10.0, 10.0);
+    odd["_class"] = json!("MSSomethingNew");
+    let (doc, warnings) = open(vec![artboard("A", "Board", 0.0, 0.0, 100.0, 100.0, vec![odd])]);
+    assert!(doc.nodes().all(|n| n.name != "Odd"));
+    assert!(warnings.iter().any(|w| w.contains("MSSomethingNew")), "{warnings:?}");
+}
+
+#[test]
+fn sketch_2025_frames_and_graphics() {
+    let mut frame = artboard("F", "Frame", 0.0, 0.0, 100.0, 100.0, vec![rect("Inside", 0.0, 0.0, 10.0, 10.0)]);
+    frame["_class"] = json!("frame");
+    frame["clipsContent"] = json!(false);
+    let mut graphic = group("Graphic", 10.0, 10.0, 10.0, 10.0, vec![rect("Leaf", 0.0, 0.0, 10.0, 10.0)]);
+    graphic["_class"] = json!("graphic");
+    frame["layers"].as_array_mut().unwrap().push(graphic);
+    let (doc, _) = open(vec![frame]);
+    assert!(matches!(node(&doc, "Frame").kind, NodeKind::Frame));
+    assert!(!node(&doc, "Frame").clip);
+    assert!(matches!(node(&doc, "Graphic").kind, NodeKind::Group));
+}
+
+#[test]
+fn many_distinct_warnings_are_capped() {
+    let layers: Vec<Value> = (0..5000)
+        .map(|i| {
+            let mut l = rect(&format!("R{i}"), 0.0, 0.0, 1.0, 1.0);
+            l["_class"] = json!(format!("MSOdd{i}"));
+            l
+        })
+        .collect();
+    let (_, warnings) = open(vec![artboard("A", "Board", 0.0, 0.0, 100.0, 100.0, layers)]);
+    assert!(warnings.len() <= 250, "{}", warnings.len());
+}
+
+#[test]
+fn bomb_pages_are_skipped() {
+    // 64 MB of `[0,0,…]` packs into a few hundred kilobytes.
+    let bomb = format!("{{\"_class\":\"page\",\"do_objectID\":\"B\",\"name\":\"Bomb\",\"layers\":[],\"junk\":[{}0]}}", "0,".repeat(32 * 1024 * 1024));
+    let mut out = Vec::new();
+    {
+        use std::io::Write;
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(&mut out));
+        let o = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);
+        z.start_file("document.json", o).unwrap();
+        z.write_all(document(&["B", "P"]).to_string().as_bytes()).unwrap();
+        z.start_file("meta.json", o).unwrap();
+        z.write_all(json!({"app": "com.bohemiancoding.sketch3", "appVersion": "50.2", "version": 103}).to_string().as_bytes()).unwrap();
+        z.start_file("pages/B.json", o).unwrap();
+        z.write_all(bomb.as_bytes()).unwrap();
+        z.start_file("pages/P.json", o).unwrap();
+        z.write_all(page("P", "Fine", vec![]).to_string().as_bytes()).unwrap();
+        z.finish().unwrap();
+    }
+    let (doc, warnings) = import(&out, "f").unwrap();
+    let names: Vec<String> = doc.pages.iter().map(|p| doc.node(*p).unwrap().name.clone()).collect();
+    assert!(!names.contains(&"Bomb".to_string()) && names.contains(&"Fine".to_string()), "{names:?}");
+    assert!(warnings.iter().any(|w| w.contains("too large")), "{warnings:?}");
+}
+
+#[test]
+fn deep_document_json_still_opens_the_pages() {
+    let mut deep = json!({"_class": "symbolMaster"});
+    for _ in 0..150 {
+        deep = json!({"_class": "group", "layers": [deep]});
+    }
+    let mut d = document(&["P"]);
+    d["foreignSymbols"] = json!([{"symbolMaster": deep}]);
+    let z = sketch_zip("50.2", 103, d, &[page("P", "Kept", vec![])], &[]);
+    let (doc, warnings) = import(&z, "f").unwrap();
+    assert!(doc.pages.iter().any(|p| doc.node(*p).unwrap().name == "Kept"));
+    assert!(!warnings.is_empty());
+}
+
+/// Sketch flips a rotated layer on screen, after rotating it.
+#[test]
+fn flip_applies_after_rotation() {
+    let r = with(with(rect("Turned", 0.0, 0.0, 40.0, 20.0), "rotation", json!(90)), "isFlippedHorizontal", json!(true));
+    let (doc, _) = open(vec![artboard("A", "Board", 0.0, 0.0, 300.0, 300.0, vec![r])]);
+    let t = doc.world_transform(node(&doc, "Turned").id).as_coeffs();
+    // Rotated a quarter turn counter-clockwise (x → up, y → right), then mirrored left to right.
+    assert!(t[0].abs() < 1e-9 && (t[1] + 1.0).abs() < 1e-9 && (t[2] + 1.0).abs() < 1e-9 && t[3].abs() < 1e-9, "{t:?}");
+}
+
+#[test]
+fn edited_shapes_keep_their_points() {
+    let mut drop = rect("Drop", 0.0, 0.0, 20.0, 30.0);
+    drop["_class"] = json!("oval");
+    drop["edited"] = json!(true);
+    drop["points"] = json!([point(0.5, 0.0), point(1.0, 0.7), point(0.5, 1.0), point(0.0, 0.7)]);
+    let mut box_ = rect("Slanted", 50.0, 0.0, 20.0, 20.0);
+    box_["edited"] = json!(true);
+    box_["points"][1]["point"] = json!("{1, 0.3}");
+    let (doc, _) = open(vec![artboard("A", "Board", 0.0, 0.0, 300.0, 300.0, vec![drop, box_])]);
+    let NodeKind::Vector { network } = &node(&doc, "Drop").kind else { panic!("not a vector") };
+    assert_eq!((network.vertices[0].x, network.vertices[0].y), (10.0, 0.0));
+    assert!(matches!(node(&doc, "Slanted").kind, NodeKind::Vector { .. }));
+}
+
+/// Sketch draws an artboard's background colour only; a style it may carry (borders, shadows) isn't
+/// drawn. Sketch 2025 frames do draw theirs.
+#[test]
+fn artboards_ignore_their_style() {
+    let border = json!([{"_class": "border", "isEnabled": true, "fillType": 0, "color": {"_class": "color", "red": 0, "green": 0, "blue": 0, "alpha": 1}, "position": 2, "thickness": 1}]);
+    let mut a = artboard("A", "Board", 0.0, 0.0, 100.0, 100.0, vec![]);
+    a["style"]["borders"] = border.clone();
+    let mut f = artboard("F", "Frame", 200.0, 0.0, 100.0, 100.0, vec![]);
+    f["_class"] = json!("frame");
+    f["style"]["borders"] = border;
+    let (doc, _) = open(vec![a, f]);
+    assert!(node(&doc, "Board").strokes.is_empty());
+    assert_eq!(node(&doc, "Frame").strokes.len(), 1);
+}
diff --git a/crates/format/src/thumbnail.rs b/crates/format/src/thumbnail.rs
index a5e7e2b3..718e8d79 100644
--- a/crates/format/src/thumbnail.rs
+++ b/crates/format/src/thumbnail.rs
@@ -1,5 +1,5 @@
-//! The picture a saved file carries of itself: `thumbnail.png` inside a `.figcraft` or `.fig` zip
-//! (the home screen's recent files show it), and the colour of the page it sits on. Image files are
+//! The picture a saved file carries of itself: `thumbnail.png` inside a `.figcraft` or `.fig` zip,
+//! `previews/preview.png` inside a `.sketch` zip (the home screen's recent files show it), and the colour of the page it sits on. Image files are
 //! their own picture. Everything is read within caps: a missing, damaged or oversized picture gives
 //! `None`, never an error or a panic.
 
@@ -33,6 +33,12 @@ pub fn thumbnail_png<R: Read + Seek>(archive: R) -> Option<Vec<u8>> {
     crate::read_member(&mut z, "thumbnail.png", MAX_THUMBNAIL_BYTES).ok()
 }
 
+/// The bytes of `previews/preview.png` in a `.sketch` zip; `None` as [`thumbnail_png`] gives it.
+pub fn sketch_preview_png<R: Read + Seek>(archive: R) -> Option<Vec<u8>> {
+    let mut z = zip::ZipArchive::new(archive).ok()?;
+    crate::read_member(&mut z, "previews/preview.png", MAX_THUMBNAIL_BYTES).ok()
+}
+
 /// Decode a picture (PNG, JPEG, WebP, GIF, BMP or TIFF) no larger than [`MAX_THUMBNAIL_SIDE`] on
 /// either side, scaled down to at most `fit` pixels on its longer side (never up).
 pub fn decode_thumbnail(bytes: &[u8], fit: u32) -> Option<Thumbnail> {
@@ -59,6 +65,8 @@ pub enum FileKind {
     FigCraft,
     /// `.fig`
     Fig,
+    /// `.sketch`
+    Sketch,
     /// `.svg`
     Svg,
     /// A raster image (`.png`, `.jpg`, `.webp`, …).
@@ -72,6 +80,7 @@ impl FileKind {
         match ext.as_str() {
             "figcraft" => FileKind::FigCraft,
             "fig" => FileKind::Fig,
+            "sketch" => FileKind::Sketch,
             "svg" => FileKind::Svg,
             "png" | "jpg" | "jpeg" | "webp" | "gif" | "bmp" | "tif" | "tiff" => FileKind::Image,
             _ => FileKind::Other,
@@ -80,7 +89,7 @@ impl FileKind {
 }
 
 /// The picture of the file at `path`, at most `fit` pixels on its longer side: the thumbnail a
-/// `.figcraft` or `.fig` file carries, or an image file itself (up to [`MAX_IMAGE_FILE_BYTES`]).
+/// `.figcraft`, `.fig` or `.sketch` file carries, or an image file itself (up to [`MAX_IMAGE_FILE_BYTES`]).
 /// `None` for anything else, and for a file that is missing, unreadable or damaged.
 pub fn file_thumbnail(path: &Path, fit: u32) -> Option<Thumbnail> {
     match FileKind::of(path) {
@@ -89,6 +98,11 @@ pub fn file_thumbnail(path: &Path, fit: u32) -> Option<Thumbnail> {
             let png = thumbnail_png(std::io::BufReader::new(file))?;
             decode_thumbnail(&png, fit)
         }
+        FileKind::Sketch => {
+            let file = std::fs::File::open(path).ok()?;
+            let png = sketch_preview_png(std::io::BufReader::new(file))?;
+            decode_thumbnail(&png, fit)
+        }
         FileKind::Image => {
             let file = std::fs::File::open(path).ok()?;
             let mut bytes = Vec::new();
@@ -109,6 +123,8 @@ pub fn file_thumbnail(path: &Path, fit: u32) -> Option<Thumbnail> {
 pub struct Preview {
     pub page: Option<[f32; 4]>,
     pub picture: Option<Thumbnail>,
+    /// A design file or a board (`.fig` and `.sketch` files and images: design).
+    pub kind: figcraft_doc::FileKind,
 }
 
 /// The [`Preview`] of the file at `path`, its picture at most `fit` pixels on its longer side.
@@ -119,7 +135,8 @@ pub fn file_preview(path: &Path, fit: u32) -> Preview {
             let Ok(file) = std::fs::File::open(path) else { return Preview::default() };
             archive_preview(std::io::BufReader::new(file), fit)
         }
-        FileKind::Image => Preview { page: None, picture: file_thumbnail(path, fit) },
+        // A Sketch file's page colour isn't read: the preview is its picture alone, as for an image.
+        FileKind::Sketch | FileKind::Image => Preview { picture: file_thumbnail(path, fit), ..Preview::default() },
         FileKind::Svg | FileKind::Other => Preview::default(),
     }
 }
@@ -129,31 +146,33 @@ pub fn file_preview(path: &Path, fit: u32) -> Preview {
 pub fn archive_preview<R: Read + Seek>(archive: R, fit: u32) -> Preview {
     let Ok(mut z) = zip::ZipArchive::new(archive) else { return Preview::default() };
     let picture = crate::read_member(&mut z, "thumbnail.png", MAX_THUMBNAIL_BYTES).ok().and_then(|png| decode_thumbnail(&png, fit));
-    let page = if z.file_names().any(|n| n == "document.json") {
-        crate::read_member(&mut z, "document.json", MAX_DOCUMENT_BYTES).ok().and_then(|json| figcraft_page(&json))
+    let (page, kind) = if z.file_names().any(|n| n == "document.json") {
+        crate::read_member(&mut z, "document.json", MAX_DOCUMENT_BYTES).ok().map(|json| figcraft_page(&json)).unwrap_or_default()
     } else {
-        crate::read_member(&mut z, "meta.json", MAX_META_BYTES).ok().and_then(|json| fig_page(&json))
+        (crate::read_member(&mut z, "meta.json", MAX_META_BYTES).ok().and_then(|json| fig_page(&json)), figcraft_doc::FileKind::Design)
     };
-    Preview { page, picture }
+    Preview { page, picture, kind }
 }
 
-/// The first page's background in a `.figcraft` `document.json`.
-fn figcraft_page(json: &[u8]) -> Option<[f32; 4]> {
+/// The first page's background in a `.figcraft` `document.json`, and the file's kind.
+fn figcraft_page(json: &[u8]) -> (Option<[f32; 4]>, figcraft_doc::FileKind) {
     #[derive(serde::Deserialize)]
     struct Head {
         #[serde(default)]
         pages: Vec<u64>,
         #[serde(default)]
         nodes: std::collections::BTreeMap<String, Node>,
+        #[serde(default)]
+        kind: figcraft_doc::FileKind,
     }
     #[derive(serde::Deserialize)]
     struct Node {
         #[serde(default)]
         background: Option<serde_json::Value>,
     }
-    let head: Head = serde_json::from_slice(json).ok()?;
-    let first = head.pages.first()?;
-    rgba(head.nodes.get(&first.to_string())?.background.as_ref()?)
+    let Ok(head) = serde_json::from_slice::<Head>(json) else { return (None, figcraft_doc::FileKind::Design) };
+    let page = head.pages.first().and_then(|first| head.nodes.get(&first.to_string())).and_then(|n| n.background.as_ref()).and_then(rgba);
+    (page, head.kind)
 }
 
 /// The canvas colour a `.fig` file's `meta.json` gives (`client_meta.background_color`).
diff --git a/crates/format/src/thumbnail_tests.rs b/crates/format/src/thumbnail_tests.rs
index 864c0f24..1be565ab 100644
--- a/crates/format/src/thumbnail_tests.rs
+++ b/crates/format/src/thumbnail_tests.rs
@@ -117,9 +117,14 @@ fn files_on_disk_by_kind() {
     let folder = d.join("folder.figcraft");
     std::fs::create_dir_all(&folder).unwrap();
     assert_eq!(file_thumbnail(&folder, 640), None);
-    let kinds: Vec<FileKind> =
-        ["a.figcraft", "a.FIG", "a.svg", "a.jpeg", "a.webp", "a.txt", "noext"].iter().map(|p| FileKind::of(std::path::Path::new(p))).collect();
-    assert_eq!(kinds, [FileKind::FigCraft, FileKind::Fig, FileKind::Svg, FileKind::Image, FileKind::Image, FileKind::Other, FileKind::Other]);
+    let kinds: Vec<FileKind> = ["a.figcraft", "a.FIG", "a.Sketch", "a.svg", "a.jpeg", "a.webp", "a.txt", "noext"]
+        .iter()
+        .map(|p| FileKind::of(std::path::Path::new(p)))
+        .collect();
+    assert_eq!(
+        kinds,
+        [FileKind::FigCraft, FileKind::Fig, FileKind::Sketch, FileKind::Svg, FileKind::Image, FileKind::Image, FileKind::Other, FileKind::Other]
+    );
 }
 
 /// A document whose first page is `rgb`.
@@ -148,7 +153,12 @@ fn previews_carry_the_first_pages_colour() {
     assert!(p.picture.is_some());
     // A file with nothing on it: its colour, no picture.
     let bytes = crate::save_bytes(&doc_on([0.9, 0.9, 0.9]), None).unwrap();
-    assert_eq!(archive_preview(Cursor::new(&bytes), 640), Preview { page: Some([0.9, 0.9, 0.9, 1.0]), picture: None });
+    assert_eq!(archive_preview(Cursor::new(&bytes), 640), Preview { page: Some([0.9, 0.9, 0.9, 1.0]), picture: None, kind: Default::default() });
+    // A board says so (the home screen marks it).
+    let mut board = doc_on([0.9, 0.9, 0.9]);
+    board.kind = figcraft_doc::FileKind::Board;
+    let bytes = crate::save_bytes(&board, None).unwrap();
+    assert_eq!(archive_preview(Cursor::new(&bytes), 640).kind, figcraft_doc::FileKind::Board);
     // Damaged or odd metadata: no colour, never a panic.
     for meta in [&b"{"[..], b"{\"client_meta\":{\"background_color\":{\"r\":\"x\",\"g\":0,\"b\":0}}}", b"[]", b"{\"client_meta\":7}"] {
         assert_eq!(archive_preview(Cursor::new(zip(&[("meta.json", meta)])), 640).page, None, "{}", String::from_utf8_lossy(meta));
@@ -176,3 +186,21 @@ fn previews_carry_the_first_pages_colour() {
     let p = file_preview(&image, 640);
     assert!(p.page.is_none() && p.picture.is_some());
 }
+
+#[test]
+fn sketch_files_show_their_preview_png() {
+    use crate::thumbnail::{Preview, file_preview};
+    let d = dir("sketch");
+    let sketch = d.join("screens.sketch");
+    std::fs::write(&sketch, zip(&[("document.json", b"{}"), ("previews/preview.png", &png(8, 4))])).unwrap();
+    assert_eq!(file_thumbnail(&sketch, 640).map(|t| (t.width, t.height)), Some((8, 4)));
+    let p = file_preview(&sketch, 640);
+    assert_eq!((p.page, p.picture.map(|t| (t.width, t.height)), p.kind), (None, Some((8, 4)), figcraft_doc::FileKind::Design));
+    // Only `previews/preview.png` counts; a damaged file has no picture.
+    let other = d.join("other.sketch");
+    std::fs::write(&other, zip(&[("thumbnail.png", &png(8, 4))])).unwrap();
+    assert_eq!(file_thumbnail(&other, 640), None);
+    let junk = d.join("junk.sketch");
+    std::fs::write(&junk, [0xFFu8; 64]).unwrap();
+    assert_eq!(file_preview(&junk, 640), Preview::default());
+}
diff --git a/crates/format/tests/it/distributed_alignment.rs b/crates/format/tests/it/distributed_alignment.rs
new file mode 100644
index 00000000..bcf8a52d
--- /dev/null
+++ b/crates/format/tests/it/distributed_alignment.rs
@@ -0,0 +1,24 @@
+//! FIG export + import keeps all three distributed main-axis alignments distinct.
+
+use figcraft_doc::{AutoLayout, Document, MainAlign, NodeKind};
+use figcraft_format::fig;
+
+#[test]
+fn distributed_alignment_round_trip() {
+    let mut results = Vec::new();
+    for expected in [MainAlign::SpaceBetween, MainAlign::SpaceAround, MainAlign::SpaceEvenly] {
+        let mut doc = Document::new("Alignment");
+        let page = doc.first_page().unwrap();
+        let frame = doc.create(page, NodeKind::Frame, "Frame", 0.0, 0.0, 200.0, 40.0).unwrap();
+        doc.node_mut(frame).unwrap().layout = Some(AutoLayout { main_align: expected, ..Default::default() });
+        let (native, _) = figcraft_format::load_bytes(&figcraft_format::save_bytes(&doc, None).unwrap()).unwrap();
+        assert_eq!(native.node(frame).unwrap().layout.as_ref().unwrap().main_align, expected);
+        let (bytes, export_warnings) = fig::export(&doc, None).unwrap();
+        let (imported, import_warnings) = fig::import(&bytes, "Alignment").unwrap();
+        let actual = imported.nodes().find(|n| n.name == "Frame").unwrap().layout.as_ref().unwrap().main_align;
+        assert!(export_warnings.is_empty());
+        assert!(import_warnings.is_empty());
+        results.push((expected, actual));
+    }
+    assert!(results.iter().all(|(expected, actual)| expected == actual), "{results:?}");
+}
diff --git a/crates/format/tests/import_link_contract.rs b/crates/format/tests/it/import_link_contract.rs
similarity index 100%
rename from crates/format/tests/import_link_contract.rs
rename to crates/format/tests/it/import_link_contract.rs
diff --git a/crates/format/tests/it/main.rs b/crates/format/tests/it/main.rs
new file mode 100644
index 00000000..6286e8db
--- /dev/null
+++ b/crates/format/tests/it/main.rs
@@ -0,0 +1,5 @@
+//! The crate's integration tests, built as one test binary.
+
+mod distributed_alignment;
+mod import_link_contract;
+mod range_hyperlink_round_trip;
diff --git a/crates/format/tests/range_hyperlink_round_trip.rs b/crates/format/tests/it/range_hyperlink_round_trip.rs
similarity index 100%
rename from crates/format/tests/range_hyperlink_round_trip.rs
rename to crates/format/tests/it/range_hyperlink_round_trip.rs
diff --git a/crates/geom/src/lib.rs b/crates/geom/src/lib.rs
index da351e5b..012fca42 100644
--- a/crates/geom/src/lib.rs
+++ b/crates/geom/src/lib.rs
@@ -2,7 +2,7 @@
 //!
 //! Re-exports [`kurbo`] and adds the shape builders a design tool needs: rectangles with independent
 //! corner radii and corner smoothing (the "squircle" continuous-curvature corner), regular polygons
-//! and stars (with rounded vertices), and ellipse arcs / rings. Coordinates are y-down.
+//! and stars (with rounded and smoothed vertices), and ellipse arcs / rings. Coordinates are y-down.
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
 
 pub use kurbo;
@@ -230,6 +230,95 @@ pub fn rounded_polygon(points: &[Point], radius: f64) -> BezPath {
     path
 }
 
+/// [`rounded_polygon`] with corner smoothing (0..=1, as [`rounded_rect`] takes it): each rounded
+/// vertex keeps a circular arc over `1 - smoothing` of its turn and eases into both edges with
+/// curves that start `1 + smoothing` times the plain corner's length from the vertex. As in
+/// [`rounded_rect`], when a smoothed corner doesn't fit in half of its shorter edge, smoothing is
+/// reduced first, then the radius. Without smoothing this is [`rounded_polygon`].
+pub fn smoothed_polygon(points: &[Point], radius: f64, smoothing: f64) -> BezPath {
+    let s = finite(smoothing).clamp(0.0, 1.0);
+    let radius = finite(radius).max(0.0);
+    let n = points.len();
+    if s <= 0.0 || radius <= 0.0 || n < 3 {
+        return rounded_polygon(points, radius);
+    }
+    let mut path = BezPath::new();
+    for i in 0..n {
+        let (Some(prev), Some(cur), Some(next)) = (points.get((i + n - 1) % n), points.get(i), points.get((i + 1) % n)) else {
+            continue;
+        };
+        let (v1, v2) = (*prev - *cur, *next - *cur);
+        let (l1, l2) = (v1.hypot(), v2.hypot());
+        let angle = if l1 < 1e-9 || l2 < 1e-9 { 0.0 } else { (v1 / l1).dot(v2 / l2).clamp(-1.0, 1.0).acos() };
+        if angle < 1e-6 || (PI - angle) < 1e-6 {
+            line_or_move(&mut path, *cur);
+            continue;
+        }
+        let (u1, u2) = (v1 / l1, v2 / l2);
+        // The plain corner's length along each edge, then the fit: smoothing first, then the radius.
+        let max_p = l1.min(l2) / 2.0;
+        let mut r = radius;
+        let mut t = r / (angle / 2.0).tan();
+        let mut sm = s;
+        if (1.0 + sm) * t > max_p {
+            sm = (max_p / t - 1.0).clamp(0.0, sm);
+        }
+        if t > max_p {
+            r *= max_p / t;
+            t = max_p;
+        }
+        let p = ((1.0 + sm) * t).min(max_p);
+        // Each easing curve covers `beta` of the turn and ends on the arc at `back` along the edge
+        // and `side` across it; its last handle points along the arc there.
+        let beta = (PI - angle) * sm / 2.0;
+        let back = t - r * beta.sin();
+        let side = r * (1.0 - beta.cos());
+        let c = r * (beta / 2.0).tan() * beta.cos();
+        let b = ((p - back - c) / 3.0).max(0.0);
+        let a = 2.0 * b;
+        let bisector = (u1 + u2).normalize();
+        let center = *cur + bisector * (r / (angle / 2.0).sin());
+        // A point `along` an edge from the vertex and `across` it toward the arc's center.
+        let at = |u: Vec2, along: f64, across: f64| *cur + u * along + (bisector - u * bisector.dot(u)).normalize() * across;
+        line_or_move(&mut path, at(u1, p, 0.0));
+        let p3 = at(u1, back, side);
+        let p4 = at(u2, back, side);
+        if a + b + c > 1e-9 {
+            path.curve_to(at(u1, p - a, 0.0), at(u1, p - a - b, 0.0), p3);
+        } else {
+            path.line_to(p3);
+        }
+        let a0 = (p3 - center).atan2();
+        let mut sweep = (p4 - center).atan2() - a0;
+        while sweep <= -PI {
+            sweep += TAU;
+        }
+        while sweep > PI {
+            sweep -= TAU;
+        }
+        if sweep.abs() > 1e-9 {
+            kurbo::Arc::new(center, (r, r), a0, sweep, 0.0).to_cubic_beziers(0.01, |p1, p2, q| path.curve_to(p1, p2, q));
+        }
+        let end = at(u2, p, 0.0);
+        if a + b + c > 1e-9 {
+            path.curve_to(at(u2, p - a - b, 0.0), at(u2, p - a, 0.0), end);
+        } else {
+            path.line_to(end);
+        }
+    }
+    path.close_path();
+    path
+}
+
+/// Starts `path` at `p`, or continues it there with a straight segment.
+fn line_or_move(path: &mut BezPath, p: Point) {
+    if path.elements().is_empty() {
+        path.move_to(p);
+    } else {
+        path.line_to(p);
+    }
+}
+
 /// An ellipse in the `width`×`height` box; with arc data, a pie/arc/ring: `start` and `sweep` in
 /// radians (clockwise from 3 o'clock, y-down) and `inner` radius ratio 0..1.
 pub fn ellipse(width: f64, height: f64, start: f64, sweep: f64, inner: f64) -> BezPath {
@@ -284,7 +373,9 @@ impl ReverseSubpaths for BezPath {
                     kurbo::PathSeg::Cubic(c) => out.curve_to(c.p1, c.p2, c.p3),
                 }
             }
-            out.close_path();
+            if matches!(seg_path.elements().last(), Some(kurbo::PathEl::ClosePath)) {
+                out.close_path();
+            }
         }
         out
     }
diff --git a/crates/geom/src/measure.rs b/crates/geom/src/measure.rs
index 7acfe4ed..0c24aa9d 100644
--- a/crates/geom/src/measure.rs
+++ b/crates/geom/src/measure.rs
@@ -91,6 +91,27 @@ pub fn polylines(path: &BezPath) -> Option<Vec<Polyline>> {
     polylines_with_limit(path, MAX_SAMPLES)
 }
 
+fn flatten_curve_segment(el: PathEl, seg_start: Point, limit: usize, count: &mut usize, cur: &mut Polyline) -> bool {
+    let mut over = false;
+    kurbo::flatten([PathEl::MoveTo(seg_start), el], FLATTEN_TOL, |fel| {
+        if over {
+            return;
+        }
+        if let PathEl::LineTo(p) = fel {
+            *count += 1;
+            if *count > limit {
+                over = true;
+                return;
+            }
+            if cur.points.is_empty() {
+                cur.push(seg_start);
+            }
+            cur.push(p);
+        }
+    });
+    !over
+}
+
 /// [`polylines`] with an explicit sample budget, so tests can use a small one.
 ///
 /// The budget is enforced *while* flattening, not after it (issue #204): the input element
@@ -141,25 +162,7 @@ fn polylines_with_limit(path: &BezPath, limit: usize) -> Option<Vec<Polyline>> {
             PathEl::QuadTo(_, end) | PathEl::CurveTo(_, _, end) => {
                 // Flatten this one segment on its own, so an over-budget curve aborts
                 // here instead of after the whole path has been flattened.
-                let seg_start = pen;
-                let mut over = false;
-                kurbo::flatten([PathEl::MoveTo(seg_start), *el], FLATTEN_TOL, |fel| {
-                    if over {
-                        return;
-                    }
-                    if let PathEl::LineTo(p) = fel {
-                        count += 1;
-                        if count > limit {
-                            over = true;
-                            return;
-                        }
-                        if cur.points.is_empty() {
-                            cur.push(seg_start);
-                        }
-                        cur.push(p);
-                    }
-                });
-                if over {
+                if !flatten_curve_segment(*el, pen, limit, &mut count, &mut cur) {
                     return None;
                 }
                 pen = end;
diff --git a/crates/geom/src/tests.rs b/crates/geom/src/tests.rs
index b99d7d8c..37e6ccab 100644
--- a/crates/geom/src/tests.rs
+++ b/crates/geom/src/tests.rs
@@ -47,6 +47,10 @@ fn degenerate_inputs_dont_panic() {
     let _ = star_points(10.0, 10.0, 1, -3.0);
     let _ = rounded_polygon(&[], 4.0);
     let _ = rounded_polygon(&[Point::ZERO, Point::ZERO, Point::ZERO], 4.0);
+    let _ = smoothed_polygon(&[Point::ZERO, Point::ZERO, Point::ZERO], 4.0, 0.6);
+    let _ = smoothed_polygon(&[Point::ZERO, Point::new(10.0, 0.0), Point::new(20.0, 0.0)], 4.0, 1.0);
+    let _ = smoothed_polygon(&polygon_points(10.0, 10.0, 5), f64::INFINITY, f64::NAN);
+    let _ = smoothed_polygon(&polygon_points(10.0, 10.0, 5), 3.0, f64::INFINITY);
     let _ = ellipse(f64::NAN, 10.0, f64::NAN, 100.0, 2.0);
 }
 
@@ -70,6 +74,56 @@ fn rounded_polygon_shrinks_area() {
     assert!(round < sharp && round > sharp * 0.8);
 }
 
+#[test]
+fn smoothed_polygon_matches_the_rectangle_corner() {
+    // A four-sided polygon is a square turned 45°: smoothed, it has the rounded rectangle's area.
+    let side = 50.0 * std::f64::consts::SQRT_2;
+    let pts = polygon_points(100.0, 100.0, 4);
+    for (r, s) in [(10.0, 0.0), (10.0, 0.6), (12.0, 1.0), (30.0, 0.6), (1000.0, 0.6)] {
+        let poly = area(&smoothed_polygon(&pts, r, s));
+        let rect = area(&rounded_rect(side, side, [r; 4], s));
+        assert!((poly - rect).abs() < 0.05, "r={r} s={s}: {poly} vs {rect}");
+    }
+}
+
+#[test]
+fn smoothed_polygon_smooths_every_corner() {
+    use kurbo::{ParamCurve, ParamCurveArclen, ParamCurveNearest};
+    let near = |p: &BezPath, at: Point| p.segments().map(|seg| seg.nearest(at, 1e-9).distance_sq).fold(f64::INFINITY, f64::min);
+    // (points, convex: smoothing only cuts area away)
+    let shapes = [(polygon_points(100.0, 100.0, 3), true), (polygon_points(120.0, 80.0, 6), true), (star_points(100.0, 100.0, 5, 0.38), false)];
+    for (pts, convex) in shapes {
+        let plain = smoothed_polygon(&pts, 8.0, 0.0);
+        assert_eq!(plain, rounded_polygon(&pts, 8.0), "no smoothing draws the plain rounded corners");
+        let sharp = area(&rounded_polygon(&pts, 0.0));
+        let mut last = area(&plain);
+        for s in [0.3, 0.6, 1.0] {
+            let p = smoothed_polygon(&pts, 8.0, s);
+            let a = area(&p);
+            assert!(if convex { a < last } else { (a - last).abs() > 1e-3 }, "s={s}: more smoothing changes the area ({a} after {last})");
+            assert!((a - sharp).abs() < sharp * 0.2, "s={s}: the shape stays close to its points");
+            last = a;
+            // The outline has no kinks: each piece leaves in the direction the one before arrives.
+            let segs: Vec<kurbo::PathSeg> = p.segments().filter(|seg| seg.arclen(1e-6) > 1e-6).collect();
+            for (i, seg) in segs.iter().enumerate() {
+                let next = segs[(i + 1) % segs.len()];
+                let out = (seg.eval(1.0) - seg.eval(1.0 - 1e-6)).normalize();
+                let into = (next.eval(1e-6) - next.eval(0.0)).normalize();
+                assert!(out.dot(into) > 0.999, "s={s}: piece {i} joins the next smoothly ({out:?} then {into:?})");
+            }
+            let b = p.bounding_box();
+            assert!(b.x0 >= -1e-6 && b.y0 >= -1e-6 && b.x1 <= 120.0 + 1e-6 && b.y1 <= 100.0 + 1e-6, "s={s} {b:?}");
+            // Every vertex is cut off, and the middle of every edge is still on the outline.
+            for (i, v) in pts.iter().enumerate() {
+                let next = pts[(i + 1) % pts.len()];
+                let mid = v.midpoint(next);
+                assert!(near(&p, mid) < 1e-6, "s={s}: edge {i} keeps its middle");
+                assert!(near(&p, *v) > 0.25, "s={s}: vertex {i} is rounded");
+            }
+        }
+    }
+}
+
 #[test]
 fn ellipse_ring_area() {
     let full = area(&ellipse(100.0, 100.0, 0.0, TAU, 0.0));
@@ -108,3 +162,18 @@ fn set_rotation_keeps_center() {
         }
     }
 }
+
+#[test]
+fn reverse_subpaths_preserves_open_and_closed() {
+    let mut open = BezPath::new();
+    open.move_to((0.0, 0.0));
+    open.line_to((10.0, 0.0));
+    open.line_to((10.0, 10.0));
+    let r = <BezPath as ReverseSubpaths>::reverse_subpaths(&open);
+    assert!(!r.elements().iter().any(|e| matches!(e, kurbo::PathEl::ClosePath)), "{:?}", r.elements());
+
+    let mut closed = open.clone();
+    closed.close_path();
+    let r = <BezPath as ReverseSubpaths>::reverse_subpaths(&closed);
+    assert!(matches!(r.elements().last(), Some(kurbo::PathEl::ClosePath)), "{:?}", r.elements());
+}
diff --git a/crates/mcp/src/backend.rs b/crates/mcp/src/backend.rs
index 1d42bdb4..f2021cc6 100644
--- a/crates/mcp/src/backend.rs
+++ b/crates/mcp/src/backend.rs
@@ -22,10 +22,9 @@ pub trait Backend {
     fn describe(&self) -> String;
 
     /// PNG bytes of the document: `ids` (in page coordinates, their union) or, when empty, the
-    /// current page's content. The default goes through `ui.render` and a temporary file.
+    /// current page's content. The default goes through `ui.render`, the PNG coming back as data.
     fn render_png(&mut self, ids: &[u64], scale: f64) -> Result<Vec<u8>, String> {
-        let path = temp_png("render");
-        let mut params = json!({"path": path, "scale": scale});
+        let mut params = json!({"scale": scale});
         if !ids.is_empty() {
             params["ids"] = json!(ids);
         } else {
@@ -36,8 +35,7 @@ pub trait Backend {
             }
             params["ids"] = json!(kids);
         }
-        self.call("ui.render", params)?;
-        read_and_remove(&path)
+        decode_data(&self.call("ui.render", params)?)
     }
 
     /// PNG bytes of what the user sees: the app window when attached, the current viewport when
@@ -52,11 +50,10 @@ pub trait Backend {
     }
 }
 
-fn capture<B: Backend + ?Sized>(b: &mut B, mut params: Value) -> Result<Vec<u8>, String> {
-    let path = temp_png("screenshot");
-    params["path"] = json!(path);
-    b.call("ui.screenshot", params)?;
-    read_and_remove(&path)
+/// A window capture, the PNG coming back as data (no file: an app confined to automation roots
+/// writes none outside them).
+fn capture<B: Backend + ?Sized>(b: &mut B, params: Value) -> Result<Vec<u8>, String> {
+    decode_data(&b.call("ui.screenshot", params)?)
 }
 
 /// The ids of the current page's top-level layers.
@@ -72,17 +69,6 @@ pub fn page_children<B: Backend + ?Sized>(b: &mut B) -> Result<Vec<u64>, String>
         .unwrap_or_default())
 }
 
-fn temp_png(what: &str) -> String {
-    let n = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).map(|d| d.as_nanos()).unwrap_or(0);
-    std::env::temp_dir().join(format!("figcraft-mcp-{what}-{}-{n}.png", std::process::id())).to_string_lossy().into_owned()
-}
-
-fn read_and_remove(path: &str) -> Result<Vec<u8>, String> {
-    let bytes = std::fs::read(path).map_err(|e| format!("{path}: {e}"))?;
-    let _ = std::fs::remove_file(path);
-    Ok(bytes)
-}
-
 /// Decode a `data` field (base64, optionally a data: URL) from an export result.
 pub fn decode_data(v: &Value) -> Result<Vec<u8>, String> {
     let d = v.get("data").and_then(Value::as_str).ok_or("the export returned no data")?;
diff --git a/crates/mcp/src/headless.rs b/crates/mcp/src/headless.rs
index 802a865d..fcdb21a3 100644
--- a/crates/mcp/src/headless.rs
+++ b/crates/mcp/src/headless.rs
@@ -160,7 +160,7 @@ impl Headless {
                     self.execute("text.edit.begin", &json!({"id": self.single_text()}))?;
                 }
                 "select.children" if self.session.tool.pen.is_some() => {
-                    let _ = self.session.pen_finish();
+                    let _ = self.session.pen_end();
                 }
                 // Enter on shapes edits them as vectors (several at once).
                 "select.children" if self.vector_targets().is_some() => {
@@ -215,7 +215,7 @@ impl Headless {
         let (w, h) = crate::png_size(&bytes).unwrap_or((0, 0));
         match p.get("path").and_then(Value::as_str) {
             Some(path) => {
-                std::fs::write(path, &bytes).map_err(|e| format!("{path}: {e}"))?;
+                figcraft_engine::file_access::write(path, &bytes).map_err(|e| e.to_string())?;
                 Ok(json!({"path": path, "width": w, "height": h, "bytes": bytes.len()}))
             }
             None => Ok(json!({"format": "png", "width": w, "height": h, "data": base64::engine::general_purpose::STANDARD.encode(&bytes)})),
@@ -278,7 +278,7 @@ impl Backend for Headless {
                 let (w, h) = crate::png_size(&bytes).unwrap_or((0, 0));
                 match p.get("path").and_then(Value::as_str) {
                     Some(path) => {
-                        std::fs::write(path, &bytes).map_err(|e| format!("{path}: {e}"))?;
+                        figcraft_engine::file_access::write(path, &bytes).map_err(|e| e.to_string())?;
                         Ok(json!({"path": path, "width": w, "height": h}))
                     }
                     None => Ok(json!({"format": "png", "width": w, "height": h, "data": base64::engine::general_purpose::STANDARD.encode(&bytes)})),
diff --git a/crates/mcp/src/server.rs b/crates/mcp/src/server.rs
index 365c8579..9b8bf7be 100644
--- a/crates/mcp/src/server.rs
+++ b/crates/mcp/src/server.rs
@@ -1,6 +1,9 @@
 //! JSON-RPC 2.0 framing and the MCP lifecycle / tools / resources / prompts methods.
 
 use std::io::{BufRead, Read, Write};
+use std::sync::Arc;
+
+use figcraft_engine::file_access::{Roots, confined};
 
 use serde_json::{Value, json};
 
@@ -42,6 +45,9 @@ Resources: figcraft://document, figcraft://node/{id}, figcraft://command/{id}. p
 pub struct Server {
     backend: Box<dyn Backend>,
     initialized: bool,
+    /// The automation roots every request's file access is confined to (`--automation-read-root`,
+    /// `--automation-write-root`), if any.
+    roots: Option<Arc<Roots>>,
 }
 
 fn response(id: Value, result: Value) -> Value {
@@ -53,12 +59,19 @@ fn error(id: Value, code: i64, message: impl Into<String>) -> Value {
 }
 
 fn panic_message(payload: &(dyn std::any::Any + Send)) -> String {
-    payload.downcast_ref::<&str>().map(|s| s.to_string()).or_else(|| payload.downcast_ref::<String>().cloned()).unwrap_or_else(|| "panic".into())
+    payload.downcast_ref::<&str>().map(ToString::to_string).or_else(|| payload.downcast_ref::<String>().cloned()).unwrap_or_else(|| "panic".into())
 }
 
 impl Server {
     pub fn new(backend: Box<dyn Backend>) -> Self {
-        Self { backend, initialized: false }
+        Self { backend, initialized: false, roots: None }
+    }
+
+    /// Confine the files every request reads and writes to `roots` (see
+    /// [`figcraft_engine::file_access`]).
+    pub fn with_roots(mut self, roots: Option<Roots>) -> Self {
+        self.roots = roots.map(Arc::new);
+        self
     }
 
     /// A server over a fresh headless session.
@@ -150,15 +163,23 @@ impl Server {
             return Some(error(id, INVALID_PARAMS, "`params` must be an object"));
         }
         // A bug that panics fails this request only; the server keeps serving.
-        let r = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| self.request(method, &params))).unwrap_or_else(|p| {
-            Err((INTERNAL_ERROR, format!("internal error in `{method}`: {} (please report this bug)", panic_message(p.as_ref()))))
-        });
+        let roots = self.roots.clone();
+        let r = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| confined(roots.as_ref(), || self.request(method, &params)))).unwrap_or_else(
+            |p| Err((INTERNAL_ERROR, format!("internal error in `{method}`: {} (please report this bug)", panic_message(p.as_ref())))),
+        );
         Some(match r {
             Ok(r) => response(id, r),
             Err((code, m)) => error(id, code, m),
         })
     }
 
+    /// What `initialize` says about the automation roots.
+    fn roots_note(&self) -> String {
+        let Some(r) = &self.roots else { return String::new() };
+        let j = r.to_json();
+        format!(" Files: only these folders may be read: {}; written: {} (any other path is refused).", j["read"], j["write"])
+    }
+
     fn notification(&mut self, method: &str) {
         match method {
             "notifications/initialized" => self.initialized = true,
@@ -180,7 +201,7 @@ impl Server {
                         "prompts": {"listChanged": false},
                     },
                     "serverInfo": {"name": "figcraft", "title": "FigCraft", "version": env!("CARGO_PKG_VERSION")},
-                    "instructions": format!("{INSTRUCTIONS} Backend: {}.", self.backend.describe()),
+                    "instructions": format!("{INSTRUCTIONS} Backend: {}.{}", self.backend.describe(), self.roots_note()),
                 }))
             }
             "ping" => Ok(json!({})),
diff --git a/crates/mcp/src/tools.rs b/crates/mcp/src/tools.rs
index 49fd272f..1b23191e 100644
--- a/crates/mcp/src/tools.rs
+++ b/crates/mcp/src/tools.rs
@@ -128,10 +128,10 @@ pub fn tool_definitions() -> Vec<Value> {
         tool(
             "batch",
             "Run commands as one step",
-            "Run several commands in order as ONE undo step (engine `command.batch`). If any command fails, everything is rolled back and the error names the failing step. Returns an array of the results in order. A later step can use a layer an earlier step created: anywhere in its params, {\"$step\": n} stands for the `id` in step n's result (zero-based; {\"$step\": n, \"field\": \"…\"} picks another field). Example: [{\"command\":\"node.create\",\"params\":{\"type\":\"frame\"}}, {\"command\":\"node.create\",\"params\":{\"type\":\"text\",\"text\":\"Hi\",\"parent\":{\"$step\":0}}}] builds a frame and a text inside it in one call.",
+            "Run several commands in order as ONE undo step (engine `command.batch`). If any command fails, everything is rolled back and the error names the failing step. Returns an array of the results in order. A later step can use what an earlier step returned: name a step with \"as\": \"card\", then anywhere in a later step's params {\"$ref\": \"card\"} stands for the `id` in its result ({\"$step\": n} does the same by zero-based position). Add \"field\" for another part of the result: a key or a slash path, e.g. {\"$ref\": \"copy\", \"field\": \"ids/0\"} for the first id edit.duplicate returned. Any object with a `$ref` or `$step` key is a reference. Example: [{\"command\":\"node.create\",\"as\":\"card\",\"params\":{\"type\":\"frame\"}}, {\"command\":\"node.create\",\"params\":{\"type\":\"text\",\"text\":\"Hi\",\"parent\":{\"$ref\":\"card\"}}}] builds a frame and a text inside it in one call.",
             obj(
                 json!({
-                    "commands": {"type": "array", "minItems": 1, "description": "Steps to run", "items": obj(json!({"command": string("Command id"), "params": {"type": "object"}}), &["command"])},
+                    "commands": {"type": "array", "minItems": 1, "description": "Steps to run", "items": obj(json!({"command": string("Command id"), "params": {"type": "object"}, "as": string("Name for this step, unique in the batch; later steps use its result with {\"$ref\": name}")}), &["command"])},
                     "label": string("Undo history label (default \"Batch\")"),
                 }),
                 &["commands"],
@@ -147,7 +147,7 @@ pub fn tool_definitions() -> Vec<Value> {
                     "type": {"type": "string", "enum": ["frame", "rectangle", "ellipse", "polygon", "star", "line", "arrow", "text", "vector", "section", "component", "slice"], "description": "Layer type"},
                     "x": num("Left, relative to the parent frame (default 0)"),
                     "y": num("Top, relative to the parent frame (default 0)"),
-                    "width": num("Width (default 100; text hugs its content unless width is set, which makes it wrap)"),
+                    "width": num("Width (default 100; text hugs its content unless width is set, which makes it wrap; for a vector with path, width/height scale the path, one alone keeping its proportion, and without them the path's own box is used)"),
                     "height": num("Height (default 100; ignored for lines/arrows and auto-height text)"),
                     "parent": id_schema("Parent frame/group/component id (default: the current page)"),
                     "index": int("Z-index among the parent's children (default: on top)"),
@@ -163,7 +163,7 @@ pub fn tool_definitions() -> Vec<Value> {
         tool(
             "set_properties",
             "Set properties",
-            "Set properties on one or more layers as one undo step (engine `node.set`). Keys: name, visible, locked, opacity (0-1), blend, x, y (relative to the parent frame; groups don't count), width, height, rotation (degrees), fill (colour) / fills (array of paints: \"#hex\" or {\"type\":\"solid\",\"color\":\"#hex\"} or {\"type\":\"linearGradient\",\"stops\":[\"#hex\",\"#hex\"]} or stops [{\"position\":0..1,\"color\":\"#hex\"}], optional from/to handles in the unit box; radialGradient too), stroke / strokes, strokeWeight, strokeAlign (inside|center|outside), cornerRadius (n or [tl,tr,br,bl]), effects (array, e.g. {\"type\":\"dropShadow\",\"color\":\"#00000040\",\"offset\":[0,4],\"radius\":8}), clip, layout (null|horizontal|vertical|grid), gap, padding (n or [t,r,b,l]), mainAlign (min|center|max|spaceBetween|spaceAround|spaceEvenly), crossAlign, wrap, contentAlign (auto|spaceBetween: wrapped lines), sizingH / sizingV (fixed|hug|fill), constraints {horizontal, vertical}, characters, fontFamily, fontStyle, fontSize, lineHeight, letterSpacing, textAlign, textAutoResize. Run list_commands with filter \"node.set\" for the full list. Unknown keys are an error. Returns the updated layers.",
+            "Set properties on one or more layers as one undo step (engine `node.set`). Keys: name, visible, locked, opacity (0-1), blend, x, y (relative to the parent frame; groups don't count), width, height, rotation (degrees), fill (colour) / fills (array of paints: \"#hex\" or {\"type\":\"solid\",\"color\":\"#hex\"} or {\"type\":\"linearGradient\",\"stops\":[\"#hex\",\"#hex\"]} or stops [{\"position\":0..1,\"color\":\"#hex\"}], optional from/to handles in the unit box; radialGradient too), stroke / strokes, strokeWeight, strokeAlign (inside|center|outside), cornerRadius (n or [tl,tr,br,bl]), effects (array, e.g. {\"type\":\"dropShadow\",\"color\":\"#00000040\",\"offset\":[0,4],\"radius\":8}), clip, layout (null|horizontal|vertical|grid), gap, padding (n or [t,r,b,l]), mainAlign (min|center|max|spaceBetween|spaceAround|spaceEvenly), crossAlign, wrap, contentAlign (auto|spaceBetween: wrapped lines), sizingH / sizingV (fixed|hug|fill), constraints {horizontal, vertical}, characters, fontFamily, fontStyle, fontSize, lineHeight, letterSpacing, textAlign, textAutoResize. Auto layout keys (gap, padding, mainAlign, crossAlign, wrap, …) apply to frames, components and instances only: other layers among the ids are skipped and named in `warnings`, and with none that can take them the call is an error. A fontStyle draws in the family's nearest face; `warnings` says when that face has another weight or slant than the name asks for. Run list_commands with filter \"node.set\" for the full list. Unknown keys are an error. Returns the updated layers.",
             obj(
                 json!({"ids": ids_schema("Layer ids (default: the selection)"), "props": {"type": "object", "description": "Property values to set"}}),
                 &["props"],
@@ -173,9 +173,15 @@ pub fn tool_definitions() -> Vec<Value> {
         tool(
             "inspect_document",
             "Inspect document",
-            "The active document as JSON: name, path, dirty flag, current page, selection, the current page's layer tree (id, name, type, x/y relative to the parent frame (groups don't count), width, height, absoluteBounds in page coordinates, fills, strokes, effects, cornerRadius, layout, sizing, text properties, component links, overrides, bound variables), other pages summarised, styles, variable count and the undo history. Use it to verify every change.",
+            "The active document as JSON: name, path, dirty flag, current page, selection, the current page's layer tree (id, name, type, x/y relative to the parent frame (groups don't count), width, height, absoluteBounds in page coordinates, fills, strokes, effects, cornerRadius, layout, sizing, text properties, component links, overrides, bound variables), other pages summarised, styles, variable count and the undo history. Use it to verify every change. Each level of `depth` multiplies the response, and `allPages` multiplies it again: on a large document the tree is reported at a shallower depth than asked for, with a `truncated` object saying so. Use get_node to read one subtree deeply instead.",
             obj(
-                json!({"depth": int("Tree depth for the current page (default 4)"), "allPages": boolean("Expand every page, not only the current one")}),
+                json!({
+                    "depth": int("Tree depth for the current page (default 4)"),
+                    "allPages": boolean("Expand every page, not only the current one"),
+                    "maxBytes": int(
+                        "Largest response to send, in bytes of the whole JSON-RPC message (default 8388608, which fits the usual 10 MiB client buffer); 1024 of it is kept for the envelope and the request id"
+                    ),
+                }),
                 &[],
             ),
             true,
@@ -183,8 +189,18 @@ pub fn tool_definitions() -> Vec<Value> {
         tool(
             "get_node",
             "Get layer",
-            "One layer as JSON (same fields as inspect_document) with its children to `depth`.",
-            obj(json!({"id": id_schema("Layer id"), "depth": int("Child depth (default 1)")}), &["id"]),
+            "One layer as JSON (same fields as inspect_document) with its children to `depth`. A subtree too large for one message is reported at a shallower depth, or with a window of the children, and a `truncated` object says so and gives the `offset` to ask for next.",
+            obj(
+                json!({
+                    "id": id_schema("Layer id"),
+                    "depth": int("Child depth (default 1)"),
+                    "offset": int("First child to report (default 0), for reading a node with more children than fit in one message"),
+                    "maxBytes": int(
+                        "Largest response to send, in bytes of the whole JSON-RPC message (default 8388608, which fits the usual 10 MiB client buffer); 1024 of it is kept for the envelope and the request id"
+                    ),
+                }),
+                &["id"],
+            ),
             true,
         ),
         tool(
@@ -197,11 +213,11 @@ pub fn tool_definitions() -> Vec<Value> {
         tool(
             "export",
             "Export",
-            "Export layers (default: the selection, else every top-level layer of the current page) as png, jpg, svg, webp or pdf at `scale`, or the whole file as `fig` (experimental: written from public format knowledge, with `warnings` for what was left out; other apps may not open every file) (PDF: with `bleed`, `cropMarks`, `bleedMarks` and `cmyk` for print; options `contentsOnly`, `includeBoundingBox`, and for SVG `svgOutlineText`, `svgIdAttribute`, `svgSimplifyStroke`). With `path` the file is written there (absolute path recommended) and the result says where. Without `path`: png/jpg/webp come back as an image content block, svg as text, other formats as base64 `data`.",
+            "Export layers (default: the selection, else every top-level layer of the current page) as png, jpg, svg, webp, pdf or xml (an Android Vector Drawable, with `warnings` for what it changed or left out, per `vdCompat`) at `scale`, or the whole file as `fig` (experimental: written from public format knowledge, with `warnings` for what was left out; other apps may not open every file) (PDF: with `bleed`, `cropMarks`, `bleedMarks` and `cmyk` for print; options `contentsOnly`, `includeBoundingBox`, and for SVG `svgOutlineText`, `svgIdAttribute`, `svgSimplifyStroke`; for XML `svgIdAttribute` and `vdCompat`). With `path` the file is written there (absolute path recommended) and the result says where. Without `path`: png/jpg/webp come back as an image content block, svg as text, xml as text followed by `{format, warnings}`, other formats as base64 `data`.",
             obj(
                 json!({
                     "ids": ids_schema("Layers to export (several are composited into one image)"),
-                    "format": {"type": "string", "enum": ["png", "jpg", "svg", "webp", "pdf", "fig"], "description": "Format (default png, or from the path's extension)"},
+                    "format": {"type": "string", "enum": ["png", "jpg", "svg", "webp", "pdf", "xml", "fig"], "description": "Format (default png, or from the path's extension)"},
                     "scale": num("Pixel scale for raster formats (default 1, max 64)"),
                     "size": string("Instead of `scale`: `2x`, or a width or height in pixels like `512w` / `512h`"),
                     "path": string("Output file path"),
@@ -214,6 +230,7 @@ pub fn tool_definitions() -> Vec<Value> {
                     "svgOutlineText": boolean("SVG: text as outlines (default true); false keeps `<text>` elements"),
                     "svgIdAttribute": boolean("SVG: layer names as unique `id` attributes (default false)"),
                     "svgSimplifyStroke": boolean("SVG: strokes as `stroke` attributes where exact (default true); false writes outlines"),
+                    "vdCompat": {"type": "string", "enum": ["bestEffort", "exact", "ignore"], "description": "XML: what a Vector Drawable can't draw exactly is approximated with a warning (bestEffort, default), left out with a warning (exact), or written as far as it maps without warnings (ignore: overlapping layer opacity dropped, even-odd fills kept as fillType=evenOdd, diamond gradients left out)"},
                 }),
                 &[],
             ),
@@ -237,7 +254,7 @@ pub fn tool_definitions() -> Vec<Value> {
         tool(
             "open_file",
             "Open file",
-            "Open a .figcraft or .json document (FigCraft or REST API file JSON), a .fig file (best effort, with `warnings` for what wasn't imported), an .svg (becomes vectors) or an image (becomes an image layer) as the active document. Returns the new document's summary.",
+            "Open a .figcraft or .json document (FigCraft or REST API file JSON), a .fig or .sketch file (best effort, with `warnings` for what wasn't imported; .sketch from Sketch 48 or newer), an .svg (becomes vectors) or an image (becomes an image layer) as the active document. Returns the new document's summary.",
             obj(
                 json!({
                     "path": string("File path"),
@@ -250,8 +267,8 @@ pub fn tool_definitions() -> Vec<Value> {
         tool(
             "save_file",
             "Save file",
-            "Save the active document as a .figcraft file. `path` is required the first time (an untitled document has no path); later saves reuse it.",
-            obj(json!({"path": string("Output .figcraft path")}), &[]),
+            "Save the active document as a .figcraft file. `path` is required the first time (an untitled document has no path); later saves reuse it. A `path` ending in .fig writes an experimental .fig export copy instead and leaves the document's own path and unsaved changes alone.",
+            obj(json!({"path": string("Output .figcraft path, or a .fig path for an experimental export copy")}), &[]),
             false,
         ),
         tool("undo", "Undo", "Undo the last change (one command, batch or gesture). Returns {undone: bool}.", empty(), false),
@@ -497,7 +514,11 @@ fn batch(b: &mut dyn Backend, a: &Map<String, Value>) -> Result<ToolResult, Stri
         };
         let mut params = params;
         friendly_params(&mut params);
-        steps.push(json!({"command": cmd, "params": params}));
+        let mut step = json!({"command": cmd, "params": params});
+        if let (Some(name), Some(o)) = (c.get("as"), step.as_object_mut()) {
+            o.insert("as".into(), name.clone());
+        }
+        steps.push(step);
     }
     let label = s_arg(a, "label")?.unwrap_or("Batch");
     exec(b, "command.batch", json!({"label": label, "commands": steps})).map(|v| ToolResult::json(&v))
@@ -544,7 +565,7 @@ fn set_properties(b: &mut dyn Backend, a: &Map<String, Value>) -> Result<ToolRes
         }
         params["ids"] = json!(ids);
     }
-    exec(b, "node.set", params)?;
+    let warnings = exec(b, "node.set", params)?.get("warnings").cloned();
     let ids = match ids {
         Some(i) => i,
         None => b
@@ -555,7 +576,66 @@ fn set_properties(b: &mut dyn Backend, a: &Map<String, Value>) -> Result<ToolRes
             .unwrap_or_default(),
     };
     let nodes: Vec<Value> = ids.iter().take(20).filter_map(|i| b.call("node.get", json!({"id": i, "depth": 0})).ok()).collect();
-    Ok(ToolResult::json(&json!({"ok": true, "nodes": nodes})))
+    let mut out = json!({"ok": true, "nodes": nodes});
+    if let Some(w) = warnings {
+        out["warnings"] = w;
+    }
+    Ok(ToolResult::json(&out))
+}
+
+/// What one tool result may take on the wire. MCP stdio is newline-delimited JSON, so a result is
+/// a single message and has to fit the client's read buffer whole -- there is no streaming of part
+/// of one. The TypeScript SDK's stdio transport defaults to 10 MiB
+/// (`STDIO_DEFAULT_MAX_BUFFER_SIZE`) and hosts rarely raise it; a document whose tree went past
+/// that killed the server, because the client stopped reading, the pipe broke, and every later
+/// call failed (#912). The 2 MiB left over covers the JSON-RPC envelope.
+const MAX_RESPONSE: usize = 8 << 20;
+
+/// Room kept for the `truncated` object, which is added after the size is measured and would
+/// otherwise be able to push a response that only just fitted back over the limit.
+const MARKER_RESERVE: usize = 1 << 10;
+
+/// Room kept for everything the text block is wrapped in: the content object and `isError`, the
+/// JSON-RPC envelope (`jsonrpc`, `id`, `result`) and the newline the transport writes after it.
+/// About ninety bytes of that is fixed and the rest is the request id, so `maxBytes` holds for
+/// any id up to roughly 900 bytes -- which is every id in practice, a number or a UUID. An id
+/// larger than that is the one case where the message can pass the caller's figure, and sizing
+/// the real envelope here would mean handing the transport's request id to every tool.
+const ENVELOPE_RESERVE: usize = 1 << 10;
+
+/// What the caller says it can read, as the bytes its *tree* may take: the figure is for the whole
+/// message, so the envelope's share comes off it here.
+fn budget(a: &Map<String, Value>) -> Result<(usize, usize), String> {
+    // A caller that knows its own buffer can say so; 1 KiB is below the shallowest tree, so the
+    // floor only keeps the arithmetic sane.
+    let max_bytes = match n_arg(a, "maxBytes")? {
+        Some(v) if v < 1024.0 => return Err("`maxBytes` must be at least 1024".into()),
+        Some(v) => v.min(usize::MAX as f64) as usize,
+        None => MAX_RESPONSE,
+    };
+    Ok((max_bytes, max_bytes.saturating_sub(ENVELOPE_RESERVE)))
+}
+
+/// What a value's text block would take on the wire. It is sent as a text block, so it is measured
+/// pretty-printed *and* escaped -- escaping adds about a tenth.
+fn wire_size(value: &Value) -> usize {
+    let text = serde_json::to_string_pretty(value).unwrap_or_default();
+    serde_json::to_string(&text).map_or(text.len(), |s| s.len())
+}
+
+/// The document at `depth`, and what its text block would take on the wire. The tree is sent as a
+/// text block, so it is measured pretty-printed *and* escaped -- escaping adds about a tenth.
+fn inspect_at(b: &mut dyn Backend, depth: u64, all: bool) -> Result<(Value, usize), String> {
+    let value = b.call("document.inspect", json!({"depth": depth, "allPages": all}))?;
+    let wire = wire_size(&value);
+    Ok((value, wire))
+}
+
+/// One layer's subtree at `depth`, and what its text block would take on the wire.
+fn node_at(b: &mut dyn Backend, id: u64, depth: u64) -> Result<(Value, usize), String> {
+    let value = b.call("node.get", json!({"id": id, "depth": depth}))?;
+    let wire = wire_size(&value);
+    Ok((value, wire))
 }
 
 fn inspect_document(b: &mut dyn Backend, a: &Map<String, Value>) -> Result<ToolResult, String> {
@@ -565,17 +645,221 @@ fn inspect_document(b: &mut dyn Backend, a: &Map<String, Value>) -> Result<ToolR
         Some(Value::Bool(x)) => *x,
         Some(_) => return Err("`allPages` must be a boolean".into()),
     };
-    b.call("document.inspect", json!({"depth": depth, "allPages": all})).map(|v| ToolResult::json(&v))
+    let (max_bytes, budget) = budget(a)?;
+
+    let (value, wire) = inspect_at(b, depth, all)?;
+    if wire <= budget {
+        return Ok(ToolResult::json(&value));
+    }
+
+    let (used, mut value, used_wire) = if depth == 0 {
+        // Depth 0 is the shallowest tree there is, so there is nothing smaller to send: it goes
+        // out over the limit with the marker saying so, the same as a bisection that reaches
+        // depth 0. An error would leave the caller with nothing at all.
+        (0, value, wire)
+    } else {
+        // The deepest tree that fits, by bisection: a deeper tree holds every node of a shallower
+        // one, so the size does not fall as the depth grows. Bisecting keeps this to about six
+        // more walks of the document rather than one per level.
+        let (mut lo, mut hi) = (0u64, depth - 1);
+        let mut best: Option<(u64, Value, usize)> = None;
+        while lo <= hi {
+            let mid = lo + (hi - lo) / 2;
+            let (v, w) = inspect_at(b, mid, all)?;
+            if w + MARKER_RESERVE <= budget {
+                best = Some((mid, v, w));
+                if mid == hi {
+                    break;
+                }
+                lo = mid + 1;
+            } else if mid == 0 {
+                best = Some((0, v, w));
+                break;
+            } else {
+                hi = mid - 1;
+            }
+        }
+        match best {
+            Some(found) => found,
+            None => return Ok(ToolResult::json(&value)),
+        }
+    };
+    if let Some(obj) = value.as_object_mut() {
+        obj.insert(
+            "truncated".into(),
+            json!({
+                "requestedDepth": depth,
+                "depth": used,
+                "requestedDepthBytes": wire,
+                "bytes": used_wire,
+                "maxBytes": max_bytes,
+                "reason": format!(
+                    "the tree at depth {depth} would be {wire} bytes on the wire, over the {max_bytes}-byte limit a client can read in one message; it is reported at depth {used} instead"
+                ),
+                "hint": "get_node({id, depth}) walks one subtree at a time, within the same limit: a node with more children than fit answers with a window of them and the offset to ask for next",
+            }),
+        );
+    }
+    Ok(ToolResult::json(&value))
 }
 
+/// One layer's subtree, kept inside what the caller can read.
+///
+/// `inspect_document` sends a shallower tree when the document's is too large and points here for
+/// the rest, so this tool is the way out of that limit and must not be a way past it: a frame with
+/// fifteen thousand children answers with 10.5 MiB at depth 1, over the buffer the report in #912
+/// is about, and no depth makes that smaller because the width is at depth 1. So the subtree is
+/// cut by depth first, as the document's is, and then by a window over the children.
 fn get_node(b: &mut dyn Backend, a: &Map<String, Value>) -> Result<ToolResult, String> {
     let id = id_arg(a.get("id").ok_or("`id` is required")?)?;
     let depth = n_arg(a, "depth")?.unwrap_or(1.0).clamp(0.0, 64.0) as u64;
-    let v = b.call("node.get", json!({"id": id, "depth": depth}))?;
-    if v.is_null() {
+    let offset = n_arg(a, "offset")?.unwrap_or(0.0).max(0.0).min(u32::MAX as f64) as usize;
+    let (max_bytes, budget) = budget(a)?;
+
+    let (value, wire) = node_at(b, id, depth)?;
+    if value.is_null() {
         return Err(format!("no such layer {id}"));
     }
-    Ok(ToolResult::json(&v))
+    if wire <= budget && offset == 0 {
+        return Ok(ToolResult::json(&value));
+    }
+
+    // The deepest subtree that fits, by bisection, as the document's tree is cut. A node asked for
+    // at a depth of its own children only (1) cannot be made shallower without losing them all,
+    // so that is where the window takes over.
+    let (mut used, mut value, mut used_wire) = (depth, value, wire);
+    if depth > 1 && offset == 0 {
+        let (mut lo, mut hi) = (1u64, depth - 1);
+        while lo <= hi {
+            let mid = lo + (hi - lo) / 2;
+            let (v, w) = node_at(b, id, mid)?;
+            if w + MARKER_RESERVE <= budget {
+                (used, value, used_wire) = (mid, v, w);
+                if mid == hi {
+                    break;
+                }
+                lo = mid + 1;
+            } else if mid == 1 {
+                (used, value, used_wire) = (1, v, w);
+                break;
+            } else {
+                hi = mid - 1;
+            }
+        }
+        if used_wire + MARKER_RESERVE <= budget {
+            return Ok(ToolResult::json(&with_marker(value, Cut { asked: depth, used, asked_wire: wire, used_wire }, max_bytes, true, None)));
+        }
+    }
+
+    // Still over, or a window was asked for: the children from `offset` that fit.
+    let total = value.get("children").and_then(Value::as_array).map_or(0, Vec::len);
+    let window = children_window(&mut value, offset, budget.saturating_sub(MARKER_RESERVE));
+    let shown = value.get("children").and_then(Value::as_array).map_or(0, Vec::len);
+    // A child too large to fit on its own is passed over (a page of just the marker), so paging
+    // moves on and every answer stays within maxBytes; `get_node` on the child reads it.
+    let after = offset + shown.max(1);
+    let next = (after < total).then_some(after);
+    let used_wire = wire_size(&value);
+    if used_wire + MARKER_RESERVE > budget {
+        // Even with every child left out, the layer's own fields (a very long name, say) pass the
+        // limit: an answer would be larger than the caller can read, so there is none.
+        return Err(format!(
+            "layer {id} takes {used_wire} bytes on the wire without its children, more than fit in maxBytes {max_bytes}; ask again with a larger `maxBytes`"
+        ));
+    }
+    // Children left out after the window were cut by size; a window that only `offset` moved, of a
+    // subtree within the limit, is paging.
+    let over = wire > budget || next.is_some();
+    let mut out = with_marker(
+        value,
+        Cut { asked: depth, used, asked_wire: wire, used_wire },
+        max_bytes,
+        over,
+        Some(json!({
+            "from": offset,
+            "shown": shown,
+            "total": total,
+            "nextOffset": next,
+        })),
+    );
+    if window && shown == total && offset == 0 && used == depth {
+        // Nothing was left out after all (an offset of zero that fitted whole).
+        out.as_object_mut().map(|o| o.remove("truncated"));
+    }
+    Ok(ToolResult::json(&out))
+}
+
+/// Keep the children from `offset` that fit in `budget`, and say whether any were left out. The
+/// window is found by bisection: a node with thousands of children would otherwise be serialised
+/// once per child.
+fn children_window(value: &mut Value, offset: usize, budget: usize) -> bool {
+    let Some(all) = value.get("children").and_then(Value::as_array).cloned() else { return false };
+    let rest: Vec<Value> = all.iter().skip(offset).cloned().collect();
+    let fits = |value: &mut Value, n: usize| {
+        if let Some(obj) = value.as_object_mut() {
+            obj.insert("children".into(), Value::Array(rest.iter().take(n).cloned().collect()));
+        }
+        wire_size(value) <= budget
+    };
+    if fits(value, rest.len()) {
+        return rest.len() != all.len();
+    }
+    // The largest window that fits, between none and all of the rest.
+    let (mut lo, mut hi) = (0usize, rest.len());
+    while lo < hi {
+        let mid = lo + (hi - lo).div_ceil(2);
+        if fits(value, mid) { lo = mid } else { hi = mid - 1 }
+    }
+    fits(value, lo);
+    true
+}
+
+/// How a subtree was cut: the depth asked for and the depth reported, with their sizes on the wire.
+struct Cut {
+    asked: u64,
+    used: u64,
+    asked_wire: usize,
+    used_wire: usize,
+}
+
+/// `value` with the `truncated` object saying how it was cut. `over`: the subtree asked for passed
+/// the limit (else the window is only the `offset` asked for). `children`: the window, when the
+/// children were cut as well as (or instead of) the depth.
+fn with_marker(mut value: Value, cut: Cut, max_bytes: usize, over: bool, children: Option<Value>) -> Value {
+    let Cut { asked, used, asked_wire, used_wire } = cut;
+    if let Some(obj) = value.as_object_mut() {
+        let mut marker = json!({
+            "requestedDepth": asked,
+            "depth": used,
+            "requestedDepthBytes": asked_wire,
+            "bytes": used_wire,
+            "maxBytes": max_bytes,
+        });
+        match &children {
+            Some(window) => {
+                marker["children"] = window.clone();
+                let from = window.get("from").and_then(Value::as_u64).unwrap_or(0);
+                marker["reason"] = json!(if over {
+                    format!(
+                        "the subtree at depth {asked} would be {asked_wire} bytes on the wire, over the {max_bytes}-byte limit a client can read in one message; its children are reported from {from} instead"
+                    )
+                } else {
+                    format!(
+                        "its children are reported from {from}, the `offset` asked for; the subtree at depth {asked} ({asked_wire} bytes) is within the {max_bytes}-byte limit"
+                    )
+                });
+                marker["hint"] = json!("ask again with the `offset` in `children.nextOffset` for the rest, or get_node({id, depth}) on one child");
+            }
+            None => {
+                marker["reason"] = json!(format!(
+                    "the subtree at depth {asked} would be {asked_wire} bytes on the wire, over the {max_bytes}-byte limit a client can read in one message; it is reported at depth {used} instead"
+                ));
+                marker["hint"] = json!("get_node({id, depth}) on a child reads deeper, one subtree at a time");
+            }
+        }
+        obj.insert("truncated".into(), marker);
+    }
+    value
 }
 
 fn select(b: &mut dyn Backend, a: &Map<String, Value>) -> Result<ToolResult, String> {
@@ -596,8 +880,8 @@ fn export(b: &mut dyn Backend, a: &Map<String, Value>) -> Result<ToolResult, Str
     }
     let format = s_arg(a, "format")?.map(str::to_ascii_lowercase);
     if let Some(f) = &format {
-        if !["png", "jpg", "jpeg", "svg", "webp", "pdf", "fig"].contains(&f.as_str()) {
-            return Err(format!("unknown format `{f}` (png|jpg|svg|webp|pdf|fig)"));
+        if !["png", "jpg", "jpeg", "svg", "webp", "pdf", "xml", "fig"].contains(&f.as_str()) {
+            return Err(format!("unknown format `{f}` (png|jpg|svg|webp|pdf|xml|fig)"));
         }
         params.insert("format".into(), json!(f));
     }
@@ -611,9 +895,18 @@ fn export(b: &mut dyn Backend, a: &Map<String, Value>) -> Result<ToolResult, Str
         params.insert("size".into(), json!(s));
     }
     // PDF print options and the export options, checked by the command.
-    for k in
-        ["bleed", "cropMarks", "bleedMarks", "cmyk", "contentsOnly", "includeBoundingBox", "svgOutlineText", "svgIdAttribute", "svgSimplifyStroke"]
-    {
+    for k in [
+        "bleed",
+        "cropMarks",
+        "bleedMarks",
+        "cmyk",
+        "contentsOnly",
+        "includeBoundingBox",
+        "svgOutlineText",
+        "svgIdAttribute",
+        "svgSimplifyStroke",
+        "vdCompat",
+    ] {
         if let Some(v) = a.get(k).filter(|v| !v.is_null()) {
             params.insert(k.into(), v.clone());
         }
@@ -633,6 +926,12 @@ fn export(b: &mut dyn Backend, a: &Map<String, Value>) -> Result<ToolResult, Str
         "jpg" | "jpeg" => Ok(ToolResult::image(&bytes, "image/jpeg", &json!({"format": "jpg", "bytes": bytes.len()}))),
         "webp" => Ok(ToolResult::image(&bytes, "image/webp", &json!({"format": "webp", "bytes": bytes.len()}))),
         "svg" => Ok(ToolResult::text(String::from_utf8_lossy(&bytes).into_owned())),
+        "xml" => {
+            let info = json!({"format": "xml", "bytes": bytes.len(), "warnings": r.get("warnings").cloned().unwrap_or_else(|| json!([]))});
+            let mut out = ToolResult::text(String::from_utf8_lossy(&bytes).into_owned());
+            out.content.extend(ToolResult::json(&info).content);
+            Ok(out)
+        }
         other => {
             let mut out = json!({"format": other, "bytes": bytes.len(), "data": base64::engine::general_purpose::STANDARD.encode(&bytes)});
             if let Some(w) = r.get("warnings") {
diff --git a/crates/mcp/tests/agent_tasks.rs b/crates/mcp/tests/it/agent_tasks.rs
similarity index 92%
rename from crates/mcp/tests/agent_tasks.rs
rename to crates/mcp/tests/it/agent_tasks.rs
index b35f3e7f..ae576e12 100644
--- a/crates/mcp/tests/agent_tasks.rs
+++ b/crates/mcp/tests/it/agent_tasks.rs
@@ -1,8 +1,7 @@
 //! End-to-end agent tasks: an in-process MCP client completes realistic design tasks only through
 //! MCP tool calls, and checks every result through inspect_document / get_node like an agent would.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
-mod common;
+use crate::common;
 
 use common::{Client, approx, png_dims};
 use serde_json::{Value, json};
@@ -344,3 +343,32 @@ fn task_card_in_one_batch() {
     );
     assert!(e.contains("step 0") && e.contains("earlier step"), "{e}");
 }
+
+/// Named steps and a path into a list result: duplicate a frame, then rename the copy through
+/// `{"$ref": "copy", "field": "ids/0"}` instead of counting steps.
+#[test]
+fn task_named_steps_and_a_duplicate_in_one_batch() {
+    let mut c = Client::new();
+    let out = c.ok(
+        "batch",
+        json!({"label": "Copy", "commands": [
+            {"command": "node.create", "as": "card", "params": {"type": "frame", "name": "Card", "width": 100, "height": 50}},
+            {"command": "edit.duplicate", "as": "copy", "params": {"ids": [{"$ref": "card"}]}},
+            {"command": "node.set", "params": {"ids": [{"$ref": "copy", "field": "ids/0"}], "props": {"name": "Card copy"}}},
+        ]}),
+    );
+    let results = ids(&out);
+    let copy = results[1]["ids"][0].clone();
+    assert_eq!(c.node(&copy)["name"], "Card copy");
+    assert_eq!(c.node(&results[0]["id"])["name"], "Card", "the original keeps its name");
+    assert_eq!(c.doc()["history"]["undo"][0], "Copy", "one undo step");
+    // An unknown name fails the whole batch, names the step and lists the names there are.
+    let e = c.err(
+        "batch",
+        json!({"commands": [
+            {"command": "node.create", "as": "card", "params": {"type": "frame"}},
+            {"command": "node.set", "params": {"ids": [{"$ref": "crad"}], "props": {"name": "x"}}},
+        ]}),
+    );
+    assert!(e.contains("step 1") && e.contains("\"crad\" names no step") && e.contains("\"card\" is step 0"), "{e}");
+}
diff --git a/crates/mcp/tests/attached.rs b/crates/mcp/tests/it/attached.rs
similarity index 99%
rename from crates/mcp/tests/attached.rs
rename to crates/mcp/tests/it/attached.rs
index 69194604..f1343dd2 100644
--- a/crates/mcp/tests/attached.rs
+++ b/crates/mcp/tests/it/attached.rs
@@ -1,6 +1,5 @@
 //! The attached backend against a fake app: a loopback control server answering with a headless
 //! session, speaking the desktop app's JSON-lines protocol.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use std::io::{BufRead, BufReader, Write};
 use std::net::TcpListener;
diff --git a/crates/mcp/tests/it/automation_roots.rs b/crates/mcp/tests/it/automation_roots.rs
new file mode 100644
index 00000000..aa8e1b24
--- /dev/null
+++ b/crates/mcp/tests/it/automation_roots.rs
@@ -0,0 +1,125 @@
+//! `--automation-read-root` / `--automation-write-root` over MCP (#715): a tool call reads only
+//! inside the read and write roots and writes only inside the write roots.
+
+use std::path::PathBuf;
+
+use figcraft_engine::file_access::Roots;
+use figcraft_mcp::Server;
+use serde_json::{Value, json};
+
+/// `<tmp>/figcraft-mcp-roots-<name>-<pid>` with `in/` (read root), `out/` (write root),
+/// `outside/` and `out2/` (named like the write root, outside it).
+struct Dirs(PathBuf);
+
+impl Dirs {
+    fn new(name: &str) -> Self {
+        let d = std::env::temp_dir().join(format!("figcraft-mcp-roots-{name}-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&d);
+        for sub in ["in", "out", "outside", "out2"] {
+            std::fs::create_dir_all(d.join(sub)).unwrap();
+        }
+        Self(d)
+    }
+
+    fn p(&self, rel: &str) -> String {
+        self.0.join(rel).to_string_lossy().into_owned()
+    }
+
+    fn server(&self) -> Server {
+        Server::headless().with_roots(Some(Roots::new(&[self.p("in")], &[self.p("out")]).unwrap()))
+    }
+}
+
+impl Drop for Dirs {
+    fn drop(&mut self) {
+        let _ = std::fs::remove_dir_all(&self.0);
+    }
+}
+
+fn call(s: &mut Server, tool: &str, args: Value) -> Value {
+    let line = json!({"jsonrpc": "2.0", "id": 1, "method": "tools/call", "params": {"name": tool, "arguments": args}}).to_string();
+    let r: Value = serde_json::from_str(&s.handle_line(&line).unwrap()).unwrap();
+    r["result"].clone()
+}
+
+fn text(r: &Value) -> String {
+    r["content"][0]["text"].as_str().unwrap_or_default().to_string()
+}
+
+#[test]
+fn writes_go_only_into_the_write_root() {
+    let d = Dirs::new("write");
+    let mut s = d.server();
+    assert_eq!(call(&mut s, "create_node", json!({"type": "frame", "width": 40, "height": 20}))["isError"], false);
+    assert_eq!(call(&mut s, "run_command", json!({"command": "export.add"}))["isError"], false);
+    for (tool, args) in [
+        ("save_file", json!({"path": d.p("outside/a.figcraft")})),
+        ("save_file", json!({"path": d.p("out2/a.figcraft")})),
+        ("save_file", json!({"path": d.p("out/../outside/a.figcraft")})),
+        ("save_file", json!({"path": d.p("in/a.figcraft")})),
+        ("export", json!({"format": "png", "path": d.p("outside/a.png")})),
+        ("run_command", json!({"command": "file.export", "params": {"format": "svg", "path": d.p("outside/a.svg")}})),
+        ("run_command", json!({"command": "file.exportLayers", "params": {"dir": d.p("outside")}})),
+        ("batch", json!({"commands": [{"command": "file.saveAs", "params": {"path": d.p("outside/b.figcraft")}}]})),
+    ] {
+        let r = call(&mut s, tool, args.clone());
+        assert_eq!(r["isError"], true, "{tool} {args}: {r}");
+        assert!(text(&r).contains("automation path rejected"), "{tool}: {r}");
+    }
+    for sub in ["outside", "out2", "in"] {
+        assert_eq!(std::fs::read_dir(d.0.join(sub)).unwrap().count(), 0, "nothing written in {sub}");
+    }
+    assert_eq!(call(&mut s, "save_file", json!({"path": d.p("out/a.figcraft")}))["isError"], false);
+    assert_eq!(call(&mut s, "export", json!({"format": "png", "path": d.p("out/a.png")}))["isError"], false);
+    assert!(d.0.join("out/a.figcraft").is_file() && d.0.join("out/a.png").is_file());
+    // Without a path the bytes come back, written nowhere.
+    let r = call(&mut s, "export", json!({"format": "png"}));
+    assert_eq!(r["content"][0]["type"], "image", "{r}");
+}
+
+#[test]
+fn reads_go_only_into_the_read_and_write_roots() {
+    let d = Dirs::new("read");
+    // Files made without roots: one in each folder.
+    let mut free = Server::headless();
+    assert_eq!(call(&mut free, "create_node", json!({"type": "frame", "width": 40, "height": 20, "name": "Made"}))["isError"], false);
+    for f in ["in/a.figcraft", "out/b.figcraft", "outside/c.figcraft"] {
+        assert_eq!(call(&mut free, "export", json!({"format": "svg", "path": d.p(&f.replace(".figcraft", ".svg"))}))["isError"], false);
+        assert_eq!(call(&mut free, "run_command", json!({"command": "file.saveAs", "params": {"path": d.p(f)}}))["isError"], false);
+    }
+    let mut s = d.server();
+    for (tool, args) in [
+        ("open_file", json!({"path": d.p("outside/c.figcraft")})),
+        ("open_file", json!({"path": d.p("in/../outside/c.figcraft")})),
+        ("open_file", json!({"path": d.p("in/a.figcraft"), "variables": d.p("outside/c.svg")})),
+        ("run_command", json!({"command": "file.import", "params": {"path": d.p("outside/c.svg")}})),
+        ("run_command", json!({"command": "file.placeImage", "params": {"path": d.p("outside/c.svg")}})),
+        ("run_command", json!({"command": "library.add", "params": {"path": d.p("outside/c.figcraft")}})),
+    ] {
+        let r = call(&mut s, tool, args.clone());
+        assert_eq!(r["isError"], true, "{tool} {args}: {r}");
+        assert!(text(&r).contains("automation path rejected"), "{tool}: {r}");
+    }
+    assert_eq!(call(&mut s, "open_file", json!({"path": d.p("in/a.figcraft")}))["isError"], false);
+    assert_eq!(call(&mut s, "open_file", json!({"path": d.p("out/b.figcraft")}))["isError"], false, "a write root may be read");
+    assert_eq!(call(&mut s, "run_command", json!({"command": "file.import", "params": {"path": d.p("in/a.svg")}}))["isError"], false);
+}
+
+#[test]
+fn initialize_names_the_roots_and_no_roots_changes_nothing() {
+    let d = Dirs::new("init");
+    let mut s = d.server();
+    let r: Value =
+        serde_json::from_str(&s.handle_line(r#"{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-06-18"}}"#).unwrap())
+            .unwrap();
+    let ins = r["result"]["instructions"].as_str().unwrap();
+    assert!(ins.contains("only these folders may be read") && ins.contains("figcraft-mcp-roots-init"), "{ins}");
+    let mut free = Server::headless();
+    let r: Value = serde_json::from_str(
+        &free.handle_line(r#"{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-06-18"}}"#).unwrap(),
+    )
+    .unwrap();
+    assert!(!r["result"]["instructions"].as_str().unwrap().contains("only these folders"));
+    assert_eq!(call(&mut free, "create_node", json!({"type": "frame", "width": 4, "height": 4}))["isError"], false);
+    assert_eq!(call(&mut free, "export", json!({"format": "png", "path": d.p("outside/free.png")}))["isError"], false);
+}
diff --git a/crates/mcp/tests/common/mod.rs b/crates/mcp/tests/it/common/mod.rs
similarity index 97%
rename from crates/mcp/tests/common/mod.rs
rename to crates/mcp/tests/it/common/mod.rs
index be4dcea2..51e74865 100644
--- a/crates/mcp/tests/common/mod.rs
+++ b/crates/mcp/tests/it/common/mod.rs
@@ -1,5 +1,4 @@
 //! An in-process MCP client: feeds JSON-RPC lines to `Server::handle_line`.
-#![allow(dead_code, clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use figcraft_mcp::Server;
 use serde_json::{Value, json};
diff --git a/crates/mcp/tests/export_hidden_roots.rs b/crates/mcp/tests/it/export_hidden_roots.rs
similarity index 96%
rename from crates/mcp/tests/export_hidden_roots.rs
rename to crates/mcp/tests/it/export_hidden_roots.rs
index ded6f731..0a3b8de4 100644
--- a/crates/mcp/tests/export_hidden_roots.rs
+++ b/crates/mcp/tests/it/export_hidden_roots.rs
@@ -1,7 +1,6 @@
 //! Hidden top-level layers in an export take no room in the image (issue #447).
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
-mod common;
+use crate::common;
 
 use common::{Client, png_dims};
 use serde_json::{Value, json};
diff --git a/crates/mcp/tests/it/export_xml.rs b/crates/mcp/tests/it/export_xml.rs
new file mode 100644
index 00000000..9ae42549
--- /dev/null
+++ b/crates/mcp/tests/it/export_xml.rs
@@ -0,0 +1,27 @@
+//! The `export` tool's Android Vector Drawable format: the XML as text, then its warnings.
+
+use crate::common::Client;
+use serde_json::{Value, json};
+
+#[test]
+fn xml_comes_back_as_text_and_its_warnings() {
+    let mut c = Client::new();
+    let id = c.create(json!({"type": "rectangle", "x": 0, "y": 0, "width": 24, "height": 16}));
+    let r = c.call("export", json!({"ids": [id], "format": "xml"}));
+    assert_eq!(r["isError"], false, "{r}");
+    let blocks = r["content"].as_array().unwrap();
+    let xml = blocks[0]["text"].as_str().unwrap();
+    assert!(xml.starts_with("<?xml") && xml.contains("android:width=\"24dp\"") && xml.contains("android:height=\"16dp\""), "{xml}");
+    let info: Value = serde_json::from_str(blocks[1]["text"].as_str().unwrap()).unwrap();
+    assert_eq!((info["format"].as_str(), info["warnings"].as_array().map(Vec::len)), (Some("xml"), Some(0)));
+
+    c.ok("set_properties", json!({"ids": [id], "props": {"effects": [{"type": "dropShadow"}]}}));
+    let r = c.call("export", json!({"ids": [id], "format": "xml"}));
+    let info: Value = serde_json::from_str(r["content"][1]["text"].as_str().unwrap()).unwrap();
+    assert_eq!(info["warnings"], json!(["drop shadows were left out (Rectangle)"]), "{info}");
+    let r = c.call("export", json!({"ids": [id], "format": "xml", "vdCompat": "ignore"}));
+    let info: Value = serde_json::from_str(r["content"][1]["text"].as_str().unwrap()).unwrap();
+    assert_eq!(info["warnings"], json!([]));
+
+    assert!(c.err("export", json!({"ids": [id], "format": "xml", "vdCompat": "loose"})).contains("vdCompat"));
+}
diff --git a/crates/mcp/tests/garbage.rs b/crates/mcp/tests/it/garbage.rs
similarity index 98%
rename from crates/mcp/tests/garbage.rs
rename to crates/mcp/tests/it/garbage.rs
index 262934c7..5d9e237e 100644
--- a/crates/mcp/tests/garbage.rs
+++ b/crates/mcp/tests/it/garbage.rs
@@ -1,5 +1,4 @@
 //! Fuzz-ish: no input line may crash the server or leave it unable to answer.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use figcraft_mcp::{Server, TOOL_NAMES};
 use proptest::prelude::*;
diff --git a/crates/mcp/tests/it/inspect_response_limit.rs b/crates/mcp/tests/it/inspect_response_limit.rs
new file mode 100644
index 00000000..347aa96e
--- /dev/null
+++ b/crates/mcp/tests/it/inspect_response_limit.rs
@@ -0,0 +1,218 @@
+//! `inspect_document` must not emit a message larger than a client can read in one piece: MCP
+//! stdio is newline-delimited JSON, so one result is one message, and a client whose read buffer
+//! it exceeds closes the pipe and kills the server for the rest of the session (#912).
+use crate::common;
+
+use common::Client;
+use serde_json::{Value, json};
+
+/// The allowance `inspect_document` keeps for the content object, the JSON-RPC envelope and the
+/// request id (`ENVELOPE_RESERVE`).
+const ENVELOPE: usize = 1024;
+
+/// A document whose tree is far larger than the limits used below.
+fn busy() -> Client {
+    let mut c = Client::new();
+    for i in 0..40 {
+        let frame = c.create(json!({"type": "frame", "x": i * 10, "y": 0, "width": 200, "height": 200}));
+        for j in 0..12 {
+            c.create(json!({"type": "rectangle", "parent": frame, "x": j * 5, "y": 5, "width": 20, "height": 20}));
+        }
+    }
+    c
+}
+
+/// The response and what its text block takes on the wire, escaped as the transport sends it.
+fn inspect(c: &mut Client, args: Value) -> (Value, usize) {
+    let r = c.call("inspect_document", args.clone());
+    assert_eq!(r["isError"], false, "{args}: {}", r["content"][0]["text"]);
+    let text = r["content"][0]["text"].as_str().expect("a text block");
+    let wire = serde_json::to_string(&text).unwrap().len();
+    (serde_json::from_str(text).expect("the block is JSON"), wire)
+}
+
+#[test]
+fn a_tree_too_large_for_the_client_is_reported_shallower_and_says_so() {
+    let mut c = busy();
+    let (full, full_wire) = inspect(&mut c, json!({"depth": 6, "allPages": true}));
+    assert!(full["truncated"].is_null(), "a tree within the limit is not truncated: {}", full["truncated"]);
+    assert!(full_wire > 30_000, "the fixture has to outgrow the limits below: {full_wire}");
+
+    // Asked for more than the caller can read: a shallower tree, inside the limit, and a marker.
+    let (cut, cut_wire) = inspect(&mut c, json!({"depth": 6, "allPages": true, "maxBytes": 30_000}));
+    assert!(cut_wire <= 30_000, "the response still exceeds maxBytes: {cut_wire}");
+    let t = &cut["truncated"];
+    assert_eq!(t["requestedDepth"], 6, "{t}");
+    assert!(t["depth"].as_u64().unwrap() < 6, "the depth was reduced: {t}");
+    assert_eq!(t["maxBytes"], 30_000, "{t}");
+    assert_eq!(t["requestedDepthBytes"], full_wire, "the marker says what the full tree would have taken: {t}");
+    // The marker points at the way to read the rest.
+    assert!(t["hint"].as_str().unwrap_or("").contains("get_node"), "{t}");
+    // Still a usable document, not just a marker: the page and its top-level layers are there.
+    assert!(!cut["currentPage"].is_null(), "{cut}");
+    assert!(cut["pages"][0]["children"].as_array().is_some_and(|c| !c.is_empty()), "{cut}");
+
+    // The deepest tree that fits is the one sent: a limit that admits the whole tree is not cut.
+    // maxBytes is the whole message, so the tree fits under it with room for the envelope, not
+    // at it: a text block of exactly maxBytes would be sent inside a larger message than that.
+    let (whole, _) = inspect(&mut c, json!({"depth": 6, "allPages": true, "maxBytes": full_wire + ENVELOPE}));
+    assert!(whole["truncated"].is_null(), "a limit that leaves room for the envelope is not a truncation: {}", whole["truncated"]);
+    let (tight, _) = inspect(&mut c, json!({"depth": 6, "allPages": true, "maxBytes": full_wire}));
+    assert_eq!(tight["truncated"]["requestedDepth"], 6, "a limit at the exact size of the tree leaves none for the envelope: {tight}");
+}
+
+/// Every over-limit response carries the marker, however the depth was arrived at: a caller that
+/// asked for depth 0 has no other way to learn that its limit was passed.
+#[test]
+fn a_depth_0_response_over_the_limit_says_so_too() {
+    let mut c = busy();
+    let (deep, _) = inspect(&mut c, json!({"depth": 0, "allPages": true}));
+    assert!(deep["truncated"].is_null(), "within the default limit: {}", deep["truncated"]);
+    let (v, wire) = inspect(&mut c, json!({"depth": 0, "allPages": true, "maxBytes": 1024}));
+    let t = &v["truncated"];
+    assert_eq!((t["requestedDepth"].as_u64(), t["depth"].as_u64()), (Some(0), Some(0)), "{t}");
+    // `bytes` is the tree, measured before the marker was added to it, so the message that goes
+    // out is larger still -- there being nothing smaller to send.
+    assert_eq!(t["bytes"], t["requestedDepthBytes"], "{t}");
+    assert!(wire > 1024, "the depth-0 tree is sent over the limit, with the marker saying so: {wire}");
+    assert!(!v["pages"].is_null(), "the tree is still sent, there being nothing smaller: {v}");
+}
+
+#[test]
+fn a_limit_below_the_shallowest_tree_still_answers() {
+    // Nothing smaller than depth 0 exists, so it is sent with the marker rather than an error:
+    // an error would leave the caller with nothing at all.
+    let mut c = busy();
+    let (v, _) = inspect(&mut c, json!({"depth": 6, "allPages": true, "maxBytes": 1024}));
+    assert_eq!(v["truncated"]["depth"], 0, "{}", v["truncated"]);
+    assert_eq!(v["truncated"]["requestedDepth"], 6, "{}", v["truncated"]);
+}
+
+#[test]
+fn maxbytes_is_checked() {
+    let mut c = Client::new();
+    let r = c.call("inspect_document", json!({"depth": 1, "maxBytes": 10}));
+    assert_eq!(r["isError"], true, "{r}");
+    assert!(r["content"][0]["text"].as_str().unwrap_or("").contains("at least 1024"), "{r}");
+}
+
+/// `inspect_document` sends a shallower tree and points at `get_node` for the rest, so `get_node`
+/// must keep to the same limit -- it was unbounded. Measured on `main`: a frame with 15,000
+/// children answers with a 10.5 MiB message at depth 1, over the 10 MiB buffer the report is
+/// about, and no depth makes that smaller because the width is at depth 1. The children are
+/// windowed instead, with the offset to ask for next.
+#[test]
+fn a_node_with_more_children_than_fit_is_windowed() {
+    let mut c = Client::new();
+    let frame = c.create(json!({"type": "frame", "x": 0, "y": 0, "width": 400, "height": 400}));
+    for i in 0..40 {
+        c.create(json!({"type": "rectangle", "parent": frame, "x": i * 5, "y": 5, "width": 20, "height": 20}));
+    }
+
+    // Whole, to measure against: every child, no marker.
+    let (whole, whole_wire) = get_node(&mut c, json!({"id": frame, "depth": 1}));
+    let total = whole["children"].as_array().expect("children").len();
+    assert_eq!(total, 40, "{whole}");
+    assert!(whole["truncated"].is_null(), "within the default limit: {}", whole["truncated"]);
+
+    // A limit that holds only some of them: a window, and the marker says how many and what next.
+    let limit = whole_wire / 3;
+    assert!(limit >= 1024, "the fixture has to outgrow the floor: {whole_wire}");
+    let (cut, cut_wire) = get_node(&mut c, json!({"id": frame, "depth": 1, "maxBytes": limit}));
+    assert!(cut_wire <= limit, "the response still exceeds maxBytes: {cut_wire} > {limit}");
+    let window = &cut["truncated"]["children"];
+    let shown = cut["children"].as_array().expect("children").len();
+    assert_eq!(window["from"], json!(0), "{window}");
+    assert_eq!(window["shown"], json!(shown), "{window}");
+    assert_eq!(window["total"], json!(total), "{window}");
+    assert!(shown > 0 && shown < total, "some children, not all: {shown} of {total}");
+    assert_eq!(window["nextOffset"], json!(shown), "the offset to ask for next: {window}");
+    assert!(cut["truncated"]["reason"].as_str().unwrap_or("").contains("over the"), "cut by size: {}", cut["truncated"]);
+    // The layer itself is still there, not just a marker.
+    assert_eq!(cut["id"], whole["id"]);
+
+    // Paging through with that offset reaches every child exactly once, in order.
+    let mut seen: Vec<Value> = Vec::new();
+    let mut offset = Some(0u64);
+    while let Some(at) = offset {
+        let (page, wire) = get_node(&mut c, json!({"id": frame, "depth": 1, "maxBytes": limit, "offset": at}));
+        assert!(wire <= limit, "page at {at} exceeds maxBytes: {wire}");
+        seen.extend(page["children"].as_array().cloned().unwrap_or_default());
+        offset = page["truncated"]["children"]["nextOffset"].as_u64();
+        assert!(seen.len() <= total, "a page repeated a child: {} of {total}", seen.len());
+    }
+    assert_eq!(seen.len(), total, "every child was reported once");
+    assert_eq!(seen, whole["children"].as_array().cloned().unwrap_or_default(), "in the same order");
+}
+
+/// The response and what its text block takes on the wire, for one `get_node` call.
+fn get_node(c: &mut Client, args: Value) -> (Value, usize) {
+    let r = c.call("get_node", args.clone());
+    assert_eq!(r["isError"], false, "{args}: {}", r["content"][0]["text"]);
+    let text = r["content"][0]["text"].as_str().expect("a text block");
+    let wire = serde_json::to_string(&text).unwrap().len() + ENVELOPE;
+    (serde_json::from_str(text).expect("the block is JSON"), wire)
+}
+
+/// A child too large for the limit on its own is passed over, one per page of just the marker,
+/// so paging moves on and every page stays within the limit.
+#[test]
+fn children_too_large_to_fit_page_one_at_a_time() {
+    let mut c = Client::new();
+    let frame = c.create(json!({"type": "frame", "x": 0, "y": 0, "width": 400, "height": 400}));
+    for i in 0..3 {
+        c.create(json!({"type": "rectangle", "parent": frame, "x": i * 5, "y": 5, "width": 20, "height": 20, "name": "n".repeat(3000)}));
+    }
+    let mut offset = Some(0u64);
+    let mut pages = 0;
+    while let Some(at) = offset {
+        let (page, wire) = get_node(&mut c, json!({"id": frame, "depth": 1, "maxBytes": 2500, "offset": at}));
+        assert!(wire <= 2500, "page at {at} exceeds maxBytes: {wire}");
+        assert_eq!(page["children"].as_array().map_or(0, Vec::len), 0, "{}", page["truncated"]);
+        assert!(!page["truncated"].is_null(), "the marker stays: page at {at}");
+        offset = page["truncated"]["children"]["nextOffset"].as_u64();
+        assert!(offset.is_none_or(|o| o > at), "paging moves on from {at}");
+        pages += 1;
+        assert!(pages <= 3);
+    }
+    assert_eq!(pages, 3);
+
+    // A sole child passed over still says the answer was cut.
+    let single = c.create(json!({"type": "frame", "x": 500, "y": 0, "width": 40, "height": 40}));
+    c.create(json!({"type": "rectangle", "parent": single, "x": 0, "y": 0, "width": 20, "height": 20, "name": "n".repeat(3000)}));
+    let (page, _) = get_node(&mut c, json!({"id": single, "depth": 1, "maxBytes": 2500}));
+    assert_eq!(page["children"].as_array().map_or(0, Vec::len), 0);
+    assert_eq!(page["truncated"]["children"]["total"], json!(1), "{}", page["truncated"]);
+}
+
+/// A layer whose own fields pass the limit with every child left out is refused: an answer would
+/// be over maxBytes, and the marker would only make it larger.
+#[test]
+fn a_layer_too_large_on_its_own_is_refused() {
+    let mut c = Client::new();
+    let rect = c.create(json!({"type": "rectangle", "x": 0, "y": 0, "width": 20, "height": 20, "name": "n".repeat(3000)}));
+    let r = c.call("get_node", json!({"id": rect, "maxBytes": 2500}));
+    assert_eq!(r["isError"], true, "{r}");
+    assert!(r["content"][0]["text"].as_str().unwrap_or("").contains("maxBytes"), "{r}");
+    // A layer of ordinary size answers within the same limit.
+    let small = c.create(json!({"type": "rectangle", "x": 0, "y": 0, "width": 20, "height": 20}));
+    let (v, wire) = get_node(&mut c, json!({"id": small, "maxBytes": 2500}));
+    assert!(wire <= 2500 && v["truncated"].is_null(), "{wire}: {v}");
+}
+
+/// A window that only an `offset` made, of a subtree within the limit, is paging: the marker
+/// doesn't say the limit was passed.
+#[test]
+fn an_offset_alone_pages_without_claiming_the_limit() {
+    let mut c = Client::new();
+    let frame = c.create(json!({"type": "frame", "x": 0, "y": 0, "width": 400, "height": 400}));
+    for i in 0..3 {
+        c.create(json!({"type": "rectangle", "parent": frame, "x": i * 5, "y": 5, "width": 20, "height": 20}));
+    }
+    let (page, _) = get_node(&mut c, json!({"id": frame, "depth": 1, "offset": 1}));
+    let t = &page["truncated"];
+    assert_eq!(page["children"].as_array().map_or(0, Vec::len), 2, "{t}");
+    assert!(t["children"]["nextOffset"].is_null(), "{t}");
+    let reason = t["reason"].as_str().unwrap_or("");
+    assert!(reason.contains("offset") && !reason.contains("over the"), "{reason}");
+}
diff --git a/crates/mcp/tests/it/main.rs b/crates/mcp/tests/it/main.rs
new file mode 100644
index 00000000..23d23ec9
--- /dev/null
+++ b/crates/mcp/tests/it/main.rs
@@ -0,0 +1,24 @@
+//! The crate's integration tests, built as one test binary.
+
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod agent_tasks;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod attached;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::disallowed_methods)]
+mod automation_roots;
+#[allow(dead_code, clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod common;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod export_hidden_roots;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod export_xml;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod garbage;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod inspect_response_limit;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod overlay_anchor;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod protocol;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod screenshot_pixel_limit;
diff --git a/crates/mcp/tests/it/overlay_anchor.rs b/crates/mcp/tests/it/overlay_anchor.rs
new file mode 100644
index 00000000..c9cd3473
--- /dev/null
+++ b/crates/mcp/tests/it/overlay_anchor.rs
@@ -0,0 +1,25 @@
+use crate::common;
+
+use common::Client;
+use serde_json::json;
+
+#[test]
+fn an_agent_anchors_a_dropdown_to_its_button() {
+    let mut c = Client::new();
+    let listed = c.ok("list_commands", json!({"filter": "proto.interaction.add"}));
+    assert!(listed.as_str().unwrap().contains("triggerOutside"), "{listed}");
+
+    let screen = c.create(json!({"type": "frame", "name": "Screen", "x": 0, "y": 0, "width": 400, "height": 800}));
+    let menu = c.create(json!({"type": "frame", "name": "Menu", "x": 600, "y": 0, "width": 160, "height": 200}));
+    let button = c.create(json!({"type": "frame", "parent": screen, "name": "Button", "x": 20, "y": 40, "width": 160, "height": 40}));
+    let open = json!({"type": "openOverlay", "dest": menu, "position": "bottomLeft", "anchor": "triggerOutside"});
+    c.run("proto.interaction.add", json!({"id": button, "action": open}));
+
+    let action = &c.node(&button)["interactions"][0]["actions"][0];
+    assert_eq!((action["position"].as_str(), action["anchor"].as_str()), (Some("bottomLeft"), Some("triggerOutside")), "{action}");
+
+    let bad = json!({"type": "openOverlay", "dest": menu, "anchor": "nextToIt"});
+    let err = c.err("run_command", json!({"command": "proto.interaction.add", "params": {"id": button, "action": bad}}));
+    assert!(!err.is_empty());
+    assert_eq!(c.node(&button)["interactions"].as_array().unwrap().len(), 1);
+}
diff --git a/crates/mcp/tests/protocol.rs b/crates/mcp/tests/it/protocol.rs
similarity index 94%
rename from crates/mcp/tests/protocol.rs
rename to crates/mcp/tests/it/protocol.rs
index 89f2a649..617790f4 100644
--- a/crates/mcp/tests/protocol.rs
+++ b/crates/mcp/tests/it/protocol.rs
@@ -1,7 +1,6 @@
 //! JSON-RPC / MCP protocol behaviour.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
-mod common;
+use crate::common;
 
 use common::Client;
 use figcraft_mcp::{PROTOCOL_VERSION, Server, TOOL_NAMES};
@@ -208,3 +207,14 @@ fn serve_accepts_a_limit_sized_frame_and_a_final_unterminated_frame() {
     assert_eq!(lines[0]["result"], json!({}));
     assert_eq!(lines[1]["id"], 2);
 }
+
+#[test]
+fn set_properties_passes_on_what_it_skipped() {
+    let mut c = Client::new();
+    let f = c.ok("create_node", json!({"type": "frame"}))["id"].clone();
+    let t = c.ok("create_node", json!({"type": "text", "text": "Hi"}))["id"].clone();
+    let r = c.ok("set_properties", json!({"ids": [f, t], "props": {"gap": 8}}));
+    assert!(r["warnings"][0].as_str().is_some_and(|w| w.contains("`gap`") && w.contains("TEXT")), "{r}");
+    assert!(c.ok("set_properties", json!({"ids": [f], "props": {"gap": 4}})).get("warnings").is_none());
+    assert!(c.err("set_properties", json!({"ids": [t], "props": {"gap": 4}})).contains("auto layout"));
+}
diff --git a/crates/mcp/tests/screenshot_pixel_limit.rs b/crates/mcp/tests/it/screenshot_pixel_limit.rs
similarity index 96%
rename from crates/mcp/tests/screenshot_pixel_limit.rs
rename to crates/mcp/tests/it/screenshot_pixel_limit.rs
index 095992ff..e575f1d5 100644
--- a/crates/mcp/tests/screenshot_pixel_limit.rs
+++ b/crates/mcp/tests/it/screenshot_pixel_limit.rs
@@ -1,6 +1,5 @@
 //! `screenshot` with `ids` must honour `maxSize` for the rendered paint area (shadows, overflow).
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
-mod common;
+use crate::common;
 use common::{Client, png_dims};
 use serde_json::{Value, json};
 
diff --git a/crates/pathops/src/lib.rs b/crates/pathops/src/lib.rs
index 553fce04..03261fc6 100644
--- a/crates/pathops/src/lib.rs
+++ b/crates/pathops/src/lib.rs
@@ -13,12 +13,14 @@ mod brush_tests;
 mod ops_tests;
 mod points;
 #[cfg(test)]
+mod rounded_side_strokes_tests;
+#[cfg(test)]
 mod sides_tests;
 pub mod width;
 #[cfg(test)]
 mod width_tests;
 
-use figcraft_doc::{BoolOp, StrokeAlign, StrokeCap, StrokeJoin, StrokeProps, VectorNetwork};
+use figcraft_doc::{BoolOp, StrokeAlign, StrokeCap, StrokeJoin, StrokeProps, VectorNetwork, WindingRule};
 use figcraft_geom::kurbo::{self, BezPath, Cap, Join, PathEl, PathSeg, Point, Shape, Vec2};
 
 #[derive(Debug, PartialEq)]
@@ -59,14 +61,26 @@ pub fn closed(path: &BezPath) -> BezPath {
 /// Every coordinate is finite and of a sane magnitude (the sweep needs bounded input).
 pub use figcraft_geom::measure::finite_path as finite;
 
+/// Run the sweep library on `f`. Version 0.4 can panic on rare near-degenerate input (an internal
+/// `unwrap` while ordering curves, hit by some font outlines): that is bad input, not a crash.
+// shortcut: no catch where panics abort (wasm32); drop this once a linesweeper release no longer panics there.
+fn sweep<T>(f: impl FnOnce() -> Result<T, PathOpsError>) -> Result<T, PathOpsError> {
+    std::panic::catch_unwind(std::panic::AssertUnwindSafe(f)).unwrap_or(Err(PathOpsError::BadInput))
+}
+
 fn binary(a: &BezPath, b: &BezPath, op: linesweeper::BinaryOp) -> Result<BezPath, PathOpsError> {
+    binary_by(a, b, linesweeper::FillRule::NonZero, op)
+}
+
+/// [`binary`] with both operands read by fill rule `rule`.
+fn binary_by(a: &BezPath, b: &BezPath, rule: linesweeper::FillRule, op: linesweeper::BinaryOp) -> Result<BezPath, PathOpsError> {
     if a.elements().is_empty() && b.elements().is_empty() {
         return Ok(BezPath::new());
     }
     if !finite(a) || !finite(b) {
         return Err(PathOpsError::BadInput);
     }
-    let contours = linesweeper::binary_op(&closed(a), &closed(b), linesweeper::FillRule::NonZero, op).map_err(|_| PathOpsError::BadInput)?;
+    let contours = sweep(|| linesweeper::binary_op(&closed(a), &closed(b), rule, op).map_err(|_| PathOpsError::BadInput))?;
     let mut out = BezPath::new();
     for c in contours.contours() {
         out.extend(c.path.elements().iter().copied());
@@ -185,23 +199,43 @@ pub fn faces(paths: &[(BezPath, bool)]) -> Result<Vec<ArrangementFace>, PathOpsE
     if paths.len() > MAX_ARRANGEMENT_INPUTS || paths.iter().any(|(p, _)| !finite(p)) {
         return Err(PathOpsError::BadInput);
     }
-    let closed_paths: Vec<BezPath> = paths.iter().map(|(p, _)| closed(p)).collect();
+    // Self-intersecting or self-overlapping inputs (a centred stroke outlined around a sharp
+    // corner folds over itself and touches the shape's fill) leave the winding on each side of a
+    // segment ambiguous where they touch, which made the sweep report overlapping faces. Reducing
+    // every input to the simple contours of the area it fills first keeps the faces disjoint.
+    let closed_paths: Vec<BezPath> = paths.iter().map(|(p, even_odd)| plain(&closed(p), *even_odd)).collect();
     if closed_paths.iter().all(|p| p.elements().is_empty()) {
         return Ok(Vec::new());
     }
     let bbox = closed_paths.iter().filter(|p| !p.elements().is_empty()).map(Shape::bounding_box).reduce(|a, b| a.union(b));
     let m = bbox.map(|b| b.x0.abs().max(b.x1.abs()).max(b.y0.abs()).max(b.y1.abs())).unwrap_or(0.0);
     let eps = (m * f64::EPSILON * 64.0).max(1e-6);
+    sweep(|| arrange(&closed_paths, eps))
+}
+
+/// The area `path` fills under `even_odd` as simple contours (self-intersections and overlapping
+/// subpaths resolved), which both fill rules then cover the same. A path the sweep can't handle
+/// comes back unchanged, so [`faces`] still tries it as it is.
+fn plain(path: &BezPath, even_odd: bool) -> BezPath {
+    if path.elements().is_empty() {
+        return BezPath::new();
+    }
+    let rule = if even_odd { linesweeper::FillRule::EvenOdd } else { linesweeper::FillRule::NonZero };
+    let swept = sweep(|| linesweeper::binary_op(path, &BezPath::new(), rule, linesweeper::BinaryOp::Union).map_err(|_| PathOpsError::BadInput));
+    let Ok(contours) = swept else { return path.clone() };
+    let mut out = BezPath::new();
+    for c in contours.contours() {
+        out.extend(c.path.elements().iter().copied());
+    }
+    out
+}
+
+/// [`faces`] of the closed, simple `paths`, swept with tolerance `eps`.
+fn arrange(closed_paths: &[BezPath], eps: f64) -> Result<Vec<ArrangementFace>, PathOpsError> {
     let topo = linesweeper::topology::Topology::<Windings>::from_paths(closed_paths.iter().enumerate().map(|(i, p)| (p, i)), eps)
         .map_err(|_| PathOpsError::BadInput)?;
-    let even_odd: Vec<bool> = paths.iter().map(|(_, e)| *e).collect();
-    let cover_of = |w: &Windings| -> Vec<usize> {
-        w.0.iter()
-            .enumerate()
-            .filter(|(i, n)| if even_odd.get(*i).copied().unwrap_or(false) { *n % 2 != 0 } else { **n != 0 })
-            .map(|(i, _)| i)
-            .collect()
-    };
+    // Every path was reduced to simple contours, so either rule covers the same area: non-zero.
+    let cover_of = |w: &Windings| -> Vec<usize> { w.0.iter().enumerate().filter(|(_, n)| **n != 0).map(|(i, _)| i).collect() };
     // Every coverage that occurs on either side of an output segment.
     let mut covers: std::collections::BTreeSet<Vec<usize>> = std::collections::BTreeSet::new();
     for seg in topo.segment_indices() {
@@ -258,17 +292,24 @@ pub(crate) fn kjoin(j: StrokeJoin) -> Join {
     }
 }
 
-/// Plain centred stroke of `path` at `width`.
+/// The widest stroke outlined: past this the rasteriser's fixed-point maths overflows and panics,
+/// and nothing visible changes (a stroke this wide covers any canvas already).
+pub const MAX_STROKE_WIDTH: f64 = 1e6;
+
+/// Plain centred stroke of `path` at `width` (capped at [`MAX_STROKE_WIDTH`]).
 pub fn stroke_center(path: &BezPath, width: f64, props: &StrokeProps) -> BezPath {
     if !(width.is_finite() && width > 0.0 && finite(path)) {
         return BezPath::new();
     }
+    let width = width.min(MAX_STROKE_WIDTH);
     let mut style = kurbo::Stroke::new(width)
         .with_join(kjoin(props.join))
         .with_miter_limit(props.miter_limit.clamp(1.0, 100.0))
         .with_start_cap(kcap(props.cap_start))
         .with_end_cap(kcap(props.cap_end));
-    if let Some(pat) = width::dash_pattern(props) {
+    // Each subpath restarts the pattern, so it can add up to one more pattern's worth of dashes.
+    let subpaths = path.elements().iter().filter(|e| matches!(e, PathEl::MoveTo(_))).count() as f64;
+    if let Some(pat) = width::dash_pattern(props).filter(|p| width::dashes_fit(path.perimeter(1.0) + subpaths * p.iter().sum::<f64>(), p)) {
         style = style.with_dashes(0.0, pat);
     }
     kurbo::stroke(path.iter(), &style, &kurbo::StrokeOpts::default(), 0.05)
@@ -284,10 +325,17 @@ pub fn stroke_outline(path: &BezPath, props: &StrokeProps, closed_shape: bool) -
 /// [`stroke_outline`] of a shape whose stroke follows vector network `net` (`path` is its stroke
 /// path): points with a cap or join of their own draw them there.
 pub fn stroke_outline_of(path: &BezPath, props: &StrokeProps, closed_shape: bool, net: Option<&VectorNetwork>) -> BezPath {
-    let w = props.weight;
-    if !(w.is_finite() && w > 0.0) {
+    if !(props.weight.is_finite() && props.weight > 0.0) {
         return BezPath::new();
     }
+    let capped;
+    let props = if props.weight > MAX_STROKE_WIDTH {
+        capped = StrokeProps { weight: MAX_STROKE_WIDTH, ..props.clone() };
+        &capped
+    } else {
+        props
+    };
+    let w = props.weight;
     let styled = net.and_then(|n| points::Styled::new(n, props));
     // Centred at `width` (twice the weight for Inside/Outside, which clip half of it away).
     let centred = |width: f64| match (&styled, &props.brush, props.profile()) {
@@ -297,16 +345,20 @@ pub fn stroke_outline_of(path: &BezPath, props: &StrokeProps, closed_shape: bool
         (None, None, None) => stroke_center(path, width, props),
     };
     let align = if closed_shape { props.align } else { StrokeAlign::Center };
+    // Inside/Outside clip against the shape's own fill, so an even-odd shape's holes stay holes.
+    let even_odd = net.is_some_and(|n| n.regions.iter().any(|r| r.winding == WindingRule::EvenOdd));
+    let clip = |s: BezPath, op: linesweeper::BinaryOp| {
+        if even_odd {
+            // The stroke overlaps itself (non-zero): flatten it to even-odd contours first.
+            simplify(&s).and_then(|s| binary_by(&s, path, linesweeper::FillRule::EvenOdd, op)).unwrap_or(s)
+        } else {
+            binary(&s, path, op).unwrap_or(s)
+        }
+    };
     let mut out = match align {
         StrokeAlign::Center => centred(w),
-        StrokeAlign::Inside => {
-            let s = centred(w * 2.0);
-            binary(&s, path, linesweeper::BinaryOp::Intersection).unwrap_or(s)
-        }
-        StrokeAlign::Outside => {
-            let s = centred(w * 2.0);
-            binary(&s, path, linesweeper::BinaryOp::Difference).unwrap_or(s)
-        }
+        StrokeAlign::Inside => clip(centred(w * 2.0), linesweeper::BinaryOp::Intersection),
+        StrokeAlign::Outside => clip(centred(w * 2.0), linesweeper::BinaryOp::Difference),
     };
     if let Some(st) = styled.as_ref().filter(|_| !closed_shape) {
         out.extend(st.arrowheads(w, props).elements().iter().copied());
@@ -324,36 +376,35 @@ pub fn stroke_outline_of(path: &BezPath, props: &StrokeProps, closed_shape: bool
 
 /// End point and outward direction of an open path at its start or end.
 fn path_end(path: &BezPath, at_end: bool) -> Option<(Point, Vec2)> {
-    let segs: Vec<PathSeg> = path.segments().collect();
-    let seg = if at_end { segs.last()? } else { segs.first()? };
     use kurbo::ParamCurve;
     use kurbo::ParamCurveDeriv;
-    let (p, d) = if at_end {
-        let d = match seg {
-            PathSeg::Line(l) => l.p1 - l.p0,
-            PathSeg::Quad(q) => q.deriv().eval(1.0).to_vec2(),
-            PathSeg::Cubic(c) => {
-                let d = c.deriv().eval(1.0).to_vec2();
-                if d.hypot() < 1e-9 { c.p3 - c.p2 } else { d }
-            }
+    let dir_of = |seg: &PathSeg| -> Option<(Point, Vec2)> {
+        let (p, d) = if at_end {
+            let d = match seg {
+                PathSeg::Line(l) => l.p1 - l.p0,
+                PathSeg::Quad(q) => q.deriv().eval(1.0).to_vec2(),
+                PathSeg::Cubic(c) => {
+                    let d = c.deriv().eval(1.0).to_vec2();
+                    if d.hypot() < 1e-9 { c.p3 - c.p2 } else { d }
+                }
+            };
+            (seg.end(), d)
+        } else {
+            let d = match seg {
+                PathSeg::Line(l) => l.p0 - l.p1,
+                PathSeg::Quad(q) => -q.deriv().eval(0.0).to_vec2(),
+                PathSeg::Cubic(c) => {
+                    let d = -c.deriv().eval(0.0).to_vec2();
+                    if d.hypot() < 1e-9 { c.p0 - c.p1 } else { d }
+                }
+            };
+            (seg.start(), d)
         };
-        (seg.end(), d)
-    } else {
-        let d = match seg {
-            PathSeg::Line(l) => l.p0 - l.p1,
-            PathSeg::Quad(q) => -q.deriv().eval(0.0).to_vec2(),
-            PathSeg::Cubic(c) => {
-                let d = -c.deriv().eval(0.0).to_vec2();
-                if d.hypot() < 1e-9 { c.p0 - c.p1 } else { d }
-            }
-        };
-        (seg.start(), d)
+        let len = d.hypot();
+        (len >= 1e-12).then(|| (p, d / len))
     };
-    let len = d.hypot();
-    if len < 1e-12 {
-        return None;
-    }
-    Some((p, d / len))
+    // Skip zero-length segments (repeated vertices) and use the nearest one with a direction.
+    if at_end { path.segments().collect::<Vec<_>>().iter().rev().find_map(dir_of) } else { path.segments().find_map(|s| dir_of(&s)) }
 }
 
 /// The filled arrowhead shape for `cap` at one end of an open path.
@@ -427,6 +478,104 @@ pub fn rect_side_strokes(w: f64, h: f64, sides: [f64; 4], align: StrokeAlign) ->
     p
 }
 
+/// Per-side stroke of a rectangle with corner radii `[tl, tr, br, bl]`, like CSS borders: the outer
+/// edge is the rounded rectangle (center and outside grow its box by half or all of each side's
+/// weight, and each non-zero radius with it); the inner edge is inset by each side's weight, with
+/// elliptical corners `max(0, R − weight)` across and down (square where either is 0). Corners
+/// that stay circular are smoothed like the shape's. An even-odd ring whose inner edge runs against
+/// the outer one, so it is a ring under non-zero too.
+pub fn rounded_side_strokes(w: f64, h: f64, radii: [f64; 4], smoothing: f64, sides: [f64; 4], align: StrokeAlign) -> BezPath {
+    let [t, r, b, l] = sides.map(non_negative);
+    if t + r + b + l <= 0.0 {
+        return BezPath::new();
+    }
+    let f = match align {
+        StrokeAlign::Inside => 0.0,
+        StrokeAlign::Center => 0.5,
+        StrokeAlign::Outside => 1.0,
+    };
+    // Clamped like the fill: at most half the shorter side.
+    let max_r = non_negative(w.min(h)) / 2.0;
+    let radii = radii.map(|v| non_negative(v).min(max_r));
+    // Each corner's radius with the weights across and down it, clockwise from the top-left.
+    let corners = [(radii[0], l, t), (radii[1], r, t), (radii[2], r, b), (radii[3], l, b)];
+    let outer = if align == StrokeAlign::Inside {
+        figcraft_geom::rounded_rect(w, h, radii, smoothing)
+    } else {
+        let grown = corners.map(|(rr, x, y)| if rr > 0.0 { (rr + x * f, rr + y * f) } else { (0.0, 0.0) });
+        corner_rect(figcraft_geom::Rect::new(-l * f, -t * f, w + r * f, h + b * f), grown, smoothing)
+    };
+    let k = 1.0 - f;
+    let inner = figcraft_geom::Rect::new(l * k, t * k, w - r * k, h - b * k);
+    if inner.width() <= 0.0 || inner.height() <= 0.0 {
+        return outer;
+    }
+    let (inset, fit) = fit_corners(inner, corners.map(|(rr, x, y)| ((rr - x * k).max(0.0), (rr - y * k).max(0.0))));
+    // The hole's corners sit on the outer ones, inside them, unless they were shrunk to fit or
+    // smoothed: then it may leave the outer edge.
+    ring(outer, &corner_rect(inner, inset, smoothing), fit < 1.0 || smoothing > 0.0)
+}
+
+/// Rectangle `r` with `(rx, ry)` corners, smoothed like `figcraft_geom::rounded_rect` where every
+/// corner is circular (smoothing is defined for those only).
+fn corner_rect(r: figcraft_geom::Rect, corners: [(f64, f64); 4], smoothing: f64) -> BezPath {
+    if smoothing > 0.0 && corners.iter().all(|(rx, ry)| rx == ry) {
+        return kurbo::Affine::translate((r.x0, r.y0)) * figcraft_geom::rounded_rect(r.width(), r.height(), corners.map(|c| c.0), smoothing);
+    }
+    elliptical_rect(r, corners)
+}
+
+fn non_negative(v: f64) -> f64 {
+    if v.is_finite() { v.max(0.0) } else { 0.0 }
+}
+
+/// `outer` with `hole` taken out: cut out of it when the hole may leave it, else as an even-odd
+/// ring whose hole runs against it.
+fn ring(outer: BezPath, hole: &BezPath, cut: bool) -> BezPath {
+    if cut && let Ok(p) = boolean_step(&outer, hole, BoolOp::Subtract) {
+        return p;
+    }
+    let mut p = outer;
+    p.extend(hole.reverse_subpaths().elements().iter().copied());
+    p
+}
+
+/// Corner radii `(rx, ry)` for the inner box `inner`, square where either is 0, all shrunk by one
+/// factor (returned too) where two on an edge add up to more than it, as CSS shrinks radii.
+fn fit_corners(inner: figcraft_geom::Rect, corners: [(f64, f64); 4]) -> ([(f64, f64); 4], f64) {
+    let c = corners.map(|(rx, ry)| if rx > 0.0 && ry > 0.0 { (rx, ry) } else { (0.0, 0.0) });
+    let [tl, tr, br, bl] = c;
+    let edges = [(inner.width(), tl.0 + tr.0), (inner.width(), bl.0 + br.0), (inner.height(), tl.1 + bl.1), (inner.height(), tr.1 + br.1)];
+    let fit = edges.iter().filter(|(_, sum)| *sum > 0.0).fold(1.0_f64, |m, (len, sum)| m.min(len / sum));
+    (c.map(|(rx, ry)| (rx * fit, ry * fit)), fit)
+}
+
+/// Rectangle `r` with an `(rx, ry)` quarter ellipse at each corner `[tl, tr, br, bl]`, drawn like
+/// `figcraft_geom::rounded_rect` (circular corners come out the same).
+fn elliptical_rect(r: figcraft_geom::Rect, [tl, tr, br, bl]: [(f64, f64); 4]) -> BezPath {
+    use std::f64::consts::{FRAC_PI_2, PI};
+    // Each corner, the direction of its ellipse centre from it, and the angle its quarter starts at.
+    let quarters = [
+        (Point::new(r.x1, r.y0), (-1.0, 1.0), tr, -FRAC_PI_2),
+        (Point::new(r.x1, r.y1), (-1.0, -1.0), br, 0.0),
+        (Point::new(r.x0, r.y1), (1.0, -1.0), bl, FRAC_PI_2),
+        (Point::new(r.x0, r.y0), (1.0, 1.0), tl, PI),
+    ];
+    let mut p = BezPath::new();
+    p.move_to((r.x0 + tl.0, r.y0));
+    for (corner, (sx, sy), (rx, ry), start) in quarters {
+        if rx > 0.0 && ry > 0.0 {
+            let c = Point::new(corner.x + sx * rx, corner.y + sy * ry);
+            p.line_to((c.x + rx * start.cos(), c.y + ry * start.sin()));
+            kurbo::Arc::new(c, (rx, ry), start, FRAC_PI_2, 0.0).to_cubic_beziers(0.01, |a, b, e| p.curve_to(a, b, e));
+        } else {
+            p.line_to(corner);
+        }
+    }
+    p.close_path();
+    p
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -441,6 +590,53 @@ mod tests {
         p.area().abs()
     }
 
+    /// A five-pointed star with sharp tips, and its centred stroke, whose outline folds over
+    /// itself at every tip (a self-intersecting non-zero input that touches the star's fill).
+    fn star_and_stroke() -> (BezPath, BezPath) {
+        let mut star = BezPath::new();
+        for i in 0..10 {
+            let a = -std::f64::consts::FRAC_PI_2 + i as f64 * std::f64::consts::PI / 5.0;
+            let r = if i % 2 == 0 { 100.0 } else { 40.0 };
+            let p = (150.0 + r * a.cos(), 150.0 + r * a.sin());
+            if i == 0 {
+                star.move_to(p);
+            } else {
+                star.line_to(p);
+            }
+        }
+        star.close_path();
+        (star.clone(), stroke_center(&star, 8.0, &StrokeProps::default()))
+    }
+
+    #[test]
+    fn self_intersecting_inputs_make_disjoint_faces() {
+        let (star, ring) = star_and_stroke();
+        // The stroke outline really is self-intersecting: its winding is 2 at the tips.
+        assert_eq!(ring.winding(Point::new(150.0, 56.0)), 2);
+        let f = faces(&[(star.clone(), false), (ring.clone(), false)]).unwrap();
+        let mut got: Vec<Vec<usize>> = f.iter().map(|x| x.cover.clone()).collect();
+        got.sort();
+        assert_eq!(got, vec![vec![0], vec![0, 1], vec![1]], "the star's inside, its stroke's inner half, its outer half");
+        // Faces never overlap: no face's interior point is inside another face.
+        for (i, a) in f.iter().enumerate() {
+            let Some(p) = figcraft_doc::vector_faces::interior_point(&a.path) else { continue };
+            for (j, b) in f.iter().enumerate() {
+                assert!(i == j || b.path.winding(p) == 0, "faces {i} and {j} overlap at {p:?}");
+            }
+        }
+        // They cover exactly what the two shapes paint together.
+        let painted = boolean(&[star, ring], BoolOp::Union).unwrap();
+        let all = union_faces(f.iter().map(|x| &x.path)).unwrap();
+        assert!((all.area().abs() - painted.area().abs()).abs() < 0.5, "{} vs {}", all.area().abs(), painted.area().abs());
+    }
+
+    #[test]
+    fn a_panic_in_the_sweep_is_bad_input() {
+        let r: Result<(), PathOpsError> = sweep(|| panic!("sweep bug"));
+        assert!(matches!(r, Err(PathOpsError::BadInput)));
+        assert!(matches!(sweep(|| Ok(1)), Ok(1)));
+    }
+
     #[test]
     fn union_intersect_subtract_exclude() {
         let a = sq(0.0, 0.0, 10.0);
@@ -525,6 +721,73 @@ mod tests {
         assert!(arrowhead(&BezPath::new(), StrokeCap::LineArrow, 1.0, true).is_none());
     }
 
+    #[test]
+    fn equal_point_joins_keep_the_layer_stroke_and_differing_ones_apply() {
+        let mut path = BezPath::new();
+        path.move_to((0.0, 0.0));
+        path.line_to((10.0, 10.0));
+        path.line_to((20.0, 0.0));
+        let net = VectorNetwork {
+            vertices: vec![
+                figcraft_doc::Vertex { cap: Some(StrokeCap::Square), ..figcraft_doc::Vertex::new(0.0, 0.0) },
+                figcraft_doc::Vertex { x: 10.0, y: 10.0, radius: 2.0, join: Some(StrokeJoin::Miter), ..figcraft_doc::Vertex::new(10.0, 10.0) },
+                figcraft_doc::Vertex { cap: Some(StrokeCap::Square), ..figcraft_doc::Vertex::new(20.0, 0.0) },
+            ],
+            segments: vec![figcraft_doc::Segment::line(0, 1), figcraft_doc::Segment::line(1, 2)],
+            ..Default::default()
+        };
+        let props = StrokeProps { weight: 4.0, ..Default::default() };
+        let inherited = stroke_outline_of(&path, &props, false, Some(&net));
+        let mut without_join = net.clone();
+        without_join.vertices[1].join = None;
+        let baseline = stroke_outline_of(&path, &props, false, Some(&without_join));
+        assert_eq!(inherited, baseline);
+
+        let different_layer = StrokeProps { join: StrokeJoin::Bevel, ..props };
+        let explicit = stroke_outline_of(&path, &different_layer, false, Some(&net));
+        let layer_only = stroke_outline_of(&path, &different_layer, false, Some(&without_join));
+        assert_ne!(explicit, layer_only);
+    }
+
+    #[test]
+    fn layer_end_arrow_is_drawn_when_a_closed_run_follows_the_open_one() {
+        let verts = [(0.0, 0.0), (50.0, 0.0), (0.0, 100.0), (50.0, 100.0), (25.0, 150.0)];
+        let net = VectorNetwork {
+            vertices: verts
+                .iter()
+                .enumerate()
+                .map(|(i, &(x, y))| figcraft_doc::Vertex { cap: (i == 0).then_some(StrokeCap::Round), ..figcraft_doc::Vertex::new(x, y) })
+                .collect(),
+            segments: vec![
+                figcraft_doc::Segment::line(0, 1),
+                figcraft_doc::Segment::line(2, 3),
+                figcraft_doc::Segment::line(3, 4),
+                figcraft_doc::Segment::line(4, 2),
+            ],
+            ..Default::default()
+        };
+        let path = BezPath::new();
+        let plain = StrokeProps { weight: 2.0, ..Default::default() };
+        let arrow = StrokeProps { cap_end: StrokeCap::TriangleArrow, ..plain.clone() };
+        assert_ne!(stroke_outline_of(&path, &arrow, false, Some(&net)), stroke_outline_of(&path, &plain, false, Some(&net)));
+    }
+
+    #[test]
+    fn equal_joins_do_not_break_closed_stroke_runs() {
+        let path = sq(0.0, 0.0, 20.0);
+        let mut net = VectorNetwork::from_points(&[Point::new(0.0, 0.0), Point::new(20.0, 0.0), Point::new(20.0, 20.0), Point::new(0.0, 20.0)], true);
+        for vertex in &mut net.vertices {
+            vertex.join = Some(StrokeJoin::Round);
+        }
+        let props = StrokeProps { join: StrokeJoin::Round, weight: 4.0, ..Default::default() };
+        let styled = stroke_outline_of(&path, &props, true, Some(&net));
+        for vertex in &mut net.vertices {
+            vertex.join = None;
+        }
+        let inherited = stroke_outline_of(&path, &props, true, Some(&net));
+        assert_eq!(styled, inherited);
+    }
+
     #[test]
     fn dashes() {
         let mut line = BezPath::new();
@@ -534,4 +797,75 @@ mod tests {
         let s = stroke_center(&line, 2.0, &props);
         assert!((s.area().abs() - 100.0).abs() < 2.0, "{}", s.area());
     }
+
+    #[test]
+    fn a_dash_pattern_too_fine_for_its_path_strokes_solid() {
+        // ~500k dashes on this line (#1060): drawn solid, as a variable width stroke is past
+        // `MAX_DASHES`, rather than one outline per dash.
+        let mut line = BezPath::new();
+        line.move_to((0.0, 0.0));
+        line.line_to((10_000.0, 0.0));
+        let props = StrokeProps { weight: 2.0, dashes: vec![0.01, 0.01], align: StrokeAlign::Center, ..Default::default() };
+        let s = stroke_center(&line, 2.0, &props);
+        assert!(s.elements().len() < 100, "{} elements", s.elements().len());
+        assert!((s.area().abs() - 20_000.0).abs() < 10.0, "{}", s.area());
+    }
+
+    #[test]
+    fn each_subpath_restarting_the_dash_pattern_counts_toward_the_limit() {
+        // The pattern restarts at every subpath: on 10,000 short lines its 199 tiny dashes come
+        // round each time (~1M dashes), though the length alone suggests a few hundred.
+        let mut path = BezPath::new();
+        for i in 0..10_000 {
+            path.move_to((0.0, f64::from(i) * 4.0));
+            path.line_to((2.0, f64::from(i) * 4.0));
+        }
+        let mut dashes = vec![0.01; 199];
+        dashes.push(10_000.0);
+        let props = StrokeProps { weight: 1.0, dashes, align: StrokeAlign::Center, ..Default::default() };
+        let s = stroke_center(&path, 1.0, &props);
+        assert!(s.elements().len() < 100_000, "{} elements", s.elements().len());
+    }
+
+    #[test]
+    fn inside_and_outside_strokes_respect_an_even_odd_hole() {
+        // A ring: both loops run the same way, so only the even-odd rule leaves the hole open.
+        let mut ring = sq(0.0, 0.0, 100.0);
+        ring.extend(sq(30.0, 30.0, 40.0).elements().iter().copied());
+        let mut net = VectorNetwork::from_path(&ring);
+        for r in &mut net.regions {
+            r.winding = figcraft_doc::WindingRule::EvenOdd;
+        }
+        let (material, hole) = (Point::new(29.0, 50.0), Point::new(31.0, 50.0));
+        let inside = StrokeProps { weight: 4.0, align: StrokeAlign::Inside, ..Default::default() };
+        let s = stroke_outline_of(&ring, &inside, true, Some(&net));
+        assert_ne!(s.winding(material), 0, "inside stroke misses the material");
+        assert_eq!(s.winding(hole), 0, "inside stroke leaks into the hole");
+        let outside = StrokeProps { align: StrokeAlign::Outside, ..inside.clone() };
+        let s = stroke_outline_of(&ring, &outside, true, Some(&net));
+        assert_eq!(s.winding(material), 0, "outside stroke covers the material");
+        assert_ne!(s.winding(hole), 0, "outside stroke misses the hole");
+        // Non-zero: the inner loop doesn't cut a hole, so its inside stroke covers both sides.
+        let nz = VectorNetwork::from_path(&ring);
+        let s = stroke_outline_of(&ring, &inside, true, Some(&nz));
+        assert!(s.winding(material) != 0 && s.winding(hole) != 0);
+    }
+
+    #[test]
+    fn arrowhead_skips_zero_length_end_segments() {
+        let mut p = BezPath::new();
+        p.move_to((0.0, 0.0));
+        p.line_to((100.0, 0.0));
+        assert!(arrowhead(&p, StrokeCap::TriangleArrow, 2.0, true).is_some());
+        p.line_to((100.0, 0.0));
+        let (tip, dir) = path_end(&p, true).expect("end direction");
+        assert_eq!((tip, dir), (Point::new(100.0, 0.0), Vec2::new(1.0, 0.0)));
+        assert!(arrowhead(&p, StrokeCap::TriangleArrow, 2.0, true).is_some());
+        let mut q = BezPath::new();
+        q.move_to((0.0, 0.0));
+        q.line_to((0.0, 0.0));
+        q.line_to((100.0, 0.0));
+        let (tip, dir) = path_end(&q, false).expect("start direction");
+        assert_eq!((tip, dir), (Point::new(0.0, 0.0), Vec2::new(-1.0, 0.0)));
+    }
 }
diff --git a/crates/pathops/src/points.rs b/crates/pathops/src/points.rs
index d432da05..650f309f 100644
--- a/crates/pathops/src/points.rs
+++ b/crates/pathops/src/points.rs
@@ -18,11 +18,17 @@ pub(crate) struct Styled {
 impl Styled {
     /// `None` when no point has a style of its own, or the stroke is dashed, variable or a brush.
     /// shortcut: dashed, variable-width and brush strokes keep the layer's caps and joins at every point; stroke them run by run too if asked for.
+    /// Joins equal to the layer do not require styled runs; stored overrides remain unchanged.
     pub(crate) fn new(net: &VectorNetwork, props: &StrokeProps) -> Option<Styled> {
-        if !net.has_point_styles() || !props.dashes.is_empty() || props.profile().is_some() || props.brush.is_some() {
+        if !net.has_point_styles(props.join) || !props.dashes.is_empty() || props.profile().is_some() || props.brush.is_some() {
             return None;
         }
-        let net = net.rounded().unwrap_or_else(|| net.clone());
+        let mut net = net.rounded().unwrap_or_else(|| net.clone());
+        for vertex in &mut net.vertices {
+            if vertex.join == Some(props.join) {
+                vertex.join = None;
+            }
+        }
         let runs = net.stroke_runs();
         let mut degrees = vec![0usize; net.vertices.len()];
         for s in &net.segments {
@@ -80,8 +86,8 @@ impl Styled {
     /// and last end (as without point styles).
     pub(crate) fn arrowheads(&self, weight: f64, props: &StrokeProps) -> BezPath {
         let mut out = BezPath::new();
-        let last = self.runs.len().saturating_sub(1);
-        for (k, run) in self.runs.iter().enumerate().filter(|(_, r)| !r.closed) {
+        let last = self.runs.iter().filter(|r| !r.closed).count().saturating_sub(1);
+        for (k, run) in self.runs.iter().filter(|r| !r.closed).enumerate() {
             let start = self.cap_at(run.start, if k == 0 { props.cap_start } else { StrokeCap::None });
             let end = self.cap_at(run.end, if k == last { props.cap_end } else { StrokeCap::None });
             for (at_end, cap) in [(false, start), (true, end)] {
diff --git a/crates/pathops/src/rounded_side_strokes_tests.rs b/crates/pathops/src/rounded_side_strokes_tests.rs
new file mode 100644
index 00000000..9c2f387e
--- /dev/null
+++ b/crates/pathops/src/rounded_side_strokes_tests.rs
@@ -0,0 +1,124 @@
+//! Per-side stroke weights on rounded rectangles, drawn like CSS borders: square corners, a bar
+//! along a rounded edge, tapers through corners, alignments, inner corners that no longer fit,
+//! smoothing and degenerate weights.
+
+use figcraft_doc::StrokeAlign;
+use figcraft_geom::kurbo::{BezPath, Point, Shape};
+use figcraft_geom::rounded_rect;
+
+use crate::{rect_side_strokes, rounded_side_strokes};
+
+const W: f64 = 120.0;
+const H: f64 = 60.0;
+
+/// The area of a ring whose hole runs against its outer edge.
+fn area(p: &BezPath) -> f64 {
+    p.area().abs()
+}
+
+fn painted(p: &BezPath, x: f64, y: f64) -> bool {
+    p.winding(Point::new(x, y)) % 2 != 0
+}
+
+#[test]
+fn square_corners_paint_what_rect_side_strokes_paints() {
+    for align in [StrokeAlign::Inside, StrokeAlign::Center, StrokeAlign::Outside] {
+        let sides = [1.0, 2.0, 3.0, 4.0];
+        let a = area(&rounded_side_strokes(W, H, [0.0; 4], 0.0, sides, align));
+        assert!((a - area(&rect_side_strokes(W, H, sides, align))).abs() < 1e-6, "{align:?}: {a}");
+    }
+}
+
+/// `border-l-4 rounded-r-lg`.
+#[test]
+fn a_left_border_on_a_right_rounded_box_is_a_straight_bar() {
+    let bar = rounded_side_strokes(W, H, [0.0, 8.0, 8.0, 0.0], 0.0, [0.0, 0.0, 0.0, 4.0], StrokeAlign::Inside);
+    assert!((area(&bar) - 4.0 * H).abs() < 1e-6, "{}", area(&bar));
+    assert!(painted(&bar, 2.0, 30.0));
+    for (x, y) in [(119.9, 30.0), (117.0, 1.0), (60.0, 0.1), (60.0, 59.9), (4.1, 30.0)] {
+        assert!(!painted(&bar, x, y), "({x}, {y})");
+    }
+}
+
+#[test]
+fn one_weight_on_every_side_is_the_uniform_ring() {
+    let ring = rounded_side_strokes(W, H, [8.0; 4], 0.0, [2.0; 4], StrokeAlign::Inside);
+    let want = area(&rounded_rect(W, H, [8.0; 4], 0.0)) - area(&rounded_rect(W - 4.0, H - 4.0, [6.0; 4], 0.0));
+    assert!((area(&ring) - want).abs() < 1e-6, "{} vs {want}", area(&ring));
+    assert_eq!(ring.winding(Point::new(60.0, 30.0)), 0, "a hole under non-zero too");
+}
+
+#[test]
+fn center_and_outside_grow_the_box_and_its_corners() {
+    for (align, out, inset) in [(StrokeAlign::Center, 1.0, 1.0), (StrokeAlign::Outside, 2.0, 0.0)] {
+        let a = area(&rounded_side_strokes(W, H, [8.0; 4], 0.0, [2.0; 4], align));
+        let outer = area(&rounded_rect(W + 2.0 * out, H + 2.0 * out, [8.0 + out; 4], 0.0));
+        let hole = area(&rounded_rect(W - 2.0 * inset, H - 2.0 * inset, [8.0 - inset; 4], 0.0));
+        assert!((a - (outer - hole)).abs() < 1e-6, "{align:?}: {a} vs {}", outer - hole);
+    }
+}
+
+/// 8 × 7 inner ellipses at the bottom corners.
+#[test]
+fn a_bottom_border_tapers_into_the_bottom_corners() {
+    let bottom = rounded_side_strokes(W, H, [8.0; 4], 0.0, [0.0, 0.0, 1.0, 0.0], StrokeAlign::Inside);
+    assert!(painted(&bottom, 60.0, 59.5) && painted(&bottom, 8.0, 59.5) && painted(&bottom, 112.0, 59.5));
+    for (x, y) in [(60.0, 0.5), (0.5, 30.0), (0.5, 52.0), (119.5, 52.0), (4.0, 4.0)] {
+        assert!(!painted(&bottom, x, y), "({x}, {y})");
+    }
+}
+
+#[test]
+fn a_weight_past_the_radius_leaves_square_inner_corners() {
+    let top = rounded_side_strokes(W, H, [8.0; 4], 0.0, [10.0, 0.0, 0.0, 2.0], StrokeAlign::Inside);
+    assert!(!painted(&top, 2.2, 10.2) && !painted(&top, 119.8, 10.2));
+    assert!(painted(&top, 60.0, 9.8) && painted(&top, 1.8, 30.0));
+}
+
+/// A weight past `w − R` leaves inner corners wider than the inner box: they shrink to fit, so the
+/// hole stays inside the outer edge, across or down.
+#[test]
+fn inner_corners_shrink_to_fit_a_narrow_inner_box() {
+    let wide = rounded_side_strokes(20.0, 20.0, [10.0; 4], 0.0, [0.0, 0.0, 0.0, 12.0], StrokeAlign::Inside);
+    assert!(painted(&wide, 6.0, 10.0) && !painted(&wide, 16.0, 10.0));
+    assert!(!painted(&wide, 17.5, 3.0) && !painted(&wide, 17.5, 17.0), "nothing past the outer edge");
+    let tall = rounded_side_strokes(20.0, 20.0, [10.0; 4], 0.0, [12.0, 0.0, 0.0, 0.0], StrokeAlign::Inside);
+    assert!(painted(&tall, 10.0, 6.0) && !painted(&tall, 10.0, 16.0));
+    assert!(!painted(&tall, 3.0, 17.5) && !painted(&tall, 17.0, 17.5), "nothing past the outer edge");
+    let pill = rounded_side_strokes(30.0, 20.0, [10.0; 4], 0.0, [0.0, 0.0, 0.0, 25.0], StrokeAlign::Inside);
+    assert!(painted(&pill, 12.0, 10.0) && !painted(&pill, 27.0, 10.0));
+    assert!(!painted(&pill, 24.0, 0.5) && !painted(&pill, 24.0, 19.5), "nothing past the outer edge");
+}
+
+#[test]
+fn smoothed_corners_keep_the_stroke_inside_the_fill() {
+    let smooth = rounded_side_strokes(W, H, [16.0; 4], 0.6, [0.0, 0.0, 2.0, 0.0], StrokeAlign::Inside);
+    let fill = rounded_rect(W, H, [16.0; 4], 0.6);
+    let grid = (0..1200).flat_map(|i| (0..600).map(move |j| Point::new(f64::from(i) * 0.1 + 0.05, f64::from(j) * 0.1 + 0.05)));
+    let stray = grid.filter(|pt| painted(&smooth, pt.x, pt.y) && (pt.y < H / 2.0 || fill.winding(*pt) == 0));
+    assert_eq!(stray.count(), 0, "painted outside the fill or along the top");
+    assert!(painted(&smooth, 60.0, 59.5));
+}
+
+#[test]
+fn center_and_outside_strokes_follow_smoothed_corners() {
+    for (align, out, inset) in [(StrokeAlign::Center, 1.0, 1.0), (StrokeAlign::Outside, 2.0, 0.0)] {
+        let a = area(&rounded_side_strokes(W, H, [16.0; 4], 0.6, [2.0; 4], align));
+        let outer = area(&rounded_rect(W + 2.0 * out, H + 2.0 * out, [16.0 + out; 4], 0.6));
+        let hole = area(&rounded_rect(W - 2.0 * inset, H - 2.0 * inset, [16.0 - inset; 4], 0.6));
+        assert!((a - (outer - hole)).abs() < 1e-3, "{align:?}: {a} vs {}", outer - hole);
+    }
+}
+
+#[test]
+fn weights_wider_than_the_box_leave_the_outer_edge() {
+    let full = rounded_side_strokes(20.0, 10.0, [4.0; 4], 0.0, [6.0; 4], StrokeAlign::Inside);
+    assert!((area(&full) - area(&rounded_rect(20.0, 10.0, [4.0; 4], 0.0))).abs() < 1e-6);
+}
+
+#[test]
+fn no_weight_paints_nothing() {
+    assert!(rounded_side_strokes(W, H, [8.0; 4], 0.0, [0.0; 4], StrokeAlign::Inside).elements().is_empty());
+    let junk = [f64::NAN, -4.0, f64::INFINITY, 0.0];
+    assert!(rounded_side_strokes(W, H, [8.0; 4], 0.0, junk, StrokeAlign::Inside).elements().is_empty());
+}
diff --git a/crates/pathops/src/width.rs b/crates/pathops/src/width.rs
index 03240284..312c5b91 100644
--- a/crates/pathops/src/width.rs
+++ b/crates/pathops/src/width.rs
@@ -17,7 +17,7 @@ pub use figcraft_geom::measure::{Polyline, polylines};
 /// Every subpath gets at least this many width samples, so the width varies smoothly along long
 /// straight runs.
 const SAMPLES_PER_SUBPATH: f64 = 128.0;
-/// The most dashes a dashed variable width stroke makes.
+/// The most dashes a dashed stroke makes ([`dashes_fit`]).
 const MAX_DASHES: usize = 20_000;
 
 /// The nearest point of the stroke path to `p`: (subpath index, t by length, distance).
@@ -242,6 +242,12 @@ pub fn dash_pattern(props: &StrokeProps) -> Option<Vec<f64>> {
     Some(if dashes.len() % 2 == 1 { [dashes.clone(), dashes].concat() } else { dashes })
 }
 
+/// Whether `pattern` (from [`dash_pattern`]) makes at most [`MAX_DASHES`] dashes along `len`;
+/// past that a stroke draws solid instead of one outline per dash (#1060).
+pub(crate) fn dashes_fit(len: f64, pattern: &[f64]) -> bool {
+    len / pattern.iter().sum::<f64>() * (pattern.len() as f64) < MAX_DASHES as f64
+}
+
 /// Resample a polyline so no step is longer than `max_step`; returns the points and the length at
 /// each, or `None` past the sample budget.
 fn resample(line: &Polyline, max_step: f64, budget: &mut usize) -> Option<(Vec<Point>, Vec<f64>)> {
@@ -294,7 +300,7 @@ pub fn variable_outline(path: &BezPath, width: f64, props: &StrokeProps, profile
             })
             .collect();
         match &pattern {
-            Some(pat) if len / pat.iter().sum::<f64>() * (pat.len() as f64) < MAX_DASHES as f64 => {
+            Some(pat) if dashes_fit(len, pat) => {
                 for (p, h) in dashes(&pts, &hw, pat) {
                     outline_piece(&mut out, &p, &h, false, style);
                 }
diff --git a/crates/pdf/src/draw.rs b/crates/pdf/src/draw.rs
index 99f4e390..1ff48409 100644
--- a/crates/pdf/src/draw.rs
+++ b/crates/pdf/src/draw.rs
@@ -116,7 +116,7 @@ pub(crate) fn rule(r: figcraft_render::FillRule) -> FillRule {
 }
 
 /// The renderer's stroke fill rule: even-odd ring paths for aligned strokes, else non-zero.
-fn stroke_rule(n: &Node, closed: bool) -> FillRule {
+pub(crate) fn stroke_rule(n: &Node, closed: bool) -> FillRule {
     if n.stroke.sides.is_some() || (n.stroke.dashes.is_empty() && closed && n.stroke.align != StrokeAlign::Center) {
         FillRule::EvenOdd
     } else {
diff --git a/crates/pdf/src/tests.rs b/crates/pdf/src/tests.rs
index 3656cf1e..a696e279 100644
--- a/crates/pdf/src/tests.rs
+++ b/crates/pdf/src/tests.rs
@@ -271,3 +271,30 @@ fn sample_files() {
         std::fs::write(format!("{stem}-{}.pdf", i + 1), export_pdf(&d, &[*f], &PdfOptions::default()).unwrap()).unwrap();
     }
 }
+
+/// A tiny PNG whose header claims 30,000 × 30,000 RGBA (3.6 GB decoded) is refused when it is read,
+/// before anything is decoded: the PDF writer is craft-libs' patched krilla.
+#[test]
+fn a_png_that_decodes_too_large_is_refused() {
+    fn chunk(out: &mut Vec<u8>, kind: &[u8; 4], data: &[u8]) {
+        out.extend_from_slice(&u32::try_from(data.len()).unwrap().to_be_bytes());
+        let mut crc = flate2::Crc::new();
+        crc.update(kind);
+        crc.update(data);
+        out.extend_from_slice(kind);
+        out.extend_from_slice(data);
+        out.extend_from_slice(&crc.sum().to_be_bytes());
+    }
+    let mut ihdr = Vec::new();
+    ihdr.extend_from_slice(&30_000u32.to_be_bytes());
+    ihdr.extend_from_slice(&30_000u32.to_be_bytes());
+    ihdr.extend_from_slice(&[8, 6, 0, 0, 0]);
+    let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default());
+    std::io::Write::write_all(&mut z, &[0; 64]).unwrap();
+    let mut png = b"\x89PNG\r\n\x1a\n".to_vec();
+    chunk(&mut png, b"IHDR", &ihdr);
+    chunk(&mut png, b"IDAT", &z.finish().unwrap());
+    chunk(&mut png, b"IEND", &[]);
+    const { assert!(krilla::CRAFT_UNWIND_SAFE_DROP) };
+    assert!(krilla::image::Image::from_png(krilla::Data::from(png), true).is_err());
+}
diff --git a/crates/pdf/src/text.rs b/crates/pdf/src/text.rs
index c425404d..cb2ec7a2 100644
--- a/crates/pdf/src/text.rs
+++ b/crates/pdf/src/text.rs
@@ -5,7 +5,7 @@ use std::collections::BTreeSet;
 use std::ops::Range;
 use std::sync::Arc;
 
-use figcraft_doc::{Node, NodeKind, StrokeAlign, StrokeProps};
+use figcraft_doc::{Node, NodeKind};
 use figcraft_geom::{Affine, BezPath};
 use figcraft_text::fontdb::FontBytes;
 use figcraft_text::{Face, Glyph, TextLayout};
@@ -16,7 +16,7 @@ use krilla::text::{Font, GlyphId, KrillaGlyph};
 
 use figcraft_color::{GradientKind, Paint, PaintKind};
 
-use crate::draw::{Exporter, above, affine_ok, blend, to_xf, vector_paint};
+use crate::draw::{Exporter, above, affine_ok, blend, stroke_rule, to_xf, vector_paint};
 use crate::raster::Raster;
 
 /// Glyphs of one face and size on one line, written as one text run.
@@ -84,11 +84,11 @@ pub(crate) fn draw_text(ex: &mut Exporter, s: &mut Surface, n: &Node, xf: Affine
         }
     }
     ex.place_inner(s, inner);
-    let props = StrokeProps { align: StrokeAlign::Center, ..n.stroke.clone() };
+    // Glyph outlines are closed: inside and outside strokes clip to them, as on the canvas (#615).
     for outlines in &stroked {
-        let area = figcraft_pathops::stroke_center(outlines, props.weight, &props);
+        let area = figcraft_render::draw::stroke_area(n, outlines, true);
         for p in &n.strokes {
-            ex.fill(s, &area, FillRule::NonZero, p, w, h, gxf);
+            ex.fill(s, &area, stroke_rule(n, true), p, w, h, gxf);
         }
     }
 }
diff --git a/crates/plugin/src/lib.rs b/crates/plugin/src/lib.rs
index 582b0e64..31e5234b 100644
--- a/crates/plugin/src/lib.rs
+++ b/crates/plugin/src/lib.rs
@@ -11,11 +11,13 @@ pub mod widget;
 
 pub use manifest::{API_VERSION, Access, MANIFEST_FILE, Manifest, Panel, Param, ParamKind, Permissions, PluginCommand};
 pub use sandbox::{ENTRY, Host, IMPORT_MODULE, Instance, Limits, PluginError, RunOutput, UiChange, check_module, run};
-pub use widget::{WidgetKind, WidgetNode, WidgetRender};
+pub use widget::{MenuItem, MenuKind, WidgetKind, WidgetNode, WidgetRender};
 
 #[cfg(test)]
 mod bundle_tests;
 #[cfg(test)]
+mod save_file_tests;
+#[cfg(test)]
 mod tests;
 #[cfg(test)]
 mod v2_tests;
diff --git a/crates/plugin/src/manifest.rs b/crates/plugin/src/manifest.rs
index 48e44e88..92cfac7b 100644
--- a/crates/plugin/src/manifest.rs
+++ b/crates/plugin/src/manifest.rs
@@ -8,7 +8,7 @@ use serde_json::{Map, Value};
 /// The manifest's file name.
 pub const MANIFEST_FILE: &str = "figcraft-plugin.json";
 /// The plugin API version this build implements (`api` in the manifest).
-pub const API_VERSION: u32 = 3;
+pub const API_VERSION: u32 = 4;
 /// Largest manifest read.
 pub const MAX_MANIFEST_BYTES: usize = 256 * 1024;
 
@@ -43,8 +43,8 @@ pub struct Manifest {
     /// The WebAssembly module, relative to the manifest (`plugin.wasm`).
     pub main: String,
     /// The plugin API version the plugin was written for (1 when not given; panels and settings
-    /// need 2, widgets 3).
-    #[serde(default = "api_version")]
+    /// need 2, widgets 3, `saveFile`, widget fields and property menus 4).
+    #[serde(default = "api_version", deserialize_with = "api_from_number_or_string")]
     pub api: u32,
     #[serde(default)]
     pub permissions: Permissions,
@@ -61,6 +61,25 @@ fn api_version() -> u32 {
     1
 }
 
+/// `api` as a whole number or a version string (`"1.0.0"`, whose major part is the API version).
+fn api_from_number_or_string<'de, D: serde::Deserializer<'de>>(d: D) -> Result<u32, D::Error> {
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum Api {
+        Number(u32),
+        Text(String),
+    }
+    match Api::deserialize(d)? {
+        Api::Number(n) => Ok(n),
+        Api::Text(s) => s
+            .trim()
+            .split('.')
+            .next()
+            .and_then(|major| major.parse().ok())
+            .ok_or_else(|| serde::de::Error::custom(format!("invalid api version `{s}`"))),
+    }
+}
+
 /// What a plugin may do.
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct Permissions {
@@ -71,6 +90,10 @@ pub struct Permissions {
     /// command its access allows.
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub commands: Vec<String>,
+    /// API 4: the plugin may hand the host a file to save. The host asks the user where; the plugin
+    /// never sees a path.
+    #[serde(default, rename = "saveFile", skip_serializing_if = "std::ops::Not::not")]
+    pub save_file: bool,
 }
 
 impl Permissions {
@@ -314,6 +337,9 @@ impl Manifest {
         if self.widget && self.api < 3 {
             return Err("a widget needs plugin API 3 (`\"api\": 3`)".into());
         }
+        if self.permissions.save_file && self.api < 4 {
+            return Err("saveFile needs plugin API 4 (`\"api\": 4`)".into());
+        }
         if self.commands.is_empty() && !self.widget {
             self.commands.push(PluginCommand { id: "run".into(), label: "Run".into(), params: Vec::new() });
         }
diff --git a/crates/plugin/src/sandbox.rs b/crates/plugin/src/sandbox.rs
index 22eb0af0..c7337dca 100644
--- a/crates/plugin/src/sandbox.rs
+++ b/crates/plugin/src/sandbox.rs
@@ -2,7 +2,8 @@
 //! memory cap, and sees the outside world only through the host functions below. There is no WASI:
 //! no file system, network, clock or randomness.
 //!
-//! # ABI (version 3; version 1 is the first seven imports, version 2 adds panels and settings)
+//! # ABI (version 4; version 1 is the first seven imports, version 2 adds panels and settings,
+//! version 3 widgets, version 4 `save_file`)
 //!
 //! The module exports its `memory` and `figcraft_run(input_len: i32) -> i32`. Host functions are
 //! imported from the module `figcraft`; strings are UTF-8 `(ptr, len)` pairs in the plugin's memory.
@@ -22,6 +23,7 @@
 //! | `setting_set` | `(key_ptr, key_len, value_ptr, value_len) -> i32` | Stores JSON under the key. 1: refused, the reply says why. |
 //! | `setting_delete` | `(key_ptr, key_len)` | Forgets a setting. |
 //! | `widget_render` | `(ptr, len) -> i32` | Draws the widget being called back: a [`WidgetRender`] as JSON. 1: invalid, the reply says why. |
+//! | `save_file` | `(name_ptr, name_len, mime_ptr, mime_len, data_ptr, data_len) -> i32` | Offers a file to save (needs `permissions.saveFile`). The host asks the user where it goes; the plugin never gets a path. 0: accepted, 1: refused, the reply says why. |
 //!
 //! When `figcraft_run` starts, the reply holds the input JSON (`input_len` bytes):
 //! `{"api", "command", "params", "selection"}`, plus `event` and `values` when a panel calls the
@@ -58,6 +60,7 @@ const IMPORTS: &[(&str, usize, usize)] = &[
     ("setting_set", 4, 1),
     ("setting_delete", 2, 0),
     ("widget_render", 2, 1),
+    ("save_file", 6, 1),
 ];
 
 /// What a run may use.
@@ -136,6 +139,11 @@ pub trait Host {
     fn set_setting(&mut self, _key: &str, _value: Option<&str>) -> Result<(), String> {
         Err("settings aren't available here".into())
     }
+    /// Offer the file `name` (MIME type `mime`) for saving, or say why not. The host picks the
+    /// destination; the plugin never learns it.
+    fn save_file(&mut self, _name: &str, _mime: &str, _data: &[u8]) -> Result<(), String> {
+        Err("saving files isn't available here".into())
+    }
 }
 
 /// What a run asked of the panel.
@@ -172,6 +180,7 @@ enum Request {
     SettingGet(String),
     SettingSet(String, String),
     SettingDelete(String),
+    SaveFile(String, String, Vec<u8>),
 }
 
 struct State {
@@ -186,6 +195,12 @@ struct State {
 }
 
 impl State {
+    /// Make `message` the reply and return status 1 (refused).
+    fn refuse(&mut self, message: String) -> i32 {
+        self.set_reply(message.into_bytes());
+        1
+    }
+
     /// Make `bytes` the reply; returns its length.
     fn set_reply(&mut self, bytes: Vec<u8>) -> i32 {
         let max = self.limits.max_message;
@@ -237,6 +252,13 @@ impl State {
                 let _ = host.set_setting(&key, None);
                 None
             }
+            Request::SaveFile(name, mime, data) => Some(match host.save_file(&name, &mime, &data) {
+                Ok(()) => 0,
+                Err(m) => {
+                    self.set_reply(m.into_bytes());
+                    1
+                }
+            }),
         }
     }
 }
@@ -575,5 +597,18 @@ fn linker(engine: &Engine) -> Result<Linker<State>, PluginError> {
         Err(ask(&mut c, Request::SettingDelete(key)))
     })
     .map_err(err)?;
+    l.func_wrap(IMPORT_MODULE, "save_file", |mut c: Ctx<'_>, np: i32, nl: i32, mp: i32, ml: i32, dp: i32, dl: i32| -> Result<i32, wasmi::Error> {
+        charge(&mut c)?;
+        let name = read_str(&mut c, np, nl)?;
+        let mime = read_str(&mut c, mp, ml)?;
+        // Too much data is a refusal the plugin can handle, not a limit that fails the run.
+        let (len, max) = (dl as u32 as usize, c.data().limits.max_message);
+        if len > max {
+            return Ok(c.data_mut().refuse(format!("a file to save is limited to {max} bytes, this one has {len}")));
+        }
+        let data = read_bytes(&mut c, dp, dl)?;
+        Err(ask(&mut c, Request::SaveFile(name, mime, data)))
+    })
+    .map_err(err)?;
     Ok(l)
 }
diff --git a/crates/plugin/src/save_file_tests.rs b/crates/plugin/src/save_file_tests.rs
new file mode 100644
index 00000000..7915323f
--- /dev/null
+++ b/crates/plugin/src/save_file_tests.rs
@@ -0,0 +1,144 @@
+//! `save_file` (API 4): the manifest permission, the host call with its bytes, and the limits.
+
+use serde_json::json;
+
+use crate::{Host, Instance, Limits, Manifest, PluginError};
+
+/// A host that records the files offered to it (and refuses names starting with `no`).
+#[derive(Default)]
+struct Saves(Vec<(String, String, Vec<u8>)>);
+
+impl Host for Saves {
+    fn call(&mut self, _command: &str, _params: &str) -> Result<String, String> {
+        Ok("{}".into())
+    }
+    fn selection(&mut self) -> String {
+        "[]".into()
+    }
+    fn notify(&mut self, _message: &str) {}
+    fn save_file(&mut self, name: &str, mime: &str, data: &[u8]) -> Result<(), String> {
+        if name.starts_with("no") {
+            return Err("nope".into());
+        }
+        self.0.push((name.into(), mime.into(), data.to_vec()));
+        Ok(())
+    }
+}
+
+/// A host that keeps the default `save_file`.
+struct Plain;
+
+impl Host for Plain {
+    fn call(&mut self, _command: &str, _params: &str) -> Result<String, String> {
+        Ok("{}".into())
+    }
+    fn selection(&mut self) -> String {
+        "[]".into()
+    }
+    fn notify(&mut self, _message: &str) {}
+}
+
+/// Memory: name at 0, MIME at 100, data at 200. `call` is the arguments of `save_file`; its status
+/// is the run's status, and its reply is the output.
+fn module(name: &str, mime: &str, data: &[u8], call: &str) -> Vec<u8> {
+    let bytes = |b: &[u8]| b.iter().map(|b| format!("\\{b:02x}")).collect::<String>();
+    let wat = format!(
+        r#"(module
+          (import "figcraft" "save_file" (func $save_file (param i32 i32 i32 i32 i32 i32) (result i32)))
+          (import "figcraft" "reply_read" (func $reply_read (param i32 i32) (result i32)))
+          (import "figcraft" "set_output" (func $set_output (param i32 i32)))
+          (memory (export "memory") 1)
+          (data (i32.const 0) "{}") (data (i32.const 100) "{}") (data (i32.const 200) "{}")
+          (func (export "figcraft_run") (param $n i32) (result i32) (local $st i32)
+            (local.set $st {call})
+            (call $set_output (i32.const 1000) (call $reply_read (i32.const 1000) (i32.const 100)))
+            (local.get $st)))"#,
+        bytes(name.as_bytes()),
+        bytes(mime.as_bytes()),
+        bytes(data)
+    );
+    wat::parse_str(&wat).unwrap_or_else(|e| panic!("{e}\n{wat}"))
+}
+
+fn call(name: &str, mime: &str, data: &[u8]) -> String {
+    format!(
+        "(call $save_file (i32.const 0) (i32.const {}) (i32.const 100) (i32.const {}) (i32.const 200) (i32.const {}))",
+        name.len(),
+        mime.len(),
+        data.len()
+    )
+}
+
+fn manifest(api: u32, save_file: bool) -> String {
+    json!({"id": "org.test.save", "name": "Save", "main": "p.wasm", "api": api, "permissions": {"saveFile": save_file}}).to_string()
+}
+
+#[test]
+fn the_host_gets_the_name_the_type_and_the_exact_bytes() {
+    let data = [0u8, 1, 2, 255, 0x80, b'x'];
+    let wasm = module("out.jsx", "text/plain", &data, &call("out.jsx", "text/plain", &data));
+    let mut host = Saves::default();
+    Instance::new(&wasm, &Limits::default()).unwrap().call("{}", &mut host).unwrap();
+    assert_eq!(host.0, vec![("out.jsx".to_string(), "text/plain".to_string(), data.to_vec())]);
+}
+
+#[test]
+fn a_refusal_returns_status_one_with_the_reason() {
+    let wasm = module("no.txt", "text/plain", b"x", &call("no.txt", "text/plain", b"x"));
+    // The module returns the status as its own, so the run fails with the reason as its message.
+    let err = Instance::new(&wasm, &Limits::default()).unwrap().call("{}", &mut Saves::default()).unwrap_err();
+    assert_eq!(err, PluginError::Failed("nope".into()));
+}
+
+#[test]
+fn a_host_without_saving_refuses_by_default() {
+    let wasm = module("a.txt", "text/plain", b"x", &call("a.txt", "text/plain", b"x"));
+    let err = Instance::new(&wasm, &Limits::default()).unwrap().call("{}", &mut Plain).unwrap_err();
+    assert_eq!(err, PluginError::Failed("saving files isn't available here".into()));
+}
+
+#[test]
+fn too_much_data_is_refused_and_bad_utf8_a_trap() {
+    let limits = Limits { max_message: 64, ..Limits::default() };
+    let data = [b'x'; 65];
+    let wasm = module("a.txt", "text/plain", &data, &call("a.txt", "text/plain", &data));
+    let mut host = Saves::default();
+    // Status 1 with the reason, which the module passes on as its own failure.
+    let err = Instance::new(&wasm, &limits).unwrap().call("{}", &mut host).unwrap_err();
+    assert_eq!(err, PluginError::Failed("a file to save is limited to 64 bytes, this one has 65".into()));
+    assert!(host.0.is_empty());
+
+    // The name points at a lone 0xff byte: not UTF-8.
+    let wasm = module(
+        "a",
+        "text/plain",
+        &[0xff],
+        "(call $save_file (i32.const 200) (i32.const 1) (i32.const 100) (i32.const 1) (i32.const 200) (i32.const 1))",
+    );
+    let err = Instance::new(&wasm, &Limits::default()).unwrap().call("{}", &mut host).unwrap_err();
+    assert!(matches!(err, PluginError::Trap(_)), "{err:?}");
+    assert!(host.0.is_empty());
+}
+
+#[test]
+fn a_wrong_signature_is_rejected() {
+    let wat = r#"(module (import "figcraft" "save_file" (func (param i32 i32) (result i32)))
+        (memory (export "memory") 1) (func (export "figcraft_run") (param i32) (result i32) (i32.const 0)))"#;
+    let wasm = wat::parse_str(wat).unwrap();
+    assert!(matches!(crate::check_module(&wasm, &Limits::default()), Err(PluginError::InvalidModule(m)) if m.contains("wrong signature")));
+}
+
+#[test]
+fn the_permission_needs_api_four_and_survives_a_round_trip() {
+    let err = Manifest::parse(&manifest(3, true)).unwrap_err();
+    assert!(err.contains("saveFile needs plugin API 4"), "{err}");
+    let m = Manifest::parse(&manifest(4, true)).unwrap();
+    assert!(m.permissions.save_file);
+    let again = Manifest::parse(&serde_json::to_string(&m).unwrap()).unwrap();
+    assert_eq!(m, again);
+    assert!(serde_json::to_string(&m).unwrap().contains("\"saveFile\":true"));
+    // Older manifests stay valid and don't grow the key.
+    let old = Manifest::parse(&manifest(3, false)).unwrap();
+    assert!(!old.permissions.save_file);
+    assert!(!serde_json::to_string(&old).unwrap().contains("saveFile"));
+}
diff --git a/crates/plugin/src/tests.rs b/crates/plugin/src/tests.rs
index 5d094ab4..a2d888c9 100644
--- a/crates/plugin/src/tests.rs
+++ b/crates/plugin/src/tests.rs
@@ -441,7 +441,7 @@ fn bad_manifests_are_refused() {
         json!({"main": "C:\\plugin.wasm"}),
         json!({"main": "plugin.js"}),
         json!({"main": "a//b.wasm"}),
-        json!({"api": 4}),
+        json!({"api": 5}),
         json!({"api": 0}),
         json!({"permissions": {"access": "root"}}),
         json!({"permissions": {"commands": ["*.x"]}}),
@@ -462,3 +462,12 @@ fn bad_manifests_are_refused() {
         assert!(Manifest::parse(junk).is_err(), "accepted {}", junk.chars().take(40).collect::<String>());
     }
 }
+
+#[test]
+fn api_may_be_a_version_string() {
+    assert_eq!(manifest(json!({"api": "1.0.0"})).unwrap().api, 1);
+    assert_eq!(manifest(json!({"api": "2"})).unwrap().api, 2);
+    assert_eq!(manifest(json!({"api": 2})).unwrap().api, 2);
+    assert!(manifest(json!({"api": "5.0.0"})).is_err());
+    assert!(manifest(json!({"api": "x"})).is_err());
+}
diff --git a/crates/plugin/src/widget.rs b/crates/plugin/src/widget.rs
index 32ee7d34..be202c97 100644
--- a/crates/plugin/src/widget.rs
+++ b/crates/plugin/src/widget.rs
@@ -1,5 +1,5 @@
-//! Widgets (ABI v3): a plugin draws a layer on the canvas by describing it, and FigCraft builds the
-//! layers. The description comes from the plugin, so it is untrusted: [`WidgetRender::parse`]
+//! Widgets (ABI v3; editable text fields and a property menu since v4): a plugin draws a layer on
+//! the canvas by describing it, and FigCraft builds the layers. The description comes from the plugin, so it is untrusted: [`WidgetRender::parse`]
 //! checks its size, node count, depth, numbers, strings, colours and image sizes before the engine
 //! sees it. The engine decides where the layers go (only inside the widget's own layer).
 
@@ -24,6 +24,12 @@ const MAX_SIZE: f64 = 4000.0;
 /// Largest image (decoded bytes), and all images of one widget together.
 pub const MAX_IMAGE_BYTES: usize = 1024 * 1024;
 const MAX_IMAGES_BYTES: usize = 2 * 1024 * 1024;
+/// Longest value of an editable text field (the same as any text layer's).
+pub const MAX_FIELD_CHARS: usize = MAX_TEXT;
+/// Most items in a widget's property menu, most colours in one colour item, longest item label.
+const MAX_MENU: usize = 8;
+const MAX_SWATCHES: usize = 8;
+const MAX_MENU_LABEL: usize = 32;
 
 /// What a widget is made of: FigCraft's own layer kinds.
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
@@ -65,6 +71,10 @@ pub struct WidgetNode {
     /// Clicking this layer calls the plugin back with this name (empty: not clickable).
     #[serde(default, skip_serializing_if = "String::is_empty")]
     pub target: String,
+    /// API 4, text layers: the text is an editable field with this name; an edit calls the plugin
+    /// back with the field and its new value, which is also kept in the state under this name.
+    #[serde(default, skip_serializing_if = "String::is_empty")]
+    pub field: String,
     /// Position in the parent frame (ignored inside auto layout and for the widget itself).
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub x: Option<f64>,
@@ -119,6 +129,38 @@ pub struct WidgetRender {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub state: Option<Map<String, Value>>,
     pub root: WidgetNode,
+    /// API 4: the widget's property menu, shown while it's selected (empty: none).
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub menu: Vec<MenuItem>,
+}
+
+/// What a property menu item is.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum MenuKind {
+    /// A button.
+    #[default]
+    Action,
+    /// On or off (`checked`).
+    Toggle,
+    /// One of a few colours (`options`; `value` is the current one).
+    Color,
+}
+
+/// One item of a widget's property menu; choosing it calls the plugin back with `item`.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+pub struct MenuItem {
+    pub item: String,
+    #[serde(default, skip_serializing_if = "String::is_empty")]
+    pub label: String,
+    #[serde(rename = "type", default)]
+    pub kind: MenuKind,
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub checked: bool,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub options: Vec<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub value: Option<String>,
 }
 
 /// What one description may still use while it's checked.
@@ -141,8 +183,74 @@ impl WidgetRender {
             return Err("widget: the root must be a frame".into());
         }
         w.root.check(0, &mut Budget { nodes: 0, image_bytes: 0 }).map_err(|e| format!("widget: {e}"))?;
+        check_menu(&mut w.menu).map_err(|e| format!("widget: {e}"))?;
         Ok(w)
     }
+
+    /// Whether it uses what plugin API 4 added (fields or a menu).
+    pub fn uses_api_4(&self) -> bool {
+        fn field(n: &WidgetNode) -> bool {
+            !n.field.is_empty() || n.children.iter().any(field)
+        }
+        !self.menu.is_empty() || field(&self.root)
+    }
+}
+
+/// Check and normalise a property menu: at most [`MAX_MENU`] items with distinct names and short
+/// labels (an item's name when it has none); a colour item has 1–[`MAX_SWATCHES`] colours, its
+/// value one of them.
+pub fn check_menu(menu: &mut [MenuItem]) -> Result<(), String> {
+    if menu.len() > MAX_MENU {
+        return Err(format!("a menu has more than {MAX_MENU} items"));
+    }
+    for i in 0..menu.len() {
+        let Some(m) = menu.get_mut(i) else { continue };
+        check_id("menu item", &m.item, MAX_NAME)?;
+        m.label = clean("a menu label", &m.label, MAX_MENU_LABEL)?;
+        if m.label.is_empty() {
+            m.label.clone_from(&m.item);
+        }
+        let colours = m.kind == MenuKind::Color;
+        if m.checked && m.kind != MenuKind::Toggle {
+            return Err("`checked` is for toggles".into());
+        }
+        if colours == m.options.is_empty() || m.options.len() > MAX_SWATCHES {
+            return Err(format!("a colour item needs 1–{MAX_SWATCHES} `options` (and only it has them)"));
+        }
+        for o in &mut m.options {
+            let mut c = Some(std::mem::take(o));
+            colour("options", &mut c)?;
+            *o = c.unwrap_or_default();
+        }
+        colour("value", &mut m.value)?;
+        if m.value.as_ref().is_some_and(|v| !m.options.contains(v)) {
+            return Err("a colour item's `value` must be one of its `options`".into());
+        }
+        let item = m.item.clone();
+        if menu.get(..i).is_some_and(|before| before.iter().any(|b| b.item == item)) {
+            return Err(format!("two menu items are called `{item}`"));
+        }
+    }
+    Ok(())
+}
+
+/// An editable field's new value, cleaned: line endings become `\n`, tabs spaces, and other control
+/// characters are dropped; at most [`MAX_FIELD_CHARS`].
+pub fn clean_field(value: &str) -> Result<String, String> {
+    let v: String = value
+        .replace("\r\n", "\n")
+        .chars()
+        .filter_map(|c| match c {
+            '\r' | '\n' => Some('\n'),
+            '\t' => Some(' '),
+            c if c.is_control() => None,
+            c => Some(c),
+        })
+        .collect();
+    if v.chars().count() > MAX_FIELD_CHARS {
+        return Err(format!("a field's value is longer than {MAX_FIELD_CHARS} characters"));
+    }
+    Ok(v)
 }
 
 /// A widget's state: a JSON object of at most [`MAX_STATE_BYTES`] with short keys.
@@ -186,6 +294,9 @@ impl WidgetNode {
         if !self.target.is_empty() {
             check_id("target", &self.target, MAX_NAME)?;
         }
+        if !self.field.is_empty() {
+            check_id("field", &self.field, MAX_NAME)?;
+        }
         for (what, v) in [("x", self.x), ("y", self.y)] {
             within(what, v, -MAX_SIZE, MAX_SIZE)?;
         }
@@ -210,6 +321,7 @@ impl WidgetNode {
         )?;
         only("text", !self.text.is_empty() || self.size.is_some() || self.color.is_some() || self.bold, kind == WidgetKind::Text)?;
         only("data", !self.data.is_empty(), kind == WidgetKind::Image)?;
+        only("field", !self.field.is_empty(), kind == WidgetKind::Text)?;
         if self.text.chars().count() > MAX_TEXT {
             return Err(format!("a text is longer than {MAX_TEXT} characters"));
         }
diff --git a/crates/plugin/src/widget_tests.rs b/crates/plugin/src/widget_tests.rs
index 0d4ec2df..1074503d 100644
--- a/crates/plugin/src/widget_tests.rs
+++ b/crates/plugin/src/widget_tests.rs
@@ -3,8 +3,8 @@
 
 use serde_json::{Value, json};
 
-use crate::widget::{MAX_IMAGE_BYTES, MAX_NODES, MAX_STATE_BYTES};
-use crate::{Host, Instance, Limits, Manifest, WidgetKind, WidgetRender};
+use crate::widget::{MAX_FIELD_CHARS, MAX_IMAGE_BYTES, MAX_NODES, MAX_STATE_BYTES, clean_field};
+use crate::{Host, Instance, Limits, Manifest, MenuKind, WidgetKind, WidgetRender};
 
 struct Quiet;
 
@@ -110,7 +110,51 @@ fn widgets_need_api_3() {
     assert!(m(2).unwrap_err().contains("API 3"));
     let ok = m(3).unwrap();
     assert!(ok.widget && ok.commands.is_empty(), "a widget-only plugin has no menu command");
-    assert!(Manifest::from_value(&json!({"id": "w", "name": "W", "main": "w.wasm", "api": 4})).is_err());
+    assert!(Manifest::from_value(&json!({"id": "w", "name": "W", "main": "w.wasm", "api": 5})).is_err());
     let v2 = Manifest::from_value(&json!({"id": "p", "name": "P", "main": "p.wasm", "api": 2})).unwrap();
     assert!(!v2.widget && v2.commands.len() == 1, "v2 manifests are unchanged");
 }
+
+#[test]
+fn fields_and_menus_are_checked_and_normalised() {
+    let root = json!({"type": "frame", "children": [{"type": "text", "field": "label", "text": "Hi"}]});
+    let w =
+        parse(json!({"root": root, "menu": [{"item": "reset"}, {"item": "c", "type": "color", "options": ["#ff0000"], "value": "ff0000"}]})).unwrap();
+    assert!(w.uses_api_4());
+    assert_eq!((w.menu[0].label.as_str(), w.menu[0].kind), ("reset", MenuKind::Action), "a label defaults to the item");
+    assert_eq!((w.menu[1].options.clone(), w.menu[1].value.clone()), (vec!["#FF0000".to_string()], Some("#FF0000".to_string())));
+    assert!(!parse(json!({"root": {"type": "frame"}})).unwrap().uses_api_4(), "API 3 descriptions are unchanged");
+    let menu = |m: Value| json!({"root": {"type": "frame"}, "menu": m});
+    let field = |kind: &str, name: &str| json!({"root": {"type": "frame", "children": [{"type": kind, "field": name}]}});
+    let junk = [
+        menu(json!(vec![json!({"item": "a"}); 9])),
+        menu(json!([{"item": "a"}, {"item": "a"}])),
+        menu(json!([{"item": "has space"}])),
+        menu(json!([{"item": ""}])),
+        menu(json!([{"item": "a", "label": "x".repeat(33)}])),
+        menu(json!([{"item": "a", "label": "line\nbreak"}])),
+        menu(json!([{"item": "a", "type": "slider"}])),
+        menu(json!([{"item": "a", "checked": true}])),
+        menu(json!([{"item": "a", "type": "color"}])),
+        menu(json!([{"item": "a", "type": "color", "options": vec!["#000000"; 9]}])),
+        menu(json!([{"item": "a", "type": "color", "options": ["red"]}])),
+        menu(json!([{"item": "a", "type": "color", "options": ["#000000"], "value": "#FFFFFF"}])),
+        menu(json!([{"item": "a", "options": ["#000000"]}])),
+        menu(json!({"item": "a"})),
+        field("rectangle", "label"),
+        field("frame", "label"),
+        field("text", "has space"),
+        field("text", &"x".repeat(65)),
+    ];
+    for j in junk {
+        assert!(parse(j.clone()).is_err(), "accepted {}", j.to_string().chars().take(100).collect::<String>());
+    }
+}
+
+#[test]
+fn field_values_are_cleaned_and_bounded() {
+    assert_eq!(clean_field("a\r\nb\rc\td\u{7}\u{0}é").unwrap(), "a\nb\nc dé");
+    assert_eq!(clean_field(&"é".repeat(MAX_FIELD_CHARS)).unwrap().chars().count(), MAX_FIELD_CHARS);
+    assert!(clean_field(&"x".repeat(MAX_FIELD_CHARS + 1)).is_err());
+    assert_eq!(clean_field("").unwrap(), "");
+}
diff --git a/crates/render/src/boolean_cache_tests.rs b/crates/render/src/boolean_cache_tests.rs
index 08a89d3a..452626c2 100644
--- a/crates/render/src/boolean_cache_tests.rs
+++ b/crates/render/src/boolean_cache_tests.rs
@@ -153,3 +153,123 @@ fn deep_boolean_nesting_stops_at_the_outline_depth_limit() {
     d.create(inner, NodeKind::Rectangle, "R", 40.0, 10.0, 20.0, 20.0).unwrap();
     assert!((outline(&d, b).area().abs() - 2.0 * 20.0 * 20.0).abs() < 0.5);
 }
+
+#[test]
+fn stroke_only_boolean_operands_keep_their_holes() {
+    use figcraft_doc::StrokeAlign;
+    use figcraft_geom::Point;
+
+    for kind in [NodeKind::Polygon { count: 6 }, NodeKind::Rectangle, NodeKind::Line] {
+        for align in [StrokeAlign::Inside, StrokeAlign::Center, StrokeAlign::Outside] {
+            let mut d = Document::new("stroke operands");
+            let page = d.first_page().unwrap();
+            let b = d.create(page, NodeKind::BooleanOp { op: BoolOp::Subtract }, "B", 0.0, 0.0, 100.0, 100.0).unwrap();
+            d.get_mut(b).unwrap().fills = vec![Paint::solid(Color::BLACK)];
+            // A nested group exercises the same path as a direct operand.
+            let g = d.create(b, NodeKind::Group, "G", 0.0, 0.0, 100.0, 100.0).unwrap();
+            let id = d.create(g, kind.clone(), "stroke", 10.0, 10.0, 80.0, 80.0).unwrap();
+            let n = d.get_mut(id).unwrap();
+            let mut hidden_fill = Paint::solid(Color::BLACK);
+            hidden_fill.visible = false;
+            n.fills = vec![hidden_fill];
+            n.strokes = vec![Paint::solid(Color::BLACK)];
+            n.stroke.weight = 6.0;
+            n.stroke.align = align;
+            let path = outline(&d, b);
+            assert_eq!(path.winding(Point::new(50.0, 45.0)), 0, "{kind:?} {align:?}: empty interior");
+            assert!(path.area().abs() > 100.0, "{kind:?} {align:?}: stroke survives");
+            assert!(!dark(&render(&d, page), 50, 45));
+            if !matches!(kind, NodeKind::Line) {
+                // Changing only stroke weight invalidates the boolean result.
+                let area = path.area().abs();
+                d.get_mut(id).unwrap().stroke.weight = 3.0;
+                assert!(outline(&d, b).area().abs() < area);
+                d.get_mut(id).unwrap().fills[0].visible = true;
+                assert_ne!(outline(&d, b).winding(Point::new(50.0, 45.0)), 0, "visible fills keep the interior");
+            }
+        }
+    }
+}
+
+#[test]
+fn boolean_operands_preserve_side_borders_and_container_children() {
+    use figcraft_doc::StrokeAlign;
+    use figcraft_geom::Point;
+    for kind in [NodeKind::Rectangle, NodeKind::Frame] {
+        let mut d = Document::new("borders");
+        let page = d.first_page().unwrap();
+        let b = d.create(page, NodeKind::BooleanOp { op: BoolOp::Union }, "B", 0.0, 0.0, 100.0, 100.0).unwrap();
+        let id = d.create(b, kind.clone(), "operand", 0.0, 0.0, 100.0, 100.0).unwrap();
+        let n = d.get_mut(id).unwrap();
+        n.fills.clear();
+        n.strokes = vec![Paint::solid(Color::BLACK)];
+        n.stroke.weight = 8.0;
+        n.stroke.align = StrokeAlign::Inside;
+        n.stroke.sides = Some([8.0, 0.0, 0.0, 0.0]);
+        if matches!(kind, NodeKind::Frame) {
+            d.create(id, NodeKind::Rectangle, "child", 40.0, 40.0, 20.0, 20.0).unwrap();
+        }
+        let p = outline(&d, b);
+        assert_ne!(p.winding(Point::new(50.0, 4.0)), 0, "top border");
+        assert_eq!(p.winding(Point::new(98.0, 50.0)), 0, "no right border");
+        assert_eq!(p.winding(Point::new(50.0, 98.0)), 0, "no bottom border");
+        if matches!(kind, NodeKind::Frame) {
+            assert_ne!(p.winding(Point::new(50.0, 50.0)), 0, "child retained");
+        }
+        d.get_mut(id).unwrap().stroke.sides = Some([0.0, 8.0, 0.0, 0.0]);
+        let p = outline(&d, b);
+        assert_eq!(p.winding(Point::new(50.0, 4.0)), 0, "side edit removes top");
+        assert_ne!(p.winding(Point::new(98.0, 50.0)), 0, "side edit adds right");
+        d.get_mut(id).unwrap().stroke.sides = None;
+        assert_ne!(outline(&d, b).winding(Point::new(50.0, 4.0)), 0, "uniform container border");
+    }
+}
+
+#[test]
+fn stroke_only_text_operands_use_glyphs_instead_of_the_text_box() {
+    use figcraft_doc::{StrokeAlign, TextData};
+    let mut d = Document::new("text strokes");
+    let page = d.first_page().unwrap();
+    let b = d.create(page, NodeKind::BooleanOp { op: BoolOp::Union }, "B", 0.0, 0.0, 400.0, 100.0).unwrap();
+    let mut text = TextData::new("Hi");
+    text.style.font_size = 32.0;
+    let id = d.create(b, NodeKind::Text(text), "text", 0.0, 0.0, 400.0, 100.0).unwrap();
+    let n = d.get_mut(id).unwrap();
+    n.fills.clear();
+    n.strokes = vec![Paint::solid(Color::BLACK)];
+    n.stroke.weight = 2.0;
+    n.stroke.align = StrokeAlign::Center;
+    let glyphs = outline(&d, id);
+    let result = outline(&d, b);
+    assert_eq!(result.elements().is_empty(), glyphs.elements().is_empty());
+    if !glyphs.elements().is_empty() {
+        let expected = glyphs.bounding_box().inflate(3.0, 3.0);
+        let actual = result.bounding_box();
+        assert!(actual.x0 >= expected.x0 && actual.x1 <= expected.x1);
+        assert!(actual.y0 >= expected.y0 && actual.y1 <= expected.y1);
+        assert!(actual.x1 < 200.0, "the unused text box must not contribute a border");
+    }
+    let NodeKind::Text(text) = &mut d.get_mut(id).unwrap().kind else { panic!() };
+    text.characters = "   ".into();
+    assert!(outline(&d, b).elements().is_empty(), "spaces have no stroked glyphs");
+}
+
+#[test]
+fn rounded_side_borders_follow_their_corners_in_booleans() {
+    use figcraft_doc::StrokeAlign;
+    use figcraft_geom::Point;
+    let mut d = Document::new("rounded borders");
+    let page = d.first_page().unwrap();
+    let b = d.create(page, NodeKind::BooleanOp { op: BoolOp::Union }, "B", 0.0, 0.0, 100.0, 100.0).unwrap();
+    let id = d.create(b, NodeKind::Rectangle, "operand", 0.0, 0.0, 100.0, 100.0).unwrap();
+    let n = d.get_mut(id).unwrap();
+    n.fills.clear();
+    n.strokes = vec![Paint::solid(Color::BLACK)];
+    n.stroke.align = StrokeAlign::Inside;
+    n.stroke.sides = Some([8.0; 4]);
+    n.corners.radii = [30.0; 4];
+    let p = outline(&d, b);
+    assert_ne!(p.winding(Point::new(50.0, 4.0)), 0, "top border");
+    assert_eq!(p.winding(Point::new(3.0, 3.0)), 0, "the rounded corner leaves the square's tip out");
+    assert_eq!(p.winding(Point::new(50.0, 50.0)), 0, "hollow inside");
+}
diff --git a/crates/render/src/bounds_memo_tests.rs b/crates/render/src/bounds_memo_tests.rs
new file mode 100644
index 00000000..4d0b305b
--- /dev/null
+++ b/crates/render/src/bounds_memo_tests.rs
@@ -0,0 +1,92 @@
+//! Paint bounds worked out once per render: the bounds kept for a layer are the ones worked out
+//! without keeping any, and the largest background blur follows the document's edits.
+
+use super::*;
+use figcraft_doc::{Effect, EffectKind};
+
+#[test]
+fn kept_paint_bounds_are_the_bounds_worked_out_afresh() {
+    // Unclipped frames nested past the 64-level walk, a rectangle at the bottom: bounds asked for
+    // deep first and then from the top, and the other way round, are those worked out alone.
+    let mut d = Document::new("deep");
+    let p = d.first_page().unwrap();
+    let mut chain = Vec::new();
+    let mut parent = p;
+    for k in 0..80 {
+        let f = d.create(parent, NodeKind::Frame, &format!("F{k}"), 1.0, 1.0, 10.0, 10.0).unwrap();
+        d.node_mut(f).unwrap().clip = false;
+        chain.push(f);
+        parent = f;
+    }
+    d.create(parent, NodeKind::Rectangle, "R", 500.0, 0.0, 10.0, 10.0).unwrap();
+    for order in [chain.iter().rev().copied().collect::<Vec<_>>(), chain.clone()] {
+        let memo = draw::Bounds::default();
+        for id in &order {
+            let n = d.node(*id).unwrap();
+            for depth in [0, 20] {
+                let kept = draw::bounds_within(&d, n, depth, None, Some(&memo)).0;
+                assert_eq!(kept, draw::local_paint_bounds(&d, n, depth, None), "{} at depth {depth}", n.name);
+            }
+        }
+    }
+}
+
+#[test]
+fn the_largest_background_blur_follows_edits() {
+    let mut d = Document::new("blur");
+    let p = d.first_page().unwrap();
+    let r = d.create(p, NodeKind::Rectangle, "R", 0.0, 0.0, 10.0, 10.0).unwrap();
+    assert_eq!(max_backdrop_blur(&d), 0.0);
+    let mut blur = Effect::background_blur();
+    if let EffectKind::BackgroundBlur(b) = &mut blur.kind {
+        b.radius = 12.0;
+    }
+    d.node_mut(r).unwrap().effects.push(blur);
+    assert_eq!(max_backdrop_blur(&d), 12.0);
+    // A copy of the document keeps it, and an edit of the copy changes only the copy's.
+    let mut copy = d.clone();
+    if let Some(EffectKind::BackgroundBlur(b)) = copy.node_mut(r).unwrap().effects.first_mut().map(|e| &mut e.kind) {
+        b.radius = 30.0;
+    }
+    assert_eq!(max_backdrop_blur(&copy), 30.0);
+    assert_eq!(max_backdrop_blur(&d), 12.0);
+    copy.node_mut(r).unwrap().effects.clear();
+    assert_eq!(max_backdrop_blur(&copy), 0.0);
+    // A deleted layer's blur no longer counts.
+    d.remove(r).unwrap();
+    assert_eq!(max_backdrop_blur(&d), 0.0);
+}
+
+#[test]
+fn kept_splat_answers_are_the_answers_worked_out_afresh() {
+    use figcraft_color::{ImageScaleMode, Paint};
+    // Groups nested past the 64-level walk, with an image-filled rectangle at the bottom of one
+    // branch and a plain one at the bottom of the other: answers asked for deep-first and
+    // top-first, at depths 0 and 20, are those worked out alone.
+    let mut d = Document::new("deep");
+    let p = d.first_page().unwrap();
+    let mut chain = Vec::new();
+    for image in [false, true] {
+        let mut parent = p;
+        for k in 0..80 {
+            let g = d.create(parent, NodeKind::Frame, &format!("{image} {k}"), 0.0, 0.0, 10.0, 10.0).unwrap();
+            d.node_mut(g).unwrap().clip = false;
+            chain.push(g);
+            parent = g;
+        }
+        let r = d.create(parent, NodeKind::Rectangle, "R", 0.0, 0.0, 10.0, 10.0).unwrap();
+        if image {
+            d.node_mut(r).unwrap().fills = vec![Paint::image("missing", ImageScaleMode::Fill)];
+        }
+    }
+    for order in [chain.iter().rev().copied().collect::<Vec<_>>(), chain.clone()] {
+        let memo = draw::Bounds::default();
+        for id in &order {
+            let n = d.node(*id).unwrap();
+            for depth in [0, 20] {
+                let kept = lod::splattable_within(&d, n, depth, Some(&memo)).0;
+                assert_eq!(kept, lod::splattable(&d, n, depth), "{} at depth {depth}", n.name);
+            }
+        }
+    }
+}
diff --git a/crates/render/src/dots.rs b/crates/render/src/dots.rs
new file mode 100644
index 00000000..980ea85a
--- /dev/null
+++ b/crates/render/src/dots.rs
@@ -0,0 +1,87 @@
+//! A dot grid on the page, under its layers (the board canvas): square dots on the device-pixel
+//! grid, blended into the image right after the page colour so the layers cover them. Each dot's
+//! pixels are computed from its page position alone, so bands and partial renders line up. Nothing
+//! is allocated per dot.
+
+use figcraft_color::Color;
+use tiny_skia::Pixmap;
+
+use crate::View;
+
+/// Dots every `step` page units from the page origin, `size` page units square (from one to 64
+/// device pixels): those on every second line both ways in `color`, the others (the ones a grid
+/// twice as coarse leaves out) in `faded`.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Dots {
+    pub step: f64,
+    pub size: f64,
+    pub color: Color,
+    pub faded: Color,
+}
+
+/// The most dots one render draws: a step far too small for the view draws none.
+const MAX_DOTS: f64 = 4_000_000.0;
+
+/// `c` as premultiplied 8-bit RGBA.
+fn premultiplied(c: Color) -> [u32; 4] {
+    let [r, g, b, a] = c.to_rgba8().map(u32::from);
+    [r * a / 255, g * a / 255, b * a / 255, a]
+}
+
+/// Draw `d` into `pix`, the render of `view`.
+pub(crate) fn draw(pix: &mut Pixmap, view: &View, d: &Dots) {
+    let s = view.scale;
+    let ok = |v: f64| v.is_finite() && v > 0.0;
+    if !(ok(d.step) && ok(d.size) && ok(s) && view.origin.0.is_finite() && view.origin.1.is_finite()) {
+        return;
+    }
+    let (w, h) = (i64::from(pix.width()), i64::from(pix.height()));
+    let (x0, y0) = view.origin;
+    let (i0, i1) = ((x0 / d.step).floor() - 1.0, ((x0 + w as f64 / s) / d.step).ceil() + 1.0);
+    let (j0, j1) = ((y0 / d.step).floor() - 1.0, ((y0 + h as f64 / s) / d.step).ceil() + 1.0);
+    let count = (i1 - i0 + 1.0) * (j1 - j0 + 1.0);
+    if !(count.is_finite() && count <= MAX_DOTS) {
+        return;
+    }
+    // Each dot on the device pixel nearest its point, from the view's top-left in device pixels.
+    let (ox, oy) = (x0 * s, y0 * s);
+    let side = ((d.size * s).round() as i64).clamp(1, 64);
+    let lead = side / 2;
+    let (strong, faded) = (premultiplied(d.color), premultiplied(d.faded));
+    let row = w as usize * 4;
+    let data = pix.data_mut();
+    for j in j0 as i64..=j1 as i64 {
+        let top = ((j as f64 * d.step * s - oy).round() as i64).saturating_sub(lead);
+        let (ya, yb) = (top.max(0), top.saturating_add(side).min(h));
+        if ya >= yb {
+            continue;
+        }
+        for i in i0 as i64..=i1 as i64 {
+            let left = ((i as f64 * d.step * s - ox).round() as i64).saturating_sub(lead);
+            let (xa, xb) = (left.max(0), left.saturating_add(side).min(w));
+            if xa >= xb {
+                continue;
+            }
+            let rgba = if i % 2 == 0 && j % 2 == 0 { strong } else { faded };
+            blend_square(data, row, (xa, xb), (ya, yb), rgba);
+        }
+    }
+}
+
+/// Blend premultiplied `rgba` source-over into the pixels `xs` × `ys` of `data`, rows `row` bytes
+/// long.
+fn blend_square(data: &mut [u8], row: usize, (xa, xb): (i64, i64), (ya, yb): (i64, i64), rgba: [u32; 4]) {
+    let keep = 255 - rgba[3];
+    if rgba[3] == 0 {
+        return;
+    }
+    for y in ya..yb {
+        let start = y as usize * row;
+        let Some(line) = data.get_mut(start + xa as usize * 4..start + xb as usize * 4) else { continue };
+        for px in line.chunks_exact_mut(4) {
+            for (dst, src) in px.iter_mut().zip(rgba) {
+                *dst = (src + u32::from(*dst) * keep / 255).min(255) as u8;
+            }
+        }
+    }
+}
diff --git a/crates/render/src/dots_tests.rs b/crates/render/src/dots_tests.rs
new file mode 100644
index 00000000..3adcbeab
--- /dev/null
+++ b/crates/render/src/dots_tests.rs
@@ -0,0 +1,88 @@
+//! The board canvas's dot grid: on the page colour, under the layers, the same pixels whichever
+//! part of the view a render covers (bands, retained patches), never in exports, and nothing
+//! drawn (or panicking) for spacings and sizes it can't draw.
+
+use std::sync::Arc;
+
+use figcraft_color::{Color, Paint};
+use figcraft_doc::{Document, NodeKind};
+
+use crate::{Dots, Options, Retained, View, render_view, render_view_single};
+
+fn dots() -> Dots {
+    Dots { step: 24.0, size: 2.0, color: Color::new(0.0, 0.0, 0.0, 0.5), faded: Color::new(0.0, 0.0, 0.0, 0.25) }
+}
+
+fn page_with_square() -> (Document, figcraft_doc::NodeId) {
+    let mut d = Document::new("dots");
+    let page = d.first_page().unwrap();
+    let r = d.create(page, NodeKind::Rectangle, "Square", 40.0, 40.0, 60.0, 60.0).unwrap();
+    d.get_mut(r).unwrap().fills = vec![Paint::solid(Color::from_hex("2D6CDF").unwrap())];
+    (d, page)
+}
+
+fn rgba(p: &crate::Pixmap, x: u32, y: u32) -> [u8; 4] {
+    let c = p.pixel(x, y).unwrap();
+    [c.red(), c.green(), c.blue(), c.alpha()]
+}
+
+#[test]
+fn dots_sit_on_the_page_under_the_layers() {
+    let (d, page) = page_with_square();
+    let view = View { origin: (0.0, 0.0), scale: 1.0, width: 200, height: 200 };
+    let pix = render_view_single(&d, page, &view, &Options { dots: Some(dots()), ..Default::default() }).unwrap();
+    let plain = render_view_single(&d, page, &view, &Options::default()).unwrap();
+    // A strong dot at (0, 0) (every second line both ways), a fainter one at (24, 0).
+    let (strong, faint, empty) = (rgba(&pix, 0, 0), rgba(&pix, 24, 0), rgba(&pix, 12, 0));
+    assert_eq!(empty, rgba(&plain, 12, 0), "nothing between the dots");
+    assert!(strong[0] < faint[0] && faint[0] < empty[0], "{strong:?} {faint:?} {empty:?}");
+    assert_eq!(rgba(&pix, 48, 48), rgba(&plain, 48, 48), "the square covers the dot at (48, 48)");
+    // Exports and thumbnails (no dots asked for) are unchanged.
+    assert_ne!(pix.data(), plain.data());
+}
+
+#[test]
+fn dots_line_up_across_bands_and_patches() {
+    let (d, page) = page_with_square();
+    let opts = Options { dots: Some(dots()), ..Default::default() };
+    // On a whole-pixel origin, as the canvas renders.
+    let full = View { origin: (-212.0, -140.0), scale: 1.5, width: 900, height: 700 };
+    let a = render_view_single(&d, page, &full, &opts).unwrap();
+    // Banded in parallel (desktop) or in one piece: the same pixels.
+    let b = render_view(&d, page, &full, &opts).unwrap();
+    assert_eq!(a.data(), b.data());
+    // A view on the same pixel grid, a whole number of pixels further on, shows the same dots.
+    let shifted = View { origin: (full.origin.0 + 101.0 / 1.5, full.origin.1 + 37.0 / 1.5), ..full.clone() };
+    let c = render_view_single(&d, page, &shifted, &opts).unwrap();
+    for (x, y) in [(0, 0), (150, 90), (400, 300), (700, 500)] {
+        assert_eq!(rgba(&c, x, y), rgba(&a, x + 101, y + 37), "at {x}, {y}");
+    }
+    // An edit redraws only around the layer, and the patched image matches a fresh render.
+    let mut retained = Retained::default();
+    let doc = Arc::new(d.clone());
+    retained.render(&doc, page, &full, &opts).unwrap();
+    let mut e = d;
+    let sq = e.get(page).unwrap().children[0];
+    e.get_mut(sq).unwrap().fills = vec![Paint::solid(Color::from_hex("E8505B").unwrap())];
+    let e = Arc::new(e);
+    let (snapped, patched, _) = retained.render(&e, page, &full, &opts).unwrap();
+    let fresh = render_view_single(&e, page, &snapped, &opts).unwrap();
+    assert_eq!(patched.data(), fresh.data());
+}
+
+#[test]
+fn dots_it_cant_draw_draw_nothing() {
+    let (d, page) = page_with_square();
+    let view = View { origin: (-1e12, 1e12), scale: 1.0, width: 64, height: 64 };
+    let plain = render_view_single(&d, page, &view, &Options::default()).unwrap();
+    for step in [0.0, -24.0, f64::NAN, f64::INFINITY, 1e-9] {
+        let opts = Options { dots: Some(Dots { step, ..dots() }), ..Default::default() };
+        assert_eq!(render_view_single(&d, page, &view, &opts).unwrap().data(), plain.data(), "step {step}");
+    }
+    for size in [f64::NAN, 1e308, -1.0] {
+        let opts = Options { dots: Some(Dots { size, ..dots() }), ..Default::default() };
+        let _ = render_view_single(&d, page, &view, &opts);
+    }
+    let far = View { origin: (f64::MAX / 2.0, -f64::MAX / 2.0), scale: 1e10, width: 16, height: 16 };
+    let _ = render_view_single(&d, page, &far, &Options { dots: Some(dots()), ..Default::default() });
+}
diff --git a/crates/render/src/draw.rs b/crates/render/src/draw.rs
index 7bfafd33..75efae60 100644
--- a/crates/render/src/draw.rs
+++ b/crates/render/src/draw.rs
@@ -4,20 +4,21 @@ use std::collections::HashMap;
 use std::hash::{Hash, Hasher};
 use std::sync::{Arc, Mutex, OnceLock};
 
-use figcraft_color::{BlendMode, Paint};
+use figcraft_color::{BlendMode, Paint, PaintKind};
 use figcraft_doc::{Document, EffectKind, Node, NodeId, NodeKind, StrokeAlign};
 use figcraft_geom::{Affine, BezPath, Rect, Shape};
-use tiny_skia::{FillRule, IntRect, Mask, MaskType, Pixmap, PixmapPaint, Transform};
+use tiny_skia::{FillRule, FilterQuality, IntRect, Mask, MaskType, Pixmap, PixmapPaint, Transform};
 
 use crate::backdrop::{self, Under};
 use crate::boolean::{PathCache, locked};
-use crate::paint::{composite, prepare_at, ts_blend};
+use crate::paint::{Prepared, composite, prepare_at, ts_blend};
 use crate::{blur, grain, lod, shadow};
 
 /// Shared state for one render.
 #[derive(Clone, Copy)]
-pub struct Ctx<'a> {
-    pub doc: &'a Document,
+/// `'d`: the document's (layers looked up for the render are kept that long), `'a`: the rest.
+pub struct Ctx<'a, 'd> {
+    pub doc: &'d Document,
     /// Device pixels per document unit (for effect radii).
     pub scale: f64,
     pub outline_mode: bool,
@@ -29,12 +30,72 @@ pub struct Ctx<'a> {
     pub skip: &'a [NodeId],
     /// Approximate what's too small to see in detail (canvas previews; see [`crate::lod`]).
     pub lod: bool,
+    pub magnified_image_pixels: bool,
     /// The surfaces under the one being drawn into, when it is an isolated layer (for backdrops).
     pub under: Option<&'a Under<'a>>,
     /// Seconds into animated GIFs (0: their first frame; only the presenter plays them).
     pub time: f64,
+    /// Paint bounds already worked out in this render.
+    pub bounds: &'a Bounds<'d>,
 }
 
+/// What one render works out about layers with children, which a walk down their subtree finds:
+/// their local paint bounds by greeking scale, and whether they can be splatted (see
+/// [`lod::splattable`]). Culling asks for a node's and then for each of its children's, so without
+/// them every layer's subtree was walked again at each level above it. Each answer keeps how many
+/// levels its walk went down.
+/// It also keeps the layers it looked up: the walks for culling, splatting and drawing go down the
+/// same layers, and in a large document a lookup is a good part of a layer's cost.
+#[derive(Default)]
+pub struct Bounds<'a> {
+    paint: std::cell::RefCell<IdMap<BoundsKey, (Rect, usize)>>,
+    pub(crate) splat: std::cell::RefCell<IdMap<NodeId, (bool, usize)>>,
+    nodes: std::cell::RefCell<IdMap<NodeId, Option<&'a Node>>>,
+}
+
+impl<'a> Bounds<'a> {
+    /// Node `id` of `doc`, looked up once for the render.
+    pub(crate) fn node(&self, doc: &'a Document, id: NodeId) -> Option<&'a Node> {
+        if let Some(n) = self.nodes.borrow().get(&id) {
+            return *n;
+        }
+        let n = doc.node(id);
+        self.nodes.borrow_mut().insert(id, n);
+        n
+    }
+}
+
+/// A hash map keyed by node ids, which need no SipHash: they are counters (or a peer's range of
+/// them), and SipHash took a good part of a render.
+type IdMap<K, V> = HashMap<K, V, std::hash::BuildHasherDefault<IdHash>>;
+
+/// Mixes each word in with a multiply (Fibonacci hashing), so ids that differ in low bits spread.
+#[derive(Default)]
+pub(crate) struct IdHash(u64);
+
+impl Hasher for IdHash {
+    fn finish(&self) -> u64 {
+        self.0
+    }
+    fn write(&mut self, bytes: &[u8]) {
+        for b in bytes {
+            self.write_u64(u64::from(*b));
+        }
+    }
+    fn write_u64(&mut self, v: u64) {
+        self.0 = (self.0.rotate_left(5) ^ v).wrapping_mul(0x9E37_79B9_7F4A_7C15);
+    }
+    fn write_usize(&mut self, v: usize) {
+        self.write_u64(v as u64);
+    }
+}
+
+/// A layer, and the scale its text is greeked at (none: drawn in full).
+type BoundsKey = (NodeId, Option<u64>);
+
+/// Deepest nesting the paint bounds walk follows.
+const MAX_BOUNDS_DEPTH: usize = 64;
+
 pub fn ts_transform(a: Affine) -> Transform {
     let c = a.as_coeffs();
     Transform::from_row(c[0] as f32, c[1] as f32, c[2] as f32, c[3] as f32, c[4] as f32, c[5] as f32)
@@ -56,10 +117,21 @@ pub fn ts_path(p: &BezPath) -> Option<tiny_skia::Path> {
     b.finish()
 }
 
+const IMAGE_PIXELS_SHOWN_FROM_MAGNIFICATION: f64 = 2.0;
+
+fn pixels_when_magnified(prep: Prepared, device_scale: f64) -> Prepared {
+    let Prepared::Pattern { pixmap, mode, quality, opacity, transform } = prep else { return prep };
+    let image_scale = f64::from(transform.sx * transform.sy - transform.kx * transform.ky).abs().sqrt();
+    let magnification = device_scale * image_scale;
+    let quality = if magnification >= IMAGE_PIXELS_SHOWN_FROM_MAGNIFICATION { FilterQuality::Nearest } else { quality };
+    Prepared::Pattern { pixmap, mode, quality, opacity, transform }
+}
+
 fn fill_with(pix: &mut Pixmap, path: &tiny_skia::Path, paints: &[Paint], w: f64, h: f64, xf: Affine, rule: FillRule, ctx: &Ctx, mask: Option<&Mask>) {
     let scale = xf.determinant().abs().sqrt();
     for p in paints {
         let Some(prep) = prepare_at(p, w, h, scale, ctx.doc, ctx.time) else { continue };
+        let prep = if ctx.magnified_image_pixels && matches!(p.kind, PaintKind::Image(_)) { pixels_when_magnified(prep, scale) } else { prep };
         let paint = tiny_skia::Paint { shader: prep.shader(), anti_alias: true, blend_mode: ts_blend(p.blend), ..Default::default() };
         if p.blend == BlendMode::PlusDarker {
             // No tiny-skia mode: the paint alone over its pixels, then blended in.
@@ -96,15 +168,26 @@ pub(crate) fn hash_path(p: &BezPath, h: &mut impl Hasher) {
     }
 }
 
+/// Per-side strokes on rectangles and frames (a ring under non-zero winding too), if `n` has them.
+fn side_strokes(n: &Node) -> Option<Arc<BezPath>> {
+    let props = &n.stroke;
+    let sides = props.sides?;
+    if !matches!(n.kind, NodeKind::Rectangle | NodeKind::Frame | NodeKind::Component { .. } | NodeKind::Instance { .. }) {
+        return None;
+    }
+    let c = &n.corners;
+    Some(Arc::new(if c.uniform() == Some(0.0) {
+        figcraft_pathops::rect_side_strokes(n.width, n.height, sides, props.align)
+    } else {
+        figcraft_pathops::rounded_side_strokes(n.width, n.height, c.radii, c.smoothing, sides, props.align)
+    }))
+}
+
 /// The stroke area of a node in local coordinates.
 pub fn stroke_area(n: &Node, path: &BezPath, closed: bool) -> Arc<BezPath> {
     let props = &n.stroke;
-    // Per-side strokes on rectangles/frames.
-    if let Some(sides) = props.sides
-        && matches!(n.kind, NodeKind::Rectangle | NodeKind::Frame | NodeKind::Component { .. } | NodeKind::Instance { .. })
-        && n.corners.uniform() == Some(0.0)
-    {
-        return Arc::new(figcraft_pathops::rect_side_strokes(n.width, n.height, sides, props.align));
+    if let Some(p) = side_strokes(n) {
+        return p;
     }
     // Rect/ellipse inside/outside strokes without booleans: an even-odd ring of two outlines.
     if props.dashes.is_empty() && props.profile().is_none() && props.brush.is_none() && closed && props.align != StrokeAlign::Center {
@@ -145,6 +228,18 @@ pub fn stroke_area(n: &Node, path: &BezPath, closed: bool) -> Arc<BezPath> {
             return Arc::new(o);
         }
     }
+    cached_stroke_outline(n, path, closed)
+}
+
+/// The stroke a boolean operand contributes: like [`stroke_area`], but never an even-odd ring
+/// (boolean folding uses non-zero winding).
+fn operand_stroke(n: &Node, path: &BezPath, closed: bool) -> Arc<BezPath> {
+    side_strokes(n).unwrap_or_else(|| cached_stroke_outline(n, path, closed))
+}
+
+/// A non-zero stroke outline (cached), shared by painting and boolean operands.
+fn cached_stroke_outline(n: &Node, path: &BezPath, closed: bool) -> Arc<BezPath> {
+    let props = &n.stroke;
     let mut h = std::collections::hash_map::DefaultHasher::new();
     hash_path(path, &mut h);
     (props.weight.to_bits(), props.align as u8, props.cap_start as u8, props.cap_end as u8, props.join as u8, props.miter_limit.to_bits(), closed)
@@ -153,11 +248,12 @@ pub fn stroke_area(n: &Node, path: &BezPath, closed: bool) -> Arc<BezPath> {
         d.to_bits().hash(&mut h);
     }
     props.dashes.len().hash(&mut h);
-    // Points' own caps and joins (vector networks).
+    // Points' own caps and joins and the fill rule Inside/Outside clip by (vector networks).
     let net = match &n.kind {
-        NodeKind::Vector { network } if network.has_point_styles() => Some(network),
+        NodeKind::Vector { network } => Some(network),
         _ => None,
     };
+    net.is_some_and(|n| n.regions.iter().any(|r| r.winding == figcraft_doc::WindingRule::EvenOdd)).hash(&mut h);
     for v in net.map(|n| n.vertices.as_slice()).unwrap_or_default() {
         (v.cap.map(|c| c as u8), v.join.map(|j| j as u8)).hash(&mut h);
     }
@@ -216,7 +312,7 @@ fn node_outline_at(doc: &Document, n: &Node, depth: usize) -> Option<(BezPath, F
                 .filter_map(|c| doc.node(*c))
                 .filter(|c| c.visible)
                 .filter_map(|c| {
-                    let (mut p, _) = subtree_outline(doc, c, depth + 1)?;
+                    let (mut p, _) = subtree_outline_at(doc, c, depth + 1, true)?;
                     p.apply_affine(c.transform);
                     Some((p, c.bool_op.unwrap_or(*op)))
                 })
@@ -240,6 +336,11 @@ fn node_outline_at(doc: &Document, n: &Node, depth: usize) -> Option<(BezPath, F
 
 /// The union outline of a node and its descendants (for booleans of groups/frames).
 pub fn subtree_outline(doc: &Document, n: &Node, depth: usize) -> Option<(BezPath, FillRule)> {
+    subtree_outline_at(doc, n, depth, false)
+}
+
+/// Boolean operands with only a stroke contribute the painted band, not their interior.
+fn subtree_outline_at(doc: &Document, n: &Node, depth: usize, stroke_only: bool) -> Option<(BezPath, FillRule)> {
     if depth > 64 {
         return None;
     }
@@ -248,21 +349,30 @@ pub fn subtree_outline(doc: &Document, n: &Node, depth: usize) -> Option<(BezPat
             let mut out = BezPath::new();
             if n.kind.is_frame_like()
                 && let Some(p) = figcraft_doc::geometry::shape_path(n)
-                && n.fills.iter().any(|f| f.visible)
             {
-                out.extend(p.elements().iter().copied());
+                if n.fills.iter().any(|f| f.visible) {
+                    out.extend(p.elements().iter().copied());
+                } else if stroke_only && n.has_visible_stroke() {
+                    out.extend(operand_stroke(n, &p, true).elements().iter().copied());
+                }
             }
             for c in n.children.iter().filter_map(|c| doc.node(*c)) {
                 if !c.visible {
                     continue;
                 }
-                if let Some((mut p, _)) = subtree_outline(doc, c, depth + 1) {
+                if let Some((mut p, _)) = subtree_outline_at(doc, c, depth + 1, stroke_only) {
                     p.apply_affine(c.transform);
                     out.extend(p.elements().iter().copied());
                 }
             }
             Some((out, FillRule::Winding))
         }
+        _ if stroke_only && !n.fills.iter().any(|p| p.visible) && n.has_visible_stroke() => {
+            let (path, _) = node_outline_at(doc, n, depth)?;
+            let path = if matches!(n.kind, NodeKind::Text(_)) { path } else { figcraft_doc::geometry::stroke_geometry(n).unwrap_or(path) };
+            let closed = figcraft_doc::geometry::is_closed(n) || matches!(n.kind, NodeKind::BooleanOp { .. });
+            Some(((*operand_stroke(n, &path, closed)).clone(), FillRule::Winding))
+        }
         _ => node_outline_at(doc, n, depth),
     }
 }
@@ -279,32 +389,63 @@ fn text_box_bounds(n: &Node) -> Rect {
 /// Local bounds a node paints into (its box grown by stroke/effect reach, plus unclipped children).
 /// Text that overflows its box counts where its glyphs are, so it isn't culled while visible;
 /// text greeked at `greek_scale` (see [`lod::greeked`]) paints only inside [`text_box_bounds`].
-fn local_paint_bounds(doc: &Document, n: &Node, depth: usize, greek_scale: Option<f64>) -> Rect {
+pub(crate) fn local_paint_bounds(doc: &Document, n: &Node, depth: usize, greek_scale: Option<f64>) -> Rect {
+    bounds_within(doc, n, depth, greek_scale, None).0
+}
+
+/// [`local_paint_bounds`], kept in and read from `memo` when there is one. Also returns how many
+/// levels the walk went down, or `None` when the nesting cap cut it short: such bounds depend on
+/// the depth they were asked at and aren't kept, and kept bounds are read only where their levels
+/// still fit under the cap.
+pub(crate) fn bounds_within<'a>(
+    doc: &'a Document,
+    n: &Node,
+    depth: usize,
+    greek_scale: Option<f64>,
+    memo: Option<&Bounds<'a>>,
+) -> (Rect, Option<usize>) {
+    // A layer without children is quicker to work out again than to look up.
+    let memo = memo.filter(|_| !n.children.is_empty());
+    let key = (n.id, greek_scale.map(f64::to_bits));
+    if let Some((r, levels)) = memo.and_then(|m| m.paint.borrow().get(&key).copied())
+        && depth + levels <= MAX_BOUNDS_DEPTH
+    {
+        return (r, Some(levels));
+    }
     let reach = n.paint_reach();
     let mut r = n.local_rect().inflate(reach, reach);
+    let mut levels = Some(0);
     let clips = n.clip && n.kind.is_frame_like();
-    if (!clips || n.kind.bounds_follow_children()) && depth < 64 && !n.hides_contents() {
-        for c in n.children.iter().filter_map(|c| doc.node(*c)) {
-            if !c.visible {
-                continue;
+    if (!clips || n.kind.bounds_follow_children()) && !n.hides_contents() {
+        if depth < MAX_BOUNDS_DEPTH {
+            let mut below = Some(0);
+            for c in n.children.iter().filter_map(|c| memo.map_or_else(|| doc.node(*c), |m| m.node(doc, *c))) {
+                if !c.visible {
+                    continue;
+                }
+                let (cb, c_levels) = bounds_within(doc, c, depth + 1, greek_scale, memo);
+                below = below.zip(c_levels).map(|(b, l)| b.max(l));
+                r = r.union(figcraft_geom::transform_rect_bbox(c.transform, cb));
             }
-            let cb = local_paint_bounds(doc, c, depth + 1, greek_scale);
-            r = r.union(figcraft_geom::transform_rect_bbox(c.transform, cb));
+            levels = below.map(|b| b + 1);
+        } else if !n.children.is_empty() {
+            levels = None;
         }
     }
     // Text can overflow its box.
     if let NodeKind::Text(_) = n.kind {
         r = r.union(text_box_bounds(n).inflate(reach, reach));
-        if greek_scale.is_some_and(|s| lod::greeked(n, s)) {
-            return r;
-        }
-        if let Some((l, dy)) = figcraft_text::layout_node(n)
+        if !greek_scale.is_some_and(|s| lod::greeked(n, s))
+            && let Some((l, dy)) = figcraft_text::layout_node(n)
             && let Some(ink) = l.ink_bounds()
         {
             r = r.union(ink + figcraft_geom::kurbo::Vec2::new(0.0, dy));
         }
     }
-    r
+    if let (Some(m), Some(l)) = (memo, levels) {
+        m.paint.borrow_mut().insert(key, (r, l));
+    }
+    (r, levels)
 }
 
 /// How far (document units) effects that read outside a node's paint bounds reach: blurs, glass,
@@ -367,10 +508,17 @@ const MAX_EFFECT_MARGIN_PX: f64 = 2048.0;
 
 /// Draw node `id` onto `pix`, where `parent_xf` maps the parent's space to `pix` pixels.
 pub fn draw_node(ctx: &Ctx, pix: &mut Pixmap, id: NodeId, parent_xf: Affine, depth: usize) {
+    if let Some(n) = ctx.doc.node(id) {
+        draw_layer(ctx, pix, n, parent_xf, depth);
+    }
+}
+
+/// [`draw_node`] for a node already looked up.
+fn draw_layer(ctx: &Ctx, pix: &mut Pixmap, n: &Node, parent_xf: Affine, depth: usize) {
+    let id = n.id;
     if depth > crate::MAX_EXPORT_DEPTH || ctx.skip.contains(&id) {
         return;
     }
-    let Some(n) = ctx.doc.node(id) else { return };
     let outline = ctx.outline_mode || ctx.outlined.contains(&id);
     if n.is_mask || n.opacity <= 0.0 && n.visible {
         return;
@@ -385,7 +533,7 @@ pub fn draw_node(ctx: &Ctx, pix: &mut Pixmap, id: NodeId, parent_xf: Affine, dep
     }
     let xf = parent_xf * n.transform;
     let (pw, ph) = (pix.width(), pix.height());
-    let local = local_paint_bounds(ctx.doc, n, 0, ctx.lod.then_some(ctx.scale));
+    let local = bounds_within(ctx.doc, n, 0, ctx.lod.then_some(ctx.scale), Some(ctx.bounds)).0;
     let dev = device_rect(xf, local);
     // Effects that read outside (blur) need a margin when culling. Absurd effects (a spread or
     // blur of millions of pixels) keep a sane layer: what lies further off reads as empty.
@@ -398,7 +546,7 @@ pub fn draw_node(ctx: &Ctx, pix: &mut Pixmap, id: NodeId, parent_xf: Affine, dep
         draw_outline(&Ctx { outline_mode: true, ..*ctx }, pix, n, xf, depth);
         return;
     }
-    if ctx.lod && dev.width().max(dev.height()) < lod::TINY_PX && lod::splattable(ctx.doc, n, 0) {
+    if ctx.lod && dev.width().max(dev.height()) < lod::TINY_PX && lod::splattable_within(ctx.doc, n, 0, Some(ctx.bounds)).0 {
         lod::splat_subtree(ctx, pix, n, xf, None, 1.0, depth);
         return;
     }
@@ -621,11 +769,11 @@ fn draw_content(ctx: &Ctx, pix: &mut Pixmap, n: &Node, xf: Affine, depth: usize,
                 f(pix);
             }
             if n.has_visible_stroke() {
-                let props = figcraft_doc::StrokeProps { align: StrokeAlign::Center, ..n.stroke.clone() };
+                // Glyph outlines are closed: inside and outside strokes clip to them (#615).
                 for path in keys.iter().filter_map(|k| by_style.get(k)) {
-                    let s = figcraft_pathops::stroke_center(path, props.weight, &props);
+                    let s = stroke_area(n, path, true);
                     if let Some(ts) = ts_path(&s) {
-                        fill_with(pix, &ts, &n.strokes, w, h, gxf, FillRule::Winding, ctx, None);
+                        fill_with(pix, &ts, &n.strokes, w, h, gxf, stroke_rule(n, true), ctx, None);
                     }
                 }
             }
@@ -672,13 +820,15 @@ fn draw_content(ctx: &Ctx, pix: &mut Pixmap, n: &Node, xf: Affine, depth: usize,
 
 fn draw_children(ctx: &Ctx, pix: &mut Pixmap, n: &Node, xf: Affine, depth: usize) {
     let kids = &n.children;
-    for run in ctx.doc.paint_runs(n) {
-        let Some(&c) = kids.get(run.start) else { continue };
-        if ctx.doc.node(c).is_some_and(|cn| cn.is_mask && cn.visible) {
+    // Each child looked up once: in a large document a lookup is a good part of a layer's cost.
+    let nodes: Vec<Option<&Node>> = kids.iter().map(|c| ctx.bounds.node(ctx.doc, *c)).collect();
+    for run in Document::paint_runs_of(&nodes, n.layout.as_ref().is_some_and(|l| l.reverse_z)) {
+        let (Some(&c), Some(Some(cn))) = (kids.get(run.start), nodes.get(run.start)) else { continue };
+        if cn.is_mask && cn.visible {
             // Everything above the mask (until the next mask) is clipped by its alpha.
             draw_masked(ctx, pix, c, kids.get(run.start + 1..run.end).unwrap_or(&[]), xf, depth);
         } else {
-            draw_node(ctx, pix, c, xf, depth + 1);
+            draw_layer(ctx, pix, cn, xf, depth + 1);
         }
     }
 }
diff --git a/crates/render/src/glass.rs b/crates/render/src/glass.rs
index 70e0d582..3555ff44 100644
--- a/crates/render/src/glass.rs
+++ b/crates/render/src/glass.rs
@@ -6,9 +6,20 @@
 //! where it faces `light_angle`, half as bright on the opposite side, spread wider by `splay`.
 //! `frost` blurs the backdrop first. Distances to the outline come from an exact Euclidean
 //! distance transform of the shape's coverage.
+//!
+//! The shape's coverage, distances and normals depend only on the shape and the zoom. Once a
+//! later render asks for the same shape at the same zoom they are worked out for the whole shape,
+//! in its own pixel frame, and kept in a cache of at most [`MAX_CACHED_BYTES`]: moving or editing
+//! what lies under the glass, dragging its sliders, panning and patching the canvas reuse them.
+//! Zooming doesn't (each zoom is new).
+
+use std::collections::HashMap;
+use std::hash::{DefaultHasher, Hash, Hasher};
+use std::sync::{Arc, Mutex, OnceLock};
 
 use figcraft_doc::Glass;
 use figcraft_geom::Affine;
+use figcraft_geom::kurbo::Shape as _;
 use tiny_skia::Pixmap;
 
 use crate::fx;
@@ -188,6 +199,211 @@ fn light_reach(band: f64, intensity: f64) -> f64 {
 /// zoom would otherwise need a huge margin of coverage around every cut).
 const MAX_LIGHT_PX: f64 = 512.0;
 
+/// A shape's coverage (alpha), distance to its edge and smoothed inward normals over a window of
+/// pixels whose top-left pixel is (`x0`, `y0`).
+struct Fields {
+    x0: i64,
+    y0: i64,
+    w: usize,
+    h: usize,
+    cov: Vec<u8>,
+    dist: Vec<f32>,
+    normals: Vec<(f32, f32)>,
+}
+
+/// Bytes a field pixel holds: coverage, distance and a normal.
+const FIELD_PX_BYTES: u64 = 1 + 4 + 8;
+
+impl Fields {
+    /// The fields of `cov`, the shape's coverage on the window at (`x0`, `y0`), normals smoothed
+    /// over `r` pixels.
+    fn new(cov: &Pixmap, x0: i64, y0: i64, r: usize) -> Fields {
+        FIELDS_COMPUTED.with(|n| n.set(n.get() + 1));
+        let dist = inside_distance(cov);
+        let (w, h) = (cov.width() as usize, cov.height() as usize);
+        let normals = smooth_normals(&dist, w, h, r);
+        let cov = cov.data().chunks_exact(4).map(|p| p.get(3).copied().unwrap_or(0)).collect();
+        Fields { x0, y0, w, h, cov, dist, normals }
+    }
+
+    /// Coverage (0–1), distance and inward normal at pixel (`x`, `y`); `None` outside the window.
+    fn at(&self, x: i64, y: i64) -> Option<(f32, f32, (f32, f32))> {
+        let (fx, fy) = (x.checked_sub(self.x0)?, y.checked_sub(self.y0)?);
+        if fx < 0 || fy < 0 || fx >= self.w as i64 || fy >= self.h as i64 {
+            return None;
+        }
+        let i = fy as usize * self.w + fx as usize;
+        Some((f32::from(*self.cov.get(i)?) / 255.0, *self.dist.get(i)?, *self.normals.get(i)?))
+    }
+}
+
+thread_local! {
+    static FIELDS_COMPUTED: std::cell::Cell<u64> = const { std::cell::Cell::new(0) };
+}
+
+/// How many times this thread has worked out a glass shape's fields: what a cache miss costs. For
+/// tests and benchmarks.
+pub fn glass_fields_computed() -> u64 {
+    FIELDS_COMPUTED.with(std::cell::Cell::get)
+}
+
+/// What a glass shape's fields depend on, with the transform's translation reduced to its fraction
+/// of a pixel: the same shape at the same zoom has the same key wherever it is and however a render
+/// cuts it.
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+struct ShapeKey {
+    path: u64,
+    linear: [u64; 4],
+    frac: (i64, i64),
+    margin: u32,
+    r: usize,
+}
+
+/// The cached fields of a shape whose window holds at most this many pixels; bigger shapes (a
+/// pane far larger than the view) are worked out for the part a render shows each time.
+#[cfg(not(target_arch = "wasm32"))]
+const MAX_SHAPE_PX: u64 = 4 << 20;
+#[cfg(target_arch = "wasm32")]
+const MAX_SHAPE_PX: u64 = 1 << 20;
+/// Bytes the glass shape cache holds at most (less on the web, where memory never shrinks).
+#[cfg(not(target_arch = "wasm32"))]
+const MAX_CACHED_BYTES: u64 = 128 << 20;
+#[cfg(target_arch = "wasm32")]
+const MAX_CACHED_BYTES: u64 = 32 << 20;
+
+/// A shape's fields once worked out; parallel bands wanting the same shape wait for one of them.
+type Slot = Arc<OnceLock<Option<Arc<Fields>>>>;
+
+/// The shapes' fields by key, at most `budget` bytes; the least recently used go first. A shape is
+/// kept from the second render that asks for it: one asked for once (each step of a zoom, a pane
+/// dragged by fractions of a pixel) is cheaper worked out for just the part a render shows.
+struct ShapeCache {
+    map: HashMap<ShapeKey, (Slot, u64, u64)>,
+    /// Shapes asked for but not kept, by the render that first asked.
+    seen: HashMap<ShapeKey, u64>,
+    held: u64,
+    tick: u64,
+    budget: u64,
+}
+
+/// Shapes remembered as asked for once; past this many they are forgotten.
+const MAX_SEEN: usize = 256;
+
+impl ShapeCache {
+    fn new(budget: u64) -> Self {
+        Self { map: HashMap::new(), seen: HashMap::new(), held: 0, tick: 0, budget }
+    }
+
+    /// The slot for `key` (filled or about to be) asked for in render number `render`, making room
+    /// for `bytes`; `None` when it isn't kept (first asked for in this render, or too big).
+    fn slot(&mut self, key: &ShapeKey, bytes: u64, render: u64) -> Option<Slot> {
+        self.tick += 1;
+        if let Some((slot, _, used)) = self.map.get_mut(key) {
+            *used = self.tick;
+            return Some(slot.clone());
+        }
+        if bytes > self.budget {
+            return None;
+        }
+        match self.seen.get(key) {
+            Some(first) if *first < render => {
+                self.seen.remove(key);
+            }
+            Some(_) => return None,
+            None => {
+                if self.seen.len() >= MAX_SEEN {
+                    self.seen.clear();
+                }
+                self.seen.insert(key.clone(), render);
+                return None;
+            }
+        }
+        while self.held + bytes > self.budget {
+            let oldest = self.map.iter().min_by_key(|(_, (_, _, used))| *used).map(|(k, _)| k.clone())?;
+            if let Some((_, b, _)) = self.map.remove(&oldest) {
+                self.held -= b;
+            }
+        }
+        let slot = Slot::default();
+        self.map.insert(key.clone(), (slot.clone(), bytes, self.tick));
+        self.held += bytes;
+        Some(slot)
+    }
+}
+
+fn shape_cache() -> &'static Mutex<ShapeCache> {
+    static C: OnceLock<Mutex<ShapeCache>> = OnceLock::new();
+    C.get_or_init(|| Mutex::new(ShapeCache::new(MAX_CACHED_BYTES)))
+}
+
+/// The fields `glass` reads for a `w` × `h` layer whose `shape` maps through `xf` (local → layer
+/// pixels), exact for distances up to the margin `m`, normals smoothed over `r` pixels, and the
+/// shift from layer pixels to the fields' pixels.
+///
+/// A shape asked for again in a later render, whose window fits [`MAX_SHAPE_PX`], is worked out
+/// whole, in its own frame (the translation's fraction of a pixel), and kept: a band, a canvas
+/// patch or the next frame of a drag reads the same fields. Otherwise it is worked out for the part
+/// shown plus the margin.
+fn shape_fields(shape: &Outline, xf: Affine, w: u32, h: u32, m: u32, r: usize) -> Option<(Arc<Fields>, (i64, i64))> {
+    if let Some(whole) = whole_shape(shape, xf, m, r) {
+        return Some(whole);
+    }
+    let cov = spread_alpha(std::slice::from_ref(shape), 0.0, Affine::translate((f64::from(m), f64::from(m))) * xf, w + 2 * m, h + 2 * m)?;
+    Some((Arc::new(Fields::new(&cov, -i64::from(m), -i64::from(m), r)), (0, 0)))
+}
+
+/// [`shape_fields`] for a whole shape, from the cache; `None` when it isn't kept (first asked for
+/// in this render, too big, or its transform too far out).
+fn whole_shape(shape: &Outline, xf: Affine, m: u32, r: usize) -> Option<(Arc<Fields>, (i64, i64))> {
+    let [a, b, c, d, e, f] = xf.as_coeffs();
+    // The translation in steps of 1/65536 px (far finer than the rasteriser's 1/64, coarse enough
+    // that rounding errors in where a render starts land on the same step), its whole pixels (the
+    // shift) and the fraction left; rounding first carries 99.9999999 over to 100.
+    const STEPS: f64 = 65536.0;
+    let q = |v: f64| {
+        let q = (v * STEPS).round();
+        (q.is_finite() && q.abs() < 1e15).then_some(q as i64)
+    };
+    let (qe, qf) = (q(e)?, q(f)?);
+    let shift = (qe.div_euclid(STEPS as i64), qf.div_euclid(STEPS as i64));
+    let frac = (qe.rem_euclid(STEPS as i64), qf.rem_euclid(STEPS as i64));
+    let own = Affine::new([a, b, c, d, frac.0 as f64 / STEPS, frac.1 as f64 / STEPS]);
+    let bb = (own * shape.0.clone()).bounding_box();
+    let (x0, y0, x1, y1) = (bb.x0.floor(), bb.y0.floor(), bb.x1.ceil(), bb.y1.ceil());
+    if ![x0, y0, x1, y1].iter().all(|v| v.is_finite() && v.abs() < 1e9) {
+        return None;
+    }
+    // The margin in steps of 32 px, so dragging a slider that widens it a little keeps the same
+    // fields (a wider margin only adds exact distances further out: the same pixels).
+    let margin = m.div_ceil(32).checked_mul(32)?;
+    let (rw, rh) = ((x1 - x0) as u64 + 2, (y1 - y0) as u64 + 2);
+    let (ww, wh) = (rw + 2 * u64::from(margin), rh + 2 * u64::from(margin));
+    if ww.checked_mul(wh)? > MAX_SHAPE_PX {
+        return None;
+    }
+    let mut hasher = DefaultHasher::new();
+    crate::draw::hash_path(&shape.0, &mut hasher);
+    matches!(shape.1, tiny_skia::FillRule::EvenOdd).hash(&mut hasher);
+    let key = ShapeKey { path: hasher.finish(), linear: [a, b, c, d].map(f64::to_bits), frac, margin, r };
+    let compute = || {
+        // Rastered against the shape's own bounds (not the window), so the margin can't move a
+        // coverage value.
+        let raster = spread_alpha(std::slice::from_ref(shape), 0.0, Affine::translate((1.0 - x0, 1.0 - y0)) * own, rw as u32, rh as u32)?;
+        let mut win = Pixmap::new(ww as u32, wh as u32)?;
+        let (row, at) = (raster.width() as usize * 4, (margin as usize, margin as usize));
+        let stride = win.width() as usize * 4;
+        for (y, src) in raster.data().chunks_exact(row).enumerate() {
+            let start = (y + at.1) * stride + at.0 * 4;
+            win.data_mut().get_mut(start..start + row)?.copy_from_slice(src);
+        }
+        let origin = (x0 as i64 - 1 - i64::from(margin), y0 as i64 - 1 - i64::from(margin));
+        Some(Fields::new(&win, origin.0, origin.1, r))
+    };
+    let slot =
+        shape_cache().lock().unwrap_or_else(std::sync::PoisonError::into_inner).slot(&key, ww * wh * FIELD_PX_BYTES, crate::render_number())?;
+    Some((slot.get_or_init(|| compute().map(Arc::new)).clone()?, shift))
+}
+
 /// The glass of a `w` × `h` layer whose `shape` maps through `xf` (local → layer pixels), from
 /// `back`, its backdrop padded by `pad` pixels each way, at `scale` device pixels per unit.
 #[allow(clippy::too_many_arguments)]
@@ -201,10 +417,7 @@ pub fn glass(g: &Glass, shape: &Outline, back: &Pixmap, pad: u32, w: u32, h: u32
     // exact: the bend's (within `depth`), the light's (within `reach`) and those the normals are
     // smoothed from (2r + 1 further).
     let m = depth.max(reach).ceil() as u32 + 4 * r as u32 + 4;
-    let cov = spread_alpha(std::slice::from_ref(shape), 0.0, Affine::translate((f64::from(m), f64::from(m))) * xf, w + 2 * m, h + 2 * m)?;
-    let dist = inside_distance(&cov);
-    let (cw, ch) = (cov.width() as usize, cov.height() as usize);
-    let normals = smooth_normals(&dist, cw, ch, r);
+    let (fields, shift) = shape_fields(shape, xf, w, h, m, r)?;
     let mut frosted = back.clone();
     fx::blur(&mut frosted, g.frost / 2.0 * scale);
     let ang = g.light_angle.to_radians();
@@ -221,17 +434,12 @@ pub fn glass(g: &Glass, shape: &Outline, back: &Pixmap, pad: u32, w: u32, h: u32
     let depth = depth as f32;
     let mut out = Pixmap::new(w, h)?;
     let dst = out.data_mut();
-    let cd = cov.data();
-    let d_at = |x: usize, y: usize| dist.get(y * cw + x).copied().unwrap_or(0.0);
     for y in 0..h as usize {
         for x in 0..w as usize {
-            let (mx, my) = (x + m as usize, y + m as usize);
-            let c = f32::from(cd.get((my * cw + mx) * 4 + 3).copied().unwrap_or(0)) / 255.0;
+            let Some((c, d, inward)) = fields.at(x as i64 - shift.0, y as i64 - shift.1) else { continue };
             if c <= 0.0 {
                 continue;
             }
-            let d = d_at(mx, my);
-            let inward = normals.get(my * cw + mx).copied().unwrap_or((0.0, 0.0));
             let t = (d / depth).min(1.0);
             let bend = bend_max * (1.0 - t) * (1.0 - t);
             let (bx, by) = (x as f32 + pad as f32 + 0.5, y as f32 + pad as f32 + 0.5);
@@ -284,6 +492,28 @@ mod tests {
         assert!((d[10 * 21 + 5] - 0.5).abs() < 1e-4, "{}", d[10 * 21 + 5]);
     }
 
+    #[test]
+    fn the_shape_cache_stays_within_its_bytes() {
+        let key = |i: u64| ShapeKey { path: i, linear: [0; 4], frac: (0, 0), margin: 0, r: 1 };
+        let mut c = ShapeCache::new(100);
+        // Kept from the second render that asks, not the first (nor again within the first).
+        assert!(c.slot(&key(1), 40, 1).is_none());
+        assert!(c.slot(&key(1), 40, 1).is_none());
+        assert!(c.slot(&key(1), 40, 2).is_some());
+        for k in [2, 3] {
+            assert!(c.slot(&key(k), 40, 2).is_none());
+        }
+        assert!(c.slot(&key(2), 40, 3).is_some());
+        // Using 1 again makes 2 the least recently used: 2 goes to make room for 3.
+        assert!(c.slot(&key(1), 40, 3).is_some());
+        assert!(c.slot(&key(3), 40, 3).is_some());
+        assert!(c.held <= 100, "{}", c.held);
+        assert!(c.map.contains_key(&key(1)) && c.map.contains_key(&key(3)) && !c.map.contains_key(&key(2)));
+        // More than it holds in all: never kept.
+        assert!(c.slot(&key(4), 101, 3).is_none() && c.slot(&key(4), 101, 4).is_none());
+        assert!(c.held <= 100 && !c.map.contains_key(&key(4)));
+    }
+
     #[test]
     fn light_reach_is_where_the_light_falls_under_half_a_level() {
         let r = light_reach(10.0, 1.0);
diff --git a/crates/render/src/glass_bench_tests.rs b/crates/render/src/glass_bench_tests.rs
index 64c95835..1a4b4cbe 100644
--- a/crates/render/src/glass_bench_tests.rs
+++ b/crates/render/src/glass_bench_tests.rs
@@ -80,6 +80,18 @@ fn set_glass(d: &mut Document, pane: NodeId, g: Glass) {
     d.get_mut(pane).unwrap().effects = vec![Effect { kind: EffectKind::Glass(g), visible: true }];
 }
 
+/// Writes the bench scene's render (rendered twice, so a kept shape is read) to the PNG named by
+/// `FIGCRAFT_GLASS_PNG`, to compare builds by eye.
+#[test]
+#[ignore = "writes a PNG: FIGCRAFT_GLASS_PNG=<path>"]
+fn glass_bench_png() {
+    let Ok(path) = std::env::var("FIGCRAFT_GLASS_PNG") else { return };
+    let (d, p, _, _) = scene();
+    let _ = render_view(&d, p, &view((0.0, 0.0), 2.0), &Options::default());
+    let pix = render_view(&d, p, &view((0.0, 0.0), 2.0), &Options::default()).unwrap();
+    pix.save_png(path).unwrap();
+}
+
 #[test]
 #[ignore = "timing: run in release with --ignored --nocapture"]
 fn glass_render_timings() {
@@ -96,6 +108,10 @@ fn glass_render_timings() {
             }),
         ),
         ("export: zoom, a new scale every frame", time(&mut d, p, render_view, |_, i| view((0.0, 0.0), 2.0 + 0.013 * f64::from(i)))),
+        (
+            "export: zoomed in, a corner of the pane in view, a new scale every frame",
+            time(&mut d, p, render_view, |_, i| view((700.0, 400.0), 3.0 + 0.013 * f64::from(i))),
+        ),
         ("single: same view again", time(&mut d, p, render_view_single, |_, _| view((0.0, 0.0), 2.0))),
         ("canvas: drag the card under the glass", canvas(&d, p, 2.0, move_card)),
         (
diff --git a/crates/render/src/glass_cut_tests.rs b/crates/render/src/glass_cut_tests.rs
index 43733c7f..93124377 100644
--- a/crates/render/src/glass_cut_tests.rs
+++ b/crates/render/src/glass_cut_tests.rs
@@ -99,7 +99,10 @@ fn glass_digests() {
             let (d, p, _) = pane_over_stripes(g.clone(), radius);
             for scale in [1.0, 1.37, 2.0] {
                 let v = View { origin: (100.0, 100.0), scale, width: (1000.0 * scale) as u32, height: (700.0 * scale) as u32 };
+                // Rendered twice: the second reads the whole shape the first asked for.
+                let first = render_view_single(&d, p, &v, &Options::default()).unwrap();
                 let pix = render_view_single(&d, p, &v, &Options::default()).unwrap();
+                assert!(first.data() == pix.data(), "glass {i} radius {radius} scale {scale}: the kept shape renders differently");
                 let mut h = DefaultHasher::new();
                 pix.data().hash(&mut h);
                 println!("glass {i} radius {radius} scale {scale}: {:016x}", h.finish());
@@ -133,3 +136,82 @@ fn a_cut_through_the_pane_matches_the_whole_render() {
         }
     }
 }
+
+/// A `w` × `h` pane of glass `g` at (`x`, `y`) over stripes, alone on its page: (document, page,
+/// pane). Each test gives its own size, so tests running at once don't share cached shapes.
+fn pane(g: Glass, x: f64, y: f64, w: f64, h: f64) -> (Document, NodeId, NodeId) {
+    let mut d = Document::new("glass");
+    let p = d.first_page().unwrap();
+    for i in 0..8u32 {
+        let s = d.create(p, NodeKind::Rectangle, "Stripe", f64::from(i) * 40.0, 0.0, 20.0, 400.0).unwrap();
+        d.get_mut(s).unwrap().fills = vec![Paint::solid(Color::from_hex("2040E0").unwrap())];
+    }
+    let pane = d.create(p, NodeKind::Rectangle, "Glass", 0.0, 0.0, w, h).unwrap();
+    let n = d.get_mut(pane).unwrap();
+    n.transform = Affine::translate((x, y));
+    n.corners.radii = [12.0; 4];
+    n.effects = vec![Effect { kind: EffectKind::Glass(g), visible: true }];
+    (d, p, pane)
+}
+
+fn render(d: &Document, p: NodeId, origin: (f64, f64), scale: f64) -> Pixmap {
+    render_view_single(d, p, &View { origin, scale, width: 400, height: 300 }, &Options::default()).unwrap()
+}
+
+/// How many glass shapes `f` works out on this thread.
+fn computed(f: impl FnOnce()) -> u64 {
+    let before = crate::glass::glass_fields_computed();
+    f();
+    crate::glass::glass_fields_computed() - before
+}
+
+#[test]
+fn kept_fields_render_the_same_pixels_as_fresh_ones() {
+    let (d, p, _) = pane(Glass::default(), 40.0, 30.0, 211.0, 137.0);
+    let mut shots = Vec::new();
+    // The first render works out the part it shows, the next the whole shape (and keeps it), the
+    // ones after reuse it.
+    for want in [1, 1, 0] {
+        assert_eq!(computed(|| shots.push(render(&d, p, (0.0, 0.0), 1.5))), want, "render {}", shots.len() + 1);
+    }
+    assert!(shots.windows(2).all(|w| w[0].data() == w[1].data()));
+}
+
+#[test]
+fn what_the_shape_depends_on_works_it_out_again_and_nothing_else_does() {
+    let (mut d, p, pane) = pane(Glass::default(), 40.0, 30.0, 223.0, 149.0);
+    let set = |d: &mut Document, g: Glass| d.get_mut(pane).unwrap().effects = vec![Effect { kind: EffectKind::Glass(g), visible: true }];
+    // Asked for twice: kept.
+    let _ = render(&d, p, (0.0, 0.0), 1.0);
+    let _ = render(&d, p, (0.0, 0.0), 1.0);
+    // Reused: the look apart from depth, what lies under the glass, panning by whole pixels and
+    // moving the pane by whole pixels.
+    let reused = computed(|| {
+        set(&mut d, Glass { light_angle: 30.0, refraction: 0.2, dispersion: 1.0, frost: 9.0, ..Glass::default() });
+        let _ = render(&d, p, (0.0, 0.0), 1.0);
+        let stripe = d.node(p).unwrap().children[0];
+        d.get_mut(stripe).unwrap().transform = Affine::translate((5.0, 0.0));
+        let _ = render(&d, p, (0.0, 0.0), 1.0);
+        let _ = render(&d, p, (7.0, -3.0), 1.0);
+        d.get_mut(pane).unwrap().transform = Affine::translate((52.0, 31.0));
+        let _ = render(&d, p, (0.0, 0.0), 1.0);
+    });
+    assert_eq!(reused, 0);
+    // Worked out again: another zoom, a move by part of a pixel, another shape, a much deeper edge.
+    assert_eq!(computed(|| drop(render(&d, p, (0.0, 0.0), 1.25))), 1, "zoom");
+    d.get_mut(pane).unwrap().transform = Affine::translate((52.5, 31.0));
+    assert_eq!(computed(|| drop(render(&d, p, (0.0, 0.0), 1.0))), 1, "part of a pixel");
+    d.get_mut(pane).unwrap().width = 230.0;
+    assert_eq!(computed(|| drop(render(&d, p, (0.0, 0.0), 1.0))), 1, "shape");
+    set(&mut d, Glass { depth: 70.0, ..Glass::default() });
+    assert_eq!(computed(|| drop(render(&d, p, (0.0, 0.0), 1.0))), 1, "depth");
+}
+
+#[test]
+fn a_pane_too_big_to_keep_still_renders() {
+    // 400 × 300 units at 8x: far past what is kept whole, so each render works out its part.
+    let (d, p, _) = pane(Glass { frost: 0.0, ..Glass::default() }, 0.0, 0.0, 400.0, 300.0);
+    let shown = render(&d, p, (10.0, 10.0), 8.0);
+    assert_eq!(computed(|| drop(render(&d, p, (10.0, 10.0), 8.0))), 1);
+    assert!(shown.data().chunks_exact(4).any(|px| px[2] > 200), "the stripes show through");
+}
diff --git a/crates/render/src/image_budget_tests.rs b/crates/render/src/image_budget_tests.rs
index 6228efc5..9a51f405 100644
--- a/crates/render/src/image_budget_tests.rs
+++ b/crates/render/src/image_budget_tests.rs
@@ -48,9 +48,11 @@ fn an_image_within_the_limits_decodes() {
 }
 
 #[test]
-fn an_image_wider_or_taller_than_the_limit_is_refused() {
-    assert!(images::decode_within(&png(30, 20), ColorProfile::Srgb, 29, u64::MAX).is_none());
-    assert!(images::decode_within(&png(20, 30), ColorProfile::Srgb, 29, u64::MAX).is_none());
+fn an_image_wider_or_taller_than_the_limit_is_scaled_down_to_fit() {
+    let (p, _) = images::decode_within(&png(30, 20), ColorProfile::Srgb, 15, u64::MAX).unwrap();
+    assert_eq!((p.width(), p.height()), (15, 10));
+    let (p, _) = images::decode_within(&png(20, 30), ColorProfile::Srgb, 15, u64::MAX).unwrap();
+    assert_eq!((p.width(), p.height()), (10, 15));
 }
 
 #[test]
@@ -63,10 +65,22 @@ fn a_huge_image_is_refused_from_its_header_alone() {
     // 16 000 × 16 000 is within the side limit; its pixels (1 GB) aren't within a 1 MB budget, and
     // the file has none to decode: only the header is read.
     assert!(images::decode_within(&png_header_only(16_000, 16_000), ColorProfile::Srgb, 16_384, 1 << 20).is_none());
-    // Past the side limit, the shipped decode refuses it the same way.
+    // Past the side limit, the shipped decode reads its header and finds no pixels to scale down.
     assert!(images::decode(&png_header_only(20_000, 10)).is_none());
 }
 
+#[test]
+fn an_image_past_the_side_limit_is_drawn_downscaled() {
+    // #1336: one side over 16 384 px drew nothing.
+    let p = images::decode(&png(16_385, 4)).unwrap();
+    assert_eq!(p.width(), 16_384);
+    assert!(p.height() >= 1 && p.height() <= 4);
+    assert!(p.pixels().iter().all(|c| c.alpha() == 255));
+    let p = images::decode(&png(4, 18_078)).unwrap();
+    assert_eq!(p.height(), 16_384);
+    assert!(p.width() >= 1 && p.width() <= 4);
+}
+
 fn key(name: &str) -> images::Key {
     (name.to_string(), [0; 7], ColorProfile::Srgb)
 }
diff --git a/crates/render/src/images.rs b/crates/render/src/images.rs
index f4f9c5d9..586c2dac 100644
--- a/crates/render/src/images.rs
+++ b/crates/render/src/images.rs
@@ -15,7 +15,7 @@ use tiny_skia::Pixmap;
 
 pub(crate) type Key = (String, [i32; 7], ColorProfile);
 
-/// The largest image side decoded.
+/// The largest side of a decoded image: larger images are scaled down to fit.
 const MAX_SIDE: u32 = 16_384;
 /// The most bytes one image's decoding may allocate: the image crate's own default limit (a
 /// larger image is refused from its header).
@@ -83,26 +83,25 @@ fn fkey(f: &ImageFilters) -> [i32; 7] {
     [q(f.exposure), q(f.contrast), q(f.saturation), q(f.temperature), q(f.tint), q(f.highlights), q(f.shadows)]
 }
 
-/// Decode encoded image bytes into a premultiplied sRGB pixmap (max 16k per side).
+/// Decode encoded image bytes into a premultiplied sRGB pixmap (scaled down to 16k per side).
 pub fn decode(bytes: &[u8]) -> Option<Pixmap> {
     decode_in(bytes, ColorProfile::Srgb).map(|(p, _)| p)
 }
 
-/// Decode encoded image bytes into a premultiplied pixmap (max 16k per side): converted from the
+/// Decode encoded image bytes into a premultiplied pixmap (scaled down to 16k per side): converted from the
 /// image's own profile into `target` (`false`), or as sRGB when it has none (`true`: the sRGB →
 /// `target` conversion is still to do).
 fn decode_in(bytes: &[u8], target: ColorProfile) -> Option<(Pixmap, bool)> {
     decode_within(bytes, target, MAX_SIDE, MAX_DECODED_BYTES)
 }
 
-/// [`decode_in`] for images at most `max_side` wide and tall whose decoded pixels take at most
-/// `max_bytes`; larger ones are refused from their header, before any pixels are decoded.
+/// [`decode_in`] for images whose decoded pixels take at most `max_bytes` (larger ones are refused
+/// from their header, before any pixels are decoded), scaled down to at most `max_side` wide and
+/// tall.
 pub(crate) fn decode_within(bytes: &[u8], target: ColorProfile, max_side: u32, max_bytes: u64) -> Option<(Pixmap, bool)> {
     use image::ImageDecoder;
     let mut reader = image::ImageReader::new(std::io::Cursor::new(bytes)).with_guessed_format().ok()?;
     let mut limits = image::Limits::default();
-    limits.max_image_width = Some(max_side);
-    limits.max_image_height = Some(max_side);
     limits.max_alloc = Some(max_bytes);
     reader.limits(limits);
     let mut dec = reader.into_decoder().ok()?;
@@ -110,7 +109,11 @@ pub(crate) fn decode_within(bytes: &[u8], target: ColorProfile, max_side: u32, m
         return None;
     }
     let source = crate::image_profile::Source::read(bytes, &mut dec);
-    let img = image::DynamicImage::from_decoder(dec).ok()?;
+    let mut img = image::DynamicImage::from_decoder(dec).ok()?;
+    if img.width() > max_side || img.height() > max_side {
+        // `thumbnail` keeps the aspect ratio and works in integers (no float copy of the pixels).
+        img = img.thumbnail(max_side, max_side);
+    }
     match source.convert(&img, target) {
         Some(rgba) => Some((premultiplied(&rgba)?, false)),
         None => Some((premultiplied(&img.to_rgba8())?, true)),
diff --git a/crates/render/src/lib.rs b/crates/render/src/lib.rs
index 9969a597..24a5e57a 100644
--- a/crates/render/src/lib.rs
+++ b/crates/render/src/lib.rs
@@ -8,6 +8,7 @@
 pub mod backdrop;
 pub mod blur;
 pub mod boolean;
+pub mod dots;
 pub mod draw;
 mod export_depth;
 pub mod fx;
@@ -21,6 +22,7 @@ pub mod pattern;
 pub mod retained;
 pub mod shadow;
 
+pub use dots::Dots;
 pub use draw::{node_outline, paint_bounds, stroke_fill, subtree_outline, ts_path};
 pub use export_depth::{ExportDepthError, MAX_EXPORT_DEPTH, check_export_depth};
 pub use retained::{Retained, Work};
@@ -79,6 +81,10 @@ pub struct Options {
     /// detail, see [`lod`]. Off for everything that must be exact (exports, thumbnails); no
     /// effect in outline mode.
     pub lod: bool,
+    pub magnified_image_pixels: bool,
+    /// A dot grid over the background, under the layers (a board's canvas; drawn only where the
+    /// background is).
+    pub dots: Option<Dots>,
 }
 
 fn new_pixmap(w: u32, h: u32) -> Option<Pixmap> {
@@ -90,7 +96,7 @@ fn new_pixmap(w: u32, h: u32) -> Option<Pixmap> {
 /// The largest backdrop radius (background blur, glass: see [`figcraft_doc::Effect::backdrop_radius`])
 /// in the document (0 without any).
 pub(crate) fn max_backdrop_blur(doc: &Document) -> f64 {
-    doc.nodes().flat_map(|n| n.effects.iter()).map(figcraft_doc::Effect::backdrop_radius).fold(0.0, f64::max)
+    doc.max_backdrop_radius()
 }
 
 /// How far (device pixels) a background blur of `radius` reads its backdrop at `scale`.
@@ -99,8 +105,23 @@ pub(crate) fn backdrop_reach(radius: f64, scale: f64) -> f64 {
     if radius > 0.0 { radius * 1.5 * scale + 3.0 } else { 0.0 }
 }
 
+/// Renders started (bands of one render count once): glass keeps the shapes a later render asks
+/// for again.
+static RENDERS: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0);
+
+/// The number of the render that just started.
+fn start_render() -> u64 {
+    RENDERS.fetch_add(1, std::sync::atomic::Ordering::Relaxed) + 1
+}
+
+/// The number of the latest render started.
+pub(crate) fn render_number() -> u64 {
+    RENDERS.load(std::sync::atomic::Ordering::Relaxed)
+}
+
 /// Render a page region, splitting it into horizontal bands rendered in parallel (desktop).
 pub fn render_view(doc: &Document, page: NodeId, view: &View, opts: &Options) -> Option<Pixmap> {
+    start_render();
     #[cfg(not(target_arch = "wasm32"))]
     {
         let threads = rayon::current_num_threads().clamp(1, 16) as u32;
@@ -112,7 +133,7 @@ pub fn render_view(doc: &Document, page: NodeId, view: &View, opts: &Options) ->
             return Some(p);
         }
     }
-    render_view_single(doc, page, view, opts)
+    render_one(doc, page, view, opts)
 }
 
 /// Render `view` as `bands` horizontal bands in parallel. Bands overlap by what background blurs
@@ -137,7 +158,7 @@ fn render_bands(doc: &Document, page: NodeId, view: &View, opts: &Options, bands
             let top = y0.saturating_sub(overlap);
             let bottom = (y0 + h + overlap).min(view.height).max(y0 + h);
             let v = View { origin: (view.origin.0, view.origin.1 + f64::from(top) / s), scale: view.scale, width: view.width, height: bottom - top };
-            let part = render_view_single(doc, page, &v, opts);
+            let part = render_one(doc, page, &v, opts);
             let own = tiny_skia::IntRect::from_xywh(0, (y0 - top) as i32, view.width.clamp(1, 16_384), h);
             (y0, if overlap == 0 { part } else { part.zip(own).and_then(|(p, r)| p.clone_rect(r)) })
         })
@@ -161,6 +182,12 @@ fn render_bands(doc: &Document, page: NodeId, view: &View, opts: &Options, bands
 
 /// Render a page region on the calling thread.
 pub fn render_view_single(doc: &Document, page: NodeId, view: &View, opts: &Options) -> Option<Pixmap> {
+    start_render();
+    render_one(doc, page, view, opts)
+}
+
+/// [`render_view_single`] as part of a render already started (one of its bands).
+fn render_one(doc: &Document, page: NodeId, view: &View, opts: &Options) -> Option<Pixmap> {
     let mut pix = new_pixmap(view.width, view.height)?;
     let bg = opts.background.or_else(|| match doc.node(page).map(|p| &p.kind) {
         Some(NodeKind::Page { background, .. }) => Some(*background),
@@ -168,8 +195,12 @@ pub fn render_view_single(doc: &Document, page: NodeId, view: &View, opts: &Opti
     });
     if let Some(bg) = bg {
         pix.fill(paint::ts_color(bg));
+        if let Some(d) = &opts.dots {
+            dots::draw(&mut pix, view, d);
+        }
     }
     let lod = opts.lod && !opts.outline_mode && view.scale <= lod::MAX_SCALE;
+    let bounds = draw::Bounds::default();
     let ctx = draw::Ctx {
         doc,
         scale: view.scale,
@@ -178,8 +209,10 @@ pub fn render_view_single(doc: &Document, page: NodeId, view: &View, opts: &Opti
         outlined: &opts.outlined,
         skip: &opts.skip,
         lod,
+        magnified_image_pixels: opts.magnified_image_pixels,
         under: None,
         time: 0.0,
+        bounds: &bounds,
     };
     let xf = view.transform();
     let Some(p) = doc.node(page) else { return Some(pix) };
@@ -201,6 +234,7 @@ pub fn render_nodes_into(doc: &Document, ids: &[NodeId], view: &View, pix: &mut
 
 /// [`render_nodes_into`] `time` seconds into animated GIFs.
 fn nodes_into(doc: &Document, ids: &[NodeId], view: &View, pix: &mut Pixmap, time: f64) {
+    let bounds = draw::Bounds::default();
     let ctx = draw::Ctx {
         doc,
         scale: view.scale,
@@ -209,8 +243,10 @@ fn nodes_into(doc: &Document, ids: &[NodeId], view: &View, pix: &mut Pixmap, tim
         outlined: &[],
         skip: &[],
         lod: false,
+        magnified_image_pixels: false,
         under: None,
         time,
+        bounds: &bounds,
     };
     for id in ids {
         draw::draw_node(&ctx, pix, *id, view.transform() * parent_transform(doc, *id), 0);
@@ -390,7 +426,7 @@ pub fn encode_webp(p: &Pixmap) -> Result<Vec<u8>, String> {
 /// Encode an export in `format` (PNG, JPEG over white, WebP) tagged with the document's colour
 /// `profile`. An sRGB PNG gets an `sRGB` chunk; a Display P3 PNG gets the profile as `iCCP` plus
 /// `cICP` code points; Display P3 JPEG and WebP files embed the ICC profile (untagged files are read
-/// as sRGB). SVG and PDF are not pixel formats: an error.
+/// as sRGB). SVG, PDF and Vector Drawable are not pixel formats: an error.
 pub fn encode_export(p: &Pixmap, format: ExportFormat, profile: ColorProfile) -> Result<Vec<u8>, String> {
     let icc = (!profile.is_srgb()).then(|| profile.icc());
     match format {
@@ -400,7 +436,7 @@ pub fn encode_export(p: &Pixmap, format: ExportFormat, profile: ColorProfile) ->
         }
         ExportFormat::Jpg => jpeg_with(p, Color::WHITE, 90, icc),
         ExportFormat::Webp => webp_with(p, icc),
-        ExportFormat::Svg | ExportFormat::Pdf => Err(format!("{} is not a pixel format", format.label())),
+        ExportFormat::Svg | ExportFormat::Pdf | ExportFormat::VectorDrawable => Err(format!("{} is not a pixel format", format.label())),
     }
 }
 
@@ -434,6 +470,10 @@ mod band_tests;
 #[cfg(test)]
 mod boolean_cache_tests;
 #[cfg(test)]
+mod bounds_memo_tests;
+#[cfg(test)]
+mod dots_tests;
+#[cfg(test)]
 mod effect_order_tests;
 #[cfg(test)]
 mod effects_behaviour_tests;
@@ -454,6 +494,8 @@ mod image_profile_tests;
 #[cfg(test)]
 mod lod_tests;
 #[cfg(test)]
+mod magnified_image_tests;
+#[cfg(test)]
 mod paint_behaviour_tests;
 #[cfg(test)]
 mod progressive_tests;
diff --git a/crates/render/src/lod.rs b/crates/render/src/lod.rs
index 6d742585..a5b3ddc1 100644
--- a/crates/render/src/lod.rs
+++ b/crates/render/src/lod.rs
@@ -60,18 +60,47 @@ fn text_paints<'a>(n: &'a Node, t: &'a TextData) -> impl Iterator<Item = &'a Pai
 /// Whether the subtree of `n` can be splatted: no image or pattern paints (their colours aren't known
 /// without sampling them) and no masks (which change what their siblings show).
 pub fn splattable(doc: &Document, n: &Node, depth: usize) -> bool {
+    splattable_within(doc, n, depth, None).0
+}
+
+/// [`splattable`], kept in and read from `memo` when there is one (layers with children only).
+/// Also returns how many levels the walk went down, or `None` when the nesting cap decided it: such
+/// answers depend on the depth they were asked at and aren't kept, and kept answers are read only
+/// where their levels still fit under the cap.
+pub(crate) fn splattable_within<'a>(doc: &'a Document, n: &Node, depth: usize, memo: Option<&crate::draw::Bounds<'a>>) -> (bool, Option<usize>) {
     if depth > MAX_DEPTH {
-        return false;
+        return (false, None);
+    }
+    let memo = memo.filter(|_| !n.children.is_empty());
+    if let Some((ok, levels)) = memo.and_then(|m| m.splat.borrow().get(&n.id).copied())
+        && depth + levels <= MAX_DEPTH
+    {
+        return (ok, Some(levels));
     }
     let image = |p: &Paint| p.visible && matches!(p.kind, PaintKind::Image(_) | PaintKind::Pattern(_));
     let own = match &n.kind {
         NodeKind::Text(t) => text_paints(n, t).any(image),
         _ => n.fills.iter().any(image),
     };
-    if own || n.strokes.iter().any(image) {
-        return false;
+    let (mut ok, mut below) = (!(own || n.strokes.iter().any(image)), Some(0));
+    if ok {
+        for c in n.children.iter().filter_map(|c| memo.map_or_else(|| doc.node(*c), |m| m.node(doc, *c))).filter(|c| c.visible) {
+            if c.is_mask {
+                ok = false;
+                break;
+            }
+            let (c_ok, c_levels) = splattable_within(doc, c, depth + 1, memo);
+            below = below.zip(c_levels).map(|(b, l)| b.max(l + 1));
+            if !c_ok {
+                ok = false;
+                break;
+            }
+        }
     }
-    n.children.iter().filter_map(|c| doc.node(*c)).filter(|c| c.visible).all(|c| !c.is_mask && splattable(doc, c, depth + 1))
+    if let (Some(m), Some(l)) = (memo, below) {
+        m.splat.borrow_mut().insert(n.id, (ok, l));
+    }
+    (ok, below)
 }
 
 /// A paint's average colour as straight RGBA (alpha times the paint's opacity); `None` for
@@ -199,7 +228,7 @@ pub fn splat_subtree(ctx: &Ctx, pix: &mut Pixmap, n: &Node, xf: Affine, clip: Op
         } else {
             clip
         };
-        for c in n.paint_order().filter_map(|c| ctx.doc.node(c)) {
+        for c in n.paint_order().filter_map(|c| ctx.bounds.node(ctx.doc, c)) {
             splat_subtree(ctx, pix, c, xf * c.transform, clip, alpha, depth + 1);
         }
     }
diff --git a/crates/render/src/lod_tests.rs b/crates/render/src/lod_tests.rs
index de8b52b4..3c35c3c3 100644
--- a/crates/render/src/lod_tests.rs
+++ b/crates/render/src/lod_tests.rs
@@ -154,6 +154,7 @@ fn exports_never_use_lod() {
     crate::render_nodes_into(&d, &[card], &v, &mut exact);
     assert_eq!(png.data(), exact.data());
     let mut preview = Pixmap::new(v.width, v.height).unwrap();
+    let bounds = crate::draw::Bounds::default();
     let ctx = crate::draw::Ctx {
         doc: &d,
         scale,
@@ -162,8 +163,10 @@ fn exports_never_use_lod() {
         outlined: &[],
         skip: &[],
         lod: true,
+        magnified_image_pixels: false,
         under: None,
         time: 0.0,
+        bounds: &bounds,
     };
     let parent = d.world_transform(p);
     crate::draw::draw_node(&ctx, &mut preview, card, v.transform() * parent, 0);
diff --git a/crates/render/src/magnified_image_tests.rs b/crates/render/src/magnified_image_tests.rs
new file mode 100644
index 00000000..07009bce
--- /dev/null
+++ b/crates/render/src/magnified_image_tests.rs
@@ -0,0 +1,75 @@
+use std::sync::Arc;
+
+use figcraft_color::{ImageScaleMode, Paint};
+use figcraft_doc::{Document, ImageData, NodeId, NodeKind};
+
+use crate::{Options, Pixmap, Retained, View, encode_png, render_view};
+
+fn checkerboard_doc() -> (Document, NodeId) {
+    let mut img = Pixmap::new(4, 4).unwrap();
+    for (i, c) in img.data_mut().chunks_exact_mut(4).enumerate() {
+        let black = (i % 4 + i / 4) % 2 == 0;
+        c.copy_from_slice(if black { &[0, 0, 0, 255] } else { &[255, 255, 255, 255] });
+    }
+    let mut d = Document::new("magnified");
+    let page = d.first_page().unwrap();
+    d.images.insert("checker".into(), ImageData { bytes: Arc::new(encode_png(&img).unwrap()), width: 4, height: 4 });
+    let r = d.create(page, NodeKind::Rectangle, "Image", 0.0, 0.0, 4.0, 4.0).unwrap();
+    d.get_mut(r).unwrap().fills = vec![Paint::image("checker", ImageScaleMode::Fill)];
+    (d, page)
+}
+
+fn view(scale: f64) -> View {
+    let side = (4.0 * scale).round() as u32;
+    View { origin: (0.0, 0.0), scale, width: side, height: side }
+}
+
+fn canvas() -> Options {
+    Options { lod: true, magnified_image_pixels: true, ..Default::default() }
+}
+
+fn in_between_greys(p: &Pixmap, side: u32) -> usize {
+    let row = p.width() as usize * 4;
+    p.data().chunks_exact(row).take(side as usize).flat_map(|r| r[..side as usize * 4].chunks_exact(4)).filter(|c| c[0] > 8 && c[0] < 247).count()
+}
+
+#[test]
+fn a_magnified_image_on_the_canvas_shows_its_pixels_as_hard_edged_squares() {
+    let (d, page) = checkerboard_doc();
+    let v = view(8.0);
+    let pix = render_view(&d, page, &v, &canvas()).unwrap();
+    assert_eq!(in_between_greys(&pix, v.width), 0, "each image pixel is one flat 8 × 8 square");
+    for (x, y, black) in [(3, 3, true), (11, 3, false), (3, 11, false), (11, 11, true), (15, 20, false)] {
+        let i = ((y * v.width + x) * 4) as usize;
+        assert_eq!(pix.data()[i] == 0, black, "({x}, {y})");
+    }
+}
+
+#[test]
+fn exports_keep_magnified_images_smooth() {
+    let (d, page) = checkerboard_doc();
+    let v = view(8.0);
+    let pix = render_view(&d, page, &v, &Options::default()).unwrap();
+    assert!(in_between_greys(&pix, v.width) > 0, "an export scaled up blends neighbouring pixels");
+}
+
+#[test]
+fn below_twice_its_size_an_image_stays_smooth_on_the_canvas() {
+    let (d, page) = checkerboard_doc();
+    let v = view(1.5);
+    let canvas = render_view(&d, page, &v, &canvas()).unwrap();
+    let export = render_view(&d, page, &v, &Options::default()).unwrap();
+    assert_eq!(canvas.data(), export.data());
+}
+
+#[test]
+fn turning_pixel_squares_on_redraws_a_retained_view() {
+    let (d, page) = checkerboard_doc();
+    let d = Arc::new(d);
+    let v = view(8.0);
+    let mut r = Retained::default();
+    let smooth = r.render(&d, page, &v, &Options { lod: true, ..Default::default() }).unwrap().1.clone();
+    let squares = r.render(&d, page, &v, &canvas()).unwrap().1.clone();
+    assert!(in_between_greys(&smooth, v.width) > 0);
+    assert_eq!(in_between_greys(&squares, v.width), 0);
+}
diff --git a/crates/render/src/paint_behaviour_tests.rs b/crates/render/src/paint_behaviour_tests.rs
index f4bad2ca..30c583d0 100644
--- a/crates/render/src/paint_behaviour_tests.rs
+++ b/crates/render/src/paint_behaviour_tests.rs
@@ -630,3 +630,35 @@ fn changing_the_colour_profile_converts_or_keeps_values() {
     let seen = draw(&kept);
     assert!(seen[0] > before[0] && seen[2] < before[2], "kept values look more saturated: {seen:?} vs {before:?}");
 }
+
+// ---- strokes on text ----
+
+#[test]
+fn text_strokes_follow_their_alignment() {
+    // #615: as on other shapes (and in SVG export), an inside stroke stays in the glyphs, a centre
+    // one reaches half its weight past them and an outside one all of it.
+    figcraft_text::scan_system_fonts();
+    let left_edge = |align: StrokeAlign| -> Option<u32> {
+        let (mut d, p) = page();
+        let mut td = figcraft_doc::TextData::new("I");
+        td.style.font_size = 120.0;
+        let t = d.create(p, NodeKind::Text(td), "T", 60.0, 30.0, 1.0, 1.0).unwrap();
+        let n = d.get_mut(t).unwrap();
+        n.fills.clear();
+        n.strokes = vec![Paint::solid(hex("#000000"))];
+        n.stroke.weight = 12.0;
+        n.stroke.align = align;
+        let (w, h) = figcraft_text::auto_size(n)?;
+        (n.width, n.height) = (w, h);
+        let pix = render(&d);
+        (0..200).find(|x| (0..200).any(|y| px(&pix, *x, y)[0] < 128))
+    };
+    let (Some(inside), Some(centre), Some(outside)) =
+        (left_edge(StrokeAlign::Inside), left_edge(StrokeAlign::Center), left_edge(StrokeAlign::Outside))
+    else {
+        eprintln!("no font to draw text with; skipping");
+        return;
+    };
+    assert!((5..=7).contains(&(inside - centre)), "centre reaches half the weight past inside: {inside} → {centre}");
+    assert!((5..=7).contains(&(centre - outside)), "outside reaches the rest: {centre} → {outside}");
+}
diff --git a/crates/render/src/pattern.rs b/crates/render/src/pattern.rs
index bfcf8e32..efa23e7b 100644
--- a/crates/render/src/pattern.rs
+++ b/crates/render/src/pattern.rs
@@ -9,7 +9,7 @@ use figcraft_doc::{Document, NodeId};
 use figcraft_geom::Affine;
 use tiny_skia::{FilterQuality, Pixmap, SpreadMode, Transform};
 
-use crate::draw::{Ctx, draw_node};
+use crate::draw::{Bounds, Ctx, draw_node};
 use crate::paint::Prepared;
 
 /// The largest side of a cell's pixmap; a cell showing larger is drawn coarser.
@@ -46,6 +46,7 @@ pub fn cell_pixmap(doc: &Document, pt: &PatternPaint, w: f64, h: f64, scale: f64
     let (pw, ph) = ((cell.size.0 * k).ceil().clamp(1.0, MAX_CELL_PX), (cell.size.1 * k).ceil().clamp(1.0, MAX_CELL_PX));
     let (kx, ky) = (pw / cell.size.0, ph / cell.size.1);
     let mut pix = Pixmap::new(pw as u32, ph as u32)?;
+    let bounds = Bounds::default();
     let ctx = Ctx {
         doc,
         scale: kx.max(ky) * cell.scale,
@@ -54,8 +55,10 @@ pub fn cell_pixmap(doc: &Document, pt: &PatternPaint, w: f64, h: f64, scale: f64
         outlined: &[],
         skip: &[],
         lod: false,
+        magnified_image_pixels: false,
         under: None,
         time,
+        bounds: &bounds,
     };
     let unrotated = src.transform.inverse();
     nested(|| {
diff --git a/crates/render/src/retained.rs b/crates/render/src/retained.rs
index 9776b028..61f11003 100644
--- a/crates/render/src/retained.rs
+++ b/crates/render/src/retained.rs
@@ -45,9 +45,11 @@ struct Frame {
     outline_extras: crate::Outline,
     outlined: Vec<NodeId>,
     lod: bool,
+    magnified_image_pixels: bool,
     skip: Vec<NodeId>,
     solo: Option<NodeId>,
     background: Option<figcraft_color::Color>,
+    dots: Option<crate::Dots>,
     scale: u64,
     /// The view's top-left in device pixels (page origin × scale).
     px: (i64, i64),
@@ -156,9 +158,11 @@ impl Retained {
             && !opts.outline.hidden
             && last.outlined == opts.outlined
             && last.lod == opts.lod
+            && last.magnified_image_pixels == opts.magnified_image_pixels
             && last.skip == opts.skip
             && last.solo == opts.solo
             && last.background == opts.background
+            && last.dots == opts.dots
             && last.scale == snapped.scale.to_bits()
             && last.pix.width() == snapped.width
             && last.pix.height() == snapped.height
@@ -200,9 +204,11 @@ impl Retained {
             outline_extras: opts.outline,
             outlined: opts.outlined.clone(),
             lod: opts.lod,
+            magnified_image_pixels: opts.magnified_image_pixels,
             skip: opts.skip.clone(),
             solo: opts.solo,
             background: opts.background,
+            dots: opts.dots,
             scale: view.scale.to_bits(),
             px,
             fonts,
diff --git a/crates/render/src/tests.rs b/crates/render/src/tests.rs
index 55488153..a5a59831 100644
--- a/crates/render/src/tests.rs
+++ b/crates/render/src/tests.rs
@@ -129,6 +129,27 @@ fn strokes_align() {
     assert_eq!(px(&pix, 30, 8)[0], 0xF5);
 }
 
+#[test]
+fn side_strokes_follow_rounded_corners() {
+    // border-l-4 rounded-r-lg: a straight 4 px bar on the left, nothing on the other edges.
+    let mut d = figcraft_doc::Document::new("t");
+    let p = d.first_page().unwrap();
+    let f = d.create(p, NodeKind::Frame, "F", 10.0, 10.0, 120.0, 60.0).unwrap();
+    let n = d.get_mut(f).unwrap();
+    n.fills = vec![Paint::solid(Color::WHITE)];
+    n.corners.radii = [0.0, 8.0, 8.0, 0.0];
+    n.strokes = vec![Paint::solid(Color::BLACK)];
+    n.stroke.align = StrokeAlign::Inside;
+    n.stroke.sides = Some([0.0, 0.0, 0.0, 4.0]);
+    let pix = render_view(&d, p, &view(150, 80), &Options::default()).unwrap();
+    for x in 10..14 {
+        assert_eq!(px(&pix, x, 40), [0, 0, 0, 255], "x {x}");
+    }
+    for (x, y) in [(14, 40), (129, 40), (126, 12), (126, 67), (70, 10), (70, 69)] {
+        assert_eq!(px(&pix, x, y), [255, 255, 255, 255], "({x}, {y})");
+    }
+}
+
 #[test]
 fn mask_clips_siblings() {
     let mut d = figcraft_doc::Document::new("t");
diff --git a/crates/svg/src/import/mod.rs b/crates/svg/src/import.rs
similarity index 82%
rename from crates/svg/src/import/mod.rs
rename to crates/svg/src/import.rs
index fdae7156..dc936260 100644
--- a/crates/svg/src/import/mod.rs
+++ b/crates/svg/src/import.rs
@@ -377,15 +377,38 @@ fn path(cx: &mut Ctx, p: &usvg::Path, parent: NodeId, base: Affine) {
                 return;
             }
             path.apply_affine(Affine::translate((-bb.x0, -bb.y0)));
-            let mut network = VectorNetwork::from_path(&path);
             let rule = if fill.is_some_and(|f| f.rule() == usvg::FillRule::EvenOdd) { WindingRule::EvenOdd } else { WindingRule::NonZero };
-            for r in &mut network.regions {
-                r.winding = rule;
+            let vector = |path: &BezPath, filled: bool| {
+                let mut network = VectorNetwork::from_path(path);
+                for r in &mut network.regions {
+                    r.winding = rule;
+                }
+                if !filled {
+                    network.regions.clear();
+                }
+                NodeKind::Vector { network }
+            };
+            let at = Affine::translate((bb.x0, bb.y0));
+            // Fill closes every subpath; a stroke only those that close themselves. A filled
+            // and stroked path with a really open subpath becomes a fill layer and a stroke layer.
+            let tol = CLOSE_TOLERANCE * bb.width().max(bb.height());
+            let (snapped, closed) = (closed_for_fill(&path, tol, false), closed_for_fill(&path, tol, true));
+            if let (Some(_), Some(_)) = (fill, stroke)
+                && snapped != closed
+            {
+                let fill_only =
+                    Node::new(cx.doc.alloc_id(), vector(&closed, true), format!("{} fill", layer_name(p.id(), "Vector")), bb.width(), bb.height());
+                let stroke_only = Node::new(cx.doc.alloc_id(), vector(&snapped, false), layer_name(p.id(), "Vector"), bb.width(), bb.height());
+                let mut layers = [paint_path(cx, p, fill_only, at, world, true, false), paint_path(cx, p, stroke_only, at, world, false, true)];
+                if p.paint_order() == usvg::PaintOrder::StrokeAndFill {
+                    layers.reverse();
+                }
+                for n in layers {
+                    cx.add(n, parent);
+                }
+                return;
             }
-            if fill.is_none() {
-                network.regions.clear();
-            }
-            (NodeKind::Vector { network }, Affine::translate((bb.x0, bb.y0)), bb.width(), bb.height(), 0.0)
+            (vector(if fill.is_some() { &closed } else { &path }, fill.is_some()), at, bb.width(), bb.height(), 0.0)
         }
     };
     let fallback = match kind {
@@ -395,12 +418,18 @@ fn path(cx: &mut Ctx, p: &usvg::Path, parent: NodeId, base: Affine) {
         _ => "Vector",
     };
     let mut n = Node::new(cx.doc.alloc_id(), kind, layer_name(p.id(), fallback), w, h);
-    n.transform = transform;
     n.corners.radii = [radius; 4];
-    let target = Target { to_node: transform.inverse() * world, size: (w, h) };
-    n.fills = fill.and_then(|f| paint::paint(cx, f.paint(), f.opacity().get(), target)).into_iter().collect();
+    let n = paint_path(cx, p, n, transform, world, true, true);
+    cx.add(n, parent);
+}
+
+/// Layer `n` of path `p` placed at `transform`, with the path's fill and / or stroke.
+fn paint_path(cx: &mut Ctx, p: &usvg::Path, mut n: Node, transform: Affine, world: Affine, with_fill: bool, with_stroke: bool) -> Node {
+    n.transform = transform;
+    let target = Target { to_node: transform.inverse() * world, size: (n.width, n.height) };
+    n.fills = p.fill().filter(|_| with_fill).and_then(|f| paint::paint(cx, f.paint(), f.opacity().get(), target)).into_iter().collect();
     n.strokes.clear();
-    if let Some(s) = stroke {
+    if let Some(s) = p.stroke().filter(|_| with_stroke) {
         n.strokes = paint::paint(cx, s.paint(), s.opacity().get(), target).into_iter().collect();
         n.stroke = stroke_props(s, length_scale(world));
         // A stroke painted under the fill shows only its outer half.
@@ -409,7 +438,55 @@ fn path(cx: &mut Ctx, p: &usvg::Path, parent: NodeId, base: Affine) {
             n.stroke.weight /= 2.0;
         }
     }
-    cx.add(n, parent);
+    n
+}
+
+/// How far (as a share of the path's larger side) a subpath may end from its start and still be
+/// closed onto it: exporters that round coordinates leave closed outlines this far apart.
+const CLOSE_TOLERANCE: f64 = 1e-3;
+
+/// `path` with the subpaths that end within `tol` of their start closed onto it and, with `all`
+/// (SVG fills every subpath as if closed), every other subpath that can enclose an area (two or
+/// more segments, or one curve) closed with a straight segment.
+fn closed_for_fill(path: &BezPath, tol: f64, all: bool) -> BezPath {
+    use figcraft_geom::kurbo::PathEl;
+    let mut out = BezPath::new();
+    let mut sub: Vec<PathEl> = Vec::new();
+    let flush = |sub: &mut Vec<PathEl>, out: &mut BezPath| {
+        let start = match sub.first() {
+            Some(PathEl::MoveTo(p)) => *p,
+            _ => {
+                sub.clear();
+                return;
+            }
+        };
+        let open = !matches!(sub.last(), Some(PathEl::ClosePath));
+        let segments = sub.len() - 1;
+        let curve = matches!(sub.last(), Some(PathEl::QuadTo(..) | PathEl::CurveTo(..)));
+        if open && (segments >= 2 || curve) {
+            let near = sub.last().and_then(|e| e.end_point()).is_some_and(|end| (end - start).hypot() <= tol);
+            if near && let Some(last) = sub.last_mut() {
+                match last {
+                    PathEl::LineTo(p) | PathEl::QuadTo(_, p) | PathEl::CurveTo(_, _, p) => *p = start,
+                    PathEl::MoveTo(_) | PathEl::ClosePath => {}
+                }
+            }
+            if near || all {
+                sub.push(PathEl::ClosePath);
+            }
+        }
+        for e in sub.drain(..) {
+            out.push(e);
+        }
+    };
+    for e in path.elements() {
+        if matches!(e, PathEl::MoveTo(_)) {
+            flush(&mut sub, &mut out);
+        }
+        sub.push(*e);
+    }
+    flush(&mut sub, &mut out);
+    out
 }
 
 /// A recognised primitive placed by `world`: its kind, transform, size and corner radius. `None`
@@ -595,6 +672,42 @@ pub(crate) fn nesting(data: &[u8], limit: usize) -> usize {
     max
 }
 
+/// Whether `data` nests elements more than [`MAX_NESTING`] deep: the byte scan first, then the
+/// parsed tree (walked without recursion), which also counts what DTD entity references expand to.
+pub(crate) fn too_deep(data: &[u8]) -> bool {
+    if nesting(data, MAX_NESTING) > MAX_NESTING {
+        return true;
+    }
+    let Ok(text) = std::str::from_utf8(data) else { return false };
+    let opt = usvg::roxmltree::ParsingOptions { allow_dtd: true, ..Default::default() };
+    let Ok(xml) = usvg::roxmltree::Document::parse_with_options(text, opt) else { return false };
+    // Depth-first by sibling and parent links; the root is depth 0, each child one deeper.
+    let (mut node, mut depth) = (xml.root(), 0usize);
+    loop {
+        if let Some(child) = node.first_child() {
+            node = child;
+            depth += 1;
+            if depth > MAX_NESTING {
+                return true;
+            }
+            continue;
+        }
+        loop {
+            if let Some(next) = node.next_sibling() {
+                node = next;
+                break;
+            }
+            match node.parent() {
+                Some(up) if depth > 0 => {
+                    node = up;
+                    depth -= 1;
+                }
+                _ => return false,
+            }
+        }
+    }
+}
+
 fn options(data: &[u8], limits: budget::Limits) -> usvg::Options<'static> {
     // Only data URIs, within budgets: an opened or pasted SVG never pulls other files off the disk
     // and never expands without limit.
@@ -651,7 +764,7 @@ fn import_within(
 ) -> Result<Imported, ImportError> {
     // SVGZ is unpacked here, within a budget, so every check below sees the real document.
     let data = budget::document(data, &limits).map_err(ImportError)?;
-    if nesting(&data, MAX_NESTING) > MAX_NESTING {
+    if too_deep(&data) {
         return Err(ImportError(format!("elements nested more than {MAX_NESTING} deep")));
     }
     let tree = usvg::Tree::from_data(&data, &options(&data, limits)).map_err(|e| ImportError(e.to_string()))?;
diff --git a/crates/svg/src/import/budget.rs b/crates/svg/src/import/budget.rs
index e7ae3fc6..75a5e673 100644
--- a/crates/svg/src/import/budget.rs
+++ b/crates/svg/src/import/budget.rs
@@ -74,7 +74,7 @@ fn embedded(used: &Used, limits: &Limits, data: &[u8], opts: &Options) -> Option
     let left = limits.embedded.saturating_sub(used.bytes.load(Ordering::Relaxed));
     let plain = inflate(data, left).ok()?;
     used.bytes.fetch_add(plain.len(), Ordering::Relaxed);
-    if super::nesting(&plain, super::MAX_NESTING) > super::MAX_NESTING {
+    if super::too_deep(&plain) {
         return None;
     }
     used.depth.fetch_add(1, Ordering::Relaxed);
diff --git a/crates/svg/src/import/hostile_tests.rs b/crates/svg/src/import/hostile_tests.rs
index bb750286..0af1297d 100644
--- a/crates/svg/src/import/hostile_tests.rs
+++ b/crates/svg/src/import/hostile_tests.rs
@@ -166,3 +166,18 @@ fn nesting_is_measured_before_parsing() {
     let p = d.first_page().unwrap();
     assert!(import_svg(&mut d, &svg(&deep), p, 0.0, 0.0, "x").is_err());
 }
+
+#[test]
+fn entity_expansion_cannot_bypass_the_nesting_limit() {
+    // An internal-DTD entity whose value nests 300 deep, referenced inside a body nesting 300 deep:
+    // the parsed tree is ~600 deep although the raw bytes never are.
+    let inner = format!("{}{}", "<g>".repeat(300), "</g>".repeat(300));
+    let body = format!("{}&deep;{}", "<g>".repeat(300), "</g>".repeat(300));
+    let data = format!(
+        "<?xml version=\"1.0\"?><!DOCTYPE svg [<!ENTITY deep \"{inner}\">]><svg xmlns=\"http://www.w3.org/2000/svg\" width=\"10\" height=\"10\">{body}</svg>"
+    );
+    let mut d = Document::new("t");
+    let p = d.first_page().unwrap();
+    let err = import_svg(&mut d, data.as_bytes(), p, 0.0, 0.0, "x").err().map(|e| e.to_string()).unwrap_or_default();
+    assert!(err.contains("nested more than 512 deep"), "{err:?}");
+}
diff --git a/crates/svg/src/lib.rs b/crates/svg/src/lib.rs
index a6813017..233da218 100644
--- a/crates/svg/src/lib.rs
+++ b/crates/svg/src/lib.rs
@@ -79,6 +79,8 @@ struct W<'a> {
     clip: Option<String>,
     /// `id` attributes written so far.
     used_ids: std::collections::BTreeSet<String>,
+    /// The next `_k` suffix to try per base id, so repeated names don't rescan from `_2`.
+    next_suffix: std::collections::HashMap<String, usize>,
 }
 
 /// ` clip-path="url(#…)"` for a clip path id (else nothing).
@@ -124,9 +126,24 @@ fn path_d(p: &BezPath) -> String {
     s
 }
 
+/// A matrix scale/shear coefficient to 6 significant digits (unlike [`num`], small values survive).
+fn coeff(v: f64) -> String {
+    if !v.is_finite() || v == 0.0 {
+        return "0".into();
+    }
+    let digits = 5 - v.abs().log10().floor() as i32;
+    let p = 10f64.powi(digits);
+    let r = (v * p).round() / p;
+    format!("{r}")
+}
+
 fn matrix(a: Affine) -> String {
     let c = a.as_coeffs();
-    format!("matrix({} {} {} {} {} {})", num(c[0]), num(c[1]), num(c[2]), num(c[3]), num(c[4]), num(c[5]))
+    // Snap float noise (e.g. 6e-17 from a 90 degree rotation) to zero, relative to the largest term.
+    let eps = c[..4].iter().fold(0.0f64, |m, v| m.max(v.abs())) * 1e-12;
+    let eps = eps.max(1e-12);
+    let k = |v: f64| if v.abs() <= eps { "0".to_string() } else { coeff(v) };
+    format!("matrix({} {} {} {} {} {})", k(c[0]), k(c[1]), k(c[2]), k(c[3]), num(c[4]), num(c[5]))
 }
 
 /// A view of page area `b` at `k` device pixels per unit (fewer when that makes it larger than
@@ -150,8 +167,15 @@ fn blend_style(b: figcraft_color::BlendMode) -> String {
     }
 }
 
+/// `s` escaped for XML text and attribute values; characters XML 1.0 forbids (control characters
+/// other than tab, newline and carriage return, U+FFFE and U+FFFF) are left out.
 fn esc(s: &str) -> String {
-    s.replace('&', "&amp;").replace('<', "&lt;").replace('>', "&gt;").replace('"', "&quot;")
+    s.chars().filter(|&c| xml_char(c)).collect::<String>().replace('&', "&amp;").replace('<', "&lt;").replace('>', "&gt;").replace('"', "&quot;")
+}
+
+/// Whether XML 1.0 allows `c` (see [`esc`]).
+fn xml_char(c: char) -> bool {
+    !matches!(c, '\u{0}'..='\u{8}' | '\u{b}' | '\u{c}' | '\u{e}'..='\u{1f}' | '\u{fffe}' | '\u{ffff}')
 }
 
 fn hex(c: Color) -> String {
@@ -160,8 +184,13 @@ fn hex(c: Color) -> String {
 
 impl W<'_> {
     fn id(&mut self, prefix: &str) -> String {
-        self.next += 1;
-        format!("{prefix}{}", self.next)
+        loop {
+            self.next += 1;
+            let id = format!("{prefix}{}", self.next);
+            if self.used_ids.insert(id.clone()) {
+                return id;
+            }
+        }
     }
 
     /// `fill="..." [fill-opacity]` for a paint on a w×h box; `None` when it paints nothing.
@@ -547,9 +576,19 @@ impl W<'_> {
 
     /// `name` as an `id` not used yet in this file (spaces as underscores; repeats get `_2`…).
     fn unique_id(&mut self, name: &str) -> String {
-        let base: String = name.chars().take(200).map(|c| if c.is_whitespace() || c.is_control() { '_' } else { c }).collect();
+        // As written: what `esc` leaves out isn't part of it.
+        let base: String =
+            name.chars().take(200).map(|c| if c.is_whitespace() || c.is_control() { '_' } else { c }).filter(|&c| xml_char(c)).collect();
         let base = if base.is_empty() { "layer".to_string() } else { base };
-        let id = (1..).map(|k| if k == 1 { base.clone() } else { format!("{base}_{k}") }).find(|i| !self.used_ids.contains(i)).unwrap_or(base);
+        let next = self.next_suffix.entry(base.clone()).or_insert(1);
+        let id = loop {
+            let k = *next;
+            *next += 1;
+            let candidate = if k == 1 { base.clone() } else { format!("{base}_{k}") };
+            if !self.used_ids.contains(&candidate) {
+                break candidate;
+            }
+        };
         self.used_ids.insert(id.clone());
         id
     }
@@ -586,7 +625,9 @@ impl W<'_> {
                         }
                         let end = glyphs.get(j).map_or(line.char_end, |g| g.char_start).max(start).min(chars.len());
                         let text: String = chars.get(start.min(end)..end).unwrap_or(&[]).iter().collect();
-                        let text = st.case.apply(text.trim_end_matches(['\n', '\r']));
+                        let prev = start.checked_sub(1).and_then(|k| chars.get(k)).copied();
+                        let before = start.checked_sub(2).and_then(|k| chars.get(k)).copied();
+                        let text = st.case.apply_between(text.trim_end_matches(['\n', '\r']), before, prev);
                         let own = match layout.styles.get(style).and_then(|s| s.fills.as_ref()) {
                             Some(fills) => {
                                 let a = fills.iter().find_map(|p| self.paint_attr(p, n.width, n.height)).unwrap_or_else(|| "fill=\"none\"".into());
@@ -601,7 +642,9 @@ impl W<'_> {
                     continue;
                 }
                 let text: String = chars.get(line.char_start..line.char_end.min(chars.len())).unwrap_or(&[]).iter().collect();
-                let text = st.case.apply(text.trim_end_matches(['\n', '\r']));
+                let prev = line.char_start.checked_sub(1).and_then(|k| chars.get(k)).copied();
+                let before = line.char_start.checked_sub(2).and_then(|k| chars.get(k)).copied();
+                let text = st.case.apply_between(text.trim_end_matches(['\n', '\r']), before, prev);
                 let (x, y) = layout.glyphs.get(line.glyph_start).map_or((0.0, line.baseline), |g| (g.x, g.y));
                 let _ = write!(spans, "<tspan x=\"{}\" y=\"{}\">{}</tspan>", num(x), num(y), esc(&text));
             }
@@ -638,7 +681,7 @@ impl W<'_> {
             || k.brush.is_some()
             || k.cap_start.is_arrow()
             || k.cap_end.is_arrow()
-            || matches!(&n.kind, NodeKind::Vector { network } if network.has_point_styles())
+            || matches!(&n.kind, NodeKind::Vector { network } if network.has_point_styles(k.join))
             || !(w.is_finite() && w > 0.0)
         {
             return None;
@@ -1002,6 +1045,7 @@ pub fn try_export_svg(doc: &Document, ids: &[NodeId], opts: &SvgOptions) -> Resu
         mask: None,
         clip: None,
         used_ids: Default::default(),
+        next_suffix: Default::default(),
     };
     for id in ids {
         let parent_xf = doc.node(*id).and_then(|n| n.parent).map(|p| doc.world_transform(p)).unwrap_or(Affine::IDENTITY);
diff --git a/crates/svg/src/tests.rs b/crates/svg/src/tests.rs
index b15cd999..bfce1cf4 100644
--- a/crates/svg/src/tests.rs
+++ b/crates/svg/src/tests.rs
@@ -115,3 +115,165 @@ fn text_run_fill_survives_live_text_export() {
     assert!(svg.contains("#000000"), "{svg}");
     assert!(svg.contains("fill=\"#00FF00\"") && svg.contains(">b</tspan>") && svg.contains(">a</tspan>"), "{svg}");
 }
+
+#[test]
+fn title_case_does_not_restart_words_across_fill_runs_in_live_text() {
+    use figcraft_doc::{StyleRun, TextCase, TextData};
+    figcraft_text::scan_system_fonts();
+    let mut d = Document::new("t");
+    let page = d.first_page().unwrap();
+    let mut text = TextData::new("hello");
+    text.style.font_size = 24.0;
+    text.style.case = TextCase::Title;
+    let mut style = text.style.clone();
+    style.fills = Some(vec![Paint::solid(Color::from_hex("00FF00").unwrap())]);
+    text.runs.push(StyleRun { start: 2, end: 3, style });
+    text.normalize();
+    let id = d.create(page, NodeKind::Text(text), "Text", 0.0, 0.0, 200.0, 40.0).unwrap();
+    d.get_mut(id).unwrap().fills = vec![Paint::solid(Color::BLACK)];
+    let svg = export_svg(&d, &[id], &SvgOptions { outline_text: false, ..SvgOptions::default() }).unwrap();
+    assert!(svg.contains(">He</tspan>") && svg.contains(">l</tspan>") && svg.contains(">lo</tspan>"), "{svg}");
+}
+
+/// Control characters in text (a pasted vertical-tab soft break, U+0001) are not allowed in XML:
+/// live-text export must leave them out so the SVG still parses, for plain and per-run spans.
+#[test]
+fn live_text_export_drops_xml_forbidden_control_characters() {
+    use figcraft_doc::{StyleRun, TextData};
+    figcraft_text::scan_system_fonts();
+    for styled in [false, true] {
+        let mut d = Document::new("t");
+        let page = d.first_page().unwrap();
+        let mut text = TextData::new("line one\u{b}line two\u{1}");
+        text.style.font_size = 24.0;
+        if styled {
+            let mut style = text.style.clone();
+            style.fills = Some(vec![Paint::solid(Color::from_hex("00FF00").unwrap())]);
+            text.runs.push(StyleRun { start: 5, end: 12, style });
+            text.normalize();
+        }
+        let id = d.create(page, NodeKind::Text(text), "Text", 0.0, 0.0, 600.0, 40.0).unwrap();
+        d.get_mut(id).unwrap().fills = vec![Paint::solid(Color::BLACK)];
+        let svg = export_svg(&d, &[id], &SvgOptions { outline_text: false, ..SvgOptions::default() }).unwrap();
+        assert!(!svg.contains('\u{b}') && !svg.contains('\u{1}'), "{svg:?}");
+        assert!(svg.contains("line") && svg.contains("two"), "{svg}");
+        let mut d2 = Document::new("t2");
+        let p2 = d2.first_page().unwrap();
+        assert!(import_svg(&mut d2, svg.as_bytes(), p2, 0.0, 0.0, "x").is_ok(), "{svg:?}");
+    }
+}
+
+#[test]
+fn side_strokes_on_rounded_corners_export_as_their_area() {
+    // border-l-4 rounded-r-lg: the stroke path is the 4 px bar (60 px tall), drawn even-odd.
+    use figcraft_geom::Shape;
+    let mut d = Document::new("t");
+    let p = d.first_page().unwrap();
+    let f = d.create(p, NodeKind::Frame, "F", 0.0, 0.0, 120.0, 60.0).unwrap();
+    let n = d.get_mut(f).unwrap();
+    n.corners.radii = [0.0, 8.0, 8.0, 0.0];
+    n.strokes = vec![Paint::solid(Color::from_hex("FF0000").unwrap())];
+    n.stroke.align = figcraft_doc::StrokeAlign::Inside;
+    n.stroke.sides = Some([0.0, 0.0, 0.0, 4.0]);
+    let svg = export_svg(&d, &[f], &SvgOptions::default()).unwrap();
+    let stroke = svg.split("<path").find(|e| e.contains("#FF0000")).unwrap();
+    assert!(stroke.contains("fill-rule=\"evenodd\""), "{stroke}");
+    let data = stroke.split("d=\"").nth(1).and_then(|s| s.split('"').next()).unwrap();
+    let area = figcraft_geom::BezPath::from_svg(data).unwrap().area().abs();
+    assert!((area - 240.0).abs() < 0.01, "{area}");
+}
+
+#[test]
+fn point_joins_equal_to_the_layer_join_keep_a_plain_stroke() {
+    use figcraft_doc::{StrokeJoin, VectorNetwork};
+    use figcraft_geom::kurbo::Point;
+    let svg_with = |join: StrokeJoin| {
+        let mut network = VectorNetwork::from_points(&[Point::new(0.0, 0.0), Point::new(50.0, 50.0), Point::new(100.0, 0.0)], false);
+        for v in &mut network.vertices {
+            v.join = Some(StrokeJoin::Miter);
+        }
+        if let Some(v) = network.vertices.get_mut(1) {
+            v.join = Some(join);
+        }
+        let mut d = Document::new("t");
+        let p = d.first_page().unwrap();
+        let v = d.create(p, NodeKind::Vector { network }, "V", 0.0, 0.0, 100.0, 50.0).unwrap();
+        let n = d.get_mut(v).unwrap();
+        n.strokes = vec![Paint::solid(Color::from_hex("000000").unwrap())];
+        n.stroke.weight = 2.0;
+        n.stroke.join = StrokeJoin::Miter;
+        export_svg(&d, &[v], &SvgOptions::default()).unwrap()
+    };
+    assert!(svg_with(StrokeJoin::Miter).contains("stroke-width=\"2\""), "equal joins stay a stroke");
+    assert!(!svg_with(StrokeJoin::Round).contains("stroke-width="), "a differing join is drawn as an outline");
+}
+
+#[test]
+fn unique_id_is_linear_for_repeated_names() {
+    let d = Document::new("t");
+    let opts = SvgOptions::default();
+    let mut w = W {
+        doc: &d,
+        roots: &[],
+        page: Affine::IDENTITY,
+        defs: String::new(),
+        body: String::new(),
+        next: 0,
+        opts: &opts,
+        mask: None,
+        clip: None,
+        used_ids: Default::default(),
+        next_suffix: Default::default(),
+    };
+    assert_eq!(w.unique_id("a"), "a");
+    assert_eq!(w.unique_id("a_3"), "a_3");
+    assert_eq!(w.unique_id("a"), "a_2");
+    assert_eq!(w.unique_id("a"), "a_4");
+    // Unique as written, without what XML leaves out.
+    assert_eq!(w.unique_id("b\u{fffe}"), "b");
+    assert_eq!(w.unique_id("b\u{ffff}"), "b_2");
+    let start = std::time::Instant::now();
+    for _ in 0..30_000 {
+        w.unique_id("Rectangle");
+    }
+    assert_eq!(w.unique_id("Rectangle"), "Rectangle_30001");
+    assert!(start.elapsed() < std::time::Duration::from_secs(2), "unique_id is quadratic: {:?}", start.elapsed());
+}
+
+#[test]
+fn layer_ids_never_clash_with_generated_ids() {
+    let mut d = Document::new("t");
+    let p = d.first_page().unwrap();
+    let f = d.create(p, NodeKind::Frame, "clip1", 0.0, 0.0, 100.0, 100.0).unwrap();
+    d.get_mut(f).unwrap().clip = true;
+    d.create(f, NodeKind::Rectangle, "R", 0.0, 0.0, 50.0, 50.0).unwrap();
+    let svg = export_svg(&d, &[f], &SvgOptions { include_ids: true, ..SvgOptions::default() }).unwrap();
+    assert_eq!(svg.matches("id=\"clip1\"").count(), 1, "{svg}");
+}
+
+#[test]
+fn a_filled_open_curve_is_closed_for_its_fill() {
+    // SVG fills an open subpath as if closed: one curve and the line back enclose an area.
+    let mut d = Document::new("t");
+    let p = d.first_page().unwrap();
+    let svg = r##"<svg xmlns="http://www.w3.org/2000/svg" width="100" height="50"><path fill="#000000" d="M0 0C0 50 100 50 100 0"/></svg>"##;
+    import_svg(&mut d, svg.as_bytes(), p, 0.0, 0.0, "x").unwrap();
+    let loops = |n: &figcraft_doc::Node| match &n.kind {
+        NodeKind::Vector { network } => network.regions.iter().map(|r| r.loops.len()).sum::<usize>(),
+        _ => 0,
+    };
+    assert_eq!(d.nodes().map(loops).sum::<usize>(), 1);
+}
+
+#[test]
+fn matrix_keeps_small_scale_precision() {
+    assert_eq!(matrix(Affine::scale(0.0375)), "matrix(0.0375 0 0 0.0375 0 0)");
+    assert_eq!(matrix(Affine::scale(0.0001)), "matrix(0.0001 0 0 0.0001 0 0)");
+}
+
+#[test]
+fn matrix_snaps_rotation_noise_and_tiny_values() {
+    let r = Affine::rotate(std::f64::consts::FRAC_PI_2);
+    assert_eq!(matrix(r), "matrix(0 1 -1 0 0 0)");
+    assert_eq!(matrix(Affine::scale(1e-320)), "matrix(0 0 0 0 0 0)");
+}
diff --git a/crates/svg/tests/corpus.rs b/crates/svg/tests/corpus.rs
index 35f6f9f4..24803c40 100644
--- a/crates/svg/tests/corpus.rs
+++ b/crates/svg/tests/corpus.rs
@@ -243,6 +243,27 @@ fn groups_keep_their_ids_and_transforms_bake_into_shapes() {
     assert_eq!(layer(&d, f, "d").kind.type_name(), "VECTOR");
 }
 
+#[test]
+fn fills_close_open_subpaths() {
+    let (d, f) = imported("open_subpaths");
+    let loops = |n: &figcraft_doc::Node| match &n.kind {
+        NodeKind::Vector { network } => network.regions.iter().map(|r| r.loops.len()).sum::<usize>(),
+        _ => 0,
+    };
+    // One filled layer: all four subpaths are fill loops, the 0.001 gap and the triangle included.
+    let filled = layer(&d, f, "filled");
+    assert_eq!((filled.kind.type_name(), loops(filled), filled.strokes.len()), ("VECTOR", 4, 0));
+    // Filled and stroked with an open triangle: a fill layer under the stroke, which stays open.
+    let (fill, stroke) = (layer(&d, f, "stroked fill"), layer(&d, f, "stroked"));
+    assert_eq!((loops(fill), fill.fills.len(), fill.strokes.len()), (2, 1, 0));
+    assert_eq!((loops(stroke), stroke.fills.len(), stroke.strokes.len()), (0, 0, 1));
+    // Only near-closed ends: one layer, closed, stroke and all.
+    let near = layer(&d, f, "near");
+    assert_eq!((loops(near), near.fills.len(), near.strokes.len()), (1, 1, 1));
+    let order: Vec<&str> = d.node(f).unwrap().children.iter().filter_map(|c| d.node(*c)).map(|n| n.name.as_str()).collect();
+    assert_eq!(order, ["filled", "stroked fill", "stroked", "near", "under", "under fill"], "paint order: fill then stroke, or the stroke first");
+}
+
 #[test]
 fn basic_shapes_stay_rectangles_ellipses_and_lines() {
     let (d, f) = imported("primitives");
diff --git a/crates/svg/tests/corpus/open_subpaths.svg b/crates/svg/tests/corpus/open_subpaths.svg
new file mode 100644
index 00000000..daed50b7
--- /dev/null
+++ b/crates/svg/tests/corpus/open_subpaths.svg
@@ -0,0 +1,28 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="120">
+  <!-- Fill closes every subpath (SVG painting: "fill ... as if a closepath"). Top row, one filled
+       path: closed with Z; back on its start without Z; 0.001 short of its start without Z (what
+       PDF exports rounded to three decimals write); an open triangle. Bottom row, filled and
+       stroked: 0.001 short (closed, stroke and all); an open triangle (stroked open). Third row,
+       filled and stroked: only 0.001 short (one layer); an open triangle with its stroke under
+       the fill. -->
+  <path id="filled" fill="#000000" d="M10 10h20v20h-20z M50 10h20v20h-20v-20 M90 10h20v20h-20v-19.999 M130 10h20v20"/>
+  <path id="stroked" fill="#000000" stroke="#ff0000" stroke-width="2" d="M10 50h20v20h-20v-19.999 M130 50h20v20"/>
+  <path id="near" fill="#000000" stroke="#ff0000" stroke-width="2" d="M50 90h20v20h-20v-19.999"/>
+  <path id="under" fill="#000000" stroke="#ff0000" stroke-width="2" paint-order="stroke" d="M130 90h20v20"/>
+  <!-- probe 20 20 #000000ff -->
+  <!-- probe 60 20 #000000ff -->
+  <!-- probe 100 20 #000000ff -->
+  <!-- probe 145 15 #000000ff -->
+  <!-- probe 135 25 #00000000 -->
+  <!-- probe 20 60 #000000ff -->
+  <!-- probe 10 60 #ff0000ff -->
+  <!-- probe 140 50 #ff0000ff -->
+  <!-- probe 145 55 #000000ff -->
+  <!-- probe 135 65 #00000000 -->
+  <!-- probe 60 100 #000000ff -->
+  <!-- probe 50 100 #ff0000ff -->
+  <!-- probe 140 89 #ff0000ff -->
+  <!-- probe 140 90 #000000ff -->
+  <!-- probe 145 95 #000000ff -->
+  <!-- probe 135 105 #00000000 -->
+</svg>
diff --git a/crates/text/Cargo.toml b/crates/text/Cargo.toml
index 84a80858..5322ca58 100644
--- a/crates/text/Cargo.toml
+++ b/crates/text/Cargo.toml
@@ -18,3 +18,13 @@ png = { workspace = true }
 unicode-bidi = { workspace = true }
 unicode-segmentation = { workspace = true }
 log = { workspace = true }
+
+# Fonts that font managers (RightFont, FontBase, Typeface) activate without copying them into a font
+# folder are known only to Core Text. Its safe wrappers list every available font's file (Core Text
+# needs unsafe FFI, which the workspace forbids). 22.0 is the first release whose
+# `get_descriptors` takes ownership of the array correctly (20.x and 21.x leak it on every scan);
+# it brings core-foundation 0.10, core-graphics 0.25 and core-graphics-types 0.2 beside the older
+# versions other crates use. Pinned exactly: review the diff before bumping.
+[target.'cfg(target_os = "macos")'.dependencies]
+core-text = { version = "=22.0.0", default-features = false, features = ["link"] }
+objc2 = "0.6"
diff --git a/crates/text/build.rs b/crates/text/build.rs
index d02defef..ba087983 100644
--- a/crates/text/build.rs
+++ b/crates/text/build.rs
@@ -1,32 +1,26 @@
 //! Embeds the optional craft-fonts build input (`CRAFT_FONTS_DIR`): both `fonts/manifest.txt` and the
 //! opt-in Latin presentation fonts in `fonts/latin-manifest.txt` (Inter, Roboto, …). Unset or missing,
-//! `CRAFT_FONTS` is empty and the app uses system fonts. Recipe: craft-fonts `docs/integration.md`.
+//! `CRAFT_FONTS` is empty and native apps use system fonts. Required web releases enforce Inter
+//! Regular/SemiBold and Noto Sans Georgian Regular after filtering. Recipe: craft-fonts `docs/integration.md`.
 //! Noto Sans CJK only with `FIGCRAFT_EMBED_CJK` set (the web build's only way to show CJK UI text).
 use std::fmt::Write as _;
 use std::path::PathBuf;
 
+/// Font build script: emit `craft_fonts.rs` from `input_fonts`, passing the
+/// `CRAFT_FONTS_DIR`, `CRAFT_FONTS_REQUIRED`, wasm target and `FIGCRAFT_EMBED_CJK` inputs;
+/// report generation and write failures with `cargo::error`.
 fn main() {
     println!("cargo::rerun-if-env-changed=CRAFT_FONTS_DIR");
     println!("cargo::rerun-if-env-changed=CRAFT_FONTS_REQUIRED");
     println!("cargo::rerun-if-env-changed=FIGCRAFT_EMBED_CJK");
     let mut src = String::from("pub static CRAFT_FONTS: &[CraftFont] = &[\n");
-    if let Some(dir) = std::env::var_os("CRAFT_FONTS_DIR").map(PathBuf::from) {
-        let mut ok = false;
-        for manifest in ["fonts/latin-manifest.txt", "fonts/manifest.txt"] {
-            match craft_fonts(&dir, manifest) {
-                Ok(entries) => {
-                    ok = true;
-                    src.push_str(&entries);
-                }
-                Err(e) if std::env::var_os("CRAFT_FONTS_REQUIRED").is_some() => {
-                    println!("cargo::error=CRAFT_FONTS_DIR={}: {e}", dir.display());
-                }
-                Err(e) => println!("cargo::warning=craft-fonts {manifest} skipped: CRAFT_FONTS_DIR={}: {e}", dir.display()),
-            }
-        }
-        if !ok {
-            println!("cargo::warning=building without craft-fonts (once it is there, `cargo clean -p figcraft-text` makes the next build use it)");
-        }
+    let dir = std::env::var_os("CRAFT_FONTS_DIR").map(PathBuf::from);
+    let required = std::env::var_os("CRAFT_FONTS_REQUIRED").is_some();
+    let wasm = std::env::var("CARGO_CFG_TARGET_ARCH").is_ok_and(|a| a == "wasm32");
+    let embed_cjk = std::env::var_os("FIGCRAFT_EMBED_CJK").is_some();
+    match input_fonts(dir.as_deref(), wasm, required, embed_cjk) {
+        Ok(entries) => src.push_str(&entries),
+        Err(e) => println!("cargo::error={e}"),
     }
     src.push_str("];\n");
     let out = PathBuf::from(std::env::var_os("OUT_DIR").unwrap_or_default()).join("craft_fonts.rs");
@@ -35,13 +29,45 @@ fn main() {
     }
 }
 
+/// Collect the effective catalog and enforce the required web release faces after filtering.
+fn input_fonts(dir: Option<&std::path::Path>, wasm: bool, required: bool, embed_cjk: bool) -> Result<String, String> {
+    let Some(dir) = dir else {
+        return if required { Err("CRAFT_FONTS_REQUIRED is set but CRAFT_FONTS_DIR is missing".into()) } else { Ok(String::new()) };
+    };
+    let mut out = String::new();
+    let mut faces = Vec::new();
+    for manifest in ["fonts/latin-manifest.txt", "fonts/manifest.txt"] {
+        let path = dir.join(manifest);
+        if manifest == "fonts/latin-manifest.txt" && !path.exists() {
+            watch(&path);
+            continue;
+        }
+        match craft_fonts(dir, manifest, wasm, embed_cjk) {
+            Ok(catalog) => {
+                out.push_str(&catalog.entries);
+                faces.extend(catalog.faces);
+            }
+            Err(e) if required => return Err(format!("CRAFT_FONTS_DIR={}: {e}", dir.display())),
+            Err(e) => println!("cargo::warning=craft-fonts {manifest} skipped: CRAFT_FONTS_DIR={}: {e}", dir.display()),
+        }
+    }
+    if required && wasm {
+        for (family, style) in [("Inter", "Regular"), ("Inter", "SemiBold"), ("Noto Sans Georgian", "Regular")] {
+            if !faces.iter().any(|(f, s)| f == family && s == style) {
+                return Err(format!("required web font missing: {family} {style}; CRAFT_FONTS_DIR must include both Latin and core release faces"));
+            }
+        }
+    }
+    Ok(out)
+}
+
 /// Rebuild when `manifest` changes or, while it is missing, when it is added to its folder.
 ///
 /// Cargo takes a watched path that doesn't exist as changed on every build, and then rebuilds this
 /// crate and every crate that depends on it each time. So a missing manifest is never watched
 /// itself: its folder is, when there is one (a craft-fonts checkout without the Latin manifest).
 /// With no craft-fonts at all there is nothing to watch, so the build can't notice it arriving:
-/// the warning in `main` says how to pick it up.
+/// rebuild this crate after adding a previously absent checkout.
 fn watch(manifest: &std::path::Path) {
     let watched = if manifest.exists() { Some(manifest) } else { manifest.parent().filter(|folder| folder.is_dir()) };
     if let Some(path) = watched {
@@ -49,30 +75,146 @@ fn watch(manifest: &std::path::Path) {
     }
 }
 
-fn craft_fonts(dir: &std::path::Path, manifest_rel: &str) -> Result<String, String> {
+struct Catalog {
+    entries: String,
+    faces: Vec<(String, String)>,
+}
+
+/// Parse a font manifest of `family | style | file | scripts` rows into `CraftFont`
+/// entries: skip Adobe-authored families, skip CJK unless requested, keep the web catalog
+/// to its budgeted families, canonicalize and watch each face, and emit `include_bytes!`
+/// items.
+fn craft_fonts(dir: &std::path::Path, manifest_rel: &str, wasm: bool, embed_cjk: bool) -> Result<Catalog, String> {
     let manifest = dir.join(manifest_rel);
     watch(&manifest);
     let text = std::fs::read_to_string(&manifest).map_err(|e| format!("{}: {e}", manifest.display()))?;
-    let wasm = std::env::var("CARGO_CFG_TARGET_ARCH").is_ok_and(|a| a == "wasm32");
     let mut out = String::new();
+    let mut faces = Vec::new();
     for line in text.lines().map(str::trim).filter(|l| !l.is_empty() && !l.starts_with('#')) {
         let f: Vec<&str> = line.split(" | ").map(str::trim).collect();
         let [family, style, file, scripts, ..] = f.as_slice() else {
             return Err(format!("malformed manifest line: {line}"));
         };
-        // CJK fonts are large; the desktop app finds system CJK fonts instead unless asked.
-        let cjk = scripts.contains("Hans");
-        if cjk && std::env::var_os("FIGCRAFT_EMBED_CJK").is_none() {
+        // FigCraft's asset policy excludes Adobe-authored visual assets on every target.
+        if matches!(*family, "Source Sans 3" | "Source Serif 4") {
             continue;
         }
-        // Web builds have a size budget: Inter, plus Noto Sans CJK (every CJK script, for CJK UI
-        // text) when asked.
-        if wasm && *family != "Inter" && !cjk {
+        // CJK fonts are large; the desktop app finds system CJK fonts instead unless asked.
+        let cjk = scripts.contains("Hans");
+        if cjk && !embed_cjk {
+            continue;
+        }
+        // Web builds have a size budget: Inter, Noto Sans Georgian (small, for the Georgian UI), only the
+        // SemiBold wordmark, and optionally Noto Sans CJK (every CJK script, for CJK UI text).
+        let wordmark = *family == "Archivo" && *style == "SemiBold";
+        if wasm && !matches!(*family, "Inter" | "Noto Sans Georgian") && !wordmark && !cjk {
             continue;
         }
         let path = dir.join(file).canonicalize().map_err(|e| format!("{file}: {e}"))?;
         println!("cargo::rerun-if-changed={}", path.display());
+        faces.push(((*family).to_owned(), (*style).to_owned()));
         let _ = writeln!(out, "    CraftFont {{ family: {family:?}, style: {style:?}, bytes: include_bytes!({:?}) }},", path.display().to_string());
     }
-    Ok(out)
+    Ok(Catalog { entries: out, faces })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::atomic::{AtomicU64, Ordering};
+
+    static NEXT: AtomicU64 = AtomicU64::new(0);
+
+    struct Fixture(PathBuf);
+
+    impl Fixture {
+        /// Test fixture: create a unique temporary directory, write a synthetic face file and
+        /// install the default Georgian manifest.
+        fn new() -> Self {
+            let dir = std::env::temp_dir().join(format!("fig-font-input-{}-{}", std::process::id(), NEXT.fetch_add(1, Ordering::Relaxed)));
+            std::fs::create_dir_all(dir.join("fonts")).unwrap();
+            // The build script validates manifest/file presence; font bytes are checked centrally.
+            std::fs::write(dir.join("fonts/face.ttf"), b"synthetic build-input fixture").unwrap();
+            let fixture = Self(dir);
+            fixture.manifest("manifest.txt", &[("Noto Sans Georgian", "Regular")]);
+            fixture
+        }
+
+        /// Test fixture: write manifest rows that all point at the fixture's `fonts/face.ttf` face.
+        fn manifest(&self, name: &str, faces: &[(&str, &str)]) {
+            let text = faces.iter().map(|(family, style)| format!("{family} | {style} | fonts/face.ttf | Latn\n")).collect::<String>();
+            std::fs::write(self.0.join("fonts").join(name), text).unwrap();
+        }
+    }
+
+    impl Drop for Fixture {
+        /// Remove the fixture's temporary directory, ignoring errors.
+        fn drop(&mut self) {
+            let _ = std::fs::remove_dir_all(&self.0);
+        }
+    }
+
+    /// Asserts the native Latin catalog keeps its 43 permitted presentation faces, the web
+    /// catalog keeps only the four Inter faces, Adobe-authored families are absent, and
+    /// permitted native faces remain.
+    #[test]
+    fn restored_latin_catalog_preserves_permitted_native_faces_and_web_budget() {
+        let f = Fixture::new();
+        std::fs::write(f.0.join("fonts/latin-manifest.txt"), include_str!("tests/fixtures/latin-families.txt")).unwrap();
+        let native = craft_fonts(&f.0, "fonts/latin-manifest.txt", false, false).unwrap();
+        assert_eq!(native.faces.len(), 43, "all prior permitted presentation faces remain available");
+        let web = craft_fonts(&f.0, "fonts/latin-manifest.txt", true, false).unwrap();
+        assert_eq!(web.faces.len(), 4, "the web catalog keeps only the four Inter faces");
+        for catalog in [&native, &web] {
+            assert!(!catalog.entries.contains("Source Sans 3"));
+            assert!(!catalog.entries.contains("Source Serif 4"));
+        }
+        assert!(native.faces.iter().any(|(family, _)| family == "Carlito"));
+        assert!(native.faces.iter().any(|(family, _)| family == "Liberation Serif"));
+        assert!(input_fonts(Some(&f.0), true, true, false).is_ok());
+    }
+
+    /// Asserts required web input rejects a catalog missing Inter Regular or Inter SemiBold.
+    #[test]
+    fn required_web_rejects_core_only_and_partial_latin_catalogs() {
+        let f = Fixture::new();
+        assert!(input_fonts(Some(&f.0), true, true, false).unwrap_err().contains("Inter Regular"));
+        f.manifest("latin-manifest.txt", &[("Inter", "Regular"), ("Unrelated", "SemiBold")]);
+        assert!(input_fonts(Some(&f.0), true, true, false).unwrap_err().contains("Inter SemiBold"));
+    }
+
+    /// Asserts required web input embeds the Inter and Georgian catalogs (three entries) and
+    /// rejects a manifest without Noto Sans Georgian Regular.
+    #[test]
+    fn required_web_embeds_both_catalogs_and_requires_georgian() {
+        let f = Fixture::new();
+        f.manifest("latin-manifest.txt", &[("Inter", "Regular"), ("Inter", "SemiBold")]);
+        let entries = input_fonts(Some(&f.0), true, true, false).unwrap();
+        assert_eq!(entries.matches("CraftFont {").count(), 3);
+        assert!(entries.contains("family: \"Inter\""));
+        assert!(entries.contains("family: \"Noto Sans Georgian\""));
+        f.manifest("manifest.txt", &[("Other", "Regular")]);
+        assert!(input_fonts(Some(&f.0), true, true, false).unwrap_err().contains("Noto Sans Georgian Regular"));
+    }
+
+    /// Asserts absent font input is empty when optional and an error when required, while present
+    /// input includes Noto Sans Georgian.
+    #[test]
+    fn optional_and_native_inputs_keep_their_existing_policy() {
+        let f = Fixture::new();
+        assert!(input_fonts(None, true, false, false).unwrap().is_empty());
+        assert!(input_fonts(None, true, true, false).unwrap_err().contains("CRAFT_FONTS_DIR is missing"));
+        assert!(input_fonts(Some(&f.0), true, false, false).unwrap().contains("Noto Sans Georgian"));
+        assert!(input_fonts(Some(&f.0), false, true, false).unwrap().contains("Noto Sans Georgian"));
+    }
+
+    /// Asserts required web input rejects a manifest whose face file is missing, even when every
+    /// face row is listed.
+    #[test]
+    fn required_web_rejects_missing_asset_even_with_all_face_rows() {
+        let f = Fixture::new();
+        f.manifest("latin-manifest.txt", &[("Inter", "Regular"), ("Inter", "SemiBold")]);
+        std::fs::remove_file(f.0.join("fonts/face.ttf")).unwrap();
+        assert!(input_fonts(Some(&f.0), true, true, false).unwrap_err().contains("fonts/face.ttf"));
+    }
 }
diff --git a/crates/text/src/behaviour_tests.rs b/crates/text/src/behaviour_tests.rs
index b3cb4884..2b19b1d6 100644
--- a/crates/text/src/behaviour_tests.rs
+++ b/crates/text/src/behaviour_tests.rs
@@ -162,6 +162,44 @@ fn resizing_auto_width_auto_height_fixed_and_truncate() {
     assert!(two.truncated && two.lines.len() == 2);
 }
 
+#[test]
+fn truncation_fills_the_last_line_before_the_ellipsis() {
+    // #1375: as with CSS `text-overflow: ellipsis`, the last line shown takes as much of the word
+    // wrapped after it as fits before the ellipsis ("Lorem consec…", not "Lorem…").
+    if face().is_none() {
+        return;
+    }
+    let s = "Lorem consectetur";
+    let full = layout(&text(s, TextAutoResize::WidthAndHeight), None, None);
+    let lorem = layout(&text("Lorem", TextAutoResize::WidthAndHeight), None, None).width;
+    // Room for "Lorem" and most of the next word, not all of it.
+    let w = lorem + (full.width - lorem) * 0.75;
+    let line_h = full.lines[0].height;
+    let mut max_one = text(s, TextAutoResize::Truncate);
+    max_one.max_lines = 1;
+    let mut hug_one = text(s, TextAutoResize::Height);
+    hug_one.max_lines = 1;
+    for (l, why) in [
+        (layout(&text(s, TextAutoResize::Truncate), Some(w), Some(line_h + 1.0)), "cut by the box height"),
+        (layout(&max_one, Some(w), Some(1000.0)), "cut by max lines"),
+        (layout(&hug_one, Some(w), None), "auto height with max lines"),
+    ] {
+        assert!(l.truncated && l.lines.len() == 1, "{why}");
+        let last = l.glyphs.last().unwrap();
+        assert_eq!(last.char_start, last.char_end, "{why}: the ellipsis ends the line");
+        assert!(l.glyphs.iter().any(|g| g.char_start == 6), "{why}: the wrapped word starts on the line");
+        assert!(l.glyphs.iter().all(|g| g.x + g.advance <= w + EPS), "{why}: within the box");
+        assert!((l.height - line_h).abs() < EPS, "{why}: one line tall");
+        let g7 = l.glyphs.iter().find(|g| g.char_start == 7).unwrap();
+        assert_eq!(l.caret(7), (g7.x, 0), "{why}: a caret reaches the chars taken from the next line");
+    }
+    // A line that ends its paragraph keeps its words; the ellipsis follows them.
+    let mut para = text("Lorem\nconsectetur", TextAutoResize::Truncate);
+    para.max_lines = 1;
+    let l = layout(&para, Some(w), Some(1000.0));
+    assert!(l.truncated && l.glyphs.iter().all(|g| g.char_start < 5 || g.char_start == g.char_end));
+}
+
 #[test]
 fn vertical_trim_cap_height_to_baseline() {
     let Some(f) = face() else { return };
@@ -265,10 +303,63 @@ fn hangul_comes_from_a_korean_font_when_one_is_installed() {
     }
 }
 
+#[test]
+fn thai_comes_from_a_thai_font_when_one_is_installed() {
+    // The default (Latin) face has no Thai. With a Thai face (Noto Sans Thai from craft-fonts or
+    // Linux, Leelawadee UI or Tahoma on Windows, Thonburi on macOS) the fallback draws every Thai
+    // cluster, marks included, instead of the missing-glyph box. Skips on a machine without one.
+    // "ภาษาไทย" (the Thai language) and "น้ำ" (water: a tone mark over SARA AM).
+    let s = "Ab \u{0E20}\u{0E32}\u{0E29}\u{0E32}\u{0E44}\u{0E17}\u{0E22} \u{0E19}\u{0E49}\u{0E33}";
+    let chars: Vec<char> = s.chars().collect();
+    let is_thai = |c: &char| ('\u{0E00}'..='\u{0E7F}').contains(c);
+    let draws_all = |f: &Face| chars.iter().filter(|c| is_thai(c)).all(|c| f.has_char(*c));
+    let Some(f) = face() else { return };
+    if draws_all(&f) {
+        return;
+    }
+    let thai = ["Noto Sans Thai", "Noto Sans Thai UI", "Leelawadee UI", "Thonburi", "Tahoma"];
+    if !thai.iter().any(|t| find_face(t, "Regular").is_some_and(|t| draws_all(&t))) {
+        return;
+    }
+    let l = layout(&text(s, TextAutoResize::WidthAndHeight), None, None);
+    let glyphs: Vec<_> = l.glyphs.iter().filter(|g| chars.get(g.char_start).is_some_and(is_thai)).collect();
+    assert!(!glyphs.is_empty());
+    for g in &glyphs {
+        assert!(g.gid != 0, "char {}: missing glyph in {} {}", g.char_start, g.face.family, g.face.style);
+        let cluster = chars.get(g.char_start..g.char_end).unwrap_or(&[]);
+        assert!(cluster.iter().all(|c| g.face.has_char(*c)), "chars {}..{}: drawn by {}, which lacks some", g.char_start, g.char_end, g.face.family);
+    }
+    let drawn: std::collections::BTreeSet<usize> = glyphs.iter().flat_map(|g| g.char_start..g.char_end).collect();
+    let want: std::collections::BTreeSet<usize> = (3..chars.len()).filter(|i| chars[*i] != ' ').collect();
+    assert_eq!(drawn, want, "every Thai char is in a drawn cluster");
+}
+
+#[test]
+fn symbols_come_from_a_symbol_font_when_one_is_installed() {
+    // ⌖ (U+2316) and ⤒ (U+2912) are in no Latin text face. With a symbol font that has them (Apple
+    // Symbols on macOS, Segoe UI Symbol on Windows, Noto Sans Symbols 2 and Noto Sans Math on
+    // Linux) the fallback draws them instead of the missing-glyph box (#1156). Each character
+    // skips on a machine with no installed fallback family that has it.
+    let Some(f) = face() else { return };
+    let families = ["Apple Symbols", "Segoe UI Symbol", "Noto Sans Symbols", "Noto Sans Symbols 2", "Noto Sans Symbols2", "Noto Sans Math"];
+    for c in ['\u{2316}', '\u{2912}'] {
+        if f.has_char(c) || !families.iter().any(|k| find_face(k, "Regular").is_some_and(|k| k.has_char(c))) {
+            continue;
+        }
+        let t = text(&format!("A {c}"), TextAutoResize::WidthAndHeight);
+        let l = layout(&t, None, None);
+        let drawn: Vec<_> = l.glyphs.iter().filter(|g| g.char_start == 2).collect();
+        assert!(!drawn.is_empty(), "U+{:04X} has a glyph", c as u32);
+        for g in drawn {
+            assert!(g.face.has_char(c), "U+{:04X} drawn by {} {}, which lacks it", c as u32, g.face.family, g.face.style);
+        }
+    }
+}
+
 #[test]
 fn break_opportunities() {
     // (before, after, may break between, derivation)
-    let cases: [(char, char, bool, &str); 22] = [
+    let cases: [(char, char, bool, &str); 32] = [
         ('a', 'b', false, "inside a Latin word: never"),
         (' ', 'b', true, "after a space"),
         ('a', ' ', false, "before a space: the space hangs at the line's end"),
@@ -291,6 +382,16 @@ fn break_opportunities() {
         ('。', '日', true, "after a full stop"),
         ('日', '「', true, "before an opening bracket"),
         ('\u{3000}', '日', true, "after an ideographic space"),
+        ('キ', 'ｬ', false, "kinsoku: nor a halfwidth small kana"),
+        ('本', 'ｯ', false, "kinsoku: nor the halfwidth small tsu"),
+        ('キ', 'ﾞ', false, "kinsoku: nor the halfwidth voiced sound mark"),
+        ('キ', 'ﾟ', false, "kinsoku: nor the halfwidth semi-voiced sound mark"),
+        ('本', '゛', false, "kinsoku: nor the spacing voiced sound mark"),
+        ('本', '゜', false, "kinsoku: nor the spacing semi-voiced sound mark"),
+        ('本', '〱', false, "kinsoku: nor a kana iteration mark"),
+        ('本', '〳', false, "kinsoku: nor a vertical kana repeat mark"),
+        ('本', '｠', false, "kinsoku: nor a halfwidth closing parenthesis"),
+        ('｟', '日', false, "kinsoku: a halfwidth opening parenthesis never ends a line"),
     ];
     for (a, b, want, why) in cases {
         assert_eq!(break_between(a, b), want, "{a}{b}: {why}");
@@ -304,13 +405,14 @@ fn cjk_lines_wrap_between_ideographs_with_kinsoku() {
     }
     // Box width cut right after char `fit` (chars 0..fit fit, the next one doesn't): the first line
     // and how the second starts. (text, fit, first line, second line starts with, derivation)
-    let cases: [(&str, usize, &str, &str, &str); 6] = [
+    let cases: [(&str, usize, &str, &str, &str); 7] = [
         ("一二三四五六", 3, "一二三", "四", "ideographs break anywhere"),
         ("一二三。四五", 3, "一二", "三。", "。 can't start a line: 三 moves down with it"),
         ("一二「三」", 3, "一二", "「三", "「 can't end a line: it moves down"),
         ("日本語abc def", 5, "日本語", "abc", "no break inside a Latin word: before it"),
         ("abc 日本語です", 6, "abc 日本", "語", "a space or an ideograph is a break"),
         ("한국어 텍스트입니다", 5, "한국어 텍", "스", "Korean breaks between syllables (documentation silent)"),
+        ("一二キｬｯﾄﾞ", 3, "一二", "キｬ", "a halfwidth small kana stays off the line start: キ moves down with it"),
     ];
     for (s, fit, first, second, why) in cases {
         let t = text(s, TextAutoResize::Height);
@@ -324,6 +426,17 @@ fn cjk_lines_wrap_between_ideographs_with_kinsoku() {
     }
 }
 
+#[test]
+fn a_manual_newline_may_start_a_line_with_a_prohibited_character() {
+    if face().is_none() {
+        return;
+    }
+    // The author's own line breaks are kept: 禁則 only applies to automatic wrapping.
+    let t = text("き\nっく", TextAutoResize::Height);
+    let l = layout(&t, None, None);
+    assert_eq!(line_texts(&t, &l), ["き\n", "っく"], "a manual break is not pushed out by kinsoku");
+}
+
 #[test]
 fn full_width_space_hangs_and_breaks() {
     if face().is_none() {
@@ -361,6 +474,18 @@ fn grapheme_clusters() {
     assert!(grapheme_starts("plain ascii").iter().all(|b| *b));
 }
 
+#[test]
+fn backspace_removes_marks_but_keeps_other_graphemes_atomic() {
+    assert_eq!(crate::backspace_step("น้ำ", 3), 2); // Thai spacing mark
+    assert_eq!(crate::backspace_step("e\u{0301}", 2), 1); // Latin combining mark
+    assert_eq!(crate::backspace_step("👨‍👩‍👧", 5), 0); // Emoji ZWJ sequence
+    assert_eq!(crate::backspace_step("🇯🇵", 2), 0); // Flag
+    assert_eq!(crate::backspace_step("x", 1), 0); // Ordinary character
+    assert_eq!(crate::backspace_step("\u{1112}\u{1161}\u{11AB}", 3), 0); // Hangul syllable as conjoining jamo
+    assert_eq!(crate::backspace_step("a\u{200D}", 2), 0); // A letter ending in ZWJ
+    assert_eq!(crate::backspace_step("1\u{FE0F}\u{20E3}", 3), 0); // Keycap
+}
+
 #[test]
 fn a_cluster_is_shaped_with_one_face() {
     if face().is_none() {
diff --git a/crates/text/src/breaks.rs b/crates/text/src/breaks.rs
index 3f5458ea..dbde6213 100644
--- a/crates/text/src/breaks.rs
+++ b/crates/text/src/breaks.rs
@@ -19,14 +19,17 @@ enum Class {
     Hyphen,
     /// Everything else (letters, digits, other symbols): no break inside a run of them.
     Other,
+    /// The figure space: glues what's on either side, ideographs included.
+    Glue,
 }
 
-/// Opening brackets and quotes (line-end prohibited).
-const OPEN: &str = "([{‘“〈《「『【〔〖〘〚〝（［｛｢";
-/// Closing brackets, quotes and punctuation, iteration marks, small kana and the prolonged sound
-/// mark (line-start prohibited; the small katakana extensions U+31F0..U+31FF are a range below).
-const CLOSE: &str =
-    ")]},.:;!?’”‥…‼⁇⁈⁉、。々〉》」』】〕〗〙〛〜〞〟〻ぁぃぅぇぉっゃゅょゎゕゖゝゞ゠ァィゥェォッャュョヮヵヶ・ーヽヾ！），．：；？］｝｡｣､･ｰ";
+/// Opening brackets and quotes (line-end prohibited, JIS X 4051's 行末禁則).
+const OPEN: &str = "([{‘“〈《「『【〔〖〘〚〝（［｛｢｟";
+/// Closing brackets, quotes and punctuation, iteration marks, small kana, the prolonged sound mark
+/// and the (semi-)voiced sound marks (line-start prohibited, JIS X 4051's 行頭禁則). Two blocks
+/// are ranges in [`class`] instead: the small katakana extensions U+31F0..U+31FF and the halfwidth
+/// small kana U+FF67..U+FF6F plus the halfwidth voicing marks U+FF9E/U+FF9F.
+const CLOSE: &str = ")]},.:;!?’”‥…‼⁇⁈⁉、。々〉》」』】〕〗〙〛〜〞〟〻ぁぃぅぇぉっゃゅょゎゕゖゝゞ゠ァィゥェォッャュョヮヵヶ・ーヽヾ！），．：；？］｝｡｣､･ｰ｠゛゜〱〲〳〴〵";
 
 fn class(c: char) -> Class {
     if c.is_ascii_alphanumeric() {
@@ -35,11 +38,12 @@ fn class(c: char) -> Class {
     if OPEN.contains(c) {
         return Class::Open;
     }
-    if CLOSE.contains(c) || ('\u{31F0}'..='\u{31FF}').contains(&c) {
+    if CLOSE.contains(c) || ('\u{31F0}'..='\u{31FF}').contains(&c) || ('\u{FF67}'..='\u{FF6F}').contains(&c) || matches!(c, '\u{FF9E}' | '\u{FF9F}') {
         return Class::Close;
     }
     match c {
-        ' ' | '\t' | '\u{3000}' | '\u{2002}'..='\u{200B}' => Class::Space,
+        ' ' | '\t' | '\u{3000}' | '\u{2002}'..='\u{2006}' | '\u{2008}'..='\u{200B}' => Class::Space,
+        '\u{2007}' => Class::Glue,
         '-' | '/' | '\u{2010}' | '\u{2013}' | '\u{2014}' => Class::Hyphen,
         '\u{2E80}'..='\u{2FFF}'
         | '\u{3003}'..='\u{33FF}'
@@ -60,8 +64,8 @@ pub(crate) fn break_between(a: char, b: char) -> bool {
     use Class::*;
     match (class(a), class(b)) {
         // Spaces hang at the end of the line before them; kinsoku: no closing mark starts a line,
-        // no opening mark ends one.
-        (_, Space | Close) | (Open, _) => false,
+        // no opening mark ends one; glue holds on both sides.
+        (_, Space | Close | Glue) | (Open | Glue, _) => false,
         (Space | Hyphen | Ideo, _) | (_, Ideo) => true,
         _ => false,
     }
@@ -86,7 +90,7 @@ pub(crate) fn grapheme_starts(text: &str) -> Vec<bool> {
 }
 
 /// The char index of the grapheme cluster boundary after (`forward`) or before char `index` in
-/// `text`: where an arrow key, Delete or Backspace moves the caret to.
+/// `text`: where an arrow key or Delete moves the caret to.
 pub fn grapheme_step(text: &str, index: usize, forward: bool) -> usize {
     let mut at = 0;
     for g in text.graphemes(true) {
@@ -98,3 +102,39 @@ pub fn grapheme_step(text: &str, index: usize, forward: bool) -> usize {
     }
     at.min(index)
 }
+
+/// The start of the text deleted by Backspace at char `index`.
+///
+/// A letter's trailing mark (Grapheme_Cluster_Break Extend or SpacingMark, such as Thai MAI THO or
+/// SARA AM) is deleted on its own; other grapheme clusters remain atomic, so emoji sequences, flags,
+/// keycaps and Hangul syllables written as conjoining jamo stay intact.
+pub fn backspace_step(text: &str, index: usize) -> usize {
+    let end = text.chars().count().min(index);
+    let start = grapheme_step(text, end, false);
+    if start == end {
+        return end;
+    }
+
+    let cluster = text.chars().skip(start).take(end - start).collect::<Vec<_>>();
+    let letter_cluster = cluster.len() > 1 && cluster.first().is_some_and(|c| c.is_alphabetic());
+    if letter_cluster && cluster.last().is_some_and(|&c| is_trailing_mark(c)) { end - 1 } else { start }
+}
+
+/// Whether `c` is Extend or SpacingMark: it joins a plain letter's cluster. ZWJ also joins one but
+/// is a joiner, not a mark.
+fn is_trailing_mark(c: char) -> bool {
+    c != '\u{200D}' && format!("a{c}").graphemes(true).count() == 1
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn figure_space_is_non_breaking() {
+        assert!(!break_between('\u{2007}', '0'));
+        assert!(!break_between('1', '\u{2007}'));
+        assert!(!break_between('日', '\u{2007}') && !break_between('\u{2007}', '日'), "nor beside ideographs");
+        assert!(!is_space('\u{2007}'));
+    }
+}
diff --git a/crates/text/src/color.rs b/crates/text/src/color.rs
index ca927a94..0eaca197 100644
--- a/crates/text/src/color.rs
+++ b/crates/text/src/color.rs
@@ -29,8 +29,10 @@ const MAX_RASTER_BYTES: usize = 32 * 1024 * 1024;
 const MAX_RASTER_ENTRIES: usize = 8192;
 /// COLR layer lists kept per face (24 bytes a layer, so a count is enough).
 const MAX_LAYERS: usize = 4096;
+/// Most COLR layers read for one glyph.
+const MAX_COLR_LAYERS: usize = 256;
 /// Widest and tallest PNG strike decoded (strikes are at most a few hundred pixels).
-const MAX_PNG_SIDE: u32 = 4096;
+const MAX_PNG_SIDE: u32 = 1024;
 /// Largest colour raster per em (device pixels). Past this the renderer scales one up instead.
 pub const MAX_PX_PER_EM: f64 = 512.0;
 
@@ -171,6 +173,9 @@ impl Face {
         let colors = palette.as_ref().map(|p| p.colors()).unwrap_or(&[]);
         let mut out = Vec::new();
         for index in range {
+            if out.len() >= MAX_COLR_LAYERS {
+                break;
+            }
             let (layer, color_index) = colr.v0_layer(index)?;
             let rgba = colors.get(usize::from(color_index)).map(|c| [c.red(), c.green(), c.blue(), c.alpha()]).unwrap_or([0, 0, 0, 255]);
             out.push(ColorLayer { gid: layer.to_u32(), rgba });
@@ -230,7 +235,11 @@ fn decode_png(png: &[u8]) -> Option<(Vec<u8>, u32, u32)> {
     if w == 0 || h == 0 || w > MAX_PNG_SIDE || h > MAX_PNG_SIDE {
         return None;
     }
-    let mut buf = vec![0u8; reader.output_buffer_size()?];
+    let buf_size = reader.output_buffer_size()?;
+    if buf_size > 4 * 1024 * 1024 {
+        return None;
+    }
+    let mut buf = vec![0u8; buf_size];
     let info = reader.next_frame(&mut buf).ok()?;
     let (width, height) = (info.width, info.height);
     let data = buf.get(..info.buffer_size())?;
diff --git a/crates/text/src/fontdb.rs b/crates/text/src/fontdb.rs
index d5ff4190..ced18c81 100644
--- a/crates/text/src/fontdb.rs
+++ b/crates/text/src/fontdb.rs
@@ -86,6 +86,8 @@ pub struct Face {
     pub id: u32,
     pub family: String,
     pub style: String,
+    /// The face's PostScript name ("HelveticaNeue-Bold").
+    pub postscript: Option<String>,
     pub weight: u16,
     pub italic: bool,
     pub bytes: FontBytes,
@@ -106,6 +108,8 @@ pub struct Face {
     /// Variation axes (empty for static fonts) and named instances.
     pub axes: Vec<Axis>,
     pub instances: Vec<NamedInstance>,
+    /// The `trak` table's normal track: (size in points, tracking in font units), by size.
+    track: Vec<(f64, f64)>,
     charmap: HashMap<u32, u32>,
     outlines: Mutex<HashMap<(u32, Coords), Arc<BezPath>>>,
     advances: Mutex<HashMap<(u32, Coords), f64>>,
@@ -123,6 +127,29 @@ impl std::fmt::Debug for Face {
 }
 
 impl Face {
+    /// The tracking the font's `trak` table gives text of `size` (pixels per glyph; 0 without a
+    /// table): Apple's platform text engine adds it on its own, FigCraft's doesn't.
+    pub fn tracking(&self, size: f64) -> f64 {
+        let (Some(first), Some(last)) = (self.track.first(), self.track.last()) else { return 0.0 };
+        if !size.is_finite() || self.upem <= 0.0 {
+            return 0.0;
+        }
+        let units = if size <= first.0 {
+            first.1
+        } else if size >= last.0 {
+            last.1
+        } else {
+            self.track
+                .windows(2)
+                .find_map(|w| match w {
+                    [a, b] if size >= a.0 && size <= b.0 && b.0 > a.0 => Some(a.1 + (b.1 - a.1) * (size - a.0) / (b.0 - a.0)),
+                    _ => None,
+                })
+                .unwrap_or(0.0)
+        };
+        units * size / self.upem
+    }
+
     pub fn from_bytes(bytes: FontBytes, index: u32, family_override: Option<&str>, style_override: Option<&str>) -> Option<Face> {
         let data = bytes.data();
         let f = skrifa::FontRef::from_index(data, index).ok()?;
@@ -147,6 +174,7 @@ impl Face {
         let charmap: HashMap<u32, u32> = f.charmap().mappings().map(|(c, g)| (c, g.to_u32())).collect();
         let (axes, instances) = variation_info(&f);
         let has_table = |tag: &[u8; 4]| f.data_for_tag(skrifa::Tag::new(tag)).is_some();
+        let track = f.data_for_tag(skrifa::Tag::new(b"trak")).map(|t| normal_track(t.as_bytes())).unwrap_or_default();
         let bitmap_strikes = has_table(b"sbix") || has_table(b"CBDT") || has_table(b"EBDT");
         let colr = has_table(b"COLR");
         let under = m.underline.map(|d| (f64::from(d.offset), f64::from(d.thickness))).unwrap_or((-upem * 0.1, upem * 0.06));
@@ -159,6 +187,7 @@ impl Face {
             id: NEXT_FACE.fetch_add(1, Ordering::Relaxed),
             italic: !matches!(attrs.style, skrifa::attribute::Style::Normal) || style.to_ascii_lowercase().contains("italic"),
             weight,
+            postscript: name_string(&f, StringId::POSTSCRIPT_NAME),
             family,
             style,
             index,
@@ -173,6 +202,7 @@ impl Face {
             strike_pos: strike,
             shaper,
             gsub_features,
+            track,
             axes,
             instances,
             charmap,
@@ -398,6 +428,31 @@ fn name_string(f: &skrifa::FontRef, id: StringId) -> Option<String> {
     (!s.is_empty()).then_some(s)
 }
 
+/// The normal (0) horizontal track of a `trak` table: (size, tracking in font units) by size. Empty
+/// when the table is missing, damaged or has no normal track.
+fn normal_track(t: &[u8]) -> Vec<(f64, f64)> {
+    let u16_at = |o: usize| t.get(o..o + 2).map(|b| u16::from_be_bytes([b[0], b[1]]));
+    let i16_at = |o: usize| t.get(o..o + 2).map(|b| i16::from_be_bytes([b[0], b[1]]));
+    let fixed_at = |o: usize| t.get(o..o + 4).map(|b| f64::from(i32::from_be_bytes([b[0], b[1], b[2], b[3]])) / 65536.0);
+    let Some(horiz) = u16_at(6).map(usize::from).filter(|o| *o > 0) else { return Vec::new() };
+    let (Some(tracks), Some(sizes)) = (u16_at(horiz).map(usize::from), u16_at(horiz + 2).map(usize::from)) else { return Vec::new() };
+    let Some(size_table) = t.get(horiz + 4..horiz + 8).map(|b| u32::from_be_bytes([b[0], b[1], b[2], b[3]]) as usize) else { return Vec::new() };
+    let sizes = sizes.min(256);
+    for k in 0..tracks.min(64) {
+        let entry = horiz + 8 + k * 8;
+        if fixed_at(entry) != Some(0.0) {
+            continue;
+        }
+        let Some(values) = u16_at(entry + 6).map(usize::from) else { return Vec::new() };
+        let out: Vec<(f64, f64)> = (0..sizes)
+            .filter_map(|i| Some((fixed_at(size_table + i * 4)?, f64::from(i16_at(values + i * 2)?))))
+            .filter(|(s, _)| s.is_finite())
+            .collect();
+        return if out.windows(2).all(|w| w[0].0 < w[1].0) { out } else { Vec::new() };
+    }
+    Vec::new()
+}
+
 /// (family, style) preferring the typographic names.
 fn names(f: &skrifa::FontRef) -> (Option<String>, Option<String>) {
     let family = name_string(f, StringId::TYPOGRAPHIC_FAMILY_NAME).or_else(|| name_string(f, StringId::FAMILY_NAME));
@@ -405,8 +460,10 @@ fn names(f: &skrifa::FontRef) -> (Option<String>, Option<String>) {
     (family, style)
 }
 
-/// Families tried, in order, for characters a text's own font lacks.
-const FALLBACK_FAMILIES: [&str; 18] = [
+/// Families tried, in order, for characters a text's own font lacks. The symbol fonts come last:
+/// Apple Symbols (macOS), Segoe UI Symbol (Windows) and the Noto symbol and math fonts (Linux), for
+/// signs such as ⌖ and ⤒ that no text face has.
+const FALLBACK_FAMILIES: [&str; 29] = [
     "Inter",
     "Helvetica Neue",
     "Arial",
@@ -416,6 +473,8 @@ const FALLBACK_FAMILIES: [&str; 18] = [
     "BIZ UDPGothic",
     "Hiragino Sans",
     "PingFang SC",
+    "Hiragino Sans GB",
+    "Heiti SC",
     "Noto Sans CJK SC",
     "Microsoft YaHei",
     "Apple SD Gothic Neo",
@@ -423,8 +482,17 @@ const FALLBACK_FAMILIES: [&str; 18] = [
     "Noto Sans CJK KR",
     "Noto Sans KR",
     "Noto Sans Arabic",
+    "Noto Sans Thai",
+    "Noto Sans Thai UI",
+    "Leelawadee UI",
+    "Thonburi",
+    "Tahoma",
     "Apple Symbols",
     "Segoe UI Symbol",
+    "Noto Sans Symbols",
+    "Noto Sans Symbols 2",
+    "Noto Sans Symbols2",
+    "Noto Sans Math",
 ];
 
 /// A system font file entry not yet loaded.
@@ -433,6 +501,8 @@ struct Pending {
     path: std::path::PathBuf,
     index: u32,
     style: String,
+    /// The face's PostScript name.
+    postscript: Option<String>,
 }
 
 #[derive(Default)]
@@ -442,12 +512,27 @@ pub struct FontDb {
     families: BTreeMap<String, (String, Vec<usize>)>,
     /// System faces known by name but not loaded (lower-case family → entries).
     pending: BTreeMap<String, (String, Vec<Pending>)>,
+    /// System faces read from disk (file, face index), so a rescan only offers new ones.
+    loaded_files: std::collections::BTreeSet<(std::path::PathBuf, u32)>,
+    /// Font files added as bytes (hash and length → families), so loading one again adds nothing.
+    loaded_bytes: std::collections::HashMap<(u64, usize), Vec<String>>,
     system_scanned: bool,
 }
 
+/// What a later walk of the font folders found ([`rescan_system_fonts`]).
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct Rescan {
+    /// Families that were unknown before.
+    pub added: Vec<String>,
+    /// Every family that gained faces: the new ones and those with styles installed since.
+    pub changed: Vec<String>,
+}
+
 static DB: OnceLock<RwLock<FontDb>> = OnceLock::new();
 /// Set by [`scan_system_fonts_on_demand`].
 static ON_DEMAND: AtomicBool = AtomicBool::new(false);
+/// Set by [`opt_out_of_system_fonts`].
+static OPTED_OUT: AtomicBool = AtomicBool::new(false);
 /// Done once per process: concurrent callers wait for the one scan.
 static SCANNED: OnceLock<()> = OnceLock::new();
 /// Directory walks done (at most one).
@@ -497,6 +582,16 @@ impl FontDb {
         (0..count).filter_map(|i| Face::from_bytes(FontBytes::Shared(shared.clone()), i, None, None)).map(|f| self.add(f)).collect()
     }
 
+    /// The family and style of the face whose PostScript name is `ps` (ignoring case), loaded or
+    /// only scanned.
+    pub fn postscript_face(&self, ps: &str) -> Option<(String, String)> {
+        let is = |p: &Option<String>| p.as_deref().is_some_and(|p| p.eq_ignore_ascii_case(ps));
+        if let Some(f) = self.faces.iter().find(|f| is(&f.postscript)) {
+            return Some((f.family.clone(), f.style.clone()));
+        }
+        self.pending.values().find_map(|(display, entries)| entries.iter().find(|e| is(&e.postscript)).map(|e| (display.clone(), e.style.clone())))
+    }
+
     /// Family display names, sorted (loaded and known system families).
     pub fn families(&self) -> Vec<String> {
         let mut v: Vec<String> = self.families.values().map(|(d, _)| d.clone()).collect();
@@ -513,7 +608,7 @@ impl FontDb {
     /// Style names of a family, by weight then italic.
     pub fn styles(&mut self, family: &str) -> Vec<String> {
         self.load_family(family, None);
-        let Some((_, idx)) = self.families.get(&family.to_lowercase()) else { return vec![] };
+        let Some((_, idx)) = self.families.get(&self.key(family)) else { return vec![] };
         // (weight, italic, order in the font, name): named instances keep the font's order.
         let mut v: Vec<(u16, bool, usize, String)> = Vec::new();
         for f in idx.iter().filter_map(|i| self.faces.get(*i)) {
@@ -534,15 +629,31 @@ impl FontDb {
         v.into_iter().map(|x| x.3).collect()
     }
 
-    pub fn has_family(&self, family: &str) -> bool {
+    /// The key `family` is known under: itself, or for a name designs use for Apple's system font
+    /// (SF Pro, SF UI Text, …) the system font when no font of that name is installed.
+    pub fn key(&self, family: &str) -> String {
         let k = family.to_lowercase();
+        let known = |k: &str| self.families.contains_key(k) || self.pending.contains_key(k);
+        if known(&k) {
+            return k;
+        }
+        match apple_alias(&k) {
+            Some(target) if known(target) => target.to_string(),
+            _ => k,
+        }
+    }
+
+    pub fn has_family(&self, family: &str) -> bool {
+        let k = self.key(family);
         self.families.contains_key(&k) || self.pending.contains_key(&k)
     }
 
     /// Read a system family's faces from disk; with `only`, just the face nearest that style (the
     /// rest stay pending).
     fn load_family(&mut self, family: &str, only: Option<&str>) {
-        let key = family.to_lowercase();
+        let key = self.key(family);
+        // Faces load under the family name the scan gave them (a hidden family's public name).
+        let display = self.pending.get(&key).map(|(d, _)| d.clone());
         let entries = match only {
             None => match self.pending.remove(&key) {
                 Some((_, entries)) => entries,
@@ -576,8 +687,9 @@ impl FontDb {
                     Err(_) => continue,
                 },
             };
-            if let Some(face) = Face::from_bytes(FontBytes::Shared(bytes), e.index, None, Some(&e.style)) {
+            if let Some(face) = Face::from_bytes(FontBytes::Shared(bytes), e.index, display.as_deref(), Some(&e.style)) {
                 self.add(face);
+                self.loaded_files.insert((e.path, e.index));
             }
         }
     }
@@ -592,7 +704,7 @@ impl FontDb {
     /// `style`: a fallback for missing characters needs one face, not every file of a CJK family
     /// (10–20 MB each). The family's other faces load when it is used by name.
     pub fn find_one(&mut self, family: &str, style: &str) -> Option<Arc<Face>> {
-        if !self.families.contains_key(&family.to_lowercase()) {
+        if !self.families.contains_key(&self.key(family)) {
             self.load_family(family, Some(style));
         }
         self.best(family, style)
@@ -600,7 +712,7 @@ impl FontDb {
 
     /// The loaded face of `family` nearest `style`.
     fn best(&self, family: &str, style: &str) -> Option<Arc<Face>> {
-        let (_, idx) = self.families.get(&family.to_lowercase())?;
+        let (_, idx) = self.families.get(&self.key(family))?;
         let faces: Vec<&Arc<Face>> = idx.iter().filter_map(|i| self.faces.get(*i)).collect();
         let want = norm_style(style);
         if let Some(f) = faces.iter().find(|f| norm_style(&f.style) == want).or_else(|| faces.iter().find(|f| f.instance(style).is_some())) {
@@ -668,6 +780,35 @@ impl FontDb {
         self.faces.len()
     }
 
+    /// Offer the families of a later walk of the font folders: new families become pending, a
+    /// family not loaded yet takes the walk's files, and a loaded family keeps its faces and gets
+    /// the files it hasn't read (styles installed since) as pending, read when it is next used.
+    fn merge_rescan(&mut self, found: BTreeMap<String, (String, Vec<Pending>)>) -> Rescan {
+        let mut out = Rescan::default();
+        for (k, (display, entries)) in found {
+            if self.families.contains_key(&k) {
+                let waiting = self.pending.get(&k).map(|(_, v)| v.clone()).unwrap_or_default();
+                let new: Vec<Pending> = entries
+                    .into_iter()
+                    .filter(|e| {
+                        !self.loaded_files.contains(&(e.path.clone(), e.index)) && !waiting.iter().any(|w| w.path == e.path && w.index == e.index)
+                    })
+                    .collect();
+                if !new.is_empty() {
+                    out.changed.push(display.clone());
+                    self.pending.entry(k).or_insert_with(|| (display, Vec::new())).1.extend(new);
+                }
+                continue;
+            }
+            if !self.pending.contains_key(&k) {
+                out.added.push(display.clone());
+            }
+            out.changed.push(display.clone());
+            self.pending.insert(k, (display, entries));
+        }
+        out
+    }
+
     /// Index the system font directories (desktop only): family names are read now, faces loaded
     /// when first used. Safe to call more than once.
     pub fn scan_system(&mut self) {
@@ -675,26 +816,48 @@ impl FontDb {
             return;
         }
         self.system_scanned = true;
-        for dir in system_font_dirs() {
-            scan_dir(&dir, 0, &mut self.pending);
-        }
-        // Families already embedded win.
-        let embedded: Vec<String> = self.families.keys().cloned().collect();
-        for k in embedded {
-            self.pending.remove(&k);
+        let mut found = BTreeMap::new();
+        scan_installed_fonts(&mut found);
+        self.merge_scan(found);
+    }
+
+    /// Offer the families of the first walk of the font folders. A family already embedded keeps
+    /// its faces, which win, and the installed styles it lacks wait beside them (#1246: release
+    /// builds embed Poppins Regular, Italic and Bold, so an installed Poppins SemiBold went unseen).
+    fn merge_scan(&mut self, found: BTreeMap<String, (String, Vec<Pending>)>) {
+        for (k, (display, mut entries)) in found {
+            if let Some((_, idx)) = self.families.get(&k) {
+                let have: Vec<&Arc<Face>> = idx.iter().filter_map(|i| self.faces.get(*i)).collect();
+                entries.retain(|e| !have.iter().any(|f| norm_style(&f.style) == norm_style(&e.style) || f.instance(&e.style).is_some()));
+                if entries.is_empty() {
+                    continue;
+                }
+            }
+            self.pending.entry(k).or_insert((display, entries));
         }
     }
 }
 
+/// The folders this platform keeps installed and activated fonts in, walked by the font scan.
 fn system_font_dirs() -> Vec<std::path::PathBuf> {
     #[allow(unused_mut)]
     let mut v: Vec<std::path::PathBuf> = Vec::new();
     #[cfg(target_os = "macos")]
     {
+        // Subfolders (`Supplemental`) are walked too.
         v.push("/System/Library/Fonts".into());
         v.push("/Library/Fonts".into());
         if let Some(h) = std::env::var_os("HOME") {
-            v.push(std::path::PathBuf::from(h).join("Library/Fonts"));
+            let h = std::path::PathBuf::from(h);
+            v.push(h.join("Library/Fonts"));
+            // Adobe Fonts activates its fonts from here (hidden files named by number), without
+            // installing them into a font folder.
+            v.push(h.join("Library/Application Support/Adobe/CoreSync/plugins/livetype"));
+        }
+        // Fonts the system downloads (PingFang and other CJK faces on current versions) live in
+        // its asset store; `Assets` is the older versions' store.
+        for store in ["/System/Library/AssetsV2", "/System/Library/Assets"] {
+            v.extend(font_asset_dirs(std::path::Path::new(store)));
         }
     }
     #[cfg(target_os = "windows")]
@@ -714,6 +877,15 @@ fn system_font_dirs() -> Vec<std::path::PathBuf> {
     v
 }
 
+/// The font folders (`com_apple_MobileAsset_Font*`, each holding `<id>.asset/AssetData/*.ttc`) in
+/// the macOS asset store `store`: only these are walked, not the store's voices, dictionaries and
+/// models.
+#[cfg(any(target_os = "macos", test))]
+fn font_asset_dirs(store: &std::path::Path) -> Vec<std::path::PathBuf> {
+    let Ok(rd) = std::fs::read_dir(store) else { return Vec::new() };
+    rd.flatten().filter(|e| e.file_name().to_str().is_some_and(|n| n.starts_with("com_apple_MobileAsset_Font"))).map(|e| e.path()).collect()
+}
+
 // Fontconfig's default configuration uses $XDG_DATA_HOME/fonts for user fonts.
 // Ignore relative XDG paths, as required by the XDG Base Directory Specification.
 #[cfg(all(unix, not(target_os = "macos")))]
@@ -730,6 +902,9 @@ fn unix_user_font_dirs(home: Option<std::ffi::OsString>, data_home: Option<std::
     dirs
 }
 
+/// Adds the faces of every font file under `dir` (up to six folders deep) to `out`, keyed by
+/// lowercased family: files named `.ttf`, `.otf`, `.ttc` or `.otc`, and files without an extension
+/// that start with a font signature.
 fn scan_dir(dir: &std::path::Path, depth: usize, out: &mut BTreeMap<String, (String, Vec<Pending>)>) {
     if depth > 6 {
         return;
@@ -747,25 +922,82 @@ fn scan_dir(dir: &std::path::Path, depth: usize, out: &mut BTreeMap<String, (Str
             scan_dir(&path, depth + 1, out);
             continue;
         }
-        // Font-like names can also belong to pipes or devices; opening a pipe can block.
-        // `meta` follows symlinks, so links to regular font files remain supported.
-        if !meta.is_file() {
-            continue;
-        }
-        let ext = path.extension().and_then(|e| e.to_str()).map(str::to_ascii_lowercase).unwrap_or_default();
-        if !matches!(ext.as_str(), "ttf" | "otf" | "ttc" | "otc") {
-            continue;
-        }
-        // Very large files are indexed all the same (Apple Color Emoji is ~180 MB and is where the
-        // system's colour emoji live): `index_bytes` reads headers and name tables out of a zeroed
-        // buffer, so only those parts are ever touched.
-        let Some(bytes) = usize::try_from(meta.len()).ok().filter(|l| *l <= 256 * 1024 * 1024).and_then(|l| index_bytes(&path, l)) else { continue };
-        for (index, family, style) in faces_in(&bytes) {
-            out.entry(family.to_lowercase()).or_insert_with(|| (family.clone(), Vec::new())).1.push(Pending { path: path.clone(), index, style });
+        index_font_file(&path, &meta, out);
+    }
+}
+
+fn index_font_file(path: &std::path::Path, meta: &std::fs::Metadata, out: &mut BTreeMap<String, (String, Vec<Pending>)>) {
+    // Font-like names can also belong to pipes or devices; opening a pipe can block.
+    // `meta` follows symlinks, so links to regular font files remain supported.
+    if !meta.is_file() {
+        return;
+    }
+    let ext = path.extension().and_then(std::ffi::OsStr::to_str).map(str::to_ascii_lowercase).unwrap_or_default();
+    if !matches!(ext.as_str(), "ttf" | "otf" | "ttc" | "otc") && !(path.extension().is_none() && starts_like_a_font(path)) {
+        return;
+    }
+    // Very large files are indexed all the same (Apple Color Emoji is ~180 MB and is where the
+    // system's colour emoji live): `index_bytes` reads headers and name tables out of a zeroed
+    // buffer, so only those parts are ever touched.
+    if meta.len() > MAX_FONT_FILE {
+        return;
+    }
+    let Some(bytes) = usize::try_from(meta.len()).ok().and_then(|l| index_bytes(path, l)) else { return };
+    for (index, family, style, postscript) in faces_in(&bytes) {
+        out.entry(family.to_lowercase()).or_insert_with(|| (family.clone(), Vec::new())).1.push(Pending {
+            path: path.to_path_buf(),
+            index,
+            style,
+            postscript,
+        });
+    }
+}
+
+fn scan_installed_fonts(out: &mut BTreeMap<String, (String, Vec<Pending>)>) {
+    let dirs = system_font_dirs();
+    for dir in &dirs {
+        scan_dir(dir, 0, out);
+    }
+    for path in files_outside_dirs(font_manager_files(), &dirs) {
+        if let Ok(meta) = std::fs::metadata(&path) {
+            index_font_file(&path, &meta, out);
         }
     }
 }
 
+/// A file without an extension is a font when it starts with a font signature (font services such
+/// as Adobe Fonts keep their fonts in files named by number).
+fn starts_like_a_font(path: &std::path::Path) -> bool {
+    use std::io::Read;
+    let mut magic = [0u8; 4];
+    std::fs::File::open(path).and_then(|mut f| f.read_exact(&mut magic)).is_ok() && matches!(&magic, &[0, 1, 0, 0] | b"OTTO" | b"true" | b"ttcf")
+}
+
+fn files_outside_dirs(files: Vec<std::path::PathBuf>, dirs: &[std::path::PathBuf]) -> std::collections::BTreeSet<std::path::PathBuf> {
+    files.into_iter().filter(|file| file.is_absolute() && !dirs.iter().any(|dir| file.starts_with(dir))).collect()
+}
+
+#[cfg(target_os = "macos")]
+fn font_manager_files() -> Vec<std::path::PathBuf> {
+    std::panic::catch_unwind(|| {
+        objc2::rc::autoreleasepool(|_| {
+            core_text::font_collection::create_for_all_families()
+                .get_descriptors()
+                .map(|descriptors| descriptors.iter().filter_map(|descriptor| descriptor.font_path()).collect())
+                .unwrap_or_default()
+        })
+    })
+    .unwrap_or_default()
+}
+
+#[cfg(not(target_os = "macos"))]
+fn font_manager_files() -> Vec<std::path::PathBuf> {
+    Vec::new()
+}
+
+/// The largest font file read (CJK collections run to ~120 MB, Apple Color Emoji ~180 MB).
+pub const MAX_FONT_FILE: u64 = 256 * 1024 * 1024;
+
 /// The parts of a font file the scan reads: headers, table directories and `name` tables, at their
 /// offsets in a zeroed buffer of the file's length (reading whole files was most of the scan).
 fn index_bytes(path: &std::path::Path, len: usize) -> Option<Vec<u8>> {
@@ -802,9 +1034,9 @@ fn index_bytes(path: &std::path::Path, len: usize) -> Option<Vec<u8>> {
     Some(buf)
 }
 
-/// (index, family, style) of each face in a font file: outline fonts and colour fonts (Apple Color
+/// (index, family, style, PostScript name) of each face in a font file: outline fonts and colour fonts (Apple Color
 /// Emoji draws most emoji from `sbix`, Noto Color Emoji has no outlines at all).
-fn faces_in(bytes: &[u8]) -> Vec<(u32, String, String)> {
+fn faces_in(bytes: &[u8]) -> Vec<(u32, String, String, Option<String>)> {
     let count = match FileRef::new(bytes) {
         Ok(FileRef::Collection(c)) => c.len(),
         Ok(FileRef::Font(_)) => 1,
@@ -818,13 +1050,45 @@ fn faces_in(bytes: &[u8]) -> Vec<(u32, String, String)> {
                 .any(|t| f.data_for_tag(skrifa::Tag::new(t)).is_some())
                 .then_some(())?;
             let (family, style) = names(&f);
-            let family = family.filter(|f| !f.starts_with('.'))?;
-            Some((i, family, style.unwrap_or_else(|| "Regular".into())))
+            let family = public_family(&family?)?;
+            Some((i, family, style.unwrap_or_else(|| "Regular".into()), name_string(&f, StringId::POSTSCRIPT_NAME)))
         })
         .collect()
 }
 
+/// The name a font's family is offered under: its own, a public name for Apple's hidden system
+/// families that designs use (`.SF Compact` → SF Compact), none for other hidden (`.`) families.
+fn public_family(family: &str) -> Option<String> {
+    let Some(hidden) = family.strip_prefix('.') else { return Some(family.to_string()) };
+    match hidden {
+        "SF Compact" | "SF Compact Rounded" => Some(hidden.to_string()),
+        "SF NS Rounded" => Some("SF Pro Rounded".into()),
+        _ => None,
+    }
+}
+
+/// The family Apple's system fonts are installed under, for the names designs use for them
+/// (lowercase): SF Pro and SF UI are the variable `SFNS.ttf` ("System Font"), its text and display
+/// cuts its optical sizes.
+fn apple_alias(key: &str) -> Option<&'static str> {
+    Some(match key.trim_start_matches('.') {
+        "sf pro" | "sf pro text" | "sf pro display" | "sf ui text" | "sf ui display" | "sf ns" | "sf ns text" | "sf ns display" | "san francisco" => {
+            "system font"
+        }
+        "sf compact text" | "sf compact display" => "sf compact",
+        _ => return None,
+    })
+}
+
 /// Convenience: find a face with the global db.
+/// The family and style of the installed face whose PostScript name is `ps`.
+pub fn postscript_face(ps: &str) -> Option<(String, String)> {
+    if ps.is_empty() {
+        return None;
+    }
+    db().read().unwrap_or_else(std::sync::PoisonError::into_inner).postscript_face(ps)
+}
+
 pub fn find_face(family: &str, style: &str) -> Option<Arc<Face>> {
     let mut db = db().write().unwrap_or_else(std::sync::PoisonError::into_inner);
     db.find(family, style).or_else(|| db.default_face())
@@ -835,6 +1099,11 @@ pub fn family_names() -> Vec<String> {
     db().read().unwrap_or_else(std::sync::PoisonError::into_inner).families()
 }
 
+/// The global db has `family` (embedded, loaded or indexed; any case).
+pub fn has_family(family: &str) -> bool {
+    db().read().unwrap_or_else(std::sync::PoisonError::into_inner).has_family(family)
+}
+
 /// Style names of a family in the global db.
 pub fn family_styles(family: &str) -> Vec<String> {
     db().write().unwrap_or_else(std::sync::PoisonError::into_inner).styles(family)
@@ -849,26 +1118,84 @@ pub fn scan_system_fonts() {
         if !system_fonts_opted_out() {
             SCANS.fetch_add(1, Ordering::Relaxed);
             let mut found: BTreeMap<String, (String, Vec<Pending>)> = BTreeMap::new();
-            for dir in system_font_dirs() {
-                scan_dir(&dir, 0, &mut found);
-            }
+            scan_installed_fonts(&mut found);
             let mut w = raw_db().write().unwrap_or_else(std::sync::PoisonError::into_inner);
             w.system_scanned = true;
-            for (k, v) in found {
-                if !w.families.contains_key(&k) {
-                    w.pending.entry(k).or_insert(v);
-                }
-            }
+            w.merge_scan(found);
             drop(w);
             crate::clear_layout_cache();
         }
     });
 }
 
-/// `FIGCRAFT_NO_SYSTEM_FONTS` is set (and not `0`): renders use only the embedded fonts.
+/// Walk the system font folders again, for fonts installed while the app runs (the first scan is
+/// once per process): the families that were unknown before, and every family that gained faces.
+/// Before the first scan this is that scan; a no-op on the web or with `FIGCRAFT_NO_SYSTEM_FONTS`.
+pub fn rescan_system_fonts() -> Rescan {
+    #[cfg(not(target_arch = "wasm32"))]
+    if !system_fonts_opted_out() {
+        if SCANNED.get().is_none() {
+            let before: std::collections::BTreeSet<String> =
+                raw_db().read().unwrap_or_else(std::sync::PoisonError::into_inner).families().into_iter().collect();
+            scan_system_fonts();
+            let added: Vec<String> = family_names().into_iter().filter(|f| !before.contains(f)).collect();
+            return Rescan { changed: added.clone(), added };
+        }
+        let mut found: BTreeMap<String, (String, Vec<Pending>)> = BTreeMap::new();
+        scan_installed_fonts(&mut found);
+        let rescan = raw_db().write().unwrap_or_else(std::sync::PoisonError::into_inner).merge_rescan(found);
+        if !rescan.changed.is_empty() {
+            crate::clear_layout_cache();
+        }
+        return rescan;
+    }
+    Rescan::default()
+}
+
+/// Load font file bytes (every face of a collection) into the global db, for a font that isn't
+/// installed. Returns the families of its faces (none: not a font file); the same file again
+/// returns them without adding its faces twice.
+pub fn load_font_bytes(bytes: Vec<u8>) -> Vec<String> {
+    use std::hash::{Hash, Hasher};
+    let mut h = std::collections::hash_map::DefaultHasher::new();
+    bytes.hash(&mut h);
+    let key = (h.finish(), bytes.len());
+    let mut db = db().write().unwrap_or_else(std::sync::PoisonError::into_inner);
+    if let Some(families) = db.loaded_bytes.get(&key) {
+        return families.clone();
+    }
+    let faces = db.add_bytes(bytes);
+    let mut families: Vec<String> = faces.iter().map(|f| f.family.clone()).collect();
+    families.dedup();
+    if !families.is_empty() {
+        db.loaded_bytes.insert(key, families.clone());
+        drop(db);
+        crate::clear_layout_cache();
+    }
+    families
+}
+
+/// `FIGCRAFT_NO_SYSTEM_FONTS` is set (and not `0`), or the process opted out
+/// ([`opt_out_of_system_fonts`]): renders use only the embedded fonts.
 #[cfg(not(target_arch = "wasm32"))]
 fn system_fonts_opted_out() -> bool {
-    std::env::var_os("FIGCRAFT_NO_SYSTEM_FONTS").is_some_and(|v| !v.is_empty() && v != "0")
+    OPTED_OUT.load(Ordering::Relaxed) || std::env::var_os("FIGCRAFT_NO_SYSTEM_FONTS").is_some_and(|v| !v.is_empty() && v != "0")
+}
+
+/// Use only the embedded fonts for the rest of the process, as `FIGCRAFT_NO_SYSTEM_FONTS` does
+/// (headless runs with `--no-system-fonts`): no call scans the system fonts after this.
+pub fn opt_out_of_system_fonts() {
+    OPTED_OUT.store(true, Ordering::Relaxed);
+}
+
+/// Every font text can use is known: the system fonts were indexed, or there are none to index
+/// (opted out, or the web). Until then a family the scan would find counts as missing.
+pub fn installed_fonts_known() -> bool {
+    #[cfg(not(target_arch = "wasm32"))]
+    if !system_fonts_opted_out() {
+        return system_fonts_scanned();
+    }
+    true
 }
 
 /// Index the system fonts the first time the font database is used (headless apps: a run that
diff --git a/crates/text/src/fontdb_tests.rs b/crates/text/src/fontdb_tests.rs
index ea762be6..85d1f3a7 100644
--- a/crates/text/src/fontdb_tests.rs
+++ b/crates/text/src/fontdb_tests.rs
@@ -2,7 +2,8 @@ use super::*;
 
 fn pending(styles: &[&str]) -> FontDb {
     let mut db = FontDb::default();
-    let entries = styles.iter().map(|s| Pending { path: format!("no-such-dir/{s}.ttf").into(), index: 0, style: (*s).into() }).collect();
+    let entries =
+        styles.iter().map(|s| Pending { path: format!("no-such-dir/{s}.ttf").into(), index: 0, style: (*s).into(), postscript: None }).collect();
     db.pending.insert("cjk ui".into(), ("CJK UI".into(), entries));
     db
 }
@@ -70,6 +71,44 @@ fn the_scan_reads_names_like_a_whole_file_read() {
     }
 }
 
+#[test]
+fn macos_font_assets_are_found_in_the_asset_store() {
+    // A store laid out like macOS's: fonts downloaded on demand sit in `<id>.asset/AssetData`
+    // folders under `com_apple_MobileAsset_Font*`; other assets are never walked. Untested on a Mac.
+    struct TempDir(std::path::PathBuf);
+    impl Drop for TempDir {
+        fn drop(&mut self) {
+            let _ = std::fs::remove_dir_all(&self.0);
+        }
+    }
+    let tmp = TempDir(std::env::temp_dir().join(format!("figcraft-font-assets-{}", std::process::id())));
+    let store = tmp.0.join("AssetsV2");
+    let fonts = store.join("com_apple_MobileAsset_Font7");
+    let data = |kind: &std::path::Path| kind.join("0f1e2d.asset").join("AssetData");
+    for dir in [data(&fonts), data(&store.join("com_apple_MobileAsset_VoiceServices"))] {
+        std::fs::create_dir_all(dir).unwrap();
+    }
+    // A file under a font-like name is listed but walks to nothing.
+    std::fs::write(store.join("com_apple_MobileAsset_Font7.plist"), b"not a folder").unwrap();
+    let found = font_asset_dirs(&store);
+    assert!(found.contains(&fonts) && !found.iter().any(|d| d.ends_with("com_apple_MobileAsset_VoiceServices")), "{found:?}");
+    assert!(font_asset_dirs(&tmp.0.join("missing")).is_empty());
+    // With an installed font to copy in (none on CI), the scan finds it only in the font folder.
+    let installed = system_font_dirs()
+        .into_iter()
+        .find_map(|d| std::fs::read_dir(d).into_iter().flatten().flatten().map(|e| e.path()).find(|p| p.extension().is_some_and(|x| x == "ttf")));
+    let Some(font) = installed else { return };
+    for kind in ["com_apple_MobileAsset_Font7", "com_apple_MobileAsset_VoiceServices"] {
+        std::fs::copy(&font, data(&store.join(kind)).join("Font.ttf")).unwrap();
+    }
+    let mut pending = BTreeMap::new();
+    for dir in found {
+        scan_dir(&dir, 0, &mut pending);
+    }
+    let paths: Vec<_> = pending.values().flat_map(|(_, p)| p.iter().map(|p| p.path.clone())).collect();
+    assert!(!paths.is_empty() && paths.iter().all(|p| p.starts_with(&fonts)), "{paths:?}");
+}
+
 #[cfg(unix)]
 #[test]
 fn the_scan_skips_named_pipes() {
@@ -154,6 +193,19 @@ fn fallback_faces_follow_the_runs_style() {
     }
 }
 
+#[test]
+fn every_platform_has_a_symbol_font_in_the_fallbacks() {
+    // Symbols such as ⌖ (U+2316) and ⤒ (U+2912) are in no text face (#1156): macOS has Apple
+    // Symbols, Windows Segoe UI Symbol, and Linux the Noto symbol and math fonts (fontconfig names
+    // "Noto Sans Symbols 2"; some packages name it "Noto Sans Symbols2").
+    for family in ["Apple Symbols", "Segoe UI Symbol", "Noto Sans Symbols", "Noto Sans Symbols 2", "Noto Sans Symbols2", "Noto Sans Math"] {
+        assert!(FALLBACK_FAMILIES.contains(&family), "{family} is a fallback");
+    }
+    // Text faces come first: a symbol font only draws what they lack.
+    let at = |f: &str| FALLBACK_FAMILIES.iter().position(|x| *x == f).unwrap();
+    assert!(at("Noto Sans") < at("Noto Sans Symbols") && at("DejaVu Sans") < at("Noto Sans Math"));
+}
+
 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn user_font_dirs_follow_xdg_data_home() {
@@ -179,3 +231,263 @@ fn user_font_dirs_preserve_non_utf8_paths() {
     assert_eq!(dirs[0].as_os_str().as_bytes(), b"/home/\xff/.fonts");
     assert_eq!(dirs[1].as_os_str().as_bytes(), b"/data/\xfe/fonts");
 }
+
+#[test]
+fn the_scan_reads_font_files_without_an_extension() {
+    // #298: Adobe Fonts keeps the fonts it activates in hidden files named by number. Any installed
+    // font stands in for one (none on CI); a file that isn't a font is left alone.
+    let Some(font) = system_font_dirs().into_iter().find_map(|d| {
+        std::fs::read_dir(d)
+            .ok()?
+            .flatten()
+            .map(|e| e.path())
+            .find(|p| p.extension().is_some_and(|x| x.eq_ignore_ascii_case("ttf") || x.eq_ignore_ascii_case("otf")))
+    }) else {
+        eprintln!("skipping: no installed font to stand in for an activated one");
+        return;
+    };
+    let dir = std::env::temp_dir().join(format!("figcraft-font-bare-{}", std::process::id()));
+    std::fs::create_dir_all(dir.join(".r")).unwrap();
+    std::fs::copy(&font, dir.join(".r/.12345")).unwrap();
+    std::fs::write(dir.join(".r/entitlements"), b"<xml/>").unwrap();
+    let mut found = BTreeMap::new();
+    scan_dir(&dir, 0, &mut found);
+    let _ = std::fs::remove_dir_all(&dir);
+    let families: Vec<&String> = found.values().map(|(f, _)| f).collect();
+    assert_eq!(found.values().map(|(_, v)| v.len()).sum::<usize>(), faces_in(&std::fs::read(&font).unwrap()).len(), "{families:?}");
+    assert!(!families.is_empty(), "{} is read as a font", font.display());
+    assert!(found.values().flat_map(|(_, v)| v).all(|p| p.path.ends_with(".r/.12345")));
+    #[cfg(target_os = "macos")]
+    assert!(system_font_dirs().iter().any(|d| d.ends_with("Adobe/CoreSync/plugins/livetype")), "Adobe Fonts' folder is scanned");
+}
+
+/// A rescan offers new families and the styles installed since, and never a file twice.
+#[test]
+fn a_rescan_offers_fonts_installed_since() {
+    let entry = |s: &str| Pending { path: format!("no-such-dir/{s}.ttf").into(), index: 0, style: s.into(), postscript: None };
+    let mut db = pending(&["Regular"]);
+    let found = |fams: &[(&str, &[&str])]| -> BTreeMap<String, (String, Vec<Pending>)> {
+        fams.iter().map(|(f, styles)| (f.to_lowercase(), ((*f).to_string(), styles.iter().map(|s| entry(s)).collect()))).collect()
+    };
+    // A new family is added; a pending one takes the walk's files (a new style); both changed.
+    let r = db.merge_rescan(found(&[("CJK UI", &["Regular", "Bold"]), ("Brand Sans", &["Regular"])]));
+    assert_eq!(r.added, ["Brand Sans"]);
+    assert_eq!(r.changed, ["Brand Sans", "CJK UI"]);
+    assert!(db.has_family("brand sans"));
+    assert_eq!(left(&db), ["Regular", "Bold"]);
+    // A loaded family keeps its faces and gets only the files it hasn't read, once.
+    db.families.insert("brand sans".into(), ("Brand Sans".into(), Vec::new()));
+    db.pending.remove("brand sans");
+    db.loaded_files.insert(("no-such-dir/Regular.ttf".into(), 0));
+    let same = db.merge_rescan(found(&[("Brand Sans", &["Regular"])]));
+    assert_eq!(same, Rescan::default());
+    assert!(!db.pending.contains_key("brand sans"));
+    let bold = db.merge_rescan(found(&[("Brand Sans", &["Regular", "Black"])]));
+    assert_eq!((bold.added.len(), bold.changed), (0, vec!["Brand Sans".to_string()]));
+    let waiting = |db: &FontDb| db.pending.get("brand sans").map(|(_, v)| v.iter().map(|e| e.style.clone()).collect::<Vec<_>>()).unwrap_or_default();
+    assert_eq!(waiting(&db), ["Black"]);
+    assert_eq!(db.merge_rescan(found(&[("Brand Sans", &["Regular", "Black"])])), Rescan::default());
+    assert_eq!(waiting(&db), ["Black"]);
+}
+
+/// #1246: the first scan offers the installed styles an embedded family lacks (release builds embed
+/// Poppins Regular, Italic and Bold; an installed SemiBold and Medium went unseen). Embedded styles win.
+#[test]
+fn the_scan_offers_installed_styles_an_embedded_family_lacks() {
+    // Any embedded or installed font stands in for the embedded face (none without craft-fonts on CI).
+    let stand_in = CRAFT_FONTS.first().map(|f| f.bytes.to_vec()).or_else(|| {
+        let mut installed = BTreeMap::new();
+        for dir in system_font_dirs() {
+            scan_dir(&dir, 0, &mut installed);
+        }
+        installed.values().flat_map(|(_, v)| v).find_map(|p| std::fs::read(&p.path).ok())
+    });
+    let Some(mut face) = stand_in.and_then(|b| Face::from_bytes(FontBytes::Shared(Arc::new(b)), 0, Some("Brand Sans"), Some("Regular"))) else {
+        eprintln!("skipping: no font to stand in for an embedded one");
+        return;
+    };
+    // A variable stand-in's named instances aren't this family's styles.
+    face.instances.clear();
+    let mut db = FontDb::default();
+    db.add(face);
+    let entry = |s: &str| Pending { path: format!("no-such-dir/{s}.ttf").into(), index: 0, style: s.into(), postscript: None };
+    let found =
+        |family: &str, styles: &[&str]| BTreeMap::from([(family.to_lowercase(), (family.to_string(), styles.iter().map(|s| entry(s)).collect()))]);
+    db.merge_scan(found("Brand Sans", &["Regular"]));
+    assert!(!db.pending.contains_key("brand sans"), "an embedded style isn't read from disk again");
+    db.merge_scan(found("Brand Sans", &["Regular", "SemiBold", "Medium"]));
+    let waiting: Vec<String> = db.pending.get("brand sans").map(|(_, v)| v.iter().map(|e| e.style.clone()).collect()).unwrap_or_default();
+    assert_eq!(waiting, ["SemiBold", "Medium"]);
+    assert_eq!(db.families(), ["Brand Sans"]);
+    db.merge_scan(found("CJK UI", &["Regular", "Bold"]));
+    assert_eq!(left(&db), ["Regular", "Bold"]);
+}
+
+/// Font file bytes add their faces once; junk adds nothing.
+#[test]
+fn font_bytes_load_into_the_db() {
+    assert!(load_font_bytes(b"not a font".to_vec()).is_empty());
+    assert!(load_font_bytes(Vec::new()).is_empty());
+    // With the embedded fonts (absent on CI builds without craft-fonts): a file's family is added,
+    // and loading the same file again returns it without adding its faces twice.
+    if let Some(f) = CRAFT_FONTS.first() {
+        let families = load_font_bytes(f.bytes.to_vec());
+        assert_eq!(families.len(), 1);
+        assert!(families.iter().all(|f| has_family(f)));
+        let faces = db().read().unwrap().face_count();
+        assert_eq!(load_font_bytes(f.bytes.to_vec()), families);
+        assert_eq!(db().read().unwrap().face_count(), faces);
+    }
+}
+
+/// Apple's system font answers to the names designs use for it (SF Pro, SF UI Text, …), unless a
+/// font of that name is installed.
+#[test]
+fn apple_system_font_names_find_the_system_font() {
+    let mut db = FontDb::default();
+    db.pending.insert(
+        "system font".into(),
+        ("System Font".into(), vec![Pending { path: "no-such-dir/SFNS.ttf".into(), index: 0, style: "Regular".into(), postscript: None }]),
+    );
+    for name in ["SF Pro", "SF Pro Text", "SF Pro Display", "SF UI Text", "SF UI Display", ".SF NS Text", "San Francisco"] {
+        assert!(db.has_family(name), "{name}");
+    }
+    assert!(!db.has_family("SF Mono"));
+    db.pending.insert("sf pro".into(), ("SF Pro".into(), Vec::new()));
+    assert_eq!(db.key("SF Pro"), "sf pro", "an installed SF Pro is itself");
+    assert_eq!(db.key("SF UI Text"), "system font");
+}
+
+#[test]
+fn hidden_apple_families_take_public_names() {
+    assert_eq!(public_family(".SF Compact").as_deref(), Some("SF Compact"));
+    assert_eq!(public_family(".SF Compact Rounded").as_deref(), Some("SF Compact Rounded"));
+    assert_eq!(public_family(".SF NS Rounded").as_deref(), Some("SF Pro Rounded"));
+    assert_eq!(public_family(".Keyboard"), None);
+    assert_eq!(public_family("Inter").as_deref(), Some("Inter"));
+}
+
+/// A named style keeps its own optical size whatever the text size (existing documents render as
+/// before); a custom `opsz` value (what a `.sketch` import sets) wins. Needs a variable font with an
+/// optical size axis and named instances: macOS's or Windows' system font.
+#[test]
+fn named_styles_keep_their_optical_size() {
+    let Some(bytes) = ["/System/Library/Fonts/SFNS.ttf", "C:/Windows/Fonts/SegUIVar.ttf"].iter().find_map(|p| std::fs::read(p).ok()) else {
+        return;
+    };
+    let face = Face::from_bytes(FontBytes::Shared(std::sync::Arc::new(bytes)), 0, None, None).unwrap();
+    let opsz = face.axes.iter().position(|a| a.tag == "opsz").unwrap();
+    let inst = face.instances.first().unwrap();
+    let mut style = figcraft_doc::TextStyle { font_style: inst.name.clone(), ..Default::default() };
+    for size in [1.0, 12.0, 40.0, 200.0] {
+        style.font_size = size;
+        assert_eq!(face.axis_values(&style)[opsz], inst.coords[opsz], "{} at {size}", inst.name);
+    }
+    style.variations.insert("opsz".into(), 1e9);
+    assert_eq!(face.axis_values(&style)[opsz], face.axes[opsz].max);
+}
+
+/// The tracking a font's `trak` table gives at a size (Apple's fonts carry one; the platform text
+/// engine applies it on its own), in pixels, interpolated between the sizes the table lists.
+#[test]
+fn trak_tracking_by_size() {
+    let Ok(bytes) = std::fs::read("/System/Library/Fonts/SFNS.ttf") else { return };
+    let face = Face::from_bytes(FontBytes::Shared(std::sync::Arc::new(bytes)), 0, None, None).unwrap();
+    // Track 0 of SF: −12 units at 13 pt, 0 at 12 pt, −40 at 16 pt (2048 units per em).
+    assert!((face.tracking(13.0) - (-12.0 * 13.0 / 2048.0)).abs() < 1e-9, "{}", face.tracking(13.0));
+    assert!(face.tracking(12.0).abs() < 1e-9);
+    assert!((face.tracking(12.5) - (-6.0 * 12.5 / 2048.0)).abs() < 1e-9);
+    // Past the table's ends: its last values.
+    assert!(face.tracking(500.0).is_finite());
+    let plain = crate::fontdb::db().write().unwrap().default_face();
+    if let Some(f) = plain.filter(|f| f.family != "System Font") {
+        let _ = f.tracking(12.0);
+    }
+}
+
+/// A face is found by its PostScript name (ignoring case), loaded or only scanned: the family and
+/// style it is offered under.
+#[test]
+fn faces_by_postscript_name() {
+    let mut db = FontDb::default();
+    db.pending.insert(
+        "brand sans".into(),
+        (
+            "Brand Sans".into(),
+            vec![Pending { path: "no-such-dir/b.ttf".into(), index: 0, style: "Bold".into(), postscript: Some("BrandSans-Bold".into()) }],
+        ),
+    );
+    assert_eq!(db.postscript_face("brandsans-bold"), Some(("Brand Sans".to_string(), "Bold".to_string())));
+    assert_eq!(db.postscript_face("BrandSans-Light"), None);
+    if let Some(f) = CRAFT_FONTS.first()
+        && let Some(face) = Face::from_bytes(FontBytes::Static(f.bytes), 0, Some(f.family), Some(f.style))
+        && let Some(ps) = face.postscript.clone()
+    {
+        db.add(face);
+        assert_eq!(db.postscript_face(&ps), Some((f.family.to_string(), f.style.to_string())));
+    }
+    assert!(postscript_face("").is_none());
+}
+
+#[test]
+fn every_platform_has_a_thai_font_in_the_fallbacks() {
+    // Thai typed into a Latin layer (new text starts in Inter) is drawn by the first fallback that
+    // has it: Noto Sans Thai (craft-fonts, Linux), Leelawadee UI or Tahoma (Windows), Thonburi
+    // (macOS). They come after the Latin faces, which go on drawing Latin text.
+    let at = |family: &str| FALLBACK_FAMILIES.iter().position(|f| *f == family);
+    let latin = at("Segoe UI").unwrap();
+    for thai in ["Noto Sans Thai", "Leelawadee UI", "Tahoma", "Thonburi"] {
+        assert!(at(thai).is_some_and(|i| i > latin), "{thai}");
+    }
+}
+
+// The paths are Unix absolute paths (font managers are a macOS thing): on Windows they aren't absolute.
+#[cfg(unix)]
+#[test]
+fn font_manager_files_outside_the_font_folders_are_indexed_once() {
+    let folders = [std::path::PathBuf::from("/Library/Fonts"), std::path::PathBuf::from("/Users/a/Library/Fonts")];
+    let library = std::path::PathBuf::from("/Users/a/Fonts.rightfontlibrary/fonts/I/Inter/InterVariable.ttf");
+    let files = vec![
+        std::path::PathBuf::from("/Library/Fonts/Arial.ttf"),
+        std::path::PathBuf::from("/Users/a/Library/Fonts/Sub/Brand.otf"),
+        library.clone(),
+        library.clone(),
+        std::path::PathBuf::from("relative/Font.ttf"),
+        std::path::PathBuf::from("/Library/FontsElsewhere/Mono.ttf"),
+    ];
+    let outside: Vec<_> = files_outside_dirs(files, &folders).into_iter().collect();
+    assert_eq!(outside, [std::path::PathBuf::from("/Library/FontsElsewhere/Mono.ttf"), library]);
+}
+
+#[test]
+fn a_font_file_outside_the_font_folders_is_indexed_from_its_path() {
+    struct TempDir(std::path::PathBuf);
+    impl Drop for TempDir {
+        fn drop(&mut self) {
+            let _ = std::fs::remove_dir_all(&self.0);
+        }
+    }
+    let installed = system_font_dirs()
+        .into_iter()
+        .find_map(|d| std::fs::read_dir(d).into_iter().flatten().flatten().map(|e| e.path()).find(|p| p.extension().is_some_and(|x| x == "ttf")));
+    let Some(font) = installed else { return };
+    let tmp = TempDir(std::env::temp_dir().join(format!("figcraft-font-manager-{}", std::process::id())));
+    std::fs::create_dir_all(&tmp.0).unwrap();
+    let copy = tmp.0.join("Activated.ttf");
+    std::fs::copy(&font, &copy).unwrap();
+    let mut pending = BTreeMap::new();
+    index_font_file(&copy, &std::fs::metadata(&copy).unwrap(), &mut pending);
+    let paths: Vec<_> = pending.values().flat_map(|(_, p)| p.iter().map(|p| p.path.clone())).collect();
+    assert!(!paths.is_empty() && paths.iter().all(|p| *p == copy), "{paths:?}");
+    let mut none = BTreeMap::new();
+    index_font_file(&tmp.0, &std::fs::metadata(&tmp.0).unwrap(), &mut none);
+    assert!(none.is_empty());
+}
+
+#[cfg(target_os = "macos")]
+#[test]
+fn core_text_lists_the_installed_font_files() {
+    let files = font_manager_files();
+    assert!(files.iter().any(|f| f.starts_with("/System/Library/Fonts")), "{} files", files.len());
+    assert!(files.iter().all(|f| f.is_absolute()));
+}
diff --git a/crates/text/src/layout.rs b/crates/text/src/layout.rs
index 37092da8..ca5f0362 100644
--- a/crates/text/src/layout.rs
+++ b/crates/text/src/layout.rs
@@ -82,6 +82,9 @@ pub struct Line {
     pub x: f64,
     /// The line ends a paragraph (hard break or end of text).
     pub para_end: bool,
+    /// The line ends with a line break char: a newline, or a line separator (U+2028) that breaks
+    /// the line inside its paragraph.
+    pub break_after: bool,
     /// The paragraph runs right to left (its first strong character is right-to-left).
     pub rtl: bool,
 }
@@ -97,7 +100,7 @@ pub struct Decoration {
 }
 
 /// Most dots or wave samples drawn for one decoration.
-const MAX_DECO_STEPS: usize = 20_000;
+const MAX_DECO_STEPS: usize = 2_500;
 
 impl Decoration {
     /// The line's outline: a bar, a row of dots or a wave, `thickness` thick.
@@ -157,6 +160,15 @@ fn deco_len(m: DecorationLength, size: f64, auto: f64) -> f64 {
     if v.is_finite() { v } else { auto }
 }
 
+/// The line separator (U+2028): a line break inside a paragraph, as `.fig` files store a soft
+/// break (imported text keeps it; typed text has newlines only).
+const LINE_SEPARATOR: char = '\u{2028}';
+
+/// A char that ends its line: a newline (which also ends the paragraph) or a line separator.
+fn is_line_break(c: char) -> bool {
+    c == '\n' || c == LINE_SEPARATOR
+}
+
 /// Opening punctuation, which hangs outside a line's start.
 fn opens(c: char) -> bool {
     matches!(c, '"' | '\'' | '\u{201C}' | '\u{2018}' | '\u{201E}' | '\u{201A}' | '\u{00AB}' | '\u{2039}' | '(' | '[' | '{' | '\u{00BF}' | '\u{00A1}')
@@ -245,6 +257,11 @@ impl Item {
     fn is_space(&self) -> bool {
         crate::breaks::is_space(self.ch)
     }
+    /// A space justified text widens: not U+200B, which only marks where a line may break (between
+    /// the words of Thai, Lao, Khmer or Burmese text, written without spaces).
+    fn stretches(&self) -> bool {
+        self.is_space() && self.ch != '\u{200B}'
+    }
 }
 
 /// Bidi embedding levels per char, and whether each char's paragraph runs right to left.
@@ -332,7 +349,7 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
     }
     // Colour emoji are their own, large faces (Apple Color Emoji is ~180 MB): they are read only
     // for a text with emoji, or with characters nothing above covers.
-    let covered = |c: char| c == '\n' || faces.iter().flatten().any(|f| f.has_char(c)) || fallbacks.iter().any(|f| f.has_char(c));
+    let covered = |c: char| is_line_break(c) || faces.iter().flatten().any(|f| f.has_char(c)) || fallbacks.iter().any(|f| f.has_char(c));
     let emoji = if chars.iter().any(|c| is_emoji(*c) || !covered(*c)) { dbw.emoji_fallbacks() } else { Vec::new() };
     fallbacks.extend(emoji.iter().cloned());
     drop(dbw);
@@ -370,7 +387,7 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
                 {
                     return f.clone();
                 }
-                if c == '\n' || primary.has_char(c) {
+                if is_line_break(c) || primary.has_char(c) {
                     return primary.clone();
                 }
                 let fallbacks = style_fallbacks.get(st_idx).unwrap_or(&fallbacks);
@@ -382,13 +399,15 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
             let mut seg_end = seg_start + 1;
             while seg_end < *end
                 && chars.get(seg_end).is_some_and(|c| {
-                    *c != '\n' && first != '\n' && (!cluster_start.get(seg_end).copied().unwrap_or(true) || face_for(*c).id == face.id)
+                    !is_line_break(*c)
+                        && !is_line_break(first)
+                        && (!cluster_start.get(seg_end).copied().unwrap_or(true) || face_for(*c).id == face.id)
                 })
                 && level_at(seg_end) == level
             {
                 seg_end += 1;
             }
-            if first == '\n' {
+            if is_line_break(first) {
                 items.push(Item {
                     face: face.clone(),
                     coords: no_coords(),
@@ -401,7 +420,7 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
                     char_start: seg_start,
                     char_end: seg_start + 1,
                     style: st_idx,
-                    ch: '\n',
+                    ch: first,
                     level,
                 });
             } else {
@@ -465,6 +484,17 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
             para += 1;
             continue;
         }
+        // A line separator (a soft break) breaks the line inside its paragraph: no
+        // paragraph spacing and no new list marker after it.
+        if it.ch == LINE_SEPARATOR {
+            lines.push((line_start, i + 1, false, para));
+            i += 1;
+            line_start = i;
+            x = 0.0;
+            last_break = None;
+            para_first_line = false;
+            continue;
+        }
         let line_indent = line_indent_of(para, para_first_line, it.char_start);
         let w = it.adv;
         // Hanging punctuation takes no room inside the box.
@@ -491,7 +521,8 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
         }
         i += 1;
     }
-    if line_start < items.len() || lines.is_empty() || lines.last().is_some_and(|l| l.2) {
+    let break_after = |e: usize| e.checked_sub(1).and_then(|i| items.get(i)).is_some_and(|it| is_line_break(it.ch));
+    if line_start < items.len() || lines.is_empty() || lines.last().is_some_and(|l| l.2 || break_after(l.1)) {
         lines.push((line_start, items.len(), true, para));
     }
 
@@ -501,7 +532,7 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
     let mut out = TextLayout { styles: styles.clone(), ..Default::default() };
     let mut y = 0.0;
     let mut para_start_line = true;
-    let max_lines = if text.max_lines > 0 && matches!(text.auto_resize, TextAutoResize::Truncate) { text.max_lines as usize } else { usize::MAX };
+    let max_lines = if text.max_lines > 0 && text.truncates() { text.max_lines as usize } else { usize::MAX };
     // A style's vertical metrics (ascent, descent, line height, cap height) come from its own
     // font, never a fallback face, so lines mixing scripts keep the spacing of lines that don't.
     let metrics = |st_idx: usize| -> [f64; 4] {
@@ -515,6 +546,25 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
             None => [size * 0.8, size * 0.2, whole_px(st.line_height.resolve(size, 1.2)), size * 0.7],
         }
     };
+    // An item's glyph with its pen position at `pen` on the line at `baseline` (none for a space
+    // the font has no glyph for).
+    let glyph_at = |it: &Item, pen: f64, baseline: f64| {
+        let size = styles.get(it.style).map(|st| sanitize_size(st.font_size)).unwrap_or(12.0) * it.scale;
+        (it.gid != 0 || !it.is_space()).then(|| Glyph {
+            face: it.face.clone(),
+            coords: it.coords.clone(),
+            gid: it.gid,
+            x: pen + it.dx,
+            y: baseline - it.dy,
+            size,
+            advance: it.adv,
+            char_start: it.char_start,
+            char_end: it.char_end,
+            style: it.style,
+            rtl: it.level % 2 == 1,
+            warp: Affine::IDENTITY,
+        })
+    };
     let mut first_cap = 0.0;
     for (li, (s, e, para_end, para)) in lines.iter().enumerate() {
         if li >= max_lines {
@@ -546,7 +596,7 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
         let baseline = y + (lh - (asc + desc)) / 2.0 + asc;
         // Trailing spaces don't count for width/alignment.
         let mut vis_end = *e;
-        while vis_end > *s && items.get(vis_end - 1).is_some_and(|it| it.is_space() || it.ch == '\n') {
+        while vis_end > *s && items.get(vis_end - 1).is_some_and(|it| it.is_space() || is_line_break(it.ch)) {
             vis_end -= 1;
         }
         // Letter spacing separates glyphs: none after the line's last visible one.
@@ -561,9 +611,11 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
             items.get(vis_end.wrapping_sub(1)).filter(|it| hang_end && !rtl_line && vis_end > *s + 1 && closes(it.ch)).map_or(0.0, |it| it.adv);
         let gstart = out.glyphs.len();
         // Justify: extra space per gap.
-        let gaps = items.get(*s..vis_end).unwrap_or(&[]).iter().filter(|it| it.is_space()).count();
+        let gaps = items.get(*s..vis_end).unwrap_or(&[]).iter().filter(|it| it.stretches()).count();
         let justify_extra = match (text.align_h, wrap) {
-            (TextAlignH::Justified, Some(maxw)) if !para_end && gaps > 0 => ((maxw - line_indent + hang_l + hang_r - width) / gaps as f64).max(0.0),
+            (TextAlignH::Justified, Some(maxw)) if !para_end && !break_after(*e) && gaps > 0 => {
+                ((maxw - line_indent + hang_l + hang_r - width) / gaps as f64).max(0.0)
+            }
             _ => 0.0,
         };
         // Where the visible text ends once justified.
@@ -574,8 +626,8 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
             .get(vis_end..*e)
             .unwrap_or(&[])
             .iter()
-            .filter(|it| it.ch != '\n')
-            .map(|it| it.adv + if it.is_space() { justify_extra } else { 0.0 })
+            .filter(|it| !is_line_break(it.ch))
+            .map(|it| it.adv + if it.stretches() { justify_extra } else { 0.0 })
             .sum();
         let mut pen = if rtl_line { -trailing } else { line_indent - hang_l };
         // List marker (before the line's text; zero-length char range so carets skip it).
@@ -649,28 +701,12 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
             (0..line_items.len()).collect()
         };
         for it in order.iter().filter_map(|k| line_items.get(*k)) {
-            if it.ch == '\n' {
+            if is_line_break(it.ch) {
                 continue;
             }
-            let size = styles.get(it.style).map(|st| sanitize_size(st.font_size)).unwrap_or(12.0) * it.scale;
-            if it.gid != 0 || !it.is_space() {
-                out.glyphs.push(Glyph {
-                    face: it.face.clone(),
-                    coords: it.coords.clone(),
-                    gid: it.gid,
-                    x: pen + it.dx,
-                    y: baseline - it.dy,
-                    size,
-                    advance: it.adv,
-                    char_start: it.char_start,
-                    char_end: it.char_end,
-                    style: it.style,
-                    rtl: it.level % 2 == 1,
-                    warp: Affine::IDENTITY,
-                });
-            }
+            out.glyphs.extend(glyph_at(it, pen, baseline));
             pen += it.adv;
-            if it.is_space() {
+            if it.stretches() {
                 pen += justify_extra;
             }
         }
@@ -687,6 +723,7 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
             width: width + line_indent - hang_l - hang_r,
             x: 0.0,
             para_end: *para_end,
+            break_after: break_after(*e),
             rtl: rtl_line,
         });
         y += lh;
@@ -723,7 +760,40 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
         }
     }
     if out.truncated {
+        // The last line shown runs on into the line cut after it, so the ellipsis fills the line
+        // ("Lorem consec…") instead of following the last whole word ("Lorem…").
+        let last = out.lines.len().checked_sub(1);
+        let wrapped_on = last.and_then(|li| Some((out.lines.get(li)?, lines.get(li)?, lines.get(li + 1)?)));
+        if let (Some(maxw), Some((line, &(_, e, para_end, _), &(ns, ne, _, _)))) = (wrap, wrapped_on)
+            && !para_end
+            && !break_after(e)
+            && !line.rtl
+        {
+            let baseline = line.baseline;
+            let mut pen = out.glyphs.get(line.glyph_start..line.glyph_end).and_then(<[Glyph]>::last).map_or(line.width, |g| g.x + g.advance);
+            for it in items.get(ns..ne).unwrap_or(&[]) {
+                if pen > maxw {
+                    break;
+                }
+                if !is_line_break(it.ch) {
+                    out.glyphs.extend(glyph_at(it, pen, baseline));
+                    pen += it.adv;
+                }
+            }
+            let gend = out.glyphs.len();
+            if let Some(l) = out.lines.last_mut() {
+                l.glyph_end = gend;
+            }
+        }
         add_ellipsis(&mut out, wrap);
+        // Carets and selections reach every char the line shows, borrowed ones included.
+        if let Some(l) = out.lines.last() {
+            let shown =
+                out.glyphs.get(l.glyph_start..l.glyph_end).unwrap_or(&[]).iter().filter(|g| g.char_end > g.char_start).map(|g| g.char_end).max();
+            if let (Some(shown), Some(l)) = (shown, out.lines.last_mut()) {
+                l.char_end = l.char_end.max(shown);
+            }
+        }
     }
 
     // Horizontal alignment within the box.
@@ -827,8 +897,8 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
 }
 
 /// The markers of a text's paragraphs ("" for plain ones). Numbers count the items of one list at
-/// one level, restarting after a plain paragraph, a shallower item or the other kind of list;
-/// levels go 1. a. i. and • ◦ ▪, then round again.
+/// one level, restarting after a plain paragraph, a shallower item or the other kind of list,
+/// from the first item's start number; levels go 1. a. i. and • ◦ ▪, then round again.
 pub(crate) fn list_markers(lists: &[ParaList]) -> Vec<String> {
     const BULLETS: [&str; 3] = ["\u{2022}", "\u{25E6}", "\u{25AA}"];
     let mut count = [(ListStyle::None, 0usize); figcraft_doc::MAX_LIST_INDENT as usize + 1];
@@ -844,7 +914,8 @@ pub(crate) fn list_markers(lists: &[ParaList]) -> Vec<String> {
                 *c = (ListStyle::None, 0);
             }
             let Some(c) = count.get_mut(d) else { return String::new() };
-            *c = if c.0 == pl.list { (pl.list, c.1 + 1) } else { (pl.list, 1) };
+            let first = usize::try_from(pl.start_offset).unwrap_or(usize::MAX).saturating_add(1);
+            *c = if c.0 == pl.list { (pl.list, c.1.saturating_add(1)) } else { (pl.list, first) };
             match (pl.list, d % 3) {
                 (ListStyle::Numbered, 1) => format!("{}.", alpha(c.1)),
                 (ListStyle::Numbered, 2) => format!("{}.", roman(c.1)),
@@ -1005,6 +1076,18 @@ fn is_emoji(c: char) -> bool {
     matches!(c, '\u{1F1E6}'..='\u{1F1FF}' | '\u{1F300}'..='\u{1FAFF}')
 }
 
+/// The lower case of the capital sigma at `i`: the final form ς or σ, chosen from the letters
+/// around it in the whole text (as lower-casing the whole string would), not from the lone char.
+fn lower_sigma(chars: &[char], i: usize) -> char {
+    // Enough context to step over any realistic run of combining marks next to the sigma.
+    const CONTEXT: usize = 32;
+    let before: String = chars.get(i.saturating_sub(CONTEXT)..i).unwrap_or(&[]).iter().collect();
+    let after: String = chars.iter().skip(i + 1).take(CONTEXT).collect();
+    let lower = format!("{before}\u{3A3}{after}").to_lowercase();
+    // Only the sigma's lower case depends on context, so the text before it keeps its length.
+    lower.get(before.to_lowercase().len()..).and_then(|s| s.chars().next()).unwrap_or('σ')
+}
+
 /// One run of chars shaped with a single face and style.
 struct Segment<'a> {
     start: usize,
@@ -1029,18 +1112,22 @@ fn shape_segment(chars: &[char], seg: &Segment, face: &Arc<Face>, features: &[Fe
     // a word split across styled runs is capitalised once) and remember synthesised small caps.
     let mut mapped: Vec<(char, usize, bool)> = Vec::with_capacity(end.saturating_sub(start));
     let mut prev = start.checked_sub(1).and_then(|i| chars.get(i)).copied();
+    let mut before = start.checked_sub(2).and_then(|i| chars.get(i)).copied();
     for (i, c) in chars.get(start..end).unwrap_or(&[]).iter().enumerate() {
         let src = start + i;
         if small_caps && !native_smcp && c.is_lowercase() {
             for u in c.to_uppercase() {
                 mapped.push((u, src, true));
             }
+        } else if style.case == TextCase::Lower && *c == 'Σ' {
+            mapped.push((lower_sigma(chars, src), src, false));
         } else {
             let mut buf = [0u8; 4];
-            for u in style.case.apply_after(c.encode_utf8(&mut buf), prev).chars() {
+            for u in style.case.apply_between(c.encode_utf8(&mut buf), before, prev).chars() {
                 mapped.push((u, src, false));
             }
         }
+        before = prev;
         prev = Some(*c);
     }
     let mut small = vec![false; end.saturating_sub(start)];
@@ -1141,16 +1228,12 @@ impl TextLayout {
     pub fn caret(&self, index: usize) -> (f64, usize) {
         for (li, line) in self.lines.iter().enumerate() {
             let last_line = li + 1 == self.lines.len();
+            // A caret at a line's end belongs to the next line, whether the line wraps or ends with a
+            // line break (before the break it is still on this line: past its glyphs).
             let in_line = index >= line.char_start && (index < line.char_end || (last_line && index <= line.char_end));
-            // A caret at the end of a soft-wrapped line belongs to the next line.
-            if !(in_line || index == line.char_end && line.para_end && !last_line) {
+            if !in_line {
                 continue;
             }
-            if index == line.char_end && line.para_end && !last_line {
-                // Before the newline: end of this line.
-                let x = self.line_end_x(line);
-                return (x, li);
-            }
             let gl = self.glyphs.get(line.glyph_start..line.glyph_end).unwrap_or(&[]);
             for g in gl {
                 if g.char_end == g.char_start {
@@ -1178,8 +1261,8 @@ impl TextLayout {
         if !line.rtl && !gl.iter().any(|g| g.rtl) {
             return None;
         }
-        // The caret can't sit after a paragraph's newline on its own line.
-        let end = if line.para_end && li + 1 < self.lines.len() { line.char_end.saturating_sub(1) } else { line.char_end };
+        // The caret can't sit after a line's break on its own line.
+        let end = if line.break_after && li + 1 < self.lines.len() { line.char_end.saturating_sub(1) } else { line.char_end };
         let next = (line.char_start..=end.max(line.char_start))
             .filter(|i| *i != index)
             .map(|i| (i, self.caret(i).0))
@@ -1190,6 +1273,12 @@ impl TextLayout {
         Some(next.unwrap_or(if right != line.rtl { index + 1 } else { index.saturating_sub(1) }))
     }
 
+    /// Left edge of a left-to-right line's first char (its end when it has none).
+    fn line_start_x(&self, line: &Line) -> f64 {
+        let gl = self.glyphs.get(line.glyph_start..line.glyph_end).unwrap_or(&[]);
+        gl.iter().find(|g| g.char_end > g.char_start).map_or_else(|| self.line_end_x(line), |g| g.x)
+    }
+
     /// Where a line's text ends: its right edge, or its left edge for a right-to-left paragraph.
     fn line_end_x(&self, line: &Line) -> f64 {
         let glyphs = self.glyphs.get(line.glyph_start..line.glyph_end).unwrap_or(&[]).iter().filter(|g| g.char_end > g.char_start);
@@ -1240,7 +1329,7 @@ impl TextLayout {
             }
         }
         let last_line = li + 1 == self.lines.len();
-        let end = if line.para_end && !last_line { line.char_end.saturating_sub(1).max(line.char_start) } else { line.char_end };
+        let end = if line.break_after && !last_line { line.char_end.saturating_sub(1).max(line.char_start) } else { line.char_end };
         // Right of a right-to-left line is its start.
         if line.rtl { line.char_start } else { end }
     }
@@ -1250,7 +1339,16 @@ impl TextLayout {
         let (a, b) = (start.min(end), start.max(end));
         let mut out = Vec::new();
         for (li, line) in self.lines.iter().enumerate() {
-            if b <= line.char_start || a > line.char_end || (a == line.char_end && li + 1 < self.lines.len()) {
+            let last = li + 1 == self.lines.len();
+            // The empty line after a trailing break has no chars, but a selection reaching the
+            // end of the text covers it: it shows a paragraph-break mark at the line's start.
+            let trailing_empty = last && a < b && b >= line.char_start && line.char_start == line.char_end;
+            if (b <= line.char_start && !trailing_empty) || a > line.char_end || (a == line.char_end && !last) {
+                continue;
+            }
+            if trailing_empty {
+                let x = self.line_end_x(line);
+                out.push(Rect::new(x, line.top, x + 4.0, line.top + line.height));
                 continue;
             }
             let gl = self.glyphs.get(line.glyph_start..line.glyph_end).unwrap_or(&[]);
@@ -1258,10 +1356,11 @@ impl TextLayout {
                 out.extend(Self::mixed_selection(gl, a, b, line));
                 continue;
             }
-            let (x0, _) = self.caret(a.max(line.char_start));
+            // From the line's own start.
+            let x0 = if a <= line.char_start { self.line_start_x(line) } else { self.caret(a).0 };
             let x1 = if b >= line.char_end {
                 // The last line has no paragraph break to show, so it ends at its glyphs.
-                self.line_end_x(line) + if line.para_end && li + 1 < self.lines.len() && b > line.char_end.saturating_sub(1) { 4.0 } else { 0.0 }
+                self.line_end_x(line) + if line.break_after && !last && b > line.char_end.saturating_sub(1) { 4.0 } else { 0.0 }
             } else {
                 self.caret(b).0
             };
diff --git a/crates/text/src/lib.rs b/crates/text/src/lib.rs
index 27456d82..8da0b2d8 100644
--- a/crates/text/src/lib.rs
+++ b/crates/text/src/lib.rs
@@ -13,11 +13,12 @@ pub mod fontdb;
 mod layout;
 mod onpath;
 
-pub use breaks::grapheme_step;
+pub use breaks::{backspace_step, grapheme_step};
 pub use color::{ColorBitmap, ColorInk, ColorLayer};
 pub use fontdb::{
-    Axis, CRAFT_FONTS, Coords, Face, FontDb, NamedInstance, axis_label, db, face_with_char, family_names, family_styles, find_face, no_coords,
-    scan_system_fonts, scan_system_fonts_on_demand, system_fonts_scanned,
+    Axis, CRAFT_FONTS, Coords, Face, FontDb, NamedInstance, Rescan, axis_label, db, face_with_char, family_names, family_styles, find_face,
+    has_family, installed_fonts_known, load_font_bytes, no_coords, opt_out_of_system_fonts, rescan_system_fonts, scan_system_fonts,
+    scan_system_fonts_on_demand, system_fonts_scanned,
 };
 pub use layout::{Decoration, Glyph, Line, TextLayout, layout};
 pub use onpath::OnPath;
@@ -41,7 +42,7 @@ struct LayoutCache {
 
 /// Layouts kept before the cache starts over (a page of distinct texts stays cached while it
 /// renders, pans and zooms).
-const LAYOUT_CACHE_MAX: usize = 32_768;
+const LAYOUT_CACHE_MAX: usize = 4_096;
 /// Entries per fingerprint (texts that compare unequal to themselves, e.g. NaN sizes, can't pile up).
 const BUCKET_MAX: usize = 8;
 
@@ -150,6 +151,8 @@ mod behaviour_tests;
 #[cfg(test)]
 mod cache_tests;
 #[cfg(test)]
+mod line_separator_tests;
+#[cfg(test)]
 mod list_tests;
 #[cfg(test)]
 mod metrics_tests;
diff --git a/crates/text/src/line_separator_tests.rs b/crates/text/src/line_separator_tests.rs
new file mode 100644
index 00000000..13f91786
--- /dev/null
+++ b/crates/text/src/line_separator_tests.rs
@@ -0,0 +1,97 @@
+//! A line separator (U+2028: a soft break in `.fig` files, kept on import) breaks the
+//! line inside its paragraph: no paragraph spacing or new list marker after it, and no glyph (#852).
+
+use super::*;
+use figcraft_doc::{LineHeight, ListStyle, TextAutoResize, TextData};
+
+const EPS: f64 = 1e-6;
+
+/// A 20 px text on 30 px lines in the default face, or None (skip) on a machine without fonts.
+fn text(s: &str) -> Option<TextData> {
+    scan_system_fonts();
+    let f = db().write().unwrap().default_face()?;
+    let mut t = TextData::new(s);
+    (t.style.font_family, t.style.font_style) = (f.family.clone(), f.style.clone());
+    t.style.font_size = 20.0;
+    t.style.line_height = LineHeight::Pixels(30.0);
+    t.auto_resize = TextAutoResize::WidthAndHeight;
+    Some(t)
+}
+
+/// The chars of each line.
+fn line_texts(t: &TextData, l: &TextLayout) -> Vec<String> {
+    let chars: Vec<char> = t.characters.chars().collect();
+    l.lines.iter().map(|ln| chars.get(ln.char_start..ln.char_end).unwrap_or(&[]).iter().collect::<String>()).collect()
+}
+
+#[test]
+fn breaks_the_line_but_not_the_paragraph() {
+    let Some(mut t) = text("one\u{2028}two\nthree") else { return };
+    t.paragraph_spacing = 10.0;
+    let l = layout(&t, None, None);
+    assert_eq!(line_texts(&t, &l), ["one\u{2028}", "two\n", "three"]);
+    assert!(!l.lines[0].para_end && l.lines[0].break_after);
+    assert!(l.lines[1].para_end && l.lines[1].break_after);
+    assert!(!l.lines[2].break_after);
+    // Paragraph spacing after the newline only: 30, then 30 + 10.
+    assert!((l.lines[1].top - 30.0).abs() < EPS && (l.lines[2].top - 70.0).abs() < EPS, "{} {}", l.lines[1].top, l.lines[2].top);
+    // The separator draws nothing.
+    assert!(l.glyphs.iter().all(|g| !(g.char_start..g.char_end).contains(&3)));
+}
+
+#[test]
+fn before_a_newline_or_at_the_end_it_leaves_an_empty_line() {
+    // "Hi,⏎¶Season" in #852: an empty line between the two.
+    let Some(t) = text("Hi,\u{2028}\nSeason") else { return };
+    let l = layout(&t, None, None);
+    assert_eq!(line_texts(&t, &l), ["Hi,\u{2028}", "\n", "Season"]);
+    let Some(t) = text("end\u{2028}") else { return };
+    let l = layout(&t, None, None);
+    assert_eq!(line_texts(&t, &l), ["end\u{2028}", ""]);
+    assert!((l.height - 60.0).abs() < EPS, "{}", l.height);
+}
+
+#[test]
+fn a_list_item_continues_after_it_without_a_new_marker() {
+    let Some(mut t) = text("item\u{2028}more\nnext") else { return };
+    t.list = ListStyle::Bulleted;
+    let l = layout(&t, None, None);
+    assert_eq!(line_texts(&t, &l), ["item\u{2028}", "more\n", "next"]);
+    // Markers are the glyphs that cover no char: one per paragraph.
+    assert_eq!(l.glyphs.iter().filter(|g| g.char_start == g.char_end).count(), 2);
+    // The line after the separator lines up with the item's text, past the bullet.
+    let text_x = |li: usize| l.glyphs.iter().find(|g| g.char_start == l.lines[li].char_start && g.char_end > g.char_start).map(|g| g.x);
+    let (first, cont) = (text_x(0).unwrap(), text_x(1).unwrap());
+    assert!(first > 0.0 && (first - cont).abs() < 1e-3, "{first} {cont}");
+}
+
+#[test]
+fn carets_and_clicks_treat_it_like_a_newline() {
+    let (Some(sep), Some(nl)) = (text("ab\u{2028}cd"), text("ab\ncd")) else { return };
+    let (ls, ln) = (layout(&sep, None, None), layout(&nl, None, None));
+    for i in 0..=5 {
+        assert_eq!(ls.caret(i), ln.caret(i), "caret before char {i}");
+    }
+    for line in &ln.lines {
+        for x in [-10.0, 5.0, line.width + 50.0] {
+            assert_eq!(ls.hit(x, line.top + 5.0), ln.hit(x, line.top + 5.0), "click at {x} on the line at {}", line.top);
+        }
+    }
+    // Before the separator: the end of the first line; after it: the start of the second.
+    assert_eq!(ls.caret(2).1, 0);
+    assert!(ls.caret(2).0 > 0.0);
+    assert_eq!(ls.caret(3), (0.0, 1));
+    // A click right of the first line lands before the separator, not after it.
+    assert_eq!(ls.hit(ls.lines[0].width + 50.0, ls.lines[0].top + 5.0), 2);
+}
+
+#[test]
+fn a_selection_across_it_shows_the_break_like_a_newline() {
+    let (Some(sep), Some(nl)) = (text("ab\u{2028}cd"), text("ab\ncd")) else { return };
+    let (ls, ln) = (layout(&sep, None, None), layout(&nl, None, None));
+    let (before, across) = (ls.selection_rects(0, 2), ls.selection_rects(0, 5));
+    assert_eq!((before.len(), across.len()), (1, 2));
+    // Reaching past the separator adds the 4 px break mark at the first line's end.
+    assert!((across[0].width() - before[0].width() - 4.0).abs() < EPS, "{} {}", across[0].width(), before[0].width());
+    assert_eq!(across, ln.selection_rects(0, 5));
+}
diff --git a/crates/text/src/onpath.rs b/crates/text/src/onpath.rs
index 2b506237..49378504 100644
--- a/crates/text/src/onpath.rs
+++ b/crates/text/src/onpath.rs
@@ -23,7 +23,14 @@ impl OnPath {
     /// Text on `tp` whose layout x = 0 sits `shift` before the start point and whose layout y
     /// `baseline` sits on the path. `None` for an empty or unmeasurable path.
     pub fn new(tp: &TextPath, shift: f64, baseline: f64) -> Option<Self> {
-        let mut line = polylines(&tp.path())?.into_iter().next()?;
+        let p = tp.path();
+        if p.elements().len() > 20_000 {
+            return None;
+        }
+        let mut line = polylines(&p)?.into_iter().next()?;
+        if line.points.len() > 40_000 {
+            return None;
+        }
         // A subpath ending where it starts (an ellipse) goes round like a closed one.
         line.closed |= matches!((line.points.first(), line.points.last()), (Some(a), Some(b)) if (*a - *b).hypot() < 1e-6);
         Some(Self { origin: tp.start() * line.length() - shift, line, flip: tp.flip, baseline })
diff --git a/crates/text/src/tail_tests.rs b/crates/text/src/tail_tests.rs
index 890b254d..2d0ad22b 100644
--- a/crates/text/src/tail_tests.rs
+++ b/crates/text/src/tail_tests.rs
@@ -43,7 +43,32 @@ fn starts(l: &TextLayout) -> Vec<(f64, Option<f64>)> {
 }
 
 fn pl(list: ListStyle, indent: u8) -> ParaList {
-    ParaList { list, indent }
+    ParaList { list, indent, start_offset: 0 }
+}
+
+fn from(list: ListStyle, indent: u8, start_offset: u32) -> ParaList {
+    ParaList { list, indent, start_offset }
+}
+
+#[test]
+fn numbered_lists_count_from_their_start() {
+    use ListStyle::{Bulleted as B, None as P, Numbered as N};
+    let cases: Vec<(Vec<ParaList>, Vec<&str>, &str)> = vec![
+        (vec![from(N, 0, 1)], vec!["2."], "a one-item list started at 2 (#686)"),
+        (vec![from(N, 0, 3), pl(N, 0), pl(N, 0)], vec!["4.", "5.", "6."], "the items after the first count on from it"),
+        (vec![from(N, 0, 3), from(N, 0, 3), from(N, 0, 3)], vec!["4.", "5.", "6."], "items that go on counting ignore their own start"),
+        (vec![from(N, 0, 1), pl(P, 0), from(N, 0, 1)], vec!["2.", "", "2."], "a list after a plain paragraph starts from its own start"),
+        (vec![pl(N, 0), from(N, 1, 1), pl(N, 1)], vec!["1.", "b.", "c."], "a nested level starts from its first item's start"),
+        (vec![from(B, 0, 4), pl(B, 0)], vec!["\u{2022}", "\u{2022}"], "bullets have no number"),
+        (vec![from(N, 0, 4_000), pl(N, 2)], vec!["4001.", "i."], "big starts"),
+    ];
+    for (lists, want, why) in cases {
+        assert_eq!(list_markers(&lists), want, "{why}");
+    }
+    // The largest start never overflows, on 32-bit targets too.
+    let max = list_markers(&[from(N, 0, u32::MAX), pl(N, 0), pl(N, 0)]);
+    assert_eq!(max.len(), 3);
+    assert!(max.iter().all(|m| m.starts_with("429496729")), "{max:?}");
 }
 
 #[test]
diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs
index e34f0110..e643ccae 100644
--- a/crates/text/src/tests.rs
+++ b/crates/text/src/tests.rs
@@ -170,6 +170,31 @@ fn title_case_across_runs() {
     assert_eq!(gid_at(6), Some(face.glyph_for('W')));
 }
 
+#[test]
+fn title_case_after_opening_apostrophe_on_canvas() {
+    let Some(face) = inter() else { return };
+    let glyph_chars = |s: &str, split: Option<usize>| {
+        let mut t = TextData::new(s);
+        t.style.case = figcraft_doc::TextCase::Title;
+        if let Some(n) = split {
+            t.restyle(0, n, |st| st.font_style = "Bold".into());
+        }
+        let l = layout(&t, None, None);
+        let chars: Vec<char> = s.chars().collect();
+        (0..chars.len()).map(|i| l.glyphs.iter().find(|g| g.char_start == i).map(|g| g.gid)).collect::<Vec<_>>()
+    };
+    let expect = |s: &str, want: &str| {
+        let got: Vec<Option<u32>> = want.chars().map(|c| Some(face.glyph_for(c))).collect();
+        for split in [None, Some(1), Some(2)] {
+            assert_eq!(glyph_chars(s, split), got, "{s:?} split {split:?}");
+        }
+    };
+    expect("'hello world'", "'Hello World'");
+    expect("say 'hi'", "Say 'Hi'");
+    expect("don't", "Don't");
+    expect("\u{2019}hello", "\u{2019}Hello");
+}
+
 #[test]
 fn lists_hang_and_number() {
     if !have_fonts() {
@@ -232,7 +257,9 @@ fn truncate_max_lines_with_ellipsis() {
     assert_eq!(l.lines.len(), 2);
     let last = l.glyphs.last().unwrap();
     assert_eq!(last.gid, face.glyph_for('…'));
-    // max_lines is ignored unless truncating.
+    // Auto height truncates at max_lines too; a fixed box shows every line.
+    t.auto_resize = figcraft_doc::TextAutoResize::Height;
+    assert_eq!(layout(&t, Some(300.0), None).lines.len(), 2);
     t.auto_resize = figcraft_doc::TextAutoResize::None;
     assert_eq!(layout(&t, Some(300.0), Some(1000.0)).lines.len(), 3);
 }
@@ -437,3 +464,125 @@ fn selection_through_text_end_stays_inside_auto_width_box() {
     let first = r.first().map_or(f64::NAN, |r| r.x1);
     assert!(first > l.caret(5).0 + 1.0, "{first}");
 }
+
+/// The selection rect drawn on line `li` of `l`, if any.
+fn rect_on(l: &TextLayout, rects: &[figcraft_geom::Rect], li: usize) -> Option<figcraft_geom::Rect> {
+    let top = l.lines.get(li)?.top;
+    rects.iter().find(|r| (r.y0 - top).abs() < 1e-6).copied()
+}
+
+#[test]
+fn select_all_highlights_an_empty_last_line() {
+    if !have_fonts() {
+        return;
+    }
+    // "Hello\n": the trailing break leaves an empty second line (#665).
+    let l = layout(&TextData::new("Hello\n"), None, None);
+    assert_eq!(l.lines.len(), 2);
+    let Some(r) = rect_on(&l, &l.selection_rects(0, 6), 1) else { panic!("no highlight on the empty last line") };
+    // A paragraph-break mark at the line's start, not at the end of "Hello" above.
+    assert!(r.x0.abs() < 1e-6 && (r.width() - 4.0).abs() < 1e-6, "{r:?}");
+    assert!(rect_on(&l, &l.selection_rects(5, 6), 1).is_some());
+    // Selecting part of the first line, or a caret, leaves the empty line alone.
+    assert!(l.selection_rects(0, 1).iter().all(|r| r.y0 < l.lines[1].top - 1e-6), "{:?}", l.selection_rects(0, 1));
+    assert!(l.selection_rects(6, 6).is_empty());
+    // A right-to-left paragraph marks its empty last line too.
+    let rtl = layout(&TextData::new("\u{5E9}\u{5DC}\u{5D5}\u{5DD}\n"), None, None);
+    let Some(r) = rect_on(&rtl, &rtl.selection_rects(0, 5), 1) else { panic!("no highlight on the empty right-to-left line") };
+    assert!(r.x0.abs() < 1e-6 && (r.width() - 4.0).abs() < 1e-6, "{r:?}");
+}
+
+#[test]
+fn selection_after_a_line_break_starts_at_the_line_start() {
+    if !have_fonts() {
+        return;
+    }
+    // Not at the end of the line above, where `caret` puts the index after the break.
+    let l = layout(&TextData::new("Hello\nworld"), None, None);
+    let Some(r) = rect_on(&l, &l.selection_rects(0, 11), 1) else { panic!("no highlight on the second line") };
+    assert!(r.x0.abs() < 1e-6 && r.x1 > l.caret(10).0, "{r:?}");
+    // An empty line in the middle shows its break mark at its start.
+    let m = layout(&TextData::new("Hello\n\nworld"), None, None);
+    let Some(r) = rect_on(&m, &m.selection_rects(0, 12), 1) else { panic!("no highlight on the empty line") };
+    assert!(r.x0.abs() < 1e-6 && (r.width() - 4.0).abs() < 1e-6, "{r:?}");
+    // A break followed by text still doesn't highlight the next line's start.
+    assert!(rect_on(&l, &l.selection_rects(0, 6), 1).is_none());
+}
+
+#[test]
+fn the_caret_after_a_line_break_sits_on_the_next_line() {
+    if !have_fonts() {
+        return;
+    }
+    // Before the break: the end of its line; after it: the start of the next (after Enter, the
+    // caret shows on the new line, and Up/Down count from there).
+    let l = layout(&TextData::new("ab\ncd"), None, None);
+    assert_eq!(l.caret(2).1, 0);
+    assert!(l.caret(2).0 > 0.0);
+    assert_eq!(l.caret(3), (0.0, 1));
+    // A trailing break: the caret sits on the empty last line.
+    let l = layout(&TextData::new("ab\n"), None, None);
+    assert_eq!(l.caret(3), (0.0, 1));
+}
+
+#[test]
+fn lower_case_writes_final_sigma() {
+    if !have_fonts() {
+        return;
+    }
+    let gids = |t: &TextData| layout(t, None, None).glyphs.iter().map(|g| (g.gid, g.char_start)).collect::<Vec<_>>();
+    let want = gids(&TextData::new("οδος ας"));
+    let Some(face) = layout(&TextData::new("ς"), None, None).glyphs.first().map(|g| g.face.clone()) else { return };
+    if face.glyph_for('σ') == face.glyph_for('ς') {
+        eprintln!("face has no distinct final sigma; skipping");
+        return;
+    }
+    let mut t = TextData::new("ΟΔΟΣ ΑΣ");
+    t.style.case = figcraft_doc::TextCase::Lower;
+    assert_eq!(gids(&t), want, "one run");
+    // The word split across two styled runs: the final form is still chosen from the whole text.
+    let mut other = t.style.clone();
+    other.font_size += 4.0;
+    t.runs.push(figcraft_doc::StyleRun { start: 3, end: 4, style: other });
+    assert_eq!(gids(&t).iter().map(|g| g.0).collect::<Vec<_>>(), want.iter().map(|g| g.0).collect::<Vec<_>>(), "split runs");
+}
+
+/// Thai is written without spaces between words; U+200B ZERO WIDTH SPACE marks where a line may
+/// break. ภาษา|ไทย|เขียน|ติดกัน ("Thai is written joined up") ไม่มี|ช่องว่าง|ระหว่าง|คำ ("with no
+/// spaces between words"), with one real space between the two phrases.
+#[test]
+fn justified_lines_dont_widen_zero_width_spaces() {
+    if !have_fonts() {
+        return;
+    }
+    let lay_out = |s: &str, align, w| {
+        let mut t = TextData::new(s);
+        t.style.font_size = 20.0;
+        t.align_h = align;
+        t.auto_resize = figcraft_doc::TextAutoResize::Height;
+        layout(&t, w, None)
+    };
+    let chars_before = |s: &str, pat: &str| s.find(pat).map(|b| s[..b].chars().count()).unwrap();
+    for (s, why) in [
+        ("ภาษา\u{200B}ไทย\u{200B}เขียน\u{200B}ติดกัน ไม่มี\u{200B}ช่องว่าง\u{200B}ระหว่าง\u{200B}คำ", "the real space takes the extra room"),
+        ("ภาษา\u{200B}ไทย\u{200B}เขียน\u{200B}ติดกัน\u{200B}ไม่มี\u{200B}ช่องว่าง\u{200B}ระหว่าง\u{200B}คำ", "no space to widen: as left-aligned"),
+    ] {
+        // A box that ends inside ช่องว่าง: the first line breaks at the U+200B before it.
+        let word = chars_before(s, "ช่องว่าง");
+        let natural = lay_out(s, TextAlignH::Left, None);
+        let (a, b) = (natural.caret(word).0, natural.caret(word + 4).0);
+        assert!(b > a, "{why}: chars need advances");
+        let w = a + (b - a) / 2.0;
+        let left = lay_out(s, TextAlignH::Left, Some(w));
+        let just = lay_out(s, TextAlignH::Justified, Some(w));
+        assert!(just.lines.len() >= 2 && just.lines[0].char_end == word, "{why}: {:?}", just.lines);
+        let space = s.chars().position(|c| c == ' ');
+        let extra = w - left.lines[0].width;
+        assert!(extra > 0.0, "{why}");
+        assert_eq!(left.glyphs.len(), just.glyphs.len());
+        for (l, j) in left.glyphs.iter().zip(&just.glyphs).filter(|(g, _)| g.char_end <= word) {
+            let want = if space.is_some_and(|sp| l.char_start > sp) { extra } else { 0.0 };
+            assert!((j.x - l.x - want).abs() < 1e-6, "{why}: char {} moved {} (want {want})", l.char_start, j.x - l.x);
+        }
+    }
+}
diff --git a/crates/text/tests/build_input.rs b/crates/text/tests/build_input.rs
new file mode 100644
index 00000000..6f87ac1f
--- /dev/null
+++ b/crates/text/tests/build_input.rs
@@ -0,0 +1,4 @@
+//! Exercise the actual build-script catalog policy without changing process environment.
+#[allow(dead_code)]
+#[path = "../build.rs"]
+mod build_script;
diff --git a/crates/text/tests/fixtures/latin-families.txt b/crates/text/tests/fixtures/latin-families.txt
new file mode 100644
index 00000000..e9db6f41
--- /dev/null
+++ b/crates/text/tests/fixtures/latin-families.txt
@@ -0,0 +1,52 @@
+# Synthetic paths; family/style inventory from craft-fonts 76ba5a0496503c0e2841abd626295038cbe07cde.
+Inter | Regular | fonts/face.ttf | Latn
+Inter | Italic | fonts/face.ttf | Latn
+Inter | SemiBold | fonts/face.ttf | Latn
+Inter | Bold | fonts/face.ttf | Latn
+Carlito | Regular | fonts/face.ttf | Latn
+Carlito | Bold | fonts/face.ttf | Latn
+Carlito | Italic | fonts/face.ttf | Latn
+Carlito | Bold Italic | fonts/face.ttf | Latn
+Caladea | Regular | fonts/face.ttf | Latn
+Caladea | Bold | fonts/face.ttf | Latn
+Caladea | Italic | fonts/face.ttf | Latn
+Caladea | Bold Italic | fonts/face.ttf | Latn
+Liberation Sans | Regular | fonts/face.ttf | Latn
+Liberation Sans | Bold | fonts/face.ttf | Latn
+Liberation Sans | Italic | fonts/face.ttf | Latn
+Liberation Sans | Bold Italic | fonts/face.ttf | Latn
+Liberation Serif | Regular | fonts/face.ttf | Latn
+Liberation Serif | Bold | fonts/face.ttf | Latn
+Liberation Serif | Italic | fonts/face.ttf | Latn
+Liberation Serif | Bold Italic | fonts/face.ttf | Latn
+Liberation Mono | Regular | fonts/face.ttf | Latn
+Liberation Mono | Bold | fonts/face.ttf | Latn
+Liberation Mono | Italic | fonts/face.ttf | Latn
+Liberation Mono | Bold Italic | fonts/face.ttf | Latn
+Source Sans 3 | Regular | fonts/face.ttf | Latn
+Source Sans 3 | Italic | fonts/face.ttf | Latn
+Source Sans 3 | Semibold | fonts/face.ttf | Latn
+Source Sans 3 | Bold | fonts/face.ttf | Latn
+Source Serif 4 | Regular | fonts/face.ttf | Latn
+Source Serif 4 | Italic | fonts/face.ttf | Latn
+Source Serif 4 | Semibold | fonts/face.ttf | Latn
+Source Serif 4 | Bold | fonts/face.ttf | Latn
+Montserrat | Variable | fonts/face.ttf | Latn
+Montserrat | Italic Variable | fonts/face.ttf | Latn
+Lato | Regular | fonts/face.ttf | Latn
+Lato | Bold | fonts/face.ttf | Latn
+Lato | Italic | fonts/face.ttf | Latn
+Open Sans | Variable | fonts/face.ttf | Latn
+Open Sans | Italic Variable | fonts/face.ttf | Latn
+Roboto | Variable | fonts/face.ttf | Latn
+Roboto | Italic Variable | fonts/face.ttf | Latn
+Merriweather | Regular | fonts/face.ttf | Latn
+Merriweather | Bold | fonts/face.ttf | Latn
+Merriweather | Italic | fonts/face.ttf | Latn
+Playfair Display | Variable | fonts/face.ttf | Latn
+Playfair Display | Italic Variable | fonts/face.ttf | Latn
+Poppins | Regular | fonts/face.ttf | Latn
+Poppins | Bold | fonts/face.ttf | Latn
+Poppins | Italic | fonts/face.ttf | Latn
+Nunito Sans | Variable | fonts/face.ttf | Latn
+Nunito Sans | Italic Variable | fonts/face.ttf | Latn
diff --git a/crates/ui-egui/Cargo.toml b/crates/ui-egui/Cargo.toml
index 65a3592d..04f09a37 100644
--- a/crates/ui-egui/Cargo.toml
+++ b/crates/ui-egui/Cargo.toml
@@ -18,10 +18,11 @@ figcraft-render = { workspace = true }
 figcraft-pathops = { workspace = true }
 figcraft-engine = { workspace = true }
 figcraft-format = { workspace = true }
-egui = { workspace = true }
+egui = { workspace = true, features = ["default_fonts", "monochrome_emoji_fonts"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 log = { workspace = true }
+chrono = { workspace = true }
 base64 = { workspace = true }
 image = { workspace = true }
 egui_extras = { workspace = true }
@@ -33,3 +34,9 @@ toml = "1"
 
 [dev-dependencies]
 wat = { workspace = true }
+# Keep the test font features explicit; production uses the same bundled fallback faces.
+# Dependency dev-features do not propagate into app release builds.
+egui = { workspace = true, features = ["default_fonts", "monochrome_emoji_fonts"] }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+craft-update = { workspace = true }
diff --git a/crates/ui-egui/locales/bn.toml b/crates/ui-egui/locales/bn.toml
new file mode 100644
index 00000000..e330d396
--- /dev/null
+++ b/crates/ui-egui/locales/bn.toml
@@ -0,0 +1,1846 @@
+# FigCraft interface strings: বাংলা, ইংরেজি থেকে অনূদিত।
+#
+# কীগুলো কোডে ব্যবহৃত ইংরেজি টেক্সট (`tr("…")`, `trf`, `trn`, `tr_noop`); মানগুলো অনূদিত,
+# বহুবচন এন্ট্রি ({ one, other }) ছাড়া। কমান্ডের লেবেল ইঞ্জিন থেকে আসে।
+# `cargo test -p figcraft-ui-egui i18n` অনুপস্থিত ও অব্যবহৃত কী তালিকাভুক্ত করে। docs/translating.md দেখুন।
+
+[meta]
+name = "বাংলা"
+status = "draft — needs native review"
+
+[ui]
+"% of all commits" = "সমস্ত কমিটের শতাংশ"
+"(no longer published)" = "(প্রকাশিত নয়)"
+"({n} warnings: some entries were skipped)" = { one = "({n}টি সতর্কতা: কিছু এন্ট্রি বাদ দেওয়া হয়েছে)", other = "({n}টি সতর্কতা: কিছু এন্ট্রি বাদ দেওয়া হয়েছে)" }
+"+ Create variable" = "+ ভেরিয়েবল তৈরি করুন"
+".fig (experimental)" = ".fig (পরীক্ষামূলক)"
+"1…9, 0" = "১…৯, ০"
+"@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs}টি PR, {commits}টি কমিট, +{added} / −{deleted} লাইন (Δ {delta}), +{bin_added} / −{bin_deleted} বাইনারি অ্যাসেট, {first} – {last}"
+"A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "এই মোড এবং ভেরিয়েবল সহ এই ফাইলের একটি সংগ্রহ: প্রতি মোডে তাদের মান ওভাররাইড করুন এবং এর নিজস্ব ভেরিয়েবল যোগ করুন"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "এই নামের একটি .figcraft ফাইল ইতিমধ্যে বিদ্যমান। প্রতিস্থাপন নিশ্চিত করতে এর সম্পূর্ণ নাম বেছে নিন।"
+"A layer on its own aligns to its frame: select more layers, or one in a frame" = "একটি লেয়ার একা তার ফ্রেমের সাথে সারিবদ্ধ হয়: আরও লেয়ার নির্বাচন করুন, বা ফ্রেমে থাকা একটি লেয়ার নির্বাচন করুন"
+"A responsive product page: hero, features, figures, a quote and a footer" = "একটি রেসপনসিভ প্রোডাক্ট পেজ: হিরো, ফিচার, ফিগার, একটি উদ্ধৃতি এবং একটি ফুটার"
+"A spring plays until it settles: its mass, stiffness and damping set how long" = "একটি স্প্রিং স্থির হওয়া পর্যন্ত চলে: এর ভর, দৃঢ়তা (stiffness) এবং ড্যাম্পিং নির্ধারণ করে কতক্ষণ চলবে"
+"A title, an agenda, a big figure, a chart and a closing slide" = "একটি শিরোনাম, একটি আলোচ্যসূচি, একটি বড় ফিগার, একটি চার্ট এবং একটি সমাপ্তি স্লাইড"
+"A to Z" = "A থেকে Z"
+"About" = "সম্পর্কিত"
+"About FigCraft" = "FigCraft সম্পর্কে"
+"About this server" = "এই সার্ভার সম্পর্কে"
+"Action" = "অ্যাকশন"
+"Actions" = "অ্যাকশনসমূহ"
+"Actions for {name}" = "{name}-এর জন্য অ্যাকশন"
+"Actions…" = "অ্যাকশনসমূহ..."
+"Active" = "সক্রিয়"
+"Actual size (100%)" = "প্রকৃত আকার (১০০%)"
+"Add a category" = "একটি বিভাগ যোগ করুন"
+"Add a comment" = "একটি মন্তব্য যোগ করুন"
+"Add a description" = "একটি বিবরণ যোগ করুন"
+"Add a frame (F) or a shape (R) to get started" = "শুরু করতে একটি ফ্রেম (F) বা শেপ (R) যোগ করুন"
+"Add a layer or component to tile first" = "প্রথমে টাইল করার জন্য একটি লেয়ার বা কম্পোনেন্ট যোগ করুন"
+"Add a minute" = "এক মিনিট যোগ করুন"
+"Add a note for developers" = "ডেভেলপারদের জন্য একটি নোট যোগ করুন"
+"Add action" = "অ্যাকশন যোগ করুন"
+"Add actions for when no condition holds" = "কোনো শর্ত পূর্ণ না হলে তার জন্য অ্যাকশন যোগ করুন"
+"Add an annotation for developers" = "ডেভেলপারদের জন্য একটি অ্যানোটেশন যোগ করুন"
+"Add another condition" = "আরেকটি শর্ত যোগ করুন"
+"Add auto layout" = "অটো লেআউট যোগ করুন"
+"Add background behind overlay" = "ওভারলে-এর পেছনে ব্যাকগ্রাউন্ড যোগ করুন"
+"Add column" = "কলাম যোগ করুন"
+"Add content to this slot" = "এই স্লটে কন্টেন্ট যোগ করুন"
+"Add dev resource" = "ডেভ রিসোর্স যোগ করুন"
+"Add effect" = "ইফেক্ট যোগ করুন"
+"Add export setting" = "এক্সপোর্ট সেটিংস যোগ করুন"
+"Add fill" = "ফিল যোগ করুন"
+"Add interaction" = "ইন্টারঅ্যাকশন যোগ করুন"
+"Add layout grid" = "লেআউট গ্রিড যোগ করুন"
+"Add library" = "লাইব্রেরি যোগ করুন"
+"Add library file…" = "লাইব্রেরি ফাইল যোগ করুন..."
+"Add max height" = "সর্বোচ্চ উচ্চতা যোগ করুন"
+"Add max width" = "সর্বোচ্চ প্রস্থ যোগ করুন"
+"Add measurement" = "মাপ যোগ করুন"
+"Add min height" = "সর্বনিম্ন উচ্চতা যোগ করুন"
+"Add min width" = "সর্বনিম্ন প্রস্থ যোগ করুন"
+"Add mode" = "মোড যোগ করুন"
+"Add new page" = "নতুন পেজ যোগ করুন"
+"Add or update collections from a variables JSON" = "একটি ভেরিয়েবল JSON থেকে সংগ্রহ যোগ বা আপডেট করুন"
+"Add properties to make instances configurable" = "ইনস্ট্যান্সগুলোকে কনফিগারযোগ্য করতে প্রপার্টি যোগ করুন"
+"Add reaction" = "রিঅ্যাকশন যোগ করুন"
+"Add row" = "সারি যোগ করুন"
+"Add starting point" = "শুরু করার বিন্দু যোগ করুন"
+"Add stroke" = "স্ট্রোক যোগ করুন"
+"Add variant" = "ভ্যারিয়েন্ট যোগ করুন"
+"Add variant with a new value" = "একটি নতুন মান সহ ভ্যারিয়েন্ট যোগ করুন"
+"Added" = "যোগ করা হয়েছে"
+"Added the library \"{name}\"" = "\"{name}\" লাইব্রেরি যোগ করা হয়েছে"
+"Adding to {name}" = "{name}-এ যোগ করা হচ্ছে"
+"Adjust" = "সামঞ্জস্য করুন"
+"Adjustment presets" = "অ্যাডজাস্টমেন্ট প্রিসেট"
+"Advanced" = "উন্নত"
+"Advanced stroke" = "উন্নত স্ট্রোক"
+"After delay" = "বিলম্বের পর"
+"After delay {ms}ms" = "{ms}ms বিলম্বের পর"
+"Align" = "সারিবদ্ধ করুন"
+"Align bottom" = "নিচে সারিবদ্ধ করুন"
+"Align center" = "কেন্দ্রে সারিবদ্ধ করুন"
+"Align horizontal centers" = "অনুভূমিক কেন্দ্র বরাবর সারিবদ্ধ করুন"
+"Align left" = "বামে সারিবদ্ধ করুন"
+"Align middle" = "মাঝামাঝি সারিবদ্ধ করুন"
+"Align right" = "ডানে সারিবদ্ধ করুন"
+"Align text baselines" = "টেক্সট বেসলাইন সারিবদ্ধ করুন"
+"Align top" = "উপরে সারিবদ্ধ করুন"
+"Align vertical centers" = "উল্লম্ব কেন্দ্র বরাবর সারিবদ্ধ করুন"
+"Alignment" = "সারিবদ্ধকরণ"
+"All" = "সব"
+"All categories" = "সব বিভাগ"
+"All comments" = "সব মন্তব্য"
+"All components" = "সব কম্পোনেন্ট"
+"All fonts" = "সব ফন্ট"
+"All objects" = "সব অবজেক্ট"
+"All supported properties" = "সমর্থিত সব প্রপার্টি"
+"All the fonts this file uses are installed" = "এই ফাইলে ব্যবহৃত সব ফন্ট ইনস্টল করা আছে"
+"All variables" = "সব ভেরিয়েবল"
+"Along the bottom" = "নিচের কিনারা বরাবর"
+"Along the left" = "বাম কিনারা বরাবর"
+"Along the right" = "ডান কিনারা বরাবর"
+"Along the top" = "উপরের কিনারা বরাবর"
+"Alpha" = "আলফা"
+"Alphabetical" = "বর্ণানুক্রমিক"
+"Alt+drag" = "Alt+ড্র্যাগ"
+"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "গ্রিডের উপর একটি অ্যানালিটিক্স স্ক্রিন: ফিগার, ভেক্টর থেকে আঁকা চার্ট এবং একটি টেবিল"
+"An invite link that opens FigCraft and joins" = "একটি আমন্ত্রণ লিংক যা FigCraft খুলে যুক্ত হয়"
+"Anchor" = "অ্যাঙ্কর"
+"Android" = "অ্যান্ড্রয়েড"
+"Angular" = "অ্যাঙ্গুলার"
+"Animation" = "অ্যানিমেশন"
+"Annotations" = "অ্যানোটেশন"
+"Annotations shown on the canvas" = "ক্যানভাসে অ্যানোটেশনগুলো দেখানো হচ্ছে"
+"Another server, or one that needs its key. The usual server is set in Preferences." = "অন্য একটি সার্ভার, অথবা যার কী প্রয়োজন। সাধারণ সার্ভারটি প্রেফারেন্সেসে সেট করা আছে।"
+"Any status" = "যেকোনো স্ট্যাটাস"
+"Anyone on your network with this code can edit the file, while this app stays open." = "এই অ্যাপ খোলা থাকা অবস্থায় আপনার নেটওয়ার্কে এই কোড জানা যেকোনো ব্যক্তি ফাইলটি এডিট করতে পারবেন।"
+"Anyone with the edit link can change the file; the view link only lets people look. The links carry their secrets: share them like passwords. `figcraft-server links` makes more and revokes them." = "এডিট লিংক থাকা যেকোনো ব্যক্তি ফাইলটি পরিবর্তন করতে পারবেন; ভিউ লিংক শুধু দেখতে দেয়। লিংকগুলো গোপন তথ্য বহন করে: পাসওয়ার্ডের মতো এগুলো শেয়ার করুন। `figcraft-server links` কমান্ড দিয়ে আরও তৈরি ও বাতিল করা যায়।"
+"Anyone with this code can edit the file." = "এই কোড জানা যেকোনো ব্যক্তি ফাইলটি এডিট করতে পারবেন।"
+"Anyone with this code can look at the file, not change it." = "এই কোড জানা যেকোনো ব্যক্তি ফাইলটি দেখতে পারবেন, পরিবর্তন করতে পারবেন না।"
+"Appearance" = "চেহারা"
+"Apply a component property" = "একটি কম্পোনেন্ট প্রপার্টি প্রয়োগ করুন"
+"Apply variable" = "ভেরিয়েবল প্রয়োগ করুন"
+"Apply variable to text" = "টেক্সটে ভেরিয়েবল প্রয়োগ করুন"
+"Apply variable to visibility" = "দৃশ্যমানতায় ভেরিয়েবল প্রয়োগ করুন"
+"Apps" = "অ্যাপস"
+"Apr" = "এপ্রিল"
+"Arc" = "আর্ক"
+"Arc ratio" = "আর্ক অনুপাত"
+"Arc start" = "আর্ক শুরু"
+"Arc sweep" = "আর্ক সুইপ"
+"Archive" = "আর্কাইভ"
+"Archived" = "আর্কাইভ করা হয়েছে"
+"Arrange" = "সাজান"
+"Arrow" = "তীর"
+"Arrow at the end" = "শেষে তীর"
+"As typed" = "যেমনটি টাইপ করা হয়েছে"
+"Asking the server…" = "সার্ভারকে জিজ্ঞাসা করা হচ্ছে..."
+"Assets" = "অ্যাসেট"
+"Aug" = "আগস্ট"
+"Auto" = "অটো"
+"Auto (space around)" = "অটো (চারপাশে স্পেস)"
+"Auto (space between)" = "অটো (মাঝখানে স্পেস)"
+"Auto (space evenly)" = "অটো (সমানভাবে স্পেস)"
+"Auto ({mode})" = "অটো ({mode})"
+"Auto columns" = "অটো কলাম"
+"Auto gap" = "অটো গ্যাপ"
+"Auto height" = "অটো উচ্চতা"
+"Auto layout" = "অটো লেআউট"
+"Auto rows" = "অটো সারি"
+"Auto width" = "অটো প্রস্থ"
+"Back to the FigCraft server" = "FigCraft সার্ভারে ফিরে যান"
+"Back to the font's value" = "ফন্টের মানে ফিরে যান"
+"Back" = "পেছনে"
+"Back to Ready for dev" = "ডেভের জন্য প্রস্তুত অবস্থায় ফিরে যান"
+"Back to Ready for dev: the next change compares with how it is now" = "ডেভের জন্য প্রস্তুত অবস্থায় ফিরে যান: পরবর্তী পরিবর্তনটি বর্তমান অবস্থার সাথে তুলনা করবে"
+"Back to assets" = "অ্যাসেটে ফিরে যান"
+"Back to current" = "বর্তমানে ফিরে যান"
+"Back to styles" = "স্টাইলে ফিরে যান"
+"Back to the canvas from a focused region" = "ফোকাসড অঞ্চল থেকে ক্যানভাসে ফিরে যান"
+"Back to the current version" = "বর্তমান সংস্করণে ফিরে যান"
+"Back to the values the font style implies" = "ফন্ট স্টাইল নির্দেশিত মানে ফিরে যান"
+"Background" = "ব্যাকগ্রাউন্ড"
+"Background blur" = "ব্যাকগ্রাউন্ড ব্লার"
+"Basics" = "মৌলিক বিষয়"
+"Before" = "আগে"
+"Bend" = "বাঁক"
+"Between the selected layers" = "নির্বাচিত লেয়ারগুলোর মাঝে"
+"Bevel" = "বেভেল"
+"Binary assets added" = "বাইনারি অ্যাসেট যোগ করা হয়েছে"
+"Binary assets removed" = "বাইনারি অ্যাসেট সরানো হয়েছে"
+"Black & white" = "কালো ও সাদা"
+"Bleed" = "ব্লিড"
+"Bleed marks" = "ব্লিড মার্ক"
+"Bleed marks need a bleed" = "ব্লিড মার্কের জন্য ব্লিড প্রয়োজন"
+"Blend" = "ব্লেন্ড"
+"Blend mode" = "ব্লেন্ড মোড"
+"Blue" = "নীল"
+"Blur" = "ব্লার"
+"Boolean" = "বুলিয়ান"
+"Boolean groups" = "বুলিয়ান গ্রুপ"
+"Both directions" = "উভয় দিক"
+"Bottom" = "নিচে"
+"Bottom left radius" = "নিচের বাম ব্যাসার্ধ"
+"Bottom right radius" = "নিচের ডান ব্যাসার্ধ"
+"Brainstorm" = "ব্রেইনস্টর্ম"
+"Branch" = "ব্রাঞ্চ"
+"Branch archived" = "ব্রাঞ্চ আর্কাইভ করা হয়েছে"
+"Branch merged" = "ব্রাঞ্চ মার্জ করা হয়েছে"
+"Branch name" = "ব্রাঞ্চের নাম"
+"Branch of {file}" = "{file}-এর ব্রাঞ্চ"
+"Branch of {file} · merged or archived" = "{file}-এর ব্রাঞ্চ · মার্জ বা আর্কাইভ করা হয়েছে"
+"Branch updated from main" = "প্রধান (main) থেকে ব্রাঞ্চ আপডেট করা হয়েছে"
+"Branch {name}" = "ব্রাঞ্চ {name}"
+"Branches" = "ব্রাঞ্চসমূহ"
+"Bound to {name}. Click to detach the variable." = "{name}-এর সাথে আবদ্ধ। ভেরিয়েবলটি বিচ্ছিন্ন করতে ক্লিক করুন।"
+"Bring forward" = "সামনে আনুন"
+"Bring the main file's changes into the branch" = "প্রধান ফাইলের পরিবর্তনগুলো ব্রাঞ্চে নিয়ে আসুন"
+"Bring to front" = "সবার সামনে আনুন"
+"Bristle" = "ব্রিসল"
+"Browse" = "ব্রাউজ করুন"
+"Brush" = "ব্রাশ"
+"Brush rotation jitter" = "ব্রাশ ঘূর্ণন জিটার"
+"Brush scatter" = "ব্রাশ স্ক্যাটার"
+"Brush size jitter" = "ব্রাশ সাইজ জিটার"
+"Brush spacing" = "ব্রাশ স্পেসিং"
+"Bulleted list" = "বুলেটেড তালিকা"
+"C or Shift+C" = "C বা Shift+C"
+"C or ⇧C" = "C বা ⇧C"
+"CMYK colour" = "CMYK রঙ"
+"Can view" = "দেখতে পারেন"
+"Check" = "টিক"
+"Checking the fonts installed on this computer…" = "এই কম্পিউটারে ইনস্টল করা ফন্টগুলো চেক করা হচ্ছে..."
+"Checking the server…" = "সার্ভার চেক করা হচ্ছে..."
+"Chevron" = "শেভরন"
+"Clear from this list" = "এই তালিকা থেকে মুছে ফেলুন"
+"Clear results" = "ফলাফল মুছুন"
+"Click objects to vote; click your badge to take a vote back" = "ভোট দিতে অবজেক্টে ক্লিক করুন; ভোট ফেরাতে আপনার ব্যাজে ক্লিক করুন"
+"Code or invite link" = "কোড বা আমন্ত্রণ লিংক"
+"Color profile: {name}" = "কালার প্রোফাইল: {name}"
+"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "রঙ ও টেক্সট স্টাইল, লাইট এবং ডার্ক ভেরিয়েবল, বোতাম, ইনপুট এবং কার্ড"
+"Connector" = "সংযোগকারী"
+"Convert to frame" = "ফ্রেম রূপান্তর করুন"
+"Convert to section" = "সেকশনে রূপান্তর করুন"
+"CSS custom properties…" = "CSS কাস্টম প্রপার্টি..."
+"Can edit" = "এডিট করতে পারেন"
+"Can't read this library: {e}" = "এই লাইব্রেরি পড়া যাচ্ছে না: {e}"
+"Cancel" = "বাতিল"
+"Canvas" = "ক্যানভাস"
+"Canvas stacking" = "ক্যানভাস স্ট্যাকিং"
+"Cap height to baseline" = "বেসলাইনে ক্যাপ হাইট"
+"Case" = "কেস"
+"Case-sensitive forms" = "কেস-সেন্সিটিভ ফর্ম"
+"Categories" = "বিভাগসমূহ"
+"Center" = "কেন্দ্র"
+"Change alias" = "অ্যালিয়াস পরিবর্তন করুন"
+"Change resolved" = "পরিবর্তন সমাধান করা হয়েছে"
+"Change style" = "স্টাইল পরিবর্তন করুন"
+"Change to" = "এতে পরিবর্তন করুন"
+"Change to needs a layer inside a variant" = "পরিবর্তন করার জন্য ভ্যারিয়েন্টের ভেতরে একটি লেয়ার প্রয়োজন"
+"Changed" = "পরিবর্তিত"
+"Changed on both sides: keep one" = "উভয় দিকেই পরিবর্তিত হয়েছে: একটি রাখুন"
+"Changes on main" = "প্রধান (main)-এ পরিবর্তন"
+"Changes on the branch" = "ব্রাঞ্চে পরিবর্তন"
+"Changes unknown" = "পরিবর্তন অজ্ঞাত"
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "এই কম্পোনেন্টটিকে কোডের সাথে যুক্ত করতে উপরে React, Leptos, Vue, SwiftUI, Compose, ArkUI বা Flutter বেছে নিন।"
+"Choose another profile to change it." = "পরিবর্তন করতে অন্য একটি প্রোফাইল বেছে নিন।"
+"Choose collection" = "সংগ্রহ (collection) বেছে নিন"
+"Choose image" = "ছবি বেছে নিন"
+"Choose mode" = "মোড বেছে নিন"
+"Choose variable" = "ভেরিয়েবল বেছে নিন"
+"Circle" = "বৃত্ত"
+"Clear recent" = "সাম্প্রতিকগুলো মুছে ফেলুন"
+"Click + to replace mixed content" = "মিশ্র কন্টেন্ট প্রতিস্থাপন করতে + এ ক্লিক করুন"
+"Click anywhere on the canvas to leave one." = "একটি রাখতে ক্যানভাসের যেকোনো জায়গায় ক্লিক করুন।"
+"Click or drag to merge · {alt} removes" = "মার্জ করতে ক্লিক বা ড্র্যাগ করুন · {alt} সরায়"
+"Click or drag to remove · {alt} merges" = "সরাতে ক্লিক বা ড্র্যাগ করুন · {alt} মার্জ করে"
+"Click to record a key" = "একটি কি রেকর্ড করতে ক্লিক করুন"
+"Clip content" = "ক্লিপ কন্টেন্ট"
+"Clip to shape" = "শেপে ক্লিপ করুন"
+"Close" = "বন্ধ করুন"
+"Close overlay" = "ওভারলে বন্ধ করুন"
+"Close preview" = "প্রিভিউ বন্ধ করুন"
+"Close tab" = "ট্যাব বন্ধ করুন"
+"Close version history" = "সংস্করণ ইতিহাস বন্ধ করুন"
+"Close when clicking outside" = "বাইরে ক্লিক করলে বন্ধ করুন"
+"Code" = "কোড"
+"Code syntax" = "কোড সিনট্যাক্স"
+"Collapse" = "সংকুচিত করুন"
+"Collapse panel" = "প্যানেল সংকুচিত করুন"
+"Collection" = "সংগ্রহ"
+"Collections" = "সংগ্রহসমূহ"
+"Color" = "রঙ"
+"Color burn" = "কালার বার্ন"
+"Color dodge" = "কালার ডজ"
+"Color format" = "কালার ফরম্যাট"
+"Color profile" = "কালার প্রোফাইল"
+"Color styles" = "কালার স্টাইল"
+"Color values in this file are in this color space." = "এই ফাইলের রঙের মানগুলো এই কালার স্পেসে রয়েছে।"
+"Color variables" = "কালার ভেরিয়েবল"
+"Colour" = "রঙ"
+"Column" = "কলাম"
+"Column gap" = "কলাম গ্যাপ"
+"Column sizes" = "কলামের আকার"
+"Column span" = "কলাম স্প্যান"
+"Columns" = "কলামসমূহ"
+"Columns {count}" = "কলাম {count}"
+"Comment" = "মন্তব্য"
+"Comments" = "মন্তব্যসমূহ"
+"Commits" = "কমিটসমূহ"
+"Company" = "কোম্পানি"
+"Compare changes" = "পরিবর্তন তুলনা করুন"
+"Compatibility notes" = "সঙ্গতি নোট (Compatibility notes)"
+"Completed" = "সম্পন্ন"
+"Component" = "কম্পোনেন্ট"
+"Component name" = "কম্পোনেন্টের নাম"
+"Component property" = "কম্পোনেন্ট প্রপার্টি"
+"Component set" = "কম্পোনেন্ট সেট"
+"Component sets" = "কম্পোনেন্ট সেটসমূহ"
+"Components" = "কম্পোনেন্টস"
+"Conditional" = "শর্তসাপেক্ষ"
+"Confetti" = "কনফেটি"
+"Conflicts" = "দ্বন্দ্ব (Conflicts)"
+"Connect to code" = "কোডের সাথে সংযুক্ত করুন"
+"Connected" = "সংযুক্ত"
+"Connected to code: {from}" = "কোডের সাথে সংযুক্ত: {from}"
+"Connection lost, reconnecting (attempt {attempt})…" = "সংযোগ বিচ্ছিন্ন হয়েছে, পুনরায় সংযোগ স্থাপন করা হচ্ছে (চেষ্টা {attempt})..."
+"Constrain proportions" = "অনুপাত ঠিক রাখুন"
+"Constraints" = "সীমাবদ্ধতা (Constraints)"
+"Content" = "কন্টেন্ট"
+"Contents hidden" = "কন্টেন্ট লুকানো আছে"
+"Contextual alternates" = "প্রসঙ্গভিত্তিক বিকল্প"
+"Contrast" = "কনট্রাস্ট (Contrast)"
+"Contributors" = "অবদানকারীগণ"
+"Contributors: {people} · Commits: {commits}" = "অবদানকারী: {people} · কমিট: {commits}"
+"Controller" = "কন্ট্রোলার"
+"Cool" = "কুল"
+"Copied as CSS" = "CSS হিসেবে কপি করা হয়েছে"
+"Copied as PNG" = "PNG হিসেবে কপি করা হয়েছে"
+"Copied as SVG" = "SVG হিসেবে কপি করা হয়েছে"
+"Copied as text" = "টেক্সট হিসেবে কপি করা হয়েছে"
+"Copied {value}" = "{value} কপি করা হয়েছে"
+"Copy" = "কপি করুন"
+"Copy as" = "যেভাবে কপি করবেন"
+"Copy as CSS" = "CSS হিসেবে কপি করুন"
+"Copy as PNG" = "PNG হিসেবে কপি করুন"
+"Copy as SVG" = "SVG হিসেবে কপি করুন"
+"Copy code" = "কোড কপি করুন"
+"Copy link" = "লিংক কপি করুন"
+"Copy the {label}" = "{label} কপি করুন"
+"Copy {value}" = "{value} কপি করুন"
+"Corner radius" = "কোণার ব্যাসার্ধ (Corner radius)"
+"Corner smoothing" = "কোণা মসৃণকরণ"
+"Couldn't download the variables" = "ভেরিয়েবলগুলো ডাউনলোড করা যায়নি"
+"Couldn't reach {server}: showing what this computer remembers." = "{server}-এ পৌঁছানো যায়নি: এই কম্পিউটার যা মনে রেখেছে তা দেখানো হচ্ছে।"
+"Couldn't save automatically: {error}" = "স্বয়ংক্রিয়ভাবে সেভ করা যায়নি: {error}"
+"Couldn't save the file" = "ফাইলটি সেভ করা যায়নি"
+"Count" = "গণনা"
+"Create" = "তৈরি করুন"
+"Create a variable collection first" = "প্রথমে একটি ভেরিয়েবল সংগ্রহ তৈরি করুন"
+"Create a variable first" = "প্রথমে একটি ভেরিয়েবল তৈরি করুন"
+"Create alias" = "অ্যালিয়াস তৈরি করুন"
+"Create branch" = "ব্রাঞ্চ তৈরি করুন"
+"Create collection" = "সংগ্রহ তৈরি করুন"
+"Create component" = "কম্পোনেন্ট তৈরি করুন"
+"Create component property" = "কম্পোনেন্ট প্রপার্টি তৈরি করুন"
+"Create components, styles or variables to publish them as a library." = "লাইব্রেরি হিসেবে প্রকাশ করতে কম্পোনেন্ট, স্টাইল বা ভেরিয়েবল তৈরি করুন।"
+"Create property…" = "প্রপার্টি তৈরি করুন..."
+"Create style" = "স্টাইল তৈরি করুন"
+"Create style from the selected text" = "নির্বাচিত টেক্সট থেকে স্টাইল তৈরি করুন"
+"Created" = "তৈরি করা হয়েছে"
+"Crop" = "ক্রপ"
+"Crop marks" = "ক্রপ মার্ক"
+"Ctrl+arrows" = "Ctrl+অ্যারো"
+"Ctrl+click" = "Ctrl+ক্লিক"
+"Ctrl+scroll" = "Ctrl+স্ক্রল"
+"Current name" = "বর্তমান নাম"
+"Current version" = "বর্তমান সংস্করণ"
+"Cursor chat" = "কার্সার চ্যাট"
+"Custom" = "কাস্টম"
+"Custom size" = "কাস্টম আকার"
+"Cut" = "কাট করুন"
+"Dark" = "ডার্ক"
+"Darken" = "ডার্কেন"
+"Dash" = "ড্যাশ"
+"Dashboard" = "ড্যাশবোর্ড"
+"Date created" = "তৈরির তারিখ"
+"Dec" = "ডিসেম্বর"
+"Decoration style" = "সজ্জা স্টাইল (Decoration style)"
+"Decoration" = "সজ্জা"
+"Deep select" = "ডিপ সিলেক্ট"
+"Default" = "ডিফল্ট"
+"Default content" = "ডিফল্ট কন্টেন্ট"
+"Default value (the top-left variant)" = "ডিফল্ট মান (উপরের-বাম ভ্যারিয়েন্ট)"
+"Delay" = "বিলম্ব"
+"Delete" = "ডিলিট করুন"
+"Delete category (its annotations stay)" = "বিভাগ ডিলিট করুন (এর অ্যানোটেশনগুলো থেকে যাবে)"
+"Delete collection" = "সংগ্রহ ডিলিট করুন"
+"Delete group" = "গ্রুপ ডিলিট করুন"
+"Delete mode" = "মোড ডিলিট করুন"
+"Delete page" = "পেজ ডিলিট করুন"
+"Delete preset" = "প্রিসেট ডিলিট করুন"
+"Delete property" = "প্রপার্টি ডিলিট করুন"
+"Delete the style (layers keep their values)" = "স্টাইল ডিলিট করুন (লেয়ারগুলো তাদের মান ধরে রাখবে)"
+"Delete thread" = "থ্রেড ডিলিট করুন"
+"Delete variable" = "ভেরিয়েবল ডিলিট করুন"
+"Delete “{name}”? This can't be undone." = "“{name}” ডিলিট করবেন? এটি আর ফেরানো যাবে না।"
+"Density" = "ঘনত্ব"
+"Depth" = "গভীরতা"
+"Describe how and when to use this component" = "এই কম্পোনেন্টটি কীভাবে এবং কখন ব্যবহার করতে হবে তা বর্ণনা করুন"
+"Describe what changed" = "কী পরিবর্তিত হয়েছে তা বর্ণনা করুন"
+"Description" = "বিবরণ"
+"Description (optional)" = "বিবরণ (ঐচ্ছিক)"
+"Design" = "ডিজাইন"
+"Design panel" = "ডিজাইন প্যানেল"
+"Design system starter" = "ডিজাইন সিস্টেম স্টার্টার"
+"Desktop" = "ডেস্কটপ"
+"Destination" = "গন্তব্য"
+"Detach alias" = "অ্যালিয়াস বিচ্ছিন্ন করুন"
+"Detach instance" = "ইনস্ট্যান্স বিচ্ছিন্ন করুন"
+"Detach property" = "প্রপার্টি বিচ্ছিন্ন করুন"
+"Detach style" = "স্টাইল বিচ্ছিন্ন করুন"
+"Detach styles" = "স্টাইলগুলো বিচ্ছিন্ন করুন"
+"Detach variable" = "ভেরিয়েবল বিচ্ছিন্ন করুন"
+"Details" = "বিস্তারিত"
+"Dev Mode" = "ডেভ মোড"
+"Dev resources" = "ডেভ রিসোর্স"
+"Development" = "ডেভেলপমেন্ট"
+"Device" = "ডিভাইস"
+"Device at 100%" = "১০০%-এ ডিভাইস"
+"Diamond" = "ডায়মন্ড"
+"Difference" = "পার্থক্য"
+"Dimensions" = "মাত্রা (Dimensions)"
+"Direction" = "দিক"
+"Disconnect from code" = "কোড থেকে সংযোগ বিচ্ছিন্ন করুন"
+"Dispersion" = "বিচ্ছুরণ"
+"Display name" = "প্রদর্শিত নাম"
+"Dissolve" = "ডিসলভ"
+"Distribute and tidy" = "বণ্টন ও পরিপাটি করুন"
+"Distribute horizontal spacing" = "অনুভূমিক ব্যবধান বিতরণ করুন"
+"Distribute vertical spacing" = "উল্লম্ব ব্যবধান বিতরণ করুন"
+"Divider" = "ডিভাইডার"
+"Don't Save" = "সংরক্ষণ করবেন না"
+"Don't truncate" = "ট্রাঙ্কেট করবেন না"
+"Done" = "সম্পন্ন"
+"Done editing" = "সম্পাদনা শেষ"
+"Dots" = "বিন্দুসমূহ"
+"Dotted" = "ডটেড"
+"Down" = "নিচে"
+"Drafts" = "ড্রাফট"
+"Drag the stroke to add a width point" = "প্রস্থ বিন্দু যোগ করতে স্ট্রোকে ড্র্যাগ করুন"
+"Draw" = "আঁকুন"
+"Draw a frame" = "একটি ফ্রেম আঁকুন"
+"Drawing tools" = "অঙ্কন টুলস"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "একটি .figcraft, .fig, .sketch, .json, .svg বা ছবির ফাইল ড্রপ করুন।"
+"Drop to import" = "ইম্পোর্ট করতে ড্রপ করুন"
+"Drop to open" = "খুলতে ড্রপ করুন"
+"Drop shadow" = "ড্রপ শ্যাডো"
+"Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "ডুয়াল-লাইসেন্সকৃত MIT বা Apache-2.0। ArtCraft টিম এবং কমিউনিটি দ্বারা তৈরি।"
+"Duo" = "ডুও"
+"Duplicate" = "প্রতিলিপি তৈরি করুন (Duplicate)"
+"Duplicate by dragging" = "ড্র্যাগ করে ডুপ্লিকেট করুন"
+"Duplicate mode" = "মোড ডুপ্লিকেট করুন"
+"Duplicate page" = "পেজ ডুপ্লিকেট করুন"
+"Edit" = "এডিট"
+"Edit as an expression" = "এক্সপ্রেশন হিসেবে এডিট করুন"
+"Edit colour" = "রঙ এডিট করুন"
+"Edit comment" = "মন্তব্য এডিট করুন"
+"Edit dev resource" = "ডেভ রিসোর্স এডিট করুন"
+"Edit link" = "লিংক এডিট করুন"
+"Edit link copied" = "এডিট লিংক কপি করা হয়েছে"
+"Edit style" = "স্টাইল এডিট করুন"
+"Edit variable" = "ভেরিয়েবল এডিট করুন"
+"Edit with the builder" = "বিল্ডার দিয়ে এডিট করুন"
+"Edited {when}" = "{when} এডিট করা হয়েছে"
+"Effect settings" = "ইফেক্ট সেটিংস"
+"Effect styles" = "ইফেক্ট স্টাইল"
+"Effects" = "ইফেক্টসমূহ"
+"Curved" = "বাঁকা"
+"Elbow" = "কোণযুক্ত"
+"Ellipse" = "উপবৃত্ত"
+"Ellipses" = "উপবৃত্তসমূহ"
+"Else" = "অন্যথায় (Else)"
+"Else if" = "অন্যথায় যদি (Else if)"
+"Embedded profile" = "এমবেডেড প্রোফাইল"
+"Empty" = "খালি"
+"End" = "শেষ"
+"End point" = "শেষ বিন্দু"
+"End vote" = "ভোট শেষ করুন"
+"Ends the session; everyone keeps their copy" = "সেশন শেষ করে; সবাই তাদের কপি নিজের কাছে রাখে"
+"Enter" = "এন্টার"
+"Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "একটি figcraft-সার্ভারের ঠিকানা দিন এবং এটি যে প্লাগইনগুলো অফার করে তা দেখতে ব্রাউজ টিপুন।"
+"Enter to save · Esc to cancel" = "সেভ করতে Enter · বাতিল করতে Esc"
+"Eraser" = "ইরেজার"
+"Esc" = "Esc"
+"Essential" = "অত্যাবশ্যকীয়"
+"Every conflict has a choice." = "প্রতিটি দ্বন্দ্বেরই একটি সমাধান বা পছন্দ থাকে।"
+"Every top-level frame already starts a flow" = "প্রতিটি শীর্ষ-স্তরের ফ্রেম ইতিমধ্যে একটি ফ্লো শুরু করে"
+"Exact opacity (4 then 5: 45%)" = "সঠিক অস্বচ্ছতা (4 তারপর 5: 45%)"
+"Exclude" = "বাদ দিন"
+"Excluded" = "বাদ দেওয়া হয়েছে"
+"Excluded from layout" = "লেআউট থেকে বাদ দেওয়া হয়েছে"
+"Excludes" = "বাদ দেয়"
+"Exclusion" = "এক্সক্লুশন"
+"Exit focus view (Esc)" = "ফোকাস ভিউ থেকে বের হন (Esc)"
+"Expand" = "প্রসারিত করুন"
+"Export" = "এক্সপোর্ট"
+"Export all" = "সব এক্সপোর্ট করুন"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "ফ্রেম এবং লেয়ারগুলোকে PNG, JPG, SVG বা PDF হিসেবে এক্সপোর্ট করুন"
+"Export page as PNG" = "পেজ PNG হিসেবে এক্সপোর্ট করুন"
+"Export settings" = "এক্সপোর্ট সেটিংস"
+"Export variables" = "ভেরিয়েবল এক্সপোর্ট করুন"
+"Export {name}" = "{name} এক্সপোর্ট করুন"
+"Export {n} layers" = { one = "{n}টি লেয়ার এক্সপোর্ট করুন", other = "{n}টি লেয়ার এক্সপোর্ট করুন" }
+"Exported {file}" = "{file} এক্সপোর্ট করা হয়েছে"
+"Exported {name}" = "{name} এক্সপোর্ট করা হয়েছে"
+"Exported {name}; {n} kinds of content were left out" = { one = "{name} এক্সপোর্ট করা হয়েছে; {n} ধরনের কন্টেন্ট বাদ দেওয়া হয়েছে", other = "{name} এক্সপোর্ট করা হয়েছে; {n} ধরনের কন্টেন্ট বাদ দেওয়া হয়েছে" }
+"Exported {n} files" = { one = "{n}টি ফাইল এক্সপোর্ট করা হয়েছে", other = "{n}টি ফাইল এক্সপোর্ট করা হয়েছে" }
+"Export…" = "এক্সপোর্ট..."
+"Expose properties to instances" = "ইনস্ট্যান্সে প্রপার্টি উন্মুক্ত করুন"
+"Exposure" = "এক্সপোজার"
+"Expression" = "এক্সপ্রেশন"
+"Extend collection" = "সংগ্রহ প্রসারিত করুন"
+"Extends \"{name}\": overridden values are marked" = "\"{name}\"-কে প্রসারিত করে: ওভাররাইড করা মানগুলো চিহ্নিত করা আছে"
+"Eye" = "চোখ"
+"F" = "F"
+"Fade" = "ফেড"
+"False" = "মিথ্যা (False)"
+"Feb" = "ফেব্রুয়ারি"
+"Fetching from the server…" = "সার্ভার থেকে ডেটা আনা হচ্ছে..."
+"FigCraft couldn't open its window: {error}" = "FigCraft এর উইন্ডো খুলতে পারেনি: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft এখনো এই ফাইলগুলোর সব ফিচার সমর্থন করে না। নোটগুলোতে ইম্পোর্ট করা কপিতে যা বাদ দেওয়া হয়েছে বা পরিবর্তন করা হয়েছে তার তালিকা রয়েছে; মূল ফাইলটি অপরিবর্তিত রয়েছে।"
+"File" = "ফাইল"
+"File name" = "ফাইলের নাম"
+"File not found" = "ফাইল পাওয়া যায়নি"
+"File published" = "ফাইল প্রকাশিত হয়েছে"
+"Files aren't end-to-end encrypted: the server's operator can read them." = "ফাইলগুলো এন্ড-টু-এন্ড এনক্রিপ্টেড নয়: সার্ভারের অপারেটর এগুলো পড়তে পারেন।"
+"Files nobody opens for {n} days are deleted." = { one = "যে ফাইল {n} দিন কেউ খোলে না তা ডিলিট করা হয়।", other = "যে ফাইলগুলো {n} দিন কেউ খোলে না সেগুলো ডিলিট করা হয়।" }
+"Fill" = "ফিল"
+"Fill (fr)" = "ফিল (fr)"
+"Fill container" = "কন্টেইনার পূর্ণ করুন"
+"Fill window" = "উইন্ডো পূর্ণ করুন"
+"Fills" = "ফিলসমূহ"
+"Fill|sizing" = "ফিল"
+"Filter and sort" = "ফিল্টার ও সাজান"
+"Find" = "খুঁজুন"
+"Find and replace" = "খুঁজুন ও প্রতিস্থাপন করুন"
+"Find layers" = "লেয়ার খুঁজুন"
+"First" = "প্রথম"
+"First commit" = "প্রথম কমিট"
+"First on top" = "প্রথমে উপরে"
+"Fit" = "ফিট"
+"Fit device to window" = "উইন্ডোতে ডিভাইস ফিট করুন"
+"Fit to contents" = "কন্টেন্ট অনুযায়ী ফিট করুন"
+"Fit to window" = "উইন্ডো অনুযায়ী ফিট করুন"
+"Fit width" = "প্রস্থ ফিট করুন"
+"Fixed" = "নির্দিষ্ট (Fixed)"
+"Fixed gap" = "নির্দিষ্ট গ্যাপ"
+"Fixed size" = "নির্দিষ্ট আকার"
+"Flatten" = "ফ্ল্যাট করুন"
+"Flip" = "উল্টান (Flip)"
+"Flip horizontal" = "অনুভূমিকভাবে উল্টান"
+"Flip text to the other side" = "টেক্সট অন্য পাশে উল্টান"
+"Flip vertical" = "উল্লম্বভাবে উল্টান"
+"Flip width profile" = "প্রস্থ প্রোফাইল উল্টান"
+"Flow chart" = "ফ্লো চার্ট"
+"Flow starting point" = "ফ্লো শুরুর বিন্দু"
+"Flow starting points" = "ফ্লো শুরুর বিন্দুসমূহ"
+"Flows" = "ফ্লোসমূহ"
+"Focus view" = "ফোকাস ভিউ"
+"Fold autosaves" = "স্বয়ংক্রিয় সেভ ভাঁজ করুন"
+"Folder: click to collapse" = "ফোল্ডার: সংকুচিত করতে ক্লিক করুন"
+"Folder: click to expand" = "ফোল্ডার: প্রসারিত করতে ক্লিক করুন"
+"Follow" = "অনুসরণ করুন"
+"Follow {name}" = "{name}-কে অনুসরণ করুন"
+"Following" = "অনুসরণ করা হচ্ছে"
+"Following {name} · {key} to stop" = "{name}-কে অনুসরণ করা হচ্ছে · থামতে {key} টিপুন"
+"Font" = "ফন্ট"
+"Font not installed" = "ফন্ট ইনস্টল করা নেই"
+"Font size" = "ফন্টের আকার"
+"Font style" = "ফন্ট স্টাইল"
+"Forget on this computer" = "এই কম্পিউটার থেকে মুছে ফেলুন"
+"Four screens of a trail app with components and a prototype flow" = "কম্পোনেন্ট এবং প্রোটোটাইপ ফ্লো সহ ট্রেইল অ্যাপের চারটি স্ক্রিন"
+"Fractions" = "ভগ্নাংশ"
+"Frame" = "ফ্রেম"
+"Frame selection" = "ফ্রেম নির্বাচন"
+"Frame tools" = "ফ্রেম টুলস"
+"Frames" = "ফ্রেমসমূহ"
+"From the library \"{name}\": read-only" = "\"{name}\" লাইব্রেরি থেকে: শুধুমাত্র পড়ার উপযোগী (read-only)"
+"From {name}" = "{name} থেকে"
+"From {server}" = "{server} থেকে"
+"Frost" = "ফ্রস্ট"
+"Gap" = "গ্যাপ"
+"Gap between columns" = "কলামের মধ্যবর্তী গ্যাপ"
+"Gap between items" = "আইটেমের মধ্যবর্তী গ্যাপ"
+"Gap between rows" = "সারির মধ্যবর্তী গ্যাপ"
+"Getting started" = "শুরু করা"
+"Give the address of a server open to the public, or a server's address with its key (`figcraft-server key` prints it)." = "পাবলিকের জন্য উন্মুক্ত কোনো সার্ভারের ঠিকানা দিন, অথবা কী সহ সার্ভারের ঠিকানা দিন (`figcraft-server key` এটি প্রিন্ট করে)।"
+"Glass" = "গ্লাস"
+"Go to main component" = "প্রধান কম্পোনেন্টে যান"
+"Go to {name}" = "{name}-এ যান"
+"Grab bag" = "গ্র্যাব ব্যাগ"
+"Gradient" = "গ্রেডিয়েন্ট"
+"Gray" = "ধূসর"
+"Green" = "সবুজ"
+"Greyscale components and two example screens to sketch a flow with" = "একটি ফ্লো স্কেচ করার জন্য গ্রেস্কেল কম্পোনেন্ট এবং দুটি উদাহরণ স্ক্রিন"
+"Grid" = "গ্রিড"
+"Grid ({size})" = "গ্রিড ({size})"
+"Grid styles" = "গ্রিড স্টাইল"
+"Grid {size}" = "গ্রিড {size}"
+"Group" = "গ্রুপ"
+"Group selection" = "গ্রুপ নির্বাচন"
+"Groups" = "গ্রুপসমূহ"
+"Gutter" = "গাটার"
+"Hand tool" = "হ্যান্ড টুল"
+"Hanging list" = "হ্যাংগিং তালিকা"
+"Hanging punctuation" = "হ্যাংগিং বিরামচিহ্ন"
+"Hard light" = "হার্ড লাইট"
+"Heart" = "হৃদয়"
+"Height" = "উচ্চতা"
+"Help" = "সহায়তা"
+"Help and resources" = "সহায়তা ও রিসোর্স"
+"Help page" = "সহায়তা পেজ"
+"Here: {names}" = "এখানে: {names}"
+"Hidden" = "লুকানো"
+"Hide contents" = "কন্টেন্ট লুকান"
+"Hide from publishing" = "প্রকাশ করা থেকে লুকান"
+"Hide section contents" = "সেকশনের কন্টেন্ট লুকান"
+"Hide these tips (Getting started in the Help menu shows them again)" = "এই টিপসগুলো লুকান (সহায়তা মেনুর 'শুরু করা' অপশনটি এগুলো আবার দেখাবে)"
+"Hide when publishing" = "প্রকাশ করার সময় লুকান"
+"Highlight layers on hover" = "হোভারে লেয়ার হাইলাইট করুন"
+"Highlighter" = "হাইলাইটার"
+"Highlights" = "হাইলাইটস"
+"Hold Alt" = "Alt চেপে ধরে রাখুন"
+"Hold Alt+Z" = "Alt+Z চেপে ধরে রাখুন"
+"Hold Ctrl" = "Ctrl চেপে ধরে রাখুন"
+"Hold Z" = "Z চেপে ধরে রাখুন"
+"Hold ⌃ or ⌘" = "⌃ বা ⌘ চেপে ধরে রাখুন"
+"Hold ⌥" = "⌥ চেপে ধরে রাখুন"
+"Hold ⌥Z" = "⌥Z চেপে ধরে রাখুন"
+"Home" = "হোম"
+"Horizontal" = "অনুভূমিক"
+"Horizontal align" = "অনুভূমিক সারিবদ্ধকরণ"
+"Horizontal hex" = "অনুভূমিক হেক্স"
+"Horizontal padding" = "অনুভূমিক প্যাডিং"
+"Horizontal spacing" = "অনুভূমিক ব্যবধান"
+"Hosted by {operator}" = "হোস্ট করেছেন: {operator}"
+"Hover a layer to see its properties" = "প্রপার্টি দেখতে কোনো লেয়ারের উপর হোভার করুন"
+"Hover other layers to measure the distance" = "দূরত্ব মাপতে অন্য লেয়ারগুলোর উপর হোভার করুন"
+"Hue" = "হিউ (Hue)"
+"Hug" = "হাগ"
+"Hug contents" = "কন্টেন্ট অনুযায়ী হাগ করুন"
+"Icon components on a 24 px grid with keylines and a size preview" = "কিলিন এবং সাইজ প্রিভিউ সহ ২৪ পিক্সেল গ্রিডে আইকন কম্পোনেন্ট"
+"Icon set starter" = "আইকন সেট স্টার্টার"
+"If it keeps happening, please report it at {link} with this message." = "যদি এটি বারবার ঘটতে থাকে, তবে অনুগ্রহ করে এই বার্তা সহ {link}-এ রিপোর্ট করুন।"
+"If" = "যদি (If)"
+"If {condition}" = "যদি {condition}"
+"Ignore auto layout (absolute position)" = "অটো লেআউট উপেক্ষা করুন (অ্যাবসোলিউট পজিশন)"
+"Ignore overlapping layers" = "ওভারল্যাপ করা লেয়ার উপেক্ষা করুন"
+"Image" = "ছবি"
+"Images" = "ছবিসমূহ"
+"Import" = "ইম্পোর্ট"
+"Import path" = "ইম্পোর্ট পাথ"
+"Import plugin from manifest" = "মেনিফেস্ট থেকে প্লাগইন ইম্পোর্ট করুন"
+"Import plugin from manifest…" = "মেনিফেস্ট থেকে প্লাগইন ইম্পোর্ট করুন..."
+"Import report" = "ইম্পোর্ট রিপোর্ট"
+"Import variables" = "ভেরিয়েবল ইম্পোর্ট করুন"
+"Imported document" = "ইম্পোর্ট করা ডকুমেন্ট"
+"Imported {name}" = "{name} ইম্পোর্ট করা হয়েছে"
+"Imported {n} new variables, updated {updated}" = { one = "{n}টি নতুন ভেরিয়েবল ইম্পোর্ট করা হয়েছে, {updated} আপডেট করা হয়েছে", other = "{n}টি নতুন ভেরিয়েবল ইম্পোর্ট করা হয়েছে, {updated} আপডেট করা হয়েছে" }
+"Import…" = "ইম্পোর্ট..."
+"In an instance, this comes from the main component" = "একটি ইনস্ট্যান্সে, এটি প্রধান কম্পোনেন্ট থেকে আসে"
+"In the browser you can join sessions the desktop app hosts and files on a FigCraft server. A page opened over https reaches other computers only through wss:// links (a server behind TLS)." = "ব্রাউজারে আপনি ডেস্কটপ অ্যাপের হোস্ট করা সেশন এবং FigCraft সার্ভারের ফাইলে যুক্ত হতে পারবেন। https-এর মাধ্যমে খোলা কোনো পেজ শুধুমাত্র wss:// লিঙ্কের (TLS-এর পেছনের সার্ভার) মাধ্যমে অন্যান্য কম্পিউটারে পৌঁছায়।"
+"Include bounding box" = "বাউন্ডিং বক্স অন্তর্ভুক্ত করুন"
+"Include id attribute" = "id অ্যাট্রিবিউট অন্তর্ভুক্ত করুন"
+"Included" = "অন্তর্ভুক্ত"
+"Included in layout" = "লেআউটে অন্তর্ভুক্ত"
+"Individual corners" = "পৃথক কোণা"
+"Individual strokes" = "পৃথক স্ট্রোক"
+"Ink" = "কালি (Ink)"
+"Inner shadow" = "ইনার শ্যাডো"
+"Inside" = "ভিতরে"
+"Inspect" = "ইন্সপেক্ট"
+"Inspect the layer under the pointer: size, colours, typography" = "পয়েন্টারের নিচের লেয়ারটি ইন্সপেক্ট করুন: আকার, রঙ, টাইপোগ্রাফি"
+"Install plugin" = "প্লাগইন ইনস্টল করুন"
+"Install" = "ইনস্টল করুন"
+"Installed {name}" = "{name} ইনস্টল করা হয়েছে"
+"Installed" = "ইনস্টল করা হয়েছে"
+"Installing…" = "ইনস্টল হচ্ছে..."
+"Instance" = "ইনস্ট্যান্স"
+"Instance properties" = "ইনস্ট্যান্স প্রপার্টি"
+"Instance swap" = "ইনস্ট্যান্স সোয়াপ"
+"Instance swap (no other component)" = "ইনস্ট্যান্স সোয়াপ (অন্য কোনো কম্পোনেন্ট নেই)"
+"Instances" = "ইনস্ট্যান্সসমূহ"
+"Instant" = "তাৎক্ষণিক"
+"Intensity" = "তীব্রতা"
+"Interaction" = "ইন্টারঅ্যাকশন"
+"Interactions" = "ইন্টারঅ্যাকশনসমূহ"
+"Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "ইন্টারফেস ডিজাইন এবং প্রোটোটাইপিং। Rust-এ শূন্য থেকে তৈরি একটি ফ্রি, ওপেন-সোর্স, ক্লিন-রুম ডিজাইন টুল, যা ArtCraft Crafting Apps-এর অংশ।"
+"Intersect" = "ছেদ (Intersect)"
+"Intersects" = "ছেদ করে"
+"Invalid color" = "অবৈধ রঙ"
+"Invite link" = "আমন্ত্রণ লিংক"
+"Invite link copied" = "আমন্ত্রণ লিংক কপি করা হয়েছে"
+"It asks permission to:" = "এটি অনুমতি চায়:"
+"Jan" = "জানুয়ারি"
+"Join" = "যুক্ত হোন"
+"Join code copied" = "যুক্তি কোড (Join code) কপি করা হয়েছে"
+"Join code or invite link" = "যুক্ত হওয়ার কোড বা আমন্ত্রণ লিংক"
+"Join live session" = "লাইভ সেশনে যুক্ত হোন"
+"Join us on Discord" = "ডিসকর্ডে আমাদের সাথে যুক্ত হোন"
+"Join with a code" = "কোড দিয়ে যুক্ত হোন"
+"Joined" = "যুক্ত হয়েছেন"
+"Joined {file}" = "{file}-এ যুক্ত হয়েছেন"
+"Joining…" = "যুক্ত হওয়া হচ্ছে..."
+"Join|stroke" = "জয়েন"
+"Jul" = "জুলাই"
+"Jun" = "জুন"
+"Just now" = "এইমাত্র"
+"Justify" = "উভয়মুখী সারিবদ্ধকরণ (Justify)"
+"Kanban board" = "কানবান বোর্ড"
+"Keep a measurement on the canvas for developers" = "ডেভেলপারদের জন্য ক্যানভাসে একটি মাপ রাখুন"
+"Keep appearance" = "চেহারা অপরিবর্তিত রাখুন"
+"Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "চেহারা অপরিবর্তিত রাখলে প্রতিটি রঙের মান {profile}-এ রূপান্তরিত হয় যাতে রঙগুলো একই দেখায়। মান অপরিবর্তিত রাখলে সংখ্যাগুলো যেমন আছে তেমনই থাকে, ফলে রঙ পরিবর্তিত হয়।"
+"Keep tool selected after use" = "ব্যবহারের পরেও টুল নির্বাচিত রাখুন"
+"Keep values" = "মান অপরিবর্তিত রাখুন"
+"Key/Gamepad" = "কি/গেমপ্যাড"
+"Key/Gamepad {key}" = "কি/গেমপ্যাড {key}"
+"Keyboard shortcuts" = "কিবোর্ড শর্টকাট"
+"Kits" = "কিটস"
+"Landing page" = "ল্যান্ডিং পেজ"
+"Language" = "ভাষা"
+"Lasso" = "ল্যাসো"
+"Last" = "শেষ"
+"Last change: {note}" = "শেষ পরিবর্তন: {note}"
+"Last commit" = "শেষ কমিট"
+"Last modified" = "সর্বশেষ সংশোধিত"
+"Last on top" = "প্রথমে নিচে"
+"Layer blur" = "লেয়ার ব্লার"
+"Layer name" = "লেয়ারের নাম"
+"Layers" = "লেয়ারসমূহ"
+"Layers in an instance take their position from the main component" = "ইনস্ট্যান্সের লেয়ারগুলো তাদের অবস্থান প্রধান কম্পোনেন্ট থেকে নেয়"
+"Layout" = "লেআউট"
+"Layout grid" = "লেআউট গ্রিড"
+"Layout grid settings" = "লেআউট গ্রিড সেটিংস"
+"Layout grids" = "লেআউট গ্রিডসমূহ"
+"Leave session" = "সেশন ত্যাগ করুন"
+"Leaves" = "ত্যাগ করে"
+"Left" = "বামে"
+"Left & right" = "বাম ও ডান"
+"Left side" = "বাম পাশ"
+"Left side width" = "বাম পাশের প্রস্থ"
+"Letter case" = "লেটার কেস"
+"Letter spacing" = "অক্ষরের ব্যবধান"
+"Libraries" = "লাইব্রেরিসমূহ"
+"Libraries in this file" = "এই ফাইলের লাইব্রেরিগুলো"
+"Library updates available" = "লাইব্রেরি আপডেট উপলব্ধ আছে"
+"Library: click to collapse" = "লাইব্রেরি: সংকুচিত করতে ক্লিক করুন"
+"Library: click to expand" = "লাইব্রেরি: প্রসারিত করতে ক্লিক করুন"
+"Library: its variables are read-only here; edit them in the library file and publish it" = "লাইব্রেরি: এর ভেরিয়েবলগুলো এখানে শুধুমাত্র পড়ার উপযোগী; লাইব্রেরি ফাইলে গিয়ে এগুলো এডিট করুন এবং প্রকাশ করুন"
+"Light" = "লাইট"
+"Lighten" = "লাইটেন"
+"Light|glass" = "লাইট"
+"Line" = "লাইন"
+"Line arrow" = "লাইন তীর"
+"Line delta" = "লাইন ডেল্টা"
+"Line height" = "লাইনের উচ্চতা"
+"Linear" = "লিনিয়ার"
+"Lines" = "লাইনসমূহ"
+"Lines +/−" = "লাইন +/−"
+"Lines added" = "লাইন যোগ করা হয়েছে"
+"Lines deleted" = "লাইন ডিলিট করা হয়েছে"
+"Link" = "লিংক"
+"Link copied" = "লিংক কপি করা হয়েছে"
+"Link docs, code or tickets for developers." = "ডেভেলপারদের জন্য ডকুমেন্ট, কোড বা টিকিট লিংক করুন।"
+"Link frames on the Prototype tab, then present the flow" = "প্রোটোটাইপ ট্যাবে ফ্রেমগুলো লিংক করুন, এরপর ফ্লো উপস্থাপন করুন"
+"Link this component to its code component: instances then show your real snippet with their values." = "এই কম্পোনেন্টটিকে এর কোড কম্পোনেন্টের সাথে লিংক করুন: ইনস্ট্যান্সগুলো তখন তাদের মানসহ আপনার আসল স্নিপেট দেখাবে।"
+"List spacing" = "তালিকায় ব্যবধান"
+"List style" = "তালিকায় স্টাইল"
+"Live session" = "লাইভ সেশন"
+"Live · {people}" = "লাইভ · {people}"
+"Local components" = "স্থানীয় কম্পোনেন্ট"
+"Local network" = "স্থানীয় নেটওয়ার্ক"
+"Local styles" = "স্থানীয় স্টাইল"
+"Local variables" = "স্থানীয় ভেরিয়েবল"
+"Lock/Unlock" = "লক/আনলক"
+"Locked" = "লক করা"
+"Lowercase" = "ছোট হাতের অক্ষর"
+"Luminance" = "লুমিন্যান্স"
+"Luminosity" = "উজ্জ্বলতা (Luminosity)"
+"Main" = "প্রধান"
+"Main component deleted" = "প্রধান কম্পোনেন্ট ডিলিট করা হয়েছে"
+"Main menu" = "প্রধান মেনু"
+"Make a component" = "একটি কম্পোনেন্ট তৈরি করুন"
+"Make slot" = "স্লট তৈরি করুন"
+"Mar" = "মার্চ"
+"Margin" = "মার্জিন"
+"Mark all as read" = "সব পঠিত হিসেবে চিহ্নিত করুন"
+"Mark as resolved" = "সমাধানকৃত হিসেবে চিহ্নিত করুন"
+"Mark as unread" = "অপঠিত হিসেবে চিহ্নিত করুন"
+"Mark as unresolved" = "অমীমাংসিত হিসেবে চিহ্নিত করুন"
+"Marker" = "মার্কার"
+"Mask" = "মাস্ক"
+"Mass · Stiffness · Damping" = "ভর · দৃঢ়তা · ড্যাম্পিং"
+"Match (empty: the whole name)" = "মেলবন্ধন (খালি: সম্পূর্ণ নাম)"
+"Max H" = "সর্বোচ্চ উচ্চতা"
+"Max W" = "সর্বোচ্চ প্রস্থ"
+"Max lines" = "সর্বোচ্চ লাইন"
+"Maximize" = "বড় করুন"
+"May" = "মে"
+"Measure to the selection" = "নির্বাচন পর্যন্ত পরিমাপ করুন"
+"Measurements" = "মাপ"
+"Merge into main" = "প্রধান ফাইলের সাথে মার্জ করুন"
+"Merge regions" = "অঞ্চলগুলো মার্জ করুন"
+"Merge the branch into the main file (one undo step) and archive it" = "ব্রাঞ্চটিকে প্রধান ফাইলের সাথে মার্জ করুন (একটি আনডু ধাপ) এবং আর্কাইভ করুন"
+"Merged" = "মার্জ করা হয়েছে"
+"Merged PRs" = "মার্জ করা PR"
+"Min H" = "সর্বনিম্ন উচ্চতা"
+"Min W" = "সর্বনিম্ন প্রস্থ"
+"Minimize" = "ছোট করুন"
+"Minutes" = "মিনিট"
+"Mirror angle" = "মিরর কোণ"
+"Mirror angle and length" = "মিরর কোণ ও দৈর্ঘ্য"
+"Mirroring" = "মিররিং"
+"Missing" = "অনুপস্থিত"
+"Missing fonts" = "অনুপস্থিত ফন্ট"
+"Missing layer" = "অনুপস্থিত লেয়ার"
+"Missing style" = "অনুপস্থিত স্টাইল"
+"Missing variable" = "অনুপস্থিত ভেরিয়েবল"
+"Miter" = "মাইটার"
+"Miter angle" = "মাইটার কোণ"
+"Mixed" = "মিশ্রিত"
+"Mixed fonts" = "মিশ্র ফন্ট"
+"Mixed interactions: click + to replace them" = "মিশ্র ইন্টারঅ্যাকশন: প্রতিস্থাপন করতে + এ ক্লিক করুন"
+"Mobile app" = "মোবাইল অ্যাপ"
+"Mode" = "মোড"
+"Model" = "মডেল"
+"Models" = "মডেলসমূহ"
+"Mono" = "মোনো"
+"More" = "আরও"
+"More instance actions" = "আরও ইনস্ট্যান্স অ্যাকশন"
+"Mouse down" = "মাউস ডাউন"
+"Mouse enter" = "মাউস এন্টার"
+"Mouse leave" = "মাউস লিভ"
+"Mouse up" = "মাউস আপ"
+"Move along the toolbar or the layer rows" = "টুলবার বা লেয়ার সারির বরাবর সরান"
+"Move" = "সরান"
+"Move column left" = "কলাম বামে সরান"
+"Move column right" = "কলাম ডানে সরান"
+"Move down" = "নিচে সরান"
+"Move in" = "ভিতরে সরান"
+"Move out" = "বাইরে সরান"
+"Move tools" = "সরানোর টুলস"
+"Move up" = "উপরে সরান"
+"Moved to {name}" = "{name}-এ সরানো হয়েছে"
+"Multi" = "মাল্টি"
+"Multiply" = "মাল্টিপ্লাই"
+"Muted" = "মিউটেড"
+"Name" = "নাম"
+"Name (A–Z)" = "নাম (A–Z)"
+"Named instance" = "নামকৃত ইনস্ট্যান্স"
+"Navigate to" = "এতে যান"
+"Nested instance" = "নেস্টেড ইনস্ট্যান্স"
+"New board" = "নতুন বোর্ড"
+"New design file" = "নতুন ডিজাইন ফাইল"
+"Newest first" = "সবচেয়ে নতুন প্রথমে"
+"Next or previous control in the focused region" = "ফোকাসড অঞ্চলের পরবর্তী বা পূর্ববর্তী কন্ট্রোল"
+"Next frame" = "পরবর্তী ফ্রেম"
+"Next ready for dev" = "ডেভের জন্য পরবর্তী প্রস্তুত"
+"Next size option" = "পরবর্তী আকারের বিকল্প"
+"No assets: no export settings, icons or images. Add export settings in the Design tab." = "কোনো অ্যাসেট নেই: কোনো এক্সপোর্ট সেটিংস, আইকন বা ছবি নেই। ডিজাইন ট্যাবে এক্সপোর্ট সেটিংস যোগ করুন।"
+"No boolean variables fit here." = "এখানে কোনো বুলিয়ান ভেরিয়েবল মানানসই নয়।"
+"No boolean variables yet. Create them in Local variables." = "এখনো কোনো বুলিয়ান ভেরিয়েবল নেই। স্থানীয় ভেরিয়েবলে (Local variables) এগুলো তৈরি করুন।"
+"No branches. A branch is a copy of the file to try changes in, then review and merge." = "কোনো ব্রাঞ্চ নেই। ব্রাঞ্চ হলো পরিবর্তনগুলো পরীক্ষা করার জন্য ফাইলের একটি কপি, এরপর পর্যালোচনা করে মার্জ করা হয়।"
+"No category" = "কোনো বিভাগ নেই"
+"No changes" = "কোনো পরিবর্তন নেই"
+"No color styles" = "কোনো কালার স্টাইল নেই"
+"No colour variables fit here." = "এখানে কোনো রঙের ভেরিয়েবল মানানসই নয়।"
+"No colour variables yet. Create them in Local variables." = "এখনো কোনো রঙের ভেরিয়েবল নেই। স্থানীয় ভেরিয়েবলে এগুলো তৈরি করুন।"
+"No comments yet" = "এখনো কোনো মন্তব্য নেই"
+"No compatibility warnings reported" = "কোনো সঙ্গতির সতর্কতা রিপোর্ট করা হয়নি"
+"No components yet. Select layers and press {keys}." = "এখনো কোনো কম্পোনেন্ট নেই। লেয়ার নির্বাচন করুন এবং {keys} টিপুন।"
+"No conflicts." = "কোনো দ্বন্দ্ব নেই।"
+"No contributor data was built into this copy." = "এই কপিতে কোনো অবদানকারীর ডেটা যুক্ত করা হয়নি।"
+"No device" = "কোনো ডিভাইস নেই"
+"No fonts match" = "কোনো ফন্ট মেলে না"
+"No files or templates match your search" = "আপনার অনুসন্ধানের সাথে কোনো ফাইল বা টেমপ্লেট মেলে না"
+"No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "এখানে কোনো যুক্ত হওয়ার কোড নেই (সার্ভারটি যুক্ত হওয়ার কোডের চেয়ে পুরনো, অথবা এই ঠিকানাকে কোডে রূপান্তর করা যায় না): পরিবর্তে লিংক শেয়ার করুন।"
+"No layer changes to show." = "দেখানোর মতো কোনো লেয়ার পরিবর্তন নেই।"
+"No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "এখনো কোনো লাইব্রেরি নেই। লাইব্রেরি হিসেবে প্রকাশিত একটি .figcraft ফাইল যোগ করুন, অথবা টিম লাইব্রেরির লিংক পেস্ট করুন।"
+"No list" = "কোনো তালিকা নেই"
+"No matching comments" = "কোনো মিলছে এমন মন্তব্য নেই"
+"No matching components" = "কোনো মিলছে এমন কম্পোনেন্ট নেই"
+"No matching layers" = "কোনো মিলছে এমন লেয়ার নেই"
+"No matching styles" = "কোনো মিলছে এমন স্টাইল নেই"
+"No matching variables" = "কোনো মিলছে এমন ভেরিয়েবল নেই"
+"No mirroring" = "কোনো মিররিং নেই"
+"No model credits were built into this copy." = "এই কপিতে কোনো মডেল ক্রেডিট যুক্ত করা হয়নি।"
+"No number variables fit here." = "এখানে কোনো নম্বরের ভেরিয়েবল মানানসই নয়।"
+"No number variables yet. Create them in Local variables." = "এখনো কোনো নম্বরের ভেরিয়েবল নেই। স্থানীয় ভেরিয়েবলে এগুলো তৈরি করুন।"
+"No other pages" = "অন্য কোনো পেজ নেই"
+"No paints" = "কোনো পেইন্ট নেই"
+"No plugins on {server}." = "{server}-এ কোনো প্লাগইন নেই।"
+"No plugins yet. Import a development plugin from its figcraft-plugin.json." = "এখনো কোনো প্লাগইন নেই। এর figcraft-plugin.json থেকে একটি ডেভেলপমেন্ট প্লাগইন ইম্পোর্ট করুন।"
+"No preferred components" = "কোনো পছন্দের কম্পোনেন্ট নেই"
+"No preset" = "কোনো প্রিসেট নেই"
+"No saved versions yet. Save a version to mark a point in your work you can come back to." = "এখনো কোনো সংরক্ষিত সংস্করণ নেই। আপনার কাজের এমন একটি পয়েন্ট চিহ্নিত করতে একটি সংস্করণ সংরক্ষণ করুন যেখানে আপনি পরে ফিরে আসতে পারেন।"
+"No scrolling" = "কোনো স্ক্রোলিং নেই"
+"No shortcuts match" = "কোনো শর্টকাট মেলে না"
+"No status" = "কোনো স্ট্যাটাস নেই"
+"No string variables fit here." = "এখানে কোনো স্ট্রিং ভেরিয়েবল মানানসই নয়।"
+"No string variables yet. Create them in Local variables." = "এখনো কোনো স্ট্রিং ভেরিয়েবল নেই। স্থানীয় ভেরিয়েবলে এগুলো তৈরি করুন।"
+"No styles yet." = "এখনো কোনো স্টাইল নেই।"
+"No styles yet. Click + to create one from the selection." = "এখনো কোনো স্টাইল নেই। নির্বাচন থেকে একটি তৈরি করতে + এ ক্লিক করুন।"
+"No templates match your search" = "আপনার অনুসন্ধানের সাথে কোনো টেমপ্লেট মেলে না"
+"No text styles yet. Click + to create one from the selected text." = "এখনো কোনো টেক্সট স্টাইল নেই। নির্বাচিত টেক্সট থেকে একটি তৈরি করতে + এ ক্লিক করুন।"
+"No variables fit here." = "এখানে কোনো ভেরিয়েবল মানানসই নয়।"
+"No variables yet. Create them in Local variables." = "এখনো কোনো ভেরিয়েবল নেই। স্থানীয় ভেরিয়েবলে এগুলো তৈরি করুন।"
+"No votes yet" = "এখনও কোনো ভোট নেই"
+"Nobody else is here yet" = "এখানে আর কেউ নেই"
+"Noise" = "নয়েজ"
+"None" = "কিছুই না"
+"None." = "কিছুই না।"
+"Normal" = "স্বাভাবিক"
+"Not bound" = "আবদ্ধ নয়"
+"Not in a live session" = "লাইভ সেশনে নেই"
+"Not in this font" = "এই ফন্টে নেই"
+"Not properties, kept as written: {names}" = "প্রপার্টি নয়, যেমনটি লেখা হয়েছে তেমনি রাখা হয়েছে: {names}"
+"Not read yet" = "এখনো পড়া হয়নি"
+"Not shared" = "শেয়ার করা হয়নি"
+"Note {n}" = "নোট {n}"
+"Nothing changed since this was marked ready for dev." = "এটি ডেভের জন্য প্রস্তুত হিসেবে চিহ্নিত করার পর থেকে কিছু পরিবর্তিত হয়নি।"
+"Nothing here yet. Set a frame's status to list it." = "এখানে এখনো কিছু নেই। তালিকাভুক্ত করতে একটি ফ্রেমের স্ট্যাটাস সেট করুন।"
+"Nothing online yet. Use Share on a file to put it online and it is listed here." = "অনলাইনে এখনো কিছু নেই। কোনো ফাইল অনলাইনে দিতে শেয়ার ব্যবহার করুন এবং এটি এখানে তালিকাভুক্ত হবে।"
+"Nothing to export" = "এক্সপোর্ট করার মতো কিছু নেই"
+"Nov" = "নভেম্বর"
+"Now" = "এখন"
+"Nudge (Shift: big nudge)" = "নাজ (Shift: বড় নাজ)"
+"Nudge amount" = "নাজ পরিমাণ"
+"Number" = "নম্বর"
+"Number ↑" = "নম্বর ↑"
+"Number ↓" = "নম্বর ↓"
+"Numbered list" = "সাংখ্যিক তালিকা"
+"Object" = "অবজেক্ট"
+"Oct" = "অক্টোবর"
+"Off" = "বন্ধ"
+"Offered first when filling the slot (any content is allowed)" = "স্লট পূর্ণ করার সময় প্রথমে অফার করা হয় (যেকোনো কন্টেন্ট অনুমোদিত)"
+"Offered first when swapping the instance (any component is allowed)" = "ইনস্ট্যান্স সোয়াপ করার সময় প্রথমে অফার করা হয় (যেকোনো কম্পোনেন্ট অনুমোদিত)"
+"Offset" = "অফসেট"
+"Oldest first" = "সবচেয়ে পুরনো প্রথমে"
+"On click" = "ক্লিকে"
+"On drag" = "ড্র্যাগে"
+"On this page" = "এই পেজে"
+"One announcement in five common sizes: square, portrait, story, link and banner" = "পাঁচটি সাধারণ আকারে একটি ঘোষণা: স্কয়ার, পোর্ট্রেট, স্টোরি, লিংক এবং ব্যানার"
+"Online" = "অনলাইন"
+"Online files" = "অনলাইন ফাইলসমূহ"
+"Online sharing is off: files are shared on the local network only." = "অনলাইন শেয়ারিং বন্ধ আছে: ফাইলগুলো শুধুমাত্র স্থানীয় নেটওয়ার্কে শেয়ার করা হচ্ছে।"
+"Only the first changed layers are listed." = "শুধুমাত্র প্রথম পরিবর্তিত লেয়ারগুলো তালিকাভুক্ত করা হয়েছে।"
+"Only the first {n} changed layers are listed." = "শুধুমাত্র প্রথম {n}টি পরিবর্তিত লেয়ার তালিকাভুক্ত করা হয়েছে।"
+"Only your threads" = "শুধুমাত্র আপনার থ্রেড"
+"Opacity" = "অস্বচ্ছতা (Opacity)"
+"Opacity & blend" = "অস্বচ্ছতা ও ব্লেন্ড"
+"Opacity 10%…90%, 0: 100%" = "অস্বচ্ছতা ১০%…৯০%, ০: ১০০%"
+"Open" = "খুলুন"
+"Open .figcraft, .svg or images" = ".figcraft, .svg বা ছবি খুলুন"
+"Open branch" = "ব্রাঞ্চ খুলুন"
+"Open file" = "ফাইল খুলুন"
+"Open files" = "ফাইলসমূহ খুলুন"
+"Open in focus view" = "ফোকাস ভিউতে খুলুন"
+"Open in new window" = "নতুন উইন্ডোতে খুলুন"
+"Open invite links in FigCraft" = "FigCraft-এ আমন্ত্রণ লিংক খুলুন"
+"Open link" = "লিংক খুলুন"
+"Open link {url}" = "লিংক খুলুন {url}"
+"Open overlay" = "ওভারলে খুলুন"
+"Open prototype preview" = "প্রোটোটাইপ প্রিভিউ খুলুন"
+"Open variables ({count})" = "ভেরিয়েবল খুলুন ({count})"
+"Opened as a new document" = "নতুন ডকুমেন্ট হিসেবে খোলা হয়েছে"
+"Opened “{name}” in a new tab" = "নতুন ট্যাবে “{name}” খোলা হয়েছে"
+"Opening the file…" = "ফাইল খোলা হচ্ছে..."
+"Opening {n} files as new files" = { one = "নতুন ফাইল হিসেবে খোলা হচ্ছে", other = "{n}টি ফাইল নতুন ফাইল হিসেবে খোলা হচ্ছে" }
+"Open|comments" = "খুলুন"
+"Options" = "বিকল্পসমূহ"
+"Orange" = "কমলা"
+"Order" = "ক্রম"
+"Other apps may not open every .fig file exported here." = "অন্যান্য অ্যাপ এখানে এক্সপোর্ট করা প্রতিটি .fig ফাইল নাও খুলতে পারে।"
+"Other" = "অন্যান্য"
+"Others lose access and keep their copy; the file stays on the server for you" = "অন্যরা অ্যাক্সেস হারায় এবং তাদের কপি নিজের কাছে রাখে; ফাইলটি আপনার জন্য সার্ভারেই থেকে যায়"
+"Others type this under Share ▸ Join with a code" = "অন্যরা 'Share ▸ Join with a code' এর নিচে এটি টাইপ করে"
+"Outline stroke" = "আউটলাইন স্ট্রোক"
+"Outline text" = "আউটলাইন টেক্সট"
+"Outlines" = "আউটলাইনসমূহ"
+"Outside" = "বাইরে"
+"Overflow" = "ওভারফ্লো"
+"Overlay" = "ওভারলে"
+"Overlay position" = "ওভারলে অবস্থান"
+"Overridden here (the collection it extends has another value)" = "এখানে ওভাররাইড করা হয়েছে (যে সংগ্রহটি এটি প্রসারিত করে তার অন্য একটি মান রয়েছে)"
+"Overrides" = "ওভাররাইডসমূহ"
+"Owner token" = "ওনার টোকেন"
+"Owner token copied" = "ওনার টোকেন কপি করা হয়েছে"
+"PDF print options" = "PDF প্রিন্ট বিকল্প"
+"PDF print settings" = "PDF প্রিন্ট সেটিংস"
+"Padding" = "প্যাডিং"
+"Page" = "পেজ"
+"Pages" = "পেজসমূহ"
+"Pages added to the document" = "ডকুমেন্টে পেজ যোগ করা হয়েছে"
+"Pause" = "বিরতি"
+"Pink" = "গোলাপি"
+"Placed on the current page" = "বর্তমান পেজে রাখা হয়েছে"
+"Pages: {pages}" = "পেজসমূহ: {pages}"
+"Paint bucket" = "পেইন্ট বালতি"
+"Pan the canvas" = "ক্যানভাস প্যান করুন"
+"Pan with nothing selected (Shift: farther)" = "কিছু নির্বাচিত না করে প্যান করুন (Shift: দূরে)"
+"Panels" = "প্যানেলসমূহ"
+"Paper" = "কাগজ"
+"Paragraph indent" = "প্যারাগ্রাফ ইনডেন্ট"
+"Paragraph indent applies to left-aligned text" = "প্যারাগ্রাফ ইনডেন্ট বাম-সারিবদ্ধ টেক্সটের ক্ষেত্রে প্রযোজ্য"
+"Paragraph spacing" = "প্যারাগ্রাফ ব্যবধান"
+"Pass through" = "পাস থ্রু"
+"Paste a link (https://…)" = "একটি লিংক পেস্ট করুন (https://…)"
+"Paste a team library link (a view link)" = "একটি টিম লাইব্রেরি লিংক পেস্ট করুন (ভিউ লিংক)"
+"Paste here" = "এখানে পেস্ট করুন"
+"Paste to replace" = "প্রতিস্থাপন করতে পেস্ট করুন"
+"Pasted design layers; {n} kinds of content were left out" = { one = "ডিজাইন লেয়ার পেস্ট করা হয়েছে; {n} ধরনের কন্টেন্ট বাদ দেওয়া হয়েছে", other = "ডিজাইন লেয়ার পেস্ট করা হয়েছে; {n} ধরনের কন্টেন্ট বাদ দেওয়া হয়েছে" }
+"Pattern" = "প্যাটার্ন"
+"Pattern alignment" = "প্যাটার্ন সারিবদ্ধকরণ"
+"Pattern scale" = "প্যাটার্ন স্কেল"
+"Pattern source" = "প্যাটার্ন উৎস"
+"Pen" = "কলম"
+"Pencil" = "পেন্সিল"
+"People in this file" = "এই ফাইলের লোকজন"
+"People join from anywhere with a code. The file is kept on {server} while you share it." = "কোডের মাধ্যমে যেকোনো স্থান থেকে লোকজন যুক্ত হতে পারে। ফাইলটি শেয়ার করার সময় {server}-এ রাখা হয়।"
+"People on your network join with a code. Nothing goes through a server." = "আপনার নেটওয়ার্কের লোকজন কোডের মাধ্যমে যুক্ত হয়। কোনো সার্ভারের মাধ্যমে কিছু যায় না।"
+"Phone" = "ফোন"
+"Pick color" = "রঙ বাছুন"
+"Pick color (I)" = "রঙ বাছুন (I)"
+"Pick one font family first" = "প্রথমে একটি ফন্ট ফ্যামিলি বাছুন"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "ফ্রেম টুল বেছে নিন, এরপর ক্যানভাসে ড্র্যাগ করুন অথবা একটি ডিভাইসের আকার বেছে নিন"
+"Pin a property" = "একটি প্রপার্টি পিন করুন"
+"Pinch" = "পিন্চ"
+"Pixel grid" = "পিক্সেল গ্রিড"
+"Pixel preview 1x" = "পিক্সেল প্রিভিউ 1x"
+"Pixel preview 2x" = "পিক্সেল প্রিভিউ 2x"
+"Place a shape or frame (its tool chosen)" = "একটি শেপ বা ফ্রেম রাখুন (এর টুল নির্বাচিত)"
+"Place automatically" = "স্বয়ংক্রিয়ভাবে রাখুন"
+"Place image" = "ছবি রাখুন"
+"Plugin" = "প্লাগইন"
+"Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "প্লাগইনগুলো ফাইল, নেটওয়ার্ক বা ঘড়ি ছাড়া FigCraft-এর স্যান্ডবক্সে চলে। শুধুমাত্র বিশ্বস্ত প্লাগইন ইনস্টল করুন।"
+"Plugins" = "প্লাগইনসমূহ"
+"Plugins & widgets" = "প্লাগইন ও উইজেট"
+"Plus darker" = "প্লাস অন্ধকার"
+"Plus lighter" = "প্লাস হালকা"
+"Plus one" = "প্লাস ওয়ান"
+"Point" = "বিন্দু"
+"Points" = "বিন্দুসমূহ"
+"Polygon" = "বহুভুজ"
+"Polygons" = "বহুভুজসমূহ"
+"Port" = "পোর্ট"
+"Position" = "অবস্থান"
+"Post" = "পোস্ট"
+"Preferences" = "প্রেফারেন্সেস"
+"Preferred" = "পছন্দসই"
+"Present" = "উপস্থাপন করুন"
+"Present or preview" = "উপস্থাপন বা প্রিভিউ করুন"
+"Present this flow" = "এই ফ্লো উপস্থাপন করুন"
+"Presentation" = "উপস্থাপন"
+"Presentation slides" = "উপস্থাপন স্লাইড"
+"Presenting: comments" = "উপস্থাপন করা হচ্ছে: মন্তব্য"
+"Presenting: cycle the size options" = "উপস্থাপন করা হচ্ছে: আকারের বিকল্পগুলো সাইকেল করুন"
+"Presenting: full screen" = "উপস্থাপন করা হচ্ছে: ফুল স্ক্রিন"
+"Presenting: next frame" = "উপস্থাপন করা হচ্ছে: পরবর্তী ফ্রেম"
+"Presenting: previous frame" = "উপস্থাপন করা হচ্ছে: পূর্ববর্তী ফ্রেম"
+"Presenting: restart" = "উপস্থাপন করা হচ্ছে: পুনরায় শুরু"
+"Preserve scroll position" = "স্ক্রোল অবস্থান সংরক্ষণ করুন"
+"Presets" = "প্রিসেটসমূহ"
+"Press a key…" = "একটি কি টিপুন..."
+"Playground" = "প্লেগ্রাউন্ড"
+"Preview" = "প্রিভিউ"
+"Preview this flow" = "এই ফ্লো প্রিভিউ করুন"
+"Preview this frame" = "এই ফ্রেম প্রিভিউ করুন"
+"Previous frame" = "পূর্ববর্তী ফ্রেম"
+"Previous ready for dev" = "ডেভের জন্য পূর্ববর্তী প্রস্তুত"
+"Progressive" = "প্রোগ্রেসিভ"
+"Properties" = "প্রপার্টিজ"
+"Prototype" = "প্রোটোটাইপ"
+"Prototype preview" = "প্রোটোটাইপ প্রিভিউ"
+"Prototype settings" = "প্রোটোটাইপ সেটিংস"
+"Publish" = "প্রকাশ করুন"
+"Publish changes" = "পরিবর্তন প্রকাশ করুন"
+"Publish to another server…" = "অন্য সার্ভারে প্রকাশ করুন..."
+"Publish to server" = "সার্ভারে প্রকাশ করুন"
+"Published version {v}" = "প্রকাশিত সংস্করণ {v}"
+"Published version {v} to the server" = "সংস্করণ {v} সার্ভারে প্রকাশ করা হয়েছে"
+"Published version {v}: save the file so other files can use it" = "প্রকাশিত সংস্করণ {v}: ফাইলটি সেভ করুন যাতে অন্যান্য ফাইল এটি ব্যবহার করতে পারে"
+"Published · {people}" = "প্রকাশিত · {people}"
+"Publishing to a server needs the desktop app; in the browser you can join a server's files" = "সার্ভারে প্রকাশ করতে ডেস্কটপ অ্যাপ প্রয়োজন; ব্রাউজারে আপনি সার্ভারের ফাইলে যুক্ত হতে পারবেন"
+"Publishing with the server's key." = "সার্ভারের কী দিয়ে প্রকাশ করা হচ্ছে।"
+"Publishing…" = "প্রকাশ করা হচ্ছে..."
+"Push" = "পুশ"
+"Push changes to main component" = "প্রধান কম্পোনেন্টে পরিবর্তন পুশ করুন"
+"Put text on path" = "পাথে টেক্সট রাখুন"
+"Question" = "প্রশ্ন"
+"R" = "R"
+"Radial" = "রেডিয়াল"
+"Radius" = "ব্যাসার্ধ"
+"Ratio" = "অনুপাত"
+"Reading the library…" = "লাইব্রেরি পড়া হচ্ছে..."
+"Ready for dev" = "ডেভের জন্য প্রস্তুত"
+"Real name" = "আসল নাম"
+"Recent" = "সাম্প্রতিক"
+"Recent files" = "সাম্প্রতিক ফাইল"
+"Recents" = "সাম্প্রতিকসমূহ"
+"Recovered {n} unsaved files after the app quit unexpectedly: save them to keep them" = { one = "অ্যাপটি অপ্রত্যাশিতভাবে বন্ধ হয়ে যাওয়ার পর একটি অসংরক্ষিত ফাইল পুনরুদ্ধার করা হয়েছে: এটি রাখতে সেভ করুন", other = "অ্যাপটি অপ্রত্যাশিতভাবে বন্ধ হয়ে যাওয়ার পর {n}টি অসংরক্ষিত ফাইল পুনরুদ্ধার করা হয়েছে: এগুলো রাখতে সেভ করুন" }
+"Rectangle" = "আয়তক্ষেত্র"
+"Rectangles" = "আয়তক্ষেত্রসমূহ"
+"Red" = "লাল"
+"Reduce motion" = "মোশন কমান"
+"Refraction" = "প্রতিসরণ"
+"Regular expression" = "রেগুলার এক্সপ্রেশন"
+"Relative to" = "এর সাপেক্ষে"
+"Remove" = "সরান"
+"Remove all" = "সব সরান"
+"Remove annotation" = "অ্যানোটেশন সরান"
+"Remove auto layout" = "অটো লেআউট সরান"
+"Remove column" = "কলাম সরান"
+"Remove dev resource" = "ডেভ রিসোর্স সরান"
+"Remove export setting" = "এক্সপোর্ট সেটিংস সরান"
+"Remove from recents" = "সাম্প্রতিক থেকে সরান"
+"Remove from server" = "সার্ভার থেকে সরান"
+"Remove from server…" = "সার্ভার থেকে সরান..."
+"Remove guide" = "গাইড সরান"
+"Remove interaction" = "ইন্টারঅ্যাকশন সরান"
+"Remove library from this file" = "এই ফাইল থেকে লাইব্রেরি সরান"
+"Remove measurement" = "মাপ সরান"
+"Remove min and max" = "সর্বনিম্ন এবং সর্বোচ্চ সরান"
+"Remove min and max height" = "সর্বনিম্ন এবং সর্বোচ্চ উচ্চতা সরান"
+"Remove min and max width" = "সর্বনিম্ন এবং সর্বোচ্চ প্রস্থ সরান"
+"Remove regions" = "অঞ্চলগুলো সরান"
+"Remove row" = "সারি সরান"
+"Remove slot" = "স্লট সরান"
+"Remove starting point" = "শুরু করার বিন্দু সরান"
+"Remove stop" = "স্টপ সরান"
+"Remove text from path" = "পাথ থেকে টেক্সট সরান"
+"Remove the else and its actions" = "else এবং এর অ্যাকশনগুলো সরান"
+"Remove this condition and its actions" = "এই শর্ত এবং এর অ্যাকশনগুলো সরান"
+"Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "সার্ভার থেকে এই ফাইলটি সরাবেন? এটি সেখান থেকে আর শেয়ার বা খোলা যাবে না। আপনার কপিটি এখানে খোলা থাকবে।"
+"Remove {name} from session" = "সেশন থেকে {name}-কে সরান"
+"Remove {name} from {server}?" = "{server} থেকে {name}-কে সরাবেন?"
+"Removed" = "সরে গেছে"
+"Removed from the server" = "সার্ভার থেকে সরানো হয়েছে"
+"Removed since it was marked" = "চিহ্নিত করার পর থেকে সরানো হয়েছে"
+"Rename" = "নাম পরিবর্তন করুন"
+"Rename duplicated layers" = "ডুপ্লিকেট করা লেয়ারের নাম পরিবর্তন করুন"
+"Rename folder" = "ফোল্ডারের নাম পরিবর্তন করুন"
+"Rename group" = "গ্রুপের নাম পরিবর্তন করুন"
+"Rename layers" = "লেয়ারের নাম পরিবর্তন করুন"
+"Rename mode" = "মোডের নাম পরিবর্তন করুন"
+"Rename on the server" = "সার্ভারে নাম পরিবর্তন করুন"
+"Rename on the server…" = "সার্ভারে নাম পরিবর্তন করুন..."
+"Rename page" = "পেজের নাম পরিবর্তন করুন"
+"Rename to" = "নাম পরিবর্তন করে রাখুন"
+"Replace all" = "সব প্রতিস্থাপন করুন"
+"Replace mixed export settings" = "মিশ্র এক্সপোর্ট সেটিংস প্রতিস্থাপন করুন"
+"Replace with" = "এটি দিয়ে প্রতিস্থাপন করুন"
+"Replace with a new interaction" = "একটি নতুন ইন্টারঅ্যাকশন দিয়ে প্রতিস্থাপন করুন"
+"Reply" = "উত্তর দিন"
+"Report" = "রিপোর্ট"
+"Report this file…" = "এই ফাইলটি রিপোর্ট করুন..."
+"Reset" = "রিসেট"
+"Reset adjustments" = "অ্যাডজাস্টমেন্ট রিসেট করুন"
+"Reset all changes" = "সব পরিবর্তন রিসেট করুন"
+"Reset all overrides on this layer" = "এই লেয়ারের সব ওভাররাইড রিসেট করুন"
+"Reset overrides" = "ওভাররাইড রিসেট করুন"
+"Reset slot" = "স্লট রিসেট করুন"
+"Reset this override" = "এই ওভাররাইড রিসেট করুন"
+"Reset to style" = "স্টাইলে রিসেট করুন"
+"Reset to the inherited value" = "উত্তরাধিকারসূত্রে প্রাপ্ত মানে রিসেট করুন"
+"Resize by the nudge amount" = "নাজ পরিমাণ অনুযায়ী আকার পরিবর্তন করুন"
+"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "ডিভাইসের স্ক্রিনে (বা ডিভাইস ছাড়া উইন্ডোতে) ফ্রেমের আকার পরিবর্তন করুন: তাদের সীমাবদ্ধতা এবং অটো লেআউট সাড়া দেয়"
+"Resize to fit" = "ফিট করতে আকার পরিবর্তন করুন"
+"Resizing" = "আকার পরিবর্তন করা হচ্ছে"
+"Resolve" = "সমাধান করুন"
+"Resolve change" = "পরিবর্তন সমাধান করুন"
+"Resolved" = "সমাধান করা হয়েছে"
+"Resources" = "রিসোর্সসমূহ"
+"Responsive" = "রেসপনসিভ"
+"Restart" = "পুনরায় শুরু করুন"
+"Restore" = "পুনরুদ্ধার করুন"
+"Restore main component" = "প্রধান কম্পোনেন্ট পুনরুদ্ধার করুন"
+"Restore this version" = "এই সংস্করণ পুনরুদ্ধার করুন"
+"Restored “{name}”" = "“{name}” পুনরুদ্ধার করা হয়েছে"
+"Retrospective" = "রেট্রোস্পেক্টিভ"
+"Results" = "ফলাফল"
+"Resume" = "আবার চালু করুন"
+"Reverse the order" = "ক্রম উল্টে দিন"
+"Reversed triangle" = "উল্টানো ত্রিভুজ"
+"Review and merge" = "পর্যালোচনা ও মার্জ করুন"
+"Ribbon" = "রিবন"
+"Right" = "ডানে"
+"Right side" = "ডান পাশ"
+"Right side width" = "ডান পাশের প্রস্থ"
+"Rotate 90°" = "৯০° ঘোরান"
+"Rotate 90° right" = "ডানে ৯০° ঘোরান"
+"Rotate to landscape" = "ল্যান্ডস্কেপে ঘোরান"
+"Rotate to portrait" = "পোর্ট্রেটে ঘোরান"
+"Rotation" = "ঘূর্ণন"
+"Rotation jitter" = "ঘূর্ণন জিটার"
+"Round" = "গোল"
+"Rounded" = "গোল করা"
+"Rounded rectangle" = "গোলাকার আয়তক্ষেত্র"
+"Row" = "সারি"
+"Row gap" = "সারির গ্যাপ"
+"Row sizes" = "সারির আকার"
+"Row span" = "সারি স্প্যান"
+"Rows" = "সারিগুলো"
+"Rows {count}" = "সারি {count}"
+"Rulers" = "রুলার"
+"Run" = "চালান"
+"Run {label}" = "চালান {label}"
+"Save file" = "ফাইল সেভ করুন"
+"Save files automatically" = "স্বয়ংক্রিয়ভাবে ফাইল সেভ করুন"
+"Search templates" = "টেমপ্লেট খুঁজুন"
+"See all templates" = "সব টেমপ্লেট দেখুন"
+"Select layers and they space themselves as their content changes" = "লেয়ার নির্বাচন করুন এবং তাদের কন্টেন্ট পরিবর্তিত হওয়ার সাথে সাথে তারা নিজেদের মধ্যে দূরত্ব বজায় রাখবে"
+"SHA-256: {sha}…" = "SHA-256: {sha}…"
+"Same as layer" = "লেয়ারের মতোই"
+"Saturation" = "স্যাচুরেশন"
+"Save" = "সেভ করুন"
+"Save as" = "এভাবে সেভ করুন"
+"Save as preset…" = "প্রিসেট হিসেবে সেভ করুন..."
+"Save version  {key}" = "সংস্করণ সেভ করুন {key}"
+"Saved" = "সেভ করা হয়েছে"
+"Saved {name}" = "সেভ করা হয়েছে {name}"
+"Say something" = "কিছু বলুন"
+"Scale" = "স্কেল"
+"Scatter" = "স্ক্যাটার"
+"Scoping: where pickers offer it" = "স্কোপিং: যেখানে পিকার এটি অফার করে"
+"Screen" = "স্ক্রিন"
+"Scroll behavior" = "স্ক্রোল আচরণ"
+"Scroll to" = "স্ক্রোল করে যান"
+"Scroll to layer" = "লেয়ারে স্ক্রোল করুন"
+"Scroll with parent" = "প্যারেন্টের সাথে স্ক্রোল করুন"
+"Search plugins" = "প্লাগইন খুঁজুন"
+"Search" = "অনুসন্ধান"
+"Search actions, layers and tools" = "অ্যাকশন, লেয়ার এবং টুল খুঁজুন"
+"Search assets" = "অ্যাসেট খুঁজুন"
+"Search comments" = "মন্তব্য খুঁজুন"
+"Search files and templates" = "ফাইল এবং টেমপ্লেট খুঁজুন"
+"Search results" = "অনুসন্ধানের ফলাফল"
+"Search fonts" = "ফন্ট খুঁজুন"
+"Search layers" = "লেয়ার খুঁজুন"
+"Search shortcuts" = "শর্টকাট খুঁজুন"
+"Section" = "সেকশন"
+"Section color" = "সেকশনের রঙ"
+"Sections" = "সেকশনসমূহ"
+"Select a frame and add a starting point to present it as a flow." = "একটি ফ্রেম নির্বাচন করুন এবং ফ্লো হিসেবে উপস্থাপন করতে একটি শুরুর বিন্দু যোগ করুন।"
+"Select a frame to preview it" = "প্রিভিউ করতে একটি ফ্রেম নির্বাচন করুন"
+"Select a layer to see its properties and code" = "এর প্রপার্টি এবং কোড দেখতে একটি লেয়ার নির্বাচন করুন"
+"Select all" = "সব নির্বাচন করুন"
+"Select all with same" = "একই রকম সব নির্বাচন করুন"
+"Select layer" = "লেয়ার নির্বাচন করুন"
+"Select layers to apply the style to" = "স্টাইল প্রয়োগ করার জন্য লেয়ার নির্বাচন করুন"
+"Select layers with this color" = "এই রঙের লেয়ারগুলো নির্বাচন করুন"
+"Select overlapping shapes" = "overlapping শেপগুলো নির্বাচন করুন"
+"Select points to edit their position, radius and mirroring" = "অবস্থান, ব্যাসার্ধ এবং মিররিং এডিট করতে পয়েন্ট নির্বাচন করুন"
+"Select slot" = "স্লট নির্বাচন করুন"
+"Selection colors" = "নির্বাচনের রঙ"
+"Selection" = "নির্বাচন"
+"Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "নির্বাচন বাক্স, {w} × {h}, অবস্থান {x}, {y}: অ্যারো কি দিয়ে সরানো যায়, Shift+arrows বা {cmd}+arrows দিয়ে আকার পরিবর্তন করা যায়, Enter দিয়ে নির্বাচন হয়, Escape দিয়ে বাতিল হয়"
+"Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "নির্বাচন বাক্স: অ্যারো কি দিয়ে সরানো যায়, Shift+arrows বা {cmd}+arrows দিয়ে আকার পরিবর্তন করা যায়, Enter দিয়ে নির্বাচন হয়, Escape দিয়ে বাতিল হয়"
+"Send backward" = "পেছনে পাঠান"
+"Send report" = "রিপোর্ট পাঠান"
+"Send to back" = "সবার পেছনে পাঠান"
+"Sep" = "সেপ্টেম্বর"
+"Server address (ws://host:47900/)" = "সার্ভার ঠিকানা (ws://host:47900/)"
+"Server address" = "সার্ভারের ঠিকানা"
+"Server for online sharing" = "অনলাইন শেয়ারিংয়ের সার্ভার"
+"Set as default" = "ডিফল্ট হিসেবে সেট করুন"
+"Set variable" = "ভেরিয়েবল সেট করুন"
+"Set variable mode" = "ভেরিয়েবল মোড সেট করুন"
+"Set variable {name}" = "ভেরিয়েবল সেট করুন {name}"
+"Set {name} to {value}" = "{name}-এর মান {value} সেট করুন"
+"Shadows" = "ছায়াসমূহ (Shadows)"
+"Shape" = "শেপ"
+"Shape builder" = "শেপ বিল্ডার"
+"Shape tools" = "শেপ টুলস"
+"Shapes" = "আকৃতি"
+"Share" = "শেয়ার"
+"Share this file" = "এই ফাইলটি শেয়ার করুন"
+"Share with a code" = "কোড দিয়ে শেয়ার করুন"
+"Share: live session, export" = "শেয়ার: লাইভ সেশন, এক্সপোর্ট"
+"Shared" = "শেয়ার করা হয়েছে"
+"Shared: copy its code from the file's menu" = "শেয়ার করা হয়েছে: ফাইলের মেনু থেকে এর কোড কপি করুন"
+"Sharing a file needs the desktop app; here you can join one." = "ফাইল শেয়ার করতে ডেস্কটপ অ্যাপ প্রয়োজন; এখানে আপনি একটিতে যুক্ত হতে পারবেন।"
+"Sharing on the local network (online sharing is off: no server is set in Preferences)." = "স্থানীয় নেটওয়ার্কে শেয়ার করা হচ্ছে (অনলাইন শেয়ারিং বন্ধ আছে: প্রেফারেন্সেসে কোনো সার্ভার সেট করা নেই)।"
+"Sharing on your network · {people}" = "আপনার নেটওয়ার্কে শেয়ার করা হচ্ছে · {people}"
+"Sharing online · {people}" = "অনলাইনে শেয়ার করা হচ্ছে · {people}"
+"Sharing stopped: the file stays on the server, open only to you" = "শেয়ারিং বন্ধ করা হয়েছে: ফাইলটি সার্ভারেই আছে, শুধুমাত্র আপনার জন্য খোলা"
+"Show" = "দেখান"
+"Show all templates" = "সব টেমপ্লেট দেখান"
+"Show as grid" = "গ্রিড হিসেবে দেখান"
+"Show as list" = "তালিকা হিসেবে দেখান"
+"Show autosaves" = "স্বয়ংক্রিয় সেভ দেখান"
+"Show behind transparent areas" = "স্বচ্ছ এলাকার পেছনে দেখান"
+"Show comments (Shift+C)" = "মন্তব্য দেখান (Shift+C)"
+"Show device frame" = "ডিভাইস ফ্রেম দেখান"
+"Show dimensions on objects" = "অবজেক্টে মাত্রা (dimensions) দেখান"
+"Show hotspot hints" = "হটস্পট ইঙ্গিত দেখান"
+"Show in Explorer" = "এক্সপ্লোরারে দেখান"
+"Show in Finder" = "ফাইন্ডারে দেখান"
+"Show in folder" = "ফোল্ডারে দেখান"
+"Show only this on the canvas" = "ক্যানভাসে শুধুমাত্র এটি দেখান"
+"Show open" = "খোলা দেখান"
+"Show section contents" = "সেকশনের কন্টেন্ট দেখান"
+"Show this layer" = "এই লেয়ারটি দেখান"
+"Show usage" = "ব্যবহার দেখান"
+"Show/Hide" = "দেখান/লুকান"
+"Show/Hide UI" = "UI দেখান/লুকান"
+"Side by side" = "পাশাপাশি"
+"Sidebar" = "সাইডবার"
+"Simplify stroke" = "স্ট্রোক সরল করুন"
+"Size" = "আকার"
+"Size jitter" = "আকার জিটার"
+"Skip ink" = "কালি বাদ দিন"
+"Slashed zero" = "স্ল্যাশড জিরো"
+"Slice" = "স্লাইস"
+"Slices" = "স্লাইসসমূহ"
+"Slide in" = "স্লাইড ইন"
+"Slide out" = "স্লাইড আউট"
+"Slot" = "স্লট"
+"Slot content" = "স্লট কন্টেন্ট"
+"Small capitals" = "ছোট বড় হাতের অক্ষর"
+"Small caps" = "স্মল ক্যাপস"
+"Smart animate" = "স্মার্ট অ্যানিমেট"
+"Snap to pixel grid" = "পিক্সেল গ্রিডে স্ন্যাপ করুন"
+"Social and slides" = "সোশ্যাল ও স্লাইড"
+"Social media" = "সোশ্যাল মিডিয়া"
+"Social post sizes" = "সোশ্যাল পোস্টের আকার"
+"Soft light" = "সফট লাইট"
+"Solid" = "সলিড"
+"Some variants have the same property values: give each one a unique combination" = "কিছু ভ্যারিয়েন্টের প্রপার্টি মান একই: প্রতিটিকে একটি অনন্য কম্বিনেশন দিন"
+"Sort" = "সাজান"
+"Sort by" = "যেভাবে সাজাবেন"
+"Sort by date" = "তারিখ অনুযায়ী সাজান"
+"Sort by page" = "পেজ অনুযায়ী সাজান"
+"Sort by {column}" = "{column} অনুযায়ী সাজান"
+"Space around" = "চারপাশে স্পেস"
+"Space between" = "মাঝখানে স্পেস"
+"Space drag" = "স্পেস ড্র্যাগ"
+"Space evenly" = "সমানভাবে স্পেস"
+"Space+drag" = "Space+ড্র্যাগ"
+"Spacing" = "ব্যবধান"
+"Spam, stolen work, abuse…" = "স্প্যাম, চুরি করা কাজ, অপব্যবহার..."
+"Speech bubble" = "কথার বুদবুদ"
+"Splay" = "সপ্লে"
+"Spotlight me" = "আমাকে স্পটলাইট করুন"
+"Spread" = "স্প্রেড"
+"Square" = "বর্গক্ষেত্র"
+"Stamp" = "স্ট্যাম্প"
+"Stamps" = "স্ট্যাম্পগুলি"
+"Standard" = "স্ট্যান্ডার্ড"
+"Standard ligatures" = "স্ট্যান্ডার্ড লিগেচার"
+"Star" = "তারকা"
+"Stars" = "তারকাসমূহ"
+"Start" = "শুরু"
+"Start ascending from / stop descending at" = "এখান থেকে ওঠা শুরু করুন / এখানে নামা বন্ধ করুন"
+"Start from a blank canvas" = "খালি ক্যানভাস থেকে শুরু করুন"
+"Start from a template" = "টেমপ্লেট থেকে শুরু করুন"
+"Start on path" = "পাথ থেকে শুরু করুন"
+"Start point" = "শুরুর বিন্দু"
+"Start sharing" = "শেয়ার করা শুরু করুন"
+"Start sharing with the Share button, then pass on the code it gives" = "শেয়ার বোতাম দিয়ে শেয়ার করা শুরু করুন, তারপর এটি যে কোড দেয় তা দিন"
+"Start vote" = "ভোট শুরু করুন"
+"Starting to share…" = "শেয়ার করা শুরু হচ্ছে..."
+"Status" = "স্ট্যাটাস"
+"Sticky" = "স্টিকি"
+"Sticky note" = "স্টিকি নোট"
+"Sticky note colors" = "স্টিকি নোটের রং"
+"Sticky notes" = "স্টিকি নোট"
+"Sticky notes, shapes and connectors" = "স্টিকি নোট, আকৃতি ও সংযোগকারী"
+"Stop" = "থামুন"
+"Stop following {name}" = "{name}-কে অনুসরণ করা বন্ধ করুন"
+"Stop session" = "সেশন বন্ধ করুন"
+"Stop sharing" = "শেয়ার করা বন্ধ করুন"
+"Stop spotlighting" = "স্পটলাইটিং বন্ধ করুন"
+"Stop timer" = "টাইমার থামান"
+"Stop {n}  {hex}" = "স্টপ {n}  {hex}"
+"Straight" = "সোজা"
+"Stretch" = "টেনে বড় করা (Stretch)"
+"Strikethrough" = "স্ট্রাইকথ্রু"
+"String" = "স্ট্রিং"
+"Stroke" = "স্ট্রোক"
+"Stroke style" = "স্ট্রোক স্টাইল"
+"Stroke weight" = "স্ট্রোকের ওজন"
+"Strokes" = "স্ট্রোকসমূহ"
+"Style" = "স্টাইল"
+"Styles" = "স্টাইলসমূহ"
+"Stylistic set 1" = "স্টাইলিস্টিক সেট ১"
+"Stylistic set 2" = "স্টাইলিস্টিক সেট ২"
+"Stylistic set 3" = "স্টাইলিস্টিক সেট ৩"
+"Stylistic set 4" = "স্টাইলিস্টিক সেট ৪"
+"Stylistic set 5" = "স্টাইলিস্টিক সেট ৫"
+"Subtract" = "বিয়োগ করুন"
+"Subtracts" = "বিয়োগ করে"
+"Suffix" = "সাফিক্স"
+"Suspend snapping while dragging" = "ড্র্যাগ করার সময় স্ন্যাপিং স্থগিত রাখুন"
+"Swap instance" = "ইনস্ট্যান্স সোয়াপ করুন"
+"Swap library: use another library's assets of the same names" = "লাইব্রেরি সোয়াপ করুন: একই নামের অন্য লাইব্রেরির অ্যাসেট ব্যবহার করুন"
+"Swap orientation" = "ভিত্তিক বিন্যাস (orientation) সোয়াপ করুন"
+"Swap overlay" = "ওভারলে সোয়াপ করুন"
+"Swap to {name}" = "{name}-এ সোয়াপ করুন"
+"Swap width and height" = "প্রস্থ ও উচ্চতা সোয়াপ করুন"
+"Swapped instance" = "সোয়াপ করা ইনস্ট্যান্স"
+"Swapped {n} assets" = { one = "{n}টি অ্যাসেট সোয়াপ করা হয়েছে", other = "{n}টি অ্যাসেট সোয়াপ করা হয়েছে" }
+"Swapped {n} assets; {missed} had no match and still use the old library" = { one = "{n}টি অ্যাসেট সোয়াপ করা হয়েছে; {missed}-এর কোনো মিল পাওয়া যায়নি এবং এখনো পুরোনো লাইব্রেরি ব্যবহার করছে", other = "{n}টি অ্যাসেট সোয়াপ করা হয়েছে; {missed}-এর কোনো মিল পাওয়া যায়নি এবং এখনো পুরোনো লাইব্রেরি ব্যবহার করছে" }
+"Sweep" = "সুইপ"
+"System" = "সিস্টেম"
+"Tab / Shift+Tab" = "Tab / Shift+Tab"
+"Table" = "টেবিল"
+"Tablet" = "ট্যাবলেট"
+"Tabular numbers" = "টাবুলার সংখ্যা"
+"Take the values from the first selected layer" = "প্রথমে নির্বাচিত লেয়ার থেকে মানগুলো নিন"
+"Taper" = "ট্যাপার"
+"Taper both ends" = "উভয় প্রান্ত ট্যাপার করুন"
+"Tell the server's operator what is wrong with it" = "সার্ভারের অপারেটরকে জানান এতে কী সমস্যা রয়েছে"
+"Temperature" = "তাপমাত্রা"
+"Template" = "টেমপ্লেট"
+"Templates" = "টেমপ্লেটসমূহ"
+"Terms" = "শর্তাবলী"
+"Text" = "টেক্সট"
+"Text align" = "টেক্সট সারিবদ্ধকরণ"
+"Text content" = "টেক্সট কন্টেন্ট"
+"Text size" = "লেখার আকার"
+"Text style" = "টেক্সট স্টাইল"
+"Text styles" = "টেক্সট স্টাইলসমূহ"
+"Texts" = "টেক্সটসমূহ"
+"Texture" = "টেক্সচার"
+"The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3." = "ক্যানভাস sRGB-তে রঙ প্রিভিউ করে; এক্সপোর্ট করা PNG, JPG এবং WebP ফাইলে Display P3 ট্যাগ করা থাকে।"
+"The destination document is unavailable. Nothing was imported." = "গন্তব্য ডকুমেন্ট অনুপলব্ধ। কিছু ইম্পোর্ট করা হয়নি।"
+"The destination document was closed. Nothing was imported." = "গন্তব্য ডকুমেন্ট বন্ধ করা হয়েছিল। কিছু ইম্পোর্ট করা হয়নি।"
+"The destination page was removed. Nothing was imported." = "গন্তব্য পেজ সরানো হয়েছে। কিছু ইম্পোর্ট করা হয়নি।"
+"The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "ফাইলটি সার্ভার থেকে ডিলিট করা হয়েছে: কেউ আর সেখান থেকে এটি খুলতে বা যুক্ত হতে পারবে না, এবং এটি আর ফেরানো যাবে না। যে কপিগুলো খোলা আছে তা যার যার কাছে আছে তার সাথেই থাকবে।"
+"The file now holds another library" = "ফাইলটিতে এখন অন্য একটি লাইব্রেরি রয়েছে"
+"The file now holds another library (\"{name}\")" = "ফাইলটিতে এখন অন্য একটি লাইব্রেরি রয়েছে (\"{name}\")"
+"The files you shared or published online from this computer. They stay on their server until you remove them." = "এই কম্পিউটার থেকে আপনি যে ফাইলগুলো অনলাইনে শেয়ার বা প্রকাশ করেছেন। আপনি না সরানো পর্যন্ত সেগুলো তাদের সার্ভারেই থাকে।"
+"The link carries the session's secret: share it only with people you invite." = "লিংকটি সেশনের গোপনীয়তা বহন করে: শুধুমাত্র আপনার আমন্ত্রিত লোকদের সাথেই এটি শেয়ার করুন।"
+"The name in your online files and on the server. The document inside keeps its own name." = "আপনার অনলাইন ফাইল এবং সার্ভারে থাকা নাম। ভেতরের ডকুমেন্টটি তার নিজস্ব নাম বজায় রাখে।"
+"The selection uses several text styles: click to apply one" = "নির্বাচনে একাধিক টেক্সট স্টাইল ব্যবহার করা হয়েছে: একটি প্রয়োগ করতে ক্লিক করুন"
+"The server deletes this file if nobody opens it before {date}." = "{date}-এর আগে কেউ না খুললে সার্ভার এই ফাইলটি ডিলিট করে দেবে।"
+"The whole file" = "সম্পূর্ণ ফাইল"
+"Theme" = "থিম"
+"There's no destination for that action" = "সেই অ্যাকশনের জন্য কোনো গন্তব্য নেই"
+"Thickness" = "পুরুত্ব"
+"This branch can't be reviewed: {e}" = "এই ব্রাঞ্চটি পর্যালোচনা করা যাচ্ছে না: {e}"
+"This branch was merged or archived." = "এই ব্রাঞ্চটি মার্জ বা আর্কাইভ করা হয়েছে।"
+"This computer only" = "শুধুমাত্র এই কম্পিউটার"
+"This computer remembers the owner token, so the file can be managed from the home screen's Online list. Copy it to manage the file from somewhere else: it is a password for this file and won't be shown again." = "এই কম্পিউটার ওনার টোকেন মনে রাখে, তাই হোম স্ক্রিনের অনলাইন তালিকা থেকে ফাইলটি পরিচালনা করা যেতে পারে। অন্য কোথাও থেকে ফাইলটি পরিচালনা করতে এটি কপি করুন: এটি এই ফাইলের জন্য একটি পাসওয়ার্ড এবং আর কখনো দেখানো হবে না।"
+"This condition is edited as an expression" = "এই শর্তটি এক্সপ্রেশন হিসেবে এডিট করা হয়েছে"
+"This file" = "এই ফাইল"
+"This file has unsaved changes" = "এই ফাইলে সেভ করা হয়নি এমন পরিবর্তন রয়েছে"
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "এই ফাইলে এমন ফন্ট ব্যবহার করা হয়েছে যা এই কম্পিউটারে ইনস্টল করা নেই। আপনি ইনস্টল না করা পর্যন্ত সেগুলোর টেক্সট একটি ফলব্যাক ফন্টে দেখানো হয়।"
+"This file is on {server}, open only to you. Share it to let others in with a new code." = "এই ফাইলটি {server}-এ আছে, শুধুমাত্র আপনার জন্য খোলা। নতুন কোড দিয়ে অন্যদের প্রবেশ করাতে এটি শেয়ার করুন।"
+"This frame is new on the branch." = "এই ফ্রেমটি ব্রাঞ্চে নতুন।"
+"This frame isn't on the branch." = "এই ফ্রেমটি ব্রাঞ্চে নেই।"
+"This server is open to the public: no key needed." = "এই সার্ভারটি সবার জন্য উন্মুক্ত: কোনো কী প্রয়োজন নেই।"
+"This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "এই সার্ভারের কী প্রয়োজন: ঠিকানায় ?key=… যোগ করুন (`figcraft-server key` এটি সার্ভারের মেশিনে প্রিন্ট করে)।"
+"This server takes files only with its key: see Advanced." = "এই সার্ভার শুধুমাত্র এর কী সহ ফাইল নেয়: উন্নত (Advanced) দেখুন।"
+"Thumbs up" = "বুড়ো আঙুল উঁচু"
+"Tidy up" = "পরিপাটি করুন"
+"Tile" = "টাইল"
+"Tile type" = "টাইল টাইপ"
+"Timer" = "টাইমার"
+"Tint" = "টিন্ট"
+"Title" = "শিরোনাম"
+"Title case" = "টাইটেল কেস"
+"To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "আপনার টিমের সাথে এই লাইব্রেরি শেয়ার করতে, ফাইলটি একটি সার্ভারে প্রকাশ করুন (Share ▸ Publish to server…), এরপর সেখানে লাইব্রেরি প্রকাশ করুন।"
+"To the layer around it" = "চারপাশের লেয়ার পর্যন্ত"
+"Toggle" = "টগল"
+"Toggle light/dark theme" = "লাইট/ডার্ক থিম টগল করুন"
+"Toggle visibility" = "দৃশ্যমানতা টগল করুন"
+"Tools" = "টুলস"
+"Top" = "উপরে"
+"Top & bottom" = "উপরে ও নিচে"
+"Top left radius" = "ওপরের বাম ব্যাসার্ধ"
+"Top right radius" = "ওপরের ডান ব্যাসার্ধ"
+"Transform" = "ট্রান্সফর্ম"
+"Triangle" = "ত্রিভুজ"
+"Triangle arrow" = "ত্রিভুজ তীর"
+"Trigger" = "ট্রিগার"
+"Trigger layer" = "ট্রিগার লেয়ার"
+"True" = "সত্য (True)"
+"Truncate text" = "টেক্সট ট্রাঙ্কেট করুন"
+"Truncate with an ellipsis" = "উপবৃত্ত (ellipsis) দিয়ে ট্রাঙ্কেট করুন"
+"Try again" = "আবার চেষ্টা করুন"
+"Try another search or filter." = "অন্য অনুসন্ধান বা ফিল্টার ব্যবহার করে দেখুন।"
+"Try another search, or browse templates." = "অন্য অনুসন্ধান ব্যবহার করুন, অথবা টেমপ্লেট ব্রাউজ করুন।"
+"Try another word, or look at every kind." = "অন্য শব্দ ব্যবহার করুন, অথবা সব ধরণ দেখুন।"
+"Turn a layer into a component, reuse it, and change every copy at once" = "একটি লেয়ারকে কম্পোনেন্টে রূপান্তর করুন, এটি পুনরায় ব্যবহার করুন এবং এক সাথে সব কপি পরিবর্তন করুন"
+"Two digits" = "দুটি অঙ্ক"
+"Type" = "ধরন (Type)"
+"Type settings" = "টাইপ সেটিংস"
+"Type the join code you were given, or paste an invite link." = "আপনাকে দেওয়া যুক্ত হওয়ার কোডটি টাইপ করুন, অথবা একটি আমন্ত্রণ লিংক পেস্ট করুন।"
+"Typography" = "টাইপোগ্রাফি"
+"Underline" = "আন্ডারলাইন"
+"Undo takes back only your own changes; what others changed since stays." = "আনডু কেবল আপনার নিজস্ব পরিবর্তনগুলো ফিরিয়ে নেয়; এর মধ্যে অন্যরা যা পরিবর্তন করেছে তা থেকেই যায়।"
+"Ungroup" = "আনগ্রুপ"
+"Uniform" = "ইউনিফর্ম"
+"Union" = "ইউনিয়ন"
+"Unions" = "ইউনিয়নসমূহ"
+"Unknown — treated as sRGB" = "অজানা — sRGB হিসেবে গণ্য করা হয়েছে"
+"Unread" = "অপঠিত"
+"Unresolve" = "অমীমাংসিত করুন"
+"Unsaved changes" = "সংরক্ষিত হয়নি এমন পরিবর্তন"
+"Unsaved changes in {names}. Save them before closing?" = "{names}-এ সংরক্ষিত হয়নি এমন পরিবর্তন রয়েছে। বন্ধ করার আগে সেগুলো সংরক্ষণ করবেন?"
+"Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "সংরক্ষিত হয়নি এমন পরিবর্তন: প্রথমে সেভ করুন ({save}), অথবা বাতিল করতে {alt}-ক্লিক করে ট্যাব বন্ধ করুন"
+"Unsaved changes: save first, or close again with {key} to discard" = "সংরক্ষিত হয়নি এমন পরিবর্তন: প্রথমে সেভ করুন, অথবা বাতিল করতে {key} দিয়ে আবার বন্ধ করুন"
+"Up" = "উপরে"
+"Update plugin" = "প্লাগইন আপডেট করুন"
+"Update" = "আপডেট"
+"Update from main" = "প্রধান (main) থেকে আপডেট করুন"
+"Update from selection" = "নির্বাচন থেকে আপডেট করুন"
+"Updated {components} and {styles}" = "{components} এবং {styles} আপডেট করা হয়েছে"
+"Updated {name}" = "{name} আপডেট করা হয়েছে"
+"Updating the graphics driver often helps. To use OpenGL only, start FigCraft from a Command Prompt with:" = "গ্রাফিক্স ড্রাইভার আপডেট করা প্রায়ই সহায়ক হয়। শুধুমাত্র OpenGL ব্যবহার করতে, কমান্ড প্রম্পট থেকে FigCraft শুরু করুন:"
+"Updating the graphics driver often helps. WGPU_BACKEND (vulkan, gl, metal) names another graphics API to try." = "গ্রাফিক্স ড্রাইভার আপডেট করা প্রায়ই সহায়ক হয়। WGPU_BACKEND (vulkan, gl, metal) চেষ্টা করার জন্য অন্য একটি গ্রাফিক্স API এর নাম বলে।"
+"Uploads this file to a FigCraft server and keeps this tab in sync with it. You get a link to edit and a link to view." = "এই ফাইলটি একটি FigCraft সার্ভারে আপলোড করে এবং এই ট্যাবটিকে এর সাথে সিঙ্ক করে রাখে। আপনি এডিট করার জন্য একটি লিংক এবং দেখার জন্য একটি লিংক পান।"
+"Uppercase" = "বড় হাতের অক্ষর"
+"Use a fixed value" = "একটি নির্দিষ্ট মান ব্যবহার করুন"
+"Use an expression, e.g. count + 1" = "একটি এক্সপ্রেশন ব্যবহার করুন, যেমন count + 1"
+"Use as mask" = "মাস্ক হিসেবে ব্যবহার করুন"
+"Use auto layout" = "অটো লেআউট ব্যবহার করুন"
+"Use number keys for opacity" = "অস্বচ্ছতার জন্য নম্বর কি ব্যবহার করুন"
+"Use the .figcraft or .fig extension." = ".figcraft বা .fig এক্সটেনশন ব্যবহার করুন।"
+"Use the layer's fill" = "লেয়ারের ফিল ব্যবহার করুন"
+"Used in {files} · {instances}" = "{files} · {instances}-এ ব্যবহৃত"
+"Username" = "ব্যবহারকারী নাম"
+"Value" = "মান"
+"Uses variables: each layer shows them in its own mode" = "ভেরিয়েবল ব্যবহার করে: প্রতিটি লেয়ার তাদের নিজস্ব মোডে সেগুলো দেখায়"
+"Variable" = "ভেরিয়েবল"
+"Variable collections" = "ভেরিয়েবল সংগ্রহসমূহ"
+"Variable modes" = "ভেরিয়েবল মোড"
+"Variable width" = "পরিবর্তনশীল প্রস্থ (Variable width)"
+"Variables" = "ভেরিয়েবলসমূহ"
+"Variables JSON…" = "ভেরিয়েবল JSON..."
+"Variables store reusable values (colours, numbers, strings, booleans) with modes such as Light and Dark." = "ভেরিয়েবলগুলো লাইট এবং ডার্কের মতো মোডের সাথে পুনঃব্যবহারযোগ্য মান (রঙ, নম্বর, স্ট্রিং, বুলিয়ান) সংরক্ষণ করে।"
+"Variant" = "ভ্যারিয়েন্ট"
+"Vector" = "ভেক্টর"
+"Vectors" = "ভেক্টরসমূহ"
+"Version" = "সংস্করণ"
+"Version history" = "সংস্করণ ইতিহাস"
+"Version {version}" = "সংস্করণ {version}"
+"Version {v} · {components} · {styles} · {variables}" = "সংস্করণ {v} · {components} · {styles} · {variables}"
+"Vertical" = "উল্লম্ব"
+"Vertical align" = "উল্লম্ব সারিবদ্ধকরণ"
+"Vertical hex" = "উল্লম্ব হেক্স"
+"Vertical padding" = "উল্লম্ব প্যাডিং"
+"Vertical spacing" = "উল্লম্ব ব্যবধান"
+"Vertical trim" = "উল্লম্ব ট্রিম"
+"View" = "ভিউ"
+"View link" = "ভিউ লিংক"
+"View link copied" = "ভিউ লিংক কপি করা হয়েছে"
+"View only" = "শুধুমাত্র দেখার উপযোগী"
+"View only: you see every change as it happens but can't edit. Leave to keep a copy you can edit." = "শুধুমাত্র দেখার উপযোগী: আপনি প্রতিটি পরিবর্তন ঘটার সাথে সাথে দেখতে পান কিন্তু এডিট করতে পারেন না। আপনি এডিট করতে পারেন এমন একটি কপি রাখতে ত্যাগ করুন।"
+"Viewing “{name}”" = "“{name}” দেখা হচ্ছে"
+"Violet" = "বেগুনি"
+"Visibility" = "দৃশ্যমানতা"
+"Visible" = "দৃশ্যমান"
+"Vivid" = "ভিভিড"
+"Votes per person" = "জনপ্রতি ভোট"
+"Voting session" = "ভোটিং সেশন"
+"WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND সেট করা আছে এবং ব্যবহারের জন্য গ্রাফিক্স API-এর নাম দেয়; এটি আনসেট করলে FigCraft কে বেছে নিতে দেয়।"
+"Warm" = "উষ্ণ"
+"Watch" = "ওয়াচ"
+"Wavy" = "ঢেউ খেলানো"
+"Web" = "ওয়েব"
+"Websites" = "ওয়েবসাইটসমূহ"
+"WebSocket URL" = "WebSocket URL"
+"WebSocket URL copied" = "WebSocket URL কপি করা হয়েছে"
+"Wedge" = "ওয়েজ"
+"Weekly planner" = "সাপ্তাহিক পরিকল্পনা"
+"Weight" = "ওজন"
+"What you try here changes this preview and the code below, not the file" = "আপনি এখানে যা চেষ্টা করেন তা ফাইলটিকে নয়, কেবল এই প্রিভিউ এবং নিচের কোডটিকে পরিবর্তন করে"
+"What changed since it was marked ready for dev" = "এটি ডেভের জন্য প্রস্তুত হিসেবে চিহ্নিত করার পর থেকে কী পরিবর্তিত হয়েছে"
+"What is wrong with this file? The server's operator gets your report." = "এই ফাইলে কী সমস্যা রয়েছে? সার্ভারের অপারেটর আপনার রিপোর্ট পান।"
+"What it's for" = "এটি কি জন্য"
+"What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "এটি কি থেকে পরিবর্তিত হয়েছে তা অজানা: FigCraft ডেভের জন্য প্রস্তুত ফ্রেমের একটি কপি রাখার আগেই এটি পরিবর্তিত হয়েছে। এখন থেকে তুলনা করতে পরিবর্তনটি সমাধান করুন (বা এটি আবার প্রস্তুত হিসেবে চিহ্নিত করুন)।"
+"While hovering" = "হোভার করার সময়"
+"While pressing" = "চেপে ধরে রাখার সময়"
+"White" = "সাদা"
+"Who runs it, its terms and how long it keeps files" = "এটি কে পরিচালনা করে, এর শর্তাবলী এবং এটি কতদিন ফাইল রাখে"
+"Whole screen" = "সম্পূর্ণ স্ক্রিন"
+"Why it changed" = "কেন এটি পরিবর্তিত হয়েছে"
+"Widget" = "উইজেট"
+"Widgets" = "উইজেটসমূহ"
+"Width" = "প্রস্থ"
+"Width point" = "প্রস্থ বিন্দু"
+"Width profile" = "প্রস্থ প্রোফাইল"
+"Wireframe kit" = "ওয়্যারফ্রেম কিট"
+"With the layers' export settings" = "লেয়ারের এক্সপোর্ট সেটিংস সহ"
+"Wrap" = "র‍্যাপ"
+"Wrap in new section" = "নতুন সেকশনে র‍্যাপ করুন"
+"Yellow" = "হলুদ"
+"Yesterday" = "গতকাল"
+"You" = "আপনি"
+"You'll get the shared file as a new tab and edit it together." = "আপনি একটি নতুন ট্যাব হিসেবে শেয়ার করা ফাইলটি পাবেন এবং একসাথে এডিট করবেন।"
+"You're spotlighting: everyone follows your view" = "আপনি স্পটলাইট করছেন: সবাই আপনার ভিউ অনুসরণ করছে"
+"Your copy of the file stays open" = "ফাইলের আপনার কপিটি খোলা থাকে"
+"Your copy stays open; the file stays on the server" = "আপনার কপি খোলা থাকে; ফাইলটি সার্ভারেই থাকে"
+"Your name" = "আপনার নাম"
+"Your name in comments" = "মন্তব্যে আপনার নাম"
+"Your system asks for reduced motion: animations stay off." = "আপনার সিস্টেম কম মোশনের অনুরোধ জানায়: অ্যানিমেশন বন্ধ থাকে।"
+"Z" = "Z"
+"Z to A" = "Z থেকে A"
+"Zoom" = "জুম"
+"Zoom around the pointer" = "পয়েন্টারের চারপাশে জুম করুন"
+"Zoom device to fill window" = "উইন্ডো পূর্ণ করতে ডিভাইস জুম করুন"
+"Zoom in" = "জুম ইন"
+"Zoom out" = "জুম আউট"
+"Zoom to 100%" = "১০০%-এ জুম করুন"
+"Zoom to 200%" = "২০০%-এ জুম করুন"
+"Zoom to 50%" = "৫০%-এ জুম করুন"
+"Zoom to fit" = "ফিট করতে জুম করুন"
+"Zoom to selection" = "নির্বাচনে জুম করুন"
+"Zoom tool: click to zoom in, drag an area" = "জুম টুল: জুম ইন করতে ক্লিক করুন, একটি এলাকা ড্র্যাগ করুন"
+"Zoom tool: zoom out" = "জুম টুল: জুম আউট"
+"and {n} more" = { one = "এবং আরও {n}টি", other = "এবং আরও {n}টি" }
+"bleed marks" = "ব্লিড মার্ক"
+"by {author}" = "{author} দ্বারা"
+"call any command its access allows" = "এর অ্যাক্সেস অনুমতি দেয় এমন যেকোনো কমান্ড কল করুন"
+"call only: {commands}" = "শুধুমাত্র কল করুন: {commands}"
+"can edit the document" = "ডকুমেন্ট এডিট করতে পারেন"
+"can save files" = "ফাইল সেভ করতে পারে"
+"conditional prototype actions nested too deeply were skipped" = "শর্তসাপেক্ষ প্রোটোটাইপ অ্যাকশনগুলো খুব গভীরভাবে নেস্ট করার কারণে বাদ দেওয়া হয়েছে"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "মূল্যায়ন করা যায় না এমন শর্তযুক্ত প্রোটোটাইপ অ্যাকশনগুলো বাদ দেওয়া হয়েছে"
+"connector label background was skipped: style data is missing" = "কানেক্টর লেবেলের ব্যাকগ্রাউন্ড বাদ দেওয়া হয়েছে: স্টাইল ডেটা অনুপস্থিত"
+"connector label was skipped: background bounds are invalid" = "কানেক্টর লেবেল বাদ দেওয়া হয়েছে: ব্যাকগ্রাউন্ড বাউন্ড অবৈধ"
+"connector label was skipped: background transform is invalid" = "কানেক্টর লেবেল বাদ দেওয়া হয়েছে: ব্যাকগ্রাউন্ড ট্রান্সফর্ম অবৈধ"
+"connector label was skipped: composed text transform is invalid" = "কানেক্টর লেবেল বাদ দেওয়া হয়েছে: কম্পোজড টেক্সট ট্রান্সফর্ম অবৈধ"
+"connector label was skipped: derived background bounds are missing" = "কানেক্টর লেবেল বাদ দেওয়া হয়েছে: ডিরাইভড ব্যাকগ্রাউন্ড বাউন্ড অনুপস্থিত"
+"connector label was skipped: derived text bounds are missing" = "কানেক্টর লেবেল বাদ দেওয়া হয়েছে: ডিরাইভড টেক্সট বাউন্ড অনুপস্থিত"
+"connector label was skipped: text bounds are invalid" = "কানেক্টর লেবেল বাদ দেওয়া হয়েছে: টেক্সট বাউন্ড অবৈধ"
+"connector label was skipped: text style data is missing" = "কানেক্টর লেবেল বাদ দেওয়া হয়েছে: টেক্সট স্টাইল ডেটা অনুপস্থিত"
+"connector label was skipped: text transform is invalid" = "কানেক্টর লেবেল বাদ দেওয়া হয়েছে: টেক্সট ট্রান্সফর্ম অবৈধ"
+"connector labels were skipped" = "কানেক্টর লেবেলগুলো বাদ দেওয়া হয়েছে"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "কানেক্টর লেবেল উপস্থিত থাকলে স্ট্যাটিক ফ্রেম/ভেক্টর স্ন্যাপশট হিসেবে ইম্পোর্ট হয়; লাইভ এন্ডপয়েন্ট বাইন্ডিং রাখা হয় না"
+"connector snapshot vector data is missing; connector was left empty" = "কানেক্টর স্ন্যাপশট ভেক্টর ডেটা অনুপস্থিত; কানেক্টর খালি রাখা হয়েছে"
+"connectors whose ends can't be placed are empty" = "যে কানেক্টরের প্রান্তগুলো রাখা যায় না সেগুলো খালি"
+"crop marks" = "ক্রপ মার্ক"
+"damaged vector geometry was skipped" = "ক্ষতিগ্রস্ত ভেক্টর জিওমেট্রি বাদ দেওয়া হয়েছে"
+"damaged vector networks import as outlines" = "ক্ষতিগ্রস্ত ভেক্টর নেটওয়ার্ক আউটলাইন হিসেবে ইম্পোর্ট হয়"
+"development: {path}" = "ডেভেলপমেন্ট: {path}"
+"document children other than pages were skipped" = "পেজ ছাড়া ডকুমেন্টের অন্যান্য চিলড্রেন বাদ দেওয়া হয়েছে"
+"duplicate grid track sizing entries use equal tracks" = "ডুপ্লিকেট গ্রিড ট্র্যাক সাইজিং এন্ট্রিগুলো সমান ট্র্যাক ব্যবহার করে"
+"e.g. count + 1" = "যেমন count + 1"
+"e.g. count >= 3 and not done" = "যেমন count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "সংরক্ষিত পাথ ছাড়া এলবো এবং কার্ভড কানেক্টর সরল রেখা হিসেবে ইম্পোর্ট হয়"
+"entries without a node type were skipped" = "নোটের ধরন ছাড়া এন্ট্রিগুলো বাদ দেওয়া হয়েছে"
+"figcraft:// links from a browser, chat or email open this app and join the session." = "ব্রাউজার, চ্যাট বা ইমেল থেকে figcraft:// লিংকগুলো এই অ্যাপ খুলে সেশনে যুক্ত হয়।"
+"filled areas of a vector with their own fill use the layer's fill" = "ভেক্টরের নিজস্ব ফিলযুক্ত পূর্ণ এলাকাগুলো লেয়ারের ফিল ব্যবহার করে"
+"from {server}" = "{server} থেকে"
+"gamepad triggers without exactly one known controller button were skipped" = "সঠিকভাবে একটি পরিচিত কন্ট্রোলার বোতাম ছাড়া গেমপ্যাড ট্রিগার বাদ দেওয়া হয়েছে"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "গ্রিড ট্র্যাক তালিকা ১০০০ এন্ট্রি অতিক্রম করেছে; ট্র্যাকগুলো ডিফল্ট সমান সাইজিং ব্যবহার করে"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "গ্রিড ট্র্যাক সাইজিং অসমর্থিত বা ত্রুটিপূর্ণ; প্রভাবিত ট্র্যাকগুলো সমান সাইজিং ব্যবহার করে"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "গ্রিড ট্র্যাক সাইজিং তালিকা ১০০০ এন্ট্রি অতিক্রম করেছে; ট্র্যাকগুলো ডিফল্ট সমান সাইজিং ব্যবহার করে"
+"hidden" = "লুকানো"
+"iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "ছবির ফিল্টারগুলো দ্ব্যর্থক কারণ উভয় ফিল্টার কন্টেইনার উপস্থিত রয়েছে; ফিল্টার রূপান্তর বাদ দেওয়া হয়েছে"
+"image filters use FigCraft's approximate renderer" = "ছবির ফিল্টারগুলো FigCraft-এর অনুমানমূলক রেন্ডারার ব্যবহার করে"
+"instance swap properties whose default component isn't in the file were skipped" = "ইনস্ট্যান্স সোয়াপ প্রপার্টি যার ডিফল্ট কম্পোনেন্ট ফাইলে নেই তা বাদ দেওয়া হয়েছে"
+"instances inside their own main component were imported as frames" = "নিজের প্রধান কম্পোনেন্টের ভেতরের ইনস্ট্যান্সগুলো ফ্রেম হিসেবে ইম্পোর্ট করা হয়েছে"
+"instances of components that aren't in the file show no layers" = "ফাইলে নেই এমন কম্পোনেন্টের ইনস্ট্যান্স কোনো লেয়ার দেখায় না"
+"instances of components that aren't in the file were imported as frames" = "ফাইলে নেই এমন কম্পোনেন্টের ইনস্ট্যান্স ফ্রেম হিসেবে ইম্পোর্ট করা হয়েছে"
+"instances that would nest a component inside itself were imported as frames" = "যে ইনস্ট্যান্সগুলো কোনো কম্পোনেন্টকে নিজের ভেতরে নেস্ট করত সেগুলোকে ফ্রেম হিসেবে ইম্পোর্ট করা হয়েছে"
+"instances without a main component were imported as empty frames" = "প্রধান কম্পোনেন্ট ছাড়া ইনস্ট্যান্সগুলো খালি ফ্রেম হিসেবে ইম্পোর্ট করা হয়েছে"
+"invalid internal .fig text path data was ignored" = "অবৈধ অভ্যন্তরীণ .fig টেক্সট পাথ ডেটা উপেক্ষা করা হয়েছে"
+"invalid or oversized vector networks import as outlines" = "অবৈধ বা অতিরিক্ত বড় ভেক্টর নেটওয়ার্ক আউটলাইন হিসেবে ইম্পোর্ট হয়"
+"invalid or oversized vector path data was skipped" = "অবৈধ বা অতিরিক্ত বড় ভেক্টর পাথ ডেটা বাদ দেওয়া হয়েছে"
+"just now" = "এইমাত্র"
+"key triggers without a supported key were skipped" = "সমর্থিত কি ছাড়া কি ট্রিগার বাদ দেওয়া হয়েছে"
+"key up triggers import as key presses" = "কি আপ ট্রিগার কি প্রেস হিসেবে ইম্পোর্ট হয়"
+"layers without a position were placed at their parent's origin" = "অবস্থান ছাড়া লেয়ারগুলো তাদের প্যারেন্টের মূল অবস্থানে রাখা হয়েছে"
+"layers without a type were skipped" = "ধরন ছাড়া লেয়ারগুলো বাদ দেওয়া হয়েছে"
+"legacy image filter container is unsupported; filter conversion was skipped" = "লিগ্যাসি ইমেজ ফিল্টার কন্টেইনার অসমর্থিত; ফিল্টার রূপান্তর বাদ দেওয়া হয়েছে"
+"locked" = "লক করা"
+"malformed image filters container was skipped" = "ত্রুটিপূর্ণ ইমেজ ফিল্টার কন্টেইনার বাদ দেওয়া হয়েছে"
+"malformed image paintFilter container was skipped" = "ত্রুটিপূর্ণ ইমেজ paintFilter কন্টেইনার বাদ দেওয়া হয়েছে"
+"malformed slot content assignment was skipped" = "ত্রুটিপূর্ণ স্লট কন্টেন্ট অ্যাসাইনমেন্ট বাদ দেওয়া হয়েছে"
+"no bleed" = "কোনো ব্লিড নেই"
+"nobody else here yet" = "এখানে আর কেউ নেই"
+"non-default slot settings are not represented and were skipped" = "অ-ডিফল্ট স্লট সেটিংস উপস্থাপিত হয়নি এবং বাদ দেওয়া হয়েছে"
+"now" = "এখন"
+"offer files to save if it asks to (you choose where each one goes)" = "চাইলে সেভ করার জন্য ফাইল দিতে (প্রতিটি কোথায় যাবে, আপনি বেছে নেন)"
+"only in a text style or variable" = "শুধুমাত্র টেক্সট স্টাইল বা ভেরিয়েবলে"
+"or" = "অথবা"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "পয়েন্ট স্ট্রোক জয়েন্ট সংরক্ষিত হয়েছে; ড্যাশড বা পরিবর্তনশীল প্রস্থের স্ট্রোক লেয়ার জয়েন্ট দিয়ে রেন্ডার হয়"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "পছন্দসই স্লট কম্পোনেন্ট কি ফাইল নোডে সমাধান করা যায়নি এবং বাদ দেওয়া হয়েছে"
+"prototype actions of unknown types were skipped" = "অজানা ধরনের প্রোটোটাইপ অ্যাকশন বাদ দেওয়া হয়েছে"
+"prototype actions without a destination in the file were skipped" = "ফাইলে গন্তব্য নেই এমন প্রোটোটাইপ অ্যাকশন বাদ দেওয়া হয়েছে"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "ভেরিয়েবল JSON-এ নেই এমন ভেরিয়েবলের উপর প্রোটোটাইপ এক্সপ্রেশন বাদ দেওয়া হয়েছে"
+"prototype expressions with unsupported functions were skipped" = "অসমর্থিত ফাংশনযুক্ত প্রোটোটাইপ এক্সপ্রেশন বাদ দেওয়া হয়েছে"
+"prototype interactions without supported actions were skipped" = "সমর্থিত অ্যাকশন ছাড়া প্রোটোটাইপ ইন্টারঅ্যাকশন বাদ দেওয়া হয়েছে"
+"prototype navigations of unknown types were skipped" = "অজানা ধরনের প্রোটোটাইপ নেভিগেশন বাদ দেওয়া হয়েছে"
+"prototype transitions of unknown types play instantly" = "অজানা ধরনের প্রোটোটাইপ ট্রানজিশন তাৎক্ষণিকভাবে চলে"
+"prototype triggers of unknown types were skipped" = "অজানা ধরনের প্রোটোটাইপ ট্রিগার বাদ দেওয়া হয়েছে"
+"put a widget on the canvas" = "ক্যানভাসে একটি উইজেট রাখুন"
+"read and edit the document" = "ডকুমেন্ট পড়ুন এবং এডিট করুন"
+"read the document" = "ডকুমেন্ট পড়ুন"
+"reads the document" = "ডকুমেন্ট পড়ে"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "ভেরিয়েবল JSON-এ নেই এমন ভেরিয়েবলের উপর set-variable অ্যাকশন বাদ দেওয়া হয়েছে"
+"set-variable actions with values that can't be evaluated were skipped" = "মূল্যায়ন করা যায় না এমন মানযুক্ত set-variable অ্যাকশন বাদ দেওয়া হয়েছে"
+"set-variable actions with values that don't fit the variable were skipped" = "ভেরিয়েবলের সাথে মেলে না এমন মানযুক্ত set-variable অ্যাকশন বাদ দেওয়া হয়েছে"
+"set-variable actions without a value were skipped" = "মান ছাড়া set-variable অ্যাকশন বাদ দেওয়া হয়েছে"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "ভেরিয়েবল JSON-এ নেই এমন সংগ্রহ বা মোডের উপর set-variable-mode অ্যাকশন বাদ দেওয়া হয়েছে"
+"slot content assignment target is missing or is not slot content" = "স্লট কন্টেন্ট অ্যাসাইনমেন্ট লক্ষ্য অনুপস্থিত অথবা স্লট কন্টেন্ট নয়"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "স্লট কন্টেন্ট অ্যাসাইনমেন্ট খালি GUID সেন্টিমেল ব্যবহার করে এবং বাদ দেওয়া হয়েছে"
+"slot layers without a matching slot property were imported as frames" = "মিল রয়েছে এমন স্লট প্রপার্টি ছাড়া স্লট লেয়ারগুলো ফ্রেম হিসেবে ইম্পোর্ট করা হয়েছে"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "কিছু ভেক্টর পয়েন্ট ফাইল থেকে অনুপস্থিত পয়েন্ট সেটিংস উল্লেখ করে; সেগুলো লেয়ারের জয়েন্ট এবং সাধারণ কোণা ব্যবহার করে"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "কিছু ভেক্টর সেগমেন্ট ফাইল থেকে অনুপস্থিত স্টাইল সেটিংস উল্লেখ করে; সেগুলো লেয়ারের স্ট্রোক ব্যবহার করে"
+"stale or invalid grid track sizing entries were ignored" = "পুরোনো বা অবৈধ গ্রিড ট্র্যাক সাইজিং এন্ট্রি উপেক্ষা করা হয়েছে"
+"stars and polygons without point counts or geometry use the default point count" = "পয়েন্ট সংখ্যা বা জিওমেট্রি ছাড়া তারকা এবং বহুভুজ ডিফল্ট পয়েন্ট সংখ্যা ব্যবহার করে"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "কিছু ভেক্টর সেগমেন্টের স্টাইল সেটিংস সমর্থিত নয়; সেই সেগমেন্টগুলো লেয়ারের স্ট্রোক ব্যবহার করে"
+"text path underline or strikethrough decoration is not rendered" = "টেক্সট পাথ আন্ডারলাইন বা স্ট্রাইকথ্রু সজ্জা রেন্ডার হয় না"
+"text style overrides refer to missing table entries" = "টেক্সট স্টাইল ওভাররাইড অনুপস্থিত টেবিল এন্ট্রি নির্দেশ করে"
+"the file has no pages" = "ফাইলে কোনো পেজ নেই"
+"the plugin" = "প্লাগইনটি"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "ভেরিয়েবল JSON-এ কোনো `variableCollections` নেই (স্থানীয় ভেরিয়েবল প্রতিক্রিয়া প্রত্যাশিত ছিল) এবং উপেক্ষা করা হয়েছে"
+"this session only" = "শুধুমাত্র এই সেশন"
+"unknown component property types were skipped" = "অজানা কম্পোনেন্ট প্রপার্টি ধরন বাদ দেওয়া হয়েছে"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "ভেরিয়েবল JSON-এ নেই (বা অন্য ধরনের) এমন ভেরিয়েবলের ভেরিয়েবল অ্যালিয়াস বাদ দেওয়া হয়েছে"
+"variable bindings to properties the layer doesn't have were skipped" = "লেয়ারের নেই এমন প্রপার্টির ভেরিয়েবল বাইন্ডিং বাদ দেওয়া হয়েছে"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "ভেরিয়েবল JSON-এ নেই (লাইব্রেরি ভেরিয়েবল) এমন ভেরিয়েবলের ভেরিয়েবল বাইন্ডিং বাদ দেওয়া হয়েছে"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "ভেরিয়েবল বাইন্ডিং বাদ দেওয়া হয়েছে: ফাইল JSON-এ কোনো ভেরিয়েবল সংজ্ঞা নেই (স্থানীয় ভেরিয়েবল JSON কে `variables` হিসেবে পাস করুন, অথবা ফাইল JSON এর পাশে এর `meta` এমবেড করুন)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "প্রপার্টির সাথে মানানসই নয় এমন ভেরিয়েবল ধরনের ভেরিয়েবল বাইন্ডিং বাদ দেওয়া হয়েছে"
+"variable collections without modes were skipped" = "মোড ছাড়া ভেরিয়েবল সংগ্রহ বাদ দেওয়া হয়েছে"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "প্রোটোটাইপ এক্সপ্রেশনের ভেরিয়েবল মোড লুকআপ যা কোনো ভেরিয়েবল এবং এর একটি মোড নয় তা বাদ দেওয়া হয়েছে"
+"variable modes of collections that aren't in the file were skipped" = "ফাইলে নেই এমন সংগ্রহের ভেরিয়েবল মোড বাদ দেওয়া হয়েছে"
+"variable modes of collections that aren't in the variables JSON were skipped" = "ভেরিয়েবল JSON-এ নেই এমন সংগ্রহের ভেরিয়েবল মোড বাদ দেওয়া হয়েছে"
+"variable values that don't match their type (or composed colours) were skipped" = "তাদের ধরনের সাথে মেলে না এমন ভেরিয়েবল মান বাদ দেওয়া হয়েছে"
+"variables of unknown types were skipped" = "অজানা ধরনের ভেরিয়েবল বাদ দেওয়া হয়েছে"
+"variables whose collection isn't in the variables JSON were skipped" = "সংগ্রহ ভেরিয়েবল JSON-এ নেই এমন ভেরিয়েবল বাদ দেওয়া হয়েছে"
+"variables without readable values were skipped" = "পড়ার উপযোগী মান নেই এমন ভেরিয়েবল বাদ দেওয়া হয়েছে"
+"vector points with unknown stroke joins use the layer join" = "অজানা স্ট্রোক জয়েন্টযুক্ত ভেক্টর পয়েন্ট লেয়ার জয়েন্ট ব্যবহার করে"
+"vectors without geometry are empty" = "জিওমেট্রি ছাড়া ভেক্টর খালি"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "জিওমেট্রি ছাড়া ভেক্টর খালি (geometry=paths সহ ফাইল JSON এক্সপোর্ট করুন)"
+"very long text was cut to 1,048,576 characters" = "খুব দীর্ঘ টেক্সট কেটে ১,০৪৮,৫৭৬ অক্ষরে ছোট করা হয়েছে"
+"very long vector paths were skipped" = "খুব দীর্ঘ ভেক্টর পাথ বাদ দেওয়া হয়েছে"
+"video actions are not supported and were skipped" = "ভিডিও অ্যাকশন সমর্থিত নয় এবং বাদ দেওয়া হয়েছে"
+"video triggers are not supported and were skipped" = "ভিডিও ট্রিগার সমর্থিত নয় এবং বাদ দেওয়া হয়েছে"
+"yesterday" = "গতকাল"
+"{instances} in {files}" = "{files}-এ {instances}টি ইনস্ট্যান্স"
+"{language}: draft translation, waiting for a native speaker's review." = "{language}: ড্রাফট অনুবাদ, স্থানীয় ভাষাভাষীর পর্যালোচনার অপেক্ষায়।"
+"{length} bleed" = "{length} ব্লিড"
+"{month} {day}, {year}" = "{day} {month}, {year}"
+"{name} cleared from the list" = "তালিকা থেকে {name} মুছে ফেলা হয়েছে"
+"{name} is forgotten on this computer; the file stays on {server}" = "এই কম্পিউটার থেকে {name} মুছে ফেলা হয়েছে; ফাইলটি {server}-এ রয়ে গেছে"
+"{name} is on the server." = "{name} সার্ভারে আছে।"
+"{name} is spotlighting" = "{name} স্পটলাইট করছে"
+"{name}\nClick to apply to the selection" = "{name}\nনির্বাচনে প্রয়োগ করতে ক্লিক করুন"
+"{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nক্যানভাসে ড্র্যাগ করুন, অথবা ভিউর মাঝখানে রাখতে ক্লিক করুন।\nকোনো ইনস্ট্যান্সে ড্রপ করার সময় সোয়াপ করতে Alt (Option) চেপে ধরে রাখুন।"
+"{name} (from {library})" = "{name} ({library} থেকে)"
+"{name} (you)" = "{name} (আপনি)"
+"{name} ({layers} layers)" = "{name} ({layers}টি লেয়ার)"
+"{name} ({tag}): {min} – {max}, default {default}. Double-click the slider to go back to the style's value; Escape while dragging cancels." = "{name} ({tag}): {min} – {max}, ডিফল্ট {default}. স্টাইলের মানে ফিরে যেতে স্লাইডারে ডাবল-ক্লিক করুন; ড্র্যাগ করার সময় Escape টিপলে বাতিল হবে।"
+"{name} from {path}" = "{path} থেকে {name}"
+"{name} was removed from the server" = "সার্ভার থেকে {name} সরানো হয়েছে"
+"{name} · deleted on main" = "{name} · প্রধান (main)-এ ডিলিট করা হয়েছে"
+"{name} · deleted on the branch" = "{name} · ব্রাঞ্চে ডিলিট করা হয়েছে"
+"{name} · not published" = "{name} · প্রকাশিত নয়"
+"{name} · on a server" = "{name} · একটি সার্ভারে"
+"{name} · published version {v}" = "{name} · প্রকাশিত সংস্করণ {v}"
+"{name} · version {v} on the server" = "{name} · সার্ভারে সংস্করণ {v}"
+"{name}, in a live session" = "{name}, লাইভ সেশনে"
+"{name}, online, open only to you" = "{name}, অনলাইনে, শুধুমাত্র আপনার জন্য খোলা"
+"{name}, {kind}, {w} by {h}, selected" = "{name}, {kind}, {w} × {h}, নির্বাচিত"
+"{n} added" = { one = "{n}টি যোগ করা হয়েছে", other = "{n}টি যোগ করা হয়েছে" }
+"{n} autosave versions" = { one = "{n}টি স্বয়ংক্রিয় সেভ সংস্করণ", other = "{n}টি স্বয়ংক্রিয় সেভ সংস্করণ" }
+"{n} changed" = { one = "{n}টি পরিবর্তিত হয়েছে", other = "{n}টি পরিবর্তিত হয়েছে" }
+"{n} columns" = { one = "{n}টি কলাম", other = "{n}টি কলাম" }
+"{n} components" = { one = "{n}টি কম্পোনেন্ট", other = "{n}টি কম্পোনেন্ট" }
+"{n} components and styles have newer versions" = { one = "{n}টি কম্পোনেন্ট বা স্টাইলের নতুন সংস্করণ রয়েছে", other = "{n}টি কম্পোনেন্ট এবং স্টাইলের নতুন সংস্করণ রয়েছে" }
+"{n} conflicts to resolve" = { one = "{n}টি দ্বন্দ্ব সমাধান করতে হবে", other = "{n}টি দ্বন্দ্ব সমাধান করতে হবে" }
+"{n} days ago" = { one = "{n} দিন আগে", other = "{n} দিন আগে" }
+"{n} files" = { one = "{n}টি ফাইল", other = "{n}টি ফাইল" }
+"{n} hours ago" = { one = "{n} ঘণ্টা আগে", other = "{n} ঘণ্টা আগে" }
+"{n} instances" = { one = "{n}টি ইনস্ট্যান্স", other = "{n}টি ইনস্ট্যান্স" }
+"{n} layers" = { one = "{n}টি লেয়ার", other = "{n}টি লেয়ার" }
+"{n} layers as one file" = { one = "{n}টি লেয়ার একটি ফাইল হিসেবে", other = "{n}টি লেয়ার একটি ফাইল হিসেবে" }
+"{n} layers selected" = { one = "{n}টি লেয়ার নির্বাচিত", other = "{n}টি লেয়ার নির্বাচিত" }
+"{n} layers · {parts}" = { one = "{n}টি লেয়ার · {parts}", other = "{n}টি লেয়ার · {parts}" }
+"{n} matches" = { one = "{n}টি মিল", other = "{n}টি মিল" }
+"{n} min" = "{n} মিনিট"
+"{n} minutes ago" = { one = "{n} মিনিট আগে", other = "{n} মিনিট আগে" }
+"{n} months ago" = { one = "{n} মাস আগে", other = "{n} মাস আগে" }
+"{n} more notes omitted from this report" = { one = "এই রিপোর্ট থেকে আরও {n}টি নোট বাদ দেওয়া হয়েছে", other = "এই রিপোর্ট থেকে আরও {n}টি নোট বাদ দেওয়া হয়েছে" }
+"{n} of {total}" = "{total}-এর মধ্যে {n}"
+"{n} people joined" = { one = "{n} জন যুক্ত হয়েছেন", other = "{n} জন যুক্ত হয়েছেন" }
+"{n} preferred components" = { one = "{n}টি পছন্দের কম্পোনেন্ট", other = "{n}টি পছন্দের কম্পোনেন্ট" }
+"{n} ready" = { one = "{n}টি প্রস্তুত", other = "{n}টি প্রস্তুত" }
+"{n} removed" = { one = "{n}টি সরানো হয়েছে", other = "{n}টি সরানো হয়েছে" }
+"{n} replies" = { one = "{n}টি উত্তর", other = "{n}টি উত্তর" }
+"{n} rows" = { one = "{n}টি সারি", other = "{n}টি সারি" }
+"{n} styles" = { one = "{n}টি স্টাইল", other = "{n}টি স্টাইল" }
+"{n} text layers" = { one = "{n}টি টেক্সট লেয়ার", other = "{n}টি টেক্সট লেয়ার" }
+"{n} variables" = { one = "{n}টি ভেরিয়েবল", other = "{n}টি ভেরিয়েবল" }
+"{n} votes" = { one = "{n}টি ভোট", other = "{n}টি ভোট" }
+"{n} votes left" = { one = "{n}টি ভোট বাকি", other = "{n}টি ভোট বাকি" }
+"{n} weeks ago" = { one = "{n} সপ্তাহ আগে", other = "{n} সপ্তাহ আগে" }
+"{n} years ago" = { one = "{n} বছর আগে", other = "{n} বছর আগে" }
+"{n}d" = "{n}d"
+"{n}h" = "{n}h"
+"{n}m" = "{n}m"
+"{n}w" = "{n}w"
+"{page}, nothing selected" = "{page}, কিছু নির্বাচিত নেই"
+"{profile} (current)" = "{profile} (বর্তমান)"
+"{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} হলো এর মান; {property ? \"a\" : \"b\"} একটি স্ট্রিং বাছে। অন্যান্য {…} যেমন লেখা আছে তেমনই থাকে।"
+"{server} can't say what became of your files (it is older than this app)." = "{server} বলতে পারছে না আপনার ফাইলের কী হয়েছে (এটি এই অ্যাপের চেয়ে পুরনো)।"
+"{server} · No longer on the server" = "{server} · আর সার্ভারে নেই"
+"{server} · {shared} · Opened {date}" = "{server} · {shared} · খোলা হয়েছে {date}"
+"{tool}  hold {key}" = "{tool}  চেপে ধরে রাখুন {key}"
+"{value} isn't a colour" = "{value} কোনো রঙ নয়"
+"{when} · edited" = "{when} · এডিট করা হয়েছে"
+"← ↑ → ↓" = "← ↑ → ↓"
+"← → ↑ ↓" = "← → ↑ ↓"
+"←" = "←"
+"→, Space or N" = "→, স্পেস বা N"
+"↵" = "↵"
+"⇥ / ⇧⇥" = "⇥ / ⇧⇥"
+"⌘ arrows" = "⌘ অ্যারো"
+"⌘ click" = "⌘ ক্লিক"
+"⌘ scroll" = "⌘ স্ক্রল"
+"⌥ drag" = "⌥ ড্র্যাগ"
+
+
+[commands]
+"board.connector" = "সংযোগকারী"
+"board.ink" = "মার্কারের টান"
+"board.label" = "সংযোগকারীর লেবেল"
+"board.nextSticky" = "পরের স্টিকি নোট"
+"board.reattach" = "সংযোগকারী পুনরায় যুক্ত করুন"
+"board.setColor" = "বোর্ডের রং"
+"board.setStyle" = "বোর্ডের শৈলী"
+"board.shape" = "লেখাসহ আকৃতি"
+"board.stamp" = "স্ট্যাম্প"
+"board.sticky" = "স্টিকি নোট"
+"board.table" = "টেবিল"
+"board.tableEdit" = "টেবিল সম্পাদনা"
+"board.template" = "বোর্ড টেমপ্লেট"
+"board.templates" = "বোর্ড টেমপ্লেটের তালিকা"
+"board.timer" = "টাইমার"
+"board.timerState" = "টাইমারের অবস্থা"
+"board.vote" = "ভোটিং সেশন"
+"board.voteResults" = "ভোটের ফলাফল"
+"devMode.addMeasurement" = "মাপ যোগ করুন"
+"devMode.measurements" = "মাপের তালিকা"
+"devMode.removeMeasurement" = "মাপ সরান"
+"file.newBoard" = "নতুন বোর্ড"
+"tool.connector" = "সংযোগকারী"
+"tool.eraser" = "ইরেজার"
+"tool.highlighter" = "হাইলাইটার"
+"tool.marker" = "মার্কার"
+"tool.shape" = "আকৃতি"
+"tool.stamp" = "স্ট্যাম্প"
+"tool.sticky" = "স্টিকি নোট"
+"widget.menu" = "উইজেটের মেনু"
+"widget.setText" = "উইজেটের ঘর সম্পাদনা"
diff --git a/crates/ui-egui/locales/cs.toml b/crates/ui-egui/locales/cs.toml
index 0f01b49f..773a3729 100644
--- a/crates/ui-egui/locales/cs.toml
+++ b/crates/ui-egui/locales/cs.toml
@@ -13,6 +13,7 @@ status = "draft — needs native review"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: PR: {prs}, commity: {commits}, +{added} / −{deleted} řádků (Δ {delta}), +{bin_added} / −{bin_deleted} binárních souborů, {first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Kolekce tohoto souboru s těmito režimy a proměnnými: přepište jejich hodnoty pro jednotlivé režimy a přidejte vlastní proměnné"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Soubor .figcraft s tímto názvem už existuje. Nahrazení potvrdíte výběrem jeho úplného názvu."
 "A layer on its own aligns to its frame: select more layers, or one in a frame" = "Samostatná vrstva se zarovná ke svému rámci: vyberte více vrstev nebo jednu v rámci"
 "A responsive product page: hero, features, figures, a quote and a footer" = "Responzivní produktová stránka: úvodní blok, funkce, čísla, citace a zápatí"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "Pružina se pohybuje až do ustálení: délku určuje její hmotnost, tuhost a tlumení"
@@ -32,6 +33,7 @@ status = "draft — needs native review"
 "Add a description" = "Přidat popis"
 "Add a frame (F) or a shape (R) to get started" = "Začněte přidáním rámce (F) nebo tvaru (R)"
 "Add a layer or component to tile first" = "Nejprve přidejte vrstvu nebo komponentu k opakování"
+"Add a minute" = "Přidat minutu"
 "Add a note for developers" = "Přidat poznámku pro vývojáře"
 "Add action" = "Přidat akci"
 "Add actions for when no condition holds" = "Přidat akce pro případ, kdy neplatí žádná podmínka"
@@ -39,6 +41,7 @@ status = "draft — needs native review"
 "Add another condition" = "Přidat další podmínku"
 "Add auto layout" = "Přidat automatické rozvržení"
 "Add background behind overlay" = "Přidat pozadí za překryv"
+"Add column" = "Přidat sloupec"
 "Add content to this slot" = "Přidat obsah do tohoto slotu"
 "Add dev resource" = "Přidat zdroj pro vývojáře"
 "Add effect" = "Přidat efekt"
@@ -50,6 +53,7 @@ status = "draft — needs native review"
 "Add library file…" = "Přidat soubor knihovny…"
 "Add max height" = "Přidat maximální výšku"
 "Add max width" = "Přidat maximální šířku"
+"Add measurement" = "Přidat měření"
 "Add min height" = "Přidat minimální výšku"
 "Add min width" = "Přidat minimální šířku"
 "Add mode" = "Přidat režim"
@@ -57,6 +61,7 @@ status = "draft — needs native review"
 "Add or update collections from a variables JSON" = "Přidat nebo aktualizovat kolekce ze souboru JSON s proměnnými"
 "Add properties to make instances configurable" = "Přidejte vlastnosti pro nastavení instancí"
 "Add reaction" = "Přidat reakci"
+"Add row" = "Přidat řádek"
 "Add starting point" = "Přidat počáteční bod"
 "Add stroke" = "Přidat tah"
 "Add variant" = "Přidat variantu"
@@ -85,8 +90,13 @@ status = "draft — needs native review"
 "All comments" = "Všechny komentáře"
 "All components" = "Všechny komponenty"
 "All fonts" = "Všechna písma"
+"All objects" = "Všechny objekty"
 "All supported properties" = "Všechny podporované vlastnosti"
 "All variables" = "Všechny proměnné"
+"Along the bottom" = "Podél dolní hrany"
+"Along the left" = "Podél levé hrany"
+"Along the right" = "Podél pravé hrany"
+"Along the top" = "Podél horní hrany"
 "Alpha" = "Alfa"
 "Alphabetical" = "Abecedně"
 "Alt+drag" = "Alt+tažení"
@@ -119,6 +129,7 @@ status = "draft — needs native review"
 "Archived" = "Archivováno"
 "Arrange" = "Uspořádat"
 "Arrow" = "Šipka"
+"Arrow at the end" = "Šipka na konci"
 "As typed" = "Podle zadání"
 "Asking the server…" = "Dotazování serveru…"
 "Assets" = "Zdroje"
@@ -150,6 +161,7 @@ status = "draft — needs native review"
 "Basics" = "Základy"
 "Before" = "Před"
 "Bend" = "Ohnout"
+"Between the selected layers" = "Mezi vybranými vrstvami"
 "Bevel" = "Zkosený"
 "Binary assets added" = "Přidané binární soubory"
 "Binary assets removed" = "Odstraněné binární soubory"
@@ -167,6 +179,7 @@ status = "draft — needs native review"
 "Bottom" = "Dole"
 "Bottom left radius" = "Poloměr levého dolního rohu"
 "Bottom right radius" = "Poloměr pravého dolního rohu"
+"Brainstorm" = "Brainstorming"
 "Branch" = "Větev"
 "Branch archived" = "Větev archivována"
 "Branch merged" = "Větev sloučena"
@@ -192,8 +205,12 @@ status = "draft — needs native review"
 "C or ⇧C" = "C nebo ⇧C"
 "CMYK colour" = "Barva CMYK"
 "Can view" = "Může prohlížet"
+"Check" = "Fajfka"
 "Checking the server…" = "Kontrola serveru…"
+"Chevron" = "Lomená šipka"
 "Clear from this list" = "Vymazat z tohoto seznamu"
+"Clear results" = "Vymazat výsledky"
+"Click objects to vote; click your badge to take a vote back" = "Kliknutím na objekty hlasujete; kliknutím na svůj odznak hlas vrátíte"
 "Code or invite link" = "Kód nebo odkaz s pozvánkou"
 "Color profile: {name}" = "Barevný profil: {name}"
 "Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Barevné a textové styly, proměnné pro světlý a tmavý režim, tlačítka, vstupní pole a karty"
@@ -218,7 +235,7 @@ status = "draft — needs native review"
 "Changes on main" = "Změny v hlavním souboru"
 "Changes on the branch" = "Změny ve větvi"
 "Changes unknown" = "Změny nejsou známy"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "Pro propojení této komponenty s jejím kódem vyberte nahoře React, Leptos, SwiftUI, Compose nebo Flutter."
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Pro propojení této komponenty s jejím kódem vyberte nahoře React, Leptos, Vue, SwiftUI, Compose, ArkUI nebo Flutter."
 "Choose another profile to change it." = "Pro změnu vyberte jiný profil."
 "Choose collection" = "Vybrat kolekci"
 "Choose image" = "Vybrat obrázek"
@@ -239,7 +256,6 @@ status = "draft — needs native review"
 "Close tab" = "Zavřít kartu"
 "Close version history" = "Zavřít historii verzí"
 "Close when clicking outside" = "Zavřít při kliknutí mimo"
-"Close without saving" = "Zavřít bez uložení"
 "Code" = "Kód"
 "Code syntax" = "Syntaxe kódu"
 "Collapse" = "Sbalit"
@@ -266,6 +282,7 @@ status = "draft — needs native review"
 "Commits" = "Commity"
 "Company" = "Společnost"
 "Compare changes" = "Porovnat změny"
+"Compatibility notes" = "Poznámky ke kompatibilitě"
 "Completed" = "Dokončeno"
 "Component" = "Komponenta"
 "Component name" = "Název komponenty"
@@ -280,11 +297,11 @@ status = "draft — needs native review"
 "Connected" = "Připojeno"
 "Connected to code: {from}" = "Propojeno s kódem: {from}"
 "Connection lost, reconnecting (attempt {attempt})…" = "Spojení ztraceno, opětovné připojování (pokus {attempt})…"
+"Connector" = "Spojnice"
 "Constrain proportions" = "Zachovat poměr stran"
 "Constraints" = "Omezení"
 "Content" = "Obsah"
 "Contents hidden" = "Obsah skryt"
-"Contents only" = "Pouze obsah"
 "Contextual alternates" = "Kontextové alternativy"
 "Contrast" = "Kontrast"
 "Contributors" = "Přispěvatelé"
@@ -308,6 +325,8 @@ status = "draft — needs native review"
 "Corner radius" = "Poloměr rohu"
 "Corner smoothing" = "Vyhlazení rohů"
 "Couldn't reach {server}: showing what this computer remembers." = "Server {server} není dostupný: zobrazuje se stav uložený v tomto počítači."
+"Couldn't read {name}." = "Soubor {name} se nepodařilo přečíst."
+"Couldn't save the file" = "Soubor se nepodařilo uložit"
 "Count" = "Počet"
 "Create" = "Vytvořit"
 "Create a variable collection first" = "Nejprve vytvořte kolekci proměnných"
@@ -331,6 +350,7 @@ status = "draft — needs native review"
 "Current version" = "Aktuální verze"
 "Cursor chat" = "Chat u kurzoru"
 "Custom" = "Vlastní"
+"Custom size" = "Vlastní velikost"
 "Cut" = "Vyjmout"
 "Dark" = "Tmavý"
 "Darken" = "Ztmavit"
@@ -364,6 +384,7 @@ status = "draft — needs native review"
 "Description" = "Popis"
 "Description (optional)" = "Popis (nepovinný)"
 "Design" = "Návrh"
+"Design panel" = "Panel návrhu"
 "Design system starter" = "Základ design systému"
 "Desktop" = "Počítač"
 "Destination" = "Cíl"
@@ -391,6 +412,7 @@ status = "draft — needs native review"
 "Distribute horizontal spacing" = "Rozmístit vodorovné rozestupy"
 "Distribute vertical spacing" = "Rozmístit svislé rozestupy"
 "Divider" = "Oddělovač"
+"Don't Save" = "Neukládat"
 "Don't truncate" = "Nezkracovat"
 "Done" = "Hotovo"
 "Done editing" = "Dokončit úpravy"
@@ -423,6 +445,8 @@ status = "draft — needs native review"
 "Effect settings" = "Nastavení efektu"
 "Effect styles" = "Styly efektů"
 "Effects" = "Efekty"
+"Curved" = "Zakřivená"
+"Elbow" = "Lomená"
 "Ellipse" = "Elipsa"
 "Ellipses" = "Elipsy"
 "Else" = "Jinak"
@@ -431,6 +455,7 @@ status = "draft — needs native review"
 "Empty" = "Prázdné"
 "End" = "Konec"
 "End point" = "Koncový bod"
+"End vote" = "Ukončit hlasování"
 "Ends the session; everyone keeps their copy" = "Ukončí relaci; každý si ponechá svou kopii"
 "Enter" = "Enter"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Zadejte adresu serveru figcraft-server a stisknutím Procházet zobrazte nabízené pluginy."
@@ -472,6 +497,7 @@ status = "draft — needs native review"
 "False" = "Nepravda"
 "Feb" = "února"
 "Fetching from the server…" = "Stahování ze serveru…"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft zatím nepodporuje všechny funkce těchto souborů. Poznámky uvádějí, co bylo v importované kopii vynecháno nebo změněno; původní soubor zůstává beze změny."
 "File" = "Soubor"
 "File name" = "Název souboru"
 "File not found" = "Soubor nenalezen"
@@ -505,6 +531,7 @@ status = "draft — needs native review"
 "Flip text to the other side" = "Převrátit text na druhou stranu"
 "Flip vertical" = "Převrátit svisle"
 "Flip width profile" = "Převrátit profil šířky"
+"Flow chart" = "Vývojový diagram"
 "Flow starting point" = "Počáteční bod toku"
 "Flow starting points" = "Počáteční body toků"
 "Flows" = "Toky"
@@ -557,6 +584,7 @@ status = "draft — needs native review"
 "Hanging list" = "Předsazený seznam"
 "Hanging punctuation" = "Předsazená interpunkce"
 "Hard light" = "Tvrdé světlo"
+"Heart" = "Srdce"
 "Height" = "Výška"
 "Help" = "Nápověda"
 "Help and resources" = "Nápověda a zdroje"
@@ -569,6 +597,7 @@ status = "draft — needs native review"
 "Hide these tips (Getting started in the Help menu shows them again)" = "Skrýt tyto tipy (znovu je zobrazíte volbou Začínáme v nabídce Nápověda)"
 "Hide when publishing" = "Skrýt při publikování"
 "Highlight layers on hover" = "Zvýraznit vrstvy pod ukazatelem"
+"Highlighter" = "Zvýrazňovač"
 "Highlights" = "Světla"
 "Hold Alt" = "Podržte Alt"
 "Hold Alt+Z" = "Podržte Alt+Z"
@@ -594,12 +623,16 @@ status = "draft — needs native review"
 "If" = "Pokud"
 "If {condition}" = "Pokud {condition}"
 "Ignore auto layout (absolute position)" = "Ignorovat automatické rozvržení (absolutní poloha)"
+"Ignore overlapping layers" = "Ignorovat překrývající se vrstvy"
 "Image" = "Obrázek"
+"Images" = "Obrázky"
 "Import" = "Import"
 "Import path" = "Cesta importu"
 "Import plugin from manifest" = "Importovat plugin z manifestu"
 "Import plugin from manifest…" = "Importovat plugin z manifestu…"
+"Import report" = "Zpráva o importu"
 "Import variables" = "Importovat proměnné"
+"Imported document" = "Importovaný dokument"
 "Imported {name}" = "Importováno: {name}"
 "Imported {n} new variables, updated {updated}" = { one = "Importována {n} nová proměnná, aktualizováno: {updated}", few = "Importovány {n} nové proměnné, aktualizováno: {updated}", other = "Importováno {n} nových proměnných, aktualizováno: {updated}" }
 "Import…" = "Importovat…"
@@ -627,11 +660,13 @@ status = "draft — needs native review"
 "Instance swap (no other component)" = "Výměna instance (žádná jiná komponenta)"
 "Instances" = "Instance"
 "Instant" = "Okamžitě"
+"Intensity" = "Intenzita"
 "Interaction" = "Interakce"
 "Interactions" = "Interakce"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Návrh rozhraní a prototypování. Svobodný nástroj s otevřeným zdrojovým kódem, napsaný od základu v jazyce Rust nezávisle na kódu jiných produktů. Součást sady ArtCraft Crafting Apps."
 "Intersect" = "Průnik"
 "Intersects" = "Průniky"
+"Invalid color" = "Neplatná barva"
 "Invite link" = "Odkaz s pozvánkou"
 "Invite link copied" = "Odkaz s pozvánkou zkopírován"
 "It asks permission to:" = "Žádá o oprávnění:"
@@ -650,6 +685,8 @@ status = "draft — needs native review"
 "Jun" = "června"
 "Just now" = "Právě teď"
 "Justify" = "Do bloku"
+"Kanban board" = "Kanbanová tabule"
+"Keep a measurement on the canvas for developers" = "Ponechat měření na plátně pro vývojáře"
 "Keep appearance" = "Zachovat vzhled"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Zachovat vzhled převede všechny hodnoty barev do profilu {profile}, aby barvy vypadaly stejně. Zachovat hodnoty ponechá čísla beze změny, takže se barvy posunou."
 "Keep tool selected after use" = "Po použití ponechat nástroj vybraný"
@@ -729,6 +766,7 @@ status = "draft — needs native review"
 "Mark as resolved" = "Označit jako vyřešené"
 "Mark as unread" = "Označit jako nepřečtené"
 "Mark as unresolved" = "Označit jako nevyřešené"
+"Marker" = "Fix"
 "Mask" = "Maska"
 "Mass · Stiffness · Damping" = "Hmotnost · Tuhost · Tlumení"
 "Match (empty: the whole name)" = "Hledaný text (prázdné: celý název)"
@@ -738,6 +776,7 @@ status = "draft — needs native review"
 "Maximize" = "Maximalizovat"
 "May" = "května"
 "Measure to the selection" = "Měřit k výběru"
+"Measurements" = "Měření"
 "Merge into main" = "Sloučit do hlavního souboru"
 "Merge regions" = "Sloučit oblasti"
 "Merge the branch into the main file (one undo step) and archive it" = "Sloučit větev do hlavního souboru (jeden krok zpět) a archivovat ji"
@@ -746,6 +785,7 @@ status = "draft — needs native review"
 "Min H" = "Min. V"
 "Min W" = "Min. Š"
 "Minimize" = "Minimalizovat"
+"Minutes" = "Minuty"
 "Mirror angle" = "Zrcadlit úhel"
 "Mirror angle and length" = "Zrcadlit úhel a délku"
 "Mirroring" = "Zrcadlení"
@@ -787,8 +827,10 @@ status = "draft — needs native review"
 "Named instance" = "Pojmenovaná instance"
 "Navigate to" = "Přejít na"
 "Nested instance" = "Vnořená instance"
+"New board" = "Nová tabule"
 "New design file" = "Nový soubor návrhu"
 "Newest first" = "Od nejnovějších"
+"Next frame" = "Další rámec"
 "Next or previous control in the focused region" = "Další nebo předchozí ovládací prvek v zaměřené oblasti"
 "Next ready for dev" = "Další připravené pro vývoj"
 "Next size option" = "Další možnost velikosti"
@@ -798,12 +840,15 @@ status = "draft — needs native review"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "Žádné větve. Větev je kopie souboru pro vyzkoušení změn, které pak zkontrolujete a sloučíte."
 "No category" = "Bez kategorie"
 "No changes" = "Žádné změny"
+"No color styles" = "Žádné barevné styly"
 "No colour variables fit here." = "Žádné vhodné barevné proměnné."
 "No colour variables yet. Create them in Local variables." = "Zatím žádné barevné proměnné. Vytvořte je v Místních proměnných."
 "No comments yet" = "Zatím žádné komentáře"
+"No compatibility warnings reported" = "Nebyla hlášena žádná upozornění na kompatibilitu"
 "No components yet. Select layers and press {keys}." = "Zatím žádné komponenty. Vyberte vrstvy a stiskněte {keys}."
 "No conflicts." = "Žádné konflikty."
 "No contributor data was built into this copy." = "Toto sestavení neobsahuje údaje o přispěvatelích."
+"No device" = "Bez zařízení"
 "No fonts match" = "Žádná odpovídající písma"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Kód pro připojení není dostupný (server kódy nepodporuje nebo tuto adresu nelze do kódu vložit): sdílejte odkaz."
 "No layer changes to show." = "Žádné změny vrstev k zobrazení."
@@ -835,6 +880,7 @@ status = "draft — needs native review"
 "No text styles yet. Click + to create one from the selected text." = "Zatím žádné textové styly. Kliknutím na + vytvoříte styl z vybraného textu."
 "No variables fit here." = "Žádné vhodné proměnné."
 "No variables yet. Create them in Local variables." = "Zatím žádné proměnné. Vytvořte je v Místních proměnných."
+"No votes yet" = "Zatím žádné hlasy"
 "Nobody else is here yet" = "Zatím tu není nikdo další"
 "Noise" = "Šum"
 "None" = "Žádné"
@@ -884,6 +930,7 @@ status = "draft — needs native review"
 "Open branch" = "Otevřít větev"
 "Open file" = "Otevřít soubor"
 "Open files" = "Otevřít soubory"
+"Open presentations" = "Otevřené prezentace"
 "Open in focus view" = "Otevřít v zaměřeném pohledu"
 "Open in new window" = "Otevřít v novém okně"
 "Open invite links in FigCraft" = "Otevírat odkazy s pozvánkou v aplikaci FigCraft"
@@ -892,6 +939,7 @@ status = "draft — needs native review"
 "Open overlay" = "Otevřít překryv"
 "Open prototype preview" = "Otevřít náhled prototypu"
 "Open variables ({count})" = "Otevřít proměnné ({count})"
+"Opened as a new document" = "Otevřeno jako nový dokument"
 "Opened “{name}” in a new tab" = "Soubor „{name}“ otevřen v nové kartě"
 "Open|comments" = "Otevřené"
 "Options" = "Možnosti"
@@ -915,7 +963,12 @@ status = "draft — needs native review"
 "PDF print settings" = "Nastavení tisku PDF"
 "Padding" = "Vnitřní odsazení"
 "Page" = "Stránka"
+"Page deleted" = "Stránka smazána"
 "Pages" = "Stránky"
+"Pages added to the document" = "Stránky přidány do dokumentu"
+"Pause" = "Pozastavit"
+"Pink" = "Růžová"
+"Placed on the current page" = "Umístěno na aktuální stránku"
 "Pages: {pages}" = "Stránky: {pages}"
 "Paint bucket" = "Plechovka barvy"
 "Pan the canvas" = "Posunout plátno"
@@ -930,6 +983,7 @@ status = "draft — needs native review"
 "Paste a team library link (a view link)" = "Vložte odkaz na týmovou knihovnu (odkaz pro prohlížení)"
 "Paste here" = "Vložit sem"
 "Paste to replace" = "Vložit a nahradit"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Vloženy vrstvy návrhu; vynechán {n} druh obsahu", few = "Vloženy vrstvy návrhu; vynechány {n} druhy obsahu", other = "Vloženy vrstvy návrhu; vynecháno {n} druhů obsahu" }
 "Pattern" = "Vzor"
 "Pattern alignment" = "Zarovnání vzoru"
 "Pattern scale" = "Měřítko vzoru"
@@ -956,6 +1010,7 @@ status = "draft — needs native review"
 "Plugins" = "Pluginy"
 "Plus darker" = "Sčítání se ztmavením"
 "Plus lighter" = "Sčítání se zesvětlením"
+"Plus one" = "Plus jedna"
 "Point" = "Bod"
 "Points" = "Body"
 "Polygon" = "Mnohoúhelník"
@@ -983,6 +1038,7 @@ status = "draft — needs native review"
 "Preview" = "Náhled"
 "Preview this flow" = "Náhled tohoto toku"
 "Preview this frame" = "Náhled tohoto rámce"
+"Previous frame" = "Předchozí rámec"
 "Previous ready for dev" = "Předchozí připravené pro vývoj"
 "Progressive" = "Postupné"
 "Properties" = "Vlastnosti"
@@ -1003,6 +1059,7 @@ status = "draft — needs native review"
 "Push" = "Vytlačení"
 "Push changes to main component" = "Přenést změny do hlavní komponenty"
 "Put text on path" = "Umístit text na cestu"
+"Question" = "Otázka"
 "R" = "R"
 "Radial" = "Kruhový"
 "Radius" = "Poloměr"
@@ -1020,10 +1077,12 @@ status = "draft — needs native review"
 "Reduce motion" = "Omezit pohyb"
 "Refraction" = "Lom světla"
 "Regular expression" = "Regulární výraz"
+"Relative to" = "Vzhledem k"
 "Remove" = "Odebrat"
 "Remove all" = "Odebrat vše"
 "Remove annotation" = "Odebrat anotaci"
 "Remove auto layout" = "Odebrat automatické rozvržení"
+"Remove column" = "Odebrat sloupec"
 "Remove dev resource" = "Odebrat zdroj pro vývojáře"
 "Remove export setting" = "Odebrat nastavení exportu"
 "Remove from recents" = "Odebrat z nedávných"
@@ -1032,10 +1091,12 @@ status = "draft — needs native review"
 "Remove guide" = "Odebrat vodítko"
 "Remove interaction" = "Odebrat interakci"
 "Remove library from this file" = "Odebrat knihovnu z tohoto souboru"
+"Remove measurement" = "Odebrat měření"
 "Remove min and max" = "Odebrat minimum a maximum"
 "Remove min and max height" = "Odebrat minimální a maximální výšku"
 "Remove min and max width" = "Odebrat minimální a maximální šířku"
 "Remove regions" = "Odebrat oblasti"
+"Remove row" = "Odebrat řádek"
 "Remove slot" = "Odebrat slot"
 "Remove starting point" = "Odebrat počáteční bod"
 "Remove stop" = "Odebrat zarážku"
@@ -1076,6 +1137,7 @@ status = "draft — needs native review"
 "Resize by the nudge amount" = "Změnit velikost o velikost posunu"
 "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Přizpůsobit velikost rámců obrazovce zařízení (nebo oknu bez zařízení): omezení a automatické rozvržení se přizpůsobí"
 "Resize to fit" = "Přizpůsobit velikost obsahu"
+"Resizing" = "Změna velikosti"
 "Resolve" = "Vyřešit"
 "Resolve change" = "Vyřešit změnu"
 "Resolved" = "Vyřešené"
@@ -1086,6 +1148,9 @@ status = "draft — needs native review"
 "Restore main component" = "Obnovit hlavní komponentu"
 "Restore this version" = "Obnovit tuto verzi"
 "Restored “{name}”" = "Obnoveno: „{name}“"
+"Retrospective" = "Retrospektiva"
+"Results" = "Výsledky"
+"Resume" = "Pokračovat"
 "Reverse the order" = "Obrátit pořadí"
 "Reversed triangle" = "Obrácený trojúhelník"
 "Review and merge" = "Zkontrolovat a sloučit"
@@ -1101,6 +1166,7 @@ status = "draft — needs native review"
 "Rotation jitter" = "Náhodná odchylka natočení"
 "Round" = "Kulatý"
 "Rounded" = "Zaoblený"
+"Rounded rectangle" = "Zaoblený obdélník"
 "Row" = "Řádek"
 "Row gap" = "Mezera mezi řádky"
 "Row sizes" = "Velikosti řádků"
@@ -1110,6 +1176,7 @@ status = "draft — needs native review"
 "Rulers" = "Pravítka"
 "Run" = "Spustit"
 "Run {label}" = "Spustit {label}"
+"Save file" = "Uložit soubor"
 "Search templates" = "Hledat šablony"
 "See all templates" = "Zobrazit všechny šablony"
 "Select layers and they space themselves as their content changes" = "Vyberte vrstvy a jejich rozestupy se přizpůsobí změnám obsahu"
@@ -1149,12 +1216,14 @@ status = "draft — needs native review"
 "Select all with same" = "Vybrat vše se stejným"
 "Select layer" = "Vybrat vrstvu"
 "Select layers to apply the style to" = "Vyberte vrstvy, na které chcete použít styl"
+"Select layers with this color" = "Vybrat vrstvy s touto barvou"
 "Select overlapping shapes" = "Vyberte překrývající se tvary"
 "Select points to edit their position, radius and mirroring" = "Vyberte body a upravte jejich polohu, poloměr a zrcadlení"
 "Select slot" = "Vybrat slot"
 "Selection" = "Výběr"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Rámeček výběru, {w} × {h} na pozici {x}, {y}: šipky posouvají, Shift+šipky nebo {cmd}+šipky mění velikost, Enter vybere, Escape zruší"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Rámeček výběru: šipky posouvají, Shift+šipky nebo {cmd}+šipky mění velikost, Enter vybere, Escape zruší"
+"Selection colors" = "Barvy výběru"
 "Send backward" = "Přesunout o úroveň níž"
 "Send report" = "Odeslat hlášení"
 "Send to back" = "Přesunout do pozadí"
@@ -1171,6 +1240,7 @@ status = "draft — needs native review"
 "Shape" = "Tvar"
 "Shape builder" = "Tvorba tvarů"
 "Shape tools" = "Nástroje tvarů"
+"Shapes" = "Tvary"
 "Share" = "Sdílet"
 "Share this file" = "Sdílet tento soubor"
 "Share with a code" = "Sdílet pomocí kódu"
@@ -1237,10 +1307,13 @@ status = "draft — needs native review"
 "Space+drag" = "Mezerník+tažení"
 "Spacing" = "Rozestupy"
 "Spam, stolen work, abuse…" = "Spam, odcizená práce, zneužití…"
+"Speech bubble" = "Bublina"
 "Splay" = "Rozevření"
 "Spotlight me" = "Sdílet můj pohled"
 "Spread" = "Rozšíření"
 "Square" = "Čtverec"
+"Stamp" = "Razítko"
+"Stamps" = "Razítka"
 "Standard" = "Standardní"
 "Standard ligatures" = "Standardní ligatury"
 "Star" = "Hvězda"
@@ -1253,15 +1326,22 @@ status = "draft — needs native review"
 "Start point" = "Počáteční bod"
 "Start sharing" = "Zahájit sdílení"
 "Start sharing with the Share button, then pass on the code it gives" = "Zahajte sdílení tlačítkem Sdílet a předejte získaný kód"
+"Start vote" = "Zahájit hlasování"
 "Starting to share…" = "Zahajování sdílení…"
 "Status" = "Stav"
 "Sticky" = "Přichycené"
+"Sticky note" = "Lepicí poznámka"
+"Sticky note colors" = "Barvy lepicích poznámek"
+"Sticky notes" = "Lepicí poznámky"
+"Sticky notes, shapes and connectors" = "Lepicí poznámky, tvary a spojnice"
 "Stop" = "Zastavit"
 "Stop following {name}" = "Přestat sledovat: {name}"
 "Stop session" = "Ukončit relaci"
 "Stop sharing" = "Zastavit sdílení"
 "Stop spotlighting" = "Ukončit sdílení pohledu"
+"Stop timer" = "Zastavit časovač"
 "Stop {n}  {hex}" = "Zarážka {n}  {hex}"
+"Straight" = "Rovná"
 "Stretch" = "Roztáhnout"
 "Strikethrough" = "Přeškrtnutí"
 "String" = "Textový řetězec"
@@ -1306,6 +1386,7 @@ status = "draft — needs native review"
 "Text" = "Text"
 "Text align" = "Zarovnání textu"
 "Text content" = "Textový obsah"
+"Text size" = "Velikost textu"
 "Text style" = "Textový styl"
 "Text styles" = "Textové styly"
 "Texts" = "Texty"
@@ -1336,13 +1417,16 @@ status = "draft — needs native review"
 "This server is open to the public: no key needed." = "Tento server je veřejný: klíč není potřeba."
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Tento server vyžaduje klíč: přidejte do adresy ?key=… (příkaz `figcraft-server key` ho vypíše na počítači serveru)."
 "This server takes files only with its key: see Advanced." = "Tento server přijímá soubory pouze s klíčem: viz Pokročilé."
+"Thumbs up" = "Palec nahoru"
 "Tidy up" = "Uspořádat"
 "Tile" = "Dlaždice"
 "Tile type" = "Typ dlaždic"
+"Timer" = "Časovač"
 "Tint" = "Tónování"
 "Title" = "Název"
 "Title case" = "Velká počáteční písmena slov"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Chcete-li sdílet tuto knihovnu s týmem, publikujte soubor na server (Sdílet ▸ Publikovat na server…) a pak tam publikujte knihovnu."
+"To the layer around it" = "K vrstvě, která ji obsahuje"
 "Toggle" = "Přepnout"
 "Toggle light/dark theme" = "Přepnout světlý/tmavý motiv"
 "Toggle visibility" = "Přepnout viditelnost"
@@ -1352,8 +1436,10 @@ status = "draft — needs native review"
 "Top left radius" = "Poloměr levého horního rohu"
 "Top right radius" = "Poloměr pravého horního rohu"
 "Transform" = "Transformace"
+"Triangle" = "Trojúhelník"
 "Triangle arrow" = "Trojúhelníková šipka"
 "Trigger" = "Spouštěč"
+"Trigger layer" = "Spouštěcí vrstva"
 "True" = "Pravda"
 "Truncate text" = "Zkrátit text"
 "Truncate with an ellipsis" = "Zkrátit výpustkou"
@@ -1376,7 +1462,7 @@ status = "draft — needs native review"
 "Unread" = "Nepřečtené"
 "Unresolve" = "Znovu otevřít"
 "Unsaved changes" = "Neuložené změny"
-"Unsaved changes in {names}. Close the window and lose them?" = "Neuložené změny v {names}. Zavřít okno a zahodit je?"
+"Unsaved changes in {names}. Save them before closing?" = "Neuložené změny v {names}. Uložit je před zavřením?"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Neuložené změny: nejprve uložte ({save}) nebo zavřete kartu kliknutím s {alt} a zahoďte je"
 "Unsaved changes: save first, or close again with {key} to discard" = "Neuložené změny: nejprve uložte nebo zavřete znovu s {key} a zahoďte je"
 "Up" = "Nahoru"
@@ -1393,6 +1479,7 @@ status = "draft — needs native review"
 "Use as mask" = "Použít jako masku"
 "Use auto layout" = "Použít automatické rozvržení"
 "Use number keys for opacity" = "Nastavovat krytí číselnými klávesami"
+"Use the .figcraft or .fig extension." = "Použijte příponu .figcraft nebo .fig."
 "Use the layer's fill" = "Použít výplň vrstvy"
 "Used in {files} · {instances}" = "Použití – {files} · {instances}"
 "Username" = "Uživatelské jméno"
@@ -1428,6 +1515,8 @@ status = "draft — needs native review"
 "Visibility" = "Viditelnost"
 "Visible" = "Viditelné"
 "Vivid" = "Živé"
+"Votes per person" = "Hlasů na osobu"
+"Voting session" = "Hlasování"
 "Warm" = "Teplé"
 "Watch" = "Hodinky"
 "Wavy" = "Vlnitý"
@@ -1436,6 +1525,7 @@ status = "draft — needs native review"
 "WebSocket URL" = "URL WebSocketu"
 "WebSocket URL copied" = "URL WebSocketu zkopírována"
 "Wedge" = "Klín"
+"Weekly planner" = "Týdenní plán"
 "Weight" = "Tloušťka"
 "What you try here changes this preview and the code below, not the file" = "Zdejší zkoušení mění tento náhled a kód níže, soubor zůstává beze změny"
 "What changed since it was marked ready for dev" = "Co se změnilo od označení jako připravené pro vývoj"
@@ -1446,6 +1536,7 @@ status = "draft — needs native review"
 "While pressing" = "Při stisku"
 "White" = "Bílá"
 "Who runs it, its terms and how long it keeps files" = "Kdo ho provozuje, jeho podmínky a doba uchovávání souborů"
+"Whole screen" = "Celá obrazovka"
 "Why it changed" = "Důvod změny"
 "Widgets" = "Widgety"
 "Width" = "Šířka"
@@ -1485,26 +1576,121 @@ status = "draft — needs native review"
 "call any command its access allows" = "volat libovolný příkaz povolený jeho oprávněními"
 "call only: {commands}" = "volat pouze: {commands}"
 "can edit the document" = "může upravovat dokument"
+"can save files" = "může ukládat soubory"
+"conditional prototype actions nested too deeply were skipped" = "podmíněné akce prototypu vnořené příliš hluboko byly přeskočeny"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "podmíněné akce prototypu s podmínkami, které nelze vyhodnotit, byly přeskočeny"
+"connector label background was skipped: style data is missing" = "pozadí popisku spojnice bylo přeskočeno: chybí data stylu"
+"connector label was skipped: background bounds are invalid" = "popisek spojnice byl přeskočen: hranice pozadí jsou neplatné"
+"connector label was skipped: background transform is invalid" = "popisek spojnice byl přeskočen: transformace pozadí je neplatná"
+"connector label was skipped: composed text transform is invalid" = "popisek spojnice byl přeskočen: složená transformace textu je neplatná"
+"connector label was skipped: derived background bounds are missing" = "popisek spojnice byl přeskočen: chybí odvozené hranice pozadí"
+"connector label was skipped: derived text bounds are missing" = "popisek spojnice byl přeskočen: chybí odvozené hranice textu"
+"connector label was skipped: text bounds are invalid" = "popisek spojnice byl přeskočen: hranice textu jsou neplatné"
+"connector label was skipped: text style data is missing" = "popisek spojnice byl přeskočen: chybí data stylu textu"
+"connector label was skipped: text transform is invalid" = "popisek spojnice byl přeskočen: transformace textu je neplatná"
+"connector labels were skipped" = "popisky spojnic byly přeskočeny"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "vrstvy spojnic se importují jako statické snímky rámců nebo vektorů, s popisky, pokud existují; živé vazby koncových bodů se nezachovávají"
+"connector snapshot vector data is missing; connector was left empty" = "chybí vektorová data snímku spojnice; spojnice zůstala prázdná"
+"connectors whose ends can't be placed are empty" = "spojnice, jejichž konce nelze umístit, jsou prázdné"
 "crop marks" = "ořezové značky"
+"damaged vector geometry was skipped" = "poškozená vektorová geometrie byla přeskočena"
+"damaged vector networks import as outlines" = "poškozené vektorové sítě se importují jako obrysy"
 "development: {path}" = "vývoj: {path}"
+"document children other than pages were skipped" = "potomci dokumentu, kteří nejsou stránkami, byli přeskočeni"
+"duplicate grid track sizing entries use equal tracks" = "duplicitní položky velikosti stop mřížky používají stejně velké stopy"
 "e.g. count + 1" = "např. count + 1"
 "e.g. count >= 3 and not done" = "např. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "lomené a zakřivené spojnice bez uložené cesty se importují jako přímky"
+"entries without a node type were skipped" = "položky bez typu uzlu byly přeskočeny"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "Odkazy figcraft:// z prohlížeče, chatu nebo e-mailu otevřou tuto aplikaci a připojí k relaci."
+"filled areas of a vector with their own fill use the layer's fill" = "vyplněné oblasti vektoru s vlastní výplní používají výplň vrstvy"
 "from {server}" = "ze serveru {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "spouštěče herního ovladače bez právě jednoho známého tlačítka ovladače byly přeskočeny"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "seznam stop mřížky přesahuje 1000 položek; stopy používají výchozí stejnou velikost"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "velikost stop mřížky není podporována nebo je poškozená; dotčené stopy mají stejnou velikost"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "seznam velikostí stop mřížky přesahuje 1000 položek; stopy používají výchozí stejnou velikost"
 "hidden" = "skryté"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "filtry obrázku jsou nejednoznačné, protože jsou přítomny oba kontejnery filtrů; převod filtrů byl přeskočen"
+"image filters use FigCraft's approximate renderer" = "filtry obrázku používají přibližné vykreslování FigCraftu"
+"instance swap properties whose default component isn't in the file were skipped" = "vlastnosti výměny instance, jejichž výchozí komponenta není v souboru, byly přeskočeny"
+"instances inside their own main component were imported as frames" = "instance uvnitř vlastní hlavní komponenty byly importovány jako rámce"
+"instances of components that aren't in the file show no layers" = "instance komponent, které nejsou v souboru, nezobrazují žádné vrstvy"
+"instances of components that aren't in the file were imported as frames" = "instance komponent, které nejsou v souboru, byly importovány jako rámce"
+"instances that would nest a component inside itself were imported as frames" = "instance, které by vnořily komponentu samu do sebe, byly importovány jako rámce"
+"instances without a main component were imported as empty frames" = "instance bez hlavní komponenty byly importovány jako prázdné rámce"
+"invalid internal .fig text path data was ignored" = "neplatná interní data textu na cestě ze souboru .fig byla ignorována"
+"invalid or oversized vector networks import as outlines" = "neplatné nebo příliš velké vektorové sítě se importují jako obrysy"
+"invalid or oversized vector path data was skipped" = "neplatná nebo příliš velká data vektorových cest byla přeskočena"
 "just now" = "právě teď"
+"key triggers without a supported key were skipped" = "spouštěče kláves bez podporované klávesy byly přeskočeny"
+"key up triggers import as key presses" = "spouštěče uvolnění klávesy se importují jako stisky klávesy"
+"layers without a position were placed at their parent's origin" = "vrstvy bez pozice byly umístěny do počátku nadřazeného prvku"
+"layers without a type were skipped" = "vrstvy bez typu byly přeskočeny"
+"legacy image filter container is unsupported; filter conversion was skipped" = "starší kontejner filtrů obrázku není podporován; převod filtrů byl přeskočen"
 "locked" = "zamknuté"
+"malformed image filters container was skipped" = "poškozený kontejner filtrů obrázku byl přeskočen"
+"malformed image paintFilter container was skipped" = "poškozený kontejner paintFilter obrázku byl přeskočen"
+"malformed slot content assignment was skipped" = "poškozené přiřazení obsahu slotu bylo přeskočeno"
 "no bleed" = "bez spadávky"
 "nobody else here yet" = "zatím tu není nikdo další"
+"non-default slot settings are not represented and were skipped" = "jiná než výchozí nastavení slotů nelze znázornit a byla přeskočena"
 "now" = "nyní"
+"offer files to save if it asks to (you choose where each one goes)" = "nabízet soubory k uložení, pokud o to požádá (kam který půjde, vyberete vy)"
 "or" = "nebo"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "spojení tahu v bodech byla zachována; přerušované tahy a tahy s proměnnou šířkou se kreslí se spojením vrstvy"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "klíče preferovaných komponent slotů nelze přiřadit k vrstvám souboru, byly přeskočeny"
+"prototype actions of unknown types were skipped" = "akce prototypu neznámých typů byly přeskočeny"
+"prototype actions without a destination in the file were skipped" = "akce prototypu bez cíle v souboru byly přeskočeny"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "výrazy prototypu s proměnnými, které nejsou v JSON proměnných, byly přeskočeny"
+"prototype expressions with unsupported functions were skipped" = "výrazy prototypu s nepodporovanými funkcemi byly přeskočeny"
+"prototype interactions without supported actions were skipped" = "interakce prototypu bez podporovaných akcí byly přeskočeny"
+"prototype navigations of unknown types were skipped" = "navigace prototypu neznámých typů byly přeskočeny"
+"prototype transitions of unknown types play instantly" = "přechody prototypu neznámých typů proběhnou okamžitě"
+"prototype triggers of unknown types were skipped" = "spouštěče prototypu neznámých typů byly přeskočeny"
 "put a widget on the canvas" = "umístit widget na plátno"
 "read and edit the document" = "číst a upravovat dokument"
 "read the document" = "číst dokument"
 "reads the document" = "čte dokument"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "akce nastavení proměnné u proměnných, které nejsou v JSON proměnných, byly přeskočeny"
+"set-variable actions with values that can't be evaluated were skipped" = "akce nastavení proměnné s hodnotami, které nelze vyhodnotit, byly přeskočeny"
+"set-variable actions with values that don't fit the variable were skipped" = "akce nastavení proměnné s hodnotami, které neodpovídají proměnné, byly přeskočeny"
+"set-variable actions without a value were skipped" = "akce nastavení proměnné bez hodnoty byly přeskočeny"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "akce nastavení režimu proměnných u kolekcí nebo režimů, které nejsou v JSON proměnných, byly přeskočeny"
+"slot content assignment target is missing or is not slot content" = "cíl přiřazení obsahu slotu chybí nebo není obsahem slotu"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "přiřazení obsahu slotu používá prázdné GUID jako zarážku a bylo přeskočeno"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "některé vektorové body odkazují na nastavení bodů, která v souboru chybí; používají spojení vrstvy a nezaoblené rohy"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "některé vektorové segmenty odkazují na nastavení stylu, která v souboru chybí; používají tah vrstvy"
+"stale or invalid grid track sizing entries were ignored" = "zastaralé nebo neplatné položky velikosti stop mřížky byly ignorovány"
+"stars and polygons without point counts or geometry use the default point count" = "hvězdy a mnohoúhelníky bez počtu bodů nebo geometrie používají výchozí počet bodů"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "nastavení stylu některých vektorových segmentů nejsou podporována; tyto segmenty používají tah vrstvy"
+"text path underline or strikethrough decoration is not rendered" = "podtržení ani přeškrtnutí textu na cestě se nevykresluje"
+"text style overrides refer to missing table entries" = "přepsání textových stylů odkazují na chybějící položky tabulky"
+"the file has no pages" = "soubor nemá žádné stránky"
 "the plugin" = "plugin"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "JSON proměnných nemá `variableCollections` (očekávala se odpověď s místními proměnnými) a byl ignorován"
 "this session only" = "pouze v této relaci"
+"unknown component property types were skipped" = "neznámé typy vlastností komponent byly přeskočeny"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "aliasy na proměnné, které nejsou v JSON proměnných (nebo jsou jiného typu), byly přeskočeny"
+"variable bindings to properties the layer doesn't have were skipped" = "vazby proměnných na vlastnosti, které vrstva nemá, byly přeskočeny"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "vazby na proměnné, které nejsou v JSON proměnných (proměnné knihovny), byly přeskočeny"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "vazby proměnných byly přeskočeny: JSON souboru nemá definice proměnných (předejte JSON místních proměnných jako `variables` nebo vložte jeho `meta` vedle JSON souboru)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "vazby proměnných, jejichž typ neodpovídá vlastnosti, byly přeskočeny"
+"variable collections without modes were skipped" = "kolekce proměnných bez režimů byly přeskočeny"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "vyhledání režimu proměnné ve výrazech prototypu, které nejsou proměnnou a jedním z jejích režimů, byla přeskočena"
+"variable modes of collections that aren't in the file were skipped" = "režimy proměnných kolekcí, které nejsou v souboru, byly přeskočeny"
+"variable modes of collections that aren't in the variables JSON were skipped" = "režimy proměnných kolekcí, které nejsou v JSON proměnných, byly přeskočeny"
+"variable values that don't match their type (or composed colours) were skipped" = "hodnoty proměnných, které neodpovídají svému typu (nebo složené barvy), byly přeskočeny"
+"variables of unknown types were skipped" = "proměnné neznámých typů byly přeskočeny"
+"variables whose collection isn't in the variables JSON were skipped" = "proměnné, jejichž kolekce není v JSON proměnných, byly přeskočeny"
+"variables without readable values were skipped" = "proměnné bez čitelných hodnot byly přeskočeny"
+"vector points with unknown stroke joins use the layer join" = "vektorové body s neznámým spojením tahu používají spojení vrstvy"
+"vectors without geometry are empty" = "vektory bez geometrie jsou prázdné"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "vektory bez geometrie jsou prázdné (exportujte JSON souboru s geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "velmi dlouhý text byl zkrácen na 1 048 576 znaků"
+"very long vector paths were skipped" = "velmi dlouhé vektorové cesty byly přeskočeny"
+"video actions are not supported and were skipped" = "akce videa nejsou podporovány a byly přeskočeny"
+"video triggers are not supported and were skipped" = "spouštěče videa nejsou podporovány a byly přeskočeny"
 "yesterday" = "včera"
 "{instances} in {files}" = "{instances} · {files}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}: návrh překladu, čeká na kontrolu rodilým mluvčím."
@@ -1514,6 +1700,7 @@ status = "draft — needs native review"
 "{name} is forgotten on this computer; the file stays on {server}" = "Zapomenuto v tomto počítači: {name}; soubor zůstává na serveru {server}"
 "{name} is on the server." = "{name} je na serveru."
 "{name} is spotlighting" = "{name} sdílí pohled"
+"{name} is too large to open in the browser (over 512 MB)." = "Soubor {name} je příliš velký na otevření v prohlížeči (více než 512 MB)."
 "{name}\nClick to apply to the selection" = "{name}\nKliknutím použijete na výběr"
 "{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nPřetáhněte na plátno nebo kliknutím umístěte doprostřed zobrazení.\nPři puštění na instanci podržte Alt (Option) a vyměňte ji."
 "{name} (from {library})" = "{name} (z {library})"
@@ -1547,8 +1734,10 @@ status = "draft — needs native review"
 "{n} layers selected" = { one = "Vybrána {n} vrstva", few = "Vybrány {n} vrstvy", other = "Vybráno {n} vrstev" }
 "{n} layers · {parts}" = { one = "{n} vrstva · {parts}", few = "{n} vrstvy · {parts}", other = "{n} vrstev · {parts}" }
 "{n} matches" = { one = "{n} shoda", few = "{n} shody", other = "{n} shod" }
+"{n} min" = "{n} min"
 "{n} minutes ago" = { one = "Před {n} minutou", few = "Před {n} minutami", other = "Před {n} minutami" }
 "{n} months ago" = { one = "Před {n} měsícem", few = "Před {n} měsíci", other = "Před {n} měsíci" }
+"{n} more notes omitted from this report" = { one = "{n} další poznámka v této zprávě vynechána", few = "{n} další poznámky v této zprávě vynechány", other = "{n} dalších poznámek v této zprávě vynecháno" }
 "{n} of {total}" = "{n} z {total}"
 "{n} people joined" = { one = "Připojila se {n} osoba", few = "Připojily se {n} osoby", other = "Připojilo se {n} osob" }
 "{n} preferred components" = { one = "{n} preferovaná komponenta", few = "{n} preferované komponenty", other = "{n} preferovaných komponent" }
@@ -1558,6 +1747,8 @@ status = "draft — needs native review"
 "{n} rows" = { one = "{n} řádek", few = "{n} řádky", other = "{n} řádků" }
 "{n} styles" = { one = "{n} styl", few = "{n} styly", other = "{n} stylů" }
 "{n} variables" = { one = "{n} proměnná", few = "{n} proměnné", other = "{n} proměnných" }
+"{n} votes" = { one = "{n} hlas", few = "{n} hlasy", other = "{n} hlasů" }
+"{n} votes left" = { one = "Zbývá {n} hlas", few = "Zbývají {n} hlasy", other = "Zbývá {n} hlasů" }
 "{n} weeks ago" = { one = "Před {n} týdnem", few = "Před {n} týdny", other = "Před {n} týdny" }
 "{n} years ago" = { one = "Před {n} rokem", few = "Před {n} lety", other = "Před {n} lety" }
 "{n}d" = "{n} d"
@@ -1608,7 +1799,26 @@ status = "draft — needs native review"
 "arrange.packH" = "Rozmístit těsně vodorovně"
 "arrange.packV" = "Rozmístit těsně svisle"
 "arrange.roundToPixels" = "Zaokrouhlit na pixely"
+"arrange.spacing" = "Rozestupy"
 "arrange.tidy" = "Uspořádat"
+"board.connector" = "Spojnice"
+"board.ink" = "Tah fixem"
+"board.label" = "Popisek spojnice"
+"board.nextSticky" = "Další lepicí poznámka"
+"board.reattach" = "Připojit spojnici jinam"
+"board.setColor" = "Barva na tabuli"
+"board.setStyle" = "Styl na tabuli"
+"board.shape" = "Tvar s textem"
+"board.stamp" = "Razítko"
+"board.sticky" = "Lepicí poznámka"
+"board.table" = "Tabulka"
+"board.tableEdit" = "Upravit tabulku"
+"board.template" = "Šablona tabule"
+"board.templates" = "Seznam šablon tabule"
+"board.timer" = "Časovač"
+"board.timerState" = "Stav časovače"
+"board.vote" = "Hlasování"
+"board.voteResults" = "Výsledky hlasování"
 "bool.exclude" = "Vyloučit výběr"
 "bool.flatten" = "Sloučit booleovskou skupinu do vektoru"
 "bool.intersect" = "Průnik výběru"
@@ -1685,6 +1895,9 @@ status = "draft — needs native review"
 "dev.focus" = "Zaměřený pohled"
 "dev.resolveChange" = "Vyřešit změnu"
 "dev.unfocus" = "Opustit zaměřený pohled"
+"devMode.addMeasurement" = "Přidat měření"
+"devMode.measurements" = "Vypsat měření"
+"devMode.removeMeasurement" = "Odebrat měření"
 "devResource.add" = "Přidat zdroj pro vývojáře"
 "devResource.edit" = "Upravit zdroj pro vývojáře"
 "devResource.list" = "Vypsat zdroje pro vývojáře"
@@ -1708,6 +1921,7 @@ status = "draft — needs native review"
 "edit.duplicate" = "Duplikovat"
 "edit.findReplace" = "Najít a nahradit"
 "edit.paste" = "Vložit"
+"edit.pasteDesignLayers" = "Vložit vrstvy návrhu"
 "edit.pasteOver" = "Vložit přes výběr"
 "edit.pasteProperties" = "Vložit vlastnosti"
 "edit.pasteReplace" = "Vložit a nahradit"
@@ -1731,7 +1945,9 @@ status = "draft — needs native review"
 "file.exportLayers" = "Exportovat vrstvy"
 "file.exportSvg" = "Exportovat výběr jako SVG"
 "file.import" = "Importovat"
+"file.moveTab" = "Přesunout kartu"
 "file.new" = "Nový soubor návrhu"
+"file.newBoard" = "Nová tabule"
 "file.newFromTemplate" = "Nový ze šablony"
 "file.open" = "Otevřít"
 "file.openRecent" = "Otevřít nedávné"
@@ -1914,6 +2130,12 @@ status = "draft — needs native review"
 "select.sameStroke" = "Vybrat stejný tah"
 "select.sameText" = "Vybrat stejné vlastnosti textu"
 "select.set" = "Vybrat"
+"selection.applyColorStyle" = "Použít barevný styl na výběr"
+"selection.bindColorVariable" = "Použít barevnou proměnnou na výběr"
+"selection.colors" = "Barvy výběru"
+"selection.detachColor" = "Odpojit barvu výběru"
+"selection.selectColor" = "Vybrat vrstvy s touto barvou"
+"selection.setPaint" = "Změnit barvu výběru"
 "shape.arrow" = "Šipka"
 "shape.ellipse" = "Elipsa"
 "shape.line" = "Čára"
@@ -1994,10 +2216,14 @@ status = "draft — needs native review"
 "text.weightUp" = "Zvětšit tloušťku písma"
 "tool.arrow" = "Šipka"
 "tool.comment" = "Komentář"
+"tool.connector" = "Spojnice"
 "tool.ellipse" = "Elipsa"
+"tool.eraser" = "Guma"
 "tool.frame" = "Rámec"
 "tool.hand" = "Ruka"
+"tool.highlighter" = "Zvýrazňovač"
 "tool.line" = "Čára"
+"tool.marker" = "Fix"
 "tool.move" = "Přesunout"
 "tool.pen" = "Pero"
 "tool.pencil" = "Tužka"
@@ -2009,9 +2235,12 @@ status = "draft — needs native review"
 "tool.scaleAnchor" = "Kotva měřítka"
 "tool.section" = "Sekce"
 "tool.set" = "Vybrat nástroj"
+"tool.shape" = "Tvary"
 "tool.shapeBuilder" = "Tvorba tvarů"
 "tool.slice" = "Výřez"
+"tool.stamp" = "Razítko"
 "tool.star" = "Hvězda"
+"tool.sticky" = "Lepicí poznámka"
 "tool.text" = "Text"
 "transform.move" = "Přesunout"
 "transform.moveTo" = "Přesunout na"
@@ -2073,11 +2302,13 @@ status = "draft — needs native review"
 "vector.edit.tool" = "Nástroj úprav vektoru"
 "vector.edit.transform" = "Transformovat body"
 "vector.edit.widthPoint" = "Bod šířky"
+"vector.fillRule" = "Nastavit pravidlo výplně"
 "vector.flatten" = "Sloučit do vektoru"
 "vector.join" = "Spojit výběr"
 "vector.offset" = "Odsadit cestu"
 "vector.outlineStroke" = "Převést tah na obrysy"
 "vector.reverse" = "Obrátit směr cesty"
+"vector.reverseLoop" = "Obrátit smyčku"
 "vector.simplify" = "Zjednodušit vektor"
 "vector.smoothJoin" = "Hladce spojit výběr"
 "version.autosave" = "Automaticky uložit verzi"
@@ -2139,6 +2370,8 @@ status = "draft — needs native review"
 "widget.click" = "Kliknout na widget"
 "widget.insert" = "Vložit widget"
 "widget.list" = "Vypsat widgety"
+"widget.menu" = "Nabídka widgetu"
+"widget.setText" = "Upravit pole widgetu"
 "window.focus" = "Přenést okno do popředí"
 "window.new" = "Nové okno"
 "template.list" = "Vypsat šablony"
diff --git a/crates/ui-egui/locales/de.toml b/crates/ui-egui/locales/de.toml
index 587b1e39..65143726 100644
--- a/crates/ui-egui/locales/de.toml
+++ b/crates/ui-egui/locales/de.toml
@@ -17,6 +17,7 @@ status = "draft — needs native review"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PRs, {commits} Commits, +{added} / −{deleted} Zeilen (Δ {delta}), +{bin_added} / −{bin_deleted} Binärdateien, {first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Eine Sammlung dieser Datei mit diesen Modi und Variablen: Überschreiben Sie ihre Werte je Modus und fügen Sie eigene Variablen hinzu"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Eine .figcraft-Datei mit diesem Namen existiert bereits. Wählen Sie ihren vollständigen Namen, um das Ersetzen zu bestätigen."
 "A layer on its own aligns to its frame: select more layers, or one in a frame" = "Eine einzelne Ebene richtet sich an ihrem Rahmen aus: Wählen Sie weitere Ebenen oder eine Ebene in einem Rahmen"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "Eine Feder läuft, bis sie zur Ruhe kommt: Masse, Steifigkeit und Dämpfung bestimmen die Dauer"
 "About" = "Über"
@@ -33,6 +34,7 @@ status = "draft — needs native review"
 "Add a description" = "Beschreibung hinzufügen"
 "Add a frame (F) or a shape (R) to get started" = "Fügen Sie zum Start einen Rahmen (F) oder eine Form (R) hinzu"
 "Add a layer or component to tile first" = "Fügen Sie zuerst eine Ebene oder Komponente zum Kacheln hinzu"
+"Add a minute" = "Eine Minute hinzufügen"
 "Add a note for developers" = "Notiz für Entwickler hinzufügen"
 "Add action" = "Aktion hinzufügen"
 "Add actions for when no condition holds" = "Aktionen für den Fall hinzufügen, dass keine Bedingung zutrifft"
@@ -40,6 +42,7 @@ status = "draft — needs native review"
 "Add another condition" = "Weitere Bedingung hinzufügen"
 "Add auto layout" = "Auto-Layout hinzufügen"
 "Add background behind overlay" = "Hintergrund hinter dem Overlay hinzufügen"
+"Add column" = "Spalte hinzufügen"
 "Add content to this slot" = "Inhalt zu diesem Slot hinzufügen"
 "Add dev resource" = "Entwicklerressource hinzufügen"
 "Add effect" = "Effekt hinzufügen"
@@ -51,6 +54,7 @@ status = "draft — needs native review"
 "Add library file…" = "Bibliotheksdatei hinzufügen…"
 "Add max height" = "Max. Höhe hinzufügen"
 "Add max width" = "Max. Breite hinzufügen"
+"Add measurement" = "Messung hinzufügen"
 "Add min height" = "Min. Höhe hinzufügen"
 "Add min width" = "Min. Breite hinzufügen"
 "Add mode" = "Modus hinzufügen"
@@ -58,6 +62,7 @@ status = "draft — needs native review"
 "Add or update collections from a variables JSON" = "Sammlungen aus einer Variablen-JSON hinzufügen oder aktualisieren"
 "Add properties to make instances configurable" = "Fügen Sie Eigenschaften hinzu, um Instanzen konfigurierbar zu machen"
 "Add reaction" = "Reaktion hinzufügen"
+"Add row" = "Zeile hinzufügen"
 "Add starting point" = "Startpunkt hinzufügen"
 "Add stroke" = "Kontur hinzufügen"
 "Add variant" = "Variante hinzufügen"
@@ -87,8 +92,13 @@ status = "draft — needs native review"
 "All comments" = "Alle Kommentare"
 "All components" = "Alle Komponenten"
 "All fonts" = "Alle Schriften"
+"All objects" = "Alle Objekte"
 "All supported properties" = "Alle unterstützten Eigenschaften"
 "All variables" = "Alle Variablen"
+"Along the bottom" = "Entlang der Unterkante"
+"Along the left" = "Entlang der linken Kante"
+"Along the right" = "Entlang der rechten Kante"
+"Along the top" = "Entlang der Oberkante"
 "Alpha" = "Alpha"
 "Alt+drag" = "Alt+Ziehen"
 "An invite link that opens FigCraft and joins" = "Ein Einladungslink, der FigCraft öffnet und beitritt"
@@ -117,6 +127,7 @@ status = "draft — needs native review"
 "Archived" = "Archiviert"
 "Arrange" = "Anordnen"
 "Arrow" = "Pfeil"
+"Arrow at the end" = "Pfeil am Ende"
 "As typed" = "Wie eingegeben"
 "Asking the server…" = "Server wird gefragt…"
 "Assets" = "Assets"
@@ -147,6 +158,7 @@ status = "draft — needs native review"
 "Basics" = "Grundlagen"
 "Before" = "Vorher"
 "Bend" = "Biegen"
+"Between the selected layers" = "Zwischen den ausgewählten Ebenen"
 "Bevel" = "Abgeflacht"
 "Binary assets added" = "Binärdateien hinzugefügt"
 "Binary assets removed" = "Binärdateien entfernt"
@@ -164,6 +176,7 @@ status = "draft — needs native review"
 "Bottom" = "Unten"
 "Bottom left radius" = "Radius unten links"
 "Bottom right radius" = "Radius unten rechts"
+"Brainstorm" = "Brainstorming"
 "Branch" = "Branch"
 "Branch archived" = "Branch archiviert"
 "Branch merged" = "Branch zusammengeführt"
@@ -188,8 +201,12 @@ status = "draft — needs native review"
 "C or ⇧C" = "C oder ⇧C"
 "CMYK colour" = "CMYK-Farbe"
 "Can view" = "Kann ansehen"
+"Check" = "Häkchen"
 "Checking the server…" = "Server wird geprüft…"
+"Chevron" = "Chevron"
 "Clear from this list" = "Aus dieser Liste entfernen"
+"Clear results" = "Ergebnisse löschen"
+"Click objects to vote; click your badge to take a vote back" = "Klicken Sie auf Objekte, um abzustimmen; klicken Sie auf Ihr Abzeichen, um eine Stimme zurückzunehmen"
 "Code or invite link" = "Code oder Einladungslink"
 "Color profile: {name}" = "Farbprofil: {name}"
 "CSS custom properties…" = "Benutzerdefinierte CSS-Eigenschaften…"
@@ -213,7 +230,7 @@ status = "draft — needs native review"
 "Changes on main" = "Änderungen in der Hauptdatei"
 "Changes on the branch" = "Änderungen im Branch"
 "Changes unknown" = "Änderungen unbekannt"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "Wählen Sie oben React, Leptos, SwiftUI, Compose oder Flutter, um diese Komponente mit ihrem Code zu verbinden."
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Wählen Sie oben React, Leptos, Vue, SwiftUI, Compose, ArkUI oder Flutter, um diese Komponente mit ihrem Code zu verbinden."
 "Choose another profile to change it." = "Wählen Sie ein anderes Profil, um es zu ändern."
 "Choose collection" = "Sammlung wählen"
 "Choose image" = "Bild wählen"
@@ -234,7 +251,6 @@ status = "draft — needs native review"
 "Close tab" = "Tab schließen"
 "Close version history" = "Versionsverlauf schließen"
 "Close when clicking outside" = "Bei Klick außerhalb schließen"
-"Close without saving" = "Ohne Speichern schließen"
 "Code" = "Code"
 "Code syntax" = "Code-Syntax"
 "Collapse" = "Einklappen"
@@ -261,6 +277,8 @@ status = "draft — needs native review"
 "Commits" = "Commits"
 "Company" = "Unternehmen"
 "Compare changes" = "Änderungen vergleichen"
+"Compare with" = "Vergleichen mit"
+"Compatibility notes" = "Hinweise zur Kompatibilität"
 "Completed" = "Abgeschlossen"
 "Component" = "Komponente"
 "Component name" = "Komponentenname"
@@ -275,11 +293,11 @@ status = "draft — needs native review"
 "Connected" = "Verbunden"
 "Connected to code: {from}" = "Mit Code verbunden: {from}"
 "Connection lost, reconnecting (attempt {attempt})…" = "Verbindung verloren, neuer Versuch ({attempt})…"
+"Connector" = "Verbinder"
 "Constrain proportions" = "Proportionen beibehalten"
 "Constraints" = "Constraints"
 "Content" = "Inhalt"
 "Contents hidden" = "Inhalt ausgeblendet"
-"Contents only" = "Nur Inhalt"
 "Contextual alternates" = "Kontextbedingte Varianten"
 "Contrast" = "Kontrast"
 "Contributors" = "Mitwirkende"
@@ -304,7 +322,9 @@ status = "draft — needs native review"
 "Corner smoothing" = "Eckenglättung"
 "Couldn't download the variables" = "Die Variablen konnten nicht heruntergeladen werden"
 "Couldn't reach {server}: showing what this computer remembers." = "{server} war nicht erreichbar: Es wird angezeigt, was dieser Computer gespeichert hat."
+"Couldn't read {name}." = "{name} konnte nicht gelesen werden."
 "Couldn't save automatically: {error}" = "Automatisches Speichern fehlgeschlagen: {error}"
+"Couldn't save the file" = "Die Datei konnte nicht gespeichert werden"
 "Count" = "Anzahl"
 "Create" = "Erstellen"
 "Create a variable collection first" = "Erstellen Sie zuerst eine Variablensammlung"
@@ -327,6 +347,7 @@ status = "draft — needs native review"
 "Current version" = "Aktuelle Version"
 "Cursor chat" = "Cursor-Chat"
 "Custom" = "Benutzerdefiniert"
+"Custom size" = "Benutzerdefinierte Größe"
 "Cut" = "Ausschneiden"
 "Dark" = "Dunkel"
 "Darken" = "Abdunkeln"
@@ -357,6 +378,7 @@ status = "draft — needs native review"
 "Description" = "Beschreibung"
 "Description (optional)" = "Beschreibung (optional)"
 "Design" = "Design"
+"Design panel" = "Design-Bereich"
 "Desktop" = "Desktop"
 "Destination" = "Ziel"
 "Detach alias" = "Alias lösen"
@@ -367,6 +389,7 @@ status = "draft — needs native review"
 "Detach variable" = "Variable lösen"
 "Details" = "Details"
 "Dev Mode" = "Entwicklermodus"
+"Dev Mode only inspects: switch to Design (Shift+D) to edit" = "Der Entwicklermodus prüft nur: Wechseln Sie zu Design (Shift+D), um zu bearbeiten"
 "Dev resources" = "Entwicklerressourcen"
 "Development" = "Entwicklung"
 "Device" = "Gerät"
@@ -383,6 +406,7 @@ status = "draft — needs native review"
 "Distribute horizontal spacing" = "Horizontale Abstände verteilen"
 "Distribute vertical spacing" = "Vertikale Abstände verteilen"
 "Divider" = "Trennlinie"
+"Don't Save" = "Nicht speichern"
 "Don't truncate" = "Nicht kürzen"
 "Done" = "Fertig"
 "Done editing" = "Bearbeitung beenden"
@@ -393,7 +417,7 @@ status = "draft — needs native review"
 "Drag the stroke to add a width point" = "Ziehen Sie an der Kontur, um einen Breitenpunkt hinzuzufügen"
 "Draw" = "Zeichnen"
 "Drawing tools" = "Zeichenwerkzeuge"
-"Drop a .figcraft, .fig, .json, .svg or image file." = "Legen Sie eine .figcraft-, .fig-, .json-, .svg- oder Bilddatei ab."
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Legen Sie eine .figcraft-, .fig-, .sketch-, .json-, .svg- oder Bilddatei ab."
 "Drop to import" = "Zum Importieren ablegen"
 "Drop to open" = "Zum Öffnen ablegen"
 "Drop shadow" = "Schlagschatten"
@@ -416,6 +440,8 @@ status = "draft — needs native review"
 "Effect settings" = "Effekteinstellungen"
 "Effect styles" = "Effektstile"
 "Effects" = "Effekte"
+"Curved" = "Gebogen"
+"Elbow" = "Gewinkelt"
 "Ellipse" = "Ellipse"
 "Ellipses" = "Ellipsen"
 "Else" = "Sonst"
@@ -424,6 +450,7 @@ status = "draft — needs native review"
 "Empty" = "Leer"
 "End" = "Ende"
 "End point" = "Endpunkt"
+"End vote" = "Abstimmung beenden"
 "Ends the session; everyone keeps their copy" = "Beendet die Sitzung; alle behalten ihre Kopie"
 "Enter" = "Eingabe"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Geben Sie die Adresse eines figcraft-server ein und drücken Sie auf Durchsuchen, um die angebotenen Plugins zu sehen."
@@ -464,6 +491,7 @@ status = "draft — needs native review"
 "False" = "Falsch"
 "Fetching from the server…" = "Wird vom Server abgerufen…"
 "FigCraft couldn't open its window: {error}" = "FigCraft konnte sein Fenster nicht öffnen: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft unterstützt noch nicht alle Funktionen dieser Dateien. Die Hinweise nennen, was in der importierten Kopie weggelassen oder geändert wurde; die Originaldatei bleibt unverändert."
 "File" = "Datei"
 "File name" = "Dateiname"
 "File published" = "Datei veröffentlicht"
@@ -496,6 +524,7 @@ status = "draft — needs native review"
 "Flip text to the other side" = "Text auf die andere Seite setzen"
 "Flip vertical" = "Vertikal spiegeln"
 "Flip width profile" = "Breitenprofil umkehren"
+"Flow chart" = "Flussdiagramm"
 "Flow starting point" = "Startpunkt des Ablaufs"
 "Flow starting points" = "Startpunkte von Abläufen"
 "Flows" = "Abläufe"
@@ -545,6 +574,7 @@ status = "draft — needs native review"
 "Hanging list" = "Hängende Liste"
 "Hanging punctuation" = "Hängende Interpunktion"
 "Hard light" = "Hartes Licht"
+"Heart" = "Herz"
 "Height" = "Höhe"
 "Help" = "Hilfe"
 "Help and resources" = "Hilfe und Ressourcen"
@@ -555,6 +585,7 @@ status = "draft — needs native review"
 "Hide from publishing" = "Nicht veröffentlichen"
 "Hide section contents" = "Abschnittsinhalt ausblenden"
 "Highlight layers on hover" = "Ebenen beim Überfahren hervorheben"
+"Highlighter" = "Textmarker"
 "Highlights" = "Lichter"
 "Hold Alt" = "Alt gedrückt halten"
 "Hold Alt+Z" = "Alt+Z gedrückt halten"
@@ -579,12 +610,16 @@ status = "draft — needs native review"
 "If" = "Wenn"
 "If {condition}" = "Wenn {condition}"
 "Ignore auto layout (absolute position)" = "Auto-Layout ignorieren (absolute Position)"
+"Ignore overlapping layers" = "Überlappende Ebenen ignorieren"
 "Image" = "Bild"
+"Images" = "Bilder"
 "Import" = "Importieren"
 "Import path" = "Importpfad"
 "Import plugin from manifest" = "Plugin aus Manifest importieren"
 "Import plugin from manifest…" = "Plugin aus Manifest importieren…"
+"Import report" = "Importbericht"
 "Import variables" = "Variablen importieren"
+"Imported document" = "Importiertes Dokument"
 "Imported {name}" = "{name} importiert"
 "Imported {n} new variables, updated {updated}" = { one = "{n} neue Variable importiert, {updated} aktualisiert", other = "{n} neue Variablen importiert, {updated} aktualisiert" }
 "Import…" = "Importieren…"
@@ -612,11 +647,13 @@ status = "draft — needs native review"
 "Instance swap (no other component)" = "Instanztausch (keine andere Komponente)"
 "Instances" = "Instanzen"
 "Instant" = "Sofort"
+"Intensity" = "Intensität"
 "Interaction" = "Interaktion"
 "Interactions" = "Interaktionen"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Interface-Design und Prototyping. Ein kostenloses Open-Source-Designwerkzeug, als Clean-Room-Entwicklung von Grund auf in Rust geschrieben, Teil der ArtCraft Crafting Apps."
 "Intersect" = "Schnittmenge"
 "Intersects" = "Schnittmengen"
+"Invalid color" = "Ungültige Farbe"
 "Invite link" = "Einladungslink"
 "Invite link copied" = "Einladungslink kopiert"
 "It asks permission to:" = "Es möchte:"
@@ -632,6 +669,8 @@ status = "draft — needs native review"
 "Join|stroke" = "Ecke"
 "Just now" = "Gerade eben"
 "Justify" = "Blocksatz"
+"Kanban board" = "Kanban-Board"
+"Keep a measurement on the canvas for developers" = "Eine Messung für Entwickler auf der Arbeitsfläche behalten"
 "Keep appearance" = "Aussehen beibehalten"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "„Aussehen beibehalten“ wandelt jeden Farbwert in {profile} um, damit die Farben gleich aussehen. „Werte beibehalten“ lässt die Zahlen unverändert, sodass sich die Farben verschieben."
 "Keep tool selected after use" = "Werkzeug nach Verwendung ausgewählt lassen"
@@ -705,6 +744,7 @@ status = "draft — needs native review"
 "Mark as resolved" = "Als erledigt markieren"
 "Mark as unread" = "Als ungelesen markieren"
 "Mark as unresolved" = "Als nicht erledigt markieren"
+"Marker" = "Marker"
 "Mask" = "Maske"
 "Mass · Stiffness · Damping" = "Masse · Steifigkeit · Dämpfung"
 "Match (empty: the whole name)" = "Übereinstimmung (leer: der ganze Name)"
@@ -713,6 +753,7 @@ status = "draft — needs native review"
 "Max lines" = "Max. Zeilen"
 "Maximize" = "Maximieren"
 "Measure to the selection" = "Bis zur Auswahl messen"
+"Measurements" = "Messungen"
 "Merge into main" = "In Hauptdatei zusammenführen"
 "Merge regions" = "Bereiche vereinen"
 "Merge the branch into the main file (one undo step) and archive it" = "Führt den Branch in die Hauptdatei zusammen (ein Rückgängig-Schritt) und archiviert ihn"
@@ -721,6 +762,7 @@ status = "draft — needs native review"
 "Min H" = "Min. H"
 "Min W" = "Min. B"
 "Minimize" = "Minimieren"
+"Minutes" = "Minuten"
 "Mirror angle" = "Winkel spiegeln"
 "Mirror angle and length" = "Winkel und Länge spiegeln"
 "Mirroring" = "Spiegelung"
@@ -761,7 +803,9 @@ status = "draft — needs native review"
 "Named instance" = "Benannte Instanz"
 "Navigate to" = "Navigieren zu"
 "Nested instance" = "Verschachtelte Instanz"
+"New board" = "Neues Whiteboard"
 "New design file" = "Neue Designdatei"
+"Next frame" = "Nächster Rahmen"
 "Next or previous control in the focused region" = "Nächstes oder vorheriges Steuerelement im fokussierten Bereich"
 "Next ready for dev" = "Nächstes bereit für Entwicklung"
 "Next size option" = "Nächste Größenoption"
@@ -771,12 +815,15 @@ status = "draft — needs native review"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "Keine Branches. Ein Branch ist eine Kopie der Datei, in der Sie Änderungen ausprobieren, prüfen und dann zusammenführen."
 "No category" = "Keine Kategorie"
 "No changes" = "Keine Änderungen"
+"No color styles" = "Keine Farbstile"
 "No colour variables fit here." = "Hier passen keine Farbvariablen."
 "No colour variables yet. Create them in Local variables." = "Noch keine Farbvariablen. Erstellen Sie sie unter Lokale Variablen."
 "No comments yet" = "Noch keine Kommentare"
+"No compatibility warnings reported" = "Keine Kompatibilitätswarnungen gemeldet"
 "No components yet. Select layers and press {keys}." = "Noch keine Komponenten. Wählen Sie Ebenen aus und drücken Sie {keys}."
 "No conflicts." = "Keine Konflikte."
 "No contributor data was built into this copy." = "Diese Kopie enthält keine Daten zu Mitwirkenden."
+"No device" = "Kein Gerät"
 "No fonts match" = "Keine passenden Schriften"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Hier gibt es keinen Beitrittscode (der Server ist älter als Beitrittscodes, oder diese Adresse passt in keinen): Teilen Sie stattdessen den Link."
 "No layer changes to show." = "Keine Ebenenänderungen vorhanden."
@@ -807,6 +854,7 @@ status = "draft — needs native review"
 "No text styles yet. Click + to create one from the selected text." = "Noch keine Textstile. Klicken Sie auf +, um einen aus dem ausgewählten Text zu erstellen."
 "No variables fit here." = "Hier passen keine Variablen."
 "No variables yet. Create them in Local variables." = "Noch keine Variablen. Erstellen Sie sie unter Lokale Variablen."
+"No votes yet" = "Noch keine Stimmen"
 "Nobody else is here yet" = "Noch niemand sonst hier"
 "Noise" = "Rauschen"
 "None" = "Keine"
@@ -819,6 +867,7 @@ status = "draft — needs native review"
 "Not read yet" = "Noch nicht gelesen"
 "Not shared" = "Nicht geteilt"
 "Note {n}" = "Notiz {n}"
+"Nothing changed since this version." = "Seit dieser Version hat sich nichts geändert."
 "Nothing changed since this was marked ready for dev." = "Seit der Markierung als bereit für die Entwicklung hat sich nichts geändert."
 "Nothing here yet. Set a frame's status to list it." = "Noch nichts hier. Legen Sie den Status eines Rahmens fest, um ihn aufzulisten."
 "Nothing online yet. Use Share on a file to put it online and it is listed here." = "Noch nichts online. Stellen Sie eine Datei über „Teilen“ online, dann erscheint sie hier."
@@ -852,6 +901,7 @@ status = "draft — needs native review"
 "Open branch" = "Branch öffnen"
 "Open file" = "Datei öffnen"
 "Open files" = "Geöffnete Dateien"
+"Open presentations" = "Geöffnete Präsentationen"
 "Open in focus view" = "In Fokusansicht öffnen"
 "Open in new window" = "In neuem Fenster öffnen"
 "Open invite links in FigCraft" = "Einladungslinks in FigCraft öffnen"
@@ -860,6 +910,7 @@ status = "draft — needs native review"
 "Open overlay" = "Overlay öffnen"
 "Open prototype preview" = "Prototyp-Vorschau öffnen"
 "Open variables ({count})" = "Variablen öffnen ({count})"
+"Opened as a new document" = "Als neues Dokument geöffnet"
 "Opened “{name}” in a new tab" = "„{name}“ in neuem Tab geöffnet"
 "Opening the file…" = "Datei wird geöffnet…"
 "Opening {n} files as new files" = { one = "Wird als neue Datei geöffnet", other = "{n} Dateien werden als neue Dateien geöffnet" }
@@ -884,7 +935,12 @@ status = "draft — needs native review"
 "PDF print settings" = "PDF-Druckeinstellungen"
 "Padding" = "Innenabstand"
 "Page" = "Seite"
+"Page deleted" = "Seite gelöscht"
 "Pages" = "Seiten"
+"Pages added to the document" = "Seiten zum Dokument hinzugefügt"
+"Pause" = "Pausieren"
+"Pink" = "Rosa"
+"Placed on the current page" = "Auf der aktuellen Seite platziert"
 "Pages: {pages}" = "Seiten: {pages}"
 "Paint bucket" = "Farbeimer"
 "Pan the canvas" = "Arbeitsfläche verschieben"
@@ -899,6 +955,7 @@ status = "draft — needs native review"
 "Paste a team library link (a view link)" = "Link einer Teambibliothek einfügen (ein Ansichtslink)"
 "Paste here" = "Hier einfügen"
 "Paste to replace" = "Zum Ersetzen einfügen"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Designebenen eingefügt; {n} Art von Inhalt wurde ausgelassen", other = "Designebenen eingefügt; {n} Arten von Inhalt wurden ausgelassen" }
 "Pattern" = "Muster"
 "Pattern alignment" = "Musterausrichtung"
 "Pattern scale" = "Musterskalierung"
@@ -924,6 +981,7 @@ status = "draft — needs native review"
 "Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Plugins laufen in der Sandbox von FigCraft, ohne Dateien, Netzwerk oder Uhr. Installieren Sie nur Plugins, denen Sie vertrauen."
 "Plus darker" = "Plus dunkler"
 "Plus lighter" = "Plus heller"
+"Plus one" = "Plus eins"
 "Point" = "Punkt"
 "Points" = "Punkte"
 "Polygon" = "Polygon"
@@ -949,6 +1007,7 @@ status = "draft — needs native review"
 "Preview" = "Vorschau"
 "Preview this flow" = "Vorschau dieses Ablaufs"
 "Preview this frame" = "Vorschau dieses Rahmens"
+"Previous frame" = "Vorheriger Rahmen"
 "Previous ready for dev" = "Vorheriges bereit für Entwicklung"
 "Progressive" = "Progressiv"
 "Properties" = "Eigenschaften"
@@ -969,6 +1028,7 @@ status = "draft — needs native review"
 "Push" = "Schieben"
 "Push changes to main component" = "Änderungen an Hauptkomponente übertragen"
 "Put text on path" = "Text auf Pfad setzen"
+"Question" = "Frage"
 "R" = "R"
 "Radial" = "Radial"
 "Radius" = "Radius"
@@ -986,10 +1046,12 @@ status = "draft — needs native review"
 "Reduce motion" = "Bewegung reduzieren"
 "Refraction" = "Brechung"
 "Regular expression" = "Regulärer Ausdruck"
+"Relative to" = "Relativ zu"
 "Remove" = "Entfernen"
 "Remove all" = "Alle entfernen"
 "Remove annotation" = "Anmerkung entfernen"
 "Remove auto layout" = "Auto-Layout entfernen"
+"Remove column" = "Spalte entfernen"
 "Remove dev resource" = "Entwicklerressource entfernen"
 "Remove export setting" = "Exporteinstellung entfernen"
 "Remove from server" = "Vom Server entfernen"
@@ -997,10 +1059,12 @@ status = "draft — needs native review"
 "Remove guide" = "Hilfslinie entfernen"
 "Remove interaction" = "Interaktion entfernen"
 "Remove library from this file" = "Bibliothek aus dieser Datei entfernen"
+"Remove measurement" = "Messung entfernen"
 "Remove min and max" = "Min. und Max. entfernen"
 "Remove min and max height" = "Min. und max. Höhe entfernen"
 "Remove min and max width" = "Min. und max. Breite entfernen"
 "Remove regions" = "Bereiche entfernen"
+"Remove row" = "Zeile entfernen"
 "Remove slot" = "Slot entfernen"
 "Remove starting point" = "Startpunkt entfernen"
 "Remove stop" = "Farbunterbrechung entfernen"
@@ -1013,6 +1077,7 @@ status = "draft — needs native review"
 "Removed" = "Entfernt"
 "Removed from the server" = "Vom Server entfernt"
 "Removed since it was marked" = "Seit der Markierung entfernt"
+"Removed since this version" = "Seit dieser Version entfernt"
 "Rename" = "Umbenennen"
 "Rename duplicated layers" = "Duplizierte Ebenen umbenennen"
 "Rename folder" = "Ordner umbenennen"
@@ -1042,6 +1107,7 @@ status = "draft — needs native review"
 "Resize by the nudge amount" = "Um die Schrittweite skalieren"
 "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Passt Rahmen an den Bildschirm des Geräts an (ohne Gerät an das Fenster): ihre Constraints und ihr Auto-Layout reagieren"
 "Resize to fit" = "Größe an Inhalt anpassen"
+"Resizing" = "Größenanpassung"
 "Resolve" = "Erledigen"
 "Resolve change" = "Änderung erledigen"
 "Resolved" = "Erledigt"
@@ -1052,6 +1118,9 @@ status = "draft — needs native review"
 "Restore main component" = "Hauptkomponente wiederherstellen"
 "Restore this version" = "Diese Version wiederherstellen"
 "Restored “{name}”" = "„{name}“ wiederhergestellt"
+"Retrospective" = "Retrospektive"
+"Results" = "Ergebnisse"
+"Resume" = "Fortsetzen"
 "Reverse the order" = "Reihenfolge umkehren"
 "Reversed triangle" = "Umgekehrtes Dreieck"
 "Review and merge" = "Prüfen und zusammenführen"
@@ -1067,6 +1136,7 @@ status = "draft — needs native review"
 "Rotation jitter" = "Drehungsschwankung"
 "Round" = "Rund"
 "Rounded" = "Abgerundet"
+"Rounded rectangle" = "Abgerundetes Rechteck"
 "Row" = "Zeile"
 "Row gap" = "Zeilenabstand"
 "Row sizes" = "Zeilengrößen"
@@ -1082,6 +1152,7 @@ status = "draft — needs native review"
 "Save" = "Speichern"
 "Save as" = "Speichern unter"
 "Save as preset…" = "Als Vorgabe speichern…"
+"Save file" = "Datei speichern"
 "Save files automatically" = "Dateien automatisch speichern"
 "Save version  {key}" = "Version speichern  {key}"
 "Saved" = "Gespeichert"
@@ -1113,12 +1184,14 @@ status = "draft — needs native review"
 "Select all with same" = "Alle auswählen mit gleicher"
 "Select layer" = "Ebene auswählen"
 "Select layers to apply the style to" = "Wählen Sie die Ebenen aus, auf die der Stil angewendet werden soll"
+"Select layers with this color" = "Ebenen mit dieser Farbe auswählen"
 "Select overlapping shapes" = "Wählen Sie überlappende Formen aus"
 "Select points to edit their position, radius and mirroring" = "Wählen Sie Punkte aus, um Position, Radius und Spiegelung zu bearbeiten"
 "Select slot" = "Slot auswählen"
 "Selection" = "Auswahl"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Auswahlrahmen, {w} × {h} bei {x}, {y}: Pfeiltasten verschieben ihn, Umschalt+Pfeiltasten oder {cmd}+Pfeiltasten ändern die Größe, Eingabe wählt aus, Esc bricht ab"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Auswahlrahmen: Pfeiltasten verschieben ihn, Umschalt+Pfeiltasten oder {cmd}+Pfeiltasten ändern die Größe, Eingabe wählt aus, Esc bricht ab"
+"Selection colors" = "Auswahlfarben"
 "Send backward" = "Eine Ebene nach hinten"
 "Send report" = "Meldung senden"
 "Send to back" = "In den Hintergrund"
@@ -1134,6 +1207,7 @@ status = "draft — needs native review"
 "Shape" = "Form"
 "Shape builder" = "Formerstellung"
 "Shape tools" = "Formwerkzeuge"
+"Shapes" = "Formen"
 "Share" = "Teilen"
 "Share this file" = "Diese Datei teilen"
 "Share: live session, export" = "Teilen: Live-Sitzung, Export"
@@ -1191,10 +1265,13 @@ status = "draft — needs native review"
 "Space+drag" = "Leertaste+Ziehen"
 "Spacing" = "Abstand"
 "Spam, stolen work, abuse…" = "Spam, gestohlene Arbeit, Missbrauch…"
+"Speech bubble" = "Sprechblase"
 "Splay" = "Spreizung"
 "Spotlight me" = "Spotlight auf mich"
 "Spread" = "Ausbreitung"
 "Square" = "Quadrat"
+"Stamp" = "Stempel"
+"Stamps" = "Stempel"
 "Standard" = "Standard"
 "Standard ligatures" = "Standardligaturen"
 "Star" = "Stern"
@@ -1203,17 +1280,25 @@ status = "draft — needs native review"
 "Start ascending from / stop descending at" = "Aufwärts zählen ab / abwärts zählen bis"
 "Start from a blank canvas" = "Mit einer leeren Arbeitsfläche beginnen"
 "Start on path" = "Anfang auf dem Pfad"
+"Start on the Home screen" = "Mit Start beginnen"
 "Start point" = "Startpunkt"
 "Start sharing" = "Teilen starten"
+"Start vote" = "Abstimmung starten"
 "Starting to share…" = "Teilen wird gestartet…"
 "Status" = "Status"
 "Sticky" = "Fixiert"
+"Sticky note" = "Haftnotiz"
+"Sticky note colors" = "Haftnotizfarben"
+"Sticky notes" = "Haftnotizen"
+"Sticky notes, shapes and connectors" = "Haftnotizen, Formen und Verbinder"
 "Stop" = "Beenden"
 "Stop following {name}" = "{name} nicht mehr folgen"
 "Stop session" = "Sitzung beenden"
 "Stop sharing" = "Teilen beenden"
 "Stop spotlighting" = "Spotlight beenden"
+"Stop timer" = "Timer stoppen"
 "Stop {n}  {hex}" = "Farbunterbrechung {n}  {hex}"
+"Straight" = "Gerade"
 "Stretch" = "Strecken"
 "Strikethrough" = "Durchgestrichen"
 "String" = "Zeichenfolge"
@@ -1253,10 +1338,12 @@ status = "draft — needs native review"
 "Tell the server's operator what is wrong with it" = "Teilen Sie dem Betreiber des Servers mit, was damit nicht stimmt"
 "Temperature" = "Temperatur"
 "Template" = "Vorlage"
+"Templates" = "Vorlagen"
 "Terms" = "Bedingungen"
 "Text" = "Text"
 "Text align" = "Textausrichtung"
 "Text content" = "Textinhalt"
+"Text size" = "Textgröße"
 "Text style" = "Textstil"
 "Text styles" = "Textstile"
 "Texts" = "Texte"
@@ -1290,13 +1377,18 @@ status = "draft — needs native review"
 "This server is open to the public: no key needed." = "Dieser Server ist öffentlich zugänglich: kein Schlüssel nötig."
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Dieser Server braucht seinen Schlüssel: Fügen Sie der Adresse ?key=… hinzu (`figcraft-server key` gibt ihn auf dem Rechner des Servers aus)."
 "This server takes files only with its key: see Advanced." = "Dieser Server nimmt Dateien nur mit seinem Schlüssel an: siehe Erweitert."
+"Thumbs up" = "Daumen hoch"
+"This version can't be read." = "Diese Version kann nicht gelesen werden."
+"This version doesn't have it: all of it is new." = "Diese Version enthält es nicht: alles daran ist neu."
 "Tidy up" = "Aufräumen"
 "Tile" = "Kachel"
 "Tile type" = "Kacheltyp"
+"Timer" = "Timer"
 "Tint" = "Tönung"
 "Title" = "Titel"
 "Title case" = "Großschreibung am Wortanfang"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Um diese Bibliothek mit Ihrem Team zu teilen, veröffentlichen Sie die Datei auf einem Server (Teilen ▸ Auf Server veröffentlichen…) und veröffentlichen Sie dort dann die Bibliothek."
+"To the layer around it" = "Bis zur umgebenden Ebene"
 "Toggle" = "Umschalten"
 "Toggle light/dark theme" = "Zwischen hellem und dunklem Design wechseln"
 "Toggle visibility" = "Sichtbarkeit umschalten"
@@ -1306,8 +1398,10 @@ status = "draft — needs native review"
 "Top left radius" = "Radius oben links"
 "Top right radius" = "Radius oben rechts"
 "Transform" = "Transformieren"
+"Triangle" = "Dreieck"
 "Triangle arrow" = "Dreieckspfeil"
 "Trigger" = "Auslöser"
+"Trigger layer" = "Auslösende Ebene"
 "True" = "Wahr"
 "Truncate text" = "Text kürzen"
 "Truncate with an ellipsis" = "Mit Auslassungspunkten kürzen"
@@ -1328,7 +1422,7 @@ status = "draft — needs native review"
 "Unread" = "Ungelesen"
 "Unresolve" = "Wieder öffnen"
 "Unsaved changes" = "Nicht gespeicherte Änderungen"
-"Unsaved changes in {names}. Close the window and lose them?" = "Nicht gespeicherte Änderungen in {names}. Fenster schließen und Änderungen verwerfen?"
+"Unsaved changes in {names}. Save them before closing?" = "Nicht gespeicherte Änderungen in {names}. Vor dem Schließen speichern?"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Nicht gespeicherte Änderungen: Speichern Sie zuerst ({save}) oder schließen Sie den Tab mit {alt}+Klick, um sie zu verwerfen"
 "Unsaved changes: save first, or close again with {key} to discard" = "Nicht gespeicherte Änderungen: Speichern Sie zuerst oder schließen Sie erneut mit {key}, um sie zu verwerfen"
 "Up" = "Nach oben"
@@ -1347,6 +1441,7 @@ status = "draft — needs native review"
 "Use as mask" = "Als Maske verwenden"
 "Use auto layout" = "Auto-Layout verwenden"
 "Use number keys for opacity" = "Zifferntasten für Deckkraft verwenden"
+"Use the .figcraft or .fig extension." = "Verwenden Sie die Dateiendung .figcraft oder .fig."
 "Use the layer's fill" = "Füllung der Ebene verwenden"
 "Used in {files} · {instances}" = "Verwendet in {files} · {instances}"
 "Username" = "Benutzername"
@@ -1381,6 +1476,8 @@ status = "draft — needs native review"
 "Visibility" = "Sichtbarkeit"
 "Visible" = "Sichtbar"
 "Vivid" = "Lebhaft"
+"Votes per person" = "Stimmen pro Person"
+"Voting session" = "Abstimmung"
 "WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND ist gesetzt und legt die Grafik-API fest; ohne diese Variable wählt FigCraft selbst."
 "Warm" = "Warm"
 "Watch" = "Smartwatch"
@@ -1389,15 +1486,19 @@ status = "draft — needs native review"
 "WebSocket URL" = "WebSocket-URL"
 "WebSocket URL copied" = "WebSocket-URL kopiert"
 "Wedge" = "Keil"
+"Weekly planner" = "Wochenplaner"
 "Weight" = "Stärke"
+"What changed since a saved version" = "Was sich seit einer gespeicherten Version geändert hat"
 "What changed since it was marked ready for dev" = "Was sich seit der Markierung als bereit für die Entwicklung geändert hat"
 "What is wrong with this file? The server's operator gets your report." = "Was stimmt mit dieser Datei nicht? Der Betreiber des Servers erhält Ihre Meldung."
 "What it's for" = "Wofür sie gedacht ist"
 "What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "Der Ausgangsstand dieser Änderung ist unbekannt: Sie erfolgte, bevor FigCraft Kopien von Rahmen mit dem Status „Bereit für Entwicklung“ aufbewahrte. Erledigen Sie die Änderung (oder markieren Sie den Rahmen erneut als bereit), um ab jetzt zu vergleichen."
+"When marked ready" = "Beim Markieren als bereit"
 "While hovering" = "Beim Überfahren"
 "While pressing" = "Beim Drücken"
 "White" = "Weiß"
 "Who runs it, its terms and how long it keeps files" = "Wer ihn betreibt, seine Bedingungen und wie lange er Dateien aufbewahrt"
+"Whole screen" = "Ganzer Bildschirm"
 "Why it changed" = "Warum es sich geändert hat"
 "Widgets" = "Widgets"
 "Width" = "Breite"
@@ -1435,25 +1536,120 @@ status = "draft — needs native review"
 "call any command its access allows" = "jeden Befehl aufrufen, den sein Zugriff erlaubt"
 "call only: {commands}" = "nur aufrufen: {commands}"
 "can edit the document" = "kann das Dokument bearbeiten"
+"can save files" = "kann Dateien speichern"
+"conditional prototype actions nested too deeply were skipped" = "zu tief verschachtelte bedingte Prototyp-Aktionen wurden übersprungen"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "bedingte Prototyp-Aktionen mit nicht auswertbaren Bedingungen wurden übersprungen"
+"connector label background was skipped: style data is missing" = "Hintergrund der Verbinderbeschriftung wurde übersprungen: Stildaten fehlen"
+"connector label was skipped: background bounds are invalid" = "Verbinderbeschriftung wurde übersprungen: Grenzen des Hintergrunds sind ungültig"
+"connector label was skipped: background transform is invalid" = "Verbinderbeschriftung wurde übersprungen: Transformation des Hintergrunds ist ungültig"
+"connector label was skipped: composed text transform is invalid" = "Verbinderbeschriftung wurde übersprungen: zusammengesetzte Texttransformation ist ungültig"
+"connector label was skipped: derived background bounds are missing" = "Verbinderbeschriftung wurde übersprungen: abgeleitete Grenzen des Hintergrunds fehlen"
+"connector label was skipped: derived text bounds are missing" = "Verbinderbeschriftung wurde übersprungen: abgeleitete Textgrenzen fehlen"
+"connector label was skipped: text bounds are invalid" = "Verbinderbeschriftung wurde übersprungen: Textgrenzen sind ungültig"
+"connector label was skipped: text style data is missing" = "Verbinderbeschriftung wurde übersprungen: Textstildaten fehlen"
+"connector label was skipped: text transform is invalid" = "Verbinderbeschriftung wurde übersprungen: Texttransformation ist ungültig"
+"connector labels were skipped" = "Verbinderbeschriftungen wurden übersprungen"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "Verbinderebenen werden als statische Rahmen- oder Vektor-Momentaufnahmen importiert, mit Beschriftungen, sofern vorhanden; dynamische Bindungen der Endpunkte bleiben nicht erhalten"
+"connector snapshot vector data is missing; connector was left empty" = "Vektordaten der Verbinder-Momentaufnahme fehlen; der Verbinder bleibt leer"
+"connectors whose ends can't be placed are empty" = "Verbinder, deren Enden sich nicht platzieren lassen, sind leer"
 "crop marks" = "Schnittmarken"
+"damaged vector geometry was skipped" = "beschädigte Vektorgeometrie wurde übersprungen"
+"damaged vector networks import as outlines" = "beschädigte Vektornetze werden als Umrisse importiert"
 "development: {path}" = "Entwicklung: {path}"
+"document children other than pages were skipped" = "Dokumentinhalte, die keine Seiten sind, wurden übersprungen"
+"duplicate grid track sizing entries use equal tracks" = "doppelte Größeneinträge für Rasterspuren verwenden gleich große Spuren"
 "e.g. count + 1" = "z. B. count + 1"
 "e.g. count >= 3 and not done" = "z. B. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "gewinkelte und gebogene Verbinder ohne gespeicherten Pfad werden als gerade Linien importiert"
+"entries without a node type were skipped" = "Einträge ohne Knotentyp wurden übersprungen"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "figcraft://-Links aus Browser, Chat oder E-Mail öffnen diese App und treten der Sitzung bei."
+"filled areas of a vector with their own fill use the layer's fill" = "gefüllte Bereiche eines Vektors mit eigener Füllung verwenden die Füllung der Ebene"
 "from {server}" = "von {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "Gamepad-Auslöser ohne genau eine bekannte Controllertaste wurden übersprungen"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "die Liste der Rasterspuren hat mehr als 1000 Einträge; die Spuren verwenden die standardmäßige gleiche Größe"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "die Größe der Rasterspuren wird nicht unterstützt oder ist fehlerhaft; betroffene Spuren sind gleich groß"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "die Liste der Rasterspurgrößen hat mehr als 1000 Einträge; die Spuren verwenden die standardmäßige gleiche Größe"
 "hidden" = "ausgeblendet"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "Bildfilter sind mehrdeutig, weil beide Filtercontainer vorhanden sind; die Filterumwandlung wurde übersprungen"
+"image filters use FigCraft's approximate renderer" = "Bildfilter verwenden die näherungsweise Darstellung von FigCraft"
+"instance swap properties whose default component isn't in the file were skipped" = "Instanztausch-Eigenschaften, deren Standardkomponente nicht in der Datei ist, wurden übersprungen"
+"instances inside their own main component were imported as frames" = "Instanzen innerhalb ihrer eigenen Hauptkomponente wurden als Rahmen importiert"
+"instances of components that aren't in the file show no layers" = "Instanzen von Komponenten, die nicht in der Datei sind, zeigen keine Ebenen"
+"instances of components that aren't in the file were imported as frames" = "Instanzen von Komponenten, die nicht in der Datei sind, wurden als Rahmen importiert"
+"instances that would nest a component inside itself were imported as frames" = "Instanzen, die eine Komponente in sich selbst verschachteln würden, wurden als Rahmen importiert"
+"instances without a main component were imported as empty frames" = "Instanzen ohne Hauptkomponente wurden als leere Rahmen importiert"
+"invalid internal .fig text path data was ignored" = "ungültige interne .fig-Daten für Text auf Pfad wurden ignoriert"
+"invalid or oversized vector networks import as outlines" = "ungültige oder zu große Vektornetze werden als Umrisse importiert"
+"invalid or oversized vector path data was skipped" = "ungültige oder zu große Vektorpfaddaten wurden übersprungen"
+"key triggers without a supported key were skipped" = "Tastenauslöser ohne unterstützte Taste wurden übersprungen"
+"key up triggers import as key presses" = "Auslöser beim Loslassen einer Taste werden als Tastendruck importiert"
+"layers without a position were placed at their parent's origin" = "Ebenen ohne Position wurden am Ursprung ihres übergeordneten Elements platziert"
+"layers without a type were skipped" = "Ebenen ohne Typ wurden übersprungen"
+"legacy image filter container is unsupported; filter conversion was skipped" = "der veraltete Bildfiltercontainer wird nicht unterstützt; die Filterumwandlung wurde übersprungen"
 "locked" = "gesperrt"
+"malformed image filters container was skipped" = "fehlerhafter Bildfiltercontainer wurde übersprungen"
+"malformed image paintFilter container was skipped" = "fehlerhafter paintFilter-Container des Bildes wurde übersprungen"
+"malformed slot content assignment was skipped" = "fehlerhafte Zuweisung von Slot-Inhalt wurde übersprungen"
 "no bleed" = "kein Anschnitt"
 "nobody else here yet" = "noch niemand sonst hier"
+"non-default slot settings are not represented and were skipped" = "vom Standard abweichende Slot-Einstellungen werden nicht abgebildet und wurden übersprungen"
 "now" = "jetzt"
+"offer files to save if it asks to (you choose where each one goes)" = "Dateien zum Speichern anbieten, falls es darum bittet (Sie wählen, wohin jede kommt)"
 "or" = "oder"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "die Konturecken der Punkte wurden übernommen; gestrichelte Konturen und Konturen mit variabler Breite werden mit der Ecke der Ebene gezeichnet"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "bevorzugte Komponentenschlüssel von Slots lassen sich keinen Ebenen der Datei zuordnen und wurden übersprungen"
+"prototype actions of unknown types were skipped" = "Prototyp-Aktionen unbekannter Art wurden übersprungen"
+"prototype actions without a destination in the file were skipped" = "Prototyp-Aktionen ohne Ziel in der Datei wurden übersprungen"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "Prototyp-Ausdrücke mit Variablen, die nicht im Variablen-JSON sind, wurden übersprungen"
+"prototype expressions with unsupported functions were skipped" = "Prototyp-Ausdrücke mit nicht unterstützten Funktionen wurden übersprungen"
+"prototype interactions without supported actions were skipped" = "Prototyp-Interaktionen ohne unterstützte Aktionen wurden übersprungen"
+"prototype navigations of unknown types were skipped" = "Prototyp-Navigationen unbekannter Art wurden übersprungen"
+"prototype transitions of unknown types play instantly" = "Prototyp-Übergänge unbekannter Art werden sofort ausgeführt"
+"prototype triggers of unknown types were skipped" = "Prototyp-Auslöser unbekannter Art wurden übersprungen"
 "put a widget on the canvas" = "ein Widget auf die Arbeitsfläche setzen"
 "read and edit the document" = "das Dokument lesen und bearbeiten"
 "read the document" = "das Dokument lesen"
 "reads the document" = "liest das Dokument"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "Aktionen „Variable festlegen“ für Variablen, die nicht im Variablen-JSON sind, wurden übersprungen"
+"set-variable actions with values that can't be evaluated were skipped" = "Aktionen „Variable festlegen“ mit nicht auswertbaren Werten wurden übersprungen"
+"set-variable actions with values that don't fit the variable were skipped" = "Aktionen „Variable festlegen“ mit Werten, die nicht zur Variable passen, wurden übersprungen"
+"set-variable actions without a value were skipped" = "Aktionen „Variable festlegen“ ohne Wert wurden übersprungen"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "Aktionen „Variablenmodus festlegen“ für Sammlungen oder Modi, die nicht im Variablen-JSON sind, wurden übersprungen"
+"slot content assignment target is missing or is not slot content" = "das Ziel der Slot-Inhaltszuweisung fehlt oder ist kein Slot-Inhalt"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "die Slot-Inhaltszuweisung verwendet die leere GUID als Platzhalterwert und wurde übersprungen"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "einige Vektorpunkte verweisen auf Punkteinstellungen, die in der Datei fehlen; sie übernehmen die Ecken der Ebenenkontur und bleiben ungerundet"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "einige Vektorsegmente verweisen auf Stileinstellungen, die in der Datei fehlen; sie verwenden die Kontur der Ebene"
+"stale or invalid grid track sizing entries were ignored" = "veraltete oder ungültige Größeneinträge für Rasterspuren wurden ignoriert"
+"stars and polygons without point counts or geometry use the default point count" = "Sterne und Polygone ohne Punktanzahl oder Geometrie verwenden die Standard-Punktanzahl"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "Stileinstellungen einiger Vektorsegmente werden nicht unterstützt; diese Segmente verwenden die Kontur der Ebene"
+"text path underline or strikethrough decoration is not rendered" = "Unter- oder Durchstreichung von Text auf Pfad wird nicht dargestellt"
+"text style overrides refer to missing table entries" = "Textstil-Überschreibungen verweisen auf fehlende Tabelleneinträge"
+"the file has no pages" = "die Datei hat keine Seiten"
 "the plugin" = "das Plugin"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "das Variablen-JSON enthält keine `variableCollections` (erwartet wurde die Antwort mit den lokalen Variablen) und wurde ignoriert"
 "this session only" = "nur diese Sitzung"
+"unknown component property types were skipped" = "unbekannte Komponenteneigenschaftstypen wurden übersprungen"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "Variablen-Aliase auf Variablen, die nicht im Variablen-JSON sind (oder einen anderen Typ haben), wurden übersprungen"
+"variable bindings to properties the layer doesn't have were skipped" = "Variablenbindungen an Eigenschaften, die die Ebene nicht hat, wurden übersprungen"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "Variablenbindungen an Variablen, die nicht im Variablen-JSON sind (Bibliotheksvariablen), wurden übersprungen"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "Variablenbindungen wurden übersprungen: Das Datei-JSON enthält keine Variablendefinitionen (übergeben Sie das lokale Variablen-JSON als `variables` oder betten Sie dessen `meta` neben dem Datei-JSON ein)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "Variablenbindungen, deren Variablentyp nicht zur Eigenschaft passt, wurden übersprungen"
+"variable collections without modes were skipped" = "Variablensammlungen ohne Modi wurden übersprungen"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "Variablenmodus-Abfragen in Prototyp-Ausdrücken, die nicht aus einer Variable und einem ihrer Modi bestehen, wurden übersprungen"
+"variable modes of collections that aren't in the file were skipped" = "Variablenmodi von Sammlungen, die nicht in der Datei sind, wurden übersprungen"
+"variable modes of collections that aren't in the variables JSON were skipped" = "Variablenmodi von Sammlungen, die nicht im Variablen-JSON sind, wurden übersprungen"
+"variable values that don't match their type (or composed colours) were skipped" = "Variablenwerte, die nicht zu ihrem Typ passen (oder zusammengesetzte Farben), wurden übersprungen"
+"variables of unknown types were skipped" = "Variablen unbekannter Typen wurden übersprungen"
+"variables whose collection isn't in the variables JSON were skipped" = "Variablen, deren Sammlung nicht im Variablen-JSON ist, wurden übersprungen"
+"variables without readable values were skipped" = "Variablen ohne lesbare Werte wurden übersprungen"
+"vector points with unknown stroke joins use the layer join" = "Vektorpunkte mit unbekannten Konturecken verwenden die Ecke der Ebene"
+"vectors without geometry are empty" = "Vektoren ohne Geometrie sind leer"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "Vektoren ohne Geometrie sind leer (exportieren Sie das Datei-JSON mit geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "sehr langer Text wurde auf 1.048.576 Zeichen gekürzt"
+"very long vector paths were skipped" = "sehr lange Vektorpfade wurden übersprungen"
+"video actions are not supported and were skipped" = "Videoaktionen werden nicht unterstützt und wurden übersprungen"
+"video triggers are not supported and were skipped" = "Videoauslöser werden nicht unterstützt und wurden übersprungen"
 "{instances} in {files}" = "{instances} in {files}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}: Übersetzungsentwurf, wartet auf die Prüfung durch Muttersprachler."
 "{length} bleed" = "{length} Anschnitt"
@@ -1468,6 +1664,7 @@ status = "draft — needs native review"
 "{name} is forgotten on this computer; the file stays on {server}" = "{name} wurde auf diesem Computer vergessen; die Datei bleibt auf {server}"
 "{name} is on the server." = "{name} liegt auf dem Server."
 "{name} is spotlighting" = "{name} hat das Spotlight"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} ist zu groß, um im Browser geöffnet zu werden (über 512 MB)."
 "{name} was removed from the server" = "{name} wurde vom Server entfernt"
 "{name} · deleted on main" = "{name} · in der Hauptdatei gelöscht"
 "{name} · deleted on the branch" = "{name} · im Branch gelöscht"
@@ -1494,8 +1691,10 @@ status = "draft — needs native review"
 "{n} layers selected" = { one = "{n} Ebene ausgewählt", other = "{n} Ebenen ausgewählt" }
 "{n} layers · {parts}" = { one = "{n} Ebene · {parts}", other = "{n} Ebenen · {parts}" }
 "{n} matches" = { one = "{n} Treffer", other = "{n} Treffer" }
+"{n} min" = "{n} Min."
 "{n} minutes ago" = { one = "vor {n} Minute", other = "vor {n} Minuten" }
 "{n} months ago" = { one = "vor {n} Monat", other = "vor {n} Monaten" }
+"{n} more notes omitted from this report" = { one = "{n} weitere Notiz in diesem Bericht nicht aufgeführt", other = "{n} weitere Notizen in diesem Bericht nicht aufgeführt" }
 "{n} of {total}" = "{n} von {total}"
 "{n} people joined" = { one = "{n} Person ist beigetreten", other = "{n} Personen sind beigetreten" }
 "{n} preferred components" = { one = "{n} bevorzugte Komponente", other = "{n} bevorzugte Komponenten" }
@@ -1505,6 +1704,8 @@ status = "draft — needs native review"
 "{n} rows" = { one = "{n} Zeile", other = "{n} Zeilen" }
 "{n} styles" = { one = "{n} Stil", other = "{n} Stile" }
 "{n} variables" = { one = "{n} Variable", other = "{n} Variablen" }
+"{n} votes" = { one = "{n} Stimme", other = "{n} Stimmen" }
+"{n} votes left" = { one = "Noch {n} Stimme", other = "Noch {n} Stimmen" }
 "{n} weeks ago" = { one = "vor {n} Woche", other = "vor {n} Wochen" }
 "{n} years ago" = { one = "vor {n} Jahr", other = "vor {n} Jahren" }
 "{n}d" = "{n} T."
@@ -1555,7 +1756,26 @@ status = "draft — needs native review"
 "arrange.packH" = "Horizontal zusammenschieben"
 "arrange.packV" = "Vertikal zusammenschieben"
 "arrange.roundToPixels" = "Auf Pixel runden"
+"arrange.spacing" = "Abstand"
 "arrange.tidy" = "Aufräumen"
+"board.connector" = "Verbinder"
+"board.ink" = "Markerstrich"
+"board.label" = "Verbinderbeschriftung"
+"board.nextSticky" = "Nächste Haftnotiz"
+"board.reattach" = "Verbinder neu verbinden"
+"board.setColor" = "Whiteboard-Farbe"
+"board.setStyle" = "Whiteboard-Stil"
+"board.shape" = "Form mit Text"
+"board.stamp" = "Stempel"
+"board.sticky" = "Haftnotiz"
+"board.table" = "Tabelle"
+"board.tableEdit" = "Tabelle bearbeiten"
+"board.template" = "Whiteboard-Vorlage"
+"board.templates" = "Whiteboard-Vorlagen auflisten"
+"board.timer" = "Timer"
+"board.timerState" = "Timer-Status"
+"board.vote" = "Abstimmung"
+"board.voteResults" = "Abstimmungsergebnisse"
 "bool.exclude" = "Auswahl ausschließen"
 "bool.flatten" = "Boolesche Gruppe zusammenfügen"
 "bool.intersect" = "Schnittmenge der Auswahl"
@@ -1631,6 +1851,9 @@ status = "draft — needs native review"
 "dev.focus" = "Fokusansicht"
 "dev.resolveChange" = "Änderung erledigen"
 "dev.unfocus" = "Fokusansicht verlassen"
+"devMode.addMeasurement" = "Messung hinzufügen"
+"devMode.measurements" = "Messungen auflisten"
+"devMode.removeMeasurement" = "Messung entfernen"
 "devResource.add" = "Entwicklerressource hinzufügen"
 "devResource.edit" = "Entwicklerressource bearbeiten"
 "devResource.list" = "Entwicklerressourcen auflisten"
@@ -1654,6 +1877,7 @@ status = "draft — needs native review"
 "edit.duplicate" = "Duplizieren"
 "edit.findReplace" = "Suchen und ersetzen"
 "edit.paste" = "Einfügen"
+"edit.pasteDesignLayers" = "Designebenen einfügen"
 "edit.pasteOver" = "Über Auswahl einfügen"
 "edit.pasteProperties" = "Eigenschaften einfügen"
 "edit.pasteReplace" = "Zum Ersetzen einfügen"
@@ -1677,7 +1901,9 @@ status = "draft — needs native review"
 "file.exportLayers" = "Ebenen exportieren"
 "file.exportSvg" = "Auswahl als SVG exportieren"
 "file.import" = "Importieren"
+"file.moveTab" = "Tab verschieben"
 "file.new" = "Neue Designdatei"
+"file.newBoard" = "Neues Whiteboard"
 "file.open" = "Öffnen"
 "file.openRecent" = "Zuletzt verwendete öffnen"
 "file.placeImage" = "Bild platzieren"
@@ -1814,6 +2040,7 @@ status = "draft — needs native review"
 "pref.reduceMotion" = "Bewegung reduzieren"
 "pref.renameDuplicates" = "Duplizierte Ebenen umbenennen"
 "pref.showDimensions" = "Abmessungen an Objekten anzeigen"
+"pref.startOnHome" = "Mit Start beginnen"
 "pref.userName" = "Ihr Name in Kommentaren"
 "proto.action.add" = "Prototyp-Aktion hinzufügen"
 "proto.action.move" = "Prototyp-Aktion neu anordnen"
@@ -1857,6 +2084,12 @@ status = "draft — needs native review"
 "select.sameStroke" = "Gleiche Kontur auswählen"
 "select.sameText" = "Gleiche Texteigenschaften auswählen"
 "select.set" = "Auswählen"
+"selection.applyColorStyle" = "Farbstil auf Auswahl anwenden"
+"selection.bindColorVariable" = "Farbvariable auf Auswahl anwenden"
+"selection.colors" = "Auswahlfarben"
+"selection.detachColor" = "Auswahlfarbe lösen"
+"selection.selectColor" = "Ebenen mit dieser Farbe auswählen"
+"selection.setPaint" = "Farbe der Auswahl ändern"
 "shape.arrow" = "Pfeil"
 "shape.ellipse" = "Ellipse"
 "shape.line" = "Linie"
@@ -1936,10 +2169,14 @@ status = "draft — needs native review"
 "text.weightUp" = "Schriftstärke erhöhen"
 "tool.arrow" = "Pfeil"
 "tool.comment" = "Kommentar"
+"tool.connector" = "Verbinder"
 "tool.ellipse" = "Ellipse"
+"tool.eraser" = "Radiergummi"
 "tool.frame" = "Rahmen"
 "tool.hand" = "Hand"
+"tool.highlighter" = "Textmarker"
 "tool.line" = "Linie"
+"tool.marker" = "Marker"
 "tool.move" = "Verschieben"
 "tool.pen" = "Zeichenstift"
 "tool.pencil" = "Bleistift"
@@ -1951,9 +2188,12 @@ status = "draft — needs native review"
 "tool.scaleAnchor" = "Skalierungsanker"
 "tool.section" = "Abschnitt"
 "tool.set" = "Werkzeug wählen"
+"tool.shape" = "Formen"
 "tool.shapeBuilder" = "Formerstellung"
 "tool.slice" = "Slice"
+"tool.stamp" = "Stempel"
 "tool.star" = "Stern"
+"tool.sticky" = "Haftnotiz"
 "tool.text" = "Text"
 "transform.move" = "Verschieben"
 "transform.moveTo" = "Verschieben nach"
@@ -2015,11 +2255,13 @@ status = "draft — needs native review"
 "vector.edit.tool" = "Vektorbearbeitungswerkzeug"
 "vector.edit.transform" = "Punkte transformieren"
 "vector.edit.widthPoint" = "Breitenpunkt"
+"vector.fillRule" = "Füllregel festlegen"
 "vector.flatten" = "Zusammenfügen"
 "vector.join" = "Auswahl verbinden"
 "vector.offset" = "Pfad versetzen"
 "vector.outlineStroke" = "Kontur in Pfad umwandeln"
 "vector.reverse" = "Pfadrichtung umkehren"
+"vector.reverseLoop" = "Schleife umdrehen"
 "vector.simplify" = "Vektor vereinfachen"
 "vector.smoothJoin" = "Auswahl glatt verbinden"
 "version.autosave" = "Version automatisch speichern"
@@ -2078,6 +2320,8 @@ status = "draft — needs native review"
 "widget.click" = "Widget anklicken"
 "widget.insert" = "Widget einfügen"
 "widget.list" = "Widgets auflisten"
+"widget.menu" = "Widget-Menü"
+"widget.setText" = "Widget-Feld bearbeiten"
 "window.focus" = "Fenster in den Vordergrund holen"
 "window.new" = "Neues Fenster"
 
diff --git a/crates/ui-egui/locales/en.toml b/crates/ui-egui/locales/en.toml
index 272224a9..068e1a21 100644
--- a/crates/ui-egui/locales/en.toml
+++ b/crates/ui-egui/locales/en.toml
@@ -16,6 +16,7 @@ name = "English"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "A collection of this file with these modes and variables: override their values per mode and add variables of its own"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "A .figcraft file with this name already exists. Choose its full name to confirm replacement."
 "A layer on its own aligns to its frame: select more layers, or one in a frame" = "A layer on its own aligns to its frame: select more layers, or one in a frame"
 "A responsive product page: hero, features, figures, a quote and a footer" = "A responsive product page: hero, features, figures, a quote and a footer"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "A spring plays until it settles: its mass, stiffness and damping set how long"
@@ -35,6 +36,7 @@ name = "English"
 "Add a description" = "Add a description"
 "Add a frame (F) or a shape (R) to get started" = "Add a frame (F) or a shape (R) to get started"
 "Add a layer or component to tile first" = "Add a layer or component to tile first"
+"Add a minute" = "Add a minute"
 "Add a note for developers" = "Add a note for developers"
 "Add action" = "Add action"
 "Add actions for when no condition holds" = "Add actions for when no condition holds"
@@ -42,6 +44,7 @@ name = "English"
 "Add another condition" = "Add another condition"
 "Add auto layout" = "Add auto layout"
 "Add background behind overlay" = "Add background behind overlay"
+"Add column" = "Add column"
 "Add content to this slot" = "Add content to this slot"
 "Add dev resource" = "Add dev resource"
 "Add effect" = "Add effect"
@@ -53,6 +56,7 @@ name = "English"
 "Add library file…" = "Add library file…"
 "Add max height" = "Add max height"
 "Add max width" = "Add max width"
+"Add measurement" = "Add measurement"
 "Add min height" = "Add min height"
 "Add min width" = "Add min width"
 "Add mode" = "Add mode"
@@ -60,6 +64,7 @@ name = "English"
 "Add or update collections from a variables JSON" = "Add or update collections from a variables JSON"
 "Add properties to make instances configurable" = "Add properties to make instances configurable"
 "Add reaction" = "Add reaction"
+"Add row" = "Add row"
 "Add starting point" = "Add starting point"
 "Add stroke" = "Add stroke"
 "Add variant" = "Add variant"
@@ -89,8 +94,14 @@ name = "English"
 "All comments" = "All comments"
 "All components" = "All components"
 "All fonts" = "All fonts"
+"All objects" = "All objects"
 "All supported properties" = "All supported properties"
+"All the fonts this file uses are installed" = "All the fonts this file uses are installed"
 "All variables" = "All variables"
+"Along the bottom" = "Along the bottom"
+"Along the left" = "Along the left"
+"Along the right" = "Along the right"
+"Along the top" = "Along the top"
 "Alpha" = "Alpha"
 "Alphabetical" = "Alphabetical"
 "Alt+drag" = "Alt+drag"
@@ -98,6 +109,7 @@ name = "English"
 "An invite link that opens FigCraft and joins" = "An invite link that opens FigCraft and joins"
 "Anchor" = "Anchor"
 "Android" = "Android"
+"Android Vector Drawable" = "Android Vector Drawable"
 "Angular" = "Angular"
 "Animation" = "Animation"
 "Annotations" = "Annotations"
@@ -123,6 +135,7 @@ name = "English"
 "Archived" = "Archived"
 "Arrange" = "Arrange"
 "Arrow" = "Arrow"
+"Arrow at the end" = "Arrow at the end"
 "As typed" = "As typed"
 "Asking the server…" = "Asking the server…"
 "Assets" = "Assets"
@@ -154,6 +167,8 @@ name = "English"
 "Basics" = "Basics"
 "Before" = "Before"
 "Bend" = "Bend"
+"Best effort" = "Best effort"
+"Between the selected layers" = "Between the selected layers"
 "Bevel" = "Bevel"
 "Binary assets added" = "Binary assets added"
 "Binary assets removed" = "Binary assets removed"
@@ -170,7 +185,9 @@ name = "English"
 "Both directions" = "Both directions"
 "Bottom" = "Bottom"
 "Bottom left radius" = "Bottom left radius"
+"Bottom padding" = "Bottom padding"
 "Bottom right radius" = "Bottom right radius"
+"Brainstorm" = "Brainstorm"
 "Branch" = "Branch"
 "Branch archived" = "Branch archived"
 "Branch merged" = "Branch merged"
@@ -196,12 +213,25 @@ name = "English"
 "C or ⇧C" = "C or ⇧C"
 "CMYK colour" = "CMYK colour"
 "Can view" = "Can view"
+"Check" = "Check"
+"Check for Updates" = "Check for Updates"
+"Check for updates…" = "Check for updates…"
+"Checking for updates…" = "Checking for updates…"
+"Checking the fonts installed on this computer…" = "Checking the fonts installed on this computer…"
 "Checking the server…" = "Checking the server…"
+"Chevron" = "Chevron"
 "Clear from this list" = "Clear from this list"
+"Clear results" = "Clear results"
+"Click objects to vote; click your badge to take a vote back" = "Click objects to vote; click your badge to take a vote back"
 "Code or invite link" = "Code or invite link"
 "Color profile: {name}" = "Color profile: {name}"
 "Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Colour and text styles, Light and Dark variables, buttons, inputs and cards"
+"Compatibility" = "Compatibility"
+"Connector" = "Connector"
+"Convert to frame" = "Convert to frame"
+"Convert to section" = "Convert to section"
 "CSS custom properties…" = "CSS custom properties…"
+"Dart constants for Flutter…" = "Dart constants for Flutter…"
 "Can edit" = "Can edit"
 "Can't read this library: {e}" = "Can't read this library: {e}"
 "Cancel" = "Cancel"
@@ -222,7 +252,7 @@ name = "English"
 "Changes on main" = "Changes on main"
 "Changes on the branch" = "Changes on the branch"
 "Changes unknown" = "Changes unknown"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code."
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code."
 "Choose another profile to change it." = "Choose another profile to change it."
 "Choose collection" = "Choose collection"
 "Choose image" = "Choose image"
@@ -243,7 +273,6 @@ name = "English"
 "Close tab" = "Close tab"
 "Close version history" = "Close version history"
 "Close when clicking outside" = "Close when clicking outside"
-"Close without saving" = "Close without saving"
 "Code" = "Code"
 "Code syntax" = "Code syntax"
 "Collapse" = "Collapse"
@@ -270,6 +299,8 @@ name = "English"
 "Commits" = "Commits"
 "Company" = "Company"
 "Compare changes" = "Compare changes"
+"Compare with" = "Compare with"
+"Compatibility notes" = "Compatibility notes"
 "Completed" = "Completed"
 "Component" = "Component"
 "Component name" = "Component name"
@@ -288,7 +319,6 @@ name = "English"
 "Constraints" = "Constraints"
 "Content" = "Content"
 "Contents hidden" = "Contents hidden"
-"Contents only" = "Contents only"
 "Contextual alternates" = "Contextual alternates"
 "Contrast" = "Contrast"
 "Contributors" = "Contributors"
@@ -306,14 +336,21 @@ name = "English"
 "Copy as PNG" = "Copy as PNG"
 "Copy as SVG" = "Copy as SVG"
 "Copy code" = "Copy code"
+"Copy effect" = "Copy effect"
+"Copy fill" = "Copy fill"
 "Copy link" = "Copy link"
+"Copy stroke" = "Copy stroke"
 "Copy the {label}" = "Copy the {label}"
 "Copy {value}" = "Copy {value}"
 "Corner radius" = "Corner radius"
 "Corner smoothing" = "Corner smoothing"
+"Could not check for updates:\n{error}" = "Could not check for updates:\n{error}"
 "Couldn't download the variables" = "Couldn't download the variables"
+"Couldn't download {name}" = "Couldn't download {name}"
 "Couldn't reach {server}: showing what this computer remembers." = "Couldn't reach {server}: showing what this computer remembers."
+"Couldn't read {name}." = "Couldn't read {name}."
 "Couldn't save automatically: {error}" = "Couldn't save automatically: {error}"
+"Couldn't save the file" = "Couldn't save the file"
 "Count" = "Count"
 "Create" = "Create"
 "Create a variable collection first" = "Create a variable collection first"
@@ -337,6 +374,7 @@ name = "English"
 "Current version" = "Current version"
 "Cursor chat" = "Cursor chat"
 "Custom" = "Custom"
+"Custom size" = "Custom size"
 "Cut" = "Cut"
 "Dark" = "Dark"
 "Darken" = "Darken"
@@ -370,6 +408,7 @@ name = "English"
 "Description" = "Description"
 "Description (optional)" = "Description (optional)"
 "Design" = "Design"
+"Design panel" = "Design panel"
 "Design system starter" = "Design system starter"
 "Desktop" = "Desktop"
 "Destination" = "Destination"
@@ -381,6 +420,7 @@ name = "English"
 "Detach variable" = "Detach variable"
 "Details" = "Details"
 "Dev Mode" = "Dev Mode"
+"Dev Mode only inspects: switch to Design (Shift+D) to edit" = "Dev Mode only inspects: switch to Design (Shift+D) to edit"
 "Dev resources" = "Dev resources"
 "Development" = "Development"
 "Device" = "Device"
@@ -397,6 +437,8 @@ name = "English"
 "Distribute horizontal spacing" = "Distribute horizontal spacing"
 "Distribute vertical spacing" = "Distribute vertical spacing"
 "Divider" = "Divider"
+"Don't Save" = "Don't Save"
+"Don't show this again" = "Don't show this again"
 "Don't truncate" = "Don't truncate"
 "Done" = "Done"
 "Done editing" = "Done editing"
@@ -408,7 +450,7 @@ name = "English"
 "Draw" = "Draw"
 "Draw a frame" = "Draw a frame"
 "Drawing tools" = "Drawing tools"
-"Drop a .figcraft, .fig, .json, .svg or image file." = "Drop a .figcraft, .fig, .json, .svg or image file."
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Drop a .figcraft, .fig, .sketch, .json, .svg or image file."
 "Drop to import" = "Drop to import"
 "Drop to open" = "Drop to open"
 "Drop shadow" = "Drop shadow"
@@ -432,6 +474,8 @@ name = "English"
 "Effect settings" = "Effect settings"
 "Effect styles" = "Effect styles"
 "Effects" = "Effects"
+"Curved" = "Curved"
+"Elbow" = "Elbow"
 "Ellipse" = "Ellipse"
 "Ellipses" = "Ellipses"
 "Else" = "Else"
@@ -440,6 +484,7 @@ name = "English"
 "Empty" = "Empty"
 "End" = "End"
 "End point" = "End point"
+"End vote" = "End vote"
 "Ends the session; everyone keeps their copy" = "Ends the session; everyone keeps their copy"
 "Enter" = "Enter"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Enter the address of a figcraft-server and press Browse to see the plugins it offers."
@@ -449,6 +494,7 @@ name = "English"
 "Essential" = "Essential"
 "Every conflict has a choice." = "Every conflict has a choice."
 "Every top-level frame already starts a flow" = "Every top-level frame already starts a flow"
+"Exact only" = "Exact only"
 "Exact opacity (4 then 5: 45%)" = "Exact opacity (4 then 5: 45%)"
 "Exclude" = "Exclude"
 "Excluded" = "Excluded"
@@ -467,8 +513,10 @@ name = "English"
 "Export {n} layers" = { one = "Export {n} layer", other = "Export {n} layers" }
 "Exported {file}" = "Exported {file}"
 "Exported {name}" = "Exported {name}"
+"Exported {name}; {n} kinds of content were changed or left out" = { one = "Exported {name}; {n} kind of content was changed or left out", other = "Exported {name}; {n} kinds of content were changed or left out" }
 "Exported {name}; {n} kinds of content were left out" = { one = "Exported {name}; {n} kind of content was left out", other = "Exported {name}; {n} kinds of content were left out" }
 "Exported {n} files" = { one = "Exported {n} file", other = "Exported {n} files" }
+"Exported {n} files; some content was changed or left out" = { one = "Exported {n} file; some content was changed or left out", other = "Exported {n} files; some content was changed or left out" }
 "Export…" = "Export…"
 "Expose properties to instances" = "Expose properties to instances"
 "Exposure" = "Exposure"
@@ -482,6 +530,8 @@ name = "English"
 "Feb" = "Feb"
 "Fetching from the server…" = "Fetching from the server…"
 "FigCraft couldn't open its window: {error}" = "FigCraft couldn't open its window: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged."
+"FigCraft {version} is currently the newest version available." = "FigCraft {version} is currently the newest version available."
 "File" = "File"
 "File name" = "File name"
 "File not found" = "File not found"
@@ -515,6 +565,7 @@ name = "English"
 "Flip text to the other side" = "Flip text to the other side"
 "Flip vertical" = "Flip vertical"
 "Flip width profile" = "Flip width profile"
+"Flow chart" = "Flow chart"
 "Flow starting point" = "Flow starting point"
 "Flow starting points" = "Flow starting points"
 "Flows" = "Flows"
@@ -531,6 +582,7 @@ name = "English"
 "Font size" = "Font size"
 "Font style" = "Font style"
 "Forget on this computer" = "Forget on this computer"
+"Format" = "Format"
 "Four screens of a trail app with components and a prototype flow" = "Four screens of a trail app with components and a prototype flow"
 "Fractions" = "Fractions"
 "Frame" = "Frame"
@@ -567,6 +619,7 @@ name = "English"
 "Hanging list" = "Hanging list"
 "Hanging punctuation" = "Hanging punctuation"
 "Hard light" = "Hard light"
+"Heart" = "Heart"
 "Height" = "Height"
 "Help" = "Help"
 "Help and resources" = "Help and resources"
@@ -579,6 +632,7 @@ name = "English"
 "Hide these tips (Getting started in the Help menu shows them again)" = "Hide these tips (Getting started in the Help menu shows them again)"
 "Hide when publishing" = "Hide when publishing"
 "Highlight layers on hover" = "Highlight layers on hover"
+"Highlighter" = "Highlighter"
 "Highlights" = "Highlights"
 "Hold Alt" = "Hold Alt"
 "Hold Alt+Z" = "Hold Alt+Z"
@@ -605,12 +659,17 @@ name = "English"
 "If" = "If"
 "If {condition}" = "If {condition}"
 "Ignore auto layout (absolute position)" = "Ignore auto layout (absolute position)"
+"Ignore overlapping layers" = "Ignore overlapping layers"
+"Ignore unsupported" = "Ignore unsupported"
 "Image" = "Image"
+"Images" = "Images"
 "Import" = "Import"
 "Import path" = "Import path"
 "Import plugin from manifest" = "Import plugin from manifest"
 "Import plugin from manifest…" = "Import plugin from manifest…"
+"Import report" = "Import report"
 "Import variables" = "Import variables"
+"Imported document" = "Imported document"
 "Imported {name}" = "Imported {name}"
 "Imported {n} new variables, updated {updated}" = { one = "Imported {n} new variable, updated {updated}", other = "Imported {n} new variables, updated {updated}" }
 "Import…" = "Import…"
@@ -621,6 +680,7 @@ name = "English"
 "Included" = "Included"
 "Included in layout" = "Included in layout"
 "Individual corners" = "Individual corners"
+"Individual padding" = "Individual padding"
 "Individual strokes" = "Individual strokes"
 "Ink" = "Ink"
 "Inner shadow" = "Inner shadow"
@@ -638,11 +698,14 @@ name = "English"
 "Instance swap (no other component)" = "Instance swap (no other component)"
 "Instances" = "Instances"
 "Instant" = "Instant"
+"Intensity" = "Intensity"
 "Interaction" = "Interaction"
 "Interactions" = "Interactions"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps."
+"Interface size" = "Interface size"
 "Intersect" = "Intersect"
 "Intersects" = "Intersects"
+"Invalid color" = "Invalid color"
 "Invite link" = "Invite link"
 "Invite link copied" = "Invite link copied"
 "It asks permission to:" = "It asks permission to:"
@@ -661,6 +724,8 @@ name = "English"
 "Jun" = "Jun"
 "Just now" = "Just now"
 "Justify" = "Justify"
+"Kanban board" = "Kanban board"
+"Keep a measurement on the canvas for developers" = "Keep a measurement on the canvas for developers"
 "Keep appearance" = "Keep appearance"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift."
 "Keep tool selected after use" = "Keep tool selected after use"
@@ -687,8 +752,10 @@ name = "English"
 "Layout grids" = "Layout grids"
 "Leave session" = "Leave session"
 "Leaves" = "Leaves"
+"Leaving the prototype" = "Leaving the prototype"
 "Left" = "Left"
 "Left & right" = "Left & right"
+"Left padding" = "Left padding"
 "Left side" = "Left side"
 "Left side width" = "Left side width"
 "Letter case" = "Letter case"
@@ -740,6 +807,7 @@ name = "English"
 "Mark as resolved" = "Mark as resolved"
 "Mark as unread" = "Mark as unread"
 "Mark as unresolved" = "Mark as unresolved"
+"Marker" = "Marker"
 "Mask" = "Mask"
 "Mass · Stiffness · Damping" = "Mass · Stiffness · Damping"
 "Match (empty: the whole name)" = "Match (empty: the whole name)"
@@ -749,6 +817,7 @@ name = "English"
 "Maximize" = "Maximize"
 "May" = "May"
 "Measure to the selection" = "Measure to the selection"
+"Measurements" = "Measurements"
 "Merge into main" = "Merge into main"
 "Merge regions" = "Merge regions"
 "Merge the branch into the main file (one undo step) and archive it" = "Merge the branch into the main file (one undo step) and archive it"
@@ -757,10 +826,12 @@ name = "English"
 "Min H" = "Min H"
 "Min W" = "Min W"
 "Minimize" = "Minimize"
+"Minutes" = "Minutes"
 "Mirror angle" = "Mirror angle"
 "Mirror angle and length" = "Mirror angle and length"
 "Mirroring" = "Mirroring"
 "Missing" = "Missing"
+"Missing fonts" = "Missing fonts"
 "Missing layer" = "Missing layer"
 "Missing style" = "Missing style"
 "Missing variable" = "Missing variable"
@@ -798,9 +869,11 @@ name = "English"
 "Named instance" = "Named instance"
 "Navigate to" = "Navigate to"
 "Nested instance" = "Nested instance"
+"New board" = "New board"
 "New design file" = "New design file"
 "Newest first" = "Newest first"
 "Next or previous control in the focused region" = "Next or previous control in the focused region"
+"Next frame" = "Next frame"
 "Next ready for dev" = "Next ready for dev"
 "Next size option" = "Next size option"
 "No assets: no export settings, icons or images. Add export settings in the Design tab." = "No assets: no export settings, icons or images. Add export settings in the Design tab."
@@ -809,13 +882,17 @@ name = "English"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "No branches. A branch is a copy of the file to try changes in, then review and merge."
 "No category" = "No category"
 "No changes" = "No changes"
+"No color styles" = "No color styles"
 "No colour variables fit here." = "No colour variables fit here."
 "No colour variables yet. Create them in Local variables." = "No colour variables yet. Create them in Local variables."
 "No comments yet" = "No comments yet"
+"No compatibility warnings reported" = "No compatibility warnings reported"
 "No components yet. Select layers and press {keys}." = "No components yet. Select layers and press {keys}."
 "No conflicts." = "No conflicts."
 "No contributor data was built into this copy." = "No contributor data was built into this copy."
+"No device" = "No device"
 "No fonts match" = "No fonts match"
+"No files or templates match your search" = "No files or templates match your search"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead."
 "No layer changes to show." = "No layer changes to show."
 "No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link."
@@ -829,6 +906,7 @@ name = "English"
 "No model credits were built into this copy." = "No model credits were built into this copy."
 "No number variables fit here." = "No number variables fit here."
 "No number variables yet. Create them in Local variables." = "No number variables yet. Create them in Local variables."
+"No other pages" = "No other pages"
 "No paints" = "No paints"
 "No plugins on {server}." = "No plugins on {server}."
 "No plugins yet. Import a development plugin from its figcraft-plugin.json." = "No plugins yet. Import a development plugin from its figcraft-plugin.json."
@@ -846,6 +924,7 @@ name = "English"
 "No text styles yet. Click + to create one from the selected text." = "No text styles yet. Click + to create one from the selected text."
 "No variables fit here." = "No variables fit here."
 "No variables yet. Create them in Local variables." = "No variables yet. Create them in Local variables."
+"No votes yet" = "No votes yet"
 "Nobody else is here yet" = "Nobody else is here yet"
 "Noise" = "Noise"
 "None" = "None"
@@ -858,6 +937,7 @@ name = "English"
 "Not read yet" = "Not read yet"
 "Not shared" = "Not shared"
 "Note {n}" = "Note {n}"
+"Nothing changed since this version." = "Nothing changed since this version."
 "Nothing changed since this was marked ready for dev." = "Nothing changed since this was marked ready for dev."
 "Nothing here yet. Set a frame's status to list it." = "Nothing here yet. Set a frame's status to list it."
 "Nothing online yet. Use Share on a file to put it online and it is listed here." = "Nothing online yet. Use Share on a file to put it online and it is listed here."
@@ -895,6 +975,7 @@ name = "English"
 "Open branch" = "Open branch"
 "Open file" = "Open file"
 "Open files" = "Open files"
+"Open presentations" = "Open presentations"
 "Open in focus view" = "Open in focus view"
 "Open in new window" = "Open in new window"
 "Open invite links in FigCraft" = "Open invite links in FigCraft"
@@ -903,6 +984,7 @@ name = "English"
 "Open overlay" = "Open overlay"
 "Open prototype preview" = "Open prototype preview"
 "Open variables ({count})" = "Open variables ({count})"
+"Opened as a new document" = "Opened as a new document"
 "Opened “{name}” in a new tab" = "Opened “{name}” in a new tab"
 "Opening the file…" = "Opening the file…"
 "Opening {n} files as new files" = { one = "Opening as a new file", other = "Opening {n} files as new files" }
@@ -911,6 +993,7 @@ name = "English"
 "Orange" = "Orange"
 "Order" = "Order"
 "Other apps may not open every .fig file exported here." = "Other apps may not open every .fig file exported here."
+"Other" = "Other"
 "Others lose access and keep their copy; the file stays on the server for you" = "Others lose access and keep their copy; the file stays on the server for you"
 "Others type this under Share ▸ Join with a code" = "Others type this under Share ▸ Join with a code"
 "Outline stroke" = "Outline stroke"
@@ -928,7 +1011,12 @@ name = "English"
 "PDF print settings" = "PDF print settings"
 "Padding" = "Padding"
 "Page" = "Page"
+"Page deleted" = "Page deleted"
 "Pages" = "Pages"
+"Pages added to the document" = "Pages added to the document"
+"Pause" = "Pause"
+"Pink" = "Pink"
+"Placed on the current page" = "Placed on the current page"
 "Pages: {pages}" = "Pages: {pages}"
 "Paint bucket" = "Paint bucket"
 "Pan the canvas" = "Pan the canvas"
@@ -941,8 +1029,12 @@ name = "English"
 "Pass through" = "Pass through"
 "Paste a link (https://…)" = "Paste a link (https://…)"
 "Paste a team library link (a view link)" = "Paste a team library link (a view link)"
+"Paste effect" = "Paste effect"
+"Paste fill" = "Paste fill"
 "Paste here" = "Paste here"
+"Paste stroke" = "Paste stroke"
 "Paste to replace" = "Paste to replace"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Pasted design layers; {n} kind of content was left out", other = "Pasted design layers; {n} kinds of content were left out" }
 "Pattern" = "Pattern"
 "Pattern alignment" = "Pattern alignment"
 "Pattern scale" = "Pattern scale"
@@ -965,10 +1057,13 @@ name = "English"
 "Place a shape or frame (its tool chosen)" = "Place a shape or frame (its tool chosen)"
 "Place automatically" = "Place automatically"
 "Place image" = "Place image"
+"Plugin" = "Plugin"
 "Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust."
 "Plugins" = "Plugins"
+"Plugins & widgets" = "Plugins & widgets"
 "Plus darker" = "Plus darker"
 "Plus lighter" = "Plus lighter"
+"Plus one" = "Plus one"
 "Point" = "Point"
 "Points" = "Points"
 "Polygon" = "Polygon"
@@ -996,6 +1091,7 @@ name = "English"
 "Preview" = "Preview"
 "Preview this flow" = "Preview this flow"
 "Preview this frame" = "Preview this frame"
+"Previous frame" = "Previous frame"
 "Previous ready for dev" = "Previous ready for dev"
 "Progressive" = "Progressive"
 "Properties" = "Properties"
@@ -1016,6 +1112,7 @@ name = "English"
 "Push" = "Push"
 "Push changes to main component" = "Push changes to main component"
 "Put text on path" = "Put text on path"
+"Question" = "Question"
 "R" = "R"
 "Radial" = "Radial"
 "Radius" = "Radius"
@@ -1033,10 +1130,13 @@ name = "English"
 "Reduce motion" = "Reduce motion"
 "Refraction" = "Refraction"
 "Regular expression" = "Regular expression"
+"Relative to" = "Relative to"
+"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "Relative to your system's display scaling (100% is the system's own size). Document zoom is separate."
 "Remove" = "Remove"
 "Remove all" = "Remove all"
 "Remove annotation" = "Remove annotation"
 "Remove auto layout" = "Remove auto layout"
+"Remove column" = "Remove column"
 "Remove dev resource" = "Remove dev resource"
 "Remove export setting" = "Remove export setting"
 "Remove from recents" = "Remove from recents"
@@ -1045,10 +1145,12 @@ name = "English"
 "Remove guide" = "Remove guide"
 "Remove interaction" = "Remove interaction"
 "Remove library from this file" = "Remove library from this file"
+"Remove measurement" = "Remove measurement"
 "Remove min and max" = "Remove min and max"
 "Remove min and max height" = "Remove min and max height"
 "Remove min and max width" = "Remove min and max width"
 "Remove regions" = "Remove regions"
+"Remove row" = "Remove row"
 "Remove slot" = "Remove slot"
 "Remove starting point" = "Remove starting point"
 "Remove stop" = "Remove stop"
@@ -1061,6 +1163,7 @@ name = "English"
 "Removed" = "Removed"
 "Removed from the server" = "Removed from the server"
 "Removed since it was marked" = "Removed since it was marked"
+"Removed since this version" = "Removed since this version"
 "Rename" = "Rename"
 "Rename duplicated layers" = "Rename duplicated layers"
 "Rename folder" = "Rename folder"
@@ -1071,6 +1174,7 @@ name = "English"
 "Rename on the server…" = "Rename on the server…"
 "Rename page" = "Rename page"
 "Rename to" = "Rename to"
+"Reorder selection" = "Reorder selection"
 "Replace all" = "Replace all"
 "Replace mixed export settings" = "Replace mixed export settings"
 "Replace with" = "Replace with"
@@ -1090,6 +1194,7 @@ name = "English"
 "Resize by the nudge amount" = "Resize by the nudge amount"
 "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond"
 "Resize to fit" = "Resize to fit"
+"Resizing" = "Resizing"
 "Resolve" = "Resolve"
 "Resolve change" = "Resolve change"
 "Resolved" = "Resolved"
@@ -1100,11 +1205,15 @@ name = "English"
 "Restore main component" = "Restore main component"
 "Restore this version" = "Restore this version"
 "Restored “{name}”" = "Restored “{name}”"
+"Retrospective" = "Retrospective"
+"Results" = "Results"
+"Resume" = "Resume"
 "Reverse the order" = "Reverse the order"
 "Reversed triangle" = "Reversed triangle"
 "Review and merge" = "Review and merge"
 "Ribbon" = "Ribbon"
 "Right" = "Right"
+"Right padding" = "Right padding"
 "Right side" = "Right side"
 "Right side width" = "Right side width"
 "Rotate 90°" = "Rotate 90°"
@@ -1115,6 +1224,7 @@ name = "English"
 "Rotation jitter" = "Rotation jitter"
 "Round" = "Round"
 "Rounded" = "Rounded"
+"Rounded rectangle" = "Rounded rectangle"
 "Row" = "Row"
 "Row gap" = "Row gap"
 "Row sizes" = "Row sizes"
@@ -1124,6 +1234,7 @@ name = "English"
 "Rulers" = "Rulers"
 "Run" = "Run"
 "Run {label}" = "Run {label}"
+"Save file" = "Save file"
 "Save files automatically" = "Save files automatically"
 "Search templates" = "Search templates"
 "See all templates" = "See all templates"
@@ -1151,8 +1262,11 @@ name = "English"
 "Search actions, layers and tools" = "Search actions, layers and tools"
 "Search assets" = "Search assets"
 "Search comments" = "Search comments"
+"Search files and templates" = "Search files and templates"
+"Search results" = "Search results"
 "Search fonts" = "Search fonts"
 "Search layers" = "Search layers"
+"Search pages" = "Search pages"
 "Search shortcuts" = "Search shortcuts"
 "Section" = "Section"
 "Section color" = "Section color"
@@ -1164,9 +1278,11 @@ name = "English"
 "Select all with same" = "Select all with same"
 "Select layer" = "Select layer"
 "Select layers to apply the style to" = "Select layers to apply the style to"
+"Select layers with this color" = "Select layers with this color"
 "Select overlapping shapes" = "Select overlapping shapes"
 "Select points to edit their position, radius and mirroring" = "Select points to edit their position, radius and mirroring"
 "Select slot" = "Select slot"
+"Selection colors" = "Selection colors"
 "Selection" = "Selection"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels"
@@ -1177,7 +1293,9 @@ name = "English"
 "Server address (ws://host:47900/)" = "Server address (ws://host:47900/)"
 "Server address" = "Server address"
 "Server for online sharing" = "Server for online sharing"
+"Server key" = "Server key"
 "Set as default" = "Set as default"
+"Set corner smoothing to 60%" = "Set corner smoothing to 60%"
 "Set variable" = "Set variable"
 "Set variable mode" = "Set variable mode"
 "Set variable {name}" = "Set variable {name}"
@@ -1186,6 +1304,7 @@ name = "English"
 "Shape" = "Shape"
 "Shape builder" = "Shape builder"
 "Shape tools" = "Shape tools"
+"Shapes" = "Shapes"
 "Share" = "Share"
 "Share this file" = "Share this file"
 "Share with a code" = "Share with a code"
@@ -1252,10 +1371,13 @@ name = "English"
 "Space+drag" = "Space+drag"
 "Spacing" = "Spacing"
 "Spam, stolen work, abuse…" = "Spam, stolen work, abuse…"
+"Speech bubble" = "Speech bubble"
 "Splay" = "Splay"
 "Spotlight me" = "Spotlight me"
 "Spread" = "Spread"
 "Square" = "Square"
+"Stamp" = "Stamp"
+"Stamps" = "Stamps"
 "Standard" = "Standard"
 "Standard ligatures" = "Standard ligatures"
 "Star" = "Star"
@@ -1265,18 +1387,26 @@ name = "English"
 "Start from a blank canvas" = "Start from a blank canvas"
 "Start from a template" = "Start from a template"
 "Start on path" = "Start on path"
+"Start on the Home screen" = "Start on the Home screen"
 "Start point" = "Start point"
 "Start sharing" = "Start sharing"
 "Start sharing with the Share button, then pass on the code it gives" = "Start sharing with the Share button, then pass on the code it gives"
+"Start vote" = "Start vote"
 "Starting to share…" = "Starting to share…"
 "Status" = "Status"
 "Sticky" = "Sticky"
+"Sticky note" = "Sticky note"
+"Sticky note colors" = "Sticky note colors"
+"Sticky notes" = "Sticky notes"
+"Sticky notes, shapes and connectors" = "Sticky notes, shapes and connectors"
 "Stop" = "Stop"
 "Stop following {name}" = "Stop following {name}"
 "Stop session" = "Stop session"
 "Stop sharing" = "Stop sharing"
 "Stop spotlighting" = "Stop spotlighting"
+"Stop timer" = "Stop timer"
 "Stop {n}  {hex}" = "Stop {n}  {hex}"
+"Straight" = "Straight"
 "Stretch" = "Stretch"
 "Strikethrough" = "Strikethrough"
 "String" = "String"
@@ -1321,6 +1451,8 @@ name = "English"
 "Text" = "Text"
 "Text align" = "Text align"
 "Text content" = "Text content"
+"Text on a path" = "Text on a path"
+"Text size" = "Text size"
 "Text style" = "Text style"
 "Text styles" = "Text styles"
 "Texts" = "Texts"
@@ -1338,6 +1470,7 @@ name = "English"
 "The selection uses several text styles: click to apply one" = "The selection uses several text styles: click to apply one"
 "The server deletes this file if nobody opens it before {date}." = "The server deletes this file if nobody opens it before {date}."
 "The whole file" = "The whole file"
+"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%."
 "Theme" = "Theme"
 "There's no destination for that action" = "There's no destination for that action"
 "Thickness" = "Thickness"
@@ -1348,19 +1481,27 @@ name = "English"
 "This condition is edited as an expression" = "This condition is edited as an expression"
 "This file" = "This file"
 "This file has unsaved changes" = "This file has unsaved changes"
+"This file is too large to join here (up to {mb} MB)" = "This file is too large to join here (up to {mb} MB)"
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them."
 "This file is on {server}, open only to you. Share it to let others in with a new code." = "This file is on {server}, open only to you. Share it to let others in with a new code."
 "This frame is new on the branch." = "This frame is new on the branch."
 "This frame isn't on the branch." = "This frame isn't on the branch."
+"This link opens a website outside the prototype:" = "This link opens a website outside the prototype:"
 "This server is open to the public: no key needed." = "This server is open to the public: no key needed."
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)."
 "This server takes files only with its key: see Advanced." = "This server takes files only with its key: see Advanced."
+"Thumbs up" = "Thumbs up"
+"This version can't be read." = "This version can't be read."
+"This version doesn't have it: all of it is new." = "This version doesn't have it: all of it is new."
 "Tidy up" = "Tidy up"
 "Tile" = "Tile"
 "Tile type" = "Tile type"
+"Timer" = "Timer"
 "Tint" = "Tint"
 "Title" = "Title"
 "Title case" = "Title case"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there."
+"To the layer around it" = "To the layer around it"
 "Toggle" = "Toggle"
 "Toggle light/dark theme" = "Toggle light/dark theme"
 "Toggle visibility" = "Toggle visibility"
@@ -1368,15 +1509,19 @@ name = "English"
 "Top" = "Top"
 "Top & bottom" = "Top & bottom"
 "Top left radius" = "Top left radius"
+"Top padding" = "Top padding"
 "Top right radius" = "Top right radius"
 "Transform" = "Transform"
+"Triangle" = "Triangle"
 "Triangle arrow" = "Triangle arrow"
 "Trigger" = "Trigger"
+"Trigger layer" = "Trigger layer"
 "True" = "True"
 "Truncate text" = "Truncate text"
 "Truncate with an ellipsis" = "Truncate with an ellipsis"
 "Try again" = "Try again"
 "Try another search or filter." = "Try another search or filter."
+"Try another search, or browse templates." = "Try another search, or browse templates."
 "Try another word, or look at every kind." = "Try another word, or look at every kind."
 "Turn a layer into a component, reuse it, and change every copy at once" = "Turn a layer into a component, reuse it, and change every copy at once"
 "Two digits" = "Two digits"
@@ -1394,10 +1539,11 @@ name = "English"
 "Unread" = "Unread"
 "Unresolve" = "Unresolve"
 "Unsaved changes" = "Unsaved changes"
-"Unsaved changes in {names}. Close the window and lose them?" = "Unsaved changes in {names}. Close the window and lose them?"
+"Unsaved changes in {names}. Save them before closing?" = "Unsaved changes in {names}. Save them before closing?"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard"
 "Unsaved changes: save first, or close again with {key} to discard" = "Unsaved changes: save first, or close again with {key} to discard"
 "Up" = "Up"
+"Update check is not supported in the web browser." = "Update check is not supported in the web browser."
 "Update plugin" = "Update plugin"
 "Update" = "Update"
 "Update from main" = "Update from main"
@@ -1413,7 +1559,9 @@ name = "English"
 "Use as mask" = "Use as mask"
 "Use auto layout" = "Use auto layout"
 "Use number keys for opacity" = "Use number keys for opacity"
+"Use the .figcraft or .fig extension." = "Use the .figcraft or .fig extension."
 "Use the layer's fill" = "Use the layer's fill"
+"Use your browser's zoom to change the interface size." = "Use your browser's zoom to change the interface size."
 "Used in {files} · {instances}" = "Used in {files} · {instances}"
 "Username" = "Username"
 "Value" = "Value"
@@ -1448,6 +1596,8 @@ name = "English"
 "Visibility" = "Visibility"
 "Visible" = "Visible"
 "Vivid" = "Vivid"
+"Votes per person" = "Votes per person"
+"Voting session" = "Voting session"
 "WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose."
 "Warm" = "Warm"
 "Watch" = "Watch"
@@ -1457,17 +1607,22 @@ name = "English"
 "WebSocket URL" = "WebSocket URL"
 "WebSocket URL copied" = "WebSocket URL copied"
 "Wedge" = "Wedge"
+"Weekly planner" = "Weekly planner"
 "Weight" = "Weight"
+"What changed since a saved version" = "What changed since a saved version"
 "What you try here changes this preview and the code below, not the file" = "What you try here changes this preview and the code below, not the file"
 "What changed since it was marked ready for dev" = "What changed since it was marked ready for dev"
 "What is wrong with this file? The server's operator gets your report." = "What is wrong with this file? The server's operator gets your report."
 "What it's for" = "What it's for"
 "What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on."
+"When marked ready" = "When marked ready"
 "While hovering" = "While hovering"
 "While pressing" = "While pressing"
 "White" = "White"
 "Who runs it, its terms and how long it keeps files" = "Who runs it, its terms and how long it keeps files"
+"Whole screen" = "Whole screen"
 "Why it changed" = "Why it changed"
+"Widget" = "Widget"
 "Widgets" = "Widgets"
 "Width" = "Width"
 "Width point" = "Width point"
@@ -1506,26 +1661,125 @@ name = "English"
 "call any command its access allows" = "call any command its access allows"
 "call only: {commands}" = "call only: {commands}"
 "can edit the document" = "can edit the document"
+"can save files" = "can save files"
+"conditional prototype actions nested too deeply were skipped" = "conditional prototype actions nested too deeply were skipped"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "conditional prototype actions with conditions that can't be evaluated were skipped"
+"connector label background was skipped: style data is missing" = "connector label background was skipped: style data is missing"
+"connector label was skipped: background bounds are invalid" = "connector label was skipped: background bounds are invalid"
+"connector label was skipped: background transform is invalid" = "connector label was skipped: background transform is invalid"
+"connector label was skipped: composed text transform is invalid" = "connector label was skipped: composed text transform is invalid"
+"connector label was skipped: derived background bounds are missing" = "connector label was skipped: derived background bounds are missing"
+"connector label was skipped: derived text bounds are missing" = "connector label was skipped: derived text bounds are missing"
+"connector label was skipped: text bounds are invalid" = "connector label was skipped: text bounds are invalid"
+"connector label was skipped: text style data is missing" = "connector label was skipped: text style data is missing"
+"connector label was skipped: text transform is invalid" = "connector label was skipped: text transform is invalid"
+"connector labels were skipped" = "connector labels were skipped"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained"
+"connector snapshot vector data is missing; connector was left empty" = "connector snapshot vector data is missing; connector was left empty"
+"connectors whose ends can't be placed are empty" = "connectors whose ends can't be placed are empty"
 "crop marks" = "crop marks"
+"damaged vector geometry was skipped" = "damaged vector geometry was skipped"
+"damaged vector networks import as outlines" = "damaged vector networks import as outlines"
 "development: {path}" = "development: {path}"
+"document children other than pages were skipped" = "document children other than pages were skipped"
+"duplicate grid track sizing entries use equal tracks" = "duplicate grid track sizing entries use equal tracks"
 "e.g. count + 1" = "e.g. count + 1"
 "e.g. count >= 3 and not done" = "e.g. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "elbowed and curved connectors without a saved path import as straight lines"
+"entries without a node type were skipped" = "entries without a node type were skipped"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "figcraft:// links from a browser, chat or email open this app and join the session."
+"filled areas of a vector with their own fill use the layer's fill" = "filled areas of a vector with their own fill use the layer's fill"
 "from {server}" = "from {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "gamepad triggers without exactly one known controller button were skipped"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "grid track list exceeds 1000 entries; the tracks use the default equal sizing"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "grid track sizing is unsupported or malformed; affected tracks use equal sizing"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing"
 "hidden" = "hidden"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "image filters are ambiguous because both filter containers are present; filter conversion was skipped"
+"image filters use FigCraft's approximate renderer" = "image filters use FigCraft's approximate renderer"
+"instance swap properties whose default component isn't in the file were skipped" = "instance swap properties whose default component isn't in the file were skipped"
+"instance swap properties whose default component was past the layer limit were skipped" = "instance swap properties whose default component was past the layer limit were skipped"
+"instances inside their own main component were imported as frames" = "instances inside their own main component were imported as frames"
+"instances of components that aren't in the file show no layers" = "instances of components that aren't in the file show no layers"
+"instances of components that aren't in the file were imported as frames" = "instances of components that aren't in the file were imported as frames"
+"instances that would nest a component inside itself were imported as frames" = "instances that would nest a component inside itself were imported as frames"
+"instances whose component was past the layer limit were imported as frames" = "instances whose component was past the layer limit were imported as frames"
+"instances without a main component were imported as empty frames" = "instances without a main component were imported as empty frames"
+"invalid internal .fig text path data was ignored" = "invalid internal .fig text path data was ignored"
+"invalid or oversized vector networks import as outlines" = "invalid or oversized vector networks import as outlines"
+"invalid or oversized vector path data was skipped" = "invalid or oversized vector path data was skipped"
 "just now" = "just now"
+"key triggers without a supported key were skipped" = "key triggers without a supported key were skipped"
+"key up triggers import as key presses" = "key up triggers import as key presses"
+"layers without a position were placed at their parent's origin" = "layers without a position were placed at their parent's origin"
+"layers without a type were skipped" = "layers without a type were skipped"
+"legacy image filter container is unsupported; filter conversion was skipped" = "legacy image filter container is unsupported; filter conversion was skipped"
 "locked" = "locked"
+"malformed image filters container was skipped" = "malformed image filters container was skipped"
+"malformed image paintFilter container was skipped" = "malformed image paintFilter container was skipped"
+"malformed slot content assignment was skipped" = "malformed slot content assignment was skipped"
 "no bleed" = "no bleed"
 "nobody else here yet" = "nobody else here yet"
+"non-default slot settings are not represented and were skipped" = "non-default slot settings are not represented and were skipped"
 "now" = "now"
+"offer files to save if it asks to (you choose where each one goes)" = "offer files to save if it asks to (you choose where each one goes)"
+"only in a text style or variable" = "only in a text style or variable"
 "or" = "or"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "point stroke joins were preserved; dashed or variable-width strokes render with the layer join"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "preferred slot component keys cannot be resolved to file nodes and were skipped"
+"prototype actions of unknown types were skipped" = "prototype actions of unknown types were skipped"
+"prototype actions without a destination in the file were skipped" = "prototype actions without a destination in the file were skipped"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "prototype expressions on variables that aren't in the variables JSON were skipped"
+"prototype expressions with unsupported functions were skipped" = "prototype expressions with unsupported functions were skipped"
+"prototype interactions without supported actions were skipped" = "prototype interactions without supported actions were skipped"
+"prototype navigations of unknown types were skipped" = "prototype navigations of unknown types were skipped"
+"prototype transitions of unknown types play instantly" = "prototype transitions of unknown types play instantly"
+"prototype triggers of unknown types were skipped" = "prototype triggers of unknown types were skipped"
 "put a widget on the canvas" = "put a widget on the canvas"
 "read and edit the document" = "read and edit the document"
 "read the document" = "read the document"
 "reads the document" = "reads the document"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "set-variable actions on variables that aren't in the variables JSON were skipped"
+"set-variable actions with values that can't be evaluated were skipped" = "set-variable actions with values that can't be evaluated were skipped"
+"set-variable actions with values that don't fit the variable were skipped" = "set-variable actions with values that don't fit the variable were skipped"
+"set-variable actions without a value were skipped" = "set-variable actions without a value were skipped"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped"
+"slot content assignment target is missing or is not slot content" = "slot content assignment target is missing or is not slot content"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "slot content assignment uses the empty GUID sentinel and was skipped"
+"slot layers without a matching slot property were imported as frames" = "slot layers without a matching slot property were imported as frames"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "some vector points refer to point settings missing from the file; they use the layer's joins and plain corners"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "some vector segments refer to style settings missing from the file; they use the layer's stroke"
+"stale or invalid grid track sizing entries were ignored" = "stale or invalid grid track sizing entries were ignored"
+"stars and polygons without point counts or geometry use the default point count" = "stars and polygons without point counts or geometry use the default point count"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "style settings of some vector segments aren't supported; those segments use the layer's stroke"
+"text path underline or strikethrough decoration is not rendered" = "text path underline or strikethrough decoration is not rendered"
+"text style overrides refer to missing table entries" = "text style overrides refer to missing table entries"
+"the file has no pages" = "the file has no pages"
 "the plugin" = "the plugin"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "the variables JSON has no `variableCollections` (expected the local variables response) and was ignored"
 "this session only" = "this session only"
+"unknown component property types were skipped" = "unknown component property types were skipped"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "variable aliases to variables that aren't in the variables JSON (or of another type) were skipped"
+"variable bindings to properties the layer doesn't have were skipped" = "variable bindings to properties the layer doesn't have were skipped"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "variable bindings to variables that aren't in the variables JSON (library variables) were skipped"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "variable bindings whose variable type doesn't fit the property were skipped"
+"variable collections without modes were skipped" = "variable collections without modes were skipped"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped"
+"variable modes of collections that aren't in the file were skipped" = "variable modes of collections that aren't in the file were skipped"
+"variable modes of collections that aren't in the variables JSON were skipped" = "variable modes of collections that aren't in the variables JSON were skipped"
+"variable values that don't match their type (or composed colours) were skipped" = "variable values that don't match their type (or composed colours) were skipped"
+"variables of unknown types were skipped" = "variables of unknown types were skipped"
+"variables whose collection isn't in the variables JSON were skipped" = "variables whose collection isn't in the variables JSON were skipped"
+"variables without readable values were skipped" = "variables without readable values were skipped"
+"vector points with unknown stroke joins use the layer join" = "vector points with unknown stroke joins use the layer join"
+"vectors without geometry are empty" = "vectors without geometry are empty"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "vectors without geometry are empty (export the file JSON with geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "very long text was cut to 1,048,576 characters"
+"very long vector paths were skipped" = "very long vector paths were skipped"
+"video actions are not supported and were skipped" = "video actions are not supported and were skipped"
+"video triggers are not supported and were skipped" = "video triggers are not supported and were skipped"
 "yesterday" = "yesterday"
 "{instances} in {files}" = "{instances} in {files}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}: draft translation, waiting for a native speaker's review."
@@ -1535,6 +1789,7 @@ name = "English"
 "{name} is forgotten on this computer; the file stays on {server}" = "{name} is forgotten on this computer; the file stays on {server}"
 "{name} is on the server." = "{name} is on the server."
 "{name} is spotlighting" = "{name} is spotlighting"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} is too large to open in the browser (over 512 MB)."
 "{name}\nClick to apply to the selection" = "{name}\nClick to apply to the selection"
 "{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it."
 "{name} (from {library})" = "{name} (from {library})"
@@ -1568,8 +1823,10 @@ name = "English"
 "{n} layers selected" = { one = "{n} layer selected", other = "{n} layers selected" }
 "{n} layers · {parts}" = { one = "{n} layer · {parts}", other = "{n} layers · {parts}" }
 "{n} matches" = { one = "{n} match", other = "{n} matches" }
+"{n} min" = "{n} min"
 "{n} minutes ago" = { one = "{n} minute ago", other = "{n} minutes ago" }
 "{n} months ago" = { one = "{n} month ago", other = "{n} months ago" }
+"{n} more notes omitted from this report" = { one = "{n} more note omitted from this report", other = "{n} more notes omitted from this report" }
 "{n} of {total}" = "{n} of {total}"
 "{n} people joined" = { one = "{n} person joined", other = "{n} people joined" }
 "{n} preferred components" = { one = "{n} preferred component", other = "{n} preferred components" }
@@ -1578,7 +1835,10 @@ name = "English"
 "{n} replies" = { one = "{n} reply", other = "{n} replies" }
 "{n} rows" = { one = "{n} row", other = "{n} rows" }
 "{n} styles" = { one = "{n} style", other = "{n} styles" }
+"{n} text layers" = { one = "{n} text layer", other = "{n} text layers" }
 "{n} variables" = { one = "{n} variable", other = "{n} variables" }
+"{n} votes" = { one = "{n} vote", other = "{n} votes" }
+"{n} votes left" = { one = "{n} vote left", other = "{n} votes left" }
 "{n} weeks ago" = { one = "{n} week ago", other = "{n} weeks ago" }
 "{n} years ago" = { one = "{n} year ago", other = "{n} years ago" }
 "{n}d" = "{n}d"
@@ -1586,6 +1846,7 @@ name = "English"
 "{n}m" = "{n}m"
 "{n}w" = "{n}w"
 "{page}, nothing selected" = "{page}, nothing selected"
+"{percent}%" = "{percent}%"
 "{profile} (current)" = "{profile} (current)"
 "{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written."
 "{server} can't say what became of your files (it is older than this app)." = "{server} can't say what became of your files (it is older than this app)."
@@ -1603,4 +1864,4 @@ name = "English"
 "⌘ arrows" = "⌘ arrows"
 "⌘ click" = "⌘ click"
 "⌘ scroll" = "⌘ scroll"
-"⌥ drag" = "⌥ drag"
\ No newline at end of file
+"⌥ drag" = "⌥ drag"
diff --git a/crates/ui-egui/locales/es-419.toml b/crates/ui-egui/locales/es-419.toml
index 6b42ac20..5b9668da 100644
--- a/crates/ui-egui/locales/es-419.toml
+++ b/crates/ui-egui/locales/es-419.toml
@@ -17,6 +17,7 @@ status = "draft — needs native review"
 "Add a description" = "Agregar una descripción"
 "Add a frame (F) or a shape (R) to get started" = "Agrega un marco (F) o una forma (R) para empezar"
 "Add a layer or component to tile first" = "Agrega antes una capa o un componente para el mosaico"
+"Add a minute" = "Agregar un minuto"
 "Add a note for developers" = "Agrega una nota para desarrollo"
 "Add action" = "Agregar acción"
 "Add actions for when no condition holds" = "Agregar acciones para cuando no se cumpla ninguna condición"
@@ -24,6 +25,7 @@ status = "draft — needs native review"
 "Add another condition" = "Agregar otra condición"
 "Add auto layout" = "Agregar diseño automático"
 "Add background behind overlay" = "Agregar fondo tras la superposición"
+"Add column" = "Agregar columna"
 "Add content to this slot" = "Agregar contenido a esta ranura"
 "Add dev resource" = "Agregar recurso de desarrollo"
 "Add effect" = "Agregar efecto"
@@ -35,6 +37,7 @@ status = "draft — needs native review"
 "Add library file…" = "Agregar archivo de biblioteca…"
 "Add max height" = "Agregar alto máximo"
 "Add max width" = "Agregar ancho máximo"
+"Add measurement" = "Agregar medición"
 "Add min height" = "Agregar alto mínimo"
 "Add min width" = "Agregar ancho mínimo"
 "Add mode" = "Agregar modo"
@@ -42,6 +45,7 @@ status = "draft — needs native review"
 "Add or update collections from a variables JSON" = "Agregar o actualizar colecciones desde un JSON de variables"
 "Add properties to make instances configurable" = "Agrega propiedades para que las instancias sean configurables"
 "Add reaction" = "Agregar reacción"
+"Add row" = "Agregar fila"
 "Add starting point" = "Agregar punto de inicio"
 "Add stroke" = "Agregar trazo"
 "Add variant" = "Agregar variante"
@@ -66,6 +70,7 @@ status = "draft — needs native review"
 "No components yet. Select layers and press {keys}." = "Aún no hay componentes. Selecciona capas y presiona {keys}."
 "No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "Aún no hay bibliotecas. Agrega un archivo .figcraft publicado como biblioteca o pega el enlace de una biblioteca de equipo."
 "PDF print settings" = "Configuración de impresión PDF"
+"Pages added to the document" = "Páginas agregadas al documento"
 "Press a key…" = "Presiona una tecla…"
 "Prototype settings" = "Configuración del prototipo"
 "Remove export setting" = "Quitar configuración de exportación"
@@ -80,6 +85,11 @@ status = "draft — needs native review"
 "Type settings" = "Configuración de texto"
 "With the layers' export settings" = "Con la configuración de exportación de las capas"
 "You'll get the shared file as a new tab and edit it together." = "Recibirás el archivo compartido en una pestaña nueva y lo editarán en conjunto."
+"gamepad triggers without exactly one known controller button were skipped" = "se omitieron los desencadenantes de control sin exactamente un botón de control conocido"
+"key up triggers import as key presses" = "los desencadenantes al soltar una tecla se importan como presiones de tecla"
+"non-default slot settings are not represented and were skipped" = "la configuración de ranura no predeterminada no se representa y se omitió"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "algunos segmentos vectoriales hacen referencia a configuraciones de estilo que faltan en el archivo; usan el trazo de la capa"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "la configuración de estilo de algunos segmentos vectoriales no es compatible; esos segmentos usan el trazo de la capa"
 "{name} is forgotten on this computer; the file stays on {server}" = "{name} se olvidó en esta computadora; el archivo se queda en {server}"
 "{n} added" = { one = "{n} agregada", other = "{n} agregadas" }
 
@@ -89,6 +99,7 @@ status = "draft — needs native review"
 "comment.add" = "Agregar comentario"
 "component.addProperty" = "Agregar propiedad de componente"
 "component.addVariant" = "Agregar variante"
+"devMode.addMeasurement" = "Agregar medición"
 "devResource.add" = "Agregar recurso de desarrollo"
 "effect.add" = "Agregar efecto"
 "export.add" = "Agregar configuración de exportación"
diff --git a/crates/ui-egui/locales/es.toml b/crates/ui-egui/locales/es.toml
index 032ff507..ad3abca4 100644
--- a/crates/ui-egui/locales/es.toml
+++ b/crates/ui-egui/locales/es.toml
@@ -8,7 +8,32 @@ name = "Español"
 status = "draft — needs native review"
 
 [ui]
+"Add a minute" = "Añadir un minuto"
+"Add column" = "Añadir columna"
+"Add measurement" = "Añadir medición"
+"Add row" = "Añadir fila"
+"All objects" = "Todos los objetos"
+"Along the bottom" = "A lo largo del borde inferior"
+"Along the left" = "A lo largo del borde izquierdo"
+"Along the right" = "A lo largo del borde derecho"
+"Along the top" = "A lo largo del borde superior"
+"Android Vector Drawable" = "Android Vector Drawable"
+"Arrow at the end" = "Flecha al final"
+"Best effort" = "Mejor aproximación"
+"Between the selected layers" = "Entre las capas seleccionadas"
+"Brainstorm" = "Lluvia de ideas"
+"Check" = "Visto"
+"Chevron" = "Cheurón"
+"Clear results" = "Borrar resultados"
+"Click objects to vote; click your badge to take a vote back" = "Haz clic en los objetos para votar; haz clic en tu insignia para retirar un voto"
+"Compatibility" = "Compatibilidad"
+"Compatibility notes" = "Notas de compatibilidad"
+"Connector" = "Conector"
 "Couldn't download the variables" = "No se pudieron descargar las variables"
+"Couldn't download {name}" = "No se pudo descargar {name}"
+"Relative to" = "Relativa a"
+"Trigger layer" = "Capa que la abre"
+"Whole screen" = "Pantalla completa"
 
 "% of all commits" = "% del total de commits"
 "(no longer published)" = "(ya no publicado)"
@@ -18,6 +43,7 @@ status = "draft — needs native review"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PR, {commits} commits, +{added} / −{deleted} líneas (Δ {delta}), +{bin_added} / −{bin_deleted} recursos binarios, {first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Una colección de este archivo con estos modos y variables: modifica sus valores por modo y añade variables propias"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Ya existe un archivo .figcraft con este nombre. Elige su nombre completo para confirmar que deseas reemplazarlo."
 "A layer on its own aligns to its frame: select more layers, or one in a frame" = "Una capa sola se alinea con su marco: selecciona más capas o una dentro de un marco"
 "A responsive product page: hero, features, figures, a quote and a footer" = "Una página de producto adaptable: cabecera, funciones, cifras, una cita y un pie"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "Un muelle se reproduce hasta que se asienta: su masa, rigidez y amortiguación fijan cuánto dura"
@@ -91,6 +117,7 @@ status = "draft — needs native review"
 "All comments" = "Todos los comentarios"
 "All components" = "Todos los componentes"
 "All fonts" = "Todas las fuentes"
+"All the fonts this file uses are installed" = "Todas las fuentes que usa este archivo están instaladas"
 "All supported properties" = "Todas las propiedades compatibles"
 "All variables" = "Todas las variables"
 "Alpha" = "Alfa"
@@ -172,6 +199,7 @@ status = "draft — needs native review"
 "Both directions" = "Ambas direcciones"
 "Bottom" = "Abajo"
 "Bottom left radius" = "Radio inferior izquierdo"
+"Bottom padding" = "Margen interno inferior"
 "Bottom right radius" = "Radio inferior derecho"
 "Branch" = "Rama"
 "Branch archived" = "Rama archivada"
@@ -198,12 +226,14 @@ status = "draft — needs native review"
 "C or ⇧C" = "C o ⇧C"
 "CMYK colour" = "Color CMYK"
 "Can view" = "Puede ver"
+"Checking the fonts installed on this computer…" = "Comprobando las fuentes instaladas en este equipo…"
 "Checking the server…" = "Comprobando el servidor…"
 "Clear from this list" = "Borrar de esta lista"
 "Code or invite link" = "Código o enlace de invitación"
 "Color profile: {name}" = "Perfil de color: {name}"
 "Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Estilos de color y texto, variables Claro y Oscuro, botones, campos y tarjetas"
 "CSS custom properties…" = "Propiedades personalizadas CSS…"
+"Dart constants for Flutter…" = "Constantes de Dart para Flutter…"
 "Can edit" = "Puede editar"
 "Can't read this library: {e}" = "No se puede leer esta biblioteca: {e}"
 "Cancel" = "Cancelar"
@@ -224,7 +254,7 @@ status = "draft — needs native review"
 "Changes on main" = "Cambios en la principal"
 "Changes on the branch" = "Cambios en la rama"
 "Changes unknown" = "Cambios desconocidos"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "Elige React, Leptos, SwiftUI, Compose o Flutter arriba para conectar este componente con su código."
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Elige React, Leptos, Vue, SwiftUI, Compose, ArkUI o Flutter arriba para conectar este componente con su código."
 "Choose another profile to change it." = "Elige otro perfil para cambiarlo."
 "Choose collection" = "Elegir colección"
 "Choose image" = "Elegir imagen"
@@ -245,7 +275,6 @@ status = "draft — needs native review"
 "Close tab" = "Cerrar pestaña"
 "Close version history" = "Cerrar historial de versiones"
 "Close when clicking outside" = "Cerrar al hacer clic fuera"
-"Close without saving" = "Cerrar sin guardar"
 "Code" = "Código"
 "Code syntax" = "Sintaxis de código"
 "Collapse" = "Contraer"
@@ -272,6 +301,7 @@ status = "draft — needs native review"
 "Commits" = "Commits"
 "Company" = "Empresa"
 "Compare changes" = "Comparar cambios"
+"Compare with" = "Comparar con"
 "Completed" = "Completado"
 "Component" = "Componente"
 "Component name" = "Nombre del componente"
@@ -290,7 +320,6 @@ status = "draft — needs native review"
 "Constraints" = "Restricciones"
 "Content" = "Contenido"
 "Contents hidden" = "Contenido oculto"
-"Contents only" = "Solo el contenido"
 "Contextual alternates" = "Alternativas contextuales"
 "Contrast" = "Contraste"
 "Contributors" = "Colaboradores"
@@ -302,19 +331,26 @@ status = "draft — needs native review"
 "Copied as SVG" = "Copiado como SVG"
 "Copied as text" = "Copiado como texto"
 "Copied {value}" = "Copiado: {value}"
+"Convert to frame" = "Convertir en marco"
+"Convert to section" = "Convertir en sección"
 "Copy" = "Copiar"
 "Copy as" = "Copiar como"
 "Copy as CSS" = "Copiar como CSS"
 "Copy as PNG" = "Copiar como PNG"
 "Copy as SVG" = "Copiar como SVG"
 "Copy code" = "Copiar código"
+"Copy effect" = "Copiar efecto"
+"Copy fill" = "Copiar relleno"
 "Copy link" = "Copiar enlace"
+"Copy stroke" = "Copiar trazo"
 "Copy the {label}" = "Copiar {label}"
 "Copy {value}" = "Copiar {value}"
 "Corner radius" = "Radio de esquina"
 "Corner smoothing" = "Suavizado de esquinas"
 "Couldn't reach {server}: showing what this computer remembers." = "No se pudo contactar con {server}: se muestra lo que este ordenador recuerda."
+"Couldn't read {name}." = "No se pudo leer {name}."
 "Couldn't save automatically: {error}" = "No se pudo guardar automáticamente: {error}"
+"Couldn't save the file" = "No se pudo guardar el archivo"
 "Count" = "Número"
 "Create" = "Crear"
 "Create a variable collection first" = "Crea primero una colección de variables"
@@ -338,6 +374,7 @@ status = "draft — needs native review"
 "Current version" = "Versión actual"
 "Cursor chat" = "Chat del cursor"
 "Custom" = "Personalizado"
+"Custom size" = "Tamaño personalizado"
 "Cut" = "Cortar"
 "Dark" = "Oscuro"
 "Darken" = "Oscurecer"
@@ -371,6 +408,7 @@ status = "draft — needs native review"
 "Description" = "Descripción"
 "Description (optional)" = "Descripción (opcional)"
 "Design" = "Diseño"
+"Design panel" = "Panel de diseño"
 "Design system starter" = "Base de sistema de diseño"
 "Desktop" = "Escritorio"
 "Destination" = "Destino"
@@ -382,6 +420,7 @@ status = "draft — needs native review"
 "Detach variable" = "Separar variable"
 "Details" = "Detalles"
 "Dev Mode" = "Modo desarrollo"
+"Dev Mode only inspects: switch to Design (Shift+D) to edit" = "El modo desarrollo solo inspecciona: cambia a Diseño (Shift+D) para editar"
 "Dev resources" = "Recursos de desarrollo"
 "Development" = "Desarrollo"
 "Device" = "Dispositivo"
@@ -398,6 +437,7 @@ status = "draft — needs native review"
 "Distribute horizontal spacing" = "Distribuir espacio horizontal"
 "Distribute vertical spacing" = "Distribuir espacio vertical"
 "Divider" = "Separador"
+"Don't Save" = "No guardar"
 "Don't truncate" = "No truncar"
 "Done" = "Listo"
 "Done editing" = "Terminar edición"
@@ -409,7 +449,7 @@ status = "draft — needs native review"
 "Draw" = "Dibujar"
 "Draw a frame" = "Dibuja un marco"
 "Drawing tools" = "Herramientas de dibujo"
-"Drop a .figcraft, .fig, .json, .svg or image file." = "Suelta un archivo .figcraft, .fig, .json, .svg o de imagen."
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Suelta un archivo .figcraft, .fig, .sketch, .json, .svg o de imagen."
 "Drop to import" = "Suelta para importar"
 "Drop to open" = "Suelta para abrir"
 "Drop shadow" = "Sombra paralela"
@@ -433,6 +473,8 @@ status = "draft — needs native review"
 "Effect settings" = "Ajustes del efecto"
 "Effect styles" = "Estilos de efecto"
 "Effects" = "Efectos"
+"Curved" = "Curvo"
+"Elbow" = "En ángulo"
 "Ellipse" = "Elipse"
 "Ellipses" = "Elipses"
 "Else" = "Si no"
@@ -441,6 +483,7 @@ status = "draft — needs native review"
 "Empty" = "Vacía"
 "End" = "Final"
 "End point" = "Punto final"
+"End vote" = "Terminar votación"
 "Ends the session; everyone keeps their copy" = "Termina la sesión; cada persona conserva su copia"
 "Enter" = "Intro"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Escribe la dirección de un figcraft-server y pulsa Explorar para ver los plugins que ofrece."
@@ -450,6 +493,7 @@ status = "draft — needs native review"
 "Essential" = "Esenciales"
 "Every conflict has a choice." = "Todos los conflictos tienen una elección."
 "Every top-level frame already starts a flow" = "Todos los marcos de nivel superior ya inician un flujo"
+"Exact only" = "Solo exacto"
 "Exact opacity (4 then 5: 45%)" = "Opacidad exacta (4 y luego 5: 45 %)"
 "Exclude" = "Excluir"
 "Excluded" = "Excluidos"
@@ -468,8 +512,10 @@ status = "draft — needs native review"
 "Export {n} layers" = { one = "Exportar {n} capa", other = "Exportar {n} capas" }
 "Exported {file}" = "Exportado: {file}"
 "Exported {name}" = "{name} exportado"
+"Exported {name}; {n} kinds of content were changed or left out" = { one = "{name} exportado; se cambió u omitió {n} tipo de contenido", other = "{name} exportado; se cambiaron u omitieron {n} tipos de contenido" }
 "Exported {name}; {n} kinds of content were left out" = { one = "{name} exportado; se omitió {n} tipo de contenido", other = "{name} exportado; se omitieron {n} tipos de contenido" }
 "Exported {n} files" = { one = "{n} archivo exportado", other = "{n} archivos exportados" }
+"Exported {n} files; some content was changed or left out" = { one = "{n} archivo exportado; se cambió u omitió parte del contenido", other = "{n} archivos exportados; se cambió u omitió parte del contenido" }
 "Export…" = "Exportar…"
 "Expose properties to instances" = "Exponer propiedades a las instancias"
 "Exposure" = "Exposición"
@@ -483,6 +529,7 @@ status = "draft — needs native review"
 "Feb" = "feb"
 "Fetching from the server…" = "Obteniendo del servidor…"
 "FigCraft couldn't open its window: {error}" = "FigCraft no pudo abrir su ventana: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft aún no admite todas las funciones de estos archivos. Las notas indican qué se omitió o cambió en la copia importada; el archivo original no se modifica."
 "File" = "Archivo"
 "File name" = "Nombre del archivo"
 "File not found" = "No se encuentra el archivo"
@@ -516,6 +563,7 @@ status = "draft — needs native review"
 "Flip text to the other side" = "Pasar el texto al otro lado"
 "Flip vertical" = "Voltear verticalmente"
 "Flip width profile" = "Invertir perfil de ancho"
+"Flow chart" = "Diagrama de flujo"
 "Flow starting point" = "Punto de inicio del flujo"
 "Flow starting points" = "Puntos de inicio de flujo"
 "Flows" = "Flujos"
@@ -532,6 +580,7 @@ status = "draft — needs native review"
 "Font size" = "Tamaño de fuente"
 "Font style" = "Estilo de fuente"
 "Forget on this computer" = "Olvidar en este ordenador"
+"Format" = "Formato"
 "Four screens of a trail app with components and a prototype flow" = "Cuatro pantallas de una app de senderos con componentes y un flujo de prototipo"
 "Fractions" = "Fracciones"
 "Frame" = "Marco"
@@ -568,6 +617,7 @@ status = "draft — needs native review"
 "Hanging list" = "Lista colgante"
 "Hanging punctuation" = "Puntuación colgante"
 "Hard light" = "Luz fuerte"
+"Heart" = "Corazón"
 "Height" = "Alto"
 "Help" = "Ayuda"
 "Help and resources" = "Ayuda y recursos"
@@ -580,6 +630,7 @@ status = "draft — needs native review"
 "Hide these tips (Getting started in the Help menu shows them again)" = "Ocultar estos consejos (Primeros pasos en el menú Ayuda los vuelve a mostrar)"
 "Hide when publishing" = "Ocultar al publicar"
 "Highlight layers on hover" = "Resaltar capas al pasar el cursor"
+"Highlighter" = "Resaltador"
 "Highlights" = "Luces"
 "Hold Alt" = "Mantén Alt"
 "Hold Alt+Z" = "Mantén Alt+Z"
@@ -606,12 +657,17 @@ status = "draft — needs native review"
 "If" = "Si"
 "If {condition}" = "Si {condition}"
 "Ignore auto layout (absolute position)" = "Ignorar diseño automático (posición absoluta)"
+"Ignore overlapping layers" = "Ignorar capas superpuestas"
+"Ignore unsupported" = "Ignorar lo no admitido"
 "Image" = "Imagen"
+"Images" = "Imágenes"
 "Import" = "Importar"
 "Import path" = "Ruta de importación"
 "Import plugin from manifest" = "Importar plugin desde manifiesto"
 "Import plugin from manifest…" = "Importar plugin desde manifiesto…"
+"Import report" = "Informe de importación"
 "Import variables" = "Importar variables"
+"Imported document" = "Documento importado"
 "Imported {name}" = "{name} importado"
 "Imported {n} new variables, updated {updated}" = { one = "Variables importadas: {n} nueva; actualizadas: {updated}", other = "Variables importadas: {n} nuevas; actualizadas: {updated}" }
 "Import…" = "Importar…"
@@ -622,6 +678,7 @@ status = "draft — needs native review"
 "Included" = "Incluidos"
 "Included in layout" = "Incluidos en el diseño"
 "Individual corners" = "Esquinas individuales"
+"Individual padding" = "Margen interno individual"
 "Individual strokes" = "Trazos individuales"
 "Ink" = "Tinta"
 "Inner shadow" = "Sombra interior"
@@ -639,11 +696,14 @@ status = "draft — needs native review"
 "Instance swap (no other component)" = "Intercambio de instancia (no hay otro componente)"
 "Instances" = "Instancias"
 "Instant" = "Instantánea"
+"Intensity" = "Intensidad"
 "Interaction" = "Interacción"
 "Interactions" = "Interacciones"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Diseño de interfaces y prototipos. Una herramienta de diseño gratuita y de código abierto, de implementación independiente (clean-room), escrita desde cero en Rust, parte de las Crafting Apps de ArtCraft."
+"Interface size" = "Tamaño de la interfaz"
 "Intersect" = "Intersecar"
 "Intersects" = "Intersecciones"
+"Invalid color" = "Color no válido"
 "Invite link" = "Enlace de invitación"
 "Invite link copied" = "Enlace de invitación copiado"
 "It asks permission to:" = "Pide permiso para:"
@@ -662,6 +722,8 @@ status = "draft — needs native review"
 "Jun" = "jun"
 "Just now" = "Justo ahora"
 "Justify" = "Justificar"
+"Kanban board" = "Tablero kanban"
+"Keep a measurement on the canvas for developers" = "Mantén una medición en el lienzo para desarrolladores"
 "Keep appearance" = "Mantener apariencia"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Mantener apariencia convierte cada valor de color a {profile} para que los colores se vean igual. Mantener valores deja los números como están, así que los colores cambian."
 "Keep tool selected after use" = "Mantener la herramienta tras usarla"
@@ -690,6 +752,7 @@ status = "draft — needs native review"
 "Leaves" = "Hojas"
 "Left" = "Izquierda"
 "Left & right" = "Izquierda y derecha"
+"Left padding" = "Margen interno izquierdo"
 "Left side" = "Lado izquierdo"
 "Left side width" = "Ancho del lado izquierdo"
 "Letter case" = "Mayúsculas y minúsculas"
@@ -741,6 +804,7 @@ status = "draft — needs native review"
 "Mark as resolved" = "Marcar como resuelto"
 "Mark as unread" = "Marcar como no leído"
 "Mark as unresolved" = "Marcar como no resuelto"
+"Marker" = "Rotulador"
 "Mask" = "Máscara"
 "Mass · Stiffness · Damping" = "Masa · Rigidez · Amortiguación"
 "Match (empty: the whole name)" = "Coincidencia (vacío: el nombre entero)"
@@ -750,6 +814,7 @@ status = "draft — needs native review"
 "Maximize" = "Maximizar"
 "May" = "may"
 "Measure to the selection" = "Medir hasta la selección"
+"Measurements" = "Mediciones"
 "Merge into main" = "Fusionar en la principal"
 "Merge regions" = "Fusionar regiones"
 "Merge the branch into the main file (one undo step) and archive it" = "Fusiona la rama en el archivo principal (un paso de deshacer) y la archiva"
@@ -758,12 +823,14 @@ status = "draft — needs native review"
 "Min H" = "Mín. H"
 "Min W" = "Mín. W"
 "Minimize" = "Minimizar"
+"Minutes" = "Minutos"
 "Mirror angle" = "Reflejar ángulo"
 "Mirror angle and length" = "Reflejar ángulo y longitud"
 "Mirroring" = "Reflejo"
 "Missing" = "No encontrado"
 "Missing layer" = "Capa no encontrada"
 "Missing style" = "Estilo no encontrado"
+"Missing fonts" = "Fuentes que faltan"
 "Missing variable" = "Variable no encontrada"
 "Miter" = "Inglete"
 "Miter angle" = "Ángulo de inglete"
@@ -799,9 +866,11 @@ status = "draft — needs native review"
 "Named instance" = "Instancia con nombre"
 "Navigate to" = "Navegar a"
 "Nested instance" = "Instancia anidada"
+"New board" = "Nueva pizarra"
 "New design file" = "Nuevo archivo de diseño"
 "Newest first" = "Más recientes primero"
 "Next or previous control in the focused region" = "Control siguiente o anterior de la región enfocada"
+"Next frame" = "Marco siguiente"
 "Next ready for dev" = "Siguiente listo para desarrollo"
 "Next size option" = "Siguiente opción de tamaño"
 "No assets: no export settings, icons or images. Add export settings in the Design tab." = "No hay recursos: ni ajustes de exportación, ni iconos, ni imágenes. Añade ajustes de exportación en la pestaña Diseño."
@@ -810,13 +879,17 @@ status = "draft — needs native review"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "No hay ramas. Una rama es una copia del archivo para probar cambios y luego revisarlos y fusionarlos."
 "No category" = "Sin categoría"
 "No changes" = "Sin cambios"
+"No color styles" = "No hay estilos de color"
 "No colour variables fit here." = "Ninguna variable de color encaja aquí."
 "No colour variables yet. Create them in Local variables." = "Aún no hay variables de color. Créalas en Variables locales."
 "No comments yet" = "Aún no hay comentarios"
+"No compatibility warnings reported" = "No se han registrado advertencias de compatibilidad"
 "No components yet. Select layers and press {keys}." = "Aún no hay componentes. Selecciona capas y pulsa {keys}."
 "No conflicts." = "Sin conflictos."
 "No contributor data was built into this copy." = "Esta copia no incluye datos de colaboradores."
+"No device" = "Sin dispositivo"
 "No fonts match" = "Ninguna fuente coincide"
+"No files or templates match your search" = "Ningún archivo ni plantilla coincide con tu búsqueda"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Aquí no hay código para unirse (el servidor es anterior a los códigos, o esta dirección no cabe en uno): comparte el enlace."
 "No layer changes to show." = "No hay cambios de capas que mostrar."
 "No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "Aún no hay bibliotecas. Añade un archivo .figcraft publicado como biblioteca o pega el enlace de una biblioteca de equipo."
@@ -830,6 +903,7 @@ status = "draft — needs native review"
 "No model credits were built into this copy." = "Esta copia no incluye créditos de modelos."
 "No number variables fit here." = "Ninguna variable numérica encaja aquí."
 "No number variables yet. Create them in Local variables." = "Aún no hay variables numéricas. Créalas en Variables locales."
+"No other pages" = "No hay otras páginas"
 "No paints" = "Sin pinturas"
 "No plugins on {server}." = "No hay plugins en {server}."
 "No plugins yet. Import a development plugin from its figcraft-plugin.json." = "Aún no hay plugins. Importa un plugin de desarrollo desde su figcraft-plugin.json."
@@ -847,6 +921,7 @@ status = "draft — needs native review"
 "No text styles yet. Click + to create one from the selected text." = "Aún no hay estilos de texto. Haz clic en + para crear uno a partir del texto seleccionado."
 "No variables fit here." = "Ninguna variable encaja aquí."
 "No variables yet. Create them in Local variables." = "Aún no hay variables. Créalas en Variables locales."
+"No votes yet" = "Aún no hay votos"
 "Nobody else is here yet" = "Aún no hay nadie más"
 "Noise" = "Ruido"
 "None" = "Ninguno"
@@ -859,6 +934,7 @@ status = "draft — needs native review"
 "Not read yet" = "Aún no leída"
 "Not shared" = "Sin compartir"
 "Note {n}" = "Nota {n}"
+"Nothing changed since this version." = "Nada cambió desde esta versión."
 "Nothing changed since this was marked ready for dev." = "Nada cambió desde que se marcó como listo para desarrollo."
 "Nothing here yet. Set a frame's status to list it." = "Aún no hay nada. Asigna un estado a un marco para verlo aquí."
 "Nothing online yet. Use Share on a file to put it online and it is listed here." = "Aún no hay nada en línea. Usa Compartir en un archivo para ponerlo en línea y aparecerá aquí."
@@ -896,6 +972,7 @@ status = "draft — needs native review"
 "Open branch" = "Abrir rama"
 "Open file" = "Abrir archivo"
 "Open files" = "Archivos abiertos"
+"Open presentations" = "Presentaciones abiertas"
 "Open in focus view" = "Abrir en vista de enfoque"
 "Open in new window" = "Abrir en una ventana nueva"
 "Open invite links in FigCraft" = "Abrir enlaces de invitación en FigCraft"
@@ -904,6 +981,7 @@ status = "draft — needs native review"
 "Open overlay" = "Abrir superposición"
 "Open prototype preview" = "Abrir vista previa del prototipo"
 "Open variables ({count})" = "Abrir variables ({count})"
+"Opened as a new document" = "Abierto como un documento nuevo"
 "Opened “{name}” in a new tab" = "“{name}” abierta en una pestaña nueva"
 "Opening the file…" = "Abriendo el archivo…"
 "Opening {n} files as new files" = { one = "Abriendo como archivo nuevo", other = "Abriendo {n} archivos como archivos nuevos" }
@@ -912,6 +990,7 @@ status = "draft — needs native review"
 "Orange" = "Naranja"
 "Order" = "Orden"
 "Other apps may not open every .fig file exported here." = "Puede que otras aplicaciones no abran todos los archivos .fig exportados aquí."
+"Other" = "Otros"
 "Others lose access and keep their copy; the file stays on the server for you" = "Los demás pierden el acceso y conservan su copia; el archivo se queda en el servidor para ti"
 "Others type this under Share ▸ Join with a code" = "Los demás lo escriben en Compartir ▸ Unirse con un código"
 "Outline stroke" = "Contornear trazo"
@@ -929,7 +1008,12 @@ status = "draft — needs native review"
 "PDF print settings" = "Ajustes de impresión PDF"
 "Padding" = "Margen interno"
 "Page" = "Página"
+"Page deleted" = "Página eliminada"
 "Pages" = "Páginas"
+"Pages added to the document" = "Páginas añadidas al documento"
+"Pause" = "Pausar"
+"Pink" = "Rosa"
+"Placed on the current page" = "Colocado en la página actual"
 "Pages: {pages}" = "Páginas: {pages}"
 "Paint bucket" = "Bote de pintura"
 "Pan the canvas" = "Desplazar el lienzo"
@@ -942,8 +1026,12 @@ status = "draft — needs native review"
 "Pass through" = "Atravesar"
 "Paste a link (https://…)" = "Pega un enlace (https://…)"
 "Paste a team library link (a view link)" = "Pega el enlace de una biblioteca de equipo (de lectura)"
+"Paste effect" = "Pegar efecto"
+"Paste fill" = "Pegar relleno"
 "Paste here" = "Pegar aquí"
+"Paste stroke" = "Pegar trazo"
 "Paste to replace" = "Pegar para reemplazar"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Capas de diseño pegadas; se omitió {n} tipo de contenido", other = "Capas de diseño pegadas; se omitieron {n} tipos de contenido" }
 "Pattern" = "Patrón"
 "Pattern alignment" = "Alineación del patrón"
 "Pattern scale" = "Escala del patrón"
@@ -966,10 +1054,13 @@ status = "draft — needs native review"
 "Place a shape or frame (its tool chosen)" = "Colocar forma o marco (herramienta elegida)"
 "Place automatically" = "Colocar automáticamente"
 "Place image" = "Colocar imagen"
+"Plugin" = "Plugin"
 "Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Los plugins se ejecutan en el entorno aislado de FigCraft, sin archivos, red ni reloj. Instala solo plugins de confianza."
 "Plugins" = "Plugins"
+"Plugins & widgets" = "Plugins y widgets"
 "Plus darker" = "Más oscuro"
 "Plus lighter" = "Más claro"
+"Plus one" = "Más uno"
 "Point" = "Punto"
 "Points" = "Puntos"
 "Polygon" = "Polígono"
@@ -997,6 +1088,7 @@ status = "draft — needs native review"
 "Preview" = "Vista previa"
 "Preview this flow" = "Vista previa de este flujo"
 "Preview this frame" = "Vista previa de este marco"
+"Previous frame" = "Marco anterior"
 "Previous ready for dev" = "Anterior listo para desarrollo"
 "Progressive" = "Progresivo"
 "Properties" = "Propiedades"
@@ -1017,6 +1109,7 @@ status = "draft — needs native review"
 "Push" = "Empujar"
 "Push changes to main component" = "Enviar cambios al componente principal"
 "Put text on path" = "Poner texto en trazado"
+"Question" = "Pregunta"
 "R" = "R"
 "Radial" = "Radial"
 "Radius" = "Radio"
@@ -1034,10 +1127,12 @@ status = "draft — needs native review"
 "Reduce motion" = "Reducir movimiento"
 "Refraction" = "Refracción"
 "Regular expression" = "Expresión regular"
+"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "Relativo al escalado de pantalla del sistema (100% es el tamaño del propio sistema). El zoom del documento es independiente."
 "Remove" = "Quitar"
 "Remove all" = "Quitar todo"
 "Remove annotation" = "Quitar anotación"
 "Remove auto layout" = "Quitar diseño automático"
+"Remove column" = "Quitar columna"
 "Remove dev resource" = "Quitar recurso de desarrollo"
 "Remove export setting" = "Quitar ajuste de exportación"
 "Remove from recents" = "Quitar de recientes"
@@ -1046,10 +1141,12 @@ status = "draft — needs native review"
 "Remove guide" = "Quitar guía"
 "Remove interaction" = "Quitar interacción"
 "Remove library from this file" = "Quitar biblioteca de este archivo"
+"Remove measurement" = "Quitar medición"
 "Remove min and max" = "Quitar mín. y máx."
 "Remove min and max height" = "Quitar alto mín. y máx."
 "Remove min and max width" = "Quitar ancho mín. y máx."
 "Remove regions" = "Quitar regiones"
+"Remove row" = "Quitar fila"
 "Remove slot" = "Quitar ranura"
 "Remove starting point" = "Quitar punto de inicio"
 "Remove stop" = "Quitar parada"
@@ -1062,6 +1159,7 @@ status = "draft — needs native review"
 "Removed" = "Eliminado"
 "Removed from the server" = "Quitado del servidor"
 "Removed since it was marked" = "Eliminada desde que se marcó"
+"Removed since this version" = "Eliminado desde esta versión"
 "Rename" = "Cambiar nombre"
 "Rename duplicated layers" = "Renombrar capas duplicadas"
 "Rename folder" = "Cambiar nombre de la carpeta"
@@ -1072,6 +1170,7 @@ status = "draft — needs native review"
 "Rename on the server…" = "Cambiar el nombre en el servidor…"
 "Rename page" = "Cambiar nombre de página"
 "Rename to" = "Nuevo nombre"
+"Reorder selection" = "Reordenar selección"
 "Replace all" = "Reemplazar todo"
 "Replace mixed export settings" = "Reemplazar ajustes de exportación mixtos"
 "Replace with" = "Reemplazar con"
@@ -1091,6 +1190,7 @@ status = "draft — needs native review"
 "Resize by the nudge amount" = "Redimensionar según el desplazamiento"
 "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Ajusta los marcos a la pantalla del dispositivo (o a la ventana sin dispositivo): sus restricciones y su diseño automático se adaptan"
 "Resize to fit" = "Ajustar tamaño"
+"Resizing" = "Cambio de tamaño"
 "Resolve" = "Resolver"
 "Resolve change" = "Resolver cambio"
 "Resolved" = "Resuelto"
@@ -1101,11 +1201,15 @@ status = "draft — needs native review"
 "Restore main component" = "Restaurar componente principal"
 "Restore this version" = "Restaurar esta versión"
 "Restored “{name}”" = "“{name}” restaurada"
+"Retrospective" = "Retrospectiva"
+"Results" = "Resultados"
+"Resume" = "Reanudar"
 "Reverse the order" = "Invertir el orden"
 "Reversed triangle" = "Triángulo invertido"
 "Review and merge" = "Revisar y fusionar"
 "Ribbon" = "Cinta"
 "Right" = "Derecha"
+"Right padding" = "Margen interno derecho"
 "Right side" = "Lado derecho"
 "Right side width" = "Ancho del lado derecho"
 "Rotate 90°" = "Girar 90°"
@@ -1116,6 +1220,7 @@ status = "draft — needs native review"
 "Rotation jitter" = "Variación de rotación"
 "Round" = "Redondo"
 "Rounded" = "Redondeado"
+"Rounded rectangle" = "Rectángulo redondeado"
 "Row" = "Fila"
 "Row gap" = "Espacio entre filas"
 "Row sizes" = "Tamaños de fila"
@@ -1125,6 +1230,7 @@ status = "draft — needs native review"
 "Rulers" = "Reglas"
 "Run" = "Ejecutar"
 "Run {label}" = "Ejecutar {label}"
+"Save file" = "Guardar archivo"
 "Save files automatically" = "Guardar archivos automáticamente"
 "Search templates" = "Buscar plantillas"
 "See all templates" = "Ver todas las plantillas"
@@ -1152,8 +1258,11 @@ status = "draft — needs native review"
 "Search actions, layers and tools" = "Buscar acciones, capas y herramientas"
 "Search assets" = "Buscar recursos"
 "Search comments" = "Buscar comentarios"
+"Search files and templates" = "Buscar archivos y plantillas"
+"Search results" = "Resultados de búsqueda"
 "Search fonts" = "Buscar fuentes"
 "Search layers" = "Buscar capas"
+"Search pages" = "Buscar páginas"
 "Search shortcuts" = "Buscar atajos"
 "Section" = "Sección"
 "Section color" = "Color de sección"
@@ -1165,9 +1274,11 @@ status = "draft — needs native review"
 "Select all with same" = "Seleccionar todo con el mismo"
 "Select layer" = "Seleccionar capa"
 "Select layers to apply the style to" = "Selecciona capas para aplicarles el estilo"
+"Select layers with this color" = "Seleccionar capas con este color"
 "Select overlapping shapes" = "Selecciona formas superpuestas"
 "Select points to edit their position, radius and mirroring" = "Selecciona puntos para editar su posición, radio y reflejo"
 "Select slot" = "Seleccionar ranura"
+"Selection colors" = "Colores de la selección"
 "Selection" = "Selección"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Cuadro de selección, {w} por {h} en {x}, {y}: las flechas lo mueven, Mayús+flechas o {cmd}+flechas cambian su tamaño, Intro selecciona, Esc cancela"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Cuadro de selección: las flechas lo mueven, Mayús+flechas o {cmd}+flechas cambian su tamaño, Intro selecciona, Esc cancela"
@@ -1178,6 +1289,7 @@ status = "draft — needs native review"
 "Server address (ws://host:47900/)" = "Dirección del servidor (ws://host:47900/)"
 "Server address" = "Dirección del servidor"
 "Server for online sharing" = "Servidor para compartir en línea"
+"Server key" = "Clave del servidor"
 "Set as default" = "Establecer como predeterminado"
 "Set variable" = "Establecer variable"
 "Set variable mode" = "Establecer modo de variable"
@@ -1187,6 +1299,7 @@ status = "draft — needs native review"
 "Shape" = "Forma"
 "Shape builder" = "Generador de formas"
 "Shape tools" = "Herramientas de forma"
+"Shapes" = "Formas"
 "Share" = "Compartir"
 "Share this file" = "Compartir este archivo"
 "Share with a code" = "Comparte con un código"
@@ -1253,10 +1366,13 @@ status = "draft — needs native review"
 "Space+drag" = "Espacio+arrastrar"
 "Spacing" = "Espaciado"
 "Spam, stolen work, abuse…" = "Spam, obra robada, abuso…"
+"Speech bubble" = "Bocadillo"
 "Splay" = "Apertura"
 "Spotlight me" = "Ponerme en el foco"
 "Spread" = "Extensión"
 "Square" = "Cuadrado"
+"Stamp" = "Sello"
+"Stamps" = "Sellos"
 "Standard" = "Estándar"
 "Standard ligatures" = "Ligaduras estándar"
 "Star" = "Estrella"
@@ -1266,18 +1382,26 @@ status = "draft — needs native review"
 "Start from a blank canvas" = "Empieza con un lienzo en blanco"
 "Start from a template" = "Empieza con una plantilla"
 "Start on path" = "Inicio en el trazado"
+"Start on the Home screen" = "Empezar en Inicio"
 "Start point" = "Punto inicial"
 "Start sharing" = "Empezar a compartir"
 "Start sharing with the Share button, then pass on the code it gives" = "Empieza a compartir con el botón Compartir y pasa el código que te da"
+"Start vote" = "Iniciar votación"
 "Starting to share…" = "Empezando a compartir…"
 "Status" = "Estado"
 "Sticky" = "Adherido"
+"Sticky note" = "Nota adhesiva"
+"Sticky note colors" = "Colores de las notas adhesivas"
+"Sticky notes" = "Notas adhesivas"
+"Sticky notes, shapes and connectors" = "Notas adhesivas, formas y conectores"
 "Stop" = "Parar"
 "Stop following {name}" = "Dejar de seguir a {name}"
 "Stop session" = "Detener sesión"
 "Stop sharing" = "Dejar de compartir"
 "Stop spotlighting" = "Salir del foco"
+"Stop timer" = "Detener temporizador"
 "Stop {n}  {hex}" = "Parada {n}  {hex}"
+"Straight" = "Recto"
 "Stretch" = "Estirar"
 "Strikethrough" = "Tachado"
 "String" = "Cadena"
@@ -1322,6 +1446,7 @@ status = "draft — needs native review"
 "Text" = "Texto"
 "Text align" = "Alineación del texto"
 "Text content" = "Contenido de texto"
+"Text size" = "Tamaño del texto"
 "Text style" = "Estilo de texto"
 "Text styles" = "Estilos de texto"
 "Texts" = "Textos"
@@ -1339,6 +1464,7 @@ status = "draft — needs native review"
 "The selection uses several text styles: click to apply one" = "La selección usa varios estilos de texto: haz clic para aplicar uno"
 "The server deletes this file if nobody opens it before {date}." = "El servidor elimina este archivo si nadie lo abre antes del {date}."
 "The whole file" = "El archivo completo"
+"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "La ventana es demasiado pequeña para {size}%, así que la interfaz se dibuja al {drawn}%. Agranda la ventana para usar {size}%."
 "Theme" = "Tema"
 "There's no destination for that action" = "No hay destino para esa acción"
 "Thickness" = "Grosor"
@@ -1349,19 +1475,26 @@ status = "draft — needs native review"
 "This condition is edited as an expression" = "Esta condición se edita como expresión"
 "This file" = "Este archivo"
 "This file has unsaved changes" = "Este archivo tiene cambios sin guardar"
+"This file is too large to join here (up to {mb} MB)" = "Este archivo es demasiado grande para unirte aquí (hasta {mb} MB)"
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "Este archivo usa fuentes que no están instaladas en este equipo. Su texto se dibuja con una fuente de reserva hasta que las instales."
 "This file is on {server}, open only to you. Share it to let others in with a new code." = "Este archivo está en {server}, abierto solo para ti. Compártelo para dejar entrar a otros con un código nuevo."
 "This frame is new on the branch." = "Este marco es nuevo en la rama."
 "This frame isn't on the branch." = "Este marco no está en la rama."
 "This server is open to the public: no key needed." = "Este servidor está abierto al público: no hace falta clave."
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Este servidor necesita su clave: añade ?key=… a la dirección (`figcraft-server key` la muestra en el equipo del servidor)."
 "This server takes files only with its key: see Advanced." = "Este servidor solo acepta archivos con su clave: mira Avanzado."
+"Thumbs up" = "Pulgar arriba"
+"This version can't be read." = "No se puede leer esta versión."
+"This version doesn't have it: all of it is new." = "Esta versión no lo tiene: todo es nuevo."
 "Tidy up" = "Ordenar"
 "Tile" = "Mosaico"
 "Tile type" = "Tipo de mosaico"
+"Timer" = "Temporizador"
 "Tint" = "Matiz"
 "Title" = "Título"
 "Title case" = "Tipo título"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Para compartir esta biblioteca con tu equipo, publica el archivo en un servidor (Compartir ▸ Publicar en servidor…) y luego publica allí la biblioteca."
+"To the layer around it" = "Hasta la capa que la contiene"
 "Toggle" = "Activar/desactivar"
 "Toggle light/dark theme" = "Cambiar tema claro/oscuro"
 "Toggle visibility" = "Mostrar/ocultar"
@@ -1369,8 +1502,10 @@ status = "draft — needs native review"
 "Top" = "Arriba"
 "Top & bottom" = "Arriba y abajo"
 "Top left radius" = "Radio superior izquierdo"
+"Top padding" = "Margen interno superior"
 "Top right radius" = "Radio superior derecho"
 "Transform" = "Transformar"
+"Triangle" = "Triángulo"
 "Triangle arrow" = "Flecha triangular"
 "Trigger" = "Desencadenante"
 "True" = "Verdadero"
@@ -1378,6 +1513,7 @@ status = "draft — needs native review"
 "Truncate with an ellipsis" = "Truncar con puntos suspensivos"
 "Try again" = "Reintentar"
 "Try another search or filter." = "Prueba otra búsqueda u otro filtro."
+"Try another search, or browse templates." = "Prueba otra búsqueda o explora las plantillas."
 "Try another word, or look at every kind." = "Prueba con otra palabra o mira todos los tipos."
 "Turn a layer into a component, reuse it, and change every copy at once" = "Convierte una capa en componente, reutilízalo y cambia todas las copias a la vez"
 "Two digits" = "Dos dígitos"
@@ -1395,7 +1531,7 @@ status = "draft — needs native review"
 "Unread" = "No leídos"
 "Unresolve" = "Reabrir"
 "Unsaved changes" = "Cambios sin guardar"
-"Unsaved changes in {names}. Close the window and lose them?" = "Hay cambios sin guardar en {names}. ¿Cerrar la ventana y perderlos?"
+"Unsaved changes in {names}. Save them before closing?" = "Hay cambios sin guardar en {names}. ¿Guardarlos antes de cerrar?"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Cambios sin guardar: guarda primero ({save}) o cierra la pestaña con {alt}+clic para descartarlos"
 "Unsaved changes: save first, or close again with {key} to discard" = "Cambios sin guardar: guarda primero o vuelve a cerrar con {key} para descartarlos"
 "Up" = "Arriba"
@@ -1414,7 +1550,9 @@ status = "draft — needs native review"
 "Use as mask" = "Usar como máscara"
 "Use auto layout" = "Usar diseño automático"
 "Use number keys for opacity" = "Usar teclas numéricas para la opacidad"
+"Use the .figcraft or .fig extension." = "Usa la extensión .figcraft o .fig."
 "Use the layer's fill" = "Usar el relleno de la capa"
+"Use your browser's zoom to change the interface size." = "Usa el zoom del navegador para cambiar el tamaño de la interfaz."
 "Used in {files} · {instances}" = "Usado en {files} · {instances}"
 "Username" = "Usuario"
 "Value" = "Valor"
@@ -1449,6 +1587,8 @@ status = "draft — needs native review"
 "Visibility" = "Visibilidad"
 "Visible" = "Visible"
 "Vivid" = "Vívido"
+"Votes per person" = "Votos por persona"
+"Voting session" = "Votación"
 "WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND está definida e indica la API gráfica que se usa; si la quitas, FigCraft elige por sí mismo."
 "Warm" = "Cálido"
 "Watch" = "Reloj"
@@ -1458,17 +1598,21 @@ status = "draft — needs native review"
 "WebSocket URL" = "URL de WebSocket"
 "WebSocket URL copied" = "URL de WebSocket copiada"
 "Wedge" = "Cuña"
+"Weekly planner" = "Planificador semanal"
 "Weight" = "Grosor"
+"What changed since a saved version" = "Qué cambió desde una versión guardada"
 "What you try here changes this preview and the code below, not the file" = "Lo que pruebes aquí cambia esta vista previa y el código de abajo, no el archivo"
 "What changed since it was marked ready for dev" = "Qué cambió desde que se marcó como listo para desarrollo"
 "What is wrong with this file? The server's operator gets your report." = "¿Qué tiene de malo este archivo? El operador del servidor recibirá tu denuncia."
 "What it's for" = "Para qué sirve"
 "What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "No se sabe desde qué cambió: cambió antes de que FigCraft guardara copias de los marcos listos para desarrollo. Resuelve el cambio (o vuelve a marcarlo como listo) para comparar a partir de ahora."
+"When marked ready" = "Al marcarlo como listo"
 "While hovering" = "Mientras se pasa el puntero"
 "While pressing" = "Mientras se presiona"
 "White" = "Blanco"
 "Who runs it, its terms and how long it keeps files" = "Quién lo gestiona, sus condiciones y cuánto tiempo conserva los archivos"
 "Why it changed" = "Por qué cambió"
+"Widget" = "Widget"
 "Widgets" = "Widgets"
 "Width" = "Ancho"
 "Width point" = "Punto de ancho"
@@ -1507,26 +1651,125 @@ status = "draft — needs native review"
 "call any command its access allows" = "llamar a cualquier comando que su acceso permita"
 "call only: {commands}" = "llamar solo a: {commands}"
 "can edit the document" = "puede editar el documento"
+"can save files" = "puede guardar archivos"
+"conditional prototype actions nested too deeply were skipped" = "se omitieron las acciones condicionales de prototipo anidadas a demasiada profundidad"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "se omitieron las acciones condicionales de prototipo con condiciones que no se pueden evaluar"
+"connector label background was skipped: style data is missing" = "se omitió el fondo de la etiqueta del conector: faltan los datos de estilo"
+"connector label was skipped: background bounds are invalid" = "se omitió la etiqueta del conector: los límites del fondo no son válidos"
+"connector label was skipped: background transform is invalid" = "se omitió la etiqueta del conector: la transformación del fondo no es válida"
+"connector label was skipped: composed text transform is invalid" = "se omitió la etiqueta del conector: la transformación compuesta del texto no es válida"
+"connector label was skipped: derived background bounds are missing" = "se omitió la etiqueta del conector: faltan los límites derivados del fondo"
+"connector label was skipped: derived text bounds are missing" = "se omitió la etiqueta del conector: faltan los límites derivados del texto"
+"connector label was skipped: text bounds are invalid" = "se omitió la etiqueta del conector: los límites del texto no son válidos"
+"connector label was skipped: text style data is missing" = "se omitió la etiqueta del conector: faltan los datos del estilo de texto"
+"connector label was skipped: text transform is invalid" = "se omitió la etiqueta del conector: la transformación del texto no es válida"
+"connector labels were skipped" = "se omitieron las etiquetas de los conectores"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "las capas de conector se importan como instantáneas estáticas de marco o vector, con sus etiquetas si las hay; no se conservan los vínculos dinámicos de los extremos"
+"connector snapshot vector data is missing; connector was left empty" = "faltan los datos vectoriales de la instantánea del conector; el conector quedó vacío"
+"connectors whose ends can't be placed are empty" = "los conectores cuyos extremos no se pueden colocar están vacíos"
 "crop marks" = "marcas de corte"
+"damaged vector geometry was skipped" = "se omitió la geometría vectorial dañada"
+"damaged vector networks import as outlines" = "las redes vectoriales dañadas se importan como contornos"
 "development: {path}" = "desarrollo: {path}"
+"document children other than pages were skipped" = "se omitieron los elementos del documento que no son páginas"
+"duplicate grid track sizing entries use equal tracks" = "las entradas duplicadas de tamaño de pista de cuadrícula usan pistas iguales"
 "e.g. count + 1" = "p. ej. count + 1"
 "e.g. count >= 3 and not done" = "p. ej. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "los conectores angulares y curvos sin trazado guardado se importan como líneas rectas"
+"entries without a node type were skipped" = "se omitieron las entradas sin tipo de nodo"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "Los enlaces figcraft:// de un navegador, chat o correo abren esta app y se unen a la sesión."
+"filled areas of a vector with their own fill use the layer's fill" = "las áreas rellenas de un vector con relleno propio usan el relleno de la capa"
 "from {server}" = "de {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "se omitieron los desencadenantes de mando sin exactamente un botón de mando conocido"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "la lista de pistas de cuadrícula supera las 1000 entradas; las pistas usan el tamaño igual predeterminado"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "el tamaño de las pistas de cuadrícula no es compatible o está mal formado; las pistas afectadas usan tamaños iguales"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "la lista de tamaños de pista de cuadrícula supera las 1000 entradas; las pistas usan el tamaño igual predeterminado"
 "hidden" = "oculta"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "los filtros de imagen son ambiguos porque están los dos contenedores de filtros; se omitió la conversión de filtros"
+"image filters use FigCraft's approximate renderer" = "los filtros de imagen usan el renderizado aproximado de FigCraft"
+"instance swap properties whose default component isn't in the file were skipped" = "se omitieron las propiedades de intercambio de instancia cuyo componente predeterminado no está en el archivo"
+"instance swap properties whose default component was past the layer limit were skipped" = "se omitieron las propiedades de intercambio de instancia cuyo componente predeterminado quedó fuera del límite de capas"
+"instances inside their own main component were imported as frames" = "las instancias dentro de su propio componente principal se importaron como marcos"
+"instances of components that aren't in the file show no layers" = "las instancias de componentes que no están en el archivo no muestran capas"
+"instances of components that aren't in the file were imported as frames" = "las instancias de componentes que no están en el archivo se importaron como marcos"
+"instances that would nest a component inside itself were imported as frames" = "las instancias que anidarían un componente dentro de sí mismo se importaron como marcos"
+"instances whose component was past the layer limit were imported as frames" = "las instancias cuyo componente quedó fuera del límite de capas se importaron como marcos"
+"instances without a main component were imported as empty frames" = "las instancias sin componente principal se importaron como marcos vacíos"
+"invalid internal .fig text path data was ignored" = "se ignoraron datos internos no válidos de texto en trazado del .fig"
+"invalid or oversized vector networks import as outlines" = "las redes vectoriales no válidas o demasiado grandes se importan como contornos"
+"invalid or oversized vector path data was skipped" = "se omitieron los datos de trazados vectoriales no válidos o demasiado grandes"
 "just now" = "justo ahora"
+"key triggers without a supported key were skipped" = "se omitieron los desencadenantes de tecla sin una tecla compatible"
+"key up triggers import as key presses" = "los desencadenantes al soltar una tecla se importan como pulsaciones de tecla"
+"layers without a position were placed at their parent's origin" = "las capas sin posición se colocaron en el origen de su elemento padre"
+"layers without a type were skipped" = "se omitieron las capas sin tipo"
+"legacy image filter container is unsupported; filter conversion was skipped" = "el contenedor antiguo de filtros de imagen no es compatible; se omitió la conversión de filtros"
 "locked" = "bloqueada"
+"malformed image filters container was skipped" = "se omitió el contenedor de filtros de imagen mal formado"
+"malformed image paintFilter container was skipped" = "se omitió el contenedor paintFilter de imagen mal formado"
+"malformed slot content assignment was skipped" = "se omitió una asignación de contenido de ranura mal formada"
 "no bleed" = "sin sangrado"
 "nobody else here yet" = "aún no hay nadie más"
+"non-default slot settings are not represented and were skipped" = "los ajustes de ranura no predeterminados no se representan y se omitieron"
 "now" = "ahora"
+"offer files to save if it asks to (you choose where each one goes)" = "ofrecer archivos para guardar si lo pide (tú eliges dónde va cada uno)"
+"only in a text style or variable" = "solo en un estilo de texto o una variable"
 "or" = "o"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "se conservaron las uniones de trazo de los puntos; los trazos discontinuos o de ancho variable se dibujan con la unión de la capa"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "las claves de componentes preferidos de las ranuras no corresponden a capas del archivo y se omitieron"
+"prototype actions of unknown types were skipped" = "se omitieron las acciones de prototipo de tipos desconocidos"
+"prototype actions without a destination in the file were skipped" = "se omitieron las acciones de prototipo sin destino en el archivo"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "se omitieron las expresiones de prototipo con variables que no están en el JSON de variables"
+"prototype expressions with unsupported functions were skipped" = "se omitieron las expresiones de prototipo con funciones no compatibles"
+"prototype interactions without supported actions were skipped" = "se omitieron las interacciones de prototipo sin acciones compatibles"
+"prototype navigations of unknown types were skipped" = "se omitieron las navegaciones de prototipo de tipos desconocidos"
+"prototype transitions of unknown types play instantly" = "las transiciones de prototipo de tipos desconocidos se reproducen al instante"
+"prototype triggers of unknown types were skipped" = "se omitieron los desencadenantes de prototipo de tipos desconocidos"
 "put a widget on the canvas" = "poner un widget en el lienzo"
 "read and edit the document" = "leer y editar el documento"
 "read the document" = "leer el documento"
 "reads the document" = "lee el documento"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "se omitieron las acciones «Establecer variable» sobre variables que no están en el JSON de variables"
+"set-variable actions with values that can't be evaluated were skipped" = "se omitieron las acciones «Establecer variable» con valores que no se pueden evaluar"
+"set-variable actions with values that don't fit the variable were skipped" = "se omitieron las acciones «Establecer variable» con valores que no encajan con la variable"
+"set-variable actions without a value were skipped" = "se omitieron las acciones «Establecer variable» sin valor"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "se omitieron las acciones «Establecer modo de variable» sobre colecciones o modos que no están en el JSON de variables"
+"slot content assignment target is missing or is not slot content" = "el destino de la asignación de contenido de ranura falta o no es contenido de ranura"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "la asignación de contenido de ranura usa el GUID vacío como centinela y se omitió"
+"slot layers without a matching slot property were imported as frames" = "las capas de ranura sin una propiedad de ranura correspondiente se importaron como marcos"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "algunos puntos vectoriales hacen referencia a ajustes de punto que faltan en el archivo; usan las uniones de la capa y esquinas simples"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "algunos segmentos vectoriales hacen referencia a ajustes de estilo que faltan en el archivo; usan el trazo de la capa"
+"stale or invalid grid track sizing entries were ignored" = "se ignoraron las entradas de tamaño de pista de cuadrícula obsoletas o no válidas"
+"stars and polygons without point counts or geometry use the default point count" = "las estrellas y los polígonos sin número de puntos ni geometría usan el número de puntos predeterminado"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "los ajustes de estilo de algunos segmentos vectoriales no son compatibles; esos segmentos usan el trazo de la capa"
+"text path underline or strikethrough decoration is not rendered" = "el subrayado o tachado del texto en trazado no se dibuja"
+"text style overrides refer to missing table entries" = "las anulaciones de estilo de texto hacen referencia a entradas de tabla que faltan"
+"the file has no pages" = "el archivo no tiene páginas"
 "the plugin" = "el plugin"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "el JSON de variables no tiene `variableCollections` (se esperaba la respuesta de variables locales) y se ignoró"
 "this session only" = "solo esta sesión"
+"unknown component property types were skipped" = "se omitieron los tipos de propiedad de componente desconocidos"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "se omitieron los alias a variables que no están en el JSON de variables (o son de otro tipo)"
+"variable bindings to properties the layer doesn't have were skipped" = "se omitieron las vinculaciones de variables a propiedades que la capa no tiene"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "se omitieron las vinculaciones a variables que no están en el JSON de variables (variables de biblioteca)"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "se omitieron las vinculaciones de variables: el JSON del archivo no tiene definiciones de variables (pasa el JSON de variables locales como `variables` o incrusta su `meta` junto al JSON del archivo)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "se omitieron las vinculaciones de variables cuyo tipo no encaja con la propiedad"
+"variable collections without modes were skipped" = "se omitieron las colecciones de variables sin modos"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "se omitieron las consultas de modo de variable en expresiones de prototipo que no son una variable y uno de sus modos"
+"variable modes of collections that aren't in the file were skipped" = "se omitieron los modos de variable de colecciones que no están en el archivo"
+"variable modes of collections that aren't in the variables JSON were skipped" = "se omitieron los modos de variable de colecciones que no están en el JSON de variables"
+"variable values that don't match their type (or composed colours) were skipped" = "se omitieron los valores de variable que no coinciden con su tipo (o colores compuestos)"
+"variables of unknown types were skipped" = "se omitieron las variables de tipos desconocidos"
+"variables whose collection isn't in the variables JSON were skipped" = "se omitieron las variables cuya colección no está en el JSON de variables"
+"variables without readable values were skipped" = "se omitieron las variables sin valores legibles"
+"vector points with unknown stroke joins use the layer join" = "los puntos vectoriales con uniones de trazo desconocidas usan la unión de la capa"
+"vectors without geometry are empty" = "los vectores sin geometría están vacíos"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "los vectores sin geometría están vacíos (exporta el JSON del archivo con geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "el texto muy largo se recortó a 1.048.576 caracteres"
+"very long vector paths were skipped" = "se omitieron los trazados vectoriales muy largos"
+"video actions are not supported and were skipped" = "las acciones de vídeo no son compatibles y se omitieron"
+"video triggers are not supported and were skipped" = "los desencadenantes de vídeo no son compatibles y se omitieron"
 "yesterday" = "ayer"
 "{instances} in {files}" = "{instances} en {files}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}: traducción en borrador, pendiente de revisión por un hablante nativo."
@@ -1536,6 +1779,7 @@ status = "draft — needs native review"
 "{name} is forgotten on this computer; the file stays on {server}" = "{name} se olvidó en este ordenador; el archivo se queda en {server}"
 "{name} is on the server." = "{name} está en el servidor."
 "{name} is spotlighting" = "{name} está en el foco"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} es demasiado grande para abrirlo en el navegador (más de 512 MB)."
 "{name}\nClick to apply to the selection" = "{name}\nHaz clic para aplicarlo a la selección"
 "{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nArrastra al lienzo o haz clic para colocarlo en el centro de la vista.\nMantén Alt (Opción) al soltar sobre una instancia para intercambiarla."
 "{name} (from {library})" = "{name} (de {library})"
@@ -1569,8 +1813,10 @@ status = "draft — needs native review"
 "{n} layers selected" = { one = "{n} capa seleccionada", other = "{n} capas seleccionadas" }
 "{n} layers · {parts}" = { one = "{n} capa · {parts}", other = "{n} capas · {parts}" }
 "{n} matches" = { one = "{n} coincidencia", other = "{n} coincidencias" }
+"{n} min" = "{n} min"
 "{n} minutes ago" = { one = "hace {n} minuto", other = "hace {n} minutos" }
 "{n} months ago" = { one = "hace {n} mes", other = "hace {n} meses" }
+"{n} more notes omitted from this report" = { one = "{n} nota más omitida de este informe", other = "{n} notas más omitidas de este informe" }
 "{n} of {total}" = "{n} de {total}"
 "{n} people joined" = { one = "{n} persona se ha unido", other = "{n} personas se han unido" }
 "{n} preferred components" = { one = "{n} componente preferido", other = "{n} componentes preferidos" }
@@ -1579,7 +1825,10 @@ status = "draft — needs native review"
 "{n} replies" = { one = "{n} respuesta", other = "{n} respuestas" }
 "{n} rows" = { one = "{n} fila", other = "{n} filas" }
 "{n} styles" = { one = "{n} estilo", other = "{n} estilos" }
+"{n} text layers" = { one = "{n} capa de texto", other = "{n} capas de texto" }
 "{n} variables" = { one = "{n} variable", other = "{n} variables" }
+"{n} votes" = { one = "{n} voto", other = "{n} votos" }
+"{n} votes left" = { one = "Te queda {n} voto", other = "Te quedan {n} votos" }
 "{n} weeks ago" = { one = "hace {n} semana", other = "hace {n} semanas" }
 "{n} years ago" = { one = "hace {n} año", other = "hace {n} años" }
 "{n}d" = "{n} d"
@@ -1587,6 +1836,7 @@ status = "draft — needs native review"
 "{n}m" = "{n} min"
 "{n}w" = "{n} sem"
 "{page}, nothing selected" = "{page}, nada seleccionado"
+"{percent}%" = "{percent}%"
 "{profile} (current)" = "{profile} (actual)"
 "{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} es su valor; {property ? \"a\" : \"b\"} elige un texto. Cualquier otro {…} se queda tal cual."
 "{server} can't say what became of your files (it is older than this app)." = "{server} no puede decir qué fue de tus archivos (es anterior a esta aplicación)."
@@ -1629,8 +1879,28 @@ status = "draft — needs native review"
 "arrange.front" = "Traer al frente"
 "arrange.packH" = "Agrupar en horizontal"
 "arrange.packV" = "Agrupar en vertical"
+"arrange.reorder" = "Reordenar selección"
 "arrange.roundToPixels" = "Redondear a píxeles"
+"arrange.spacing" = "Espaciado"
 "arrange.tidy" = "Ordenar"
+"board.connector" = "Conector"
+"board.ink" = "Trazo de rotulador"
+"board.label" = "Etiqueta del conector"
+"board.nextSticky" = "Siguiente nota adhesiva"
+"board.reattach" = "Volver a unir el conector"
+"board.setColor" = "Color en la pizarra"
+"board.setStyle" = "Estilo en la pizarra"
+"board.shape" = "Forma con texto"
+"board.stamp" = "Sello"
+"board.sticky" = "Nota adhesiva"
+"board.table" = "Tabla"
+"board.tableEdit" = "Editar tabla"
+"board.template" = "Plantilla de pizarra"
+"board.templates" = "Listar plantillas de pizarra"
+"board.timer" = "Temporizador"
+"board.timerState" = "Estado del temporizador"
+"board.vote" = "Votación"
+"board.voteResults" = "Resultados de la votación"
 "bool.exclude" = "Excluir selección"
 "bool.flatten" = "Acoplar booleana"
 "bool.intersect" = "Intersecar selección"
@@ -1708,6 +1978,9 @@ status = "draft — needs native review"
 "dev.focus" = "Vista de enfoque"
 "dev.resolveChange" = "Resolver cambio"
 "dev.unfocus" = "Salir de la vista de enfoque"
+"devMode.addMeasurement" = "Añadir medición"
+"devMode.measurements" = "Listar mediciones"
+"devMode.removeMeasurement" = "Quitar medición"
 "devResource.add" = "Añadir recurso de desarrollo"
 "devResource.edit" = "Editar recurso de desarrollo"
 "devResource.list" = "Listar recursos de desarrollo"
@@ -1731,6 +2004,7 @@ status = "draft — needs native review"
 "edit.duplicate" = "Duplicar"
 "edit.findReplace" = "Buscar y reemplazar"
 "edit.paste" = "Pegar"
+"edit.pasteDesignLayers" = "Pegar capas de diseño"
 "edit.pasteOver" = "Pegar sobre la selección"
 "edit.pasteProperties" = "Pegar propiedades"
 "edit.pasteReplace" = "Pegar para reemplazar"
@@ -1740,7 +2014,9 @@ status = "draft — needs native review"
 "edit.setDefaultProperties" = "Establecer propiedades predeterminadas"
 "edit.undo" = "Deshacer"
 "effect.add" = "Añadir efecto"
+"effect.copy" = "Copiar efecto"
 "effect.move" = "Mover efecto"
+"effect.paste" = "Pegar efecto"
 "effect.remove" = "Quitar efecto"
 "effect.set" = "Establecer efecto"
 "export.add" = "Añadir ajuste de exportación"
@@ -1754,7 +2030,9 @@ status = "draft — needs native review"
 "file.exportLayers" = "Exportar capas"
 "file.exportSvg" = "Exportar selección como SVG"
 "file.import" = "Importar"
+"file.moveTab" = "Mover pestaña"
 "file.new" = "Nuevo archivo de diseño"
+"file.newBoard" = "Nueva pizarra"
 "file.newFromTemplate" = "Nuevo desde plantilla"
 "file.open" = "Abrir"
 "file.openRecent" = "Abrir reciente"
@@ -1764,10 +2042,13 @@ status = "draft — needs native review"
 "file.revert" = "Volver a lo guardado"
 "file.save" = "Guardar"
 "file.saveAs" = "Guardar como"
+"file.markSaved" = "Marcar como guardado"
 "file.saveVersion" = "Guardar en el historial de versiones"
 "file.versionHistory" = "Mostrar historial de versiones"
 "fill.add" = "Añadir relleno"
+"fill.copy" = "Copiar relleno"
 "fill.move" = "Mover relleno"
+"fill.paste" = "Pegar relleno"
 "fill.pattern" = "Relleno de patrón"
 "fill.remove" = "Quitar relleno"
 "fill.set" = "Establecer relleno"
@@ -1839,6 +2120,7 @@ status = "draft — needs native review"
 "object.batchRename" = "Cambiar nombre en lote"
 "object.convertToFrame" = "Convertir en marco"
 "object.convertToGroup" = "Convertir en grupo"
+"object.convertToSection" = "Convertir en sección"
 "object.flipH" = "Voltear horizontalmente"
 "object.flipV" = "Voltear verticalmente"
 "object.frameSelection" = "Enmarcar selección"
@@ -1895,6 +2177,8 @@ status = "draft — needs native review"
 "pref.reduceMotion" = "Reducir movimiento"
 "pref.renameDuplicates" = "Renombrar capas duplicadas"
 "pref.showDimensions" = "Mostrar dimensiones en los objetos"
+"pref.startOnHome" = "Empezar en Inicio"
+"pref.uiScale" = "Tamaño de la interfaz"
 "pref.userName" = "Tu nombre en los comentarios"
 "proto.action.add" = "Añadir acción de prototipo"
 "proto.action.move" = "Reordenar acción de prototipo"
@@ -1938,6 +2222,12 @@ status = "draft — needs native review"
 "select.sameStroke" = "Seleccionar mismo trazo"
 "select.sameText" = "Seleccionar mismas propiedades de texto"
 "select.set" = "Seleccionar"
+"selection.applyColorStyle" = "Aplicar estilo de color a la selección"
+"selection.bindColorVariable" = "Aplicar variable de color a la selección"
+"selection.colors" = "Colores de la selección"
+"selection.detachColor" = "Separar color de la selección"
+"selection.selectColor" = "Seleccionar capas con este color"
+"selection.setPaint" = "Cambiar color de la selección"
 "shape.arrow" = "Flecha"
 "shape.ellipse" = "Elipse"
 "shape.line" = "Línea"
@@ -1950,7 +2240,9 @@ status = "draft — needs native review"
 "shapeBuilder.remove" = "Quitar regiones"
 "stroke.add" = "Añadir trazo"
 "stroke.brush" = "Pincel"
+"stroke.copy" = "Copiar trazo"
 "stroke.move" = "Mover trazo"
+"stroke.paste" = "Pegar trazo"
 "stroke.remove" = "Quitar trazo"
 "stroke.set" = "Establecer trazo"
 "stroke.widthProfile" = "Perfil de ancho"
@@ -1996,15 +2288,21 @@ status = "draft — needs native review"
 "text.listIndent" = "Aumentar sangría de la lista"
 "text.listOutdent" = "Reducir sangría de la lista"
 "text.listStyle" = "Estilo de lista"
+"text.loadFont" = "Cargar archivo de fuente"
 "text.maxLines" = "Máximo de líneas"
+"text.missingFonts" = "Fuentes que faltan"
 "text.numberList" = "Lista numerada"
 "text.onPath" = "Texto en trazado"
 "text.paragraphIndent" = "Sangría de párrafo"
 "text.paragraphSpacing" = "Espacio entre párrafos"
 "text.pathOptions" = "Opciones de texto en trazado"
 "text.preview" = "Previsualizar cambio de texto"
+"text.refit" = "Ajustar texto a las fuentes"
 "text.removeFromPath" = "Quitar texto del trazado"
+"text.rescanFonts" = "Volver a buscar fuentes instaladas"
 "text.set" = "Establecer texto"
+"data.fill" = "Rellenar copias con datos"
+"text.fit" = "Ajustar texto a su caja"
 "text.setFeatures" = "Funciones OpenType"
 "text.setVariations" = "Ejes de fuente variable"
 "text.sizeDown" = "Reducir tamaño de fuente"
@@ -2018,10 +2316,14 @@ status = "draft — needs native review"
 "text.weightUp" = "Aumentar peso de fuente"
 "tool.arrow" = "Flecha"
 "tool.comment" = "Comentario"
+"tool.connector" = "Conector"
 "tool.ellipse" = "Elipse"
+"tool.eraser" = "Borrador"
 "tool.frame" = "Marco"
 "tool.hand" = "Mano"
+"tool.highlighter" = "Resaltador"
 "tool.line" = "Línea"
+"tool.marker" = "Rotulador"
 "tool.move" = "Mover"
 "tool.pen" = "Pluma"
 "tool.pencil" = "Lápiz"
@@ -2033,9 +2335,12 @@ status = "draft — needs native review"
 "tool.scaleAnchor" = "Ancla de escala"
 "tool.section" = "Sección"
 "tool.set" = "Elegir herramienta"
+"tool.shape" = "Formas"
 "tool.shapeBuilder" = "Generador de formas"
 "tool.slice" = "Sector"
+"tool.stamp" = "Sello"
 "tool.star" = "Estrella"
+"tool.sticky" = "Nota adhesiva"
 "tool.text" = "Texto"
 "transform.move" = "Mover"
 "transform.moveTo" = "Mover a"
@@ -2097,11 +2402,13 @@ status = "draft — needs native review"
 "vector.edit.tool" = "Herramienta de edición vectorial"
 "vector.edit.transform" = "Transformar puntos"
 "vector.edit.widthPoint" = "Punto de ancho"
+"vector.fillRule" = "Establecer regla de relleno"
 "vector.flatten" = "Acoplar"
 "vector.join" = "Unir selección"
 "vector.offset" = "Desplazar trazado"
 "vector.outlineStroke" = "Contornear trazo"
 "vector.reverse" = "Invertir dirección del trazado"
+"vector.reverseLoop" = "Invertir bucle"
 "vector.simplify" = "Simplificar vector"
 "vector.smoothJoin" = "Unir selección con suavizado"
 "version.autosave" = "Guardar versión automáticamente"
@@ -2163,6 +2470,8 @@ status = "draft — needs native review"
 "widget.click" = "Pulsar widget"
 "widget.insert" = "Insertar widget"
 "widget.list" = "Listar widgets"
+"widget.menu" = "Menú del widget"
+"widget.setText" = "Editar campo del widget"
 "window.focus" = "Traer la ventana al frente"
 "window.new" = "Nueva ventana"
 "template.list" = "Listar plantillas"
diff --git a/crates/ui-egui/locales/fi.toml b/crates/ui-egui/locales/fi.toml
new file mode 100644
index 00000000..d7b152d7
--- /dev/null
+++ b/crates/ui-egui/locales/fi.toml
@@ -0,0 +1,2458 @@
+# Finnish interface catalog. Original translations; MIT OR Apache-2.0.
+# AI-assisted draft; not reviewed by a human Finnish/native speaker.
+# Sentence case, imperative commands. Integer plurals: 1 taso, 0/2/21 tasoa.
+# Product names, shortcut notation, numeric glyphs and code examples retain their identity.
+# Command ids and context suffixes are immutable keys; translated text is display-only.
+# Completeness measured against the English UI and live command/menu source sets; see tests.
+
+[meta]
+name = "Suomi"
+status = "draft — needs native review"
+
+[ui]
+"% of all commits" = "% kaikista muutoksista"
+"(no longer published)" = "(ei enää julkaistu)"
+"({n} warnings: some entries were skipped)" = { one = "({n} varoitus: joitakin kohteita ohitettiin)", other = "({n} varoitusta: joitakin kohteita ohitettiin)" }
+"+ Create variable" = "+ Luo muuttuja"
+".fig (experimental)" = ".fig (kokeellinen)"
+"1…9, 0" = "1…9, 0"
+"@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: PR:t {prs}, muutokset {commits}, rivit +{added} / −{deleted} (Δ {delta}), binääriresurssit +{bin_added} / −{bin_deleted}, {first} – {last}"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Tämänniminen .figcraft-tiedosto on jo olemassa. Vahvista korvaaminen valitsemalla sen koko nimi."
+"A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Tämän tiedoston kokoelma, joka sisältää nämä tilat ja muuttujat. Voit ohittaa niiden arvot tilakohtaisesti ja lisätä omia muuttujia."
+"A layer on its own aligns to its frame: select more layers, or one in a frame" = "Yksittäinen taso tasataan kehykseensä. Valitse useampia tasoja tai yksi kehyksen sisällä oleva taso."
+"A responsive product page: hero, features, figures, a quote and a footer" = "Mukautuva tuotesivu: pääosio, ominaisuudet, tunnusluvut, lainaus ja alatunniste"
+"A spring plays until it settles: its mass, stiffness and damping set how long" = "Jousi liikkuu, kunnes se asettuu. Sen massa, jäykkyys ja vaimennus määräävät keston."
+"A title, an agenda, a big figure, a chart and a closing slide" = "Otsikko, esityslista, suuri tunnusluku, kaavio ja päätösdia"
+"A to Z" = "A:sta Z:aan"
+"About" = "Tietoja"
+"About FigCraft" = "Tietoja FigCraftista"
+"About this server" = "Tietoja tästä palvelimesta"
+"Action" = "Toiminto"
+"Actions" = "Toiminnot"
+"Actions for {name}" = "Kohteen {name} toiminnot"
+"Actions…" = "Toiminnot…"
+"Active" = "Aktiivinen"
+"Actual size (100%)" = "Todellinen koko (100 %)"
+"Add a category" = "Lisää luokka"
+"Add a comment" = "Lisää kommentti"
+"Add a description" = "Lisää kuvaus"
+"Add a frame (F) or a shape (R) to get started" = "Aloita lisäämällä kehys (F) tai muoto (R)"
+"Add a layer or component to tile first" = "Lisää ensin laatoitettava taso tai komponentti"
+"Add a minute" = "Lisää minuutti"
+"Add a note for developers" = "Lisää huomautus kehittäjille"
+"Add action" = "Lisää toiminto"
+"Add actions for when no condition holds" = "Lisää toimintoja tilanteeseen, jossa mikään ehto ei täyty"
+"Add an annotation for developers" = "Lisää huomautus kehittäjille"
+"Add another condition" = "Lisää toinen ehto"
+"Add auto layout" = "Lisää automaattinen asettelu"
+"Add background behind overlay" = "Lisää tausta peittokuvan taakse"
+"Add column" = "Lisää sarake"
+"Add content to this slot" = "Lisää sisältöä tähän sisältöpaikkaan"
+"Add dev resource" = "Lisää kehittäjäresurssi"
+"Add effect" = "Lisää tehoste"
+"Add export setting" = "Lisää vientiasetus"
+"Add fill" = "Lisää täyttö"
+"Add interaction" = "Lisää vuorovaikutus"
+"Add layout grid" = "Lisää asetteluruudukko"
+"Add library" = "Lisää kirjasto"
+"Add library file…" = "Lisää kirjastotiedosto…"
+"Add max height" = "Lisää enimmäiskorkeus"
+"Add max width" = "Lisää enimmäisleveys"
+"Add measurement" = "Lisää mittaus"
+"Add min height" = "Lisää vähimmäiskorkeus"
+"Add min width" = "Lisää vähimmäisleveys"
+"Add mode" = "Lisää tila"
+"Add new page" = "Lisää uusi sivu"
+"Add or update collections from a variables JSON" = "Lisää tai päivitä kokoelmia muuttujien JSON-tiedostosta"
+"Add properties to make instances configurable" = "Lisää ominaisuuksia, jotta ilmentymiä voi mukauttaa"
+"Add reaction" = "Lisää reaktio"
+"Add row" = "Lisää rivi"
+"Add starting point" = "Lisää aloituspiste"
+"Add stroke" = "Lisää reunaviiva"
+"Add variant" = "Lisää variantti"
+"Add variant with a new value" = "Lisää variantti uudella arvolla"
+"Added" = "Lisätty"
+"Added the library \"{name}\"" = "Kirjasto ”{name}” lisätty"
+"Adding to {name}" = "Lisätään kohteeseen {name}"
+"Adjust" = "Säädä"
+"Adjustment presets" = "Säädön esiasetukset"
+"Advanced" = "Lisäasetukset"
+"Advanced stroke" = "Reunaviivan lisäasetukset"
+"After delay" = "Viiveen jälkeen"
+"After delay {ms}ms" = "Viiveen {ms}ms jälkeen"
+"Align" = "Tasaa"
+"Align bottom" = "Tasaa alas"
+"Align center" = "Keskitä"
+"Align horizontal centers" = "Keskitä vaakasuunnassa"
+"Align left" = "Tasaa vasemmalle"
+"Align middle" = "Tasaa keskelle"
+"Align right" = "Tasaa oikealle"
+"Align text baselines" = "Tasaa tekstin peruslinjat"
+"Align top" = "Tasaa ylös"
+"Align vertical centers" = "Keskitä pystysuunnassa"
+"Alignment" = "Tasaus"
+"All" = "Kaikki"
+"All categories" = "Kaikki luokat"
+"All comments" = "Kaikki kommentit"
+"All components" = "Kaikki komponentit"
+"All fonts" = "Kaikki fontit"
+"All objects" = "Kaikki objektit"
+"All supported properties" = "Kaikki tuetut ominaisuudet"
+"All the fonts this file uses are installed" = "Kaikki tämän tiedoston käyttämät fontit on asennettu"
+"All variables" = "Kaikki muuttujat"
+"Along the bottom" = "Alareunaa pitkin"
+"Along the left" = "Vasenta reunaa pitkin"
+"Along the right" = "Oikeaa reunaa pitkin"
+"Along the top" = "Yläreunaa pitkin"
+"Alpha" = "Alfa"
+"Alphabetical" = "Aakkosjärjestys"
+"Alt+drag" = "Alt+drag"
+"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "Analytiikkanäkymä ruudukossa: tunnuslukuja, vektoreista piirrettyjä kaavioita ja taulukko"
+"An invite link that opens FigCraft and joins" = "Kutsulinkki, joka avaa FigCraftin ja liittyy istuntoon"
+"Anchor" = "Ankkuri"
+"Android" = "Android"
+"Angular" = "Kulmaliukuväri"
+"Animation" = "Animaatio"
+"Annotations" = "Huomautukset"
+"Annotations shown on the canvas" = "Piirtoalueella näytettävät huomautukset"
+"Another server, or one that needs its key. The usual server is set in Preferences." = "Toinen palvelin tai avainta tarvitseva palvelin. Tavallinen palvelin asetetaan asetuksissa."
+"Any status" = "Kaikki tilat"
+"Anyone on your network with this code can edit the file, while this app stays open." = "Kuka tahansa lähiverkossasi voi muokata tiedostoa tällä koodilla niin kauan kuin sovellus on auki."
+"Anyone with the edit link can change the file; the view link only lets people look. The links carry their secrets: share them like passwords. `figcraft-server links` makes more and revokes them." = "Kuka tahansa muokkauslinkin saanut voi muuttaa tiedostoa. Katselulinkillä voi vain katsella. Linkit sisältävät salaiset tunnisteet: jaa niitä kuin salasanoja. `figcraft-server links` luo lisää linkkejä ja peruu niitä."
+"Anyone with this code can edit the file." = "Kuka tahansa tämän koodin saanut voi muokata tiedostoa."
+"Anyone with this code can look at the file, not change it." = "Kuka tahansa tämän koodin saanut voi katsella tiedostoa, mutta ei muuttaa sitä."
+"Appearance" = "Ulkoasu"
+"Apply a component property" = "Käytä komponentin ominaisuutta"
+"Apply variable" = "Käytä muuttujaa"
+"Apply variable to text" = "Käytä muuttujaa tekstiin"
+"Apply variable to visibility" = "Käytä muuttujaa näkyvyyteen"
+"Apps" = "Sovellukset"
+"Apr" = "huhtik."
+"Arc" = "Kaari"
+"Arc ratio" = "Kaaren suhde"
+"Arc start" = "Kaaren alku"
+"Arc sweep" = "Kaaren pyyhkäisy"
+"Archive" = "Arkistoi"
+"Archived" = "Arkistoitu"
+"Arrange" = "Järjestä"
+"Arrow" = "Nuoli"
+"Arrow at the end" = "Nuoli loppuun"
+"As typed" = "Kirjoitetussa muodossa"
+"Asking the server…" = "Kysytään palvelimelta…"
+"Assets" = "Resurssit"
+"Aug" = "elok."
+"Auto" = "Automaattinen"
+"Auto (space around)" = "Automaattinen (tila ympärillä)"
+"Auto (space between)" = "Automaattinen (tila välissä)"
+"Auto (space evenly)" = "Automaattinen (tasavälein)"
+"Auto ({mode})" = "Automaattinen ({mode})"
+"Auto columns" = "Automaattiset sarakkeet"
+"Auto gap" = "Automaattinen väli"
+"Auto height" = "Automaattinen korkeus"
+"Auto layout" = "Automaattinen asettelu"
+"Auto rows" = "Automaattiset rivit"
+"Auto width" = "Automaattinen leveys"
+"Back" = "Takaisin"
+"Back to Ready for dev" = "Palauta kehitysvalmiiksi"
+"Back to Ready for dev: the next change compares with how it is now" = "Palauta kehitysvalmiiksi: seuraavaa muutosta verrataan nykyiseen tilaan"
+"Back to assets" = "Takaisin resursseihin"
+"Back to current" = "Takaisin nykyiseen"
+"Back to styles" = "Takaisin tyyleihin"
+"Back to the FigCraft server" = "Takaisin FigCraft-palvelimelle"
+"Back to the canvas from a focused region" = "Palaa kohdistetulta alueelta piirtoalueelle"
+"Back to the current version" = "Takaisin nykyiseen versioon"
+"Back to the font's value" = "Palauta fontin arvo"
+"Back to the values the font style implies" = "Palauta fonttityylin mukaiset arvot"
+"Background" = "Tausta"
+"Background blur" = "Taustan sumennus"
+"Basics" = "Perusteet"
+"Before" = "Ennen"
+"Bend" = "Taivutus"
+"Between the selected layers" = "Valittujen tasojen välillä"
+"Bevel" = "Viiste"
+"Binary assets added" = "Lisätyt binääriresurssit"
+"Binary assets removed" = "Poistetut binääriresurssit"
+"Black & white" = "Mustavalkoinen"
+"Bleed" = "Leikkuuvara"
+"Bleed marks" = "Leikkuuvaramerkit"
+"Bleed marks need a bleed" = "Leikkuuvaramerkit edellyttävät leikkuuvaraa"
+"Blend" = "Sekoitus"
+"Blend mode" = "Sekoitustila"
+"Blue" = "Sininen"
+"Blur" = "Sumennus"
+"Boolean" = "Totuusarvo"
+"Boolean groups" = "Boolen ryhmät"
+"Both directions" = "Molemmat suunnat"
+"Bottom" = "Alhaalta"
+"Bottom left radius" = "Vasemman alakulman säde"
+"Bottom right radius" = "Oikean alakulman säde"
+"Bound to {name}. Click to detach the variable." = "Sidottu muuttujaan {name}. Irrota muuttuja napsauttamalla."
+"Brainstorm" = "Ideointi"
+"Branch" = "Haara"
+"Branch archived" = "Haara arkistoitu"
+"Branch merged" = "Haara yhdistetty"
+"Branch name" = "Haaran nimi"
+"Branch of {file}" = "Tiedoston {file} haara"
+"Branch of {file} · merged or archived" = "Tiedoston {file} haara · yhdistetty tai arkistoitu"
+"Branch updated from main" = "Haara päivitetty päähaarasta"
+"Branch {name}" = "Haara {name}"
+"Branches" = "Haarat"
+"Bring forward" = "Tuo eteenpäin"
+"Bring the main file's changes into the branch" = "Tuo päätiedoston muutokset haaraan"
+"Bring to front" = "Tuo etummaiseksi"
+"Bristle" = "Harjas"
+"Browse" = "Selaa"
+"Brush" = "Sivellin"
+"Brush rotation jitter" = "Siveltimen kierron vaihtelu"
+"Brush scatter" = "Siveltimen hajonta"
+"Brush size jitter" = "Siveltimen koon vaihtelu"
+"Brush spacing" = "Siveltimen välistys"
+"Bulleted list" = "Luettelomerkitty luettelo"
+"C or Shift+C" = "C or Shift+C"
+"C or ⇧C" = "C or ⇧C"
+"CMYK colour" = "CMYK-väri"
+"CSS custom properties…" = "CSS:n mukautetut ominaisuudet…"
+"Can edit" = "Voi muokata"
+"Can view" = "Voi katsella"
+"Can't read this library: {e}" = "Kirjastoa ei voi lukea: {e}"
+"Cancel" = "Peruuta"
+"Canvas" = "Piirtoalue"
+"Canvas stacking" = "Piirtoalueen pinoamisjärjestys"
+"Cap height to baseline" = "Versaalikorkeudesta peruslinjaan"
+"Case" = "Kirjainkoko"
+"Case-sensitive forms" = "Kirjainkokoon mukautuvat muodot"
+"Categories" = "Luokat"
+"Center" = "Keskelle"
+"Change alias" = "Vaihda alias"
+"Change resolved" = "Muutos ratkaistu"
+"Change style" = "Vaihda tyyli"
+"Change to" = "Vaihda kohteeksi"
+"Change to needs a layer inside a variant" = "Vaihto edellyttää variantin sisällä olevaa tasoa"
+"Changed" = "Muutettu"
+"Changed on both sides: keep one" = "Muutettu molemmilla puolilla: säilytä toinen"
+"Changes on main" = "Päähaaran muutokset"
+"Changes on the branch" = "Haaran muutokset"
+"Changes unknown" = "Muutokset tuntemattomia"
+"Check" = "Valintamerkki"
+"Checking the fonts installed on this computer…" = "Tarkistetaan tämän tietokoneen asennettuja fontteja…"
+"Checking the server…" = "Tarkistetaan palvelinta…"
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Valitse yllä React, Leptos, Vue, SwiftUI, Compose, ArkUI tai Flutter yhdistääksesi tämän komponentin sen koodiin."
+"Chevron" = "Kulmanuoli"
+"Choose another profile to change it." = "Vaihda valitsemalla toinen profiili."
+"Choose collection" = "Valitse kokoelma"
+"Choose image" = "Valitse kuva"
+"Choose mode" = "Valitse tila"
+"Choose variable" = "Valitse muuttuja"
+"Circle" = "Ympyrä"
+"Clear from this list" = "Poista tästä luettelosta"
+"Clear recent" = "Tyhjennä viimeisimmät"
+"Clear results" = "Tyhjennä tulokset"
+"Click + to replace mixed content" = "Korvaa vaihteleva sisältö napsauttamalla +"
+"Click anywhere on the canvas to leave one." = "Lisää huomautus napsauttamalla mitä tahansa piirtoalueen kohtaa."
+"Click objects to vote; click your badge to take a vote back" = "Äänestä napsauttamalla objekteja; peru ääni napsauttamalla merkkiäsi"
+"Click or drag to merge · {alt} removes" = "Yhdistä napsauttamalla tai vetämällä · {alt} poistaa"
+"Click or drag to remove · {alt} merges" = "Poista napsauttamalla tai vetämällä · {alt} yhdistää"
+"Click to record a key" = "Tallenna näppäin napsauttamalla"
+"Clip content" = "Leikkaa sisältö rajoihin"
+"Clip to shape" = "Leikkaa muotoon"
+"Close" = "Sulje"
+"Close overlay" = "Sulje peittokuva"
+"Close preview" = "Sulje esikatselu"
+"Close tab" = "Sulje välilehti"
+"Close version history" = "Sulje versiohistoria"
+"Close when clicking outside" = "Sulje napsautettaessa ulkopuolelle"
+"Code" = "Koodi"
+"Code or invite link" = "Koodi tai kutsulinkki"
+"Code syntax" = "Koodin syntaksi"
+"Collapse" = "Tiivistä muunnokset"
+"Collapse panel" = "Supista paneeli"
+"Collection" = "Kokoelma"
+"Collections" = "Kokoelmat"
+"Color" = "Väri"
+"Color burn" = "Värivarjostus"
+"Color dodge" = "Värilisävalotus"
+"Color format" = "Värimuoto"
+"Color profile" = "Väriprofiili"
+"Color profile: {name}" = "Väriprofiili: {name}"
+"Color styles" = "Värityylit"
+"Color values in this file are in this color space." = "Tämän tiedoston väriarvot ovat tässä väriavaruudessa."
+"Color variables" = "Värimuuttujat"
+"Colour" = "Väri"
+"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Väri- ja tekstityylejä, vaalean ja tumman tilan muuttujia, painikkeita, syötekenttiä ja kortteja"
+"Column" = "Sarake"
+"Column gap" = "Sarakkeiden väli"
+"Column sizes" = "Sarakkeiden koot"
+"Column span" = "Sarakeulottuvuus"
+"Columns" = "Sarakkeet"
+"Columns {count}" = "Sarakkeita: {count}"
+"Comment" = "Kommentti"
+"Comments" = "Kommentit"
+"Commits" = "Muutokset"
+"Company" = "Yritys"
+"Compare changes" = "Vertaa muutoksia"
+"Compatibility notes" = "Yhteensopivuushuomautukset"
+"Completed" = "Valmis"
+"Component" = "Komponentti"
+"Component name" = "Komponentin nimi"
+"Component property" = "Komponentin ominaisuus"
+"Component set" = "Komponenttijoukko"
+"Component sets" = "Komponenttijoukot"
+"Components" = "Komponentit"
+"Conditional" = "Ehdollinen"
+"Confetti" = "Konfetti"
+"Conflicts" = "Ristiriidat"
+"Connect to code" = "Yhdistä koodiin"
+"Connected" = "Yhdistetty"
+"Connected to code: {from}" = "Yhdistetty koodiin: {from}"
+"Connection lost, reconnecting (attempt {attempt})…" = "Yhteys katkesi, yhdistetään uudelleen (yritys {attempt})…"
+"Connector" = "Yhdistin"
+"Constrain proportions" = "Säilytä mittasuhteet"
+"Constraints" = "Rajoitteet"
+"Content" = "Sisältö"
+"Contents hidden" = "Sisältö kätketty"
+"Contextual alternates" = "Kontekstuaaliset vaihtoehdot"
+"Contrast" = "Kontrasti"
+"Contributors" = "Tekijät"
+"Contributors: {people} · Commits: {commits}" = "Tekijät: {people} · Muutokset: {commits}"
+"Controller" = "Ohjain"
+"Convert to frame" = "Muunna kehykseksi"
+"Convert to section" = "Muunna osioksi"
+"Cool" = "Viileä"
+"Copied as CSS" = "Kopioitu CSS-muodossa"
+"Copied as PNG" = "Kopioitu PNG-muodossa"
+"Copied as SVG" = "Kopioitu SVG-muodossa"
+"Copied as text" = "Kopioitu tekstinä"
+"Copied {value}" = "Kopioitu: {value}"
+"Copy" = "Kopioi"
+"Copy as" = "Kopioi muodossa"
+"Copy as CSS" = "Kopioi CSS-muodossa"
+"Copy as PNG" = "Kopioi PNG-muodossa"
+"Copy as SVG" = "Kopioi SVG-muodossa"
+"Copy code" = "Kopioi koodi"
+"Copy link" = "Kopioi linkki"
+"Copy the {label}" = "Kopioi: {label}"
+"Copy {value}" = "Kopioi: {value}"
+"Corner radius" = "Kulman säde"
+"Corner smoothing" = "Kulman pehmennys"
+"Couldn't download the variables" = "Muuttujia ei voitu ladata"
+"Couldn't reach {server}: showing what this computer remembers." = "Palvelimeen {server} ei saatu yhteyttä. Näytetään tämän tietokoneen muistamat tiedot."
+"Couldn't read {name}." = "Tiedostoa {name} ei voitu lukea."
+"Couldn't save automatically: {error}" = "Automaattinen tallennus epäonnistui: {error}"
+"Couldn't save the file" = "Tiedostoa ei voitu tallentaa"
+"Count" = "Määrä"
+"Create" = "Luo"
+"Create a variable collection first" = "Luo ensin muuttujakokoelma"
+"Create a variable first" = "Luo ensin muuttuja"
+"Create alias" = "Luo alias"
+"Create branch" = "Luo haara"
+"Create collection" = "Luo kokoelma"
+"Create component" = "Luo komponentti"
+"Create component property" = "Luo komponentin ominaisuus"
+"Create components, styles or variables to publish them as a library." = "Luo komponentteja, tyylejä tai muuttujia, jotta voit julkaista ne kirjastona."
+"Create property…" = "Luo ominaisuus…"
+"Create style" = "Luo tyyli"
+"Create style from the selected text" = "Luo tyyli valitusta tekstistä"
+"Created" = "Luotu"
+"Crop" = "Rajaa"
+"Crop marks" = "Leikkausmerkit"
+"Ctrl+arrows" = "Ctrl+arrows"
+"Ctrl+click" = "Ctrl+click"
+"Ctrl+scroll" = "Ctrl+scroll"
+"Current name" = "Nykyinen nimi"
+"Current version" = "Nykyinen versio"
+"Cursor chat" = "Kohdistinkeskustelu"
+"Custom" = "Mukautettu"
+"Custom size" = "Mukautettu koko"
+"Cut" = "Leikkaa"
+"Dark" = "Tumma"
+"Darken" = "Tummenna"
+"Dash" = "Katkoviiva"
+"Dashboard" = "Koontinäkymä"
+"Date created" = "Luontipäivä"
+"Dec" = "jouluk."
+"Decoration" = "Koristelu"
+"Decoration style" = "Koristelun tyyli"
+"Deep select" = "Valitse sisäkkäinen kohde"
+"Default" = "Oletus"
+"Default content" = "Oletussisältö"
+"Default value (the top-left variant)" = "Oletusarvo (vasemman yläkulman variantti)"
+"Delay" = "Viive"
+"Delete" = "Poista"
+"Delete category (its annotations stay)" = "Poista luokka (sen huomautukset säilyvät)"
+"Delete collection" = "Poista kokoelma"
+"Delete group" = "Poista ryhmä"
+"Delete mode" = "Poista tila"
+"Delete page" = "Poista sivu"
+"Delete preset" = "Poista esiasetus"
+"Delete property" = "Poista ominaisuus"
+"Delete the style (layers keep their values)" = "Poista tyyli (tasojen arvot säilyvät)"
+"Delete thread" = "Poista keskustelu"
+"Delete variable" = "Poista muuttuja"
+"Delete “{name}”? This can't be undone." = "Poistetaanko ”{name}”? Tätä ei voi kumota."
+"Density" = "Tiheys"
+"Depth" = "Syvyys"
+"Describe how and when to use this component" = "Kuvaile, miten ja milloin tätä komponenttia käytetään"
+"Describe what changed" = "Kuvaile muutokset"
+"Description" = "Kuvaus"
+"Description (optional)" = "Kuvaus (valinnainen)"
+"Design" = "Suunnittelu"
+"Design panel" = "Suunnittelupaneeli"
+"Design system starter" = "Muotoilujärjestelmän aloituspohja"
+"Desktop" = "Työpöytä"
+"Destination" = "Kohde"
+"Detach alias" = "Irrota alias"
+"Detach instance" = "Irrota ilmentymä"
+"Detach property" = "Irrota ominaisuus"
+"Detach style" = "Irrota tyyli"
+"Detach styles" = "Irrota tyylit"
+"Detach variable" = "Irrota muuttuja"
+"Details" = "Tiedot"
+"Dev Mode" = "Kehittäjätila"
+"Dev resources" = "Kehittäjäresurssit"
+"Development" = "Kehitys"
+"Device" = "Laite"
+"Device at 100%" = "Laite koossa 100 %"
+"Diamond" = "Vinoneliö"
+"Difference" = "Erotus"
+"Dimensions" = "Mitat"
+"Direction" = "Suunta"
+"Disconnect from code" = "Katkaise yhteys koodiin"
+"Dispersion" = "Hajonta"
+"Display name" = "Näyttönimi"
+"Dissolve" = "Häivytys"
+"Distribute and tidy" = "Jaa ja järjestä"
+"Distribute horizontal spacing" = "Jaa vaakavälit tasan"
+"Distribute vertical spacing" = "Jaa pystyvälit tasan"
+"Divider" = "Erotin"
+"Don't Save" = "Älä tallenna"
+"Don't truncate" = "Älä lyhennä"
+"Done" = "Valmis"
+"Done editing" = "Lopeta muokkaus"
+"Dots" = "Pisteet"
+"Dotted" = "Pisteviiva"
+"Down" = "Alas"
+"Drafts" = "Luonnokset"
+"Drag the stroke to add a width point" = "Lisää leveyspiste vetämällä reunaviivaa"
+"Draw" = "Piirrä"
+"Draw a frame" = "Piirrä kehys"
+"Drawing tools" = "Piirtotyökalut"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Pudota .figcraft-, .fig-, .sketch-, .json-, .svg- tai kuvatiedosto."
+"Drop shadow" = "Heittovarjo"
+"Drop to import" = "Tuo pudottamalla"
+"Drop to open" = "Avaa pudottamalla"
+"Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "Kaksoislisensoitu: MIT OR Apache-2.0. ArtCraft-tiimin ja yhteisön tekemä."
+"Duo" = "Kaksivärinen"
+"Duplicate" = "Monista"
+"Duplicate by dragging" = "Monista vetämällä"
+"Duplicate mode" = "Monista tila"
+"Duplicate page" = "Monista sivu"
+"Edit" = "Muokkaa"
+"Edit as an expression" = "Muokkaa lausekkeena"
+"Edit colour" = "Muokkaa väriä"
+"Edit comment" = "Muokkaa kommenttia"
+"Edit dev resource" = "Muokkaa kehittäjäresurssia"
+"Edit link" = "Muokkaa linkkiä"
+"Edit link copied" = "Muokkauslinkki kopioitu"
+"Edit style" = "Muokkaa tyyliä"
+"Edit variable" = "Muokkaa muuttujaa"
+"Edit with the builder" = "Muokkaa rakentimella"
+"Edited {when}" = "Muokattu {when}"
+"Effect settings" = "Tehosteen asetukset"
+"Effect styles" = "Tehostetyylit"
+"Effects" = "Tehosteet"
+"Curved" = "Kaareva"
+"Elbow" = "Kulmikas"
+"Ellipse" = "Ellipsi"
+"Ellipses" = "Ellipsit"
+"Else" = "Muuten"
+"Else if" = "Muuten jos"
+"Embedded profile" = "Upotettu profiili"
+"Empty" = "Tyhjä"
+"End" = "Loppu"
+"End point" = "Loppupiste"
+"End vote" = "Lopeta äänestys"
+"Ends the session; everyone keeps their copy" = "Lopettaa istunnon. Kaikki säilyttävät oman kopionsa."
+"Enter" = "Enter"
+"Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Anna figcraft-server-palvelimen osoite ja näytä sen tarjoamat liitännäiset painamalla Selaa."
+"Enter to save · Esc to cancel" = "Tallenna Enterillä · peruuta Escillä"
+"Eraser" = "Pyyhekumi"
+"Esc" = "Esc"
+"Essential" = "Olennainen"
+"Every conflict has a choice." = "Jokaiselle ristiriidalle on valittu ratkaisu."
+"Every top-level frame already starts a flow" = "Jokainen ylimmän tason kehys aloittaa jo kulun"
+"Exact opacity (4 then 5: 45%)" = "Tarkka peittävyys (4 ja sitten 5: 45 %)"
+"Exclude" = "Jätä pois"
+"Excluded" = "Jätetty pois"
+"Excluded from layout" = "Jätetty pois asettelusta"
+"Excludes" = "Poissulkee"
+"Exclusion" = "Poissulku"
+"Exit focus view (Esc)" = "Poistu kohdistusnäkymästä (Esc)"
+"Expand" = "Laajenna"
+"Export" = "Vie"
+"Export all" = "Vie kaikki"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "Vie kehyksiä ja tasoja PNG-, JPG-, SVG- tai PDF-muodossa"
+"Export page as PNG" = "Vie sivu PNG-muodossa"
+"Export settings" = "Vientiasetukset"
+"Export variables" = "Vie muuttujat"
+"Export {name}" = "Vie {name}"
+"Export {n} layers" = { one = "Vie {n} taso", other = "Vie {n} tasoa" }
+"Exported {file}" = "Viety: {file}"
+"Exported {name}" = "Viety: {name}"
+"Exported {name}; {n} kinds of content were left out" = { one = "Viety {name}; {n} sisältötyyppi jätettiin pois", other = "Viety {name}; {n} sisältötyyppiä jätettiin pois" }
+"Exported {n} files" = { one = "Viety {n} tiedosto", other = "Viety {n} tiedostoa" }
+"Export…" = "Vie…"
+"Expose properties to instances" = "Tuo ominaisuudet ilmentymien käyttöön"
+"Exposure" = "Valotus"
+"Expression" = "Lauseke"
+"Extend collection" = "Laajenna kokoelmaa"
+"Extends \"{name}\": overridden values are marked" = "Laajentaa kokoelmaa ”{name}”: ohitetut arvot on merkitty"
+"Eye" = "Silmä"
+"F" = "F"
+"Fade" = "Häivytys"
+"False" = "Epätosi"
+"Feb" = "helmik."
+"Fetching from the server…" = "Haetaan palvelimelta…"
+"FigCraft couldn't open its window: {error}" = "FigCraft ei voinut avata ikkunaansa: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft ei vielä tue näiden tiedostojen kaikkia ominaisuuksia. Huomautukset kertovat, mitä tuodusta kopiosta jätettiin pois tai muutettiin. Alkuperäinen tiedosto säilyy ennallaan."
+"File" = "Tiedosto"
+"File name" = "Tiedostonimi"
+"File not found" = "Tiedostoa ei löydy"
+"File published" = "Tiedosto julkaistu"
+"Files aren't end-to-end encrypted: the server's operator can read them." = "Tiedostoja ei salata päästä päähän. Palvelimen ylläpitäjä voi lukea ne."
+"Files nobody opens for {n} days are deleted." = { one = "Tiedostot, joita kukaan ei avaa {n} päivään, poistetaan.", other = "Tiedostot, joita kukaan ei avaa {n} päivään, poistetaan." }
+"Fill" = "Täyttö"
+"Fill (fr)" = "Täytä (fr)"
+"Fill container" = "Täytä säilö"
+"Fill window" = "Täytä ikkuna"
+"Fills" = "Täytöt"
+"Fill|sizing" = "Täytä"
+"Filter and sort" = "Suodata ja lajittele"
+"Find" = "Etsi"
+"Find and replace" = "Etsi ja korvaa"
+"Find layers" = "Etsi tasoja"
+"First" = "Ensimmäinen"
+"First commit" = "Ensimmäinen muutos"
+"First on top" = "Ensimmäinen päällimmäisenä"
+"Fit" = "Sovita"
+"Fit device to window" = "Sovita laite ikkunaan"
+"Fit to contents" = "Sovita sisältöön"
+"Fit to window" = "Sovita ikkunaan"
+"Fit width" = "Sovita leveyteen"
+"Fixed" = "Kiinteä"
+"Fixed gap" = "Kiinteä väli"
+"Fixed size" = "Kiinteä koko"
+"Flatten" = "Yhdistä vektorimuodoksi"
+"Flip" = "Peilaa"
+"Flip horizontal" = "Peilaa vaakasuunnassa"
+"Flip text to the other side" = "Siirrä teksti toiselle puolelle"
+"Flip vertical" = "Peilaa pystysuunnassa"
+"Flip width profile" = "Peilaa leveysprofiili"
+"Flow chart" = "Vuokaavio"
+"Flow starting point" = "Kulun aloituspiste"
+"Flow starting points" = "Kulkujen aloituspisteet"
+"Flows" = "Kulut"
+"Focus view" = "Kohdistusnäkymä"
+"Fold autosaves" = "Tiivistä automaattiset tallennukset"
+"Folder: click to collapse" = "Kansio: supista napsauttamalla"
+"Folder: click to expand" = "Kansio: laajenna napsauttamalla"
+"Follow" = "Seuraa"
+"Follow {name}" = "Seuraa käyttäjää {name}"
+"Following" = "Seurataan"
+"Following {name} · {key} to stop" = "Seurataan käyttäjää {name} · lopeta painamalla {key}"
+"Font" = "Fontti"
+"Font not installed" = "Fonttia ei ole asennettu"
+"Font size" = "Fonttikoko"
+"Font style" = "Fonttityyli"
+"Forget on this computer" = "Unohda tällä tietokoneella"
+"Four screens of a trail app with components and a prototype flow" = "Retkeilysovelluksen neljä näkymää, komponentit ja prototyypin kulku"
+"Fractions" = "Murtoluvut"
+"Frame" = "Kehys"
+"Frame selection" = "Kehystä valinta"
+"Frame tools" = "Kehystyökalut"
+"Frames" = "Kehykset"
+"From the library \"{name}\": read-only" = "Kirjastosta ”{name}”: vain luku"
+"From {name}" = "Lähteestä {name}"
+"From {server}" = "Palvelimelta {server}"
+"Frost" = "Huurre"
+"Gap" = "Väli"
+"Gap between columns" = "Sarakkeiden väli"
+"Gap between items" = "Kohteiden väli"
+"Gap between rows" = "Rivien väli"
+"Getting started" = "Aloittaminen"
+"Give the address of a server open to the public, or a server's address with its key (`figcraft-server key` prints it)." = "Anna julkisen palvelimen osoite tai palvelimen osoite avaimineen (`figcraft-server key` tulostaa avaimen)."
+"Glass" = "Lasi"
+"Go to main component" = "Siirry pääkomponenttiin"
+"Go to {name}" = "Siirry kohteeseen {name}"
+"Grab bag" = "Sekalaiset"
+"Gradient" = "Liukuväri"
+"Gray" = "Harmaa"
+"Green" = "Vihreä"
+"Greyscale components and two example screens to sketch a flow with" = "Harmaasävykomponentit ja kaksi esimerkkinäkymää kulun luonnosteluun"
+"Grid" = "Ruudukko"
+"Grid ({size})" = "Ruudukko ({size})"
+"Grid styles" = "Ruudukkotyylit"
+"Grid {size}" = "Ruudukko {size}"
+"Group" = "Ryhmä"
+"Group selection" = "Ryhmittele valinta"
+"Groups" = "Ryhmät"
+"Gutter" = "Palstaväli"
+"Hand tool" = "Käsityökalu"
+"Hanging list" = "Riippuva luettelo"
+"Hanging punctuation" = "Välimerkkien ulonnus"
+"Hard light" = "Kova valo"
+"Heart" = "Sydän"
+"Height" = "Korkeus"
+"Help" = "Ohje"
+"Help and resources" = "Ohje ja resurssit"
+"Help page" = "Ohjesivu"
+"Here: {names}" = "Paikalla: {names}"
+"Hidden" = "Kätketty"
+"Hide contents" = "Kätke sisältö"
+"Hide from publishing" = "Jätä julkaisematta"
+"Hide section contents" = "Kätke osion sisältö"
+"Hide these tips (Getting started in the Help menu shows them again)" = "Kätke nämä vinkit (Ohje-valikon Aloittaminen näyttää ne uudelleen)"
+"Hide when publishing" = "Kätke julkaistaessa"
+"Highlight layers on hover" = "Korosta tasot osoitettaessa"
+"Highlighter" = "Korostuskynä"
+"Highlights" = "Huippuvalot"
+"Hold Alt" = "Pidä Alt painettuna"
+"Hold Alt+Z" = "Pidä Alt+Z painettuna"
+"Hold Ctrl" = "Pidä Ctrl painettuna"
+"Hold Z" = "Pidä Z painettuna"
+"Hold ⌃ or ⌘" = "Pidä ⌃ tai ⌘ painettuna"
+"Hold ⌥" = "Pidä ⌥ painettuna"
+"Hold ⌥Z" = "Pidä ⌥Z painettuna"
+"Home" = "Aloitus"
+"Horizontal" = "Vaakasuunta"
+"Horizontal align" = "Vaakatasaus"
+"Horizontal hex" = "Vaakasuuntainen kuusikulmio"
+"Horizontal padding" = "Vaakasuuntainen sisämarginaali"
+"Horizontal spacing" = "Vaakavälistys"
+"Hosted by {operator}" = "Ylläpitäjä: {operator}"
+"Hover a layer to see its properties" = "Näytä tason ominaisuudet viemällä osoitin sen päälle"
+"Hover other layers to measure the distance" = "Mittaa etäisyys viemällä osoitin muiden tasojen päälle"
+"Hue" = "Sävy"
+"Hug" = "Sovita sisältöön"
+"Hug contents" = "Sovita sisältöön"
+"Icon components on a 24 px grid with keylines and a size preview" = "Kuvakekomponentteja 24 px:n ruudukossa, apulinjat ja koon esikatselu"
+"Icon set starter" = "Kuvakejoukon aloituspohja"
+"If" = "Jos"
+"If it keeps happening, please report it at {link} with this message." = "Jos ongelma jatkuu, ilmoita siitä osoitteessa {link} ja liitä tämä viesti mukaan."
+"If {condition}" = "Jos {condition}"
+"Ignore auto layout (absolute position)" = "Ohita automaattinen asettelu (absoluuttinen sijainti)"
+"Ignore overlapping layers" = "Ohita päällekkäiset tasot"
+"Image" = "Kuva"
+"Images" = "Kuvat"
+"Import" = "Tuo"
+"Import path" = "Tuontipolku"
+"Import plugin from manifest" = "Tuo liitännäinen manifestista"
+"Import plugin from manifest…" = "Tuo liitännäinen manifestista…"
+"Import report" = "Tuontiraportti"
+"Import variables" = "Tuo muuttujat"
+"Imported document" = "Tuotu asiakirja"
+"Imported {name}" = "Tuotu: {name}"
+"Imported {n} new variables, updated {updated}" = { one = "Tuotu {n} uusi muuttuja, päivitetty {updated}", other = "Tuotu {n} uutta muuttujaa, päivitetty {updated}" }
+"Import…" = "Tuo…"
+"In an instance, this comes from the main component" = "Ilmentymässä tämä arvo tulee pääkomponentista"
+"In the browser you can join sessions the desktop app hosts and files on a FigCraft server. A page opened over https reaches other computers only through wss:// links (a server behind TLS)." = "Selaimessa voit liittyä työpöytäsovelluksen isännöimiin istuntoihin ja FigCraft-palvelimen tiedostoihin. https-sivu tavoittaa muut tietokoneet vain wss://-linkeillä (TLS:n takana oleva palvelin)."
+"Include bounding box" = "Sisällytä rajauslaatikko"
+"Include id attribute" = "Sisällytä id-määrite"
+"Included" = "Sisällytetty"
+"Included in layout" = "Sisällytetty asetteluun"
+"Individual corners" = "Kulmat erikseen"
+"Individual strokes" = "Reunaviivat erikseen"
+"Ink" = "Muste"
+"Inner shadow" = "Sisävarjo"
+"Inside" = "Sisäpuolella"
+"Inspect" = "Tarkastele"
+"Inspect the layer under the pointer: size, colours, typography" = "Tarkastele osoittimen alla olevaa tasoa: koko, värit ja typografia"
+"Install" = "Asenna"
+"Install plugin" = "Asenna liitännäinen"
+"Installed" = "Asennettu"
+"Installed {name}" = "Asennettu: {name}"
+"Installing…" = "Asennetaan…"
+"Instance" = "Ilmentymä"
+"Instance properties" = "Ilmentymän ominaisuudet"
+"Instance swap" = "Ilmentymän vaihto"
+"Instance swap (no other component)" = "Ilmentymän vaihto (ei muuta komponenttia)"
+"Instances" = "Ilmentymät"
+"Instant" = "Välitön"
+"Intensity" = "Vahvuus"
+"Interaction" = "Vuorovaikutus"
+"Interactions" = "Vuorovaikutukset"
+"Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Käyttöliittymien suunnittelu ja prototyypit. Ilmainen avoimen lähdekoodin suunnittelutyökalu, joka on toteutettu riippumattomasti alusta alkaen Rustilla. Osa ArtCraft-sovellusperhettä."
+"Intersect" = "Leikkaus"
+"Intersects" = "Leikkaa"
+"Invalid color" = "Virheellinen väri"
+"Invite link" = "Kutsulinkki"
+"Invite link copied" = "Kutsulinkki kopioitu"
+"It asks permission to:" = "Se pyytää oikeutta:"
+"Jan" = "tammik."
+"Join" = "Liity"
+"Join code copied" = "Liittymiskoodi kopioitu"
+"Join code or invite link" = "Liittymiskoodi tai kutsulinkki"
+"Join live session" = "Liity reaaliaikaiseen istuntoon"
+"Join us on Discord" = "Liity yhteisöömme Discordissa"
+"Join with a code" = "Liity koodilla"
+"Joined" = "Liitytty"
+"Joined {file}" = "Liitytty tiedostoon {file}"
+"Joining…" = "Liitytään…"
+"Join|stroke" = "Liitos"
+"Jul" = "heinäk."
+"Jun" = "kesäk."
+"Just now" = "Juuri nyt"
+"Justify" = "Tasaa molemmat reunat"
+"Kanban board" = "Kanban-taulu"
+"Keep a measurement on the canvas for developers" = "Säilytä mittaus piirtoalueella kehittäjille"
+"Keep appearance" = "Säilytä ulkoasu"
+"Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Säilytä ulkoasu muuntaa kaikki väriarvot profiiliin {profile}, jotta värit näyttävät samoilta. Säilytä arvot jättää lukuarvot ennalleen, jolloin värit muuttuvat."
+"Keep tool selected after use" = "Pidä työkalu valittuna käytön jälkeen"
+"Keep values" = "Säilytä arvot"
+"Key/Gamepad" = "Näppäin/peliohjain"
+"Key/Gamepad {key}" = "Näppäin/peliohjain {key}"
+"Keyboard shortcuts" = "Pikanäppäimet"
+"Kits" = "Paketit"
+"Landing page" = "Laskeutumissivu"
+"Language" = "Kieli"
+"Lasso" = "Lasso"
+"Last" = "Viimeinen"
+"Last change: {note}" = "Viimeisin muutos: {note}"
+"Last commit" = "Viimeisin muutos"
+"Last modified" = "Viimeksi muokattu"
+"Last on top" = "Viimeinen päällimmäisenä"
+"Layer blur" = "Tason sumennus"
+"Layer name" = "Tason nimi"
+"Layers" = "Tasot"
+"Layers in an instance take their position from the main component" = "Ilmentymän tasot saavat sijaintinsa pääkomponentista"
+"Layout" = "Asettelu"
+"Layout grid" = "Asetteluruudukko"
+"Layout grid settings" = "Asetteluruudukon asetukset"
+"Layout grids" = "Asetteluruudukot"
+"Leave session" = "Poistu istunnosta"
+"Leaves" = "Lehdet"
+"Left" = "Vasen"
+"Left & right" = "Vasen ja oikea"
+"Left side" = "Vasen puoli"
+"Left side width" = "Vasemman puolen leveys"
+"Letter case" = "Kirjainkoko"
+"Letter spacing" = "Merkkiväli"
+"Libraries" = "Kirjastot"
+"Libraries in this file" = "Tämän tiedoston kirjastot"
+"Library updates available" = "Kirjastopäivityksiä saatavilla"
+"Library: click to collapse" = "Kirjasto: supista napsauttamalla"
+"Library: click to expand" = "Kirjasto: laajenna napsauttamalla"
+"Library: its variables are read-only here; edit them in the library file and publish it" = "Kirjasto: sen muuttujat ovat tässä vain luettavissa. Muokkaa niitä kirjastotiedostossa ja julkaise se."
+"Light" = "Vaalea"
+"Lighten" = "Vaalenna"
+"Light|glass" = "Valo"
+"Line" = "Viiva"
+"Line arrow" = "Viivanuoli"
+"Line delta" = "Rivimuutos"
+"Line height" = "Rivikorkeus"
+"Linear" = "Lineaarinen"
+"Lines" = "Viivat"
+"Lines +/−" = "Rivit +/−"
+"Lines added" = "Lisätyt rivit"
+"Lines deleted" = "Poistetut rivit"
+"Link" = "Linkki"
+"Link copied" = "Linkki kopioitu"
+"Link docs, code or tickets for developers." = "Linkitä dokumentaatiota, koodia tai tehtäviä kehittäjille."
+"Link frames on the Prototype tab, then present the flow" = "Linkitä kehykset Prototyyppi-välilehdellä ja esitä sitten kulku"
+"Link this component to its code component: instances then show your real snippet with their values." = "Yhdistä tämä komponentti sen koodikomponenttiin. Ilmentymät näyttävät sitten todellisen koodikatkelmasi omilla arvoillaan."
+"List spacing" = "Luettelon välistys"
+"List style" = "Luettelotyyli"
+"Live session" = "Reaaliaikainen istunto"
+"Live · {people}" = "Reaaliaikainen · {people}"
+"Local components" = "Paikalliset komponentit"
+"Local network" = "Paikallisverkko"
+"Local styles" = "Paikalliset tyylit"
+"Local variables" = "Paikalliset muuttujat"
+"Lock/Unlock" = "Lukitse/avaa lukitus"
+"Locked" = "Lukittu"
+"Lowercase" = "Pienet kirjaimet"
+"Luminance" = "Luminanssi"
+"Luminosity" = "Valoisuus"
+"Main" = "Päähaara"
+"Main component deleted" = "Pääkomponentti poistettu"
+"Main menu" = "Päävalikko"
+"Make a component" = "Luo komponentti"
+"Make slot" = "Luo sisältöpaikka"
+"Mar" = "maalisk."
+"Margin" = "Marginaali"
+"Mark all as read" = "Merkitse kaikki luetuiksi"
+"Mark as resolved" = "Merkitse ratkaistuksi"
+"Mark as unread" = "Merkitse lukemattomaksi"
+"Mark as unresolved" = "Merkitse ratkaisemattomaksi"
+"Marker" = "Tussi"
+"Mask" = "Maski"
+"Mass · Stiffness · Damping" = "Massa · jäykkyys · vaimennus"
+"Match (empty: the whole name)" = "Etsittävä (tyhjä: koko nimi)"
+"Max H" = "Enimmäiskorkeus"
+"Max W" = "Enimmäisleveys"
+"Max lines" = "Rivien enimmäismäärä"
+"Maximize" = "Suurenna"
+"May" = "toukok."
+"Measure to the selection" = "Mittaa valintaan"
+"Measurements" = "Mittaukset"
+"Merge into main" = "Yhdistä päähaaraan"
+"Merge regions" = "Yhdistä alueet"
+"Merge the branch into the main file (one undo step) and archive it" = "Yhdistä haara päätiedostoon (yksi kumottava toiminto) ja arkistoi se"
+"Merged" = "Yhdistetty"
+"Merged PRs" = "Yhdistetyt PR:t"
+"Min H" = "Vähimmäiskorkeus"
+"Min W" = "Vähimmäisleveys"
+"Minimize" = "Pienennä"
+"Minutes" = "Minuutit"
+"Mirror angle" = "Peilaa kulma"
+"Mirror angle and length" = "Peilaa kulma ja pituus"
+"Mirroring" = "Peilaus"
+"Missing" = "Puuttuu"
+"Missing fonts" = "Puuttuvat fontit"
+"Missing layer" = "Puuttuva taso"
+"Missing style" = "Puuttuva tyyli"
+"Missing variable" = "Puuttuva muuttuja"
+"Miter" = "Jiiri"
+"Miter angle" = "Jiirikulma"
+"Mixed" = "Useita arvoja"
+"Mixed fonts" = "Useita fontteja"
+"Mixed interactions: click + to replace them" = "Vaihtelevia vuorovaikutuksia: korvaa napsauttamalla +"
+"Mobile app" = "Mobiilisovellus"
+"Mode" = "Tila"
+"Model" = "Malli"
+"Models" = "Mallit"
+"Mono" = "Yksivärinen"
+"More" = "Lisää"
+"More instance actions" = "Lisää ilmentymän toimintoja"
+"Mouse down" = "Hiiren painallus"
+"Mouse enter" = "Osoitin saapuu"
+"Mouse leave" = "Osoitin poistuu"
+"Mouse up" = "Hiiren vapautus"
+"Move" = "Siirrä"
+"Move along the toolbar or the layer rows" = "Siirry työkalurivillä tai tasoriveillä"
+"Move column left" = "Siirrä sarake vasemmalle"
+"Move column right" = "Siirrä sarake oikealle"
+"Move down" = "Siirrä alas"
+"Move in" = "Siirry sisään"
+"Move out" = "Siirry ulos"
+"Move tools" = "Siirtotyökalut"
+"Move up" = "Siirrä ylös"
+"Moved to {name}" = "Siirretty kohteeseen {name}"
+"Multi" = "Monivärinen"
+"Multiply" = "Kerro"
+"Muted" = "Hillitty"
+"Name" = "Nimi"
+"Name (A–Z)" = "Nimi (A–Z)"
+"Named instance" = "Nimetty ilmentymä"
+"Navigate to" = "Siirry kohteeseen"
+"Nested instance" = "Sisäkkäinen ilmentymä"
+"New board" = "Uusi taulu"
+"New design file" = "Uusi suunnittelutiedosto"
+"Newest first" = "Uusimmat ensin"
+"Next frame" = "Seuraava kehys"
+"Next or previous control in the focused region" = "Seuraava tai edellinen säädin kohdistetulla alueella"
+"Next ready for dev" = "Seuraava kehitysvalmis"
+"Next size option" = "Seuraava kokovaihtoehto"
+"No assets: no export settings, icons or images. Add export settings in the Design tab." = "Ei resursseja: ei vientiasetuksia, kuvakkeita tai kuvia. Lisää vientiasetuksia Suunnittelu-välilehdellä."
+"No boolean variables fit here." = "Tähän ei sovi totuusarvomuuttujia."
+"No boolean variables yet. Create them in Local variables." = "Ei vielä totuusarvomuuttujia. Luo niitä Paikalliset muuttujat -näkymässä."
+"No branches. A branch is a copy of the file to try changes in, then review and merge." = "Ei haaroja. Haara on tiedoston kopio, jossa voi kokeilla muutoksia ja sitten tarkistaa ja yhdistää ne."
+"No category" = "Ei luokkaa"
+"No changes" = "Ei muutoksia"
+"No color styles" = "Ei värityylejä"
+"No colour variables fit here." = "Tähän ei sovi värimuuttujia."
+"No colour variables yet. Create them in Local variables." = "Ei vielä värimuuttujia. Luo niitä Paikalliset muuttujat -näkymässä."
+"No comments yet" = "Ei vielä kommentteja"
+"No compatibility warnings reported" = "Yhteensopivuusvaroituksia ei ilmoitettu"
+"No components yet. Select layers and press {keys}." = "Ei vielä komponentteja. Valitse tasoja ja paina {keys}."
+"No conflicts." = "Ei ristiriitoja."
+"No contributor data was built into this copy." = "Tähän versioon ei ole sisällytetty tekijätietoja."
+"No device" = "Ei laitetta"
+"No files or templates match your search" = "Hakua vastaavia tiedostoja tai malleja ei löydy"
+"No fonts match" = "Vastaavia fontteja ei löydy"
+"No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Liittymiskoodia ei ole (palvelin on liittymiskoodeja vanhempi tai tätä osoitetta ei voi sisällyttää koodiin). Jaa linkki sen sijaan."
+"No layer changes to show." = "Ei näytettäviä tasomuutoksia."
+"No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "Ei vielä kirjastoja. Lisää kirjastona julkaistu .figcraft-tiedosto tai liitä tiimikirjaston linkki."
+"No list" = "Ei luetteloa"
+"No matching comments" = "Vastaavia kommentteja ei löydy"
+"No matching components" = "Vastaavia komponentteja ei löydy"
+"No matching layers" = "Vastaavia tasoja ei löydy"
+"No matching styles" = "Vastaavia tyylejä ei löydy"
+"No matching variables" = "Vastaavia muuttujia ei löydy"
+"No mirroring" = "Ei peilausta"
+"No model credits were built into this copy." = "Tähän versioon ei ole sisällytetty mallien tekijätietoja."
+"No number variables fit here." = "Tähän ei sovi lukumuuttujia."
+"No number variables yet. Create them in Local variables." = "Ei vielä lukumuuttujia. Luo niitä Paikalliset muuttujat -näkymässä."
+"No other pages" = "Ei muita sivuja"
+"No paints" = "Ei täyttöjä"
+"No plugins on {server}." = "Palvelimella {server} ei ole liitännäisiä."
+"No plugins yet. Import a development plugin from its figcraft-plugin.json." = "Ei vielä liitännäisiä. Tuo kehitysliitännäinen sen figcraft-plugin.json-tiedostosta."
+"No preferred components" = "Ei ensisijaisia komponentteja"
+"No preset" = "Ei esiasetusta"
+"No saved versions yet. Save a version to mark a point in your work you can come back to." = "Ei vielä tallennettuja versioita. Tallenna versio, jotta voit palata tähän työvaiheeseen myöhemmin."
+"No scrolling" = "Ei vieritystä"
+"No shortcuts match" = "Vastaavia pikanäppäimiä ei löydy"
+"No status" = "Ei tilaa"
+"No string variables fit here." = "Tähän ei sovi merkkijonomuuttujia."
+"No string variables yet. Create them in Local variables." = "Ei vielä merkkijonomuuttujia. Luo niitä Paikalliset muuttujat -näkymässä."
+"No styles yet." = "Ei vielä tyylejä."
+"No styles yet. Click + to create one from the selection." = "Ei vielä tyylejä. Luo tyyli valinnasta napsauttamalla +."
+"No templates match your search" = "Hakua vastaavia malleja ei löydy"
+"No text styles yet. Click + to create one from the selected text." = "Ei vielä tekstityylejä. Luo tyyli valitusta tekstistä napsauttamalla +."
+"No variables fit here." = "Tähän ei sovi muuttujia."
+"No variables yet. Create them in Local variables." = "Ei vielä muuttujia. Luo niitä Paikalliset muuttujat -näkymässä."
+"No votes yet" = "Ei vielä ääniä"
+"Nobody else is here yet" = "Kukaan muu ei ole vielä paikalla"
+"Noise" = "Kohina"
+"None" = "Ei mitään"
+"None." = "Ei mitään."
+"Normal" = "Normaali"
+"Not bound" = "Ei sidottu"
+"Not in a live session" = "Ei reaaliaikaisessa istunnossa"
+"Not in this font" = "Ei tässä fontissa"
+"Not properties, kept as written: {names}" = "Eivät ole ominaisuuksia, säilytetään sellaisinaan: {names}"
+"Not read yet" = "Ei vielä luettu"
+"Not shared" = "Ei jaettu"
+"Note {n}" = "Huomautus {n}"
+"Nothing changed since this was marked ready for dev." = "Mikään ei ole muuttunut kehitysvalmiiksi merkitsemisen jälkeen."
+"Nothing here yet. Set a frame's status to list it." = "Ei vielä sisältöä. Lisää kehys luetteloon asettamalla sen tila."
+"Nothing online yet. Use Share on a file to put it online and it is listed here." = "Ei vielä verkkotiedostoja. Julkaise tiedosto verkkoon Jaa-toiminnolla, niin se näkyy tässä."
+"Nothing to export" = "Ei vietävää"
+"Nov" = "marrask."
+"Now" = "Nyt"
+"Nudge (Shift: big nudge)" = "Siirrä askel (Shift: suuri askel)"
+"Nudge amount" = "Siirtoaskeleen koko"
+"Number" = "Luku"
+"Number ↑" = "Luku ↑"
+"Number ↓" = "Luku ↓"
+"Numbered list" = "Numeroitu luettelo"
+"Object" = "Objekti"
+"Oct" = "lokak."
+"Off" = "Ei käytössä"
+"Offered first when filling the slot (any content is allowed)" = "Ehdotetaan ensin sisältöpaikkaa täytettäessä (kaikki sisältö sallitaan)"
+"Offered first when swapping the instance (any component is allowed)" = "Ehdotetaan ensin ilmentymää vaihdettaessa (kaikki komponentit sallitaan)"
+"Offset" = "Siirtymä"
+"Oldest first" = "Vanhimmat ensin"
+"On click" = "Napsautettaessa"
+"On drag" = "Vedettäessä"
+"On this page" = "Tällä sivulla"
+"One announcement in five common sizes: square, portrait, story, link and banner" = "Yksi ilmoitus viidessä tavallisessa koossa: neliö, pysty, tarina, linkki ja banneri"
+"Online" = "Verkossa"
+"Online files" = "Verkkotiedostot"
+"Online sharing is off: files are shared on the local network only." = "Verkkojakaminen on pois käytöstä. Tiedostoja jaetaan vain lähiverkossa."
+"Only the first changed layers are listed." = "Vain ensimmäiset muuttuneet tasot näytetään."
+"Only the first {n} changed layers are listed." = "Vain ensimmäiset {n} muuttunutta tasoa näytetään."
+"Only your threads" = "Vain omat keskustelut"
+"Opacity" = "Peittävyys"
+"Opacity & blend" = "Peittävyys ja sekoitus"
+"Opacity 10%…90%, 0: 100%" = "Peittävyys 10 %…90 %, 0: 100 %"
+"Open" = "Avaa"
+"Open .figcraft, .svg or images" = "Avaa .figcraft-, .svg- tai kuvatiedostoja"
+"Open branch" = "Avaa haara"
+"Open file" = "Avaa tiedosto"
+"Open files" = "Avaa tiedostoja"
+"Open presentations" = "Avoimet esitykset"
+"Open in focus view" = "Avaa kohdistusnäkymässä"
+"Open in new window" = "Avaa uudessa ikkunassa"
+"Open invite links in FigCraft" = "Avaa kutsulinkit FigCraftissa"
+"Open link" = "Avaa linkki"
+"Open link {url}" = "Avaa linkki {url}"
+"Open overlay" = "Avaa peittokuva"
+"Open prototype preview" = "Avaa prototyypin esikatselu"
+"Open variables ({count})" = "Avaa muuttujat ({count})"
+"Opened as a new document" = "Avattu uutena asiakirjana"
+"Opened “{name}” in a new tab" = "”{name}” avattu uudessa välilehdessä"
+"Opening the file…" = "Avataan tiedostoa…"
+"Opening {n} files as new files" = { one = "Avataan uutena tiedostona", other = "Avataan uusia tiedostoja: {n}" }
+"Open|comments" = "Avoin"
+"Options" = "Asetukset"
+"Orange" = "Oranssi"
+"Order" = "Järjestys"
+"Other" = "Muu"
+"Other apps may not open every .fig file exported here." = "Muut sovellukset eivät välttämättä avaa kaikkia tässä vietyjä .fig-tiedostoja."
+"Others lose access and keep their copy; the file stays on the server for you" = "Muiden käyttöoikeus päättyy, ja he säilyttävät kopionsa. Tiedosto jää palvelimelle käyttöösi."
+"Others type this under Share ▸ Join with a code" = "Muut kirjoittavat tämän kohtaan Jaa ▸ Liity koodilla"
+"Outline stroke" = "Muunna reunaviiva poluksi"
+"Outline text" = "Muunna teksti poluiksi"
+"Outlines" = "Ääriviivat"
+"Outside" = "Ulkopuolella"
+"Overflow" = "Ylivuoto"
+"Overlay" = "Peittokuva"
+"Overlay position" = "Peittokuvan sijainti"
+"Overridden here (the collection it extends has another value)" = "Ohitettu tässä (laajennetussa kokoelmassa on toinen arvo)"
+"Overrides" = "Ohitukset"
+"Owner token" = "Omistajan tunniste"
+"Owner token copied" = "Omistajan tunniste kopioitu"
+"PDF print options" = "PDF-tulostusasetukset"
+"PDF print settings" = "PDF-tulostusasetukset"
+"Padding" = "Sisämarginaali"
+"Page" = "Sivu"
+"Page deleted" = "Sivu poistettu"
+"Pages" = "Sivut"
+"Pages added to the document" = "Sivut lisätty asiakirjaan"
+"Pages: {pages}" = "Sivut: {pages}"
+"Paint bucket" = "Maalipurkki"
+"Pan the canvas" = "Siirrä piirtoaluetta"
+"Pan with nothing selected (Shift: farther)" = "Siirrä näkymää ilman valintaa (Shift: pidemmälle)"
+"Panels" = "Paneelit"
+"Paper" = "Paperi"
+"Paragraph indent" = "Kappaleen sisennys"
+"Paragraph indent applies to left-aligned text" = "Kappaleen sisennys koskee vasemmalle tasattua tekstiä"
+"Paragraph spacing" = "Kappaleväli"
+"Pass through" = "Läpivienti"
+"Paste a link (https://…)" = "Liitä linkki (https://…)"
+"Paste a team library link (a view link)" = "Liitä tiimikirjaston linkki (katselulinkki)"
+"Paste here" = "Liitä tähän"
+"Paste to replace" = "Liitä korvaten"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Suunnittelutasot liitetty; {n} sisältötyyppi jätettiin pois", other = "Suunnittelutasot liitetty; {n} sisältötyyppiä jätettiin pois" }
+"Pattern" = "Kuvio"
+"Pattern alignment" = "Kuvion tasaus"
+"Pattern scale" = "Kuvion skaalaus"
+"Pattern source" = "Kuvion lähde"
+"Pause" = "Keskeytä"
+"Pen" = "Kynä"
+"Pencil" = "Lyijykynä"
+"People in this file" = "Tämän tiedoston käyttäjät"
+"People join from anywhere with a code. The file is kept on {server} while you share it." = "Käyttäjät voivat liittyä koodilla mistä tahansa. Tiedosto säilytetään palvelimella {server} jakamisen ajan."
+"People on your network join with a code. Nothing goes through a server." = "Lähiverkkosi käyttäjät liittyvät koodilla. Mitään ei kulje palvelimen kautta."
+"Phone" = "Puhelin"
+"Pick color" = "Poimi väri"
+"Pick color (I)" = "Poimi väri (I)"
+"Pick one font family first" = "Valitse ensin yksi fonttiperhe"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "Valitse Kehys-työkalu ja vedä piirtoalueella tai valitse laitteen koko"
+"Pin a property" = "Kiinnitä ominaisuus"
+"Pinch" = "Nipistys"
+"Pink" = "Vaaleanpunainen"
+"Pixel grid" = "Pikseliruudukko"
+"Pixel preview 1x" = "Pikseliesikatselu 1x"
+"Pixel preview 2x" = "Pikseliesikatselu 2x"
+"Place a shape or frame (its tool chosen)" = "Sijoita muoto tai kehys (sen työkalu valittuna)"
+"Place automatically" = "Sijoita automaattisesti"
+"Place image" = "Sijoita kuva"
+"Placed on the current page" = "Sijoitettu nykyiselle sivulle"
+"Playground" = "Kokeilualue"
+"Plugin" = "Liitännäinen"
+"Plugins" = "Liitännäiset"
+"Plugins & widgets" = "Liitännäiset ja pienoisohjelmat"
+"Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Liitännäiset toimivat FigCraftin eristetyssä ympäristössä ilman tiedostoja, verkkoa tai kelloa. Asenna vain luottamiasi liitännäisiä."
+"Plus darker" = "Tummempi summa"
+"Plus lighter" = "Vaaleampi summa"
+"Plus one" = "Plus yksi"
+"Point" = "Piste"
+"Points" = "Pisteet"
+"Polygon" = "Monikulmio"
+"Polygons" = "Monikulmiot"
+"Port" = "Portti"
+"Position" = "Sijainti"
+"Post" = "Lähetä"
+"Preferences" = "Asetukset"
+"Preferred" = "Ensisijainen"
+"Present" = "Esitä"
+"Present or preview" = "Esitä tai esikatsele"
+"Present this flow" = "Esitä tämä kulku"
+"Presentation" = "Esitys"
+"Presentation slides" = "Esitysdiat"
+"Presenting: comments" = "Esitys: kommentit"
+"Presenting: cycle the size options" = "Esitys: kierrä kokovaihtoehtoja"
+"Presenting: full screen" = "Esitys: koko näyttö"
+"Presenting: next frame" = "Esitys: seuraava kehys"
+"Presenting: previous frame" = "Esitys: edellinen kehys"
+"Presenting: restart" = "Esitys: aloita uudelleen"
+"Preserve scroll position" = "Säilytä vierityksen sijainti"
+"Presets" = "Esiasetukset"
+"Press a key…" = "Paina näppäintä…"
+"Preview" = "Esikatselu"
+"Preview this flow" = "Esikatsele tätä kulkua"
+"Preview this frame" = "Esikatsele tätä kehystä"
+"Previous frame" = "Edellinen kehys"
+"Previous ready for dev" = "Edellinen kehitysvalmis"
+"Progressive" = "Asteittainen"
+"Properties" = "Ominaisuudet"
+"Prototype" = "Prototyyppi"
+"Prototype preview" = "Prototyypin esikatselu"
+"Prototype settings" = "Prototyypin asetukset"
+"Publish" = "Julkaise"
+"Publish changes" = "Julkaise muutokset"
+"Publish to another server…" = "Julkaise toiselle palvelimelle…"
+"Publish to server" = "Julkaise palvelimelle"
+"Published version {v}" = "Julkaistu versio {v}"
+"Published version {v} to the server" = "Versio {v} julkaistu palvelimelle"
+"Published version {v}: save the file so other files can use it" = "Versio {v} julkaistu: tallenna tiedosto, jotta muut tiedostot voivat käyttää sitä"
+"Published · {people}" = "Julkaistu · {people}"
+"Publishing to a server needs the desktop app; in the browser you can join a server's files" = "Palvelimelle julkaiseminen vaatii työpöytäsovelluksen. Selaimessa voit liittyä palvelimen tiedostoihin."
+"Publishing with the server's key." = "Julkaistaan palvelimen avaimella."
+"Publishing…" = "Julkaistaan…"
+"Push" = "Työntö"
+"Push changes to main component" = "Siirrä muutokset pääkomponenttiin"
+"Put text on path" = "Sijoita teksti polulle"
+"Question" = "Kysymys"
+"R" = "R"
+"Radial" = "Säteittäinen"
+"Radius" = "Säde"
+"Ratio" = "Suhde"
+"Reading the library…" = "Luetaan kirjastoa…"
+"Ready for dev" = "Kehitysvalmis"
+"Real name" = "Oikea nimi"
+"Recent" = "Viimeisimmät"
+"Recent files" = "Viimeksi avatut tiedostot"
+"Recents" = "Viimeisimmät"
+"Recovered {n} unsaved files after the app quit unexpectedly: save them to keep them" = { one = "Tallentamaton tiedosto palautettiin sovelluksen sulkeuduttua odottamatta. Tallenna se säilyttääksesi sen.", other = "Palautettu {n} tallentamatonta tiedostoa sovelluksen sulkeuduttua odottamatta. Tallenna ne säilyttääksesi ne." }
+"Rectangle" = "Suorakulmio"
+"Rectangles" = "Suorakulmiot"
+"Red" = "Punainen"
+"Reduce motion" = "Vähennä liikettä"
+"Refraction" = "Taittuminen"
+"Regular expression" = "Säännöllinen lauseke"
+"Relative to" = "Suhteessa"
+"Remove" = "Poista"
+"Remove all" = "Poista kaikki"
+"Remove annotation" = "Poista huomautus"
+"Remove auto layout" = "Poista automaattinen asettelu"
+"Remove column" = "Poista sarake"
+"Remove dev resource" = "Poista kehittäjäresurssi"
+"Remove export setting" = "Poista vientiasetus"
+"Remove from recents" = "Poista viimeisimmistä"
+"Remove from server" = "Poista palvelimelta"
+"Remove from server…" = "Poista palvelimelta…"
+"Remove guide" = "Poista apuviiva"
+"Remove interaction" = "Poista vuorovaikutus"
+"Remove library from this file" = "Poista kirjasto tästä tiedostosta"
+"Remove measurement" = "Poista mittaus"
+"Remove min and max" = "Poista vähimmäis- ja enimmäisrajat"
+"Remove min and max height" = "Poista korkeuden vähimmäis- ja enimmäisrajat"
+"Remove min and max width" = "Poista leveyden vähimmäis- ja enimmäisrajat"
+"Remove regions" = "Poista alueet"
+"Remove row" = "Poista rivi"
+"Remove slot" = "Poista sisältöpaikka"
+"Remove starting point" = "Poista aloituspiste"
+"Remove stop" = "Poista liukuvärin piste"
+"Remove text from path" = "Poista teksti polulta"
+"Remove the else and its actions" = "Poista muuten-haara ja sen toiminnot"
+"Remove this condition and its actions" = "Poista tämä ehto ja sen toiminnot"
+"Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "Poistetaanko tämä tiedosto palvelimelta? Sitä ei voi enää jakaa tai avata sieltä. Oma kopiosi pysyy auki tässä."
+"Remove {name} from session" = "Poista {name} istunnosta"
+"Remove {name} from {server}?" = "Poistetaanko {name} palvelimelta {server}?"
+"Removed" = "Poistettu"
+"Removed from the server" = "Poistettu palvelimelta"
+"Removed since it was marked" = "Poistettu merkitsemisen jälkeen"
+"Rename" = "Nimeä uudelleen"
+"Rename duplicated layers" = "Nimeä monistetut tasot uudelleen"
+"Rename folder" = "Nimeä kansio uudelleen"
+"Rename group" = "Nimeä ryhmä uudelleen"
+"Rename layers" = "Nimeä tasot uudelleen"
+"Rename mode" = "Nimeä tila uudelleen"
+"Rename on the server" = "Nimeä uudelleen palvelimella"
+"Rename on the server…" = "Nimeä uudelleen palvelimella…"
+"Rename page" = "Nimeä sivu uudelleen"
+"Rename to" = "Uusi nimi"
+"Replace all" = "Korvaa kaikki"
+"Replace mixed export settings" = "Korvaa vaihtelevat vientiasetukset"
+"Replace with" = "Korvaa kohteella"
+"Replace with a new interaction" = "Korvaa uudella vuorovaikutuksella"
+"Reply" = "Vastaa"
+"Report" = "Ilmoita"
+"Report this file…" = "Ilmoita tästä tiedostosta…"
+"Reset" = "Palauta"
+"Reset adjustments" = "Palauta säädöt"
+"Reset all changes" = "Palauta kaikki muutokset"
+"Reset all overrides on this layer" = "Palauta kaikki tämän tason ohitukset"
+"Reset overrides" = "Palauta ohitukset"
+"Reset slot" = "Palauta sisältöpaikka"
+"Reset this override" = "Palauta tämä ohitus"
+"Reset to style" = "Palauta tyylin arvo"
+"Reset to the inherited value" = "Palauta peritty arvo"
+"Resize by the nudge amount" = "Muuta kokoa siirtoaskeleen verran"
+"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Sovita kehysten koko laitteen näyttöön (tai ikkunaan ilman laitetta). Rajoitteet ja automaattinen asettelu mukautuvat."
+"Resize to fit" = "Sovita koko"
+"Resizing" = "Koon muuttaminen"
+"Resolve" = "Ratkaise"
+"Resolve change" = "Ratkaise muutos"
+"Resolved" = "Ratkaistu"
+"Resources" = "Resurssit"
+"Responsive" = "Mukautuva"
+"Restart" = "Aloita uudelleen"
+"Restore" = "Palauta"
+"Restore main component" = "Palauta pääkomponentti"
+"Restore this version" = "Palauta tämä versio"
+"Restored “{name}”" = "”{name}” palautettu"
+"Retrospective" = "Retrospektiivi"
+"Results" = "Tulokset"
+"Resume" = "Jatka"
+"Reverse the order" = "Käännä järjestys"
+"Reversed triangle" = "Käänteinen kolmio"
+"Review and merge" = "Tarkista ja yhdistä"
+"Ribbon" = "Valintanauha"
+"Right" = "Oikea"
+"Right side" = "Oikea puoli"
+"Right side width" = "Oikean puolen leveys"
+"Rotate 90°" = "Kierrä 90°"
+"Rotate 90° right" = "Kierrä 90° oikealle"
+"Rotate to landscape" = "Käännä vaakasuuntaan"
+"Rotate to portrait" = "Käännä pystysuuntaan"
+"Rotation" = "Kierto"
+"Rotation jitter" = "Kierron vaihtelu"
+"Round" = "Pyöreä"
+"Rounded" = "Pyöristetty"
+"Rounded rectangle" = "Pyöristetty suorakulmio"
+"Row" = "Rivi"
+"Row gap" = "Rivien väli"
+"Row sizes" = "Rivien koot"
+"Row span" = "Riviulottuvuus"
+"Rows" = "Rivit"
+"Rows {count}" = "Rivejä: {count}"
+"Rulers" = "Viivaimet"
+"Run" = "Suorita"
+"Run {label}" = "Suorita {label}"
+"SHA-256: {sha}…" = "SHA-256: {sha}…"
+"Same as layer" = "Sama kuin tasolla"
+"Saturation" = "Kylläisyys"
+"Save" = "Tallenna"
+"Save as" = "Tallenna nimellä"
+"Save as preset…" = "Tallenna esiasetuksena…"
+"Save file" = "Tallenna tiedosto"
+"Save files automatically" = "Tallenna tiedostot automaattisesti"
+"Save version  {key}" = "Tallenna versio  {key}"
+"Saved" = "Tallennettu"
+"Saved {name}" = "Tallennettu: {name}"
+"Say something" = "Kirjoita viesti"
+"Scale" = "Skaalaus"
+"Scatter" = "Hajonta"
+"Scoping: where pickers offer it" = "Käyttöalue: missä valitsimet tarjoavat tätä"
+"Screen" = "Rasteri"
+"Scroll behavior" = "Vierityksen toiminta"
+"Scroll to" = "Vieritä kohteeseen"
+"Scroll to layer" = "Vieritä tasoon"
+"Scroll with parent" = "Vieritä emotason mukana"
+"Search" = "Etsi"
+"Search actions, layers and tools" = "Etsi toimintoja, tasoja ja työkaluja"
+"Search assets" = "Etsi resursseja"
+"Search comments" = "Etsi kommentteja"
+"Search files and templates" = "Etsi tiedostoja ja malleja"
+"Search fonts" = "Etsi fontteja"
+"Search layers" = "Etsi tasoja"
+"Search plugins" = "Etsi liitännäisiä"
+"Search results" = "Hakutulokset"
+"Search shortcuts" = "Etsi pikanäppäimiä"
+"Search templates" = "Etsi malleja"
+"Section" = "Osio"
+"Section color" = "Osion väri"
+"Sections" = "Osiot"
+"See all templates" = "Näytä kaikki mallit"
+"Select a frame and add a starting point to present it as a flow." = "Valitse kehys ja lisää aloituspiste, jotta voit esittää sen kulkuna."
+"Select a frame to preview it" = "Valitse kehys esikatseltavaksi"
+"Select a layer to see its properties and code" = "Valitse taso, jotta näet sen ominaisuudet ja koodin"
+"Select all" = "Valitse kaikki"
+"Select all with same" = "Valitse kaikki samalla ominaisuudella"
+"Select layer" = "Valitse taso"
+"Select layers and they space themselves as their content changes" = "Valitse tasoja, niin niiden välit mukautuvat sisällön muuttuessa"
+"Select layers to apply the style to" = "Valitse tasot, joihin tyyliä käytetään"
+"Select layers with this color" = "Valitse tämänväriset tasot"
+"Select overlapping shapes" = "Valitse päällekkäiset muodot"
+"Select points to edit their position, radius and mirroring" = "Valitse pisteitä muokataksesi niiden sijaintia, sädettä ja peilausta"
+"Select slot" = "Valitse sisältöpaikka"
+"Selection" = "Valinta"
+"Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Valintalaatikko, {w} × {h} kohdassa {x}, {y}: nuolet siirtävät, Shift+nuolet tai {cmd}+nuolet muuttavat kokoa, Enter valitsee, Escape peruuttaa"
+"Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Valintalaatikko: nuolet siirtävät, Shift+nuolet tai {cmd}+nuolet muuttavat kokoa, Enter valitsee, Escape peruuttaa"
+"Selection colors" = "Valinnan värit"
+"Send backward" = "Vie taaksepäin"
+"Send report" = "Lähetä ilmoitus"
+"Send to back" = "Vie takimmaiseksi"
+"Sep" = "syysk."
+"Server address" = "Palvelimen osoite"
+"Server address (ws://host:47900/)" = "Palvelimen osoite (ws://host:47900/)"
+"Server for online sharing" = "Verkkojakamisen palvelin"
+"Set as default" = "Aseta oletukseksi"
+"Set variable" = "Aseta muuttuja"
+"Set variable mode" = "Aseta muuttujan tila"
+"Set variable {name}" = "Aseta muuttuja {name}"
+"Set {name} to {value}" = "Aseta {name} arvoon {value}"
+"Shadows" = "Varjot"
+"Shape" = "Muoto"
+"Shape builder" = "Muodonrakennin"
+"Shape tools" = "Muototyökalut"
+"Shapes" = "Muodot"
+"Share" = "Jaa"
+"Share this file" = "Jaa tämä tiedosto"
+"Share with a code" = "Jaa koodilla"
+"Share: live session, export" = "Jaa: reaaliaikainen istunto, vienti"
+"Shared" = "Jaettu"
+"Shared: copy its code from the file's menu" = "Jaettu: kopioi koodi tiedoston valikosta"
+"Sharing a file needs the desktop app; here you can join one." = "Tiedoston jakaminen vaatii työpöytäsovelluksen. Tässä voit liittyä jaettuun tiedostoon."
+"Sharing on the local network (online sharing is off: no server is set in Preferences)." = "Jaetaan lähiverkossa (verkkojakaminen on pois käytöstä: asetuksissa ei ole palvelinta)."
+"Sharing on your network · {people}" = "Jaetaan lähiverkossasi · {people}"
+"Sharing online · {people}" = "Jaetaan verkossa · {people}"
+"Sharing stopped: the file stays on the server, open only to you" = "Jakaminen lopetettu: tiedosto jää palvelimelle vain sinun käyttöösi"
+"Show" = "Näytä"
+"Show all templates" = "Näytä kaikki mallit"
+"Show as grid" = "Näytä ruudukkona"
+"Show as list" = "Näytä luettelona"
+"Show autosaves" = "Näytä automaattiset tallennukset"
+"Show behind transparent areas" = "Näytä läpinäkyvien alueiden takana"
+"Show comments (Shift+C)" = "Näytä kommentit (Shift+C)"
+"Show device frame" = "Näytä laitteen kehys"
+"Show dimensions on objects" = "Näytä objektien mitat"
+"Show hotspot hints" = "Näytä aktiivisten kohtien vihjeet"
+"Show in Explorer" = "Näytä Resurssienhallinnassa"
+"Show in Finder" = "Näytä Finderissa"
+"Show in folder" = "Näytä kansiossa"
+"Show only this on the canvas" = "Näytä piirtoalueella vain tämä"
+"Show open" = "Näytä avoimet"
+"Show section contents" = "Näytä osion sisältö"
+"Show this layer" = "Näytä tämä taso"
+"Show usage" = "Näytä käyttö"
+"Show/Hide" = "Näytä/kätke"
+"Show/Hide UI" = "Näytä/kätke käyttöliittymä"
+"Side by side" = "Vierekkäin"
+"Sidebar" = "Sivupalkki"
+"Simplify stroke" = "Yksinkertaista reunaviiva"
+"Size" = "Koko"
+"Size jitter" = "Koon vaihtelu"
+"Skip ink" = "Väistä merkkien viivoja"
+"Slashed zero" = "Viivallinen nolla"
+"Slice" = "Viipale"
+"Slices" = "Viipaleet"
+"Slide in" = "Liu'u sisään"
+"Slide out" = "Liu'u ulos"
+"Slot" = "Sisältöpaikka"
+"Slot content" = "Sisältöpaikan sisältö"
+"Small capitals" = "Kapiteelit"
+"Small caps" = "Kapiteelit"
+"Smart animate" = "Älykäs animointi"
+"Snap to pixel grid" = "Tartu pikseliruudukkoon"
+"Social and slides" = "Some ja diat"
+"Social media" = "Sosiaalinen media"
+"Social post sizes" = "Somejulkaisujen koot"
+"Soft light" = "Pehmeä valo"
+"Solid" = "Yksivärinen"
+"Some variants have the same property values: give each one a unique combination" = "Joillakin varianteilla on samat ominaisuusarvot. Anna kullekin yksilöllinen yhdistelmä."
+"Sort" = "Lajittele"
+"Sort by" = "Lajitteluperuste"
+"Sort by date" = "Lajittele päivämäärän mukaan"
+"Sort by page" = "Lajittele sivun mukaan"
+"Sort by {column}" = "Lajittele sarakkeen {column} mukaan"
+"Space around" = "Tila ympärillä"
+"Space between" = "Tila välissä"
+"Space drag" = "Space drag"
+"Space evenly" = "Tasavälein"
+"Space+drag" = "Space+drag"
+"Spacing" = "Välistys"
+"Spam, stolen work, abuse…" = "Roskaposti, varastettu työ, väärinkäyttö…"
+"Speech bubble" = "Puhekupla"
+"Splay" = "Harotus"
+"Spotlight me" = "Nosta minut esiin"
+"Spread" = "Leviäminen"
+"Square" = "Neliö"
+"Stamp" = "Leima"
+"Stamps" = "Leimat"
+"Standard" = "Vakio"
+"Standard ligatures" = "Tavalliset ligatuurit"
+"Star" = "Tähti"
+"Stars" = "Tähdet"
+"Start" = "Alku"
+"Start ascending from / stop descending at" = "Nousevan osan alku / laskevan osan loppu"
+"Start from a blank canvas" = "Aloita tyhjältä piirtoalueelta"
+"Start from a template" = "Aloita mallista"
+"Start on path" = "Aloituskohta polulla"
+"Start on the Home screen" = "Aloita Aloitus-näkymästä"
+"Start point" = "Alkupiste"
+"Start sharing" = "Aloita jakaminen"
+"Start sharing with the Share button, then pass on the code it gives" = "Aloita jakaminen Jaa-painikkeella ja välitä sen antama koodi"
+"Start vote" = "Aloita äänestys"
+"Starting to share…" = "Aloitetaan jakamista…"
+"Status" = "Tila"
+"Sticky" = "Kiinnittyvä"
+"Sticky note" = "Muistilappu"
+"Sticky note colors" = "Muistilappujen värit"
+"Sticky notes" = "Muistilaput"
+"Sticky notes, shapes and connectors" = "Muistilaput, muodot ja yhdistimet"
+"Stop" = "Pysäytä"
+"Stop following {name}" = "Lopeta käyttäjän {name} seuraaminen"
+"Stop session" = "Lopeta istunto"
+"Stop sharing" = "Lopeta jakaminen"
+"Stop spotlighting" = "Lopeta esiin nostaminen"
+"Stop timer" = "Pysäytä ajastin"
+"Stop {n}  {hex}" = "Piste {n}  {hex}"
+"Straight" = "Suora"
+"Stretch" = "Venytys"
+"Strikethrough" = "Yliviivaus"
+"String" = "Merkkijono"
+"Stroke" = "Reunaviiva"
+"Stroke style" = "Reunaviivan tyyli"
+"Stroke weight" = "Reunaviivan paksuus"
+"Strokes" = "Reunaviivat"
+"Style" = "Tyyli"
+"Styles" = "Tyylit"
+"Stylistic set 1" = "Tyylijoukko 1"
+"Stylistic set 2" = "Tyylijoukko 2"
+"Stylistic set 3" = "Tyylijoukko 3"
+"Stylistic set 4" = "Tyylijoukko 4"
+"Stylistic set 5" = "Tyylijoukko 5"
+"Subtract" = "Vähennä"
+"Subtracts" = "Vähentää"
+"Suffix" = "Jälkiliite"
+"Suspend snapping while dragging" = "Keskeytä tarttuminen vetämisen ajaksi"
+"Swap instance" = "Vaihda ilmentymä"
+"Swap library: use another library's assets of the same names" = "Vaihda kirjasto: käytä toisen kirjaston samannimisiä resursseja"
+"Swap orientation" = "Vaihda suunta"
+"Swap overlay" = "Vaihda peittokuva"
+"Swap to {name}" = "Vaihda kohteeseen {name}"
+"Swap width and height" = "Vaihda leveys ja korkeus keskenään"
+"Swapped instance" = "Ilmentymä vaihdettu"
+"Swapped {n} assets" = { one = "Vaihdettu {n} resurssi", other = "Vaihdettu {n} resurssia" }
+"Swapped {n} assets; {missed} had no match and still use the old library" = { one = "Vaihdettu {n} resurssi; ilman vastinetta jäi {missed}, ja ne käyttävät yhä vanhaa kirjastoa", other = "Vaihdettu {n} resurssia; ilman vastinetta jäi {missed}, ja ne käyttävät yhä vanhaa kirjastoa" }
+"Sweep" = "Pyyhkäisy"
+"System" = "Järjestelmä"
+"Tab / Shift+Tab" = "Tab / Shift+Tab"
+"Table" = "Taulukko"
+"Tablet" = "Tabletti"
+"Tabular numbers" = "Tasalevyiset numerot"
+"Take the values from the first selected layer" = "Ota arvot ensimmäisestä valitusta tasosta"
+"Taper" = "Kapeneminen"
+"Taper both ends" = "Kavenna molemmat päät"
+"Tell the server's operator what is wrong with it" = "Kerro palvelimen ylläpitäjälle, mikä siinä on vikana"
+"Temperature" = "Lämpötila"
+"Template" = "Malli"
+"Templates" = "Mallit"
+"Terms" = "Ehdot"
+"Text" = "Teksti"
+"Text align" = "Tekstin tasaus"
+"Text content" = "Tekstisisältö"
+"Text size" = "Tekstin koko"
+"Text style" = "Tekstityyli"
+"Text styles" = "Tekstityylit"
+"Texts" = "Tekstit"
+"Texture" = "Tekstuuri"
+"The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3." = "Piirtoalue esikatselee värit sRGB-muodossa. Vietäviin PNG-, JPG- ja WebP-tiedostoihin merkitään Display P3 -profiili."
+"The destination document is unavailable. Nothing was imported." = "Kohdeasiakirja ei ole käytettävissä. Mitään ei tuotu."
+"The destination document was closed. Nothing was imported." = "Kohdeasiakirja suljettiin. Mitään ei tuotu."
+"The destination page was removed. Nothing was imported." = "Kohdesivu poistettiin. Mitään ei tuotu."
+"The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "Tiedosto poistetaan palvelimelta. Kukaan ei voi enää avata sitä tai liittyä siihen sieltä, eikä tätä voi kumota. Avoimet kopiot säilyvät käyttäjillään."
+"The file now holds another library" = "Tiedosto sisältää nyt toisen kirjaston"
+"The file now holds another library (\"{name}\")" = "Tiedosto sisältää nyt toisen kirjaston (”{name}”)"
+"The files you shared or published online from this computer. They stay on their server until you remove them." = "Tältä tietokoneelta verkossa jakamasi tai julkaisemasi tiedostot. Ne säilyvät palvelimellaan, kunnes poistat ne."
+"The link carries the session's secret: share it only with people you invite." = "Linkki sisältää istunnon salaisen tunnisteen. Jaa se vain kutsumillesi henkilöille."
+"The name in your online files and on the server. The document inside keeps its own name." = "Nimi verkkotiedostoissasi ja palvelimella. Sisällä oleva asiakirja säilyttää oman nimensä."
+"The selection uses several text styles: click to apply one" = "Valinta käyttää useita tekstityylejä. Käytä yhtä niistä napsauttamalla."
+"The server deletes this file if nobody opens it before {date}." = "Palvelin poistaa tämän tiedoston, ellei kukaan avaa sitä ennen päivää {date}."
+"The whole file" = "Koko tiedosto"
+"Theme" = "Teema"
+"There's no destination for that action" = "Toiminnolla ei ole kohdetta"
+"Thickness" = "Paksuus"
+"This branch can't be reviewed: {e}" = "Tätä haaraa ei voi tarkistaa: {e}"
+"This branch was merged or archived." = "Tämä haara on yhdistetty tai arkistoitu."
+"This computer only" = "Vain tämä tietokone"
+"This computer remembers the owner token, so the file can be managed from the home screen's Online list. Copy it to manage the file from somewhere else: it is a password for this file and won't be shown again." = "Tämä tietokone muistaa omistajan tunnisteen, joten tiedostoa voi hallita aloitusnäkymän Verkossa-luettelosta. Kopioi tunniste hallitaksesi tiedostoa muualla. Se on tämän tiedoston salasana, eikä sitä näytetä uudelleen."
+"This condition is edited as an expression" = "Tätä ehtoa muokataan lausekkeena"
+"This file" = "Tämä tiedosto"
+"This file has unsaved changes" = "Tässä tiedostossa on tallentamattomia muutoksia"
+"This file is on {server}, open only to you. Share it to let others in with a new code." = "Tämä tiedosto on palvelimella {server} vain sinun käytössäsi. Jaa se, jotta muut voivat liittyä uudella koodilla."
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "Tämä tiedosto käyttää fontteja, joita ei ole asennettu tälle tietokoneelle. Teksti piirretään korvaavalla fontilla, kunnes asennat puuttuvat fontit."
+"This frame is new on the branch." = "Tämä kehys on uusi haarassa."
+"This frame isn't on the branch." = "Tätä kehystä ei ole haarassa."
+"This server is open to the public: no key needed." = "Tämä palvelin on julkinen: avainta ei tarvita."
+"This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Tämä palvelin tarvitsee avaimen. Lisää osoitteeseen ?key=… (`figcraft-server key` tulostaa avaimen palvelimen koneella)."
+"This server takes files only with its key: see Advanced." = "Tämä palvelin ottaa tiedostoja vastaan vain avaimellaan. Katso Lisäasetukset."
+"Thumbs up" = "Peukku ylös"
+"Tidy up" = "Järjestä tasavälein"
+"Tile" = "Laatoitus"
+"Tile type" = "Laatan tyyppi"
+"Timer" = "Ajastin"
+"Tint" = "Sävytys"
+"Title" = "Otsikko"
+"Title case" = "Sanojen isot alkukirjaimet"
+"To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Jaa tämä kirjasto tiimillesi julkaisemalla tiedosto palvelimelle (Jaa ▸ Julkaise palvelimelle…) ja julkaisemalla kirjasto siellä."
+"To the layer around it" = "Ympäröivään tasoon"
+"Toggle" = "Vaihda tila"
+"Toggle light/dark theme" = "Vaihda vaalea/tumma teema"
+"Toggle visibility" = "Vaihda näkyvyys"
+"Tools" = "Työkalut"
+"Top" = "Ylhäältä"
+"Top & bottom" = "Ylä- ja alareuna"
+"Top left radius" = "Vasemman yläkulman säde"
+"Top right radius" = "Oikean yläkulman säde"
+"Transform" = "Muunna"
+"Triangle" = "Kolmio"
+"Triangle arrow" = "Kolmionuoli"
+"Trigger" = "Laukaisin"
+"Trigger layer" = "Laukaiseva taso"
+"True" = "Tosi"
+"Truncate text" = "Lyhennä tekstiä"
+"Truncate with an ellipsis" = "Lyhennä kolmella pisteellä"
+"Try again" = "Yritä uudelleen"
+"Try another search or filter." = "Kokeile toista hakua tai suodatinta."
+"Try another search, or browse templates." = "Kokeile toista hakua tai selaa malleja."
+"Try another word, or look at every kind." = "Kokeile toista sanaa tai katso kaikki tyypit."
+"Turn a layer into a component, reuse it, and change every copy at once" = "Muunna taso komponentiksi, käytä sitä uudelleen ja muuta kaikkia kopioita kerralla"
+"Two digits" = "Kaksi numeroa"
+"Type" = "Teksti"
+"Type settings" = "Tekstiasetukset"
+"Type the join code you were given, or paste an invite link." = "Kirjoita saamasi liittymiskoodi tai liitä kutsulinkki."
+"Typography" = "Typografia"
+"Underline" = "Alleviivaus"
+"Undo takes back only your own changes; what others changed since stays." = "Kumoaminen peruu vain omat muutoksesi. Muiden sen jälkeen tekemät muutokset säilyvät."
+"Ungroup" = "Pura ryhmittely"
+"Uniform" = "Tasainen"
+"Union" = "Yhdiste"
+"Unions" = "Yhdistää"
+"Unknown — treated as sRGB" = "Tuntematon — käsitellään sRGB:nä"
+"Unread" = "Lukematon"
+"Unresolve" = "Merkitse ratkaisemattomaksi"
+"Unsaved changes" = "Tallentamattomat muutokset"
+"Unsaved changes in {names}. Save them before closing?" = "Tallentamattomia muutoksia kohteissa {names}. Tallennetaanko ne ennen sulkemista?"
+"Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Tallentamattomia muutoksia: tallenna ensin ({save}) tai hylkää sulkemalla välilehti {alt}-napsautuksella"
+"Unsaved changes: save first, or close again with {key} to discard" = "Tallentamattomia muutoksia: tallenna ensin tai hylkää sulkemalla uudelleen näppäimellä {key}"
+"Up" = "Ylös"
+"Update" = "Päivitä"
+"Update from main" = "Päivitä päähaarasta"
+"Update from selection" = "Päivitä valinnasta"
+"Update plugin" = "Päivitä liitännäinen"
+"Updated {components} and {styles}" = "Päivitetty {components} ja {styles}"
+"Updated {name}" = "Päivitetty: {name}"
+"Updating the graphics driver often helps. To use OpenGL only, start FigCraft from a Command Prompt with:" = "Näytönohjainajurin päivittäminen auttaa usein. Käytä vain OpenGL:ää käynnistämällä FigCraft komentokehotteesta näin:"
+"Updating the graphics driver often helps. WGPU_BACKEND (vulkan, gl, metal) names another graphics API to try." = "Näytönohjainajurin päivittäminen auttaa usein. WGPU_BACKEND (vulkan, gl, metal) määrittää toisen kokeiltavan grafiikkarajapinnan."
+"Uploads this file to a FigCraft server and keeps this tab in sync with it. You get a link to edit and a link to view." = "Lataa tämän tiedoston FigCraft-palvelimelle ja pitää tämän välilehden synkronoituna sen kanssa. Saat muokkauslinkin ja katselulinkin."
+"Uppercase" = "Isot kirjaimet"
+"Use a fixed value" = "Käytä kiinteää arvoa"
+"Use an expression, e.g. count + 1" = "Käytä lauseketta, esim. count + 1"
+"Use as mask" = "Käytä maskina"
+"Use auto layout" = "Käytä automaattista asettelua"
+"Use number keys for opacity" = "Säädä peittävyyttä numeronäppäimillä"
+"Use the .figcraft or .fig extension." = "Käytä .figcraft- tai .fig-tiedostopäätettä."
+"Use the layer's fill" = "Käytä tason täyttöä"
+"Used in {files} · {instances}" = "Käytössä tiedostoissa {files} · {instances}"
+"Username" = "Käyttäjänimi"
+"Uses variables: each layer shows them in its own mode" = "Käyttää muuttujia: kukin taso näyttää ne omassa tilassaan"
+"Value" = "Arvo"
+"Variable" = "Muuttuja"
+"Variable collections" = "Muuttujakokoelmat"
+"Variable modes" = "Muuttujatilat"
+"Variable width" = "Vaihteleva leveys"
+"Variables" = "Muuttujat"
+"Variables JSON…" = "Muuttujat JSON…"
+"Variables store reusable values (colours, numbers, strings, booleans) with modes such as Light and Dark." = "Muuttujat tallentavat uudelleenkäytettäviä arvoja (värejä, lukuja, merkkijonoja ja totuusarvoja). Niillä voi olla tiloja, kuten vaalea ja tumma."
+"Variant" = "Variantti"
+"Vector" = "Vektori"
+"Vectors" = "Vektorit"
+"Version" = "Versio"
+"Version history" = "Versiohistoria"
+"Version {version}" = "Versio {version}"
+"Version {v} · {components} · {styles} · {variables}" = "Versio {v} · {components} · {styles} · {variables}"
+"Vertical" = "Pystysuunta"
+"Vertical align" = "Pystytasaus"
+"Vertical hex" = "Pystysuuntainen kuusikulmio"
+"Vertical padding" = "Pystysuuntainen sisämarginaali"
+"Vertical spacing" = "Pystyvälistys"
+"Vertical trim" = "Pystysuuntainen rajaus"
+"View" = "Näytä"
+"View link" = "Katselulinkki"
+"View link copied" = "Katselulinkki kopioitu"
+"View only" = "Vain katselu"
+"View only: you see every change as it happens but can't edit. Leave to keep a copy you can edit." = "Vain katselu: näet kaikki muutokset reaaliajassa, mutta et voi muokata. Poistu säilyttääksesi muokattavan kopion."
+"Viewing “{name}”" = "Katsellaan tiedostoa ”{name}”"
+"Violet" = "Violetti"
+"Visibility" = "Näkyvyys"
+"Visible" = "Näkyvä"
+"Vivid" = "Kirkas"
+"Votes per person" = "Ääniä henkilöä kohden"
+"Voting session" = "Äänestys"
+"WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND on asetettu ja määrittää käytettävän grafiikkarajapinnan. Poista se käytöstä, jotta FigCraft voi valita."
+"Warm" = "Lämmin"
+"Watch" = "Seuraa"
+"Wavy" = "Aaltoileva"
+"Web" = "Verkko"
+"WebSocket URL" = "WebSocket-URL"
+"WebSocket URL copied" = "WebSocket-URL kopioitu"
+"Websites" = "Verkkosivustot"
+"Wedge" = "Kiila"
+"Weekly planner" = "Viikkosuunnitelma"
+"Weight" = "Paksuus"
+"What changed since it was marked ready for dev" = "Muutokset kehitysvalmiiksi merkitsemisen jälkeen"
+"What is wrong with this file? The server's operator gets your report." = "Mikä tässä tiedostossa on vikana? Palvelimen ylläpitäjä saa ilmoituksesi."
+"What it's for" = "Käyttötarkoitus"
+"What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "Aiempi tila ei ole tiedossa: muutos tehtiin ennen kuin FigCraft tallensi kopioita kehitysvalmiista kehyksistä. Ratkaise muutos tai merkitse kehys uudelleen valmiiksi, jotta jatkossa vertailu onnistuu."
+"What you try here changes this preview and the code below, not the file" = "Tässä kokeilemasi asiat muuttavat esikatselua ja alla olevaa koodia, eivät tiedostoa"
+"While hovering" = "Osoitettaessa"
+"While pressing" = "Painettaessa"
+"White" = "Valkoinen"
+"Who runs it, its terms and how long it keeps files" = "Ylläpitäjä, käyttöehdot ja tiedostojen säilytysaika"
+"Whole screen" = "Koko näyttö"
+"Why it changed" = "Muutoksen syy"
+"Widget" = "Pienoisohjelma"
+"Widgets" = "Pienoisohjelmat"
+"Width" = "Leveys"
+"Width point" = "Leveyspiste"
+"Width profile" = "Leveysprofiili"
+"Wireframe kit" = "Rautalankapaketti"
+"With the layers' export settings" = "Tasojen vientiasetuksilla"
+"Wrap" = "Rivitys"
+"Wrap in new section" = "Ympäröi uudella osiolla"
+"Yellow" = "Keltainen"
+"Yesterday" = "Eilen"
+"You" = "Sinä"
+"You'll get the shared file as a new tab and edit it together." = "Jaettu tiedosto avautuu uuteen välilehteen, ja voitte muokata sitä yhdessä."
+"You're spotlighting: everyone follows your view" = "Olet esillä: kaikki seuraavat näkymääsi"
+"Your copy of the file stays open" = "Oma kopiosi tiedostosta pysyy auki"
+"Your copy stays open; the file stays on the server" = "Oma kopiosi pysyy auki, ja tiedosto jää palvelimelle"
+"Your name" = "Nimesi"
+"Your name in comments" = "Nimesi kommenteissa"
+"Your system asks for reduced motion: animations stay off." = "Järjestelmäsi pyytää vähennettyä liikettä. Animaatiot pidetään pois käytöstä."
+"Z" = "Z"
+"Z to A" = "Z:sta A:han"
+"Zoom" = "Zoomaus"
+"Zoom around the pointer" = "Zoomaa osoittimen ympärillä"
+"Zoom device to fill window" = "Zoomaa laite ikkunan kokoiseksi"
+"Zoom in" = "Lähennä"
+"Zoom out" = "Loitonna"
+"Zoom to 100%" = "Zoomaa kokoon 100 %"
+"Zoom to 200%" = "Zoomaa kokoon 200 %"
+"Zoom to 50%" = "Zoomaa kokoon 50 %"
+"Zoom to fit" = "Sovita näkymään"
+"Zoom to selection" = "Zoomaa valintaan"
+"Zoom tool: click to zoom in, drag an area" = "Zoomaustyökalu: lähennä napsauttamalla tai vedä alue"
+"Zoom tool: zoom out" = "Zoomaustyökalu: loitonna"
+"and {n} more" = { one = "ja vielä {n}", other = "ja vielä {n}" }
+"bleed marks" = "leikkuuvaramerkit"
+"by {author}" = "tekijä: {author}"
+"call any command its access allows" = "kutsua kaikkia käyttöoikeuksiensa sallimia komentoja"
+"call only: {commands}" = "kutsua vain: {commands}"
+"can edit the document" = "voi muokata asiakirjaa"
+"can save files" = "voi tallentaa tiedostoja"
+"conditional prototype actions nested too deeply were skipped" = "liian syvälle sisäkkäiset ehdolliset prototyyppitoiminnot ohitettiin"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "ehdolliset prototyyppitoiminnot ohitettiin, koska niiden ehtoja ei voi laskea"
+"connector label background was skipped: style data is missing" = "yhdistimen tekstin tausta ohitettiin: tyylitiedot puuttuvat"
+"connector label was skipped: background bounds are invalid" = "yhdistimen teksti ohitettiin: taustan rajat ovat virheelliset"
+"connector label was skipped: background transform is invalid" = "yhdistimen teksti ohitettiin: taustan muunnos on virheellinen"
+"connector label was skipped: composed text transform is invalid" = "yhdistimen teksti ohitettiin: yhdistetty tekstimuunnos on virheellinen"
+"connector label was skipped: derived background bounds are missing" = "yhdistimen teksti ohitettiin: johdetut taustan rajat puuttuvat"
+"connector label was skipped: derived text bounds are missing" = "yhdistimen teksti ohitettiin: johdetut tekstin rajat puuttuvat"
+"connector label was skipped: text bounds are invalid" = "yhdistimen teksti ohitettiin: tekstin rajat ovat virheelliset"
+"connector label was skipped: text style data is missing" = "yhdistimen teksti ohitettiin: tekstin tyylitiedot puuttuvat"
+"connector label was skipped: text transform is invalid" = "yhdistimen teksti ohitettiin: tekstin muunnos on virheellinen"
+"connector labels were skipped" = "yhdistimien tekstit ohitettiin"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "yhdistintasot tuodaan staattisina kehys- ja vektorikuvina mahdollisine teksteineen; päiden reaaliaikaisia sidoksia ei säilytetä"
+"connector snapshot vector data is missing; connector was left empty" = "yhdistimen vektorikuvatiedot puuttuvat; yhdistin jätettiin tyhjäksi"
+"connectors whose ends can't be placed are empty" = "yhdistimet, joiden päitä ei voi sijoittaa, ovat tyhjiä"
+"crop marks" = "leikkausmerkit"
+"damaged vector geometry was skipped" = "vaurioitunut vektorigeometria ohitettiin"
+"damaged vector networks import as outlines" = "vaurioituneet vektoriverkot tuodaan ääriviivoina"
+"development: {path}" = "kehitys: {path}"
+"document children other than pages were skipped" = "asiakirjan muut kuin sivuina olevat alikohteet ohitettiin"
+"duplicate grid track sizing entries use equal tracks" = "päällekkäiset ruudukon kokomääritykset käyttävät tasakokoisia osia"
+"e.g. count + 1" = "esim. count + 1"
+"e.g. count >= 3 and not done" = "esim. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "mutkaiset ja kaarevat yhdistimet, joilla ei ole tallennettua polkua, tuodaan suorina viivoina"
+"entries without a node type were skipped" = "kohteet, joilta puuttuu solmutyyppi, ohitettiin"
+"figcraft:// links from a browser, chat or email open this app and join the session." = "selaimen, keskustelun tai sähköpostin figcraft://-linkit avaavat tämän sovelluksen ja liittyvät istuntoon."
+"filled areas of a vector with their own fill use the layer's fill" = "vektorin omalla täytöllä määritetyt alueet käyttävät tason täyttöä"
+"from {server}" = "palvelimelta {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "peliohjainlaukaisimet, joilla ei ole täsmälleen yhtä tunnettua ohjainpainiketta, ohitettiin"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "ruudukon osien luettelo ylittää 1000 kohdetta; osat käyttävät oletuksen mukaista tasakokoa"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "ruudukon kokomääritys on virheellinen tai sitä ei tueta; kyseiset osat käyttävät tasakokoa"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "ruudukon kokomääritysten luettelo ylittää 1000 kohdetta; osat käyttävät oletuksen mukaista tasakokoa"
+"hidden" = "kätketty"
+"iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "kuvasuotimet ovat monitulkintaisia, koska molemmat suodinsäilöt ovat läsnä; suotimien muunnos ohitettiin"
+"image filters use FigCraft's approximate renderer" = "kuvasuotimet käyttävät FigCraftin likimääräistä renderöijää"
+"instance swap properties whose default component isn't in the file were skipped" = "ilmentymän vaihto-ominaisuudet ohitettiin, koska niiden oletuskomponenttia ei ole tiedostossa"
+"instances inside their own main component were imported as frames" = "oman pääkomponenttinsa sisällä olevat ilmentymät tuotiin kehyksinä"
+"instances of components that aren't in the file show no layers" = "tiedostosta puuttuvien komponenttien ilmentymät eivät näytä tasoja"
+"instances of components that aren't in the file were imported as frames" = "tiedostosta puuttuvien komponenttien ilmentymät tuotiin kehyksinä"
+"instances that would nest a component inside itself were imported as frames" = "ilmentymät, jotka sijoittaisivat komponentin itsensä sisään, tuotiin kehyksinä"
+"instances without a main component were imported as empty frames" = "ilmentymät, joilta puuttuu pääkomponentti, tuotiin tyhjinä kehyksinä"
+"invalid internal .fig text path data was ignored" = "virheelliset sisäiset .fig-tekstipolun tiedot ohitettiin"
+"invalid or oversized vector networks import as outlines" = "virheelliset tai liian suuret vektoriverkot tuodaan ääriviivoina"
+"invalid or oversized vector path data was skipped" = "virheelliset tai liian suuret vektoripolun tiedot ohitettiin"
+"just now" = "juuri nyt"
+"key triggers without a supported key were skipped" = "näppäinlaukaisimet, joilla ei ole tuettua näppäintä, ohitettiin"
+"key up triggers import as key presses" = "näppäimen vapautuslaukaisimet tuodaan näppäimen painalluksina"
+"layers without a position were placed at their parent's origin" = "tasot, joilta puuttuu sijainti, sijoitettiin emotasonsa origoon"
+"layers without a type were skipped" = "tasot, joilta puuttuu tyyppi, ohitettiin"
+"legacy image filter container is unsupported; filter conversion was skipped" = "vanhaa kuvasuodinsäilöä ei tueta; suotimien muunnos ohitettiin"
+"locked" = "lukittu"
+"malformed image filters container was skipped" = "virheellinen image filters -säilö ohitettiin"
+"malformed image paintFilter container was skipped" = "virheellinen image paintFilter -säilö ohitettiin"
+"malformed slot content assignment was skipped" = "virheellinen sisältöpaikan sisällön määritys ohitettiin"
+"no bleed" = "ei leikkuuvaraa"
+"nobody else here yet" = "kukaan muu ei ole vielä paikalla"
+"non-default slot settings are not represented and were skipped" = "oletuksesta poikkeavia sisältöpaikan asetuksia ei esitetä, ja ne ohitettiin"
+"now" = "nyt"
+"offer files to save if it asks to (you choose where each one goes)" = "tarjota tiedostoja tallennettavaksi, jos se pyytää (valitset itse kunkin paikan)"
+"only in a text style or variable" = "vain tekstityylissä tai muuttujassa"
+"or" = "tai"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "pisteiden viivaliitokset säilytettiin; katko- ja vaihtelevanlevyiset viivat käyttävät tason liitostyyliä"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "sisältöpaikan ensisijaisten komponenttien avaimia ei voitu yhdistää tiedoston solmuihin, ja ne ohitettiin"
+"prototype actions of unknown types were skipped" = "tuntemattoman tyyppiset prototyyppitoiminnot ohitettiin"
+"prototype actions without a destination in the file were skipped" = "prototyyppitoiminnot, joiden kohdetta ei ole tiedostossa, ohitettiin"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "muuttujiin viittaavat prototyyppilausekkeet ohitettiin, koska muuttujia ei ole muuttujien JSON-tiedostossa"
+"prototype expressions with unsupported functions were skipped" = "prototyyppilausekkeet, joissa on tukemattomia funktioita, ohitettiin"
+"prototype interactions without supported actions were skipped" = "prototyypin vuorovaikutukset, joissa ei ole tuettuja toimintoja, ohitettiin"
+"prototype navigations of unknown types were skipped" = "tuntemattoman tyyppiset prototyypin siirtymät kohteeseen ohitettiin"
+"prototype transitions of unknown types play instantly" = "tuntemattoman tyyppiset prototyypin siirtymäanimaatiot toistuvat välittömästi"
+"prototype triggers of unknown types were skipped" = "tuntemattoman tyyppiset prototyypin laukaisimet ohitettiin"
+"put a widget on the canvas" = "lisätä pienoisohjelman piirtoalueelle"
+"read and edit the document" = "lukea ja muokata asiakirjaa"
+"read the document" = "lukea asiakirjan"
+"reads the document" = "lukee asiakirjan"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "muuttujan asetustoiminnot ohitettiin, koska muuttujia ei ole muuttujien JSON-tiedostossa"
+"set-variable actions with values that can't be evaluated were skipped" = "muuttujan asetustoiminnot ohitettiin, koska arvoja ei voi laskea"
+"set-variable actions with values that don't fit the variable were skipped" = "muuttujan asetustoiminnot ohitettiin, koska arvot eivät sovi muuttujaan"
+"set-variable actions without a value were skipped" = "muuttujan asetustoiminnot, joilta puuttuu arvo, ohitettiin"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "muuttujatilan asetustoiminnot ohitettiin, koska kokoelmia tai tiloja ei ole muuttujien JSON-tiedostossa"
+"slot content assignment target is missing or is not slot content" = "sisältöpaikan määrityksen kohde puuttuu tai ei ole sisältöpaikan sisältöä"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "sisältöpaikan määritys käyttää tyhjää GUID-erikoisarvoa, ja se ohitettiin"
+"slot layers without a matching slot property were imported as frames" = "sisältöpaikkatasot, joilla ei ole vastaavaa sisältöpaikkaominaisuutta, tuotiin kehyksinä"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "jotkin vektoripisteet viittaavat tiedostosta puuttuviin pisteasetuksiin; ne käyttävät tason liitostyyliä ja tavallisia kulmia"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "jotkin vektorisegmentit viittaavat tiedostosta puuttuviin tyyliasetuksiin; ne käyttävät tason reunaviivaa"
+"stale or invalid grid track sizing entries were ignored" = "vanhentuneet tai virheelliset ruudukon kokomääritykset ohitettiin"
+"stars and polygons without point counts or geometry use the default point count" = "tähdet ja monikulmiot, joilta puuttuu pistemäärä tai geometria, käyttävät oletuspistemäärää"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "joidenkin vektorisegmenttien tyyliasetuksia ei tueta; nämä segmentit käyttävät tason reunaviivaa"
+"text path underline or strikethrough decoration is not rendered" = "tekstipolun alleviivausta tai yliviivausta ei renderöidä"
+"text style overrides refer to missing table entries" = "tekstityylin ohitukset viittaavat puuttuviin taulukkokohteisiin"
+"the file has no pages" = "tiedostossa ei ole sivuja"
+"the plugin" = "liitännäinen"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "muuttujien JSON-tiedostosta puuttuu `variableCollections` (odotettiin paikallisten muuttujien vastausta), ja tiedosto ohitettiin"
+"this session only" = "vain tämä istunto"
+"unknown component property types were skipped" = "tuntemattoman tyyppiset komponenttiominaisuudet ohitettiin"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "muuttuja-aliakset ohitettiin, koska kohdemuuttujia ei ole muuttujien JSON-tiedostossa tai ne ovat eri tyyppiä"
+"variable bindings to properties the layer doesn't have were skipped" = "muuttujasidokset ominaisuuksiin, joita tasolla ei ole, ohitettiin"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "muuttujasidokset muuttujiin, joita ei ole muuttujien JSON-tiedostossa (kirjastomuuttujat), ohitettiin"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "muuttujasidokset ohitettiin: tiedoston JSON ei määritä muuttujia (anna paikallisten muuttujien JSON arvona `variables` tai sisällytä sen `meta` tiedoston JSONin viereen)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "muuttujasidokset, joiden muuttujatyyppi ei sovi ominaisuuteen, ohitettiin"
+"variable collections without modes were skipped" = "muuttujakokoelmat, joilla ei ole tiloja, ohitettiin"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "prototyyppilausekkeiden muuttujatilahaut, jotka eivät ole muuttuja ja jokin sen tiloista, ohitettiin"
+"variable modes of collections that aren't in the file were skipped" = "tiedostosta puuttuvien kokoelmien muuttujatilat ohitettiin"
+"variable modes of collections that aren't in the variables JSON were skipped" = "muuttujien JSON-tiedostosta puuttuvien kokoelmien muuttujatilat ohitettiin"
+"variable values that don't match their type (or composed colours) were skipped" = "muuttujien arvot, jotka eivät vastaa tyyppiään (tai yhdistettyjä värejä), ohitettiin"
+"variables of unknown types were skipped" = "tuntemattoman tyyppiset muuttujat ohitettiin"
+"variables whose collection isn't in the variables JSON were skipped" = "muuttujat, joiden kokoelmaa ei ole muuttujien JSON-tiedostossa, ohitettiin"
+"variables without readable values were skipped" = "muuttujat, joiden arvoja ei voi lukea, ohitettiin"
+"vector points with unknown stroke joins use the layer join" = "vektoripisteet, joilla on tuntematon liitostyyli, käyttävät tason liitostyyliä"
+"vectors without geometry are empty" = "vektorit ilman geometriaa ovat tyhjiä"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "vektorit ilman geometriaa ovat tyhjiä (vie tiedoston JSON asetuksella geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "erittäin pitkä teksti katkaistiin 1 048 576 merkkiin"
+"very long vector paths were skipped" = "erittäin pitkät vektoripolut ohitettiin"
+"video actions are not supported and were skipped" = "videotoimintoja ei tueta, ja ne ohitettiin"
+"video triggers are not supported and were skipped" = "videolaukaisimia ei tueta, ja ne ohitettiin"
+"yesterday" = "eilen"
+"{instances} in {files}" = "{instances} tiedostoissa {files}"
+"{language}: draft translation, waiting for a native speaker's review." = "{language}: käännösluonnos, joka odottaa äidinkielisen puhujan tarkistusta."
+"{length} bleed" = "Leikkuuvara {length}"
+"{month} {day}, {year}" = "{day}. {month} {year}"
+"{name}\nClick to apply to the selection" = "{name}\nKäytä valintaan napsauttamalla"
+"{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nVedä piirtoalueelle tai sijoita näkymän keskelle napsauttamalla.\nVaihda ilmentymä pudottamalla sen päälle Alt (Option) painettuna."
+"{name} (from {library})" = "{name} (kirjastosta {library})"
+"{name} (you)" = "{name} (sinä)"
+"{name} ({layers} layers)" = "{name} (tasoja: {layers})"
+"{name} ({tag}): {min} – {max}, default {default}. Double-click the slider to go back to the style's value; Escape while dragging cancels." = "{name} ({tag}): {min} – {max}, oletus {default}. Palauta tyylin arvo kaksoisnapsauttamalla liukusäädintä. Escape peruuttaa vetämisen."
+"{name} cleared from the list" = "{name} poistettu luettelosta"
+"{name} from {path}" = "{name} polusta {path}"
+"{name} is forgotten on this computer; the file stays on {server}" = "{name} on unohdettu tällä tietokoneella. Tiedosto jää palvelimelle {server}."
+"{name} is on the server." = "{name} on palvelimella."
+"{name} is spotlighting" = "{name} nostaa näkymäänsä esiin"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} on liian suuri avattavaksi selaimessa (yli 512 Mt)."
+"{name} was removed from the server" = "{name} poistettiin palvelimelta"
+"{name} · deleted on main" = "{name} · poistettu päähaarassa"
+"{name} · deleted on the branch" = "{name} · poistettu haarassa"
+"{name} · not published" = "{name} · ei julkaistu"
+"{name} · on a server" = "{name} · palvelimella"
+"{name} · published version {v}" = "{name} · julkaistu versio {v}"
+"{name} · version {v} on the server" = "{name} · versio {v} palvelimella"
+"{name}, in a live session" = "{name}, reaaliaikaisessa istunnossa"
+"{name}, online, open only to you" = "{name}, verkossa, vain sinun käytössäsi"
+"{name}, {kind}, {w} by {h}, selected" = "{name}, {kind}, {w} × {h}, valittu"
+"{n} added" = { one = "Lisätty: {n}", other = "Lisätty: {n}" }
+"{n} autosave versions" = { one = "{n} automaattisesti tallennettu versio", other = "{n} automaattisesti tallennettua versiota" }
+"{n} changed" = { one = "Muutettu: {n}", other = "Muutettu: {n}" }
+"{n} columns" = { one = "{n} sarake", other = "{n} saraketta" }
+"{n} components" = { one = "{n} komponentti", other = "{n} komponenttia" }
+"{n} components and styles have newer versions" = { one = "Uudempi versio saatavilla: {n} komponentti tai tyyli", other = "Uudempia versioita saatavilla: {n} komponenttia ja tyyliä" }
+"{n} conflicts to resolve" = { one = "{n} ratkaistava ristiriita", other = "{n} ratkaistavaa ristiriitaa" }
+"{n} days ago" = { one = "{n} päivä sitten", other = "{n} päivää sitten" }
+"{n} files" = { one = "{n} tiedosto", other = "{n} tiedostoa" }
+"{n} hours ago" = { one = "{n} tunti sitten", other = "{n} tuntia sitten" }
+"{n} instances" = { one = "{n} ilmentymä", other = "{n} ilmentymää" }
+"{n} layers" = { one = "{n} taso", other = "{n} tasoa" }
+"{n} layers as one file" = { one = "{n} taso yhtenä tiedostona", other = "{n} tasoa yhtenä tiedostona" }
+"{n} layers selected" = { one = "{n} taso valittu", other = "{n} tasoa valittu" }
+"{n} layers · {parts}" = { one = "{n} taso · {parts}", other = "{n} tasoa · {parts}" }
+"{n} matches" = { one = "{n} osuma", other = "{n} osumaa" }
+"{n} min" = "{n} min"
+"{n} minutes ago" = { one = "{n} minuutti sitten", other = "{n} minuuttia sitten" }
+"{n} months ago" = { one = "{n} kuukausi sitten", other = "{n} kuukautta sitten" }
+"{n} more notes omitted from this report" = { one = "Tästä raportista on jätetty pois vielä {n} huomautus", other = "Tästä raportista on jätetty pois vielä {n} huomautusta" }
+"{n} of {total}" = "{n} / {total}"
+"{n} people joined" = { one = "{n} henkilö liittyi", other = "{n} henkilöä liittyi" }
+"{n} preferred components" = { one = "{n} ensisijainen komponentti", other = "{n} ensisijaista komponenttia" }
+"{n} ready" = { one = "{n} valmis", other = "{n} valmista" }
+"{n} removed" = { one = "Poistettu: {n}", other = "Poistettu: {n}" }
+"{n} replies" = { one = "{n} vastaus", other = "{n} vastausta" }
+"{n} rows" = { one = "{n} rivi", other = "{n} riviä" }
+"{n} styles" = { one = "{n} tyyli", other = "{n} tyyliä" }
+"{n} text layers" = { one = "{n} tekstitaso", other = "{n} tekstitasoa" }
+"{n} variables" = { one = "{n} muuttuja", other = "{n} muuttujaa" }
+"{n} votes" = { one = "{n} ääni", other = "{n} ääntä" }
+"{n} votes left" = { one = "{n} ääni jäljellä", other = "{n} ääntä jäljellä" }
+"{n} weeks ago" = { one = "{n} viikko sitten", other = "{n} viikkoa sitten" }
+"{n} years ago" = { one = "{n} vuosi sitten", other = "{n} vuotta sitten" }
+"{n}d" = "{n}pv"
+"{n}h" = "{n}t"
+"{n}m" = "{n}min"
+"{n}w" = "{n}vk"
+"{page}, nothing selected" = "{page}, ei valintaa"
+"{profile} (current)" = "{profile} (nykyinen)"
+"{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} on sen arvo. {property ? \"a\" : \"b\"} valitsee merkkijonon. Muut {…}-ilmaukset säilyvät sellaisinaan."
+"{server} can't say what became of your files (it is older than this app)." = "{server} ei pysty kertomaan tiedostojesi tilaa (se on tätä sovellusta vanhempi)."
+"{server} · No longer on the server" = "{server} · Ei enää palvelimella"
+"{server} · {shared} · Opened {date}" = "{server} · {shared} · Avattu {date}"
+"{tool}  hold {key}" = "{tool}  pidä {key} painettuna"
+"{value} isn't a colour" = "{value} ei ole väri"
+"{when} · edited" = "{when} · muokattu"
+"←" = "←"
+"← ↑ → ↓" = "← ↑ → ↓"
+"← → ↑ ↓" = "← → ↑ ↓"
+"→, Space or N" = "→, Space or N"
+"↵" = "↵"
+"⇥ / ⇧⇥" = "⇥ / ⇧⇥"
+"⌘ arrows" = "⌘ arrows"
+"⌘ click" = "⌘ click"
+"⌘ scroll" = "⌘ scroll"
+"⌥ drag" = "⌥ drag"
+
+[commands]
+"align.bottom" = "Tasaa alas"
+"align.hcenter" = "Keskitä vaakasuunnassa"
+"align.left" = "Tasaa vasemmalle"
+"align.right" = "Tasaa oikealle"
+"align.top" = "Tasaa ylös"
+"align.vcenter" = "Keskitä pystysuunnassa"
+"annotation.add" = "Lisää huomautus"
+"annotation.addCategory" = "Lisää huomautusluokka"
+"annotation.categories" = "Huomautusten luokat"
+"annotation.edit" = "Muokkaa huomautusta"
+"annotation.editCategory" = "Muokkaa huomautusluokkaa"
+"annotation.list" = "Luettele huomautukset"
+"annotation.remove" = "Poista huomautus"
+"annotation.removeCategory" = "Poista huomautusluokka"
+"app.actions" = "Toiminnot"
+"app.preferences" = "Asetukset"
+"arrange.back" = "Vie takimmaiseksi"
+"arrange.backward" = "Vie taaksepäin"
+"arrange.forward" = "Tuo eteenpäin"
+"arrange.front" = "Tuo etummaiseksi"
+"arrange.packH" = "Pakkaa vaakasuunnassa"
+"arrange.packV" = "Pakkaa pystysuunnassa"
+"arrange.roundToPixels" = "Pyöristä pikseleihin"
+"arrange.spacing" = "Välistys"
+"arrange.tidy" = "Järjestä tasavälein"
+"board.connector" = "Yhdistin"
+"board.ink" = "Tussiviiva"
+"board.label" = "Yhdistimen nimiö"
+"board.nextSticky" = "Seuraava muistilappu"
+"board.reattach" = "Liitä yhdistin uudelleen"
+"board.setColor" = "Taulun väri"
+"board.setStyle" = "Taulun tyyli"
+"board.shape" = "Muoto ja teksti"
+"board.stamp" = "Leima"
+"board.sticky" = "Muistilappu"
+"board.table" = "Taulukko"
+"board.tableEdit" = "Muokkaa taulukkoa"
+"board.template" = "Taulun malli"
+"board.templates" = "Luettele taulun mallit"
+"board.timer" = "Ajastin"
+"board.timerState" = "Ajastimen tila"
+"board.vote" = "Äänestys"
+"board.voteResults" = "Äänestyksen tulokset"
+"bool.exclude" = "Sulje valinnan päällekkäinen alue pois"
+"bool.flatten" = "Yhdistä Boolen muoto vektoriksi"
+"bool.intersect" = "Leikkaa valinnan yhteinen alue"
+"bool.subtract" = "Vähennä valinta"
+"bool.union" = "Yhdistä valinta"
+"branch.archive" = "Arkistoi haara"
+"branch.create" = "Luo haara"
+"branch.list" = "Luettele haarat"
+"branch.merge" = "Yhdistä haara"
+"branch.open" = "Avaa haara"
+"branch.review" = "Tarkista haara"
+"branch.updateFromMain" = "Päivitä päähaarasta"
+"codeConnect.export" = "Vie koodiyhteydet"
+"codeConnect.import" = "Tuo koodiyhteydet"
+"codeConnect.remove" = "Katkaise yhteys koodiin"
+"codeConnect.set" = "Yhdistä koodiin"
+"collab.cursor" = "Näytä kohdistin kohdassa"
+"collab.cursorChat" = "Kohdistinkeskustelu"
+"collab.diff" = "Näytä synkronoinnin muutokset"
+"collab.files" = "Omat verkkotiedostot"
+"collab.follow" = "Seuraa"
+"collab.forgetFile" = "Unohda verkkotiedosto"
+"collab.host" = "Aloita reaaliaikainen istunto"
+"collab.join" = "Liity reaaliaikaiseen istuntoon"
+"collab.leave" = "Poistu reaaliaikaisesta istunnosta"
+"collab.manageFile" = "Hallitse julkaistua tiedostoa"
+"collab.openFile" = "Avaa verkkotiedosto"
+"collab.peers" = "Tämän tiedoston käyttäjät"
+"collab.publish" = "Julkaise palvelimelle"
+"collab.recoverFile" = "Palauta verkkotiedosto"
+"collab.registerLinks" = "Avaa kutsulinkit FigCraftissa"
+"collab.removePerson" = "Poista istunnosta"
+"collab.report" = "Ilmoita tiedostosta palvelimen ylläpitäjälle"
+"collab.serverInfo" = "Palvelimen tiedot"
+"collab.share" = "Jaa liittymiskoodilla"
+"collab.spotlight" = "Nosta minut esiin"
+"collab.stop" = "Lopeta reaaliaikainen istunto"
+"command.batch" = "Suorita useita komentoja"
+"comment.add" = "Lisää kommentti"
+"comment.delete" = "Poista kommentti"
+"comment.edit" = "Muokkaa kommenttia"
+"comment.link" = "Kopioi linkki kommenttiin"
+"comment.list" = "Luettele kommentit"
+"comment.markRead" = "Merkitse kommentti luetuksi"
+"comment.move" = "Siirrä kommentti"
+"comment.next" = "Seuraava kommentti"
+"comment.open" = "Avaa kommentti"
+"comment.people" = "Kommenttien osallistujat"
+"comment.react" = "Reagoi kommenttiin"
+"comment.reply" = "Vastaa kommenttiin"
+"comment.resolve" = "Ratkaise kommentti"
+"comment.zoom" = "Zoomaa kommentteihin"
+"component.addProperty" = "Lisää komponentin ominaisuus"
+"component.addVariant" = "Lisää variantti"
+"component.bindProperty" = "Sido taso ominaisuuteen"
+"component.combineVariants" = "Yhdistä varianteiksi"
+"component.create" = "Luo komponentti"
+"component.createMultiple" = "Luo useita komponentteja"
+"component.deleteProperty" = "Poista komponentin ominaisuus"
+"component.detach" = "Irrota ilmentymä"
+"component.editProperty" = "Muokkaa komponentin ominaisuutta"
+"component.exposeInstance" = "Tuo sisäkkäinen ilmentymä käyttöön"
+"component.goToMain" = "Siirry pääkomponenttiin"
+"component.hideWhenPublishing" = "Kätke julkaistaessa"
+"component.list" = "Luettele komponentit"
+"component.makeSlot" = "Luo sisältöpaikka"
+"component.playground" = "Komponenttien kokeilualue"
+"component.properties" = "Komponentin ominaisuudet"
+"component.pushChanges" = "Siirrä muutokset pääkomponenttiin"
+"component.removeSlot" = "Poista sisältöpaikka"
+"component.resetInstance" = "Palauta kaikki muutokset"
+"component.resetOverride" = "Palauta ohitus"
+"component.restoreMain" = "Palauta pääkomponentti"
+"dev.compare" = "Vertaa muutoksia"
+"dev.focus" = "Kohdistusnäkymä"
+"dev.resolveChange" = "Ratkaise muutos"
+"dev.unfocus" = "Poistu kohdistusnäkymästä"
+"devMode.addMeasurement" = "Lisää mittaus"
+"devMode.measurements" = "Luettele mittaukset"
+"devMode.removeMeasurement" = "Poista mittaus"
+"devResource.add" = "Lisää kehittäjäresurssi"
+"devResource.edit" = "Muokkaa kehittäjäresurssia"
+"devResource.list" = "Luettele kehittäjäresurssit"
+"devResource.remove" = "Poista kehittäjäresurssi"
+"distribute.horizontal" = "Jaa vaakavälit tasan"
+"distribute.vertical" = "Jaa pystyvälit tasan"
+"doc.home" = "Aloitus"
+"doc.list" = "Luettele asiakirjat"
+"doc.nextTab" = "Seuraava välilehti"
+"doc.previousTab" = "Edellinen välilehti"
+"doc.switch" = "Vaihda asiakirjaa"
+"edit.copy" = "Kopioi"
+"edit.copyAsCss" = "Kopioi CSS-muodossa"
+"edit.copyAsPng" = "Kopioi PNG-muodossa"
+"edit.copyAsSvg" = "Kopioi SVG-muodossa"
+"edit.copyAsText" = "Kopioi tekstinä"
+"edit.copyLink" = "Kopioi linkki valintaan"
+"edit.copyProperties" = "Kopioi ominaisuudet"
+"edit.cut" = "Leikkaa"
+"edit.delete" = "Poista"
+"edit.duplicate" = "Monista"
+"edit.findReplace" = "Etsi ja korvaa"
+"edit.paste" = "Liitä"
+"edit.pasteDesignLayers" = "Liitä suunnittelutasoja"
+"edit.pasteOver" = "Liitä valinnan päälle"
+"edit.pasteProperties" = "Liitä ominaisuudet"
+"edit.pasteReplace" = "Liitä korvaten"
+"edit.pickColor" = "Poimi väri"
+"edit.redo" = "Tee uudelleen"
+"edit.repeat" = "Toista viimeisin komento"
+"edit.setDefaultProperties" = "Aseta oletusominaisuudet"
+"edit.undo" = "Kumoa"
+"effect.add" = "Lisää tehoste"
+"effect.move" = "Siirrä tehoste"
+"effect.remove" = "Poista tehoste"
+"effect.set" = "Aseta tehoste"
+"export.add" = "Lisää vientiasetus"
+"export.remove" = "Poista vientiasetus"
+"export.update" = "Muokkaa vientiasetusta"
+"file.close" = "Sulje välilehti"
+"file.colorProfile" = "Väriprofiili"
+"file.duplicate" = "Monista tiedosto"
+"file.export" = "Vie"
+"file.exportFramesPdf" = "Vie kehykset PDF-muodossa"
+"file.exportLayers" = "Vie tasot"
+"file.exportSvg" = "Vie valinta SVG-muodossa"
+"file.import" = "Tuo"
+"file.moveTab" = "Siirrä välilehti"
+"file.new" = "Uusi suunnittelutiedosto"
+"file.newBoard" = "Uusi taulu"
+"file.newFromTemplate" = "Uusi mallista"
+"file.open" = "Avaa"
+"file.openRecent" = "Avaa viimeksi avattu"
+"file.placeImage" = "Sijoita kuva"
+"file.recover" = "Palauta tiedosto"
+"file.rename" = "Nimeä tiedosto uudelleen"
+"file.revert" = "Palauta tallennettu"
+"file.save" = "Tallenna"
+"file.saveAs" = "Tallenna nimellä"
+"file.saveVersion" = "Tallenna versiohistoriaan"
+"file.versionHistory" = "Näytä versiohistoria"
+"fill.add" = "Lisää täyttö"
+"fill.move" = "Siirrä täyttö"
+"fill.pattern" = "Kuviotäyttö"
+"fill.remove" = "Poista täyttö"
+"fill.set" = "Aseta täyttö"
+"frame.create" = "Luo kehys"
+"frame.presets" = "Luettele kehysten esiasetukset"
+"frame.swapOrientation" = "Vaihda suunta"
+"grid.add" = "Lisää asetteluruudukko"
+"grid.move" = "Siirrä asetteluruudukko"
+"grid.remove" = "Poista asetteluruudukko"
+"guide.add" = "Lisää apuviiva"
+"guide.clear" = "Poista kaikki apuviivat"
+"guide.move" = "Siirrä apuviiva"
+"guide.remove" = "Poista apuviiva"
+"guide.select" = "Valitse apuviiva"
+"help.about" = "Tietoja FigCraftista"
+"help.gettingStarted" = "Aloittaminen"
+"help.page" = "Ohjesivu"
+"help.shortcuts" = "Pikanäppäimet"
+"image.adjust" = "Säädä kuvaa"
+"image.deletePreset" = "Poista kuvan esiasetus"
+"image.place" = "Sijoita kuva"
+"image.presets" = "Kuvan esiasetukset"
+"image.savePreset" = "Tallenna kuvan esiasetus"
+"inspect.assets" = "Tarkastele resursseja"
+"inspect.code" = "Tason koodi"
+"inspect.componentCode" = "Komponentin koodi"
+"inspect.properties" = "Tarkastele ominaisuuksia"
+"inspect.readyForDev" = "Kehitysvalmis"
+"instance.create" = "Luo ilmentymä"
+"instance.exposed" = "Käyttöön tuodut sisäkkäiset ilmentymät"
+"instance.place" = "Sijoita ilmentymä"
+"instance.resetSlot" = "Palauta sisältöpaikka"
+"instance.setProperties" = "Aseta ilmentymän ominaisuudet"
+"instance.slotInsert" = "Lisää sisältöpaikkaan"
+"instance.swap" = "Vaihda ilmentymä"
+"instance.swapAt" = "Vaihda ilmentymä pisteessä"
+"layers.collapseAll" = "Supista tasot"
+"layout.add" = "Lisää automaattinen asettelu"
+"layout.remove" = "Poista automaattinen asettelu"
+"layout.setTrack" = "Aseta ruudukon osan koko"
+"layout.suggest" = "Ehdota automaattista asettelua"
+"libraries.open" = "Kirjastot"
+"libraries.publish" = "Julkaise kirjasto…"
+"library.acceptUpdates" = "Hyväksy kirjaston päivitykset"
+"library.add" = "Lisää kirjasto"
+"library.aliasVariable" = "Luo alias kirjastomuuttujaan"
+"library.applyStyle" = "Käytä kirjastotyyliä"
+"library.bindVariable" = "Sido kirjastomuuttuja"
+"library.extendCollection" = "Laajenna kirjastokokoelmaa"
+"library.import" = "Tuo kirjastokomponentti"
+"library.importVariable" = "Tuo kirjastomuuttuja"
+"library.list" = "Luettele kirjastot"
+"library.place" = "Sijoita kirjastokomponentti"
+"library.publish" = "Julkaise kirjasto"
+"library.publishToServer" = "Julkaise kirjasto palvelimelle"
+"library.remove" = "Poista kirjasto"
+"library.setVariableMode" = "Aseta kirjastomuuttujan tila"
+"library.swap" = "Vaihda kirjasto"
+"library.swapAt" = "Vaihda ilmentymä kirjastokomponenttiin"
+"library.updates" = "Kirjaston päivitykset"
+"library.usage" = "Kirjaston käyttö"
+"measure.distances" = "Mittaa etäisyyksiä"
+"measure.padding" = "Mittaa automaattisen asettelun sisämarginaali"
+"node.create" = "Luo taso"
+"node.get" = "Hae taso"
+"node.reorder" = "Muuta tason järjestystä"
+"node.reparent" = "Siirrä taso kohteeseen"
+"node.set" = "Aseta ominaisuudet"
+"object.batchRename" = "Nimeä joukko uudelleen"
+"object.convertToFrame" = "Muunna kehykseksi"
+"object.convertToGroup" = "Muunna ryhmäksi"
+"object.convertToSection" = "Muunna osioksi"
+"object.flipH" = "Peilaa vaakasuunnassa"
+"object.flipV" = "Peilaa pystysuunnassa"
+"object.frameSelection" = "Kehystä valinta"
+"object.group" = "Ryhmittele valinta"
+"object.hideOthers" = "Kätke muut tasot"
+"object.mask" = "Käytä maskina"
+"object.moveToPage" = "Siirrä sivulle"
+"object.opacityKeys" = "Peittävyys numeronäppäimillä"
+"object.rasterize" = "Rasteroi valinta"
+"object.releaseMask" = "Vapauta maski"
+"object.removeFill" = "Poista täyttö"
+"object.removeFrame" = "Poista kehys"
+"object.removeStroke" = "Poista reunaviiva"
+"object.rename" = "Nimeä uudelleen"
+"object.resizeToFit" = "Sovita koko"
+"object.rotate180" = "Kierrä 180°"
+"object.rotateLeft" = "Kierrä 90° vasemmalle"
+"object.rotateRight" = "Kierrä 90° oikealle"
+"object.setThumbnail" = "Aseta pikkukuvaksi"
+"object.swapFillStroke" = "Vaihda täyttö ja reunaviiva keskenään"
+"object.toggleLock" = "Lukitse/avaa valinnan lukitus"
+"object.toggleVisible" = "Näytä/kätke valinta"
+"object.ungroup" = "Pura valinnan ryhmittely"
+"object.wrapInSection" = "Ympäröi uudella osiolla"
+"page.add" = "Lisää sivu"
+"page.delete" = "Poista sivu"
+"page.duplicate" = "Monista sivu"
+"page.list" = "Luettele sivut"
+"page.move" = "Siirrä sivu"
+"page.rename" = "Nimeä sivu uudelleen"
+"page.select" = "Siirry sivulle"
+"page.setBackground" = "Sivun tausta"
+"paint.documentColors" = "Asiakirjan värit"
+"plugin.close" = "Sulje liitännäispaneeli"
+"plugin.directory.install" = "Asenna liitännäinen hakemistosta"
+"plugin.directory.list" = "Selaa liitännäishakemistoa"
+"plugin.directory.publish" = "Julkaise liitännäinen hakemistoon"
+"plugin.directory.unpublish" = "Peru liitännäisen julkaisu hakemistosta"
+"plugin.event" = "Käytä liitännäispaneelin säädintä"
+"plugin.import" = "Tuo liitännäinen manifestista…"
+"plugin.list" = "Luettele liitännäiset"
+"plugin.remove" = "Poista liitännäinen"
+"plugin.run" = "Suorita liitännäinen"
+"plugin.ui" = "Liitännäispaneeli"
+"plugins.manage" = "Hallitse liitännäisiä…"
+"plugins.runLast" = "Suorita viimeisin liitännäinen"
+"pref.autoSave" = "Tallenna tiedostot automaattisesti"
+"pref.highlightHover" = "Korosta tasot osoitettaessa"
+"pref.keepTool" = "Pidä työkalu valittuna käytön jälkeen"
+"pref.language" = "Käyttöliittymän kieli"
+"pref.nudge" = "Siirtoaskeleen koko"
+"pref.numberKeysOpacity" = "Säädä peittävyyttä numeronäppäimillä"
+"pref.publishServer" = "Verkkojakamisen palvelin"
+"pref.reduceMotion" = "Vähennä liikettä"
+"pref.renameDuplicates" = "Nimeä monistetut tasot uudelleen"
+"pref.showDimensions" = "Näytä objektien mitat"
+"pref.startOnHome" = "Aloita Aloitus-näkymästä"
+"pref.userName" = "Nimesi kommenteissa"
+"proto.action.add" = "Lisää prototyyppitoiminto"
+"proto.action.move" = "Muuta prototyyppitoimintojen järjestystä"
+"proto.action.remove" = "Poista prototyyppitoiminto"
+"proto.action.set" = "Muokkaa prototyyppitoimintoa"
+"proto.closePreview" = "Sulje prototyypin esikatselu"
+"proto.conditional.addBlock" = "Lisää muuten jos / muuten"
+"proto.conditional.removeBlock" = "Poista jos / muuten jos / muuten"
+"proto.conditional.setCondition" = "Muokkaa ehtoa"
+"proto.evaluate" = "Laske prototyyppilauseke"
+"proto.flow.add" = "Lisää kulun aloituspiste"
+"proto.flow.remove" = "Poista kulku"
+"proto.flow.rename" = "Nimeä kulku uudelleen"
+"proto.interaction.add" = "Lisää vuorovaikutus"
+"proto.interaction.clear" = "Poista kaikki vuorovaikutukset"
+"proto.interaction.remove" = "Poista vuorovaikutus"
+"proto.interaction.set" = "Muokkaa vuorovaikutusta"
+"proto.present" = "Esitä"
+"proto.presentOptions" = "Esityksen asetukset"
+"proto.preview" = "Avaa prototyypin esikatselu"
+"proto.settings" = "Prototyypin asetukset"
+"section.toggleContents" = "Kätke/näytä osion sisältö"
+"select.add" = "Lisää valintaan"
+"select.all" = "Valitse kaikki"
+"select.area" = "Valitse alue"
+"select.byName" = "Valitse tasoja nimen perusteella"
+"select.children" = "Valitse alikohteet"
+"select.inverse" = "Käännä valinta"
+"select.layersAt" = "Pisteessä olevat tasot"
+"select.matching" = "Valitse vastaavat tasot"
+"select.next" = "Valitse seuraava rinnakkaiskohde"
+"select.none" = "Poista valinta"
+"select.parent" = "Valitse emotaso"
+"select.previous" = "Valitse edellinen rinnakkaiskohde"
+"select.remove" = "Poista valinnasta"
+"select.sameEffect" = "Valitse sama tehoste"
+"select.sameFill" = "Valitse sama täyttö"
+"select.sameFont" = "Valitse sama fontti"
+"select.sameInstance" = "Valitse sama ilmentymä"
+"select.sameProperties" = "Valitse samat ominaisuudet"
+"select.sameStroke" = "Valitse sama reunaviiva"
+"select.sameText" = "Valitse samat tekstiominaisuudet"
+"select.set" = "Valitse"
+"selection.applyColorStyle" = "Käytä valinnan värityyliä"
+"selection.bindColorVariable" = "Käytä valinnan värimuuttujaa"
+"selection.colors" = "Valinnan värit"
+"selection.detachColor" = "Irrota valinnan väri"
+"selection.selectColor" = "Valitse tämänväriset tasot"
+"selection.setPaint" = "Muuta valinnan väriä"
+"shape.arrow" = "Nuoli"
+"shape.ellipse" = "Ellipsi"
+"shape.line" = "Viiva"
+"shape.polygon" = "Monikulmio"
+"shape.rectangle" = "Suorakulmio"
+"shape.star" = "Tähti"
+"shapeBuilder.merge" = "Yhdistä alueet"
+"shapeBuilder.mode" = "Muodonrakentimen tila"
+"shapeBuilder.regions" = "Muodonrakentimen alueet"
+"shapeBuilder.remove" = "Poista alueet"
+"stroke.add" = "Lisää reunaviiva"
+"stroke.brush" = "Sivellin"
+"stroke.move" = "Siirrä reunaviiva"
+"stroke.remove" = "Poista reunaviiva"
+"stroke.set" = "Aseta reunaviiva"
+"stroke.widthProfile" = "Leveysprofiili"
+"style.apply" = "Käytä tyyliä"
+"style.bind" = "Sido muuttuja tyylissä"
+"style.create" = "Luo tyyli"
+"style.delete" = "Poista tyyli"
+"style.detach" = "Irrota tyyli"
+"style.duplicate" = "Monista tyyli"
+"style.list" = "Luettele tyylit"
+"style.move" = "Siirrä tyylejä"
+"style.renameFolder" = "Nimeä tyylikansio uudelleen"
+"style.update" = "Muokkaa tyyliä"
+"template.list" = "Luettele mallit"
+"text.alignCenter" = "Keskitä"
+"text.alignJustify" = "Tasaa molemmat reunat"
+"text.alignLeft" = "Tasaa vasemmalle"
+"text.alignRight" = "Tasaa oikealle"
+"text.bold" = "Lihavointi"
+"text.bulletList" = "Luettelomerkitty luettelo"
+"text.case" = "Kirjainkoko"
+"text.caseLower" = "Pienet kirjaimet"
+"text.caseOriginal" = "Alkuperäinen kirjainkoko"
+"text.caseSmallCaps" = "Kapiteelit"
+"text.caseTitle" = "Sanojen isot alkukirjaimet"
+"text.caseUpper" = "Isot kirjaimet"
+"text.create" = "Teksti"
+"text.decoration" = "Koristelu"
+"text.edit.begin" = "Muokkaa tekstiä"
+"text.edit.caret" = "Aseta kohdistin"
+"text.edit.end" = "Lopeta tekstin muokkaus"
+"text.edit.insert" = "Kirjoita tekstiä"
+"text.edit.key" = "Tekstinäppäin"
+"text.edit.preedit" = "Koosta tekstiä (IME)"
+"text.edit.selectLine" = "Valitse rivi"
+"text.edit.selectWord" = "Valitse sana"
+"text.edit.selection" = "Tekstivalinta"
+"text.endPreview" = "Lopeta tekstin esikatselu"
+"text.fonts" = "Luettele fontit"
+"text.italic" = "Kursivointi"
+"text.lineHeightDown" = "Pienennä rivikorkeutta"
+"text.lineHeightUp" = "Suurenna rivikorkeutta"
+"text.link" = "Luo linkki"
+"text.listIndent" = "Sisennä luettelo"
+"text.listOutdent" = "Vähennä luettelon sisennystä"
+"text.listStyle" = "Luettelotyyli"
+"text.loadFont" = "Lataa fonttitiedosto"
+"text.maxLines" = "Rivien enimmäismäärä"
+"text.missingFonts" = "Puuttuvat fontit"
+"text.numberList" = "Numeroitu luettelo"
+"text.onPath" = "Teksti polulla"
+"text.paragraphIndent" = "Kappaleen sisennys"
+"text.paragraphSpacing" = "Kappaleväli"
+"text.pathOptions" = "Tekstipolun asetukset"
+"text.preview" = "Esikatsele tekstimuutosta"
+"text.refit" = "Sovita teksti fontteihin"
+"text.removeFromPath" = "Poista teksti polulta"
+"text.rescanFonts" = "Etsi asennetut fontit uudelleen"
+"text.set" = "Aseta teksti"
+"text.setFeatures" = "OpenType-ominaisuudet"
+"text.setVariations" = "Muuttuvan fontin akselit"
+"text.sizeDown" = "Pienennä fonttikokoa"
+"text.sizeUp" = "Suurenna fonttikokoa"
+"text.strikethrough" = "Yliviivaus"
+"text.style" = "Muotoile tekstialue"
+"text.trackingDown" = "Pienennä merkkiväliä"
+"text.trackingUp" = "Suurenna merkkiväliä"
+"text.underline" = "Alleviivaus"
+"text.weightDown" = "Vähennä fontin paksuutta"
+"text.weightUp" = "Lisää fontin paksuutta"
+"tool.arrow" = "Nuoli"
+"tool.comment" = "Kommentti"
+"tool.connector" = "Yhdistin"
+"tool.ellipse" = "Ellipsi"
+"tool.eraser" = "Pyyhekumi"
+"tool.frame" = "Kehys"
+"tool.hand" = "Käsi"
+"tool.highlighter" = "Korostuskynä"
+"tool.line" = "Viiva"
+"tool.marker" = "Tussi"
+"tool.move" = "Siirrä"
+"tool.pen" = "Kynä"
+"tool.pencil" = "Lyijykynä"
+"tool.pencilBrush" = "Lyijykynäsivellin"
+"tool.place" = "Sijoita työkalulla"
+"tool.polygon" = "Monikulmio"
+"tool.rectangle" = "Suorakulmio"
+"tool.scale" = "Skaalaus"
+"tool.scaleAnchor" = "Skaalauksen ankkuri"
+"tool.section" = "Osio"
+"tool.set" = "Valitse työkalu"
+"tool.shape" = "Muodot"
+"tool.shapeBuilder" = "Muodonrakennin"
+"tool.slice" = "Viipale"
+"tool.stamp" = "Leima"
+"tool.star" = "Tähti"
+"tool.sticky" = "Muistilappu"
+"tool.text" = "Teksti"
+"transform.move" = "Siirrä"
+"transform.moveTo" = "Siirrä kohteeseen"
+"transform.nudge" = "Siirrä askelittain"
+"transform.nudgeSize" = "Muuta kokoa askelittain"
+"transform.resize" = "Muuta kokoa"
+"transform.rotate" = "Kierrä"
+"transform.rotationOrigin" = "Siirrä kiertokeskipistettä"
+"transform.scale" = "Skaalaus"
+"transform.setRotationOrigin" = "Aseta kiertokeskipiste"
+"variable.addMode" = "Lisää tila"
+"variable.bind" = "Sido muuttuja"
+"variable.create" = "Luo muuttuja"
+"variable.createCollection" = "Luo muuttujakokoelma"
+"variable.delete" = "Poista muuttuja"
+"variable.deleteCollection" = "Poista kokoelma"
+"variable.duplicate" = "Monista muuttuja"
+"variable.export" = "Vie muuttujat"
+"variable.import" = "Tuo muuttujat"
+"variable.list" = "Luettele muuttujat"
+"variable.moveMode" = "Siirrä tila"
+"variable.removeMode" = "Poista tila"
+"variable.renameCollection" = "Nimeä kokoelma uudelleen"
+"variable.renameMode" = "Nimeä tila uudelleen"
+"variable.resetOverride" = "Palauta muuttujan ohitus"
+"variable.set" = "Aseta muuttujan arvo"
+"variable.setMode" = "Aseta muuttujan tila"
+"variable.update" = "Muokkaa muuttujaa"
+"vector.create" = "Vektori"
+"vector.deleteHeal" = "Poista ja korjaa valinta"
+"vector.edit.addVertex" = "Lisää piste"
+"vector.edit.begin" = "Muokkaa vektoria"
+"vector.edit.bend" = "Taivuta segmenttiä"
+"vector.edit.bounds" = "Valittujen pisteiden rajat"
+"vector.edit.connect" = "Yhdistä pisteet"
+"vector.edit.cornerRadius" = "Pisteen kulmasäde"
+"vector.edit.cut" = "Leikkaa polku"
+"vector.edit.delete" = "Poista pisteet"
+"vector.edit.end" = "Lopeta muokkaus"
+"vector.edit.erase" = "Pyyhi"
+"vector.edit.lasso" = "Valitse lassolla"
+"vector.edit.mirroring" = "Kahvojen peilaus"
+"vector.edit.moveHandles" = "Siirrä kahvoja"
+"vector.edit.moveVertices" = "Siirrä pisteitä"
+"vector.edit.nudge" = "Siirrä pisteitä askelittain"
+"vector.edit.paint" = "Maalipurkki"
+"vector.edit.pen" = "Kynän piste"
+"vector.edit.penEnd" = "Päätä kynäpolku"
+"vector.edit.position" = "Pisteen sijainti"
+"vector.edit.resize" = "Muuta pisteiden kokoa"
+"vector.edit.rotate" = "Kierrä pisteitä"
+"vector.edit.select" = "Valitse pisteitä"
+"vector.edit.selectAll" = "Valitse kaikki pisteet"
+"vector.edit.setHandle" = "Aseta kahva"
+"vector.edit.smooth" = "Pehmennä tai terävöitä pisteitä"
+"vector.edit.state" = "Vektorimuokkauksen tila"
+"vector.edit.strokeCap" = "Pisteen viivanpää"
+"vector.edit.strokeJoin" = "Pisteen viivaliitos"
+"vector.edit.tool" = "Vektorimuokkauksen työkalu"
+"vector.edit.transform" = "Muunna pisteitä"
+"vector.edit.widthPoint" = "Leveyspiste"
+"vector.flatten" = "Yhdistä vektorimuodoksi"
+"vector.join" = "Yhdistä valinta"
+"vector.offset" = "Siirrä polun reunaa"
+"vector.outlineStroke" = "Muunna reunaviiva poluksi"
+"vector.reverse" = "Käännä polun suunta"
+"vector.simplify" = "Yksinkertaista vektori"
+"vector.smoothJoin" = "Yhdistä valinta pehmeästi"
+"version.autosave" = "Tallenna versio automaattisesti"
+"version.delete" = "Poista versio"
+"version.duplicate" = "Monista versio"
+"version.exitPreview" = "Takaisin nykyiseen versioon"
+"version.list" = "Luettele versiot"
+"version.preview" = "Katsele versiota"
+"version.rename" = "Nimeä versio uudelleen"
+"version.restore" = "Palauta versio"
+"view.assets" = "Resurssipaneeli"
+"view.comments" = "Kommentit"
+"view.contextMenu" = "Näytä pikavalikko"
+"view.design" = "Suunnittelupaneeli"
+"view.designPrototype" = "Vaihda suunnittelun ja prototyypin välillä"
+"view.devMode" = "Kehittäjätila"
+"view.frameOutlines" = "Kehysten ääriviivat"
+"view.fullscreen" = "Koko näyttö"
+"view.get" = "Hae näkymä"
+"view.layers" = "Tasopaneeli"
+"view.layoutGrids" = "Asetteluruudukot"
+"view.leftSidebar" = "Näytä/kätke vasen sivupalkki"
+"view.maskOutlines" = "Maskien ääriviivat"
+"view.multiplayerCursors" = "Yhteiskäytön kohdistimet"
+"view.nextFrame" = "Zoomaa seuraavaan kehykseen"
+"view.nextPage" = "Seuraava sivu"
+"view.nextRegion" = "Kohdista seuraava alue"
+"view.outlines" = "Ääriviivat"
+"view.outlinesHiddenLayers" = "Sisällytä kätketyt tasot ääriviivoihin"
+"view.outlinesObjectBounds" = "Sisällytä objektien rajat ääriviivoihin"
+"view.outlinesSelection" = "Valinnan ääriviivat"
+"view.pan" = "Siirrä näkymää"
+"view.panelWidths" = "Palauta paneelien leveydet"
+"view.pixelGrid" = "Pikseliruudukko"
+"view.pixelPreview" = "Pikseliesikatselu"
+"view.prevFrame" = "Zoomaa edelliseen kehykseen"
+"view.prevPage" = "Edellinen sivu"
+"view.previousRegion" = "Kohdista edellinen alue"
+"view.proofSrgb" = "sRGB-vedossimulointi"
+"view.prototype" = "Prototyyppipaneeli"
+"view.rulers" = "Viivaimet"
+"view.set" = "Aseta näkymä"
+"view.slices" = "Viipaleet"
+"view.snapGeometry" = "Tartu geometriaan"
+"view.snapObjects" = "Tartu objekteihin"
+"view.snapPixel" = "Tartu pikseliruudukkoon"
+"view.themeDark" = "Tumma teema"
+"view.themeLight" = "Vaalea teema"
+"view.themeSystem" = "Seuraa järjestelmän teemaa"
+"view.toggleUi" = "Näytä/kätke käyttöliittymä"
+"view.zoom100" = "Zoomaa kokoon 100 %"
+"view.zoom200" = "Zoomaa kokoon 200 %"
+"view.zoom50" = "Zoomaa kokoon 50 %"
+"view.zoomAt" = "Zoomaustyökalu"
+"view.zoomFit" = "Sovita näkymään"
+"view.zoomIn" = "Lähennä"
+"view.zoomOut" = "Loitonna"
+"view.zoomSelection" = "Zoomaa valintaan"
+"widget.click" = "Napsauta pienoisohjelmaa"
+"widget.insert" = "Lisää pienoisohjelma"
+"widget.list" = "Luettele pienoisohjelmat"
+"widget.menu" = "Pienoisohjelman valikko"
+"widget.setText" = "Muokkaa pienoisohjelman kenttää"
+"window.focus" = "Tuo ikkuna etummaiseksi"
+"window.new" = "Uusi ikkuna"
+
+[menu]
+"bool.exclude" = "Jätä pois"
+"bool.flatten" = "Yhdistä vektorimuodoksi"
+"bool.intersect" = "Leikkaus"
+"bool.subtract" = "Vähennä"
+"bool.union" = "Yhdiste"
+"file.duplicate" = "Monista"
+"file.import" = "Tuo tiedostosta…"
+"file.rename" = "Nimeä uudelleen"
+"libraries.open" = "Avaa kirjastot"
+"select.sameEffect" = "Tehoste"
+"select.sameFill" = "Täyttö"
+"select.sameFont" = "Fontti"
+"select.sameInstance" = "Ilmentymä"
+"select.sameProperties" = "Ominaisuudet"
+"select.sameStroke" = "Reunaviiva"
+"select.sameText" = "Tekstiominaisuudet"
+"text.alignCenter" = "Keskitä teksti"
+"text.alignJustify" = "Tasaa tekstin molemmat reunat"
+"text.alignLeft" = "Tasaa teksti vasemmalle"
+"text.alignRight" = "Tasaa teksti oikealle"
+"view.assets" = "Resurssit"
+"view.design" = "Suunnittelu"
+"view.layers" = "Tasot"
+"view.outlines" = "Näytä ääriviivat"
+"view.outlinesHiddenLayers" = "Sisällytä kätketyt tasot"
+"view.outlinesObjectBounds" = "Sisällytä objektien rajat"
+"view.outlinesSelection" = "Näytä valinnan ääriviivat"
+"view.prototype" = "Prototyyppi"
+"view.themeDark" = "Tumma"
+"view.themeLight" = "Vaalea"
+"view.themeSystem" = "Seuraa järjestelmää"
diff --git a/crates/ui-egui/locales/fr.toml b/crates/ui-egui/locales/fr.toml
index ae0030a2..f8c6c8f0 100644
--- a/crates/ui-egui/locales/fr.toml
+++ b/crates/ui-egui/locales/fr.toml
@@ -17,8 +17,12 @@ status = "draft — needs native review"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login} : {prs} PR, {commits} commits, +{added} / −{deleted} lignes (Δ {delta}), +{bin_added} / −{bin_deleted} ressources binaires, {first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Une collection de ce fichier avec ces modes et ces variables : remplacez leurs valeurs par mode et ajoutez vos propres variables"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Un fichier .figcraft portant ce nom existe déjà. Choisissez son nom complet pour confirmer le remplacement."
 "A layer on its own aligns to its frame: select more layers, or one in a frame" = "Un calque seul s’aligne sur son cadre : sélectionnez d’autres calques, ou un calque dans un cadre"
+"A responsive product page: hero, features, figures, a quote and a footer" = "Une page produit responsive : héros, fonctionnalités, chiffres, une citation et un pied de page"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "Un ressort joue jusqu’à ce qu’il se stabilise : sa masse, sa rigidité et son amortissement en fixent la durée"
+"A title, an agenda, a big figure, a chart and a closing slide" = "Un titre, un sommaire, un grand chiffre, un graphique et une diapositive de clôture"
+"A to Z" = "A à Z"
 "About" = "À propos"
 "About FigCraft" = "À propos de FigCraft"
 "About this server" = "À propos de ce serveur"
@@ -33,6 +37,7 @@ status = "draft — needs native review"
 "Add a description" = "Ajouter une description"
 "Add a frame (F) or a shape (R) to get started" = "Ajoutez un cadre (F) ou une forme (R) pour commencer"
 "Add a layer or component to tile first" = "Ajoutez d’abord un calque ou un composant à répéter en mosaïque"
+"Add a minute" = "Ajouter une minute"
 "Add a note for developers" = "Ajouter une note pour les développeurs"
 "Add action" = "Ajouter une action"
 "Add actions for when no condition holds" = "Ajouter des actions pour le cas où aucune condition n’est remplie"
@@ -40,6 +45,7 @@ status = "draft — needs native review"
 "Add another condition" = "Ajouter une autre condition"
 "Add auto layout" = "Ajouter la mise en page auto"
 "Add background behind overlay" = "Ajouter un fond derrière la superposition"
+"Add column" = "Ajouter une colonne"
 "Add content to this slot" = "Ajouter du contenu à cet emplacement"
 "Add dev resource" = "Ajouter une ressource de développement"
 "Add effect" = "Ajouter un effet"
@@ -51,6 +57,7 @@ status = "draft — needs native review"
 "Add library file…" = "Ajouter un fichier de bibliothèque…"
 "Add max height" = "Ajouter une hauteur max."
 "Add max width" = "Ajouter une largeur max."
+"Add measurement" = "Ajouter une mesure"
 "Add min height" = "Ajouter une hauteur min."
 "Add min width" = "Ajouter une largeur min."
 "Add mode" = "Ajouter un mode"
@@ -58,12 +65,14 @@ status = "draft — needs native review"
 "Add or update collections from a variables JSON" = "Ajouter ou mettre à jour des collections depuis un JSON de variables"
 "Add properties to make instances configurable" = "Ajoutez des propriétés pour rendre les instances configurables"
 "Add reaction" = "Ajouter une réaction"
+"Add row" = "Ajouter une ligne"
 "Add starting point" = "Ajouter un point de départ"
 "Add stroke" = "Ajouter un contour"
 "Add variant" = "Ajouter une variante"
 "Add variant with a new value" = "Ajouter une variante avec une nouvelle valeur"
 "Added" = "Ajouté"
 "Added the library \"{name}\"" = "Bibliothèque « {name} » ajoutée"
+"Adding to {name}" = "Ajout dans {name}"
 "Adjust" = "Réglages"
 "Adjustment presets" = "Préréglages"
 "Advanced" = "Avancé"
@@ -86,10 +95,17 @@ status = "draft — needs native review"
 "All comments" = "Tous les commentaires"
 "All components" = "Tous les composants"
 "All fonts" = "Toutes les polices"
+"All objects" = "Tous les objets"
 "All supported properties" = "Toutes les propriétés prises en charge"
 "All variables" = "Toutes les variables"
+"Along the bottom" = "Le long du bord inférieur"
+"Along the left" = "Le long du bord gauche"
+"Along the right" = "Le long du bord droit"
+"Along the top" = "Le long du bord supérieur"
 "Alpha" = "Alpha"
+"Alphabetical" = "Alphabétique"
 "Alt+drag" = "Alt+glisser"
+"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "Un écran d’analyse sur une grille : chiffres, graphiques tracés en vectoriel et un tableau"
 "An invite link that opens FigCraft and joins" = "Un lien d’invitation qui ouvre FigCraft et rejoint la session"
 "Anchor" = "Ancre"
 "Android" = "Android"
@@ -108,6 +124,8 @@ status = "draft — needs native review"
 "Apply variable" = "Appliquer une variable"
 "Apply variable to text" = "Appliquer une variable au texte"
 "Apply variable to visibility" = "Appliquer une variable à la visibilité"
+"Apps" = "Applications"
+"Apr" = "avr."
 "Arc" = "Arc"
 "Arc ratio" = "Rapport de l’arc"
 "Arc start" = "Début de l’arc"
@@ -116,9 +134,11 @@ status = "draft — needs native review"
 "Archived" = "Archivée"
 "Arrange" = "Disposer"
 "Arrow" = "Flèche"
+"Arrow at the end" = "Flèche à la fin"
 "As typed" = "Tel que saisi"
 "Asking the server…" = "Interrogation du serveur…"
 "Assets" = "Ressources"
+"Aug" = "août"
 "Auto" = "Auto"
 "Auto (space around)" = "Auto (espace autour)"
 "Auto (space between)" = "Auto (espace entre)"
@@ -138,7 +158,7 @@ status = "draft — needs native review"
 "Back to assets" = "Retour aux ressources"
 "Back to current" = "Revenir à l’actuelle"
 "Back to styles" = "Retour aux styles"
-"Back to the canvas from a focused region" = "Revenir au canevas depuis une région active"
+"Back to the canvas from a focused region" = "Revenir au canevas depuis une région qui a le focus"
 "Back to the current version" = "Revenir à la version actuelle"
 "Back to the values the font style implies" = "Revenir aux valeurs du style de police"
 "Background" = "Arrière-plan"
@@ -146,6 +166,7 @@ status = "draft — needs native review"
 "Basics" = "Essentiel"
 "Before" = "Avant"
 "Bend" = "Courber"
+"Between the selected layers" = "Entre les calques sélectionnés"
 "Bevel" = "Biseau"
 "Binary assets added" = "Ressources binaires ajoutées"
 "Binary assets removed" = "Ressources binaires supprimées"
@@ -163,6 +184,8 @@ status = "draft — needs native review"
 "Bottom" = "Bas"
 "Bottom left radius" = "Rayon inférieur gauche"
 "Bottom right radius" = "Rayon inférieur droit"
+"Bound to {name}. Click to detach the variable." = "Lié à {name}. Cliquez pour détacher la variable."
+"Brainstorm" = "Remue-méninges"
 "Branch" = "Branche"
 "Branch archived" = "Branche archivée"
 "Branch merged" = "Branche fusionnée"
@@ -173,7 +196,7 @@ status = "draft — needs native review"
 "Branch {name}" = "Branche {name}"
 "Branches" = "Branches"
 "Bring forward" = "Avancer"
-"Bring the main file's changes into the branch" = "Apporte dans la branche les modifications du fichier principal"
+"Bring the main file's changes into the branch" = "Apporter dans la branche les modifications du fichier principal"
 "Bring to front" = "Mettre au premier plan"
 "Bristle" = "Soies"
 "Browse" = "Parcourir"
@@ -187,8 +210,12 @@ status = "draft — needs native review"
 "C or ⇧C" = "C ou ⇧C"
 "CMYK colour" = "Couleur CMJN"
 "Can view" = "Peut consulter"
+"Check" = "Coche"
 "Checking the server…" = "Vérification auprès du serveur…"
+"Chevron" = "Chevron"
 "Clear from this list" = "Effacer de cette liste"
+"Clear results" = "Effacer les résultats"
+"Click objects to vote; click your badge to take a vote back" = "Cliquez sur des objets pour voter ; cliquez sur votre badge pour retirer un vote"
 "Code or invite link" = "Code ou lien d’invitation"
 "Color profile: {name}" = "Profil colorimétrique : {name}"
 "CSS custom properties…" = "Propriétés personnalisées CSS…"
@@ -212,7 +239,7 @@ status = "draft — needs native review"
 "Changes on main" = "Modifications dans le fichier principal"
 "Changes on the branch" = "Modifications dans la branche"
 "Changes unknown" = "Modifications inconnues"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "Choisissez React, Leptos, SwiftUI, Compose ou Flutter ci-dessus pour relier ce composant à son code."
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Choisissez React, Leptos, Vue, SwiftUI, Compose, ArkUI ou Flutter ci-dessus pour relier ce composant à son code."
 "Choose another profile to change it." = "Choisissez un autre profil pour le changer."
 "Choose collection" = "Choisir une collection"
 "Choose image" = "Choisir une image"
@@ -233,7 +260,6 @@ status = "draft — needs native review"
 "Close tab" = "Fermer l’onglet"
 "Close version history" = "Fermer l’historique des versions"
 "Close when clicking outside" = "Fermer en cliquant à l’extérieur"
-"Close without saving" = "Fermer sans enregistrer"
 "Code" = "Code"
 "Code syntax" = "Syntaxe du code"
 "Collapse" = "Réduire"
@@ -241,14 +267,15 @@ status = "draft — needs native review"
 "Collection" = "Collection"
 "Collections" = "Collections"
 "Color" = "Couleur"
-"Color burn" = "Brûlage de couleur"
-"Color dodge" = "Éclaircissement de couleur"
+"Color burn" = "Densité couleur +"
+"Color dodge" = "Densité couleur −"
 "Color format" = "Format de couleur"
 "Color profile" = "Profil colorimétrique"
 "Color styles" = "Styles de couleur"
 "Color values in this file are in this color space." = "Les valeurs de couleur de ce fichier sont dans cet espace colorimétrique."
 "Color variables" = "Variables de couleur"
 "Colour" = "Couleur"
+"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Styles de couleur et de texte, variables Clair et Sombre, boutons, champs et cartes"
 "Column" = "Colonne"
 "Column gap" = "Espacement des colonnes"
 "Column sizes" = "Tailles des colonnes"
@@ -260,6 +287,8 @@ status = "draft — needs native review"
 "Commits" = "Commits"
 "Company" = "Entreprise"
 "Compare changes" = "Comparer les modifications"
+"Compare with" = "Comparer avec"
+"Compatibility notes" = "Notes de compatibilité"
 "Completed" = "Terminé"
 "Component" = "Composant"
 "Component name" = "Nom du composant"
@@ -274,16 +303,18 @@ status = "draft — needs native review"
 "Connected" = "Connecté"
 "Connected to code: {from}" = "Relié au code : {from}"
 "Connection lost, reconnecting (attempt {attempt})…" = "Connexion perdue, reconnexion (tentative {attempt})…"
+"Connector" = "Connecteur"
 "Constrain proportions" = "Conserver les proportions"
 "Constraints" = "Contraintes"
 "Content" = "Contenu"
 "Contents hidden" = "Contenu masqué"
-"Contents only" = "Contenu uniquement"
 "Contextual alternates" = "Variantes contextuelles"
 "Contrast" = "Contraste"
 "Contributors" = "Contributeurs"
 "Contributors: {people} · Commits: {commits}" = "Contributeurs : {people} · Commits : {commits}"
 "Controller" = "Manette"
+"Convert to frame" = "Convertir en cadre"
+"Convert to section" = "Convertir en section"
 "Cool" = "Froid"
 "Copied as CSS" = "Copié en CSS"
 "Copied as PNG" = "Copié en PNG"
@@ -302,8 +333,10 @@ status = "draft — needs native review"
 "Corner radius" = "Rayon d’angle"
 "Corner smoothing" = "Lissage des angles"
 "Couldn't download the variables" = "Impossible de télécharger les variables"
-"Couldn't reach {server}: showing what this computer remembers." = "Impossible de joindre {server} : affichage de ce dont cet ordinateur se souvient."
+"Couldn't reach {server}: showing what this computer remembers." = "Impossible de joindre {server} : affichage de ce dont cet ordinateur se souvient."
+"Couldn't read {name}." = "Impossible de lire {name}."
 "Couldn't save automatically: {error}" = "Impossible d’enregistrer automatiquement : {error}"
+"Couldn't save the file" = "Impossible d’enregistrer le fichier"
 "Count" = "Nombre"
 "Create" = "Créer"
 "Create a variable collection first" = "Créez d’abord une collection de variables"
@@ -317,6 +350,7 @@ status = "draft — needs native review"
 "Create property…" = "Créer une propriété…"
 "Create style" = "Créer un style"
 "Create style from the selected text" = "Créer un style à partir du texte sélectionné"
+"Created" = "Création"
 "Crop" = "Recadrer"
 "Crop marks" = "Traits de coupe"
 "Ctrl+arrows" = "Ctrl+flèches"
@@ -326,10 +360,14 @@ status = "draft — needs native review"
 "Current version" = "Version actuelle"
 "Cursor chat" = "Chat au curseur"
 "Custom" = "Personnalisé"
+"Custom size" = "Taille personnalisée"
 "Cut" = "Couper"
 "Dark" = "Sombre"
 "Darken" = "Assombrir"
 "Dash" = "Tirets"
+"Dashboard" = "Tableau de bord"
+"Date created" = "Date de création"
+"Dec" = "déc."
 "Decoration style" = "Style de décoration"
 "Decoration" = "Décoration"
 "Deep select" = "Sélection en profondeur"
@@ -356,6 +394,8 @@ status = "draft — needs native review"
 "Description" = "Description"
 "Description (optional)" = "Description (facultative)"
 "Design" = "Design"
+"Design panel" = "Panneau Design"
+"Design system starter" = "Base de système de design"
 "Desktop" = "Ordinateur"
 "Destination" = "Destination"
 "Detach alias" = "Détacher l’alias"
@@ -366,6 +406,7 @@ status = "draft — needs native review"
 "Detach variable" = "Détacher la variable"
 "Details" = "Détails"
 "Dev Mode" = "Mode Dev"
+"Dev Mode only inspects: switch to Design (Shift+D) to edit" = "Le mode Dev sert seulement à inspecter : passez en Design (Shift+D) pour modifier"
 "Dev resources" = "Ressources de développement"
 "Development" = "Développement"
 "Device" = "Appareil"
@@ -382,6 +423,7 @@ status = "draft — needs native review"
 "Distribute horizontal spacing" = "Répartir l’espacement horizontal"
 "Distribute vertical spacing" = "Répartir l’espacement vertical"
 "Divider" = "Séparateur"
+"Don't Save" = "Ne pas enregistrer"
 "Don't truncate" = "Ne pas tronquer"
 "Done" = "Terminé"
 "Done editing" = "Terminer la modification"
@@ -391,8 +433,12 @@ status = "draft — needs native review"
 "Drafts" = "Brouillons"
 "Drag the stroke to add a width point" = "Faites glisser le contour pour ajouter un point de largeur"
 "Draw" = "Dessin"
+"Draw a frame" = "Tracer un cadre"
 "Drawing tools" = "Outils de dessin"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Déposez un fichier .figcraft, .fig, .sketch, .json, .svg ou une image."
 "Drop shadow" = "Ombre portée"
+"Drop to import" = "Déposer pour importer"
+"Drop to open" = "Déposer pour ouvrir"
 "Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "Double licence MIT OR Apache-2.0. Réalisé par l’équipe et la communauté ArtCraft."
 "Duo" = "Duo"
 "Duplicate" = "Dupliquer"
@@ -409,9 +455,12 @@ status = "draft — needs native review"
 "Edit style" = "Modifier le style"
 "Edit variable" = "Modifier la variable"
 "Edit with the builder" = "Modifier avec l’assistant"
+"Edited {when}" = "Modifié {when}"
 "Effect settings" = "Réglages de l’effet"
 "Effect styles" = "Styles d’effet"
 "Effects" = "Effets"
+"Curved" = "Courbe"
+"Elbow" = "Coudé"
 "Ellipse" = "Ellipse"
 "Ellipses" = "Ellipses"
 "Else" = "Sinon"
@@ -420,14 +469,15 @@ status = "draft — needs native review"
 "Empty" = "Vide"
 "End" = "Fin"
 "End point" = "Point final"
-"Ends the session; everyone keeps their copy" = "Met fin à la session ; chacun conserve sa copie"
+"End vote" = "Terminer le vote"
+"Ends the session; everyone keeps their copy" = "Met fin à la session ; chacun conserve sa copie"
 "Enter" = "Entrée"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Saisissez l’adresse d’un figcraft-server et appuyez sur Parcourir pour voir les plugins qu’il propose."
 "Enter to save · Esc to cancel" = "Entrée pour enregistrer · Échap pour annuler"
 "Eraser" = "Gomme"
 "Esc" = "Échap"
 "Essential" = "Essentiels"
-"Every conflict has a choice." = "Chaque conflit a un choix."
+"Every conflict has a choice." = "Un choix est fait pour chaque conflit."
 "Every top-level frame already starts a flow" = "Chaque cadre de premier niveau démarre déjà un flux"
 "Exact opacity (4 then 5: 45%)" = "Opacité exacte (4 puis 5 : 45 %)"
 "Exclude" = "Exclure"
@@ -439,14 +489,15 @@ status = "draft — needs native review"
 "Expand" = "Développer"
 "Export" = "Exporter"
 "Export all" = "Tout exporter"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "Exporter les cadres et les calques en PNG, JPG, SVG ou PDF"
 "Export page as PNG" = "Exporter la page en PNG"
 "Export settings" = "Réglages d’exportation"
 "Export variables" = "Exporter les variables"
 "Export {name}" = "Exporter {name}"
 "Export {n} layers" = { one = "Exporter {n} calque", other = "Exporter {n} calques" }
-"Exported {file}" = "Exporté : {file}"
+"Exported {file}" = "{file} exporté"
 "Exported {name}" = "{name} exporté"
-"Exported {name}; {n} kinds of content were left out" = { one = "{name} exporté ; {n} type de contenu a été omis", other = "{name} exporté ; {n} types de contenu ont été omis" }
+"Exported {name}; {n} kinds of content were left out" = { one = "{name} exporté ; {n} type de contenu a été omis", other = "{name} exporté ; {n} types de contenu ont été omis" }
 "Exported {n} files" = { one = "{n} fichier exporté", other = "{n} fichiers exportés" }
 "Export…" = "Exporter…"
 "Expose properties to instances" = "Exposer les propriétés aux instances"
@@ -458,12 +509,15 @@ status = "draft — needs native review"
 "F" = "F"
 "Fade" = "Fondu"
 "False" = "Faux"
+"Feb" = "févr."
 "Fetching from the server…" = "Récupération depuis le serveur…"
 "FigCraft couldn't open its window: {error}" = "FigCraft n’a pas pu ouvrir sa fenêtre : {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft ne prend pas encore en charge toutes les fonctionnalités de ces fichiers. Les notes indiquent ce qui a été omis ou modifié dans la copie importée ; le fichier d’origine reste inchangé."
 "File" = "Fichier"
 "File name" = "Nom du fichier"
+"File not found" = "Fichier introuvable"
 "File published" = "Fichier publié"
-"Files aren't end-to-end encrypted: the server's operator can read them." = "Les fichiers ne sont pas chiffrés de bout en bout : l’opérateur du serveur peut les lire."
+"Files aren't end-to-end encrypted: the server's operator can read them." = "Les fichiers ne sont pas chiffrés de bout en bout : l’opérateur du serveur peut les lire."
 "Files nobody opens for {n} days are deleted." = { one = "Les fichiers que personne n’ouvre pendant {n} jour sont supprimés.", other = "Les fichiers que personne n’ouvre pendant {n} jours sont supprimés." }
 "Fill" = "Remplissage"
 "Fill (fr)" = "Remplir (fr)"
@@ -492,6 +546,7 @@ status = "draft — needs native review"
 "Flip text to the other side" = "Passer le texte de l’autre côté"
 "Flip vertical" = "Retourner verticalement"
 "Flip width profile" = "Inverser le profil de largeur"
+"Flow chart" = "Logigramme"
 "Flow starting point" = "Point de départ du flux"
 "Flow starting points" = "Points de départ de flux"
 "Flows" = "Flux"
@@ -508,6 +563,7 @@ status = "draft — needs native review"
 "Font size" = "Taille de police"
 "Font style" = "Style de police"
 "Forget on this computer" = "Oublier sur cet ordinateur"
+"Four screens of a trail app with components and a prototype flow" = "Quatre écrans d’une application de randonnée avec des composants et un flux de prototype"
 "Fractions" = "Fractions"
 "Frame" = "Cadre"
 "Frame selection" = "Encadrer la sélection"
@@ -521,6 +577,7 @@ status = "draft — needs native review"
 "Gap between columns" = "Espacement entre les colonnes"
 "Gap between items" = "Espacement entre les éléments"
 "Gap between rows" = "Espacement entre les lignes"
+"Getting started" = "Premiers pas"
 "Give the address of a server open to the public, or a server's address with its key (`figcraft-server key` prints it)." = "Indiquez l’adresse d’un serveur ouvert au public, ou l’adresse d’un serveur avec sa clé (`figcraft-server key` l’affiche)."
 "Glass" = "Verre"
 "Go to main component" = "Aller au composant principal"
@@ -529,6 +586,7 @@ status = "draft — needs native review"
 "Gradient" = "Dégradé"
 "Gray" = "Gris"
 "Green" = "Vert"
+"Greyscale components and two example screens to sketch a flow with" = "Composants en niveaux de gris et deux écrans d’exemple pour esquisser un flux"
 "Grid" = "Grille"
 "Grid ({size})" = "Grille ({size})"
 "Grid styles" = "Styles de grille"
@@ -538,19 +596,23 @@ status = "draft — needs native review"
 "Groups" = "Groupes"
 "Gutter" = "Gouttière"
 "Hand tool" = "Outil Main"
-"Hanging list" = "Liste en retrait"
+"Hanging list" = "Liste à retrait suspendu"
 "Hanging punctuation" = "Ponctuation en débord"
 "Hard light" = "Lumière dure"
+"Heart" = "Cœur"
 "Height" = "Hauteur"
 "Help" = "Aide"
 "Help and resources" = "Aide et ressources"
 "Help page" = "Page d’aide"
-"Here: {names}" = "Présents : {names}"
+"Here: {names}" = "Présents : {names}"
 "Hidden" = "Masqué"
 "Hide contents" = "Masquer le contenu"
 "Hide from publishing" = "Exclure de la publication"
 "Hide section contents" = "Masquer le contenu de la section"
+"Hide these tips (Getting started in the Help menu shows them again)" = "Masquer ces astuces (Premiers pas dans le menu Aide les affiche de nouveau)"
+"Hide when publishing" = "Masquer à la publication"
 "Highlight layers on hover" = "Mettre en évidence les calques au survol"
+"Highlighter" = "Surligneur"
 "Highlights" = "Hautes lumières"
 "Hold Alt" = "Maintenir Alt"
 "Hold Alt+Z" = "Maintenir Alt+Z"
@@ -571,16 +633,22 @@ status = "draft — needs native review"
 "Hue" = "Teinte"
 "Hug" = "Ajuster"
 "Hug contents" = "Ajuster au contenu"
+"Icon components on a 24 px grid with keylines and a size preview" = "Composants d’icônes sur une grille de 24 px avec repères et aperçu de la taille"
+"Icon set starter" = "Base de jeu d’icônes"
 "If it keeps happening, please report it at {link} with this message." = "Si cela se reproduit, signalez-le sur {link} avec ce message."
 "If" = "Si"
 "If {condition}" = "Si {condition}"
 "Ignore auto layout (absolute position)" = "Ignorer la mise en page auto (position absolue)"
+"Ignore overlapping layers" = "Ignorer les calques superposés"
 "Image" = "Image"
+"Images" = "Images"
 "Import" = "Importer"
 "Import path" = "Chemin d’importation"
 "Import plugin from manifest" = "Importer un plugin depuis un manifeste"
 "Import plugin from manifest…" = "Importer un plugin depuis un manifeste…"
+"Import report" = "Rapport d’importation"
 "Import variables" = "Importer des variables"
+"Imported document" = "Document importé"
 "Imported {name}" = "{name} importé"
 "Imported {n} new variables, updated {updated}" = { one = "{n} nouvelle variable importée, {updated} mises à jour", other = "{n} nouvelles variables importées, {updated} mises à jour" }
 "Import…" = "Importer…"
@@ -608,14 +676,18 @@ status = "draft — needs native review"
 "Instance swap (no other component)" = "Permutation d’instance (aucun autre composant)"
 "Instances" = "Instances"
 "Instant" = "Instantané"
+"Intensity" = "Intensité"
 "Interaction" = "Interaction"
 "Interactions" = "Interactions"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Design d’interfaces et prototypage. Un outil de design libre et gratuit, développé en salle blanche (clean-room) et écrit de zéro en Rust, membre des Crafting Apps d’ArtCraft."
+"Interface size" = "Taille de l’interface"
 "Intersect" = "Intersection"
 "Intersects" = "Intersections"
+"Invalid color" = "Couleur non valide"
 "Invite link" = "Lien d’invitation"
 "Invite link copied" = "Lien d’invitation copié"
 "It asks permission to:" = "Il demande l’autorisation de :"
+"Jan" = "janv."
 "Join" = "Rejoindre"
 "Join code copied" = "Code d’accès copié"
 "Join code or invite link" = "Code d’accès ou lien d’invitation"
@@ -625,9 +697,13 @@ status = "draft — needs native review"
 "Joined" = "Connecté"
 "Joined {file}" = "Connecté à {file}"
 "Joining…" = "Connexion…"
-"Join|stroke" = "Jointure"
+"Join|stroke" = "Jonction"
+"Jul" = "juil."
+"Jun" = "juin"
 "Just now" = "À l’instant"
 "Justify" = "Justifier"
+"Kanban board" = "Tableau kanban"
+"Keep a measurement on the canvas for developers" = "Garder une mesure sur le canevas pour les développeurs"
 "Keep appearance" = "Conserver l’apparence"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Conserver l’apparence convertit chaque valeur de couleur en {profile} pour que les couleurs restent identiques. Conserver les valeurs laisse les nombres tels quels, si bien que les couleurs changent."
 "Keep tool selected after use" = "Garder l’outil sélectionné après usage"
@@ -635,17 +711,20 @@ status = "draft — needs native review"
 "Key/Gamepad" = "Touche/manette"
 "Key/Gamepad {key}" = "Touche/manette {key}"
 "Keyboard shortcuts" = "Raccourcis clavier"
+"Kits" = "Kits"
+"Landing page" = "Page de destination"
 "Language" = "Langue"
 "Lasso" = "Lasso"
 "Last" = "Dernier"
 "Last change: {note}" = "Dernière modification : {note}"
 "Last commit" = "Dernier commit"
+"Last modified" = "Dernière modification"
 "Last on top" = "Dernier au-dessus"
 "Layer blur" = "Flou de calque"
 "Layer name" = "Nom du calque"
 "Layers" = "Calques"
 "Layers in an instance take their position from the main component" = "Les calques d’une instance prennent leur position du composant principal"
-"Layout" = "Disposition"
+"Layout" = "Mise en page"
 "Layout grid" = "Grille de mise en page"
 "Layout grid settings" = "Réglages de la grille de mise en page"
 "Layout grids" = "Grilles de mise en page"
@@ -678,6 +757,7 @@ status = "draft — needs native review"
 "Link" = "Lien"
 "Link copied" = "Lien copié"
 "Link docs, code or tickets for developers." = "Liez de la documentation, du code ou des tickets pour les développeurs."
+"Link frames on the Prototype tab, then present the flow" = "Reliez les cadres dans l’onglet Prototype, puis présentez le flux"
 "Link this component to its code component: instances then show your real snippet with their values." = "Reliez ce composant à son composant de code : les instances affichent alors votre véritable extrait avec leurs valeurs."
 "List spacing" = "Espacement de liste"
 "List style" = "Style de liste"
@@ -695,12 +775,15 @@ status = "draft — needs native review"
 "Main" = "Principal"
 "Main component deleted" = "Composant principal supprimé"
 "Main menu" = "Menu principal"
+"Make a component" = "Créer un composant"
 "Make slot" = "Créer un emplacement"
+"Mar" = "mars"
 "Margin" = "Marge"
 "Mark all as read" = "Tout marquer comme lu"
 "Mark as resolved" = "Marquer comme résolu"
 "Mark as unread" = "Marquer comme non lu"
 "Mark as unresolved" = "Marquer comme non résolu"
+"Marker" = "Marqueur"
 "Mask" = "Masque"
 "Mass · Stiffness · Damping" = "Masse · Rigidité · Amortissement"
 "Match (empty: the whole name)" = "Correspondance (vide : le nom entier)"
@@ -708,15 +791,18 @@ status = "draft — needs native review"
 "Max W" = "L max."
 "Max lines" = "Lignes max."
 "Maximize" = "Agrandir"
+"May" = "mai"
 "Measure to the selection" = "Mesurer jusqu’à la sélection"
-"Merge into main" = "Fusionner dans le principal"
+"Measurements" = "Mesures"
+"Merge into main" = "Fusionner dans le fichier principal"
 "Merge regions" = "Fusionner les régions"
-"Merge the branch into the main file (one undo step) and archive it" = "Fusionne la branche dans le fichier principal (une seule étape d’annulation) et l’archive"
+"Merge the branch into the main file (one undo step) and archive it" = "Fusionner la branche dans le fichier principal (une seule étape d’annulation) et l’archiver"
 "Merged" = "Fusionnée"
 "Merged PRs" = "PR fusionnées"
 "Min H" = "H min."
 "Min W" = "L min."
 "Minimize" = "Réduire"
+"Minutes" = "Minutes"
 "Mirror angle" = "Symétrie d’angle"
 "Mirror angle and length" = "Symétrie d’angle et de longueur"
 "Mirroring" = "Symétrie"
@@ -729,9 +815,10 @@ status = "draft — needs native review"
 "Mixed" = "Mixte"
 "Mixed fonts" = "Polices mixtes"
 "Mixed interactions: click + to replace them" = "Interactions mixtes : cliquez sur + pour les remplacer"
+"Mobile app" = "Application mobile"
 "Mode" = "Mode"
 "Model" = "Modèle"
-"Models" = "Modèles"
+"Models" = "Modèles d’IA"
 "Mono" = "Mono"
 "More" = "Plus"
 "More instance actions" = "Autres actions d’instance"
@@ -744,8 +831,8 @@ status = "draft — needs native review"
 "Move column left" = "Déplacer la colonne à gauche"
 "Move column right" = "Déplacer la colonne à droite"
 "Move down" = "Descendre"
-"Move in" = "Entrée"
-"Move out" = "Sortie"
+"Move in" = "Déplacer vers l’intérieur"
+"Move out" = "Déplacer vers l’extérieur"
 "Move tools" = "Outils de déplacement"
 "Move up" = "Monter"
 "Moved to {name}" = "Déplacé vers {name}"
@@ -757,8 +844,11 @@ status = "draft — needs native review"
 "Named instance" = "Instance nommée"
 "Navigate to" = "Naviguer vers"
 "Nested instance" = "Instance imbriquée"
+"New board" = "Nouveau tableau blanc"
 "New design file" = "Nouveau fichier de design"
-"Next or previous control in the focused region" = "Contrôle suivant ou précédent dans la région active"
+"Newest first" = "Plus récent d’abord"
+"Next frame" = "Cadre suivant"
+"Next or previous control in the focused region" = "Contrôle suivant ou précédent dans la région qui a le focus"
 "Next ready for dev" = "Prêt pour le dev suivant"
 "Next size option" = "Option de taille suivante"
 "No assets: no export settings, icons or images. Add export settings in the Design tab." = "Aucune ressource : ni réglage d’exportation, ni icône, ni image. Ajoutez des réglages d’exportation dans l’onglet Design."
@@ -767,14 +857,17 @@ status = "draft — needs native review"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "Aucune branche. Une branche est une copie du fichier pour essayer des modifications, puis les relire et les fusionner."
 "No category" = "Sans catégorie"
 "No changes" = "Aucune modification"
+"No color styles" = "Aucun style de couleur"
 "No colour variables fit here." = "Aucune variable de couleur ne convient ici."
 "No colour variables yet. Create them in Local variables." = "Aucune variable de couleur pour l’instant. Créez-en dans Variables locales."
 "No comments yet" = "Aucun commentaire pour l’instant"
+"No compatibility warnings reported" = "Aucun avertissement de compatibilité signalé"
 "No components yet. Select layers and press {keys}." = "Aucun composant pour l’instant. Sélectionnez des calques et appuyez sur {keys}."
 "No conflicts." = "Aucun conflit."
 "No contributor data was built into this copy." = "Cette copie ne contient aucune donnée de contributeurs."
+"No device" = "Aucun appareil"
 "No fonts match" = "Aucune police ne correspond"
-"No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Pas de code d’accès ici (le serveur est antérieur aux codes d’accès, ou cette adresse ne tient pas dans un code) : partagez plutôt le lien."
+"No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Pas de code d’accès ici (le serveur est antérieur aux codes d’accès, ou cette adresse ne tient pas dans un code) : partagez plutôt le lien."
 "No layer changes to show." = "Aucune modification de calque à afficher."
 "No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "Aucune bibliothèque pour l’instant. Ajoutez un fichier .figcraft publié en tant que bibliothèque, ou collez le lien d’une bibliothèque d’équipe."
 "No list" = "Aucune liste"
@@ -787,7 +880,8 @@ status = "draft — needs native review"
 "No model credits were built into this copy." = "Cette copie ne contient aucun crédit de modèle."
 "No number variables fit here." = "Aucune variable numérique ne convient ici."
 "No number variables yet. Create them in Local variables." = "Aucune variable numérique pour l’instant. Créez-en dans Variables locales."
-"No paints" = "Aucune peinture"
+"No other pages" = "Aucune autre page"
+"No paints" = "Aucun remplissage"
 "No plugins on {server}." = "Aucun plugin sur {server}."
 "No plugins yet. Import a development plugin from its figcraft-plugin.json." = "Aucun plugin pour l’instant. Importez un plugin en développement depuis son figcraft-plugin.json."
 "No preferred components" = "Aucun composant préféré"
@@ -800,9 +894,11 @@ status = "draft — needs native review"
 "No string variables yet. Create them in Local variables." = "Aucune variable de chaîne pour l’instant. Créez-en dans Variables locales."
 "No styles yet." = "Aucun style pour l’instant."
 "No styles yet. Click + to create one from the selection." = "Aucun style pour l’instant. Cliquez sur + pour en créer un à partir de la sélection."
+"No templates match your search" = "Aucun modèle ne correspond à votre recherche"
 "No text styles yet. Click + to create one from the selected text." = "Aucun style de texte pour l’instant. Cliquez sur + pour en créer un à partir du texte sélectionné."
 "No variables fit here." = "Aucune variable ne convient ici."
 "No variables yet. Create them in Local variables." = "Aucune variable pour l’instant. Créez-en dans Variables locales."
+"No votes yet" = "Aucun vote pour l’instant"
 "Nobody else is here yet" = "Personne d’autre n’est encore là"
 "Noise" = "Bruit"
 "None" = "Aucun"
@@ -815,10 +911,12 @@ status = "draft — needs native review"
 "Not read yet" = "Pas encore lu"
 "Not shared" = "Non partagé"
 "Note {n}" = "Note {n}"
+"Nothing changed since this version." = "Rien n’a changé depuis cette version."
 "Nothing changed since this was marked ready for dev." = "Rien n’a changé depuis que ceci a été marqué prêt pour le dev."
 "Nothing here yet. Set a frame's status to list it." = "Rien pour l’instant. Attribuez un statut à un cadre pour le lister ici."
 "Nothing online yet. Use Share on a file to put it online and it is listed here." = "Rien en ligne pour l’instant. Utilisez Partager sur un fichier pour le mettre en ligne et il apparaîtra ici."
 "Nothing to export" = "Rien à exporter"
+"Nov" = "nov."
 "Now" = "Maintenant"
 "Nudge (Shift: big nudge)" = "Décaler (Maj : grand décalage)"
 "Nudge amount" = "Pas de décalage"
@@ -827,16 +925,19 @@ status = "draft — needs native review"
 "Number ↓" = "Numéro ↓"
 "Numbered list" = "Liste numérotée"
 "Object" = "Objet"
-"Off" = "Non"
+"Oct" = "oct."
+"Off" = "Désactivé"
 "Offered first when filling the slot (any content is allowed)" = "Proposés en premier pour remplir l’emplacement (tout contenu est autorisé)"
 "Offered first when swapping the instance (any component is allowed)" = "Proposés en premier pour permuter l’instance (tout composant est autorisé)"
 "Offset" = "Décalage"
+"Oldest first" = "Plus ancien d’abord"
 "On click" = "Au clic"
 "On drag" = "Au glissement"
 "On this page" = "Sur cette page"
+"One announcement in five common sizes: square, portrait, story, link and banner" = "Une annonce en cinq formats courants : carré, portrait, story, lien et bannière"
 "Online" = "En ligne"
 "Online files" = "Fichiers en ligne"
-"Online sharing is off: files are shared on the local network only." = "Le partage en ligne est désactivé : les fichiers ne sont partagés que sur le réseau local."
+"Online sharing is off: files are shared on the local network only." = "Le partage en ligne est désactivé : les fichiers ne sont partagés que sur le réseau local."
 "Only the first changed layers are listed." = "Seuls les premiers calques modifiés sont listés."
 "Only the first {n} changed layers are listed." = "Seuls les {n} premiers calques modifiés sont listés."
 "Only your threads" = "Vos fils uniquement"
@@ -848,6 +949,7 @@ status = "draft — needs native review"
 "Open branch" = "Ouvrir la branche"
 "Open file" = "Ouvrir un fichier"
 "Open files" = "Fichiers ouverts"
+"Open presentations" = "Présentations ouvertes"
 "Open in focus view" = "Ouvrir en vue ciblée"
 "Open in new window" = "Ouvrir dans une nouvelle fenêtre"
 "Open invite links in FigCraft" = "Ouvrir les liens d’invitation dans FigCraft"
@@ -856,12 +958,17 @@ status = "draft — needs native review"
 "Open overlay" = "Ouvrir une superposition"
 "Open prototype preview" = "Ouvrir l’aperçu du prototype"
 "Open variables ({count})" = "Ouvrir les variables ({count})"
+"Opened as a new document" = "Ouvert comme nouveau document"
 "Opened “{name}” in a new tab" = "« {name} » ouvert dans un nouvel onglet"
+"Opening the file…" = "Ouverture du fichier…"
+"Opening {n} files as new files" = { one = "Ouverture comme nouveau fichier", other = "Ouverture de {n} fichiers comme nouveaux fichiers" }
 "Open|comments" = "Ouverts"
 "Options" = "Options"
 "Orange" = "Orange"
+"Order" = "Ordre"
+"Other" = "Autre"
 "Other apps may not open every .fig file exported here." = "D’autres applications risquent de ne pas ouvrir tous les fichiers .fig exportés ici."
-"Others lose access and keep their copy; the file stays on the server for you" = "Les autres perdent l’accès et conservent leur copie ; le fichier reste sur le serveur pour vous"
+"Others lose access and keep their copy; the file stays on the server for you" = "Les autres perdent l’accès et conservent leur copie ; le fichier reste sur le serveur pour vous"
 "Others type this under Share ▸ Join with a code" = "Les autres le saisissent dans Partager ▸ Rejoindre avec un code"
 "Outline stroke" = "Convertir le contour en tracé"
 "Outline text" = "Convertir le texte en tracés"
@@ -878,7 +985,13 @@ status = "draft — needs native review"
 "PDF print settings" = "Réglages d’impression PDF"
 "Padding" = "Marge intérieure"
 "Page" = "Page"
+"Page deleted" = "Page supprimée"
 "Pages" = "Pages"
+"Pages added to the document" = "Pages ajoutées au document"
+"Pause" = "Pause"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "Choisissez l’outil Cadre, puis faites glisser sur le canevas ou choisissez une taille d’appareil"
+"Pink" = "Rose"
+"Placed on the current page" = "Placé sur la page actuelle"
 "Pages: {pages}" = "Pages : {pages}"
 "Paint bucket" = "Pot de peinture"
 "Pan the canvas" = "Faire défiler le canevas"
@@ -893,6 +1006,7 @@ status = "draft — needs native review"
 "Paste a team library link (a view link)" = "Collez le lien d’une bibliothèque d’équipe (un lien de consultation)"
 "Paste here" = "Coller ici"
 "Paste to replace" = "Coller pour remplacer"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Calques de design collés ; {n} type de contenu a été omis", other = "Calques de design collés ; {n} types de contenu ont été omis" }
 "Pattern" = "Motif"
 "Pattern alignment" = "Alignement du motif"
 "Pattern scale" = "Échelle du motif"
@@ -900,7 +1014,7 @@ status = "draft — needs native review"
 "Pen" = "Plume"
 "Pencil" = "Crayon"
 "People in this file" = "Personnes dans ce fichier"
-"People join from anywhere with a code. The file is kept on {server} while you share it." = "On vous rejoint de partout avec un code. Le fichier est conservé sur {server} tant que vous le partagez."
+"People join from anywhere with a code. The file is kept on {server} while you share it." = "Les personnes vous rejoignent de partout avec un code. Le fichier est conservé sur {server} tant que vous le partagez."
 "People on your network join with a code. Nothing goes through a server." = "Les personnes de votre réseau vous rejoignent avec un code. Rien ne passe par un serveur."
 "Phone" = "Téléphone"
 "Pick color" = "Prélever une couleur"
@@ -914,10 +1028,14 @@ status = "draft — needs native review"
 "Place a shape or frame (its tool chosen)" = "Placer une forme ou un cadre (outil choisi)"
 "Place automatically" = "Placer automatiquement"
 "Place image" = "Placer une image"
+"Playground" = "Bac à sable"
+"Plugin" = "Plugin"
 "Plugins" = "Plugins"
+"Plugins & widgets" = "Plugins et widgets"
 "Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Les plugins s’exécutent dans le bac à sable de FigCraft, sans fichiers, réseau ni horloge. N’installez que des plugins de confiance."
 "Plus darker" = "Plus foncé"
 "Plus lighter" = "Plus clair"
+"Plus one" = "Plus un"
 "Point" = "Point"
 "Points" = "Points"
 "Polygon" = "Polygone"
@@ -931,6 +1049,7 @@ status = "draft — needs native review"
 "Present or preview" = "Présenter ou prévisualiser"
 "Present this flow" = "Présenter ce flux"
 "Presentation" = "Présentation"
+"Presentation slides" = "Diapositives de présentation"
 "Presenting: comments" = "Présentation : commentaires"
 "Presenting: cycle the size options" = "Présentation : parcourir les options de taille"
 "Presenting: full screen" = "Présentation : plein écran"
@@ -943,6 +1062,7 @@ status = "draft — needs native review"
 "Preview" = "Aperçu"
 "Preview this flow" = "Prévisualiser ce flux"
 "Preview this frame" = "Prévisualiser ce cadre"
+"Previous frame" = "Cadre précédent"
 "Previous ready for dev" = "Prêt pour le dev précédent"
 "Progressive" = "Progressif"
 "Properties" = "Propriétés"
@@ -963,13 +1083,14 @@ status = "draft — needs native review"
 "Push" = "Pousser"
 "Push changes to main component" = "Transmettre les modifications au composant principal"
 "Put text on path" = "Placer le texte sur un tracé"
+"Question" = "Question"
 "R" = "R"
 "Radial" = "Radial"
 "Radius" = "Rayon"
 "Ratio" = "Rapport"
 "Reading the library…" = "Lecture de la bibliothèque…"
 "Ready for dev" = "Prêt pour le dev"
-"Real name" = "Vrai nom"
+"Real name" = "Nom réel"
 "Recent" = "Récents"
 "Recent files" = "Fichiers récents"
 "Recents" = "Récents"
@@ -980,33 +1101,40 @@ status = "draft — needs native review"
 "Reduce motion" = "Réduire les animations"
 "Refraction" = "Réfraction"
 "Regular expression" = "Expression régulière"
+"Relative to" = "Par rapport à"
+"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "Relative à la mise à l’échelle d’affichage de votre système (100 % est la taille du système). Le zoom du document est distinct."
 "Remove" = "Retirer"
 "Remove all" = "Tout retirer"
 "Remove annotation" = "Retirer l’annotation"
 "Remove auto layout" = "Retirer la mise en page auto"
+"Remove column" = "Retirer la colonne"
 "Remove dev resource" = "Retirer la ressource de développement"
 "Remove export setting" = "Retirer le réglage d’exportation"
+"Remove from recents" = "Retirer des récents"
 "Remove from server" = "Retirer du serveur"
 "Remove from server…" = "Retirer du serveur…"
 "Remove guide" = "Retirer le repère"
 "Remove interaction" = "Retirer l’interaction"
 "Remove library from this file" = "Retirer la bibliothèque de ce fichier"
+"Remove measurement" = "Retirer la mesure"
 "Remove min and max" = "Retirer min. et max."
 "Remove min and max height" = "Retirer la hauteur min. et max."
 "Remove min and max width" = "Retirer la largeur min. et max."
 "Remove regions" = "Retirer les régions"
+"Remove row" = "Retirer la ligne"
 "Remove slot" = "Retirer l’emplacement"
 "Remove starting point" = "Retirer le point de départ"
 "Remove stop" = "Retirer l’arrêt"
 "Remove text from path" = "Retirer le texte du tracé"
 "Remove the else and its actions" = "Retirer le « sinon » et ses actions"
 "Remove this condition and its actions" = "Retirer cette condition et ses actions"
-"Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "Retirer ce fichier du serveur ? Il ne pourra plus être partagé ni ouvert depuis celui-ci. Votre copie reste ouverte ici."
+"Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "Retirer ce fichier du serveur ? Il ne pourra plus être partagé ni ouvert depuis ce serveur. Votre copie reste ouverte ici."
 "Remove {name} from session" = "Retirer {name} de la session"
-"Remove {name} from {server}?" = "Retirer {name} de {server} ?"
+"Remove {name} from {server}?" = "Retirer {name} de {server} ?"
 "Removed" = "Supprimé"
 "Removed from the server" = "Retiré du serveur"
 "Removed since it was marked" = "Supprimé depuis le marquage"
+"Removed since this version" = "Supprimé depuis cette version"
 "Rename" = "Renommer"
 "Rename duplicated layers" = "Renommer les calques dupliqués"
 "Rename folder" = "Renommer le dossier"
@@ -1034,8 +1162,9 @@ status = "draft — needs native review"
 "Reset to style" = "Revenir au style"
 "Reset to the inherited value" = "Revenir à la valeur héritée"
 "Resize by the nudge amount" = "Redimensionner du pas de décalage"
-"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Redimensionne les cadres à l’écran de l’appareil (ou à la fenêtre sans appareil) : leurs contraintes et leur mise en page auto s’adaptent"
+"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Redimensionner les cadres à l’écran de l’appareil (ou à la fenêtre sans appareil) : leurs contraintes et leur mise en page auto s’adaptent"
 "Resize to fit" = "Redimensionner au contenu"
+"Resizing" = "Redimensionnement"
 "Resolve" = "Résoudre"
 "Resolve change" = "Résoudre la modification"
 "Resolved" = "Résolu"
@@ -1046,6 +1175,9 @@ status = "draft — needs native review"
 "Restore main component" = "Restaurer le composant principal"
 "Restore this version" = "Restaurer cette version"
 "Restored “{name}”" = "« {name} » restaurée"
+"Retrospective" = "Rétrospective"
+"Results" = "Résultats"
+"Resume" = "Reprendre"
 "Reverse the order" = "Inverser l’ordre"
 "Reversed triangle" = "Triangle inversé"
 "Review and merge" = "Relire et fusionner"
@@ -1061,6 +1193,7 @@ status = "draft — needs native review"
 "Rotation jitter" = "Variation de rotation"
 "Round" = "Arrondi"
 "Rounded" = "Arrondi"
+"Rounded rectangle" = "Rectangle arrondi"
 "Row" = "Ligne"
 "Row gap" = "Espacement des lignes"
 "Row sizes" = "Tailles des lignes"
@@ -1076,6 +1209,7 @@ status = "draft — needs native review"
 "Save" = "Enregistrer"
 "Save as" = "Enregistrer sous"
 "Save as preset…" = "Enregistrer comme préréglage…"
+"Save file" = "Enregistrer le fichier"
 "Save files automatically" = "Enregistrer les fichiers automatiquement"
 "Save version  {key}" = "Enregistrer une version  {key}"
 "Saved" = "Enregistré"
@@ -1097,25 +1231,31 @@ status = "draft — needs native review"
 "Search layers" = "Rechercher des calques"
 "Search plugins" = "Rechercher des plugins"
 "Search shortcuts" = "Rechercher des raccourcis"
+"Search templates" = "Rechercher des modèles"
 "Section" = "Section"
 "Section color" = "Couleur de la section"
 "Sections" = "Sections"
+"See all templates" = "Voir tous les modèles"
 "Select a frame and add a starting point to present it as a flow." = "Sélectionnez un cadre et ajoutez un point de départ pour le présenter comme un flux."
 "Select a frame to preview it" = "Sélectionnez un cadre pour le prévisualiser"
 "Select a layer to see its properties and code" = "Sélectionnez un calque pour voir ses propriétés et son code"
 "Select all" = "Tout sélectionner"
-"Select all with same" = "Sélectionner tout ce qui a le même"
+"Select all with same" = "Sélectionner par propriété commune"
 "Select layer" = "Sélectionner le calque"
+"Select layers and they space themselves as their content changes" = "Sélectionnez des calques et leur espacement s’ajuste quand leur contenu change"
 "Select layers to apply the style to" = "Sélectionnez les calques auxquels appliquer le style"
+"Select layers with this color" = "Sélectionner les calques de cette couleur"
 "Select overlapping shapes" = "Sélectionnez des formes qui se chevauchent"
 "Select points to edit their position, radius and mirroring" = "Sélectionnez des points pour modifier leur position, leur rayon et leur symétrie"
 "Select slot" = "Sélectionner l’emplacement"
 "Selection" = "Sélection"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Zone de sélection, {w} sur {h} à {x}, {y} : les flèches la déplacent, Maj+flèches ou {cmd}+flèches la redimensionnent, Entrée sélectionne, Échap annule"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Zone de sélection : les flèches la déplacent, Maj+flèches ou {cmd}+flèches la redimensionnent, Entrée sélectionne, Échap annule"
+"Selection colors" = "Couleurs de la sélection"
 "Send backward" = "Reculer"
 "Send report" = "Envoyer le signalement"
 "Send to back" = "Mettre à l’arrière-plan"
+"Sep" = "sept."
 "Server address" = "Adresse du serveur"
 "Server address (ws://host:47900/)" = "Adresse du serveur (ws://host:47900/)"
 "Server for online sharing" = "Serveur pour le partage en ligne"
@@ -1128,17 +1268,20 @@ status = "draft — needs native review"
 "Shape" = "Forme"
 "Shape builder" = "Générateur de formes"
 "Shape tools" = "Outils de forme"
+"Shapes" = "Formes"
 "Share" = "Partager"
 "Share this file" = "Partager ce fichier"
+"Share with a code" = "Partager avec un code"
 "Share: live session, export" = "Partager : session en direct, exportation"
 "Shared" = "Partagé"
-"Shared: copy its code from the file's menu" = "Partagé : copiez son code depuis le menu du fichier"
-"Sharing a file needs the desktop app; here you can join one." = "Le partage d’un fichier nécessite l’application de bureau ; ici, vous pouvez en rejoindre un."
-"Sharing on the local network (online sharing is off: no server is set in Preferences)." = "Partage sur le réseau local (le partage en ligne est désactivé : aucun serveur n’est défini dans les Préférences)."
+"Shared: copy its code from the file's menu" = "Partagé : copiez son code depuis le menu du fichier"
+"Sharing a file needs the desktop app; here you can join one." = "Le partage d’un fichier nécessite l’application de bureau ; ici, vous pouvez en rejoindre un."
+"Sharing on the local network (online sharing is off: no server is set in Preferences)." = "Partage sur le réseau local (le partage en ligne est désactivé : aucun serveur n’est défini dans les Préférences)."
 "Sharing on your network · {people}" = "Partage sur votre réseau · {people}"
 "Sharing online · {people}" = "Partage en ligne · {people}"
-"Sharing stopped: the file stays on the server, open only to you" = "Partage arrêté : le fichier reste sur le serveur, accessible à vous seul"
+"Sharing stopped: the file stays on the server, open only to you" = "Partage arrêté : le fichier reste sur le serveur, accessible à vous seul"
 "Show" = "Afficher"
+"Show all templates" = "Afficher tous les modèles"
 "Show as grid" = "Afficher en grille"
 "Show as list" = "Afficher en liste"
 "Show autosaves" = "Afficher les sauvegardes auto"
@@ -1147,6 +1290,9 @@ status = "draft — needs native review"
 "Show device frame" = "Afficher le cadre de l’appareil"
 "Show dimensions on objects" = "Afficher les dimensions sur les objets"
 "Show hotspot hints" = "Afficher les zones interactives"
+"Show in Explorer" = "Afficher dans l’Explorateur"
+"Show in Finder" = "Afficher dans le Finder"
+"Show in folder" = "Afficher dans le dossier"
 "Show only this on the canvas" = "Afficher uniquement ceci sur le canevas"
 "Show open" = "Afficher les ouverts"
 "Show section contents" = "Afficher le contenu de la section"
@@ -1171,13 +1317,17 @@ status = "draft — needs native review"
 "Small caps" = "Petites capitales"
 "Smart animate" = "Animation intelligente"
 "Snap to pixel grid" = "Aimanter à la grille de pixels"
+"Social and slides" = "Réseaux sociaux et diapositives"
 "Social media" = "Réseaux sociaux"
+"Social post sizes" = "Formats de publications sociales"
 "Soft light" = "Lumière douce"
 "Solid" = "Continu"
 "Some variants have the same property values: give each one a unique combination" = "Certaines variantes ont les mêmes valeurs de propriété : donnez à chacune une combinaison unique"
 "Sort" = "Trier"
+"Sort by" = "Trier par"
 "Sort by date" = "Trier par date"
 "Sort by page" = "Trier par page"
+"Sort by {column}" = "Trier par {column}"
 "Space around" = "Espace autour"
 "Space between" = "Espace entre"
 "Space drag" = "Espace et glisser"
@@ -1185,10 +1335,13 @@ status = "draft — needs native review"
 "Space+drag" = "Espace+glisser"
 "Spacing" = "Espacement"
 "Spam, stolen work, abuse…" = "Spam, travail volé, abus…"
+"Speech bubble" = "Bulle"
 "Splay" = "Évasement"
-"Spotlight me" = "Me mettre sous les projecteurs"
+"Spotlight me" = "Faire suivre ma vue"
 "Spread" = "Étendue"
 "Square" = "Carré"
+"Stamp" = "Tampon"
+"Stamps" = "Tampons"
 "Standard" = "Standard"
 "Standard ligatures" = "Ligatures standard"
 "Star" = "Étoile"
@@ -1196,18 +1349,28 @@ status = "draft — needs native review"
 "Start" = "Début"
 "Start ascending from / stop descending at" = "Compter vers le haut depuis / vers le bas jusqu’à"
 "Start from a blank canvas" = "Commencer avec un canevas vide"
+"Start from a template" = "Commencer avec un modèle"
 "Start on path" = "Début sur le tracé"
+"Start on the Home screen" = "Démarrer sur l’Accueil"
 "Start point" = "Point de départ"
 "Start sharing" = "Commencer le partage"
+"Start sharing with the Share button, then pass on the code it gives" = "Commencez à partager avec le bouton Partager, puis communiquez le code qu’il donne"
+"Start vote" = "Lancer le vote"
 "Starting to share…" = "Démarrage du partage…"
 "Status" = "Statut"
 "Sticky" = "Collant"
+"Sticky note" = "Note autocollante"
+"Sticky note colors" = "Couleurs des notes autocollantes"
+"Sticky notes" = "Notes autocollantes"
+"Sticky notes, shapes and connectors" = "Notes autocollantes, formes et connecteurs"
 "Stop" = "Arrêter"
 "Stop following {name}" = "Ne plus suivre {name}"
 "Stop session" = "Arrêter la session"
 "Stop sharing" = "Arrêter le partage"
-"Stop spotlighting" = "Quitter les projecteurs"
+"Stop spotlighting" = "Arrêter de faire suivre ma vue"
+"Stop timer" = "Arrêter le minuteur"
 "Stop {n}  {hex}" = "Arrêt {n}  {hex}"
+"Straight" = "Droit"
 "Stretch" = "Étirer"
 "Strikethrough" = "Barré"
 "String" = "Chaîne"
@@ -1247,16 +1410,21 @@ status = "draft — needs native review"
 "Tell the server's operator what is wrong with it" = "Indiquez à l’opérateur du serveur ce qui ne va pas"
 "Temperature" = "Température"
 "Template" = "Modèle"
+"Templates" = "Modèles"
 "Terms" = "Conditions"
 "Text" = "Texte"
 "Text align" = "Alignement du texte"
 "Text content" = "Contenu du texte"
+"Text size" = "Taille du texte"
 "Text style" = "Style de texte"
 "Text styles" = "Styles de texte"
 "Texts" = "Textes"
 "Texture" = "Texture"
 "The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3." = "Le canevas affiche les couleurs en sRGB ; les fichiers PNG, JPG et WebP exportés sont balisés Display P3."
-"The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "Le fichier est supprimé du serveur : plus personne ne pourra l’ouvrir ni le rejoindre depuis celui-ci, et c’est irréversible. Les copies ouvertes restent à ceux qui les ont."
+"The destination document is unavailable. Nothing was imported." = "Le document de destination est indisponible. Rien n’a été importé."
+"The destination document was closed. Nothing was imported." = "Le document de destination a été fermé. Rien n’a été importé."
+"The destination page was removed. Nothing was imported." = "La page de destination a été supprimée. Rien n’a été importé."
+"The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "Le fichier est supprimé du serveur : plus personne ne pourra l’ouvrir ni le rejoindre depuis ce serveur, et c’est irréversible. Les copies ouvertes restent à ceux qui les ont."
 "The file now holds another library" = "Le fichier contient désormais une autre bibliothèque"
 "The file now holds another library (\"{name}\")" = "Le fichier contient désormais une autre bibliothèque (« {name} »)"
 "The files you shared or published online from this computer. They stay on their server until you remove them." = "Les fichiers que vous avez partagés ou publiés en ligne depuis cet ordinateur. Ils restent sur leur serveur jusqu’à ce que vous les retiriez."
@@ -1265,29 +1433,35 @@ status = "draft — needs native review"
 "The selection uses several text styles: click to apply one" = "La sélection utilise plusieurs styles de texte : cliquez pour en appliquer un"
 "The server deletes this file if nobody opens it before {date}." = "Le serveur supprime ce fichier si personne ne l’ouvre avant le {date}."
 "The whole file" = "Le fichier entier"
+"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "La fenêtre est trop petite pour {size} %, l’interface est donc affichée à {drawn} %. Agrandissez la fenêtre pour utiliser {size} %."
 "Theme" = "Thème"
 "There's no destination for that action" = "Cette action n’a pas de destination"
 "Thickness" = "Épaisseur"
 "This branch can't be reviewed: {e}" = "Impossible de relire cette branche : {e}"
 "This branch was merged or archived." = "Cette branche a été fusionnée ou archivée."
 "This computer only" = "Cet ordinateur uniquement"
-"This computer remembers the owner token, so the file can be managed from the home screen's Online list. Copy it to manage the file from somewhere else: it is a password for this file and won't be shown again." = "Cet ordinateur mémorise le jeton de propriétaire : le fichier se gère depuis la liste En ligne de l’écran d’accueil. Copiez-le pour gérer le fichier depuis un autre endroit : c’est un mot de passe pour ce fichier et il ne sera plus affiché."
+"This computer remembers the owner token, so the file can be managed from the home screen's Online list. Copy it to manage the file from somewhere else: it is a password for this file and won't be shown again." = "Cet ordinateur mémorise le jeton de propriétaire : le fichier se gère depuis la liste En ligne de l’écran d’accueil. Copiez-le pour gérer le fichier depuis un autre endroit : c’est un mot de passe pour ce fichier et il ne sera plus affiché."
 "This condition is edited as an expression" = "Cette condition se modifie en tant qu’expression"
 "This file" = "Ce fichier"
 "This file has unsaved changes" = "Ce fichier contient des modifications non enregistrées"
 "This file is on {server}, open only to you. Share it to let others in with a new code." = "Ce fichier est sur {server}, accessible à vous seul. Partagez-le pour laisser entrer d’autres personnes avec un nouveau code."
 "This frame is new on the branch." = "Ce cadre est nouveau dans la branche."
 "This frame isn't on the branch." = "Ce cadre n’est pas dans la branche."
-"This server is open to the public: no key needed." = "Ce serveur est ouvert au public : aucune clé nécessaire."
-"This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Ce serveur exige sa clé : ajoutez ?key=… à l’adresse (`figcraft-server key` l’affiche sur la machine du serveur)."
-"This server takes files only with its key: see Advanced." = "Ce serveur n’accepte les fichiers qu’avec sa clé : voir Avancé."
+"This server is open to the public: no key needed." = "Ce serveur est ouvert au public : aucune clé nécessaire."
+"This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Ce serveur exige sa clé : ajoutez ?key=… à l’adresse (`figcraft-server key` l’affiche sur la machine du serveur)."
+"This server takes files only with its key: see Advanced." = "Ce serveur n’accepte les fichiers qu’avec sa clé : voir Avancé."
+"Thumbs up" = "Pouce levé"
+"This version can't be read." = "Cette version est illisible."
+"This version doesn't have it: all of it is new." = "Cette version ne le contient pas : tout est nouveau."
 "Tidy up" = "Ranger"
 "Tile" = "Mosaïque"
 "Tile type" = "Type de mosaïque"
+"Timer" = "Minuteur"
 "Tint" = "Nuance"
 "Title" = "Titre"
 "Title case" = "Casse de titre"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Pour partager cette bibliothèque avec votre équipe, publiez le fichier sur un serveur (Partager ▸ Publier sur un serveur…), puis publiez-y la bibliothèque."
+"To the layer around it" = "Jusqu’au calque qui le contient"
 "Toggle" = "Activer/désactiver"
 "Toggle light/dark theme" = "Basculer entre thème clair et sombre"
 "Toggle visibility" = "Afficher/masquer"
@@ -1297,13 +1471,17 @@ status = "draft — needs native review"
 "Top left radius" = "Rayon supérieur gauche"
 "Top right radius" = "Rayon supérieur droit"
 "Transform" = "Transformer"
+"Triangle" = "Triangle"
 "Triangle arrow" = "Flèche triangulaire"
 "Trigger" = "Déclencheur"
+"Trigger layer" = "Calque déclencheur"
 "True" = "Vrai"
 "Truncate text" = "Tronquer le texte"
 "Truncate with an ellipsis" = "Tronquer avec des points de suspension"
 "Try again" = "Réessayer"
 "Try another search or filter." = "Essayez une autre recherche ou un autre filtre."
+"Try another word, or look at every kind." = "Essayez un autre mot, ou regardez chaque type."
+"Turn a layer into a component, reuse it, and change every copy at once" = "Transformez un calque en composant, réutilisez-le et modifiez toutes les copies d’un coup"
 "Two digits" = "Deux chiffres"
 "Type" = "Type"
 "Type settings" = "Réglages typographiques"
@@ -1319,12 +1497,12 @@ status = "draft — needs native review"
 "Unread" = "Non lus"
 "Unresolve" = "Rouvrir"
 "Unsaved changes" = "Modifications non enregistrées"
-"Unsaved changes in {names}. Close the window and lose them?" = "Modifications non enregistrées dans {names}. Fermer la fenêtre et les perdre ?"
+"Unsaved changes in {names}. Save them before closing?" = "Modifications non enregistrées dans {names}. Les enregistrer avant de fermer ?"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Modifications non enregistrées : enregistrez d’abord ({save}) ou fermez l’onglet avec {alt}+clic pour les abandonner"
 "Unsaved changes: save first, or close again with {key} to discard" = "Modifications non enregistrées : enregistrez d’abord ou fermez à nouveau avec {key} pour les abandonner"
 "Up" = "Haut"
 "Update" = "Mettre à jour"
-"Update from main" = "Mettre à jour depuis le principal"
+"Update from main" = "Mettre à jour depuis le fichier principal"
 "Update from selection" = "Mettre à jour depuis la sélection"
 "Update plugin" = "Mettre à jour le plugin"
 "Updated {components} and {styles}" = "{components} et {styles} mis à jour"
@@ -1338,9 +1516,12 @@ status = "draft — needs native review"
 "Use as mask" = "Utiliser comme masque"
 "Use auto layout" = "Utiliser la mise en page auto"
 "Use number keys for opacity" = "Utiliser les touches numériques pour l’opacité"
+"Use the .figcraft or .fig extension." = "Utilisez l’extension .figcraft ou .fig."
 "Use the layer's fill" = "Utiliser le remplissage du calque"
+"Use your browser's zoom to change the interface size." = "Utilisez le zoom de votre navigateur pour modifier la taille de l’interface."
 "Used in {files} · {instances}" = "Utilisé dans {files} · {instances}"
 "Username" = "Nom d’utilisateur"
+"Uses variables: each layer shows them in its own mode" = "Utilise des variables : chaque calque les affiche dans son propre mode"
 "Value" = "Valeur"
 "Variable" = "Variable"
 "Variable collections" = "Collections de variables"
@@ -1372,6 +1553,8 @@ status = "draft — needs native review"
 "Visibility" = "Visibilité"
 "Visible" = "Visible"
 "Vivid" = "Vif"
+"Votes per person" = "Votes par personne"
+"Voting session" = "Session de vote"
 "WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND est définie et impose l’API graphique ; sans elle, FigCraft choisit lui-même."
 "Warm" = "Chaud"
 "Watch" = "Montre"
@@ -1379,21 +1562,29 @@ status = "draft — needs native review"
 "Web" = "Web"
 "WebSocket URL" = "URL WebSocket"
 "WebSocket URL copied" = "URL WebSocket copiée"
+"Websites" = "Sites web"
 "Wedge" = "Coin"
+"Weekly planner" = "Planning de la semaine"
 "Weight" = "Graisse"
+"What changed since a saved version" = "Ce qui a changé depuis une version enregistrée"
 "What changed since it was marked ready for dev" = "Ce qui a changé depuis le marquage prêt pour le dev"
-"What is wrong with this file? The server's operator gets your report." = "Qu’est-ce qui ne va pas avec ce fichier ? L’opérateur du serveur reçoit votre signalement."
+"What is wrong with this file? The server's operator gets your report." = "Qu’est-ce qui ne va pas avec ce fichier ? L’opérateur du serveur reçoit votre signalement."
 "What it's for" = "À quoi il sert"
 "What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "L’état d’origine de cette modification est inconnu : elle date d’avant que FigCraft ne conserve une copie des cadres prêts pour le dev. Résolvez la modification (ou marquez-la à nouveau comme prête) pour comparer à partir de maintenant."
+"When marked ready" = "Au marquage prêt"
+"What you try here changes this preview and the code below, not the file" = "Ce que vous essayez ici change cet aperçu et le code ci-dessous, pas le fichier"
 "While hovering" = "Pendant le survol"
 "While pressing" = "Pendant l’appui"
 "White" = "Blanc"
 "Who runs it, its terms and how long it keeps files" = "Qui le gère, ses conditions et combien de temps il conserve les fichiers"
+"Whole screen" = "Écran entier"
 "Why it changed" = "Pourquoi cela a changé"
+"Widget" = "Widget"
 "Widgets" = "Widgets"
 "Width" = "Largeur"
 "Width point" = "Point de largeur"
 "Width profile" = "Profil de largeur"
+"Wireframe kit" = "Kit de wireframes"
 "With the layers' export settings" = "Avec les réglages d’exportation des calques"
 "Wrap" = "Renvoi à la ligne"
 "Wrap in new section" = "Envelopper dans une nouvelle section"
@@ -1401,13 +1592,14 @@ status = "draft — needs native review"
 "Yesterday" = "Hier"
 "You" = "Vous"
 "You'll get the shared file as a new tab and edit it together." = "Vous recevrez le fichier partagé dans un nouvel onglet et le modifierez ensemble."
-"You're spotlighting: everyone follows your view" = "Vous êtes sous les projecteurs : tout le monde suit votre vue"
+"You're spotlighting: everyone follows your view" = "Vous faites suivre votre vue : tout le monde vous suit"
 "Your copy of the file stays open" = "Votre copie du fichier reste ouverte"
-"Your copy stays open; the file stays on the server" = "Votre copie reste ouverte ; le fichier reste sur le serveur"
+"Your copy stays open; the file stays on the server" = "Votre copie reste ouverte ; le fichier reste sur le serveur"
 "Your name" = "Votre nom"
 "Your name in comments" = "Votre nom dans les commentaires"
 "Your system asks for reduced motion: animations stay off." = "Votre système demande de réduire les animations : elles restent désactivées."
 "Z" = "Z"
+"Z to A" = "Z à A"
 "Zoom" = "Zoom"
 "Zoom around the pointer" = "Zoomer autour du pointeur"
 "Zoom device to fill window" = "Zoomer l’appareil pour remplir la fenêtre"
@@ -1426,28 +1618,126 @@ status = "draft — needs native review"
 "call any command its access allows" = "appeler toute commande que son accès autorise"
 "call only: {commands}" = "appeler seulement : {commands}"
 "can edit the document" = "peut modifier le document"
+"can save files" = "peut enregistrer des fichiers"
+"conditional prototype actions nested too deeply were skipped" = "les actions de prototype conditionnelles trop profondément imbriquées ont été ignorées"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "les actions de prototype conditionnelles dont les conditions ne peuvent pas être évaluées ont été ignorées"
+"connector label background was skipped: style data is missing" = "l’arrière-plan du libellé du connecteur a été ignoré : les données de style sont manquantes"
+"connector label was skipped: background bounds are invalid" = "le libellé du connecteur a été ignoré : les limites de l’arrière-plan ne sont pas valides"
+"connector label was skipped: background transform is invalid" = "le libellé du connecteur a été ignoré : la transformation de l’arrière-plan n’est pas valide"
+"connector label was skipped: composed text transform is invalid" = "le libellé du connecteur a été ignoré : la transformation composée du texte n’est pas valide"
+"connector label was skipped: derived background bounds are missing" = "le libellé du connecteur a été ignoré : les limites dérivées de l’arrière-plan sont manquantes"
+"connector label was skipped: derived text bounds are missing" = "le libellé du connecteur a été ignoré : les limites dérivées du texte sont manquantes"
+"connector label was skipped: text bounds are invalid" = "le libellé du connecteur a été ignoré : les limites du texte ne sont pas valides"
+"connector label was skipped: text style data is missing" = "le libellé du connecteur a été ignoré : les données de style du texte sont manquantes"
+"connector label was skipped: text transform is invalid" = "le libellé du connecteur a été ignoré : la transformation du texte n’est pas valide"
+"connector labels were skipped" = "les libellés des connecteurs ont été ignorés"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "les calques de connecteur sont importés comme des instantanés statiques de cadre ou de vecteur, avec leurs libellés s’il y en a ; les liaisons dynamiques des extrémités ne sont pas conservées"
+"connector snapshot vector data is missing; connector was left empty" = "les données vectorielles de l’instantané du connecteur sont manquantes ; le connecteur reste vide"
+"connectors whose ends can't be placed are empty" = "les connecteurs dont les extrémités ne peuvent pas être placées sont vides"
 "crop marks" = "traits de coupe"
+"damaged vector geometry was skipped" = "la géométrie vectorielle endommagée a été ignorée"
+"damaged vector networks import as outlines" = "les réseaux vectoriels endommagés sont importés comme tracés"
 "development: {path}" = "développement : {path}"
+"document children other than pages were skipped" = "les enfants du document autres que des pages ont été ignorés"
+"duplicate grid track sizing entries use equal tracks" = "les entrées de dimensionnement de piste de grille en double utilisent des pistes égales"
 "e.g. count + 1" = "p. ex. count + 1"
 "e.g. count >= 3 and not done" = "p. ex. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "les connecteurs coudés et courbes sans tracé enregistré sont importés comme des lignes droites"
+"entries without a node type were skipped" = "les entrées sans type de nœud ont été ignorées"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "Les liens figcraft:// d’un navigateur, d’une messagerie ou d’un e-mail ouvrent cette application et rejoignent la session."
+"filled areas of a vector with their own fill use the layer's fill" = "les zones remplies d’un vecteur avec leur propre remplissage utilisent le remplissage du calque"
 "from {server}" = "depuis {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "les déclencheurs de manette sans exactement un bouton de manette connu ont été ignorés"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "la liste des pistes de grille dépasse 1 000 entrées ; les pistes utilisent le dimensionnement égal par défaut"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "le dimensionnement des pistes de grille n’est pas pris en charge ou est mal formé ; les pistes concernées ont un dimensionnement égal"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "la liste de dimensionnement des pistes de grille dépasse 1 000 entrées ; les pistes utilisent le dimensionnement égal par défaut"
 "hidden" = "masqué"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "les filtres d’image sont ambigus, car les deux conteneurs de filtres sont présents ; la conversion des filtres a été ignorée"
+"image filters use FigCraft's approximate renderer" = "les filtres d’image utilisent le rendu approximatif de FigCraft"
+"instance swap properties whose default component isn't in the file were skipped" = "les propriétés de permutation d’instance dont le composant par défaut n’est pas dans le fichier ont été ignorées"
+"instances inside their own main component were imported as frames" = "les instances placées dans leur propre composant principal ont été importées comme cadres"
+"instances of components that aren't in the file show no layers" = "les instances de composants absents du fichier n’affichent aucun calque"
+"instances of components that aren't in the file were imported as frames" = "les instances de composants absents du fichier ont été importées comme cadres"
+"instances that would nest a component inside itself were imported as frames" = "les instances qui imbriqueraient un composant dans lui-même ont été importées comme cadres"
+"instances without a main component were imported as empty frames" = "les instances sans composant principal ont été importées comme cadres vides"
+"invalid internal .fig text path data was ignored" = "les données internes non valides de texte sur tracé du .fig ont été ignorées"
+"invalid or oversized vector networks import as outlines" = "les réseaux vectoriels non valides ou trop grands sont importés comme tracés"
+"invalid or oversized vector path data was skipped" = "les données de tracé vectoriel non valides ou trop grandes ont été ignorées"
+"just now" = "à l’instant"
+"key triggers without a supported key were skipped" = "les déclencheurs de touche sans touche prise en charge ont été ignorés"
+"key up triggers import as key presses" = "les déclencheurs au relâchement d’une touche sont importés comme des appuis sur la touche"
+"layers without a position were placed at their parent's origin" = "les calques sans position ont été placés à l’origine de leur parent"
+"layers without a type were skipped" = "les calques sans type ont été ignorés"
+"legacy image filter container is unsupported; filter conversion was skipped" = "l’ancien conteneur de filtres d’image n’est pas pris en charge ; la conversion des filtres a été ignorée"
 "locked" = "verrouillé"
+"malformed image filters container was skipped" = "le conteneur de filtres d’image mal formé a été ignoré"
+"malformed image paintFilter container was skipped" = "le conteneur paintFilter d’image mal formé a été ignoré"
+"malformed slot content assignment was skipped" = "une affectation de contenu d’emplacement mal formée a été ignorée"
 "no bleed" = "sans fond perdu"
 "nobody else here yet" = "personne d’autre pour l’instant"
+"non-default slot settings are not represented and were skipped" = "les réglages d’emplacement autres que ceux par défaut ne sont pas représentés et ont été ignorés"
 "now" = "maintenant"
+"offer files to save if it asks to (you choose where each one goes)" = "proposer des fichiers à enregistrer s’il le demande (vous choisissez où va chacun)"
 "or" = "ou"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "les jointures des points ont été conservées ; les contours en pointillés ou à largeur variable sont dessinés avec la jointure du calque"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "les clés de composants préférés des emplacements ne correspondent à aucun calque du fichier et ont été ignorées"
+"prototype actions of unknown types were skipped" = "les actions de prototype de types inconnus ont été ignorées"
+"prototype actions without a destination in the file were skipped" = "les actions de prototype sans destination dans le fichier ont été ignorées"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "les expressions de prototype portant sur des variables absentes du JSON des variables ont été ignorées"
+"prototype expressions with unsupported functions were skipped" = "les expressions de prototype utilisant des fonctions non prises en charge ont été ignorées"
+"prototype interactions without supported actions were skipped" = "les interactions de prototype sans action prise en charge ont été ignorées"
+"prototype navigations of unknown types were skipped" = "les navigations de prototype de types inconnus ont été ignorées"
+"prototype transitions of unknown types play instantly" = "les transitions de prototype de types inconnus sont instantanées"
+"prototype triggers of unknown types were skipped" = "les déclencheurs de prototype de types inconnus ont été ignorés"
 "put a widget on the canvas" = "placer un widget sur le canevas"
 "read and edit the document" = "lire et modifier le document"
 "read the document" = "lire le document"
 "reads the document" = "lit le document"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "les actions de définition de variable portant sur des variables absentes du JSON des variables ont été ignorées"
+"set-variable actions with values that can't be evaluated were skipped" = "les actions de définition de variable dont les valeurs ne peuvent pas être évaluées ont été ignorées"
+"set-variable actions with values that don't fit the variable were skipped" = "les actions de définition de variable dont les valeurs ne correspondent pas à la variable ont été ignorées"
+"set-variable actions without a value were skipped" = "les actions de définition de variable sans valeur ont été ignorées"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "les actions de définition du mode de variable portant sur des collections ou des modes absents du JSON des variables ont été ignorées"
+"slot content assignment target is missing or is not slot content" = "la cible de l’affectation de contenu d’emplacement est absente ou n’est pas un contenu d’emplacement"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "l’affectation de contenu d’emplacement utilise le GUID vide comme sentinelle et a été ignorée"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "certains points vectoriels renvoient à des réglages de point absents du fichier ; ils utilisent les jointures du calque et des angles simples"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "certains segments vectoriels renvoient à des réglages de style absents du fichier ; ils utilisent le contour du calque"
+"stale or invalid grid track sizing entries were ignored" = "les entrées de dimensionnement de piste de grille obsolètes ou non valides ont été ignorées"
+"stars and polygons without point counts or geometry use the default point count" = "les étoiles et polygones sans nombre de pointes ni géométrie utilisent le nombre de pointes par défaut"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "les réglages de style de certains segments vectoriels ne sont pas pris en charge ; ces segments utilisent le contour du calque"
+"text path underline or strikethrough decoration is not rendered" = "le soulignement ou le barré du texte sur tracé n’est pas affiché"
+"text style overrides refer to missing table entries" = "les remplacements de style de texte renvoient à des entrées de table manquantes"
+"the file has no pages" = "le fichier n’a aucune page"
 "the plugin" = "le plugin"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "le JSON des variables n’a pas de `variableCollections` (la réponse des variables locales était attendue) et a été ignoré"
 "this session only" = "cette session uniquement"
+"unknown component property types were skipped" = "les types de propriété de composant inconnus ont été ignorés"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "les alias vers des variables absentes du JSON des variables (ou d’un autre type) ont été ignorés"
+"variable bindings to properties the layer doesn't have were skipped" = "les liaisons de variables à des propriétés que le calque n’a pas ont été ignorées"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "les liaisons à des variables absentes du JSON des variables (variables de bibliothèque) ont été ignorées"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "les liaisons de variables ont été ignorées : le JSON du fichier n’a aucune définition de variable (transmettez le JSON des variables locales comme `variables`, ou intégrez son `meta` à côté du JSON du fichier)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "les liaisons de variables dont le type de variable ne convient pas à la propriété ont été ignorées"
+"variable collections without modes were skipped" = "les collections de variables sans mode ont été ignorées"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "les recherches de mode de variable dans les expressions de prototype qui ne sont pas une variable et l’un de ses modes ont été ignorées"
+"variable modes of collections that aren't in the file were skipped" = "les modes de variables de collections absentes du fichier ont été ignorés"
+"variable modes of collections that aren't in the variables JSON were skipped" = "les modes de variables de collections absentes du JSON des variables ont été ignorés"
+"variable values that don't match their type (or composed colours) were skipped" = "les valeurs de variables qui ne correspondent pas à leur type (ou les couleurs composées) ont été ignorées"
+"variables of unknown types were skipped" = "les variables de types inconnus ont été ignorées"
+"variables whose collection isn't in the variables JSON were skipped" = "les variables dont la collection est absente du JSON des variables ont été ignorées"
+"variables without readable values were skipped" = "les variables sans valeurs lisibles ont été ignorées"
+"vector points with unknown stroke joins use the layer join" = "les points vectoriels aux jointures inconnues utilisent la jointure du calque"
+"vectors without geometry are empty" = "les vecteurs sans géométrie sont vides"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "les vecteurs sans géométrie sont vides (exportez le JSON du fichier avec geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "le texte très long a été coupé à 1 048 576 caractères"
+"very long vector paths were skipped" = "les tracés vectoriels très longs ont été ignorés"
+"video actions are not supported and were skipped" = "les actions vidéo ne sont pas prises en charge et ont été ignorées"
+"video triggers are not supported and were skipped" = "les déclencheurs vidéo ne sont pas pris en charge et ont été ignorés"
+"yesterday" = "hier"
 "{instances} in {files}" = "{instances} dans {files}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language} : traduction provisoire, en attente de relecture par un locuteur natif."
 "{length} bleed" = "fond perdu de {length}"
+"{month} {day}, {year}" = "{day} {month} {year}"
 "{name}\nClick to apply to the selection" = "{name}\nCliquez pour l’appliquer à la sélection"
 "{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nFaites glisser sur le canevas, ou cliquez pour le placer au centre de la vue.\nMaintenez Alt (Option) en le déposant sur une instance pour la permuter."
 "{name} (from {library})" = "{name} (de {library})"
@@ -1456,11 +1746,12 @@ status = "draft — needs native review"
 "{name} ({tag}): {min} – {max}, default {default}. Double-click the slider to go back to the style's value; Escape while dragging cancels." = "{name} ({tag}) : {min} – {max}, par défaut {default}. Double-cliquez sur le curseur pour revenir à la valeur du style ; Échap pendant le glissement annule."
 "{name} cleared from the list" = "{name} effacé de la liste"
 "{name} from {path}" = "{name} depuis {path}"
-"{name} is forgotten on this computer; the file stays on {server}" = "{name} est oublié sur cet ordinateur ; le fichier reste sur {server}"
+"{name} is forgotten on this computer; the file stays on {server}" = "{name} est oublié sur cet ordinateur ; le fichier reste sur {server}"
 "{name} is on the server." = "{name} est sur le serveur."
-"{name} is spotlighting" = "{name} est sous les projecteurs"
+"{name} is spotlighting" = "{name} fait suivre sa vue"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} est trop volumineux pour être ouvert dans le navigateur (plus de 512 Mo)."
 "{name} was removed from the server" = "{name} a été retiré du serveur"
-"{name} · deleted on main" = "{name} · supprimé dans le principal"
+"{name} · deleted on main" = "{name} · supprimé dans le fichier principal"
 "{name} · deleted on the branch" = "{name} · supprimé dans la branche"
 "{name} · not published" = "{name} · non publié"
 "{name} · on a server" = "{name} · sur un serveur"
@@ -1485,8 +1776,10 @@ status = "draft — needs native review"
 "{n} layers selected" = { one = "{n} calque sélectionné", other = "{n} calques sélectionnés" }
 "{n} layers · {parts}" = { one = "{n} calque · {parts}", other = "{n} calques · {parts}" }
 "{n} matches" = { one = "{n} résultat", other = "{n} résultats" }
+"{n} min" = "{n} min"
 "{n} minutes ago" = { one = "il y a {n} minute", other = "il y a {n} minutes" }
 "{n} months ago" = { one = "il y a {n} mois", other = "il y a {n} mois" }
+"{n} more notes omitted from this report" = { one = "{n} autre note omise de ce rapport", other = "{n} autres notes omises de ce rapport" }
 "{n} of {total}" = "{n} sur {total}"
 "{n} people joined" = { one = "{n} personne a rejoint la session", other = "{n} personnes ont rejoint la session" }
 "{n} preferred components" = { one = "{n} composant préféré", other = "{n} composants préférés" }
@@ -1496,6 +1789,8 @@ status = "draft — needs native review"
 "{n} rows" = { one = "{n} ligne", other = "{n} lignes" }
 "{n} styles" = { one = "{n} style", other = "{n} styles" }
 "{n} variables" = { one = "{n} variable", other = "{n} variables" }
+"{n} votes" = { one = "{n} vote", other = "{n} votes" }
+"{n} votes left" = { one = "{n} vote restant", other = "{n} votes restants" }
 "{n} weeks ago" = { one = "il y a {n} semaine", other = "il y a {n} semaines" }
 "{n} years ago" = { one = "il y a {n} an", other = "il y a {n} ans" }
 "{n}d" = "{n} j"
@@ -1503,6 +1798,7 @@ status = "draft — needs native review"
 "{n}m" = "{n} min"
 "{n}w" = "{n} sem."
 "{page}, nothing selected" = "{page}, aucune sélection"
+"{percent}%" = "{percent} %"
 "{profile} (current)" = "{profile} (actuel)"
 "{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} donne sa valeur ; {property ? \"a\" : \"b\"} choisit un texte. Tout autre {…} reste tel quel."
 "{server} can't say what became of your files (it is older than this app)." = "{server} ne peut pas dire ce que sont devenus vos fichiers (il est plus ancien que cette application)."
@@ -1546,7 +1842,26 @@ status = "draft — needs native review"
 "arrange.packH" = "Tasser horizontalement"
 "arrange.packV" = "Tasser verticalement"
 "arrange.roundToPixels" = "Arrondir aux pixels"
+"arrange.spacing" = "Espacement"
 "arrange.tidy" = "Ranger"
+"board.connector" = "Connecteur"
+"board.ink" = "Trait de marqueur"
+"board.label" = "Libellé du connecteur"
+"board.nextSticky" = "Note autocollante suivante"
+"board.reattach" = "Rattacher le connecteur"
+"board.setColor" = "Couleur du tableau"
+"board.setStyle" = "Style du tableau"
+"board.shape" = "Forme avec texte"
+"board.stamp" = "Tampon"
+"board.sticky" = "Note autocollante"
+"board.table" = "Tableau"
+"board.tableEdit" = "Modifier le tableau"
+"board.template" = "Modèle de tableau blanc"
+"board.templates" = "Lister les modèles de tableau blanc"
+"board.timer" = "Minuteur"
+"board.timerState" = "État du minuteur"
+"board.vote" = "Session de vote"
+"board.voteResults" = "Résultats du vote"
 "bool.exclude" = "Exclure la sélection"
 "bool.flatten" = "Aplatir le booléen"
 "bool.intersect" = "Intersection de la sélection"
@@ -1558,7 +1873,7 @@ status = "draft — needs native review"
 "branch.merge" = "Fusionner la branche"
 "branch.open" = "Ouvrir la branche"
 "branch.review" = "Relire la branche"
-"branch.updateFromMain" = "Mettre à jour depuis le principal"
+"branch.updateFromMain" = "Mettre à jour depuis le fichier principal"
 "codeConnect.export" = "Exporter les liaisons au code"
 "codeConnect.import" = "Importer les liaisons au code"
 "codeConnect.remove" = "Délier du code"
@@ -1582,7 +1897,7 @@ status = "draft — needs native review"
 "collab.report" = "Signaler le fichier à l’opérateur du serveur"
 "collab.serverInfo" = "Informations sur le serveur"
 "collab.share" = "Partager avec un code d’accès"
-"collab.spotlight" = "Me mettre sous les projecteurs"
+"collab.spotlight" = "Faire suivre ma vue"
 "collab.stop" = "Arrêter la session en direct"
 "command.batch" = "Exécuter plusieurs commandes"
 "comment.add" = "Ajouter un commentaire"
@@ -1610,8 +1925,10 @@ status = "draft — needs native review"
 "component.editProperty" = "Modifier la propriété de composant"
 "component.exposeInstance" = "Exposer l’instance imbriquée"
 "component.goToMain" = "Aller au composant principal"
+"component.hideWhenPublishing" = "Masquer à la publication"
 "component.list" = "Lister les composants"
 "component.makeSlot" = "Créer un emplacement"
+"component.playground" = "Bac à sable de composant"
 "component.properties" = "Propriétés du composant"
 "component.pushChanges" = "Transmettre les modifications au composant principal"
 "component.removeSlot" = "Retirer l’emplacement"
@@ -1622,6 +1939,9 @@ status = "draft — needs native review"
 "dev.focus" = "Vue ciblée"
 "dev.resolveChange" = "Résoudre la modification"
 "dev.unfocus" = "Quitter la vue ciblée"
+"devMode.addMeasurement" = "Ajouter une mesure"
+"devMode.measurements" = "Lister les mesures"
+"devMode.removeMeasurement" = "Retirer la mesure"
 "devResource.add" = "Ajouter une ressource de développement"
 "devResource.edit" = "Modifier la ressource de développement"
 "devResource.list" = "Lister les ressources de développement"
@@ -1645,6 +1965,7 @@ status = "draft — needs native review"
 "edit.duplicate" = "Dupliquer"
 "edit.findReplace" = "Rechercher et remplacer"
 "edit.paste" = "Coller"
+"edit.pasteDesignLayers" = "Coller des calques de design"
 "edit.pasteOver" = "Coller par-dessus la sélection"
 "edit.pasteProperties" = "Coller les propriétés"
 "edit.pasteReplace" = "Coller pour remplacer"
@@ -1668,7 +1989,10 @@ status = "draft — needs native review"
 "file.exportLayers" = "Exporter les calques"
 "file.exportSvg" = "Exporter la sélection en SVG"
 "file.import" = "Importer"
+"file.moveTab" = "Déplacer l’onglet"
 "file.new" = "Nouveau fichier de design"
+"file.newBoard" = "Nouveau tableau blanc"
+"file.newFromTemplate" = "Nouveau à partir d’un modèle"
 "file.open" = "Ouvrir"
 "file.openRecent" = "Ouvrir un fichier récent"
 "file.placeImage" = "Placer une image"
@@ -1696,6 +2020,7 @@ status = "draft — needs native review"
 "guide.remove" = "Retirer le repère"
 "guide.select" = "Sélectionner le repère"
 "help.about" = "À propos de FigCraft"
+"help.gettingStarted" = "Premiers pas"
 "help.page" = "Page d’aide"
 "help.shortcuts" = "Raccourcis clavier"
 "image.adjust" = "Régler l’image"
@@ -1749,6 +2074,9 @@ status = "draft — needs native review"
 "node.reparent" = "Déplacer le calque dans"
 "node.set" = "Définir les propriétés"
 "object.batchRename" = "Renommer par lot"
+"object.convertToFrame" = "Convertir en cadre"
+"object.convertToGroup" = "Convertir en groupe"
+"object.convertToSection" = "Convertir en section"
 "object.flipH" = "Retourner horizontalement"
 "object.flipV" = "Retourner verticalement"
 "object.frameSelection" = "Encadrer la sélection"
@@ -1805,6 +2133,8 @@ status = "draft — needs native review"
 "pref.reduceMotion" = "Réduire les animations"
 "pref.renameDuplicates" = "Renommer les calques dupliqués"
 "pref.showDimensions" = "Afficher les dimensions sur les objets"
+"pref.startOnHome" = "Démarrer sur l’Accueil"
+"pref.uiScale" = "Taille de l’interface"
 "pref.userName" = "Votre nom dans les commentaires"
 "proto.action.add" = "Ajouter une action de prototype"
 "proto.action.move" = "Réordonner l’action de prototype"
@@ -1835,10 +2165,10 @@ status = "draft — needs native review"
 "select.inverse" = "Inverser la sélection"
 "select.layersAt" = "Calques en un point"
 "select.matching" = "Sélectionner les calques correspondants"
-"select.next" = "Sélectionner l’élément suivant"
+"select.next" = "Sélectionner l’élément suivant du même niveau"
 "select.none" = "Tout désélectionner"
 "select.parent" = "Sélectionner le parent"
-"select.previous" = "Sélectionner l’élément précédent"
+"select.previous" = "Sélectionner l’élément précédent du même niveau"
 "select.remove" = "Retirer de la sélection"
 "select.sameEffect" = "Sélectionner le même effet"
 "select.sameFill" = "Sélectionner le même remplissage"
@@ -1848,6 +2178,12 @@ status = "draft — needs native review"
 "select.sameStroke" = "Sélectionner le même contour"
 "select.sameText" = "Sélectionner les mêmes propriétés de texte"
 "select.set" = "Sélectionner"
+"selection.applyColorStyle" = "Appliquer un style de couleur à la sélection"
+"selection.bindColorVariable" = "Appliquer une variable de couleur à la sélection"
+"selection.colors" = "Couleurs de la sélection"
+"selection.detachColor" = "Détacher la couleur de la sélection"
+"selection.selectColor" = "Sélectionner les calques de cette couleur"
+"selection.setPaint" = "Changer la couleur de la sélection"
 "shape.arrow" = "Flèche"
 "shape.ellipse" = "Ellipse"
 "shape.line" = "Ligne"
@@ -1865,6 +2201,7 @@ status = "draft — needs native review"
 "stroke.set" = "Définir le contour"
 "stroke.widthProfile" = "Profil de largeur"
 "style.apply" = "Appliquer le style"
+"style.bind" = "Lier une variable dans un style"
 "style.create" = "Créer un style"
 "style.delete" = "Supprimer le style"
 "style.detach" = "Détacher le style"
@@ -1873,6 +2210,7 @@ status = "draft — needs native review"
 "style.move" = "Déplacer les styles"
 "style.renameFolder" = "Renommer le dossier de styles"
 "style.update" = "Modifier le style"
+"template.list" = "Lister les modèles"
 "text.alignCenter" = "Centrer"
 "text.alignJustify" = "Justifier"
 "text.alignLeft" = "Aligner à gauche"
@@ -1919,7 +2257,7 @@ status = "draft — needs native review"
 "text.sizeDown" = "Réduire la taille de police"
 "text.sizeUp" = "Augmenter la taille de police"
 "text.strikethrough" = "Barré"
-"text.style" = "Styler une plage de texte"
+"text.style" = "Appliquer un style à une plage de texte"
 "text.trackingDown" = "Réduire l’interlettrage"
 "text.trackingUp" = "Augmenter l’interlettrage"
 "text.underline" = "Souligné"
@@ -1927,10 +2265,14 @@ status = "draft — needs native review"
 "text.weightUp" = "Augmenter la graisse"
 "tool.arrow" = "Flèche"
 "tool.comment" = "Commentaire"
+"tool.connector" = "Connecteur"
 "tool.ellipse" = "Ellipse"
+"tool.eraser" = "Gomme"
 "tool.frame" = "Cadre"
 "tool.hand" = "Main"
+"tool.highlighter" = "Surligneur"
 "tool.line" = "Ligne"
+"tool.marker" = "Marqueur"
 "tool.move" = "Déplacer"
 "tool.pen" = "Plume"
 "tool.pencil" = "Crayon"
@@ -1942,9 +2284,12 @@ status = "draft — needs native review"
 "tool.scaleAnchor" = "Ancre de mise à l’échelle"
 "tool.section" = "Section"
 "tool.set" = "Choisir un outil"
+"tool.shape" = "Formes"
 "tool.shapeBuilder" = "Générateur de formes"
 "tool.slice" = "Tranche"
+"tool.stamp" = "Tampon"
 "tool.star" = "Étoile"
+"tool.sticky" = "Note autocollante"
 "tool.text" = "Texte"
 "transform.move" = "Déplacer"
 "transform.moveTo" = "Déplacer vers"
@@ -2002,15 +2347,17 @@ status = "draft — needs native review"
 "vector.edit.smooth" = "Lisser ou rendre anguleux les points"
 "vector.edit.state" = "État de la modification vectorielle"
 "vector.edit.strokeCap" = "Extrémité du contour au point"
-"vector.edit.strokeJoin" = "Jointure du contour au point"
+"vector.edit.strokeJoin" = "Jonction du contour au point"
 "vector.edit.tool" = "Outil de modification vectorielle"
 "vector.edit.transform" = "Transformer les points"
 "vector.edit.widthPoint" = "Point de largeur"
+"vector.fillRule" = "Définir la règle de remplissage"
 "vector.flatten" = "Aplatir"
 "vector.join" = "Joindre la sélection"
 "vector.offset" = "Décaler le tracé"
 "vector.outlineStroke" = "Convertir le contour en tracé"
 "vector.reverse" = "Inverser le sens du tracé"
+"vector.reverseLoop" = "Inverser la boucle"
 "vector.simplify" = "Simplifier le vecteur"
 "vector.smoothJoin" = "Joindre la sélection en lissant"
 "version.autosave" = "Enregistrer automatiquement une version"
@@ -2036,15 +2383,18 @@ status = "draft — needs native review"
 "view.multiplayerCursors" = "Curseurs des autres participants"
 "view.nextFrame" = "Zoomer sur le cadre suivant"
 "view.nextPage" = "Page suivante"
-"view.nextRegion" = "Activer la région suivante"
+"view.nextRegion" = "Placer le focus sur la région suivante"
 "view.outlines" = "Contours"
+"view.outlinesHiddenLayers" = "Inclure les calques masqués dans les contours"
+"view.outlinesObjectBounds" = "Inclure les limites des objets dans les contours"
 "view.outlinesSelection" = "Contours de la sélection"
 "view.pan" = "Faire défiler la vue"
+"view.panelWidths" = "Réinitialiser la largeur des panneaux"
 "view.pixelGrid" = "Grille de pixels"
 "view.pixelPreview" = "Aperçu des pixels"
 "view.prevFrame" = "Zoomer sur le cadre précédent"
 "view.prevPage" = "Page précédente"
-"view.previousRegion" = "Activer la région précédente"
+"view.previousRegion" = "Placer le focus sur la région précédente"
 "view.proofSrgb" = "Épreuve écran sRGB"
 "view.fullscreen" = "Plein écran"
 "view.prototype" = "Panneau Prototype"
@@ -2069,6 +2419,8 @@ status = "draft — needs native review"
 "widget.click" = "Cliquer sur le widget"
 "widget.insert" = "Insérer un widget"
 "widget.list" = "Lister les widgets"
+"widget.menu" = "Menu du widget"
+"widget.setText" = "Modifier le champ du widget"
 "window.focus" = "Mettre la fenêtre au premier plan"
 "window.new" = "Nouvelle fenêtre"
 
@@ -2097,6 +2449,8 @@ status = "draft — needs native review"
 "view.design" = "Design"
 "view.layers" = "Calques"
 "view.outlines" = "Afficher les contours"
+"view.outlinesHiddenLayers" = "Inclure les calques masqués"
+"view.outlinesObjectBounds" = "Inclure les limites des objets"
 "view.outlinesSelection" = "Afficher les contours de la sélection"
 "view.prototype" = "Prototype"
 "view.themeDark" = "Sombre"
diff --git a/crates/ui-egui/locales/id.toml b/crates/ui-egui/locales/id.toml
index 07c2789c..a3c86021 100644
--- a/crates/ui-egui/locales/id.toml
+++ b/crates/ui-egui/locales/id.toml
@@ -8,6 +8,9 @@ name = "Bahasa Indonesia"
 status = "draft — needs native review"
 
 [ui]
+"Relative to" = "Relatif terhadap"
+"Trigger layer" = "Layer pemicu"
+"Whole screen" = "Seluruh layar"
 
 "% of all commits" = "% dari semua commit"
 "(no longer published)" = "(tidak lagi dipublikasikan)"
@@ -17,6 +20,7 @@ status = "draft — needs native review"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PR, {commits} commit, +{added} / −{deleted} baris (Δ {delta}), +{bin_added} / −{bin_deleted} aset biner, {first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Koleksi file ini dengan mode dan variabel tersebut: timpa nilainya per mode dan tambahkan variabel sendiri"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "File .figcraft dengan nama ini sudah ada. Pilih nama lengkapnya untuk mengonfirmasi penggantian."
 "A layer on its own aligns to its frame: select more layers, or one in a frame" = "Satu layer saja diratakan ke frame-nya: pilih lebih banyak layer, atau satu layer di dalam frame"
 "A responsive product page: hero, features, figures, a quote and a footer" = "Halaman produk responsif: hero, fitur, angka, kutipan, dan footer"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "Spring berjalan hingga stabil: massa, kekakuan, dan redamannya menentukan durasinya"
@@ -36,6 +40,7 @@ status = "draft — needs native review"
 "Add a description" = "Tambah deskripsi"
 "Add a frame (F) or a shape (R) to get started" = "Tambahkan frame (F) atau bentuk (R) untuk memulai"
 "Add a layer or component to tile first" = "Tambahkan dulu layer atau component untuk dijadikan ubin"
+"Add a minute" = "Tambah satu menit"
 "Add a note for developers" = "Tambah catatan untuk developer"
 "Add action" = "Tambah aksi"
 "Add actions for when no condition holds" = "Tambah aksi saat tidak ada kondisi yang terpenuhi"
@@ -43,6 +48,7 @@ status = "draft — needs native review"
 "Add another condition" = "Tambah kondisi lain"
 "Add auto layout" = "Tambah auto layout"
 "Add background behind overlay" = "Tambah latar belakang di balik overlay"
+"Add column" = "Tambah kolom"
 "Add content to this slot" = "Tambah konten ke slot ini"
 "Add dev resource" = "Tambah sumber daya dev"
 "Add effect" = "Tambah efek"
@@ -54,6 +60,7 @@ status = "draft — needs native review"
 "Add library file…" = "Tambah file pustaka…"
 "Add max height" = "Tambah tinggi maks"
 "Add max width" = "Tambah lebar maks"
+"Add measurement" = "Tambah pengukuran"
 "Add min height" = "Tambah tinggi min"
 "Add min width" = "Tambah lebar min"
 "Add mode" = "Tambah mode"
@@ -61,6 +68,7 @@ status = "draft — needs native review"
 "Add or update collections from a variables JSON" = "Tambah atau perbarui koleksi dari JSON variabel"
 "Add properties to make instances configurable" = "Tambahkan properti agar instance dapat dikonfigurasi"
 "Add reaction" = "Tambah reaksi"
+"Add row" = "Tambah baris"
 "Add starting point" = "Tambah titik awal"
 "Add stroke" = "Tambah stroke"
 "Add variant" = "Tambah variant"
@@ -89,8 +97,13 @@ status = "draft — needs native review"
 "All comments" = "Semua komentar"
 "All components" = "Semua component"
 "All fonts" = "Semua font"
+"All objects" = "Semua objek"
 "All supported properties" = "Semua properti yang didukung"
 "All variables" = "Semua variabel"
+"Along the bottom" = "Sepanjang sisi bawah"
+"Along the left" = "Sepanjang sisi kiri"
+"Along the right" = "Sepanjang sisi kanan"
+"Along the top" = "Sepanjang sisi atas"
 "Alpha" = "Alfa"
 "Alphabetical" = "Alfabetis"
 "Alt+drag" = "Alt+seret"
@@ -123,6 +136,7 @@ status = "draft — needs native review"
 "Archived" = "Diarsipkan"
 "Arrange" = "Susun"
 "Arrow" = "Panah"
+"Arrow at the end" = "Panah di ujung"
 "As typed" = "Sesuai ketikan"
 "Asking the server…" = "Menghubungi server…"
 "Assets" = "Aset"
@@ -154,6 +168,7 @@ status = "draft — needs native review"
 "Basics" = "Dasar"
 "Before" = "Sebelum"
 "Bend" = "Lengkungan"
+"Between the selected layers" = "Di antara layer yang dipilih"
 "Bevel" = "Bevel"
 "Binary assets added" = "Aset biner ditambahkan"
 "Binary assets removed" = "Aset biner dihapus"
@@ -171,6 +186,7 @@ status = "draft — needs native review"
 "Bottom" = "Bawah"
 "Bottom left radius" = "Radius kiri bawah"
 "Bottom right radius" = "Radius kanan bawah"
+"Brainstorm" = "Curah gagasan"
 "Branch" = "Branch"
 "Branch archived" = "Branch diarsipkan"
 "Branch merged" = "Branch di-merge"
@@ -196,8 +212,12 @@ status = "draft — needs native review"
 "C or ⇧C" = "C atau ⇧C"
 "CMYK colour" = "Warna CMYK"
 "Can view" = "Dapat melihat"
+"Check" = "Centang"
 "Checking the server…" = "Memeriksa server…"
+"Chevron" = "Chevron"
 "Clear from this list" = "Hapus dari daftar ini"
+"Clear results" = "Hapus hasil"
+"Click objects to vote; click your badge to take a vote back" = "Klik objek untuk memberi suara; klik lencana Anda untuk menarik suara"
 "Code or invite link" = "Kode atau link undangan"
 "Color profile: {name}" = "Profil warna: {name}"
 "Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Gaya warna dan teks, variabel Light dan Dark, tombol, input, dan kartu"
@@ -222,7 +242,7 @@ status = "draft — needs native review"
 "Changes on main" = "Perubahan di main"
 "Changes on the branch" = "Perubahan di branch"
 "Changes unknown" = "Perubahan tidak diketahui"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "Pilih React, Leptos, SwiftUI, Compose, atau Flutter di atas untuk menghubungkan component ini ke kodenya."
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Pilih React, Leptos, Vue, SwiftUI, Compose, ArkUI, atau Flutter di atas untuk menghubungkan component ini ke kodenya."
 "Choose another profile to change it." = "Pilih profil lain untuk mengubahnya."
 "Choose collection" = "Pilih koleksi"
 "Choose image" = "Pilih gambar"
@@ -243,7 +263,6 @@ status = "draft — needs native review"
 "Close tab" = "Tutup tab"
 "Close version history" = "Tutup riwayat versi"
 "Close when clicking outside" = "Tutup saat klik di luar"
-"Close without saving" = "Tutup tanpa menyimpan"
 "Code" = "Kode"
 "Code syntax" = "Sintaks kode"
 "Collapse" = "Ciutkan"
@@ -270,6 +289,7 @@ status = "draft — needs native review"
 "Commits" = "Commit"
 "Company" = "Perusahaan"
 "Compare changes" = "Bandingkan perubahan"
+"Compatibility notes" = "Catatan kompatibilitas"
 "Completed" = "Selesai"
 "Component" = "Component"
 "Component name" = "Nama component"
@@ -284,11 +304,11 @@ status = "draft — needs native review"
 "Connected" = "Terhubung"
 "Connected to code: {from}" = "Terhubung ke kode: {from}"
 "Connection lost, reconnecting (attempt {attempt})…" = "Koneksi terputus, menghubungkan ulang (percobaan {attempt})…"
+"Connector" = "Konektor"
 "Constrain proportions" = "Kunci proporsi"
 "Constraints" = "Batasan"
 "Content" = "Konten"
 "Contents hidden" = "Konten disembunyikan"
-"Contents only" = "Hanya konten"
 "Contextual alternates" = "Alternatif kontekstual"
 "Contrast" = "Kontras"
 "Contributors" = "Kontributor"
@@ -312,6 +332,8 @@ status = "draft — needs native review"
 "Corner radius" = "Radius sudut"
 "Corner smoothing" = "Penghalusan sudut"
 "Couldn't reach {server}: showing what this computer remembers." = "Tidak dapat terhubung ke {server}: menampilkan data yang diingat komputer ini."
+"Couldn't read {name}." = "Tidak dapat membaca {name}."
+"Couldn't save the file" = "Tidak dapat menyimpan file"
 "Count" = "Jumlah"
 "Create" = "Buat"
 "Create a variable collection first" = "Buat koleksi variabel terlebih dahulu"
@@ -335,6 +357,7 @@ status = "draft — needs native review"
 "Current version" = "Versi saat ini"
 "Cursor chat" = "Chat kursor"
 "Custom" = "Kustom"
+"Custom size" = "Ukuran kustom"
 "Cut" = "Potong"
 "Dark" = "Gelap"
 "Darken" = "Gelapkan"
@@ -368,6 +391,7 @@ status = "draft — needs native review"
 "Description" = "Deskripsi"
 "Description (optional)" = "Deskripsi (opsional)"
 "Design" = "Desain"
+"Design panel" = "Panel desain"
 "Design system starter" = "Dasar sistem desain"
 "Desktop" = "Desktop"
 "Destination" = "Tujuan"
@@ -395,6 +419,7 @@ status = "draft — needs native review"
 "Distribute horizontal spacing" = "Sebarkan jarak horizontal"
 "Distribute vertical spacing" = "Sebarkan jarak vertikal"
 "Divider" = "Pembatas"
+"Don't Save" = "Jangan simpan"
 "Don't truncate" = "Jangan potong"
 "Done" = "Selesai"
 "Done editing" = "Selesai mengedit"
@@ -427,6 +452,8 @@ status = "draft — needs native review"
 "Effect settings" = "Pengaturan efek"
 "Effect styles" = "Gaya efek"
 "Effects" = "Efek"
+"Curved" = "Lengkung"
+"Elbow" = "Siku"
 "Ellipse" = "Elips"
 "Ellipses" = "Elips"
 "Else" = "Jika tidak"
@@ -435,6 +462,7 @@ status = "draft — needs native review"
 "Empty" = "Kosong"
 "End" = "Akhir"
 "End point" = "Titik akhir"
+"End vote" = "Akhiri pemungutan suara"
 "Ends the session; everyone keeps their copy" = "Mengakhiri sesi; semua orang tetap memiliki salinannya"
 "Enter" = "Enter"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Masukkan alamat figcraft-server lalu tekan Jelajahi untuk melihat plugin yang ditawarkannya."
@@ -476,6 +504,7 @@ status = "draft — needs native review"
 "False" = "Salah"
 "Feb" = "Feb"
 "Fetching from the server…" = "Mengambil dari server…"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft belum mendukung semua fitur file ini. Catatan berisi apa yang dihilangkan atau diubah pada salinan yang diimpor; file aslinya tidak berubah."
 "File" = "File"
 "File name" = "Nama file"
 "File not found" = "File tidak ditemukan"
@@ -509,6 +538,7 @@ status = "draft — needs native review"
 "Flip text to the other side" = "Balik teks ke sisi lain"
 "Flip vertical" = "Balik vertikal"
 "Flip width profile" = "Balik profil lebar"
+"Flow chart" = "Diagram alir"
 "Flow starting point" = "Titik awal alur"
 "Flow starting points" = "Titik awal alur"
 "Flows" = "Alur"
@@ -561,6 +591,7 @@ status = "draft — needs native review"
 "Hanging list" = "Daftar menggantung"
 "Hanging punctuation" = "Tanda baca menggantung"
 "Hard light" = "Hard light"
+"Heart" = "Hati"
 "Height" = "Tinggi"
 "Help" = "Bantuan"
 "Help and resources" = "Bantuan dan sumber daya"
@@ -573,6 +604,7 @@ status = "draft — needs native review"
 "Hide these tips (Getting started in the Help menu shows them again)" = "Sembunyikan tips ini (tampilkan lagi lewat Memulai di menu Bantuan)"
 "Hide when publishing" = "Sembunyikan saat dipublikasikan"
 "Highlight layers on hover" = "Sorot layer saat hover"
+"Highlighter" = "Stabilo"
 "Highlights" = "Sorotan"
 "Hold Alt" = "Tahan Alt"
 "Hold Alt+Z" = "Tahan Alt+Z"
@@ -598,12 +630,16 @@ status = "draft — needs native review"
 "If" = "Jika"
 "If {condition}" = "Jika {condition}"
 "Ignore auto layout (absolute position)" = "Abaikan auto layout (posisi absolut)"
+"Ignore overlapping layers" = "Abaikan layer yang tumpang tindih"
 "Image" = "Gambar"
+"Images" = "Gambar"
 "Import" = "Impor"
 "Import path" = "Jalur impor"
 "Import plugin from manifest" = "Impor plugin dari manifest"
 "Import plugin from manifest…" = "Impor plugin dari manifest…"
+"Import report" = "Laporan impor"
 "Import variables" = "Impor variabel"
+"Imported document" = "Dokumen yang diimpor"
 "Imported {name}" = "{name} diimpor"
 "Imported {n} new variables, updated {updated}" = { other = "{n} variabel baru diimpor, {updated} diperbarui" }
 "Import…" = "Impor…"
@@ -631,11 +667,13 @@ status = "draft — needs native review"
 "Instance swap (no other component)" = "Tukar instance (tidak ada component lain)"
 "Instances" = "Instance"
 "Instant" = "Instan"
+"Intensity" = "Intensitas"
 "Interaction" = "Interaksi"
 "Interactions" = "Interaksi"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Desain antarmuka dan prototyping. Alat desain clean-room gratis dan open-source yang ditulis dari nol dengan Rust, bagian dari ArtCraft Crafting Apps."
 "Intersect" = "Irisan"
 "Intersects" = "Beririsan"
+"Invalid color" = "Warna tidak valid"
 "Invite link" = "Link undangan"
 "Invite link copied" = "Link undangan disalin"
 "It asks permission to:" = "Plugin ini meminta izin untuk:"
@@ -654,6 +692,8 @@ status = "draft — needs native review"
 "Jun" = "Jun"
 "Just now" = "Baru saja"
 "Justify" = "Rata kiri-kanan"
+"Kanban board" = "Papan kanban"
+"Keep a measurement on the canvas for developers" = "Simpan pengukuran di kanvas untuk developer"
 "Keep appearance" = "Pertahankan tampilan"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Pertahankan tampilan mengonversi setiap nilai warna ke {profile} agar warna terlihat sama. Pertahankan nilai membiarkan angkanya apa adanya, sehingga warna bergeser."
 "Keep tool selected after use" = "Tetap pilih alat setelah dipakai"
@@ -733,6 +773,7 @@ status = "draft — needs native review"
 "Mark as resolved" = "Tandai selesai"
 "Mark as unread" = "Tandai belum dibaca"
 "Mark as unresolved" = "Tandai belum selesai"
+"Marker" = "Spidol"
 "Mask" = "Mask"
 "Mass · Stiffness · Damping" = "Massa · Kekakuan · Redaman"
 "Match (empty: the whole name)" = "Cocokkan (kosong: seluruh nama)"
@@ -742,6 +783,7 @@ status = "draft — needs native review"
 "Maximize" = "Maksimalkan"
 "May" = "Mei"
 "Measure to the selection" = "Ukur ke pilihan"
+"Measurements" = "Pengukuran"
 "Merge into main" = "Merge ke main"
 "Merge regions" = "Gabungkan area"
 "Merge the branch into the main file (one undo step) and archive it" = "Merge branch ke file utama (satu langkah urungkan) lalu arsipkan"
@@ -750,6 +792,7 @@ status = "draft — needs native review"
 "Min H" = "Min T"
 "Min W" = "Min L"
 "Minimize" = "Minimalkan"
+"Minutes" = "Menit"
 "Mirror angle" = "Cerminkan sudut"
 "Mirror angle and length" = "Cerminkan sudut dan panjang"
 "Mirroring" = "Pencerminan"
@@ -791,8 +834,10 @@ status = "draft — needs native review"
 "Named instance" = "Instance bernama"
 "Navigate to" = "Navigasi ke"
 "Nested instance" = "Instance bersarang"
+"New board" = "Papan baru"
 "New design file" = "File desain baru"
 "Newest first" = "Terbaru dulu"
+"Next frame" = "Frame berikutnya"
 "Next or previous control in the focused region" = "Kontrol berikutnya atau sebelumnya di wilayah yang difokuskan"
 "Next ready for dev" = "Siap dev berikutnya"
 "Next size option" = "Opsi ukuran berikutnya"
@@ -802,12 +847,15 @@ status = "draft — needs native review"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "Tidak ada branch. Branch adalah salinan file untuk mencoba perubahan, lalu ditinjau dan di-merge."
 "No category" = "Tanpa kategori"
 "No changes" = "Tidak ada perubahan"
+"No color styles" = "Tidak ada gaya warna"
 "No colour variables fit here." = "Tidak ada variabel warna yang cocok di sini."
 "No colour variables yet. Create them in Local variables." = "Belum ada variabel warna. Buat di Variabel lokal."
 "No comments yet" = "Belum ada komentar"
+"No compatibility warnings reported" = "Tidak ada peringatan kompatibilitas"
 "No components yet. Select layers and press {keys}." = "Belum ada component. Pilih layer lalu tekan {keys}."
 "No conflicts." = "Tidak ada konflik."
 "No contributor data was built into this copy." = "Tidak ada data kontributor yang disertakan dalam salinan ini."
+"No device" = "Tanpa perangkat"
 "No fonts match" = "Tidak ada font yang cocok"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Tidak ada kode gabung di sini (versi server lebih lama dari fitur kode gabung, atau alamat ini tidak dapat dimasukkan ke kode): bagikan link-nya saja."
 "No layer changes to show." = "Tidak ada perubahan layer untuk ditampilkan."
@@ -839,6 +887,7 @@ status = "draft — needs native review"
 "No text styles yet. Click + to create one from the selected text." = "Belum ada gaya teks. Klik + untuk membuat dari teks yang dipilih."
 "No variables fit here." = "Tidak ada variabel yang sesuai di sini."
 "No variables yet. Create them in Local variables." = "Belum ada variabel. Buat di Variabel lokal."
+"No votes yet" = "Belum ada suara"
 "Nobody else is here yet" = "Belum ada orang lain di sini"
 "Noise" = "Noise"
 "None" = "Tidak ada"
@@ -888,6 +937,7 @@ status = "draft — needs native review"
 "Open branch" = "Buka branch"
 "Open file" = "Buka file"
 "Open files" = "Buka file"
+"Open presentations" = "Presentasi yang terbuka"
 "Open in focus view" = "Buka di tampilan fokus"
 "Open in new window" = "Buka di jendela baru"
 "Open invite links in FigCraft" = "Buka link undangan di FigCraft"
@@ -896,6 +946,7 @@ status = "draft — needs native review"
 "Open overlay" = "Buka overlay"
 "Open prototype preview" = "Buka pratinjau prototype"
 "Open variables ({count})" = "Buka variabel ({count})"
+"Opened as a new document" = "Dibuka sebagai dokumen baru"
 "Opened “{name}” in a new tab" = "“{name}” dibuka di tab baru"
 "Open|comments" = "Terbuka"
 "Options" = "Opsi"
@@ -919,7 +970,12 @@ status = "draft — needs native review"
 "PDF print settings" = "Pengaturan cetak PDF"
 "Padding" = "Padding"
 "Page" = "Halaman"
+"Page deleted" = "Halaman dihapus"
 "Pages" = "Halaman"
+"Pages added to the document" = "Halaman ditambahkan ke dokumen"
+"Pause" = "Jeda"
+"Pink" = "Merah muda"
+"Placed on the current page" = "Ditempatkan di halaman saat ini"
 "Pages: {pages}" = "Halaman: {pages}"
 "Paint bucket" = "Ember cat"
 "Pan the canvas" = "Geser kanvas"
@@ -934,6 +990,7 @@ status = "draft — needs native review"
 "Paste a team library link (a view link)" = "Tempel link pustaka tim (link akses lihat)"
 "Paste here" = "Tempel di sini"
 "Paste to replace" = "Tempel dan ganti"
+"Pasted design layers; {n} kinds of content were left out" = { other = "Layer desain ditempel; {n} jenis konten tidak disertakan" }
 "Pattern" = "Pola"
 "Pattern alignment" = "Perataan pola"
 "Pattern scale" = "Skala pola"
@@ -960,6 +1017,7 @@ status = "draft — needs native review"
 "Plugins" = "Plugin"
 "Plus darker" = "Plus darker"
 "Plus lighter" = "Plus lighter"
+"Plus one" = "Plus satu"
 "Point" = "Titik"
 "Points" = "Titik"
 "Polygon" = "Poligon"
@@ -987,6 +1045,7 @@ status = "draft — needs native review"
 "Preview" = "Pratinjau"
 "Preview this flow" = "Pratinjau alur ini"
 "Preview this frame" = "Pratinjau frame ini"
+"Previous frame" = "Frame sebelumnya"
 "Previous ready for dev" = "Versi siap dev sebelumnya"
 "Progressive" = "Progresif"
 "Properties" = "Properti"
@@ -1007,6 +1066,7 @@ status = "draft — needs native review"
 "Push" = "Dorong"
 "Push changes to main component" = "Terapkan perubahan ke main component"
 "Put text on path" = "Tempatkan teks di path"
+"Question" = "Pertanyaan"
 "R" = "R"
 "Radial" = "Radial"
 "Radius" = "Radius"
@@ -1028,6 +1088,7 @@ status = "draft — needs native review"
 "Remove all" = "Hapus semua"
 "Remove annotation" = "Hapus anotasi"
 "Remove auto layout" = "Hapus auto layout"
+"Remove column" = "Hapus kolom"
 "Remove dev resource" = "Hapus sumber daya dev"
 "Remove export setting" = "Hapus pengaturan ekspor"
 "Remove from recents" = "Hapus dari terbaru"
@@ -1036,10 +1097,12 @@ status = "draft — needs native review"
 "Remove guide" = "Hapus garis bantu"
 "Remove interaction" = "Hapus interaksi"
 "Remove library from this file" = "Hapus pustaka dari file ini"
+"Remove measurement" = "Hapus pengukuran"
 "Remove min and max" = "Hapus min dan maks"
 "Remove min and max height" = "Hapus tinggi min dan maks"
 "Remove min and max width" = "Hapus lebar min dan maks"
 "Remove regions" = "Hapus area"
+"Remove row" = "Hapus baris"
 "Remove slot" = "Hapus slot"
 "Remove starting point" = "Hapus titik awal"
 "Remove stop" = "Hapus stop"
@@ -1080,6 +1143,7 @@ status = "draft — needs native review"
 "Resize by the nudge amount" = "Ubah ukuran sebesar jarak geser"
 "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Ubah ukuran frame ke layar perangkat (atau jendela tanpa perangkat): batasan dan auto layout-nya menyesuaikan"
 "Resize to fit" = "Ubah ukuran agar pas"
+"Resizing" = "Pengubahan ukuran"
 "Resolve" = "Selesaikan"
 "Resolve change" = "Selesaikan perubahan"
 "Resolved" = "Terselesaikan"
@@ -1090,6 +1154,9 @@ status = "draft — needs native review"
 "Restore main component" = "Pulihkan main component"
 "Restore this version" = "Pulihkan versi ini"
 "Restored “{name}”" = "“{name}” dipulihkan"
+"Retrospective" = "Retrospektif"
+"Results" = "Hasil"
+"Resume" = "Lanjutkan"
 "Reverse the order" = "Balik urutan"
 "Reversed triangle" = "Segitiga terbalik"
 "Review and merge" = "Tinjau dan merge"
@@ -1105,6 +1172,7 @@ status = "draft — needs native review"
 "Rotation jitter" = "Variasi rotasi"
 "Round" = "Bulat"
 "Rounded" = "Membulat"
+"Rounded rectangle" = "Persegi panjang membulat"
 "Row" = "Baris"
 "Row gap" = "Jarak baris"
 "Row sizes" = "Ukuran baris"
@@ -1114,6 +1182,7 @@ status = "draft — needs native review"
 "Rulers" = "Penggaris"
 "Run" = "Jalankan"
 "Run {label}" = "Jalankan {label}"
+"Save file" = "Simpan file"
 "Search templates" = "Cari templat"
 "See all templates" = "Lihat semua templat"
 "Select layers and they space themselves as their content changes" = "Pilih layer dan jaraknya akan menyesuaikan saat kontennya berubah"
@@ -1153,12 +1222,14 @@ status = "draft — needs native review"
 "Select all with same" = "Pilih semua yang sama"
 "Select layer" = "Pilih layer"
 "Select layers to apply the style to" = "Pilih layer untuk menerapkan gaya"
+"Select layers with this color" = "Pilih layer dengan warna ini"
 "Select overlapping shapes" = "Pilih bentuk yang tumpang tindih"
 "Select points to edit their position, radius and mirroring" = "Pilih titik untuk mengedit posisi, radius, dan pencerminannya"
 "Select slot" = "Pilih slot"
 "Selection" = "Pilihan"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Kotak pilihan, {w} x {h} di {x}, {y}: panah untuk memindahkan, Shift+panah atau {cmd}+panah untuk mengubah ukuran, Enter untuk memilih, Escape untuk membatalkan"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Kotak pilihan: panah untuk memindahkan, Shift+panah atau {cmd}+panah untuk mengubah ukuran, Enter untuk memilih, Escape untuk membatalkan"
+"Selection colors" = "Warna pilihan"
 "Send backward" = "Bawa mundur"
 "Send report" = "Kirim laporan"
 "Send to back" = "Bawa ke paling belakang"
@@ -1175,6 +1246,7 @@ status = "draft — needs native review"
 "Shape" = "Bentuk"
 "Shape builder" = "Shape builder"
 "Shape tools" = "Alat bentuk"
+"Shapes" = "Bentuk"
 "Share" = "Bagikan"
 "Share this file" = "Bagikan file ini"
 "Share with a code" = "Bagikan dengan kode"
@@ -1241,10 +1313,13 @@ status = "draft — needs native review"
 "Space+drag" = "Space+seret"
 "Spacing" = "Spasi"
 "Spam, stolen work, abuse…" = "Spam, karya curian, penyalahgunaan…"
+"Speech bubble" = "Balon kata"
 "Splay" = "Bukaan"
 "Spotlight me" = "Sorot saya"
 "Spread" = "Sebaran"
 "Square" = "Persegi"
+"Stamp" = "Stempel"
+"Stamps" = "Stempel"
 "Standard" = "Standar"
 "Standard ligatures" = "Ligatur standar"
 "Star" = "Bintang"
@@ -1257,15 +1332,22 @@ status = "draft — needs native review"
 "Start point" = "Titik awal"
 "Start sharing" = "Mulai berbagi"
 "Start sharing with the Share button, then pass on the code it gives" = "Mulai berbagi dengan tombol Bagikan, lalu teruskan kode yang diberikannya"
+"Start vote" = "Mulai pemungutan suara"
 "Starting to share…" = "Memulai berbagi…"
 "Status" = "Status"
 "Sticky" = "Menempel"
+"Sticky note" = "Catatan tempel"
+"Sticky note colors" = "Warna catatan tempel"
+"Sticky notes" = "Catatan tempel"
+"Sticky notes, shapes and connectors" = "Catatan tempel, bentuk, dan konektor"
 "Stop" = "Hentikan"
 "Stop following {name}" = "Berhenti mengikuti {name}"
 "Stop session" = "Hentikan sesi"
 "Stop sharing" = "Berhenti berbagi"
 "Stop spotlighting" = "Hentikan sorotan"
+"Stop timer" = "Hentikan pengatur waktu"
 "Stop {n}  {hex}" = "Titik {n}  {hex}"
+"Straight" = "Lurus"
 "Stretch" = "Regangkan"
 "Strikethrough" = "Coret"
 "String" = "String"
@@ -1310,6 +1392,7 @@ status = "draft — needs native review"
 "Text" = "Teks"
 "Text align" = "Perataan teks"
 "Text content" = "Konten teks"
+"Text size" = "Ukuran teks"
 "Text style" = "Gaya teks"
 "Text styles" = "Gaya teks"
 "Texts" = "Teks"
@@ -1340,13 +1423,16 @@ status = "draft — needs native review"
 "This server is open to the public: no key needed." = "Server ini terbuka untuk publik: tidak perlu kunci."
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Server ini memerlukan kuncinya: tambahkan ?key=… ke alamat (`figcraft-server key` menampilkannya di mesin server)."
 "This server takes files only with its key: see Advanced." = "Server ini hanya menerima file dengan kuncinya: lihat Lanjutan."
+"Thumbs up" = "Jempol"
 "Tidy up" = "Rapikan"
 "Tile" = "Ubin"
 "Tile type" = "Jenis ubin"
+"Timer" = "Pengatur waktu"
 "Tint" = "Rona"
 "Title" = "Judul"
 "Title case" = "Huruf Awal Kapital"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Untuk membagikan pustaka ini kepada tim Anda, publikasikan file ke server (Bagikan ▸ Publikasikan ke server…), lalu publikasikan pustaka di sana."
+"To the layer around it" = "Ke layer yang membungkusnya"
 "Toggle" = "Alihkan"
 "Toggle light/dark theme" = "Alihkan tema terang/gelap"
 "Toggle visibility" = "Alihkan visibilitas"
@@ -1356,6 +1442,7 @@ status = "draft — needs native review"
 "Top left radius" = "Radius kiri atas"
 "Top right radius" = "Radius kanan atas"
 "Transform" = "Transformasi"
+"Triangle" = "Segitiga"
 "Triangle arrow" = "Panah segitiga"
 "Trigger" = "Pemicu"
 "True" = "Benar"
@@ -1380,7 +1467,7 @@ status = "draft — needs native review"
 "Unread" = "Belum dibaca"
 "Unresolve" = "Buka kembali"
 "Unsaved changes" = "Perubahan belum disimpan"
-"Unsaved changes in {names}. Close the window and lose them?" = "Perubahan belum disimpan di {names}. Tutup jendela dan buang perubahan?"
+"Unsaved changes in {names}. Save them before closing?" = "Perubahan belum disimpan di {names}. Simpan sebelum menutup?"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Perubahan belum disimpan: simpan dulu ({save}), atau tutup tab dengan {alt}-klik untuk membuangnya"
 "Unsaved changes: save first, or close again with {key} to discard" = "Perubahan belum disimpan: simpan dulu, atau tutup lagi dengan {key} untuk membuangnya"
 "Up" = "Atas"
@@ -1397,6 +1484,7 @@ status = "draft — needs native review"
 "Use as mask" = "Gunakan sebagai mask"
 "Use auto layout" = "Gunakan auto layout"
 "Use number keys for opacity" = "Gunakan tombol angka untuk opasitas"
+"Use the .figcraft or .fig extension." = "Gunakan ekstensi .figcraft atau .fig."
 "Use the layer's fill" = "Gunakan fill layer"
 "Used in {files} · {instances}" = "Digunakan di {files} · {instances}"
 "Username" = "Nama pengguna"
@@ -1432,6 +1520,8 @@ status = "draft — needs native review"
 "Visibility" = "Visibilitas"
 "Visible" = "Terlihat"
 "Vivid" = "Cerah"
+"Votes per person" = "Suara per orang"
+"Voting session" = "Sesi pemungutan suara"
 "Warm" = "Hangat"
 "Watch" = "Jam tangan"
 "Wavy" = "Bergelombang"
@@ -1440,6 +1530,7 @@ status = "draft — needs native review"
 "WebSocket URL" = "URL WebSocket"
 "WebSocket URL copied" = "URL WebSocket disalin"
 "Wedge" = "Baji"
+"Weekly planner" = "Perencana mingguan"
 "Weight" = "Ketebalan"
 "What you try here changes this preview and the code below, not the file" = "Yang Anda coba di sini mengubah pratinjau ini dan kode di bawah, bukan file-nya"
 "What changed since it was marked ready for dev" = "Yang berubah sejak ditandai siap untuk dev"
@@ -1489,26 +1580,121 @@ status = "draft — needs native review"
 "call any command its access allows" = "memanggil perintah apa pun yang diizinkan aksesnya"
 "call only: {commands}" = "hanya memanggil: {commands}"
 "can edit the document" = "dapat mengedit dokumen"
+"can save files" = "dapat menyimpan file"
+"conditional prototype actions nested too deeply were skipped" = "tindakan prototype kondisional yang bersarang terlalu dalam dilewati"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "tindakan prototype kondisional dengan kondisi yang tidak dapat dievaluasi dilewati"
+"connector label background was skipped: style data is missing" = "latar belakang label konektor dilewati: data gaya tidak ada"
+"connector label was skipped: background bounds are invalid" = "label konektor dilewati: batas latar belakang tidak valid"
+"connector label was skipped: background transform is invalid" = "label konektor dilewati: transformasi latar belakang tidak valid"
+"connector label was skipped: composed text transform is invalid" = "label konektor dilewati: transformasi gabungan teks tidak valid"
+"connector label was skipped: derived background bounds are missing" = "label konektor dilewati: batas turunan latar belakang tidak ada"
+"connector label was skipped: derived text bounds are missing" = "label konektor dilewati: batas turunan teks tidak ada"
+"connector label was skipped: text bounds are invalid" = "label konektor dilewati: batas teks tidak valid"
+"connector label was skipped: text style data is missing" = "label konektor dilewati: data gaya teks tidak ada"
+"connector label was skipped: text transform is invalid" = "label konektor dilewati: transformasi teks tidak valid"
+"connector labels were skipped" = "label konektor dilewati"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "layer konektor diimpor sebagai snapshot frame/vector statis beserta labelnya jika ada; binding dinamis titik ujung tidak dipertahankan"
+"connector snapshot vector data is missing; connector was left empty" = "data vector snapshot konektor tidak ada; konektor dibiarkan kosong"
+"connectors whose ends can't be placed are empty" = "konektor yang ujungnya tidak dapat ditempatkan kosong"
 "crop marks" = "tanda potong"
+"damaged vector geometry was skipped" = "geometri vector yang rusak dilewati"
+"damaged vector networks import as outlines" = "jaringan vector yang rusak diimpor sebagai outline"
 "development: {path}" = "pengembangan: {path}"
+"document children other than pages were skipped" = "anak dokumen selain halaman dilewati"
+"duplicate grid track sizing entries use equal tracks" = "entri ukuran track grid yang duplikat memakai track yang sama besar"
 "e.g. count + 1" = "mis. count + 1"
 "e.g. count >= 3 and not done" = "mis. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "konektor siku dan lengkung tanpa jalur tersimpan diimpor sebagai garis lurus"
+"entries without a node type were skipped" = "entri tanpa tipe node dilewati"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "Link figcraft:// dari browser, chat, atau email membuka aplikasi ini dan bergabung ke sesi."
+"filled areas of a vector with their own fill use the layer's fill" = "area terisi pada vector dengan isian sendiri memakai isian layer"
 "from {server}" = "dari {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "pemicu gamepad yang tidak memiliki tepat satu tombol kontroler yang dikenal dilewati"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "daftar track grid melebihi 1000 entri; track memakai ukuran sama besar bawaan"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "ukuran track grid tidak didukung atau rusak; track yang terdampak memakai ukuran sama besar"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "daftar ukuran track grid melebihi 1000 entri; track memakai ukuran sama besar bawaan"
 "hidden" = "tersembunyi"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "filter gambar ambigu karena kedua kontainer filter ada; konversi filter dilewati"
+"image filters use FigCraft's approximate renderer" = "filter gambar memakai perenderan perkiraan FigCraft"
+"instance swap properties whose default component isn't in the file were skipped" = "properti tukar instance yang component bawaannya tidak ada di file dilewati"
+"instances inside their own main component were imported as frames" = "instance di dalam main component-nya sendiri diimpor sebagai frame"
+"instances of components that aren't in the file show no layers" = "instance dari component yang tidak ada di file tidak menampilkan layer"
+"instances of components that aren't in the file were imported as frames" = "instance dari component yang tidak ada di file diimpor sebagai frame"
+"instances that would nest a component inside itself were imported as frames" = "instance yang akan menyarangkan component di dalam dirinya sendiri diimpor sebagai frame"
+"instances without a main component were imported as empty frames" = "instance tanpa main component diimpor sebagai frame kosong"
+"invalid internal .fig text path data was ignored" = "data teks di path internal .fig yang tidak valid diabaikan"
+"invalid or oversized vector networks import as outlines" = "jaringan vector yang tidak valid atau terlalu besar diimpor sebagai outline"
+"invalid or oversized vector path data was skipped" = "data jalur vector yang tidak valid atau terlalu besar dilewati"
 "just now" = "baru saja"
+"key triggers without a supported key were skipped" = "pemicu tombol tanpa tombol yang didukung dilewati"
+"key up triggers import as key presses" = "pemicu saat tombol dilepas diimpor sebagai penekanan tombol"
+"layers without a position were placed at their parent's origin" = "layer tanpa posisi ditempatkan di titik asal induknya"
+"layers without a type were skipped" = "layer tanpa tipe dilewati"
+"legacy image filter container is unsupported; filter conversion was skipped" = "kontainer filter gambar versi lama tidak didukung; konversi filter dilewati"
 "locked" = "terkunci"
+"malformed image filters container was skipped" = "kontainer filter gambar yang rusak dilewati"
+"malformed image paintFilter container was skipped" = "kontainer paintFilter gambar yang rusak dilewati"
+"malformed slot content assignment was skipped" = "penetapan konten slot yang rusak dilewati"
 "no bleed" = "tanpa bleed"
 "nobody else here yet" = "belum ada orang lain di sini"
+"non-default slot settings are not represented and were skipped" = "pengaturan slot non-default tidak dapat direpresentasikan dan dilewati"
 "now" = "sekarang"
+"offer files to save if it asks to (you choose where each one goes)" = "menawarkan file untuk disimpan jika memintanya (Anda memilih lokasi tiap file)"
 "or" = "atau"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "sambungan stroke per titik dipertahankan; stroke putus-putus atau berlebar variabel digambar dengan sambungan layer"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "kunci component pilihan slot tidak dapat dicocokkan dengan layer di file dan dilewati"
+"prototype actions of unknown types were skipped" = "tindakan prototype dengan tipe yang tidak dikenal dilewati"
+"prototype actions without a destination in the file were skipped" = "tindakan prototype tanpa tujuan di file dilewati"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "ekspresi prototype pada variabel yang tidak ada di JSON variabel dilewati"
+"prototype expressions with unsupported functions were skipped" = "ekspresi prototype dengan fungsi yang tidak didukung dilewati"
+"prototype interactions without supported actions were skipped" = "interaksi prototype tanpa tindakan yang didukung dilewati"
+"prototype navigations of unknown types were skipped" = "navigasi prototype dengan tipe yang tidak dikenal dilewati"
+"prototype transitions of unknown types play instantly" = "transisi prototype dengan tipe yang tidak dikenal berjalan instan"
+"prototype triggers of unknown types were skipped" = "pemicu prototype dengan tipe yang tidak dikenal dilewati"
 "put a widget on the canvas" = "menaruh widget di kanvas"
 "read and edit the document" = "membaca dan mengedit dokumen"
 "read the document" = "membaca dokumen"
 "reads the document" = "membaca dokumen"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "tindakan atur variabel pada variabel yang tidak ada di JSON variabel dilewati"
+"set-variable actions with values that can't be evaluated were skipped" = "tindakan atur variabel dengan nilai yang tidak dapat dievaluasi dilewati"
+"set-variable actions with values that don't fit the variable were skipped" = "tindakan atur variabel dengan nilai yang tidak cocok dengan variabelnya dilewati"
+"set-variable actions without a value were skipped" = "tindakan atur variabel tanpa nilai dilewati"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "tindakan atur mode variabel pada koleksi atau mode yang tidak ada di JSON variabel dilewati"
+"slot content assignment target is missing or is not slot content" = "target penetapan konten slot tidak ada atau bukan konten slot"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "penetapan konten slot memakai GUID kosong sebagai penanda dan dilewati"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "beberapa titik vector merujuk ke pengaturan titik yang tidak ada di file; titik tersebut memakai sambungan layer dan sudut biasa"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "beberapa segmen vector merujuk ke pengaturan gaya yang tidak ada di file; segmen tersebut memakai stroke layer"
+"stale or invalid grid track sizing entries were ignored" = "entri ukuran track grid yang usang atau tidak valid diabaikan"
+"stars and polygons without point counts or geometry use the default point count" = "bintang dan poligon tanpa jumlah titik atau geometri memakai jumlah titik bawaan"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "pengaturan gaya beberapa segmen vector tidak didukung; segmen tersebut memakai stroke layer"
+"text path underline or strikethrough decoration is not rendered" = "garis bawah atau coretan pada teks di path tidak digambar"
+"text style overrides refer to missing table entries" = "penimpaan gaya teks merujuk ke entri tabel yang tidak ada"
+"the file has no pages" = "file tidak memiliki halaman"
 "the plugin" = "plugin"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "JSON variabel tidak memiliki `variableCollections` (yang diharapkan adalah respons variabel lokal) dan diabaikan"
 "this session only" = "hanya sesi ini"
+"unknown component property types were skipped" = "tipe properti component yang tidak dikenal dilewati"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "alias ke variabel yang tidak ada di JSON variabel (atau bertipe lain) dilewati"
+"variable bindings to properties the layer doesn't have were skipped" = "binding variabel ke properti yang tidak dimiliki layer dilewati"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "binding ke variabel yang tidak ada di JSON variabel (variabel pustaka) dilewati"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "binding variabel dilewati: JSON file tidak memiliki definisi variabel (berikan JSON variabel lokal sebagai `variables`, atau sematkan `meta`-nya di samping JSON file)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "binding variabel yang tipe variabelnya tidak cocok dengan properti dilewati"
+"variable collections without modes were skipped" = "koleksi variabel tanpa mode dilewati"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "pencarian mode variabel dalam ekspresi prototype yang bukan berupa variabel dan salah satu modenya dilewati"
+"variable modes of collections that aren't in the file were skipped" = "mode variabel dari koleksi yang tidak ada di file dilewati"
+"variable modes of collections that aren't in the variables JSON were skipped" = "mode variabel dari koleksi yang tidak ada di JSON variabel dilewati"
+"variable values that don't match their type (or composed colours) were skipped" = "nilai variabel yang tidak sesuai dengan tipenya (atau warna gabungan) dilewati"
+"variables of unknown types were skipped" = "variabel dengan tipe yang tidak dikenal dilewati"
+"variables whose collection isn't in the variables JSON were skipped" = "variabel yang koleksinya tidak ada di JSON variabel dilewati"
+"variables without readable values were skipped" = "variabel tanpa nilai yang dapat dibaca dilewati"
+"vector points with unknown stroke joins use the layer join" = "titik vector dengan sambungan stroke yang tidak dikenal memakai sambungan layer"
+"vectors without geometry are empty" = "vector tanpa geometri kosong"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "vector tanpa geometri kosong (ekspor JSON file dengan geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "teks yang sangat panjang dipotong menjadi 1.048.576 karakter"
+"very long vector paths were skipped" = "jalur vector yang sangat panjang dilewati"
+"video actions are not supported and were skipped" = "tindakan video tidak didukung dan dilewati"
+"video triggers are not supported and were skipped" = "pemicu video tidak didukung dan dilewati"
 "yesterday" = "kemarin"
 "{instances} in {files}" = "{instances} di {files}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}: terjemahan draf, menunggu tinjauan penutur asli."
@@ -1518,6 +1704,7 @@ status = "draft — needs native review"
 "{name} is forgotten on this computer; the file stays on {server}" = "{name} dilupakan di komputer ini; file tetap ada di {server}"
 "{name} is on the server." = "{name} ada di server."
 "{name} is spotlighting" = "{name} sedang spotlight"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} terlalu besar untuk dibuka di browser (lebih dari 512 MB)."
 "{name}\nClick to apply to the selection" = "{name}\nKlik untuk menerapkan ke pilihan"
 "{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nSeret ke kanvas, atau klik untuk menaruh di tengah tampilan.\nTahan Alt (Option) saat melepas di atas instance untuk menukarnya."
 "{name} (from {library})" = "{name} (dari {library})"
@@ -1551,8 +1738,10 @@ status = "draft — needs native review"
 "{n} layers selected" = { other = "{n} layer dipilih" }
 "{n} layers · {parts}" = { other = "{n} layer · {parts}" }
 "{n} matches" = { other = "{n} kecocokan" }
+"{n} min" = "{n} mnt"
 "{n} minutes ago" = { other = "{n} menit lalu" }
 "{n} months ago" = { other = "{n} bulan lalu" }
+"{n} more notes omitted from this report" = { other = "{n} catatan lainnya tidak dicantumkan dalam laporan ini" }
 "{n} of {total}" = "{n} dari {total}"
 "{n} people joined" = { other = "{n} orang bergabung" }
 "{n} preferred components" = { other = "{n} component pilihan" }
@@ -1562,6 +1751,8 @@ status = "draft — needs native review"
 "{n} rows" = { other = "{n} baris" }
 "{n} styles" = { other = "{n} gaya" }
 "{n} variables" = { other = "{n} variabel" }
+"{n} votes" = { other = "{n} suara" }
+"{n} votes left" = { other = "Sisa {n} suara" }
 "{n} weeks ago" = { other = "{n} minggu lalu" }
 "{n} years ago" = { other = "{n} tahun lalu" }
 "{n}d" = "{n} hr"
@@ -1612,7 +1803,26 @@ status = "draft — needs native review"
 "arrange.packH" = "Rapatkan horizontal"
 "arrange.packV" = "Rapatkan vertikal"
 "arrange.roundToPixels" = "Bulatkan ke piksel"
+"arrange.spacing" = "Spasi"
 "arrange.tidy" = "Rapikan"
+"board.connector" = "Konektor"
+"board.ink" = "Goresan spidol"
+"board.label" = "Label konektor"
+"board.nextSticky" = "Catatan tempel berikutnya"
+"board.reattach" = "Pasang ulang konektor"
+"board.setColor" = "Warna papan"
+"board.setStyle" = "Gaya papan"
+"board.shape" = "Bentuk dengan teks"
+"board.stamp" = "Stempel"
+"board.sticky" = "Catatan tempel"
+"board.table" = "Tabel"
+"board.tableEdit" = "Edit tabel"
+"board.template" = "Templat papan"
+"board.templates" = "Daftar templat papan"
+"board.timer" = "Pengatur waktu"
+"board.timerState" = "Status pengatur waktu"
+"board.vote" = "Sesi pemungutan suara"
+"board.voteResults" = "Hasil pemungutan suara"
 "bool.exclude" = "Kecualikan pilihan"
 "bool.flatten" = "Satukan boolean"
 "bool.intersect" = "Iriskan pilihan"
@@ -1689,6 +1899,9 @@ status = "draft — needs native review"
 "dev.focus" = "Tampilan fokus"
 "dev.resolveChange" = "Selesaikan perubahan"
 "dev.unfocus" = "Keluar dari tampilan fokus"
+"devMode.addMeasurement" = "Tambah pengukuran"
+"devMode.measurements" = "Daftar pengukuran"
+"devMode.removeMeasurement" = "Hapus pengukuran"
 "devResource.add" = "Tambah sumber daya dev"
 "devResource.edit" = "Edit sumber daya dev"
 "devResource.list" = "Daftar sumber daya dev"
@@ -1712,6 +1925,7 @@ status = "draft — needs native review"
 "edit.duplicate" = "Duplikat"
 "edit.findReplace" = "Cari dan ganti"
 "edit.paste" = "Tempel"
+"edit.pasteDesignLayers" = "Tempel layer desain"
 "edit.pasteOver" = "Tempel di atas pilihan"
 "edit.pasteProperties" = "Tempel properti"
 "edit.pasteReplace" = "Tempel dan ganti"
@@ -1735,7 +1949,9 @@ status = "draft — needs native review"
 "file.exportLayers" = "Ekspor layer"
 "file.exportSvg" = "Ekspor pilihan sebagai SVG"
 "file.import" = "Impor"
+"file.moveTab" = "Pindahkan tab"
 "file.new" = "File desain baru"
+"file.newBoard" = "Papan baru"
 "file.newFromTemplate" = "Baru dari templat"
 "file.open" = "Buka"
 "file.openRecent" = "Buka terbaru"
@@ -1918,6 +2134,12 @@ status = "draft — needs native review"
 "select.sameStroke" = "Pilih stroke yang sama"
 "select.sameText" = "Pilih properti teks yang sama"
 "select.set" = "Pilih"
+"selection.applyColorStyle" = "Terapkan gaya warna ke pilihan"
+"selection.bindColorVariable" = "Terapkan variabel warna ke pilihan"
+"selection.colors" = "Warna pilihan"
+"selection.detachColor" = "Lepas warna pilihan"
+"selection.selectColor" = "Pilih layer dengan warna ini"
+"selection.setPaint" = "Ubah warna pilihan"
 "shape.arrow" = "Panah"
 "shape.ellipse" = "Elips"
 "shape.line" = "Garis"
@@ -1998,10 +2220,14 @@ status = "draft — needs native review"
 "text.weightUp" = "Tambah ketebalan font"
 "tool.arrow" = "Panah"
 "tool.comment" = "Komentar"
+"tool.connector" = "Konektor"
 "tool.ellipse" = "Elips"
+"tool.eraser" = "Penghapus"
 "tool.frame" = "Frame"
 "tool.hand" = "Tangan"
+"tool.highlighter" = "Stabilo"
 "tool.line" = "Garis"
+"tool.marker" = "Spidol"
 "tool.move" = "Pindahkan"
 "tool.pen" = "Pena"
 "tool.pencil" = "Pensil"
@@ -2013,9 +2239,12 @@ status = "draft — needs native review"
 "tool.scaleAnchor" = "Titik acuan skala"
 "tool.section" = "Section"
 "tool.set" = "Pilih alat"
+"tool.shape" = "Bentuk"
 "tool.shapeBuilder" = "Shape builder"
 "tool.slice" = "Slice"
+"tool.stamp" = "Stempel"
 "tool.star" = "Bintang"
+"tool.sticky" = "Catatan tempel"
 "tool.text" = "Teks"
 "transform.move" = "Pindahkan"
 "transform.moveTo" = "Pindahkan ke"
@@ -2077,11 +2306,13 @@ status = "draft — needs native review"
 "vector.edit.tool" = "Alat edit vector"
 "vector.edit.transform" = "Transformasi titik"
 "vector.edit.widthPoint" = "Titik lebar"
+"vector.fillRule" = "Atur aturan isian"
 "vector.flatten" = "Satukan"
 "vector.join" = "Gabungkan pilihan"
 "vector.offset" = "Offset path"
 "vector.outlineStroke" = "Outline stroke"
 "vector.reverse" = "Balik arah path"
+"vector.reverseLoop" = "Balik loop"
 "vector.simplify" = "Sederhanakan vector"
 "vector.smoothJoin" = "Gabungkan pilihan dengan halus"
 "version.autosave" = "Simpan versi otomatis"
@@ -2143,6 +2374,8 @@ status = "draft — needs native review"
 "widget.click" = "Klik widget"
 "widget.insert" = "Sisipkan widget"
 "widget.list" = "Daftar widget"
+"widget.menu" = "Menu widget"
+"widget.setText" = "Edit kolom widget"
 "window.focus" = "Bawa jendela ke depan"
 "window.new" = "Jendela baru"
 "template.list" = "Daftar templat"
diff --git a/crates/ui-egui/locales/it.toml b/crates/ui-egui/locales/it.toml
new file mode 100644
index 00000000..63118197
--- /dev/null
+++ b/crates/ui-egui/locales/it.toml
@@ -0,0 +1,2363 @@
+# FigCraft interface strings: Italian.
+#
+# Draft — needs native review: machine-drafted from the English catalog. Brand names and keyboard
+# glyphs stay as they are. See docs/translating.md.
+
+[meta]
+name = "Italiano"
+status = "draft — needs native review"
+
+[ui]
+"% of all commits" = "% di tutti i commit"
+"(no longer published)" = "(non più pubblicato)"
+"({n} warnings: some entries were skipped)" = { one = "({n} avviso: alcune voci sono state saltate)", other = "({n} avvisi: alcune voci sono state saltate)" }
+"+ Create variable" = "+ Crea variabile"
+".fig (experimental)" = ".fig (sperimentale)"
+"1…9, 0" = "1…9, 0"
+"@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PR, {commits} commit, +{added} / −{deleted} righe (Δ {delta}), +{bin_added} / −{bin_deleted} asset binari, {first} – {last}"
+"A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Una collezione di questo file con queste modalità e variabili: sovrascrivi i loro valori per modalità e aggiungi variabili proprie"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Esiste già un file .figcraft con questo nome. Scegli il nome completo per confermare la sostituzione."
+"A layer on its own aligns to its frame: select more layers, or one in a frame" = "Un livello da solo si allinea al proprio frame: seleziona più livelli, oppure uno dentro un frame"
+"A responsive product page: hero, features, figures, a quote and a footer" = "Una pagina prodotto responsive: hero, funzionalità, figure, una citazione e un footer"
+"A spring plays until it settles: its mass, stiffness and damping set how long" = "Una molla si muove finché non si assesta: massa, rigidità e smorzamento ne determinano la durata"
+"A title, an agenda, a big figure, a chart and a closing slide" = "Un titolo, un'agenda, una cifra grande, un grafico e una slide di chiusura"
+"A to Z" = "Dalla A alla Z"
+"About" = "Informazioni"
+"About FigCraft" = "Informazioni su FigCraft"
+"About this server" = "Informazioni su questo server"
+"Action" = "Azione"
+"Actions" = "Azioni"
+"Actions for {name}" = "Azioni per {name}"
+"Actions…" = "Azioni…"
+"Active" = "Attivo"
+"Actual size (100%)" = "Dimensione reale (100%)"
+"Add a category" = "Aggiungi una categoria"
+"Add a comment" = "Aggiungi un commento"
+"Add a description" = "Aggiungi una descrizione"
+"Add a frame (F) or a shape (R) to get started" = "Aggiungi un frame (F) o una forma (R) per iniziare"
+"Add a layer or component to tile first" = "Aggiungi prima un livello o un componente da affiancare"
+"Add a note for developers" = "Aggiungi una nota per gli sviluppatori"
+"Add action" = "Aggiungi azione"
+"Add actions for when no condition holds" = "Aggiungi azioni per quando nessuna condizione è vera"
+"Add an annotation for developers" = "Aggiungi un'annotazione per gli sviluppatori"
+"Add another condition" = "Aggiungi un'altra condizione"
+"Add auto layout" = "Aggiungi auto layout"
+"Add background behind overlay" = "Aggiungi sfondo dietro la sovrapposizione"
+"Add content to this slot" = "Aggiungi contenuto a questo slot"
+"Add dev resource" = "Aggiungi risorsa per sviluppatori"
+"Add effect" = "Aggiungi effetto"
+"Add export setting" = "Aggiungi impostazione di esportazione"
+"Add fill" = "Aggiungi riempimento"
+"Add interaction" = "Aggiungi interazione"
+"Add layout grid" = "Aggiungi griglia di layout"
+"Add library" = "Aggiungi libreria"
+"Add library file…" = "Aggiungi file libreria…"
+"Add max height" = "Aggiungi altezza massima"
+"Add max width" = "Aggiungi larghezza massima"
+"Add min height" = "Aggiungi altezza minima"
+"Add min width" = "Aggiungi larghezza minima"
+"Add mode" = "Aggiungi modalità"
+"Add new page" = "Aggiungi nuova pagina"
+"Add or update collections from a variables JSON" = "Aggiungi o aggiorna collezioni da un JSON di variabili"
+"Add properties to make instances configurable" = "Aggiungi proprietà per rendere le istanze configurabili"
+"Add reaction" = "Aggiungi reazione"
+"Add starting point" = "Aggiungi punto di partenza"
+"Add stroke" = "Aggiungi contorno"
+"Add variant" = "Aggiungi variante"
+"Add variant with a new value" = "Aggiungi variante con un nuovo valore"
+"Added" = "Aggiunto"
+"Added the library \"{name}\"" = "Libreria \"{name}\" aggiunta"
+"Adding to {name}" = "Aggiunta a {name}"
+"Adjust" = "Regola"
+"Adjustment presets" = "Preset di regolazione"
+"Advanced" = "Avanzate"
+"Advanced stroke" = "Contorno avanzato"
+"After delay" = "Dopo un ritardo"
+"After delay {ms}ms" = "Dopo un ritardo di {ms} ms"
+"Align" = "Allinea"
+"Align bottom" = "Allinea in basso"
+"Align center" = "Allinea al centro"
+"Align horizontal centers" = "Allinea i centri orizzontali"
+"Align left" = "Allinea a sinistra"
+"Align middle" = "Allinea a metà altezza"
+"Align right" = "Allinea a destra"
+"Align text baselines" = "Allinea le linee di base del testo"
+"Align top" = "Allinea in alto"
+"Align vertical centers" = "Allinea i centri verticali"
+"Alignment" = "Allineamento"
+"All" = "Tutti"
+"All categories" = "Tutte le categorie"
+"All comments" = "Tutti i commenti"
+"All components" = "Tutti i componenti"
+"All fonts" = "Tutti i font"
+"All supported properties" = "Tutte le proprietà supportate"
+"All the fonts this file uses are installed" = "Tutti i font usati da questo file sono installati"
+"All variables" = "Tutte le variabili"
+"Alpha" = "Alfa"
+"Alphabetical" = "Alfabetico"
+"Alt+drag" = "Alt+trascina"
+"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "Una schermata di analisi su una griglia: cifre, grafici disegnati con vettori e una tabella"
+"An invite link that opens FigCraft and joins" = "Un link di invito che apre FigCraft e si unisce"
+"Anchor" = "Ancora"
+"Android" = "Android"
+"Angular" = "Angolare"
+"Animation" = "Animazione"
+"Annotations" = "Annotazioni"
+"Annotations shown on the canvas" = "Annotazioni mostrate sul canvas"
+"Another server, or one that needs its key. The usual server is set in Preferences." = "Un altro server, oppure uno che richiede la sua chiave. Il server abituale si imposta nelle Preferenze."
+"Any status" = "Qualsiasi stato"
+"Anyone on your network with this code can edit the file, while this app stays open." = "Chiunque nella tua rete abbia questo codice può modificare il file, finché questa app resta aperta."
+"Anyone with the edit link can change the file; the view link only lets people look. The links carry their secrets: share them like passwords. `figcraft-server links` makes more and revokes them." = "Chiunque abbia il link di modifica può cambiare il file; il link di visualizzazione permette solo di guardare. I link contengono i loro segreti: condividili come password. `figcraft-server links` ne crea altri e li revoca."
+"Anyone with this code can edit the file." = "Chiunque abbia questo codice può modificare il file."
+"Anyone with this code can look at the file, not change it." = "Chiunque abbia questo codice può vedere il file, ma non modificarlo."
+"Appearance" = "Aspetto"
+"Apply a component property" = "Applica una proprietà del componente"
+"Apply variable" = "Applica variabile"
+"Apply variable to text" = "Applica variabile al testo"
+"Apply variable to visibility" = "Applica variabile alla visibilità"
+"Apps" = "App"
+"Apr" = "apr"
+"Arc" = "Arco"
+"Arc ratio" = "Rapporto dell'arco"
+"Arc start" = "Inizio dell'arco"
+"Arc sweep" = "Ampiezza dell'arco"
+"Archive" = "Archivia"
+"Archived" = "Archiviato"
+"Arrange" = "Disponi"
+"Arrow" = "Freccia"
+"As typed" = "Come digitato"
+"Asking the server…" = "Interrogo il server…"
+"Assets" = "Asset"
+"Aug" = "ago"
+"Auto" = "Auto"
+"Auto (space around)" = "Auto (spazio attorno)"
+"Auto (space between)" = "Auto (spazio tra)"
+"Auto (space evenly)" = "Auto (spazio uniforme)"
+"Auto ({mode})" = "Auto ({mode})"
+"Auto columns" = "Colonne automatiche"
+"Auto gap" = "Spaziatura automatica"
+"Auto height" = "Altezza automatica"
+"Auto layout" = "Auto layout"
+"Auto rows" = "Righe automatiche"
+"Auto width" = "Larghezza automatica"
+"Back to the FigCraft server" = "Torna al server FigCraft"
+"Back to the font's value" = "Torna al valore del font"
+"Back" = "Indietro"
+"Back to Ready for dev" = "Torna a Pronto per lo sviluppo"
+"Back to Ready for dev: the next change compares with how it is now" = "Torna a Pronto per lo sviluppo: la prossima modifica sarà confrontata con lo stato attuale"
+"Back to assets" = "Torna agli asset"
+"Back to current" = "Torna alla versione attuale"
+"Back to styles" = "Torna agli stili"
+"Back to the canvas from a focused region" = "Torna al canvas da un'area attiva"
+"Back to the current version" = "Torna alla versione attuale"
+"Back to the values the font style implies" = "Torna ai valori previsti dallo stile del font"
+"Background" = "Sfondo"
+"Background blur" = "Sfocatura dello sfondo"
+"Basics" = "Nozioni di base"
+"Before" = "Prima"
+"Bend" = "Curva"
+"Bevel" = "Smusso"
+"Binary assets added" = "Asset binari aggiunti"
+"Binary assets removed" = "Asset binari rimossi"
+"Black & white" = "Bianco e nero"
+"Bleed" = "Abbondanza"
+"Bleed marks" = "Crocini di abbondanza"
+"Bleed marks need a bleed" = "I crocini di abbondanza richiedono un'abbondanza"
+"Blend" = "Fusione"
+"Blend mode" = "Metodo di fusione"
+"Blue" = "Blu"
+"Blur" = "Sfocatura"
+"Boolean" = "Booleano"
+"Boolean groups" = "Gruppi booleani"
+"Both directions" = "Entrambe le direzioni"
+"Bottom" = "In basso"
+"Bottom left radius" = "Raggio in basso a sinistra"
+"Bottom padding" = "Margine interno inferiore"
+"Bottom right radius" = "Raggio in basso a destra"
+"Branch" = "Ramo"
+"Branch archived" = "Ramo archiviato"
+"Branch merged" = "Ramo unito"
+"Branch name" = "Nome del ramo"
+"Branch of {file}" = "Ramo di {file}"
+"Branch of {file} · merged or archived" = "Ramo di {file} · unito o archiviato"
+"Branch updated from main" = "Ramo aggiornato da main"
+"Branch {name}" = "Ramo {name}"
+"Branches" = "Rami"
+"Bound to {name}. Click to detach the variable." = "Collegato a {name}. Clicca per scollegare la variabile."
+"Bring forward" = "Porta avanti"
+"Bring the main file's changes into the branch" = "Porta le modifiche del file principale nel ramo"
+"Bring to front" = "Porta in primo piano"
+"Bristle" = "Setola"
+"Browse" = "Sfoglia"
+"Brush" = "Pennello"
+"Brush rotation jitter" = "Variazione casuale della rotazione del pennello"
+"Brush scatter" = "Dispersione del pennello"
+"Brush size jitter" = "Variazione casuale della dimensione del pennello"
+"Brush spacing" = "Spaziatura del pennello"
+"Bulleted list" = "Elenco puntato"
+"C or Shift+C" = "C o Maiusc+C"
+"C or ⇧C" = "C o ⇧C"
+"CMYK colour" = "Colore CMYK"
+"Can view" = "Può visualizzare"
+"Checking the fonts installed on this computer…" = "Controllo dei font installati su questo computer…"
+"Checking the server…" = "Controllo del server…"
+"Clear from this list" = "Rimuovi da questo elenco"
+"Code or invite link" = "Codice o link di invito"
+"Color profile: {name}" = "Profilo colore: {name}"
+"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Stili di colore e di testo, variabili Chiaro e Scuro, pulsanti, campi di input e schede"
+"Convert to frame" = "Converti in frame"
+"Convert to section" = "Converti in sezione"
+"CSS custom properties…" = "Proprietà personalizzate CSS…"
+"Can edit" = "Può modificare"
+"Can't read this library: {e}" = "Impossibile leggere questa libreria: {e}"
+"Cancel" = "Annulla"
+"Canvas" = "Canvas"
+"Canvas stacking" = "Sovrapposizione nel canvas"
+"Cap height to baseline" = "Altezza delle maiuscole fino alla linea di base"
+"Case" = "Maiuscole/minuscole"
+"Case-sensitive forms" = "Forme sensibili alle maiuscole"
+"Categories" = "Categorie"
+"Center" = "Centro"
+"Change alias" = "Cambia alias"
+"Change resolved" = "Cambia lo stato di risolto"
+"Change style" = "Cambia stile"
+"Change to" = "Cambia in"
+"Change to needs a layer inside a variant" = "\"Cambia in\" richiede un livello dentro una variante"
+"Changed" = "Modificato"
+"Changed on both sides: keep one" = "Modificato su entrambi i lati: mantienine uno"
+"Changes on main" = "Modifiche su main"
+"Changes on the branch" = "Modifiche sul ramo"
+"Changes unknown" = "Modifiche sconosciute"
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Scegli React, Leptos, Vue, SwiftUI, Compose, ArkUI o Flutter qui sopra per collegare questo componente al suo codice."
+"Choose another profile to change it." = "Scegli un altro profilo per cambiarlo."
+"Choose collection" = "Scegli collezione"
+"Choose image" = "Scegli immagine"
+"Choose mode" = "Scegli modalità"
+"Choose variable" = "Scegli variabile"
+"Circle" = "Cerchio"
+"Clear recent" = "Svuota recenti"
+"Click + to replace mixed content" = "Clicca + per sostituire il contenuto misto"
+"Click anywhere on the canvas to leave one." = "Clicca ovunque sul canvas per lasciarne uno."
+"Click or drag to merge · {alt} removes" = "Clicca o trascina per unire · {alt} rimuove"
+"Click or drag to remove · {alt} merges" = "Clicca o trascina per rimuovere · {alt} unisce"
+"Click to record a key" = "Clicca per registrare un tasto"
+"Clip content" = "Ritaglia il contenuto"
+"Clip to shape" = "Ritaglia sulla forma"
+"Close" = "Chiudi"
+"Close overlay" = "Chiudi sovrapposizione"
+"Close preview" = "Chiudi anteprima"
+"Close tab" = "Chiudi scheda"
+"Close version history" = "Chiudi cronologia versioni"
+"Close when clicking outside" = "Chiudi cliccando all'esterno"
+"Code" = "Codice"
+"Code syntax" = "Sintassi del codice"
+"Collapse" = "Comprimi"
+"Collapse panel" = "Comprimi pannello"
+"Collection" = "Collezione"
+"Collections" = "Collezioni"
+"Color" = "Colore"
+"Color burn" = "Brucia colore"
+"Color dodge" = "Scherma colore"
+"Color format" = "Formato colore"
+"Color profile" = "Profilo colore"
+"Color styles" = "Stili di colore"
+"Color values in this file are in this color space." = "I valori di colore in questo file sono in questo spazio colore."
+"Color variables" = "Variabili di colore"
+"Colour" = "Colore"
+"Column" = "Colonna"
+"Column gap" = "Spaziatura colonne"
+"Column sizes" = "Dimensioni colonne"
+"Column span" = "Estensione colonne"
+"Columns" = "Colonne"
+"Columns {count}" = "Colonne {count}"
+"Comment" = "Commento"
+"Comments" = "Commenti"
+"Commits" = "Commit"
+"Company" = "Azienda"
+"Compare changes" = "Confronta modifiche"
+"Compatibility notes" = "Note di compatibilità"
+"Completed" = "Completato"
+"Component" = "Componente"
+"Component name" = "Nome del componente"
+"Component property" = "Proprietà del componente"
+"Component set" = "Set di componenti"
+"Component sets" = "Set di componenti"
+"Components" = "Componenti"
+"Conditional" = "Condizionale"
+"Confetti" = "Coriandoli"
+"Conflicts" = "Conflitti"
+"Connect to code" = "Collega al codice"
+"Connected" = "Collegato"
+"Connected to code: {from}" = "Collegato al codice: {from}"
+"Connection lost, reconnecting (attempt {attempt})…" = "Connessione persa, riconnessione in corso (tentativo {attempt})…"
+"Constrain proportions" = "Mantieni le proporzioni"
+"Constraints" = "Vincoli"
+"Content" = "Contenuto"
+"Contents hidden" = "Contenuti nascosti"
+"Contextual alternates" = "Alternative contestuali"
+"Contrast" = "Contrasto"
+"Contributors" = "Collaboratori"
+"Contributors: {people} · Commits: {commits}" = "Collaboratori: {people} · Commit: {commits}"
+"Controller" = "Controller"
+"Cool" = "Freddo"
+"Copied as CSS" = "Copiato come CSS"
+"Copied as PNG" = "Copiato come PNG"
+"Copied as SVG" = "Copiato come SVG"
+"Copied as text" = "Copiato come testo"
+"Copied {value}" = "Copiato {value}"
+"Copy" = "Copia"
+"Copy as" = "Copia come"
+"Copy as CSS" = "Copia come CSS"
+"Copy as PNG" = "Copia come PNG"
+"Copy as SVG" = "Copia come SVG"
+"Copy code" = "Copia codice"
+"Copy link" = "Copia link"
+"Copy the {label}" = "Copia {label}"
+"Copy {value}" = "Copia {value}"
+"Corner radius" = "Raggio degli angoli"
+"Corner smoothing" = "Smussatura degli angoli"
+"Couldn't download the variables" = "Impossibile scaricare le variabili"
+"Couldn't reach {server}: showing what this computer remembers." = "Impossibile raggiungere {server}: mostro ciò che questo computer ha in memoria."
+"Couldn't read {name}." = "Impossibile leggere {name}."
+"Couldn't save automatically: {error}" = "Impossibile salvare automaticamente: {error}"
+"Count" = "Numero"
+"Create" = "Crea"
+"Create a variable collection first" = "Crea prima una collezione di variabili"
+"Create a variable first" = "Crea prima una variabile"
+"Create alias" = "Crea alias"
+"Create branch" = "Crea ramo"
+"Create collection" = "Crea collezione"
+"Create component" = "Crea componente"
+"Create component property" = "Crea proprietà del componente"
+"Create components, styles or variables to publish them as a library." = "Crea componenti, stili o variabili per pubblicarli come libreria."
+"Create property…" = "Crea proprietà…"
+"Create style" = "Crea stile"
+"Create style from the selected text" = "Crea stile dal testo selezionato"
+"Created" = "Creato"
+"Crop" = "Ritaglia"
+"Crop marks" = "Crocini di taglio"
+"Ctrl+arrows" = "Ctrl+frecce"
+"Ctrl+click" = "Ctrl+clic"
+"Ctrl+scroll" = "Ctrl+scorrimento"
+"Current name" = "Nome attuale"
+"Current version" = "Versione attuale"
+"Cursor chat" = "Chat del cursore"
+"Custom" = "Personalizzato"
+"Custom size" = "Dimensione personalizzata"
+"Cut" = "Taglia"
+"Dark" = "Scuro"
+"Darken" = "Scurisci"
+"Dash" = "Tratteggio"
+"Dashboard" = "Dashboard"
+"Date created" = "Data di creazione"
+"Dec" = "dic"
+"Decoration style" = "Stile della decorazione"
+"Decoration" = "Decorazione"
+"Deep select" = "Selezione profonda"
+"Default" = "Predefinito"
+"Default content" = "Contenuto predefinito"
+"Default value (the top-left variant)" = "Valore predefinito (la variante in alto a sinistra)"
+"Delay" = "Ritardo"
+"Delete" = "Elimina"
+"Delete category (its annotations stay)" = "Elimina categoria (le sue annotazioni restano)"
+"Delete collection" = "Elimina collezione"
+"Delete group" = "Elimina gruppo"
+"Delete mode" = "Elimina modalità"
+"Delete page" = "Elimina pagina"
+"Delete preset" = "Elimina preset"
+"Delete property" = "Elimina proprietà"
+"Delete the style (layers keep their values)" = "Elimina lo stile (i livelli mantengono i propri valori)"
+"Delete thread" = "Elimina discussione"
+"Delete variable" = "Elimina variabile"
+"Delete “{name}”? This can't be undone." = "Eliminare “{name}”? L'operazione non può essere annullata."
+"Density" = "Densità"
+"Depth" = "Profondità"
+"Describe how and when to use this component" = "Descrivi come e quando usare questo componente"
+"Describe what changed" = "Descrivi cosa è cambiato"
+"Description" = "Descrizione"
+"Description (optional)" = "Descrizione (facoltativa)"
+"Design" = "Design"
+"Design system starter" = "Starter per design system"
+"Desktop" = "Desktop"
+"Destination" = "Destinazione"
+"Detach alias" = "Scollega alias"
+"Detach instance" = "Scollega istanza"
+"Detach property" = "Scollega proprietà"
+"Detach style" = "Scollega stile"
+"Detach styles" = "Scollega stili"
+"Detach variable" = "Scollega variabile"
+"Details" = "Dettagli"
+"Dev Mode" = "Modalità sviluppo"
+"Dev resources" = "Risorse per sviluppatori"
+"Development" = "Sviluppo"
+"Device" = "Dispositivo"
+"Device at 100%" = "Dispositivo al 100%"
+"Diamond" = "Rombo"
+"Difference" = "Differenza"
+"Dimensions" = "Dimensioni"
+"Direction" = "Direzione"
+"Disconnect from code" = "Scollega dal codice"
+"Dispersion" = "Dispersione"
+"Display name" = "Nome visualizzato"
+"Dissolve" = "Dissolvenza"
+"Distribute and tidy" = "Distribuisci e riordina"
+"Distribute horizontal spacing" = "Distribuisci spaziatura orizzontale"
+"Distribute vertical spacing" = "Distribuisci spaziatura verticale"
+"Divider" = "Divisore"
+"Don't truncate" = "Non troncare"
+"Done" = "Fatto"
+"Done editing" = "Modifica terminata"
+"Dots" = "Punti"
+"Dotted" = "Puntinato"
+"Down" = "Giù"
+"Drafts" = "Bozze"
+"Drag the stroke to add a width point" = "Trascina il contorno per aggiungere un punto di larghezza"
+"Draw" = "Disegna"
+"Draw a frame" = "Disegna un frame"
+"Drawing tools" = "Strumenti di disegno"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Rilascia un file .figcraft, .fig, .sketch, .json, .svg o un'immagine."
+"Drop to import" = "Rilascia per importare"
+"Drop to open" = "Rilascia per aprire"
+"Drop shadow" = "Ombra esterna"
+"Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "Doppia licenza MIT OR Apache-2.0. Creato dal team e dalla community di ArtCraft."
+"Duo" = "Duo"
+"Duplicate" = "Duplica"
+"Duplicate by dragging" = "Duplica trascinando"
+"Duplicate mode" = "Duplica modalità"
+"Duplicate page" = "Duplica pagina"
+"Edit" = "Modifica"
+"Edit as an expression" = "Modifica come espressione"
+"Edit colour" = "Modifica colore"
+"Edit comment" = "Modifica commento"
+"Edit dev resource" = "Modifica risorsa per sviluppatori"
+"Edit link" = "Link di modifica"
+"Edit link copied" = "Link di modifica copiato"
+"Edit style" = "Modifica stile"
+"Edit variable" = "Modifica variabile"
+"Edit with the builder" = "Modifica con il builder"
+"Edited {when}" = "Modificato {when}"
+"Effect settings" = "Impostazioni dell'effetto"
+"Effect styles" = "Stili di effetto"
+"Effects" = "Effetti"
+"Ellipse" = "Ellisse"
+"Ellipses" = "Ellissi"
+"Else" = "Altrimenti"
+"Else if" = "Altrimenti se"
+"Embedded profile" = "Profilo incorporato"
+"Empty" = "Vuoto"
+"End" = "Fine"
+"End point" = "Punto finale"
+"Ends the session; everyone keeps their copy" = "Termina la sessione; ognuno conserva la propria copia"
+"Enter" = "Invio"
+"Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Inserisci l'indirizzo di un figcraft-server e premi Sfoglia per vedere i plugin che offre."
+"Enter to save · Esc to cancel" = "Invio per salvare · Esc per annullare"
+"Eraser" = "Gomma"
+"Esc" = "Esc"
+"Essential" = "Essenziale"
+"Every conflict has a choice." = "Ogni conflitto ha una scelta."
+"Every top-level frame already starts a flow" = "Ogni frame di primo livello avvia già un flusso"
+"Exact opacity (4 then 5: 45%)" = "Opacità esatta (4 poi 5: 45%)"
+"Exclude" = "Escludi"
+"Excluded" = "Escluso"
+"Excluded from layout" = "Escluso dal layout"
+"Excludes" = "Esclude"
+"Exclusion" = "Esclusione"
+"Exit focus view (Esc)" = "Esci dalla vista focus (Esc)"
+"Expand" = "Espandi"
+"Export" = "Esporta"
+"Export all" = "Esporta tutto"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "Esporta frame e livelli come PNG, JPG, SVG o PDF"
+"Export page as PNG" = "Esporta pagina come PNG"
+"Export settings" = "Impostazioni di esportazione"
+"Export variables" = "Esporta variabili"
+"Export {name}" = "Esporta {name}"
+"Export {n} layers" = { one = "Esporta {n} livello", other = "Esporta {n} livelli" }
+"Exported {file}" = "Esportato {file}"
+"Exported {name}" = "Esportato {name}"
+"Exported {name}; {n} kinds of content were left out" = { one = "Esportato {name}; {n} tipo di contenuto è stato escluso", other = "Esportato {name}; {n} tipi di contenuto sono stati esclusi" }
+"Exported {n} files" = { one = "Esportato {n} file", other = "Esportati {n} file" }
+"Export…" = "Esporta…"
+"Expose properties to instances" = "Esponi le proprietà alle istanze"
+"Exposure" = "Esposizione"
+"Expression" = "Espressione"
+"Extend collection" = "Estendi collezione"
+"Extends \"{name}\": overridden values are marked" = "Estende \"{name}\": i valori sovrascritti sono evidenziati"
+"Eye" = "Occhio"
+"F" = "F"
+"Fade" = "Sfuma"
+"False" = "Falso"
+"Feb" = "feb"
+"Fetching from the server…" = "Recupero dal server…"
+"FigCraft couldn't open its window: {error}" = "FigCraft non è riuscito ad aprire la sua finestra: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft non supporta ancora tutte le funzionalità di questi file. Le note elencano ciò che è stato omesso o modificato nella copia importata; il file originale resta invariato."
+"File" = "File"
+"File name" = "Nome del file"
+"File not found" = "File non trovato"
+"File published" = "File pubblicato"
+"Files aren't end-to-end encrypted: the server's operator can read them." = "I file non sono crittografati end-to-end: chi gestisce il server può leggerli."
+"Files nobody opens for {n} days are deleted." = { one = "I file che nessuno apre da {n} giorno vengono eliminati.", other = "I file che nessuno apre da {n} giorni vengono eliminati." }
+"Fill" = "Riempimento"
+"Fill (fr)" = "Riempimento (fr)"
+"Fill container" = "Riempi contenitore"
+"Fill window" = "Riempi finestra"
+"Fills" = "Riempimenti"
+"Fill|sizing" = "Riempi"
+"Filter and sort" = "Filtra e ordina"
+"Find" = "Trova"
+"Find and replace" = "Trova e sostituisci"
+"Find layers" = "Trova livelli"
+"First" = "Primo"
+"First commit" = "Primo commit"
+"First on top" = "Il primo in alto"
+"Fit" = "Adatta"
+"Fit device to window" = "Adatta il dispositivo alla finestra"
+"Fit to contents" = "Adatta al contenuto"
+"Fit to window" = "Adatta alla finestra"
+"Fit width" = "Adatta alla larghezza"
+"Fixed" = "Fisso"
+"Fixed gap" = "Spaziatura fissa"
+"Fixed size" = "Dimensione fissa"
+"Flatten" = "Appiattisci"
+"Flip" = "Rifletti"
+"Flip horizontal" = "Rifletti orizzontalmente"
+"Flip text to the other side" = "Rifletti il testo sull'altro lato"
+"Flip vertical" = "Rifletti verticalmente"
+"Flip width profile" = "Inverti il profilo di larghezza"
+"Flow starting point" = "Punto di partenza del flusso"
+"Flow starting points" = "Punti di partenza del flusso"
+"Flows" = "Flussi"
+"Focus view" = "Vista focus"
+"Fold autosaves" = "Comprimi i salvataggi automatici"
+"Folder: click to collapse" = "Cartella: clicca per comprimere"
+"Folder: click to expand" = "Cartella: clicca per espandere"
+"Follow" = "Segui"
+"Follow {name}" = "Segui {name}"
+"Following" = "Seguendo"
+"Following {name} · {key} to stop" = "Stai seguendo {name} · {key} per smettere"
+"Font" = "Font"
+"Font not installed" = "Font non installato"
+"Font size" = "Dimensione del font"
+"Font style" = "Stile del font"
+"Forget on this computer" = "Dimentica su questo computer"
+"Four screens of a trail app with components and a prototype flow" = "Quattro schermate di un'app per sentieri con componenti e un flusso di prototipo"
+"Fractions" = "Frazioni"
+"Frame" = "Frame"
+"Frame selection" = "Racchiudi la selezione in un frame"
+"Frame tools" = "Strumenti frame"
+"Frames" = "Frame"
+"From the library \"{name}\": read-only" = "Dalla libreria \"{name}\": sola lettura"
+"From {name}" = "Da {name}"
+"From {server}" = "Da {server}"
+"Frost" = "Brina"
+"Gap" = "Spaziatura"
+"Gap between columns" = "Spaziatura tra le colonne"
+"Gap between items" = "Spaziatura tra gli elementi"
+"Gap between rows" = "Spaziatura tra le righe"
+"Getting started" = "Per iniziare"
+"Give the address of a server open to the public, or a server's address with its key (`figcraft-server key` prints it)." = "Indica l'indirizzo di un server aperto al pubblico, oppure l'indirizzo di un server con la sua chiave (la stampa `figcraft-server key`)."
+"Glass" = "Vetro"
+"Go to main component" = "Vai al componente principale"
+"Go to {name}" = "Vai a {name}"
+"Grab bag" = "Varie"
+"Gradient" = "Gradiente"
+"Gray" = "Grigio"
+"Green" = "Verde"
+"Greyscale components and two example screens to sketch a flow with" = "Componenti in scala di grigi e due schermate di esempio con cui abbozzare un flusso"
+"Grid" = "Griglia"
+"Grid ({size})" = "Griglia ({size})"
+"Grid styles" = "Stili di griglia"
+"Grid {size}" = "Griglia {size}"
+"Group" = "Gruppo"
+"Group selection" = "Raggruppa selezione"
+"Groups" = "Gruppi"
+"Gutter" = "Intercolonna"
+"Hand tool" = "Strumento mano"
+"Hanging list" = "Elenco sporgente"
+"Hanging punctuation" = "Punteggiatura sporgente"
+"Hard light" = "Luce intensa"
+"Height" = "Altezza"
+"Help" = "Aiuto"
+"Help and resources" = "Aiuto e risorse"
+"Help page" = "Pagina di aiuto"
+"Here: {names}" = "Qui: {names}"
+"Hidden" = "Nascosto"
+"Hide contents" = "Nascondi contenuti"
+"Hide from publishing" = "Nascondi dalla pubblicazione"
+"Hide section contents" = "Nascondi il contenuto della sezione"
+"Hide these tips (Getting started in the Help menu shows them again)" = "Nascondi questi suggerimenti (Per iniziare nel menu Aiuto li mostra di nuovo)"
+"Hide when publishing" = "Nascondi alla pubblicazione"
+"Highlight layers on hover" = "Evidenzia i livelli al passaggio del mouse"
+"Highlights" = "Luci"
+"Hold Alt" = "Tieni premuto Alt"
+"Hold Alt+Z" = "Tieni premuto Alt+Z"
+"Hold Ctrl" = "Tieni premuto Ctrl"
+"Hold Z" = "Tieni premuto Z"
+"Hold ⌃ or ⌘" = "Tieni premuto ⌃ o ⌘"
+"Hold ⌥" = "Tieni premuto ⌥"
+"Hold ⌥Z" = "Tieni premuto ⌥Z"
+"Home" = "Home"
+"Horizontal" = "Orizzontale"
+"Horizontal align" = "Allineamento orizzontale"
+"Horizontal hex" = "Esagono orizzontale"
+"Horizontal padding" = "Margine interno orizzontale"
+"Horizontal spacing" = "Spaziatura orizzontale"
+"Hosted by {operator}" = "Ospitato da {operator}"
+"Hover a layer to see its properties" = "Passa sopra un livello per vederne le proprietà"
+"Hover other layers to measure the distance" = "Passa sopra altri livelli per misurare la distanza"
+"Hue" = "Tonalità"
+"Hug" = "Aderisci"
+"Hug contents" = "Aderisci al contenuto"
+"Icon components on a 24 px grid with keylines and a size preview" = "Componenti icona su una griglia da 24 px con linee guida e anteprima delle dimensioni"
+"Icon set starter" = "Starter per set di icone"
+"If it keeps happening, please report it at {link} with this message." = "Se il problema persiste, segnalalo su {link} insieme a questo messaggio."
+"If" = "Se"
+"If {condition}" = "Se {condition}"
+"Ignore auto layout (absolute position)" = "Ignora auto layout (posizione assoluta)"
+"Image" = "Immagine"
+"Images" = "Immagini"
+"Import" = "Importa"
+"Import path" = "Percorso di importazione"
+"Import plugin from manifest" = "Importa plugin da manifest"
+"Import plugin from manifest…" = "Importa plugin da manifest…"
+"Import report" = "Resoconto di importazione"
+"Import variables" = "Importa variabili"
+"Imported document" = "Documento importato"
+"Imported {name}" = "Importato {name}"
+"Imported {n} new variables, updated {updated}" = { one = "Importata {n} nuova variabile, aggiornate {updated}", other = "Importate {n} nuove variabili, aggiornate {updated}" }
+"Import…" = "Importa…"
+"In an instance, this comes from the main component" = "In un'istanza, questo proviene dal componente principale"
+"In the browser you can join sessions the desktop app hosts and files on a FigCraft server. A page opened over https reaches other computers only through wss:// links (a server behind TLS)." = "Nel browser puoi unirti alle sessioni ospitate dall'app desktop e ai file su un server FigCraft. Una pagina aperta tramite https raggiunge altri computer solo attraverso link wss:// (un server dietro TLS)."
+"Include bounding box" = "Includi riquadro di delimitazione"
+"Include id attribute" = "Includi attributo id"
+"Included" = "Incluso"
+"Included in layout" = "Incluso nel layout"
+"Individual corners" = "Angoli singoli"
+"Individual padding" = "Margini interni singoli"
+"Individual strokes" = "Contorni singoli"
+"Ink" = "Inchiostro"
+"Inner shadow" = "Ombra interna"
+"Inside" = "Dentro"
+"Inspect" = "Ispeziona"
+"Inspect the layer under the pointer: size, colours, typography" = "Ispeziona il livello sotto il puntatore: dimensioni, colori, tipografia"
+"Install plugin" = "Installa plugin"
+"Install" = "Installa"
+"Installed {name}" = "Installato {name}"
+"Installed" = "Installato"
+"Installing…" = "Installazione…"
+"Instance" = "Istanza"
+"Instance properties" = "Proprietà dell'istanza"
+"Instance swap" = "Scambio di istanza"
+"Instance swap (no other component)" = "Scambio di istanza (nessun altro componente)"
+"Instances" = "Istanze"
+"Instant" = "Istantaneo"
+"Intensity" = "Intensità"
+"Interaction" = "Interazione"
+"Interactions" = "Interazioni"
+"Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Progettazione e prototipazione di interfacce. Uno strumento di design gratuito e open source, sviluppato da zero in Rust con metodo clean-room, parte delle ArtCraft Crafting Apps."
+"Interface size" = "Dimensione dell'interfaccia"
+"Intersect" = "Interseca"
+"Intersects" = "Interseca"
+"Invalid color" = "Colore non valido"
+"Invite link" = "Link di invito"
+"Invite link copied" = "Link di invito copiato"
+"It asks permission to:" = "Chiede il permesso di:"
+"Jan" = "gen"
+"Join" = "Unisciti"
+"Join code copied" = "Codice di partecipazione copiato"
+"Join code or invite link" = "Codice di partecipazione o link di invito"
+"Join live session" = "Partecipa alla sessione live"
+"Join us on Discord" = "Unisciti a noi su Discord"
+"Join with a code" = "Partecipa con un codice"
+"Joined" = "Unito"
+"Joined {file}" = "Partecipazione a {file}"
+"Joining…" = "Partecipazione…"
+"Join|stroke" = "Giunzione"
+"Jul" = "lug"
+"Jun" = "giu"
+"Just now" = "Adesso"
+"Justify" = "Giustifica"
+"Keep appearance" = "Mantieni l'aspetto"
+"Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "\"Mantieni l'aspetto\" converte ogni valore di colore in {profile} così i colori sembrano uguali. \"Mantieni i valori\" lascia i numeri invariati, quindi i colori cambiano."
+"Keep tool selected after use" = "Mantieni lo strumento selezionato dopo l'uso"
+"Keep values" = "Mantieni i valori"
+"Key/Gamepad" = "Tasto/Gamepad"
+"Key/Gamepad {key}" = "Tasto/Gamepad {key}"
+"Keyboard shortcuts" = "Scorciatoie da tastiera"
+"Kits" = "Kit"
+"Landing page" = "Landing page"
+"Language" = "Lingua"
+"Lasso" = "Lazo"
+"Last" = "Ultimo"
+"Last change: {note}" = "Ultima modifica: {note}"
+"Last commit" = "Ultimo commit"
+"Last modified" = "Ultima modifica"
+"Last on top" = "L'ultimo in alto"
+"Layer blur" = "Sfocatura del livello"
+"Layer name" = "Nome del livello"
+"Layers" = "Livelli"
+"Layers in an instance take their position from the main component" = "I livelli in un'istanza prendono la posizione dal componente principale"
+"Layout" = "Layout"
+"Layout grid" = "Griglia di layout"
+"Layout grid settings" = "Impostazioni della griglia di layout"
+"Layout grids" = "Griglie di layout"
+"Leave session" = "Esci dalla sessione"
+"Leaves" = "Foglie"
+"Left" = "Sinistra"
+"Left & right" = "Sinistra e destra"
+"Left padding" = "Margine interno sinistro"
+"Left side" = "Lato sinistro"
+"Left side width" = "Larghezza del lato sinistro"
+"Letter case" = "Maiuscole/minuscole"
+"Letter spacing" = "Spaziatura tra lettere"
+"Libraries" = "Librerie"
+"Libraries in this file" = "Librerie in questo file"
+"Library updates available" = "Aggiornamenti delle librerie disponibili"
+"Library: click to collapse" = "Libreria: clicca per comprimere"
+"Library: click to expand" = "Libreria: clicca per espandere"
+"Library: its variables are read-only here; edit them in the library file and publish it" = "Libreria: qui le sue variabili sono di sola lettura; modificale nel file della libreria e pubblicalo"
+"Light" = "Chiaro"
+"Lighten" = "Schiarisci"
+"Light|glass" = "Luce"
+"Line" = "Linea"
+"Line arrow" = "Freccia lineare"
+"Line delta" = "Variazione righe"
+"Line height" = "Interlinea"
+"Linear" = "Lineare"
+"Lines" = "Righe"
+"Lines +/−" = "Righe +/−"
+"Lines added" = "Righe aggiunte"
+"Lines deleted" = "Righe eliminate"
+"Link" = "Link"
+"Link copied" = "Link copiato"
+"Link docs, code or tickets for developers." = "Collega documentazione, codice o ticket per gli sviluppatori."
+"Link frames on the Prototype tab, then present the flow" = "Collega i frame nella scheda Prototipo, poi presenta il flusso"
+"Link this component to its code component: instances then show your real snippet with their values." = "Collega questo componente al suo componente nel codice: le istanze mostreranno il tuo snippet reale con i loro valori."
+"List spacing" = "Spaziatura dell'elenco"
+"List style" = "Stile dell'elenco"
+"Live session" = "Sessione live"
+"Live · {people}" = "Live · {people}"
+"Local components" = "Componenti locali"
+"Local network" = "Rete locale"
+"Local styles" = "Stili locali"
+"Local variables" = "Variabili locali"
+"Lock/Unlock" = "Blocca/Sblocca"
+"Locked" = "Bloccato"
+"Lowercase" = "Minuscolo"
+"Luminance" = "Luminanza"
+"Luminosity" = "Luminosità"
+"Main" = "Main"
+"Main component deleted" = "Componente principale eliminato"
+"Main menu" = "Menu principale"
+"Make a component" = "Crea un componente"
+"Make slot" = "Crea slot"
+"Mar" = "mar"
+"Margin" = "Margine"
+"Mark all as read" = "Segna tutto come letto"
+"Mark as resolved" = "Segna come risolto"
+"Mark as unread" = "Segna come non letto"
+"Mark as unresolved" = "Segna come non risolto"
+"Mask" = "Maschera"
+"Mass · Stiffness · Damping" = "Massa · Rigidità · Smorzamento"
+"Match (empty: the whole name)" = "Corrispondenza (vuoto: l'intero nome)"
+"Max H" = "Alt. max"
+"Max W" = "Largh. max"
+"Max lines" = "Righe massime"
+"Maximize" = "Ingrandisci"
+"May" = "mag"
+"Measure to the selection" = "Misura fino alla selezione"
+"Merge into main" = "Unisci in main"
+"Merge regions" = "Unisci regioni"
+"Merge the branch into the main file (one undo step) and archive it" = "Unisci il ramo nel file principale (un solo passaggio di annullamento) e archivialo"
+"Merged" = "Unito"
+"Merged PRs" = "PR uniti"
+"Min H" = "Alt. min"
+"Min W" = "Largh. min"
+"Minimize" = "Riduci a icona"
+"Mirror angle" = "Rifletti angolo"
+"Mirror angle and length" = "Rifletti angolo e lunghezza"
+"Mirroring" = "Riflessione"
+"Missing" = "Mancante"
+"Missing fonts" = "Font mancanti"
+"Missing layer" = "Livello mancante"
+"Missing style" = "Stile mancante"
+"Missing variable" = "Variabile mancante"
+"Miter" = "Spigolo vivo"
+"Miter angle" = "Angolo dello spigolo"
+"Mixed" = "Misto"
+"Mixed fonts" = "Font misti"
+"Mixed interactions: click + to replace them" = "Interazioni miste: clicca + per sostituirle"
+"Mobile app" = "App mobile"
+"Mode" = "Modalità"
+"Model" = "Modello"
+"Models" = "Modelli"
+"Mono" = "Mono"
+"More" = "Altro"
+"More instance actions" = "Altre azioni per l'istanza"
+"Mouse down" = "Pressione del mouse"
+"Mouse enter" = "Ingresso del mouse"
+"Mouse leave" = "Uscita del mouse"
+"Mouse up" = "Rilascio del mouse"
+"Move along the toolbar or the layer rows" = "Spostati lungo la barra degli strumenti o le righe dei livelli"
+"Move" = "Sposta"
+"Move column left" = "Sposta colonna a sinistra"
+"Move column right" = "Sposta colonna a destra"
+"Move down" = "Sposta giù"
+"Move in" = "Sposta dentro"
+"Move out" = "Sposta fuori"
+"Move tools" = "Strumenti di spostamento"
+"Move up" = "Sposta su"
+"Moved to {name}" = "Spostato in {name}"
+"Multi" = "Multi"
+"Multiply" = "Moltiplica"
+"Muted" = "Attenuato"
+"Name" = "Nome"
+"Name (A–Z)" = "Nome (A–Z)"
+"Named instance" = "Istanza con nome"
+"Navigate to" = "Vai a"
+"Nested instance" = "Istanza annidata"
+"New design file" = "Nuovo file di design"
+"Newest first" = "Prima i più recenti"
+"Next or previous control in the focused region" = "Controllo successivo o precedente nell'area attiva"
+"Next frame" = "Frame successivo"
+"Next ready for dev" = "Prossimo pronto per lo sviluppo"
+"Next size option" = "Opzione di dimensione successiva"
+"No assets: no export settings, icons or images. Add export settings in the Design tab." = "Nessun asset: nessuna impostazione di esportazione, icona o immagine. Aggiungi le impostazioni di esportazione nella scheda Design."
+"No boolean variables fit here." = "Nessuna variabile booleana adatta qui."
+"No boolean variables yet. Create them in Local variables." = "Ancora nessuna variabile booleana. Creale in Variabili locali."
+"No branches. A branch is a copy of the file to try changes in, then review and merge." = "Nessun ramo. Un ramo è una copia del file in cui provare modifiche, da rivedere e unire poi."
+"No category" = "Nessuna categoria"
+"No changes" = "Nessuna modifica"
+"No color styles" = "Nessuno stile di colore"
+"No colour variables fit here." = "Nessuna variabile di colore adatta qui."
+"No colour variables yet. Create them in Local variables." = "Ancora nessuna variabile di colore. Creale in Variabili locali."
+"No comments yet" = "Ancora nessun commento"
+"No compatibility warnings reported" = "Nessun avviso di compatibilità segnalato"
+"No components yet. Select layers and press {keys}." = "Ancora nessun componente. Seleziona dei livelli e premi {keys}."
+"No conflicts." = "Nessun conflitto."
+"No contributor data was built into this copy." = "In questa copia non sono inclusi dati sui collaboratori."
+"No device" = "Nessun dispositivo"
+"No fonts match" = "Nessun font corrisponde"
+"No files or templates match your search" = "Nessun file o modello corrisponde alla ricerca"
+"No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Nessun codice di partecipazione qui (il server è più vecchio dei codici di partecipazione, oppure questo indirizzo non può essere inserito in uno): condividi invece il link."
+"No layer changes to show." = "Nessuna modifica ai livelli da mostrare."
+"No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "Ancora nessuna libreria. Aggiungi un file .figcraft pubblicato come libreria, oppure incolla il link di una libreria del team."
+"No list" = "Nessun elenco"
+"No matching comments" = "Nessun commento corrispondente"
+"No matching components" = "Nessun componente corrispondente"
+"No matching layers" = "Nessun livello corrispondente"
+"No matching styles" = "Nessuno stile corrispondente"
+"No matching variables" = "Nessuna variabile corrispondente"
+"No mirroring" = "Nessuna riflessione"
+"No model credits were built into this copy." = "In questa copia non sono inclusi crediti dei modelli."
+"No number variables fit here." = "Nessuna variabile numerica adatta qui."
+"No number variables yet. Create them in Local variables." = "Ancora nessuna variabile numerica. Creale in Variabili locali."
+"No other pages" = "Nessun'altra pagina"
+"No paints" = "Nessun riempimento"
+"No plugins on {server}." = "Nessun plugin su {server}."
+"No plugins yet. Import a development plugin from its figcraft-plugin.json." = "Ancora nessun plugin. Importa un plugin di sviluppo dal suo figcraft-plugin.json."
+"No preferred components" = "Nessun componente preferito"
+"No preset" = "Nessun preset"
+"No saved versions yet. Save a version to mark a point in your work you can come back to." = "Ancora nessuna versione salvata. Salva una versione per segnare un punto del tuo lavoro a cui poter tornare."
+"No scrolling" = "Nessuno scorrimento"
+"No shortcuts match" = "Nessuna scorciatoia corrisponde"
+"No status" = "Nessuno stato"
+"No string variables fit here." = "Nessuna variabile stringa adatta qui."
+"No string variables yet. Create them in Local variables." = "Ancora nessuna variabile stringa. Creale in Variabili locali."
+"No styles yet." = "Ancora nessuno stile."
+"No styles yet. Click + to create one from the selection." = "Ancora nessuno stile. Clicca + per crearne uno dalla selezione."
+"No templates match your search" = "Nessun modello corrisponde alla ricerca"
+"No text styles yet. Click + to create one from the selected text." = "Ancora nessuno stile di testo. Clicca + per crearne uno dal testo selezionato."
+"No variables fit here." = "Nessuna variabile adatta qui."
+"No variables yet. Create them in Local variables." = "Ancora nessuna variabile. Creale in Variabili locali."
+"Nobody else is here yet" = "Non c'è ancora nessun altro"
+"Noise" = "Rumore"
+"None" = "Nessuno"
+"None." = "Nessuno."
+"Normal" = "Normale"
+"Not bound" = "Non collegato"
+"Not in a live session" = "Non in una sessione live"
+"Not in this font" = "Non presente in questo font"
+"Not properties, kept as written: {names}" = "Non sono proprietà, mantenute come scritte: {names}"
+"Not read yet" = "Non ancora letto"
+"Not shared" = "Non condiviso"
+"Note {n}" = "Nota {n}"
+"Nothing changed since this was marked ready for dev." = "Nulla è cambiato da quando è stato segnato come pronto per lo sviluppo."
+"Nothing here yet. Set a frame's status to list it." = "Ancora niente qui. Imposta lo stato di un frame per elencarlo."
+"Nothing online yet. Use Share on a file to put it online and it is listed here." = "Ancora niente online. Usa Condividi su un file per metterlo online e comparirà qui."
+"Nothing to export" = "Niente da esportare"
+"Nov" = "nov"
+"Now" = "Ora"
+"Nudge (Shift: big nudge)" = "Sposta di poco (Maiusc: spostamento grande)"
+"Nudge amount" = "Entità dello spostamento"
+"Number" = "Numero"
+"Number ↑" = "Numero ↑"
+"Number ↓" = "Numero ↓"
+"Numbered list" = "Elenco numerato"
+"Object" = "Oggetto"
+"Oct" = "ott"
+"Off" = "Disattivato"
+"Offered first when filling the slot (any content is allowed)" = "Proposto per primo quando si riempie lo slot (qualsiasi contenuto è ammesso)"
+"Offered first when swapping the instance (any component is allowed)" = "Proposto per primo quando si scambia l'istanza (qualsiasi componente è ammesso)"
+"Offset" = "Scostamento"
+"Oldest first" = "Prima i più vecchi"
+"On click" = "Al clic"
+"On drag" = "Al trascinamento"
+"On this page" = "In questa pagina"
+"One announcement in five common sizes: square, portrait, story, link and banner" = "Un annuncio in cinque formati comuni: quadrato, verticale, storia, link e banner"
+"Online" = "Online"
+"Online files" = "File online"
+"Online sharing is off: files are shared on the local network only." = "La condivisione online è disattivata: i file sono condivisi solo sulla rete locale."
+"Only the first changed layers are listed." = "Sono elencati solo i primi livelli modificati."
+"Only the first {n} changed layers are listed." = "Sono elencati solo i primi {n} livelli modificati."
+"Only your threads" = "Solo le tue discussioni"
+"Opacity" = "Opacità"
+"Opacity & blend" = "Opacità e fusione"
+"Opacity 10%…90%, 0: 100%" = "Opacità 10%…90%, 0: 100%"
+"Open" = "Apri"
+"Open .figcraft, .svg or images" = "Apri .figcraft, .svg o immagini"
+"Open branch" = "Apri ramo"
+"Open file" = "Apri file"
+"Open files" = "Apri file"
+"Open in focus view" = "Apri nella vista focus"
+"Open in new window" = "Apri in una nuova finestra"
+"Open invite links in FigCraft" = "Apri i link di invito in FigCraft"
+"Open link" = "Apri link"
+"Open link {url}" = "Apri link {url}"
+"Open overlay" = "Apri sovrapposizione"
+"Open prototype preview" = "Apri anteprima del prototipo"
+"Open variables ({count})" = "Variabili aperte ({count})"
+"Opened as a new document" = "Aperto come nuovo documento"
+"Opened “{name}” in a new tab" = "“{name}” aperto in una nuova scheda"
+"Opening the file…" = "Apertura del file…"
+"Opening {n} files as new files" = { one = "Apertura come nuovo file", other = "Apertura di {n} file come nuovi file" }
+"Open|comments" = "Aperti"
+"Options" = "Opzioni"
+"Orange" = "Arancione"
+"Order" = "Ordine"
+"Other apps may not open every .fig file exported here." = "Altre app potrebbero non aprire tutti i file .fig esportati qui."
+"Other" = "Altro"
+"Others lose access and keep their copy; the file stays on the server for you" = "Gli altri perdono l'accesso e conservano la propria copia; il file resta sul server per te"
+"Others type this under Share ▸ Join with a code" = "Gli altri lo digitano in Condividi ▸ Partecipa con un codice"
+"Outline stroke" = "Contorna tratto"
+"Outline text" = "Contorna testo"
+"Outlines" = "Contorni"
+"Outside" = "Fuori"
+"Overflow" = "Overflow"
+"Overlay" = "Sovrapposizione"
+"Overlay position" = "Posizione della sovrapposizione"
+"Overridden here (the collection it extends has another value)" = "Sovrascritto qui (la collezione che estende ha un altro valore)"
+"Overrides" = "Sovrascritture"
+"Owner token" = "Token del proprietario"
+"Owner token copied" = "Token del proprietario copiato"
+"PDF print options" = "Opzioni di stampa PDF"
+"PDF print settings" = "Impostazioni di stampa PDF"
+"Padding" = "Margine interno"
+"Page" = "Pagina"
+"Page deleted" = "Pagina eliminata"
+"Pages" = "Pagine"
+"Pages added to the document" = "Pagine aggiunte al documento"
+"Placed on the current page" = "Posizionato nella pagina corrente"
+"Pages: {pages}" = "Pagine: {pages}"
+"Paint bucket" = "Secchiello"
+"Pan the canvas" = "Sposta il canvas"
+"Pan with nothing selected (Shift: farther)" = "Sposta la vista senza selezione (Maiusc: più lontano)"
+"Panels" = "Pannelli"
+"Paper" = "Carta"
+"Paragraph indent" = "Rientro del paragrafo"
+"Paragraph indent applies to left-aligned text" = "Il rientro del paragrafo si applica al testo allineato a sinistra"
+"Paragraph spacing" = "Spaziatura dei paragrafi"
+"Pass through" = "Passa attraverso"
+"Paste a link (https://…)" = "Incolla un link (https://…)"
+"Paste a team library link (a view link)" = "Incolla il link di una libreria del team (un link di visualizzazione)"
+"Paste here" = "Incolla qui"
+"Paste to replace" = "Incolla per sostituire"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Livelli di design incollati; {n} tipo di contenuto è stato escluso", other = "Livelli di design incollati; {n} tipi di contenuto sono stati esclusi" }
+"Pattern" = "Motivo"
+"Pattern alignment" = "Allineamento del motivo"
+"Pattern scale" = "Scala del motivo"
+"Pattern source" = "Sorgente del motivo"
+"Pen" = "Penna"
+"Pencil" = "Matita"
+"People in this file" = "Persone in questo file"
+"People join from anywhere with a code. The file is kept on {server} while you share it." = "Le persone partecipano da ovunque con un codice. Il file è conservato su {server} finché lo condividi."
+"People on your network join with a code. Nothing goes through a server." = "Le persone nella tua rete partecipano con un codice. Niente passa da un server."
+"Phone" = "Telefono"
+"Pick color" = "Scegli colore"
+"Pick color (I)" = "Scegli colore (I)"
+"Pick one font family first" = "Scegli prima una famiglia di font"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "Scegli lo strumento Frame, poi trascina sul canvas o scegli le dimensioni di un dispositivo"
+"Pin a property" = "Fissa una proprietà"
+"Pinch" = "Pizzico"
+"Pixel grid" = "Griglia di pixel"
+"Pixel preview 1x" = "Anteprima pixel 1x"
+"Pixel preview 2x" = "Anteprima pixel 2x"
+"Place a shape or frame (its tool chosen)" = "Inserisci una forma o un frame (con il suo strumento scelto)"
+"Place automatically" = "Posiziona automaticamente"
+"Place image" = "Inserisci immagine"
+"Plugin" = "Plugin"
+"Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "I plugin vengono eseguiti nella sandbox di FigCraft, senza file, rete o orologio. Installa solo plugin di cui ti fidi."
+"Plugins" = "Plugin"
+"Plugins & widgets" = "Plugin e widget"
+"Plus darker" = "Più scuro"
+"Plus lighter" = "Più chiaro"
+"Point" = "Punto"
+"Points" = "Punti"
+"Polygon" = "Poligono"
+"Polygons" = "Poligoni"
+"Port" = "Porta"
+"Position" = "Posizione"
+"Post" = "Invia"
+"Preferences" = "Preferenze"
+"Preferred" = "Preferito"
+"Present" = "Presenta"
+"Present or preview" = "Presenta o anteprima"
+"Present this flow" = "Presenta questo flusso"
+"Presentation" = "Presentazione"
+"Presentation slides" = "Slide di presentazione"
+"Presenting: comments" = "In presentazione: commenti"
+"Presenting: cycle the size options" = "In presentazione: scorri le opzioni di dimensione"
+"Presenting: full screen" = "In presentazione: schermo intero"
+"Presenting: next frame" = "In presentazione: frame successivo"
+"Presenting: previous frame" = "In presentazione: frame precedente"
+"Presenting: restart" = "In presentazione: ricomincia"
+"Preserve scroll position" = "Mantieni la posizione di scorrimento"
+"Presets" = "Preset"
+"Press a key…" = "Premi un tasto…"
+"Playground" = "Playground"
+"Preview" = "Anteprima"
+"Preview this flow" = "Anteprima di questo flusso"
+"Preview this frame" = "Anteprima di questo frame"
+"Previous frame" = "Frame precedente"
+"Previous ready for dev" = "Precedente pronto per lo sviluppo"
+"Progressive" = "Progressivo"
+"Properties" = "Proprietà"
+"Prototype" = "Prototipo"
+"Prototype preview" = "Anteprima del prototipo"
+"Prototype settings" = "Impostazioni del prototipo"
+"Publish" = "Pubblica"
+"Publish changes" = "Pubblica modifiche"
+"Publish to another server…" = "Pubblica su un altro server…"
+"Publish to server" = "Pubblica sul server"
+"Published version {v}" = "Versione {v} pubblicata"
+"Published version {v} to the server" = "Versione {v} pubblicata sul server"
+"Published version {v}: save the file so other files can use it" = "Versione {v} pubblicata: salva il file perché altri file possano usarla"
+"Published · {people}" = "Pubblicato · {people}"
+"Publishing to a server needs the desktop app; in the browser you can join a server's files" = "Per pubblicare su un server serve l'app desktop; nel browser puoi unirti ai file di un server"
+"Publishing with the server's key." = "Pubblicazione con la chiave del server."
+"Publishing…" = "Pubblicazione…"
+"Push" = "Invia"
+"Push changes to main component" = "Invia le modifiche al componente principale"
+"Put text on path" = "Metti il testo su tracciato"
+"R" = "R"
+"Radial" = "Radiale"
+"Radius" = "Raggio"
+"Ratio" = "Rapporto"
+"Reading the library…" = "Lettura della libreria…"
+"Ready for dev" = "Pronto per lo sviluppo"
+"Real name" = "Nome reale"
+"Recent" = "Recenti"
+"Recent files" = "File recenti"
+"Recents" = "Recenti"
+"Recovered {n} unsaved files after the app quit unexpectedly: save them to keep them" = { one = "Recuperato un file non salvato dopo la chiusura imprevista dell'app: salvalo per conservarlo", other = "Recuperati {n} file non salvati dopo la chiusura imprevista dell'app: salvali per conservarli" }
+"Rectangle" = "Rettangolo"
+"Rectangles" = "Rettangoli"
+"Red" = "Rosso"
+"Reduce motion" = "Riduci animazioni"
+"Refraction" = "Rifrazione"
+"Regular expression" = "Espressione regolare"
+"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "Relativo alla scala dello schermo del sistema (100% è la dimensione del sistema). Lo zoom del documento è separato."
+"Remove" = "Rimuovi"
+"Remove all" = "Rimuovi tutto"
+"Remove annotation" = "Rimuovi annotazione"
+"Remove auto layout" = "Rimuovi auto layout"
+"Remove dev resource" = "Rimuovi risorsa per sviluppatori"
+"Remove export setting" = "Rimuovi impostazione di esportazione"
+"Remove from recents" = "Rimuovi dai recenti"
+"Remove from server" = "Rimuovi dal server"
+"Remove from server…" = "Rimuovi dal server…"
+"Remove guide" = "Rimuovi guida"
+"Remove interaction" = "Rimuovi interazione"
+"Remove library from this file" = "Rimuovi la libreria da questo file"
+"Remove min and max" = "Rimuovi minimo e massimo"
+"Remove min and max height" = "Rimuovi altezza minima e massima"
+"Remove min and max width" = "Rimuovi larghezza minima e massima"
+"Remove regions" = "Rimuovi regioni"
+"Remove slot" = "Rimuovi slot"
+"Remove starting point" = "Rimuovi punto di partenza"
+"Remove stop" = "Rimuovi stop"
+"Remove text from path" = "Rimuovi il testo dal tracciato"
+"Remove the else and its actions" = "Rimuovi \"Altrimenti\" e le sue azioni"
+"Remove this condition and its actions" = "Rimuovi questa condizione e le sue azioni"
+"Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "Rimuovere questo file dal server? Non potrà più essere condiviso né aperto da lì. La tua copia resta aperta qui."
+"Remove {name} from session" = "Rimuovi {name} dalla sessione"
+"Remove {name} from {server}?" = "Rimuovere {name} da {server}?"
+"Removed" = "Rimosso"
+"Removed from the server" = "Rimosso dal server"
+"Removed since it was marked" = "Rimosso da quando è stato segnato"
+"Rename" = "Rinomina"
+"Rename duplicated layers" = "Rinomina i livelli duplicati"
+"Rename folder" = "Rinomina cartella"
+"Rename group" = "Rinomina gruppo"
+"Rename layers" = "Rinomina livelli"
+"Rename mode" = "Rinomina modalità"
+"Rename on the server" = "Rinomina sul server"
+"Rename on the server…" = "Rinomina sul server…"
+"Rename page" = "Rinomina pagina"
+"Rename to" = "Rinomina in"
+"Reorder selection" = "Riordina selezione"
+"Replace all" = "Sostituisci tutto"
+"Replace mixed export settings" = "Sostituisci le impostazioni di esportazione miste"
+"Replace with" = "Sostituisci con"
+"Replace with a new interaction" = "Sostituisci con una nuova interazione"
+"Reply" = "Rispondi"
+"Report" = "Segnala"
+"Report this file…" = "Segnala questo file…"
+"Reset" = "Ripristina"
+"Reset adjustments" = "Ripristina regolazioni"
+"Reset all changes" = "Ripristina tutte le modifiche"
+"Reset all overrides on this layer" = "Ripristina tutte le sovrascritture su questo livello"
+"Reset overrides" = "Ripristina sovrascritture"
+"Reset slot" = "Ripristina slot"
+"Reset this override" = "Ripristina questa sovrascrittura"
+"Reset to style" = "Ripristina allo stile"
+"Reset to the inherited value" = "Ripristina al valore ereditato"
+"Resize by the nudge amount" = "Ridimensiona dell'entità dello spostamento"
+"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Ridimensiona i frame allo schermo del dispositivo (o alla finestra senza dispositivo): vincoli e auto layout reagiscono"
+"Resize to fit" = "Ridimensiona per adattare"
+"Resizing" = "Ridimensionamento"
+"Resolve" = "Risolvi"
+"Resolve change" = "Risolvi la modifica"
+"Resolved" = "Risolto"
+"Resources" = "Risorse"
+"Responsive" = "Responsive"
+"Restart" = "Riavvia"
+"Restore" = "Ripristina"
+"Restore main component" = "Ripristina componente principale"
+"Restore this version" = "Ripristina questa versione"
+"Restored “{name}”" = "“{name}” ripristinato"
+"Reverse the order" = "Inverti l'ordine"
+"Reversed triangle" = "Triangolo rovesciato"
+"Review and merge" = "Rivedi e unisci"
+"Ribbon" = "Nastro"
+"Right" = "Destra"
+"Right padding" = "Margine interno destro"
+"Right side" = "Lato destro"
+"Right side width" = "Larghezza del lato destro"
+"Rotate 90°" = "Ruota di 90°"
+"Rotate 90° right" = "Ruota di 90° a destra"
+"Rotate to landscape" = "Ruota in orizzontale"
+"Rotate to portrait" = "Ruota in verticale"
+"Rotation" = "Rotazione"
+"Rotation jitter" = "Variazione casuale della rotazione"
+"Round" = "Arrotondato"
+"Rounded" = "Arrotondato"
+"Row" = "Riga"
+"Row gap" = "Spaziatura righe"
+"Row sizes" = "Dimensioni righe"
+"Row span" = "Estensione righe"
+"Rows" = "Righe"
+"Rows {count}" = "Righe {count}"
+"Rulers" = "Righelli"
+"Run" = "Esegui"
+"Run {label}" = "Esegui {label}"
+"Save files automatically" = "Salva i file automaticamente"
+"Search templates" = "Cerca modelli"
+"See all templates" = "Vedi tutti i modelli"
+"Select layers and they space themselves as their content changes" = "Seleziona dei livelli e si distanzieranno da soli al variare del contenuto"
+"SHA-256: {sha}…" = "SHA-256: {sha}…"
+"Same as layer" = "Come il livello"
+"Saturation" = "Saturazione"
+"Save" = "Salva"
+"Save as" = "Salva come"
+"Save as preset…" = "Salva come preset…"
+"Save version  {key}" = "Salva versione  {key}"
+"Saved" = "Salvato"
+"Saved {name}" = "Salvato {name}"
+"Say something" = "Scrivi qualcosa"
+"Scale" = "Scala"
+"Scatter" = "Dispersione"
+"Scoping: where pickers offer it" = "Ambito: dove i selettori lo propongono"
+"Screen" = "Schermo"
+"Scroll behavior" = "Comportamento di scorrimento"
+"Scroll to" = "Scorri fino a"
+"Scroll to layer" = "Scorri fino al livello"
+"Scroll with parent" = "Scorri con il genitore"
+"Search plugins" = "Cerca plugin"
+"Search" = "Cerca"
+"Search actions, layers and tools" = "Cerca azioni, livelli e strumenti"
+"Search assets" = "Cerca asset"
+"Search comments" = "Cerca commenti"
+"Search files and templates" = "Cerca file e modelli"
+"Search results" = "Risultati della ricerca"
+"Search fonts" = "Cerca font"
+"Search layers" = "Cerca livelli"
+"Search pages" = "Cerca pagine"
+"Search shortcuts" = "Cerca scorciatoie"
+"Section" = "Sezione"
+"Section color" = "Colore della sezione"
+"Sections" = "Sezioni"
+"Select a frame and add a starting point to present it as a flow." = "Seleziona un frame e aggiungi un punto di partenza per presentarlo come flusso."
+"Select a frame to preview it" = "Seleziona un frame per vederne l'anteprima"
+"Select a layer to see its properties and code" = "Seleziona un livello per vederne proprietà e codice"
+"Select all" = "Seleziona tutto"
+"Select all with same" = "Seleziona tutto con lo stesso"
+"Select layer" = "Seleziona livello"
+"Select layers to apply the style to" = "Seleziona i livelli a cui applicare lo stile"
+"Select layers with this color" = "Seleziona i livelli con questo colore"
+"Select overlapping shapes" = "Seleziona forme sovrapposte"
+"Select points to edit their position, radius and mirroring" = "Seleziona dei punti per modificarne posizione, raggio e riflessione"
+"Select slot" = "Seleziona slot"
+"Selection colors" = "Colori della selezione"
+"Selection" = "Selezione"
+"Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Riquadro di selezione, {w} per {h} a {x}, {y}: le frecce lo spostano, Maiusc+frecce o {cmd}+frecce lo ridimensionano, Invio seleziona, Esc annulla"
+"Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Riquadro di selezione: le frecce lo spostano, Maiusc+frecce o {cmd}+frecce lo ridimensionano, Invio seleziona, Esc annulla"
+"Send backward" = "Porta indietro"
+"Send report" = "Invia segnalazione"
+"Send to back" = "Porta in fondo"
+"Sep" = "set"
+"Server address (ws://host:47900/)" = "Indirizzo del server (ws://host:47900/)"
+"Server address" = "Indirizzo del server"
+"Server for online sharing" = "Server per la condivisione online"
+"Set as default" = "Imposta come predefinito"
+"Set variable" = "Imposta variabile"
+"Set variable mode" = "Imposta modalità della variabile"
+"Set variable {name}" = "Imposta variabile {name}"
+"Set {name} to {value}" = "Imposta {name} su {value}"
+"Shadows" = "Ombre"
+"Shape" = "Forma"
+"Shape builder" = "Generatore di forme"
+"Shape tools" = "Strumenti forma"
+"Share" = "Condividi"
+"Share this file" = "Condividi questo file"
+"Share with a code" = "Condividi con un codice"
+"Share: live session, export" = "Condividi: sessione live, esportazione"
+"Shared" = "Condiviso"
+"Shared: copy its code from the file's menu" = "Condiviso: copia il suo codice dal menu del file"
+"Sharing a file needs the desktop app; here you can join one." = "Per condividere un file serve l'app desktop; qui puoi partecipare a uno."
+"Sharing on the local network (online sharing is off: no server is set in Preferences)." = "Condivisione sulla rete locale (la condivisione online è disattivata: nelle Preferenze non è impostato alcun server)."
+"Sharing on your network · {people}" = "Condivisione sulla tua rete · {people}"
+"Sharing online · {people}" = "Condivisione online · {people}"
+"Sharing stopped: the file stays on the server, open only to you" = "Condivisione interrotta: il file resta sul server, aperto solo a te"
+"Show" = "Mostra"
+"Show all templates" = "Mostra tutti i modelli"
+"Show as grid" = "Mostra come griglia"
+"Show as list" = "Mostra come elenco"
+"Show autosaves" = "Mostra salvataggi automatici"
+"Show behind transparent areas" = "Mostra dietro le aree trasparenti"
+"Show comments (Shift+C)" = "Mostra commenti (Maiusc+C)"
+"Show device frame" = "Mostra cornice del dispositivo"
+"Show dimensions on objects" = "Mostra dimensioni sugli oggetti"
+"Show hotspot hints" = "Mostra suggerimenti sulle aree interattive"
+"Show in Explorer" = "Mostra in Esplora risorse"
+"Show in Finder" = "Mostra nel Finder"
+"Show in folder" = "Mostra nella cartella"
+"Show only this on the canvas" = "Mostra solo questo sul canvas"
+"Show open" = "Mostra aperti"
+"Show section contents" = "Mostra il contenuto della sezione"
+"Show this layer" = "Mostra questo livello"
+"Show usage" = "Mostra utilizzo"
+"Show/Hide" = "Mostra/Nascondi"
+"Show/Hide UI" = "Mostra/Nascondi interfaccia"
+"Side by side" = "Affiancati"
+"Sidebar" = "Barra laterale"
+"Simplify stroke" = "Semplifica tratto"
+"Size" = "Dimensione"
+"Size jitter" = "Variazione casuale della dimensione"
+"Skip ink" = "Evita i discendenti"
+"Slashed zero" = "Zero barrato"
+"Slice" = "Slice"
+"Slices" = "Slice"
+"Slide in" = "Scorrimento in entrata"
+"Slide out" = "Scorrimento in uscita"
+"Slot" = "Slot"
+"Slot content" = "Contenuto dello slot"
+"Small capitals" = "Maiuscoletto"
+"Small caps" = "Maiuscoletto"
+"Smart animate" = "Animazione intelligente"
+"Snap to pixel grid" = "Aggancia alla griglia di pixel"
+"Social and slides" = "Social e slide"
+"Social media" = "Social media"
+"Social post sizes" = "Dimensioni dei post social"
+"Soft light" = "Luce soffusa"
+"Solid" = "Pieno"
+"Some variants have the same property values: give each one a unique combination" = "Alcune varianti hanno gli stessi valori di proprietà: assegna a ciascuna una combinazione unica"
+"Sort" = "Ordina"
+"Sort by" = "Ordina per"
+"Sort by date" = "Ordina per data"
+"Sort by page" = "Ordina per pagina"
+"Sort by {column}" = "Ordina per {column}"
+"Space around" = "Spazio attorno"
+"Space between" = "Spazio tra"
+"Space drag" = "Trascinamento con Spazio"
+"Space evenly" = "Spazio uniforme"
+"Space+drag" = "Spazio+trascina"
+"Spacing" = "Spaziatura"
+"Spam, stolen work, abuse…" = "Spam, lavoro rubato, abusi…"
+"Splay" = "Svasatura"
+"Spotlight me" = "Metti me in evidenza"
+"Spread" = "Diffusione"
+"Square" = "Quadrato"
+"Standard" = "Standard"
+"Standard ligatures" = "Legature standard"
+"Star" = "Stella"
+"Stars" = "Stelle"
+"Start" = "Inizio"
+"Start ascending from / stop descending at" = "Inizia a salire da / smetti di scendere a"
+"Start from a blank canvas" = "Inizia da un canvas vuoto"
+"Start from a template" = "Inizia da un modello"
+"Start on path" = "Inizio sul tracciato"
+"Start on the Home screen" = "Avvia dalla schermata Home"
+"Start point" = "Punto iniziale"
+"Start sharing" = "Inizia a condividere"
+"Start sharing with the Share button, then pass on the code it gives" = "Inizia a condividere con il pulsante Condividi, poi passa il codice che ti dà"
+"Starting to share…" = "Avvio della condivisione…"
+"Status" = "Stato"
+"Sticky" = "Sticky"
+"Stop" = "Interrompi"
+"Stop following {name}" = "Smetti di seguire {name}"
+"Stop session" = "Termina sessione"
+"Stop sharing" = "Interrompi condivisione"
+"Stop spotlighting" = "Smetti di mettere in evidenza"
+"Stop {n}  {hex}" = "Stop {n}  {hex}"
+"Stretch" = "Allunga"
+"Strikethrough" = "Barrato"
+"String" = "Stringa"
+"Stroke" = "Contorno"
+"Stroke style" = "Stile del contorno"
+"Stroke weight" = "Spessore del contorno"
+"Strokes" = "Contorni"
+"Style" = "Stile"
+"Styles" = "Stili"
+"Stylistic set 1" = "Set stilistico 1"
+"Stylistic set 2" = "Set stilistico 2"
+"Stylistic set 3" = "Set stilistico 3"
+"Stylistic set 4" = "Set stilistico 4"
+"Stylistic set 5" = "Set stilistico 5"
+"Subtract" = "Sottrai"
+"Subtracts" = "Sottrae"
+"Suffix" = "Suffisso"
+"Suspend snapping while dragging" = "Sospendi l'aggancio durante il trascinamento"
+"Swap instance" = "Scambia istanza"
+"Swap library: use another library's assets of the same names" = "Scambia libreria: usa gli asset con gli stessi nomi di un'altra libreria"
+"Swap orientation" = "Scambia orientamento"
+"Swap overlay" = "Scambia sovrapposizione"
+"Swap to {name}" = "Scambia con {name}"
+"Swap width and height" = "Scambia larghezza e altezza"
+"Swapped instance" = "Istanza scambiata"
+"Swapped {n} assets" = { one = "Scambiato {n} asset", other = "Scambiati {n} asset" }
+"Swapped {n} assets; {missed} had no match and still use the old library" = { one = "Scambiato {n} asset; mancate corrispondenze: {missed}, che usano ancora la vecchia libreria", other = "Scambiati {n} asset; mancate corrispondenze: {missed}, che usano ancora la vecchia libreria" }
+"Sweep" = "Ampiezza"
+"System" = "Sistema"
+"Tab / Shift+Tab" = "Tab / Maiusc+Tab"
+"Table" = "Tabella"
+"Tablet" = "Tablet"
+"Tabular numbers" = "Numeri tabulari"
+"Take the values from the first selected layer" = "Prendi i valori dal primo livello selezionato"
+"Taper" = "Rastremazione"
+"Taper both ends" = "Rastrema entrambe le estremità"
+"Tell the server's operator what is wrong with it" = "Spiega a chi gestisce il server cosa c'è che non va"
+"Temperature" = "Temperatura"
+"Template" = "Modello"
+"Templates" = "Modelli"
+"Terms" = "Termini"
+"Text" = "Testo"
+"Text align" = "Allineamento del testo"
+"Text content" = "Contenuto del testo"
+"Text style" = "Stile di testo"
+"Text styles" = "Stili di testo"
+"Texts" = "Testi"
+"Texture" = "Texture"
+"The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3." = "Il canvas mostra i colori in sRGB; i file PNG, JPG e WebP esportati sono contrassegnati come Display P3."
+"The destination document is unavailable. Nothing was imported." = "Il documento di destinazione non è disponibile. Non è stato importato nulla."
+"The destination document was closed. Nothing was imported." = "Il documento di destinazione è stato chiuso. Non è stato importato nulla."
+"The destination page was removed. Nothing was imported." = "La pagina di destinazione è stata rimossa. Non è stato importato nulla."
+"The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "Il file viene eliminato dal server: nessuno potrà più aprirlo o parteciparvi da lì, e l'operazione non può essere annullata. Le copie aperte restano a chi le ha."
+"The file now holds another library" = "Il file contiene ora un'altra libreria"
+"The file now holds another library (\"{name}\")" = "Il file contiene ora un'altra libreria (\"{name}\")"
+"The files you shared or published online from this computer. They stay on their server until you remove them." = "I file che hai condiviso o pubblicato online da questo computer. Restano sul loro server finché non li rimuovi."
+"The link carries the session's secret: share it only with people you invite." = "Il link contiene il segreto della sessione: condividilo solo con le persone che inviti."
+"The name in your online files and on the server. The document inside keeps its own name." = "Il nome nei tuoi file online e sul server. Il documento al suo interno mantiene il proprio nome."
+"The selection uses several text styles: click to apply one" = "La selezione usa più stili di testo: clicca per applicarne uno"
+"The server deletes this file if nobody opens it before {date}." = "Il server elimina questo file se nessuno lo apre prima del {date}."
+"The whole file" = "L'intero file"
+"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "La finestra è troppo piccola per {size}%, quindi l'interfaccia è disegnata al {drawn}%. Ingrandisci la finestra per usare {size}%."
+"Theme" = "Tema"
+"There's no destination for that action" = "Non c'è nessuna destinazione per quell'azione"
+"Thickness" = "Spessore"
+"This branch can't be reviewed: {e}" = "Questo ramo non può essere rivisto: {e}"
+"This branch was merged or archived." = "Questo ramo è stato unito o archiviato."
+"This computer only" = "Solo questo computer"
+"This computer remembers the owner token, so the file can be managed from the home screen's Online list. Copy it to manage the file from somewhere else: it is a password for this file and won't be shown again." = "Questo computer ricorda il token del proprietario, quindi il file può essere gestito dall'elenco Online della schermata Home. Copialo per gestire il file da un altro posto: è una password per questo file e non verrà mostrato di nuovo."
+"This condition is edited as an expression" = "Questa condizione viene modificata come espressione"
+"This file" = "Questo file"
+"This file has unsaved changes" = "Questo file ha modifiche non salvate"
+"This file is too large to join here (up to {mb} MB)" = "Questo file è troppo grande per parteciparvi da qui (fino a {mb} MB)"
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "Questo file usa font che non sono installati su questo computer. Il loro testo è disegnato con un font di riserva finché non li installi."
+"This file is on {server}, open only to you. Share it to let others in with a new code." = "Questo file è su {server}, aperto solo a te. Condividilo per far entrare altri con un nuovo codice."
+"This frame is new on the branch." = "Questo frame è nuovo nel ramo."
+"This frame isn't on the branch." = "Questo frame non è nel ramo."
+"This server is open to the public: no key needed." = "Questo server è aperto al pubblico: non serve nessuna chiave."
+"This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Questo server richiede la sua chiave: aggiungi ?key=… all'indirizzo (`figcraft-server key` la stampa sul computer del server)."
+"This server takes files only with its key: see Advanced." = "Questo server accetta file solo con la sua chiave: vedi Avanzate."
+"Tidy up" = "Riordina"
+"Tile" = "Affianca"
+"Tile type" = "Tipo di affiancamento"
+"Tint" = "Tinta"
+"Title" = "Titolo"
+"Title case" = "Iniziali maiuscole"
+"To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Per condividere questa libreria con il tuo team, pubblica il file su un server (Condividi ▸ Pubblica sul server…), poi pubblica lì la libreria."
+"Toggle" = "Attiva/Disattiva"
+"Toggle light/dark theme" = "Passa dal tema chiaro a quello scuro"
+"Toggle visibility" = "Attiva/Disattiva visibilità"
+"Tools" = "Strumenti"
+"Top" = "In alto"
+"Top & bottom" = "In alto e in basso"
+"Top left radius" = "Raggio in alto a sinistra"
+"Top padding" = "Margine interno superiore"
+"Top right radius" = "Raggio in alto a destra"
+"Transform" = "Trasforma"
+"Triangle arrow" = "Freccia triangolare"
+"Trigger" = "Trigger"
+"True" = "Vero"
+"Truncate text" = "Tronca testo"
+"Truncate with an ellipsis" = "Tronca con i puntini di sospensione"
+"Try again" = "Riprova"
+"Try another search or filter." = "Prova un'altra ricerca o un altro filtro."
+"Try another search, or browse templates." = "Prova un'altra ricerca, oppure sfoglia i modelli."
+"Try another word, or look at every kind." = "Prova un'altra parola, oppure guarda tutti i tipi."
+"Turn a layer into a component, reuse it, and change every copy at once" = "Trasforma un livello in componente, riutilizzalo e cambia tutte le copie in una volta"
+"Two digits" = "Due cifre"
+"Type" = "Tipo"
+"Type settings" = "Impostazioni tipografiche"
+"Type the join code you were given, or paste an invite link." = "Digita il codice di partecipazione che ti è stato dato, oppure incolla un link di invito."
+"Typography" = "Tipografia"
+"Underline" = "Sottolineato"
+"Undo takes back only your own changes; what others changed since stays." = "Annulla ripristina solo le tue modifiche; quelle fatte da altri nel frattempo restano."
+"Ungroup" = "Separa"
+"Uniform" = "Uniforme"
+"Union" = "Unione"
+"Unions" = "Unioni"
+"Unknown — treated as sRGB" = "Sconosciuto — trattato come sRGB"
+"Unread" = "Non letto"
+"Unresolve" = "Riapri"
+"Unsaved changes" = "Modifiche non salvate"
+"Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Modifiche non salvate: salva prima ({save}), oppure chiudi la scheda con {alt}+clic per scartarle"
+"Unsaved changes: save first, or close again with {key} to discard" = "Modifiche non salvate: salva prima, oppure chiudi di nuovo con {key} per scartarle"
+"Up" = "Su"
+"Update plugin" = "Aggiorna plugin"
+"Update" = "Aggiorna"
+"Update from main" = "Aggiorna da main"
+"Update from selection" = "Aggiorna dalla selezione"
+"Updated {components} and {styles}" = "Aggiornati {components} e {styles}"
+"Updated {name}" = "Aggiornato {name}"
+"Updating the graphics driver often helps. To use OpenGL only, start FigCraft from a Command Prompt with:" = "Aggiornare il driver grafico spesso aiuta. Per usare solo OpenGL, avvia FigCraft dal Prompt dei comandi con:"
+"Updating the graphics driver often helps. WGPU_BACKEND (vulkan, gl, metal) names another graphics API to try." = "Aggiornare il driver grafico spesso aiuta. WGPU_BACKEND (vulkan, gl, metal) indica un'altra API grafica da provare."
+"Uploads this file to a FigCraft server and keeps this tab in sync with it. You get a link to edit and a link to view." = "Carica questo file su un server FigCraft e mantiene questa scheda sincronizzata con esso. Ricevi un link per modificare e un link per visualizzare."
+"Uppercase" = "Maiuscolo"
+"Use a fixed value" = "Usa un valore fisso"
+"Use an expression, e.g. count + 1" = "Usa un'espressione, ad es. count + 1"
+"Use as mask" = "Usa come maschera"
+"Use auto layout" = "Usa auto layout"
+"Use number keys for opacity" = "Usa i tasti numerici per l'opacità"
+"Use the .figcraft or .fig extension." = "Usa l'estensione .figcraft o .fig."
+"Use the layer's fill" = "Usa il riempimento del livello"
+"Use your browser's zoom to change the interface size." = "Usa lo zoom del browser per cambiare la dimensione dell'interfaccia."
+"Used in {files} · {instances}" = "Usato in {files} · {instances}"
+"Username" = "Nome utente"
+"Value" = "Valore"
+"Uses variables: each layer shows them in its own mode" = "Usa variabili: ogni livello le mostra nella propria modalità"
+"Variable" = "Variabile"
+"Variable collections" = "Collezioni di variabili"
+"Variable modes" = "Modalità delle variabili"
+"Variable width" = "Larghezza variabile"
+"Variables" = "Variabili"
+"Variables JSON…" = "JSON delle variabili…"
+"Variables store reusable values (colours, numbers, strings, booleans) with modes such as Light and Dark." = "Le variabili memorizzano valori riutilizzabili (colori, numeri, stringhe, booleani) con modalità come Chiaro e Scuro."
+"Variant" = "Variante"
+"Vector" = "Vettore"
+"Vectors" = "Vettori"
+"Version" = "Versione"
+"Version history" = "Cronologia versioni"
+"Version {version}" = "Versione {version}"
+"Version {v} · {components} · {styles} · {variables}" = "Versione {v} · {components} · {styles} · {variables}"
+"Vertical" = "Verticale"
+"Vertical align" = "Allineamento verticale"
+"Vertical hex" = "Esagono verticale"
+"Vertical padding" = "Margine interno verticale"
+"Vertical spacing" = "Spaziatura verticale"
+"Vertical trim" = "Rifilatura verticale"
+"View" = "Vista"
+"View link" = "Link di visualizzazione"
+"View link copied" = "Link di visualizzazione copiato"
+"View only" = "Sola visualizzazione"
+"View only: you see every change as it happens but can't edit. Leave to keep a copy you can edit." = "Sola visualizzazione: vedi ogni modifica mentre avviene ma non puoi modificare. Esci per conservare una copia modificabile."
+"Viewing “{name}”" = "Visualizzazione di “{name}”"
+"Violet" = "Viola"
+"Visibility" = "Visibilità"
+"Visible" = "Visibile"
+"Vivid" = "Vivido"
+"WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND è impostata e indica l'API grafica da usare; rimuovendola FigCraft sceglie da sé."
+"Warm" = "Caldo"
+"Watch" = "Osserva"
+"Wavy" = "Ondulato"
+"Web" = "Web"
+"Websites" = "Siti web"
+"WebSocket URL" = "URL WebSocket"
+"WebSocket URL copied" = "URL WebSocket copiato"
+"Wedge" = "Spicchio"
+"Weight" = "Peso"
+"What you try here changes this preview and the code below, not the file" = "Ciò che provi qui cambia questa anteprima e il codice sotto, non il file"
+"What changed since it was marked ready for dev" = "Cosa è cambiato da quando è stato segnato come pronto per lo sviluppo"
+"What is wrong with this file? The server's operator gets your report." = "Cosa c'è che non va in questo file? Chi gestisce il server riceve la tua segnalazione."
+"What it's for" = "A cosa serve"
+"What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "Non si sa da cosa sia cambiato: è cambiato prima che FigCraft conservasse una copia dei frame pronti per lo sviluppo. Risolvi la modifica (o segnalo di nuovo come pronto) per confrontare da ora in poi."
+"While hovering" = "Durante il passaggio del mouse"
+"While pressing" = "Durante la pressione"
+"White" = "Bianco"
+"Who runs it, its terms and how long it keeps files" = "Chi lo gestisce, i suoi termini e per quanto tempo conserva i file"
+"Why it changed" = "Perché è cambiato"
+"Widget" = "Widget"
+"Widgets" = "Widget"
+"Width" = "Larghezza"
+"Width point" = "Punto di larghezza"
+"Width profile" = "Profilo di larghezza"
+"Wireframe kit" = "Kit wireframe"
+"With the layers' export settings" = "Con le impostazioni di esportazione dei livelli"
+"Wrap" = "A capo"
+"Wrap in new section" = "Racchiudi in una nuova sezione"
+"Yellow" = "Giallo"
+"Yesterday" = "Ieri"
+"You" = "Tu"
+"You'll get the shared file as a new tab and edit it together." = "Riceverai il file condiviso in una nuova scheda e lo modificherete insieme."
+"You're spotlighting: everyone follows your view" = "Stai mettendo in evidenza: tutti seguono la tua vista"
+"Your copy of the file stays open" = "La tua copia del file resta aperta"
+"Your copy stays open; the file stays on the server" = "La tua copia resta aperta; il file resta sul server"
+"Your name" = "Il tuo nome"
+"Your name in comments" = "Il tuo nome nei commenti"
+"Your system asks for reduced motion: animations stay off." = "Il tuo sistema richiede movimento ridotto: le animazioni restano disattivate."
+"Z" = "Z"
+"Z to A" = "Dalla Z alla A"
+"Zoom" = "Zoom"
+"Zoom around the pointer" = "Zoom attorno al puntatore"
+"Zoom device to fill window" = "Ingrandisci il dispositivo per riempire la finestra"
+"Zoom in" = "Ingrandisci"
+"Zoom out" = "Riduci"
+"Zoom to 100%" = "Zoom al 100%"
+"Zoom to 200%" = "Zoom al 200%"
+"Zoom to 50%" = "Zoom al 50%"
+"Zoom to fit" = "Zoom per adattare"
+"Zoom to selection" = "Zoom sulla selezione"
+"Zoom tool: click to zoom in, drag an area" = "Strumento zoom: clicca per ingrandire, trascina un'area"
+"Zoom tool: zoom out" = "Strumento zoom: riduci"
+"and {n} more" = { one = "e altro {n}", other = "e altri {n}" }
+"bleed marks" = "crocini di abbondanza"
+"by {author}" = "di {author}"
+"call any command its access allows" = "chiama qualsiasi comando consentito dal suo accesso"
+"call only: {commands}" = "chiama solo: {commands}"
+"can edit the document" = "può modificare il documento"
+"conditional prototype actions nested too deeply were skipped" = "le azioni condizionali del prototipo annidate troppo in profondità sono state saltate"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "le azioni condizionali del prototipo con condizioni non valutabili sono state saltate"
+"connector label background was skipped: style data is missing" = "lo sfondo dell'etichetta del connettore è stato saltato: mancano i dati di stile"
+"connector label was skipped: background bounds are invalid" = "l'etichetta del connettore è stata saltata: i limiti dello sfondo non sono validi"
+"connector label was skipped: background transform is invalid" = "l'etichetta del connettore è stata saltata: la trasformazione dello sfondo non è valida"
+"connector label was skipped: composed text transform is invalid" = "l'etichetta del connettore è stata saltata: la trasformazione del testo composto non è valida"
+"connector label was skipped: derived background bounds are missing" = "l'etichetta del connettore è stata saltata: mancano i limiti dello sfondo derivati"
+"connector label was skipped: derived text bounds are missing" = "l'etichetta del connettore è stata saltata: mancano i limiti del testo derivati"
+"connector label was skipped: text bounds are invalid" = "l'etichetta del connettore è stata saltata: i limiti del testo non sono validi"
+"connector label was skipped: text style data is missing" = "l'etichetta del connettore è stata saltata: mancano i dati di stile del testo"
+"connector label was skipped: text transform is invalid" = "l'etichetta del connettore è stata saltata: la trasformazione del testo non è valida"
+"connector labels were skipped" = "le etichette dei connettori sono state saltate"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "i livelli connettore vengono importati come istantanee statiche di frame/vettori con le etichette, se presenti; i collegamenti dinamici alle estremità non vengono mantenuti"
+"connector snapshot vector data is missing; connector was left empty" = "mancano i dati vettoriali dell'istantanea del connettore; il connettore è stato lasciato vuoto"
+"connectors whose ends can't be placed are empty" = "i connettori le cui estremità non possono essere posizionate sono vuoti"
+"crop marks" = "crocini di taglio"
+"damaged vector geometry was skipped" = "la geometria vettoriale danneggiata è stata saltata"
+"damaged vector networks import as outlines" = "le reti vettoriali danneggiate vengono importate come contorni"
+"development: {path}" = "sviluppo: {path}"
+"document children other than pages were skipped" = "i figli del documento diversi dalle pagine sono stati saltati"
+"duplicate grid track sizing entries use equal tracks" = "le voci duplicate di dimensionamento delle tracce della griglia usano tracce uguali"
+"e.g. count + 1" = "ad es. count + 1"
+"e.g. count >= 3 and not done" = "ad es. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "i connettori ad angolo e curvi senza un tracciato salvato vengono importati come linee rette"
+"entries without a node type were skipped" = "le voci senza tipo di nodo sono state saltate"
+"figcraft:// links from a browser, chat or email open this app and join the session." = "i link figcraft:// da un browser, una chat o un'email aprono questa app e partecipano alla sessione."
+"filled areas of a vector with their own fill use the layer's fill" = "le aree riempite di un vettore con riempimento proprio usano il riempimento del livello"
+"from {server}" = "da {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "i trigger del gamepad senza esattamente un pulsante noto del controller sono stati saltati"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "l'elenco delle tracce della griglia supera 1000 voci; le tracce usano il dimensionamento uniforme predefinito"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "il dimensionamento delle tracce della griglia non è supportato o è malformato; le tracce interessate usano dimensioni uguali"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "l'elenco di dimensionamento delle tracce della griglia supera 1000 voci; le tracce usano il dimensionamento uniforme predefinito"
+"hidden" = "nascosto"
+"iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "i filtri immagine sono ambigui perché sono presenti entrambi i contenitori di filtri; la conversione dei filtri è stata saltata"
+"image filters use FigCraft's approximate renderer" = "i filtri immagine usano il renderer approssimato di FigCraft"
+"instance swap properties whose default component isn't in the file were skipped" = "le proprietà di scambio istanza il cui componente predefinito non è nel file sono state saltate"
+"instances inside their own main component were imported as frames" = "le istanze all'interno del proprio componente principale sono state importate come frame"
+"instances of components that aren't in the file show no layers" = "le istanze di componenti non presenti nel file non mostrano livelli"
+"instances of components that aren't in the file were imported as frames" = "le istanze di componenti non presenti nel file sono state importate come frame"
+"instances that would nest a component inside itself were imported as frames" = "le istanze che anniderebbero un componente dentro se stesso sono state importate come frame"
+"instances without a main component were imported as empty frames" = "le istanze senza componente principale sono state importate come frame vuoti"
+"invalid internal .fig text path data was ignored" = "i dati interni non validi del tracciato di testo .fig sono stati ignorati"
+"invalid or oversized vector networks import as outlines" = "le reti vettoriali non valide o troppo grandi vengono importate come contorni"
+"invalid or oversized vector path data was skipped" = "i dati di tracciato vettoriale non validi o troppo grandi sono stati saltati"
+"just now" = "adesso"
+"key triggers without a supported key were skipped" = "i trigger da tasto senza un tasto supportato sono stati saltati"
+"key up triggers import as key presses" = "i trigger di rilascio del tasto vengono importati come pressioni del tasto"
+"layers without a position were placed at their parent's origin" = "i livelli senza posizione sono stati posti all'origine del loro genitore"
+"layers without a type were skipped" = "i livelli senza tipo sono stati saltati"
+"legacy image filter container is unsupported; filter conversion was skipped" = "il contenitore di filtri immagine legacy non è supportato; la conversione dei filtri è stata saltata"
+"locked" = "bloccato"
+"malformed image filters container was skipped" = "il contenitore di filtri immagine malformato è stato saltato"
+"malformed image paintFilter container was skipped" = "il contenitore paintFilter dell'immagine malformato è stato saltato"
+"malformed slot content assignment was skipped" = "l'assegnazione di contenuto dello slot malformata è stata saltata"
+"no bleed" = "nessuna abbondanza"
+"nobody else here yet" = "ancora nessun altro qui"
+"non-default slot settings are not represented and were skipped" = "le impostazioni dello slot non predefinite non sono rappresentate e sono state saltate"
+"now" = "ora"
+"only in a text style or variable" = "solo in uno stile di testo o in una variabile"
+"or" = "oppure"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "le giunzioni dei punti del contorno sono state mantenute; i contorni tratteggiati o di larghezza variabile vengono resi con la giunzione del livello"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "le chiavi dei componenti preferiti dello slot non possono essere risolte in nodi del file e sono state saltate"
+"prototype actions of unknown types were skipped" = "le azioni del prototipo di tipo sconosciuto sono state saltate"
+"prototype actions without a destination in the file were skipped" = "le azioni del prototipo senza una destinazione nel file sono state saltate"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "le espressioni del prototipo su variabili non presenti nel JSON delle variabili sono state saltate"
+"prototype expressions with unsupported functions were skipped" = "le espressioni del prototipo con funzioni non supportate sono state saltate"
+"prototype interactions without supported actions were skipped" = "le interazioni del prototipo senza azioni supportate sono state saltate"
+"prototype navigations of unknown types were skipped" = "le navigazioni del prototipo di tipo sconosciuto sono state saltate"
+"prototype transitions of unknown types play instantly" = "le transizioni del prototipo di tipo sconosciuto vengono eseguite istantaneamente"
+"prototype triggers of unknown types were skipped" = "i trigger del prototipo di tipo sconosciuto sono stati saltati"
+"put a widget on the canvas" = "inserire un widget sul canvas"
+"read and edit the document" = "leggere e modificare il documento"
+"read the document" = "leggere il documento"
+"reads the document" = "legge il documento"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "le azioni \"imposta variabile\" su variabili non presenti nel JSON delle variabili sono state saltate"
+"set-variable actions with values that can't be evaluated were skipped" = "le azioni \"imposta variabile\" con valori non valutabili sono state saltate"
+"set-variable actions with values that don't fit the variable were skipped" = "le azioni \"imposta variabile\" con valori non adatti alla variabile sono state saltate"
+"set-variable actions without a value were skipped" = "le azioni \"imposta variabile\" senza valore sono state saltate"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "le azioni \"imposta modalità variabile\" su collezioni o modalità non presenti nel JSON delle variabili sono state saltate"
+"slot content assignment target is missing or is not slot content" = "la destinazione dell'assegnazione del contenuto dello slot manca o non è un contenuto di slot"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "l'assegnazione del contenuto dello slot usa il GUID sentinella vuoto ed è stata saltata"
+"slot layers without a matching slot property were imported as frames" = "i livelli slot senza una proprietà slot corrispondente sono stati importati come frame"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "alcuni punti vettoriali fanno riferimento a impostazioni di punto mancanti nel file; usano le giunzioni del livello e angoli semplici"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "alcuni segmenti vettoriali fanno riferimento a impostazioni di stile mancanti nel file; usano il contorno del livello"
+"stale or invalid grid track sizing entries were ignored" = "le voci di dimensionamento delle tracce della griglia obsolete o non valide sono state ignorate"
+"stars and polygons without point counts or geometry use the default point count" = "stelle e poligoni senza numero di punte o geometria usano il numero di punte predefinito"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "le impostazioni di stile di alcuni segmenti vettoriali non sono supportate; quei segmenti usano il contorno del livello"
+"text path underline or strikethrough decoration is not rendered" = "la sottolineatura o il barrato del testo su tracciato non viene reso"
+"text style overrides refer to missing table entries" = "le sovrascritture dello stile di testo fanno riferimento a voci di tabella mancanti"
+"the file has no pages" = "il file non ha pagine"
+"the plugin" = "il plugin"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "il JSON delle variabili non ha `variableCollections` (era attesa la risposta delle variabili locali) ed è stato ignorato"
+"this session only" = "solo questa sessione"
+"unknown component property types were skipped" = "i tipi di proprietà del componente sconosciuti sono stati saltati"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "gli alias di variabile verso variabili non presenti nel JSON delle variabili (o di un altro tipo) sono stati saltati"
+"variable bindings to properties the layer doesn't have were skipped" = "i collegamenti di variabile a proprietà che il livello non possiede sono stati saltati"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "i collegamenti di variabile a variabili non presenti nel JSON delle variabili (variabili di libreria) sono stati saltati"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "i collegamenti di variabile sono stati saltati: il JSON del file non ha definizioni di variabili (passa il JSON delle variabili locali come `variables`, oppure incorpora il suo `meta` accanto al JSON del file)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "i collegamenti di variabile il cui tipo non è adatto alla proprietà sono stati saltati"
+"variable collections without modes were skipped" = "le collezioni di variabili senza modalità sono state saltate"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "le ricerche di modalità di variabile nelle espressioni del prototipo che non sono una variabile e una delle sue modalità sono state saltate"
+"variable modes of collections that aren't in the file were skipped" = "le modalità di variabile di collezioni non presenti nel file sono state saltate"
+"variable modes of collections that aren't in the variables JSON were skipped" = "le modalità di variabile di collezioni non presenti nel JSON delle variabili sono state saltate"
+"variable values that don't match their type (or composed colours) were skipped" = "i valori di variabile che non corrispondono al loro tipo (o i colori composti) sono stati saltati"
+"variables of unknown types were skipped" = "le variabili di tipo sconosciuto sono state saltate"
+"variables whose collection isn't in the variables JSON were skipped" = "le variabili la cui collezione non è nel JSON delle variabili sono state saltate"
+"variables without readable values were skipped" = "le variabili senza valori leggibili sono state saltate"
+"vector points with unknown stroke joins use the layer join" = "i punti vettoriali con giunzioni di contorno sconosciute usano la giunzione del livello"
+"vectors without geometry are empty" = "i vettori senza geometria sono vuoti"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "i vettori senza geometria sono vuoti (esporta il JSON del file con geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "un testo molto lungo è stato troncato a 1.048.576 caratteri"
+"very long vector paths were skipped" = "i tracciati vettoriali molto lunghi sono stati saltati"
+"video actions are not supported and were skipped" = "le azioni video non sono supportate e sono state saltate"
+"video triggers are not supported and were skipped" = "i trigger video non sono supportati e sono stati saltati"
+"yesterday" = "ieri"
+"{instances} in {files}" = "{instances} in {files}"
+"{language}: draft translation, waiting for a native speaker's review." = "{language}: traduzione provvisoria, in attesa della revisione di un madrelingua."
+"{length} bleed" = "abbondanza di {length}"
+"{month} {day}, {year}" = "{day} {month} {year}"
+"{name} cleared from the list" = "{name} rimosso dall'elenco"
+"{name} is forgotten on this computer; the file stays on {server}" = "{name} è dimenticato su questo computer; il file resta su {server}"
+"{name} is on the server." = "{name} è sul server."
+"{name} is spotlighting" = "{name} sta mettendo in evidenza"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} è troppo grande per essere aperto nel browser (oltre 512 MB)."
+"{name}\nClick to apply to the selection" = "{name}\nClicca per applicare alla selezione"
+"{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nTrascina sul canvas, oppure clicca per posizionare al centro della vista.\nTieni premuto Alt (Opzione) mentre rilasci su un'istanza per scambiarla."
+"{name} (from {library})" = "{name} (da {library})"
+"{name} (you)" = "{name} (tu)"
+"{name} ({layers} layers)" = "{name} ({layers} livelli)"
+"{name} ({tag}): {min} – {max}, default {default}. Double-click the slider to go back to the style's value; Escape while dragging cancels." = "{name} ({tag}): {min} – {max}, predefinito {default}. Fai doppio clic sul cursore per tornare al valore dello stile; Esc durante il trascinamento annulla."
+"{name} from {path}" = "{name} da {path}"
+"{name} was removed from the server" = "{name} è stato rimosso dal server"
+"{name} · deleted on main" = "{name} · eliminato su main"
+"{name} · deleted on the branch" = "{name} · eliminato sul ramo"
+"{name} · not published" = "{name} · non pubblicato"
+"{name} · on a server" = "{name} · su un server"
+"{name} · published version {v}" = "{name} · versione {v} pubblicata"
+"{name} · version {v} on the server" = "{name} · versione {v} sul server"
+"{name}, in a live session" = "{name}, in una sessione live"
+"{name}, online, open only to you" = "{name}, online, aperto solo a te"
+"{name}, {kind}, {w} by {h}, selected" = "{name}, {kind}, {w} per {h}, selezionato"
+"{n} added" = { one = "{n} aggiunto", other = "{n} aggiunti" }
+"{n} autosave versions" = { one = "{n} versione di salvataggio automatico", other = "{n} versioni di salvataggio automatico" }
+"{n} changed" = { one = "{n} modificato", other = "{n} modificati" }
+"{n} columns" = { one = "{n} colonna", other = "{n} colonne" }
+"{n} components" = { one = "{n} componente", other = "{n} componenti" }
+"{n} components and styles have newer versions" = { one = "{n} componente o stile ha una versione più recente", other = "{n} componenti e stili hanno versioni più recenti" }
+"{n} conflicts to resolve" = { one = "{n} conflitto da risolvere", other = "{n} conflitti da risolvere" }
+"{n} days ago" = { one = "{n} giorno fa", other = "{n} giorni fa" }
+"{n} files" = { one = "{n} file", other = "{n} file" }
+"{n} hours ago" = { one = "{n} ora fa", other = "{n} ore fa" }
+"{n} instances" = { one = "{n} istanza", other = "{n} istanze" }
+"{n} layers" = { one = "{n} livello", other = "{n} livelli" }
+"{n} layers as one file" = { one = "{n} livello come un unico file", other = "{n} livelli come un unico file" }
+"{n} layers selected" = { one = "{n} livello selezionato", other = "{n} livelli selezionati" }
+"{n} layers · {parts}" = { one = "{n} livello · {parts}", other = "{n} livelli · {parts}" }
+"{n} matches" = { one = "{n} corrispondenza", other = "{n} corrispondenze" }
+"{n} minutes ago" = { one = "{n} minuto fa", other = "{n} minuti fa" }
+"{n} months ago" = { one = "{n} mese fa", other = "{n} mesi fa" }
+"{n} more notes omitted from this report" = { one = "{n} altra nota omessa da questo resoconto", other = "{n} altre note omesse da questo resoconto" }
+"{n} of {total}" = "{n} di {total}"
+"{n} people joined" = { one = "{n} persona si è unita", other = "{n} persone si sono unite" }
+"{n} preferred components" = { one = "{n} componente preferito", other = "{n} componenti preferiti" }
+"{n} ready" = { one = "{n} pronto", other = "{n} pronti" }
+"{n} removed" = { one = "{n} rimosso", other = "{n} rimossi" }
+"{n} replies" = { one = "{n} risposta", other = "{n} risposte" }
+"{n} rows" = { one = "{n} riga", other = "{n} righe" }
+"{n} styles" = { one = "{n} stile", other = "{n} stili" }
+"{n} text layers" = { one = "{n} livello di testo", other = "{n} livelli di testo" }
+"{n} variables" = { one = "{n} variabile", other = "{n} variabili" }
+"{n} weeks ago" = { one = "{n} settimana fa", other = "{n} settimane fa" }
+"{n} years ago" = { one = "{n} anno fa", other = "{n} anni fa" }
+"{n}d" = "{n}g"
+"{n}h" = "{n}h"
+"{n}m" = "{n}m"
+"{n}w" = "{n}sett"
+"{page}, nothing selected" = "{page}, nessuna selezione"
+"{percent}%" = "{percent}%"
+"{profile} (current)" = "{profile} (attuale)"
+"{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} è il suo valore; {property ? \"a\" : \"b\"} sceglie una stringa. Qualsiasi altro {…} resta come scritto."
+"{server} can't say what became of your files (it is older than this app)." = "{server} non sa dire che fine abbiano fatto i tuoi file (è più vecchio di questa app)."
+"{server} · No longer on the server" = "{server} · Non più sul server"
+"{server} · {shared} · Opened {date}" = "{server} · {shared} · Aperto {date}"
+"{tool}  hold {key}" = "{tool}  tieni premuto {key}"
+"{value} isn't a colour" = "{value} non è un colore"
+"{when} · edited" = "{when} · modificato"
+"← ↑ → ↓" = "← ↑ → ↓"
+"← → ↑ ↓" = "← → ↑ ↓"
+"←" = "←"
+"→, Space or N" = "→, Spazio o N"
+"↵" = "↵"
+"⇥ / ⇧⇥" = "⇥ / ⇧⇥"
+"⌘ arrows" = "⌘ frecce"
+"⌘ click" = "⌘ clic"
+"⌘ scroll" = "⌘ scorrimento"
+"⌥ drag" = "⌥ trascina"
+
+[commands]
+"align.bottom" = "Allinea in basso"
+"align.hcenter" = "Allinea i centri orizzontali"
+"align.left" = "Allinea a sinistra"
+"align.right" = "Allinea a destra"
+"align.top" = "Allinea in alto"
+"align.vcenter" = "Allinea i centri verticali"
+"annotation.add" = "Aggiungi annotazione"
+"annotation.addCategory" = "Aggiungi categoria di annotazione"
+"annotation.categories" = "Categorie di annotazione"
+"annotation.edit" = "Modifica annotazione"
+"annotation.editCategory" = "Modifica categoria di annotazione"
+"annotation.list" = "Elenca annotazioni"
+"annotation.remove" = "Rimuovi annotazione"
+"annotation.removeCategory" = "Elimina categoria di annotazione"
+"app.actions" = "Azioni"
+"app.preferences" = "Preferenze"
+"arrange.back" = "Porta in fondo"
+"arrange.backward" = "Porta indietro"
+"arrange.forward" = "Porta avanti"
+"arrange.front" = "Porta in primo piano"
+"arrange.packH" = "Compatta in orizzontale"
+"arrange.packV" = "Compatta in verticale"
+"arrange.reorder" = "Riordina selezione"
+"arrange.roundToPixels" = "Arrotonda ai pixel"
+"arrange.spacing" = "Spaziatura"
+"arrange.tidy" = "Riordina"
+"bool.exclude" = "Escludi selezione"
+"bool.flatten" = "Appiattisci booleano"
+"bool.intersect" = "Interseca selezione"
+"bool.subtract" = "Sottrai selezione"
+"bool.union" = "Unisci selezione"
+"branch.archive" = "Archivia ramo"
+"branch.create" = "Crea ramo"
+"branch.list" = "Elenca rami"
+"branch.merge" = "Unisci ramo"
+"branch.open" = "Apri ramo"
+"branch.review" = "Rivedi ramo"
+"branch.updateFromMain" = "Aggiorna da main"
+"codeConnect.export" = "Esporta collegamenti al codice"
+"codeConnect.import" = "Importa collegamenti al codice"
+"codeConnect.remove" = "Scollega dal codice"
+"codeConnect.set" = "Collega al codice"
+"collab.cursor" = "Mostra cursore a"
+"collab.cursorChat" = "Chat del cursore"
+"collab.diff" = "Mostra modifiche di sincronizzazione"
+"collab.files" = "I tuoi file online"
+"collab.follow" = "Segui"
+"collab.forgetFile" = "Dimentica file online"
+"collab.host" = "Avvia sessione live"
+"collab.join" = "Partecipa alla sessione live"
+"collab.leave" = "Esci dalla sessione live"
+"collab.manageFile" = "Gestisci file pubblicato"
+"collab.openFile" = "Apri file online"
+"collab.peers" = "Persone in questo file"
+"collab.publish" = "Pubblica sul server"
+"collab.recoverFile" = "Recupera file online"
+"collab.registerLinks" = "Apri i link di invito in FigCraft"
+"collab.removePerson" = "Rimuovi dalla sessione"
+"collab.report" = "Segnala il file a chi gestisce il server"
+"collab.serverInfo" = "Informazioni sul server"
+"collab.share" = "Condividi con un codice di partecipazione"
+"collab.spotlight" = "Metti me in evidenza"
+"collab.stop" = "Termina sessione live"
+"command.batch" = "Esegui più comandi"
+"comment.add" = "Aggiungi commento"
+"comment.delete" = "Elimina commento"
+"comment.edit" = "Modifica commento"
+"comment.link" = "Copia link al commento"
+"comment.list" = "Elenca commenti"
+"comment.markRead" = "Segna commento come letto"
+"comment.move" = "Sposta commento"
+"comment.next" = "Commento successivo"
+"comment.open" = "Apri commento"
+"comment.people" = "Persone nei commenti"
+"comment.react" = "Reagisci al commento"
+"comment.reply" = "Rispondi al commento"
+"comment.resolve" = "Risolvi commento"
+"comment.zoom" = "Zoom sui commenti"
+"component.addProperty" = "Aggiungi proprietà del componente"
+"component.addVariant" = "Aggiungi variante"
+"component.bindProperty" = "Collega livello alla proprietà"
+"component.combineVariants" = "Combina come varianti"
+"component.create" = "Crea componente"
+"component.createMultiple" = "Crea più componenti"
+"component.deleteProperty" = "Elimina proprietà del componente"
+"component.detach" = "Scollega istanza"
+"component.editProperty" = "Modifica proprietà del componente"
+"component.exposeInstance" = "Esponi istanza annidata"
+"component.goToMain" = "Vai al componente principale"
+"component.hideWhenPublishing" = "Nascondi alla pubblicazione"
+"component.list" = "Elenca componenti"
+"component.makeSlot" = "Crea slot"
+"component.playground" = "Playground dei componenti"
+"component.properties" = "Proprietà del componente"
+"component.pushChanges" = "Invia le modifiche al componente principale"
+"component.removeSlot" = "Rimuovi slot"
+"component.resetInstance" = "Ripristina tutte le modifiche"
+"component.resetOverride" = "Ripristina sovrascrittura"
+"component.restoreMain" = "Ripristina componente principale"
+"dev.compare" = "Confronta modifiche"
+"dev.focus" = "Vista focus"
+"dev.resolveChange" = "Risolvi la modifica"
+"dev.unfocus" = "Esci dalla vista focus"
+"devResource.add" = "Aggiungi risorsa per sviluppatori"
+"devResource.edit" = "Modifica risorsa per sviluppatori"
+"devResource.list" = "Elenca risorse per sviluppatori"
+"devResource.remove" = "Rimuovi risorsa per sviluppatori"
+"distribute.horizontal" = "Distribuisci spaziatura orizzontale"
+"distribute.vertical" = "Distribuisci spaziatura verticale"
+"doc.home" = "Home"
+"doc.list" = "Elenca documenti"
+"doc.nextTab" = "Scheda successiva"
+"doc.previousTab" = "Scheda precedente"
+"doc.switch" = "Cambia documento"
+"edit.copy" = "Copia"
+"edit.copyAsCss" = "Copia come CSS"
+"edit.copyAsPng" = "Copia come PNG"
+"edit.copyAsSvg" = "Copia come SVG"
+"edit.copyAsText" = "Copia come testo"
+"edit.copyLink" = "Copia link alla selezione"
+"edit.copyProperties" = "Copia proprietà"
+"edit.cut" = "Taglia"
+"edit.delete" = "Elimina"
+"edit.duplicate" = "Duplica"
+"edit.findReplace" = "Trova e sostituisci"
+"edit.paste" = "Incolla"
+"edit.pasteDesignLayers" = "Incolla livelli di design"
+"edit.pasteOver" = "Incolla sopra la selezione"
+"edit.pasteProperties" = "Incolla proprietà"
+"edit.pasteReplace" = "Incolla per sostituire"
+"edit.pickColor" = "Scegli colore"
+"edit.redo" = "Ripeti"
+"edit.repeat" = "Ripeti l'ultimo comando"
+"edit.setDefaultProperties" = "Imposta proprietà predefinite"
+"edit.undo" = "Annulla"
+"effect.add" = "Aggiungi effetto"
+"effect.move" = "Sposta effetto"
+"effect.remove" = "Rimuovi effetto"
+"effect.set" = "Imposta effetto"
+"export.add" = "Aggiungi impostazione di esportazione"
+"export.remove" = "Rimuovi impostazione di esportazione"
+"export.update" = "Modifica impostazione di esportazione"
+"file.close" = "Chiudi scheda"
+"file.colorProfile" = "Profilo colore"
+"file.duplicate" = "Duplica file"
+"file.export" = "Esporta"
+"file.exportFramesPdf" = "Esporta frame in PDF"
+"file.exportLayers" = "Esporta livelli"
+"file.exportSvg" = "Esporta selezione come SVG"
+"file.import" = "Importa"
+"file.moveTab" = "Sposta scheda"
+"file.new" = "Nuovo file di design"
+"file.newFromTemplate" = "Nuovo da modello"
+"file.open" = "Apri"
+"file.openRecent" = "Apri recente"
+"file.placeImage" = "Inserisci immagine"
+"file.recover" = "Recupera file"
+"file.rename" = "Rinomina file"
+"file.revert" = "Ripristina l'ultima versione salvata"
+"file.save" = "Salva"
+"file.saveAs" = "Salva come"
+"file.saveVersion" = "Salva nella cronologia versioni"
+"file.versionHistory" = "Mostra cronologia versioni"
+"fill.add" = "Aggiungi riempimento"
+"fill.move" = "Sposta riempimento"
+"fill.pattern" = "Riempimento a motivo"
+"fill.remove" = "Rimuovi riempimento"
+"fill.set" = "Imposta riempimento"
+"frame.create" = "Crea frame"
+"frame.presets" = "Elenca preset di frame"
+"frame.swapOrientation" = "Scambia orientamento"
+"grid.add" = "Aggiungi griglia di layout"
+"grid.move" = "Sposta griglia di layout"
+"grid.remove" = "Rimuovi griglia di layout"
+"guide.add" = "Aggiungi guida"
+"guide.clear" = "Rimuovi tutte le guide"
+"guide.move" = "Sposta guida"
+"guide.remove" = "Rimuovi guida"
+"guide.select" = "Seleziona guida"
+"help.gettingStarted" = "Per iniziare"
+"help.about" = "Informazioni su FigCraft"
+"help.page" = "Pagina di aiuto"
+"help.shortcuts" = "Scorciatoie da tastiera"
+"image.adjust" = "Regola immagine"
+"image.deletePreset" = "Elimina preset di immagine"
+"image.place" = "Inserisci immagine"
+"image.presets" = "Preset di immagine"
+"image.savePreset" = "Salva preset di immagine"
+"inspect.assets" = "Ispeziona asset"
+"inspect.code" = "Codice del livello"
+"inspect.componentCode" = "Codice del componente"
+"inspect.properties" = "Ispeziona proprietà"
+"inspect.readyForDev" = "Pronto per lo sviluppo"
+"instance.create" = "Crea istanza"
+"instance.exposed" = "Istanze annidate esposte"
+"instance.place" = "Inserisci istanza"
+"instance.resetSlot" = "Ripristina slot"
+"instance.setProperties" = "Imposta proprietà dell'istanza"
+"instance.slotInsert" = "Inserisci nello slot"
+"instance.swap" = "Scambia istanza"
+"instance.swapAt" = "Scambia istanza nel punto"
+"layers.collapseAll" = "Comprimi livelli"
+"layout.add" = "Aggiungi auto layout"
+"layout.remove" = "Rimuovi auto layout"
+"layout.setTrack" = "Imposta dimensione traccia della griglia"
+"layout.suggest" = "Suggerisci auto layout"
+"libraries.open" = "Librerie"
+"libraries.publish" = "Pubblica libreria…"
+"library.acceptUpdates" = "Accetta aggiornamenti della libreria"
+"library.add" = "Aggiungi libreria"
+"library.aliasVariable" = "Alias di variabile di libreria"
+"library.applyStyle" = "Applica stile di libreria"
+"library.bindVariable" = "Collega variabile di libreria"
+"library.extendCollection" = "Estendi collezione di libreria"
+"library.import" = "Importa componente di libreria"
+"library.importVariable" = "Importa variabile di libreria"
+"library.list" = "Elenca librerie"
+"library.place" = "Inserisci componente di libreria"
+"library.publish" = "Pubblica libreria"
+"library.publishToServer" = "Pubblica libreria sul server"
+"library.remove" = "Rimuovi libreria"
+"library.setVariableMode" = "Imposta modalità della variabile di libreria"
+"library.swap" = "Scambia libreria"
+"library.swapAt" = "Scambia istanza con componente di libreria"
+"library.updates" = "Aggiornamenti della libreria"
+"library.usage" = "Utilizzo della libreria"
+"measure.distances" = "Misura distanze"
+"measure.padding" = "Misura margini interni dell'auto layout"
+"node.create" = "Crea livello"
+"node.get" = "Ottieni livello"
+"node.reorder" = "Riordina livello"
+"node.reparent" = "Sposta livello dentro"
+"node.set" = "Imposta proprietà"
+"object.batchRename" = "Rinomina in blocco"
+"object.convertToFrame" = "Converti in frame"
+"object.convertToGroup" = "Converti in gruppo"
+"object.convertToSection" = "Converti in sezione"
+"object.flipH" = "Rifletti orizzontalmente"
+"object.flipV" = "Rifletti verticalmente"
+"object.frameSelection" = "Racchiudi la selezione in un frame"
+"object.group" = "Raggruppa selezione"
+"object.hideOthers" = "Nascondi altri livelli"
+"object.mask" = "Usa come maschera"
+"object.moveToPage" = "Sposta nella pagina"
+"object.opacityKeys" = "Opacità dai tasti numerici"
+"object.rasterize" = "Rasterizza selezione"
+"object.releaseMask" = "Rilascia maschera"
+"object.removeFill" = "Rimuovi riempimento"
+"object.removeFrame" = "Rimuovi frame"
+"object.removeStroke" = "Rimuovi contorno"
+"object.rename" = "Rinomina"
+"object.resizeToFit" = "Ridimensiona per adattare"
+"object.rotate180" = "Ruota di 180°"
+"object.rotateLeft" = "Ruota di 90° a sinistra"
+"object.rotateRight" = "Ruota di 90° a destra"
+"object.setThumbnail" = "Imposta come miniatura"
+"object.swapFillStroke" = "Scambia riempimento e contorno"
+"object.toggleLock" = "Blocca/Sblocca selezione"
+"object.toggleVisible" = "Mostra/Nascondi selezione"
+"object.ungroup" = "Separa selezione"
+"object.wrapInSection" = "Racchiudi in una nuova sezione"
+"page.add" = "Aggiungi pagina"
+"page.delete" = "Elimina pagina"
+"page.duplicate" = "Duplica pagina"
+"page.list" = "Elenca pagine"
+"page.move" = "Sposta pagina"
+"page.rename" = "Rinomina pagina"
+"page.select" = "Vai alla pagina"
+"page.setBackground" = "Sfondo della pagina"
+"paint.documentColors" = "Colori del documento"
+"plugin.close" = "Chiudi pannello del plugin"
+"plugin.directory.install" = "Installa plugin dalla directory"
+"plugin.directory.list" = "Sfoglia la directory dei plugin"
+"plugin.directory.publish" = "Pubblica plugin nella directory"
+"plugin.directory.unpublish" = "Rimuovi plugin dalla directory"
+"plugin.event" = "Usa controllo del pannello del plugin"
+"plugin.import" = "Importa plugin da manifest…"
+"plugin.list" = "Elenca plugin"
+"plugin.remove" = "Rimuovi plugin"
+"plugin.run" = "Esegui plugin"
+"plugin.ui" = "Pannello del plugin"
+"plugins.manage" = "Gestisci plugin…"
+"plugins.runLast" = "Esegui l'ultimo plugin"
+"pref.autoSave" = "Salva i file automaticamente"
+"pref.highlightHover" = "Evidenzia i livelli al passaggio del mouse"
+"pref.keepTool" = "Mantieni lo strumento selezionato dopo l'uso"
+"pref.language" = "Lingua dell'interfaccia"
+"pref.nudge" = "Entità dello spostamento"
+"pref.numberKeysOpacity" = "Usa i tasti numerici per l'opacità"
+"pref.publishServer" = "Server per la condivisione online"
+"pref.reduceMotion" = "Riduci animazioni"
+"pref.renameDuplicates" = "Rinomina i livelli duplicati"
+"pref.showDimensions" = "Mostra dimensioni sugli oggetti"
+"pref.startOnHome" = "Avvia dalla schermata Home"
+"pref.uiScale" = "Dimensione dell'interfaccia"
+"pref.userName" = "Il tuo nome nei commenti"
+"proto.action.add" = "Aggiungi azione del prototipo"
+"proto.action.move" = "Riordina azione del prototipo"
+"proto.action.remove" = "Rimuovi azione del prototipo"
+"proto.action.set" = "Modifica azione del prototipo"
+"proto.closePreview" = "Chiudi anteprima del prototipo"
+"proto.conditional.addBlock" = "Aggiungi \"altrimenti se\" / \"altrimenti\""
+"proto.conditional.removeBlock" = "Rimuovi \"se\" / \"altrimenti se\" / \"altrimenti\""
+"proto.conditional.setCondition" = "Modifica condizione"
+"proto.evaluate" = "Valuta espressione del prototipo"
+"proto.flow.add" = "Aggiungi punto di partenza del flusso"
+"proto.flow.remove" = "Rimuovi flusso"
+"proto.flow.rename" = "Rinomina flusso"
+"proto.interaction.add" = "Aggiungi interazione"
+"proto.interaction.clear" = "Rimuovi tutte le interazioni"
+"proto.interaction.remove" = "Rimuovi interazione"
+"proto.interaction.set" = "Modifica interazione"
+"proto.present" = "Presenta"
+"proto.presentOptions" = "Opzioni di presentazione"
+"proto.preview" = "Apri anteprima del prototipo"
+"proto.settings" = "Impostazioni del prototipo"
+"section.toggleContents" = "Nascondi/Mostra il contenuto della sezione"
+"select.add" = "Aggiungi alla selezione"
+"select.all" = "Seleziona tutto"
+"select.area" = "Seleziona area"
+"select.byName" = "Seleziona livelli per nome"
+"select.children" = "Seleziona figli"
+"select.inverse" = "Inverti selezione"
+"select.layersAt" = "Livelli in un punto"
+"select.matching" = "Seleziona livelli corrispondenti"
+"select.next" = "Seleziona fratello successivo"
+"select.none" = "Deseleziona tutto"
+"select.parent" = "Seleziona genitore"
+"select.previous" = "Seleziona fratello precedente"
+"select.remove" = "Rimuovi dalla selezione"
+"select.sameEffect" = "Seleziona stesso effetto"
+"select.sameFill" = "Seleziona stesso riempimento"
+"select.sameFont" = "Seleziona stesso font"
+"select.sameInstance" = "Seleziona stessa istanza"
+"select.sameProperties" = "Seleziona stesse proprietà"
+"select.sameStroke" = "Seleziona stesso contorno"
+"select.sameText" = "Seleziona stesse proprietà del testo"
+"select.set" = "Seleziona"
+"selection.applyColorStyle" = "Applica stile di colore della selezione"
+"selection.colors" = "Colori della selezione"
+"selection.selectColor" = "Seleziona livelli con il colore"
+"selection.setPaint" = "Cambia colore della selezione"
+"shape.arrow" = "Freccia"
+"shape.ellipse" = "Ellisse"
+"shape.line" = "Linea"
+"shape.polygon" = "Poligono"
+"shape.rectangle" = "Rettangolo"
+"shape.star" = "Stella"
+"shapeBuilder.merge" = "Unisci regioni"
+"shapeBuilder.mode" = "Modalità generatore di forme"
+"shapeBuilder.regions" = "Regioni del generatore di forme"
+"shapeBuilder.remove" = "Rimuovi regioni"
+"stroke.add" = "Aggiungi contorno"
+"stroke.brush" = "Pennello"
+"stroke.move" = "Sposta contorno"
+"stroke.remove" = "Rimuovi contorno"
+"stroke.set" = "Imposta contorno"
+"stroke.widthProfile" = "Profilo di larghezza"
+"style.apply" = "Applica stile"
+"style.bind" = "Collega variabile nello stile"
+"style.create" = "Crea stile"
+"style.delete" = "Elimina stile"
+"style.detach" = "Scollega stile"
+"style.duplicate" = "Duplica stile"
+"style.list" = "Elenca stili"
+"style.move" = "Sposta stili"
+"style.renameFolder" = "Rinomina cartella di stili"
+"style.update" = "Modifica stile"
+"text.alignCenter" = "Centra"
+"text.alignJustify" = "Giustifica"
+"text.alignLeft" = "Allinea a sinistra"
+"text.alignRight" = "Allinea a destra"
+"text.bold" = "Grassetto"
+"text.bulletList" = "Elenco puntato"
+"text.case" = "Maiuscole/minuscole"
+"text.caseLower" = "Minuscolo"
+"text.caseOriginal" = "Originale"
+"text.caseSmallCaps" = "Maiuscoletto"
+"text.caseTitle" = "Iniziali maiuscole"
+"text.caseUpper" = "Maiuscolo"
+"text.create" = "Testo"
+"text.decoration" = "Decorazione"
+"text.edit.begin" = "Modifica testo"
+"text.edit.caret" = "Imposta cursore"
+"text.edit.end" = "Termina modifica del testo"
+"text.edit.insert" = "Digita testo"
+"text.edit.key" = "Tasto del testo"
+"text.edit.preedit" = "Componi testo (IME)"
+"text.edit.selectLine" = "Seleziona riga"
+"text.edit.selectWord" = "Seleziona parola"
+"text.edit.selection" = "Selezione del testo"
+"text.endPreview" = "Termina anteprima del testo"
+"text.fonts" = "Elenca font"
+"text.italic" = "Corsivo"
+"text.lineHeightDown" = "Riduci interlinea"
+"text.lineHeightUp" = "Aumenta interlinea"
+"text.link" = "Crea link"
+"text.listIndent" = "Aumenta rientro elenco"
+"text.listOutdent" = "Riduci rientro elenco"
+"text.listStyle" = "Stile dell'elenco"
+"text.loadFont" = "Carica file di font"
+"text.maxLines" = "Righe massime"
+"text.missingFonts" = "Font mancanti"
+"text.numberList" = "Elenco numerato"
+"text.onPath" = "Testo su tracciato"
+"text.paragraphIndent" = "Rientro del paragrafo"
+"text.paragraphSpacing" = "Spaziatura dei paragrafi"
+"text.pathOptions" = "Opzioni del tracciato di testo"
+"text.preview" = "Anteprima della modifica del testo"
+"text.refit" = "Adatta il testo ai font"
+"text.removeFromPath" = "Rimuovi il testo dal tracciato"
+"text.rescanFonts" = "Riesamina i font installati"
+"text.set" = "Imposta testo"
+"text.setFeatures" = "Funzionalità OpenType"
+"text.setVariations" = "Assi del font variabile"
+"text.sizeDown" = "Riduci dimensione del font"
+"text.sizeUp" = "Aumenta dimensione del font"
+"text.strikethrough" = "Barrato"
+"text.style" = "Applica stile a un intervallo di testo"
+"text.trackingDown" = "Riduci spaziatura tra lettere"
+"text.trackingUp" = "Aumenta spaziatura tra lettere"
+"text.underline" = "Sottolineato"
+"text.weightDown" = "Riduci peso del font"
+"text.weightUp" = "Aumenta peso del font"
+"tool.arrow" = "Freccia"
+"tool.comment" = "Commento"
+"tool.ellipse" = "Ellisse"
+"tool.frame" = "Frame"
+"tool.hand" = "Mano"
+"tool.line" = "Linea"
+"tool.move" = "Sposta"
+"tool.pen" = "Penna"
+"tool.pencil" = "Matita"
+"tool.pencilBrush" = "Pennello matita"
+"tool.place" = "Inserisci con lo strumento"
+"tool.polygon" = "Poligono"
+"tool.rectangle" = "Rettangolo"
+"tool.scale" = "Scala"
+"tool.scaleAnchor" = "Ancora di scala"
+"tool.section" = "Sezione"
+"tool.set" = "Scegli strumento"
+"tool.shapeBuilder" = "Generatore di forme"
+"tool.slice" = "Slice"
+"tool.star" = "Stella"
+"tool.text" = "Testo"
+"transform.move" = "Sposta"
+"transform.moveTo" = "Sposta in"
+"transform.nudge" = "Sposta di poco"
+"transform.nudgeSize" = "Ridimensiona di poco"
+"transform.resize" = "Ridimensiona"
+"transform.rotate" = "Ruota"
+"transform.rotationOrigin" = "Sposta origine di rotazione"
+"transform.scale" = "Scala"
+"transform.setRotationOrigin" = "Imposta origine di rotazione"
+"variable.addMode" = "Aggiungi modalità"
+"variable.bind" = "Collega variabile"
+"variable.create" = "Crea variabile"
+"variable.createCollection" = "Crea collezione di variabili"
+"variable.delete" = "Elimina variabile"
+"variable.deleteCollection" = "Elimina collezione"
+"variable.duplicate" = "Duplica variabile"
+"variable.export" = "Esporta variabili"
+"variable.import" = "Importa variabili"
+"variable.list" = "Elenca variabili"
+"variable.moveMode" = "Sposta modalità"
+"variable.removeMode" = "Elimina modalità"
+"variable.renameCollection" = "Rinomina collezione"
+"variable.renameMode" = "Rinomina modalità"
+"variable.resetOverride" = "Ripristina sovrascrittura della variabile"
+"variable.set" = "Imposta valore della variabile"
+"variable.setMode" = "Imposta modalità della variabile"
+"variable.update" = "Modifica variabile"
+"vector.create" = "Vettore"
+"vector.deleteHeal" = "Elimina e ricuci selezione"
+"vector.edit.addVertex" = "Aggiungi punto"
+"vector.edit.begin" = "Modifica vettore"
+"vector.edit.bend" = "Curva segmento"
+"vector.edit.bounds" = "Limiti dei punti selezionati"
+"vector.edit.connect" = "Collega punti"
+"vector.edit.cornerRadius" = "Raggio dell'angolo del punto"
+"vector.edit.cut" = "Taglia tracciato"
+"vector.edit.delete" = "Elimina punti"
+"vector.edit.end" = "Modifica terminata"
+"vector.edit.erase" = "Cancella"
+"vector.edit.lasso" = "Selezione a lazo"
+"vector.edit.mirroring" = "Riflessione delle maniglie"
+"vector.edit.moveHandles" = "Sposta maniglie"
+"vector.edit.moveVertices" = "Sposta punti"
+"vector.edit.nudge" = "Sposta punti di poco"
+"vector.edit.paint" = "Secchiello"
+"vector.edit.pen" = "Punto penna"
+"vector.edit.penEnd" = "Termina tracciato penna"
+"vector.edit.position" = "Posizione del punto"
+"vector.edit.resize" = "Ridimensiona punti"
+"vector.edit.rotate" = "Ruota punti"
+"vector.edit.select" = "Seleziona punti"
+"vector.edit.selectAll" = "Seleziona tutti i punti"
+"vector.edit.setHandle" = "Imposta maniglia"
+"vector.edit.smooth" = "Ammorbidisci o appuntisci punti"
+"vector.edit.state" = "Stato di modifica del vettore"
+"vector.edit.strokeCap" = "Terminazione del contorno del punto"
+"vector.edit.strokeJoin" = "Giunzione del contorno del punto"
+"vector.edit.tool" = "Strumento di modifica vettoriale"
+"vector.edit.transform" = "Trasforma punti"
+"vector.edit.widthPoint" = "Punto di larghezza"
+"vector.flatten" = "Appiattisci"
+"vector.join" = "Unisci selezione"
+"vector.offset" = "Contorno parallelo"
+"vector.outlineStroke" = "Contorna tratto"
+"vector.reverse" = "Inverti direzione del tracciato"
+"vector.simplify" = "Semplifica vettore"
+"vector.smoothJoin" = "Unisci selezione in modo uniforme"
+"version.autosave" = "Versione di salvataggio automatico"
+"version.delete" = "Elimina versione"
+"version.duplicate" = "Duplica versione"
+"version.exitPreview" = "Torna alla versione attuale"
+"version.list" = "Elenca versioni"
+"version.preview" = "Visualizza versione"
+"version.rename" = "Rinomina versione"
+"version.restore" = "Ripristina versione"
+"view.assets" = "Pannello degli asset"
+"view.comments" = "Commenti"
+"view.contextMenu" = "Mostra menu contestuale"
+"view.design" = "Pannello Design"
+"view.designPrototype" = "Passa tra Design e Prototipo"
+"view.devMode" = "Modalità sviluppo"
+"view.frameOutlines" = "Contorni dei frame"
+"view.get" = "Ottieni vista"
+"view.layers" = "Pannello dei livelli"
+"view.layoutGrids" = "Griglie di layout"
+"view.leftSidebar" = "Mostra/Nascondi barra laterale sinistra"
+"view.maskOutlines" = "Contorni delle maschere"
+"view.multiplayerCursors" = "Cursori multiutente"
+"view.nextFrame" = "Zoom sul frame successivo"
+"view.nextPage" = "Pagina successiva"
+"view.nextRegion" = "Sposta il focus sull'area successiva"
+"view.outlines" = "Contorni"
+"view.outlinesHiddenLayers" = "Includi i livelli nascosti nei contorni"
+"view.outlinesObjectBounds" = "Includi i limiti degli oggetti nei contorni"
+"view.outlinesSelection" = "Contorni della selezione"
+"view.pan" = "Sposta la vista"
+"view.panelWidths" = "Ripristina larghezze dei pannelli"
+"view.pixelGrid" = "Griglia di pixel"
+"view.pixelPreview" = "Anteprima pixel"
+"view.prevFrame" = "Zoom sul frame precedente"
+"view.prevPage" = "Pagina precedente"
+"view.previousRegion" = "Sposta il focus sull'area precedente"
+"view.proofSrgb" = "Soft proof sRGB"
+"view.fullscreen" = "Schermo intero"
+"view.prototype" = "Pannello Prototipo"
+"view.rulers" = "Righelli"
+"view.set" = "Imposta vista"
+"view.slices" = "Slice"
+"view.snapGeometry" = "Aggancia alla geometria"
+"view.snapObjects" = "Aggancia agli oggetti"
+"view.snapPixel" = "Aggancia alla griglia di pixel"
+"view.themeDark" = "Tema scuro"
+"view.themeLight" = "Tema chiaro"
+"view.themeSystem" = "Segui il tema del sistema"
+"view.toggleUi" = "Mostra/Nascondi interfaccia"
+"view.zoom100" = "Zoom al 100%"
+"view.zoom200" = "Zoom al 200%"
+"view.zoom50" = "Zoom al 50%"
+"view.zoomAt" = "Strumento zoom"
+"view.zoomFit" = "Zoom per adattare"
+"view.zoomIn" = "Ingrandisci"
+"view.zoomOut" = "Riduci"
+"view.zoomSelection" = "Zoom sulla selezione"
+"widget.click" = "Clicca widget"
+"widget.insert" = "Inserisci widget"
+"widget.list" = "Elenca widget"
+"window.focus" = "Porta la finestra in primo piano"
+"window.new" = "Nuova finestra"
+"template.list" = "Elenca modelli"
+
+[menu]
+"bool.exclude" = "Escludi"
+"bool.flatten" = "Appiattisci"
+"bool.intersect" = "Interseca"
+"bool.subtract" = "Sottrai"
+"bool.union" = "Unisci"
+"file.duplicate" = "Duplica"
+"file.import" = "Importa da file…"
+"file.rename" = "Rinomina"
+"libraries.open" = "Apri librerie"
+"select.sameEffect" = "Effetto"
+"select.sameFill" = "Riempimento"
+"select.sameFont" = "Font"
+"select.sameInstance" = "Istanza"
+"select.sameProperties" = "Proprietà"
+"select.sameStroke" = "Contorno"
+"select.sameText" = "Proprietà del testo"
+"text.alignCenter" = "Centra testo"
+"text.alignJustify" = "Giustifica testo"
+"text.alignLeft" = "Allinea testo a sinistra"
+"text.alignRight" = "Allinea testo a destra"
+"view.assets" = "Asset"
+"view.design" = "Design"
+"view.layers" = "Livelli"
+"view.outlines" = "Mostra contorni"
+"view.outlinesHiddenLayers" = "Includi livelli nascosti"
+"view.outlinesObjectBounds" = "Includi limiti degli oggetti"
+"view.outlinesSelection" = "Mostra contorni della selezione"
+"view.prototype" = "Prototipo"
+"view.themeDark" = "Scuro"
+"view.themeLight" = "Chiaro"
+"view.themeSystem" = "Segui il sistema"
diff --git a/crates/ui-egui/locales/ja.toml b/crates/ui-egui/locales/ja.toml
index aff76805..6f079eff 100644
--- a/crates/ui-egui/locales/ja.toml
+++ b/crates/ui-egui/locales/ja.toml
@@ -19,6 +19,7 @@ status = "draft — needs native review"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}：PR {prs} 件、コミット {commits} 件、+{added} / −{deleted} 行（Δ {delta}）、バイナリアセット +{bin_added} / −{bin_deleted}、{first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "このファイルのコレクションとそのモード・変数：モードごとに値を上書きし、独自の変数を追加できる"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "この名前の .figcraft ファイルは既に存在します。置き換えるには、拡張子まで含む名前を選択。"
 "A layer on its own aligns to its frame: select more layers, or one in a frame" = "単独のレイヤーはフレームに整列します：レイヤーを追加で選択するか、フレーム内のレイヤーを選択"
 "A responsive product page: hero, features, figures, a quote and a footer" = "レスポンシブな製品ページ：ヒーロー、機能、数値、引用、フッター"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "スプリングは静止するまで再生。長さは質量・剛性・減衰で決まる"
@@ -38,6 +39,7 @@ status = "draft — needs native review"
 "Add a description" = "説明を追加"
 "Add a frame (F) or a shape (R) to get started" = "フレーム（F）またはシェイプ（R）を追加して開始"
 "Add a layer or component to tile first" = "先に並べるレイヤーまたはコンポーネントを追加"
+"Add a minute" = "1分追加"
 "Add a note for developers" = "開発者向けのメモを追加"
 "Add action" = "アクションを追加"
 "Add actions for when no condition holds" = "どの条件にも当てはまらないときのアクションを追加"
@@ -45,6 +47,7 @@ status = "draft — needs native review"
 "Add another condition" = "条件を追加"
 "Add auto layout" = "オートレイアウトを追加"
 "Add background behind overlay" = "オーバーレイの背後に背景を追加"
+"Add column" = "列を追加"
 "Add content to this slot" = "このスロットにコンテンツを追加"
 "Add dev resource" = "開発リソースを追加"
 "Add effect" = "エフェクトを追加"
@@ -56,6 +59,7 @@ status = "draft — needs native review"
 "Add library file…" = "ライブラリファイルを追加…"
 "Add max height" = "最大の高さを追加"
 "Add max width" = "最大の幅を追加"
+"Add measurement" = "測定を追加"
 "Add min height" = "最小の高さを追加"
 "Add min width" = "最小の幅を追加"
 "Add mode" = "モードを追加"
@@ -63,6 +67,7 @@ status = "draft — needs native review"
 "Add or update collections from a variables JSON" = "変数 JSON からコレクションを追加・更新"
 "Add properties to make instances configurable" = "プロパティを追加してインスタンスを設定可能にする"
 "Add reaction" = "リアクションを追加"
+"Add row" = "行を追加"
 "Add starting point" = "開始点を追加"
 "Add stroke" = "線を追加"
 "Add variant" = "バリアントを追加"
@@ -91,8 +96,13 @@ status = "draft — needs native review"
 "All comments" = "すべてのコメント"
 "All components" = "すべてのコンポーネント"
 "All fonts" = "すべてのフォント"
+"All objects" = "すべてのオブジェクト"
 "All supported properties" = "サポートされているすべてのプロパティ"
 "All variables" = "すべての変数"
+"Along the bottom" = "下辺に沿って"
+"Along the left" = "左辺に沿って"
+"Along the right" = "右辺に沿って"
+"Along the top" = "上辺に沿って"
 "Alpha" = "アルファ"
 "Alphabetical" = "名前順"
 "Alt+drag" = "Alt+ドラッグ"
@@ -125,6 +135,7 @@ status = "draft — needs native review"
 "Archived" = "アーカイブ済み"
 "Arrange" = "配置"
 "Arrow" = "矢印"
+"Arrow at the end" = "末端に矢印"
 "As typed" = "入力どおり"
 "Asking the server…" = "サーバーに問い合わせ中…"
 "Assets" = "アセット"
@@ -156,6 +167,7 @@ status = "draft — needs native review"
 "Basics" = "基本"
 "Before" = "変更前"
 "Bend" = "曲げ"
+"Between the selected layers" = "選択したレイヤーの間"
 "Bevel" = "ベベル"
 "Binary assets added" = "追加されたバイナリアセット"
 "Binary assets removed" = "削除されたバイナリアセット"
@@ -174,6 +186,7 @@ status = "draft — needs native review"
 "Bottom left radius" = "左下の半径"
 "Bottom right radius" = "右下の半径"
 "Bound to {name}. Click to detach the variable." = "「{name}」を適用中。クリックで変数の割り当てを解除。"
+"Brainstorm" = "ブレインストーミング"
 "Branch" = "ブランチ"
 "Branch archived" = "ブランチをアーカイブ済み"
 "Branch merged" = "ブランチをマージ済み"
@@ -198,8 +211,12 @@ status = "draft — needs native review"
 "C or ⇧C" = "C または ⇧C"
 "CMYK colour" = "CMYK カラー"
 "Can view" = "閲覧可"
+"Check" = "チェック"
 "Checking the server…" = "サーバーを確認中…"
+"Chevron" = "シェブロン"
 "Clear from this list" = "このリストから消去"
+"Clear results" = "結果をクリア"
+"Click objects to vote; click your badge to take a vote back" = "オブジェクトをクリックして投票、自分のバッジをクリックして票を取り消し"
 "Code or invite link" = "コードまたは招待リンク"
 "Color profile: {name}" = "カラープロファイル：{name}"
 "CSS custom properties…" = "CSS カスタムプロパティ…"
@@ -223,7 +240,7 @@ status = "draft — needs native review"
 "Changes on main" = "メインの変更"
 "Changes on the branch" = "ブランチの変更"
 "Changes unknown" = "変更内容は不明"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "上で React、Leptos、SwiftUI、Compose、Flutter のいずれかを選び、このコンポーネントをコードに接続。"
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "上で React、Leptos、Vue、SwiftUI、Compose、ArkUI、Flutter のいずれかを選び、このコンポーネントをコードに接続。"
 "Choose another profile to change it." = "変更するには別のプロファイルを選択。"
 "Choose collection" = "コレクションを選択"
 "Choose image" = "画像を選択"
@@ -244,7 +261,6 @@ status = "draft — needs native review"
 "Close tab" = "タブを閉じる"
 "Close version history" = "バージョン履歴を閉じる"
 "Close when clicking outside" = "外側をクリックしたら閉じる"
-"Close without saving" = "保存せずに閉じる"
 "Code" = "コード"
 "Code syntax" = "コード構文"
 "Collapse" = "折りたたむ"
@@ -272,6 +288,8 @@ status = "draft — needs native review"
 "Commits" = "コミット"
 "Company" = "会社"
 "Compare changes" = "変更を比較"
+"Compare with" = "比較対象"
+"Compatibility notes" = "互換性に関する注記"
 "Completed" = "完了"
 "Component" = "コンポーネント"
 "Component name" = "コンポーネント名"
@@ -286,11 +304,11 @@ status = "draft — needs native review"
 "Connected" = "接続済み"
 "Connected to code: {from}" = "コードに接続済み：{from}"
 "Connection lost, reconnecting (attempt {attempt})…" = "接続が切断。再接続中（{attempt} 回目）…"
+"Connector" = "コネクタ"
 "Constrain proportions" = "縦横比を固定"
 "Constraints" = "制約"
 "Content" = "コンテンツ"
 "Contents hidden" = "コンテンツ非表示"
-"Contents only" = "コンテンツのみ"
 "Contextual alternates" = "前後関係に依存する字形"
 "Contrast" = "コントラスト"
 "Contributors" = "貢献者"
@@ -314,7 +332,9 @@ status = "draft — needs native review"
 "Corner radius" = "角の半径"
 "Corner smoothing" = "角のスムージング"
 "Couldn't reach {server}: showing what this computer remembers." = "{server} に接続できない：このコンピューターが覚えている内容を表示中。"
+"Couldn't read {name}." = "{name} を読み込めませんでした。"
 "Couldn't save automatically: {error}" = "自動保存できませんでした：{error}"
+"Couldn't save the file" = "ファイルを保存できませんでした"
 "Count" = "数"
 "Create" = "作成"
 "Create a variable collection first" = "先に変数コレクションを作成"
@@ -338,6 +358,7 @@ status = "draft — needs native review"
 "Current version" = "現在のバージョン"
 "Cursor chat" = "カーソルチャット"
 "Custom" = "カスタム"
+"Custom size" = "カスタムサイズ"
 "Cut" = "カット"
 "Dark" = "ダーク"
 "Darken" = "比較（暗）"
@@ -371,6 +392,7 @@ status = "draft — needs native review"
 "Description" = "説明"
 "Description (optional)" = "説明（任意）"
 "Design" = "デザイン"
+"Design panel" = "デザインパネル"
 "Design system starter" = "デザインシステムの雛形"
 "Desktop" = "デスクトップ"
 "Destination" = "遷移先"
@@ -382,6 +404,7 @@ status = "draft — needs native review"
 "Detach variable" = "変数を切り離す"
 "Details" = "詳細"
 "Dev Mode" = "開発モード"
+"Dev Mode only inspects: switch to Design (Shift+D) to edit" = "開発モードは検査専用です。編集するにはデザイン (Shift+D) に切り替えてください"
 "Dev resources" = "開発リソース"
 "Development" = "開発"
 "Device" = "デバイス"
@@ -398,6 +421,7 @@ status = "draft — needs native review"
 "Distribute horizontal spacing" = "水平方向に等間隔に分布"
 "Distribute vertical spacing" = "垂直方向に等間隔に分布"
 "Divider" = "区切り線"
+"Don't Save" = "保存しない"
 "Don't truncate" = "切り詰めない"
 "Done" = "完了"
 "Done editing" = "編集を完了"
@@ -430,6 +454,8 @@ status = "draft — needs native review"
 "Effect settings" = "エフェクトの設定"
 "Effect styles" = "エフェクトスタイル"
 "Effects" = "エフェクト"
+"Curved" = "曲線"
+"Elbow" = "直角"
 "Ellipse" = "楕円"
 "Ellipses" = "楕円"
 "Else" = "それ以外"
@@ -438,6 +464,7 @@ status = "draft — needs native review"
 "Empty" = "空"
 "End" = "終了"
 "End point" = "終点"
+"End vote" = "投票を終了"
 "Ends the session; everyone keeps their copy" = "セッションを終了。各自のコピーは残る"
 "Enter" = "Enter"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "figcraft-server のアドレスを入力し、「参照」を押すと、提供されているプラグインが表示される。"
@@ -480,6 +507,7 @@ status = "draft — needs native review"
 "Feb" = "2月"
 "Fetching from the server…" = "サーバーから取得中…"
 "FigCraft couldn't open its window: {error}" = "FigCraft のウィンドウを開けなかった：{error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft はこれらのファイルの機能をまだすべてサポートしていない。注記には、インポートしたコピーで省略または変更された内容を示す。元のファイルは変更されない。"
 "File" = "ファイル"
 "File name" = "ファイル名"
 "File not found" = "ファイルが見つからない"
@@ -513,6 +541,7 @@ status = "draft — needs native review"
 "Flip text to the other side" = "テキストを反対側に反転"
 "Flip vertical" = "上下反転"
 "Flip width profile" = "幅プロファイルを反転"
+"Flow chart" = "フローチャート"
 "Flow starting point" = "フローの開始点"
 "Flow starting points" = "フローの開始点"
 "Flows" = "フロー"
@@ -565,6 +594,7 @@ status = "draft — needs native review"
 "Hanging list" = "ぶら下げリスト"
 "Hanging punctuation" = "ぶら下げ句読点"
 "Hard light" = "ハードライト"
+"Heart" = "ハート"
 "Height" = "高さ"
 "Help" = "ヘルプ"
 "Help and resources" = "ヘルプとリソース"
@@ -577,6 +607,7 @@ status = "draft — needs native review"
 "Hide these tips (Getting started in the Help menu shows them again)" = "ヒントを非表示（ヘルプメニューの「使い始めるには」で再表示）"
 "Hide when publishing" = "公開時に非表示"
 "Highlight layers on hover" = "ホバー時にレイヤーをハイライト"
+"Highlighter" = "蛍光ペン"
 "Highlights" = "ハイライト"
 "Hold Alt" = "Alt を押したまま"
 "Hold Alt+Z" = "Alt+Z を押したまま"
@@ -603,12 +634,16 @@ status = "draft — needs native review"
 "If" = "条件"
 "If {condition}" = "条件：{condition}"
 "Ignore auto layout (absolute position)" = "オートレイアウトを無視（絶対位置）"
+"Ignore overlapping layers" = "重なっているレイヤーを無視"
 "Image" = "画像"
+"Images" = "画像"
 "Import" = "インポート"
 "Import path" = "インポートパス"
 "Import plugin from manifest" = "マニフェストからプラグインをインポート"
 "Import plugin from manifest…" = "マニフェストからプラグインをインポート…"
+"Import report" = "インポートレポート"
 "Import variables" = "変数をインポート"
+"Imported document" = "インポートしたドキュメント"
 "Imported {name}" = "{name} をインポート済み"
 "Imported {n} new variables, updated {updated}" = { other = "新しい変数を {n} 個インポートし、{updated} 個を更新" }
 "Import…" = "インポート…"
@@ -636,11 +671,13 @@ status = "draft — needs native review"
 "Instance swap (no other component)" = "インスタンスの入れ替え（他のコンポーネントなし）"
 "Instances" = "インスタンス"
 "Instant" = "即時"
+"Intensity" = "強さ"
 "Interaction" = "インタラクション"
 "Interactions" = "インタラクション"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "インターフェースデザインとプロトタイピング。Rust でゼロから書かれた、無料でオープンソースのクリーンルーム設計のデザインツール。ArtCraft Crafting Apps の一つ。"
 "Intersect" = "交差"
 "Intersects" = "交差"
+"Invalid color" = "無効なカラー"
 "Invite link" = "招待リンク"
 "Invite link copied" = "招待リンクをコピー済み"
 "It asks permission to:" = "次の権限を求めている："
@@ -659,6 +696,8 @@ status = "draft — needs native review"
 "Jun" = "6月"
 "Just now" = "たった今"
 "Justify" = "両端揃え"
+"Kanban board" = "カンバンボード"
+"Keep a measurement on the canvas for developers" = "開発者向けに測定をキャンバスに残す"
 "Keep appearance" = "見た目を保持"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "「見た目を保持」はすべてのカラー値を {profile} に変換し、色の見た目を保つ。「値を保持」は数値をそのまま残すため、色が変わる。"
 "Keep tool selected after use" = "使用後もツールを選択したままにする"
@@ -738,6 +777,7 @@ status = "draft — needs native review"
 "Mark as resolved" = "解決済みにする"
 "Mark as unread" = "未読にする"
 "Mark as unresolved" = "未解決にする"
+"Marker" = "マーカー"
 "Mask" = "マスク"
 "Mass · Stiffness · Damping" = "質量 · 剛性 · 減衰"
 "Match (empty: the whole name)" = "一致（空欄：名前全体）"
@@ -747,6 +787,7 @@ status = "draft — needs native review"
 "Maximize" = "最大化"
 "May" = "5月"
 "Measure to the selection" = "選択範囲までの距離を測定"
+"Measurements" = "測定"
 "Merge into main" = "メインにマージ"
 "Merge regions" = "領域を結合"
 "Merge the branch into the main file (one undo step) and archive it" = "ブランチをメインファイルにマージし（1 回の取り消し単位）、アーカイブする"
@@ -755,6 +796,7 @@ status = "draft — needs native review"
 "Min H" = "最小 H"
 "Min W" = "最小 W"
 "Minimize" = "最小化"
+"Minutes" = "分"
 "Mirror angle" = "角度を対称にする"
 "Mirror angle and length" = "角度と長さを対称にする"
 "Mirroring" = "対称"
@@ -796,8 +838,10 @@ status = "draft — needs native review"
 "Named instance" = "名前付きインスタンス"
 "Navigate to" = "移動先"
 "Nested instance" = "ネストされたインスタンス"
+"New board" = "新規ボード"
 "New design file" = "新規デザインファイル"
 "Newest first" = "新しい順"
+"Next frame" = "次のフレーム"
 "Next or previous control in the focused region" = "フォーカス中の領域で次または前のコントロール"
 "Next ready for dev" = "次の開発準備完了"
 "Next size option" = "次のサイズオプション"
@@ -807,12 +851,15 @@ status = "draft — needs native review"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "ブランチはない。ブランチはファイルのコピーで、変更を試してからレビューしてマージできる。"
 "No category" = "カテゴリなし"
 "No changes" = "変更なし"
+"No color styles" = "カラースタイルがありません"
 "No colour variables fit here." = "ここに使えるカラー変数はない。"
 "No colour variables yet. Create them in Local variables." = "カラー変数はまだない。ローカル変数で作成。"
 "No comments yet" = "コメントはまだない"
+"No compatibility warnings reported" = "互換性の警告はない"
 "No components yet. Select layers and press {keys}." = "コンポーネントはまだない。レイヤーを選択して {keys} を押す。"
 "No conflicts." = "競合なし。"
 "No contributor data was built into this copy." = "このコピーには貢献者データが含まれていない。"
+"No device" = "デバイスなし"
 "No fonts match" = "一致するフォントなし"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "参加コードなし（サーバーが参加コードより古いか、このアドレスはコードにできない）：代わりにリンクを共有すること。"
 "No layer changes to show." = "表示するレイヤーの変更なし。"
@@ -844,6 +891,7 @@ status = "draft — needs native review"
 "No text styles yet. Click + to create one from the selected text." = "テキストスタイルはまだない。+ をクリックして選択したテキストから作成。"
 "No variables fit here." = "ここに使える変数はない。"
 "No variables yet. Create them in Local variables." = "変数はまだない。ローカル変数で作成。"
+"No votes yet" = "まだ投票はありません"
 "Nobody else is here yet" = "まだ他に誰もいない"
 "Noise" = "ノイズ"
 "None" = "なし"
@@ -856,6 +904,7 @@ status = "draft — needs native review"
 "Not read yet" = "未読"
 "Not shared" = "共有していない"
 "Note {n}" = "メモ {n}"
+"Nothing changed since this version." = "このバージョンから変更なし。"
 "Nothing changed since this was marked ready for dev." = "開発準備完了にしてから変更なし。"
 "Nothing here yet. Set a frame's status to list it." = "まだ何もない。フレームのステータスを設定すると一覧に表示される。"
 "Nothing online yet. Use Share on a file to put it online and it is listed here." = "オンラインのファイルはまだない。ファイルの「共有」からオンラインにすると、ここに表示される。"
@@ -893,6 +942,7 @@ status = "draft — needs native review"
 "Open branch" = "ブランチを開く"
 "Open file" = "ファイルを開く"
 "Open files" = "開いているファイル"
+"Open presentations" = "開いているプレゼンテーション"
 "Open in focus view" = "フォーカスビューで開く"
 "Open in new window" = "新しいウィンドウで開く"
 "Open invite links in FigCraft" = "招待リンクを FigCraft で開く"
@@ -901,6 +951,7 @@ status = "draft — needs native review"
 "Open overlay" = "オーバーレイを開く"
 "Open prototype preview" = "プロトタイプのプレビューを開く"
 "Open variables ({count})" = "変数を開く（{count}）"
+"Opened as a new document" = "新しいドキュメントとして開いた"
 "Opened “{name}” in a new tab" = "「{name}」を新しいタブで開いた"
 "Open|comments" = "未解決"
 "Options" = "オプション"
@@ -924,7 +975,12 @@ status = "draft — needs native review"
 "PDF print settings" = "PDF 印刷設定"
 "Padding" = "パディング"
 "Page" = "ページ"
+"Page deleted" = "ページは削除済み"
 "Pages" = "ページ"
+"Pages added to the document" = "ページをドキュメントに追加した"
+"Pause" = "一時停止"
+"Pink" = "ピンク"
+"Placed on the current page" = "現在のページに配置した"
 "Pages: {pages}" = "ページ：{pages}"
 "Paint bucket" = "塗りつぶし"
 "Pan the canvas" = "キャンバスをパン"
@@ -939,6 +995,7 @@ status = "draft — needs native review"
 "Paste a team library link (a view link)" = "チームライブラリのリンク（閲覧リンク）を貼り付け"
 "Paste here" = "ここに貼り付け"
 "Paste to replace" = "貼り付けて置換"
+"Pasted design layers; {n} kinds of content were left out" = { other = "デザインレイヤーを貼り付け済み。{n} 種類のコンテンツは含まれていない" }
 "Pattern" = "パターン"
 "Pattern alignment" = "パターンの配置"
 "Pattern scale" = "パターンの拡大縮小"
@@ -966,6 +1023,7 @@ status = "draft — needs native review"
 "Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "プラグインは FigCraft のサンドボックス内で、ファイル、ネットワーク、時計なしで実行される。信頼できるプラグインのみをインストールすること。"
 "Plus darker" = "プラス（暗）"
 "Plus lighter" = "プラス（明）"
+"Plus one" = "プラスワン"
 "Point" = "ポイント"
 "Points" = "ポイント"
 "Polygon" = "多角形"
@@ -992,6 +1050,7 @@ status = "draft — needs native review"
 "Preview" = "プレビュー"
 "Preview this flow" = "このフローをプレビュー"
 "Preview this frame" = "このフレームをプレビュー"
+"Previous frame" = "前のフレーム"
 "Previous ready for dev" = "前の開発準備完了"
 "Progressive" = "プログレッシブ"
 "Properties" = "プロパティ"
@@ -1012,6 +1071,7 @@ status = "draft — needs native review"
 "Push" = "プッシュ"
 "Push changes to main component" = "変更をメインコンポーネントにプッシュ"
 "Put text on path" = "テキストをパスに沿わせる"
+"Question" = "質問"
 "R" = "R"
 "Radial" = "放射状"
 "Radius" = "半径"
@@ -1029,10 +1089,12 @@ status = "draft — needs native review"
 "Reduce motion" = "動きを減らす"
 "Refraction" = "屈折"
 "Regular expression" = "正規表現"
+"Relative to" = "基準"
 "Remove" = "削除"
 "Remove all" = "すべて削除"
 "Remove annotation" = "注釈を削除"
 "Remove auto layout" = "オートレイアウトを解除"
+"Remove column" = "列を削除"
 "Remove dev resource" = "開発リソースを削除"
 "Remove export setting" = "書き出し設定を削除"
 "Remove from recents" = "最近使ったファイルから削除"
@@ -1041,10 +1103,12 @@ status = "draft — needs native review"
 "Remove guide" = "ガイドを削除"
 "Remove interaction" = "インタラクションを削除"
 "Remove library from this file" = "このファイルからライブラリを削除"
+"Remove measurement" = "測定を削除"
 "Remove min and max" = "最小と最大を削除"
 "Remove min and max height" = "最小と最大の高さを削除"
 "Remove min and max width" = "最小と最大の幅を削除"
 "Remove regions" = "領域を削除"
+"Remove row" = "行を削除"
 "Remove slot" = "スロットを削除"
 "Remove starting point" = "開始点を削除"
 "Remove stop" = "カラー分岐点を削除"
@@ -1057,6 +1121,7 @@ status = "draft — needs native review"
 "Removed" = "削除"
 "Removed from the server" = "サーバーから削除済み"
 "Removed since it was marked" = "マーク後に削除"
+"Removed since this version" = "このバージョン以降に削除"
 "Rename" = "名前を変更"
 "Rename duplicated layers" = "複製したレイヤーの名前を変更"
 "Rename folder" = "フォルダー名を変更"
@@ -1086,6 +1151,7 @@ status = "draft — needs native review"
 "Resize by the nudge amount" = "微調整の量でサイズ変更"
 "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "フレームをデバイスの画面（デバイスなしの場合はウィンドウ）に合わせてサイズ変更：制約とオートレイアウトが反応"
 "Resize to fit" = "サイズを合わせる"
+"Resizing" = "サイズ変更"
 "Resolve" = "解決"
 "Resolve change" = "変更を解決"
 "Resolved" = "解決済み"
@@ -1096,6 +1162,9 @@ status = "draft — needs native review"
 "Restore main component" = "メインコンポーネントを復元"
 "Restore this version" = "このバージョンを復元"
 "Restored “{name}”" = "「{name}」を復元済み"
+"Retrospective" = "振り返り"
+"Results" = "結果"
+"Resume" = "再開"
 "Reverse the order" = "順序を反転"
 "Reversed triangle" = "逆三角形"
 "Review and merge" = "レビューしてマージ"
@@ -1111,6 +1180,7 @@ status = "draft — needs native review"
 "Rotation jitter" = "回転のばらつき"
 "Round" = "丸型"
 "Rounded" = "丸型"
+"Rounded rectangle" = "角丸長方形"
 "Row" = "行"
 "Row gap" = "行の間隔"
 "Row sizes" = "行のサイズ"
@@ -1126,6 +1196,7 @@ status = "draft — needs native review"
 "Save" = "保存"
 "Save as" = "名前を付けて保存"
 "Save as preset…" = "プリセットとして保存…"
+"Save file" = "ファイルを保存"
 "Save files automatically" = "ファイルを自動保存"
 "Save version  {key}" = "バージョンを保存  {key}"
 "Saved" = "保存済み"
@@ -1160,12 +1231,14 @@ status = "draft — needs native review"
 "Select layer" = "レイヤーを選択"
 "Select layers and they space themselves as their content changes" = "レイヤーを選択すると、内容の変化に合わせて間隔を自動調整"
 "Select layers to apply the style to" = "スタイルを適用するレイヤーを選択"
+"Select layers with this color" = "このカラーのレイヤーを選択"
 "Select overlapping shapes" = "重なったシェイプを選択"
 "Select points to edit their position, radius and mirroring" = "ポイントを選択すると位置、半径、対称を編集できる"
 "Select slot" = "スロットを選択"
 "Selection" = "選択範囲"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "選択ボックス、{w} × {h}、位置 {x}, {y}：矢印キーで移動、Shift+矢印キーまたは {cmd}+矢印キーでサイズ変更、Enter で選択、Escape でキャンセル"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "選択ボックス：矢印キーで移動、Shift+矢印キーまたは {cmd}+矢印キーでサイズ変更、Enter で選択、Escape でキャンセル"
+"Selection colors" = "選択範囲のカラー"
 "Send backward" = "背面へ"
 "Send report" = "報告を送信"
 "Send to back" = "最背面へ"
@@ -1182,6 +1255,7 @@ status = "draft — needs native review"
 "Shape" = "シェイプ"
 "Shape builder" = "シェイプビルダー"
 "Shape tools" = "シェイプツール"
+"Shapes" = "シェイプ"
 "Share" = "共有"
 "Share this file" = "このファイルを共有"
 "Share with a code" = "コードで共有"
@@ -1248,10 +1322,13 @@ status = "draft — needs native review"
 "Space+drag" = "Space+ドラッグ"
 "Spacing" = "間隔"
 "Spam, stolen work, abuse…" = "スパム、盗用、迷惑行為…"
+"Speech bubble" = "吹き出し"
 "Splay" = "広がり"
 "Spotlight me" = "自分をスポットライト"
 "Spread" = "スプレッド"
 "Square" = "正方形"
+"Stamp" = "スタンプ"
+"Stamps" = "スタンプ"
 "Standard" = "標準"
 "Standard ligatures" = "標準合字"
 "Star" = "星"
@@ -1261,18 +1338,26 @@ status = "draft — needs native review"
 "Start from a blank canvas" = "空白のキャンバスから始める"
 "Start from a template" = "テンプレートから始める"
 "Start on path" = "パス上の開始位置"
+"Start on the Home screen" = "起動時にホームを表示"
 "Start point" = "始点"
 "Start sharing" = "共有を開始"
 "Start sharing with the Share button, then pass on the code it gives" = "共有ボタンで共有を開始し、表示されたコードを相手に伝える"
+"Start vote" = "投票を開始"
 "Starting to share…" = "共有を開始中…"
 "Status" = "ステータス"
 "Sticky" = "固定"
+"Sticky note" = "付箋"
+"Sticky note colors" = "付箋の色"
+"Sticky notes" = "付箋"
+"Sticky notes, shapes and connectors" = "付箋、シェイプ、コネクタ"
 "Stop" = "停止"
 "Stop following {name}" = "{name} のフォローを停止"
 "Stop session" = "セッションを停止"
 "Stop sharing" = "共有を停止"
 "Stop spotlighting" = "スポットライトを停止"
+"Stop timer" = "タイマーを停止"
 "Stop {n}  {hex}" = "分岐点 {n}  {hex}"
+"Straight" = "直線"
 "Stretch" = "伸縮"
 "Strikethrough" = "取り消し線"
 "String" = "文字列"
@@ -1317,6 +1402,7 @@ status = "draft — needs native review"
 "Text" = "テキスト"
 "Text align" = "テキストの配置"
 "Text content" = "テキストの内容"
+"Text size" = "テキストサイズ"
 "Text style" = "テキストスタイル"
 "Text styles" = "テキストスタイル"
 "Texts" = "テキスト"
@@ -1347,13 +1433,18 @@ status = "draft — needs native review"
 "This server is open to the public: no key needed." = "このサーバーは一般公開されている：キーは不要。"
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "このサーバーにはキーが必要：アドレスに ?key=… を追加（サーバーのマシンで `figcraft-server key` を実行すると表示）。"
 "This server takes files only with its key: see Advanced." = "このサーバーはキーがないとファイルを受け付けない：「詳細設定」を参照。"
+"Thumbs up" = "いいね"
+"This version can't be read." = "このバージョンを読み込めません。"
+"This version doesn't have it: all of it is new." = "このバージョンにはありません。すべて新規です。"
 "Tidy up" = "整列"
 "Tile" = "タイル"
 "Tile type" = "タイルの種類"
+"Timer" = "タイマー"
 "Tint" = "ティント"
 "Title" = "タイトル"
 "Title case" = "タイトルケース"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "このライブラリをチームと共有するには、ファイルをサーバーに公開し（共有 ▸ サーバーに公開…）、そこでライブラリを公開する。"
+"To the layer around it" = "親レイヤーまで"
 "Toggle" = "切り替え"
 "Toggle light/dark theme" = "ライト/ダークテーマを切り替え"
 "Toggle visibility" = "表示を切り替え"
@@ -1363,8 +1454,10 @@ status = "draft — needs native review"
 "Top left radius" = "左上の半径"
 "Top right radius" = "右上の半径"
 "Transform" = "変形"
+"Triangle" = "三角形"
 "Triangle arrow" = "三角矢印"
 "Trigger" = "トリガー"
+"Trigger layer" = "トリガーレイヤー"
 "True" = "true"
 "Truncate text" = "テキストを切り詰める"
 "Truncate with an ellipsis" = "省略記号で切り詰める"
@@ -1387,7 +1480,7 @@ status = "draft — needs native review"
 "Unread" = "未読"
 "Unresolve" = "未解決に戻す"
 "Unsaved changes" = "未保存の変更"
-"Unsaved changes in {names}. Close the window and lose them?" = "{names} に未保存の変更がある。ウィンドウを閉じて変更を破棄する？"
+"Unsaved changes in {names}. Save them before closing?" = "{names} に未保存の変更がある。閉じる前に保存する？"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "未保存の変更：先に保存する（{save}）か、{alt}-クリックでタブを閉じて破棄"
 "Unsaved changes: save first, or close again with {key} to discard" = "未保存の変更：先に保存するか、もう一度 {key} で閉じて破棄"
 "Up" = "上"
@@ -1406,6 +1499,7 @@ status = "draft — needs native review"
 "Use as mask" = "マスクとして使用"
 "Use auto layout" = "オートレイアウトを使用"
 "Use number keys for opacity" = "数字キーで不透明度を変更"
+"Use the .figcraft or .fig extension." = "拡張子は .figcraft または .fig を使用。"
 "Use the layer's fill" = "レイヤーの塗りを使用"
 "Used in {files} · {instances}" = "{files}で使用 · {instances}"
 "Username" = "ユーザー名"
@@ -1441,6 +1535,8 @@ status = "draft — needs native review"
 "Visibility" = "表示"
 "Visible" = "表示"
 "Vivid" = "ビビッド"
+"Votes per person" = "1人あたりの票数"
+"Voting session" = "投票セッション"
 "WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND が設定されていて、使うグラフィックス API を指定している。解除すると FigCraft が選ぶ。"
 "Warm" = "ウォーム"
 "Watch" = "ウォッチ"
@@ -1450,16 +1546,20 @@ status = "draft — needs native review"
 "WebSocket URL copied" = "WebSocket URL をコピー済み"
 "Websites" = "Webサイト"
 "Wedge" = "くさび"
+"Weekly planner" = "週間プランナー"
 "Weight" = "太さ"
+"What changed since a saved version" = "保存したバージョンからの変更"
 "What changed since it was marked ready for dev" = "開発準備完了にしてからの変更内容"
 "What is wrong with this file? The server's operator gets your report." = "このファイルの何が問題ですか？ 報告はサーバーの運営者に届く。"
 "What it's for" = "用途"
 "What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "変更前の状態は不明：FigCraft が開発準備完了フレームのコピーを保存するようになる前に変更された。変更を解決する（または再度準備完了にする）と、今後はそこから比較する。"
 "What you try here changes this preview and the code below, not the file" = "ここでの操作はプレビューと下のコードに反映。ファイルは変更されない"
+"When marked ready" = "準備完了にした時点"
 "While hovering" = "ホバー中"
 "While pressing" = "押している間"
 "White" = "白"
 "Who runs it, its terms and how long it keeps files" = "運営者、利用規約、ファイルの保管期間"
+"Whole screen" = "画面全体"
 "Why it changed" = "変更理由"
 "Widgets" = "ウィジェット"
 "Width" = "幅"
@@ -1499,26 +1599,121 @@ status = "draft — needs native review"
 "call any command its access allows" = "アクセス権で許可された任意のコマンドの呼び出し"
 "call only: {commands}" = "次のコマンドのみの呼び出し：{commands}"
 "can edit the document" = "ドキュメントを編集できる"
+"can save files" = "ファイルを保存できる"
+"conditional prototype actions nested too deeply were skipped" = "入れ子が深すぎる条件付きプロトタイプアクションをスキップ"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "評価できない条件を持つ条件付きプロトタイプアクションをスキップ"
+"connector label background was skipped: style data is missing" = "コネクタラベルの背景をスキップ：スタイルデータがない"
+"connector label was skipped: background bounds are invalid" = "コネクタラベルをスキップ：背景の境界が無効"
+"connector label was skipped: background transform is invalid" = "コネクタラベルをスキップ：背景の変形が無効"
+"connector label was skipped: composed text transform is invalid" = "コネクタラベルをスキップ：合成したテキストの変形が無効"
+"connector label was skipped: derived background bounds are missing" = "コネクタラベルをスキップ：算出した背景の境界がない"
+"connector label was skipped: derived text bounds are missing" = "コネクタラベルをスキップ：算出したテキストの境界がない"
+"connector label was skipped: text bounds are invalid" = "コネクタラベルをスキップ：テキストの境界が無効"
+"connector label was skipped: text style data is missing" = "コネクタラベルをスキップ：テキストスタイルのデータがない"
+"connector label was skipped: text transform is invalid" = "コネクタラベルをスキップ：テキストの変形が無効"
+"connector labels were skipped" = "コネクタのラベルをスキップ"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "コネクタレイヤーは静的なフレーム／ベクターのスナップショットとして（ラベルがあればラベルも）インポート。端点の動的なバインドは保持しない"
+"connector snapshot vector data is missing; connector was left empty" = "コネクタのスナップショットのベクターデータがないため、コネクタは空のまま"
+"connectors whose ends can't be placed are empty" = "端点を配置できないコネクタは空"
 "crop marks" = "トンボ"
+"damaged vector geometry was skipped" = "破損したベクタージオメトリをスキップ"
+"damaged vector networks import as outlines" = "破損したベクターネットワークはアウトラインとしてインポート"
 "development: {path}" = "開発：{path}"
+"document children other than pages were skipped" = "ページ以外のドキュメントの子をスキップ"
+"duplicate grid track sizing entries use equal tracks" = "重複したグリッドトラックのサイズ指定は均等なトラックを使用"
 "e.g. count + 1" = "例：count + 1"
 "e.g. count >= 3 and not done" = "例：count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "保存されたパスのない折れ線・曲線コネクタは直線としてインポート"
+"entries without a node type were skipped" = "ノードタイプのない項目をスキップ"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "ブラウザー、チャット、メールからの figcraft:// リンクでこのアプリが開き、セッションに参加する。"
+"filled areas of a vector with their own fill use the layer's fill" = "独自の塗りを持つベクターの塗りつぶし領域にはレイヤーの塗りを使用"
 "from {server}" = "{server} から"
+"gamepad triggers without exactly one known controller button were skipped" = "既知のコントローラーボタンがちょうど 1 つではないゲームパッドトリガーをスキップ"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "グリッドトラックのリストが 1000 項目を超えるため、トラックはデフォルトの均等サイズを使用"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "グリッドトラックのサイズ指定が未対応または不正なため、該当するトラックは均等サイズを使用"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "グリッドトラックのサイズ指定リストが 1000 項目を超えるため、トラックはデフォルトの均等サイズを使用"
 "hidden" = "非表示"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "両方のフィルターコンテナがあり画像フィルターが曖昧なため、フィルターの変換をスキップ"
+"image filters use FigCraft's approximate renderer" = "画像フィルターは FigCraft の近似レンダリングで描画"
+"instance swap properties whose default component isn't in the file were skipped" = "デフォルトのコンポーネントがファイルにないインスタンスの入れ替えプロパティをスキップ"
+"instances inside their own main component were imported as frames" = "自身のメインコンポーネント内にあるインスタンスはフレームとしてインポート"
+"instances of components that aren't in the file show no layers" = "ファイルにないコンポーネントのインスタンスにはレイヤーが表示されない"
+"instances of components that aren't in the file were imported as frames" = "ファイルにないコンポーネントのインスタンスはフレームとしてインポート"
+"instances that would nest a component inside itself were imported as frames" = "コンポーネントを自身の中に入れ子にしてしまうインスタンスはフレームとしてインポート"
+"instances without a main component were imported as empty frames" = "メインコンポーネントのないインスタンスは空のフレームとしてインポート"
+"invalid internal .fig text path data was ignored" = "無効な .fig 内部のパス上テキストのデータを無視した"
+"invalid or oversized vector networks import as outlines" = "無効または大きすぎるベクターネットワークはアウトラインとしてインポート"
+"invalid or oversized vector path data was skipped" = "無効または大きすぎるベクターパスデータをスキップ"
 "just now" = "たった今"
+"key triggers without a supported key were skipped" = "サポートされているキーのないキートリガーをスキップ"
+"key up triggers import as key presses" = "キーを離すトリガーはキー押下としてインポート"
+"layers without a position were placed at their parent's origin" = "位置のないレイヤーは親の原点に配置"
+"layers without a type were skipped" = "タイプのないレイヤーをスキップ"
+"legacy image filter container is unsupported; filter conversion was skipped" = "旧形式の画像フィルターコンテナは未対応のため、フィルターの変換をスキップ"
 "locked" = "ロック中"
+"malformed image filters container was skipped" = "不正な画像フィルターコンテナをスキップ"
+"malformed image paintFilter container was skipped" = "不正な画像の paintFilter コンテナをスキップ"
+"malformed slot content assignment was skipped" = "不正なスロットコンテンツの割り当てをスキップ"
 "no bleed" = "裁ち落としなし"
 "nobody else here yet" = "まだ他に誰もいない"
+"non-default slot settings are not represented and were skipped" = "デフォルト以外のスロット設定は再現できないためスキップ"
 "now" = "たった今"
+"offer files to save if it asks to (you choose where each one goes)" = "要求した場合のファイル保存の提案（保存先はその都度選択）"
 "or" = "または"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "ポイントごとの角の形状は保持した。破線や可変幅の線はレイヤーの角の形状で描画"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "スロットの優先コンポーネントキーをファイル内のレイヤーに解決できないためスキップ"
+"prototype actions of unknown types were skipped" = "不明なタイプのプロトタイプアクションをスキップ"
+"prototype actions without a destination in the file were skipped" = "ファイル内に移動先のないプロトタイプアクションをスキップ"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "変数 JSON にない変数を使うプロトタイプの式をスキップ"
+"prototype expressions with unsupported functions were skipped" = "サポートされていない関数を使うプロトタイプの式をスキップ"
+"prototype interactions without supported actions were skipped" = "サポートされているアクションのないプロトタイプインタラクションをスキップ"
+"prototype navigations of unknown types were skipped" = "不明なタイプのプロトタイプナビゲーションをスキップ"
+"prototype transitions of unknown types play instantly" = "不明なタイプのプロトタイプトランジションは即時に再生"
+"prototype triggers of unknown types were skipped" = "不明なタイプのプロトタイプトリガーをスキップ"
 "put a widget on the canvas" = "キャンバスへのウィジェットの配置"
 "read and edit the document" = "ドキュメントの読み取りと編集"
 "read the document" = "ドキュメントの読み取り"
 "reads the document" = "ドキュメントを読み取る"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "変数 JSON にない変数に対する変数設定アクションをスキップ"
+"set-variable actions with values that can't be evaluated were skipped" = "評価できない値を持つ変数設定アクションをスキップ"
+"set-variable actions with values that don't fit the variable were skipped" = "変数に合わない値を持つ変数設定アクションをスキップ"
+"set-variable actions without a value were skipped" = "値のない変数設定アクションをスキップ"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "変数 JSON にないコレクションまたはモードに対する変数モード設定アクションをスキップ"
+"slot content assignment target is missing or is not slot content" = "スロットコンテンツの割り当て先がないか、スロットコンテンツではない"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "スロットコンテンツの割り当てが空の GUID を番兵値として使用しているためスキップ"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "一部のベクターポイントがファイルにないポイント設定を参照している。それらのポイントはレイヤーの角の形状と丸めのない角を使用"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "一部のベクターセグメントがファイルにないスタイル設定を参照している。それらのセグメントはレイヤーの線を使用"
+"stale or invalid grid track sizing entries were ignored" = "古いまたは無効なグリッドトラックのサイズ指定を無視した"
+"stars and polygons without point counts or geometry use the default point count" = "ポイント数もジオメトリもない星と多角形はデフォルトのポイント数を使用"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "一部のベクターセグメントのスタイル設定は未対応。それらのセグメントはレイヤーの線を使用"
+"text path underline or strikethrough decoration is not rendered" = "パス上テキストの下線や取り消し線は描画しない"
+"text style overrides refer to missing table entries" = "テキストスタイルのオーバーライドが存在しないテーブル項目を参照している"
+"the file has no pages" = "ファイルにページがない"
 "the plugin" = "このプラグイン"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "変数 JSON に `variableCollections` がない（ローカル変数のレスポンスを想定）ため無視した"
 "this session only" = "このセッションのみ"
+"unknown component property types were skipped" = "不明なタイプのコンポーネントプロパティをスキップ"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "変数 JSON にない（または型が異なる）変数へのエイリアスをスキップ"
+"variable bindings to properties the layer doesn't have were skipped" = "レイヤーにないプロパティへの変数バインディングをスキップ"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "変数 JSON にない変数（ライブラリ変数）へのバインディングをスキップ"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "変数バインディングをスキップ：ファイル JSON に変数の定義がない（ローカル変数 JSON を `variables` として渡すか、その `meta` をファイル JSON の隣に埋め込む）"
+"variable bindings whose variable type doesn't fit the property were skipped" = "変数の型がプロパティに合わない変数バインディングをスキップ"
+"variable collections without modes were skipped" = "モードのない変数コレクションをスキップ"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "変数とそのモードの 1 つになっていない、プロトタイプの式内の変数モード参照をスキップ"
+"variable modes of collections that aren't in the file were skipped" = "ファイルにないコレクションの変数モードをスキップ"
+"variable modes of collections that aren't in the variables JSON were skipped" = "変数 JSON にないコレクションの変数モードをスキップ"
+"variable values that don't match their type (or composed colours) were skipped" = "型に合わない変数値（または合成カラー）をスキップ"
+"variables of unknown types were skipped" = "不明なタイプの変数をスキップ"
+"variables whose collection isn't in the variables JSON were skipped" = "コレクションが変数 JSON にない変数をスキップ"
+"variables without readable values were skipped" = "読み取れる値のない変数をスキップ"
+"vector points with unknown stroke joins use the layer join" = "不明な角の形状を持つベクターポイントはレイヤーの角の形状を使用"
+"vectors without geometry are empty" = "ジオメトリのないベクターは空"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "ジオメトリのないベクターは空（geometry=paths を指定してファイル JSON を書き出す）"
+"very long text was cut to 1,048,576 characters" = "非常に長いテキストを 1,048,576 文字に切り詰めた"
+"very long vector paths were skipped" = "非常に長いベクターパスをスキップ"
+"video actions are not supported and were skipped" = "ビデオアクションはサポートされていないためスキップ"
+"video triggers are not supported and were skipped" = "ビデオトリガーはサポートされていないためスキップ"
 "yesterday" = "昨日"
 "{instances} in {files}" = "{files}内の{instances}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}：下書きの翻訳。ネイティブスピーカーによるレビュー待ち。"
@@ -1535,6 +1730,7 @@ status = "draft — needs native review"
 "{name} is forgotten on this computer; the file stays on {server}" = "{name} の記録をこのコンピューターから消去済み。ファイルは {server} に残る"
 "{name} is on the server." = "{name} はサーバーにある。"
 "{name} is spotlighting" = "{name} がスポットライト中"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} は大きすぎるため、ブラウザーで開けません（512 MB 超）。"
 "{name} was removed from the server" = "{name} をサーバーから削除済み"
 "{name} · deleted on main" = "{name} · メインで削除"
 "{name} · deleted on the branch" = "{name} · ブランチで削除"
@@ -1561,8 +1757,10 @@ status = "draft — needs native review"
 "{n} layers selected" = { other = "{n} 個のレイヤーを選択中" }
 "{n} layers · {parts}" = { other = "{n} 個のレイヤー · {parts}" }
 "{n} matches" = { other = "{n} 件一致" }
+"{n} min" = "{n}分"
 "{n} minutes ago" = { other = "{n} 分前" }
 "{n} months ago" = { other = "{n} か月前" }
+"{n} more notes omitted from this report" = { other = "このレポートで省略した注記がさらに {n} 件" }
 "{n} of {total}" = "{n} / {total}"
 "{n} people joined" = { other = "{n} 人が参加済み" }
 "{n} preferred components" = { other = "優先コンポーネント {n} 個" }
@@ -1572,6 +1770,8 @@ status = "draft — needs native review"
 "{n} rows" = { other = "{n} 行" }
 "{n} styles" = { other = "{n} 個のスタイル" }
 "{n} variables" = { other = "{n} 個の変数" }
+"{n} votes" = { other = "{n}票" }
+"{n} votes left" = { other = "残り{n}票" }
 "{n} weeks ago" = { other = "{n} 週間前" }
 "{n} years ago" = { other = "{n} 年前" }
 "{n}d" = "{n}日"
@@ -1622,7 +1822,26 @@ status = "draft — needs native review"
 "arrange.packH" = "水平方向に詰める"
 "arrange.packV" = "垂直方向に詰める"
 "arrange.roundToPixels" = "ピクセルに丸める"
+"arrange.spacing" = "間隔"
 "arrange.tidy" = "整列"
+"board.connector" = "コネクタ"
+"board.ink" = "マーカーの線"
+"board.label" = "コネクタのラベル"
+"board.nextSticky" = "次の付箋"
+"board.reattach" = "コネクタを付け替え"
+"board.setColor" = "ボードの色"
+"board.setStyle" = "ボードのスタイル"
+"board.shape" = "テキスト付きシェイプ"
+"board.stamp" = "スタンプ"
+"board.sticky" = "付箋"
+"board.table" = "表"
+"board.tableEdit" = "表を編集"
+"board.template" = "ボードテンプレート"
+"board.templates" = "ボードテンプレートの一覧"
+"board.timer" = "タイマー"
+"board.timerState" = "タイマーの状態"
+"board.vote" = "投票セッション"
+"board.voteResults" = "投票結果"
 "bool.exclude" = "選択範囲を除外"
 "bool.flatten" = "ブーリアンを平坦化"
 "bool.intersect" = "選択範囲を交差"
@@ -1700,6 +1919,9 @@ status = "draft — needs native review"
 "dev.focus" = "フォーカスビュー"
 "dev.resolveChange" = "変更を解決"
 "dev.unfocus" = "フォーカスビューを終了"
+"devMode.addMeasurement" = "測定を追加"
+"devMode.measurements" = "測定を一覧表示"
+"devMode.removeMeasurement" = "測定を削除"
 "devResource.add" = "開発リソースを追加"
 "devResource.edit" = "開発リソースを編集"
 "devResource.list" = "開発リソースを一覧表示"
@@ -1723,6 +1945,7 @@ status = "draft — needs native review"
 "edit.duplicate" = "複製"
 "edit.findReplace" = "検索と置換"
 "edit.paste" = "貼り付け"
+"edit.pasteDesignLayers" = "デザインレイヤーを貼り付け"
 "edit.pasteOver" = "選択範囲の上に貼り付け"
 "edit.pasteProperties" = "プロパティを貼り付け"
 "edit.pasteReplace" = "貼り付けて置換"
@@ -1746,7 +1969,9 @@ status = "draft — needs native review"
 "file.exportLayers" = "レイヤーを書き出し"
 "file.exportSvg" = "選択範囲を SVG で書き出し"
 "file.import" = "インポート"
+"file.moveTab" = "タブを移動"
 "file.new" = "新規デザインファイル"
+"file.newBoard" = "新規ボード"
 "file.newFromTemplate" = "テンプレートから新規作成"
 "file.open" = "開く"
 "file.openRecent" = "最近使ったファイルを開く"
@@ -1887,6 +2112,7 @@ status = "draft — needs native review"
 "pref.reduceMotion" = "動きを減らす"
 "pref.renameDuplicates" = "複製したレイヤーの名前を変更"
 "pref.showDimensions" = "オブジェクトに寸法を表示"
+"pref.startOnHome" = "起動時にホームを表示"
 "pref.userName" = "コメントに表示する名前"
 "proto.action.add" = "プロトタイプのアクションを追加"
 "proto.action.move" = "プロトタイプのアクションの順序を変更"
@@ -1930,6 +2156,12 @@ status = "draft — needs native review"
 "select.sameStroke" = "同じ線を選択"
 "select.sameText" = "同じテキストプロパティを選択"
 "select.set" = "選択"
+"selection.applyColorStyle" = "選択範囲にカラースタイルを適用"
+"selection.bindColorVariable" = "選択範囲にカラー変数を適用"
+"selection.colors" = "選択範囲のカラー"
+"selection.detachColor" = "選択範囲のカラーを切り離す"
+"selection.selectColor" = "このカラーのレイヤーを選択"
+"selection.setPaint" = "選択範囲のカラーを変更"
 "shape.arrow" = "矢印"
 "shape.ellipse" = "楕円"
 "shape.line" = "線"
@@ -2011,10 +2243,14 @@ status = "draft — needs native review"
 "text.weightUp" = "フォントの太さを太く"
 "tool.arrow" = "矢印"
 "tool.comment" = "コメント"
+"tool.connector" = "コネクタ"
 "tool.ellipse" = "楕円"
+"tool.eraser" = "消しゴム"
 "tool.frame" = "フレーム"
 "tool.hand" = "手のひら"
+"tool.highlighter" = "蛍光ペン"
 "tool.line" = "線"
+"tool.marker" = "マーカー"
 "tool.move" = "移動"
 "tool.pen" = "ペン"
 "tool.pencil" = "鉛筆"
@@ -2026,9 +2262,12 @@ status = "draft — needs native review"
 "tool.scaleAnchor" = "拡大縮小の基準点"
 "tool.section" = "セクション"
 "tool.set" = "ツールを選択"
+"tool.shape" = "シェイプ"
 "tool.shapeBuilder" = "シェイプビルダー"
 "tool.slice" = "スライス"
+"tool.stamp" = "スタンプ"
 "tool.star" = "星"
+"tool.sticky" = "付箋"
 "tool.text" = "テキスト"
 "transform.move" = "移動"
 "transform.moveTo" = "指定位置へ移動"
@@ -2090,11 +2329,13 @@ status = "draft — needs native review"
 "vector.edit.tool" = "ベクター編集ツール"
 "vector.edit.transform" = "ポイントを変形"
 "vector.edit.widthPoint" = "幅のポイント"
+"vector.fillRule" = "塗りつぶし規則を設定"
 "vector.flatten" = "平坦化"
 "vector.join" = "選択範囲を連結"
 "vector.offset" = "パスのオフセット"
 "vector.outlineStroke" = "線のアウトライン化"
 "vector.reverse" = "パスの方向を反転"
+"vector.reverseLoop" = "ループを反転"
 "vector.simplify" = "ベクターを単純化"
 "vector.smoothJoin" = "選択範囲を滑らかに連結"
 "version.autosave" = "自動保存バージョン"
@@ -2156,6 +2397,8 @@ status = "draft — needs native review"
 "widget.click" = "ウィジェットをクリック"
 "widget.insert" = "ウィジェットを挿入"
 "widget.list" = "ウィジェットを一覧表示"
+"widget.menu" = "ウィジェットのメニュー"
+"widget.setText" = "ウィジェットのフィールドを編集"
 "window.focus" = "ウィンドウを最前面に表示"
 "window.new" = "新しいウィンドウ"
 
diff --git a/crates/ui-egui/locales/ka.toml b/crates/ui-egui/locales/ka.toml
new file mode 100644
index 00000000..bdb4933a
--- /dev/null
+++ b/crates/ui-egui/locales/ka.toml
@@ -0,0 +1,2449 @@
+# FigCraft interface strings: Georgian.
+#
+# Written with AI assistance (Claude) from the meaning of each English string, following the glossary
+# the Craft apps share, and reviewed by a native Georgian speaker; kept as a draft until a maintainer
+# changes its status. Brand names and keyboard glyphs stay as they are. Georgian has no letter case,
+# and a noun after a numeral stays singular, so counts read "შრე: {n}" and plural entries give the
+# same text for one and other. See docs/translating.md.
+
+[meta]
+name = "ქართული"
+status = "draft — reviewed by a native speaker, awaiting a maintainer's approval"
+
+[ui]
+"% of all commits" = "ყველა კომიტის %"
+"(no longer published)" = "(აღარ არის გამოქვეყნებული)"
+"({n} warnings: some entries were skipped)" = { one = "(გაფრთხილება: {n}; ზოგი ჩანაწერი გამოტოვებულია)", other = "(გაფრთხილება: {n}; ზოგი ჩანაწერი გამოტოვებულია)" }
+"+ Create variable" = "+ ცვლადის შექმნა"
+".fig (experimental)" = ".fig (ექსპერიმენტული)"
+"1…9, 0" = "1…9, 0"
+"@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: PR: {prs}, კომიტი: {commits}, +{added} / −{deleted} სტრიქონი (Δ {delta}), +{bin_added} / −{bin_deleted} ბინარული რესურსი, {first} – {last}"
+"A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "ამ ფაილის კოლექცია ამ რეჟიმებითა და ცვლადებით: შეცვალეთ მათი მნიშვნელობები თითოეული რეჟიმისთვის და დაამატეთ საკუთარი ცვლადები"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "ამ სახელით .figcraft ფაილი უკვე არსებობს. ჩანაცვლების დასადასტურებლად აირჩიეთ მისი სრული სახელი."
+"A layer on its own aligns to its frame: select more layers, or one in a frame" = "ცალკე შრე თავის ჩარჩოსთან სწორდება: მონიშნეთ მეტი შრე ან ჩარჩოში მყოფი შრე"
+"A responsive product page: hero, features, figures, a quote and a footer" = "პროდუქტის ადაპტური გვერდი ყველა ძირითადი ბლოკით"
+"A spring plays until it settles: its mass, stiffness and damping set how long" = "ზამბარა მოძრაობს, სანამ არ დამშვიდდება: მისი მასა, სიხისტე და მილევა განსაზღვრავს ხანგრძლივობას"
+"A title, an agenda, a big figure, a chart and a closing slide" = "სათაური, დღის წესრიგი, დიდი ციფრი, დიაგრამა და დასკვნითი სლაიდი"
+"A to Z" = "ა-დან ჰ-მდე"
+"About" = "პროგრამის შესახებ"
+"About FigCraft" = "FigCraft-ის შესახებ"
+"About this server" = "ამ სერვერის შესახებ"
+"Action" = "მოქმედება"
+"Actions" = "მოქმედებები"
+"Actions for {name}" = "მოქმედებები: {name}"
+"Actions…" = "მოქმედებები…"
+"Active" = "აქტიური"
+"Actual size (100%)" = "რეალური ზომა (100%)"
+"Add a category" = "კატეგორიის დამატება"
+"Add a comment" = "კომენტარის დამატება"
+"Add a description" = "აღწერის დამატება"
+"Add a frame (F) or a shape (R) to get started" = "დასაწყებად დაამატეთ ჩარჩო (F) ან ფიგურა (R)"
+"Add a layer or component to tile first" = "ჯერ დაამატეთ შრე ან კომპონენტი ფილებად დასაწყობად"
+"Add a minute" = "ერთი წუთის დამატება"
+"Add a note for developers" = "შენიშვნის დამატება დეველოპერებისთვის"
+"Add action" = "მოქმედების დამატება"
+"Add actions for when no condition holds" = "მოქმედებების დამატება იმ შემთხვევისთვის, როცა არცერთი პირობა არ სრულდება"
+"Add an annotation for developers" = "ანოტაციის დამატება დეველოპერებისთვის"
+"Add another condition" = "კიდევ ერთი პირობის დამატება"
+"Add auto layout" = "ავტოგანლაგების დამატება"
+"Add background behind overlay" = "ფონის დამატება გადაფარვის უკან"
+"Add column" = "სვეტის დამატება"
+"Add content to this slot" = "შიგთავსის დამატება ამ სლოტში"
+"Add dev resource" = "დეველოპერის რესურსის დამატება"
+"Add effect" = "ეფექტის დამატება"
+"Add export setting" = "ექსპორტის პარამეტრის დამატება"
+"Add fill" = "შევსების დამატება"
+"Add interaction" = "ურთიერთქმედების დამატება"
+"Add layout grid" = "განლაგების ბადის დამატება"
+"Add library" = "ბიბლიოთეკის დამატება"
+"Add library file…" = "ბიბლიოთეკის ფაილის დამატება…"
+"Add max height" = "მაქსიმალური სიმაღლის დამატება"
+"Add max width" = "მაქსიმალური სიგანის დამატება"
+"Add measurement" = "გაზომვის დამატება"
+"Add min height" = "მინიმალური სიმაღლის დამატება"
+"Add min width" = "მინიმალური სიგანის დამატება"
+"Add mode" = "რეჟიმის დამატება"
+"Add new page" = "ახალი გვერდის დამატება"
+"Add or update collections from a variables JSON" = "კოლექციების დამატება ან განახლება ცვლადების JSON-იდან"
+"Add properties to make instances configurable" = "დაამატეთ თვისებები, რომ ინსტანსები კონფიგურირებადი გახდეს"
+"Add reaction" = "რეაქციის დამატება"
+"Add row" = "მწკრივის დამატება"
+"Add starting point" = "საწყისი წერტილის დამატება"
+"Add stroke" = "კონტურის დამატება"
+"Add variant" = "ვარიანტის დამატება"
+"Add variant with a new value" = "ვარიანტის დამატება ახალი მნიშვნელობით"
+"Added" = "დამატებულია"
+"Added the library \"{name}\"" = "ბიბლიოთეკა „{name}“ დამატებულია"
+"Adding to {name}" = "დამატება: {name}"
+"Adjust" = "კორექცია"
+"Adjustment presets" = "კორექციის პრესეტები"
+"Advanced" = "დამატებითი"
+"Advanced stroke" = "კონტურის დამატებითი პარამეტრები"
+"After delay" = "დაყოვნების შემდეგ"
+"After delay {ms}ms" = "დაყოვნების შემდეგ: {ms} მწმ"
+"Align" = "სწორება"
+"Align bottom" = "ქვემოთ სწორება"
+"Align center" = "ცენტრში სწორება"
+"Align horizontal centers" = "ჰორიზონტალური ცენტრების სწორება"
+"Align left" = "მარცხნივ სწორება"
+"Align middle" = "შუაში სწორება"
+"Align right" = "მარჯვნივ სწორება"
+"Align text baselines" = "ტექსტის საბაზისო ხაზების სწორება"
+"Align top" = "ზემოთ სწორება"
+"Align vertical centers" = "ვერტიკალური ცენტრების სწორება"
+"Alignment" = "სწორება"
+"All" = "ყველა"
+"All categories" = "ყველა კატეგორია"
+"All comments" = "ყველა კომენტარი"
+"All components" = "ყველა კომპონენტი"
+"All fonts" = "ყველა შრიფტი"
+"All objects" = "ყველა ობიექტი"
+"All supported properties" = "ყველა მხარდაჭერილი თვისება"
+"All the fonts this file uses are installed" = "ამ ფაილის ყველა შრიფტი დაინსტალირებულია"
+"All variables" = "ყველა ცვლადი"
+"Along the bottom" = "ქვედა კიდის გასწვრივ"
+"Along the left" = "მარცხენა კიდის გასწვრივ"
+"Along the right" = "მარჯვენა კიდის გასწვრივ"
+"Along the top" = "ზედა კიდის გასწვრივ"
+"Alpha" = "ალფა"
+"Alphabetical" = "ანბანის მიხედვით"
+"Alt+drag" = "Alt+გადათრევა"
+"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "ანალიტიკა ბადეზე: ციფრები, დიაგრამები და ცხრილი"
+"An invite link that opens FigCraft and joins" = "მოსაწვევი ბმული, რომელიც ხსნის FigCraft-ს და უერთდება სესიას"
+"Anchor" = "საყრდენი"
+"Android" = "Android"
+"Angular" = "კუთხური"
+"Animation" = "ანიმაცია"
+"Annotations" = "ანოტაციები"
+"Annotations shown on the canvas" = "ტილოზე ნაჩვენები ანოტაციები"
+"Another server, or one that needs its key. The usual server is set in Preferences." = "სხვა სერვერი ან სერვერი, რომელსაც გასაღები სჭირდება. ჩვეულებრივი სერვერი პარამეტრებში ირჩევა."
+"Any status" = "ნებისმიერი სტატუსი"
+"Anyone on your network with this code can edit the file, while this app stays open." = "თქვენს ქსელში ნებისმიერს, ვისაც ეს კოდი აქვს, შეუძლია ფაილის რედაქტირება, სანამ ეს აპი ღიაა."
+"Anyone with the edit link can change the file; the view link only lets people look. The links carry their secrets: share them like passwords. `figcraft-server links` makes more and revokes them." = "რედაქტირების ბმულის მქონე ნებისმიერს შეუძლია ფაილის შეცვლა; ნახვის ბმული მხოლოდ დათვალიერების საშუალებას იძლევა. ბმულები საიდუმლო გასაღებებს შეიცავს: გააზიარეთ ისინი პაროლების მსგავსად. `figcraft-server links` ქმნის ახალ ბმულებს და აუქმებს მათ."
+"Anyone with this code can edit the file." = "ნებისმიერს, ვისაც ეს კოდი აქვს, შეუძლია ფაილის რედაქტირება."
+"Anyone with this code can look at the file, not change it." = "ნებისმიერს, ვისაც ეს კოდი აქვს, შეუძლია ფაილის ნახვა, მაგრამ არა შეცვლა."
+"Appearance" = "იერსახე"
+"Apply a component property" = "კომპონენტის თვისების გამოყენება"
+"Apply variable" = "ცვლადის გამოყენება"
+"Apply variable to text" = "ცვლადის გამოყენება ტექსტზე"
+"Apply variable to visibility" = "ცვლადის გამოყენება ხილვადობაზე"
+"Apps" = "აპები"
+"Apr" = "აპრ"
+"Arc" = "რკალი"
+"Arc ratio" = "რკალის თანაფარდობა"
+"Arc start" = "რკალის დასაწყისი"
+"Arc sweep" = "რკალის სიგრძე"
+"Archive" = "დაარქივება"
+"Archived" = "დაარქივებულია"
+"Arrange" = "დალაგება"
+"Arrow" = "ისარი"
+"Arrow at the end" = "ისარი ბოლოში"
+"As typed" = "როგორც აიკრიფა"
+"Asking the server…" = "სერვერთან მოთხოვნა…"
+"Assets" = "რესურსები"
+"Aug" = "აგვ"
+"Auto" = "ავტომატური"
+"Auto (space around)" = "ავტო (დაშორება გარშემო)"
+"Auto (space between)" = "ავტო (დაშორება შორის)"
+"Auto (space evenly)" = "ავტო (თანაბარი დაშორება)"
+"Auto ({mode})" = "ავტო ({mode})"
+"Auto columns" = "ავტომატური სვეტები"
+"Auto gap" = "ავტომატური შუალედი"
+"Auto height" = "ავტომატური სიმაღლე"
+"Auto layout" = "ავტოგანლაგება"
+"Auto rows" = "ავტომატური სტრიქონები"
+"Auto width" = "ავტომატური სიგანე"
+"Back to the FigCraft server" = "FigCraft-ის სერვერზე დაბრუნება"
+"Back to the font's value" = "შრიფტის მნიშვნელობაზე დაბრუნება"
+"Back" = "უკან"
+"Back to Ready for dev" = "„მზადაა დეველოპერისთვის“ სტატუსზე დაბრუნება"
+"Back to Ready for dev: the next change compares with how it is now" = "„მზადაა დეველოპერისთვის“ სტატუსზე დაბრუნება: შემდეგი ცვლილება შედარდება ამჟამინდელ მდგომარეობას"
+"Back to assets" = "რესურსებზე დაბრუნება"
+"Back to current" = "მიმდინარეზე დაბრუნება"
+"Back to styles" = "სტილებზე დაბრუნება"
+"Back to the canvas from a focused region" = "ფოკუსირებული არიდან ტილოზე დაბრუნება"
+"Back to the current version" = "მიმდინარე ვერსიაზე დაბრუნება"
+"Back to the values the font style implies" = "შრიფტის სტილით განსაზღვრულ მნიშვნელობებზე დაბრუნება"
+"Background" = "ფონი"
+"Background blur" = "ფონის გაბუნდოვნება"
+"Basics" = "საფუძვლები"
+"Before" = "მანამდე"
+"Bend" = "მოხრა"
+"Between the selected layers" = "მონიშნულ შრეებს შორის"
+"Bevel" = "წაკვეთილი"
+"Binary assets added" = "დამატებული ბინარული ფაილები"
+"Binary assets removed" = "წაშლილი ბინარული ფაილები"
+"Black & white" = "შავ-თეთრი"
+"Bleed" = "ჭრისპირა არე"
+"Bleed marks" = "ჭრისპირა არის ნიშნები"
+"Bleed marks need a bleed" = "ჭრისპირა არის ნიშნებს ჭრისპირა არე სჭირდება"
+"Blend" = "შერევა"
+"Blend mode" = "შერევის რეჟიმი"
+"Blue" = "ლურჯი"
+"Blur" = "გაბუნდოვნება"
+"Boolean" = "ლოგიკური"
+"Boolean groups" = "ლოგიკური ოპერაციების ჯგუფები"
+"Both directions" = "ორივე მიმართულება"
+"Bottom" = "ქვემოთ"
+"Bottom left radius" = "ქვედა მარცხენა რადიუსი"
+"Bottom right radius" = "ქვედა მარჯვენა რადიუსი"
+"Brainstorm" = "გონებრივი იერიში"
+"Branch" = "განშტოება"
+"Branch archived" = "განშტოება დაარქივებულია"
+"Branch merged" = "განშტოება შერწყმულია"
+"Branch name" = "განშტოების სახელი"
+"Branch of {file}" = "{file}-ის განშტოება"
+"Branch of {file} · merged or archived" = "{file}-ის განშტოება · შერწყმული ან დაარქივებული"
+"Branch updated from main" = "განშტოება განახლდა მთავარიდან"
+"Branch {name}" = "განშტოება {name}"
+"Branches" = "განშტოებები"
+"Bound to {name}. Click to detach the variable." = "მიბმულია: {name}. დაწკაპეთ ცვლადის მოსაწყვეტად."
+"Bring forward" = "წინ გადმოტანა"
+"Bring the main file's changes into the branch" = "მთავარი ფაილის ცვლილებების განშტოებაში გადმოტანა"
+"Bring to front" = "წინა პლანზე გადმოტანა"
+"Bristle" = "ჯაგრისი"
+"Browse" = "დათვალიერება"
+"Brush" = "ფუნჯი"
+"Brush rotation jitter" = "ფუნჯის შემობრუნების ცვალებადობა"
+"Brush scatter" = "ფუნჯის გაბნევა"
+"Brush size jitter" = "ფუნჯის ზომის ცვალებადობა"
+"Brush spacing" = "ფუნჯის ბიჯი"
+"Bulleted list" = "ბურთულებიანი სია"
+"C or Shift+C" = "C ან Shift+C"
+"C or ⇧C" = "C ან ⇧C"
+"CMYK colour" = "CMYK ფერი"
+"Can view" = "შეუძლია ნახვა"
+"Check" = "ნიშნული"
+"Checking the fonts installed on this computer…" = "ამ კომპიუტერზე დაინსტალირებული შრიფტების შემოწმება…"
+"Checking the server…" = "სერვერის შემოწმება…"
+"Chevron" = "შევრონი"
+"Clear from this list" = "ამ სიიდან ამოღება"
+"Clear results" = "შედეგების გასუფთავება"
+"Click objects to vote; click your badge to take a vote back" = "ხმის მისაცემად დააწკაპუნეთ ობიექტებზე; ხმის დასაბრუნებლად დააწკაპუნეთ თქვენს ნიშანზე"
+"Code or invite link" = "კოდი ან მოსაწვევი ბმული"
+"Color profile: {name}" = "ფერის პროფილი: {name}"
+"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "სტილები, ღია და მუქი ცვლადები, ღილაკები და ბარათები"
+"Connector" = "შემაერთებელი"
+"Convert to frame" = "ჩარჩოდ გარდაქმნა"
+"Convert to section" = "სექციად გარდაქმნა"
+"CSS custom properties…" = "CSS-ის მორგებული თვისებები…"
+"Can edit" = "შეუძლია რედაქტირება"
+"Can't read this library: {e}" = "ამ ბიბლიოთეკის წაკითხვა ვერ მოხერხდა: {e}"
+"Cancel" = "გაუქმება"
+"Canvas" = "ტილო"
+"Canvas stacking" = "ტილოზე დალაგების რიგი"
+"Cap height to baseline" = "მთავრული ასოს სიმაღლიდან საბაზისო ხაზამდე"
+"Case" = "რეგისტრი"
+"Case-sensitive forms" = "რეგისტრზე დამოკიდებული ფორმები"
+"Categories" = "კატეგორიები"
+"Center" = "ცენტრში"
+"Change alias" = "ალიასის შეცვლა"
+"Change resolved" = "ცვლილება გადაწყვეტილია"
+"Change style" = "სტილის შეცვლა"
+"Change to" = "შეცვლა:"
+"Change to needs a layer inside a variant" = "„ვარიანტის შეცვლას“ ვარიანტის შიგნით შრე სჭირდება"
+"Changed" = "შეცვლილია"
+"Changed on both sides: keep one" = "შეცვლილია ორივე მხარეს: დატოვეთ ერთი"
+"Changes on main" = "ცვლილებები მთავარში"
+"Changes on the branch" = "ცვლილებები განშტოებაში"
+"Changes unknown" = "ცვლილებები უცნობია"
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "ამ კომპონენტის კოდთან დასაკავშირებლად ზემოთ აირჩიეთ React, Leptos, Vue, SwiftUI, Compose, ArkUI ან Flutter."
+"Choose another profile to change it." = "მის შესაცვლელად აირჩიეთ სხვა პროფილი."
+"Choose collection" = "კოლექციის არჩევა"
+"Choose image" = "გამოსახულების არჩევა"
+"Choose mode" = "რეჟიმის არჩევა"
+"Choose variable" = "ცვლადის არჩევა"
+"Circle" = "წრე"
+"Clear recent" = "ბოლოდროინდელის გასუფთავება"
+"Click + to replace mixed content" = "დაწკაპეთ +, რომ შერეული შიგთავსი ჩაანაცვლოთ"
+"Click anywhere on the canvas to leave one." = "მის დასატოვებლად დაწკაპეთ ტილოს ნებისმიერ ადგილას."
+"Click or drag to merge · {alt} removes" = "დაწკაპეთ ან გადაათრიეთ შესარწყმელად · {alt} შლის"
+"Click or drag to remove · {alt} merges" = "დაწკაპეთ ან გადაათრიეთ წასაშლელად · {alt} შერწყამს"
+"Click to record a key" = "დაწკაპეთ კლავიშის ჩასაწერად"
+"Clip content" = "შიგთავსის მოჭრა"
+"Clip to shape" = "ფიგურაზე მოჭრა"
+"Close" = "დახურვა"
+"Close overlay" = "გადაფარვის დახურვა"
+"Close preview" = "წინასწარი ნახვის დახურვა"
+"Close tab" = "ჩანართის დახურვა"
+"Close version history" = "ვერსიების ისტორიის დახურვა"
+"Close when clicking outside" = "დახურვა გარეთ დაწკაპუნებისას"
+"Code" = "კოდი"
+"Code syntax" = "კოდის სინტაქსი"
+"Collapse" = "ჩაკეცვა"
+"Collapse panel" = "პანელის ჩაკეცვა"
+"Collection" = "კოლექცია"
+"Collections" = "კოლექციები"
+"Color" = "ფერი"
+"Color burn" = "ფერით ჩამუქება"
+"Color dodge" = "ფერით გაღიავება"
+"Color format" = "ფერის ფორმატი"
+"Color profile" = "ფერის პროფილი"
+"Color styles" = "ფერის სტილები"
+"Color values in this file are in this color space." = "ამ ფაილში ფერის მნიშვნელობები ამ ფერთა სივრცეშია."
+"Color variables" = "ფერის ცვლადები"
+"Colour" = "ფერი"
+"Column" = "სვეტი"
+"Column gap" = "სვეტებს შორის შუალედი"
+"Column sizes" = "სვეტების ზომები"
+"Column span" = "სვეტების გაერთიანება"
+"Columns" = "სვეტები"
+"Columns {count}" = "სვეტები {count}"
+"Comment" = "კომენტარი"
+"Comments" = "კომენტარები"
+"Commits" = "კომიტები"
+"Company" = "კომპანია"
+"Compare changes" = "ცვლილებების შედარება"
+"Compatibility notes" = "თავსებადობის შენიშვნები"
+"Completed" = "დასრულებული"
+"Component" = "კომპონენტი"
+"Component name" = "კომპონენტის სახელი"
+"Component property" = "კომპონენტის თვისება"
+"Component set" = "კომპონენტების ნაკრები"
+"Component sets" = "კომპონენტების ნაკრებები"
+"Components" = "კომპონენტები"
+"Conditional" = "პირობითი"
+"Confetti" = "კონფეტი"
+"Conflicts" = "კონფლიქტები"
+"Connect to code" = "კოდთან დაკავშირება"
+"Connected" = "დაკავშირებულია"
+"Connected to code: {from}" = "დაკავშირებულია კოდთან: {from}"
+"Connection lost, reconnecting (attempt {attempt})…" = "კავშირი გაწყდა, ხელახლა დაკავშირება (მცდელობა {attempt})…"
+"Constrain proportions" = "პროპორციების შენარჩუნება"
+"Constraints" = "შეზღუდვები"
+"Content" = "შიგთავსი"
+"Contents hidden" = "შიგთავსი დამალულია"
+"Contextual alternates" = "კონტექსტური ალტერნატივები"
+"Contrast" = "კონტრასტი"
+"Contributors" = "მონაწილეები"
+"Contributors: {people} · Commits: {commits}" = "მონაწილეები: {people} · კომიტები: {commits}"
+"Controller" = "კონტროლერი"
+"Cool" = "ცივი"
+"Copied as CSS" = "დაკოპირდა როგორც CSS"
+"Copied as PNG" = "დაკოპირდა როგორც PNG"
+"Copied as SVG" = "დაკოპირდა როგორც SVG"
+"Copied as text" = "დაკოპირდა როგორც ტექსტი"
+"Copied {value}" = "დაკოპირდა: {value}"
+"Copy" = "კოპირება"
+"Copy as" = "კოპირება როგორც"
+"Copy as CSS" = "კოპირება როგორც CSS"
+"Copy as PNG" = "კოპირება როგორც PNG"
+"Copy as SVG" = "კოპირება როგორც SVG"
+"Copy code" = "კოდის კოპირება"
+"Copy link" = "ბმულის კოპირება"
+"Copy the {label}" = "კოპირება: {label}"
+"Copy {value}" = "კოპირება: {value}"
+"Corner radius" = "კუთხის რადიუსი"
+"Corner smoothing" = "კუთხეების დარბილება"
+"Couldn't download the variables" = "ცვლადების ჩამოტვირთვა ვერ მოხერხდა"
+"Couldn't reach {server}: showing what this computer remembers." = "{server}-თან დაკავშირება ვერ მოხერხდა: ნაჩვენებია ის, რაც ამ კომპიუტერს ახსოვს."
+"Couldn't save automatically: {error}" = "ავტომატურად შენახვა ვერ მოხერხდა: {error}"
+"Couldn't save the file" = "ფაილის შენახვა ვერ მოხერხდა"
+"Count" = "რაოდენობა"
+"Create" = "შექმნა"
+"Create a variable collection first" = "ჯერ შექმენით ცვლადების კოლექცია"
+"Create a variable first" = "ჯერ შექმენით ცვლადი"
+"Create alias" = "ალიასის შექმნა"
+"Create branch" = "განშტოების შექმნა"
+"Create collection" = "კოლექციის შექმნა"
+"Create component" = "კომპონენტის შექმნა"
+"Create component property" = "კომპონენტის თვისების შექმნა"
+"Create components, styles or variables to publish them as a library." = "შექმენით კომპონენტები, სტილები ან ცვლადები, რომ ბიბლიოთეკად გამოაქვეყნოთ."
+"Create property…" = "თვისების შექმნა…"
+"Create style" = "სტილის შექმნა"
+"Create style from the selected text" = "სტილის შექმნა მონიშნული ტექსტიდან"
+"Created" = "შექმნილია"
+"Crop" = "ჩამოჭრა"
+"Crop marks" = "ჭრის ნიშნები"
+"Ctrl+arrows" = "Ctrl+ისრები"
+"Ctrl+click" = "Ctrl+დაწკაპუნება"
+"Ctrl+scroll" = "Ctrl+გადახვევა"
+"Current name" = "მიმდინარე სახელი"
+"Current version" = "მიმდინარე ვერსია"
+"Cursor chat" = "კურსორის ჩატი"
+"Custom" = "მორგებული"
+"Custom size" = "მორგებული ზომა"
+"Cut" = "ამოჭრა"
+"Dark" = "ბნელი"
+"Darken" = "ჩამუქება"
+"Dash" = "ტირე"
+"Dashboard" = "სამართავი დაფა"
+"Date created" = "შექმნის თარიღი"
+"Dec" = "დეკ"
+"Decoration style" = "გაფორმების სტილი"
+"Decoration" = "გაფორმება"
+"Deep select" = "ღრმა მონიშვნა"
+"Default" = "ნაგულისხმევი"
+"Default content" = "ნაგულისხმევი შიგთავსი"
+"Default value (the top-left variant)" = "ნაგულისხმევი მნიშვნელობა (ზედა მარცხენა ვარიანტი)"
+"Delay" = "დაყოვნება"
+"Delete" = "წაშლა"
+"Delete category (its annotations stay)" = "კატეგორიის წაშლა (მისი ანოტაციები რჩება)"
+"Delete collection" = "კოლექციის წაშლა"
+"Delete group" = "ჯგუფის წაშლა"
+"Delete mode" = "რეჟიმის წაშლა"
+"Delete page" = "გვერდის წაშლა"
+"Delete preset" = "პრესეტის წაშლა"
+"Delete property" = "თვისების წაშლა"
+"Delete the style (layers keep their values)" = "სტილის წაშლა (შრეები ინარჩუნებს მნიშვნელობებს)"
+"Delete thread" = "კომენტარისა და პასუხების წაშლა"
+"Delete variable" = "ცვლადის წაშლა"
+"Delete “{name}”? This can't be undone." = "წაიშალოს „{name}“? ამის დაბრუნება შეუძლებელია."
+"Density" = "სიმკვრივე"
+"Depth" = "სიღრმე"
+"Describe how and when to use this component" = "აღწერეთ, როგორ და როდის გამოიყენება ეს კომპონენტი"
+"Describe what changed" = "აღწერეთ, რა შეიცვალა"
+"Description" = "აღწერა"
+"Description (optional)" = "აღწერა (არასავალდებულო)"
+"Design" = "დიზაინი"
+"Design panel" = "დიზაინის პანელი"
+"Design system starter" = "დიზაინ-სისტემის საწყისი ნაკრები"
+"Desktop" = "დესკტოპი"
+"Destination" = "დანიშნულება"
+"Detach alias" = "ალიასის გამოყოფა"
+"Detach instance" = "ინსტანსის გამოყოფა"
+"Detach property" = "თვისების გამოყოფა"
+"Detach style" = "სტილის გამოყოფა"
+"Detach styles" = "სტილების გამოყოფა"
+"Detach variable" = "ცვლადის გამოყოფა"
+"Details" = "დეტალები"
+"Dev Mode" = "დეველოპერის რეჟიმი"
+"Dev resources" = "დეველოპერის რესურსები"
+"Development" = "დეველოპმენტი"
+"Device" = "მოწყობილობა"
+"Device at 100%" = "მოწყობილობა 100%-ზე"
+"Diamond" = "ბრილიანტი"
+"Difference" = "სხვაობა"
+"Dimensions" = "ზომები"
+"Direction" = "მიმართულება"
+"Disconnect from code" = "კოდთან კავშირის გაწყვეტა"
+"Dispersion" = "დისპერსია"
+"Display name" = "საჩვენებელი სახელი"
+"Dissolve" = "გადადნობა"
+"Distribute and tidy" = "განაწილება და მოწესრიგება"
+"Distribute horizontal spacing" = "ჰორიზონტალური შუალედების განაწილება"
+"Distribute vertical spacing" = "ვერტიკალური შუალედების განაწილება"
+"Divider" = "გამყოფი"
+"Don't Save" = "არ შეინახო"
+"Don't truncate" = "შეკვეცის გარეშე"
+"Done" = "მზადაა"
+"Done editing" = "რედაქტირების დასრულება"
+"Dots" = "წერტილები"
+"Dotted" = "პუნქტირი"
+"Down" = "ქვემოთ"
+"Drafts" = "მონახაზები"
+"Drag the stroke to add a width point" = "გადაათრიეთ კონტური სიგანის წერტილის დასამატებლად"
+"Draw" = "ხატვა"
+"Draw a frame" = "დახატეთ ჩარჩო"
+"Drawing tools" = "ხატვის ხელსაწყოები"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "ჩააგდეთ .figcraft, .fig, .sketch, .json, .svg ან გამოსახულების ფაილი."
+"Drop to import" = "ჩააგდეთ იმპორტისთვის"
+"Drop to open" = "ჩააგდეთ გასახსნელად"
+"Drop shadow" = "ჩრდილი"
+"Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "ორმაგი ლიცენზია: MIT OR Apache-2.0. შექმნილია ArtCraft-ის გუნდისა და საზოგადოების მიერ."
+"Duo" = "დუო"
+"Duplicate" = "დუბლირება"
+"Duplicate by dragging" = "დუბლირება გადათრევით"
+"Duplicate mode" = "რეჟიმის დუბლირება"
+"Duplicate page" = "გვერდის დუბლირება"
+"Edit" = "რედაქტირება"
+"Edit as an expression" = "ექსპრესიად რედაქტირება"
+"Edit colour" = "ფერის რედაქტირება"
+"Edit comment" = "კომენტარის რედაქტირება"
+"Edit dev resource" = "დეველოპერის რესურსის რედაქტირება"
+"Edit link" = "რედაქტირების ბმული"
+"Edit link copied" = "რედაქტირების ბმული დაკოპირდა"
+"Edit style" = "სტილის რედაქტირება"
+"Edit variable" = "ცვლადის რედაქტირება"
+"Edit with the builder" = "კონსტრუქტორით რედაქტირება"
+"Edited {when}" = "რედაქტირებულია {when}"
+"Effect settings" = "ეფექტის პარამეტრები"
+"Effect styles" = "ეფექტის სტილები"
+"Effects" = "ეფექტები"
+"Curved" = "მრუდი"
+"Elbow" = "კუთხოვანი"
+"Ellipse" = "ელიფსი"
+"Ellipses" = "ელიფსები"
+"Else" = "სხვა შემთხვევაში"
+"Else if" = "სხვა შემთხვევაში, თუ"
+"Embedded profile" = "ჩაშენებული პროფილი"
+"Empty" = "ცარიელი"
+"End" = "ბოლო"
+"End point" = "საბოლოო წერტილი"
+"End vote" = "ხმის მიცემის დასრულება"
+"Ends the session; everyone keeps their copy" = "ასრულებს სესიას; ყველას თავისი ასლი რჩება"
+"Enter" = "Enter"
+"Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "შეიყვანეთ figcraft-server-ის მისამართი და დააჭირეთ „დათვალიერებას“, რომ ნახოთ მის მიერ შემოთავაზებული პლაგინები."
+"Enter to save · Esc to cancel" = "Enter — შენახვა · Esc — გაუქმება"
+"Eraser" = "საშლელი"
+"Esc" = "Esc"
+"Essential" = "ძირითადი"
+"Every conflict has a choice." = "ყველა კონფლიქტს არჩევანი აქვს."
+"Every top-level frame already starts a flow" = "ყველა ზედა დონის ჩარჩო უკვე იწყებს ნაკადს"
+"Exact opacity (4 then 5: 45%)" = "ზუსტი გაუმჭვირვალობა (4, შემდეგ 5: 45%)"
+"Exclude" = "გამორიცხვა"
+"Excluded" = "გამორიცხული"
+"Excluded from layout" = "განლაგებიდან გამორიცხული"
+"Excludes" = "გამორიცხვები"
+"Exclusion" = "გამორიცხვა"
+"Exit focus view (Esc)" = "ფოკუსის ხედიდან გასვლა (Esc)"
+"Expand" = "გაშლა"
+"Export" = "ექსპორტირება"
+"Export all" = "ყველაფრის ექსპორტირება"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "ჩარჩოები და შრეები PNG, JPG, SVG ან PDF ფორმატში"
+"Export page as PNG" = "გვერდის PNG ფაილად ექსპორტირება"
+"Export settings" = "ექსპორტის პარამეტრები"
+"Export variables" = "ცვლადების ექსპორტირება"
+"Export {name}" = "{name}-ის ექსპორტირება"
+"Export {n} layers" = { one = "შრის ექსპორტირება: {n}", other = "შრის ექსპორტირება: {n}" }
+"Exported {file}" = "ექსპორტირებულია: {file}"
+"Exported {name}" = "ექსპორტირებულია: {name}"
+"Exported {name}; {n} kinds of content were left out" = { one = "ექსპორტირებულია: {name}; გამოტოვებული შიგთავსის სახეობა: {n}", other = "ექსპორტირებულია: {name}; გამოტოვებული შიგთავსის სახეობა: {n}" }
+"Exported {n} files" = { one = "ექსპორტირებულია ფაილი: {n}", other = "ექსპორტირებულია ფაილი: {n}" }
+"Export…" = "ექსპორტირება…"
+"Expose properties to instances" = "თვისებების ჩვენება ინსტანსებში"
+"Exposure" = "ექსპოზიცია"
+"Expression" = "ექსპრესია"
+"Extend collection" = "კოლექციის გაფართოება"
+"Extends \"{name}\": overridden values are marked" = "აფართოებს „{name}“-ს: შეცვლილი მნიშვნელობები მონიშნულია"
+"Eye" = "თვალი"
+"F" = "F"
+"Fade" = "მილევა"
+"False" = "მცდარი"
+"Feb" = "თებ"
+"Fetching from the server…" = "სერვერიდან მიღება…"
+"FigCraft couldn't open its window: {error}" = "FigCraft-მა ფანჯრის გახსნა ვერ შეძლო: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft ჯერ ამ ფაილების ყველა შესაძლებლობას არ უჭერს მხარს. შენიშვნებში ჩამოთვლილია, რა გამოტოვდა ან შეიცვალა იმპორტირებულ ასლში; ორიგინალი ფაილი უცვლელია."
+"File" = "ფაილი"
+"File name" = "ფაილის სახელი"
+"File not found" = "ფაილი ვერ მოიძებნა"
+"File published" = "ფაილი გამოქვეყნდა"
+"Files aren't end-to-end encrypted: the server's operator can read them." = "ფაილები ბოლომდე არ არის დაშიფრული: სერვერის ოპერატორს შეუძლია მათი წაკითხვა."
+"Files nobody opens for {n} days are deleted." = { one = "ფაილები, რომლებსაც არავინ ხსნის, იშლება. დღე: {n}.", other = "ფაილები, რომლებსაც არავინ ხსნის, იშლება. დღე: {n}." }
+"Fill" = "შევსება"
+"Fill (fr)" = "შევსება (fr)"
+"Fill container" = "კონტეინერის შევსება"
+"Fill window" = "ფანჯრის შევსება"
+"Fills" = "შევსებები"
+"Fill|sizing" = "შევსება"
+"Filter and sort" = "ფილტრი და სორტირება"
+"Find" = "ძებნა"
+"Find and replace" = "ძებნა და ჩანაცვლება"
+"Find layers" = "შრეების ძებნა"
+"First" = "პირველი"
+"First commit" = "პირველი კომიტი"
+"First on top" = "პირველი ზემოთ"
+"Fit" = "მორგება"
+"Fit device to window" = "მოწყობილობის ფანჯარაში ჩატევა"
+"Fit to contents" = "შიგთავსზე მორგება"
+"Fit to window" = "ფანჯარაში ჩატევა"
+"Fit width" = "სიგანეში ჩატევა"
+"Fixed" = "ფიქსირებული"
+"Fixed gap" = "ფიქსირებული შუალედი"
+"Fixed size" = "ფიქსირებული ზომა"
+"Flatten" = "გაბრტყელება"
+"Flip" = "არეკვლა"
+"Flip horizontal" = "ჰორიზონტალურად არეკვლა"
+"Flip text to the other side" = "ტექსტის მეორე მხარეს გადატანა"
+"Flip vertical" = "ვერტიკალურად არეკვლა"
+"Flip width profile" = "სიგანის პროფილის არეკვლა"
+"Flow chart" = "ბლოკ-სქემა"
+"Flow starting point" = "ნაკადის საწყისი წერტილი"
+"Flow starting points" = "ნაკადის საწყისი წერტილები"
+"Flows" = "ნაკადები"
+"Focus view" = "ფოკუსის ხედი"
+"Fold autosaves" = "ავტოშენახვების ჩაკეცვა"
+"Folder: click to collapse" = "საქაღალდე: დაწკაპეთ ჩასაკეცად"
+"Folder: click to expand" = "საქაღალდე: დაწკაპეთ გასაშლელად"
+"Follow" = "მიყოლა"
+"Follow {name}" = "{name}-ის მიყოლა"
+"Following" = "მიყოლა"
+"Following {name} · {key} to stop" = "მიჰყვებით: {name} · შესაწყვეტად {key}"
+"Font" = "შრიფტი"
+"Font not installed" = "შრიფტი არ არის დაინსტალირებული"
+"Font size" = "შრიფტის ზომა"
+"Font style" = "შრიფტის სტილი"
+"Forget on this computer" = "ამ კომპიუტერზე დავიწყება"
+"Four screens of a trail app with components and a prototype flow" = "ლაშქრობის აპის ოთხი ეკრანი და პროტოტიპის ნაკადი"
+"Fractions" = "წილადები"
+"Frame" = "ჩარჩო"
+"Frame selection" = "მონიშნულის ჩარჩოში მოქცევა"
+"Frame tools" = "ჩარჩოს ხელსაწყოები"
+"Frames" = "ჩარჩოები"
+"From the library \"{name}\": read-only" = "ბიბლიოთეკიდან „{name}“: მხოლოდ წასაკითხად"
+"From {name}" = "წყარო: {name}"
+"From {server}" = "წყარო: {server}"
+"Frost" = "ჭირხლი"
+"Gap" = "შუალედი"
+"Gap between columns" = "სვეტებს შორის შუალედი"
+"Gap between items" = "ელემენტებს შორის შუალედი"
+"Gap between rows" = "სტრიქონებს შორის შუალედი"
+"Getting started" = "პირველი ნაბიჯები"
+"Give the address of a server open to the public, or a server's address with its key (`figcraft-server key` prints it)." = "მიუთითეთ საჯარო სერვერის მისამართი ან სერვერის მისამართი გასაღებთან ერთად (`figcraft-server key` გამოიტანს მას)."
+"Glass" = "მინა"
+"Go to main component" = "მთავარ კომპონენტზე გადასვლა"
+"Go to {name}" = "{name}-ზე გადასვლა"
+"Grab bag" = "სხვადასხვა"
+"Gradient" = "გრადიენტი"
+"Gray" = "ნაცრისფერი"
+"Green" = "მწვანე"
+"Greyscale components and two example screens to sketch a flow with" = "ნაცრისფერი კომპონენტები ნაკადის ჩანახატისთვის"
+"Grid" = "ბადე"
+"Grid ({size})" = "ბადე ({size})"
+"Grid styles" = "ბადის სტილები"
+"Grid {size}" = "ბადე {size}"
+"Group" = "ჯგუფი"
+"Group selection" = "ჯგუფის მონიშვნა"
+"Groups" = "ჯგუფები"
+"Gutter" = "შუალედი"
+"Hand tool" = "ხელის ხელსაწყო"
+"Hanging list" = "გამოწეული სია"
+"Hanging punctuation" = "გამოწეული პუნქტუაცია"
+"Hard light" = "მკვეთრი სინათლე"
+"Heart" = "გული"
+"Height" = "სიმაღლე"
+"Help" = "დახმარება"
+"Help and resources" = "დახმარება და რესურსები"
+"Help page" = "დახმარების გვერდი"
+"Here: {names}" = "აქ: {names}"
+"Hidden" = "დამალული"
+"Hide contents" = "შიგთავსის დამალვა"
+"Hide from publishing" = "გამოქვეყნებისას დამალვა"
+"Hide section contents" = "სექციის შიგთავსის დამალვა"
+"Hide these tips (Getting started in the Help menu shows them again)" = "ამ რჩევების დამალვა („პირველი ნაბიჯები“ დახმარების მენიუში ისევ აჩვენებს მათ)"
+"Hide when publishing" = "გამოქვეყნებისას დამალვა"
+"Highlight layers on hover" = "შრეების გამოკვეთა მაჩვენებლის მიტანისას"
+"Highlighter" = "ხაზგასმის მარკერი"
+"Highlights" = "ღია ტონები"
+"Hold Alt" = "Alt-ის დაჭერა"
+"Hold Alt+Z" = "Alt+Z-ის დაჭერა"
+"Hold Ctrl" = "Ctrl-ის დაჭერა"
+"Hold Z" = "Z-ის დაჭერა"
+"Hold ⌃ or ⌘" = "⌃-ის ან ⌘-ის დაჭერა"
+"Hold ⌥" = "⌥-ის დაჭერა"
+"Hold ⌥Z" = "⌥Z-ის დაჭერა"
+"Home" = "საწყისი ეკრანი"
+"Horizontal" = "ჰორიზონტალური"
+"Horizontal align" = "ჰორიზონტალური სწორება"
+"Horizontal hex" = "ჰორიზონტალური ექვსკუთხედი"
+"Horizontal padding" = "ჰორიზონტალური შიდა დაშორება"
+"Horizontal spacing" = "ჰორიზონტალური დაშორება"
+"Hosted by {operator}" = "მასპინძელი: {operator}"
+"Hover a layer to see its properties" = "მიიტანეთ მაჩვენებელი შრეზე მისი თვისებების სანახავად"
+"Hover other layers to measure the distance" = "მიიტანეთ მაჩვენებელი სხვა შრეებზე მანძილის გასაზომად"
+"Hue" = "ფერის ტონი"
+"Hug" = "შიგთავსზე მორგება"
+"Hug contents" = "შიგთავსზე მორგება"
+"Icon components on a 24 px grid with keylines and a size preview" = "ხატულები 24 px ბადეზე, საორიენტაციო ხაზებით"
+"Icon set starter" = "ხატულების ნაკრების საწყისი"
+"If it keeps happening, please report it at {link} with this message." = "თუ ეს განმეორდება, გთხოვთ, ეს შეტყობინება გამოგვიგზავნეთ აქ: {link}"
+"If" = "თუ"
+"If {condition}" = "თუ {condition}"
+"Ignore auto layout (absolute position)" = "ავტოგანლაგების იგნორირება (აბსოლუტური პოზიცია)"
+"Ignore overlapping layers" = "გადაფარული შრეების იგნორირება"
+"Image" = "გამოსახულება"
+"Images" = "გამოსახულებები"
+"Import" = "იმპორტი"
+"Import path" = "იმპორტის გზა"
+"Import plugin from manifest" = "პლაგინის იმპორტი მანიფესტიდან"
+"Import plugin from manifest…" = "პლაგინის იმპორტი მანიფესტიდან…"
+"Import report" = "იმპორტის ანგარიში"
+"Import variables" = "ცვლადების იმპორტი"
+"Imported document" = "იმპორტირებული დოკუმენტი"
+"Imported {name}" = "იმპორტირებულია: {name}"
+"Imported {n} new variables, updated {updated}" = { one = "იმპორტირებულია ახალი ცვლადი: {n}; განახლდა: {updated}", other = "იმპორტირებულია ახალი ცვლადი: {n}; განახლდა: {updated}" }
+"Import…" = "იმპორტი…"
+"In an instance, this comes from the main component" = "ინსტანსში ეს მთავარი კომპონენტიდან მოდის"
+"In the browser you can join sessions the desktop app hosts and files on a FigCraft server. A page opened over https reaches other computers only through wss:// links (a server behind TLS)." = "ბრაუზერში შეგიძლიათ შეუერთდეთ სესიებს, რომლებსაც სამუშაო მაგიდის აპი მასპინძლობს, და FigCraft-ის სერვერზე არსებულ ფაილებს. https-ით გახსნილი გვერდი სხვა კომპიუტერებს მხოლოდ wss:// ბმულებით აღწევს (TLS-ის მიღმა მყოფი სერვერი)."
+"Include bounding box" = "შემომსაზღვრელი ჩარჩოს ჩართვა"
+"Include id attribute" = "id ატრიბუტის ჩართვა"
+"Included" = "ჩართული"
+"Included in layout" = "განლაგებაში ჩართული"
+"Individual corners" = "ცალკეული კუთხეები"
+"Individual strokes" = "ცალკეული კონტურები"
+"Ink" = "მელანი"
+"Inner shadow" = "შიდა ჩრდილი"
+"Inside" = "შიგნით"
+"Inspect" = "ინსპექტირება"
+"Inspect the layer under the pointer: size, colours, typography" = "მაჩვენებლის ქვეშ მყოფი შრის ინსპექტირება: ზომა, ფერები, ტიპოგრაფია"
+"Install plugin" = "პლაგინის ინსტალაცია"
+"Install" = "ინსტალაცია"
+"Installed {name}" = "დაინსტალირდა: {name}"
+"Installed" = "დაინსტალირებულია"
+"Installing…" = "ინსტალაცია…"
+"Instance" = "ინსტანსი"
+"Instance properties" = "ინსტანსის თვისებები"
+"Instance swap" = "ინსტანსის ჩანაცვლება"
+"Instance swap (no other component)" = "ინსტანსის ჩანაცვლება (სხვა კომპონენტი არ არის)"
+"Instances" = "ინსტანსები"
+"Instant" = "მყისიერი"
+"Intensity" = "ძალა"
+"Interaction" = "ურთიერთქმედება"
+"Interactions" = "ურთიერთქმედებები"
+"Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "ინტერფეისის დიზაინი და პროტოტიპირება. უფასო, ღია კოდის, დამოუკიდებლად (clean-room) შექმნილი დიზაინის ხელსაწყო, ნულიდან დაწერილი Rust-ზე, ArtCraft Crafting Apps-ის ნაწილი."
+"Intersect" = "გადაკვეთა"
+"Intersects" = "გადაკვეთები"
+"Invalid color" = "არასწორი ფერი"
+"Invite link" = "მოსაწვევი ბმული"
+"Invite link copied" = "მოსაწვევი ბმული დაკოპირდა"
+"It asks permission to:" = "ის ითხოვს ნებართვას:"
+"Jan" = "იან"
+"Join" = "შეერთება"
+"Join code copied" = "შეერთების კოდი დაკოპირდა"
+"Join code or invite link" = "შეერთების კოდი ან მოსაწვევი ბმული"
+"Join live session" = "ცოცხალ სესიასთან შეერთება"
+"Join us on Discord" = "შემოგვიერთდით Discord-ზე"
+"Join with a code" = "კოდით შეერთება"
+"Joined" = "შეერთებულია"
+"Joined {file}" = "შეერთებულია: {file}"
+"Joining…" = "შეერთება…"
+"Join|stroke" = "შეერთება"
+"Jul" = "ივლ"
+"Jun" = "ივნ"
+"Just now" = "ახლახან"
+"Justify" = "ორმხრივი სწორება"
+"Kanban board" = "კანბან დაფა"
+"Keep a measurement on the canvas for developers" = "გაზომვის შენახვა ტილოზე დეველოპერებისთვის"
+"Keep appearance" = "იერსახის შენარჩუნება"
+"Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "„იერსახის შენარჩუნება“ ყველა ფერის მნიშვნელობას {profile}-ში გარდაქმნის, რომ ფერები იგივენაირად გამოჩნდეს. „მნიშვნელობების შენარჩუნება“ რიცხვებს უცვლელად ტოვებს, ამიტომ ფერები იცვლება."
+"Keep tool selected after use" = "ხელსაწყოს არჩეულად დატოვება გამოყენების შემდეგ"
+"Keep values" = "მნიშვნელობების შენარჩუნება"
+"Key/Gamepad" = "კლავიში/გეიმპადი"
+"Key/Gamepad {key}" = "კლავიში/გეიმპადი {key}"
+"Keyboard shortcuts" = "კლავიატურის მალსახმობები"
+"Kits" = "ნაკრებები"
+"Landing page" = "ლენდინგი"
+"Language" = "ენა"
+"Lasso" = "ლასო"
+"Last" = "ბოლო"
+"Last change: {note}" = "ბოლო ცვლილება: {note}"
+"Last commit" = "ბოლო კომიტი"
+"Last modified" = "ბოლო ცვლილება"
+"Last on top" = "ბოლო ზემოთ"
+"Layer blur" = "შრის გაბუნდოვნება"
+"Layer name" = "შრის სახელი"
+"Layers" = "შრეები"
+"Layers in an instance take their position from the main component" = "ინსტანსის შრეები პოზიციას მთავარი კომპონენტიდან იღებს"
+"Layout" = "განლაგება"
+"Layout grid" = "განლაგების ბადე"
+"Layout grid settings" = "განლაგების ბადის პარამეტრები"
+"Layout grids" = "განლაგების ბადეები"
+"Leave session" = "სესიიდან გასვლა"
+"Leaves" = "ფოთლები"
+"Left" = "მარცხნივ"
+"Left & right" = "მარცხნივ და მარჯვნივ"
+"Left side" = "მარცხენა მხარე"
+"Left side width" = "მარცხენა მხარის სიგანე"
+"Letter case" = "ასოთა რეგისტრი"
+"Letter spacing" = "ასოებს შორის დაშორება"
+"Libraries" = "ბიბლიოთეკები"
+"Libraries in this file" = "ამ ფაილის ბიბლიოთეკები"
+"Library updates available" = "ხელმისაწვდომია ბიბლიოთეკის განახლებები"
+"Library: click to collapse" = "ბიბლიოთეკა: დაწკაპეთ ჩასაკეცად"
+"Library: click to expand" = "ბიბლიოთეკა: დაწკაპეთ გასაშლელად"
+"Library: its variables are read-only here; edit them in the library file and publish it" = "ბიბლიოთეკა: მისი ცვლადები აქ მხოლოდ წასაკითხია; შეცვალეთ ისინი ბიბლიოთეკის ფაილში და გამოაქვეყნეთ"
+"Light" = "ღია"
+"Lighten" = "გაღიავება"
+"Light|glass" = "ღია"
+"Line" = "ხაზი"
+"Line arrow" = "ხაზოვანი ისარი"
+"Line delta" = "სტრიქონების სხვაობა"
+"Line height" = "სტრიქონის სიმაღლე"
+"Linear" = "წრფივი"
+"Lines" = "სტრიქონები"
+"Lines +/−" = "სტრიქონები +/−"
+"Lines added" = "დამატებული სტრიქონები"
+"Lines deleted" = "წაშლილი სტრიქონები"
+"Link" = "ბმული"
+"Link copied" = "ბმული დაკოპირდა"
+"Link docs, code or tickets for developers." = "მიაბით დოკუმენტაცია, კოდი ან ტიკეტები დეველოპერებისთვის."
+"Link frames on the Prototype tab, then present the flow" = "დააკავშირეთ ჩარჩოები და წარადგინეთ ნაკადი"
+"Link this component to its code component: instances then show your real snippet with their values." = "დააკავშირეთ ეს კომპონენტი მის კოდის კომპონენტთან: ინსტანსები მაშინ თქვენს რეალურ ფრაგმენტს აჩვენებს მათი მნიშვნელობებით."
+"List spacing" = "სიის დაშორება"
+"List style" = "სიის სტილი"
+"Live session" = "ცოცხალი სესია"
+"Live · {people}" = "ცოცხლად · {people}"
+"Local components" = "ლოკალური კომპონენტები"
+"Local network" = "ლოკალური ქსელი"
+"Local styles" = "ლოკალური სტილები"
+"Local variables" = "ლოკალური ცვლადები"
+"Lock/Unlock" = "ჩაკეტვა/განბლოკვა"
+"Locked" = "ჩაკეტილი"
+"Lowercase" = "პატარა ასოები"
+"Luminance" = "სიკაშკაშე"
+"Luminosity" = "ნათება"
+"Main" = "მთავარი"
+"Main component deleted" = "მთავარი კომპონენტი წაიშალა"
+"Main menu" = "მთავარი მენიუ"
+"Make a component" = "შექმენით კომპონენტი"
+"Make slot" = "სლოტად გადაქცევა"
+"Mar" = "მარ"
+"Margin" = "ველი"
+"Mark all as read" = "ყველას წაკითხულად მარკირება"
+"Mark as resolved" = "გადაწყვეტილად მარკირება"
+"Mark as unread" = "წაუკითხავად მარკირება"
+"Mark as unresolved" = "გადაუწყვეტლად მარკირება"
+"Marker" = "მარკერი"
+"Mask" = "ნიღაბი"
+"Mass · Stiffness · Damping" = "მასა · სიხისტე · მილევა"
+"Match (empty: the whole name)" = "დამთხვევა (ცარიელი: მთელი სახელი)"
+"Max H" = "მაქს. H"
+"Max W" = "მაქს. W"
+"Max lines" = "მაქს. სტრიქონები"
+"Maximize" = "გაშლა"
+"May" = "მაი"
+"Measure to the selection" = "მონიშნულამდე გაზომვა"
+"Measurements" = "გაზომვები"
+"Merge into main" = "მთავარში შერწყმა"
+"Merge regions" = "არეების შერწყმა"
+"Merge the branch into the main file (one undo step) and archive it" = "განშტოების მთავარ ფაილთან შერწყმა (დაბრუნების ერთი ნაბიჯი) და მისი დაარქივება"
+"Merged" = "შერწყმულია"
+"Merged PRs" = "გაერთიანებული PR-ები"
+"Min H" = "მინ. H"
+"Min W" = "მინ. W"
+"Minimize" = "ჩაკეცვა"
+"Minutes" = "წუთები"
+"Mirror angle" = "კუთხის არეკვლა"
+"Mirror angle and length" = "კუთხისა და სიგრძის არეკვლა"
+"Mirroring" = "არეკვლა"
+"Missing" = "აკლია"
+"Missing fonts" = "მიუწვდომელი შრიფტები"
+"Missing layer" = "შრე ვერ მოიძებნა"
+"Missing style" = "სტილი ვერ მოიძებნა"
+"Missing variable" = "ცვლადი ვერ მოიძებნა"
+"Miter" = "მახვილი"
+"Miter angle" = "მახვილის კუთხე"
+"Mixed" = "შერეული"
+"Mixed fonts" = "შერეული შრიფტები"
+"Mixed interactions: click + to replace them" = "შერეული ურთიერთქმედებები: დაწკაპეთ +, რომ ჩაანაცვლოთ"
+"Mobile app" = "მობილური აპი"
+"Mode" = "რეჟიმი"
+"Model" = "მოდელი"
+"Models" = "მოდელები"
+"Mono" = "მონო"
+"More" = "მეტი"
+"More instance actions" = "ინსტანსის სხვა მოქმედებები"
+"Mouse down" = "თაგუნას დაჭერა"
+"Mouse enter" = "თაგუნას შესვლა"
+"Mouse leave" = "მაჩვენებლის გასვლა"
+"Mouse up" = "თაგუნას აშვება"
+"Move along the toolbar or the layer rows" = "ხელსაწყოთა ზოლში ან შრეების სტრიქონებში გადაადგილება"
+"Move" = "გადაადგილება"
+"Move column left" = "სვეტის მარცხნივ გადატანა"
+"Move column right" = "სვეტის მარჯვნივ გადატანა"
+"Move down" = "ჩამოწევა"
+"Move in" = "შიგნით გადატანა"
+"Move out" = "გარეთ გადატანა"
+"Move tools" = "გადაადგილების ხელსაწყოები"
+"Move up" = "აწევა"
+"Moved to {name}" = "გადატანილია: {name}"
+"Multi" = "მრავალი"
+"Multiply" = "გამრავლება"
+"Muted" = "მკრთალი"
+"Name" = "სახელი"
+"Name (A–Z)" = "სახელი (ა–ჰ)"
+"Named instance" = "დასახელებული ინსტანსი"
+"Navigate to" = "გადასვლა"
+"Nested instance" = "ჩადგმული ინსტანსი"
+"New board" = "ახალი დაფა"
+"New design file" = "ახალი დიზაინის ფაილი"
+"Newest first" = "ჯერ უახლესი"
+"Next or previous control in the focused region" = "ფოკუსირებულ არეში შემდეგი ან წინა მართვის ელემენტი"
+"Next frame" = "შემდეგი ჩარჩო"
+"Next ready for dev" = "შემდეგი მზად დეველოპერისთვის"
+"Next size option" = "ზომის შემდეგი ვარიანტი"
+"No assets: no export settings, icons or images. Add export settings in the Design tab." = "რესურსები არ არის: არც ექსპორტის პარამეტრები, არც ხატულები, არც გამოსახულებები. ექსპორტის პარამეტრები დაამატეთ „დიზაინის“ ჩანართზე."
+"No boolean variables fit here." = "აქ არცერთი ლოგიკური ცვლადი არ ერგება."
+"No boolean variables yet. Create them in Local variables." = "ლოგიკური ცვლადები ჯერ არ არის. შექმენით ისინი ლოკალურ ცვლადებში."
+"No branches. A branch is a copy of the file to try changes in, then review and merge." = "განშტოებები არ არის. განშტოება ფაილის ასლია, რომელშიც ცვლილებებს ცდით, შემდეგ კი განიხილავთ და შერწყამთ."
+"No category" = "კატეგორიის გარეშე"
+"No changes" = "ცვლილებები არ არის"
+"No color styles" = "ფერის სტილები არ არის"
+"No colour variables fit here." = "აქ არცერთი ფერის ცვლადი არ ერგება."
+"No colour variables yet. Create them in Local variables." = "ფერის ცვლადები ჯერ არ არის. შექმენით ისინი ლოკალურ ცვლადებში."
+"No comments yet" = "კომენტარები ჯერ არ არის"
+"No compatibility warnings reported" = "თავსებადობის გაფრთხილებები არ დაფიქსირებულა"
+"No components yet. Select layers and press {keys}." = "კომპონენტები ჯერ არ არის. მონიშნეთ შრეები და დააჭირეთ {keys}."
+"No conflicts." = "კონფლიქტები არ არის."
+"No contributor data was built into this copy." = "ამ ასლში მონაწილეების მონაცემები არ არის ჩაშენებული."
+"No device" = "მოწყობილობის გარეშე"
+"No fonts match" = "შესაბამისი შრიფტი არ მოიძებნა"
+"No files or templates match your search" = "ძიების შესაბამისი ფაილი ან შაბლონი არ მოიძებნა"
+"No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "აქ შეერთების კოდი არ არის (სერვერი შეერთების კოდებზე ძველია, ან ეს მისამართი კოდში ვერ ეტევა): ამის ნაცვლად გააზიარეთ ბმული."
+"No layer changes to show." = "საჩვენებელი შრეების ცვლილებები არ არის."
+"No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "ბიბლიოთეკები ჯერ არ არის. დაამატეთ ბიბლიოთეკად გამოქვეყნებული .figcraft ფაილი ან ჩასვით გუნდის ბიბლიოთეკის ბმული."
+"No list" = "სიის გარეშე"
+"No matching comments" = "შესაბამისი კომენტარი არ მოიძებნა"
+"No matching components" = "შესაბამისი კომპონენტი არ მოიძებნა"
+"No matching layers" = "შესაბამისი შრე არ მოიძებნა"
+"No matching styles" = "შესაბამისი სტილი არ მოიძებნა"
+"No matching variables" = "შესაბამისი ცვლადი არ მოიძებნა"
+"No mirroring" = "არეკვლის გარეშე"
+"No model credits were built into this copy." = "ამ ასლში მოდელების მონაცემები არ არის ჩაშენებული."
+"No number variables fit here." = "აქ არცერთი რიცხვითი ცვლადი არ ერგება."
+"No number variables yet. Create them in Local variables." = "რიცხვითი ცვლადები ჯერ არ არის. შექმენით ისინი ლოკალურ ცვლადებში."
+"No other pages" = "სხვა გვერდები არ არის"
+"No paints" = "საღებავების გარეშე"
+"No plugins on {server}." = "{server}-ზე პლაგინები არ არის."
+"No plugins yet. Import a development plugin from its figcraft-plugin.json." = "პლაგინები ჯერ არ არის. დეველოპერის პლაგინის იმპორტი მოახდინეთ მისი figcraft-plugin.json-იდან."
+"No preferred components" = "სასურველი კომპონენტების გარეშე"
+"No preset" = "პრესეტის გარეშე"
+"No saved versions yet. Save a version to mark a point in your work you can come back to." = "შენახული ვერსიები ჯერ არ არის. შეინახეთ ვერსია, რომ მონიშნოთ თქვენი სამუშაოს წერტილი, სადაც შეგიძლიათ დაბრუნდეთ."
+"No scrolling" = "გადახვევის გარეშე"
+"No shortcuts match" = "შესაბამისი მალსახმობი არ მოიძებნა"
+"No status" = "სტატუსის გარეშე"
+"No string variables fit here." = "აქ არცერთი სტრიქონული ცვლადი არ ერგება."
+"No string variables yet. Create them in Local variables." = "სტრიქონული ცვლადები ჯერ არ არის. შექმენით ისინი ლოკალურ ცვლადებში."
+"No styles yet." = "სტილები ჯერ არ არის."
+"No styles yet. Click + to create one from the selection." = "სტილები ჯერ არ არის. დაწკაპეთ +, რომ მონიშნულიდან შექმნათ."
+"No templates match your search" = "ძიების შესაბამისი შაბლონი არ მოიძებნა"
+"No text styles yet. Click + to create one from the selected text." = "ტექსტის სტილები ჯერ არ არის. დაწკაპეთ +, რომ მონიშნული ტექსტიდან შექმნათ."
+"No variables fit here." = "აქ არცერთი ცვლადი არ ერგება."
+"No variables yet. Create them in Local variables." = "ცვლადები ჯერ არ არის. შექმენით ისინი ლოკალურ ცვლადებში."
+"No votes yet" = "ხმები ჯერ არ არის"
+"Nobody else is here yet" = "აქ ჯერ სხვა არავინ არის"
+"Noise" = "ხმაური"
+"None" = "არცერთი"
+"None." = "არაფერი."
+"Normal" = "ჩვეულებრივი"
+"Not bound" = "მიბმული არ არის"
+"Not in a live session" = "ცოცხალ სესიაში არ ხართ"
+"Not in this font" = "ამ შრიფტში არ არის"
+"Not properties, kept as written: {names}" = "არ არის თვისებები, დარჩა დაწერილი სახით: {names}"
+"Not read yet" = "ჯერ არ არის წაკითხული"
+"Not shared" = "არ არის გაზიარებული"
+"Note {n}" = "შენიშვნა {n}"
+"Nothing changed since this was marked ready for dev." = "მას შემდეგ, რაც მზად დეველოპერისთვის მოინიშნა, არაფერი შეცვლილა."
+"Nothing here yet. Set a frame's status to list it." = "აქ ჯერ არაფერია. ჩარჩოს სიაში გამოსაჩენად მიანიჭეთ სტატუსი."
+"Nothing online yet. Use Share on a file to put it online and it is listed here." = "ონლაინ ჯერ არაფერია. ფაილის ონლაინ განსათავსებლად გამოიყენეთ „გაზიარება“ და ის აქ გამოჩნდება."
+"Nothing to export" = "საექსპორტო არაფერია"
+"Nov" = "ნოე"
+"Now" = "ახლა"
+"Nudge (Shift: big nudge)" = "მცირედ გადაწევა (Shift: დიდი ბიჯით)"
+"Nudge amount" = "მცირედ გადაწევის ბიჯი"
+"Number" = "რიცხვი"
+"Number ↑" = "რიცხვი ↑"
+"Number ↓" = "რიცხვი ↓"
+"Numbered list" = "დანომრილი სია"
+"Object" = "ობიექტი"
+"Oct" = "ოქტ"
+"Off" = "გამორთული"
+"Offered first when filling the slot (any content is allowed)" = "სლოტის შევსებისას პირველად შემოთავაზებული (ნებისმიერი შიგთავსი დასაშვებია)"
+"Offered first when swapping the instance (any component is allowed)" = "ინსტანსის ჩანაცვლებისას პირველად შემოთავაზებული (ნებისმიერი კომპონენტი დასაშვებია)"
+"Offset" = "წანაცვლება"
+"Oldest first" = "ჯერ უძველესი"
+"On click" = "დაწკაპუნებით"
+"On drag" = "გადათრევისას"
+"On this page" = "ამ გვერდზე"
+"One announcement in five common sizes: square, portrait, story, link and banner" = "ერთი განცხადება ხუთ პოპულარულ ზომაში"
+"Online" = "ონლაინ"
+"Online files" = "ონლაინ ფაილები"
+"Online sharing is off: files are shared on the local network only." = "ონლაინ გაზიარება გამორთულია: ფაილები მხოლოდ ლოკალურ ქსელში ზიარდება."
+"Only the first changed layers are listed." = "ნაჩვენებია მხოლოდ პირველი შეცვლილი შრეები."
+"Only the first {n} changed layers are listed." = "ნაჩვენებია მხოლოდ პირველი შეცვლილი შრეები. შრე: {n}."
+"Only your threads" = "მხოლოდ თქვენი მიმოწერები"
+"Opacity" = "გაუმჭვირვალობა"
+"Opacity & blend" = "გაუმჭვირვალობა და შერევა"
+"Opacity 10%…90%, 0: 100%" = "გაუმჭვირვალობა 10%…90%, 0: 100%"
+"Open" = "გახსნა"
+"Open .figcraft, .svg or images" = ".figcraft, .svg ან გამოსახულებების გახსნა"
+"Open branch" = "განშტოების გახსნა"
+"Open file" = "ფაილის გახსნა"
+"Open files" = "გახსნილი ფაილები"
+"Open in focus view" = "ფოკუსის ხედში გახსნა"
+"Open in new window" = "გახსნა ახალ ფანჯარაში"
+"Open invite links in FigCraft" = "მოსაწვევი ბმულების FigCraft-ში გახსნა"
+"Open link" = "ბმულის გახსნა"
+"Open link {url}" = "ბმულის გახსნა {url}"
+"Open overlay" = "გადაფარვის გახსნა"
+"Open prototype preview" = "პროტოტიპის წინასწარი ნახვის გახსნა"
+"Open variables ({count})" = "ცვლადების გახსნა ({count})"
+"Opened as a new document" = "გაიხსნა ახალ დოკუმენტად"
+"Opened “{name}” in a new tab" = "„{name}“ გაიხსნა ახალ ჩანართში"
+"Opening the file…" = "ფაილის გახსნა…"
+"Opening {n} files as new files" = { one = "ახალ ფაილად გახსნა", other = "ახალ ფაილებად გახსნა: {n}" }
+"Open|comments" = "გახსნა"
+"Options" = "პარამეტრები"
+"Orange" = "ნარინჯისფერი"
+"Order" = "რიგი"
+"Other apps may not open every .fig file exported here." = "სხვა აპებმა შეიძლება ვერ გახსნან აქ ექსპორტირებული ყველა .fig ფაილი."
+"Other" = "სხვა"
+"Others lose access and keep their copy; the file stays on the server for you" = "სხვები კარგავენ წვდომას და ინარჩუნებენ თავიანთ ასლს; ფაილი სერვერზე თქვენთვის რჩება"
+"Others type this under Share ▸ Join with a code" = "სხვები ამას შეიყვანენ აქ: გაზიარება ▸ კოდით შეერთება"
+"Outline stroke" = "კონტურის ფიგურად გარდაქმნა"
+"Outline text" = "ტექსტის კონტურებად გარდაქმნა"
+"Outlines" = "კონტურები"
+"Outside" = "გარეთ"
+"Overflow" = "გადავსება"
+"Overlay" = "ზედდება"
+"Overlay position" = "გადაფარვის პოზიცია"
+"Overridden here (the collection it extends has another value)" = "აქ შეცვლილია (კოლექციას, რომელსაც აფართოებს, სხვა მნიშვნელობა აქვს)"
+"Overrides" = "გადაფარვები"
+"Owner token" = "მფლობელის ტოკენი"
+"Owner token copied" = "მფლობელის ტოკენი დაკოპირდა"
+"PDF print options" = "PDF-ის ბეჭდვის პარამეტრები"
+"PDF print settings" = "PDF-ის ბეჭდვის პარამეტრები"
+"Padding" = "შიდა დაშორება"
+"Page" = "გვერდი"
+"Pages" = "გვერდები"
+"Pages added to the document" = "გვერდები დაემატა დოკუმენტს"
+"Pause" = "პაუზა"
+"Pink" = "ვარდისფერი"
+"Placed on the current page" = "განთავსდა მიმდინარე გვერდზე"
+"Pages: {pages}" = "გვერდი: {pages}"
+"Paint bucket" = "საღებავის ვედრო"
+"Pan the canvas" = "ტილოს გადაადგილება"
+"Pan with nothing selected (Shift: farther)" = "გადაადგილება, როცა არაფერია მონიშნული (Shift: უფრო შორს)"
+"Panels" = "პანელები"
+"Paper" = "ქაღალდი"
+"Paragraph indent" = "აბზაცის შეწევა"
+"Paragraph indent applies to left-aligned text" = "აბზაცის შეწევა ვრცელდება მარცხნივ სწორებულ ტექსტზე"
+"Paragraph spacing" = "აბზაცთა ინტერვალი"
+"Pass through" = "გატარება"
+"Paste a link (https://…)" = "ჩასვით ბმული (https://…)"
+"Paste a team library link (a view link)" = "ჩასვით გუნდის ბიბლიოთეკის ბმული (ნახვის ბმული)"
+"Paste here" = "აქ ჩასმა"
+"Paste to replace" = "ჩასმა ჩასანაცვლებლად"
+"Pasted design layers; {n} kinds of content were left out" = { one = "ჩასმულია დიზაინის შრეები; გამოტოვებული შიგთავსის სახეობა: {n}", other = "ჩასმულია დიზაინის შრეები; გამოტოვებული შიგთავსის სახეობა: {n}" }
+"Pattern" = "პატერნი"
+"Pattern alignment" = "პატერნის სწორება"
+"Pattern scale" = "პატერნის მასშტაბი"
+"Pattern source" = "პატერნის წყარო"
+"Pen" = "კალამი"
+"Pencil" = "ფანქარი"
+"People in this file" = "ამ ფაილში მყოფი ადამიანები"
+"People join from anywhere with a code. The file is kept on {server} while you share it." = "ადამიანები ნებისმიერი ადგილიდან კოდით უერთდებიან. სანამ აზიარებთ, ფაილი {server}-ზე ინახება."
+"People on your network join with a code. Nothing goes through a server." = "თქვენი ქსელის ადამიანები კოდით უერთდებიან. სერვერზე არაფერი გადის."
+"Phone" = "ტელეფონი"
+"Pick color" = "ფერის არჩევა"
+"Pick color (I)" = "ფერის აღება (I)"
+"Pick one font family first" = "ჯერ აირჩიეთ ერთი შრიფტის ოჯახი"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "ჩარჩოს ხელსაწყოთი გადაათრიეთ ან აირჩიეთ ზომა"
+"Pin a property" = "თვისების მიმაგრება"
+"Pinch" = "მოჭყლეტა"
+"Pixel grid" = "პიქსელური ბადე"
+"Pixel preview 1x" = "პიქსელების წინასწარი ნახვა 1x"
+"Pixel preview 2x" = "პიქსელების წინასწარი ნახვა 2x"
+"Place a shape or frame (its tool chosen)" = "ფიგურის ან ჩარჩოს განთავსება (არჩეული ხელსაწყოთი)"
+"Place automatically" = "ავტომატურად განთავსება"
+"Place image" = "გამოსახულების განთავსება"
+"Plugin" = "პლაგინი"
+"Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "პლაგინები FigCraft-ის იზოლირებულ გარემოში მუშაობს, ფაილების, ქსელისა და საათის გარეშე. დააინსტალირეთ მხოლოდ სანდო პლაგინები."
+"Plugins" = "პლაგინები"
+"Plugins & widgets" = "პლაგინები და ვიჯეტები"
+"Plus darker" = "პლუს მუქი"
+"Plus lighter" = "პლუს ღია"
+"Plus one" = "პლუს ერთი"
+"Point" = "წერტილი"
+"Points" = "წერტილები"
+"Polygon" = "მრავალკუთხედი"
+"Polygons" = "მრავალკუთხედები"
+"Port" = "პორტი"
+"Position" = "პოზიცია"
+"Post" = "გაგზავნა"
+"Preferences" = "პარამეტრები"
+"Preferred" = "სასურველი"
+"Present" = "წარდგენა"
+"Present or preview" = "წარდგენა ან წინასწარი ნახვა"
+"Present this flow" = "ამ ნაკადის წარდგენა"
+"Presentation" = "პრეზენტაცია"
+"Presentation slides" = "პრეზენტაციის სლაიდები"
+"Presenting: comments" = "წარდგენა: კომენტარები"
+"Presenting: cycle the size options" = "წარდგენა: ზომის ვარიანტების მონაცვლეობა"
+"Presenting: full screen" = "წარდგენა: სრული ეკრანი"
+"Presenting: next frame" = "წარდგენა: შემდეგი ჩარჩო"
+"Presenting: previous frame" = "წარდგენა: წინა ჩარჩო"
+"Presenting: restart" = "წარდგენა: თავიდან დაწყება"
+"Preserve scroll position" = "გადახვევის პოზიციის შენარჩუნება"
+"Presets" = "პრესეტები"
+"Press a key…" = "დააჭირეთ კლავიშს…"
+"Playground" = "საცდელი სივრცე"
+"Preview" = "წინასწარი ნახვა"
+"Preview this flow" = "ამ ნაკადის წინასწარი ნახვა"
+"Preview this frame" = "ამ ჩარჩოს წინასწარი ნახვა"
+"Previous frame" = "წინა ჩარჩო"
+"Previous ready for dev" = "წინა მზად დეველოპერისთვის"
+"Progressive" = "პროგრესული"
+"Properties" = "თვისებები"
+"Prototype" = "პროტოტიპი"
+"Prototype preview" = "პროტოტიპის წინასწარი ნახვა"
+"Prototype settings" = "პროტოტიპის პარამეტრები"
+"Publish" = "გამოქვეყნება"
+"Publish changes" = "ცვლილებების გამოქვეყნება"
+"Publish to another server…" = "სხვა სერვერზე გამოქვეყნება…"
+"Publish to server" = "სერვერზე გამოქვეყნება"
+"Published version {v}" = "გამოქვეყნდა ვერსია {v}"
+"Published version {v} to the server" = "ვერსია {v} გამოქვეყნდა სერვერზე"
+"Published version {v}: save the file so other files can use it" = "გამოქვეყნდა ვერსია {v}: შეინახეთ ფაილი, რომ სხვა ფაილებმა შეძლონ მისი გამოყენება"
+"Published · {people}" = "გამოქვეყნებულია · {people}"
+"Publishing to a server needs the desktop app; in the browser you can join a server's files" = "სერვერზე გამოსაქვეყნებლად სამუშაო მაგიდის აპია საჭირო; ბრაუზერში შეგიძლიათ სერვერის ფაილებს შეუერთდეთ"
+"Publishing with the server's key." = "ქვეყნდება სერვერის გასაღებით."
+"Publishing…" = "გამოქვეყნება…"
+"Push" = "ბიძგი"
+"Push changes to main component" = "ცვლილებების მთავარ კომპონენტში გადაგზავნა"
+"Put text on path" = "ტექსტის ტრაექტორიაზე განთავსება"
+"Question" = "კითხვა"
+"R" = "R"
+"Radial" = "რადიალური"
+"Radius" = "რადიუსი"
+"Ratio" = "თანაფარდობა"
+"Reading the library…" = "ბიბლიოთეკის წაკითხვა…"
+"Ready for dev" = "მზადაა დეველოპერისთვის"
+"Real name" = "ნამდვილი სახელი"
+"Recent" = "ბოლოდროინდელი"
+"Recent files" = "ბოლოს გახსნილი ფაილები"
+"Recents" = "ბოლოდროინდელი"
+"Recovered {n} unsaved files after the app quit unexpectedly: save them to keep them" = { one = "აპის მოულოდნელი დახურვის შემდეგ აღდგა შეუნახავი ფაილი: შესანარჩუნებლად შეინახეთ", other = "აპის მოულოდნელი დახურვის შემდეგ აღდგა შეუნახავი ფაილი: {n}. შესანარჩუნებლად შეინახეთ" }
+"Rectangle" = "მართკუთხედი"
+"Rectangles" = "მართკუთხედები"
+"Red" = "წითელი"
+"Reduce motion" = "მოძრაობის შემცირება"
+"Refraction" = "გარდატეხა"
+"Regular expression" = "რეგულარული გამოსახულება"
+"Relative to" = "მიმართ"
+"Remove" = "წაშლა"
+"Remove all" = "ყველას წაშლა"
+"Remove annotation" = "ანოტაციის წაშლა"
+"Remove auto layout" = "ავტოგანლაგების მოხსნა"
+"Remove column" = "სვეტის წაშლა"
+"Remove dev resource" = "დეველოპერის რესურსის წაშლა"
+"Remove export setting" = "ექსპორტის პარამეტრის წაშლა"
+"Remove from recents" = "ბოლოდროინდელებიდან ამოშლა"
+"Remove from server" = "სერვერიდან წაშლა"
+"Remove from server…" = "სერვერიდან წაშლა…"
+"Remove guide" = "დამხმარე ხაზის მოცილება"
+"Remove interaction" = "ურთიერთქმედების წაშლა"
+"Remove library from this file" = "ბიბლიოთეკის ამ ფაილიდან ამოშლა"
+"Remove measurement" = "გაზომვის წაშლა"
+"Remove min and max" = "მინ. და მაქს. მოხსნა"
+"Remove min and max height" = "მინ. და მაქს. სიმაღლის მოხსნა"
+"Remove min and max width" = "მინ. და მაქს. სიგანის მოხსნა"
+"Remove regions" = "არეების წაშლა"
+"Remove row" = "მწკრივის წაშლა"
+"Remove slot" = "სლოტის მოხსნა"
+"Remove starting point" = "საწყისი წერტილის წაშლა"
+"Remove stop" = "გადასვლის წერტილის წაშლა"
+"Remove text from path" = "ტექსტის ტრაექტორიიდან მოხსნა"
+"Remove the else and its actions" = "„სხვა შემთხვევაში“ და მისი მოქმედებების წაშლა"
+"Remove this condition and its actions" = "ამ პირობისა და მისი მოქმედებების წაშლა"
+"Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "წაიშალოს ეს ფაილი სერვერიდან? იქიდან მისი გაზიარება ან გახსნა აღარ იქნება შესაძლებელი. თქვენი ასლი აქ ღია რჩება."
+"Remove {name} from session" = "სესიიდან მოცილება: {name}"
+"Remove {name} from {server}?" = "წაიშალოს {name} {server}-იდან?"
+"Removed" = "წაშლილია"
+"Removed from the server" = "წაიშალა სერვერიდან"
+"Removed since it was marked" = "წაიშალა მონიშვნის შემდეგ"
+"Rename" = "სახელის შეცვლა"
+"Rename duplicated layers" = "დუბლირებული შრეების სახელის შეცვლა"
+"Rename folder" = "საქაღალდის სახელის შეცვლა"
+"Rename group" = "ჯგუფის სახელის შეცვლა"
+"Rename layers" = "შრეების სახელის შეცვლა"
+"Rename mode" = "რეჟიმის სახელის შეცვლა"
+"Rename on the server" = "სახელის შეცვლა სერვერზე"
+"Rename on the server…" = "სახელის შეცვლა სერვერზე…"
+"Rename page" = "გვერდის სახელის შეცვლა"
+"Rename to" = "ახალი სახელი"
+"Replace all" = "ყველას ჩანაცვლება"
+"Replace mixed export settings" = "შერეული ექსპორტის პარამეტრების ჩანაცვლება"
+"Replace with" = "ჩანაცვლება:"
+"Replace with a new interaction" = "ახალი ურთიერთქმედებით ჩანაცვლება"
+"Reply" = "პასუხი"
+"Report" = "საჩივარი"
+"Report this file…" = "ამ ფაილზე საჩივარი…"
+"Reset" = "ჩამოყრა"
+"Reset adjustments" = "კორექციების ჩამოყრა"
+"Reset all changes" = "ყველა ცვლილების ჩამოყრა"
+"Reset all overrides on this layer" = "ამ შრის ყველა გადაფარვის ჩამოყრა"
+"Reset overrides" = "გადაფარვების ჩამოყრა"
+"Reset slot" = "სლოტის ჩამოყრა"
+"Reset this override" = "ამ გადაფარვის ჩამოყრა"
+"Reset to style" = "სტილზე ჩამოყრა"
+"Reset to the inherited value" = "მემკვიდრეობით მიღებულ მნიშვნელობაზე ჩამოყრა"
+"Resize by the nudge amount" = "ზომის შეცვლა მცირედ გადაწევის ბიჯით"
+"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "ჩარჩოების ზომის მორგება მოწყობილობის ეკრანზე (ან ფანჯარაზე, თუ მოწყობილობა არ არის): მათი შეზღუდვები და ავტოგანლაგება რეაგირებს"
+"Resize to fit" = "ზომის მორგება"
+"Resizing" = "ზომის შეცვლა"
+"Resolve" = "გადაწყვეტა"
+"Resolve change" = "ცვლილების გადაწყვეტა"
+"Resolved" = "გადაწყვეტილია"
+"Resources" = "რესურსები"
+"Responsive" = "ადაპტური"
+"Restart" = "გადატვირთვა"
+"Restore" = "აღდგენა"
+"Restore main component" = "მთავარი კომპონენტის აღდგენა"
+"Restore this version" = "ამ ვერსიის აღდგენა"
+"Restored “{name}”" = "„{name}“ აღდგა"
+"Retrospective" = "რეტროსპექტივა"
+"Results" = "შედეგები"
+"Resume" = "გაგრძელება"
+"Reverse the order" = "რიგის შებრუნება"
+"Reversed triangle" = "შებრუნებული სამკუთხედი"
+"Review and merge" = "განხილვა და შერწყმა"
+"Ribbon" = "ლენტი"
+"Right" = "მარჯვნივ"
+"Right side" = "მარჯვენა მხარე"
+"Right side width" = "მარჯვენა მხარის სიგანე"
+"Rotate 90°" = "90°-ით შემობრუნება"
+"Rotate 90° right" = "90°-ით მარჯვნივ შემობრუნება"
+"Rotate to landscape" = "ჰორიზონტალურად შემობრუნება"
+"Rotate to portrait" = "ვერტიკალურად შემობრუნება"
+"Rotation" = "შემობრუნება"
+"Rotation jitter" = "შემობრუნების ცვალებადობა"
+"Round" = "მომრგვალებული"
+"Rounded" = "მომრგვალებული"
+"Rounded rectangle" = "მომრგვალებული მართკუთხედი"
+"Row" = "სტრიქონი"
+"Row gap" = "სტრიქონებს შორის შუალედი"
+"Row sizes" = "სტრიქონების ზომები"
+"Row span" = "სტრიქონების გაერთიანება"
+"Rows" = "სტრიქონები"
+"Rows {count}" = "სტრიქონები {count}"
+"Rulers" = "სახაზავები"
+"Run" = "გაშვება"
+"Run {label}" = "გაშვება: {label}"
+"Save file" = "ფაილის შენახვა"
+"Save files automatically" = "ფაილების ავტომატურად შენახვა"
+"Search templates" = "შაბლონების ძიება"
+"See all templates" = "ყველა შაბლონის ნახვა"
+"Select layers and they space themselves as their content changes" = "შრეები შიგთავსის ცვლილებისას თავად დაშორდება"
+"SHA-256: {sha}…" = "SHA-256: {sha}…"
+"Same as layer" = "შრის მსგავსად"
+"Saturation" = "გაჯერება"
+"Save" = "შენახვა"
+"Save as" = "შენახვა როგორც"
+"Save as preset…" = "პრესეტად შენახვა…"
+"Save version  {key}" = "ვერსიის შენახვა  {key}"
+"Saved" = "შენახულია"
+"Saved {name}" = "შენახულია {name}"
+"Say something" = "დაწერეთ რამე"
+"Scale" = "მასშტაბი"
+"Scatter" = "გაბნევა"
+"Scoping: where pickers offer it" = "არე: სად სთავაზობენ ამომრჩევები"
+"Screen" = "ეკრანი"
+"Scroll behavior" = "გადახვევის ქცევა"
+"Scroll to" = "გადახვევა:"
+"Scroll to layer" = "შრემდე გადახვევა"
+"Scroll with parent" = "მშობელთან ერთად გადახვევა"
+"Search plugins" = "პლაგინების ძიება"
+"Search" = "ძიება"
+"Search actions, layers and tools" = "მოქმედებების, შრეებისა და ხელსაწყოების ძიება"
+"Search assets" = "რესურსების ძიება"
+"Search comments" = "კომენტარების ძიება"
+"Search files and templates" = "ფაილებისა და შაბლონების ძიება"
+"Search results" = "ძიების შედეგები"
+"Search fonts" = "შრიფტების ძიება"
+"Search layers" = "შრეების ძიება"
+"Search shortcuts" = "მალსახმობების ძიება"
+"Section" = "სექცია"
+"Section color" = "სექციის ფერი"
+"Sections" = "სექციები"
+"Select a frame and add a starting point to present it as a flow." = "მონიშნეთ ჩარჩო და დაამატეთ საწყისი წერტილი, რომ ნაკადად წარადგინოთ."
+"Select a frame to preview it" = "მონიშნეთ ჩარჩო მისი წინასწარი ნახვისთვის"
+"Select a layer to see its properties and code" = "მონიშნეთ შრე მისი თვისებებისა და კოდის სანახავად"
+"Select all" = "ყველაფრის მონიშვნა"
+"Select all with same" = "ყველაფრის მონიშვნა იგივე"
+"Select layer" = "შრის მონიშვნა"
+"Select layers to apply the style to" = "მონიშნეთ შრეები, რომლებზეც სტილი უნდა გამოიყენოთ"
+"Select layers with this color" = "ამ ფერის შრეების მონიშვნა"
+"Select overlapping shapes" = "გადაფარული ფიგურების მონიშვნა"
+"Select points to edit their position, radius and mirroring" = "მონიშნეთ წერტილები მათი პოზიციის, რადიუსისა და არეკვლის შესაცვლელად"
+"Select slot" = "სლოტის მონიშვნა"
+"Selection colors" = "მონიშნულის ფერები"
+"Selection" = "მონიშნული"
+"Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "მონიშვნის ჩარჩო, {w} × {h}, მდებარეობა {x}, {y}: ისრები გადააადგილებს, Shift+ისრები ან {cmd}+ისრები ზომას ცვლის, Enter მონიშნავს, Escape გააუქმებს"
+"Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "მონიშვნის ჩარჩო: ისრები გადააადგილებს, Shift+ისრები ან {cmd}+ისრები ზომას ცვლის, Enter მონიშნავს, Escape გააუქმებს"
+"Send backward" = "უკან გადატანა"
+"Send report" = "საჩივრის გაგზავნა"
+"Send to back" = "უკანა პლანზე გადატანა"
+"Sep" = "სექ"
+"Server address (ws://host:47900/)" = "სერვერის მისამართი (ws://host:47900/)"
+"Server address" = "სერვერის მისამართი"
+"Server for online sharing" = "ონლაინ გაზიარების სერვერი"
+"Set as default" = "ნაგულისხმევად დაყენება"
+"Set variable" = "ცვლადის დაყენება"
+"Set variable mode" = "ცვლადის რეჟიმის დაყენება"
+"Set variable {name}" = "ცვლადის დაყენება: {name}"
+"Set {name} to {value}" = "{name}-ისთვის {value}-ის დაყენება"
+"Shadows" = "ჩრდილები"
+"Shape" = "ფიგურა"
+"Shape builder" = "ფიგურების კონსტრუქტორი"
+"Shape tools" = "ფიგურის ხელსაწყოები"
+"Shapes" = "ფიგურები"
+"Share" = "გაზიარება"
+"Share this file" = "ამ ფაილის გაზიარება"
+"Share with a code" = "კოდით გაზიარება"
+"Share: live session, export" = "გაზიარება: ცოცხალი სესია, ექსპორტირება"
+"Shared" = "გაზიარებულია"
+"Shared: copy its code from the file's menu" = "გაზიარებულია: მისი კოდი დააკოპირეთ ფაილის მენიუდან"
+"Sharing a file needs the desktop app; here you can join one." = "ფაილის გასაზიარებლად სამუშაო მაგიდის აპია საჭირო; აქ შეგიძლიათ შეუერთდეთ."
+"Sharing on the local network (online sharing is off: no server is set in Preferences)." = "ზიარდება ლოკალურ ქსელში (ონლაინ გაზიარება გამორთულია: პარამეტრებში სერვერი არ არის მითითებული)."
+"Sharing on your network · {people}" = "ზიარდება თქვენს ქსელში · {people}"
+"Sharing online · {people}" = "ზიარდება ონლაინ · {people}"
+"Sharing stopped: the file stays on the server, open only to you" = "გაზიარება შეწყდა: ფაილი სერვერზე რჩება და მხოლოდ თქვენთვისაა ღია"
+"Show" = "ჩვენება"
+"Show all templates" = "ყველა შაბლონის ჩვენება"
+"Show as grid" = "ბადის სახით ჩვენება"
+"Show as list" = "სიის სახით ჩვენება"
+"Show autosaves" = "ავტოშენახვების ჩვენება"
+"Show behind transparent areas" = "გამჭვირვალე არეების მიღმა ჩვენება"
+"Show comments (Shift+C)" = "კომენტარების ჩვენება (Shift+C)"
+"Show device frame" = "მოწყობილობის კორპუსის ჩვენება"
+"Show dimensions on objects" = "ზომების ჩვენება ობიექტებზე"
+"Show hotspot hints" = "აქტიური არეების მინიშნებების ჩვენება"
+"Show in Explorer" = "Explorer-ში ჩვენება"
+"Show in Finder" = "Finder-ში ჩვენება"
+"Show in folder" = "საქაღალდეში ჩვენება"
+"Show only this on the canvas" = "ტილოზე მხოლოდ ამის ჩვენება"
+"Show open" = "გახსნილის ჩვენება"
+"Show section contents" = "სექციის შიგთავსის ჩვენება"
+"Show this layer" = "ამ შრის ჩვენება"
+"Show usage" = "გამოყენების ჩვენება"
+"Show/Hide" = "ჩვენება/დამალვა"
+"Show/Hide UI" = "ინტერფეისის ჩვენება/დამალვა"
+"Side by side" = "გვერდიგვერდ"
+"Sidebar" = "გვერდითი ზოლი"
+"Simplify stroke" = "კონტურის გამარტივება"
+"Size" = "ზომა"
+"Size jitter" = "ზომის ცვალებადობა"
+"Skip ink" = "ხაზგასმის გაწყვეტა ასოებთან"
+"Slashed zero" = "გადახაზული ნული"
+"Slice" = "ნაჭერი"
+"Slices" = "ნაჭრები"
+"Slide in" = "შემოსრიალება"
+"Slide out" = "გასრიალება"
+"Slot" = "სლოტი"
+"Slot content" = "სლოტის შიგთავსი"
+"Small capitals" = "პატარა მთავრული"
+"Small caps" = "პატარა მთავრული"
+"Smart animate" = "ჭკვიანი ანიმაცია"
+"Snap to pixel grid" = "პიქსელურ ბადეზე მიბმა"
+"Social and slides" = "სოციალური ქსელები და სლაიდები"
+"Social media" = "სოციალური ქსელები"
+"Social post sizes" = "სოციალური ქსელების პოსტების ზომები"
+"Soft light" = "რბილი ღია"
+"Solid" = "ერთფეროვანი"
+"Some variants have the same property values: give each one a unique combination" = "ზოგ ვარიანტს თვისებების ერთნაირი მნიშვნელობები აქვს: მიეცით თითოეულს უნიკალური კომბინაცია"
+"Sort" = "სორტირება"
+"Sort by" = "სორტირება:"
+"Sort by date" = "თარიღის მიხედვით სორტირება"
+"Sort by page" = "გვერდის მიხედვით სორტირება"
+"Sort by {column}" = "სორტირება: {column}"
+"Space around" = "დაშორება გარშემო"
+"Space between" = "დაშორება შორის"
+"Space drag" = "Space და გადათრევა"
+"Space evenly" = "თანაბარი დაშორება"
+"Space+drag" = "Space+გადათრევა"
+"Spacing" = "ინტერვალი"
+"Spam, stolen work, abuse…" = "სპამი, მოპარული ნამუშევარი, შეურაცხყოფა…"
+"Speech bubble" = "სიტყვის ბუშტი"
+"Splay" = "გაშლილობა"
+"Spotlight me" = "ჩემი ხედის ჩვენება ყველასთვის"
+"Spread" = "გაფართოება"
+"Square" = "კვადრატი"
+"Stamp" = "შტამპი"
+"Stamps" = "შტამპები"
+"Standard" = "სტანდარტული"
+"Standard ligatures" = "სტანდარტული ლიგატურები"
+"Star" = "ვარსკვლავი"
+"Stars" = "ვარსკვლავები"
+"Start" = "დასაწყისი"
+"Start ascending from / stop descending at" = "ზრდადობით დაწყება / კლებადობით დასრულება"
+"Start from a blank canvas" = "ცარიელი ტილოთი დაწყება"
+"Start from a template" = "შაბლონით დაწყება"
+"Start on path" = "დასაწყისი ტრაექტორიაზე"
+"Start point" = "საწყისი წერტილი"
+"Start sharing" = "გაზიარების დაწყება"
+"Start sharing with the Share button, then pass on the code it gives" = "დააჭირეთ „გაზიარებას“ და გადაეცით მიღებული კოდი"
+"Start vote" = "ხმის მიცემის დაწყება"
+"Starting to share…" = "გაზიარების დაწყება…"
+"Status" = "სტატუსი"
+"Sticky" = "მიმაგრებული"
+"Sticky note" = "სტიკერი"
+"Sticky note colors" = "სტიკერების ფერები"
+"Sticky notes" = "სტიკერები"
+"Sticky notes, shapes and connectors" = "სტიკერები, ფიგურები და შემაერთებლები"
+"Stop" = "შეწყვეტა"
+"Stop following {name}" = "{name}-ის მიყოლის შეწყვეტა"
+"Stop session" = "სესიის შეწყვეტა"
+"Stop sharing" = "გაზიარების შეწყვეტა"
+"Stop spotlighting" = "ჩემი ხედის ჩვენების შეწყვეტა"
+"Stop timer" = "ტაიმერის გაჩერება"
+"Stop {n}  {hex}" = "გადასვლის წერტილი {n}  {hex}"
+"Straight" = "სწორი"
+"Stretch" = "გაწელვა"
+"Strikethrough" = "გადახაზული"
+"String" = "ტექსტი"
+"Stroke" = "კონტური"
+"Stroke style" = "კონტურის სტილი"
+"Stroke weight" = "კონტურის სისქე"
+"Strokes" = "კონტურები"
+"Style" = "სტილი"
+"Styles" = "სტილები"
+"Stylistic set 1" = "სტილისტური ნაკრები 1"
+"Stylistic set 2" = "სტილისტური ნაკრები 2"
+"Stylistic set 3" = "სტილისტური ნაკრები 3"
+"Stylistic set 4" = "სტილისტური ნაკრები 4"
+"Stylistic set 5" = "სტილისტური ნაკრები 5"
+"Subtract" = "გამოკლება"
+"Subtracts" = "გამოკლებები"
+"Suffix" = "სუფიქსი"
+"Suspend snapping while dragging" = "მიბმის შეჩერება გადათრევისას"
+"Swap instance" = "ინსტანსის ჩანაცვლება"
+"Swap library: use another library's assets of the same names" = "ბიბლიოთეკის ჩანაცვლება: სხვა ბიბლიოთეკის იმავე სახელის რესურსების გამოყენება"
+"Swap orientation" = "ორიენტაციის შეცვლა"
+"Swap overlay" = "გადაფარვის ჩანაცვლება"
+"Swap to {name}" = "ჩანაცვლება: {name}"
+"Swap width and height" = "სიგანისა და სიმაღლის გაცვლა"
+"Swapped instance" = "ჩანაცვლებული ინსტანსი"
+"Swapped {n} assets" = { one = "ჩანაცვლებული რესურსი: {n}", other = "ჩანაცვლებული რესურსი: {n}" }
+"Swapped {n} assets; {missed} had no match and still use the old library" = { one = "ჩანაცვლებული რესურსი: {n}; {missed} ვერ დაემთხვა და ისევ ძველ ბიბლიოთეკას იყენებს", other = "ჩანაცვლებული რესურსი: {n}; {missed} ვერ დაემთხვა და ისევ ძველ ბიბლიოთეკას იყენებს" }
+"Sweep" = "სიგრძე"
+"System" = "სისტემა"
+"Tab / Shift+Tab" = "Tab / Shift+Tab"
+"Table" = "ცხრილი"
+"Tablet" = "პლანშეტი"
+"Tabular numbers" = "ცხრილური ციფრები"
+"Take the values from the first selected layer" = "მნიშვნელობების აღება პირველი მონიშნული შრიდან"
+"Taper" = "წაწვეტება"
+"Taper both ends" = "ორივე ბოლოს წაწვეტება"
+"Tell the server's operator what is wrong with it" = "აცნობეთ სერვერის ოპერატორს, რა არის მასში არასწორი"
+"Temperature" = "ტემპერატურა"
+"Template" = "შაბლონი"
+"Templates" = "შაბლონები"
+"Terms" = "პირობები"
+"Text" = "ტექსტი"
+"Text align" = "ტექსტის სწორება"
+"Text content" = "ტექსტის შიგთავსი"
+"Text size" = "ტექსტის ზომა"
+"Text style" = "ტექსტის სტილი"
+"Text styles" = "ტექსტის სტილები"
+"Texts" = "ტექსტები"
+"Texture" = "ტექსტურა"
+"The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3." = "ტილო ფერებს sRGB-ში აჩვენებს; ექსპორტირებულ PNG, JPG და WebP ფაილებს Display P3 ჭდე აქვს."
+"The destination document is unavailable. Nothing was imported." = "დანიშნულების დოკუმენტი მიუწვდომელია. იმპორტი არ შესრულდა."
+"The destination document was closed. Nothing was imported." = "დანიშნულების დოკუმენტი დაიხურა. იმპორტი არ შესრულდა."
+"The destination page was removed. Nothing was imported." = "დანიშნულების გვერდი წაიშალა. იმპორტი არ შესრულდა."
+"The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "ფაილი სერვერიდან წაიშლება: იქიდან მის გახსნას ან შეერთებას ვეღარავინ შეძლებს და ამის დაბრუნება შეუძლებელია. ღია ასლები მათ მფლობელებთან რჩება."
+"The file now holds another library" = "ფაილი ახლა სხვა ბიბლიოთეკას შეიცავს"
+"The file now holds another library (\"{name}\")" = "ფაილი ახლა სხვა ბიბლიოთეკას შეიცავს („{name}“)"
+"The files you shared or published online from this computer. They stay on their server until you remove them." = "ფაილები, რომლებიც ამ კომპიუტერიდან ონლაინ გააზიარეთ ან გამოაქვეყნეთ. ისინი თავიანთ სერვერზე რჩება, სანამ არ წაშლით."
+"The link carries the session's secret: share it only with people you invite." = "ბმული სესიის საიდუმლო გასაღებს შეიცავს: გააზიარეთ მხოლოდ მოწვეულ ადამიანებთან."
+"The name in your online files and on the server. The document inside keeps its own name." = "სახელი თქვენს ონლაინ ფაილებსა და სერვერზე. შიგნით არსებული დოკუმენტი თავის სახელს ინარჩუნებს."
+"The selection uses several text styles: click to apply one" = "მონიშნული ტექსტის რამდენიმე სტილს იყენებს: დაწკაპეთ ერთის გამოსაყენებლად"
+"The server deletes this file if nobody opens it before {date}." = "სერვერი ამ ფაილს წაშლის, თუ მას {date}-მდე არავინ გახსნის."
+"The whole file" = "მთელი ფაილი"
+"Theme" = "თემა"
+"There's no destination for that action" = "ამ მოქმედებას დანიშნულება არ აქვს"
+"Thickness" = "სისქე"
+"This branch can't be reviewed: {e}" = "ამ განშტოების განხილვა შეუძლებელია: {e}"
+"This branch was merged or archived." = "ეს განშტოება შერწყმულია ან დაარქივებულია."
+"This computer only" = "მხოლოდ ეს კომპიუტერი"
+"This computer remembers the owner token, so the file can be managed from the home screen's Online list. Copy it to manage the file from somewhere else: it is a password for this file and won't be shown again." = "ეს კომპიუტერი იმახსოვრებს მფლობელის ტოკენს, ამიტომ ფაილის მართვა საწყისი ეკრანის „ონლაინ“ სიიდან შეიძლება. ფაილის სხვა ადგილიდან სამართავად დააკოპირეთ ის: ეს ამ ფაილის პაროლია და აღარ გამოჩნდება."
+"This condition is edited as an expression" = "ეს პირობა ექსპრესიად რედაქტირდება"
+"This file" = "ეს ფაილი"
+"This file has unsaved changes" = "ამ ფაილს შეუნახავი ცვლილებები აქვს"
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "ეს ფაილი იყენებს შრიფტებს, რომლებიც ამ კომპიუტერზე დაინსტალირებული არ არის. მათი ტექსტი სათადარიგო შრიფტით გამოისახება, სანამ მათ არ დააინსტალირებთ."
+"This file is on {server}, open only to you. Share it to let others in with a new code." = "ეს ფაილი {server}-ზეა და მხოლოდ თქვენთვისაა ღია. გააზიარეთ, რომ სხვები ახალი კოდით შემოუშვათ."
+"This frame is new on the branch." = "ეს ჩარჩო განშტოებაში ახალია."
+"This frame isn't on the branch." = "ეს ჩარჩო განშტოებაში არ არის."
+"This server is open to the public: no key needed." = "ეს სერვერი საჯაროა: გასაღები საჭირო არ არის."
+"This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "ამ სერვერს გასაღები სჭირდება: მისამართს დაუმატეთ ?key=… (`figcraft-server key` გამოიტანს მას სერვერის კომპიუტერზე)."
+"This server takes files only with its key: see Advanced." = "ეს სერვერი ფაილებს მხოლოდ გასაღებით იღებს: იხილეთ „დამატებითი“."
+"Thumbs up" = "ცერი ზემოთ"
+"Tidy up" = "მოწესრიგება"
+"Tile" = "ფილებად"
+"Tile type" = "ფილის ტიპი"
+"Timer" = "ტაიმერი"
+"Tint" = "ტონირება"
+"Title" = "დასახელება"
+"Title case" = "სათაურის რეგისტრი"
+"To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "ამ ბიბლიოთეკის გუნდთან გასაზიარებლად გამოაქვეყნეთ ფაილი სერვერზე (გაზიარება ▸ სერვერზე გამოქვეყნება…), შემდეგ იქ გამოაქვეყნეთ ბიბლიოთეკა."
+"To the layer around it" = "გარშემო მყოფ შრემდე"
+"Toggle" = "გადართვა"
+"Toggle light/dark theme" = "ღია/ბნელი თემის გადართვა"
+"Toggle visibility" = "ხილვადობის ჩართვა/გამორთვა"
+"Tools" = "ხელსაწყოები"
+"Top" = "ზემოთ"
+"Top & bottom" = "ზემოთ და ქვემოთ"
+"Top left radius" = "ზედა მარცხენა რადიუსი"
+"Top right radius" = "ზედა მარჯვენა რადიუსი"
+"Transform" = "გარდაქმნა"
+"Triangle" = "სამკუთხედი"
+"Triangle arrow" = "სამკუთხა ისარი"
+"Trigger" = "გამშვები"
+"Trigger layer" = "გამშვები შრე"
+"True" = "ჭეშმარიტი"
+"Truncate text" = "ტექსტის შეკვეცა"
+"Truncate with an ellipsis" = "შეკვეცა მრავალწერტილით"
+"Try again" = "ხელახლა ცდა"
+"Try another search or filter." = "სცადეთ სხვა ძიება ან ფილტრი."
+"Try another search, or browse templates." = "სცადეთ სხვა ძიება ან დაათვალიერეთ შაბლონები."
+"Try another word, or look at every kind." = "სცადეთ სხვა სიტყვა ან ნახეთ ყველა სახეობა."
+"Turn a layer into a component, reuse it, and change every copy at once" = "შრე აქციეთ კომპონენტად და შეცვალეთ ყველა ასლი"
+"Two digits" = "ორი ციფრი"
+"Type" = "ტიპი"
+"Type settings" = "ტექსტის პარამეტრები"
+"Type the join code you were given, or paste an invite link." = "შეიყვანეთ მოცემული შეერთების კოდი ან ჩასვით მოსაწვევი ბმული."
+"Typography" = "ტიპოგრაფია"
+"Underline" = "ხაზგასმული"
+"Undo takes back only your own changes; what others changed since stays." = "დაბრუნება მხოლოდ თქვენს ცვლილებებს აუქმებს; რაც სხვებმა ამასობაში შეცვალეს, რჩება."
+"Ungroup" = "დაჯგუფების მოხსნა"
+"Uniform" = "ერთგვაროვანი"
+"Union" = "გაერთიანება"
+"Unions" = "გაერთიანებები"
+"Unknown — treated as sRGB" = "უცნობი — განიხილება როგორც sRGB"
+"Unread" = "წაუკითხავი"
+"Unresolve" = "ხელახლა გახსნა"
+"Unsaved changes" = "შეუნახავი ცვლილებები"
+"Unsaved changes in {names}. Save them before closing?" = "შეუნახავი ცვლილებები: {names}. შევინახოთ დახურვამდე?"
+"Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "შეუნახავი ცვლილებები: ჯერ შეინახეთ ({save}) ან გასაუქმებლად დახურეთ ჩანართი {alt}+დაწკაპუნებით"
+"Unsaved changes: save first, or close again with {key} to discard" = "შეუნახავი ცვლილებები: ჯერ შეინახეთ ან გასაუქმებლად ხელახლა დახურეთ {key}-ით"
+"Up" = "ზემოთ"
+"Update plugin" = "პლაგინის განახლება"
+"Update" = "განახლება"
+"Update from main" = "მთავარიდან განახლება"
+"Update from selection" = "მონიშნულიდან განახლება"
+"Updated {components} and {styles}" = "განახლდა {components} და {styles}"
+"Updated {name}" = "განახლდა: {name}"
+"Updating the graphics driver often helps. To use OpenGL only, start FigCraft from a Command Prompt with:" = "ხშირად გრაფიკის დრაივერის განახლება შველის. მხოლოდ OpenGL-ის გამოსაყენებლად FigCraft გაუშვით ბრძანების სტრიქონიდან (Command Prompt) ასე:"
+"Updating the graphics driver often helps. WGPU_BACKEND (vulkan, gl, metal) names another graphics API to try." = "ხშირად გრაფიკის დრაივერის განახლება შველის. WGPU_BACKEND-ით (vulkan, gl, metal) შეგიძლიათ სხვა გრაფიკული API სცადოთ."
+"Uploads this file to a FigCraft server and keeps this tab in sync with it. You get a link to edit and a link to view." = "ტვირთავს ამ ფაილს FigCraft-ის სერვერზე და ამ ჩანართს მასთან სინქრონში ინახავს. მიიღებთ რედაქტირებისა და ნახვის ბმულებს."
+"Uppercase" = "მთავრული"
+"Use a fixed value" = "ფიქსირებული მნიშვნელობის გამოყენება"
+"Use an expression, e.g. count + 1" = "ექსპრესიის გამოყენება, მაგ. count + 1"
+"Use as mask" = "ნიღბად გამოყენება"
+"Use auto layout" = "ავტოგანლაგების გამოყენება"
+"Use number keys for opacity" = "გაუმჭვირვალობისთვის ციფრული კლავიშების გამოყენება"
+"Use the .figcraft or .fig extension." = "გამოიყენეთ .figcraft ან .fig გაფართოება."
+"Use the layer's fill" = "შრის შევსების გამოყენება"
+"Used in {files} · {instances}" = "გამოიყენება: {files} · {instances}"
+"Username" = "მომხმარებლის სახელი"
+"Value" = "მნიშვნელობა"
+"Uses variables: each layer shows them in its own mode" = "იყენებს ცვლადებს: თითოეული შრე მათ თავის რეჟიმში აჩვენებს"
+"Variable" = "ცვლადი"
+"Variable collections" = "ცვლადების კოლექციები"
+"Variable modes" = "ცვლადების რეჟიმები"
+"Variable width" = "ცვლადი სიგანე"
+"Variables" = "ცვლადები"
+"Variables JSON…" = "ცვლადების JSON…"
+"Variables store reusable values (colours, numbers, strings, booleans) with modes such as Light and Dark." = "ცვლადები ინახავს ხელახლა გამოსაყენებელ მნიშვნელობებს (ფერები, რიცხვები, სტრიქონები, ლოგიკური მნიშვნელობები) ისეთი რეჟიმებით, როგორიცაა ღია და მუქი."
+"Variant" = "ვარიანტი"
+"Vector" = "ვექტორი"
+"Vectors" = "ვექტორები"
+"Version" = "ვერსია"
+"Version history" = "ვერსიების ისტორია"
+"Version {version}" = "ვერსია {version}"
+"Version {v} · {components} · {styles} · {variables}" = "ვერსია {v} · {components} · {styles} · {variables}"
+"Vertical" = "ვერტიკალური"
+"Vertical align" = "ვერტიკალური სწორება"
+"Vertical hex" = "ვერტიკალური ექვსკუთხედი"
+"Vertical padding" = "ვერტიკალური შიდა დაშორება"
+"Vertical spacing" = "ვერტიკალური დაშორება"
+"Vertical trim" = "ვერტიკალური ჩამოჭრა"
+"View" = "ხედი"
+"View link" = "ნახვის ბმული"
+"View link copied" = "ნახვის ბმული დაკოპირდა"
+"View only" = "მხოლოდ ნახვა"
+"View only: you see every change as it happens but can't edit. Leave to keep a copy you can edit." = "მხოლოდ ნახვა: ყოველ ცვლილებას ხედავთ მისი მოხდენისთანავე, მაგრამ რედაქტირება არ შეგიძლიათ. რედაქტირებადი ასლის შესანარჩუნებლად გადით სესიიდან."
+"Viewing “{name}”" = "დათვალიერება: „{name}“"
+"Violet" = "იისფერი"
+"Visibility" = "ხილვადობა"
+"Visible" = "ხილული"
+"Vivid" = "ცოცხალი"
+"Votes per person" = "ხმები ერთ ადამიანზე"
+"Voting session" = "ხმის მიცემის სესია"
+"WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND დაყენებულია და გამოსაყენებელ გრაფიკულ API-ს განსაზღვრავს; მისი მოხსნის შემდეგ FigCraft თავად აირჩევს."
+"Warm" = "თბილი"
+"Watch" = "საათი"
+"Wavy" = "ტალღოვანი"
+"Web" = "ვები"
+"Websites" = "ვებსაიტები"
+"WebSocket URL" = "WebSocket URL"
+"WebSocket URL copied" = "WebSocket URL დაკოპირდა"
+"Wedge" = "სოლი"
+"Weekly planner" = "კვირის გეგმა"
+"Weight" = "სისქე"
+"What you try here changes this preview and the code below, not the file" = "რასაც აქ ცდით, ცვლის ამ გადახედვას და ქვემოთ კოდს და არა ფაილს"
+"What changed since it was marked ready for dev" = "რა შეიცვალა მზად დეველოპერისთვის მონიშვნის შემდეგ"
+"What is wrong with this file? The server's operator gets your report." = "რა არის ამ ფაილში არასწორი? სერვერის ოპერატორი მიიღებს თქვენს საჩივარს."
+"What it's for" = "რისთვისაა"
+"What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "არ არის ცნობილი, რისგან შეიცვალა: ცვლილება მოხდა მანამ, სანამ FigCraft მზად დეველოპერისთვის ჩარჩოების ასლებს შეინახავდა. გადაწყვიტეთ ცვლილება (ან ხელახლა მონიშნეთ მზადად), რომ ამიერიდან შედარდეს."
+"While hovering" = "მაჩვენებლის მიტანისას"
+"While pressing" = "დაჭერისას"
+"White" = "თეთრი"
+"Who runs it, its terms and how long it keeps files" = "ვინ მართავს, მისი პირობები და რამდენ ხანს ინახავს ფაილებს"
+"Whole screen" = "მთელი ეკრანი"
+"Why it changed" = "რატომ შეიცვალა"
+"Widget" = "ვიჯეტი"
+"Widgets" = "ვიჯეტები"
+"Width" = "სიგანე"
+"Width point" = "სიგანის წერტილი"
+"Width profile" = "სიგანის პროფილი"
+"Wireframe kit" = "კარკასების ნაკრები"
+"With the layers' export settings" = "შრეების ექსპორტის პარამეტრებით"
+"Wrap" = "გადატანა"
+"Wrap in new section" = "ახალ სექციაში მოქცევა"
+"Yellow" = "ყვითელი"
+"Yesterday" = "გუშინ"
+"You" = "თქვენ"
+"You'll get the shared file as a new tab and edit it together." = "გაზიარებულ ფაილს ახალ ჩანართად მიიღებთ და ერთად დაარედაქტირებთ."
+"You're spotlighting: everyone follows your view" = "ყურადღება თქვენზეა: ყველა თქვენს ხედს მიჰყვება"
+"Your copy of the file stays open" = "თქვენი ფაილის ასლი ღია რჩება"
+"Your copy stays open; the file stays on the server" = "თქვენი ასლი ღია რჩება; ფაილი სერვერზე რჩება"
+"Your name" = "თქვენი სახელი"
+"Your name in comments" = "თქვენი სახელი კომენტარებში"
+"Your system asks for reduced motion: animations stay off." = "თქვენი სისტემა ითხოვს მოძრაობის შემცირებას: ანიმაციები გამორთული რჩება."
+"Z" = "Z"
+"Z to A" = "ჰ-დან ა-მდე"
+"Zoom" = "მასშტაბი"
+"Zoom around the pointer" = "მასშტაბირება მაჩვენებლის გარშემო"
+"Zoom device to fill window" = "მოწყობილობის მასშტაბირება ფანჯრის შესავსებად"
+"Zoom in" = "გადიდება"
+"Zoom out" = "დაპატარავება"
+"Zoom to 100%" = "მასშტაბი 100%"
+"Zoom to 200%" = "მასშტაბი 200%"
+"Zoom to 50%" = "მასშტაბი 50%"
+"Zoom to fit" = "ეკრანში ჩატევა"
+"Zoom to selection" = "მონიშნულის მასშტაბირება"
+"Zoom tool: click to zoom in, drag an area" = "მასშტაბის ხელსაწყო: დაწკაპეთ გასადიდებლად, მონიშნეთ არე გადათრევით"
+"Zoom tool: zoom out" = "მასშტაბის ხელსაწყო: დაპატარავება"
+"and {n} more" = { one = "და კიდევ {n}", other = "და კიდევ {n}" }
+"bleed marks" = "ჭრისპირა არის ნიშნები"
+"by {author}" = "ავტორი: {author}"
+"call any command its access allows" = "ნებისმიერი ბრძანების გამოძახება, რასაც მისი წვდომა უშვებს"
+"call only: {commands}" = "მხოლოდ გამოძახება: {commands}"
+"can edit the document" = "შეუძლია დოკუმენტის რედაქტირება"
+"can save files" = "შეუძლია ფაილების შენახვა"
+"conditional prototype actions nested too deeply were skipped" = "ზედმეტად ღრმად ჩადგმული პირობითი მოქმედებები პროტოტიპში გამოტოვებულია"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "პროტოტიპის პირობითი მოქმედებები, რომელთა პირობების გამოთვლა ვერ ხერხდება, გამოტოვებულია"
+"connector label background was skipped: style data is missing" = "შემაერთებლის იარლიყის ფონი გამოტოვებულია: სტილის მონაცემები აკლია"
+"connector label was skipped: background bounds are invalid" = "შემაერთებლის იარლიყი გამოტოვებულია: ფონის საზღვრები არასწორია"
+"connector label was skipped: background transform is invalid" = "შემაერთებლის იარლიყი გამოტოვებულია: ფონის გარდაქმნა არასწორია"
+"connector label was skipped: composed text transform is invalid" = "შემაერთებლის იარლიყი გამოტოვებულია: ტექსტის შედგენილი გარდაქმნა არასწორია"
+"connector label was skipped: derived background bounds are missing" = "შემაერთებლის იარლიყი გამოტოვებულია: ფონის გამოთვლილი საზღვრები აკლია"
+"connector label was skipped: derived text bounds are missing" = "შემაერთებლის იარლიყი გამოტოვებულია: ტექსტის გამოთვლილი საზღვრები აკლია"
+"connector label was skipped: text bounds are invalid" = "შემაერთებლის იარლიყი გამოტოვებულია: ტექსტის საზღვრები არასწორია"
+"connector label was skipped: text style data is missing" = "შემაერთებლის იარლიყი გამოტოვებულია: ტექსტის სტილის მონაცემები აკლია"
+"connector label was skipped: text transform is invalid" = "შემაერთებლის იარლიყი გამოტოვებულია: ტექსტის გარდაქმნა არასწორია"
+"connector labels were skipped" = "შემაერთებლების იარლიყები გამოტოვებულია"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "შემაერთებლის შრეები იმპორტირდება ჩარჩოს ან ვექტორის სტატიკური სნეპშოტების სახით, იარლიყებით (თუ არის); ბოლოების ცოცხალი მიბმები არ ნარჩუნდება"
+"connector snapshot vector data is missing; connector was left empty" = "შემაერთებლის სნეპშოტის ვექტორული მონაცემები აკლია; შემაერთებელი ცარიელი დარჩა"
+"connectors whose ends can't be placed are empty" = "შემაერთებლები, რომელთა ბოლოების განთავსება ვერ ხერხდება, ცარიელია"
+"crop marks" = "ჭრის ნიშნები"
+"damaged vector geometry was skipped" = "დაზიანებული ვექტორული გეომეტრია გამოტოვებულია"
+"damaged vector networks import as outlines" = "დაზიანებული ვექტორული ქსელები კონტურებად იმპორტირდება"
+"development: {path}" = "დეველოპმენტი: {path}"
+"document children other than pages were skipped" = "დოკუმენტის ქვეელემენტები, რომლებიც გვერდები არ არის, გამოტოვებულია"
+"duplicate grid track sizing entries use equal tracks" = "ბადის ტრეკის ზომის დუბლირებული ჩანაწერებისას ტრეკები თანაბარია"
+"e.g. count + 1" = "მაგ. count + 1"
+"e.g. count >= 3 and not done" = "მაგ. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "შენახული ტრაექტორიის გარეშე კუთხოვანი და მრუდი შემაერთებლები სწორ ხაზებად იმპორტირდება"
+"entries without a node type were skipped" = "კვანძის ტიპის გარეშე ჩანაწერები გამოტოვებულია"
+"figcraft:// links from a browser, chat or email open this app and join the session." = "ბრაუზერიდან, ჩატიდან ან ელფოსტიდან figcraft:// ბმულები ხსნის ამ აპს და უერთდება სესიას."
+"filled areas of a vector with their own fill use the layer's fill" = "ვექტორის შევსებული არეები საკუთარი შევსებით შრის შევსებას იყენებს"
+"from {server}" = "წყარო: {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "გეიმპადის გამშვებები, რომლებსაც ზუსტად ერთი ცნობილი კონტროლერის ღილაკი არ აქვს, გამოტოვებულია"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "ბადის ტრეკების სია 1000 ჩანაწერს აღემატება; ტრეკები ნაგულისხმევ თანაბარ ზომებს იყენებს"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "ბადის ტრეკის ზომა მხარდაუჭერელი ან დაზიანებულია; შესაბამისი ტრეკები თანაბარ ზომებს იყენებს"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "ბადის ტრეკების ზომების სია 1000 ჩანაწერს აღემატება; ტრეკები ნაგულისხმევ თანაბარ ზომებს იყენებს"
+"hidden" = "დამალული"
+"iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "გამოსახულების ფილტრები ორაზროვანია, რადგან ფილტრების ორივე კონტეინერია მოცემული; ფილტრების გარდაქმნა გამოტოვებულია"
+"image filters use FigCraft's approximate renderer" = "გამოსახულების ფილტრები FigCraft-ის მიახლოებითი რენდერით გამოისახება"
+"instance swap properties whose default component isn't in the file were skipped" = "ინსტანსის ჩანაცვლების თვისებები, რომელთა ნაგულისხმევი კომპონენტი ფაილში არ არის, გამოტოვებულია"
+"instances inside their own main component were imported as frames" = "საკუთარი მთავარი კომპონენტის შიგნით მყოფი ინსტანსები ჩარჩოებად იმპორტირდა"
+"instances of components that aren't in the file show no layers" = "იმ კომპონენტების ინსტანსები, რომლებიც ფაილში არ არის, შრეებს არ აჩვენებს"
+"instances of components that aren't in the file were imported as frames" = "იმ კომპონენტების ინსტანსები, რომლებიც ფაილში არ არის, ჩარჩოებად იმპორტირდა"
+"instances that would nest a component inside itself were imported as frames" = "ინსტანსები, რომლებიც კომპონენტს საკუთარ თავში ჩადგამდა, ჩარჩოებად იმპორტირდა"
+"instances without a main component were imported as empty frames" = "მთავარი კომპონენტის გარეშე ინსტანსები ცარიელ ჩარჩოებად იმპორტირდა"
+"invalid internal .fig text path data was ignored" = ".fig-ის შიდა ტექსტის ტრაექტორიის არასწორი მონაცემები იგნორირებულია"
+"invalid or oversized vector networks import as outlines" = "არასწორი ან ზედმეტად დიდი ვექტორული ქსელები კონტურებად იმპორტირდება"
+"invalid or oversized vector path data was skipped" = "ვექტორული ტრაექტორიის არასწორი ან ზედმეტად დიდი მონაცემები გამოტოვებულია"
+"just now" = "ახლახან"
+"key triggers without a supported key were skipped" = "მხარდაჭერილი კლავიშის გარეშე კლავიშის გამშვებები გამოტოვებულია"
+"key up triggers import as key presses" = "კლავიშის აშვების გამშვებები კლავიშის დაჭერებად იმპორტირდება"
+"layers without a position were placed at their parent's origin" = "პოზიციის გარეშე შრეები მშობლის საწყის წერტილში განთავსდა"
+"layers without a type were skipped" = "ტიპის გარეშე შრეები გამოტოვებულია"
+"legacy image filter container is unsupported; filter conversion was skipped" = "გამოსახულების ფილტრების ძველი კონტეინერი მხარდაუჭერელია; ფილტრების გარდაქმნა გამოტოვებულია"
+"locked" = "ჩაკეტილი"
+"malformed image filters container was skipped" = "გამოსახულების ფილტრების დაზიანებული კონტეინერი გამოტოვებულია"
+"malformed image paintFilter container was skipped" = "გამოსახულების paintFilter-ის დაზიანებული კონტეინერი გამოტოვებულია"
+"malformed slot content assignment was skipped" = "სლოტის შიგთავსის დაზიანებული მინიჭება გამოტოვებულია"
+"no bleed" = "ჭრისპირა არის გარეშე"
+"nobody else here yet" = "აქ ჯერ სხვა არავინაა"
+"non-default slot settings are not represented and were skipped" = "სლოტის არანაგულისხმევი პარამეტრები არ არის წარმოდგენილი და გამოტოვებულია"
+"now" = "ახლა"
+"offer files to save if it asks to (you choose where each one goes)" = "შესანახად ფაილების შეთავაზება, თუ ამას ითხოვს (თითოეულის ადგილს თქვენ ირჩევთ)"
+"only in a text style or variable" = "მხოლოდ ტექსტის სტილში ან ცვლადში"
+"or" = "ან"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "წერტილების კონტურის შეერთებები შენარჩუნებულია; ტირეებიანი ან ცვლადი სისქის კონტურები შრის შეერთებით გამოისახება"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "სლოტის სასურველი კომპონენტების გასაღებები ფაილის კვანძებთან ვერ დაკავშირდა და გამოტოვებულია"
+"prototype actions of unknown types were skipped" = "უცნობი ტიპის პროტოტიპის მოქმედებები გამოტოვებულია"
+"prototype actions without a destination in the file were skipped" = "პროტოტიპის მოქმედებები, რომელთა დანიშნულება ფაილში არ არის, გამოტოვებულია"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "პროტოტიპის ექსპრესიები იმ ცვლადებზე, რომლებიც ცვლადების JSON-ში არ არის, გამოტოვებულია"
+"prototype expressions with unsupported functions were skipped" = "მხარდაუჭერელი ფუნქციების შემცველი პროტოტიპის ექსპრესიები გამოტოვებულია"
+"prototype interactions without supported actions were skipped" = "მხარდაჭერილი მოქმედებების გარეშე პროტოტიპის ურთიერთქმედებები გამოტოვებულია"
+"prototype navigations of unknown types were skipped" = "უცნობი ტიპის პროტოტიპის ნავიგაციები გამოტოვებულია"
+"prototype transitions of unknown types play instantly" = "უცნობი ტიპის პროტოტიპის გადასვლები მყისიერად სრულდება"
+"prototype triggers of unknown types were skipped" = "უცნობი ტიპის პროტოტიპის გამშვებები გამოტოვებულია"
+"put a widget on the canvas" = "ვიჯეტის ტილოზე განთავსება"
+"read and edit the document" = "დოკუმენტის წაკითხვა და რედაქტირება"
+"read the document" = "დოკუმენტის წაკითხვა"
+"reads the document" = "კითხულობს დოკუმენტს"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "ცვლადის დაყენების მოქმედებები იმ ცვლადებზე, რომლებიც ცვლადების JSON-ში არ არის, გამოტოვებულია"
+"set-variable actions with values that can't be evaluated were skipped" = "ცვლადის დაყენების მოქმედებები, რომელთა მნიშვნელობის გამოთვლა ვერ ხერხდება, გამოტოვებულია"
+"set-variable actions with values that don't fit the variable were skipped" = "ცვლადის დაყენების მოქმედებები, რომელთა მნიშვნელობა ცვლადს არ შეესაბამება, გამოტოვებულია"
+"set-variable actions without a value were skipped" = "მნიშვნელობის გარეშე ცვლადის დაყენების მოქმედებები გამოტოვებულია"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "ცვლადის რეჟიმის დაყენების მოქმედებები იმ კოლექციებზე ან რეჟიმებზე, რომლებიც ცვლადების JSON-ში არ არის, გამოტოვებულია"
+"slot content assignment target is missing or is not slot content" = "სლოტის შიგთავსის მინიჭების სამიზნე აკლია ან სლოტის შიგთავსი არ არის"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "სლოტის შიგთავსის მინიჭება ცარიელ GUID მარკერს იყენებს და გამოტოვებულია"
+"slot layers without a matching slot property were imported as frames" = "სლოტის შრეები, რომლებსაც შესაბამისი სლოტის თვისება არ აქვს, ჩარჩოებად იმპორტირდა"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "ზოგი ვექტორული წერტილი მიუთითებს წერტილის პარამეტრებზე, რომლებიც ფაილს აკლია; ისინი შრის შეერთებებსა და ჩვეულებრივ კუთხეებს იყენებს"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "ზოგი ვექტორული სეგმენტი მიუთითებს სტილის პარამეტრებზე, რომლებიც ფაილს აკლია; ისინი შრის კონტურს იყენებს"
+"stale or invalid grid track sizing entries were ignored" = "ბადის ტრეკის ზომის მოძველებული ან არასწორი ჩანაწერები იგნორირებულია"
+"stars and polygons without point counts or geometry use the default point count" = "ვარსკვლავები და მრავალკუთხედები წვეროების რაოდენობის ან გეომეტრიის გარეშე წვეროების ნაგულისხმევ რაოდენობას იყენებს"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "ზოგი ვექტორული სეგმენტის სტილის პარამეტრები მხარდაუჭერელია; ეს სეგმენტები შრის კონტურს იყენებს"
+"text path underline or strikethrough decoration is not rendered" = "ტრაექტორიაზე განთავსებული ტექსტის ხაზგასმა ან გადახაზვა არ გამოისახება"
+"text style overrides refer to missing table entries" = "ტექსტის სტილის გადაფარვები ცხრილის არარსებულ ჩანაწერებზე მიუთითებს"
+"the file has no pages" = "ფაილს გვერდები არ აქვს"
+"the plugin" = "პლაგინი"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "ცვლადების JSON-ს `variableCollections` არ აქვს (მოსალოდნელი იყო ლოკალური ცვლადების პასუხი) და იგნორირებულია"
+"this session only" = "მხოლოდ ეს სესია"
+"unknown component property types were skipped" = "კომპონენტის თვისებების უცნობი ტიპები გამოტოვებულია"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "ცვლადის ალიასები იმ ცვლადებზე, რომლებიც ცვლადების JSON-ში არ არის (ან სხვა ტიპისაა), გამოტოვებულია"
+"variable bindings to properties the layer doesn't have were skipped" = "ცვლადების მიბმები იმ თვისებებზე, რომლებიც შრეს არ აქვს, გამოტოვებულია"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "ცვლადების მიბმები იმ ცვლადებზე, რომლებიც ცვლადების JSON-ში არ არის (ბიბლიოთეკის ცვლადები), გამოტოვებულია"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "ცვლადების მიბმები გამოტოვებულია: ფაილის JSON-ში ცვლადების განსაზღვრებები არ არის (გადაეცით ლოკალური ცვლადების JSON როგორც `variables`, ან ჩააშენეთ მისი `meta` ფაილის JSON-ის გვერდით)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "ცვლადების მიბმები, რომელთა ცვლადის ტიპი თვისებას არ შეესაბამება, გამოტოვებულია"
+"variable collections without modes were skipped" = "რეჟიმების გარეშე ცვლადების კოლექციები გამოტოვებულია"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "პროტოტიპის ექსპრესიებში ცვლადის რეჟიმის მოძიებები, რომლებიც ცვლადსა და მის ერთ-ერთ რეჟიმს არ წარმოადგენს, გამოტოვებულია"
+"variable modes of collections that aren't in the file were skipped" = "იმ კოლექციების ცვლადის რეჟიმები, რომლებიც ფაილში არ არის, გამოტოვებულია"
+"variable modes of collections that aren't in the variables JSON were skipped" = "იმ კოლექციების ცვლადის რეჟიმები, რომლებიც ცვლადების JSON-ში არ არის, გამოტოვებულია"
+"variable values that don't match their type (or composed colours) were skipped" = "ცვლადის მნიშვნელობები, რომლებიც თავიანთ ტიპს არ შეესაბამება (ან შედგენილი ფერები), გამოტოვებულია"
+"variables of unknown types were skipped" = "უცნობი ტიპის ცვლადები გამოტოვებულია"
+"variables whose collection isn't in the variables JSON were skipped" = "ცვლადები, რომელთა კოლექცია ცვლადების JSON-ში არ არის, გამოტოვებულია"
+"variables without readable values were skipped" = "წაკითხვადი მნიშვნელობების გარეშე ცვლადები გამოტოვებულია"
+"vector points with unknown stroke joins use the layer join" = "უცნობი კონტურის შეერთების მქონე ვექტორული წერტილები შრის შეერთებას იყენებს"
+"vectors without geometry are empty" = "გეომეტრიის გარეშე ვექტორები ცარიელია"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "გეომეტრიის გარეშე ვექტორები ცარიელია (ფაილის JSON-ის ექსპორტი გააკეთეთ geometry=paths პარამეტრით)"
+"very long text was cut to 1,048,576 characters" = "ძალიან გრძელი ტექსტი 1 048 576 სიმბოლომდე შემოკლდა"
+"very long vector paths were skipped" = "ძალიან გრძელი ვექტორული ტრაექტორიები გამოტოვებულია"
+"video actions are not supported and were skipped" = "ვიდეოს მოქმედებები მხარდაუჭერელია და გამოტოვებულია"
+"video triggers are not supported and were skipped" = "ვიდეოს გამშვებები მხარდაუჭერელია და გამოტოვებულია"
+"yesterday" = "გუშინ"
+"{instances} in {files}" = "{instances} — {files}"
+"{language}: draft translation, waiting for a native speaker's review." = "{language}: თარგმანის მონახაზი, ელოდება მშობლიური ენის მცოდნის განხილვას."
+"{length} bleed" = "ჭრისპირა არე: {length}"
+"{month} {day}, {year}" = "{day} {month}, {year}"
+"{name} cleared from the list" = "{name} ამოიშალა სიიდან"
+"{name} is forgotten on this computer; the file stays on {server}" = "{name} დავიწყებულია ამ კომპიუტერზე; ფაილი {server}-ზე რჩება"
+"{name} is on the server." = "{name} სერვერზეა."
+"{name} is spotlighting" = "ყურადღება {name}-ზეა"
+"{name}\nClick to apply to the selection" = "{name}\nდაწკაპეთ მონიშნულზე გამოსაყენებლად"
+"{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nგადაათრიეთ ტილოზე ან დაწკაპეთ ხედის შუაში განსათავსებლად.\nინსტანსის ჩასანაცვლებლად მასზე ჩაგდებისას დააჭირეთ Alt-ს (Option)."
+"{name} (from {library})" = "{name} ({library}-იდან)"
+"{name} (you)" = "{name} (თქვენ)"
+"{name} ({layers} layers)" = "{name} (შრე: {layers})"
+"{name} ({tag}): {min} – {max}, default {default}. Double-click the slider to go back to the style's value; Escape while dragging cancels." = "{name} ({tag}): {min} – {max}, ნაგულისხმევი {default}. სტილის მნიშვნელობაზე დასაბრუნებლად ორჯერ დაწკაპეთ სლაიდერზე; Escape გადათრევისას აუქმებს."
+"{name} from {path}" = "{name} — {path}"
+"{name} was removed from the server" = "{name} წაიშალა სერვერიდან"
+"{name} · deleted on main" = "{name} · წაშლილია მთავარში"
+"{name} · deleted on the branch" = "{name} · წაშლილია განშტოებაში"
+"{name} · not published" = "{name} · არ არის გამოქვეყნებული"
+"{name} · on a server" = "{name} · სერვერზე"
+"{name} · published version {v}" = "{name} · გამოქვეყნებული ვერსია {v}"
+"{name} · version {v} on the server" = "{name} · ვერსია {v} სერვერზე"
+"{name}, in a live session" = "{name}, ცოცხალ სესიაში"
+"{name}, online, open only to you" = "{name}, ონლაინ, ღიაა მხოლოდ თქვენთვის"
+"{name}, {kind}, {w} by {h}, selected" = "{name}, {kind}, {w} × {h}, მონიშნულია"
+"{n} added" = { one = "დამატებულია: {n}", other = "დამატებულია: {n}" }
+"{n} autosave versions" = { one = "ავტოშენახული ვერსია: {n}", other = "ავტოშენახული ვერსია: {n}" }
+"{n} changed" = { one = "შეცვლილია: {n}", other = "შეცვლილია: {n}" }
+"{n} columns" = { one = "სვეტი: {n}", other = "სვეტი: {n}" }
+"{n} components" = { one = "კომპონენტი: {n}", other = "კომპონენტი: {n}" }
+"{n} components and styles have newer versions" = { one = "ახალი ვერსია აქვს კომპონენტს ან სტილს: {n}", other = "ახალი ვერსია აქვს კომპონენტს ან სტილს: {n}" }
+"{n} conflicts to resolve" = { one = "გადასაწყვეტი კონფლიქტი: {n}", other = "გადასაწყვეტი კონფლიქტი: {n}" }
+"{n} days ago" = { one = "{n} დღის წინ", other = "{n} დღის წინ" }
+"{n} files" = { one = "ფაილი: {n}", other = "ფაილი: {n}" }
+"{n} hours ago" = { one = "{n} საათის წინ", other = "{n} საათის წინ" }
+"{n} instances" = { one = "ინსტანსი: {n}", other = "ინსტანსი: {n}" }
+"{n} layers" = { one = "შრე: {n}", other = "შრე: {n}" }
+"{n} layers as one file" = { one = "შრე: {n}, ერთ ფაილად", other = "შრე: {n}, ერთ ფაილად" }
+"{n} layers selected" = { one = "მონიშნული შრე: {n}", other = "მონიშნული შრე: {n}" }
+"{n} layers · {parts}" = { one = "შრე: {n} · {parts}", other = "შრე: {n} · {parts}" }
+"{n} matches" = { one = "დამთხვევა: {n}", other = "დამთხვევა: {n}" }
+"{n} min" = "{n} წთ"
+"{n} minutes ago" = { one = "{n} წუთის წინ", other = "{n} წუთის წინ" }
+"{n} months ago" = { one = "{n} თვის წინ", other = "{n} თვის წინ" }
+"{n} more notes omitted from this report" = { one = "ამ ანგარიშიდან გამოტოვებული სხვა შენიშვნები: {n}", other = "ამ ანგარიშიდან გამოტოვებული სხვა შენიშვნები: {n}" }
+"{n} of {total}" = "{n} / {total}"
+"{n} people joined" = { one = "შემოუერთდა ადამიანი: {n}", other = "შემოუერთდა ადამიანი: {n}" }
+"{n} preferred components" = { one = "სასურველი კომპონენტი: {n}", other = "სასურველი კომპონენტი: {n}" }
+"{n} ready" = { one = "მზადაა: {n}", other = "მზადაა: {n}" }
+"{n} removed" = { one = "წაშლილია: {n}", other = "წაშლილია: {n}" }
+"{n} replies" = { one = "პასუხი: {n}", other = "პასუხი: {n}" }
+"{n} rows" = { one = "სტრიქონი: {n}", other = "სტრიქონი: {n}" }
+"{n} styles" = { one = "სტილი: {n}", other = "სტილი: {n}" }
+"{n} text layers" = { one = "ტექსტის შრე: {n}", other = "ტექსტის შრე: {n}" }
+"{n} variables" = { one = "ცვლადი: {n}", other = "ცვლადი: {n}" }
+"{n} votes" = { one = "ხმა: {n}", other = "ხმა: {n}" }
+"{n} votes left" = { one = "დარჩენილი ხმა: {n}", other = "დარჩენილი ხმა: {n}" }
+"{n} weeks ago" = { one = "{n} კვირის წინ", other = "{n} კვირის წინ" }
+"{n} years ago" = { one = "{n} წლის წინ", other = "{n} წლის წინ" }
+"{n}d" = "{n} დღ"
+"{n}h" = "{n} სთ"
+"{n}m" = "{n} წთ"
+"{n}w" = "{n} კვ"
+"{page}, nothing selected" = "{page}, არაფერია მონიშნული"
+"{profile} (current)" = "{profile} (მიმდინარე)"
+"{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} მისი მნიშვნელობაა; {property ? \"a\" : \"b\"} ირჩევს სტრიქონს. ნებისმიერი სხვა {…} რჩება დაწერილი სახით."
+"{server} can't say what became of your files (it is older than this app)." = "{server} ვერ გეტყვით, რა მოუვიდა თქვენს ფაილებს (ის ამ აპზე ძველია)."
+"{server} · No longer on the server" = "{server} · სერვერზე აღარ არის"
+"{server} · {shared} · Opened {date}" = "{server} · {shared} · გაიხსნა {date}"
+"{tool}  hold {key}" = "{tool}  დააჭირეთ {key}"
+"{value} isn't a colour" = "{value} ფერი არ არის"
+"{when} · edited" = "{when} · რედაქტირებულია"
+"← ↑ → ↓" = "← ↑ → ↓"
+"← → ↑ ↓" = "← → ↑ ↓"
+"←" = "←"
+"→, Space or N" = "→, Space ან N"
+"↵" = "↵"
+"⇥ / ⇧⇥" = "⇥ / ⇧⇥"
+"⌘ arrows" = "⌘ ისრები"
+"⌘ click" = "⌘ დაწკაპუნება"
+"⌘ scroll" = "⌘ გადახვევა"
+"⌥ drag" = "⌥ გადათრევა"
+
+[commands]
+"align.bottom" = "ქვემოთ სწორება"
+"align.hcenter" = "ჰორიზონტალური ცენტრების სწორება"
+"align.left" = "მარცხნივ სწორება"
+"align.right" = "მარჯვნივ სწორება"
+"align.top" = "ზემოთ სწორება"
+"align.vcenter" = "ვერტიკალური ცენტრების სწორება"
+"annotation.add" = "ანოტაციის დამატება"
+"annotation.addCategory" = "ანოტაციის კატეგორიის დამატება"
+"annotation.categories" = "ანოტაციის კატეგორიები"
+"annotation.edit" = "ანოტაციის რედაქტირება"
+"annotation.editCategory" = "ანოტაციის კატეგორიის რედაქტირება"
+"annotation.list" = "ანოტაციების სია"
+"annotation.remove" = "ანოტაციის წაშლა"
+"annotation.removeCategory" = "ანოტაციის კატეგორიის წაშლა"
+"app.actions" = "მოქმედებები"
+"app.preferences" = "პარამეტრები"
+"arrange.back" = "უკანა პლანზე გადატანა"
+"arrange.backward" = "უკან გადატანა"
+"arrange.forward" = "წინ გადმოტანა"
+"arrange.front" = "წინა პლანზე გადმოტანა"
+"arrange.packH" = "ჰორიზონტალურად შეკვრა"
+"arrange.packV" = "ვერტიკალურად შეკვრა"
+"arrange.roundToPixels" = "პიქსელებამდე დამრგვალება"
+"arrange.spacing" = "ინტერვალი"
+"arrange.tidy" = "მოწესრიგება"
+"board.connector" = "შემაერთებელი"
+"board.ink" = "მარკერის შტრიხი"
+"board.label" = "შემაერთებლის წარწერა"
+"board.nextSticky" = "შემდეგი სტიკერი"
+"board.reattach" = "შემაერთებლის ხელახლა მიმაგრება"
+"board.setColor" = "დაფის ფერი"
+"board.setStyle" = "დაფის სტილი"
+"board.shape" = "ფიგურა ტექსტით"
+"board.stamp" = "შტამპი"
+"board.sticky" = "სტიკერი"
+"board.table" = "ცხრილი"
+"board.tableEdit" = "ცხრილის რედაქტირება"
+"board.template" = "დაფის შაბლონი"
+"board.templates" = "დაფის შაბლონების სია"
+"board.timer" = "ტაიმერი"
+"board.timerState" = "ტაიმერის მდგომარეობა"
+"board.vote" = "ხმის მიცემის სესია"
+"board.voteResults" = "ხმის მიცემის შედეგები"
+"bool.exclude" = "მონიშნულის გამორიცხვა"
+"bool.flatten" = "ლოგიკური ოპერაციის გაბრტყელება"
+"bool.intersect" = "მონიშნულის გადაკვეთა"
+"bool.subtract" = "მონიშნულის გამოკლება"
+"bool.union" = "მონიშნულის გაერთიანება"
+"branch.archive" = "განშტოების დაარქივება"
+"branch.create" = "განშტოების შექმნა"
+"branch.list" = "განშტოებების სია"
+"branch.merge" = "განშტოების შერწყმა"
+"branch.open" = "განშტოების გახსნა"
+"branch.review" = "განშტოების განხილვა"
+"branch.updateFromMain" = "მთავარიდან განახლება"
+"codeConnect.export" = "კოდთან კავშირების ექსპორტირება"
+"codeConnect.import" = "კოდთან კავშირების იმპორტი"
+"codeConnect.remove" = "კოდთან კავშირის გაწყვეტა"
+"codeConnect.set" = "კოდთან დაკავშირება"
+"collab.cursor" = "კურსორის ჩვენება მდებარეობაზე"
+"collab.cursorChat" = "კურსორის ჩატი"
+"collab.diff" = "სინქრონიზებული ცვლილებების ჩვენება"
+"collab.files" = "თქვენი ონლაინ ფაილები"
+"collab.follow" = "მიყოლა"
+"collab.forgetFile" = "ონლაინ ფაილის დავიწყება"
+"collab.host" = "ცოცხალი სესიის დაწყება"
+"collab.join" = "ცოცხალ სესიასთან შეერთება"
+"collab.leave" = "ცოცხალი სესიიდან გასვლა"
+"collab.manageFile" = "გამოქვეყნებული ფაილის მართვა"
+"collab.openFile" = "ონლაინ ფაილის გახსნა"
+"collab.peers" = "ამ ფაილში მყოფი ადამიანები"
+"collab.publish" = "სერვერზე გამოქვეყნება"
+"collab.recoverFile" = "ონლაინ ფაილის აღდგენა"
+"collab.registerLinks" = "მოსაწვევი ბმულების FigCraft-ში გახსნა"
+"collab.removePerson" = "სესიიდან მოცილება"
+"collab.report" = "ფაილზე საჩივარი სერვერის ოპერატორთან"
+"collab.serverInfo" = "სერვერის ინფორმაცია"
+"collab.share" = "შეერთების კოდით გაზიარება"
+"collab.spotlight" = "ჩემზე ყურადღების გამახვილება"
+"collab.stop" = "ცოცხალი სესიის შეწყვეტა"
+"command.batch" = "რამდენიმე ბრძანების გაშვება"
+"comment.add" = "კომენტარის დამატება"
+"comment.delete" = "კომენტარის წაშლა"
+"comment.edit" = "კომენტარის რედაქტირება"
+"comment.link" = "კომენტარის ბმულის კოპირება"
+"comment.list" = "კომენტარების სია"
+"comment.markRead" = "კომენტარის წაკითხულად მარკირება"
+"comment.move" = "კომენტარის გადატანა"
+"comment.next" = "შემდეგი კომენტარი"
+"comment.open" = "კომენტარის გახსნა"
+"comment.people" = "კომენტარებში მონაწილე ადამიანები"
+"comment.react" = "კომენტარზე რეაგირება"
+"comment.reply" = "კომენტარზე პასუხი"
+"comment.resolve" = "კომენტარის გადაწყვეტა"
+"comment.zoom" = "კომენტარების მასშტაბირება"
+"component.addProperty" = "კომპონენტის თვისების დამატება"
+"component.addVariant" = "ვარიანტის დამატება"
+"component.bindProperty" = "შრის თვისებაზე მიბმა"
+"component.combineVariants" = "ვარიანტებად გაერთიანება"
+"component.create" = "კომპონენტის შექმნა"
+"component.createMultiple" = "რამდენიმე კომპონენტის შექმნა"
+"component.deleteProperty" = "კომპონენტის თვისების წაშლა"
+"component.detach" = "ინსტანსის გამოყოფა"
+"component.editProperty" = "კომპონენტის თვისების რედაქტირება"
+"component.exposeInstance" = "ჩადგმული ინსტანსის გამოტანა"
+"component.goToMain" = "მთავარ კომპონენტზე გადასვლა"
+"component.hideWhenPublishing" = "გამოქვეყნებისას დამალვა"
+"component.list" = "კომპონენტების სია"
+"component.makeSlot" = "სლოტად გადაქცევა"
+"component.playground" = "კომპონენტის სავარჯიშო მოედანი"
+"component.properties" = "კომპონენტის თვისებები"
+"component.pushChanges" = "ცვლილებების მთავარ კომპონენტში გადაგზავნა"
+"component.removeSlot" = "სლოტის მოხსნა"
+"component.resetInstance" = "ყველა ცვლილების ჩამოყრა"
+"component.resetOverride" = "გადაფარვის ჩამოყრა"
+"component.restoreMain" = "მთავარი კომპონენტის აღდგენა"
+"dev.compare" = "ცვლილებების შედარება"
+"dev.focus" = "ფოკუსის ხედი"
+"dev.resolveChange" = "ცვლილების გადაწყვეტა"
+"dev.unfocus" = "ფოკუსის ხედიდან გასვლა"
+"devMode.addMeasurement" = "გაზომვის დამატება"
+"devMode.measurements" = "გაზომვების სია"
+"devMode.removeMeasurement" = "გაზომვის წაშლა"
+"devResource.add" = "დეველოპერის რესურსის დამატება"
+"devResource.edit" = "დეველოპერის რესურსის რედაქტირება"
+"devResource.list" = "დეველოპერის რესურსების სია"
+"devResource.remove" = "დეველოპერის რესურსის წაშლა"
+"distribute.horizontal" = "ჰორიზონტალური შუალედების განაწილება"
+"distribute.vertical" = "ვერტიკალური შუალედების განაწილება"
+"doc.home" = "საწყისი ეკრანი"
+"doc.list" = "დოკუმენტების სია"
+"doc.nextTab" = "შემდეგი ჩანართი"
+"doc.previousTab" = "წინა ჩანართი"
+"doc.switch" = "დოკუმენტის გადართვა"
+"edit.copy" = "კოპირება"
+"edit.copyAsCss" = "კოპირება როგორც CSS"
+"edit.copyAsPng" = "კოპირება როგორც PNG"
+"edit.copyAsSvg" = "კოპირება როგორც SVG"
+"edit.copyAsText" = "კოპირება როგორც ტექსტი"
+"edit.copyLink" = "მონიშნულის ბმულის კოპირება"
+"edit.copyProperties" = "თვისებების კოპირება"
+"edit.cut" = "ამოჭრა"
+"edit.delete" = "წაშლა"
+"edit.duplicate" = "დუბლირება"
+"edit.findReplace" = "ძებნა და ჩანაცვლება"
+"edit.paste" = "ჩასმა"
+"edit.pasteDesignLayers" = "დიზაინის შრეების ჩასმა"
+"edit.pasteOver" = "მონიშნულზე ჩასმა"
+"edit.pasteProperties" = "თვისებების ჩასმა"
+"edit.pasteReplace" = "ჩასმა ჩასანაცვლებლად"
+"edit.pickColor" = "ფერის არჩევა"
+"edit.redo" = "ხელახლა შესრულება"
+"edit.repeat" = "ბოლო ბრძანების გამეორება"
+"edit.setDefaultProperties" = "ნაგულისხმევი თვისებების დაყენება"
+"edit.undo" = "დაბრუნება"
+"effect.add" = "ეფექტის დამატება"
+"effect.move" = "ეფექტის გადატანა"
+"effect.remove" = "ეფექტის წაშლა"
+"effect.set" = "ეფექტის დაყენება"
+"export.add" = "ექსპორტის პარამეტრის დამატება"
+"export.remove" = "ექსპორტის პარამეტრის წაშლა"
+"export.update" = "ექსპორტის პარამეტრის რედაქტირება"
+"file.close" = "ჩანართის დახურვა"
+"file.colorProfile" = "ფერის პროფილი"
+"file.duplicate" = "ფაილის დუბლირება"
+"file.export" = "ექსპორტირება"
+"file.exportFramesPdf" = "ჩარჩოების PDF-ად ექსპორტირება"
+"file.exportLayers" = "შრეების ექსპორტირება"
+"file.exportSvg" = "მონიშნულის SVG-ად ექსპორტირება"
+"file.import" = "იმპორტი"
+"file.new" = "ახალი დიზაინის ფაილი"
+"file.newBoard" = "ახალი დაფა"
+"file.newFromTemplate" = "შაბლონიდან შექმნა"
+"file.open" = "გახსნა"
+"file.openRecent" = "ბოლოს გახსნილი ფაილების გახსნა"
+"file.placeImage" = "გამოსახულების განთავსება"
+"file.recover" = "ფაილის აღდგენა"
+"file.rename" = "ფაილის სახელის შეცვლა"
+"file.revert" = "წინა ვერსიაზე დაბრუნება"
+"file.save" = "შენახვა"
+"file.saveAs" = "შენახვა როგორც"
+"file.saveVersion" = "ვერსიების ისტორიაში შენახვა"
+"file.versionHistory" = "ვერსიების ისტორიის ჩვენება"
+"fill.add" = "შევსების დამატება"
+"fill.move" = "შევსების გადატანა"
+"fill.pattern" = "პატერნით შევსება"
+"fill.remove" = "შევსების წაშლა"
+"fill.set" = "შევსების დაყენება"
+"frame.create" = "ჩარჩოს შექმნა"
+"frame.presets" = "ჩარჩოს პრესეტების სია"
+"frame.swapOrientation" = "ორიენტაციის შეცვლა"
+"grid.add" = "განლაგების ბადის დამატება"
+"grid.move" = "განლაგების ბადის გადატანა"
+"grid.remove" = "განლაგების ბადის წაშლა"
+"guide.add" = "დამხმარე ხაზის დამატება"
+"guide.clear" = "ყველა დამხმარე ხაზის წაშლა"
+"guide.move" = "დამხმარე ხაზის გადაადგილება"
+"guide.remove" = "დამხმარე ხაზის მოცილება"
+"guide.select" = "დამხმარე ხაზის მონიშვნა"
+"help.about" = "FigCraft-ის შესახებ"
+"help.gettingStarted" = "პირველი ნაბიჯები"
+"help.page" = "დახმარების გვერდი"
+"help.shortcuts" = "კლავიატურის მალსახმობები"
+"image.adjust" = "გამოსახულების კორექცია"
+"image.deletePreset" = "გამოსახულების პრესეტის წაშლა"
+"image.place" = "გამოსახულების განთავსება"
+"image.presets" = "გამოსახულების პრესეტები"
+"image.savePreset" = "გამოსახულების პრესეტის შენახვა"
+"inspect.assets" = "რესურსების ინსპექტირება"
+"inspect.code" = "შრის კოდი"
+"inspect.componentCode" = "კომპონენტის კოდი"
+"inspect.properties" = "თვისებების ინსპექტირება"
+"inspect.readyForDev" = "მზადაა დეველოპერისთვის"
+"instance.create" = "ინსტანსის შექმნა"
+"instance.exposed" = "გამოტანილი ჩადგმული ინსტანსები"
+"instance.place" = "ინსტანსის განთავსება"
+"instance.resetSlot" = "სლოტის ჩამოყრა"
+"instance.setProperties" = "ინსტანსის თვისებების დაყენება"
+"instance.slotInsert" = "სლოტში ჩასმა"
+"instance.swap" = "ინსტანსის ჩანაცვლება"
+"instance.swapAt" = "ინსტანსის ჩანაცვლება წერტილში"
+"layers.collapseAll" = "შრეების ჩაკეცვა"
+"layout.add" = "ავტოგანლაგების დამატება"
+"layout.remove" = "ავტოგანლაგების მოხსნა"
+"layout.setTrack" = "ბადის ტრეკის ზომის დაყენება"
+"layout.suggest" = "ავტოგანლაგების შეთავაზება"
+"libraries.open" = "ბიბლიოთეკები"
+"libraries.publish" = "ბიბლიოთეკის გამოქვეყნება…"
+"library.acceptUpdates" = "ბიბლიოთეკის განახლებების მიღება"
+"library.add" = "ბიბლიოთეკის დამატება"
+"library.aliasVariable" = "ბიბლიოთეკის ცვლადის ალიასი"
+"library.applyStyle" = "ბიბლიოთეკის სტილის გამოყენება"
+"library.bindVariable" = "ბიბლიოთეკის ცვლადის მიბმა"
+"library.extendCollection" = "ბიბლიოთეკის კოლექციის გაფართოება"
+"library.import" = "ბიბლიოთეკის კომპონენტის იმპორტი"
+"library.importVariable" = "ბიბლიოთეკის ცვლადის იმპორტი"
+"library.list" = "ბიბლიოთეკების სია"
+"library.place" = "ბიბლიოთეკის კომპონენტის განთავსება"
+"library.publish" = "ბიბლიოთეკის გამოქვეყნება"
+"library.publishToServer" = "ბიბლიოთეკის სერვერზე გამოქვეყნება"
+"library.remove" = "ბიბლიოთეკის წაშლა"
+"library.setVariableMode" = "ბიბლიოთეკის ცვლადის რეჟიმის დაყენება"
+"library.swap" = "ბიბლიოთეკის ჩანაცვლება"
+"library.swapAt" = "ინსტანსის ბიბლიოთეკის კომპონენტით ჩანაცვლება"
+"library.updates" = "ბიბლიოთეკის განახლებები"
+"library.usage" = "ბიბლიოთეკის გამოყენება"
+"measure.distances" = "მანძილების გაზომვა"
+"measure.padding" = "ავტოგანლაგების შიდა დაშორების გაზომვა"
+"node.create" = "შრის შექმნა"
+"node.get" = "შრის მიღება"
+"node.reorder" = "შრის გადალაგება"
+"node.reparent" = "შრის შიგნით გადატანა"
+"node.set" = "თვისებების დაყენება"
+"object.batchRename" = "ჯგუფური სახელის შეცვლა"
+"object.convertToFrame" = "ჩარჩოდ გარდაქმნა"
+"object.convertToGroup" = "ჯგუფად გარდაქმნა"
+"object.convertToSection" = "სექციად გარდაქმნა"
+"object.flipH" = "ჰორიზონტალურად არეკვლა"
+"object.flipV" = "ვერტიკალურად არეკვლა"
+"object.frameSelection" = "მონიშნულის ჩარჩოში მოქცევა"
+"object.group" = "ჯგუფის მონიშვნა"
+"object.hideOthers" = "სხვა შრეების დამალვა"
+"object.mask" = "ნიღბად გამოყენება"
+"object.moveToPage" = "გვერდზე გადატანა"
+"object.opacityKeys" = "გაუმჭვირვალობა ციფრული კლავიშებით"
+"object.rasterize" = "მონიშნულის რასტრირება"
+"object.releaseMask" = "ნიღბის მოხსნა"
+"object.removeFill" = "შევსების წაშლა"
+"object.removeFrame" = "ჩარჩოს მოხსნა"
+"object.removeStroke" = "კონტურის წაშლა"
+"object.rename" = "სახელის შეცვლა"
+"object.resizeToFit" = "შიგთავსზე ზომის მორგება"
+"object.rotate180" = "180°-ით შემობრუნება"
+"object.rotateLeft" = "90°-ით მარცხნივ შემობრუნება"
+"object.rotateRight" = "90°-ით მარჯვნივ შემობრუნება"
+"object.setThumbnail" = "ესკიზად დაყენება"
+"object.swapFillStroke" = "შევსებისა და კონტურის გაცვლა"
+"object.toggleLock" = "მონიშნულის ჩაკეტვა/განბლოკვა"
+"object.toggleVisible" = "მონიშნულის ჩვენება/დამალვა"
+"object.ungroup" = "მონიშნულის დაჯგუფების მოხსნა"
+"object.wrapInSection" = "ახალ სექციაში მოქცევა"
+"page.add" = "გვერდის დამატება"
+"page.delete" = "გვერდის წაშლა"
+"page.duplicate" = "გვერდის დუბლირება"
+"page.list" = "გვერდების სია"
+"page.move" = "გვერდის გადატანა"
+"page.rename" = "გვერდის სახელის შეცვლა"
+"page.select" = "გვერდზე გადასვლა"
+"page.setBackground" = "გვერდის ფონი"
+"paint.documentColors" = "დოკუმენტის ფერები"
+"plugin.close" = "პლაგინის პანელის დახურვა"
+"plugin.directory.install" = "პლაგინის ინსტალაცია კატალოგიდან"
+"plugin.directory.list" = "პლაგინების კატალოგის დათვალიერება"
+"plugin.directory.publish" = "პლაგინის კატალოგში გამოქვეყნება"
+"plugin.directory.unpublish" = "პლაგინის კატალოგიდან მოხსნა"
+"plugin.event" = "პლაგინის პანელის მართვის ელემენტის გამოყენება"
+"plugin.import" = "პლაგინის იმპორტი მანიფესტიდან…"
+"plugin.list" = "პლაგინების სია"
+"plugin.remove" = "პლაგინის წაშლა"
+"plugin.run" = "პლაგინის გაშვება"
+"plugin.ui" = "პლაგინის პანელი"
+"plugins.manage" = "პლაგინების მართვა…"
+"plugins.runLast" = "ბოლო პლაგინის გაშვება"
+"pref.autoSave" = "ფაილების ავტომატურად შენახვა"
+"pref.highlightHover" = "შრეების გამოკვეთა მაჩვენებლის მიტანისას"
+"pref.keepTool" = "ხელსაწყოს არჩეულად დატოვება გამოყენების შემდეგ"
+"pref.language" = "ინტერფეისის ენა"
+"pref.nudge" = "მცირედ გადაწევის ბიჯი"
+"pref.numberKeysOpacity" = "გაუმჭვირვალობისთვის ციფრული კლავიშების გამოყენება"
+"pref.publishServer" = "ონლაინ გაზიარების სერვერი"
+"pref.reduceMotion" = "მოძრაობის შემცირება"
+"pref.renameDuplicates" = "დუბლირებული შრეების სახელის შეცვლა"
+"pref.showDimensions" = "ზომების ჩვენება ობიექტებზე"
+"pref.userName" = "თქვენი სახელი კომენტარებში"
+"proto.action.add" = "პროტოტიპის მოქმედების დამატება"
+"proto.action.move" = "პროტოტიპის მოქმედების გადალაგება"
+"proto.action.remove" = "პროტოტიპის მოქმედების წაშლა"
+"proto.action.set" = "პროტოტიპის მოქმედების რედაქტირება"
+"proto.closePreview" = "პროტოტიპის წინასწარი ნახვის დახურვა"
+"proto.conditional.addBlock" = "„სხვა შემთხვევაში, თუ“ / „სხვა შემთხვევაში“-ს დამატება"
+"proto.conditional.removeBlock" = "„თუ“ / „სხვა შემთხვევაში, თუ“ / „სხვა შემთხვევაში“-ს წაშლა"
+"proto.conditional.setCondition" = "პირობის რედაქტირება"
+"proto.evaluate" = "პროტოტიპის ექსპრესიის გამოთვლა"
+"proto.flow.add" = "ნაკადის საწყისი წერტილის დამატება"
+"proto.flow.remove" = "ნაკადის წაშლა"
+"proto.flow.rename" = "ნაკადის სახელის შეცვლა"
+"proto.interaction.add" = "ურთიერთქმედების დამატება"
+"proto.interaction.clear" = "ყველა ურთიერთქმედების წაშლა"
+"proto.interaction.remove" = "ურთიერთქმედების წაშლა"
+"proto.interaction.set" = "ურთიერთქმედების რედაქტირება"
+"proto.present" = "წარდგენა"
+"proto.presentOptions" = "წარდგენის პარამეტრები"
+"proto.preview" = "პროტოტიპის წინასწარი ნახვის გახსნა"
+"proto.settings" = "პროტოტიპის პარამეტრები"
+"section.toggleContents" = "სექციის შიგთავსის დამალვა/ჩვენება"
+"select.add" = "მონიშნულზე დამატება"
+"select.all" = "ყველაფრის მონიშვნა"
+"select.area" = "არის მონიშვნა"
+"select.byName" = "შრეების სახელით მონიშვნა"
+"select.children" = "შვილობილების მონიშვნა"
+"select.inverse" = "მონიშვნის შებრუნება"
+"select.layersAt" = "შრეები წერტილში"
+"select.matching" = "შესაბამისი შრეების მონიშვნა"
+"select.next" = "შემდეგი მეზობლის მონიშვნა"
+"select.none" = "მონიშვნის მოხსნა"
+"select.parent" = "მშობლის მონიშვნა"
+"select.previous" = "წინა მეზობლის მონიშვნა"
+"select.remove" = "მონიშნულიდან ამოღება"
+"select.sameEffect" = "იგივე ეფექტის მონიშვნა"
+"select.sameFill" = "იგივე შევსების მონიშვნა"
+"select.sameFont" = "იგივე შრიფტის მონიშვნა"
+"select.sameInstance" = "იგივე ინსტანსის მონიშვნა"
+"select.sameProperties" = "იგივე თვისებების მონიშვნა"
+"select.sameStroke" = "იგივე კონტურის მონიშვნა"
+"select.sameText" = "ტექსტის იგივე თვისებების მონიშვნა"
+"select.set" = "მონიშვნა"
+"selection.applyColorStyle" = "მონიშნულის ფერის სტილის გამოყენება"
+"selection.bindColorVariable" = "მონიშნულზე ფერის ცვლადის გამოყენება"
+"selection.colors" = "მონიშნულის ფერები"
+"selection.detachColor" = "მონიშნულის ფერის გამოყოფა"
+"selection.selectColor" = "ამ ფერის შრეების მონიშვნა"
+"selection.setPaint" = "მონიშნულის ფერის შეცვლა"
+"shape.arrow" = "ისარი"
+"shape.ellipse" = "ელიფსი"
+"shape.line" = "ხაზი"
+"shape.polygon" = "მრავალკუთხედი"
+"shape.rectangle" = "მართკუთხედი"
+"shape.star" = "ვარსკვლავი"
+"shapeBuilder.merge" = "არეების შერწყმა"
+"shapeBuilder.mode" = "ფიგურების კონსტრუქტორის რეჟიმი"
+"shapeBuilder.regions" = "ფიგურების კონსტრუქტორის არეები"
+"shapeBuilder.remove" = "არეების წაშლა"
+"stroke.add" = "კონტურის დამატება"
+"stroke.brush" = "ფუნჯი"
+"stroke.move" = "კონტურის გადატანა"
+"stroke.remove" = "კონტურის წაშლა"
+"stroke.set" = "კონტურის დაყენება"
+"stroke.widthProfile" = "სიგანის პროფილი"
+"style.apply" = "სტილის გამოყენება"
+"style.bind" = "ცვლადის სტილში მიბმა"
+"style.create" = "სტილის შექმნა"
+"style.delete" = "სტილის წაშლა"
+"style.detach" = "სტილის გამოყოფა"
+"style.duplicate" = "სტილის დუბლირება"
+"style.list" = "სტილების სია"
+"style.move" = "სტილების გადატანა"
+"style.renameFolder" = "სტილების საქაღალდის სახელის შეცვლა"
+"style.update" = "სტილის რედაქტირება"
+"template.list" = "შაბლონების სია"
+"text.alignCenter" = "ცენტრში სწორება"
+"text.alignJustify" = "ორმხრივი სწორება"
+"text.alignLeft" = "მარცხნივ სწორება"
+"text.alignRight" = "მარჯვნივ სწორება"
+"text.bold" = "მუქი"
+"text.bulletList" = "ბურთულებიანი სია"
+"text.case" = "ასოთა რეგისტრი"
+"text.caseLower" = "პატარა ასოები"
+"text.caseOriginal" = "საწყისი რეგისტრი"
+"text.caseSmallCaps" = "პატარა მთავრული"
+"text.caseTitle" = "სათაურის რეგისტრი"
+"text.caseUpper" = "მთავრული"
+"text.create" = "ტექსტი"
+"text.decoration" = "გაფორმება"
+"text.edit.begin" = "ტექსტის რედაქტირება"
+"text.edit.caret" = "კურსორის დაყენება"
+"text.edit.end" = "ტექსტის რედაქტირების დასრულება"
+"text.edit.insert" = "ტექსტის აკრეფა"
+"text.edit.key" = "ტექსტის კლავიში"
+"text.edit.preedit" = "ტექსტის აწყობა (IME)"
+"text.edit.selectLine" = "სტრიქონის მონიშვნა"
+"text.edit.selectWord" = "სიტყვის მონიშვნა"
+"text.edit.selection" = "ტექსტის მონიშვნა"
+"text.endPreview" = "ტექსტის გადახედვის დასრულება"
+"text.fonts" = "შრიფტების სია"
+"text.italic" = "დახრილი"
+"text.lineHeightDown" = "სტრიქონის სიმაღლის შემცირება"
+"text.lineHeightUp" = "სტრიქონის სიმაღლის გაზრდა"
+"text.link" = "ბმულის შექმნა"
+"text.listIndent" = "სიის შეწევის გაზრდა"
+"text.listOutdent" = "სიის შეწევის შემცირება"
+"text.listStyle" = "სიის სტილი"
+"text.maxLines" = "მაქს. სტრიქონები"
+"text.missingFonts" = "მიუწვდომელი შრიფტები"
+"text.numberList" = "დანომრილი სია"
+"text.onPath" = "ტექსტი ტრაექტორიაზე"
+"text.paragraphIndent" = "აბზაცის შეწევა"
+"text.paragraphSpacing" = "აბზაცთა ინტერვალი"
+"text.pathOptions" = "ტრაექტორიაზე ტექსტის პარამეტრები"
+"text.preview" = "ტექსტის ცვლილების გადახედვა"
+"text.removeFromPath" = "ტექსტის ტრაექტორიიდან მოხსნა"
+"text.set" = "ტექსტის დაყენება"
+"text.setFeatures" = "OpenType შესაძლებლობები"
+"text.setVariations" = "ცვლადი შრიფტის ღერძები"
+"text.sizeDown" = "შრიფტის ზომის შემცირება"
+"text.sizeUp" = "შრიფტის ზომის გაზრდა"
+"text.strikethrough" = "გადახაზული"
+"text.style" = "ტექსტის დიაპაზონის სტილის მინიჭება"
+"text.trackingDown" = "ასოებს შორის დაშორების შემცირება"
+"text.trackingUp" = "ასოებს შორის დაშორების გაზრდა"
+"text.underline" = "ხაზგასმული"
+"text.weightDown" = "შრიფტის სისქის შემცირება"
+"text.weightUp" = "შრიფტის სისქის გაზრდა"
+"tool.arrow" = "ისარი"
+"tool.comment" = "კომენტარი"
+"tool.connector" = "შემაერთებელი"
+"tool.ellipse" = "ელიფსი"
+"tool.eraser" = "საშლელი"
+"tool.frame" = "ჩარჩო"
+"tool.hand" = "ხელი"
+"tool.highlighter" = "ხაზგასმის მარკერი"
+"tool.line" = "ხაზი"
+"tool.marker" = "მარკერი"
+"tool.move" = "გადაადგილება"
+"tool.pen" = "კალამი"
+"tool.pencil" = "ფანქარი"
+"tool.pencilBrush" = "ფანქრის ფუნჯი"
+"tool.place" = "ხელსაწყოთი განთავსება"
+"tool.polygon" = "მრავალკუთხედი"
+"tool.rectangle" = "მართკუთხედი"
+"tool.scale" = "მასშტაბირება"
+"tool.scaleAnchor" = "მასშტაბირების საყრდენი წერტილი"
+"tool.section" = "სექცია"
+"tool.set" = "ხელსაწყოს არჩევა"
+"tool.shape" = "ფიგურები"
+"tool.shapeBuilder" = "ფიგურების კონსტრუქტორი"
+"tool.slice" = "ნაჭერი"
+"tool.stamp" = "შტამპი"
+"tool.star" = "ვარსკვლავი"
+"tool.sticky" = "სტიკერი"
+"tool.text" = "ტექსტი"
+"transform.move" = "გადაადგილება"
+"transform.moveTo" = "გადატანა"
+"transform.nudge" = "მცირედ გადაწევა"
+"transform.nudgeSize" = "ზომის შეცვლა მცირედ გადაწევით"
+"transform.resize" = "ზომის შეცვლა"
+"transform.rotate" = "შემობრუნება"
+"transform.rotationOrigin" = "შემობრუნების ცენტრის გადატანა"
+"transform.scale" = "მასშტაბირება"
+"transform.setRotationOrigin" = "შემობრუნების ცენტრის დაყენება"
+"variable.addMode" = "რეჟიმის დამატება"
+"variable.bind" = "ცვლადის მიბმა"
+"variable.create" = "ცვლადის შექმნა"
+"variable.createCollection" = "ცვლადების კოლექციის შექმნა"
+"variable.delete" = "ცვლადის წაშლა"
+"variable.deleteCollection" = "კოლექციის წაშლა"
+"variable.duplicate" = "ცვლადის დუბლირება"
+"variable.export" = "ცვლადების ექსპორტირება"
+"variable.import" = "ცვლადების იმპორტი"
+"variable.list" = "ცვლადების სია"
+"variable.moveMode" = "რეჟიმის გადატანა"
+"variable.removeMode" = "რეჟიმის წაშლა"
+"variable.renameCollection" = "კოლექციის სახელის შეცვლა"
+"variable.renameMode" = "რეჟიმის სახელის შეცვლა"
+"variable.resetOverride" = "ცვლადის გადაფარვის ჩამოყრა"
+"variable.set" = "ცვლადის მნიშვნელობის დაყენება"
+"variable.setMode" = "ცვლადის რეჟიმის დაყენება"
+"variable.update" = "ცვლადის რედაქტირება"
+"vector.create" = "ვექტორი"
+"vector.deleteHeal" = "მონიშნულის წაშლა ხარვეზის შევსებით"
+"vector.edit.addVertex" = "წერტილის დამატება"
+"vector.edit.begin" = "ვექტორის რედაქტირება"
+"vector.edit.bend" = "სეგმენტის მოხრა"
+"vector.edit.bounds" = "მონიშნული წერტილების საზღვრები"
+"vector.edit.connect" = "წერტილების შეერთება"
+"vector.edit.cornerRadius" = "წერტილის კუთხის რადიუსი"
+"vector.edit.cut" = "ტრაექტორიის გაჭრა"
+"vector.edit.delete" = "წერტილების წაშლა"
+"vector.edit.end" = "რედაქტირების დასრულება"
+"vector.edit.erase" = "წაშლა"
+"vector.edit.lasso" = "ლასოთი მონიშვნა"
+"vector.edit.mirroring" = "სახელურების არეკვლა"
+"vector.edit.moveHandles" = "სახელურების გადატანა"
+"vector.edit.moveVertices" = "წერტილების გადატანა"
+"vector.edit.nudge" = "წერტილების მცირედ გადაწევა"
+"vector.edit.paint" = "საღებავის ვედრო"
+"vector.edit.pen" = "კალმის წერტილი"
+"vector.edit.penEnd" = "კალმის ტრაექტორიის დასრულება"
+"vector.edit.position" = "წერტილის პოზიცია"
+"vector.edit.resize" = "წერტილების ზომის შეცვლა"
+"vector.edit.rotate" = "წერტილების შემობრუნება"
+"vector.edit.select" = "წერტილების მონიშვნა"
+"vector.edit.selectAll" = "ყველა წერტილის მონიშვნა"
+"vector.edit.setHandle" = "სახელურის დაყენება"
+"vector.edit.smooth" = "წერტილების მოგლუვება ან გამახვილება"
+"vector.edit.state" = "ვექტორის რედაქტირების მდგომარეობა"
+"vector.edit.strokeCap" = "კონტურის დაბოლოება წერტილში"
+"vector.edit.strokeJoin" = "კონტურის შეერთება წერტილში"
+"vector.edit.tool" = "ვექტორის რედაქტირების ხელსაწყო"
+"vector.edit.transform" = "წერტილების გარდაქმნა"
+"vector.edit.widthPoint" = "სიგანის წერტილი"
+"vector.flatten" = "გაბრტყელება"
+"vector.join" = "მონიშნულის შეერთება"
+"vector.offset" = "ტრაექტორიის წანაცვლება"
+"vector.outlineStroke" = "კონტურის ფიგურად გარდაქმნა"
+"vector.reverse" = "ტრაექტორიის მიმართულების შებრუნება"
+"vector.simplify" = "ვექტორის გამარტივება"
+"vector.smoothJoin" = "მონიშნულის გლუვი შეერთება"
+"version.autosave" = "ვერსიის ავტოშენახვა"
+"version.delete" = "ვერსიის წაშლა"
+"version.duplicate" = "ვერსიის დუბლირება"
+"version.exitPreview" = "მიმდინარე ვერსიაზე დაბრუნება"
+"version.list" = "ვერსიების სია"
+"version.preview" = "ვერსიის ნახვა"
+"version.rename" = "ვერსიის სახელის შეცვლა"
+"version.restore" = "ვერსიის აღდგენა"
+"view.assets" = "რესურსების პანელი"
+"view.comments" = "კომენტარები"
+"view.contextMenu" = "კონტექსტური მენიუს ჩვენება"
+"view.design" = "დიზაინის პანელი"
+"view.designPrototype" = "გადართვა დიზაინსა და პროტოტიპს შორის"
+"view.devMode" = "დეველოპერის რეჟიმი"
+"view.frameOutlines" = "ჩარჩოების კონტურები"
+"view.fullscreen" = "სრული ეკრანი"
+"view.get" = "ხედის მიღება"
+"view.layers" = "შრეების პანელი"
+"view.layoutGrids" = "განლაგების ბადეები"
+"view.leftSidebar" = "მარცხენა გვერდითი ზოლის ჩვენება/დამალვა"
+"view.maskOutlines" = "ნიღბების კონტურები"
+"view.multiplayerCursors" = "სხვა მონაწილეების კურსორები"
+"view.nextFrame" = "შემდეგი ჩარჩოს მასშტაბირება"
+"view.nextPage" = "შემდეგი გვერდი"
+"view.nextRegion" = "შემდეგ არეზე ფოკუსირება"
+"view.outlines" = "კონტურები"
+"view.outlinesHiddenLayers" = "კონტურებში დამალული შრეების ჩართვა"
+"view.outlinesObjectBounds" = "კონტურებში ობიექტების საზღვრების ჩართვა"
+"view.outlinesSelection" = "მონიშნულის კონტურები"
+"view.pan" = "ხედის გადაადგილება"
+"view.panelWidths" = "პანელების სიგანის ჩამოყრა"
+"view.pixelGrid" = "პიქსელური ბადე"
+"view.pixelPreview" = "პიქსელების წინასწარი ნახვა"
+"view.prevFrame" = "წინა ჩარჩოს მასშტაბირება"
+"view.prevPage" = "წინა გვერდი"
+"view.previousRegion" = "წინა არეზე ფოკუსირება"
+"view.proofSrgb" = "ეკრანზე sRGB-ის სიმულაცია"
+"view.prototype" = "პროტოტიპის პანელი"
+"view.rulers" = "სახაზავები"
+"view.set" = "ხედის დაყენება"
+"view.slices" = "ნაჭრები"
+"view.snapGeometry" = "გეომეტრიაზე მიბმა"
+"view.snapObjects" = "ობიექტებზე მიბმა"
+"view.snapPixel" = "პიქსელურ ბადეზე მიბმა"
+"view.themeDark" = "ბნელი თემა"
+"view.themeLight" = "ღია თემა"
+"view.themeSystem" = "სისტემის თემის მიყოლა"
+"view.toggleUi" = "ინტერფეისის ჩვენება/დამალვა"
+"view.zoom100" = "მასშტაბი 100%"
+"view.zoom200" = "მასშტაბი 200%"
+"view.zoom50" = "მასშტაბი 50%"
+"view.zoomAt" = "მასშტაბის ხელსაწყო"
+"view.zoomFit" = "ეკრანში ჩატევა"
+"view.zoomIn" = "გადიდება"
+"view.zoomOut" = "დაპატარავება"
+"view.zoomSelection" = "მონიშნულის მასშტაბირება"
+"widget.click" = "ვიჯეტზე დაწკაპუნება"
+"widget.insert" = "ვიჯეტის ჩასმა"
+"widget.list" = "ვიჯეტების სია"
+"widget.menu" = "ვიჯეტის მენიუ"
+"widget.setText" = "ვიჯეტის ველის რედაქტირება"
+"window.focus" = "ფანჯრის წინა პლანზე გადმოტანა"
+"window.new" = "ახალი ფანჯარა"
+
+[menu]
+"bool.exclude" = "გამორიცხვა"
+"bool.flatten" = "გაბრტყელება"
+"bool.intersect" = "გადაკვეთა"
+"bool.subtract" = "გამოკლება"
+"bool.union" = "გაერთიანება"
+"file.duplicate" = "დუბლირება"
+"file.import" = "ფაილიდან იმპორტი…"
+"file.rename" = "სახელის შეცვლა"
+"libraries.open" = "ბიბლიოთეკების გახსნა"
+"select.sameEffect" = "ეფექტი"
+"select.sameFill" = "შევსება"
+"select.sameFont" = "შრიფტი"
+"select.sameInstance" = "ინსტანსი"
+"select.sameProperties" = "თვისებები"
+"select.sameStroke" = "კონტური"
+"select.sameText" = "ტექსტის თვისებები"
+"text.alignCenter" = "ტექსტის ცენტრში სწორება"
+"text.alignJustify" = "ტექსტის ორმხრივი სწორება"
+"text.alignLeft" = "ტექსტის მარცხნივ სწორება"
+"text.alignRight" = "ტექსტის მარჯვნივ სწორება"
+"view.assets" = "რესურსები"
+"view.design" = "დიზაინი"
+"view.layers" = "შრეები"
+"view.outlines" = "კონტურების ჩვენება"
+"view.outlinesHiddenLayers" = "დამალული შრეების ჩართვა"
+"view.outlinesObjectBounds" = "ობიექტების საზღვრების ჩართვა"
+"view.outlinesSelection" = "მონიშნულის კონტურების ჩვენება"
+"view.prototype" = "პროტოტიპი"
+"view.themeDark" = "ბნელი"
+"view.themeLight" = "ღია"
+"view.themeSystem" = "სისტემის მიყოლა"
diff --git a/crates/ui-egui/locales/ko.toml b/crates/ui-egui/locales/ko.toml
index a6a2f6bf..2f57b36c 100644
--- a/crates/ui-egui/locales/ko.toml
+++ b/crates/ui-egui/locales/ko.toml
@@ -18,6 +18,7 @@ status = "draft — needs native review"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: PR {prs}개, 커밋 {commits}개, +{added} / −{deleted}줄 (Δ {delta}), 바이너리 에셋 +{bin_added} / −{bin_deleted}, {first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "이 파일의 컬렉션과 그 모드 및 변수: 모드별로 값을 재정의하고 자체 변수를 추가할 수 있음"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "이 이름의 .figcraft 파일이 이미 있습니다. 바꾸려면 확장자까지 포함한 전체 이름을 선택하세요."
 "A layer on its own aligns to its frame: select more layers, or one in a frame" = "레이어 하나는 프레임에 맞춰 정렬됩니다: 레이어를 더 선택하거나 프레임 안의 레이어를 선택하세요"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "스프링은 멈출 때까지 재생됨. 길이는 질량, 강성, 감쇠로 결정됨"
 "About" = "정보"
@@ -34,6 +35,7 @@ status = "draft — needs native review"
 "Add a description" = "설명 추가"
 "Add a frame (F) or a shape (R) to get started" = "프레임(F) 또는 도형(R)을 추가해 시작하세요"
 "Add a layer or component to tile first" = "먼저 바둑판식으로 배열할 레이어나 컴포넌트를 추가하세요"
+"Add a minute" = "1분 추가"
 "Add a note for developers" = "개발자용 메모 추가"
 "Add action" = "액션 추가"
 "Add actions for when no condition holds" = "조건에 맞지 않을 때의 액션 추가"
@@ -41,6 +43,7 @@ status = "draft — needs native review"
 "Add another condition" = "조건 추가"
 "Add auto layout" = "자동 레이아웃 추가"
 "Add background behind overlay" = "오버레이 뒤에 배경 추가"
+"Add column" = "열 추가"
 "Add content to this slot" = "이 슬롯에 콘텐츠 추가"
 "Add dev resource" = "개발 리소스 추가"
 "Add effect" = "효과 추가"
@@ -52,6 +55,7 @@ status = "draft — needs native review"
 "Add library file…" = "라이브러리 파일 추가…"
 "Add max height" = "최대 높이 추가"
 "Add max width" = "최대 너비 추가"
+"Add measurement" = "측정 추가"
 "Add min height" = "최소 높이 추가"
 "Add min width" = "최소 너비 추가"
 "Add mode" = "모드 추가"
@@ -59,6 +63,7 @@ status = "draft — needs native review"
 "Add or update collections from a variables JSON" = "변수 JSON에서 컬렉션 추가 또는 업데이트"
 "Add properties to make instances configurable" = "속성을 추가해 인스턴스를 설정 가능하게 만들기"
 "Add reaction" = "반응 추가"
+"Add row" = "행 추가"
 "Add starting point" = "시작점 추가"
 "Add stroke" = "선 추가"
 "Add variant" = "배리언트 추가"
@@ -87,8 +92,13 @@ status = "draft — needs native review"
 "All comments" = "모든 댓글"
 "All components" = "모든 컴포넌트"
 "All fonts" = "모든 글꼴"
+"All objects" = "모든 개체"
 "All supported properties" = "지원되는 모든 속성"
 "All variables" = "모든 변수"
+"Along the bottom" = "아래쪽 가장자리를 따라"
+"Along the left" = "왼쪽 가장자리를 따라"
+"Along the right" = "오른쪽 가장자리를 따라"
+"Along the top" = "위쪽 가장자리를 따라"
 "Alpha" = "알파"
 "Alt+drag" = "Alt+드래그"
 "An invite link that opens FigCraft and joins" = "FigCraft를 열고 참여하는 초대 링크"
@@ -117,6 +127,7 @@ status = "draft — needs native review"
 "Archived" = "보관됨"
 "Arrange" = "배치"
 "Arrow" = "화살표"
+"Arrow at the end" = "끝에 화살표"
 "As typed" = "입력한 대로"
 "Asking the server…" = "서버에 확인하는 중…"
 "Assets" = "에셋"
@@ -147,6 +158,7 @@ status = "draft — needs native review"
 "Basics" = "기본"
 "Before" = "변경 전"
 "Bend" = "구부리기"
+"Between the selected layers" = "선택한 레이어 사이"
 "Bevel" = "베벨"
 "Binary assets added" = "추가된 바이너리 에셋"
 "Binary assets removed" = "제거된 바이너리 에셋"
@@ -164,6 +176,7 @@ status = "draft — needs native review"
 "Bottom" = "아래쪽"
 "Bottom left radius" = "왼쪽 아래 반경"
 "Bottom right radius" = "오른쪽 아래 반경"
+"Brainstorm" = "브레인스토밍"
 "Branch" = "브랜치"
 "Branch archived" = "브랜치 보관됨"
 "Branch merged" = "브랜치 병합됨"
@@ -188,8 +201,12 @@ status = "draft — needs native review"
 "C or ⇧C" = "C 또는 ⇧C"
 "CMYK colour" = "CMYK 색상"
 "Can view" = "보기 가능"
+"Check" = "체크"
 "Checking the server…" = "서버 확인 중…"
+"Chevron" = "셰브런"
 "Clear from this list" = "이 목록에서 지우기"
+"Clear results" = "결과 지우기"
+"Click objects to vote; click your badge to take a vote back" = "개체를 클릭해 투표하고, 내 배지를 클릭해 투표를 취소하세요"
 "Code or invite link" = "코드 또는 초대 링크"
 "Color profile: {name}" = "색상 프로필: {name}"
 "CSS custom properties…" = "CSS 사용자 정의 속성…"
@@ -213,7 +230,7 @@ status = "draft — needs native review"
 "Changes on main" = "메인의 변경 사항"
 "Changes on the branch" = "브랜치의 변경 사항"
 "Changes unknown" = "변경 내용 알 수 없음"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "위에서 React, Leptos, SwiftUI, Compose 또는 Flutter를 선택해 이 컴포넌트를 코드에 연결하세요."
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "위에서 React, Leptos, Vue, SwiftUI, Compose, ArkUI 또는 Flutter를 선택해 이 컴포넌트를 코드에 연결하세요."
 "Choose another profile to change it." = "변경하려면 다른 프로필을 선택하세요."
 "Choose collection" = "컬렉션 선택"
 "Choose image" = "이미지 선택"
@@ -234,7 +251,6 @@ status = "draft — needs native review"
 "Close tab" = "탭 닫기"
 "Close version history" = "버전 기록 닫기"
 "Close when clicking outside" = "바깥쪽을 클릭하면 닫기"
-"Close without saving" = "저장하지 않고 닫기"
 "Code" = "코드"
 "Code syntax" = "코드 구문"
 "Collapse" = "접기"
@@ -261,6 +277,8 @@ status = "draft — needs native review"
 "Commits" = "커밋"
 "Company" = "회사"
 "Compare changes" = "변경 사항 비교"
+"Compare with" = "비교 대상"
+"Compatibility notes" = "호환성 참고 사항"
 "Completed" = "완료됨"
 "Component" = "컴포넌트"
 "Component name" = "컴포넌트 이름"
@@ -275,11 +293,11 @@ status = "draft — needs native review"
 "Connected" = "연결됨"
 "Connected to code: {from}" = "코드에 연결됨: {from}"
 "Connection lost, reconnecting (attempt {attempt})…" = "연결이 끊어짐. 다시 연결하는 중({attempt}번째 시도)…"
+"Connector" = "커넥터"
 "Constrain proportions" = "비율 고정"
 "Constraints" = "제약"
 "Content" = "콘텐츠"
 "Contents hidden" = "콘텐츠 숨김"
-"Contents only" = "콘텐츠만"
 "Contextual alternates" = "문맥 대체 글자"
 "Contrast" = "대비"
 "Contributors" = "기여자"
@@ -303,7 +321,9 @@ status = "draft — needs native review"
 "Corner radius" = "모서리 반경"
 "Corner smoothing" = "모서리 스무딩"
 "Couldn't reach {server}: showing what this computer remembers." = "{server}에 연결할 수 없음: 이 컴퓨터가 기억하는 내용을 표시함."
+"Couldn't read {name}." = "{name}을(를) 읽을 수 없습니다."
 "Couldn't save automatically: {error}" = "자동으로 저장할 수 없음: {error}"
+"Couldn't save the file" = "파일을 저장할 수 없음"
 "Count" = "개수"
 "Create" = "만들기"
 "Create a variable collection first" = "먼저 변수 컬렉션을 만드세요"
@@ -326,6 +346,7 @@ status = "draft — needs native review"
 "Current version" = "현재 버전"
 "Cursor chat" = "커서 채팅"
 "Custom" = "사용자 지정"
+"Custom size" = "사용자 지정 크기"
 "Cut" = "잘라내기"
 "Dark" = "다크"
 "Darken" = "어둡게 하기"
@@ -356,6 +377,7 @@ status = "draft — needs native review"
 "Description" = "설명"
 "Description (optional)" = "설명(선택 사항)"
 "Design" = "디자인"
+"Design panel" = "디자인 패널"
 "Desktop" = "데스크톱"
 "Destination" = "대상"
 "Detach alias" = "별칭 분리"
@@ -366,6 +388,7 @@ status = "draft — needs native review"
 "Detach variable" = "변수 분리"
 "Details" = "세부 정보"
 "Dev Mode" = "개발 모드"
+"Dev Mode only inspects: switch to Design (Shift+D) to edit" = "개발 모드는 검사 전용입니다. 편집하려면 디자인(Shift+D)으로 전환하세요"
 "Dev resources" = "개발 리소스"
 "Development" = "개발"
 "Device" = "기기"
@@ -382,6 +405,7 @@ status = "draft — needs native review"
 "Distribute horizontal spacing" = "수평 간격 균등 분포"
 "Distribute vertical spacing" = "수직 간격 균등 분포"
 "Divider" = "구분선"
+"Don't Save" = "저장 안 함"
 "Don't truncate" = "자르지 않음"
 "Done" = "완료"
 "Done editing" = "편집 완료"
@@ -412,6 +436,8 @@ status = "draft — needs native review"
 "Effect settings" = "효과 설정"
 "Effect styles" = "효과 스타일"
 "Effects" = "효과"
+"Curved" = "곡선"
+"Elbow" = "꺾은선"
 "Ellipse" = "타원"
 "Ellipses" = "타원"
 "Else" = "그 외"
@@ -420,6 +446,7 @@ status = "draft — needs native review"
 "Empty" = "비어 있음"
 "End" = "끝"
 "End point" = "끝점"
+"End vote" = "투표 종료"
 "Ends the session; everyone keeps their copy" = "세션을 종료함. 각자의 사본은 그대로 유지됨"
 "Enter" = "Enter"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "figcraft-server 주소를 입력하고 찾아보기를 눌러 제공되는 플러그인을 확인하세요."
@@ -460,6 +487,7 @@ status = "draft — needs native review"
 "False" = "거짓"
 "Fetching from the server…" = "서버에서 가져오는 중…"
 "FigCraft couldn't open its window: {error}" = "FigCraft 창을 열 수 없음: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft는 아직 이 파일의 모든 기능을 지원하지 않습니다. 참고 사항에는 가져온 사본에서 빠지거나 바뀐 내용이 나와 있으며, 원본 파일은 바뀌지 않습니다."
 "File" = "파일"
 "File name" = "파일 이름"
 "File published" = "파일 게시됨"
@@ -492,6 +520,7 @@ status = "draft — needs native review"
 "Flip text to the other side" = "텍스트를 반대쪽으로 뒤집기"
 "Flip vertical" = "세로로 뒤집기"
 "Flip width profile" = "너비 프로필 뒤집기"
+"Flow chart" = "순서도"
 "Flow starting point" = "플로우 시작점"
 "Flow starting points" = "플로우 시작점"
 "Flows" = "플로우"
@@ -541,6 +570,7 @@ status = "draft — needs native review"
 "Hanging list" = "내어쓰기 목록"
 "Hanging punctuation" = "문장 부호 내어쓰기"
 "Hard light" = "하드 라이트"
+"Heart" = "하트"
 "Height" = "높이"
 "Help" = "도움말"
 "Help and resources" = "도움말 및 리소스"
@@ -551,6 +581,7 @@ status = "draft — needs native review"
 "Hide from publishing" = "게시에서 숨기기"
 "Hide section contents" = "섹션 콘텐츠 숨기기"
 "Highlight layers on hover" = "마우스를 올리면 레이어 강조"
+"Highlighter" = "형광펜"
 "Highlights" = "밝은 영역"
 "Hold Alt" = "Alt 누른 채로"
 "Hold Alt+Z" = "Alt+Z 누른 채로"
@@ -575,12 +606,16 @@ status = "draft — needs native review"
 "If" = "조건"
 "If {condition}" = "조건: {condition}"
 "Ignore auto layout (absolute position)" = "자동 레이아웃 무시(절대 위치)"
+"Ignore overlapping layers" = "겹치는 레이어 무시"
 "Image" = "이미지"
+"Images" = "이미지"
 "Import" = "가져오기"
 "Import path" = "가져오기 경로"
 "Import plugin from manifest" = "매니페스트에서 플러그인 가져오기"
 "Import plugin from manifest…" = "매니페스트에서 플러그인 가져오기…"
+"Import report" = "가져오기 보고서"
 "Import variables" = "변수 가져오기"
+"Imported document" = "가져온 문서"
 "Imported {name}" = "{name} 가져옴"
 "Imported {n} new variables, updated {updated}" = { other = "새 변수 {n}개를 가져오고 {updated}개를 업데이트함" }
 "Import…" = "가져오기…"
@@ -608,11 +643,13 @@ status = "draft — needs native review"
 "Instance swap (no other component)" = "인스턴스 교체(다른 컴포넌트 없음)"
 "Instances" = "인스턴스"
 "Instant" = "즉시"
+"Intensity" = "강도"
 "Interaction" = "인터랙션"
 "Interactions" = "인터랙션"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "인터페이스 디자인과 프로토타이핑. Rust로 처음부터 작성한 무료 오픈 소스 클린룸 디자인 도구이며 ArtCraft Crafting Apps의 하나."
 "Intersect" = "교차"
 "Intersects" = "교차"
+"Invalid color" = "잘못된 색상"
 "Invite link" = "초대 링크"
 "Invite link copied" = "초대 링크 복사됨"
 "It asks permission to:" = "다음 권한을 요청함:"
@@ -628,6 +665,8 @@ status = "draft — needs native review"
 "Join|stroke" = "선 연결"
 "Just now" = "방금"
 "Justify" = "양쪽 정렬"
+"Kanban board" = "칸반 보드"
+"Keep a measurement on the canvas for developers" = "개발자를 위해 캔버스에 측정 유지"
 "Keep appearance" = "모양 유지"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "\"모양 유지\"는 모든 색상 값을 {profile}(으)로 변환해 색이 똑같아 보이게 함. \"값 유지\"는 숫자를 그대로 두므로 색이 달라짐."
 "Keep tool selected after use" = "사용 후에도 도구 선택 유지"
@@ -701,6 +740,7 @@ status = "draft — needs native review"
 "Mark as resolved" = "해결됨으로 표시"
 "Mark as unread" = "읽지 않음으로 표시"
 "Mark as unresolved" = "미해결로 표시"
+"Marker" = "마커"
 "Mask" = "마스크"
 "Mass · Stiffness · Damping" = "질량 · 강성 · 감쇠"
 "Match (empty: the whole name)" = "일치(비우면 이름 전체)"
@@ -709,6 +749,7 @@ status = "draft — needs native review"
 "Max lines" = "최대 줄 수"
 "Maximize" = "최대화"
 "Measure to the selection" = "선택 항목까지 측정"
+"Measurements" = "측정"
 "Merge into main" = "메인에 병합"
 "Merge regions" = "영역 병합"
 "Merge the branch into the main file (one undo step) and archive it" = "브랜치를 메인 파일에 병합(실행 취소 한 번)하고 보관"
@@ -717,6 +758,7 @@ status = "draft — needs native review"
 "Min H" = "최소 H"
 "Min W" = "최소 W"
 "Minimize" = "최소화"
+"Minutes" = "분"
 "Mirror angle" = "각도 대칭"
 "Mirror angle and length" = "각도와 길이 대칭"
 "Mirroring" = "대칭"
@@ -757,7 +799,9 @@ status = "draft — needs native review"
 "Named instance" = "명명된 인스턴스"
 "Navigate to" = "이동 대상"
 "Nested instance" = "중첩된 인스턴스"
+"New board" = "새 보드"
 "New design file" = "새 디자인 파일"
+"Next frame" = "다음 프레임"
 "Next or previous control in the focused region" = "포커스된 영역의 다음 또는 이전 컨트롤"
 "Next ready for dev" = "다음 개발 준비 완료"
 "Next size option" = "다음 크기 옵션"
@@ -767,12 +811,15 @@ status = "draft — needs native review"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "브랜치 없음. 브랜치는 변경을 시험해 본 뒤 검토하고 병합하는 파일 사본임."
 "No category" = "카테고리 없음"
 "No changes" = "변경 사항 없음"
+"No color styles" = "색상 스타일 없음"
 "No colour variables fit here." = "여기에 맞는 색상 변수가 없음."
 "No colour variables yet. Create them in Local variables." = "아직 색상 변수가 없음. 로컬 변수에서 만드세요."
 "No comments yet" = "아직 댓글 없음"
+"No compatibility warnings reported" = "보고된 호환성 경고 없음"
 "No components yet. Select layers and press {keys}." = "아직 컴포넌트가 없음. 레이어를 선택하고 {keys}를 누르세요."
 "No conflicts." = "충돌 없음."
 "No contributor data was built into this copy." = "이 사본에는 기여자 데이터가 포함되지 않음."
+"No device" = "기기 없음"
 "No fonts match" = "일치하는 글꼴 없음"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "참여 코드 없음(서버가 참여 코드 이전 버전이거나 이 주소를 코드에 담을 수 없음): 대신 링크를 공유하세요."
 "No layer changes to show." = "표시할 레이어 변경 사항 없음."
@@ -803,6 +850,7 @@ status = "draft — needs native review"
 "No text styles yet. Click + to create one from the selected text." = "아직 텍스트 스타일이 없음. +를 클릭해 선택한 텍스트로 만드세요."
 "No variables fit here." = "여기에 맞는 변수가 없음."
 "No variables yet. Create them in Local variables." = "아직 변수가 없음. 로컬 변수에서 만드세요."
+"No votes yet" = "아직 투표가 없습니다"
 "Nobody else is here yet" = "아직 다른 사람이 없음"
 "Noise" = "노이즈"
 "None" = "없음"
@@ -815,6 +863,7 @@ status = "draft — needs native review"
 "Not read yet" = "아직 읽지 않음"
 "Not shared" = "공유 안 함"
 "Note {n}" = "메모 {n}"
+"Nothing changed since this version." = "이 버전 이후 변경된 내용 없음."
 "Nothing changed since this was marked ready for dev." = "개발 준비 완료로 표시된 뒤 변경된 내용 없음."
 "Nothing here yet. Set a frame's status to list it." = "아직 아무것도 없음. 프레임의 상태를 설정하면 목록에 표시됨."
 "Nothing online yet. Use Share on a file to put it online and it is listed here." = "아직 온라인에 올린 파일이 없음. 파일에서 공유를 사용해 온라인에 올리면 여기에 표시됨."
@@ -848,6 +897,7 @@ status = "draft — needs native review"
 "Open branch" = "브랜치 열기"
 "Open file" = "파일 열기"
 "Open files" = "열린 파일"
+"Open presentations" = "열린 프레젠테이션"
 "Open in focus view" = "포커스 보기로 열기"
 "Open in new window" = "새 창에서 열기"
 "Open invite links in FigCraft" = "초대 링크를 FigCraft에서 열기"
@@ -856,6 +906,7 @@ status = "draft — needs native review"
 "Open overlay" = "오버레이 열기"
 "Open prototype preview" = "프로토타입 미리 보기 열기"
 "Open variables ({count})" = "변수 열기({count})"
+"Opened as a new document" = "새 문서로 열림"
 "Opened “{name}” in a new tab" = "\"{name}\"을(를) 새 탭에서 열었음"
 "Open|comments" = "미해결"
 "Options" = "옵션"
@@ -878,7 +929,12 @@ status = "draft — needs native review"
 "PDF print settings" = "PDF 인쇄 설정"
 "Padding" = "패딩"
 "Page" = "페이지"
+"Page deleted" = "페이지가 삭제됨"
 "Pages" = "페이지"
+"Pages added to the document" = "문서에 페이지 추가됨"
+"Pause" = "일시 정지"
+"Pink" = "분홍"
+"Placed on the current page" = "현재 페이지에 배치됨"
 "Pages: {pages}" = "페이지: {pages}"
 "Paint bucket" = "페인트 통"
 "Pan the canvas" = "캔버스 이동"
@@ -893,6 +949,7 @@ status = "draft — needs native review"
 "Paste a team library link (a view link)" = "팀 라이브러리 링크(보기 링크) 붙여 넣기"
 "Paste here" = "여기에 붙여 넣기"
 "Paste to replace" = "붙여 넣어 바꾸기"
+"Pasted design layers; {n} kinds of content were left out" = { other = "디자인 레이어를 붙여 넣음. 콘텐츠 {n}종은 제외됨" }
 "Pattern" = "패턴"
 "Pattern alignment" = "패턴 정렬"
 "Pattern scale" = "패턴 배율"
@@ -918,6 +975,7 @@ status = "draft — needs native review"
 "Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "플러그인은 FigCraft 샌드박스에서 파일, 네트워크, 시계 없이 실행됨. 신뢰할 수 있는 플러그인만 설치하세요."
 "Plus darker" = "더 어둡게"
 "Plus lighter" = "더 밝게"
+"Plus one" = "플러스 원"
 "Point" = "점"
 "Points" = "점"
 "Polygon" = "다각형"
@@ -943,6 +1001,7 @@ status = "draft — needs native review"
 "Preview" = "미리 보기"
 "Preview this flow" = "이 플로우 미리 보기"
 "Preview this frame" = "이 프레임 미리 보기"
+"Previous frame" = "이전 프레임"
 "Previous ready for dev" = "이전 개발 준비 완료"
 "Progressive" = "점진적"
 "Properties" = "속성"
@@ -963,6 +1022,7 @@ status = "draft — needs native review"
 "Push" = "밀어내기"
 "Push changes to main component" = "변경 사항을 메인 컴포넌트에 푸시"
 "Put text on path" = "텍스트를 패스에 배치"
+"Question" = "질문"
 "R" = "R"
 "Radial" = "방사형"
 "Radius" = "반경"
@@ -980,10 +1040,12 @@ status = "draft — needs native review"
 "Reduce motion" = "동작 줄이기"
 "Refraction" = "굴절"
 "Regular expression" = "정규식"
+"Relative to" = "기준"
 "Remove" = "제거"
 "Remove all" = "모두 제거"
 "Remove annotation" = "주석 제거"
 "Remove auto layout" = "자동 레이아웃 제거"
+"Remove column" = "열 제거"
 "Remove dev resource" = "개발 리소스 제거"
 "Remove export setting" = "내보내기 설정 제거"
 "Remove from server" = "서버에서 제거"
@@ -991,10 +1053,12 @@ status = "draft — needs native review"
 "Remove guide" = "안내선 제거"
 "Remove interaction" = "인터랙션 제거"
 "Remove library from this file" = "이 파일에서 라이브러리 제거"
+"Remove measurement" = "측정 제거"
 "Remove min and max" = "최소 및 최대 제거"
 "Remove min and max height" = "최소 및 최대 높이 제거"
 "Remove min and max width" = "최소 및 최대 너비 제거"
 "Remove regions" = "영역 제거"
+"Remove row" = "행 제거"
 "Remove slot" = "슬롯 제거"
 "Remove starting point" = "시작점 제거"
 "Remove stop" = "정지점 제거"
@@ -1007,6 +1071,7 @@ status = "draft — needs native review"
 "Removed" = "제거됨"
 "Removed from the server" = "서버에서 제거됨"
 "Removed since it was marked" = "표시된 뒤 제거됨"
+"Removed since this version" = "이 버전 이후 삭제됨"
 "Rename" = "이름 바꾸기"
 "Rename duplicated layers" = "복제한 레이어 이름 바꾸기"
 "Rename folder" = "폴더 이름 바꾸기"
@@ -1036,6 +1101,7 @@ status = "draft — needs native review"
 "Resize by the nudge amount" = "미세 이동 거리만큼 크기 조정"
 "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "프레임 크기를 기기 화면(기기가 없으면 창)에 맞게 조정: 제약과 자동 레이아웃이 반응함"
 "Resize to fit" = "크기 맞춤"
+"Resizing" = "크기 조정"
 "Resolve" = "해결"
 "Resolve change" = "변경 사항 해결"
 "Resolved" = "해결됨"
@@ -1046,6 +1112,9 @@ status = "draft — needs native review"
 "Restore main component" = "메인 컴포넌트 복원"
 "Restore this version" = "이 버전 복원"
 "Restored “{name}”" = "\"{name}\" 복원됨"
+"Retrospective" = "회고"
+"Results" = "결과"
+"Resume" = "재개"
 "Reverse the order" = "순서 뒤집기"
 "Reversed triangle" = "역삼각형"
 "Review and merge" = "검토 및 병합"
@@ -1061,6 +1130,7 @@ status = "draft — needs native review"
 "Rotation jitter" = "회전 지터"
 "Round" = "둥글게"
 "Rounded" = "둥근"
+"Rounded rectangle" = "둥근 사각형"
 "Row" = "행"
 "Row gap" = "행 간격"
 "Row sizes" = "행 크기"
@@ -1076,6 +1146,7 @@ status = "draft — needs native review"
 "Save" = "저장"
 "Save as" = "다른 이름으로 저장"
 "Save as preset…" = "프리셋으로 저장…"
+"Save file" = "파일 저장"
 "Save files automatically" = "파일 자동 저장"
 "Save version  {key}" = "버전 저장  {key}"
 "Saved" = "저장됨"
@@ -1107,12 +1178,14 @@ status = "draft — needs native review"
 "Select all with same" = "같은 항목 모두 선택"
 "Select layer" = "레이어 선택"
 "Select layers to apply the style to" = "스타일을 적용할 레이어를 선택하세요"
+"Select layers with this color" = "이 색상의 레이어 선택"
 "Select overlapping shapes" = "겹친 도형 선택"
 "Select points to edit their position, radius and mirroring" = "점을 선택해 위치, 반경, 대칭 편집"
 "Select slot" = "슬롯 선택"
 "Selection" = "선택 항목"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "선택 상자, {w} × {h}, 위치 {x}, {y}: 화살표로 이동, Shift+화살표 또는 {cmd}+화살표로 크기 조정, Enter로 선택, Escape로 취소"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "선택 상자: 화살표로 이동, Shift+화살표 또는 {cmd}+화살표로 크기 조정, Enter로 선택, Escape로 취소"
+"Selection colors" = "선택 항목 색상"
 "Send backward" = "뒤로 보내기"
 "Send report" = "신고 보내기"
 "Send to back" = "맨 뒤로 보내기"
@@ -1128,6 +1201,7 @@ status = "draft — needs native review"
 "Shape" = "도형"
 "Shape builder" = "도형 빌더"
 "Shape tools" = "도형 도구"
+"Shapes" = "도형"
 "Share" = "공유"
 "Share this file" = "이 파일 공유"
 "Share: live session, export" = "공유: 라이브 세션, 내보내기"
@@ -1185,10 +1259,13 @@ status = "draft — needs native review"
 "Space+drag" = "Space+드래그"
 "Spacing" = "간격"
 "Spam, stolen work, abuse…" = "스팸, 도용, 악용…"
+"Speech bubble" = "말풍선"
 "Splay" = "펼침"
 "Spotlight me" = "나를 스포트라이트"
 "Spread" = "확산"
 "Square" = "정사각형"
+"Stamp" = "스탬프"
+"Stamps" = "스탬프"
 "Standard" = "표준"
 "Standard ligatures" = "표준 합자"
 "Star" = "별"
@@ -1197,17 +1274,25 @@ status = "draft — needs native review"
 "Start ascending from / stop descending at" = "오름차순 시작 값 / 내림차순 끝 값"
 "Start from a blank canvas" = "빈 캔버스로 시작"
 "Start on path" = "패스 시작 위치"
+"Start on the Home screen" = "홈에서 시작"
 "Start point" = "시작점"
 "Start sharing" = "공유 시작"
+"Start vote" = "투표 시작"
 "Starting to share…" = "공유를 시작하는 중…"
 "Status" = "상태"
 "Sticky" = "고정"
+"Sticky note" = "스티커 메모"
+"Sticky note colors" = "스티커 메모 색상"
+"Sticky notes" = "스티커 메모"
+"Sticky notes, shapes and connectors" = "스티커 메모, 도형, 커넥터"
 "Stop" = "중지"
 "Stop following {name}" = "{name} 따라가기 중지"
 "Stop session" = "세션 중지"
 "Stop sharing" = "공유 중지"
 "Stop spotlighting" = "스포트라이트 중지"
+"Stop timer" = "타이머 중지"
 "Stop {n}  {hex}" = "정지점 {n}  {hex}"
+"Straight" = "직선"
 "Stretch" = "늘이기"
 "Strikethrough" = "취소선"
 "String" = "문자열"
@@ -1247,10 +1332,12 @@ status = "draft — needs native review"
 "Tell the server's operator what is wrong with it" = "무엇이 문제인지 서버 운영자에게 알리기"
 "Temperature" = "색온도"
 "Template" = "템플릿"
+"Templates" = "템플릿"
 "Terms" = "약관"
 "Text" = "텍스트"
 "Text align" = "텍스트 정렬"
 "Text content" = "텍스트 내용"
+"Text size" = "텍스트 크기"
 "Text style" = "텍스트 스타일"
 "Text styles" = "텍스트 스타일"
 "Texts" = "텍스트"
@@ -1281,13 +1368,18 @@ status = "draft — needs native review"
 "This server is open to the public: no key needed." = "이 서버는 누구에게나 열려 있음: 키가 필요 없음."
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "이 서버는 키가 필요함: 주소에 ?key=…를 추가하세요(서버 컴퓨터에서 `figcraft-server key`로 확인)."
 "This server takes files only with its key: see Advanced." = "이 서버는 키가 있어야만 파일을 받음: 고급을 참고하세요."
+"Thumbs up" = "좋아요"
+"This version can't be read." = "이 버전을 읽을 수 없습니다."
+"This version doesn't have it: all of it is new." = "이 버전에는 없습니다. 모두 새 항목입니다."
 "Tidy up" = "정돈"
 "Tile" = "타일"
 "Tile type" = "타일 유형"
+"Timer" = "타이머"
 "Tint" = "색조 보정"
 "Title" = "제목"
 "Title case" = "제목 대소문자"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "이 라이브러리를 팀과 공유하려면 파일을 서버에 게시(공유 ▸ 서버에 게시…)한 다음 그곳에서 라이브러리를 게시하세요."
+"To the layer around it" = "감싸는 레이어까지"
 "Toggle" = "전환"
 "Toggle light/dark theme" = "라이트/다크 테마 전환"
 "Toggle visibility" = "표시 여부 전환"
@@ -1297,8 +1389,10 @@ status = "draft — needs native review"
 "Top left radius" = "왼쪽 위 반경"
 "Top right radius" = "오른쪽 위 반경"
 "Transform" = "변형"
+"Triangle" = "삼각형"
 "Triangle arrow" = "삼각 화살표"
 "Trigger" = "트리거"
+"Trigger layer" = "트리거 레이어"
 "True" = "참"
 "Truncate text" = "텍스트 자르기"
 "Truncate with an ellipsis" = "줄임표로 자르기"
@@ -1319,7 +1413,7 @@ status = "draft — needs native review"
 "Unread" = "읽지 않음"
 "Unresolve" = "미해결로 되돌리기"
 "Unsaved changes" = "저장되지 않은 변경 사항"
-"Unsaved changes in {names}. Close the window and lose them?" = "{names}에 저장되지 않은 변경 사항이 있음. 창을 닫고 변경 사항을 버릴까요?"
+"Unsaved changes in {names}. Save them before closing?" = "{names}에 저장되지 않은 변경 사항이 있음. 닫기 전에 저장할까요?"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "저장되지 않은 변경 사항: 먼저 저장({save})하거나 {alt}-클릭으로 탭을 닫아 버리세요"
 "Unsaved changes: save first, or close again with {key} to discard" = "저장되지 않은 변경 사항: 먼저 저장하거나 {key}로 다시 닫아 버리세요"
 "Up" = "위"
@@ -1338,6 +1432,7 @@ status = "draft — needs native review"
 "Use as mask" = "마스크로 사용"
 "Use auto layout" = "자동 레이아웃 사용"
 "Use number keys for opacity" = "숫자 키로 불투명도 변경"
+"Use the .figcraft or .fig extension." = ".figcraft 또는 .fig 확장자를 사용하세요."
 "Use the layer's fill" = "레이어의 채우기 사용"
 "Used in {files} · {instances}" = "{files}에서 사용 · {instances}"
 "Username" = "사용자 이름"
@@ -1372,6 +1467,8 @@ status = "draft — needs native review"
 "Visibility" = "표시 여부"
 "Visible" = "표시됨"
 "Vivid" = "선명하게"
+"Votes per person" = "1인당 투표 수"
+"Voting session" = "투표 세션"
 "WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND가 설정되어 사용할 그래픽 API를 지정하고 있습니다. 설정을 해제하면 FigCraft가 선택합니다."
 "Warm" = "따뜻하게"
 "Watch" = "시계"
@@ -1380,15 +1477,19 @@ status = "draft — needs native review"
 "WebSocket URL" = "WebSocket URL"
 "WebSocket URL copied" = "WebSocket URL 복사됨"
 "Wedge" = "쐐기"
+"Weekly planner" = "주간 계획표"
 "Weight" = "굵기"
+"What changed since a saved version" = "저장된 버전 이후 변경된 내용"
 "What changed since it was marked ready for dev" = "개발 준비 완료로 표시된 뒤 변경된 내용"
 "What is wrong with this file? The server's operator gets your report." = "이 파일에 어떤 문제가 있나요? 신고는 서버 운영자에게 전달됨."
 "What it's for" = "용도"
 "What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "무엇에서 바뀌었는지 알 수 없음: FigCraft가 개발 준비 완료 프레임의 사본을 보관하기 전에 변경됨. 변경을 해결(또는 다시 준비 완료로 표시)하면 이후부터 비교함."
+"When marked ready" = "준비 완료로 표시한 시점"
 "While hovering" = "마우스를 올린 동안"
 "While pressing" = "누르는 동안"
 "White" = "흰색"
 "Who runs it, its terms and how long it keeps files" = "운영자, 약관, 파일 보관 기간"
+"Whole screen" = "전체 화면"
 "Why it changed" = "변경 이유"
 "Widgets" = "위젯"
 "Width" = "너비"
@@ -1426,25 +1527,120 @@ status = "draft — needs native review"
 "call any command its access allows" = "접근 권한이 허용하는 모든 명령 호출"
 "call only: {commands}" = "다음 명령만 호출: {commands}"
 "can edit the document" = "문서를 편집할 수 있음"
+"can save files" = "파일을 저장할 수 있음"
+"conditional prototype actions nested too deeply were skipped" = "너무 깊게 중첩된 조건부 프로토타입 액션을 건너뜀"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "평가할 수 없는 조건이 있는 조건부 프로토타입 액션을 건너뜀"
+"connector label background was skipped: style data is missing" = "커넥터 레이블 배경을 건너뜀: 스타일 데이터가 없음"
+"connector label was skipped: background bounds are invalid" = "커넥터 레이블을 건너뜀: 배경 경계가 잘못됨"
+"connector label was skipped: background transform is invalid" = "커넥터 레이블을 건너뜀: 배경 변형이 잘못됨"
+"connector label was skipped: composed text transform is invalid" = "커넥터 레이블을 건너뜀: 합성된 텍스트 변형이 잘못됨"
+"connector label was skipped: derived background bounds are missing" = "커넥터 레이블을 건너뜀: 계산된 배경 경계가 없음"
+"connector label was skipped: derived text bounds are missing" = "커넥터 레이블을 건너뜀: 계산된 텍스트 경계가 없음"
+"connector label was skipped: text bounds are invalid" = "커넥터 레이블을 건너뜀: 텍스트 경계가 잘못됨"
+"connector label was skipped: text style data is missing" = "커넥터 레이블을 건너뜀: 텍스트 스타일 데이터가 없음"
+"connector label was skipped: text transform is invalid" = "커넥터 레이블을 건너뜀: 텍스트 변형이 잘못됨"
+"connector labels were skipped" = "커넥터 레이블을 건너뜀"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "커넥터 레이어는 정적인 프레임/벡터 스냅샷으로 가져오며 레이블이 있으면 함께 가져옴. 끝점의 동적 바인딩은 유지되지 않음"
+"connector snapshot vector data is missing; connector was left empty" = "커넥터 스냅샷의 벡터 데이터가 없어 커넥터를 비워 둠"
+"connectors whose ends can't be placed are empty" = "끝점을 배치할 수 없는 커넥터는 비어 있음"
 "crop marks" = "재단선 표시"
+"damaged vector geometry was skipped" = "손상된 벡터 지오메트리를 건너뜀"
+"damaged vector networks import as outlines" = "손상된 벡터 네트워크는 윤곽선으로 가져옴"
 "development: {path}" = "개발: {path}"
+"document children other than pages were skipped" = "페이지가 아닌 문서 하위 항목을 건너뜀"
+"duplicate grid track sizing entries use equal tracks" = "중복된 그리드 트랙 크기 항목은 균등한 트랙을 사용함"
 "e.g. count + 1" = "예: count + 1"
 "e.g. count >= 3 and not done" = "예: count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "저장된 경로가 없는 꺾인 커넥터와 곡선 커넥터는 직선으로 가져옴"
+"entries without a node type were skipped" = "노드 유형이 없는 항목을 건너뜀"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "브라우저, 채팅, 이메일의 figcraft:// 링크로 이 앱을 열고 세션에 참여함."
+"filled areas of a vector with their own fill use the layer's fill" = "자체 채우기가 있는 벡터의 채워진 영역은 레이어의 채우기를 사용함"
 "from {server}" = "{server}에서"
+"gamepad triggers without exactly one known controller button were skipped" = "알려진 컨트롤러 버튼이 정확히 하나가 아닌 게임패드 트리거를 건너뜀"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "그리드 트랙 목록이 1000개 항목을 넘어 트랙은 기본 균등 크기를 사용함"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "그리드 트랙 크기가 지원되지 않거나 잘못되어 해당 트랙은 균등 크기를 사용함"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "그리드 트랙 크기 목록이 1000개 항목을 넘어 트랙은 기본 균등 크기를 사용함"
 "hidden" = "숨김"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "필터 컨테이너가 둘 다 있어 이미지 필터가 모호하므로 필터 변환을 건너뜀"
+"image filters use FigCraft's approximate renderer" = "이미지 필터는 FigCraft의 근사 렌더링을 사용함"
+"instance swap properties whose default component isn't in the file were skipped" = "기본 컴포넌트가 파일에 없는 인스턴스 교체 속성을 건너뜀"
+"instances inside their own main component were imported as frames" = "자체 메인 컴포넌트 안에 있는 인스턴스는 프레임으로 가져옴"
+"instances of components that aren't in the file show no layers" = "파일에 없는 컴포넌트의 인스턴스에는 레이어가 표시되지 않음"
+"instances of components that aren't in the file were imported as frames" = "파일에 없는 컴포넌트의 인스턴스는 프레임으로 가져옴"
+"instances that would nest a component inside itself were imported as frames" = "컴포넌트를 자기 안에 중첩하게 되는 인스턴스는 프레임으로 가져옴"
+"instances without a main component were imported as empty frames" = "메인 컴포넌트가 없는 인스턴스는 빈 프레임으로 가져옴"
+"invalid internal .fig text path data was ignored" = "잘못된 .fig 내부 패스 위 텍스트 데이터를 무시함"
+"invalid or oversized vector networks import as outlines" = "잘못되었거나 너무 큰 벡터 네트워크는 윤곽선으로 가져옴"
+"invalid or oversized vector path data was skipped" = "잘못되었거나 너무 큰 벡터 경로 데이터를 건너뜀"
+"key triggers without a supported key were skipped" = "지원되는 키가 없는 키 트리거를 건너뜀"
+"key up triggers import as key presses" = "키를 뗄 때 트리거는 키 누름으로 가져옴"
+"layers without a position were placed at their parent's origin" = "위치가 없는 레이어는 상위 요소의 원점에 배치됨"
+"layers without a type were skipped" = "유형이 없는 레이어를 건너뜀"
+"legacy image filter container is unsupported; filter conversion was skipped" = "레거시 이미지 필터 컨테이너는 지원되지 않아 필터 변환을 건너뜀"
 "locked" = "잠김"
+"malformed image filters container was skipped" = "잘못된 형식의 이미지 필터 컨테이너를 건너뜀"
+"malformed image paintFilter container was skipped" = "잘못된 형식의 이미지 paintFilter 컨테이너를 건너뜀"
+"malformed slot content assignment was skipped" = "잘못된 형식의 슬롯 콘텐츠 할당을 건너뜀"
 "no bleed" = "도련 없음"
 "nobody else here yet" = "아직 다른 사람이 없음"
+"non-default slot settings are not represented and were skipped" = "기본값이 아닌 슬롯 설정은 표현할 수 없어 건너뜀"
 "now" = "방금"
+"offer files to save if it asks to (you choose where each one goes)" = "요청하는 경우 저장할 파일 제공(각 파일의 위치는 직접 선택)"
 "or" = "또는"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "점별 선 연결을 유지함. 파선이나 가변 너비 선은 레이어의 선 연결로 그려짐"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "슬롯의 기본 설정 컴포넌트 키를 파일의 레이어로 확인할 수 없어 건너뜀"
+"prototype actions of unknown types were skipped" = "알 수 없는 유형의 프로토타입 액션을 건너뜀"
+"prototype actions without a destination in the file were skipped" = "파일에 대상이 없는 프로토타입 액션을 건너뜀"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "변수 JSON에 없는 변수에 대한 프로토타입 수식을 건너뜀"
+"prototype expressions with unsupported functions were skipped" = "지원되지 않는 함수가 있는 프로토타입 수식을 건너뜀"
+"prototype interactions without supported actions were skipped" = "지원되는 액션이 없는 프로토타입 인터랙션을 건너뜀"
+"prototype navigations of unknown types were skipped" = "알 수 없는 유형의 프로토타입 탐색을 건너뜀"
+"prototype transitions of unknown types play instantly" = "알 수 없는 유형의 프로토타입 전환은 즉시 재생됨"
+"prototype triggers of unknown types were skipped" = "알 수 없는 유형의 프로토타입 트리거를 건너뜀"
 "put a widget on the canvas" = "캔버스에 위젯 배치"
 "read and edit the document" = "문서 읽기 및 편집"
 "read the document" = "문서 읽기"
 "reads the document" = "문서를 읽음"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "변수 JSON에 없는 변수에 대한 변수 설정 액션을 건너뜀"
+"set-variable actions with values that can't be evaluated were skipped" = "평가할 수 없는 값이 있는 변수 설정 액션을 건너뜀"
+"set-variable actions with values that don't fit the variable were skipped" = "변수에 맞지 않는 값이 있는 변수 설정 액션을 건너뜀"
+"set-variable actions without a value were skipped" = "값이 없는 변수 설정 액션을 건너뜀"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "변수 JSON에 없는 컬렉션이나 모드에 대한 변수 모드 설정 액션을 건너뜀"
+"slot content assignment target is missing or is not slot content" = "슬롯 콘텐츠 할당 대상이 없거나 슬롯 콘텐츠가 아님"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "슬롯 콘텐츠 할당이 빈 GUID를 센티넬 값으로 사용하여 건너뜀"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "일부 벡터 점이 파일에 없는 점 설정을 참조함. 해당 점은 레이어의 선 연결과 둥글리지 않은 모서리를 사용함"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "일부 벡터 세그먼트가 파일에 없는 스타일 설정을 참조함. 해당 세그먼트는 레이어의 선을 사용함"
+"stale or invalid grid track sizing entries were ignored" = "오래되었거나 잘못된 그리드 트랙 크기 항목을 무시함"
+"stars and polygons without point counts or geometry use the default point count" = "점 개수나 지오메트리가 없는 별과 다각형은 기본 점 개수를 사용함"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "일부 벡터 세그먼트의 스타일 설정은 지원되지 않음. 해당 세그먼트는 레이어의 선을 사용함"
+"text path underline or strikethrough decoration is not rendered" = "패스 위 텍스트의 밑줄 또는 취소선은 그려지지 않음"
+"text style overrides refer to missing table entries" = "텍스트 스타일 재정의가 없는 테이블 항목을 참조함"
+"the file has no pages" = "파일에 페이지가 없음"
 "the plugin" = "이 플러그인"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "변수 JSON에 `variableCollections`가 없어(로컬 변수 응답이어야 함) 무시함"
 "this session only" = "이 세션만"
+"unknown component property types were skipped" = "알 수 없는 컴포넌트 속성 유형을 건너뜀"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "변수 JSON에 없거나 유형이 다른 변수에 대한 별칭을 건너뜀"
+"variable bindings to properties the layer doesn't have were skipped" = "레이어에 없는 속성에 대한 변수 바인딩을 건너뜀"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "변수 JSON에 없는 변수(라이브러리 변수)에 대한 바인딩을 건너뜀"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "변수 바인딩을 건너뜀: 파일 JSON에 변수 정의가 없음(로컬 변수 JSON을 `variables`로 전달하거나 파일 JSON 옆에 해당 `meta`를 포함하세요)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "변수 유형이 속성에 맞지 않는 변수 바인딩을 건너뜀"
+"variable collections without modes were skipped" = "모드가 없는 변수 컬렉션을 건너뜀"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "변수와 그 모드 중 하나가 아닌, 프로토타입 수식의 변수 모드 조회를 건너뜀"
+"variable modes of collections that aren't in the file were skipped" = "파일에 없는 컬렉션의 변수 모드를 건너뜀"
+"variable modes of collections that aren't in the variables JSON were skipped" = "변수 JSON에 없는 컬렉션의 변수 모드를 건너뜀"
+"variable values that don't match their type (or composed colours) were skipped" = "유형과 맞지 않는 변수 값(또는 합성 색상)을 건너뜀"
+"variables of unknown types were skipped" = "알 수 없는 유형의 변수를 건너뜀"
+"variables whose collection isn't in the variables JSON were skipped" = "컬렉션이 변수 JSON에 없는 변수를 건너뜀"
+"variables without readable values were skipped" = "읽을 수 있는 값이 없는 변수를 건너뜀"
+"vector points with unknown stroke joins use the layer join" = "알 수 없는 선 연결이 있는 벡터 점은 레이어의 선 연결을 사용함"
+"vectors without geometry are empty" = "지오메트리가 없는 벡터는 비어 있음"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "지오메트리가 없는 벡터는 비어 있음(geometry=paths로 파일 JSON을 내보내세요)"
+"very long text was cut to 1,048,576 characters" = "매우 긴 텍스트를 1,048,576자로 잘랐음"
+"very long vector paths were skipped" = "매우 긴 벡터 경로를 건너뜀"
+"video actions are not supported and were skipped" = "비디오 액션은 지원되지 않아 건너뜀"
+"video triggers are not supported and were skipped" = "비디오 트리거는 지원되지 않아 건너뜀"
 "{instances} in {files}" = "{files}의 {instances}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}: 초안 번역, 원어민 검토 대기 중."
 "{length} bleed" = "도련 {length}"
@@ -1459,6 +1655,7 @@ status = "draft — needs native review"
 "{name} is forgotten on this computer; the file stays on {server}" = "{name}의 기록을 이 컴퓨터에서 지움. 파일은 {server}에 남음"
 "{name} is on the server." = "{name}이(가) 서버에 있음."
 "{name} is spotlighting" = "{name} 님이 스포트라이트 중"
+"{name} is too large to open in the browser (over 512 MB)." = "{name}은(는) 너무 커서 브라우저에서 열 수 없습니다(512MB 초과)."
 "{name} was removed from the server" = "{name}을(를) 서버에서 제거함"
 "{name} · deleted on main" = "{name} · 메인에서 삭제됨"
 "{name} · deleted on the branch" = "{name} · 브랜치에서 삭제됨"
@@ -1485,8 +1682,10 @@ status = "draft — needs native review"
 "{n} layers selected" = { other = "레이어 {n}개 선택됨" }
 "{n} layers · {parts}" = { other = "레이어 {n}개 · {parts}" }
 "{n} matches" = { other = "{n}개 일치" }
+"{n} min" = "{n}분"
 "{n} minutes ago" = { other = "{n}분 전" }
 "{n} months ago" = { other = "{n}개월 전" }
+"{n} more notes omitted from this report" = { other = "참고 사항 {n}개가 이 보고서에서 더 생략됨" }
 "{n} of {total}" = "{n} / {total}"
 "{n} people joined" = { other = "{n}명 참여함" }
 "{n} preferred components" = { other = "선호 컴포넌트 {n}개" }
@@ -1496,6 +1695,8 @@ status = "draft — needs native review"
 "{n} rows" = { other = "{n}행" }
 "{n} styles" = { other = "스타일 {n}개" }
 "{n} variables" = { other = "변수 {n}개" }
+"{n} votes" = { other = "{n}표" }
+"{n} votes left" = { other = "남은 투표 {n}개" }
 "{n} weeks ago" = { other = "{n}주 전" }
 "{n} years ago" = { other = "{n}년 전" }
 "{n}d" = "{n}일"
@@ -1521,6 +1722,121 @@ status = "draft — needs native review"
 "⌘ click" = "⌘ 클릭"
 "⌘ scroll" = "⌘ 스크롤"
 "⌥ drag" = "⌥ 드래그"
+"A responsive product page: hero, features, figures, a quote and a footer" = "대표 영역, 기능, 수치, 인용문, 푸터로 구성된 반응형 제품 페이지"
+"A title, an agenda, a big figure, a chart and a closing slide" = "제목, 목차, 주요 수치, 차트, 마무리 슬라이드"
+"A to Z" = "이름 오름차순"
+"Adding to {name}" = "{name}에 추가 중"
+"All the fonts this file uses are installed" = "이 파일에 사용된 모든 글꼴이 설치되어 있습니다."
+"Alphabetical" = "가나다순"
+"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "수치, 벡터 차트, 표를 격자로 배치한 분석 화면"
+"Apps" = "앱"
+"Apr" = "4월"
+"Aug" = "8월"
+"Bottom padding" = "아래쪽 안쪽 여백"
+"Bound to {name}. Click to detach the variable." = "{name}에 연결되어 있습니다. 클릭하면 변수 연결을 해제합니다."
+"Checking the fonts installed on this computer…" = "이 컴퓨터에 설치된 글꼴 확인 중…"
+"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "색상 및 텍스트 스타일, 밝게·어둡게 변수, 버튼, 입력란, 카드"
+"Convert to frame" = "프레임으로 변환"
+"Convert to section" = "섹션으로 변환"
+"Couldn't download the variables" = "변수를 다운로드할 수 없습니다."
+"Created" = "만든 날짜"
+"Dashboard" = "대시보드"
+"Date created" = "만든 날짜"
+"Dec" = "12월"
+"Design system starter" = "디자인 시스템 시작 키트"
+"Draw a frame" = "프레임 그리기"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = ".figcraft, .fig, .sketch, .json, .svg 또는 이미지 파일을 놓으세요."
+"Drop to import" = "놓아서 가져오기"
+"Drop to open" = "놓아서 열기"
+"Edited {when}" = "{when} 편집"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "프레임과 레이어를 PNG, JPG, SVG 또는 PDF로 내보내기"
+"Feb" = "2월"
+"File not found" = "파일을 찾을 수 없습니다."
+"Four screens of a trail app with components and a prototype flow" = "컴포넌트와 프로토타입 흐름이 포함된 트레일 앱 화면 4개"
+"Getting started" = "시작하기"
+"Greyscale components and two example screens to sketch a flow with" = "흐름을 구상할 수 있는 회색 음영 컴포넌트와 예시 화면 2개"
+"Hide these tips (Getting started in the Help menu shows them again)" = "팁 숨기기(도움말 메뉴의 시작하기에서 다시 표시)"
+"Hide when publishing" = "게시할 때 숨기기"
+"Icon components on a 24 px grid with keylines and a size preview" = "키라인과 크기 미리 보기가 포함된 24px 격자의 아이콘 컴포넌트"
+"Icon set starter" = "아이콘 세트 시작 키트"
+"Individual padding" = "개별 안쪽 여백"
+"Interface size" = "인터페이스 크기"
+"Jan" = "1월"
+"Jul" = "7월"
+"Jun" = "6월"
+"Kits" = "키트"
+"Landing page" = "랜딩 페이지"
+"Last modified" = "마지막 수정"
+"Left padding" = "왼쪽 안쪽 여백"
+"Link frames on the Prototype tab, then present the flow" = "프로토타입 탭에서 프레임을 연결한 다음 흐름을 실행해 보세요."
+"Make a component" = "컴포넌트 만들기"
+"Mar" = "3월"
+"May" = "5월"
+"Missing fonts" = "없는 글꼴"
+"Mobile app" = "모바일 앱"
+"Newest first" = "최신순"
+"No files or templates match your search" = "검색 조건에 맞는 파일이나 템플릿이 없습니다."
+"No other pages" = "다른 페이지 없음"
+"No templates match your search" = "검색 조건에 맞는 템플릿이 없습니다."
+"Nov" = "11월"
+"Oct" = "10월"
+"Oldest first" = "오래된순"
+"One announcement in five common sizes: square, portrait, story, link and banner" = "하나의 공지를 정사각형, 세로형, 스토리, 링크, 배너의 일반적인 5가지 크기로 구성"
+"Opening the file…" = "파일 여는 중…"
+"Opening {n} files as new files" = { other = "파일 {n}개를 새 파일로 여는 중" }
+"Order" = "순서"
+"Other" = "기타"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "프레임 도구를 선택한 뒤 캔버스에서 드래그하거나 기기 크기를 고르세요."
+"Plugin" = "플러그인"
+"Plugins & widgets" = "플러그인 및 위젯"
+"Presentation slides" = "프레젠테이션 슬라이드"
+"Playground" = "실험 공간"
+"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "시스템 디스플레이 배율을 기준으로 합니다(100%는 시스템 기본 크기). 문서 확대/축소는 별도입니다."
+"Remove from recents" = "최근 목록에서 제거"
+"Reorder selection" = "선택 항목 순서 변경"
+"Right padding" = "오른쪽 안쪽 여백"
+"Search templates" = "템플릿 검색"
+"See all templates" = "모든 템플릿 보기"
+"Select layers and they space themselves as their content changes" = "레이어를 선택하면 내용 변경에 맞춰 간격이 자동으로 조정됩니다."
+"Search files and templates" = "파일 및 템플릿 검색"
+"Search results" = "검색 결과"
+"Search pages" = "페이지 검색"
+"Sep" = "9월"
+"Share with a code" = "코드로 공유"
+"Show all templates" = "모든 템플릿 표시"
+"Show in Explorer" = "탐색기에서 보기"
+"Show in Finder" = "Finder에서 보기"
+"Show in folder" = "폴더에서 보기"
+"Social and slides" = "소셜 및 슬라이드"
+"Social post sizes" = "소셜 게시물 크기"
+"Sort by" = "정렬 기준"
+"Sort by {column}" = "{column} 기준 정렬"
+"Start from a template" = "템플릿으로 시작"
+"Start sharing with the Share button, then pass on the code it gives" = "공유 버튼으로 공유를 시작한 뒤 표시되는 코드를 전달하세요."
+"The destination document is unavailable. Nothing was imported." = "대상 문서를 사용할 수 없습니다. 아무것도 가져오지 않았습니다."
+"The destination document was closed. Nothing was imported." = "대상 문서가 닫혔습니다. 아무것도 가져오지 않았습니다."
+"The destination page was removed. Nothing was imported." = "대상 페이지가 삭제되었습니다. 아무것도 가져오지 않았습니다."
+"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "창이 너무 작아 {size}% 대신 {drawn}%로 표시합니다. {size}%를 사용하려면 창을 키우세요."
+"This file is too large to join here (up to {mb} MB)" = "이 파일은 여기에 추가하기에 너무 큽니다(최대 {mb}MB)."
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "이 파일은 이 컴퓨터에 없는 글꼴을 사용합니다. 해당 글꼴을 설치할 때까지 대체 글꼴로 표시합니다."
+"Top padding" = "위쪽 안쪽 여백"
+"Try another search, or browse templates." = "다른 검색어를 입력하거나 템플릿을 둘러보세요."
+"Try another word, or look at every kind." = "다른 단어를 검색하거나 모든 종류를 확인하세요."
+"Turn a layer into a component, reuse it, and change every copy at once" = "레이어를 컴포넌트로 만들고 재사용하여 모든 사본을 한 번에 변경하세요."
+"Use your browser's zoom to change the interface size." = "인터페이스 크기는 브라우저의 확대/축소로 변경하세요."
+"Uses variables: each layer shows them in its own mode" = "변수 사용: 각 레이어의 모드에 따라 표시합니다."
+"Websites" = "웹사이트"
+"What you try here changes this preview and the code below, not the file" = "여기서 변경한 내용은 미리 보기와 아래 코드에만 적용되며 파일은 바뀌지 않습니다."
+"Widget" = "위젯"
+"Wireframe kit" = "와이어프레임 키트"
+"Z to A" = "이름 내림차순"
+"just now" = "방금"
+"only in a text style or variable" = "텍스트 스타일 또는 변수에서만 사용"
+"slot layers without a matching slot property were imported as frames" = "일치하는 슬롯 속성이 없는 슬롯 레이어를 프레임으로 가져왔습니다."
+"yesterday" = "어제"
+"{month} {day}, {year}" = "{year}년 {month} {day}일"
+"{n} text layers" = { other = "텍스트 레이어 {n}개" }
+"{percent}%" = "{percent}%"
 
 [commands]
 "align.bottom" = "아래쪽 정렬"
@@ -1546,7 +1862,26 @@ status = "draft — needs native review"
 "arrange.packH" = "가로로 붙이기"
 "arrange.packV" = "세로로 붙이기"
 "arrange.roundToPixels" = "픽셀에 맞춰 반올림"
+"arrange.spacing" = "간격"
 "arrange.tidy" = "정돈"
+"board.connector" = "커넥터"
+"board.ink" = "마커 획"
+"board.label" = "커넥터 레이블"
+"board.nextSticky" = "다음 스티커 메모"
+"board.reattach" = "커넥터 다시 연결"
+"board.setColor" = "보드 색상"
+"board.setStyle" = "보드 스타일"
+"board.shape" = "텍스트가 있는 도형"
+"board.stamp" = "스탬프"
+"board.sticky" = "스티커 메모"
+"board.table" = "표"
+"board.tableEdit" = "표 편집"
+"board.template" = "보드 템플릿"
+"board.templates" = "보드 템플릿 목록"
+"board.timer" = "타이머"
+"board.timerState" = "타이머 상태"
+"board.vote" = "투표 세션"
+"board.voteResults" = "투표 결과"
 "bool.exclude" = "선택 항목 제외"
 "bool.flatten" = "불리언 평면화"
 "bool.intersect" = "선택 항목 교차"
@@ -1622,6 +1957,9 @@ status = "draft — needs native review"
 "dev.focus" = "포커스 보기"
 "dev.resolveChange" = "변경 사항 해결"
 "dev.unfocus" = "포커스 보기 종료"
+"devMode.addMeasurement" = "측정 추가"
+"devMode.measurements" = "측정 목록"
+"devMode.removeMeasurement" = "측정 제거"
 "devResource.add" = "개발 리소스 추가"
 "devResource.edit" = "개발 리소스 편집"
 "devResource.list" = "개발 리소스 목록"
@@ -1645,6 +1983,7 @@ status = "draft — needs native review"
 "edit.duplicate" = "복제"
 "edit.findReplace" = "찾기 및 바꾸기"
 "edit.paste" = "붙여 넣기"
+"edit.pasteDesignLayers" = "디자인 레이어 붙여 넣기"
 "edit.pasteOver" = "선택 항목 위에 붙여 넣기"
 "edit.pasteProperties" = "속성 붙여 넣기"
 "edit.pasteReplace" = "붙여 넣어 바꾸기"
@@ -1668,7 +2007,9 @@ status = "draft — needs native review"
 "file.exportLayers" = "레이어 내보내기"
 "file.exportSvg" = "선택 항목을 SVG로 내보내기"
 "file.import" = "가져오기"
+"file.moveTab" = "탭 이동"
 "file.new" = "새 디자인 파일"
+"file.newBoard" = "새 보드"
 "file.open" = "열기"
 "file.openRecent" = "최근 파일 열기"
 "file.placeImage" = "이미지 배치"
@@ -1805,6 +2146,7 @@ status = "draft — needs native review"
 "pref.reduceMotion" = "동작 줄이기"
 "pref.renameDuplicates" = "복제한 레이어 이름 바꾸기"
 "pref.showDimensions" = "개체에 치수 표시"
+"pref.startOnHome" = "홈에서 시작"
 "pref.userName" = "댓글에 표시할 이름"
 "proto.action.add" = "프로토타입 액션 추가"
 "proto.action.move" = "프로토타입 액션 순서 변경"
@@ -1848,6 +2190,12 @@ status = "draft — needs native review"
 "select.sameStroke" = "같은 선 선택"
 "select.sameText" = "같은 텍스트 속성 선택"
 "select.set" = "선택"
+"selection.applyColorStyle" = "선택 항목에 색상 스타일 적용"
+"selection.bindColorVariable" = "선택 항목에 색상 변수 적용"
+"selection.colors" = "선택 항목 색상"
+"selection.detachColor" = "선택 항목 색상 분리"
+"selection.selectColor" = "이 색상의 레이어 선택"
+"selection.setPaint" = "선택 항목 색상 변경"
 "shape.arrow" = "화살표"
 "shape.ellipse" = "타원"
 "shape.line" = "선"
@@ -1927,10 +2275,14 @@ status = "draft — needs native review"
 "text.weightUp" = "글꼴 굵기 늘리기"
 "tool.arrow" = "화살표"
 "tool.comment" = "댓글"
+"tool.connector" = "커넥터"
 "tool.ellipse" = "타원"
+"tool.eraser" = "지우개"
 "tool.frame" = "프레임"
 "tool.hand" = "손"
+"tool.highlighter" = "형광펜"
 "tool.line" = "선"
+"tool.marker" = "마커"
 "tool.move" = "이동"
 "tool.pen" = "펜"
 "tool.pencil" = "연필"
@@ -1942,9 +2294,12 @@ status = "draft — needs native review"
 "tool.scaleAnchor" = "배율 기준점"
 "tool.section" = "섹션"
 "tool.set" = "도구 선택"
+"tool.shape" = "도형"
 "tool.shapeBuilder" = "도형 빌더"
 "tool.slice" = "슬라이스"
+"tool.stamp" = "스탬프"
 "tool.star" = "별"
+"tool.sticky" = "스티커 메모"
 "tool.text" = "텍스트"
 "transform.move" = "이동"
 "transform.moveTo" = "위치로 이동"
@@ -2006,11 +2361,13 @@ status = "draft — needs native review"
 "vector.edit.tool" = "벡터 편집 도구"
 "vector.edit.transform" = "점 변형"
 "vector.edit.widthPoint" = "너비 점"
+"vector.fillRule" = "칠 규칙 설정"
 "vector.flatten" = "평면화"
 "vector.join" = "선택 항목 연결"
 "vector.offset" = "패스 오프셋"
 "vector.outlineStroke" = "선 윤곽선 만들기"
 "vector.reverse" = "패스 방향 반전"
+"vector.reverseLoop" = "루프 반전"
 "vector.simplify" = "벡터 단순화"
 "vector.smoothJoin" = "선택 항목 부드럽게 연결"
 "version.autosave" = "자동 저장 버전"
@@ -2069,8 +2426,28 @@ status = "draft — needs native review"
 "widget.click" = "위젯 클릭"
 "widget.insert" = "위젯 삽입"
 "widget.list" = "위젯 목록"
+"widget.menu" = "위젯 메뉴"
+"widget.setText" = "위젯 필드 편집"
 "window.focus" = "창을 맨 앞으로 가져오기"
 "window.new" = "새 창"
+"arrange.reorder" = "선택 항목 순서 변경"
+"component.hideWhenPublishing" = "게시할 때 숨기기"
+"object.convertToGroup" = "그룹으로 변환"
+"object.convertToFrame" = "프레임으로 변환"
+"object.convertToSection" = "섹션으로 변환"
+"text.rescanFonts" = "설치된 글꼴 다시 검색"
+"text.loadFont" = "글꼴 파일 불러오기"
+"view.outlinesHiddenLayers" = "윤곽선에 숨겨진 레이어 포함"
+"view.outlinesObjectBounds" = "윤곽선에 개체 경계 포함"
+"view.panelWidths" = "패널 너비 초기화"
+"pref.uiScale" = "인터페이스 크기"
+"help.gettingStarted" = "시작하기"
+"style.bind" = "스타일에 변수 연결"
+"component.playground" = "컴포넌트 실험실"
+"text.missingFonts" = "누락된 글꼴"
+"text.refit" = "글꼴에 맞게 텍스트 조정"
+"template.list" = "템플릿 목록"
+"file.newFromTemplate" = "템플릿에서 새로 만들기"
 
 [menu]
 "bool.exclude" = "제외"
@@ -2102,3 +2479,5 @@ status = "draft — needs native review"
 "view.themeDark" = "다크"
 "view.themeLight" = "라이트"
 "view.themeSystem" = "시스템 따르기"
+"view.outlinesHiddenLayers" = "숨겨진 레이어 포함"
+"view.outlinesObjectBounds" = "개체 경계 포함"
diff --git a/crates/ui-egui/locales/nl.toml b/crates/ui-egui/locales/nl.toml
new file mode 100644
index 00000000..e58110ae
--- /dev/null
+++ b/crates/ui-egui/locales/nl.toml
@@ -0,0 +1,2453 @@
+# FigCraft interface strings: Dutch (Nederlands).
+#
+# Draft — needs native review: machine-drafted from the English catalog. Established tool terms
+# (frame, auto layout, component, variant, prototype, overlay, widget, plugin, branch, constraints)
+# and blend-mode, brush-preset and boolean names stay as they are. See docs/translating.md.
+
+[meta]
+name = "Nederlands"
+status = "draft — needs native review"
+
+[ui]
+
+"% of all commits" = "% van alle commits"
+"(no longer published)" = "(niet langer gepubliceerd)"
+"({n} warnings: some entries were skipped)" = { one = "({n} waarschuwing: sommige items zijn overgeslagen)", other = "({n} waarschuwingen: sommige items zijn overgeslagen)" }
+"+ Create variable" = "+ Variabele maken"
+".fig (experimental)" = ".fig (experimental)"
+"1…9, 0" = "1…9, 0"
+"@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} regels (Δ {delta}), +{bin_added} / −{bin_deleted} binaire assets, {first} – {last}"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Er bestaat al een .figcraft-bestand met deze naam. Kies de volledige naam om de vervanging te bevestigen."
+"A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Een verzameling van dit bestand met deze modi en variabelen: overschrijf hun waarden per modus en voeg er eigen variabelen toe"
+"A layer on its own aligns to its frame: select more layers, or one in a frame" = "Een losse laag wordt uitgelijnd op zijn frame: selecteer meer lagen, of één in een frame"
+"A responsive product page: hero, features, figures, a quote and a footer" = "Een responsive productpagina: hero, features, afbeeldingen, een citaat en een footer"
+"A spring plays until it settles: its mass, stiffness and damping set how long" = "Een veer speelt tot hij tot rust komt: zijn massa, stijfheid en demping bepalen hoe lang"
+"A title, an agenda, a big figure, a chart and a closing slide" = "Een titel, een agenda, een grote afbeelding, een grafiek en een afsluitende dia"
+"A to Z" = "A tot Z"
+"About" = "Over"
+"About FigCraft" = "Over FigCraft"
+"About this server" = "Over deze server"
+"Action" = "Actie"
+"Actions" = "Acties"
+"Actions for {name}" = "Acties voor {name}"
+"Actions…" = "Acties…"
+"Active" = "Actief"
+"Actual size (100%)" = "Werkelijke grootte (100%)"
+"Add a category" = "Categorie toevoegen"
+"Add a comment" = "Reactie toevoegen"
+"Add a description" = "Beschrijving toevoegen"
+"Add a frame (F) or a shape (R) to get started" = "Voeg een frame (F) of een vorm (R) toe om te beginnen"
+"Add a layer or component to tile first" = "Voeg eerst een laag of component toe om als tegel te gebruiken"
+"Add a minute" = "Een minuut toevoegen"
+"Add a note for developers" = "Notitie voor ontwikkelaars toevoegen"
+"Add action" = "Actie toevoegen"
+"Add actions for when no condition holds" = "Voeg acties toe voor het geval geen enkele voorwaarde geldt"
+"Add an annotation for developers" = "Annotatie voor developers toevoegen"
+"Add another condition" = "Nog een voorwaarde toevoegen"
+"Add auto layout" = "Auto layout toevoegen"
+"Add background behind overlay" = "Achtergrond achter overlay toevoegen"
+"Add column" = "Kolom toevoegen"
+"Add content to this slot" = "Voeg inhoud toe aan dit slot"
+"Add dev resource" = "Dev-resource toevoegen"
+"Add effect" = "Effect toevoegen"
+"Add export setting" = "Exportinstelling toevoegen"
+"Add fill" = "Vulling toevoegen"
+"Add interaction" = "Interactie toevoegen"
+"Add layout grid" = "Layoutraster toevoegen"
+"Add library" = "Bibliotheek toevoegen"
+"Add library file…" = "Bibliotheekbestand toevoegen…"
+"Add max height" = "Maximale hoogte toevoegen"
+"Add max width" = "Maximale breedte toevoegen"
+"Add measurement" = "Meting toevoegen"
+"Add min height" = "Minimale hoogte toevoegen"
+"Add min width" = "Minimale breedte toevoegen"
+"Add mode" = "Modus toevoegen"
+"Add new page" = "Nieuwe pagina toevoegen"
+"Add or update collections from a variables JSON" = "Voeg verzamelingen toe of werk ze bij vanuit een variables-JSON"
+"Add properties to make instances configurable" = "Voeg eigenschappen toe om instances configureerbaar te maken"
+"Add reaction" = "Reactie toevoegen"
+"Add row" = "Rij toevoegen"
+"Add starting point" = "Startpunt toevoegen"
+"Add stroke" = "Lijn toevoegen"
+"Add variant" = "Variant toevoegen"
+"Add variant with a new value" = "Variant met een nieuwe waarde toevoegen"
+"Added" = "Toegevoegd"
+"Added the library \"{name}\"" = "Bibliotheek \"{name}\" toegevoegd"
+"Adding to {name}" = "Toevoegen aan {name}"
+"Adjust" = "Aanpassen"
+"Adjustment presets" = "Aanpassingspresets"
+"Advanced" = "Geavanceerd"
+"Advanced stroke" = "Geavanceerde lijn"
+"After delay" = "Na vertraging"
+"After delay {ms}ms" = "Na {ms}ms vertraging"
+"Align" = "Uitlijnen"
+"Align bottom" = "Onderaan uitlijnen"
+"Align center" = "Midden uitlijnen"
+"Align horizontal centers" = "Horizontale middens uitlijnen"
+"Align left" = "Links uitlijnen"
+"Align middle" = "Midden uitlijnen"
+"Align right" = "Rechts uitlijnen"
+"Align text baselines" = "Tekstbasislijnen uitlijnen"
+"Align top" = "Bovenaan uitlijnen"
+"Align vertical centers" = "Verticale middens uitlijnen"
+"Alignment" = "Uitlijning"
+"All" = "Alle"
+"All categories" = "Alle categorieën"
+"All comments" = "Alle reacties"
+"All components" = "Alle components"
+"All fonts" = "Alle lettertypen"
+"All objects" = "Alle objecten"
+"All supported properties" = "Alle ondersteunde eigenschappen"
+"All the fonts this file uses are installed" = "Alle lettertypen die dit bestand gebruikt zijn geïnstalleerd"
+"All variables" = "Alle variabelen"
+"Along the bottom" = "Langs de onderkant"
+"Along the left" = "Langs de linkerkant"
+"Along the right" = "Langs de rechterkant"
+"Along the top" = "Langs de bovenkant"
+"Alpha" = "Alpha"
+"Alphabetical" = "Alfabetisch"
+"Alt+drag" = "Alt+drag"
+"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "Een analysescherm op een raster: cijfers, diagrammen getekend met vectoren en een tabel"
+"An invite link that opens FigCraft and joins" = "Een uitnodigingslink die FigCraft opent en waarmee je deelneemt"
+"Anchor" = "Anker"
+"Android" = "Android"
+"Angular" = "Angular"
+"Animation" = "Animatie"
+"Annotations" = "Annotaties"
+"Annotations shown on the canvas" = "Annotaties die op het canvas worden weergegeven"
+"Another server, or one that needs its key. The usual server is set in Preferences." = "Een andere server, of een server waarvoor je een sleutel nodig hebt. De gebruikelijke server stel je in bij Voorkeuren."
+"Any status" = "Alle statussen"
+"Anyone on your network with this code can edit the file, while this app stays open." = "Iedereen in je netwerk met deze code kan het bestand bewerken, zolang deze app open blijft."
+"Anyone with the edit link can change the file; the view link only lets people look. The links carry their secrets: share them like passwords. `figcraft-server links` makes more and revokes them." = "Iedereen met de bewerklink kan het bestand wijzigen; de weergavelink laat mensen alleen kijken. De links bevatten geheimen: deel ze alsof het wachtwoorden zijn. Met `figcraft-server links` maak je er meer en trek je ze in."
+"Anyone with this code can edit the file." = "Iedereen met deze code kan het bestand bewerken."
+"Anyone with this code can look at the file, not change it." = "Iedereen met deze code kan het bestand bekijken, maar niet wijzigen."
+"Appearance" = "Weergave"
+"Apply a component property" = "Een componenteigenschap toepassen"
+"Apply variable" = "Variabele toepassen"
+"Apply variable to text" = "Variabele toepassen op tekst"
+"Apply variable to visibility" = "Variabele toepassen op zichtbaarheid"
+"Apps" = "Apps"
+"Apr" = "apr."
+"Arc" = "Boog"
+"Arc ratio" = "Boogverhouding"
+"Arc start" = "Start van de boog"
+"Arc sweep" = "Boogdoorloop"
+"Archive" = "Archiveren"
+"Archived" = "Gearchiveerd"
+"Arrange" = "Schikken"
+"Arrow" = "Pijl"
+"Arrow at the end" = "Pijl aan het eind"
+"As typed" = "Zoals getypt"
+"Asking the server…" = "Bezig met vragen aan de server…"
+"Assets" = "Assets"
+"Aug" = "aug."
+"Auto" = "Auto"
+"Auto (space around)" = "Auto (ruimte eromheen)"
+"Auto (space between)" = "Auto (afstand ertussen)"
+"Auto (space evenly)" = "Auto (gelijkmatig verdelen)"
+"Auto ({mode})" = "Auto ({mode})"
+"Auto columns" = "Automatische kolommen"
+"Auto gap" = "Automatische afstand"
+"Auto height" = "Automatische hoogte"
+"Auto layout" = "Auto layout"
+"Auto rows" = "Automatische rijen"
+"Auto width" = "Automatische breedte"
+"Back" = "Terug"
+"Back to Ready for dev" = "Terug naar Ready for dev"
+"Back to Ready for dev: the next change compares with how it is now" = "Terug naar Gereed voor dev: de volgende wijziging wordt vergeleken met hoe het nu is"
+"Back to assets" = "Terug naar assets"
+"Back to current" = "Terug naar huidige"
+"Back to styles" = "Terug naar stijlen"
+"Back to the FigCraft server" = "Terug naar de FigCraft-server"
+"Back to the canvas from a focused region" = "Terug naar het canvas vanuit een focusgebied"
+"Back to the current version" = "Terug naar de huidige versie"
+"Back to the font's value" = "Terug naar de waarde van het lettertype"
+"Back to the values the font style implies" = "Terug naar de waarden die bij de lettertypestijl horen"
+"Background" = "Achtergrond"
+"Background blur" = "Achtergrondvervaging"
+"Basics" = "Basis"
+"Before" = "Voor"
+"Bend" = "Buiging"
+"Between the selected layers" = "Tussen de geselecteerde lagen"
+"Bevel" = "Afgeschuind"
+"Binary assets added" = "Binaire assets toegevoegd"
+"Binary assets removed" = "Verwijderde binaire assets"
+"Black & white" = "Black & white"
+"Bleed" = "Afloop"
+"Bleed marks" = "Aansnijmarkeringen"
+"Bleed marks need a bleed" = "Aansnijtekens vereisen een aansnijrand"
+"Blend" = "Mengmodus"
+"Blend mode" = "Blendmodus"
+"Blue" = "Blauw"
+"Blur" = "Vervaging"
+"Boolean" = "Boolean"
+"Boolean groups" = "Booleaanse groepen"
+"Both directions" = "Beide richtingen"
+"Bottom" = "Onder"
+"Bottom left radius" = "Radius linksonder"
+"Bottom right radius" = "Radius rechtsonder"
+"Bound to {name}. Click to detach the variable." = "Gekoppeld aan {name}. Klik om de variabele los te koppelen."
+"Brainstorm" = "Brainstorm"
+"Branch" = "Branch"
+"Branch archived" = "Branch gearchiveerd"
+"Branch merged" = "Branch samengevoegd"
+"Branch name" = "Branchnaam"
+"Branch of {file}" = "Branch van {file}"
+"Branch of {file} · merged or archived" = "Branch van {file} · samengevoegd of gearchiveerd"
+"Branch updated from main" = "Branch bijgewerkt vanaf main"
+"Branch {name}" = "Branch {name}"
+"Branches" = "Branches"
+"Bring forward" = "Naar voren brengen"
+"Bring the main file's changes into the branch" = "De wijzigingen uit het hoofdbestand in de branch brengen"
+"Bring to front" = "Op de voorgrond plaatsen"
+"Bristle" = "Bristle"
+"Browse" = "Bladeren"
+"Brush" = "Penseel"
+"Brush rotation jitter" = "Penseelrotatiejitter"
+"Brush scatter" = "Penseelverstrooiing"
+"Brush size jitter" = "Penseelgrootte-jitter"
+"Brush spacing" = "Penseelafstand"
+"Bulleted list" = "Lijst met opsommingstekens"
+"C or Shift+C" = "C of Shift+C"
+"C or ⇧C" = "C of ⇧C"
+"CMYK colour" = "CMYK-kleur"
+"CSS custom properties…" = "CSS-variabelen…"
+"Can edit" = "Kan bewerken"
+"Can view" = "Kan bekijken"
+"Can't read this library: {e}" = "Kan deze bibliotheek niet lezen: {e}"
+"Cancel" = "Annuleren"
+"Canvas" = "Canvas"
+"Canvas stacking" = "Stapeling op canvas"
+"Cap height to baseline" = "Hoofdletterhoogte tot basislijn"
+"Case" = "Hoofdlettergebruik"
+"Case-sensitive forms" = "Hoofdlettergevoelige vormen"
+"Categories" = "Categorieën"
+"Center" = "Midden"
+"Change alias" = "Alias wijzigen"
+"Change resolved" = "Wijziging opgelost"
+"Change style" = "Stijl wijzigen"
+"Change to" = "Wijzigen naar"
+"Change to needs a layer inside a variant" = "Wijzigen naar vereist een laag binnen een variant"
+"Changed" = "Gewijzigd"
+"Changed on both sides: keep one" = "Aan beide kanten gewijzigd: één behouden"
+"Changes on main" = "Wijzigingen op main"
+"Changes on the branch" = "Wijzigingen op de branch"
+"Changes unknown" = "Onbekende wijzigingen"
+"Check" = "Vinkje"
+"Checking the fonts installed on this computer…" = "De lettertypen op deze computer worden gecontroleerd…"
+"Checking the server…" = "Server controleren…"
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Kies hierboven React, Leptos, Vue, SwiftUI, Compose, ArkUI of Flutter om dit component aan zijn code te koppelen."
+"Chevron" = "Punthaak"
+"Choose another profile to change it." = "Kies een ander profiel om dit te wijzigen."
+"Choose collection" = "Kies een verzameling"
+"Choose image" = "Afbeelding kiezen"
+"Choose mode" = "Modus kiezen"
+"Choose variable" = "Variabele kiezen"
+"Circle" = "Cirkel"
+"Clear from this list" = "Verwijderen uit deze lijst"
+"Clear recent" = "Recenten wissen"
+"Clear results" = "Resultaten wissen"
+"Click + to replace mixed content" = "Klik op + om gemengde inhoud te vervangen"
+"Click anywhere on the canvas to leave one." = "Klik ergens op het canvas om er een achter te laten."
+"Click objects to vote; click your badge to take a vote back" = "Klik op objecten om te stemmen; klik op je badge om een stem terug te nemen"
+"Click or drag to merge · {alt} removes" = "Klik of sleep om samen te voegen · {alt} verwijdert"
+"Click or drag to remove · {alt} merges" = "Klik of sleep om te verwijderen · {alt} voegt samen"
+"Click to record a key" = "Klik om een toets op te nemen"
+"Clip content" = "Inhoud bijsnijden"
+"Clip to shape" = "Bijsnijden op vorm"
+"Close" = "Sluiten"
+"Close overlay" = "Overlay sluiten"
+"Close preview" = "Voorvertoning sluiten"
+"Close tab" = "Tabblad sluiten"
+"Close version history" = "Versiegeschiedenis sluiten"
+"Close when clicking outside" = "Sluiten bij klikken erbuiten"
+"Code" = "Code"
+"Code or invite link" = "Code of uitnodigingslink"
+"Code syntax" = "Code-syntaxis"
+"Collapse" = "Inklappen"
+"Collapse panel" = "Paneel samenvouwen"
+"Collection" = "Verzameling"
+"Collections" = "Verzamelingen"
+"Color" = "Kleur"
+"Color burn" = "Color burn"
+"Color dodge" = "Color dodge"
+"Color format" = "Kleurnotatie"
+"Color profile" = "Kleurprofiel"
+"Color profile: {name}" = "Kleurprofiel: {name}"
+"Color styles" = "Kleurstijlen"
+"Color values in this file are in this color space." = "Kleurwaarden in dit bestand gebruiken deze kleurruimte."
+"Color variables" = "Kleurvariabelen"
+"Colour" = "Kleur"
+"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Kleur- en tekststijlen, lichte en donkere variabelen, knoppen, invoervelden en kaarten"
+"Column" = "Kolom"
+"Column gap" = "Kolomafstand"
+"Column sizes" = "Kolomgroottes"
+"Column span" = "Kolomspan"
+"Columns" = "Kolommen"
+"Columns {count}" = "Kolommen {count}"
+"Comment" = "Reactie"
+"Comments" = "Reacties"
+"Commits" = "Commits"
+"Company" = "Bedrijf"
+"Compare changes" = "Wijzigingen vergelijken"
+"Compatibility notes" = "Compatibiliteitsopmerkingen"
+"Completed" = "Voltooid"
+"Component" = "Component"
+"Component name" = "Componentnaam"
+"Component property" = "Componenteigenschap"
+"Component set" = "Componentenset"
+"Component sets" = "Componentensets"
+"Components" = "Components"
+"Conditional" = "Voorwaardelijk"
+"Confetti" = "Confetti"
+"Conflicts" = "Conflicten"
+"Connect to code" = "Verbinden met code"
+"Connected" = "Verbonden"
+"Connected to code: {from}" = "Verbonden met code: {from}"
+"Connection lost, reconnecting (attempt {attempt})…" = "Verbinding verbroken, opnieuw verbinden (poging {attempt})…"
+"Connector" = "Verbinding"
+"Constrain proportions" = "Verhoudingen vergrendelen"
+"Constraints" = "Constraints"
+"Content" = "Inhoud"
+"Contents hidden" = "Inhoud verborgen"
+"Contextual alternates" = "Contextuele alternatieven"
+"Contrast" = "Contrast"
+"Contributors" = "Bijdragers"
+"Contributors: {people} · Commits: {commits}" = "Bijdragers: {people} · Commits: {commits}"
+"Controller" = "Controller"
+"Convert to frame" = "Converteren naar frame"
+"Convert to section" = "Converteren naar sectie"
+"Cool" = "Cool"
+"Copied as CSS" = "Gekopieerd als CSS"
+"Copied as PNG" = "Gekopieerd als PNG"
+"Copied as SVG" = "Gekopieerd als SVG"
+"Copied as text" = "Gekopieerd als tekst"
+"Copied {value}" = "{value} gekopieerd"
+"Copy" = "Kopiëren"
+"Copy as" = "Kopiëren als"
+"Copy as CSS" = "Kopiëren als CSS"
+"Copy as PNG" = "Kopiëren als PNG"
+"Copy as SVG" = "Kopiëren als SVG"
+"Copy code" = "Code kopiëren"
+"Copy link" = "Link kopiëren"
+"Copy the {label}" = "Kopieer de {label}"
+"Copy {value}" = "{value} kopiëren"
+"Corner radius" = "Hoekradius"
+"Corner smoothing" = "Hoekafvlakking"
+"Couldn't download the variables" = "De variabelen konden niet worden gedownload"
+"Couldn't reach {server}: showing what this computer remembers." = "Kon {server} niet bereiken: toont wat deze computer onthoudt."
+"Couldn't read {name}." = "Kon {name} niet lezen."
+"Couldn't save automatically: {error}" = "Kan niet automatisch opslaan: {error}"
+"Couldn't save the file" = "Kan het bestand niet opslaan"
+"Count" = "Aantal"
+"Create" = "Maken"
+"Create a variable collection first" = "Maak eerst een variabeleverzameling"
+"Create a variable first" = "Maak eerst een variabele"
+"Create alias" = "Alias maken"
+"Create branch" = "Branch aanmaken"
+"Create collection" = "Verzameling maken"
+"Create component" = "Component maken"
+"Create component property" = "Componenteigenschap maken"
+"Create components, styles or variables to publish them as a library." = "Maak componenten, stijlen of variabelen om ze als bibliotheek te publiceren."
+"Create property…" = "Eigenschap maken…"
+"Create style" = "Stijl maken"
+"Create style from the selected text" = "Stijl maken van de geselecteerde tekst"
+"Created" = "Gemaakt"
+"Crop" = "Bijsnijden"
+"Crop marks" = "Snijtekens"
+"Ctrl+arrows" = "Ctrl+pijltjes"
+"Ctrl+click" = "Ctrl+click"
+"Ctrl+scroll" = "Ctrl+scroll"
+"Current name" = "Huidige naam"
+"Current version" = "Huidige versie"
+"Cursor chat" = "Cursorchat"
+"Custom" = "Aangepast"
+"Custom size" = "Aangepaste grootte"
+"Cut" = "Knippen"
+"Dark" = "Donker"
+"Darken" = "Darken"
+"Dash" = "Streep"
+"Dashboard" = "Dashboard"
+"Date created" = "Aanmaakdatum"
+"Dec" = "dec."
+"Decoration" = "Decoratie"
+"Decoration style" = "Decoratiestijl"
+"Deep select" = "Diep selecteren"
+"Default" = "Standaard"
+"Default content" = "Standaardinhoud"
+"Default value (the top-left variant)" = "Standaardwaarde (de variant linksboven)"
+"Delay" = "Vertraging"
+"Delete" = "Verwijderen"
+"Delete category (its annotations stay)" = "Categorie verwijderen (de annotaties blijven staan)"
+"Delete collection" = "Verzameling verwijderen"
+"Delete group" = "Groep verwijderen"
+"Delete mode" = "Modus verwijderen"
+"Delete page" = "Pagina verwijderen"
+"Delete preset" = "Preset verwijderen"
+"Delete property" = "Eigenschap verwijderen"
+"Delete the style (layers keep their values)" = "Verwijdert de stijl (lagen behouden hun waarden)"
+"Delete thread" = "Gesprek verwijderen"
+"Delete variable" = "Variabele verwijderen"
+"Delete “{name}”? This can't be undone." = "“{name}” verwijderen? Dit kan niet ongedaan worden gemaakt."
+"Density" = "Dichtheid"
+"Depth" = "Diepte"
+"Describe how and when to use this component" = "Beschrijf hoe en wanneer je dit component gebruikt"
+"Describe what changed" = "Beschrijf wat er is gewijzigd"
+"Description" = "Beschrijving"
+"Description (optional)" = "Beschrijving (optioneel)"
+"Design" = "Design"
+"Design panel" = "Ontwerppaneel"
+"Design system starter" = "Designsysteem-starter"
+"Desktop" = "Desktop"
+"Destination" = "Bestemming"
+"Detach alias" = "Alias loskoppelen"
+"Detach instance" = "Instance loskoppelen"
+"Detach property" = "Eigenschap loskoppelen"
+"Detach style" = "Stijl loskoppelen"
+"Detach styles" = "Stijlen loskoppelen"
+"Detach variable" = "Variabele loskoppelen"
+"Details" = "Details"
+"Dev Mode" = "Dev Mode"
+"Dev resources" = "Dev-bronnen"
+"Development" = "Ontwikkeling"
+"Device" = "Apparaat"
+"Device at 100%" = "Apparaat op 100%"
+"Diamond" = "Ruit"
+"Difference" = "Difference"
+"Dimensions" = "Afmetingen"
+"Direction" = "Richting"
+"Disconnect from code" = "Loskoppelen van code"
+"Dispersion" = "Dispersie"
+"Display name" = "Weergavenaam"
+"Dissolve" = "Dissolve"
+"Distribute and tidy" = "Verdelen en opruimen"
+"Distribute horizontal spacing" = "Horizontale afstand verdelen"
+"Distribute vertical spacing" = "Verticale afstand verdelen"
+"Divider" = "Scheidslijn"
+"Don't Save" = "Niet opslaan"
+"Don't truncate" = "Niet afkappen"
+"Done" = "Klaar"
+"Done editing" = "Klaar met bewerken"
+"Dots" = "Dots"
+"Dotted" = "Gestippeld"
+"Down" = "Onder"
+"Drafts" = "Concepten"
+"Drag the stroke to add a width point" = "Sleep de lijn om een breedtepunt toe te voegen"
+"Draw" = "Tekenen"
+"Draw a frame" = "Teken een frame"
+"Drawing tools" = "Tekengereedschap"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Laat een .figcraft-, .fig-, .sketch-, .json-, .svg- of afbeeldingsbestand los."
+"Drop shadow" = "Slagschaduw"
+"Drop to import" = "Loslaten om te importeren"
+"Drop to open" = "Loslaten om te openen"
+"Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community."
+"Duo" = "Duo"
+"Duplicate" = "Dupliceren"
+"Duplicate by dragging" = "Dupliceren door te slepen"
+"Duplicate mode" = "Modus dupliceren"
+"Duplicate page" = "Pagina dupliceren"
+"Edit" = "Bewerken"
+"Edit as an expression" = "Bewerken als expressie"
+"Edit colour" = "Kleur bewerken"
+"Edit comment" = "Reactie bewerken"
+"Edit dev resource" = "Dev-resource bewerken"
+"Edit link" = "Link bewerken"
+"Edit link copied" = "Link om te bewerken gekopieerd"
+"Edit style" = "Stijl bewerken"
+"Edit variable" = "Variabele bewerken"
+"Edit with the builder" = "Bewerken met de builder"
+"Edited {when}" = "Bewerkt {when}"
+"Effect settings" = "Effectinstellingen"
+"Effect styles" = "Effectstijlen"
+"Effects" = "Effecten"
+"Curved" = "Gebogen"
+"Elbow" = "Haaks"
+"Ellipse" = "Ellips"
+"Ellipses" = "Ellipsen"
+"Else" = "Anders"
+"Else if" = "Anders als"
+"Embedded profile" = "Ingebed profiel"
+"Empty" = "Leeg"
+"End" = "End"
+"End point" = "Eindpunt"
+"End vote" = "Stemronde beëindigen"
+"Ends the session; everyone keeps their copy" = "Beëindigt de sessie; iedereen houdt zijn eigen kopie"
+"Enter" = "Enter"
+"Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Voer het adres van een figcraft-server in en druk op Bladeren om te zien welke plugins het aanbiedt."
+"Enter to save · Esc to cancel" = "Enter om op te slaan · Esc om te annuleren"
+"Eraser" = "Gum"
+"Esc" = "Esc"
+"Essential" = "Essentieel"
+"Every conflict has a choice." = "Elk conflict heeft een keuze."
+"Every top-level frame already starts a flow" = "Elk frame op het hoogste niveau begint al een flow"
+"Exact opacity (4 then 5: 45%)" = "Exacte dekking (4 dan 5: 45%)"
+"Exclude" = "Exclude"
+"Excluded" = "Uitgesloten"
+"Excluded from layout" = "Uitgesloten van de layout"
+"Excludes" = "Sluit uit"
+"Exclusion" = "Exclusion"
+"Exit focus view (Esc)" = "Focusweergave afsluiten (Esc)"
+"Expand" = "Uitvouwen"
+"Export" = "Exporteren"
+"Export all" = "Alles exporteren"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "Frames en lagen exporteren als PNG, JPG, SVG of PDF"
+"Export page as PNG" = "Pagina exporteren als PNG"
+"Export settings" = "Exportinstellingen"
+"Export variables" = "Variabelen exporteren"
+"Export {name}" = "{name} exporteren"
+"Export {n} layers" = { one = "{n} laag exporteren", other = "{n} lagen exporteren" }
+"Exported {file}" = "{file} geëxporteerd"
+"Exported {name}" = "{name} geëxporteerd"
+"Exported {name}; {n} kinds of content were left out" = { one = "{name} geëxporteerd; {n} soort content is niet meegenomen", other = "{name} geëxporteerd; {n} soorten content zijn niet meegenomen" }
+"Exported {n} files" = { one = "{n} bestand geëxporteerd", other = "{n} bestanden geëxporteerd" }
+"Export…" = "Exporteren…"
+"Expose properties to instances" = "Eigenschappen beschikbaar maken voor instances"
+"Exposure" = "Belichting"
+"Expression" = "Expressie"
+"Extend collection" = "Verzameling uitbreiden"
+"Extends \"{name}\": overridden values are marked" = "Erft van “{name}”: overschreven waarden zijn gemarkeerd"
+"Eye" = "Oog"
+"F" = "F"
+"Fade" = "Fade"
+"False" = "Onwaar"
+"Feb" = "feb."
+"Fetching from the server…" = "Bezig met ophalen van de server…"
+"FigCraft couldn't open its window: {error}" = "FigCraft kon zijn venster niet openen: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft ondersteunt nog niet elke functie van deze bestanden. De notities vermelden wat er in de geïmporteerde kopie is weggelaten of gewijzigd; het originele bestand is ongewijzigd."
+"File" = "Bestand"
+"File name" = "Bestandsnaam"
+"File not found" = "Bestand niet gevonden"
+"File published" = "Bestand gepubliceerd"
+"Files aren't end-to-end encrypted: the server's operator can read them." = "Bestanden zijn niet end-to-end versleuteld: de beheerder van de server kan ze lezen."
+"Files nobody opens for {n} days are deleted." = { one = "Na {n} dag zonder openen wordt een bestand verwijderd.", other = "Na {n} dagen zonder openen wordt een bestand verwijderd." }
+"Fill" = "Vulling"
+"Fill (fr)" = "Vullen (fr)"
+"Fill container" = "Container vullen"
+"Fill window" = "Venster vullen"
+"Fills" = "Vullingen"
+"Fill|sizing" = "Vullen"
+"Filter and sort" = "Filteren en sorteren"
+"Find" = "Zoeken"
+"Find and replace" = "Zoeken en vervangen"
+"Find layers" = "Lagen zoeken"
+"First" = "Eerste"
+"First commit" = "Eerste commit"
+"First on top" = "Eerste bovenaan"
+"Fit" = "Inpassen"
+"Fit device to window" = "Apparaat inpassen in het venster"
+"Fit to contents" = "Aanpassen aan inhoud"
+"Fit to window" = "Inpassen in venster"
+"Fit width" = "Breedte inpassen"
+"Fixed" = "Vast"
+"Fixed gap" = "Vaste afstand"
+"Fixed size" = "Vaste grootte"
+"Flatten" = "Samenvoegen tot vector"
+"Flip" = "Spiegelen"
+"Flip horizontal" = "Horizontaal spiegelen"
+"Flip text to the other side" = "Tekst naar de andere kant spiegelen"
+"Flip vertical" = "Verticaal spiegelen"
+"Flip width profile" = "Breedteprofiel spiegelen"
+"Flow chart" = "Stroomdiagram"
+"Flow starting point" = "Flow-startpunt"
+"Flow starting points" = "Flow-startpunten"
+"Flows" = "Flows"
+"Focus view" = "Focusweergave"
+"Fold autosaves" = "Automatisch opgeslagen versies inklappen"
+"Folder: click to collapse" = "Map: klik om samen te vouwen"
+"Folder: click to expand" = "Map: klik om uit te klappen"
+"Follow" = "Volgen"
+"Follow {name}" = "{name} volgen"
+"Following" = "Volgend"
+"Following {name} · {key} to stop" = "Volgt {name} · {key} om te stoppen"
+"Font" = "Lettertype"
+"Font not installed" = "Lettertype niet geïnstalleerd"
+"Font size" = "Lettertypegrootte"
+"Font style" = "Lettertypestijl"
+"Forget on this computer" = "Vergeten op deze computer"
+"Four screens of a trail app with components and a prototype flow" = "Vier schermen van een wandelroute-app met componenten en een prototype-flow"
+"Fractions" = "Breuken"
+"Frame" = "Frame"
+"Frame selection" = "Selectie in frame plaatsen"
+"Frame tools" = "Frame-hulpmiddelen"
+"Frames" = "Frames"
+"From the library \"{name}\": read-only" = "Uit de bibliotheek \"{name}\": alleen-lezen"
+"From {name}" = "Van {name}"
+"From {server}" = "Van {server}"
+"Frost" = "Frost"
+"Gap" = "Afstand"
+"Gap between columns" = "Afstand tussen kolommen"
+"Gap between items" = "Afstand tussen items"
+"Gap between rows" = "Afstand tussen rijen"
+"Getting started" = "Aan de slag"
+"Give the address of a server open to the public, or a server's address with its key (`figcraft-server key` prints it)." = "Geef het adres van een server die openbaar bereikbaar is, of het adres van een server met bijbehorende key (`figcraft-server key` toont die)."
+"Glass" = "Glass"
+"Go to main component" = "Naar hoofdcomponent gaan"
+"Go to {name}" = "Ga naar {name}"
+"Grab bag" = "Grab bag"
+"Gradient" = "Verloop"
+"Gray" = "Grijs"
+"Green" = "Groen"
+"Greyscale components and two example screens to sketch a flow with" = "Grijswaardencomponenten en twee voorbeeldschermen om een flow mee te schetsen"
+"Grid" = "Raster"
+"Grid ({size})" = "Raster ({size})"
+"Grid styles" = "Rasterstijlen"
+"Grid {size}" = "Raster {size}"
+"Group" = "Groep"
+"Group selection" = "Selectie groeperen"
+"Groups" = "Groepen"
+"Gutter" = "Tussenruimte"
+"Hand tool" = "Handgereedschap"
+"Hanging list" = "Lijst met hangende inspringing"
+"Hanging punctuation" = "Uithangende leestekens"
+"Hard light" = "Hard light"
+"Heart" = "Hart"
+"Height" = "Hoogte"
+"Help" = "Help"
+"Help and resources" = "Help en bronnen"
+"Help page" = "Helppagina"
+"Here: {names}" = "Hier: {names}"
+"Hidden" = "Verborgen"
+"Hide contents" = "Inhoud verbergen"
+"Hide from publishing" = "Verbergen bij publiceren"
+"Hide section contents" = "Sectie-inhoud verbergen"
+"Hide these tips (Getting started in the Help menu shows them again)" = "Deze tips verbergen (Aan de slag in het menu Help toont ze opnieuw)"
+"Hide when publishing" = "Verbergen bij publiceren"
+"Highlight layers on hover" = "Lagen uitlichten bij aanwijzen"
+"Highlighter" = "Markeerstift"
+"Highlights" = "Hooglichten"
+"Hold Alt" = "Houd Alt ingedrukt"
+"Hold Alt+Z" = "Houd Alt+Z ingedrukt"
+"Hold Ctrl" = "Ctrl ingedrukt houden"
+"Hold Z" = "Houd Z ingedrukt"
+"Hold ⌃ or ⌘" = "Houd ⌃ of ⌘ ingedrukt"
+"Hold ⌥" = "Houd ⌥ ingedrukt"
+"Hold ⌥Z" = "Houd ⌥Z ingedrukt"
+"Home" = "Home"
+"Horizontal" = "Horizontaal"
+"Horizontal align" = "Horizontaal uitlijnen"
+"Horizontal hex" = "Horizontaal hex"
+"Horizontal padding" = "Horizontale padding"
+"Horizontal spacing" = "Horizontale afstand"
+"Hosted by {operator}" = "Gehost door {operator}"
+"Hover a layer to see its properties" = "Houd de muis boven een laag om de eigenschappen te zien"
+"Hover other layers to measure the distance" = "Beweeg over andere lagen om de afstand te meten"
+"Hue" = "Hue"
+"Hug" = "Hug"
+"Hug contents" = "Aangepast aan inhoud"
+"Icon components on a 24 px grid with keylines and a size preview" = "Iconcomponents op een raster van 24 px met keylines en een voorvertoning van de grootte"
+"Icon set starter" = "Iconenset-starter"
+"If" = "Als"
+"If it keeps happening, please report it at {link} with this message." = "Als dit blijft gebeuren, meld het dan op {link} met dit bericht."
+"If {condition}" = "Als {condition}"
+"Ignore auto layout (absolute position)" = "Auto layout negeren (absolute positie)"
+"Ignore overlapping layers" = "Overlappende lagen negeren"
+"Image" = "Afbeelding"
+"Images" = "Afbeeldingen"
+"Import" = "Importeren"
+"Import path" = "Importpad"
+"Import plugin from manifest" = "Plugin importeren vanuit een manifest"
+"Import plugin from manifest…" = "Plugin importeren vanuit manifest…"
+"Import report" = "Importrapport"
+"Import variables" = "Variabelen importeren"
+"Imported document" = "Geïmporteerd document"
+"Imported {name}" = "{name} geïmporteerd"
+"Imported {n} new variables, updated {updated}" = { one = "{n} nieuwe variabele geïmporteerd, {updated} bijgewerkt", other = "{n} nieuwe variabelen geïmporteerd, {updated} bijgewerkt" }
+"Import…" = "Importeren…"
+"In an instance, this comes from the main component" = "In een instance komt dit uit de hoofdcomponent"
+"In the browser you can join sessions the desktop app hosts and files on a FigCraft server. A page opened over https reaches other computers only through wss:// links (a server behind TLS)." = "In de browser kun je deelnemen aan sessies die de desktop-app host en aan bestanden die op een FigCraft-server staan. Een pagina die via https is geopend, bereikt andere computers alleen via wss://-links (een server achter TLS)."
+"Include bounding box" = "Bounding box meenemen"
+"Include id attribute" = "id-attribuut opnemen"
+"Included" = "Inbegrepen"
+"Included in layout" = "Inbegrepen in de layout"
+"Individual corners" = "Individuele hoeken"
+"Individual strokes" = "Afzonderlijke lijnen"
+"Ink" = "Ink"
+"Inner shadow" = "Binnenschaduw"
+"Inside" = "Binnen"
+"Inspect" = "Inspecteren"
+"Inspect the layer under the pointer: size, colours, typography" = "Inspecteer de laag onder de muisaanwijzer: grootte, kleuren, typografie"
+"Install" = "Installeren"
+"Install plugin" = "Plugin installeren"
+"Installed" = "Geïnstalleerd"
+"Installed {name}" = "{name} geïnstalleerd"
+"Installing…" = "Installeren…"
+"Instance" = "Instance"
+"Instance properties" = "Instance-eigenschappen"
+"Instance swap" = "Instance verwisselen"
+"Instance swap (no other component)" = "Instance verwisselen (geen andere component)"
+"Instances" = "Instances"
+"Instant" = "Direct"
+"Intensity" = "Intensiteit"
+"Interaction" = "Interactie"
+"Interactions" = "Interacties"
+"Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Interface-ontwerp en prototyping. Een gratis, open-source, clean-room ontwerptool, helemaal van nul geschreven in Rust, onderdeel van de ArtCraft Crafting Apps."
+"Intersect" = "Intersect"
+"Intersects" = "Overlapt"
+"Invalid color" = "Ongeldige kleur"
+"Invite link" = "Uitnodigingslink"
+"Invite link copied" = "Uitnodigingslink gekopieerd"
+"It asks permission to:" = "Het vraagt toestemming om:"
+"Jan" = "jan."
+"Join" = "Deelnemen"
+"Join code copied" = "Toegangscode gekopieerd"
+"Join code or invite link" = "Deelnamecode of uitnodigingslink"
+"Join live session" = "Deelnemen aan live-sessie"
+"Join us on Discord" = "Chat met ons op Discord"
+"Join with a code" = "Deelnemen met een code"
+"Joined" = "Erbij gekomen"
+"Joined {file}" = "Deelgenomen aan {file}"
+"Joining…" = "Bezig met deelnemen…"
+"Join|stroke" = "Hoek"
+"Jul" = "jul."
+"Jun" = "jun."
+"Just now" = "Zojuist"
+"Justify" = "Uitvullen"
+"Kanban board" = "Kanbanbord"
+"Keep a measurement on the canvas for developers" = "Een meting voor ontwikkelaars op het canvas houden"
+"Keep appearance" = "Uiterlijk behouden"
+"Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Kleur behouden converteert elke kleurwaarde naar {profile}, zodat kleuren er hetzelfde uitzien. Waarden behouden laat de getallen staan, waardoor kleuren verschuiven."
+"Keep tool selected after use" = "Tool na gebruik geselecteerd houden"
+"Keep values" = "Waarden behouden"
+"Key/Gamepad" = "Toets/Gamepad"
+"Key/Gamepad {key}" = "Toets/Gamepad {key}"
+"Keyboard shortcuts" = "Sneltoetsen"
+"Kits" = "Kits"
+"Landing page" = "Landingspagina"
+"Language" = "Taal"
+"Lasso" = "Lasso"
+"Last" = "Laatst"
+"Last change: {note}" = "Laatste wijziging: {note}"
+"Last commit" = "Laatste commit"
+"Last modified" = "Laatst gewijzigd"
+"Last on top" = "Laatste bovenaan"
+"Layer blur" = "Laagvervaging"
+"Layer name" = "Laagnaam"
+"Layers" = "Lagen"
+"Layers in an instance take their position from the main component" = "Lagen in een instance nemen hun positie over van de hoofdcomponent"
+"Layout" = "Layout"
+"Layout grid" = "Layoutraster"
+"Layout grid settings" = "Instellingen voor layoutraster"
+"Layout grids" = "Layout-rasters"
+"Leave session" = "Sessie verlaten"
+"Leaves" = "Leaves"
+"Left" = "Links"
+"Left & right" = "Links en rechts"
+"Left side" = "Linkerkant"
+"Left side width" = "Breedte linkerkant"
+"Letter case" = "Letterkast"
+"Letter spacing" = "Letterafstand"
+"Libraries" = "Bibliotheken"
+"Libraries in this file" = "Bibliotheken in dit bestand"
+"Library updates available" = "Bibliotheekupdates beschikbaar"
+"Library: click to collapse" = "Bibliotheek: klik om samen te vouwen"
+"Library: click to expand" = "Bibliotheek: klik om uit te klappen"
+"Library: its variables are read-only here; edit them in the library file and publish it" = "Bibliotheek: de variabelen zijn hier alleen-lezen; bewerk ze in het bibliotheekbestand en publiceer dat"
+"Light" = "Licht"
+"Lighten" = "Lighten"
+"Light|glass" = "Light"
+"Line" = "Lijn"
+"Line arrow" = "Lijnpijl"
+"Line delta" = "Regeldelta"
+"Line height" = "Regelafstand"
+"Linear" = "Lineair"
+"Lines" = "Lijnen"
+"Lines +/−" = "Regels +/−"
+"Lines added" = "Toegevoegde regels"
+"Lines deleted" = "Regels verwijderd"
+"Link" = "Koppeling"
+"Link copied" = "Link gekopieerd"
+"Link docs, code or tickets for developers." = "Koppel documentatie, code of tickets voor ontwikkelaars."
+"Link frames on the Prototype tab, then present the flow" = "Koppel frames op het Prototype-tabblad en presenteer daarna de flow"
+"Link this component to its code component: instances then show your real snippet with their values." = "Koppel deze component aan zijn codecomponent: instances laten dan je echte snippet zien met hun waarden."
+"List spacing" = "Lijstafstand"
+"List style" = "Lijststijl"
+"Live session" = "Live sessie"
+"Live · {people}" = "Live · {people}"
+"Local components" = "Lokale componenten"
+"Local network" = "Lokaal netwerk"
+"Local styles" = "Lokale stijlen"
+"Local variables" = "Lokale variabelen"
+"Lock/Unlock" = "Vergrendelen/ontgrendelen"
+"Locked" = "Vergrendeld"
+"Lowercase" = "Kleine letters"
+"Luminance" = "Luminantie"
+"Luminosity" = "Luminosity"
+"Main" = "Main"
+"Main component deleted" = "Hoofdcomponent verwijderd"
+"Main menu" = "Hoofdmenu"
+"Make a component" = "Maak een component"
+"Make slot" = "Slot maken"
+"Mar" = "mrt."
+"Margin" = "Marge"
+"Mark all as read" = "Markeer alles als gelezen"
+"Mark as resolved" = "Markeren als opgelost"
+"Mark as unread" = "Markeren als ongelezen"
+"Mark as unresolved" = "Markeren als onopgelost"
+"Marker" = "Stift"
+"Mask" = "Masker"
+"Mass · Stiffness · Damping" = "Massa · Stijfheid · Demping"
+"Match (empty: the whole name)" = "Overeenkomst (leeg: de hele naam)"
+"Max H" = "Max H"
+"Max W" = "Max B"
+"Max lines" = "Max. regels"
+"Maximize" = "Maximaliseren"
+"May" = "mei"
+"Measure to the selection" = "Meten tot de selectie"
+"Measurements" = "Metingen"
+"Merge into main" = "Samenvoegen in main"
+"Merge regions" = "Gebieden samenvoegen"
+"Merge the branch into the main file (one undo step) and archive it" = "Voeg de branch samen met het hoofdbestand (één keer ongedaan maken) en archiveer hem"
+"Merged" = "Samengevoegd"
+"Merged PRs" = "Samengevoegde PRs"
+"Min H" = "Min H"
+"Min W" = "Min. B"
+"Minimize" = "Minimaliseren"
+"Minutes" = "Minuten"
+"Mirror angle" = "Hoek spiegelen"
+"Mirror angle and length" = "Spiegel hoek en lengte"
+"Mirroring" = "Spiegeling"
+"Missing" = "Ontbreekt"
+"Missing fonts" = "Ontbrekende lettertypen"
+"Missing layer" = "Ontbrekende laag"
+"Missing style" = "Ontbrekende stijl"
+"Missing variable" = "Ontbrekende variabele"
+"Miter" = "Punt"
+"Miter angle" = "Verstekhoek"
+"Mixed" = "Gemengd"
+"Mixed fonts" = "Gemengde lettertypen"
+"Mixed interactions: click + to replace them" = "Gemengde interacties: klik op + om ze te vervangen"
+"Mobile app" = "Mobiele app"
+"Mode" = "Modus"
+"Model" = "Model"
+"Models" = "Modellen"
+"Mono" = "Mono"
+"More" = "Meer"
+"More instance actions" = "Meer instance-acties"
+"Mouse down" = "Muisknop ingedrukt"
+"Mouse enter" = "Muis erover"
+"Mouse leave" = "Muis verlaat"
+"Mouse up" = "Muis loslaten"
+"Move" = "Verplaatsen"
+"Move along the toolbar or the layer rows" = "Beweeg langs de werkbalk of de rijen met lagen"
+"Move column left" = "Kolom naar links verplaatsen"
+"Move column right" = "Kolom naar rechts verplaatsen"
+"Move down" = "Omlaag verplaatsen"
+"Move in" = "Naar binnen bewegen"
+"Move out" = "Naar buiten verplaatsen"
+"Move tools" = "Verplaatsgereedschap"
+"Move up" = "Omhoog verplaatsen"
+"Moved to {name}" = "Verplaatst naar {name}"
+"Multi" = "Multi"
+"Multiply" = "Multiply"
+"Muted" = "Muted"
+"Name" = "Naam"
+"Name (A–Z)" = "Naam (A–Z)"
+"Named instance" = "Benoemde instance"
+"Navigate to" = "Ga naar"
+"Nested instance" = "Geneste instance"
+"New board" = "Nieuw whiteboard"
+"New design file" = "Nieuw ontwerpbestand"
+"Newest first" = "Nieuwste eerst"
+"Next frame" = "Volgend frame"
+"Next or previous control in the focused region" = "Volgende of vorige bedieningselement in het gebied met focus"
+"Next ready for dev" = "Volgende klaar voor dev"
+"Next size option" = "Volgende grootteoptie"
+"No assets: no export settings, icons or images. Add export settings in the Design tab." = "Geen assets: geen exportinstellingen, pictogrammen of afbeeldingen. Voeg exportinstellingen toe op het Design-tabblad."
+"No boolean variables fit here." = "Er passen hier geen booleaanse variabelen."
+"No boolean variables yet. Create them in Local variables." = "Nog geen booleaanse variabelen. Maak ze in Lokale variabelen."
+"No branches. A branch is a copy of the file to try changes in, then review and merge." = "Geen branches. Een branch is een kopie van het bestand om wijzigingen in uit te proberen, daarna te beoordelen en samen te voegen."
+"No category" = "Geen categorie"
+"No changes" = "Geen wijzigingen"
+"No color styles" = "Geen kleurstijlen"
+"No colour variables fit here." = "Hier passen geen kleurvariabelen."
+"No colour variables yet. Create them in Local variables." = "Nog geen kleurvariabelen. Maak ze in Lokale variabelen."
+"No comments yet" = "Nog geen reacties"
+"No compatibility warnings reported" = "Geen compatibiliteitswaarschuwingen gerapporteerd"
+"No components yet. Select layers and press {keys}." = "Nog geen components. Selecteer lagen en druk op {keys}."
+"No conflicts." = "Geen conflicten."
+"No contributor data was built into this copy." = "In deze kopie zijn geen bijdragersgegevens ingebouwd."
+"No device" = "Geen apparaat"
+"No files or templates match your search" = "Geen bestanden of sjablonen komen overeen met je zoekopdracht"
+"No fonts match" = "Geen lettertypen gevonden"
+"No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Hier is geen toegangscode (de server is ouder dan toegangscodes, of dit adres past niet in een code): deel in plaats daarvan de link."
+"No layer changes to show." = "Geen lagenwijzigingen om te tonen."
+"No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "Nog geen bibliotheken. Voeg een .figcraft-bestand toe dat als bibliotheek is gepubliceerd, of plak de link van een teambibliotheek."
+"No list" = "Geen lijst"
+"No matching comments" = "Geen overeenkomende reacties"
+"No matching components" = "Geen overeenkomende components"
+"No matching layers" = "Geen bijpassende lagen"
+"No matching styles" = "Geen bijpassende stijlen"
+"No matching variables" = "Geen passende variabelen"
+"No mirroring" = "Geen spiegeling"
+"No model credits were built into this copy." = "Er zijn geen modelcredits in deze kopie ingebouwd."
+"No number variables fit here." = "Hier passen geen getalvariabelen."
+"No number variables yet. Create them in Local variables." = "Nog geen getalvariabelen. Maak ze in Lokale variabelen."
+"No other pages" = "Geen andere pagina's"
+"No paints" = "Geen vullingen"
+"No plugins on {server}." = "Geen plugins op {server}."
+"No plugins yet. Import a development plugin from its figcraft-plugin.json." = "Nog geen plugins. Importeer een development-plugin via zijn figcraft-plugin.json."
+"No preferred components" = "Geen voorkeurscomponenten"
+"No preset" = "Geen preset"
+"No saved versions yet. Save a version to mark a point in your work you can come back to." = "Nog geen opgeslagen versies. Sla een versie op om een moment in je werk vast te leggen waar je later naartoe kunt terugkeren."
+"No scrolling" = "Geen scrollen"
+"No shortcuts match" = "Er komen geen sneltoetsen overeen"
+"No status" = "Geen status"
+"No string variables fit here." = "Er passen hier geen string-variabelen."
+"No string variables yet. Create them in Local variables." = "Nog geen tekenreeksvariabelen. Maak ze aan in Lokale variabelen."
+"No styles yet." = "Nog geen stijlen."
+"No styles yet. Click + to create one from the selection." = "Nog geen stijlen. Klik op + om er een te maken vanuit de selectie."
+"No templates match your search" = "Geen sjablonen gevonden voor je zoekopdracht"
+"No text styles yet. Click + to create one from the selected text." = "Nog geen tekststijlen. Klik op + om er een te maken vanuit de geselecteerde tekst."
+"No variables fit here." = "Er passen hier geen variabelen."
+"No variables yet. Create them in Local variables." = "Nog geen variabelen. Maak ze in Lokale variabelen."
+"No votes yet" = "Nog geen stemmen"
+"Nobody else is here yet" = "Er is nog niemand anders hier"
+"Noise" = "Ruis"
+"None" = "Geen"
+"None." = "Geen."
+"Normal" = "Normal"
+"Not bound" = "Niet gekoppeld"
+"Not in a live session" = "Niet in een live sessie"
+"Not in this font" = "Niet in dit lettertype"
+"Not properties, kept as written: {names}" = "Geen eigenschappen, ongewijzigd overgenomen: {names}"
+"Not read yet" = "Nog niet gelezen"
+"Not shared" = "Niet gedeeld"
+"Note {n}" = "Notitie {n}"
+"Nothing changed since this was marked ready for dev." = "Er is niets gewijzigd sinds dit was gemarkeerd als ready for dev."
+"Nothing here yet. Set a frame's status to list it." = "Nog niets hier. Stel de status van een frame in om het hier te tonen."
+"Nothing online yet. Use Share on a file to put it online and it is listed here." = "Er staat nog niets online. Gebruik Delen bij een bestand om het online te zetten, dan wordt het hier vermeld."
+"Nothing to export" = "Niets te exporteren"
+"Nov" = "nov."
+"Now" = "Nu"
+"Nudge (Shift: big nudge)" = "Verschuiven (Shift: grote stap)"
+"Nudge amount" = "Stapafstand"
+"Number" = "Getal"
+"Number ↑" = "Getal ↑"
+"Number ↓" = "Nummer ↓"
+"Numbered list" = "Genummerde lijst"
+"Object" = "Object"
+"Oct" = "okt."
+"Off" = "Uit"
+"Offered first when filling the slot (any content is allowed)" = "Wordt het eerst aangeboden bij het vullen van de slot (elke inhoud is toegestaan)"
+"Offered first when swapping the instance (any component is allowed)" = "Wordt als eerste aangeboden bij het verwisselen van de instance (elk component is toegestaan)"
+"Offset" = "Verschuiving"
+"Oldest first" = "Oudste eerst"
+"On click" = "Bij klik"
+"On drag" = "Bij slepen"
+"On this page" = "Op deze pagina"
+"One announcement in five common sizes: square, portrait, story, link and banner" = "Eén aankondiging in vijf gangbare formaten: vierkant, staand, story, link en banner"
+"Online" = "Online"
+"Online files" = "Online bestanden"
+"Online sharing is off: files are shared on the local network only." = "Online delen staat uit: bestanden worden alleen op het lokale netwerk gedeeld."
+"Only the first changed layers are listed." = "Alleen de eerste gewijzigde lagen worden weergegeven."
+"Only the first {n} changed layers are listed." = "Er worden alleen de eerste {n} gewijzigde lagen weergegeven."
+"Only your threads" = "Alleen jouw gesprekken"
+"Opacity" = "Dekking"
+"Opacity & blend" = "Dekking & blend"
+"Opacity 10%…90%, 0: 100%" = "Dekking 10%…90%, 0: 100%"
+"Open" = "Openen"
+"Open .figcraft, .svg or images" = "Open .figcraft, .svg of afbeeldingen"
+"Open branch" = "Branch openen"
+"Open file" = "Bestand openen"
+"Open files" = "Geopende bestanden"
+"Open presentations" = "Geopende presentaties"
+"Open in focus view" = "Openen in focusweergave"
+"Open in new window" = "Openen in een nieuw venster"
+"Open invite links in FigCraft" = "Uitnodigingslinks openen in FigCraft"
+"Open link" = "Link openen"
+"Open link {url}" = "Link {url} openen"
+"Open overlay" = "Overlay openen"
+"Open prototype preview" = "Voorvertoning van prototype openen"
+"Open variables ({count})" = "Variabelen openen ({count})"
+"Opened as a new document" = "Geopend als nieuw document"
+"Opened “{name}” in a new tab" = "“{name}” geopend in een nieuw tabblad"
+"Opening the file…" = "Bestand openen…"
+"Opening {n} files as new files" = { one = "Openen als nieuw bestand", other = "{n} bestanden openen als nieuwe bestanden" }
+"Open|comments" = "Open"
+"Options" = "Opties"
+"Orange" = "Oranje"
+"Order" = "Volgorde"
+"Other" = "Overige"
+"Other apps may not open every .fig file exported here." = "Het kan zijn dat andere apps niet elk .fig-bestand openen dat hier wordt geëxporteerd."
+"Others lose access and keep their copy; the file stays on the server for you" = "Anderen verliezen de toegang en behouden hun kopie; het bestand blijft voor jou op de server"
+"Others type this under Share ▸ Join with a code" = "Anderen typen dit onder Delen ▸ Deelnemen met een code"
+"Outline stroke" = "Lijn omzetten naar contour"
+"Outline text" = "Tekst omzetten in outlines"
+"Outlines" = "Contouren"
+"Outside" = "Buiten"
+"Overflow" = "Overloop"
+"Overlay" = "Overlay"
+"Overlay position" = "Overlaypositie"
+"Overridden here (the collection it extends has another value)" = "Hier overschreven (de verzameling die het uitbreidt heeft een andere waarde)"
+"Overrides" = "Overschrijvingen"
+"Owner token" = "Eigenaartoken"
+"Owner token copied" = "Eigenaartoken gekopieerd"
+"PDF print options" = "PDF-afdrukopties"
+"PDF print settings" = "PDF-afdrukinstellingen"
+"Padding" = "Padding"
+"Page" = "Pagina"
+"Page deleted" = "Pagina verwijderd"
+"Pages" = "Pagina's"
+"Pages added to the document" = "Pagina's toegevoegd aan het document"
+"Pages: {pages}" = "Pagina's: {pages}"
+"Paint bucket" = "Vulemmertje"
+"Pan the canvas" = "Verschuif het canvas"
+"Pan with nothing selected (Shift: farther)" = "Verschuiven zonder selectie (Shift: verder)"
+"Panels" = "Panelen"
+"Paper" = "Paper"
+"Paragraph indent" = "Alinea-inspringen"
+"Paragraph indent applies to left-aligned text" = "Alineainspringing geldt voor links uitgelijnde tekst"
+"Paragraph spacing" = "Alinea-afstand"
+"Pass through" = "Pass through"
+"Paste a link (https://…)" = "Plak een link (https://…)"
+"Paste a team library link (a view link)" = "Plak een link naar een teambibliotheek (een weergavelink)"
+"Paste here" = "Hier plakken"
+"Paste to replace" = "Plakken om te vervangen"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Ontwerplagen geplakt; {n} soort inhoud is weggelaten", other = "Ontwerplagen geplakt; {n} soorten inhoud zijn weggelaten" }
+"Pattern" = "Patroon"
+"Pattern alignment" = "Patroonuitlijning"
+"Pattern scale" = "Patroonschaal"
+"Pattern source" = "Patroonbron"
+"Pause" = "Pauzeren"
+"Pen" = "Pen"
+"Pencil" = "Potlood"
+"People in this file" = "Personen in dit bestand"
+"People join from anywhere with a code. The file is kept on {server} while you share it." = "Mensen kunnen met een code van overal deelnemen. Het bestand blijft op {server} staan zolang je het deelt."
+"People on your network join with a code. Nothing goes through a server." = "Mensen op je netwerk nemen deel met een code. Er gaat niets via een server."
+"Phone" = "Telefoon"
+"Pick color" = "Kleur opnemen"
+"Pick color (I)" = "Kleur kiezen (I)"
+"Pick one font family first" = "Kies eerst één lettertypefamilie"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "Kies de Frame-tool en sleep daarna op het canvas of kies een apparaatgrootte"
+"Pin a property" = "Eigenschap vastspelden"
+"Pinch" = "Pinch"
+"Pink" = "Roze"
+"Pixel grid" = "Pixelraster"
+"Pixel preview 1x" = "Pixelvoorvertoning 1x"
+"Pixel preview 2x" = "Pixelvoorvertoning 2x"
+"Place a shape or frame (its tool chosen)" = "Plaats een vorm of frame (het bijbehorende gereedschap is gekozen)"
+"Place automatically" = "Automatisch plaatsen"
+"Place image" = "Afbeelding plaatsen"
+"Placed on the current page" = "Geplaatst op de huidige pagina"
+"Playground" = "Playground"
+"Plugin" = "Plugin"
+"Plugins" = "Plugins"
+"Plugins & widgets" = "Plugins & widgets"
+"Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Plugins draaien in de sandbox van FigCraft, zonder bestanden, netwerk of klok. Installeer alleen plugins die je vertrouwt."
+"Plus darker" = "Plus darker"
+"Plus lighter" = "Plus lighter"
+"Plus one" = "Plus één"
+"Point" = "Punt"
+"Points" = "Punten"
+"Polygon" = "Veelhoek"
+"Polygons" = "Veelhoeken"
+"Port" = "Poort"
+"Position" = "Positie"
+"Post" = "Plaatsen"
+"Preferences" = "Voorkeuren"
+"Preferred" = "Voorkeur"
+"Present" = "Presenteren"
+"Present or preview" = "Presenteren of voorvertonen"
+"Present this flow" = "Deze flow presenteren"
+"Presentation" = "Presentatie"
+"Presentation slides" = "Presentatiedia's"
+"Presenting: comments" = "Presenteren: reacties"
+"Presenting: cycle the size options" = "Presenteren: door de grootteopties bladeren"
+"Presenting: full screen" = "Presenteren: volledig scherm"
+"Presenting: next frame" = "Presenteren: volgende frame"
+"Presenting: previous frame" = "Presenteren: vorig frame"
+"Presenting: restart" = "Presenteren: opnieuw starten"
+"Preserve scroll position" = "Scrollpositie behouden"
+"Presets" = "Presets"
+"Press a key…" = "Druk op een toets…"
+"Preview" = "Voorvertoning"
+"Preview this flow" = "Voorvertoning van deze flow"
+"Preview this frame" = "Dit frame voorvertonen"
+"Previous frame" = "Vorige frame"
+"Previous ready for dev" = "Vorige klaar voor developers"
+"Progressive" = "Progressive"
+"Properties" = "Eigenschappen"
+"Prototype" = "Prototype"
+"Prototype preview" = "Prototypevoorvertoning"
+"Prototype settings" = "Prototype-instellingen"
+"Publish" = "Publiceren"
+"Publish changes" = "Wijzigingen publiceren"
+"Publish to another server…" = "Publiceren op een andere server…"
+"Publish to server" = "Publiceren naar de server"
+"Published version {v}" = "Gepubliceerde versie {v}"
+"Published version {v} to the server" = "Versie {v} naar de server gepubliceerd"
+"Published version {v}: save the file so other files can use it" = "Gepubliceerde versie {v}: sla het bestand op zodat andere bestanden het kunnen gebruiken"
+"Published · {people}" = "Gepubliceerd · {people}"
+"Publishing to a server needs the desktop app; in the browser you can join a server's files" = "Publiceren naar een server vraagt om de desktop-app; in de browser kun je deelnemen aan de bestanden van een server"
+"Publishing with the server's key." = "Publiceren met de sleutel van de server."
+"Publishing…" = "Bezig met publiceren…"
+"Push" = "Pushen"
+"Push changes to main component" = "Wijzigingen naar hoofdcomponent doorvoeren"
+"Put text on path" = "Tekst op pad plaatsen"
+"Question" = "Vraag"
+"R" = "R"
+"Radial" = "Radiaal"
+"Radius" = "Radius"
+"Ratio" = "Verhouding"
+"Reading the library…" = "Bibliotheek wordt gelezen…"
+"Ready for dev" = "Klaar voor dev"
+"Real name" = "Echte naam"
+"Recent" = "Onlangs geopend"
+"Recent files" = "Onlangs geopende bestanden"
+"Recents" = "Onlangs geopend"
+"Recovered {n} unsaved files after the app quit unexpectedly: save them to keep them" = { one = "Na een onverwachte afsluiting van de app is één niet-opgeslagen bestand hersteld: sla het op om het te bewaren", other = "Na een onverwachte afsluiting van de app zijn {n} niet-opgeslagen bestanden hersteld: sla ze op om ze te bewaren" }
+"Rectangle" = "Rechthoek"
+"Rectangles" = "Rechthoeken"
+"Red" = "Rood"
+"Reduce motion" = "Beweging verminderen"
+"Refraction" = "Breking"
+"Regular expression" = "Reguliere expressie"
+"Relative to" = "Ten opzichte van"
+"Remove" = "Verwijderen"
+"Remove all" = "Alles verwijderen"
+"Remove annotation" = "Annotatie verwijderen"
+"Remove auto layout" = "Auto layout verwijderen"
+"Remove column" = "Kolom verwijderen"
+"Remove dev resource" = "Dev-resource verwijderen"
+"Remove export setting" = "Exportinstelling verwijderen"
+"Remove from recents" = "Verwijderen uit onlangs geopend"
+"Remove from server" = "Van de server verwijderen"
+"Remove from server…" = "Van server verwijderen…"
+"Remove guide" = "Hulplijn verwijderen"
+"Remove interaction" = "Interactie verwijderen"
+"Remove library from this file" = "Bibliotheek uit dit bestand verwijderen"
+"Remove measurement" = "Meting verwijderen"
+"Remove min and max" = "Min en max verwijderen"
+"Remove min and max height" = "Minimale en maximale hoogte verwijderen"
+"Remove min and max width" = "Minimale en maximale breedte verwijderen"
+"Remove regions" = "Gebieden verwijderen"
+"Remove row" = "Rij verwijderen"
+"Remove slot" = "Vak verwijderen"
+"Remove starting point" = "Startpunt verwijderen"
+"Remove stop" = "Stop verwijderen"
+"Remove text from path" = "Tekst losmaken van pad"
+"Remove the else and its actions" = "De else en de bijbehorende acties verwijderen"
+"Remove this condition and its actions" = "Deze voorwaarde en de bijbehorende acties verwijderen"
+"Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "Dit bestand van de server verwijderen? Het kan daarna niet meer worden gedeeld of geopend vanaf de server. Jouw kopie blijft hier open."
+"Remove {name} from session" = "{name} verwijderen uit de sessie"
+"Remove {name} from {server}?" = "{name} van {server} verwijderen?"
+"Removed" = "Verwijderd"
+"Removed from the server" = "Van de server verwijderd"
+"Removed since it was marked" = "Verwijderd sinds het was gemarkeerd"
+"Rename" = "Hernoemen"
+"Rename duplicated layers" = "Gedupliceerde lagen hernoemen"
+"Rename folder" = "Map hernoemen"
+"Rename group" = "Groep hernoemen"
+"Rename layers" = "Lagen hernoemen"
+"Rename mode" = "Modus hernoemen"
+"Rename on the server" = "Hernoemen op de server"
+"Rename on the server…" = "Hernoemen op de server…"
+"Rename page" = "Pagina hernoemen"
+"Rename to" = "Hernoemen naar"
+"Replace all" = "Alles vervangen"
+"Replace mixed export settings" = "Gemengde exportinstellingen vervangen"
+"Replace with" = "Vervangen door"
+"Replace with a new interaction" = "Vervangen door een nieuwe interactie"
+"Reply" = "Antwoorden"
+"Report" = "Melden"
+"Report this file…" = "Dit bestand melden…"
+"Reset" = "Herstellen"
+"Reset adjustments" = "Aanpassingen herstellen"
+"Reset all changes" = "Alle wijzigingen terugdraaien"
+"Reset all overrides on this layer" = "Alle overschrijvingen op deze laag herstellen"
+"Reset overrides" = "Overschrijvingen terugzetten"
+"Reset slot" = "Slot terugzetten"
+"Reset this override" = "Deze overschrijving terugzetten"
+"Reset to style" = "Terugzetten naar stijl"
+"Reset to the inherited value" = "Terugzetten naar de overgeërfde waarde"
+"Resize by the nudge amount" = "Formaat wijzigen met de stapafstand"
+"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Pas het formaat van frames aan naar het scherm van het apparaat (of het venster zonder apparaat): hun constraints en auto layout reageren"
+"Resize to fit" = "Formaat aanpassen aan inhoud"
+"Resizing" = "Formaat wijzigen"
+"Resolve" = "Oplossen"
+"Resolve change" = "Wijziging oplossen"
+"Resolved" = "Opgelost"
+"Resources" = "Bronnen"
+"Responsive" = "Responsive"
+"Restart" = "Opnieuw starten"
+"Restore" = "Terugzetten"
+"Restore main component" = "Hoofdcomponent terugzetten"
+"Restore this version" = "Deze versie terugzetten"
+"Restored “{name}”" = "“{name}” teruggezet"
+"Retrospective" = "Retrospectief"
+"Results" = "Resultaten"
+"Resume" = "Hervatten"
+"Reverse the order" = "Volgorde omdraaien"
+"Reversed triangle" = "Omgekeerde driehoek"
+"Review and merge" = "Controleren en samenvoegen"
+"Ribbon" = "Ribbon"
+"Right" = "Rechts"
+"Right side" = "Rechterkant"
+"Right side width" = "Breedte rechterkant"
+"Rotate 90°" = "90° draaien"
+"Rotate 90° right" = "90° naar rechts draaien"
+"Rotate to landscape" = "Draai naar liggend"
+"Rotate to portrait" = "Draaien naar staand"
+"Rotation" = "Rotatie"
+"Rotation jitter" = "Verspreide rotatie"
+"Round" = "Rond"
+"Rounded" = "Rounded"
+"Rounded rectangle" = "Afgeronde rechthoek"
+"Row" = "Rij"
+"Row gap" = "Rijafstand"
+"Row sizes" = "Rijgroottes"
+"Row span" = "Rijbereik"
+"Rows" = "Rijen"
+"Rows {count}" = "Rijen {count}"
+"Rulers" = "Linialen"
+"Run" = "Uitvoeren"
+"Run {label}" = "{label} uitvoeren"
+"SHA-256: {sha}…" = "SHA-256: {sha}…"
+"Same as layer" = "Zoals de laag"
+"Saturation" = "Verzadiging"
+"Save" = "Opslaan"
+"Save as" = "Opslaan als"
+"Save as preset…" = "Opslaan als preset…"
+"Save file" = "Bestand opslaan"
+"Save files automatically" = "Bestanden automatisch opslaan"
+"Save version  {key}" = "Versie opslaan  {key}"
+"Saved" = "Opgeslagen"
+"Saved {name}" = "{name} opgeslagen"
+"Say something" = "Zeg iets"
+"Scale" = "Schalen"
+"Scatter" = "Scatter"
+"Scoping: where pickers offer it" = "Bereik: waar keuzeschermen hem aanbieden"
+"Screen" = "Screen"
+"Scroll behavior" = "Scrollgedrag"
+"Scroll to" = "Scrollen naar"
+"Scroll to layer" = "Naar laag scrollen"
+"Scroll with parent" = "Scrollen met bovenliggend"
+"Search" = "Zoeken"
+"Search actions, layers and tools" = "Zoek naar acties, lagen en tools"
+"Search assets" = "Zoek assets"
+"Search comments" = "Zoeken in reacties"
+"Search files and templates" = "Bestanden en sjablonen zoeken"
+"Search fonts" = "Lettertypen zoeken"
+"Search layers" = "Lagen doorzoeken"
+"Search plugins" = "Zoeken naar plugins"
+"Search results" = "Zoekresultaten"
+"Search shortcuts" = "Sneltoetsen zoeken"
+"Search templates" = "Sjablonen zoeken"
+"Section" = "Sectie"
+"Section color" = "Sectiekleur"
+"Sections" = "Secties"
+"See all templates" = "Alle sjablonen bekijken"
+"Select a frame and add a starting point to present it as a flow." = "Selecteer een frame en voeg een startpunt toe om het als flow te presenteren."
+"Select a frame to preview it" = "Kies een frame voor een voorvertoning"
+"Select a layer to see its properties and code" = "Selecteer een laag om de eigenschappen en de code te zien"
+"Select all" = "Alles selecteren"
+"Select all with same" = "Alles met hetzelfde selecteren"
+"Select layer" = "Laag selecteren"
+"Select layers and they space themselves as their content changes" = "Selecteer lagen en ze passen hun afstand automatisch aan als de inhoud verandert"
+"Select layers to apply the style to" = "Selecteer lagen om de stijl op toe te passen"
+"Select layers with this color" = "Lagen met deze kleur selecteren"
+"Select overlapping shapes" = "Overlappende vormen selecteren"
+"Select points to edit their position, radius and mirroring" = "Selecteer punten om hun positie, radius en spiegeling te bewerken"
+"Select slot" = "Kies een slot"
+"Selection" = "Selectie"
+"Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Selectiekader, {w} bij {h} op {x}, {y}: pijlen verplaatsen het, Shift+pijlen of {cmd}+pijlen wijzigen het formaat, Enter selecteert, Escape annuleert"
+"Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Selectiekader: pijltjes verplaatsen het, Shift+pijltjes of {cmd}+pijltjes vergroten of verkleinen het, Enter selecteert, Escape annuleert"
+"Selection colors" = "Kleuren in selectie"
+"Send backward" = "Naar achteren sturen"
+"Send report" = "Rapport verzenden"
+"Send to back" = "Naar achterste brengen"
+"Sep" = "sep."
+"Server address" = "Serveradres"
+"Server address (ws://host:47900/)" = "Serveradres (ws://host:47900/)"
+"Server for online sharing" = "Server voor online delen"
+"Set as default" = "Als standaard instellen"
+"Set variable" = "Variabele instellen"
+"Set variable mode" = "Variabelemodus instellen"
+"Set variable {name}" = "Variabele {name} instellen"
+"Set {name} to {value}" = "{name} instellen op {value}"
+"Shadows" = "Schaduwen"
+"Shape" = "Vorm"
+"Shape builder" = "Shape builder"
+"Shape tools" = "Vormgereedschap"
+"Shapes" = "Vormen"
+"Share" = "Delen"
+"Share this file" = "Dit bestand delen"
+"Share with a code" = "Delen met een code"
+"Share: live session, export" = "Delen: live-sessie, exporteren"
+"Shared" = "Gedeeld"
+"Shared: copy its code from the file's menu" = "Gedeeld: kopieer de code uit het menu van het bestand"
+"Sharing a file needs the desktop app; here you can join one." = "Een bestand delen vereist de desktop-app; hier kun je aan één deelnemen."
+"Sharing on the local network (online sharing is off: no server is set in Preferences)." = "Delen op het lokale netwerk (online delen staat uit: er is geen server ingesteld in Voorkeuren)."
+"Sharing on your network · {people}" = "Delen via je netwerk · {people}"
+"Sharing online · {people}" = "Delen online · {people}"
+"Sharing stopped: the file stays on the server, open only to you" = "Delen gestopt: het bestand blijft op de server staan, alleen voor jou toegankelijk"
+"Show" = "Weergeven"
+"Show all templates" = "Alle sjablonen tonen"
+"Show as grid" = "Als raster weergeven"
+"Show as list" = "Weergeven als lijst"
+"Show autosaves" = "Automatisch opgeslagen versies tonen"
+"Show behind transparent areas" = "Weergeven achter transparante gebieden"
+"Show comments (Shift+C)" = "Reacties tonen (Shift+C)"
+"Show device frame" = "Apparaatframe weergeven"
+"Show dimensions on objects" = "Toon afmetingen op objecten"
+"Show hotspot hints" = "Hints voor hotspots tonen"
+"Show in Explorer" = "Weergeven in Verkenner"
+"Show in Finder" = "In Finder weergeven"
+"Show in folder" = "In map tonen"
+"Show only this on the canvas" = "Alleen dit op het canvas weergeven"
+"Show open" = "Openstaande tonen"
+"Show section contents" = "Sectie-inhoud weergeven"
+"Show this layer" = "Deze laag tonen"
+"Show usage" = "Gebruik weergeven"
+"Show/Hide" = "Tonen/Verbergen"
+"Show/Hide UI" = "UI tonen/verbergen"
+"Side by side" = "Naast elkaar"
+"Sidebar" = "Zijbalk"
+"Simplify stroke" = "Lijn vereenvoudigen"
+"Size" = "Grootte"
+"Size jitter" = "Groottevariatie"
+"Skip ink" = "Skip ink"
+"Slashed zero" = "Nul met schuine streep"
+"Slice" = "Slice"
+"Slices" = "Slices"
+"Slide in" = "Inschuiven"
+"Slide out" = "Uitschuiven"
+"Slot" = "Slot"
+"Slot content" = "Slotinhoud"
+"Small capitals" = "Kapitelen"
+"Small caps" = "Kleine kapitalen"
+"Smart animate" = "Smart animate"
+"Snap to pixel grid" = "Uitlijnen op pixelraster"
+"Social and slides" = "Sociale media en dia's"
+"Social media" = "Sociale media"
+"Social post sizes" = "Maten voor sociale posts"
+"Soft light" = "Soft light"
+"Solid" = "Effen"
+"Some variants have the same property values: give each one a unique combination" = "Sommige varianten hebben dezelfde eigenschapswaarden: geef elke variant een unieke combinatie"
+"Sort" = "Sorteren"
+"Sort by" = "Sorteren op"
+"Sort by date" = "Op datum sorteren"
+"Sort by page" = "Sorteren op pagina"
+"Sort by {column}" = "Sorteren op {column}"
+"Space around" = "Ruimte rondom"
+"Space between" = "Ruimte ertussen"
+"Space drag" = "Slepen met de spatiebalk"
+"Space evenly" = "Gelijkmatig verdelen"
+"Space+drag" = "Space+drag"
+"Spacing" = "Afstand"
+"Spam, stolen work, abuse…" = "Spam, gestolen werk, misbruik…"
+"Speech bubble" = "Tekstballon"
+"Splay" = "Splay"
+"Spotlight me" = "Spotlight mij"
+"Spread" = "Spread"
+"Square" = "Vierkant"
+"Stamp" = "Stempel"
+"Stamps" = "Stempels"
+"Standard" = "Standaard"
+"Standard ligatures" = "Standaardligaturen"
+"Star" = "Ster"
+"Stars" = "Stars"
+"Start" = "Start"
+"Start ascending from / stop descending at" = "Begin oplopend vanaf / stop aflopend bij"
+"Start from a blank canvas" = "Begin vanaf een leeg canvas"
+"Start from a template" = "Begin met een sjabloon"
+"Start on path" = "Begin op het pad"
+"Start on the Home screen" = "Starten op Home"
+"Start point" = "Startpunt"
+"Start sharing" = "Delen starten"
+"Start sharing with the Share button, then pass on the code it gives" = "Begin met delen via de knop Delen en geef daarna de code door die je krijgt"
+"Start vote" = "Stemronde starten"
+"Starting to share…" = "Bezig met delen…"
+"Status" = "Status"
+"Sticky" = "Sticky"
+"Sticky note" = "Plakbriefje"
+"Sticky note colors" = "Kleuren van plakbriefjes"
+"Sticky notes" = "Plakbriefjes"
+"Sticky notes, shapes and connectors" = "Plakbriefjes, vormen en verbindingen"
+"Stop" = "Stoppen"
+"Stop following {name}" = "Stop met {name} te volgen"
+"Stop session" = "Sessie stoppen"
+"Stop sharing" = "Stoppen met delen"
+"Stop spotlighting" = "Stop met uitlichten"
+"Stop timer" = "Timer stoppen"
+"Stop {n}  {hex}" = "Stop {n}  {hex}"
+"Straight" = "Recht"
+"Stretch" = "Uitrekken"
+"Strikethrough" = "Doorstrepen"
+"String" = "Tekenreeks"
+"Stroke" = "Lijn"
+"Stroke style" = "Lijnstijl"
+"Stroke weight" = "Lijndikte"
+"Strokes" = "Lijnen"
+"Style" = "Stijl"
+"Styles" = "Stijlen"
+"Stylistic set 1" = "Stilistische set 1"
+"Stylistic set 2" = "Stylistische set 2"
+"Stylistic set 3" = "Stylistische set 3"
+"Stylistic set 4" = "Stilistische set 4"
+"Stylistic set 5" = "Stilistische set 5"
+"Subtract" = "Subtract"
+"Subtracts" = "Trekt af"
+"Suffix" = "Achtervoegsel"
+"Suspend snapping while dragging" = "Uitlijning opschorten tijdens het slepen"
+"Swap instance" = "Instance verwisselen"
+"Swap library: use another library's assets of the same names" = "Bibliotheek verwisselen: assets met dezelfde namen uit een andere bibliotheek gebruiken"
+"Swap orientation" = "Oriëntatie verwisselen"
+"Swap overlay" = "Overlay verwisselen"
+"Swap to {name}" = "Wisselen naar {name}"
+"Swap width and height" = "Breedte en hoogte omwisselen"
+"Swapped instance" = "Verwisselde instance"
+"Swapped {n} assets" = { one = "{n} asset verwisseld", other = "{n} assets verwisseld" }
+"Swapped {n} assets; {missed} had no match and still use the old library" = { one = "{n} asset verwisseld; {missed} had geen overeenkomst en gebruikt nog de oude bibliotheek", other = "{n} assets verwisseld; {missed} hadden geen overeenkomst en gebruiken nog de oude bibliotheek" }
+"Sweep" = "Sweep"
+"System" = "Systeem"
+"Tab / Shift+Tab" = "Tab / Shift+Tab"
+"Table" = "Tabel"
+"Tablet" = "Tablet"
+"Tabular numbers" = "Tabulaire cijfers"
+"Take the values from the first selected layer" = "Waarden van de eerste geselecteerde laag overnemen"
+"Taper" = "Taper"
+"Taper both ends" = "Beide uiteinden versmallen"
+"Tell the server's operator what is wrong with it" = "Vertel de beheerder van de server wat er mis mee is"
+"Temperature" = "Temperatuur"
+"Template" = "Sjabloon"
+"Templates" = "Sjablonen"
+"Terms" = "Voorwaarden"
+"Text" = "Tekst"
+"Text align" = "Tekstuitlijning"
+"Text content" = "Tekstinhoud"
+"Text size" = "Tekstgrootte"
+"Text style" = "Tekststijl"
+"Text styles" = "Tekststijlen"
+"Texts" = "Teksten"
+"Texture" = "Texture"
+"The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3." = "Het canvas toont de kleuren als voorvertoning in sRGB; geëxporteerde PNG-, JPG- en WebP-bestanden worden gelabeld als Display P3."
+"The destination document is unavailable. Nothing was imported." = "Het doeldocument is niet beschikbaar. Er is niets geïmporteerd."
+"The destination document was closed. Nothing was imported." = "Het doeldocument is gesloten. Er is niets geïmporteerd."
+"The destination page was removed. Nothing was imported." = "De doelpagina is verwijderd. Er is niets geïmporteerd."
+"The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "Het bestand wordt van de server verwijderd: niemand kan het daar nog openen of eraan deelnemen, en dit kan niet ongedaan worden gemaakt. Kopieën die open zijn, blijven bij wie ze heeft."
+"The file now holds another library" = "Het bestand bevat nu een andere bibliotheek"
+"The file now holds another library (\"{name}\")" = "Het bestand bevat nu een andere bibliotheek (\"{name}\")"
+"The files you shared or published online from this computer. They stay on their server until you remove them." = "De bestanden die je vanaf deze computer online hebt gedeeld of gepubliceerd. Ze blijven op hun server totdat je ze verwijdert."
+"The link carries the session's secret: share it only with people you invite." = "De link bevat het geheim van de sessie: deel hem alleen met mensen die je uitnodigt."
+"The name in your online files and on the server. The document inside keeps its own name." = "De naam in je online bestanden en op de server. Het document erin behoudt zijn eigen naam."
+"The selection uses several text styles: click to apply one" = "De selectie gebruikt meerdere tekststijlen: klik om er een toe te passen"
+"The server deletes this file if nobody opens it before {date}." = "De server verwijdert dit bestand als niemand het vóór {date} opent."
+"The whole file" = "Het hele bestand"
+"Theme" = "Thema"
+"There's no destination for that action" = "Er is geen doel voor die actie"
+"Thickness" = "Dikte"
+"This branch can't be reviewed: {e}" = "Deze branch kan niet worden beoordeeld: {e}"
+"This branch was merged or archived." = "Deze branch is samengevoegd of gearchiveerd."
+"This computer only" = "Alleen op deze computer"
+"This computer remembers the owner token, so the file can be managed from the home screen's Online list. Copy it to manage the file from somewhere else: it is a password for this file and won't be shown again." = "Deze computer onthoudt het eigenaartoken, zodat het bestand beheerd kan worden vanuit de Online-lijst op het beginscherm. Kopieer het om het bestand vanaf een andere plek te beheren: het is het wachtwoord voor dit bestand en wordt niet opnieuw weergegeven."
+"This condition is edited as an expression" = "Deze voorwaarde wordt als expressie bewerkt"
+"This file" = "Dit bestand"
+"This file has unsaved changes" = "Dit bestand heeft niet-opgeslagen wijzigingen"
+"This file is on {server}, open only to you. Share it to let others in with a new code." = "Dit bestand staat op {server}, alleen toegankelijk voor jou. Deel het om anderen binnen te laten met een nieuwe code."
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "Dit bestand gebruikt lettertypen die niet op deze computer zijn geïnstalleerd. Hun tekst wordt in een vervangend lettertype getoond tot je ze installeert."
+"This frame is new on the branch." = "Dit frame is nieuw op de branch."
+"This frame isn't on the branch." = "Dit frame staat niet op de branch."
+"This server is open to the public: no key needed." = "Deze server is voor iedereen toegankelijk: geen sleutel nodig."
+"This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Deze server heeft een sleutel nodig: voeg ?key=… toe aan het adres (`figcraft-server key` toont die op de computer van de server)."
+"This server takes files only with its key: see Advanced." = "Deze server accepteert bestanden alleen met de bijbehorende sleutel: zie Geavanceerd."
+"Thumbs up" = "Duim omhoog"
+"Tidy up" = "Opruimen"
+"Tile" = "Tegelen"
+"Tile type" = "Tegeltype"
+"Timer" = "Timer"
+"Tint" = "Tint"
+"Title" = "Titel"
+"Title case" = "Hoofdletter per woord"
+"To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Om deze bibliotheek met je team te delen, publiceer het bestand naar een server (Delen ▸ Publiceren naar server…), publiceer daarna de bibliotheek."
+"To the layer around it" = "Tot de laag eromheen"
+"Toggle" = "Omschakelen"
+"Toggle light/dark theme" = "Wisselen tussen licht/donker thema"
+"Toggle visibility" = "Zichtbaarheid omschakelen"
+"Tools" = "Gereedschappen"
+"Top" = "Boven"
+"Top & bottom" = "Boven & onder"
+"Top left radius" = "Radius linksboven"
+"Top right radius" = "Hoekradius rechtsboven"
+"Transform" = "Transformeren"
+"Triangle" = "Driehoek"
+"Triangle arrow" = "Driehoekspijl"
+"Trigger" = "Trigger"
+"Trigger layer" = "Activerende laag"
+"True" = "Waar"
+"Truncate text" = "Tekst afkappen"
+"Truncate with an ellipsis" = "Afkappen met een beletselteken"
+"Try again" = "Probeer het opnieuw"
+"Try another search or filter." = "Probeer een andere zoekopdracht of filter."
+"Try another search, or browse templates." = "Probeer een andere zoekopdracht of bekijk de sjablonen."
+"Try another word, or look at every kind." = "Probeer een ander woord, of bekijk alle soorten."
+"Turn a layer into a component, reuse it, and change every copy at once" = "Maak van een laag een component, hergebruik die en verander alle kopieën tegelijk"
+"Two digits" = "Twee cijfers"
+"Type" = "Type"
+"Type settings" = "Tekstinstellingen"
+"Type the join code you were given, or paste an invite link." = "Typ de toegangscode die je hebt gekregen, of plak een uitnodigingslink."
+"Typography" = "Typografie"
+"Underline" = "Onderstrepen"
+"Undo takes back only your own changes; what others changed since stays." = "Ongedaan maken zet alleen je eigen wijzigingen terug; wat anderen sindsdien hebben gewijzigd, blijft staan."
+"Ungroup" = "Groep opheffen"
+"Uniform" = "Gelijkmatig"
+"Union" = "Union"
+"Unions" = "Unies"
+"Unknown — treated as sRGB" = "Onbekend — behandeld als sRGB"
+"Unread" = "Ongelezen"
+"Unresolve" = "Oplossing ongedaan maken"
+"Unsaved changes" = "Niet-opgeslagen wijzigingen"
+"Unsaved changes in {names}. Save them before closing?" = "Niet-opgeslagen wijzigingen in {names}. Opslaan voor het sluiten?"
+"Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Niet-opgeslagen wijzigingen: sla eerst op ({save}), of sluit het tabblad met {alt}-klik om ze te verwerpen"
+"Unsaved changes: save first, or close again with {key} to discard" = "Niet-opgeslagen wijzigingen: sla eerst op, of sluit nogmaals met {key} om te verwerpen"
+"Up" = "Omhoog"
+"Update" = "Bijwerken"
+"Update from main" = "Bijwerken vanaf main"
+"Update from selection" = "Bijwerken vanuit de selectie"
+"Update plugin" = "Plugin bijwerken"
+"Updated {components} and {styles}" = "{components} en {styles} bijgewerkt"
+"Updated {name}" = "{name} bijgewerkt"
+"Updating the graphics driver often helps. To use OpenGL only, start FigCraft from a Command Prompt with:" = "Het bijwerken van de grafische driver helpt vaak. Om alleen OpenGL te gebruiken, start je FigCraft vanaf de Opdrachtprompt met:"
+"Updating the graphics driver often helps. WGPU_BACKEND (vulkan, gl, metal) names another graphics API to try." = "Het bijwerken van de grafische driver helpt vaak. WGPU_BACKEND (vulkan, gl, metal) noemt een andere grafische API om te proberen."
+"Uploads this file to a FigCraft server and keeps this tab in sync with it. You get a link to edit and a link to view." = "Uploadt dit bestand naar een FigCraft-server en houdt dit tabblad daarmee gesynchroniseerd. Je krijgt een link om te bewerken en een link om te bekijken."
+"Uppercase" = "Hoofdletters"
+"Use a fixed value" = "Gebruik een vaste waarde"
+"Use an expression, e.g. count + 1" = "Gebruik een expressie, bijv. count + 1"
+"Use as mask" = "Gebruiken als masker"
+"Use auto layout" = "Auto layout gebruiken"
+"Use number keys for opacity" = "Gebruik cijfertoetsen voor dekking"
+"Use the .figcraft or .fig extension." = "Gebruik de extensie .figcraft of .fig."
+"Use the layer's fill" = "De vulling van de laag gebruiken"
+"Used in {files} · {instances}" = "Gebruikt in {files} · {instances}"
+"Username" = "Gebruikersnaam"
+"Uses variables: each layer shows them in its own mode" = "Gebruikt variabelen: elke laag toont ze in zijn eigen modus"
+"Value" = "Waarde"
+"Variable" = "Variabele"
+"Variable collections" = "Verzamelingen van variabelen"
+"Variable modes" = "Variabelemodi"
+"Variable width" = "Variabele breedte"
+"Variables" = "Variabelen"
+"Variables JSON…" = "Variabelen-JSON…"
+"Variables store reusable values (colours, numbers, strings, booleans) with modes such as Light and Dark." = "Variabelen slaan herbruikbare waarden (kleuren, getallen, tekenreeksen, booleans) op met modi zoals Light en Dark."
+"Variant" = "Variant"
+"Vector" = "Vector"
+"Vectors" = "Vectoren"
+"Version" = "Versie"
+"Version history" = "Versiegeschiedenis"
+"Version {version}" = "Versie {version}"
+"Version {v} · {components} · {styles} · {variables}" = "Versie {v} · {components} · {styles} · {variables}"
+"Vertical" = "Verticaal"
+"Vertical align" = "Verticaal uitlijnen"
+"Vertical hex" = "Verticale hex"
+"Vertical padding" = "Verticale padding"
+"Vertical spacing" = "Verticale afstand"
+"Vertical trim" = "Verticaal bijsnijden"
+"View" = "Weergave"
+"View link" = "Weergavelink"
+"View link copied" = "Weergavelink gekopieerd"
+"View only" = "Alleen weergeven"
+"View only: you see every change as it happens but can't edit. Leave to keep a copy you can edit." = "Alleen weergeven: je ziet elke wijziging live terwijl die plaatsvindt, maar je kunt niet bewerken. Verlaat de sessie om een kopie te bewaren die je kunt bewerken."
+"Viewing “{name}”" = "“{name}” bekijken"
+"Violet" = "Violet"
+"Visibility" = "Zichtbaarheid"
+"Visible" = "Zichtbaar"
+"Vivid" = "Vivid"
+"Votes per person" = "Stemmen per persoon"
+"Voting session" = "Stemronde"
+"WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND is ingesteld en geeft de te gebruiken grafische API aan; als je het uitzet, kiest FigCraft zelf."
+"Warm" = "Warm"
+"Watch" = "Watch"
+"Wavy" = "Golvend"
+"Web" = "Web"
+"WebSocket URL" = "WebSocket-URL"
+"WebSocket URL copied" = "WebSocket-URL gekopieerd"
+"Websites" = "Websites"
+"Wedge" = "Wedge"
+"Weekly planner" = "Weekplanner"
+"Weight" = "Dikte"
+"What changed since it was marked ready for dev" = "Wat er veranderd is sinds het is gemarkeerd als klaar voor Dev Mode"
+"What is wrong with this file? The server's operator gets your report." = "Wat klopt er niet aan dit bestand? Je melding gaat naar de beheerder van de server."
+"What it's for" = "Waarvoor het dient"
+"What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "Vanwaar dit is veranderd, is niet bekend: het veranderde voordat FigCraft een kopie bewaarde van dev-klare frames. Los de wijziging op (of markeer het weer als te vergelijken) om vanaf nu te kunnen vergelijken."
+"What you try here changes this preview and the code below, not the file" = "Wat je hier probeert, wijzigt deze voorvertoning en de code hieronder, niet het bestand"
+"While hovering" = "Tijdens het aanwijzen"
+"While pressing" = "Tijdens het indrukken"
+"White" = "Wit"
+"Who runs it, its terms and how long it keeps files" = "Wie het beheert, de voorwaarden en hoelang het bestanden bewaart"
+"Whole screen" = "Hele scherm"
+"Why it changed" = "Waarom het is veranderd"
+"Widget" = "Widget"
+"Widgets" = "Widgets"
+"Width" = "Breedte"
+"Width point" = "Breedtepunt"
+"Width profile" = "Breedteprofiel"
+"Wireframe kit" = "Wireframekit"
+"With the layers' export settings" = "Met de exportinstellingen van de lagen"
+"Wrap" = "Omloop"
+"Wrap in new section" = "Inpakken in een nieuwe sectie"
+"Yellow" = "Geel"
+"Yesterday" = "Gisteren"
+"You" = "Jij"
+"You'll get the shared file as a new tab and edit it together." = "Je krijgt het gedeelde bestand als nieuw tabblad en bewerkt het samen."
+"You're spotlighting: everyone follows your view" = "Je bent in de spotlight: iedereen volgt jouw weergave"
+"Your copy of the file stays open" = "Je kopie van het bestand blijft open"
+"Your copy stays open; the file stays on the server" = "Jouw kopie blijft open; het bestand blijft op de server"
+"Your name" = "Jouw naam"
+"Your name in comments" = "Je naam in reacties"
+"Your system asks for reduced motion: animations stay off." = "Jouw systeem vraagt om minder beweging: animaties blijven uit."
+"Z" = "Z"
+"Z to A" = "Z tot A"
+"Zoom" = "Zoom"
+"Zoom around the pointer" = "Inzoomen rond de aanwijzer"
+"Zoom device to fill window" = "Apparaat inzoomen om het venster te vullen"
+"Zoom in" = "Inzoomen"
+"Zoom out" = "Uitzoomen"
+"Zoom to 100%" = "Zoomen naar 100%"
+"Zoom to 200%" = "Inzoomen op 200%"
+"Zoom to 50%" = "Zoomen naar 50%"
+"Zoom to fit" = "Inpassen"
+"Zoom to selection" = "Inzoomen op selectie"
+"Zoom tool: click to zoom in, drag an area" = "Zoomgereedschap: klik om in te zoomen, sleep om een gebied te selecteren"
+"Zoom tool: zoom out" = "Zoomgereedschap: uitzoomen"
+"and {n} more" = { one = "en {n} meer", other = "en {n} meer" }
+"bleed marks" = "afloopmarkeringen"
+"by {author}" = "door {author}"
+"call any command its access allows" = "elke opdracht aanroepen die diens toegang toestaat"
+"call only: {commands}" = "alleen aanroepbaar: {commands}"
+"can edit the document" = "kan het document bewerken"
+"can save files" = "kan bestanden opslaan"
+"conditional prototype actions nested too deeply were skipped" = "Voorwaardelijke prototype-acties die te diep genest zijn, zijn overgeslagen"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "voorwaardelijke prototypeacties met voorwaarden die niet konden worden geëvalueerd zijn overgeslagen"
+"connector label background was skipped: style data is missing" = "achtergrond van connectorlabel overgeslagen: stijldata ontbreekt"
+"connector label was skipped: background bounds are invalid" = "connectorlabel is overgeslagen: achtergrondgrenzen zijn ongeldig"
+"connector label was skipped: background transform is invalid" = "connector labels overgeslagen: achtergrondtransformatie is ongeldig"
+"connector label was skipped: composed text transform is invalid" = "connectorlabel is overgeslagen: samengestelde teksttransformatie is ongeldig"
+"connector label was skipped: derived background bounds are missing" = "connectorlabel is overgeslagen: afgeleide achtergrondgrenzen ontbreken"
+"connector label was skipped: derived text bounds are missing" = "connectorlabel is overgeslagen: afgeleide tekstgrenzen ontbreken"
+"connector label was skipped: text bounds are invalid" = "connectorlabel overgeslagen: de tekstafmetingen zijn ongeldig"
+"connector label was skipped: text style data is missing" = "connectorlabel is overgeslagen: tekststijlgegevens ontbreken"
+"connector label was skipped: text transform is invalid" = "Het label van de verbinding is overgeslagen: de teksttransformatie is ongeldig"
+"connector labels were skipped" = "labels van connectoren zijn overgeslagen"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "connectorlagen worden geïmporteerd als statische frame-/vectormomentopnames met labels indien aanwezig; live eindpuntkoppelingen worden niet behouden"
+"connector snapshot vector data is missing; connector was left empty" = "vectordata in de connector-snapshot ontbreekt; connector is leeggelaten"
+"connectors whose ends can't be placed are empty" = "connectors waarvan de uiteinden niet geplaatst kunnen worden zijn leeg"
+"crop marks" = "snijmarkeringen"
+"damaged vector geometry was skipped" = "beschadigde vectorgeometrie is overgeslagen"
+"damaged vector networks import as outlines" = "beschadigde vectornetwerken worden geïmporteerd als outlines"
+"development: {path}" = "ontwikkeling: {path}"
+"document children other than pages were skipped" = "documentkinderen anders dan pagina's zijn overgeslagen"
+"duplicate grid track sizing entries use equal tracks" = "Dubbele vermeldingen voor trackgroottes gebruiken gelijke tracks"
+"e.g. count + 1" = "bijv. count + 1"
+"e.g. count >= 3 and not done" = "bijv. aantal >= 3 en niet klaar"
+"elbowed and curved connectors without a saved path import as straight lines" = "haakse en gebogen connectors zonder opgeslagen pad worden geïmporteerd als rechte lijnen"
+"entries without a node type were skipped" = "items zonder node-type zijn overgeslagen"
+"figcraft:// links from a browser, chat or email open this app and join the session." = "figcraft://-links uit een browser, chat of e-mail openen deze app en laten je deelnemen aan de sessie."
+"filled areas of a vector with their own fill use the layer's fill" = "gevulde gebieden van een vector met een eigen vulling gebruiken de vulling van de laag"
+"from {server}" = "van {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "gamepad-triggers zonder precies één bekende controllerknop zijn overgeslagen"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "de lijst met rastertracks overschrijdt 1000 items; de tracks gebruiken de standaard gelijke grootte"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "Trackgrootte wordt niet ondersteund of is ongeldig opgemaakt; de betreffende tracks gebruiken gelijke groottes"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "de lijst met maten voor rastertracks bevat meer dan 1000 items; de tracks gebruiken de standaard gelijke maat"
+"hidden" = "verborgen"
+"iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "afbeeldingsfilters zijn dubbelzinnig omdat beide filtercontainers aanwezig zijn; filterconversie is overgeslagen"
+"image filters use FigCraft's approximate renderer" = "afbeeldingsfilters gebruiken de benaderende renderer van FigCraft"
+"instance swap properties whose default component isn't in the file were skipped" = "instance-swap-eigenschappen waarvan de standaardcomponent niet in het bestand zit, zijn overgeslagen"
+"instances inside their own main component were imported as frames" = "instances in hun eigen hoofdcomponent zijn geïmporteerd als frames"
+"instances of components that aren't in the file show no layers" = "instances van components die niet in het bestand staan, tonen geen lagen"
+"instances of components that aren't in the file were imported as frames" = "instances van componenten die het bestand niet bevat zijn als frames geïmporteerd"
+"instances that would nest a component inside itself were imported as frames" = "Instanties die een component in zichzelf zouden nesten, zijn als frames geïmporteerd"
+"instances without a main component were imported as empty frames" = "instances zonder hoofdcomponent zijn geïmporteerd als lege frames"
+"invalid internal .fig text path data was ignored" = "ongeldige padgegevens van interne .fig-tekst zijn genegeerd"
+"invalid or oversized vector networks import as outlines" = "ongeldige of te grote vectornetwerken worden geïmporteerd als contouren"
+"invalid or oversized vector path data was skipped" = "ongeldige of te grote vectorpadgegevens zijn overgeslagen"
+"just now" = "zojuist"
+"key triggers without a supported key were skipped" = "key-triggers zonder een ondersteunde toets zijn overgeslagen"
+"key up triggers import as key presses" = "key-up-triggers worden geïmporteerd als toetsaanslagen"
+"layers without a position were placed at their parent's origin" = "lagen zonder positie zijn op de oorsprong van het bovenliggende element geplaatst"
+"layers without a type were skipped" = "lagen zonder type zijn overgeslagen"
+"legacy image filter container is unsupported; filter conversion was skipped" = "Verouderde container voor beeldfilters wordt niet ondersteund; filterconversie is overgeslagen"
+"locked" = "vergrendeld"
+"malformed image filters container was skipped" = "misvormde container met afbeeldingsfilters is overgeslagen"
+"malformed image paintFilter container was skipped" = "onjuist gevormde image paintFilter-container is overgeslagen"
+"malformed slot content assignment was skipped" = "onjuiste toewijzing van slot-inhoud is overgeslagen"
+"no bleed" = "geen afloop"
+"nobody else here yet" = "nog niemand anders hier"
+"non-default slot settings are not represented and were skipped" = "niet-standaard slot-instellingen zijn niet overgenomen en zijn overgeslagen"
+"now" = "nu"
+"offer files to save if it asks to (you choose where each one goes)" = "bestanden aanbieden om op te slaan als het daarom vraagt (jij kiest waar elk bestand komt)"
+"only in a text style or variable" = "alleen in een tekststijl of variabele"
+"or" = "of"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "Lijnverbindingen op punten zijn behouden; gestreepte lijnen of lijnen met variabele breedte worden weergegeven met de verbinding van de laag"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "voorkeurssleutels van slotcomponenten konden niet naar bestandsknooppunten worden herleid en zijn overgeslagen"
+"prototype actions of unknown types were skipped" = "prototypeacties van onbekende typen zijn overgeslagen"
+"prototype actions without a destination in the file were skipped" = "prototype-acties zonder bestemming in het bestand zijn overgeslagen"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "prototype-expressies over variabelen die niet in de variables-JSON staan zijn overgeslagen"
+"prototype expressions with unsupported functions were skipped" = "prototype-expressies met niet-ondersteunde functies zijn overgeslagen"
+"prototype interactions without supported actions were skipped" = "prototype-interacties zonder ondersteunde acties zijn overgeslagen"
+"prototype navigations of unknown types were skipped" = "prototype-navigaties van onbekende typen zijn overgeslagen"
+"prototype transitions of unknown types play instantly" = "prototype-overgangen van onbekende typen worden direct afgespeeld"
+"prototype triggers of unknown types were skipped" = "prototype-triggers van onbekende typen zijn overgeslagen"
+"put a widget on the canvas" = "een widget op het canvas zetten"
+"read and edit the document" = "het document lezen en bewerken"
+"read the document" = "lees het document"
+"reads the document" = "leest het document"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "set-variable-acties op variabelen die niet in de variables-JSON staan zijn overgeslagen"
+"set-variable actions with values that can't be evaluated were skipped" = "set-variable-acties met waarden die niet kunnen worden geëvalueerd zijn overgeslagen"
+"set-variable actions with values that don't fit the variable were skipped" = "set-variable-acties met waarden die niet in de variabele passen, zijn overgeslagen"
+"set-variable actions without a value were skipped" = "set-variable-acties zonder waarde zijn overgeslagen"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "set-variable-mode-acties op verzamelingen of modi die niet in de variables JSON staan, zijn overgeslagen"
+"slot content assignment target is missing or is not slot content" = "het toewijzingsdoel van slotcontent ontbreekt of is geen slotcontent"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "Toewijzing van slot-inhoud gebruikt de lege GUID-sentinelwaarde en is overgeslagen"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "sommige vectorpunten verwijzen naar puntinstellingen die ontbreken in het bestand; ze gebruiken de verbindingen van de laag en gewone hoeken"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "sommige vectorsegmenten verwijzen naar stijlinstellingen die in het bestand ontbreken; ze gebruiken de lijn van de laag"
+"stale or invalid grid track sizing entries were ignored" = "verouderde of ongeldige items voor de trackgroottes van het raster zijn genegeerd"
+"stars and polygons without point counts or geometry use the default point count" = "sterren en veelhoeken zonder puntaantallen of geometrie gebruiken het standaardpuntaantal"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "stijlinstellingen van sommige vectorsegmenten worden niet ondersteund; die segmenten gebruiken de lijn van de laag"
+"text path underline or strikethrough decoration is not rendered" = "onderstreep- of doorhaaldecoratie op een tekstpad wordt niet weergegeven"
+"text style overrides refer to missing table entries" = "tekststijl-overschrijvingen verwijzen naar ontbrekende tabelitems"
+"the file has no pages" = "het bestand heeft geen pagina's"
+"the plugin" = "de plugin"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "De variabelen-JSON bevat geen `variableCollections` (de respons van lokale variabelen was verwacht) en is genegeerd"
+"this session only" = "alleen voor deze sessie"
+"unknown component property types were skipped" = "componenteigenschappen van onbekende typen zijn overgeslagen"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "variabele-aliassen naar variabelen die niet in de variables JSON zitten (of van een ander type zijn) zijn overgeslagen"
+"variable bindings to properties the layer doesn't have were skipped" = "variabelekoppelingen naar eigenschappen die de laag niet heeft zijn overgeslagen"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "variabelekoppelingen naar variabelen die niet in de variabelen-JSON zitten (bibliotheekvariabelen) zijn overgeslagen"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "variabelekoppelingen zijn overgeslagen: de bestands-JSON bevat geen variabelendefinities (geef de JSON van lokale variabelen mee als `variables`, of voeg de `meta` ervan naast de bestands-JSON in)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "variabelekoppelingen waarvan het variabeletype niet bij de eigenschap past zijn overgeslagen"
+"variable collections without modes were skipped" = "variabeleverzamelingen zonder modi zijn overgeslagen"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "opzoekingen in prototype-expressies naar andere combinaties dan een variabele en een van zijn modi zijn overgeslagen"
+"variable modes of collections that aren't in the file were skipped" = "Variabelemodi van verzamelingen die niet in het bestand staan, zijn overgeslagen"
+"variable modes of collections that aren't in the variables JSON were skipped" = "variabelemodi van verzamelingen die niet in de variables-JSON staan zijn overgeslagen"
+"variable values that don't match their type (or composed colours) were skipped" = "waarden van variabelen die niet bij hun type passen (of samengestelde kleuren) zijn overgeslagen"
+"variables of unknown types were skipped" = "variabelen van onbekende typen zijn overgeslagen"
+"variables whose collection isn't in the variables JSON were skipped" = "variabelen waarvan de verzameling niet in de variables-JSON zit zijn overgeslagen"
+"variables without readable values were skipped" = "variabelen zonder leesbare waarde zijn overgeslagen"
+"vector points with unknown stroke joins use the layer join" = "vectorpunten met onbekende lijnverbindingen gebruiken de verbinding van de laag"
+"vectors without geometry are empty" = "vectoren zonder geometrie zijn leeg"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "vectoren zonder geometrie zijn leeg (exporteer de bestands-JSON met geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "zeer lange tekst is ingekort tot 1.048.576 tekens"
+"very long vector paths were skipped" = "Zeer lange vectorpaden zijn overgeslagen"
+"video actions are not supported and were skipped" = "videoacties worden niet ondersteund en zijn overgeslagen"
+"video triggers are not supported and were skipped" = "videotriggers worden niet ondersteund en zijn overgeslagen"
+"yesterday" = "gisteren"
+"{instances} in {files}" = "{instances} in {files}"
+"{language}: draft translation, waiting for a native speaker's review." = "{language}: voorlopige vertaling, wacht op controle door een moedertaalspreker."
+"{length} bleed" = "{length} afloop"
+"{month} {day}, {year}" = "{day} {month} {year}"
+"{name} (from {library})" = "{name} (uit {library})"
+"{name} (you)" = "{name} (jij)"
+"{name} ({layers} layers)" = "{name} ({layers} lagen)"
+"{name} ({tag}): {min} – {max}, default {default}. Double-click the slider to go back to the style's value; Escape while dragging cancels." = "{name} ({tag}): {min} – {max}, standaard {default}. Dubbelklik op de schuifregelaar om terug te gaan naar de waarde van de stijl; Escape tijdens het slepen annuleert."
+"{name} cleared from the list" = "{name} uit de lijst verwijderd"
+"{name} from {path}" = "{name} uit {path}"
+"{name} is forgotten on this computer; the file stays on {server}" = "{name} is op deze computer vergeten; het bestand blijft op {server}"
+"{name} is on the server." = "{name} staat op de server."
+"{name} is spotlighting" = "{name} staat in de spotlight"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} is te groot om in de browser te openen (meer dan 512 MB)."
+"{name} was removed from the server" = "{name} is van de server verwijderd"
+"{name} · deleted on main" = "{name} · verwijderd op main"
+"{name} · deleted on the branch" = "{name} · verwijderd op de branch"
+"{name} · not published" = "{name} · niet gepubliceerd"
+"{name} · on a server" = "{name} · op een server"
+"{name} · published version {v}" = "{name} · gepubliceerde versie {v}"
+"{name} · version {v} on the server" = "{name} · versie {v} op de server"
+"{name}, in a live session" = "{name}, in een live sessie"
+"{name}, online, open only to you" = "{name}, online, alleen voor jou toegankelijk"
+"{name}, {kind}, {w} by {h}, selected" = "{name}, {kind}, {w} bij {h}, geselecteerd"
+"{name}\nClick to apply to the selection" = "{name}\nKlik om op de selectie toe te passen"
+"{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nSleep naar het canvas, of klik om in het midden van de weergave te plaatsen.\nHoud Alt (Option) ingedrukt terwijl je op een instance loslaat om die te verwisselen."
+"{n} added" = { one = "{n} toegevoegd", other = "{n} toegevoegd" }
+"{n} autosave versions" = { one = "{n} automatisch opgeslagen versie", other = "{n} automatisch opgeslagen versies" }
+"{n} changed" = { one = "{n} gewijzigd", other = "{n} gewijzigd" }
+"{n} columns" = { one = "{n} kolom", other = "{n} kolommen" }
+"{n} components" = { one = "{n} component", other = "{n} componenten" }
+"{n} components and styles have newer versions" = { one = "{n} component of stijl heeft een nieuwere versie", other = "{n} components en stijlen hebben nieuwere versies" }
+"{n} conflicts to resolve" = { one = "{n} conflict om op te lossen", other = "{n} conflicten om op te lossen" }
+"{n} days ago" = { one = "{n} dag geleden", other = "{n} dagen geleden" }
+"{n} files" = { one = "{n} bestand", other = "{n} bestanden" }
+"{n} hours ago" = { one = "{n} uur geleden", other = "{n} uur geleden" }
+"{n} instances" = { one = "{n} instance", other = "{n} instances" }
+"{n} layers" = { one = "{n} laag", other = "{n} lagen" }
+"{n} layers as one file" = { one = "{n} laag als één bestand", other = "{n} lagen als één bestand" }
+"{n} layers selected" = { one = "{n} laag geselecteerd", other = "{n} lagen geselecteerd" }
+"{n} layers · {parts}" = { one = "{n} laag · {parts}", other = "{n} lagen · {parts}" }
+"{n} matches" = { one = "{n} overeenkomst", other = "{n} overeenkomsten" }
+"{n} min" = "{n} min"
+"{n} minutes ago" = { one = "{n} minuut geleden", other = "{n} minuten geleden" }
+"{n} months ago" = { one = "{n} maand geleden", other = "{n} maanden geleden" }
+"{n} more notes omitted from this report" = { one = "{n} extra notitie weggelaten uit dit rapport", other = "{n} extra notities weggelaten uit dit rapport" }
+"{n} of {total}" = "{n} van {total}"
+"{n} people joined" = { one = "{n} persoon is erbij gekomen", other = "{n} personen zijn erbij gekomen" }
+"{n} preferred components" = { one = "{n} voorkeurscomponent", other = "{n} voorkeurscomponenten" }
+"{n} ready" = { one = "{n} klaar", other = "{n} klaar" }
+"{n} removed" = { one = "{n} verwijderd", other = "{n} verwijderd" }
+"{n} replies" = { one = "{n} antwoord", other = "{n} antwoorden" }
+"{n} rows" = { one = "{n} rij", other = "{n} rijen" }
+"{n} styles" = { one = "{n} stijl", other = "{n} stijlen" }
+"{n} text layers" = { one = "{n} tekstlaag", other = "{n} tekstlagen" }
+"{n} variables" = { one = "{n} variabele", other = "{n} variabelen" }
+"{n} votes" = { one = "{n} stem", other = "{n} stemmen" }
+"{n} votes left" = { one = "Nog {n} stem", other = "Nog {n} stemmen" }
+"{n} weeks ago" = { one = "{n} week geleden", other = "{n} weken geleden" }
+"{n} years ago" = { one = "{n} jaar geleden", other = "{n} jaar geleden" }
+"{n}d" = "{n}d"
+"{n}h" = "{n}h"
+"{n}m" = "{n}m"
+"{n}w" = "{n}w"
+"{page}, nothing selected" = "{page}, niets geselecteerd"
+"{profile} (current)" = "{profile} (huidig)"
+"{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} is de waarde ervan; {property ? \"a\" : \"b\"} kiest een string. Andere {…} blijven letterlijk staan."
+"{server} can't say what became of your files (it is older than this app)." = "{server} kan niet zeggen wat er met je bestanden is gebeurd (deze is ouder dan deze app)."
+"{server} · No longer on the server" = "{server} · Niet meer op de server"
+"{server} · {shared} · Opened {date}" = "{server} · {shared} · Geopend op {date}"
+"{tool}  hold {key}" = "{tool}  {key} ingedrukt houden"
+"{value} isn't a colour" = "{value} is geen kleur"
+"{when} · edited" = "{when} · bewerkt"
+"←" = "←"
+"← ↑ → ↓" = "← ↑ → ↓"
+"← → ↑ ↓" = "← → ↑ ↓"
+"→, Space or N" = "→, Spatie of N"
+"↵" = "↵"
+"⇥ / ⇧⇥" = "⇥ / ⇧⇥"
+"⌘ arrows" = "⌘ arrows"
+"⌘ click" = "⌘ click"
+"⌘ scroll" = "⌘ scroll"
+"⌥ drag" = "⌥ drag"
+
+[commands]
+"align.bottom" = "Onder uitlijnen"
+"align.hcenter" = "Horizontale middens uitlijnen"
+"align.left" = "Links uitlijnen"
+"align.right" = "Rechts uitlijnen"
+"align.top" = "Boven uitlijnen"
+"align.vcenter" = "Verticale middens uitlijnen"
+"annotation.add" = "Annotatie toevoegen"
+"annotation.addCategory" = "Annotatiecategorie toevoegen"
+"annotation.categories" = "Annotatiecategorieën"
+"annotation.edit" = "Annotatie bewerken"
+"annotation.editCategory" = "Annotatiecategorie bewerken"
+"annotation.list" = "Annotaties weergeven"
+"annotation.remove" = "Annotatie verwijderen"
+"annotation.removeCategory" = "Annotatiecategorie verwijderen"
+"app.actions" = "Acties"
+"app.preferences" = "Voorkeuren"
+"arrange.back" = "Achteraan plaatsen"
+"arrange.backward" = "Naar achteren sturen"
+"arrange.forward" = "Naar voren brengen"
+"arrange.front" = "Vooraan plaatsen"
+"arrange.packH" = "Horizontaal samenpakken"
+"arrange.packV" = "Verticaal stapelen"
+"arrange.roundToPixels" = "Afronden op pixels"
+"arrange.spacing" = "Afstand"
+"arrange.tidy" = "Opruimen"
+"board.connector" = "Verbinding"
+"board.ink" = "Stiftlijn"
+"board.label" = "Label van verbinding"
+"board.nextSticky" = "Volgend plakbriefje"
+"board.reattach" = "Verbinding opnieuw koppelen"
+"board.setColor" = "Whiteboardkleur"
+"board.setStyle" = "Whiteboardstijl"
+"board.shape" = "Vorm met tekst"
+"board.stamp" = "Stempel"
+"board.sticky" = "Plakbriefje"
+"board.table" = "Tabel"
+"board.tableEdit" = "Tabel bewerken"
+"board.template" = "Whiteboardsjabloon"
+"board.templates" = "Whiteboardsjablonen weergeven"
+"board.timer" = "Timer"
+"board.timerState" = "Timerstatus"
+"board.vote" = "Stemronde"
+"board.voteResults" = "Stemresultaten"
+"bool.exclude" = "Exclude toepassen op selectie"
+"bool.flatten" = "Boolean afvlakken"
+"bool.intersect" = "Intersect toepassen op selectie"
+"bool.subtract" = "Selectie aftrekken"
+"bool.union" = "Union toepassen op selectie"
+"branch.archive" = "Branch archiveren"
+"branch.create" = "Branch maken"
+"branch.list" = "Branches weergeven"
+"branch.merge" = "Branch samenvoegen"
+"branch.open" = "Branch openen"
+"branch.review" = "Branch beoordelen"
+"branch.updateFromMain" = "Bijwerken vanaf main"
+"codeConnect.export" = "Codeverbindingen exporteren"
+"codeConnect.import" = "Codekoppelingen importeren"
+"codeConnect.remove" = "Koppeling met code verbreken"
+"codeConnect.set" = "Aan code koppelen"
+"collab.cursor" = "Cursor weergeven op"
+"collab.cursorChat" = "Cursorchat"
+"collab.diff" = "Syncwijzigingen weergeven"
+"collab.files" = "Jouw online bestanden"
+"collab.follow" = "Volgen"
+"collab.forgetFile" = "Online bestand vergeten"
+"collab.host" = "Live sessie starten"
+"collab.join" = "Deelnemen aan live sessie"
+"collab.leave" = "Live sessie verlaten"
+"collab.manageFile" = "Gepubliceerd bestand beheren"
+"collab.openFile" = "Online bestand openen"
+"collab.peers" = "Mensen in dit bestand"
+"collab.publish" = "Publiceren op server"
+"collab.recoverFile" = "Online bestand herstellen"
+"collab.registerLinks" = "Uitnodigingslinks openen in FigCraft"
+"collab.removePerson" = "Uit sessie verwijderen"
+"collab.report" = "Bestand melden bij serverbeheerder"
+"collab.serverInfo" = "Serverinformatie"
+"collab.share" = "Delen met een deelnamecode"
+"collab.spotlight" = "Mij in de spotlight zetten"
+"collab.stop" = "Livesessie stoppen"
+"command.batch" = "Meerdere opdrachten uitvoeren"
+"comment.add" = "Reactie toevoegen"
+"comment.delete" = "Reactie verwijderen"
+"comment.edit" = "Reactie bewerken"
+"comment.link" = "Link naar reactie kopiëren"
+"comment.list" = "Reacties weergeven"
+"comment.markRead" = "Reactie als gelezen markeren"
+"comment.move" = "Reactie verplaatsen"
+"comment.next" = "Volgende reactie"
+"comment.open" = "Reactie openen"
+"comment.people" = "Personen in reacties"
+"comment.react" = "Op reactie reageren"
+"comment.reply" = "Op reactie antwoorden"
+"comment.resolve" = "Reactie oplossen"
+"comment.zoom" = "Inzoomen op reacties"
+"component.addProperty" = "Componenteigenschap toevoegen"
+"component.addVariant" = "Variant toevoegen"
+"component.bindProperty" = "Laag aan eigenschap koppelen"
+"component.combineVariants" = "Combineren als varianten"
+"component.create" = "Component maken"
+"component.createMultiple" = "Meerdere componenten maken"
+"component.deleteProperty" = "Componenteigenschap verwijderen"
+"component.detach" = "Instance loskoppelen"
+"component.editProperty" = "Componenteigenschap bewerken"
+"component.exposeInstance" = "Geneste instance zichtbaar maken"
+"component.goToMain" = "Naar hoofdcomponent gaan"
+"component.hideWhenPublishing" = "Verbergen bij publiceren"
+"component.list" = "Componenten weergeven"
+"component.makeSlot" = "Slot maken"
+"component.playground" = "Componentplayground"
+"component.properties" = "Componenteigenschappen"
+"component.pushChanges" = "Wijzigingen naar hoofdcomponent pushen"
+"component.removeSlot" = "Slot verwijderen"
+"component.resetInstance" = "Alle wijzigingen herstellen"
+"component.resetOverride" = "Overschrijving resetten"
+"component.restoreMain" = "Hoofdcomponent terugzetten"
+"dev.compare" = "Wijzigingen vergelijken"
+"dev.focus" = "Focusweergave"
+"dev.resolveChange" = "Wijziging oplossen"
+"dev.unfocus" = "Focusweergave verlaten"
+"devMode.addMeasurement" = "Meting toevoegen"
+"devMode.measurements" = "Metingen weergeven"
+"devMode.removeMeasurement" = "Meting verwijderen"
+"devResource.add" = "Dev-resource toevoegen"
+"devResource.edit" = "Dev-resource bewerken"
+"devResource.list" = "Dev-resources weergeven"
+"devResource.remove" = "Dev-resource verwijderen"
+"distribute.horizontal" = "Horizontale afstand verdelen"
+"distribute.vertical" = "Verticale afstand verdelen"
+"doc.home" = "Home"
+"doc.list" = "Documenten weergeven"
+"doc.nextTab" = "Volgend tabblad"
+"doc.previousTab" = "Vorig tabblad"
+"doc.switch" = "Document wisselen"
+"edit.copy" = "Kopiëren"
+"edit.copyAsCss" = "Kopiëren als CSS"
+"edit.copyAsPng" = "Kopiëren als PNG"
+"edit.copyAsSvg" = "Kopiëren als SVG"
+"edit.copyAsText" = "Kopiëren als tekst"
+"edit.copyLink" = "Link naar selectie kopiëren"
+"edit.copyProperties" = "Eigenschappen kopiëren"
+"edit.cut" = "Knippen"
+"edit.delete" = "Verwijderen"
+"edit.duplicate" = "Dupliceren"
+"edit.findReplace" = "Zoeken en vervangen"
+"edit.paste" = "Plakken"
+"edit.pasteDesignLayers" = "Ontwerplagen plakken"
+"edit.pasteOver" = "Plakken over selectie"
+"edit.pasteProperties" = "Eigenschappen plakken"
+"edit.pasteReplace" = "Plakken ter vervanging"
+"edit.pickColor" = "Kleur oppikken"
+"edit.redo" = "Opnieuw"
+"edit.repeat" = "Laatste opdracht herhalen"
+"edit.setDefaultProperties" = "Standaardeigenschappen instellen"
+"edit.undo" = "Ongedaan maken"
+"effect.add" = "Effect toevoegen"
+"effect.move" = "Effect verplaatsen"
+"effect.remove" = "Effect verwijderen"
+"effect.set" = "Effect instellen"
+"export.add" = "Exportinstelling toevoegen"
+"export.remove" = "Exportinstelling verwijderen"
+"export.update" = "Exportinstelling bewerken"
+"file.close" = "Tabblad sluiten"
+"file.colorProfile" = "Kleurprofiel"
+"file.duplicate" = "Bestand dupliceren"
+"file.export" = "Exporteren"
+"file.exportFramesPdf" = "Frames exporteren naar PDF"
+"file.exportLayers" = "Lagen exporteren"
+"file.exportSvg" = "Selectie exporteren als SVG"
+"file.import" = "Importeren"
+"file.moveTab" = "Tabblad verplaatsen"
+"file.new" = "Nieuw ontwerpbestand"
+"file.newBoard" = "Nieuw whiteboard"
+"file.newFromTemplate" = "Nieuw vanuit sjabloon"
+"file.open" = "Openen"
+"file.openRecent" = "Onlangs geopende bestanden"
+"file.placeImage" = "Afbeelding plaatsen"
+"file.recover" = "Bestand herstellen"
+"file.rename" = "Bestand hernoemen"
+"file.revert" = "Terugdraaien naar opgeslagen versie"
+"file.save" = "Opslaan"
+"file.saveAs" = "Opslaan als"
+"file.saveVersion" = "Opslaan in versiegeschiedenis"
+"file.versionHistory" = "Versiegeschiedenis weergeven"
+"fill.add" = "Vulling toevoegen"
+"fill.move" = "Vulling verplaatsen"
+"fill.pattern" = "Patroonvulling"
+"fill.remove" = "Vulling verwijderen"
+"fill.set" = "Vulling instellen"
+"frame.create" = "Frame maken"
+"frame.presets" = "Frame-voorinstellingen weergeven"
+"frame.swapOrientation" = "Oriëntatie omwisselen"
+"grid.add" = "Layoutraster toevoegen"
+"grid.move" = "Layoutraster verplaatsen"
+"grid.remove" = "Layoutraster verwijderen"
+"guide.add" = "Hulplijn toevoegen"
+"guide.clear" = "Alle hulplijnen verwijderen"
+"guide.move" = "Hulplijn verplaatsen"
+"guide.remove" = "Hulplijn verwijderen"
+"guide.select" = "Hulplijn selecteren"
+"help.about" = "Over FigCraft"
+"help.gettingStarted" = "Aan de slag"
+"help.page" = "Helppagina"
+"help.shortcuts" = "Sneltoetsen"
+"image.adjust" = "Afbeelding aanpassen"
+"image.deletePreset" = "Afbeeldingspreset verwijderen"
+"image.place" = "Afbeelding plaatsen"
+"image.presets" = "Afbeeldingsvoorinstellingen"
+"image.savePreset" = "Voorinstelling voor afbeelding opslaan"
+"inspect.assets" = "Assets inspecteren"
+"inspect.code" = "Code voor laag"
+"inspect.componentCode" = "Componentcode"
+"inspect.properties" = "Eigenschappen inspecteren"
+"inspect.readyForDev" = "Ready for dev"
+"instance.create" = "Instance maken"
+"instance.exposed" = "Zichtbare geneste instances"
+"instance.place" = "Instance plaatsen"
+"instance.resetSlot" = "Slot herstellen"
+"instance.setProperties" = "Eigenschappen van instance instellen"
+"instance.slotInsert" = "In slot invoegen"
+"instance.swap" = "Instance verwisselen"
+"instance.swapAt" = "Instance op punt verwisselen"
+"layers.collapseAll" = "Lagen inklappen"
+"layout.add" = "Auto layout toevoegen"
+"layout.remove" = "Auto layout verwijderen"
+"layout.setTrack" = "Grootte van rastertrack instellen"
+"layout.suggest" = "Auto layout voorstellen"
+"libraries.open" = "Bibliotheken"
+"libraries.publish" = "Bibliotheek publiceren…"
+"library.acceptUpdates" = "Bibliotheekupdates accepteren"
+"library.add" = "Bibliotheek toevoegen"
+"library.aliasVariable" = "Alias van bibliotheekvariabele maken"
+"library.applyStyle" = "Bibliotheekstijl toepassen"
+"library.bindVariable" = "Bibliotheekvariabele koppelen"
+"library.extendCollection" = "Bibliotheekverzameling uitbreiden"
+"library.import" = "Bibliotheekcomponent importeren"
+"library.importVariable" = "Bibliotheekvariabele importeren"
+"library.list" = "Bibliotheken weergeven"
+"library.place" = "Bibliotheekcomponent plaatsen"
+"library.publish" = "Bibliotheek publiceren"
+"library.publishToServer" = "Bibliotheek naar server publiceren"
+"library.remove" = "Bibliotheek verwijderen"
+"library.setVariableMode" = "Modus van bibliotheekvariabele instellen"
+"library.swap" = "Bibliotheek verwisselen"
+"library.swapAt" = "Instance verwisselen voor bibliotheekcomponent"
+"library.updates" = "Bibliotheekupdates"
+"library.usage" = "Bibliotheekgebruik"
+"measure.distances" = "Afstanden meten"
+"measure.padding" = "Padding van auto layout meten"
+"node.create" = "Laag maken"
+"node.get" = "Laag ophalen"
+"node.reorder" = "Laag herordenen"
+"node.reparent" = "Laag verplaatsen naar"
+"node.set" = "Eigenschappen instellen"
+"object.batchRename" = "Batch hernoemen"
+"object.convertToFrame" = "Converteren naar frame"
+"object.convertToGroup" = "Converteren naar groep"
+"object.convertToSection" = "Converteren naar sectie"
+"object.flipH" = "Horizontaal spiegelen"
+"object.flipV" = "Verticaal spiegelen"
+"object.frameSelection" = "Selectie framen"
+"object.group" = "Selectie groeperen"
+"object.hideOthers" = "Overige lagen verbergen"
+"object.mask" = "Als masker gebruiken"
+"object.moveToPage" = "Verplaatsen naar pagina"
+"object.opacityKeys" = "Dekking via cijfertoetsen"
+"object.rasterize" = "Selectie rasteriseren"
+"object.releaseMask" = "Masker opheffen"
+"object.removeFill" = "Vulling verwijderen"
+"object.removeFrame" = "Frame verwijderen"
+"object.removeStroke" = "Lijn verwijderen"
+"object.rename" = "Hernoemen"
+"object.resizeToFit" = "Formaat aanpassen aan inhoud"
+"object.rotate180" = "180° draaien"
+"object.rotateLeft" = "90° naar links draaien"
+"object.rotateRight" = "90° naar rechts draaien"
+"object.setThumbnail" = "Instellen als miniatuur"
+"object.swapFillStroke" = "Vulling en lijn omwisselen"
+"object.toggleLock" = "Selectie vergrendelen/ontgrendelen"
+"object.toggleVisible" = "Selectie tonen/verbergen"
+"object.ungroup" = "Selectie ontgroeperen"
+"object.wrapInSection" = "In nieuwe sectie plaatsen"
+"page.add" = "Pagina toevoegen"
+"page.delete" = "Pagina verwijderen"
+"page.duplicate" = "Pagina dupliceren"
+"page.list" = "Pagina's weergeven"
+"page.move" = "Pagina verplaatsen"
+"page.rename" = "Pagina hernoemen"
+"page.select" = "Naar pagina gaan"
+"page.setBackground" = "Pagina-achtergrond"
+"paint.documentColors" = "Documentkleuren"
+"plugin.close" = "Pluginpaneel sluiten"
+"plugin.directory.install" = "Plugin installeren vanuit map"
+"plugin.directory.list" = "Plugincatalogus doorbladeren"
+"plugin.directory.publish" = "Plugin naar catalogus publiceren"
+"plugin.directory.unpublish" = "Publicatie van plugin in catalogus ongedaan maken"
+"plugin.event" = "Bedieningselement in pluginpaneel gebruiken"
+"plugin.import" = "Plugin importeren vanuit manifest…"
+"plugin.list" = "Plugins weergeven"
+"plugin.remove" = "Plugin verwijderen"
+"plugin.run" = "Plugin uitvoeren"
+"plugin.ui" = "Pluginpaneel"
+"plugins.manage" = "Plugins beheren…"
+"plugins.runLast" = "Laatste plugin uitvoeren"
+"pref.autoSave" = "Bestanden automatisch opslaan"
+"pref.highlightHover" = "Lagen markeren bij aanwijzen"
+"pref.keepTool" = "Gereedschap geselecteerd houden na gebruik"
+"pref.language" = "Interfacetaal"
+"pref.nudge" = "Stapafstand"
+"pref.numberKeysOpacity" = "Cijfertoetsen gebruiken voor dekking"
+"pref.publishServer" = "Server voor online delen"
+"pref.reduceMotion" = "Beweging verminderen"
+"pref.renameDuplicates" = "Gedupliceerde lagen hernoemen"
+"pref.showDimensions" = "Afmetingen op objecten tonen"
+"pref.startOnHome" = "Starten op Home"
+"pref.userName" = "Je naam in reacties"
+"proto.action.add" = "Prototypeactie toevoegen"
+"proto.action.move" = "Volgorde van prototypeactie wijzigen"
+"proto.action.remove" = "Prototype-actie verwijderen"
+"proto.action.set" = "Prototype-actie bewerken"
+"proto.closePreview" = "Prototype-voorvertoning sluiten"
+"proto.conditional.addBlock" = "Else if / else toevoegen"
+"proto.conditional.removeBlock" = "if / else if / else verwijderen"
+"proto.conditional.setCondition" = "Voorwaarde bewerken"
+"proto.evaluate" = "Prototype-expressie evalueren"
+"proto.flow.add" = "Startpunt van flow toevoegen"
+"proto.flow.remove" = "Flow verwijderen"
+"proto.flow.rename" = "Flow hernoemen"
+"proto.interaction.add" = "Interactie toevoegen"
+"proto.interaction.clear" = "Alle interacties verwijderen"
+"proto.interaction.remove" = "Interactie verwijderen"
+"proto.interaction.set" = "Interactie bewerken"
+"proto.present" = "Presenteren"
+"proto.presentOptions" = "Presentatieopties"
+"proto.preview" = "Prototypevoorvertoning openen"
+"proto.settings" = "Prototype-instellingen"
+"section.toggleContents" = "Sectie-inhoud verbergen/weergeven"
+"select.add" = "Toevoegen aan selectie"
+"select.all" = "Alles selecteren"
+"select.area" = "Gebied selecteren"
+"select.byName" = "Lagen op naam selecteren"
+"select.children" = "Onderliggende items selecteren"
+"select.inverse" = "Selectie omkeren"
+"select.layersAt" = "Lagen op een punt"
+"select.matching" = "Overeenkomende lagen selecteren"
+"select.next" = "Volgende laag op hetzelfde niveau selecteren"
+"select.none" = "Selectie opheffen"
+"select.parent" = "Bovenliggende selecteren"
+"select.previous" = "Vorige laag op hetzelfde niveau selecteren"
+"select.remove" = "Uit selectie verwijderen"
+"select.sameEffect" = "Zelfde effect selecteren"
+"select.sameFill" = "Dezelfde vulling selecteren"
+"select.sameFont" = "Lagen met hetzelfde lettertype selecteren"
+"select.sameInstance" = "Zelfde instance selecteren"
+"select.sameProperties" = "Dezelfde eigenschappen selecteren"
+"select.sameStroke" = "Lagen met dezelfde lijn selecteren"
+"select.sameText" = "Dezelfde teksteigenschappen selecteren"
+"select.set" = "Selecteren"
+"selection.applyColorStyle" = "Kleurstijl op selectie toepassen"
+"selection.bindColorVariable" = "Kleurvariabele op selectie toepassen"
+"selection.colors" = "Selectiekleuren"
+"selection.detachColor" = "Selectiekleur loskoppelen"
+"selection.selectColor" = "Lagen op kleur selecteren"
+"selection.setPaint" = "Selectiekleur wijzigen"
+"shape.arrow" = "Pijl"
+"shape.ellipse" = "Ellips"
+"shape.line" = "Lijn"
+"shape.polygon" = "Veelhoek"
+"shape.rectangle" = "Rechthoek"
+"shape.star" = "Ster"
+"shapeBuilder.merge" = "Gebieden samenvoegen"
+"shapeBuilder.mode" = "Shape builder-modus"
+"shapeBuilder.regions" = "Shape builder-gebieden"
+"shapeBuilder.remove" = "Gebieden verwijderen"
+"stroke.add" = "Lijn toevoegen"
+"stroke.brush" = "Penseel"
+"stroke.move" = "Lijn verplaatsen"
+"stroke.remove" = "Lijn verwijderen"
+"stroke.set" = "Lijn instellen"
+"stroke.widthProfile" = "Breedteprofiel"
+"style.apply" = "Stijl toepassen"
+"style.bind" = "Variabele aan stijl koppelen"
+"style.create" = "Stijl maken"
+"style.delete" = "Stijl verwijderen"
+"style.detach" = "Stijl loskoppelen"
+"style.duplicate" = "Stijl dupliceren"
+"style.list" = "Stijlen weergeven"
+"style.move" = "Stijlen verplaatsen"
+"style.renameFolder" = "Stijlmap hernoemen"
+"style.update" = "Stijl bewerken"
+"template.list" = "Sjablonen weergeven"
+"text.alignCenter" = "Midden uitlijnen"
+"text.alignJustify" = "Uitvullen"
+"text.alignLeft" = "Links uitlijnen"
+"text.alignRight" = "Rechts uitlijnen"
+"text.bold" = "Vet"
+"text.bulletList" = "Lijst met opsommingstekens"
+"text.case" = "Hoofdlettergebruik"
+"text.caseLower" = "Kleine letters"
+"text.caseOriginal" = "Oorspronkelijk hoofdlettergebruik"
+"text.caseSmallCaps" = "Kleine hoofdletters"
+"text.caseTitle" = "Hoofdletters per woord"
+"text.caseUpper" = "Hoofdletters"
+"text.create" = "Tekst"
+"text.decoration" = "Decoratie"
+"text.edit.begin" = "Tekst bewerken"
+"text.edit.caret" = "Invoegpunt instellen"
+"text.edit.end" = "Tekst bewerken stoppen"
+"text.edit.insert" = "Tekst typen"
+"text.edit.key" = "Tekstoets"
+"text.edit.preedit" = "Tekst samenstellen (IME)"
+"text.edit.selectLine" = "Regel selecteren"
+"text.edit.selectWord" = "Woord selecteren"
+"text.edit.selection" = "Tekstselectie"
+"text.endPreview" = "Tekstvoorvertoning beëindigen"
+"text.fonts" = "Lettertypen weergeven"
+"text.italic" = "Cursief"
+"text.lineHeightDown" = "Regelafstand verkleinen"
+"text.lineHeightUp" = "Regelafstand vergroten"
+"text.link" = "Link maken"
+"text.listIndent" = "Lijst inspringen"
+"text.listOutdent" = "Inspringing lijst verkleinen"
+"text.listStyle" = "Lijststijl"
+"text.maxLines" = "Maximaal aantal regels"
+"text.numberList" = "Genummerde lijst"
+"text.onPath" = "Tekst op pad"
+"text.paragraphIndent" = "Alinea-inspringing"
+"text.paragraphSpacing" = "Alinea-afstand"
+"text.pathOptions" = "Opties voor tekstpad"
+"text.preview" = "Tekstwijziging voorvertonen"
+"text.removeFromPath" = "Tekst van pad verwijderen"
+"text.set" = "Tekst instellen"
+"text.setFeatures" = "OpenType-functies"
+"text.setVariations" = "Assen van variabele lettertypen"
+"text.sizeDown" = "Lettergrootte verkleinen"
+"text.sizeUp" = "Lettertypegrootte vergroten"
+"text.strikethrough" = "Doorstrepen"
+"text.style" = "Tekstbereik opmaken"
+"text.trackingDown" = "Letterafstand verkleinen"
+"text.trackingUp" = "Letterafstand vergroten"
+"text.underline" = "Onderstrepen"
+"text.weightDown" = "Lettertypedikte verkleinen"
+"text.weightUp" = "Letterdikte vergroten"
+"tool.arrow" = "Pijl"
+"tool.comment" = "Reactie"
+"tool.connector" = "Verbinding"
+"tool.ellipse" = "Ellips"
+"tool.eraser" = "Gum"
+"tool.frame" = "Frame"
+"tool.hand" = "Hand"
+"tool.highlighter" = "Markeerstift"
+"tool.line" = "Lijn"
+"tool.marker" = "Stift"
+"tool.move" = "Verplaatsen"
+"tool.pen" = "Pen"
+"tool.pencil" = "Potlood"
+"tool.pencilBrush" = "Potloodpenseel"
+"tool.place" = "Plaatsen met de tool"
+"tool.polygon" = "Veelhoek"
+"tool.rectangle" = "Rechthoek"
+"tool.scale" = "Schalen"
+"tool.scaleAnchor" = "Schaalanker"
+"tool.section" = "Sectie"
+"tool.set" = "Gereedschap kiezen"
+"tool.shape" = "Vormen"
+"tool.shapeBuilder" = "Shape builder"
+"tool.slice" = "Slice"
+"tool.stamp" = "Stempel"
+"tool.star" = "Ster"
+"tool.sticky" = "Plakbriefje"
+"tool.text" = "Tekst"
+"transform.move" = "Verplaatsen"
+"transform.moveTo" = "Verplaatsen naar"
+"transform.nudge" = "Verschuiven"
+"transform.nudgeSize" = "Formaat wijzigen in stappen"
+"transform.resize" = "Formaat wijzigen"
+"transform.rotate" = "Draaien"
+"transform.rotationOrigin" = "Rotatiepunt verplaatsen"
+"transform.scale" = "Schalen"
+"transform.setRotationOrigin" = "Rotatiepunt instellen"
+"variable.addMode" = "Modus toevoegen"
+"variable.bind" = "Variabele koppelen"
+"variable.create" = "Variabele maken"
+"variable.createCollection" = "Variabeleverzameling maken"
+"variable.delete" = "Variabele verwijderen"
+"variable.deleteCollection" = "Verzameling verwijderen"
+"variable.duplicate" = "Variabele dupliceren"
+"variable.export" = "Variabelen exporteren"
+"variable.import" = "Variabelen importeren"
+"variable.list" = "Variabelen weergeven"
+"variable.moveMode" = "Modus verplaatsen"
+"variable.removeMode" = "Modus verwijderen"
+"variable.renameCollection" = "Verzameling hernoemen"
+"variable.renameMode" = "Modus hernoemen"
+"variable.resetOverride" = "Overschrijving van variabele resetten"
+"variable.set" = "Variabelewaarde instellen"
+"variable.setMode" = "Variabelemodus instellen"
+"variable.update" = "Variabele bewerken"
+"vector.create" = "Vector"
+"vector.deleteHeal" = "Selectie verwijderen en herstellen"
+"vector.edit.addVertex" = "Punt toevoegen"
+"vector.edit.begin" = "Vector bewerken"
+"vector.edit.bend" = "Segment buigen"
+"vector.edit.bounds" = "Grenzen van geselecteerde punten"
+"vector.edit.connect" = "Punten verbinden"
+"vector.edit.cornerRadius" = "Hoekradius van punt"
+"vector.edit.cut" = "Pad knippen"
+"vector.edit.delete" = "Punten verwijderen"
+"vector.edit.end" = "Klaar met bewerken"
+"vector.edit.erase" = "Wissen"
+"vector.edit.lasso" = "Met lasso selecteren"
+"vector.edit.mirroring" = "Handgrepen spiegelen"
+"vector.edit.moveHandles" = "Handgrepen verplaatsen"
+"vector.edit.moveVertices" = "Punten verplaatsen"
+"vector.edit.nudge" = "Punten verschuiven"
+"vector.edit.paint" = "Verfemmer"
+"vector.edit.pen" = "Penpunt"
+"vector.edit.penEnd" = "Penpad beëindigen"
+"vector.edit.position" = "Puntpositie"
+"vector.edit.resize" = "Formaat van punten wijzigen"
+"vector.edit.rotate" = "Punten draaien"
+"vector.edit.select" = "Punten selecteren"
+"vector.edit.selectAll" = "Alle punten selecteren"
+"vector.edit.setHandle" = "Handgreep instellen"
+"vector.edit.smooth" = "Punten glad of scherp maken"
+"vector.edit.state" = "Status van vectorbewerking"
+"vector.edit.strokeCap" = "Lijneinde van punt"
+"vector.edit.strokeJoin" = "Lijnaansluiting van punt"
+"vector.edit.tool" = "Tool voor vectorbewerking"
+"vector.edit.transform" = "Punten transformeren"
+"vector.edit.widthPoint" = "Breedtepunt"
+"vector.flatten" = "Afvlakken"
+"vector.join" = "Selectie samenvoegen"
+"vector.offset" = "Pad offsetten"
+"vector.outlineStroke" = "Lijn omzetten naar contouren"
+"vector.reverse" = "Padrichting omkeren"
+"vector.simplify" = "Vector vereenvoudigen"
+"vector.smoothJoin" = "Selectie vloeiend samenvoegen"
+"version.autosave" = "Versie automatisch opslaan"
+"version.delete" = "Versie verwijderen"
+"version.duplicate" = "Versie dupliceren"
+"version.exitPreview" = "Terug naar huidige versie"
+"version.list" = "Versies weergeven"
+"version.preview" = "Versie bekijken"
+"version.rename" = "Versie hernoemen"
+"version.restore" = "Versie terugzetten"
+"view.assets" = "Assetpaneel"
+"view.comments" = "Reacties"
+"view.contextMenu" = "Contextmenu tonen"
+"view.design" = "Ontwerppaneel"
+"view.designPrototype" = "Wisselen tussen Design en Prototype"
+"view.devMode" = "Dev Mode"
+"view.frameOutlines" = "Framecontouren"
+"view.fullscreen" = "Volledig scherm"
+"view.get" = "Weergave ophalen"
+"view.layers" = "Lagenpaneel"
+"view.layoutGrids" = "Layoutrasters"
+"view.leftSidebar" = "Linkerzijbalk tonen/verbergen"
+"view.maskOutlines" = "Maskercontouren"
+"view.multiplayerCursors" = "Multiplayer-cursors"
+"view.nextFrame" = "Inzoomen op volgend frame"
+"view.nextPage" = "Volgende pagina"
+"view.nextRegion" = "Volgend gebied focussen"
+"view.outlines" = "Contouren"
+"view.outlinesHiddenLayers" = "Verborgen lagen opnemen in contouren"
+"view.outlinesObjectBounds" = "Objectgrenzen opnemen in contouren"
+"view.outlinesSelection" = "Contouren voor selectie"
+"view.pan" = "Weergave verschuiven"
+"view.panelWidths" = "Paneelbreedtes herstellen"
+"view.pixelGrid" = "Pixelraster"
+"view.pixelPreview" = "Pixelvoorvertoning"
+"view.prevFrame" = "Inzoomen op vorig frame"
+"view.prevPage" = "Vorige pagina"
+"view.previousRegion" = "Vorige regio focussen"
+"view.proofSrgb" = "sRGB-proefweergave"
+"view.prototype" = "Prototypepaneel"
+"view.rulers" = "Linialen"
+"view.set" = "Weergave instellen"
+"view.slices" = "Slices"
+"view.snapGeometry" = "Uitlijnen op geometrie"
+"view.snapObjects" = "Uitlijnen op objecten"
+"view.snapPixel" = "Uitlijnen op pixelraster"
+"view.themeDark" = "Donker thema"
+"view.themeLight" = "Licht thema"
+"view.themeSystem" = "Systeemthema volgen"
+"view.toggleUi" = "UI tonen/verbergen"
+"view.zoom100" = "Inzoomen op 100%"
+"view.zoom200" = "Zoomen naar 200%"
+"view.zoom50" = "Zoom instellen op 50%"
+"view.zoomAt" = "Zoomgereedschap"
+"view.zoomFit" = "Inpassen"
+"view.zoomIn" = "Inzoomen"
+"view.zoomOut" = "Uitzoomen"
+"view.zoomSelection" = "Inzoomen op selectie"
+"widget.click" = "Op widget klikken"
+"widget.insert" = "Widget invoegen"
+"widget.list" = "Widgets weergeven"
+"widget.menu" = "Widgetmenu"
+"widget.setText" = "Widgetveld bewerken"
+"window.focus" = "Venster naar voren brengen"
+"window.new" = "Nieuw venster"
+
+[menu]
+"bool.exclude" = "Exclude"
+"bool.flatten" = "Flatten"
+"bool.intersect" = "Intersect"
+"bool.subtract" = "Subtract"
+"bool.union" = "Union"
+"file.duplicate" = "Dupliceren"
+"file.import" = "Importeren uit bestand…"
+"file.rename" = "Hernoemen"
+"libraries.open" = "Bibliotheken openen"
+"select.sameEffect" = "Effect"
+"select.sameFill" = "Vulling"
+"select.sameFont" = "Lettertype"
+"select.sameInstance" = "Instance"
+"select.sameProperties" = "Eigenschappen"
+"select.sameStroke" = "Lijn"
+"select.sameText" = "Teksteigenschappen"
+"text.alignCenter" = "Tekst centreren"
+"text.alignJustify" = "Tekst uitvullen"
+"text.alignLeft" = "Tekst links uitlijnen"
+"text.alignRight" = "Tekst rechts uitlijnen"
+"view.assets" = "Assets"
+"view.design" = "Ontwerp"
+"view.layers" = "Lagen"
+"view.outlines" = "Omtrekken weergeven"
+"view.outlinesHiddenLayers" = "Verborgen lagen meenemen"
+"view.outlinesObjectBounds" = "Objectgrenzen meenemen"
+"view.outlinesSelection" = "Omtrekken van selectie weergeven"
+"view.prototype" = "Prototype"
+"view.themeDark" = "Donker"
+"view.themeLight" = "Licht"
+"view.themeSystem" = "Systeem volgen"
diff --git a/crates/ui-egui/locales/pl.toml b/crates/ui-egui/locales/pl.toml
new file mode 100644
index 00000000..b39a220d
--- /dev/null
+++ b/crates/ui-egui/locales/pl.toml
@@ -0,0 +1,2471 @@
+# FigCraft interface strings: Polish.
+#
+# Wording reviewed and approved by Lucas (@lukasz-sklad).
+# Complete Polish localization for FigCraft.
+# See docs/translating.md; plural forms follow Polish CLDR integer rules.
+
+[meta]
+name = "Polski"
+
+[ui]
+"% of all commits" = "% wszystkich commitów"
+"(no longer published)" = "(już niepublikowane)"
+"({n} warnings: some entries were skipped)" = { one = "({n} ostrzeżenie: niektóre wpisy zostały pominięte)", few = "({n} ostrzeżenia: niektóre wpisy zostały pominięte)", many = "({n} ostrzeżeń: niektóre wpisy zostały pominięte)", other = "({n} ostrzeżeń: niektóre wpisy zostały pominięte)" }
+"+ Create variable" = "+ Utwórz zmienną"
+".fig (experimental)" = ".fig (eksperymentalny)"
+"1…9, 0" = "1…9, 0"
+"@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: PR: {prs}, commitów: {commits}, +{added} / −{deleted} wierszy (Δ {delta}), +{bin_added} / −{bin_deleted} zasobów binarnych, {first} – {last}"
+"A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Kolekcja tego pliku z tymi trybami i zmiennymi: nadpisuj ich wartości dla poszczególnych trybów i dodawaj własne zmienne"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Plik .figcraft o tej nazwie już istnieje. Wybierz pełną nazwę, aby potwierdzić zastąpienie."
+"A layer on its own aligns to its frame: select more layers, or one in a frame" = "Pojedyncza warstwa wyrównuje się do swojej ramki: zaznacz więcej warstw lub warstwę w ramce"
+"A responsive product page: hero, features, figures, a quote and a footer" = "Responsywna strona produktu: sekcja hero, funkcje, statystyki, cytat i stopka"
+"A spring plays until it settles: its mass, stiffness and damping set how long" = "Animacja sprężynowa trwa do ustabilizowania: jej masa, sztywność i tłumienie określają czas"
+"A title, an agenda, a big figure, a chart and a closing slide" = "Tytuł, agenda, wyróżniona liczba, wykres i slajd końcowy"
+"A to Z" = "Od A do Z"
+"About" = "O programie"
+"About FigCraft" = "O programie FigCraft"
+"About this server" = "O tym serwerze"
+"Action" = "Akcja"
+"Actions" = "Akcje"
+"Actions for {name}" = "Akcje dla: {name}"
+"Actions…" = "Akcje…"
+"Active" = "Aktywny"
+"Actual size (100%)" = "Rozmiar rzeczywisty (100%)"
+"Add a category" = "Dodaj kategorię"
+"Add a comment" = "Dodaj komentarz"
+"Add a description" = "Dodaj opis"
+"Add a frame (F) or a shape (R) to get started" = "Dodaj ramkę (F) lub kształt (R), aby rozpocząć"
+"Add a layer or component to tile first" = "Najpierw dodaj warstwę lub komponent do powielenia"
+"Add a minute" = "Dodaj minutę"
+"Add a note for developers" = "Dodaj notatkę dla programistów"
+"Add action" = "Dodaj akcję"
+"Add actions for when no condition holds" = "Dodaj akcje wykonywane, gdy żaden warunek nie jest spełniony"
+"Add an annotation for developers" = "Dodaj adnotację dla programistów"
+"Add another condition" = "Dodaj kolejny warunek"
+"Add auto layout" = "Dodaj Auto layout"
+"Add background behind overlay" = "Dodaj tło za nakładką"
+"Add column" = "Dodaj kolumnę"
+"Add content to this slot" = "Dodaj zawartość do tego gniazda"
+"Add dev resource" = "Dodaj zasób programistyczny"
+"Add effect" = "Dodaj efekt"
+"Add export setting" = "Dodaj ustawienie eksportu"
+"Add fill" = "Dodaj wypełnienie"
+"Add interaction" = "Dodaj interakcję"
+"Add layout grid" = "Dodaj siatkę układu"
+"Add library" = "Dodaj bibliotekę"
+"Add library file…" = "Dodaj plik biblioteki…"
+"Add max height" = "Dodaj maksymalną wysokość"
+"Add max width" = "Dodaj maksymalną szerokość"
+"Add measurement" = "Dodaj pomiar"
+"Add min height" = "Dodaj minimalną wysokość"
+"Add min width" = "Dodaj minimalną szerokość"
+"Add mode" = "Dodaj tryb"
+"Add new page" = "Dodaj nową stronę"
+"Add or update collections from a variables JSON" = "Dodaj lub zaktualizuj kolekcje z pliku JSON ze zmiennymi"
+"Add properties to make instances configurable" = "Dodaj właściwości, aby umożliwić konfigurację instancji"
+"Add reaction" = "Dodaj reakcję"
+"Add row" = "Dodaj wiersz"
+"Add starting point" = "Dodaj punkt startowy"
+"Add stroke" = "Dodaj obrys"
+"Add variant" = "Dodaj wariant"
+"Add variant with a new value" = "Dodaj wariant z nową wartością"
+"Added" = "Dodano"
+"Added the library \"{name}\"" = "Dodano bibliotekę „{name}”"
+"Adding to {name}" = "Dodawanie do: {name}"
+"Adjust" = "Dopasowanie"
+"Adjustment presets" = "Presety korekt"
+"Advanced" = "Zaawansowane"
+"Advanced stroke" = "Zaawansowany obrys"
+"After delay" = "Po opóźnieniu"
+"After delay {ms}ms" = "Po opóźnieniu {ms} ms"
+"Align" = "Wyrównaj"
+"Align bottom" = "Wyrównaj do dołu"
+"Align center" = "Wyrównaj do środka"
+"Align horizontal centers" = "Wyrównaj poziomo do środka"
+"Align left" = "Wyrównaj do lewej"
+"Align middle" = "Wyrównaj do środka pionowo"
+"Align right" = "Wyrównaj do prawej"
+"Align text baselines" = "Wyrównaj do linii bazowych tekstu"
+"Align top" = "Wyrównaj do góry"
+"Align vertical centers" = "Wyrównaj pionowo do środka"
+"Alignment" = "Wyrównanie"
+"All" = "Wszystko"
+"All categories" = "Wszystkie kategorie"
+"All comments" = "Wszystkie komentarze"
+"All components" = "Wszystkie komponenty"
+"All fonts" = "Wszystkie czcionki"
+"All objects" = "Wszystkie obiekty"
+"All supported properties" = "Wszystkie obsługiwane właściwości"
+"All the fonts this file uses are installed" = "Wszystkie czcionki używane w tym pliku są zainstalowane"
+"All variables" = "Wszystkie zmienne"
+"Along the bottom" = "Wzdłuż dolnej krawędzi"
+"Along the left" = "Wzdłuż lewej krawędzi"
+"Along the right" = "Wzdłuż prawej krawędzi"
+"Along the top" = "Wzdłuż górnej krawędzi"
+"Alpha" = "Alfa"
+"Alphabetical" = "Alfabetycznie"
+"Alt+drag" = "Alt+przeciągnięcie"
+"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "Ekran analityczny na siatce: wykresy wektorowe, liczby i tabela"
+"An invite link that opens FigCraft and joins" = "Link z zaproszeniem otwierający FigCraft i dołączający do sesji"
+"Anchor" = "Punkt zaczepienia"
+"Android" = "Android"
+"Angular" = "Kątowy"
+"Animation" = "Animacja"
+"Annotations" = "Adnotacje"
+"Annotations shown on the canvas" = "Adnotacje widoczne na płótnie"
+"Another server, or one that needs its key. The usual server is set in Preferences." = "Inny serwer lub serwer wymagający klucza. Domyślny serwer konfiguruje się w Preferencjach."
+"Any status" = "Dowolny status"
+"Anyone on your network with this code can edit the file, while this app stays open." = "Każdy w Twojej sieci z tym kodem może edytować plik, dopóki ta aplikacja pozostaje otwarta."
+"Anyone with the edit link can change the file; the view link only lets people look. The links carry their secrets: share them like passwords. `figcraft-server links` makes more and revokes them." = "Każdy z linkiem do edycji może modyfikować plik; link do podglądu pozwala tylko oglądać. Linki zawierają tokeny: traktuj je jak hasła. Polecenie `figcraft-server links` tworzy i unieważnia linki."
+"Anyone with this code can edit the file." = "Każdy z tym kodem może edytować plik."
+"Anyone with this code can look at the file, not change it." = "Każdy z tym kodem może przeglądać plik bez możliwości zmian."
+"Appearance" = "Wygląd"
+"Apply a component property" = "Zastosuj właściwość komponentu"
+"Apply variable" = "Zastosuj zmienną"
+"Apply variable to text" = "Zastosuj zmienną do tekstu"
+"Apply variable to visibility" = "Zastosuj zmienną do widoczności"
+"Apps" = "Aplikacje"
+"Apr" = "Kwi"
+"Arc" = "Łuk"
+"Arc ratio" = "Proporcja łuku"
+"Arc start" = "Początek łuku"
+"Arc sweep" = "Rozpiętość łuku"
+"Archive" = "Zarchiwizuj"
+"Archived" = "Zarchiwizowano"
+"Arrange" = "Ułóż"
+"Arrow" = "Strzałka"
+"Arrow at the end" = "Strzałka na końcu"
+"As typed" = "Zgodnie z wpisanym"
+"Asking the server…" = "Odpytywanie serwera…"
+"Assets" = "Zasoby"
+"Aug" = "Sie"
+"Auto" = "Automatycznie"
+"Auto (space around)" = "Automatycznie (odstęp dookoła)"
+"Auto (space between)" = "Automatycznie (odstęp między)"
+"Auto (space evenly)" = "Automatycznie (równy odstęp)"
+"Auto ({mode})" = "Automatycznie ({mode})"
+"Auto columns" = "Automatyczne kolumny"
+"Auto gap" = "Automatyczny odstęp"
+"Auto height" = "Automatyczna wysokość"
+"Auto layout" = "Automatyczny układ"
+"Auto rows" = "Automatyczne wiersze"
+"Auto width" = "Automatyczna szerokość"
+"Back to the FigCraft server" = "Powrót do serwera FigCraft"
+"Back to the font's value" = "Powrót do wartości czcionki"
+"Back" = "Tył"
+"Back to Ready for dev" = "Powrót do Gotowe do wdrożenia"
+"Back to Ready for dev: the next change compares with how it is now" = "Powrót do Gotowe do wdrożenia: kolejna zmiana zostanie porównana ze stanem obecnym"
+"Back to assets" = "Powrót do zasobów"
+"Back to current" = "Powrót do bieżącej"
+"Back to styles" = "Powrót do stylów"
+"Back to the canvas from a focused region" = "Powrót do płótna z wybranego obszaru"
+"Back to the current version" = "Powrót do bieżącej wersji"
+"Back to the values the font style implies" = "Powrót do wartości wynikających ze stylu czcionki"
+"Background" = "Tło"
+"Background blur" = "Rozmycie tła"
+"Basics" = "Podstawy"
+"Before" = "Przed"
+"Bend" = "Wygnij"
+"Between the selected layers" = "Między zaznaczonymi warstwami"
+"Bevel" = "Ścięte"
+"Binary assets added" = "Dodane pliki binarne"
+"Binary assets removed" = "Usunięte pliki binarne"
+"Black & white" = "Czerń i biel"
+"Bleed" = "Spad"
+"Bleed marks" = "Znaczniki spadu"
+"Bleed marks need a bleed" = "Znaczniki spadu wymagają zdefiniowania spadu"
+"Blend" = "Mieszanie"
+"Blend mode" = "Tryb mieszania"
+"Blue" = "Niebieski"
+"Blur" = "Rozmycie"
+"Boolean" = "Wartość logiczna"
+"Boolean groups" = "Grupy logiczne (Boolean)"
+"Both directions" = "W obu kierunkach"
+"Bottom" = "Dół"
+"Bottom left radius" = "Promień lewego dolnego narożnika"
+"Bottom padding" = "Margines dolny"
+"Bottom right radius" = "Promień prawego dolnego narożnika"
+"Brainstorm" = "Burza mózgów"
+"Branch" = "Gałąź"
+"Branch archived" = "Gałąź zarchiwizowana"
+"Branch merged" = "Gałąź scalona"
+"Branch name" = "Nazwa gałęzi"
+"Branch of {file}" = "Gałąź pliku {file}"
+"Branch of {file} · merged or archived" = "Gałąź pliku {file} · scalona lub zarchiwizowana"
+"Branch updated from main" = "Gałąź zaktualizowana z głównej"
+"Branch {name}" = "Gałąź {name}"
+"Branches" = "Gałęzie"
+"Bound to {name}. Click to detach the variable." = "Powiązano z: {name}. Kliknij, aby odłączyć zmienną."
+"Bring forward" = "Przenieś do przodu"
+"Bring the main file's changes into the branch" = "Pobierz zmiany z pliku głównego do gałęzi"
+"Bring to front" = "Przenieś na wierzch"
+"Bristle" = "Włosiankowy"
+"Browse" = "Przeglądaj"
+"Brush" = "Pędzel"
+"Brush rotation jitter" = "Fluktuacja obrotu pędzla"
+"Brush scatter" = "Rozrzut pędzla"
+"Brush size jitter" = "Fluktuacja rozmiaru pędzla"
+"Brush spacing" = "Odstęp pędzla"
+"Bulleted list" = "Lista punktowana"
+"C or Shift+C" = "C lub Shift+C"
+"C or ⇧C" = "C lub ⇧C"
+"CMYK colour" = "Kolor CMYK"
+"Can view" = "Może przeglądać"
+"Check" = "Ptaszek"
+"Checking the fonts installed on this computer…" = "Sprawdzanie czcionek zainstalowanych na tym komputerze…"
+"Checking the server…" = "Sprawdzanie serwera…"
+"Chevron" = "Szewron"
+"Clear from this list" = "Usuń z tej listy"
+"Clear results" = "Wyczyść wyniki"
+"Click objects to vote; click your badge to take a vote back" = "Kliknij obiekty, aby głosować; kliknij swoją odznakę, aby cofnąć głos"
+"Code or invite link" = "Kod lub link z zaproszeniem"
+"Color profile: {name}" = "Profil kolorów: {name}"
+"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Style kolorów i tekstu, zmienne Jasne i Ciemne, przyciski, pola wprowadzania i karty"
+"Connector" = "Łącznik"
+"Convert to frame" = "Konwertuj na ramkę"
+"Convert to section" = "Konwertuj na sekcję"
+"CSS custom properties…" = "Właściwości niestandardowe CSS…"
+"Can edit" = "Może edytować"
+"Can't read this library: {e}" = "Nie można odczytać tej biblioteki: {e}"
+"Cancel" = "Anuluj"
+"Canvas" = "Płótno"
+"Canvas stacking" = "Kolejność na płótnie"
+"Cap height to baseline" = "Wysokość wersalików do linii bazowej"
+"Case" = "Wielkość liter"
+"Case-sensitive forms" = "Formy zależne od wielkości liter"
+"Categories" = "Kategorie"
+"Center" = "Środek"
+"Change alias" = "Zmień alias"
+"Change resolved" = "Zmiana rozwiązana"
+"Change style" = "Zmień styl"
+"Change to" = "Zmień na"
+"Change to needs a layer inside a variant" = "Opcja Zmień na wymaga warstwy wewnątrz wariantu"
+"Changed" = "Zmieniono"
+"Changed on both sides: keep one" = "Zmieniono po obu stronach: zachowaj jedną wersję"
+"Changes on main" = "Zmiany w gałęzi głównej"
+"Changes on the branch" = "Zmiany w gałęzi"
+"Changes unknown" = "Nieznane zmiany"
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Wybierz React, Leptos, Vue, SwiftUI, Compose, ArkUI lub Flutter powyżej, aby połączyć ten komponent z jego kodem."
+"Choose another profile to change it." = "Wybierz inny profil, aby go zmienić."
+"Choose collection" = "Wybierz kolekcję"
+"Choose image" = "Wybierz obraz"
+"Choose mode" = "Wybierz tryb"
+"Choose variable" = "Wybierz zmienną"
+"Circle" = "Koło"
+"Clear recent" = "Wyczyść ostatnie"
+"Click + to replace mixed content" = "Kliknij +, aby zastąpić zawartość mieszaną"
+"Click anywhere on the canvas to leave one." = "Kliknij w dowolnym miejscu na płótnie, aby zostawić komentarz."
+"Click or drag to merge · {alt} removes" = "Kliknij lub przeciągnij, aby scalić · {alt} usuwa"
+"Click or drag to remove · {alt} merges" = "Kliknij lub przeciągnij, aby usunąć · {alt} scala"
+"Click to record a key" = "Kliknij, aby zarejestrować klawisz"
+"Clip content" = "Przycinaj zawartość"
+"Clip to shape" = "Przytnij do kształtu"
+"Close" = "Zamknij"
+"Close overlay" = "Zamknij nakładkę"
+"Close preview" = "Zamknij podgląd"
+"Close tab" = "Zamknij kartę"
+"Close version history" = "Zamknij historię wersji"
+"Close when clicking outside" = "Zamknij przy kliknięciu poza obszarem"
+"Code" = "Kod"
+"Code syntax" = "Składnia kodu"
+"Collapse" = "Zwiń"
+"Collapse panel" = "Zwiń panel"
+"Collection" = "Kolekcja"
+"Collections" = "Kolekcje"
+"Color" = "Kolor"
+"Color burn" = "Ściemnianie"
+"Color dodge" = "Rozjaśnianie"
+"Color format" = "Format koloru"
+"Color profile" = "Profil kolorów"
+"Color styles" = "Style kolorów"
+"Color values in this file are in this color space." = "Wartości kolorów w tym pliku są w tej przestrzeni kolorów."
+"Color variables" = "Zmienne koloru"
+"Colour" = "Kolor"
+"Column" = "Kolumna"
+"Column gap" = "Odstęp kolumn"
+"Column sizes" = "Rozmiary kolumn"
+"Column span" = "Rozpiętość kolumn"
+"Columns" = "Kolumny"
+"Columns {count}" = "Kolumny: {count}"
+"Comment" = "Komentarz"
+"Comments" = "Komentarze"
+"Commits" = "Commity"
+"Company" = "Firma"
+"Compare changes" = "Porównaj zmiany"
+"Compatibility notes" = "Uwagi dotyczące zgodności"
+"Completed" = "Ukończone"
+"Component" = "Komponent"
+"Component name" = "Nazwa komponentu"
+"Component property" = "Właściwość komponentu"
+"Component set" = "Zestaw komponentów"
+"Component sets" = "Zestawy komponentów"
+"Components" = "Komponenty"
+"Conditional" = "Warunek (Conditional)"
+"Confetti" = "Konfetti"
+"Conflicts" = "Konflikty"
+"Connect to code" = "Połącz z kodem"
+"Connected" = "Połączono"
+"Connected to code: {from}" = "Połączono z kodem: {from}"
+"Connection lost, reconnecting (attempt {attempt})…" = "Utracono połączenie, ponowne łączenie (próba {attempt})…"
+"Constrain proportions" = "Zachowaj proporcje"
+"Constraints" = "Więzy"
+"Content" = "Zawartość"
+"Contents hidden" = "Zawartość ukryta"
+"Contextual alternates" = "Alternatywy kontekstowe"
+"Contrast" = "Kontrast"
+"Contributors" = "Współtwórcy"
+"Contributors: {people} · Commits: {commits}" = "Współtwórcy: {people} · Commity: {commits}"
+"Controller" = "Kontroler"
+"Cool" = "Chłodny"
+"Copied as CSS" = "Skopiowano jako CSS"
+"Copied as PNG" = "Skopiowano jako PNG"
+"Copied as SVG" = "Skopiowano jako SVG"
+"Copied as text" = "Skopiowano jako tekst"
+"Copied {value}" = "Skopiowano {value}"
+"Copy" = "Kopiuj"
+"Copy as" = "Kopiuj jako"
+"Copy as CSS" = "Kopiuj jako CSS"
+"Copy as PNG" = "Kopiuj jako PNG"
+"Copy as SVG" = "Kopiuj jako SVG"
+"Copy code" = "Kopiuj kod"
+"Copy link" = "Kopiuj link"
+"Copy the {label}" = "Kopiuj {label}"
+"Copy {value}" = "Kopiuj {value}"
+"Corner radius" = "Zaokrąglenie rogów"
+"Corner smoothing" = "Wygładzanie narożników (Corner smoothing)"
+"Couldn't download the variables" = "Nie udało się pobrać zmiennych"
+"Couldn't reach {server}: showing what this computer remembers." = "Nie udało się połączyć z {server}: pokazywanie zawartości zapamiętanej przez ten komputer."
+"Couldn't read {name}." = "Nie udało się odczytać pliku {name}."
+"Couldn't save automatically: {error}" = "Nie udało się zapisać automatycznie: {error}"
+"Couldn't save the file" = "Nie udało się zapisać pliku"
+"Count" = "Licznik"
+"Create" = "Utwórz"
+"Create a variable collection first" = "Najpierw utwórz kolekcję zmiennych"
+"Create a variable first" = "Najpierw utwórz zmienną"
+"Create alias" = "Utwórz alias"
+"Create branch" = "Utwórz gałąź"
+"Create collection" = "Utwórz kolekcję"
+"Create component" = "Utwórz komponent"
+"Create component property" = "Utwórz właściwość komponentu"
+"Create components, styles or variables to publish them as a library." = "Twórz komponenty, style lub zmienne, aby opublikować je jako bibliotekę."
+"Create property…" = "Utwórz właściwość…"
+"Create style" = "Utwórz styl"
+"Create style from the selected text" = "Utwórz styl z zaznaczonego tekstu"
+"Created" = "Utworzono"
+"Crop" = "Przytnij"
+"Crop marks" = "Znaczniki przycięcia"
+"Ctrl+arrows" = "Ctrl+strzałki"
+"Ctrl+click" = "Ctrl+kliknięcie"
+"Ctrl+scroll" = "Ctrl+przewijanie"
+"Current name" = "Bieżąca nazwa"
+"Current version" = "Bieżąca wersja"
+"Cursor chat" = "Czat kursora"
+"Custom" = "Niestandardowy"
+"Custom size" = "Rozmiar niestandardowy"
+"Cut" = "Wytnij"
+"Dark" = "Ciemny"
+"Darken" = "Ciemniej"
+"Dash" = "Kreska"
+"Dashboard" = "Pulpit"
+"Date created" = "Data utworzenia"
+"Dec" = "Gru"
+"Decoration style" = "Styl dekoracji"
+"Decoration" = "Dekoracja tekstu"
+"Deep select" = "Głębokie zaznaczanie"
+"Default" = "Domyślne"
+"Default content" = "Domyślna zawartość"
+"Default value (the top-left variant)" = "Wartość domyślna (lewy górny wariant)"
+"Delay" = "Opóźnienie"
+"Delete" = "Usuń"
+"Delete category (its annotations stay)" = "Usuń kategorię (jej adnotacje pozostaną)"
+"Delete collection" = "Usuń kolekcję"
+"Delete group" = "Usuń grupę"
+"Delete mode" = "Usuń tryb"
+"Delete page" = "Usuń stronę"
+"Delete preset" = "Usuń ustawienie"
+"Delete property" = "Usuń właściwość"
+"Delete the style (layers keep their values)" = "Usuń styl (warstwy zachowają swoje wartości)"
+"Delete thread" = "Usuń wątek"
+"Delete variable" = "Usuń zmienną"
+"Delete “{name}”? This can't be undone." = "Usunąć „{name}”? Tej operacji nie można cofnąć."
+"Density" = "Gęstość"
+"Depth" = "Głębia"
+"Describe how and when to use this component" = "Opisz sposób i warunki użycia tego komponentu"
+"Describe what changed" = "Opisz wprowadzone zmiany"
+"Description" = "Opis"
+"Description (optional)" = "Opis (opcjonalnie)"
+"Design" = "Projektowanie"
+"Design panel" = "Panel projektu"
+"Design system starter" = "Pakiet startowy systemu projektowego (Design System)"
+"Desktop" = "Pulpit"
+"Destination" = "Miejsce docelowe"
+"Detach alias" = "Odłącz alias"
+"Detach instance" = "Odłącz instancję"
+"Detach property" = "Odłącz właściwość"
+"Detach style" = "Odłącz styl"
+"Detach styles" = "Odłącz style"
+"Detach variable" = "Odłącz zmienną"
+"Details" = "Szczegóły"
+"Dev Mode" = "Tryb deweloperski"
+"Dev resources" = "Zasoby programistyczne"
+"Development" = "Programowanie"
+"Device" = "Urządzenie"
+"Device at 100%" = "Urządzenie w 100%"
+"Diamond" = "Rombowy"
+"Difference" = "Różnica"
+"Dimensions" = "Wymiary"
+"Direction" = "Kierunek"
+"Disconnect from code" = "Odłącz od kodu"
+"Dispersion" = "Dyspersja"
+"Display name" = "Nazwa wyświetlana"
+"Dissolve" = "Rozpuszczanie"
+"Distribute and tidy" = "Rozmieść i uporządkuj"
+"Distribute horizontal spacing" = "Rozmieść poziomo"
+"Distribute vertical spacing" = "Rozmieść pionowo"
+"Divider" = "Rozdzielacz"
+"Don't Save" = "Nie zapisuj"
+"Don't truncate" = "Nie obcinaj tekstu"
+"Done" = "Gotowe"
+"Done editing" = "Zakończ edycję"
+"Dots" = "Kropki"
+"Dotted" = "Kropkowany"
+"Down" = "W dół"
+"Drafts" = "Szkice"
+"Drag the stroke to add a width point" = "Przeciągnij obrys, aby dodać punkt szerokości"
+"Draw" = "Rysuj"
+"Draw a frame" = "Narysuj ramkę"
+"Drawing tools" = "Narzędzia rysowania"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Upuść plik .figcraft, .fig, .sketch, .json, .svg lub plik obrazu."
+"Drop to import" = "Upuść, aby zaimportować"
+"Drop to open" = "Upuść, aby otworzyć"
+"Drop shadow" = "Cień"
+"Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "Podwójna licencja MIT LUB Apache-2.0. Stworzone przez zespół ArtCraft i społeczność."
+"Duo" = "Duet"
+"Duplicate" = "Powiel"
+"Duplicate by dragging" = "Powiel przez przeciągnięcie"
+"Duplicate mode" = "Powiel tryb"
+"Duplicate page" = "Powiel stronę"
+"Edit" = "Edycja"
+"Edit as an expression" = "Edytuj jako wyrażenie"
+"Edit colour" = "Edytuj kolor"
+"Edit comment" = "Edytuj komentarz"
+"Edit dev resource" = "Edytuj zasób programistyczny"
+"Edit link" = "Edytuj link"
+"Edit link copied" = "Skopiowano link do edycji"
+"Edit style" = "Edytuj styl"
+"Edit variable" = "Edytuj zmienną"
+"Edit with the builder" = "Edytuj za pomocą kreatora"
+"Edited {when}" = "Edytowano {when}"
+"Effect settings" = "Ustawienia efektów"
+"Effect styles" = "Style efektów"
+"Effects" = "Efekty"
+"Curved" = "Zakrzywiony"
+"Elbow" = "Łamany"
+"Ellipse" = "Elipsa"
+"Ellipses" = "Elipsy"
+"Else" = "W przeciwnym razie"
+"Else if" = "W przeciwnym razie jeśli"
+"Embedded profile" = "Wbudowany profil"
+"Empty" = "Puste"
+"End" = "End"
+"End point" = "Punkt końcowy"
+"End vote" = "Zakończ głosowanie"
+"Ends the session; everyone keeps their copy" = "Kończy sesję; każdy zachowuje swoją kopię"
+"Enter" = "Enter"
+"Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Wprowadź adres figcraft-server i kliknij Przeglądaj, aby zobaczyć dostępne wtyczki."
+"Enter to save · Esc to cancel" = "Enter, aby zapisać · Esc, aby anulować"
+"Eraser" = "Gumka"
+"Esc" = "Esc"
+"Essential" = "Podstawowe"
+"Every conflict has a choice." = "Każdy konflikt ma rozwiązanie do wyboru."
+"Every top-level frame already starts a flow" = "Każda ramka najwyższego poziomu rozpoczyna już przepływ"
+"Exact opacity (4 then 5: 45%)" = "Dokładna nieprzezroczystość (4, potem 5: 45%)"
+"Exclude" = "Wyklucz"
+"Excluded" = "Wykluczono"
+"Excluded from layout" = "Wykluczono z układu"
+"Excludes" = "Wyklucza"
+"Exclusion" = "Wykluczenie"
+"Exit focus view (Esc)" = "Wyjdź z widoku skupienia (Esc)"
+"Expand" = "Rozwiń"
+"Export" = "Eksportuj"
+"Export all" = "Eksportuj wszystko"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "Eksportuj ramki i warstwy jako PNG, JPG, SVG lub PDF"
+"Export page as PNG" = "Eksportuj stronę jako PNG"
+"Export settings" = "Ustawienia eksportu"
+"Export variables" = "Eksportuj zmienne"
+"Export {name}" = "Eksportuj {name}"
+"Export {n} layers" = { one = "Eksportuj {n} warstwę", few = "Eksportuj {n} warstwy", many = "Eksportuj {n} warstw", other = "Eksportuj {n} warstw" }
+"Exported {file}" = "Wyeksportowano {file}"
+"Exported {name}" = "Wyeksportowano {name}"
+"Exported {name}; {n} kinds of content were left out" = { one = "Wyeksportowano {name}; pominięto {n} rodzaj zawartości", few = "Wyeksportowano {name}; pominięto {n} rodzaje zawartości", many = "Wyeksportowano {name}; pominięto {n} rodzajów zawartości", other = "Wyeksportowano {name}; pominięto {n} rodzajów zawartości" }
+"Exported {n} files" = { one = "Wyeksportowano {n} plik", few = "Wyeksportowano {n} pliki", many = "Wyeksportowano {n} plików", other = "Wyeksportowano {n} plików" }
+"Export…" = "Eksport…"
+"Expose properties to instances" = "Udostępnij właściwości instancjom"
+"Exposure" = "Czas naświetlania"
+"Expression" = "Wyrażenie"
+"Extend collection" = "Rozszerz kolekcję"
+"Extends \"{name}\": overridden values are marked" = "Rozszerza „{name}”: nadpisane wartości są oznaczone"
+"Eye" = "Oko"
+"F" = "F"
+"Fade" = "Zanikanie"
+"False" = "Fałsz"
+"Feb" = "Lut"
+"Fetching from the server…" = "Pobieranie z serwera…"
+"FigCraft couldn't open its window: {error}" = "FigCraft nie mógł otworzyć okna: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft nie obsługuje jeszcze wszystkich funkcji tych plików. Uwagi wymieniają elementy pominięte lub zmienione w zaimportowanej kopii; oryginalny plik pozostaje niezmieniony."
+"File" = "Plik"
+"File name" = "Nazwa pliku"
+"File not found" = "Nie znaleziono pliku"
+"File published" = "Plik został opublikowany"
+"Files aren't end-to-end encrypted: the server's operator can read them." = "Pliki nie są szyfrowane end-to-end: administrator serwera może je odczytać."
+"Files nobody opens for {n} days are deleted." = { one = "Pliki, których nikt nie otwiera przez {n} dzień, są usuwane.", few = "Pliki, których nikt nie otwiera przez {n} dni, są usuwane.", many = "Pliki, których nikt nie otwiera przez {n} dni, są usuwane.", other = "Pliki, których nikt nie otwiera przez {n} dni, są usuwane." }
+"Fill" = "Wypełnienie"
+"Fill (fr)" = "Wypełnienie (fr)"
+"Fill container" = "Wypełnij kontener"
+"Fill window" = "Wypełnij okno"
+"Fills" = "Wypełnienia"
+"Fill|sizing" = "Wypełnij"
+"Filter and sort" = "Filtruj i sortuj"
+"Find" = "Znajdź"
+"Find and replace" = "Znajdź i zamień"
+"Find layers" = "Znajdź warstwy"
+"First" = "Pierwszy"
+"First commit" = "Pierwszy commit"
+"First on top" = "Pierwszy na wierzchu"
+"Fit" = "Dopasuj"
+"Fit device to window" = "Dopasuj urządzenie do okna"
+"Fit to contents" = "Dopasuj do zawartości"
+"Fit to window" = "Dopasuj do okna"
+"Fit width" = "Dopasuj szerokość"
+"Fixed" = "Stałe"
+"Fixed gap" = "Stały odstęp"
+"Fixed size" = "Stały rozmiar"
+"Flatten" = "Spłaszcz"
+"Flip" = "Odbij"
+"Flip horizontal" = "Odbij w poziomie"
+"Flip text to the other side" = "Przerzuć tekst na drugą stronę"
+"Flip vertical" = "Odbij w pionie"
+"Flip width profile" = "Odwróć profil szerokości"
+"Flow chart" = "Schemat blokowy"
+"Flow starting point" = "Punkt startowy przepływu"
+"Flow starting points" = "Punkty startowe przepływu"
+"Flows" = "Przepływy"
+"Focus view" = "Widok skupienia"
+"Fold autosaves" = "Zwiń automatyczne zapisy"
+"Folder: click to collapse" = "Folder: kliknij, aby zwinąć"
+"Folder: click to expand" = "Folder: kliknij, aby rozwinąć"
+"Follow" = "Obserwuj"
+"Follow {name}" = "Obserwuj: {name}"
+"Following" = "Obserwowanie"
+"Following {name} · {key} to stop" = "Obserwowanie {name} · {key}, aby zatrzymać"
+"Font" = "Czcionka"
+"Font not installed" = "Czcionka niezainstalowana"
+"Font size" = "Rozmiar czcionki"
+"Font style" = "Styl czcionki"
+"Forget on this computer" = "Zapomnij na tym komputerze"
+"Four screens of a trail app with components and a prototype flow" = "Cztery ekrany aplikacji z komponentami i przepływem prototypu"
+"Fractions" = "Ułamki"
+"Frame" = "Ramka"
+"Frame selection" = "Utwórz ramkę z zaznaczenia"
+"Frame tools" = "Narzędzia ramek"
+"Frames" = "Ramki"
+"From the library \"{name}\": read-only" = "Z biblioteki „{name}”: tylko do odczytu"
+"From {name}" = "Od {name}"
+"From {server}" = "Z serwera {server}"
+"Frost" = "Szron"
+"Gap" = "Odstęp"
+"Gap between columns" = "Odstęp między kolumnami"
+"Gap between items" = "Odstęp między elementami"
+"Gap between rows" = "Odstęp między wierszami"
+"Getting started" = "Pierwsze kroki"
+"Give the address of a server open to the public, or a server's address with its key (`figcraft-server key` prints it)." = "Podaj adres serwera publicznego lub adres serwera z jego kluczem (polecenie `figcraft-server key` go wyświetla)."
+"Glass" = "Szkło"
+"Go to main component" = "Przejdź do głównego komponentu"
+"Go to {name}" = "Przejdź do: {name}"
+"Grab bag" = "Lista dowolna"
+"Gradient" = "Gradient"
+"Gray" = "Szary"
+"Green" = "Zielony"
+"Greyscale components and two example screens to sketch a flow with" = "Komponenty w odcieniach szarości i dwa przykładowe ekrany do naszkicowania przepływu"
+"Grid" = "Siatka"
+"Grid ({size})" = "Siatka ({size})"
+"Grid styles" = "Style siatki"
+"Grid {size}" = "Siatka {size}"
+"Group" = "Grupa"
+"Group selection" = "Grupuj zaznaczenie"
+"Groups" = "Grupy"
+"Gutter" = "Odstęp"
+"Hand tool" = "Narzędzie Rączka"
+"Hanging list" = "Lista z wysunięciem"
+"Hanging punctuation" = "Wiszące znaki interpunkcyjne"
+"Hard light" = "Mocne światło"
+"Heart" = "Serce"
+"Height" = "Wysokość"
+"Help" = "Pomoc"
+"Help and resources" = "Pomoc i zasoby"
+"Help page" = "Strona pomocy"
+"Here: {names}" = "Tutaj: {names}"
+"Hidden" = "Ukryty"
+"Hide contents" = "Ukryj zawartość"
+"Hide from publishing" = "Ukryj przed publikacją"
+"Hide section contents" = "Ukryj zawartość sekcji"
+"Hide these tips (Getting started in the Help menu shows them again)" = "Ukryj te wskazówki (Pierwsze kroki w menu Pomoc wyświetli je ponownie)"
+"Hide when publishing" = "Ukryj podczas publikacji"
+"Highlight layers on hover" = "Wyróżniaj warstwy po najechaniu kursorem"
+"Highlighter" = "Zakreślacz"
+"Highlights" = "Światła"
+"Hold Alt" = "Przytrzymaj Alt"
+"Hold Alt+Z" = "Przytrzymaj Alt+Z"
+"Hold Ctrl" = "Przytrzymaj Ctrl"
+"Hold Z" = "Przytrzymaj Z"
+"Hold ⌃ or ⌘" = "Przytrzymaj ⌃ lub ⌘"
+"Hold ⌥" = "Przytrzymaj ⌥"
+"Hold ⌥Z" = "Przytrzymaj ⌥Z"
+"Home" = "Start"
+"Horizontal" = "Poziomo"
+"Horizontal align" = "Wyrównanie poziome"
+"Horizontal hex" = "Poziomy sześciokąt"
+"Horizontal padding" = "Marginesy poziome"
+"Horizontal spacing" = "Odstępy poziome"
+"Hosted by {operator}" = "Hostowane przez {operator}"
+"Hover a layer to see its properties" = "Najedź na warstwę, aby zobaczyć jej właściwości"
+"Hover other layers to measure the distance" = "Najedź na inne warstwy, aby zmierzyć odległość"
+"Hue" = "Odcień"
+"Hug" = "Dopasuj"
+"Hug contents" = "Dopasuj do zawartości"
+"Icon components on a 24 px grid with keylines and a size preview" = "Komponenty ikon na siatce 24 px z liniami pomocniczymi i podglądem rozmiaru"
+"Icon set starter" = "Zestaw początkowy ikon"
+"If it keeps happening, please report it at {link} with this message." = "Jeśli problem będzie się powtarzał, zgłoś go pod adresem {link}, dołączając tę wiadomość."
+"If" = "Jeżeli"
+"If {condition}" = "Jeżeli {condition}"
+"Ignore auto layout (absolute position)" = "Ignoruj automatyczny układ (pozycja bezwzględna)"
+"Ignore overlapping layers" = "Ignoruj nakładające się warstwy"
+"Image" = "Obraz"
+"Images" = "Obrazy"
+"Import" = "Importuj"
+"Import path" = "Ścieżka importu"
+"Import plugin from manifest" = "Zaimportuj wtyczkę z manifestu"
+"Import plugin from manifest…" = "Zaimportuj wtyczkę z manifestu…"
+"Import report" = "Raport importu"
+"Import variables" = "Importuj zmienne"
+"Imported document" = "Zaimportowany dokument"
+"Imported {name}" = "Zaimportowano {name}"
+"Imported {n} new variables, updated {updated}" = { one = "Zaimportowano {n} nową zmienną, zaktualizowano {updated}", few = "Zaimportowano {n} nowe zmienne, zaktualizowano {updated}", many = "Zaimportowano {n} nowych zmiennych, zaktualizowano {updated}", other = "Zaimportowano {n} nowych zmiennych, zaktualizowano {updated}" }
+"Import…" = "Importuj…"
+"In an instance, this comes from the main component" = "W instancji pochodzi to z głównego komponentu"
+"In the browser you can join sessions the desktop app hosts and files on a FigCraft server. A page opened over https reaches other computers only through wss:// links (a server behind TLS)." = "W przeglądarce możesz dołączać do sesji hostowanych przez aplikację desktopową oraz do plików na serwerze FigCraft. Strona otwarta przez https łączy się z innymi komputerami tylko przez linki wss:// (serwer za TLS)."
+"Include bounding box" = "Dołącz ramkę otaczającą"
+"Include id attribute" = "Dołącz atrybut id"
+"Included" = "Uwzględniono"
+"Included in layout" = "Uwzględniono w układzie"
+"Individual corners" = "Niezależne narożniki"
+"Individual padding" = "Niezależne marginesy"
+"Individual strokes" = "Niezależne obrysy"
+"Ink" = "Farba"
+"Inner shadow" = "Cień wewnętrzny"
+"Inside" = "Wewnątrz"
+"Inspect" = "Inspekcja"
+"Inspect the layer under the pointer: size, colours, typography" = "Sprawdź warstwę pod kursorem: rozmiar, kolory, typografia"
+"Install plugin" = "Zainstaluj wtyczkę"
+"Install" = "Zainstaluj"
+"Installed {name}" = "Zainstalowano {name}"
+"Installed" = "Zainstalowano"
+"Installing…" = "Instalowanie…"
+"Instance" = "Instancja"
+"Instance properties" = "Właściwości instancji"
+"Instance swap" = "Podmiana instancji"
+"Instance swap (no other component)" = "Podmiana instancji (brak innego komponentu)"
+"Instances" = "Instancje"
+"Instant" = "Natychmiastowo"
+"Intensity" = "Siła"
+"Interaction" = "Interakcja"
+"Interactions" = "Interakcje"
+"Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Projektowanie interfejsów i prototypowanie. Darmowe, otwartoźródłowe, czysto implementowane narzędzie projektowe napisane od podstaw w Rust, część ArtCraft Crafting Apps."
+"Interface size" = "Rozmiar interfejsu"
+"Intersect" = "Przetnij"
+"Intersects" = "Przecina"
+"Invalid color" = "Nieprawidłowy kolor"
+"Invite link" = "Link z zaproszeniem"
+"Invite link copied" = "Skopiowano link z zaproszeniem"
+"It asks permission to:" = "Wymaga uprawnień do:"
+"Jan" = "Sty"
+"Join" = "Połącz"
+"Join code copied" = "Skopiowano kod dołączenia"
+"Join code or invite link" = "Kod dołączenia lub link z zaproszeniem"
+"Join live session" = "Dołącz do sesji na żywo"
+"Join us on Discord" = "Dołącz do nas na Discordzie"
+"Join with a code" = "Dołącz za pomocą kodu"
+"Joined" = "Dołączono"
+"Joined {file}" = "Dołączono do: {file}"
+"Joining…" = "Dołączanie…"
+"Join|stroke" = "Łączenie"
+"Jul" = "Lip"
+"Jun" = "Cze"
+"Just now" = "Przed chwilą"
+"Justify" = "Wyjustuj"
+"Kanban board" = "Tablica kanban"
+"Keep a measurement on the canvas for developers" = "Zachowaj pomiar na płótnie dla programistów"
+"Keep appearance" = "Zachowaj wygląd"
+"Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Zachowanie wyglądu konwertuje każdą wartość koloru na {profile}, aby kolory wyglądały tak samo. Zachowanie wartości pozostawia liczby bez zmian, co może zmienić odcienie barw."
+"Keep tool selected after use" = "Pozostaw narzędzie wybrane po użyciu"
+"Keep values" = "Zachowaj wartości"
+"Key/Gamepad" = "Klawisz/Kontroler"
+"Key/Gamepad {key}" = "Klawisz/Kontroler {key}"
+"Keyboard shortcuts" = "Skróty klawiaturowe"
+"Kits" = "Zestawy"
+"Landing page" = "Strona docelowa (Landing page)"
+"Language" = "Język"
+"Lasso" = "Lasso"
+"Last" = "Ostatni"
+"Last change: {note}" = "Ostatnia zmiana: {note}"
+"Last commit" = "Ostatni commit"
+"Last modified" = "Ostatnia modyfikacja"
+"Last on top" = "Ostatni na wierzchu"
+"Layer blur" = "Rozmycie warstwy"
+"Layer name" = "Nazwa warstwy"
+"Layers" = "Warstwy"
+"Layers in an instance take their position from the main component" = "Warstwy w instancji przyjmują pozycję z głównego komponentu"
+"Layout" = "Układ"
+"Layout grid" = "Siatka układu"
+"Layout grid settings" = "Ustawienia siatki układu"
+"Layout grids" = "Siatki układu"
+"Leave session" = "Opuść sesję"
+"Leaves" = "Opuszcza"
+"Left" = "Do lewej"
+"Left & right" = "Lewa i prawa"
+"Left padding" = "Margines lewy"
+"Left side" = "Lewa strona"
+"Left side width" = "Szerokość lewej strony"
+"Letter case" = "Wielkość liter"
+"Letter spacing" = "Światło tekstu"
+"Libraries" = "Biblioteki"
+"Libraries in this file" = "Biblioteki w tym pliku"
+"Library updates available" = "Dostępne aktualizacje biblioteki"
+"Library: click to collapse" = "Biblioteka: kliknij, aby zwinąć"
+"Library: click to expand" = "Biblioteka: kliknij, aby rozwinąć"
+"Library: its variables are read-only here; edit them in the library file and publish it" = "Biblioteka: jej zmienne są tutaj tylko do odczytu; edytuj je w pliku biblioteki i opublikuj"
+"Light" = "Jasny"
+"Lighten" = "Jaśniej"
+"Light|glass" = "Światło"
+"Line" = "Linia"
+"Line arrow" = "Strzałka liniowa"
+"Line delta" = "Różnica wierszy"
+"Line height" = "Interlinia"
+"Linear" = "Liniowy"
+"Lines" = "Linie"
+"Lines +/−" = "Wiersze +/−"
+"Lines added" = "Dodane wiersze"
+"Lines deleted" = "Usunięte wiersze"
+"Link" = "Łącze"
+"Link copied" = "Skopiowano link"
+"Link docs, code or tickets for developers." = "Dołącz dokumentację, kod lub zgłoszenia dla programistów."
+"Link frames on the Prototype tab, then present the flow" = "Połącz ramki na karcie Prototyp, a następnie zaprezentuj przepływ"
+"Link this component to its code component: instances then show your real snippet with their values." = "Połącz ten komponent z jego odpowiednikiem w kodzie: instancje wyświetlą wtedy rzeczywisty fragment kodu z ich wartościami."
+"List spacing" = "Odstępy listy"
+"List style" = "Styl listy"
+"Live session" = "Sesja na żywo"
+"Live · {people}" = "Na żywo · {people}"
+"Local components" = "Komponenty lokalne"
+"Local network" = "Sieć lokalna"
+"Local styles" = "Style lokalne"
+"Local variables" = "Zmienne lokalne"
+"Lock/Unlock" = "Zablokuj/Odblokuj"
+"Locked" = "Zablokowane"
+"Lowercase" = "Małe litery"
+"Luminance" = "Luminancja"
+"Luminosity" = "Jasność"
+"Main" = "Główny"
+"Main component deleted" = "Usunięto główny komponent"
+"Main menu" = "Menu główne"
+"Make a component" = "Utwórz komponent"
+"Make slot" = "Utwórz gniazdo (slot)"
+"Mar" = "Mar"
+"Margin" = "Margines"
+"Mark all as read" = "Oznacz wszystkie jako przeczytane"
+"Mark as resolved" = "Oznacz jako rozwiązane"
+"Mark as unread" = "Oznacz jako nieprzeczytane"
+"Mark as unresolved" = "Oznacz jako nierozwiązane"
+"Marker" = "Marker"
+"Mask" = "Maska"
+"Mass · Stiffness · Damping" = "Masa · Sztywność · Tłumienie"
+"Match (empty: the whole name)" = "Dopasowanie (puste: cała nazwa)"
+"Max H" = "Maks. wys."
+"Max W" = "Maks. szer."
+"Max lines" = "Maks. linii"
+"Maximize" = "Maksymalizuj"
+"May" = "maja"
+"Measure to the selection" = "Zmierz odległość do zaznaczenia"
+"Measurements" = "Pomiary"
+"Merge into main" = "Scal z gałęzią główną"
+"Merge regions" = "Scal obszary"
+"Merge the branch into the main file (one undo step) and archive it" = "Scal gałąź z plikiem głównym (jeden krok cofnięcia) i zarchiwizuj ją"
+"Merged" = "Scalone"
+"Merged PRs" = "Scalone PR"
+"Min H" = "Min. wys."
+"Min W" = "Min. szer."
+"Minimize" = "Minimalizuj"
+"Minutes" = "Minuty"
+"Mirror angle" = "Kąt odbicia lustrzanego"
+"Mirror angle and length" = "Kąt i długość odbicia lustrzanego"
+"Mirroring" = "Odbicie lustrzane"
+"Missing" = "Brak"
+"Missing fonts" = "Brakujące czcionki"
+"Missing layer" = "Brakująca warstwa"
+"Missing style" = "Brakujący styl"
+"Missing variable" = "Brakująca zmienna"
+"Miter" = "Ostre"
+"Miter angle" = "Kąt ścięcia (miter)"
+"Mixed" = "Różne wartości"
+"Mixed fonts" = "Różne czcionki"
+"Mixed interactions: click + to replace them" = "Różne interakcje: kliknij +, aby je zastąpić"
+"Mobile app" = "Aplikacja mobilna"
+"Mode" = "Tryb"
+"Model" = "Model"
+"Models" = "Modele"
+"Mono" = "Mono"
+"More" = "Więcej"
+"More instance actions" = "Więcej akcji instancji"
+"Mouse down" = "Naciśnięcie myszy"
+"Mouse enter" = "Wskazanie myszą (Mouse enter)"
+"Mouse leave" = "Opuszczenie kursora myszy"
+"Mouse up" = "Zwolnienie przycisku myszy"
+"Move along the toolbar or the layer rows" = "Przechodź wzdłuż paska narzędzi lub wierszy warstw"
+"Move" = "Przesuń"
+"Move column left" = "Przesuń kolumnę w lewo"
+"Move column right" = "Przesuń kolumnę w prawo"
+"Move down" = "Przesuń w dół"
+"Move in" = "Wsuń"
+"Move out" = "Wysuń"
+"Move tools" = "Narzędzia przesuwania"
+"Move up" = "Przesuń w górę"
+"Moved to {name}" = "Przeniesiono do: {name}"
+"Multi" = "Wiele"
+"Multiply" = "Mnożenie"
+"Muted" = "Stonowany"
+"Name" = "Nazwa"
+"Name (A–Z)" = "Nazwa (A–Z)"
+"Named instance" = "Nazwana instancja"
+"Navigate to" = "Przejdź do"
+"Nested instance" = "Zagnieżdżona instancja"
+"New board" = "Nowa tablica"
+"New design file" = "Nowy plik projektu"
+"Newest first" = "Najpierw najnowsze"
+"Next or previous control in the focused region" = "Następny lub poprzedni element w aktywnym obszarze"
+"Next frame" = "Następna klatka"
+"Next ready for dev" = "Następny element gotowy do wdrożenia"
+"Next size option" = "Następna opcja rozmiaru"
+"No assets: no export settings, icons or images. Add export settings in the Design tab." = "Brak zasobów: brak ustawień eksportu, ikon lub obrazów. Dodaj ustawienia eksportu na karcie Projekt."
+"No boolean variables fit here." = "Żadna zmienna logiczna (boolean) tutaj nie pasuje."
+"No boolean variables yet. Create them in Local variables." = "Brak zmiennych logicznych. Utwórz je w Zmiennych lokalnych."
+"No branches. A branch is a copy of the file to try changes in, then review and merge." = "Brak gałęzi. Gałąź to kopia pliku do testowania zmian, a następnie ich przeglądu i scalenia."
+"No category" = "Bez kategorii"
+"No changes" = "Brak zmian"
+"No color styles" = "Brak stylów kolorów"
+"No colour variables fit here." = "Żadna zmienna koloru tutaj nie pasuje."
+"No colour variables yet. Create them in Local variables." = "Brak zmiennych koloru. Utwórz je w Zmiennych lokalnych."
+"No comments yet" = "Brak komentarzy"
+"No compatibility warnings reported" = "Nie zgłoszono ostrzeżeń o zgodności"
+"No components yet. Select layers and press {keys}." = "Brak komponentów. Zaznacz warstwy i naciśnij {keys}."
+"No conflicts." = "Brak konfliktów."
+"No contributor data was built into this copy." = "Ta kopia nie zawiera danych o współtwórcach."
+"No device" = "Brak urządzenia"
+"No fonts match" = "Brak pasujących czcionek"
+"No files or templates match your search" = "Żaden plik ani szablon nie pasuje do wyszukiwania"
+"No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Brak kodu dołączenia (serwer jest starszy niż kody dołączenia lub ten adres nie może być zakodowany): zamiast tego udostępnij link."
+"No layer changes to show." = "Brak zmian warstw do wyświetlenia."
+"No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "Brak bibliotek. Dodaj plik .figcraft opublikowany jako biblioteka lub wklej link do biblioteki zespołu."
+"No list" = "Brak listy"
+"No matching comments" = "Brak pasujących komentarzy"
+"No matching components" = "Brak pasujących komponentów"
+"No matching layers" = "Brak pasujących warstw"
+"No matching styles" = "Brak pasujących stylów"
+"No matching variables" = "Brak pasujących zmiennych"
+"No mirroring" = "Brak odbicia lustrzanego"
+"No model credits were built into this copy." = "Ta kopia nie zawiera informacji o modelach."
+"No number variables fit here." = "Żadna zmienna liczbowa tutaj nie pasuje."
+"No number variables yet. Create them in Local variables." = "Brak zmiennych liczbowych. Utwórz je w Zmiennych lokalnych."
+"No other pages" = "Brak innych stron"
+"No paints" = "Brak wypełnień/obrysów"
+"No plugins on {server}." = "Brak wtyczek na {server}."
+"No plugins yet. Import a development plugin from its figcraft-plugin.json." = "Brak wtyczek. Zaimportuj wtyczkę deweloperską z pliku figcraft-plugin.json."
+"No preferred components" = "Brak preferowanych komponentów"
+"No preset" = "Brak presetu"
+"No saved versions yet. Save a version to mark a point in your work you can come back to." = "Brak zapisanych wersji. Zapisz wersję, aby oznaczyć punkt w pracy, do którego możesz wrócić."
+"No scrolling" = "Brak przewijania"
+"No shortcuts match" = "Brak pasujących skrótów"
+"No status" = "Brak statusu"
+"No string variables fit here." = "Żadna zmienna tekstowa tutaj nie pasuje."
+"No string variables yet. Create them in Local variables." = "Brak zmiennych tekstowych. Utwórz je w Zmiennych lokalnych."
+"No styles yet." = "Brak stylów."
+"No styles yet. Click + to create one from the selection." = "Brak stylów. Kliknij +, aby utworzyć styl z zaznaczenia."
+"No templates match your search" = "Żaden szablon nie pasuje do wyszukiwania"
+"No text styles yet. Click + to create one from the selected text." = "Brak stylów tekstu. Kliknij +, aby utworzyć styl z zaznaczonego tekstu."
+"No variables fit here." = "Żadne zmienne tutaj nie pasują."
+"No variables yet. Create them in Local variables." = "Brak zmiennych. Utwórz je w Zmiennych lokalnych."
+"No votes yet" = "Brak głosów"
+"Nobody else is here yet" = "Nikogo innego tu jeszcze nie ma"
+"Noise" = "Szum"
+"None" = "Brak"
+"None." = "Brak."
+"Normal" = "Zwykły"
+"Not bound" = "Nieprzypisane"
+"Not in a live session" = "Nie jesteś w sesji na żywo"
+"Not in this font" = "Brak w tej czcionce"
+"Not properties, kept as written: {names}" = "Nie są to właściwości, zachowano bez zmian: {names}"
+"Not read yet" = "Jeszcze nieprzeczytane"
+"Not shared" = "Nieudostępnione"
+"Note {n}" = "Notatka {n}"
+"Nothing changed since this was marked ready for dev." = "Nic się nie zmieniło od czasu oznaczenia jako gotowe do wdrożenia."
+"Nothing here yet. Set a frame's status to list it." = "Nic tu jeszcze nie ma. Ustaw status ramki, aby ją wyświetlić."
+"Nothing online yet. Use Share on a file to put it online and it is listed here." = "Brak plików online. Użyj Udostępnij na pliku, aby umieścić go online i wyświetlić tutaj."
+"Nothing to export" = "Nic do wyeksportowania"
+"Nov" = "Lis"
+"Now" = "Teraz"
+"Nudge (Shift: big nudge)" = "Krok przesunięcia (Shift: duży krok)"
+"Nudge amount" = "Wielkość kroku przesunięcia"
+"Number" = "Liczba"
+"Number ↑" = "Liczba ↑"
+"Number ↓" = "Liczba ↓"
+"Numbered list" = "Lista numerowana"
+"Object" = "Obiekt"
+"Oct" = "Paź"
+"Off" = "Wyłączone"
+"Offered first when filling the slot (any content is allowed)" = "Proponowane w pierwszej kolejności przy wypełnianiu gniazda (dowolna zawartość jest dozwolona)"
+"Offered first when swapping the instance (any component is allowed)" = "Proponowane w pierwszej kolejności przy podmianie instancji (dowolny komponent jest dozwolony)"
+"Offset" = "Przesunięcie"
+"Oldest first" = "Najpierw najstarsze"
+"On click" = "Przy kliknięciu"
+"On drag" = "Podczas przeciągania"
+"On this page" = "Na tej stronie"
+"One announcement in five common sizes: square, portrait, story, link and banner" = "Jedno ogłoszenie w pięciu popularnych rozmiarach: kwadrat, pion, relacja, link i baner"
+"Online" = "Online"
+"Online files" = "Pliki online"
+"Online sharing is off: files are shared on the local network only." = "Udostępnianie online jest wyłączone: pliki są udostępniane tylko w sieci lokalnej."
+"Only the first changed layers are listed." = "Wymieniono tylko pierwsze zmienione warstwy."
+"Only the first {n} changed layers are listed." = "Wymieniono tylko pierwsze {n} zmienionych warstw."
+"Only your threads" = "Tylko Twoje wątki"
+"Opacity" = "Krycie"
+"Opacity & blend" = "Nieprzezroczystość i mieszanie"
+"Opacity 10%…90%, 0: 100%" = "Nieprzezroczystość 10%…90%, 0: 100%"
+"Open" = "Otwórz"
+"Open .figcraft, .svg or images" = "Otwórz .figcraft, .svg lub obrazy"
+"Open branch" = "Otwórz gałąź"
+"Open file" = "Otwórz plik"
+"Open files" = "Otwórz pliki"
+"Open presentations" = "Otwarte prezentacje"
+"Open in focus view" = "Otwórz w widoku skupienia"
+"Open in new window" = "Otwórz w nowym oknie"
+"Open invite links in FigCraft" = "Otwieraj linki z zaproszeniem w FigCraft"
+"Open link" = "Otwórz łącze"
+"Open link {url}" = "Otwórz link: {url}"
+"Open overlay" = "Otwórz nakładkę"
+"Open prototype preview" = "Otwórz podgląd prototypu"
+"Open variables ({count})" = "Otwórz zmienne ({count})"
+"Opened as a new document" = "Otwarto jako nowy dokument"
+"Opened “{name}” in a new tab" = "Otwarto „{name}” w nowej karcie"
+"Opening the file…" = "Otwieranie pliku…"
+"Opening {n} files as new files" = { one = "Otwieranie jako nowy plik", few = "Otwieranie {n} plików jako nowe pliki", many = "Otwieranie {n} plików jako nowe pliki", other = "Otwieranie {n} plików jako nowe pliki" }
+"Open|comments" = "Otwarte"
+"Options" = "Opcje"
+"Orange" = "Pomarańczowy"
+"Order" = "Kolejność"
+"Other apps may not open every .fig file exported here." = "Inne aplikacje mogą nie otworzyć każdego pliku .fig wyeksportowanego tutaj."
+"Other" = "Inne"
+"Others lose access and keep their copy; the file stays on the server for you" = "Inni tracą dostęp i zachowują swoją kopię; plik pozostaje na serwerze dla Ciebie"
+"Others type this under Share ▸ Join with a code" = "Inni wpisują to w menu Udostępnij ▸ Dołącz za pomocą kodu"
+"Outline stroke" = "Przekształć obrys w ścieżkę"
+"Outline text" = "Kontury tekstu"
+"Outlines" = "Kontury"
+"Outside" = "Na zewnątrz"
+"Overflow" = "Przepełnienie (overflow)"
+"Overlay" = "Nakładka"
+"Overlay position" = "Pozycja nakładki"
+"Overridden here (the collection it extends has another value)" = "Nadpisane tutaj (kolekcja, którą rozszerza, ma inną wartość)"
+"Overrides" = "Nadpisania"
+"Owner token" = "Token właściciela"
+"Owner token copied" = "Skopiowano token właściciela"
+"PDF print options" = "Opcje druku PDF"
+"PDF print settings" = "Ustawienia druku PDF"
+"Padding" = "Marginesy wewnętrzne"
+"Page" = "Strona"
+"Page deleted" = "Strona została usunięta"
+"Pages" = "Strony"
+"Pages added to the document" = "Strony dodane do dokumentu"
+"Pause" = "Wstrzymaj"
+"Pink" = "Różowy"
+"Placed on the current page" = "Umieszczono na bieżącej stronie"
+"Pages: {pages}" = "Strony: {pages}"
+"Paint bucket" = "Wiadro z farbą"
+"Pan the canvas" = "Przesuwaj płótno"
+"Pan with nothing selected (Shift: farther)" = "Przesuwaj przy braku zaznaczenia (Shift: dalej)"
+"Panels" = "Panele"
+"Paper" = "Papier"
+"Paragraph indent" = "Wcięcie akapitu"
+"Paragraph indent applies to left-aligned text" = "Wcięcie akapitu dotyczy tekstu wyrównanego do lewej"
+"Paragraph spacing" = "Odstęp akapitu"
+"Pass through" = "Przepuszczanie"
+"Paste a link (https://…)" = "Wklej link (https://…)"
+"Paste a team library link (a view link)" = "Wklej link do biblioteki zespołu (link do podglądu)"
+"Paste here" = "Wklej tutaj"
+"Paste to replace" = "Wklej, aby zastąpić"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Wklejono warstwy projektu; pominięto {n} rodzaj zawartości", few = "Wklejono warstwy projektu; pominięto {n} rodzaje zawartości", many = "Wklejono warstwy projektu; pominięto {n} rodzajów zawartości", other = "Wklejono warstwy projektu; pominięto {n} rodzajów zawartości" }
+"Pattern" = "Wzór"
+"Pattern alignment" = "Wyrównanie wzoru"
+"Pattern scale" = "Skala wzoru"
+"Pattern source" = "Źródło wzoru"
+"Pen" = "Pióro"
+"Pencil" = "Ołówek"
+"People in this file" = "Osoby w tym pliku"
+"People join from anywhere with a code. The file is kept on {server} while you share it." = "Użytkownicy dołączają z dowolnego miejsca za pomocą kodu. Plik jest przechowywany na {server} podczas udostępniania."
+"People on your network join with a code. Nothing goes through a server." = "Użytkownicy w Twojej sieci dołączają za pomocą kodu. Nic nie przechodzi przez serwer zewnętrzny."
+"Phone" = "Telefon"
+"Pick color" = "Wybierz kolor"
+"Pick color (I)" = "Wybierz kolor (I)"
+"Pick one font family first" = "Najpierw wybierz jedną rodzinę czcionek"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "Wybierz narzędzie Ramka, a następnie przeciągnij po płótnie lub wybierz rozmiar urządzenia"
+"Pin a property" = "Przypnij właściwość"
+"Pinch" = "Uszczypnięcie"
+"Pixel grid" = "Siatka pikseli"
+"Pixel preview 1x" = "Podgląd pikselowy 1x"
+"Pixel preview 2x" = "Podgląd pikselowy 2x"
+"Place a shape or frame (its tool chosen)" = "Umieść kształt lub ramkę (wybrane narzędzie)"
+"Place automatically" = "Umieść automatycznie"
+"Place image" = "Umieść obraz"
+"Plugin" = "Wtyczka"
+"Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Wtyczki działają w piaskownicy FigCraft, bez dostępu do plików, sieci czy zegara. Instaluj tylko zaufane wtyczki."
+"Plugins" = "Wtyczki"
+"Plugins & widgets" = "Wtyczki i widżety"
+"Plus darker" = "Plus ciemniejszy"
+"Plus lighter" = "Plus jaśniejszy"
+"Plus one" = "Plus jeden"
+"Point" = "Punkt"
+"Points" = "Punkty"
+"Polygon" = "Wielokąt"
+"Polygons" = "Wielokąty"
+"Port" = "Port"
+"Position" = "Położenie"
+"Post" = "Opublikuj"
+"Preferences" = "Preferencje"
+"Preferred" = "Preferowane"
+"Present" = "Prezentuj"
+"Present or preview" = "Prezentuj lub wyświetl podgląd"
+"Present this flow" = "Prezentuj ten przepływ"
+"Presentation" = "Prezentacja"
+"Presentation slides" = "Slajdy prezentacji"
+"Presenting: comments" = "Prezentacja: komentarze"
+"Presenting: cycle the size options" = "Prezentacja: przełączaj opcje rozmiaru"
+"Presenting: full screen" = "Prezentacja: pełny ekran"
+"Presenting: next frame" = "Prezentacja: następna ramka"
+"Presenting: previous frame" = "Prezentacja: poprzednia ramka"
+"Presenting: restart" = "Prezentacja: uruchom ponownie"
+"Preserve scroll position" = "Zachowaj pozycję przewijania"
+"Presets" = "Ustawienia wstępne"
+"Press a key…" = "Naciśnij klawisz…"
+"Playground" = "Piaskownica (Playground)"
+"Preview" = "Podgląd"
+"Preview this flow" = "Podgląd tego przepływu"
+"Preview this frame" = "Podgląd tej ramki"
+"Previous frame" = "Poprzednia klatka"
+"Previous ready for dev" = "Poprzedni gotowy do wdrożenia"
+"Progressive" = "Progresywny"
+"Properties" = "Właściwości"
+"Prototype" = "Prototyp"
+"Prototype preview" = "Podgląd prototypu"
+"Prototype settings" = "Ustawienia prototypu"
+"Publish" = "Publikuj"
+"Publish changes" = "Publikuj zmiany"
+"Publish to another server…" = "Publikuj na innym serwerze…"
+"Publish to server" = "Publikuj na serwerze"
+"Published version {v}" = "Opublikowano wersję {v}"
+"Published version {v} to the server" = "Opublikowano wersję {v} na serwerze"
+"Published version {v}: save the file so other files can use it" = "Opublikowano wersję {v}: zapisz plik, aby inne pliki mogły go używać"
+"Published · {people}" = "Opublikowano · {people}"
+"Publishing to a server needs the desktop app; in the browser you can join a server's files" = "Publikowanie na serwerze wymaga aplikacji desktopowej; w przeglądarce możesz dołączać do plików serwera"
+"Publishing with the server's key." = "Publikowanie przy użyciu klucza serwera."
+"Publishing…" = "Publikowanie…"
+"Push" = "Wypychanie"
+"Push changes to main component" = "Wypchnij zmiany do głównego komponentu"
+"Put text on path" = "Umieść tekst na ścieżce"
+"Question" = "Pytanie"
+"R" = "R"
+"Radial" = "Promienisty"
+"Radius" = "Promień"
+"Ratio" = "Proporcje"
+"Reading the library…" = "Odczytywanie biblioteki…"
+"Ready for dev" = "Gotowe do wdrożenia"
+"Real name" = "Imię i nazwisko"
+"Recent" = "Ostatnie"
+"Recent files" = "Ostatnie pliki"
+"Recents" = "Ostatnie"
+"Recovered {n} unsaved files after the app quit unexpectedly: save them to keep them" = { one = "Odzyskano niezapisany plik po nieoczekiwanym zamknięciu programu: zapisz go, aby go zachować", few = "Odzyskano {n} niezapisane pliki po nieoczekiwanym zamknięciu programu: zapisz je, aby je zachować", many = "Odzyskano {n} niezapisanych plików po nieoczekiwanym zamknięciu programu: zapisz je, aby je zachować", other = "Odzyskano {n} niezapisanych plików po nieoczekiwanym zamknięciu programu: zapisz je, aby je zachować" }
+"Rectangle" = "Prostokąt"
+"Rectangles" = "Prostokąty"
+"Red" = "Czerwony"
+"Reduce motion" = "Ogranicz ruch"
+"Refraction" = "Załamanie światła (refrakcja)"
+"Regular expression" = "Wyrażenie regularne"
+"Relative to" = "Względem"
+"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "Względem skalowania ekranu Twojego systemu (100% to domyślny rozmiar systemu). Powiększenie dokumentu jest niezależne."
+"Remove" = "Usuń"
+"Remove all" = "Usuń wszystko"
+"Remove annotation" = "Usuń adnotację"
+"Remove auto layout" = "Usuń Auto layout"
+"Remove column" = "Usuń kolumnę"
+"Remove dev resource" = "Usuń zasób programistyczny"
+"Remove export setting" = "Usuń ustawienie eksportu"
+"Remove from recents" = "Usuń z ostatnich"
+"Remove from server" = "Usuń z serwera"
+"Remove from server…" = "Usuń z serwera…"
+"Remove guide" = "Usuń linię pomocniczą"
+"Remove interaction" = "Usuń interakcję"
+"Remove library from this file" = "Usuń bibliotekę z tego pliku"
+"Remove measurement" = "Usuń pomiar"
+"Remove min and max" = "Usuń min. i maks."
+"Remove min and max height" = "Usuń minimalną i maksymalną wysokość"
+"Remove min and max width" = "Usuń minimalną i maksymalną szerokość"
+"Remove regions" = "Usuń obszary"
+"Remove row" = "Usuń wiersz"
+"Remove slot" = "Usuń gniazdo"
+"Remove starting point" = "Usuń punkt startowy"
+"Remove stop" = "Usuń punkt"
+"Remove text from path" = "Usuń tekst ze ścieżki"
+"Remove the else and its actions" = "Usuń warunek przeciwny (else) i jego akcje"
+"Remove this condition and its actions" = "Usuń ten warunek i jego akcje"
+"Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "Usunąć ten plik z serwera? Nie będzie można go już stamtąd udostępnić ani otworzyć. Twoja kopia pozostanie otwarta tutaj."
+"Remove {name} from session" = "Usuń {name} z sesji"
+"Remove {name} from {server}?" = "Usunąć {name} z {server}?"
+"Removed" = "Usunięto"
+"Removed from the server" = "Usunięto z serwera"
+"Removed since it was marked" = "Usunięto od momentu oznaczenia"
+"Rename" = "Zmień nazwę"
+"Rename duplicated layers" = "Zmień nazwę powielonych warstw"
+"Rename folder" = "Zmień nazwę folderu"
+"Rename group" = "Zmień nazwę grupy"
+"Rename layers" = "Zmień nazwę warstw"
+"Rename mode" = "Zmień nazwę trybu"
+"Rename on the server" = "Zmień nazwę na serwerze"
+"Rename on the server…" = "Zmień nazwę na serwerze…"
+"Rename page" = "Zmień nazwę strony"
+"Rename to" = "Zmień nazwę na"
+"Reorder selection" = "Zmień kolejność zaznaczenia"
+"Replace all" = "Zamień wszystko"
+"Replace mixed export settings" = "Zastąp zróżnicowane ustawienia eksportu"
+"Replace with" = "Zamień na"
+"Replace with a new interaction" = "Zastąp nową interakcją"
+"Reply" = "Odpowiedz"
+"Report" = "Raport"
+"Report this file…" = "Zgłoś ten plik…"
+"Reset" = "Resetuj"
+"Reset adjustments" = "Zresetuj korekty"
+"Reset all changes" = "Zresetuj wszystkie zmiany"
+"Reset all overrides on this layer" = "Zresetuj wszystkie nadpisania na tej warstwie"
+"Reset overrides" = "Zresetuj nadpisania"
+"Reset slot" = "Zresetuj gniazdo"
+"Reset this override" = "Zresetuj to nadpisanie"
+"Reset to style" = "Przywróć styl"
+"Reset to the inherited value" = "Przywróć wartość dziedziczoną"
+"Resize by the nudge amount" = "Zmień rozmiar o wielkość kroku przesunięcia"
+"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Dopasuj ramki do ekranu urządzenia (lub okna bez urządzenia): ich ograniczenia i automatyczny układ odpowiednio zareagują"
+"Resize to fit" = "Dopasuj rozmiar"
+"Resizing" = "Zmiana rozmiaru"
+"Resolve" = "Rozwiąż"
+"Resolve change" = "Rozwiąż zmianę"
+"Resolved" = "Rozwiązany"
+"Resources" = "Zasoby"
+"Responsive" = "Responsywny"
+"Restart" = "Uruchom ponownie"
+"Restore" = "Przywróć"
+"Restore main component" = "Przywróć główny komponent"
+"Restore this version" = "Przywróć tę wersję"
+"Restored “{name}”" = "Przywrócono „{name}”"
+"Retrospective" = "Retrospektywa"
+"Results" = "Wyniki"
+"Resume" = "Wznów"
+"Reverse the order" = "Odwróć kolejność"
+"Reversed triangle" = "Odwrócony trójkąt"
+"Review and merge" = "Przejrzyj i scal"
+"Ribbon" = "Wstążka"
+"Right" = "Do prawej"
+"Right padding" = "Margines prawy"
+"Right side" = "Prawa strona"
+"Right side width" = "Szerokość prawej strony"
+"Rotate 90°" = "Obróć o 90°"
+"Rotate 90° right" = "Obróć o 90° w prawo"
+"Rotate to landscape" = "Obróć do orientacji poziomej"
+"Rotate to portrait" = "Obróć do orientacji pionowej"
+"Rotation" = "Obrót"
+"Rotation jitter" = "Drżenie obrotu (jitter)"
+"Round" = "Okrągłe"
+"Rounded" = "Zaokrąglone"
+"Rounded rectangle" = "Zaokrąglony prostokąt"
+"Row" = "Wiersz"
+"Row gap" = "Odstęp między wierszami"
+"Row sizes" = "Rozmiary wierszy"
+"Row span" = "Rozpiętość wierszy"
+"Rows" = "Wiersze"
+"Rows {count}" = "Wiersze: {count}"
+"Rulers" = "Linijki"
+"Run" = "Uruchom"
+"Run {label}" = "Uruchom {label}"
+"Save file" = "Zapisz plik"
+"Save files automatically" = "Zapisuj pliki automatycznie"
+"Search templates" = "Szukaj szablonów"
+"See all templates" = "Zobacz wszystkie szablony"
+"Select layers and they space themselves as their content changes" = "Zaznacz warstwy, a będą automatycznie zachowywać odstępy przy zmianie zawartości"
+"SHA-256: {sha}…" = "SHA-256: {sha}…"
+"Same as layer" = "Taki sam jak warstwa"
+"Saturation" = "Nasycenie"
+"Save" = "Zapisz"
+"Save as" = "Zapisz jako"
+"Save as preset…" = "Zapisz jako preset…"
+"Save version  {key}" = "Zapisz wersję  {key}"
+"Saved" = "Zapisano"
+"Saved {name}" = "Zapisano: {name}"
+"Say something" = "Napisz coś"
+"Scale" = "Skaluj"
+"Scatter" = "Rozproszenie"
+"Scoping: where pickers offer it" = "Zakres: gdzie próbniki go oferują"
+"Screen" = "Ekran"
+"Scroll behavior" = "Zachowanie przewijania"
+"Scroll to" = "Przewiń do"
+"Scroll to layer" = "Przewiń do warstwy"
+"Scroll with parent" = "Przewijaj z rodzicem"
+"Search plugins" = "Szukaj wtyczek"
+"Search" = "Szukaj"
+"Search actions, layers and tools" = "Szukaj akcji, warstw i narzędzi"
+"Search assets" = "Szukaj zasobów"
+"Search comments" = "Szukaj komentarzy"
+"Search files and templates" = "Szukaj plików i szablonów"
+"Search results" = "Wyniki wyszukiwania"
+"Search fonts" = "Szukaj czcionek"
+"Search layers" = "Szukaj warstw"
+"Search pages" = "Szukaj stron"
+"Search shortcuts" = "Szukaj skrótów"
+"Section" = "Sekcja"
+"Section color" = "Kolor sekcji"
+"Sections" = "Sekcje"
+"Select a frame and add a starting point to present it as a flow." = "Wybierz ramkę i dodaj punkt początkowy, aby zaprezentować ją jako przepływ."
+"Select a frame to preview it" = "Wybierz ramkę, aby wyświetlić jej podgląd"
+"Select a layer to see its properties and code" = "Wybierz warstwę, aby zobaczyć jej właściwości i kod"
+"Select all" = "Zaznacz wszystko"
+"Select all with same" = "Zaznacz wszystko z takim samym"
+"Select layer" = "Zaznacz warstwę"
+"Select layers to apply the style to" = "Zaznacz warstwy, do których chcesz zastosować styl"
+"Select layers with this color" = "Zaznacz warstwy z tym kolorem"
+"Select overlapping shapes" = "Zaznacz nakładające się kształty"
+"Select points to edit their position, radius and mirroring" = "Zaznacz punkty, aby edytować ich pozycję, promień i odbicie lustrzane"
+"Select slot" = "Zaznacz gniazdo (slot)"
+"Selection colors" = "Kolory zaznaczenia"
+"Selection" = "Zaznaczenie"
+"Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Ramka zaznaczenia, {w} × {h} w ({x}, {y}): strzałki przesuwają, Shift+strzałki lub {cmd}+strzałki zmieniają rozmiar, Enter zatwierdza, Escape anuluje"
+"Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Ramka zaznaczenia: strzałki przesuwają, Shift+strzałki lub {cmd}+strzałki zmieniają rozmiar, Enter zatwierdza, Escape anuluje"
+"Send backward" = "Przenieś do tyłu"
+"Send report" = "Wyślij zgłoszenie"
+"Send to back" = "Przenieś na spód"
+"Sep" = "Wrz"
+"Server address (ws://host:47900/)" = "Adres serwera (ws://host:47900/)"
+"Server address" = "Adres serwera"
+"Server for online sharing" = "Serwer do udostępniania online"
+"Set as default" = "Ustaw jako domyślne"
+"Set variable" = "Ustaw zmienną"
+"Set variable mode" = "Ustaw tryb zmiennej"
+"Set variable {name}" = "Ustaw zmienną {name}"
+"Set {name} to {value}" = "Ustaw {name} na {value}"
+"Shadows" = "Cienie"
+"Shape" = "Kształt"
+"Shape builder" = "Kreator kształtów"
+"Shape tools" = "Narzędzia kształtów"
+"Shapes" = "Kształty"
+"Share" = "Udostępnij"
+"Share this file" = "Udostępnij ten plik"
+"Share with a code" = "Udostępnij za pomocą kodu"
+"Share: live session, export" = "Udostępnianie: sesja na żywo, eksport"
+"Shared" = "Udostępniono"
+"Shared: copy its code from the file's menu" = "Udostępniono: skopiuj kod z menu pliku"
+"Sharing a file needs the desktop app; here you can join one." = "Udostępnianie pliku wymaga aplikacji desktopowej; tutaj możesz tylko dołączyć."
+"Sharing on the local network (online sharing is off: no server is set in Preferences)." = "Udostępnianie w sieci lokalnej (udostępnianie online wyłączone: brak serwera w Preferencjach)."
+"Sharing on your network · {people}" = "Udostępnianie w Twojej sieci · {people}"
+"Sharing online · {people}" = "Udostępnianie online · {people}"
+"Sharing stopped: the file stays on the server, open only to you" = "Zatrzymano udostępnianie: plik pozostaje na serwerze, otwarty tylko dla Ciebie"
+"Show" = "Pokaż"
+"Show all templates" = "Pokaż wszystkie szablony"
+"Show as grid" = "Pokaż jako siatkę"
+"Show as list" = "Pokaż jako listę"
+"Show autosaves" = "Pokaż automatyczne zapisy"
+"Show behind transparent areas" = "Pokaż za przezroczystymi obszarami"
+"Show comments (Shift+C)" = "Pokaż komentarze (Shift+C)"
+"Show device frame" = "Pokaż ramkę urządzenia"
+"Show dimensions on objects" = "Pokaż wymiary na obiektach"
+"Show hotspot hints" = "Pokaż podpowiedzi obszarów klikalnych (hotspots)"
+"Show in Explorer" = "Pokaż w Eksploratorze"
+"Show in Finder" = "Pokaż w Finderze"
+"Show in folder" = "Pokaż w folderze"
+"Show only this on the canvas" = "Pokaż tylko ten element na płótnie"
+"Show open" = "Pokaż otwarte"
+"Show section contents" = "Pokaż zawartość sekcji"
+"Show this layer" = "Pokaż tę warstwę"
+"Show usage" = "Pokaż użycie"
+"Show/Hide" = "Pokaż/Ukryj"
+"Show/Hide UI" = "Pokaż/Ukryj interfejs"
+"Side by side" = "Obok siebie"
+"Sidebar" = "Panel boczny"
+"Simplify stroke" = "Uprość obrys"
+"Size" = "Rozmiar"
+"Size jitter" = "Rozrzut rozmiaru"
+"Skip ink" = "Pomiń atrament"
+"Slashed zero" = "Przekreślone zero"
+"Slice" = "Wycinek"
+"Slices" = "Plasterki"
+"Slide in" = "Wsuń slajd"
+"Slide out" = "Wysuń slajd"
+"Slot" = "Gniazdo (slot)"
+"Slot content" = "Zawartość gniazda"
+"Small capitals" = "Kapitaliki"
+"Small caps" = "Kapitaliki"
+"Smart animate" = "Inteligentna animacja (Smart animate)"
+"Snap to pixel grid" = "Przyciągaj do siatki pikseli"
+"Social and slides" = "Social media i slajdy"
+"Social media" = "Media społecznościowe"
+"Social post sizes" = "Rozmiary postów w mediach społecznościowych"
+"Soft light" = "Łagodne światło"
+"Solid" = "Jednolity"
+"Some variants have the same property values: give each one a unique combination" = "Niektóre warianty mają takie same wartości właściwości: nadaj każdemu unikalną kombinację"
+"Sort" = "Sortuj"
+"Sort by" = "Sortuj według"
+"Sort by date" = "Sortuj według daty"
+"Sort by page" = "Sortuj według strony"
+"Sort by {column}" = "Sortuj według: {column}"
+"Space around" = "Równe odstępy z marginesem (Space around)"
+"Space between" = "Równe odstępy między elementami (Space between)"
+"Space drag" = "Przesuwanie spacją"
+"Space evenly" = "Rozmieść równomiernie"
+"Space+drag" = "Spacja+przeciągnięcie"
+"Spacing" = "Odstępy"
+"Spam, stolen work, abuse…" = "Spam, plagiat, naruszenie zasad…"
+"Speech bubble" = "Dymek"
+"Splay" = "Rozszerzenie"
+"Spotlight me" = "Wyróżnij mój widok (Spotlight me)"
+"Spread" = "Rozszerzenie"
+"Square" = "Kwadratowe"
+"Stamp" = "Pieczątka"
+"Stamps" = "Pieczątki"
+"Standard" = "Standardowy"
+"Standard ligatures" = "Ligatury standardowe"
+"Star" = "Gwiazda"
+"Stars" = "Gwiazdy"
+"Start" = "Uruchom"
+"Start ascending from / stop descending at" = "Początek narastania od / koniec opadania w"
+"Start from a blank canvas" = "Zacznij od pustego płótna"
+"Start from a template" = "Zacznij od szablonu"
+"Start on path" = "Początek na ścieżce"
+"Start on the Home screen" = "Rozpoczynaj od ekranu głównego"
+"Start point" = "Punkt początkowy"
+"Start sharing" = "Rozpocznij udostępnianie"
+"Start sharing with the Share button, then pass on the code it gives" = "Rozpocznij udostępnianie przyciskiem Udostępnij, a następnie przekaż wygenerowany kod"
+"Start vote" = "Rozpocznij głosowanie"
+"Starting to share…" = "Rozpoczynanie udostępniania…"
+"Status" = "Stan"
+"Sticky" = "Przyklejony (sticky)"
+"Sticky note" = "Karteczka"
+"Sticky note colors" = "Kolory karteczek"
+"Sticky notes" = "Karteczki"
+"Sticky notes, shapes and connectors" = "Karteczki, kształty i łączniki"
+"Stop" = "Zatrzymaj"
+"Stop following {name}" = "Przestań obserwować: {name}"
+"Stop session" = "Zatrzymaj sesję"
+"Stop sharing" = "Zatrzymaj udostępnianie"
+"Stop spotlighting" = "Zatrzymaj wyróżnianie widoku"
+"Stop timer" = "Zatrzymaj minutnik"
+"Stop {n}  {hex}" = "Punkt przejścia {n}  {hex}"
+"Straight" = "Prosty"
+"Stretch" = "Rozciągnięcie"
+"Strikethrough" = "Przekreślenie"
+"String" = "Tekst (string)"
+"Stroke" = "Obrys"
+"Stroke style" = "Styl obrysu"
+"Stroke weight" = "Grubość obrysu"
+"Strokes" = "Obrysy"
+"Style" = "Styl"
+"Styles" = "Style"
+"Stylistic set 1" = "Zestaw stylistyczny 1"
+"Stylistic set 2" = "Zestaw stylistyczny 2"
+"Stylistic set 3" = "Zestaw stylistyczny 3"
+"Stylistic set 4" = "Zestaw stylistyczny 4"
+"Stylistic set 5" = "Zestaw stylistyczny 5"
+"Subtract" = "Odejmij"
+"Subtracts" = "Odejmuje"
+"Suffix" = "Przyrostek"
+"Suspend snapping while dragging" = "Zawieś przyciąganie podczas przeciągania"
+"Swap instance" = "Podmień instancję"
+"Swap library: use another library's assets of the same names" = "Podmień bibliotekę: użyj zasobów innej biblioteki o tych samych nazwach"
+"Swap orientation" = "Zmień orientację"
+"Swap overlay" = "Podmień nakładkę"
+"Swap to {name}" = "Podmień na {name}"
+"Swap width and height" = "Zamień szerokość i wysokość"
+"Swapped instance" = "Podmieniono instancję"
+"Swapped {n} assets" = { one = "Podmieniono {n} zasób", few = "Podmieniono {n} zasoby", many = "Podmieniono {n} zasobów", other = "Podmieniono {n} zasobów" }
+"Swapped {n} assets; {missed} had no match and still use the old library" = { one = "Podmieniono {n} zasób; {missed} nie ma dopasowania i nadal używa starej biblioteki", few = "Podmieniono {n} zasoby; {missed} nie ma dopasowania i nadal używa starej biblioteki", many = "Podmieniono {n} zasobów; {missed} nie ma dopasowania i nadal używa starej biblioteki", other = "Podmieniono {n} zasobów; {missed} nie ma dopasowania i nadal używa starej biblioteki" }
+"Sweep" = "Przemiatanie (sweep)"
+"System" = "Systemowy"
+"Tab / Shift+Tab" = "Tab / Shift+Tab"
+"Table" = "Tabela"
+"Tablet" = "Tablet"
+"Tabular numbers" = "Cyfry tabelaryczne"
+"Take the values from the first selected layer" = "Pobierz wartości z pierwszej zaznaczonej warstwy"
+"Taper" = "Zwężanie"
+"Taper both ends" = "Zwężaj oba końce"
+"Tell the server's operator what is wrong with it" = "Poinformuj administratora serwera, co jest nie tak"
+"Temperature" = "Temperatura"
+"Template" = "Szablon"
+"Templates" = "Szablony"
+"Terms" = "Warunki"
+"Text" = "Tekst"
+"Text align" = "Wyrównanie tekstu"
+"Text content" = "Zawartość tekstu"
+"Text size" = "Rozmiar tekstu"
+"Text style" = "Styl tekstu"
+"Text styles" = "Style tekstu"
+"Texts" = "Teksty"
+"Texture" = "Tekstura"
+"The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3." = "Płótno wyświetla podgląd kolorów w sRGB; wyeksportowane pliki PNG, JPG i WebP są oznaczane profilem Display P3."
+"The destination document is unavailable. Nothing was imported." = "Dokument docelowy jest niedostępny. Nic nie zostało zaimportowane."
+"The destination document was closed. Nothing was imported." = "Dokument docelowy został zamknięty. Nic nie zostało zaimportowane."
+"The destination page was removed. Nothing was imported." = "Strona docelowa została usunięta. Nic nie zostało zaimportowane."
+"The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "Plik został usunięty z serwera: nikt nie może go już stamtąd otworzyć ani do niego dołączyć, a tej operacji nie można cofnąć. Otwarte kopie pozostają u ich posiadaczy."
+"The file now holds another library" = "Plik zawiera teraz inną bibliotekę"
+"The file now holds another library (\"{name}\")" = "Plik zawiera teraz inną bibliotekę („{name}”)"
+"The files you shared or published online from this computer. They stay on their server until you remove them." = "Pliki udostępnione lub opublikowane online z tego komputera. Pozostają na serwerze do momentu ich usunięcia."
+"The link carries the session's secret: share it only with people you invite." = "Link zawiera sekret sesji: udostępniaj go tylko osobom, które zapraszasz."
+"The name in your online files and on the server. The document inside keeps its own name." = "Nazwa w Twoich plikach online i na serwerze. Dokument wewnątrz zachowuje własną nazwę."
+"The selection uses several text styles: click to apply one" = "Zaznaczenie używa kilku stylów tekstu: kliknij, aby zastosować jeden"
+"The server deletes this file if nobody opens it before {date}." = "Serwer usunie ten plik, jeśli nikt go nie otworzy przed {date}."
+"The whole file" = "Cały plik"
+"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "Okno jest zbyt małe dla {size}%, więc interfejs jest wyświetlany w {drawn}%. Powiększ okno, aby użyć {size}%."
+"Theme" = "Motyw"
+"There's no destination for that action" = "Brak miejsca docelowego dla tej akcji"
+"Thickness" = "Grubość"
+"This branch can't be reviewed: {e}" = "Tej gałęzi nie można przejrzeć: {e}"
+"This branch was merged or archived." = "Ta gałąź została scalona lub zarchiwizowana."
+"This computer only" = "Tylko ten komputer"
+"This computer remembers the owner token, so the file can be managed from the home screen's Online list. Copy it to manage the file from somewhere else: it is a password for this file and won't be shown again." = "Ten komputer pamięta token właściciela, więc plik może być zarządzany z listy Online na ekranie głównym. Skopiuj go, aby zarządzać plikiem z innego miejsca: jest to hasło do tego pliku i nie zostanie ponownie wyświetlone."
+"This condition is edited as an expression" = "Ten warunek jest edytowany jako wyrażenie"
+"This file" = "Ten plik"
+"This file has unsaved changes" = "Ten plik ma niezapisane zmiany"
+"This file is too large to join here (up to {mb} MB)" = "Ten plik jest zbyt duży, aby do niego dołączyć (maksymalnie {mb} MB)"
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "Ten plik używa czcionek, które nie są zainstalowane na tym komputerze. Do czasu ich zainstalowania tekst jest wyświetlany czcionką zastępczą."
+"This file is on {server}, open only to you. Share it to let others in with a new code." = "Ten plik znajduje się na {server}, otwarty tylko dla Ciebie. Udostępnij go, aby wpuścić innych nowym kodem."
+"This frame is new on the branch." = "Ta ramka jest nowa w gałęzi."
+"This frame isn't on the branch." = "Tej ramki nie ma w gałęzi."
+"This server is open to the public: no key needed." = "Ten serwer jest otwarty publicznie: klucz nie jest wymagany."
+"This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Ten serwer wymaga klucza: dodaj ?key=… do adresu (polecenie `figcraft-server key` wyświetla go na maszynie serwera)."
+"This server takes files only with its key: see Advanced." = "Ten serwer przyjmuje pliki tylko z kluczem: zobacz Zaawansowane."
+"Thumbs up" = "Kciuk w górę"
+"Tidy up" = "Uporządkuj"
+"Tile" = "Sąsiadująco"
+"Tile type" = "Typ kafelka"
+"Timer" = "Minutnik"
+"Tint" = "Odcień barwny"
+"Title" = "Tytuł"
+"Title case" = "Jak W Tytule"
+"To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Aby udostępnić tę bibliotekę zespołowi, opublikuj plik na serwerze (Udostępnij ▸ Publikuj na serwerze…), a następnie opublikuj tam bibliotekę."
+"To the layer around it" = "Do warstwy nadrzędnej"
+"Toggle" = "Przełącz"
+"Toggle light/dark theme" = "Przełącz motyw jasny/ciemny"
+"Toggle visibility" = "Przełącz widoczność"
+"Tools" = "Narzędzia"
+"Top" = "Góra"
+"Top & bottom" = "Góra i dół"
+"Top left radius" = "Promień górnego lewego narożnika"
+"Top padding" = "Margines górny"
+"Top right radius" = "Promień górnego prawego narożnika"
+"Transform" = "Przekształć"
+"Triangle" = "Trójkąt"
+"Triangle arrow" = "Strzałka trójkątna"
+"Trigger" = "Wyzwalacz"
+"Trigger layer" = "Warstwa wyzwalająca"
+"True" = "Prawda"
+"Truncate text" = "Utnij tekst"
+"Truncate with an ellipsis" = "Utnij tekst z wielokropkiem (…)"
+"Try again" = "Spróbuj ponownie"
+"Try another search or filter." = "Wypróbuj inne wyszukiwanie lub filtr."
+"Try another search, or browse templates." = "Spróbuj innego wyszukiwania lub przejrzyj szablony."
+"Try another word, or look at every kind." = "Wypróbuj inne słowo lub przejrzyj wszystkie typy."
+"Turn a layer into a component, reuse it, and change every copy at once" = "Przekształć warstwę w komponent, używaj jej ponownie i modyfikuj wszystkie kopie naraz"
+"Two digits" = "Dwie cyfry"
+"Type" = "Tekst"
+"Type settings" = "Ustawienia tekstu"
+"Type the join code you were given, or paste an invite link." = "Wpisz otrzymany kod dołączenia lub wklej link z zaproszeniem."
+"Typography" = "Typografia"
+"Underline" = "Podkreślenie"
+"Undo takes back only your own changes; what others changed since stays." = "Cofanie odwołuje tylko Twoje własne zmiany; modyfikacje wprowadzone przez innych pozostają."
+"Ungroup" = "Rozgrupuj"
+"Uniform" = "Jednolity"
+"Union" = "Suma zbiorów"
+"Unions" = "Sumy"
+"Unknown — treated as sRGB" = "Nieznany — traktowany jako sRGB"
+"Unread" = "Nieprzeczytane"
+"Unresolve" = "Cofnij rozwiązanie"
+"Unsaved changes" = "Niezapisane zmiany"
+"Unsaved changes in {names}. Save them before closing?" = "Niezapisane zmiany w: {names}. Zapisać je przed zamknięciem?"
+"Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Niezapisane zmiany: najpierw zapisz ({save}) lub zamknij kartę z {alt}-kliknięciem, aby odrzucić"
+"Unsaved changes: save first, or close again with {key} to discard" = "Niezapisane zmiany: najpierw zapisz lub naciśnij ponownie {key}, aby odrzucić"
+"Up" = "W górę"
+"Update plugin" = "Zaktualizuj wtyczkę"
+"Update" = "Aktualizuj"
+"Update from main" = "Zaktualizuj z gałęzi głównej"
+"Update from selection" = "Zaktualizuj z zaznaczenia"
+"Updated {components} and {styles}" = "Zaktualizowano {components} i {styles}"
+"Updated {name}" = "Zaktualizowano {name}"
+"Updating the graphics driver often helps. To use OpenGL only, start FigCraft from a Command Prompt with:" = "Aktualizacja sterownika graficznego często pomaga. Aby używać tylko OpenGL, uruchom FigCraft z wiersza poleceń za pomocą:"
+"Updating the graphics driver often helps. WGPU_BACKEND (vulkan, gl, metal) names another graphics API to try." = "Aktualizacja sterownika graficznego często pomaga. Zmienna WGPU_BACKEND (vulkan, gl, metal) pozwala wybrać inne graficzne API do wypróbowania."
+"Uploads this file to a FigCraft server and keeps this tab in sync with it. You get a link to edit and a link to view." = "Przesyła ten plik na serwer FigCraft i synchronizuje tę kartę na bieżąco. Otrzymujesz link do edycji oraz link do podglądu."
+"Uppercase" = "WIELKIE LITERY"
+"Use a fixed value" = "Użyj stałej wartości"
+"Use an expression, e.g. count + 1" = "Użyj wyrażenia, np. count + 1"
+"Use as mask" = "Użyj jako maski"
+"Use auto layout" = "Użyj automatycznego układu"
+"Use number keys for opacity" = "Użyj klawiszy numerycznych dla nieprzezroczystości"
+"Use the .figcraft or .fig extension." = "Użyj rozszerzenia .figcraft lub .fig."
+"Use the layer's fill" = "Użyj wypełnienia warstwy"
+"Use your browser's zoom to change the interface size." = "Użyj powiększenia przeglądarki, aby zmienić rozmiar interfejsu."
+"Used in {files} · {instances}" = "Używane w {files} · {instances}"
+"Username" = "Nazwa użytkownika"
+"Value" = "Wartość"
+"Uses variables: each layer shows them in its own mode" = "Używa zmiennych: każda warstwa wyświetla je we własnym trybie"
+"Variable" = "Zmienna"
+"Variable collections" = "Kolekcje zmiennych"
+"Variable modes" = "Tryby zmiennych"
+"Variable width" = "Zmienna szerokość"
+"Variables" = "Zmienne"
+"Variables JSON…" = "JSON ze zmiennymi…"
+"Variables store reusable values (colours, numbers, strings, booleans) with modes such as Light and Dark." = "Zmienne przechowują wartości wielokrotnego użytku (kolory, liczby, teksty, wartości logiczne) z trybami takimi jak Jasny i Ciemny."
+"Variant" = "Wariant"
+"Vector" = "Wektor"
+"Vectors" = "Wektory"
+"Version" = "Wersja"
+"Version history" = "Historia wersji"
+"Version {version}" = "Wersja {version}"
+"Version {v} · {components} · {styles} · {variables}" = "Wersja {v} · {components} · {styles} · {variables}"
+"Vertical" = "Pionowo"
+"Vertical align" = "Wyrównanie pionowe"
+"Vertical hex" = "Pionowy sześciokąt"
+"Vertical padding" = "Marginesy pionowe"
+"Vertical spacing" = "Odstępy pionowe"
+"Vertical trim" = "Przycinanie pionowe (vertical trim)"
+"View" = "Widok"
+"View link" = "Link do podglądu"
+"View link copied" = "Skopiowano link do podglądu"
+"View only" = "Tylko podgląd"
+"View only: you see every change as it happens but can't edit. Leave to keep a copy you can edit." = "Tylko podgląd: widzisz każdą zmianę w czasie rzeczywistym, ale nie możesz edytować. Opuść sesję, aby zachować kopię do edycji."
+"Viewing “{name}”" = "Podglądanie „{name}”"
+"Violet" = "Fiolet"
+"Visibility" = "Widoczność"
+"Visible" = "Widoczne"
+"Vivid" = "Żywe kolory"
+"Votes per person" = "Głosy na osobę"
+"Voting session" = "Głosowanie"
+"WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "Zmienna WGPU_BACKEND jest ustawiona i określa używane API graficzne; jej usunięcie pozwala FigCraft dokonać wyboru."
+"Warm" = "Ciepły"
+"Watch" = "Zegarek"
+"Wavy" = "Falisty"
+"Web" = "Internet"
+"Websites" = "Strony internetowe"
+"WebSocket URL" = "Adres WebSocket URL"
+"WebSocket URL copied" = "Skopiowano adres WebSocket URL"
+"Wedge" = "Klin"
+"Weekly planner" = "Plan tygodnia"
+"Weight" = "Grubość"
+"What you try here changes this preview and the code below, not the file" = "To, co wypróbujesz tutaj, zmienia ten podgląd i kod poniżej, a nie plik"
+"What changed since it was marked ready for dev" = "Co się zmieniło od czasu oznaczenia jako gotowe do wdrożenia"
+"What is wrong with this file? The server's operator gets your report." = "Co jest nie tak z tym plikiem? Administrator serwera otrzyma Twoje zgłoszenie."
+"What it's for" = "Do czego to służy"
+"What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "Nie wiadomo, w stosunku do czego zaszła zmiana: ramka zmieniła się, zanim FigCraft zaczął zapisywać kopię ramek gotowych do wdrożenia. Rozwiąż zmianę (lub oznacz ponownie jako gotowe), aby móc porównywać od teraz."
+"While hovering" = "Podczas najechania"
+"While pressing" = "Podczas naciskania"
+"White" = "Biały"
+"Who runs it, its terms and how long it keeps files" = "Kto zarządza serwerem, jego regulamin i czas przechowywania plików"
+"Whole screen" = "Cały ekran"
+"Why it changed" = "Dlaczego to się zmieniło"
+"Widget" = "Widżet"
+"Widgets" = "Widżety"
+"Width" = "Szerokość"
+"Width point" = "Punkt szerokości"
+"Width profile" = "Profil szerokości"
+"Wireframe kit" = "Zestaw makiet (Wireframe kit)"
+"With the layers' export settings" = "Z ustawieniami eksportu warstw"
+"Wrap" = "Owinięcie"
+"Wrap in new section" = "Zawiń w nową sekcję"
+"Yellow" = "Żółty"
+"Yesterday" = "Wczoraj"
+"You" = "Ty"
+"You'll get the shared file as a new tab and edit it together." = "Otrzymasz udostępniony plik jako nową kartę i będziecie go edytować wspólnie."
+"You're spotlighting: everyone follows your view" = "Wyróżniasz swój widok (spotlight): wszyscy podążają za Twoim widokiem"
+"Your copy of the file stays open" = "Twoja kopia pliku pozostaje otwarta"
+"Your copy stays open; the file stays on the server" = "Twoja kopia pozostaje otwarta; plik pozostaje na serwerze"
+"Your name" = "Twoje imię i nazwisko"
+"Your name in comments" = "Twoje imię w komentarzach"
+"Your system asks for reduced motion: animations stay off." = "Twój system preferuje ograniczony ruch: animacje pozostają wyłączone."
+"Z" = "Z"
+"Z to A" = "Od Z do A"
+"Zoom" = "Powiększenie"
+"Zoom around the pointer" = "Powiększaj wokół kursora"
+"Zoom device to fill window" = "Dopasuj urządzenie do okna z powiększeniem"
+"Zoom in" = "Powiększ"
+"Zoom out" = "Pomniejsz"
+"Zoom to 100%" = "Powiększ do 100%"
+"Zoom to 200%" = "Powiększ do 200%"
+"Zoom to 50%" = "Zmniejsz do 50%"
+"Zoom to fit" = "Dopasuj do okna"
+"Zoom to selection" = "Powiększaj do zaznaczenia"
+"Zoom tool: click to zoom in, drag an area" = "Narzędzie powiększenia: kliknij, aby przybliżyć, przeciągnij obszar"
+"Zoom tool: zoom out" = "Narzędzie powiększenia: oddal"
+"and {n} more" = { one = "i jeszcze {n}", few = "i jeszcze {n}", many = "i jeszcze {n}", other = "i jeszcze {n}" }
+"bleed marks" = "znaczniki spadu"
+"by {author}" = "autor: {author}"
+"call any command its access allows" = "wywołaj dowolne polecenie, na które zezwala dostęp"
+"call only: {commands}" = "wywołaj tylko: {commands}"
+"can edit the document" = "może edytować dokument"
+"can save files" = "może zapisywać pliki"
+"conditional prototype actions nested too deeply were skipped" = "zbyt głęboko zagnieżdżone warunkowe akcje prototypu zostały pominięte"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "warunkowe akcje prototypu z warunkami niemożliwymi do obliczenia zostały pominięte"
+"connector label background was skipped: style data is missing" = "tło etykiety łącznika zostało pominięte: brak danych stylu"
+"connector label was skipped: background bounds are invalid" = "etykieta łącznika została pominięta: nieprawidłowe granice tła"
+"connector label was skipped: background transform is invalid" = "etykieta łącznika została pominięta: nieprawidłowe przekształcenie tła"
+"connector label was skipped: composed text transform is invalid" = "etykieta łącznika została pominięta: nieprawidłowe przekształcenie tekstu złożonego"
+"connector label was skipped: derived background bounds are missing" = "etykieta łącznika została pominięta: brak wyznaczonych granic tła"
+"connector label was skipped: derived text bounds are missing" = "etykieta łącznika została pominięta: brak wyznaczonych granic tekstu"
+"connector label was skipped: text bounds are invalid" = "etykieta łącznika została pominięta: nieprawidłowe granice tekstu"
+"connector label was skipped: text style data is missing" = "etykieta łącznika została pominięta: brak danych stylu tekstu"
+"connector label was skipped: text transform is invalid" = "etykieta łącznika została pominięta: nieprawidłowe przekształcenie tekstu"
+"connector labels were skipped" = "etykiety łączników zostały pominięte"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "warstwy łączników są importowane jako statyczne ramki/wektory z etykietami; aktywne punkty końcowe nie są zachowywane"
+"connector snapshot vector data is missing; connector was left empty" = "brak danych wektorowych łącznika; łącznik pozostał pusty"
+"connectors whose ends can't be placed are empty" = "łączniki, których końców nie można umieścić, pozostają puste"
+"crop marks" = "Znaczniki przycięcia"
+"damaged vector geometry was skipped" = "uszkodzona geometria wektorowa została pominięta"
+"damaged vector networks import as outlines" = "uszkodzone sieci wektorowe są importowane jako kontury"
+"development: {path}" = "wersja rozwojowa: {path}"
+"document children other than pages were skipped" = "elementy podrzędne dokumentu inne niż strony zostały pominięte"
+"duplicate grid track sizing entries use equal tracks" = "zduplikowane wpisy rozmiaru siatki używają równych pasów"
+"e.g. count + 1" = "np. count + 1"
+"e.g. count >= 3 and not done" = "np. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "złamane i zakrzywione łączniki bez zapisanej ścieżki są importowane jako linie proste"
+"entries without a node type were skipped" = "wpisy bez typu węzła zostały pominięte"
+"figcraft:// links from a browser, chat or email open this app and join the session." = "linki figcraft:// z przeglądarki, czatu lub poczty e-mail otwierają tę aplikację i dołączają do sesji."
+"filled areas of a vector with their own fill use the layer's fill" = "wypełnione obszary wektora z własnym wypełnieniem używają wypełnienia warstwy"
+"from {server}" = "z serwera {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "wyzwalacze kontrolera bez dokładnie jednego znanego przycisku zostały pominięte"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "lista ścieżek siatki przekracza 1000 pozycji; ścieżki używają domyślnego równego rozmiaru"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "rozmiar ścieżek siatki jest nieobsługiwany lub nieprawidłowy; dotknięte ścieżki używają równego rozmiaru"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "lista rozmiarów ścieżek siatki przekracza 1000 pozycji; ścieżki używają domyślnego równego rozmiaru"
+"hidden" = "ukryty"
+"iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "filtry obrazu są niejednoznaczne, ponieważ obecne są oba kontenery filtrów; konwersja filtrów została pominięta"
+"image filters use FigCraft's approximate renderer" = "filtry obrazu używają przybliżonego renderera FigCraft"
+"instance swap properties whose default component isn't in the file were skipped" = "właściwości podmiany instancji, których domyślny komponent nie znajduje się w pliku, zostały pominięte"
+"instances inside their own main component were imported as frames" = "instancje wewnątrz własnego głównego komponentu zostały zaimportowane jako ramki"
+"instances of components that aren't in the file show no layers" = "instancje komponentów, których nie ma w pliku, nie pokazują żadnych warstw"
+"instances of components that aren't in the file were imported as frames" = "instancje komponentów, których nie ma w pliku, zostały zaimportowane jako ramki"
+"instances that would nest a component inside itself were imported as frames" = "instancje zagnieżdżające komponent wewnątrz samego siebie zostały zaimportowane jako ramki"
+"instances without a main component were imported as empty frames" = "instancje bez głównego komponentu zostały zaimportowane jako puste ramki"
+"invalid internal .fig text path data was ignored" = "nieprawidłowe wewnętrzne dane ścieżki tekstu .fig zostały zignorowane"
+"invalid or oversized vector networks import as outlines" = "nieprawidłowe lub przewymiarowane sieci wektorowe są importowane jako kontury"
+"invalid or oversized vector path data was skipped" = "nieprawidłowe lub przewymiarowane dane ścieżki wektorowej zostały pominięte"
+"just now" = "przed chwilą"
+"key triggers without a supported key were skipped" = "wyzwalacze klawiszy z nieobsługiwanym klawiszem zostały pominięte"
+"key up triggers import as key presses" = "wyzwalacze zwolnienia klawisza są importowane jako naciśnięcia klawiszy"
+"layers without a position were placed at their parent's origin" = "warstwy bez określonej pozycji zostały umieszczone w punkcie początkowym rodzica"
+"layers without a type were skipped" = "warstwy bez typu zostały pominięte"
+"legacy image filter container is unsupported; filter conversion was skipped" = "przestarzały kontener filtrów obrazu jest nieobsługiwany; konwersja filtrów została pominięta"
+"locked" = "Zablokowane"
+"malformed image filters container was skipped" = "nieprawidłowy kontener filtrów obrazu został pominięty"
+"malformed image paintFilter container was skipped" = "nieprawidłowy kontener filtrów malowania (paintFilter) został pominięty"
+"malformed slot content assignment was skipped" = "nieprawidłowe przypisanie zawartości gniazda zostało pominięte"
+"no bleed" = "brak spadu"
+"nobody else here yet" = "nikogo innego tu jeszcze nie ma"
+"non-default slot settings are not represented and were skipped" = "niedomyślne ustawienia gniazd nie są reprezentowane i zostały pominięte"
+"now" = "teraz"
+"offer files to save if it asks to (you choose where each one goes)" = "proponować pliki do zapisania, jeśli o to poprosi (miejsce każdego wybierasz sam)"
+"only in a text style or variable" = "tylko w stylu tekstu lub zmiennej"
+"or" = "lub"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "połączenia punktów obrysu zostały zachowane; obrysy przerywane lub o zmiennej szerokości renderują się z łączeniem warstwy"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "klucze preferowanych komponentów gniazda nie mogą zostać dopasowane do węzłów pliku i zostały pominięte"
+"prototype actions of unknown types were skipped" = "akcje prototypu o nieznanych typach zostały pominięte"
+"prototype actions without a destination in the file were skipped" = "akcje prototypu bez miejsca docelowego w pliku zostały pominięte"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "wyrażenia prototypu operujące na zmiennych, których nie ma w pliku JSON ze zmiennymi, zostały pominięte"
+"prototype expressions with unsupported functions were skipped" = "wyrażenia prototypu z nieobsługiwanymi funkcjami zostały pominięte"
+"prototype interactions without supported actions were skipped" = "interakcje prototypu bez obsługiwanych akcji zostały pominięte"
+"prototype navigations of unknown types were skipped" = "nawigacje prototypu o nieznanych typach zostały pominięte"
+"prototype transitions of unknown types play instantly" = "przejścia prototypu o nieznanych typach odtwarzają się natychmiast"
+"prototype triggers of unknown types were skipped" = "wyzwalacze prototypu o nieznanych typach zostały pominięte"
+"put a widget on the canvas" = "umieść widżet na płótnie"
+"read and edit the document" = "odczytuj i edytuj dokument"
+"read the document" = "odczytuj dokument"
+"reads the document" = "odczytuje dokument"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "akcje set-variable operujące na zmiennych, których nie ma w pliku JSON ze zmiennymi, zostały pominięte"
+"set-variable actions with values that can't be evaluated were skipped" = "akcje set-variable z wartościami, których nie można obliczyć, zostały pominięte"
+"set-variable actions with values that don't fit the variable were skipped" = "akcje set-variable z wartościami niepasującymi do zmiennej zostały pominięte"
+"set-variable actions without a value were skipped" = "akcje set-variable bez wartości zostały pominięte"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "akcje set-variable-mode dla kolekcji lub trybów, których nie ma w pliku JSON ze zmiennymi, zostały pominięte"
+"slot content assignment target is missing or is not slot content" = "cel przypisania zawartości gniazda nie istnieje lub nie jest zawartością gniazda"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "przypisanie zawartości gniazda używa pustego identyfikatora GUID i zostało pominięte"
+"slot layers without a matching slot property were imported as frames" = "warstwy gniazd bez pasującej właściwości gniazda zostały zaimportowane jako ramki"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "niektóre punkty wektorowe odwołują się do ustawień punktów brakujących w pliku; używają połączeń warstwy i zwykłych narożników"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "niektóre segmenty wektorowe odwołują się do ustawień stylu brakujących w pliku; używają obrysu warstwy"
+"stale or invalid grid track sizing entries were ignored" = "nieaktualne lub nieprawidłowe wpisy rozmiarów ścieżek siatki zostały zignorowane"
+"stars and polygons without point counts or geometry use the default point count" = "gwiazdy i wielokąty bez określonej liczby wierzchołków lub geometrii używają domyślnej liczby punktów"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "ustawienia stylu niektórych segmentów wektorowych nie są obsługiwane; segmenty te używają obrysu warstwy"
+"text path underline or strikethrough decoration is not rendered" = "podkreślenie lub przekreślenie tekstu na ścieżce nie jest renderowane"
+"text style overrides refer to missing table entries" = "nadpisania stylu tekstu odwołują się do brakujących wpisów w tabeli"
+"the file has no pages" = "plik nie zawiera stron"
+"the plugin" = "wtyczka"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "plik JSON ze zmiennymi nie zawiera `variableCollections` (oczekiwano odpowiedzi ze zmiennymi lokalnymi) i został zignorowany"
+"this session only" = "tylko ta sesja"
+"unknown component property types were skipped" = "nieznane typy właściwości komponentu zostały pominięte"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "aliasy zmiennych wskazujące na zmienne nieobecne w pliku JSON ze zmiennymi (lub innego typu) zostały pominięte"
+"variable bindings to properties the layer doesn't have were skipped" = "powiązania zmiennych z właściwościami, których warstwa nie posiada, zostały pominięte"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "powiązania zmiennych ze zmiennymi nieobecnymi w pliku JSON ze zmiennymi (zmienne biblioteki) zostały pominięte"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "powiązania zmiennych zostały pominięte: plik JSON nie zawiera definicji zmiennych (przekaż JSON zmiennych lokalnych jako `variables` lub osadź jego `meta` obok pliku JSON)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "powiązania zmiennych, których typ nie pasuje do właściwości, zostały pominięte"
+"variable collections without modes were skipped" = "kolekcje zmiennych bez trybów zostały pominięte"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "odwołania do trybu zmiennej w wyrażeniach prototypu niebędące zmienną i jednym z jej trybów zostały pominięte"
+"variable modes of collections that aren't in the file were skipped" = "tryby zmiennych dla kolekcji nieobecnych w pliku zostały pominięte"
+"variable modes of collections that aren't in the variables JSON were skipped" = "tryby zmiennych dla kolekcji nieobecnych w pliku JSON ze zmiennymi zostały pominięte"
+"variable values that don't match their type (or composed colours) were skipped" = "wartości zmiennych niezgodne ze swoim typem (lub złożone kolory) zostały pominięte"
+"variables of unknown types were skipped" = "zmienne o nieznanych typach zostały pominięte"
+"variables whose collection isn't in the variables JSON were skipped" = "zmienne, których kolekcji nie ma w pliku JSON ze zmiennymi, zostały pominięte"
+"variables without readable values were skipped" = "zmienne bez czytelnych wartości zostały pominięte"
+"vector points with unknown stroke joins use the layer join" = "punkty wektorowe z nieznanymi połączeniami obrysu używają połączenia warstwy"
+"vectors without geometry are empty" = "wektory bez geometrii są puste"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "wektory bez geometrii są puste (wyeksportuj plik JSON z opcją geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "bardzo długi tekst został przycięty do 1 048 576 znaków"
+"very long vector paths were skipped" = "bardzo długie ścieżki wektorowe zostały pominięte"
+"video actions are not supported and were skipped" = "akcje wideo nie są obsługiwane i zostały pominięte"
+"video triggers are not supported and were skipped" = "wyzwalacze wideo nie są obsługiwane i zostały pominięte"
+"yesterday" = "wczoraj"
+"{instances} in {files}" = "{instances} w {files}"
+"{language}: draft translation, waiting for a native speaker's review." = "{language}: wersja robocza tłumaczenia, oczekuje na weryfikację przez native speakera."
+"{length} bleed" = "spad {length}"
+"{month} {day}, {year}" = "{day} {month} {year}"
+"{name} cleared from the list" = "Usunięto {name} z listy"
+"{name} is forgotten on this computer; the file stays on {server}" = "{name} usunięto z pamięci tego komputera; plik pozostaje na {server}"
+"{name} is on the server." = "{name} znajduje się na serwerze."
+"{name} is spotlighting" = "{name} prezentuje widok (spotlight)"
+"{name} is too large to open in the browser (over 512 MB)." = "Plik {name} jest za duży, aby otworzyć go w przeglądarce (ponad 512 MB)."
+"{name}\nClick to apply to the selection" = "{name}\nKliknij, aby zastosować do zaznaczenia"
+"{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nPrzeciągnij na płótno lub kliknij, aby umieścić na środku widoku.\nPrzytrzymaj klawisz Alt (Option) podczas upuszczania na instancję, aby ją zamienić."
+"{name} (from {library})" = "{name} (z biblioteki {library})"
+"{name} (you)" = "{name} (Ty)"
+"{name} ({layers} layers)" = "{name} ({layers} warstw)"
+"{name} ({tag}): {min} – {max}, default {default}. Double-click the slider to go back to the style's value; Escape while dragging cancels." = "{name} ({tag}): {min} – {max}, domyślnie {default}. Kliknij dwukrotnie suwak, aby przywrócić wartość stylu; naciśnięcie Escape podczas przeciągania anuluje."
+"{name} from {path}" = "{name} z {path}"
+"{name} was removed from the server" = "Plik {name} został usunięty z serwera"
+"{name} · deleted on main" = "{name} · usunięto w gałęzi głównej"
+"{name} · deleted on the branch" = "{name} · usunięto w gałęzi"
+"{name} · not published" = "{name} · nieopublikowane"
+"{name} · on a server" = "{name} · na serwerze"
+"{name} · published version {v}" = "{name} · opublikowana wersja {v}"
+"{name} · version {v} on the server" = "{name} · wersja {v} na serwerze"
+"{name}, in a live session" = "{name}, w sesji na żywo"
+"{name}, online, open only to you" = "{name}, online, otwarty tylko dla Ciebie"
+"{name}, {kind}, {w} by {h}, selected" = "{name}, {kind}, {w} × {h}, zaznaczono"
+"{n} added" = { one = "Dodano {n}", few = "Dodano {n}", many = "Dodano {n}", other = "Dodano {n}" }
+"{n} autosave versions" = { one = "{n} wersja autozapisu", few = "{n} wersje autozapisu", many = "{n} wersji autozapisu", other = "{n} wersji autozapisu" }
+"{n} changed" = { one = "Zmieniono {n}", few = "Zmieniono {n}", many = "Zmieniono {n}", other = "Zmieniono {n}" }
+"{n} columns" = { one = "{n} kolumna", few = "{n} kolumny", many = "{n} kolumn", other = "{n} kolumn" }
+"{n} components" = { one = "{n} komponent", few = "{n} komponenty", many = "{n} komponentów", other = "{n} komponentów" }
+"{n} components and styles have newer versions" = { one = "{n} komponent lub styl ma nowszą wersję", few = "{n} komponenty i style mają nowsze wersje", many = "{n} komponentów i stylów ma nowsze wersje", other = "{n} komponentów i stylów ma nowsze wersje" }
+"{n} conflicts to resolve" = { one = "{n} konflikt do rozwiązania", few = "{n} konflikty do rozwiązania", many = "{n} konfliktów do rozwiązania", other = "{n} konfliktów do rozwiązania" }
+"{n} days ago" = { one = "{n} dzień temu", few = "{n} dni temu", many = "{n} dni temu", other = "{n} dni temu" }
+"{n} files" = { one = "{n} plik", few = "{n} pliki", many = "{n} plików", other = "{n} plików" }
+"{n} hours ago" = { one = "{n} godzinę temu", few = "{n} godziny temu", many = "{n} godzin temu", other = "{n} godzin temu" }
+"{n} instances" = { one = "{n} instancja", few = "{n} instancje", many = "{n} instancji", other = "{n} instancji" }
+"{n} layers" = { one = "{n} warstwa", few = "{n} warstwy", many = "{n} warstw", other = "{n} warstw" }
+"{n} layers as one file" = { one = "{n} warstwa jako jeden plik", few = "{n} warstwy jako jeden plik", many = "{n} warstw jako jeden plik", other = "{n} warstw jako jeden plik" }
+"{n} layers selected" = { one = "Zaznaczono {n} warstwę", few = "Zaznaczono {n} warstwy", many = "Zaznaczono {n} warstw", other = "Zaznaczono {n} warstw" }
+"{n} layers · {parts}" = { one = "{n} warstwa · {parts}", few = "{n} warstwy · {parts}", many = "{n} warstw · {parts}", other = "{n} warstw · {parts}" }
+"{n} matches" = { one = "{n} dopasowanie", few = "{n} dopasowania", many = "{n} dopasowań", other = "{n} dopasowań" }
+"{n} min" = "{n} min"
+"{n} minutes ago" = { one = "{n} minutę temu", few = "{n} minuty temu", many = "{n} minut temu", other = "{n} minut temu" }
+"{n} months ago" = { one = "{n} miesiąc temu", few = "{n} miesiące temu", many = "{n} miesięcy temu", other = "{n} miesięcy temu" }
+"{n} more notes omitted from this report" = { one = "Pominięto jeszcze {n} notatkę w tym raporcie", few = "Pominięto jeszcze {n} notatki w tym raporcie", many = "Pominięto jeszcze {n} notatek w tym raporcie", other = "Pominięto jeszcze {n} notatek w tym raporcie" }
+"{n} of {total}" = "{n} z {total}"
+"{n} people joined" = { one = "Dołączyła {n} osoba", few = "Dołączyły {n} osoby", many = "Dołączyło {n} osób", other = "Dołączyło {n} osób" }
+"{n} preferred components" = { one = "{n} preferowany komponent", few = "{n} preferowane komponenty", many = "{n} preferowanych komponentów", other = "{n} preferowanych komponentów" }
+"{n} ready" = { one = "{n} gotowy", few = "{n} gotowe", many = "{n} gotowych", other = "{n} gotowych" }
+"{n} removed" = { one = "Usunięto {n}", few = "Usunięto {n}", many = "Usunięto {n}", other = "Usunięto {n}" }
+"{n} replies" = { one = "{n} odpowiedź", few = "{n} odpowiedzi", many = "{n} odpowiedzi", other = "{n} odpowiedzi" }
+"{n} rows" = { one = "{n} wiersz", few = "{n} wiersze", many = "{n} wierszy", other = "{n} wierszy" }
+"{n} styles" = { one = "{n} styl", few = "{n} style", many = "{n} stylów", other = "{n} stylów" }
+"{n} text layers" = { one = "{n} warstwa tekstowa", few = "{n} warstwy tekstowe", many = "{n} warstw tekstowych", other = "{n} warstw tekstowych" }
+"{n} variables" = { one = "{n} zmienna", few = "{n} zmienne", many = "{n} zmiennych", other = "{n} zmiennych" }
+"{n} votes" = { one = "{n} głos", few = "{n} głosy", many = "{n} głosów", other = "{n} głosu" }
+"{n} votes left" = { one = "Pozostał {n} głos", few = "Pozostały {n} głosy", many = "Pozostało {n} głosów", other = "Pozostało {n} głosu" }
+"{n} weeks ago" = { one = "{n} tydzień temu", few = "{n} tygodnie temu", many = "{n} tygodni temu", other = "{n} tygodni temu" }
+"{n} years ago" = { one = "{n} rok temu", few = "{n} lata temu", many = "{n} lat temu", other = "{n} lat temu" }
+"{n}d" = "{n} d"
+"{n}h" = "{n} godz."
+"{n}m" = "{n} min"
+"{n}w" = "{n} tyg."
+"{page}, nothing selected" = "{page}, nic nie zaznaczono"
+"{percent}%" = "{percent}%"
+"{profile} (current)" = "{profile} (bieżący)"
+"{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} to jej wartość; {property ? \"a\" : \"b\"} wybiera tekst. Pozostałe wyrażenia {…} pozostają bez zmian."
+"{server} can't say what became of your files (it is older than this app)." = "{server} nie może określić stanu Twoich plików (jest starszy niż ta aplikacja)."
+"{server} · No longer on the server" = "{server} · Brak na serwerze"
+"{server} · {shared} · Opened {date}" = "{server} · {shared} · Otwarto {date}"
+"{tool}  hold {key}" = "{tool}  przytrzymaj {key}"
+"{value} isn't a colour" = "Wartość {value} nie jest kolorem"
+"{when} · edited" = "{when} · edytowano"
+"← ↑ → ↓" = "← ↑ → ↓"
+"← → ↑ ↓" = "← → ↑ ↓"
+"←" = "←"
+"→, Space or N" = "→, Spacja lub N"
+"↵" = "↵"
+"⇥ / ⇧⇥" = "⇥ / ⇧⇥"
+"⌘ arrows" = "⌘ strzałki"
+"⌘ click" = "⌘ kliknięcie"
+"⌘ scroll" = "⌘ przewijanie"
+"⌥ drag" = "⌥ przeciągnięcie"
+
+[commands]
+"align.bottom" = "Wyrównaj do dołu"
+"align.hcenter" = "Wyrównaj poziomo do środka"
+"align.left" = "Wyrównaj do lewej"
+"align.right" = "Wyrównaj do prawej"
+"align.top" = "Wyrównaj do góry"
+"align.vcenter" = "Wyrównaj pionowo do środka"
+"annotation.add" = "Dodaj adnotację"
+"annotation.addCategory" = "Dodaj kategorię adnotacji"
+"annotation.categories" = "Kategorie adnotacji"
+"annotation.edit" = "Edytuj adnotację"
+"annotation.editCategory" = "Edytuj kategorię adnotacji"
+"annotation.list" = "Lista adnotacji"
+"annotation.remove" = "Usuń adnotację"
+"annotation.removeCategory" = "Usuń kategorię adnotacji"
+"app.actions" = "Akcje"
+"app.preferences" = "Preferencje"
+"arrange.back" = "Przesuń na sam spód"
+"arrange.backward" = "Przesuń do tyłu"
+"arrange.forward" = "Przesuń do przodu"
+"arrange.front" = "Przesuń na sam wierzch"
+"arrange.packH" = "Upakuj w poziomie"
+"arrange.packV" = "Upakuj w pionie"
+"arrange.reorder" = "Zmień kolejność zaznaczenia"
+"arrange.roundToPixels" = "Zaokrąglij do pikseli"
+"arrange.spacing" = "Odstępy"
+"arrange.tidy" = "Uporządkuj"
+"board.connector" = "Łącznik"
+"board.ink" = "Pociągnięcie markera"
+"board.label" = "Etykieta łącznika"
+"board.nextSticky" = "Następna karteczka"
+"board.reattach" = "Podłącz łącznik ponownie"
+"board.setColor" = "Kolor na tablicy"
+"board.setStyle" = "Styl na tablicy"
+"board.shape" = "Kształt z tekstem"
+"board.stamp" = "Pieczątka"
+"board.sticky" = "Karteczka"
+"board.table" = "Tabela"
+"board.tableEdit" = "Edytuj tabelę"
+"board.template" = "Szablon tablicy"
+"board.templates" = "Lista szablonów tablicy"
+"board.timer" = "Minutnik"
+"board.timerState" = "Stan minutnika"
+"board.vote" = "Głosowanie"
+"board.voteResults" = "Wyniki głosowania"
+"bool.exclude" = "Wyklucz zaznaczenie"
+"bool.flatten" = "Spłaszcz operację logiczną"
+"bool.intersect" = "Część wspólna zaznaczenia"
+"bool.subtract" = "Odejmij zaznaczenie"
+"bool.union" = "Połącz zaznaczenie"
+"branch.archive" = "Zarchiwizuj gałąź"
+"branch.create" = "Utwórz gałąź"
+"branch.list" = "Lista gałęzi"
+"branch.merge" = "Scal gałąź"
+"branch.open" = "Otwórz gałąź"
+"branch.review" = "Przejrzyj gałąź"
+"branch.updateFromMain" = "Zaktualizuj z gałęzi głównej"
+"codeConnect.export" = "Eksportuj połączenia kodu"
+"codeConnect.import" = "Importuj połączenia kodu"
+"codeConnect.remove" = "Odłącz od kodu"
+"codeConnect.set" = "Połącz z kodem"
+"collab.cursor" = "Pokaż kursor na pozycji"
+"collab.cursorChat" = "Czat kursora"
+"collab.diff" = "Pokaż zmiany synchronizacji"
+"collab.files" = "Twoje pliki online"
+"collab.follow" = "Obserwuj"
+"collab.forgetFile" = "Zapomnij plik online"
+"collab.host" = "Rozpocznij sesję na żywo"
+"collab.join" = "Dołącz do sesji na żywo"
+"collab.leave" = "Opuść sesję na żywo"
+"collab.manageFile" = "Zarządzaj opublikowanym plikiem"
+"collab.openFile" = "Otwórz plik online"
+"collab.peers" = "Osoby w tym pliku"
+"collab.publish" = "Opublikuj na serwerze"
+"collab.recoverFile" = "Odzyskaj plik online"
+"collab.registerLinks" = "Otwieraj linki z zaproszeniem w FigCraft"
+"collab.removePerson" = "Usuń z sesji"
+"collab.report" = "Zgłoś plik operatorowi serwera"
+"collab.serverInfo" = "Informacje o serwerze"
+"collab.share" = "Udostępnij z kodem dołączenia"
+"collab.spotlight" = "Wyróżnij mój widok"
+"collab.stop" = "Zatrzymaj sesję na żywo"
+"command.batch" = "Wykonaj serię poleceń"
+"comment.add" = "Dodaj komentarz"
+"comment.delete" = "Usuń komentarz"
+"comment.edit" = "Edytuj komentarz"
+"comment.link" = "Kopiuj link do komentarza"
+"comment.list" = "Lista komentarzy"
+"comment.markRead" = "Oznacz komentarz jako przeczytany"
+"comment.move" = "Przenieś komentarz"
+"comment.next" = "Następny komentarz"
+"comment.open" = "Otwórz komentarz"
+"comment.people" = "Osoby w komentarzach"
+"comment.react" = "Zareaguj na komentarz"
+"comment.reply" = "Odpowiedz na komentarz"
+"comment.resolve" = "Rozwiąż komentarz"
+"comment.zoom" = "Powiększ do komentarzy"
+"component.addProperty" = "Dodaj właściwość komponentu"
+"component.addVariant" = "Dodaj wariant"
+"component.bindProperty" = "Powiąż warstwę z właściwością"
+"component.combineVariants" = "Połącz jako warianty"
+"component.create" = "Utwórz komponent"
+"component.createMultiple" = "Utwórz wiele komponentów"
+"component.deleteProperty" = "Usuń właściwość komponentu"
+"component.detach" = "Odłącz instancję"
+"component.editProperty" = "Edytuj właściwość komponentu"
+"component.exposeInstance" = "Udostępnij zagnieżdżoną instancję"
+"component.goToMain" = "Przejdź do głównego komponentu"
+"component.hideWhenPublishing" = "Ukryj podczas publikowania"
+"component.list" = "Lista komponentów"
+"component.makeSlot" = "Utwórz gniazdo (Slot)"
+"component.playground" = "Środowisko testowe komponentu (Playground)"
+"component.properties" = "Właściwości komponentu"
+"component.pushChanges" = "Zastosuj zmiany w głównym komponencie"
+"component.removeSlot" = "Usuń gniazdo"
+"component.resetInstance" = "Zresetuj wszystkie zmiany"
+"component.resetOverride" = "Zresetuj zmianę"
+"component.restoreMain" = "Przywróć główny komponent"
+"dev.compare" = "Porównaj zmiany"
+"dev.focus" = "Widok skupienia"
+"dev.resolveChange" = "Rozwiąż zmianę"
+"dev.unfocus" = "Wyjdź z widoku skupienia"
+"devMode.addMeasurement" = "Dodaj pomiar"
+"devMode.measurements" = "Lista pomiarów"
+"devMode.removeMeasurement" = "Usuń pomiar"
+"devResource.add" = "Dodaj zasób programistyczny"
+"devResource.edit" = "Edytuj zasób programistyczny"
+"devResource.list" = "Lista zasobów programistycznych"
+"devResource.remove" = "Usuń zasób programistyczny"
+"distribute.horizontal" = "Rozmieść równe odstępy poziome"
+"distribute.vertical" = "Rozmieść równe odstępy pionowe"
+"doc.home" = "Ekran główny"
+"doc.list" = "Lista dokumentów"
+"doc.nextTab" = "Następna karta"
+"doc.previousTab" = "Poprzednia karta"
+"doc.switch" = "Przełącz dokument"
+"edit.copy" = "Kopiuj"
+"edit.copyAsCss" = "Kopiuj jako CSS"
+"edit.copyAsPng" = "Kopiuj jako PNG"
+"edit.copyAsSvg" = "Kopiuj jako SVG"
+"edit.copyAsText" = "Kopiuj jako tekst"
+"edit.copyLink" = "Kopiuj łącze do zaznaczenia"
+"edit.copyProperties" = "Kopiuj właściwości"
+"edit.cut" = "Wytnij"
+"edit.delete" = "Usuń"
+"edit.duplicate" = "Powiel"
+"edit.findReplace" = "Znajdź i zamień…"
+"edit.paste" = "Wklej"
+"edit.pasteDesignLayers" = "Wklej warstwy projektu"
+"edit.pasteOver" = "Wklej na zaznaczenie"
+"edit.pasteProperties" = "Wklej właściwości"
+"edit.pasteReplace" = "Wklej, aby zastąpić"
+"edit.pickColor" = "Wybierz kolor"
+"edit.redo" = "Ponów"
+"edit.repeat" = "Powtórz ostatnie polecenie"
+"edit.setDefaultProperties" = "Ustaw właściwości domyślne"
+"edit.undo" = "Cofnij"
+"effect.add" = "Dodaj efekt"
+"effect.move" = "Przenieś efekt"
+"effect.remove" = "Usuń efekt"
+"effect.set" = "Ustaw efekt"
+"export.add" = "Dodaj ustawienie eksportu"
+"export.remove" = "Usuń ustawienie eksportu"
+"export.update" = "Edytuj ustawienie eksportu"
+"file.close" = "Zamknij kartę"
+"file.colorProfile" = "Profil kolorów"
+"file.duplicate" = "Powiel plik"
+"file.export" = "Eksportuj…"
+"file.exportFramesPdf" = "Eksportuj ramki do PDF"
+"file.exportLayers" = "Eksportuj warstwy"
+"file.exportSvg" = "Eksportuj zaznaczenie jako SVG"
+"file.import" = "Importuj z pliku…"
+"file.moveTab" = "Przenieś kartę"
+"file.new" = "Nowy plik projektu"
+"file.newBoard" = "Nowa tablica"
+"file.newFromTemplate" = "Nowy z szablonu"
+"file.open" = "Otwórz…"
+"file.openRecent" = "Otwórz ostatnie"
+"file.placeImage" = "Umieść obraz"
+"file.recover" = "Odzyskaj plik"
+"file.rename" = "Zmień nazwę pliku"
+"file.revert" = "Przywróć do zapisanego"
+"file.save" = "Zapisz"
+"file.saveAs" = "Zapisz jako…"
+"file.saveVersion" = "Zapisz w historii wersji…"
+"file.versionHistory" = "Pokaż historię wersji"
+"fill.add" = "Dodaj wypełnienie"
+"fill.move" = "Przenieś wypełnienie"
+"fill.pattern" = "Wypełnienie wzorem"
+"fill.remove" = "Usuń wypełnienie"
+"fill.set" = "Ustaw wypełnienie"
+"frame.create" = "Utwórz ramkę"
+"frame.presets" = "Lista presetów ramek"
+"frame.swapOrientation" = "Zmień orientację ramki"
+"grid.add" = "Dodaj siatkę układu"
+"grid.move" = "Przenieś siatkę układu"
+"grid.remove" = "Usuń siatkę układu"
+"guide.add" = "Dodaj prowadnicę"
+"guide.clear" = "Wyczyść prowadnice"
+"guide.move" = "Przesuń prowadnicę"
+"guide.remove" = "Usuń prowadnicę"
+"guide.select" = "Zaznacz prowadnicę"
+"help.about" = "O programie FigCraft"
+"help.gettingStarted" = "Wprowadzenie"
+"help.page" = "Strona pomocy"
+"help.shortcuts" = "Skróty klawiszowe"
+"image.adjust" = "Dostosuj obraz"
+"image.deletePreset" = "Usuń preset obrazu"
+"image.place" = "Umieść obraz"
+"image.presets" = "Presety obrazów"
+"image.savePreset" = "Zapisz preset obrazu"
+"inspect.assets" = "Zasoby do inspekcji"
+"inspect.code" = "Kod warstwy"
+"inspect.componentCode" = "Kod komponentu"
+"inspect.properties" = "Właściwości do inspekcji"
+"inspect.readyForDev" = "Gotowe do wdrożenia"
+"instance.create" = "Utwórz instancję"
+"instance.exposed" = "Udostępnione zagnieżdżone instancje"
+"instance.place" = "Umieść instancję"
+"instance.resetSlot" = "Zresetuj gniazdo"
+"instance.setProperties" = "Ustaw właściwości instancji"
+"instance.slotInsert" = "Wstaw do gniazda"
+"instance.swap" = "Podmień instancję"
+"instance.swapAt" = "Podmień instancję w punkcie"
+"layers.collapseAll" = "Zwiń wszystkie warstwy"
+"layout.add" = "Dodaj automatyczny układ"
+"layout.remove" = "Usuń automatyczny układ"
+"layout.setTrack" = "Ustaw rozmiar linii siatki"
+"layout.suggest" = "Sugeruj automatyczny układ"
+"libraries.open" = "Biblioteki"
+"libraries.publish" = "Publikuj bibliotekę…"
+"library.acceptUpdates" = "Zaakceptuj aktualizacje biblioteki"
+"library.add" = "Dodaj bibliotekę"
+"library.aliasVariable" = "Utwórz alias zmiennej biblioteki"
+"library.applyStyle" = "Zastosuj styl biblioteki"
+"library.bindVariable" = "Powiąż zmienną biblioteki"
+"library.extendCollection" = "Rozszerz kolekcję biblioteki"
+"library.import" = "Importuj komponent biblioteki"
+"library.importVariable" = "Importuj zmienną biblioteki"
+"library.list" = "Lista bibliotek"
+"library.place" = "Umieść komponent biblioteki"
+"library.publish" = "Opublikuj bibliotekę"
+"library.publishToServer" = "Opublikuj bibliotekę na serwerze"
+"library.remove" = "Usuń bibliotekę"
+"library.setVariableMode" = "Ustaw tryb zmiennej biblioteki"
+"library.swap" = "Podmień bibliotekę"
+"library.swapAt" = "Podmień instancję na komponent biblioteki"
+"library.updates" = "Aktualizacje biblioteki"
+"library.usage" = "Użycie biblioteki"
+"measure.distances" = "Zmierz odległości"
+"measure.padding" = "Zmierz marginesy automatycznego układu"
+"node.create" = "Utwórz warstwę"
+"node.get" = "Pobierz warstwę"
+"node.reorder" = "Zmień kolejność warstwy"
+"node.reparent" = "Przenieś warstwę do"
+"node.set" = "Ustaw właściwości"
+"object.batchRename" = "Zmień nazwy wsadowo…"
+"object.convertToFrame" = "Konwertuj na ramkę"
+"object.convertToGroup" = "Konwertuj na grupę"
+"object.convertToSection" = "Konwertuj na sekcję"
+"object.flipH" = "Odbij w poziomie"
+"object.flipV" = "Odbij w pionie"
+"object.frameSelection" = "Umieść zaznaczenie w ramce"
+"object.group" = "Grupuj zaznaczenie"
+"object.hideOthers" = "Ukryj pozostałe warstwy"
+"object.mask" = "Użyj jako maski"
+"object.moveToPage" = "Przenieś na stronę"
+"object.opacityKeys" = "Krycie z klawiatury numerycznej"
+"object.rasterize" = "Rasteryzuj zaznaczenie"
+"object.releaseMask" = "Zwolnij maskę"
+"object.removeFill" = "Usuń wypełnienie"
+"object.removeFrame" = "Usuń ramkę"
+"object.removeStroke" = "Usuń obrys"
+"object.rename" = "Zmień nazwę"
+"object.resizeToFit" = "Dopasuj rozmiar do zawartości"
+"object.rotate180" = "Obróć o 180°"
+"object.rotateLeft" = "Obróć o 90° w lewo"
+"object.rotateRight" = "Obróć o 90° w prawo"
+"object.setThumbnail" = "Ustaw jako miniaturę"
+"object.swapFillStroke" = "Zamień wypełnienie i obrys"
+"object.toggleLock" = "Zablokuj/Odblokuj zaznaczenie"
+"object.toggleVisible" = "Pokaż/Ukryj zaznaczenie"
+"object.ungroup" = "Rozgrupuj zaznaczenie"
+"object.wrapInSection" = "Umieść w nowej sekcji"
+"page.add" = "Dodaj stronę"
+"page.delete" = "Usuń stronę"
+"page.duplicate" = "Powiel stronę"
+"page.list" = "Lista stron"
+"page.move" = "Przenieś stronę"
+"page.rename" = "Zmień nazwę strony"
+"page.select" = "Przejdź do strony"
+"page.setBackground" = "Tło strony"
+"paint.documentColors" = "Kolory dokumentu"
+"plugin.close" = "Zamknij panel wtyczki"
+"plugin.directory.install" = "Zainstaluj wtyczkę z katalogu"
+"plugin.directory.list" = "Przeglądaj katalog wtyczek"
+"plugin.directory.publish" = "Opublikuj wtyczkę w katalogu"
+"plugin.directory.unpublish" = "Wycofaj wtyczkę z katalogu"
+"plugin.event" = "Użyj kontrolki panelu wtyczki"
+"plugin.import" = "Importuj wtyczkę z manifestu…"
+"plugin.list" = "Lista wtyczek"
+"plugin.remove" = "Usuń wtyczkę"
+"plugin.run" = "Uruchom wtyczkę"
+"plugin.ui" = "Panel wtyczki"
+"plugins.manage" = "Zarządzaj wtyczkami…"
+"plugins.runLast" = "Uruchom ponownie ostatnią wtyczkę"
+"pref.autoSave" = "Zapisuj pliki automatycznie"
+"pref.highlightHover" = "Podświetlaj warstwy przy najechaniu myszą"
+"pref.keepTool" = "Zachowaj wybrane narzędzie po użyciu"
+"pref.language" = "Język interfejsu"
+"pref.nudge" = "Wartości przesunięcia (Nudge)"
+"pref.numberKeysOpacity" = "Klawisze numeryczne zmieniają krycie"
+"pref.publishServer" = "Serwer do udostępniania online"
+"pref.reduceMotion" = "Ogranicz animacje"
+"pref.renameDuplicates" = "Zmieniaj nazwy duplikatów"
+"pref.showDimensions" = "Pokazuj wymiary przy zaznaczeniu"
+"pref.startOnHome" = "Rozpoczynaj od ekranu głównego"
+"pref.uiScale" = "Rozmiar interfejsu"
+"pref.userName" = "Twoja nazwa w komentarzach"
+"proto.action.add" = "Dodaj akcję prototypu"
+"proto.action.move" = "Zmień kolejność akcji prototypu"
+"proto.action.remove" = "Usuń akcję prototypu"
+"proto.action.set" = "Edytuj akcję prototypu"
+"proto.closePreview" = "Zamknij podgląd prototypu"
+"proto.conditional.addBlock" = "Dodaj else if / else"
+"proto.conditional.removeBlock" = "Usuń if / else if / else"
+"proto.conditional.setCondition" = "Edytuj warunek"
+"proto.evaluate" = "Oblicz wyrażenie prototypu"
+"proto.flow.add" = "Dodaj punkt początkowy przepływu"
+"proto.flow.remove" = "Usuń przepływ"
+"proto.flow.rename" = "Zmień nazwę przepływu"
+"proto.interaction.add" = "Dodaj interakcję"
+"proto.interaction.clear" = "Usuń wszystkie interakcje"
+"proto.interaction.remove" = "Usuń interakcję"
+"proto.interaction.set" = "Edytuj interakcję"
+"proto.present" = "Prezentuj"
+"proto.presentOptions" = "Opcje prezentacji"
+"proto.preview" = "Otwórz podgląd prototypu"
+"proto.settings" = "Ustawienia prototypu"
+"section.toggleContents" = "Ukryj/Pokaż zawartość sekcji"
+"select.add" = "Dodaj do zaznaczenia"
+"select.all" = "Zaznacz wszystko"
+"select.area" = "Zaznacz obszar"
+"select.byName" = "Zaznacz warstwy po nazwie"
+"select.children" = "Zaznacz elementy podrzędne"
+"select.inverse" = "Odwróć zaznaczenie"
+"select.layersAt" = "Warstwy w punkcie"
+"select.matching" = "Zaznacz pasujące warstwy"
+"select.next" = "Zaznacz następną warstwę"
+"select.none" = "Odznacz wszystko"
+"select.parent" = "Zaznacz element nadrzędny"
+"select.previous" = "Zaznacz poprzednią warstwę"
+"select.remove" = "Usuń z zaznaczenia"
+"select.sameEffect" = "Zaznacz elementy z takim samym efektem"
+"select.sameFill" = "Zaznacz elementy z takim samym wypełnieniem"
+"select.sameFont" = "Zaznacz elementy z taką samą czcionką"
+"select.sameInstance" = "Zaznacz taką samą instancję"
+"select.sameProperties" = "Zaznacz elementy z takimi samymi właściwościami"
+"select.sameStroke" = "Zaznacz elementy z takim samym obrysem"
+"select.sameText" = "Zaznacz elementy z takimi samymi właściwościami tekstu"
+"select.set" = "Zaznacz"
+"selection.applyColorStyle" = "Zastosuj styl koloru do zaznaczenia"
+"selection.bindColorVariable" = "Zastosuj zmienną koloru do zaznaczenia"
+"selection.colors" = "Kolory zaznaczenia"
+"selection.detachColor" = "Odłącz kolor zaznaczenia"
+"selection.selectColor" = "Zaznacz warstwy z kolorem"
+"selection.setPaint" = "Zmień kolor zaznaczenia"
+"shape.arrow" = "Strzałka"
+"shape.ellipse" = "Elipsa"
+"shape.line" = "Linia"
+"shape.polygon" = "Wielokąt"
+"shape.rectangle" = "Prostokąt"
+"shape.star" = "Gwiazda"
+"shapeBuilder.merge" = "Połącz obszary kształtów"
+"shapeBuilder.mode" = "Tryb generatora kształtów"
+"shapeBuilder.regions" = "Obszary generatora kształtów"
+"shapeBuilder.remove" = "Usuń obszary"
+"stroke.add" = "Dodaj obrys"
+"stroke.brush" = "Pędzel"
+"stroke.move" = "Przenieś obrys"
+"stroke.remove" = "Usuń obrys"
+"stroke.set" = "Ustaw obrys"
+"stroke.widthProfile" = "Profil grubości"
+"style.apply" = "Zastosuj styl"
+"style.bind" = "Powiąż zmienną w stylu"
+"style.create" = "Utwórz styl"
+"style.delete" = "Usuń styl"
+"style.detach" = "Odłącz styl"
+"style.duplicate" = "Powiel styl"
+"style.list" = "Lista stylów"
+"style.move" = "Przenieś style"
+"style.renameFolder" = "Zmień nazwę folderu stylów"
+"style.update" = "Edytuj styl"
+"template.list" = "Lista szablonów"
+"text.alignCenter" = "Wyrównaj tekst do środka"
+"text.alignJustify" = "Wyjustuj tekst"
+"text.alignLeft" = "Wyrównaj tekst do lewej"
+"text.alignRight" = "Wyrównaj tekst do prawej"
+"text.bold" = "Pogrubienie"
+"text.bulletList" = "Lista punktowana"
+"text.case" = "Wielkość liter"
+"text.caseLower" = "Małe litery"
+"text.caseOriginal" = "Oryginalna wielkość liter"
+"text.caseSmallCaps" = "Kapitaliki"
+"text.caseTitle" = "Jak nazwy własne"
+"text.caseUpper" = "Wielkie litery"
+"text.create" = "Tekst"
+"text.decoration" = "Dekoracja tekstu"
+"text.edit.begin" = "Edytuj tekst"
+"text.edit.caret" = "Ustaw kursor tekstu"
+"text.edit.end" = "Zakończ edycję tekstu"
+"text.edit.insert" = "Wpisz tekst"
+"text.edit.key" = "Klawisz tekstu"
+"text.edit.preedit" = "Redaguj tekst"
+"text.edit.selectLine" = "Zaznacz wiersz"
+"text.edit.selectWord" = "Zaznacz słowo"
+"text.edit.selection" = "Zaznaczenie tekstu"
+"text.endPreview" = "Zakończ podgląd tekstu"
+"text.fonts" = "Lista czcionek"
+"text.italic" = "Kursywa"
+"text.lineHeightDown" = "Zmniejsz interlinię"
+"text.lineHeightUp" = "Zwiększ interlinię"
+"text.link" = "Wstaw łącze"
+"text.listIndent" = "Zwiększ wcięcie listy"
+"text.listOutdent" = "Zmniejsz wcięcie listy"
+"text.listStyle" = "Styl listy"
+"text.loadFont" = "Wczytaj plik czcionki"
+"text.maxLines" = "Maksymalna liczba wierszy"
+"text.missingFonts" = "Brakujące czcionki"
+"text.numberList" = "Lista numerowana"
+"text.onPath" = "Tekst na ścieżce"
+"text.paragraphIndent" = "Wcięcie akapitu"
+"text.paragraphSpacing" = "Odstęp między akapitami"
+"text.pathOptions" = "Opcje ścieżki tekstu"
+"text.preview" = "Podgląd zmiany tekstu"
+"text.refit" = "Dopasuj tekst do czcionek"
+"text.removeFromPath" = "Usuń tekst ze ścieżki"
+"text.rescanFonts" = "Wyszukaj ponownie zainstalowane czcionki"
+"text.set" = "Ustaw tekst"
+"text.setFeatures" = "Funkcje OpenType"
+"text.setVariations" = "Osie czcionki zmiennej (Variable Font)"
+"text.sizeDown" = "Zmniejsz rozmiar czcionki"
+"text.sizeUp" = "Zwiększ rozmiar czcionki"
+"text.strikethrough" = "Przekreślenie"
+"text.style" = "Zastosuj styl do fragmentu tekstu"
+"text.trackingDown" = "Zmniejsz odstęp między literami"
+"text.trackingUp" = "Zwiększ odstęp między literami"
+"text.underline" = "Podkreślenie"
+"text.weightDown" = "Zmniejsz grubość czcionki"
+"text.weightUp" = "Zwiększ grubość czcionki"
+"tool.arrow" = "Strzałka"
+"tool.comment" = "Komentarz"
+"tool.connector" = "Łącznik"
+"tool.ellipse" = "Elipsa"
+"tool.eraser" = "Gumka"
+"tool.frame" = "Ramka"
+"tool.hand" = "Rączka"
+"tool.highlighter" = "Zakreślacz"
+"tool.line" = "Linia"
+"tool.marker" = "Marker"
+"tool.move" = "Wskaźnik"
+"tool.pen" = "Pióro"
+"tool.pencil" = "Ołówek"
+"tool.pencilBrush" = "Pędzel ołówka"
+"tool.place" = "Umieść za pomocą narzędzia"
+"tool.polygon" = "Wielokąt"
+"tool.rectangle" = "Prostokąt"
+"tool.scale" = "Skalowanie"
+"tool.scaleAnchor" = "Punkt zaczepienia skalowania"
+"tool.section" = "Sekcja"
+"tool.set" = "Wybierz narzędzie"
+"tool.shape" = "Kształty"
+"tool.shapeBuilder" = "Generator kształtów"
+"tool.slice" = "Plaster"
+"tool.stamp" = "Pieczątka"
+"tool.star" = "Gwiazda"
+"tool.sticky" = "Karteczka"
+"tool.text" = "Tekst"
+"transform.move" = "Przenieś"
+"transform.moveTo" = "Przenieś do"
+"transform.nudge" = "Przesuń o krok (Nudge)"
+"transform.nudgeSize" = "Zmień rozmiar o krok"
+"transform.resize" = "Zmień rozmiar"
+"transform.rotate" = "Obróć"
+"transform.rotationOrigin" = "Przesuń punkt obrotu"
+"transform.scale" = "Skaluj"
+"transform.setRotationOrigin" = "Ustaw punkt obrotu"
+"variable.addMode" = "Dodaj tryb"
+"variable.bind" = "Powiąż zmienną"
+"variable.create" = "Utwórz zmienną"
+"variable.createCollection" = "Utwórz kolekcję zmiennych"
+"variable.delete" = "Usuń zmienną"
+"variable.deleteCollection" = "Usuń kolekcję"
+"variable.duplicate" = "Powiel zmienną"
+"variable.export" = "Eksportuj zmienne"
+"variable.import" = "Importuj zmienne"
+"variable.list" = "Lista zmiennych"
+"variable.moveMode" = "Przenieś tryb"
+"variable.removeMode" = "Usuń tryb"
+"variable.renameCollection" = "Zmień nazwę kolekcji"
+"variable.renameMode" = "Zmień nazwę trybu"
+"variable.resetOverride" = "Zresetuj nadpisanie zmiennej"
+"variable.set" = "Ustaw wartość zmiennej"
+"variable.setMode" = "Ustaw tryb zmiennej"
+"variable.update" = "Edytuj zmienną"
+"vector.create" = "Wektor"
+"vector.deleteHeal" = "Usuń punkt i napraw zaznaczenie"
+"vector.edit.addVertex" = "Dodaj punkt"
+"vector.edit.begin" = "Edytuj wektor"
+"vector.edit.bend" = "Zegnij segment"
+"vector.edit.bounds" = "Granice zaznaczonych punktów"
+"vector.edit.connect" = "Połącz punkty"
+"vector.edit.cornerRadius" = "Promień zaokrąglenia punktu"
+"vector.edit.cut" = "Rozetnij ścieżkę"
+"vector.edit.delete" = "Usuń punkty"
+"vector.edit.end" = "Zakończ edycję"
+"vector.edit.erase" = "Wymaż"
+"vector.edit.lasso" = "Zaznacz lasso"
+"vector.edit.mirroring" = "Symetria uchwytów"
+"vector.edit.moveHandles" = "Przesuń uchwyty"
+"vector.edit.moveVertices" = "Przesuń punkty"
+"vector.edit.nudge" = "Przesuń punkty o krok"
+"vector.edit.paint" = "Wiadro z farbą"
+"vector.edit.pen" = "Punkt pióra"
+"vector.edit.penEnd" = "Zakończ ścieżkę pióra"
+"vector.edit.position" = "Pozycja punktu"
+"vector.edit.resize" = "Zmień rozmiar punktów"
+"vector.edit.rotate" = "Obróć punkty"
+"vector.edit.select" = "Zaznacz punkty"
+"vector.edit.selectAll" = "Zaznacz wszystkie punkty"
+"vector.edit.setHandle" = "Ustaw uchwyt"
+"vector.edit.smooth" = "Wygładź lub wyostrz punkty"
+"vector.edit.state" = "Stan edycji wektora"
+"vector.edit.strokeCap" = "Zakończenie obrysu punktu"
+"vector.edit.strokeJoin" = "Połączenie obrysu punktu"
+"vector.edit.tool" = "Narzędzie edycji wektora"
+"vector.edit.transform" = "Przekształć punkty"
+"vector.edit.widthPoint" = "Punkt szerokości"
+"vector.flatten" = "Spłaszcz do wektora"
+"vector.join" = "Połącz ścieżki"
+"vector.offset" = "Przesunięcie ścieżki (Offset)"
+"vector.outlineStroke" = "Przekształć obrys w ścieżkę"
+"vector.reverse" = "Odwróć kierunek ścieżki"
+"vector.simplify" = "Uprość wektor"
+"vector.smoothJoin" = "Płynne połączenie zaznaczenia"
+"version.autosave" = "Wersja autozapisu"
+"version.delete" = "Usuń wersję"
+"version.duplicate" = "Powiel wersję"
+"version.exitPreview" = "Powrót do bieżącej wersji"
+"version.list" = "Historia wersji"
+"version.preview" = "Wyświetl wersję"
+"version.rename" = "Zmień nazwę wersji"
+"version.restore" = "Przywróć wersję"
+"view.assets" = "Panel zasobów"
+"view.comments" = "Pokaż komentarze"
+"view.contextMenu" = "Pokaż menu kontekstowe"
+"view.design" = "Panel projektu"
+"view.designPrototype" = "Przełącz między Projektem a Prototypem"
+"view.devMode" = "Tryb programisty"
+"view.frameOutlines" = "Kontury ramek"
+"view.fullscreen" = "Tryb pełnoekranowy"
+"view.get" = "Pobierz widok"
+"view.layers" = "Panel warstw"
+"view.layoutGrids" = "Siatki układu"
+"view.leftSidebar" = "Pokaż/Ukryj lewy pasek boczny"
+"view.maskOutlines" = "Kontury masek"
+"view.multiplayerCursors" = "Kursory innych użytkowników"
+"view.nextFrame" = "Przejdź do następnej ramki"
+"view.nextPage" = "Następna strona"
+"view.nextRegion" = "Przejdź do następnego obszaru"
+"view.outlines" = "Pokaż kontury"
+"view.outlinesHiddenLayers" = "Pokaż kontury ukrytych warstw"
+"view.outlinesObjectBounds" = "Pokaż granice obiektów"
+"view.outlinesSelection" = "Pokaż kontury zaznaczenia"
+"view.pan" = "Przesuń widok"
+"view.panelWidths" = "Zresetuj szerokości paneli"
+"view.pixelGrid" = "Siatka pikseli"
+"view.pixelPreview" = "Podgląd pikseli"
+"view.prevFrame" = "Przejdź do poprzedniej ramki"
+"view.prevPage" = "Poprzednia strona"
+"view.previousRegion" = "Przejdź do poprzedniego obszaru"
+"view.proofSrgb" = "Symulacja sRGB (Soft-proof)"
+"view.prototype" = "Panel prototypu"
+"view.rulers" = "Linijki"
+"view.set" = "Ustaw widok"
+"view.slices" = "Plastry"
+"view.snapGeometry" = "Przyciągaj do geometrii"
+"view.snapObjects" = "Przyciągaj do obiektów"
+"view.snapPixel" = "Przyciągaj do pikseli"
+"view.themeDark" = "Ciemny motyw"
+"view.themeLight" = "Jasny motyw"
+"view.themeSystem" = "Motyw zgodny z systemem"
+"view.toggleUi" = "Pokaż/Ukryj interfejs"
+"view.zoom100" = "Powiększenie 100%"
+"view.zoom200" = "Powiększenie 200%"
+"view.zoom50" = "Powiększenie 50%"
+"view.zoomAt" = "Narzędzie lupy"
+"view.zoomFit" = "Dopasuj do ekranu"
+"view.zoomIn" = "Powiększ"
+"view.zoomOut" = "Pomniejsz"
+"view.zoomSelection" = "Powiększ do zaznaczenia"
+"widget.click" = "Kliknij widżet"
+"widget.insert" = "Wstaw widżet"
+"widget.list" = "Lista widżetów"
+"widget.menu" = "Menu widżetu"
+"widget.setText" = "Edytuj pole widżetu"
+"window.focus" = "Przesuń okno na wierzch"
+"window.new" = "Nowe okno"
+
+[menu]
+"bool.exclude" = "Wyklucz"
+"bool.flatten" = "Spłaszcz"
+"bool.intersect" = "Część wspólna"
+"bool.subtract" = "Odejmij"
+"bool.union" = "Połącz"
+"file.duplicate" = "Powiel"
+"file.import" = "Importuj z pliku…"
+"file.rename" = "Zmień nazwę"
+"libraries.open" = "Otwórz biblioteki"
+"select.sameEffect" = "Efekt"
+"select.sameFill" = "Wypełnienie"
+"select.sameFont" = "Czcionka"
+"select.sameInstance" = "Instancja"
+"select.sameProperties" = "Właściwości"
+"select.sameStroke" = "Obrys"
+"select.sameText" = "Właściwości tekstu"
+"text.alignCenter" = "Wyrównaj do środka"
+"text.alignJustify" = "Wyjustuj"
+"text.alignLeft" = "Wyrównaj do lewej"
+"text.alignRight" = "Wyrównaj do prawej"
+"view.assets" = "Zasoby"
+"view.design" = "Projekt"
+"view.layers" = "Warstwy"
+"view.outlines" = "Pokaż kontury"
+"view.outlinesHiddenLayers" = "Uwzględnij ukryte warstwy"
+"view.outlinesObjectBounds" = "Uwzględnij granice obiektów"
+"view.outlinesSelection" = "Pokaż kontury zaznaczenia"
+"view.prototype" = "Prototyp"
+"view.themeDark" = "Ciemny"
+"view.themeLight" = "Jasny"
+"view.themeSystem" = "Zgodny z systemem"
diff --git a/crates/ui-egui/locales/pt-BR.toml b/crates/ui-egui/locales/pt-BR.toml
index d4c75a1b..4c20c24a 100644
--- a/crates/ui-egui/locales/pt-BR.toml
+++ b/crates/ui-egui/locales/pt-BR.toml
@@ -16,6 +16,7 @@ status = "draft — needs native review"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} linhas (Δ {delta}), +{bin_added} / −{bin_deleted} arquivos binários, {first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Uma coleção deste arquivo com estes modos e variáveis: substitua os valores por modo e adicione variáveis próprias"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Já existe um arquivo .figcraft com este nome. Escolha o nome completo dele para confirmar a substituição."
 "A layer on its own aligns to its frame: select more layers, or one in a frame" = "Uma camada sozinha se alinha ao seu quadro: selecione mais camadas ou uma dentro de um quadro"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "Uma mola se move até se estabilizar: sua massa, rigidez e amortecimento definem a duração"
 "About" = "Sobre"
@@ -32,6 +33,7 @@ status = "draft — needs native review"
 "Add a description" = "Adicionar uma descrição"
 "Add a frame (F) or a shape (R) to get started" = "Adicione um quadro (F) ou uma forma (R) para começar"
 "Add a layer or component to tile first" = "Adicione primeiro uma camada ou um componente para o mosaico"
+"Add a minute" = "Adicionar um minuto"
 "Add a note for developers" = "Adicione uma nota para desenvolvedores"
 "Add action" = "Adicionar ação"
 "Add actions for when no condition holds" = "Adicionar ações para quando nenhuma condição for atendida"
@@ -39,6 +41,7 @@ status = "draft — needs native review"
 "Add another condition" = "Adicionar outra condição"
 "Add auto layout" = "Adicionar layout automático"
 "Add background behind overlay" = "Adicionar fundo atrás da sobreposição"
+"Add column" = "Adicionar coluna"
 "Add content to this slot" = "Adicionar conteúdo a este slot"
 "Add dev resource" = "Adicionar recurso de desenvolvimento"
 "Add effect" = "Adicionar efeito"
@@ -50,6 +53,7 @@ status = "draft — needs native review"
 "Add library file…" = "Adicionar arquivo de biblioteca…"
 "Add max height" = "Adicionar altura máx."
 "Add max width" = "Adicionar largura máx."
+"Add measurement" = "Adicionar medição"
 "Add min height" = "Adicionar altura mín."
 "Add min width" = "Adicionar largura mín."
 "Add mode" = "Adicionar modo"
@@ -57,6 +61,7 @@ status = "draft — needs native review"
 "Add or update collections from a variables JSON" = "Adicionar ou atualizar coleções a partir de um JSON de variáveis"
 "Add properties to make instances configurable" = "Adicione propriedades para tornar as instâncias configuráveis"
 "Add reaction" = "Adicionar reação"
+"Add row" = "Adicionar linha"
 "Add starting point" = "Adicionar ponto de partida"
 "Add stroke" = "Adicionar traço"
 "Add variant" = "Adicionar variante"
@@ -85,8 +90,13 @@ status = "draft — needs native review"
 "All comments" = "Todos os comentários"
 "All components" = "Todos os componentes"
 "All fonts" = "Todas as fontes"
+"All objects" = "Todos os objetos"
 "All supported properties" = "Todas as propriedades compatíveis"
 "All variables" = "Todas as variáveis"
+"Along the bottom" = "Ao longo da borda inferior"
+"Along the left" = "Ao longo da borda esquerda"
+"Along the right" = "Ao longo da borda direita"
+"Along the top" = "Ao longo da borda superior"
 "Alpha" = "Alfa"
 "Alt+drag" = "Alt+arrastar"
 "An invite link that opens FigCraft and joins" = "Um link de convite que abre o FigCraft e entra na sessão"
@@ -115,6 +125,7 @@ status = "draft — needs native review"
 "Archived" = "Arquivada"
 "Arrange" = "Organizar"
 "Arrow" = "Seta"
+"Arrow at the end" = "Seta no final"
 "As typed" = "Como digitado"
 "Asking the server…" = "Consultando o servidor…"
 "Assets" = "Recursos"
@@ -145,6 +156,7 @@ status = "draft — needs native review"
 "Basics" = "Básico"
 "Before" = "Antes"
 "Bend" = "Curvar"
+"Between the selected layers" = "Entre as camadas selecionadas"
 "Bevel" = "Chanfro"
 "Binary assets added" = "Arquivos binários adicionados"
 "Binary assets removed" = "Arquivos binários removidos"
@@ -162,6 +174,7 @@ status = "draft — needs native review"
 "Bottom" = "Embaixo"
 "Bottom left radius" = "Raio inferior esquerdo"
 "Bottom right radius" = "Raio inferior direito"
+"Brainstorm" = "Brainstorming"
 "Branch" = "Branch"
 "Branch archived" = "Branch arquivada"
 "Branch merged" = "Branch mesclada"
@@ -186,8 +199,12 @@ status = "draft — needs native review"
 "C or ⇧C" = "C ou ⇧C"
 "CMYK colour" = "Cor CMYK"
 "Can view" = "Pode visualizar"
+"Check" = "Visto"
 "Checking the server…" = "Verificando o servidor…"
+"Chevron" = "Divisa"
 "Clear from this list" = "Limpar desta lista"
+"Clear results" = "Limpar resultados"
+"Click objects to vote; click your badge to take a vote back" = "Clique nos objetos para votar; clique no seu selo para retirar um voto"
 "Code or invite link" = "Código ou link de convite"
 "Color profile: {name}" = "Perfil de cor: {name}"
 "CSS custom properties…" = "Propriedades personalizadas CSS…"
@@ -211,7 +228,7 @@ status = "draft — needs native review"
 "Changes on main" = "Alterações no principal"
 "Changes on the branch" = "Alterações na branch"
 "Changes unknown" = "Alterações desconhecidas"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "Escolha React, Leptos, SwiftUI, Compose ou Flutter acima para conectar este componente ao código dele."
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Escolha React, Leptos, Vue, SwiftUI, Compose, ArkUI ou Flutter acima para conectar este componente ao código dele."
 "Choose another profile to change it." = "Escolha outro perfil para alterá-lo."
 "Choose collection" = "Escolher coleção"
 "Choose image" = "Escolher imagem"
@@ -232,7 +249,6 @@ status = "draft — needs native review"
 "Close tab" = "Fechar aba"
 "Close version history" = "Fechar histórico de versões"
 "Close when clicking outside" = "Fechar ao clicar fora"
-"Close without saving" = "Fechar sem salvar"
 "Code" = "Código"
 "Code syntax" = "Sintaxe de código"
 "Collapse" = "Recolher"
@@ -259,6 +275,8 @@ status = "draft — needs native review"
 "Commits" = "Commits"
 "Company" = "Empresa"
 "Compare changes" = "Comparar alterações"
+"Compare with" = "Comparar com"
+"Compatibility notes" = "Notas de compatibilidade"
 "Completed" = "Concluído"
 "Component" = "Componente"
 "Component name" = "Nome do componente"
@@ -273,11 +291,11 @@ status = "draft — needs native review"
 "Connected" = "Conectado"
 "Connected to code: {from}" = "Conectado ao código: {from}"
 "Connection lost, reconnecting (attempt {attempt})…" = "Conexão perdida, reconectando (tentativa {attempt})…"
+"Connector" = "Conector"
 "Constrain proportions" = "Manter proporções"
 "Constraints" = "Restrições"
 "Content" = "Conteúdo"
 "Contents hidden" = "Conteúdo oculto"
-"Contents only" = "Somente o conteúdo"
 "Contextual alternates" = "Alternativas contextuais"
 "Contrast" = "Contraste"
 "Contributors" = "Colaboradores"
@@ -302,7 +320,9 @@ status = "draft — needs native review"
 "Corner smoothing" = "Suavização de cantos"
 "Couldn't download the variables" = "Não foi possível baixar as variáveis"
 "Couldn't reach {server}: showing what this computer remembers." = "Não foi possível alcançar {server}: mostrando o que este computador lembra."
+"Couldn't read {name}." = "Não foi possível ler {name}."
 "Couldn't save automatically: {error}" = "Não foi possível salvar automaticamente: {error}"
+"Couldn't save the file" = "Não foi possível salvar o arquivo"
 "Count" = "Quantidade"
 "Create" = "Criar"
 "Create a variable collection first" = "Crie primeiro uma coleção de variáveis"
@@ -325,6 +345,7 @@ status = "draft — needs native review"
 "Current version" = "Versão atual"
 "Cursor chat" = "Chat do cursor"
 "Custom" = "Personalizado"
+"Custom size" = "Tamanho personalizado"
 "Cut" = "Recortar"
 "Dark" = "Escuro"
 "Darken" = "Escurecer"
@@ -355,6 +376,7 @@ status = "draft — needs native review"
 "Description" = "Descrição"
 "Description (optional)" = "Descrição (opcional)"
 "Design" = "Design"
+"Design panel" = "Painel de design"
 "Desktop" = "Desktop"
 "Destination" = "Destino"
 "Detach alias" = "Desvincular alias"
@@ -365,6 +387,7 @@ status = "draft — needs native review"
 "Detach variable" = "Desvincular variável"
 "Details" = "Detalhes"
 "Dev Mode" = "Modo Dev"
+"Dev Mode only inspects: switch to Design (Shift+D) to edit" = "O modo Dev só inspeciona: mude para Design (Shift+D) para editar"
 "Dev resources" = "Recursos de desenvolvimento"
 "Development" = "Desenvolvimento"
 "Device" = "Dispositivo"
@@ -381,6 +404,7 @@ status = "draft — needs native review"
 "Distribute horizontal spacing" = "Distribuir espaçamento horizontal"
 "Distribute vertical spacing" = "Distribuir espaçamento vertical"
 "Divider" = "Divisor"
+"Don't Save" = "Não salvar"
 "Don't truncate" = "Não truncar"
 "Done" = "Concluído"
 "Done editing" = "Concluir edição"
@@ -411,6 +435,8 @@ status = "draft — needs native review"
 "Effect settings" = "Configurações do efeito"
 "Effect styles" = "Estilos de efeito"
 "Effects" = "Efeitos"
+"Curved" = "Curvo"
+"Elbow" = "Em ângulo"
 "Ellipse" = "Elipse"
 "Ellipses" = "Elipses"
 "Else" = "Senão"
@@ -419,6 +445,7 @@ status = "draft — needs native review"
 "Empty" = "Vazio"
 "End" = "Fim"
 "End point" = "Ponto final"
+"End vote" = "Encerrar votação"
 "Ends the session; everyone keeps their copy" = "Encerra a sessão; cada pessoa fica com a própria cópia"
 "Enter" = "Enter"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Digite o endereço de um figcraft-server e pressione Procurar para ver os plugins que ele oferece."
@@ -459,6 +486,7 @@ status = "draft — needs native review"
 "False" = "Falso"
 "Fetching from the server…" = "Buscando no servidor…"
 "FigCraft couldn't open its window: {error}" = "O FigCraft não conseguiu abrir a janela: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "O FigCraft ainda não oferece suporte a todos os recursos desses arquivos. As notas listam o que foi omitido ou alterado na cópia importada; o arquivo original não é alterado."
 "File" = "Arquivo"
 "File name" = "Nome do arquivo"
 "File published" = "Arquivo publicado"
@@ -491,6 +519,7 @@ status = "draft — needs native review"
 "Flip text to the other side" = "Passar o texto para o outro lado"
 "Flip vertical" = "Inverter verticalmente"
 "Flip width profile" = "Inverter perfil de largura"
+"Flow chart" = "Fluxograma"
 "Flow starting point" = "Ponto de partida do fluxo"
 "Flow starting points" = "Pontos de partida de fluxo"
 "Flows" = "Fluxos"
@@ -540,6 +569,7 @@ status = "draft — needs native review"
 "Hanging list" = "Lista com recuo deslocado"
 "Hanging punctuation" = "Pontuação pendente"
 "Hard light" = "Luz forte"
+"Heart" = "Coração"
 "Height" = "Altura"
 "Help" = "Ajuda"
 "Help and resources" = "Ajuda e recursos"
@@ -550,6 +580,7 @@ status = "draft — needs native review"
 "Hide from publishing" = "Não publicar"
 "Hide section contents" = "Ocultar conteúdo da seção"
 "Highlight layers on hover" = "Destacar camadas ao passar o cursor"
+"Highlighter" = "Marca-texto"
 "Highlights" = "Realces"
 "Hold Alt" = "Segure Alt"
 "Hold Alt+Z" = "Segure Alt+Z"
@@ -574,12 +605,16 @@ status = "draft — needs native review"
 "If" = "Se"
 "If {condition}" = "Se {condition}"
 "Ignore auto layout (absolute position)" = "Ignorar layout automático (posição absoluta)"
+"Ignore overlapping layers" = "Ignorar camadas sobrepostas"
 "Image" = "Imagem"
+"Images" = "Imagens"
 "Import" = "Importar"
 "Import path" = "Caminho de importação"
 "Import plugin from manifest" = "Importar plugin a partir do manifesto"
 "Import plugin from manifest…" = "Importar plugin a partir do manifesto…"
+"Import report" = "Relatório de importação"
 "Import variables" = "Importar variáveis"
+"Imported document" = "Documento importado"
 "Imported {name}" = "{name} importado"
 "Imported {n} new variables, updated {updated}" = { one = "{n} variável nova importada, {updated} atualizadas", other = "{n} variáveis novas importadas, {updated} atualizadas" }
 "Import…" = "Importar…"
@@ -607,11 +642,13 @@ status = "draft — needs native review"
 "Instance swap (no other component)" = "Troca de instância (nenhum outro componente)"
 "Instances" = "Instâncias"
 "Instant" = "Instantâneo"
+"Intensity" = "Brilho"
 "Interaction" = "Interação"
 "Interactions" = "Interações"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Design de interfaces e prototipagem. Uma ferramenta de design gratuita e de código aberto, com implementação independente (clean-room), escrita do zero em Rust, parte dos Crafting Apps da ArtCraft."
 "Intersect" = "Interseção"
 "Intersects" = "Interseções"
+"Invalid color" = "Cor inválida"
 "Invite link" = "Link de convite"
 "Invite link copied" = "Link de convite copiado"
 "It asks permission to:" = "Ele pede permissão para:"
@@ -627,6 +664,8 @@ status = "draft — needs native review"
 "Join|stroke" = "Junção"
 "Just now" = "Agora mesmo"
 "Justify" = "Justificar"
+"Kanban board" = "Quadro kanban"
+"Keep a measurement on the canvas for developers" = "Manter uma medição no canvas para desenvolvedores"
 "Keep appearance" = "Manter aparência"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Manter aparência converte cada valor de cor para {profile} para que as cores pareçam iguais. Manter valores deixa os números como estão, então as cores mudam."
 "Keep tool selected after use" = "Manter a ferramenta selecionada após o uso"
@@ -700,6 +739,7 @@ status = "draft — needs native review"
 "Mark as resolved" = "Marcar como resolvido"
 "Mark as unread" = "Marcar como não lido"
 "Mark as unresolved" = "Marcar como não resolvido"
+"Marker" = "Marcador"
 "Mask" = "Máscara"
 "Mass · Stiffness · Damping" = "Massa · Rigidez · Amortecimento"
 "Match (empty: the whole name)" = "Correspondência (vazio: o nome inteiro)"
@@ -708,6 +748,7 @@ status = "draft — needs native review"
 "Max lines" = "Máx. de linhas"
 "Maximize" = "Maximizar"
 "Measure to the selection" = "Medir até a seleção"
+"Measurements" = "Medições"
 "Merge into main" = "Mesclar no principal"
 "Merge regions" = "Mesclar regiões"
 "Merge the branch into the main file (one undo step) and archive it" = "Mescla a branch no arquivo principal (uma etapa de desfazer) e a arquiva"
@@ -716,6 +757,7 @@ status = "draft — needs native review"
 "Min H" = "Alt. mín."
 "Min W" = "Larg. mín."
 "Minimize" = "Minimizar"
+"Minutes" = "Minutos"
 "Mirror angle" = "Espelhar ângulo"
 "Mirror angle and length" = "Espelhar ângulo e comprimento"
 "Mirroring" = "Espelhamento"
@@ -756,7 +798,9 @@ status = "draft — needs native review"
 "Named instance" = "Instância nomeada"
 "Navigate to" = "Navegar para"
 "Nested instance" = "Instância aninhada"
+"New board" = "Novo quadro"
 "New design file" = "Novo arquivo de design"
+"Next frame" = "Próximo quadro"
 "Next or previous control in the focused region" = "Controle seguinte ou anterior na região em foco"
 "Next ready for dev" = "Próximo pronto para dev"
 "Next size option" = "Próxima opção de tamanho"
@@ -766,12 +810,15 @@ status = "draft — needs native review"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "Nenhuma branch. Uma branch é uma cópia do arquivo para testar alterações e depois revisá-las e mesclá-las."
 "No category" = "Sem categoria"
 "No changes" = "Nenhuma alteração"
+"No color styles" = "Nenhum estilo de cor"
 "No colour variables fit here." = "Nenhuma variável de cor se encaixa aqui."
 "No colour variables yet. Create them in Local variables." = "Ainda não há variáveis de cor. Crie-as em Variáveis locais."
 "No comments yet" = "Ainda não há comentários"
+"No compatibility warnings reported" = "Nenhum aviso de compatibilidade relatado"
 "No components yet. Select layers and press {keys}." = "Ainda não há componentes. Selecione camadas e pressione {keys}."
 "No conflicts." = "Nenhum conflito."
 "No contributor data was built into this copy." = "Esta cópia não inclui dados de colaboradores."
+"No device" = "Nenhum dispositivo"
 "No fonts match" = "Nenhuma fonte corresponde"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Não há código de acesso aqui (o servidor é anterior aos códigos de acesso, ou este endereço não cabe em um): compartilhe o link."
 "No layer changes to show." = "Nenhuma alteração de camada para mostrar."
@@ -802,6 +849,7 @@ status = "draft — needs native review"
 "No text styles yet. Click + to create one from the selected text." = "Ainda não há estilos de texto. Clique em + para criar um a partir do texto selecionado."
 "No variables fit here." = "Nenhuma variável se encaixa aqui."
 "No variables yet. Create them in Local variables." = "Ainda não há variáveis. Crie-as em Variáveis locais."
+"No votes yet" = "Nenhum voto ainda"
 "Nobody else is here yet" = "Ainda não há mais ninguém aqui"
 "Noise" = "Ruído"
 "None" = "Nenhum"
@@ -814,6 +862,7 @@ status = "draft — needs native review"
 "Not read yet" = "Ainda não lido"
 "Not shared" = "Não compartilhado"
 "Note {n}" = "Nota {n}"
+"Nothing changed since this version." = "Nada mudou desde esta versão."
 "Nothing changed since this was marked ready for dev." = "Nada mudou desde que isto foi marcado como pronto para dev."
 "Nothing here yet. Set a frame's status to list it." = "Ainda não há nada aqui. Defina o status de um quadro para listá-lo."
 "Nothing online yet. Use Share on a file to put it online and it is listed here." = "Nada online ainda. Use Compartilhar em um arquivo para colocá-lo online e ele aparecerá aqui."
@@ -847,6 +896,7 @@ status = "draft — needs native review"
 "Open branch" = "Abrir branch"
 "Open file" = "Abrir arquivo"
 "Open files" = "Arquivos abertos"
+"Open presentations" = "Apresentações abertas"
 "Open in focus view" = "Abrir na visualização em foco"
 "Open in new window" = "Abrir em nova janela"
 "Open invite links in FigCraft" = "Abrir links de convite no FigCraft"
@@ -855,6 +905,7 @@ status = "draft — needs native review"
 "Open overlay" = "Abrir sobreposição"
 "Open prototype preview" = "Abrir visualização do protótipo"
 "Open variables ({count})" = "Abrir variáveis ({count})"
+"Opened as a new document" = "Aberto como novo documento"
 "Opened “{name}” in a new tab" = "“{name}” aberto em uma nova aba"
 "Open|comments" = "Abertos"
 "Options" = "Opções"
@@ -877,7 +928,12 @@ status = "draft — needs native review"
 "PDF print settings" = "Configurações de impressão em PDF"
 "Padding" = "Espaçamento interno"
 "Page" = "Página"
+"Page deleted" = "Página excluída"
 "Pages" = "Páginas"
+"Pages added to the document" = "Páginas adicionadas ao documento"
+"Pause" = "Pausar"
+"Pink" = "Rosa"
+"Placed on the current page" = "Colocado na página atual"
 "Pages: {pages}" = "Páginas: {pages}"
 "Paint bucket" = "Balde de tinta"
 "Pan the canvas" = "Mover a tela"
@@ -892,6 +948,7 @@ status = "draft — needs native review"
 "Paste a team library link (a view link)" = "Cole o link de uma biblioteca de equipe (um link de visualização)"
 "Paste here" = "Colar aqui"
 "Paste to replace" = "Colar para substituir"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Camadas de design coladas; {n} tipo de conteúdo ficou de fora", other = "Camadas de design coladas; {n} tipos de conteúdo ficaram de fora" }
 "Pattern" = "Padrão"
 "Pattern alignment" = "Alinhamento do padrão"
 "Pattern scale" = "Escala do padrão"
@@ -917,6 +974,7 @@ status = "draft — needs native review"
 "Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Os plugins são executados na sandbox do FigCraft, sem arquivos, rede nem relógio. Instale apenas plugins em que você confia."
 "Plus darker" = "Mais escuro"
 "Plus lighter" = "Mais claro"
+"Plus one" = "Mais um"
 "Point" = "Ponto"
 "Points" = "Pontos"
 "Polygon" = "Polígono"
@@ -942,6 +1000,7 @@ status = "draft — needs native review"
 "Preview" = "Visualização"
 "Preview this flow" = "Visualizar este fluxo"
 "Preview this frame" = "Visualizar este quadro"
+"Previous frame" = "Quadro anterior"
 "Previous ready for dev" = "Anterior pronto para dev"
 "Progressive" = "Progressivo"
 "Properties" = "Propriedades"
@@ -962,6 +1021,7 @@ status = "draft — needs native review"
 "Push" = "Empurrar"
 "Push changes to main component" = "Enviar alterações ao componente principal"
 "Put text on path" = "Colocar texto no caminho"
+"Question" = "Pergunta"
 "R" = "R"
 "Radial" = "Radial"
 "Radius" = "Raio"
@@ -979,10 +1039,12 @@ status = "draft — needs native review"
 "Reduce motion" = "Reduzir movimento"
 "Refraction" = "Refração"
 "Regular expression" = "Expressão regular"
+"Relative to" = "Relativa a"
 "Remove" = "Remover"
 "Remove all" = "Remover tudo"
 "Remove annotation" = "Remover anotação"
 "Remove auto layout" = "Remover layout automático"
+"Remove column" = "Remover coluna"
 "Remove dev resource" = "Remover recurso de desenvolvimento"
 "Remove export setting" = "Remover configuração de exportação"
 "Remove from server" = "Remover do servidor"
@@ -990,10 +1052,12 @@ status = "draft — needs native review"
 "Remove guide" = "Remover guia"
 "Remove interaction" = "Remover interação"
 "Remove library from this file" = "Remover biblioteca deste arquivo"
+"Remove measurement" = "Remover medição"
 "Remove min and max" = "Remover mín. e máx."
 "Remove min and max height" = "Remover altura mín. e máx."
 "Remove min and max width" = "Remover largura mín. e máx."
 "Remove regions" = "Remover regiões"
+"Remove row" = "Remover linha"
 "Remove slot" = "Remover slot"
 "Remove starting point" = "Remover ponto de partida"
 "Remove stop" = "Remover parada"
@@ -1006,6 +1070,7 @@ status = "draft — needs native review"
 "Removed" = "Removido"
 "Removed from the server" = "Removido do servidor"
 "Removed since it was marked" = "Removido desde a marcação"
+"Removed since this version" = "Removido desde esta versão"
 "Rename" = "Renomear"
 "Rename duplicated layers" = "Renomear camadas duplicadas"
 "Rename folder" = "Renomear pasta"
@@ -1035,6 +1100,7 @@ status = "draft — needs native review"
 "Resize by the nudge amount" = "Redimensionar pelo valor do deslocamento"
 "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Redimensiona os quadros para a tela do dispositivo (ou para a janela, sem dispositivo): as restrições e o layout automático deles se adaptam"
 "Resize to fit" = "Redimensionar para caber"
+"Resizing" = "Redimensionamento"
 "Resolve" = "Resolver"
 "Resolve change" = "Resolver alteração"
 "Resolved" = "Resolvido"
@@ -1045,6 +1111,9 @@ status = "draft — needs native review"
 "Restore main component" = "Restaurar componente principal"
 "Restore this version" = "Restaurar esta versão"
 "Restored “{name}”" = "“{name}” restaurada"
+"Retrospective" = "Retrospectiva"
+"Results" = "Resultados"
+"Resume" = "Retomar"
 "Reverse the order" = "Inverter a ordem"
 "Reversed triangle" = "Triângulo invertido"
 "Review and merge" = "Revisar e mesclar"
@@ -1060,6 +1129,7 @@ status = "draft — needs native review"
 "Rotation jitter" = "Variação de rotação"
 "Round" = "Arredondado"
 "Rounded" = "Arredondado"
+"Rounded rectangle" = "Retângulo arredondado"
 "Row" = "Linha"
 "Row gap" = "Espaço entre linhas"
 "Row sizes" = "Tamanhos de linha"
@@ -1075,6 +1145,7 @@ status = "draft — needs native review"
 "Save" = "Salvar"
 "Save as" = "Salvar como"
 "Save as preset…" = "Salvar como predefinição…"
+"Save file" = "Salvar arquivo"
 "Save files automatically" = "Salvar arquivos automaticamente"
 "Save version  {key}" = "Salvar versão  {key}"
 "Saved" = "Salvo"
@@ -1106,12 +1177,14 @@ status = "draft — needs native review"
 "Select all with same" = "Selecionar tudo com o mesmo"
 "Select layer" = "Selecionar camada"
 "Select layers to apply the style to" = "Selecione as camadas às quais aplicar o estilo"
+"Select layers with this color" = "Selecionar camadas com esta cor"
 "Select overlapping shapes" = "Selecione formas sobrepostas"
 "Select points to edit their position, radius and mirroring" = "Selecione pontos para editar posição, raio e espelhamento"
 "Select slot" = "Selecionar slot"
 "Selection" = "Seleção"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Caixa de seleção, {w} por {h} em {x}, {y}: as setas a movem, Shift+setas ou {cmd}+setas a redimensionam, Enter seleciona, Esc cancela"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Caixa de seleção: as setas a movem, Shift+setas ou {cmd}+setas a redimensionam, Enter seleciona, Esc cancela"
+"Selection colors" = "Cores da seleção"
 "Send backward" = "Enviar para trás"
 "Send report" = "Enviar denúncia"
 "Send to back" = "Enviar para o plano de fundo"
@@ -1127,6 +1200,7 @@ status = "draft — needs native review"
 "Shape" = "Forma"
 "Shape builder" = "Construtor de formas"
 "Shape tools" = "Ferramentas de forma"
+"Shapes" = "Formas"
 "Share" = "Compartilhar"
 "Share this file" = "Compartilhar este arquivo"
 "Share: live session, export" = "Compartilhar: sessão ao vivo, exportar"
@@ -1184,10 +1258,13 @@ status = "draft — needs native review"
 "Space+drag" = "Espaço+arrastar"
 "Spacing" = "Espaçamento"
 "Spam, stolen work, abuse…" = "Spam, trabalho roubado, abuso…"
+"Speech bubble" = "Balão de fala"
 "Splay" = "Abertura"
 "Spotlight me" = "Colocar o foco em mim"
 "Spread" = "Expansão"
 "Square" = "Quadrado"
+"Stamp" = "Carimbo"
+"Stamps" = "Carimbos"
 "Standard" = "Padrão"
 "Standard ligatures" = "Ligaduras padrão"
 "Star" = "Estrela"
@@ -1196,17 +1273,25 @@ status = "draft — needs native review"
 "Start ascending from / stop descending at" = "Contar para cima a partir de / para baixo até"
 "Start from a blank canvas" = "Comece com uma tela em branco"
 "Start on path" = "Início no caminho"
+"Start on the Home screen" = "Começar no Início"
 "Start point" = "Ponto inicial"
 "Start sharing" = "Começar a compartilhar"
+"Start vote" = "Iniciar votação"
 "Starting to share…" = "Começando a compartilhar…"
 "Status" = "Status"
 "Sticky" = "Fixado"
+"Sticky note" = "Nota adesiva"
+"Sticky note colors" = "Cores das notas adesivas"
+"Sticky notes" = "Notas adesivas"
+"Sticky notes, shapes and connectors" = "Notas adesivas, formas e conectores"
 "Stop" = "Parar"
 "Stop following {name}" = "Parar de seguir {name}"
 "Stop session" = "Encerrar sessão"
 "Stop sharing" = "Parar de compartilhar"
 "Stop spotlighting" = "Remover o foco"
+"Stop timer" = "Parar timer"
 "Stop {n}  {hex}" = "Parada {n}  {hex}"
+"Straight" = "Reto"
 "Stretch" = "Esticar"
 "Strikethrough" = "Tachado"
 "String" = "String"
@@ -1250,6 +1335,7 @@ status = "draft — needs native review"
 "Text" = "Texto"
 "Text align" = "Alinhamento do texto"
 "Text content" = "Conteúdo do texto"
+"Text size" = "Tamanho do texto"
 "Text style" = "Estilo de texto"
 "Text styles" = "Estilos de texto"
 "Texts" = "Textos"
@@ -1280,13 +1366,18 @@ status = "draft — needs native review"
 "This server is open to the public: no key needed." = "Este servidor é aberto ao público: não precisa de chave."
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Este servidor precisa da própria chave: adicione ?key=… ao endereço (`figcraft-server key` a mostra na máquina do servidor)."
 "This server takes files only with its key: see Advanced." = "Este servidor só aceita arquivos com a própria chave: veja Avançado."
+"Thumbs up" = "Joinha"
+"This version can't be read." = "Não é possível ler esta versão."
+"This version doesn't have it: all of it is new." = "Esta versão não o tem: tudo é novo."
 "Tidy up" = "Organizar"
 "Tile" = "Mosaico"
 "Tile type" = "Tipo de mosaico"
+"Timer" = "Timer"
 "Tint" = "Tonalidade"
 "Title" = "Título"
 "Title case" = "Iniciais maiúsculas"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Para compartilhar esta biblioteca com sua equipe, publique o arquivo em um servidor (Compartilhar ▸ Publicar no servidor…) e depois publique a biblioteca lá."
+"To the layer around it" = "Até a camada que a contém"
 "Toggle" = "Alternar"
 "Toggle light/dark theme" = "Alternar tema claro/escuro"
 "Toggle visibility" = "Alternar visibilidade"
@@ -1296,8 +1387,10 @@ status = "draft — needs native review"
 "Top left radius" = "Raio superior esquerdo"
 "Top right radius" = "Raio superior direito"
 "Transform" = "Transformar"
+"Triangle" = "Triângulo"
 "Triangle arrow" = "Seta triangular"
 "Trigger" = "Gatilho"
+"Trigger layer" = "Camada que a abre"
 "True" = "Verdadeiro"
 "Truncate text" = "Truncar texto"
 "Truncate with an ellipsis" = "Truncar com reticências"
@@ -1318,7 +1411,7 @@ status = "draft — needs native review"
 "Unread" = "Não lidos"
 "Unresolve" = "Reabrir"
 "Unsaved changes" = "Alterações não salvas"
-"Unsaved changes in {names}. Close the window and lose them?" = "Há alterações não salvas em {names}. Fechar a janela e perdê-las?"
+"Unsaved changes in {names}. Save them before closing?" = "Há alterações não salvas em {names}. Salvá-las antes de fechar?"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Alterações não salvas: salve primeiro ({save}) ou feche a aba com {alt}+clique para descartá-las"
 "Unsaved changes: save first, or close again with {key} to discard" = "Alterações não salvas: salve primeiro ou feche de novo com {key} para descartá-las"
 "Up" = "Para cima"
@@ -1337,6 +1430,7 @@ status = "draft — needs native review"
 "Use as mask" = "Usar como máscara"
 "Use auto layout" = "Usar layout automático"
 "Use number keys for opacity" = "Usar teclas numéricas para a opacidade"
+"Use the .figcraft or .fig extension." = "Use a extensão .figcraft ou .fig."
 "Use the layer's fill" = "Usar o preenchimento da camada"
 "Used in {files} · {instances}" = "Usado em {files} · {instances}"
 "Username" = "Nome de usuário"
@@ -1371,6 +1465,8 @@ status = "draft — needs native review"
 "Visibility" = "Visibilidade"
 "Visible" = "Visível"
 "Vivid" = "Vívido"
+"Votes per person" = "Votos por pessoa"
+"Voting session" = "Sessão de votação"
 "WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND está definida e indica a API gráfica a usar; sem ela, o FigCraft escolhe sozinho."
 "Warm" = "Quente"
 "Watch" = "Relógio"
@@ -1379,15 +1475,19 @@ status = "draft — needs native review"
 "WebSocket URL" = "URL do WebSocket"
 "WebSocket URL copied" = "URL do WebSocket copiada"
 "Wedge" = "Cunha"
+"Weekly planner" = "Planejador semanal"
 "Weight" = "Espessura"
+"What changed since a saved version" = "O que mudou desde uma versão salva"
 "What changed since it was marked ready for dev" = "O que mudou desde que foi marcado como pronto para dev"
 "What is wrong with this file? The server's operator gets your report." = "O que há de errado com este arquivo? O operador do servidor recebe a sua denúncia."
 "What it's for" = "Para que serve"
 "What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "Não se sabe de onde esta alteração partiu: ela ocorreu antes de o FigCraft guardar cópias dos quadros prontos para dev. Resolva a alteração (ou marque-o como pronto de novo) para comparar daqui em diante."
+"When marked ready" = "Ao marcar como pronto"
 "While hovering" = "Enquanto passa o cursor"
 "While pressing" = "Enquanto pressiona"
 "White" = "Branco"
 "Who runs it, its terms and how long it keeps files" = "Quem o mantém, os termos dele e por quanto tempo guarda os arquivos"
+"Whole screen" = "Tela inteira"
 "Why it changed" = "Por que mudou"
 "Widgets" = "Widgets"
 "Width" = "Largura"
@@ -1425,25 +1525,120 @@ status = "draft — needs native review"
 "call any command its access allows" = "chamar qualquer comando que seu acesso permita"
 "call only: {commands}" = "chamar apenas: {commands}"
 "can edit the document" = "pode editar o documento"
+"can save files" = "pode salvar arquivos"
+"conditional prototype actions nested too deeply were skipped" = "ações condicionais de protótipo aninhadas profundamente demais foram ignoradas"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "ações condicionais de protótipo com condições que não podem ser avaliadas foram ignoradas"
+"connector label background was skipped: style data is missing" = "o fundo do rótulo do conector foi ignorado: faltam os dados de estilo"
+"connector label was skipped: background bounds are invalid" = "o rótulo do conector foi ignorado: os limites do fundo são inválidos"
+"connector label was skipped: background transform is invalid" = "o rótulo do conector foi ignorado: a transformação do fundo é inválida"
+"connector label was skipped: composed text transform is invalid" = "o rótulo do conector foi ignorado: a transformação composta do texto é inválida"
+"connector label was skipped: derived background bounds are missing" = "o rótulo do conector foi ignorado: faltam os limites derivados do fundo"
+"connector label was skipped: derived text bounds are missing" = "o rótulo do conector foi ignorado: faltam os limites derivados do texto"
+"connector label was skipped: text bounds are invalid" = "o rótulo do conector foi ignorado: os limites do texto são inválidos"
+"connector label was skipped: text style data is missing" = "o rótulo do conector foi ignorado: faltam os dados de estilo do texto"
+"connector label was skipped: text transform is invalid" = "o rótulo do conector foi ignorado: a transformação do texto é inválida"
+"connector labels were skipped" = "rótulos de conectores foram ignorados"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "camadas de conector são importadas como instantâneos estáticos de quadro ou vetor, com rótulos quando houver; os vínculos dinâmicos das pontas não são mantidos"
+"connector snapshot vector data is missing; connector was left empty" = "faltam os dados vetoriais do instantâneo do conector; o conector ficou vazio"
+"connectors whose ends can't be placed are empty" = "conectores cujas pontas não podem ser posicionadas ficam vazios"
 "crop marks" = "marcas de corte"
+"damaged vector geometry was skipped" = "geometria vetorial danificada foi ignorada"
+"damaged vector networks import as outlines" = "redes vetoriais danificadas são importadas como contornos"
 "development: {path}" = "desenvolvimento: {path}"
+"document children other than pages were skipped" = "filhos do documento que não são páginas foram ignorados"
+"duplicate grid track sizing entries use equal tracks" = "entradas duplicadas de dimensionamento de faixas da grade usam faixas iguais"
 "e.g. count + 1" = "por ex. count + 1"
 "e.g. count >= 3 and not done" = "por ex. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "conectores angulares e curvos sem um caminho salvo são importados como linhas retas"
+"entries without a node type were skipped" = "entradas sem tipo de nó foram ignoradas"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "Links figcraft:// de um navegador, chat ou e-mail abrem este app e entram na sessão."
+"filled areas of a vector with their own fill use the layer's fill" = "áreas preenchidas de um vetor com preenchimento próprio usam o preenchimento da camada"
 "from {server}" = "de {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "gatilhos de gamepad sem exatamente um botão de controle conhecido foram ignorados"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "a lista de faixas da grade passa de 1000 entradas; as faixas usam o dimensionamento igual padrão"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "o dimensionamento de faixas da grade não é compatível ou está malformado; as faixas afetadas usam dimensionamento igual"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "a lista de dimensionamento de faixas da grade passa de 1000 entradas; as faixas usam o dimensionamento igual padrão"
 "hidden" = "oculta"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "os filtros de imagem são ambíguos porque os dois contêineres de filtro estão presentes; a conversão dos filtros foi ignorada"
+"image filters use FigCraft's approximate renderer" = "os filtros de imagem usam a renderização aproximada do FigCraft"
+"instance swap properties whose default component isn't in the file were skipped" = "propriedades de troca de instância cujo componente padrão não está no arquivo foram ignoradas"
+"instances inside their own main component were imported as frames" = "instâncias dentro do próprio componente principal foram importadas como quadros"
+"instances of components that aren't in the file show no layers" = "instâncias de componentes que não estão no arquivo não mostram camadas"
+"instances of components that aren't in the file were imported as frames" = "instâncias de componentes que não estão no arquivo foram importadas como quadros"
+"instances that would nest a component inside itself were imported as frames" = "instâncias que aninhariam um componente dentro dele mesmo foram importadas como quadros"
+"instances without a main component were imported as empty frames" = "instâncias sem componente principal foram importadas como quadros vazios"
+"invalid internal .fig text path data was ignored" = "dados internos inválidos de texto em caminho do .fig foram ignorados"
+"invalid or oversized vector networks import as outlines" = "redes vetoriais inválidas ou grandes demais são importadas como contornos"
+"invalid or oversized vector path data was skipped" = "dados de caminho vetorial inválidos ou grandes demais foram ignorados"
+"key triggers without a supported key were skipped" = "gatilhos de tecla sem uma tecla compatível foram ignorados"
+"key up triggers import as key presses" = "gatilhos ao soltar uma tecla são importados como pressionamentos de tecla"
+"layers without a position were placed at their parent's origin" = "camadas sem posição foram colocadas na origem do elemento pai"
+"layers without a type were skipped" = "camadas sem tipo foram ignoradas"
+"legacy image filter container is unsupported; filter conversion was skipped" = "o contêiner legado de filtros de imagem não é compatível; a conversão dos filtros foi ignorada"
 "locked" = "bloqueada"
+"malformed image filters container was skipped" = "o contêiner de filtros de imagem malformado foi ignorado"
+"malformed image paintFilter container was skipped" = "o contêiner paintFilter de imagem malformado foi ignorado"
+"malformed slot content assignment was skipped" = "uma atribuição de conteúdo de slot malformada foi ignorada"
 "no bleed" = "sem sangria"
 "nobody else here yet" = "ainda não há mais ninguém"
+"non-default slot settings are not represented and were skipped" = "configurações de slot diferentes do padrão não são representadas e foram ignoradas"
 "now" = "agora"
+"offer files to save if it asks to (you choose where each one goes)" = "oferecer arquivos para salvar, se pedir (você escolhe onde cada um fica)"
 "or" = "ou"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "as junções de traço por ponto foram mantidas; traços tracejados ou de largura variável são desenhados com a junção da camada"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "chaves de componentes preferidos de slots não correspondem a camadas do arquivo e foram ignoradas"
+"prototype actions of unknown types were skipped" = "ações de protótipo de tipos desconhecidos foram ignoradas"
+"prototype actions without a destination in the file were skipped" = "ações de protótipo sem destino no arquivo foram ignoradas"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "expressões de protótipo com variáveis que não estão no JSON de variáveis foram ignoradas"
+"prototype expressions with unsupported functions were skipped" = "expressões de protótipo com funções sem suporte foram ignoradas"
+"prototype interactions without supported actions were skipped" = "interações de protótipo sem ações compatíveis foram ignoradas"
+"prototype navigations of unknown types were skipped" = "navegações de protótipo de tipos desconhecidos foram ignoradas"
+"prototype transitions of unknown types play instantly" = "transições de protótipo de tipos desconhecidos são instantâneas"
+"prototype triggers of unknown types were skipped" = "gatilhos de protótipo de tipos desconhecidos foram ignorados"
 "put a widget on the canvas" = "colocar um widget na tela"
 "read and edit the document" = "ler e editar o documento"
 "read the document" = "ler o documento"
 "reads the document" = "lê o documento"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "ações de definir variável em variáveis que não estão no JSON de variáveis foram ignoradas"
+"set-variable actions with values that can't be evaluated were skipped" = "ações de definir variável com valores que não podem ser avaliados foram ignoradas"
+"set-variable actions with values that don't fit the variable were skipped" = "ações de definir variável com valores que não cabem na variável foram ignoradas"
+"set-variable actions without a value were skipped" = "ações de definir variável sem valor foram ignoradas"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "ações de definir modo de variável em coleções ou modos que não estão no JSON de variáveis foram ignoradas"
+"slot content assignment target is missing or is not slot content" = "o destino da atribuição de conteúdo de slot está ausente ou não é conteúdo de slot"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "a atribuição de conteúdo de slot usa o GUID vazio como sentinela e foi ignorada"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "alguns pontos vetoriais se referem a configurações de ponto ausentes no arquivo; eles usam as junções da camada e cantos simples"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "alguns segmentos vetoriais se referem a configurações de estilo ausentes no arquivo; eles usam o traço da camada"
+"stale or invalid grid track sizing entries were ignored" = "entradas de dimensionamento de faixas da grade obsoletas ou inválidas foram ignoradas"
+"stars and polygons without point counts or geometry use the default point count" = "estrelas e polígonos sem número de pontas nem geometria usam o número de pontas padrão"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "as configurações de estilo de alguns segmentos vetoriais não são compatíveis; esses segmentos usam o traço da camada"
+"text path underline or strikethrough decoration is not rendered" = "o sublinhado ou tachado do texto em caminho não é desenhado"
+"text style overrides refer to missing table entries" = "substituições de estilo de texto se referem a entradas de tabela ausentes"
+"the file has no pages" = "o arquivo não tem páginas"
 "the plugin" = "o plugin"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "o JSON de variáveis não tem `variableCollections` (era esperada a resposta de variáveis locais) e foi ignorado"
 "this session only" = "somente nesta sessão"
+"unknown component property types were skipped" = "tipos desconhecidos de propriedade de componente foram ignorados"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "aliases para variáveis que não estão no JSON de variáveis (ou de outro tipo) foram ignorados"
+"variable bindings to properties the layer doesn't have were skipped" = "vínculos de variáveis a propriedades que a camada não tem foram ignorados"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "vínculos a variáveis que não estão no JSON de variáveis (variáveis de biblioteca) foram ignorados"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "vínculos de variáveis foram ignorados: o JSON do arquivo não tem definições de variáveis (passe o JSON de variáveis locais como `variables` ou incorpore o `meta` dele ao lado do JSON do arquivo)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "vínculos de variáveis cujo tipo de variável não combina com a propriedade foram ignorados"
+"variable collections without modes were skipped" = "coleções de variáveis sem modos foram ignoradas"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "consultas de modo de variável em expressões de protótipo que não são uma variável e um de seus modos foram ignoradas"
+"variable modes of collections that aren't in the file were skipped" = "modos de variáveis de coleções que não estão no arquivo foram ignorados"
+"variable modes of collections that aren't in the variables JSON were skipped" = "modos de variáveis de coleções que não estão no JSON de variáveis foram ignorados"
+"variable values that don't match their type (or composed colours) were skipped" = "valores de variáveis que não correspondem ao seu tipo (ou cores compostas) foram ignorados"
+"variables of unknown types were skipped" = "variáveis de tipos desconhecidos foram ignoradas"
+"variables whose collection isn't in the variables JSON were skipped" = "variáveis cuja coleção não está no JSON de variáveis foram ignoradas"
+"variables without readable values were skipped" = "variáveis sem valores legíveis foram ignoradas"
+"vector points with unknown stroke joins use the layer join" = "pontos vetoriais com junções de traço desconhecidas usam a junção da camada"
+"vectors without geometry are empty" = "vetores sem geometria ficam vazios"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "vetores sem geometria ficam vazios (exporte o JSON do arquivo com geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "textos muito longos foram cortados em 1.048.576 caracteres"
+"very long vector paths were skipped" = "caminhos vetoriais muito longos foram ignorados"
+"video actions are not supported and were skipped" = "ações de vídeo não têm suporte e foram ignoradas"
+"video triggers are not supported and were skipped" = "gatilhos de vídeo não têm suporte e foram ignorados"
 "{instances} in {files}" = "{instances} em {files}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}: tradução em rascunho, aguardando revisão de um falante nativo."
 "{length} bleed" = "sangria de {length}"
@@ -1458,6 +1653,7 @@ status = "draft — needs native review"
 "{name} is forgotten on this computer; the file stays on {server}" = "{name} foi esquecido neste computador; o arquivo continua em {server}"
 "{name} is on the server." = "{name} está no servidor."
 "{name} is spotlighting" = "{name} está em destaque"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} é grande demais para abrir no navegador (mais de 512 MB)."
 "{name} was removed from the server" = "{name} foi removido do servidor"
 "{name} · deleted on main" = "{name} · excluído no principal"
 "{name} · deleted on the branch" = "{name} · excluído na branch"
@@ -1484,8 +1680,10 @@ status = "draft — needs native review"
 "{n} layers selected" = { one = "{n} camada selecionada", other = "{n} camadas selecionadas" }
 "{n} layers · {parts}" = { one = "{n} camada · {parts}", other = "{n} camadas · {parts}" }
 "{n} matches" = { one = "{n} resultado", other = "{n} resultados" }
+"{n} min" = "{n} min"
 "{n} minutes ago" = { one = "há {n} minuto", other = "há {n} minutos" }
 "{n} months ago" = { one = "há {n} mês", other = "há {n} meses" }
+"{n} more notes omitted from this report" = { one = "{n} nota a mais omitida deste relatório", other = "{n} notas a mais omitidas deste relatório" }
 "{n} of {total}" = "{n} de {total}"
 "{n} people joined" = { one = "{n} pessoa entrou", other = "{n} pessoas entraram" }
 "{n} preferred components" = { one = "{n} componente preferido", other = "{n} componentes preferidos" }
@@ -1495,6 +1693,8 @@ status = "draft — needs native review"
 "{n} rows" = { one = "{n} linha", other = "{n} linhas" }
 "{n} styles" = { one = "{n} estilo", other = "{n} estilos" }
 "{n} variables" = { one = "{n} variável", other = "{n} variáveis" }
+"{n} votes" = { one = "{n} voto", other = "{n} votos" }
+"{n} votes left" = { one = "{n} voto restante", other = "{n} votos restantes" }
 "{n} weeks ago" = { one = "há {n} semana", other = "há {n} semanas" }
 "{n} years ago" = { one = "há {n} ano", other = "há {n} anos" }
 "{n}d" = "{n} d"
@@ -1520,6 +1720,120 @@ status = "draft — needs native review"
 "⌘ click" = "⌘ clique"
 "⌘ scroll" = "⌘ rolar"
 "⌥ drag" = "⌥ arrastar"
+"A responsive product page: hero, features, figures, a quote and a footer" = "Uma página de produto responsiva: destaque, recursos, dados, depoimento e rodapé"
+"A title, an agenda, a big figure, a chart and a closing slide" = "Um título, uma pauta, um número em destaque, um gráfico e um slide de encerramento"
+"A to Z" = "De A a Z"
+"Adding to {name}" = "Adicionando a {name}"
+"All the fonts this file uses are installed" = "Todas as fontes usadas neste arquivo estão instaladas"
+"Alphabetical" = "Alfabética"
+"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "Uma tela de análise em grade: dados, gráficos vetoriais e uma tabela"
+"Apps" = "Aplicativos"
+"Apr" = "abr."
+"Aug" = "ago."
+"Bottom padding" = "Espaçamento interno inferior"
+"Bound to {name}. Click to detach the variable." = "Vinculada a {name}. Clique para desvincular a variável."
+"Checking the fonts installed on this computer…" = "Verificando as fontes instaladas neste computador…"
+"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Estilos de cor e texto, variáveis Claro e Escuro, botões, campos e cartões"
+"Convert to frame" = "Converter em quadro"
+"Convert to section" = "Converter em seção"
+"Created" = "Criado"
+"Dashboard" = "Painel"
+"Date created" = "Data de criação"
+"Dec" = "dez."
+"Design system starter" = "Ponto de partida para sistema de design"
+"Draw a frame" = "Desenhe um quadro"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Solte um arquivo .figcraft, .fig, .sketch, .json, .svg ou uma imagem."
+"Drop to import" = "Solte para importar"
+"Drop to open" = "Solte para abrir"
+"Edited {when}" = "Editado {when}"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "Exporte quadros e camadas como PNG, JPG, SVG ou PDF"
+"Feb" = "fev."
+"File not found" = "Arquivo não encontrado"
+"Four screens of a trail app with components and a prototype flow" = "Quatro telas de um aplicativo de trilhas com componentes e um fluxo de protótipo"
+"Getting started" = "Primeiros passos"
+"Greyscale components and two example screens to sketch a flow with" = "Componentes em escala de cinza e duas telas de exemplo para esboçar um fluxo"
+"Hide these tips (Getting started in the Help menu shows them again)" = "Ocultar estas dicas (Primeiros passos no menu Ajuda as exibe novamente)"
+"Hide when publishing" = "Ocultar ao publicar"
+"Icon components on a 24 px grid with keylines and a size preview" = "Componentes de ícone em uma grade de 24 px, com linhas-guia e prévia de tamanho"
+"Icon set starter" = "Ponto de partida para conjunto de ícones"
+"Individual padding" = "Espaçamento interno individual"
+"Interface size" = "Tamanho da interface"
+"Jan" = "jan."
+"Jul" = "jul."
+"Jun" = "jun."
+"Kits" = "Kits"
+"Landing page" = "Página de apresentação"
+"Last modified" = "Modificado por último"
+"Left padding" = "Espaçamento interno à esquerda"
+"Link frames on the Prototype tab, then present the flow" = "Vincule os quadros na aba Protótipo e apresente o fluxo"
+"Make a component" = "Criar um componente"
+"Mar" = "mar."
+"May" = "mai."
+"Missing fonts" = "Fontes ausentes"
+"Mobile app" = "Aplicativo para celular"
+"Newest first" = "Mais recentes primeiro"
+"No files or templates match your search" = "Nenhum arquivo ou modelo corresponde à sua busca"
+"No other pages" = "Não há outras páginas"
+"No templates match your search" = "Nenhum modelo corresponde à sua busca"
+"Nov" = "nov."
+"Oct" = "out."
+"Oldest first" = "Mais antigos primeiro"
+"One announcement in five common sizes: square, portrait, story, link and banner" = "Um anúncio em cinco tamanhos comuns: quadrado, retrato, story, link e banner"
+"Opening the file…" = "Abrindo o arquivo…"
+"Opening {n} files as new files" = { one = "Abrindo como um novo arquivo", other = "Abrindo {n} arquivos como novos arquivos" }
+"Order" = "Ordem"
+"Other" = "Outro"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "Selecione a ferramenta Quadro e arraste na tela ou escolha o tamanho de um dispositivo"
+"Plugin" = "Plugin"
+"Plugins & widgets" = "Plugins e widgets"
+"Presentation slides" = "Slides de apresentação"
+"Playground" = "Área de testes"
+"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "Em relação à escala de exibição do sistema (100% corresponde ao tamanho definido pelo sistema). O zoom do documento é independente."
+"Remove from recents" = "Remover dos recentes"
+"Reorder selection" = "Reordenar seleção"
+"Right padding" = "Espaçamento interno à direita"
+"Search templates" = "Buscar modelos"
+"See all templates" = "Ver todos os modelos"
+"Select layers and they space themselves as their content changes" = "Selecione camadas e elas ajustarão o espaçamento conforme o conteúdo mudar"
+"Search files and templates" = "Buscar arquivos e modelos"
+"Search results" = "Resultados da busca"
+"Search pages" = "Buscar páginas"
+"Sep" = "set."
+"Share with a code" = "Compartilhar com um código"
+"Show all templates" = "Mostrar todos os modelos"
+"Show in Explorer" = "Mostrar no Explorador de Arquivos"
+"Show in Finder" = "Mostrar no Finder"
+"Show in folder" = "Mostrar na pasta"
+"Social and slides" = "Redes sociais e slides"
+"Social post sizes" = "Tamanhos de publicação para redes sociais"
+"Sort by" = "Ordenar por"
+"Sort by {column}" = "Ordenar por {column}"
+"Start from a template" = "Começar com um modelo"
+"Start sharing with the Share button, then pass on the code it gives" = "Comece a compartilhar pelo botão Compartilhar e envie o código gerado"
+"Templates" = "Modelos"
+"The destination document is unavailable. Nothing was imported." = "O documento de destino está indisponível. Nada foi importado."
+"The destination document was closed. Nothing was imported." = "O documento de destino foi fechado. Nada foi importado."
+"The destination page was removed. Nothing was imported." = "A página de destino foi removida. Nada foi importado."
+"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "A janela é pequena demais para {size}%, então a interface é exibida em {drawn}%. Aumente a janela para usar {size}%."
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "Este arquivo usa fontes que não estão instaladas neste computador. O texto será exibido com uma fonte substituta até que você as instale."
+"Top padding" = "Espaçamento interno superior"
+"Try another search, or browse templates." = "Tente outra busca ou explore os modelos."
+"Try another word, or look at every kind." = "Tente outra palavra ou veja todos os tipos."
+"Turn a layer into a component, reuse it, and change every copy at once" = "Transforme uma camada em componente, reutilize-a e altere todas as cópias de uma só vez"
+"Use your browser's zoom to change the interface size." = "Use o zoom do navegador para alterar o tamanho da interface."
+"Uses variables: each layer shows them in its own mode" = "Usa variáveis: cada camada as exibe em seu próprio modo"
+"Websites" = "Sites"
+"What you try here changes this preview and the code below, not the file" = "O que você experimentar aqui altera esta prévia e o código abaixo, não o arquivo"
+"Widget" = "Widget"
+"Wireframe kit" = "Kit de wireframe"
+"Z to A" = "De Z a A"
+"just now" = "agora mesmo"
+"only in a text style or variable" = "somente em um estilo de texto ou variável"
+"slot layers without a matching slot property were imported as frames" = "camadas de slot sem uma propriedade de slot correspondente foram importadas como quadros"
+"yesterday" = "ontem"
+"{month} {day}, {year}" = "{day} de {month} de {year}"
+"{n} text layers" = { one = "{n} camada de texto", other = "{n} camadas de texto" }
+"{percent}%" = "{percent}%"
 
 [commands]
 "align.bottom" = "Alinhar embaixo"
@@ -1545,7 +1859,26 @@ status = "draft — needs native review"
 "arrange.packH" = "Compactar na horizontal"
 "arrange.packV" = "Compactar na vertical"
 "arrange.roundToPixels" = "Arredondar para pixels"
+"arrange.spacing" = "Espaçamento"
 "arrange.tidy" = "Organizar"
+"board.connector" = "Conector"
+"board.ink" = "Traço de marcador"
+"board.label" = "Rótulo do conector"
+"board.nextSticky" = "Próxima nota adesiva"
+"board.reattach" = "Reconectar conector"
+"board.setColor" = "Cor no quadro"
+"board.setStyle" = "Estilo no quadro"
+"board.shape" = "Forma com texto"
+"board.stamp" = "Carimbo"
+"board.sticky" = "Nota adesiva"
+"board.table" = "Tabela"
+"board.tableEdit" = "Editar tabela"
+"board.template" = "Modelo de quadro"
+"board.templates" = "Listar modelos de quadro"
+"board.timer" = "Timer"
+"board.timerState" = "Estado do timer"
+"board.vote" = "Sessão de votação"
+"board.voteResults" = "Resultados da votação"
 "bool.exclude" = "Excluir sobreposição da seleção"
 "bool.flatten" = "Nivelar booleano"
 "bool.intersect" = "Interseção da seleção"
@@ -1621,6 +1954,9 @@ status = "draft — needs native review"
 "dev.focus" = "Visualização em foco"
 "dev.resolveChange" = "Resolver alteração"
 "dev.unfocus" = "Sair da visualização em foco"
+"devMode.addMeasurement" = "Adicionar medição"
+"devMode.measurements" = "Listar medições"
+"devMode.removeMeasurement" = "Remover medição"
 "devResource.add" = "Adicionar recurso de desenvolvimento"
 "devResource.edit" = "Editar recurso de desenvolvimento"
 "devResource.list" = "Listar recursos de desenvolvimento"
@@ -1644,6 +1980,7 @@ status = "draft — needs native review"
 "edit.duplicate" = "Duplicar"
 "edit.findReplace" = "Localizar e substituir"
 "edit.paste" = "Colar"
+"edit.pasteDesignLayers" = "Colar camadas de design"
 "edit.pasteOver" = "Colar sobre a seleção"
 "edit.pasteProperties" = "Colar propriedades"
 "edit.pasteReplace" = "Colar para substituir"
@@ -1667,7 +2004,9 @@ status = "draft — needs native review"
 "file.exportLayers" = "Exportar camadas"
 "file.exportSvg" = "Exportar seleção como SVG"
 "file.import" = "Importar"
+"file.moveTab" = "Mover aba"
 "file.new" = "Novo arquivo de design"
+"file.newBoard" = "Novo quadro"
 "file.open" = "Abrir"
 "file.openRecent" = "Abrir recente"
 "file.placeImage" = "Inserir imagem"
@@ -1804,6 +2143,7 @@ status = "draft — needs native review"
 "pref.reduceMotion" = "Reduzir movimento"
 "pref.renameDuplicates" = "Renomear camadas duplicadas"
 "pref.showDimensions" = "Mostrar dimensões nos objetos"
+"pref.startOnHome" = "Começar no Início"
 "pref.userName" = "Seu nome nos comentários"
 "proto.action.add" = "Adicionar ação de protótipo"
 "proto.action.move" = "Reordenar ação de protótipo"
@@ -1847,6 +2187,12 @@ status = "draft — needs native review"
 "select.sameStroke" = "Selecionar mesmo traço"
 "select.sameText" = "Selecionar mesmas propriedades de texto"
 "select.set" = "Selecionar"
+"selection.applyColorStyle" = "Aplicar estilo de cor à seleção"
+"selection.bindColorVariable" = "Aplicar variável de cor à seleção"
+"selection.colors" = "Cores da seleção"
+"selection.detachColor" = "Desvincular cor da seleção"
+"selection.selectColor" = "Selecionar camadas com esta cor"
+"selection.setPaint" = "Alterar cor da seleção"
 "shape.arrow" = "Seta"
 "shape.ellipse" = "Elipse"
 "shape.line" = "Linha"
@@ -1913,6 +2259,8 @@ status = "draft — needs native review"
 "text.preview" = "Visualizar alteração de texto"
 "text.removeFromPath" = "Remover texto do caminho"
 "text.set" = "Definir texto"
+"data.fill" = "Preencher cópias com dados"
+"text.fit" = "Ajustar texto à caixa"
 "text.setFeatures" = "Recursos OpenType"
 "text.setVariations" = "Eixos de fonte variável"
 "text.sizeDown" = "Diminuir tamanho da fonte"
@@ -1926,10 +2274,14 @@ status = "draft — needs native review"
 "text.weightUp" = "Aumentar peso da fonte"
 "tool.arrow" = "Seta"
 "tool.comment" = "Comentário"
+"tool.connector" = "Conector"
 "tool.ellipse" = "Elipse"
+"tool.eraser" = "Borracha"
 "tool.frame" = "Quadro"
 "tool.hand" = "Mão"
+"tool.highlighter" = "Marca-texto"
 "tool.line" = "Linha"
+"tool.marker" = "Marcador"
 "tool.move" = "Mover"
 "tool.pen" = "Caneta"
 "tool.pencil" = "Lápis"
@@ -1941,9 +2293,12 @@ status = "draft — needs native review"
 "tool.scaleAnchor" = "Âncora de escala"
 "tool.section" = "Seção"
 "tool.set" = "Escolher ferramenta"
+"tool.shape" = "Formas"
 "tool.shapeBuilder" = "Construtor de formas"
 "tool.slice" = "Fatia"
+"tool.stamp" = "Carimbo"
 "tool.star" = "Estrela"
+"tool.sticky" = "Nota adesiva"
 "tool.text" = "Texto"
 "transform.move" = "Mover"
 "transform.moveTo" = "Mover para"
@@ -2005,11 +2360,13 @@ status = "draft — needs native review"
 "vector.edit.tool" = "Ferramenta de edição vetorial"
 "vector.edit.transform" = "Transformar pontos"
 "vector.edit.widthPoint" = "Ponto de largura"
+"vector.fillRule" = "Definir regra de preenchimento"
 "vector.flatten" = "Nivelar"
 "vector.join" = "Unir seleção"
 "vector.offset" = "Deslocar caminho"
 "vector.outlineStroke" = "Contornar traço"
 "vector.reverse" = "Inverter direção do caminho"
+"vector.reverseLoop" = "Inverter laço"
 "vector.simplify" = "Simplificar vetor"
 "vector.smoothJoin" = "Unir seleção com suavização"
 "version.autosave" = "Salvar versão automaticamente"
@@ -2068,6 +2425,8 @@ status = "draft — needs native review"
 "widget.click" = "Clicar no widget"
 "widget.insert" = "Inserir widget"
 "widget.list" = "Listar widgets"
+"widget.menu" = "Menu do widget"
+"widget.setText" = "Editar campo do widget"
 "window.focus" = "Trazer a janela para a frente"
 "window.new" = "Nova janela"
 
diff --git a/crates/ui-egui/locales/ru.toml b/crates/ui-egui/locales/ru.toml
index 58e4667e..a4968cd4 100644
--- a/crates/ui-egui/locales/ru.toml
+++ b/crates/ui-egui/locales/ru.toml
@@ -1,5 +1,6 @@
 # FigCraft interface strings: Russian.
 # Wording reviewed and approved by VanTan.
+# Strings added since that review (2026-10-20) are a machine draft awaiting review.
 # Keep Frame, Dev Mode and Smart animate as familiar tool names.
 # See docs/translating.md; plural forms follow Russian integer rules.
 
@@ -15,6 +16,8 @@ name = "Русский"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: PR: {prs}, коммитов: {commits}, +{added} / −{deleted} строк (Δ {delta}), +{bin_added} / −{bin_deleted} бинарных ресурсов, {first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Коллекция этого файла с этими режимами и переменными: переопределяйте значения для каждого режима и добавляйте собственные переменные"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Файл .figcraft с таким именем уже существует. Чтобы подтвердить замену, выберите его полное имя."
+"A layer on its own aligns to its frame: select more layers, or one in a frame" = "Отдельный слой выравнивается по своему фрейму: выделите больше слоёв или слой внутри фрейма."
 "A responsive product page: hero, features, figures, a quote and a footer" = "Адаптивная страница продукта: главный блок, возможности, показатели, цитата и подвал"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "Пружинная анимация длится до затухания: её время задают масса, жёсткость и демпфирование"
 "A title, an agenda, a big figure, a chart and a closing slide" = "Заголовок, повестка, крупный показатель, диаграмма и заключительный слайд"
@@ -33,6 +36,7 @@ name = "Русский"
 "Add a description" = "Добавить описание"
 "Add a frame (F) or a shape (R) to get started" = "Для начала добавьте Frame (F) или фигуру (R)"
 "Add a layer or component to tile first" = "Сначала добавьте слой или компонент для повторения"
+"Add a minute" = "Добавить минуту"
 "Add a note for developers" = "Добавить заметку для разработчиков"
 "Add action" = "Добавить действие"
 "Add actions for when no condition holds" = "Добавить действия на случай, если ни одно условие не выполнено"
@@ -40,6 +44,7 @@ name = "Русский"
 "Add another condition" = "Добавить ещё одно условие"
 "Add auto layout" = "Добавить автолейаут"
 "Add background behind overlay" = "Добавить фон за оверлеем"
+"Add column" = "Добавить столбец"
 "Add content to this slot" = "Добавить содержимое в этот слот"
 "Add dev resource" = "Добавить ресурс для разработки"
 "Add effect" = "Добавить эффект"
@@ -51,6 +56,7 @@ name = "Русский"
 "Add library file…" = "Добавить файл библиотеки…"
 "Add max height" = "Добавить максимальную высоту"
 "Add max width" = "Добавить максимальную ширину"
+"Add measurement" = "Добавить измерение"
 "Add min height" = "Добавить минимальную высоту"
 "Add min width" = "Добавить минимальную ширину"
 "Add mode" = "Добавить режим"
@@ -58,12 +64,14 @@ name = "Русский"
 "Add or update collections from a variables JSON" = "Добавить или обновить коллекции из JSON переменных"
 "Add properties to make instances configurable" = "Добавьте свойства, чтобы настраивать экземпляры"
 "Add reaction" = "Добавить реакцию"
+"Add row" = "Добавить строку"
 "Add starting point" = "Добавить начальную точку"
 "Add stroke" = "Добавить обводку"
 "Add variant" = "Добавить вариант"
 "Add variant with a new value" = "Добавить вариант с новым значением"
 "Added" = "Добавлено"
 "Added the library \"{name}\"" = "Добавлена библиотека «{name}»"
+"Adding to {name}" = "Добавление в {name}"
 "Adjust" = "Коррекция"
 "Adjustment presets" = "Пресеты коррекции"
 "Advanced" = "Дополнительно"
@@ -86,8 +94,14 @@ name = "Русский"
 "All comments" = "Все комментарии"
 "All components" = "Все компоненты"
 "All fonts" = "Все шрифты"
+"All objects" = "Все объекты"
 "All supported properties" = "Все поддерживаемые свойства"
+"All the fonts this file uses are installed" = "Все шрифты, которые использует этот файл, установлены"
 "All variables" = "Все переменные"
+"Along the bottom" = "Вдоль нижнего края"
+"Along the left" = "Вдоль левого края"
+"Along the right" = "Вдоль правого края"
+"Along the top" = "Вдоль верхнего края"
 "Alpha" = "Альфа"
 "Alphabetical" = "По алфавиту"
 "Alt+drag" = "Alt+перетаскивание"
@@ -120,6 +134,7 @@ name = "Русский"
 "Archived" = "В архиве"
 "Arrange" = "Упорядочить"
 "Arrow" = "Стрелка"
+"Arrow at the end" = "Стрелка на конце"
 "As typed" = "Как введено"
 "Asking the server…" = "Запрос к серверу…"
 "Assets" = "Ресурсы"
@@ -151,6 +166,7 @@ name = "Русский"
 "Basics" = "Основы"
 "Before" = "До"
 "Bend" = "Изгиб"
+"Between the selected layers" = "Между выбранными слоями"
 "Bevel" = "Скошенное"
 "Binary assets added" = "Добавлено бинарных ресурсов"
 "Binary assets removed" = "Удалено бинарных ресурсов"
@@ -167,7 +183,9 @@ name = "Русский"
 "Both directions" = "Оба направления"
 "Bottom" = "Снизу"
 "Bottom left radius" = "Радиус нижнего левого угла"
+"Bottom padding" = "Нижний внутренний отступ"
 "Bottom right radius" = "Радиус нижнего правого угла"
+"Brainstorm" = "Мозговой штурм"
 "Branch" = "Ветка"
 "Branch archived" = "Ветка архивирована"
 "Branch merged" = "Ветка объединена"
@@ -193,8 +211,13 @@ name = "Русский"
 "C or ⇧C" = "C или ⇧C"
 "CMYK colour" = "Цвет CMYK"
 "Can view" = "Может просматривать"
+"Check" = "Галочка"
+"Checking the fonts installed on this computer…" = "Проверка шрифтов, установленных на этом компьютере…"
 "Checking the server…" = "Проверка сервера…"
+"Chevron" = "Шеврон"
 "Clear from this list" = "Убрать из этого списка"
+"Clear results" = "Очистить результаты"
+"Click objects to vote; click your badge to take a vote back" = "Нажмите на объекты, чтобы проголосовать; нажмите на свой значок, чтобы забрать голос"
 "Code or invite link" = "Код или ссылка приглашения"
 "Color profile: {name}" = "Цветовой профиль: {name}"
 "Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Цветовые и текстовые стили, переменные светлой и тёмной тем, кнопки, поля ввода и карточки"
@@ -219,7 +242,7 @@ name = "Русский"
 "Changes on main" = "Изменения в основной ветке"
 "Changes on the branch" = "Изменения в ветке"
 "Changes unknown" = "Изменения неизвестны"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "Выберите выше React, Leptos, SwiftUI, Compose или Flutter, чтобы связать компонент с его кодом."
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Выберите выше React, Leptos, Vue, SwiftUI, Compose, ArkUI или Flutter, чтобы связать компонент с его кодом."
 "Choose another profile to change it." = "Для смены выберите другой профиль."
 "Choose collection" = "Выбрать коллекцию"
 "Choose image" = "Выбрать изображение"
@@ -240,7 +263,6 @@ name = "Русский"
 "Close tab" = "Закрыть вкладку"
 "Close version history" = "Закрыть историю версий"
 "Close when clicking outside" = "Закрывать при нажатии снаружи"
-"Close without saving" = "Закрыть без сохранения"
 "Code" = "Код"
 "Code syntax" = "Синтаксис кода"
 "Collapse" = "Свернуть"
@@ -267,6 +289,7 @@ name = "Русский"
 "Commits" = "Коммиты"
 "Company" = "Компания"
 "Compare changes" = "Сравнить изменения"
+"Compatibility notes" = "Замечания о совместимости"
 "Completed" = "Завершено"
 "Component" = "Компонент"
 "Component name" = "Имя компонента"
@@ -281,16 +304,18 @@ name = "Русский"
 "Connected" = "Подключено"
 "Connected to code: {from}" = "Связано с кодом: {from}"
 "Connection lost, reconnecting (attempt {attempt})…" = "Соединение потеряно, переподключение (попытка {attempt})…"
+"Connector" = "Соединитель"
 "Constrain proportions" = "Сохранять пропорции"
 "Constraints" = "Ограничения"
 "Content" = "Содержимое"
 "Contents hidden" = "Содержимое скрыто"
-"Contents only" = "Только содержимое"
 "Contextual alternates" = "Контекстные альтернативы"
 "Contrast" = "Контраст"
 "Contributors" = "Участники"
 "Contributors: {people} · Commits: {commits}" = "Участники: {people} · Коммиты: {commits}"
 "Controller" = "Контроллер"
+"Convert to frame" = "Преобразовать во Frame"
+"Convert to section" = "Преобразовать в секцию"
 "Cool" = "Холодный"
 "Copied as CSS" = "Скопировано как CSS"
 "Copied as PNG" = "Скопировано как PNG"
@@ -308,7 +333,11 @@ name = "Русский"
 "Copy {value}" = "Копировать {value}"
 "Corner radius" = "Радиус углов"
 "Corner smoothing" = "Сглаживание углов"
+"Couldn't download the variables" = "Не удалось загрузить переменные"
 "Couldn't reach {server}: showing what this computer remembers." = "Не удалось связаться с {server}: показаны данные, сохранённые на этом компьютере."
+"Couldn't read {name}." = "Не удалось прочитать {name}."
+"Couldn't save automatically: {error}" = "Не удалось сохранить автоматически: {error}"
+"Couldn't save the file" = "Не удалось сохранить файл"
 "Count" = "Количество"
 "Create" = "Создать"
 "Create a variable collection first" = "Сначала создайте коллекцию переменных"
@@ -332,6 +361,7 @@ name = "Русский"
 "Current version" = "Текущая версия"
 "Cursor chat" = "Чат у курсора"
 "Custom" = "Пользовательский"
+"Custom size" = "Пользовательский размер"
 "Cut" = "Вырезать"
 "Dark" = "Тёмная"
 "Darken" = "Затемнение"
@@ -365,6 +395,7 @@ name = "Русский"
 "Description" = "Описание"
 "Description (optional)" = "Описание (необязательно)"
 "Design" = "Дизайн"
+"Design panel" = "Панель дизайна"
 "Design system starter" = "Основа дизайн-системы"
 "Desktop" = "Компьютер"
 "Destination" = "Назначение"
@@ -392,6 +423,7 @@ name = "Русский"
 "Distribute horizontal spacing" = "Распределить по горизонтали"
 "Distribute vertical spacing" = "Распределить по вертикали"
 "Divider" = "Разделитель"
+"Don't Save" = "Не сохранять"
 "Don't truncate" = "Не обрезать"
 "Done" = "Готово"
 "Done editing" = "Завершить редактирование"
@@ -403,7 +435,10 @@ name = "Русский"
 "Draw" = "Рисование"
 "Draw a frame" = "Нарисовать Frame"
 "Drawing tools" = "Инструменты рисования"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Перетащите файл .figcraft, .fig, .sketch, .json, .svg или изображение."
 "Drop shadow" = "Внешняя тень"
+"Drop to import" = "Отпустите, чтобы импортировать"
+"Drop to open" = "Отпустите, чтобы открыть"
 "Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "Двойная лицензия MIT OR Apache-2.0. Создано командой и сообществом ArtCraft."
 "Duo" = "Дуо"
 "Duplicate" = "Дублировать"
@@ -424,6 +459,8 @@ name = "Русский"
 "Effect settings" = "Настройки эффекта"
 "Effect styles" = "Стили эффектов"
 "Effects" = "Эффекты"
+"Curved" = "Кривая"
+"Elbow" = "Ломаная"
 "Ellipse" = "Эллипс"
 "Ellipses" = "Эллипсы"
 "Else" = "Иначе"
@@ -432,6 +469,7 @@ name = "Русский"
 "Empty" = "Пусто"
 "End" = "Конец"
 "End point" = "Конечная точка"
+"End vote" = "Завершить голосование"
 "Ends the session; everyone keeps their copy" = "Завершает сессию; у всех остаются свои копии"
 "Enter" = "Enter"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Введите адрес figcraft-server и нажмите «Обзор», чтобы увидеть доступные плагины."
@@ -473,6 +511,8 @@ name = "Русский"
 "False" = "Ложь"
 "Feb" = "февр."
 "Fetching from the server…" = "Загрузка с сервера…"
+"FigCraft couldn't open its window: {error}" = "FigCraft не смог открыть своё окно: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft пока поддерживает не все возможности этих файлов. В замечаниях перечислено, что было пропущено или изменено в импортированной копии; исходный файл не меняется."
 "File" = "Файл"
 "File name" = "Имя файла"
 "File not found" = "Файл не найден"
@@ -506,6 +546,7 @@ name = "Русский"
 "Flip text to the other side" = "Перенести текст на другую сторону"
 "Flip vertical" = "Отразить по вертикали"
 "Flip width profile" = "Отразить профиль ширины"
+"Flow chart" = "Блок-схема"
 "Flow starting point" = "Начальная точка сценария"
 "Flow starting points" = "Начальные точки сценариев"
 "Flows" = "Сценарии"
@@ -558,6 +599,7 @@ name = "Русский"
 "Hanging list" = "Выступающий список"
 "Hanging punctuation" = "Висячая пунктуация"
 "Hard light" = "Жёсткий свет"
+"Heart" = "Сердце"
 "Height" = "Высота"
 "Help" = "Справка"
 "Help and resources" = "Справка и ресурсы"
@@ -570,6 +612,7 @@ name = "Русский"
 "Hide these tips (Getting started in the Help menu shows them again)" = "Скрыть подсказки (их можно вернуть через «Начало работы» в меню справки)"
 "Hide when publishing" = "Скрывать при публикации"
 "Highlight layers on hover" = "Подсвечивать слои при наведении"
+"Highlighter" = "Текстовыделитель"
 "Highlights" = "Света"
 "Hold Alt" = "Удерживайте Alt"
 "Hold Alt+Z" = "Удерживайте Alt+Z"
@@ -593,14 +636,19 @@ name = "Русский"
 "Icon components on a 24 px grid with keylines and a size preview" = "Компоненты иконок на сетке 24 px с направляющими и предпросмотром размеров"
 "Icon set starter" = "Основа набора иконок"
 "If" = "Если"
+"If it keeps happening, please report it at {link} with this message." = "Если это повторяется, сообщите об этом по адресу {link}, приложив это сообщение."
 "If {condition}" = "Если {condition}"
 "Ignore auto layout (absolute position)" = "Игнорировать автолейаут (абсолютная позиция)"
+"Ignore overlapping layers" = "Игнорировать перекрывающиеся слои"
 "Image" = "Изображение"
+"Images" = "Изображения"
 "Import" = "Импорт"
 "Import path" = "Путь импорта"
 "Import plugin from manifest" = "Импортировать плагин из манифеста"
 "Import plugin from manifest…" = "Импортировать плагин из манифеста…"
+"Import report" = "Отчёт об импорте"
 "Import variables" = "Импортировать переменные"
+"Imported document" = "Импортированный документ"
 "Imported {name}" = "Импортировано: {name}"
 "Imported {n} new variables, updated {updated}" = { one = "Импортирована {n} новая переменная, обновлено: {updated}", few = "Импортированы {n} новые переменные, обновлено: {updated}", many = "Импортировано {n} новых переменных, обновлено: {updated}", other = "Импортировано {n} новой переменной, обновлено: {updated}" }
 "Import…" = "Импорт…"
@@ -611,6 +659,7 @@ name = "Русский"
 "Included" = "Включено"
 "Included in layout" = "Участвует в компоновке"
 "Individual corners" = "Углы по отдельности"
+"Individual padding" = "Внутренние отступы по отдельности"
 "Individual strokes" = "Обводки по отдельности"
 "Ink" = "Чернила"
 "Inner shadow" = "Внутренняя тень"
@@ -628,11 +677,14 @@ name = "Русский"
 "Instance swap (no other component)" = "Замена экземпляра (других компонентов нет)"
 "Instances" = "Экземпляры"
 "Instant" = "Мгновенно"
+"Intensity" = "Яркость"
 "Interaction" = "Взаимодействие"
 "Interactions" = "Взаимодействия"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Дизайн интерфейсов и прототипирование. Бесплатный инструмент с открытым исходным кодом, независимо созданный с нуля на Rust, из семейства ArtCraft Crafting Apps."
+"Interface size" = "Размер интерфейса"
 "Intersect" = "Пересечение"
 "Intersects" = "Пересечения"
+"Invalid color" = "Недопустимый цвет"
 "Invite link" = "Ссылка приглашения"
 "Invite link copied" = "Ссылка приглашения скопирована"
 "It asks permission to:" = "Запрашивает разрешение на:"
@@ -651,6 +703,8 @@ name = "Русский"
 "Jun" = "июн."
 "Just now" = "Только что"
 "Justify" = "По ширине"
+"Kanban board" = "Канбан-доска"
+"Keep a measurement on the canvas for developers" = "Оставить измерение на холсте для разработчиков"
 "Keep appearance" = "Сохранить внешний вид"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "«Сохранить внешний вид» преобразует все значения цветов в {profile}, сохраняя их вид. «Сохранить значения» оставляет числа без изменений, поэтому цвета меняются."
 "Keep tool selected after use" = "Оставлять инструмент выбранным после использования"
@@ -679,6 +733,7 @@ name = "Русский"
 "Leaves" = "Листья"
 "Left" = "Слева"
 "Left & right" = "Слева и справа"
+"Left padding" = "Левый внутренний отступ"
 "Left side" = "Левая сторона"
 "Left side width" = "Ширина левой стороны"
 "Letter case" = "Регистр букв"
@@ -730,6 +785,7 @@ name = "Русский"
 "Mark as resolved" = "Отметить как решённое"
 "Mark as unread" = "Отметить как непрочитанное"
 "Mark as unresolved" = "Отметить как нерешённое"
+"Marker" = "Маркер"
 "Mask" = "Маска"
 "Mass · Stiffness · Damping" = "Масса · Жёсткость · Демпфирование"
 "Match (empty: the whole name)" = "Совпадение (пусто: всё имя)"
@@ -739,6 +795,7 @@ name = "Русский"
 "Maximize" = "Развернуть окно"
 "May" = "май"
 "Measure to the selection" = "Измерить до выделения"
+"Measurements" = "Измерения"
 "Merge into main" = "Объединить с основной"
 "Merge regions" = "Объединить области"
 "Merge the branch into the main file (one undo step) and archive it" = "Объединить ветку с основным файлом (один шаг отмены) и архивировать её"
@@ -747,10 +804,12 @@ name = "Русский"
 "Min H" = "Мин. В"
 "Min W" = "Мин. Ш"
 "Minimize" = "Свернуть окно"
+"Minutes" = "Минуты"
 "Mirror angle" = "Отражать угол"
 "Mirror angle and length" = "Отражать угол и длину"
 "Mirroring" = "Зеркальность"
 "Missing" = "Отсутствует"
+"Missing fonts" = "Отсутствующие шрифты"
 "Missing layer" = "Слой отсутствует"
 "Missing style" = "Стиль отсутствует"
 "Missing variable" = "Переменная отсутствует"
@@ -788,8 +847,10 @@ name = "Русский"
 "Named instance" = "Именованный экземпляр"
 "Navigate to" = "Перейти к"
 "Nested instance" = "Вложенный экземпляр"
+"New board" = "Новая доска"
 "New design file" = "Новый файл дизайна"
 "Newest first" = "Сначала новые"
+"Next frame" = "Следующий Frame"
 "Next or previous control in the focused region" = "Следующий или предыдущий элемент в активной области"
 "Next ready for dev" = "Следующий готовый к разработке"
 "Next size option" = "Следующий вариант размера"
@@ -799,13 +860,17 @@ name = "Русский"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "Веток нет. Ветка — копия файла, в которой можно попробовать изменения, затем проверить и объединить их."
 "No category" = "Без категории"
 "No changes" = "Нет изменений"
+"No color styles" = "Нет цветовых стилей"
 "No colour variables fit here." = "Нет подходящих цветовых переменных."
 "No colour variables yet. Create them in Local variables." = "Цветовых переменных пока нет. Создайте их в разделе «Локальные переменные»."
 "No comments yet" = "Комментариев пока нет"
+"No compatibility warnings reported" = "Предупреждений о совместимости нет"
 "No components yet. Select layers and press {keys}." = "Компонентов пока нет. Выделите слои и нажмите {keys}."
 "No conflicts." = "Конфликтов нет."
 "No contributor data was built into this copy." = "В этой сборке нет данных об участниках."
+"No device" = "Без устройства"
 "No fonts match" = "Подходящих шрифтов нет"
+"No files or templates match your search" = "Файлы и шаблоны по запросу не найдены"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Код подключения недоступен (сервер не поддерживает коды или адрес нельзя включить в код): поделитесь ссылкой."
 "No layer changes to show." = "Нет изменений слоёв для показа."
 "No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "Библиотек пока нет. Добавьте файл .figcraft, опубликованный как библиотека, или вставьте ссылку на командную библиотеку."
@@ -819,6 +884,7 @@ name = "Русский"
 "No model credits were built into this copy." = "В этой сборке нет сведений об использованных моделях."
 "No number variables fit here." = "Нет подходящих числовых переменных."
 "No number variables yet. Create them in Local variables." = "Числовых переменных пока нет. Создайте их в разделе «Локальные переменные»."
+"No other pages" = "Других страниц нет"
 "No paints" = "Заливок нет"
 "No plugins on {server}." = "На {server} нет плагинов."
 "No plugins yet. Import a development plugin from its figcraft-plugin.json." = "Плагинов пока нет. Импортируйте плагин для разработки из его figcraft-plugin.json."
@@ -836,6 +902,7 @@ name = "Русский"
 "No text styles yet. Click + to create one from the selected text." = "Текстовых стилей пока нет. Нажмите +, чтобы создать стиль из выделенного текста."
 "No variables fit here." = "Нет подходящих переменных."
 "No variables yet. Create them in Local variables." = "Переменных пока нет. Создайте их в разделе «Локальные переменные»."
+"No votes yet" = "Голосов пока нет"
 "Nobody else is here yet" = "Здесь пока больше никого нет"
 "Noise" = "Шум"
 "None" = "Нет"
@@ -885,6 +952,7 @@ name = "Русский"
 "Open branch" = "Открыть ветку"
 "Open file" = "Открыть файл"
 "Open files" = "Открыть файлы"
+"Open presentations" = "Открытые презентации"
 "Open in focus view" = "Открыть в режиме фокуса"
 "Open in new window" = "Открыть в новом окне"
 "Open invite links in FigCraft" = "Открывать ссылки приглашения в FigCraft"
@@ -893,11 +961,15 @@ name = "Русский"
 "Open overlay" = "Открыть оверлей"
 "Open prototype preview" = "Открыть предпросмотр прототипа"
 "Open variables ({count})" = "Открыть переменные ({count})"
+"Opened as a new document" = "Открыт как новый документ"
 "Opened “{name}” in a new tab" = "«{name}» открыт в новой вкладке"
+"Opening the file…" = "Открытие файла…"
+"Opening {n} files as new files" = { one = "Открытие {n} файла как нового", few = "Открытие {n} файлов как новых", many = "Открытие {n} файлов как новых", other = "Открытие {n} файлов как новых" }
 "Open|comments" = "Открытые"
 "Options" = "Параметры"
 "Orange" = "Оранжевый"
 "Order" = "Порядок"
+"Other" = "Другое"
 "Other apps may not open every .fig file exported here." = "Другие приложения могут открыть не каждый экспортированный здесь файл .fig."
 "Others lose access and keep their copy; the file stays on the server for you" = "Другие участники потеряют доступ, сохранив свои копии; файл останется на сервере для вас"
 "Others type this under Share ▸ Join with a code" = "Другие участники вводят это в «Поделиться» ▸ «Подключиться по коду»"
@@ -916,7 +988,12 @@ name = "Русский"
 "PDF print settings" = "Настройки печати PDF"
 "Padding" = "Внутренние отступы"
 "Page" = "Страница"
+"Page deleted" = "Страница удалена"
 "Pages" = "Страницы"
+"Pages added to the document" = "Страницы добавлены в документ"
+"Pause" = "Пауза"
+"Pink" = "Розовый"
+"Placed on the current page" = "Размещено на текущей странице"
 "Pages: {pages}" = "Страницы: {pages}"
 "Paint bucket" = "Заливка области"
 "Pan the canvas" = "Перемещение по холсту"
@@ -931,6 +1008,7 @@ name = "Русский"
 "Paste a team library link (a view link)" = "Вставьте ссылку на командную библиотеку (для просмотра)"
 "Paste here" = "Вставить здесь"
 "Paste to replace" = "Вставить с заменой"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Слои дизайна вставлены; пропущен {n} тип содержимого", few = "Слои дизайна вставлены; пропущены {n} типа содержимого", many = "Слои дизайна вставлены; пропущено {n} типов содержимого", other = "Слои дизайна вставлены; пропущено {n} типа содержимого" }
 "Pattern" = "Паттерн"
 "Pattern alignment" = "Выравнивание паттерна"
 "Pattern scale" = "Масштаб паттерна"
@@ -953,10 +1031,13 @@ name = "Русский"
 "Place a shape or frame (its tool chosen)" = "Разместить фигуру или Frame (выбранным инструментом)"
 "Place automatically" = "Разместить автоматически"
 "Place image" = "Разместить изображение"
+"Plugin" = "Плагин"
+"Plugins & widgets" = "Плагины и виджеты"
 "Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Плагины работают в песочнице FigCraft без доступа к файлам, сети и часам. Устанавливайте только плагины, которым доверяете."
 "Plugins" = "Плагины"
 "Plus darker" = "Линейное затемнение"
 "Plus lighter" = "Линейное осветление"
+"Plus one" = "Плюс один"
 "Point" = "Точка"
 "Points" = "Точки"
 "Polygon" = "Многоугольник"
@@ -984,6 +1065,7 @@ name = "Русский"
 "Preview" = "Предпросмотр"
 "Preview this flow" = "Предпросмотр этого сценария"
 "Preview this frame" = "Предпросмотр этого Frame"
+"Previous frame" = "Предыдущий Frame"
 "Previous ready for dev" = "Предыдущий готовый к разработке"
 "Progressive" = "Прогрессивный"
 "Properties" = "Свойства"
@@ -1004,6 +1086,7 @@ name = "Русский"
 "Push" = "Вытеснение"
 "Push changes to main component" = "Перенести изменения в основной компонент"
 "Put text on path" = "Разместить текст на пути"
+"Question" = "Вопрос"
 "R" = "R"
 "Radial" = "Радиальный"
 "Radius" = "Радиус"
@@ -1021,10 +1104,13 @@ name = "Русский"
 "Reduce motion" = "Уменьшить движение"
 "Refraction" = "Преломление"
 "Regular expression" = "Регулярное выражение"
+"Relative to" = "Относительно"
+"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "Относительно масштаба экрана в системе (100% — собственный размер системы). Масштаб документа задаётся отдельно."
 "Remove" = "Удалить"
 "Remove all" = "Удалить всё"
 "Remove annotation" = "Удалить аннотацию"
 "Remove auto layout" = "Убрать автолейаут"
+"Remove column" = "Удалить столбец"
 "Remove dev resource" = "Удалить ресурс для разработки"
 "Remove export setting" = "Удалить настройку экспорта"
 "Remove from recents" = "Убрать из недавних"
@@ -1033,10 +1119,12 @@ name = "Русский"
 "Remove guide" = "Удалить направляющую"
 "Remove interaction" = "Удалить взаимодействие"
 "Remove library from this file" = "Удалить библиотеку из этого файла"
+"Remove measurement" = "Удалить измерение"
 "Remove min and max" = "Убрать минимум и максимум"
 "Remove min and max height" = "Убрать минимальную и максимальную высоту"
 "Remove min and max width" = "Убрать минимальную и максимальную ширину"
 "Remove regions" = "Удалить области"
+"Remove row" = "Удалить строку"
 "Remove slot" = "Убрать слот"
 "Remove starting point" = "Убрать начальную точку"
 "Remove stop" = "Удалить точку градиента"
@@ -1044,6 +1132,7 @@ name = "Русский"
 "Remove the else and its actions" = "Удалить «Иначе» и его действия"
 "Remove this condition and its actions" = "Удалить это условие и его действия"
 "Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "Удалить файл с сервера? Его больше нельзя будет открывать и публиковать оттуда. Ваша копия останется открытой здесь."
+"Remove {name} from session" = "Убрать {name} из сессии"
 "Remove {name} from {server}?" = "Удалить {name} с {server}?"
 "Removed" = "Удалено"
 "Removed from the server" = "Удалено с сервера"
@@ -1058,6 +1147,7 @@ name = "Русский"
 "Rename on the server…" = "Переименовать на сервере…"
 "Rename page" = "Переименовать страницу"
 "Rename to" = "Новое имя"
+"Reorder selection" = "Изменить порядок выделения"
 "Replace all" = "Заменить всё"
 "Replace mixed export settings" = "Заменить разные настройки экспорта"
 "Replace with" = "Заменить на"
@@ -1077,6 +1167,7 @@ name = "Русский"
 "Resize by the nudge amount" = "Изменить размер на шаг сдвига"
 "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Менять размер Frame под экран устройства (или окно, если устройство не выбрано): ограничения и автолейаут подстраиваются"
 "Resize to fit" = "Подогнать размер"
+"Resizing" = "Изменение размера"
 "Resolve" = "Решить"
 "Resolve change" = "Разрешить изменение"
 "Resolved" = "Решённые"
@@ -1087,11 +1178,15 @@ name = "Русский"
 "Restore main component" = "Восстановить основной компонент"
 "Restore this version" = "Восстановить эту версию"
 "Restored “{name}”" = "«{name}» восстановлено"
+"Retrospective" = "Ретроспектива"
+"Results" = "Результаты"
+"Resume" = "Продолжить"
 "Reverse the order" = "Обратить порядок"
 "Reversed triangle" = "Обратный треугольник"
 "Review and merge" = "Проверить и объединить"
 "Ribbon" = "Лента"
 "Right" = "Справа"
+"Right padding" = "Правый внутренний отступ"
 "Right side" = "Правая сторона"
 "Right side width" = "Ширина правой стороны"
 "Rotate 90°" = "Повернуть на 90°"
@@ -1102,6 +1197,7 @@ name = "Русский"
 "Rotation jitter" = "Колебание угла"
 "Round" = "Круглое"
 "Rounded" = "Скруглённый"
+"Rounded rectangle" = "Скруглённый прямоугольник"
 "Row" = "Строка"
 "Row gap" = "Интервал между строками"
 "Row sizes" = "Размеры строк"
@@ -1111,6 +1207,9 @@ name = "Русский"
 "Rulers" = "Линейки"
 "Run" = "Запустить"
 "Run {label}" = "Запустить {label}"
+"Save file" = "Сохранить файл"
+"Save files automatically" = "Автоматически сохранять файлы"
+"Search pages" = "Поиск страниц"
 "Search templates" = "Поиск шаблонов"
 "See all templates" = "Все шаблоны"
 "Select layers and they space themselves as their content changes" = "Выделите слои: интервалы между ними будут подстраиваться при изменении содержимого"
@@ -1137,6 +1236,8 @@ name = "Русский"
 "Search actions, layers and tools" = "Поиск действий, слоёв и инструментов"
 "Search assets" = "Поиск ресурсов"
 "Search comments" = "Поиск комментариев"
+"Search files and templates" = "Поиск файлов и шаблонов"
+"Search results" = "Результаты поиска"
 "Search fonts" = "Поиск шрифтов"
 "Search layers" = "Поиск слоёв"
 "Search shortcuts" = "Поиск сочетаний клавиш"
@@ -1150,12 +1251,14 @@ name = "Русский"
 "Select all with same" = "Выделить всё с одинаковым"
 "Select layer" = "Выделить слой"
 "Select layers to apply the style to" = "Выделите слои для применения стиля"
+"Select layers with this color" = "Выделить слои с этим цветом"
 "Select overlapping shapes" = "Выделите пересекающиеся фигуры"
 "Select points to edit their position, radius and mirroring" = "Выделите точки для изменения положения, радиуса и зеркальности"
 "Select slot" = "Выделить слот"
 "Selection" = "Выделение"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Область выделения {w} на {h} в {x}, {y}: стрелки — перемещение, Shift+стрелки или {cmd}+стрелки — размер, Enter — выделить, Escape — отменить"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Область выделения: стрелки — перемещение, Shift+стрелки или {cmd}+стрелки — размер, Enter — выделить, Escape — отменить"
+"Selection colors" = "Цвета выделения"
 "Send backward" = "На уровень назад"
 "Send report" = "Отправить жалобу"
 "Send to back" = "На задний план"
@@ -1172,6 +1275,7 @@ name = "Русский"
 "Shape" = "Фигура"
 "Shape builder" = "Конструктор фигур"
 "Shape tools" = "Инструменты фигур"
+"Shapes" = "Фигуры"
 "Share" = "Поделиться"
 "Share this file" = "Поделиться файлом"
 "Share with a code" = "Поделиться по коду"
@@ -1238,10 +1342,13 @@ name = "Русский"
 "Space+drag" = "Пробел+перетаскивание"
 "Spacing" = "Интервал"
 "Spam, stolen work, abuse…" = "Спам, украденные работы, оскорбления…"
+"Speech bubble" = "Выноска"
 "Splay" = "Расхождение"
 "Spotlight me" = "Показывать мой экран всем"
 "Spread" = "Размах"
 "Square" = "Квадрат"
+"Stamp" = "Штамп"
+"Stamps" = "Штампы"
 "Standard" = "Стандартный"
 "Standard ligatures" = "Стандартные лигатуры"
 "Star" = "Звезда"
@@ -1251,18 +1358,26 @@ name = "Русский"
 "Start from a blank canvas" = "Начать с пустого холста"
 "Start from a template" = "Начать с шаблона"
 "Start on path" = "Начало на пути"
+"Start on the Home screen" = "Начинать с главной"
 "Start point" = "Начальная точка"
 "Start sharing" = "Включить общий доступ"
 "Start sharing with the Share button, then pass on the code it gives" = "Включите общий доступ кнопкой «Поделиться», затем передайте полученный код"
+"Start vote" = "Начать голосование"
 "Starting to share…" = "Включение общего доступа…"
 "Status" = "Статус"
 "Sticky" = "Закреплённый"
+"Sticky note" = "Стикер"
+"Sticky note colors" = "Цвета стикеров"
+"Sticky notes" = "Стикеры"
+"Sticky notes, shapes and connectors" = "Стикеры, фигуры и соединители"
 "Stop" = "Остановить"
 "Stop following {name}" = "Перестать следить за {name}"
 "Stop session" = "Завершить сессию"
 "Stop sharing" = "Остановить общий доступ"
 "Stop spotlighting" = "Прекратить показ всем"
+"Stop timer" = "Остановить таймер"
 "Stop {n}  {hex}" = "Точка {n}  {hex}"
+"Straight" = "Прямая"
 "Stretch" = "Растянуть"
 "Strikethrough" = "Зачёркивание"
 "String" = "Строка"
@@ -1307,11 +1422,15 @@ name = "Русский"
 "Text" = "Текст"
 "Text align" = "Выравнивание текста"
 "Text content" = "Содержимое текста"
+"Text size" = "Размер текста"
 "Text style" = "Текстовый стиль"
 "Text styles" = "Текстовые стили"
 "Texts" = "Тексты"
 "Texture" = "Текстура"
 "The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3." = "На холсте цвета отображаются в sRGB; экспортированные PNG, JPG и WebP помечены профилем Display P3."
+"The destination document is unavailable. Nothing was imported." = "Документ назначения недоступен. Ничего не импортировано."
+"The destination document was closed. Nothing was imported." = "Документ назначения закрыт. Ничего не импортировано."
+"The destination page was removed. Nothing was imported." = "Страница назначения удалена. Ничего не импортировано."
 "The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "Файл удаляется с сервера: его больше нельзя будет открыть или подключиться к нему оттуда. Отменить это нельзя. Уже открытые копии остаются у участников."
 "The file now holds another library" = "Теперь файл содержит другую библиотеку"
 "The file now holds another library (\"{name}\")" = "Теперь файл содержит другую библиотеку («{name}»)"
@@ -1321,6 +1440,7 @@ name = "Русский"
 "The selection uses several text styles: click to apply one" = "В выделении несколько текстовых стилей: нажмите, чтобы применить один"
 "The server deletes this file if nobody opens it before {date}." = "Сервер удалит файл, если никто не откроет его до {date}."
 "The whole file" = "Весь файл"
+"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "Окно слишком мало для {size}%, поэтому интерфейс отрисовывается в масштабе {drawn}%. Увеличьте окно, чтобы использовать {size}%."
 "Theme" = "Тема"
 "There's no destination for that action" = "Для этого действия не задано назначение"
 "Thickness" = "Толщина"
@@ -1332,18 +1452,23 @@ name = "Русский"
 "This file" = "Этот файл"
 "This file has unsaved changes" = "В файле есть несохранённые изменения"
 "This file is on {server}, open only to you. Share it to let others in with a new code." = "Файл находится на {server} и доступен только вам. Включите общий доступ, чтобы пригласить других по новому коду."
+"This file is too large to join here (up to {mb} MB)" = "Этот файл слишком большой, чтобы подключиться здесь (до {mb} МБ)"
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "В этом файле используются шрифты, не установленные на этом компьютере. Их текст отрисовывается запасным шрифтом, пока вы их не установите."
 "This frame is new on the branch." = "Этот Frame добавлен в ветке."
 "This frame isn't on the branch." = "Этого Frame нет в ветке."
 "This server is open to the public: no key needed." = "Сервер общедоступен: ключ не нужен."
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Сервер требует ключ: добавьте ?key=… к адресу (`figcraft-server key` выводит его на компьютере сервера)."
 "This server takes files only with its key: see Advanced." = "Сервер принимает файлы только с ключом: см. «Дополнительно»."
+"Thumbs up" = "Палец вверх"
 "Tidy up" = "Упорядочить"
 "Tile" = "Повторение"
 "Tile type" = "Тип повторения"
+"Timer" = "Таймер"
 "Tint" = "Оттенок"
 "Title" = "Заголовок"
 "Title case" = "Каждое Слово С Прописной"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Чтобы поделиться библиотекой с командой, опубликуйте файл на сервере («Поделиться» ▸ «Опубликовать на сервере…»), затем опубликуйте там библиотеку."
+"To the layer around it" = "До родительского слоя"
 "Toggle" = "Переключить"
 "Toggle light/dark theme" = "Переключить светлую/тёмную тему"
 "Toggle visibility" = "Переключить видимость"
@@ -1351,15 +1476,19 @@ name = "Русский"
 "Top" = "Сверху"
 "Top & bottom" = "Сверху и снизу"
 "Top left radius" = "Радиус верхнего левого угла"
+"Top padding" = "Верхний внутренний отступ"
 "Top right radius" = "Радиус верхнего правого угла"
 "Transform" = "Трансформация"
+"Triangle" = "Треугольник"
 "Triangle arrow" = "Треугольная стрелка"
 "Trigger" = "Триггер"
+"Trigger layer" = "Слой-триггер"
 "True" = "Истина"
 "Truncate text" = "Обрезать текст"
 "Truncate with an ellipsis" = "Обрезать с многоточием"
 "Try again" = "Повторить"
 "Try another search or filter." = "Попробуйте другой запрос или фильтр."
+"Try another search, or browse templates." = "Попробуйте другой запрос или просмотрите шаблоны."
 "Try another word, or look at every kind." = "Попробуйте другое слово или посмотрите все категории."
 "Turn a layer into a component, reuse it, and change every copy at once" = "Превратите слой в компонент, используйте повторно и изменяйте все копии сразу"
 "Two digits" = "Две цифры"
@@ -1377,7 +1506,7 @@ name = "Русский"
 "Unread" = "Непрочитанные"
 "Unresolve" = "Снова открыть"
 "Unsaved changes" = "Несохранённые изменения"
-"Unsaved changes in {names}. Close the window and lose them?" = "Несохранённые изменения в {names}. Закрыть окно и потерять их?"
+"Unsaved changes in {names}. Save them before closing?" = "Несохранённые изменения в {names}. Сохранить их перед закрытием?"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Есть несохранённые изменения: сохраните ({save}) или закройте вкладку нажатием с {alt}, чтобы отбросить их"
 "Unsaved changes: save first, or close again with {key} to discard" = "Есть несохранённые изменения: сохраните или закройте ещё раз с {key}, чтобы отбросить их"
 "Up" = "Вверх"
@@ -1387,6 +1516,8 @@ name = "Русский"
 "Update from selection" = "Обновить из выделения"
 "Updated {components} and {styles}" = "Обновлено: {components} и {styles}"
 "Updated {name}" = "Обновлено: {name}"
+"Updating the graphics driver often helps. To use OpenGL only, start FigCraft from a Command Prompt with:" = "Часто помогает обновление драйвера видеокарты. Чтобы использовать только OpenGL, запустите FigCraft из командной строки с параметром:"
+"Updating the graphics driver often helps. WGPU_BACKEND (vulkan, gl, metal) names another graphics API to try." = "Часто помогает обновление драйвера видеокарты. Переменная WGPU_BACKEND (vulkan, gl, metal) задаёт другой графический API, который можно попробовать."
 "Uploads this file to a FigCraft server and keeps this tab in sync with it. You get a link to edit and a link to view." = "Загружает файл на сервер FigCraft и синхронизирует эту вкладку с ним. Вы получите ссылки для редактирования и просмотра."
 "Uppercase" = "Прописные"
 "Use a fixed value" = "Использовать фиксированное значение"
@@ -1394,7 +1525,9 @@ name = "Русский"
 "Use as mask" = "Использовать как маску"
 "Use auto layout" = "Использовать автолейаут"
 "Use number keys for opacity" = "Задавать непрозрачность цифровыми клавишами"
+"Use the .figcraft or .fig extension." = "Используйте расширение .figcraft или .fig."
 "Use the layer's fill" = "Использовать заливку слоя"
+"Use your browser's zoom to change the interface size." = "Изменяйте размер интерфейса масштабом браузера."
 "Used in {files} · {instances}" = "Используется в {files} · {instances}"
 "Username" = "Имя пользователя"
 "Value" = "Значение"
@@ -1429,6 +1562,9 @@ name = "Русский"
 "Visibility" = "Видимость"
 "Visible" = "Видимый"
 "Vivid" = "Яркий"
+"Votes per person" = "Голосов на человека"
+"Voting session" = "Голосование"
+"WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "Переменная WGPU_BACKEND задана и указывает используемый графический API; если её убрать, FigCraft выберет сам."
 "Warm" = "Тёплый"
 "Watch" = "Часы"
 "Wavy" = "Волнистый"
@@ -1437,6 +1573,7 @@ name = "Русский"
 "WebSocket URL" = "URL WebSocket"
 "WebSocket URL copied" = "URL WebSocket скопирован"
 "Wedge" = "Клин"
+"Weekly planner" = "План на неделю"
 "Weight" = "Толщина"
 "What you try here changes this preview and the code below, not the file" = "Здесь меняются только предпросмотр и код ниже; файл остаётся без изменений"
 "What changed since it was marked ready for dev" = "Изменения после отметки «Готово к разработке»"
@@ -1447,7 +1584,9 @@ name = "Русский"
 "While pressing" = "При удержании"
 "White" = "Белый"
 "Who runs it, its terms and how long it keeps files" = "Оператор, условия и срок хранения файлов"
+"Whole screen" = "Весь экран"
 "Why it changed" = "Причина изменения"
+"Widget" = "Виджет"
 "Widgets" = "Виджеты"
 "Width" = "Ширина"
 "Width point" = "Точка ширины"
@@ -1486,26 +1625,123 @@ name = "Русский"
 "call any command its access allows" = "вызывать любые команды в рамках разрешений"
 "call only: {commands}" = "вызывать только: {commands}"
 "can edit the document" = "может редактировать документ"
+"can save files" = "может сохранять файлы"
+"conditional prototype actions nested too deeply were skipped" = "условные действия прототипа со слишком глубокой вложенностью пропущены"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "условные действия прототипа с условиями, которые нельзя вычислить, пропущены"
+"connector label background was skipped: style data is missing" = "фон подписи соединительной линии пропущен: нет данных стиля"
+"connector label was skipped: background bounds are invalid" = "подпись соединительной линии пропущена: недопустимые границы фона"
+"connector label was skipped: background transform is invalid" = "подпись соединительной линии пропущена: недопустимая трансформация фона"
+"connector label was skipped: composed text transform is invalid" = "подпись соединительной линии пропущена: недопустимая составная трансформация текста"
+"connector label was skipped: derived background bounds are missing" = "подпись соединительной линии пропущена: нет вычисленных границ фона"
+"connector label was skipped: derived text bounds are missing" = "подпись соединительной линии пропущена: нет вычисленных границ текста"
+"connector label was skipped: text bounds are invalid" = "подпись соединительной линии пропущена: недопустимые границы текста"
+"connector label was skipped: text style data is missing" = "подпись соединительной линии пропущена: нет данных стиля текста"
+"connector label was skipped: text transform is invalid" = "подпись соединительной линии пропущена: недопустимая трансформация текста"
+"connector labels were skipped" = "подписи соединительных линий пропущены"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "соединительные линии импортируются как статичные снимки фреймов или векторов, с подписями, если они есть; динамические привязки концов не сохраняются"
+"connector snapshot vector data is missing; connector was left empty" = "нет векторных данных снимка соединительной линии; соединительная линия оставлена пустой"
+"connectors whose ends can't be placed are empty" = "соединительные линии, концы которых нельзя разместить, пусты"
 "crop marks" = "метки обреза"
+"damaged vector geometry was skipped" = "повреждённая векторная геометрия пропущена"
+"damaged vector networks import as outlines" = "повреждённые векторные сети импортируются как контуры"
 "development: {path}" = "разработка: {path}"
+"document children other than pages were skipped" = "дочерние элементы документа, не являющиеся страницами, пропущены"
+"duplicate grid track sizing entries use equal tracks" = "для повторяющихся записей размеров треков сетки используются равные треки"
 "e.g. count + 1" = "например, count + 1"
 "e.g. count >= 3 and not done" = "например, count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "ломаные и изогнутые соединительные линии без сохранённого пути импортируются как прямые"
+"entries without a node type were skipped" = "записи без типа узла пропущены"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "Ссылки figcraft:// из браузера, чата или почты открывают это приложение и подключают к сессии."
+"filled areas of a vector with their own fill use the layer's fill" = "залитые области вектора с собственной заливкой используют заливку слоя"
 "from {server}" = "с {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "триггеры геймпада без ровно одной известной кнопки контроллера пропущены"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "список треков сетки превышает 1000 записей; треки получают стандартный равный размер"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "размеры треков сетки не поддерживаются или повреждены; затронутые треки получают равный размер"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "список размеров треков сетки превышает 1000 записей; треки получают стандартный равный размер"
 "hidden" = "скрыто"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "фильтры изображения неоднозначны, так как есть оба контейнера фильтров; преобразование фильтров пропущено"
+"image filters use FigCraft's approximate renderer" = "фильтры изображения отрисовываются приблизительно средствами FigCraft"
+"instance swap properties whose default component isn't in the file were skipped" = "свойства замены экземпляра, компонент по умолчанию которых отсутствует в файле, пропущены"
+"instances inside their own main component were imported as frames" = "экземпляры внутри собственного основного компонента импортированы как фреймы"
+"instances of components that aren't in the file show no layers" = "экземпляры компонентов, которых нет в файле, не показывают слоёв"
+"instances of components that aren't in the file were imported as frames" = "экземпляры компонентов, которых нет в файле, импортированы как фреймы"
+"instances that would nest a component inside itself were imported as frames" = "экземпляры, которые вложили бы компонент в самого себя, импортированы как фреймы"
+"instances without a main component were imported as empty frames" = "экземпляры без основного компонента импортированы как пустые фреймы"
+"invalid internal .fig text path data was ignored" = "недопустимые внутренние данные текста на пути из .fig проигнорированы"
+"invalid or oversized vector networks import as outlines" = "недопустимые или слишком большие векторные сети импортируются как контуры"
+"invalid or oversized vector path data was skipped" = "недопустимые или слишком большие данные векторных путей пропущены"
 "just now" = "только что"
+"key triggers without a supported key were skipped" = "триггеры клавиш без поддерживаемой клавиши пропущены"
+"key up triggers import as key presses" = "триггеры отпускания клавиши импортируются как нажатия клавиши"
+"layers without a position were placed at their parent's origin" = "слои без положения размещены в начале координат родителя"
+"layers without a type were skipped" = "слои без типа пропущены"
+"legacy image filter container is unsupported; filter conversion was skipped" = "устаревший контейнер фильтров изображения не поддерживается; преобразование фильтров пропущено"
 "locked" = "заблокировано"
+"malformed image filters container was skipped" = "повреждённый контейнер фильтров изображения пропущен"
+"malformed image paintFilter container was skipped" = "повреждённый контейнер paintFilter изображения пропущен"
+"malformed slot content assignment was skipped" = "повреждённое назначение содержимого слота пропущено"
 "no bleed" = "без вылета"
 "nobody else here yet" = "здесь пока больше никого нет"
+"non-default slot settings are not represented and were skipped" = "нестандартные настройки слотов не передаются и пропущены"
 "now" = "сейчас"
+"offer files to save if it asks to (you choose where each one goes)" = "предлагать файлы для сохранения, если запросит (куда сохранить каждый, выбираете вы)"
+"only in a text style or variable" = "только в текстовом стиле или переменной"
 "or" = "или"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "соединения обводки в точках сохранены; пунктирные обводки и обводки переменной ширины рисуются с соединением слоя"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "ключи предпочтительных компонентов слотов не удалось сопоставить со слоями файла, они пропущены"
+"prototype actions of unknown types were skipped" = "действия прототипа неизвестных типов пропущены"
+"prototype actions without a destination in the file were skipped" = "действия прототипа без цели в файле пропущены"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "выражения прототипа с переменными, которых нет в JSON переменных, пропущены"
+"prototype expressions with unsupported functions were skipped" = "выражения прототипа с неподдерживаемыми функциями пропущены"
+"prototype interactions without supported actions were skipped" = "взаимодействия прототипа без поддерживаемых действий пропущены"
+"prototype navigations of unknown types were skipped" = "действия навигации прототипа неизвестных типов пропущены"
+"prototype transitions of unknown types play instantly" = "переходы прототипа неизвестных типов выполняются мгновенно"
+"prototype triggers of unknown types were skipped" = "триггеры прототипа неизвестных типов пропущены"
 "put a widget on the canvas" = "размещать виджет на холсте"
 "read and edit the document" = "читать и редактировать документ"
 "read the document" = "читать документ"
 "reads the document" = "читает документ"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "действия «Задать переменную» для переменных, которых нет в JSON переменных, пропущены"
+"set-variable actions with values that can't be evaluated were skipped" = "действия «Задать переменную» со значениями, которые нельзя вычислить, пропущены"
+"set-variable actions with values that don't fit the variable were skipped" = "действия «Задать переменную» со значениями, не подходящими переменной, пропущены"
+"set-variable actions without a value were skipped" = "действия «Задать переменную» без значения пропущены"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "действия смены режима переменных для коллекций или режимов, которых нет в JSON переменных, пропущены"
+"slot content assignment target is missing or is not slot content" = "цель назначения содержимого слота отсутствует или не является содержимым слота"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "назначение содержимого слота использует пустой GUID-маркер и пропущено"
+"slot layers without a matching slot property were imported as frames" = "слои слотов без подходящего свойства слота импортированы как фреймы"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "некоторые векторные точки ссылаются на настройки точек, которых нет в файле; они используют соединения слоя и обычные углы"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "некоторые векторные сегменты ссылаются на настройки стиля, которых нет в файле; они используют обводку слоя"
+"stale or invalid grid track sizing entries were ignored" = "устаревшие или недопустимые записи размеров треков сетки проигнорированы"
+"stars and polygons without point counts or geometry use the default point count" = "звёзды и многоугольники без числа вершин или геометрии используют число вершин по умолчанию"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "настройки стиля некоторых векторных сегментов не поддерживаются; эти сегменты используют обводку слоя"
+"text path underline or strikethrough decoration is not rendered" = "подчёркивание и зачёркивание текста на пути не отображаются"
+"text style overrides refer to missing table entries" = "переопределения текстовых стилей ссылаются на отсутствующие записи таблицы"
+"the file has no pages" = "в файле нет страниц"
 "the plugin" = "плагин"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "в JSON переменных нет `variableCollections` (ожидался ответ с локальными переменными), он проигнорирован"
 "this session only" = "только эта сессия"
+"unknown component property types were skipped" = "неизвестные типы свойств компонентов пропущены"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "псевдонимы переменных, которых нет в JSON переменных (или другого типа), пропущены"
+"variable bindings to properties the layer doesn't have were skipped" = "привязки переменных к свойствам, которых нет у слоя, пропущены"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "привязки к переменным, которых нет в JSON переменных (переменные библиотеки), пропущены"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "привязки переменных пропущены: в JSON файла нет определений переменных (передайте JSON локальных переменных как `variables` или вложите его `meta` рядом с JSON файла)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "привязки переменных, тип которых не подходит свойству, пропущены"
+"variable collections without modes were skipped" = "коллекции переменных без режимов пропущены"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "обращения к режимам переменных в выражениях прототипа, не состоящие из переменной и одного из её режимов, пропущены"
+"variable modes of collections that aren't in the file were skipped" = "режимы переменных коллекций, которых нет в файле, пропущены"
+"variable modes of collections that aren't in the variables JSON were skipped" = "режимы переменных коллекций, которых нет в JSON переменных, пропущены"
+"variable values that don't match their type (or composed colours) were skipped" = "значения переменных, не соответствующие своему типу (или составные цвета), пропущены"
+"variables of unknown types were skipped" = "переменные неизвестных типов пропущены"
+"variables whose collection isn't in the variables JSON were skipped" = "переменные, коллекции которых нет в JSON переменных, пропущены"
+"variables without readable values were skipped" = "переменные без читаемых значений пропущены"
+"vector points with unknown stroke joins use the layer join" = "векторные точки с неизвестными соединениями обводки используют соединение слоя"
+"vectors without geometry are empty" = "векторы без геометрии пусты"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "векторы без геометрии пусты (экспортируйте JSON файла с geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "очень длинный текст обрезан до 1 048 576 символов"
+"very long vector paths were skipped" = "очень длинные векторные пути пропущены"
+"video actions are not supported and were skipped" = "действия с видео не поддерживаются и пропущены"
+"video triggers are not supported and were skipped" = "триггеры видео не поддерживаются и пропущены"
 "yesterday" = "вчера"
 "{instances} in {files}" = "{instances} в {files}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}: черновой перевод, ожидает проверки носителем языка."
@@ -1515,6 +1751,7 @@ name = "Русский"
 "{name} is forgotten on this computer; the file stays on {server}" = "{name} забыт на этом компьютере; файл остаётся на {server}"
 "{name} is on the server." = "{name} находится на сервере."
 "{name} is spotlighting" = "{name} показывает экран всем"
+"{name} is too large to open in the browser (over 512 MB)." = "Файл {name} слишком велик для открытия в браузере (больше 512 МБ)."
 "{name}\nClick to apply to the selection" = "{name}\nНажмите, чтобы применить к выделению"
 "{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nПеретащите на холст или нажмите, чтобы разместить в центре вида.\nУдерживайте Alt (Option) при переносе на экземпляр, чтобы заменить его."
 "{name} (from {library})" = "{name} (из {library})"
@@ -1548,8 +1785,10 @@ name = "Русский"
 "{n} layers selected" = { one = "Выделен {n} слой", few = "Выделены {n} слоя", many = "Выделено {n} слоёв", other = "Выделено {n} слоя" }
 "{n} layers · {parts}" = { one = "{n} слой · {parts}", few = "{n} слоя · {parts}", many = "{n} слоёв · {parts}", other = "{n} слоя · {parts}" }
 "{n} matches" = { one = "{n} совпадение", few = "{n} совпадения", many = "{n} совпадений", other = "{n} совпадения" }
+"{n} min" = "{n} мин"
 "{n} minutes ago" = { one = "{n} минуту назад", few = "{n} минуты назад", many = "{n} минут назад", other = "{n} минуты назад" }
 "{n} months ago" = { one = "{n} месяц назад", few = "{n} месяца назад", many = "{n} месяцев назад", other = "{n} месяца назад" }
+"{n} more notes omitted from this report" = { one = "Ещё {n} замечание не включено в этот отчёт", few = "Ещё {n} замечания не включены в этот отчёт", many = "Ещё {n} замечаний не включено в этот отчёт", other = "Ещё {n} замечания не включено в этот отчёт" }
 "{n} of {total}" = "{n} из {total}"
 "{n} people joined" = { one = "Подключился {n} участник", few = "Подключились {n} участника", many = "Подключились {n} участников", other = "Подключилось {n} участника" }
 "{n} preferred components" = { one = "{n} предпочтительный компонент", few = "{n} предпочтительных компонента", many = "{n} предпочтительных компонентов", other = "{n} предпочтительного компонента" }
@@ -1558,7 +1797,10 @@ name = "Русский"
 "{n} replies" = { one = "{n} ответ", few = "{n} ответа", many = "{n} ответов", other = "{n} ответа" }
 "{n} rows" = { one = "{n} строка", few = "{n} строки", many = "{n} строк", other = "{n} строки" }
 "{n} styles" = { one = "{n} стиль", few = "{n} стиля", many = "{n} стилей", other = "{n} стиля" }
+"{n} text layers" = { one = "{n} текстовый слой", few = "{n} текстовых слоя", many = "{n} текстовых слоёв", other = "{n} текстовых слоя" }
 "{n} variables" = { one = "{n} переменная", few = "{n} переменные", many = "{n} переменных", other = "{n} переменной" }
+"{n} votes" = { one = "{n} голос", few = "{n} голоса", many = "{n} голосов", other = "{n} голоса" }
+"{n} votes left" = { one = "Остался {n} голос", few = "Осталось {n} голоса", many = "Осталось {n} голосов", other = "Осталось {n} голоса" }
 "{n} weeks ago" = { one = "{n} неделю назад", few = "{n} недели назад", many = "{n} недель назад", other = "{n} недели назад" }
 "{n} years ago" = { one = "{n} год назад", few = "{n} года назад", many = "{n} лет назад", other = "{n} года назад" }
 "{n}d" = "{n} д"
@@ -1566,6 +1808,7 @@ name = "Русский"
 "{n}m" = "{n} мин"
 "{n}w" = "{n} нед"
 "{page}, nothing selected" = "{page}, ничего не выделено"
+"{percent}%" = "{percent}%"
 "{profile} (current)" = "{profile} (текущий)"
 "{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} — значение свойства; {property ? \"a\" : \"b\"} выбирает строку. Другие {…} остаются как есть."
 "{server} can't say what became of your files (it is older than this app)." = "{server} не может сообщить, что стало с вашими файлами (версия сервера старее приложения)."
@@ -1608,8 +1851,28 @@ name = "Русский"
 "arrange.front" = "На передний план"
 "arrange.packH" = "Уплотнить по горизонтали"
 "arrange.packV" = "Уплотнить по вертикали"
+"arrange.reorder" = "Изменить порядок выделения"
 "arrange.roundToPixels" = "Округлить до пикселей"
+"arrange.spacing" = "Интервал"
 "arrange.tidy" = "Упорядочить"
+"board.connector" = "Соединитель"
+"board.ink" = "Штрих маркера"
+"board.label" = "Подпись соединителя"
+"board.nextSticky" = "Следующий стикер"
+"board.reattach" = "Переподключить соединитель"
+"board.setColor" = "Цвет на доске"
+"board.setStyle" = "Стиль на доске"
+"board.shape" = "Фигура с текстом"
+"board.stamp" = "Штамп"
+"board.sticky" = "Стикер"
+"board.table" = "Таблица"
+"board.tableEdit" = "Изменить таблицу"
+"board.template" = "Шаблон доски"
+"board.templates" = "Список шаблонов доски"
+"board.timer" = "Таймер"
+"board.timerState" = "Состояние таймера"
+"board.vote" = "Голосование"
+"board.voteResults" = "Результаты голосования"
 "bool.exclude" = "Исключить выделение"
 "bool.flatten" = "Свести булеву группу"
 "bool.intersect" = "Пересечь выделение"
@@ -1641,6 +1904,7 @@ name = "Русский"
 "collab.publish" = "Опубликовать на сервере"
 "collab.recoverFile" = "Восстановить онлайн-файл"
 "collab.registerLinks" = "Открывать ссылки приглашения в FigCraft"
+"collab.removePerson" = "Убрать из сессии"
 "collab.report" = "Пожаловаться на файл оператору сервера"
 "collab.serverInfo" = "Информация о сервере"
 "collab.share" = "Поделиться по коду подключения"
@@ -1686,6 +1950,9 @@ name = "Русский"
 "dev.focus" = "Режим фокуса"
 "dev.resolveChange" = "Разрешить изменение"
 "dev.unfocus" = "Выйти из режима фокуса"
+"devMode.addMeasurement" = "Добавить измерение"
+"devMode.measurements" = "Список измерений"
+"devMode.removeMeasurement" = "Удалить измерение"
 "devResource.add" = "Добавить ресурс для разработки"
 "devResource.edit" = "Изменить ресурс для разработки"
 "devResource.list" = "Список ресурсов для разработки"
@@ -1709,6 +1976,7 @@ name = "Русский"
 "edit.duplicate" = "Дублировать"
 "edit.findReplace" = "Найти и заменить"
 "edit.paste" = "Вставить"
+"edit.pasteDesignLayers" = "Вставить слои дизайна"
 "edit.pasteOver" = "Вставить поверх выделения"
 "edit.pasteProperties" = "Вставить свойства"
 "edit.pasteReplace" = "Вставить с заменой"
@@ -1732,7 +2000,9 @@ name = "Русский"
 "file.exportLayers" = "Экспортировать слои"
 "file.exportSvg" = "Экспортировать выделение в SVG"
 "file.import" = "Импорт"
+"file.moveTab" = "Переместить вкладку"
 "file.new" = "Новый файл дизайна"
+"file.newBoard" = "Новая доска"
 "file.newFromTemplate" = "Создать из шаблона"
 "file.open" = "Открыть"
 "file.openRecent" = "Открыть недавние"
@@ -1817,6 +2087,7 @@ name = "Русский"
 "object.batchRename" = "Массовое переименование"
 "object.convertToFrame" = "Преобразовать во Frame"
 "object.convertToGroup" = "Преобразовать в группу"
+"object.convertToSection" = "Преобразовать в секцию"
 "object.flipH" = "Отразить по горизонтали"
 "object.flipV" = "Отразить по вертикали"
 "object.frameSelection" = "Поместить выделение во Frame"
@@ -1863,6 +2134,7 @@ name = "Русский"
 "plugin.ui" = "Панель плагина"
 "plugins.manage" = "Управление плагинами…"
 "plugins.runLast" = "Запустить последний плагин"
+"pref.autoSave" = "Автоматически сохранять файлы"
 "pref.highlightHover" = "Подсвечивать слои при наведении"
 "pref.keepTool" = "Оставлять инструмент выбранным после использования"
 "pref.language" = "Язык интерфейса"
@@ -1872,6 +2144,8 @@ name = "Русский"
 "pref.reduceMotion" = "Уменьшить движение"
 "pref.renameDuplicates" = "Переименовывать дубликаты слоёв"
 "pref.showDimensions" = "Показать размеры объектов"
+"pref.startOnHome" = "Начинать с главной"
+"pref.uiScale" = "Размер интерфейса"
 "pref.userName" = "Ваше имя в комментариях"
 "proto.action.add" = "Добавить действие прототипа"
 "proto.action.move" = "Изменить порядок действия прототипа"
@@ -1915,6 +2189,12 @@ name = "Русский"
 "select.sameStroke" = "Выделить с одинаковой обводкой"
 "select.sameText" = "Выделить с одинаковыми свойствами текста"
 "select.set" = "Выделить"
+"selection.applyColorStyle" = "Применить цветовой стиль к выделению"
+"selection.bindColorVariable" = "Применить цветовую переменную к выделению"
+"selection.colors" = "Цвета выделения"
+"selection.detachColor" = "Отвязать цвет выделения"
+"selection.selectColor" = "Выделить слои с этим цветом"
+"selection.setPaint" = "Изменить цвет выделения"
 "shape.arrow" = "Стрелка"
 "shape.ellipse" = "Эллипс"
 "shape.line" = "Линия"
@@ -1973,14 +2253,18 @@ name = "Русский"
 "text.listIndent" = "Увеличить отступ списка"
 "text.listOutdent" = "Уменьшить отступ списка"
 "text.listStyle" = "Стиль списка"
+"text.loadFont" = "Загрузить файл шрифта"
 "text.maxLines" = "Максимум строк"
+"text.missingFonts" = "Отсутствующие шрифты"
 "text.numberList" = "Нумерованный список"
 "text.onPath" = "Текст на пути"
 "text.paragraphIndent" = "Абзацный отступ"
 "text.paragraphSpacing" = "Интервал между абзацами"
 "text.pathOptions" = "Параметры текста на пути"
 "text.preview" = "Предпросмотр изменения текста"
+"text.refit" = "Подогнать текст под шрифты"
 "text.removeFromPath" = "Снять текст с пути"
+"text.rescanFonts" = "Повторно найти установленные шрифты"
 "text.set" = "Задать текст"
 "text.setFeatures" = "Функции OpenType"
 "text.setVariations" = "Оси вариативного шрифта"
@@ -1995,10 +2279,14 @@ name = "Русский"
 "text.weightUp" = "Увеличить толщину шрифта"
 "tool.arrow" = "Стрелка"
 "tool.comment" = "Комментарий"
+"tool.connector" = "Соединитель"
 "tool.ellipse" = "Эллипс"
+"tool.eraser" = "Ластик"
 "tool.frame" = "Frame"
 "tool.hand" = "Рука"
+"tool.highlighter" = "Текстовыделитель"
 "tool.line" = "Линия"
+"tool.marker" = "Маркер"
 "tool.move" = "Перемещение"
 "tool.pen" = "Перо"
 "tool.pencil" = "Карандаш"
@@ -2010,9 +2298,12 @@ name = "Русский"
 "tool.scaleAnchor" = "Центр масштабирования"
 "tool.section" = "Секция"
 "tool.set" = "Выбрать инструмент"
+"tool.shape" = "Фигуры"
 "tool.shapeBuilder" = "Конструктор фигур"
 "tool.slice" = "Срез"
+"tool.stamp" = "Штамп"
 "tool.star" = "Звезда"
+"tool.sticky" = "Стикер"
 "tool.text" = "Текст"
 "transform.move" = "Перемещение"
 "transform.moveTo" = "Переместить в"
@@ -2074,11 +2365,13 @@ name = "Русский"
 "vector.edit.tool" = "Инструмент редактирования вектора"
 "vector.edit.transform" = "Трансформировать точки"
 "vector.edit.widthPoint" = "Точка ширины"
+"vector.fillRule" = "Задать правило заливки"
 "vector.flatten" = "Свести"
 "vector.join" = "Соединить выделение"
 "vector.offset" = "Сместить путь"
 "vector.outlineStroke" = "Преобразовать обводку в контур"
 "vector.reverse" = "Обратить направление пути"
+"vector.reverseLoop" = "Развернуть контур"
 "vector.simplify" = "Упростить вектор"
 "vector.smoothJoin" = "Плавно соединить выделение"
 "version.autosave" = "Автосохранить версию"
@@ -2140,6 +2433,8 @@ name = "Русский"
 "widget.click" = "Нажать виджет"
 "widget.insert" = "Вставить виджет"
 "widget.list" = "Список виджетов"
+"widget.menu" = "Меню виджета"
+"widget.setText" = "Изменить поле виджета"
 "window.focus" = "Вывести окно на передний план"
 "window.new" = "Новое окно"
 "template.list" = "Список шаблонов"
diff --git a/crates/ui-egui/locales/sv.toml b/crates/ui-egui/locales/sv.toml
index c952418f..aba26633 100644
--- a/crates/ui-egui/locales/sv.toml
+++ b/crates/ui-egui/locales/sv.toml
@@ -7,6 +7,9 @@
 name = "Svenska"
 
 [ui]
+"Relative to" = "Relativt till"
+"Trigger layer" = "Utlösande lager"
+"Whole screen" = "Hela skärmen"
 
 "% of all commits" = "% av alla commits"
 "(no longer published)" = "(publiceras inte längre)"
@@ -14,8 +17,10 @@ name = "Svenska"
 "+ Create variable" = "+ Skapa variabel"
 ".fig (experimental)" = ".fig (experimentell)"
 "1…9, 0" = "1…9, 0"
-"@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PR:er, {commits} commits, +{added} / −{deleted} rader (Δ {delta}), +{bin_added} / −{bin_deleted} binära tillgångar, {first} – {last}"
-"A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "En samling i den här filen med dessa lägen och variabler: åsidosätt deras värden per läge och lägg till egna variabler"
+"@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PR:er, {commits} commits, +{added} / −{deleted} rader (Δ {delta}), +{bin_added} / −{bin_deleted} binära resurser, {first} – {last}"
+"A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "En samling i den här filen med dessa lägen och variabler: ange overrides för deras värden per läge och lägg till egna variabler"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Det finns redan en .figcraft-fil med det här namnet. Välj dess fullständiga namn för att bekräfta att den ersätts."
+"A layer on its own aligns to its frame: select more layers, or one in a frame" = "Ett ensamt lager justeras mot sin frame: markera fler lager, eller ett lager i en frame"
 "A responsive product page: hero, features, figures, a quote and a footer" = "En responsiv produktsida: toppsektion, funktioner, figurer, ett citat och en sidfot"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "En fjäder spelas tills den stannar: dess massa, styvhet och dämpning avgör hur länge"
 "A title, an agenda, a big figure, a chart and a closing slide" = "En titel, en agenda, en stor figur, ett diagram och en avslutande bild"
@@ -32,15 +37,17 @@ name = "Svenska"
 "Add a category" = "Lägg till en kategori"
 "Add a comment" = "Lägg till en kommentar"
 "Add a description" = "Lägg till en beskrivning"
-"Add a frame (F) or a shape (R) to get started" = "Lägg till en ram (F) eller en form (R) för att komma igång"
+"Add a frame (F) or a shape (R) to get started" = "Lägg till en frame (F) eller en form (R) för att komma igång"
 "Add a layer or component to tile first" = "Lägg först till ett lager eller en komponent att lägga sida vid sida"
+"Add a minute" = "Lägg till en minut"
 "Add a note for developers" = "Lägg till en anteckning för utvecklare"
 "Add action" = "Lägg till åtgärd"
 "Add actions for when no condition holds" = "Lägg till åtgärder för när inget villkor uppfylls"
 "Add an annotation for developers" = "Lägg till en annotering för utvecklare"
 "Add another condition" = "Lägg till ett villkor till"
-"Add auto layout" = "Lägg till automatisk layout"
+"Add auto layout" = "Lägg till auto layout"
 "Add background behind overlay" = "Lägg till bakgrund bakom överlägg"
+"Add column" = "Lägg till kolumn"
 "Add content to this slot" = "Lägg till innehåll i facket"
 "Add dev resource" = "Lägg till utvecklarresurs"
 "Add effect" = "Lägg till effekt"
@@ -52,6 +59,7 @@ name = "Svenska"
 "Add library file…" = "Lägg till biblioteksfil…"
 "Add max height" = "Lägg till maxhöjd"
 "Add max width" = "Lägg till maxbredd"
+"Add measurement" = "Lägg till mått"
 "Add min height" = "Lägg till minhöjd"
 "Add min width" = "Lägg till minbredd"
 "Add mode" = "Lägg till läge"
@@ -59,12 +67,14 @@ name = "Svenska"
 "Add or update collections from a variables JSON" = "Lägg till eller uppdatera samlingar från en variabel-JSON"
 "Add properties to make instances configurable" = "Lägg till egenskaper för att göra instanser konfigurerbara"
 "Add reaction" = "Lägg till reaktion"
+"Add row" = "Lägg till rad"
 "Add starting point" = "Lägg till startpunkt"
 "Add stroke" = "Lägg till kontur"
 "Add variant" = "Lägg till variant"
 "Add variant with a new value" = "Lägg till variant med ett nytt värde"
 "Added" = "Tillagd"
 "Added the library \"{name}\"" = "Biblioteket ”{name}” har lagts till"
+"Adding to {name}" = "Lägger till i {name}"
 "Adjust" = "Justera"
 "Adjustment presets" = "Justeringsförinställningar"
 "Advanced" = "Avancerat"
@@ -87,8 +97,14 @@ name = "Svenska"
 "All comments" = "Alla kommentarer"
 "All components" = "Alla komponenter"
 "All fonts" = "Alla typsnitt"
+"All objects" = "Alla objekt"
 "All supported properties" = "Alla egenskaper som stöds"
+"All the fonts this file uses are installed" = "Alla typsnitt som filen använder är installerade"
 "All variables" = "Alla variabler"
+"Along the bottom" = "Längs nederkanten"
+"Along the left" = "Längs vänsterkanten"
+"Along the right" = "Längs högerkanten"
+"Along the top" = "Längs överkanten"
 "Alpha" = "Alfa"
 "Alphabetical" = "I bokstavsordning"
 "Alt+drag" = "Alt+dra"
@@ -121,9 +137,10 @@ name = "Svenska"
 "Archived" = "Arkiverad"
 "Arrange" = "Ordna"
 "Arrow" = "Pil"
+"Arrow at the end" = "Pil i slutet"
 "As typed" = "Som inskrivet"
 "Asking the server…" = "Frågar servern…"
-"Assets" = "Tillgångar"
+"Assets" = "Resurser"
 "Aug" = "aug"
 "Auto" = "Auto"
 "Auto (space around)" = "Auto (utrymme runt om)"
@@ -133,15 +150,15 @@ name = "Svenska"
 "Auto columns" = "Automatiska kolumner"
 "Auto gap" = "Automatiskt mellanrum"
 "Auto height" = "Automatisk höjd"
-"Auto layout" = "Automatisk layout"
+"Auto layout" = "Auto layout"
 "Auto rows" = "Automatiska rader"
 "Auto width" = "Automatisk bredd"
 "Back to the FigCraft server" = "Tillbaka till FigCraft-servern"
-"Back to the font's value" = "Tillbaka till teckensnittets värde"
+"Back to the font's value" = "Tillbaka till typsnittets värde"
 "Back" = "Tillbaka"
 "Back to Ready for dev" = "Tillbaka till Redo för utveckling"
 "Back to Ready for dev: the next change compares with how it is now" = "Tillbaka till Redo för utveckling: nästa ändring jämförs med hur det ser ut nu"
-"Back to assets" = "Tillbaka till tillgångar"
+"Back to assets" = "Tillbaka till resurser"
 "Back to current" = "Tillbaka till aktuell"
 "Back to styles" = "Tillbaka till formatmallar"
 "Back to the canvas from a focused region" = "Tillbaka till arbetsytan från en fokuserad region"
@@ -152,6 +169,7 @@ name = "Svenska"
 "Basics" = "Grunder"
 "Before" = "Före"
 "Bend" = "Böj"
+"Between the selected layers" = "Mellan de markerade lagren"
 "Bevel" = "Fasning"
 "Binary assets added" = "Binära resurser tillagda"
 "Binary assets removed" = "Binära resurser borttagna"
@@ -168,7 +186,9 @@ name = "Svenska"
 "Both directions" = "Båda riktningarna"
 "Bottom" = "Nederkant"
 "Bottom left radius" = "Radie nere till vänster"
+"Bottom padding" = "Nedre padding"
 "Bottom right radius" = "Radie nere till höger"
+"Brainstorm" = "Idéstorm"
 "Branch" = "Gren"
 "Branch archived" = "Grenen har arkiverats"
 "Branch merged" = "Grenen har sammanfogats"
@@ -194,8 +214,13 @@ name = "Svenska"
 "C or ⇧C" = "C eller ⇧C"
 "CMYK colour" = "CMYK-färg"
 "Can view" = "Kan visa"
+"Check" = "Bock"
+"Checking the fonts installed on this computer…" = "Kontrollerar vilka typsnitt som är installerade på den här datorn…"
 "Checking the server…" = "Kontrollerar servern…"
+"Chevron" = "Vinkel"
 "Clear from this list" = "Ta bort från listan"
+"Clear results" = "Rensa resultat"
+"Click objects to vote; click your badge to take a vote back" = "Klicka på objekt för att rösta; klicka på din bricka för att ta tillbaka en röst"
 "Code or invite link" = "Kod eller inbjudningslänk"
 "Color profile: {name}" = "Färgprofil: {name}"
 "Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Färg- och textstilar, ljusa och mörka variabler, knappar, inmatningsfält och kort"
@@ -220,7 +245,7 @@ name = "Svenska"
 "Changes on main" = "Ändringar i main"
 "Changes on the branch" = "Ändringar i grenen"
 "Changes unknown" = "Okända ändringar"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "Välj React, Leptos, SwiftUI, Compose eller Flutter ovan för att koppla den här komponenten till dess kod."
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Välj React, Leptos, Vue, SwiftUI, Compose, ArkUI eller Flutter ovan för att koppla den här komponenten till dess kod."
 "Choose another profile to change it." = "Välj en annan profil för att ändra den."
 "Choose collection" = "Välj samling"
 "Choose image" = "Välj bild"
@@ -241,7 +266,6 @@ name = "Svenska"
 "Close tab" = "Stäng flik"
 "Close version history" = "Stäng versionshistorik"
 "Close when clicking outside" = "Stäng vid klick utanför"
-"Close without saving" = "Stäng utan att spara"
 "Code" = "Kod"
 "Code syntax" = "Kodsyntax"
 "Collapse" = "Komprimera"
@@ -268,6 +292,7 @@ name = "Svenska"
 "Commits" = "Commits"
 "Company" = "Företag"
 "Compare changes" = "Jämför ändringar"
+"Compatibility notes" = "Kompatibilitetsanteckningar"
 "Completed" = "Slutförd"
 "Component" = "Komponent"
 "Component name" = "Komponentnamn"
@@ -282,16 +307,18 @@ name = "Svenska"
 "Connected" = "Kopplad"
 "Connected to code: {from}" = "Kopplad till kod: {from}"
 "Connection lost, reconnecting (attempt {attempt})…" = "Anslutningen bröts, återansluter (försök {attempt})…"
+"Connector" = "Koppling"
 "Constrain proportions" = "Behåll proportioner"
-"Constraints" = "Begränsningar"
+"Constraints" = "Constraints"
 "Content" = "Innehåll"
 "Contents hidden" = "Innehållet är dolt"
-"Contents only" = "Endast innehåll"
 "Contextual alternates" = "Kontextuella alternativ"
 "Contrast" = "Kontrast"
 "Contributors" = "Bidragsgivare"
 "Contributors: {people} · Commits: {commits}" = "Bidragsgivare: {people} · Commits: {commits}"
 "Controller" = "Handkontroll"
+"Convert to frame" = "Konvertera till frame"
+"Convert to section" = "Konvertera till avsnitt"
 "Cool" = "Kall"
 "Copied as CSS" = "Kopierat som CSS"
 "Copied as PNG" = "Kopierat som PNG"
@@ -309,7 +336,11 @@ name = "Svenska"
 "Copy {value}" = "Kopiera {value}"
 "Corner radius" = "Hörnradie"
 "Corner smoothing" = "Hörnutjämning"
+"Couldn't download the variables" = "Det gick inte att hämta variablerna"
 "Couldn't reach {server}: showing what this computer remembers." = "Det gick inte att nå {server}: visar det som den här datorn minns."
+"Couldn't read {name}." = "Det gick inte att läsa {name}."
+"Couldn't save automatically: {error}" = "Det gick inte att spara automatiskt: {error}"
+"Couldn't save the file" = "Det gick inte att spara filen"
 "Count" = "Antal"
 "Create" = "Skapa"
 "Create a variable collection first" = "Skapa en variabelsamling först"
@@ -333,6 +364,7 @@ name = "Svenska"
 "Current version" = "Aktuell version"
 "Cursor chat" = "Markörchatt"
 "Custom" = "Anpassad"
+"Custom size" = "Anpassad storlek"
 "Cut" = "Klipp ut"
 "Dark" = "Mörk"
 "Darken" = "Mörkare"
@@ -366,6 +398,7 @@ name = "Svenska"
 "Description" = "Beskrivning"
 "Description (optional)" = "Beskrivning (valfritt)"
 "Design" = "Design"
+"Design panel" = "Designpanel"
 "Design system starter" = "Startmall för designsystem"
 "Desktop" = "Skrivbord"
 "Destination" = "Mål"
@@ -393,6 +426,7 @@ name = "Svenska"
 "Distribute horizontal spacing" = "Fördela horisontellt avstånd"
 "Distribute vertical spacing" = "Fördela vertikalt avstånd"
 "Divider" = "Avdelare"
+"Don't Save" = "Spara inte"
 "Don't truncate" = "Korta inte av"
 "Done" = "Klart"
 "Done editing" = "Klar med redigeringen"
@@ -402,9 +436,12 @@ name = "Svenska"
 "Drafts" = "Utkast"
 "Drag the stroke to add a width point" = "Dra i konturen för att lägga till en breddpunkt"
 "Draw" = "Rita"
-"Draw a frame" = "Rita en ram"
+"Draw a frame" = "Rita en frame"
 "Drawing tools" = "Ritverktyg"
-"Drop shadow" = "Släppskugga"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Släpp en .figcraft-, .fig-, .sketch-, .json- eller .svg-fil eller en bildfil."
+"Drop to import" = "Släpp för att importera"
+"Drop to open" = "Släpp för att öppna"
+"Drop shadow" = "Slagskugga"
 "Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "Dubbellicensierad under MIT OR Apache-2.0. Skapad av ArtCraft-teamet och gemenskapen."
 "Duo" = "Duo"
 "Duplicate" = "Duplicera"
@@ -425,6 +462,8 @@ name = "Svenska"
 "Effect settings" = "Effektinställningar"
 "Effect styles" = "Effektstilar"
 "Effects" = "Effekter"
+"Curved" = "Böjd"
+"Elbow" = "Vinklad"
 "Ellipse" = "Ellips"
 "Ellipses" = "Ellipser"
 "Else" = "Annars"
@@ -433,15 +472,16 @@ name = "Svenska"
 "Empty" = "Tom"
 "End" = "Slut"
 "End point" = "Slutpunkt"
+"End vote" = "Avsluta omröstning"
 "Ends the session; everyone keeps their copy" = "Avslutar sessionen; alla behåller sin kopia"
 "Enter" = "Enter"
-"Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Ange adressen till en figcraft-server och tryck på Bläddra för att se vilka plugin-program den erbjuder."
+"Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Ange adressen till en figcraft-server och tryck på Bläddra för att se vilka plugins den erbjuder."
 "Enter to save · Esc to cancel" = "Enter för att spara · Esc för att avbryta"
 "Eraser" = "Suddgummi"
 "Esc" = "Esc"
 "Essential" = "Grundläggande"
 "Every conflict has a choice." = "Alla konflikter har ett val."
-"Every top-level frame already starts a flow" = "Varje ram på översta nivån startar redan ett flöde"
+"Every top-level frame already starts a flow" = "Varje frame på översta nivån startar redan ett flöde"
 "Exact opacity (4 then 5: 45%)" = "Exakt opacitet (4 och sedan 5: 45 %)"
 "Exclude" = "Uteslut"
 "Excluded" = "Utesluten"
@@ -452,7 +492,7 @@ name = "Svenska"
 "Expand" = "Expandera"
 "Export" = "Exportera"
 "Export all" = "Exportera alla"
-"Export frames and layers as PNG, JPG, SVG or PDF" = "Exportera ramar och lager som PNG, JPG, SVG eller PDF"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "Exportera frames och lager som PNG, JPG, SVG eller PDF"
 "Export page as PNG" = "Exportera sidan som PNG"
 "Export settings" = "Exportinställningar"
 "Export variables" = "Exportera variabler"
@@ -474,6 +514,8 @@ name = "Svenska"
 "False" = "Falskt"
 "Feb" = "feb"
 "Fetching from the server…" = "Hämtar från servern…"
+"FigCraft couldn't open its window: {error}" = "FigCraft kunde inte öppna sitt fönster: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft stöder ännu inte alla funktioner i de här filerna. Anteckningarna visar vad som utelämnades eller ändrades i den importerade kopian; originalfilen är oförändrad."
 "File" = "Fil"
 "File name" = "Filnamn"
 "File not found" = "Filen hittades inte"
@@ -507,6 +549,7 @@ name = "Svenska"
 "Flip text to the other side" = "Vänd texten till andra sidan"
 "Flip vertical" = "Vänd lodrätt"
 "Flip width profile" = "Vänd breddprofil"
+"Flow chart" = "Flödesschema"
 "Flow starting point" = "Startpunkt för flöde"
 "Flow starting points" = "Startpunkter för flöden"
 "Flows" = "Flöden"
@@ -518,17 +561,17 @@ name = "Svenska"
 "Follow {name}" = "Följ {name}"
 "Following" = "Följer"
 "Following {name} · {key} to stop" = "Följer {name} · {key} för att sluta"
-"Font" = "Teckensnitt"
-"Font not installed" = "Teckensnittet är inte installerat"
+"Font" = "Typsnitt"
+"Font not installed" = "Typsnittet är inte installerat"
 "Font size" = "Teckenstorlek"
 "Font style" = "Teckenstil"
 "Forget on this computer" = "Glöm på den här datorn"
 "Four screens of a trail app with components and a prototype flow" = "Fyra skärmar i en vandringsapp med komponenter och ett prototypflöde"
 "Fractions" = "Bråk"
-"Frame" = "Ram"
+"Frame" = "Frame"
 "Frame selection" = "Rama in markering"
-"Frame tools" = "Ramverktyg"
-"Frames" = "Ramar"
+"Frame tools" = "Frame-verktyg"
+"Frames" = "Frames"
 "From the library \"{name}\": read-only" = "Från biblioteket \"{name}\": skrivskyddad"
 "From {name}" = "Från {name}"
 "From {server}" = "Från {server}"
@@ -559,6 +602,7 @@ name = "Svenska"
 "Hanging list" = "Hängande lista"
 "Hanging punctuation" = "Hängande skiljetecken"
 "Hard light" = "Hårt ljus"
+"Heart" = "Hjärta"
 "Height" = "Höjd"
 "Help" = "Hjälp"
 "Help and resources" = "Hjälp och resurser"
@@ -571,6 +615,7 @@ name = "Svenska"
 "Hide these tips (Getting started in the Help menu shows them again)" = "Dölj de här tipsen (Kom igång i Hjälp-menyn visar dem igen)"
 "Hide when publishing" = "Dölj vid publicering"
 "Highlight layers on hover" = "Framhäv lager vid hovring"
+"Highlighter" = "Överstrykningspenna"
 "Highlights" = "Högdagrar"
 "Hold Alt" = "Håll ned Alt"
 "Hold Alt+Z" = "Håll ned Alt+Z"
@@ -583,7 +628,7 @@ name = "Svenska"
 "Horizontal" = "Horisontell"
 "Horizontal align" = "Horisontell justering"
 "Horizontal hex" = "Horisontell hex"
-"Horizontal padding" = "Horisontell utfyllnad"
+"Horizontal padding" = "Horisontell padding"
 "Horizontal spacing" = "Horisontellt avstånd"
 "Hosted by {operator}" = "Värd: {operator}"
 "Hover a layer to see its properties" = "Hovra över ett lager för att se dess egenskaper"
@@ -593,15 +638,20 @@ name = "Svenska"
 "Hug contents" = "Omslut innehåll"
 "Icon components on a 24 px grid with keylines and a size preview" = "Ikonkomponenter på ett 24 px-rutnät med hjälplinjer och en förhandsgranskning av storlekar"
 "Icon set starter" = "Startpaket för ikonuppsättning"
+"If it keeps happening, please report it at {link} with this message." = "Om det fortsätter att hända kan du rapportera det på {link} och bifoga det här meddelandet."
 "If" = "Om"
 "If {condition}" = "Om {condition}"
-"Ignore auto layout (absolute position)" = "Ignorera automatisk layout (absolut position)"
+"Ignore auto layout (absolute position)" = "Ignorera auto layout (absolut position)"
+"Ignore overlapping layers" = "Ignorera överlappande lager"
 "Image" = "Bild"
+"Images" = "Bilder"
 "Import" = "Importera"
 "Import path" = "Importsökväg"
 "Import plugin from manifest" = "Importera plugin från manifest"
 "Import plugin from manifest…" = "Importera plugin från manifest…"
+"Import report" = "Importrapport"
 "Import variables" = "Importera variabler"
+"Imported document" = "Importerat dokument"
 "Imported {name}" = "Importerade {name}"
 "Imported {n} new variables, updated {updated}" = { one = "Importerade {n} ny variabel, uppdaterade {updated}", other = "Importerade {n} nya variabler, uppdaterade {updated}" }
 "Import…" = "Importera…"
@@ -612,6 +662,7 @@ name = "Svenska"
 "Included" = "Inkluderad"
 "Included in layout" = "Inkluderad i layouten"
 "Individual corners" = "Enskilda hörn"
+"Individual padding" = "Individuell padding"
 "Individual strokes" = "Enskilda konturer"
 "Ink" = "Bläck"
 "Inner shadow" = "Inre skugga"
@@ -629,11 +680,14 @@ name = "Svenska"
 "Instance swap (no other component)" = "Instansbyte (ingen annan komponent)"
 "Instances" = "Instanser"
 "Instant" = "Direkt"
+"Intensity" = "Intensitet"
 "Interaction" = "Interaktion"
 "Interactions" = "Interaktioner"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Gränssnittsdesign och prototyper. Ett fritt clean-room-designverktyg med öppen källkod, skrivet från grunden i Rust och en del av ArtCraft Crafting Apps."
+"Interface size" = "Gränssnittsstorlek"
 "Intersect" = "Skärning"
 "Intersects" = "Skär"
+"Invalid color" = "Ogiltig färg"
 "Invite link" = "Inbjudningslänk"
 "Invite link copied" = "Inbjudningslänken har kopierats"
 "It asks permission to:" = "Den ber om behörighet att:"
@@ -652,6 +706,8 @@ name = "Svenska"
 "Jun" = "jun"
 "Just now" = "Nyss"
 "Justify" = "Marginaljustera"
+"Kanban board" = "Kanbantavla"
+"Keep a measurement on the canvas for developers" = "Behåll ett mått på arbetsytan för utvecklare"
 "Keep appearance" = "Behåll utseende"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Behåll utseende konverterar varje färgvärde till {profile} så att färgerna ser likadana ut. Behåll värden lämnar siffrorna som de är, så färgerna förskjuts."
 "Keep tool selected after use" = "Behåll verktyget markerat efter användning"
@@ -680,6 +736,7 @@ name = "Svenska"
 "Leaves" = "Löv"
 "Left" = "Vänster"
 "Left & right" = "Vänster och höger"
+"Left padding" = "Vänster padding"
 "Left side" = "Vänster sida"
 "Left side width" = "Bredd på vänster sida"
 "Letter case" = "Skiftläge"
@@ -705,7 +762,7 @@ name = "Svenska"
 "Link" = "Länk"
 "Link copied" = "Länken har kopierats"
 "Link docs, code or tickets for developers." = "Länka dokumentation, kod eller ärenden för utvecklare."
-"Link frames on the Prototype tab, then present the flow" = "Länka ramar på fliken Prototyp och presentera sedan flödet"
+"Link frames on the Prototype tab, then present the flow" = "Länka frames på fliken Prototyp och presentera sedan flödet"
 "Link this component to its code component: instances then show your real snippet with their values." = "Länka den här komponenten till dess kodkomponent: instanserna visar då ditt riktiga kodavsnitt med sina värden."
 "List spacing" = "Listavstånd"
 "List style" = "Liststil"
@@ -731,6 +788,7 @@ name = "Svenska"
 "Mark as resolved" = "Märk som löst"
 "Mark as unread" = "Märk som oläst"
 "Mark as unresolved" = "Märk som olöst"
+"Marker" = "Märkpenna"
 "Mask" = "Mask"
 "Mass · Stiffness · Damping" = "Massa · Styvhet · Dämpning"
 "Match (empty: the whole name)" = "Matcha (tomt: hela namnet)"
@@ -740,6 +798,7 @@ name = "Svenska"
 "Maximize" = "Maximera"
 "May" = "Maj"
 "Measure to the selection" = "Mät avståndet till markeringen"
+"Measurements" = "Mått"
 "Merge into main" = "Sammanfoga med main"
 "Merge regions" = "Sammanfoga regioner"
 "Merge the branch into the main file (one undo step) and archive it" = "Sammanfoga grenen med huvudfilen (ett ångrasteg) och arkivera den"
@@ -748,10 +807,12 @@ name = "Svenska"
 "Min H" = "Min H"
 "Min W" = "Min B"
 "Minimize" = "Minimera"
+"Minutes" = "Minuter"
 "Mirror angle" = "Spegla vinkel"
 "Mirror angle and length" = "Spegla vinkel och längd"
 "Mirroring" = "Spegling"
 "Missing" = "Saknas"
+"Missing fonts" = "Saknade typsnitt"
 "Missing layer" = "Lager saknas"
 "Missing style" = "Stil saknas"
 "Missing variable" = "Variabel saknas"
@@ -789,8 +850,10 @@ name = "Svenska"
 "Named instance" = "Namngiven instans"
 "Navigate to" = "Navigera till"
 "Nested instance" = "Kapslad instans"
+"New board" = "Ny whiteboard"
 "New design file" = "Ny designfil"
 "Newest first" = "Nyaste först"
+"Next frame" = "Nästa frame"
 "Next or previous control in the focused region" = "Nästa eller föregående kontroll i den fokuserade regionen"
 "Next ready for dev" = "Nästa redo för utveckling"
 "Next size option" = "Nästa storleksalternativ"
@@ -800,12 +863,16 @@ name = "Svenska"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "Inga grenar. En gren är en kopia av filen där du kan prova ändringar och sedan granska och sammanfoga dem."
 "No category" = "Ingen kategori"
 "No changes" = "Inga ändringar"
+"No color styles" = "Inga färgformatmallar"
 "No colour variables fit here." = "Inga färgvariabler passar här."
 "No colour variables yet. Create them in Local variables." = "Inga färgvariabler än. Skapa dem i Lokala variabler."
 "No comments yet" = "Inga kommentarer än"
+"No compatibility warnings reported" = "Inga kompatibilitetsvarningar rapporterades"
 "No components yet. Select layers and press {keys}." = "Inga komponenter än. Markera lager och tryck på {keys}."
 "No conflicts." = "Inga konflikter."
 "No contributor data was built into this copy." = "Inga uppgifter om bidragsgivare finns inbyggda i den här kopian."
+"No device" = "Ingen enhet"
+"No files or templates match your search" = "Inga filer eller mallar matchar sökningen"
 "No fonts match" = "Inga typsnitt matchar"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Ingen anslutningskod här (servern är äldre än anslutningskoder, eller så kan den här adressen inte göras om till en): dela länken i stället."
 "No layer changes to show." = "Inga lagerändringar att visa."
@@ -820,9 +887,10 @@ name = "Svenska"
 "No model credits were built into this copy." = "Inga modellkrediteringar finns inbyggda i den här kopian."
 "No number variables fit here." = "Inga nummervariabler passar här."
 "No number variables yet. Create them in Local variables." = "Inga nummervariabler än. Skapa dem i Lokala variabler."
+"No other pages" = "Inga andra sidor"
 "No paints" = "Inga färger"
-"No plugins on {server}." = "Inga plugin-program på {server}."
-"No plugins yet. Import a development plugin from its figcraft-plugin.json." = "Inga plugin-program än. Importera ett plugin-program under utveckling från dess figcraft-plugin.json."
+"No plugins on {server}." = "Inga plugins på {server}."
+"No plugins yet. Import a development plugin from its figcraft-plugin.json." = "Inga plugins än. Importera ett plugin under utveckling från dess figcraft-plugin.json."
 "No preferred components" = "Inga föredragna komponenter"
 "No preset" = "Ingen förinställning"
 "No saved versions yet. Save a version to mark a point in your work you can come back to." = "Inga sparade versioner än. Spara en version för att markera en punkt i arbetet som du kan återvända till."
@@ -837,6 +905,7 @@ name = "Svenska"
 "No text styles yet. Click + to create one from the selected text." = "Inga textstilar än. Klicka på + för att skapa en från den markerade texten."
 "No variables fit here." = "Inga variabler passar här."
 "No variables yet. Create them in Local variables." = "Inga variabler än. Skapa dem i Lokala variabler."
+"No votes yet" = "Inga röster än"
 "Nobody else is here yet" = "Ingen annan är här än"
 "Noise" = "Brus"
 "None" = "Ingen"
@@ -844,19 +913,19 @@ name = "Svenska"
 "Normal" = "Normal"
 "Not bound" = "Inte kopplad"
 "Not in a live session" = "Inte i en livesession"
-"Not in this font" = "Finns inte i det här teckensnittet"
+"Not in this font" = "Finns inte i det här typsnittet"
 "Not properties, kept as written: {names}" = "Inte egenskaper, behölls som de skrevs: {names}"
 "Not read yet" = "Inte läst än"
 "Not shared" = "Inte delad"
 "Note {n}" = "Anteckning {n}"
 "Nothing changed since this was marked ready for dev." = "Inget har ändrats sedan detta markerades som klart för utveckling."
-"Nothing here yet. Set a frame's status to list it." = "Inget här än. Ange en rams status för att lista den."
+"Nothing here yet. Set a frame's status to list it." = "Inget här än. Ange en frames status för att lista den."
 "Nothing online yet. Use Share on a file to put it online and it is listed here." = "Inget online än. Använd Dela på en fil för att lägga ut den online, så visas den här."
 "Nothing to export" = "Inget att exportera"
 "Nov" = "nov"
 "Now" = "Nu"
-"Nudge (Shift: big nudge)" = "Knuffa (Shift: stor knuff)"
-"Nudge amount" = "Knuffavstånd"
+"Nudge (Shift: big nudge)" = "Flytta stegvis (Shift: stort steg)"
+"Nudge amount" = "Steglängd"
 "Number" = "Nummer"
 "Number ↑" = "Nummer ↑"
 "Number ↓" = "Nummer ↓"
@@ -886,6 +955,7 @@ name = "Svenska"
 "Open branch" = "Öppna gren"
 "Open file" = "Öppna fil"
 "Open files" = "Öppna filer"
+"Open presentations" = "Öppna presentationer"
 "Open in focus view" = "Öppna i fokusvy"
 "Open in new window" = "Öppna i nytt fönster"
 "Open invite links in FigCraft" = "Öppna inbjudningslänkar i FigCraft"
@@ -894,11 +964,15 @@ name = "Svenska"
 "Open overlay" = "Öppna överlägg"
 "Open prototype preview" = "Öppna prototypförhandsgranskning"
 "Open variables ({count})" = "Öppna variabler ({count})"
+"Opened as a new document" = "Öppnat som ett nytt dokument"
 "Opened “{name}” in a new tab" = "Öppnade ”{name}” i en ny flik"
+"Opening the file…" = "Öppnar filen…"
+"Opening {n} files as new files" = { one = "Öppnar som en ny fil", other = "Öppnar {n} filer som nya filer" }
 "Open|comments" = "Öppna"
 "Options" = "Alternativ"
 "Orange" = "Orange"
 "Order" = "Ordning"
+"Other" = "Annat"
 "Other apps may not open every .fig file exported here." = "Andra appar kanske inte kan öppna alla .fig-filer som exporteras här."
 "Others lose access and keep their copy; the file stays on the server for you" = "Andra förlorar åtkomst och behåller sin kopia; filen ligger kvar på servern åt dig"
 "Others type this under Share ▸ Join with a code" = "Andra skriver in den under Dela ▸ Anslut med en kod"
@@ -910,14 +984,19 @@ name = "Svenska"
 "Overlay" = "Överlägg"
 "Overlay position" = "Överläggsposition"
 "Overridden here (the collection it extends has another value)" = "Åsidosatt här (samlingen som den utökar har ett annat värde)"
-"Overrides" = "Åsidosättningar"
+"Overrides" = "Overrides"
 "Owner token" = "Ägartoken"
 "Owner token copied" = "Ägartoken kopierad"
 "PDF print options" = "PDF-utskriftsalternativ"
 "PDF print settings" = "PDF-utskriftsinställningar"
-"Padding" = "Utfyllnad"
+"Padding" = "Padding"
 "Page" = "Sida"
+"Page deleted" = "Sidan har raderats"
 "Pages" = "Sidor"
+"Pages added to the document" = "Sidor tillagda i dokumentet"
+"Pause" = "Pausa"
+"Pink" = "Rosa"
+"Placed on the current page" = "Placerat på den aktuella sidan"
 "Pages: {pages}" = "Sidor: {pages}"
 "Paint bucket" = "Färghink"
 "Pan the canvas" = "Panorera arbetsytan"
@@ -932,6 +1011,7 @@ name = "Svenska"
 "Paste a team library link (a view link)" = "Klistra in en länk till ett teambibliotek (en visningslänk)"
 "Paste here" = "Klistra in här"
 "Paste to replace" = "Klistra in och ersätt"
+"Pasted design layers; {n} kinds of content were left out" = { one = "Designlager inklistrade; {n} typ av innehåll utelämnades", other = "Designlager inklistrade; {n} typer av innehåll utelämnades" }
 "Pattern" = "Mönster"
 "Pattern alignment" = "Mönsterjustering"
 "Pattern scale" = "Mönsterskala"
@@ -944,20 +1024,23 @@ name = "Svenska"
 "Phone" = "Telefon"
 "Pick color" = "Hämta färg"
 "Pick color (I)" = "Hämta färg (I)"
-"Pick one font family first" = "Välj en teckensnittsfamilj först"
-"Pick the Frame tool, then drag on the canvas or choose a device size" = "Välj ramverktyget och dra sedan på arbetsytan eller välj en enhetsstorlek"
+"Pick one font family first" = "Välj en typsnittsfamilj först"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "Välj verktyget Frame och dra sedan på arbetsytan eller välj en enhetsstorlek"
 "Pin a property" = "Fäst en egenskap"
 "Pinch" = "Nyp"
 "Pixel grid" = "Pixelrutnät"
 "Pixel preview 1x" = "Pixelförhandsgranskning 1x"
 "Pixel preview 2x" = "Pixelförhandsgranskning 2x"
-"Place a shape or frame (its tool chosen)" = "Placera en form eller ram (när dess verktyg är valt)"
+"Place a shape or frame (its tool chosen)" = "Placera en form eller frame (när dess verktyg är valt)"
 "Place automatically" = "Placera automatiskt"
 "Place image" = "Placera bild"
-"Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Plugin-program körs i FigCrafts sandlåda, utan filer, nätverk eller klocka. Installera bara plugin-program du litar på."
-"Plugins" = "Plugin-program"
+"Plugin" = "Plugin"
+"Plugins & widgets" = "Plugins och widgetar"
+"Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Plugins körs i FigCrafts sandlåda, utan filer, nätverk eller klocka. Installera bara plugins du litar på."
+"Plugins" = "Plugins"
 "Plus darker" = "Plus mörkare"
 "Plus lighter" = "Plus ljusare"
+"Plus one" = "Plus ett"
 "Point" = "Punkt"
 "Points" = "Punkter"
 "Polygon" = "Polygon"
@@ -975,8 +1058,8 @@ name = "Svenska"
 "Presenting: comments" = "Presentation: kommentarer"
 "Presenting: cycle the size options" = "Presentation: växla mellan storleksalternativen"
 "Presenting: full screen" = "Presentation: helskärm"
-"Presenting: next frame" = "Presentation: nästa ram"
-"Presenting: previous frame" = "Presentation: föregående ram"
+"Presenting: next frame" = "Presentation: nästa frame"
+"Presenting: previous frame" = "Presentation: föregående frame"
 "Presenting: restart" = "Presentation: starta om"
 "Preserve scroll position" = "Bevara rullningsposition"
 "Presets" = "Förinställningar"
@@ -984,7 +1067,8 @@ name = "Svenska"
 "Playground" = "Testyta"
 "Preview" = "Förhandsgranskning"
 "Preview this flow" = "Förhandsgranska det här flödet"
-"Preview this frame" = "Förhandsgranska den här ramen"
+"Preview this frame" = "Förhandsgranska den här framen"
+"Previous frame" = "Föregående frame"
 "Previous ready for dev" = "Föregående redo för utveckling"
 "Progressive" = "Progressiv"
 "Properties" = "Egenskaper"
@@ -1005,6 +1089,7 @@ name = "Svenska"
 "Push" = "Skjut"
 "Push changes to main component" = "Skicka ändringar till huvudkomponenten"
 "Put text on path" = "Placera text på bana"
+"Question" = "Fråga"
 "R" = "R"
 "Radial" = "Radiell"
 "Radius" = "Radie"
@@ -1022,10 +1107,12 @@ name = "Svenska"
 "Reduce motion" = "Minska rörelse"
 "Refraction" = "Brytning"
 "Regular expression" = "Reguljärt uttryck"
+"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "Relativt systemets skalning av skärmen (100 % är systemets egen storlek). Dokumentets zoom är separat."
 "Remove" = "Ta bort"
 "Remove all" = "Ta bort alla"
 "Remove annotation" = "Ta bort anteckning"
-"Remove auto layout" = "Ta bort automatisk layout"
+"Remove auto layout" = "Ta bort auto layout"
+"Remove column" = "Ta bort kolumn"
 "Remove dev resource" = "Ta bort utvecklarresurs"
 "Remove export setting" = "Ta bort exportinställning"
 "Remove from recents" = "Ta bort från Senaste"
@@ -1034,10 +1121,12 @@ name = "Svenska"
 "Remove guide" = "Ta bort stödlinje"
 "Remove interaction" = "Ta bort interaktion"
 "Remove library from this file" = "Ta bort biblioteket från den här filen"
+"Remove measurement" = "Ta bort mått"
 "Remove min and max" = "Ta bort min och max"
 "Remove min and max height" = "Ta bort min- och maxhöjd"
 "Remove min and max width" = "Ta bort min- och maxbredd"
 "Remove regions" = "Ta bort områden"
+"Remove row" = "Ta bort rad"
 "Remove slot" = "Ta bort plats"
 "Remove starting point" = "Ta bort startpunkt"
 "Remove stop" = "Ta bort stopp"
@@ -1045,6 +1134,7 @@ name = "Svenska"
 "Remove the else and its actions" = "Ta bort else-grenen och dess åtgärder"
 "Remove this condition and its actions" = "Ta bort det här villkoret och dess åtgärder"
 "Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "Vill du ta bort den här filen från servern? Den kan inte längre delas eller öppnas därifrån. Din kopia förblir öppen här."
+"Remove {name} from session" = "Ta bort {name} från sessionen"
 "Remove {name} from {server}?" = "Vill du ta bort {name} från {server}?"
 "Removed" = "Borttaget"
 "Removed from the server" = "Borttagen från servern"
@@ -1059,6 +1149,7 @@ name = "Svenska"
 "Rename on the server…" = "Byt namn på servern…"
 "Rename page" = "Byt namn på sida"
 "Rename to" = "Nytt namn"
+"Reorder selection" = "Ändra ordning på markeringen"
 "Replace all" = "Ersätt alla"
 "Replace mixed export settings" = "Ersätt blandade exportinställningar"
 "Replace with" = "Ersätt med"
@@ -1069,15 +1160,16 @@ name = "Svenska"
 "Reset" = "Återställ"
 "Reset adjustments" = "Återställ justeringar"
 "Reset all changes" = "Återställ alla ändringar"
-"Reset all overrides on this layer" = "Återställ alla åsidosättningar på det här lagret"
-"Reset overrides" = "Återställ åsidosättningar"
+"Reset all overrides on this layer" = "Återställ alla overrides på det här lagret"
+"Reset overrides" = "Återställ overrides"
 "Reset slot" = "Återställ plats"
-"Reset this override" = "Återställ den här åsidosättningen"
+"Reset this override" = "Återställ den här overriden"
 "Reset to style" = "Återställ till formatmall"
 "Reset to the inherited value" = "Återställ till ärvt värde"
-"Resize by the nudge amount" = "Ändra storlek med knuffavståndet"
-"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Ändra storlek på ramar efter enhetens skärm (eller fönstret utan enhet): deras begränsningar och automatiska layout anpassas"
+"Resize by the nudge amount" = "Ändra storlek med steglängden"
+"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Ändra storlek på frames efter enhetens skärm (eller fönstret utan enhet): deras constraints och auto layout anpassas"
 "Resize to fit" = "Anpassa storlek"
+"Resizing" = "Storleksändring"
 "Resolve" = "Lös"
 "Resolve change" = "Lös ändring"
 "Resolved" = "Löst"
@@ -1088,11 +1180,15 @@ name = "Svenska"
 "Restore main component" = "Återställ huvudkomponent"
 "Restore this version" = "Återställ den här versionen"
 "Restored “{name}”" = "Återställde ”{name}”"
+"Retrospective" = "Retrospektiv"
+"Results" = "Resultat"
+"Resume" = "Återuppta"
 "Reverse the order" = "Vänd på ordningen"
 "Reversed triangle" = "Omvänd triangel"
 "Review and merge" = "Granska och sammanfoga"
 "Ribbon" = "Verktygspanel"
 "Right" = "Höger"
+"Right padding" = "Höger padding"
 "Right side" = "Höger sida"
 "Right side width" = "Bredd på höger sida"
 "Rotate 90°" = "Rotera 90°"
@@ -1103,6 +1199,7 @@ name = "Svenska"
 "Rotation jitter" = "Rotationsdarr"
 "Round" = "Rund"
 "Rounded" = "Rundad"
+"Rounded rectangle" = "Rundad rektangel"
 "Row" = "Rad"
 "Row gap" = "Radmellanrum"
 "Row sizes" = "Radstorlekar"
@@ -1112,6 +1209,11 @@ name = "Svenska"
 "Rulers" = "Linjaler"
 "Run" = "Kör"
 "Run {label}" = "Kör {label}"
+"Save file" = "Spara fil"
+"Save files automatically" = "Spara filer automatiskt"
+"Search files and templates" = "Sök efter filer och mallar"
+"Search pages" = "Sök sidor"
+"Search results" = "Sökresultat"
 "Search templates" = "Sök mallar"
 "See all templates" = "Se alla mallar"
 "Select layers and they space themselves as their content changes" = "Markera lager så fördelar de avståndet själva när innehållet ändras"
@@ -1133,10 +1235,10 @@ name = "Svenska"
 "Scroll to" = "Rulla till"
 "Scroll to layer" = "Rulla till lager"
 "Scroll with parent" = "Rulla med överordnat element"
-"Search plugins" = "Sök plugin-program"
+"Search plugins" = "Sök plugins"
 "Search" = "Sök"
 "Search actions, layers and tools" = "Sök åtgärder, lager och verktyg"
-"Search assets" = "Sök tillgångar"
+"Search assets" = "Sök resurser"
 "Search comments" = "Sök i kommentarer"
 "Search fonts" = "Sök typsnitt"
 "Search layers" = "Sök lager"
@@ -1144,19 +1246,21 @@ name = "Svenska"
 "Section" = "Avsnitt"
 "Section color" = "Avsnittsfärg"
 "Sections" = "Avsnitt"
-"Select a frame and add a starting point to present it as a flow." = "Markera en ram och lägg till en startpunkt för att presentera den som ett flöde."
-"Select a frame to preview it" = "Markera en ram för att förhandsgranska den"
+"Select a frame and add a starting point to present it as a flow." = "Markera en frame och lägg till en startpunkt för att presentera den som ett flöde."
+"Select a frame to preview it" = "Markera en frame för att förhandsgranska den"
 "Select a layer to see its properties and code" = "Markera ett lager för att se dess egenskaper och kod"
 "Select all" = "Markera alla"
 "Select all with same" = "Markera alla med samma"
 "Select layer" = "Markera lager"
 "Select layers to apply the style to" = "Markera de lager som formatmallen ska användas på"
+"Select layers with this color" = "Markera lager med den här färgen"
 "Select overlapping shapes" = "Markera överlappande former"
 "Select points to edit their position, radius and mirroring" = "Markera punkter för att redigera deras position, radie och spegling"
 "Select slot" = "Markera plats"
 "Selection" = "Markering"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Markeringsruta, {w} gånger {h} vid {x}, {y}: piltangenterna flyttar den, Shift+pilar eller {cmd}+pilar ändrar storleken, Enter markerar, Escape avbryter"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Markeringsruta: piltangenterna flyttar den, Shift+pilar eller {cmd}+pilar ändrar storleken, Enter markerar, Escape avbryter"
+"Selection colors" = "Markeringsfärger"
 "Send backward" = "Flytta bakåt"
 "Send report" = "Skicka rapport"
 "Send to back" = "Flytta längst bak"
@@ -1173,6 +1277,7 @@ name = "Svenska"
 "Shape" = "Form"
 "Shape builder" = "Formbyggare"
 "Shape tools" = "Formverktyg"
+"Shapes" = "Former"
 "Share" = "Dela"
 "Share this file" = "Dela den här filen"
 "Share with a code" = "Dela med en kod"
@@ -1239,10 +1344,13 @@ name = "Svenska"
 "Space+drag" = "Blanksteg+dra"
 "Spacing" = "Avstånd"
 "Spam, stolen work, abuse…" = "Skräppost, stulet material, kränkningar…"
+"Speech bubble" = "Pratbubbla"
 "Splay" = "Utbredning"
 "Spotlight me" = "Rikta strålkastaren mot mig"
 "Spread" = "Spridning"
 "Square" = "Kvadrat"
+"Stamp" = "Stämpel"
+"Stamps" = "Stämplar"
 "Standard" = "Standard"
 "Standard ligatures" = "Standardligaturer"
 "Star" = "Stjärna"
@@ -1252,18 +1360,26 @@ name = "Svenska"
 "Start from a blank canvas" = "Börja med en tom arbetsyta"
 "Start from a template" = "Börja med en mall"
 "Start on path" = "Början på banan"
+"Start on the Home screen" = "Börja på Start"
 "Start point" = "Startpunkt"
 "Start sharing" = "Börja dela"
 "Start sharing with the Share button, then pass on the code it gives" = "Börja dela med knappen Dela och skicka sedan vidare koden du får"
+"Start vote" = "Starta omröstning"
 "Starting to share…" = "Börjar dela…"
 "Status" = "Status"
 "Sticky" = "Fast"
+"Sticky note" = "Lapp"
+"Sticky note colors" = "Lappfärger"
+"Sticky notes" = "Lappar"
+"Sticky notes, shapes and connectors" = "Lappar, former och kopplingar"
 "Stop" = "Stoppa"
 "Stop following {name}" = "Sluta följa {name}"
 "Stop session" = "Avsluta session"
 "Stop sharing" = "Sluta dela"
 "Stop spotlighting" = "Sluta använda strålkastaren"
+"Stop timer" = "Stoppa timern"
 "Stop {n}  {hex}" = "Stopp {n}  {hex}"
+"Straight" = "Rak"
 "Stretch" = "Sträck"
 "Strikethrough" = "Genomstruken"
 "String" = "Sträng"
@@ -1281,16 +1397,16 @@ name = "Svenska"
 "Subtract" = "Subtrahera"
 "Subtracts" = "Subtraktioner"
 "Suffix" = "Suffix"
-"Suspend snapping while dragging" = "Stäng av fästning medan du drar"
+"Suspend snapping while dragging" = "Stäng av fästfunktionen medan du drar"
 "Swap instance" = "Byt instans"
-"Swap library: use another library's assets of the same names" = "Byt bibliotek: använd tillgångar med samma namn från ett annat bibliotek"
+"Swap library: use another library's assets of the same names" = "Byt bibliotek: använd resurser med samma namn från ett annat bibliotek"
 "Swap orientation" = "Växla orientering"
 "Swap overlay" = "Byt överlägg"
 "Swap to {name}" = "Byt till {name}"
 "Swap width and height" = "Byt plats på bredd och höjd"
 "Swapped instance" = "Utbytt instans"
-"Swapped {n} assets" = { one = "Bytte {n} tillgång", other = "Bytte {n} tillgångar" }
-"Swapped {n} assets; {missed} had no match and still use the old library" = { one = "Bytte {n} tillgång; {missed} saknade motsvarighet och använder fortfarande det gamla biblioteket", other = "Bytte {n} tillgångar; {missed} saknade motsvarighet och använder fortfarande det gamla biblioteket" }
+"Swapped {n} assets" = { one = "Bytte {n} resurs", other = "Bytte {n} resurser" }
+"Swapped {n} assets; {missed} had no match and still use the old library" = { one = "Bytte {n} resurs; {missed} saknade motsvarighet och använder fortfarande det gamla biblioteket", other = "Bytte {n} resurser; {missed} saknade motsvarighet och använder fortfarande det gamla biblioteket" }
 "Sweep" = "Svep"
 "System" = "Enligt systemet"
 "Tab / Shift+Tab" = "Tab / Shift+Tab"
@@ -1308,11 +1424,15 @@ name = "Svenska"
 "Text" = "Text"
 "Text align" = "Textjustering"
 "Text content" = "Textinnehåll"
+"Text size" = "Textstorlek"
 "Text style" = "Textstil"
 "Text styles" = "Textstilar"
 "Texts" = "Texter"
 "Texture" = "Textur"
 "The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3." = "Arbetsytan förhandsgranskar färger i sRGB; exporterade PNG-, JPG- och WebP-filer märks med Display P3."
+"The destination document is unavailable. Nothing was imported." = "Måldokumentet är inte tillgängligt. Ingenting importerades."
+"The destination document was closed. Nothing was imported." = "Måldokumentet stängdes. Ingenting importerades."
+"The destination page was removed. Nothing was imported." = "Målsidan togs bort. Ingenting importerades."
 "The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "Filen raderas från servern: ingen kan längre öppna eller ansluta till den därifrån, och detta kan inte ångras. Kopior som är öppna finns kvar hos dem som har dem."
 "The file now holds another library" = "Filen innehåller nu ett annat bibliotek"
 "The file now holds another library (\"{name}\")" = "Filen innehåller nu ett annat bibliotek (\"{name}\")"
@@ -1322,6 +1442,7 @@ name = "Svenska"
 "The selection uses several text styles: click to apply one" = "Markeringen använder flera textstilar: klicka för att använda en"
 "The server deletes this file if nobody opens it before {date}." = "Servern raderar filen om ingen öppnar den före {date}."
 "The whole file" = "Hela filen"
+"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "Fönstret är för litet för {size} %, så gränssnittet ritas i {drawn} %. Gör fönstret större för att använda {size} %."
 "Theme" = "Tema"
 "There's no destination for that action" = "Det finns inget mål för den åtgärden"
 "Thickness" = "Tjocklek"
@@ -1333,18 +1454,23 @@ name = "Svenska"
 "This file" = "Den här filen"
 "This file has unsaved changes" = "Filen har osparade ändringar"
 "This file is on {server}, open only to you. Share it to let others in with a new code." = "Filen ligger på {server} och är bara öppen för dig. Dela den för att släppa in andra med en ny kod."
-"This frame is new on the branch." = "Den här ramen är ny på grenen."
-"This frame isn't on the branch." = "Den här ramen finns inte på grenen."
+"This file is too large to join here (up to {mb} MB)" = "Den här filen är för stor för att ansluta till här (högst {mb} MB)"
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "Den här filen använder typsnitt som inte är installerade på den här datorn. Deras text ritas med ett reservtypsnitt tills du installerar dem."
+"This frame is new on the branch." = "Den här framen är ny på grenen."
+"This frame isn't on the branch." = "Den här framen finns inte på grenen."
 "This server is open to the public: no key needed." = "Servern är öppen för alla: ingen nyckel behövs."
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Servern kräver sin nyckel: lägg till ?key=… i adressen (`figcraft-server key` skriver ut den på serverns dator)."
 "This server takes files only with its key: see Advanced." = "Servern tar bara emot filer med sin nyckel: se Avancerat."
+"Thumbs up" = "Tummen upp"
 "Tidy up" = "Snygga till"
 "Tile" = "Sida vid sida"
 "Tile type" = "Upprepningstyp"
+"Timer" = "Timer"
 "Tint" = "Färgton"
 "Title" = "Titel"
 "Title case" = "Inledande versaler"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Om du vill dela biblioteket med ditt team publicerar du filen på en server (Dela ▸ Publicera på server…) och publicerar sedan biblioteket där."
+"To the layer around it" = "Till lagret runt det"
 "Toggle" = "Visa/dölj"
 "Toggle light/dark theme" = "Växla mellan ljust och mörkt tema"
 "Toggle visibility" = "Visa/dölj"
@@ -1352,8 +1478,10 @@ name = "Svenska"
 "Top" = "Överkant"
 "Top & bottom" = "Över- och nederkant"
 "Top left radius" = "Radie uppe till vänster"
+"Top padding" = "Övre padding"
 "Top right radius" = "Radie uppe till höger"
 "Transform" = "Transformera"
+"Triangle" = "Triangel"
 "Triangle arrow" = "Triangelpil"
 "Trigger" = "Utlösare"
 "True" = "Sant"
@@ -1361,6 +1489,7 @@ name = "Svenska"
 "Truncate with an ellipsis" = "Korta av med ellips"
 "Try again" = "Försök igen"
 "Try another search or filter." = "Prova en annan sökning eller ett annat filter."
+"Try another search, or browse templates." = "Prova en annan sökning eller bläddra bland mallar."
 "Try another word, or look at every kind." = "Prova ett annat ord, eller visa alla typer."
 "Turn a layer into a component, reuse it, and change every copy at once" = "Gör om ett lager till en komponent, återanvänd den och ändra alla kopior på en gång"
 "Two digits" = "Två siffror"
@@ -1378,7 +1507,7 @@ name = "Svenska"
 "Unread" = "Olästa"
 "Unresolve" = "Markera som olöst"
 "Unsaved changes" = "Osparade ändringar"
-"Unsaved changes in {names}. Close the window and lose them?" = "Osparade ändringar i {names}. Vill du stänga fönstret och förlora dem?"
+"Unsaved changes in {names}. Save them before closing?" = "Osparade ändringar i {names}. Vill du spara dem innan du stänger?"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Osparade ändringar: spara först ({save}), eller stäng fliken med {alt}-klick för att slänga dem"
 "Unsaved changes: save first, or close again with {key} to discard" = "Osparade ändringar: spara först, eller stäng igen med {key} för att slänga dem"
 "Up" = "Upp"
@@ -1388,14 +1517,18 @@ name = "Svenska"
 "Update from selection" = "Uppdatera från markering"
 "Updated {components} and {styles}" = "{components} och {styles} har uppdaterats"
 "Updated {name}" = "{name} har uppdaterats"
+"Updating the graphics driver often helps. To use OpenGL only, start FigCraft from a Command Prompt with:" = "Det hjälper ofta att uppdatera grafikdrivrutinen. Om du bara vill använda OpenGL startar du FigCraft från en kommandotolk med:"
+"Updating the graphics driver often helps. WGPU_BACKEND (vulkan, gl, metal) names another graphics API to try." = "Det hjälper ofta att uppdatera grafikdrivrutinen. WGPU_BACKEND (vulkan, gl, metal) anger ett annat grafik-API att prova."
 "Uploads this file to a FigCraft server and keeps this tab in sync with it. You get a link to edit and a link to view." = "Laddar upp filen till en FigCraft-server och håller fliken synkroniserad med den. Du får en länk för redigering och en för visning."
 "Uppercase" = "Versaler"
 "Use a fixed value" = "Använd ett fast värde"
 "Use an expression, e.g. count + 1" = "Använd ett uttryck, t.ex. count + 1"
 "Use as mask" = "Använd som mask"
-"Use auto layout" = "Använd automatisk layout"
+"Use auto layout" = "Använd auto layout"
 "Use number keys for opacity" = "Använd siffertangenterna för opacitet"
+"Use the .figcraft or .fig extension." = "Använd filändelsen .figcraft eller .fig."
 "Use the layer's fill" = "Använd lagrets fyllning"
+"Use your browser's zoom to change the interface size." = "Använd webbläsarens zoom för att ändra gränssnittets storlek."
 "Used in {files} · {instances}" = "Används i {files} · {instances}"
 "Username" = "Användarnamn"
 "Value" = "Värde"
@@ -1417,7 +1550,7 @@ name = "Svenska"
 "Vertical" = "Vertikal"
 "Vertical align" = "Vertikal justering"
 "Vertical hex" = "Vertikal hex"
-"Vertical padding" = "Vertikal utfyllnad"
+"Vertical padding" = "Vertikal padding"
 "Vertical spacing" = "Vertikalt avstånd"
 "Vertical trim" = "Vertikal trimning"
 "View" = "Visa"
@@ -1430,6 +1563,9 @@ name = "Svenska"
 "Visibility" = "Synlighet"
 "Visible" = "Synlig"
 "Vivid" = "Livfull"
+"Votes per person" = "Röster per person"
+"Voting session" = "Omröstning"
+"WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "WGPU_BACKEND är satt och anger vilket grafik-API som ska användas; tar du bort den väljer FigCraft själv."
 "Warm" = "Varm"
 "Watch" = "Bevaka"
 "Wavy" = "Vågig"
@@ -1438,17 +1574,19 @@ name = "Svenska"
 "WebSocket URL" = "WebSocket-URL"
 "WebSocket URL copied" = "WebSocket-URL kopierad"
 "Wedge" = "Kil"
+"Weekly planner" = "Veckoplanering"
 "Weight" = "Tjocklek"
 "What you try here changes this preview and the code below, not the file" = "Det du provar här ändrar den här förhandsgranskningen och koden nedan, inte filen"
 "What changed since it was marked ready for dev" = "Vad som har ändrats sedan den markerades som klar för utveckling"
 "What is wrong with this file? The server's operator gets your report." = "Vad är fel med den här filen? Serverns operatör får din rapport."
 "What it's for" = "Vad den är till för"
-"What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "Vad detta ändrades från är okänt: ändringen gjordes innan FigCraft började spara en kopia av ramar som är klara för utveckling. Lös ändringen (eller markera den som klar igen) för att kunna jämföra från och med nu."
+"What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "Vad detta ändrades från är okänt: ändringen gjordes innan FigCraft började spara en kopia av frames som är klara för utveckling. Lös ändringen (eller markera den som klar igen) för att kunna jämföra från och med nu."
 "While hovering" = "Vid hovring"
 "While pressing" = "Vid nedtryckning"
 "White" = "Vit"
 "Who runs it, its terms and how long it keeps files" = "Vem som driver den, dess villkor och hur länge den sparar filer"
 "Why it changed" = "Varför det ändrades"
+"Widget" = "Widget"
 "Widgets" = "Widgetar"
 "Width" = "Bredd"
 "Width point" = "Breddpunkt"
@@ -1487,26 +1625,123 @@ name = "Svenska"
 "call any command its access allows" = "anropa alla kommandon som dess åtkomst tillåter"
 "call only: {commands}" = "anropa endast: {commands}"
 "can edit the document" = "kan redigera dokumentet"
+"can save files" = "kan spara filer"
+"conditional prototype actions nested too deeply were skipped" = "villkorliga prototypåtgärder som var nästlade för djupt hoppades över"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "villkorliga prototypåtgärder med villkor som inte kan utvärderas hoppades över"
+"connector label background was skipped: style data is missing" = "bakgrunden till etiketten på en kopplingslinje hoppades över: stildata saknas"
+"connector label was skipped: background bounds are invalid" = "etiketten på en kopplingslinje hoppades över: bakgrundens gränser är ogiltiga"
+"connector label was skipped: background transform is invalid" = "etiketten på en kopplingslinje hoppades över: bakgrundens transformering är ogiltig"
+"connector label was skipped: composed text transform is invalid" = "etiketten på en kopplingslinje hoppades över: textens sammansatta transformering är ogiltig"
+"connector label was skipped: derived background bounds are missing" = "etiketten på en kopplingslinje hoppades över: bakgrundens härledda gränser saknas"
+"connector label was skipped: derived text bounds are missing" = "etiketten på en kopplingslinje hoppades över: textens härledda gränser saknas"
+"connector label was skipped: text bounds are invalid" = "etiketten på en kopplingslinje hoppades över: textens gränser är ogiltiga"
+"connector label was skipped: text style data is missing" = "etiketten på en kopplingslinje hoppades över: textens stildata saknas"
+"connector label was skipped: text transform is invalid" = "etiketten på en kopplingslinje hoppades över: textens transformering är ogiltig"
+"connector labels were skipped" = "etiketter på kopplingslinjer hoppades över"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "kopplingslinjelager importeras som statiska ögonblicksbilder av frames eller vektorer, med etiketter om de finns; dynamiska bindningar av ändpunkterna behålls inte"
+"connector snapshot vector data is missing; connector was left empty" = "vektordata för kopplingslinjens ögonblicksbild saknas; kopplingslinjen lämnades tom"
+"connectors whose ends can't be placed are empty" = "kopplingslinjer vars ändar inte kan placeras är tomma"
 "crop marks" = "skärmärken"
+"damaged vector geometry was skipped" = "skadad vektorgeometri hoppades över"
+"damaged vector networks import as outlines" = "skadade vektornätverk importeras som former"
 "development: {path}" = "utveckling: {path}"
+"document children other than pages were skipped" = "underordnade objekt i dokumentet som inte är sidor hoppades över"
+"duplicate grid track sizing entries use equal tracks" = "dubbla storleksposter för rutnätsspår använder lika stora spår"
 "e.g. count + 1" = "t.ex. count + 1"
 "e.g. count >= 3 and not done" = "t.ex. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "vinklade och böjda kopplingslinjer utan sparad bana importeras som raka linjer"
+"entries without a node type were skipped" = "poster utan nodtyp hoppades över"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "figcraft://-länkar från en webbläsare, chatt eller e-post öppnar den här appen och ansluter till sessionen."
+"filled areas of a vector with their own fill use the layer's fill" = "fyllda områden i en vektor med egen fyllning använder lagrets fyllning"
 "from {server}" = "från {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "spelkontrollsutlösare utan exakt en känd kontrollknapp hoppades över"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "listan över rutnätsspår har fler än 1000 poster; spåren får standardstorleken med lika stora spår"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "storleken på rutnätsspår stöds inte eller är felaktig; berörda spår blir lika stora"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "listan över storlekar på rutnätsspår har fler än 1000 poster; spåren får standardstorleken med lika stora spår"
 "hidden" = "dold"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "bildfiltren är tvetydiga eftersom båda filterbehållarna finns; filterkonverteringen hoppades över"
+"image filters use FigCraft's approximate renderer" = "bildfilter använder FigCrafts ungefärliga rendering"
+"instance swap properties whose default component isn't in the file were skipped" = "egenskaper för instansbyte vars standardkomponent inte finns i filen hoppades över"
+"instances inside their own main component were imported as frames" = "instanser inuti sin egen huvudkomponent importerades som frames"
+"instances of components that aren't in the file show no layers" = "instanser av komponenter som inte finns i filen visar inga lager"
+"instances of components that aren't in the file were imported as frames" = "instanser av komponenter som inte finns i filen importerades som frames"
+"instances that would nest a component inside itself were imported as frames" = "instanser som skulle nästla en komponent i sig själv importerades som frames"
+"instances without a main component were imported as empty frames" = "instanser utan huvudkomponent importerades som tomma frames"
+"invalid internal .fig text path data was ignored" = "ogiltiga interna .fig-data för text på bana ignorerades"
+"invalid or oversized vector networks import as outlines" = "ogiltiga eller för stora vektornätverk importeras som former"
+"invalid or oversized vector path data was skipped" = "ogiltiga eller för stora vektorbanedata hoppades över"
 "just now" = "nyss"
+"key triggers without a supported key were skipped" = "tangentutlösare utan en tangent som stöds hoppades över"
+"key up triggers import as key presses" = "utlösare för släppt tangent importeras som tangenttryckningar"
+"layers without a position were placed at their parent's origin" = "lager utan position placerades i det överordnade objektets origo"
+"layers without a type were skipped" = "lager utan typ hoppades över"
+"legacy image filter container is unsupported; filter conversion was skipped" = "den äldre bildfilterbehållaren stöds inte; filterkonverteringen hoppades över"
 "locked" = "låst"
+"malformed image filters container was skipped" = "en felaktig bildfilterbehållare hoppades över"
+"malformed image paintFilter container was skipped" = "en felaktig paintFilter-behållare för bild hoppades över"
+"malformed slot content assignment was skipped" = "en felaktig tilldelning av fackinnehåll hoppades över"
 "no bleed" = "inget utfall"
 "nobody else here yet" = "ingen annan här än"
+"non-default slot settings are not represented and were skipped" = "fackinställningar som avviker från standard återges inte och hoppades över"
 "now" = "nu"
+"offer files to save if it asks to (you choose where each one goes)" = "erbjuda filer att spara om den ber om det (du väljer var varje fil hamnar)"
+"only in a text style or variable" = "endast i en textstil eller variabel"
 "or" = "eller"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "punkternas hörntyper behölls; streckade konturer och konturer med variabel bredd ritas med lagrets hörntyp"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "nycklar för föredragna komponenter i fack kan inte kopplas till lager i filen och hoppades över"
+"prototype actions of unknown types were skipped" = "prototypåtgärder av okända typer hoppades över"
+"prototype actions without a destination in the file were skipped" = "prototypåtgärder utan mål i filen hoppades över"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "prototyputtryck med variabler som inte finns i variabel-JSON:en hoppades över"
+"prototype expressions with unsupported functions were skipped" = "prototyputtryck med funktioner som inte stöds hoppades över"
+"prototype interactions without supported actions were skipped" = "prototypinteraktioner utan åtgärder som stöds hoppades över"
+"prototype navigations of unknown types were skipped" = "prototypnavigeringar av okända typer hoppades över"
+"prototype transitions of unknown types play instantly" = "prototypövergångar av okända typer spelas upp direkt"
+"prototype triggers of unknown types were skipped" = "prototyputlösare av okända typer hoppades över"
 "put a widget on the canvas" = "placera en widget på arbetsytan"
 "read and edit the document" = "läsa och redigera dokumentet"
 "read the document" = "läsa dokumentet"
 "reads the document" = "läser dokumentet"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "åtgärder för att ange variabel på variabler som inte finns i variabel-JSON:en hoppades över"
+"set-variable actions with values that can't be evaluated were skipped" = "åtgärder för att ange variabel med värden som inte kan utvärderas hoppades över"
+"set-variable actions with values that don't fit the variable were skipped" = "åtgärder för att ange variabel med värden som inte passar variabeln hoppades över"
+"set-variable actions without a value were skipped" = "åtgärder för att ange variabel utan värde hoppades över"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "åtgärder för att ange variabelläge på samlingar eller lägen som inte finns i variabel-JSON:en hoppades över"
+"slot content assignment target is missing or is not slot content" = "målet för tilldelningen av fackinnehåll saknas eller är inte fackinnehåll"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "tilldelningen av fackinnehåll använder det tomma GUID:t som markörvärde och hoppades över"
+"slot layers without a matching slot property were imported as frames" = "facklager utan en motsvarande fackegenskap importerades som frames"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "vissa vektorpunkter hänvisar till punktinställningar som saknas i filen; de använder lagrets hörntyper och vanliga hörn"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "vissa vektorsegment hänvisar till stilinställningar som saknas i filen; de använder lagrets kontur"
+"stale or invalid grid track sizing entries were ignored" = "inaktuella eller ogiltiga storleksposter för rutnätsspår ignorerades"
+"stars and polygons without point counts or geometry use the default point count" = "stjärnor och polygoner utan antal punkter eller geometri använder standardantalet punkter"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "stilinställningar för vissa vektorsegment stöds inte; de segmenten använder lagrets kontur"
+"text path underline or strikethrough decoration is not rendered" = "understrykning eller genomstrykning av text på bana ritas inte"
+"text style overrides refer to missing table entries" = "overrides av textstilar hänvisar till tabellposter som saknas"
+"the file has no pages" = "filen har inga sidor"
 "the plugin" = "pluginet"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "variabel-JSON:en har inga `variableCollections` (svaret med lokala variabler väntades) och ignorerades"
 "this session only" = "endast den här sessionen"
+"unknown component property types were skipped" = "okända typer av komponentegenskaper hoppades över"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "alias till variabler som inte finns i variabel-JSON:en (eller är av en annan typ) hoppades över"
+"variable bindings to properties the layer doesn't have were skipped" = "variabelbindningar till egenskaper som lagret inte har hoppades över"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "bindningar till variabler som inte finns i variabel-JSON:en (biblioteksvariabler) hoppades över"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "variabelbindningar hoppades över: fil-JSON:en har inga variabeldefinitioner (skicka den lokala variabel-JSON:en som `variables`, eller bädda in dess `meta` bredvid fil-JSON:en)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "variabelbindningar vars variabeltyp inte passar egenskapen hoppades över"
+"variable collections without modes were skipped" = "variabelsamlingar utan lägen hoppades över"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "uppslag av variabellägen i prototyputtryck som inte är en variabel och ett av dess lägen hoppades över"
+"variable modes of collections that aren't in the file were skipped" = "variabellägen för samlingar som inte finns i filen hoppades över"
+"variable modes of collections that aren't in the variables JSON were skipped" = "variabellägen för samlingar som inte finns i variabel-JSON:en hoppades över"
+"variable values that don't match their type (or composed colours) were skipped" = "variabelvärden som inte matchar sin typ (eller sammansatta färger) hoppades över"
+"variables of unknown types were skipped" = "variabler av okända typer hoppades över"
+"variables whose collection isn't in the variables JSON were skipped" = "variabler vars samling inte finns i variabel-JSON:en hoppades över"
+"variables without readable values were skipped" = "variabler utan läsbara värden hoppades över"
+"vector points with unknown stroke joins use the layer join" = "vektorpunkter med okända hörntyper använder lagrets hörntyp"
+"vectors without geometry are empty" = "vektorer utan geometri är tomma"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "vektorer utan geometri är tomma (exportera fil-JSON:en med geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "mycket lång text kortades till 1 048 576 tecken"
+"very long vector paths were skipped" = "mycket långa vektorbanor hoppades över"
+"video actions are not supported and were skipped" = "videoåtgärder stöds inte och hoppades över"
+"video triggers are not supported and were skipped" = "videoutlösare stöds inte och hoppades över"
 "yesterday" = "i går"
 "{instances} in {files}" = "{instances} i {files}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}: utkast till översättning, väntar på granskning av en modersmålstalare."
@@ -1516,6 +1751,7 @@ name = "Svenska"
 "{name} is forgotten on this computer; the file stays on {server}" = "{name} har glömts på den här datorn; filen finns kvar på {server}"
 "{name} is on the server." = "{name} finns på servern."
 "{name} is spotlighting" = "{name} har spotlight"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} är för stor för att öppnas i webbläsaren (över 512 MB)."
 "{name}\nClick to apply to the selection" = "{name}\nKlicka för att använda på markeringen"
 "{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nDra till arbetsytan, eller klicka för att placera i mitten av vyn.\nHåll ned Alt (Option) när du släpper på en instans för att byta ut den."
 "{name} (from {library})" = "{name} (från {library})"
@@ -1549,8 +1785,10 @@ name = "Svenska"
 "{n} layers selected" = { one = "{n} lager markerat", other = "{n} lager markerade" }
 "{n} layers · {parts}" = { one = "{n} lager · {parts}", other = "{n} lager · {parts}" }
 "{n} matches" = { one = "{n} träff", other = "{n} träffar" }
+"{n} min" = "{n} min"
 "{n} minutes ago" = { one = "för {n} minut sedan", other = "för {n} minuter sedan" }
 "{n} months ago" = { one = "för {n} månad sedan", other = "för {n} månader sedan" }
+"{n} more notes omitted from this report" = { one = "{n} anteckning till utelämnades i den här rapporten", other = "{n} anteckningar till utelämnades i den här rapporten" }
 "{n} of {total}" = "{n} av {total}"
 "{n} people joined" = { one = "{n} person anslöt", other = "{n} personer anslöt" }
 "{n} preferred components" = { one = "{n} föredragen komponent", other = "{n} föredragna komponenter" }
@@ -1559,7 +1797,10 @@ name = "Svenska"
 "{n} replies" = { one = "{n} svar", other = "{n} svar" }
 "{n} rows" = { one = "{n} rad", other = "{n} rader" }
 "{n} styles" = { one = "{n} formatmall", other = "{n} formatmallar" }
+"{n} text layers" = { one = "{n} textlager", other = "{n} textlager" }
 "{n} variables" = { one = "{n} variabel", other = "{n} variabler" }
+"{n} votes" = { one = "{n} röst", other = "{n} röster" }
+"{n} votes left" = { one = "{n} röst kvar", other = "{n} röster kvar" }
 "{n} weeks ago" = { one = "för {n} vecka sedan", other = "för {n} veckor sedan" }
 "{n} years ago" = { one = "för {n} år sedan", other = "för {n} år sedan" }
 "{n}d" = "{n} d"
@@ -1567,6 +1808,7 @@ name = "Svenska"
 "{n}m" = "{n} min"
 "{n}w" = "{n} v"
 "{page}, nothing selected" = "{page}, inget markerat"
+"{percent}%" = "{percent} %"
 "{profile} (current)" = "{profile} (aktuell)"
 "{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} är dess värde; {property ? \"a\" : \"b\"} väljer en sträng. Andra {…} lämnas som de är skrivna."
 "{server} can't say what became of your files (it is older than this app)." = "{server} kan inte säga vad som hände med dina filer (den är äldre än den här appen)."
@@ -1588,9 +1830,154 @@ name = "Svenska"
 
 [commands]
 
+"align.bottom" = "Justera nederkant"
+"align.hcenter" = "Justera horisontella mittpunkter"
+"align.left" = "Justera vänster"
+"align.right" = "Justera höger"
+"align.top" = "Justera överkant"
+"align.vcenter" = "Justera vertikala mittpunkter"
+"annotation.add" = "Lägg till anteckning"
+"annotation.addCategory" = "Lägg till anteckningskategori"
+"annotation.categories" = "Anteckningskategorier"
+"annotation.edit" = "Redigera anteckning"
+"annotation.editCategory" = "Redigera anteckningskategori"
+"annotation.list" = "Lista anteckningar"
+"annotation.remove" = "Ta bort anteckning"
+"annotation.removeCategory" = "Radera anteckningskategori"
+"app.actions" = "Åtgärder"
+"app.preferences" = "Inställningar"
+"arrange.back" = "Flytta längst bak"
+"arrange.backward" = "Flytta bakåt"
+"arrange.forward" = "Flytta framåt"
+"arrange.front" = "Flytta längst fram"
+"arrange.packH" = "Packa horisontellt"
+"arrange.packV" = "Packa vertikalt"
+"arrange.reorder" = "Ändra ordning på markeringen"
+"arrange.roundToPixels" = "Avrunda till pixlar"
+"arrange.spacing" = "Avstånd"
+"arrange.tidy" = "Snygga till"
+"board.connector" = "Koppling"
+"board.ink" = "Märkpennsdrag"
+"board.label" = "Kopplingsetikett"
+"board.nextSticky" = "Nästa lapp"
+"board.reattach" = "Koppla om koppling"
+"board.setColor" = "Whiteboardfärg"
+"board.setStyle" = "Whiteboardstil"
+"board.shape" = "Form med text"
+"board.stamp" = "Stämpel"
+"board.sticky" = "Lapp"
+"board.table" = "Tabell"
+"board.tableEdit" = "Redigera tabell"
+"board.template" = "Whiteboardmall"
+"board.templates" = "Lista whiteboardmallar"
+"board.timer" = "Timer"
+"board.timerState" = "Timerstatus"
+"board.vote" = "Omröstning"
+"board.voteResults" = "Omröstningsresultat"
+"bool.exclude" = "Uteslut markering"
+"bool.flatten" = "Platta till boolesk form"
+"bool.intersect" = "Skärning av markering"
+"bool.subtract" = "Subtrahera markering"
+"bool.union" = "Förena markering"
+"branch.archive" = "Arkivera gren"
+"branch.create" = "Skapa gren"
+"branch.list" = "Lista grenar"
+"branch.merge" = "Sammanfoga gren"
+"branch.open" = "Öppna gren"
+"branch.review" = "Granska gren"
+"branch.updateFromMain" = "Uppdatera från main"
+"codeConnect.export" = "Exportera kodkopplingar"
+"codeConnect.import" = "Importera kodkopplingar"
+"codeConnect.remove" = "Koppla från koden"
+"codeConnect.set" = "Koppla till kod"
+"collab.cursor" = "Visa markör vid"
+"collab.cursorChat" = "Markörchatt"
+"collab.diff" = "Visa synkändringar"
+"collab.files" = "Dina onlinefiler"
+"collab.follow" = "Följ"
+"collab.forgetFile" = "Glöm onlinefil"
+"collab.host" = "Starta livesession"
+"collab.join" = "Gå med i livesession"
+"collab.leave" = "Lämna livesession"
+"collab.manageFile" = "Hantera publicerad fil"
+"collab.openFile" = "Öppna onlinefil"
+"collab.peers" = "Personer i den här filen"
+"collab.publish" = "Publicera på server"
+"collab.recoverFile" = "Återställ onlinefil"
+"collab.registerLinks" = "Öppna inbjudningslänkar i FigCraft"
+"collab.removePerson" = "Ta bort från session"
+"collab.report" = "Rapportera filen till serveroperatören"
+"collab.serverInfo" = "Serverinfo"
+"collab.share" = "Dela med en anslutningskod"
+"collab.spotlight" = "Rikta strålkastaren mot mig"
+"collab.stop" = "Stoppa livesession"
+"command.batch" = "Kör flera kommandon"
+"comment.add" = "Lägg till kommentar"
+"comment.delete" = "Ta bort kommentar"
+"comment.edit" = "Redigera kommentar"
+"comment.link" = "Kopiera länk till kommentar"
+"comment.list" = "Lista kommentarer"
+"comment.markRead" = "Markera kommentar som läst"
+"comment.move" = "Flytta kommentar"
+"comment.next" = "Nästa kommentar"
+"comment.open" = "Öppna kommentar"
+"comment.people" = "Personer i kommentarer"
+"comment.react" = "Reagera på kommentar"
+"comment.reply" = "Svara på kommentar"
+"comment.resolve" = "Lös kommentar"
+"comment.zoom" = "Zooma till kommentarer"
+"component.addProperty" = "Lägg till komponentegenskap"
+"component.addVariant" = "Lägg till variant"
+"component.bindProperty" = "Koppla lager till egenskap"
+"component.combineVariants" = "Kombinera som varianter"
+"component.create" = "Skapa komponent"
+"component.createMultiple" = "Skapa flera komponenter"
+"component.deleteProperty" = "Radera komponentegenskap"
+"component.detach" = "Koppla bort instans"
+"component.editProperty" = "Redigera komponentegenskap"
+"component.exposeInstance" = "Exponera kapslad instans"
+"component.goToMain" = "Gå till huvudkomponent"
+"component.hideWhenPublishing" = "Dölj vid publicering"
+"component.list" = "Lista komponenter"
+"component.makeSlot" = "Gör till plats"
+"component.playground" = "Komponenttestyta"
+"component.properties" = "Komponentegenskaper"
+"component.pushChanges" = "Skicka ändringar till huvudkomponenten"
+"component.removeSlot" = "Ta bort plats"
+"component.resetInstance" = "Återställ alla ändringar"
+"component.resetOverride" = "Återställ override"
+"component.restoreMain" = "Återställ huvudkomponent"
+"dev.compare" = "Jämför ändringar"
+"dev.focus" = "Fokusvy"
+"dev.resolveChange" = "Lös ändring"
+"dev.unfocus" = "Lämna fokusvy"
+"devMode.addMeasurement" = "Lägg till mått"
+"devMode.measurements" = "Lista mått"
+"devMode.removeMeasurement" = "Ta bort mått"
+"devResource.add" = "Lägg till utvecklarresurs"
+"devResource.edit" = "Redigera utvecklarresurs"
+"devResource.list" = "Lista utvecklarresurser"
+"devResource.remove" = "Ta bort utvecklarresurs"
+"distribute.horizontal" = "Fördela horisontellt avstånd"
+"distribute.vertical" = "Fördela vertikalt avstånd"
+"doc.home" = "Start"
+"doc.list" = "Lista dokument"
+"doc.nextTab" = "Nästa flik"
+"doc.previousTab" = "Föregående flik"
+"doc.switch" = "Byt dokument"
+"edit.copy" = "Kopiera"
+"edit.copyAsCss" = "Kopiera som CSS"
+"edit.copyAsPng" = "Kopiera som PNG"
+"edit.copyAsSvg" = "Kopiera som SVG"
+"edit.copyAsText" = "Kopiera som text"
+"edit.copyLink" = "Kopiera länk till markering"
+"edit.copyProperties" = "Kopiera egenskaper"
+"edit.cut" = "Klipp ut"
+"edit.delete" = "Radera"
 "edit.duplicate" = "Duplicera"
 "edit.findReplace" = "Sök och ersätt"
 "edit.paste" = "Klistra in"
+"edit.pasteDesignLayers" = "Klistra in designlager"
 "edit.pasteOver" = "Klistra in över"
 "edit.pasteProperties" = "Klistra in egenskaper"
 "edit.pasteReplace" = "Klistra in och ersätt"
@@ -1610,11 +1997,13 @@ name = "Svenska"
 "file.colorProfile" = "Färgprofil"
 "file.duplicate" = "Duplicera fil"
 "file.export" = "Exportera"
-"file.exportFramesPdf" = "Exportera ramar som PDF"
+"file.exportFramesPdf" = "Exportera frames som PDF"
 "file.exportLayers" = "Exportera lager"
 "file.exportSvg" = "Exportera som SVG"
 "file.import" = "Importera"
+"file.moveTab" = "Flytta flik"
 "file.new" = "Nytt"
+"file.newBoard" = "Ny whiteboard"
 "file.newFromTemplate" = "Nytt från mall"
 "file.open" = "Öppna"
 "file.openRecent" = "Öppna senaste"
@@ -1631,8 +2020,8 @@ name = "Svenska"
 "fill.pattern" = "Mönster"
 "fill.remove" = "Ta bort fyllning"
 "fill.set" = "Ange fyllning"
-"frame.create" = "Skapa ram"
-"frame.presets" = "Ramförinställningar"
+"frame.create" = "Skapa frame"
+"frame.presets" = "Förinställningar för frames"
 "frame.swapOrientation" = "Växla orientering"
 "grid.add" = "Lägg till rutnät"
 "grid.move" = "Flytta rutnät"
@@ -1651,7 +2040,7 @@ name = "Svenska"
 "image.place" = "Placera bild"
 "image.presets" = "Bildförinställningar"
 "image.savePreset" = "Spara förinställning"
-"inspect.assets" = "Tillgångar"
+"inspect.assets" = "Resurser"
 "inspect.code" = "Kod"
 "inspect.componentCode" = "Komponentkod"
 "inspect.properties" = "Egenskaper"
@@ -1665,8 +2054,8 @@ name = "Svenska"
 "instance.swap" = "Byt instans"
 "instance.swapAt" = "Byt instans vid position"
 "layers.collapseAll" = "Fäll ihop alla"
-"layout.add" = "Lägg till automatisk layout"
-"layout.remove" = "Ta bort automatisk layout"
+"layout.add" = "Lägg till auto layout"
+"layout.remove" = "Ta bort auto layout"
 "layout.setTrack" = "Ange spår"
 "layout.suggest" = "Föreslå layout"
 "libraries.open" = "Öppna bibliotek"
@@ -1690,15 +2079,16 @@ name = "Svenska"
 "library.updates" = "Biblioteksuppdateringar"
 "library.usage" = "Biblioteksanvändning"
 "measure.distances" = "Mät avstånd"
-"measure.padding" = "Mät utfyllnad"
+"measure.padding" = "Mät padding"
 "node.create" = "Skapa nod"
 "node.get" = "Hämta nod"
 "node.reorder" = "Ändra ordning"
 "node.reparent" = "Byt överordnad nod"
 "node.set" = "Ange nodegenskaper"
 "object.batchRename" = "Byt namn på flera"
-"object.convertToFrame" = "Konvertera till ram"
+"object.convertToFrame" = "Konvertera till frame"
 "object.convertToGroup" = "Konvertera till grupp"
+"object.convertToSection" = "Konvertera till avsnitt"
 "object.flipH" = "Vänd vågrätt"
 "object.flipV" = "Vänd lodrätt"
 "object.frameSelection" = "Rama in markering"
@@ -1708,6 +2098,378 @@ name = "Svenska"
 "object.moveToPage" = "Flytta till sida"
 "object.opacityKeys" = "Nyckelbildrutor för opacitet"
 "object.rasterize" = "Rastrera"
+"object.releaseMask" = "Frigör mask"
+"object.removeFill" = "Ta bort fyllning"
+"object.removeFrame" = "Ta bort frame"
+"object.removeStroke" = "Ta bort kontur"
+"object.rename" = "Byt namn"
+"object.resizeToFit" = "Anpassa storlek"
+"object.rotate180" = "Rotera 180°"
+"object.rotateLeft" = "Rotera 90° åt vänster"
+"object.rotateRight" = "Rotera 90° åt höger"
+"object.setThumbnail" = "Ange som miniatyr"
+"object.swapFillStroke" = "Byt plats på fyllning och kontur"
+"object.toggleLock" = "Lås/lås upp markering"
+"object.toggleVisible" = "Visa/dölj markering"
+"object.ungroup" = "Dela upp markerade grupper"
+"object.wrapInSection" = "Lägg i nytt avsnitt"
+"page.add" = "Lägg till sida"
+"page.delete" = "Radera sida"
+"page.duplicate" = "Duplicera sida"
+"page.list" = "Lista sidor"
+"page.move" = "Flytta sida"
+"page.rename" = "Byt namn på sida"
+"page.select" = "Gå till sida"
+"page.setBackground" = "Sidbakgrund"
+"paint.documentColors" = "Dokumentfärger"
+"plugin.close" = "Stäng plugin-panelen"
+"plugin.directory.install" = "Installera plugin från katalogen"
+"plugin.directory.list" = "Bläddra i plugin-katalogen"
+"plugin.directory.publish" = "Publicera plugin i katalogen"
+"plugin.directory.unpublish" = "Avpublicera plugin från katalogen"
+"plugin.event" = "Använd kontroll i plugin-panelen"
+"plugin.import" = "Importera plugin från manifest…"
+"plugin.list" = "Lista plugins"
+"plugin.remove" = "Ta bort plugin"
+"plugin.run" = "Kör plugin"
+"plugin.ui" = "Plugin-panel"
+"plugins.manage" = "Hantera plugins…"
+"plugins.runLast" = "Kör senaste plugin"
+"pref.autoSave" = "Spara filer automatiskt"
+"pref.highlightHover" = "Framhäv lager vid hovring"
+"pref.keepTool" = "Behåll verktyget markerat efter användning"
+"pref.language" = "Gränssnittsspråk"
+"pref.nudge" = "Steglängd"
+"pref.numberKeysOpacity" = "Använd siffertangenterna för opacitet"
+"pref.publishServer" = "Server för delning online"
+"pref.reduceMotion" = "Minska rörelse"
+"pref.renameDuplicates" = "Byt namn på duplicerade lager"
+"pref.showDimensions" = "Visa dimensioner på objekt"
+"pref.startOnHome" = "Börja på Start"
+"pref.uiScale" = "Gränssnittsstorlek"
+"pref.userName" = "Ditt namn i kommentarer"
+"proto.action.add" = "Lägg till prototypåtgärd"
+"proto.action.move" = "Ändra ordning på prototypåtgärd"
+"proto.action.remove" = "Ta bort prototypåtgärd"
+"proto.action.set" = "Redigera prototypåtgärd"
+"proto.closePreview" = "Stäng prototypförhandsgranskning"
+"proto.conditional.addBlock" = "Lägg till annars om / annars"
+"proto.conditional.removeBlock" = "Ta bort om / annars om / annars"
+"proto.conditional.setCondition" = "Redigera villkor"
+"proto.evaluate" = "Beräkna prototyputtryck"
+"proto.flow.add" = "Lägg till startpunkt för flöde"
+"proto.flow.remove" = "Ta bort flöde"
+"proto.flow.rename" = "Byt namn på flöde"
+"proto.interaction.add" = "Lägg till interaktion"
+"proto.interaction.clear" = "Ta bort alla interaktioner"
+"proto.interaction.remove" = "Ta bort interaktion"
+"proto.interaction.set" = "Redigera interaktion"
+"proto.present" = "Presentera"
+"proto.presentOptions" = "Presentationsalternativ"
+"proto.preview" = "Öppna prototypförhandsgranskning"
+"proto.settings" = "Prototypinställningar"
+"section.toggleContents" = "Dölj/visa avsnittets innehåll"
+"select.add" = "Lägg till i markering"
+"select.all" = "Markera alla"
+"select.area" = "Markera område"
+"select.byName" = "Markera lager efter namn"
+"select.children" = "Markera underordnade"
+"select.inverse" = "Invertera markering"
+"select.layersAt" = "Lager vid en punkt"
+"select.matching" = "Markera matchande lager"
+"select.next" = "Markera nästa syskon"
+"select.none" = "Markera inga"
+"select.parent" = "Markera överordnad"
+"select.previous" = "Markera föregående syskon"
+"select.remove" = "Ta bort från markering"
+"select.sameEffect" = "Markera samma effekt"
+"select.sameFill" = "Markera samma fyllning"
+"select.sameFont" = "Markera samma typsnitt"
+"select.sameInstance" = "Markera samma instans"
+"select.sameProperties" = "Markera samma egenskaper"
+"select.sameStroke" = "Markera samma kontur"
+"select.sameText" = "Markera samma textegenskaper"
+"select.set" = "Markera"
+"selection.applyColorStyle" = "Använd färgformatmall på markeringen"
+"selection.bindColorVariable" = "Använd färgvariabel på markeringen"
+"selection.colors" = "Markeringsfärger"
+"selection.detachColor" = "Koppla bort markeringsfärg"
+"selection.selectColor" = "Markera lager med den här färgen"
+"selection.setPaint" = "Ändra markeringens färg"
+"shape.arrow" = "Pil"
+"shape.ellipse" = "Ellips"
+"shape.line" = "Linje"
+"shape.polygon" = "Polygon"
+"shape.rectangle" = "Rektangel"
+"shape.star" = "Stjärna"
+"shapeBuilder.merge" = "Sammanfoga områden"
+"shapeBuilder.mode" = "Formbyggarläge"
+"shapeBuilder.regions" = "Formbyggarområden"
+"shapeBuilder.remove" = "Ta bort områden"
+"stroke.add" = "Lägg till kontur"
+"stroke.brush" = "Pensel"
+"stroke.move" = "Flytta kontur"
+"stroke.remove" = "Ta bort kontur"
+"stroke.set" = "Ange kontur"
+"stroke.widthProfile" = "Breddprofil"
+"style.apply" = "Använd stil"
+"style.bind" = "Bind variabel i stil"
+"style.create" = "Skapa stil"
+"style.delete" = "Ta bort stil"
+"style.detach" = "Koppla bort stil"
+"style.duplicate" = "Duplicera stil"
+"style.list" = "Lista stilar"
+"style.move" = "Flytta stilar"
+"style.renameFolder" = "Byt namn på stilmapp"
+"style.update" = "Redigera stil"
+"template.list" = "Lista mallar"
+"text.alignCenter" = "Centrera"
+"text.alignJustify" = "Marginaljustera"
+"text.alignLeft" = "Justera vänster"
+"text.alignRight" = "Justera höger"
+"text.bold" = "Fet"
+"text.bulletList" = "Punktlista"
+"text.case" = "Skiftläge"
+"text.caseLower" = "Gemener"
+"text.caseOriginal" = "Ursprungligt skiftläge"
+"text.caseSmallCaps" = "Kapitäler"
+"text.caseTitle" = "Inledande versaler"
+"text.caseUpper" = "Versaler"
+"text.create" = "Text"
+"text.decoration" = "Dekoration"
+"text.edit.begin" = "Redigera text"
+"text.edit.caret" = "Placera markören"
+"text.edit.end" = "Sluta redigera text"
+"text.edit.insert" = "Skriv text"
+"text.edit.key" = "Texttangent"
+"text.edit.preedit" = "Komponera text (IME)"
+"text.edit.selectLine" = "Markera textrad"
+"text.edit.selectWord" = "Markera ord"
+"text.edit.selection" = "Textmarkering"
+"text.endPreview" = "Avsluta förhandsgranskning av text"
+"text.fonts" = "Lista typsnitt"
+"text.italic" = "Kursiv"
+"text.lineHeightDown" = "Minska radhöjden"
+"text.lineHeightUp" = "Öka radhöjden"
+"text.link" = "Skapa länk"
+"text.listIndent" = "Öka listindrag"
+"text.listOutdent" = "Minska listindrag"
+"text.listStyle" = "Liststil"
+"text.loadFont" = "Läs in typsnittsfil"
+"text.maxLines" = "Max antal rader"
+"text.missingFonts" = "Saknade typsnitt"
+"text.numberList" = "Numrerad lista"
+"text.onPath" = "Text på bana"
+"text.paragraphIndent" = "Styckeindrag"
+"text.paragraphSpacing" = "Styckeavstånd"
+"text.pathOptions" = "Alternativ för textbana"
+"text.preview" = "Förhandsgranska textändring"
+"text.refit" = "Anpassa text till typsnitt"
+"text.removeFromPath" = "Ta bort text från bana"
+"text.rescanFonts" = "Sök igenom installerade typsnitt igen"
+"text.set" = "Ange text"
+"text.setFeatures" = "OpenType-funktioner"
+"text.setVariations" = "Axlar för variabla typsnitt"
+"text.sizeDown" = "Minska teckenstorleken"
+"text.sizeUp" = "Öka teckenstorleken"
+"text.strikethrough" = "Genomstruken"
+"text.style" = "Formatera textomfång"
+"text.trackingDown" = "Minska teckenavståndet"
+"text.trackingUp" = "Öka teckenavståndet"
+"text.underline" = "Understrykning"
+"text.weightDown" = "Minska teckenvikten"
+"text.weightUp" = "Öka teckenvikten"
+"tool.arrow" = "Pil"
+"tool.comment" = "Kommentar"
+"tool.connector" = "Koppling"
+"tool.ellipse" = "Ellips"
+"tool.eraser" = "Suddgummi"
+"tool.frame" = "Frame"
+"tool.hand" = "Hand"
+"tool.highlighter" = "Överstrykningspenna"
+"tool.line" = "Linje"
+"tool.marker" = "Märkpenna"
+"tool.move" = "Flytta"
+"tool.pen" = "Penna"
+"tool.pencil" = "Blyertspenna"
+"tool.pencilBrush" = "Blyertspensel"
+"tool.place" = "Placera med verktyget"
+"tool.polygon" = "Polygon"
+"tool.rectangle" = "Rektangel"
+"tool.scale" = "Skala"
+"tool.scaleAnchor" = "Skalningsankare"
+"tool.section" = "Avsnitt"
+"tool.set" = "Välj verktyg"
+"tool.shape" = "Former"
+"tool.shapeBuilder" = "Formbyggare"
+"tool.slice" = "Skiva"
+"tool.stamp" = "Stämpel"
+"tool.star" = "Stjärna"
+"tool.sticky" = "Lapp"
+"tool.text" = "Text"
+"transform.move" = "Flytta"
+"transform.moveTo" = "Flytta till"
+"transform.nudge" = "Flytta stegvis"
+"transform.nudgeSize" = "Ändra storlek stegvis"
+"transform.resize" = "Ändra storlek"
+"transform.rotate" = "Rotera"
+"transform.rotationOrigin" = "Flytta rotationspunkt"
+"transform.scale" = "Skala"
+"transform.setRotationOrigin" = "Ange rotationspunkt"
+"variable.addMode" = "Lägg till läge"
+"variable.bind" = "Bind variabel"
+"variable.create" = "Skapa variabel"
+"variable.createCollection" = "Skapa variabelsamling"
+"variable.delete" = "Radera variabel"
+"variable.deleteCollection" = "Radera samling"
+"variable.duplicate" = "Duplicera variabel"
+"variable.export" = "Exportera variabler"
+"variable.import" = "Importera variabler"
+"variable.list" = "Lista variabler"
+"variable.moveMode" = "Flytta läge"
+"variable.removeMode" = "Radera läge"
+"variable.renameCollection" = "Byt namn på samling"
+"variable.renameMode" = "Byt namn på läge"
+"variable.resetOverride" = "Återställ åsidosatt variabel"
+"variable.set" = "Ange variabelvärde"
+"variable.setMode" = "Ange variabelläge"
+"variable.update" = "Redigera variabel"
+"vector.create" = "Vektor"
+"vector.deleteHeal" = "Radera och retuschera markering"
+"vector.edit.addVertex" = "Lägg till punkt"
+"vector.edit.begin" = "Redigera vektor"
+"vector.edit.bend" = "Böj segment"
+"vector.edit.bounds" = "Markerade punkters gränser"
+"vector.edit.connect" = "Koppla ihop punkter"
+"vector.edit.cornerRadius" = "Hörnradie för punkt"
+"vector.edit.cut" = "Dela bana"
+"vector.edit.delete" = "Radera punkter"
+"vector.edit.end" = "Klar med redigeringen"
+"vector.edit.erase" = "Radera"
+"vector.edit.lasso" = "Lassomarkering"
+"vector.edit.mirroring" = "Handtagsspegling"
+"vector.edit.moveHandles" = "Flytta handtag"
+"vector.edit.moveVertices" = "Flytta punkter"
+"vector.edit.nudge" = "Flytta punkter stegvis"
+"vector.edit.paint" = "Färghink"
+"vector.edit.pen" = "Pennpunkt"
+"vector.edit.penEnd" = "Avsluta pennbana"
+"vector.edit.position" = "Punktposition"
+"vector.edit.resize" = "Ändra storlek på punkter"
+"vector.edit.rotate" = "Rotera punkter"
+"vector.edit.select" = "Markera punkter"
+"vector.edit.selectAll" = "Markera alla punkter"
+"vector.edit.setHandle" = "Ange handtag"
+"vector.edit.smooth" = "Gör punkter mjuka eller skarpa"
+"vector.edit.state" = "Tillstånd för vektorredigering"
+"vector.edit.strokeCap" = "Konturände för punkt"
+"vector.edit.strokeJoin" = "Konturhörn för punkt"
+"vector.edit.tool" = "Vektorredigeringsverktyg"
+"vector.edit.transform" = "Transformera punkter"
+"vector.edit.widthPoint" = "Breddpunkt"
+"vector.fillRule" = "Ange fyllnadsregel"
+"vector.flatten" = "Platta till"
+"vector.join" = "Sammanfoga markering"
+"vector.offset" = "Förskjut bana"
+"vector.outlineStroke" = "Konvertera kontur till form"
+"vector.reverse" = "Vänd banans riktning"
+"vector.reverseLoop" = "Vänd slinga"
+"vector.simplify" = "Förenkla vektor"
+"vector.smoothJoin" = "Sammanfoga markering mjukt"
+"version.autosave" = "Autospara version"
+"version.delete" = "Radera version"
+"version.duplicate" = "Duplicera version"
+"version.exitPreview" = "Tillbaka till aktuell version"
+"version.list" = "Lista versioner"
+"version.preview" = "Visa version"
+"version.rename" = "Byt namn på version"
+"version.restore" = "Återställ version"
+"view.assets" = "Panelen Resurser"
+"view.comments" = "Kommentarer"
+"view.contextMenu" = "Visa snabbmeny"
+"view.design" = "Panelen Design"
+"view.designPrototype" = "Växla mellan Design och Prototyp"
+"view.devMode" = "Utvecklarläge"
+"view.frameOutlines" = "Konturlinjer för frames"
+"view.fullscreen" = "Helskärm"
+"view.get" = "Hämta vy"
+"view.layers" = "Panelen Lager"
+"view.layoutGrids" = "Layoutrutnät"
+"view.leftSidebar" = "Visa/dölj vänster sidofält"
+"view.maskOutlines" = "Konturlinjer för masker"
+"view.multiplayerCursors" = "Samarbetsmarkörer"
+"view.nextFrame" = "Zooma till nästa frame"
+"view.nextPage" = "Nästa sida"
+"view.nextRegion" = "Fokusera nästa region"
+"view.outlines" = "Konturlinjer"
+"view.outlinesHiddenLayers" = "Inkludera dolda lager i konturlinjer"
+"view.outlinesObjectBounds" = "Inkludera objektgränser i konturlinjer"
+"view.outlinesSelection" = "Konturlinjer för markering"
+"view.pan" = "Panorera vyn"
+"view.panelWidths" = "Återställ panelbredder"
+"view.pixelGrid" = "Pixelrutnät"
+"view.pixelPreview" = "Pixelförhandsgranskning"
+"view.prevFrame" = "Zooma till föregående frame"
+"view.prevPage" = "Föregående sida"
+"view.previousRegion" = "Fokusera föregående region"
+"view.proofSrgb" = "Skärmkorrektur i sRGB"
+"view.prototype" = "Panelen Prototyp"
+"view.rulers" = "Linjaler"
+"view.set" = "Ange vy"
+"view.slices" = "Skivor"
+"view.snapGeometry" = "Fäst mot geometri"
+"view.snapObjects" = "Fäst mot objekt"
+"view.snapPixel" = "Fäst mot pixelrutnät"
+"view.themeDark" = "Mörkt tema"
+"view.themeLight" = "Ljust tema"
+"view.themeSystem" = "Följ systemets tema"
+"view.toggleUi" = "Visa/dölj gränssnitt"
+"view.zoom100" = "Zooma till 100 %"
+"view.zoom200" = "Zooma till 200 %"
+"view.zoom50" = "Zooma till 50 %"
+"view.zoomAt" = "Zoomverktyg"
+"view.zoomFit" = "Zooma för att anpassa"
+"view.zoomIn" = "Zooma in"
+"view.zoomOut" = "Zooma ut"
+"view.zoomSelection" = "Zooma till markering"
+"widget.click" = "Klicka på widget"
+"widget.insert" = "Infoga widget"
+"widget.list" = "Lista widgetar"
+"widget.menu" = "Widgetmeny"
+"widget.setText" = "Redigera widgetfält"
+"window.focus" = "Placera fönstret längst fram"
+"window.new" = "Nytt fönster"
 
 [menu]
 
+"bool.exclude" = "Uteslut"
+"bool.flatten" = "Platta till"
+"bool.intersect" = "Skärning"
+"bool.subtract" = "Subtrahera"
+"bool.union" = "Förena"
+"file.duplicate" = "Duplicera"
+"file.import" = "Importera från fil…"
+"file.rename" = "Byt namn"
+"libraries.open" = "Öppna bibliotek"
+"select.sameEffect" = "Effekt"
+"select.sameFill" = "Fyllning"
+"select.sameFont" = "Typsnitt"
+"select.sameInstance" = "Instans"
+"select.sameProperties" = "Egenskaper"
+"select.sameStroke" = "Kontur"
+"select.sameText" = "Textegenskaper"
+"text.alignCenter" = "Centrera text"
+"text.alignJustify" = "Marginaljustera text"
+"text.alignLeft" = "Vänsterjustera text"
+"text.alignRight" = "Högerjustera text"
+"view.assets" = "Resurser"
+"view.design" = "Design"
+"view.layers" = "Lager"
+"view.outlines" = "Visa konturlinjer"
+"view.outlinesHiddenLayers" = "Inkludera dolda lager"
+"view.outlinesObjectBounds" = "Inkludera objektgränser"
+"view.outlinesSelection" = "Visa konturlinjer för markering"
+"view.prototype" = "Prototyp"
+"view.themeDark" = "Mörk"
+"view.themeLight" = "Ljus"
+"view.themeSystem" = "Följ systemet"
diff --git a/crates/ui-egui/locales/th.toml b/crates/ui-egui/locales/th.toml
new file mode 100644
index 00000000..c85db727
--- /dev/null
+++ b/crates/ui-egui/locales/th.toml
@@ -0,0 +1,2429 @@
+# FigCraft interface strings: Thai.
+#
+# Draft — needs native review: machine-drafted from the English catalog. Brand names, keyboard
+# glyphs and {placeholders} stay as they are. Concise UI style without ครับ/ค่ะ endings, bare
+# imperatives for buttons and menu items (บันทึก, ลบ), no spaces between Thai words (a space only
+# separates clauses and Thai from Latin words or numbers). Established design terms are
+# transliterated as Thai designers say them (เฟรม, เลเยอร์, คอมโพเนนต์, อินสแตนซ์, แวเรียนต์,
+# ออโต้เลย์เอาต์, โปรโตไทป์). No plural forms: plural entries give only `other`.
+# See docs/translating.md.
+
+[meta]
+name = "ไทย"
+status = "draft — needs native review"
+
+[ui]
+"% of all commits" = "% ของคอมมิตทั้งหมด"
+"(no longer published)" = "(เลิกเผยแพร่แล้ว)"
+"({n} warnings: some entries were skipped)" = { other = "(คำเตือน {n} รายการ: ข้ามบางรายการ)" }
+"+ Create variable" = "+ สร้างตัวแปร"
+".fig (experimental)" = ".fig (ทดลอง)"
+"1…9, 0" = "1…9, 0"
+"@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PR, {commits} คอมมิต, +{added} / −{deleted} บรรทัด (Δ {delta}), แอสเซ็ตไบนารี +{bin_added} / −{bin_deleted}, {first} – {last}"
+"A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "คอลเลกชันของไฟล์นี้พร้อมโหมดและตัวแปรเหล่านี้: เขียนทับค่าตามโหมดและเพิ่มตัวแปรของตัวเองได้"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "มีไฟล์ .figcraft ชื่อนี้อยู่แล้ว เลือกชื่อเต็มของไฟล์เพื่อยืนยันการแทนที่"
+"A layer on its own aligns to its frame: select more layers, or one in a frame" = "เลเยอร์เดี่ยวจะจัดแนวตามเฟรมของมัน: เลือกเลเยอร์เพิ่ม หรือเลือกเลเยอร์ในเฟรม"
+"A responsive product page: hero, features, figures, a quote and a footer" = "หน้าสินค้าแบบรีสปอนซีฟ: ฮีโร่ ฟีเจอร์ ตัวเลข คำพูดอ้างอิง และฟุตเตอร์"
+"A spring plays until it settles: its mass, stiffness and damping set how long" = "สปริงเล่นจนนิ่ง: มวล ความแข็ง และการหน่วงกำหนดระยะเวลา"
+"A title, an agenda, a big figure, a chart and a closing slide" = "ชื่อเรื่อง วาระ ตัวเลขใหญ่ แผนภูมิ และสไลด์ปิดท้าย"
+"A to Z" = "A ถึง Z"
+"About" = "เกี่ยวกับ"
+"About FigCraft" = "เกี่ยวกับ FigCraft"
+"About this server" = "เกี่ยวกับเซิร์ฟเวอร์นี้"
+"Action" = "การกระทำ"
+"Actions" = "การกระทำ"
+"Actions for {name}" = "การกระทำของ {name}"
+"Actions…" = "การกระทำ…"
+"Active" = "ใช้งานอยู่"
+"Actual size (100%)" = "ขนาดจริง (100%)"
+"Add a category" = "เพิ่มหมวดหมู่"
+"Add a comment" = "เพิ่มความคิดเห็น"
+"Add a description" = "เพิ่มคำอธิบาย"
+"Add a frame (F) or a shape (R) to get started" = "เพิ่มเฟรม (F) หรือรูปร่าง (R) เพื่อเริ่มต้น"
+"Add a layer or component to tile first" = "เพิ่มเลเยอร์หรือคอมโพเนนต์ที่จะเรียงต่อกันก่อน"
+"Add a note for developers" = "เพิ่มโน้ตสำหรับนักพัฒนา"
+"Add action" = "เพิ่มการกระทำ"
+"Add actions for when no condition holds" = "เพิ่มการกระทำสำหรับเมื่อไม่มีเงื่อนไขใดเป็นจริง"
+"Add an annotation for developers" = "เพิ่มหมายเหตุสำหรับนักพัฒนา"
+"Add another condition" = "เพิ่มเงื่อนไขอื่น"
+"Add auto layout" = "เพิ่มออโต้เลย์เอาต์"
+"Add background behind overlay" = "เพิ่มพื้นหลังหลังโอเวอร์เลย์"
+"Add content to this slot" = "เพิ่มเนื้อหาในสล็อตนี้"
+"Add dev resource" = "เพิ่มแหล่งข้อมูลสำหรับนักพัฒนา"
+"Add effect" = "เพิ่มเอฟเฟกต์"
+"Add export setting" = "เพิ่มการตั้งค่าส่งออก"
+"Add fill" = "เพิ่มสีเติม"
+"Add interaction" = "เพิ่มอินเทอร์แอกชัน"
+"Add layout grid" = "เพิ่มกริดเลย์เอาต์"
+"Add library" = "เพิ่มไลบรารี"
+"Add library file…" = "เพิ่มไฟล์ไลบรารี…"
+"Add max height" = "เพิ่มความสูงสูงสุด"
+"Add max width" = "เพิ่มความกว้างสูงสุด"
+"Add measurement" = "เพิ่มการวัด"
+"Add min height" = "เพิ่มความสูงต่ำสุด"
+"Add min width" = "เพิ่มความกว้างต่ำสุด"
+"Add mode" = "เพิ่มโหมด"
+"Add new page" = "เพิ่มหน้าใหม่"
+"Add or update collections from a variables JSON" = "เพิ่มหรืออัปเดตคอลเลกชันจาก JSON ของตัวแปร"
+"Add properties to make instances configurable" = "เพิ่มพร็อพเพอร์ตีเพื่อให้ปรับแต่งอินสแตนซ์ได้"
+"Add reaction" = "เพิ่มรีแอกชัน"
+"Add starting point" = "เพิ่มจุดเริ่มต้น"
+"Add stroke" = "เพิ่มเส้นขอบ"
+"Add variant" = "เพิ่มแวเรียนต์"
+"Add variant with a new value" = "เพิ่มแวเรียนต์ด้วยค่าใหม่"
+"Added" = "เพิ่มแล้ว"
+"Added the library \"{name}\"" = "เพิ่มไลบรารี \"{name}\" แล้ว"
+"Adding to {name}" = "กำลังเพิ่มลงใน {name}"
+"Adjust" = "ปรับ"
+"Adjustment presets" = "พรีเซ็ตการปรับ"
+"Advanced" = "ขั้นสูง"
+"Advanced stroke" = "เส้นขอบขั้นสูง"
+"After delay" = "หลังหน่วงเวลา"
+"After delay {ms}ms" = "หลังหน่วงเวลา {ms} มิลลิวินาที"
+"Align" = "จัดแนว"
+"Align bottom" = "จัดแนวชิดล่าง"
+"Align center" = "จัดแนวกึ่งกลาง"
+"Align horizontal centers" = "จัดแนวกึ่งกลางแนวนอน"
+"Align left" = "จัดแนวชิดซ้าย"
+"Align middle" = "จัดแนวกึ่งกลางแนวตั้ง"
+"Align right" = "จัดแนวชิดขวา"
+"Align text baselines" = "จัดแนวเส้นฐานข้อความ"
+"Align top" = "จัดแนวชิดบน"
+"Align vertical centers" = "จัดแนวกึ่งกลางแนวตั้ง"
+"Alignment" = "การจัดแนว"
+"All" = "ทั้งหมด"
+"All categories" = "ทุกหมวดหมู่"
+"All comments" = "ความคิดเห็นทั้งหมด"
+"All components" = "คอมโพเนนต์ทั้งหมด"
+"All fonts" = "ฟอนต์ทั้งหมด"
+"All supported properties" = "พร็อพเพอร์ตีที่รองรับทั้งหมด"
+"All the fonts this file uses are installed" = "ติดตั้งฟอนต์ทั้งหมดที่ไฟล์นี้ใช้แล้ว"
+"All variables" = "ตัวแปรทั้งหมด"
+"Along the bottom" = "ตามขอบล่าง"
+"Along the left" = "ตามขอบซ้าย"
+"Along the right" = "ตามขอบขวา"
+"Along the top" = "ตามขอบบน"
+"Alpha" = "อัลฟา"
+"Alphabetical" = "ตามตัวอักษร"
+"Alt+drag" = "Alt+ลาก"
+"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "หน้าจอวิเคราะห์ข้อมูลบนกริด: ตัวเลข แผนภูมิที่วาดจากเวกเตอร์ และตาราง"
+"An invite link that opens FigCraft and joins" = "ลิงก์เชิญที่เปิด FigCraft และเข้าร่วม"
+"Anchor" = "จุดยึด"
+"Android" = "Android"
+"Angular" = "แบบเชิงมุม"
+"Animation" = "แอนิเมชัน"
+"Annotations" = "หมายเหตุ"
+"Annotations shown on the canvas" = "หมายเหตุที่แสดงบนแคนวาส"
+"Another server, or one that needs its key. The usual server is set in Preferences." = "เซิร์ฟเวอร์อื่น หรือเซิร์ฟเวอร์ที่ต้องใช้คีย์ เซิร์ฟเวอร์ปกติตั้งค่าได้ในการตั้งค่า"
+"Any status" = "สถานะใดก็ได้"
+"Anyone on your network with this code can edit the file, while this app stays open." = "ทุกคนในเครือข่ายของคุณที่มีรหัสนี้แก้ไขไฟล์ได้ ตราบเท่าที่แอปนี้ยังเปิดอยู่"
+"Anyone with the edit link can change the file; the view link only lets people look. The links carry their secrets: share them like passwords. `figcraft-server links` makes more and revokes them." = "ทุกคนที่มีลิงก์แก้ไขเปลี่ยนไฟล์ได้ ส่วนลิงก์ดูเปิดดูได้อย่างเดียว ลิงก์มีรหัสลับในตัว: แชร์เหมือนรหัสผ่าน `figcraft-server links` สร้างลิงก์เพิ่มและเพิกถอนได้"
+"Anyone with this code can edit the file." = "ทุกคนที่มีรหัสนี้แก้ไขไฟล์ได้"
+"Anyone with this code can look at the file, not change it." = "ทุกคนที่มีรหัสนี้เปิดดูไฟล์ได้ แต่แก้ไขไม่ได้"
+"Appearance" = "รูปลักษณ์"
+"Apply a component property" = "ใช้พร็อพเพอร์ตีของคอมโพเนนต์"
+"Apply variable" = "ใช้ตัวแปร"
+"Apply variable to text" = "ใช้ตัวแปรกับข้อความ"
+"Apply variable to visibility" = "ใช้ตัวแปรกับการแสดงผล"
+"Apps" = "แอป"
+"Apr" = "เม.ย."
+"Arc" = "ส่วนโค้ง"
+"Arc ratio" = "อัตราส่วนส่วนโค้ง"
+"Arc start" = "จุดเริ่มส่วนโค้ง"
+"Arc sweep" = "มุมกวาดส่วนโค้ง"
+"Archive" = "เก็บถาวร"
+"Archived" = "เก็บถาวรแล้ว"
+"Arrange" = "จัดเรียง"
+"Arrow" = "ลูกศร"
+"Arrow at the end" = "ลูกศรที่ปลาย"
+"As typed" = "ตามที่พิมพ์"
+"Asking the server…" = "กำลังถามเซิร์ฟเวอร์…"
+"Assets" = "แอสเซ็ต"
+"Aug" = "ส.ค."
+"Auto" = "อัตโนมัติ"
+"Auto (space around)" = "อัตโนมัติ (เว้นรอบ)"
+"Auto (space between)" = "อัตโนมัติ (เว้นระหว่าง)"
+"Auto (space evenly)" = "อัตโนมัติ (เว้นเท่ากัน)"
+"Auto ({mode})" = "อัตโนมัติ ({mode})"
+"Auto columns" = "คอลัมน์อัตโนมัติ"
+"Auto gap" = "ช่องว่างอัตโนมัติ"
+"Auto height" = "ความสูงอัตโนมัติ"
+"Auto layout" = "ออโต้เลย์เอาต์"
+"Auto rows" = "แถวอัตโนมัติ"
+"Auto width" = "ความกว้างอัตโนมัติ"
+"Back to the FigCraft server" = "กลับไปยังเซิร์ฟเวอร์ FigCraft"
+"Back to the font's value" = "กลับไปใช้ค่าของฟอนต์"
+"Back" = "กลับ"
+"Back to Ready for dev" = "กลับไปที่พร้อมสำหรับนักพัฒนา"
+"Back to Ready for dev: the next change compares with how it is now" = "กลับไปที่พร้อมสำหรับนักพัฒนา: การเปลี่ยนครั้งถัดไปจะเทียบกับสภาพปัจจุบัน"
+"Back to assets" = "กลับไปที่แอสเซ็ต"
+"Back to current" = "กลับไปที่ปัจจุบัน"
+"Back to styles" = "กลับไปที่สไตล์"
+"Back to the canvas from a focused region" = "กลับไปที่แคนวาสจากพื้นที่ที่โฟกัส"
+"Back to the current version" = "กลับไปที่เวอร์ชันปัจจุบัน"
+"Back to the values the font style implies" = "กลับไปใช้ค่าตามสไตล์ฟอนต์"
+"Background" = "พื้นหลัง"
+"Background blur" = "เบลอพื้นหลัง"
+"Basics" = "พื้นฐาน"
+"Before" = "ก่อน"
+"Bend" = "โค้งงอ"
+"Between the selected layers" = "ระหว่างเลเยอร์ที่เลือก"
+"Bevel" = "ปลายตัด"
+"Binary assets added" = "แอสเซ็ตไบนารีที่เพิ่ม"
+"Binary assets removed" = "แอสเซ็ตไบนารีที่ลบ"
+"Black & white" = "ขาวดำ"
+"Bleed" = "ระยะตัดตก"
+"Bleed marks" = "เครื่องหมายตัดตก"
+"Bleed marks need a bleed" = "เครื่องหมายตัดตกต้องมีระยะตัดตก"
+"Blend" = "ผสม"
+"Blend mode" = "โหมดการผสม"
+"Blue" = "น้ำเงิน"
+"Blur" = "เบลอ"
+"Boolean" = "บูลีน"
+"Boolean groups" = "กลุ่มบูลีน"
+"Both directions" = "ทั้งสองทิศทาง"
+"Bottom" = "ล่าง"
+"Bottom left radius" = "รัศมีมุมล่างซ้าย"
+"Bottom padding" = "ระยะขอบในด้านล่าง"
+"Bottom right radius" = "รัศมีมุมล่างขวา"
+"Branch" = "แบรนช์"
+"Branch archived" = "เก็บถาวรแบรนช์แล้ว"
+"Branch merged" = "รวมแบรนช์แล้ว"
+"Branch name" = "ชื่อแบรนช์"
+"Branch of {file}" = "แบรนช์ของ {file}"
+"Branch of {file} · merged or archived" = "แบรนช์ของ {file} · รวมหรือเก็บถาวรแล้ว"
+"Branch updated from main" = "อัปเดตแบรนช์จากเมนแล้ว"
+"Branch {name}" = "แบรนช์ {name}"
+"Branches" = "แบรนช์"
+"Bound to {name}. Click to detach the variable." = "ผูกกับ {name} คลิกเพื่อถอดตัวแปรออก"
+"Bring forward" = "นำมาข้างหน้า"
+"Bring the main file's changes into the branch" = "นำการเปลี่ยนแปลงของไฟล์หลักเข้าสู่แบรนช์"
+"Bring to front" = "นำไปไว้หน้าสุด"
+"Bristle" = "ขนแปรง"
+"Browse" = "เรียกดู"
+"Brush" = "แปรง"
+"Brush rotation jitter" = "การสุ่มการหมุนของแปรง"
+"Brush scatter" = "การกระจายของแปรง"
+"Brush size jitter" = "การสุ่มขนาดของแปรง"
+"Brush spacing" = "ระยะห่างของแปรง"
+"Bulleted list" = "รายการแบบสัญลักษณ์แสดงหัวข้อย่อย"
+"C or Shift+C" = "C หรือ Shift+C"
+"C or ⇧C" = "C หรือ ⇧C"
+"CMYK colour" = "สี CMYK"
+"Can view" = "ดูได้"
+"Check" = "ตรวจสอบ"
+"Checking the fonts installed on this computer…" = "กำลังตรวจสอบฟอนต์ที่ติดตั้งในคอมพิวเตอร์เครื่องนี้…"
+"Checking the server…" = "กำลังตรวจสอบเซิร์ฟเวอร์…"
+"Chevron" = "เชฟรอน"
+"Clear from this list" = "ล้างออกจากรายการนี้"
+"Code or invite link" = "รหัสหรือลิงก์เชิญ"
+"Color profile: {name}" = "โปรไฟล์สี: {name}"
+"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "สไตล์สีและข้อความ ตัวแปรสว่างและมืด ปุ่ม ช่องกรอก และการ์ด"
+"Connector" = "ตัวเชื่อม"
+"Convert to frame" = "แปลงเป็นเฟรม"
+"Convert to section" = "แปลงเป็นเซกชัน"
+"CSS custom properties…" = "CSS custom properties…"
+"Can edit" = "แก้ไขได้"
+"Can't read this library: {e}" = "อ่านไลบรารีนี้ไม่ได้: {e}"
+"Cancel" = "ยกเลิก"
+"Canvas" = "แคนวาส"
+"Canvas stacking" = "การซ้อนบนแคนวาส"
+"Cap height to baseline" = "ความสูงตัวพิมพ์ใหญ่ถึงเส้นฐาน"
+"Case" = "ตัวพิมพ์"
+"Case-sensitive forms" = "รูปแบบที่แยกตัวพิมพ์เล็กใหญ่"
+"Categories" = "หมวดหมู่"
+"Center" = "กึ่งกลาง"
+"Change alias" = "เปลี่ยนนามแฝง"
+"Change resolved" = "เปลี่ยนสถานะแก้ไขแล้ว"
+"Change style" = "เปลี่ยนสไตล์"
+"Change to" = "เปลี่ยนเป็น"
+"Change to needs a layer inside a variant" = "การเปลี่ยนเป็นต้องมีเลเยอร์อยู่ในแวเรียนต์"
+"Changed" = "เปลี่ยนแล้ว"
+"Changed on both sides: keep one" = "เปลี่ยนทั้งสองฝั่ง: เลือกเก็บไว้ฝั่งเดียว"
+"Changes on main" = "การเปลี่ยนแปลงบนเมน"
+"Changes on the branch" = "การเปลี่ยนแปลงบนแบรนช์"
+"Changes unknown" = "ไม่ทราบการเปลี่ยนแปลง"
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "เลือก React, Leptos, Vue, SwiftUI, Compose, ArkUI หรือ Flutter ด้านบนเพื่อเชื่อมคอมโพเนนต์นี้กับโค้ด"
+"Choose another profile to change it." = "เลือกโปรไฟล์อื่นเพื่อเปลี่ยน"
+"Choose collection" = "เลือกคอลเลกชัน"
+"Choose image" = "เลือกรูปภาพ"
+"Choose mode" = "เลือกโหมด"
+"Choose variable" = "เลือกตัวแปร"
+"Circle" = "วงกลม"
+"Clear recent" = "ล้างรายการล่าสุด"
+"Click + to replace mixed content" = "คลิก + เพื่อแทนที่เนื้อหาที่ปะปนกัน"
+"Click anywhere on the canvas to leave one." = "คลิกที่ใดก็ได้บนแคนวาสเพื่อวางไว้หนึ่งรายการ"
+"Click or drag to merge · {alt} removes" = "คลิกหรือลากเพื่อรวม · {alt} เพื่อลบ"
+"Click or drag to remove · {alt} merges" = "คลิกหรือลากเพื่อลบ · {alt} เพื่อรวม"
+"Click to record a key" = "คลิกเพื่อบันทึกปุ่ม"
+"Clip content" = "ตัดเนื้อหาส่วนเกิน"
+"Clip to shape" = "ตัดตามรูปร่าง"
+"Close" = "ปิด"
+"Close overlay" = "ปิดโอเวอร์เลย์"
+"Close preview" = "ปิดตัวอย่าง"
+"Close tab" = "ปิดแท็บ"
+"Close version history" = "ปิดประวัติเวอร์ชัน"
+"Close when clicking outside" = "ปิดเมื่อคลิกด้านนอก"
+"Code" = "โค้ด"
+"Code syntax" = "ไวยากรณ์โค้ด"
+"Collapse" = "ยุบ"
+"Collapse panel" = "ยุบแผง"
+"Collection" = "คอลเลกชัน"
+"Collections" = "คอลเลกชัน"
+"Color" = "สี"
+"Color burn" = "Color burn"
+"Color dodge" = "Color dodge"
+"Color format" = "รูปแบบสี"
+"Color profile" = "โปรไฟล์สี"
+"Color styles" = "สไตล์สี"
+"Color values in this file are in this color space." = "ค่าสีในไฟล์นี้อยู่ในปริภูมิสีนี้"
+"Color variables" = "ตัวแปรสี"
+"Colour" = "สี"
+"Column" = "คอลัมน์"
+"Column gap" = "ช่องว่างระหว่างคอลัมน์"
+"Column sizes" = "ขนาดคอลัมน์"
+"Column span" = "จำนวนคอลัมน์ที่คลุม"
+"Columns" = "คอลัมน์"
+"Columns {count}" = "คอลัมน์ {count}"
+"Comment" = "ความคิดเห็น"
+"Comments" = "ความคิดเห็น"
+"Commits" = "คอมมิต"
+"Company" = "บริษัท"
+"Compare changes" = "เปรียบเทียบการเปลี่ยนแปลง"
+"Compare with" = "เปรียบเทียบกับ"
+"Compatibility notes" = "หมายเหตุความเข้ากันได้"
+"Completed" = "เสร็จสมบูรณ์"
+"Component" = "คอมโพเนนต์"
+"Component name" = "ชื่อคอมโพเนนต์"
+"Component property" = "พร็อพเพอร์ตีของคอมโพเนนต์"
+"Component set" = "ชุดคอมโพเนนต์"
+"Component sets" = "ชุดคอมโพเนนต์"
+"Components" = "คอมโพเนนต์"
+"Conditional" = "เงื่อนไข"
+"Confetti" = "กระดาษโปรย"
+"Conflicts" = "ความขัดแย้ง"
+"Connect to code" = "เชื่อมต่อกับโค้ด"
+"Connected" = "เชื่อมต่อแล้ว"
+"Connected to code: {from}" = "เชื่อมต่อกับโค้ด: {from}"
+"Connection lost, reconnecting (attempt {attempt})…" = "การเชื่อมต่อขาดหาย กำลังเชื่อมต่อใหม่ (ครั้งที่ {attempt})…"
+"Constrain proportions" = "ล็อกสัดส่วน"
+"Constraints" = "คอนสเตรนต์"
+"Content" = "เนื้อหา"
+"Contents hidden" = "ซ่อนเนื้อหา"
+"Contextual alternates" = "ตัวอักษรทางเลือกตามบริบท"
+"Contrast" = "คอนทราสต์"
+"Contributors" = "ผู้มีส่วนร่วม"
+"Contributors: {people} · Commits: {commits}" = "ผู้มีส่วนร่วม: {people} · คอมมิต: {commits}"
+"Controller" = "จอยควบคุม"
+"Cool" = "เย็น"
+"Copied as CSS" = "คัดลอกเป็น CSS แล้ว"
+"Copied as PNG" = "คัดลอกเป็น PNG แล้ว"
+"Copied as SVG" = "คัดลอกเป็น SVG แล้ว"
+"Copied as text" = "คัดลอกเป็นข้อความแล้ว"
+"Copied {value}" = "คัดลอก {value} แล้ว"
+"Copy" = "คัดลอก"
+"Copy as" = "คัดลอกเป็น"
+"Copy as CSS" = "คัดลอกเป็น CSS"
+"Copy as PNG" = "คัดลอกเป็น PNG"
+"Copy as SVG" = "คัดลอกเป็น SVG"
+"Copy code" = "คัดลอกโค้ด"
+"Copy link" = "คัดลอกลิงก์"
+"Copy the {label}" = "คัดลอก{label}"
+"Copy {value}" = "คัดลอก {value}"
+"Corner radius" = "รัศมีมุม"
+"Corner smoothing" = "ความนุ่มนวลของมุม"
+"Couldn't download the variables" = "ดาวน์โหลดตัวแปรไม่ได้"
+"Couldn't reach {server}: showing what this computer remembers." = "เชื่อมต่อ {server} ไม่ได้: แสดงข้อมูลที่เครื่องนี้จำไว้"
+"Couldn't read {name}." = "อ่าน {name} ไม่ได้"
+"Couldn't save automatically: {error}" = "บันทึกอัตโนมัติไม่ได้: {error}"
+"Count" = "จำนวน"
+"Create" = "สร้าง"
+"Create a variable collection first" = "สร้างคอลเลกชันตัวแปรก่อน"
+"Create a variable first" = "สร้างตัวแปรก่อน"
+"Create alias" = "สร้างนามแฝง"
+"Create branch" = "สร้างแบรนช์"
+"Create collection" = "สร้างคอลเลกชัน"
+"Create component" = "สร้างคอมโพเนนต์"
+"Create component property" = "สร้างพร็อพเพอร์ตีของคอมโพเนนต์"
+"Create components, styles or variables to publish them as a library." = "สร้างคอมโพเนนต์ สไตล์ หรือตัวแปรเพื่อเผยแพร่เป็นไลบรารี"
+"Create property…" = "สร้างพร็อพเพอร์ตี…"
+"Create style" = "สร้างสไตล์"
+"Create style from the selected text" = "สร้างสไตล์จากข้อความที่เลือก"
+"Created" = "สร้างเมื่อ"
+"Crop" = "ครอป"
+"Crop marks" = "เครื่องหมายตัดตก"
+"Ctrl+arrows" = "Ctrl+ลูกศร"
+"Ctrl+click" = "Ctrl+คลิก"
+"Ctrl+scroll" = "Ctrl+เลื่อน"
+"Current name" = "ชื่อปัจจุบัน"
+"Current version" = "เวอร์ชันปัจจุบัน"
+"Cursor chat" = "แชตที่เคอร์เซอร์"
+"Custom" = "กำหนดเอง"
+"Custom size" = "ขนาดที่กำหนดเอง"
+"Cut" = "ตัด"
+"Dark" = "มืด"
+"Darken" = "Darken"
+"Dash" = "เส้นประ"
+"Dashboard" = "แดชบอร์ด"
+"Date created" = "วันที่สร้าง"
+"Dec" = "ธ.ค."
+"Decoration style" = "สไตล์การตกแต่ง"
+"Decoration" = "การตกแต่ง"
+"Deep select" = "เลือกเชิงลึก"
+"Default" = "ค่าเริ่มต้น"
+"Default content" = "เนื้อหาเริ่มต้น"
+"Default value (the top-left variant)" = "ค่าเริ่มต้น (แวเรียนต์ซ้ายบน)"
+"Delay" = "หน่วงเวลา"
+"Delete" = "ลบ"
+"Delete category (its annotations stay)" = "ลบหมวดหมู่ (หมายเหตุยังอยู่)"
+"Delete collection" = "ลบคอลเลกชัน"
+"Delete group" = "ลบกลุ่ม"
+"Delete mode" = "ลบโหมด"
+"Delete page" = "ลบหน้า"
+"Delete preset" = "ลบพรีเซ็ต"
+"Delete property" = "ลบพร็อพเพอร์ตี"
+"Delete the style (layers keep their values)" = "ลบสไตล์ (เลเยอร์ยังคงค่าเดิม)"
+"Delete thread" = "ลบเธรด"
+"Delete variable" = "ลบตัวแปร"
+"Delete “{name}”? This can't be undone." = "ลบ “{name}” หรือไม่ การกระทำนี้ย้อนกลับไม่ได้"
+"Density" = "ความหนาแน่น"
+"Depth" = "ความลึก"
+"Describe how and when to use this component" = "อธิบายวิธีและเวลาที่ใช้คอมโพเนนต์นี้"
+"Describe what changed" = "อธิบายสิ่งที่เปลี่ยน"
+"Description" = "คำอธิบาย"
+"Description (optional)" = "คำอธิบาย (ไม่บังคับ)"
+"Design" = "ดีไซน์"
+"Design panel" = "แผงดีไซน์"
+"Design system starter" = "ชุดเริ่มต้นดีไซน์ซิสเต็ม"
+"Desktop" = "เดสก์ท็อป"
+"Destination" = "ปลายทาง"
+"Detach alias" = "ถอดนามแฝง"
+"Detach instance" = "ถอดอินสแตนซ์"
+"Detach property" = "ถอดพร็อพเพอร์ตี"
+"Detach style" = "ถอดสไตล์"
+"Detach styles" = "ถอดสไตล์"
+"Detach variable" = "ถอดตัวแปร"
+"Details" = "รายละเอียด"
+"Dev Mode" = "Dev Mode"
+"Dev Mode only inspects: switch to Design (Shift+D) to edit" = "Dev Mode ใช้ตรวจสอบเท่านั้น: สลับไปที่ดีไซน์ (Shift+D) เพื่อแก้ไข"
+"Dev resources" = "แหล่งข้อมูลสำหรับนักพัฒนา"
+"Development" = "การพัฒนา"
+"Device" = "อุปกรณ์"
+"Device at 100%" = "อุปกรณ์ที่ 100%"
+"Diamond" = "เพชร"
+"Difference" = "Difference"
+"Dimensions" = "ขนาด"
+"Direction" = "ทิศทาง"
+"Disconnect from code" = "ตัดการเชื่อมต่อจากโค้ด"
+"Dispersion" = "การกระจาย"
+"Display name" = "ชื่อที่แสดง"
+"Dissolve" = "สลายตัว"
+"Distribute and tidy" = "กระจายและจัดระเบียบ"
+"Distribute horizontal spacing" = "กระจายระยะห่างแนวนอน"
+"Distribute vertical spacing" = "กระจายระยะห่างแนวตั้ง"
+"Divider" = "เส้นแบ่ง"
+"Don't Save" = "ไม่บันทึก"
+"Don't truncate" = "ไม่ตัดข้อความ"
+"Done" = "เสร็จ"
+"Done editing" = "แก้ไขเสร็จแล้ว"
+"Dots" = "จุด"
+"Dotted" = "เส้นจุด"
+"Down" = "ลง"
+"Drafts" = "แบบร่าง"
+"Drag the stroke to add a width point" = "ลากเส้นขอบเพื่อเพิ่มจุดความกว้าง"
+"Draw" = "วาด"
+"Draw a frame" = "วาดเฟรม"
+"Drawing tools" = "เครื่องมือวาด"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "วางไฟล์ .figcraft, .fig, .sketch, .json, .svg หรือรูปภาพ"
+"Drop to import" = "วางเพื่อนำเข้า"
+"Drop to open" = "วางเพื่อเปิด"
+"Drop shadow" = "เงาตกกระทบ"
+"Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "ใบอนุญาตคู่ MIT หรือ Apache-2.0 สร้างโดยทีม ArtCraft และชุมชน"
+"Duo" = "คู่"
+"Duplicate" = "ทำสำเนา"
+"Duplicate by dragging" = "ทำสำเนาด้วยการลาก"
+"Duplicate mode" = "ทำสำเนาโหมด"
+"Duplicate page" = "ทำสำเนาหน้า"
+"Edit" = "แก้ไข"
+"Edit as an expression" = "แก้ไขเป็นนิพจน์"
+"Edit colour" = "แก้ไขสี"
+"Edit comment" = "แก้ไขความคิดเห็น"
+"Edit dev resource" = "แก้ไขแหล่งข้อมูลสำหรับนักพัฒนา"
+"Edit link" = "ลิงก์แก้ไข"
+"Edit link copied" = "คัดลอกลิงก์แก้ไขแล้ว"
+"Edit style" = "แก้ไขสไตล์"
+"Edit variable" = "แก้ไขตัวแปร"
+"Edit with the builder" = "แก้ไขด้วยตัวสร้าง"
+"Edited {when}" = "แก้ไข{when}"
+"Effect settings" = "การตั้งค่าเอฟเฟกต์"
+"Effect styles" = "สไตล์เอฟเฟกต์"
+"Effects" = "เอฟเฟกต์"
+"Elbow" = "ข้อศอก"
+"Ellipse" = "วงรี"
+"Ellipses" = "วงรี"
+"Else" = "มิฉะนั้น"
+"Else if" = "มิฉะนั้นถ้า"
+"Embedded profile" = "โปรไฟล์ที่ฝังไว้"
+"Empty" = "ว่าง"
+"End" = "จบ"
+"End point" = "จุดสิ้นสุด"
+"Ends the session; everyone keeps their copy" = "จบเซสชัน ทุกคนยังมีสำเนาของตัวเอง"
+"Enter" = "Enter"
+"Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "ใส่ที่อยู่ของ figcraft-server แล้วกดเรียกดูเพื่อดูปลั๊กอินที่มี"
+"Enter to save · Esc to cancel" = "Enter เพื่อบันทึก · Esc เพื่อยกเลิก"
+"Eraser" = "ยางลบ"
+"Esc" = "Esc"
+"Essential" = "จำเป็น"
+"Every conflict has a choice." = "ทุกความขัดแย้งมีตัวเลือก"
+"Every top-level frame already starts a flow" = "เฟรมระดับบนสุดทุกเฟรมเป็นจุดเริ่มโฟลว์แล้ว"
+"Exact opacity (4 then 5: 45%)" = "ความทึบที่แน่นอน (กด 4 แล้ว 5: 45%)"
+"Exclude" = "ยกเว้น"
+"Excluded" = "ยกเว้นแล้ว"
+"Excluded from layout" = "ยกเว้นจากเลย์เอาต์"
+"Excludes" = "ยกเว้น"
+"Exclusion" = "Exclusion"
+"Exit focus view (Esc)" = "ออกจากมุมมองโฟกัส (Esc)"
+"Expand" = "ขยาย"
+"Export" = "ส่งออก"
+"Export all" = "ส่งออกทั้งหมด"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "ส่งออกเฟรมและเลเยอร์เป็น PNG, JPG, SVG หรือ PDF"
+"Export page as PNG" = "ส่งออกหน้าเป็น PNG"
+"Export settings" = "การตั้งค่าส่งออก"
+"Export variables" = "ส่งออกตัวแปร"
+"Export {name}" = "ส่งออก {name}"
+"Export {n} layers" = { other = "ส่งออก {n} เลเยอร์" }
+"Exported {file}" = "ส่งออก {file} แล้ว"
+"Exported {name}" = "ส่งออก {name} แล้ว"
+"Exported {name}; {n} kinds of content were left out" = { other = "ส่งออก {name} แล้ว; ข้ามเนื้อหา {n} ประเภท" }
+"Exported {n} files" = { other = "ส่งออก {n} ไฟล์แล้ว" }
+"Export…" = "ส่งออก…"
+"Expose properties to instances" = "เปิดเผยพร็อพเพอร์ตีให้อินสแตนซ์"
+"Exposure" = "การรับแสง"
+"Expression" = "นิพจน์"
+"Extend collection" = "ขยายคอลเลกชัน"
+"Extends \"{name}\": overridden values are marked" = "ขยายจาก \"{name}\": ค่าที่เขียนทับมีเครื่องหมาย"
+"Eye" = "ตา"
+"F" = "F"
+"Fade" = "จางหาย"
+"False" = "เท็จ"
+"Feb" = "ก.พ."
+"Fetching from the server…" = "กำลังดึงข้อมูลจากเซิร์ฟเวอร์…"
+"FigCraft couldn't open its window: {error}" = "FigCraft เปิดหน้าต่างไม่ได้: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft ยังไม่รองรับทุกฟีเจอร์ของไฟล์เหล่านี้ หมายเหตุแสดงสิ่งที่ข้ามหรือเปลี่ยนในสำเนาที่นำเข้า ไฟล์ต้นฉบับไม่เปลี่ยนแปลง"
+"File" = "ไฟล์"
+"File name" = "ชื่อไฟล์"
+"File not found" = "ไม่พบไฟล์"
+"File published" = "เผยแพร่ไฟล์แล้ว"
+"Files aren't end-to-end encrypted: the server's operator can read them." = "ไฟล์ไม่ได้เข้ารหัสแบบ end-to-end: ผู้ดูแลเซิร์ฟเวอร์อ่านได้"
+"Files nobody opens for {n} days are deleted." = { other = "ไฟล์ที่ไม่มีใครเปิดเป็นเวลา {n} วันจะถูกลบ" }
+"Fill" = "สีเติม"
+"Fill (fr)" = "เติม (fr)"
+"Fill container" = "เติมคอนเทนเนอร์"
+"Fill window" = "เติมหน้าต่าง"
+"Fills" = "สีเติม"
+"Fill|sizing" = "เติม"
+"Filter and sort" = "กรองและเรียงลำดับ"
+"Find" = "ค้นหา"
+"Find and replace" = "ค้นหาและแทนที่"
+"Find layers" = "ค้นหาเลเยอร์"
+"First" = "แรกสุด"
+"First commit" = "คอมมิตแรก"
+"First on top" = "อันแรกอยู่บนสุด"
+"Fit" = "พอดี"
+"Fit device to window" = "ปรับอุปกรณ์ให้พอดีหน้าต่าง"
+"Fit to contents" = "พอดีกับเนื้อหา"
+"Fit to window" = "พอดีหน้าต่าง"
+"Fit width" = "พอดีความกว้าง"
+"Fixed" = "คงที่"
+"Fixed gap" = "ช่องว่างคงที่"
+"Fixed size" = "ขนาดคงที่"
+"Flatten" = "รวมเป็นชั้นเดียว"
+"Flip" = "พลิก"
+"Flip horizontal" = "พลิกแนวนอน"
+"Flip text to the other side" = "พลิกข้อความไปอีกด้าน"
+"Flip vertical" = "พลิกแนวตั้ง"
+"Flip width profile" = "พลิกโปรไฟล์ความกว้าง"
+"Flow starting point" = "จุดเริ่มโฟลว์"
+"Flow starting points" = "จุดเริ่มโฟลว์"
+"Flows" = "โฟลว์"
+"Focus view" = "มุมมองโฟกัส"
+"Fold autosaves" = "ย่อการบันทึกอัตโนมัติ"
+"Folder: click to collapse" = "โฟลเดอร์: คลิกเพื่อยุบ"
+"Folder: click to expand" = "โฟลเดอร์: คลิกเพื่อขยาย"
+"Follow" = "ติดตาม"
+"Follow {name}" = "ติดตาม {name}"
+"Following" = "กำลังติดตาม"
+"Following {name} · {key} to stop" = "กำลังติดตาม {name} · {key} เพื่อหยุด"
+"Font" = "ฟอนต์"
+"Font not installed" = "ยังไม่ได้ติดตั้งฟอนต์"
+"Font size" = "ขนาดฟอนต์"
+"Font style" = "สไตล์ฟอนต์"
+"Forget on this computer" = "ลืมในคอมพิวเตอร์เครื่องนี้"
+"Four screens of a trail app with components and a prototype flow" = "สี่หน้าจอของแอปเส้นทางเดินป่าพร้อมคอมโพเนนต์และโฟลว์โปรโตไทป์"
+"Fractions" = "เศษส่วน"
+"Frame" = "เฟรม"
+"Frame selection" = "ครอบการเลือกด้วยเฟรม"
+"Frame tools" = "เครื่องมือเฟรม"
+"Frames" = "เฟรม"
+"From the library \"{name}\": read-only" = "จากไลบรารี \"{name}\": อ่านได้อย่างเดียว"
+"From {name}" = "จาก {name}"
+"From {server}" = "จาก {server}"
+"Frost" = "น้ำแข็งฝ้า"
+"Gap" = "ช่องว่าง"
+"Gap between columns" = "ช่องว่างระหว่างคอลัมน์"
+"Gap between items" = "ช่องว่างระหว่างรายการ"
+"Gap between rows" = "ช่องว่างระหว่างแถว"
+"Getting started" = "เริ่มต้นใช้งาน"
+"Give the address of a server open to the public, or a server's address with its key (`figcraft-server key` prints it)." = "ใส่ที่อยู่ของเซิร์ฟเวอร์สาธารณะ หรือที่อยู่เซิร์ฟเวอร์พร้อมคีย์ (`figcraft-server key` แสดงคีย์ให้)"
+"Glass" = "กระจก"
+"Go to main component" = "ไปที่คอมโพเนนต์หลัก"
+"Go to {name}" = "ไปที่ {name}"
+"Grab bag" = "รวมมิตร"
+"Gradient" = "ไล่ระดับสี"
+"Gray" = "เทา"
+"Green" = "เขียว"
+"Greyscale components and two example screens to sketch a flow with" = "คอมโพเนนต์สีเทาและสองหน้าจอตัวอย่างสำหรับร่างโฟลว์"
+"Grid" = "กริด"
+"Grid ({size})" = "กริด ({size})"
+"Grid styles" = "สไตล์กริด"
+"Grid {size}" = "กริด {size}"
+"Group" = "กลุ่ม"
+"Group selection" = "จัดกลุ่มการเลือก"
+"Groups" = "กลุ่ม"
+"Gutter" = "ช่องไฟ"
+"Hand tool" = "เครื่องมือมือ"
+"Hanging list" = "รายการแบบยื่น"
+"Hanging punctuation" = "เครื่องหมายวรรคตอนแบบยื่น"
+"Hard light" = "Hard light"
+"Heart" = "หัวใจ"
+"Height" = "ความสูง"
+"Help" = "ช่วยเหลือ"
+"Help and resources" = "ความช่วยเหลือและแหล่งข้อมูล"
+"Help page" = "หน้าช่วยเหลือ"
+"Here: {names}" = "ที่นี่: {names}"
+"Hidden" = "ซ่อนอยู่"
+"Hide contents" = "ซ่อนเนื้อหา"
+"Hide from publishing" = "ซ่อนจากการเผยแพร่"
+"Hide section contents" = "ซ่อนเนื้อหาของเซกชัน"
+"Hide these tips (Getting started in the Help menu shows them again)" = "ซ่อนเคล็ดลับเหล่านี้ (เริ่มต้นใช้งานในเมนูช่วยเหลือจะแสดงอีกครั้ง)"
+"Hide when publishing" = "ซ่อนเมื่อเผยแพร่"
+"Highlight layers on hover" = "ไฮไลต์เลเยอร์เมื่อวางเมาส์"
+"Highlighter" = "ปากกาไฮไลต์"
+"Highlights" = "ส่วนสว่าง"
+"Hold Alt" = "กด Alt ค้างไว้"
+"Hold Alt+Z" = "กด Alt+Z ค้างไว้"
+"Hold Ctrl" = "กด Ctrl ค้างไว้"
+"Hold Z" = "กด Z ค้างไว้"
+"Hold ⌃ or ⌘" = "กด ⌃ หรือ ⌘ ค้างไว้"
+"Hold ⌥" = "กด ⌥ ค้างไว้"
+"Hold ⌥Z" = "กด ⌥Z ค้างไว้"
+"Home" = "หน้าแรก"
+"Horizontal" = "แนวนอน"
+"Horizontal align" = "จัดแนวนอน"
+"Horizontal hex" = "หกเหลี่ยมแนวนอน"
+"Horizontal padding" = "ระยะขอบในแนวนอน"
+"Horizontal spacing" = "ระยะห่างแนวนอน"
+"Hosted by {operator}" = "โฮสต์โดย {operator}"
+"Hover a layer to see its properties" = "วางเมาส์บนเลเยอร์เพื่อดูพร็อพเพอร์ตี"
+"Hover other layers to measure the distance" = "วางเมาส์บนเลเยอร์อื่นเพื่อวัดระยะห่าง"
+"Hue" = "เฉดสี"
+"Hug" = "พอดีเนื้อหา"
+"Hug contents" = "พอดีกับเนื้อหา"
+"Icon components on a 24 px grid with keylines and a size preview" = "คอมโพเนนต์ไอคอนบนกริด 24 px พร้อมเส้นคีย์ไลน์และตัวอย่างขนาด"
+"Icon set starter" = "ชุดเริ่มต้นไอคอนเซ็ต"
+"If it keeps happening, please report it at {link} with this message." = "หากยังเกิดซ้ำ โปรดรายงานที่ {link} พร้อมข้อความนี้"
+"If" = "ถ้า"
+"If {condition}" = "ถ้า {condition}"
+"Ignore auto layout (absolute position)" = "ไม่ใช้ออโต้เลย์เอาต์ (ตำแหน่งสัมบูรณ์)"
+"Image" = "รูปภาพ"
+"Images" = "รูปภาพ"
+"Import" = "นำเข้า"
+"Import path" = "เส้นทางนำเข้า"
+"Import plugin from manifest" = "นำเข้าปลั๊กอินจากไฟล์ manifest"
+"Import plugin from manifest…" = "นำเข้าปลั๊กอินจากไฟล์ manifest…"
+"Import report" = "รายงานการนำเข้า"
+"Import variables" = "นำเข้าตัวแปร"
+"Imported document" = "เอกสารที่นำเข้า"
+"Imported {name}" = "นำเข้า {name} แล้ว"
+"Imported {n} new variables, updated {updated}" = { other = "นำเข้าตัวแปรใหม่ {n} รายการ อัปเดต {updated} รายการ" }
+"Import…" = "นำเข้า…"
+"In an instance, this comes from the main component" = "ในอินสแตนซ์ ค่านี้มาจากคอมโพเนนต์หลัก"
+"In the browser you can join sessions the desktop app hosts and files on a FigCraft server. A page opened over https reaches other computers only through wss:// links (a server behind TLS)." = "ในเบราว์เซอร์ คุณเข้าร่วมเซสชันที่แอปเดสก์ท็อปโฮสต์และไฟล์บนเซิร์ฟเวอร์ FigCraft ได้ หน้าที่เปิดผ่าน https เข้าถึงคอมพิวเตอร์เครื่องอื่นได้เฉพาะลิงก์ wss:// (เซิร์ฟเวอร์ที่อยู่หลัง TLS)"
+"Include bounding box" = "รวมกรอบล้อมรอบ"
+"Include id attribute" = "รวมแอตทริบิวต์ id"
+"Included" = "รวมอยู่"
+"Included in layout" = "รวมอยู่ในเลย์เอาต์"
+"Individual corners" = "แต่ละมุม"
+"Individual padding" = "ระยะขอบในแต่ละด้าน"
+"Individual strokes" = "เส้นขอบแต่ละด้าน"
+"Ink" = "หมึก"
+"Inner shadow" = "เงาด้านใน"
+"Inside" = "ด้านใน"
+"Inspect" = "ตรวจสอบ"
+"Inspect the layer under the pointer: size, colours, typography" = "ตรวจสอบเลเยอร์ใต้ตัวชี้: ขนาด สี ตัวอักษร"
+"Install plugin" = "ติดตั้งปลั๊กอิน"
+"Install" = "ติดตั้ง"
+"Installed {name}" = "ติดตั้ง {name} แล้ว"
+"Installed" = "ติดตั้งแล้ว"
+"Installing…" = "กำลังติดตั้ง…"
+"Instance" = "อินสแตนซ์"
+"Instance properties" = "พร็อพเพอร์ตีของอินสแตนซ์"
+"Instance swap" = "สลับอินสแตนซ์"
+"Instance swap (no other component)" = "สลับอินสแตนซ์ (ไม่มีคอมโพเนนต์อื่น)"
+"Instances" = "อินสแตนซ์"
+"Instant" = "ทันที"
+"Intensity" = "เข้ม"
+"Interaction" = "อินเทอร์แอกชัน"
+"Interactions" = "อินเทอร์แอกชัน"
+"Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "ออกแบบอินเทอร์เฟซและสร้างโปรโตไทป์ เครื่องมือดีไซน์โอเพนซอร์สฟรีแบบ clean-room ที่เขียนใหม่ทั้งหมดด้วย Rust เป็นส่วนหนึ่งของ ArtCraft Crafting Apps"
+"Interface size" = "ขนาดอินเทอร์เฟซ"
+"Intersect" = "ตัดกัน"
+"Intersects" = "ตัดกัน"
+"Invalid color" = "สีไม่ถูกต้อง"
+"Invite link" = "ลิงก์เชิญ"
+"Invite link copied" = "คัดลอกลิงก์เชิญแล้ว"
+"It asks permission to:" = "ขออนุญาตเพื่อ:"
+"Jan" = "ม.ค."
+"Join" = "เข้าร่วม"
+"Join code copied" = "คัดลอกรหัสเข้าร่วมแล้ว"
+"Join code or invite link" = "รหัสเข้าร่วมหรือลิงก์เชิญ"
+"Join live session" = "เข้าร่วมเซสชันสด"
+"Join us on Discord" = "เข้าร่วมกับเราบน Discord"
+"Join with a code" = "เข้าร่วมด้วยรหัส"
+"Joined" = "เข้าร่วมแล้ว"
+"Joined {file}" = "เข้าร่วม {file} แล้ว"
+"Joining…" = "กำลังเข้าร่วม…"
+"Join|stroke" = "รอยต่อ"
+"Jul" = "ก.ค."
+"Jun" = "มิ.ย."
+"Just now" = "เมื่อสักครู่"
+"Justify" = "จัดชิดสองข้าง"
+"Keep a measurement on the canvas for developers" = "เก็บการวัดไว้บนแคนวาสสำหรับนักพัฒนา"
+"Keep appearance" = "คงรูปลักษณ์"
+"Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "คงรูปลักษณ์จะแปลงค่าสีทั้งหมดเป็น {profile} เพื่อให้สีดูเหมือนเดิม ส่วนคงค่าจะเก็บตัวเลขไว้ตามเดิม สีจึงเปลี่ยนไป"
+"Keep tool selected after use" = "คงเครื่องมือที่เลือกไว้หลังใช้งาน"
+"Keep values" = "คงค่า"
+"Key/Gamepad" = "ปุ่ม/จอยเกม"
+"Key/Gamepad {key}" = "ปุ่ม/จอยเกม {key}"
+"Keyboard shortcuts" = "แป้นพิมพ์ลัด"
+"Kits" = "ชุดเครื่องมือ"
+"Landing page" = "แลนดิ้งเพจ"
+"Language" = "ภาษา"
+"Lasso" = "บ่วงบาศ"
+"Last" = "ล่าสุด"
+"Last change: {note}" = "การเปลี่ยนแปลงล่าสุด: {note}"
+"Last commit" = "คอมมิตล่าสุด"
+"Last modified" = "แก้ไขล่าสุด"
+"Last on top" = "อันล่าสุดอยู่บนสุด"
+"Layer blur" = "เบลอเลเยอร์"
+"Layer name" = "ชื่อเลเยอร์"
+"Layers" = "เลเยอร์"
+"Layers in an instance take their position from the main component" = "เลเยอร์ในอินสแตนซ์ใช้ตำแหน่งจากคอมโพเนนต์หลัก"
+"Layout" = "เลย์เอาต์"
+"Layout grid" = "กริดเลย์เอาต์"
+"Layout grid settings" = "การตั้งค่ากริดเลย์เอาต์"
+"Layout grids" = "กริดเลย์เอาต์"
+"Leave session" = "ออกจากเซสชัน"
+"Leaves" = "ใบไม้"
+"Left" = "ซ้าย"
+"Left & right" = "ซ้ายและขวา"
+"Left padding" = "ระยะขอบในด้านซ้าย"
+"Left side" = "ด้านซ้าย"
+"Left side width" = "ความกว้างด้านซ้าย"
+"Letter case" = "ตัวพิมพ์"
+"Letter spacing" = "ระยะห่างตัวอักษร"
+"Libraries" = "ไลบรารี"
+"Libraries in this file" = "ไลบรารีในไฟล์นี้"
+"Library updates available" = "มีอัปเดตไลบรารี"
+"Library: click to collapse" = "ไลบรารี: คลิกเพื่อยุบ"
+"Library: click to expand" = "ไลบรารี: คลิกเพื่อขยาย"
+"Library: its variables are read-only here; edit them in the library file and publish it" = "ไลบรารี: ตัวแปรของไลบรารีอ่านได้อย่างเดียวที่นี่ ให้แก้ในไฟล์ไลบรารีแล้วเผยแพร่"
+"Light" = "สว่าง"
+"Lighten" = "Lighten"
+"Light|glass" = "แสง"
+"Line" = "เส้น"
+"Line arrow" = "ลูกศรเส้น"
+"Line delta" = "ผลต่างบรรทัด"
+"Line height" = "ความสูงบรรทัด"
+"Linear" = "เชิงเส้น"
+"Lines" = "บรรทัด"
+"Lines +/−" = "บรรทัด +/−"
+"Lines added" = "บรรทัดที่เพิ่ม"
+"Lines deleted" = "บรรทัดที่ลบ"
+"Link" = "ลิงก์"
+"Link copied" = "คัดลอกลิงก์แล้ว"
+"Link docs, code or tickets for developers." = "ลิงก์เอกสาร โค้ด หรือตั๋วงานสำหรับนักพัฒนา"
+"Link frames on the Prototype tab, then present the flow" = "เชื่อมเฟรมในแท็บโปรโตไทป์ แล้วนำเสนอโฟลว์"
+"Link this component to its code component: instances then show your real snippet with their values." = "เชื่อมคอมโพเนนต์นี้กับคอมโพเนนต์โค้ด: อินสแตนซ์จะแสดงสนิปเพ็ตจริงพร้อมค่าของมัน"
+"List spacing" = "ระยะห่างรายการ"
+"List style" = "สไตล์รายการ"
+"Live session" = "เซสชันสด"
+"Live · {people}" = "สด · {people}"
+"Local components" = "คอมโพเนนต์ในเครื่อง"
+"Local network" = "เครือข่ายภายใน"
+"Local styles" = "สไตล์ในเครื่อง"
+"Local variables" = "ตัวแปรในเครื่อง"
+"Lock/Unlock" = "ล็อก/ปลดล็อก"
+"Locked" = "ล็อกอยู่"
+"Lowercase" = "ตัวพิมพ์เล็ก"
+"Luminance" = "ความสว่าง"
+"Luminosity" = "Luminosity"
+"Main" = "เมน"
+"Main component deleted" = "ลบคอมโพเนนต์หลักแล้ว"
+"Main menu" = "เมนูหลัก"
+"Make a component" = "สร้างคอมโพเนนต์"
+"Make slot" = "สร้างสล็อต"
+"Mar" = "มี.ค."
+"Margin" = "ระยะขอบนอก"
+"Mark all as read" = "ทำเครื่องหมายว่าอ่านทั้งหมดแล้ว"
+"Mark as resolved" = "ทำเครื่องหมายว่าแก้ไขแล้ว"
+"Mark as unread" = "ทำเครื่องหมายว่ายังไม่อ่าน"
+"Mark as unresolved" = "ทำเครื่องหมายว่ายังไม่แก้ไข"
+"Marker" = "มาร์กเกอร์"
+"Mask" = "มาสก์"
+"Mass · Stiffness · Damping" = "มวล · ความแข็ง · การหน่วง"
+"Match (empty: the whole name)" = "ตรงกับ (ว่าง: ทั้งชื่อ)"
+"Max H" = "สูงสุด H"
+"Max W" = "สูงสุด W"
+"Max lines" = "จำนวนบรรทัดสูงสุด"
+"Maximize" = "ขยายใหญ่สุด"
+"May" = "พ.ค."
+"Measure to the selection" = "วัดไปยังส่วนที่เลือก"
+"Measurements" = "การวัด"
+"Merge into main" = "รวมเข้าเมน"
+"Merge regions" = "รวมพื้นที่"
+"Merge the branch into the main file (one undo step) and archive it" = "รวมแบรนช์เข้ากับไฟล์หลัก (เลิกทำได้ในขั้นตอนเดียว) และเก็บถาวร"
+"Merged" = "รวมแล้ว"
+"Merged PRs" = "PR ที่รวมแล้ว"
+"Min H" = "ต่ำสุด H"
+"Min W" = "ต่ำสุด W"
+"Minimize" = "ย่อเล็กสุด"
+"Mirror angle" = "สะท้อนมุม"
+"Mirror angle and length" = "สะท้อนมุมและความยาว"
+"Mirroring" = "การสะท้อน"
+"Missing" = "ขาดหาย"
+"Missing fonts" = "ฟอนต์ที่ขาดหาย"
+"Missing layer" = "เลเยอร์ที่ขาดหาย"
+"Missing style" = "สไตล์ที่ขาดหาย"
+"Missing variable" = "ตัวแปรที่ขาดหาย"
+"Miter" = "ปลายแหลม"
+"Miter angle" = "มุมปลายแหลม"
+"Mixed" = "ปะปน"
+"Mixed fonts" = "ฟอนต์ปะปน"
+"Mixed interactions: click + to replace them" = "อินเทอร์แอกชันปะปน: คลิก + เพื่อแทนที่"
+"Mobile app" = "แอปมือถือ"
+"Mode" = "โหมด"
+"Model" = "โมเดล"
+"Models" = "โมเดล"
+"Mono" = "โมโน"
+"More" = "เพิ่มเติม"
+"More instance actions" = "การกระทำอินสแตนซ์เพิ่มเติม"
+"Mouse down" = "กดเมาส์ลง"
+"Mouse enter" = "เมาส์เข้า"
+"Mouse leave" = "เมาส์ออก"
+"Mouse up" = "ปล่อยเมาส์"
+"Move along the toolbar or the layer rows" = "เลื่อนไปตามแถบเครื่องมือหรือแถวเลเยอร์"
+"Move" = "ย้าย"
+"Move column left" = "ย้ายคอลัมน์ไปทางซ้าย"
+"Move column right" = "ย้ายคอลัมน์ไปทางขวา"
+"Move down" = "ย้ายลง"
+"Move in" = "ย้ายเข้า"
+"Move out" = "ย้ายออก"
+"Move tools" = "เครื่องมือย้าย"
+"Move up" = "ย้ายขึ้น"
+"Moved to {name}" = "ย้ายไปที่ {name} แล้ว"
+"Multi" = "หลายรายการ"
+"Multiply" = "Multiply"
+"Muted" = "ปิดเสียง"
+"Name" = "ชื่อ"
+"Name (A–Z)" = "ชื่อ (A–Z)"
+"Named instance" = "อินสแตนซ์ที่มีชื่อ"
+"Navigate to" = "นำทางไปยัง"
+"Nested instance" = "อินสแตนซ์ซ้อน"
+"New board" = "บอร์ดใหม่"
+"New design file" = "ไฟล์ดีไซน์ใหม่"
+"Newest first" = "ใหม่สุดก่อน"
+"Next or previous control in the focused region" = "ตัวควบคุมถัดไปหรือก่อนหน้าในพื้นที่ที่โฟกัส"
+"Next frame" = "เฟรมถัดไป"
+"Next ready for dev" = "พร้อมสำหรับนักพัฒนารายการถัดไป"
+"Next size option" = "ตัวเลือกขนาดถัดไป"
+"No assets: no export settings, icons or images. Add export settings in the Design tab." = "ไม่มีแอสเซ็ต: ไม่มีการตั้งค่าส่งออก ไอคอน หรือรูปภาพ เพิ่มการตั้งค่าส่งออกได้ในแท็บดีไซน์"
+"No boolean variables fit here." = "ไม่มีตัวแปรบูลีนที่ใช้ได้ที่นี่"
+"No boolean variables yet. Create them in Local variables." = "ยังไม่มีตัวแปรบูลีน สร้างได้ในตัวแปรในเครื่อง"
+"No branches. A branch is a copy of the file to try changes in, then review and merge." = "ไม่มีแบรนช์ แบรนช์คือสำเนาของไฟล์สำหรับลองแก้ไข แล้วตรวจทานและรวมกลับ"
+"No category" = "ไม่มีหมวดหมู่"
+"No changes" = "ไม่มีการเปลี่ยนแปลง"
+"No color styles" = "ไม่มีสไตล์สี"
+"No colour variables fit here." = "ไม่มีตัวแปรสีที่ใช้ได้ที่นี่"
+"No colour variables yet. Create them in Local variables." = "ยังไม่มีตัวแปรสี สร้างได้ในตัวแปรในเครื่อง"
+"No comments yet" = "ยังไม่มีความคิดเห็น"
+"No compatibility warnings reported" = "ไม่มีคำเตือนความเข้ากันได้"
+"No components yet. Select layers and press {keys}." = "ยังไม่มีคอมโพเนนต์ เลือกเลเยอร์แล้วกด {keys}"
+"No conflicts." = "ไม่มีความขัดแย้ง"
+"No contributor data was built into this copy." = "สำเนานี้ไม่มีข้อมูลผู้มีส่วนร่วมฝังอยู่"
+"No device" = "ไม่มีอุปกรณ์"
+"No fonts match" = "ไม่พบฟอนต์ที่ตรงกัน"
+"No files or templates match your search" = "ไม่พบไฟล์หรือเทมเพลตที่ตรงกับการค้นหา"
+"No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "ไม่มีรหัสเข้าร่วมที่นี่ (เซิร์ฟเวอร์เก่ากว่าระบบรหัสเข้าร่วม หรือที่อยู่นี้ใส่ในรหัสไม่ได้): แชร์ลิงก์แทน"
+"No layer changes to show." = "ไม่มีการเปลี่ยนแปลงเลเยอร์ที่จะแสดง"
+"No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "ยังไม่มีไลบรารี เพิ่มไฟล์ .figcraft ที่เผยแพร่เป็นไลบรารี หรือวางลิงก์ไลบรารีของทีม"
+"No list" = "ไม่มีรายการ"
+"No matching comments" = "ไม่พบความคิดเห็นที่ตรงกัน"
+"No matching components" = "ไม่พบคอมโพเนนต์ที่ตรงกัน"
+"No matching layers" = "ไม่พบเลเยอร์ที่ตรงกัน"
+"No matching styles" = "ไม่พบสไตล์ที่ตรงกัน"
+"No matching variables" = "ไม่พบตัวแปรที่ตรงกัน"
+"No mirroring" = "ไม่สะท้อน"
+"No model credits were built into this copy." = "สำเนานี้ไม่มีเครดิตโมเดลฝังอยู่"
+"No number variables fit here." = "ไม่มีตัวแปรตัวเลขที่ใช้ได้ที่นี่"
+"No number variables yet. Create them in Local variables." = "ยังไม่มีตัวแปรตัวเลข สร้างได้ในตัวแปรในเครื่อง"
+"No other pages" = "ไม่มีหน้าอื่น"
+"No paints" = "ไม่มีสี"
+"No plugins on {server}." = "ไม่มีปลั๊กอินบน {server}"
+"No plugins yet. Import a development plugin from its figcraft-plugin.json." = "ยังไม่มีปลั๊กอิน นำเข้าปลั๊กอินสำหรับพัฒนาจาก figcraft-plugin.json"
+"No preferred components" = "ไม่มีคอมโพเนนต์ที่ต้องการ"
+"No preset" = "ไม่มีพรีเซ็ต"
+"No saved versions yet. Save a version to mark a point in your work you can come back to." = "ยังไม่มีเวอร์ชันที่บันทึก บันทึกเวอร์ชันเพื่อทำเครื่องหมายจุดในงานที่กลับมาดูได้"
+"No scrolling" = "ไม่เลื่อน"
+"No shortcuts match" = "ไม่พบแป้นพิมพ์ลัดที่ตรงกัน"
+"No status" = "ไม่มีสถานะ"
+"No string variables fit here." = "ไม่มีตัวแปรสตริงที่ใช้ได้ที่นี่"
+"No string variables yet. Create them in Local variables." = "ยังไม่มีตัวแปรสตริง สร้างได้ในตัวแปรในเครื่อง"
+"No styles yet." = "ยังไม่มีสไตล์"
+"No styles yet. Click + to create one from the selection." = "ยังไม่มีสไตล์ คลิก + เพื่อสร้างจากส่วนที่เลือก"
+"No templates match your search" = "ไม่พบเทมเพลตที่ตรงกับการค้นหา"
+"No text styles yet. Click + to create one from the selected text." = "ยังไม่มีสไตล์ข้อความ คลิก + เพื่อสร้างจากข้อความที่เลือก"
+"No variables fit here." = "ไม่มีตัวแปรที่ใช้ได้ที่นี่"
+"No variables yet. Create them in Local variables." = "ยังไม่มีตัวแปร สร้างได้ในตัวแปรในเครื่อง"
+"Nobody else is here yet" = "ยังไม่มีคนอื่นอยู่ที่นี่"
+"Noise" = "นอยส์"
+"None" = "ไม่มี"
+"None." = "ไม่มี"
+"Normal" = "ปกติ"
+"Not bound" = "ไม่ได้ผูก"
+"Not in a live session" = "ไม่ได้อยู่ในเซสชันสด"
+"Not in this font" = "ไม่มีในฟอนต์นี้"
+"Not properties, kept as written: {names}" = "ไม่ใช่พร็อพเพอร์ตี คงไว้ตามที่เขียน: {names}"
+"Not read yet" = "ยังไม่ได้อ่าน"
+"Not shared" = "ไม่ได้แชร์"
+"Note {n}" = "โน้ต {n}"
+"Nothing changed since this version." = "ไม่มีอะไรเปลี่ยนตั้งแต่เวอร์ชันนี้"
+"Nothing changed since this was marked ready for dev." = "ไม่มีอะไรเปลี่ยนตั้งแต่ทำเครื่องหมายว่าพร้อมสำหรับนักพัฒนา"
+"Nothing here yet. Set a frame's status to list it." = "ยังไม่มีอะไรที่นี่ ตั้งสถานะของเฟรมเพื่อแสดงในรายการ"
+"Nothing online yet. Use Share on a file to put it online and it is listed here." = "ยังไม่มีอะไรออนไลน์ ใช้แชร์กับไฟล์เพื่อนำขึ้นออนไลน์ แล้วจะแสดงที่นี่"
+"Nothing to export" = "ไม่มีอะไรให้ส่งออก"
+"Nov" = "พ.ย."
+"Now" = "ตอนนี้"
+"Nudge (Shift: big nudge)" = "ขยับเล็กน้อย (Shift: ขยับมาก)"
+"Nudge amount" = "ระยะขยับ"
+"Number" = "ตัวเลข"
+"Number ↑" = "ตัวเลข ↑"
+"Number ↓" = "ตัวเลข ↓"
+"Numbered list" = "รายการแบบลำดับเลข"
+"Object" = "ออบเจกต์"
+"Oct" = "ต.ค."
+"Off" = "ปิด"
+"Offered first when filling the slot (any content is allowed)" = "เสนอก่อนเมื่อเติมสล็อต (ใส่เนื้อหาใดก็ได้)"
+"Offered first when swapping the instance (any component is allowed)" = "เสนอก่อนเมื่อสลับอินสแตนซ์ (ใช้คอมโพเนนต์ใดก็ได้)"
+"Offset" = "ระยะเยื้อง"
+"Oldest first" = "เก่าสุดก่อน"
+"On click" = "เมื่อคลิก"
+"On drag" = "เมื่อลาก"
+"On this page" = "ในหน้านี้"
+"One announcement in five common sizes: square, portrait, story, link and banner" = "ประกาศหนึ่งชิ้นในห้าขนาดยอดนิยม: สี่เหลี่ยมจัตุรัส แนวตั้ง สตอรี่ ลิงก์ และแบนเนอร์"
+"Online" = "ออนไลน์"
+"Online files" = "ไฟล์ออนไลน์"
+"Online sharing is off: files are shared on the local network only." = "การแชร์ออนไลน์ปิดอยู่: ไฟล์แชร์ได้เฉพาะในเครือข่ายภายใน"
+"Only the first changed layers are listed." = "แสดงเฉพาะเลเยอร์แรกๆ ที่เปลี่ยน"
+"Only the first {n} changed layers are listed." = "แสดงเฉพาะ {n} เลเยอร์แรกที่เปลี่ยน"
+"Only your threads" = "เฉพาะเธรดของคุณ"
+"Opacity" = "ความทึบ"
+"Opacity & blend" = "ความทึบและการผสม"
+"Opacity 10%…90%, 0: 100%" = "ความทึบ 10%…90%, 0: 100%"
+"Open" = "เปิด"
+"Open .figcraft, .svg or images" = "เปิด .figcraft, .svg หรือรูปภาพ"
+"Open branch" = "เปิดแบรนช์"
+"Open file" = "เปิดไฟล์"
+"Open files" = "ไฟล์ที่เปิดอยู่"
+"Open presentations" = "เปิดการนำเสนอ"
+"Open in focus view" = "เปิดในมุมมองโฟกัส"
+"Open in new window" = "เปิดในหน้าต่างใหม่"
+"Open invite links in FigCraft" = "เปิดลิงก์เชิญใน FigCraft"
+"Open link" = "เปิดลิงก์"
+"Open link {url}" = "เปิดลิงก์ {url}"
+"Open overlay" = "เปิดโอเวอร์เลย์"
+"Open prototype preview" = "เปิดตัวอย่างโปรโตไทป์"
+"Open variables ({count})" = "เปิดตัวแปร ({count})"
+"Opened as a new document" = "เปิดเป็นเอกสารใหม่แล้ว"
+"Opened “{name}” in a new tab" = "เปิด “{name}” ในแท็บใหม่แล้ว"
+"Opening the file…" = "กำลังเปิดไฟล์…"
+"Opening {n} files as new files" = { other = "กำลังเปิด {n} ไฟล์เป็นไฟล์ใหม่" }
+"Open|comments" = "ยังเปิดอยู่"
+"Options" = "ตัวเลือก"
+"Orange" = "ส้ม"
+"Order" = "ลำดับ"
+"Other apps may not open every .fig file exported here." = "แอปอื่นอาจเปิดไฟล์ .fig ที่ส่งออกจากที่นี่ได้ไม่ครบทุกไฟล์"
+"Other" = "อื่นๆ"
+"Others lose access and keep their copy; the file stays on the server for you" = "คนอื่นจะเข้าถึงไม่ได้แต่ยังมีสำเนาของตัวเอง ไฟล์ยังอยู่บนเซิร์ฟเวอร์สำหรับคุณ"
+"Others type this under Share ▸ Join with a code" = "คนอื่นพิมพ์รหัสนี้ที่แชร์ ▸ เข้าร่วมด้วยรหัส"
+"Outline stroke" = "แปลงเส้นขอบเป็นเค้าร่าง"
+"Outline text" = "แปลงข้อความเป็นเค้าร่าง"
+"Outlines" = "เค้าร่าง"
+"Outside" = "ด้านนอก"
+"Overflow" = "ส่วนที่เกิน"
+"Overlay" = "โอเวอร์เลย์"
+"Overlay position" = "ตำแหน่งโอเวอร์เลย์"
+"Overridden here (the collection it extends has another value)" = "เขียนทับที่นี่ (คอลเลกชันที่ขยายมามีค่าอื่น)"
+"Overrides" = "การเขียนทับ"
+"Owner token" = "โทเคนเจ้าของ"
+"Owner token copied" = "คัดลอกโทเคนเจ้าของแล้ว"
+"PDF print options" = "ตัวเลือกพิมพ์ PDF"
+"PDF print settings" = "การตั้งค่าพิมพ์ PDF"
+"Padding" = "ระยะขอบใน"
+"Page" = "หน้า"
+"Page deleted" = "ลบหน้าแล้ว"
+"Pages" = "หน้า"
+"Pages added to the document" = "เพิ่มหน้าลงในเอกสารแล้ว"
+"Pink" = "ชมพู"
+"Placed on the current page" = "วางบนหน้าปัจจุบันแล้ว"
+"Pages: {pages}" = "หน้า: {pages}"
+"Paint bucket" = "ถังสี"
+"Pan the canvas" = "เลื่อนแคนวาส"
+"Pan with nothing selected (Shift: farther)" = "เลื่อนเมื่อไม่ได้เลือกอะไร (Shift: ไกลขึ้น)"
+"Panels" = "แผง"
+"Paper" = "กระดาษ"
+"Paragraph indent" = "การเยื้องย่อหน้า"
+"Paragraph indent applies to left-aligned text" = "การเยื้องย่อหน้าใช้กับข้อความที่ชิดซ้าย"
+"Paragraph spacing" = "ระยะห่างย่อหน้า"
+"Pass through" = "ผ่านทะลุ"
+"Paste a link (https://…)" = "วางลิงก์ (https://…)"
+"Paste a team library link (a view link)" = "วางลิงก์ไลบรารีของทีม (ลิงก์ดู)"
+"Paste here" = "วางที่นี่"
+"Paste to replace" = "วางเพื่อแทนที่"
+"Pasted design layers; {n} kinds of content were left out" = { other = "วางเลเยอร์ดีไซน์แล้ว ข้ามเนื้อหา {n} ประเภท" }
+"Pattern" = "แพตเทิร์น"
+"Pattern alignment" = "การจัดแนวแพตเทิร์น"
+"Pattern scale" = "สเกลแพตเทิร์น"
+"Pattern source" = "ต้นทางแพตเทิร์น"
+"Pen" = "ปากกา"
+"Pencil" = "ดินสอ"
+"People in this file" = "ผู้ที่อยู่ในไฟล์นี้"
+"People join from anywhere with a code. The file is kept on {server} while you share it." = "ทุกคนเข้าร่วมจากที่ใดก็ได้ด้วยรหัส ไฟล์จะถูกเก็บไว้บน {server} ขณะที่คุณแชร์"
+"People on your network join with a code. Nothing goes through a server." = "ทุกคนในเครือข่ายของคุณเข้าร่วมด้วยรหัส ไม่มีข้อมูลผ่านเซิร์ฟเวอร์"
+"Phone" = "โทรศัพท์"
+"Pick color" = "เลือกสี"
+"Pick color (I)" = "เลือกสี (I)"
+"Pick one font family first" = "เลือกตระกูลฟอนต์หนึ่งแบบก่อน"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "เลือกเครื่องมือเฟรม แล้วลากบนแคนวาสหรือเลือกขนาดอุปกรณ์"
+"Pin a property" = "ปักหมุดพร็อพเพอร์ตี"
+"Pinch" = "บีบ"
+"Pixel grid" = "กริดพิกเซล"
+"Pixel preview 1x" = "ตัวอย่างพิกเซล 1x"
+"Pixel preview 2x" = "ตัวอย่างพิกเซล 2x"
+"Place a shape or frame (its tool chosen)" = "วางรูปร่างหรือเฟรม (เลือกเครื่องมือของมันแล้ว)"
+"Place automatically" = "วางอัตโนมัติ"
+"Place image" = "วางรูปภาพ"
+"Plugin" = "ปลั๊กอิน"
+"Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "ปลั๊กอินทำงานในแซนด์บ็อกซ์ของ FigCraft โดยไม่มีไฟล์ เครือข่าย หรือนาฬิกา ติดตั้งเฉพาะปลั๊กอินที่ไว้ใจ"
+"Plugins" = "ปลั๊กอิน"
+"Plugins & widgets" = "ปลั๊กอินและวิดเจ็ต"
+"Plus darker" = "Plus darker"
+"Plus lighter" = "Plus lighter"
+"Plus one" = "บวกหนึ่ง"
+"Point" = "จุด"
+"Points" = "จุด"
+"Polygon" = "รูปหลายเหลี่ยม"
+"Polygons" = "รูปหลายเหลี่ยม"
+"Port" = "พอร์ต"
+"Position" = "ตำแหน่ง"
+"Post" = "โพสต์"
+"Preferences" = "การตั้งค่า"
+"Preferred" = "ที่ต้องการ"
+"Present" = "นำเสนอ"
+"Present or preview" = "นำเสนอหรือดูตัวอย่าง"
+"Present this flow" = "นำเสนอโฟลว์นี้"
+"Presentation" = "การนำเสนอ"
+"Presentation slides" = "สไลด์นำเสนอ"
+"Presenting: comments" = "ขณะนำเสนอ: ความคิดเห็น"
+"Presenting: cycle the size options" = "ขณะนำเสนอ: สลับตัวเลือกขนาด"
+"Presenting: full screen" = "ขณะนำเสนอ: เต็มหน้าจอ"
+"Presenting: next frame" = "ขณะนำเสนอ: เฟรมถัดไป"
+"Presenting: previous frame" = "ขณะนำเสนอ: เฟรมก่อนหน้า"
+"Presenting: restart" = "ขณะนำเสนอ: เริ่มใหม่"
+"Preserve scroll position" = "คงตำแหน่งการเลื่อน"
+"Presets" = "พรีเซ็ต"
+"Press a key…" = "กดปุ่ม…"
+"Playground" = "สนามทดลอง"
+"Preview" = "ตัวอย่าง"
+"Preview this flow" = "ดูตัวอย่างโฟลว์นี้"
+"Preview this frame" = "ดูตัวอย่างเฟรมนี้"
+"Previous frame" = "เฟรมก่อนหน้า"
+"Previous ready for dev" = "พร้อมสำหรับนักพัฒนารายการก่อนหน้า"
+"Progressive" = "แบบไล่ระดับ"
+"Properties" = "พร็อพเพอร์ตี"
+"Prototype" = "โปรโตไทป์"
+"Prototype preview" = "ตัวอย่างโปรโตไทป์"
+"Prototype settings" = "การตั้งค่าโปรโตไทป์"
+"Publish" = "เผยแพร่"
+"Publish changes" = "เผยแพร่การเปลี่ยนแปลง"
+"Publish to another server…" = "เผยแพร่ไปยังเซิร์ฟเวอร์อื่น…"
+"Publish to server" = "เผยแพร่ไปยังเซิร์ฟเวอร์"
+"Published version {v}" = "เผยแพร่เวอร์ชัน {v} แล้ว"
+"Published version {v} to the server" = "เผยแพร่เวอร์ชัน {v} ไปยังเซิร์ฟเวอร์แล้ว"
+"Published version {v}: save the file so other files can use it" = "เผยแพร่เวอร์ชัน {v} แล้ว: บันทึกไฟล์เพื่อให้ไฟล์อื่นใช้ได้"
+"Published · {people}" = "เผยแพร่แล้ว · {people}"
+"Publishing to a server needs the desktop app; in the browser you can join a server's files" = "การเผยแพร่ไปยังเซิร์ฟเวอร์ต้องใช้แอปเดสก์ท็อป ในเบราว์เซอร์เข้าร่วมไฟล์ของเซิร์ฟเวอร์ได้"
+"Publishing with the server's key." = "กำลังเผยแพร่ด้วยคีย์ของเซิร์ฟเวอร์"
+"Publishing…" = "กำลังเผยแพร่…"
+"Push" = "ผลัก"
+"Push changes to main component" = "ส่งการเปลี่ยนแปลงไปยังคอมโพเนนต์หลัก"
+"Put text on path" = "วางข้อความบนเส้นทาง"
+"Question" = "คำถาม"
+"R" = "R"
+"Radial" = "แบบรัศมี"
+"Radius" = "รัศมี"
+"Ratio" = "อัตราส่วน"
+"Reading the library…" = "กำลังอ่านไลบรารี…"
+"Ready for dev" = "พร้อมสำหรับนักพัฒนา"
+"Real name" = "ชื่อจริง"
+"Recent" = "ล่าสุด"
+"Recent files" = "ไฟล์ล่าสุด"
+"Recents" = "ล่าสุด"
+"Recovered {n} unsaved files after the app quit unexpectedly: save them to keep them" = { other = "กู้คืนไฟล์ที่ยังไม่ได้บันทึก {n} ไฟล์หลังแอปปิดโดยไม่คาดคิด: บันทึกเพื่อเก็บไว้" }
+"Rectangle" = "สี่เหลี่ยมผืนผ้า"
+"Rectangles" = "สี่เหลี่ยมผืนผ้า"
+"Red" = "แดง"
+"Reduce motion" = "ลดการเคลื่อนไหว"
+"Refraction" = "การหักเห"
+"Regular expression" = "นิพจน์ปกติ"
+"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "สัมพันธ์กับสเกลการแสดงผลของระบบ (100% คือขนาดของระบบเอง) การซูมเอกสารแยกต่างหาก"
+"Remove" = "นำออก"
+"Remove all" = "นำออกทั้งหมด"
+"Remove annotation" = "นำหมายเหตุออก"
+"Remove auto layout" = "นำออโต้เลย์เอาต์ออก"
+"Remove dev resource" = "นำแหล่งข้อมูลสำหรับนักพัฒนาออก"
+"Remove export setting" = "นำการตั้งค่าส่งออกออก"
+"Remove from recents" = "นำออกจากรายการล่าสุด"
+"Remove from server" = "นำออกจากเซิร์ฟเวอร์"
+"Remove from server…" = "นำออกจากเซิร์ฟเวอร์…"
+"Remove guide" = "นำเส้นไกด์ออก"
+"Remove interaction" = "นำอินเทอร์แอกชันออก"
+"Remove library from this file" = "นำไลบรารีออกจากไฟล์นี้"
+"Remove measurement" = "นำการวัดออก"
+"Remove min and max" = "นำค่าต่ำสุดและสูงสุดออก"
+"Remove min and max height" = "นำความสูงต่ำสุดและสูงสุดออก"
+"Remove min and max width" = "นำความกว้างต่ำสุดและสูงสุดออก"
+"Remove regions" = "นำพื้นที่ออก"
+"Remove slot" = "นำสล็อตออก"
+"Remove starting point" = "นำจุดเริ่มต้นออก"
+"Remove stop" = "นำจุดหยุดออก"
+"Remove text from path" = "นำข้อความออกจากเส้นทาง"
+"Remove the else and its actions" = "นำส่วนมิฉะนั้นและการกระทำของมันออก"
+"Remove this condition and its actions" = "นำเงื่อนไขนี้และการกระทำของมันออก"
+"Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "นำไฟล์นี้ออกจากเซิร์ฟเวอร์หรือไม่ จะแชร์หรือเปิดจากที่นั่นอีกไม่ได้ สำเนาของคุณยังเปิดอยู่ที่นี่"
+"Remove {name} from session" = "นำ {name} ออกจากเซสชัน"
+"Remove {name} from {server}?" = "นำ {name} ออกจาก {server} หรือไม่"
+"Removed" = "นำออกแล้ว"
+"Removed from the server" = "นำออกจากเซิร์ฟเวอร์แล้ว"
+"Removed since it was marked" = "นำออกตั้งแต่ทำเครื่องหมาย"
+"Removed since this version" = "นำออกตั้งแต่เวอร์ชันนี้"
+"Rename" = "เปลี่ยนชื่อ"
+"Rename duplicated layers" = "เปลี่ยนชื่อเลเยอร์ที่ทำสำเนา"
+"Rename folder" = "เปลี่ยนชื่อโฟลเดอร์"
+"Rename group" = "เปลี่ยนชื่อกลุ่ม"
+"Rename layers" = "เปลี่ยนชื่อเลเยอร์"
+"Rename mode" = "เปลี่ยนชื่อโหมด"
+"Rename on the server" = "เปลี่ยนชื่อบนเซิร์ฟเวอร์"
+"Rename on the server…" = "เปลี่ยนชื่อบนเซิร์ฟเวอร์…"
+"Rename page" = "เปลี่ยนชื่อหน้า"
+"Rename to" = "เปลี่ยนชื่อเป็น"
+"Reorder selection" = "เรียงลำดับส่วนที่เลือกใหม่"
+"Replace all" = "แทนที่ทั้งหมด"
+"Replace mixed export settings" = "แทนที่การตั้งค่าส่งออกที่ปะปนกัน"
+"Replace with" = "แทนที่ด้วย"
+"Replace with a new interaction" = "แทนที่ด้วยอินเทอร์แอกชันใหม่"
+"Reply" = "ตอบกลับ"
+"Report" = "รายงาน"
+"Report this file…" = "รายงานไฟล์นี้…"
+"Reset" = "รีเซ็ต"
+"Reset adjustments" = "รีเซ็ตการปรับ"
+"Reset all changes" = "รีเซ็ตการเปลี่ยนแปลงทั้งหมด"
+"Reset all overrides on this layer" = "รีเซ็ตการเขียนทับทั้งหมดบนเลเยอร์นี้"
+"Reset overrides" = "รีเซ็ตการเขียนทับ"
+"Reset slot" = "รีเซ็ตสล็อต"
+"Reset this override" = "รีเซ็ตการเขียนทับนี้"
+"Reset to style" = "รีเซ็ตเป็นสไตล์"
+"Reset to the inherited value" = "รีเซ็ตเป็นค่าที่สืบทอด"
+"Resize by the nudge amount" = "ปรับขนาดตามระยะขยับ"
+"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "ปรับขนาดเฟรมตามหน้าจออุปกรณ์ (หรือหน้าต่างเมื่อไม่มีอุปกรณ์): คอนสเตรนต์และออโต้เลย์เอาต์จะตอบสนอง"
+"Resize to fit" = "ปรับขนาดให้พอดี"
+"Resizing" = "การปรับขนาด"
+"Resolve" = "แก้ไขแล้ว"
+"Resolve change" = "แก้ไขการเปลี่ยนแปลง"
+"Resolved" = "แก้ไขแล้ว"
+"Resources" = "แหล่งข้อมูล"
+"Responsive" = "รีสปอนซีฟ"
+"Restart" = "เริ่มใหม่"
+"Restore" = "กู้คืน"
+"Restore main component" = "กู้คืนคอมโพเนนต์หลัก"
+"Restore this version" = "กู้คืนเวอร์ชันนี้"
+"Restored “{name}”" = "กู้คืน “{name}” แล้ว"
+"Reverse the order" = "กลับลำดับ"
+"Reversed triangle" = "สามเหลี่ยมกลับหัว"
+"Review and merge" = "ตรวจทานและรวม"
+"Ribbon" = "ริบบิ้น"
+"Right" = "ขวา"
+"Right padding" = "ระยะขอบในด้านขวา"
+"Right side" = "ด้านขวา"
+"Right side width" = "ความกว้างด้านขวา"
+"Rotate 90°" = "หมุน 90°"
+"Rotate 90° right" = "หมุน 90° ไปทางขวา"
+"Rotate to landscape" = "หมุนเป็นแนวนอน"
+"Rotate to portrait" = "หมุนเป็นแนวตั้ง"
+"Rotation" = "การหมุน"
+"Rotation jitter" = "การสุ่มการหมุน"
+"Round" = "มน"
+"Rounded" = "โค้งมน"
+"Rounded rectangle" = "สี่เหลี่ยมมุมมน"
+"Row" = "แถว"
+"Row gap" = "ช่องว่างระหว่างแถว"
+"Row sizes" = "ขนาดแถว"
+"Row span" = "จำนวนแถวที่คลุม"
+"Rows" = "แถว"
+"Rows {count}" = "แถว {count}"
+"Rulers" = "ไม้บรรทัด"
+"Run" = "เรียกใช้"
+"Run {label}" = "เรียกใช้ {label}"
+"Save files automatically" = "บันทึกไฟล์อัตโนมัติ"
+"Search templates" = "ค้นหาเทมเพลต"
+"See all templates" = "ดูเทมเพลตทั้งหมด"
+"Select layers and they space themselves as their content changes" = "เลือกเลเยอร์แล้วระยะห่างจะปรับเองเมื่อเนื้อหาเปลี่ยน"
+"SHA-256: {sha}…" = "SHA-256: {sha}…"
+"Same as layer" = "เหมือนเลเยอร์"
+"Saturation" = "ความอิ่มตัว"
+"Save" = "บันทึก"
+"Save as" = "บันทึกเป็น"
+"Save as preset…" = "บันทึกเป็นพรีเซ็ต…"
+"Save version  {key}" = "บันทึกเวอร์ชัน  {key}"
+"Saved" = "บันทึกแล้ว"
+"Saved {name}" = "บันทึก {name} แล้ว"
+"Say something" = "พิมพ์ข้อความ"
+"Scale" = "สเกล"
+"Scatter" = "กระจาย"
+"Scoping: where pickers offer it" = "ขอบเขต: ตัวเลือกจะเสนอที่ใดบ้าง"
+"Screen" = "Screen"
+"Scroll behavior" = "พฤติกรรมการเลื่อน"
+"Scroll to" = "เลื่อนไปที่"
+"Scroll to layer" = "เลื่อนไปที่เลเยอร์"
+"Scroll with parent" = "เลื่อนตามตัวแม่"
+"Search plugins" = "ค้นหาปลั๊กอิน"
+"Search" = "ค้นหา"
+"Search actions, layers and tools" = "ค้นหาการกระทำ เลเยอร์ และเครื่องมือ"
+"Search assets" = "ค้นหาแอสเซ็ต"
+"Search comments" = "ค้นหาความคิดเห็น"
+"Search files and templates" = "ค้นหาไฟล์และเทมเพลต"
+"Search results" = "ผลการค้นหา"
+"Search fonts" = "ค้นหาฟอนต์"
+"Search layers" = "ค้นหาเลเยอร์"
+"Search pages" = "ค้นหาหน้า"
+"Search shortcuts" = "ค้นหาแป้นพิมพ์ลัด"
+"Section" = "เซกชัน"
+"Section color" = "สีเซกชัน"
+"Sections" = "เซกชัน"
+"Select a frame and add a starting point to present it as a flow." = "เลือกเฟรมแล้วเพิ่มจุดเริ่มต้นเพื่อนำเสนอเป็นโฟลว์"
+"Select a frame to preview it" = "เลือกเฟรมเพื่อดูตัวอย่าง"
+"Select a layer to see its properties and code" = "เลือกเลเยอร์เพื่อดูพร็อพเพอร์ตีและโค้ด"
+"Select all" = "เลือกทั้งหมด"
+"Select all with same" = "เลือกทั้งหมดที่เหมือนกัน"
+"Select layer" = "เลือกเลเยอร์"
+"Select layers to apply the style to" = "เลือกเลเยอร์ที่จะใช้สไตล์"
+"Select layers with this color" = "เลือกเลเยอร์ที่มีสีนี้"
+"Select overlapping shapes" = "เลือกรูปร่างที่ซ้อนกัน"
+"Select points to edit their position, radius and mirroring" = "เลือกจุดเพื่อแก้ไขตำแหน่ง รัศมี และการสะท้อน"
+"Select slot" = "เลือกสล็อต"
+"Selection colors" = "สีของส่วนที่เลือก"
+"Selection" = "ส่วนที่เลือก"
+"Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "กรอบเลือก {w} คูณ {h} ที่ {x}, {y}: ลูกศรเลื่อนกรอบ Shift+ลูกศรหรือ {cmd}+ลูกศรปรับขนาด Enter เพื่อเลือก Escape เพื่อยกเลิก"
+"Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "กรอบเลือก: ลูกศรเลื่อนกรอบ Shift+ลูกศรหรือ {cmd}+ลูกศรปรับขนาด Enter เพื่อเลือก Escape เพื่อยกเลิก"
+"Send backward" = "ส่งไปข้างหลัง"
+"Send report" = "ส่งรายงาน"
+"Send to back" = "ส่งไปไว้หลังสุด"
+"Sep" = "ก.ย."
+"Server address (ws://host:47900/)" = "ที่อยู่เซิร์ฟเวอร์ (ws://host:47900/)"
+"Server address" = "ที่อยู่เซิร์ฟเวอร์"
+"Server for online sharing" = "เซิร์ฟเวอร์สำหรับการแชร์ออนไลน์"
+"Set as default" = "ตั้งเป็นค่าเริ่มต้น"
+"Set variable" = "ตั้งค่าตัวแปร"
+"Set variable mode" = "ตั้งโหมดตัวแปร"
+"Set variable {name}" = "ตั้งค่าตัวแปร {name}"
+"Set {name} to {value}" = "ตั้ง {name} เป็น {value}"
+"Shadows" = "ส่วนมืด"
+"Shape" = "รูปร่าง"
+"Shape builder" = "ตัวสร้างรูปร่าง"
+"Shape tools" = "เครื่องมือรูปร่าง"
+"Shapes" = "รูปร่าง"
+"Share" = "แชร์"
+"Share this file" = "แชร์ไฟล์นี้"
+"Share with a code" = "แชร์ด้วยรหัส"
+"Share: live session, export" = "แชร์: เซสชันสด ส่งออก"
+"Shared" = "แชร์แล้ว"
+"Shared: copy its code from the file's menu" = "แชร์แล้ว: คัดลอกรหัสจากเมนูของไฟล์"
+"Sharing a file needs the desktop app; here you can join one." = "การแชร์ไฟล์ต้องใช้แอปเดสก์ท็อป ที่นี่เข้าร่วมได้อย่างเดียว"
+"Sharing on the local network (online sharing is off: no server is set in Preferences)." = "กำลังแชร์ในเครือข่ายภายใน (การแชร์ออนไลน์ปิดอยู่: ไม่ได้ตั้งเซิร์ฟเวอร์ในการตั้งค่า)"
+"Sharing on your network · {people}" = "กำลังแชร์ในเครือข่ายของคุณ · {people}"
+"Sharing online · {people}" = "กำลังแชร์ออนไลน์ · {people}"
+"Sharing stopped: the file stays on the server, open only to you" = "หยุดแชร์แล้ว: ไฟล์ยังอยู่บนเซิร์ฟเวอร์ เปิดได้เฉพาะคุณ"
+"Show" = "แสดง"
+"Show all templates" = "แสดงเทมเพลตทั้งหมด"
+"Show as grid" = "แสดงเป็นกริด"
+"Show as list" = "แสดงเป็นรายการ"
+"Show autosaves" = "แสดงการบันทึกอัตโนมัติ"
+"Show behind transparent areas" = "แสดงด้านหลังพื้นที่โปร่งใส"
+"Show comments (Shift+C)" = "แสดงความคิดเห็น (Shift+C)"
+"Show device frame" = "แสดงกรอบอุปกรณ์"
+"Show dimensions on objects" = "แสดงขนาดบนออบเจกต์"
+"Show hotspot hints" = "แสดงคำใบ้ฮอตสปอต"
+"Show in Explorer" = "แสดงใน Explorer"
+"Show in Finder" = "แสดงใน Finder"
+"Show in folder" = "แสดงในโฟลเดอร์"
+"Show only this on the canvas" = "แสดงเฉพาะอันนี้บนแคนวาส"
+"Show open" = "แสดงที่ยังเปิดอยู่"
+"Show section contents" = "แสดงเนื้อหาของเซกชัน"
+"Show this layer" = "แสดงเลเยอร์นี้"
+"Show usage" = "แสดงการใช้งาน"
+"Show/Hide" = "แสดง/ซ่อน"
+"Show/Hide UI" = "แสดง/ซ่อน UI"
+"Side by side" = "เคียงข้างกัน"
+"Sidebar" = "แถบด้านข้าง"
+"Simplify stroke" = "ทำเส้นขอบให้เรียบง่าย"
+"Size" = "ขนาด"
+"Size jitter" = "การสุ่มขนาด"
+"Skip ink" = "เว้นเส้นตรงตัวอักษร"
+"Slashed zero" = "ศูนย์มีขีด"
+"Slice" = "สไลซ์"
+"Slices" = "สไลซ์"
+"Slide in" = "เลื่อนเข้า"
+"Slide out" = "เลื่อนออก"
+"Slot" = "สล็อต"
+"Slot content" = "เนื้อหาสล็อต"
+"Small capitals" = "ตัวพิมพ์ใหญ่ขนาดเล็ก"
+"Small caps" = "ตัวพิมพ์ใหญ่ขนาดเล็ก"
+"Smart animate" = "Smart animate"
+"Snap to pixel grid" = "ยึดติดกริดพิกเซล"
+"Social and slides" = "โซเชียลและสไลด์"
+"Social media" = "โซเชียลมีเดีย"
+"Social post sizes" = "ขนาดโพสต์โซเชียล"
+"Soft light" = "Soft light"
+"Solid" = "ทึบ"
+"Some variants have the same property values: give each one a unique combination" = "บางแวเรียนต์มีค่าพร็อพเพอร์ตีเหมือนกัน: กำหนดชุดค่าที่ไม่ซ้ำกันให้แต่ละอัน"
+"Sort" = "เรียงลำดับ"
+"Sort by" = "เรียงตาม"
+"Sort by date" = "เรียงตามวันที่"
+"Sort by page" = "เรียงตามหน้า"
+"Sort by {column}" = "เรียงตาม {column}"
+"Space around" = "เว้นรอบ"
+"Space between" = "เว้นระหว่าง"
+"Space drag" = "ลากด้วยสเปซ"
+"Space evenly" = "เว้นเท่ากัน"
+"Space+drag" = "สเปซ+ลาก"
+"Spacing" = "ระยะห่าง"
+"Spam, stolen work, abuse…" = "สแปม งานที่ขโมยมา การละเมิด…"
+"Speech bubble" = "ฟองคำพูด"
+"Splay" = "แผ่ออก"
+"Spotlight me" = "ส่องไฟมาที่ฉัน"
+"Spread" = "การแผ่"
+"Square" = "สี่เหลี่ยมจัตุรัส"
+"Stamp" = "แสตมป์"
+"Stamps" = "แสตมป์"
+"Standard" = "มาตรฐาน"
+"Standard ligatures" = "ลิเกเจอร์มาตรฐาน"
+"Star" = "ดาว"
+"Stars" = "ดาว"
+"Start" = "เริ่ม"
+"Start ascending from / stop descending at" = "เริ่มเพิ่มขึ้นจาก / หยุดลดลงที่"
+"Start from a blank canvas" = "เริ่มจากแคนวาสว่าง"
+"Start from a template" = "เริ่มจากเทมเพลต"
+"Start on path" = "เริ่มบนเส้นทาง"
+"Start on the Home screen" = "เริ่มที่หน้าจอหลัก"
+"Start point" = "จุดเริ่มต้น"
+"Start sharing" = "เริ่มแชร์"
+"Start sharing with the Share button, then pass on the code it gives" = "เริ่มแชร์ด้วยปุ่มแชร์ แล้วส่งต่อรหัสที่ได้"
+"Starting to share…" = "กำลังเริ่มแชร์…"
+"Status" = "สถานะ"
+"Sticky" = "ติดหนึบ"
+"Sticky note" = "โน้ตติดหนึบ"
+"Sticky note colors" = "สีโน้ตติดหนึบ"
+"Sticky notes, shapes and connectors" = "โน้ตติดหนึบ รูปร่าง และตัวเชื่อม"
+"Stop" = "หยุด"
+"Stop following {name}" = "เลิกติดตาม {name}"
+"Stop session" = "หยุดเซสชัน"
+"Stop sharing" = "หยุดแชร์"
+"Stop spotlighting" = "หยุดส่องไฟ"
+"Stop {n}  {hex}" = "จุดหยุด {n}  {hex}"
+"Straight" = "ตรง"
+"Stretch" = "ยืด"
+"Strikethrough" = "ขีดฆ่า"
+"String" = "สตริง"
+"Stroke" = "เส้นขอบ"
+"Stroke style" = "สไตล์เส้นขอบ"
+"Stroke weight" = "ความหนาเส้นขอบ"
+"Strokes" = "เส้นขอบ"
+"Style" = "สไตล์"
+"Styles" = "สไตล์"
+"Stylistic set 1" = "ชุดสไตล์ 1"
+"Stylistic set 2" = "ชุดสไตล์ 2"
+"Stylistic set 3" = "ชุดสไตล์ 3"
+"Stylistic set 4" = "ชุดสไตล์ 4"
+"Stylistic set 5" = "ชุดสไตล์ 5"
+"Subtract" = "หักออก"
+"Subtracts" = "หักออก"
+"Suffix" = "ส่วนต่อท้าย"
+"Suspend snapping while dragging" = "ระงับการยึดติดขณะลาก"
+"Swap instance" = "สลับอินสแตนซ์"
+"Swap library: use another library's assets of the same names" = "สลับไลบรารี: ใช้แอสเซ็ตชื่อเดียวกันจากไลบรารีอื่น"
+"Swap orientation" = "สลับการวางแนว"
+"Swap overlay" = "สลับโอเวอร์เลย์"
+"Swap to {name}" = "สลับเป็น {name}"
+"Swap width and height" = "สลับความกว้างและความสูง"
+"Swapped instance" = "อินสแตนซ์ที่สลับแล้ว"
+"Swapped {n} assets" = { other = "สลับแอสเซ็ต {n} รายการแล้ว" }
+"Swapped {n} assets; {missed} had no match and still use the old library" = { other = "สลับแอสเซ็ต {n} รายการแล้ว; {missed} รายการไม่พบที่ตรงกันและยังใช้ไลบรารีเดิม" }
+"Sweep" = "กวาด"
+"System" = "ระบบ"
+"Tab / Shift+Tab" = "Tab / Shift+Tab"
+"Table" = "ตาราง"
+"Tablet" = "แท็บเล็ต"
+"Tabular numbers" = "ตัวเลขแบบตาราง"
+"Take the values from the first selected layer" = "ใช้ค่าจากเลเยอร์แรกที่เลือก"
+"Taper" = "เรียวลง"
+"Taper both ends" = "เรียวลงทั้งสองปลาย"
+"Tell the server's operator what is wrong with it" = "แจ้งผู้ดูแลเซิร์ฟเวอร์ว่ามีปัญหาอะไร"
+"Temperature" = "อุณหภูมิสี"
+"Template" = "เทมเพลต"
+"Templates" = "เทมเพลต"
+"Terms" = "ข้อกำหนด"
+"Text" = "ข้อความ"
+"Text align" = "การจัดแนวข้อความ"
+"Text content" = "เนื้อหาข้อความ"
+"Text size" = "ขนาดข้อความ"
+"Text style" = "สไตล์ข้อความ"
+"Text styles" = "สไตล์ข้อความ"
+"Texts" = "ข้อความ"
+"Texture" = "เท็กซ์เจอร์"
+"The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3." = "แคนวาสแสดงตัวอย่างสีใน sRGB ส่วนไฟล์ PNG, JPG และ WebP ที่ส่งออกจะติดแท็ก Display P3"
+"The destination document is unavailable. Nothing was imported." = "เอกสารปลายทางใช้ไม่ได้ ไม่มีอะไรถูกนำเข้า"
+"The destination document was closed. Nothing was imported." = "เอกสารปลายทางถูกปิดแล้ว ไม่มีอะไรถูกนำเข้า"
+"The destination page was removed. Nothing was imported." = "หน้าปลายทางถูกลบแล้ว ไม่มีอะไรถูกนำเข้า"
+"The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "ไฟล์จะถูกลบจากเซิร์ฟเวอร์: ไม่มีใครเปิดหรือเข้าร่วมจากที่นั่นได้อีก และย้อนกลับไม่ได้ สำเนาที่เปิดอยู่ยังอยู่กับผู้ที่ถือไว้"
+"The file now holds another library" = "ตอนนี้ไฟล์เก็บไลบรารีอื่น"
+"The file now holds another library (\"{name}\")" = "ตอนนี้ไฟล์เก็บไลบรารีอื่น (\"{name}\")"
+"The files you shared or published online from this computer. They stay on their server until you remove them." = "ไฟล์ที่คุณแชร์หรือเผยแพร่ออนไลน์จากคอมพิวเตอร์เครื่องนี้ ไฟล์จะอยู่บนเซิร์ฟเวอร์ของมันจนกว่าคุณจะนำออก"
+"The link carries the session's secret: share it only with people you invite." = "ลิงก์มีรหัสลับของเซสชัน: แชร์เฉพาะกับคนที่คุณเชิญ"
+"The name in your online files and on the server. The document inside keeps its own name." = "ชื่อในไฟล์ออนไลน์ของคุณและบนเซิร์ฟเวอร์ เอกสารข้างในยังคงใช้ชื่อของตัวเอง"
+"The selection uses several text styles: click to apply one" = "ส่วนที่เลือกใช้หลายสไตล์ข้อความ: คลิกเพื่อใช้สไตล์เดียว"
+"The server deletes this file if nobody opens it before {date}." = "เซิร์ฟเวอร์จะลบไฟล์นี้หากไม่มีใครเปิดก่อน {date}"
+"The whole file" = "ทั้งไฟล์"
+"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "หน้าต่างเล็กเกินไปสำหรับ {size}% อินเทอร์เฟซจึงแสดงที่ {drawn}% ขยายหน้าต่างเพื่อใช้ {size}%"
+"Theme" = "ธีม"
+"There's no destination for that action" = "การกระทำนั้นไม่มีปลายทาง"
+"Thickness" = "ความหนา"
+"This branch can't be reviewed: {e}" = "ตรวจทานแบรนช์นี้ไม่ได้: {e}"
+"This branch was merged or archived." = "แบรนช์นี้ถูกรวมหรือเก็บถาวรแล้ว"
+"This computer only" = "เฉพาะเครื่องนี้"
+"This computer remembers the owner token, so the file can be managed from the home screen's Online list. Copy it to manage the file from somewhere else: it is a password for this file and won't be shown again." = "คอมพิวเตอร์เครื่องนี้จำโทเคนเจ้าของไว้ จึงจัดการไฟล์ได้จากรายการออนไลน์ในหน้าจอหลัก คัดลอกไว้เพื่อจัดการไฟล์จากที่อื่น: โทเคนนี้เป็นรหัสผ่านของไฟล์นี้และจะไม่แสดงอีก"
+"This condition is edited as an expression" = "เงื่อนไขนี้แก้ไขเป็นนิพจน์"
+"This file" = "ไฟล์นี้"
+"This file has unsaved changes" = "ไฟล์นี้มีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก"
+"This file is too large to join here (up to {mb} MB)" = "ไฟล์นี้ใหญ่เกินกว่าจะเข้าร่วมที่นี่ (สูงสุด {mb} MB)"
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "ไฟล์นี้ใช้ฟอนต์ที่ยังไม่ได้ติดตั้งในคอมพิวเตอร์เครื่องนี้ ข้อความจะแสดงด้วยฟอนต์สำรองจนกว่าคุณจะติดตั้ง"
+"This file is on {server}, open only to you. Share it to let others in with a new code." = "ไฟล์นี้อยู่บน {server} เปิดได้เฉพาะคุณ แชร์เพื่อให้คนอื่นเข้าได้ด้วยรหัสใหม่"
+"This frame is new on the branch." = "เฟรมนี้เป็นเฟรมใหม่บนแบรนช์"
+"This frame isn't on the branch." = "เฟรมนี้ไม่ได้อยู่บนแบรนช์"
+"This server is open to the public: no key needed." = "เซิร์ฟเวอร์นี้เปิดสาธารณะ: ไม่ต้องใช้คีย์"
+"This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "เซิร์ฟเวอร์นี้ต้องใช้คีย์: เพิ่ม ?key=… ต่อท้ายที่อยู่ (`figcraft-server key` แสดงคีย์บนเครื่องเซิร์ฟเวอร์)"
+"This server takes files only with its key: see Advanced." = "เซิร์ฟเวอร์นี้รับไฟล์เฉพาะที่มีคีย์: ดูที่ขั้นสูง"
+"Thumbs up" = "ยกนิ้วโป้ง"
+"This version can't be read." = "อ่านเวอร์ชันนี้ไม่ได้"
+"This version doesn't have it: all of it is new." = "เวอร์ชันนี้ไม่มีรายการนี้: ทั้งหมดเป็นของใหม่"
+"Tidy up" = "จัดระเบียบ"
+"Tile" = "เรียงต่อ"
+"Tile type" = "ชนิดการเรียงต่อ"
+"Tint" = "โทนสี"
+"Title" = "ชื่อเรื่อง"
+"Title case" = "ตัวพิมพ์ใหญ่ต้นคำ"
+"To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "หากต้องการแชร์ไลบรารีนี้กับทีม ให้เผยแพร่ไฟล์ไปยังเซิร์ฟเวอร์ (แชร์ ▸ เผยแพร่ไปยังเซิร์ฟเวอร์…) แล้วเผยแพร่ไลบรารีที่นั่น"
+"To the layer around it" = "ไปยังเลเยอร์ที่ล้อมรอบ"
+"Toggle" = "สลับ"
+"Toggle light/dark theme" = "สลับธีมสว่าง/มืด"
+"Toggle visibility" = "สลับการแสดงผล"
+"Tools" = "เครื่องมือ"
+"Top" = "บน"
+"Top & bottom" = "บนและล่าง"
+"Top left radius" = "รัศมีมุมบนซ้าย"
+"Top padding" = "ระยะขอบในด้านบน"
+"Top right radius" = "รัศมีมุมบนขวา"
+"Transform" = "แปลงรูปทรง"
+"Triangle" = "สามเหลี่ยม"
+"Triangle arrow" = "ลูกศรสามเหลี่ยม"
+"Trigger" = "ทริกเกอร์"
+"True" = "จริง"
+"Truncate text" = "ตัดข้อความ"
+"Truncate with an ellipsis" = "ตัดด้วยจุดไข่ปลา"
+"Try again" = "ลองอีกครั้ง"
+"Try another search or filter." = "ลองค้นหาหรือกรองด้วยเงื่อนไขอื่น"
+"Try another search, or browse templates." = "ลองค้นหาด้วยคำอื่น หรือเรียกดูเทมเพลต"
+"Try another word, or look at every kind." = "ลองคำอื่น หรือดูทุกประเภท"
+"Turn a layer into a component, reuse it, and change every copy at once" = "แปลงเลเยอร์เป็นคอมโพเนนต์ ใช้ซ้ำ และเปลี่ยนทุกสำเนาพร้อมกัน"
+"Two digits" = "สองหลัก"
+"Type" = "ชนิด"
+"Type settings" = "การตั้งค่าตัวอักษร"
+"Type the join code you were given, or paste an invite link." = "พิมพ์รหัสเข้าร่วมที่ได้รับ หรือวางลิงก์เชิญ"
+"Typography" = "ตัวอักษร"
+"Underline" = "ขีดเส้นใต้"
+"Undo takes back only your own changes; what others changed since stays." = "เลิกทำจะย้อนเฉพาะการเปลี่ยนแปลงของคุณ สิ่งที่คนอื่นเปลี่ยนหลังจากนั้นยังคงอยู่"
+"Ungroup" = "เลิกจัดกลุ่ม"
+"Uniform" = "สม่ำเสมอ"
+"Union" = "รวม"
+"Unions" = "รวม"
+"Unknown — treated as sRGB" = "ไม่ทราบ — ถือเป็น sRGB"
+"Unread" = "ยังไม่อ่าน"
+"Unresolve" = "ยกเลิกสถานะแก้ไขแล้ว"
+"Unsaved changes" = "การเปลี่ยนแปลงที่ยังไม่ได้บันทึก"
+"Unsaved changes in {names}. Save them before closing?" = "{names} มีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก บันทึกก่อนปิดหรือไม่"
+"Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "มีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก: บันทึกก่อน ({save}) หรือปิดแท็บด้วย {alt}+คลิกเพื่อทิ้งการเปลี่ยนแปลง"
+"Unsaved changes: save first, or close again with {key} to discard" = "มีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก: บันทึกก่อน หรือปิดอีกครั้งด้วย {key} เพื่อทิ้งการเปลี่ยนแปลง"
+"Up" = "ขึ้น"
+"Update plugin" = "อัปเดตปลั๊กอิน"
+"Update" = "อัปเดต"
+"Update from main" = "อัปเดตจากเมน"
+"Update from selection" = "อัปเดตจากส่วนที่เลือก"
+"Updated {components} and {styles}" = "อัปเดต {components} และ {styles} แล้ว"
+"Updated {name}" = "อัปเดต {name} แล้ว"
+"Updating the graphics driver often helps. To use OpenGL only, start FigCraft from a Command Prompt with:" = "การอัปเดตไดรเวอร์กราฟิกมักช่วยได้ หากต้องการใช้ OpenGL เท่านั้น ให้เริ่ม FigCraft จาก Command Prompt ด้วย:"
+"Updating the graphics driver often helps. WGPU_BACKEND (vulkan, gl, metal) names another graphics API to try." = "การอัปเดตไดรเวอร์กราฟิกมักช่วยได้ WGPU_BACKEND (vulkan, gl, metal) ระบุ API กราฟิกอื่นที่ลองใช้ได้"
+"Uploads this file to a FigCraft server and keeps this tab in sync with it. You get a link to edit and a link to view." = "อัปโหลดไฟล์นี้ไปยังเซิร์ฟเวอร์ FigCraft และซิงก์แท็บนี้กับไฟล์ คุณจะได้ลิงก์แก้ไขและลิงก์ดู"
+"Uppercase" = "ตัวพิมพ์ใหญ่"
+"Use a fixed value" = "ใช้ค่าคงที่"
+"Use an expression, e.g. count + 1" = "ใช้นิพจน์ เช่น count + 1"
+"Use as mask" = "ใช้เป็นมาสก์"
+"Use auto layout" = "ใช้ออโต้เลย์เอาต์"
+"Use number keys for opacity" = "ใช้ปุ่มตัวเลขกำหนดความทึบ"
+"Use the .figcraft or .fig extension." = "ใช้นามสกุล .figcraft หรือ .fig"
+"Use the layer's fill" = "ใช้สีเติมของเลเยอร์"
+"Use your browser's zoom to change the interface size." = "ใช้การซูมของเบราว์เซอร์เพื่อเปลี่ยนขนาดอินเทอร์เฟซ"
+"Used in {files} · {instances}" = "ใช้ใน {files} · {instances}"
+"Username" = "ชื่อผู้ใช้"
+"Value" = "ค่า"
+"Uses variables: each layer shows them in its own mode" = "ใช้ตัวแปร: แต่ละเลเยอร์แสดงตัวแปรตามโหมดของตัวเอง"
+"Variable" = "ตัวแปร"
+"Variable collections" = "คอลเลกชันตัวแปร"
+"Variable modes" = "โหมดตัวแปร"
+"Variable width" = "ความกว้างแปรผัน"
+"Variables" = "ตัวแปร"
+"Variables JSON…" = "JSON ของตัวแปร…"
+"Variables store reusable values (colours, numbers, strings, booleans) with modes such as Light and Dark." = "ตัวแปรเก็บค่าที่ใช้ซ้ำได้ (สี ตัวเลข สตริง บูลีน) พร้อมโหมดเช่นสว่างและมืด"
+"Variant" = "แวเรียนต์"
+"Vector" = "เวกเตอร์"
+"Vectors" = "เวกเตอร์"
+"Version" = "เวอร์ชัน"
+"Version history" = "ประวัติเวอร์ชัน"
+"Version {version}" = "เวอร์ชัน {version}"
+"Version {v} · {components} · {styles} · {variables}" = "เวอร์ชัน {v} · {components} · {styles} · {variables}"
+"Vertical" = "แนวตั้ง"
+"Vertical align" = "จัดแนวตั้ง"
+"Vertical hex" = "หกเหลี่ยมแนวตั้ง"
+"Vertical padding" = "ระยะขอบในแนวตั้ง"
+"Vertical spacing" = "ระยะห่างแนวตั้ง"
+"Vertical trim" = "ตัดแนวตั้ง"
+"View" = "มุมมอง"
+"View link" = "ลิงก์ดู"
+"View link copied" = "คัดลอกลิงก์ดูแล้ว"
+"View only" = "ดูอย่างเดียว"
+"View only: you see every change as it happens but can't edit. Leave to keep a copy you can edit." = "ดูอย่างเดียว: คุณเห็นทุกการเปลี่ยนแปลงทันทีแต่แก้ไขไม่ได้ ออกจากเซสชันเพื่อเก็บสำเนาที่แก้ไขได้"
+"Viewing “{name}”" = "กำลังดู “{name}”"
+"Violet" = "ม่วง"
+"Visibility" = "การแสดงผล"
+"Visible" = "แสดงอยู่"
+"Vivid" = "สดใส"
+"WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "ตั้งค่า WGPU_BACKEND ไว้และระบุ API กราฟิกที่ใช้ ยกเลิกการตั้งค่าเพื่อให้ FigCraft เลือกเอง"
+"Warm" = "อุ่น"
+"Watch" = "นาฬิกา"
+"Wavy" = "ลูกคลื่น"
+"Web" = "เว็บ"
+"Websites" = "เว็บไซต์"
+"WebSocket URL" = "URL ของ WebSocket"
+"WebSocket URL copied" = "คัดลอก URL ของ WebSocket แล้ว"
+"Wedge" = "ลิ่ม"
+"Weight" = "น้ำหนัก"
+"What changed since a saved version" = "สิ่งที่เปลี่ยนตั้งแต่เวอร์ชันที่บันทึก"
+"What you try here changes this preview and the code below, not the file" = "สิ่งที่คุณลองที่นี่เปลี่ยนเฉพาะตัวอย่างนี้และโค้ดด้านล่าง ไม่เปลี่ยนไฟล์"
+"What changed since it was marked ready for dev" = "สิ่งที่เปลี่ยนตั้งแต่ทำเครื่องหมายว่าพร้อมสำหรับนักพัฒนา"
+"What is wrong with this file? The server's operator gets your report." = "ไฟล์นี้มีปัญหาอะไร ผู้ดูแลเซิร์ฟเวอร์จะได้รับรายงานของคุณ"
+"What it's for" = "ใช้ทำอะไร"
+"What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "ไม่ทราบว่าเปลี่ยนมาจากอะไร: เปลี่ยนก่อนที่ FigCraft จะเก็บสำเนาของเฟรมที่พร้อมสำหรับนักพัฒนา แก้ไขการเปลี่ยนแปลง (หรือทำเครื่องหมายว่าพร้อมอีกครั้ง) เพื่อเริ่มเปรียบเทียบจากตอนนี้"
+"When marked ready" = "ตอนทำเครื่องหมายว่าพร้อม"
+"While hovering" = "ขณะวางเมาส์"
+"While pressing" = "ขณะกด"
+"White" = "ขาว"
+"Who runs it, its terms and how long it keeps files" = "ใครเป็นผู้ดูแล ข้อกำหนด และระยะเวลาที่เก็บไฟล์"
+"Why it changed" = "เหตุผลที่เปลี่ยน"
+"Widget" = "วิดเจ็ต"
+"Widgets" = "วิดเจ็ต"
+"Width" = "ความกว้าง"
+"Width point" = "จุดความกว้าง"
+"Width profile" = "โปรไฟล์ความกว้าง"
+"Wireframe kit" = "ชุดไวร์เฟรม"
+"With the layers' export settings" = "ด้วยการตั้งค่าส่งออกของเลเยอร์"
+"Wrap" = "ตัดบรรทัด"
+"Wrap in new section" = "ห่อด้วยเซกชันใหม่"
+"Yellow" = "เหลือง"
+"Yesterday" = "เมื่อวาน"
+"You" = "คุณ"
+"You'll get the shared file as a new tab and edit it together." = "คุณจะได้ไฟล์ที่แชร์เป็นแท็บใหม่และแก้ไขร่วมกันได้"
+"You're spotlighting: everyone follows your view" = "คุณกำลังส่องไฟ: ทุกคนติดตามมุมมองของคุณ"
+"Your copy of the file stays open" = "สำเนาไฟล์ของคุณยังเปิดอยู่"
+"Your copy stays open; the file stays on the server" = "สำเนาของคุณยังเปิดอยู่ ไฟล์ยังอยู่บนเซิร์ฟเวอร์"
+"Your name" = "ชื่อของคุณ"
+"Your name in comments" = "ชื่อของคุณในความคิดเห็น"
+"Your system asks for reduced motion: animations stay off." = "ระบบของคุณขอให้ลดการเคลื่อนไหว: แอนิเมชันจะปิดอยู่"
+"Z" = "Z"
+"Z to A" = "Z ถึง A"
+"Zoom" = "ซูม"
+"Zoom around the pointer" = "ซูมรอบตัวชี้"
+"Zoom device to fill window" = "ซูมอุปกรณ์ให้เต็มหน้าต่าง"
+"Zoom in" = "ซูมเข้า"
+"Zoom out" = "ซูมออก"
+"Zoom to 100%" = "ซูมเป็น 100%"
+"Zoom to 200%" = "ซูมเป็น 200%"
+"Zoom to 50%" = "ซูมเป็น 50%"
+"Zoom to fit" = "ซูมให้พอดี"
+"Zoom to selection" = "ซูมไปที่ส่วนที่เลือก"
+"Zoom tool: click to zoom in, drag an area" = "เครื่องมือซูม: คลิกเพื่อซูมเข้า ลากเป็นพื้นที่"
+"Zoom tool: zoom out" = "เครื่องมือซูม: ซูมออก"
+"and {n} more" = { other = "และอีก {n} รายการ" }
+"bleed marks" = "เครื่องหมายตัดตก"
+"by {author}" = "โดย {author}"
+"call any command its access allows" = "เรียกใช้คำสั่งใดก็ได้ที่สิทธิ์อนุญาต"
+"call only: {commands}" = "เรียกใช้ได้เฉพาะ: {commands}"
+"can edit the document" = "แก้ไขเอกสารได้"
+"conditional prototype actions nested too deeply were skipped" = "ข้ามการกระทำโปรโตไทป์แบบมีเงื่อนไขที่ซ้อนลึกเกินไป"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "ข้ามการกระทำโปรโตไทป์แบบมีเงื่อนไขที่ประเมินเงื่อนไขไม่ได้"
+"connector label background was skipped: style data is missing" = "ข้ามพื้นหลังป้ายตัวเชื่อม: ไม่มีข้อมูลสไตล์"
+"connector label was skipped: background bounds are invalid" = "ข้ามป้ายตัวเชื่อม: ขอบเขตพื้นหลังไม่ถูกต้อง"
+"connector label was skipped: background transform is invalid" = "ข้ามป้ายตัวเชื่อม: การแปลงพื้นหลังไม่ถูกต้อง"
+"connector label was skipped: composed text transform is invalid" = "ข้ามป้ายตัวเชื่อม: การแปลงข้อความที่ประกอบไม่ถูกต้อง"
+"connector label was skipped: derived background bounds are missing" = "ข้ามป้ายตัวเชื่อม: ไม่มีขอบเขตพื้นหลังที่คำนวณได้"
+"connector label was skipped: derived text bounds are missing" = "ข้ามป้ายตัวเชื่อม: ไม่มีขอบเขตข้อความที่คำนวณได้"
+"connector label was skipped: text bounds are invalid" = "ข้ามป้ายตัวเชื่อม: ขอบเขตข้อความไม่ถูกต้อง"
+"connector label was skipped: text style data is missing" = "ข้ามป้ายตัวเชื่อม: ไม่มีข้อมูลสไตล์ข้อความ"
+"connector label was skipped: text transform is invalid" = "ข้ามป้ายตัวเชื่อม: การแปลงข้อความไม่ถูกต้อง"
+"connector labels were skipped" = "ข้ามป้ายตัวเชื่อม"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "เลเยอร์ตัวเชื่อมนำเข้าเป็นสแนปช็อตเฟรม/เวกเตอร์แบบคงที่พร้อมป้าย (ถ้ามี) ไม่คงการผูกปลายทางแบบสด"
+"connector snapshot vector data is missing; connector was left empty" = "ไม่มีข้อมูลเวกเตอร์สแนปช็อตของตัวเชื่อม: ปล่อยตัวเชื่อมว่างไว้"
+"connectors whose ends can't be placed are empty" = "ตัวเชื่อมที่วางปลายไม่ได้จะว่างเปล่า"
+"crop marks" = "เครื่องหมายตัดตก"
+"damaged vector geometry was skipped" = "ข้ามเรขาคณิตเวกเตอร์ที่เสียหาย"
+"damaged vector networks import as outlines" = "เครือข่ายเวกเตอร์ที่เสียหายนำเข้าเป็นเค้าร่าง"
+"development: {path}" = "สำหรับพัฒนา: {path}"
+"document children other than pages were skipped" = "ข้ามส่วนย่อยของเอกสารที่ไม่ใช่หน้า"
+"duplicate grid track sizing entries use equal tracks" = "รายการขนาดแทร็กกริดที่ซ้ำกันใช้แทร็กขนาดเท่ากัน"
+"e.g. count + 1" = "เช่น count + 1"
+"e.g. count >= 3 and not done" = "เช่น count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "ตัวเชื่อมแบบหักมุมและโค้งที่ไม่มีเส้นทางที่บันทึกไว้นำเข้าเป็นเส้นตรง"
+"entries without a node type were skipped" = "ข้ามรายการที่ไม่มีชนิดโหนด"
+"figcraft:// links from a browser, chat or email open this app and join the session." = "ลิงก์ figcraft:// จากเบราว์เซอร์ แชต หรืออีเมลจะเปิดแอปนี้และเข้าร่วมเซสชัน"
+"filled areas of a vector with their own fill use the layer's fill" = "พื้นที่เติมสีของเวกเตอร์ที่มีสีเติมของตัวเองใช้สีเติมของเลเยอร์"
+"from {server}" = "จาก {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "ข้ามทริกเกอร์จอยเกมที่ไม่ได้ระบุปุ่มควบคุมที่รู้จักเพียงปุ่มเดียว"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "รายการแทร็กกริดเกิน 1000 รายการ: แทร็กใช้ขนาดเท่ากันตามค่าเริ่มต้น"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "ไม่รองรับหรือรูปแบบขนาดแทร็กกริดผิด: แทร็กที่ได้รับผลกระทบใช้ขนาดเท่ากัน"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "รายการขนาดแทร็กกริดเกิน 1000 รายการ: แทร็กใช้ขนาดเท่ากันตามค่าเริ่มต้น"
+"hidden" = "ซ่อนอยู่"
+"iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "ตัวกรองรูปภาพกำกวมเพราะมีคอนเทนเนอร์ตัวกรองทั้งสองแบบ: ข้ามการแปลงตัวกรอง"
+"image filters use FigCraft's approximate renderer" = "ตัวกรองรูปภาพใช้ตัวเรนเดอร์โดยประมาณของ FigCraft"
+"instance swap properties whose default component isn't in the file were skipped" = "ข้ามพร็อพเพอร์ตีสลับอินสแตนซ์ที่คอมโพเนนต์เริ่มต้นไม่อยู่ในไฟล์"
+"instances inside their own main component were imported as frames" = "อินสแตนซ์ภายในคอมโพเนนต์หลักของตัวเองนำเข้าเป็นเฟรม"
+"instances of components that aren't in the file show no layers" = "อินสแตนซ์ของคอมโพเนนต์ที่ไม่อยู่ในไฟล์ไม่แสดงเลเยอร์"
+"instances of components that aren't in the file were imported as frames" = "อินสแตนซ์ของคอมโพเนนต์ที่ไม่อยู่ในไฟล์นำเข้าเป็นเฟรม"
+"instances that would nest a component inside itself were imported as frames" = "อินสแตนซ์ที่จะซ้อนคอมโพเนนต์ไว้ในตัวเองนำเข้าเป็นเฟรม"
+"instances without a main component were imported as empty frames" = "อินสแตนซ์ที่ไม่มีคอมโพเนนต์หลักนำเข้าเป็นเฟรมว่าง"
+"invalid internal .fig text path data was ignored" = "ละเว้นข้อมูลเส้นทางข้อความภายในของ .fig ที่ไม่ถูกต้อง"
+"invalid or oversized vector networks import as outlines" = "เครือข่ายเวกเตอร์ที่ไม่ถูกต้องหรือใหญ่เกินนำเข้าเป็นเค้าร่าง"
+"invalid or oversized vector path data was skipped" = "ข้ามข้อมูลเส้นทางเวกเตอร์ที่ไม่ถูกต้องหรือใหญ่เกิน"
+"just now" = "เมื่อสักครู่"
+"key triggers without a supported key were skipped" = "ข้ามทริกเกอร์ปุ่มที่ไม่มีปุ่มที่รองรับ"
+"key up triggers import as key presses" = "ทริกเกอร์ปล่อยปุ่มนำเข้าเป็นการกดปุ่ม"
+"layers without a position were placed at their parent's origin" = "เลเยอร์ที่ไม่มีตำแหน่งถูกวางที่จุดกำเนิดของตัวแม่"
+"layers without a type were skipped" = "ข้ามเลเยอร์ที่ไม่มีชนิด"
+"legacy image filter container is unsupported; filter conversion was skipped" = "ไม่รองรับคอนเทนเนอร์ตัวกรองรูปภาพแบบเก่า: ข้ามการแปลงตัวกรอง"
+"locked" = "ล็อกอยู่"
+"malformed image filters container was skipped" = "ข้ามคอนเทนเนอร์ตัวกรองรูปภาพที่รูปแบบผิด"
+"malformed image paintFilter container was skipped" = "ข้ามคอนเทนเนอร์ paintFilter ของรูปภาพที่รูปแบบผิด"
+"malformed slot content assignment was skipped" = "ข้ามการกำหนดเนื้อหาสล็อตที่รูปแบบผิด"
+"no bleed" = "ไม่มีระยะตัดตก"
+"nobody else here yet" = "ยังไม่มีคนอื่นอยู่ที่นี่"
+"non-default slot settings are not represented and were skipped" = "ไม่รองรับการตั้งค่าสล็อตที่ไม่ใช่ค่าเริ่มต้นและข้ามไป"
+"now" = "ตอนนี้"
+"only in a text style or variable" = "เฉพาะในสไตล์ข้อความหรือตัวแปร"
+"or" = "หรือ"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "คงรอยต่อเส้นขอบของจุดไว้: เส้นประหรือเส้นขอบความกว้างแปรผันแสดงด้วยรอยต่อของเลเยอร์"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "ข้ามคีย์คอมโพเนนต์สล็อตที่ต้องการซึ่งแปลงเป็นโหนดของไฟล์ไม่ได้"
+"prototype actions of unknown types were skipped" = "ข้ามการกระทำโปรโตไทป์ที่ไม่ทราบชนิด"
+"prototype actions without a destination in the file were skipped" = "ข้ามการกระทำโปรโตไทป์ที่ไม่มีปลายทางในไฟล์"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "ข้ามนิพจน์โปรโตไทป์ของตัวแปรที่ไม่อยู่ใน JSON ของตัวแปร"
+"prototype expressions with unsupported functions were skipped" = "ข้ามนิพจน์โปรโตไทป์ที่ใช้ฟังก์ชันที่ไม่รองรับ"
+"prototype interactions without supported actions were skipped" = "ข้ามอินเทอร์แอกชันโปรโตไทป์ที่ไม่มีการกระทำที่รองรับ"
+"prototype navigations of unknown types were skipped" = "ข้ามการนำทางโปรโตไทป์ที่ไม่ทราบชนิด"
+"prototype transitions of unknown types play instantly" = "การเปลี่ยนฉากโปรโตไทป์ที่ไม่ทราบชนิดจะเล่นทันที"
+"prototype triggers of unknown types were skipped" = "ข้ามทริกเกอร์โปรโตไทป์ที่ไม่ทราบชนิด"
+"put a widget on the canvas" = "วางวิดเจ็ตบนแคนวาส"
+"read and edit the document" = "อ่านและแก้ไขเอกสาร"
+"read the document" = "อ่านเอกสาร"
+"reads the document" = "อ่านเอกสาร"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "ข้ามการกระทำตั้งค่าตัวแปรของตัวแปรที่ไม่อยู่ใน JSON ของตัวแปร"
+"set-variable actions with values that can't be evaluated were skipped" = "ข้ามการกระทำตั้งค่าตัวแปรที่ประเมินค่าไม่ได้"
+"set-variable actions with values that don't fit the variable were skipped" = "ข้ามการกระทำตั้งค่าตัวแปรที่ค่าไม่เหมาะกับตัวแปร"
+"set-variable actions without a value were skipped" = "ข้ามการกระทำตั้งค่าตัวแปรที่ไม่มีค่า"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "ข้ามการกระทำตั้งโหมดตัวแปรของคอลเลกชันหรือโหมดที่ไม่อยู่ใน JSON ของตัวแปร"
+"slot content assignment target is missing or is not slot content" = "เป้าหมายการกำหนดเนื้อหาสล็อตหายไปหรือไม่ใช่เนื้อหาสล็อต"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "การกำหนดเนื้อหาสล็อตใช้ค่า GUID ว่างและข้ามไป"
+"slot layers without a matching slot property were imported as frames" = "เลเยอร์สล็อตที่ไม่มีพร็อพเพอร์ตีสล็อตที่ตรงกันนำเข้าเป็นเฟรม"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "จุดเวกเตอร์บางจุดอ้างถึงการตั้งค่าจุดที่ไม่อยู่ในไฟล์: ใช้รอยต่อของเลเยอร์และมุมธรรมดา"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "ส่วนเวกเตอร์บางส่วนอ้างถึงการตั้งค่าสไตล์ที่ไม่อยู่ในไฟล์: ใช้เส้นขอบของเลเยอร์"
+"stale or invalid grid track sizing entries were ignored" = "ละเว้นรายการขนาดแทร็กกริดที่ล้าสมัยหรือไม่ถูกต้อง"
+"stars and polygons without point counts or geometry use the default point count" = "ดาวและรูปหลายเหลี่ยมที่ไม่มีจำนวนจุดหรือเรขาคณิตใช้จำนวนจุดเริ่มต้น"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "ไม่รองรับการตั้งค่าสไตล์ของส่วนเวกเตอร์บางส่วน: ส่วนเหล่านั้นใช้เส้นขอบของเลเยอร์"
+"text path underline or strikethrough decoration is not rendered" = "ไม่แสดงการขีดเส้นใต้หรือขีดฆ่าของข้อความบนเส้นทาง"
+"text style overrides refer to missing table entries" = "การเขียนทับสไตล์ข้อความอ้างถึงรายการในตารางที่ไม่มี"
+"the file has no pages" = "ไฟล์ไม่มีหน้า"
+"the plugin" = "ปลั๊กอิน"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "JSON ของตัวแปรไม่มี `variableCollections` (คาดว่าเป็นผลตอบกลับของตัวแปรในเครื่อง) และถูกละเว้น"
+"this session only" = "เฉพาะเซสชันนี้"
+"unknown component property types were skipped" = "ข้ามพร็อพเพอร์ตีคอมโพเนนต์ที่ไม่ทราบชนิด"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "ข้ามนามแฝงตัวแปรที่ชี้ไปยังตัวแปรที่ไม่อยู่ใน JSON ของตัวแปร (หรือเป็นชนิดอื่น)"
+"variable bindings to properties the layer doesn't have were skipped" = "ข้ามการผูกตัวแปรกับพร็อพเพอร์ตีที่เลเยอร์ไม่มี"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "ข้ามการผูกตัวแปรกับตัวแปรที่ไม่อยู่ใน JSON ของตัวแปร (ตัวแปรไลบรารี)"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "ข้ามการผูกตัวแปร: JSON ของไฟล์ไม่มีคำนิยามตัวแปร (ส่ง JSON ของตัวแปรในเครื่องเป็น `variables` หรือฝัง `meta` ไว้ข้าง JSON ของไฟล์)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "ข้ามการผูกตัวแปรที่ชนิดตัวแปรไม่เหมาะกับพร็อพเพอร์ตี"
+"variable collections without modes were skipped" = "ข้ามคอลเลกชันตัวแปรที่ไม่มีโหมด"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "ข้ามการค้นหาโหมดตัวแปรในนิพจน์โปรโตไทป์ที่ไม่ใช่ตัวแปรกับหนึ่งในโหมดของมัน"
+"variable modes of collections that aren't in the file were skipped" = "ข้ามโหมดตัวแปรของคอลเลกชันที่ไม่อยู่ในไฟล์"
+"variable modes of collections that aren't in the variables JSON were skipped" = "ข้ามโหมดตัวแปรของคอลเลกชันที่ไม่อยู่ใน JSON ของตัวแปร"
+"variable values that don't match their type (or composed colours) were skipped" = "ข้ามค่าตัวแปรที่ไม่ตรงกับชนิด (หรือสีแบบประกอบ)"
+"variables of unknown types were skipped" = "ข้ามตัวแปรที่ไม่ทราบชนิด"
+"variables whose collection isn't in the variables JSON were skipped" = "ข้ามตัวแปรที่คอลเลกชันไม่อยู่ใน JSON ของตัวแปร"
+"variables without readable values were skipped" = "ข้ามตัวแปรที่ไม่มีค่าที่อ่านได้"
+"vector points with unknown stroke joins use the layer join" = "จุดเวกเตอร์ที่มีรอยต่อเส้นขอบที่ไม่ทราบชนิดใช้รอยต่อของเลเยอร์"
+"vectors without geometry are empty" = "เวกเตอร์ที่ไม่มีเรขาคณิตจะว่างเปล่า"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "เวกเตอร์ที่ไม่มีเรขาคณิตจะว่างเปล่า (ส่งออก JSON ของไฟล์ด้วย geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "ข้อความที่ยาวมากถูกตัดเหลือ 1,048,576 ตัวอักษร"
+"very long vector paths were skipped" = "ข้ามเส้นทางเวกเตอร์ที่ยาวมาก"
+"video actions are not supported and were skipped" = "ไม่รองรับการกระทำวิดีโอและข้ามไป"
+"video triggers are not supported and were skipped" = "ไม่รองรับทริกเกอร์วิดีโอและข้ามไป"
+"yesterday" = "เมื่อวาน"
+"{instances} in {files}" = "{instances} ใน {files}"
+"{language}: draft translation, waiting for a native speaker's review." = "{language}: คำแปลฉบับร่าง รอเจ้าของภาษาตรวจทาน"
+"{length} bleed" = "ระยะตัดตก {length}"
+"{month} {day}, {year}" = "{day} {month} {year}"
+"{name} cleared from the list" = "ล้าง {name} ออกจากรายการแล้ว"
+"{name} is forgotten on this computer; the file stays on {server}" = "ลืม {name} ในคอมพิวเตอร์เครื่องนี้แล้ว ไฟล์ยังอยู่บน {server}"
+"{name} is on the server." = "{name} อยู่บนเซิร์ฟเวอร์"
+"{name} is spotlighting" = "{name} กำลังส่องไฟ"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} ใหญ่เกินกว่าจะเปิดในเบราว์เซอร์ (เกิน 512 MB)"
+"{name}\nClick to apply to the selection" = "{name}\nคลิกเพื่อใช้กับส่วนที่เลือก"
+"{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nลากไปวางบนแคนวาส หรือคลิกเพื่อวางกลางมุมมอง\nกด Alt (Option) ค้างไว้ขณะวางบนอินสแตนซ์เพื่อสลับ"
+"{name} (from {library})" = "{name} (จาก {library})"
+"{name} (you)" = "{name} (คุณ)"
+"{name} ({layers} layers)" = "{name} ({layers} เลเยอร์)"
+"{name} ({tag}): {min} – {max}, default {default}. Double-click the slider to go back to the style's value; Escape while dragging cancels." = "{name} ({tag}): {min} – {max} ค่าเริ่มต้น {default} ดับเบิลคลิกแถบเลื่อนเพื่อกลับไปใช้ค่าของสไตล์ กด Escape ขณะลากเพื่อยกเลิก"
+"{name} from {path}" = "{name} จาก {path}"
+"{name} was removed from the server" = "นำ {name} ออกจากเซิร์ฟเวอร์แล้ว"
+"{name} · deleted on main" = "{name} · ลบบนเมน"
+"{name} · deleted on the branch" = "{name} · ลบบนแบรนช์"
+"{name} · not published" = "{name} · ยังไม่เผยแพร่"
+"{name} · on a server" = "{name} · อยู่บนเซิร์ฟเวอร์"
+"{name} · published version {v}" = "{name} · เผยแพร่เวอร์ชัน {v}"
+"{name} · version {v} on the server" = "{name} · เวอร์ชัน {v} บนเซิร์ฟเวอร์"
+"{name}, in a live session" = "{name} อยู่ในเซสชันสด"
+"{name}, online, open only to you" = "{name} ออนไลน์ เปิดได้เฉพาะคุณ"
+"{name}, {kind}, {w} by {h}, selected" = "{name} {kind} {w} คูณ {h} เลือกอยู่"
+"{n} added" = { other = "เพิ่ม {n} รายการ" }
+"{n} autosave versions" = { other = "เวอร์ชันบันทึกอัตโนมัติ {n} รายการ" }
+"{n} changed" = { other = "เปลี่ยน {n} รายการ" }
+"{n} columns" = { other = "{n} คอลัมน์" }
+"{n} components" = { other = "{n} คอมโพเนนต์" }
+"{n} components and styles have newer versions" = { other = "คอมโพเนนต์และสไตล์ {n} รายการมีเวอร์ชันใหม่กว่า" }
+"{n} conflicts to resolve" = { other = "มี {n} ความขัดแย้งที่ต้องแก้ไข" }
+"{n} days ago" = { other = "{n} วันที่แล้ว" }
+"{n} files" = { other = "{n} ไฟล์" }
+"{n} hours ago" = { other = "{n} ชั่วโมงที่แล้ว" }
+"{n} instances" = { other = "{n} อินสแตนซ์" }
+"{n} layers" = { other = "{n} เลเยอร์" }
+"{n} layers as one file" = { other = "{n} เลเยอร์เป็นไฟล์เดียว" }
+"{n} layers selected" = { other = "เลือก {n} เลเยอร์" }
+"{n} layers · {parts}" = { other = "{n} เลเยอร์ · {parts}" }
+"{n} matches" = { other = "พบ {n} รายการ" }
+"{n} minutes ago" = { other = "{n} นาทีที่แล้ว" }
+"{n} months ago" = { other = "{n} เดือนที่แล้ว" }
+"{n} more notes omitted from this report" = { other = "ละเว้นหมายเหตุอีก {n} รายการจากรายงานนี้" }
+"{n} of {total}" = "{n} จาก {total}"
+"{n} people joined" = { other = "มีผู้เข้าร่วม {n} คน" }
+"{n} preferred components" = { other = "{n} คอมโพเนนต์ที่ต้องการ" }
+"{n} ready" = { other = "พร้อม {n} รายการ" }
+"{n} removed" = { other = "นำออก {n} รายการ" }
+"{n} replies" = { other = "{n} การตอบกลับ" }
+"{n} rows" = { other = "{n} แถว" }
+"{n} styles" = { other = "{n} สไตล์" }
+"{n} text layers" = { other = "{n} เลเยอร์ข้อความ" }
+"{n} variables" = { other = "{n} ตัวแปร" }
+"{n} weeks ago" = { other = "{n} สัปดาห์ที่แล้ว" }
+"{n} years ago" = { other = "{n} ปีที่แล้ว" }
+"{n}d" = "{n} วัน"
+"{n}h" = "{n} ชม."
+"{n}m" = "{n} นาที"
+"{n}w" = "{n} สัปดาห์"
+"{page}, nothing selected" = "{page} ไม่ได้เลือกอะไร"
+"{percent}%" = "{percent}%"
+"{profile} (current)" = "{profile} (ปัจจุบัน)"
+"{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} คือค่าของมัน; {property ? \"a\" : \"b\"} เลือกสตริง {…} อื่นคงไว้ตามที่เขียน"
+"{server} can't say what became of your files (it is older than this app)." = "{server} บอกไม่ได้ว่าไฟล์ของคุณเป็นอย่างไร (เซิร์ฟเวอร์เก่ากว่าแอปนี้)"
+"{server} · No longer on the server" = "{server} · ไม่อยู่บนเซิร์ฟเวอร์แล้ว"
+"{server} · {shared} · Opened {date}" = "{server} · {shared} · เปิดเมื่อ {date}"
+"{tool}  hold {key}" = "{tool}  กด {key} ค้างไว้"
+"{value} isn't a colour" = "{value} ไม่ใช่สี"
+"{when} · edited" = "{when} · แก้ไขแล้ว"
+"← ↑ → ↓" = "← ↑ → ↓"
+"← → ↑ ↓" = "← → ↑ ↓"
+"←" = "←"
+"→, Space or N" = "→, Space หรือ N"
+"↵" = "↵"
+"⇥ / ⇧⇥" = "⇥ / ⇧⇥"
+"⌘ arrows" = "⌘ ลูกศร"
+"⌘ click" = "⌘ คลิก"
+"⌘ scroll" = "⌘ เลื่อน"
+"⌥ drag" = "⌥ ลาก"
+
+[commands]
+"align.bottom" = "จัดแนวชิดล่าง"
+"align.hcenter" = "จัดแนวกึ่งกลางแนวนอน"
+"align.left" = "จัดแนวชิดซ้าย"
+"align.right" = "จัดแนวชิดขวา"
+"align.top" = "จัดแนวชิดบน"
+"align.vcenter" = "จัดแนวกึ่งกลางแนวตั้ง"
+"annotation.add" = "เพิ่มหมายเหตุ"
+"annotation.addCategory" = "เพิ่มหมวดหมู่หมายเหตุ"
+"annotation.categories" = "หมวดหมู่หมายเหตุ"
+"annotation.edit" = "แก้ไขหมายเหตุ"
+"annotation.editCategory" = "แก้ไขหมวดหมู่หมายเหตุ"
+"annotation.list" = "แสดงรายการหมายเหตุ"
+"annotation.remove" = "นำหมายเหตุออก"
+"annotation.removeCategory" = "ลบหมวดหมู่หมายเหตุ"
+"app.actions" = "การกระทำ"
+"app.preferences" = "การตั้งค่า"
+"arrange.back" = "ส่งไปไว้หลังสุด"
+"arrange.backward" = "ส่งไปข้างหลัง"
+"arrange.forward" = "นำมาข้างหน้า"
+"arrange.front" = "นำไปไว้หน้าสุด"
+"arrange.packH" = "อัดแนวนอน"
+"arrange.packV" = "อัดแนวตั้ง"
+"arrange.roundToPixels" = "ปัดเป็นพิกเซล"
+"arrange.spacing" = "ระยะห่าง"
+"arrange.tidy" = "จัดระเบียบ"
+"board.connector" = "ตัวเชื่อม"
+"board.ink" = "เส้นปากกามาร์กเกอร์"
+"board.label" = "ป้ายตัวเชื่อม"
+"board.nextSticky" = "โน้ตติดหนึบถัดไป"
+"board.setColor" = "สีบอร์ด"
+"board.setStyle" = "สไตล์บอร์ด"
+"board.shape" = "รูปร่างพร้อมข้อความ"
+"board.stamp" = "แสตมป์"
+"board.sticky" = "โน้ตติดหนึบ"
+"bool.exclude" = "ยกเว้นส่วนที่เลือก"
+"bool.flatten" = "รวมบูลีนเป็นชั้นเดียว"
+"bool.intersect" = "ตัดกันส่วนที่เลือก"
+"bool.subtract" = "หักออกส่วนที่เลือก"
+"bool.union" = "รวมส่วนที่เลือก"
+"branch.archive" = "เก็บถาวรแบรนช์"
+"branch.create" = "สร้างแบรนช์"
+"branch.list" = "แสดงรายการแบรนช์"
+"branch.merge" = "รวมแบรนช์"
+"branch.open" = "เปิดแบรนช์"
+"branch.review" = "ตรวจทานแบรนช์"
+"branch.updateFromMain" = "อัปเดตจากเมน"
+"codeConnect.export" = "ส่งออกการเชื่อมต่อโค้ด"
+"codeConnect.import" = "นำเข้าการเชื่อมต่อโค้ด"
+"codeConnect.remove" = "ตัดการเชื่อมต่อจากโค้ด"
+"codeConnect.set" = "เชื่อมต่อกับโค้ด"
+"collab.cursor" = "แสดงเคอร์เซอร์ที่"
+"collab.cursorChat" = "แชตที่เคอร์เซอร์"
+"collab.diff" = "แสดงการเปลี่ยนแปลงที่ซิงก์"
+"collab.files" = "ไฟล์ออนไลน์ของคุณ"
+"collab.follow" = "ติดตาม"
+"collab.forgetFile" = "ลืมไฟล์ออนไลน์"
+"collab.host" = "เริ่มเซสชันสด"
+"collab.join" = "เข้าร่วมเซสชันสด"
+"collab.leave" = "ออกจากเซสชันสด"
+"collab.manageFile" = "จัดการไฟล์ที่เผยแพร่"
+"collab.openFile" = "เปิดไฟล์ออนไลน์"
+"collab.peers" = "ผู้ที่อยู่ในไฟล์นี้"
+"collab.publish" = "เผยแพร่ไปยังเซิร์ฟเวอร์"
+"collab.recoverFile" = "กู้คืนไฟล์ออนไลน์"
+"collab.registerLinks" = "เปิดลิงก์เชิญใน FigCraft"
+"collab.removePerson" = "นำออกจากเซสชัน"
+"collab.report" = "รายงานไฟล์ถึงผู้ดูแลเซิร์ฟเวอร์"
+"collab.serverInfo" = "ข้อมูลเซิร์ฟเวอร์"
+"collab.share" = "แชร์ด้วยรหัสเข้าร่วม"
+"collab.spotlight" = "ส่องไฟมาที่ฉัน"
+"collab.stop" = "หยุดเซสชันสด"
+"command.batch" = "รันหลายคำสั่ง"
+"comment.add" = "เพิ่มความคิดเห็น"
+"comment.delete" = "ลบความคิดเห็น"
+"comment.edit" = "แก้ไขความคิดเห็น"
+"comment.link" = "คัดลอกลิงก์ไปยังความคิดเห็น"
+"comment.list" = "แสดงรายการความคิดเห็น"
+"comment.markRead" = "ทำเครื่องหมายความคิดเห็นว่าอ่านแล้ว"
+"comment.move" = "ย้ายความคิดเห็น"
+"comment.next" = "ความคิดเห็นถัดไป"
+"comment.open" = "เปิดความคิดเห็น"
+"comment.people" = "ผู้ที่อยู่ในความคิดเห็น"
+"comment.react" = "แสดงปฏิกิริยาต่อความคิดเห็น"
+"comment.reply" = "ตอบกลับความคิดเห็น"
+"comment.resolve" = "ทำเครื่องหมายความคิดเห็นว่าแก้ไขแล้ว"
+"comment.zoom" = "ซูมไปที่ความคิดเห็น"
+"component.addProperty" = "เพิ่มพร็อพเพอร์ตีของคอมโพเนนต์"
+"component.addVariant" = "เพิ่มแวเรียนต์"
+"component.bindProperty" = "ผูกเลเยอร์กับพร็อพเพอร์ตี"
+"component.combineVariants" = "รวมเป็นแวเรียนต์"
+"component.create" = "สร้างคอมโพเนนต์"
+"component.createMultiple" = "สร้างหลายคอมโพเนนต์"
+"component.deleteProperty" = "ลบพร็อพเพอร์ตีของคอมโพเนนต์"
+"component.detach" = "ถอดอินสแตนซ์"
+"component.editProperty" = "แก้ไขพร็อพเพอร์ตีของคอมโพเนนต์"
+"component.exposeInstance" = "เปิดเผยอินสแตนซ์ซ้อน"
+"component.goToMain" = "ไปที่คอมโพเนนต์หลัก"
+"component.hideWhenPublishing" = "ซ่อนเมื่อเผยแพร่"
+"component.list" = "แสดงรายการคอมโพเนนต์"
+"component.makeSlot" = "สร้างสล็อต"
+"component.playground" = "สนามทดลองคอมโพเนนต์"
+"component.properties" = "พร็อพเพอร์ตีของคอมโพเนนต์"
+"component.pushChanges" = "ส่งการเปลี่ยนแปลงไปยังคอมโพเนนต์หลัก"
+"component.removeSlot" = "นำสล็อตออก"
+"component.resetInstance" = "รีเซ็ตการเปลี่ยนแปลงทั้งหมด"
+"component.resetOverride" = "รีเซ็ตการเขียนทับ"
+"component.restoreMain" = "กู้คืนคอมโพเนนต์หลัก"
+"dev.compare" = "เปรียบเทียบการเปลี่ยนแปลง"
+"dev.focus" = "มุมมองโฟกัส"
+"dev.resolveChange" = "แก้ไขการเปลี่ยนแปลง"
+"dev.unfocus" = "ออกจากมุมมองโฟกัส"
+"devMode.addMeasurement" = "เพิ่มการวัด"
+"devMode.measurements" = "แสดงรายการการวัด"
+"devMode.removeMeasurement" = "นำการวัดออก"
+"devResource.add" = "เพิ่มแหล่งข้อมูลสำหรับนักพัฒนา"
+"devResource.edit" = "แก้ไขแหล่งข้อมูลสำหรับนักพัฒนา"
+"devResource.list" = "แสดงรายการแหล่งข้อมูลสำหรับนักพัฒนา"
+"devResource.remove" = "นำแหล่งข้อมูลสำหรับนักพัฒนาออก"
+"distribute.horizontal" = "กระจายระยะห่างแนวนอน"
+"distribute.vertical" = "กระจายระยะห่างแนวตั้ง"
+"doc.home" = "หน้าแรก"
+"doc.list" = "แสดงรายการเอกสาร"
+"doc.nextTab" = "แท็บถัดไป"
+"doc.previousTab" = "แท็บก่อนหน้า"
+"doc.switch" = "สลับเอกสาร"
+"edit.copy" = "คัดลอก"
+"edit.copyAsCss" = "คัดลอกเป็น CSS"
+"edit.copyAsPng" = "คัดลอกเป็น PNG"
+"edit.copyAsSvg" = "คัดลอกเป็น SVG"
+"edit.copyAsText" = "คัดลอกเป็นข้อความ"
+"edit.copyLink" = "คัดลอกลิงก์"
+"edit.copyProperties" = "คัดลอกพร็อพเพอร์ตี"
+"edit.cut" = "ตัด"
+"edit.delete" = "ลบ"
+"edit.duplicate" = "ทำสำเนา"
+"edit.findReplace" = "ค้นหาและแทนที่"
+"edit.paste" = "วาง"
+"edit.pasteDesignLayers" = "วางเลเยอร์ดีไซน์"
+"edit.pasteOver" = "วางทับส่วนที่เลือก"
+"edit.pasteProperties" = "วางพร็อพเพอร์ตี"
+"edit.pasteReplace" = "วางเพื่อแทนที่"
+"edit.pickColor" = "เลือกสี"
+"edit.redo" = "ทำซ้ำ"
+"edit.repeat" = "ทำคำสั่งล่าสุดซ้ำ"
+"edit.setDefaultProperties" = "ตั้งพร็อพเพอร์ตีเริ่มต้น"
+"edit.undo" = "เลิกทำ"
+"effect.add" = "เพิ่มเอฟเฟกต์"
+"effect.move" = "ย้ายเอฟเฟกต์"
+"effect.remove" = "นำเอฟเฟกต์ออก"
+"effect.set" = "ตั้งค่าเอฟเฟกต์"
+"export.add" = "เพิ่มการตั้งค่าส่งออก"
+"export.remove" = "นำการตั้งค่าส่งออกออก"
+"export.update" = "แก้ไขการตั้งค่าส่งออก"
+"file.close" = "ปิดแท็บ"
+"file.colorProfile" = "โปรไฟล์สี"
+"file.duplicate" = "ทำสำเนาไฟล์"
+"file.export" = "ส่งออก"
+"file.exportFramesPdf" = "ส่งออกเฟรมเป็น PDF"
+"file.exportLayers" = "ส่งออกเลเยอร์"
+"file.exportSvg" = "ส่งออกส่วนที่เลือกเป็น SVG"
+"file.import" = "นำเข้า"
+"file.moveTab" = "ย้ายแท็บ"
+"file.new" = "ไฟล์ดีไซน์ใหม่"
+"file.newBoard" = "บอร์ดใหม่"
+"file.newFromTemplate" = "ใหม่จากเทมเพลต"
+"file.open" = "เปิด"
+"file.openRecent" = "เปิดล่าสุด"
+"file.placeImage" = "วางรูปภาพ"
+"file.recover" = "กู้คืนไฟล์"
+"file.rename" = "เปลี่ยนชื่อไฟล์"
+"file.revert" = "คืนค่าเป็นที่บันทึกไว้"
+"file.save" = "บันทึก"
+"file.saveAs" = "บันทึกเป็น"
+"file.saveVersion" = "บันทึกลงประวัติเวอร์ชัน"
+"file.versionHistory" = "แสดงประวัติเวอร์ชัน"
+"fill.add" = "เพิ่มสีเติม"
+"fill.move" = "ย้ายสีเติม"
+"fill.pattern" = "เติมด้วยแพตเทิร์น"
+"fill.remove" = "นำสีเติมออก"
+"fill.set" = "ตั้งค่าสีเติม"
+"frame.create" = "สร้างเฟรม"
+"frame.presets" = "แสดงรายการพรีเซ็ตเฟรม"
+"frame.swapOrientation" = "สลับการวางแนว"
+"grid.add" = "เพิ่มกริดเลย์เอาต์"
+"grid.move" = "ย้ายกริดเลย์เอาต์"
+"grid.remove" = "นำกริดเลย์เอาต์ออก"
+"guide.add" = "เพิ่มเส้นไกด์"
+"guide.clear" = "นำเส้นไกด์ทั้งหมดออก"
+"guide.move" = "ย้ายเส้นไกด์"
+"guide.remove" = "นำเส้นไกด์ออก"
+"guide.select" = "เลือกเส้นไกด์"
+"help.about" = "เกี่ยวกับ FigCraft"
+"help.gettingStarted" = "เริ่มต้นใช้งาน"
+"help.page" = "หน้าช่วยเหลือ"
+"help.shortcuts" = "แป้นพิมพ์ลัด"
+"image.adjust" = "ปรับรูปภาพ"
+"image.deletePreset" = "ลบพรีเซ็ตรูปภาพ"
+"image.place" = "วางรูปภาพ"
+"image.presets" = "พรีเซ็ตรูปภาพ"
+"image.savePreset" = "บันทึกพรีเซ็ตรูปภาพ"
+"inspect.assets" = "ตรวจสอบแอสเซ็ต"
+"inspect.code" = "โค้ดของเลเยอร์"
+"inspect.componentCode" = "โค้ดของคอมโพเนนต์"
+"inspect.properties" = "ตรวจสอบพร็อพเพอร์ตี"
+"inspect.readyForDev" = "พร้อมสำหรับนักพัฒนา"
+"instance.create" = "สร้างอินสแตนซ์"
+"instance.exposed" = "อินสแตนซ์ซ้อนที่เปิดเผย"
+"instance.place" = "วางอินสแตนซ์"
+"instance.resetSlot" = "รีเซ็ตสล็อต"
+"instance.setProperties" = "ตั้งค่าพร็อพเพอร์ตีของอินสแตนซ์"
+"instance.slotInsert" = "แทรกลงในสล็อต"
+"instance.swap" = "สลับอินสแตนซ์"
+"instance.swapAt" = "สลับอินสแตนซ์ที่จุด"
+"layers.collapseAll" = "ยุบเลเยอร์"
+"layout.add" = "เพิ่มออโต้เลย์เอาต์"
+"layout.remove" = "นำออโต้เลย์เอาต์ออก"
+"layout.setTrack" = "ตั้งขนาดแทร็กกริด"
+"layout.suggest" = "แนะนำออโต้เลย์เอาต์"
+"libraries.open" = "ไลบรารี"
+"libraries.publish" = "เผยแพร่ไลบรารี…"
+"library.acceptUpdates" = "ยอมรับอัปเดตไลบรารี"
+"library.add" = "เพิ่มไลบรารี"
+"library.aliasVariable" = "ตั้งนามแฝงตัวแปรไลบรารี"
+"library.applyStyle" = "ใช้สไตล์ไลบรารี"
+"library.bindVariable" = "ผูกตัวแปรไลบรารี"
+"library.extendCollection" = "ขยายคอลเลกชันไลบรารี"
+"library.import" = "นำเข้าคอมโพเนนต์ไลบรารี"
+"library.importVariable" = "นำเข้าตัวแปรไลบรารี"
+"library.list" = "แสดงรายการไลบรารี"
+"library.place" = "วางคอมโพเนนต์ไลบรารี"
+"library.publish" = "เผยแพร่ไลบรารี"
+"library.publishToServer" = "เผยแพร่ไลบรารีไปยังเซิร์ฟเวอร์"
+"library.remove" = "นำไลบรารีออก"
+"library.setVariableMode" = "ตั้งโหมดตัวแปรไลบรารี"
+"library.swap" = "สลับไลบรารี"
+"library.swapAt" = "สลับอินสแตนซ์เป็นคอมโพเนนต์ไลบรารี"
+"library.updates" = "อัปเดตไลบรารี"
+"library.usage" = "การใช้งานไลบรารี"
+"measure.distances" = "วัดระยะห่าง"
+"measure.padding" = "วัดระยะขอบในของออโต้เลย์เอาต์"
+"node.create" = "สร้างเลเยอร์"
+"node.get" = "ดึงเลเยอร์"
+"node.reorder" = "เรียงลำดับเลเยอร์ใหม่"
+"node.reparent" = "ย้ายเลเยอร์เข้าไปใน"
+"node.set" = "ตั้งค่าพร็อพเพอร์ตี"
+"object.batchRename" = "เปลี่ยนชื่อเป็นชุด"
+"object.convertToFrame" = "แปลงเป็นเฟรม"
+"object.convertToGroup" = "แปลงเป็นกลุ่ม"
+"object.flipH" = "พลิกแนวนอน"
+"object.flipV" = "พลิกแนวตั้ง"
+"object.frameSelection" = "ครอบการเลือกด้วยเฟรม"
+"object.group" = "จัดกลุ่มการเลือก"
+"object.hideOthers" = "ซ่อนเลเยอร์อื่น"
+"object.mask" = "ใช้เป็นมาสก์"
+"object.moveToPage" = "ย้ายไปยังหน้า"
+"object.opacityKeys" = "ความทึบจากปุ่มตัวเลข"
+"object.rasterize" = "แรสเตอร์ส่วนที่เลือก"
+"object.releaseMask" = "ปล่อยมาสก์"
+"object.removeFill" = "นำสีเติมออก"
+"object.removeFrame" = "นำเฟรมออก"
+"object.removeStroke" = "นำเส้นขอบออก"
+"object.rename" = "เปลี่ยนชื่อ"
+"object.resizeToFit" = "ปรับขนาดให้พอดี"
+"object.rotate180" = "หมุน 180°"
+"object.rotateLeft" = "หมุน 90° ไปทางซ้าย"
+"object.rotateRight" = "หมุน 90° ไปทางขวา"
+"object.setThumbnail" = "ตั้งเป็นภาพขนาดย่อ"
+"object.swapFillStroke" = "สลับสีเติมและเส้นขอบ"
+"object.toggleLock" = "ล็อก/ปลดล็อกส่วนที่เลือก"
+"object.toggleVisible" = "แสดง/ซ่อนส่วนที่เลือก"
+"object.ungroup" = "เลิกจัดกลุ่มการเลือก"
+"object.wrapInSection" = "ห่อด้วยเซกชันใหม่"
+"page.add" = "เพิ่มหน้า"
+"page.delete" = "ลบหน้า"
+"page.duplicate" = "ทำสำเนาหน้า"
+"page.list" = "แสดงรายการหน้า"
+"page.move" = "ย้ายหน้า"
+"page.rename" = "เปลี่ยนชื่อหน้า"
+"page.select" = "ไปที่หน้า"
+"page.setBackground" = "พื้นหลังหน้า"
+"paint.documentColors" = "สีของเอกสาร"
+"plugin.close" = "ปิดแผงปลั๊กอิน"
+"plugin.directory.install" = "ติดตั้งปลั๊กอินจากไดเรกทอรี"
+"plugin.directory.list" = "เรียกดูไดเรกทอรีปลั๊กอิน"
+"plugin.directory.publish" = "เผยแพร่ปลั๊กอินไปยังไดเรกทอรี"
+"plugin.directory.unpublish" = "ยกเลิกการเผยแพร่ปลั๊กอินจากไดเรกทอรี"
+"plugin.event" = "ใช้ตัวควบคุมของแผงปลั๊กอิน"
+"plugin.import" = "นำเข้าปลั๊กอินจากไฟล์ manifest…"
+"plugin.list" = "แสดงรายการปลั๊กอิน"
+"plugin.remove" = "นำปลั๊กอินออก"
+"plugin.run" = "เรียกใช้ปลั๊กอิน"
+"plugin.ui" = "แผงปลั๊กอิน"
+"plugins.manage" = "จัดการปลั๊กอิน…"
+"plugins.runLast" = "เรียกใช้ปลั๊กอินล่าสุด"
+"pref.autoSave" = "บันทึกไฟล์อัตโนมัติ"
+"pref.highlightHover" = "ไฮไลต์เลเยอร์เมื่อวางเมาส์"
+"pref.keepTool" = "คงเครื่องมือที่เลือกไว้หลังใช้งาน"
+"pref.language" = "ภาษาของอินเทอร์เฟซ"
+"pref.nudge" = "ระยะขยับ"
+"pref.numberKeysOpacity" = "ใช้ปุ่มตัวเลขกำหนดความทึบ"
+"pref.publishServer" = "เซิร์ฟเวอร์สำหรับการแชร์ออนไลน์"
+"pref.reduceMotion" = "ลดการเคลื่อนไหว"
+"pref.renameDuplicates" = "เปลี่ยนชื่อเลเยอร์ที่ทำสำเนา"
+"pref.showDimensions" = "แสดงขนาดบนออบเจกต์"
+"pref.startOnHome" = "เริ่มที่หน้าจอหลัก"
+"pref.userName" = "ชื่อของคุณในความคิดเห็น"
+"proto.action.add" = "เพิ่มการกระทำโปรโตไทป์"
+"proto.action.move" = "เรียงลำดับการกระทำโปรโตไทป์ใหม่"
+"proto.action.remove" = "นำการกระทำโปรโตไทป์ออก"
+"proto.action.set" = "แก้ไขการกระทำโปรโตไทป์"
+"proto.closePreview" = "ปิดตัวอย่างโปรโตไทป์"
+"proto.conditional.addBlock" = "เพิ่มมิฉะนั้นถ้า / มิฉะนั้น"
+"proto.conditional.removeBlock" = "นำถ้า / มิฉะนั้นถ้า / มิฉะนั้นออก"
+"proto.conditional.setCondition" = "แก้ไขเงื่อนไข"
+"proto.evaluate" = "ประเมินนิพจน์โปรโตไทป์"
+"proto.flow.add" = "เพิ่มจุดเริ่มโฟลว์"
+"proto.flow.remove" = "นำโฟลว์ออก"
+"proto.flow.rename" = "เปลี่ยนชื่อโฟลว์"
+"proto.interaction.add" = "เพิ่มอินเทอร์แอกชัน"
+"proto.interaction.clear" = "นำอินเทอร์แอกชันทั้งหมดออก"
+"proto.interaction.remove" = "นำอินเทอร์แอกชันออก"
+"proto.interaction.set" = "แก้ไขอินเทอร์แอกชัน"
+"proto.present" = "นำเสนอ"
+"proto.presentOptions" = "ตัวเลือกการนำเสนอ"
+"proto.preview" = "เปิดตัวอย่างโปรโตไทป์"
+"proto.settings" = "การตั้งค่าโปรโตไทป์"
+"section.toggleContents" = "ซ่อน/แสดงเนื้อหาของเซกชัน"
+"select.add" = "เพิ่มลงในส่วนที่เลือก"
+"select.all" = "เลือกทั้งหมด"
+"select.area" = "เลือกพื้นที่"
+"select.byName" = "เลือกเลเยอร์ตามชื่อ"
+"select.children" = "เลือกส่วนย่อย"
+"select.inverse" = "เลือกส่วนที่เหลือ"
+"select.layersAt" = "เลเยอร์ที่จุด"
+"select.matching" = "เลือกเลเยอร์ที่ตรงกัน"
+"select.next" = "เลือกพี่น้องถัดไป"
+"select.none" = "ไม่เลือกอะไร"
+"select.parent" = "เลือกตัวแม่"
+"select.previous" = "เลือกพี่น้องก่อนหน้า"
+"select.remove" = "นำออกจากส่วนที่เลือก"
+"select.sameEffect" = "เลือกเอฟเฟกต์เดียวกัน"
+"select.sameFill" = "เลือกสีเติมเดียวกัน"
+"select.sameFont" = "เลือกฟอนต์เดียวกัน"
+"select.sameInstance" = "เลือกอินสแตนซ์เดียวกัน"
+"select.sameProperties" = "เลือกพร็อพเพอร์ตีเดียวกัน"
+"select.sameStroke" = "เลือกเส้นขอบเดียวกัน"
+"select.sameText" = "เลือกพร็อพเพอร์ตีข้อความเดียวกัน"
+"select.set" = "เลือก"
+"selection.applyColorStyle" = "ใช้สไตล์สีกับส่วนที่เลือก"
+"selection.colors" = "สีของส่วนที่เลือก"
+"selection.selectColor" = "เลือกเลเยอร์ที่มีสี"
+"selection.setPaint" = "เปลี่ยนสีของส่วนที่เลือก"
+"shape.arrow" = "ลูกศร"
+"shape.ellipse" = "วงรี"
+"shape.line" = "เส้น"
+"shape.polygon" = "รูปหลายเหลี่ยม"
+"shape.rectangle" = "สี่เหลี่ยมผืนผ้า"
+"shape.star" = "ดาว"
+"shapeBuilder.merge" = "รวมพื้นที่"
+"shapeBuilder.mode" = "โหมดตัวสร้างรูปร่าง"
+"shapeBuilder.regions" = "พื้นที่ของตัวสร้างรูปร่าง"
+"shapeBuilder.remove" = "นำพื้นที่ออก"
+"stroke.add" = "เพิ่มเส้นขอบ"
+"stroke.brush" = "แปรง"
+"stroke.move" = "ย้ายเส้นขอบ"
+"stroke.remove" = "นำเส้นขอบออก"
+"stroke.set" = "ตั้งค่าเส้นขอบ"
+"stroke.widthProfile" = "โปรไฟล์ความกว้าง"
+"style.apply" = "ใช้สไตล์"
+"style.bind" = "ผูกตัวแปรในสไตล์"
+"style.create" = "สร้างสไตล์"
+"style.delete" = "ลบสไตล์"
+"style.detach" = "ถอดสไตล์"
+"style.duplicate" = "ทำสำเนาสไตล์"
+"style.list" = "แสดงรายการสไตล์"
+"style.move" = "ย้ายสไตล์"
+"style.renameFolder" = "เปลี่ยนชื่อโฟลเดอร์สไตล์"
+"style.update" = "แก้ไขสไตล์"
+"template.list" = "แสดงรายการเทมเพลต"
+"text.alignCenter" = "จัดข้อความกึ่งกลาง"
+"text.alignJustify" = "จัดชิดสองข้าง"
+"text.alignLeft" = "จัดข้อความชิดซ้าย"
+"text.alignRight" = "จัดข้อความชิดขวา"
+"text.bold" = "ตัวหนา"
+"text.bulletList" = "รายการแบบสัญลักษณ์แสดงหัวข้อย่อย"
+"text.case" = "ตัวพิมพ์"
+"text.caseLower" = "ตัวพิมพ์เล็ก"
+"text.caseOriginal" = "ตัวพิมพ์ตามต้นฉบับ"
+"text.caseSmallCaps" = "ตัวพิมพ์ใหญ่ขนาดเล็ก"
+"text.caseTitle" = "ตัวพิมพ์ใหญ่ต้นคำ"
+"text.caseUpper" = "ตัวพิมพ์ใหญ่"
+"text.create" = "ข้อความ"
+"text.decoration" = "การตกแต่ง"
+"text.edit.begin" = "แก้ไขข้อความ"
+"text.edit.caret" = "ตั้งตำแหน่งเคอร์เซอร์"
+"text.edit.end" = "หยุดแก้ไขข้อความ"
+"text.edit.insert" = "พิมพ์ข้อความ"
+"text.edit.key" = "ปุ่มข้อความ"
+"text.edit.preedit" = "เรียบเรียงข้อความ (IME)"
+"text.edit.selectLine" = "เลือกบรรทัด"
+"text.edit.selectWord" = "เลือกคำ"
+"text.edit.selection" = "ข้อความที่เลือก"
+"text.endPreview" = "จบการดูตัวอย่างข้อความ"
+"text.fonts" = "แสดงรายการฟอนต์"
+"text.italic" = "ตัวเอียง"
+"text.lineHeightDown" = "ลดความสูงบรรทัด"
+"text.lineHeightUp" = "เพิ่มความสูงบรรทัด"
+"text.link" = "สร้างลิงก์"
+"text.listIndent" = "เยื้องรายการ"
+"text.listOutdent" = "เลิกเยื้องรายการ"
+"text.listStyle" = "สไตล์รายการ"
+"text.maxLines" = "จำนวนบรรทัดสูงสุด"
+"text.numberList" = "รายการแบบลำดับเลข"
+"text.onPath" = "ข้อความบนเส้นทาง"
+"text.paragraphIndent" = "การเยื้องย่อหน้า"
+"text.paragraphSpacing" = "ระยะห่างย่อหน้า"
+"text.pathOptions" = "ตัวเลือกข้อความบนเส้นทาง"
+"text.preview" = "ดูตัวอย่างการเปลี่ยนข้อความ"
+"text.removeFromPath" = "นำข้อความออกจากเส้นทาง"
+"text.set" = "ตั้งค่าข้อความ"
+"text.setFeatures" = "ฟีเจอร์ OpenType"
+"text.setVariations" = "แกนฟอนต์แปรผัน"
+"text.sizeDown" = "ลดขนาดฟอนต์"
+"text.sizeUp" = "เพิ่มขนาดฟอนต์"
+"text.strikethrough" = "ขีดฆ่า"
+"text.style" = "จัดสไตล์ช่วงข้อความ"
+"text.trackingDown" = "ลดระยะห่างตัวอักษร"
+"text.trackingUp" = "เพิ่มระยะห่างตัวอักษร"
+"text.underline" = "ขีดเส้นใต้"
+"text.weightDown" = "ลดน้ำหนักฟอนต์"
+"text.weightUp" = "เพิ่มน้ำหนักฟอนต์"
+"tool.arrow" = "ลูกศร"
+"tool.comment" = "ความคิดเห็น"
+"tool.connector" = "ตัวเชื่อม"
+"tool.ellipse" = "วงรี"
+"tool.eraser" = "ยางลบ"
+"tool.frame" = "เฟรม"
+"tool.hand" = "มือ"
+"tool.highlighter" = "ปากกาไฮไลต์"
+"tool.line" = "เส้น"
+"tool.marker" = "มาร์กเกอร์"
+"tool.move" = "ย้าย"
+"tool.pen" = "ปากกา"
+"tool.pencil" = "ดินสอ"
+"tool.pencilBrush" = "แปรงดินสอ"
+"tool.place" = "วางด้วยเครื่องมือ"
+"tool.polygon" = "รูปหลายเหลี่ยม"
+"tool.rectangle" = "สี่เหลี่ยมผืนผ้า"
+"tool.scale" = "สเกล"
+"tool.scaleAnchor" = "จุดยึดสเกล"
+"tool.section" = "เซกชัน"
+"tool.set" = "เลือกเครื่องมือ"
+"tool.shape" = "รูปร่าง"
+"tool.shapeBuilder" = "ตัวสร้างรูปร่าง"
+"tool.slice" = "สไลซ์"
+"tool.stamp" = "แสตมป์"
+"tool.star" = "ดาว"
+"tool.sticky" = "โน้ตติดหนึบ"
+"tool.text" = "ข้อความ"
+"transform.move" = "ย้าย"
+"transform.moveTo" = "ย้ายไปที่"
+"transform.nudge" = "ขยับเล็กน้อย"
+"transform.nudgeSize" = "ปรับขนาดด้วยการขยับ"
+"transform.resize" = "ปรับขนาด"
+"transform.rotate" = "หมุน"
+"transform.rotationOrigin" = "ย้ายจุดหมุน"
+"transform.scale" = "สเกล"
+"transform.setRotationOrigin" = "ตั้งจุดหมุน"
+"variable.addMode" = "เพิ่มโหมด"
+"variable.bind" = "ผูกตัวแปร"
+"variable.create" = "สร้างตัวแปร"
+"variable.createCollection" = "สร้างคอลเลกชันตัวแปร"
+"variable.delete" = "ลบตัวแปร"
+"variable.deleteCollection" = "ลบคอลเลกชัน"
+"variable.duplicate" = "ทำสำเนาตัวแปร"
+"variable.export" = "ส่งออกตัวแปร"
+"variable.import" = "นำเข้าตัวแปร"
+"variable.list" = "แสดงรายการตัวแปร"
+"variable.moveMode" = "ย้ายโหมด"
+"variable.removeMode" = "ลบโหมด"
+"variable.renameCollection" = "เปลี่ยนชื่อคอลเลกชัน"
+"variable.renameMode" = "เปลี่ยนชื่อโหมด"
+"variable.resetOverride" = "รีเซ็ตการเขียนทับตัวแปร"
+"variable.set" = "ตั้งค่าตัวแปร"
+"variable.setMode" = "ตั้งโหมดตัวแปร"
+"variable.update" = "แก้ไขตัวแปร"
+"vector.create" = "เวกเตอร์"
+"vector.deleteHeal" = "ลบและประสานส่วนที่เลือก"
+"vector.edit.addVertex" = "เพิ่มจุด"
+"vector.edit.begin" = "แก้ไขเวกเตอร์"
+"vector.edit.bend" = "ดัดส่วนของเส้น"
+"vector.edit.bounds" = "ขอบเขตของจุดที่เลือก"
+"vector.edit.connect" = "เชื่อมจุด"
+"vector.edit.cornerRadius" = "รัศมีมุมของจุด"
+"vector.edit.cut" = "ตัดเส้นทาง"
+"vector.edit.delete" = "ลบจุด"
+"vector.edit.end" = "แก้ไขเสร็จแล้ว"
+"vector.edit.erase" = "ลบ"
+"vector.edit.lasso" = "เลือกด้วยบ่วงบาศ"
+"vector.edit.mirroring" = "การสะท้อนแฮนเดิล"
+"vector.edit.moveHandles" = "ย้ายแฮนเดิล"
+"vector.edit.moveVertices" = "ย้ายจุด"
+"vector.edit.nudge" = "ขยับจุด"
+"vector.edit.paint" = "ถังสี"
+"vector.edit.pen" = "จุดปากกา"
+"vector.edit.penEnd" = "จบเส้นทางปากกา"
+"vector.edit.position" = "ตำแหน่งของจุด"
+"vector.edit.resize" = "ปรับขนาดจุด"
+"vector.edit.rotate" = "หมุนจุด"
+"vector.edit.select" = "เลือกจุด"
+"vector.edit.selectAll" = "เลือกจุดทั้งหมด"
+"vector.edit.setHandle" = "ตั้งค่าแฮนเดิล"
+"vector.edit.smooth" = "ทำให้จุดเรียบหรือคม"
+"vector.edit.state" = "สถานะการแก้ไขเวกเตอร์"
+"vector.edit.strokeCap" = "ปลายเส้นขอบของจุด"
+"vector.edit.strokeJoin" = "รอยต่อเส้นขอบของจุด"
+"vector.edit.tool" = "เครื่องมือแก้ไขเวกเตอร์"
+"vector.edit.transform" = "แปลงรูปทรงจุด"
+"vector.edit.widthPoint" = "จุดความกว้าง"
+"vector.fillRule" = "ตั้งกฎการเติมสี"
+"vector.flatten" = "รวมเป็นชั้นเดียว"
+"vector.join" = "เชื่อมส่วนที่เลือก"
+"vector.offset" = "เลื่อนเส้นทาง"
+"vector.outlineStroke" = "แปลงเส้นขอบเป็นเค้าร่าง"
+"vector.reverse" = "กลับทิศทางเส้นทาง"
+"vector.reverseLoop" = "กลับทิศทางวงรอบ"
+"vector.simplify" = "ทำเวกเตอร์ให้เรียบง่าย"
+"vector.smoothJoin" = "เชื่อมส่วนที่เลือกให้เรียบ"
+"version.autosave" = "เวอร์ชันบันทึกอัตโนมัติ"
+"version.delete" = "ลบเวอร์ชัน"
+"version.duplicate" = "ทำสำเนาเวอร์ชัน"
+"version.exitPreview" = "กลับไปที่เวอร์ชันปัจจุบัน"
+"version.list" = "แสดงรายการเวอร์ชัน"
+"version.preview" = "ดูเวอร์ชัน"
+"version.rename" = "เปลี่ยนชื่อเวอร์ชัน"
+"version.restore" = "กู้คืนเวอร์ชัน"
+"view.assets" = "แผงแอสเซ็ต"
+"view.comments" = "ความคิดเห็น"
+"view.contextMenu" = "แสดงเมนูบริบท"
+"view.design" = "แผงดีไซน์"
+"view.designPrototype" = "สลับระหว่างดีไซน์และโปรโตไทป์"
+"view.devMode" = "Dev Mode"
+"view.frameOutlines" = "เค้าร่างเฟรม"
+"view.get" = "ดึงมุมมอง"
+"view.layers" = "แผงเลเยอร์"
+"view.layoutGrids" = "กริดเลย์เอาต์"
+"view.leftSidebar" = "แสดง/ซ่อนแถบด้านข้างซ้าย"
+"view.maskOutlines" = "เค้าร่างมาสก์"
+"view.multiplayerCursors" = "เคอร์เซอร์หลายผู้ใช้"
+"view.nextFrame" = "ซูมไปที่เฟรมถัดไป"
+"view.nextPage" = "หน้าถัดไป"
+"view.nextRegion" = "โฟกัสพื้นที่ถัดไป"
+"view.outlines" = "เค้าร่าง"
+"view.outlinesHiddenLayers" = "รวมเลเยอร์ที่ซ่อนในเค้าร่าง"
+"view.outlinesObjectBounds" = "รวมขอบเขตออบเจกต์ในเค้าร่าง"
+"view.outlinesSelection" = "เค้าร่างของส่วนที่เลือก"
+"view.pan" = "เลื่อนมุมมอง"
+"view.panelWidths" = "รีเซ็ตความกว้างแผง"
+"view.pixelGrid" = "กริดพิกเซล"
+"view.pixelPreview" = "ตัวอย่างพิกเซล"
+"view.prevFrame" = "ซูมไปที่เฟรมก่อนหน้า"
+"view.prevPage" = "หน้าก่อนหน้า"
+"view.previousRegion" = "โฟกัสพื้นที่ก่อนหน้า"
+"view.proofSrgb" = "ซอฟต์พรูฟ sRGB"
+"view.fullscreen" = "เต็มหน้าจอ"
+"view.prototype" = "แผงโปรโตไทป์"
+"view.rulers" = "ไม้บรรทัด"
+"view.set" = "ตั้งค่ามุมมอง"
+"view.slices" = "สไลซ์"
+"view.snapGeometry" = "ยึดติดเรขาคณิต"
+"view.snapObjects" = "ยึดติดออบเจกต์"
+"view.snapPixel" = "ยึดติดกริดพิกเซล"
+"view.themeDark" = "ธีมมืด"
+"view.themeLight" = "ธีมสว่าง"
+"view.themeSystem" = "ตามธีมของระบบ"
+"view.toggleUi" = "แสดง/ซ่อน UI"
+"view.zoom100" = "ซูมเป็น 100%"
+"view.zoom200" = "ซูมเป็น 200%"
+"view.zoom50" = "ซูมเป็น 50%"
+"view.zoomAt" = "เครื่องมือซูม"
+"view.zoomFit" = "ซูมให้พอดี"
+"view.zoomIn" = "ซูมเข้า"
+"view.zoomOut" = "ซูมออก"
+"view.zoomSelection" = "ซูมไปที่ส่วนที่เลือก"
+"widget.click" = "คลิกวิดเจ็ต"
+"widget.insert" = "แทรกวิดเจ็ต"
+"widget.list" = "แสดงรายการวิดเจ็ต"
+"window.focus" = "นำหน้าต่างมาไว้ด้านหน้า"
+"window.new" = "หน้าต่างใหม่"
+
+[menu]
+"bool.exclude" = "ยกเว้น"
+"bool.flatten" = "รวมเป็นชั้นเดียว"
+"bool.intersect" = "ตัดกัน"
+"bool.subtract" = "หักออก"
+"bool.union" = "รวม"
+"file.duplicate" = "ทำสำเนา"
+"file.import" = "นำเข้าจากไฟล์…"
+"file.rename" = "เปลี่ยนชื่อ"
+"libraries.open" = "เปิดไลบรารี"
+"select.sameEffect" = "เอฟเฟกต์"
+"select.sameFill" = "สีเติม"
+"select.sameFont" = "ฟอนต์"
+"select.sameInstance" = "อินสแตนซ์"
+"select.sameProperties" = "พร็อพเพอร์ตี"
+"select.sameStroke" = "เส้นขอบ"
+"select.sameText" = "พร็อพเพอร์ตีข้อความ"
+"text.alignCenter" = "จัดข้อความกึ่งกลาง"
+"text.alignJustify" = "จัดข้อความชิดสองข้าง"
+"text.alignLeft" = "จัดข้อความชิดซ้าย"
+"text.alignRight" = "จัดข้อความชิดขวา"
+"view.assets" = "แอสเซ็ต"
+"view.design" = "ดีไซน์"
+"view.layers" = "เลเยอร์"
+"view.outlines" = "แสดงเค้าร่าง"
+"view.outlinesHiddenLayers" = "รวมเลเยอร์ที่ซ่อน"
+"view.outlinesObjectBounds" = "รวมขอบเขตออบเจกต์"
+"view.outlinesSelection" = "แสดงเค้าร่างของส่วนที่เลือก"
+"view.prototype" = "โปรโตไทป์"
+"view.themeDark" = "มืด"
+"view.themeLight" = "สว่าง"
+"view.themeSystem" = "ตามระบบ"
diff --git a/crates/ui-egui/locales/tr.toml b/crates/ui-egui/locales/tr.toml
index 13df8e7b..1ba75e8c 100644
--- a/crates/ui-egui/locales/tr.toml
+++ b/crates/ui-egui/locales/tr.toml
@@ -18,6 +18,7 @@ name = "Türkçe"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PR, {commits} commit, +{added} / −{deleted} satır (Δ {delta}), +{bin_added} / −{bin_deleted} ikili varlık, {first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Bu dosyanın bu modları ve değişkenleri içeren bir koleksiyonu: değerlerini mod başına geçersiz kılın ve kendi değişkenlerinizi ekleyin"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Bu adda bir .figcraft dosyası zaten var. Değiştirmeyi onaylamak için tam adını seçin."
 "A responsive product page: hero, features, figures, a quote and a footer" = "Duyarlı bir ürün sayfası: giriş bölümü, özellikler, rakamlar, bir alıntı ve bir alt bilgi"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "Yay, durulana kadar oynar: kütlesi, sertliği ve sönümü ne kadar süreceğini belirler"
 "A title, an agenda, a big figure, a chart and a closing slide" = "Bir başlık, bir gündem, büyük bir rakam, bir grafik ve bir kapanış slaydı"
@@ -36,6 +37,7 @@ name = "Türkçe"
 "Add a description" = "Açıklama ekle"
 "Add a frame (F) or a shape (R) to get started" = "Başlamak için bir çerçeve (F) veya bir şekil (R) ekleyin"
 "Add a layer or component to tile first" = "Önce döşenecek bir katman veya bileşen ekleyin"
+"Add a minute" = "Bir dakika ekle"
 "Add a note for developers" = "Geliştiriciler için not ekle"
 "Add action" = "Eylem ekle"
 "Add actions for when no condition holds" = "Hiçbir koşul sağlanmadığında yapılacak eylemleri ekleyin"
@@ -43,6 +45,7 @@ name = "Türkçe"
 "Add another condition" = "Başka bir koşul ekle"
 "Add auto layout" = "Otomatik yerleşim ekle"
 "Add background behind overlay" = "Bindirmenin arkasına arka plan ekle"
+"Add column" = "Sütun ekle"
 "Add content to this slot" = "Bu yuvaya içerik ekle"
 "Add dev resource" = "Geliştirici kaynağı ekle"
 "Add effect" = "Efekt ekle"
@@ -54,6 +57,7 @@ name = "Türkçe"
 "Add library file…" = "Kitaplık dosyası ekle…"
 "Add max height" = "En büyük yükseklik ekle"
 "Add max width" = "En büyük genişlik ekle"
+"Add measurement" = "Ölçüm ekle"
 "Add min height" = "En küçük yükseklik ekle"
 "Add min width" = "En küçük genişlik ekle"
 "Add mode" = "Mod ekle"
@@ -61,6 +65,7 @@ name = "Türkçe"
 "Add or update collections from a variables JSON" = "Bir değişken JSON'undan koleksiyon ekleyin veya güncelleyin"
 "Add properties to make instances configurable" = "Örnekleri yapılandırılabilir kılmak için özellik ekleyin"
 "Add reaction" = "Tepki ekle"
+"Add row" = "Satır ekle"
 "Add starting point" = "Başlangıç noktası ekle"
 "Add stroke" = "Kontur ekle"
 "Add variant" = "Varyant ekle"
@@ -89,8 +94,13 @@ name = "Türkçe"
 "All comments" = "Tüm yorumlar"
 "All components" = "Tüm bileşenler"
 "All fonts" = "Tüm yazı tipleri"
+"All objects" = "Tüm nesneler"
 "All supported properties" = "Desteklenen tüm özellikler"
 "All variables" = "Tüm değişkenler"
+"Along the bottom" = "Alt kenar boyunca"
+"Along the left" = "Sol kenar boyunca"
+"Along the right" = "Sağ kenar boyunca"
+"Along the top" = "Üst kenar boyunca"
 "Alpha" = "Alfa"
 "Alphabetical" = "Alfabetik"
 "Alt+drag" = "Alt+sürükle"
@@ -123,6 +133,7 @@ name = "Türkçe"
 "Archived" = "Arşivlendi"
 "Arrange" = "Konumlandır"
 "Arrow" = "Ok"
+"Arrow at the end" = "Sonda ok"
 "As typed" = "Yazıldığı gibi"
 "Asking the server…" = "Sunucuya soruluyor…"
 "Assets" = "Varlıklar"
@@ -154,6 +165,7 @@ name = "Türkçe"
 "Basics" = "Temel bilgiler"
 "Before" = "Önce"
 "Bend" = "Bük"
+"Between the selected layers" = "Seçili katmanlar arasında"
 "Bevel" = "Eğimli"
 "Binary assets added" = "Eklenen ikili varlıklar"
 "Binary assets removed" = "Kaldırılan ikili varlıklar"
@@ -171,6 +183,7 @@ name = "Türkçe"
 "Bottom" = "Alt"
 "Bottom left radius" = "Sol alt yarıçap"
 "Bottom right radius" = "Sağ alt yarıçap"
+"Brainstorm" = "Beyin fırtınası"
 "Branch" = "Dal"
 "Branch archived" = "Dal arşivlendi"
 "Branch merged" = "Dal birleştirildi"
@@ -196,8 +209,12 @@ name = "Türkçe"
 "C or ⇧C" = "C veya ⇧C"
 "CMYK colour" = "CMYK rengi"
 "Can view" = "Görüntüleyebilir"
+"Check" = "Onay"
 "Checking the server…" = "Sunucu denetleniyor…"
+"Chevron" = "Şerit ok"
 "Clear from this list" = "Bu listeden kaldır"
+"Clear results" = "Sonuçları temizle"
+"Click objects to vote; click your badge to take a vote back" = "Oy vermek için nesnelere tıklayın; oyu geri almak için rozetinize tıklayın"
 "Code or invite link" = "Kod veya davet bağlantısı"
 "Color profile: {name}" = "Renk profili: {name}"
 "Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Renk ve metin stilleri, Açık ve Koyu değişkenler, düğmeler, giriş alanları ve kartlar"
@@ -222,7 +239,7 @@ name = "Türkçe"
 "Changes on main" = "Ana dosyadaki değişiklikler"
 "Changes on the branch" = "Daldaki değişiklikler"
 "Changes unknown" = "Değişiklikler bilinmiyor"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "Bu bileşeni koduna bağlamak için yukarıdan React, Leptos, SwiftUI, Compose veya Flutter seçin."
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Bu bileşeni koduna bağlamak için yukarıdan React, Leptos, Vue, SwiftUI, Compose, ArkUI veya Flutter seçin."
 "Choose another profile to change it." = "Değiştirmek için başka bir profil seçin."
 "Choose collection" = "Koleksiyon seç"
 "Choose image" = "Görüntü seç"
@@ -243,7 +260,6 @@ name = "Türkçe"
 "Close tab" = "Sekmeyi kapat"
 "Close version history" = "Sürüm geçmişini kapat"
 "Close when clicking outside" = "Dışarı tıklanınca kapat"
-"Close without saving" = "Kaydetmeden kapat"
 "Code" = "Kod"
 "Code syntax" = "Kod söz dizimi"
 "Collapse" = "Daralt"
@@ -270,6 +286,7 @@ name = "Türkçe"
 "Commits" = "Commit'ler"
 "Company" = "Şirket"
 "Compare changes" = "Değişiklikleri karşılaştır"
+"Compatibility notes" = "Uyumluluk notları"
 "Completed" = "Tamamlandı"
 "Component" = "Bileşen"
 "Component name" = "Bileşen adı"
@@ -284,11 +301,11 @@ name = "Türkçe"
 "Connected" = "Bağlandı"
 "Connected to code: {from}" = "Koda bağlı: {from}"
 "Connection lost, reconnecting (attempt {attempt})…" = "Bağlantı koptu, yeniden bağlanılıyor (deneme {attempt})…"
+"Connector" = "Bağlayıcı"
 "Constrain proportions" = "Oranları koru"
 "Constraints" = "Kısıtlamalar"
 "Content" = "İçerik"
 "Contents hidden" = "İçerik gizli"
-"Contents only" = "Yalnızca içerik"
 "Contextual alternates" = "Bağlamsal alternatifler"
 "Contrast" = "Kontrast"
 "Contributors" = "Katkıda bulunanlar"
@@ -312,6 +329,8 @@ name = "Türkçe"
 "Corner radius" = "Köşe yarıçapı"
 "Corner smoothing" = "Köşe yumuşatma"
 "Couldn't reach {server}: showing what this computer remembers." = "{server} sunucusuna ulaşılamadı: bu bilgisayarın hatırladıkları gösteriliyor."
+"Couldn't read {name}." = "{name} okunamadı."
+"Couldn't save the file" = "Dosya kaydedilemedi"
 "Count" = "Sayı"
 "Create" = "Oluştur"
 "Create a variable collection first" = "Önce bir değişken koleksiyonu oluşturun"
@@ -335,6 +354,7 @@ name = "Türkçe"
 "Current version" = "Geçerli sürüm"
 "Cursor chat" = "İmleç sohbeti"
 "Custom" = "Özel"
+"Custom size" = "Özel boyut"
 "Cut" = "Kes"
 "Dark" = "Koyu"
 "Darken" = "Koyulaştır"
@@ -368,6 +388,7 @@ name = "Türkçe"
 "Description" = "Açıklama"
 "Description (optional)" = "Açıklama (isteğe bağlı)"
 "Design" = "Tasarım"
+"Design panel" = "Tasarım paneli"
 "Design system starter" = "Tasarım sistemi başlangıç seti"
 "Desktop" = "Masaüstü"
 "Destination" = "Hedef"
@@ -395,6 +416,7 @@ name = "Türkçe"
 "Distribute horizontal spacing" = "Yatay aralığı dağıt"
 "Distribute vertical spacing" = "Dikey aralığı dağıt"
 "Divider" = "Ayırıcı"
+"Don't Save" = "Kaydetme"
 "Don't truncate" = "Kısaltma yapma"
 "Done" = "Bitti"
 "Done editing" = "Düzenlemeyi bitir"
@@ -427,6 +449,8 @@ name = "Türkçe"
 "Effect settings" = "Efekt ayarları"
 "Effect styles" = "Efekt stilleri"
 "Effects" = "Efektler"
+"Curved" = "Eğri"
+"Elbow" = "Dirsekli"
 "Ellipse" = "Elips"
 "Ellipses" = "Elipsler"
 "Else" = "Değilse"
@@ -435,6 +459,7 @@ name = "Türkçe"
 "Empty" = "Boş"
 "End" = "Bitiş"
 "End point" = "Bitiş noktası"
+"End vote" = "Oylamayı bitir"
 "Ends the session; everyone keeps their copy" = "Oturumu sonlandırır; herkes kendi kopyasını saklar"
 "Enter" = "Enter"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Bir figcraft-server adresi girin ve sunduğu eklentileri görmek için Gözat'a basın."
@@ -476,6 +501,7 @@ name = "Türkçe"
 "False" = "Yanlış"
 "Feb" = "Şub"
 "Fetching from the server…" = "Sunucudan getiriliyor…"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft bu dosyaların tüm özelliklerini henüz desteklemiyor. Notlar, içe aktarılan kopyada nelerin dışarıda bırakıldığını veya değiştirildiğini listeler; özgün dosya değişmez."
 "File" = "Dosya"
 "File name" = "Dosya adı"
 "File not found" = "Dosya bulunamadı"
@@ -509,6 +535,7 @@ name = "Türkçe"
 "Flip text to the other side" = "Metni diğer tarafa çevir"
 "Flip vertical" = "Dikey çevir"
 "Flip width profile" = "Genişlik profilini çevir"
+"Flow chart" = "Akış şeması"
 "Flow starting point" = "Akış başlangıç noktası"
 "Flow starting points" = "Akış başlangıç noktaları"
 "Flows" = "Akışlar"
@@ -561,6 +588,7 @@ name = "Türkçe"
 "Hanging list" = "Asılı liste"
 "Hanging punctuation" = "Asılı noktalama"
 "Hard light" = "Sert ışık"
+"Heart" = "Kalp"
 "Height" = "Yükseklik"
 "Help" = "Yardım"
 "Help and resources" = "Yardım ve kaynaklar"
@@ -573,6 +601,7 @@ name = "Türkçe"
 "Hide these tips (Getting started in the Help menu shows them again)" = "Bu ipuçlarını gizle (Yardım menüsündeki Başlarken onları yeniden gösterir)"
 "Hide when publishing" = "Yayımlarken gizle"
 "Highlight layers on hover" = "Üzerine gelince katmanları vurgula"
+"Highlighter" = "Fosforlu kalem"
 "Highlights" = "Açık tonlar"
 "Hold Alt" = "Alt tuşunu basılı tutun"
 "Hold Alt+Z" = "Alt+Z tuşlarını basılı tutun"
@@ -598,12 +627,16 @@ name = "Türkçe"
 "If" = "Eğer"
 "If {condition}" = "Eğer {condition}"
 "Ignore auto layout (absolute position)" = "Otomatik yerleşimi yok say (mutlak konum)"
+"Ignore overlapping layers" = "Çakışan katmanları yok say"
 "Image" = "Görüntü"
+"Images" = "Görüntüler"
 "Import" = "İçe aktar"
 "Import path" = "İçe aktarma yolu"
 "Import plugin from manifest" = "Eklentiyi manifestten içe aktar"
 "Import plugin from manifest…" = "Eklentiyi manifestten içe aktar…"
+"Import report" = "İçe aktarma raporu"
 "Import variables" = "Değişkenleri içe aktar"
+"Imported document" = "İçe aktarılan belge"
 "Imported {name}" = "İçe aktarıldı: {name}"
 "Imported {n} new variables, updated {updated}" = { other = "{n} yeni değişken içe aktarıldı, {updated} güncellendi" }
 "Import…" = "İçe aktar…"
@@ -631,11 +664,13 @@ name = "Türkçe"
 "Instance swap (no other component)" = "Örnek değiştirme (başka bileşen yok)"
 "Instances" = "Örnekler"
 "Instant" = "Anında"
+"Intensity" = "Yoğunluk"
 "Interaction" = "Etkileşim"
 "Interactions" = "Etkileşimler"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Arayüz tasarımı ve prototipleme. Rust ile sıfırdan yazılmış, ücretsiz, açık kaynaklı, temiz oda yöntemiyle geliştirilmiş bir tasarım aracı; ArtCraft Crafting Apps ailesinin bir parçası."
 "Intersect" = "Kesiştir"
 "Intersects" = "Kesişir"
+"Invalid color" = "Geçersiz renk"
 "Invite link" = "Davet bağlantısı"
 "Invite link copied" = "Davet bağlantısı kopyalandı"
 "It asks permission to:" = "Şunlar için izin istiyor:"
@@ -654,6 +689,8 @@ name = "Türkçe"
 "Jun" = "Haz"
 "Just now" = "Az önce"
 "Justify" = "İki yana yasla"
+"Kanban board" = "Kanban panosu"
+"Keep a measurement on the canvas for developers" = "Geliştiriciler için tuvalde bir ölçüm tut"
 "Keep appearance" = "Görünümü koru"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Görünümü koru, renkler aynı görünsün diye her renk değerini {profile} profiline dönüştürür. Değerleri koru, sayıları olduğu gibi bırakır; bu yüzden renkler kayar."
 "Keep tool selected after use" = "Kullanımdan sonra aracı seçili tut"
@@ -733,6 +770,7 @@ name = "Türkçe"
 "Mark as resolved" = "Çözüldü olarak işaretle"
 "Mark as unread" = "Okunmadı olarak işaretle"
 "Mark as unresolved" = "Çözülmedi olarak işaretle"
+"Marker" = "Keçeli kalem"
 "Mask" = "Maske"
 "Mass · Stiffness · Damping" = "Kütle · Sertlik · Sönüm"
 "Match (empty: the whole name)" = "Eşleşme (boş: adın tamamı)"
@@ -742,6 +780,7 @@ name = "Türkçe"
 "Maximize" = "Ekranı kapla"
 "May" = "May"
 "Measure to the selection" = "Seçime kadar ölç"
+"Measurements" = "Ölçümler"
 "Merge into main" = "Ana dosyaya birleştir"
 "Merge regions" = "Bölgeleri birleştir"
 "Merge the branch into the main file (one undo step) and archive it" = "Dalı ana dosyaya birleştir (tek geri alma adımı) ve arşivle"
@@ -750,6 +789,7 @@ name = "Türkçe"
 "Min H" = "En küçük Y"
 "Min W" = "En küçük G"
 "Minimize" = "Simge durumuna küçült"
+"Minutes" = "Dakika"
 "Mirror angle" = "Açıyı yansıt"
 "Mirror angle and length" = "Açıyı ve uzunluğu yansıt"
 "Mirroring" = "Yansıtma"
@@ -791,8 +831,10 @@ name = "Türkçe"
 "Named instance" = "Adlandırılmış örnek"
 "Navigate to" = "Şuraya git"
 "Nested instance" = "İç içe örnek"
+"New board" = "Yeni pano"
 "New design file" = "Yeni tasarım dosyası"
 "Newest first" = "Önce en yeni"
+"Next frame" = "Sonraki çerçeve"
 "Next or previous control in the focused region" = "Odaklanılan bölgedeki sonraki veya önceki denetim"
 "Next ready for dev" = "Sonraki geliştirmeye hazır"
 "Next size option" = "Sonraki boyut seçeneği"
@@ -802,12 +844,15 @@ name = "Türkçe"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "Dal yok. Dal, değişiklikleri denemek, sonra gözden geçirip birleştirmek için dosyanın bir kopyasıdır."
 "No category" = "Kategori yok"
 "No changes" = "Değişiklik yok"
+"No color styles" = "Renk stili yok"
 "No colour variables fit here." = "Buraya uyan renk değişkeni yok."
 "No colour variables yet. Create them in Local variables." = "Henüz renk değişkeni yok. Onları Yerel değişkenler'de oluşturun."
 "No comments yet" = "Henüz yorum yok"
+"No compatibility warnings reported" = "Uyumluluk uyarısı bildirilmedi"
 "No components yet. Select layers and press {keys}." = "Henüz bileşen yok. Katmanları seçip {keys} tuşlarına basın."
 "No conflicts." = "Çakışma yok."
 "No contributor data was built into this copy." = "Bu kopyaya katkıda bulunan verisi eklenmemiş."
+"No device" = "Cihaz yok"
 "No fonts match" = "Eşleşen yazı tipi yok"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Burada katılma kodu yok (sunucu katılma kodlarından eski veya bu adres bir koda sığmıyor): bunun yerine bağlantıyı paylaşın."
 "No layer changes to show." = "Gösterilecek katman değişikliği yok."
@@ -839,6 +884,7 @@ name = "Türkçe"
 "No text styles yet. Click + to create one from the selected text." = "Henüz metin stili yok. Seçili metinden oluşturmak için + simgesine tıklayın."
 "No variables fit here." = "Buraya uyan değişken yok."
 "No variables yet. Create them in Local variables." = "Henüz değişken yok. Onları Yerel değişkenler'de oluşturun."
+"No votes yet" = "Henüz oy yok"
 "Nobody else is here yet" = "Burada henüz başka kimse yok"
 "Noise" = "Gürültü"
 "None" = "Yok"
@@ -888,6 +934,7 @@ name = "Türkçe"
 "Open branch" = "Dalı aç"
 "Open file" = "Dosya aç"
 "Open files" = "Dosyaları aç"
+"Open presentations" = "Açık sunumlar"
 "Open in focus view" = "Odak görünümünde aç"
 "Open in new window" = "Yeni pencerede aç"
 "Open invite links in FigCraft" = "Davet bağlantılarını FigCraft'ta aç"
@@ -896,6 +943,7 @@ name = "Türkçe"
 "Open overlay" = "Bindirmeyi aç"
 "Open prototype preview" = "Prototip önizlemesini aç"
 "Open variables ({count})" = "Açık değişkenler ({count})"
+"Opened as a new document" = "Yeni belge olarak açıldı"
 "Opened “{name}” in a new tab" = "“{name}” yeni sekmede açıldı"
 "Open|comments" = "Açık"
 "Options" = "Seçenekler"
@@ -919,7 +967,12 @@ name = "Türkçe"
 "PDF print settings" = "PDF baskı ayarları"
 "Padding" = "İç boşluk"
 "Page" = "Sayfa"
+"Page deleted" = "Sayfa silindi"
 "Pages" = "Sayfalar"
+"Pages added to the document" = "Sayfalar belgeye eklendi"
+"Pause" = "Duraklat"
+"Pink" = "Pembe"
+"Placed on the current page" = "Geçerli sayfaya yerleştirildi"
 "Pages: {pages}" = "Sayfalar: {pages}"
 "Paint bucket" = "Boya kovası"
 "Pan the canvas" = "Tuvali kaydır"
@@ -934,6 +987,7 @@ name = "Türkçe"
 "Paste a team library link (a view link)" = "Bir ekip kitaplığı bağlantısı yapıştırın (görüntüleme bağlantısı)"
 "Paste here" = "Buraya yapıştır"
 "Paste to replace" = "Değiştirmek için yapıştır"
+"Pasted design layers; {n} kinds of content were left out" = { other = "Tasarım katmanları yapıştırıldı; {n} tür içerik dışarıda bırakıldı" }
 "Pattern" = "Desen"
 "Pattern alignment" = "Desen hizalaması"
 "Pattern scale" = "Desen ölçeği"
@@ -960,6 +1014,7 @@ name = "Türkçe"
 "Plugins" = "Eklentiler"
 "Plus darker" = "Artı koyu"
 "Plus lighter" = "Artı açık"
+"Plus one" = "Artı bir"
 "Point" = "Nokta"
 "Points" = "Noktalar"
 "Polygon" = "Çokgen"
@@ -987,6 +1042,7 @@ name = "Türkçe"
 "Preview" = "Önizleme"
 "Preview this flow" = "Bu akışı önizle"
 "Preview this frame" = "Bu çerçeveyi önizle"
+"Previous frame" = "Önceki çerçeve"
 "Previous ready for dev" = "Önceki geliştirmeye hazır"
 "Progressive" = "Aşamalı"
 "Properties" = "Özellikler"
@@ -1007,6 +1063,7 @@ name = "Türkçe"
 "Push" = "İt"
 "Push changes to main component" = "Değişiklikleri ana bileşene gönder"
 "Put text on path" = "Metni yola yerleştir"
+"Question" = "Soru"
 "R" = "R"
 "Radial" = "Dairesel"
 "Radius" = "Yarıçap"
@@ -1024,10 +1081,12 @@ name = "Türkçe"
 "Reduce motion" = "Hareketi azalt"
 "Refraction" = "Kırılma"
 "Regular expression" = "Düzenli ifade"
+"Relative to" = "Göre"
 "Remove" = "Kaldır"
 "Remove all" = "Tümünü kaldır"
 "Remove annotation" = "Ek açıklamayı kaldır"
 "Remove auto layout" = "Otomatik yerleşimi kaldır"
+"Remove column" = "Sütunu kaldır"
 "Remove dev resource" = "Geliştirici kaynağını kaldır"
 "Remove export setting" = "Dışa aktarma ayarını kaldır"
 "Remove from recents" = "Son kullanılanlardan kaldır"
@@ -1036,10 +1095,12 @@ name = "Türkçe"
 "Remove guide" = "Kılavuzu kaldır"
 "Remove interaction" = "Etkileşimi kaldır"
 "Remove library from this file" = "Kitaplığı bu dosyadan kaldır"
+"Remove measurement" = "Ölçümü kaldır"
 "Remove min and max" = "En küçük ve en büyüğü kaldır"
 "Remove min and max height" = "En küçük ve en büyük yüksekliği kaldır"
 "Remove min and max width" = "En küçük ve en büyük genişliği kaldır"
 "Remove regions" = "Bölgeleri kaldır"
+"Remove row" = "Satırı kaldır"
 "Remove slot" = "Yuvayı kaldır"
 "Remove starting point" = "Başlangıç noktasını kaldır"
 "Remove stop" = "Durağı kaldır"
@@ -1080,6 +1141,7 @@ name = "Türkçe"
 "Resize by the nudge amount" = "Kaydırma miktarı kadar yeniden boyutlandır"
 "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Çerçeveleri cihazın ekranına (veya cihaz yoksa pencereye) göre yeniden boyutlandır: kısıtlamaları ve otomatik yerleşimleri tepki verir"
 "Resize to fit" = "Sığacak şekilde yeniden boyutlandır"
+"Resizing" = "Yeniden boyutlandırma"
 "Resolve" = "Çöz"
 "Resolve change" = "Değişikliği çöz"
 "Resolved" = "Çözüldü"
@@ -1090,6 +1152,9 @@ name = "Türkçe"
 "Restore main component" = "Ana bileşeni geri yükle"
 "Restore this version" = "Bu sürümü geri yükle"
 "Restored “{name}”" = "“{name}” geri yüklendi"
+"Retrospective" = "Retrospektif"
+"Results" = "Sonuçlar"
+"Resume" = "Sürdür"
 "Reverse the order" = "Sırayı ters çevir"
 "Reversed triangle" = "Ters üçgen"
 "Review and merge" = "Gözden geçir ve birleştir"
@@ -1105,6 +1170,7 @@ name = "Türkçe"
 "Rotation jitter" = "Döndürme titreşimi"
 "Round" = "Yuvarlak"
 "Rounded" = "Yuvarlatılmış"
+"Rounded rectangle" = "Yuvarlatılmış dikdörtgen"
 "Row" = "Satır"
 "Row gap" = "Satır aralığı"
 "Row sizes" = "Satır boyutları"
@@ -1114,6 +1180,7 @@ name = "Türkçe"
 "Rulers" = "Cetveller"
 "Run" = "Çalıştır"
 "Run {label}" = "Çalıştır: {label}"
+"Save file" = "Dosyayı kaydet"
 "Search templates" = "Şablonlarda ara"
 "See all templates" = "Tüm şablonları gör"
 "Select layers and they space themselves as their content changes" = "Katmanları seçin; içerikleri değiştikçe kendi aralıklarını ayarlarlar"
@@ -1153,12 +1220,14 @@ name = "Türkçe"
 "Select all with same" = "Aynı olanların tümünü seç"
 "Select layer" = "Katman seç"
 "Select layers to apply the style to" = "Stilin uygulanacağı katmanları seçin"
+"Select layers with this color" = "Bu renkteki katmanları seç"
 "Select overlapping shapes" = "Çakışan şekilleri seç"
 "Select points to edit their position, radius and mirroring" = "Konumlarını, yarıçaplarını ve yansıtmalarını düzenlemek için noktaları seçin"
 "Select slot" = "Yuvayı seç"
 "Selection" = "Seçim"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Seçim kutusu, {x}, {y} konumunda {w} × {h}: oklar onu taşır, Shift+oklar veya {cmd}+oklar boyutlandırır, Enter seçer, Escape iptal eder"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Seçim kutusu: oklar onu taşır, Shift+oklar veya {cmd}+oklar boyutlandırır, Enter seçer, Escape iptal eder"
+"Selection colors" = "Seçim renkleri"
 "Send backward" = "Geriye gönder"
 "Send report" = "Raporu gönder"
 "Send to back" = "En arkaya gönder"
@@ -1175,6 +1244,7 @@ name = "Türkçe"
 "Shape" = "Şekil"
 "Shape builder" = "Şekil oluşturucu"
 "Shape tools" = "Şekil araçları"
+"Shapes" = "Şekiller"
 "Share" = "Paylaş"
 "Share this file" = "Bu dosyayı paylaş"
 "Share with a code" = "Kodla paylaş"
@@ -1241,10 +1311,13 @@ name = "Türkçe"
 "Space+drag" = "Boşluk+sürükle"
 "Spacing" = "Aralık"
 "Spam, stolen work, abuse…" = "İstenmeyen içerik, çalıntı iş, kötüye kullanım…"
+"Speech bubble" = "Konuşma balonu"
 "Splay" = "Açılma"
 "Spotlight me" = "Beni öne çıkar"
 "Spread" = "Yayılma"
 "Square" = "Kare"
+"Stamp" = "Damga"
+"Stamps" = "Damgalar"
 "Standard" = "Standart"
 "Standard ligatures" = "Standart bitişik harfler"
 "Star" = "Yıldız"
@@ -1257,15 +1330,22 @@ name = "Türkçe"
 "Start point" = "Başlangıç noktası"
 "Start sharing" = "Paylaşmaya başla"
 "Start sharing with the Share button, then pass on the code it gives" = "Paylaş düğmesiyle paylaşmaya başlayın, sonra verdiği kodu iletin"
+"Start vote" = "Oylamayı başlat"
 "Starting to share…" = "Paylaşım başlatılıyor…"
 "Status" = "Durum"
 "Sticky" = "Yapışkan"
+"Sticky note" = "Yapışkan not"
+"Sticky note colors" = "Yapışkan not renkleri"
+"Sticky notes" = "Yapışkan notlar"
+"Sticky notes, shapes and connectors" = "Yapışkan notlar, şekiller ve bağlayıcılar"
 "Stop" = "Durdur"
 "Stop following {name}" = "{name} takibini bırak"
 "Stop session" = "Oturumu durdur"
 "Stop sharing" = "Paylaşmayı durdur"
 "Stop spotlighting" = "Öne çıkarmayı durdur"
+"Stop timer" = "Zamanlayıcıyı durdur"
 "Stop {n}  {hex}" = "Durak {n}  {hex}"
+"Straight" = "Düz"
 "Stretch" = "Uzat"
 "Strikethrough" = "Üstü çizili"
 "String" = "Metin"
@@ -1310,6 +1390,7 @@ name = "Türkçe"
 "Text" = "Metin"
 "Text align" = "Metin hizalaması"
 "Text content" = "Metin içeriği"
+"Text size" = "Metin boyutu"
 "Text style" = "Metin stili"
 "Text styles" = "Metin stilleri"
 "Texts" = "Metinler"
@@ -1340,13 +1421,16 @@ name = "Türkçe"
 "This server is open to the public: no key needed." = "Bu sunucu herkese açık: anahtar gerekmez."
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Bu sunucu anahtarını istiyor: adrese ?key=… ekleyin (`figcraft-server key` anahtarı sunucunun makinesinde yazdırır)."
 "This server takes files only with its key: see Advanced." = "Bu sunucu dosyaları yalnızca anahtarıyla kabul ediyor: Gelişmiş'e bakın."
+"Thumbs up" = "Başparmak yukarı"
 "Tidy up" = "Toparla"
 "Tile" = "Döşe"
 "Tile type" = "Döşeme türü"
+"Timer" = "Zamanlayıcı"
 "Tint" = "Renk tonu"
 "Title" = "Başlık"
 "Title case" = "Başlık biçimi"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Bu kitaplığı ekibinizle paylaşmak için dosyayı bir sunucuya yayımlayın (Paylaş ▸ Sunucuya yayımla…), sonra kitaplığı orada yayımlayın."
+"To the layer around it" = "Çevreleyen katmana kadar"
 "Toggle" = "Aç/Kapat"
 "Toggle light/dark theme" = "Açık/koyu temayı değiştir"
 "Toggle visibility" = "Görünürlüğü değiştir"
@@ -1356,8 +1440,10 @@ name = "Türkçe"
 "Top left radius" = "Sol üst yarıçap"
 "Top right radius" = "Sağ üst yarıçap"
 "Transform" = "Dönüştür"
+"Triangle" = "Üçgen"
 "Triangle arrow" = "Üçgen ok"
 "Trigger" = "Tetikleyici"
+"Trigger layer" = "Tetikleyici katman"
 "True" = "Doğru"
 "Truncate text" = "Metni kısalt"
 "Truncate with an ellipsis" = "Üç noktayla kısalt"
@@ -1380,7 +1466,7 @@ name = "Türkçe"
 "Unread" = "Okunmamış"
 "Unresolve" = "Çözülmedi yap"
 "Unsaved changes" = "Kaydedilmemiş değişiklikler"
-"Unsaved changes in {names}. Close the window and lose them?" = "{names} içinde kaydedilmemiş değişiklikler var. Pencere kapatılıp bunlar kaybedilsin mi?"
+"Unsaved changes in {names}. Save them before closing?" = "{names} içinde kaydedilmemiş değişiklikler var. Kapatmadan önce kaydedilsin mi?"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Kaydedilmemiş değişiklikler: önce kaydedin ({save}) veya atmak için sekmeyi {alt}-tıklamayla kapatın"
 "Unsaved changes: save first, or close again with {key} to discard" = "Kaydedilmemiş değişiklikler: önce kaydedin veya atmak için {key} ile yeniden kapatın"
 "Up" = "Yukarı"
@@ -1397,6 +1483,7 @@ name = "Türkçe"
 "Use as mask" = "Maske olarak kullan"
 "Use auto layout" = "Otomatik yerleşim kullan"
 "Use number keys for opacity" = "Opaklık için rakam tuşlarını kullan"
+"Use the .figcraft or .fig extension." = ".figcraft veya .fig uzantısını kullanın."
 "Use the layer's fill" = "Katmanın dolgusunu kullan"
 "Used in {files} · {instances}" = "Kullanıldığı yer: {files} · {instances}"
 "Username" = "Kullanıcı adı"
@@ -1432,6 +1519,8 @@ name = "Türkçe"
 "Visibility" = "Görünürlük"
 "Visible" = "Görünür"
 "Vivid" = "Canlı"
+"Votes per person" = "Kişi başı oy"
+"Voting session" = "Oylama oturumu"
 "Warm" = "Sıcak"
 "Watch" = "İzle"
 "Wavy" = "Dalgalı"
@@ -1440,6 +1529,7 @@ name = "Türkçe"
 "WebSocket URL" = "WebSocket URL'si"
 "WebSocket URL copied" = "WebSocket URL'si kopyalandı"
 "Wedge" = "Kama"
+"Weekly planner" = "Haftalık planlayıcı"
 "Weight" = "Kalınlık"
 "What you try here changes this preview and the code below, not the file" = "Burada denedikleriniz dosyayı değil, bu önizlemeyi ve aşağıdaki kodu değiştirir"
 "What changed since it was marked ready for dev" = "Geliştirmeye hazır olarak işaretlendiğinden beri neler değişti"
@@ -1450,6 +1540,7 @@ name = "Türkçe"
 "While pressing" = "Basılıyken"
 "White" = "Beyaz"
 "Who runs it, its terms and how long it keeps files" = "Kimin işlettiği, koşulları ve dosyaları ne kadar sakladığı"
+"Whole screen" = "Tüm ekran"
 "Why it changed" = "Neden değişti"
 "Widgets" = "Widget'lar"
 "Width" = "Genişlik"
@@ -1489,26 +1580,121 @@ name = "Türkçe"
 "call any command its access allows" = "erişiminin izin verdiği her komutu çağırmak"
 "call only: {commands}" = "yalnızca şunları çağırmak: {commands}"
 "can edit the document" = "belgeyi düzenleyebilir"
+"can save files" = "dosya kaydedebilir"
+"conditional prototype actions nested too deeply were skipped" = "çok derin iç içe geçmiş koşullu prototip eylemleri atlandı"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "değerlendirilemeyen koşullara sahip koşullu prototip eylemleri atlandı"
+"connector label background was skipped: style data is missing" = "bağlayıcı etiketinin arka planı atlandı: stil verileri eksik"
+"connector label was skipped: background bounds are invalid" = "bağlayıcı etiketi atlandı: arka plan sınırları geçersiz"
+"connector label was skipped: background transform is invalid" = "bağlayıcı etiketi atlandı: arka plan dönüşümü geçersiz"
+"connector label was skipped: composed text transform is invalid" = "bağlayıcı etiketi atlandı: birleştirilmiş metin dönüşümü geçersiz"
+"connector label was skipped: derived background bounds are missing" = "bağlayıcı etiketi atlandı: türetilmiş arka plan sınırları eksik"
+"connector label was skipped: derived text bounds are missing" = "bağlayıcı etiketi atlandı: türetilmiş metin sınırları eksik"
+"connector label was skipped: text bounds are invalid" = "bağlayıcı etiketi atlandı: metin sınırları geçersiz"
+"connector label was skipped: text style data is missing" = "bağlayıcı etiketi atlandı: metin stili verileri eksik"
+"connector label was skipped: text transform is invalid" = "bağlayıcı etiketi atlandı: metin dönüşümü geçersiz"
+"connector labels were skipped" = "bağlayıcı etiketleri atlandı"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "bağlayıcı katmanları, varsa etiketleriyle birlikte statik çerçeve/vektör anlık görüntüleri olarak içe aktarılır; uç noktaların dinamik bağlantıları korunmaz"
+"connector snapshot vector data is missing; connector was left empty" = "bağlayıcı anlık görüntüsünün vektör verileri eksik; bağlayıcı boş bırakıldı"
+"connectors whose ends can't be placed are empty" = "uçları yerleştirilemeyen bağlayıcılar boş"
 "crop marks" = "kesim işaretleri"
+"damaged vector geometry was skipped" = "hasarlı vektör geometrisi atlandı"
+"damaged vector networks import as outlines" = "hasarlı vektör ağları ana hat olarak içe aktarılır"
 "development: {path}" = "geliştirme: {path}"
+"document children other than pages were skipped" = "belgenin sayfa olmayan alt öğeleri atlandı"
+"duplicate grid track sizing entries use equal tracks" = "yinelenen ızgara izi boyutlandırma girdileri eşit izler kullanır"
 "e.g. count + 1" = "ör. count + 1"
 "e.g. count >= 3 and not done" = "ör. count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "kaydedilmiş yolu olmayan dirsekli ve eğri bağlayıcılar düz çizgi olarak içe aktarılır"
+"entries without a node type were skipped" = "düğüm türü olmayan girdiler atlandı"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "Bir tarayıcıdan, sohbetten veya e-postadan gelen figcraft:// bağlantıları bu uygulamayı açar ve oturuma katılır."
+"filled areas of a vector with their own fill use the layer's fill" = "kendi dolgusu olan vektör dolgu alanları katmanın dolgusunu kullanır"
 "from {server}" = "kaynak: {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "tam olarak bir bilinen kumanda düğmesi olmayan oyun kumandası tetikleyicileri atlandı"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "ızgara izi listesi 1000 girdiyi aşıyor; izler varsayılan eşit boyutlandırmayı kullanır"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "ızgara izi boyutlandırması desteklenmiyor veya bozuk; etkilenen izler eşit boyutlandırma kullanır"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "ızgara izi boyutlandırma listesi 1000 girdiyi aşıyor; izler varsayılan eşit boyutlandırmayı kullanır"
 "hidden" = "gizli"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "iki filtre kapsayıcısı da bulunduğu için görüntü filtreleri belirsiz; filtre dönüştürme atlandı"
+"image filters use FigCraft's approximate renderer" = "görüntü filtreleri FigCraft'ın yaklaşık işlemesini kullanır"
+"instance swap properties whose default component isn't in the file were skipped" = "varsayılan bileşeni dosyada olmayan örnek değiştirme özellikleri atlandı"
+"instances inside their own main component were imported as frames" = "kendi ana bileşeninin içindeki örnekler çerçeve olarak içe aktarıldı"
+"instances of components that aren't in the file show no layers" = "dosyada olmayan bileşenlerin örnekleri katman göstermez"
+"instances of components that aren't in the file were imported as frames" = "dosyada olmayan bileşenlerin örnekleri çerçeve olarak içe aktarıldı"
+"instances that would nest a component inside itself were imported as frames" = "bir bileşeni kendi içine yerleştirecek örnekler çerçeve olarak içe aktarıldı"
+"instances without a main component were imported as empty frames" = "ana bileşeni olmayan örnekler boş çerçeve olarak içe aktarıldı"
+"invalid internal .fig text path data was ignored" = "yol üzerindeki metne ait geçersiz dahili .fig verileri yok sayıldı"
+"invalid or oversized vector networks import as outlines" = "geçersiz veya çok büyük vektör ağları ana hat olarak içe aktarılır"
+"invalid or oversized vector path data was skipped" = "geçersiz veya çok büyük vektör yolu verileri atlandı"
 "just now" = "az önce"
+"key triggers without a supported key were skipped" = "desteklenen bir tuşu olmayan tuş tetikleyicileri atlandı"
+"key up triggers import as key presses" = "tuş bırakma tetikleyicileri tuşa basma olarak içe aktarılır"
+"layers without a position were placed at their parent's origin" = "konumu olmayan katmanlar üst öğelerinin başlangıç noktasına yerleştirildi"
+"layers without a type were skipped" = "türü olmayan katmanlar atlandı"
+"legacy image filter container is unsupported; filter conversion was skipped" = "eski görüntü filtresi kapsayıcısı desteklenmiyor; filtre dönüştürme atlandı"
 "locked" = "kilitli"
+"malformed image filters container was skipped" = "bozuk görüntü filtreleri kapsayıcısı atlandı"
+"malformed image paintFilter container was skipped" = "bozuk görüntü paintFilter kapsayıcısı atlandı"
+"malformed slot content assignment was skipped" = "bozuk yuva içeriği ataması atlandı"
 "no bleed" = "taşma payı yok"
 "nobody else here yet" = "burada henüz başka kimse yok"
+"non-default slot settings are not represented and were skipped" = "varsayılan dışındaki yuva ayarları aktarılamıyor ve atlandı"
 "now" = "şimdi"
+"offer files to save if it asks to (you choose where each one goes)" = "isterse kaydedilecek dosya sunmak (her birinin yerini siz seçersiniz)"
 "or" = "veya"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "nokta başına kontur birleşimleri korundu; kesikli veya değişken genişlikli konturlar katmanın birleşimiyle çizilir"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "yuvaların tercih edilen bileşen anahtarları dosyadaki katmanlarla eşleştirilemedi ve atlandı"
+"prototype actions of unknown types were skipped" = "bilinmeyen türdeki prototip eylemleri atlandı"
+"prototype actions without a destination in the file were skipped" = "dosyada hedefi olmayan prototip eylemleri atlandı"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "değişken JSON'unda olmayan değişkenler üzerindeki prototip ifadeleri atlandı"
+"prototype expressions with unsupported functions were skipped" = "desteklenmeyen işlevler içeren prototip ifadeleri atlandı"
+"prototype interactions without supported actions were skipped" = "desteklenen eylemi olmayan prototip etkileşimleri atlandı"
+"prototype navigations of unknown types were skipped" = "bilinmeyen türdeki prototip gezinmeleri atlandı"
+"prototype transitions of unknown types play instantly" = "bilinmeyen türdeki prototip geçişleri anında oynatılır"
+"prototype triggers of unknown types were skipped" = "bilinmeyen türdeki prototip tetikleyicileri atlandı"
 "put a widget on the canvas" = "tuvale bir widget koymak"
 "read and edit the document" = "belgeyi okumak ve düzenlemek"
 "read the document" = "belgeyi okumak"
 "reads the document" = "belgeyi okur"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "değişken JSON'unda olmayan değişkenler üzerindeki değişken ayarlama eylemleri atlandı"
+"set-variable actions with values that can't be evaluated were skipped" = "değerlendirilemeyen değerlere sahip değişken ayarlama eylemleri atlandı"
+"set-variable actions with values that don't fit the variable were skipped" = "değişkene uymayan değerlere sahip değişken ayarlama eylemleri atlandı"
+"set-variable actions without a value were skipped" = "değeri olmayan değişken ayarlama eylemleri atlandı"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "değişken JSON'unda olmayan koleksiyonlar veya modlar üzerindeki değişken modu ayarlama eylemleri atlandı"
+"slot content assignment target is missing or is not slot content" = "yuva içeriği atamasının hedefi eksik veya yuva içeriği değil"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "yuva içeriği ataması boş GUID'i işaretçi olarak kullanıyor ve atlandı"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "bazı vektör noktaları dosyada eksik olan nokta ayarlarına başvuruyor; bu noktalar katmanın birleşimlerini ve düz köşeleri kullanır"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "bazı vektör segmentleri dosyada eksik olan stil ayarlarına başvuruyor; bu segmentler katmanın konturunu kullanır"
+"stale or invalid grid track sizing entries were ignored" = "eski veya geçersiz ızgara izi boyutlandırma girdileri yok sayıldı"
+"stars and polygons without point counts or geometry use the default point count" = "nokta sayısı veya geometrisi olmayan yıldızlar ve çokgenler varsayılan nokta sayısını kullanır"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "bazı vektör segmentlerinin stil ayarları desteklenmiyor; bu segmentler katmanın konturunu kullanır"
+"text path underline or strikethrough decoration is not rendered" = "yol üzerindeki metinde altı çizili veya üstü çizili süsleme çizilmez"
+"text style overrides refer to missing table entries" = "metin stili geçersiz kılmaları eksik tablo girdilerine başvuruyor"
+"the file has no pages" = "dosyada sayfa yok"
 "the plugin" = "eklenti"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "değişken JSON'unda `variableCollections` yok (yerel değişkenler yanıtı bekleniyordu) ve yok sayıldı"
 "this session only" = "yalnızca bu oturum"
+"unknown component property types were skipped" = "bilinmeyen bileşen özelliği türleri atlandı"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "değişken JSON'unda olmayan (veya başka türdeki) değişkenlere yönelik takma adlar atlandı"
+"variable bindings to properties the layer doesn't have were skipped" = "katmanda olmayan özelliklere yönelik değişken bağlamaları atlandı"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "değişken JSON'unda olmayan değişkenlere (kitaplık değişkenleri) yönelik bağlamalar atlandı"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "değişken bağlamaları atlandı: dosya JSON'unda değişken tanımı yok (yerel değişken JSON'unu `variables` olarak verin veya `meta` alanını dosya JSON'unun yanına gömün)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "değişken türü özelliğe uymayan değişken bağlamaları atlandı"
+"variable collections without modes were skipped" = "modu olmayan değişken koleksiyonları atlandı"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "prototip ifadelerinde bir değişken ve onun modlarından biri olmayan değişken modu aramaları atlandı"
+"variable modes of collections that aren't in the file were skipped" = "dosyada olmayan koleksiyonların değişken modları atlandı"
+"variable modes of collections that aren't in the variables JSON were skipped" = "değişken JSON'unda olmayan koleksiyonların değişken modları atlandı"
+"variable values that don't match their type (or composed colours) were skipped" = "türüyle eşleşmeyen değişken değerleri (veya birleşik renkler) atlandı"
+"variables of unknown types were skipped" = "bilinmeyen türdeki değişkenler atlandı"
+"variables whose collection isn't in the variables JSON were skipped" = "koleksiyonu değişken JSON'unda olmayan değişkenler atlandı"
+"variables without readable values were skipped" = "okunabilir değeri olmayan değişkenler atlandı"
+"vector points with unknown stroke joins use the layer join" = "bilinmeyen kontur birleşimleri olan vektör noktaları katmanın birleşimini kullanır"
+"vectors without geometry are empty" = "geometrisi olmayan vektörler boş"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "geometrisi olmayan vektörler boş (dosya JSON'unu geometry=paths ile dışa aktarın)"
+"very long text was cut to 1,048,576 characters" = "çok uzun metin 1.048.576 karaktere kısaltıldı"
+"very long vector paths were skipped" = "çok uzun vektör yolları atlandı"
+"video actions are not supported and were skipped" = "video eylemleri desteklenmiyor ve atlandı"
+"video triggers are not supported and were skipped" = "video tetikleyicileri desteklenmiyor ve atlandı"
 "yesterday" = "dün"
 "{instances} in {files}" = "{instances}, {files} içinde"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}: taslak çeviri, ana dili konuşan birinin incelemesini bekliyor."
@@ -1518,6 +1704,7 @@ name = "Türkçe"
 "{name} is forgotten on this computer; the file stays on {server}" = "{name} bu bilgisayarda unutuldu; dosya {server} üzerinde kalır"
 "{name} is on the server." = "{name} sunucuda."
 "{name} is spotlighting" = "{name} öne çıkarıyor"
+"{name} is too large to open in the browser (over 512 MB)." = "{name}, tarayıcıda açılamayacak kadar büyük (512 MB'tan fazla)."
 "{name}\nClick to apply to the selection" = "{name}\nSeçime uygulamak için tıklayın"
 "{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nTuvale sürükleyin veya görünümün ortasına yerleştirmek için tıklayın.\nBir örneği değiştirmek için üzerine bırakırken Alt (Option) tuşunu basılı tutun."
 "{name} (from {library})" = "{name} ({library} kitaplığından)"
@@ -1551,8 +1738,10 @@ name = "Türkçe"
 "{n} layers selected" = { other = "{n} katman seçili" }
 "{n} layers · {parts}" = { other = "{n} katman · {parts}" }
 "{n} matches" = { other = "{n} eşleşme" }
+"{n} min" = "{n} dk"
 "{n} minutes ago" = { other = "{n} dakika önce" }
 "{n} months ago" = { other = "{n} ay önce" }
+"{n} more notes omitted from this report" = { other = "{n} not daha bu rapora alınmadı" }
 "{n} of {total}" = "{n} / {total}"
 "{n} people joined" = { other = "{n} kişi katıldı" }
 "{n} preferred components" = { other = "{n} tercih edilen bileşen" }
@@ -1562,6 +1751,8 @@ name = "Türkçe"
 "{n} rows" = { other = "{n} satır" }
 "{n} styles" = { other = "{n} stil" }
 "{n} variables" = { other = "{n} değişken" }
+"{n} votes" = { other = "{n} oy" }
+"{n} votes left" = { other = "{n} oy kaldı" }
 "{n} weeks ago" = { other = "{n} hafta önce" }
 "{n} years ago" = { other = "{n} yıl önce" }
 "{n}d" = "{n} g"
@@ -1612,7 +1803,26 @@ name = "Türkçe"
 "arrange.packH" = "Yatay sıkıştır"
 "arrange.packV" = "Dikey sıkıştır"
 "arrange.roundToPixels" = "Piksellere yuvarla"
+"arrange.spacing" = "Aralık"
 "arrange.tidy" = "Toparla"
+"board.connector" = "Bağlayıcı"
+"board.ink" = "Keçeli kalem çizgisi"
+"board.label" = "Bağlayıcı etiketi"
+"board.nextSticky" = "Sonraki yapışkan not"
+"board.reattach" = "Bağlayıcıyı yeniden bağla"
+"board.setColor" = "Pano rengi"
+"board.setStyle" = "Pano stili"
+"board.shape" = "Metinli şekil"
+"board.stamp" = "Damga"
+"board.sticky" = "Yapışkan not"
+"board.table" = "Tablo"
+"board.tableEdit" = "Tabloyu düzenle"
+"board.template" = "Pano şablonu"
+"board.templates" = "Pano şablonlarını listele"
+"board.timer" = "Zamanlayıcı"
+"board.timerState" = "Zamanlayıcı durumu"
+"board.vote" = "Oylama oturumu"
+"board.voteResults" = "Oylama sonuçları"
 "bool.exclude" = "Seçimi hariç tut"
 "bool.flatten" = "Boolean'ı düzleştir"
 "bool.intersect" = "Seçimi kesiştir"
@@ -1689,6 +1899,9 @@ name = "Türkçe"
 "dev.focus" = "Odak görünümü"
 "dev.resolveChange" = "Değişikliği çöz"
 "dev.unfocus" = "Odak görünümünden çık"
+"devMode.addMeasurement" = "Ölçüm ekle"
+"devMode.measurements" = "Ölçümleri listele"
+"devMode.removeMeasurement" = "Ölçümü kaldır"
 "devResource.add" = "Geliştirici kaynağı ekle"
 "devResource.edit" = "Geliştirici kaynağını düzenle"
 "devResource.list" = "Geliştirici kaynaklarını listele"
@@ -1712,6 +1925,7 @@ name = "Türkçe"
 "edit.duplicate" = "Çoğalt"
 "edit.findReplace" = "Bul ve değiştir"
 "edit.paste" = "Yapıştır"
+"edit.pasteDesignLayers" = "Tasarım katmanlarını yapıştır"
 "edit.pasteOver" = "Seçimin üzerine yapıştır"
 "edit.pasteProperties" = "Özellikleri yapıştır"
 "edit.pasteReplace" = "Değiştirmek için yapıştır"
@@ -1735,7 +1949,9 @@ name = "Türkçe"
 "file.exportLayers" = "Katmanları dışa aktar"
 "file.exportSvg" = "Seçimi SVG olarak dışa aktar"
 "file.import" = "İçe aktar"
+"file.moveTab" = "Sekmeyi taşı"
 "file.new" = "Yeni tasarım dosyası"
+"file.newBoard" = "Yeni pano"
 "file.newFromTemplate" = "Şablondan yeni"
 "file.open" = "Aç"
 "file.openRecent" = "Son kullanılanı aç"
@@ -1918,6 +2134,12 @@ name = "Türkçe"
 "select.sameStroke" = "Aynı konturu seç"
 "select.sameText" = "Aynı metin özelliklerini seç"
 "select.set" = "Seç"
+"selection.applyColorStyle" = "Seçime renk stili uygula"
+"selection.bindColorVariable" = "Seçime renk değişkeni uygula"
+"selection.colors" = "Seçim renkleri"
+"selection.detachColor" = "Seçim rengini ayır"
+"selection.selectColor" = "Bu renkteki katmanları seç"
+"selection.setPaint" = "Seçimin rengini değiştir"
 "shape.arrow" = "Ok"
 "shape.ellipse" = "Elips"
 "shape.line" = "Çizgi"
@@ -1998,10 +2220,14 @@ name = "Türkçe"
 "text.weightUp" = "Yazı tipi kalınlığını artır"
 "tool.arrow" = "Ok"
 "tool.comment" = "Yorum"
+"tool.connector" = "Bağlayıcı"
 "tool.ellipse" = "Elips"
+"tool.eraser" = "Silgi"
 "tool.frame" = "Çerçeve"
 "tool.hand" = "El"
+"tool.highlighter" = "Fosforlu kalem"
 "tool.line" = "Çizgi"
+"tool.marker" = "Keçeli kalem"
 "tool.move" = "Taşı"
 "tool.pen" = "Kalem"
 "tool.pencil" = "Kurşun kalem"
@@ -2013,9 +2239,12 @@ name = "Türkçe"
 "tool.scaleAnchor" = "Ölçekleme bağlantı noktası"
 "tool.section" = "Bölüm"
 "tool.set" = "Araç seç"
+"tool.shape" = "Şekiller"
 "tool.shapeBuilder" = "Şekil oluşturucu"
 "tool.slice" = "Dilim"
+"tool.stamp" = "Damga"
 "tool.star" = "Yıldız"
+"tool.sticky" = "Yapışkan not"
 "tool.text" = "Metin"
 "transform.move" = "Taşı"
 "transform.moveTo" = "Şuraya taşı"
@@ -2077,11 +2306,13 @@ name = "Türkçe"
 "vector.edit.tool" = "Vektör düzenleme aracı"
 "vector.edit.transform" = "Noktaları dönüştür"
 "vector.edit.widthPoint" = "Genişlik noktası"
+"vector.fillRule" = "Dolgu kuralını ayarla"
 "vector.flatten" = "Düzleştir"
 "vector.join" = "Seçimi birleştir"
 "vector.offset" = "Yolu ötele"
 "vector.outlineStroke" = "Konturu ana hatlara dönüştür"
 "vector.reverse" = "Yol yönünü ters çevir"
+"vector.reverseLoop" = "Döngüyü çevir"
 "vector.simplify" = "Vektörü sadeleştir"
 "vector.smoothJoin" = "Seçimi yumuşak birleştir"
 "version.autosave" = "Otomatik kayıt sürümü"
@@ -2143,6 +2374,8 @@ name = "Türkçe"
 "widget.click" = "Widget'a tıkla"
 "widget.insert" = "Widget ekle"
 "widget.list" = "Widget'ları listele"
+"widget.menu" = "Widget menüsü"
+"widget.setText" = "Widget alanını düzenle"
 "window.focus" = "Pencereyi öne getir"
 "window.new" = "Yeni pencere"
 "template.list" = "Şablonları listele"
diff --git a/crates/ui-egui/locales/vi.toml b/crates/ui-egui/locales/vi.toml
new file mode 100644
index 00000000..fd32bd8a
--- /dev/null
+++ b/crates/ui-egui/locales/vi.toml
@@ -0,0 +1,2364 @@
+# FigCraft interface strings: Vietnamese.
+#
+# Draft — needs native review: machine-drafted from the English catalog. Brand names, keyboard
+# glyphs and {placeholders} stay as they are. Vietnamese nouns do not inflect for number, so plural
+# entries give only `other`. See docs/translating.md.
+
+[meta]
+name = "Tiếng Việt"
+status = "draft — needs native review"
+
+[ui]
+"% of all commits" = "% tổng số commit"
+"(no longer published)" = "(không còn được xuất bản)"
+"({n} warnings: some entries were skipped)" = { other = "({n} cảnh báo: một số mục đã bị bỏ qua)" }
+"+ Create variable" = "+ Tạo biến"
+".fig (experimental)" = ".fig (thử nghiệm)"
+"1…9, 0" = "1…9, 0"
+"@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PR, {commits} commit, +{added} / −{deleted} dòng (Δ {delta}), +{bin_added} / −{bin_deleted} tài nguyên nhị phân, {first} – {last}"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Đã tồn tại tệp .figcraft có tên này. Hãy chọn tên đầy đủ của tệp để xác nhận thay thế."
+"A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "Một bộ sưu tập của tệp này với các chế độ và biến sau: ghi đè giá trị theo từng chế độ và thêm các biến riêng"
+"A layer on its own aligns to its frame: select more layers, or one in a frame" = "Một lớp riêng lẻ sẽ căn chỉnh theo khung của nó: hãy chọn thêm lớp, hoặc chọn một lớp bên trong khung"
+"A responsive product page: hero, features, figures, a quote and a footer" = "Trang sản phẩm đáp ứng: phần mở đầu, tính năng, số liệu, trích dẫn và chân trang"
+"A spring plays until it settles: its mass, stiffness and damping set how long" = "Chuyển động lò xo chạy cho đến khi ổn định: khối lượng, độ cứng và độ giảm chấn quyết định thời lượng"
+"A title, an agenda, a big figure, a chart and a closing slide" = "Tiêu đề, chương trình, số liệu lớn, biểu đồ và trang kết thúc"
+"A to Z" = "A đến Z"
+"About" = "Giới thiệu"
+"About FigCraft" = "Giới thiệu về FigCraft"
+"About this server" = "Giới thiệu về máy chủ này"
+"Action" = "Hành động"
+"Actions" = "Hành động"
+"Actions for {name}" = "Hành động cho {name}"
+"Actions…" = "Hành động…"
+"Active" = "Đang hoạt động"
+"Actual size (100%)" = "Kích thước thực (100%)"
+"Add a category" = "Thêm danh mục"
+"Add a comment" = "Thêm bình luận"
+"Add a description" = "Thêm mô tả"
+"Add a frame (F) or a shape (R) to get started" = "Thêm khung (F) hoặc hình dạng (R) để bắt đầu"
+"Add a layer or component to tile first" = "Hãy thêm một lớp hoặc thành phần để lặp ô trước"
+"Add a note for developers" = "Thêm ghi chú cho nhà phát triển"
+"Add action" = "Thêm hành động"
+"Add actions for when no condition holds" = "Thêm hành động khi không có điều kiện nào thỏa mãn"
+"Add an annotation for developers" = "Thêm chú thích cho nhà phát triển"
+"Add another condition" = "Thêm điều kiện khác"
+"Add auto layout" = "Thêm bố cục tự động"
+"Add background behind overlay" = "Thêm nền phía sau lớp phủ"
+"Add content to this slot" = "Thêm nội dung vào ô chứa này"
+"Add dev resource" = "Thêm tài nguyên dev"
+"Add effect" = "Thêm hiệu ứng"
+"Add export setting" = "Thêm thiết lập xuất"
+"Add fill" = "Thêm màu tô"
+"Add interaction" = "Thêm tương tác"
+"Add layout grid" = "Thêm lưới bố cục"
+"Add library" = "Thêm thư viện"
+"Add library file…" = "Thêm tệp thư viện…"
+"Add max height" = "Thêm chiều cao tối đa"
+"Add max width" = "Thêm chiều rộng tối đa"
+"Add min height" = "Thêm chiều cao tối thiểu"
+"Add min width" = "Thêm chiều rộng tối thiểu"
+"Add mode" = "Thêm chế độ"
+"Add new page" = "Thêm trang mới"
+"Add or update collections from a variables JSON" = "Thêm hoặc cập nhật bộ sưu tập từ JSON biến"
+"Add properties to make instances configurable" = "Thêm thuộc tính để có thể cấu hình các bản thể"
+"Add reaction" = "Thêm biểu cảm"
+"Add starting point" = "Thêm điểm bắt đầu"
+"Add stroke" = "Thêm nét"
+"Add variant" = "Thêm biến thể"
+"Add variant with a new value" = "Thêm biến thể với giá trị mới"
+"Added" = "Đã thêm"
+"Added the library \"{name}\"" = "Đã thêm thư viện \"{name}\""
+"Adding to {name}" = "Đang thêm vào {name}"
+"Adjust" = "Điều chỉnh"
+"Adjustment presets" = "Thiết lập sẵn điều chỉnh"
+"Advanced" = "Nâng cao"
+"Advanced stroke" = "Nét nâng cao"
+"After delay" = "Sau khoảng trễ"
+"After delay {ms}ms" = "Sau khoảng trễ {ms}ms"
+"Align" = "Căn chỉnh"
+"Align bottom" = "Căn dưới"
+"Align center" = "Căn giữa"
+"Align horizontal centers" = "Căn tâm ngang"
+"Align left" = "Căn trái"
+"Align middle" = "Căn giữa dọc"
+"Align right" = "Căn phải"
+"Align text baselines" = "Căn theo đường cơ sở văn bản"
+"Align top" = "Căn trên"
+"Align vertical centers" = "Căn tâm dọc"
+"Alignment" = "Căn chỉnh"
+"All" = "Tất cả"
+"All categories" = "Tất cả danh mục"
+"All comments" = "Tất cả bình luận"
+"All components" = "Tất cả thành phần"
+"All fonts" = "Tất cả phông chữ"
+"All supported properties" = "Tất cả thuộc tính được hỗ trợ"
+"All the fonts this file uses are installed" = "Tất cả phông chữ tệp này sử dụng đều đã được cài đặt"
+"All variables" = "Tất cả biến"
+"Alpha" = "Alpha"
+"Alphabetical" = "Theo bảng chữ cái"
+"Alt+drag" = "Alt+kéo"
+"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "Màn hình phân tích trên lưới: số liệu, biểu đồ vẽ bằng vector và bảng dữ liệu"
+"An invite link that opens FigCraft and joins" = "Liên kết mời giúp mở FigCraft và tham gia ngay"
+"Anchor" = "Điểm neo"
+"Android" = "Android"
+"Angular" = "Góc"
+"Animation" = "Hoạt ảnh"
+"Annotations" = "Chú thích"
+"Annotations shown on the canvas" = "Chú thích hiển thị trên vùng vẽ"
+"Another server, or one that needs its key. The usual server is set in Preferences." = "Một máy chủ khác, hoặc máy chủ cần khóa truy cập. Máy chủ thường dùng được đặt trong Tùy chọn."
+"Any status" = "Mọi trạng thái"
+"Anyone on your network with this code can edit the file, while this app stays open." = "Bất kỳ ai trong mạng của bạn có mã này đều có thể chỉnh sửa tệp trong khi ứng dụng này đang mở."
+"Anyone with the edit link can change the file; the view link only lets people look. The links carry their secrets: share them like passwords. `figcraft-server links` makes more and revokes them." = "Bất kỳ ai có liên kết chỉnh sửa đều có thể thay đổi tệp; liên kết xem chỉ cho phép xem. Các liên kết chứa mã bí mật: hãy chia sẻ cẩn thận như mật khẩu. `figcraft-server links` dùng để tạo thêm và thu hồi liên kết."
+"Anyone with this code can edit the file." = "Bất kỳ ai có mã này đều có thể chỉnh sửa tệp."
+"Anyone with this code can look at the file, not change it." = "Bất kỳ ai có mã này đều có thể xem tệp nhưng không thể chỉnh sửa."
+"Appearance" = "Giao diện"
+"Apply a component property" = "Áp dụng thuộc tính thành phần"
+"Apply variable" = "Áp dụng biến"
+"Apply variable to text" = "Áp dụng biến cho văn bản"
+"Apply variable to visibility" = "Áp dụng biến cho hiển thị"
+"Apps" = "Ứng dụng"
+"Apr" = "Thg 4"
+"Arc" = "Cung"
+"Arc ratio" = "Tỷ lệ cung"
+"Arc start" = "Điểm đầu cung"
+"Arc sweep" = "Góc quét cung"
+"Archive" = "Lưu trữ"
+"Archived" = "Đã lưu trữ"
+"Arrange" = "Sắp xếp"
+"Arrow" = "Mũi tên"
+"As typed" = "Như đã nhập"
+"Asking the server…" = "Đang hỏi máy chủ…"
+"Assets" = "Tài nguyên"
+"Aug" = "Thg 8"
+"Auto" = "Tự động"
+"Auto (space around)" = "Tự động (cách đều xung quanh)"
+"Auto (space between)" = "Tự động (cách đều giữa các mục)"
+"Auto (space evenly)" = "Tự động (cách đều bằng nhau)"
+"Auto ({mode})" = "Tự động ({mode})"
+"Auto columns" = "Cột tự động"
+"Auto gap" = "Khoảng hở tự động"
+"Auto height" = "Chiều cao tự động"
+"Auto layout" = "Bố cục tự động"
+"Auto rows" = "Hàng tự động"
+"Auto width" = "Chiều rộng tự động"
+"Back" = "Quay lại"
+"Back to Ready for dev" = "Quay lại Sẵn sàng cho dev"
+"Back to Ready for dev: the next change compares with how it is now" = "Quay lại Sẵn sàng cho dev: thay đổi tiếp theo sẽ so sánh với trạng thái hiện tại"
+"Back to assets" = "Quay lại tài nguyên"
+"Back to current" = "Quay lại hiện tại"
+"Back to styles" = "Quay lại các kiểu"
+"Back to the FigCraft server" = "Quay lại máy chủ FigCraft"
+"Back to the canvas from a focused region" = "Quay lại vùng vẽ từ vùng đang giữ tiêu điểm"
+"Back to the current version" = "Quay lại phiên bản hiện tại"
+"Back to the font's value" = "Quay lại giá trị của phông chữ"
+"Back to the values the font style implies" = "Quay lại các giá trị mặc định của kiểu phông chữ"
+"Background" = "Nền"
+"Background blur" = "Làm mờ nền"
+"Basics" = "Cơ bản"
+"Before" = "Trước"
+"Bend" = "Uốn cong"
+"Bevel" = "Vát cạnh"
+"Binary assets added" = "Tài nguyên nhị phân đã thêm"
+"Binary assets removed" = "Tài nguyên nhị phân đã xóa"
+"Black & white" = "Đen trắng"
+"Bleed" = "Vùng tràn lề"
+"Bleed marks" = "Dấu tràn lề"
+"Bleed marks need a bleed" = "Dấu tràn lề cần có vùng tràn lề"
+"Blend" = "Hòa trộn"
+"Blend mode" = "Chế độ hòa trộn"
+"Blue" = "Xanh lam"
+"Blur" = "Làm mờ"
+"Boolean" = "Boolean"
+"Boolean groups" = "Nhóm boolean"
+"Both directions" = "Cả hai hướng"
+"Bottom" = "Dưới"
+"Bottom left radius" = "Bán kính góc dưới trái"
+"Bottom padding" = "Đệm dưới"
+"Bottom right radius" = "Bán kính góc dưới phải"
+"Bound to {name}. Click to detach the variable." = "Đã gắn với {name}. Nhấp để tách biến."
+"Branch" = "Nhánh"
+"Branch archived" = "Đã lưu trữ nhánh"
+"Branch merged" = "Đã hợp nhất nhánh"
+"Branch name" = "Tên nhánh"
+"Branch of {file}" = "Nhánh của {file}"
+"Branch of {file} · merged or archived" = "Nhánh của {file} · đã hợp nhất hoặc lưu trữ"
+"Branch updated from main" = "Đã cập nhật nhánh từ nhánh chính"
+"Branch {name}" = "Nhánh {name}"
+"Branches" = "Các nhánh"
+"Bring forward" = "Đưa tiến một lớp"
+"Bring the main file's changes into the branch" = "Đưa các thay đổi của tệp chính vào nhánh"
+"Bring to front" = "Đưa lên trên cùng"
+"Bristle" = "Lông cọ"
+"Browse" = "Duyệt"
+"Brush" = "Cọ vẽ"
+"Brush rotation jitter" = "Độ ngẫu nhiên góc xoay cọ"
+"Brush scatter" = "Độ phân tán cọ"
+"Brush size jitter" = "Độ ngẫu nhiên cỡ cọ"
+"Brush spacing" = "Khoảng cách nét cọ"
+"Bulleted list" = "Danh sách dấu đầu dòng"
+"C or Shift+C" = "C hoặc Shift+C"
+"C or ⇧C" = "C hoặc ⇧C"
+"CMYK colour" = "Màu CMYK"
+"CSS custom properties…" = "Thuộc tính tùy chỉnh CSS…"
+"Can edit" = "Có thể chỉnh sửa"
+"Can view" = "Có thể xem"
+"Can't read this library: {e}" = "Không thể đọc thư viện này: {e}"
+"Cancel" = "Hủy"
+"Canvas" = "Vùng vẽ"
+"Canvas stacking" = "Thứ tự xếp chồng trên vùng vẽ"
+"Cap height to baseline" = "Chiều cao chữ hoa đến đường cơ sở"
+"Case" = "Chữ hoa/thường"
+"Case-sensitive forms" = "Dạng ký tự theo chữ hoa/thường"
+"Categories" = "Danh mục"
+"Center" = "Giữa"
+"Change alias" = "Đổi bí danh"
+"Change resolved" = "Đã giải quyết thay đổi"
+"Change style" = "Đổi kiểu"
+"Change to" = "Đổi thành"
+"Change to needs a layer inside a variant" = "Đổi thành cần một lớp nằm trong biến thể"
+"Changed" = "Đã thay đổi"
+"Changed on both sides: keep one" = "Đã thay đổi ở cả hai phía: hãy giữ một bên"
+"Changes on main" = "Thay đổi trên nhánh chính"
+"Changes on the branch" = "Thay đổi trên nhánh"
+"Changes unknown" = "Không rõ thay đổi"
+"Checking the fonts installed on this computer…" = "Đang kiểm tra các phông chữ cài đặt trên máy tính này…"
+"Checking the server…" = "Đang kiểm tra máy chủ…"
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "Hãy chọn React, Leptos, Vue, SwiftUI, Compose, ArkUI hoặc Flutter ở trên để kết nối thành phần này với mã nguồn."
+"Choose another profile to change it." = "Hãy chọn hồ sơ khác để thay đổi."
+"Choose collection" = "Chọn bộ sưu tập"
+"Choose image" = "Chọn hình ảnh"
+"Choose mode" = "Chọn chế độ"
+"Choose variable" = "Chọn biến"
+"Circle" = "Hình tròn"
+"Clear from this list" = "Xóa khỏi danh sách này"
+"Clear recent" = "Xóa danh sách gần đây"
+"Click + to replace mixed content" = "Nhấp + để thay thế nội dung hỗn hợp"
+"Click anywhere on the canvas to leave one." = "Nhấp vào bất kỳ đâu trên vùng vẽ để lại bình luận."
+"Click or drag to merge · {alt} removes" = "Nhấp hoặc kéo để hợp nhất · {alt} để xóa"
+"Click or drag to remove · {alt} merges" = "Nhấp hoặc kéo để xóa · {alt} để hợp nhất"
+"Click to record a key" = "Nhấp để ghi nhận phím"
+"Clip content" = "Cắt nội dung tràn khung"
+"Clip to shape" = "Cắt theo hình dạng"
+"Close" = "Đóng"
+"Close overlay" = "Đóng lớp phủ"
+"Close preview" = "Đóng xem trước"
+"Close tab" = "Đóng thẻ"
+"Close version history" = "Đóng lịch sử phiên bản"
+"Close when clicking outside" = "Đóng khi nhấp ra ngoài"
+"Code" = "Mã"
+"Code or invite link" = "Mã hoặc liên kết mời"
+"Code syntax" = "Cú pháp mã"
+"Collapse" = "Thu gọn"
+"Collapse panel" = "Thu gọn bảng"
+"Collection" = "Bộ sưu tập"
+"Collections" = "Bộ sưu tập"
+"Color" = "Màu"
+"Color burn" = "Đốt màu"
+"Color dodge" = "Làm sáng màu"
+"Color format" = "Định dạng màu"
+"Color profile" = "Hồ sơ màu"
+"Color profile: {name}" = "Hồ sơ màu: {name}"
+"Color styles" = "Kiểu màu"
+"Color values in this file are in this color space." = "Các giá trị màu trong tệp này thuộc không gian màu này."
+"Color variables" = "Biến màu"
+"Colour" = "Màu"
+"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Kiểu màu và văn bản, biến Sáng và Tối, nút bấm, ô nhập liệu và thẻ"
+"Column" = "Cột"
+"Column gap" = "Khoảng hở cột"
+"Column sizes" = "Kích thước cột"
+"Column span" = "Số cột gộp"
+"Columns" = "Các cột"
+"Columns {count}" = "Cột {count}"
+"Comment" = "Bình luận"
+"Comments" = "Bình luận"
+"Commits" = "Commit"
+"Company" = "Công ty"
+"Compare changes" = "So sánh thay đổi"
+"Compatibility notes" = "Ghi chú tương thích"
+"Completed" = "Đã hoàn thành"
+"Component" = "Thành phần"
+"Component name" = "Tên thành phần"
+"Component property" = "Thuộc tính thành phần"
+"Component set" = "Bộ thành phần"
+"Component sets" = "Các bộ thành phần"
+"Components" = "Các thành phần"
+"Conditional" = "Điều kiện"
+"Confetti" = "Hoa giấy"
+"Conflicts" = "Xung đột"
+"Connect to code" = "Kết nối với mã"
+"Connected" = "Đã kết nối"
+"Connected to code: {from}" = "Đã kết nối với mã: {from}"
+"Connection lost, reconnecting (attempt {attempt})…" = "Mất kết nối, đang kết nối lại (lần thử {attempt})…"
+"Constrain proportions" = "Giữ tỷ lệ"
+"Constraints" = "Ràng buộc"
+"Content" = "Nội dung"
+"Contents hidden" = "Đã ẩn nội dung"
+"Contextual alternates" = "Ký tự thay thế theo ngữ cảnh"
+"Contrast" = "Độ tương phản"
+"Contributors" = "Người đóng góp"
+"Contributors: {people} · Commits: {commits}" = "Người đóng góp: {people} · Commit: {commits}"
+"Controller" = "Tay cầm điều khiển"
+"Convert to frame" = "Chuyển thành khung"
+"Convert to section" = "Chuyển thành phần"
+"Cool" = "Lạnh"
+"Copied as CSS" = "Đã sao chép dưới dạng CSS"
+"Copied as PNG" = "Đã sao chép dưới dạng PNG"
+"Copied as SVG" = "Đã sao chép dưới dạng SVG"
+"Copied as text" = "Đã sao chép dưới dạng văn bản"
+"Copied {value}" = "Đã sao chép {value}"
+"Copy" = "Sao chép"
+"Copy as" = "Sao chép dưới dạng"
+"Copy as CSS" = "Sao chép dưới dạng CSS"
+"Copy as PNG" = "Sao chép dưới dạng PNG"
+"Copy as SVG" = "Sao chép dưới dạng SVG"
+"Copy code" = "Sao chép mã"
+"Copy link" = "Sao chép liên kết"
+"Copy the {label}" = "Sao chép {label}"
+"Copy {value}" = "Sao chép {value}"
+"Corner radius" = "Bán kính góc"
+"Corner smoothing" = "Làm mượt góc"
+"Couldn't download the variables" = "Không thể tải xuống các biến"
+"Couldn't reach {server}: showing what this computer remembers." = "Không thể kết nối tới {server}: đang hiển thị dữ liệu máy tính này ghi nhớ."
+"Couldn't read {name}." = "Không thể đọc {name}."
+"Couldn't save automatically: {error}" = "Không thể tự động lưu: {error}"
+"Count" = "Số lượng"
+"Create" = "Tạo"
+"Create a variable collection first" = "Hãy tạo bộ sưu tập biến trước"
+"Create a variable first" = "Hãy tạo biến trước"
+"Create alias" = "Tạo bí danh"
+"Create branch" = "Tạo nhánh"
+"Create collection" = "Tạo bộ sưu tập"
+"Create component" = "Tạo thành phần"
+"Create component property" = "Tạo thuộc tính thành phần"
+"Create components, styles or variables to publish them as a library." = "Hãy tạo các thành phần, kiểu hoặc biến để xuất bản thành thư viện."
+"Create property…" = "Tạo thuộc tính…"
+"Create style" = "Tạo kiểu"
+"Create style from the selected text" = "Tạo kiểu từ văn bản đã chọn"
+"Created" = "Đã tạo"
+"Crop" = "Cắt xén"
+"Crop marks" = "Dấu xén"
+"Ctrl+arrows" = "Ctrl+mũi tên"
+"Ctrl+click" = "Ctrl+nhấp"
+"Ctrl+scroll" = "Ctrl+cuộn"
+"Current name" = "Tên hiện tại"
+"Current version" = "Phiên bản hiện tại"
+"Cursor chat" = "Trò chuyện con trỏ"
+"Custom" = "Tùy chỉnh"
+"Custom size" = "Kích thước tùy chỉnh"
+"Cut" = "Cắt"
+"Dark" = "Tối"
+"Darken" = "Làm tối"
+"Dash" = "Nét đứt"
+"Dashboard" = "Bảng điều khiển"
+"Date created" = "Ngày tạo"
+"Dec" = "Thg 12"
+"Decoration" = "Trang trí chữ"
+"Decoration style" = "Kiểu trang trí chữ"
+"Deep select" = "Chọn sâu"
+"Default" = "Mặc định"
+"Default content" = "Nội dung mặc định"
+"Default value (the top-left variant)" = "Giá trị mặc định (biến thể ở góc trên trái)"
+"Delay" = "Độ trễ"
+"Delete" = "Xóa"
+"Delete category (its annotations stay)" = "Xóa danh mục (các chú thích vẫn được giữ lại)"
+"Delete collection" = "Xóa bộ sưu tập"
+"Delete group" = "Xóa nhóm"
+"Delete mode" = "Xóa chế độ"
+"Delete page" = "Xóa trang"
+"Delete preset" = "Xóa thiết lập sẵn"
+"Delete property" = "Xóa thuộc tính"
+"Delete the style (layers keep their values)" = "Xóa kiểu (các lớp vẫn giữ nguyên giá trị)"
+"Delete thread" = "Xóa luồng bình luận"
+"Delete variable" = "Xóa biến"
+"Delete “{name}”? This can't be undone." = "Xóa “{name}”? Thao tác này không thể hoàn tác."
+"Density" = "Mật độ"
+"Depth" = "Độ sâu"
+"Describe how and when to use this component" = "Mô tả cách thức và thời điểm sử dụng thành phần này"
+"Describe what changed" = "Mô tả những gì đã thay đổi"
+"Description" = "Mô tả"
+"Description (optional)" = "Mô tả (tùy chọn)"
+"Design" = "Thiết kế"
+"Design system starter" = "Bộ khởi đầu hệ thống thiết kế"
+"Desktop" = "Máy tính"
+"Destination" = "Đích"
+"Detach alias" = "Tách bí danh"
+"Detach instance" = "Tách bản thể"
+"Detach property" = "Tách thuộc tính"
+"Detach style" = "Tách kiểu"
+"Detach styles" = "Tách các kiểu"
+"Detach variable" = "Tách biến"
+"Details" = "Chi tiết"
+"Dev Mode" = "Dev Mode"
+"Dev resources" = "Tài nguyên dev"
+"Development" = "Phát triển"
+"Device" = "Thiết bị"
+"Device at 100%" = "Thiết bị ở mức 100%"
+"Diamond" = "Hình thoi"
+"Difference" = "Khác biệt"
+"Dimensions" = "Kích thước"
+"Direction" = "Hướng"
+"Disconnect from code" = "Ngắt kết nối mã"
+"Dispersion" = "Tán sắc"
+"Display name" = "Tên hiển thị"
+"Dissolve" = "Hòa tan"
+"Distribute and tidy" = "Phân bổ và sắp xếp gọn"
+"Distribute horizontal spacing" = "Phân bổ đều khoảng cách ngang"
+"Distribute vertical spacing" = "Phân bổ đều khoảng cách dọc"
+"Divider" = "Đường phân cách"
+"Don't truncate" = "Không cắt bớt"
+"Done" = "Xong"
+"Done editing" = "Hoàn tất chỉnh sửa"
+"Dots" = "Chấm"
+"Dotted" = "Chấm tròn"
+"Down" = "Xuống"
+"Drafts" = "Bản nháp"
+"Drag the stroke to add a width point" = "Kéo nét để thêm điểm độ rộng"
+"Draw" = "Vẽ"
+"Draw a frame" = "Vẽ khung"
+"Drawing tools" = "Công cụ vẽ"
+"Drop a .figcraft, .fig, .sketch, .json, .svg or image file." = "Thả tệp .figcraft, .fig, .sketch, .json, .svg hoặc hình ảnh vào đây."
+"Drop shadow" = "Đổ bóng"
+"Drop to import" = "Thả để nhập"
+"Drop to open" = "Thả để mở"
+"Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "Cấp phép kép MIT HOẶC Apache-2.0. Được phát triển bởi đội ngũ và cộng đồng ArtCraft."
+"Duo" = "Hai tông"
+"Duplicate" = "Nhân bản"
+"Duplicate by dragging" = "Nhân bản bằng cách kéo"
+"Duplicate mode" = "Nhân bản chế độ"
+"Duplicate page" = "Nhân bản trang"
+"Edit" = "Chỉnh sửa"
+"Edit as an expression" = "Chỉnh sửa dưới dạng biểu thức"
+"Edit colour" = "Chỉnh sửa màu"
+"Edit comment" = "Chỉnh sửa bình luận"
+"Edit dev resource" = "Chỉnh sửa tài nguyên dev"
+"Edit link" = "Liên kết chỉnh sửa"
+"Edit link copied" = "Đã sao chép liên kết chỉnh sửa"
+"Edit style" = "Chỉnh sửa kiểu"
+"Edit variable" = "Chỉnh sửa biến"
+"Edit with the builder" = "Chỉnh sửa bằng bộ dựng"
+"Edited {when}" = "Đã chỉnh sửa {when}"
+"Effect settings" = "Thiết lập hiệu ứng"
+"Effect styles" = "Kiểu hiệu ứng"
+"Effects" = "Hiệu ứng"
+"Ellipse" = "Hình elip"
+"Ellipses" = "Hình elip"
+"Else" = "Ngược lại"
+"Else if" = "Hoặc nếu"
+"Embedded profile" = "Hồ sơ nhúng sẵn"
+"Empty" = "Trống"
+"End" = "Cuối"
+"End point" = "Điểm cuối"
+"Ends the session; everyone keeps their copy" = "Kết thúc phiên; mọi người vẫn giữ bản sao của mình"
+"Enter" = "Enter"
+"Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "Nhập địa chỉ figcraft-server và nhấn Duyệt để xem các plugin mà máy chủ cung cấp."
+"Enter to save · Esc to cancel" = "Enter để lưu · Esc để hủy"
+"Eraser" = "Cục tẩy"
+"Esc" = "Esc"
+"Essential" = "Thiết yếu"
+"Every conflict has a choice." = "Mọi xung đột đều đã có lựa chọn."
+"Every top-level frame already starts a flow" = "Mọi khung cấp cao nhất đều đã là điểm bắt đầu luồng"
+"Exact opacity (4 then 5: 45%)" = "Độ mờ chính xác (nhấn 4 rồi 5: 45%)"
+"Exclude" = "Loại trừ"
+"Excluded" = "Đã loại trừ"
+"Excluded from layout" = "Đã loại trừ khỏi bố cục"
+"Excludes" = "Phép loại trừ"
+"Exclusion" = "Loại trừ"
+"Exit focus view (Esc)" = "Thoát chế độ xem tập trung (Esc)"
+"Expand" = "Mở rộng"
+"Export" = "Xuất"
+"Export all" = "Xuất tất cả"
+"Export frames and layers as PNG, JPG, SVG or PDF" = "Xuất các khung và lớp dưới dạng PNG, JPG, SVG hoặc PDF"
+"Export page as PNG" = "Xuất trang dưới dạng PNG"
+"Export settings" = "Thiết lập xuất"
+"Export variables" = "Xuất các biến"
+"Export {name}" = "Xuất {name}"
+"Export {n} layers" = { other = "Xuất {n} lớp" }
+"Exported {file}" = "Đã xuất {file}"
+"Exported {name}" = "Đã xuất {name}"
+"Exported {name}; {n} kinds of content were left out" = { other = "Đã xuất {name}; {n} loại nội dung đã bị lược bỏ" }
+"Exported {n} files" = { other = "Đã xuất {n} tệp" }
+"Export…" = "Xuất…"
+"Expose properties to instances" = "Hiển thị thuộc tính từ các bản thể lồng nhau"
+"Exposure" = "Phơi sáng"
+"Expression" = "Biểu thức"
+"Extend collection" = "Mở rộng bộ sưu tập"
+"Extends \"{name}\": overridden values are marked" = "Mở rộng \"{name}\": các giá trị ghi đè được đánh dấu"
+"Eye" = "Mắt"
+"F" = "F"
+"Fade" = "Mờ dần"
+"False" = "Sai"
+"Feb" = "Thg 2"
+"Fetching from the server…" = "Đang tải từ máy chủ…"
+"FigCraft couldn't open its window: {error}" = "FigCraft không thể mở cửa sổ: {error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft chưa hỗ trợ mọi tính năng của các tệp này. Các ghi chú dưới đây liệt kê những gì đã được lược bỏ hoặc thay đổi trong bản sao đã nhập; tệp gốc không bị thay đổi."
+"File" = "Tệp"
+"File name" = "Tên tệp"
+"File not found" = "Không tìm thấy tệp"
+"File published" = "Đã xuất bản tệp"
+"Files aren't end-to-end encrypted: the server's operator can read them." = "Các tệp không được mã hóa đầu cuối: người vận hành máy chủ có thể đọc được chúng."
+"Files nobody opens for {n} days are deleted." = { other = "Các tệp không ai mở trong {n} ngày sẽ bị xóa." }
+"Fill" = "Màu tô"
+"Fill (fr)" = "Lấp đầy (fr)"
+"Fill container" = "Lấp đầy khung chứa"
+"Fill window" = "Lấp đầy cửa sổ"
+"Fills" = "Màu tô"
+"Fill|sizing" = "Lấp đầy"
+"Filter and sort" = "Lọc và sắp xếp"
+"Find" = "Tìm"
+"Find and replace" = "Tìm và thay thế"
+"Find layers" = "Tìm lớp"
+"First" = "Đầu tiên"
+"First commit" = "Commit đầu tiên"
+"First on top" = "Mục đầu ở trên cùng"
+"Fit" = "Vừa khít"
+"Fit device to window" = "Vừa thiết bị với cửa sổ"
+"Fit to contents" = "Vừa khít nội dung"
+"Fit to window" = "Vừa khít cửa sổ"
+"Fit width" = "Vừa chiều rộng"
+"Fixed" = "Cố định"
+"Fixed gap" = "Khoảng hở cố định"
+"Fixed size" = "Kích thước cố định"
+"Flatten" = "Làm phẳng"
+"Flip" = "Lật"
+"Flip horizontal" = "Lật ngang"
+"Flip text to the other side" = "Lật văn bản sang phía bên kia"
+"Flip vertical" = "Lật dọc"
+"Flip width profile" = "Lật biên dạng độ rộng"
+"Flow starting point" = "Điểm bắt đầu luồng"
+"Flow starting points" = "Các điểm bắt đầu luồng"
+"Flows" = "Các luồng"
+"Focus view" = "Chế độ xem tập trung"
+"Fold autosaves" = "Gộp các bản tự động lưu"
+"Folder: click to collapse" = "Thư mục: nhấp để thu gọn"
+"Folder: click to expand" = "Thư mục: nhấp để mở rộng"
+"Follow" = "Theo dõi"
+"Follow {name}" = "Theo dõi {name}"
+"Following" = "Đang theo dõi"
+"Following {name} · {key} to stop" = "Đang theo dõi {name} · {key} để dừng"
+"Font" = "Phông chữ"
+"Font not installed" = "Phông chữ chưa được cài đặt"
+"Font size" = "Cỡ chữ"
+"Font style" = "Kiểu phông chữ"
+"Forget on this computer" = "Quên trên máy tính này"
+"Four screens of a trail app with components and a prototype flow" = "Bốn màn hình ứng dụng đường mòn với các thành phần và luồng nguyên mẫu"
+"Fractions" = "Phân số"
+"Frame" = "Khung"
+"Frame selection" = "Đóng khung vùng chọn"
+"Frame tools" = "Công cụ khung"
+"Frames" = "Các khung"
+"From the library \"{name}\": read-only" = "Từ thư viện \"{name}\": chỉ đọc"
+"From {name}" = "Từ {name}"
+"From {server}" = "Từ {server}"
+"Frost" = "Độ mờ sương"
+"Gap" = "Khoảng hở"
+"Gap between columns" = "Khoảng hở giữa các cột"
+"Gap between items" = "Khoảng hở giữa các mục"
+"Gap between rows" = "Khoảng hở giữa các hàng"
+"Getting started" = "Bắt đầu"
+"Give the address of a server open to the public, or a server's address with its key (`figcraft-server key` prints it)." = "Nhập địa chỉ của một máy chủ công khai, hoặc địa chỉ máy chủ kèm theo khóa (`figcraft-server key` sẽ in khóa đó)."
+"Glass" = "Kính"
+"Go to main component" = "Đi tới thành phần chính"
+"Go to {name}" = "Đi tới {name}"
+"Grab bag" = "Tổng hợp"
+"Gradient" = "Chuyển sắc"
+"Gray" = "Xám"
+"Green" = "Xanh lá"
+"Greyscale components and two example screens to sketch a flow with" = "Các thành phần thang độ xám và hai màn hình mẫu để phác thảo luồng"
+"Grid" = "Lưới"
+"Grid ({size})" = "Lưới ({size})"
+"Grid styles" = "Kiểu lưới"
+"Grid {size}" = "Lưới {size}"
+"Group" = "Nhóm"
+"Group selection" = "Nhóm vùng chọn"
+"Groups" = "Các nhóm"
+"Gutter" = "Rãnh cột"
+"Hand tool" = "Công cụ bàn tay"
+"Hanging list" = "Danh sách nhô đầu dòng"
+"Hanging punctuation" = "Dấu câu treo ngoài lề"
+"Hard light" = "Ánh sáng gắt"
+"Height" = "Chiều cao"
+"Help" = "Trợ giúp"
+"Help and resources" = "Trợ giúp và tài nguyên"
+"Help page" = "Trang trợ giúp"
+"Here: {names}" = "Tại đây: {names}"
+"Hidden" = "Đã ẩn"
+"Hide contents" = "Ẩn nội dung"
+"Hide from publishing" = "Ẩn khi xuất bản"
+"Hide section contents" = "Ẩn nội dung phần"
+"Hide these tips (Getting started in the Help menu shows them again)" = "Ẩn các mẹo này (chọn Bắt đầu trong trình đơn Trợ giúp để hiện lại)"
+"Hide when publishing" = "Ẩn khi xuất bản"
+"Highlight layers on hover" = "Làm nổi bật lớp khi di chuột qua"
+"Highlights" = "Vùng sáng"
+"Hold Alt" = "Giữ Alt"
+"Hold Alt+Z" = "Giữ Alt+Z"
+"Hold Ctrl" = "Giữ Ctrl"
+"Hold Z" = "Giữ Z"
+"Hold ⌃ or ⌘" = "Giữ ⌃ hoặc ⌘"
+"Hold ⌥" = "Giữ ⌥"
+"Hold ⌥Z" = "Giữ ⌥Z"
+"Home" = "Trang chủ"
+"Horizontal" = "Ngang"
+"Horizontal align" = "Căn ngang"
+"Horizontal hex" = "Lục giác ngang"
+"Horizontal padding" = "Đệm ngang"
+"Horizontal spacing" = "Khoảng cách ngang"
+"Hosted by {operator}" = "Được vận hành bởi {operator}"
+"Hover a layer to see its properties" = "Di chuột qua một lớp để xem thuộc tính"
+"Hover other layers to measure the distance" = "Di chuột qua các lớp khác để đo khoảng cách"
+"Hue" = "Sắc độ"
+"Hug" = "Ôm khít"
+"Hug contents" = "Ôm khít nội dung"
+"Icon components on a 24 px grid with keylines and a size preview" = "Các thành phần biểu tượng trên lưới 24 px có đường định chuẩn và khung xem trước kích thước"
+"Icon set starter" = "Bộ khởi đầu biểu tượng"
+"If" = "Nếu"
+"If it keeps happening, please report it at {link} with this message." = "Nếu lỗi vẫn tiếp diễn, vui lòng báo cáo tại {link} kèm theo thông báo này."
+"If {condition}" = "Nếu {condition}"
+"Ignore auto layout (absolute position)" = "Bỏ qua bố cục tự động (vị trí tuyệt đối)"
+"Image" = "Hình ảnh"
+"Images" = "Hình ảnh"
+"Import" = "Nhập"
+"Import path" = "Đường dẫn nhập"
+"Import plugin from manifest" = "Nhập plugin từ tệp kê khai"
+"Import plugin from manifest…" = "Nhập plugin từ tệp kê khai…"
+"Import report" = "Báo cáo nhập"
+"Import variables" = "Nhập các biến"
+"Imported document" = "Tài liệu đã nhập"
+"Imported {name}" = "Đã nhập {name}"
+"Imported {n} new variables, updated {updated}" = { other = "Đã nhập {n} biến mới, cập nhật {updated}" }
+"Import…" = "Nhập…"
+"In an instance, this comes from the main component" = "Trong bản thể, giá trị này được lấy từ thành phần chính"
+"In the browser you can join sessions the desktop app hosts and files on a FigCraft server. A page opened over https reaches other computers only through wss:// links (a server behind TLS)." = "Trên trình duyệt, bạn có thể tham gia các phiên do ứng dụng máy tính chủ trì và các tệp trên máy chủ FigCraft. Trang mở qua https chỉ kết nối tới máy tính khác qua liên kết wss:// (máy chủ có TLS)."
+"Include bounding box" = "Bao gồm khung giới hạn"
+"Include id attribute" = "Bao gồm thuộc tính id"
+"Included" = "Đã bao gồm"
+"Included in layout" = "Được tính trong bố cục"
+"Individual corners" = "Từng góc riêng"
+"Individual padding" = "Đệm từng cạnh"
+"Individual strokes" = "Nét từng cạnh"
+"Ink" = "Mực"
+"Inner shadow" = "Bóng trong"
+"Inside" = "Bên trong"
+"Inspect" = "Kiểm tra"
+"Inspect the layer under the pointer: size, colours, typography" = "Kiểm tra lớp dưới con trỏ: kích thước, màu sắc, kiểu chữ"
+"Install" = "Cài đặt"
+"Install plugin" = "Cài đặt plugin"
+"Installed" = "Đã cài đặt"
+"Installed {name}" = "Đã cài đặt {name}"
+"Installing…" = "Đang cài đặt…"
+"Instance" = "Bản thể"
+"Instance properties" = "Thuộc tính bản thể"
+"Instance swap" = "Hoán đổi bản thể"
+"Instance swap (no other component)" = "Hoán đổi bản thể (không có thành phần khác)"
+"Instances" = "Các bản thể"
+"Instant" = "Tức thì"
+"Intensity" = "Cường độ"
+"Interaction" = "Tương tác"
+"Interactions" = "Các tương tác"
+"Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "Thiết kế giao diện và tạo nguyên mẫu. Công cụ thiết kế miễn phí, mã nguồn mở, được viết mới hoàn toàn bằng Rust, thuộc bộ ứng dụng sáng tạo ArtCraft."
+"Interface size" = "Kích thước giao diện"
+"Intersect" = "Giao nhau"
+"Intersects" = "Phép giao"
+"Invalid color" = "Màu không hợp lệ"
+"Invite link" = "Liên kết mời"
+"Invite link copied" = "Đã sao chép liên kết mời"
+"It asks permission to:" = "Plugin yêu cầu quyền:"
+"Jan" = "Thg 1"
+"Join" = "Tham gia"
+"Join code copied" = "Đã sao chép mã tham gia"
+"Join code or invite link" = "Mã tham gia hoặc liên kết mời"
+"Join live session" = "Tham gia phiên trực tiếp"
+"Join us on Discord" = "Tham gia Discord cùng chúng tôi"
+"Join with a code" = "Tham gia bằng mã"
+"Joined" = "Đã tham gia"
+"Joined {file}" = "Đã tham gia {file}"
+"Joining…" = "Đang tham gia…"
+"Join|stroke" = "Khớp nối"
+"Jul" = "Thg 7"
+"Jun" = "Thg 6"
+"Just now" = "Vừa xong"
+"Justify" = "Căn đều"
+"Keep appearance" = "Giữ nguyên diện mạo"
+"Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "Giữ nguyên diện mạo sẽ chuyển đổi mọi giá trị màu sang {profile} để màu sắc hiển thị như cũ. Giữ nguyên giá trị sẽ giữ nguyên các con số nên màu sắc sẽ thay đổi."
+"Keep tool selected after use" = "Giữ công cụ được chọn sau khi dùng"
+"Keep values" = "Giữ nguyên giá trị"
+"Key/Gamepad" = "Phím/Tay cầm"
+"Key/Gamepad {key}" = "Phím/Tay cầm {key}"
+"Keyboard shortcuts" = "Phím tắt"
+"Kits" = "Bộ công cụ"
+"Landing page" = "Trang đích"
+"Language" = "Ngôn ngữ"
+"Lasso" = "Dây quây"
+"Last" = "Cuối cùng"
+"Last change: {note}" = "Thay đổi gần nhất: {note}"
+"Last commit" = "Commit cuối cùng"
+"Last modified" = "Sửa đổi lần cuối"
+"Last on top" = "Mục cuối ở trên cùng"
+"Layer blur" = "Làm mờ lớp"
+"Layer name" = "Tên lớp"
+"Layers" = "Các lớp"
+"Layers in an instance take their position from the main component" = "Các lớp trong bản thể lấy vị trí từ thành phần chính"
+"Layout" = "Bố cục"
+"Layout grid" = "Lưới bố cục"
+"Layout grid settings" = "Thiết lập lưới bố cục"
+"Layout grids" = "Lưới bố cục"
+"Leave session" = "Rời phiên"
+"Leaves" = "Lá cây"
+"Left" = "Trái"
+"Left & right" = "Trái & phải"
+"Left padding" = "Đệm trái"
+"Left side" = "Cạnh trái"
+"Left side width" = "Độ rộng cạnh trái"
+"Letter case" = "Kiểu chữ hoa/thường"
+"Letter spacing" = "Khoảng cách chữ"
+"Libraries" = "Thư viện"
+"Libraries in this file" = "Thư viện trong tệp này"
+"Library updates available" = "Có bản cập nhật thư viện"
+"Library: click to collapse" = "Thư viện: nhấp để thu gọn"
+"Library: click to expand" = "Thư viện: nhấp để mở rộng"
+"Library: its variables are read-only here; edit them in the library file and publish it" = "Thư viện: các biến của thư viện chỉ đọc tại đây; hãy chỉnh sửa chúng trong tệp thư viện rồi xuất bản"
+"Light" = "Sáng"
+"Lighten" = "Làm sáng"
+"Light|glass" = "Ánh sáng"
+"Line" = "Đường thẳng"
+"Line arrow" = "Mũi tên nét mảnh"
+"Line delta" = "Chênh lệch dòng"
+"Line height" = "Chiều cao dòng"
+"Linear" = "Tuyến tính"
+"Lines" = "Đường thẳng"
+"Lines +/−" = "Dòng +/−"
+"Lines added" = "Dòng đã thêm"
+"Lines deleted" = "Dòng đã xóa"
+"Link" = "Liên kết"
+"Link copied" = "Đã sao chép liên kết"
+"Link docs, code or tickets for developers." = "Liên kết tài liệu, mã nguồn hoặc thẻ công việc cho nhà phát triển."
+"Link frames on the Prototype tab, then present the flow" = "Liên kết các khung trong thẻ Nguyên mẫu, sau đó trình chiếu luồng"
+"Link this component to its code component: instances then show your real snippet with their values." = "Liên kết thành phần này với thành phần mã nguồn: các bản thể sẽ hiển thị đoạn mã thực kèm theo giá trị của chúng."
+"List spacing" = "Khoảng cách mục danh sách"
+"List style" = "Kiểu danh sách"
+"Live session" = "Phiên trực tiếp"
+"Live · {people}" = "Trực tiếp · {people}"
+"Local components" = "Thành phần cục bộ"
+"Local network" = "Mạng cục bộ"
+"Local styles" = "Kiểu cục bộ"
+"Local variables" = "Biến cục bộ"
+"Lock/Unlock" = "Khóa/Mở khóa"
+"Locked" = "Đã khóa"
+"Lowercase" = "Chữ thường"
+"Luminance" = "Độ chói"
+"Luminosity" = "Độ sáng"
+"Main" = "Chính"
+"Main component deleted" = "Thành phần chính đã bị xóa"
+"Main menu" = "Trình đơn chính"
+"Make a component" = "Tạo thành phần"
+"Make slot" = "Tạo ô chứa"
+"Mar" = "Thg 3"
+"Margin" = "Lề"
+"Mark all as read" = "Đánh dấu tất cả là đã đọc"
+"Mark as resolved" = "Đánh dấu là đã giải quyết"
+"Mark as unread" = "Đánh dấu là chưa đọc"
+"Mark as unresolved" = "Đánh dấu là chưa giải quyết"
+"Mask" = "Mặt nạ"
+"Mass · Stiffness · Damping" = "Khối lượng · Độ cứng · Độ giảm chấn"
+"Match (empty: the whole name)" = "Khớp (để trống: toàn bộ tên)"
+"Max H" = "Cao tối đa"
+"Max W" = "Rộng tối đa"
+"Max lines" = "Số dòng tối đa"
+"Maximize" = "Phóng to cực đại"
+"May" = "Tháng 5"
+"Measure to the selection" = "Đo khoảng cách tới vùng chọn"
+"Merge into main" = "Hợp nhất vào nhánh chính"
+"Merge regions" = "Hợp nhất các vùng"
+"Merge the branch into the main file (one undo step) and archive it" = "Hợp nhất nhánh vào tệp chính (một bước hoàn tác) và lưu trữ nhánh"
+"Merged" = "Đã hợp nhất"
+"Merged PRs" = "PR đã hợp nhất"
+"Min H" = "Cao tối thiểu"
+"Min W" = "Rộng tối thiểu"
+"Minimize" = "Thu nhỏ"
+"Mirror angle" = "Đối xứng góc"
+"Mirror angle and length" = "Đối xứng góc và độ dài"
+"Mirroring" = "Đối xứng tay nắm"
+"Missing" = "Thiếu"
+"Missing fonts" = "Phông chữ bị thiếu"
+"Missing layer" = "Lớp bị thiếu"
+"Missing style" = "Kiểu bị thiếu"
+"Missing variable" = "Biến bị thiếu"
+"Miter" = "Góc nhọn"
+"Miter angle" = "Góc vát nhọn"
+"Mixed" = "Hỗn hợp"
+"Mixed fonts" = "Nhiều phông chữ"
+"Mixed interactions: click + to replace them" = "Tương tác hỗn hợp: nhấp + để thay thế"
+"Mobile app" = "Ứng dụng di động"
+"Mode" = "Chế độ"
+"Model" = "Mô hình"
+"Models" = "Mô hình AI"
+"Mono" = "Đơn sắc"
+"More" = "Thêm"
+"More instance actions" = "Thêm hành động cho bản thể"
+"Mouse down" = "Nhấn chuột xuống"
+"Mouse enter" = "Đưa chuột vào"
+"Mouse leave" = "Đưa chuột ra"
+"Mouse up" = "Nhả chuột"
+"Move" = "Di chuyển"
+"Move along the toolbar or the layer rows" = "Di chuyển dọc thanh công cụ hoặc các hàng lớp"
+"Move column left" = "Chuyển cột sang trái"
+"Move column right" = "Chuyển cột sang phải"
+"Move down" = "Di chuyển xuống"
+"Move in" = "Di chuyển vào"
+"Move out" = "Di chuyển ra"
+"Move tools" = "Công cụ di chuyển"
+"Move up" = "Di chuyển lên"
+"Moved to {name}" = "Đã chuyển sang {name}"
+"Multi" = "Đa sắc"
+"Multiply" = "Nhân"
+"Muted" = "Trầm"
+"Name" = "Tên"
+"Name (A–Z)" = "Tên (A–Z)"
+"Named instance" = "Bản thể có tên"
+"Navigate to" = "Điều hướng đến"
+"Nested instance" = "Bản thể lồng nhau"
+"New design file" = "Tệp thiết kế mới"
+"Newest first" = "Mới nhất trước"
+"Next frame" = "Khung tiếp theo"
+"Next or previous control in the focused region" = "Điều khiển tiếp theo hoặc trước đó trong vùng đang giữ tiêu điểm"
+"Next ready for dev" = "Mục Sẵn sàng cho dev tiếp theo"
+"Next size option" = "Tùy chọn kích thước tiếp theo"
+"No assets: no export settings, icons or images. Add export settings in the Design tab." = "Không có tài nguyên: chưa có thiết lập xuất, biểu tượng hay hình ảnh. Hãy thêm thiết lập xuất trong thẻ Thiết kế."
+"No boolean variables fit here." = "Không có biến boolean nào phù hợp tại đây."
+"No boolean variables yet. Create them in Local variables." = "Chưa có biến boolean nào. Hãy tạo trong mục Biến cục bộ."
+"No branches. A branch is a copy of the file to try changes in, then review and merge." = "Chưa có nhánh nào. Nhánh là bản sao của tệp để thử nghiệm thay đổi, sau đó xem xét và hợp nhất."
+"No category" = "Không có danh mục"
+"No changes" = "Không có thay đổi"
+"No color styles" = "Không có kiểu màu"
+"No colour variables fit here." = "Không có biến màu nào phù hợp tại đây."
+"No colour variables yet. Create them in Local variables." = "Chưa có biến màu nào. Hãy tạo trong mục Biến cục bộ."
+"No comments yet" = "Chưa có bình luận nào"
+"No compatibility warnings reported" = "Không có cảnh báo tương thích nào"
+"No components yet. Select layers and press {keys}." = "Chưa có thành phần nào. Hãy chọn các lớp và nhấn {keys}."
+"No conflicts." = "Không có xung đột."
+"No contributor data was built into this copy." = "Bản sao này không có dữ liệu người đóng góp."
+"No device" = "Không có thiết bị"
+"No files or templates match your search" = "Không có tệp hoặc mẫu nào khớp với tìm kiếm của bạn"
+"No fonts match" = "Không có phông chữ nào khớp"
+"No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "Không có mã tham gia tại đây (máy chủ cũ hơn tính năng mã tham gia, hoặc địa chỉ này không thể tạo mã): hãy chia sẻ liên kết thay thế."
+"No layer changes to show." = "Không có thay đổi lớp nào để hiển thị."
+"No libraries yet. Add a .figcraft file that was published as a library, or paste a team library's link." = "Chưa có thư viện nào. Hãy thêm tệp .figcraft đã xuất bản làm thư viện, hoặc dán liên kết thư viện nhóm."
+"No list" = "Không tạo danh sách"
+"No matching comments" = "Không có bình luận phù hợp"
+"No matching components" = "Không có thành phần phù hợp"
+"No matching layers" = "Không có lớp phù hợp"
+"No matching styles" = "Không có kiểu phù hợp"
+"No matching variables" = "Không có biến phù hợp"
+"No mirroring" = "Không đối xứng"
+"No model credits were built into this copy." = "Bản sao này không có thông tin ghi nhận mô hình."
+"No number variables fit here." = "Không có biến số nào phù hợp tại đây."
+"No number variables yet. Create them in Local variables." = "Chưa có biến số nào. Hãy tạo trong mục Biến cục bộ."
+"No other pages" = "Không có trang nào khác"
+"No paints" = "Không có màu tô"
+"No plugins on {server}." = "Không có plugin nào trên {server}."
+"No plugins yet. Import a development plugin from its figcraft-plugin.json." = "Chưa có plugin nào. Hãy nhập một plugin phát triển từ tệp figcraft-plugin.json."
+"No preferred components" = "Chưa có thành phần ưu tiên"
+"No preset" = "Không có thiết lập sẵn"
+"No saved versions yet. Save a version to mark a point in your work you can come back to." = "Chưa có phiên bản đã lưu nào. Hãy lưu một phiên bản để đánh dấu mốc công việc có thể quay lại sau."
+"No scrolling" = "Không cuộn"
+"No shortcuts match" = "Không có phím tắt nào khớp"
+"No status" = "Không có trạng thái"
+"No string variables fit here." = "Không có biến chuỗi nào phù hợp tại đây."
+"No string variables yet. Create them in Local variables." = "Chưa có biến chuỗi nào. Hãy tạo trong mục Biến cục bộ."
+"No styles yet." = "Chưa có kiểu nào."
+"No styles yet. Click + to create one from the selection." = "Chưa có kiểu nào. Nhấp + để tạo kiểu từ vùng chọn."
+"No templates match your search" = "Không có mẫu nào khớp với tìm kiếm của bạn"
+"No text styles yet. Click + to create one from the selected text." = "Chưa có kiểu văn bản nào. Nhấp + để tạo kiểu từ văn bản đã chọn."
+"No variables fit here." = "Không có biến nào phù hợp tại đây."
+"No variables yet. Create them in Local variables." = "Chưa có biến nào. Hãy tạo trong mục Biến cục bộ."
+"Nobody else is here yet" = "Chưa có ai khác ở đây"
+"Noise" = "Nhiễu"
+"None" = "Không có"
+"None." = "Không có."
+"Normal" = "Bình thường"
+"Not bound" = "Chưa gắn biến"
+"Not in a live session" = "Không ở trong phiên trực tiếp"
+"Not in this font" = "Không có trong phông chữ này"
+"Not properties, kept as written: {names}" = "Không phải thuộc tính, được giữ nguyên như đã viết: {names}"
+"Not read yet" = "Chưa đọc"
+"Not shared" = "Chưa chia sẻ"
+"Note {n}" = "Ghi chú {n}"
+"Nothing changed since this was marked ready for dev." = "Chưa có gì thay đổi kể từ khi được đánh dấu sẵn sàng cho dev."
+"Nothing here yet. Set a frame's status to list it." = "Chưa có gì ở đây. Hãy đặt trạng thái cho một khung để hiển thị tại đây."
+"Nothing online yet. Use Share on a file to put it online and it is listed here." = "Chưa có tệp trực tuyến nào. Hãy dùng nút Chia sẻ trên một tệp để đưa lên trực tuyến và tệp sẽ xuất hiện tại đây."
+"Nothing to export" = "Không có gì để xuất"
+"Nov" = "Thg 11"
+"Now" = "Bây giờ"
+"Nudge (Shift: big nudge)" = "Dịch nhẹ (Shift: dịch bước lớn)"
+"Nudge amount" = "Mức dịch chuyển nhẹ"
+"Number" = "Số"
+"Number ↑" = "Số ↑"
+"Number ↓" = "Số ↓"
+"Numbered list" = "Danh sách đánh số"
+"Object" = "Đối tượng"
+"Oct" = "Thg 10"
+"Off" = "Tắt"
+"Offered first when filling the slot (any content is allowed)" = "Được đề xuất đầu tiên khi thêm vào ô chứa (cho phép mọi nội dung)"
+"Offered first when swapping the instance (any component is allowed)" = "Được đề xuất đầu tiên khi hoán đổi bản thể (cho phép mọi thành phần)"
+"Offset" = "Độ lệch"
+"Oldest first" = "Cũ nhất trước"
+"On click" = "Khi nhấp"
+"On drag" = "Khi kéo"
+"On this page" = "Trên trang này"
+"One announcement in five common sizes: square, portrait, story, link and banner" = "Một thông báo với năm kích thước phổ biến: vuông, dọc, story, liên kết và biểu ngữ"
+"Online" = "Trực tuyến"
+"Online files" = "Tệp trực tuyến"
+"Online sharing is off: files are shared on the local network only." = "Chia sẻ trực tuyến đang tắt: tệp chỉ được chia sẻ trong mạng cục bộ."
+"Only the first changed layers are listed." = "Chỉ liệt kê những lớp thay đổi đầu tiên."
+"Only the first {n} changed layers are listed." = "Chỉ liệt kê {n} lớp thay đổi đầu tiên."
+"Only your threads" = "Chỉ luồng của bạn"
+"Opacity" = "Độ mờ"
+"Opacity & blend" = "Độ mờ & hòa trộn"
+"Opacity 10%…90%, 0: 100%" = "Độ mờ 10%…90%, 0: 100%"
+"Open" = "Mở"
+"Open .figcraft, .svg or images" = "Mở tệp .figcraft, .svg hoặc hình ảnh"
+"Open branch" = "Mở nhánh"
+"Open file" = "Mở tệp"
+"Open files" = "Các tệp đang mở"
+"Open in focus view" = "Mở trong chế độ xem tập trung"
+"Open in new window" = "Mở trong cửa sổ mới"
+"Open invite links in FigCraft" = "Mở liên kết mời trong FigCraft"
+"Open link" = "Mở liên kết"
+"Open link {url}" = "Mở liên kết {url}"
+"Open overlay" = "Mở lớp phủ"
+"Open prototype preview" = "Mở xem trước nguyên mẫu"
+"Open variables ({count})" = "Mở các biến ({count})"
+"Opened as a new document" = "Đã mở dưới dạng tài liệu mới"
+"Opened “{name}” in a new tab" = "Đã mở “{name}” trong thẻ mới"
+"Opening the file…" = "Đang mở tệp…"
+"Opening {n} files as new files" = { other = "Đang mở {n} tệp dưới dạng tệp mới" }
+"Open|comments" = "Đang mở"
+"Options" = "Tùy chọn"
+"Orange" = "Cam"
+"Order" = "Thứ tự"
+"Other" = "Khác"
+"Other apps may not open every .fig file exported here." = "Các ứng dụng khác có thể không mở được mọi tệp .fig xuất từ đây."
+"Others lose access and keep their copy; the file stays on the server for you" = "Những người khác sẽ mất quyền truy cập và giữ lại bản sao của họ; tệp vẫn còn trên máy chủ cho bạn"
+"Others type this under Share ▸ Join with a code" = "Người khác nhập mã này tại mục Chia sẻ ▸ Tham gia bằng mã"
+"Outline stroke" = "Chuyển nét thành đường viền"
+"Outline text" = "Chuyển văn bản thành đường viền"
+"Outlines" = "Đường viền nét"
+"Outside" = "Bên ngoài"
+"Overflow" = "Nội dung tràn"
+"Overlay" = "Lớp phủ"
+"Overlay position" = "Vị trí lớp phủ"
+"Overridden here (the collection it extends has another value)" = "Đã ghi đè tại đây (bộ sưu tập gốc có giá trị khác)"
+"Overrides" = "Ghi đè"
+"Owner token" = "Mã thông báo chủ sở hữu"
+"Owner token copied" = "Đã sao chép mã thông báo chủ sở hữu"
+"PDF print options" = "Tùy chọn in PDF"
+"PDF print settings" = "Thiết lập in PDF"
+"Padding" = "Đệm"
+"Page" = "Trang"
+"Page deleted" = "Đã xóa trang"
+"Pages" = "Các trang"
+"Pages added to the document" = "Các trang đã được thêm vào tài liệu"
+"Pages: {pages}" = "Trang: {pages}"
+"Paint bucket" = "Thùng sơn"
+"Pan the canvas" = "Di chuyển vùng vẽ"
+"Pan with nothing selected (Shift: farther)" = "Di chuyển vùng vẽ khi không chọn gì (Shift: xa hơn)"
+"Panels" = "Bảng"
+"Paper" = "Giấy"
+"Paragraph indent" = "Thụt lề đoạn văn"
+"Paragraph indent applies to left-aligned text" = "Thụt lề đoạn văn áp dụng cho văn bản căn trái"
+"Paragraph spacing" = "Khoảng cách đoạn văn"
+"Pass through" = "Xuyên qua"
+"Paste a link (https://…)" = "Dán một liên kết (https://…)"
+"Paste a team library link (a view link)" = "Dán liên kết thư viện nhóm (liên kết xem)"
+"Paste here" = "Dán vào đây"
+"Paste to replace" = "Dán để thay thế"
+"Pasted design layers; {n} kinds of content were left out" = { other = "Đã dán các lớp thiết kế; {n} loại nội dung đã bị lược bỏ" }
+"Pattern" = "Họa tiết"
+"Pattern alignment" = "Căn chỉnh họa tiết"
+"Pattern scale" = "Tỷ lệ họa tiết"
+"Pattern source" = "Nguồn họa tiết"
+"Pen" = "Bút"
+"Pencil" = "Bút chì"
+"People in this file" = "Những người trong tệp này"
+"People join from anywhere with a code. The file is kept on {server} while you share it." = "Mọi người có thể tham gia từ bất kỳ đâu bằng mã. Tệp được lưu trên {server} trong khi bạn chia sẻ."
+"People on your network join with a code. Nothing goes through a server." = "Mọi người trong mạng của bạn tham gia bằng mã. Không có dữ liệu nào đi qua máy chủ."
+"Phone" = "Điện thoại"
+"Pick color" = "Chọn màu"
+"Pick color (I)" = "Chọn màu (I)"
+"Pick one font family first" = "Hãy chọn một họ phông chữ trước"
+"Pick the Frame tool, then drag on the canvas or choose a device size" = "Chọn công cụ Khung, sau đó kéo trên vùng vẽ hoặc chọn kích thước thiết bị"
+"Pin a property" = "Ghim thuộc tính"
+"Pinch" = "Bóp nhọn"
+"Pixel grid" = "Lưới pixel"
+"Pixel preview 1x" = "Xem trước pixel 1x"
+"Pixel preview 2x" = "Xem trước pixel 2x"
+"Place a shape or frame (its tool chosen)" = "Đặt hình dạng hoặc khung (khi đã chọn công cụ tương ứng)"
+"Place automatically" = "Đặt tự động"
+"Place image" = "Đặt hình ảnh"
+"Placed on the current page" = "Đã đặt trên trang hiện tại"
+"Playground" = "Sân thử nghiệm"
+"Plugin" = "Plugin"
+"Plugins" = "Plugin"
+"Plugins & widgets" = "Plugin & tiện ích"
+"Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "Plugin chạy trong môi trường cô lập của FigCraft, không truy cập tệp, mạng hay đồng hồ. Chỉ cài đặt những plugin bạn tin tưởng."
+"Plus darker" = "Cộng tối hơn"
+"Plus lighter" = "Cộng sáng hơn"
+"Point" = "Điểm"
+"Points" = "Các điểm"
+"Polygon" = "Đa giác"
+"Polygons" = "Đa giác"
+"Port" = "Cổng"
+"Position" = "Vị trí"
+"Post" = "Đăng"
+"Preferences" = "Tùy chọn"
+"Preferred" = "Ưu tiên"
+"Present" = "Trình chiếu"
+"Present or preview" = "Trình chiếu hoặc xem trước"
+"Present this flow" = "Trình chiếu luồng này"
+"Presentation" = "Thuyết trình"
+"Presentation slides" = "Trang trình chiếu"
+"Presenting: comments" = "Khi trình chiếu: bình luận"
+"Presenting: cycle the size options" = "Khi trình chiếu: chuyển đổi tùy chọn kích thước"
+"Presenting: full screen" = "Khi trình chiếu: toàn màn hình"
+"Presenting: next frame" = "Khi trình chiếu: khung tiếp theo"
+"Presenting: previous frame" = "Khi trình chiếu: khung trước"
+"Presenting: restart" = "Khi trình chiếu: bắt đầu lại"
+"Preserve scroll position" = "Giữ nguyên vị trí cuộn"
+"Presets" = "Thiết lập sẵn"
+"Press a key…" = "Nhấn một phím…"
+"Preview" = "Xem trước"
+"Preview this flow" = "Xem trước luồng này"
+"Preview this frame" = "Xem trước khung này"
+"Previous frame" = "Khung trước"
+"Previous ready for dev" = "Mục Sẵn sàng cho dev trước đó"
+"Progressive" = "Lũy tiến"
+"Properties" = "Thuộc tính"
+"Prototype" = "Nguyên mẫu"
+"Prototype preview" = "Xem trước nguyên mẫu"
+"Prototype settings" = "Thiết lập nguyên mẫu"
+"Publish" = "Xuất bản"
+"Publish changes" = "Xuất bản thay đổi"
+"Publish to another server…" = "Xuất bản lên máy chủ khác…"
+"Publish to server" = "Xuất bản lên máy chủ"
+"Published version {v}" = "Đã xuất bản phiên bản {v}"
+"Published version {v} to the server" = "Đã xuất bản phiên bản {v} lên máy chủ"
+"Published version {v}: save the file so other files can use it" = "Đã xuất bản phiên bản {v}: hãy lưu tệp để các tệp khác có thể sử dụng"
+"Published · {people}" = "Đã xuất bản · {people}"
+"Publishing to a server needs the desktop app; in the browser you can join a server's files" = "Cần ứng dụng máy tính để xuất bản lên máy chủ; trên trình duyệt bạn có thể tham gia các tệp trên máy chủ"
+"Publishing with the server's key." = "Đang xuất bản bằng khóa của máy chủ."
+"Publishing…" = "Đang xuất bản…"
+"Push" = "Đẩy"
+"Push changes to main component" = "Đẩy thay đổi lên thành phần chính"
+"Put text on path" = "Đặt văn bản lên đường dẫn"
+"R" = "R"
+"Radial" = "Hướng tâm"
+"Radius" = "Bán kính"
+"Ratio" = "Tỷ lệ"
+"Reading the library…" = "Đang đọc thư viện…"
+"Ready for dev" = "Sẵn sàng cho dev"
+"Real name" = "Tên thật"
+"Recent" = "Gần đây"
+"Recent files" = "Tệp gần đây"
+"Recents" = "Gần đây"
+"Recovered {n} unsaved files after the app quit unexpectedly: save them to keep them" = { other = "Đã khôi phục {n} tệp chưa lưu sau khi ứng dụng thoát đột ngột: hãy lưu lại để giữ chúng" }
+"Rectangle" = "Hình chữ nhật"
+"Rectangles" = "Hình chữ nhật"
+"Red" = "Đỏ"
+"Reduce motion" = "Giảm chuyển động"
+"Refraction" = "Khúc xạ"
+"Regular expression" = "Biểu thức chính quy"
+"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "Tương ứng với tỷ lệ hiển thị của hệ thống (100% là kích thước chuẩn của hệ thống). Mức thu phóng tài liệu là riêng biệt."
+"Remove" = "Xóa"
+"Remove all" = "Xóa tất cả"
+"Remove annotation" = "Xóa chú thích"
+"Remove auto layout" = "Xóa bố cục tự động"
+"Remove dev resource" = "Xóa tài nguyên dev"
+"Remove export setting" = "Xóa thiết lập xuất"
+"Remove from recents" = "Xóa khỏi danh sách gần đây"
+"Remove from server" = "Xóa khỏi máy chủ"
+"Remove from server…" = "Xóa khỏi máy chủ…"
+"Remove guide" = "Xóa đường gióng"
+"Remove interaction" = "Xóa tương tác"
+"Remove library from this file" = "Xóa thư viện khỏi tệp này"
+"Remove min and max" = "Xóa giới hạn tối thiểu và tối đa"
+"Remove min and max height" = "Xóa chiều cao tối thiểu và tối đa"
+"Remove min and max width" = "Xóa chiều rộng tối thiểu và tối đa"
+"Remove regions" = "Xóa các vùng"
+"Remove slot" = "Xóa ô chứa"
+"Remove starting point" = "Xóa điểm bắt đầu"
+"Remove stop" = "Xóa điểm dừng màu"
+"Remove text from path" = "Gỡ văn bản khỏi đường dẫn"
+"Remove the else and its actions" = "Xóa nhánh ngược lại và các hành động của nó"
+"Remove this condition and its actions" = "Xóa điều kiện này và các hành động của nó"
+"Remove this file from the server? It can't be shared or opened from there again. Your copy stays open here." = "Xóa tệp này khỏi máy chủ? Tệp sẽ không thể chia sẻ hay mở lại từ đó nữa. Bản sao của bạn vẫn mở tại đây."
+"Remove {name} from session" = "Xóa {name} khỏi phiên"
+"Remove {name} from {server}?" = "Xóa {name} khỏi {server}?"
+"Removed" = "Đã xóa"
+"Removed from the server" = "Đã xóa khỏi máy chủ"
+"Removed since it was marked" = "Đã bị xóa kể từ khi đánh dấu"
+"Rename" = "Đổi tên"
+"Rename duplicated layers" = "Đổi tên các lớp nhân bản"
+"Rename folder" = "Đổi tên thư mục"
+"Rename group" = "Đổi tên nhóm"
+"Rename layers" = "Đổi tên các lớp"
+"Rename mode" = "Đổi tên chế độ"
+"Rename on the server" = "Đổi tên trên máy chủ"
+"Rename on the server…" = "Đổi tên trên máy chủ…"
+"Rename page" = "Đổi tên trang"
+"Rename to" = "Đổi tên thành"
+"Reorder selection" = "Sắp xếp lại vùng chọn"
+"Replace all" = "Thay thế tất cả"
+"Replace mixed export settings" = "Thay thế thiết lập xuất hỗn hợp"
+"Replace with" = "Thay thế bằng"
+"Replace with a new interaction" = "Thay thế bằng tương tác mới"
+"Reply" = "Trả lời"
+"Report" = "Báo cáo"
+"Report this file…" = "Báo cáo tệp này…"
+"Reset" = "Đặt lại"
+"Reset adjustments" = "Đặt lại điều chỉnh"
+"Reset all changes" = "Đặt lại mọi thay đổi"
+"Reset all overrides on this layer" = "Đặt lại mọi ghi đè trên lớp này"
+"Reset overrides" = "Đặt lại ghi đè"
+"Reset slot" = "Đặt lại ô chứa"
+"Reset this override" = "Đặt lại ghi đè này"
+"Reset to style" = "Đặt lại theo kiểu"
+"Reset to the inherited value" = "Đặt lại về giá trị kế thừa"
+"Resize by the nudge amount" = "Đổi kích thước theo mức dịch chuyển nhẹ"
+"Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "Đổi kích thước khung theo màn hình thiết bị (hoặc cửa sổ nếu không có thiết bị): các ràng buộc và bố cục tự động sẽ tự điều chỉnh"
+"Resize to fit" = "Đổi kích thước vừa khít"
+"Resizing" = "Đổi kích thước"
+"Resolve" = "Giải quyết"
+"Resolve change" = "Giải quyết thay đổi"
+"Resolved" = "Đã giải quyết"
+"Resources" = "Tài nguyên"
+"Responsive" = "Đáp ứng"
+"Restart" = "Bắt đầu lại"
+"Restore" = "Khôi phục"
+"Restore main component" = "Khôi phục thành phần chính"
+"Restore this version" = "Khôi phục phiên bản này"
+"Restored “{name}”" = "Đã khôi phục “{name}”"
+"Reverse the order" = "Đảo ngược thứ tự"
+"Reversed triangle" = "Tam giác ngược"
+"Review and merge" = "Xem xét và hợp nhất"
+"Ribbon" = "Dải ruy băng"
+"Right" = "Phải"
+"Right padding" = "Đệm phải"
+"Right side" = "Cạnh phải"
+"Right side width" = "Độ rộng cạnh phải"
+"Rotate 90°" = "Xoay 90°"
+"Rotate 90° right" = "Xoay 90° sang phải"
+"Rotate to landscape" = "Xoay sang chiều ngang"
+"Rotate to portrait" = "Xoay sang chiều dọc"
+"Rotation" = "Góc xoay"
+"Rotation jitter" = "Độ ngẫu nhiên góc xoay"
+"Round" = "Tròn"
+"Rounded" = "Bo tròn"
+"Row" = "Hàng"
+"Row gap" = "Khoảng hở hàng"
+"Row sizes" = "Kích thước hàng"
+"Row span" = "Số hàng gộp"
+"Rows" = "Các hàng"
+"Rows {count}" = "Hàng {count}"
+"Rulers" = "Thước"
+"Run" = "Chạy"
+"Run {label}" = "Chạy {label}"
+"SHA-256: {sha}…" = "SHA-256: {sha}…"
+"Same as layer" = "Giống như lớp"
+"Saturation" = "Độ bão hòa"
+"Save" = "Lưu"
+"Save as" = "Lưu thành"
+"Save as preset…" = "Lưu thành thiết lập sẵn…"
+"Save files automatically" = "Tự động lưu tệp"
+"Save version  {key}" = "Lưu phiên bản  {key}"
+"Saved" = "Đã lưu"
+"Saved {name}" = "Đã lưu {name}"
+"Say something" = "Nhập nội dung trò chuyện"
+"Scale" = "Tỷ lệ"
+"Scatter" = "Phân tán"
+"Scoping: where pickers offer it" = "Phạm vi: nơi biến xuất hiện trong bộ chọn"
+"Screen" = "Màn lọc"
+"Scroll behavior" = "Hành vi cuộn"
+"Scroll to" = "Cuộn tới"
+"Scroll to layer" = "Cuộn tới lớp"
+"Scroll with parent" = "Cuộn theo lớp cha"
+"Search" = "Tìm kiếm"
+"Search actions, layers and tools" = "Tìm kiếm hành động, lớp và công cụ"
+"Search assets" = "Tìm tài nguyên"
+"Search comments" = "Tìm bình luận"
+"Search files and templates" = "Tìm tệp và mẫu"
+"Search fonts" = "Tìm phông chữ"
+"Search layers" = "Tìm lớp"
+"Search pages" = "Tìm trang"
+"Search plugins" = "Tìm plugin"
+"Search results" = "Kết quả tìm kiếm"
+"Search shortcuts" = "Tìm phím tắt"
+"Search templates" = "Tìm mẫu"
+"Section" = "Phần"
+"Section color" = "Màu phần"
+"Sections" = "Các phần"
+"See all templates" = "Xem tất cả mẫu"
+"Select a frame and add a starting point to present it as a flow." = "Hãy chọn một khung và thêm điểm bắt đầu để trình chiếu thành một luồng."
+"Select a frame to preview it" = "Chọn một khung để xem trước"
+"Select a layer to see its properties and code" = "Chọn một lớp để xem thuộc tính và mã nguồn"
+"Select all" = "Chọn tất cả"
+"Select all with same" = "Chọn tất cả có cùng"
+"Select layer" = "Chọn lớp"
+"Select layers and they space themselves as their content changes" = "Chọn các lớp để chúng tự động giãn cách khi nội dung thay đổi"
+"Select layers to apply the style to" = "Chọn các lớp để áp dụng kiểu"
+"Select layers with this color" = "Chọn các lớp có màu này"
+"Select overlapping shapes" = "Chọn các hình chồng lên nhau"
+"Select points to edit their position, radius and mirroring" = "Chọn các điểm để chỉnh sửa vị trí, bán kính và đối xứng tay nắm"
+"Select slot" = "Chọn ô chứa"
+"Selection" = "Vùng chọn"
+"Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Khung chọn, {w} × {h} tại {x}, {y}: phím mũi tên để di chuyển, Shift+mũi tên hoặc {cmd}+mũi tên để đổi kích thước, Enter để chọn, Escape để hủy"
+"Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "Khung chọn: phím mũi tên để di chuyển, Shift+mũi tên hoặc {cmd}+mũi tên để đổi kích thước, Enter để chọn, Escape để hủy"
+"Selection colors" = "Màu của vùng chọn"
+"Send backward" = "Đưa lùi một lớp"
+"Send report" = "Gửi báo cáo"
+"Send to back" = "Đưa xuống dưới cùng"
+"Sep" = "Thg 9"
+"Server address" = "Địa chỉ máy chủ"
+"Server address (ws://host:47900/)" = "Địa chỉ máy chủ (ws://host:47900/)"
+"Server for online sharing" = "Máy chủ chia sẻ trực tuyến"
+"Set as default" = "Đặt làm mặc định"
+"Set variable" = "Đặt biến"
+"Set variable mode" = "Đặt chế độ biến"
+"Set variable {name}" = "Đặt biến {name}"
+"Set {name} to {value}" = "Đặt {name} thành {value}"
+"Shadows" = "Vùng tối"
+"Shape" = "Hình dạng"
+"Shape builder" = "Tạo hình"
+"Shape tools" = "Công cụ hình dạng"
+"Share" = "Chia sẻ"
+"Share this file" = "Chia sẻ tệp này"
+"Share with a code" = "Chia sẻ bằng mã"
+"Share: live session, export" = "Chia sẻ: phiên trực tiếp, xuất tệp"
+"Shared" = "Đã chia sẻ"
+"Shared: copy its code from the file's menu" = "Đã chia sẻ: sao chép mã từ trình đơn của tệp"
+"Sharing a file needs the desktop app; here you can join one." = "Cần ứng dụng máy tính để chia sẻ tệp; tại đây bạn có thể tham gia một phiên."
+"Sharing on the local network (online sharing is off: no server is set in Preferences)." = "Đang chia sẻ trên mạng cục bộ (chia sẻ trực tuyến đang tắt: chưa đặt máy chủ trong Tùy chọn)."
+"Sharing on your network · {people}" = "Đang chia sẻ trên mạng của bạn · {people}"
+"Sharing online · {people}" = "Đang chia sẻ trực tuyến · {people}"
+"Sharing stopped: the file stays on the server, open only to you" = "Đã dừng chia sẻ: tệp vẫn còn trên máy chủ và chỉ mình bạn mở được"
+"Show" = "Hiện"
+"Show all templates" = "Hiện tất cả mẫu"
+"Show as grid" = "Hiện dạng lưới"
+"Show as list" = "Hiện dạng danh sách"
+"Show autosaves" = "Hiện các bản tự động lưu"
+"Show behind transparent areas" = "Hiện phía sau vùng trong suốt"
+"Show comments (Shift+C)" = "Hiện bình luận (Shift+C)"
+"Show device frame" = "Hiện khung thiết bị"
+"Show dimensions on objects" = "Hiện kích thước trên đối tượng"
+"Show hotspot hints" = "Hiện gợi ý vùng tương tác"
+"Show in Explorer" = "Hiện trong Explorer"
+"Show in Finder" = "Hiện trong Finder"
+"Show in folder" = "Hiện trong thư mục"
+"Show only this on the canvas" = "Chỉ hiện mục này trên vùng vẽ"
+"Show open" = "Hiện mục đang mở"
+"Show section contents" = "Hiện nội dung phần"
+"Show this layer" = "Hiện lớp này"
+"Show usage" = "Hiện nơi sử dụng"
+"Show/Hide" = "Hiện/Ẩn"
+"Show/Hide UI" = "Hiện/Ẩn giao diện"
+"Side by side" = "Cạnh nhau"
+"Sidebar" = "Thanh bên"
+"Simplify stroke" = "Đơn giản hóa nét"
+"Size" = "Kích thước"
+"Size jitter" = "Độ ngẫu nhiên kích thước"
+"Skip ink" = "Chừa nét chữ dưới"
+"Slashed zero" = "Số 0 gạch chéo"
+"Slice" = "Lát cắt"
+"Slices" = "Các lát cắt"
+"Slide in" = "Trượt vào"
+"Slide out" = "Trượt ra"
+"Slot" = "Ô chứa"
+"Slot content" = "Nội dung ô chứa"
+"Small capitals" = "Chữ hoa nhỏ"
+"Small caps" = "Chữ hoa nhỏ"
+"Smart animate" = "Hoạt ảnh thông minh"
+"Snap to pixel grid" = "Bắt dính vào lưới pixel"
+"Social and slides" = "Mạng xã hội và trang chiếu"
+"Social media" = "Mạng xã hội"
+"Social post sizes" = "Kích thước bài đăng mạng xã hội"
+"Soft light" = "Ánh sáng dịu"
+"Solid" = "Đặc"
+"Some variants have the same property values: give each one a unique combination" = "Một số biến thể có cùng giá trị thuộc tính: hãy đặt cho mỗi biến thể một tổ hợp duy nhất"
+"Sort" = "Sắp xếp"
+"Sort by" = "Sắp xếp theo"
+"Sort by date" = "Sắp xếp theo ngày"
+"Sort by page" = "Sắp xếp theo trang"
+"Sort by {column}" = "Sắp xếp theo {column}"
+"Space around" = "Cách đều xung quanh"
+"Space between" = "Cách đều giữa các mục"
+"Space drag" = "Space kéo"
+"Space evenly" = "Cách đều bằng nhau"
+"Space+drag" = "Space+kéo"
+"Spacing" = "Khoảng cách"
+"Spam, stolen work, abuse…" = "Thư rác, đánh cắp tác phẩm, lạm dụng…"
+"Splay" = "Xòe tia"
+"Spotlight me" = "Chiếu tâm điểm vào tôi"
+"Spread" = "Độ lan"
+"Square" = "Hình vuông"
+"Standard" = "Tiêu chuẩn"
+"Standard ligatures" = "Chữ ghép tiêu chuẩn"
+"Star" = "Ngôi sao"
+"Stars" = "Các ngôi sao"
+"Start" = "Bắt đầu"
+"Start ascending from / stop descending at" = "Bắt đầu tăng dần từ / dừng giảm dần tại"
+"Start from a blank canvas" = "Bắt đầu từ vùng vẽ trống"
+"Start from a template" = "Bắt đầu từ một mẫu"
+"Start on path" = "Điểm bắt đầu trên đường dẫn"
+"Start on the Home screen" = "Khởi động tại màn hình Trang chủ"
+"Start point" = "Điểm đầu"
+"Start sharing" = "Bắt đầu chia sẻ"
+"Start sharing with the Share button, then pass on the code it gives" = "Bắt đầu chia sẻ bằng nút Chia sẻ, sau đó gửi mã nhận được cho người khác"
+"Starting to share…" = "Đang bắt đầu chia sẻ…"
+"Status" = "Trạng thái"
+"Sticky" = "Ghim cố định khi cuộn"
+"Stop" = "Dừng"
+"Stop following {name}" = "Dừng theo dõi {name}"
+"Stop session" = "Dừng phiên"
+"Stop sharing" = "Dừng chia sẻ"
+"Stop spotlighting" = "Dừng chiếu tâm điểm"
+"Stop {n}  {hex}" = "Điểm dừng {n}  {hex}"
+"Stretch" = "Kéo giãn"
+"Strikethrough" = "Gạch ngang chữ"
+"String" = "Chuỗi"
+"Stroke" = "Nét"
+"Stroke style" = "Kiểu nét"
+"Stroke weight" = "Độ dày nét"
+"Strokes" = "Các nét"
+"Style" = "Kiểu"
+"Styles" = "Các kiểu"
+"Stylistic set 1" = "Bộ kiểu chữ 1"
+"Stylistic set 2" = "Bộ kiểu chữ 2"
+"Stylistic set 3" = "Bộ kiểu chữ 3"
+"Stylistic set 4" = "Bộ kiểu chữ 4"
+"Stylistic set 5" = "Bộ kiểu chữ 5"
+"Subtract" = "Trừ"
+"Subtracts" = "Phép trừ"
+"Suffix" = "Hậu tố"
+"Suspend snapping while dragging" = "Tạm ngừng bắt dính khi đang kéo"
+"Swap instance" = "Hoán đổi bản thể"
+"Swap library: use another library's assets of the same names" = "Hoán đổi thư viện: dùng tài nguyên cùng tên từ một thư viện khác"
+"Swap orientation" = "Đổi chiều ngang/dọc"
+"Swap overlay" = "Hoán đổi lớp phủ"
+"Swap to {name}" = "Hoán đổi sang {name}"
+"Swap width and height" = "Đổi chiều rộng và chiều cao"
+"Swapped instance" = "Bản thể đã hoán đổi"
+"Swapped {n} assets" = { other = "Đã hoán đổi {n} tài nguyên" }
+"Swapped {n} assets; {missed} had no match and still use the old library" = { other = "Đã hoán đổi {n} tài nguyên; {missed} mục không khớp và vẫn dùng thư viện cũ" }
+"Sweep" = "Góc quét"
+"System" = "Hệ thống"
+"Tab / Shift+Tab" = "Tab / Shift+Tab"
+"Table" = "Bảng"
+"Tablet" = "Máy tính bảng"
+"Tabular numbers" = "Chữ số thẳng cột"
+"Take the values from the first selected layer" = "Lấy giá trị từ lớp được chọn đầu tiên"
+"Taper" = "Thuôn nhọn"
+"Taper both ends" = "Thuôn nhọn cả hai đầu"
+"Tell the server's operator what is wrong with it" = "Cho người vận hành máy chủ biết vấn đề của tệp này"
+"Temperature" = "Nhiệt độ màu"
+"Template" = "Mẫu"
+"Templates" = "Các mẫu"
+"Terms" = "Điều khoản"
+"Text" = "Văn bản"
+"Text align" = "Căn chỉnh văn bản"
+"Text content" = "Nội dung văn bản"
+"Text style" = "Kiểu văn bản"
+"Text styles" = "Kiểu văn bản"
+"Texts" = "Văn bản"
+"Texture" = "Kết cấu"
+"The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3." = "Vùng vẽ xem trước màu theo sRGB; các tệp PNG, JPG và WebP xuất ra được gắn thẻ Display P3."
+"The destination document is unavailable. Nothing was imported." = "Tài liệu đích không khả dụng. Không có nội dung nào được nhập."
+"The destination document was closed. Nothing was imported." = "Tài liệu đích đã đóng. Không có nội dung nào được nhập."
+"The destination page was removed. Nothing was imported." = "Trang đích đã bị xóa. Không có nội dung nào được nhập."
+"The file is deleted from the server: nobody can open or join it from there again, and this can't be undone. Copies that are open stay with whoever has them." = "Tệp sẽ bị xóa khỏi máy chủ: không ai có thể mở hoặc tham gia tệp từ đó nữa, và thao tác này không thể hoàn tác. Các bản sao đang mở vẫn được giữ lại ở máy người dùng."
+"The file now holds another library" = "Tệp hiện chứa một thư viện khác"
+"The file now holds another library (\"{name}\")" = "Tệp hiện chứa một thư viện khác (\"{name}\")"
+"The files you shared or published online from this computer. They stay on their server until you remove them." = "Các tệp bạn đã chia sẻ hoặc xuất bản trực tuyến từ máy tính này. Chúng sẽ được lưu trên máy chủ cho đến khi bạn xóa."
+"The link carries the session's secret: share it only with people you invite." = "Liên kết chứa khóa bí mật của phiên: chỉ chia sẻ với những người bạn mời."
+"The name in your online files and on the server. The document inside keeps its own name." = "Tên hiển thị trong danh sách tệp trực tuyến của bạn và trên máy chủ. Tài liệu bên trong vẫn giữ tên riêng của nó."
+"The selection uses several text styles: click to apply one" = "Vùng chọn đang dùng nhiều kiểu văn bản: nhấp để áp dụng một kiểu"
+"The server deletes this file if nobody opens it before {date}." = "Máy chủ sẽ xóa tệp này nếu không ai mở trước {date}."
+"The whole file" = "Toàn bộ tệp"
+"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "Cửa sổ quá nhỏ cho mức {size}%, nên giao diện được hiển thị ở mức {drawn}%. Hãy phóng rộng cửa sổ để dùng mức {size}%."
+"Theme" = "Giao diện"
+"There's no destination for that action" = "Không có đích đến cho hành động đó"
+"Thickness" = "Độ dày"
+"This branch can't be reviewed: {e}" = "Không thể xem xét nhánh này: {e}"
+"This branch was merged or archived." = "Nhánh này đã được hợp nhất hoặc lưu trữ."
+"This computer only" = "Chỉ máy tính này"
+"This computer remembers the owner token, so the file can be managed from the home screen's Online list. Copy it to manage the file from somewhere else: it is a password for this file and won't be shown again." = "Máy tính này ghi nhớ mã thông báo chủ sở hữu để bạn có thể quản lý tệp từ danh sách Trực tuyến ở màn hình Trang chủ. Hãy sao chép mã này nếu muốn quản lý tệp từ nơi khác: đây là mật khẩu của tệp và sẽ không hiển thị lại."
+"This condition is edited as an expression" = "Điều kiện này được chỉnh sửa dưới dạng biểu thức"
+"This file" = "Tệp này"
+"This file has unsaved changes" = "Tệp này có thay đổi chưa lưu"
+"This file is on {server}, open only to you. Share it to let others in with a new code." = "Tệp này đang ở trên {server} và chỉ mình bạn mở được. Hãy chia sẻ để người khác tham gia bằng mã mới."
+"This file is too large to join here (up to {mb} MB)" = "Tệp này quá lớn để tham gia tại đây (tối đa {mb} MB)"
+"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "Tệp này sử dụng phông chữ chưa được cài đặt trên máy tính này. Văn bản sẽ hiển thị bằng phông chữ dự phòng cho đến khi bạn cài đặt chúng."
+"This frame is new on the branch." = "Khung này là mới trên nhánh."
+"This frame isn't on the branch." = "Khung này không có trên nhánh."
+"This server is open to the public: no key needed." = "Máy chủ này mở công khai: không cần khóa."
+"This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "Máy chủ này yêu cầu khóa: hãy thêm ?key=… vào địa chỉ (`figcraft-server key` sẽ in khóa trên máy chủ)."
+"This server takes files only with its key: see Advanced." = "Máy chủ này chỉ nhận tệp khi có khóa: xem phần Nâng cao."
+"Tidy up" = "Sắp xếp gọn"
+"Tile" = "Lặp ô"
+"Tile type" = "Kiểu lặp ô"
+"Tint" = "Sắc thái"
+"Title" = "Tiêu đề"
+"Title case" = "Viết hoa đầu từ"
+"To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "Để chia sẻ thư viện này với nhóm của bạn, hãy xuất bản tệp lên máy chủ (Chia sẻ ▸ Xuất bản lên máy chủ…), sau đó xuất bản thư viện tại đó."
+"Toggle" = "Bật/tắt"
+"Toggle light/dark theme" = "Chuyển đổi giao diện sáng/tối"
+"Toggle visibility" = "Bật/tắt hiển thị"
+"Tools" = "Công cụ"
+"Top" = "Trên"
+"Top & bottom" = "Trên & dưới"
+"Top left radius" = "Bán kính góc trên trái"
+"Top padding" = "Đệm trên"
+"Top right radius" = "Bán kính góc trên phải"
+"Transform" = "Biến đổi"
+"Triangle arrow" = "Mũi tên tam giác"
+"Trigger" = "Kích hoạt"
+"True" = "Đúng"
+"Truncate text" = "Cắt bớt văn bản"
+"Truncate with an ellipsis" = "Cắt bớt bằng dấu ba chấm"
+"Try again" = "Thử lại"
+"Try another search or filter." = "Hãy thử từ khóa hoặc bộ lọc khác."
+"Try another search, or browse templates." = "Hãy thử tìm kiếm khác, hoặc duyệt các mẫu."
+"Try another word, or look at every kind." = "Hãy thử từ khác, hoặc xem tất cả các loại."
+"Turn a layer into a component, reuse it, and change every copy at once" = "Biến một lớp thành thành phần, tái sử dụng và cập nhật mọi bản sao cùng lúc"
+"Two digits" = "Hai chữ số"
+"Type" = "Loại"
+"Type settings" = "Thiết lập kiểu chữ"
+"Type the join code you were given, or paste an invite link." = "Nhập mã tham gia bạn được cấp, hoặc dán liên kết mời."
+"Typography" = "Kiểu chữ"
+"Underline" = "Gạch chân"
+"Undo takes back only your own changes; what others changed since stays." = "Hoàn tác chỉ quay lại các thay đổi của riêng bạn; những gì người khác đã thay đổi vẫn giữ nguyên."
+"Ungroup" = "Bỏ nhóm"
+"Uniform" = "Đồng đều"
+"Union" = "Hợp"
+"Unions" = "Phép hợp"
+"Unknown — treated as sRGB" = "Không rõ — được xử lý như sRGB"
+"Unread" = "Chưa đọc"
+"Unresolve" = "Mở lại bình luận"
+"Unsaved changes" = "Thay đổi chưa lưu"
+"Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "Có thay đổi chưa lưu: hãy lưu trước ({save}), hoặc giữ {alt} khi nhấp đóng thẻ để hủy bỏ"
+"Unsaved changes: save first, or close again with {key} to discard" = "Có thay đổi chưa lưu: hãy lưu trước, hoặc đóng lại lần nữa bằng {key} để hủy bỏ"
+"Up" = "Lên"
+"Update" = "Cập nhật"
+"Update from main" = "Cập nhật từ nhánh chính"
+"Update from selection" = "Cập nhật từ vùng chọn"
+"Update plugin" = "Cập nhật plugin"
+"Updated {components} and {styles}" = "Đã cập nhật {components} và {styles}"
+"Updated {name}" = "Đã cập nhật {name}"
+"Updating the graphics driver often helps. To use OpenGL only, start FigCraft from a Command Prompt with:" = "Việc cập nhật trình điều khiển đồ họa thường sẽ khắc phục được lỗi. Để chỉ sử dụng OpenGL, hãy khởi chạy FigCraft từ Command Prompt bằng:"
+"Updating the graphics driver often helps. WGPU_BACKEND (vulkan, gl, metal) names another graphics API to try." = "Việc cập nhật trình điều khiển đồ họa thường sẽ khắc phục được lỗi. Biến WGPU_BACKEND (vulkan, gl, metal) cho phép thử một API đồ họa khác."
+"Uploads this file to a FigCraft server and keeps this tab in sync with it. You get a link to edit and a link to view." = "Tải tệp này lên máy chủ FigCraft và giữ thẻ này đồng bộ với máy chủ. Bạn sẽ nhận được một liên kết chỉnh sửa và một liên kết xem."
+"Uppercase" = "Chữ hoa"
+"Use a fixed value" = "Dùng giá trị cố định"
+"Use an expression, e.g. count + 1" = "Dùng biểu thức, ví dụ: count + 1"
+"Use as mask" = "Dùng làm mặt nạ"
+"Use auto layout" = "Dùng bố cục tự động"
+"Use number keys for opacity" = "Dùng phím số để chỉnh độ mờ"
+"Use the .figcraft or .fig extension." = "Hãy dùng phần mở rộng .figcraft hoặc .fig."
+"Use the layer's fill" = "Dùng màu tô của lớp"
+"Use your browser's zoom to change the interface size." = "Hãy dùng tính năng thu phóng của trình duyệt để thay đổi kích thước giao diện."
+"Used in {files} · {instances}" = "Được dùng trong {files} · {instances}"
+"Username" = "Tên người dùng"
+"Uses variables: each layer shows them in its own mode" = "Có sử dụng biến: mỗi lớp hiển thị giá trị theo chế độ riêng của lớp đó"
+"Value" = "Giá trị"
+"Variable" = "Biến"
+"Variable collections" = "Bộ sưu tập biến"
+"Variable modes" = "Chế độ biến"
+"Variable width" = "Độ rộng biến thiên"
+"Variables" = "Các biến"
+"Variables JSON…" = "JSON biến…"
+"Variables store reusable values (colours, numbers, strings, booleans) with modes such as Light and Dark." = "Biến lưu trữ các giá trị tái sử dụng (màu sắc, số, chuỗi, boolean) theo các chế độ như Sáng và Tối."
+"Variant" = "Biến thể"
+"Vector" = "Vector"
+"Vectors" = "Vector"
+"Version" = "Phiên bản"
+"Version history" = "Lịch sử phiên bản"
+"Version {version}" = "Phiên bản {version}"
+"Version {v} · {components} · {styles} · {variables}" = "Phiên bản {v} · {components} · {styles} · {variables}"
+"Vertical" = "Dọc"
+"Vertical align" = "Căn dọc"
+"Vertical hex" = "Lục giác dọc"
+"Vertical padding" = "Đệm dọc"
+"Vertical spacing" = "Khoảng cách dọc"
+"Vertical trim" = "Cắt gọn khoảng đệm dọc"
+"View" = "Xem"
+"View link" = "Liên kết xem"
+"View link copied" = "Đã sao chép liên kết xem"
+"View only" = "Chỉ xem"
+"View only: you see every change as it happens but can't edit. Leave to keep a copy you can edit." = "Chỉ xem: bạn thấy mọi thay đổi theo thời gian thực nhưng không thể chỉnh sửa. Hãy rời phiên để giữ lại một bản sao có thể chỉnh sửa."
+"Viewing “{name}”" = "Đang xem “{name}”"
+"Violet" = "Tím"
+"Visibility" = "Hiển thị"
+"Visible" = "Hiển thị"
+"Vivid" = "Rực rỡ"
+"WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "Biến WGPU_BACKEND đang được đặt để chỉ định API đồ họa; hãy bỏ đặt biến này để FigCraft tự chọn."
+"Warm" = "Ấm"
+"Watch" = "Đồng hồ"
+"Wavy" = "Lượn sóng"
+"Web" = "Web"
+"WebSocket URL" = "URL WebSocket"
+"WebSocket URL copied" = "Đã sao chép URL WebSocket"
+"Websites" = "Trang web"
+"Wedge" = "Hình nêm"
+"Weight" = "Độ dày"
+"What changed since it was marked ready for dev" = "Những thay đổi kể từ khi được đánh dấu sẵn sàng cho dev"
+"What is wrong with this file? The server's operator gets your report." = "Tệp này có vấn đề gì? Người vận hành máy chủ sẽ nhận được báo cáo của bạn."
+"What it's for" = "Mục đích sử dụng"
+"What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "Không rõ trạng thái trước khi thay đổi: khung đã thay đổi trước khi FigCraft lưu bản sao của các khung sẵn sàng cho dev. Hãy giải quyết thay đổi (hoặc đánh dấu sẵn sàng lại) để so sánh từ nay về sau."
+"What you try here changes this preview and the code below, not the file" = "Những gì bạn thử tại đây chỉ làm thay đổi bản xem trước này và đoạn mã bên dưới, không thay đổi tệp"
+"While hovering" = "Khi di chuột qua"
+"While pressing" = "Khi nhấn giữ"
+"White" = "Trắng"
+"Who runs it, its terms and how long it keeps files" = "Đơn vị vận hành, điều khoản và thời gian lưu giữ tệp"
+"Why it changed" = "Lý do thay đổi"
+"Widget" = "Tiện ích"
+"Widgets" = "Các tiện ích"
+"Width" = "Chiều rộng"
+"Width point" = "Điểm độ rộng"
+"Width profile" = "Biên dạng độ rộng"
+"Wireframe kit" = "Bộ khung dây (Wireframe)"
+"With the layers' export settings" = "Theo thiết lập xuất của các lớp"
+"Wrap" = "Ngắt dòng"
+"Wrap in new section" = "Bọc trong phần mới"
+"Yellow" = "Vàng"
+"Yesterday" = "Hôm qua"
+"You" = "Bạn"
+"You'll get the shared file as a new tab and edit it together." = "Bạn sẽ nhận được tệp chia sẻ trong một thẻ mới và cùng nhau chỉnh sửa."
+"You're spotlighting: everyone follows your view" = "Bạn đang chiếu tâm điểm: mọi người đang theo dõi khung nhìn của bạn"
+"Your copy of the file stays open" = "Bản sao tệp của bạn vẫn mở"
+"Your copy stays open; the file stays on the server" = "Bản sao của bạn vẫn mở; tệp vẫn được lưu trên máy chủ"
+"Your name" = "Tên của bạn"
+"Your name in comments" = "Tên của bạn trong bình luận"
+"Your system asks for reduced motion: animations stay off." = "Hệ thống của bạn yêu cầu giảm chuyển động: các hoạt ảnh sẽ được tắt."
+"Z" = "Z"
+"Z to A" = "Z đến A"
+"Zoom" = "Thu phóng"
+"Zoom around the pointer" = "Thu phóng quanh con trỏ"
+"Zoom device to fill window" = "Thu phóng thiết bị lấp đầy cửa sổ"
+"Zoom in" = "Phóng to"
+"Zoom out" = "Thu nhỏ"
+"Zoom to 100%" = "Thu phóng về 100%"
+"Zoom to 200%" = "Thu phóng về 200%"
+"Zoom to 50%" = "Thu phóng về 50%"
+"Zoom to fit" = "Thu phóng vừa khít"
+"Zoom to selection" = "Thu phóng vừa vùng chọn"
+"Zoom tool: click to zoom in, drag an area" = "Công cụ thu phóng: nhấp để phóng to, kéo chọn vùng"
+"Zoom tool: zoom out" = "Công cụ thu phóng: thu nhỏ"
+"and {n} more" = { other = "và {n} mục nữa" }
+"bleed marks" = "dấu tràn lề"
+"by {author}" = "bởi {author}"
+"call any command its access allows" = "gọi bất kỳ lệnh nào mà quyền truy cập cho phép"
+"call only: {commands}" = "chỉ gọi: {commands}"
+"can edit the document" = "có thể chỉnh sửa tài liệu"
+"conditional prototype actions nested too deeply were skipped" = "đã bỏ qua các hành động nguyên mẫu có điều kiện lồng quá sâu"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "đã bỏ qua các hành động nguyên mẫu có điều kiện không thể tính giá trị"
+"connector label background was skipped: style data is missing" = "đã bỏ qua nền nhãn đường nối: thiếu dữ liệu kiểu"
+"connector label was skipped: background bounds are invalid" = "đã bỏ qua nhãn đường nối: khung giới hạn nền không hợp lệ"
+"connector label was skipped: background transform is invalid" = "đã bỏ qua nhãn đường nối: phép biến đổi nền không hợp lệ"
+"connector label was skipped: composed text transform is invalid" = "đã bỏ qua nhãn đường nối: phép biến đổi văn bản tổng hợp không hợp lệ"
+"connector label was skipped: derived background bounds are missing" = "đã bỏ qua nhãn đường nối: thiếu khung giới hạn nền suy dẫn"
+"connector label was skipped: derived text bounds are missing" = "đã bỏ qua nhãn đường nối: thiếu khung giới hạn văn bản suy dẫn"
+"connector label was skipped: text bounds are invalid" = "đã bỏ qua nhãn đường nối: khung giới hạn văn bản không hợp lệ"
+"connector label was skipped: text style data is missing" = "đã bỏ qua nhãn đường nối: thiếu dữ liệu kiểu văn bản"
+"connector label was skipped: text transform is invalid" = "đã bỏ qua nhãn đường nối: phép biến đổi văn bản không hợp lệ"
+"connector labels were skipped" = "đã bỏ qua các nhãn đường nối"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "các lớp đường nối được nhập dưới dạng khung/vector tĩnh kèm theo nhãn nếu có; liên kết động ở hai đầu mút không được giữ lại"
+"connector snapshot vector data is missing; connector was left empty" = "thiếu dữ liệu vector tĩnh của đường nối; đường nối được để trống"
+"connectors whose ends can't be placed are empty" = "các đường nối không thể đặt hai đầu mút sẽ được để trống"
+"crop marks" = "dấu xén"
+"damaged vector geometry was skipped" = "đã bỏ qua hình học vector bị hỏng"
+"damaged vector networks import as outlines" = "mạng vector bị hỏng được nhập dưới dạng đường viền"
+"development: {path}" = "phát triển: {path}"
+"document children other than pages were skipped" = "đã bỏ qua các mục con của tài liệu không phải là trang"
+"duplicate grid track sizing entries use equal tracks" = "các mục kích thước dải lưới trùng lặp sẽ dùng kích thước dải bằng nhau"
+"e.g. count + 1" = "ví dụ: count + 1"
+"e.g. count >= 3 and not done" = "ví dụ: count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "các đường nối gấp khúc và cong không có đường dẫn đã lưu được nhập thành đường thẳng"
+"entries without a node type were skipped" = "đã bỏ qua các mục không có loại nút"
+"figcraft:// links from a browser, chat or email open this app and join the session." = "Liên kết figcraft:// từ trình duyệt, ứng dụng trò chuyện hoặc email sẽ mở ứng dụng này và tham gia phiên."
+"filled areas of a vector with their own fill use the layer's fill" = "các vùng tô riêng trong một vector sẽ dùng màu tô của lớp"
+"from {server}" = "từ {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "đã bỏ qua các kích hoạt tay cầm không có đúng một nút điều khiển đã biết"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "danh sách dải lưới vượt quá 1000 mục; các dải sẽ dùng kích thước đều nhau mặc định"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "kích thước dải lưới không được hỗ trợ hoặc sai định dạng; các dải bị ảnh hưởng sẽ dùng kích thước đều nhau"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "danh sách kích thước dải lưới vượt quá 1000 mục; các dải sẽ dùng kích thước đều nhau mặc định"
+"hidden" = "đã ẩn"
+"iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "bộ lọc hình ảnh không rõ ràng do có cả hai vùng chứa bộ lọc; đã bỏ qua chuyển đổi bộ lọc"
+"image filters use FigCraft's approximate renderer" = "bộ lọc hình ảnh sử dụng bộ kết xuất xấp xỉ của FigCraft"
+"instance swap properties whose default component isn't in the file were skipped" = "đã bỏ qua các thuộc tính hoán đổi bản thể có thành phần mặc định không nằm trong tệp"
+"instances inside their own main component were imported as frames" = "các bản thể nằm bên trong chính thành phần chính của chúng đã được nhập thành khung"
+"instances of components that aren't in the file show no layers" = "các bản thể của thành phần không có trong tệp sẽ không hiển thị lớp nào"
+"instances of components that aren't in the file were imported as frames" = "các bản thể của thành phần không có trong tệp đã được nhập thành khung"
+"instances that would nest a component inside itself were imported as frames" = "các bản thể gây lồng thành phần vào chính nó đã được nhập thành khung"
+"instances without a main component were imported as empty frames" = "các bản thể không có thành phần chính đã được nhập thành khung trống"
+"invalid internal .fig text path data was ignored" = "đã bỏ qua dữ liệu đường dẫn văn bản .fig nội bộ không hợp lệ"
+"invalid or oversized vector networks import as outlines" = "mạng vector không hợp lệ hoặc quá lớn được nhập dưới dạng đường viền"
+"invalid or oversized vector path data was skipped" = "đã bỏ qua dữ liệu đường dẫn vector không hợp lệ hoặc quá lớn"
+"just now" = "vừa xong"
+"key triggers without a supported key were skipped" = "đã bỏ qua các kích hoạt phím không có phím được hỗ trợ"
+"key up triggers import as key presses" = "kích hoạt nhả phím được nhập thành nhấn phím"
+"layers without a position were placed at their parent's origin" = "các lớp không có vị trí đã được đặt tại gốc tọa độ của lớp cha"
+"layers without a type were skipped" = "đã bỏ qua các lớp không có loại"
+"legacy image filter container is unsupported; filter conversion was skipped" = "vùng chứa bộ lọc hình ảnh kiểu cũ không được hỗ trợ; đã bỏ qua chuyển đổi bộ lọc"
+"locked" = "đã khóa"
+"malformed image filters container was skipped" = "đã bỏ qua vùng chứa bộ lọc hình ảnh bị lỗi định dạng"
+"malformed image paintFilter container was skipped" = "đã bỏ qua vùng chứa paintFilter hình ảnh bị lỗi định dạng"
+"malformed slot content assignment was skipped" = "đã bỏ qua phép gán nội dung ô chứa bị lỗi định dạng"
+"no bleed" = "không tràn lề"
+"nobody else here yet" = "chưa có ai khác ở đây"
+"non-default slot settings are not represented and were skipped" = "các thiết lập ô chứa không mặc định không được biểu diễn và đã bị bỏ qua"
+"now" = "bây giờ"
+"only in a text style or variable" = "chỉ trong kiểu văn bản hoặc biến"
+"or" = "hoặc"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "khớp nối nét tại điểm được giữ lại; nét đứt hoặc nét có độ rộng biến thiên sẽ kết xuất theo khớp nối của lớp"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "không thể phân giải khóa thành phần ưu tiên của ô chứa thành nút trong tệp nên đã bỏ qua"
+"prototype actions of unknown types were skipped" = "đã bỏ qua các hành động nguyên mẫu thuộc loại không xác định"
+"prototype actions without a destination in the file were skipped" = "đã bỏ qua các hành động nguyên mẫu không có đích đến trong tệp"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "đã bỏ qua các biểu thức nguyên mẫu dùng biến không có trong JSON biến"
+"prototype expressions with unsupported functions were skipped" = "đã bỏ qua các biểu thức nguyên mẫu có hàm không được hỗ trợ"
+"prototype interactions without supported actions were skipped" = "đã bỏ qua các tương tác nguyên mẫu không có hành động được hỗ trợ"
+"prototype navigations of unknown types were skipped" = "đã bỏ qua các điều hướng nguyên mẫu thuộc loại không xác định"
+"prototype transitions of unknown types play instantly" = "các chuyển cảnh nguyên mẫu thuộc loại không xác định sẽ phát tức thì"
+"prototype triggers of unknown types were skipped" = "đã bỏ qua các kích hoạt nguyên mẫu thuộc loại không xác định"
+"put a widget on the canvas" = "đặt một tiện ích lên vùng vẽ"
+"read and edit the document" = "đọc và chỉnh sửa tài liệu"
+"read the document" = "đọc tài liệu"
+"reads the document" = "đọc tài liệu"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "đã bỏ qua các hành động đặt biến trên biến không có trong JSON biến"
+"set-variable actions with values that can't be evaluated were skipped" = "đã bỏ qua các hành động đặt biến có giá trị không thể tính toán"
+"set-variable actions with values that don't fit the variable were skipped" = "đã bỏ qua các hành động đặt biến có giá trị không khớp kiểu biến"
+"set-variable actions without a value were skipped" = "đã bỏ qua các hành động đặt biến không có giá trị"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "đã bỏ qua các hành động đặt chế độ biến trên bộ sưu tập hoặc chế độ không có trong JSON biến"
+"slot content assignment target is missing or is not slot content" = "đích gán nội dung ô chứa bị thiếu hoặc không phải là nội dung ô chứa"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "phép gán nội dung ô chứa dùng GUID rỗng nên đã bị bỏ qua"
+"slot layers without a matching slot property were imported as frames" = "các lớp ô chứa không có thuộc tính ô chứa tương ứng đã được nhập thành khung"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "một số điểm vector tham chiếu đến thiết lập điểm bị thiếu trong tệp; chúng sẽ dùng khớp nối của lớp và góc thường"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "một số đoạn vector tham chiếu đến thiết lập kiểu bị thiếu trong tệp; chúng sẽ dùng nét của lớp"
+"stale or invalid grid track sizing entries were ignored" = "đã bỏ qua các mục kích thước dải lưới cũ hoặc không hợp lệ"
+"stars and polygons without point counts or geometry use the default point count" = "ngôi sao và đa giác không có số đỉnh hoặc hình học sẽ dùng số đỉnh mặc định"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "thiết lập kiểu của một số đoạn vector không được hỗ trợ; các đoạn đó sẽ dùng nét của lớp"
+"text path underline or strikethrough decoration is not rendered" = "không kết xuất gạch chân hoặc gạch ngang chữ đối với văn bản trên đường dẫn"
+"text style overrides refer to missing table entries" = "các ghi đè kiểu văn bản tham chiếu đến mục bảng bị thiếu"
+"the file has no pages" = "tệp không có trang nào"
+"the plugin" = "plugin"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "JSON biến không có `variableCollections` (cần phản hồi biến cục bộ) nên đã bị bỏ qua"
+"this session only" = "chỉ trong phiên này"
+"unknown component property types were skipped" = "đã bỏ qua các loại thuộc tính thành phần không xác định"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "đã bỏ qua các bí danh biến trỏ tới biến không có trong JSON biến (hoặc khác kiểu)"
+"variable bindings to properties the layer doesn't have were skipped" = "đã bỏ qua các gắn kết biến vào thuộc tính mà lớp không có"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "đã bỏ qua các gắn kết biến trỏ tới biến không có trong JSON biến (biến thư viện)"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "đã bỏ qua các gắn kết biến: JSON tệp không có định nghĩa biến (hãy truyền JSON biến cục bộ vào `variables`, hoặc nhúng `meta` của nó cạnh JSON tệp)"
+"variable bindings whose variable type doesn't fit the property were skipped" = "đã bỏ qua các gắn kết biến có kiểu biến không phù hợp với thuộc tính"
+"variable collections without modes were skipped" = "đã bỏ qua các bộ sưu tập biến không có chế độ"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "đã bỏ qua các tra cứu chế độ biến trong biểu thức nguyên mẫu không phải là một biến và một chế độ của nó"
+"variable modes of collections that aren't in the file were skipped" = "đã bỏ qua các chế độ biến của bộ sưu tập không có trong tệp"
+"variable modes of collections that aren't in the variables JSON were skipped" = "đã bỏ qua các chế độ biến của bộ sưu tập không có trong JSON biến"
+"variable values that don't match their type (or composed colours) were skipped" = "đã bỏ qua các giá trị biến không khớp kiểu (hoặc màu tổng hợp)"
+"variables of unknown types were skipped" = "đã bỏ qua các biến thuộc kiểu không xác định"
+"variables whose collection isn't in the variables JSON were skipped" = "đã bỏ qua các biến có bộ sưu tập không nằm trong JSON biến"
+"variables without readable values were skipped" = "đã bỏ qua các biến không có giá trị đọc được"
+"vector points with unknown stroke joins use the layer join" = "các điểm vector có khớp nối nét không xác định sẽ dùng khớp nối của lớp"
+"vectors without geometry are empty" = "các vector không có dữ liệu hình học sẽ để trống"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "các vector không có dữ liệu hình học sẽ để trống (hãy xuất JSON tệp với geometry=paths)"
+"very long text was cut to 1,048,576 characters" = "văn bản quá dài đã được cắt còn 1.048.576 ký tự"
+"very long vector paths were skipped" = "đã bỏ qua các đường dẫn vector quá dài"
+"video actions are not supported and were skipped" = "hành động video không được hỗ trợ và đã bị bỏ qua"
+"video triggers are not supported and were skipped" = "kích hoạt video không được hỗ trợ và đã bị bỏ qua"
+"yesterday" = "hôm qua"
+"{instances} in {files}" = "{instances} trong {files}"
+"{language}: draft translation, waiting for a native speaker's review." = "{language}: bản dịch nháp, đang chờ người bản ngữ hiệu đính."
+"{length} bleed" = "tràn lề {length}"
+"{month} {day}, {year}" = "{day} {month}, {year}"
+"{name}\nClick to apply to the selection" = "{name}\nNhấp để áp dụng cho vùng chọn"
+"{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\nKéo vào vùng vẽ, hoặc nhấp để đặt ở giữa khung nhìn.\nGiữ Alt (Option) khi thả vào một bản thể để hoán đổi."
+"{name} (from {library})" = "{name} (từ {library})"
+"{name} (you)" = "{name} (bạn)"
+"{name} ({layers} layers)" = "{name} ({layers} lớp)"
+"{name} ({tag}): {min} – {max}, default {default}. Double-click the slider to go back to the style's value; Escape while dragging cancels." = "{name} ({tag}): {min} – {max}, mặc định {default}. Nhấp đúp vào thanh trượt để quay lại giá trị của kiểu; nhấn Escape khi đang kéo để hủy."
+"{name} cleared from the list" = "Đã xóa {name} khỏi danh sách"
+"{name} from {path}" = "{name} từ {path}"
+"{name} is forgotten on this computer; the file stays on {server}" = "Đã quên {name} trên máy tính này; tệp vẫn còn trên {server}"
+"{name} is on the server." = "{name} đang ở trên máy chủ."
+"{name} is spotlighting" = "{name} đang chiếu tâm điểm"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} quá lớn để mở trong trình duyệt (trên 512 MB)."
+"{name} was removed from the server" = "Đã xóa {name} khỏi máy chủ"
+"{name} · deleted on main" = "{name} · đã xóa trên nhánh chính"
+"{name} · deleted on the branch" = "{name} · đã xóa trên nhánh"
+"{name} · not published" = "{name} · chưa xuất bản"
+"{name} · on a server" = "{name} · trên máy chủ"
+"{name} · published version {v}" = "{name} · đã xuất bản phiên bản {v}"
+"{name} · version {v} on the server" = "{name} · phiên bản {v} trên máy chủ"
+"{name}, in a live session" = "{name}, trong phiên trực tiếp"
+"{name}, online, open only to you" = "{name}, trực tuyến, chỉ mình bạn mở được"
+"{name}, {kind}, {w} by {h}, selected" = "{name}, {kind}, {w} × {h}, đã chọn"
+"{n} added" = { other = "{n} đã thêm" }
+"{n} autosave versions" = { other = "{n} phiên bản tự động lưu" }
+"{n} changed" = { other = "{n} đã thay đổi" }
+"{n} columns" = { other = "{n} cột" }
+"{n} components" = { other = "{n} thành phần" }
+"{n} components and styles have newer versions" = { other = "{n} thành phần và kiểu có phiên bản mới hơn" }
+"{n} conflicts to resolve" = { other = "{n} xung đột cần giải quyết" }
+"{n} days ago" = { other = "{n} ngày trước" }
+"{n} files" = { other = "{n} tệp" }
+"{n} hours ago" = { other = "{n} giờ trước" }
+"{n} instances" = { other = "{n} bản thể" }
+"{n} layers" = { other = "{n} lớp" }
+"{n} layers as one file" = { other = "{n} lớp thành một tệp" }
+"{n} layers selected" = { other = "Đã chọn {n} lớp" }
+"{n} layers · {parts}" = { other = "{n} lớp · {parts}" }
+"{n} matches" = { other = "{n} kết quả khớp" }
+"{n} minutes ago" = { other = "{n} phút trước" }
+"{n} months ago" = { other = "{n} tháng trước" }
+"{n} more notes omitted from this report" = { other = "{n} ghi chú khác đã được lược bớt khỏi báo cáo này" }
+"{n} of {total}" = "{n} / {total}"
+"{n} people joined" = { other = "{n} người đã tham gia" }
+"{n} preferred components" = { other = "{n} thành phần ưu tiên" }
+"{n} ready" = { other = "{n} sẵn sàng" }
+"{n} removed" = { other = "{n} đã xóa" }
+"{n} replies" = { other = "{n} phản hồi" }
+"{n} rows" = { other = "{n} hàng" }
+"{n} styles" = { other = "{n} kiểu" }
+"{n} text layers" = { other = "{n} lớp văn bản" }
+"{n} variables" = { other = "{n} biến" }
+"{n} weeks ago" = { other = "{n} tuần trước" }
+"{n} years ago" = { other = "{n} năm trước" }
+"{n}d" = "{n}ng"
+"{n}h" = "{n}g"
+"{n}m" = "{n}ph"
+"{n}w" = "{n}t"
+"{page}, nothing selected" = "{page}, chưa chọn gì"
+"{percent}%" = "{percent}%"
+"{profile} (current)" = "{profile} (hiện tại)"
+"{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} là giá trị thuộc tính; {property ? \"a\" : \"b\"} chọn một chuỗi. Các {…} khác được giữ nguyên như đã viết."
+"{server} can't say what became of your files (it is older than this app)." = "{server} không thể cho biết trạng thái các tệp của bạn (máy chủ cũ hơn ứng dụng này)."
+"{server} · No longer on the server" = "{server} · Không còn trên máy chủ"
+"{server} · {shared} · Opened {date}" = "{server} · {shared} · Đã mở {date}"
+"{tool}  hold {key}" = "{tool}  giữ {key}"
+"{value} isn't a colour" = "{value} không phải là một màu"
+"{when} · edited" = "{when} · đã chỉnh sửa"
+"←" = "←"
+"← ↑ → ↓" = "← ↑ → ↓"
+"← → ↑ ↓" = "← → ↑ ↓"
+"→, Space or N" = "→, Space hoặc N"
+"↵" = "↵"
+"⇥ / ⇧⇥" = "⇥ / ⇧⇥"
+"⌘ arrows" = "⌘ mũi tên"
+"⌘ click" = "⌘ nhấp"
+"⌘ scroll" = "⌘ cuộn"
+"⌥ drag" = "⌥ kéo"
+
+[commands]
+"align.bottom" = "Căn dưới"
+"align.hcenter" = "Căn tâm ngang"
+"align.left" = "Căn trái"
+"align.right" = "Căn phải"
+"align.top" = "Căn trên"
+"align.vcenter" = "Căn tâm dọc"
+"annotation.add" = "Thêm chú thích"
+"annotation.addCategory" = "Thêm danh mục chú thích"
+"annotation.categories" = "Danh mục chú thích"
+"annotation.edit" = "Chỉnh sửa chú thích"
+"annotation.editCategory" = "Chỉnh sửa danh mục chú thích"
+"annotation.list" = "Danh sách chú thích"
+"annotation.remove" = "Xóa chú thích"
+"annotation.removeCategory" = "Xóa danh mục chú thích"
+"app.actions" = "Hành động"
+"app.preferences" = "Tùy chọn"
+"arrange.back" = "Đưa xuống dưới cùng"
+"arrange.backward" = "Đưa lùi một lớp"
+"arrange.forward" = "Đưa tiến một lớp"
+"arrange.front" = "Đưa lên trên cùng"
+"arrange.packH" = "Xếp sát ngang"
+"arrange.packV" = "Xếp sát dọc"
+"arrange.reorder" = "Sắp xếp lại vùng chọn"
+"arrange.roundToPixels" = "Làm tròn theo pixel"
+"arrange.spacing" = "Khoảng cách"
+"arrange.tidy" = "Sắp xếp gọn"
+"bool.exclude" = "Loại trừ vùng chọn"
+"bool.flatten" = "Làm phẳng nhóm boolean"
+"bool.intersect" = "Giao vùng chọn"
+"bool.subtract" = "Trừ vùng chọn"
+"bool.union" = "Hợp vùng chọn"
+"branch.archive" = "Lưu trữ nhánh"
+"branch.create" = "Tạo nhánh"
+"branch.list" = "Danh sách nhánh"
+"branch.merge" = "Hợp nhất nhánh"
+"branch.open" = "Mở nhánh"
+"branch.review" = "Xem xét nhánh"
+"branch.updateFromMain" = "Cập nhật từ nhánh chính"
+"codeConnect.export" = "Xuất kết nối mã"
+"codeConnect.import" = "Nhập kết nối mã"
+"codeConnect.remove" = "Ngắt kết nối mã"
+"codeConnect.set" = "Kết nối với mã"
+"collab.cursor" = "Hiện con trỏ tại"
+"collab.cursorChat" = "Trò chuyện con trỏ"
+"collab.diff" = "Hiện thay đổi đồng bộ"
+"collab.files" = "Tệp trực tuyến của bạn"
+"collab.follow" = "Theo dõi"
+"collab.forgetFile" = "Quên tệp trực tuyến"
+"collab.host" = "Bắt đầu phiên trực tiếp"
+"collab.join" = "Tham gia phiên trực tiếp"
+"collab.leave" = "Rời phiên trực tiếp"
+"collab.manageFile" = "Quản lý tệp đã xuất bản"
+"collab.openFile" = "Mở tệp trực tuyến"
+"collab.peers" = "Những người trong tệp này"
+"collab.publish" = "Xuất bản lên máy chủ"
+"collab.recoverFile" = "Khôi phục tệp trực tuyến"
+"collab.registerLinks" = "Mở liên kết mời trong FigCraft"
+"collab.removePerson" = "Xóa khỏi phiên"
+"collab.report" = "Báo cáo tệp cho người vận hành máy chủ"
+"collab.serverInfo" = "Thông tin máy chủ"
+"collab.share" = "Chia sẻ bằng mã tham gia"
+"collab.spotlight" = "Chiếu tâm điểm vào tôi"
+"collab.stop" = "Dừng phiên trực tiếp"
+"command.batch" = "Chạy nhiều lệnh"
+"comment.add" = "Thêm bình luận"
+"comment.delete" = "Xóa bình luận"
+"comment.edit" = "Chỉnh sửa bình luận"
+"comment.link" = "Sao chép liên kết đến bình luận"
+"comment.list" = "Danh sách bình luận"
+"comment.markRead" = "Đánh dấu bình luận đã đọc"
+"comment.move" = "Di chuyển bình luận"
+"comment.next" = "Bình luận tiếp theo"
+"comment.open" = "Mở bình luận"
+"comment.people" = "Người trong bình luận"
+"comment.react" = "Thả cảm xúc cho bình luận"
+"comment.reply" = "Trả lời bình luận"
+"comment.resolve" = "Giải quyết bình luận"
+"comment.zoom" = "Thu phóng đến bình luận"
+"component.addProperty" = "Thêm thuộc tính thành phần"
+"component.addVariant" = "Thêm biến thể"
+"component.bindProperty" = "Gắn lớp vào thuộc tính"
+"component.combineVariants" = "Kết hợp thành các biến thể"
+"component.create" = "Tạo thành phần"
+"component.createMultiple" = "Tạo nhiều thành phần"
+"component.deleteProperty" = "Xóa thuộc tính thành phần"
+"component.detach" = "Tách bản thể"
+"component.editProperty" = "Chỉnh sửa thuộc tính thành phần"
+"component.exposeInstance" = "Hiển thị bản thể lồng nhau"
+"component.goToMain" = "Đi tới thành phần chính"
+"component.hideWhenPublishing" = "Ẩn khi xuất bản"
+"component.list" = "Danh sách thành phần"
+"component.makeSlot" = "Tạo ô chứa"
+"component.playground" = "Sân thử nghiệm thành phần"
+"component.properties" = "Thuộc tính thành phần"
+"component.pushChanges" = "Đẩy thay đổi lên thành phần chính"
+"component.removeSlot" = "Xóa ô chứa"
+"component.resetInstance" = "Đặt lại mọi thay đổi"
+"component.resetOverride" = "Đặt lại ghi đè"
+"component.restoreMain" = "Khôi phục thành phần chính"
+"dev.compare" = "So sánh thay đổi"
+"dev.focus" = "Chế độ xem tập trung"
+"dev.resolveChange" = "Giải quyết thay đổi"
+"dev.unfocus" = "Thoát chế độ xem tập trung"
+"devResource.add" = "Thêm tài nguyên dev"
+"devResource.edit" = "Chỉnh sửa tài nguyên dev"
+"devResource.list" = "Danh sách tài nguyên dev"
+"devResource.remove" = "Xóa tài nguyên dev"
+"distribute.horizontal" = "Phân bổ đều khoảng cách ngang"
+"distribute.vertical" = "Phân bổ đều khoảng cách dọc"
+"doc.home" = "Trang chủ"
+"doc.list" = "Danh sách tài liệu"
+"doc.nextTab" = "Thẻ tiếp theo"
+"doc.previousTab" = "Thẻ trước"
+"doc.switch" = "Chuyển tài liệu"
+"edit.copy" = "Sao chép"
+"edit.copyAsCss" = "Sao chép dưới dạng CSS"
+"edit.copyAsPng" = "Sao chép dưới dạng PNG"
+"edit.copyAsSvg" = "Sao chép dưới dạng SVG"
+"edit.copyAsText" = "Sao chép dưới dạng văn bản"
+"edit.copyLink" = "Sao chép liên kết đến vùng chọn"
+"edit.copyProperties" = "Sao chép thuộc tính"
+"edit.cut" = "Cắt"
+"edit.delete" = "Xóa"
+"edit.duplicate" = "Nhân bản"
+"edit.findReplace" = "Tìm và thay thế"
+"edit.paste" = "Dán"
+"edit.pasteDesignLayers" = "Dán các lớp thiết kế"
+"edit.pasteOver" = "Dán đè lên vùng chọn"
+"edit.pasteProperties" = "Dán thuộc tính"
+"edit.pasteReplace" = "Dán để thay thế"
+"edit.pickColor" = "Chọn màu"
+"edit.redo" = "Làm lại"
+"edit.repeat" = "Lặp lại lệnh cuối"
+"edit.setDefaultProperties" = "Đặt thuộc tính mặc định"
+"edit.undo" = "Hoàn tác"
+"effect.add" = "Thêm hiệu ứng"
+"effect.move" = "Di chuyển hiệu ứng"
+"effect.remove" = "Xóa hiệu ứng"
+"effect.set" = "Đặt hiệu ứng"
+"export.add" = "Thêm thiết lập xuất"
+"export.remove" = "Xóa thiết lập xuất"
+"export.update" = "Chỉnh sửa thiết lập xuất"
+"file.close" = "Đóng thẻ"
+"file.colorProfile" = "Hồ sơ màu"
+"file.duplicate" = "Nhân bản tệp"
+"file.export" = "Xuất"
+"file.exportFramesPdf" = "Xuất các khung ra PDF"
+"file.exportLayers" = "Xuất các lớp"
+"file.exportSvg" = "Xuất vùng chọn ra SVG"
+"file.import" = "Nhập"
+"file.moveTab" = "Di chuyển thẻ"
+"file.new" = "Tệp thiết kế mới"
+"file.newFromTemplate" = "Mới từ mẫu"
+"file.open" = "Mở"
+"file.openRecent" = "Mở tệp gần đây"
+"file.placeImage" = "Đặt hình ảnh"
+"file.recover" = "Khôi phục tệp"
+"file.rename" = "Đổi tên tệp"
+"file.revert" = "Hoàn nguyên về bản đã lưu"
+"file.save" = "Lưu"
+"file.saveAs" = "Lưu thành"
+"file.saveVersion" = "Lưu vào lịch sử phiên bản"
+"file.versionHistory" = "Hiện lịch sử phiên bản"
+"fill.add" = "Thêm màu tô"
+"fill.move" = "Di chuyển màu tô"
+"fill.pattern" = "Tô họa tiết"
+"fill.remove" = "Xóa màu tô"
+"fill.set" = "Đặt màu tô"
+"frame.create" = "Tạo khung"
+"frame.presets" = "Danh sách kích thước khung dựng sẵn"
+"frame.swapOrientation" = "Đổi chiều ngang/dọc"
+"grid.add" = "Thêm lưới bố cục"
+"grid.move" = "Di chuyển lưới bố cục"
+"grid.remove" = "Xóa lưới bố cục"
+"guide.add" = "Thêm đường gióng"
+"guide.clear" = "Xóa mọi đường gióng"
+"guide.move" = "Di chuyển đường gióng"
+"guide.remove" = "Xóa đường gióng"
+"guide.select" = "Chọn đường gióng"
+"help.about" = "Giới thiệu về FigCraft"
+"help.gettingStarted" = "Bắt đầu"
+"help.page" = "Trang trợ giúp"
+"help.shortcuts" = "Phím tắt"
+"image.adjust" = "Điều chỉnh hình ảnh"
+"image.deletePreset" = "Xóa thiết lập sẵn hình ảnh"
+"image.place" = "Đặt hình ảnh"
+"image.presets" = "Thiết lập sẵn hình ảnh"
+"image.savePreset" = "Lưu thiết lập sẵn hình ảnh"
+"inspect.assets" = "Kiểm tra tài nguyên"
+"inspect.code" = "Mã cho lớp"
+"inspect.componentCode" = "Mã thành phần"
+"inspect.properties" = "Kiểm tra thuộc tính"
+"inspect.readyForDev" = "Sẵn sàng cho dev"
+"instance.create" = "Tạo bản thể"
+"instance.exposed" = "Các bản thể lồng nhau được hiển thị"
+"instance.place" = "Đặt bản thể"
+"instance.resetSlot" = "Đặt lại ô chứa"
+"instance.setProperties" = "Đặt thuộc tính bản thể"
+"instance.slotInsert" = "Chèn vào ô chứa"
+"instance.swap" = "Hoán đổi bản thể"
+"instance.swapAt" = "Hoán đổi bản thể tại điểm"
+"layers.collapseAll" = "Thu gọn các lớp"
+"layout.add" = "Thêm bố cục tự động"
+"layout.remove" = "Xóa bố cục tự động"
+"layout.setTrack" = "Đặt kích thước dải lưới"
+"layout.suggest" = "Gợi ý bố cục tự động"
+"libraries.open" = "Thư viện"
+"libraries.publish" = "Xuất bản thư viện…"
+"library.acceptUpdates" = "Chấp nhận cập nhật thư viện"
+"library.add" = "Thêm thư viện"
+"library.aliasVariable" = "Tạo bí danh biến thư viện"
+"library.applyStyle" = "Áp dụng kiểu thư viện"
+"library.bindVariable" = "Gắn biến thư viện"
+"library.extendCollection" = "Mở rộng bộ sưu tập thư viện"
+"library.import" = "Nhập thành phần thư viện"
+"library.importVariable" = "Nhập biến thư viện"
+"library.list" = "Danh sách thư viện"
+"library.place" = "Đặt thành phần thư viện"
+"library.publish" = "Xuất bản thư viện"
+"library.publishToServer" = "Xuất bản thư viện lên máy chủ"
+"library.remove" = "Xóa thư viện"
+"library.setVariableMode" = "Đặt chế độ biến thư viện"
+"library.swap" = "Hoán đổi thư viện"
+"library.swapAt" = "Hoán đổi bản thể sang thành phần thư viện"
+"library.updates" = "Cập nhật thư viện"
+"library.usage" = "Mức sử dụng thư viện"
+"measure.distances" = "Đo khoảng cách"
+"measure.padding" = "Đo khoảng đệm bố cục tự động"
+"node.create" = "Tạo lớp"
+"node.get" = "Lấy lớp"
+"node.reorder" = "Sắp xếp lại lớp"
+"node.reparent" = "Di chuyển lớp vào trong"
+"node.set" = "Đặt thuộc tính"
+"object.batchRename" = "Đổi tên hàng loạt"
+"object.convertToFrame" = "Chuyển thành khung"
+"object.convertToGroup" = "Chuyển thành nhóm"
+"object.convertToSection" = "Chuyển thành phần"
+"object.flipH" = "Lật ngang"
+"object.flipV" = "Lật dọc"
+"object.frameSelection" = "Đóng khung vùng chọn"
+"object.group" = "Nhóm vùng chọn"
+"object.hideOthers" = "Ẩn các lớp khác"
+"object.mask" = "Dùng làm mặt nạ"
+"object.moveToPage" = "Di chuyển sang trang"
+"object.opacityKeys" = "Độ mờ từ phím số"
+"object.rasterize" = "Điểm ảnh hóa vùng chọn"
+"object.releaseMask" = "Bỏ mặt nạ"
+"object.removeFill" = "Xóa màu tô"
+"object.removeFrame" = "Bỏ khung"
+"object.removeStroke" = "Xóa nét"
+"object.rename" = "Đổi tên"
+"object.resizeToFit" = "Đổi kích thước vừa khít"
+"object.rotate180" = "Xoay 180°"
+"object.rotateLeft" = "Xoay 90° sang trái"
+"object.rotateRight" = "Xoay 90° sang phải"
+"object.setThumbnail" = "Đặt làm ảnh thu nhỏ"
+"object.swapFillStroke" = "Đổi chỗ màu tô và nét"
+"object.toggleLock" = "Khóa/Mở khóa vùng chọn"
+"object.toggleVisible" = "Hiện/Ẩn vùng chọn"
+"object.ungroup" = "Bỏ nhóm vùng chọn"
+"object.wrapInSection" = "Bọc trong phần mới"
+"page.add" = "Thêm trang"
+"page.delete" = "Xóa trang"
+"page.duplicate" = "Nhân bản trang"
+"page.list" = "Danh sách trang"
+"page.move" = "Di chuyển trang"
+"page.rename" = "Đổi tên trang"
+"page.select" = "Đi tới trang"
+"page.setBackground" = "Màu nền trang"
+"paint.documentColors" = "Màu trong tài liệu"
+"plugin.close" = "Đóng bảng plugin"
+"plugin.directory.install" = "Cài đặt plugin từ thư mục"
+"plugin.directory.list" = "Duyệt thư mục plugin"
+"plugin.directory.publish" = "Xuất bản plugin lên thư mục"
+"plugin.directory.unpublish" = "Gỡ xuất bản plugin khỏi thư mục"
+"plugin.event" = "Dùng điều khiển bảng plugin"
+"plugin.import" = "Nhập plugin từ tệp kê khai…"
+"plugin.list" = "Danh sách plugin"
+"plugin.remove" = "Gỡ plugin"
+"plugin.run" = "Chạy plugin"
+"plugin.ui" = "Bảng plugin"
+"plugins.manage" = "Quản lý plugin…"
+"plugins.runLast" = "Chạy plugin vừa dùng"
+"pref.autoSave" = "Tự động lưu tệp"
+"pref.highlightHover" = "Làm nổi bật lớp khi di chuột qua"
+"pref.keepTool" = "Giữ công cụ được chọn sau khi dùng"
+"pref.language" = "Ngôn ngữ giao diện"
+"pref.nudge" = "Mức dịch chuyển nhẹ"
+"pref.numberKeysOpacity" = "Dùng phím số để chỉnh độ mờ"
+"pref.publishServer" = "Máy chủ chia sẻ trực tuyến"
+"pref.reduceMotion" = "Giảm chuyển động"
+"pref.renameDuplicates" = "Đổi tên các lớp nhân bản"
+"pref.showDimensions" = "Hiện kích thước trên đối tượng"
+"pref.startOnHome" = "Khởi động tại màn hình Trang chủ"
+"pref.uiScale" = "Kích thước giao diện"
+"pref.userName" = "Tên của bạn trong bình luận"
+"proto.action.add" = "Thêm hành động nguyên mẫu"
+"proto.action.move" = "Sắp xếp lại hành động nguyên mẫu"
+"proto.action.remove" = "Xóa hành động nguyên mẫu"
+"proto.action.set" = "Chỉnh sửa hành động nguyên mẫu"
+"proto.closePreview" = "Đóng xem trước nguyên mẫu"
+"proto.conditional.addBlock" = "Thêm nhánh else if / else"
+"proto.conditional.removeBlock" = "Xóa nhánh if / else if / else"
+"proto.conditional.setCondition" = "Chỉnh sửa điều kiện"
+"proto.evaluate" = "Tính biểu thức nguyên mẫu"
+"proto.flow.add" = "Thêm điểm bắt đầu luồng"
+"proto.flow.remove" = "Xóa luồng"
+"proto.flow.rename" = "Đổi tên luồng"
+"proto.interaction.add" = "Thêm tương tác"
+"proto.interaction.clear" = "Xóa mọi tương tác"
+"proto.interaction.remove" = "Xóa tương tác"
+"proto.interaction.set" = "Chỉnh sửa tương tác"
+"proto.present" = "Trình chiếu"
+"proto.presentOptions" = "Tùy chọn trình chiếu"
+"proto.preview" = "Mở xem trước nguyên mẫu"
+"proto.settings" = "Thiết lập nguyên mẫu"
+"section.toggleContents" = "Ẩn/Hiện nội dung phần"
+"select.add" = "Thêm vào vùng chọn"
+"select.all" = "Chọn tất cả"
+"select.area" = "Chọn vùng"
+"select.byName" = "Chọn lớp theo tên"
+"select.children" = "Chọn các lớp con"
+"select.inverse" = "Đảo ngược vùng chọn"
+"select.layersAt" = "Các lớp tại một điểm"
+"select.matching" = "Chọn các lớp tương ứng"
+"select.next" = "Chọn lớp đồng cấp tiếp theo"
+"select.none" = "Bỏ chọn tất cả"
+"select.parent" = "Chọn lớp cha"
+"select.previous" = "Chọn lớp đồng cấp trước đó"
+"select.remove" = "Bỏ khỏi vùng chọn"
+"select.sameEffect" = "Chọn cùng hiệu ứng"
+"select.sameFill" = "Chọn cùng màu tô"
+"select.sameFont" = "Chọn cùng phông chữ"
+"select.sameInstance" = "Chọn cùng bản thể"
+"select.sameProperties" = "Chọn cùng thuộc tính"
+"select.sameStroke" = "Chọn cùng nét"
+"select.sameText" = "Chọn cùng thuộc tính văn bản"
+"select.set" = "Chọn"
+"selection.applyColorStyle" = "Áp dụng kiểu màu cho vùng chọn"
+"selection.colors" = "Màu của vùng chọn"
+"selection.selectColor" = "Chọn các lớp có màu này"
+"selection.setPaint" = "Đổi màu vùng chọn"
+"shape.arrow" = "Mũi tên"
+"shape.ellipse" = "Hình elip"
+"shape.line" = "Đường thẳng"
+"shape.polygon" = "Đa giác"
+"shape.rectangle" = "Hình chữ nhật"
+"shape.star" = "Ngôi sao"
+"shapeBuilder.merge" = "Hợp nhất các vùng"
+"shapeBuilder.mode" = "Chế độ tạo hình"
+"shapeBuilder.regions" = "Các vùng tạo hình"
+"shapeBuilder.remove" = "Xóa các vùng"
+"stroke.add" = "Thêm nét"
+"stroke.brush" = "Cọ vẽ"
+"stroke.move" = "Di chuyển nét"
+"stroke.remove" = "Xóa nét"
+"stroke.set" = "Đặt nét"
+"stroke.widthProfile" = "Biên dạng độ rộng"
+"style.apply" = "Áp dụng kiểu"
+"style.bind" = "Gắn biến trong kiểu"
+"style.create" = "Tạo kiểu"
+"style.delete" = "Xóa kiểu"
+"style.detach" = "Tách kiểu"
+"style.duplicate" = "Nhân bản kiểu"
+"style.list" = "Danh sách kiểu"
+"style.move" = "Di chuyển kiểu"
+"style.renameFolder" = "Đổi tên thư mục kiểu"
+"style.update" = "Chỉnh sửa kiểu"
+"template.list" = "Danh sách mẫu"
+"text.alignCenter" = "Căn giữa"
+"text.alignJustify" = "Căn đều"
+"text.alignLeft" = "Căn trái"
+"text.alignRight" = "Căn phải"
+"text.bold" = "Đậm"
+"text.bulletList" = "Danh sách dấu đầu dòng"
+"text.case" = "Kiểu chữ hoa/thường"
+"text.caseLower" = "Chữ thường"
+"text.caseOriginal" = "Giữ nguyên chữ hoa/thường"
+"text.caseSmallCaps" = "Chữ hoa nhỏ"
+"text.caseTitle" = "Viết hoa đầu từ"
+"text.caseUpper" = "Chữ hoa"
+"text.create" = "Văn bản"
+"text.decoration" = "Trang trí chữ"
+"text.edit.begin" = "Chỉnh sửa văn bản"
+"text.edit.caret" = "Đặt con trỏ văn bản"
+"text.edit.end" = "Dừng chỉnh sửa văn bản"
+"text.edit.insert" = "Nhập văn bản"
+"text.edit.key" = "Phím văn bản"
+"text.edit.preedit" = "Soạn văn bản (IME)"
+"text.edit.selectLine" = "Chọn dòng"
+"text.edit.selectWord" = "Chọn từ"
+"text.edit.selection" = "Vùng chọn văn bản"
+"text.endPreview" = "Kết thúc xem trước văn bản"
+"text.fonts" = "Danh sách phông chữ"
+"text.italic" = "Nghiêng"
+"text.lineHeightDown" = "Giảm chiều cao dòng"
+"text.lineHeightUp" = "Tăng chiều cao dòng"
+"text.link" = "Tạo liên kết"
+"text.listIndent" = "Thụt lề danh sách"
+"text.listOutdent" = "Nhô lề danh sách"
+"text.listStyle" = "Kiểu danh sách"
+"text.loadFont" = "Tải tệp phông chữ"
+"text.maxLines" = "Số dòng tối đa"
+"text.missingFonts" = "Phông chữ bị thiếu"
+"text.numberList" = "Danh sách đánh số"
+"text.onPath" = "Văn bản trên đường dẫn"
+"text.paragraphIndent" = "Thụt lề đoạn văn"
+"text.paragraphSpacing" = "Khoảng cách đoạn văn"
+"text.pathOptions" = "Tùy chọn đường dẫn văn bản"
+"text.preview" = "Xem trước thay đổi văn bản"
+"text.refit" = "Khớp lại văn bản theo phông chữ"
+"text.removeFromPath" = "Gỡ văn bản khỏi đường dẫn"
+"text.rescanFonts" = "Quét lại phông chữ đã cài đặt"
+"text.set" = "Đặt văn bản"
+"text.setFeatures" = "Tính năng OpenType"
+"text.setVariations" = "Trục phông chữ biến thiên"
+"text.sizeDown" = "Giảm cỡ chữ"
+"text.sizeUp" = "Tăng cỡ chữ"
+"text.strikethrough" = "Gạch ngang chữ"
+"text.style" = "Định kiểu đoạn văn bản"
+"text.trackingDown" = "Giảm khoảng cách chữ"
+"text.trackingUp" = "Tăng khoảng cách chữ"
+"text.underline" = "Gạch chân"
+"text.weightDown" = "Giảm độ đậm chữ"
+"text.weightUp" = "Tăng độ đậm chữ"
+"tool.arrow" = "Mũi tên"
+"tool.comment" = "Bình luận"
+"tool.ellipse" = "Hình elip"
+"tool.frame" = "Khung"
+"tool.hand" = "Bàn tay"
+"tool.line" = "Đường thẳng"
+"tool.move" = "Di chuyển"
+"tool.pen" = "Bút"
+"tool.pencil" = "Bút chì"
+"tool.pencilBrush" = "Cọ bút chì"
+"tool.place" = "Đặt bằng công cụ"
+"tool.polygon" = "Đa giác"
+"tool.rectangle" = "Hình chữ nhật"
+"tool.scale" = "Tỷ lệ"
+"tool.scaleAnchor" = "Điểm neo tỷ lệ"
+"tool.section" = "Phần"
+"tool.set" = "Chọn công cụ"
+"tool.shapeBuilder" = "Tạo hình"
+"tool.slice" = "Lát cắt"
+"tool.star" = "Ngôi sao"
+"tool.text" = "Văn bản"
+"transform.move" = "Di chuyển"
+"transform.moveTo" = "Di chuyển tới"
+"transform.nudge" = "Dịch chuyển nhẹ"
+"transform.nudgeSize" = "Đổi kích thước theo bước dịch nhẹ"
+"transform.resize" = "Đổi kích thước"
+"transform.rotate" = "Xoay"
+"transform.rotationOrigin" = "Di chuyển tâm xoay"
+"transform.scale" = "Tỷ lệ"
+"transform.setRotationOrigin" = "Đặt tâm xoay"
+"variable.addMode" = "Thêm chế độ"
+"variable.bind" = "Gắn biến"
+"variable.create" = "Tạo biến"
+"variable.createCollection" = "Tạo bộ sưu tập biến"
+"variable.delete" = "Xóa biến"
+"variable.deleteCollection" = "Xóa bộ sưu tập"
+"variable.duplicate" = "Nhân bản biến"
+"variable.export" = "Xuất các biến"
+"variable.import" = "Nhập các biến"
+"variable.list" = "Danh sách biến"
+"variable.moveMode" = "Di chuyển chế độ"
+"variable.removeMode" = "Xóa chế độ"
+"variable.renameCollection" = "Đổi tên bộ sưu tập"
+"variable.renameMode" = "Đổi tên chế độ"
+"variable.resetOverride" = "Đặt lại ghi đè biến"
+"variable.set" = "Đặt giá trị biến"
+"variable.setMode" = "Đặt chế độ biến"
+"variable.update" = "Chỉnh sửa biến"
+"vector.create" = "Vector"
+"vector.deleteHeal" = "Xóa và nối liền vùng chọn"
+"vector.edit.addVertex" = "Thêm điểm"
+"vector.edit.begin" = "Chỉnh sửa vector"
+"vector.edit.bend" = "Uốn đoạn"
+"vector.edit.bounds" = "Khung giới hạn các điểm đã chọn"
+"vector.edit.connect" = "Nối các điểm"
+"vector.edit.cornerRadius" = "Bán kính góc của điểm"
+"vector.edit.cut" = "Cắt đường dẫn"
+"vector.edit.delete" = "Xóa các điểm"
+"vector.edit.end" = "Hoàn tất chỉnh sửa"
+"vector.edit.erase" = "Tẩy xóa"
+"vector.edit.lasso" = "Chọn bằng dây quây"
+"vector.edit.mirroring" = "Đối xứng tay nắm"
+"vector.edit.moveHandles" = "Di chuyển tay nắm"
+"vector.edit.moveVertices" = "Di chuyển các điểm"
+"vector.edit.nudge" = "Dịch nhẹ các điểm"
+"vector.edit.paint" = "Thùng sơn"
+"vector.edit.pen" = "Điểm bút"
+"vector.edit.penEnd" = "Kết thúc đường dẫn bút"
+"vector.edit.position" = "Vị trí điểm"
+"vector.edit.resize" = "Đổi kích thước các điểm"
+"vector.edit.rotate" = "Xoay các điểm"
+"vector.edit.select" = "Chọn các điểm"
+"vector.edit.selectAll" = "Chọn tất cả các điểm"
+"vector.edit.setHandle" = "Đặt tay nắm"
+"vector.edit.smooth" = "Làm mượt hoặc làm nhọn điểm"
+"vector.edit.state" = "Trạng thái chỉnh sửa vector"
+"vector.edit.strokeCap" = "Đầu mút nét tại điểm"
+"vector.edit.strokeJoin" = "Khớp nối nét tại điểm"
+"vector.edit.tool" = "Công cụ chỉnh sửa vector"
+"vector.edit.transform" = "Biến đổi các điểm"
+"vector.edit.widthPoint" = "Điểm độ rộng"
+"vector.flatten" = "Làm phẳng"
+"vector.join" = "Nối vùng chọn"
+"vector.offset" = "Đường dẫn lệch"
+"vector.outlineStroke" = "Chuyển nét thành đường viền"
+"vector.reverse" = "Đảo chiều đường dẫn"
+"vector.simplify" = "Đơn giản hóa vector"
+"vector.smoothJoin" = "Nối mượt vùng chọn"
+"version.autosave" = "Phiên bản tự động lưu"
+"version.delete" = "Xóa phiên bản"
+"version.duplicate" = "Nhân bản phiên bản"
+"version.exitPreview" = "Quay lại phiên bản hiện tại"
+"version.list" = "Danh sách phiên bản"
+"version.preview" = "Xem phiên bản"
+"version.rename" = "Đổi tên phiên bản"
+"version.restore" = "Khôi phục phiên bản"
+"view.assets" = "Bảng Tài nguyên"
+"view.comments" = "Bình luận"
+"view.contextMenu" = "Hiện trình đơn ngữ cảnh"
+"view.design" = "Bảng Thiết kế"
+"view.designPrototype" = "Chuyển đổi giữa Thiết kế và Nguyên mẫu"
+"view.devMode" = "Dev Mode"
+"view.frameOutlines" = "Đường viền khung"
+"view.fullscreen" = "Toàn màn hình"
+"view.get" = "Lấy khung nhìn"
+"view.layers" = "Bảng Các lớp"
+"view.layoutGrids" = "Lưới bố cục"
+"view.leftSidebar" = "Hiện/Ẩn thanh bên trái"
+"view.maskOutlines" = "Đường viền mặt nạ"
+"view.multiplayerCursors" = "Con trỏ nhiều người dùng"
+"view.nextFrame" = "Thu phóng đến khung tiếp theo"
+"view.nextPage" = "Trang tiếp theo"
+"view.nextRegion" = "Chuyển tiêu điểm sang vùng tiếp theo"
+"view.outlines" = "Đường viền nét"
+"view.outlinesHiddenLayers" = "Bao gồm các lớp ẩn trong đường viền nét"
+"view.outlinesObjectBounds" = "Bao gồm khung giới hạn đối tượng trong đường viền nét"
+"view.outlinesSelection" = "Đường viền nét cho vùng chọn"
+"view.pan" = "Di chuyển khung nhìn"
+"view.panelWidths" = "Đặt lại độ rộng bảng"
+"view.pixelGrid" = "Lưới pixel"
+"view.pixelPreview" = "Xem trước pixel"
+"view.prevFrame" = "Thu phóng đến khung trước"
+"view.prevPage" = "Trang trước"
+"view.previousRegion" = "Chuyển tiêu điểm về vùng trước"
+"view.proofSrgb" = "Kiểm thử mềm sRGB"
+"view.prototype" = "Bảng Nguyên mẫu"
+"view.rulers" = "Thước"
+"view.set" = "Đặt khung nhìn"
+"view.slices" = "Lát cắt"
+"view.snapGeometry" = "Bắt dính vào hình học"
+"view.snapObjects" = "Bắt dính vào đối tượng"
+"view.snapPixel" = "Bắt dính vào lưới pixel"
+"view.themeDark" = "Giao diện tối"
+"view.themeLight" = "Giao diện sáng"
+"view.themeSystem" = "Theo giao diện hệ thống"
+"view.toggleUi" = "Hiện/Ẩn giao diện"
+"view.zoom100" = "Thu phóng về 100%"
+"view.zoom200" = "Thu phóng về 200%"
+"view.zoom50" = "Thu phóng về 50%"
+"view.zoomAt" = "Công cụ thu phóng"
+"view.zoomFit" = "Thu phóng vừa khít"
+"view.zoomIn" = "Phóng to"
+"view.zoomOut" = "Thu nhỏ"
+"view.zoomSelection" = "Thu phóng vừa vùng chọn"
+"widget.click" = "Nhấp tiện ích"
+"widget.insert" = "Chèn tiện ích"
+"widget.list" = "Danh sách tiện ích"
+"window.focus" = "Đưa cửa sổ lên trước"
+"window.new" = "Cửa sổ mới"
+
+[menu]
+"bool.exclude" = "Loại trừ"
+"bool.flatten" = "Làm phẳng"
+"bool.intersect" = "Giao nhau"
+"bool.subtract" = "Trừ"
+"bool.union" = "Hợp"
+"file.duplicate" = "Nhân bản"
+"file.import" = "Nhập từ tệp…"
+"file.rename" = "Đổi tên"
+"libraries.open" = "Mở thư viện"
+"select.sameEffect" = "Hiệu ứng"
+"select.sameFill" = "Màu tô"
+"select.sameFont" = "Phông chữ"
+"select.sameInstance" = "Bản thể"
+"select.sameProperties" = "Thuộc tính"
+"select.sameStroke" = "Nét"
+"select.sameText" = "Thuộc tính văn bản"
+"text.alignCenter" = "Căn giữa văn bản"
+"text.alignJustify" = "Căn đều văn bản"
+"text.alignLeft" = "Căn trái văn bản"
+"text.alignRight" = "Căn phải văn bản"
+"view.assets" = "Tài nguyên"
+"view.design" = "Thiết kế"
+"view.layers" = "Các lớp"
+"view.outlines" = "Hiện đường viền nét"
+"view.outlinesHiddenLayers" = "Bao gồm các lớp ẩn"
+"view.outlinesObjectBounds" = "Bao gồm khung giới hạn đối tượng"
+"view.outlinesSelection" = "Hiện đường viền nét cho vùng chọn"
+"view.prototype" = "Nguyên mẫu"
+"view.themeDark" = "Tối"
+"view.themeLight" = "Sáng"
+"view.themeSystem" = "Theo hệ thống"
diff --git a/crates/ui-egui/locales/zh-Hans.toml b/crates/ui-egui/locales/zh-Hans.toml
index 34a40417..5e5b4364 100644
--- a/crates/ui-egui/locales/zh-Hans.toml
+++ b/crates/ui-egui/locales/zh-Hans.toml
@@ -19,6 +19,7 @@ status = "draft — needs native review"
 "1…9, 0" = "1…9, 0"
 "@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}：{prs} 个 PR，{commits} 次提交，+{added} / −{deleted} 行（Δ {delta}），二进制资源 +{bin_added} / −{bin_deleted}，{first} – {last}"
 "A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "本文件中带有这些模式和变量的集合：可按模式覆盖其值，并添加自己的变量"
+"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "已存在同名的 .figcraft 文件。请选择其完整名称以确认替换。"
 "A layer on its own aligns to its frame: select more layers, or one in a frame" = "单个图层与其所在画框对齐：请再选择其他图层，或选择画框内的图层"
 "A spring plays until it settles: its mass, stiffness and damping set how long" = "弹簧动画播放至静止，时长由质量、刚度和阻尼决定"
 "About" = "关于"
@@ -35,6 +36,7 @@ status = "draft — needs native review"
 "Add a description" = "添加描述"
 "Add a frame (F) or a shape (R) to get started" = "添加画框（F）或形状（R）以开始"
 "Add a layer or component to tile first" = "请先添加要平铺的图层或组件"
+"Add a minute" = "加一分钟"
 "Add a note for developers" = "为开发者添加备注"
 "Add action" = "添加操作"
 "Add actions for when no condition holds" = "添加所有条件都不满足时的操作"
@@ -42,6 +44,7 @@ status = "draft — needs native review"
 "Add another condition" = "添加其他条件"
 "Add auto layout" = "添加自动布局"
 "Add background behind overlay" = "在浮层后添加背景"
+"Add column" = "添加列"
 "Add content to this slot" = "向此插槽添加内容"
 "Add dev resource" = "添加开发资源"
 "Add effect" = "添加效果"
@@ -53,6 +56,7 @@ status = "draft — needs native review"
 "Add library file…" = "添加库文件…"
 "Add max height" = "添加最大高度"
 "Add max width" = "添加最大宽度"
+"Add measurement" = "添加测量"
 "Add min height" = "添加最小高度"
 "Add min width" = "添加最小宽度"
 "Add mode" = "添加模式"
@@ -60,6 +64,7 @@ status = "draft — needs native review"
 "Add or update collections from a variables JSON" = "从变量 JSON 添加或更新集合"
 "Add properties to make instances configurable" = "添加属性，使实例可配置"
 "Add reaction" = "添加表情回应"
+"Add row" = "添加行"
 "Add starting point" = "添加起点"
 "Add stroke" = "添加描边"
 "Add variant" = "添加变体"
@@ -88,8 +93,13 @@ status = "draft — needs native review"
 "All comments" = "全部评论"
 "All components" = "全部组件"
 "All fonts" = "全部字体"
+"All objects" = "所有对象"
 "All supported properties" = "所有支持的属性"
 "All variables" = "全部变量"
+"Along the bottom" = "沿底边"
+"Along the left" = "沿左边"
+"Along the right" = "沿右边"
+"Along the top" = "沿顶边"
 "Alpha" = "Alpha"
 "Alt+drag" = "Alt+拖动"
 "An invite link that opens FigCraft and joins" = "可打开 FigCraft 并加入的邀请链接"
@@ -118,6 +128,7 @@ status = "draft — needs native review"
 "Archived" = "已归档"
 "Arrange" = "排列"
 "Arrow" = "箭头"
+"Arrow at the end" = "末端箭头"
 "As typed" = "原样"
 "Asking the server…" = "正在询问服务器…"
 "Assets" = "资源"
@@ -148,6 +159,7 @@ status = "draft — needs native review"
 "Basics" = "基础"
 "Before" = "之前"
 "Bend" = "弯曲"
+"Between the selected layers" = "所选图层之间"
 "Bevel" = "斜角"
 "Binary assets added" = "新增的二进制资源"
 "Binary assets removed" = "删除的二进制资源"
@@ -165,6 +177,7 @@ status = "draft — needs native review"
 "Bottom" = "底部"
 "Bottom left radius" = "左下圆角"
 "Bottom right radius" = "右下圆角"
+"Brainstorm" = "头脑风暴"
 "Branch" = "分支"
 "Branch archived" = "分支已归档"
 "Branch merged" = "分支已合并"
@@ -189,8 +202,12 @@ status = "draft — needs native review"
 "C or ⇧C" = "C 或 ⇧C"
 "CMYK colour" = "CMYK 颜色"
 "Can view" = "可查看"
+"Check" = "对勾"
 "Checking the server…" = "正在检查服务器…"
+"Chevron" = "箭头形"
 "Clear from this list" = "从此列表中清除"
+"Clear results" = "清除结果"
+"Click objects to vote; click your badge to take a vote back" = "点击对象投票；点击你的徽章收回一票"
 "Code or invite link" = "代码或邀请链接"
 "Color profile: {name}" = "颜色配置文件：{name}"
 "CSS custom properties…" = "CSS 自定义属性…"
@@ -214,7 +231,7 @@ status = "draft — needs native review"
 "Changes on main" = "主文件上的更改"
 "Changes on the branch" = "分支上的更改"
 "Changes unknown" = "更改未知"
-"Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code." = "在上方选择 React、Leptos、SwiftUI、Compose 或 Flutter，将此组件关联到其代码。"
+"Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code." = "在上方选择 React、Leptos、Vue、SwiftUI、Compose、ArkUI 或 Flutter，将此组件关联到其代码。"
 "Choose another profile to change it." = "选择其他配置文件以更改。"
 "Choose collection" = "选择集合"
 "Choose image" = "选择图片"
@@ -235,7 +252,6 @@ status = "draft — needs native review"
 "Close tab" = "关闭标签页"
 "Close version history" = "关闭版本历史"
 "Close when clicking outside" = "点击外部时关闭"
-"Close without saving" = "关闭但不保存"
 "Code" = "代码"
 "Code syntax" = "代码语法"
 "Collapse" = "折叠"
@@ -262,6 +278,8 @@ status = "draft — needs native review"
 "Commits" = "提交"
 "Company" = "公司"
 "Compare changes" = "比较更改"
+"Compare with" = "比较对象"
+"Compatibility notes" = "兼容性说明"
 "Completed" = "已完成"
 "Component" = "组件"
 "Component name" = "组件名称"
@@ -276,11 +294,11 @@ status = "draft — needs native review"
 "Connected" = "已连接"
 "Connected to code: {from}" = "已关联代码：{from}"
 "Connection lost, reconnecting (attempt {attempt})…" = "连接已断开，正在重新连接（第 {attempt} 次尝试）…"
+"Connector" = "连接线"
 "Constrain proportions" = "锁定比例"
 "Constraints" = "约束"
 "Content" = "内容"
 "Contents hidden" = "内容已隐藏"
-"Contents only" = "仅内容"
 "Contextual alternates" = "上下文替代字"
 "Contrast" = "对比度"
 "Contributors" = "贡献者"
@@ -298,13 +316,18 @@ status = "draft — needs native review"
 "Copy as PNG" = "复制为 PNG"
 "Copy as SVG" = "复制为 SVG"
 "Copy code" = "复制代码"
+"Copy effect" = "复制效果"
+"Copy fill" = "复制填充"
 "Copy link" = "复制链接"
+"Copy stroke" = "复制描边"
 "Copy the {label}" = "复制{label}"
 "Copy {value}" = "复制 {value}"
 "Corner radius" = "圆角半径"
 "Corner smoothing" = "圆角平滑"
 "Couldn't reach {server}: showing what this computer remembers." = "无法连接 {server}：显示的是这台电脑记录的内容。"
+"Couldn't read {name}." = "无法读取 {name}。"
 "Couldn't save automatically: {error}" = "无法自动保存：{error}"
+"Couldn't save the file" = "无法保存文件"
 "Count" = "数量"
 "Create" = "创建"
 "Create a variable collection first" = "请先创建变量集合"
@@ -327,6 +350,7 @@ status = "draft — needs native review"
 "Current version" = "当前版本"
 "Cursor chat" = "光标聊天"
 "Custom" = "自定义"
+"Custom size" = "自定义大小"
 "Cut" = "剪切"
 "Dark" = "深色"
 "Darken" = "变暗"
@@ -357,6 +381,7 @@ status = "draft — needs native review"
 "Description" = "描述"
 "Description (optional)" = "描述（可选）"
 "Design" = "设计"
+"Design panel" = "设计面板"
 "Desktop" = "桌面"
 "Destination" = "目标"
 "Detach alias" = "分离别名"
@@ -367,6 +392,7 @@ status = "draft — needs native review"
 "Detach variable" = "分离变量"
 "Details" = "详细"
 "Dev Mode" = "开发模式"
+"Dev Mode only inspects: switch to Design (Shift+D) to edit" = "开发模式仅用于检查：切换到设计 (Shift+D) 进行编辑"
 "Dev resources" = "开发资源"
 "Development" = "开发"
 "Device" = "设备"
@@ -383,6 +409,7 @@ status = "draft — needs native review"
 "Distribute horizontal spacing" = "水平间距分布"
 "Distribute vertical spacing" = "垂直间距分布"
 "Divider" = "分隔线"
+"Don't Save" = "不保存"
 "Don't truncate" = "不截断"
 "Done" = "完成"
 "Done editing" = "完成编辑"
@@ -413,6 +440,8 @@ status = "draft — needs native review"
 "Effect settings" = "效果设置"
 "Effect styles" = "效果样式"
 "Effects" = "效果"
+"Curved" = "曲线"
+"Elbow" = "折线"
 "Ellipse" = "椭圆"
 "Ellipses" = "椭圆"
 "Else" = "否则"
@@ -421,6 +450,7 @@ status = "draft — needs native review"
 "Empty" = "空"
 "End" = "末尾"
 "End point" = "终点"
+"End vote" = "结束投票"
 "Ends the session; everyone keeps their copy" = "结束会话；每个人保留自己的副本"
 "Enter" = "Enter"
 "Enter the address of a figcraft-server and press Browse to see the plugins it offers." = "输入 figcraft-server 的地址，然后按“浏览”查看它提供的插件。"
@@ -461,6 +491,7 @@ status = "draft — needs native review"
 "False" = "假"
 "Fetching from the server…" = "正在从服务器获取…"
 "FigCraft couldn't open its window: {error}" = "FigCraft 无法打开窗口：{error}"
+"FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged." = "FigCraft 尚不支持这些文件的全部功能。说明中列出了导入副本中省略或更改的内容；原始文件保持不变。"
 "File" = "文件"
 "File name" = "文件名"
 "File published" = "文件已发布"
@@ -493,6 +524,7 @@ status = "draft — needs native review"
 "Flip text to the other side" = "将文本翻转到另一侧"
 "Flip vertical" = "垂直翻转"
 "Flip width profile" = "翻转宽度配置"
+"Flow chart" = "流程图"
 "Flow starting point" = "流程起点"
 "Flow starting points" = "流程起点"
 "Flows" = "流程"
@@ -509,6 +541,7 @@ status = "draft — needs native review"
 "Font size" = "字号"
 "Font style" = "字体样式"
 "Forget on this computer" = "在这台电脑上忘记"
+"Format" = "格式"
 "Fractions" = "分数"
 "Frame" = "画框"
 "Frame selection" = "为所选项添加画框"
@@ -542,6 +575,7 @@ status = "draft — needs native review"
 "Hanging list" = "悬挂列表"
 "Hanging punctuation" = "标点悬挂"
 "Hard light" = "强光"
+"Heart" = "爱心"
 "Height" = "高度"
 "Help" = "帮助"
 "Help and resources" = "帮助和资源"
@@ -552,6 +586,7 @@ status = "draft — needs native review"
 "Hide from publishing" = "发布时隐藏"
 "Hide section contents" = "隐藏分区内容"
 "Highlight layers on hover" = "悬停时高亮图层"
+"Highlighter" = "荧光笔"
 "Highlights" = "高光"
 "Hold Alt" = "按住 Alt"
 "Hold Alt+Z" = "按住 Alt+Z"
@@ -576,12 +611,16 @@ status = "draft — needs native review"
 "If" = "如果"
 "If {condition}" = "如果 {condition}"
 "Ignore auto layout (absolute position)" = "忽略自动布局（绝对定位）"
+"Ignore overlapping layers" = "忽略重叠图层"
 "Image" = "图片"
+"Images" = "图片"
 "Import" = "导入"
 "Import path" = "导入路径"
 "Import plugin from manifest" = "从清单导入插件"
 "Import plugin from manifest…" = "从清单导入插件…"
+"Import report" = "导入报告"
 "Import variables" = "导入变量"
+"Imported document" = "导入的文档"
 "Imported {name}" = "已导入 {name}"
 "Imported {n} new variables, updated {updated}" = { other = "已导入 {n} 个新变量，更新 {updated} 个" }
 "Import…" = "导入…"
@@ -609,11 +648,13 @@ status = "draft — needs native review"
 "Instance swap (no other component)" = "实例替换（无其他组件）"
 "Instances" = "实例"
 "Instant" = "即时"
+"Intensity" = "强度"
 "Interaction" = "交互"
 "Interactions" = "交互"
 "Interface design and prototyping. A free, open-source, clean-room design tool written from scratch in Rust, part of the ArtCraft Crafting Apps." = "界面设计与原型制作。一款以 Rust 从零编写的免费、开源、净室设计工具，属于 ArtCraft Crafting Apps 系列。"
 "Intersect" = "相交"
 "Intersects" = "相交"
+"Invalid color" = "无效颜色"
 "Invite link" = "邀请链接"
 "Invite link copied" = "已复制邀请链接"
 "It asks permission to:" = "它请求以下权限："
@@ -629,6 +670,8 @@ status = "draft — needs native review"
 "Join|stroke" = "转角"
 "Just now" = "刚刚"
 "Justify" = "两端对齐"
+"Kanban board" = "看板"
+"Keep a measurement on the canvas for developers" = "为开发者在画布上保留测量"
 "Keep appearance" = "保持外观"
 "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift." = "“保持外观”会将每个颜色值转换为 {profile}，使颜色看起来不变。“保持数值”则保留数值不变，颜色会有偏移。"
 "Keep tool selected after use" = "使用后保持工具选中"
@@ -702,6 +745,7 @@ status = "draft — needs native review"
 "Mark as resolved" = "标为已解决"
 "Mark as unread" = "标为未读"
 "Mark as unresolved" = "标为未解决"
+"Marker" = "马克笔"
 "Mask" = "蒙版"
 "Mass · Stiffness · Damping" = "质量 · 刚度 · 阻尼"
 "Match (empty: the whole name)" = "匹配（留空：整个名称）"
@@ -710,6 +754,7 @@ status = "draft — needs native review"
 "Max lines" = "最大行数"
 "Maximize" = "最大化"
 "Measure to the selection" = "测量到所选项的距离"
+"Measurements" = "测量"
 "Merge into main" = "合并到主文件"
 "Merge regions" = "合并区域"
 "Merge the branch into the main file (one undo step) and archive it" = "将分支合并到主文件（一步撤销）并归档"
@@ -718,6 +763,7 @@ status = "draft — needs native review"
 "Min H" = "最小高"
 "Min W" = "最小宽"
 "Minimize" = "最小化"
+"Minutes" = "分钟"
 "Mirror angle" = "镜像角度"
 "Mirror angle and length" = "镜像角度和长度"
 "Mirroring" = "镜像"
@@ -758,7 +804,9 @@ status = "draft — needs native review"
 "Named instance" = "具名实例"
 "Navigate to" = "导航到"
 "Nested instance" = "嵌套实例"
+"New board" = "新建白板"
 "New design file" = "新建设计文件"
+"Next frame" = "下一个画框"
 "Next or previous control in the focused region" = "聚焦区域中的下一个或上一个控件"
 "Next ready for dev" = "下一个可供开发"
 "Next size option" = "下一个尺寸选项"
@@ -768,12 +816,15 @@ status = "draft — needs native review"
 "No branches. A branch is a copy of the file to try changes in, then review and merge." = "没有分支。分支是文件的副本，可在其中尝试更改，再审阅并合并。"
 "No category" = "无类别"
 "No changes" = "无更改"
+"No color styles" = "没有颜色样式"
 "No colour variables fit here." = "没有适用于此处的颜色变量。"
 "No colour variables yet. Create them in Local variables." = "还没有颜色变量。请在“本地变量”中创建。"
 "No comments yet" = "还没有评论"
+"No compatibility warnings reported" = "未报告兼容性警告"
 "No components yet. Select layers and press {keys}." = "还没有组件。选择图层并按 {keys}。"
 "No conflicts." = "没有冲突。"
 "No contributor data was built into this copy." = "此副本未内置贡献者数据。"
+"No device" = "无设备"
 "No fonts match" = "没有匹配的字体"
 "No join code here (the server is older than join codes, or this address can't be put in one): share the link instead." = "此处没有加入代码（服务器版本早于加入代码，或此地址无法写入代码）：请改为分享链接。"
 "No layer changes to show." = "没有可显示的图层更改。"
@@ -804,6 +855,7 @@ status = "draft — needs native review"
 "No text styles yet. Click + to create one from the selected text." = "还没有文本样式。点击 + 从所选文本创建。"
 "No variables fit here." = "没有适用于此处的变量。"
 "No variables yet. Create them in Local variables." = "还没有变量。请在“本地变量”中创建。"
+"No votes yet" = "暂无投票"
 "Nobody else is here yet" = "这里还没有其他人"
 "Noise" = "杂色"
 "None" = "无"
@@ -816,6 +868,7 @@ status = "draft — needs native review"
 "Not read yet" = "尚未读取"
 "Not shared" = "未分享"
 "Note {n}" = "备注 {n}"
+"Nothing changed since this version." = "自此版本以来没有任何更改。"
 "Nothing changed since this was marked ready for dev." = "自标记为可供开发以来没有任何更改。"
 "Nothing here yet. Set a frame's status to list it." = "这里还没有内容。设置画框的状态即可将其列出。"
 "Nothing online yet. Use Share on a file to put it online and it is listed here." = "还没有在线文件。对文件使用“分享”将其放到网上后，它会列在这里。"
@@ -849,6 +902,7 @@ status = "draft — needs native review"
 "Open branch" = "打开分支"
 "Open file" = "打开文件"
 "Open files" = "打开的文件"
+"Open presentations" = "打开的演示"
 "Open in focus view" = "在聚焦视图中打开"
 "Open in new window" = "在新窗口中打开"
 "Open invite links in FigCraft" = "在 FigCraft 中打开邀请链接"
@@ -857,6 +911,7 @@ status = "draft — needs native review"
 "Open overlay" = "打开浮层"
 "Open prototype preview" = "打开原型预览"
 "Open variables ({count})" = "打开变量（{count}）"
+"Opened as a new document" = "已作为新文档打开"
 "Opened “{name}” in a new tab" = "已在新标签页中打开“{name}”"
 "Open|comments" = "未解决"
 "Options" = "选项"
@@ -879,7 +934,12 @@ status = "draft — needs native review"
 "PDF print settings" = "PDF 打印设置"
 "Padding" = "内边距"
 "Page" = "页面"
+"Page deleted" = "页面已删除"
 "Pages" = "页面"
+"Pages added to the document" = "页面已添加到文档"
+"Pause" = "暂停"
+"Pink" = "粉色"
+"Placed on the current page" = "已放置在当前页面"
 "Pages: {pages}" = "页面：{pages}"
 "Paint bucket" = "油漆桶"
 "Pan the canvas" = "平移画布"
@@ -892,8 +952,12 @@ status = "draft — needs native review"
 "Pass through" = "穿透"
 "Paste a link (https://…)" = "粘贴链接（https://…）"
 "Paste a team library link (a view link)" = "粘贴团队库链接（查看链接）"
+"Paste effect" = "粘贴效果"
+"Paste fill" = "粘贴填充"
 "Paste here" = "粘贴到此处"
+"Paste stroke" = "粘贴描边"
 "Paste to replace" = "粘贴以替换"
+"Pasted design layers; {n} kinds of content were left out" = { other = "已粘贴设计图层；有 {n} 类内容未包含" }
 "Pattern" = "图案"
 "Pattern alignment" = "图案对齐"
 "Pattern scale" = "图案缩放"
@@ -919,6 +983,7 @@ status = "draft — needs native review"
 "Plugins run in FigCraft's sandbox, without files, network or clock. Install only plugins you trust." = "插件在 FigCraft 的沙盒中运行，无法使用文件、网络或时钟。请只安装你信任的插件。"
 "Plus darker" = "加深"
 "Plus lighter" = "增亮"
+"Plus one" = "加一"
 "Point" = "点"
 "Points" = "点数"
 "Polygon" = "多边形"
@@ -944,6 +1009,7 @@ status = "draft — needs native review"
 "Preview" = "预览"
 "Preview this flow" = "预览此流程"
 "Preview this frame" = "预览此画框"
+"Previous frame" = "上一个画框"
 "Previous ready for dev" = "上一个可供开发"
 "Progressive" = "渐进"
 "Properties" = "属性"
@@ -964,6 +1030,7 @@ status = "draft — needs native review"
 "Push" = "推入"
 "Push changes to main component" = "将更改推送到主组件"
 "Put text on path" = "将文本放到路径上"
+"Question" = "问号"
 "R" = "R"
 "Radial" = "径向"
 "Radius" = "半径"
@@ -981,10 +1048,12 @@ status = "draft — needs native review"
 "Reduce motion" = "减少动态效果"
 "Refraction" = "折射"
 "Regular expression" = "正则表达式"
+"Relative to" = "相对于"
 "Remove" = "移除"
 "Remove all" = "全部移除"
 "Remove annotation" = "移除标注"
 "Remove auto layout" = "移除自动布局"
+"Remove column" = "删除列"
 "Remove dev resource" = "移除开发资源"
 "Remove export setting" = "移除导出设置"
 "Remove from server" = "从服务器移除"
@@ -992,10 +1061,12 @@ status = "draft — needs native review"
 "Remove guide" = "移除参考线"
 "Remove interaction" = "移除交互"
 "Remove library from this file" = "从此文件中移除库"
+"Remove measurement" = "移除测量"
 "Remove min and max" = "移除最小值和最大值"
 "Remove min and max height" = "移除最小和最大高度"
 "Remove min and max width" = "移除最小和最大宽度"
 "Remove regions" = "移除区域"
+"Remove row" = "删除行"
 "Remove slot" = "移除插槽"
 "Remove starting point" = "移除起点"
 "Remove stop" = "移除色标"
@@ -1008,6 +1079,7 @@ status = "draft — needs native review"
 "Removed" = "已删除"
 "Removed from the server" = "已从服务器移除"
 "Removed since it was marked" = "标记后已删除"
+"Removed since this version" = "自此版本以来已移除"
 "Rename" = "重命名"
 "Rename duplicated layers" = "重命名副本图层"
 "Rename folder" = "重命名文件夹"
@@ -1037,6 +1109,7 @@ status = "draft — needs native review"
 "Resize by the nudge amount" = "按微移量调整大小"
 "Resize frames to the device's screen (or the window without a device): their constraints and auto layout respond" = "将画框调整为设备屏幕大小（无设备时为窗口大小）：其约束和自动布局随之响应"
 "Resize to fit" = "调整大小以适应"
+"Resizing" = "调整大小"
 "Resolve" = "解决"
 "Resolve change" = "解决更改"
 "Resolved" = "已解决"
@@ -1047,6 +1120,9 @@ status = "draft — needs native review"
 "Restore main component" = "恢复主组件"
 "Restore this version" = "恢复此版本"
 "Restored “{name}”" = "已恢复“{name}”"
+"Retrospective" = "回顾"
+"Results" = "结果"
+"Resume" = "继续"
 "Reverse the order" = "反转顺序"
 "Reversed triangle" = "反向三角形"
 "Review and merge" = "审阅并合并"
@@ -1062,6 +1138,7 @@ status = "draft — needs native review"
 "Rotation jitter" = "旋转抖动"
 "Round" = "圆形"
 "Rounded" = "圆润"
+"Rounded rectangle" = "圆角矩形"
 "Row" = "行"
 "Row gap" = "行间距"
 "Row sizes" = "行高"
@@ -1077,6 +1154,7 @@ status = "draft — needs native review"
 "Save" = "保存"
 "Save as" = "另存为"
 "Save as preset…" = "存储为预设…"
+"Save file" = "保存文件"
 "Save files automatically" = "自动保存文件"
 "Save version  {key}" = "保存版本  {key}"
 "Saved" = "已保存"
@@ -1108,12 +1186,14 @@ status = "draft — needs native review"
 "Select all with same" = "选择所有相同"
 "Select layer" = "选择图层"
 "Select layers to apply the style to" = "选择要应用样式的图层"
+"Select layers with this color" = "选择使用此颜色的图层"
 "Select overlapping shapes" = "选择重叠的形状"
 "Select points to edit their position, radius and mirroring" = "选择点以编辑其位置、半径和镜像"
 "Select slot" = "选择插槽"
 "Selection" = "所选项"
 "Selection box, {w} by {h} at {x}, {y}: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "选框，{w} × {h}，位于 {x}, {y}：方向键移动，Shift+方向键或 {cmd}+方向键调整大小，Enter 选择，Esc 取消"
 "Selection box: arrows move it, Shift+arrows or {cmd}+arrows size it, Enter selects, Escape cancels" = "选框：方向键移动，Shift+方向键或 {cmd}+方向键调整大小，Enter 选择，Esc 取消"
+"Selection colors" = "所选项颜色"
 "Send backward" = "下移一层"
 "Send report" = "发送举报"
 "Send to back" = "置于底层"
@@ -1129,6 +1209,7 @@ status = "draft — needs native review"
 "Shape" = "形状"
 "Shape builder" = "形状生成器"
 "Shape tools" = "形状工具"
+"Shapes" = "形状"
 "Share" = "分享"
 "Share this file" = "分享此文件"
 "Share: live session, export" = "分享：实时会话、导出"
@@ -1186,10 +1267,13 @@ status = "draft — needs native review"
 "Space+drag" = "空格+拖动"
 "Spacing" = "间距"
 "Spam, stolen work, abuse…" = "垃圾信息、盗用作品、滥用…"
+"Speech bubble" = "对话气泡"
 "Splay" = "张开"
 "Spotlight me" = "聚焦于我"
 "Spread" = "扩展"
 "Square" = "方形"
+"Stamp" = "印章"
+"Stamps" = "印章"
 "Standard" = "标准"
 "Standard ligatures" = "标准连字"
 "Star" = "星形"
@@ -1198,17 +1282,25 @@ status = "draft — needs native review"
 "Start ascending from / stop descending at" = "升序起点 / 降序终点"
 "Start from a blank canvas" = "从空白画布开始"
 "Start on path" = "路径起点"
+"Start on the Home screen" = "启动时显示主页"
 "Start point" = "起点"
 "Start sharing" = "开始分享"
+"Start vote" = "开始投票"
 "Starting to share…" = "正在开始分享…"
 "Status" = "状态"
 "Sticky" = "粘性"
+"Sticky note" = "便利贴"
+"Sticky note colors" = "便利贴颜色"
+"Sticky notes" = "便利贴"
+"Sticky notes, shapes and connectors" = "便利贴、形状和连接线"
 "Stop" = "停止"
 "Stop following {name}" = "停止跟随 {name}"
 "Stop session" = "停止会话"
 "Stop sharing" = "停止分享"
 "Stop spotlighting" = "停止聚焦"
+"Stop timer" = "停止计时器"
 "Stop {n}  {hex}" = "色标 {n}  {hex}"
+"Straight" = "直线"
 "Stretch" = "拉伸"
 "Strikethrough" = "删除线"
 "String" = "字符串"
@@ -1248,10 +1340,12 @@ status = "draft — needs native review"
 "Tell the server's operator what is wrong with it" = "告诉服务器的运营者它有什么问题"
 "Temperature" = "色温"
 "Template" = "模板"
+"Templates" = "模板"
 "Terms" = "条款"
 "Text" = "文本"
 "Text align" = "文本对齐"
 "Text content" = "文本内容"
+"Text size" = "文字大小"
 "Text style" = "文本样式"
 "Text styles" = "文本样式"
 "Texts" = "文本"
@@ -1282,13 +1376,18 @@ status = "draft — needs native review"
 "This server is open to the public: no key needed." = "此服务器对公众开放：无需密钥。"
 "This server needs its key: add ?key=… to the address (`figcraft-server key` prints it on the server's machine)." = "此服务器需要密钥：请在地址后加上 ?key=…（在服务器所在的机器上运行 `figcraft-server key` 可显示）。"
 "This server takes files only with its key: see Advanced." = "此服务器只接受带密钥的文件：请查看“高级”。"
+"Thumbs up" = "点赞"
+"This version can't be read." = "无法读取此版本。"
+"This version doesn't have it: all of it is new." = "此版本中没有它：全部是新的。"
 "Tidy up" = "整理"
 "Tile" = "平铺"
 "Tile type" = "平铺类型"
+"Timer" = "计时器"
 "Tint" = "色调"
 "Title" = "标题"
 "Title case" = "首字母大写"
 "To share this library with your team, publish the file to a server (Share ▸ Publish to server…), then publish the library there." = "要与团队共享此库，请先将文件发布到服务器（分享 ▸ 发布到服务器…），然后在那里发布库。"
+"To the layer around it" = "到外层图层"
 "Toggle" = "切换显示"
 "Toggle light/dark theme" = "切换浅色/深色主题"
 "Toggle visibility" = "切换可见性"
@@ -1298,8 +1397,10 @@ status = "draft — needs native review"
 "Top left radius" = "左上圆角"
 "Top right radius" = "右上圆角"
 "Transform" = "变换"
+"Triangle" = "三角形"
 "Triangle arrow" = "三角箭头"
 "Trigger" = "触发器"
+"Trigger layer" = "触发图层"
 "True" = "真"
 "Truncate text" = "截断文本"
 "Truncate with an ellipsis" = "以省略号截断"
@@ -1320,7 +1421,7 @@ status = "draft — needs native review"
 "Unread" = "未读"
 "Unresolve" = "取消解决"
 "Unsaved changes" = "未保存的更改"
-"Unsaved changes in {names}. Close the window and lose them?" = "{names} 中有未保存的更改。要关闭窗口并丢弃这些更改吗？"
+"Unsaved changes in {names}. Save them before closing?" = "{names} 中有未保存的更改。关闭前要保存吗？"
 "Unsaved changes: save first ({save}), or close the tab with {alt}-click to discard" = "有未保存的更改：请先保存（{save}），或按住 {alt} 点击关闭标签页以丢弃"
 "Unsaved changes: save first, or close again with {key} to discard" = "有未保存的更改：请先保存，或再次按 {key} 关闭以丢弃"
 "Up" = "向上"
@@ -1339,6 +1440,7 @@ status = "draft — needs native review"
 "Use as mask" = "用作蒙版"
 "Use auto layout" = "使用自动布局"
 "Use number keys for opacity" = "用数字键设置不透明度"
+"Use the .figcraft or .fig extension." = "请使用 .figcraft 或 .fig 扩展名。"
 "Use the layer's fill" = "使用图层的填充"
 "Used in {files} · {instances}" = "用于 {files} · {instances}"
 "Username" = "用户名"
@@ -1373,6 +1475,8 @@ status = "draft — needs native review"
 "Visibility" = "可见性"
 "Visible" = "可见"
 "Vivid" = "鲜艳"
+"Votes per person" = "每人票数"
+"Voting session" = "投票"
 "WGPU_BACKEND is set and names the graphics API to use; unsetting it lets FigCraft choose." = "已设置 WGPU_BACKEND，它指定了要使用的图形 API；取消设置后由 FigCraft 自行选择。"
 "Warm" = "暖调"
 "Watch" = "手表"
@@ -1381,15 +1485,19 @@ status = "draft — needs native review"
 "WebSocket URL" = "WebSocket URL"
 "WebSocket URL copied" = "已复制 WebSocket URL"
 "Wedge" = "楔形"
+"Weekly planner" = "每周计划"
 "Weight" = "粗细"
+"What changed since a saved version" = "自已保存版本以来的更改"
 "What changed since it was marked ready for dev" = "自标记为可供开发以来的更改"
 "What is wrong with this file? The server's operator gets your report." = "此文件有什么问题？你的举报会发送给服务器的运营者。"
 "What it's for" = "用途"
 "What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on." = "无法得知更改前的状态：它在 FigCraft 开始保存可供开发画框的副本之前就已更改。请解决此更改（或重新标记为可供开发），以便今后进行比较。"
+"When marked ready" = "标记为就绪时"
 "While hovering" = "悬停时"
 "While pressing" = "按住时"
 "White" = "白"
 "Who runs it, its terms and how long it keeps files" = "谁在运营、其条款以及文件保留多久"
+"Whole screen" = "整个屏幕"
 "Why it changed" = "更改原因"
 "Widgets" = "小组件"
 "Width" = "宽度"
@@ -1427,25 +1535,120 @@ status = "draft — needs native review"
 "call any command its access allows" = "调用其访问权限允许的任何命令"
 "call only: {commands}" = "仅调用：{commands}"
 "can edit the document" = "可编辑文档"
+"can save files" = "可以保存文件"
+"conditional prototype actions nested too deeply were skipped" = "已跳过嵌套过深的条件原型操作"
+"conditional prototype actions with conditions that can't be evaluated were skipped" = "已跳过条件无法求值的条件原型操作"
+"connector label background was skipped: style data is missing" = "已跳过连接线标签背景：缺少样式数据"
+"connector label was skipped: background bounds are invalid" = "已跳过连接线标签：背景边界无效"
+"connector label was skipped: background transform is invalid" = "已跳过连接线标签：背景变换无效"
+"connector label was skipped: composed text transform is invalid" = "已跳过连接线标签：组合后的文本变换无效"
+"connector label was skipped: derived background bounds are missing" = "已跳过连接线标签：缺少推算的背景边界"
+"connector label was skipped: derived text bounds are missing" = "已跳过连接线标签：缺少推算的文本边界"
+"connector label was skipped: text bounds are invalid" = "已跳过连接线标签：文本边界无效"
+"connector label was skipped: text style data is missing" = "已跳过连接线标签：缺少文本样式数据"
+"connector label was skipped: text transform is invalid" = "已跳过连接线标签：文本变换无效"
+"connector labels were skipped" = "已跳过连接线标签"
+"connector layers import as static frame/vector snapshots with labels when present; live endpoint bindings are not retained" = "连接线图层导入为静态的画框/矢量快照，有标签时一并导入；不保留端点的动态绑定"
+"connector snapshot vector data is missing; connector was left empty" = "缺少连接线快照的矢量数据；连接线保留为空"
+"connectors whose ends can't be placed are empty" = "无法放置端点的连接线为空"
 "crop marks" = "裁切标记"
+"damaged vector geometry was skipped" = "已跳过损坏的矢量几何"
+"damaged vector networks import as outlines" = "损坏的矢量网络导入为轮廓"
 "development: {path}" = "开发：{path}"
+"document children other than pages were skipped" = "已跳过非页面的文档子项"
+"duplicate grid track sizing entries use equal tracks" = "重复的网格轨道尺寸条目使用等分轨道"
 "e.g. count + 1" = "例如 count + 1"
 "e.g. count >= 3 and not done" = "例如 count >= 3 and not done"
+"elbowed and curved connectors without a saved path import as straight lines" = "没有已保存路径的折线和曲线连接线导入为直线"
+"entries without a node type were skipped" = "已跳过没有节点类型的条目"
 "figcraft:// links from a browser, chat or email open this app and join the session." = "来自浏览器、聊天或邮件的 figcraft:// 链接会打开此应用并加入会话。"
+"filled areas of a vector with their own fill use the layer's fill" = "具有自身填充的矢量填充区域使用图层的填充"
 "from {server}" = "来自 {server}"
+"gamepad triggers without exactly one known controller button were skipped" = "已跳过没有恰好一个已知手柄按钮的游戏手柄触发器"
+"grid track list exceeds 1000 entries; the tracks use the default equal sizing" = "网格轨道列表超过 1000 个条目；轨道使用默认的等分尺寸"
+"grid track sizing is unsupported or malformed; affected tracks use equal sizing" = "网格轨道尺寸不受支持或格式错误；受影响的轨道使用等分尺寸"
+"grid track sizing list exceeds 1000 entries; the tracks use the default equal sizing" = "网格轨道尺寸列表超过 1000 个条目；轨道使用默认的等分尺寸"
 "hidden" = "已隐藏"
 "iOS" = "iOS"
+"image filters are ambiguous because both filter containers are present; filter conversion was skipped" = "两个滤镜容器同时存在，图片滤镜有歧义；已跳过滤镜转换"
+"image filters use FigCraft's approximate renderer" = "图片滤镜使用 FigCraft 的近似渲染"
+"instance swap properties whose default component isn't in the file were skipped" = "已跳过默认组件不在文件中的实例替换属性"
+"instances inside their own main component were imported as frames" = "位于自身主组件内的实例已导入为画框"
+"instances of components that aren't in the file show no layers" = "文件中没有的组件的实例不显示图层"
+"instances of components that aren't in the file were imported as frames" = "文件中没有的组件的实例已导入为画框"
+"instances that would nest a component inside itself were imported as frames" = "会将组件嵌套到自身内部的实例已导入为画框"
+"instances without a main component were imported as empty frames" = "没有主组件的实例已导入为空画框"
+"invalid internal .fig text path data was ignored" = "已忽略无效的 .fig 内部路径文字数据"
+"invalid or oversized vector networks import as outlines" = "无效或过大的矢量网络导入为轮廓"
+"invalid or oversized vector path data was skipped" = "已跳过无效或过大的矢量路径数据"
+"key triggers without a supported key were skipped" = "已跳过没有受支持按键的按键触发器"
+"key up triggers import as key presses" = "松开按键触发器导入为按下按键"
+"layers without a position were placed at their parent's origin" = "没有位置的图层已放在其父级的原点"
+"layers without a type were skipped" = "已跳过没有类型的图层"
+"legacy image filter container is unsupported; filter conversion was skipped" = "不支持旧版图片滤镜容器；已跳过滤镜转换"
 "locked" = "已锁定"
+"malformed image filters container was skipped" = "已跳过格式错误的图片滤镜容器"
+"malformed image paintFilter container was skipped" = "已跳过格式错误的图片 paintFilter 容器"
+"malformed slot content assignment was skipped" = "已跳过格式错误的插槽内容分配"
 "no bleed" = "无出血"
 "nobody else here yet" = "这里还没有其他人"
+"non-default slot settings are not represented and were skipped" = "非默认的插槽设置无法表示，已跳过"
 "now" = "刚刚"
+"offer files to save if it asks to (you choose where each one goes)" = "在请求时提供要保存的文件（每个文件的保存位置由你选择）"
 "or" = "或"
+"point stroke joins were preserved; dashed or variable-width strokes render with the layer join" = "已保留各点的描边转角；虚线描边或可变宽度描边以图层的转角绘制"
+"preferred slot component keys cannot be resolved to file nodes and were skipped" = "插槽的首选组件键无法对应到文件中的图层，已跳过"
+"prototype actions of unknown types were skipped" = "已跳过未知类型的原型操作"
+"prototype actions without a destination in the file were skipped" = "已跳过在文件中没有目标的原型操作"
+"prototype expressions on variables that aren't in the variables JSON were skipped" = "已跳过使用变量 JSON 中没有的变量的原型表达式"
+"prototype expressions with unsupported functions were skipped" = "已跳过使用不受支持函数的原型表达式"
+"prototype interactions without supported actions were skipped" = "已跳过没有受支持操作的原型交互"
+"prototype navigations of unknown types were skipped" = "已跳过未知类型的原型导航"
+"prototype transitions of unknown types play instantly" = "未知类型的原型过渡即时播放"
+"prototype triggers of unknown types were skipped" = "已跳过未知类型的原型触发器"
 "put a widget on the canvas" = "在画布上放置小组件"
 "read and edit the document" = "读取和编辑文档"
 "read the document" = "读取文档"
 "reads the document" = "读取文档"
+"set-variable actions on variables that aren't in the variables JSON were skipped" = "已跳过针对变量 JSON 中没有的变量的设置变量操作"
+"set-variable actions with values that can't be evaluated were skipped" = "已跳过值无法求值的设置变量操作"
+"set-variable actions with values that don't fit the variable were skipped" = "已跳过值与变量不符的设置变量操作"
+"set-variable actions without a value were skipped" = "已跳过没有值的设置变量操作"
+"set-variable-mode actions on collections or modes that aren't in the variables JSON were skipped" = "已跳过针对变量 JSON 中没有的集合或模式的设置变量模式操作"
+"slot content assignment target is missing or is not slot content" = "插槽内容分配的目标缺失或不是插槽内容"
+"slot content assignment uses the empty GUID sentinel and was skipped" = "插槽内容分配使用空 GUID 作为哨兵值，已跳过"
+"some vector points refer to point settings missing from the file; they use the layer's joins and plain corners" = "部分矢量点引用了文件中缺失的点设置；这些点使用图层的转角和普通角"
+"some vector segments refer to style settings missing from the file; they use the layer's stroke" = "部分矢量段引用了文件中缺失的样式设置；这些段使用图层的描边"
+"stale or invalid grid track sizing entries were ignored" = "已忽略过时或无效的网格轨道尺寸条目"
+"stars and polygons without point counts or geometry use the default point count" = "没有点数或几何的星形和多边形使用默认点数"
+"style settings of some vector segments aren't supported; those segments use the layer's stroke" = "部分矢量段的样式设置不受支持；这些段使用图层的描边"
+"text path underline or strikethrough decoration is not rendered" = "不绘制路径文字的下划线或删除线"
+"text style overrides refer to missing table entries" = "文本样式覆盖引用了缺失的表条目"
+"the file has no pages" = "文件没有页面"
 "the plugin" = "插件"
+"the variables JSON has no `variableCollections` (expected the local variables response) and was ignored" = "变量 JSON 中没有 `variableCollections`（应为本地变量响应），已忽略"
 "this session only" = "仅限本次会话"
+"unknown component property types were skipped" = "已跳过未知的组件属性类型"
+"variable aliases to variables that aren't in the variables JSON (or of another type) were skipped" = "已跳过指向变量 JSON 中没有的（或其他类型的）变量的别名"
+"variable bindings to properties the layer doesn't have were skipped" = "已跳过绑定到图层没有的属性的变量绑定"
+"variable bindings to variables that aren't in the variables JSON (library variables) were skipped" = "已跳过绑定到变量 JSON 中没有的变量（库变量）的绑定"
+"variable bindings were skipped: the file JSON has no variable definitions (pass the local variables JSON as `variables`, or embed its `meta` next to the file JSON)" = "已跳过变量绑定：文件 JSON 中没有变量定义（将本地变量 JSON 作为 `variables` 传入，或将其 `meta` 嵌入文件 JSON 旁）"
+"variable bindings whose variable type doesn't fit the property were skipped" = "已跳过变量类型与属性不符的变量绑定"
+"variable collections without modes were skipped" = "已跳过没有模式的变量集合"
+"variable mode lookups in prototype expressions that aren't a variable and one of its modes were skipped" = "已跳过原型表达式中不是变量及其某个模式的变量模式查找"
+"variable modes of collections that aren't in the file were skipped" = "已跳过文件中没有的集合的变量模式"
+"variable modes of collections that aren't in the variables JSON were skipped" = "已跳过变量 JSON 中没有的集合的变量模式"
+"variable values that don't match their type (or composed colours) were skipped" = "已跳过与其类型不符的变量值（或组合颜色）"
+"variables of unknown types were skipped" = "已跳过未知类型的变量"
+"variables whose collection isn't in the variables JSON were skipped" = "已跳过其集合不在变量 JSON 中的变量"
+"variables without readable values were skipped" = "已跳过没有可读值的变量"
+"vector points with unknown stroke joins use the layer join" = "转角未知的矢量点使用图层的转角"
+"vectors without geometry are empty" = "没有几何的矢量为空"
+"vectors without geometry are empty (export the file JSON with geometry=paths)" = "没有几何的矢量为空（使用 geometry=paths 导出文件 JSON）"
+"very long text was cut to 1,048,576 characters" = "过长的文本已截断为 1,048,576 个字符"
+"very long vector paths were skipped" = "已跳过过长的矢量路径"
+"video actions are not supported and were skipped" = "不支持视频操作，已跳过"
+"video triggers are not supported and were skipped" = "不支持视频触发器，已跳过"
 "{instances} in {files}" = "{files} 中的 {instances}"
 "{language}: draft translation, waiting for a native speaker's review." = "{language}：翻译草稿，等待母语者审校。"
 "{length} bleed" = "出血 {length}"
@@ -1453,6 +1656,7 @@ status = "draft — needs native review"
 "{name} is forgotten on this computer; the file stays on {server}" = "已在这台电脑上忘记 {name}；文件仍保留在 {server} 上"
 "{name} is on the server." = "{name} 已在服务器上。"
 "{name} is spotlighting" = "{name} 正在聚焦"
+"{name} is too large to open in the browser (over 512 MB)." = "{name} 太大，无法在浏览器中打开（超过 512 MB）。"
 "{name}\nClick to apply to the selection" = "{name}\n点击应用于所选项"
 "{name}\nDrag onto the canvas, or click to place in the middle of the view.\nHold Alt (Option) while dropping onto an instance to swap it." = "{name}\n拖到画布上，或点击放置在视图中央。\n拖放到实例上时按住 Alt（Option）可替换该实例。"
 "{name} (from {library})" = "{name}（来自 {library}）"
@@ -1486,8 +1690,10 @@ status = "draft — needs native review"
 "{n} layers selected" = { other = "已选择 {n} 个图层" }
 "{n} layers · {parts}" = { other = "{n} 个图层 · {parts}" }
 "{n} matches" = { other = "{n} 个匹配项" }
+"{n} min" = "{n} 分钟"
 "{n} minutes ago" = { other = "{n} 分钟前" }
 "{n} months ago" = { other = "{n} 个月前" }
+"{n} more notes omitted from this report" = { other = "另有 {n} 条说明未列入此报告" }
 "{n} of {total}" = "第 {n} 个，共 {total} 个"
 "{n} people joined" = { other = "{n} 人已加入" }
 "{n} preferred components" = { other = "{n} 个首选组件" }
@@ -1497,6 +1703,8 @@ status = "draft — needs native review"
 "{n} rows" = { other = "{n} 行" }
 "{n} styles" = { other = "{n} 个样式" }
 "{n} variables" = { other = "{n} 个变量" }
+"{n} votes" = { other = "{n} 票" }
+"{n} votes left" = { other = "剩余 {n} 票" }
 "{n} weeks ago" = { other = "{n} 周前" }
 "{n} years ago" = { other = "{n} 年前" }
 "{n}d" = "{n}天"
@@ -1547,7 +1755,26 @@ status = "draft — needs native review"
 "arrange.packH" = "水平紧凑排列"
 "arrange.packV" = "垂直紧凑排列"
 "arrange.roundToPixels" = "取整到像素"
+"arrange.spacing" = "间距"
 "arrange.tidy" = "整理"
+"board.connector" = "连接线"
+"board.ink" = "马克笔笔画"
+"board.label" = "连接线标签"
+"board.nextSticky" = "下一张便利贴"
+"board.reattach" = "重新连接连接线"
+"board.setColor" = "白板颜色"
+"board.setStyle" = "白板样式"
+"board.shape" = "带文字的形状"
+"board.stamp" = "印章"
+"board.sticky" = "便利贴"
+"board.table" = "表格"
+"board.tableEdit" = "编辑表格"
+"board.template" = "白板模板"
+"board.templates" = "列出白板模板"
+"board.timer" = "计时器"
+"board.timerState" = "计时器状态"
+"board.vote" = "投票"
+"board.voteResults" = "投票结果"
 "bool.exclude" = "排除所选项"
 "bool.flatten" = "拼合布尔组"
 "bool.intersect" = "所选项相交"
@@ -1623,6 +1850,9 @@ status = "draft — needs native review"
 "dev.focus" = "聚焦视图"
 "dev.resolveChange" = "解决更改"
 "dev.unfocus" = "退出聚焦视图"
+"devMode.addMeasurement" = "添加测量"
+"devMode.measurements" = "列出测量"
+"devMode.removeMeasurement" = "移除测量"
 "devResource.add" = "添加开发资源"
 "devResource.edit" = "编辑开发资源"
 "devResource.list" = "列出开发资源"
@@ -1646,6 +1876,7 @@ status = "draft — needs native review"
 "edit.duplicate" = "创建副本"
 "edit.findReplace" = "查找和替换"
 "edit.paste" = "粘贴"
+"edit.pasteDesignLayers" = "粘贴设计图层"
 "edit.pasteOver" = "粘贴到所选项上方"
 "edit.pasteProperties" = "粘贴属性"
 "edit.pasteReplace" = "粘贴以替换"
@@ -1655,7 +1886,9 @@ status = "draft — needs native review"
 "edit.setDefaultProperties" = "设为默认属性"
 "edit.undo" = "撤销"
 "effect.add" = "添加效果"
+"effect.copy" = "复制效果"
 "effect.move" = "移动效果"
+"effect.paste" = "粘贴效果"
 "effect.remove" = "移除效果"
 "effect.set" = "设置效果"
 "export.add" = "添加导出设置"
@@ -1669,7 +1902,9 @@ status = "draft — needs native review"
 "file.exportLayers" = "导出图层"
 "file.exportSvg" = "将所选项导出为 SVG"
 "file.import" = "导入"
+"file.moveTab" = "移动标签页"
 "file.new" = "新建设计文件"
+"file.newBoard" = "新建白板"
 "file.open" = "打开"
 "file.openRecent" = "打开最近的文件"
 "file.placeImage" = "置入图片"
@@ -1681,7 +1916,9 @@ status = "draft — needs native review"
 "file.saveVersion" = "保存到版本历史"
 "file.versionHistory" = "显示版本历史"
 "fill.add" = "添加填充"
+"fill.copy" = "复制填充"
 "fill.move" = "移动填充"
+"fill.paste" = "粘贴填充"
 "fill.pattern" = "图案填充"
 "fill.remove" = "移除填充"
 "fill.set" = "设置填充"
@@ -1806,6 +2043,7 @@ status = "draft — needs native review"
 "pref.reduceMotion" = "减少动态效果"
 "pref.renameDuplicates" = "重命名副本图层"
 "pref.showDimensions" = "在对象上显示尺寸"
+"pref.startOnHome" = "启动时显示主页"
 "pref.userName" = "评论中显示的名字"
 "proto.action.add" = "添加原型操作"
 "proto.action.move" = "调整原型操作顺序"
@@ -1849,6 +2087,12 @@ status = "draft — needs native review"
 "select.sameStroke" = "选择相同描边"
 "select.sameText" = "选择相同文本属性"
 "select.set" = "选择"
+"selection.applyColorStyle" = "将颜色样式应用于所选项"
+"selection.bindColorVariable" = "将颜色变量应用于所选项"
+"selection.colors" = "所选项颜色"
+"selection.detachColor" = "分离所选项颜色"
+"selection.selectColor" = "选择使用此颜色的图层"
+"selection.setPaint" = "更改所选项颜色"
 "shape.arrow" = "箭头"
 "shape.ellipse" = "椭圆"
 "shape.line" = "直线"
@@ -1861,7 +2105,9 @@ status = "draft — needs native review"
 "shapeBuilder.remove" = "移除区域"
 "stroke.add" = "添加描边"
 "stroke.brush" = "画笔"
+"stroke.copy" = "复制描边"
 "stroke.move" = "移动描边"
+"stroke.paste" = "粘贴描边"
 "stroke.remove" = "移除描边"
 "stroke.set" = "设置描边"
 "stroke.widthProfile" = "宽度配置"
@@ -1928,10 +2174,14 @@ status = "draft — needs native review"
 "text.weightUp" = "增大字重"
 "tool.arrow" = "箭头"
 "tool.comment" = "评论"
+"tool.connector" = "连接线"
 "tool.ellipse" = "椭圆"
+"tool.eraser" = "橡皮擦"
 "tool.frame" = "画框"
 "tool.hand" = "抓手"
+"tool.highlighter" = "荧光笔"
 "tool.line" = "直线"
+"tool.marker" = "马克笔"
 "tool.move" = "移动"
 "tool.pen" = "钢笔"
 "tool.pencil" = "铅笔"
@@ -1943,9 +2193,12 @@ status = "draft — needs native review"
 "tool.scaleAnchor" = "缩放锚点"
 "tool.section" = "分区"
 "tool.set" = "选择工具"
+"tool.shape" = "形状"
 "tool.shapeBuilder" = "形状生成器"
 "tool.slice" = "切片"
+"tool.stamp" = "印章"
 "tool.star" = "星形"
+"tool.sticky" = "便利贴"
 "tool.text" = "文本"
 "transform.move" = "移动"
 "transform.moveTo" = "移动到"
@@ -2007,11 +2260,13 @@ status = "draft — needs native review"
 "vector.edit.tool" = "矢量编辑工具"
 "vector.edit.transform" = "变换点"
 "vector.edit.widthPoint" = "宽度点"
+"vector.fillRule" = "设置填充规则"
 "vector.flatten" = "拼合"
 "vector.join" = "连接所选项"
 "vector.offset" = "偏移路径"
 "vector.outlineStroke" = "轮廓化描边"
 "vector.reverse" = "反转路径方向"
+"vector.reverseLoop" = "反转环"
 "vector.simplify" = "简化矢量"
 "vector.smoothJoin" = "平滑连接所选项"
 "version.autosave" = "自动保存版本"
@@ -2070,6 +2325,8 @@ status = "draft — needs native review"
 "widget.click" = "点击小组件"
 "widget.insert" = "插入小组件"
 "widget.list" = "列出小组件"
+"widget.menu" = "小组件菜单"
+"widget.setText" = "编辑小组件字段"
 "window.focus" = "将窗口置于前台"
 "window.new" = "新建窗口"
 
diff --git a/crates/ui-egui/src/a11y.rs b/crates/ui-egui/src/a11y.rs
index 824defd4..3c5fafb6 100644
--- a/crates/ui-egui/src/a11y.rs
+++ b/crates/ui-egui/src/a11y.rs
@@ -239,6 +239,10 @@ pub fn scroll_focus(nav: &mut Nav, ui: &Ui) {
 #[derive(Clone, Default)]
 struct Shared {
     canvas: Option<Id>,
+    /// The root `Ui::scope_id` of the frame. A resizable panel's real `__resize` widget is
+    /// `root_scope.with(<panel salt>).with("__resize")`; FigCraft's panels are fixed, so its own
+    /// `panel_edge` and `pages_edge` IDs are the ones to exclude today.
+    root_scope: Option<Id>,
     keyboard: bool,
     /// The focused widget showed its focus itself this frame (no ring needed).
     ring: Option<Id>,
@@ -249,8 +253,10 @@ struct Shared {
     name: String,
 }
 
+/// Run `f` on the per-context temporary `Shared` accessibility state keyed by
+/// `figcraft_a11y`.
 fn shared<R>(ctx: &Context, f: impl FnOnce(&mut Shared) -> R) -> R {
-    ctx.data_mut(|d| f(d.get_temp_mut_or_default::<Shared>(Id::new("figcraft_a11y"))))
+    ctx.data_mut(|d| f(d.get_temp_mut_or_default::<Shared>(Id::unique("figcraft_a11y"))))
 }
 
 /// Whether a widget other than the canvas has the keyboard (a field, a focused button): the
@@ -284,8 +290,10 @@ pub fn keyboard(ctx: &Context) -> bool {
 
 /// Before the panels draw: pointer presses, the focused control's region, and the navigation
 /// keys (F6, Tab, arrows, Escape), which are taken out of the input when they move the keyboard.
-pub fn begin(app: &mut FigApp, ctx: &Context) {
+pub fn begin(app: &mut FigApp, ctx: &Context, root_scope: Id) {
     app.ui.nav.last = std::mem::take(&mut app.ui.nav.next);
+    // Before the keys: a panel edge derived from the root scope must already be excluded.
+    shared(ctx, |s| s.root_scope = Some(root_scope));
     keys(app, ctx);
     let keyboard = app.ui.nav.keyboard;
     shared(ctx, |s| {
@@ -646,7 +654,13 @@ fn step_within(app: &mut FigApp, ctx: &Context, region: Region, step: i32) {
 /// them, are left out).
 fn focusables(ctx: &Context, nav: &Nav, region: Region) -> Vec<(Id, Rect)> {
     let canvas = nav.last.canvas;
-    let edges = [Id::new("left_panel").with("__resize"), Id::new("right_panel").with("__resize")];
+    // Both the real resize widgets (should a panel ever become resizable) and FigCraft's own
+    // custom panel and pages-list edges, which must never enter the F6/Tab order.
+    let mut edges = vec![Id::unique(("panel_edge", "left")), Id::unique(("panel_edge", "right")), Id::unique("pages_edge")];
+    if let Some(root) = shared(ctx, |s| s.root_scope) {
+        edges.push(root.with("left_panel").with("__resize"));
+        edges.push(root.with("right_panel").with("__resize"));
+    }
     ctx.viewport(|v| {
         v.prev_pass
             .widgets
@@ -942,10 +956,11 @@ pub fn menu_item(resp: &Response, label: &str, trail: &str, checked: Option<bool
 }
 
 /// A menu item opening a submenu.
-pub fn submenu(resp: &Response, label: &str) {
+pub fn submenu(resp: &Response, label: &str, open: bool) {
     node(resp, label, |n| {
         n.set_role(Role::MenuItem);
         n.set_has_popup(accesskit::HasPopup::Menu);
+        n.set_expanded(open);
     });
 }
 
diff --git a/crates/ui-egui/src/a11y_tests.rs b/crates/ui-egui/src/a11y_tests.rs
index d041a5b3..14be637d 100644
--- a/crates/ui-egui/src/a11y_tests.rs
+++ b/crates/ui-egui/src/a11y_tests.rs
@@ -403,3 +403,31 @@ fn the_align_buttons_are_off_for_a_layer_alone_on_the_page() {
     u.app.run("select.set", json!({"ids": [inner]}));
     assert!(!align_left(&tree(&mut u)), "one in a frame aligns to it");
 }
+
+/// Asserts side-panel and Pages edges are not focusable, and Tab never stops on the
+/// side-panel edges.
+#[test]
+fn the_custom_panel_edges_never_enter_the_keyboard_or_focus_order() {
+    // FigCraft's panels are fixed, so egui makes no `panel.__resize` widgets; the draggable edges
+    // are `Id::unique(("panel_edge", ...))`. They sense the pointer but must not be focusable, or
+    // Tab/F6 would stop on an unnamed control.
+    let (mut u, _, _) = setup();
+    let (left, right) = (egui::Id::unique(("panel_edge", "left")), egui::Id::unique(("panel_edge", "right")));
+    // The Pages list's edge has the same contract as the side panels' edges.
+    let pages = egui::Id::unique("pages_edge");
+    for f in [left, right, pages] {
+        let focusable = u.ctx.viewport(|v| v.prev_pass.widgets.get(f).map(|w| w.sense.is_focusable()));
+        assert_eq!(focusable, Some(false), "the panel/pages edge still senses clicks/drags but is not focusable");
+    }
+    let mut seen = Vec::new();
+    for back in [false, true] {
+        f6(&mut u, back);
+        for _ in 0..30 {
+            press(&mut u, Key::Tab, Modifiers::NONE);
+            if let Some(id) = u.ctx.memory(|m| m.focused()) {
+                seen.push(id);
+            }
+        }
+    }
+    assert!(!seen.contains(&left) && !seen.contains(&right), "Tab never stops on a panel edge: {seen:?}");
+}
diff --git a/crates/ui-egui/src/app.rs b/crates/ui-egui/src/app.rs
new file mode 100644
index 00000000..c10b402c
--- /dev/null
+++ b/crates/ui-egui/src/app.rs
@@ -0,0 +1,385 @@
+use super::clock::{AUTO_SAVE_RETRY_SECS, AUTO_SAVE_SECS, AUTOSAVE_SECS, CJK_CHANGES, FrameClock, TOAST_SECS, ToastClock, repaint_in};
+use super::open::OPEN_EXTENSIONS;
+use super::services::{DialogFuture, PickFuture, Picked, RepaintWaker, Services};
+use super::state::{LEFT_PANEL, LeftTab, MOBILE_STRIP, MobilePanel, NARROW_WIDTH, PANEL_DEFAULT, RIGHT_PANEL, RightTab, TitleBar, fit_panels};
+use super::*;
+
+mod clipboard;
+mod commands;
+mod control;
+mod files;
+mod frame;
+mod ime;
+
+impl FigApp {
+    /// Construct `FigApp` from a session and services, taking panel widths and pages height
+    /// from preferences and initializing UI, canvas, clocks, capture/IME and transient channel
+    /// state.
+    pub fn new(session: Session, services: Box<dyn Services>) -> Self {
+        // The main window's panels open as wide as they were left.
+        let (left_width, right_width) = session.prefs.panel_widths;
+        let pages_height = session.prefs.pages_height;
+        Self {
+            ui: UiState { left_width, right_width, pages_height, ..UiState::default() },
+            session,
+            canvas: canvas::CanvasState::default(),
+            services,
+            worker: None,
+            fonts_installed: false,
+            script_fonts: None,
+            cjk_checked: None,
+            language: None,
+            field_focus: false,
+            panels_unsaved: false,
+            control_queue: Vec::new(),
+            control_input: Vec::new(),
+            frame_stats: frame_stats::FrameStats::default(),
+            windows: windows::Windows::default(),
+            window_requests: Vec::new(),
+            waiting: Vec::new(),
+            pending_dialog: None,
+            ui_context: None,
+            automation_roots: None,
+            control_input_doc: None,
+            control_synthetic: false,
+            input_acks: Vec::new(),
+            applied_acks: Vec::new(),
+            applied_input: None,
+            control_input_queued: false,
+            applied_frame: None,
+            clock: FrameClock::default(),
+            capture: crate::control::CaptureState::default(),
+            logic_ticked: false,
+            ui_frame_stamp: None,
+            ime: egui::ime_context::ImeContextTracker::new(),
+            updates_rt: updates_ui::Runtime::default(),
+            #[cfg(test)]
+            ime_observations: 0,
+        }
+    }
+
+    /// UI-phase setup that needs a real current `Ui`: fonts/language/theme, interface zoom and the
+    /// render worker. Runs once per frame (pass 0) for the main window, and once per frame for
+    /// every child window (`windows::draw`), never on a logic-only tick.
+    fn ui_setup(&mut self, ctx: &egui::Context) {
+        self.viewport_setup(ctx);
+    }
+
+    /// The app-global part of [`Self::ui_setup`] that every window's frame needs: language, fonts,
+    /// theme and `ui.dark`, the render worker, and the interface zoom plan. eframe only calls
+    /// `App::ui` for the root window, so a child must run this itself before it draws; a child that
+    /// only runs while the root is minimised still gets theme switches, CJK faces for its own
+    /// document, and the right `ui.dark` for its tabs and dialogs.
+    pub(crate) fn viewport_setup(&mut self, ctx: &egui::Context) {
+        if self.language.as_ref() != Some(&self.session.prefs.language) {
+            i18n::set(&self.session.prefs.language, self.services.system_language().as_deref());
+            self.language = Some(self.session.prefs.language.clone());
+        }
+        // Screen-reader and bidi language of the UI (fork E17).
+        ctx.set_language(i18n::current().map(|l| l.code.to_string()));
+        if !self.fonts_installed {
+            // Cmd/Ctrl+= / - / 0 zoom the canvas (view.zoomIn, view.zoomOut, view.zoom100): egui's
+            // own keyboard zoom would scale the whole interface on the same keys.
+            ctx.options_mut(|o| o.zoom_with_keyboard = false);
+            // A double-click's window is the platform's (0.5 s, Windows' default), not egui's
+            // stricter 0.3 s: a double-click the OS takes must enter a shape's points too.
+            ctx.memory_mut(|m| m.options.input_options.max_double_click_delay = 0.5);
+            theme::install_fonts(ctx, false, 0);
+            self.fonts_installed = true;
+            // Installed fonts apply from the next frame; a child window draws on here, so ask for
+            // that frame (the root draws nothing on the frame it installs them).
+            ctx.request_repaint();
+        } else if figcraft_text::system_fonts_scanned() {
+            // Once the system fonts are indexed: faces for names in scripts the UI fonts lack, and
+            // for each CJK script once something shows it.
+            let installed = self.script_fonts.map_or(0, |(s, _)| s);
+            let cjk = installed | self.cjk_needed(ctx, installed);
+            // The UI language's script leads the CJK faces, so another language lays them out again.
+            let lang = i18n::current().map_or("en", |l| l.code);
+            if self.script_fonts != Some((cjk, lang)) {
+                self.script_fonts = Some((cjk, lang));
+                theme::install_fonts(ctx, true, cjk);
+            }
+        }
+        // egui's zoom is for the whole app and multiplies each window's own system scale, so the
+        // size is the same relative to every screen; the main window, whose size can hold a size
+        // back, sets it. The browser keeps its own zoom. Every window records its own plan (the
+        // Preferences warning and `ui.inspect` read it), from its own size.
+        {
+            let window_px = ctx.content_rect().size() * ctx.pixels_per_point();
+            let size = if cfg!(target_arch = "wasm32") { 1.0 } else { self.session.prefs.ui_scale };
+            let plan = ui_scale::plan(size, ctx.native_pixels_per_point(), Some((window_px.x, window_px.y)));
+            if ctx.viewport_id() == egui::ViewportId::ROOT {
+                ctx.set_zoom_factor(plan.zoom);
+            }
+            self.ui.ui_scale = plan;
+        }
+        let dark = match self.session.prefs.theme.as_str() {
+            "dark" => true,
+            // The active visuals were set by us last frame (possibly for a manual theme). Read the
+            // integration's OS theme; winit reports none on Linux and the BSDs, where the platform
+            // services' colour scheme answers instead. Without either, keep the light fallback.
+            "system" => ctx.system_theme().map(|t| t == egui::Theme::Dark).or_else(|| self.services.system_dark()).unwrap_or(false),
+            _ => false,
+        };
+        self.ui.dark = dark;
+        // New files take the theme's page colour (existing pages keep theirs).
+        self.session.set_ui_dark(dark);
+        theme::apply_with(ctx, if dark { theme::Tokens::dark() } else { theme::Tokens::light() }, self.reduce_motion());
+        if self.worker.is_none() {
+            self.worker = Some(render_worker::Worker::new(ctx.clone()));
+        }
+    }
+
+    /// Draw the whole UI: the main window (the other windows draw themselves).
+    pub fn ui(&mut self, ui: &mut egui::Ui) {
+        #[cfg(not(target_arch = "wasm32"))]
+        let t0 = std::time::Instant::now();
+        let ctx = ui.ctx().clone();
+        self.ui_context = Some(ctx.clone());
+        // `App::logic` already ticked this pass; direct harnesses do not call it. The marker only
+        // covers the tick that shares this pass: clearing it here keeps a direct `App::ui` harness
+        // ticking on every frame (it used to tick every other frame).
+        if !std::mem::take(&mut self.logic_ticked) {
+            self.background_tick(&ctx);
+            self.logic_ticked = false;
+        }
+        // Setup once per frame (pass 0), not once per pass and never on a logic-only tick.
+        let stamp = (ctx.viewport_id(), ctx.cumulative_frame_nr());
+        let first = !self.fonts_installed;
+        if ctx.current_pass_index() == 0 && self.ui_frame_stamp != Some(stamp) {
+            self.ui_frame_stamp = Some(stamp);
+            self.frame_stats.record(&ctx);
+            self.ui_setup(&ctx);
+        }
+        if first && self.fonts_installed {
+            // New fonts apply from the next frame; draw nothing until then. Anything taken into
+            // this frame's (undrawn) input waits for the first drawn frame.
+            ctx.request_repaint();
+            if let Some(events) = self.applied_input.take() {
+                self.push_control_input(events);
+            }
+            self.input_acks.append(&mut self.applied_acks);
+            self.applied_frame = None;
+            self.control_synthetic = false;
+            // The next (drawn) frame ticks for itself in a direct harness.
+            self.logic_ticked = false;
+            self.observe_ime(&ctx, false);
+            return;
+        }
+        windows::begin(self, &ctx);
+        let (files, prefs) = (self.session.docs.len(), self.session.prefs.clone());
+        self.frame(ui);
+        windows::settle(self, &ctx, files);
+        if self.session.prefs != prefs {
+            windows::repaint_others(self, &ctx);
+        }
+        windows::show(self, &ctx);
+        // The injected batch was applied by the frame that took it. A discarded sizing pass keeps
+        // its acknowledgement for the presented pass but never replays the input (its side effects
+        // already happened and would otherwise duplicate).
+        self.end_input_frame(&ctx);
+        // Plugins installed, removed or set up are kept at once: a crash doesn't lose them.
+        // So are the owner tokens of files put online.
+        if std::mem::take(&mut self.session.plugins.unsaved) | std::mem::take(&mut self.session.live.unsaved) {
+            self.services.save_prefs(&self.session.prefs);
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            self.ui.frame_ms = t0.elapsed().as_secs_f64() * 1000.0;
+        }
+    }
+
+    /// One frame of the window drawing now.
+    pub(crate) fn frame(&mut self, ui: &mut egui::Ui) {
+        let ctx = ui.ctx().clone();
+        // Bind this input batch before controls or pointer input can replace its composing
+        // target/caret. Outgoing IME receipts run after mutation and cannot authorize it.
+        let ime_input = shortcuts::ImeInputBaseline::capture(self);
+        let t = theme::Tokens::get(&ctx);
+        // A field that had the keyboard when the frame began keeps its keys from the shortcuts
+        // even if it lets go during the frame (Enter commits it), or as it began (egui drops the
+        // focus on Escape before the frame, which cancels the field's edit and nothing else).
+        let typing = std::mem::take(&mut self.field_focus) || a11y::field_focused(&ctx);
+        // Bind the originating field/file before tabs can switch. Its widget commits only after
+        // processing this batch; delivery remains deferred until the following frame.
+        let field_save = shortcuts::prepare_field_save(self, &ctx);
+        let swallowed = shortcuts::swallowed_paste(self, &ctx);
+        // A dialog that closed acts first, in the window it was opened from.
+        self.poll_dialog(&ctx);
+        // Control requests run first so their results reflect this frame.
+        crate::control::drain(self, &ctx);
+        windows::requests(self, &ctx);
+        selection_spacing::sync(self, &ctx);
+        // Before any widget: the navigation keys (F6, Tab, arrows, Escape) move the keyboard.
+        a11y::begin(self, &ctx, ui.scope_id());
+        if self.ui.title_bar == TitleBar::Custom {
+            tabs::resize_edges(&ctx);
+        }
+        if self.ui.icon_gallery {
+            icons::gallery(&ctx);
+        }
+        theme::set_doc_profile(&ctx, self.session.doc().map_or(figcraft_color::ColorProfile::Srgb, |d| d.color_profile));
+        widgets::set_nudge(&ctx, self.session.prefs.nudge_small, self.session.prefs.nudge_big);
+        self.sync_dev_mode();
+        self.end_pen_outside_design();
+        tabs::relink_presents(self);
+        tabs::tab_bar(self, ui);
+        // Control/window work and this pass's physical tab click may have replaced the owner.
+        // A shared field ID in that replacement must never consume the old commit marker.
+        let field_save = shortcuts::revalidate_field_save(self, &ctx, field_save);
+        if self.ui.present.is_some() {
+            // A close request can arrive while the presenter fills the window. Let its unsaved
+            // changes dialog take Escape and draw above the player just as it does in the editor.
+            dialogs::keys(self, &ctx);
+            present::show(self, ui);
+            dialogs::show(self, &ctx);
+            updates_ui::show(self, &ctx);
+            // What went wrong while presenting (a widget's plugin failing) shows over it.
+            self.toast_ui(&ctx);
+            windows::requests(self, &ctx);
+            shortcuts::clear_field_save_marker(&ctx);
+            self.observe_ime(&ctx, false);
+            return;
+        }
+        if !self.has_files() || self.ui.home {
+            home::show(self, ui);
+            // The shortcuts panel belongs to the canvas; it doesn't hang over the home screen
+            // (cleared after the home widgets, which may have just asked for it).
+            self.ui.shortcuts_panel = false;
+            dialogs::keys(self, &ctx);
+            dialogs::show(self, &ctx);
+            updates_ui::show(self, &ctx);
+            self.toast_ui(&ctx);
+            windows::requests(self, &ctx);
+            shortcuts::clear_field_save_marker(&ctx);
+            self.observe_ime(&ctx, false);
+            return;
+        }
+        let hidden = self.session.ds().map(|d| d.view.ui_hidden).unwrap_or(false);
+        let narrow = !hidden && ui.available_width() < NARROW_WIDTH;
+        let mobile = self.ui.mobile_panel.filter(|_| narrow);
+        self.ui.narrow = narrow;
+        // A narrow window shows the right panel when its button asks for it, a board's too.
+        let right_open = (self.right_panel_shown(hidden) && !narrow) || mobile == Some(MobilePanel::Right);
+        if !hidden && (!narrow || mobile == Some(MobilePanel::Left)) {
+            egui::Panel::left("left_rail")
+                .exact_size(56.0)
+                .resizable(false)
+                .frame(egui::Frame::NONE.fill(t.panel).stroke(egui::Stroke::new(1.0, t.border)))
+                .show(ui, |ui| {
+                    a11y::region(&mut self.ui.nav, ui, a11y::Region::Layers, egui::accesskit::Role::Navigation, i18n::tr("Sidebar"));
+                    layers::rail(self, ui)
+                });
+        }
+        // The panels are as wide as asked, less in a window too small for them and the canvas.
+        let left_open = !hidden && if narrow { mobile == Some(MobilePanel::Left) } else { !self.ui.left_collapsed };
+        let (left_w, right_w) = if narrow {
+            let w = (ui.available_width() - MOBILE_STRIP).max(0.0);
+            (if left_open { w } else { 0.0 }, w)
+        } else {
+            fit_panels(ui.available_width(), left_open.then_some(self.ui.left_width), right_open.then_some(self.ui.right_width))
+        };
+        let rows = ui.available_rect_before_wrap().y_range();
+        let mut edges: Vec<(&str, f32, f32, f32)> = Vec::new();
+        if left_open {
+            if !narrow {
+                edges.push(("left", ui.available_rect_before_wrap().min.x + left_w, left_w, 1.0));
+            }
+            egui::Panel::left("left_panel")
+                .resizable(false)
+                .exact_size(left_w)
+                .frame(egui::Frame::NONE.fill(t.panel).stroke(egui::Stroke::new(1.0, t.border)))
+                .show(ui, |ui| {
+                    let label = match self.ui.left_tab {
+                        _ if self.ui.versions.open => i18n::tr("Version history"),
+                        LeftTab::File => i18n::tr("Layers"),
+                        LeftTab::Assets => i18n::tr("Assets"),
+                    };
+                    a11y::region(&mut self.ui.nav, ui, a11y::Region::Layers, egui::accesskit::Role::Pane, label);
+                    layers::left_panel(self, ui)
+                });
+        }
+        if right_open {
+            if !narrow {
+                edges.push(("right", ui.available_rect_before_wrap().max.x - right_w, right_w, -1.0));
+            }
+            egui::Panel::right("right_panel")
+                .resizable(false)
+                .exact_size(right_w)
+                .frame(egui::Frame::NONE.fill(t.panel).stroke(egui::Stroke::new(1.0, t.border)))
+                .show(ui, |ui| {
+                    let label = match self.ui.right_tab {
+                        RightTab::Design => i18n::tr("Design"),
+                        RightTab::Prototype => i18n::tr("Prototype"),
+                        RightTab::Inspect => i18n::tr("Dev Mode"),
+                    };
+                    a11y::region(&mut self.ui.nav, ui, a11y::Region::Properties, egui::accesskit::Role::Pane, label);
+                    right::right_panel(self, ui)
+                });
+        }
+        egui::CentralPanel::default().frame(egui::Frame::NONE.fill(t.canvas)).show(ui, |ui| {
+            let worker = self.worker.take();
+            let mut worker = worker.unwrap_or_else(|| render_worker::Worker::new(ctx.clone()));
+            canvas::show(self, ui, &mut worker);
+            self.worker = Some(worker);
+            if !hidden && mobile.is_none() {
+                ui.scope_builder(egui::UiBuilder::new().id_salt("toolbar"), |ui| {
+                    a11y::container(ui, egui::accesskit::Role::Toolbar, i18n::tr("Tools"));
+                    toolbar::show(self, ui);
+                });
+            }
+        });
+        if narrow {
+            let x = if mobile == Some(MobilePanel::Left) { ctx.content_rect().max.x - MOBILE_STRIP + 4.0 } else { ctx.content_rect().min.x + 4.0 };
+            self.mobile_buttons(&ctx, egui::pos2(x, rows.min + 8.0));
+        }
+        // The panels' edges, over the canvas and the panels (drawn after them: they take the press).
+        for (name, x, shown, grows) in edges {
+            if let Some(w) = Self::panel_edge(ui, name, x, rows, shown, grows) {
+                let (l, r) = if name == "left" { (w, self.ui.right_width) } else { (self.ui.left_width, w) };
+                self.set_panel_widths(l, r);
+                self.panels_unsaved = true;
+            }
+        }
+        // Kept once the drag is over (not on every pointer move).
+        if self.panels_unsaved && !ctx.input(|i| i.pointer.any_down()) {
+            self.panels_unsaved = false;
+            self.services.save_prefs(&self.session.prefs);
+        }
+        // Before the shortcuts: keys the hovered pane's prototype uses don't reach the editor, and
+        // the arrows step through comment threads with the Comment tool.
+        present::show_pane(self, &ctx);
+        comments::keys(self, &ctx);
+        dev_compare::keys(self, &ctx);
+        branch_ui::keys(self, &ctx);
+        live::dialog_keys(self, &ctx);
+        dialogs::keys(self, &ctx);
+        shortcuts::handle_input(self, &ctx, typing, swallowed, ime_input, field_save);
+        menus::popups(self, &ctx);
+        variable_ui::picker(self, &ctx);
+        style_picker::show(self, &ctx);
+        self.end_unwanted_text_preview(&ctx);
+        self.end_pen_outside_design();
+        dialogs::show(self, &ctx);
+        updates_ui::show(self, &ctx);
+        self.toast_ui(&ctx);
+        // A rename started after the layers panel drew (Cmd/Ctrl+R, a double-click) opens its field
+        // next frame.
+        if self.ui.rename.is_some_and(|r| r.start) && !hidden && !self.ui.left_collapsed && self.ui.left_tab == LeftTab::File {
+            ctx.request_repaint();
+        }
+        a11y::end(self, &ctx);
+        self.field_focus = a11y::field_focused(&ctx);
+        windows::requests(self, &ctx);
+        // Your pointer, selection and view to the others in each live session (when they
+        // changed), from the window with its file.
+        let windows = &self.windows;
+        self.session.live_sync_in(|uid| uid.map_or(0, |u| windows.of(u)) == windows.current);
+        // The canvas editor's IME context is observed exactly once per pass, after every command
+        // this pass ran (shortcuts, menus, dialogs, window requests and live sync). A focused panel
+        // field or an open palette owns the platform IME instead; the early `home`/present paths
+        // above make the same single idle observation.
+        self.observe_ime(&ctx, !typing && !self.field_focus && self.ui.palette.is_none());
+    }
+}
diff --git a/crates/ui-egui/src/app/clipboard.rs b/crates/ui-egui/src/app/clipboard.rs
new file mode 100644
index 00000000..2280f9a1
--- /dev/null
+++ b/crates/ui-egui/src/app/clipboard.rs
@@ -0,0 +1,20 @@
+use super::*;
+
+impl FigApp {
+    /// Put `text` on the system clipboard. Input injected through the control channel never
+    /// replaces what the user copied: this is the one write path every copy command goes through.
+    pub(crate) fn clipboard_set_text(&mut self, text: &str) {
+        if self.control_synthetic {
+            return;
+        }
+        self.services.clipboard_set_text(text);
+    }
+
+    /// [`Self::clipboard_set_text`] for an image (straight RGBA).
+    pub(crate) fn clipboard_set_png(&mut self, width: u32, height: u32, rgba: &[u8]) {
+        if self.control_synthetic {
+            return;
+        }
+        self.services.clipboard_set_png(width, height, rgba);
+    }
+}
diff --git a/crates/ui-egui/src/app/commands.rs b/crates/ui-egui/src/app/commands.rs
new file mode 100644
index 00000000..38adf660
--- /dev/null
+++ b/crates/ui-egui/src/app/commands.rs
@@ -0,0 +1,282 @@
+use super::*;
+
+impl FigApp {
+    /// Dismiss the composer after a successful switch away from the Comment tool.
+    pub(crate) fn clear_comment_draft_after_tool_set(&mut self, id: &str, succeeded: bool) {
+        if id == "tool.set" && succeeded && self.session.tool.tool != figcraft_engine::tools::ToolId::Comment {
+            self.ui.comments.draft = None;
+        }
+    }
+
+    /// Run a command, surfacing errors as a toast. Returns the result.
+    pub fn run(&mut self, id: &str, params: Value) -> Option<Value> {
+        let layers_generation = self.session.clipboard.layers_generation;
+        let r = self.session.execute(id, &params);
+        self.clear_comment_draft_after_tool_set(id, r.is_ok());
+        self.handle_ui_requests();
+        self.invalidate_synthetic_copy(layers_generation);
+        // A command may change the file the window shows (`doc.switch`, `doc.nextTab`,
+        // `file.open`/`file.close`). Record that presentation before returning, so an in-flight
+        // screenshot admitted on the old file cannot accept pixels from the new one.
+        self.observe_presentation();
+        r.map_err(|e| self.failed(id, &e)).ok()
+    }
+
+    /// A programmatic command that changed the engine clipboard never wrote the system clipboard:
+    /// forget the old system mirror so a later user paste does not trust it as our own copy.
+    /// `before` is the layers generation captured before the command ran.
+    pub(crate) fn invalidate_synthetic_copy(&mut self, before: u64) {
+        if self.control_synthetic && self.session.clipboard.layers_generation != before {
+            self.ui.last_copy = None;
+        }
+    }
+
+    /// Record the file the window drawing now shows, with a monotonic generation that changes on
+    /// every switch (an A→B→A switch is two generations, never the admitted one again).
+    pub(crate) fn observe_presentation(&mut self) {
+        let window = self.windows.current;
+        self.windows.presentation(&self.session, window);
+    }
+
+    /// [`run`](Self::run) for something the user did (a dialog, a drop, a paste, a recent file):
+    /// a file it imports shows its import report. Programmatic calls use `run` and never open one.
+    pub fn run_user(&mut self, id: &str, params: Value) -> Option<Value> {
+        let result = self.run(id, params.clone());
+        if let Some(result) = &result {
+            import_report::capture(self, id, &params, result);
+        }
+        missing_fonts::check_later(self, id, result.as_ref());
+        result
+    }
+
+    /// Show command `id`'s error.
+    pub(crate) fn failed(&mut self, id: &str, e: &figcraft_engine::EngineError) {
+        let msg = e.to_string();
+        log::warn!("{id}: {msg}");
+        self.show_error(msg);
+    }
+
+    /// Show an error as a toast, kept as the last error.
+    pub(crate) fn show_error(&mut self, msg: String) {
+        self.toast(msg.clone());
+        self.ui.last_error = Some(msg);
+    }
+
+    /// Run a command that may talk to a server without waiting for it (the engine's
+    /// [`start_background`](Session::start_background)): `done` gets the result, at once or when
+    /// the answer arrives (the network wakes the window then); errors show as with [`run`](Self::run).
+    /// [`Session::waiting_for`] tells the panels to show that it's on its way.
+    pub fn run_background(&mut self, ctx: &egui::Context, id: &str, params: Value, done: Done) {
+        self.waiting.retain(|(c, _)| c != id);
+        let r = self.session.start_background(id, params);
+        self.handle_ui_requests();
+        match r {
+            Ok(Some(v)) => done(self, ctx, v),
+            Ok(None) => self.waiting.push((id.to_string(), done)),
+            Err(e) => self.failed(id, &e),
+        }
+    }
+
+    /// Stop waiting for command `id` (Cancel, or its window closed): its answer is dropped.
+    pub fn cancel_background(&mut self, id: &str) {
+        self.session.cancel_background(id);
+        self.waiting.retain(|(c, _)| c != id);
+    }
+
+    /// Hand the results of background commands that finished to what's waiting for them.
+    fn background_done(&mut self, ctx: &egui::Context) {
+        while let Some((id, r)) = self.session.take_background_done() {
+            self.handle_ui_requests();
+            let done = self.waiting.iter().position(|(c, _)| *c == id).map(|i| self.waiting.remove(i).1);
+            match (r, done) {
+                (Ok(v), Some(done)) => done(self, ctx, v),
+                (Ok(_), None) => {}
+                (Err(e), _) => self.failed(&id, &e),
+            }
+        }
+    }
+
+    /// Dev Mode (the Inspect tab): the canvas measures on hover without Alt and edits nothing;
+    /// entering it ends editing text or vectors.
+    pub(super) fn sync_dev_mode(&mut self) {
+        let dev = self.ui.right_tab == RightTab::Inspect;
+        if dev && !self.session.tool.dev_mode {
+            let _ = self.session.drop_gesture();
+            let editing = self.session.ds().map(|d| (d.text_edit.is_some(), d.vector_edit.is_some())).unwrap_or_default();
+            for (on, cmd) in [(editing.0, "text.edit.end"), (editing.1, "vector.edit.end")] {
+                if on {
+                    self.run(cmd, json!({}));
+                }
+            }
+        }
+        self.session.tool.dev_mode = dev;
+    }
+
+    /// Act on UI requests queued by commands (dialogs, panels).
+    pub fn handle_ui_requests(&mut self) {
+        let reqs = std::mem::take(&mut self.session.ui_requests);
+        for r in reqs {
+            match r.kind.as_str() {
+                "dialog.about" => {
+                    self.ui.about = true;
+                    self.ui.about_tab = dialogs::AboutTab::About;
+                }
+                "dialog.preferences" => self.ui.preferences = true,
+                "dialog.missingFonts" => missing_fonts::request(self),
+                "panel.shortcuts" => self.ui.shortcuts_panel = !self.ui.shortcuts_panel,
+                "palette.actions" => menus::toggle_palette(&mut self.ui),
+                "panel.design" if self.session.doc().is_ok_and(figcraft_engine::board::is_board) => self.ui.board_panel = !self.ui.board_panel,
+                "panel.design" => self.ui.right_tab = RightTab::Design,
+                "board.editText" => {
+                    if let Some(id) = r.data.get("id").and_then(figcraft_engine::params::id_of)
+                        && let Err(e) = figcraft_engine::board::edit_text(&mut self.session, id)
+                    {
+                        self.toast(e.to_string());
+                    }
+                }
+                "panel.prototype" => self.ui.right_tab = RightTab::Prototype,
+                "panel.designPrototype" => {
+                    self.ui.right_tab = if self.ui.right_tab == RightTab::Prototype { RightTab::Design } else { RightTab::Prototype };
+                }
+                "panel.devMode" => {
+                    self.ui.right_tab = if self.ui.right_tab == RightTab::Inspect { RightTab::Design } else { RightTab::Inspect };
+                }
+                "panel.leftSidebar" => {
+                    let shown = if self.ui.narrow { self.ui.mobile_panel == Some(MobilePanel::Left) } else { !self.ui.left_collapsed };
+                    if shown {
+                        self.ui.close_left_panel();
+                    } else {
+                        self.ui.open_left_panel();
+                    }
+                }
+                "panel.widths" => {
+                    let width = |k: &str| r.data.get(k).and_then(Value::as_f64).map(|w| w as f32);
+                    let (left, right) = (width("left"), width("right"));
+                    let reset = left.is_none() && right.is_none();
+                    self.set_panel_widths(
+                        left.unwrap_or(if reset { PANEL_DEFAULT } else { self.ui.left_width }),
+                        right.unwrap_or(if reset { PANEL_DEFAULT } else { self.ui.right_width }),
+                    );
+                    self.services.save_prefs(&self.session.prefs);
+                }
+                "focus.region" => self.ui.nav.step(r.data.get("step").and_then(Value::as_i64).unwrap_or(1).clamp(-4, 4) as i32),
+                "panel.layers" => self.ui.left_tab = LeftTab::File,
+                "panel.assets" => {
+                    self.ui.left_tab = LeftTab::Assets;
+                    self.ui.open_left_panel();
+                    self.ui.versions = Default::default();
+                }
+                "panel.versionHistory" => versions::open(self),
+                "view.devCompare" => {
+                    self.ui.dev.compare = dev_compare::CompareView::requested(&r.data);
+                }
+                "panel.libraries" => {
+                    self.ui.left_tab = LeftTab::Assets;
+                    self.ui.open_left_panel();
+                    self.ui.libraries = true;
+                }
+                "home" => self.ui.home = true,
+                "home.templates" => {
+                    self.ui.home = true;
+                    self.ui.home_view.section = home::Section::Templates;
+                }
+                "home.gettingStarted" => {
+                    self.ui.home = true;
+                    self.ui.home_view.section = home::Section::Recents;
+                    self.services.save_prefs(&self.session.prefs);
+                }
+                "dialog.saveAs" => self.save_as_dialog(),
+                "dialog.colorProfile" => self.ui.color_profile = self.session.doc().ok().map(|d| d.color_profile),
+                "present" => {
+                    if let Some(start) = r.data.get("start").and_then(figcraft_engine::params::id_of) {
+                        tabs::open_present(self, start);
+                    }
+                }
+                "present.options" => {
+                    let v = &mut self.ui.present_view;
+                    if let Some(s) = r.data.get("scale").and_then(|s| s.as_str()).and_then(present::PresentScale::parse) {
+                        v.scale = s;
+                    }
+                    if let Some(f) = r.data.get("deviceFrame").and_then(|f| f.as_bool()) {
+                        v.device_frame = f;
+                    }
+                    if let Some(h) = r.data.get("hotspotHints").and_then(|h| h.as_bool()) {
+                        v.hotspot_hints = h;
+                    }
+                    if let Some(i) = r.data.get("inspect").and_then(|i| i.as_bool()) {
+                        v.inspect = i;
+                    }
+                    if let Some(p) = self.ui.present.as_mut() {
+                        p.view.device_frame = v.device_frame;
+                        p.view.hotspot_hints = v.hotspot_hints;
+                        p.view.inspect = v.inspect;
+                        p.set_scale(v.scale);
+                    }
+                }
+                "preview" => {
+                    if let Some(start) = r.data.get("start").and_then(figcraft_engine::params::id_of) {
+                        self.ui.preview = Some(present::Pane::new(start, &self.session));
+                    }
+                }
+                "preview.close" => self.ui.preview = None,
+                "open.help" => self.services.open_url("https://getartcraft.com/apps/figcraft"),
+                "layers.collapseAll" => layers::collapse_all(self),
+                "contextMenu" => self.ui.key_menu = true,
+                "selectArea" => self.start_key_box(),
+                "canvas.renameLabel" => {
+                    self.ui.rename_label = r.data.get("id").and_then(figcraft_engine::params::id_of).map(|id| layers::Rename { id, start: true });
+                }
+                "layers.rename" => {
+                    let ids: Vec<NodeId> =
+                        r.data.get("ids").and_then(Value::as_array).into_iter().flatten().filter_map(figcraft_engine::params::id_of).collect();
+                    if ids.len() > 1 {
+                        dialogs::open_batch_rename(self, &ids);
+                    } else {
+                        layers::start_rename(self, &ids);
+                    }
+                }
+                "comment.open" => {
+                    if let Some(id) = r.data.get("id").and_then(Value::as_u64) {
+                        self.ui.comments.show(id);
+                    }
+                }
+                "comment.new" => {
+                    let x = r.data.get("x").and_then(|v| v.as_f64()).unwrap_or(0.0);
+                    let y = r.data.get("y").and_then(|v| v.as_f64()).unwrap_or(0.0);
+                    comments::start_draft(self, x, y);
+                }
+                "dialog.unsaved" => self.toast(i18n::tr("This file has unsaved changes")),
+                "dialog.plugins" => self.ui.plugins_window = true,
+                "dialog.pluginSave" => plugins_ui::save_file(self, &r.data),
+                "dialog.cursorChat" => live::open_chat(self),
+                "window.new" | "window.focus" | "window.fullscreen" => self.window_requests.push(r),
+                _ => {}
+            }
+        }
+        if let Some(m) = self.session.message.take() {
+            self.toast(m);
+        }
+    }
+
+    /// Work safe from a logic-only callback (`App::logic`, which also runs while hidden) and from
+    /// a normal UI pass: consumed control work, live polling, background completions, autosave and
+    /// recovery deadlines. It never reads UI input, so it must not scan events, run shortcuts or
+    /// lay out anything.
+    pub fn background_tick(&mut self, ctx: &egui::Context) {
+        crate::control::background(self, ctx);
+        // What happened in a live session (the network woke us for it).
+        if self.session.live_poll() {
+            if let Some(m) = self.session.message.take() {
+                self.toast(live::failure_text(&m));
+            }
+            self.background_done(ctx);
+        }
+        // Files that arrived without a command (joined, recovered) take the kept View toggles too.
+        self.session.apply_view_prefs();
+        let now = self.clock.now();
+        self.autosave_tick(ctx, now);
+        self.auto_save_tick(ctx, now);
+        updates_ui::tick(self, ctx);
+        self.logic_ticked = true;
+    }
+}
diff --git a/crates/ui-egui/src/app/control.rs b/crates/ui-egui/src/app/control.rs
new file mode 100644
index 00000000..bbbe9c61
--- /dev/null
+++ b/crates/ui-egui/src/app/control.rs
@@ -0,0 +1,110 @@
+use super::*;
+
+impl FigApp {
+    /// Queue raw input injected through the control channel for the window drawing next, tagged
+    /// with the document it belongs to (a batch is dropped if another file is active by then).
+    pub(crate) fn push_control_input(&mut self, events: Vec<egui::Event>) -> bool {
+        if events.is_empty() {
+            return false;
+        }
+        let doc = self.session.docs.get(self.session.active).map(|d| d.uid);
+        if !self.control_input.is_empty() && self.control_input_doc != doc {
+            // A queued batch belongs to the file that was open when it was injected; it cannot be
+            // merged with one for the file showing now. Its acknowledgement says so.
+            self.control_input.clear();
+            let viewport = crate::windows::viewport(self.windows.current);
+            crate::windows::fail_input_acks(self, viewport);
+        }
+        // Always the live pane vector: while a child window draws, `windows::enter` has swapped
+        // its pane into the app, and `leave` swaps these events back into that pane.
+        self.control_input.extend(events);
+        self.control_input_doc = doc;
+        self.control_synthetic = true;
+        true
+    }
+
+    /// The acknowledgements waiting for `viewport`'s input batch (other windows keep theirs).
+    pub(crate) fn take_input_acks(&mut self, viewport: egui::ViewportId) -> Vec<PendingAck> {
+        let mut mine = Vec::new();
+        for ack in std::mem::take(&mut self.input_acks) {
+            if ack.viewport == viewport {
+                mine.push(ack);
+            } else {
+                self.input_acks.push(ack);
+            }
+        }
+        mine
+    }
+
+    /// UI state as JSON (control channel `ui.inspect`).
+    pub fn inspect(&self) -> Value {
+        let mut state = json!({
+            "rightTab": self.ui.right_tab,
+            "leftTab": self.ui.left_tab,
+            "home": self.ui.home,
+            "online": online::inspect(self),
+            "tabs": self.session.docs.iter().map(|d| json!({"name": d.doc.name, "live": tabs::live_mark(self, d.uid).map(|shared| if shared { "shared" } else { "private" })})).collect::<Vec<_>>(),
+            "homeSection": self.ui.home_view.section.id(),
+            "homeRecents": home_recents::inspect(self),
+            "dark": self.ui.dark,
+            "focus": {"region": self.ui.nav.region.id(), "keyboard": self.ui.nav.keyboard},
+            "reduceMotion": self.reduce_motion(),
+            "presenting": self.ui.present.is_some(),
+            "presenter": tabs::shown_or_paused(self).map(present::Presenter::inspect),
+            "presentOptions": {"scale": self.ui.present_view.scale.id(), "deviceFrame": self.ui.present_view.device_frame, "comments": self.ui.present_view.comments, "hotspotHints": self.ui.present_view.hotspot_hints, "inspect": self.ui.present_view.inspect},
+            "preview": self.ui.preview.as_ref().map(|p| p.player.inspect()),
+            "mainMenu": self.ui.main_menu,
+            "palette": self.ui.palette.is_some(),
+            "variables": self.ui.variables.is_some(),
+            "versionHistory": self.ui.versions.open,
+            "branchReview": self.ui.branch_review.as_ref().map(|r| json!({"id": r.id, "picks": r.picks, "mode": if r.mode == dev_compare::Mode::Overlay { "overlay" } else { "sideBySide" }})),
+            "devCompare": self.ui.dev.compare.as_ref().map(|c| json!({"id": c.id, "mode": if c.mode == dev_compare::Mode::Overlay { "overlay" } else { "sideBySide" }, "split": c.split, "version": c.version})),
+            "devFocus": self.session.ds().ok().and_then(figcraft_engine::DocState::focused),
+            "annotationFilter": self.ui.dev.categories.id(),
+            "colorProfileDialog": self.ui.color_profile.map(|p| p.id()),
+            "stylePicker": self.ui.style_picker.as_ref().map(|p| p.slot().key()),
+            "stylePickerView": if self.ui.style_grid { "grid" } else { "list" },
+            "textPreview": figcraft_engine::textpreview::active(&self.session),
+            "comments": {
+                "open": self.ui.comments.open,
+                "draft": self.ui.comments.draft.as_ref().map(|d| [d.0, d.1]),
+                "filter": self.ui.comments.filter.id(),
+                "sort": self.ui.comments.sort.id(),
+                "search": self.ui.comments.search,
+                "editing": self.ui.comments.editing.as_ref().map(|e| [e.0, e.1 as u64]),
+                "mentions": self.ui.comments.mention.names(),
+            },
+            "frameMs": self.ui.frame_ms,
+            "renderMs": self.ui.render_ms,
+            "framesDrawn": self.frame_stats.frames,
+            "repaintCauses": self.frame_stats.causes(),
+            "canvas": {
+                "rect": [self.canvas.rect.min.x, self.canvas.rect.min.y, self.canvas.rect.max.x, self.canvas.rect.max.y],
+                "renderWork": self.canvas.render_work.map(|w| match w {
+                    figcraft_render::Work::Reused => json!({"kind": "reused"}),
+                    figcraft_render::Work::Partial { pixels } => json!({"kind": "partial", "pixels": pixels}),
+                    figcraft_render::Work::Full => json!({"kind": "full"}),
+                }),
+                "quality": if self.canvas.tex_coarse { "preview" } else { "refined" },
+                "previewLatencyMs": self.canvas.preview_latency_ms,
+                "refineLatencyMs": self.canvas.refine_latency_ms,
+            },
+            "live": live::inspect(self),
+            "window": self.windows.current,
+            "windows": windows::list(self),
+            "tool": self.session.tool_info(),
+            "cursor": self.canvas.cursor.map(cursors::Shown::name),
+            "panels": {"left": self.ui.left_width, "right": self.ui.right_width, "leftCollapsed": self.ui.left_collapsed},
+            "status": self.session.status(),
+            "lastError": self.ui.last_error,
+            "importReport": self.ui.import_report.as_ref().map(import_report::Report::inspect),
+        });
+        state["homeSearch"] = json!(self.ui.home_view.file_query);
+        // Set apart from the literal above, which is at the macro recursion limit.
+        state["uiScale"] = json!({"choice": self.session.prefs.ui_scale, "zoom": self.ui.ui_scale.zoom, "drawn": self.ui.ui_scale.drawn, "limited": self.ui.ui_scale.limited});
+        state["pendingOpens"] = json!(self.ui.pending_opens.len());
+        state["missingFonts"] = json!(self.ui.missing_fonts.as_ref().map(missing_fonts::Shown::inspect));
+        state["presentTabs"] = tabs::present_tabs_inspect(self);
+        state
+    }
+}
diff --git a/crates/ui-egui/src/app/files.rs b/crates/ui-egui/src/app/files.rs
new file mode 100644
index 00000000..ae17b7bc
--- /dev/null
+++ b/crates/ui-egui/src/app/files.rs
@@ -0,0 +1,298 @@
+use super::*;
+
+impl FigApp {
+    pub fn save_as_dialog(&mut self) {
+        if self.services.downloads() {
+            if let Some(r) = self.run("file.saveAs", json!({"data": true}))
+                && self.download(r["name"].as_str().unwrap_or_default(), &r)
+            {
+                self.run("file.markSaved", json!({}));
+                dialogs::file_saved(self, &r);
+            }
+            return;
+        }
+        let Ok(name) = self.session.doc().map(|d| d.name.clone()) else { return };
+        self.pick_save(i18n::tr("Save as"), &format!("{name}.figcraft"), &["figcraft", "fig"], |app, mut p| {
+            if p.extension().is_none_or(OsStr::is_empty) {
+                if !p.set_extension("figcraft") {
+                    app.toast(i18n::tr("Use the .figcraft or .fig extension."));
+                    return;
+                }
+                // This name wasn't confirmed by the system dialog: don't replace an existing file.
+                match p.try_exists() {
+                    Ok(false) => {}
+                    Ok(true) => {
+                        app.toast(i18n::tr("A .figcraft file with this name already exists. Choose its full name to confirm replacement."));
+                        return;
+                    }
+                    Err(e) => {
+                        app.toast(e.to_string());
+                        return;
+                    }
+                }
+            } else if !p.extension().and_then(OsStr::to_str).is_some_and(|e| e.eq_ignore_ascii_case("figcraft") || e.eq_ignore_ascii_case("fig")) {
+                app.toast(i18n::tr("Use the .figcraft or .fig extension."));
+                return;
+            }
+            if let Some(r) = app.run("file.saveAs", json!({"path": p.to_string_lossy()})) {
+                dialogs::file_saved(app, &r);
+            }
+        });
+    }
+
+    pub fn save(&mut self) {
+        // A branch tab saves its main file.
+        let tab = figcraft_engine::branches::file_tab(&self.session);
+        // A path ending in .fig is never saved over silently: a .fig destination is an export copy.
+        let native_path = self
+            .session
+            .docs
+            .get(tab)
+            .and_then(|d| d.path.as_deref())
+            .is_some_and(|path| !Path::new(path).extension().and_then(OsStr::to_str).is_some_and(|e| e.eq_ignore_ascii_case("fig")));
+        if native_path {
+            if self.run("file.save", json!({})).is_some() {
+                self.toast(i18n::tr("Saved"));
+            }
+        } else {
+            self.save_as_dialog();
+        }
+    }
+
+    pub fn open_dialog(&mut self) {
+        // Opening needs no file in front: it goes ahead even if that file closed meanwhile.
+        self.pick_file(i18n::tr("Open"), OPEN_EXTENSIONS, false, |app, file| {
+            if app.run_user("file.open", file).is_some() {
+                app.ui.home = false;
+            }
+        });
+    }
+
+    pub fn import_dialog(&mut self, place: bool) {
+        let exts: &[&str] = if place {
+            &["png", "jpg", "jpeg", "webp", "gif", "tif", "tiff"]
+        } else {
+            &["svg", "png", "jpg", "jpeg", "webp", "gif", "tif", "tiff", "figcraft", "fig", "sketch"]
+        };
+        let title = if place { i18n::tr("Place image") } else { i18n::tr("Import") };
+        self.pick_file(title, exts, true, |app, file| {
+            app.run_user("file.import", file);
+        });
+    }
+
+    /// Pick a file to open or import; `done` gets it as `file.open` and `file.import` take it (a
+    /// path, or the name and contents where the platform has no paths). `pin`: as
+    /// [`FigApp::pick_open`]'s file in front.
+    fn pick_file(&mut self, title: &str, exts: &[&str], pin: bool, done: impl FnOnce(&mut FigApp, Value) + 'static) {
+        self.start_pick(
+            |services| -> PickFuture {
+                match services.pick_open_contents(title, exts) {
+                    Some(read) => {
+                        Box::pin(async move { read.await.map(|r| r.map_or_else(Picked::Unreadable, |(name, bytes)| Picked::Contents(name, bytes))) })
+                    }
+                    None => {
+                        let pick = services.pick_open(title, exts);
+                        Box::pin(async move { pick.await.map(Picked::Path) })
+                    }
+                }
+            },
+            pin,
+            move |app, picked| match picked.file_params() {
+                Ok(file) => done(app, file),
+                Err(why) => app.show_error(why),
+            },
+        );
+    }
+
+    /// Pick a file to open. `done` runs with the file in front now back in front (and not at all
+    /// if that file closed meanwhile).
+    pub fn pick_open(&mut self, title: &str, exts: &[&str], done: impl FnOnce(&mut FigApp, PathBuf) + 'static) {
+        self.start_dialog(|services| services.pick_open(title, exts), true, done);
+    }
+
+    /// Pick where to save; `done` runs as [`FigApp::pick_open`]'s does.
+    pub fn pick_save(&mut self, title: &str, name: &str, exts: &[&str], done: impl FnOnce(&mut FigApp, PathBuf) + 'static) {
+        self.start_dialog(|services| services.pick_save(title, name, exts), true, done);
+    }
+
+    /// Hand a command result's base64 `data` over as a download named `name`, where the platform
+    /// saves by downloads rather than save dialogs (the browser, #969). Says so when nothing arrived.
+    pub(crate) fn download(&mut self, name: &str, result: &Value) -> bool {
+        use base64::Engine as _;
+        let bytes = result["data"].as_str().and_then(|d| base64::engine::general_purpose::STANDARD.decode(d).ok());
+        if bytes.is_some_and(|b| self.services.download(name, &b)) {
+            return true;
+        }
+        self.toast(i18n::trf("Couldn't download {name}", &[("name", &name)]));
+        false
+    }
+
+    /// Pick a folder; `done` runs as [`FigApp::pick_open`]'s does.
+    pub fn pick_folder(&mut self, title: &str, done: impl FnOnce(&mut FigApp, PathBuf) + 'static) {
+        self.start_dialog(|services| services.pick_folder(title), true, done);
+    }
+
+    /// Open a native dialog from the window drawing now, for the file in front (`pin`).
+    fn start_dialog(&mut self, start: impl FnOnce(&mut dyn Services) -> DialogFuture, pin: bool, done: impl FnOnce(&mut FigApp, PathBuf) + 'static) {
+        self.start_pick(
+            |services| -> PickFuture {
+                let pick = start(services);
+                Box::pin(async move { pick.await.map(Picked::Path) })
+            },
+            pin,
+            move |app, picked| {
+                if let Picked::Path(p) = picked {
+                    done(app, p);
+                }
+            },
+        );
+    }
+
+    /// [`FigApp::start_dialog`] for any kind of pick.
+    fn start_pick(&mut self, start: impl FnOnce(&mut dyn Services) -> PickFuture, pin: bool, done: impl FnOnce(&mut FigApp, Picked) + 'static) {
+        if self.pending_dialog.is_some() {
+            return;
+        }
+        let doc = if pin { self.session.ds().ok().filter(|d| self.shows(d.uid)).map(|d| d.uid) } else { None };
+        let future = start(self.services.as_mut());
+        self.pending_dialog = Some(PendingDialog { future, picked: None, done: Box::new(done), doc, window: self.windows.current });
+        if let Some(ctx) = &self.ui_context {
+            ctx.request_repaint();
+        }
+    }
+
+    /// Once the dialog has a path, its continuation runs in the window that holds its file, with
+    /// that file in front; then the tab in front before comes back (unless the dialog opened a file).
+    pub(crate) fn poll_dialog(&mut self, ctx: &egui::Context) {
+        let Some(d) = &mut self.pending_dialog else { return };
+        if d.picked.is_none() {
+            let waker = Waker::from(Arc::new(RepaintWaker(ctx.clone())));
+            let Poll::Ready(picked) = d.future.as_mut().poll(&mut TaskContext::from_waker(&waker)) else { return };
+            d.picked = picked;
+        }
+        let (doc, origin, picked) = (d.doc, d.window, d.picked.is_some());
+        let index = doc.map(|u| self.session.docs.iter().position(|ds| ds.uid == u));
+        // Cancelled, or its file closed meanwhile.
+        if !picked || index == Some(None) {
+            self.pending_dialog = None;
+            return;
+        }
+        let window = match doc {
+            Some(u) => self.windows.of(u),
+            None if self.windows.exists(origin) => origin,
+            None => 0,
+        };
+        if window != self.windows.current {
+            ctx.request_repaint_of(windows::viewport(window));
+            return;
+        }
+        let Some(PendingDialog { picked: Some(picked), done, .. }) = self.pending_dialog.take() else { return };
+        let before = self.session.ds().ok().map(|d| d.uid);
+        if let Some(Some(i)) = index {
+            self.session.active = i;
+        }
+        done(self, picked);
+        if doc.is_some()
+            && self.session.ds().ok().map(|d| d.uid) == doc
+            && let Some(i) = before.and_then(|u| self.session.docs.iter().position(|d| d.uid == u))
+        {
+            self.session.active = i;
+        }
+    }
+
+    /// Every [`AUTOSAVE_SECS`], each open document with unsaved changes since its last version
+    /// gets an autosave checkpoint in its version history.
+    pub(super) fn autosave_tick(&mut self, ctx: &egui::Context, now: f64) {
+        if now < self.ui.next_autosave {
+            // Wake up for it even if nothing else draws a frame by then.
+            repaint_in(ctx, self.ui.next_autosave - now);
+            return;
+        }
+        if self.ui.next_autosave > 0.0 {
+            let active = self.session.active;
+            for i in 0..self.session.docs.len() {
+                self.session.active = i;
+                let _ = self.session.execute("version.autosave", &json!({}));
+            }
+            self.session.active = active;
+        }
+        self.ui.next_autosave = now + AUTOSAVE_SECS;
+        repaint_in(ctx, AUTOSAVE_SECS);
+    }
+
+    /// With auto-save on, files that have a path are saved [`AUTO_SAVE_SECS`] after they last
+    /// changed (not during a gesture, a live preview or while a version is shown). The file is
+    /// encoded on a thread of its own, so a big one doesn't hold up the window, and written here.
+    pub(super) fn auto_save_tick(&mut self, ctx: &egui::Context, now: f64) {
+        let mut failed = self.auto_save_done();
+        // The browser has no files to save to.
+        let on = !cfg!(target_arch = "wasm32") && self.session.prefs.auto_save;
+        let saving = &self.ui.auto_saving;
+        let due = |d: &&figcraft_engine::DocState| {
+            d.path.as_deref().is_some_and(|p| d.images_lost_saving_to(p).is_none())
+                && d.branch_of.is_none()
+                && d.preview.is_none()
+                && d.is_dirty()
+                && !saving.iter().any(|(uid, _)| *uid == d.uid)
+        };
+        let changes = if on { self.session.docs.iter().filter(due).map(|d| d.revision).reduce(u64::wrapping_add) } else { None };
+        match changes {
+            None => self.ui.auto_save_at = None,
+            Some(changes) => {
+                let at = match self.ui.auto_save_at {
+                    Some((at, c)) if c == changes && failed.is_none() => at,
+                    _ => now + if failed.is_some() { AUTO_SAVE_RETRY_SECS } else { AUTO_SAVE_SECS },
+                };
+                self.ui.auto_save_at = Some((at, changes));
+                if now < at || self.session.docs.iter().any(|d| d.interaction.is_some() || d.text_preview.is_some()) {
+                    // Due but busy: look again in a second.
+                    repaint_in(ctx, if now < at { at - now } else { 1.0 });
+                } else {
+                    self.ui.auto_save_at = None;
+                    let files: Vec<_> =
+                        self.session.docs.iter().filter(due).map(|d| (d.uid, figcraft_engine::cmd::file::FileSnapshot::of(d))).collect();
+                    for (uid, file) in files {
+                        let encode = move || {
+                            let bytes = file.encode();
+                            (file, bytes)
+                        };
+                        match std::thread::Builder::new().name("figcraft-save".into()).spawn(encode) {
+                            Ok(h) => self.ui.auto_saving.push((uid, h)),
+                            Err(e) => {
+                                failed.get_or_insert(e.to_string());
+                                self.ui.auto_save_at = Some((now + AUTO_SAVE_RETRY_SECS, changes));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if !self.ui.auto_saving.is_empty() {
+            // Look again shortly for the files being encoded.
+            repaint_in(ctx, 0.1);
+        }
+        if let Some(e) = failed {
+            self.toast(i18n::trf("Couldn't save automatically: {error}", &[("error", &e)]));
+        }
+    }
+
+    /// Write the files whose auto-save encoding finished; the first error, if one failed.
+    fn auto_save_done(&mut self) -> Option<String> {
+        if self.ui.auto_saving.is_empty() {
+            return None;
+        }
+        let mut failed = None;
+        let done: Vec<_> = self.ui.auto_saving.extract_if(.., |(_, h)| h.is_finished()).collect();
+        for (_, h) in done {
+            let saved = match h.join() {
+                Ok((snapshot, Ok(bytes))) => snapshot.save(&mut self.session, &bytes).map(|_| ()).map_err(|e| e.to_string()),
+                Ok((_, Err(e))) => Err(e.to_string()),
+                Err(_) => Err("the file couldn't be encoded".to_string()),
+            };
+            if let Err(e) = saved {
+                failed.get_or_insert(e);
+            }
+        }
+        failed
+    }
+}
diff --git a/crates/ui-egui/src/app/frame.rs b/crates/ui-egui/src/app/frame.rs
new file mode 100644
index 00000000..96225f20
--- /dev/null
+++ b/crates/ui-egui/src/app/frame.rs
@@ -0,0 +1,255 @@
+use super::*;
+
+impl FigApp {
+    /// Show what `command params` would do on the canvas as a live preview (`text.preview`) while
+    /// a font family, font style, text style, named instance or axis slider is hovered or dragged. Call it every frame
+    /// the preview should stay: it ends on the first frame nothing asks for it.
+    pub fn preview_text(&mut self, ctx: &egui::Context, command: &str, params: Value) {
+        self.ui.text_preview_wanted = true;
+        let revision = self.session.ds().map_or(0, |d| d.revision);
+        if let Some((c, p, rev)) = &self.ui.text_preview
+            && c == command
+            && *p == params
+            && (*rev == revision || figcraft_engine::textpreview::active(&self.session))
+        {
+            return;
+        }
+        let shown = self.session.execute("text.preview", &json!({"command": command, "params": params})).is_ok();
+        let revision = self.session.ds().map_or(0, |d| d.revision);
+        self.ui.text_preview = shown.then(|| (command.to_string(), params, revision));
+        // The canvas drew before the panels: show the preview next frame.
+        ctx.request_repaint();
+    }
+
+    /// End the live text preview the panels show (Escape, or nothing hovered any more).
+    pub fn end_text_preview(&mut self, ctx: &egui::Context) {
+        if self.ui.text_preview.take().is_some() {
+            let _ = self.session.execute("text.endPreview", &json!({}));
+            ctx.request_repaint();
+        }
+    }
+
+    /// Leaving Design ends a pen path as Escape does and goes back to Move: Prototype and Inspect
+    /// don't draw (#307). Checked as the frame starts (the control channel) and after the panels
+    /// and shortcuts (the mode switcher, the tabs, Shift+E/Shift+D), before the canvas sees more.
+    pub(super) fn end_pen_outside_design(&mut self) {
+        if self.ui.right_tab == self.ui.last_right_tab {
+            return;
+        }
+        self.ui.last_right_tab = self.ui.right_tab;
+        if self.ui.right_tab != RightTab::Design && self.session.tool.tool == figcraft_engine::tools::ToolId::Pen {
+            self.run("tool.set", json!({"tool": "move"}));
+        }
+    }
+
+    /// Once a frame, after the panels: a preview nothing asked for this frame ends.
+    pub(super) fn end_unwanted_text_preview(&mut self, ctx: &egui::Context) {
+        if !std::mem::take(&mut self.ui.text_preview_wanted) {
+            self.end_text_preview(ctx);
+        }
+    }
+
+    /// Finish the frame that applies an injected batch: acknowledge it once the pass is presented,
+    /// and stop fencing the system clipboard. Only the viewport whose batch this frame took acts.
+    pub(crate) fn end_input_frame(&mut self, ctx: &egui::Context) {
+        if self.applied_frame != Some(ctx.viewport_id()) {
+            return;
+        }
+        self.applied_input = None;
+        if ctx.will_discard() {
+            // Keep `applied_frame`/`applied_acks`: the rerun pass must present (and acknowledge)
+            // the same frame without replaying the input.
+            return;
+        }
+        self.applied_frame = None;
+        for ack in self.applied_acks.drain(..) {
+            let _ = ack.tx.send(ack.reply);
+        }
+        self.control_synthetic = false;
+    }
+
+    /// The app's monotonic clock in seconds, also usable from logic-only callbacks (recovery,
+    /// control deadlines). Never `ctx.input(i.time)`, which is stale there.
+    pub fn now_secs(&self) -> f64 {
+        self.clock.now()
+    }
+
+    pub fn toast(&mut self, msg: impl Into<String>) {
+        self.ui.toast = Some((msg.into(), ToastClock::Raised));
+    }
+
+    /// Say that `n` documents left unsaved by a crash were opened again from recovery copies.
+    pub fn note_recovered(&mut self, n: usize) {
+        if n > 0 {
+            self.toast(i18n::trn("Recovered {n} unsaved files after the app quit unexpectedly: save them to keep them", n, &[]));
+        }
+    }
+
+    /// Set the widths asked for this window's side panels (within their limits); the main
+    /// window's are kept in the preferences.
+    pub fn set_panel_widths(&mut self, left: f32, right: f32) {
+        let within = |w: f32, range: std::ops::RangeInclusive<f32>| if w.is_finite() { w.clamp(*range.start(), *range.end()) } else { PANEL_DEFAULT };
+        (self.ui.left_width, self.ui.right_width) = (within(left, LEFT_PANEL), within(right, RIGHT_PANEL));
+        if self.windows.current == 0 {
+            self.session.prefs.panel_widths = (self.ui.left_width, self.ui.right_width);
+        }
+    }
+
+    /// The edge between a side panel and the canvas, at `x` down `rows`: dragging it sizes the
+    /// panel (`grows`: +1 for the left panel, whose edge is on its right, −1 for the right one), a
+    /// double-click puts back the default width. Returns the width asked for, when it changed.
+    pub(super) fn panel_edge(ui: &mut egui::Ui, name: &str, x: f32, rows: egui::Rangef, width: f32, grows: f32) -> Option<f32> {
+        let grab = ui.style().interaction.resize_grab_radius_side;
+        let rect = egui::Rect::from_x_y_ranges(x - grab..=x + grab, rows);
+        let id = egui::Id::unique(("panel_edge", name));
+        // Not focusable: an edge is a pointer target, so it must not take Tab/F6 focus from the
+        // panels' controls (see `a11y::focusables`).
+        let resp = ui.interact(rect, id, egui::Sense::CLICK | egui::Sense::DRAG);
+        if resp.hovered() || resp.dragged() {
+            ui.ctx().set_cursor_icon(egui::CursorIcon::ResizeHorizontal);
+            ui.painter().vline(x, rows, egui::Stroke::new(2.0, theme::ACCENT));
+        }
+        if resp.double_clicked() {
+            return Some(PANEL_DEFAULT);
+        }
+        // The edge stays under the pointer where it was grabbed (also back from past a limit).
+        let at = resp.interact_pointer_pos().filter(|_| resp.dragged())?;
+        if resp.drag_started() {
+            let pressed = ui.input(|i| i.pointer.press_origin()).unwrap_or(at);
+            ui.data_mut(|d| d.insert_temp(id, pressed.x - x));
+        }
+        let grabbed: f32 = ui.data(|d| d.get_temp(id)).unwrap_or(0.0);
+        let w = width + (at.x - grabbed - x) * grows;
+        (w != width).then_some(w)
+    }
+
+    /// Reduced motion: the preference or the system's setting.
+    pub fn reduce_motion(&self) -> bool {
+        self.session.prefs.reduce_motion || self.services.reduce_motion()
+    }
+
+    /// The CJK, Bengali and Thai scripts the UI shows: the language's, the language picker's (Preferences open),
+    /// typed text's, and those in the open file's names and comments (read when it changes, not
+    /// mid-drag). Nothing is checked once every script has a face.
+    pub(crate) fn cjk_needed(&mut self, ctx: &egui::Context, installed: u8) -> u8 {
+        if installed == cjk::ALL {
+            return installed;
+        }
+        let mut need = i18n::current().map_or(0, |l| cjk::language(l.code));
+        if self.ui.preferences {
+            need |= i18n::languages().iter().filter(|l| cjk::can_show(l.code)).fold(0, |m, l| m | cjk::language(l.code));
+        }
+        need |= ctx.input(|i| {
+            i.events.iter().fold(0, |m, e| match e {
+                egui::Event::Text(t) | egui::Event::Ime(egui::ImeEvent::Preedit { text: t, .. } | egui::ImeEvent::Commit(t)) => m | cjk::scripts(t),
+                _ => m,
+            })
+        });
+        let dragging = ctx.input(|i| i.pointer.any_down());
+        // Pans and zooms change the revision too: only a new version of the document is looked
+        // at, and only the layers it changed (a large file has hundreds of thousands of names).
+        let current = self.session.docs.get(self.session.active).filter(|_| !dragging).map(|d| (d.uid, d.doc.clone()));
+        if let Some((uid, doc)) = current {
+            let before = self.cjk_checked.take().filter(|(u, _)| *u == uid).map(|(_, b)| b);
+            if !before.as_ref().is_some_and(|b| Arc::ptr_eq(b, &doc)) {
+                let mut scan = |s: &str| need |= cjk::scripts(s);
+                scan(&doc.name);
+                match before.as_ref().and_then(|b| doc.changed_ids(b, CJK_CHANGES)) {
+                    Some(ids) => ids.into_iter().filter_map(|id| doc.node(id)).for_each(|n| scan(&n.name)),
+                    None => doc.nodes().for_each(|n| scan(&n.name)),
+                }
+                doc.comments.iter().flat_map(|c| std::iter::once(&c.first).chain(&c.replies)).for_each(|m| {
+                    scan(&m.author);
+                    scan(&m.text);
+                });
+            }
+            self.cjk_checked = Some((uid, doc));
+        }
+        need
+    }
+
+    /// Whether the right panel shows: never with the UI `hidden`; always on a design file; on a
+    /// board, which has no prototypes or Dev Mode (its tab stays Design), only when asked for.
+    pub(super) fn right_panel_shown(&mut self, hidden: bool) -> bool {
+        let board = self.session.doc().is_ok_and(figcraft_engine::board::is_board);
+        if board {
+            self.ui.right_tab = RightTab::Design;
+        }
+        !hidden && (!board || self.ui.board_panel)
+    }
+
+    /// A narrow window's two buttons for the side panels (touch-sized); the open one closes again.
+    pub(super) fn mobile_buttons(&mut self, ctx: &egui::Context, at: egui::Pos2) {
+        use a11y::Tip as _;
+        let t = theme::Tokens::get(ctx);
+        egui::Area::new(egui::Id::unique("mobile_panel_buttons")).order(egui::Order::Foreground).fixed_pos(at).show(ctx, |ui| {
+            for (side, icon, name) in
+                [(MobilePanel::Left, icons::Icon::Layers, i18n::tr("Layers")), (MobilePanel::Right, icons::Icon::Panels, i18n::tr("Design"))]
+            {
+                let open = self.ui.mobile_panel == Some(side);
+                let (r, resp) = ui.allocate_exact_size(egui::vec2(40.0, 40.0), egui::Sense::click());
+                let resp = resp.tip(name);
+                let fill = if open { t.accent } else { t.panel };
+                ui.painter().rect(r, 8.0, fill, egui::Stroke::new(1.0, t.border), egui::StrokeKind::Inside);
+                icons::paint(ui.painter(), r.shrink(10.0), icon, if open { t.accent_on } else { t.icon });
+                if resp.clicked() {
+                    if side == MobilePanel::Left && !open {
+                        self.ui.open_left_panel();
+                    } else {
+                        self.ui.mobile_panel = if open { None } else { Some(side) };
+                    }
+                }
+                ui.add_space(4.0);
+            }
+        });
+    }
+
+    /// Draw the toast: start its lifetime on the frame **after** the first drawn frame, request
+    /// that frame and the frame that hides it, expire and remove it at the deadline, and place it
+    /// at the bottom centre.
+    pub(super) fn toast_ui(&mut self, ctx: &egui::Context) {
+        let Some((msg, clock)) = &mut self.ui.toast else { return };
+        let now = ctx.input(|i| i.time);
+        // The clock starts on the frame after the one that first draws the toast: that frame's
+        // time was taken before whatever raised it ran (a file dialog, a long open), and would
+        // count that wait against it, so a failed open's message expired before it was seen.
+        let left = match *clock {
+            ToastClock::Raised => {
+                *clock = ToastClock::Drawn;
+                ctx.request_repaint();
+                TOAST_SECS
+            }
+            ToastClock::Drawn => {
+                *clock = ToastClock::Since(now);
+                TOAST_SECS
+            }
+            ToastClock::Since(t) => TOAST_SECS - (now - t),
+        };
+        if left <= 0.0 {
+            self.ui.toast = None;
+            return;
+        }
+        let msg = msg.clone();
+        // Nothing moves while it shows: the next frame it needs is the one that hides it.
+        if matches!(clock, ToastClock::Since(_)) {
+            repaint_in(ctx, left);
+        }
+        let screen = ctx.content_rect();
+        egui::Area::new(egui::Id::unique("toast"))
+            .fixed_pos(egui::pos2(screen.center().x, screen.max.y - 96.0))
+            .pivot(egui::Align2::CENTER_BOTTOM)
+            .order(egui::Order::Tooltip)
+            .show(ctx, |ui| {
+                egui::Frame::NONE
+                    .fill(egui::Color32::from_rgb(0x1E, 0x1E, 0x1E))
+                    .corner_radius(egui::CornerRadius::same(8))
+                    .inner_margin(egui::Margin::symmetric(14, 10))
+                    .show(ui, |ui| {
+                        // Wrapped at a readable width (the area alone would wrap at a sliver).
+                        let width = (screen.width() - 64.0).clamp(120.0, 480.0);
+                        let galley = ui.painter().layout(msg, theme::regular(12.0), egui::Color32::WHITE, width);
+                        ui.label(galley);
+                    });
+            });
+    }
+}
diff --git a/crates/ui-egui/src/app/ime.rs b/crates/ui-egui/src/app/ime.rs
new file mode 100644
index 00000000..df0a7fd2
--- /dev/null
+++ b/crates/ui-egui/src/app/ime.rs
@@ -0,0 +1,20 @@
+use super::*;
+
+impl FigApp {
+    /// The pass's one IME observation: the focused on-canvas editor, or an explicit idle.
+    ///
+    /// Calling `ImeContextTracker::observe` more than once in a pass would treat an idle followed
+    /// by a focused observation as a context change (dropping the frame's receipts) and bump the
+    /// generation. Keeping this in one place makes the fork contract structural.
+    pub(super) fn observe_ime(&mut self, ctx: &egui::Context, focused: bool) {
+        #[cfg(test)]
+        {
+            self.ime_observations = self.ime_observations.saturating_add(1);
+        }
+        if focused {
+            shortcuts::ime_output(self, ctx);
+        } else {
+            let _ = self.ime.observe(ctx.viewport_id(), None);
+        }
+    }
+}
diff --git a/crates/ui-egui/src/async_dialog_tests.rs b/crates/ui-egui/src/async_dialog_tests.rs
index 26808fe5..f38ac824 100644
--- a/crates/ui-egui/src/async_dialog_tests.rs
+++ b/crates/ui-egui/src/async_dialog_tests.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use figcraft_engine::Session;
 
-use crate::{DialogFuture, FigApp, Services};
+use crate::{ContentsFuture, DialogFuture, FigApp, Services};
 
 struct OpenFile(PathBuf);
 
@@ -79,6 +79,74 @@ fn save_as_saves_the_file_it_was_opened_for_after_another_tab_comes_to_the_front
     let _ = std::fs::remove_dir_all(dir);
 }
 
+/// The browser: the picker hands over a file's name and contents, never a path.
+struct Contents(&'static str, Vec<u8>);
+
+impl Services for Contents {
+    fn pick_open(&mut self, _title: &str, _exts: &[&str]) -> DialogFuture {
+        panic!("a platform that picks contents is never asked for a path")
+    }
+    fn pick_open_contents(&mut self, _title: &str, _exts: &[&str]) -> Option<ContentsFuture> {
+        Some(Box::pin(std::future::ready(Some(Ok((self.0.to_string(), self.1.clone()))))))
+    }
+}
+
+/// The browser, with a picked file it won't read.
+struct Unreadable(String);
+
+impl Services for Unreadable {
+    fn pick_open_contents(&mut self, _title: &str, _exts: &[&str]) -> Option<ContentsFuture> {
+        Some(Box::pin(std::future::ready(Some(Err(self.0.clone())))))
+    }
+}
+
+#[test]
+fn a_picked_file_that_cannot_be_read_says_why_and_opens_nothing() {
+    let why = crate::browser_can_read("Huge.fig", 600.0 * 1024.0 * 1024.0).unwrap_err();
+    let mut app = FigApp::new(Session::empty(), Box::new(Unreadable(why.clone())));
+    app.open_dialog();
+    app.poll_dialog(&egui::Context::default());
+    assert!(app.session.docs.is_empty());
+    assert_eq!(app.ui.last_error.as_deref(), Some(why.as_str()));
+    assert!(why.contains("Huge.fig"), "{why}");
+}
+
+#[test]
+fn the_browser_reads_files_up_to_512_mib() {
+    let max = (512u64 << 20) as f64;
+    assert!(crate::browser_can_read("a", 0.0).is_ok());
+    assert!(crate::browser_can_read("a", max).is_ok());
+    assert!(crate::browser_can_read("a", max + 1.0).is_err());
+    assert!(crate::browser_can_read("a", f64::NAN).is_err());
+    assert!(crate::browser_can_read("a", f64::INFINITY).is_err());
+}
+
+#[test]
+fn open_dialog_opens_picked_contents_as_a_new_unsaved_document() {
+    let bytes = figcraft_format::save_bytes(&figcraft_doc::Document::new("Picked"), None).unwrap();
+    let mut app = FigApp::new(Session::empty(), Box::new(Contents("Picked.figcraft", bytes)));
+    app.ui.home = true;
+    app.open_dialog();
+    assert!(app.session.docs.is_empty(), "opening waits for the picker result");
+    app.poll_dialog(&egui::Context::default());
+    assert_eq!(app.session.docs.len(), 1);
+    assert_eq!(app.session.docs[0].path, None, "no path to save over");
+    assert_eq!(app.session.docs[0].doc.name, "Picked");
+    assert!(!app.ui.home, "and the editor shows it");
+}
+
+#[test]
+fn import_dialog_imports_picked_contents_into_the_file_in_front() {
+    let svg = br#"<svg xmlns="http://www.w3.org/2000/svg" width="40" height="20"><rect width="40" height="20" fill="red"/></svg>"#.to_vec();
+    let mut app = FigApp::new(Session::new(), Box::new(Contents("Logo.svg", svg)));
+    let rectangles = |app: &FigApp| app.session.doc().unwrap().nodes().filter(|n| matches!(n.kind, figcraft_doc::NodeKind::Rectangle)).count();
+    assert_eq!(rectangles(&app), 0);
+    app.import_dialog(false);
+    app.poll_dialog(&egui::Context::default());
+    assert_eq!(app.session.docs.len(), 1, "imported, not opened");
+    assert_eq!(rectangles(&app), 1, "the SVG's content");
+}
+
 #[test]
 fn a_dialog_whose_file_closed_meanwhile_does_nothing() {
     let (mut app, dir, path) = two_files("closed");
diff --git a/crates/ui-egui/src/bidi.rs b/crates/ui-egui/src/bidi.rs
index 915c7e11..dffd4955 100644
--- a/crates/ui-egui/src/bidi.rs
+++ b/crates/ui-egui/src/bidi.rs
@@ -1,69 +1,23 @@
 //! Names in right-to-left and mixed-direction scripts (Hebrew, Arabic…) in the panels: layer, page,
-//! style, component and file names. egui has no bidi: it shapes each run of one font on its own,
-//! reversing right-to-left runs but leaving the words and runs of a name in logical order. So
-//! names go through [`figcraft_text::display`] (visual order, Arabic letters joined, mirrored
-//! brackets) and every shown cluster is laid out as its own section, which egui's shaper leaves as
-//! it is. Names are elided at their end (the left end of a right-to-left name) and edited by
-//! [`single_line`], whose caret, clicks and selection follow the shown text (the arrow keys move
-//! visually). Left-to-right names take egui's own path unchanged.
+//! style, component and file names. egui 0.37's epaint shapes the logical (typing-order) text with
+//! the Unicode bidirectional algorithm (UAX #9), lays every run out in visual order, joins Arabic
+//! letters through the font's OpenType features, mirrors brackets, and keeps one glyph per char so
+//! that caret, selection and click offsets stay logical. Names are therefore passed to egui in
+//! logical order and elided at their visual end. The rename editor is egui's own single-line
+//! `TextEdit`, whose arrow keys move the caret on screen while its state remains a logical range.
 
-use std::collections::HashMap;
 use std::sync::Arc;
 
-use egui::text::{ByteIndex, CCursor, CCursorRange, LayoutJob, LayoutSection, TextFormat, TextWrapping};
-use egui::{Color32, FontId, Galley, Id, Painter, Pos2, Rect, Response, Stroke, Ui, pos2, vec2};
-use figcraft_text::display::{self, VisualLine};
-
-/// Shown (visual, elided) lines by name, font and width: elision measures many candidates, so the
-/// result is kept between frames (cleared when it grows large).
-#[derive(Clone, Default)]
-struct Elided(Arc<std::sync::Mutex<HashMap<ElidedKey, VisualLine>>>);
-
-/// A name, its font's size and family (proportional or not) and the width it was cut to (bits).
-type ElidedKey = (String, u32, bool, u32);
-
-const ELIDED_MAX: usize = 4096;
+use egui::text::{LayoutJob, TextWrapping};
+use egui::{Color32, FontId, Galley, Id, Painter, Pos2, Rect, Response, Ui, pos2, vec2};
 
 /// `name` on one line in `font`, at most `max_w` wide (ending in an ellipsis when cut), ready to
-/// paint: in visual order with Arabic letters joined when it has right-to-left text.
+/// paint. The text stays in logical order; egui shapes, joins and reorders it, and puts the
+/// ellipsis at the row's visual end (the left end of a right-to-left name).
 pub fn name_galley(painter: &Painter, name: &str, font: FontId, color: Color32, max_w: f32) -> Arc<Galley> {
     let max_w = max_w.max(1.0);
-    if !display::has_rtl(name) {
-        let mut job = LayoutJob::simple_singleline(name.to_string(), font, color);
-        job.wrap = TextWrapping::truncate_at_width(max_w);
-        return painter.layout_job(job);
-    }
-    let key = (name.to_string(), font.size.to_bits(), matches!(font.family, egui::FontFamily::Proportional), max_w.to_bits());
-    let cache = painter.ctx().data_mut(|d| d.get_temp_mut_or_default::<Elided>(Id::new("bidi_elided")).clone());
-    let hit = cache.0.lock().ok().and_then(|m| m.get(&key).cloned());
-    let shown = hit.unwrap_or_else(|| {
-        let fits = |v: &VisualLine| visual_galley(painter, v, &font, color).size().x <= max_w;
-        let v = display::elide(name, fits);
-        if let Ok(mut m) = cache.0.lock() {
-            if m.len() >= ELIDED_MAX {
-                m.clear();
-            }
-            m.insert(key, v.clone());
-        }
-        v
-    });
-    visual_galley(painter, &shown, &font, color)
-}
-
-/// A line in display order laid out with each cluster as its own section, so egui's shaper (which
-/// would reverse a right-to-left run once more) gets one ordered, joined cluster at a time.
-fn visual_galley(painter: &Painter, line: &VisualLine, font: &FontId, color: Color32) -> Arc<Galley> {
-    let chars: Vec<char> = line.text.chars().collect();
-    let format = TextFormat::simple(font.clone(), color);
-    let mut job = LayoutJob::default();
-    for c in &line.clusters {
-        let start = job.text.len();
-        job.text.extend(chars.get(c.shown.clone()).unwrap_or_default());
-        // Pushed as is: `LayoutJob::append` would merge it with the section before.
-        if job.text.len() > start {
-            job.sections.push(LayoutSection { leading_space: 0.0, byte_range: ByteIndex(start)..ByteIndex(job.text.len()), format: format.clone() });
-        }
-    }
+    let mut job = LayoutJob::simple_singleline(name.to_string(), font, color);
+    job.wrap = TextWrapping::truncate_at_width(max_w);
     painter.layout_job(job)
 }
 
@@ -76,208 +30,29 @@ pub fn paint_name(painter: &Painter, left_center: Pos2, name: &str, font: FontId
     rect
 }
 
-/// Each shown cluster's left and right x in a galley of `v.text` laid out from x = 0.
-fn edges(v: &VisualLine, galley: &Galley) -> Vec<(f64, f64)> {
-    let chars: Vec<(f64, f64)> = galley
-        .rows
-        .first()
-        .map(|r| r.row.glyphs.iter().map(|g| (f64::from(g.pos.x), f64::from(g.pos.x + g.advance_width))).collect())
-        .unwrap_or_default();
-    v.cluster_edges(&chars)
-}
-
-/// The shown text of a field being edited, laid out once per frame.
-struct Shown {
-    line: VisualLine,
-    galley: Arc<Galley>,
-    edges: Vec<(f64, f64)>,
-}
-
-impl Shown {
-    fn new(ui: &Ui, text: &str, font: &FontId, color: Color32) -> Shown {
-        let line = display::visual_line(text);
-        let galley = visual_galley(ui.painter(), &line, font, color);
-        let edges = edges(&line, &galley);
-        Shown { line, galley, edges }
-    }
-
-    fn caret_x(&self, i: usize) -> f32 {
-        self.line.caret_x(i, &self.edges) as f32
-    }
-
-    fn hit(&self, x: f32) -> usize {
-        self.line.hit(f64::from(x), &self.edges)
-    }
-}
-
-fn scroll_id(id: Id) -> Id {
-    id.with("bidi_scroll")
-}
-
-fn anchor_id(id: Id) -> Id {
-    id.with("bidi_anchor")
-}
-
-/// A frameless one-line text editor for a name (a [`egui::TextEdit`] with id `id`). Text with
-/// right-to-left characters shows in visual order, and the caret, the selection, clicks, drags and
-/// the left and right arrow keys follow what's on screen.
+/// A frameless one-line text editor for a name (a [`egui::TextEdit`] with id `id`). The editor's
+/// text is logical; egui's galley paints it in visual order, and its caret, selection, clicks,
+/// drags and left and right arrows follow what is on screen while reporting logical char offsets.
 pub fn single_line(ui: &mut Ui, id: Id, text: &mut String, font: FontId, width: f32) -> Response {
-    let rtl = display::has_rtl(text);
-    let focused = ui.memory(|m| m.has_focus(id));
-    let color = ui.visuals().text_color();
-    if rtl && focused {
-        visual_arrows(ui, id, text, &font, color);
-    }
     // Centred in the height it's given (a rename row), like the name it replaces.
     let height = ui.available_height().max(0.0);
-    let edit = egui::TextEdit::singleline(text)
+    egui::TextEdit::singleline(text)
         .id(id)
         .frame(egui::Frame::NONE)
-        .font(font.clone())
+        .font(font)
         .desired_width(width)
-        .vertical_align(egui::Align::Center)
-        .min_size(vec2(0.0, height));
-    if !rtl {
-        ui.data_mut(|d| d.remove::<f32>(scroll_id(id)));
-        return edit.show(ui).response.response;
-    }
-    // egui would draw the chars in logical order: hide its text, caret and selection and draw the
-    // shown text over it.
-    let out = ui
-        .scope(|ui| {
-            let v = ui.visuals_mut();
-            v.selection.bg_fill = Color32::TRANSPARENT;
-            v.selection.stroke = Stroke::new(0.0, Color32::TRANSPARENT);
-            v.text_cursor.stroke = Stroke::NONE;
-            edit.text_color(Color32::TRANSPARENT).show(ui)
-        })
-        .inner;
-    let response = out.response.response;
-    let shown = Shown::new(ui, text, &font, color);
-    let clip = out.text_clip_rect;
-    let mut scroll: f32 = ui.data(|d| d.get_temp(scroll_id(id))).unwrap_or(0.0);
-    let origin = |scroll: f32| pos2(clip.min.x - scroll, out.galley_pos.y);
-    // Clicks and drags place the caret by what's on screen.
-    let mut range = out.state.cursor.char_range();
-    if let Some(p) = response.interact_pointer_pos() {
-        let at = shown.hit(p.x - origin(scroll).x);
-        if response.double_clicked() {
-            let (a, b) = word_at(text, at);
-            range = Some(CCursorRange::two(CCursor::new(a), CCursor::new(b)));
-        } else if response.clicked() || (response.is_pointer_button_down_on() && !response.dragged()) {
-            // Pressed (not yet dragging): the caret and the drag's anchor go here.
-            ui.data_mut(|d| d.insert_temp(anchor_id(id), at));
-            range = Some(CCursorRange::one(CCursor::new(at)));
-        } else if response.dragged() {
-            let anchor = ui.data(|d| d.get_temp::<usize>(anchor_id(id))).unwrap_or(at);
-            range = Some(CCursorRange { primary: CCursor::new(at), secondary: CCursor::new(anchor), h_pos: None });
-        }
-        if range != out.state.cursor.char_range() {
-            let mut state = out.state.clone();
-            state.cursor.set_char_range(range);
-            state.store(ui.ctx(), id);
-        }
-    }
-    // Keep the caret in view.
-    let caret = range.map_or(0, |r| r.primary.index.0);
-    let cx = shown.caret_x(caret);
-    let w = clip.width().max(1.0);
-    if cx - scroll > w - 1.0 {
-        scroll = cx - w + 1.0;
-    }
-    if cx - scroll < 0.0 {
-        scroll = cx;
-    }
-    scroll = scroll.clamp(0.0, (shown.galley.size().x - w + 1.0).max(0.0));
-    ui.data_mut(|d| d.insert_temp(scroll_id(id), scroll));
-    let o = origin(scroll);
-    let painter = ui.painter().with_clip_rect(clip.expand2(vec2(1.0, 0.0)));
-    let h = shown.galley.size().y;
-    if focused && let Some(r) = range {
-        let (a, b) = (r.primary.index.0, r.secondary.index.0);
-        for (x0, x1) in shown.line.selection(a, b, &shown.edges) {
-            let sel = Rect::from_min_max(pos2(o.x + x0 as f32, o.y), pos2(o.x + x1 as f32, o.y + h));
-            painter.rect_filled(sel, 0.0, ui.visuals().selection.bg_fill);
-        }
-    }
-    painter.galley(o, shown.galley.clone(), color);
-    if focused {
-        let x = (o.x + cx).round() + 0.5;
-        painter.line_segment([pos2(x, o.y), pos2(x, o.y + h)], ui.visuals().text_cursor.stroke);
-        ui.ctx().request_repaint_after(std::time::Duration::from_millis(500));
-    }
-    response
+        .align(egui::Align2::LEFT_CENTER)
+        .min_size(vec2(0.0, height))
+        .show(ui)
+        .response
+        .response
 }
 
-/// Plain and Shift-held left and right arrows move the caret across the shown text (consumed so
-/// the editor doesn't move it logically). Word and line jumps stay logical.
-fn visual_arrows(ui: &mut Ui, id: Id, text: &str, font: &FontId, color: Color32) {
-    let moves: Vec<(bool, bool)> = ui.input_mut(|i| {
-        let mut out = Vec::new();
-        i.events.retain(|e| match e {
-            egui::Event::Key { key: key @ (egui::Key::ArrowLeft | egui::Key::ArrowRight), pressed: true, modifiers, .. }
-                if !modifiers.alt && !modifiers.command && !modifiers.ctrl =>
-            {
-                out.push((*key == egui::Key::ArrowRight, modifiers.shift));
-                false
-            }
-            _ => true,
-        });
-        out
-    });
-    if moves.is_empty() {
-        return;
-    }
-    let Some(mut state) = egui::TextEdit::load_state(ui.ctx(), id) else { return };
-    let shown = Shown::new(ui, text, font, color);
-    let mut r = state.cursor.char_range().unwrap_or_default();
-    for (right, shift) in moves {
-        let (lo, hi) = (r.primary.index.0.min(r.secondary.index.0), r.primary.index.0.max(r.secondary.index.0));
-        let next = if !shift && lo != hi {
-            // A selection collapses to its end on the side of the arrow.
-            let (xa, xb) = (shown.caret_x(lo), shown.caret_x(hi));
-            if (xa < xb) == right { hi } else { lo }
-        } else {
-            shown.line.step(r.primary.index.0, right, &shown.edges)
-        };
-        r = if shift {
-            CCursorRange { primary: CCursor::new(next), secondary: r.secondary, h_pos: None }
-        } else {
-            CCursorRange::one(CCursor::new(next))
-        };
-    }
-    state.cursor.set_char_range(Some(r));
-    state.store(ui.ctx(), id);
-}
-
-/// The word around char `i` (letters, digits and marks; else the single char).
-fn word_at(text: &str, i: usize) -> (usize, usize) {
-    let chars: Vec<char> = text.chars().collect();
-    let is_word =
-        |k: usize| chars.get(k).is_some_and(|c| c.is_alphanumeric() || matches!(*c as u32, 0x0300..=0x036F | 0x0591..=0x05C7 | 0x064B..=0x065F));
-    let i = i.min(chars.len());
-    let at = if is_word(i) {
-        i
-    } else if i > 0 && is_word(i - 1) {
-        i - 1
-    } else {
-        return (i, (i + 1).min(chars.len()));
-    };
-    let mut a = at;
-    while a > 0 && is_word(a - 1) {
-        a -= 1;
-    }
-    let mut b = at;
-    while is_word(b) {
-        b += 1;
-    }
-    (a, b)
-}
-
-/// Faces the UI adds for scripts its own fonts lack (desktop: from the system), as egui font data.
-pub fn script_fallbacks(have: &dyn Fn(char) -> bool) -> Vec<(String, egui::FontData)> {
-    // Hebrew, Arabic letters, Arabic presentation forms (what joined names are drawn with).
-    const SAMPLES: [char; 3] = ['\u{05D0}', '\u{0628}', '\u{FE91}'];
+/// Faces the UI adds for scripts its own fonts lack (desktop: from the system), as egui font data;
+/// `taken` as for [`crate::theme::system_fallbacks`].
+pub fn script_fallbacks(have: &dyn Fn(char) -> bool, taken: &mut Vec<Arc<figcraft_text::Face>>) -> Vec<(String, egui::FontData)> {
+    // Hebrew and Arabic letters; egui's shaper selects the joined contextual forms itself.
+    const SAMPLES: [char; 2] = ['\u{05D0}', '\u{0628}'];
     const FAMILIES: [&str; 11] = [
         "Segoe UI",
         "Arial",
@@ -291,19 +66,8 @@ pub fn script_fallbacks(have: &dyn Fn(char) -> bool) -> Vec<(String, egui::FontD
         "FreeSans",
         "Noto Sans",
     ];
-    let mut out: Vec<(String, egui::FontData)> = Vec::new();
-    let mut taken: Vec<Arc<figcraft_text::Face>> = Vec::new();
-    for c in SAMPLES {
-        if have(c) || taken.iter().any(|f| f.has_char(c)) {
-            continue;
-        }
-        let Some(face) = figcraft_text::face_with_char(c, &FAMILIES) else { continue };
-        out.push((format!("system-{}-{}", face.family, face.style), crate::theme::font_data(&face)));
-        taken.push(face);
-    }
-    out
+    crate::theme::system_fallbacks(SAMPLES, &FAMILIES, have, taken)
 }
 
 #[cfg(test)]
-#[path = "rtl_names_tests.rs"]
 mod tests;
diff --git a/crates/ui-egui/src/bidi/tests.rs b/crates/ui-egui/src/bidi/tests.rs
new file mode 100644
index 00000000..22f59817
--- /dev/null
+++ b/crates/ui-egui/src/bidi/tests.rs
@@ -0,0 +1,312 @@
+//! Right-to-left and mixed-direction names and rename fields, driven through egui headless.
+//! egui 0.37 shapes logical text with the Unicode bidi algorithm and keeps logical char offsets;
+//! these tests assert that logical text and the actual painted order, not a preordered string.
+
+use egui::text::{CCursor, CCursorRange};
+use egui::{Event, Key, Modifiers, Pos2, RawInput, Rect, vec2};
+
+use super::*;
+use crate::theme::regular;
+
+fn frame(ctx: &egui::Context, events: Vec<Event>, mut f: impl FnMut(&mut Ui)) {
+    let input = RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), events, ..Default::default() };
+    ctx.run_ui(input, |ui| f(ui)).textures_delta.clear();
+}
+
+fn key(k: Key, shift: bool) -> Event {
+    Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers: if shift { Modifiers::SHIFT } else { Modifiers::NONE } }
+}
+
+fn caret(ctx: &egui::Context, id: Id) -> (usize, usize) {
+    let r = egui::TextEdit::load_state(ctx, id).and_then(|s| s.cursor.char_range()).unwrap_or_default();
+    (r.primary.index.0, r.secondary.index.0)
+}
+
+fn set_caret(ctx: &egui::Context, id: Id, i: usize) {
+    let mut s = egui::TextEdit::load_state(ctx, id).unwrap_or_default();
+    s.cursor.set_char_range(Some(CCursorRange::one(CCursor::new(i))));
+    s.store(ctx, id);
+}
+
+/// The caret's x in a native logical galley laid out from x = 0. These short, newline-free
+/// samples use the same font and layout as the rename field; this is not a clipping oracle.
+fn caret_x(ctx: &egui::Context, text: &str, cursor: CCursor) -> f32 {
+    ctx.fonts_mut(|f| f.layout_no_wrap(text.to_string(), regular(11.0), Color32::WHITE).pos_from_cursor(cursor).min.x)
+}
+
+/// Read the primary character cursor of a test text field.
+fn cursor(ctx: &egui::Context, id: Id) -> CCursor {
+    egui::TextEdit::load_state(ctx, id).unwrap().cursor.char_range().unwrap().primary
+}
+
+/// A glyph's atlas bitmap, normalized out of its atlas position: which shape the shaper chose.
+fn bitmap(image: &egui::ColorImage, glyph: &egui::epaint::text::Glyph) -> (usize, usize, Vec<u8>) {
+    let [x0, y0] = glyph.uv_rect.min.map(usize::from);
+    let [x1, y1] = glyph.uv_rect.max.map(usize::from);
+    let mut pixels = Vec::with_capacity((x1 - x0) * (y1 - y0) * 4);
+    for y in y0..y1 {
+        for x in x0..x1 {
+            pixels.extend(image[(x, y)].to_array());
+        }
+    }
+    (x1 - x0, y1 - y0, pixels)
+}
+
+/// A context with the bundled (or explicitly tested) Hebrew and Arabic faces. The required
+/// craft-fonts build must carry both; an optional no-font build skips instead of borrowing a
+/// system face or treating tofu as evidence.
+fn fonts() -> Option<egui::Context> {
+    let has = |family: &str| figcraft_text::CRAFT_FONTS.iter().any(|f| f.family == family && f.style == "Regular");
+    if !has("Noto Sans Hebrew") || !has("Noto Sans Arabic") {
+        assert!(
+            option_env!("CRAFT_FONTS_REQUIRED").is_none(),
+            "the required craft-fonts input must include Noto Sans Hebrew and Noto Sans Arabic Regular"
+        );
+        eprintln!("optional craft-fonts input absent: right-to-left names were not qualified");
+        return None;
+    }
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx, false, 0);
+    ctx.run_ui(RawInput::default(), |_| {}).textures_delta.clear();
+    ctx.fonts_mut(|f| {
+        for c in "שלוםكتاب".chars() {
+            assert!(f.has_glyph(&regular(11.0), c), "the bundled RTL faces must draw {c:?}");
+        }
+    });
+    Some(ctx)
+}
+
+/// Asserts names keep their logical text while glyphs paint in visual order, including
+/// ellipsis placement at the overflow end and mixed-direction rows.
+#[test]
+fn names_keep_logical_text_and_paint_in_visual_order() {
+    let Some(ctx) = fonts() else { return };
+    frame(&ctx, vec![], |ui| {
+        let p = ui.painter();
+        let white = Color32::WHITE;
+        let g = name_galley(p, "Rectangle with a rather long name", regular(11.0), white, 60.0);
+        assert!(g.elided);
+        assert!(g.size().x <= 61.0);
+        // The job stays logical; the row keeps the logical start and ends in the overflow character.
+        assert_eq!(g.text(), "Rectangle with a rather long name");
+        let row = &g.rows[0].row;
+        assert!(!row.rtl_paragraph);
+        assert!(row.text().ends_with('…'), "{}", row.text());
+        assert!(row.text().chars().count() < g.text().chars().count());
+        let ellipsis = row.glyphs.last().unwrap();
+        // Glyph origins are pixel-rounded while advances are not. Test visual order
+        // using origins, rather than comparing an unrounded advance to a rounded origin.
+        assert_eq!(row.visual_order().last(), Some(row.glyphs.len() - 1));
+        assert!(row.glyphs[..row.glyphs.len() - 1].iter().all(|gl| gl.pos.x < ellipsis.pos.x));
+
+        let g = name_galley(p, "Frame", regular(11.0), white, 200.0);
+        assert!(!g.elided);
+        assert_eq!(g.text(), "Frame");
+
+        // Right to left: the logical text is unchanged; the glyphs are placed right to left.
+        let g = name_galley(p, "שלום", regular(11.0), white, 500.0);
+        assert_eq!(g.text(), "שלום");
+        let row = &g.rows[0].row;
+        assert!(row.rtl_paragraph);
+        assert_eq!(row.text(), "שלום");
+        assert_eq!(row.visual_order().collect::<Vec<_>>(), vec![3, 2, 1, 0]);
+        let xs: Vec<f32> = row.glyphs.iter().map(|g| g.pos.x).collect();
+        assert!(xs[0] > xs[1] && xs[1] > xs[2] && xs[2] > xs[3], "logical order paints right to left: {xs:?}");
+
+        // Arabic keeps its logical letters and paints them right to left as joined shapes.
+        let g = name_galley(p, "كتاب", regular(11.0), white, 500.0);
+        assert_eq!(g.text(), "كتاب");
+        let row = &g.rows[0].row;
+        assert!(row.rtl_paragraph);
+        assert_eq!(row.text(), "كتاب");
+        assert_eq!(row.glyphs.len(), 4);
+        assert_eq!(row.visual_order().collect::<Vec<_>>(), vec![3, 2, 1, 0]);
+        let xs: Vec<f32> = row.glyphs.iter().map(|g| g.pos.x).collect();
+        assert!(xs[0] > xs[1] && xs[1] > xs[2] && xs[2] > xs[3], "logical Arabic paints right to left: {xs:?}");
+
+        // Mixed directions: every glyph stays in logical order in the row; visual_order is a
+        // permutation placed strictly left to right on screen.
+        let mixed = "abc אבג (1)";
+        let g = name_galley(p, mixed, regular(11.0), white, 500.0);
+        assert_eq!(g.text(), mixed);
+        let row = &g.rows[0].row;
+        assert_eq!(row.text(), mixed);
+        let order: Vec<usize> = row.visual_order().collect();
+        let xs: Vec<f32> = order.iter().map(|&i| row.glyphs[i].pos.x).collect();
+        assert!(xs.is_sorted(), "{mixed}: {xs:?}");
+        let mut sorted = order;
+        sorted.sort_unstable();
+        assert_eq!(sorted, (0..mixed.chars().count()).collect::<Vec<_>>());
+    });
+}
+
+/// Asserts Arabic letters take joined contextual forms and truncation puts the ellipsis at
+/// the visual end of a right-to-left row.
+#[test]
+fn arabic_joining_and_truncation_use_the_visual_end() {
+    let Some(ctx) = fonts() else { return };
+    frame(&ctx, vec![], |ui| {
+        let font = regular(11.0);
+        let isolated = ui.painter().layout_no_wrap("ب".into(), font.clone(), Color32::WHITE);
+        let joined = ui.painter().layout_no_wrap("بب".into(), font, Color32::WHITE);
+        let row = &joined.rows[0].row;
+        assert_eq!(joined.text(), "بب");
+        assert_eq!(row.text(), "بب");
+        assert_eq!(row.glyphs.len(), 2);
+        let image = ui.ctx().fonts_mut(|fonts| fonts.image());
+        let isolated = bitmap(&image, &isolated.rows[0].row.glyphs[0]);
+        let first = bitmap(&image, &row.glyphs[0]);
+        let second = bitmap(&image, &row.glyphs[1]);
+        assert_ne!(first, isolated, "the first ب takes its initial form, not the isolated one");
+        assert_ne!(second, isolated, "the second ب takes its final form, not the isolated one");
+        assert_ne!(first, second, "the joined letters take different contextual forms");
+
+        let full = "مرحبا بكم في العالم";
+        let g = name_galley(ui.painter(), full, regular(11.0), Color32::WHITE, 44.0);
+        assert!(g.elided);
+        assert_eq!(g.text(), full);
+        let row = &g.rows[0].row;
+        assert!(row.rtl_paragraph);
+        let kept = row.text();
+        assert!(kept.ends_with('…'), "{kept:?}");
+        assert!(kept.chars().count() > 1, "the fixture must retain text before its ellipsis");
+        assert!(full.starts_with(kept.trim_end_matches('…')), "{kept:?}");
+        let ellipsis = row.glyphs.last().unwrap();
+        assert_eq!(ellipsis.chr, '…');
+        assert_eq!(row.visual_order().next(), Some(row.glyphs.len() - 1));
+        assert!(
+            row.glyphs[..row.glyphs.len() - 1].iter().all(|gl| ellipsis.pos.x < gl.pos.x),
+            "the ellipsis is at the visual left of a right-to-left row: {kept:?}"
+        );
+        assert!(g.size().x <= 45.0);
+    });
+}
+
+/// Asserts the shaper mirrors right-to-left parentheses in both glyph order and the atlas
+/// shapes chosen for them.
+#[test]
+fn rtl_brackets_are_mirrored_by_the_shaper() {
+    let Some(ctx) = fonts() else { return };
+    frame(&ctx, vec![], |ui| {
+        let text = "عدد (123) هنا";
+        let g = name_galley(ui.painter(), text, regular(11.0), Color32::WHITE, 500.0);
+        assert_eq!(g.text(), text);
+        let row = &g.rows[0].row;
+        assert_eq!(row.text(), text);
+        assert_eq!(row.visual_order().collect::<Vec<_>>(), vec![12, 11, 10, 9, 8, 5, 6, 7, 4, 3, 2, 1, 0]);
+        let xs: Vec<f32> = row.visual_order().map(|i| row.glyphs[i].pos.x).collect();
+        assert!(xs.is_sorted(), "{xs:?}");
+        assert_eq!(row.glyphs[4].chr, '(');
+        assert_eq!(row.glyphs[8].chr, ')');
+
+        // The atlas shape, chosen by which side of the middle row has ink: the logical "(" is
+        // drawn as ")" on the right of the number, and the logical ")" as "(" on its left.
+        let image = ui.ctx().fonts_mut(|fonts| fonts.image());
+        let shape = |glyph: &egui::epaint::text::Glyph| {
+            let [x0, y0] = glyph.uv_rect.min.map(usize::from);
+            let [x1, y1] = glyph.uv_rect.max.map(usize::from);
+            let y = usize::midpoint(y0, y1);
+            let ink: Vec<f32> = (x0..x1).map(|x| f32::from(image[(x, y)].a())).collect();
+            let weighted: f32 = ink.iter().enumerate().map(|(i, a)| i as f32 * a).sum();
+            let alpha_sum = ink.iter().sum::<f32>();
+            assert!(alpha_sum > 0.0, "the bracket's middle scanline must contain ink");
+            let centroid = weighted / alpha_sum;
+            if centroid < (ink.len() - 1) as f32 / 2.0 { '(' } else { ')' }
+        };
+        assert_eq!(shape(&row.glyphs[4]), ')');
+        assert_eq!(shape(&row.glyphs[8]), '(');
+    });
+}
+
+/// Asserts Right/Left move the caret visually while logical offsets jump, Shift extends
+/// visually, and typing inserts at the logical caret; Latin text keeps egui's own caret.
+#[test]
+fn rename_caret_moves_visually_with_logical_offsets() {
+    let Some(ctx) = fonts() else { return };
+    let id = Id::unique("rename_test");
+    let mut text = "abc אבג".to_string();
+    let run = |events: Vec<Event>, text: &mut String| {
+        frame(&ctx, events, |ui| {
+            ui.memory_mut(|m| m.request_focus(id));
+            single_line(ui, id, text, regular(11.0), 200.0);
+        });
+    };
+    run(vec![], &mut text);
+    run(vec![], &mut text);
+    set_caret(&ctx, id, 3);
+    let x3 = caret_x(&ctx, &text, cursor(&ctx, id));
+    // Right from the space enters the Hebrew word at its visual left. The cursor's logical
+    // offsets jump (4, then 6, then 5, then 4) while its painted x strictly advances.
+    run(vec![key(Key::ArrowRight, false)], &mut text);
+    assert_eq!(caret(&ctx, id).0, 4);
+    let x4 = caret_x(&ctx, &text, cursor(&ctx, id));
+    assert!(x4 > x3, "right moves on screen: {x3} -> {x4}");
+    run(vec![key(Key::ArrowRight, false)], &mut text);
+    assert_eq!(caret(&ctx, id).0, 6);
+    let x6 = caret_x(&ctx, &text, cursor(&ctx, id));
+    assert!(x6 > x4, "right moves on screen: {x4} -> {x6}");
+    // Shift extends from where the caret was; the selection is a logical range (5..6) whose
+    // two ends are painted on the screen in that order.
+    run(vec![key(Key::ArrowRight, true)], &mut text);
+    assert_eq!(caret(&ctx, id), (5, 6));
+    let selection = egui::TextEdit::load_state(&ctx, id).unwrap().cursor.char_range().unwrap();
+    assert!(caret_x(&ctx, &text, selection.primary) > caret_x(&ctx, &text, selection.secondary));
+    // Without Shift a selection collapses to its side on screen.
+    run(vec![key(Key::ArrowLeft, false)], &mut text);
+    assert_eq!(caret(&ctx, id), (6, 6));
+    run(vec![key(Key::ArrowLeft, false), key(Key::ArrowLeft, false)], &mut text);
+    assert_eq!(caret(&ctx, id).0, 3);
+    // Typing still goes in at the logical caret.
+    run(vec![Event::Text("ד".into())], &mut text);
+    assert_eq!(text, "abcד אבג");
+    // Plain left-to-right text keeps egui's own caret.
+    let mut latin = "Frame".to_string();
+    let lid = Id::unique("latin");
+    let mut run = |events: Vec<Event>| {
+        frame(&ctx, events, |ui| {
+            ui.memory_mut(|m| m.request_focus(lid));
+            single_line(ui, lid, &mut latin, regular(11.0), 200.0);
+        });
+    };
+    run(vec![]);
+    run(vec![]);
+    set_caret(&ctx, lid, 1);
+    run(vec![key(Key::ArrowRight, false)]);
+    assert_eq!(caret(&ctx, lid).0, 2);
+}
+
+/// Asserts clicks map right-to-left visual positions to logical carets, so a click at the
+/// visual left end leaves the caret at the logical end and typing appends there.
+#[test]
+fn clicks_place_the_logical_caret_by_what_is_shown() {
+    let Some(ctx) = fonts() else { return };
+    let id = Id::unique("click_test");
+    let mut text = "שלום".to_string();
+    let mut rect = Rect::NOTHING;
+    let run = |events: Vec<Event>, text: &mut String, rect: &mut Rect| {
+        frame(&ctx, events, |ui| {
+            ui.memory_mut(|m| m.request_focus(id));
+            *rect = single_line(ui, id, text, regular(11.0), 200.0).rect;
+        });
+    };
+    run(vec![], &mut text, &mut rect);
+    run(vec![], &mut text, &mut rect);
+    // The text's right end is its logical start.
+    let galley = ctx.fonts_mut(|f| f.layout_no_wrap("שלום".into(), regular(11.0), Color32::WHITE));
+    let row = &galley.rows[0].row;
+    assert!(row.rtl_paragraph);
+    assert_eq!(row.visual_order().collect::<Vec<_>>(), vec![3, 2, 1, 0]);
+    let right = Pos2::new(rect.min.x + galley.size().x - 1.0, rect.center().y);
+    let press = |p: Pos2, pressed: bool| Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Modifiers::NONE };
+    run(vec![Event::PointerMoved(right), press(right, true)], &mut text, &mut rect);
+    run(vec![press(right, false)], &mut text, &mut rect);
+    assert_eq!(caret(&ctx, id).0, 0);
+    let left = Pos2::new(rect.min.x + 1.0, rect.center().y);
+    run(vec![Event::PointerMoved(left), press(left, true)], &mut text, &mut rect);
+    run(vec![press(left, false)], &mut text, &mut rect);
+    assert_eq!(caret(&ctx, id).0, 4);
+    // A click at the visual left end leaves the logical caret at the end of the word, so typing
+    // appends to the logical text rather than to the shown (reversed) string.
+    run(vec![Event::Text("א".into())], &mut text, &mut rect);
+    assert_eq!(text, "שלוםא");
+}
diff --git a/crates/ui-egui/src/board_picker_tests.rs b/crates/ui-egui/src/board_picker_tests.rs
new file mode 100644
index 00000000..c5860525
--- /dev/null
+++ b/crates/ui-egui/src/board_picker_tests.rs
@@ -0,0 +1,83 @@
+//! Boards in the UI: the toolbar's templates picker (pictures, a template or a table placed with
+//! a click) and the table's part of the bar over the selection.
+
+use egui::{Event, Modifiers, PointerButton, Pos2, pos2};
+use figcraft_doc::{BoardItem, NodeId};
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+use crate::live_tests::{flat, has_text, text_center};
+
+fn click(u: &mut Ui, p: Pos2) {
+    for pressed in [true, false] {
+        u.frame(vec![Event::PointerMoved(p), Event::PointerButton { pos: p, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE }]);
+    }
+    u.frame(vec![]);
+}
+
+fn board() -> Ui {
+    let mut s = Session::new();
+    s.execute("file.newBoard", &json!({})).unwrap();
+    let mut u = Ui::new(s);
+    u.frame(vec![]);
+    u
+}
+
+/// The templates button: left of the Design panel's button at the board toolbar's right end.
+fn templates_button(u: &Ui) -> Pos2 {
+    let p = crate::toolbar::pill_rect(u.app.canvas.rect, crate::toolbar::bar_width(&u.app));
+    pos2(p.max.x - 8.0 - 32.0 - 4.0 - 16.0, p.center().y)
+}
+
+fn count(u: &Ui, f: impl Fn(&BoardItem) -> bool) -> usize {
+    u.app.session.doc().unwrap().nodes().filter(|n| n.board.as_ref().is_some_and(&f)).count()
+}
+
+#[test]
+fn the_templates_picker_places_a_template_or_a_table() {
+    let mut u = board();
+    let at = templates_button(&u);
+    click(&mut u, at);
+    assert_eq!(u.app.ui.tool_flyout, Some("board_templates"));
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    for name in ["Retrospective", "Brainstorm", "Weekly planner", "Flow chart", "Kanban board", "Table"] {
+        assert!(has_text(&shapes, name), "{name} in the picker");
+    }
+    let pictures = shapes.iter().filter(|s| matches!(s, egui::Shape::Mesh(m) if m.texture_id != egui::TextureId::default())).count();
+    assert!(pictures >= 5, "each template has its picture ({pictures})");
+    click(&mut u, text_center(&shapes, "Flow chart"));
+    assert_eq!(u.app.ui.tool_flyout, None, "a pick closes the picker");
+    assert_eq!(count(&u, |b| matches!(b, BoardItem::Connector(_))), 6);
+    assert!(!u.app.session.selection().is_empty(), "what it placed is selected");
+    // Again, for a table.
+    click(&mut u, at);
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    click(&mut u, text_center(&shapes, "Table"));
+    assert_eq!(count(&u, |b| *b == BoardItem::Table), 1);
+    // Escape closes it.
+    click(&mut u, at);
+    u.frame(vec![Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE }]);
+    assert_eq!(u.app.ui.tool_flyout, None);
+}
+
+#[test]
+fn the_selection_bar_adds_and_removes_a_tables_rows_and_columns() {
+    let mut u = board();
+    let t = NodeId(u.app.session.execute("board.table", &json!({"x": 0, "y": 0, "rows": 2, "columns": 2})).unwrap()["id"].as_u64().unwrap());
+    u.frame(vec![]);
+    u.frame(vec![]);
+    let size = |u: &Ui| {
+        let doc = u.app.session.doc().unwrap();
+        let n = doc.node(t).unwrap();
+        let rows: Vec<_> = n.children.iter().filter(|c| !doc.node(**c).unwrap().child_layout.absolute).collect();
+        (rows.len(), doc.node(*rows[0]).unwrap().children.len())
+    };
+    // Add row, remove row, add column, remove column: 30 apart, 8 in.
+    for (i, want) in [(0, (3, 2)), (1, (2, 2)), (2, (2, 3)), (3, (2, 2))] {
+        // The bar follows the table's middle as it widens.
+        let r = u.ctx.memory(|m| m.area_rect(egui::Id::unique("board_bar"))).expect("the bar shows for a table");
+        click(&mut u, pos2(r.min.x + 8.0 + i as f32 * 30.0 + 14.0, r.center().y));
+        assert_eq!(size(&u), want, "cell {i}");
+    }
+}
diff --git a/crates/ui-egui/src/board_ui_tests.rs b/crates/ui-egui/src/board_ui_tests.rs
new file mode 100644
index 00000000..e8592467
--- /dev/null
+++ b/crates/ui-egui/src/board_ui_tests.rs
@@ -0,0 +1,273 @@
+//! Boards in the UI, drawn headless: the board toolbar (its flyouts pick a tool with a colour, a
+//! shape or a stamp; the Design panel's button), the right panel hidden until asked for, the bar
+//! over the selection (colours, shapes, text sizes, connector style, also with layers that aren't
+//! board objects selected, never on a file you can only view), the home screen's New board card,
+//! and the marks design files and boards get.
+
+use egui::{Event, Modifiers, PointerButton, Pos2, Rect, pos2};
+use figcraft_doc::{BoardItem, BoardShape, FileKind, NodeId, Routing, Stamp, StrokeCap, board_color};
+use figcraft_engine::Session;
+use figcraft_engine::tools::ToolId;
+use serde_json::{Value, json};
+
+use crate::layers_drag_tests::Ui;
+use crate::live_tests::{flat, has_text, text_center};
+
+fn click(u: &mut Ui, p: Pos2) {
+    for pressed in [true, false] {
+        u.frame(vec![Event::PointerMoved(p), Event::PointerButton { pos: p, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE }]);
+    }
+    u.frame(vec![]);
+}
+
+fn id(v: &Value) -> NodeId {
+    NodeId(v["id"].as_u64().unwrap())
+}
+
+/// The app on a new board.
+fn board() -> Ui {
+    let mut s = Session::new();
+    s.execute("file.newBoard", &json!({})).unwrap();
+    let mut u = Ui::new(s);
+    u.frame(vec![]);
+    u
+}
+
+/// The board toolbar pill on screen.
+fn pill(u: &Ui) -> Rect {
+    crate::toolbar::pill_rect(u.app.canvas.rect, crate::toolbar::bar_width(&u.app))
+}
+
+/// The left edge of board toolbar group `i` (button 32 wide, a 16-wide caret 2 after it on the
+/// groups with flyouts, 4 between): move, ink, sticky, shapes, connector, text, section, stamp,
+/// comment.
+fn group_x(u: &Ui, i: usize) -> f32 {
+    const WIDTHS: [f32; 9] = [54.0, 54.0, 54.0, 54.0, 36.0, 36.0, 36.0, 54.0, 36.0];
+    pill(u).min.x + 8.0 + WIDTHS.iter().take(i).sum::<f32>()
+}
+
+/// Open group `i`'s flyout from its caret and click option `n` in it (a row of 32-wide cells, 4
+/// apart, 8 in from the flyout's edge, the flyout's bottom 8 above the pill).
+fn pick_option(u: &mut Ui, i: usize, n: usize) {
+    let caret = pos2(group_x(u, i) + 42.0, pill(u).center().y);
+    click(u, caret);
+    let at = pos2(group_x(u, i) + 8.0 + n as f32 * 36.0 + 16.0, pill(u).min.y - 8.0 - 24.0);
+    click(u, at);
+}
+
+/// Whether the bar over the selection showed in the last frame.
+fn bar_shown(ctx: &egui::Context) -> bool {
+    ctx.memory(|m| m.areas().visible_last_frame(&egui::LayerId::new(egui::Order::Middle, egui::Id::unique("board_bar"))))
+}
+
+/// The bar over the selection, when it shows.
+fn bar(u: &Ui) -> Option<Rect> {
+    bar_shown(&u.ctx).then(|| u.ctx.memory(|m| m.area_rect(egui::Id::unique("board_bar")))).flatten()
+}
+
+#[test]
+fn the_board_toolbar_picks_tools_with_their_colours_shapes_and_stamps() {
+    let mut u = board();
+    pick_option(&mut u, 2, 5);
+    assert_eq!(u.app.session.tool.tool, ToolId::Sticky);
+    assert_eq!(Some(u.app.session.tool.board.sticky), board_color("blue"));
+    pick_option(&mut u, 3, 3);
+    assert_eq!((u.app.session.tool.tool, u.app.session.tool.board.shape), (ToolId::BoardShape, BoardShape::Diamond));
+    pick_option(&mut u, 7, 1);
+    assert_eq!((u.app.session.tool.tool, u.app.session.tool.board.stamp), (ToolId::Stamp, Stamp::Heart));
+    // The connector's button picks it; the ink group's flyout lists the marker's siblings.
+    let connector = pos2(group_x(&u, 4) + 16.0, pill(&u).center().y);
+    click(&mut u, connector);
+    assert_eq!(u.app.session.tool.tool, ToolId::Connector);
+    let ink_caret = pos2(group_x(&u, 1) + 42.0, pill(&u).center().y);
+    click(&mut u, ink_caret);
+    assert_eq!(u.app.ui.tool_flyout, Some("ink"));
+}
+
+#[test]
+fn a_boards_design_panel_opens_when_asked_for_and_prototyping_is_not_offered() {
+    let mut u = board();
+    u.app.ui.right_tab = crate::RightTab::Prototype;
+    u.frame(vec![]);
+    assert_eq!(u.app.ui.right_tab, crate::RightTab::Design, "boards have no Prototype tab");
+    let canvas = u.app.canvas.rect;
+    assert!(canvas.max.x > 1400.0, "no right panel: the canvas reaches the window's edge ({canvas:?})");
+    // The Design panel's button at the pill's right end.
+    let p = pill(&u);
+    click(&mut u, pos2(p.max.x - 8.0 - 16.0, p.center().y));
+    assert!(u.app.ui.board_panel);
+    u.frame(vec![]);
+    assert!(u.app.canvas.rect.max.x < canvas.max.x - 200.0, "the panel takes its room");
+    // On a design file the panel shows whatever was asked for a board.
+    u.app.run("file.new", json!({}));
+    u.app.run("view.design", json!({}));
+    u.frame(vec![]);
+    assert!(u.app.ui.board_panel, "view.design on a design file doesn't toggle the board's panel");
+}
+
+#[test]
+fn the_selection_bar_recolours_reshapes_and_restyles() {
+    let mut u = board();
+    let shape = id(&u.app.session.execute("board.shape", &json!({"x": 0, "y": 0, "shape": "rectangle", "text": "Hi"})).unwrap());
+    let section = id(&u.app.session.execute("node.create", &json!({"type": "section", "x": 0, "y": 400, "width": 200, "height": 200})).unwrap());
+    // A section selected with it (no board object) leaves the bar for the shape.
+    u.app.session.execute("select.set", &json!({"ids": [shape, section]})).unwrap();
+    u.frame(vec![]);
+    u.frame(vec![]);
+    let r = bar(&u).expect("the bar shows");
+    let cy = r.center().y;
+    // Swatch 5 (blue): 8 in, 24 apart, 20 wide.
+    click(&mut u, pos2(r.min.x + 8.0 + 5.0 * 24.0 + 10.0, cy));
+    let outline = u.app.session.doc().unwrap().node(shape).unwrap().children[0];
+    assert_eq!(u.app.session.doc().unwrap().node(outline).unwrap().fills[0].solid_color(), board_color("blue"));
+    // Text size L: after the colours (208) and the shape menu (52), the third of the 30-wide cells.
+    let r = bar(&u).unwrap();
+    click(&mut u, pos2(r.min.x + 208.0 + 52.0 + 2.0 * 30.0 + 14.0, cy));
+    let text = figcraft_engine::board::text_of(u.app.session.doc().unwrap(), shape).unwrap();
+    assert_eq!(u.app.session.doc().unwrap().node(text).unwrap().kind.text().unwrap().style.font_size, 24.0);
+    // The shape menu lists the outlines.
+    let r = bar(&u).unwrap();
+    click(&mut u, pos2(r.min.x + 208.0 + 20.0, cy));
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    click(&mut u, text_center(&shapes, "Ellipse"));
+    assert_eq!(u.app.session.doc().unwrap().node(shape).unwrap().board, Some(BoardItem::Shape { shape: BoardShape::Ellipse }));
+}
+
+#[test]
+fn the_selection_bar_sets_a_connectors_style_and_offers_nothing_for_a_stamp() {
+    let mut u = board();
+    let a = u.app.session.execute("board.sticky", &json!({"x": 0, "y": 0})).unwrap()["id"].clone();
+    let b = u.app.session.execute("board.sticky", &json!({"x": 400, "y": 300})).unwrap()["id"].clone();
+    let c = id(&u.app.session.execute("board.connector", &json!({"from": a, "to": b, "style": "elbow"})).unwrap());
+    u.frame(vec![]);
+    u.frame(vec![]);
+    let r = bar(&u).expect("the bar shows for a connector");
+    let cy = r.center().y;
+    // After the colours (208): Straight, Elbow, Curved, the end's arrow, 30 apart.
+    click(&mut u, pos2(r.min.x + 208.0 + 14.0, cy));
+    let routing = |u: &Ui| match &u.app.session.doc().unwrap().node(c).unwrap().board {
+        Some(BoardItem::Connector(k)) => k.routing,
+        _ => panic!("not a connector"),
+    };
+    assert_eq!(routing(&u), Routing::Straight);
+    let r = bar(&u).unwrap();
+    click(&mut u, pos2(r.min.x + 208.0 + 60.0 + 14.0, cy));
+    assert_eq!(routing(&u), Routing::Curved);
+    let r = bar(&u).unwrap();
+    click(&mut u, pos2(r.min.x + 208.0 + 90.0 + 14.0, cy));
+    assert_eq!(u.app.session.doc().unwrap().node(c).unwrap().stroke.cap_end, StrokeCap::None);
+    // Nothing is offered while a stamp alone is selected: it takes neither colour nor style.
+    let st = id(&u.app.session.execute("board.stamp", &json!({"x": 900, "y": 0, "stamp": "star"})).unwrap());
+    u.app.session.execute("select.set", &json!({"ids": [st]})).unwrap();
+    u.frame(vec![]);
+    u.frame(vec![]);
+    assert!(bar(&u).is_none());
+}
+
+#[test]
+fn a_board_you_only_view_offers_no_bar() {
+    let (mut h, _) = crate::live_tests::Harness::new();
+    h.app.session.execute("file.newBoard", &json!({})).unwrap();
+    let st = id(&h.app.session.execute("board.sticky", &json!({"x": 0, "y": 0})).unwrap());
+    h.frames(2);
+    assert!(bar_shown(&h.ctx), "the bar shows for the selected sticky");
+    crate::live_server_tests::joined(&mut h, figcraft_engine::live::Access::View);
+    h.app.session.execute("select.set", &json!({"ids": [st]})).unwrap();
+    h.frames(2);
+    assert!(h.app.session.active_read_only().is_some());
+    assert!(!bar_shown(&h.ctx), "view only: nothing to edit");
+}
+
+#[test]
+fn the_home_screen_makes_boards_and_marks_files_by_kind() {
+    let mut u = Ui::new(Session::empty());
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    click(&mut u, text_center(&shapes, "New board"));
+    assert_eq!(u.app.session.doc().unwrap().kind, FileKind::Board);
+    assert_eq!(crate::icons::file_mark(FileKind::Board), crate::icons::Icon::Board);
+    assert_eq!(crate::icons::file_mark(FileKind::Design), crate::icons::Icon::PenNib);
+}
+
+#[test]
+fn a_stamp_shows_who_placed_it_on_hover() {
+    let mut s = Session::new();
+    s.prefs.user_name = "Grace".into();
+    s.execute("file.newBoard", &json!({})).unwrap();
+    s.execute("board.stamp", &json!({"x": 100, "y": 100, "stamp": "check"})).unwrap();
+    s.execute("select.none", &json!({})).unwrap();
+    let mut u = Ui::new(s);
+    let at = u.app.to_screen(100.0, 100.0);
+    u.frame(vec![Event::PointerMoved(at)]);
+    u.frame(vec![Event::PointerMoved(at + egui::vec2(1.0, 0.0))]);
+    let shapes = flat(&u.frame_output(vec![Event::PointerMoved(at + egui::vec2(1.0, 1.0))]).shapes);
+    assert!(has_text(&shapes, "Grace"), "the placer's name beside the pointer");
+}
+
+#[test]
+fn the_next_sticky_from_the_keyboard_goes_on_typing() {
+    let mut u = board();
+    u.app.run("board.sticky", json!({"x": 0, "y": 0}));
+    // Shift+Cmd/Ctrl+Enter runs it from the menu layer, asking to type in the new one.
+    crate::menus::invoke(&mut u.app, "board.nextSticky");
+    let doc = u.app.session.doc().unwrap();
+    let te = u.app.session.ds().unwrap().text_edit.clone().expect("typing in the new sticky");
+    let owner = figcraft_engine::board::owner_of_text(doc, te.id).unwrap();
+    assert_eq!(doc.node(owner).unwrap().transform.translation().x, 224.0);
+}
+
+#[test]
+fn a_board_page_has_a_dot_grid_under_its_layers_thinned_out_zoomed_out() {
+    let mut u = board();
+    let sticky = id(&u.app.session.execute("board.sticky", &json!({"x": 0, "y": 0})).unwrap());
+    u.app.session.execute("view.zoom100", &json!({})).unwrap();
+    u.frame(vec![]);
+    let t = crate::theme::Tokens::get(&u.ctx);
+    let page = figcraft_doc::BOARD_PAGE;
+    let bg = egui::Color32::from_rgb((page.r * 255.0).round() as u8, (page.g * 255.0).round() as u8, (page.b * 255.0).round() as u8);
+    let dots = crate::board_bar::dots(&u.app, bg, &t).expect("a board has dots");
+    assert!(dots.color.a > 0.0 && dots.color.r < 0.5, "dark dots on the light page: {:?}", dots.color);
+    // The canvas render draws them on the page, and the layers over them.
+    let ds = u.app.session.ds().unwrap();
+    let view = figcraft_render::View { origin: (-60.0, -60.0), scale: 1.0, width: 400, height: 400 };
+    let opts = figcraft_render::Options { dots: Some(dots), ..Default::default() };
+    let pix = figcraft_render::render_view(&ds.doc, ds.page, &view, &opts).unwrap();
+    let at = |x: f64, y: f64| {
+        let p = pix.pixel((x + 60.0) as u32, (y + 60.0) as u32).unwrap();
+        [p.red(), p.green(), p.blue()]
+    };
+    let plain = [bg.r(), bg.g(), bg.b()];
+    let step = dots.step;
+    assert_ne!(at(-2.0 * step, -2.0 * step), plain, "a dot on the page");
+    assert_eq!(at(-2.0 * step + step / 2.0, -2.0 * step), plain, "between the dots");
+    let fill = u.app.session.doc().unwrap().node(sticky).unwrap().fills[0].solid_color().unwrap().to_rgba8();
+    assert_eq!(at(2.0 * step, 2.0 * step), [fill[0], fill[1], fill[2]], "the sticky covers the dot under it");
+    // Zoomed out, the dots space out: every second, fourth… stays, the next to go fading.
+    use crate::board_bar::dot_spacing;
+    assert_eq!(dot_spacing(1.0), Some((24.0, ((24.0 - 14.0) / 14.0) as f32)));
+    assert_eq!(dot_spacing(0.25).map(|d| d.0), Some(96.0));
+    assert_eq!(dot_spacing(4.0), Some((24.0, 1.0)));
+    for z in [1e-300, 1e-9, 0.01, 0.37, 1.0, 64.0, 1e300] {
+        let (step, fade) = dot_spacing(z).unwrap();
+        assert!(step * z >= 14.0 && step * z < 28.0 || step == 24.0, "{z}: {step}");
+        assert!((0.0..=1.0).contains(&fade));
+    }
+    assert_eq!(dot_spacing(0.0), None);
+    assert_eq!(dot_spacing(f64::NAN), None);
+    // Design files have none.
+    let d = Ui::new(Session::new());
+    assert!(crate::board_bar::dots(&d.app, bg, &t).is_none());
+}
+
+#[test]
+fn a_selected_connector_shows_its_ends_as_handles() {
+    let mut u = board();
+    let a = u.app.session.execute("board.sticky", &json!({"x": 0, "y": 0})).unwrap()["id"].clone();
+    let b = u.app.session.execute("board.sticky", &json!({"x": 400, "y": 0})).unwrap()["id"].clone();
+    u.app.session.execute("board.connector", &json!({"from": a, "to": b, "style": "straight"})).unwrap();
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    let ends = [u.app.to_screen(200.0, 100.0), u.app.to_screen(400.0, 100.0)];
+    for end in ends {
+        let ring = shapes.iter().any(|s| matches!(s, egui::Shape::Circle(c) if (c.center - end).length() < 0.5 && c.radius == 5.0));
+        assert!(ring, "a handle at {end:?}");
+    }
+}
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs
index 82e89798..faf10528 100644
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@ -12,7 +12,38 @@ use serde_json::json;
 use crate::FigApp;
 use crate::i18n::{tr, trf, trn};
 use crate::render_worker::{Done, Job, Worker};
-use crate::theme::{ACCENT, COMPONENT, Tokens, doc_c32, regular, semibold};
+use crate::theme::{COMPONENT, Tokens, doc_c32, regular, semibold};
+
+mod builder;
+mod input;
+mod outline;
+mod overlays;
+mod render;
+mod rulers;
+
+#[cfg(test)]
+use builder::clean_poly;
+use input::input;
+pub use input::open_context_menu;
+pub(crate) use outline::{TextOnScreen, node_quad};
+use overlays::{accent, overlays};
+use render::{JobKey, request_render, shows};
+pub use rulers::fmt;
+pub(crate) use rulers::{status_badge, status_label};
+pub mod board_bar;
+pub mod board_facilitate;
+pub mod comments;
+pub mod cursors;
+pub mod frame_labels;
+pub mod frame_stats;
+pub mod guides;
+pub mod handles;
+pub mod live_text;
+pub mod measure_overlay;
+pub mod proto_canvas;
+pub mod render_worker;
+pub(crate) mod selection_spacing;
+pub mod widget_bar;
 
 pub struct CanvasState {
     pub rect: Rect,
@@ -23,6 +54,8 @@ pub struct CanvasState {
     tex_of: Option<(u64, NodeId)>,
     /// The texture is a coarse preview (see [`crate::render_worker`]).
     pub tex_coarse: bool,
+    /// The request the texture answers ([`crate::render_worker::Done::seq`]).
+    tex_seq: u64,
     submitted: Option<JobKey>,
     /// The view of the last render asked for.
     want_view: Option<figcraft_render::View>,
@@ -58,6 +91,7 @@ impl Default for CanvasState {
             tex_view: None,
             tex_of: None,
             tex_coarse: false,
+            tex_seq: 0,
             submitted: None,
             want_view: None,
             render_work: None,
@@ -114,23 +148,6 @@ impl FigApp {
     }
 }
 
-#[derive(Clone, PartialEq)]
-struct JobKey {
-    doc: usize,
-    page: NodeId,
-    origin: (i64, i64),
-    scale: i64,
-    size: (u32, u32),
-    outline: bool,
-    outline_extras: figcraft_render::Outline,
-    outlined: Vec<NodeId>,
-    skip: Vec<NodeId>,
-    solo: Option<NodeId>,
-    /// Text lays out anew when fonts arrive (system fonts load in the background).
-    fonts: u64,
-    proof: bool,
-}
-
 impl FigApp {
     /// Page → screen (logical points).
     pub fn to_screen(&self, x: f64, y: f64) -> Pos2 {
@@ -163,12 +180,16 @@ fn pointer_event(app: &FigApp, kind: PointerKind, pos: Pos2, m: &egui::Modifiers
     }
 }
 
+/// Run one canvas pass: update the viewport size and first-fit zoom; handle pointer/key input
+/// and accessibility; draw the drop overlay, guides, live pointer and preedit; request/poll
+/// renders and upload the texture; draw the page background and last texture; then draw overlays,
+/// labels, handles, comments, versions/branch/dev/live UI and the cursor.
 pub fn show(app: &mut FigApp, ui: &mut Ui, worker: &mut Worker) {
     let rect = ui.max_rect();
     app.canvas.rect = rect;
     let ctx = ui.ctx().clone();
     let ppp = ctx.pixels_per_point();
-    let resp = ui.interact(rect, ui.id().with("canvas"), Sense::click_and_drag());
+    let resp = ui.interact(rect, ui.scope_id().with("canvas"), Sense::click_and_drag());
     let key_box = app.ui.key_box;
     crate::a11y::canvas(&mut app.ui.nav, &resp, || key_box.map_or_else(|| describe(&app.session), describe_box));
     if let Ok(ds) = app.session.ds_mut()
@@ -183,13 +204,35 @@ pub fn show(app: &mut FigApp, ui: &mut Ui, worker: &mut Worker) {
         }
     }
     let own_cursor = input(app, ui, &resp);
-    crate::drop_overlay(&ctx, ctx.content_rect(), tr("Drop to import"));
+    // A browser names no dragged file until the drop, so documents there still say "import", or
+    // in Dev Mode show the Dev Mode note, though they open when dropped.
+    let documents = ctx.input(|i| i.raw.hovered_files.iter().all(|f| f.path.as_deref().is_some_and(crate::is_document)));
+    let label = if documents {
+        tr("Drop to open")
+    } else if app.ui.right_tab == crate::RightTab::Inspect {
+        tr("Dev Mode only inspects: switch to Design (Shift+D) to edit")
+    } else {
+        tr("Drop to import")
+    };
+    crate::drop_overlay(&ctx, ctx.content_rect(), label);
     crate::guides::end_released(&ctx);
     crate::live::track_pointer(app, &ctx);
     app.sync_preedit();
     // Retained rendering snaps the view outward and adds one pixel on each axis.
     let max_texture_side = (ctx.input(|i| i.max_texture_side).min(16_384) as u32).saturating_sub(1).max(1);
-    request_render(app, worker, ppp, max_texture_side);
+    let t = Tokens::get(&ctx);
+    // Page background (also behind a stale/partial texture).
+    let bg = app
+        .session
+        .ds()
+        .ok()
+        .and_then(|ds| match ds.doc.node(ds.page).map(|n| &n.kind) {
+            Some(NodeKind::Page { background, .. }) => Some(doc_c32(&ctx, *background)),
+            _ => None,
+        })
+        .unwrap_or(t.canvas);
+    let dots = crate::board_bar::dots(app, bg, &t);
+    request_render(app, worker, ppp, max_texture_side, dots);
     // Every finished render is shown, even when a newer one is already on its way: renders finish
     // in order, and an edit every frame (a drag) would otherwise never show until it stopped.
     let shown = app.session.ds().map(|ds| (ds.uid, ds.page)).ok();
@@ -219,39 +262,38 @@ pub fn show(app: &mut FigApp, ui: &mut Ui, worker: &mut Worker) {
         app.canvas.tex_view = Some(done.view);
         app.canvas.tex_of = Some((done.uid, done.page));
         app.canvas.tex_coarse = done.coarse;
+        app.canvas.tex_seq = done.seq;
     }
     let painter = ui.painter_at(rect);
-    let t = Tokens::get(&ctx);
-    // Page background (also behind a stale/partial texture).
-    let bg = app
-        .session
-        .ds()
-        .ok()
-        .and_then(|ds| match ds.doc.node(ds.page).map(|n| &n.kind) {
-            Some(NodeKind::Page { background, .. }) => Some(doc_c32(&ctx, *background)),
-            _ => None,
-        })
-        .unwrap_or(t.canvas);
     painter.rect_filled(rect, CornerRadius::ZERO, bg);
+    crate::theme::set_canvas_page(&ctx, bg);
     if let (Some(tex), Some(v), true) = (&app.canvas.texture, &app.canvas.tex_view, shown.is_some() && app.canvas.tex_of == shown) {
         // Re-project the last render onto the current view.
         let tl = app.to_screen(v.origin.0, v.origin.1);
         let zoom = app.session.ds().map(|d| d.view.zoom).unwrap_or(1.0);
-        let w = (f64::from(v.width) / v.scale * zoom) as f32;
-        let h = (f64::from(v.height) / v.scale * zoom) as f32;
-        painter.image(tex.id(), Rect::from_min_size(tl, vec2(w, h)), Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
+        let pixel_preview = app.session.ds().ok().and_then(|ds| ds.view.pixel_preview_scale()) == Some(v.scale);
+        let image_rect = presented_image_rect(tl, v, zoom, ppp, pixel_preview);
+        painter.image(tex.id(), image_rect, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
     }
+    crate::dev_mode::refresh_measurements(app);
     app.session.tool.labels = overlays(app, &painter, &t);
+    crate::frame_labels::rename_field(app, ui);
     // The zoom tool's area.
     if let (Some(start), Some(p)) = (app.canvas.zoom_drag, ctx.input(|i| i.pointer.hover_pos())) {
         let area = Rect::from_two_pos(start, p);
         if area.width() > 4.0 || area.height() > 4.0 {
-            painter.rect_filled(area, CornerRadius::ZERO, ACCENT.gamma_multiply(0.1));
-            painter.rect_stroke(area, CornerRadius::ZERO, Stroke::new(1.0, ACCENT), StrokeKind::Inside);
+            painter.rect_filled(area, CornerRadius::ZERO, accent(&painter).gamma_multiply(0.1));
+            painter.rect_stroke(area, CornerRadius::ZERO, Stroke::new(1.0, accent(&painter)), StrokeKind::Inside);
         }
     }
     crate::dev_mode::draw(app, &painter);
     crate::handles::draw(app, &painter);
+    crate::board_facilitate::badges(app, &painter);
+    crate::board_bar::stamp_author(app, &painter, ctx.input(|i| i.pointer.hover_pos()).filter(|p| rect.contains(*p)));
+    crate::board_bar::show(app, &ctx);
+    crate::board_facilitate::show(app, &ctx, rect);
+    crate::widget_bar::show(app, &ctx);
+    crate::selection_spacing::draw(app, &painter);
     crate::comments::draw(app, &painter);
     crate::live_text::draw(app, &painter);
     crate::live::draw(app, &painter, &ctx);
@@ -271,6 +313,22 @@ pub fn show(app: &mut FigApp, ui: &mut Ui, worker: &mut Worker) {
     }
 }
 
+/// The image's screen rect; align native-density renders to device pixels to avoid linear filtering
+/// blending neighbouring texels. Stale and pixel-preview renders retain their original projection.
+pub(super) fn presented_image_rect(tl: Pos2, view: &figcraft_render::View, zoom: f64, ppp: f32, pixel_preview: bool) -> Rect {
+    let w = (f64::from(view.width) / view.scale * zoom) as f32;
+    let h = (f64::from(view.height) / view.scale * zoom) as f32;
+    let native_density = !pixel_preview
+        && ppp.is_finite()
+        && ppp > 0.0
+        && zoom.is_finite()
+        && view.scale.is_finite()
+        && view.scale > 0.0
+        && (view.scale - zoom * f64::from(ppp)).abs() <= view.scale.abs().max(1.0) * 1e-9;
+    let min = if native_density { pos2((tl.x * ppp).round() / ppp, (tl.y * ppp).round() / ppp) } else { tl };
+    Rect::from_min_size(min, vec2(w, h))
+}
+
 /// What the canvas says to screen readers: the selected layer ("Rectangle 1, Rectangle, 120 by 80,
 /// selected"), how many are selected, or the page with nothing selected.
 pub fn describe(s: &figcraft_engine::Session) -> String {
@@ -301,1207 +359,8 @@ fn describe_box([x0, y0, x1, y1]: [f64; 4]) -> String {
     )
 }
 
-/// Whether a finished render goes on screen: an image of the file and page shown (`shown`), and
-/// not a coarse preview over a refined image that already shows the whole view asked for at its
-/// zoom (the same zoom elsewhere on the page is no such image).
-fn shows(c: &CanvasState, done: &Done, shown: Option<(u64, NodeId)>) -> bool {
-    if shown != Some((done.uid, done.page)) {
-        return false;
-    }
-    let refined_here = !c.tex_coarse
-        && c.tex_of == shown
-        && c.tex_view
-            .as_ref()
-            .zip(c.want_view.as_ref())
-            .is_some_and(|(have, want)| have.scale.to_bits() == want.scale.to_bits() && covers(have, want));
-    !(done.coarse && refined_here)
-}
-
-/// Whether `outer` shows all of the page that `inner` does.
-fn covers(outer: &figcraft_render::View, inner: &figcraft_render::View) -> bool {
-    let (o, i) = (outer.page_rect(), inner.page_rect());
-    // Rounding in the snapped origin, well under a device pixel.
-    let eps = 1e-6 / inner.scale.max(1e-9);
-    o.x0 <= i.x0 + eps && o.y0 <= i.y0 + eps && o.x1 >= i.x1 - eps && o.y1 >= i.y1 - eps
-}
-
-fn request_render(app: &mut FigApp, worker: &mut Worker, ppp: f32, max_texture_side: u32) {
-    let Ok(ds) = app.session.ds() else { return };
-    let rect = app.canvas.rect;
-    let (mut ox, mut oy) = ds.view.origin();
-    let (scale, visible_w, visible_h) = if let Some(k) = ds.view.pixel_preview_scale() {
-        // Pixel preview: render `k` pixels per page unit from a whole-pixel origin, shown magnified
-        // without smoothing.
-        (ox, oy) = ((ox * k).floor() / k, (oy * k).floor() / k);
-        let z = ds.view.zoom.max(1e-9) / k;
-        (k, (f64::from(rect.width()) / z).ceil() as u32 + 2, (f64::from(rect.height()) / z).ceil() as u32 + 2)
-    } else {
-        (ds.view.zoom * f64::from(ppp), (rect.width() * ppp).ceil().max(1.0) as u32, (rect.height() * ppp).ceil().max(1.0) as u32)
-    };
-    // The edited text is drawn live (an IME composition included); the caret is an overlay.
-    let doc = app.preedit_view().map(|p| p.doc.clone()).unwrap_or_else(|| ds.doc.clone());
-    let outlined = if ds.view.outlines_selection { ds.selection.clone() } else { vec![] };
-    let proof = ds.view.proof_srgb && !doc.color_profile.is_srgb();
-    let outline_extras = figcraft_render::Outline { hidden: ds.view.outline_hidden, bounds: ds.view.outline_bounds, light: false };
-    // Render beyond the visible viewport. During a pan the previous texture then still covers
-    // the screen while the worker renders newly exposed content. Request a new buffer before the
-    // visible area reaches its edge, rather than exposing an empty strip each pointer move.
-    let margin = overscan_margin(visible_w, visible_h, max_texture_side);
-    let origin = (ox, oy);
-    let visible = (visible_w, visible_h);
-    let requested = (ox - f64::from(margin) / scale, oy - f64::from(margin) / scale);
-    let size = (visible_w.saturating_add(margin * 2).min(max_texture_side), visible_h.saturating_add(margin * 2).min(max_texture_side));
-    let key = JobKey {
-        doc: Arc::as_ptr(&doc) as usize,
-        page: ds.page,
-        origin: ((requested.0 * 1000.0) as i64, (requested.1 * 1000.0) as i64),
-        scale: (scale * 10000.0) as i64,
-        size,
-        outline: ds.view.outlines,
-        outline_extras,
-        outlined: outlined.clone(),
-        skip: vec![],
-        solo: ds.focused(),
-        fonts: figcraft_text::layout_generation(),
-        proof,
-    };
-    if let Some(previous) = &app.canvas.submitted {
-        let previous_origin = (previous.origin.0 as f64 / 1000.0, previous.origin.1 as f64 / 1000.0);
-        let same_content = JobKey { origin: previous.origin, size: previous.size, ..key.clone() } == *previous;
-        let covers = cached_render_covers(previous_origin, previous.size, origin, visible, scale);
-        if same_content && covers {
-            return;
-        }
-    }
-    if app.canvas.submitted.as_ref() == Some(&key) {
-        return;
-    }
-    let job = Job {
-        doc,
-        page: ds.page,
-        view: figcraft_render::View { origin: requested, scale, width: size.0, height: size.1 },
-        outline: ds.view.outlines,
-        outline_extras,
-        outlined,
-        skip: vec![],
-        solo: key.solo,
-        proof,
-        uid: ds.uid,
-        zoom_preview: ds.view.pixel_preview_scale().is_none(),
-        at: web_time::Instant::now(),
-    };
-    app.canvas.want_view = Some(job.view.clone());
-    worker.submit(job);
-    app.canvas.submitted = Some(key);
-}
-
-/// Leave a 96-pixel reserve so the next render starts before a pan reaches a cached edge.
-fn cached_render_covers(buffer_origin: (f64, f64), buffer_size: (u32, u32), view_origin: (f64, f64), view_size: (u32, u32), scale: f64) -> bool {
-    if !scale.is_finite() || scale <= 0.0 {
-        return false;
-    }
-    let guard_x = 96.0_f64.min(f64::from(buffer_size.0.saturating_sub(view_size.0)) / 4.0) / scale;
-    let guard_y = 96.0_f64.min(f64::from(buffer_size.1.saturating_sub(view_size.1)) / 4.0) / scale;
-    view_origin.0 >= buffer_origin.0 + guard_x
-        && view_origin.1 >= buffer_origin.1 + guard_y
-        && view_origin.0 + f64::from(view_size.0) / scale <= buffer_origin.0 + f64::from(buffer_size.0) / scale - guard_x
-        && view_origin.1 + f64::from(view_size.1) / scale <= buffer_origin.1 + f64::from(buffer_size.1) / scale - guard_y
-}
-
-/// Bound the extra rendered area to about 1.6 times the visible area. A fixed large margin can
-/// multiply the pixel count several-fold on a narrow or small viewport.
-fn overscan_margin(width: u32, height: u32, max_texture_side: u32) -> u32 {
-    width.min(height).saturating_div(8).min(128).min(max_texture_side.saturating_sub(width.max(height)) / 2)
-}
+#[cfg(test)]
+mod builder_poly_tests;
 
 #[cfg(test)]
-#[test]
-fn pan_uses_cached_pixels_until_the_refill_boundary() {
-    let margin = overscan_margin(1000, 800, 16_383);
-    assert_eq!(margin, 100);
-    let buffer = (-f64::from(margin), -f64::from(margin));
-    let size = (1000 + 2 * margin, 800 + 2 * margin);
-    assert!(cached_render_covers(buffer, size, (0.0, 0.0), (1000, 800), 1.0));
-    assert!(cached_render_covers(buffer, size, (50.0, 0.0), (1000, 800), 1.0));
-    assert!(!cached_render_covers(buffer, size, (80.0, 0.0), (1000, 800), 1.0));
-    assert!(!cached_render_covers(buffer, size, (-80.0, 0.0), (1000, 800), 1.0));
-    assert!(cached_render_covers((-24.0, -24.0), (1048, 848), (10.0, 0.0), (1000, 800), 1.0));
-    assert!(!cached_render_covers((-24.0, -24.0), (1048, 848), (19.0, 0.0), (1000, 800), 1.0));
-}
-
-#[cfg(test)]
-#[test]
-fn overscan_stays_within_texture_and_pixel_budget() {
-    for (width, height, limit) in [(1000, 800, 16_383), (390, 844, 16_383), (2560, 1440, 16_383), (1000, 800, 1060)] {
-        let margin = overscan_margin(width, height, limit);
-        assert!(width + 2 * margin <= limit || width > limit);
-        assert!(height + 2 * margin <= limit || height > limit);
-        let rendered = u64::from(width + 2 * margin) * u64::from(height + 2 * margin);
-        let visible = u64::from(width) * u64::from(height);
-        assert!(rendered * 5 <= visible * 8); // At most 1.6× the visible pixels.
-    }
-}
-
-/// The zoom tool while Z is held (Alt: zoom out): a click zooms a step about the pointer, a drag
-/// zooms to the dragged area. Takes the pointer from the other tools while it's active.
-fn zoom_tool(app: &mut FigApp, ui: &Ui, resp: &egui::Response, pos: Pos2, mods: egui::Modifiers, typing: bool) -> bool {
-    let held = !typing && !mods.command && ui.input(|i| i.key_down(egui::Key::Z));
-    app.canvas.zoom_tool = held.then_some(mods.alt);
-    let Some(start) = app.canvas.zoom_drag.or_else(|| (held && resp.hovered() && ui.input(|i| i.pointer.primary_pressed())).then_some(pos)) else {
-        return held;
-    };
-    app.canvas.zoom_drag = Some(start);
-    let area = Rect::from_two_pos(start, pos);
-    if ui.input(|i| i.pointer.primary_down()) {
-        return true;
-    }
-    app.canvas.zoom_drag = None;
-    let (a, b) = (app.to_page(area.min), app.to_page(area.max));
-    let params = if area.width() > 4.0 && area.height() > 4.0 {
-        json!({"x": a.x, "y": a.y, "width": b.x - a.x, "height": b.y - a.y})
-    } else {
-        let p = app.to_page(pos);
-        json!({"x": p.x, "y": p.y, "out": mods.alt})
-    };
-    app.run("view.zoomAt", params);
-    true
-}
-
-/// The pointer and keys on the canvas. False when something on it with a cursor of its own has
-/// the pointer (a comment pin, a ruler guide, a gradient or padding handle): the tool's cursor
-/// then doesn't show.
-fn input(app: &mut FigApp, ui: &mut Ui, resp: &egui::Response) -> bool {
-    if crate::proto_canvas::input(app, ui, resp) {
-        return true;
-    }
-    let ctx = ui.ctx().clone();
-    let (mods, scroll, zoom_delta, hover_pos, space) =
-        ctx.input(|i| (i.modifiers, i.smooth_scroll_delta, i.zoom_delta(), i.pointer.hover_pos(), i.key_down(egui::Key::Space)));
-    let editing_text = app.session.ds().map(|d| d.text_edit.is_some()).unwrap_or(false);
-    let typing_elsewhere = crate::a11y::field_focused(&ctx);
-    app.canvas.space_pan = space && !editing_text && !typing_elsewhere;
-    // Dropped files import onto the canvas, behind a card while they do ([`crate::pending_open`]).
-    let dropped = ctx.input(|i| i.raw.dropped_files.clone());
-    for f in dropped {
-        let path = f.path().to_path_buf();
-        let pt = hover_pos.map(|h| app.to_page(h)).unwrap_or_default();
-        let name = path.file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| "dropped.png".into());
-        let params = if path.exists() {
-            json!({"path": path.to_string_lossy(), "x": pt.x, "y": pt.y})
-        } else if let Some(bytes) = crate::dropped_bytes(&f) {
-            use base64::Engine as _;
-            let b64 = base64::engine::general_purpose::STANDARD.encode(&bytes);
-            json!({"data": b64, "name": name, "x": pt.x, "y": pt.y})
-        } else {
-            continue;
-        };
-        let Some(target) =
-            app.session.ds().ok().map(|doc| crate::pending_open::ImportTarget { uid: doc.uid, page: doc.page, name: doc.doc.name.clone() })
-        else {
-            continue;
-        };
-        app.ui.pending_opens.push(crate::pending_open::PendingOpen { label: name, params, command: "file.import", target: Some(target) });
-    }
-    let Some(pos) = hover_pos.filter(|p| app.canvas.rect.contains(*p)) else {
-        // A drag released off the canvas, or off the window, ends where the pointer was last seen.
-        if app.canvas.dragging && !ctx.input(|i| i.pointer.primary_down()) {
-            app.canvas.dragging = false;
-            if let Some(at) = hover_pos.or_else(|| app.canvas.last_pointer.map(|p| app.to_screen(p.x, p.y))) {
-                send(app, PointerKind::Up, at, &mods);
-            }
-        }
-        // Leaving the canvas: nothing is hovered there any more.
-        if !app.canvas.dragging && std::mem::take(&mut app.canvas.hovering) {
-            app.session.vector_pointer_left();
-        }
-        // A pan whose button was released off the canvas is over.
-        if !ctx.input(|i| i.pointer.button_down(egui::PointerButton::Middle) || i.pointer.primary_down()) {
-            app.canvas.middle_pan = None;
-        }
-        return true;
-    };
-    // A press on the canvas gives the keyboard back to it (arrows nudge again).
-    if resp.hovered() && ctx.input(|i| i.pointer.any_pressed()) {
-        app.ui.layers_focus = false;
-        app.ui.key_box = None;
-    }
-    // Zoom (pinch, Cmd/Ctrl+scroll) about the pointer; plain scroll pans.
-    if resp.hovered() {
-        if (zoom_delta - 1.0).abs() > 1e-4 {
-            let anchor = app.to_page(pos);
-            if let Ok(ds) = app.session.ds_mut() {
-                let z = ds.view.zoom * f64::from(zoom_delta);
-                ds.view.set_zoom_at(z, (anchor.x, anchor.y));
-                ds.revision += 1;
-            }
-        } else if scroll != egui::Vec2::ZERO
-            && let Ok(ds) = app.session.ds_mut()
-        {
-            ds.view.scroll(f64::from(scroll.x), f64::from(scroll.y), mods.shift);
-            ds.revision += 1;
-        }
-    }
-    if zoom_tool(app, ui, resp, pos, mods, editing_text || typing_elsewhere) {
-        return true;
-    }
-    // Middle-button / space panning.
-    let middle_down = ctx.input(|i| i.pointer.button_down(egui::PointerButton::Middle));
-    if (middle_down || (app.canvas.space_pan && ctx.input(|i| i.pointer.primary_down()))) && resp.hovered() || app.canvas.middle_pan.is_some() {
-        if let Ok(ds) = app.session.ds_mut() {
-            match app.canvas.middle_pan {
-                None => app.canvas.middle_pan = Some((pos, ds.view.cx, ds.view.cy)),
-                Some((p0, cx, cy)) => {
-                    let z = ds.view.zoom.max(1e-6);
-                    ds.view.cx = cx - f64::from(pos.x - p0.x) / z;
-                    ds.view.cy = cy - f64::from(pos.y - p0.y) / z;
-                    ds.revision += 1;
-                }
-            }
-        }
-        if !middle_down && !ctx.input(|i| i.pointer.primary_down()) {
-            app.canvas.middle_pan = None;
-        }
-        return true;
-    }
-    if !app.canvas.dragging && (resp.hovered() || app.ui.comments.dragging()) && crate::comments::input(app, &ctx, pos) {
-        return false;
-    }
-    if !app.canvas.dragging && resp.hovered() && crate::guides::input(app, &ctx, pos) {
-        return false;
-    }
-    if !app.canvas.dragging && resp.hovered() && crate::handles::input(app, &ctx, pos) {
-        return false;
-    }
-    if resp.secondary_clicked() {
-        open_context_menu(app, pos, mods.command);
-        return true;
-    }
-    if resp.double_clicked() {
-        let ev = pointer_event(app, PointerKind::DoubleClick, pos, &mods);
-        if let Err(e) = app.session.pointer(&ev) {
-            app.toast(e.to_string());
-        }
-        app.canvas.dragging = false;
-        return true;
-    }
-    let primary_pressed = ctx.input(|i| i.pointer.button_pressed(egui::PointerButton::Primary));
-    let primary_down = ctx.input(|i| i.pointer.primary_down());
-    let primary_released = ctx.input(|i| i.pointer.button_released(egui::PointerButton::Primary));
-    let kind = if primary_pressed && resp.hovered() {
-        app.canvas.dragging = true;
-        app.ui.context_menu = None;
-        app.ui.tool_flyout = None;
-        // Clicking the canvas takes focus from panel fields.
-        ctx.memory_mut(|m| {
-            if let Some(f) = m.focused() {
-                m.surrender_focus(f);
-            }
-        });
-        Some(PointerKind::Down)
-    } else if app.canvas.dragging && primary_released {
-        app.canvas.dragging = false;
-        Some(PointerKind::Up)
-    } else if app.canvas.dragging && primary_down {
-        Some(PointerKind::Move)
-    } else if resp.hovered() {
-        app.canvas.hovering = true;
-        Some(PointerKind::Hover)
-    } else {
-        // Something over the canvas took the pointer.
-        if std::mem::take(&mut app.canvas.hovering) {
-            app.session.vector_pointer_left();
-        }
-        None
-    };
-    // Pen pressure comes with touch events (a pen on Windows, a stylus in a browser); a mouse,
-    // macOS and Linux tablets report none and draw at the stroke weight.
-    let force = ctx.input(|i| {
-        i.events.iter().rev().find_map(|e| match e {
-            egui::Event::Touch { force: Some(f), .. } if f.is_finite() && *f > 0.0 => Some(f.clamp(0.0, 1.0)),
-            _ => None,
-        })
-    });
-    if force.is_some() {
-        app.canvas.pressure = force;
-    }
-    if let Some(k) = kind {
-        send(app, k, pos, &mods);
-    }
-    true
-}
-
-/// Pointer event `kind` at screen point `pos`, to the tools.
-fn send(app: &mut FigApp, kind: PointerKind, pos: Pos2, m: &egui::Modifiers) {
-    let ev = pointer_event(app, kind, pos, m);
-    if kind == PointerKind::Up {
-        app.canvas.pressure = None;
-    }
-    app.canvas.last_pointer = Some(Point::new(ev.x, ev.y));
-    if let Err(e) = app.session.pointer(&ev) {
-        app.toast(e.to_string());
-    }
-    app.handle_ui_requests();
-}
-
-/// Right-click at screen `pos`: select what's under the pointer (`deep`: the nested layer), then
-/// open the context menu there.
-pub fn open_context_menu(app: &mut FigApp, pos: Pos2, deep: bool) {
-    let p = app.to_page(pos);
-    if let Ok(ds) = app.session.ds() {
-        let (doc, page, sel, zoom) = (ds.doc.clone(), ds.page, ds.selection.clone(), ds.view.zoom.max(1e-6));
-        if let Some(leaf) = app.session.hit(&doc, page, p, 2.0 / zoom) {
-            let target = figcraft_doc::geometry::select_target(&doc, leaf, &sel, deep);
-            if !sel.contains(&target) {
-                app.session.set_selection(vec![target]);
-            }
-        }
-    }
-    app.ui.context_menu = Some((pos, app.session.selection()));
-}
-
-fn stroke(c: Color32, w: f32) -> Stroke {
-    Stroke::new(w, c)
-}
-
-/// A text layer's layout placed on the canvas: where carets and selected characters show (yours
-/// and other people's in a live session).
-pub(crate) struct TextOnScreen {
-    pub layout: Arc<figcraft_text::TextLayout>,
-    /// How many characters the text has.
-    pub chars: usize,
-    /// The layout's vertical offset in the box (vertical alignment).
-    dy: f64,
-    world: figcraft_geom::Affine,
-}
-
-impl TextOnScreen {
-    /// Text layer `id` of `doc` (`None`: not a text layer).
-    pub(crate) fn of(doc: &Document, id: NodeId) -> Option<Self> {
-        let n = doc.node(id)?;
-        let NodeKind::Text(t) = &n.kind else { return None };
-        let (layout, dy) = figcraft_text::layout_node(n)?;
-        Some(Self { layout, chars: t.char_count(), dy, world: doc.world_transform(id) })
-    }
-
-    /// Layout point `(x, y)` on screen (on the path, for text on a path).
-    pub(crate) fn at(&self, app: &FigApp, x: f64, y: f64) -> Pos2 {
-        let q = self.layout.warp_point(x, y);
-        let p = self.world * Point::new(q.x, q.y + self.dy);
-        app.to_screen(p.x, p.y)
-    }
-
-    /// The highlight of characters `a..b`, one screen quad per line.
-    pub(crate) fn selection(&self, app: &FigApp, a: usize, b: usize) -> Vec<[Pos2; 4]> {
-        let rects = self.layout.selection_rects(a, b);
-        rects.iter().map(|r| [self.at(app, r.x0, r.y0), self.at(app, r.x1, r.y0), self.at(app, r.x1, r.y1), self.at(app, r.x0, r.y1)]).collect()
-    }
-
-    /// The caret before character `index`: its top and bottom on screen (an empty layer: a line
-    /// of default height at its origin).
-    pub(crate) fn caret(&self, app: &FigApp, index: usize, zoom: f64) -> [Pos2; 2] {
-        let (cx, li) = self.layout.caret(index);
-        match self.layout.lines.get(li).or(self.layout.lines.last()) {
-            Some(line) => [self.at(app, cx, line.top), self.at(app, cx, line.top + line.height)],
-            None => {
-                let p = self.at(app, 0.0, 0.0);
-                [p, p + vec2(0.0, 14.0 * zoom as f32)]
-            }
-        }
-    }
-}
-
-/// A node's oriented outline in screen space.
-pub(crate) fn node_quad(app: &FigApp, doc: &Document, id: NodeId) -> Option<[Pos2; 4]> {
-    let n = doc.node(id)?;
-    let w = doc.world_transform(id);
-    let corners = [Point::new(0.0, 0.0), Point::new(n.width, 0.0), Point::new(n.width, n.height), Point::new(0.0, n.height)];
-    Some(corners.map(|c| {
-        let p = w * c;
-        app.to_screen(p.x, p.y)
-    }))
-}
-
-fn quad(painter: &egui::Painter, q: [Pos2; 4], s: Stroke) {
-    painter.add(Shape::closed_line(q.to_vec(), s));
-}
-
-/// The slots of the selected components and instances (and a slot being dropped onto): a dashed
-/// outline and the slot's name above its top-left corner, like a frame label (never over the
-/// content).
-fn slot_badges(app: &FigApp, painter: &egui::Painter, doc: &Document, sel: &[NodeId], drop: Option<NodeId>) {
-    use figcraft_engine::components::{owning_component, owning_instance, slot_name, slots_of};
-    let mut roots: Vec<NodeId> = Vec::new();
-    for id in sel {
-        let root = match doc.node(*id).map(|n| &n.kind) {
-            Some(NodeKind::Instance { .. } | NodeKind::Component { .. } | NodeKind::ComponentSet { .. }) => Some(*id),
-            _ => owning_instance(doc, *id).or_else(|| owning_component(doc, *id)),
-        };
-        if let Some(r) = root.filter(|r| !roots.contains(r)) {
-            roots.push(r);
-        }
-    }
-    let mut slots: Vec<(NodeId, String)> = roots.iter().flat_map(|r| slots_of(doc, *r)).collect();
-    if let Some(d) = drop
-        && !slots.iter().any(|(s, _)| *s == d)
-        && let Some(name) = slot_name(doc, d)
-    {
-        slots.push((d, name));
-    }
-    for (id, name) in slots {
-        let Some(q) = node_quad(app, doc, id) else { continue };
-        if !Rect::from_points(&q).intersects(app.canvas.rect) {
-            continue;
-        }
-        painter.extend(Shape::dashed_line(&[q[0], q[1], q[2], q[3], q[0]], stroke(COMPONENT, 1.0), 4.0, 3.0));
-        // The label, when the slot is wide enough on screen to hold it.
-        let galley = painter.layout_no_wrap(name, regular(10.0), COMPONENT);
-        let (w, h) = (galley.size().x + 14.0, galley.size().y.max(11.0));
-        if (q[1] - q[0]).length() < w {
-            continue;
-        }
-        let at = q[0] - vec2(0.0, h + 2.0);
-        crate::icons::paint(painter, Rect::from_min_size(pos2(at.x, at.y + (h - 11.0) / 2.0), vec2(11.0, 11.0)), crate::icons::Icon::Slot, COMPONENT);
-        painter.galley(pos2(at.x + 14.0, at.y + (h - galley.size().y) / 2.0), galley, COMPONENT);
-    }
-}
-
-/// The instance an Alt-drop of a component from the Assets panel swaps: tinted and outlined in
-/// the component colour, with a "Swap instance" label above its top-left corner.
-fn swap_highlight(app: &FigApp, painter: &egui::Painter, doc: &Document, id: NodeId) {
-    let Some(q) = node_quad(app, doc, id) else { return };
-    // White on the component colour, in both themes (like the canvas's selection labels).
-    let ink = Color32::WHITE;
-    painter.add(Shape::convex_polygon(q.to_vec(), COMPONENT.gamma_multiply(0.12), Stroke::NONE));
-    quad(painter, q, stroke(COMPONENT, 2.0));
-    let galley = painter.layout_no_wrap(tr("Swap instance").to_string(), semibold(10.0), ink);
-    let size = vec2(galley.size().x + 26.0, 18.0);
-    let top = Rect::from_points(&q).min;
-    let pill = Rect::from_min_size(pos2(top.x, top.y - size.y - 4.0), size);
-    painter.rect_filled(pill, CornerRadius::same(4), COMPONENT);
-    crate::icons::paint(
-        painter,
-        Rect::from_center_size(pos2(pill.min.x + 11.0, pill.center().y), vec2(10.0, 10.0)),
-        crate::icons::Icon::Instance,
-        ink,
-    );
-    painter.galley(pos2(pill.min.x + 20.0, pill.center().y - galley.size().y / 2.0), galley, ink);
-}
-
-/// The outline colour for a layer: purple for components, sets and instances and every layer in
-/// them, blue otherwise.
-fn outline_colour(doc: &Document, id: NodeId) -> Color32 {
-    use figcraft_engine::components::{owning_component, owning_instance};
-    let set = matches!(doc.node(id).map(|n| &n.kind), Some(NodeKind::ComponentSet { .. }));
-    if set || owning_component(doc, id).is_some() || owning_instance(doc, id).is_some() { COMPONENT } else { ACCENT }
-}
-
-/// The outline path of shapes (ellipses, vectors) for hover/selection outlines.
-fn outline_shape(app: &FigApp, doc: &Document, id: NodeId) -> Option<Vec<Vec<Pos2>>> {
-    let n = doc.node(id)?;
-    if !matches!(
-        n.kind,
-        NodeKind::Ellipse { .. } | NodeKind::Vector { .. } | NodeKind::Polygon { .. } | NodeKind::Star { .. } | NodeKind::BooleanOp { .. }
-    ) {
-        return None;
-    }
-    let (path, _) = figcraft_render::node_outline(doc, n)?;
-    let w = doc.world_transform(id);
-    let mut out = Vec::new();
-    let mut cur: Vec<Pos2> = Vec::new();
-    figcraft_geom::kurbo::flatten(path.iter(), 0.5 / app.session.ds().map(|d| d.view.zoom).unwrap_or(1.0), |el| {
-        use figcraft_geom::kurbo::PathEl::*;
-        match el {
-            MoveTo(p) => {
-                if cur.len() > 1 {
-                    out.push(std::mem::take(&mut cur));
-                }
-                cur.clear();
-                let q = w * p;
-                cur.push(app.to_screen(q.x, q.y));
-            }
-            LineTo(p) => {
-                let q = w * p;
-                cur.push(app.to_screen(q.x, q.y));
-            }
-            ClosePath => {
-                if let Some(f) = cur.first().copied() {
-                    cur.push(f);
-                }
-            }
-            _ => {}
-        }
-    });
-    if cur.len() > 1 {
-        out.push(cur);
-    }
-    Some(out)
-}
-
-/// A layer's outline on the canvas: its shape for ellipses, vectors, polygons, stars and boolean
-/// groups, its box otherwise.
-fn draw_outline(app: &FigApp, painter: &egui::Painter, doc: &Document, id: NodeId, s: Stroke) {
-    match outline_shape(app, doc, id) {
-        Some(lines) => {
-            for l in lines {
-                painter.add(Shape::line(l, s));
-            }
-        }
-        None => {
-            if let Some(q) = node_quad(app, doc, id) {
-                quad(painter, q, s);
-            }
-        }
-    }
-}
-
-/// Everything drawn over the rendered page; returns the frame labels drawn (frame, corners on the
-/// page) for the engine to hit-test.
-fn overlays(app: &FigApp, painter: &egui::Painter, t: &Tokens) -> Vec<(NodeId, [Point; 4])> {
-    let mut labels = Vec::new();
-    let Ok(ds) = app.session.ds() else { return labels };
-    let doc = ds.doc.clone();
-    let page = ds.page;
-    let sel = ds.selection.clone();
-    let zoom = ds.view.zoom;
-    let view = ds.view.clone();
-    // Pixel grid at high zoom.
-    if view.pixel_grid_shown() {
-        let r = app.canvas.rect;
-        let p0 = app.to_page(r.min);
-        let p1 = app.to_page(r.max);
-        let col = Color32::from_black_alpha(18);
-        let mut x = p0.x.floor();
-        while x <= p1.x {
-            let s = app.to_screen(x, 0.0).x;
-            painter.line_segment([pos2(s, r.min.y), pos2(s, r.max.y)], stroke(col, 1.0));
-            x += 1.0;
-        }
-        let mut y = p0.y.floor();
-        while y <= p1.y {
-            let s = app.to_screen(0.0, y).y;
-            painter.line_segment([pos2(r.min.x, s), pos2(r.max.x, s)], stroke(col, 1.0));
-            y += 1.0;
-        }
-    }
-    // Layout grids and frame labels for top-level frames (also those in sections); the focus view
-    // labels only its frame.
-    let focus = ds.focused();
-    for c in boards(&doc, page).iter().filter(|c| focus.is_none_or(|f| f == **c)) {
-        let Some(n) = doc.node(*c) else { continue };
-        let Some(b) = doc.world_bounds(*c) else { continue };
-        // Off-screen frames draw neither grids nor a label (labels sit just outside the frame).
-        let on_screen = Rect::from_two_pos(app.to_screen(b.x0, b.y0), app.to_screen(b.x1, b.y1)).expand(20.0);
-        if !on_screen.intersects(app.canvas.rect) {
-            continue;
-        }
-        if view.layout_grids && !n.grids.is_empty() && figcraft_layout::grids_shown(&doc, *c) {
-            let w = doc.world_transform(*c);
-            for g in n.grids.iter().filter(|g| g.visible) {
-                let col = doc_c32(painter.ctx(), g.color);
-                for r in figcraft_layout::grid_lines(g, n.width, n.height) {
-                    let a = w * Point::new(r.x0, r.y0);
-                    let b = w * Point::new(r.x1, r.y1);
-                    let (sa, sb) = (app.to_screen(a.x, a.y), app.to_screen(b.x, b.y));
-                    if g.kind == figcraft_doc::GridKind::Grid {
-                        painter.line_segment([sa, sb], stroke(col, 1.0));
-                    } else {
-                        painter.rect_filled(Rect::from_two_pos(sa, sb), CornerRadius::ZERO, col);
-                    }
-                }
-            }
-        }
-        // The focus view's bar names its frame.
-        let labelled = focus.is_none() && (n.kind.is_frame_like() || matches!(n.kind, NodeKind::Section { .. }));
-        if labelled && let Some(q) = crate::frame_labels::draw(app, painter, t, &doc, *c, sel.contains(c), ds.hover == Some(*c)) {
-            labels.push((*c, q.map(|p| app.to_page(p))));
-        }
-    }
-    // Prototype connections.
-    crate::proto_canvas::draw(app, painter);
-    // Hover outline (measuring outlines the measured box in red instead).
-    if let Some(h) = ds.hover
-        && !sel.contains(&h)
-        && matches!(app.session.tool.tool, ToolId::Move | ToolId::Scale)
-        && app.session.prefs.highlight_on_hover
-        && app.session.tool.overlay.measure_box.is_none()
-    {
-        draw_outline(app, painter, &doc, h, stroke(outline_colour(&doc, h), 1.5));
-    }
-    // Inside a boolean group (an operand selected or in vector edit mode): every operand's outline,
-    // so the shapes making the live result stay visible while one of them changes.
-    let operands = figcraft_engine::booleans::outlined_operands(&doc, &sel, ds.vector_edit.as_ref().map(|ve| ve.id));
-    for id in operands.iter().filter(|o| !sel.contains(o)) {
-        draw_outline(app, painter, &doc, *id, stroke(outline_colour(&doc, *id).gamma_multiply(0.6), 1.0));
-    }
-    // Mask outlines (a mask doesn't draw itself), frame outlines and slices, as the View menu shows.
-    if view.mask_outlines || view.frame_outlines || view.show_slices {
-        for id in doc.subtree(page) {
-            let Some(n) = doc.node(id).filter(|n| n.visible) else { continue };
-            if view.mask_outlines && n.is_mask {
-                draw_outline(app, painter, &doc, id, stroke(ACCENT, 1.0));
-            } else if view.frame_outlines && n.kind.is_frame_like() {
-                draw_outline(app, painter, &doc, id, stroke(t.text_secondary, 1.0));
-            } else if view.show_slices
-                && matches!(n.kind, NodeKind::Slice)
-                && let Some(q) = node_quad(app, &doc, id)
-            {
-                painter.extend(Shape::dashed_line(&[q[0], q[1], q[2], q[3], q[0]], stroke(t.text_secondary, 1.0), 4.0, 3.0));
-            }
-        }
-    }
-    // Drop target / insertion indicator.
-    let ov = &app.session.tool.overlay;
-    if let Some(d) = ov.drop_target
-        && let Some(q) = node_quad(app, &doc, d)
-    {
-        quad(painter, q, stroke(if figcraft_engine::components::is_slot(&doc, d) { COMPONENT } else { ACCENT }, 1.0));
-    }
-    slot_badges(app, painter, &doc, &sel, ov.drop_target);
-    if let Some(t) = ov.swap_target {
-        swap_highlight(app, painter, &doc, t);
-    }
-    if let Some([x0, y0, x1, y1]) = ov.insert_line {
-        painter.line_segment([app.to_screen(x0, y0), app.to_screen(x1, y1)], stroke(ACCENT, 2.0));
-    }
-    if let Some([x0, y0, x1, y1]) = ov.drop_cell {
-        let r = Rect::from_two_pos(app.to_screen(x0, y0), app.to_screen(x1, y1));
-        painter.rect_filled(r, CornerRadius::same(2), ACCENT.gamma_multiply(0.12));
-        let pts = [r.left_top(), r.right_top(), r.right_bottom(), r.left_bottom(), r.left_top()];
-        painter.add(Shape::dashed_line(&pts, stroke(ACCENT, 1.5), 4.0, 3.0));
-    }
-    // Vector edit mode, with the transform box around several selected points.
-    // The selection's size label, which measurement labels keep clear of.
-    let mut size_label = None;
-    if let Some(ve) = ds.vector_edit.clone()
-        && let Some(o) = figcraft_engine::vectoredit::overlay(&doc, &ve)
-    {
-        // The Variable width tool shows width points in place of the path's points.
-        let width_tool = ve.tool == figcraft_engine::vectoredit::VTool::Width;
-        // Other layers edited at once go under the active one; the hover shows on its own layer.
-        let ov = &app.session.tool.overlay;
-        let hover_on = |id| ov.vector_hover.filter(|_| ov.vector_hover_on.unwrap_or(ve.id) == id);
-        for part in &ve.others {
-            if let Some(po) = figcraft_engine::vectoredit::overlay(&doc, &ve.view(part)) {
-                vector_overlay(app, painter, &po, !width_tool, hover_on(part.id), false);
-            }
-        }
-        vector_overlay(app, painter, &o, !width_tool, hover_on(ve.id), true);
-        if width_tool {
-            width_overlay(app, painter, &doc, &ve, zoom);
-        } else if let Some(c) = app.session.vector_edit_box() {
-            let label = format!("{} × {}", fmt((c[1] - c[0]).hypot()), fmt((c[3] - c[0]).hypot()));
-            size_label = transform_box(app, painter, c.map(|p| app.to_screen(p.x, p.y)), ACCENT, true, 4, label);
-        }
-    }
-    // Selection.
-    let editing = ds.text_edit.clone();
-    if !sel.is_empty() && editing.is_none() && ds.vector_edit.is_none() {
-        let col = if sel.iter().any(|i| outline_colour(&doc, *i) == COMPONENT) { COMPONENT } else { ACCENT };
-        for id in &sel {
-            draw_outline(app, painter, &doc, *id, stroke(col, 1.0));
-        }
-        // The shape builder reshapes by regions: no transform box.
-        if app.session.tool.tool != ToolId::ShapeBuilder
-            && let Some(b) = selection_box(&doc, &sel)
-            && let Some((_, w, h)) = selection_frame(&doc, &sel)
-        {
-            let is_line = sel.len() == 1 && matches!(sel.first().and_then(|i| doc.node(*i)).map(|n| &n.kind), Some(NodeKind::Line));
-            let mut label = if is_line { fmt(w) } else { format!("{} × {}", fmt(w), fmt(h)) };
-            let scale = app.session.tool.overlay.scale;
-            if let Some(hint) = scale {
-                label = format!("{label} · {}x", fmt(hint.factor.abs()));
-            }
-            // A layer smaller than its handles on screen shows just its outline (they still answer
-            // just outside it).
-            let tiny = figcraft_engine::tools::box_sides_px(&b, zoom).1 < figcraft_engine::tools::SMALL_BOX_PX;
-            // Locked layers (selected in the layers panel) can't be resized: no handles either.
-            let handles = if sel.iter().any(|i| figcraft_engine::tools::locked_in(&doc, *i)) {
-                0
-            } else if is_line {
-                2
-            } else if tiny {
-                0
-            } else {
-                4
-            };
-            size_label = transform_box(app, painter, b.map(|p| app.to_screen(p.x, p.y)), col, sel.len() > 1, handles, label);
-            arc_overlay(app, painter, col);
-            shape_overlay(app, painter, col);
-            if app.session.tool.tool == ToolId::Scale {
-                // The point that stays put: the dragged pivot, else the anchor.
-                let pivot = scale
-                    .map(|h| Point::new(h.pivot[0], h.pivot[1]))
-                    .or_else(|| figcraft_engine::tools::scale_anchor_point(&doc, &sel, app.session.tool.scale_anchor));
-                if let Some(p) = pivot {
-                    let c = app.to_screen(p.x, p.y);
-                    painter.circle_filled(c, 4.0, Color32::WHITE);
-                    painter.circle_stroke(c, 4.0, stroke(col, 1.5));
-                    painter.circle_filled(c, 1.5, col);
-                }
-            }
-            // The rotation origin while it shows (Alt+R): a ring with a cross through it.
-            if let Some(o) = ds.origin_handle() {
-                let c = app.to_screen(o.x, o.y);
-                painter.circle_filled(c, 5.0, Color32::WHITE);
-                painter.circle_stroke(c, 5.0, stroke(col, 1.5));
-                for d in [vec2(1.0, 0.0), vec2(0.0, 1.0)] {
-                    painter.line_segment([c - d * 10.0, c - d * 5.0], stroke(col, 1.5));
-                    painter.line_segment([c + d * 5.0, c + d * 10.0], stroke(col, 1.5));
-                }
-                painter.circle_filled(c, 1.5, col);
-            }
-        }
-    }
-    if app.session.tool.tool == ToolId::ShapeBuilder
-        && let Some(arr) = figcraft_engine::shapebuilder::current(&app.session)
-    {
-        builder_overlay(app, painter, t, &arr);
-    }
-    // Text editing: caret and selection, or the IME composition underlined at the caret.
-    let preedit = app.preedit_view();
-    let edoc: &Document = preedit.map(|p| &*p.doc).unwrap_or(&doc);
-    if let Some(te) = editing
-        && let Some(text) = TextOnScreen::of(edoc, te.id)
-    {
-        let layout = &text.layout;
-        if let Some(q) = node_quad(app, edoc, te.id) {
-            quad(painter, q, stroke(ACCENT, 1.0));
-        }
-        let (a, b) = (te.caret.min(te.anchor), te.caret.max(te.anchor));
-        if a != b && preedit.is_none() {
-            for q in text.selection(app, a, b) {
-                painter.add(Shape::convex_polygon(q.to_vec(), ACCENT.gamma_multiply(0.3), Stroke::NONE));
-            }
-        }
-        if let Some(p) = preedit {
-            for r in layout.selection_rects(p.range.0, p.range.1) {
-                // Underline just below the baseline, across the composed chars only.
-                let Some(line) = layout.lines.iter().find(|l| (l.top - r.y0).abs() < 1e-6) else { continue };
-                let x1 = layout
-                    .glyphs
-                    .get(line.glyph_start..line.glyph_end)
-                    .unwrap_or(&[])
-                    .iter()
-                    .filter(|g| g.char_end > g.char_start && g.char_start >= p.range.0 && g.char_end <= p.range.1)
-                    .map(|g| g.x + g.advance)
-                    .fold(r.x0, f64::max);
-                let y = line.baseline + (line.top + line.height - line.baseline) * 0.35;
-                painter.line_segment([text.at(app, r.x0, y), text.at(app, x1, y)], stroke(t.text, 1.0));
-            }
-        }
-        let caret = preedit.map(|p| p.cursor).unwrap_or(te.caret);
-        let blink = (painter.ctx().input(|i| i.time) * 2.0) as i64 % 2 == 0;
-        if blink || a != b {
-            painter.line_segment(text.caret(app, caret, zoom), stroke(t.text, 1.0));
-        }
-        painter.ctx().request_repaint_after(std::time::Duration::from_millis(500));
-    }
-    // Smart guides and measurements (their labels kept clear of the size label).
-    crate::measure_overlay::draw(app, painter, t, size_label);
-    // Marquee.
-    if let Some([x0, y0, x1, y1]) = ov.marquee.or(app.ui.key_box) {
-        let r = Rect::from_two_pos(app.to_screen(x0, y0), app.to_screen(x1, y1));
-        painter.rect_filled(r, CornerRadius::ZERO, ACCENT.gamma_multiply(0.1));
-        painter.rect_stroke(r, CornerRadius::ZERO, stroke(ACCENT, 1.0), StrokeKind::Inside);
-    }
-    // Pen path.
-    if !ov.pen.is_empty() {
-        let pts: Vec<Pos2> = ov.pen.iter().map(|[x, y]| app.to_screen(*x, *y)).collect();
-        if app.session.tool.tool == ToolId::Pencil {
-            painter.add(Shape::line(pts, stroke(t.text, 2.0)));
-        } else {
-            for [x0, y0, x1, y1] in &ov.pen_handles {
-                bezier_handle(painter, app.to_screen(*x0, *y0), app.to_screen(*x1, *y1), 3.5, Color32::WHITE);
-            }
-            for p in &pts {
-                painter.circle_filled(*p, 3.5, Color32::WHITE);
-                painter.circle_stroke(*p, 3.5, stroke(ACCENT, 1.0));
-            }
-            if let Some([x0, y0, x1, y1]) = ov.rubber {
-                let (a, b) = (app.to_screen(x0, y0), app.to_screen(x1, y1));
-                // The segment a click would make: along the last anchor's out handle, if it has one.
-                match ov.rubber_handle {
-                    Some([hx, hy]) => {
-                        let h = app.to_screen(hx, hy);
-                        painter.add(egui::epaint::CubicBezierShape::from_points_stroke(
-                            [a, h, b, b],
-                            false,
-                            Color32::TRANSPARENT,
-                            stroke(ACCENT, 1.0),
-                        ));
-                    }
-                    None => {
-                        painter.line_segment([a, b], stroke(ACCENT, 1.0));
-                    }
-                }
-            }
-        }
-    }
-    // Eraser brush (vector edit mode).
-    if let Some([x, y, r]) = ov.brush {
-        let c = app.to_screen(x, y);
-        let rs = (r * app.session.ds().map(|d| d.view.zoom).unwrap_or(1.0)) as f32;
-        painter.circle_stroke(c, rs, stroke(Color32::WHITE, 3.0));
-        painter.circle_stroke(c, rs, stroke(ACCENT, 1.5));
-    }
-    // Lasso (vector edit mode).
-    if ov.lasso.len() > 1 {
-        let mut pts: Vec<Pos2> = ov.lasso.iter().map(|[x, y]| app.to_screen(*x, *y)).collect();
-        if let Some(first) = pts.first().copied() {
-            pts.push(first);
-        }
-        painter.add(Shape::dashed_line(&pts, stroke(ACCENT, 1.0), 4.0, 3.0));
-    }
-    // Guides (under the rulers).
-    crate::guides::draw(app, painter);
-    // Rulers.
-    if view.rulers {
-        rulers(app, painter, t, &doc, &sel);
-    }
-    labels
-}
-
-/// A transform box (screen corners tl, tr, br, bl): its outline when `outline`, the first `handles`
-/// corner handles and, when dimensions are shown, the size `label` under it (its box returned).
-fn transform_box(app: &FigApp, painter: &egui::Painter, q: [Pos2; 4], col: Color32, outline: bool, handles: usize, label: String) -> Option<Rect> {
-    if outline {
-        quad(painter, q, stroke(col, 1.0));
-    }
-    for c in q.iter().take(handles) {
-        let r = Rect::from_center_size(*c, vec2(8.0, 8.0));
-        painter.rect_filled(r, CornerRadius::same(1), Color32::WHITE);
-        painter.rect_stroke(r, CornerRadius::same(1), stroke(col, 1.0), StrokeKind::Inside);
-    }
-    if app.session.prefs.show_dimensions {
-        let bottom = q.iter().map(|p| p.y).fold(f32::MIN, f32::max);
-        let cx = q.iter().map(|p| p.x).sum::<f32>() / 4.0;
-        return Some(pill(painter, pos2(cx, bottom + 9.0), Align2::CENTER_TOP, label, col));
-    }
-    None
-}
-
-/// A canvas readout: white `text` on a `col` pill placed at `at` by `align` (its box returned).
-fn pill(painter: &egui::Painter, at: Pos2, align: Align2, text: String, col: Color32) -> Rect {
-    let galley = painter.layout_no_wrap(text, semibold(11.0), Color32::WHITE);
-    let r = align.anchor_size(at, galley.size() + vec2(8.0, 4.0));
-    painter.rect_filled(r, CornerRadius::same(3), col);
-    painter.galley(r.min + vec2(4.0, 2.0), galley, Color32::WHITE);
-    r
-}
-
-/// The selected ellipse's arc handles (the hovered or dragged one larger, Start with a dot inside)
-/// and, while one is dragged, its readout beside it.
-fn arc_overlay(app: &FigApp, painter: &egui::Painter, col: Color32) {
-    use figcraft_engine::arc_handles::ArcHandle;
-    let Some(hs) = app.session.arc_handles() else { return };
-    let ov = &app.session.tool.overlay;
-    for h in [ArcHandle::Ratio, ArcHandle::Start, ArcHandle::Sweep] {
-        let Some([x, y]) = hs.at(h) else { continue };
-        let c = app.to_screen(x, y);
-        let r = if ov.arc_hover == Some(h) { 5.0 } else { 4.0 };
-        painter.circle_filled(c, r, Color32::WHITE);
-        painter.circle_stroke(c, r, stroke(col, 1.0));
-        if h == ArcHandle::Start {
-            painter.circle_filled(c, 1.5, col);
-        }
-    }
-    if let Some(hint) = &ov.arc {
-        let c = app.to_screen(hint.at[0], hint.at[1]);
-        pill(painter, c + vec2(12.0, 12.0), Align2::LEFT_TOP, hint.label.clone(), col);
-    }
-}
-
-/// The selected shape's corner radius handles and a star's ratio handle (the hovered or dragged
-/// one larger) and, while one is dragged, its value beside it.
-fn shape_overlay(app: &FigApp, painter: &egui::Painter, col: Color32) {
-    use figcraft_engine::shape_handles::ShapeHandle;
-    let ov = &app.session.tool.overlay;
-    for (h, [x, y]) in app.session.shape_handles() {
-        let r = if ov.shape_hover == Some(h) { 4.5 } else { 3.5 };
-        let c = app.to_screen(x, y);
-        painter.circle_filled(c, r, Color32::WHITE);
-        painter.circle_stroke(c, r, stroke(col, 1.0));
-    }
-    if let Some(hint) = &ov.shape {
-        let c = app.to_screen(hint.at[0], hint.at[1]);
-        let text = match hint.handle {
-            ShapeHandle::Radius { .. } => format!("{} {}", tr("Radius"), hint.value),
-            ShapeHandle::Ratio => format!("{} {}%", tr("Ratio"), hint.value),
-        };
-        pill(painter, c + vec2(12.0, 12.0), Align2::LEFT_TOP, text, col);
-    }
-}
-
-/// Variable width tool: each width point on the path with a bar across the stroke to its two
-/// width handles (the selected point filled), and a faint preview where a drag would add one.
-fn width_overlay(app: &FigApp, painter: &egui::Painter, doc: &Document, ve: &figcraft_engine::vectoredit::VectorEdit, zoom: f64) {
-    use figcraft_doc::WidthSide;
-    use figcraft_engine::vectoredit::{WHit, width_handles, width_preview};
-    let hover = app.session.tool.overlay.width_hover;
-    let sp = |p: &[f64; 2]| app.to_screen(p[0], p[1]);
-    let draw = |h: &figcraft_engine::vectoredit::WidthHandle, ghost: bool| {
-        let (c, a, b) = (sp(&h.at), sp(&h.sides[0]), sp(&h.sides[1]));
-        let col = if ghost { ACCENT.gamma_multiply(0.5) } else { ACCENT };
-        painter.line_segment([a, b], stroke(Color32::from_white_alpha(160), 3.0));
-        painter.line_segment([a, b], stroke(col, 1.0));
-        for (e, side) in [(a, WidthSide::Right), (b, WidthSide::Left)] {
-            let grab = !ghost && hover == Some(WHit::Handle { index: h.index, side });
-            let r = if grab { 4.5 } else { 3.5 };
-            painter.circle_filled(e, r, Color32::WHITE);
-            painter.circle_stroke(e, r, stroke(col, 1.0));
-        }
-        let on = !ghost && ve.width_point == Some(h.index);
-        let hovered = !ghost && hover == Some(WHit::Point { index: h.index });
-        let r = if hovered { 5.0 } else { 4.0 };
-        painter.circle_filled(c, r, if on { ACCENT } else { Color32::WHITE });
-        painter.circle_stroke(c, r, stroke(col, 1.0));
-    };
-    for h in width_handles(doc, ve, zoom) {
-        draw(&h, false);
-    }
-    if let Some(WHit::Path { t, .. }) = hover {
-        for h in width_preview(doc, ve, t, zoom) {
-            draw(&h, true);
-        }
-    }
-}
-
-/// A bezier handle from its anchor `v` to its end `e` (screen points): the line, and a dot of
-/// radius `r` filled with `fill` (vector edit mode and the Pen draw them alike).
-fn bezier_handle(painter: &egui::Painter, v: Pos2, e: Pos2, r: f32, fill: Color32) {
-    painter.line_segment([v, e], stroke(ACCENT, 1.0));
-    painter.circle_filled(e, r, fill);
-    painter.circle_stroke(e, r, stroke(ACCENT, 1.0));
-}
-
-/// Vector edit mode: a layer's segments, handles and points (`points`) with its `hover`ed part, and
-/// for the `active` layer the closed area under the paint bucket and the pen's rubber band.
-fn vector_overlay(
-    app: &FigApp,
-    painter: &egui::Painter,
-    o: &figcraft_engine::vectoredit::EditOverlay,
-    points: bool,
-    hover: Option<figcraft_engine::vectoredit::VHit>,
-    active: bool,
-) {
-    use figcraft_engine::vectoredit::VHit;
-    let ov = &app.session.tool.overlay;
-    let sp = |p: &[f64; 2]| app.to_screen(p[0], p[1]);
-    // Paint bucket target: hatched like a fill to come.
-    if active && !ov.face.is_empty() {
-        let polys: Vec<Vec<Pos2>> = ov.face.iter().map(|poly| poly.iter().map(sp).collect()).collect();
-        hatched(painter, &polys, ACCENT);
-    }
-    if active {
-        region_hatch(app, painter);
-    }
-    let hover_seg = match hover {
-        Some(VHit::Segment { seg, .. }) => Some(seg),
-        _ => None,
-    };
-    for (i, seg) in o.segments.iter().enumerate() {
-        let [a, b, c, d] = [sp(&seg[0]), sp(&seg[1]), sp(&seg[2]), sp(&seg[3])];
-        let w = if o.selected_segments.contains(&i) {
-            3.0
-        } else if hover_seg == Some(i) {
-            2.5
-        } else {
-            1.5
-        };
-        painter.add(egui::epaint::CubicBezierShape::from_points_stroke([a, b, c, d], false, Color32::TRANSPARENT, stroke(ACCENT, w)));
-    }
-    if !points {
-        return;
-    }
-    for h in &o.handles {
-        let hovered = hover == Some(VHit::Handle { seg: h.seg, start: h.start });
-        let on = o.selected_handles.contains(&(h.seg, h.start));
-        bezier_handle(painter, sp(&h.vertex), sp(&h.handle), if hovered { 4.5 } else { 3.5 }, if on { ACCENT } else { Color32::WHITE });
-    }
-    for (i, v) in o.vertices.iter().enumerate() {
-        let p = sp(v);
-        let hovered = matches!(hover, Some(VHit::Vertex { index }) if index == i);
-        let size = if hovered { 9.0 } else { 7.0 };
-        let r = Rect::from_center_size(p, vec2(size, size));
-        let on = o.selected_vertices.contains(&i);
-        painter.rect_filled(r, CornerRadius::same(5), if on { ACCENT } else { Color32::WHITE });
-        painter.rect_stroke(r, CornerRadius::same(5), stroke(ACCENT, 1.0), StrokeKind::Inside);
-        if o.anchor == Some(i) {
-            painter.circle_stroke(p, 7.5, stroke(ACCENT, 1.0));
-        }
-    }
-    if let Some([x0, y0, x1, y1]) = ov.rubber.filter(|_| active) {
-        painter.add(Shape::dashed_line(&[app.to_screen(x0, y0), app.to_screen(x1, y1)], stroke(ACCENT, 1.0), 4.0, 3.0));
-    }
-}
-
-/// Width of the lines hatching the hovered and selected regions in vector edit mode (screen px).
-const REGION_HATCH_WIDTH: f32 = 1.4;
-
-/// Vector edit mode: the selected regions and the hovered one hatched in the selection colour,
-/// under the segments and points (the engine lays out and clips the lines).
-fn region_hatch(app: &FigApp, painter: &egui::Painter) {
-    let Ok(ds) = app.session.ds() else { return };
-    let (ox, oy) = ds.view.page_to_screen(0.0, 0.0);
-    let (z, min) = (ds.view.zoom, app.canvas.rect.min);
-    let view = figcraft_geom::Affine::new([z, 0.0, 0.0, z, f64::from(min.x) + ox, f64::from(min.y) + oy]);
-    let r = painter.clip_rect();
-    let clip = figcraft_geom::Rect::new(f64::from(r.min.x), f64::from(r.min.y), f64::from(r.max.x), f64::from(r.max.y));
-    for [a, b] in app.session.vector_region_hatch(view, Some(clip)) {
-        painter.line_segment([pos2(a.x as f32, a.y as f32), pos2(b.x as f32, b.y as f32)], stroke(ACCENT, REGION_HATCH_WIDTH));
-    }
-}
-
-/// Shape builder: every region's edges, and the hovered or collected regions hatched (in the
-/// danger colour when releasing removes them).
-fn builder_overlay(app: &FigApp, painter: &egui::Painter, t: &Tokens, arr: &figcraft_engine::shapebuilder::Arrangement) {
-    let ov = &app.session.tool.overlay;
-    let screen = |r: &figcraft_engine::shapebuilder::Region| -> Vec<Vec<Pos2>> {
-        r.polys.iter().map(|poly| poly.iter().map(|p| app.to_screen(p.x, p.y)).collect()).collect()
-    };
-    // Edges read on any fill: a light halo under a thin accent line.
-    for r in &arr.regions {
-        for poly in screen(r) {
-            painter.add(Shape::closed_line(poly.clone(), stroke(Color32::from_white_alpha(150), 2.5)));
-            painter.add(Shape::closed_line(poly, stroke(ACCENT, 1.0)));
-        }
-    }
-    let col = if ov.builder_remove { t.danger } else { ACCENT };
-    for r in ov.builder_regions.iter().filter_map(|i| arr.regions.get(*i)) {
-        hatched(painter, &screen(r), col);
-    }
-}
-
-/// Polygons hatched and outlined in `col` (an area about to be filled, merged or removed), each
-/// line on a light halo so it reads on any fill, even one in `col`.
-fn hatched(painter: &egui::Painter, polys: &[Vec<Pos2>], col: Color32) {
-    let halo = Color32::from_white_alpha(200);
-    for l in hatch(polys, 6.0) {
-        painter.line_segment(l, stroke(halo, 3.0));
-        painter.line_segment(l, stroke(col, 1.25));
-    }
-    for poly in polys {
-        painter.add(Shape::closed_line(poly.clone(), stroke(halo, 4.0)));
-        painter.add(Shape::closed_line(poly.clone(), stroke(col, 2.0)));
-    }
-}
-
-/// 45° hatch lines `gap` apart inside polygons (even-odd), in screen space.
-fn hatch(polys: &[Vec<Pos2>], gap: f32) -> Vec<[Pos2; 2]> {
-    // Rotate so the hatch is horizontal, scan, rotate back.
-    let rot = |p: Pos2| pos2((p.x + p.y) * std::f32::consts::FRAC_1_SQRT_2, (p.y - p.x) * std::f32::consts::FRAC_1_SQRT_2);
-    let back = |x: f32, y: f32| pos2((x - y) * std::f32::consts::FRAC_1_SQRT_2, (x + y) * std::f32::consts::FRAC_1_SQRT_2);
-    let edges: Vec<(Pos2, Pos2)> = polys
-        .iter()
-        .flat_map(|poly| {
-            let pts: Vec<Pos2> = poly.iter().map(|p| rot(*p)).collect();
-            let n = pts.len();
-            (0..n).filter_map(move |k| Some((*pts.get(k)?, *pts.get((k + 1) % n)?)))
-        })
-        .collect();
-    let (y0, y1) = edges.iter().fold((f32::INFINITY, f32::NEG_INFINITY), |(lo, hi), (a, b)| (lo.min(a.y).min(b.y), hi.max(a.y).max(b.y)));
-    let mut out = Vec::new();
-    if !(y0.is_finite() && y1.is_finite()) || (y1 - y0) / gap > 4000.0 {
-        return out;
-    }
-    let mut y = (y0 / gap).ceil() * gap;
-    while y < y1 {
-        let mut xs: Vec<f32> = edges
-            .iter()
-            .filter(|(a, b)| (a.y <= y && y < b.y) || (b.y <= y && y < a.y))
-            .map(|(a, b)| a.x + (y - a.y) * (b.x - a.x) / (b.y - a.y))
-            .collect();
-        xs.sort_by(f32::total_cmp);
-        for pair in xs.chunks_exact(2) {
-            if let [a, b] = pair {
-                out.push([back(*a, y), back(*b, y)]);
-            }
-        }
-        y += gap;
-    }
-    out
-}
-
-/// The layers that get canvas labels and layout grids, in z-order: the page's visible top-level
-/// layers and, inside sections whose contents show, their visible children (sections nest).
-fn boards(doc: &Document, page: NodeId) -> Vec<NodeId> {
-    fn walk(doc: &Document, id: NodeId, depth: usize, out: &mut Vec<NodeId>) {
-        let Some(n) = doc.node(id) else { return };
-        for c in &n.children {
-            let Some(cn) = doc.node(*c) else { continue };
-            if !cn.visible {
-                continue;
-            }
-            out.push(*c);
-            if matches!(cn.kind, NodeKind::Section { contents_hidden: false }) && depth < 32 {
-                walk(doc, *c, depth + 1, out);
-            }
-        }
-    }
-    let mut out = Vec::new();
-    walk(doc, page, 0, &mut out);
-    out
-}
-
-/// A frame's or section's handoff status as its badge says it, with the badge colour ("Changed"
-/// once a ready-for-dev layer was edited; `None` without a status).
-pub(crate) fn status_label(n: &figcraft_doc::Node) -> Option<(&'static str, Color32)> {
-    match n.dev_status {
-        figcraft_doc::DevStatus::None => None,
-        figcraft_doc::DevStatus::ReadyForDev if n.dev_changed => Some((tr("Changed"), crate::theme::DEV_CHANGED)),
-        figcraft_doc::DevStatus::ReadyForDev => Some((tr("Ready for dev"), crate::theme::DEV_READY)),
-        figcraft_doc::DevStatus::Completed => Some((tr("Completed"), crate::theme::DEV_COMPLETED)),
-    }
-}
-
-/// A frame's or section's handoff status as a small pill left-centred on `at`; the pill's area.
-pub(crate) fn status_badge(painter: &egui::Painter, n: &figcraft_doc::Node, at: Pos2) -> Option<Rect> {
-    let (label, fill) = status_label(n)?;
-    let galley = painter.layout_no_wrap(label.to_string(), semibold(10.0), Color32::WHITE);
-    let r = Rect::from_min_size(pos2(at.x, at.y - galley.size().y / 2.0 - 2.0), galley.size() + vec2(10.0, 4.0));
-    painter.rect_filled(r, CornerRadius::same(4), fill);
-    painter.galley(r.min + vec2(5.0, 2.0), galley, Color32::WHITE);
-    Some(r)
-}
-
-fn rulers(app: &FigApp, painter: &egui::Painter, t: &Tokens, doc: &Document, sel: &[NodeId]) {
-    let r = app.canvas.rect;
-    let size = 20.0;
-    painter.rect_filled(Rect::from_min_size(r.min, vec2(r.width(), size)), CornerRadius::ZERO, t.panel);
-    painter.rect_filled(Rect::from_min_size(r.min, vec2(size, r.height())), CornerRadius::ZERO, t.panel);
-    let zoom = app.session.ds().map(|d| d.view.zoom).unwrap_or(1.0);
-    let step = figcraft_engine::guides::ruler_step(zoom);
-    let p0 = app.to_page(r.min);
-    let p1 = app.to_page(r.max);
-    // Highlight the selection's span.
-    if let Some(b) = doc.bounds_of(sel) {
-        let (a, bb) = (app.to_screen(b.x0, b.y0), app.to_screen(b.x1, b.y1));
-        painter.rect_filled(Rect::from_min_max(pos2(a.x, r.min.y), pos2(bb.x, r.min.y + size)), CornerRadius::ZERO, ACCENT.gamma_multiply(0.15));
-        painter.rect_filled(Rect::from_min_max(pos2(r.min.x, a.y), pos2(r.min.x + size, bb.y)), CornerRadius::ZERO, ACCENT.gamma_multiply(0.15));
-    }
-    let mut x = (p0.x / step).floor() * step;
-    while x <= p1.x {
-        let s = app.to_screen(x, 0.0).x;
-        painter.line_segment([pos2(s, r.min.y + size - 6.0), pos2(s, r.min.y + size)], stroke(t.text_tertiary, 1.0));
-        painter.text(pos2(s + 2.0, r.min.y + 3.0), Align2::LEFT_TOP, fmt(x), regular(9.0), t.text_secondary);
-        x += step;
-    }
-    let mut y = (p0.y / step).floor() * step;
-    while y <= p1.y {
-        let s = app.to_screen(0.0, y).y;
-        painter.line_segment([pos2(r.min.x + size - 6.0, s), pos2(r.min.x + size, s)], stroke(t.text_tertiary, 1.0));
-        painter.text(pos2(r.min.x + 3.0, s + 2.0), Align2::LEFT_TOP, fmt(y), regular(9.0), t.text_secondary);
-        y += step;
-    }
-    painter.line_segment([pos2(r.min.x, r.min.y + size), pos2(r.max.x, r.min.y + size)], stroke(t.border, 1.0));
-    painter.line_segment([pos2(r.min.x + size, r.min.y), pos2(r.min.x + size, r.max.y)], stroke(t.border, 1.0));
-}
-
-pub fn fmt(v: f64) -> String {
-    let r = (v * 100.0).round() / 100.0;
-    if (r - r.round()).abs() < 1e-9 { format!("{}", r.round() as i64) } else { format!("{r}") }
-}
-
-#[cfg(test)]
-#[path = "zoom_preview_tests.rs"]
 mod zoom_preview_tests;
diff --git a/crates/ui-egui/src/canvas/board_bar.rs b/crates/ui-egui/src/canvas/board_bar.rs
new file mode 100644
index 00000000..c1a76a4d
--- /dev/null
+++ b/crates/ui-egui/src/canvas/board_bar.rs
@@ -0,0 +1,345 @@
+//! Boards in the UI: the small bar floating over a board's selection (colour, shape, text size,
+//! connector style; boards hide the Design panel until asked for), and the swatches it and the
+//! board tools' flyouts share.
+
+use egui::{Color32, CornerRadius, Pos2, Rect, Sense, Stroke, StrokeKind, Ui, pos2, vec2};
+use figcraft_doc::{BOARD_COLORS, BoardItem, BoardShape, NodeKind, Routing, Stamp, StrokeCap};
+use figcraft_engine::board::{BoardTool, TEXT_SIZES};
+use serde_json::{Value, json};
+
+use crate::FigApp;
+use crate::a11y;
+use crate::i18n::{tr, tr_noop};
+use crate::icons::{self, Icon};
+use crate::theme::{Tokens, semibold};
+use crate::toolbar::Options;
+
+/// What a swatch shows.
+pub(crate) enum Mark {
+    Color(figcraft_color::Color),
+    Shape(BoardShape),
+    Stamp(Stamp),
+}
+
+/// One choice of a board tool's flyout: its name, the tool's params, whether it is the tool's now.
+pub(crate) struct Choice {
+    pub label: &'static str,
+    pub params: Value,
+    pub on: bool,
+    pub mark: Mark,
+}
+
+/// The choices a board tool's flyout offers.
+pub(crate) fn choices(options: Options, board: &BoardTool) -> Vec<Choice> {
+    match options {
+        Options::Colors => BOARD_COLORS
+            .iter()
+            .map(|(n, c)| Choice { label: color_label(n), params: json!({"color": n}), on: board.sticky == *c, mark: Mark::Color(*c) })
+            .collect(),
+        Options::Shapes => BoardShape::ALL
+            .iter()
+            .map(|b| Choice { label: b.label(), params: json!({"shape": b.id()}), on: board.shape == *b, mark: Mark::Shape(*b) })
+            .collect(),
+        Options::Stamps => Stamp::ALL
+            .iter()
+            .map(|b| Choice { label: b.label(), params: json!({"stamp": b.id()}), on: board.stamp == *b, mark: Mark::Stamp(*b) })
+            .collect(),
+        Options::None => Vec::new(),
+    }
+}
+
+/// A board colour's name as the UI says it.
+fn color_label(name: &str) -> &'static str {
+    match name {
+        "yellow" => tr_noop("Yellow"),
+        "orange" => tr_noop("Orange"),
+        "red" => tr_noop("Red"),
+        "pink" => tr_noop("Pink"),
+        "violet" => tr_noop("Violet"),
+        "blue" => tr_noop("Blue"),
+        "green" => tr_noop("Green"),
+        _ => tr_noop("Gray"),
+    }
+}
+
+/// Paint `mark` in `r`: a colour chip, a shape's outline in `ink`, or a stamp badge.
+pub(crate) fn paint_choice(p: &egui::Painter, r: Rect, mark: &Mark, ink: Color32) {
+    match mark {
+        Mark::Color(c) => {
+            p.rect_filled(r, CornerRadius::same(4), c32(*c));
+            p.rect_stroke(r, CornerRadius::same(4), Stroke::new(1.0, Color32::from_black_alpha(40)), StrokeKind::Inside);
+        }
+        Mark::Shape(s) => {
+            let path = s.path(14.0, 14.0);
+            let path = figcraft_geom::Affine::translate((1.0, 1.0)) * path;
+            icons::paint_outlines(p, r, 16.0, &[(&path, false)], ink, 1.2);
+        }
+        Mark::Stamp(s) => {
+            p.circle_filled(r.center(), r.width().min(r.height()) / 2.0, c32(s.color()));
+            let parts: Vec<(figcraft_geom::BezPath, bool)> =
+                s.mark().iter().filter_map(|m| figcraft_geom::BezPath::from_svg(m.d).ok().map(|b| (b, m.filled))).collect();
+            let refs: Vec<(&figcraft_geom::BezPath, bool)> = parts.iter().map(|(b, f)| (b, *f)).collect();
+            icons::paint_outlines(p, r, figcraft_doc::STAMP_SIZE, &refs, Color32::WHITE, 3.0);
+        }
+    }
+}
+
+fn c32(c: figcraft_color::Color) -> Color32 {
+    let [r, g, b, a] = c.to_rgba8();
+    Color32::from_rgba_unmultiplied(r, g, b, a)
+}
+
+/// What the selection has that the bar can change.
+#[derive(Default)]
+struct Has {
+    color: bool,
+    shape: Option<BoardShape>,
+    text: bool,
+    connector: Option<(Routing, bool)>,
+    table: bool,
+}
+
+/// What the selected board objects take from the bar (layers that aren't board objects, a section
+/// say, are left out); `None` when none takes anything.
+fn has(app: &FigApp) -> Option<Has> {
+    let ds = app.session.ds().ok()?;
+    let mut h = Has::default();
+    for n in ds.selection.iter().filter_map(|id| ds.doc.node(*id)) {
+        match &n.board {
+            Some(BoardItem::Sticky { .. } | BoardItem::Ink) => h.color = true,
+            Some(BoardItem::Shape { shape }) => {
+                h.color = true;
+                h.text = true;
+                h.shape = Some(*shape);
+            }
+            Some(BoardItem::Connector(c)) => {
+                h.color = true;
+                h.connector = Some((c.routing, n.stroke.cap_end != StrokeCap::None));
+            }
+            Some(BoardItem::Label { .. }) => h.text = true,
+            Some(BoardItem::Table) => h.table = true,
+            Some(BoardItem::Stamp { .. }) | None => {}
+        }
+    }
+    (h.color || h.text || h.connector.is_some() || h.table).then_some(h)
+}
+
+const CELL: f32 = 28.0;
+const SWATCH: f32 = 20.0;
+const GAP: f32 = 4.0;
+/// The room each part takes after its controls (the divider and the gap around it).
+const PART_END: f32 = 8.0;
+
+impl Has {
+    /// The bar's width for these parts.
+    fn width(&self) -> f32 {
+        let mut w = 8.0;
+        if self.color {
+            w += BOARD_COLORS.len() as f32 * (SWATCH + GAP) + PART_END;
+        }
+        if self.shape.is_some() {
+            w += CELL + 12.0 + GAP + PART_END;
+        }
+        if self.text {
+            w += TEXT_SIZES.len() as f32 * (CELL + 2.0) + PART_END;
+        }
+        if self.connector.is_some() {
+            w += 4.0 * (CELL + 2.0) + PART_END;
+        }
+        if self.table {
+            w += crate::board_picker::TABLE_PART_W;
+        }
+        w
+    }
+}
+
+/// Where a bar `size` big goes for the selection's screen box `sel`: centred above it, below it
+/// when there is no room above, inside the canvas.
+pub(crate) fn place(sel: Rect, size: egui::Vec2, canvas: Rect) -> Pos2 {
+    let w = size.x;
+    let cx = sel.center().x.clamp(canvas.min.x + w / 2.0 + 8.0, (canvas.max.x - w / 2.0 - 8.0).max(canvas.min.x + w / 2.0 + 8.0));
+    let above = sel.min.y - 14.0 - size.y;
+    let y = if above > canvas.min.y + 8.0 { above } else { (sel.max.y + 14.0).min(canvas.max.y - size.y - 80.0) };
+    pos2(cx - w / 2.0, y)
+}
+
+/// The bar above a board's selection, while nothing is being dragged and the file can be edited.
+pub fn show(app: &mut FigApp, ctx: &egui::Context) {
+    let editable = app.session.active_read_only().is_none();
+    if app.session.tool.busy() || !editable || !app.session.doc().is_ok_and(figcraft_engine::board::is_board) {
+        return;
+    }
+    let Some(h) = has(app) else { return };
+    let Some(b) = app.session.ds().ok().and_then(|ds| ds.doc.bounds_of(&ds.selection)) else { return };
+    let sel = Rect::from_two_pos(app.to_screen(b.x0, b.y0), app.to_screen(b.x1, b.y1));
+    let size = vec2(h.width(), 40.0);
+    let at = place(sel, size, app.canvas.rect);
+    let t = Tokens::get(ctx);
+    egui::Area::new(egui::Id::unique("board_bar")).fixed_pos(at).order(egui::Order::Middle).show(ctx, |ui| {
+        let (rect, _) = ui.allocate_exact_size(size, Sense::click());
+        a11y::container_bounds(ui, rect);
+        let p = ui.painter();
+        p.rect_filled(rect.expand(2.0).translate(vec2(0.0, 1.0)), CornerRadius::same(12), Color32::from_black_alpha(18));
+        p.rect_filled(rect, CornerRadius::same(10), t.panel);
+        p.rect_stroke(rect, CornerRadius::same(10), Stroke::new(1.0, t.border), StrokeKind::Inside);
+        let cy = rect.center().y;
+        let mut x = rect.min.x + 8.0;
+        if h.color {
+            x = color_part(app, ui, x, cy, &t);
+        }
+        if let Some(shape) = h.shape {
+            x = shape_part(app, ui, shape, pos2(x, cy), &t);
+        }
+        if h.text {
+            x = size_part(app, ui, x, cy, &t);
+        }
+        if h.table {
+            x = crate::board_picker::table_part(app, ui, x, cy, &t);
+        }
+        if let Some((routing, arrow)) = h.connector {
+            line_part(app, ui, (routing, arrow), pos2(x, cy), &t);
+        }
+    });
+}
+
+/// The board colours from `x` (`board.setColor`); where the next part starts.
+fn color_part(app: &mut FigApp, ui: &mut Ui, mut x: f32, cy: f32, t: &Tokens) -> f32 {
+    for (i, (name, c)) in BOARD_COLORS.iter().enumerate() {
+        let r = Rect::from_center_size(pos2(x + SWATCH / 2.0, cy), vec2(SWATCH, SWATCH));
+        let resp = ui.interact(r, ui.scope_id().with(("bb_color", i)), Sense::click()).on_hover_text(tr(color_label(name)));
+        a11y::button(&resp, tr(color_label(name)));
+        if resp.hovered() {
+            ui.painter().rect_filled(r.expand(2.0), CornerRadius::same(6), t.hover);
+        }
+        paint_choice(ui.painter(), r, &Mark::Color(*c), t.icon);
+        if resp.clicked() {
+            app.run("board.setColor", json!({"color": name}));
+        }
+        x += SWATCH + GAP;
+    }
+    divider(ui, t, x, cy)
+}
+
+/// The shape menu at `at` (its left edge and middle), showing `shape`; where the next part starts.
+fn shape_part(app: &mut FigApp, ui: &mut Ui, shape: BoardShape, at: Pos2, t: &Tokens) -> f32 {
+    let r = Rect::from_min_size(pos2(at.x, at.y - CELL / 2.0), vec2(CELL + 12.0, CELL));
+    let resp = ui.interact(r, ui.scope_id().with("bb_shape"), Sense::click()).on_hover_text(tr("Shape"));
+    a11y::menu_button(&resp, tr("Shape"), a11y::menu_open(&resp));
+    if resp.hovered() {
+        ui.painter().rect_filled(r, CornerRadius::same(5), t.hover);
+    }
+    paint_choice(ui.painter(), Rect::from_center_size(pos2(r.min.x + CELL / 2.0, at.y), vec2(18.0, 18.0)), &Mark::Shape(shape), t.icon);
+    icons::paint(ui.painter(), Rect::from_center_size(pos2(r.max.x - 7.0, at.y), vec2(12.0, 12.0)), Icon::Chevron, t.icon_secondary);
+    crate::right::menu_popup(&resp).show(|ui| {
+        for b in BoardShape::ALL {
+            let art = |p: &egui::Painter, row: Rect, ink: Color32| {
+                paint_choice(p, Rect::from_center_size(pos2(row.max.x - 16.0, row.center().y), vec2(16.0, 16.0)), &Mark::Shape(b), ink)
+            };
+            if crate::right::menu_item_with(ui, tr(b.label()), "", 24.0, art) {
+                app.run("board.setStyle", json!({"shape": b.id()}));
+                ui.close();
+            }
+        }
+    });
+    divider(ui, t, at.x + CELL + 12.0 + GAP, at.y)
+}
+
+/// The text sizes from `x` (`board.setStyle {fontSize}`); where the next part starts.
+fn size_part(app: &mut FigApp, ui: &mut Ui, mut x: f32, cy: f32, t: &Tokens) -> f32 {
+    for (label, size) in TEXT_SIZES {
+        let r = Rect::from_center_size(pos2(x + CELL / 2.0, cy), vec2(CELL, CELL));
+        let resp = ui.interact(r, ui.scope_id().with(("bb_size", label)), Sense::click()).on_hover_text(tr("Text size"));
+        a11y::button(&resp, &format!("{} {label}", tr("Text size")));
+        if resp.hovered() {
+            ui.painter().rect_filled(r, CornerRadius::same(5), t.hover);
+        }
+        ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, label, semibold(11.0), t.text);
+        if resp.clicked() {
+            app.run("board.setStyle", json!({"fontSize": size}));
+        }
+        x += CELL + 2.0;
+    }
+    divider(ui, t, x, cy)
+}
+
+/// A connector's routing (straight, elbow, curved) and end arrow at `at`, as they are now (`line`).
+fn line_part(app: &mut FigApp, ui: &mut Ui, line: (Routing, bool), at: Pos2, t: &Tokens) {
+    let (routing, arrow) = line;
+    let cells = [
+        (Icon::Line, tr("Straight"), routing == Routing::Straight, json!({"style": "straight"})),
+        (Icon::Connector, tr("Elbow"), routing == Routing::Elbow, json!({"style": "elbow"})),
+        (Icon::CurvedConnector, tr("Curved"), routing == Routing::Curved, json!({"style": "curved"})),
+        (Icon::Arrow, tr("Arrow at the end"), arrow, json!({"endCap": if arrow { "none" } else { "triangleArrow" }})),
+    ];
+    let mut x = at.x;
+    for (i, (icon, tip, on, params)) in cells.into_iter().enumerate() {
+        let r = Rect::from_center_size(pos2(x + CELL / 2.0, at.y), vec2(CELL, CELL));
+        if crate::toolbar::tool_cell(ui, t, r, ("bb_line", i), icon, on, tip).clicked() {
+            app.run("board.setStyle", params);
+        }
+        x += CELL + 2.0;
+    }
+}
+
+/// A thin separator after `x`; where the next part starts.
+pub(crate) fn divider(ui: &Ui, t: &Tokens, x: f32, cy: f32) -> f32 {
+    ui.painter().line_segment([pos2(x + 2.0, cy - 10.0), pos2(x + 2.0, cy + 10.0)], Stroke::new(1.0, t.border));
+    x + 8.0
+}
+
+/// The dot grid's spacing on the page at 100%, and the closest its dots come on screen (points):
+/// zoomed out, every second, fourth… dot stays, the ones going fading out first.
+const DOT_STEP: f64 = 24.0;
+const DOT_MIN_GAP: f64 = 14.0;
+
+/// A board page's dot grid on its background `bg`, for the canvas render to draw under the
+/// layers: dark dots on a light page, light ones on a dark page, in the theme's ink, about a point
+/// and a half across on screen. `None` on design files.
+pub fn dots(app: &FigApp, bg: Color32, t: &Tokens) -> Option<figcraft_render::Dots> {
+    let ds = app.session.ds().ok()?;
+    if !figcraft_engine::board::is_board(&ds.doc) {
+        return None;
+    }
+    let zoom = ds.view.zoom;
+    let (step, fade) = dot_spacing(zoom)?;
+    let dark_page = 0.2126 * f32::from(bg.r()) + 0.7152 * f32::from(bg.g()) + 0.0722 * f32::from(bg.b()) < 128.0;
+    let ink = if dark_page == t.dark { t.text } else { t.bg };
+    let alpha = if dark_page { 0.22 } else { 0.18 };
+    let color = |a: f32| figcraft_color::Color::from_rgba8(ink.r(), ink.g(), ink.b(), (a * 255.0).round() as u8);
+    let size = (1.5 * zoom.sqrt()).clamp(1.0, 3.0) / zoom;
+    Some(figcraft_render::Dots { step, size, color: color(alpha), faded: color(alpha * fade) })
+}
+
+/// The dot grid's spacing on the page at `zoom` (doubled until the dots are far enough apart on
+/// screen), and how strongly the dots the next doubling drops still show (0 to 1).
+pub(crate) fn dot_spacing(zoom: f64) -> Option<(f64, f32)> {
+    if !(zoom.is_finite() && zoom > 0.0) {
+        return None;
+    }
+    // Bounded: past about 1000 doublings the step is no longer finite, and there are no dots.
+    let mut step = DOT_STEP;
+    for _ in 0..1100 {
+        if step * zoom >= DOT_MIN_GAP {
+            break;
+        }
+        step *= 2.0;
+    }
+    let gap = step * zoom;
+    // From one to two minimum gaps apart, the in-between dots fade in.
+    (gap.is_finite() && gap >= DOT_MIN_GAP).then(|| (step, ((gap - DOT_MIN_GAP) / DOT_MIN_GAP).clamp(0.0, 1.0) as f32))
+}
+
+/// The name of the person who placed the stamp under the pointer, beside it.
+pub fn stamp_author(app: &FigApp, painter: &egui::Painter, pointer: Option<Pos2>) {
+    let (Some(at), Ok(ds)) = (pointer, app.session.ds()) else { return };
+    let Some(n) = ds.hover.and_then(|h| ds.doc.node(h)) else { return };
+    let Some(BoardItem::Stamp { author, .. }) = &n.board else { return };
+    if author.is_empty() || !matches!(n.kind, NodeKind::Frame) {
+        return;
+    }
+    let t = Tokens::get(painter.ctx());
+    let galley = painter.layout_no_wrap(author.clone(), semibold(11.0), t.text);
+    let r = Rect::from_min_size(at + vec2(14.0, 14.0), galley.size() + vec2(12.0, 6.0));
+    painter.rect_filled(r, CornerRadius::same(4), t.menu);
+    painter.galley(r.min + vec2(6.0, 3.0), galley, t.menu_text);
+}
diff --git a/crates/ui-egui/src/canvas/board_facilitate.rs b/crates/ui-egui/src/canvas/board_facilitate.rs
new file mode 100644
index 00000000..2c5c66ab
--- /dev/null
+++ b/crates/ui-egui/src/canvas/board_facilitate.rs
@@ -0,0 +1,257 @@
+//! Boards in the UI: the timer and voting pill at the top right of a board, and the vote badges on
+//! objects. Everything they change goes through `board.timer` and `board.vote`.
+
+use std::time::Duration;
+
+use egui::{Align2, Color32, CornerRadius, Rect, RichText, Stroke, Ui, pos2, vec2};
+use figcraft_doc::{BoardTimer, NodeId};
+use figcraft_engine::cmd::facilitate::{self, BADGE_PX};
+use serde_json::{Value, json};
+
+use crate::FigApp;
+use crate::i18n::{tr, tr_noop, trf, trn};
+use crate::icons::{self, Icon};
+use crate::theme::{Tokens, regular, semibold};
+use crate::widgets;
+
+const CELL: f32 = 28.0;
+/// The presets the timer offers (minutes).
+const PRESETS: [u32; 5] = [1, 3, 5, 10, 15];
+/// What a vote can be on, as `board.vote {on}` takes it.
+const SCOPES: [(&str, &str); 3] = [("all", tr_noop("All objects")), ("stickies", tr_noop("Sticky notes")), ("selection", tr_noop("Selection"))];
+
+/// What the pill shows of the vote: none, running (your votes left) or ended (the results).
+enum VoteView {
+    Off,
+    Running { left: u32 },
+    Ended { results: Vec<(usize, NodeId, String, u32)> },
+}
+
+fn vote_view(app: &FigApp) -> VoteView {
+    let Ok(doc) = app.session.doc() else { return VoteView::Off };
+    let Some(vote) = &doc.vote else { return VoteView::Off };
+    if vote.ended {
+        let results = facilitate::ranked(doc, vote).into_iter().map(|(rank, id, n)| (rank, id, facilitate::object_name(doc, id), n)).collect();
+        return VoteView::Ended { results };
+    }
+    let used: u32 = facilitate::mine(doc, &facilitate::voter(&app.session, &Value::Null)).iter().map(|m| m.1).sum();
+    VoteView::Running { left: vote.per_person.saturating_sub(used) }
+}
+
+/// The pill at the top right of a board's canvas: the timer, then the vote.
+pub fn show(app: &mut FigApp, ctx: &egui::Context, canvas: Rect) {
+    let Ok(doc) = app.session.doc() else { return };
+    if !figcraft_engine::board::is_board(doc) {
+        return;
+    }
+    let timer = doc.timer;
+    let now = facilitate::now_ms();
+    if let Some(left) = timer.filter(|t| matches!(t, BoardTimer::Running { .. })).map(|t| t.left(now)).filter(|l| *l > 0) {
+        // Wake when the shown second changes; nothing else ticks.
+        ctx.request_repaint_after(Duration::from_millis(left % 1000 + 5));
+    }
+    let vote = vote_view(app);
+    let editable = app.session.active_read_only().is_none();
+    let t = Tokens::get(ctx);
+    egui::Area::new(egui::Id::unique("board_facilitate"))
+        .order(egui::Order::Middle)
+        .pivot(Align2::RIGHT_TOP)
+        .fixed_pos(pos2(canvas.max.x - 12.0, canvas.min.y + 12.0))
+        .show(ctx, |ui| {
+            egui::Frame::NONE
+                .fill(t.panel)
+                .stroke(Stroke::new(1.0, t.border))
+                .corner_radius(CornerRadius::same(10))
+                .shadow(egui::epaint::Shadow { offset: [0, 2], blur: 12, spread: 0, color: t.shadow })
+                .inner_margin(egui::Margin::same(4))
+                .show(ui, |ui| {
+                    ui.horizontal(|ui| {
+                        ui.spacing_mut().item_spacing.x = 2.0;
+                        timer_part(app, ui, timer, now, editable, &t);
+                        ui.add_space(4.0);
+                        ui.separator();
+                        ui.add_space(4.0);
+                        vote_part(app, ui, vote, editable, &t);
+                    });
+                });
+        });
+}
+
+fn timer_part(app: &mut FigApp, ui: &mut Ui, timer: Option<BoardTimer>, now: u64, editable: bool, t: &Tokens) {
+    let Some(timer) = timer else {
+        let resp = icons::button(ui, Icon::Timer, CELL, false, tr("Timer"));
+        if editable {
+            timer_popup(app, &resp);
+        }
+        return;
+    };
+    let state = facilitate::timer_state(Some(timer), now);
+    let color = match state {
+        "done" => t.danger,
+        "paused" => t.text_secondary,
+        _ => t.text,
+    };
+    let (r, _) = ui.allocate_exact_size(vec2(20.0, CELL), egui::Sense::hover());
+    icons::paint(ui.painter(), Rect::from_center_size(r.center(), vec2(16.0, 16.0)), Icon::Timer, color);
+    // As wide as the same clock in zeros: the pill doesn't jitter as the seconds change.
+    let text = facilitate::clock(timer.left(now));
+    let zeros: String = text.chars().map(|c| if c.is_ascii_digit() { '0' } else { c }).collect();
+    let w = ui.painter().layout_no_wrap(zeros, semibold(13.0), color).size().x;
+    let (r, _) = ui.allocate_exact_size(vec2(w + 2.0, CELL), egui::Sense::hover());
+    ui.painter().text(r.left_center(), Align2::LEFT_CENTER, text, semibold(13.0), color);
+    ui.add_space(2.0);
+    if !editable {
+        return;
+    }
+    let (icon, tip, action) = match timer {
+        BoardTimer::Paused { .. } => (Icon::Play, tr("Resume"), "resume"),
+        BoardTimer::Running { .. } => (Icon::Pause, tr("Pause"), "pause"),
+    };
+    if state != "done" && icons::button(ui, icon, CELL, false, tip).clicked() {
+        app.run("board.timer", json!({"action": action}));
+    }
+    if icons::button(ui, Icon::Plus, CELL, false, tr("Add a minute")).clicked() {
+        app.run("board.timer", json!({"action": "add", "minutes": 1}));
+    }
+    if icons::button(ui, Icon::Close, CELL, false, tr("Stop timer")).clicked() {
+        app.run("board.timer", json!({"action": "stop"}));
+    }
+}
+
+/// The timer button's popover: presets and a custom length.
+fn timer_popup(app: &mut FigApp, anchor: &egui::Response) {
+    crate::right::menu_popup(anchor).width(300.0).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
+        ui.spacing_mut().item_spacing = vec2(6.0, 8.0);
+        ui.add_space(2.0);
+        ui.label(RichText::new(tr("Timer")).font(semibold(12.0)));
+        let mut start = None;
+        ui.horizontal(|ui| {
+            ui.spacing_mut().item_spacing.x = 4.0;
+            for m in PRESETS {
+                if widgets::button(ui, &trf("{n} min", &[("n", &m)]), false, true).clicked() {
+                    start = Some(m);
+                }
+            }
+        });
+        ui.horizontal(|ui| {
+            let id = egui::Id::unique("board_timer_minutes");
+            let mut minutes: u32 = ui.data(|d| d.get_temp(id)).unwrap_or(5);
+            widgets::label(ui, tr("Minutes"), Tokens::get(ui.ctx()).text_secondary);
+            ui.add(egui::DragValue::new(&mut minutes).range(1..=1440).speed(0.25));
+            ui.data_mut(|d| d.insert_temp(id, minutes));
+            if widgets::button(ui, tr("Start"), true, true).clicked() {
+                start = Some(minutes);
+            }
+        });
+        if let Some(minutes) = start {
+            app.run("board.timer", json!({"action": "start", "minutes": minutes}));
+            ui.close();
+        }
+    });
+}
+
+fn vote_part(app: &mut FigApp, ui: &mut Ui, vote: VoteView, editable: bool, t: &Tokens) {
+    match vote {
+        VoteView::Off => {
+            let resp = icons::button(ui, Icon::Vote, CELL, false, tr("Voting session"));
+            if editable {
+                vote_popup(app, &resp);
+            }
+        }
+        VoteView::Running { left } => {
+            let (r, resp) = ui.allocate_exact_size(vec2(20.0, CELL), egui::Sense::hover());
+            icons::paint(ui.painter(), Rect::from_center_size(r.center(), vec2(16.0, 16.0)), Icon::Vote, t.accent_text);
+            let hint = tr("Click objects to vote; click your badge to take a vote back");
+            resp.on_hover_text(hint);
+            ui.label(RichText::new(trn("{n} votes left", left as usize, &[])).font(regular(12.0)).color(t.text)).on_hover_text(hint);
+            ui.add_space(4.0);
+            if editable && widgets::button(ui, tr("End vote"), true, true).clicked() {
+                app.run("board.vote", json!({"action": "end"}));
+            }
+        }
+        VoteView::Ended { results } => {
+            let (r, _) = ui.allocate_exact_size(vec2(20.0, CELL), egui::Sense::hover());
+            icons::paint(ui.painter(), Rect::from_center_size(r.center(), vec2(16.0, 16.0)), Icon::Vote, t.accent_text);
+            let resp = widgets::button(ui, tr("Results"), false, true);
+            results_popup(app, &resp, &results, editable);
+        }
+    }
+}
+
+/// The vote button's popover: votes per person, what to vote on, Start.
+fn vote_popup(app: &mut FigApp, anchor: &egui::Response) {
+    let selected = !app.session.selection().is_empty();
+    crate::right::menu_popup(anchor).width(236.0).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
+        ui.spacing_mut().item_spacing.y = 6.0;
+        ui.add_space(2.0);
+        ui.label(RichText::new(tr("Voting session")).font(semibold(12.0)));
+        let (votes_id, on_id) = (egui::Id::unique("board_vote_votes"), egui::Id::unique("board_vote_on"));
+        let mut votes: u32 = ui.data(|d| d.get_temp(votes_id)).unwrap_or(3);
+        let mut on: usize = ui.data(|d| d.get_temp(on_id)).unwrap_or(0);
+        if on == 2 && !selected {
+            on = 0;
+        }
+        ui.horizontal(|ui| {
+            widgets::label(ui, tr("Votes per person"), Tokens::get(ui.ctx()).text_secondary);
+            ui.add(egui::DragValue::new(&mut votes).range(1..=99));
+        });
+        for (i, (_, label)) in SCOPES.iter().enumerate() {
+            // The selection is offered while there is one.
+            if (i != 2 || selected) && widgets::radio(ui, on == i, tr(label)) {
+                on = i;
+            }
+        }
+        ui.data_mut(|d| {
+            d.insert_temp(votes_id, votes);
+            d.insert_temp(on_id, on);
+        });
+        let scope = SCOPES.get(on).map_or("all", |s| s.0);
+        if widgets::button(ui, tr("Start vote"), true, true).clicked() {
+            app.run("board.vote", json!({"action": "start", "votes": votes, "on": scope}));
+            ui.close();
+        }
+    });
+}
+
+/// The ended vote's results, most votes first: a click on a row selects that object.
+fn results_popup(app: &mut FigApp, anchor: &egui::Response, results: &[(usize, NodeId, String, u32)], editable: bool) {
+    crate::right::menu_popup(anchor).width(260.0).show(|ui| {
+        ui.add_space(2.0);
+        ui.label(RichText::new(tr("Results")).font(semibold(12.0)));
+        if results.is_empty() {
+            widgets::label(ui, tr("No votes yet"), Tokens::get(ui.ctx()).text_secondary);
+        }
+        for (rank, id, name, n) in results {
+            let label = format!("{rank}. {}", widgets::elide(ui, name, 160.0));
+            if crate::right::menu_item(ui, &label, &trn("{n} votes", *n as usize, &[])) {
+                app.run("select.set", json!({"ids": [id]}));
+            }
+        }
+        if editable {
+            ui.add_space(4.0);
+            if widgets::button(ui, tr("Clear results"), false, true).clicked() {
+                app.run("board.vote", json!({"action": "clear"}));
+                ui.close();
+            }
+        }
+    });
+}
+
+/// The vote badges on the page: your votes while the vote runs, everyone's once it ends.
+pub fn badges(app: &FigApp, painter: &egui::Painter) {
+    let Ok(ds) = app.session.ds() else { return };
+    let doc = &ds.doc;
+    let Some(vote) = &doc.vote else { return };
+    let counts = if vote.ended { vote.tally(doc, &doc.votes) } else { facilitate::mine(doc, &facilitate::voter(&app.session, &Value::Null)) };
+    let t = Tokens::get(painter.ctx());
+    let r = BADGE_PX as f32;
+    for (id, n) in counts {
+        let Some(b) = doc.world_bounds(id).filter(|_| doc.page_of(id) == Some(ds.page)) else { continue };
+        let (c, _) = facilitate::badge(b, ds.view.zoom);
+        let c = app.to_screen(c.x, c.y);
+        painter.circle_filled(c + vec2(0.0, 1.0), r + 1.0, Color32::from_black_alpha(40));
+        painter.circle_filled(c, r, t.accent);
+        painter.circle_stroke(c, r, Stroke::new(1.5, Color32::WHITE));
+        painter.text(c, Align2::CENTER_CENTER, n.to_string(), semibold(11.0), t.accent_on);
+    }
+}
diff --git a/crates/ui-egui/src/canvas/builder.rs b/crates/ui-egui/src/canvas/builder.rs
new file mode 100644
index 00000000..bc2360da
--- /dev/null
+++ b/crates/ui-egui/src/canvas/builder.rs
@@ -0,0 +1,121 @@
+use super::outline::stroke;
+use super::overlays::accent;
+use super::*;
+
+/// Width of the lines hatching the hovered and selected regions in vector edit mode (screen px).
+const REGION_HATCH_WIDTH: f32 = 1.4;
+
+/// Vector edit mode: the selected regions and the hovered one hatched in the selection colour,
+/// under the segments and points (the engine lays out and clips the lines).
+pub(super) fn region_hatch(app: &FigApp, painter: &egui::Painter) {
+    let Ok(ds) = app.session.ds() else { return };
+    let (ox, oy) = ds.view.page_to_screen(0.0, 0.0);
+    let (z, min) = (ds.view.zoom, app.canvas.rect.min);
+    let view = figcraft_geom::Affine::new([z, 0.0, 0.0, z, f64::from(min.x) + ox, f64::from(min.y) + oy]);
+    let r = painter.clip_rect();
+    let clip = figcraft_geom::Rect::new(f64::from(r.min.x), f64::from(r.min.y), f64::from(r.max.x), f64::from(r.max.y));
+    for [a, b] in app.session.vector_region_hatch(view, Some(clip)) {
+        painter.line_segment([pos2(a.x as f32, a.y as f32), pos2(b.x as f32, b.y as f32)], stroke(accent(painter), REGION_HATCH_WIDTH));
+    }
+}
+
+/// Shape builder: every region's edges, and the hovered or collected regions hatched (in the
+/// danger colour when releasing removes them).
+pub(super) fn builder_overlay(app: &FigApp, painter: &egui::Painter, t: &Tokens, arr: &figcraft_engine::shapebuilder::Arrangement) {
+    let ov = &app.session.tool.overlay;
+    let screen = |r: &figcraft_engine::shapebuilder::Region| -> Vec<Vec<Pos2>> {
+        r.polys.iter().filter_map(|poly| clean_poly(poly.iter().map(|p| app.to_screen(p.x, p.y)))).collect()
+    };
+    // Edges read on any fill: a light halo under a thin accent line.
+    for r in &arr.regions {
+        for poly in screen(r) {
+            for seg in segments(&poly) {
+                painter.add(Shape::line(seg.to_vec(), stroke(Color32::from_white_alpha(150), 2.5)));
+                painter.add(Shape::line(seg.to_vec(), stroke(accent(painter), 1.0)));
+            }
+        }
+    }
+    let col = if ov.builder_remove { t.danger } else { accent(painter) };
+    for r in ov.builder_regions.iter().filter_map(|i| arr.regions.get(*i)) {
+        hatched(painter, &screen(r), col);
+    }
+}
+
+/// A region contour in screen space, ready to draw: non-finite and repeated points dropped (the
+/// last point back at the first, the points a sliver doubles back on) and sub-pixel slivers left
+/// out, since they're invisible anyway.
+pub(crate) fn clean_poly(points: impl IntoIterator<Item = Pos2>) -> Option<Vec<Pos2>> {
+    let mut out: Vec<Pos2> = Vec::new();
+    for q in points {
+        if !(q.x.is_finite() && q.y.is_finite()) || out.last().is_some_and(|l| l.distance(q) < 0.01) {
+            continue;
+        }
+        out.push(q);
+    }
+    if out.len() > 1 && out.first().is_some_and(|f| f.distance(*out.last().unwrap_or(f)) < 0.01) {
+        out.pop();
+    }
+    let n = out.len();
+    let twice_area: f32 = (0..n).map(|k| out[k].x * out[(k + 1) % n].y - out[(k + 1) % n].x * out[k].y).sum();
+    (n > 2 && twice_area.abs() > 0.4).then_some(out)
+}
+
+/// A closed polygon as its segments. Drawn segment by segment rather than as one closed path: a
+/// joined path asks the tessellator for a mitre at every hairpin a region's sliver doubles back on,
+/// and a zero-length segment there divides by a zero normal, which draws a spike across the canvas.
+fn segments(poly: &[Pos2]) -> impl Iterator<Item = [Pos2; 2]> + '_ {
+    let n = poly.len();
+    (0..n).map(move |k| [poly[k], poly[(k + 1) % n]])
+}
+
+/// Polygons hatched and outlined in `col` (an area about to be filled, merged or removed), each
+/// line on a light halo so it reads on any fill, even one in `col`.
+pub(super) fn hatched(painter: &egui::Painter, polys: &[Vec<Pos2>], col: Color32) {
+    let halo = Color32::from_white_alpha(200);
+    for l in hatch(polys, 6.0) {
+        painter.line_segment(l, stroke(halo, 3.0));
+        painter.line_segment(l, stroke(col, 1.25));
+    }
+    for poly in polys {
+        for seg in segments(poly) {
+            painter.add(Shape::line(seg.to_vec(), stroke(halo, 4.0)));
+            painter.add(Shape::line(seg.to_vec(), stroke(col, 2.0)));
+        }
+    }
+}
+
+/// 45° hatch lines `gap` apart inside polygons (even-odd), in screen space.
+fn hatch(polys: &[Vec<Pos2>], gap: f32) -> Vec<[Pos2; 2]> {
+    // Rotate so the hatch is horizontal, scan, rotate back.
+    let rot = |p: Pos2| pos2((p.x + p.y) * std::f32::consts::FRAC_1_SQRT_2, (p.y - p.x) * std::f32::consts::FRAC_1_SQRT_2);
+    let back = |x: f32, y: f32| pos2((x - y) * std::f32::consts::FRAC_1_SQRT_2, (x + y) * std::f32::consts::FRAC_1_SQRT_2);
+    let edges: Vec<(Pos2, Pos2)> = polys
+        .iter()
+        .flat_map(|poly| {
+            let pts: Vec<Pos2> = poly.iter().map(|p| rot(*p)).collect();
+            let n = pts.len();
+            (0..n).filter_map(move |k| Some((*pts.get(k)?, *pts.get((k + 1) % n)?)))
+        })
+        .collect();
+    let (y0, y1) = edges.iter().fold((f32::INFINITY, f32::NEG_INFINITY), |(lo, hi), (a, b)| (lo.min(a.y).min(b.y), hi.max(a.y).max(b.y)));
+    let mut out = Vec::new();
+    if !(y0.is_finite() && y1.is_finite()) || (y1 - y0) / gap > 4000.0 {
+        return out;
+    }
+    let mut y = (y0 / gap).ceil() * gap;
+    while y < y1 {
+        let mut xs: Vec<f32> = edges
+            .iter()
+            .filter(|(a, b)| (a.y <= y && y < b.y) || (b.y <= y && y < a.y))
+            .map(|(a, b)| a.x + (y - a.y) * (b.x - a.x) / (b.y - a.y))
+            .collect();
+        xs.sort_by(f32::total_cmp);
+        for pair in xs.chunks_exact(2) {
+            if let [a, b] = pair {
+                out.push([back(*a, y), back(*b, y)]);
+            }
+        }
+        y += gap;
+    }
+    out
+}
diff --git a/crates/ui-egui/src/canvas/builder_poly_tests.rs b/crates/ui-egui/src/canvas/builder_poly_tests.rs
new file mode 100644
index 00000000..763cc515
--- /dev/null
+++ b/crates/ui-egui/src/canvas/builder_poly_tests.rs
@@ -0,0 +1,39 @@
+//! The shape builder's region outlines: repeats dropped and sub-pixel slivers left out, so the
+//! tessellator never sees a zero-length segment at a hairpin (that draws a spike across the canvas).
+
+use super::clean_poly;
+use egui::pos2;
+
+#[test]
+fn a_contour_loses_the_point_it_closes_back_to() {
+    // A square whose flattened contour ends where it started, as kurbo's flatten emits it.
+    let sq = vec![pos2(0.0, 0.0), pos2(10.0, 0.0), pos2(10.0, 10.0), pos2(0.0, 10.0), pos2(0.0, 0.0)];
+    let out = clean_poly(sq).expect("a square is drawn");
+    assert_eq!(out, vec![pos2(0.0, 0.0), pos2(10.0, 0.0), pos2(10.0, 10.0), pos2(0.0, 10.0)]);
+}
+
+#[test]
+fn repeated_points_and_stray_values_are_dropped() {
+    // Triplicated points at the corners are what makes the tessellator divide by a zero normal.
+    let poly = vec![pos2(0.0, 0.0), pos2(0.0, 0.0), pos2(0.0, 0.0), pos2(20.0, 0.0), pos2(f32::NAN, 5.0), pos2(20.0, 20.0), pos2(0.0, 20.0)];
+    let out = clean_poly(poly).expect("a square is drawn");
+    assert_eq!(out, vec![pos2(0.0, 0.0), pos2(20.0, 0.0), pos2(20.0, 20.0), pos2(0.0, 20.0)]);
+}
+
+#[test]
+fn a_sliver_a_fraction_of_a_pixel_thin_is_left_out() {
+    // A sliver region that doubles back on itself: 100 px long, 0.002 px thick, closing back.
+    let sliver = vec![pos2(0.0, 0.0), pos2(100.0, 0.0), pos2(100.0, 0.002), pos2(0.0, 0.0)];
+    assert!(clean_poly(sliver).is_none());
+    // Two points (a doubled-back line without thickness) and a single point aren't areas either.
+    assert!(clean_poly(vec![pos2(0.0, 0.0), pos2(10.0, 0.0)]).is_none());
+    assert!(clean_poly(vec![pos2(3.0, 4.0)]).is_none());
+}
+
+#[test]
+fn a_thin_but_visible_region_is_kept() {
+    // 2 px wide and 100 px long: thin, but a real area.
+    let strip = vec![pos2(0.0, 0.0), pos2(100.0, 0.0), pos2(100.0, 2.0), pos2(0.0, 2.0)];
+    let out = clean_poly(strip).expect("a 2 px strip is drawn");
+    assert_eq!(out.len(), 4);
+}
diff --git a/crates/ui-egui/src/comments.rs b/crates/ui-egui/src/canvas/comments.rs
similarity index 96%
rename from crates/ui-egui/src/comments.rs
rename to crates/ui-egui/src/canvas/comments.rs
index 5918dfc0..468836de 100644
--- a/crates/ui-egui/src/comments.rs
+++ b/crates/ui-egui/src/canvas/comments.rs
@@ -189,10 +189,10 @@ pub fn cluster(points: &[Pos2], r: f32) -> Vec<Vec<usize>> {
 }
 
 /// A message's text with its @mentions of `people` picked out, wrapped at `width`.
-pub fn rich_text(text: &str, people: &[&str], color: Color32, width: f32) -> LayoutJob {
+pub fn rich_text(text: &str, people: &[&str], color: Color32, mention_color: Color32, width: f32) -> LayoutJob {
     let mut job = LayoutJob::default();
     let plain = TextFormat { font_id: regular(12.0), color, ..Default::default() };
-    let mention = TextFormat { font_id: semibold(12.0), color: ACCENT, ..Default::default() };
+    let mention = TextFormat { font_id: semibold(12.0), color: mention_color, ..Default::default() };
     let mut at = 0;
     for r in mention_ranges(text, people) {
         job.append(text.get(at..r.start).unwrap_or(""), 0.0, plain.clone());
@@ -400,7 +400,7 @@ pub fn draw(app: &FigApp, painter: &egui::Painter) {
     if let Some((x, y, _)) = &app.ui.comments.draft {
         let r = pin_rect(app.to_screen(*x, *y));
         painter.rect_filled(r, BUBBLE, ACCENT);
-        painter.circle_filled(r.center(), 3.0, Color32::WHITE);
+        painter.circle_filled(r.center(), 3.0, crate::theme::ACCENT_ON);
     }
 }
 
@@ -476,7 +476,7 @@ pub fn start_draft(app: &mut FigApp, x: f64, y: f64) {
 
 /// The reply field's id for a thread.
 fn reply_id(thread: u64) -> Id {
-    Id::new(("comment_reply", thread))
+    Id::unique(("comment_reply", thread))
 }
 
 fn set_cursor(ctx: &egui::Context, id: Id, at: usize) {
@@ -650,7 +650,7 @@ fn message(
     let t = Tokens::get(ui.ctx());
     let ctx = ui.ctx().clone();
     let id = cx.c.id;
-    let hover_key = Id::new(("comment_msg_hover", id, i));
+    let hover_key = Id::unique(("comment_msg_hover", id, i));
     let hovered = ctx.data(|d| d.get_temp::<bool>(hover_key)).unwrap_or(false);
     let indent = 36.0;
     let block = ui.scope(|ui| {
@@ -663,10 +663,10 @@ fn message(
             ui.label(egui::RichText::new(when).font(regular(11.0)).color(t.text_tertiary));
             ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
                 if m.author == cx.me {
-                    let menu = Id::new(("comment_msg_more_menu", id, i));
+                    let menu = Id::unique(("comment_msg_more_menu", id, i));
                     let more = hover_button(
                         ui,
-                        Id::new(("comment_msg_more", id, i)),
+                        Id::unique(("comment_msg_more", id, i)),
                         Icon::Dots,
                         hovered || egui::Popup::is_id_open(&ctx, menu),
                         tr("More"),
@@ -682,10 +682,10 @@ fn message(
                         }
                     });
                 }
-                let menu = Id::new(("comment_msg_react_menu", id, i));
+                let menu = Id::unique(("comment_msg_react_menu", id, i));
                 let react = hover_button(
                     ui,
-                    Id::new(("comment_msg_react", id, i)),
+                    Id::unique(("comment_msg_react", id, i)),
                     Icon::Reaction,
                     hovered || egui::Popup::is_id_open(&ctx, menu),
                     tr("Add reaction"),
@@ -715,7 +715,7 @@ fn message(
                 ui.horizontal(|ui| {
                     ui.add_space(indent);
                     ui.vertical(|ui| {
-                        if composer(ui, Id::new(("comment_edit", id, i)), text, tr("Edit comment"), cx.people, cx.me, pick) {
+                        if composer(ui, Id::unique(("comment_edit", id, i)), text, tr("Edit comment"), cx.people, cx.me, pick) {
                             let mut p = message_params(id, i);
                             p["text"] = json!(text.trim());
                             *act = Some(Act::Run("comment.edit", p));
@@ -729,7 +729,7 @@ fn message(
                     ui.add_space(indent);
                     let mut names: Vec<&str> = cx.people.iter().map(String::as_str).collect();
                     names.push(cx.me);
-                    ui.add(egui::Label::new(rich_text(&m.text, &names, t.text, ui.available_width())).wrap());
+                    ui.add(egui::Label::new(rich_text(&m.text, &names, t.text, t.accent_text, ui.available_width())).wrap());
                 });
             }
         }
@@ -828,12 +828,12 @@ pub fn popovers(app: &mut FigApp, ctx: &egui::Context) {
         let me = me(app);
         let mut pick = std::mem::take(&mut app.ui.comments.mention);
         let mut post = false;
-        egui::Area::new(Id::new("comment_draft")).order(egui::Order::Foreground).fixed_pos(popover_pos(app.to_screen(x, y), canvas)).show(
+        egui::Area::new(Id::unique("comment_draft")).order(egui::Order::Foreground).fixed_pos(popover_pos(app.to_screen(x, y), canvas)).show(
             ctx,
             |ui| {
                 popover_frame(&t).show(ui, |ui| {
                     ui.set_width(POPOVER_W - 24.0);
-                    post = composer(ui, Id::new("comment_draft_text"), &mut text, tr("Add a comment"), &people, &me, &mut pick);
+                    post = composer(ui, Id::unique("comment_draft_text"), &mut text, tr("Add a comment"), &people, &me, &mut pick);
                 });
             },
         );
@@ -877,7 +877,7 @@ pub fn thread(app: &mut FigApp, ctx: &egui::Context, id: u64, anchor: Pos2, boun
     let mut pick = std::mem::take(&mut app.ui.comments.mention);
     let mut act: Option<Act> = None;
     let cx = ThreadCtx { c: &c, me: &me, people: &people };
-    egui::Area::new(Id::new("comment_thread")).order(egui::Order::Foreground).fixed_pos(popover_pos(anchor, bounds)).show(ctx, |ui| {
+    egui::Area::new(Id::unique("comment_thread")).order(egui::Order::Foreground).fixed_pos(popover_pos(anchor, bounds)).show(ctx, |ui| {
         popover_frame(&t).show(ui, |ui| {
             ui.set_width(POPOVER_W - 24.0);
             // Header: resolve, more, close.
@@ -934,7 +934,7 @@ pub fn thread(app: &mut FigApp, ctx: &egui::Context, id: u64, anchor: Pos2, boun
         }
         Some(Act::CopyLink) => {
             if let Some(link) = app.run("comment.link", json!({"id": id})).and_then(|v| v.get("link").and_then(Value::as_str).map(str::to_string)) {
-                app.services.clipboard_set_text(&link);
+                app.clipboard_set_text(&link);
                 app.toast(tr("Link copied"));
             }
         }
@@ -1051,7 +1051,7 @@ pub fn panel(app: &mut FigApp, ui: &mut Ui) {
     ui.horizontal(|ui| {
         ui.add_space(16.0);
         let w = ui.available_width() - 16.0;
-        if let Some(s) = crate::widgets::text_field(ui, Id::new("comment_search"), &app.ui.comments.search, w, tr("Search comments")) {
+        if let Some(s) = crate::widgets::text_field(ui, Id::unique("comment_search"), &app.ui.comments.search, w, tr("Search comments")) {
             app.ui.comments.search = s;
         }
     });
@@ -1062,7 +1062,8 @@ pub fn panel(app: &mut FigApp, ui: &mut Ui) {
             ui.add_space(16.0);
             ui.label(egui::RichText::new(tr(app.ui.comments.filter.label())).font(regular(11.0)).color(t.text_secondary));
             ui.add_space(4.0);
-            if ui.add(egui::Label::new(egui::RichText::new(tr("Show open")).font(regular(11.0)).color(ACCENT)).sense(Sense::click())).clicked() {
+            if ui.add(egui::Label::new(egui::RichText::new(tr("Show open")).font(regular(11.0)).color(t.accent_text)).sense(Sense::click())).clicked()
+            {
                 app.ui.comments.filter = Filter::Open;
             }
         });
@@ -1177,7 +1178,7 @@ pub fn presenter(app: &mut FigApp, ctx: &egui::Context, frame: NodeId, place: cr
     let mut clicked = None;
     for p in &pins {
         let r = pin_rect(p.at);
-        egui::Area::new(Id::new(("present_comment_pin", p.id))).order(egui::Order::Foreground).fixed_pos(r.min).show(ctx, |ui| {
+        egui::Area::new(Id::unique(("present_comment_pin", p.id))).order(egui::Order::Foreground).fixed_pos(r.min).show(ctx, |ui| {
             let (rr, resp) = ui.allocate_exact_size(r.size(), Sense::click());
             paint_pin(ui.painter(), rr, p, open == Some(p.id) || resp.hovered());
             if resp.on_hover_cursor(egui::CursorIcon::PointingHand).clicked() {
diff --git a/crates/ui-egui/src/cursors.rs b/crates/ui-egui/src/canvas/cursors.rs
similarity index 99%
rename from crates/ui-egui/src/cursors.rs
rename to crates/ui-egui/src/canvas/cursors.rs
index 1c4e4ad0..dec2a1b3 100644
--- a/crates/ui-egui/src/cursors.rs
+++ b/crates/ui-egui/src/canvas/cursors.rs
@@ -121,7 +121,7 @@ impl Shown {
     pub fn show(self, ctx: &egui::Context, at: Pos2) {
         ctx.set_cursor_icon(self.icon());
         if let Shown::Drawn(g) = self {
-            paint(&ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("canvas_cursor"))), at, g);
+            paint(&ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("canvas_cursor"))), at, g);
         }
     }
 }
diff --git a/crates/ui-egui/src/frame_labels.rs b/crates/ui-egui/src/canvas/frame_labels.rs
similarity index 84%
rename from crates/ui-egui/src/frame_labels.rs
rename to crates/ui-egui/src/canvas/frame_labels.rs
index 2718fddd..a87fc9f4 100644
--- a/crates/ui-egui/src/frame_labels.rs
+++ b/crates/ui-egui/src/canvas/frame_labels.rs
@@ -58,10 +58,16 @@ pub fn turn_since(painter: &Painter, from: ShapeIdx, pivot: Pos2, angle: f32) {
     });
 }
 
+/// Recursively rotate shape geometry by `rot`/`angle` about `pivot`: leaves
+/// no-op/callback/band shapes alone, rotates points and centers, adds the angle to
+/// ellipses/rects/text, and rotates meshes.
 fn turn(shape: &mut Shape, rot: Rot2, angle: f32, pivot: Pos2) {
     let at = |p: &mut Pos2| *p = pivot + rot * (*p - pivot);
     match shape {
         Shape::Noop | Shape::Callback(_) => {}
+        // Bands are not drawn by this UI; if one ever arrives, rotate it via its own `angle`
+        // rather than approximating the samples as points.
+        Shape::Band(_) => {}
         Shape::Vec(v) => v.iter_mut().for_each(|s| turn(s, rot, angle, pivot)),
         Shape::Circle(c) => at(&mut c.center),
         Shape::Ellipse(e) => {
@@ -103,7 +109,7 @@ pub fn draw(app: &FigApp, painter: &Painter, t: &Tokens, doc: &Document, id: Nod
     let col = if is_comp {
         COMPONENT
     } else if selected || hovered {
-        ACCENT
+        crate::theme::canvas_accent(painter.ctx())
     } else {
         t.text_secondary
     };
@@ -151,6 +157,28 @@ pub fn draw(app: &FigApp, painter: &Painter, t: &Tokens, doc: &Document, id: Nod
     Some([area.left_top(), area.right_top(), area.right_bottom(), area.left_bottom()].map(|p| tl + rot * (p - tl)))
 }
 
+/// The field over a frame's or section's name label being renamed (`UiState::rename_label`, from a
+/// double-click on the label): Enter or a click elsewhere renames the layer, Escape keeps the name.
+/// The rename ends when the field lets go of the keyboard or the label is gone.
+pub fn rename_field(app: &mut FigApp, ui: &mut egui::Ui) {
+    let Some(r) = app.ui.rename_label else { return };
+    let quad = app.session.tool.labels.iter().find(|(i, _)| *i == r.id).map(|(_, q)| q.map(|p| app.to_screen(p.x, p.y)));
+    let name = app.session.doc().ok().and_then(|d| d.node(r.id)).map(|n| n.name.clone());
+    let (Some(quad), Some(name)) = (quad, name) else {
+        app.ui.rename_label = None;
+        return;
+    };
+    let area = Rect::from_points(&quad);
+    let font = regular(11.0);
+    let text_w = ui.painter().layout_no_wrap(name.clone(), font.clone(), Color32::WHITE).size().x;
+    let rect = Rect::from_min_size(pos2(area.min.x, area.max.y - 16.0), vec2((text_w + 24.0).max(area.width()).clamp(80.0, 480.0), 16.0));
+    let (done, open) = crate::widgets::rename_field(ui, egui::Id::unique(("frame_label_rename", r.id)), &name, rect, font, r.start);
+    app.ui.rename_label = open.then_some(crate::layers::Rename { id: r.id, start: false });
+    if let Some(new) = done {
+        app.run("object.rename", serde_json::json!({"ids": [r.id], "name": new}));
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/ui-egui/src/frame_stats.rs b/crates/ui-egui/src/canvas/frame_stats.rs
similarity index 100%
rename from crates/ui-egui/src/frame_stats.rs
rename to crates/ui-egui/src/canvas/frame_stats.rs
diff --git a/crates/ui-egui/src/guides.rs b/crates/ui-egui/src/canvas/guides.rs
similarity index 99%
rename from crates/ui-egui/src/guides.rs
rename to crates/ui-egui/src/canvas/guides.rs
index 69ab8ee8..c3bb6589 100644
--- a/crates/ui-egui/src/guides.rs
+++ b/crates/ui-egui/src/canvas/guides.rs
@@ -49,13 +49,14 @@ struct Placed {
     line: Option<[Point; 2]>,
 }
 
+/// Stable egui id for guide dragging.
 fn drag_id() -> Id {
-    Id::new("guide_drag")
+    Id::unique("guide_drag")
 }
 
 /// The dragged guide as it would land.
 fn preview_id() -> Id {
-    Id::new("guide_preview")
+    Id::unique("guide_preview")
 }
 
 /// The page's guides and those of its top-level frames (frames last, so they're found first).
@@ -268,6 +269,7 @@ pub fn input(app: &mut FigApp, ctx: &egui::Context, pos: Pos2) -> bool {
             app.run("guide.select", owned(g.owner, page, json!({"index": g.index})));
             if secondary {
                 app.ui.context_menu = Some((pos, Vec::new()));
+                app.ui.context_menu_shown = false;
             } else {
                 ctx.data_mut(|d| {
                     d.insert_temp(drag_id(), GuideDrag::Move { owner: g.owner, index: g.index, vertical: g.vertical, copy: alt, frame })
diff --git a/crates/ui-egui/src/handles.rs b/crates/ui-egui/src/canvas/handles.rs
similarity index 95%
rename from crates/ui-egui/src/handles.rs
rename to crates/ui-egui/src/canvas/handles.rs
index 282e351f..d29d59ee 100644
--- a/crates/ui-egui/src/handles.rs
+++ b/crates/ui-egui/src/canvas/handles.rs
@@ -11,10 +11,17 @@ use figcraft_geom::Point;
 use serde_json::json;
 
 use crate::colorpicker::PickerTarget;
-use crate::theme::{ACCENT, semibold};
+use crate::theme::semibold;
 use crate::{FigApp, RightTab};
 
-const PINK: Color32 = Color32::from_rgb(0xF2, 0x48, 0x8C);
+pub(crate) const PINK: Color32 = Color32::from_rgb(0xF2, 0x48, 0x8C);
+
+pub(crate) fn pink_label(painter: &egui::Painter, label: String, center: Pos2) {
+    let galley = painter.layout_no_wrap(label, semibold(10.0), Color32::WHITE);
+    let rect = Rect::from_center_size(center, galley.size() + vec2(8.0, 4.0));
+    painter.rect_filled(rect, CornerRadius::same(3), PINK);
+    painter.galley(rect.min + vec2(4.0, 2.0), galley, Color32::WHITE);
+}
 
 #[derive(Clone, Debug)]
 enum Drag {
@@ -60,8 +67,9 @@ fn crop_corners(app: &FigApp, id: NodeId, r: (f64, f64, f64, f64)) -> Option<[Po
     ])
 }
 
+/// Stable egui id for handle dragging.
 fn drag_id() -> Id {
-    Id::new("figcraft_handle_drag")
+    Id::unique("figcraft_handle_drag")
 }
 
 /// The gradient being edited (single node, picker open on a gradient paint).
@@ -286,7 +294,12 @@ pub fn draw(app: &FigApp, painter: &egui::Painter) {
             painter.rect_filled(r, CornerRadius::same(2), crate::theme::doc_c32(painter.ctx(), s.color.with_alpha(1.0)));
             painter.rect_stroke(r, CornerRadius::same(2), Stroke::new(2.0, Color32::WHITE), StrokeKind::Outside);
             if i == selected {
-                painter.rect_stroke(r.expand(2.0), CornerRadius::same(3), Stroke::new(1.5, ACCENT), StrokeKind::Outside);
+                painter.rect_stroke(
+                    r.expand(2.0),
+                    CornerRadius::same(3),
+                    Stroke::new(1.5, crate::theme::canvas_accent(painter.ctx())),
+                    StrokeKind::Outside,
+                );
             }
         }
         for (i, p) in [a, b, c].iter().enumerate() {
@@ -294,7 +307,7 @@ pub fn draw(app: &FigApp, painter: &egui::Painter) {
                 continue;
             }
             painter.circle_filled(*p, 5.0, Color32::WHITE);
-            painter.circle_stroke(*p, 5.0, Stroke::new(1.5, ACCENT));
+            painter.circle_stroke(*p, 5.0, Stroke::new(1.5, crate::theme::canvas_accent(painter.ctx())));
         }
         return;
     }
@@ -304,8 +317,8 @@ pub fn draw(app: &FigApp, painter: &egui::Painter) {
         painter.line_segment([a, b], Stroke::new(1.0, Color32::from_black_alpha(120)));
         // The start is hollow (least blur), the end filled (most blur by default).
         painter.circle_filled(a, 5.0, Color32::WHITE);
-        painter.circle_stroke(a, 5.0, Stroke::new(1.5, ACCENT));
-        painter.circle_filled(b, 5.0, ACCENT);
+        painter.circle_stroke(a, 5.0, Stroke::new(1.5, crate::theme::canvas_accent(painter.ctx())));
+        painter.circle_filled(b, 5.0, crate::theme::canvas_accent(painter.ctx()));
         painter.circle_stroke(b, 5.0, Stroke::new(1.5, Color32::WHITE));
         return;
     }
@@ -313,11 +326,11 @@ pub fn draw(app: &FigApp, painter: &egui::Painter) {
         let Some(c) = crop_corners(app, id, r) else { return };
         let outline = vec![c[0], c[1], c[2], c[3], c[0]];
         painter.add(Shape::line(outline.clone(), Stroke::new(2.0, Color32::WHITE)));
-        painter.add(Shape::line(outline, Stroke::new(1.0, ACCENT)));
+        painter.add(Shape::line(outline, Stroke::new(1.0, crate::theme::canvas_accent(painter.ctx()))));
         for p in c {
             let hr = Rect::from_center_size(p, vec2(8.0, 8.0));
             painter.rect_filled(hr, CornerRadius::ZERO, Color32::WHITE);
-            painter.rect_stroke(hr, CornerRadius::ZERO, Stroke::new(1.0, ACCENT), StrokeKind::Inside);
+            painter.rect_stroke(hr, CornerRadius::ZERO, Stroke::new(1.0, crate::theme::canvas_accent(painter.ctx())), StrokeKind::Inside);
         }
         return;
     }
@@ -338,11 +351,7 @@ pub fn draw(app: &FigApp, painter: &egui::Painter) {
         let hot = hover.is_some_and(|h| r.contains(h)) || active_side == Some(*side);
         if hot {
             painter.rect_filled(*r, CornerRadius::ZERO, PINK.gamma_multiply(0.25));
-            let label = crate::canvas::fmt(*v);
-            let galley = painter.layout_no_wrap(label, semibold(10.0), Color32::WHITE);
-            let lr = Rect::from_center_size(r.center(), galley.size() + vec2(8.0, 4.0));
-            painter.rect_filled(lr, CornerRadius::same(3), PINK);
-            painter.galley(lr.min + vec2(4.0, 2.0), galley, Color32::WHITE);
+            pink_label(painter, crate::canvas::fmt(*v), r.center());
         }
     }
     let drag_key = match &dragging {
@@ -356,10 +365,7 @@ pub fn draw(app: &FigApp, painter: &egui::Painter) {
             painter.rect_filled(r, CornerRadius::ZERO, PINK.gamma_multiply(0.3));
             let c = r.center();
             painter.line_segment([pos2(c.x - 3.0, c.y), pos2(c.x + 3.0, c.y)], Stroke::new(1.0, PINK));
-            let galley = painter.layout_no_wrap(crate::canvas::fmt(g.value), semibold(10.0), Color32::WHITE);
-            let lr = Rect::from_center_size(c, galley.size() + vec2(8.0, 4.0));
-            painter.rect_filled(lr, CornerRadius::same(3), PINK);
-            painter.galley(lr.min + vec2(4.0, 2.0), galley, Color32::WHITE);
+            pink_label(painter, crate::canvas::fmt(g.value), c);
         }
     }
     let _ = Align2::CENTER_CENTER;
diff --git a/crates/ui-egui/src/canvas/input.rs b/crates/ui-egui/src/canvas/input.rs
new file mode 100644
index 00000000..fc518d2f
--- /dev/null
+++ b/crates/ui-egui/src/canvas/input.rs
@@ -0,0 +1,260 @@
+use super::*;
+
+/// The zoom tool while Z is held (Alt: zoom out): a click zooms a step about the pointer, a drag
+/// zooms to the dragged area. Takes the pointer from the other tools while it's active.
+fn zoom_tool(app: &mut FigApp, ui: &Ui, resp: &egui::Response, pos: Pos2, mods: egui::Modifiers, typing: bool) -> bool {
+    let held = !typing && !mods.command && ui.input(|i| i.key_down(egui::Key::Z));
+    app.canvas.zoom_tool = held.then_some(mods.alt);
+    let Some(start) = app.canvas.zoom_drag.or_else(|| (held && resp.hovered() && ui.input(|i| i.pointer.primary_pressed())).then_some(pos)) else {
+        return held;
+    };
+    app.canvas.zoom_drag = Some(start);
+    let area = Rect::from_two_pos(start, pos);
+    if ui.input(|i| i.pointer.primary_down()) {
+        return true;
+    }
+    app.canvas.zoom_drag = None;
+    let (a, b) = (app.to_page(area.min), app.to_page(area.max));
+    let params = if area.width() > 4.0 && area.height() > 4.0 {
+        json!({"x": a.x, "y": a.y, "width": b.x - a.x, "height": b.y - a.y})
+    } else {
+        let p = app.to_page(pos);
+        json!({"x": p.x, "y": p.y, "out": mods.alt})
+    };
+    app.run("view.zoomAt", params);
+    true
+}
+
+/// The pointer and keys on the canvas. False when something on it with a cursor of its own has
+/// the pointer (a comment pin, a ruler guide, a gradient or padding handle): the tool's cursor
+/// then doesn't show.
+pub(super) fn input(app: &mut FigApp, ui: &mut Ui, resp: &egui::Response) -> bool {
+    if crate::proto_canvas::input(app, ui, resp) {
+        // A prototype gesture is a press on the canvas too: the Pages list gives up the keyboard.
+        app.ui.pages_focus = None;
+        return true;
+    }
+    let ctx = ui.ctx().clone();
+    // Two fingers pan as well as pinch (a touch screen has no scroll wheel).
+    let (mods, scroll, zoom_delta, hover_pos, space) = ctx.input(|i| {
+        let pan = i.multi_touch().map_or(egui::Vec2::ZERO, |m| m.translation_delta);
+        (i.modifiers, i.smooth_scroll_delta + pan, i.zoom_delta(), i.pointer.hover_pos(), i.key_down(egui::Key::Space))
+    });
+    let editing_text = app.session.ds().map(|d| d.text_edit.is_some()).unwrap_or(false);
+    let typing_elsewhere = crate::a11y::field_focused(&ctx);
+    app.canvas.space_pan = space && !editing_text && !typing_elsewhere;
+    if !app.canvas.dragging && crate::selection_spacing::input(app, &ctx, hover_pos, resp.hovered(), app.canvas.space_pan) {
+        return false;
+    }
+    // Dropped files import onto the canvas, behind a card while they do ([`crate::pending_open`]);
+    // a dropped document opens as a file of its own, as on the home screen. Dev Mode imports
+    // nothing into the design, and says so once for the whole drop.
+    let dropped = ctx.input(|i| i.raw.dropped_files.clone());
+    let mut refused = false;
+    for f in dropped {
+        let path = f.path().to_path_buf();
+        if crate::is_document(&path) {
+            crate::pending_open::open_dropped(app, &f);
+            continue;
+        }
+        if refused || crate::menus::dev_mode_refuses(app, "file.import") {
+            refused = true;
+            continue;
+        }
+        let pt = hover_pos.map(|h| app.to_page(h)).unwrap_or_default();
+        let name = path.file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| "dropped.png".into());
+        let (params, read) = if path.exists() {
+            (json!({"path": path.to_string_lossy(), "x": pt.x, "y": pt.y}), None)
+        } else {
+            (json!({"name": name, "x": pt.x, "y": pt.y}), Some(crate::dropped_bytes(&f, &name)))
+        };
+        let Some(target) =
+            app.session.ds().ok().map(|doc| crate::pending_open::ImportTarget { uid: doc.uid, page: doc.page, name: doc.doc.name.clone() })
+        else {
+            continue;
+        };
+        app.ui.pending_opens.push(crate::pending_open::PendingOpen { label: name, params, command: "file.import", target: Some(target), read });
+    }
+    let Some(pos) = hover_pos.filter(|p| app.canvas.rect.contains(*p)) else {
+        // A drag released off the canvas, or off the window, ends where the pointer was last seen.
+        if app.canvas.dragging && !ctx.input(|i| i.pointer.primary_down()) {
+            app.canvas.dragging = false;
+            if let Some(at) = hover_pos.or_else(|| app.canvas.last_pointer.map(|p| app.to_screen(p.x, p.y))) {
+                send(app, PointerKind::Up, at, &mods);
+            }
+        }
+        // Leaving the canvas: nothing is hovered there any more.
+        if !app.canvas.dragging && std::mem::take(&mut app.canvas.hovering) {
+            app.session.pointer_left();
+        }
+        // A pan whose button was released off the canvas is over.
+        if !ctx.input(|i| i.pointer.button_down(egui::PointerButton::Middle) || i.pointer.primary_down()) {
+            app.canvas.middle_pan = None;
+        }
+        return true;
+    };
+    // A press on the canvas gives the keyboard back to it (arrows nudge again).
+    if resp.hovered() && ctx.input(|i| i.pointer.any_pressed()) {
+        app.ui.layers_focus = false;
+        app.ui.pages_focus = None;
+        app.ui.key_box = None;
+    }
+    // Zoom (pinch, Cmd/Ctrl+scroll) about the pointer; plain scroll pans.
+    if resp.hovered() {
+        if (zoom_delta - 1.0).abs() > 1e-4 {
+            let anchor = app.to_page(pos);
+            if let Ok(ds) = app.session.ds_mut() {
+                let z = ds.view.zoom * f64::from(zoom_delta);
+                ds.view.set_zoom_at(z, (anchor.x, anchor.y));
+                ds.revision += 1;
+            }
+        } else if scroll != egui::Vec2::ZERO
+            && let Ok(ds) = app.session.ds_mut()
+        {
+            ds.view.scroll(f64::from(scroll.x), f64::from(scroll.y), mods.shift);
+            ds.revision += 1;
+        }
+    }
+    if zoom_tool(app, ui, resp, pos, mods, editing_text || typing_elsewhere) {
+        return true;
+    }
+    // Middle-button / space panning.
+    let middle_down = ctx.input(|i| i.pointer.button_down(egui::PointerButton::Middle));
+    if (middle_down || (app.canvas.space_pan && ctx.input(|i| i.pointer.primary_down()))) && resp.hovered() || app.canvas.middle_pan.is_some() {
+        if let Ok(ds) = app.session.ds_mut() {
+            match app.canvas.middle_pan {
+                None => app.canvas.middle_pan = Some((pos, ds.view.cx, ds.view.cy)),
+                Some((p0, cx, cy)) => {
+                    let z = ds.view.zoom.max(1e-6);
+                    ds.view.cx = cx - f64::from(pos.x - p0.x) / z;
+                    ds.view.cy = cy - f64::from(pos.y - p0.y) / z;
+                    ds.revision += 1;
+                }
+            }
+        }
+        if !middle_down && !ctx.input(|i| i.pointer.primary_down()) {
+            app.canvas.middle_pan = None;
+        }
+        return true;
+    }
+    if !app.canvas.dragging && (resp.hovered() || app.ui.comments.dragging()) && crate::comments::input(app, &ctx, pos) {
+        return false;
+    }
+    if !app.canvas.dragging && resp.hovered() && crate::guides::input(app, &ctx, pos) {
+        return false;
+    }
+    if !app.canvas.dragging && resp.hovered() && crate::handles::input(app, &ctx, pos) {
+        return false;
+    }
+    if resp.secondary_clicked() {
+        open_context_menu(app, pos, mods.command);
+        return true;
+    }
+    // A third quick click is counted as a triple, not a double (a click elsewhere in between still
+    // leaves its time in the sequence): it means the same here — edit, enter, open — unless a
+    // vector or text is being edited, where a triple already has its own meaning. A triple on
+    // empty canvas still means a double in vector edit mode: the double-click that entered edit
+    // mode counts on, so leaving it right away would otherwise take a fourth click or a pause.
+    let ds = app.session.ds().ok();
+    let editing = ds.is_some_and(|d| d.vector_edit.is_some() || d.text_edit.is_some());
+    // Only a triple click asks (it walks the parts' render bounds).
+    let empty_canvas = || {
+        ds.is_some_and(|d| {
+            let Some(ve) = d.vector_edit.as_ref().filter(|v| v.anchor.is_none() && d.text_edit.is_none()) else {
+                return false;
+            };
+            let p = app.to_page(pos);
+            let tol = 6.0 / d.view.zoom.max(1e-6);
+            ve.parts().iter().all(|part| d.doc.world_render_bounds(part.id).is_none_or(|b| !b.inflate(tol * 4.0, tol * 4.0).contains(p)))
+        })
+    };
+    if resp.double_clicked() || (resp.triple_clicked() && (!editing || empty_canvas())) {
+        let ev = pointer_event(app, PointerKind::DoubleClick, pos, &mods);
+        if let Err(e) = app.session.pointer(&ev) {
+            app.toast(e.to_string());
+        }
+        app.canvas.dragging = false;
+        return true;
+    }
+    let primary_pressed = ctx.input(|i| i.pointer.button_pressed(egui::PointerButton::Primary));
+    let primary_down = ctx.input(|i| i.pointer.primary_down());
+    let primary_released = ctx.input(|i| i.pointer.button_released(egui::PointerButton::Primary));
+    let kind = if primary_pressed && resp.hovered() {
+        app.canvas.dragging = true;
+        app.ui.context_menu = None;
+        app.ui.tool_flyout = None;
+        // Clicking the canvas takes focus from panel fields.
+        ctx.memory_mut(|m| {
+            if let Some(f) = m.focused() {
+                m.surrender_focus(f);
+            }
+        });
+        Some(PointerKind::Down)
+    } else if app.canvas.dragging && primary_released {
+        app.canvas.dragging = false;
+        Some(PointerKind::Up)
+    } else if app.canvas.dragging && primary_down {
+        Some(PointerKind::Move)
+    } else if resp.hovered() {
+        app.canvas.hovering = true;
+        Some(PointerKind::Hover)
+    } else {
+        // Something over the canvas took the pointer.
+        if std::mem::take(&mut app.canvas.hovering) {
+            app.session.pointer_left();
+        }
+        None
+    };
+    // Pen pressure comes with touch events (a pen on Windows, a stylus in a browser); a mouse,
+    // macOS and Linux tablets report none and draw at the stroke weight.
+    let force = ctx.input(|i| {
+        i.events.iter().rev().find_map(|e| match e {
+            egui::Event::Touch { force: Some(f), .. } if f.is_finite() && *f > 0.0 => Some(f.clamp(0.0, 1.0)),
+            _ => None,
+        })
+    });
+    if force.is_some() {
+        app.canvas.pressure = force;
+    }
+    if let Some(k) = kind {
+        send(app, k, pos, &mods);
+        // The pointer also let go within this frame (a quick click, or a slow frame): the tools get
+        // the release too, so the press's gesture ends — a quick click with a shape tool still
+        // draws and returns to Move, and a double-click right after drawing finds the Move tool.
+        if matches!(k, PointerKind::Down) && primary_released {
+            app.canvas.dragging = false;
+            send(app, PointerKind::Up, pos, &mods);
+        }
+    }
+    true
+}
+
+/// Pointer event `kind` at screen point `pos`, to the tools.
+fn send(app: &mut FigApp, kind: PointerKind, pos: Pos2, m: &egui::Modifiers) {
+    let ev = pointer_event(app, kind, pos, m);
+    if kind == PointerKind::Up {
+        app.canvas.pressure = None;
+    }
+    app.canvas.last_pointer = Some(Point::new(ev.x, ev.y));
+    if let Err(e) = app.session.pointer(&ev) {
+        app.toast(e.to_string());
+    }
+    app.handle_ui_requests();
+}
+
+/// Right-click at screen `pos`: select what's under the pointer (`deep`: the nested layer), then
+/// open the context menu there.
+pub fn open_context_menu(app: &mut FigApp, pos: Pos2, deep: bool) {
+    let p = app.to_page(pos);
+    if let Ok(ds) = app.session.ds() {
+        let (doc, page, sel, zoom) = (ds.doc.clone(), ds.page, ds.selection.clone(), ds.view.zoom.max(1e-6));
+        if let Some(leaf) = app.session.hit(&doc, page, p, 2.0 / zoom) {
+            let target = figcraft_doc::geometry::select_target(&doc, leaf, &sel, deep);
+            if !sel.contains(&target) {
+                app.session.set_selection(vec![target]);
+            }
+        }
+    }
+    app.ui.context_menu = Some((pos, app.session.selection()));
+    app.ui.context_menu_shown = false;
+}
diff --git a/crates/ui-egui/src/live_text.rs b/crates/ui-egui/src/canvas/live_text.rs
similarity index 100%
rename from crates/ui-egui/src/live_text.rs
rename to crates/ui-egui/src/canvas/live_text.rs
diff --git a/crates/ui-egui/src/measure_overlay.rs b/crates/ui-egui/src/canvas/measure_overlay.rs
similarity index 96%
rename from crates/ui-egui/src/measure_overlay.rs
rename to crates/ui-egui/src/canvas/measure_overlay.rs
index 053ce861..ed8f019b 100644
--- a/crates/ui-egui/src/measure_overlay.rs
+++ b/crates/ui-egui/src/canvas/measure_overlay.rs
@@ -12,8 +12,9 @@ const GAP: f32 = 4.0;
 /// Padding inside a label's pill.
 const PAD: Vec2 = vec2(4.0, 2.0);
 
-/// Draw the tool overlay's guides, measurement labels and measured box; labels keep clear of
-/// `avoid` (the selection's size label).
+/// Draw the tool overlay's guides, measurement labels and measured box, and in Dev Mode the
+/// measurements kept on the canvas; labels keep clear of `avoid` (the selection's size label) and
+/// of one another.
 pub fn draw(app: &FigApp, painter: &egui::Painter, t: &Tokens, avoid: Option<Rect>) {
     let ov = &app.session.tool.overlay;
     let line = Stroke::new(1.0, t.guide);
@@ -21,7 +22,7 @@ pub fn draw(app: &FigApp, painter: &egui::Painter, t: &Tokens, avoid: Option<Rec
         painter.rect_stroke(Rect::from_two_pos(app.to_screen(x0, y0), app.to_screen(x1, y1)), CornerRadius::ZERO, line, StrokeKind::Middle);
     }
     let mut labels: Vec<(Pos2, Pos2, String)> = Vec::new();
-    for g in &ov.guides {
+    for g in ov.guides.iter().chain(crate::dev_mode::saved_lines(app)) {
         let (a, b) = (app.to_screen(g.x0, g.y0), app.to_screen(g.x1, g.y1));
         if g.x0 == g.x1 && g.y0 == g.y1 {
             for d in [vec2(4.0, 4.0), vec2(4.0, -4.0)] {
diff --git a/crates/ui-egui/src/canvas/outline.rs b/crates/ui-egui/src/canvas/outline.rs
new file mode 100644
index 00000000..58f5fd20
--- /dev/null
+++ b/crates/ui-egui/src/canvas/outline.rs
@@ -0,0 +1,196 @@
+use super::*;
+
+pub(super) fn stroke(c: Color32, w: f32) -> Stroke {
+    Stroke::new(w, c)
+}
+
+/// A text layer's layout placed on the canvas: where carets and selected characters show (yours
+/// and other people's in a live session).
+pub(crate) struct TextOnScreen {
+    pub layout: Arc<figcraft_text::TextLayout>,
+    /// How many characters the text has.
+    pub chars: usize,
+    /// The layout's vertical offset in the box (vertical alignment).
+    dy: f64,
+    world: figcraft_geom::Affine,
+}
+
+impl TextOnScreen {
+    /// Text layer `id` of `doc` (`None`: not a text layer).
+    pub(crate) fn of(doc: &Document, id: NodeId) -> Option<Self> {
+        let n = doc.node(id)?;
+        let NodeKind::Text(t) = &n.kind else { return None };
+        let (layout, dy) = figcraft_text::layout_node(n)?;
+        Some(Self { layout, chars: t.char_count(), dy, world: doc.world_transform(id) })
+    }
+
+    /// Layout point `(x, y)` on screen (on the path, for text on a path).
+    pub(crate) fn at(&self, app: &FigApp, x: f64, y: f64) -> Pos2 {
+        let q = self.layout.warp_point(x, y);
+        let p = self.world * Point::new(q.x, q.y + self.dy);
+        app.to_screen(p.x, p.y)
+    }
+
+    /// The highlight of characters `a..b`, one screen quad per line.
+    pub(crate) fn selection(&self, app: &FigApp, a: usize, b: usize) -> Vec<[Pos2; 4]> {
+        let rects = self.layout.selection_rects(a, b);
+        rects.iter().map(|r| [self.at(app, r.x0, r.y0), self.at(app, r.x1, r.y0), self.at(app, r.x1, r.y1), self.at(app, r.x0, r.y1)]).collect()
+    }
+
+    /// The caret before character `index`: its top and bottom on screen (an empty layer: a line
+    /// of default height at its origin).
+    pub(crate) fn caret(&self, app: &FigApp, index: usize, zoom: f64) -> [Pos2; 2] {
+        let (cx, li) = self.layout.caret(index);
+        match self.layout.lines.get(li).or(self.layout.lines.last()) {
+            Some(line) => [self.at(app, cx, line.top), self.at(app, cx, line.top + line.height)],
+            None => {
+                let p = self.at(app, 0.0, 0.0);
+                [p, p + vec2(0.0, 14.0 * zoom as f32)]
+            }
+        }
+    }
+}
+
+/// A node's oriented outline in screen space.
+pub(crate) fn node_quad(app: &FigApp, doc: &Document, id: NodeId) -> Option<[Pos2; 4]> {
+    let n = doc.node(id)?;
+    let w = doc.world_transform(id);
+    let corners = [Point::new(0.0, 0.0), Point::new(n.width, 0.0), Point::new(n.width, n.height), Point::new(0.0, n.height)];
+    Some(corners.map(|c| {
+        let p = w * c;
+        app.to_screen(p.x, p.y)
+    }))
+}
+
+pub(super) fn quad(painter: &egui::Painter, q: [Pos2; 4], s: Stroke) {
+    painter.add(Shape::closed_line(q.to_vec(), s));
+}
+
+/// The slots of the selected components and instances (and a slot being dropped onto): a dashed
+/// outline and the slot's name above its top-left corner, like a frame label (never over the
+/// content).
+pub(super) fn slot_badges(app: &FigApp, painter: &egui::Painter, doc: &Document, sel: &[NodeId], drop: Option<NodeId>) {
+    use figcraft_engine::components::{owning_component, owning_instance, slot_name, slots_of};
+    let mut roots: Vec<NodeId> = Vec::new();
+    for id in sel {
+        let root = match doc.node(*id).map(|n| &n.kind) {
+            Some(NodeKind::Instance { .. } | NodeKind::Component { .. } | NodeKind::ComponentSet { .. }) => Some(*id),
+            _ => owning_instance(doc, *id).or_else(|| owning_component(doc, *id)),
+        };
+        if let Some(r) = root.filter(|r| !roots.contains(r)) {
+            roots.push(r);
+        }
+    }
+    let mut slots: Vec<(NodeId, String)> = roots.iter().flat_map(|r| slots_of(doc, *r)).collect();
+    if let Some(d) = drop
+        && !slots.iter().any(|(s, _)| *s == d)
+        && let Some(name) = slot_name(doc, d)
+    {
+        slots.push((d, name));
+    }
+    for (id, name) in slots {
+        let Some(q) = node_quad(app, doc, id) else { continue };
+        if !Rect::from_points(&q).intersects(app.canvas.rect) {
+            continue;
+        }
+        painter.extend(Shape::dashed_line(&[q[0], q[1], q[2], q[3], q[0]], stroke(COMPONENT, 1.0), 4.0, 3.0));
+        // The label, when the slot is wide enough on screen to hold it.
+        let galley = painter.layout_no_wrap(name, regular(10.0), COMPONENT);
+        let (w, h) = (galley.size().x + 14.0, galley.size().y.max(11.0));
+        if (q[1] - q[0]).length() < w {
+            continue;
+        }
+        let at = q[0] - vec2(0.0, h + 2.0);
+        crate::icons::paint(painter, Rect::from_min_size(pos2(at.x, at.y + (h - 11.0) / 2.0), vec2(11.0, 11.0)), crate::icons::Icon::Slot, COMPONENT);
+        painter.galley(pos2(at.x + 14.0, at.y + (h - galley.size().y) / 2.0), galley, COMPONENT);
+    }
+}
+
+/// The instance an Alt-drop of a component from the Assets panel swaps: tinted and outlined in
+/// the component colour, with a "Swap instance" label above its top-left corner.
+pub(super) fn swap_highlight(app: &FigApp, painter: &egui::Painter, doc: &Document, id: NodeId) {
+    let Some(q) = node_quad(app, doc, id) else { return };
+    // White on the component colour, in both themes (like the canvas's selection labels).
+    let ink = Color32::WHITE;
+    painter.add(Shape::convex_polygon(q.to_vec(), COMPONENT.gamma_multiply(0.12), Stroke::NONE));
+    quad(painter, q, stroke(COMPONENT, 2.0));
+    let galley = painter.layout_no_wrap(tr("Swap instance").to_string(), semibold(10.0), ink);
+    let size = vec2(galley.size().x + 26.0, 18.0);
+    let top = Rect::from_points(&q).min;
+    let pill = Rect::from_min_size(pos2(top.x, top.y - size.y - 4.0), size);
+    painter.rect_filled(pill, CornerRadius::same(4), COMPONENT);
+    crate::icons::paint(
+        painter,
+        Rect::from_center_size(pos2(pill.min.x + 11.0, pill.center().y), vec2(10.0, 10.0)),
+        crate::icons::Icon::Instance,
+        ink,
+    );
+    painter.galley(pos2(pill.min.x + 20.0, pill.center().y - galley.size().y / 2.0), galley, ink);
+}
+
+/// The outline colour for a layer: purple for components, sets and instances and every layer in
+/// them, the page's overlay `green` otherwise.
+pub(super) fn outline_colour(doc: &Document, id: NodeId, green: Color32) -> Color32 {
+    use figcraft_engine::components::{owning_component, owning_instance};
+    let set = matches!(doc.node(id).map(|n| &n.kind), Some(NodeKind::ComponentSet { .. }));
+    if set || owning_component(doc, id).is_some() || owning_instance(doc, id).is_some() { COMPONENT } else { green }
+}
+
+/// The outline path of shapes (ellipses, vectors) for hover/selection outlines.
+fn outline_shape(app: &FigApp, doc: &Document, id: NodeId) -> Option<Vec<Vec<Pos2>>> {
+    let n = doc.node(id)?;
+    if !matches!(
+        n.kind,
+        NodeKind::Ellipse { .. } | NodeKind::Vector { .. } | NodeKind::Polygon { .. } | NodeKind::Star { .. } | NodeKind::BooleanOp { .. }
+    ) {
+        return None;
+    }
+    let (path, _) = figcraft_render::node_outline(doc, n)?;
+    let w = doc.world_transform(id);
+    let mut out = Vec::new();
+    let mut cur: Vec<Pos2> = Vec::new();
+    figcraft_geom::kurbo::flatten(path.iter(), 0.5 / app.session.ds().map(|d| d.view.zoom).unwrap_or(1.0), |el| {
+        use figcraft_geom::kurbo::PathEl::*;
+        match el {
+            MoveTo(p) => {
+                if cur.len() > 1 {
+                    out.push(std::mem::take(&mut cur));
+                }
+                cur.clear();
+                let q = w * p;
+                cur.push(app.to_screen(q.x, q.y));
+            }
+            LineTo(p) => {
+                let q = w * p;
+                cur.push(app.to_screen(q.x, q.y));
+            }
+            ClosePath => {
+                if let Some(f) = cur.first().copied() {
+                    cur.push(f);
+                }
+            }
+            _ => {}
+        }
+    });
+    if cur.len() > 1 {
+        out.push(cur);
+    }
+    Some(out)
+}
+
+/// A layer's outline on the canvas: its shape for ellipses, vectors, polygons, stars and boolean
+/// groups, its box otherwise.
+pub(super) fn draw_outline(app: &FigApp, painter: &egui::Painter, doc: &Document, id: NodeId, s: Stroke) {
+    match outline_shape(app, doc, id) {
+        Some(lines) => {
+            for l in lines {
+                painter.add(Shape::line(l, s));
+            }
+        }
+        None => {
+            if let Some(q) = node_quad(app, doc, id) {
+                quad(painter, q, s);
+            }
+        }
+    }
+}
diff --git a/crates/ui-egui/src/canvas/overlays.rs b/crates/ui-egui/src/canvas/overlays.rs
new file mode 100644
index 00000000..675427c1
--- /dev/null
+++ b/crates/ui-egui/src/canvas/overlays.rs
@@ -0,0 +1,545 @@
+use super::builder::{builder_overlay, hatched, region_hatch};
+use super::outline::{TextOnScreen, draw_outline, node_quad, outline_colour, quad, slot_badges, stroke, swap_highlight};
+use super::rulers::{boards, fmt, rulers};
+use super::*;
+
+/// Everything drawn over the rendered page; returns the frame labels drawn (frame, corners on the
+/// page) for the engine to hit-test.
+pub(super) fn overlays(app: &FigApp, painter: &egui::Painter, t: &Tokens) -> Vec<(NodeId, [Point; 4])> {
+    let mut labels = Vec::new();
+    let Ok(ds) = app.session.ds() else { return labels };
+    let doc = ds.doc.clone();
+    let page = ds.page;
+    let sel = ds.selection.clone();
+    let zoom = ds.view.zoom;
+    let view = ds.view.clone();
+    // Pixel grid at high zoom.
+    if view.pixel_grid_shown() {
+        let r = app.canvas.rect;
+        let p0 = app.to_page(r.min);
+        let p1 = app.to_page(r.max);
+        let col = Color32::from_black_alpha(18);
+        let mut x = p0.x.floor();
+        while x <= p1.x {
+            let s = app.to_screen(x, 0.0).x;
+            painter.line_segment([pos2(s, r.min.y), pos2(s, r.max.y)], stroke(col, 1.0));
+            x += 1.0;
+        }
+        let mut y = p0.y.floor();
+        while y <= p1.y {
+            let s = app.to_screen(0.0, y).y;
+            painter.line_segment([pos2(r.min.x, s), pos2(r.max.x, s)], stroke(col, 1.0));
+            y += 1.0;
+        }
+    }
+    // Layout grids and frame labels for top-level frames (also those in sections); the focus view
+    // labels only its frame.
+    let focus = ds.focused();
+    for c in boards(&doc, page).iter().filter(|c| focus.is_none_or(|f| f == **c)) {
+        let Some(n) = doc.node(*c) else { continue };
+        let Some(b) = doc.world_bounds(*c) else { continue };
+        // Off-screen frames draw neither grids nor a label (labels sit just outside the frame).
+        let on_screen = Rect::from_two_pos(app.to_screen(b.x0, b.y0), app.to_screen(b.x1, b.y1)).expand(20.0);
+        if !on_screen.intersects(app.canvas.rect) {
+            continue;
+        }
+        if view.layout_grids && !n.grids.is_empty() && figcraft_layout::grids_shown(&doc, *c) {
+            let w = doc.world_transform(*c);
+            for g in n.grids.iter().filter(|g| g.visible) {
+                let col = doc_c32(painter.ctx(), g.color);
+                for r in figcraft_layout::grid_lines(g, n.width, n.height) {
+                    let a = w * Point::new(r.x0, r.y0);
+                    let b = w * Point::new(r.x1, r.y1);
+                    let (sa, sb) = (app.to_screen(a.x, a.y), app.to_screen(b.x, b.y));
+                    if g.kind == figcraft_doc::GridKind::Grid {
+                        painter.line_segment([sa, sb], stroke(col, 1.0));
+                    } else {
+                        painter.rect_filled(Rect::from_two_pos(sa, sb), CornerRadius::ZERO, col);
+                    }
+                }
+            }
+        }
+        // The focus view's bar names its frame.
+        // Board objects (stickies, shapes with text, stamps) are frames without a name label.
+        let labelled = focus.is_none() && (n.kind.is_frame_like() || matches!(n.kind, NodeKind::Section { .. })) && !n.is_board_atom();
+        if labelled && let Some(q) = crate::frame_labels::draw(app, painter, t, &doc, *c, sel.contains(c), ds.hover == Some(*c)) {
+            labels.push((*c, q.map(|p| app.to_page(p))));
+        }
+    }
+    // Prototype connections.
+    crate::proto_canvas::draw(app, painter);
+    // Hover outline (measuring outlines the measured box in red instead).
+    if let Some(h) = ds.hover
+        && !sel.contains(&h)
+        && matches!(app.session.tool.tool, ToolId::Move | ToolId::Scale)
+        && app.session.prefs.highlight_on_hover
+        && app.session.tool.overlay.measure_box.is_none()
+    {
+        draw_outline(app, painter, &doc, h, stroke(outline_colour(&doc, h, accent(painter)), 1.5));
+    }
+    // Inside a boolean group (an operand selected or in vector edit mode): every operand's outline,
+    // so the shapes making the live result stay visible while one of them changes.
+    let operands = figcraft_engine::booleans::outlined_operands(&doc, &sel, ds.vector_edit.as_ref().map(|ve| ve.id));
+    for id in operands.iter().filter(|o| !sel.contains(o)) {
+        draw_outline(app, painter, &doc, *id, stroke(outline_colour(&doc, *id, accent(painter)).gamma_multiply(0.6), 1.0));
+    }
+    // Mask outlines (a mask doesn't draw itself), frame outlines and slices, as the View menu shows.
+    if view.mask_outlines || view.frame_outlines || view.show_slices {
+        for id in doc.subtree(page) {
+            let Some(n) = doc.node(id).filter(|n| n.visible) else { continue };
+            if view.mask_outlines && n.is_mask {
+                draw_outline(app, painter, &doc, id, stroke(accent(painter), 1.0));
+            } else if view.frame_outlines && n.kind.is_frame_like() {
+                draw_outline(app, painter, &doc, id, stroke(t.text_secondary, 1.0));
+            } else if view.show_slices
+                && matches!(n.kind, NodeKind::Slice)
+                && let Some(q) = node_quad(app, &doc, id)
+            {
+                painter.extend(Shape::dashed_line(&[q[0], q[1], q[2], q[3], q[0]], stroke(t.text_secondary, 1.0), 4.0, 3.0));
+            }
+        }
+    }
+    // Drop target / insertion indicator.
+    let ov = &app.session.tool.overlay;
+    if let Some(d) = ov.drop_target
+        && let Some(q) = node_quad(app, &doc, d)
+    {
+        quad(painter, q, stroke(if figcraft_engine::components::is_slot(&doc, d) { COMPONENT } else { accent(painter) }, 1.0));
+    }
+    slot_badges(app, painter, &doc, &sel, ov.drop_target);
+    if let Some(t) = ov.swap_target {
+        swap_highlight(app, painter, &doc, t);
+    }
+    if let Some([x0, y0, x1, y1]) = ov.insert_line {
+        painter.line_segment([app.to_screen(x0, y0), app.to_screen(x1, y1)], stroke(accent(painter), 2.0));
+    }
+    if let Some([x0, y0, x1, y1]) = ov.drop_cell {
+        let r = Rect::from_two_pos(app.to_screen(x0, y0), app.to_screen(x1, y1));
+        painter.rect_filled(r, CornerRadius::same(2), accent(painter).gamma_multiply(0.12));
+        let pts = [r.left_top(), r.right_top(), r.right_bottom(), r.left_bottom(), r.left_top()];
+        painter.add(Shape::dashed_line(&pts, stroke(accent(painter), 1.5), 4.0, 3.0));
+    }
+    // Vector edit mode, with the transform box around several selected points.
+    // The selection's size label, which measurement labels keep clear of.
+    let mut size_label = None;
+    if let Some(ve) = ds.vector_edit.clone()
+        && let Some(o) = figcraft_engine::vectoredit::overlay(&doc, &ve)
+    {
+        // The Variable width tool shows width points in place of the path's points.
+        let width_tool = ve.tool == figcraft_engine::vectoredit::VTool::Width;
+        // Other layers edited at once go under the active one; the hover shows on its own layer.
+        let ov = &app.session.tool.overlay;
+        let hover_on = |id| ov.vector_hover.filter(|_| ov.vector_hover_on.unwrap_or(ve.id) == id);
+        for part in &ve.others {
+            if let Some(po) = figcraft_engine::vectoredit::overlay(&doc, &ve.view(part)) {
+                vector_overlay(app, painter, &po, !width_tool, hover_on(part.id), false, None);
+            }
+        }
+        vector_overlay(app, painter, &o, !width_tool, hover_on(ve.id), true, ov.vector_add);
+        if width_tool {
+            width_overlay(app, painter, &doc, &ve, zoom);
+        } else if let Some(c) = app.session.vector_edit_box() {
+            // The box around several selected points draws no corner handles: they would read as
+            // points. Its corners and edges still scale the points when dragged.
+            let label = format!("{} × {}", fmt((c[1] - c[0]).hypot()), fmt((c[3] - c[0]).hypot()));
+            size_label = transform_box(app, painter, c.map(|p| app.to_screen(p.x, p.y)), accent(painter), true, 0, Some(label));
+        }
+    }
+    // Selection.
+    let editing = ds.text_edit.clone();
+    if !sel.is_empty() && editing.is_none() && ds.vector_edit.is_none() {
+        let col = if sel.iter().any(|i| outline_colour(&doc, *i, accent(painter)) == COMPONENT) { COMPONENT } else { accent(painter) };
+        for id in &sel {
+            draw_outline(app, painter, &doc, *id, stroke(col, 1.0));
+        }
+        // The shape builder reshapes by regions: no transform box.
+        if app.session.tool.tool != ToolId::ShapeBuilder
+            && let Some(b) = selection_box(&doc, &sel)
+            && let Some((_, w, h)) = selection_frame(&doc, &sel)
+        {
+            let is_line = sel.len() == 1 && matches!(sel.first().and_then(|i| doc.node(*i)).map(|n| &n.kind), Some(NodeKind::Line));
+            // A selected connector's handles are its two ends (drag one onto another object).
+            let connector = figcraft_engine::board::selected_connector_ends(&doc, &sel).map(|(_, ends)| ends);
+            let mut label = if is_line { fmt(w) } else { format!("{} × {}", fmt(w), fmt(h)) };
+            let scale = app.session.tool.overlay.scale;
+            if let Some(hint) = scale {
+                label = format!("{label} · {}x", fmt(hint.factor.abs()));
+            }
+            // A layer smaller than its handles on screen shows just its outline (they still answer
+            // just outside it).
+            let tiny = figcraft_engine::tools::box_sides_px(&b, zoom).1 < figcraft_engine::tools::SMALL_BOX_PX;
+            // Measuring to another layer (Alt held) shows just the outlines: no handles or size.
+            let measuring = app.session.tool.overlay.measure_box.is_some();
+            // Locked layers (selected in the layers panel) can't be resized, nor anything in Dev
+            // Mode: no handles either.
+            let handles =
+                if measuring || app.session.tool.dev_mode || connector.is_some() || sel.iter().any(|i| figcraft_engine::tools::locked_in(&doc, *i)) {
+                    0
+                } else if is_line {
+                    2
+                } else if tiny {
+                    0
+                } else {
+                    4
+                };
+            size_label = transform_box(
+                app,
+                painter,
+                b.map(|p| app.to_screen(p.x, p.y)),
+                col,
+                sel.len() > 1,
+                handles,
+                (!measuring && connector.is_none()).then_some(label),
+            );
+            for end in connector.into_iter().flatten().filter(|_| !app.session.tool.dev_mode) {
+                let c = app.to_screen(end.x, end.y);
+                painter.circle_filled(c, 5.0, Color32::WHITE);
+                painter.circle_stroke(c, 5.0, stroke(col, 1.5));
+            }
+            if !measuring {
+                arc_overlay(app, painter, col);
+                shape_overlay(app, painter, col);
+            }
+            if app.session.tool.tool == ToolId::Scale {
+                // The point that stays put: the dragged pivot, else the anchor.
+                let pivot = scale
+                    .map(|h| Point::new(h.pivot[0], h.pivot[1]))
+                    .or_else(|| figcraft_engine::tools::scale_anchor_point(&doc, &sel, app.session.tool.scale_anchor));
+                if let Some(p) = pivot {
+                    let c = app.to_screen(p.x, p.y);
+                    painter.circle_filled(c, 4.0, Color32::WHITE);
+                    painter.circle_stroke(c, 4.0, stroke(col, 1.5));
+                    painter.circle_filled(c, 1.5, col);
+                }
+            }
+            // The rotation origin while it shows (Alt+R): a ring with a cross through it.
+            if let Some(o) = ds.origin_handle() {
+                let c = app.to_screen(o.x, o.y);
+                painter.circle_filled(c, 5.0, Color32::WHITE);
+                painter.circle_stroke(c, 5.0, stroke(col, 1.5));
+                for d in [vec2(1.0, 0.0), vec2(0.0, 1.0)] {
+                    painter.line_segment([c - d * 10.0, c - d * 5.0], stroke(col, 1.5));
+                    painter.line_segment([c + d * 5.0, c + d * 10.0], stroke(col, 1.5));
+                }
+                painter.circle_filled(c, 1.5, col);
+            }
+        }
+    }
+    if app.session.tool.tool == ToolId::ShapeBuilder
+        && let Some(arr) = figcraft_engine::shapebuilder::current(&app.session)
+    {
+        builder_overlay(app, painter, t, &arr);
+    }
+    // Text editing: caret and selection, or the IME composition underlined at the caret.
+    let preedit = app.preedit_view();
+    let edoc: &Document = preedit.map(|p| &*p.doc).unwrap_or(&doc);
+    if let Some(te) = editing
+        && let Some(text) = TextOnScreen::of(edoc, te.id)
+    {
+        let layout = &text.layout;
+        if let Some(q) = node_quad(app, edoc, te.id) {
+            quad(painter, q, stroke(accent(painter), 1.0));
+        }
+        let (a, b) = (te.caret.min(te.anchor), te.caret.max(te.anchor));
+        if a != b && preedit.is_none() {
+            for q in text.selection(app, a, b) {
+                painter.add(Shape::convex_polygon(q.to_vec(), accent(painter).gamma_multiply(0.3), Stroke::NONE));
+            }
+        }
+        if let Some(p) = preedit {
+            for r in layout.selection_rects(p.range.0, p.range.1) {
+                // Underline just below the baseline, across the composed chars only.
+                let Some(line) = layout.lines.iter().find(|l| (l.top - r.y0).abs() < 1e-6) else { continue };
+                let x1 = layout
+                    .glyphs
+                    .get(line.glyph_start..line.glyph_end)
+                    .unwrap_or(&[])
+                    .iter()
+                    .filter(|g| g.char_end > g.char_start && g.char_start >= p.range.0 && g.char_end <= p.range.1)
+                    .map(|g| g.x + g.advance)
+                    .fold(r.x0, f64::max);
+                let y = line.baseline + (line.top + line.height - line.baseline) * 0.35;
+                painter.line_segment([text.at(app, r.x0, y), text.at(app, x1, y)], stroke(t.text, 1.0));
+            }
+        }
+        let caret = preedit.map(|p| p.cursor).unwrap_or(te.caret);
+        let blink = (painter.ctx().input(|i| i.time) * 2.0) as i64 % 2 == 0;
+        if blink || a != b {
+            painter.line_segment(text.caret(app, caret, zoom), stroke(t.text, 1.0));
+        }
+        painter.ctx().request_repaint_after(std::time::Duration::from_millis(500));
+    }
+    // Smart guides and measurements (their labels kept clear of the size label).
+    crate::measure_overlay::draw(app, painter, t, size_label);
+    // Marquee.
+    if let Some([x0, y0, x1, y1]) = ov.marquee.or(app.ui.key_box) {
+        let r = Rect::from_two_pos(app.to_screen(x0, y0), app.to_screen(x1, y1));
+        painter.rect_filled(r, CornerRadius::ZERO, accent(painter).gamma_multiply(0.1));
+        painter.rect_stroke(r, CornerRadius::ZERO, stroke(accent(painter), 1.0), StrokeKind::Inside);
+    }
+    // Pen path.
+    if !ov.pen.is_empty() {
+        let pts: Vec<Pos2> = ov.pen.iter().map(|[x, y]| app.to_screen(*x, *y)).collect();
+        if app.session.tool.tool == ToolId::Pencil {
+            // The stroke it will make, in its colour and weight (at least a point when zoomed out).
+            let (color, weight) = figcraft_engine::tools::PENCIL_STROKE;
+            painter.add(Shape::line(pts, stroke(doc_c32(painter.ctx(), color), ((weight * zoom) as f32).max(1.0))));
+        } else {
+            for [x0, y0, x1, y1] in &ov.pen_handles {
+                bezier_handle(painter, app.to_screen(*x0, *y0), app.to_screen(*x1, *y1), 3.5, Color32::WHITE);
+            }
+            for p in &pts {
+                painter.circle_filled(*p, 3.5, Color32::WHITE);
+                painter.circle_stroke(*p, 3.5, stroke(accent(painter), 1.0));
+            }
+            if let Some([x0, y0, x1, y1]) = ov.rubber {
+                let (a, b) = (app.to_screen(x0, y0), app.to_screen(x1, y1));
+                // The segment a click would make: along the last anchor's out handle, if it has one.
+                match ov.rubber_handle {
+                    Some([hx, hy]) => {
+                        let h = app.to_screen(hx, hy);
+                        painter.add(egui::epaint::CubicBezierShape::from_points_stroke(
+                            [a, h, b, b],
+                            false,
+                            Color32::TRANSPARENT,
+                            stroke(accent(painter), 1.0),
+                        ));
+                    }
+                    None => {
+                        painter.line_segment([a, b], stroke(accent(painter), 1.0));
+                    }
+                }
+            }
+        }
+    } else if let Some([x0, y0, x1, y1]) = ov.rubber {
+        // A connector being drawn, or one of its ends dragged: from where it starts to the pointer.
+        painter.line_segment([app.to_screen(x0, y0), app.to_screen(x1, y1)], stroke(accent(painter), 1.5));
+    }
+    // Eraser brush (vector edit mode).
+    if let Some([x, y, r]) = ov.brush {
+        let c = app.to_screen(x, y);
+        let rs = (r * app.session.ds().map(|d| d.view.zoom).unwrap_or(1.0)) as f32;
+        painter.circle_stroke(c, rs, stroke(Color32::WHITE, 3.0));
+        painter.circle_stroke(c, rs, stroke(accent(painter), 1.5));
+    }
+    // Lasso (vector edit mode).
+    if ov.lasso.len() > 1 {
+        let mut pts: Vec<Pos2> = ov.lasso.iter().map(|[x, y]| app.to_screen(*x, *y)).collect();
+        if let Some(first) = pts.first().copied() {
+            pts.push(first);
+        }
+        painter.add(Shape::dashed_line(&pts, stroke(accent(painter), 1.0), 4.0, 3.0));
+    }
+    // Guides (under the rulers).
+    crate::guides::draw(app, painter);
+    // Rulers.
+    if view.rulers {
+        rulers(app, painter, t, &doc, &sel);
+    }
+    labels
+}
+
+/// A transform box (screen corners tl, tr, br, bl): its outline when `outline`, the first `handles`
+/// corner handles and, when dimensions are shown, the size `label` (if any) under it (its box returned).
+fn transform_box(
+    app: &FigApp,
+    painter: &egui::Painter,
+    q: [Pos2; 4],
+    col: Color32,
+    outline: bool,
+    handles: usize,
+    label: Option<String>,
+) -> Option<Rect> {
+    if outline {
+        quad(painter, q, stroke(col, 1.0));
+    }
+    for c in q.iter().take(handles) {
+        let r = Rect::from_center_size(*c, vec2(8.0, 8.0));
+        painter.rect_filled(r, CornerRadius::same(1), Color32::WHITE);
+        painter.rect_stroke(r, CornerRadius::same(1), stroke(col, 1.0), StrokeKind::Inside);
+    }
+    if let Some(label) = label.filter(|_| app.session.prefs.show_dimensions) {
+        let bottom = q.iter().map(|p| p.y).fold(f32::MIN, f32::max);
+        let cx = q.iter().map(|p| p.x).sum::<f32>() / 4.0;
+        return Some(pill(painter, pos2(cx, bottom + 9.0), Align2::CENTER_TOP, label, col));
+    }
+    None
+}
+
+/// A canvas readout: white `text` on a `col` pill placed at `at` by `align` (its box returned).
+fn pill(painter: &egui::Painter, at: Pos2, align: Align2, text: String, col: Color32) -> Rect {
+    let galley = painter.layout_no_wrap(text, semibold(11.0), Color32::WHITE);
+    let r = align.anchor_size(at, galley.size() + vec2(8.0, 4.0));
+    painter.rect_filled(r, CornerRadius::same(3), crate::theme::under_white(col));
+    painter.galley(r.min + vec2(4.0, 2.0), galley, Color32::WHITE);
+    r
+}
+
+/// The selected ellipse's arc handles (the hovered or dragged one larger, Start with a dot inside)
+/// and, while one is dragged, its readout beside it.
+fn arc_overlay(app: &FigApp, painter: &egui::Painter, col: Color32) {
+    use figcraft_engine::arc_handles::ArcHandle;
+    let Some(hs) = app.session.arc_handles() else { return };
+    let ov = &app.session.tool.overlay;
+    for h in [ArcHandle::Ratio, ArcHandle::Start, ArcHandle::Sweep] {
+        let Some([x, y]) = hs.at(h) else { continue };
+        let c = app.to_screen(x, y);
+        let r = if ov.arc_hover == Some(h) { 5.0 } else { 4.0 };
+        painter.circle_filled(c, r, Color32::WHITE);
+        painter.circle_stroke(c, r, stroke(col, 1.0));
+        if h == ArcHandle::Start {
+            painter.circle_filled(c, 1.5, col);
+        }
+    }
+    if let Some(hint) = &ov.arc {
+        let c = app.to_screen(hint.at[0], hint.at[1]);
+        pill(painter, c + vec2(12.0, 12.0), Align2::LEFT_TOP, hint.label.clone(), col);
+    }
+}
+
+/// The selected shape's corner radius handles and a star's ratio handle (the hovered or dragged
+/// one larger) and, while one is dragged, its value beside it.
+fn shape_overlay(app: &FigApp, painter: &egui::Painter, col: Color32) {
+    use figcraft_engine::shape_handles::ShapeHandle;
+    let ov = &app.session.tool.overlay;
+    for (h, [x, y]) in app.session.shape_handles() {
+        let r = if ov.shape_hover == Some(h) { 4.5 } else { 3.5 };
+        let c = app.to_screen(x, y);
+        painter.circle_filled(c, r, Color32::WHITE);
+        painter.circle_stroke(c, r, stroke(col, 1.0));
+    }
+    if let Some(hint) = &ov.shape {
+        let c = app.to_screen(hint.at[0], hint.at[1]);
+        let text = match hint.handle {
+            ShapeHandle::Radius { .. } => format!("{} {}", tr("Radius"), hint.value),
+            ShapeHandle::Ratio => format!("{} {}%", tr("Ratio"), hint.value),
+        };
+        pill(painter, c + vec2(12.0, 12.0), Align2::LEFT_TOP, text, col);
+    }
+}
+
+/// Variable width tool: each width point on the path with a bar across the stroke to its two
+/// width handles (the selected point filled), and a faint preview where a drag would add one.
+fn width_overlay(app: &FigApp, painter: &egui::Painter, doc: &Document, ve: &figcraft_engine::vectoredit::VectorEdit, zoom: f64) {
+    use figcraft_doc::WidthSide;
+    use figcraft_engine::vectoredit::{WHit, width_handles, width_preview};
+    let hover = app.session.tool.overlay.width_hover;
+    let sp = |p: &[f64; 2]| app.to_screen(p[0], p[1]);
+    let draw = |h: &figcraft_engine::vectoredit::WidthHandle, ghost: bool| {
+        let (c, a, b) = (sp(&h.at), sp(&h.sides[0]), sp(&h.sides[1]));
+        let col = if ghost { accent(painter).gamma_multiply(0.5) } else { accent(painter) };
+        painter.line_segment([a, b], stroke(Color32::from_white_alpha(160), 3.0));
+        painter.line_segment([a, b], stroke(col, 1.0));
+        for (e, side) in [(a, WidthSide::Right), (b, WidthSide::Left)] {
+            let grab = !ghost && hover == Some(WHit::Handle { index: h.index, side });
+            let r = if grab { 4.5 } else { 3.5 };
+            painter.circle_filled(e, r, Color32::WHITE);
+            painter.circle_stroke(e, r, stroke(col, 1.0));
+        }
+        let on = !ghost && ve.width_point == Some(h.index);
+        let hovered = !ghost && hover == Some(WHit::Point { index: h.index });
+        let r = if hovered { 5.0 } else { 4.0 };
+        painter.circle_filled(c, r, if on { accent(painter) } else { Color32::WHITE });
+        painter.circle_stroke(c, r, stroke(col, 1.0));
+    };
+    for h in width_handles(doc, ve, zoom) {
+        draw(&h, false);
+    }
+    if let Some(WHit::Path { t, .. }) = hover {
+        for h in width_preview(doc, ve, t, zoom) {
+            draw(&h, true);
+        }
+    }
+}
+
+/// A bezier handle from its anchor `v` to its end `e` (screen points): the line, and a dot of
+/// radius `r` filled with `fill` (vector edit mode and the Pen draw them alike).
+fn bezier_handle(painter: &egui::Painter, v: Pos2, e: Pos2, r: f32, fill: Color32) {
+    painter.line_segment([v, e], stroke(accent(painter), 1.0));
+    painter.circle_filled(e, r, fill);
+    painter.circle_stroke(e, r, stroke(accent(painter), 1.0));
+}
+
+/// Vector edit mode: a layer's segments, handles and points (`points`) with its `hover`ed part, the
+/// `add` point a press would put on the outline, and for the `active` layer the closed area under
+/// the paint bucket and the pen's rubber band.
+fn vector_overlay(
+    app: &FigApp,
+    painter: &egui::Painter,
+    o: &figcraft_engine::vectoredit::EditOverlay,
+    points: bool,
+    hover: Option<figcraft_engine::vectoredit::VHit>,
+    active: bool,
+    add: Option<figcraft_engine::tools::VectorAdd>,
+) {
+    use figcraft_engine::vectoredit::VHit;
+    let ov = &app.session.tool.overlay;
+    let sp = |p: &[f64; 2]| app.to_screen(p[0], p[1]);
+    // Paint bucket target: hatched like a fill to come.
+    if active && !ov.face.is_empty() {
+        let polys: Vec<Vec<Pos2>> = ov.face.iter().map(|poly| poly.iter().map(sp).collect()).collect();
+        hatched(painter, &polys, accent(painter));
+    }
+    if active {
+        region_hatch(app, painter);
+    }
+    let hover_seg = match hover {
+        Some(VHit::Segment { seg, .. }) => Some(seg),
+        _ => None,
+    };
+    for (i, seg) in o.segments.iter().enumerate() {
+        let [a, b, c, d] = [sp(&seg[0]), sp(&seg[1]), sp(&seg[2]), sp(&seg[3])];
+        let w = if o.selected_segments.contains(&i) {
+            3.0
+        } else if hover_seg == Some(i) {
+            2.5
+        } else {
+            1.5
+        };
+        painter.add(egui::epaint::CubicBezierShape::from_points_stroke([a, b, c, d], false, Color32::TRANSPARENT, stroke(accent(painter), w)));
+    }
+    if !points {
+        return;
+    }
+    for h in &o.handles {
+        let hovered = hover == Some(VHit::Handle { seg: h.seg, start: h.start });
+        let on = o.selected_handles.contains(&(h.seg, h.start));
+        bezier_handle(painter, sp(&h.vertex), sp(&h.handle), if hovered { 4.5 } else { 3.5 }, if on { accent(painter) } else { Color32::WHITE });
+    }
+    for (i, v) in o.vertices.iter().enumerate() {
+        let p = sp(v);
+        let hovered = matches!(hover, Some(VHit::Vertex { index }) if index == i);
+        let size = if hovered { 9.0 } else { 7.0 };
+        let r = Rect::from_center_size(p, vec2(size, size));
+        let on = o.selected_vertices.contains(&i);
+        painter.rect_filled(r, CornerRadius::same(5), if on { accent(painter) } else { Color32::WHITE });
+        painter.rect_stroke(r, CornerRadius::same(5), stroke(accent(painter), 1.0), StrokeKind::Inside);
+        if o.anchor == Some(i) {
+            painter.circle_stroke(p, 7.5, stroke(accent(painter), 1.0));
+        }
+    }
+    // The point a press would add to the outline: the pen's ghost anchor where it is over a
+    // segment, or a segment's midpoint under the Move tool (which grows and fills once the pointer
+    // is on it, when a press adds it).
+    if let Some(a) = add {
+        let p = app.to_screen(a.at[0], a.at[1]);
+        let col = accent(painter);
+        if a.midpoint {
+            let (r, fill) = if a.on { (5.5, col) } else { (3.5, Color32::from_white_alpha(190)) };
+            painter.circle_filled(p, r, fill);
+            painter.circle_stroke(p, r, stroke(if a.on { Color32::WHITE } else { col.gamma_multiply(0.7) }, 1.2));
+        } else {
+            let r = Rect::from_center_size(p, vec2(7.0, 7.0));
+            painter.rect_filled(r, CornerRadius::same(5), Color32::from_white_alpha(160));
+            painter.rect_stroke(r, CornerRadius::same(5), stroke(col.gamma_multiply(0.8), 1.0), StrokeKind::Inside);
+        }
+    }
+    if let Some([x0, y0, x1, y1]) = ov.rubber.filter(|_| active) {
+        painter.add(Shape::dashed_line(&[app.to_screen(x0, y0), app.to_screen(x1, y1)], stroke(accent(painter), 1.0), 4.0, 3.0));
+    }
+}
+
+/// The overlay green for the page this painter draws on ([`crate::theme::canvas_accent`]).
+pub(super) fn accent(p: &egui::Painter) -> Color32 {
+    crate::theme::canvas_accent(p.ctx())
+}
diff --git a/crates/ui-egui/src/proto_canvas.rs b/crates/ui-egui/src/canvas/proto_canvas.rs
similarity index 83%
rename from crates/ui-egui/src/proto_canvas.rs
rename to crates/ui-egui/src/canvas/proto_canvas.rs
index 6310c05c..b5d402b4 100644
--- a/crates/ui-egui/src/proto_canvas.rs
+++ b/crates/ui-egui/src/canvas/proto_canvas.rs
@@ -8,7 +8,6 @@ use egui::{Color32, CornerRadius, Id, Pos2, Rect, Shape, Stroke, StrokeKind, pos
 use figcraft_doc::{Document, NodeId};
 use serde_json::{Value, json};
 
-use crate::theme::ACCENT;
 use crate::{FigApp, RightTab};
 
 const HANDLE_R: f32 = 7.0;
@@ -21,8 +20,9 @@ struct Drag {
     pos: Pos2,
 }
 
+/// Stable egui id for prototype connection dragging.
 fn drag_id() -> Id {
-    Id::new("proto_canvas_drag")
+    Id::unique("proto_canvas_drag")
 }
 
 /// One drawn connection.
@@ -60,9 +60,11 @@ struct Sources {
     ids: Arc<Vec<NodeId>>,
 }
 
+/// Return the cached subtree nodes with interactions for `page`, recomputing only when the
+/// document pointer or page changes.
 pub(crate) fn sources(ctx: &egui::Context, doc: &Arc<Document>, page: NodeId) -> Arc<Vec<NodeId>> {
     ctx.data_mut(|d| {
-        let c = d.get_temp_mut_or_default::<Sources>(Id::new("proto_canvas_sources"));
+        let c = d.get_temp_mut_or_default::<Sources>(Id::unique("proto_canvas_sources"));
         if !(c.doc.as_ref().is_some_and(|d| Arc::ptr_eq(d, doc)) && c.page == Some(page)) {
             let ids = doc.subtree(page).into_iter().filter(|i| doc.node(*i).is_some_and(|n| !n.interactions.is_empty())).collect();
             *c = Sources { doc: Some(doc.clone()), page: Some(page), ids: Arc::new(ids) };
@@ -140,7 +142,7 @@ fn arrow(painter: &egui::Painter, pts: &[Pos2; 4], col: Color32) {
 }
 
 fn plus_handle(painter: &egui::Painter, c: Pos2, hot: bool) {
-    painter.circle_filled(c, HANDLE_R + if hot { 1.0 } else { 0.0 }, ACCENT);
+    painter.circle_filled(c, HANDLE_R + if hot { 1.0 } else { 0.0 }, crate::theme::canvas_accent(painter.ctx()));
     painter.circle_stroke(c, HANDLE_R + if hot { 1.0 } else { 0.0 }, Stroke::new(1.5, Color32::WHITE));
     painter.line_segment([c - vec2(3.5, 0.0), c + vec2(3.5, 0.0)], Stroke::new(1.5, Color32::WHITE));
     painter.line_segment([c - vec2(0.0, 3.5), c + vec2(0.0, 3.5)], Stroke::new(1.5, Color32::WHITE));
@@ -161,7 +163,11 @@ pub fn draw(app: &FigApp, painter: &egui::Painter) {
         let selected = sel.contains(&nd.source);
         let is_open = open == Some((nd.source, nd.index));
         let near = dragging.is_none() && hover.is_some_and(|q| bezier_distance(&nd.pts, q) < 5.0);
-        let col = if selected || is_open || near { ACCENT } else { ACCENT.gamma_multiply(0.55) };
+        let col = if selected || is_open || near {
+            crate::theme::canvas_accent(painter.ctx())
+        } else {
+            crate::theme::canvas_accent(painter.ctx()).gamma_multiply(0.55)
+        };
         let w = if is_open || near {
             2.5
         } else if selected {
@@ -177,7 +183,12 @@ pub fn draw(app: &FigApp, painter: &egui::Painter) {
                 .and_then(|it| figcraft_doc::proto::walk(&it.actions).find_map(|a| a.dest()))
             && let Some(r) = screen_rect(app, doc, dest)
         {
-            painter.rect_stroke(r, CornerRadius::ZERO, Stroke::new(1.0, ACCENT.gamma_multiply(0.7)), StrokeKind::Outside);
+            painter.rect_stroke(
+                r,
+                CornerRadius::ZERO,
+                Stroke::new(1.0, crate::theme::canvas_accent(painter.ctx()).gamma_multiply(0.7)),
+                StrokeKind::Outside,
+            );
         }
         painter.add(egui::epaint::CubicBezierShape::from_points_stroke(nd.pts, false, Color32::TRANSPARENT, Stroke::new(w, col)));
         painter.circle_filled(nd.pts[0], 3.5, col);
@@ -190,12 +201,17 @@ pub fn draw(app: &FigApp, painter: &egui::Painter) {
                 && doc.top_level_frame(d.source) != Some(f)
                 && let Some(r) = screen_rect(app, doc, f)
             {
-                painter.rect_stroke(r, CornerRadius::ZERO, Stroke::new(2.0, ACCENT), StrokeKind::Outside);
+                painter.rect_stroke(r, CornerRadius::ZERO, Stroke::new(2.0, crate::theme::canvas_accent(painter.ctx())), StrokeKind::Outside);
             }
             let dx = ((d.pos.x - d.from.x).abs() * 0.5).max(30.0) * if d.pos.x >= d.from.x { 1.0 } else { -1.0 };
             let pts = [d.from, d.from + vec2(dx, 0.0), d.pos - vec2(dx, 0.0), d.pos];
-            painter.add(egui::epaint::CubicBezierShape::from_points_stroke(pts, false, Color32::TRANSPARENT, Stroke::new(2.0, ACCENT)));
-            arrow(painter, &pts, ACCENT);
+            painter.add(egui::epaint::CubicBezierShape::from_points_stroke(
+                pts,
+                false,
+                Color32::TRANSPARENT,
+                Stroke::new(2.0, crate::theme::canvas_accent(painter.ctx())),
+            ));
+            arrow(painter, &pts, crate::theme::canvas_accent(painter.ctx()));
             plus_handle(painter, d.from, true);
         }
         None => {
@@ -272,6 +288,9 @@ pub fn input(app: &mut FigApp, ui: &egui::Ui, resp: &egui::Response) -> bool {
         crate::proto_panel::open_editor(&ctx, Some((n.source, n.index)));
         return true;
     }
+    if pressed && crate::proto_panel::editor(&ctx).is_some() {
+        crate::proto_panel::open_editor(&ctx, None);
+    }
     false
 }
 
@@ -279,6 +298,26 @@ pub fn input(app: &mut FigApp, ui: &egui::Ui, resp: &egui::Response) -> bool {
 mod tests {
     use super::*;
 
+    /// A press on a connection handle takes the keyboard from the Pages list, as a press anywhere
+    /// else on the canvas does, so a later Delete can't take the page (#859).
+    #[test]
+    fn a_press_on_a_connection_handle_ends_the_pages_list_focus() {
+        let mut s = figcraft_engine::Session::new();
+        let a = s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 200, "height": 150})).unwrap();
+        let a = crate::present_tests::id(&a);
+        s.execute("select.set", &json!({"ids": [a]})).unwrap();
+        let mut u = crate::present_tests::Ui::new(s);
+        u.app.ui.right_tab = RightTab::Prototype;
+        u.run("view.zoomSelection", json!({}));
+        u.frames(2, Vec::new);
+        u.app.ui.pages_focus = u.app.session.ds().ok().map(|d| d.uid);
+        let doc = u.app.session.doc().unwrap().clone();
+        let (_, at) = *handles(&u.app, &doc, &[a]).first().unwrap();
+        u.button(at, true);
+        assert!(u.app.ui.pages_focus.is_none());
+        u.button(at, false);
+    }
+
     #[test]
     fn curves_leave_the_facing_side() {
         let a = Rect::from_min_size(pos2(0.0, 0.0), vec2(50.0, 20.0));
diff --git a/crates/ui-egui/src/canvas/render.rs b/crates/ui-egui/src/canvas/render.rs
new file mode 100644
index 00000000..915e8ea5
--- /dev/null
+++ b/crates/ui-egui/src/canvas/render.rs
@@ -0,0 +1,166 @@
+use super::*;
+
+#[derive(Clone, PartialEq)]
+pub(super) struct JobKey {
+    doc: usize,
+    page: NodeId,
+    origin: (i64, i64),
+    scale: i64,
+    size: (u32, u32),
+    outline: bool,
+    outline_extras: figcraft_render::Outline,
+    outlined: Vec<NodeId>,
+    skip: Vec<NodeId>,
+    solo: Option<NodeId>,
+    /// Text lays out anew when fonts arrive (system fonts load in the background).
+    fonts: u64,
+    proof: bool,
+    dots: Option<figcraft_render::Dots>,
+}
+
+/// Whether a finished render goes on screen: an image of the file and page shown (`shown`), and
+/// not a coarse preview over a refined image of the same or a newer request, or one that already
+/// shows the whole view asked for at its zoom (the same zoom elsewhere on the page is no such
+/// image).
+pub(crate) fn shows(c: &CanvasState, done: &Done, shown: Option<(u64, NodeId)>) -> bool {
+    if shown != Some((done.uid, done.page)) {
+        return false;
+    }
+    let refined = !c.tex_coarse && c.tex_of == shown;
+    if done.coarse && refined && done.seq <= c.tex_seq {
+        return false;
+    }
+    let refined_here = refined
+        && c.tex_view
+            .as_ref()
+            .zip(c.want_view.as_ref())
+            .is_some_and(|(have, want)| have.scale.to_bits() == want.scale.to_bits() && covers(have, want));
+    !(done.coarse && refined_here)
+}
+
+/// Whether `outer` shows all of the page that `inner` does.
+fn covers(outer: &figcraft_render::View, inner: &figcraft_render::View) -> bool {
+    let (o, i) = (outer.page_rect(), inner.page_rect());
+    // Rounding in the snapped origin, well under a device pixel.
+    let eps = 1e-6 / inner.scale.max(1e-9);
+    o.x0 <= i.x0 + eps && o.y0 <= i.y0 + eps && o.x1 >= i.x1 - eps && o.y1 >= i.y1 - eps
+}
+
+pub(super) fn request_render(app: &mut FigApp, worker: &mut Worker, ppp: f32, max_texture_side: u32, dots: Option<figcraft_render::Dots>) {
+    let Ok(ds) = app.session.ds() else { return };
+    let rect = app.canvas.rect;
+    let (mut ox, mut oy) = ds.view.origin();
+    let (scale, visible_w, visible_h) = if let Some(k) = ds.view.pixel_preview_scale() {
+        // Pixel preview: render `k` pixels per page unit from a whole-pixel origin, shown magnified
+        // without smoothing.
+        (ox, oy) = ((ox * k).floor() / k, (oy * k).floor() / k);
+        let z = ds.view.zoom.max(1e-9) / k;
+        (k, (f64::from(rect.width()) / z).ceil() as u32 + 2, (f64::from(rect.height()) / z).ceil() as u32 + 2)
+    } else {
+        (ds.view.zoom * f64::from(ppp), (rect.width() * ppp).ceil().max(1.0) as u32, (rect.height() * ppp).ceil().max(1.0) as u32)
+    };
+    // The edited text is drawn live (an IME composition included); the caret is an overlay.
+    let doc = app.preedit_view().map(|p| p.doc.clone()).unwrap_or_else(|| ds.doc.clone());
+    let outlined = if ds.view.outlines_selection { ds.selection.clone() } else { vec![] };
+    let proof = ds.view.proof_srgb && !doc.color_profile.is_srgb();
+    let outline_extras = figcraft_render::Outline { hidden: ds.view.outline_hidden, bounds: ds.view.outline_bounds, light: false };
+    // Render beyond the visible viewport. During a pan the previous texture then still covers
+    // the screen while the worker renders newly exposed content. Request a new buffer before the
+    // visible area reaches its edge, rather than exposing an empty strip each pointer move.
+    let margin = overscan_margin(visible_w, visible_h, max_texture_side);
+    let origin = (ox, oy);
+    let visible = (visible_w, visible_h);
+    let requested = (ox - f64::from(margin) / scale, oy - f64::from(margin) / scale);
+    let size = (visible_w.saturating_add(margin * 2).min(max_texture_side), visible_h.saturating_add(margin * 2).min(max_texture_side));
+    let key = JobKey {
+        doc: Arc::as_ptr(&doc) as usize,
+        page: ds.page,
+        origin: ((requested.0 * 1000.0) as i64, (requested.1 * 1000.0) as i64),
+        scale: (scale * 10000.0) as i64,
+        size,
+        outline: ds.view.outlines,
+        outline_extras,
+        outlined: outlined.clone(),
+        skip: vec![],
+        solo: ds.focused(),
+        fonts: figcraft_text::layout_generation(),
+        proof,
+        dots,
+    };
+    if let Some(previous) = &app.canvas.submitted {
+        let previous_origin = (previous.origin.0 as f64 / 1000.0, previous.origin.1 as f64 / 1000.0);
+        let same_content = JobKey { origin: previous.origin, size: previous.size, ..key.clone() } == *previous;
+        let covers = cached_render_covers(previous_origin, previous.size, origin, visible, scale);
+        if same_content && covers {
+            return;
+        }
+    }
+    if app.canvas.submitted.as_ref() == Some(&key) {
+        return;
+    }
+    let job = Job {
+        doc,
+        page: ds.page,
+        view: figcraft_render::View { origin: requested, scale, width: size.0, height: size.1 },
+        outline: ds.view.outlines,
+        outline_extras,
+        outlined,
+        skip: vec![],
+        solo: key.solo,
+        proof,
+        dots,
+        uid: ds.uid,
+        zoom_preview: ds.view.pixel_preview_scale().is_none(),
+        at: web_time::Instant::now(),
+    };
+    app.canvas.want_view = Some(job.view.clone());
+    worker.submit(job);
+    app.canvas.submitted = Some(key);
+}
+
+/// Leave a 96-pixel reserve so the next render starts before a pan reaches a cached edge.
+fn cached_render_covers(buffer_origin: (f64, f64), buffer_size: (u32, u32), view_origin: (f64, f64), view_size: (u32, u32), scale: f64) -> bool {
+    if !scale.is_finite() || scale <= 0.0 {
+        return false;
+    }
+    let guard_x = 96.0_f64.min(f64::from(buffer_size.0.saturating_sub(view_size.0)) / 4.0) / scale;
+    let guard_y = 96.0_f64.min(f64::from(buffer_size.1.saturating_sub(view_size.1)) / 4.0) / scale;
+    view_origin.0 >= buffer_origin.0 + guard_x
+        && view_origin.1 >= buffer_origin.1 + guard_y
+        && view_origin.0 + f64::from(view_size.0) / scale <= buffer_origin.0 + f64::from(buffer_size.0) / scale - guard_x
+        && view_origin.1 + f64::from(view_size.1) / scale <= buffer_origin.1 + f64::from(buffer_size.1) / scale - guard_y
+}
+
+/// Bound the extra rendered area to about 1.6 times the visible area. A fixed large margin can
+/// multiply the pixel count several-fold on a narrow or small viewport.
+fn overscan_margin(width: u32, height: u32, max_texture_side: u32) -> u32 {
+    width.min(height).saturating_div(8).min(128).min(max_texture_side.saturating_sub(width.max(height)) / 2)
+}
+
+#[cfg(test)]
+#[test]
+fn pan_uses_cached_pixels_until_the_refill_boundary() {
+    let margin = overscan_margin(1000, 800, 16_383);
+    assert_eq!(margin, 100);
+    let buffer = (-f64::from(margin), -f64::from(margin));
+    let size = (1000 + 2 * margin, 800 + 2 * margin);
+    assert!(cached_render_covers(buffer, size, (0.0, 0.0), (1000, 800), 1.0));
+    assert!(cached_render_covers(buffer, size, (50.0, 0.0), (1000, 800), 1.0));
+    assert!(!cached_render_covers(buffer, size, (80.0, 0.0), (1000, 800), 1.0));
+    assert!(!cached_render_covers(buffer, size, (-80.0, 0.0), (1000, 800), 1.0));
+    assert!(cached_render_covers((-24.0, -24.0), (1048, 848), (10.0, 0.0), (1000, 800), 1.0));
+    assert!(!cached_render_covers((-24.0, -24.0), (1048, 848), (19.0, 0.0), (1000, 800), 1.0));
+}
+
+#[cfg(test)]
+#[test]
+fn overscan_stays_within_texture_and_pixel_budget() {
+    for (width, height, limit) in [(1000, 800, 16_383), (390, 844, 16_383), (2560, 1440, 16_383), (1000, 800, 1060)] {
+        let margin = overscan_margin(width, height, limit);
+        assert!(width + 2 * margin <= limit || width > limit);
+        assert!(height + 2 * margin <= limit || height > limit);
+        let rendered = u64::from(width + 2 * margin) * u64::from(height + 2 * margin);
+        let visible = u64::from(width) * u64::from(height);
+        assert!(rendered * 5 <= visible * 8); // At most 1.6× the visible pixels.
+    }
+}
diff --git a/crates/ui-egui/src/render_worker.rs b/crates/ui-egui/src/canvas/render_worker.rs
similarity index 67%
rename from crates/ui-egui/src/render_worker.rs
rename to crates/ui-egui/src/canvas/render_worker.rs
index e2fb9a20..873e762a 100644
--- a/crates/ui-egui/src/render_worker.rs
+++ b/crates/ui-egui/src/canvas/render_worker.rs
@@ -8,6 +8,10 @@
 //! whole view is first rendered coarsely ([`PREVIEW_FACTOR`] times fewer pixels each way, kept
 //! apart from the full image so pans and edits still build on it), then refined unless a newer
 //! request is already waiting.
+//! Without a measure of the new render (the first one, another page or file, a zoom after quick
+//! renders) nothing is spent up front: on the desktop a watchdog thread renders the preview once
+//! the render from scratch has run past [`PREVIEW_AFTER_MS`], beside it (the full render keeps the
+//! other cores), and drops it if the full image is there first.
 
 use std::sync::Arc;
 
@@ -19,7 +23,7 @@ use web_time::Instant;
 
 /// A preview has this many times fewer pixels each way than the view it stands in for.
 pub const PREVIEW_FACTOR: f64 = 4.0;
-/// Full renders quicker than this (about a frame) show without a preview first.
+/// Full renders quicker than this (about a frame) show without a preview.
 pub const PREVIEW_AFTER_MS: f64 = 12.0;
 
 #[derive(Clone)]
@@ -37,6 +41,8 @@ pub struct Job {
     pub solo: Option<NodeId>,
     /// Soft-proof sRGB: stripe the colours sRGB can't show.
     pub proof: bool,
+    /// A board's dot grid under the layers.
+    pub dots: Option<figcraft_render::Dots>,
     /// The document's [`figcraft_engine::DocState::uid`]: images of other files are never shown.
     pub uid: u64,
     /// A coarse preview may come first when the zoom changes (not in pixel preview, whose pixels
@@ -60,6 +66,8 @@ pub struct Done {
     pub coarse: bool,
     /// [`Job::at`].
     pub at: Instant,
+    /// The request it answers, numbered by the worker in order (0 outside a worker).
+    pub seq: u64,
 }
 
 /// A render of a document in `profile` as a texture image for the screen (sRGB).
@@ -95,6 +103,8 @@ fn run(job: &Job, view: &View, retained: &mut Retained, coarse: bool) -> Option<
         skip: job.skip.clone(),
         solo: job.solo,
         lod: true,
+        magnified_image_pixels: true,
+        dots: job.dots,
         ..Default::default()
     };
     let (view, pix, work) = retained.render(&job.doc, job.page, view, &opts)?;
@@ -103,7 +113,7 @@ fn run(job: &Job, view: &View, retained: &mut Retained, coarse: bool) -> Option<
         mark_outside_srgb(&mut image, pix, job.doc.color_profile);
     }
     let ms = t0.elapsed().as_secs_f64() * 1000.0;
-    Some(Done { image, view, ms, work, uid: job.uid, page: job.page, coarse, at: job.at })
+    Some(Done { image, view, ms, work, uid: job.uid, page: job.page, coarse, at: job.at, seq: 0 })
 }
 
 /// `view` with [`PREVIEW_FACTOR`] times fewer pixels each way, showing at least the same area.
@@ -137,13 +147,21 @@ impl Renders {
         Self { full: Retained::default(), preview: Retained::default(), last: None, full_ms: 0.0, preview_after_ms: ms }
     }
 
-    /// Whether `job` gets a preview first: the kept image is of another zoom, page or file (so the
-    /// full render starts from scratch) and those have been slow. The first render has no
-    /// measure yet and comes without one.
+    /// Whether `job` is a render from scratch: the kept image is of another zoom, page or file, or
+    /// there is none.
+    fn starts_over(&self, job: &Job) -> bool {
+        self.last.is_none_or(|(uid, page, scale)| uid != job.uid || page != job.page || scale.to_bits() != job.view.scale.to_bits())
+    }
+
+    /// Whether `job` gets a preview first: it renders from scratch and those have been slow on a
+    /// page already drawn (the first render has no measure).
     fn wants_preview(&self, job: &Job) -> bool {
-        job.zoom_preview
-            && self.full_ms >= self.preview_after_ms
-            && self.last.is_some_and(|(uid, page, scale)| uid != job.uid || page != job.page || scale.to_bits() != job.view.scale.to_bits())
+        job.zoom_preview && self.last.is_some() && self.full_ms >= self.preview_after_ms && self.starts_over(job)
+    }
+
+    /// Whether `job` should get a preview should its render run long: from scratch, with none first.
+    pub fn wants_late_preview(&self, job: &Job) -> bool {
+        job.zoom_preview && self.starts_over(job) && !self.wants_preview(job)
     }
 
     /// The coarse preview of the whole of `job`'s view, when one should come first.
@@ -151,8 +169,7 @@ impl Renders {
         if !self.wants_preview(job) {
             return None;
         }
-        let view = coarse_view(&job.view);
-        guarded(&mut self.preview, |r| run(job, &view, r, true))
+        preview_with(job, &mut self.preview)
     }
 
     /// The image of `job`'s view, built on the kept one where it can be.
@@ -168,6 +185,26 @@ impl Renders {
     }
 }
 
+/// The coarse preview of the whole of `job`'s view, kept in `retained`.
+pub fn preview_with(job: &Job, retained: &mut Retained) -> Option<Done> {
+    let view = coarse_view(&job.view);
+    guarded(retained, |r| run(job, &view, r, true))
+}
+
+/// `d` numbered as the answer to request `seq`.
+fn answering(d: Done, seq: u64) -> Done {
+    Done { seq, ..d }
+}
+
+/// Of two finished renders, the one to show: the newer request's, and of one request's the refined
+/// image (the watchdog's preview can arrive after it).
+pub fn better(a: Option<Done>, b: Done) -> Done {
+    match a {
+        Some(a) if a.seq > b.seq || (a.seq == b.seq && !a.coarse && b.coarse) => a,
+        _ => b,
+    }
+}
+
 /// Run `f` on `retained`; after a panic, forget the image it may have left half drawn.
 fn guarded(retained: &mut Retained, f: impl FnOnce(&mut Retained) -> Option<Done>) -> Option<Done> {
     match std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| f(retained))) {
@@ -199,6 +236,40 @@ impl Worker {
         let done_with = finished.clone();
         // The window that renders with it (each window has its own worker).
         let viewport = ctx.viewport_id();
+        // The request being rendered from scratch without a preview, and when it started, for the
+        // watchdog; the newest request refined so far.
+        let (watch, watched) = std::sync::mpsc::channel::<(u64, Job, std::time::Instant)>();
+        let refined = Arc::new(std::sync::atomic::AtomicU64::new(0));
+        let refined_seen = refined.clone();
+        let (preview_tx, preview_ctx) = (done_tx.clone(), ctx.clone());
+        let watchdog = std::thread::Builder::new().name("figcraft-render-preview".into()).spawn(move || {
+            let mut retained = Retained::default();
+            let after = std::time::Duration::from_secs_f64(PREVIEW_AFTER_MS / 1000.0);
+            while let Ok((mut seq, mut job, mut started)) = watched.recv() {
+                // Wait out the threshold; a newer arming means that render is over.
+                loop {
+                    match watched.recv_timeout(after.saturating_sub(started.elapsed())) {
+                        Ok(newer) => (seq, job, started) = newer,
+                        Err(std::sync::mpsc::RecvTimeoutError::Timeout) => break,
+                        Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => return,
+                    }
+                }
+                let still_rendering = || refined_seen.load(std::sync::atomic::Ordering::Acquire) < seq;
+                if !still_rendering() {
+                    continue;
+                }
+                let Some(d) = preview_with(&job, &mut retained) else { continue };
+                if still_rendering() {
+                    if preview_tx.send(answering(d, seq)).is_err() {
+                        break;
+                    }
+                    preview_ctx.request_repaint_of(viewport);
+                }
+            }
+        });
+        if let Err(e) = watchdog {
+            log::error!("render preview thread: {e}");
+        }
         let spawned = std::thread::Builder::new().name("figcraft-render".into()).spawn(move || {
             let mut renders = Renders::default();
             let mut next = None;
@@ -209,7 +280,7 @@ impl Worker {
                     (seq, job) = newer;
                 }
                 if let Some(d) = renders.preview(&job) {
-                    if done_tx.send(d).is_err() {
+                    if done_tx.send(answering(d, seq)).is_err() {
                         break;
                     }
                     ctx.request_repaint_of(viewport);
@@ -219,8 +290,14 @@ impl Worker {
                         continue;
                     }
                 }
-                if let Some(d) = renders.refine(&job)
-                    && done_tx.send(d).is_err()
+                if renders.wants_late_preview(&job) {
+                    // Without the watchdog (it failed to start) there is just no preview.
+                    let _ = watch.send((seq, job.clone(), std::time::Instant::now()));
+                }
+                let done = renders.refine(&job);
+                refined.store(seq, std::sync::atomic::Ordering::Release);
+                if let Some(d) = done
+                    && done_tx.send(answering(d, seq)).is_err()
                 {
                     break;
                 }
@@ -246,12 +323,13 @@ impl Worker {
         self.finished.load(std::sync::atomic::Ordering::Acquire) < self.submitted
     }
 
+    /// The best of the renders finished since the last poll ([`better`]).
     pub fn poll(&mut self) -> Option<Done> {
-        let mut last = None;
+        let mut best = None;
         while let Ok(d) = self.rx.try_recv() {
-            last = Some(d);
+            best = Some(better(best, d));
         }
-        last
+        best
     }
 }
 
@@ -261,6 +339,8 @@ impl Worker {
 pub struct Inline {
     ctx: egui::Context,
     pending: Option<Job>,
+    /// Requests submitted so far.
+    submitted: u64,
     previewed: bool,
     renders: Renders,
 }
@@ -270,10 +350,11 @@ pub type Worker = Inline;
 
 impl Inline {
     pub fn new(ctx: egui::Context) -> Self {
-        Self { ctx, pending: None, previewed: false, renders: Renders::default() }
+        Self { ctx, pending: None, submitted: 0, previewed: false, renders: Renders::default() }
     }
     pub fn submit(&mut self, job: Job) {
         self.pending = Some(job);
+        self.submitted += 1;
         self.previewed = false;
     }
     pub fn in_flight(&self) -> bool {
@@ -284,11 +365,11 @@ impl Inline {
             self.previewed = true;
             if let Some(d) = self.pending.as_ref().and_then(|job| self.renders.preview(job)) {
                 self.ctx.request_repaint();
-                return Some(d);
+                return Some(answering(d, self.submitted));
             }
         }
         let job = self.pending.take()?;
-        self.renders.refine(&job)
+        self.renders.refine(&job).map(|d| answering(d, self.submitted))
     }
 }
 
diff --git a/crates/ui-egui/src/canvas/rulers.rs b/crates/ui-egui/src/canvas/rulers.rs
new file mode 100644
index 00000000..a394ca7c
--- /dev/null
+++ b/crates/ui-egui/src/canvas/rulers.rs
@@ -0,0 +1,93 @@
+use super::outline::stroke;
+use super::overlays::accent;
+use super::*;
+
+/// The layers that get canvas labels and layout grids, in z-order: the page's visible top-level
+/// layers and, inside sections whose contents show, their visible children (sections nest). A
+/// section comes after its children, so its title pill draws over (and takes clicks from) the
+/// labels of frames near its top-left (#1150).
+pub(super) fn boards(doc: &Document, page: NodeId) -> Vec<NodeId> {
+    fn walk(doc: &Document, id: NodeId, depth: usize, out: &mut Vec<NodeId>) {
+        let Some(n) = doc.node(id) else { return };
+        for c in &n.children {
+            let Some(cn) = doc.node(*c) else { continue };
+            if !cn.visible {
+                continue;
+            }
+            if matches!(cn.kind, NodeKind::Section { contents_hidden: false }) && depth < 32 {
+                walk(doc, *c, depth + 1, out);
+            }
+            out.push(*c);
+        }
+    }
+    let mut out = Vec::new();
+    walk(doc, page, 0, &mut out);
+    out
+}
+
+/// A frame's or section's handoff status as its badge says it, with the badge colour ("Changed"
+/// once a ready-for-dev layer was edited; `None` without a status).
+pub(crate) fn status_label(n: &figcraft_doc::Node) -> Option<(&'static str, Color32)> {
+    match n.dev_status {
+        figcraft_doc::DevStatus::None => None,
+        figcraft_doc::DevStatus::ReadyForDev if n.dev_changed => Some((tr("Changed"), crate::theme::DEV_CHANGED)),
+        figcraft_doc::DevStatus::ReadyForDev => Some((tr("Ready for dev"), crate::theme::DEV_READY)),
+        figcraft_doc::DevStatus::Completed => Some((tr("Completed"), crate::theme::DEV_COMPLETED)),
+    }
+}
+
+/// A frame's or section's handoff status as a small pill left-centred on `at`; the pill's area.
+pub(crate) fn status_badge(painter: &egui::Painter, n: &figcraft_doc::Node, at: Pos2) -> Option<Rect> {
+    let (label, fill) = status_label(n)?;
+    let galley = painter.layout_no_wrap(label.to_string(), semibold(10.0), Color32::WHITE);
+    let r = Rect::from_min_size(pos2(at.x, at.y - galley.size().y / 2.0 - 2.0), galley.size() + vec2(10.0, 4.0));
+    painter.rect_filled(r, CornerRadius::same(4), fill);
+    painter.galley(r.min + vec2(5.0, 2.0), galley, Color32::WHITE);
+    Some(r)
+}
+
+pub(super) fn rulers(app: &FigApp, painter: &egui::Painter, t: &Tokens, doc: &Document, sel: &[NodeId]) {
+    let r = app.canvas.rect;
+    let size = 20.0;
+    painter.rect_filled(Rect::from_min_size(r.min, vec2(r.width(), size)), CornerRadius::ZERO, t.panel);
+    painter.rect_filled(Rect::from_min_size(r.min, vec2(size, r.height())), CornerRadius::ZERO, t.panel);
+    let zoom = app.session.ds().map(|d| d.view.zoom).unwrap_or(1.0);
+    let step = figcraft_engine::guides::ruler_step(zoom);
+    let p0 = app.to_page(r.min);
+    let p1 = app.to_page(r.max);
+    // Highlight the selection's span.
+    if let Some(b) = doc.bounds_of(sel) {
+        let (a, bb) = (app.to_screen(b.x0, b.y0), app.to_screen(b.x1, b.y1));
+        painter.rect_filled(
+            Rect::from_min_max(pos2(a.x, r.min.y), pos2(bb.x, r.min.y + size)),
+            CornerRadius::ZERO,
+            accent(painter).gamma_multiply(0.15),
+        );
+        painter.rect_filled(
+            Rect::from_min_max(pos2(r.min.x, a.y), pos2(r.min.x + size, bb.y)),
+            CornerRadius::ZERO,
+            accent(painter).gamma_multiply(0.15),
+        );
+    }
+    let mut x = (p0.x / step).floor() * step;
+    while x <= p1.x {
+        let s = app.to_screen(x, 0.0).x;
+        painter.line_segment([pos2(s, r.min.y + size - 6.0), pos2(s, r.min.y + size)], stroke(t.text_tertiary, 1.0));
+        painter.text(pos2(s + 2.0, r.min.y + 3.0), Align2::LEFT_TOP, fmt(x), regular(9.0), t.text_secondary);
+        x += step;
+    }
+    let mut y = (p0.y / step).floor() * step;
+    while y <= p1.y {
+        let s = app.to_screen(0.0, y).y;
+        painter.line_segment([pos2(r.min.x + size - 6.0, s), pos2(r.min.x + size, s)], stroke(t.text_tertiary, 1.0));
+        painter.text(pos2(r.min.x + 3.0, s + 2.0), Align2::LEFT_TOP, fmt(y), regular(9.0), t.text_secondary);
+        y += step;
+    }
+    painter.line_segment([pos2(r.min.x, r.min.y + size), pos2(r.max.x, r.min.y + size)], stroke(t.border, 1.0));
+    painter.line_segment([pos2(r.min.x + size, r.min.y), pos2(r.min.x + size, r.max.y)], stroke(t.border, 1.0));
+}
+
+pub fn fmt(v: f64) -> String {
+    let r = (v * 100.0).round() / 100.0;
+    if (r - r.round()).abs() < 1e-9 { format!("{}", r.round() as i64) } else { format!("{r}") }
+}
diff --git a/crates/ui-egui/src/canvas/selection_spacing.rs b/crates/ui-egui/src/canvas/selection_spacing.rs
new file mode 100644
index 00000000..414348bb
--- /dev/null
+++ b/crates/ui-egui/src/canvas/selection_spacing.rs
@@ -0,0 +1,440 @@
+//! Smart-selection fields and handles. Geometry and document edits belong to the engine.
+use std::sync::Arc;
+
+use egui::{CursorIcon, Id, Pos2, Rect, Stroke, Ui, vec2};
+use figcraft_doc::{Document, NodeId};
+use figcraft_engine::selection_reorder::ReorderLayout;
+use figcraft_engine::selection_spacing::{Axis, SelectionSpacing, selection_spacing};
+use serde_json::json;
+
+use crate::FigApp;
+use crate::handles::{PINK, pink_label};
+use crate::i18n::tr;
+use crate::icons::Icon;
+use crate::widgets::{self, Lead};
+
+#[derive(Clone)]
+struct LayoutCache {
+    document: u64,
+    page: NodeId,
+    doc: Arc<Document>,
+    ids: Vec<NodeId>,
+    frame: u64,
+    layout: Arc<SelectionSpacing>,
+    reorder: Option<Arc<ReorderLayout>>,
+}
+
+/// Return one cached spacing/reorder calculation per document, page, selection and frame,
+/// refreshing next frame after an edit and reusing an unchanged document snapshot.
+fn layout(app: &FigApp, ctx: &egui::Context, ids: &[NodeId]) -> Arc<SelectionSpacing> {
+    let Ok(ds) = app.session.ds() else { return Arc::new(SelectionSpacing::default()) };
+    let key = Id::unique("selection_spacing_layout");
+    let frame = ctx.cumulative_frame_nr();
+    if let Some(mut cache) = ctx.data(|d| d.get_temp::<LayoutCache>(key))
+        && cache.document == ds.uid
+        && cache.page == ds.page
+        && cache.ids == ids
+        && (cache.frame == frame || Arc::ptr_eq(&cache.doc, &ds.doc))
+    {
+        if cache.frame != frame {
+            cache.frame = frame;
+            ctx.data_mut(|d| d.insert_temp(key, cache.clone()));
+        }
+        return cache.layout;
+    }
+    // Panel, input and drawing share one calculation per frame. If a command changes the
+    // document during this frame, refresh next frame; unchanged snapshots also reuse it then.
+    let layout = Arc::new(selection_spacing(&ds.doc, ids));
+    let reorder = ReorderLayout::new(&ds.doc, ids).map(Arc::new);
+    ctx.data_mut(|d| {
+        d.insert_temp(
+            key,
+            LayoutCache { document: ds.uid, page: ds.page, doc: ds.doc.clone(), ids: ids.to_vec(), frame, layout: layout.clone(), reorder },
+        );
+    });
+    layout
+}
+/// Return the cached reorder layout, first ensuring the shared layout cache is populated.
+fn reorder_layout(app: &FigApp, ctx: &egui::Context, ids: &[NodeId]) -> Option<Arc<ReorderLayout>> {
+    layout(app, ctx, ids);
+    ctx.data(|d| d.get_temp::<LayoutCache>(Id::unique("selection_spacing_layout"))).and_then(|c| c.reorder)
+}
+
+/// Stable egui id for spacing/reorder drag state.
+fn drag_id() -> Id {
+    Id::unique("selection_spacing_drag")
+}
+
+/// The reorder ring of a layer with world bounds `b`: its centre on screen and hit radius. The
+/// radius is 8 px, at most a quarter of the layer's smaller side on screen, so most of a small
+/// layer still drags the selection; a layer under 16 px on screen has no ring.
+fn ring(app: &FigApp, b: figcraft_geom::Rect) -> Option<(Pos2, f32)> {
+    let zoom = app.session.ds().map_or(1.0, |d| d.view.zoom);
+    let side = ((b.x1 - b.x0).min(b.y1 - b.y0) * zoom) as f32;
+    (side >= 16.0).then(|| (app.to_screen((b.x0 + b.x1) * 0.5, (b.y0 + b.y1) * 0.5), (side / 4.0).min(8.0)))
+}
+
+#[derive(Clone)]
+enum Action {
+    Spacing { axis: Axis, value: f64, last_value: Option<f64> },
+    Reorder { layout: Arc<ReorderLayout>, source: NodeId, target: NodeId, swap: bool },
+}
+
+#[derive(Clone)]
+struct Drag {
+    ids: Vec<NodeId>,
+    action: Action,
+    start: Pos2,
+    uid: u64,
+    page: NodeId,
+    moved: bool,
+}
+
+fn start_drag(app: &mut FigApp, ctx: &egui::Context, ids: Vec<NodeId>, p: Pos2, action: Action) {
+    let label = match action {
+        Action::Spacing { .. } => tr("Spacing"),
+        Action::Reorder { .. } => tr("Reorder selection"),
+    };
+    if app.session.begin_interaction(label).is_ok()
+        && let Ok(ds) = app.session.ds()
+    {
+        let drag = Drag { ids, action, start: p, uid: ds.uid, page: ds.page, moved: false };
+        app.ui.layers_focus = false;
+        app.ui.pages_focus = None;
+        app.ui.key_box = None;
+        ctx.memory_mut(|m| {
+            if let Some(f) = m.focused() {
+                m.surrender_focus(f);
+            }
+        });
+        ctx.data_mut(|d| d.insert_temp(drag_id(), drag));
+    }
+}
+
+/// Draw horizontal and vertical spacing fields, running `arrange.spacing` with
+/// `fromGesture`.
+pub fn panel(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId]) {
+    let layout = layout(app, ui.ctx(), ids);
+    if layout.horizontal.is_none() && layout.vertical.is_none() {
+        return;
+    }
+    widgets::sublabels(ui, tr("Spacing"), None);
+    let col = widgets::col_width(ui.available_width());
+    crate::right::row(ui, 32.0, |ui| {
+        for (axis, key, icon, tip) in [
+            (&layout.horizontal, "horizontal", Icon::DistributeH, tr("Horizontal spacing")),
+            (&layout.vertical, "vertical", Icon::DistributeV, tr("Vertical spacing")),
+        ] {
+            let Some(axis) = axis else { continue };
+            let edit = widgets::number_field(ui, Id::unique(("selection_spacing", key)), Lead::Icon(icon, tip), axis.value, "", col, 1.0);
+            app.field_run(edit, "arrange.spacing", |v| json!({"ids":ids,key:v.clamp(-1e6,1e6),"fromGesture":true}));
+        }
+    });
+}
+
+#[derive(Clone)]
+struct Handle {
+    value: f64,
+    center: Pos2,
+    hit: Rect,
+}
+
+fn bounds(doc: &Document, ids: &[NodeId]) -> Option<figcraft_geom::Rect> {
+    ids.iter().filter_map(|id| doc.world_bounds(*id)).reduce(|a, b| a.union(b))
+}
+
+fn handles(app: &FigApp, axis: &Axis) -> Vec<Handle> {
+    let Ok(doc) = app.session.doc() else { return vec![] };
+    let cross = |b: figcraft_geom::Rect| if axis.vertical { (b.x0, b.x1) } else { (b.y0, b.y1) };
+    let mut out = Vec::new();
+    for pair in axis.tracks.windows(2) {
+        let Some((a, b)) = pair.first().zip(pair.get(1)) else { continue };
+        let (Some(ab), Some(bb)) = (bounds(doc, &a.ids), bounds(doc, &b.ids)) else { continue };
+        let gap = axis.start(bb) - axis.end(ab);
+        let middle = (axis.start(bb) + axis.end(ab)) * 0.5;
+        // Intersect neighbouring tracks' cross-axis spans in a sweep: one handle per row/cell,
+        // without comparing every object in a large column to every object in the next one.
+        let mut aa: Vec<_> = a.ids.iter().filter_map(|id| doc.world_bounds(*id)).map(cross).collect();
+        let mut bs: Vec<_> = b.ids.iter().filter_map(|id| doc.world_bounds(*id)).map(cross).collect();
+        aa.sort_by(|a, b| a.0.total_cmp(&b.0));
+        bs.sort_by(|a, b| a.0.total_cmp(&b.0));
+        let (mut i, mut j) = (0, 0);
+        while let (Some(a), Some(b)) = (aa.get(i), bs.get(j)) {
+            let (lo, hi) = (a.0.max(b.0), a.1.min(b.1));
+            if hi > lo {
+                let c = (lo + hi) * 0.5;
+                let center = if axis.vertical { app.to_screen(c, middle) } else { app.to_screen(middle, c) };
+                let size = if axis.vertical { vec2(24.0, 10.0) } else { vec2(10.0, 24.0) };
+                out.push(Handle { value: gap, center, hit: Rect::from_center_size(center, size) });
+            }
+            if a.1 <= b.1 {
+                i += 1;
+            } else {
+                j += 1;
+            }
+        }
+    }
+    out
+}
+
+fn available(app: &FigApp) -> bool {
+    app.ui.right_tab == crate::RightTab::Design
+        && app.ui.picker.is_none()
+        && app.session.tool.tool == figcraft_engine::ToolId::Move
+        && !app.session.tool.busy()
+        && app.session.ds().is_ok_and(|d| d.text_edit.is_none() && d.vector_edit.is_none())
+}
+
+pub fn cancel(app: &mut FigApp, ctx: &egui::Context) -> bool {
+    let drag = ctx.data(|d| d.get_temp::<Drag>(drag_id()));
+    if let Some(drag) = &drag {
+        figcraft_engine::selection_spacing::cancel_gesture(&mut app.session, drag.uid);
+        ctx.data_mut(|d| d.remove::<Drag>(drag_id()));
+    }
+    drag.is_some()
+}
+
+/// Retire handles when another document, page, tool or editing context takes over.
+pub fn sync(app: &mut FigApp, ctx: &egui::Context) {
+    if let Some(drag) = ctx.data(|d| d.get_temp::<Drag>(drag_id())) {
+        let same = app.session.ds().is_ok_and(|d| d.uid == drag.uid && d.page == drag.page && d.selection == drag.ids && d.interaction.is_some());
+        if !same || !available(app) {
+            cancel(app, ctx);
+        }
+    }
+}
+
+/// Called before canvas pointer dispatch, also when the pointer leaves the canvas/window.
+pub fn input(app: &mut FigApp, ctx: &egui::Context, pos: Option<Pos2>, hovered: bool, space: bool) -> bool {
+    let dragging = ctx.data(|d| d.get_temp::<Drag>(drag_id()));
+    if let Some(mut drag) = dragging {
+        let same = app.session.ds().is_ok_and(|d| d.uid == drag.uid && d.page == drag.page && d.selection == drag.ids && d.interaction.is_some());
+        if !same {
+            cancel(app, ctx);
+            return true;
+        }
+        let down = ctx.input(|i| i.pointer.primary_down());
+        if let Some(p) = pos {
+            match &mut drag.action {
+                Action::Spacing { axis, value: original, last_value } => {
+                    let zoom = app.session.ds().map_or(1.0, |d| d.view.zoom).max(1e-6);
+                    let distance = if axis.vertical { p.y - drag.start.y } else { p.x - drag.start.x };
+                    drag.moved |= distance.abs() >= 3.0;
+                    if drag.moved {
+                        let value = ctx
+                            .input(|i| {
+                                let quantum = if i.modifiers.alt {
+                                    0.1
+                                } else if i.modifiers.shift {
+                                    10.0
+                                } else {
+                                    1.0
+                                };
+                                ((*original + f64::from(distance) / zoom) / quantum).round() * quantum
+                            })
+                            .clamp(-1e6, 1e6);
+                        let key = if axis.vertical { "vertical" } else { "horizontal" };
+                        if *last_value != Some(value) {
+                            match app.session.execute("arrange.spacing", &json!({"ids":drag.ids,key:value,"fromGesture":true})) {
+                                Ok(_) => *last_value = Some(value),
+                                Err(e) => app.toast(e.to_string()),
+                            }
+                        }
+                    }
+                }
+                Action::Reorder { layout, source, target, swap } if app.canvas.rect.contains(p) => {
+                    drag.moved |= p.distance(drag.start) >= 3.0;
+                    // Hit original slots, never the moving preview: otherwise a stationary
+                    // pointer could alternate between two permutations on successive frames.
+                    let nearest = layout
+                        .slots
+                        .iter()
+                        .min_by(|a, b| {
+                            let center = |b: figcraft_geom::Rect| app.to_screen((b.x0 + b.x1) * 0.5, (b.y0 + b.y1) * 0.5);
+                            center(a.1).distance_sq(p).total_cmp(&center(b.1).distance_sq(p))
+                        })
+                        .map(|(id, _)| *id)
+                        .unwrap_or(*source);
+                    let swapping = ctx.input(|i| i.modifiers.command);
+                    if drag.moved && (nearest != *target || swapping != *swap) {
+                        match app
+                            .session
+                            .execute("arrange.reorder", &json!({"ids":drag.ids,"source":source,"target":nearest,"swap":swapping,"fromGesture":true}))
+                        {
+                            Ok(_) => {
+                                *target = nearest;
+                                *swap = swapping;
+                            }
+                            Err(e) => app.toast(e.to_string()),
+                        }
+                    }
+                }
+                // A release over a panel or outside the window commits the last canvas
+                // preview; the release's sentinel coordinates must not select a new slot.
+                Action::Reorder { .. } => {}
+            }
+        }
+        ctx.set_cursor_icon(match &drag.action {
+            Action::Spacing { axis, .. } if axis.vertical => CursorIcon::ResizeVertical,
+            Action::Spacing { .. } => CursorIcon::ResizeHorizontal,
+            Action::Reorder { .. } => CursorIcon::Grabbing,
+        });
+        if !down {
+            let _ = app.session.commit_interaction();
+            ctx.data_mut(|d| d.remove::<Drag>(drag_id()));
+        } else {
+            ctx.data_mut(|d| d.insert_temp(drag_id(), drag));
+        }
+        return true;
+    }
+    if !hovered || space || !available(app) {
+        return false;
+    }
+    let Some(p) = pos else { return false };
+    let ids = app.session.selection();
+    if let Some(reorder) = reorder_layout(app, ctx, &ids) {
+        for (id, b) in &reorder.slots {
+            if ring(app, *b).is_some_and(|(center, r)| center.distance(p) <= r) {
+                ctx.set_cursor_icon(CursorIcon::Grab);
+                if ctx.input(|i| i.pointer.primary_pressed()) {
+                    let source = *id;
+                    start_drag(app, ctx, ids, p, Action::Reorder { layout: reorder, source, target: source, swap: false });
+                }
+                return true;
+            }
+        }
+    }
+    if ctx.input(|i| i.modifiers.command) {
+        return false;
+    }
+    let layout = layout(app, ctx, &ids);
+    for axis in [layout.horizontal.as_ref(), layout.vertical.as_ref()].into_iter().flatten() {
+        for h in handles(app, axis) {
+            if !h.hit.contains(p) {
+                continue;
+            }
+            ctx.set_cursor_icon(if axis.vertical { CursorIcon::ResizeVertical } else { CursorIcon::ResizeHorizontal });
+            if ctx.input(|i| i.pointer.primary_pressed()) {
+                start_drag(app, ctx, ids, p, Action::Spacing { axis: axis.clone(), value: h.value, last_value: axis.value });
+            }
+            return true;
+        }
+    }
+    false
+}
+
+pub fn draw(app: &FigApp, painter: &egui::Painter) {
+    let ctx = painter.ctx();
+    let drag = ctx.data(|d| d.get_temp::<Drag>(drag_id()));
+    if !available(app) && drag.is_none() {
+        return;
+    }
+    let Ok(ds) = app.session.ds() else { return };
+    let hover = ctx.input(|i| i.pointer.hover_pos());
+    let Some(b) = bounds(&ds.doc, &ds.selection) else { return };
+    let rect = Rect::from_two_pos(app.to_screen(b.x0, b.y0), app.to_screen(b.x1, b.y1)).expand(12.0);
+    if drag.is_none() && !hover.is_some_and(|p| rect.contains(p)) {
+        return;
+    }
+    let reorder = match drag.as_ref().map(|d| &d.action) {
+        Some(Action::Reorder { layout, .. }) => Some(layout.clone()),
+        Some(Action::Spacing { .. }) => None,
+        None => reorder_layout(app, ctx, &ds.selection),
+    };
+    if let Some(layout) = reorder {
+        for (id, _) in &layout.slots {
+            let Some((center, r)) = ds.doc.world_bounds(*id).and_then(|b| ring(app, b)) else { continue };
+            let hot = hover.is_some_and(|p| center.distance(p) <= r);
+            let active = matches!(drag.as_ref().map(|d| &d.action), Some(Action::Reorder { source, .. }) if source == id);
+            if active {
+                painter.circle_filled(center, 4.5, PINK);
+            } else {
+                painter.circle_stroke(center, 4.5, Stroke::new(if hot { 2.5 } else { 1.5 }, PINK));
+            }
+        }
+    }
+    if let Some(Drag { action: Action::Reorder { layout, target, .. }, moved: true, .. }) = &drag {
+        if let Some((_, b)) = layout.slots.iter().find(|(id, _)| id == target) {
+            let rect = Rect::from_two_pos(app.to_screen(b.x0, b.y0), app.to_screen(b.x1, b.y1)).expand(3.0);
+            painter.rect_stroke(rect, 0, Stroke::new(2.0, crate::theme::ACCENT), egui::StrokeKind::Outside);
+        }
+        return;
+    }
+    let axes = if let Some(Drag { action: Action::Spacing { axis, .. }, .. }) = &drag {
+        vec![axis.clone()]
+    } else {
+        let layout = layout(app, ctx, &ds.selection);
+        [layout.horizontal.clone(), layout.vertical.clone()].into_iter().flatten().collect()
+    };
+    for axis in axes {
+        for h in handles(app, &axis) {
+            let hot = hover.is_some_and(|p| h.hit.contains(p)) || drag.is_some();
+            let by = if axis.vertical { vec2(10.0, 0.0) } else { vec2(0.0, 10.0) };
+            painter.line_segment([h.center - by, h.center + by], Stroke::new(if hot { 3.0 } else { 2.0 }, PINK));
+            if hot {
+                let at = h.center + if axis.vertical { vec2(18.0, 0.0) } else { vec2(0.0, -22.0) };
+                pink_label(painter, widgets::fmt_num(h.value), at);
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod cache_tests {
+    use super::*;
+    use crate::NoServices;
+    use figcraft_engine::Session;
+
+    fn setup() -> (FigApp, egui::Context, Vec<NodeId>) {
+        let mut session = Session::new();
+        let mut ids = Vec::new();
+        for x in [0, 80, 160] {
+            ids.push(NodeId(session.execute("shape.rectangle", &json!({"x":x,"width":50,"height":50})).unwrap()["id"].as_u64().unwrap()));
+        }
+        session.execute("select.set", &json!({"ids":ids})).unwrap();
+        (FigApp::new(session, Box::new(NoServices)), egui::Context::default(), ids)
+    }
+
+    #[test]
+    fn layout_is_shared_within_a_frame_and_refreshed_after_a_document_edit() {
+        let (mut app, ctx, ids) = setup();
+        let mut cached = None;
+        let mut output = ctx.run_ui(Default::default(), |_| {
+            let first = layout(&app, &ctx, &ids);
+            assert_eq!(first.horizontal.as_ref().unwrap().value, Some(30.0));
+            assert!(Arc::ptr_eq(&first, &layout(&app, &ctx, &ids)));
+            cached = Some(first);
+        });
+        output.textures_delta.clear();
+        let mut output = ctx.run_ui(Default::default(), |_| {
+            let first = layout(&app, &ctx, &ids);
+            assert!(Arc::ptr_eq(cached.as_ref().unwrap(), &first), "unchanged frames reuse the calculation");
+            app.set_props(&[ids[1]], json!({"x":90}));
+            assert!(Arc::ptr_eq(&first, &layout(&app, &ctx, &ids)), "a mid-frame edit waits until the next frame");
+        });
+        output.textures_delta.clear();
+        let mut output = ctx.run_ui(Default::default(), |_| {
+            let next = layout(&app, &ctx, &ids);
+            assert!(!Arc::ptr_eq(cached.as_ref().unwrap(), &next));
+            assert_eq!(next.horizontal.as_ref().unwrap().value, None);
+            assert!(Arc::ptr_eq(&next, &layout(&app, &ctx, &ids)));
+        });
+        output.textures_delta.clear();
+    }
+
+    #[test]
+    fn a_selection_or_document_switch_invalidates_the_layout() {
+        let (mut app, ctx, ids) = setup();
+        let mut output = ctx.run_ui(Default::default(), |_| {
+            let all = layout(&app, &ctx, &ids);
+            let subset = layout(&app, &ctx, &ids[..2]);
+            assert!(!Arc::ptr_eq(&all, &subset));
+            assert_eq!(subset.horizontal.as_ref().unwrap().tracks.len(), 2);
+            app.session.execute("file.new", &json!({})).unwrap();
+            let other = layout(&app, &ctx, &ids[..2]);
+            assert!(!Arc::ptr_eq(&subset, &other));
+            assert!(other.horizontal.is_none() && other.vertical.is_none());
+        });
+        output.textures_delta.clear();
+    }
+}
diff --git a/crates/ui-egui/src/canvas/widget_bar.rs b/crates/ui-egui/src/canvas/widget_bar.rs
new file mode 100644
index 00000000..c32002d6
--- /dev/null
+++ b/crates/ui-egui/src/canvas/widget_bar.rs
@@ -0,0 +1,113 @@
+//! The small bar floating over a selected plugin widget that has a property menu: its actions and
+//! toggles as buttons, its colour choices as swatches. Each calls `widget.menu`; the labels are the
+//! plugin's own.
+
+use egui::{CornerRadius, Rect, Sense, Stroke, StrokeKind, Ui, pos2, vec2};
+use figcraft_engine::widgets::{MenuItem, MenuKind, menu_of};
+use serde_json::json;
+
+use crate::FigApp;
+use crate::a11y;
+use crate::board_bar::{Mark, divider, paint_choice, place};
+use crate::theme::{Tokens, semibold};
+
+const HEIGHT: f32 = 40.0;
+const CELL: f32 = 28.0;
+const SWATCH: f32 = 20.0;
+const GAP: f32 = 4.0;
+/// A text button's padding on each side.
+const PAD: f32 = 8.0;
+
+/// What one item takes across the bar, its trailing gap included (text buttons by their label).
+fn width(ctx: &egui::Context, m: &MenuItem) -> f32 {
+    match m.kind {
+        MenuKind::Color => m.options.len() as f32 * (SWATCH + GAP),
+        _ => ctx.fonts_mut(|f| f.layout_no_wrap(m.label.clone(), semibold(11.0), egui::Color32::WHITE).size().x) + PAD * 2.0 + GAP,
+    }
+}
+
+/// The bar above the selected widget, while it is the only layer selected, nothing is being dragged
+/// or edited and the file can be edited.
+pub fn show(app: &mut FigApp, ctx: &egui::Context) {
+    if app.session.tool.busy() || app.session.active_read_only().is_some() {
+        return;
+    }
+    let Ok(ds) = app.session.ds() else { return };
+    let ([w], None) = (ds.selection.as_slice(), &ds.text_edit) else { return };
+    let w = *w;
+    let menu = menu_of(&ds.doc, w);
+    let Some(b) = ds.doc.world_bounds(w).filter(|_| !menu.is_empty()) else { return };
+    let sel = Rect::from_two_pos(app.to_screen(b.x0, b.y0), app.to_screen(b.x1, b.y1));
+    // Scrolled out of view: no bar (it would float over the rest of the window).
+    if !sel.intersects(app.canvas.rect) {
+        return;
+    }
+    let widths: Vec<f32> = menu.iter().map(|m| width(ctx, m)).collect();
+    // The items, a divider (8) between each two, and the padding.
+    let size = vec2(8.0 + widths.iter().sum::<f32>() + 8.0 * (menu.len() - 1) as f32 + 4.0, HEIGHT);
+    let at = place(sel, size, app.canvas.rect);
+    let t = Tokens::get(ctx);
+    egui::Area::new(egui::Id::unique("widget_bar")).fixed_pos(at).order(egui::Order::Middle).show(ctx, |ui| {
+        let (rect, _) = ui.allocate_exact_size(size, Sense::click());
+        a11y::container_bounds(ui, rect);
+        let p = ui.painter();
+        p.rect_filled(rect.expand(2.0).translate(vec2(0.0, 1.0)), CornerRadius::same(12), egui::Color32::from_black_alpha(18));
+        p.rect_filled(rect, CornerRadius::same(10), t.panel);
+        p.rect_stroke(rect, CornerRadius::same(10), Stroke::new(1.0, t.border), StrokeKind::Inside);
+        let cy = rect.center().y;
+        let mut x = rect.min.x + 8.0;
+        for (i, (m, wd)) in menu.iter().zip(&widths).enumerate() {
+            if i > 0 {
+                x = divider(ui, &t, x, cy);
+            }
+            if let Some(value) = item(ui, &t, m, x, cy, *wd) {
+                app.run("widget.menu", json!({"id": w, "item": m.item, "value": value}));
+            }
+            x += wd;
+        }
+    });
+}
+
+/// Draw item `m` from `x`, `wd` wide; the value to send when it's used.
+fn item(ui: &mut Ui, t: &Tokens, m: &MenuItem, x: f32, cy: f32, wd: f32) -> Option<serde_json::Value> {
+    if m.kind == MenuKind::Color {
+        let mut picked = None;
+        for (i, hex) in m.options.iter().enumerate() {
+            let r = Rect::from_center_size(pos2(x + i as f32 * (SWATCH + GAP) + SWATCH / 2.0, cy), vec2(SWATCH, SWATCH));
+            let tip = format!("{} {hex}", m.label);
+            let resp = ui.interact(r, ui.scope_id().with(("wb_color", &m.item, i)), Sense::click()).on_hover_text(&tip);
+            let on = m.value.as_ref() == Some(hex);
+            a11y::toggle(&resp, &tip, on);
+            if on {
+                ui.painter().rect_stroke(r.expand(2.5), CornerRadius::same(6), Stroke::new(1.5, t.text), StrokeKind::Inside);
+            } else if resp.hovered() {
+                ui.painter().rect_filled(r.expand(2.0), CornerRadius::same(6), t.hover);
+            }
+            if let Some(c) = figcraft_color::Color::from_hex(hex) {
+                paint_choice(ui.painter(), r, &Mark::Color(c), t.icon);
+            }
+            if resp.clicked() && !on {
+                picked = Some(json!(hex));
+            }
+        }
+        return picked;
+    }
+    let r = Rect::from_min_size(pos2(x, cy - CELL / 2.0), vec2(wd - GAP, CELL));
+    let resp = ui.interact(r, ui.scope_id().with(("wb_item", &m.item)), Sense::click());
+    let on = m.kind == MenuKind::Toggle && m.checked;
+    if m.kind == MenuKind::Toggle {
+        a11y::toggle(&resp, &m.label, on);
+    } else {
+        a11y::button(&resp, &m.label);
+    }
+    let bg = if on {
+        t.accent
+    } else if resp.hovered() {
+        t.hover
+    } else {
+        egui::Color32::TRANSPARENT
+    };
+    ui.painter().rect_filled(r, CornerRadius::same(5), bg);
+    ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, &m.label, semibold(11.0), if on { t.accent_on } else { t.text });
+    resp.clicked().then(|| if m.kind == MenuKind::Toggle { json!(!m.checked) } else { serde_json::Value::Null })
+}
diff --git a/crates/ui-egui/src/zoom_preview_tests.rs b/crates/ui-egui/src/canvas/zoom_preview_tests.rs
similarity index 70%
rename from crates/ui-egui/src/zoom_preview_tests.rs
rename to crates/ui-egui/src/canvas/zoom_preview_tests.rs
index 0fcd9a29..ab0b54da 100644
--- a/crates/ui-egui/src/zoom_preview_tests.rs
+++ b/crates/ui-egui/src/canvas/zoom_preview_tests.rs
@@ -2,7 +2,9 @@
 //! then the refined image, which matches a render from scratch; pans and edits still build on the
 //! kept image; previews never replace a refined image that already shows the whole view asked
 //! for, and no image of another file or page goes on screen. The browser's inline worker previews
-//! by the same measure as the render thread.
+//! by the same measure as the render thread. Renders from scratch with no measure to go by (the
+//! first, another page, a zoom after quick renders) get a preview on the desktop only if they run
+//! long, from the watchdog beside the render thread.
 
 use std::sync::Arc;
 
@@ -13,7 +15,9 @@ use figcraft_render::{View, Work};
 use serde_json::json;
 
 use super::{CanvasState, shows};
-use crate::render_worker::{Done, Inline, Job, PREVIEW_AFTER_MS, PREVIEW_FACTOR, Renders, coarse_view, render_now};
+use figcraft_render::Retained;
+
+use crate::render_worker::{Done, Inline, Job, PREVIEW_AFTER_MS, PREVIEW_FACTOR, Renders, Worker, better, coarse_view, preview_with, render_now};
 
 /// A page of ellipses with a rectangle on top; the session and the rectangle.
 fn document() -> (Session, NodeId) {
@@ -72,6 +76,7 @@ fn job(doc: &Arc<Document>, page: NodeId, uid: u64, view: View) -> Job {
         skip: vec![],
         solo: None,
         proof: false,
+        dots: None,
         uid,
         zoom_preview: true,
         at: web_time::Instant::now(),
@@ -225,9 +230,9 @@ fn the_canvas_shows_images_of_its_own_page_and_never_a_coarser_one_of_its_view()
     let here = Some((ds.uid, ds.page));
     let mut r = Renders::with_threshold(0.0);
     let near = job(&ds.doc, ds.page, ds.uid, view_at((300.0, 200.0), 2.0, 200, 150));
-    let refined = r.refine(&near).unwrap();
+    let refined = Done { seq: 1, ..r.refine(&near).unwrap() };
     let far = job(&ds.doc, ds.page, ds.uid, view_at((300.0, 200.0), 0.5, 200, 150));
-    let preview = r.preview(&far).unwrap();
+    let preview = Done { seq: 2, ..r.preview(&far).unwrap() };
 
     let mut c = CanvasState { want_view: Some(near.view.clone()), ..Default::default() };
     assert!(shows(&c, &refined, here));
@@ -235,7 +240,7 @@ fn the_canvas_shows_images_of_its_own_page_and_never_a_coarser_one_of_its_view()
     assert!(!shows(&c, &refined, Some((ds.uid, NodeId(ds.page.0 + 1)))), "another page");
     assert!(!shows(&c, &refined, None), "no file open");
     // Showing the refined image of the view asked for: a preview arriving late stays off.
-    (c.tex_view, c.tex_of, c.tex_coarse) = (Some(refined.view.clone()), here, false);
+    (c.tex_view, c.tex_of, c.tex_coarse, c.tex_seq) = (Some(refined.view.clone()), here, false, refined.seq);
     assert!(!shows(&c, &preview, here));
     // Once the view asked for moves on, the preview is the better match.
     c.want_view = Some(far.view.clone());
@@ -246,6 +251,103 @@ fn the_canvas_shows_images_of_its_own_page_and_never_a_coarser_one_of_its_view()
     assert!(shows(&c, &preview, here));
     (c.tex_coarse, c.tex_of) = (false, Some((ds.uid, NodeId(ds.page.0 + 1))));
     assert!(shows(&c, &preview, here));
+    // Never over the refined image of its own request or a newer one (the watchdog's preview can
+    // come after the refined image), even once the view asked for moved on.
+    (c.tex_of, c.want_view) = (here, Some(far.view.clone()));
+    for seq in [preview.seq, preview.seq + 1] {
+        c.tex_seq = seq;
+        assert!(!shows(&c, &preview, here), "refined image of request {seq}");
+    }
+}
+
+#[test]
+fn a_poll_takes_the_newest_request_and_of_one_request_the_refined_image() {
+    let (s, _) = document();
+    let ds = s.ds().unwrap();
+    let v = job(&ds.doc, ds.page, ds.uid, view_at((300.0, 200.0), 0.5, 64, 48));
+    let preview = |seq| Done { seq, ..preview_with(&v, &mut Retained::default()).unwrap() };
+    let refined = |seq| Done { seq, ..render_now(&v).unwrap() };
+    let pick = |order: Vec<Done>| order.into_iter().fold(None, |best, d| Some(better(best, d))).map(|d| (d.seq, d.coarse));
+    assert_eq!(pick(vec![refined(3), preview(4)]), Some((4, true)), "a newer request's preview over an older refined image");
+    assert_eq!(pick(vec![preview(3), refined(3)]), Some((3, false)));
+    assert_eq!(pick(vec![refined(3), preview(3)]), Some((3, false)), "the watchdog's preview after its refined image");
+    assert_eq!(pick(vec![refined(4), preview(4), preview(3)]), Some((4, false)));
+    assert_eq!(pick(vec![preview(4)]), Some((4, true)));
+}
+
+#[test]
+fn renders_from_scratch_with_nothing_to_go_by_get_a_late_preview() {
+    let (mut s, _) = document();
+    let (doc, page, uid) = {
+        let ds = s.ds().unwrap();
+        (ds.doc.clone(), ds.page, ds.uid)
+    };
+    let at = |doc: &Arc<Document>, page, uid, scale| job(doc, page, uid, view_at((300.0, 200.0), scale, 200, 150));
+    // Renders that have been quick: nothing up front, a preview only should one run long.
+    let mut r = Renders::with_threshold(f64::INFINITY);
+    let first = at(&doc, page, uid, 1.0);
+    assert!(r.wants_late_preview(&first) && r.preview(&first).is_none(), "the first render");
+    r.refine(&first).unwrap();
+    assert!(r.wants_late_preview(&at(&doc, page, uid, 4.0)), "a zoom after quick renders");
+    assert!(r.wants_late_preview(&at(&doc, page, uid + 1, 1.0)), "another file");
+    let mut panned = first.clone();
+    panned.view.origin.0 += 5.0;
+    assert!(!r.wants_late_preview(&panned), "a pan builds on the kept image");
+    let mut pixels = at(&doc, page, uid, 4.0);
+    pixels.zoom_preview = false;
+    assert!(!r.wants_late_preview(&pixels), "pixel preview");
+    s.execute("page.add", &json!({})).unwrap();
+    let ds = s.ds().unwrap();
+    assert!(r.wants_late_preview(&at(&ds.doc, ds.page, uid, 1.0)), "another page");
+    // Renders that have been slow: the preview comes first instead.
+    let mut slow = Renders::with_threshold(0.0);
+    slow.refine(&first).unwrap();
+    let zoom = at(&doc, page, uid, 4.0);
+    assert!(!slow.wants_late_preview(&zoom) && slow.preview(&zoom).is_some());
+}
+
+/// Every image `w` hands out until it has nothing left in flight: (request, coarse).
+fn drain(w: &mut Worker) -> Vec<(u64, bool)> {
+    let start = std::time::Instant::now();
+    let mut got = vec![];
+    while w.in_flight() || got.is_empty() {
+        assert!(start.elapsed() < std::time::Duration::from_secs(60), "the render never finished");
+        if let Some(d) = w.poll() {
+            got.push((d.seq, d.coarse));
+        }
+        std::thread::sleep(std::time::Duration::from_millis(1));
+    }
+    got.extend(w.poll().map(|d| (d.seq, d.coarse)));
+    got
+}
+
+#[test]
+fn a_slow_first_render_gets_a_preview_beside_it_and_a_quick_one_none() {
+    // Slow: a render from scratch that runs past the threshold, then the preview, with as much
+    // again to spare, so the preview comes first however fast this machine and the renderer are.
+    let view = view_at((300.0, 200.0), 2.0, 1200, 1200);
+    let mut want = 4.0 * PREVIEW_AFTER_MS;
+    let slow = loop {
+        let s = slow_scene(std::slice::from_ref(&view), want);
+        let ds = s.ds().unwrap();
+        let slow = job(&ds.doc, ds.page, ds.uid, view.clone());
+        let (full, preview) = (render_now(&slow).unwrap().ms, preview_with(&slow, &mut Retained::default()).unwrap().ms);
+        if full >= 2.0 * (PREVIEW_AFTER_MS + preview) {
+            break slow;
+        }
+        assert!(want < 64.0 * PREVIEW_AFTER_MS, "previews keep up with full renders: {preview} ms of {full} ms");
+        want *= 2.0;
+    };
+    let mut w = Worker::new(egui::Context::default());
+    w.submit(slow);
+    assert_eq!(drain(&mut w), [(1, true), (1, false)], "the preview while it renders, then the refined image");
+    // Quick: a small view of a few shapes on a fresh worker (the slow render above would make the
+    // next zoom get its preview first).
+    let (s, _) = document();
+    let ds = s.ds().unwrap();
+    let mut w = Worker::new(egui::Context::default());
+    w.submit(job(&ds.doc, ds.page, ds.uid, view_at((300.0, 200.0), 0.5, 120, 90)));
+    assert_eq!(drain(&mut w), [(1, false)], "done before the threshold: no preview");
 }
 
 #[test]
@@ -260,24 +362,25 @@ fn a_preview_replaces_a_refined_image_of_the_same_zoom_elsewhere_on_the_page() {
     let b = job(&ds.doc, ds.page, ds.uid, view((0.0, 0.0), 8.0));
     let a2 = job(&ds.doc, ds.page, ds.uid, view((-700.0, -525.0), 1.0));
     let mut r = Renders::with_threshold(0.0);
-    let refined_a = r.refine(&a).unwrap();
+    let refined_a = Done { seq: 1, ..r.refine(&a).unwrap() };
     // The canvas shows A; B is asked for, then A' while B renders. The thread finishes B, then
     // previews A' before the canvas polls: the queue holds [refined B, preview A'], and a poll
-    // takes the last.
-    let queue = [r.refine(&b).unwrap(), r.preview(&a2).expect("A' is a new zoom for the thread")];
-    let polled = queue.last().unwrap();
+    // takes the newer request's.
+    let queue = [Done { seq: 2, ..r.refine(&b).unwrap() }, Done { seq: 3, ..r.preview(&a2).expect("A' is a new zoom for the thread") }];
+    let polled = &queue.into_iter().fold(None, |best, d| Some(better(best, d))).unwrap();
     assert!(polled.coarse && covers(&polled.view, &a2.view));
     let c = CanvasState {
         tex_view: Some(refined_a.view.clone()),
         tex_of: here,
         tex_coarse: false,
+        tex_seq: refined_a.seq,
         want_view: Some(a2.view.clone()),
         ..Default::default()
     };
     assert!(shows(&c, polled, here), "A at the same zoom shows 1/64 of A': the preview of all of it goes on");
     // Once A' itself is refined on screen, a preview of it would be a step down.
     let refined_a2 = r.refine(&a2).unwrap();
-    let c = CanvasState { tex_view: Some(refined_a2.view.clone()), ..c };
+    let c = CanvasState { tex_view: Some(refined_a2.view.clone()), tex_seq: 3, ..c };
     assert!(!shows(&c, polled, here));
 }
 
diff --git a/crates/ui-egui/src/canvas_double_click_tests.rs b/crates/ui-egui/src/canvas_double_click_tests.rs
index 1c89757f..72f91b76 100644
--- a/crates/ui-egui/src/canvas_double_click_tests.rs
+++ b/crates/ui-egui/src/canvas_double_click_tests.rs
@@ -2,11 +2,127 @@
 //! began is dropped, so the tool is idle once the button is up.
 
 use egui::{Event, Modifiers, PointerButton, Pos2};
+use figcraft_doc::NodeId;
 use figcraft_engine::Session;
 use serde_json::json;
 
 use crate::layers_drag_tests::Ui;
 
+/// One press and release at `p`.
+fn click(u: &mut Ui, p: Pos2) {
+    u.frame(vec![Event::PointerMoved(p)]);
+    for pressed in [true, false] {
+        u.frame(vec![Event::PointerButton { pos: p, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE }]);
+    }
+}
+
+/// A double-click at `p`.
+fn double_click_at(u: &mut Ui, p: Pos2) {
+    u.frame(vec![Event::PointerMoved(p)]);
+    for _ in 0..2 {
+        for pressed in [true, false] {
+            u.frame(vec![Event::PointerButton { pos: p, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE }]);
+        }
+    }
+    u.frame(vec![]);
+}
+
+#[test]
+fn double_clicking_a_selected_shape_enters_vector_edit_like_enter() {
+    let mut s = Session::new();
+    let r = s.execute("shape.rectangle", &json!({"x": 100, "y": 100, "width": 300, "height": 200})).unwrap();
+    let r: NodeId = figcraft_engine::params::id_of(&r["id"]).unwrap();
+    s.execute("select.none", &json!({})).unwrap();
+    let mut u = Ui::new(s);
+    let p = u.app.to_screen(250.0, 200.0);
+    // A click selects it; a double-click right after (three quick clicks) still edits its points.
+    click(&mut u, p);
+    assert_eq!(u.app.session.selection(), vec![r]);
+    double_click_at(&mut u, p);
+    assert!(u.app.session.ds().unwrap().vector_edit.is_some(), "a double-click enters vector edit");
+    // Enter does the same.
+    u.app.session.execute("vector.edit.end", &json!({})).unwrap();
+    u.frame(vec![Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE }]);
+    assert!(u.app.session.ds().unwrap().vector_edit.is_some());
+}
+
+#[test]
+fn a_slower_double_click_still_edits_the_points() {
+    let mut s = Session::new();
+    let r = s.execute("shape.rectangle", &json!({"x": 100, "y": 100, "width": 200, "height": 200})).unwrap();
+    let r: NodeId = figcraft_engine::params::id_of(&r["id"]).unwrap();
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    let mut u = Ui::new(s);
+    let p = u.app.to_screen(200.0, 200.0);
+    u.frame(vec![Event::PointerMoved(p)]);
+    let press = |u: &mut Ui, pressed| {
+        u.frame(vec![Event::PointerButton { pos: p, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE }]);
+    };
+    // The first click, then 0.4 s: inside the platform's 0.5 s double-click window, past egui's
+    // default 0.3 s.
+    press(&mut u, true);
+    press(&mut u, false);
+    for _ in 0..24 {
+        u.frame(vec![]);
+    }
+    press(&mut u, true);
+    press(&mut u, false);
+    assert!(u.app.session.ds().unwrap().vector_edit.is_some(), "a double-click the platform takes edits its points");
+}
+
+#[test]
+fn double_clicking_an_unselected_shape_edits_its_points() {
+    let mut s = Session::new();
+    let r = s.execute("shape.rectangle", &json!({"x": 100, "y": 100, "width": 300, "height": 200})).unwrap();
+    let r: NodeId = figcraft_engine::params::id_of(&r["id"]).unwrap();
+    s.execute("select.none", &json!({})).unwrap();
+    let mut u = Ui::new(s);
+    let p = u.app.to_screen(250.0, 200.0);
+    // Nothing is selected: the double-click selects the shape and edits its points, like Figma.
+    double_click_at(&mut u, p);
+    let ve = u.app.session.ds().unwrap().vector_edit.clone();
+    assert_eq!(ve.map(|v| v.id), Some(r));
+}
+
+#[test]
+fn a_double_click_on_empty_canvas_right_after_entering_leaves_vector_edit() {
+    let mut s = Session::new();
+    let r = s.execute("shape.rectangle", &json!({"x": 100, "y": 100, "width": 300, "height": 200})).unwrap();
+    let r: NodeId = figcraft_engine::params::id_of(&r["id"]).unwrap();
+    s.execute("select.none", &json!({})).unwrap();
+    let mut u = Ui::new(s);
+    let shape = u.app.to_screen(250.0, 200.0);
+    let empty = Pos2::new(u.app.canvas.rect.left() + 30.0, u.app.canvas.rect.bottom() - 30.0);
+    // The double-click that enters edit mode, then straight away one on empty canvas.
+    double_click_at(&mut u, shape);
+    assert_eq!(u.app.session.ds().unwrap().vector_edit.as_ref().map(|v| v.id), Some(r));
+    double_click_at(&mut u, empty);
+    assert!(u.app.session.ds().unwrap().vector_edit.is_none(), "a double-click on empty canvas leaves vector edit at once");
+}
+
+#[test]
+fn a_click_on_empty_canvas_keeps_vector_edit_until_a_double_click() {
+    let mut s = Session::new();
+    let r = s.execute("shape.rectangle", &json!({"x": 100, "y": 100, "width": 300, "height": 200})).unwrap();
+    let r: NodeId = figcraft_engine::params::id_of(&r["id"]).unwrap();
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    let mut u = Ui::new(s);
+    let shape = u.app.to_screen(250.0, 200.0);
+    let empty = Pos2::new(u.app.canvas.rect.left() + 30.0, u.app.canvas.rect.bottom() - 30.0);
+    double_click_at(&mut u, shape);
+    assert!(u.app.session.ds().unwrap().vector_edit.is_some());
+    // One click on empty canvas only clears the points: edit mode stays.
+    click(&mut u, empty);
+    assert!(u.app.session.ds().unwrap().vector_edit.is_some(), "a click on empty canvas keeps vector edit");
+    // A double-click on empty canvas leaves it, the earlier click and the counts from entering
+    // included.
+    double_click_at(&mut u, empty);
+    assert!(u.app.session.ds().unwrap().vector_edit.is_none(), "a double-click on empty canvas leaves vector edit");
+    // The next double-click edits the shape again.
+    double_click_at(&mut u, shape);
+    assert!(u.app.session.ds().unwrap().vector_edit.is_some(), "a double-click edits it again");
+}
+
 /// Two presses and releases at the bottom left of the canvas, with `modifiers` held.
 fn double_click(u: &mut Ui, modifiers: Modifiers) {
     let pos = Pos2::new(u.app.canvas.rect.left() + 30.0, u.app.canvas.rect.bottom() - 30.0);
diff --git a/crates/ui-egui/src/canvas_fixes_tests.rs b/crates/ui-egui/src/canvas_fixes_tests.rs
index 3b593dae..dc3f7e94 100644
--- a/crates/ui-egui/src/canvas_fixes_tests.rs
+++ b/crates/ui-egui/src/canvas_fixes_tests.rs
@@ -63,6 +63,7 @@ fn big_job(doc: &Arc<figcraft_doc::Document>, page: figcraft_doc::NodeId, scale:
         skip: vec![],
         solo: None,
         proof: false,
+        dots: None,
         uid: 0,
         zoom_preview: false,
         at: web_time::Instant::now(),
@@ -128,3 +129,36 @@ fn the_pen_draws_the_handles_of_the_point_being_dragged_and_a_curved_band() {
     let band = shapes.iter().any(|s| matches!(s, Shape::CubicBezier(c) if c.points[0].distance(a) < 0.5 && c.points[1].distance(at(&u, 140.0, 100.0)) < 0.5 && c.stroke.color == accent));
     assert!(band, "a curve leaving along the out handle");
 }
+
+/// While drawing, the Pencil shows the stroke it will make, in its colour and weight (#256): in a
+/// dark theme the theme's text colour was white, so over a white shape nothing showed until the
+/// stroke was let go.
+#[test]
+fn the_pencil_previews_its_stroke_in_its_colour_and_weight() {
+    let mut u = Ui::new(Session::new());
+    u.app.run("tool.set", json!({"tool": "pencil"}));
+    let (color, weight) = figcraft_engine::tools::PENCIL_STROKE;
+    let preview = |shapes: &[Shape]| {
+        shapes.iter().find_map(|s| match s {
+            Shape::Path(p) if !p.closed && p.points.len() >= 3 && p.stroke.color == egui::epaint::ColorMode::Solid(crate::theme::c32(color)) => {
+                Some(p.stroke.width)
+            }
+            _ => None,
+        })
+    };
+    let at = |u: &Ui, x: f64, y: f64| u.app.to_screen(x, y);
+    let start = at(&u, 10.0, 10.0);
+    u.button(start, true);
+    for i in 1..=6 {
+        let p = at(&u, 10.0 + 12.0 * f64::from(i), 10.0 + 6.0 * f64::from(i % 2));
+        u.frame(vec![egui::Event::PointerMoved(p)]);
+    }
+    let zoom = u.app.session.ds().unwrap().view.zoom;
+    let w = preview(&flat(&u.frame_output(vec![]).shapes)).expect("a preview while drawing");
+    assert!((w - (weight * zoom) as f32).abs() < 0.01, "{w} for {weight} at {zoom}");
+    // Zoomed far out it stays visible.
+    u.app.session.ds_mut().unwrap().view.zoom = 0.05;
+    let p = at(&u, 120.0, 40.0);
+    let w = preview(&flat(&u.frame_output(vec![egui::Event::PointerMoved(p)]).shapes)).expect("still previewing");
+    assert!((w - 1.0).abs() < 0.01, "at least a point: {w}");
+}
diff --git a/crates/ui-egui/src/canvas_image_rect_tests.rs b/crates/ui-egui/src/canvas_image_rect_tests.rs
new file mode 100644
index 00000000..d047f057
--- /dev/null
+++ b/crates/ui-egui/src/canvas_image_rect_tests.rs
@@ -0,0 +1,35 @@
+use super::canvas::presented_image_rect;
+use egui::{Pos2, Rect, pos2, vec2};
+use figcraft_render::View;
+
+#[test]
+fn native_density_rect_aligns_origin_and_preserves_pixel_extent() {
+    for ppp in [1.0_f32, 1.25, 1.5, 2.0] {
+        for zoom in [0.37_f64, 0.67, 1.0, 1.3, 2.0] {
+            let view = View { origin: (-31.25, 18.75), scale: zoom * f64::from(ppp), width: 375, height: 240 };
+            let tl = pos2(149.5, 91.25);
+            let rect = presented_image_rect(tl, &view, zoom, ppp, false);
+            assert!(((rect.min.x * ppp) - (rect.min.x * ppp).round()).abs() < 1e-4, "left edge: ppp={ppp}, zoom={zoom}, rect={rect:?}");
+            assert!(((rect.min.y * ppp) - (rect.min.y * ppp).round()).abs() < 1e-4, "top edge: ppp={ppp}, zoom={zoom}, rect={rect:?}");
+            assert!((rect.min.x - tl.x).abs() * ppp <= 0.5001, "x shift exceeds half a device pixel: ppp={ppp}, rect={rect:?}");
+            assert!((rect.min.y - tl.y).abs() * ppp <= 0.5001, "y shift exceeds half a device pixel: ppp={ppp}, rect={rect:?}");
+            assert!((rect.width() * ppp - view.width as f32).abs() < 1e-3, "width changed: ppp={ppp}, rect={rect:?}");
+            assert!((rect.height() * ppp - view.height as f32).abs() < 1e-3, "height changed: ppp={ppp}, rect={rect:?}");
+        }
+    }
+}
+
+#[test]
+fn stale_pixel_preview_and_invalid_density_keep_unsnapped_origin() {
+    let tl = Pos2::new(149.5, 91.25);
+    let view = View { origin: (0.0, 0.0), scale: 1.95, width: 300, height: 180 };
+    for (zoom, ppp, pixel_preview) in [(1.2, 1.5, false), (1.3, 1.5, true)] {
+        let rect = presented_image_rect(tl, &view, zoom, ppp, pixel_preview);
+        let original =
+            Rect::from_min_size(tl, vec2((f64::from(view.width) / view.scale * zoom) as f32, (f64::from(view.height) / view.scale * zoom) as f32));
+        assert_eq!(rect, original);
+    }
+    for ppp in [0.0, -1.0, f32::NAN, f32::INFINITY] {
+        assert_eq!(presented_image_rect(tl, &view, 1.3, ppp, false).min, tl);
+    }
+}
diff --git a/crates/ui-egui/src/cjk.rs b/crates/ui-egui/src/cjk.rs
index c7fb1f98..fab93990 100644
--- a/crates/ui-egui/src/cjk.rs
+++ b/crates/ui-egui/src/cjk.rs
@@ -1,8 +1,9 @@
-//! Chinese, Japanese and Korean text in the UI. egui's own fonts and Inter have no CJK glyphs, so
-//! the UI adds a face per script it needs: the UI language's, the scripts in the open file's names
+//! Chinese, Japanese, Korean, Bengali and Thai text in the UI. egui's own fonts and Inter have no glyphs
+//! for them, so the UI adds a face per script it needs: the UI language's, the scripts in the open file's names
 //! and comments, the language picker's and typed text. Desktop finds them among the installed
 //! fonts (the system font scan), only once one is needed, so English users load none; the web
-//! build has only the CJK faces built in from craft-fonts (`FIGCRAFT_EMBED_CJK`), else none.
+//! build has only the CJK faces built in from craft-fonts (`FIGCRAFT_EMBED_CJK`), else none (no
+//! Bengali or Thai face is built in, so the web leaves them out).
 
 use std::sync::Arc;
 
@@ -12,6 +13,19 @@ pub const KANA: u8 = 1;
 pub const HANGUL: u8 = 2;
 /// Han characters (and CJK punctuation and full-width forms).
 pub const HAN: u8 = 4;
+/// Bengali script.
+pub const BENGALI: u8 = 8;
+/// Thai script.
+pub const THAI: u8 = 16;
+/// Every script bit: nothing more to look for once all have a face.
+pub const ALL: u8 = KANA | HANGUL | HAN | BENGALI | THAI;
+
+/// Bengali faces: cross-platform, Windows, macOS, then Linux names.
+const BENGALI_FONTS: &[&str] = &["Noto Sans Bengali", "Nirmala UI", "Bangla Sangam MN", "Kalpurush", "SolaimanLipi"];
+
+/// Thai faces: cross-platform, Windows, macOS, then Linux names.
+const THAI_FONTS: &[&str] =
+    &["Noto Sans Thai", "Leelawadee UI", "Tahoma", "Sukhumvit Set", "Thonburi", "Ayuthaya", "Sarabun", "Loma", "Garuda", "Waree"];
 
 /// Japanese faces, the built-in one first: Windows, macOS, then Linux names.
 const JAPANESE: &[&str] = &[
@@ -37,6 +51,8 @@ const CHINESE: &[&str] = &[
     "Microsoft YaHei UI",
     "Microsoft YaHei",
     "PingFang SC",
+    "Hiragino Sans GB",
+    "Heiti SC",
     "Noto Sans SC",
     "Source Han Sans SC",
     "WenQuanYi Micro Hei",
@@ -44,36 +60,49 @@ const CHINESE: &[&str] = &[
     "Droid Sans Fallback",
 ];
 
-/// The CJK scripts in `s`.
+/// The CJK, Bengali and Thai scripts in `s`.
 pub fn scripts(s: &str) -> u8 {
     s.chars().fold(0, |m, c| {
         m | match u32::from(c) {
             0x3040..=0x30FF | 0x31F0..=0x31FF | 0xFF66..=0xFF9F => KANA,
             0x1100..=0x11FF | 0x3130..=0x318F | 0xA960..=0xA97F | 0xAC00..=0xD7FF | 0xFFA0..=0xFFDC => HANGUL,
             0x3000..=0x303F | 0x3400..=0x4DBF | 0x4E00..=0x9FFF | 0xF900..=0xFAFF | 0xFF01..=0xFF65 | 0x20000..=0x3FFFF => HAN,
+            0x0980..=0x09FF => BENGALI,
+            0x0E00..=0x0E7F => THAI,
             _ => 0,
         }
     })
 }
 
-/// The CJK scripts a UI language (a catalog code) is written in.
+/// The scripts a UI language (a catalog code) is written in.
 pub fn language(code: &str) -> u8 {
     match code.split('-').next() {
         Some("ja") => KANA | HAN,
         Some("ko") => HANGUL,
         Some("zh") => HAN,
+        Some("bn") => BENGALI,
+        Some("th") => THAI,
         _ => 0,
     }
 }
 
 /// Whether the UI can draw language `code`: always on desktop (a system face is found when it's
-/// needed; tofu at worst), on the web only with built-in faces for its scripts. The language
-/// picker and the system language skip a language it can't.
+/// needed; tofu at worst), on the web only with built-in faces for its scripts (Georgian: craft-fonts'
+/// Noto Sans Georgian). The language picker and the system language skip a language it can't.
 pub fn can_show(code: &str) -> bool {
+    shows(code, cfg!(target_arch = "wasm32"))
+}
+
+/// [`can_show`] in a desktop or (`web`) a web build.
+fn shows(code: &str, web: bool) -> bool {
+    if !web {
+        return true;
+    }
+    if code.split('-').next() == Some("ka") {
+        return figcraft_text::face_with_char('ა', &["Noto Sans Georgian"]).is_some();
+    }
     let need = language(code);
-    need == 0
-        || !cfg!(target_arch = "wasm32")
-        || samples(need, 0).iter().all(|(c, _)| figcraft_text::face_with_char(*c, &["BIZ UDPGothic", "Noto Sans CJK SC"]).is_some())
+    need == 0 || samples(need, 0).iter().all(|(c, _)| figcraft_text::face_with_char(*c, &["BIZ UDPGothic", "Noto Sans CJK SC"]).is_some())
 }
 
 /// A character standing for each script in `need`, with the families to look for it in, the UI
@@ -87,10 +116,22 @@ fn samples(need: u8, ui: u8) -> Vec<(char, Vec<&'static str>)> {
         (false, HANGUL) => ('漢', [KOREAN, JAPANESE, CHINESE].concat()),
         (false, _) => ('漢', [JAPANESE, KOREAN, CHINESE].concat()),
     };
-    let mut v = vec![(KANA, ('あ', JAPANESE.to_vec())), (HAN, han), (HANGUL, ('한', KOREAN.to_vec()))];
+    let mut v = vec![
+        (KANA, ('あ', JAPANESE.to_vec())),
+        (HAN, han),
+        (HANGUL, ('한', KOREAN.to_vec())),
+        (BENGALI, ('অ', BENGALI_FONTS.to_vec())),
+        (THAI, ('ก', THAI_FONTS.to_vec())),
+    ];
     match ui {
-        HANGUL => v.reverse(),
+        HANGUL => v.swap(0, 2),
         HAN => v.swap(0, 1),
+        BENGALI | THAI => {
+            if let Some(pos) = v.iter().position(|(bit, _)| *bit == ui) {
+                let item = v.remove(pos);
+                v.insert(0, item);
+            }
+        }
         _ => {}
     }
     v.into_iter().filter(|(bit, _)| need & bit != 0).map(|(_, s)| s).collect()
@@ -116,29 +157,49 @@ pub fn faces(need: u8, lang: &str, have: &dyn Fn(char) -> bool) -> Vec<Arc<Face>
 mod tests {
     use super::*;
 
+    /// Each script is found in text and tied to its UI language code.
     #[test]
     fn scripts_and_languages() {
         assert_eq!(scripts("Frame 1"), 0);
         assert_eq!(scripts("ボタン"), KANA);
         assert_eq!(scripts("버튼"), HANGUL);
         assert_eq!(scripts("按钮"), HAN);
+        assert_eq!(scripts("বাংলা"), BENGALI);
+        assert_eq!(scripts("หน้าแรก"), THAI);
+        assert_eq!(language("th"), THAI);
         assert_eq!(scripts("日本語のレイヤー（1）"), KANA | HAN);
         assert_eq!(language("ja"), KANA | HAN);
         assert_eq!(language("ko"), HANGUL);
         assert_eq!(language("zh-Hant"), HAN);
         assert_eq!(language("zh-Hans"), HAN);
+        assert_eq!(language("bn"), BENGALI);
         assert_eq!(language("fr"), 0);
-        assert!(["en", "es", "es-419", "fr", "de", "pt-BR", "tr", "id"].iter().all(|c| can_show(c)));
+        assert!(["en", "es", "es-419", "fr", "de", "pt-BR", "tr", "id", "vi"].iter().all(|c| can_show(c)));
     }
 
+    #[test]
+    fn the_web_offers_georgian_only_with_its_face() {
+        assert!(shows("ka", false), "desktop always lists Georgian");
+        let face = figcraft_text::face_with_char('ა', &["Noto Sans Georgian"]).is_some();
+        assert_eq!(shows("ka", true), face);
+        assert_eq!(shows("ka-GE", true), face);
+        assert!(shows("en", true) && shows("tr", true));
+    }
+
+    /// The UI language's script leads the fallback order; the others follow.
     #[test]
     fn the_ui_language_script_comes_first() {
         let order = |need, ui| samples(need, ui).into_iter().map(|(c, _)| c).collect::<String>();
         let first_face = |need, ui| samples(need, ui).first().and_then(|(_, f)| f.first()).copied();
         assert_eq!(order(KANA | HAN | HANGUL, 0), "あ漢한");
+        assert_eq!(order(KANA | HAN | HANGUL | BENGALI, language("bn")), "অあ漢한");
         assert_eq!(order(KANA | HAN | HANGUL, KANA | HAN), "あ漢한");
         assert_eq!(order(KANA | HAN | HANGUL, HANGUL), "한漢あ");
         assert_eq!(order(HANGUL, 0), "한");
+        assert_eq!(order(THAI, 0), "ก");
+        assert_eq!(order(THAI | KANA, language("th")), "กあ");
+        // A Korean UI draws Hangul in a Korean face before the Thai or Bengali ones.
+        assert_eq!(order(KANA | HAN | HANGUL | BENGALI | THAI, HANGUL), "한漢あঅก");
         // Han without kana outside a Japanese or Korean UI reads as Chinese.
         assert_eq!(order(HAN, 0), "们");
         assert_eq!(first_face(HAN, 0), Some("Noto Sans CJK SC"));
@@ -148,6 +209,6 @@ mod tests {
         assert_eq!(order(KANA | HAN, language("zh-Hans")), "们あ");
         assert!(["Microsoft YaHei UI", "PingFang SC", "Noto Sans CJK SC"].iter().all(|f| samples(HAN, HAN)[0].1[..4].contains(f)));
         assert!(faces(0, "en", &|_| false).is_empty());
-        assert!(faces(KANA | HANGUL | HAN, "ja", &|_| true).is_empty(), "nothing is looked up for scripts the UI draws");
+        assert!(faces(KANA | HANGUL | HAN | BENGALI, "ja", &|_| true).is_empty(), "nothing is looked up for scripts the UI draws");
     }
 }
diff --git a/crates/ui-egui/src/clipboard_fence_tests.rs b/crates/ui-egui/src/clipboard_fence_tests.rs
new file mode 100644
index 00000000..9b7ed4fe
--- /dev/null
+++ b/crates/ui-egui/src/clipboard_fence_tests.rs
@@ -0,0 +1,231 @@
+//! Programmatic gestures never replace the user's system clipboard: keys and clicks injected
+//! through the control channel (`ui.input`, `ui.menu.invoke`, …) may copy inside FigCraft but the
+//! OS clipboard is the user's. Every copy command goes through `FigApp::clipboard_set_text` /
+//! `FigApp::clipboard_set_png`, which drop the write while the frame's input is synthetic.
+
+use std::sync::{Arc, Mutex};
+
+use egui::{Event, Pos2, RawInput, Rect, vec2};
+use figcraft_doc::{NodeId, NodeKind};
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::control::ControlRequest;
+use crate::{FigApp, Services};
+
+#[derive(Default)]
+struct Recorded {
+    text: Vec<String>,
+    pngs: usize,
+    /// What the system clipboard holds now (the last text written).
+    last_text: Option<String>,
+}
+
+/// The system clipboard of the test machine.
+struct Clipboard(Arc<Mutex<Recorded>>);
+
+impl Services for Clipboard {
+    /// Record a system-clipboard text write in the test clipboard service.
+    fn clipboard_set_text(&mut self, s: &str) {
+        let mut r = self.0.lock().unwrap();
+        r.text.push(s.to_string());
+        r.last_text = Some(s.to_string());
+    }
+    /// Return the test system clipboard's last text.
+    fn clipboard_get_text(&mut self) -> Option<String> {
+        self.0.lock().unwrap().last_text.clone()
+    }
+    /// Count a PNG clipboard write in the test clipboard service.
+    fn clipboard_set_png(&mut self, _w: u32, _h: u32, _rgba: &[u8]) {
+        self.0.lock().unwrap().pngs += 1;
+    }
+}
+
+struct Win {
+    ctx: egui::Context,
+    app: FigApp,
+    time: f64,
+    recorded: Arc<Mutex<Recorded>>,
+}
+
+impl Win {
+    /// Create a test window over a session containing one selected rectangle.
+    fn new() -> Self {
+        let mut s = Session::new();
+        s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 100, "height": 50})).unwrap();
+        let mut win = Self::with_session(s);
+        let _ = win.app.run("select.all", json!({}));
+        win
+    }
+
+    /// Build a test window around `s` with a recording clipboard service and run three frames.
+    fn with_session(s: Session) -> Self {
+        let recorded = Arc::new(Mutex::new(Recorded::default()));
+        let app = FigApp::new(s, Box::new(Clipboard(recorded.clone())));
+        let mut win = Self { ctx: egui::Context::default(), app, time: 0.0, recorded };
+        for _ in 0..3 {
+            win.frame(vec![]);
+        }
+        win
+    }
+
+    /// Run one production UI frame with `events` at the next 60 Hz test time.
+    fn frame(&mut self, events: Vec<Event>) {
+        self.time += 1.0 / 60.0;
+        self.app.clock.set_test_now(Some(self.time));
+        let input =
+            RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), time: Some(self.time), events, ..Default::default() };
+        let app = &mut self.app;
+        let mut out = self.ctx.run_ui(input, |ui| app.ui(ui));
+        out.textures_delta.clear();
+    }
+
+    /// Return the recorded `(text writes, PNG writes)` count.
+    fn writes(&self) -> (usize, usize) {
+        let r = self.recorded.lock().unwrap();
+        (r.text.len(), r.pngs)
+    }
+}
+
+/// Asserts that a control-channel copy shortcut writes no system clipboard, still runs the
+/// command and is acknowledged.
+#[test]
+fn a_synthetic_copy_shortcut_leaves_the_system_clipboard_alone() {
+    let mut w = Win::new();
+    assert!(!w.app.session.selection().is_empty(), "something to copy");
+    let (tx, rx) = std::sync::mpsc::channel();
+    w.app.control_queue.push(ControlRequest {
+        id: json!(1),
+        method: "ui.input".into(),
+        // Shift+Cmd+C: `edit.copyAsPng`, which wrote the OS clipboard directly before the fence.
+        params: json!({"events": [{"key": "C", "shift": true, "cmd": true}]}),
+        reply: tx,
+        state: Default::default(),
+    });
+    w.frame(vec![]);
+    let events = crate::windows::take_input(&mut w.app, egui::ViewportId::ROOT);
+    assert!(!events.is_empty(), "the injected shortcut");
+    w.frame(events);
+    assert_eq!(w.writes(), (0, 0), "a control-channel gesture never replaces the user's clipboard");
+    assert!(
+        w.app.ui.toast.as_ref().is_some_and(|(m, _)| m.contains("Copied")),
+        "the command itself ran (only its OS clipboard write is fenced): {:?}",
+        w.app.ui.toast
+    );
+    assert!(rx.try_recv().is_ok(), "the batch is acknowledged");
+}
+
+/// Asserts copy commands run under the synthetic-control fence write nothing, while the same
+/// command afterwards writes once.
+#[test]
+fn a_copy_command_invoked_for_a_synthetic_click_still_keeps_the_clipboard() {
+    let mut w = Win::new();
+    // What a synthetic pointer click on Copy runs, fenced as `control::drain`/`background` fence it.
+    w.app.control_synthetic = true;
+    crate::menus::invoke(&mut w.app, "edit.copyAsCss");
+    crate::menus::invoke(&mut w.app, "edit.copyAsText");
+    assert_eq!(w.writes(), (0, 0));
+    w.app.control_synthetic = false;
+    // A user's own copy still writes.
+    crate::menus::invoke(&mut w.app, "edit.copyAsCss");
+    assert_eq!(w.writes(), (1, 0));
+}
+
+/// Asserts a real `ui.menu.invoke` of Copy link is fenced from the system clipboard, while the
+/// same menu item invoked by the user writes the selected layer's link.
+#[test]
+fn a_synthetic_ui_menu_invoke_copy_link_keeps_the_clipboard_then_a_user_copy_writes_the_link() {
+    let mut w = Win::new();
+    let selected = *w.app.session.selection().first().expect("a selected layer");
+    let link = format!("figcraft://node/{}", selected.0);
+
+    let (tx, rx) = std::sync::mpsc::channel();
+    w.app.control_queue.push(ControlRequest {
+        id: json!(1),
+        method: "ui.menu.invoke".into(),
+        params: json!({"id": "edit.copyLink"}),
+        reply: tx,
+        state: Default::default(),
+    });
+    w.frame(vec![]);
+    let reply = rx.try_recv().expect("the menu invocation is acknowledged");
+    assert_eq!(reply.id, json!(1));
+    assert!(reply.result.is_ok(), "the menu item ran: {:?}", reply.result);
+    assert_eq!(w.writes(), (0, 0), "a synthetic menu invocation never replaces the user's clipboard");
+    assert_eq!(w.app.ui.toast.as_ref().map(|t| t.0.as_str()), Some("Link copied"));
+    assert!(!w.app.control_synthetic, "the fence ends with the frame");
+
+    crate::menus::invoke(&mut w.app, "edit.copyLink");
+    assert_eq!(w.writes(), (1, 0), "the user's invocation writes exactly one text clipboard entry");
+    let recorded = w.recorded.lock().unwrap();
+    assert_eq!(recorded.text, vec![link.clone()]);
+    assert_eq!(recorded.last_text.as_deref(), Some(link.as_str()));
+}
+
+/// Return the characters of a text node in the test window.
+fn edit_text(w: &Win, id: NodeId) -> String {
+    match &w.app.session.doc().unwrap().node(id).unwrap().kind {
+        NodeKind::Text(t) => t.characters.clone(),
+        _ => panic!("not text"),
+    }
+}
+
+/// Asserts a synthetic Cut deletes the selected text, keeps the edit session active, writes
+/// no system clipboard, and ends its fence with the frame.
+#[test]
+fn a_synthetic_cut_deletes_the_selection_but_leaves_the_users_clipboard_alone() {
+    let mut s = Session::new();
+    let id = NodeId(s.execute("text.create", &json!({"text": "abc", "x": 40, "y": 40})).unwrap()["id"].as_u64().unwrap());
+    let mut w = Win::with_session(s);
+    figcraft_engine::textedit::begin(&mut w.app.session, id, Some(3), false).unwrap();
+    figcraft_engine::textedit::set_caret(&mut w.app.session, 0, true).unwrap();
+
+    // A control-channel gesture is fenced from the OS clipboard, but its Cut still edits the
+    // document: the selection is deleted exactly as a user's Cut would delete it.
+    w.app.push_control_input(vec![Event::Cut]);
+    let events = crate::windows::take_input(&mut w.app, egui::ViewportId::ROOT);
+    assert_eq!(events, [Event::Cut], "the production input path owns the synthetic frame");
+    w.frame(events);
+    assert_eq!(w.writes(), (0, 0), "a synthetic cut never writes the user's clipboard");
+    assert_eq!(edit_text(&w, id), "", "the selected text is deleted");
+    assert!(w.app.session.ds().unwrap().text_edit.is_some(), "the edit session stays active");
+    assert!(!w.app.control_synthetic, "the fence ends with the frame");
+}
+
+/// Asserts a programmatic copy leaves the system clipboard alone and invalidates the stale
+/// mirror, so a later user paste uses the system text rather than the programmatic layers.
+#[test]
+fn a_programmatic_copy_does_not_let_a_stale_mirror_hide_the_users_paste() {
+    let mut s = Session::new();
+    let hello = figcraft_doc::NodeId(s.execute("text.create", &json!({"text": "hello", "x": 10, "y": 10})).unwrap()["id"].as_u64().unwrap());
+    let other = figcraft_doc::NodeId(s.execute("text.create", &json!({"text": "other", "x": 10, "y": 80})).unwrap()["id"].as_u64().unwrap());
+    s.execute("select.set", &json!({"ids": [hello]})).unwrap();
+    let mut w = Win::with_session(s);
+
+    // The user copies the "hello" text layer: the OS clipboard and `last_copy` become "hello".
+    crate::menus::invoke(&mut w.app, "edit.copy");
+    assert_eq!(w.app.ui.last_copy.as_deref(), Some("hello"));
+    assert_eq!(w.writes().0, 1, "the user's copy reaches the system clipboard");
+
+    // A control-channel copy changes the engine clipboard to "other" but never writes the system
+    // clipboard. The stale "hello" mirror must not claim the programmatic selection is ours.
+    let _ = w.app.run("select.set", json!({"ids": [other]}));
+    w.app.control_synthetic = true;
+    crate::menus::invoke(&mut w.app, "edit.copy");
+    w.app.control_synthetic = false;
+    assert_eq!(w.writes().0, 1, "the programmatic copy leaves the system clipboard alone");
+    assert_eq!(w.app.ui.last_copy, None, "the old system-clipboard mirror is invalidated");
+
+    // The user pastes: the system clipboard's own text wins over the programmatic layers.
+    crate::menus::paste(&mut w.app, Some("hello"), None);
+    let doc = w.app.session.doc().unwrap();
+    let texts: Vec<String> = doc
+        .pages
+        .iter()
+        .filter_map(|p| doc.node(*p))
+        .flat_map(|p| p.children.iter().copied())
+        .filter_map(|id| doc.node(id).and_then(|n| n.kind.text().map(|t| t.characters.clone())))
+        .collect();
+    assert_eq!(texts.iter().filter(|t| t.as_str() == "hello").count(), 2, "the user's text was pasted");
+    assert_eq!(texts.iter().filter(|t| t.as_str() == "other").count(), 1, "the programmatic selection was not pasted");
+}
diff --git a/crates/ui-egui/src/clock.rs b/crates/ui-egui/src/clock.rs
new file mode 100644
index 00000000..cca9c12a
--- /dev/null
+++ b/crates/ui-egui/src/clock.rs
@@ -0,0 +1,63 @@
+/// How often open documents get an autosave checkpoint (seconds).
+pub const AUTOSAVE_SECS: f64 = 30.0 * 60.0;
+
+/// Most changed layers whose names are checked for CJK scripts one by one (beyond: all of them).
+pub(crate) const CJK_CHANGES: usize = 10_000;
+
+/// With auto-save on: how long after a file last changed it is saved, and how long a failed save
+/// waits before trying again (seconds).
+pub const AUTO_SAVE_SECS: f64 = 3.0;
+
+pub(crate) const AUTO_SAVE_RETRY_SECS: f64 = 60.0;
+
+/// How long a toast shows (seconds).
+pub(crate) const TOAST_SECS: f64 = 3.0;
+
+/// How long a toast has been showing ([`UiState::toast`]).
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum ToastClock {
+    /// Raised, not drawn yet.
+    Raised,
+    /// Drawn once; the next frame starts the clock.
+    Drawn,
+    /// Showing since this time (UI clock, seconds).
+    Since(f64),
+}
+
+/// Draw another frame `secs` from now (nothing else needs drawing until then: an idle window draws
+/// no frames).
+#[track_caller]
+pub(crate) fn repaint_in(ctx: &egui::Context, secs: f64) {
+    if secs.is_finite() {
+        ctx.request_repaint_after(std::time::Duration::from_secs_f64(secs.max(0.0)));
+    }
+}
+
+/// A monotonic clock for background work (autosave, recovery, capture deadlines).
+///
+/// `Context::input(|i| i.time)` is the UI pass's time and is stale in `run_logic`; wall-clock time
+/// can jump. `web_time::Instant` is monotonic on native and in the browser. Tests drive deadlines
+/// directly with [`FrameClock::set_test_now`].
+pub struct FrameClock {
+    origin: web_time::Instant,
+    test_now: Option<f64>,
+}
+
+impl Default for FrameClock {
+    /// Start the frame clock at the current web time with no injected test time.
+    fn default() -> Self {
+        Self { origin: web_time::Instant::now(), test_now: None }
+    }
+}
+
+impl FrameClock {
+    /// Seconds since the app started (or the injected test time).
+    pub fn now(&self) -> f64 {
+        self.test_now.unwrap_or_else(|| self.origin.elapsed().as_secs_f64())
+    }
+
+    /// Set a fake monotonic time (tests); `None` returns to the real clock.
+    pub fn set_test_now(&mut self, secs: Option<f64>) {
+        self.test_now = secs;
+    }
+}
diff --git a/crates/ui-egui/src/colorpicker_eyedropper_tests.rs b/crates/ui-egui/src/colorpicker_eyedropper_tests.rs
new file mode 100644
index 00000000..51856b48
--- /dev/null
+++ b/crates/ui-egui/src/colorpicker_eyedropper_tests.rs
@@ -0,0 +1,90 @@
+//! The eyedropper of a colour picker, driven through egui headless: the colour it samples goes to
+//! the paint the picker edits (a stroke, an effect), not to the layer's fill (vectorcraft#3342).
+
+use egui::accesskit::Role;
+use egui::{Event, Pos2, pos2};
+use figcraft_doc::NodeId;
+use figcraft_engine::{Session, ToolId};
+use serde_json::json;
+
+use crate::colorpicker::PickerTarget;
+use crate::layers_drag_tests::Ui;
+
+fn rect(s: &mut Session, x: f64, props: serde_json::Value) -> NodeId {
+    let v = s.execute("shape.rectangle", &json!({"x": x, "y": 0, "width": 60, "height": 60, "props": props})).unwrap();
+    NodeId(v["id"].as_u64().unwrap())
+}
+
+/// The middle of the picker's eyedropper button.
+fn eyedropper_button(u: &mut Ui) -> Pos2 {
+    u.ctx.enable_accesskit();
+    u.frame(vec![]);
+    let out = u.frame_output(vec![]);
+    let nodes = out.platform_output.accesskit_update.expect("an AccessKit update").nodes;
+    let n = nodes.iter().map(|(_, n)| n).find(|n| n.role() == Role::Button && n.label() == Some("Pick color (I)")).expect("the eyedropper button");
+    let b = n.bounds().expect("bounds");
+    pos2(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32)
+}
+
+fn click(u: &mut Ui, p: Pos2) {
+    u.button(p, true);
+    u.button(p, false);
+    u.frame(vec![Event::PointerMoved(p)]);
+    u.frame(vec![]);
+}
+
+#[test]
+fn the_pickers_eyedropper_applies_the_colour_to_the_paint_it_edits() {
+    for effect in [false, true] {
+        // A red layer to sample, and a green one with a blue stroke (and a shadow) to edit.
+        let mut s = Session::new();
+        s.execute("page.setBackground", &json!({"color": "#FFFFFF"})).unwrap();
+        let red = rect(&mut s, 0.0, json!({"fill": "#FF0000"}));
+        let b = rect(&mut s, 200.0, json!({"fill": "#00FF00", "stroke": "#0000FF", "strokeWeight": 2}));
+        s.execute("select.set", &json!({"ids": [b]})).unwrap();
+        let target = if effect {
+            s.execute("effect.add", &json!({"ids": [b], "type": "dropShadow"})).unwrap();
+            PickerTarget::Effect { ids: vec![b], index: 0, secondary: false }
+        } else {
+            PickerTarget::Paint { fills: false, index: 0, ids: vec![b] }
+        };
+        let mut u = Ui::new(s);
+        u.app.ui.picker = Some(target.clone());
+        let at = eyedropper_button(&mut u);
+        click(&mut u, at);
+        assert_eq!(u.app.session.tool.tool, ToolId::Eyedropper, "the button picks up the eyedropper");
+        let undo = u.app.session.undo_depth().0;
+        let on_red = u.app.to_screen(30.0, 30.0);
+        click(&mut u, on_red);
+        let doc = u.app.session.doc().unwrap();
+        let n = doc.node(b).unwrap();
+        let hex = |p: Option<figcraft_color::Color>| p.map(|c| c.to_hex()).unwrap_or_default();
+        let picked = if effect { hex(n.effects[0].color(false)) } else { hex(n.strokes[0].solid_color()) };
+        assert_eq!(picked, "FF0000", "the picker's paint takes the colour (effect: {effect})");
+        assert_eq!(hex(n.fills[0].solid_color()), "00FF00", "the fill is left alone (effect: {effect})");
+        assert!(doc.node(red).is_some());
+        assert_eq!(u.app.session.tool.tool, ToolId::Move, "picking ends the eyedropper");
+        assert_eq!(u.app.ui.picker, Some(target), "the picker stays open on its paint");
+        assert_eq!(u.app.session.undo_depth().0, undo + 1, "one undo step");
+    }
+}
+
+#[test]
+fn closing_the_picker_drops_its_eyedropper() {
+    // The colour sampled after the picker closed has no paint to go to: it must not wait for the
+    // next picker, and the eyedropper gives way to the Move tool.
+    let mut s = Session::new();
+    let b = rect(&mut s, 200.0, json!({"fill": "#00FF00", "stroke": "#0000FF"}));
+    s.execute("select.set", &json!({"ids": [b]})).unwrap();
+    let mut u = Ui::new(s);
+    u.app.ui.picker = Some(PickerTarget::Paint { fills: false, index: 0, ids: vec![b] });
+    let at = eyedropper_button(&mut u);
+    click(&mut u, at);
+    assert_eq!(u.app.session.tool.tool, ToolId::Eyedropper);
+    u.app.ui.picker = None;
+    u.app.session.tool.picked = figcraft_color::Color::from_hex("#FF0000");
+    u.frame(vec![]);
+    u.frame(vec![]);
+    assert_eq!(u.app.session.tool.tool, ToolId::Move);
+    assert_eq!(u.app.session.tool.picked, None, "a colour sampled for a closed picker is dropped");
+}
diff --git a/crates/ui-egui/src/colorpicker_selection_tests.rs b/crates/ui-egui/src/colorpicker_selection_tests.rs
index 57aae197..fff5536a 100644
--- a/crates/ui-egui/src/colorpicker_selection_tests.rs
+++ b/crates/ui-egui/src/colorpicker_selection_tests.rs
@@ -52,3 +52,54 @@ fn picker_closes_when_another_layer_is_selected() {
     u.frame(vec![]);
     assert!(u.app.ui.picker.is_none(), "selecting another layer closes the picker: {:?}", u.app.ui.picker);
 }
+
+// Regression test for #237: the "On this page" swatches wrapped onto rows that started at the picker's
+// left edge (only the first row was indented) and ran past its right edge.
+#[test]
+fn wrapped_page_colour_swatches_stay_inset_inside_the_picker() {
+    use egui::Shape;
+    let mut s = Session::new();
+    let mut first = None;
+    for i in 0..40 {
+        let v = s
+            .execute(
+                "shape.rectangle",
+                &json!({"x": i * 30, "y": 0, "width": 20, "height": 20, "props": {"fill": format!("#{:02X}{:02X}80", i * 6, 255 - i * 6)}}),
+            )
+            .unwrap();
+        first.get_or_insert(NodeId(v["id"].as_u64().unwrap()));
+    }
+    let a = first.unwrap();
+    s.execute("select.set", &json!({"ids": [a]})).unwrap();
+    let mut u = Ui::new(s);
+    u.app.ui.picker = Some(PickerTarget::Paint { fills: true, index: 0, ids: vec![a] });
+    for _ in 0..3 {
+        u.frame(vec![]);
+    }
+    let out = u.frame_output(vec![]);
+    // The picker is the only floating window open.
+    let picker = u
+        .ctx
+        .memory(|m| m.areas().visible_layer_ids().into_iter().filter(|l| l.order == egui::Order::Middle).find_map(|l| m.area_rect(l.id)))
+        .expect("the picker is open");
+    // A swatch is a 14 pt square with a 1 pt outline.
+    let swatches: Vec<egui::Rect> = out
+        .shapes
+        .iter()
+        .filter_map(|c| match &c.shape {
+            Shape::Rect(r) if r.stroke.width == 1.0 && (r.rect.width() - 14.0).abs() < 0.01 && (r.rect.height() - 14.0).abs() < 0.01 => Some(r.rect),
+            _ => None,
+        })
+        .filter(|r| picker.contains_rect(*r))
+        .collect();
+    let mut rows: Vec<f32> = swatches.iter().map(|r| r.min.y).collect();
+    rows.sort_by(f32::total_cmp);
+    rows.dedup_by(|a, b| (*a - *b).abs() < 1.0);
+    assert!(rows.len() >= 2, "expected the page colours to wrap onto several rows, got {} swatches in {} row(s)", swatches.len(), rows.len());
+    for r in &swatches {
+        assert!(
+            r.min.x >= picker.min.x + 16.0 - 0.5 && r.max.x <= picker.max.x - 16.0 + 0.5,
+            "swatch {r:?} is not inset 16 pt from both sides of the picker {picker:?}"
+        );
+    }
+}
diff --git a/crates/ui-egui/src/comments_tests.rs b/crates/ui-egui/src/comments_tests.rs
index bf30d5e5..eea2278e 100644
--- a/crates/ui-egui/src/comments_tests.rs
+++ b/crates/ui-egui/src/comments_tests.rs
@@ -7,7 +7,7 @@ use egui::{Event, Key, Modifiers, Pos2, pos2, vec2};
 use figcraft_engine::Session;
 use serde_json::{Value, json};
 
-use crate::comments::{cluster, insert_mention, mention_matches, mention_query};
+use crate::comments::{cluster, insert_mention, mention_matches, mention_query, start_draft};
 use crate::present_tests::{Ui, id};
 
 fn add(s: &mut Session, x: f64, y: f64, text: &str, author: &str) -> u64 {
@@ -41,6 +41,35 @@ fn comments(u: &Ui) -> Value {
     u.app.inspect()["comments"].clone()
 }
 
+#[test]
+fn switching_from_comment_to_move_closes_the_unposted_composer() {
+    let mut u = Ui::new(Session::new());
+    u.app.run("tool.set", json!({"tool": "comment"}));
+    start_draft(&mut u.app, 100.0, 80.0);
+    assert!(comments(&u)["draft"].is_array());
+
+    u.app.run("tool.set", json!({"tool": "move"}));
+    u.frame(vec![]);
+    assert!(comments(&u)["draft"].is_null());
+}
+
+#[test]
+fn control_channel_tool_switch_closes_the_unposted_composer() {
+    let mut u = Ui::new(Session::new());
+    u.app.run("tool.set", json!({"tool": "comment"}));
+    start_draft(&mut u.app, 100.0, 80.0);
+    assert!(comments(&u)["draft"].is_array());
+
+    let invalid = json!({"command": "tool.set", "params": {"tool": "not-a-tool"}});
+    assert!(crate::control::handle(&mut u.app, &egui::Context::default(), "engine.execute", &invalid).is_err());
+    assert!(comments(&u)["draft"].is_array());
+
+    crate::control::handle(&mut u.app, &egui::Context::default(), "engine.execute", &json!({"command": "tool.set", "params": {"tool": "move"}}))
+        .unwrap();
+    u.frame(vec![]);
+    assert!(comments(&u)["draft"].is_null());
+}
+
 #[test]
 fn mention_helpers() {
     // The `@query` before the cursor.
@@ -213,7 +242,7 @@ fn the_presenter_shows_the_frames_comments() {
     key(&mut u, Key::C, Modifiers::SHIFT);
     assert_eq!(u.app.inspect()["presenter"]["comments"], true);
     // The frame is presented at 100% (Fit never scales up), centred under the bar.
-    let screen = egui::Rect::from_min_size(pos2(0.0, 40.0), vec2(1440.0, 860.0));
+    let screen = egui::Rect::from_min_size(pos2(0.0, 80.0), vec2(1440.0, 820.0));
     let frame_min = screen.center() - vec2(200.0, 150.0);
     let pin = frame_min + vec2(100.0, 100.0) + vec2(14.0, -14.0);
     click(&mut u, pin);
diff --git a/crates/ui-egui/src/component_props_reorder_tests.rs b/crates/ui-egui/src/component_props_reorder_tests.rs
new file mode 100644
index 00000000..729185ce
--- /dev/null
+++ b/crates/ui-egui/src/component_props_reorder_tests.rs
@@ -0,0 +1,125 @@
+//! Dragging variant properties in a component set's Properties section, driven through egui
+//! headless: a property dragged by its left margin moves in one undo step (its values go with it,
+//! instances follow), its fields don't start a drag, and Escape cancels.
+
+use egui::{Event, Pos2, vec2};
+use figcraft_doc::NodeId;
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+use crate::list_drag::grip_id;
+
+fn id(v: serde_json::Value) -> NodeId {
+    NodeId(v["id"].as_u64().unwrap())
+}
+
+/// A selected set whose variants list Size then State (two values each), a shared boolean "Icon",
+/// and an instance of the set. Returns (ui, set, instance).
+fn setup() -> (Ui, NodeId, NodeId) {
+    let mut s = Session::new();
+    let mut variants = Vec::new();
+    for (k, name) in ["Size=Small, State=Default", "Size=Large, State=Default", "Size=Small, State=Hover"].iter().enumerate() {
+        let f = id(s.execute("frame.create", &json!({"x": 0, "y": k * 60, "width": 80, "height": 40, "name": name})).unwrap());
+        variants.push(id(s.execute("component.create", &json!({"ids": [f]})).unwrap()));
+    }
+    let set = id(s.execute("component.combineVariants", &json!({"ids": variants})).unwrap());
+    s.execute("component.addProperty", &json!({"id": set, "name": "Icon", "type": "boolean", "default": true})).unwrap();
+    let inst = id(s.execute("instance.create", &json!({"component": set, "x": 400, "y": 0})).unwrap());
+    s.execute("select.set", &json!({"ids": [set]})).unwrap();
+    (Ui::new(s), set, inst)
+}
+
+/// Property names of `id` (a set or an instance), in the order they're listed.
+fn names(u: &mut Ui, id: NodeId) -> Vec<String> {
+    let props = u.app.session.execute("component.properties", &json!({"id": id})).unwrap();
+    props["properties"].as_array().unwrap().iter().map(|p| p["name"].as_str().unwrap().to_string()).collect()
+}
+
+fn undo_len(u: &Ui) -> usize {
+    u.app.session.ds().unwrap().history.undo.len()
+}
+
+/// The middle of the grip of variant property `index` (as laid out last frame).
+fn grip(u: &Ui, set: NodeId, index: usize) -> Option<Pos2> {
+    u.ctx.read_response(grip_id(("variant_props", set), index)).map(|r| r.rect.center())
+}
+
+/// Press at `from`, move to `to` in small steps, and leave the button down.
+fn drag(u: &mut Ui, from: Pos2, to: Pos2) {
+    u.button(from, true);
+    for k in 1..=10 {
+        u.frame(vec![Event::PointerMoved(from + (to - from) * (k as f32 / 10.0))]);
+    }
+}
+
+#[test]
+fn dragging_a_variant_property_reorders_it_in_one_step() {
+    let (mut u, set, inst) = setup();
+    assert_eq!(names(&mut u, set), ["Size", "State", "Icon"]);
+    let (size, state) = (grip(&u, set, 0).expect("variant properties have a grip"), grip(&u, set, 1).unwrap());
+    assert!(size.y < state.y, "listed in order");
+    let undo = undo_len(&u);
+    // State above Size.
+    let to = size - vec2(0.0, 12.0);
+    drag(&mut u, state, to);
+    assert_eq!(names(&mut u, set), ["Size", "State", "Icon"], "nothing moves before the drop");
+    u.button(to, false);
+    assert_eq!(names(&mut u, set), ["State", "Size", "Icon"]);
+    assert_eq!(names(&mut u, inst), ["State", "Size", "Icon"], "the instance lists the new order");
+    let doc = u.app.session.doc().unwrap();
+    let first = doc.node(set).unwrap().children[0];
+    assert!(doc.node(first).unwrap().name.starts_with("State="), "{}", doc.node(first).unwrap().name);
+    assert_eq!(undo_len(&u), undo + 1);
+    assert!(u.app.ui.last_error.is_none(), "{:?}", u.app.ui.last_error);
+    // Dropped where it is: nothing changes.
+    u.frame(vec![]);
+    u.frame(vec![]);
+    let g = grip(&u, set, 0).unwrap();
+    drag(&mut u, g, g + vec2(0.0, 6.0));
+    u.button(g + vec2(0.0, 6.0), false);
+    assert_eq!(undo_len(&u), undo + 1);
+    assert!(u.app.session.undo().unwrap());
+    assert_eq!(names(&mut u, set), ["Size", "State", "Icon"]);
+}
+
+#[test]
+fn a_property_dropped_under_the_last_ones_values_lands_last() {
+    let (mut u, set, _) = setup();
+    let size = grip(&u, set, 0).unwrap();
+    // State's header is 32 high and its value row 30 under it: 58 down is on the value row, below
+    // the header's half-row slack, so only an area that takes in the values counts it.
+    let state = u.ctx.read_response(grip_id(("variant_props", set), 1)).unwrap().rect;
+    let to = Pos2::new(size.x, state.min.y + 58.0);
+    drag(&mut u, size, to);
+    u.button(to, false);
+    assert_eq!(names(&mut u, set), ["State", "Size", "Icon"]);
+}
+
+#[test]
+fn pressing_the_name_field_does_not_start_a_drag() {
+    // A guard: on main there's no grip at all; it fails if the whole row becomes a drag handle.
+    let (mut u, set, _) = setup();
+    let (size, state) = (grip(&u, set, 0).unwrap(), grip(&u, set, 1).unwrap());
+    let undo = undo_len(&u);
+    let field = size + vec2(60.0, 0.0);
+    drag(&mut u, field, Pos2::new(field.x, state.y + 40.0));
+    u.button(Pos2::new(field.x, state.y + 40.0), false);
+    assert_eq!(names(&mut u, set), ["Size", "State", "Icon"]);
+    assert_eq!(undo_len(&u), undo);
+}
+
+#[test]
+fn escape_cancels_a_property_drag_and_keeps_the_selection() {
+    // A guard: the cancel comes from the shared list drag.
+    let (mut u, set, _) = setup();
+    let (size, state) = (grip(&u, set, 0).unwrap(), grip(&u, set, 1).unwrap());
+    let undo = undo_len(&u);
+    let to = size - vec2(0.0, 12.0);
+    drag(&mut u, state, to);
+    u.frame(vec![Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() }]);
+    u.button(to, false);
+    assert_eq!(names(&mut u, set), ["Size", "State", "Icon"]);
+    assert_eq!(undo_len(&u), undo);
+    assert_eq!(u.app.session.ds().unwrap().selection, [set], "the Escape only cancels the drag");
+}
diff --git a/crates/ui-egui/src/component_swap_default_tests.rs b/crates/ui-egui/src/component_swap_default_tests.rs
new file mode 100644
index 00000000..50b06b8b
--- /dev/null
+++ b/crates/ui-egui/src/component_swap_default_tests.rs
@@ -0,0 +1,118 @@
+//! The default of a main component's instance-swap property, driven through egui headless: with
+//! more components than fit on the screen (an icon library), its menu scrolls, so the last one can
+//! be picked (#1338).
+
+use egui::accesskit::{Node, Role};
+use egui::{Event, MouseWheelUnit, Pos2, TouchPhase, pos2, vec2};
+use figcraft_doc::{NodeId, NodeKind, PropDef};
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+
+fn id(v: serde_json::Value) -> NodeId {
+    NodeId(v["id"].as_u64().unwrap())
+}
+
+/// A selected "Button" component whose instance-swap property "Icon" defaults to "Heart", then 80
+/// more components, the last "Zebra". Returns (ui, button, zebra).
+fn setup() -> (Ui, NodeId, NodeId) {
+    let mut s = Session::new();
+    let mut icon = |name: &str, k: usize| {
+        let f =
+            id(s.execute("frame.create", &json!({"x": (k % 20) * 40, "y": 200 + (k / 20) * 40, "width": 24, "height": 24, "name": name})).unwrap());
+        id(s.execute("component.create", &json!({"ids": [f]})).unwrap())
+    };
+    let heart = icon("Heart", 0);
+    let mut zebra = heart;
+    for k in 1..=80 {
+        zebra = icon(&if k == 80 { "Zebra".to_string() } else { format!("Glyph {k}") }, k);
+    }
+    let f = id(s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 120, "height": 40, "name": "Button"})).unwrap());
+    let nested = id(s.execute("instance.create", &json!({"component": heart, "x": 8, "y": 8, "parent": f})).unwrap());
+    let button = id(s.execute("component.create", &json!({"ids": [f]})).unwrap());
+    s.execute("component.addProperty", &json!({"id": button, "name": "Icon", "type": "instanceSwap", "default": heart, "layer": nested})).unwrap();
+    s.execute("select.set", &json!({"ids": [button]})).unwrap();
+    let u = Ui::new(s);
+    u.ctx.enable_accesskit();
+    (u, button, zebra)
+}
+
+fn tree(u: &mut Ui) -> Vec<Node> {
+    u.frame_output(vec![]).platform_output.accesskit_update.unwrap().nodes.into_iter().map(|(_, n)| n).collect()
+}
+
+fn centre(n: &Node) -> Pos2 {
+    let b = n.bounds().unwrap();
+    pos2(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32)
+}
+
+fn click(u: &mut Ui, at: Pos2) {
+    u.button(at, true);
+    u.button(at, false);
+}
+
+/// Turn the mouse wheel down by `dy` points over `at`, and let the scroll settle.
+fn wheel(u: &mut Ui, at: Pos2, dy: f32) {
+    let wheel = Event::MouseWheel {
+        unit: MouseWheelUnit::Point,
+        source: egui::MouseWheelSource::Unknown,
+        delta: vec2(0.0, -dy),
+        phase: TouchPhase::Move,
+        modifiers: Default::default(),
+    };
+    u.frame(vec![Event::PointerMoved(at), wheel]);
+    for _ in 0..30 {
+        u.frame(vec![]);
+    }
+}
+
+fn swap_default(u: &Ui, button: NodeId) -> Option<NodeId> {
+    match u.app.session.ds().ok()?.doc.node(button).map(|n| &n.kind) {
+        Some(NodeKind::Component { props, .. }) => match props.get("Icon") {
+            Some(PropDef::InstanceSwap { default, .. }) => Some(*default),
+            _ => None,
+        },
+        _ => None,
+    }
+}
+
+/// The default's dropdown on the "Icon" property row, scrolled into view in the Design panel.
+fn default_combo(u: &mut Ui) -> Option<Node> {
+    for _ in 0..20 {
+        let combo = tree(u).into_iter().find(|n| n.role() == Role::ComboBox && n.label() == Some("Icon"))?;
+        if centre(&combo).y < 860.0 {
+            return Some(combo);
+        }
+        wheel(u, pos2(1300.0, 500.0), 100.0);
+    }
+    None
+}
+
+#[test]
+fn the_default_menu_scrolls_to_its_last_component() {
+    let (mut u, button, zebra) = setup();
+    let combo = default_combo(&mut u).expect("the Icon property has a dropdown for its default");
+    assert_eq!(combo.value(), Some("Heart"));
+    // Layer rows share the names; the menu's items are the ones that weren't there before it opened.
+    let before: Vec<Pos2> = tree(&mut u).iter().filter(|n| n.label().is_some_and(|l| l == "Zebra" || l == "Glyph 1")).map(centre).collect();
+    click(&mut u, centre(&combo));
+    let item = |u: &mut Ui, name: &str| tree(u).into_iter().find(|n| n.label() == Some(name) && !before.contains(&centre(n)));
+    let top = centre(&item(&mut u, "Glyph 1").expect("the menu lists the components"));
+    let bottom = centre(&item(&mut u, "Zebra").expect("the menu lists the last component"));
+    assert!(bottom.y > 900.0, "80 components don't fit on the screen: Zebra at {bottom:?}");
+    // The menu is capped and scrolls: wheel over it to the end of the list, and pick Zebra.
+    let mut at = bottom;
+    for _ in 0..40 {
+        wheel(&mut u, top, 200.0);
+        let next = centre(&item(&mut u, "Zebra").expect("the menu stays open while it scrolls"));
+        if next == at {
+            break;
+        }
+        at = next;
+    }
+    assert!(at.y < 880.0, "the menu scrolls Zebra onto the screen: at {at:?}");
+    assert!(at.y - top.y < 400.0, "Zebra ends up inside the capped menu, near its top row: {top:?} → {at:?}");
+    click(&mut u, at);
+    assert_eq!(swap_default(&u, button), Some(zebra), "picking the last component makes it the default");
+}
diff --git a/crates/ui-egui/src/context_menu_tests.rs b/crates/ui-egui/src/context_menu_tests.rs
new file mode 100644
index 00000000..a447347d
--- /dev/null
+++ b/crates/ui-egui/src/context_menu_tests.rs
@@ -0,0 +1,86 @@
+//! The right-click menu on a layer: the copy commands sit in a Copy as submenu under Paste to
+//! replace; "Copy link to selection" puts `figcraft://node/<id>` on the clipboard and says so, and
+//! with nothing selected the command copies nothing.
+
+use std::sync::{Arc, Mutex};
+
+use egui::Pos2;
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+use crate::live_tests::{flat, has_text, text_center};
+use crate::present_tests::id;
+
+/// A clipboard that keeps what was copied where the test can read it.
+struct Copied(Arc<Mutex<Vec<String>>>);
+
+impl crate::Services for Copied {
+    fn clipboard_set_text(&mut self, s: &str) {
+        if let Ok(mut copied) = self.0.lock() {
+            copied.push(s.to_string());
+        }
+    }
+}
+
+#[test]
+fn the_context_menu_groups_the_copy_commands_under_copy_as() {
+    let mut s = Session::new();
+    let f = id(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 300, "height": 200, "name": "หน้าแรก"})).unwrap());
+    let copied = Arc::new(Mutex::new(Vec::new()));
+    let mut u = Ui::new(s);
+    u.app.services = Box::new(Copied(copied.clone()));
+    u.frame(vec![]);
+    u.app.ui.context_menu = Some((Pos2::new(700.0, 300.0), vec![f]));
+    u.frame(vec![]);
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    // A row under Paste to replace; the items are in its submenu, not in the menu itself.
+    let y = |s: &str| text_center(&shapes, s).y;
+    assert!(y("Paste to replace") < y("Copy as") && y("Copy as") < y("Bring to front"), "Copy as sits under Paste to replace");
+    for item in ["Copy as CSS", "Copy as SVG", "Copy as PNG", "Copy link to selection"] {
+        assert!(!has_text(&shapes, item), "{item} is inside the submenu");
+    }
+    let at = text_center(&shapes, "Copy as");
+    u.button(at, true);
+    u.button(at, false);
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    for item in ["Copy as CSS", "Copy as SVG", "Copy as PNG", "Copy link to selection"] {
+        assert!(has_text(&shapes, item), "{item} is in the submenu");
+    }
+    let at = text_center(&shapes, "Copy link to selection");
+    u.button(at, true);
+    u.button(at, false);
+    assert_eq!(*copied.lock().unwrap(), vec![format!("figcraft://node/{}", f.0)], "the link to the frame");
+    assert_eq!(u.app.ui.toast.as_ref().map(|t| t.0.as_str()), Some("Link copied"));
+    assert!(u.app.ui.context_menu.is_none(), "the menu closes");
+}
+
+#[test]
+fn the_context_menu_offers_go_to_main_for_an_instance() {
+    // Right-clicking an instance reaches its main component: the menu offers "Go to main
+    // component" instead of "Create component" (which is for plain layers).
+    let mut s = Session::new();
+    let f = id(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 100, "height": 60, "name": "Button"})).unwrap());
+    let comp = id(&s.execute("component.create", &json!({"ids": [f]})).unwrap());
+    let inst = id(&s.execute("instance.create", &json!({"component": comp, "x": 0, "y": 200})).unwrap());
+    let mut u = Ui::new(s);
+    u.frame(vec![]);
+    u.app.ui.context_menu = Some((Pos2::new(700.0, 300.0), vec![inst]));
+    u.frame(vec![]);
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    assert!(has_text(&shapes, "Go to main component"), "an instance's menu reaches its main");
+    assert!(!has_text(&shapes, "Create component"), "not offered for an instance");
+}
+
+#[test]
+fn copying_a_link_with_nothing_selected_copies_nothing() {
+    let mut s = Session::new();
+    s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 300, "height": 200})).unwrap();
+    s.execute("select.none", &json!({})).unwrap();
+    let copied = Arc::new(Mutex::new(Vec::new()));
+    let mut u = Ui::new(s);
+    u.app.services = Box::new(Copied(copied.clone()));
+    crate::menus::invoke(&mut u.app, "edit.copyLink");
+    assert!(copied.lock().unwrap().is_empty(), "no link to node 0");
+    assert!(u.app.ui.toast.is_none());
+}
diff --git a/crates/ui-egui/src/control.rs b/crates/ui-egui/src/control.rs
index 7a196cf2..afef387d 100644
--- a/crates/ui-egui/src/control.rs
+++ b/crates/ui-egui/src/control.rs
@@ -1,6 +1,7 @@
 //! The control channel's UI-thread side. The app crate accepts JSON lines on a localhost socket
-//! and queues [`ControlRequest`]s; [`drain`] runs them at the start of a frame so replies reflect
-//! the real UI. Methods:
+//! and queues [`ControlRequest`]s. [`background`] runs the phase-safe part from every logic
+//! callback; [`drain`] admits and answers the UI-only work inside a real frame so replies reflect
+//! the drawn UI. Methods:
 //!
 //! - `engine.execute {command, params}` — run any command (no dialogs open)
 //! - `engine.commands {}` — every command with its params doc
@@ -15,9 +16,12 @@
 //!   for the frames that follow (all false: released); `gamepad` presses a controller button in the
 //!   prototype playing (presenter or preview pane)
 //! - `ui.menu.invoke {id}` — a menu item exactly like clicking it (may open a dialog)
-//! - `ui.set {rightTab?, leftTab?, theme?, home?, homeSection?, homeRecentsView?, homeRecentsSort?, homeRecentsOrder?, palette?, focusRegion?, preview?, presentScroll?, …}`
-//! - `ui.screenshot {path}` — PNG of the window (needs a visible window)
-//! - `ui.render {path, scale?, ids?}` — PNG of the document (no UI chrome; works without a window)
+//! - `ui.set {rightTab?, leftTab?, theme?, home?, homeSection?, homeSearch?, homeRecentsView?, homeRecentsSort?, homeRecentsOrder?, palette?, focusRegion?, preview?, presentScroll?, …}`
+//! - `ui.screenshot {path?}` — PNG of the window, written to `path` or returned as base64 `data`;
+//!   a hidden window is asked to paint (`RequestPaintWhileHidden`) and the request expires once at
+//!   its deadline (native; the shared web runner does not implement hidden paint yet)
+//! - `ui.render {path?, scale?, ids?}` — PNG of the document (no UI chrome; works without a
+//!   window), written to `path` or returned as base64 `data`
 //! - `window.new {path?, index?}` → `{window}` / `window.list {}` / `window.focus {id}` — several
 //!   windows (desktop)
 //! - `app.quit {}`
@@ -25,6 +29,8 @@
 //! Any method takes `window` (an id from `window.list`) to run in that window, with its tabs and
 //! panels; without it, requests go to the window last in front.
 
+use std::sync::{Arc, Mutex};
+
 use egui::Context;
 use figcraft_engine::cmd::comment::{Filter, Sort};
 use figcraft_engine::{PointerEvent, PointerKind};
@@ -37,121 +43,436 @@ pub struct ControlReply {
     pub result: Result<Value, String>,
 }
 
+/// Which side has finished a control request.
+///
+/// The transport and the UI race to settle one request: while it is `Open`, either may cancel it
+/// (the transport's timeout) or commit it (the UI's final reply). Once settled, neither side may
+/// change it.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub enum RequestState {
+    #[default]
+    Open,
+    /// The transport stopped waiting: no file may be written and no reply is wanted.
+    Cancelled,
+    /// The UI wrote the file (if any) and queued the reply before releasing the gate.
+    Replied,
+}
+
+/// The gate the transport's timeout and the UI's final reply share for one request.
+///
+/// Encoding happens outside it, so a slow PNG never blocks the timeout. The final file write and
+/// reply enqueue happen under it, after rechecking cancellation and the deadline, so a timeout
+/// cannot overtake a committed file and a cancellation cannot slip between the check and the
+/// write. It is never held across socket I/O.
+#[derive(Clone, Default)]
+pub struct RequestGate {
+    state: Arc<Mutex<RequestState>>,
+}
+
+impl RequestGate {
+    /// Create a request gate in its default `Open` state.
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Return a copy of the gate's current request state.
+    pub fn state(&self) -> RequestState {
+        *self.state.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
+    }
+
+    /// Whether the gate is `Cancelled`.
+    pub fn is_cancelled(&self) -> bool {
+        self.state() == RequestState::Cancelled
+    }
+
+    /// Whether the gate is `Replied`.
+    pub fn is_replied(&self) -> bool {
+        self.state() == RequestState::Replied
+    }
+
+    /// Cancel an open request, as the transport's timeout does. Returns the resulting state so a
+    /// timeout that lost the race knows to consume the already-queued reply.
+    pub fn cancel_if_open(&self) -> RequestState {
+        let mut state = self.state.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+        if *state == RequestState::Open {
+            *state = RequestState::Cancelled;
+        }
+        *state
+    }
+
+    /// Run the final commit (file write and reply enqueue) only while the request is still open,
+    /// then mark it replied before releasing the gate. `None` means the transport cancelled it or
+    /// it was already committed; the closure must not have run then.
+    pub fn commit<T>(&self, finish: impl FnOnce() -> T) -> Option<T> {
+        let mut state = self.state.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+        if *state != RequestState::Open {
+            return None;
+        }
+        let value = finish();
+        *state = RequestState::Replied;
+        Some(value)
+    }
+}
+
 pub struct ControlRequest {
     pub id: Value,
     pub method: String,
     pub params: Value,
     pub reply: std::sync::mpsc::Sender<ControlReply>,
-    /// The transport stops waiting after its timeout; discard requests still queued then.
-    pub cancelled: std::sync::Arc<std::sync::atomic::AtomicBool>,
+    /// The transport stops waiting after its timeout; discard requests still queued then. The UI
+    /// passes the same gate to its screenshot's final commit.
+    pub state: RequestGate,
 }
 
 impl ControlRequest {
+    /// Whether this request's gate is `Cancelled`.
     pub fn is_cancelled(&self) -> bool {
-        self.cancelled.load(std::sync::atomic::Ordering::Relaxed)
+        self.state.is_cancelled()
     }
 }
 
-/// Pending screenshot replies.
-pub struct PendingShot {
-    pub id: Value,
-    pub path: String,
-    pub reply: std::sync::mpsc::Sender<ControlReply>,
-    /// When it was asked for (UI clock, seconds).
-    pub since: f64,
-    /// The window it captures.
+/// One screenshot's completion slot.
+///
+/// The renderer's one-shot callback only stores the raw image here and wakes the captured
+/// viewport; it never encodes or writes a file, and it holds only a [`std::sync::Weak`] reference, so a late
+/// capture after the request (or the app) is gone is a no-op. The live request owns the only
+/// strong reference, together with the viewport `Context` clone used for the wakeup.
+pub struct CaptureSlot {
+    inner: Mutex<SlotInner>,
+    ctx: Context,
+    viewport: egui::ViewportId,
+}
+
+#[derive(Default)]
+struct SlotInner {
+    image: Option<Arc<egui::ColorImage>>,
+    closed: bool,
+    /// The one image was already handed to a frame (a second callback cannot store another).
+    taken: bool,
+}
+
+impl CaptureSlot {
+    /// Create an empty capture slot for `viewport`, holding a clone of the UI context.
+    fn new(ctx: &Context, viewport: egui::ViewportId) -> Arc<Self> {
+        Arc::new(Self { inner: Mutex::new(SlotInner::default()), ctx: ctx.clone(), viewport })
+    }
+
+    /// The one-shot callback for `ViewportCommand::Screenshot`.
+    fn callback(slot: &Arc<Self>) -> egui::ScreenshotCallback {
+        let weak = Arc::downgrade(slot);
+        egui::ScreenshotCallback::new(move |image| {
+            if let Some(slot) = weak.upgrade() {
+                slot.complete(image);
+            }
+        })
+    }
+
+    /// Store the first delivered image only while the slot is open and untaken, ignoring later
+    /// or closed deliveries, then wake the viewport after releasing the lock.
+    pub(crate) fn complete(&self, image: Arc<egui::ColorImage>) {
+        {
+            let mut inner = self.inner.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+            if inner.closed || inner.image.is_some() || inner.taken {
+                return;
+            }
+            inner.image = Some(image);
+        }
+        // The lock is released before waking: the wakeup may draw the frame that drains this slot.
+        self.ctx.request_repaint_of(self.viewport);
+    }
+
+    /// The captured image, once: a second callback or drain finds the slot taken.
+    fn take(&self) -> Option<Arc<egui::ColorImage>> {
+        let mut inner = self.inner.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+        if inner.taken {
+            return None;
+        }
+        let image = inner.image.take();
+        inner.taken = image.is_some();
+        image
+    }
+
+    /// Whether the renderer delivered the image. A hidden window's frame must be asked to paint
+    /// again to drain it: the capture command's own paint was the one that produced it.
+    fn has_result(&self) -> bool {
+        self.inner.lock().unwrap_or_else(std::sync::PoisonError::into_inner).image.is_some()
+    }
+
+    /// Forget a cancelled, timed-out or superseded request: a late callback finds it closed.
+    fn close(&self) {
+        let mut inner = self.inner.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+        inner.closed = true;
+        inner.image = None;
+    }
+}
+
+/// A screenshot's capture-time geometry (the viewport surface and the scale it was admitted at).
+/// Pixels are derived from these dimensions, never from a stale `ViewportInfo::inner_rect` or a
+/// previous pass's viewport rectangle.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct CaptureSpec {
     pub viewport: egui::ViewportId,
+    /// Expected readback pixels.
+    pub size_px: [usize; 2],
+    pub pixels_per_point: f32,
+    pub zoom: f32,
+}
+
+/// Slack allowed for PNG headers and chunk framing past the raw pixel bytes.
+const SHOT_PNG_OVERHEAD: usize = 64 * 1024;
+
+impl CaptureSpec {
+    /// Return the checked pixel byte count (`width × height × 4`), or `None` on overflow.
+    fn bytes(&self) -> Option<usize> {
+        self.size_px[0].checked_mul(self.size_px[1])?.checked_mul(4)
+    }
+
+    /// The bytes this capture may hold at its peak.
+    ///
+    /// `shot_reply` first holds the readback image, the straight-RGBA copy handed to the encoder
+    /// and the PNG being built (two raw buffers plus the PNG), then drops the copy and builds the
+    /// base64 reply from the PNG (readback plus PNG plus four thirds of the PNG). The budget is the
+    /// larger of those phases, never a sum of all four buffers at once. The reservation is a bound,
+    /// not an estimate of the encoded size; `shot_reply` enforces the reply side of it and must
+    /// drop the straight-RGBA copy before encoding base64.
+    fn cost(&self) -> Option<usize> {
+        let raw = self.bytes()?;
+        let png = raw.checked_add(SHOT_PNG_OVERHEAD)?;
+        let encode_phase = raw.checked_mul(2)?.checked_add(png)?;
+        let reply = png.checked_div(3)?.checked_add(1)?.checked_mul(4)?;
+        let reply_phase = raw.checked_add(png)?.checked_add(reply)?;
+        Some(encode_phase.max(reply_phase))
+    }
+}
+
+/// One admitted screenshot: its deadline, capture identity and completion slot.
+pub struct ShotRequest {
+    pub id: Value,
+    /// Where to write the PNG; `None`: return it as data.
+    pub path: Option<String>,
+    pub reply: std::sync::mpsc::Sender<ControlReply>,
+    /// The transport's timeout and this request's final write share this gate.
+    pub state: RequestGate,
+    /// Monotonic seconds ([`crate::FrameClock`]); covers admission, settling, retries and arrival.
+    pub deadline: f64,
+    pub viewport: egui::ViewportId,
+    /// The window whose document generation the capture belongs to.
+    pub window: u64,
+    /// The document UID shown when the request was admitted.
+    pub document: u64,
+    /// That presentation's monotonic generation (the UID alone cannot tell A→B→A apart).
+    pub presentation: u64,
+    pub spec: Option<CaptureSpec>,
+    /// The geometry epoch at issuance; a resize/DPI/zoom change rejects the pixels.
+    pub epoch: u64,
+    /// Completed, presented UI frames since admission (hidden logic ticks never count; a
+    /// discarded sizing pass inside a frame does not count separately from that frame's final
+    /// presented pass).
+    pub settle: u8,
+    /// The last completed-frame number counted into `settle`; `None` until the first observed
+    /// pass anchors the count. A frame is counted only once it has completed, so its first pass
+    /// is never treated as settled before the frame has presented a layout.
+    pub settle_frame: Option<u64>,
+    pub issued: bool,
+    pub slot: Option<Arc<CaptureSlot>>,
+    /// Image bytes reserved for this request (in flight or completed but undrained).
+    pub reserved: usize,
+    pub retries: u8,
+}
+
+impl ShotRequest {
+    /// Close and drop the capture slot, if any, and zero the reserved byte count.
+    fn release(&mut self) {
+        if let Some(slot) = self.slot.take() {
+            slot.close();
+        }
+        self.reserved = 0;
+    }
+}
+
+/// Screenshot state owned by the app: pending requests and the geometry epoch they were admitted
+/// against. Pending and completed-but-undrained images both count toward the budget.
+#[derive(Default)]
+pub struct CaptureState {
+    pub(crate) shots: Vec<ShotRequest>,
+    /// The last UI geometry of each viewport and the epoch it defines (a resize, DPI change or
+    /// zoom change — even back — bumps it). Per viewport: one window's frames must not invalidate
+    /// another's captures.
+    pub(crate) geometry: std::collections::HashMap<egui::ViewportId, (CaptureSpec, u64)>,
+    pub(crate) epoch: u64,
 }
 
 /// How long a screenshot waits for the window to deliver it (the control server gives up then too).
-const SHOT_TIMEOUT: f64 = 60.0;
+pub(crate) const SHOT_TIMEOUT: f64 = 60.0;
 
-fn pending(ctx: &Context) -> std::sync::Arc<std::sync::Mutex<Vec<PendingShot>>> {
-    ctx.data_mut(|d| d.get_temp_mut_or_insert_with(egui::Id::new("pending_shots"), || std::sync::Arc::new(std::sync::Mutex::new(Vec::new()))).clone())
+/// Completed real UI frames a capture waits for before it is issued, so fonts, layout and the
+/// renderer have settled (hidden logic ticks do not count; a frame counts once, after presenting
+/// its final pass).
+const SHOT_SETTLE_PASSES: u8 = 3;
+
+/// The suite's capture budget, counted over in-flight and completed-but-undrained images.
+pub(crate) const MAX_SHOTS: usize = 4;
+const MAX_SHOT_IMAGE_BYTES: usize = 128 * 1024 * 1024;
+const MAX_SHOT_TOTAL_BYTES: usize = 256 * 1024 * 1024;
+/// A PNG larger than this is refused before its base64 reply is built (a PNG cannot normally grow
+/// past its raw pixels, so only pathological content reaches it).
+const MAX_SHOT_REPLY_BYTES: usize = 192 * 1024 * 1024;
+
+/// The capture geometry of the UI pass drawing now, if the surface size is known. The screenshot
+/// is the whole viewport surface (a notch's area is still read back), and pixel bounds are rounded
+/// up: a fractional DPI must not turn a valid surface into a one-pixel mismatch.
+fn current_spec(ctx: &Context, viewport: egui::ViewportId) -> Option<CaptureSpec> {
+    let surface = ctx.viewport_rect();
+    let rect = if surface.width() >= 1.0 && surface.height() >= 1.0 { surface } else { ctx.content_rect() };
+    let ppp = ctx.pixels_per_point();
+    let zoom = ctx.zoom_factor();
+    if !(rect.width().is_finite() && rect.height().is_finite() && ppp.is_finite() && zoom.is_finite()) {
+        return None;
+    }
+    let w = (rect.width() * ppp).ceil();
+    let h = (rect.height() * ppp).ceil();
+    if w < 1.0 || h < 1.0 || w > 32768.0 || h > 32768.0 {
+        return None;
+    }
+    Some(CaptureSpec { viewport, size_px: [w as usize, h as usize], pixels_per_point: ppp, zoom })
 }
 
-pub fn drain(app: &mut FigApp, ctx: &Context) {
-    let now = ctx.input(|i| i.time);
-    let list = pending(ctx);
-    // Finish screenshots that arrived (a window's capture can arrive in any window's input).
-    let shots: Vec<(egui::ViewportId, std::sync::Arc<egui::ColorImage>)> = ctx.input(|i| {
-        i.events
-            .iter()
-            .filter_map(|e| match e {
-                egui::Event::Screenshot { viewport_id, image, .. } => Some((*viewport_id, image.clone())),
-                _ => None,
-            })
-            .collect()
-    });
-    for (vp, img) in &shots {
-        list.lock().unwrap_or_else(std::sync::PoisonError::into_inner).retain(|p| {
-            if p.viewport != *vp {
-                return true;
-            }
-            let res = save_color_image(img, &p.path).map(|_| json!({"path": p.path, "width": img.size[0], "height": img.size[1]}));
-            let _ = p.reply.send(ControlReply { id: p.id.clone(), result: res });
-            false
-        });
+/// Send one reply carrying the request id, ignoring a disconnected receiver.
+fn reply(r: &mut ShotRequest, result: Result<Value, String>) {
+    let _ = r.reply.send(ControlReply { id: r.id.clone(), result });
+}
+
+/// Admit a screenshot request. Geometry is filled in on the next UI pass; until then the request
+/// is only counted, so a hidden window's capture can wait for its forced paint without inventing
+/// geometry from a stale pass.
+fn admit(app: &mut FigApp, r: ControlRequest, window: u64, now: f64) {
+    let canceled = r.is_cancelled();
+    let ControlRequest { id, method: _, params, reply: tx, state } = r;
+    if app.capture.shots.len() >= MAX_SHOTS {
+        if !canceled {
+            let _ = tx.send(ControlReply { id, result: Err(format!("too many screenshots are pending (at most {MAX_SHOTS})")) });
+        }
+        return;
     }
-    let reqs = std::mem::take(&mut app.control_queue);
-    for r in reqs {
-        if r.is_cancelled() {
-            continue;
-        }
-        // Requests for another window wait for its frame.
-        let target = r.params.get("window").and_then(Value::as_u64).unwrap_or(app.windows.focused);
-        if target != app.windows.current {
-            if app.windows.exists(target) {
-                ctx.request_repaint_of(crate::windows::viewport(target));
-                app.control_queue.push(r);
-            } else {
-                let _ = r.reply.send(ControlReply { id: r.id, result: Err(format!("no window {target}")) });
-            }
-            continue;
-        }
-        if r.method == "ui.screenshot" {
-            let path = r.params.get("path").and_then(Value::as_str).unwrap_or("figcraft-screenshot.png").to_string();
-            let viewport = ctx.viewport_id();
-            list.lock().unwrap_or_else(std::sync::PoisonError::into_inner).push(PendingShot { id: r.id, path, reply: r.reply, since: now, viewport });
-            ctx.send_viewport_cmd(egui::ViewportCommand::Screenshot(egui::UserData::default()));
-            continue;
-        }
-        let res = handle(app, ctx, &r.method, &r.params);
-        let _ = r.reply.send(ControlReply { id: r.id, result: res });
-        ctx.request_repaint();
-    }
-    // The window delivers a screenshot some frames after it was asked for (once the GPU has copied
-    // it back), and only while frames are drawn: keep drawing until it arrives (a hidden window
-    // never delivers; its requests expire).
-    let mut list = list.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
-    list.retain(|p| {
-        let live = now - p.since < SHOT_TIMEOUT;
-        if !live {
-            let _ = p.reply.send(ControlReply { id: p.id.clone(), result: Err("the window didn't deliver a screenshot (is it visible?)".into()) });
-        }
-        live
+    let path = params.get("path").and_then(Value::as_str).map(str::to_string);
+    let (document, presentation) = app.windows.presentation(&app.session, window);
+    app.capture.shots.push(ShotRequest {
+        id,
+        path,
+        reply: tx,
+        state,
+        deadline: now + SHOT_TIMEOUT,
+        viewport: crate::windows::viewport(window),
+        window,
+        document,
+        presentation,
+        spec: None,
+        epoch: app.capture.epoch,
+        settle: 0,
+        settle_frame: None,
+        issued: false,
+        slot: None,
+        reserved: 0,
+        retries: 0,
     });
-    if !list.is_empty() {
-        ctx.request_repaint();
+}
+
+/// Expire requests whose whole lifetime (admission, settling, retries, arrival) is over, exactly
+/// once, and release their image reservation.
+fn expire(app: &mut FigApp, ctx: &Context, now: f64) {
+    let mut i = 0;
+    while i < app.capture.shots.len() {
+        let (deadline, cancelled, window) = {
+            let r = &app.capture.shots[i];
+            (r.deadline, r.state.is_cancelled(), r.window)
+        };
+        let closed = !app.windows.exists(window);
+        if now >= deadline || cancelled || closed {
+            let mut r = app.capture.shots.remove(i);
+            r.release();
+            if !cancelled {
+                let why = if closed {
+                    "the window closed before the screenshot was captured"
+                } else {
+                    "the window didn't deliver a screenshot (is it visible?)"
+                };
+                reply(&mut r, Err(why.into()));
+            }
+            ctx.request_repaint();
+        } else {
+            i += 1;
+        }
     }
 }
 
-/// Methods that need no frame drawn (#269): a hidden window answers them too.
-const NO_FRAME: &[&str] = &["engine.execute", "engine.commands", "document.inspect", "node.get", "window.list", "ui.render"];
+/// Whether the platform reports window `id` as visible; `None` means it has not said (a
+/// minimised window can report no `visible` flag at all).
+fn visibility(ctx: &Context, id: u64) -> Option<bool> {
+    ctx.input(|i| {
+        let info = i.raw.viewports.get(&crate::windows::viewport(id))?;
+        // Some platforms report `visible: true` for a minimised window; `minimized` is the more
+        // specific signal there. No information at all stays `None` (unknown), never visible.
+        if info.minimized == Some(true) {
+            return Some(false);
+        }
+        info.visible()
+    })
+}
 
 /// Whether window `id` draws no frames now: minimised, or covered by other windows (on macOS also
 /// on another Space).
 fn hidden(ctx: &Context, id: u64) -> bool {
-    ctx.input(|i| i.raw.viewports.get(&crate::windows::viewport(id)).and_then(egui::ViewportInfo::visible)) == Some(false)
+    visibility(ctx, id) == Some(false)
 }
 
-/// A hidden window (minimised, or covered by other windows) draws no frames, but the desktop app's
-/// `logic` still runs, for the main window even while every window is hidden: it answers the
-/// requests for any hidden window that need no frame, in that window's file, so an attached agent
-/// can edit, inspect and save. The rest (screenshots, input, the interface's own state) wait for the
-/// window to show; another window on screen is asked to draw, which the main window's frame would
-/// do but doesn't while it is hidden. A request for a window that doesn't exist is an error at once.
-pub fn drain_hidden(app: &mut FigApp, ctx: &Context) {
+/// Send `RequestPaintWhileHidden` for work that needs a real UI pass (a queued capture or
+/// synthetic input), and schedule a wakeup for the next capture deadline. Native eframe honours
+/// this command; the shared web runner does not implement it yet, so a hidden browser tab remains
+/// an explicit, recorded qualification gap (see `docs/egui-037-local-followups.md`).
+fn request_paint(app: &FigApp, ctx: &Context) {
+    for r in &app.capture.shots {
+        if !app.windows.exists(r.window) {
+            continue;
+        }
+        // A capture that is still settling needs the real UI pass its geometry comes from; one
+        // whose pixels arrived while the window was hidden needs the pass that drains the slot.
+        // The capture command's own paint was drained when it produced the image.
+        if !r.issued || r.slot.as_ref().is_some_and(|s| s.has_result()) {
+            ctx.send_viewport_cmd_to(r.viewport, egui::ViewportCommand::RequestPaintWhileHidden);
+        }
+    }
+    for r in &app.control_queue {
+        if r.method == "ui.input" {
+            let target = r.params.get("window").and_then(Value::as_u64).unwrap_or(app.windows.focused);
+            if hidden(ctx, target) {
+                ctx.send_viewport_cmd_to(crate::windows::viewport(target), egui::ViewportCommand::RequestPaintWhileHidden);
+            }
+        }
+    }
+    // A batch queued for a frame that has not drawn it yet also keeps asking. During a child
+    // window's pass `app.control_input` is that window's live pane; from the main window's logic
+    // it is the root's, so the viewport drawing now is the one to wake.
+    if !app.control_input.is_empty() {
+        ctx.send_viewport_cmd_to(ctx.viewport_id(), egui::ViewportCommand::RequestPaintWhileHidden);
+    }
+    for viewport in app.windows.pending_input_viewports() {
+        ctx.send_viewport_cmd_to(viewport, egui::ViewportCommand::RequestPaintWhileHidden);
+    }
+    // A batch already handed to a hidden window's raw input (a logic-only pass takes it, egui
+    // saves it for the next pass) still needs the real pass that applies and acknowledges it.
+    if let Some(viewport) = app.applied_frame {
+        ctx.send_viewport_cmd_to(viewport, egui::ViewportCommand::RequestPaintWhileHidden);
+    }
+    if let Some(d) = app.capture.shots.iter().map(|r| r.deadline).reduce(f64::min) {
+        crate::repaint_in(ctx, (d - app.clock.now()).clamp(0.0, SHOT_TIMEOUT));
+    }
+}
+
+/// Work a logic-only callback can do safely: expire deadlines, admit or park screenshot requests,
+/// and answer state-only control requests for hidden windows. Input/geometry are never read here.
+pub fn background(app: &mut FigApp, ctx: &Context) {
+    let now = app.clock.now();
+    expire(app, ctx, now);
     for r in std::mem::take(&mut app.control_queue) {
         if r.is_cancelled() {
             continue;
@@ -161,34 +482,431 @@ pub fn drain_hidden(app: &mut FigApp, ctx: &Context) {
             let _ = r.reply.send(ControlReply { id: r.id, result: Err(format!("no window {target}")) });
             continue;
         }
-        if !hidden(ctx, target) || !NO_FRAME.contains(&r.method.as_str()) {
-            // Another window on screen draws only when asked: while the main window is hidden no
-            // frame of it does that (`drain`), so ask here.
-            if target != app.windows.current && !hidden(ctx, target) {
-                ctx.request_repaint_of(crate::windows::viewport(target));
-            }
+        let is_hidden = hidden(ctx, target);
+        if r.method == "ui.screenshot" && visibility(ctx, target) != Some(true) {
+            // Hidden, minimised, or with visibility the platform has not reported: admit it now
+            // so the request gets its deadline and a forced paint. Waiting for a frame that may
+            // never draw would leave it queued past the transport's own timeout with no reply.
+            admit(app, r, target, now);
+            continue;
+        }
+        if !is_hidden && target == app.windows.current {
+            // The window's frame admits and issues it against real geometry.
             app.control_queue.push(r);
             continue;
         }
+        if !is_hidden {
+            // Another visible window draws only when asked.
+            ctx.request_repaint_of(crate::windows::viewport(target));
+            app.control_queue.push(r);
+            continue;
+        }
+        if r.method == "ui.input" {
+            // Keep one synthetic batch until a real UI pass consumes it.
+            app.control_queue.push(r);
+            continue;
+        }
+        if r.method == "window.new" {
+            let error = format!("window {target} is minimised or hidden: `window.new` needs it on screen");
+            let _ = r.reply.send(ControlReply { id: r.id, result: Err(error) });
+            continue;
+        }
         // Outside a frame, so outside the frame's guard: within the window's swap, a panic still
         // ends in recovery copies and leaves every window its own state.
         let res = crate::windows::as_window(app, target, |app| {
             let mut res = Err("internal error".to_string());
+            // Every control-channel gesture is fenced from the user's system clipboard.
+            let before = app.control_synthetic;
+            app.control_synthetic = true;
             crate::windows::guard(app, ctx, |app| res = handle(app, ctx, &r.method, &r.params));
+            app.control_synthetic = before;
             res
         });
         let _ = r.reply.send(ControlReply { id: r.id, result: res.unwrap_or_else(|| Err(format!("no window {target}"))) });
     }
+    request_paint(app, ctx);
 }
 
-fn save_color_image(img: &egui::ColorImage, path: &str) -> Result<(), String> {
+/// The UI phase's control work: drain completed captures, admit and settle queued screenshots
+/// against this pass's geometry, and run state-only requests for the window drawing now.
+pub fn drain(app: &mut FigApp, ctx: &Context) {
+    let now = app.clock.now();
+    let viewport = ctx.viewport_id();
+    // This pass's geometry defines the epoch: a resize, DPI change or zoom change (back or not)
+    // invalidates captures issued under the old one.
+    let (spec, epoch) = pass_geometry(app, ctx, viewport);
+    expire(app, ctx, now);
+
+    // Drain completed captures first, so their budget is free before new requests are admitted.
+    drain_completed(app, ctx, viewport, now, epoch);
+
+    // Admit queued captures for the window drawing now; other windows keep waiting for their frame.
+    admit_queued(app, ctx, viewport, now);
+
+    // Fill in this pass's geometry, enforce the byte budget (a post-callback check alone would
+    // not bound peak memory), and release anything over it before issuing.
+    enforce_capture_budget(app, viewport, spec);
+
+    // Settle on completed UI frames only, then issue once. (The screenshot command itself forces
+    // the paint that delivers it.) The request's document and window were fixed at admission and
+    // are never rewritten here: a tab switched during settling is an error, not a capture of the
+    // new one.
+    //
+    // `cumulative_frame_nr` counts frames whose final (presented) pass has finished. A frame whose
+    // first pass calls `request_discard` is therefore counted once, after it presents its layout,
+    // not when its discarded sizing pass runs. Passes after the first (`current_pass_index > 0`)
+    // belong to such a frame and never add another count.
+    settle_and_issue(app, ctx, viewport, now, epoch, spec);
+    request_paint(app, ctx);
+}
+
+/// Establish this pass's screenshot geometry and epoch: a resize, DPI change or zoom change (even
+/// back) bumps the epoch captures issued under the old one were admitted against.
+fn pass_geometry(app: &mut FigApp, ctx: &Context, viewport: egui::ViewportId) -> (Option<CaptureSpec>, u64) {
+    let spec = current_spec(ctx, viewport);
+    if let Some(spec) = spec {
+        let changed = app.capture.geometry.get(&viewport).is_none_or(|(old, _)| *old != spec);
+        if changed {
+            app.capture.epoch = app.capture.epoch.wrapping_add(1);
+            app.capture.geometry.insert(viewport, (spec, app.capture.epoch));
+        }
+    }
+    let epoch = app.capture.geometry.get(&viewport).map_or(0, |(_, e)| *e);
+    (spec, epoch)
+}
+
+/// Take the image delivery for the shot at `index`; `None` when no image has arrived yet.
+fn arrived_shot(app: &mut FigApp, index: usize) -> Option<(ShotRequest, Arc<egui::ColorImage>)> {
+    let slot = app.capture.shots.get(index)?.slot.clone()?;
+    let image = slot.take()?;
+    let mut r = app.capture.shots.remove(index);
+    r.release();
+    Some((r, image))
+}
+
+/// Drain images delivered for this viewport: reply, re-queue for a geometry retry, or drop a
+/// cancelled capture. Each viewport drains its own captures: their geometry and document differ.
+fn drain_completed(app: &mut FigApp, ctx: &Context, viewport: egui::ViewportId, now: f64, epoch: u64) {
+    let mut i = 0;
+    while i < app.capture.shots.len() {
+        if app.capture.shots[i].viewport != viewport {
+            i += 1;
+            continue;
+        }
+        let Some((r, image)) = arrived_shot(app, i) else {
+            i += 1;
+            continue;
+        };
+        settle_arrival(app, ctx, viewport, now, epoch, r, &image);
+        ctx.request_repaint();
+    }
+}
+
+/// Whether the pass geometry differs from the one the capture was issued at (even back to an old
+/// size): the pixels cannot be accepted for the admitted surface.
+fn geometry_moved(r: &ShotRequest, current: CaptureSpec, epoch: u64) -> bool {
+    r.epoch != epoch || r.spec.is_none_or(|s| s.size_px != current.size_px || s.pixels_per_point != current.pixels_per_point)
+}
+
+/// The admitted surface is in whole UI points; the readback is in physical pixels. Up to one
+/// pixel of rounding either way is the same surface, not a scale change. The difference is
+/// absolute: an undersized readback is a scale mismatch too.
+fn scale_mismatch(image: &egui::ColorImage, spec: CaptureSpec) -> bool {
+    image.size[0].abs_diff(spec.size_px[0]) > 1 || image.size[1].abs_diff(spec.size_px[1]) > 1
+}
+
+/// Re-queue a capture against the new pass, or hand it back when its retries are exhausted.
+fn requeue_capture(app: &mut FigApp, mut r: ShotRequest, current: CaptureSpec, epoch: u64) -> Option<ShotRequest> {
+    if r.retries >= 2 {
+        return Some(r);
+    }
+    r.retries += 1;
+    r.spec = Some(current);
+    r.epoch = epoch;
+    r.reserved = r.spec.and_then(|s| s.cost()).unwrap_or(0);
+    r.settle = 0;
+    r.settle_frame = None;
+    r.issued = false;
+    app.capture.shots.push(r);
+    None
+}
+
+/// Settle an arrived image: reply with it, retry against the new pass on a geometry/scale change,
+/// or drop it when the transport cancelled or the window/document moved on.
+fn settle_arrival(app: &mut FigApp, ctx: &Context, viewport: egui::ViewportId, now: f64, epoch: u64, mut r: ShotRequest, image: &egui::ColorImage) {
+    let cancelled = r.state.is_cancelled();
+    let current = current_spec(ctx, viewport);
+    let (document, presentation) = app.windows.presentation(&app.session, r.window);
+    if cancelled {
+        // The transport stopped waiting: no reply, no file.
+        return;
+    }
+    if now >= r.deadline {
+        reply(&mut r, Err("the window didn't deliver a screenshot in time (is it visible?)".into()));
+        return;
+    }
+    if r.window != app.windows.current || r.document != document || r.presentation != presentation {
+        reply(&mut r, Err("the document changed while the screenshot was being captured".into()));
+        return;
+    }
+    let Some(current) = current else {
+        // Fail closed: with no representable current geometry the pixels cannot be proven to
+        // belong to the surface that was admitted, so they are never the capture's reply.
+        reply(&mut r, Err("the window's current geometry is unavailable (is it minimised?)".into()));
+        return;
+    };
+    if geometry_moved(&r, current, epoch) {
+        // Geometry moved between issuance and arrival (even back): retry against the new pass,
+        // never accept the old pixels. Document changes are errors above.
+        if let Some(mut r) = requeue_capture(app, r, current, epoch) {
+            reply(&mut r, Err("the window kept changing size while the screenshot was captured".into()));
+        }
+        return;
+    }
+    if let Some(spec) = r.spec
+        && scale_mismatch(image, spec)
+    {
+        if let Some(mut r) = requeue_capture(app, r, current, epoch) {
+            reply(
+                &mut r,
+                Err(format!(
+                    "the screenshot is {}x{} but the window is {}x{} (a scale mismatch)",
+                    image.size[0], image.size[1], spec.size_px[0], spec.size_px[1]
+                )),
+            );
+        }
+        return;
+    }
+    // Encode outside the shared gate: a slow PNG must not hold the transport's timeout. The
+    // fresh clock read and final write happen under the gate, so a timeout that arrives while the
+    // image is being encoded either wins (no file, no reply) or finds the committed reply.
+    let encoded = encode_shot(image, r.path.as_deref());
+    commit_shot(&r.state, &r.id, &r.reply, r.deadline, &app.clock, encoded);
+}
+
+/// Admit queued captures for the window drawing now; other windows keep waiting for their frame.
+fn admit_queued(app: &mut FigApp, ctx: &Context, viewport: egui::ViewportId, now: f64) {
+    for r in std::mem::take(&mut app.control_queue) {
+        route_queued(app, ctx, viewport, now, r);
+    }
+}
+
+/// Route one queued control request: retarget another window, admit a capture, or run a
+/// state-only request for the window drawing now.
+fn route_queued(app: &mut FigApp, ctx: &Context, viewport: egui::ViewportId, now: f64, r: ControlRequest) {
+    if r.is_cancelled() {
+        return;
+    }
+    let target = r.params.get("window").and_then(Value::as_u64).unwrap_or(app.windows.focused);
+    if target != app.windows.current {
+        if app.windows.exists(target) {
+            ctx.request_repaint_of(crate::windows::viewport(target));
+            app.control_queue.push(r);
+        } else {
+            let _ = r.reply.send(ControlReply { id: r.id, result: Err(format!("no window {target}")) });
+        }
+        return;
+    }
+    if r.method == "ui.screenshot" {
+        admit(app, r, target, now);
+        return;
+    }
+    // Every control-channel gesture is fenced from the user's system clipboard (the flag is
+    // restored so a batch already in a frame's raw input keeps its own provenance).
+    let before = app.control_synthetic;
+    app.control_synthetic = true;
+    let res = handle(app, ctx, &r.method, &r.params);
+    app.control_synthetic = before;
+    if r.method == "ui.input" && std::mem::take(&mut app.control_input_queued) {
+        // Acknowledge once the pass that applies the batch is presented, never from a sizing
+        // pass whose input is thrown away.
+        app.input_acks.push(crate::PendingAck { viewport, tx: r.reply, reply: ControlReply { id: r.id, result: res } });
+    } else {
+        let _ = r.reply.send(ControlReply { id: r.id, result: res });
+    }
+    ctx.request_repaint();
+}
+
+/// Reserve this request's actual surface against the capture budget; `true` when it must be
+/// removed for exceeding it.
+fn reserve_for_spec(r: &mut ShotRequest, spec: Option<CaptureSpec>, total: usize) -> bool {
+    if !r.issued && r.spec != spec {
+        // A request can resize during its settling frames. Reserve and validate this
+        // actual surface before issuance, never the old (possibly much smaller) one.
+        r.spec = spec;
+        r.settle = 0;
+        r.settle_frame = None;
+        if spec.is_none() {
+            r.reserved = 0;
+        }
+    }
+    let Some(spec) = r.spec else { return false };
+    let raw = spec.bytes().unwrap_or(usize::MAX);
+    let cost = spec.cost().unwrap_or(usize::MAX);
+    if raw > MAX_SHOT_IMAGE_BYTES || total.saturating_sub(r.reserved).saturating_add(cost) > MAX_SHOT_TOTAL_BYTES {
+        reply(r, Err(format!("the screenshot needs {cost} bytes, over the capture budget")));
+        return true;
+    }
+    if r.reserved != cost {
+        r.reserved = cost;
+    }
+    false
+}
+
+/// Fill in this pass's geometry and enforce the byte budget (a post-callback check alone would
+/// not bound peak memory), releasing anything over it before issuing.
+fn enforce_capture_budget(app: &mut FigApp, viewport: egui::ViewportId, spec: Option<CaptureSpec>) {
+    let mut i = 0;
+    while i < app.capture.shots.len() {
+        let total: usize = app.capture.shots.iter().map(|s| s.reserved).sum();
+        let remove = {
+            let r = &mut app.capture.shots[i];
+            if r.viewport != viewport {
+                i += 1;
+                continue;
+            }
+            reserve_for_spec(r, spec, total)
+        };
+        if remove {
+            let mut r = app.capture.shots.remove(i);
+            r.release();
+        } else {
+            i += 1;
+        }
+    }
+}
+
+/// Count one completed frame into the capture's settling, reporting whether it may now be issued.
+fn settled_for_issue(r: &mut ShotRequest, frame_nr: u64) -> bool {
+    match r.settle_frame {
+        None => {
+            // Anchor the count at the first pass that sees this request's geometry; this
+            // frame has not completed yet.
+            r.settle_frame = Some(frame_nr);
+            false
+        }
+        Some(seen) if frame_nr > seen => {
+            r.settle_frame = Some(frame_nr);
+            r.settle = r.settle.saturating_add(1);
+            r.settle >= SHOT_SETTLE_PASSES
+        }
+        _ => false,
+    }
+}
+
+/// Settle on completed UI frames only, then issue once (against this pass's surface).
+fn settle_and_issue(app: &mut FigApp, ctx: &Context, viewport: egui::ViewportId, now: f64, epoch: u64, spec: Option<CaptureSpec>) {
+    let first_pass = ctx.current_pass_index() == 0;
+    let frame_nr = ctx.cumulative_frame_nr_for(viewport);
+    for r in &mut app.capture.shots {
+        if !first_pass || r.viewport != viewport || r.issued || r.spec.is_none() {
+            continue;
+        }
+        if r.state.is_cancelled() || now >= r.deadline {
+            continue;
+        }
+        if !settled_for_issue(r, frame_nr) {
+            continue;
+        }
+        let slot = CaptureSlot::new(ctx, viewport);
+        r.slot = Some(slot.clone());
+        r.epoch = epoch;
+        // Issued against this pass's surface: the size the readback is expected at.
+        if let Some(spec) = spec {
+            r.spec = Some(spec);
+        }
+        r.issued = true;
+        ctx.send_viewport_cmd_to(viewport, egui::ViewportCommand::Screenshot(CaptureSlot::callback(&slot)));
+    }
+}
+
+/// An encoded screenshot that has not been written or returned yet. Encoding is the expensive
+/// part, so it is done before the request's shared commit gate is taken.
+enum EncodedShot {
+    /// The PNG for a `path` request; writing it is part of the final commit.
+    File { path: String, png: Vec<u8>, width: usize, height: usize },
+    /// The complete base64 reply for a request without a path.
+    Data(Value),
+}
+
+impl EncodedShot {
+    /// Deliver the encoded shot: for `File`, write the PNG through `file_access` and return its
+    /// path and dimensions; for `Data`, return the prebuilt result.
+    fn finish(self) -> Result<Value, String> {
+        match self {
+            Self::File { path, png, width, height } => {
+                figcraft_engine::file_access::write(&path, &png).map_err(|e| e.to_string())?;
+                Ok(json!({"path": path, "width": width, "height": height}))
+            }
+            Self::Data(result) => Ok(result),
+        }
+    }
+}
+
+/// A screenshot's reply: the PNG written to `path` (through the automation roots, when the app
+/// has them), or returned as base64 `data`. Control requests split this into [`encode_shot`] and
+/// [`commit_shot`]; encoding and automation-root tests use the whole operation.
+#[cfg(test)]
+fn shot_reply(img: &egui::ColorImage, path: Option<&str>) -> Result<Value, String> {
+    encode_shot(img, path)?.finish()
+}
+
+/// Encode the straight-alpha PNG and the data reply. No request gate is held here.
+fn encode_shot(img: &egui::ColorImage, path: Option<&str>) -> Result<EncodedShot, String> {
     let [w, h] = img.size;
-    let mut rgba = Vec::with_capacity(w * h * 4);
+    let raw = w.checked_mul(h).and_then(|n| n.checked_mul(4)).ok_or("bad screenshot size")?;
+    if raw > MAX_SHOT_IMAGE_BYTES {
+        return Err(format!("the screenshot is {raw} bytes, over the capture budget"));
+    }
+    let mut rgba = Vec::with_capacity(raw);
     for p in &img.pixels {
         rgba.extend_from_slice(&p.to_srgba_unmultiplied());
     }
     let buf = image::RgbaImage::from_raw(w as u32, h as u32, rgba).ok_or("bad screenshot buffer")?;
-    buf.save(path).map_err(|e| e.to_string())
+    let mut png = std::io::Cursor::new(Vec::new());
+    buf.write_to(&mut png, image::ImageFormat::Png).map_err(|e| e.to_string())?;
+    // The encoder copy is not needed once the PNG exists. Drop it before the (possibly bigger)
+    // base64 reply is built so the peak is the larger phase accounted by `CaptureSpec::cost`,
+    // not the sum of all four buffers.
+    drop(buf);
+    let png = png.into_inner();
+    match path {
+        Some(path) => Ok(EncodedShot::File { path: path.to_string(), png, width: w, height: h }),
+        None => {
+            if png.len() > MAX_SHOT_REPLY_BYTES {
+                // Refuse before the base64 string (4/3 of the PNG) is allocated.
+                return Err(format!("the encoded screenshot is {} bytes, over the reply budget", png.len()));
+            }
+            use base64::Engine as _;
+            Ok(EncodedShot::Data(json!({"format": "png", "width": w, "height": h, "data": base64::engine::general_purpose::STANDARD.encode(&png)})))
+        }
+    }
+}
+
+/// Commit an encoded screenshot's file and reply while holding the request's shared gate. The
+/// cancellation and a fresh deadline are rechecked under the gate: if the transport gave up while
+/// the image was being encoded, no file is written; a commit that gets there first queues its
+/// reply before the timeout can mark the request cancelled.
+fn commit_shot(
+    gate: &RequestGate,
+    id: &Value,
+    reply: &std::sync::mpsc::Sender<ControlReply>,
+    deadline: f64,
+    clock: &crate::FrameClock,
+    encoded: Result<EncodedShot, String>,
+) -> bool {
+    gate.commit(|| {
+        // Read the clock after the gate is held: a request whose deadline passed while it waited
+        // for the gate must not write its file.
+        let result = if clock.now() < deadline {
+            encoded.and_then(EncodedShot::finish)
+        } else {
+            Err("the window didn't deliver a screenshot in time (is it visible?)".into())
+        };
+        // Enqueue before the gate is released and before `Replied` is visible to the transport.
+        let _ = reply.send(ControlReply { id: id.clone(), result });
+    })
+    .is_some()
 }
 
 /// A controller button given as its standard-layout index, its key trigger name ("Gamepad A") or
@@ -212,10 +930,16 @@ pub fn handle(app: &mut FigApp, ctx: &Context, method: &str, p: &Value) -> Resul
         "engine.execute" => {
             let cmd = p.get("command").and_then(Value::as_str).ok_or("`command` required")?;
             let params = p.get("params").cloned().unwrap_or(json!({}));
+            let layers_generation = app.session.clipboard.layers_generation;
             let r = app.session.execute(cmd, &params).map_err(|e| e.to_string());
+            app.clear_comment_draft_after_tool_set(cmd, r.is_ok());
+            app.invalidate_synthetic_copy(layers_generation);
             // Programmatic calls never open dialogs.
             app.session.ui_requests.retain(|u| !u.kind.starts_with("dialog."));
             app.handle_ui_requests();
+            // A programmatic `doc.switch` changes the presented file just like a tab click: the
+            // capture generation must see it even though this path bypasses `FigApp::run`.
+            app.observe_presentation();
             r
         }
         "engine.commands" => Ok(Value::Array(
@@ -225,7 +949,7 @@ pub fn handle(app: &mut FigApp, ctx: &Context, method: &str, p: &Value) -> Resul
                 .collect(),
         )),
         "document.inspect" => {
-            let depth = p.get("depth").and_then(Value::as_u64).unwrap_or(8) as usize;
+            let depth = p.get("depth").and_then(Value::as_u64).unwrap_or(8).min(64) as usize;
             Ok(figcraft_engine::inspect::document(&app.session, depth, b(p, "allPages")))
         }
         "node.get" => {
@@ -293,8 +1017,9 @@ pub fn handle(app: &mut FigApp, ctx: &Context, method: &str, p: &Value) -> Resul
                     app.session.execute(cmd, &params).map_err(|e| e.to_string())
                 }
                 _ => {
-                    // Number keys: opacity (two in quick succession make an exact percentage).
-                    let now = ctx.input(|i| i.time);
+                    // Number keys: opacity (two in quick succession make an exact percentage). A
+                    // hidden window's logic tick has a stale `ctx.input(i.time)`.
+                    let now = app.clock.now();
                     match egui::Key::from_name(name) {
                         Some(k) if m.is_none() && crate::shortcuts::opacity_digit(app, k, now) => Ok(json!({"opacity": true})),
                         _ => Err(format!("no shortcut `{key}`")),
@@ -309,7 +1034,8 @@ pub fn handle(app: &mut FigApp, ctx: &Context, method: &str, p: &Value) -> Resul
                 .ok_or("`events` required: [{move|down|up: [x, y]} | {key, shift?, alt?, cmd?} | {text} | {leave: true}]")?;
             let pos = |v: &Value| -> Option<egui::Pos2> {
                 let a = v.as_array()?;
-                Some(egui::pos2(a.first()?.as_f64()? as f32, a.get(1)?.as_f64()? as f32))
+                let p = egui::pos2(a.first()?.as_f64()? as f32, a.get(1)?.as_f64()? as f32);
+                p.is_finite().then_some(p)
             };
             let mut events = Vec::new();
             let mut pads = Vec::new();
@@ -339,6 +1065,7 @@ pub fn handle(app: &mut FigApp, ctx: &Context, method: &str, p: &Value) -> Resul
                     // Content moves by `d` points (negative y scrolls down, like a wheel turned towards you).
                     events.push(egui::Event::MouseWheel {
                         unit: egui::MouseWheelUnit::Point,
+                        source: egui::MouseWheelSource::Wheel,
                         delta: d.to_vec2(),
                         phase: egui::TouchPhase::Move,
                         modifiers: mods,
@@ -369,7 +1096,7 @@ pub fn handle(app: &mut FigApp, ctx: &Context, method: &str, p: &Value) -> Resul
                     (None, None) => return Err("controller buttons go to a prototype that is playing: run proto.present or proto.preview".into()),
                 }
             }
-            app.control_input.extend(events);
+            app.control_input_queued = app.push_control_input(events);
             ctx.request_repaint();
             Ok(json!({"queued": list.len().min(256)}))
         }
@@ -403,6 +1130,9 @@ pub fn handle(app: &mut FigApp, ctx: &Context, method: &str, p: &Value) -> Resul
             if let Some(section) = p.get("homeSection").and_then(Value::as_str).and_then(crate::home::Section::parse) {
                 app.ui.home_view.section = section;
             }
+            if let Some(query) = p.get("homeSearch").and_then(Value::as_str) {
+                app.ui.home_view.file_query = query.chars().take(256).collect();
+            }
             if let Some(view) = p.get("homeRecentsView").and_then(Value::as_str).and_then(crate::home_recents::View::parse) {
                 view.store(&mut app.session.prefs);
             }
@@ -414,7 +1144,7 @@ pub fn handle(app: &mut FigApp, ctx: &Context, method: &str, p: &Value) -> Resul
                 crate::home_recents::Sort { descending: order == "desc", ..sort }.store(&mut app.session.prefs);
             }
             if let Some(h) = p.get("palette").and_then(Value::as_bool) {
-                app.ui.palette = if h { Some(String::new()) } else { None };
+                crate::menus::set_palette(&mut app.ui, h);
             }
             // true / false, or a top-level menu to open it at ("Plugins").
             match p.get("mainMenu") {
@@ -603,12 +1333,16 @@ pub fn handle(app: &mut FigApp, ctx: &Context, method: &str, p: &Value) -> Resul
             if let Some(v) = p.get("exportPreview").and_then(Value::as_bool) {
                 app.ui.export_thumb = v;
             }
-            // Dev Mode's compare view: a ready-for-dev frame or section opens it, null closes it;
+            // Dev Mode's compare view: a frame or section opens it, null closes it; `devCompareVersion`
+            // the saved version it compares with (null: when it was marked ready for dev),
             // `devCompareMode` is sideBySide or overlay, `devCompareSplit` the overlay slider (0–1).
             if let Some(v) = p.get("devCompare") {
-                app.ui.dev.compare = figcraft_engine::params::id_of(v).map(crate::dev_compare::CompareView::new);
+                app.ui.dev.compare = figcraft_engine::params::id_of(v).map(|id| crate::dev_compare::CompareView::new(id, None));
             }
             if let Some(c) = app.ui.dev.compare.as_mut() {
+                if let Some(v) = p.get("devCompareVersion") {
+                    c.version = v.as_str().map(str::to_string);
+                }
                 match p.get("devCompareMode").and_then(Value::as_str) {
                     Some("overlay") => c.mode = crate::dev_compare::Mode::Overlay,
                     Some("sideBySide") => c.mode = crate::dev_compare::Mode::SideBySide,
@@ -644,11 +1378,13 @@ pub fn handle(app: &mut FigApp, ctx: &Context, method: &str, p: &Value) -> Resul
             Ok(app.inspect())
         }
         "ui.render" => {
-            let path = p.get("path").and_then(Value::as_str).ok_or("`path` required")?;
             let scale = p.get("scale").and_then(Value::as_f64).unwrap_or(1.0);
             let ids: Vec<figcraft_doc::NodeId> =
                 p.get("ids").and_then(Value::as_array).map(|a| a.iter().filter_map(figcraft_engine::params::id_of).collect()).unwrap_or_default();
-            let mut params = json!({"format": "png", "scale": scale, "path": path});
+            let mut params = json!({"format": "png", "scale": scale});
+            if let Some(path) = p.get("path").and_then(Value::as_str) {
+                params["path"] = json!(path);
+            }
             if !ids.is_empty() {
                 params["ids"] = json!(ids);
             }
@@ -723,3 +1459,9 @@ fn pointer(app: &mut FigApp, p: &Value) -> Result<Value, String> {
     app.handle_ui_requests();
     Ok(json!({"selection": app.session.selection(), "tool": app.session.tool.tool.id()}))
 }
+
+#[cfg(test)]
+mod roots_tests;
+
+#[cfg(test)]
+mod capture_tests;
diff --git a/crates/ui-egui/src/control/capture_tests.rs b/crates/ui-egui/src/control/capture_tests.rs
new file mode 100644
index 00000000..6068ce52
--- /dev/null
+++ b/crates/ui-egui/src/control/capture_tests.rs
@@ -0,0 +1,657 @@
+//! Screenshot capture (the local completion-slot adapter): per-request identity and reverse
+//! completion, cancellation/late delivery, budget admission, straight-alpha round-trips and zero
+//! retained bytes after draining. Driven headless through the real UI pass, so geometry comes from
+//! the frame that issues the capture, not from a stale logic tick.
+
+use std::sync::Arc;
+
+use figcraft_doc::NodeId;
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::control::{CaptureSpec, ControlReply, ControlRequest};
+use crate::layers_drag_tests::Ui;
+
+/// Queue a `ui.screenshot` request in the test app and return its reply receiver.
+fn push(u: &mut Ui, id: u64, params: serde_json::Value) -> std::sync::mpsc::Receiver<ControlReply> {
+    let (tx, rx) = std::sync::mpsc::channel();
+    u.app.control_queue.push(ControlRequest { id: json!(id), method: "ui.screenshot".into(), params, reply: tx, state: Default::default() });
+    rx
+}
+
+/// Run UI passes until every admitted capture has been issued (settled on real UI passes).
+fn settle_to_issue(u: &mut Ui, n: usize) {
+    for _ in 0..12 {
+        u.frame(vec![]);
+        if u.app.capture.shots.len() == n && u.app.capture.shots.iter().all(|r| r.issued) {
+            return;
+        }
+    }
+    panic!("{n} captures were not issued: {} admitted", u.app.capture.shots.len());
+}
+
+/// A real changed viewport size, without allocating a readback image of that size.
+fn resized_frame(u: &mut Ui, size: egui::Vec2) -> egui::FullOutput {
+    let input = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, size)), ..Default::default() };
+    let app = &mut u.app;
+    let mut out = u.ctx.run_ui(input, |ui| app.ui(ui));
+    out.textures_delta.clear();
+    out
+}
+
+/// Whether any viewport in the frame output issues a `Screenshot` command.
+fn has_screenshot(out: &egui::FullOutput) -> bool {
+    out.viewport_output.values().any(|v| v.commands.iter().any(|c| matches!(c, egui::ViewportCommand::Screenshot(_))))
+}
+
+/// Asserts reverse capture completion replies only to the matching request, then drains both
+/// requests.
+#[test]
+fn two_captures_correlate_by_request_across_reverse_completion() {
+    let mut u = Ui::new(Session::empty());
+    let first = push(&mut u, 1, json!({}));
+    let second = push(&mut u, 2, json!({}));
+    settle_to_issue(&mut u, 2);
+    let [a, b] = [0, 1].map(|i| u.app.capture.shots[i].spec.expect("geometry"));
+    assert_eq!(a.viewport, b.viewport);
+    assert!(a.size_px[0] > 0 && a.size_px[1] > 0);
+    // The second capture arrives first; only its own request is completed.
+    let slot_b = u.app.capture.shots[1].slot.clone().expect("issued");
+    slot_b.complete(Arc::new(egui::ColorImage::filled(b.size_px, egui::Color32::GREEN)));
+    u.frame(vec![]);
+    let got = second.try_recv().expect("the second capture's reply");
+    assert_eq!(got.id, json!(2));
+    assert!(first.try_recv().is_err(), "the first is still in flight");
+    assert_eq!(u.app.capture.shots.len(), 1);
+    let slot_a = u.app.capture.shots[0].slot.clone().expect("issued");
+    slot_a.complete(Arc::new(egui::ColorImage::filled(a.size_px, egui::Color32::RED)));
+    u.frame(vec![]);
+    let got = first.try_recv().expect("the first capture's reply");
+    assert_eq!(got.id, json!(1));
+    assert!(u.app.capture.shots.is_empty(), "no retained requests");
+}
+
+/// Asserts a cancelled capture gets no reply and its slot is released.
+#[test]
+fn a_cancelled_capture_never_replies_or_writes() {
+    let mut u = Ui::new(Session::empty());
+    let rx = push(&mut u, 3, json!({}));
+    settle_to_issue(&mut u, 1);
+    let spec = u.app.capture.shots[0].spec.expect("geometry");
+    let slot = u.app.capture.shots[0].slot.clone().expect("issued");
+    u.app.capture.shots[0].state.cancel_if_open();
+    slot.complete(Arc::new(egui::ColorImage::filled(spec.size_px, egui::Color32::BLUE)));
+    u.frame(vec![]);
+    assert!(rx.try_recv().is_err(), "a cancelled transport gets no reply");
+    assert!(u.app.capture.shots.is_empty(), "the slot is released");
+}
+
+/// A unique directory for a commit test; the caller removes it.
+fn commit_dir(tag: &str) -> std::path::PathBuf {
+    let dir = std::env::temp_dir().join(format!("figcraft-capture-commit-{tag}-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).expect("temp dir");
+    dir
+}
+
+/// Asserts cancellation after encoding still prevents the final file write and reply.
+#[test]
+fn a_cancellation_after_encoding_prevents_the_final_write() {
+    let dir = commit_dir("cancelled");
+    let path = dir.join("shot.png");
+    let gate = crate::control::RequestGate::new();
+    let (tx, rx) = std::sync::mpsc::channel();
+    let clock = crate::FrameClock::default();
+    let img = egui::ColorImage::filled([2, 2], egui::Color32::RED);
+    // Encoding is complete before the transport cancels: the final gate must still refuse the file.
+    let encoded = super::encode_shot(&img, Some(path.to_str().expect("utf-8 path"))).expect("encoded");
+    assert!(!path.exists(), "encoding alone does not write");
+    assert_eq!(gate.cancel_if_open(), crate::control::RequestState::Cancelled);
+    assert!(!super::commit_shot(&gate, &json!(40), &tx, 100.0, &clock, Ok(encoded)), "a cancelled request does not commit");
+    assert!(!path.exists(), "the cancellation landed before the final write");
+    assert!(rx.try_recv().is_err(), "a cancelled transport gets no reply");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// Asserts a capture that arrives past its deadline reports a timeout and writes no PNG.
+#[test]
+fn a_real_arrival_that_crosses_the_deadline_does_not_write_its_png() {
+    let mut u = Ui::new(Session::empty());
+    let dir = commit_dir("settle-expired");
+    let path = dir.join("shot.png");
+    let rx = push(&mut u, 60, json!({"path": path.to_string_lossy()}));
+    settle_to_issue(&mut u, 1);
+    let spec = u.app.capture.shots[0].spec.expect("geometry");
+    let slot = u.app.capture.shots[0].slot.clone().expect("issued");
+    let deadline = u.app.capture.shots[0].deadline;
+    let epoch = u.app.capture.shots[0].epoch;
+    slot.complete(Arc::new(egui::ColorImage::filled(spec.size_px, egui::Color32::RED)));
+    // A frame's saved time may precede encoding; the final write must use a fresh clock.
+    let stale_now = u.app.clock.now();
+    u.app.clock.set_test_now(Some(deadline + 1.0));
+    super::drain_completed(&mut u.app, &u.ctx, egui::ViewportId::ROOT, stale_now, epoch);
+    let reply = rx.try_recv().expect("the late commit reports a timeout");
+    assert!(reply.result.unwrap_err().contains("didn't deliver"));
+    assert!(!path.exists(), "the final deadline check must precede the PNG write");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// Asserts an expiry during encoding reports the timeout under the gate, marks the request
+/// replied and writes no file.
+#[test]
+fn an_expiry_during_encoding_prevents_the_final_write_and_reports_timeout() {
+    let dir = commit_dir("expired");
+    let path = dir.join("shot.png");
+    let gate = crate::control::RequestGate::new();
+    let (tx, rx) = std::sync::mpsc::channel();
+    let mut clock = crate::FrameClock::default();
+    clock.set_test_now(Some(5.0));
+    let img = egui::ColorImage::filled([2, 2], egui::Color32::RED);
+    let encoded = super::encode_shot(&img, Some(path.to_str().expect("utf-8 path"))).expect("encoded");
+    // The gate is open, but the fresh clock read under it is already at the deadline.
+    assert!(super::commit_shot(&gate, &json!(41), &tx, 5.0, &clock, Ok(encoded)), "the open request is settled once");
+    let reply = rx.try_recv().expect("a timeout reply");
+    assert_eq!(reply.id, json!(41));
+    assert!(reply.result.unwrap_err().contains("didn't deliver"), "the late commit reports the same timeout");
+    assert!(!path.exists(), "an expired request never writes its file");
+    assert!(gate.is_replied(), "the timeout reply was committed under the gate");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// Asserts a commit before the deadline writes the file and queues one reply, and a second
+/// commit is refused.
+#[test]
+fn a_commit_before_the_deadline_writes_and_queues_its_reply_once() {
+    let dir = commit_dir("committed");
+    let path = dir.join("shot.png");
+    let gate = crate::control::RequestGate::new();
+    let (tx, rx) = std::sync::mpsc::channel();
+    let mut clock = crate::FrameClock::default();
+    clock.set_test_now(Some(1.0));
+    let img = egui::ColorImage::filled([2, 2], egui::Color32::GREEN);
+    let encoded = super::encode_shot(&img, Some(path.to_str().expect("utf-8 path"))).expect("encoded");
+    assert!(super::commit_shot(&gate, &json!(42), &tx, 10.0, &clock, Ok(encoded)), "an open request commits");
+    let reply = rx.try_recv().expect("the committed reply");
+    assert_eq!(reply.id, json!(42));
+    assert_eq!(reply.result.expect("written")["path"], json!(path.to_string_lossy()));
+    assert!(path.is_file(), "the file is written under the gate");
+    assert!(gate.is_replied(), "a timeout now consumes the committed reply");
+    // A second commit is refused: the gate is no longer open.
+    let again = super::encode_shot(&img, Some(path.to_str().expect("utf-8 path"))).expect("encoded");
+    assert!(!super::commit_shot(&gate, &json!(43), &tx, 10.0, &clock, Ok(again)));
+    assert!(rx.try_recv().is_err(), "no duplicate reply");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// Asserts a capture past its deadline sends one timeout reply, releases its slot, and late
+/// pixels are ignored.
+#[test]
+fn a_capture_after_its_deadline_replies_once_and_late_pixels_are_inert() {
+    let mut u = Ui::new(Session::empty());
+    let rx = push(&mut u, 4, json!({}));
+    settle_to_issue(&mut u, 1);
+    let spec = u.app.capture.shots[0].spec.expect("geometry");
+    let slot = u.app.capture.shots[0].slot.clone().expect("issued");
+    u.advance_clock(crate::control::SHOT_TIMEOUT + 1.0);
+    u.frame(vec![]);
+    let reply = rx.try_recv().expect("timed out");
+    assert_eq!(reply.id, json!(4));
+    assert!(reply.result.unwrap_err().contains("didn't deliver"), "one timeout reply");
+    assert!(u.app.capture.shots.is_empty(), "released");
+    // The renderer finishing afterwards finds a closed slot: no reply, no write, no panic.
+    slot.complete(Arc::new(egui::ColorImage::filled(spec.size_px, egui::Color32::RED)));
+    u.frame(vec![]);
+    assert!(rx.try_recv().is_err(), "a late capture is inert");
+}
+
+/// Asserts the snapshot count budget rejects an over-budget request before issuing, and every
+/// admitted capture still completes under its own id.
+#[test]
+fn a_snapshot_batch_is_capped_before_issuing_over_the_count_budget() {
+    let mut u = Ui::new(Session::empty());
+    let mut rxs: Vec<_> = (0..crate::control::MAX_SHOTS as u64).map(|i| push(&mut u, 10 + i, json!({}))).collect();
+    settle_to_issue(&mut u, crate::control::MAX_SHOTS);
+    let over = push(&mut u, 99, json!({}));
+    u.frame(vec![]);
+    let reply = over.try_recv().expect("rejected at admission");
+    assert!(reply.result.unwrap_err().contains("too many screenshots"), "budget error");
+    assert_eq!(u.app.capture.shots.len(), crate::control::MAX_SHOTS);
+    // Every admitted capture still completes with its own identity. Each drain removes its
+    // request, so always complete the first remaining one: the vector shifts under the loop.
+    for (i, rx) in rxs.iter_mut().enumerate() {
+        let spec = u.app.capture.shots.first().expect("one left").spec.expect("geometry");
+        let slot = u.app.capture.shots.first().and_then(|r| r.slot.clone()).expect("issued");
+        slot.complete(Arc::new(egui::ColorImage::filled(spec.size_px, egui::Color32::RED)));
+        u.frame(vec![]);
+        assert_eq!(rx.try_recv().expect("answered").id, json!(10 + i as u64), "request {i} keeps its identity");
+    }
+    rxs.clear();
+}
+
+/// Asserts an undersized readback is not accepted but reissued with one retry and no reply.
+#[test]
+fn an_undersized_readback_is_reissued_instead_of_accepted() {
+    let mut u = Ui::new(Session::empty());
+    let rx = push(&mut u, 30, json!({}));
+    settle_to_issue(&mut u, 1);
+    let spec = u.app.capture.shots[0].spec.expect("geometry");
+    let slot = u.app.capture.shots[0].slot.clone().expect("issued");
+    assert!(spec.size_px[0] > 2, "room for a two-pixel undersized readback");
+    // Smaller by two pixels on one axis: a scale mismatch, not the admitted surface.
+    slot.complete(Arc::new(egui::ColorImage::filled([spec.size_px[0] - 2, spec.size_px[1]], egui::Color32::RED)));
+    u.frame(vec![]);
+    assert!(rx.try_recv().is_err(), "the undersized pixels are not accepted");
+    let r = u.app.capture.shots.first().expect("reissued");
+    assert_eq!(r.retries, 1, "one retry, not an error");
+    assert!(!r.issued, "waits for the settled geometry again");
+}
+
+/// Asserts a one-pixel rounding difference is accepted as the same surface.
+#[test]
+fn a_one_pixel_rounding_difference_is_still_the_same_surface() {
+    let mut u = Ui::new(Session::empty());
+    let rx = push(&mut u, 31, json!({}));
+    settle_to_issue(&mut u, 1);
+    let spec = u.app.capture.shots[0].spec.expect("geometry");
+    let slot = u.app.capture.shots[0].slot.clone().expect("issued");
+    slot.complete(Arc::new(egui::ColorImage::filled([spec.size_px[0] - 1, spec.size_px[1] + 1], egui::Color32::RED)));
+    u.frame(vec![]);
+    let reply = rx.try_recv().expect("a pixel of rounding is accepted");
+    assert_eq!(reply.id, json!(31));
+    assert!(reply.result.is_ok());
+    assert!(u.app.capture.shots.is_empty(), "released");
+}
+
+/// Asserts an A→B→A tab switch invalidates the admitted capture with "document changed".
+#[test]
+fn a_document_a_to_b_to_a_switch_is_not_the_admitted_capture() {
+    let mut s = Session::empty();
+    s.execute("file.new", &json!({"name": "A"})).unwrap();
+    s.execute("file.new", &json!({"name": "B"})).unwrap();
+    let (a, b) = (s.docs.iter().position(|d| d.doc.name == "A").expect("file A"), s.docs.iter().position(|d| d.doc.name == "B").expect("file B"));
+    let mut u = Ui::new(s);
+    u.app.session.active = a;
+    let rx = push(&mut u, 32, json!({}));
+    settle_to_issue(&mut u, 1);
+    let spec = u.app.capture.shots[0].spec.expect("geometry");
+    let slot = u.app.capture.shots[0].slot.clone().expect("issued");
+    // A→B→A before the callback is drained: the final UID is A again, but its pixels were never
+    // what this capture asked for.
+    assert!(u.app.run("doc.switch", json!({"index": b})).is_some());
+    assert!(u.app.run("doc.switch", json!({"index": a})).is_some());
+    slot.complete(Arc::new(egui::ColorImage::filled(spec.size_px, egui::Color32::RED)));
+    u.frame(vec![]);
+    let reply = rx.try_recv().expect("answered");
+    assert!(reply.result.unwrap_err().contains("document changed"), "the A→B→A switch invalidates the capture");
+    assert!(u.app.capture.shots.is_empty(), "released");
+}
+
+/// Asserts a geometry change bumps the capture epoch and reissues instead of accepting old
+/// pixels.
+#[test]
+fn a_geometry_change_reissues_instead_of_accepting_old_pixels() {
+    let mut u = Ui::new(Session::empty());
+    let rx = push(&mut u, 5, json!({}));
+    settle_to_issue(&mut u, 1);
+    let old = u.app.capture.shots[0].spec.expect("geometry");
+    let slot = u.app.capture.shots[0].slot.clone().expect("issued");
+    // A resize between issuance and arrival bumps the epoch.
+    u.app
+        .capture
+        .geometry
+        .insert(egui::ViewportId::ROOT, (CaptureSpec { size_px: [old.size_px[0] + 1, old.size_px[1]], ..old }, u.app.capture.epoch.wrapping_add(1)));
+    slot.complete(Arc::new(egui::ColorImage::filled(old.size_px, egui::Color32::RED)));
+    u.frame(vec![]);
+    assert!(rx.try_recv().is_err(), "the old pixels are not accepted");
+    let r = u.app.capture.shots.first().expect("reissued");
+    assert_eq!(r.retries, 1, "one retry, not an error");
+    assert!(!r.issued, "waits for the settled geometry again");
+}
+
+/// Asserts a translucent pixel round-trips through the PNG as straight RGBA without
+/// darkening.
+#[test]
+fn a_translucent_pixel_round_trips_straight_rgba() {
+    let img = egui::ColorImage::from_rgba_unmultiplied([1, 1], &[128, 64, 32, 128]);
+    let reply = super::shot_reply(&img, None).expect("encoded");
+    use base64::Engine as _;
+    let png = base64::engine::general_purpose::STANDARD.decode(reply["data"].as_str().expect("data")).expect("base64");
+    let decoded = image::load_from_memory(&png).expect("png").to_rgba8();
+    assert_eq!(decoded.get_pixel(0, 0).0, [128, 64, 32, 128], "straight alpha is not darkened");
+}
+
+/// Asserts a capture is not issued before three completed real UI frames; the following
+/// completed frame issues it.
+#[test]
+fn a_capture_is_not_issued_before_three_completed_real_ui_frames() {
+    let mut u = Ui::new(Session::empty());
+    let _rx = push(&mut u, 6, json!({}));
+    u.frame(vec![]);
+    assert_eq!(u.app.capture.shots.len(), 1, "admitted");
+    assert!(!u.app.capture.shots[0].issued, "not on the frame that anchors the count");
+    u.frame(vec![]);
+    assert!(!u.app.capture.shots[0].issued, "not on the second frame");
+    u.frame(vec![]);
+    assert!(!u.app.capture.shots[0].issued, "the third frame has not completed when its pass 0 runs");
+    u.frame(vec![]);
+    assert!(u.app.capture.shots[0].issued, "issued once three frames have presented their layout");
+}
+
+/// Asserts a discarded sizing pass does not count toward capture settling, and the next
+/// completed frame issues it.
+#[test]
+fn a_discarded_sizing_pass_does_not_count_as_a_settled_capture_frame() {
+    let mut u = Ui::new(Session::empty());
+    let _rx = push(&mut u, 33, json!({}));
+    // Each `frame_raw_with_discard` presents a layout after rerunning a discarded first pass.
+    // Only that completed frame counts; the discarded pass must not make the capture look settled.
+    u.frame_raw_with_discard(egui::RawInput::default());
+    u.frame_raw_with_discard(egui::RawInput::default());
+    u.frame_raw_with_discard(egui::RawInput::default());
+    assert!(!u.app.capture.shots[0].issued, "three multipass frames present only two prior layouts here; the third pass 0 is not settled");
+    u.frame(vec![]);
+    assert!(u.app.capture.shots[0].issued, "the next completed frame issues the capture");
+}
+
+/// Asserts pixels delivered while hidden force a draining paint and are answered rather than
+/// timed out.
+#[test]
+fn a_hidden_window_that_delivers_pixels_is_asked_to_paint_the_draining_pass() {
+    let mut u = Ui::new(Session::empty());
+    let rx = push(&mut u, 7, json!({}));
+    settle_to_issue(&mut u, 1);
+    let spec = u.app.capture.shots[0].spec.expect("geometry");
+    let slot = u.app.capture.shots[0].slot.clone().expect("issued");
+    // The renderer completes the readback while the window is hidden; the screenshot command that
+    // produced it is drained, so without a new forced paint the request would only time out.
+    slot.complete(Arc::new(egui::ColorImage::filled(spec.size_px, egui::Color32::RED)));
+    let mut input = egui::RawInput::default();
+    input.viewports.insert(egui::ViewportId::ROOT, egui::ViewportInfo { minimized: Some(true), ..Default::default() });
+    let ctx = u.ctx.clone();
+    let out = ctx.run_logic(&input, |ctx| crate::control::background(&mut u.app, ctx));
+    let asked = out
+        .viewport_commands
+        .get(&egui::ViewportId::ROOT)
+        .is_some_and(|cmds| cmds.iter().any(|c| matches!(c, egui::ViewportCommand::RequestPaintWhileHidden)));
+    assert!(asked, "the completed pixels keep the hidden window painting");
+    // The forced paint drains the slot; the deadline is untouched.
+    u.frame(vec![]);
+    let reply = rx.try_recv().expect("the completed capture is answered, not timed out");
+    assert_eq!(reply.id, json!(7));
+    assert!(reply.result.unwrap()["width"].as_u64().is_some(), "written or returned");
+    assert!(u.app.capture.shots.is_empty(), "released");
+}
+
+/// Asserts a capture for a window with unknown visibility is parked with its deadline and a
+/// paint request, then times out once.
+#[test]
+fn a_capture_for_a_window_with_unknown_visibility_is_admitted_with_a_deadline() {
+    let mut u = Ui::new(Session::empty());
+    let rx = push(&mut u, 40, json!({}));
+    // A minimised window may report no `visible` flag at all. The request must still be parked
+    // with its deadline rather than left in `control_queue` waiting for a frame that never draws.
+    let mut input = egui::RawInput::default();
+    // Neither `visible` nor `minimized` is reported: the platform has not said whether the
+    // window draws, so waiting for its frame would leave the request queued indefinitely.
+    input.viewports.insert(egui::ViewportId::ROOT, egui::ViewportInfo::default());
+    let ctx = u.ctx.clone();
+    let out = ctx.run_logic(&input, |ctx| crate::control::background(&mut u.app, ctx));
+    assert_eq!(u.app.capture.shots.len(), 1, "admitted, not left queued");
+    assert!(u.app.control_queue.is_empty(), "the parked request no longer waits in the input queue");
+    let r = &u.app.capture.shots[0];
+    assert!(!r.issued);
+    let now = u.app.clock.now();
+    assert!((r.deadline - (now + crate::control::SHOT_TIMEOUT)).abs() < 1e-6, "the hidden request has its deadline");
+    let asked = out
+        .viewport_commands
+        .get(&egui::ViewportId::ROOT)
+        .is_some_and(|cmds| cmds.iter().any(|c| matches!(c, egui::ViewportCommand::RequestPaintWhileHidden)));
+    assert!(asked, "the parked capture asks the window to paint");
+    // The deadline still answers the transport when no frame draws.
+    u.advance_clock(crate::control::SHOT_TIMEOUT + 2.0);
+    u.frame(vec![]);
+    let reply = rx.try_recv().expect("the parked capture times out");
+    assert_eq!(reply.id, json!(40));
+    assert!(reply.result.unwrap_err().contains("didn't deliver"));
+    assert!(u.app.capture.shots.is_empty(), "released");
+}
+
+/// Asserts a completed capture is rejected when current geometry is unavailable, failing
+/// closed.
+#[test]
+fn a_completed_capture_is_rejected_when_current_geometry_is_unavailable() {
+    let mut u = Ui::new(Session::empty());
+    let rx = push(&mut u, 41, json!({}));
+    settle_to_issue(&mut u, 1);
+    let spec = u.app.capture.shots[0].spec.expect("geometry");
+    let slot = u.app.capture.shots[0].slot.clone().expect("issued");
+    slot.complete(Arc::new(egui::ColorImage::filled(spec.size_px, egui::Color32::RED)));
+    // A surface that cannot represent geometry at all (smaller than one point here). The pixels
+    // may still match the old admitted spec, but they cannot be proven current: fail closed.
+    u.advance_clock(1.0);
+    let input = egui::RawInput {
+        screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(0.0, 0.0))),
+        time: Some(1.0),
+        ..Default::default()
+    };
+    let app = &mut u.app;
+    let ctx = u.ctx.clone();
+    let mut out = ctx.run_ui(input, |ui| crate::control::drain(app, ui.ctx()));
+    out.textures_delta.clear();
+    let reply = rx.try_recv().expect("answered instead of accepted");
+    assert_eq!(reply.id, json!(41));
+    assert!(reply.result.unwrap_err().contains("geometry is unavailable"), "fail closed");
+    assert!(u.app.capture.shots.is_empty(), "released");
+}
+
+/// Asserts a tab switch while a capture settles invalidates it with "document changed".
+#[test]
+fn a_capture_belongs_to_the_document_admitted_not_the_one_showing_when_it_arrives() {
+    let mut s = Session::empty();
+    s.execute("file.new", &json!({"name": "A"})).unwrap();
+    s.execute("file.new", &json!({"name": "B"})).unwrap();
+    let (a, b) = (s.docs.iter().position(|d| d.doc.name == "A").expect("file A"), s.docs.iter().position(|d| d.doc.name == "B").expect("file B"));
+    let mut u = Ui::new(s);
+    u.app.session.active = a;
+    let rx = push(&mut u, 8, json!({}));
+    u.frame(vec![]);
+    assert_eq!(u.app.capture.shots.len(), 1, "admitted against A");
+    // The tab switches while the capture settles: the pixels that arrive are B's, not A's.
+    u.app.session.active = b;
+    settle_to_issue(&mut u, 1);
+    let spec = u.app.capture.shots[0].spec.expect("geometry");
+    let slot = u.app.capture.shots[0].slot.clone().expect("issued");
+    slot.complete(Arc::new(egui::ColorImage::filled(spec.size_px, egui::Color32::RED)));
+    u.frame(vec![]);
+    let reply = rx.try_recv().expect("answered");
+    assert!(reply.result.unwrap_err().contains("document changed"), "a tab switch invalidates the capture");
+    assert!(u.app.capture.shots.is_empty(), "released");
+}
+
+/// Asserts the capture budget covers the encoding and reply peaks, not just pixels, and an
+/// over-budget resize is rejected before readback.
+#[test]
+fn the_capture_budget_counts_the_encoding_peak_not_only_the_pixels() {
+    let fits = CaptureSpec { viewport: egui::ViewportId::ROOT, size_px: [4096, 4096], pixels_per_point: 1.0, zoom: 1.0 };
+    let over = CaptureSpec { viewport: egui::ViewportId::ROOT, size_px: [5000, 5000], pixels_per_point: 1.0, zoom: 1.0 };
+    // The encode phase holds the readback and the straight-RGBA copy while the PNG is built; the
+    // reply phase holds the readback and PNG plus the base64 string after that copy is dropped.
+    let raw = fits.bytes().expect("pixels");
+    let png = raw + super::SHOT_PNG_OVERHEAD;
+    let encode_phase = raw * 2 + png;
+    let reply_phase = raw + png + (png / 3 + 1) * 4;
+    assert_eq!(fits.cost(), Some(encode_phase.max(reply_phase)), "cost covers both live encoding phases");
+    // 5000² × 4 is under the per-image pixel budget but its PNG copy and base64 reply are not.
+    assert!(over.bytes().expect("pixels") <= super::MAX_SHOT_IMAGE_BYTES);
+    assert!(over.cost().expect("cost") > super::MAX_SHOT_TOTAL_BYTES, "the reply is part of the bound");
+    assert!(fits.cost().expect("cost") <= super::MAX_SHOT_TOTAL_BYTES);
+    // The real resize path enforces that bound, even after admission at a smaller size.
+    let mut u = Ui::new(Session::empty());
+    let rx = push(&mut u, 9, json!({}));
+    u.frame(vec![]);
+    assert_eq!(u.app.capture.shots.len(), 1, "admitted");
+    let out = resized_frame(&mut u, egui::vec2(5000.0, 5000.0));
+    let reply = rx.try_recv().expect("rejected");
+    assert!(reply.result.unwrap_err().contains("capture budget"), "the encoding peak is refused");
+    assert!(u.app.capture.shots.is_empty(), "nothing retained");
+    assert!(!has_screenshot(&out), "over-budget growth is rejected before any readback command");
+}
+
+/// Asserts resizing settling captures rechecks aggregate reserved bytes, rejects the request
+/// that no longer fits, and makes the survivor reserve its real cost.
+#[test]
+fn resizing_settling_captures_rechecks_the_aggregate_reserved_bytes() {
+    let mut u = Ui::new(Session::empty());
+    let a = push(&mut u, 81, json!({}));
+    let b = push(&mut u, 82, json!({}));
+    u.frame(vec![]);
+    assert_eq!(u.app.capture.shots.len(), 2, "both fit at the original size");
+    let out = resized_frame(&mut u, egui::vec2(3200.0, 3200.0));
+    let replies: Vec<_> = [a.try_recv(), b.try_recv()].into_iter().filter_map(Result::ok).collect();
+    assert_eq!(replies.len(), 1, "each resized request fits alone, but not both together");
+    assert!(replies[0].result.as_ref().unwrap_err().contains("capture budget"));
+    assert_eq!(u.app.capture.shots.len(), 1);
+    let remaining = &u.app.capture.shots[0];
+    assert_eq!(remaining.spec.unwrap().size_px, [3200, 3200]);
+    assert_eq!(remaining.reserved, remaining.spec.unwrap().cost().unwrap(), "the survivor reserves its real current cost");
+    assert!(!remaining.issued);
+    assert!(!has_screenshot(&out), "neither request was read back using the old small reservation");
+}
+
+/// Asserts an allowed resize restarts settling, issues only after three new-size frames, and
+/// reserves the current cost.
+#[test]
+fn an_allowed_resize_restarts_settling_and_issues_with_the_current_reservation() {
+    let mut u = Ui::new(Session::empty());
+    let _rx = push(&mut u, 83, json!({}));
+    u.frame(vec![]);
+    u.frame(vec![]);
+    u.frame(vec![]);
+    assert_eq!(u.app.capture.shots[0].settle, 2);
+    let size = egui::vec2(2000.0, 1200.0);
+    let out = resized_frame(&mut u, size);
+    assert!(!has_screenshot(&out), "the third old-size frame cannot issue a newly resized surface");
+    assert_eq!(u.app.capture.shots[0].settle, 0);
+    for _ in 0..2 {
+        assert!(!has_screenshot(&resized_frame(&mut u, size)), "wait for three completed new-size frames");
+    }
+    let out = resized_frame(&mut u, size);
+    assert!(has_screenshot(&out), "a valid settled capture still issues");
+    let request = &u.app.capture.shots[0];
+    assert!(request.issued);
+    assert_eq!(request.spec.unwrap().size_px, [2000, 1200]);
+    assert_eq!(request.reserved, request.spec.unwrap().cost().unwrap());
+}
+
+/// Queue an injected-input request (the desktop app's `raw_input_hook` is simulated by
+/// `windows::take_input` in these tests).
+fn push_input(u: &mut Ui, id: u64) -> std::sync::mpsc::Receiver<ControlReply> {
+    let (tx, rx) = std::sync::mpsc::channel();
+    u.app.control_queue.push(ControlRequest {
+        id: json!(id),
+        method: "ui.input".into(),
+        params: json!({"events": [{"move": [10.0, 10.0]}]}),
+        reply: tx,
+        state: Default::default(),
+    });
+    rx
+}
+
+/// Asserts injected input is queued, applied by the presenting pass, and acknowledged once
+/// after that pass.
+#[test]
+fn injected_input_is_acknowledged_only_after_the_pass_that_applies_it() {
+    let mut u = Ui::new(Session::empty());
+    let rx = push_input(&mut u, 20);
+    u.frame(vec![]);
+    assert!(rx.try_recv().is_err(), "queued, not applied yet");
+    let events = crate::windows::take_input(&mut u.app, egui::ViewportId::ROOT);
+    assert!(!events.is_empty(), "the batch the window draws with");
+    assert!(u.app.control_synthetic, "the applying frame is fenced from the system clipboard");
+    u.frame(vec![]);
+    let reply = rx.try_recv().expect("acknowledged by the presented pass");
+    assert_eq!(reply.id, json!(20));
+    assert!(reply.result.is_ok());
+    assert!(!u.app.control_synthetic, "the fence ends with the frame");
+}
+
+/// Asserts a discarded pass neither acknowledges nor replays an injected batch; the presented
+/// pass acknowledges once.
+#[test]
+fn a_discarded_pass_does_not_acknowledge_or_lose_an_injected_batch() {
+    let mut u = Ui::new(Session::empty());
+    let rx = push_input(&mut u, 21);
+    u.frame(vec![]);
+    let events = crate::windows::take_input(&mut u.app, egui::ViewportId::ROOT);
+    assert!(!events.is_empty());
+    let input = egui::RawInput {
+        screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1440.0, 900.0))),
+        time: Some(1.0),
+        ..Default::default()
+    };
+    let app = &mut u.app;
+    let ctx = u.ctx.clone();
+    let mut passes = 0;
+    let mut out = ctx.run_ui(input, |ui| {
+        passes += 1;
+        app.ui(ui);
+        if passes == 1 {
+            ui.ctx().request_discard("test sizing pass");
+        }
+    });
+    out.textures_delta.clear();
+    assert_eq!(passes, 2);
+    // The batch's side effects already happened; it is never replayed. Its acknowledgement waits
+    // for the pass whose output is actually presented.
+    assert_eq!(rx.try_recv().expect("acknowledged by the presented pass").id, json!(21));
+    assert!(app.control_input.is_empty(), "the batch is not replayed");
+    assert!(app.input_acks.is_empty() && app.applied_acks.is_empty());
+}
+
+/// Asserts injected text is applied once across a discarded sizing pass and acknowledged
+/// once.
+#[test]
+fn injected_text_lands_once_across_a_discarded_sizing_pass() {
+    // egui reruns a discarded pass with the same `RawInput`. The custom editor applied the text in
+    // the first pass; the rerun must not insert it a second time.
+    let mut s = Session::new();
+    let id = NodeId(s.execute("text.create", &json!({"text": "X", "x": 40, "y": 40})).unwrap()["id"].as_u64().unwrap());
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, id, Some(1), false).unwrap();
+    let (tx, rx) = std::sync::mpsc::channel();
+    u.app.control_queue.push(ControlRequest {
+        id: json!(22),
+        method: "ui.input".into(),
+        params: json!({"events": [{"text": "abc"}]}),
+        reply: tx,
+        state: Default::default(),
+    });
+    u.frame(vec![]);
+    let events = crate::windows::take_input(&mut u.app, egui::ViewportId::ROOT);
+    assert!(!events.is_empty(), "the applying frame's batch");
+    let input = egui::RawInput {
+        screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1440.0, 900.0))),
+        time: Some(1.0),
+        events,
+        ..Default::default()
+    };
+    let app = &mut u.app;
+    let ctx = u.ctx.clone();
+    let mut passes = 0;
+    let mut out = ctx.run_ui(input, |ui| {
+        passes += 1;
+        app.ui(ui);
+        if passes == 1 {
+            ui.ctx().request_discard("a grid-like sizing pass");
+        }
+    });
+    out.textures_delta.clear();
+    assert_eq!(passes, 2, "egui reran the frame");
+    let typed = match &app.session.doc().expect("a file").node(id).expect("the text layer").kind {
+        figcraft_doc::NodeKind::Text(t) => t.characters.clone(),
+        _ => panic!("not text"),
+    };
+    assert_eq!(typed, "Xabc", "the discarded pass's text was not applied twice");
+    assert_eq!(rx.try_recv().expect("acknowledged once").id, json!(22));
+    assert!(app.input_acks.is_empty() && app.applied_acks.is_empty());
+}
diff --git a/crates/ui-egui/src/control/roots_tests.rs b/crates/ui-egui/src/control/roots_tests.rs
new file mode 100644
index 00000000..d3863248
--- /dev/null
+++ b/crates/ui-egui/src/control/roots_tests.rs
@@ -0,0 +1,122 @@
+//! An app started with automation roots: its frames and control requests read and write only
+//! inside them, and captures come back as data without a path.
+
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use figcraft_engine::Session;
+use figcraft_engine::file_access::Roots;
+use serde_json::{Value, json};
+
+use crate::{FigApp, NoServices};
+
+struct Dirs(PathBuf);
+
+impl Drop for Dirs {
+    fn drop(&mut self) {
+        let _ = std::fs::remove_dir_all(&self.0);
+    }
+}
+
+fn confined_app(name: &str) -> (FigApp, Dirs) {
+    let d = std::env::temp_dir().join(format!("figcraft-ui-roots-{name}-{}", std::process::id()));
+    for sub in ["out", "outside"] {
+        std::fs::create_dir_all(d.join(sub)).unwrap();
+    }
+    let mut s = Session::new();
+    s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 20, "height": 10})).unwrap();
+    let mut app = FigApp::new(s, Box::new(NoServices));
+    app.automation_roots = Some(Arc::new(Roots::new(&[], &[d.join("out").to_string_lossy().into_owned()]).unwrap()));
+    (app, Dirs(d))
+}
+
+/// Control method `method` handled as the desktop app does: inside the frame guard.
+fn handle(app: &mut FigApp, method: &str, p: Value) -> Result<Value, String> {
+    let ctx = egui::Context::default();
+    let mut res = Err("not run".to_string());
+    crate::windows::guard(app, &ctx, |app| res = super::handle(app, &ctx, method, &p));
+    res
+}
+
+#[test]
+fn a_confined_app_writes_only_inside_its_write_root() {
+    let (mut app, d) = confined_app("write");
+    let p = |rel: &str| d.0.join(rel).to_string_lossy().into_owned();
+    let e = handle(&mut app, "ui.render", json!({"path": p("outside/r.png")})).unwrap_err();
+    assert!(e.contains("automation path rejected"), "{e}");
+    let e =
+        handle(&mut app, "engine.execute", json!({"command": "file.export", "params": {"format": "svg", "path": p("outside/r.svg")}})).unwrap_err();
+    assert!(e.contains("automation path rejected"), "{e}");
+    assert!(handle(&mut app, "ui.render", json!({"path": p("out/r.png")})).is_ok());
+    // Without a path the PNG comes back as data.
+    let r = handle(&mut app, "ui.render", json!({})).unwrap();
+    assert!(r["data"].as_str().is_some_and(|d| !d.is_empty()), "{r}");
+    assert_eq!(std::fs::read_dir(d.0.join("outside")).unwrap().count(), 0);
+    assert!(d.0.join("out/r.png").is_file());
+    // Outside the guard (the app's own work) nothing is confined.
+    assert!(app.session.execute("file.export", &json!({"format": "svg", "path": p("outside/own.svg")})).is_ok());
+}
+
+#[test]
+fn a_confined_app_saves_only_inside_its_write_root() {
+    // #836: saving over the control channel, both as a new file and to the current one.
+    let (mut app, d) = confined_app("save");
+    let p = |rel: &str| d.0.join(rel).to_string_lossy().into_owned();
+    for cmd in ["file.saveAs", "file.save"] {
+        let e = handle(&mut app, "engine.execute", json!({"command": cmd, "params": {"path": p("outside/a.figcraft")}})).unwrap_err();
+        assert!(e.contains("automation path rejected"), "{cmd}: {e}");
+        let e = handle(&mut app, "engine.execute", json!({"command": cmd, "params": {"path": p("out/../outside/b.figcraft")}})).unwrap_err();
+        assert!(e.contains("automation path rejected"), "{cmd}: {e}");
+    }
+    assert_eq!(std::fs::read_dir(d.0.join("outside")).unwrap().count(), 0, "nothing written outside the root");
+    handle(&mut app, "engine.execute", json!({"command": "file.saveAs", "params": {"path": p("out/in.figcraft")}})).unwrap();
+    assert!(d.0.join("out/in.figcraft").is_file());
+    // Saving again goes to the same file, inside the root.
+    handle(&mut app, "engine.execute", json!({"command": "file.save", "params": {}})).unwrap();
+}
+
+#[test]
+fn window_captures_are_written_through_the_roots_or_returned() {
+    let (app, d) = confined_app("capture");
+    let img = egui::ColorImage::filled([3, 2], egui::Color32::RED);
+    let roots = app.automation_roots.clone();
+    let out = d.0.join("out/shot.png").to_string_lossy().into_owned();
+    let outside = d.0.join("outside/shot.png").to_string_lossy().into_owned();
+    figcraft_engine::file_access::confined(roots.as_ref(), || {
+        assert!(super::shot_reply(&img, Some(&outside)).unwrap_err().contains("automation path rejected"));
+        assert_eq!(super::shot_reply(&img, Some(&out)).unwrap()["width"], 3);
+        let data = super::shot_reply(&img, None).unwrap();
+        assert_eq!((data["format"].as_str(), data["height"].as_u64()), (Some("png"), Some(2)));
+    });
+    assert!(d.0.join("out/shot.png").is_file() && !d.0.join("outside/shot.png").exists());
+}
+
+#[test]
+fn ui_input_rejects_non_finite_coordinates() {
+    let (mut app, _d) = confined_app("input");
+    for ev in [json!({"move": [1e300, 5]}), json!({"down": [5, 1e300]}), json!({"scroll": [1e300, 0]})] {
+        let r = handle(&mut app, "ui.input", json!({"events": [ev]}));
+        assert!(r.is_err(), "{ev}: {r:?}");
+    }
+    assert!(app.control_input.iter().all(|e| !matches!(e, egui::Event::PointerMoved(p) if !p.is_finite())));
+}
+
+#[test]
+fn document_inspect_caps_the_requested_depth() {
+    let (mut app, _d) = confined_app("inspect-depth");
+    let mut parent: Option<Value> = None;
+    for _ in 0..80 {
+        let mut p = json!({"x": 0, "y": 0, "width": 10, "height": 10});
+        if let Some(id) = &parent {
+            p["parent"] = id.clone();
+        }
+        let r = app.session.execute("frame.create", &p).unwrap();
+        parent = Some(r["id"].clone());
+    }
+    let r = handle(&mut app, "document.inspect", json!({"depth": u64::MAX, "allPages": false})).unwrap();
+    fn nesting(v: &Value) -> usize {
+        v["children"].as_array().map_or(0, |c| 1 + c.iter().map(nesting).max().unwrap_or(0))
+    }
+    let n = nesting(&r["pages"][0]);
+    assert!(n <= 64, "inspect nested {n} levels");
+}
diff --git a/crates/ui-egui/src/corner_individual_tests.rs b/crates/ui-egui/src/corner_individual_tests.rs
new file mode 100644
index 00000000..c87f4f33
--- /dev/null
+++ b/crates/ui-egui/src/corner_individual_tests.rs
@@ -0,0 +1,117 @@
+//! Individual corners in the Design panel, driven headless: the four corner fields sit where
+//! their corners are (top left, top right / bottom left, bottom right) and each sets its own;
+//! for a polygon or star the panel shows corner smoothing only.
+
+use egui::accesskit::Role;
+use egui::{Event, Id, Key, Modifiers, Pos2, Rect, pos2};
+use figcraft_doc::NodeId;
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+
+/// A rectangle rounded only on its left corners (top left and bottom left 30), selected.
+fn scene() -> (Ui, NodeId) {
+    let mut s = Session::new();
+    let r = NodeId(s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 200, "height": 120})).unwrap()["id"].as_u64().unwrap());
+    s.execute("node.set", &json!({"ids": [r], "props": {"topLeftRadius": 30, "bottomLeftRadius": 30}})).unwrap();
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    (Ui::new(s), r)
+}
+
+/// The rectangle's radii as `[top left, top right, bottom right, bottom left]`.
+fn radii(u: &Ui, r: NodeId) -> [f64; 4] {
+    u.app.session.doc().unwrap().node(r).unwrap().corners.radii
+}
+
+/// A full press-and-release at `p`, then settling one frame.
+fn click(u: &mut Ui, p: Pos2) {
+    u.button(p, true);
+    u.button(p, false);
+    u.frame(vec![]);
+}
+
+/// A press-and-release of Enter, committing the focused number field.
+fn enter(u: &mut Ui) {
+    u.frame(vec![
+        Event::Key { key: Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE },
+        Event::Key { key: Key::Enter, physical_key: None, pressed: false, repeat: false, modifiers: Modifiers::NONE },
+    ]);
+}
+
+/// The middle of the toggle button named `label`, found in the AccessKit tree.
+fn named_button(u: &mut Ui, label: &str) -> Pos2 {
+    u.ctx.enable_accesskit();
+    u.frame(vec![]);
+    let out = u.frame_output(vec![]);
+    let nodes = out.platform_output.accesskit_update.expect("an AccessKit update").nodes;
+    let n = nodes.iter().map(|(_, n)| n).find(|n| n.role() == Role::Button && n.label() == Some(label)).expect(label);
+    let b = n.bounds().expect("bounds");
+    pos2(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32)
+}
+
+/// Corner field `k` (an index into the radii).
+fn field(u: &Ui, k: usize) -> Rect {
+    u.ctx.read_response(Id::unique(("corner", k)).with("field")).expect("corner field shows").rect
+}
+
+/// The iOS button next to Corner smoothing sets 60% in one undo step, as the help page's "click
+/// iOS to set corner smoothing to 60%" describes.
+#[test]
+fn ios_button_sets_corner_smoothing_to_60_percent() {
+    let (mut u, r) = scene();
+    let t = named_button(&mut u, "Individual corners");
+    click(&mut u, t);
+    let history = u.app.session.undo_depth().0;
+    let ios = named_button(&mut u, "iOS");
+    click(&mut u, ios);
+    let smoothing = u.app.session.doc().unwrap().node(r).unwrap().corners.smoothing;
+    assert!((smoothing - 0.6).abs() < 1e-9, "smoothing is {smoothing}");
+    assert_eq!(u.app.session.undo_depth().0, history + 1);
+}
+
+/// The fields sit at their corners, and typing in the bottom right one sets only that corner in a
+/// single undo step (#1002: the bottom row showed bottom right on the left).
+#[test]
+fn corner_fields_sit_at_their_corners_and_set_their_own() {
+    let (mut u, r) = scene();
+    let t = named_button(&mut u, "Individual corners");
+    click(&mut u, t);
+    let (tl, tr, br, bl) = (field(&u, 0).center(), field(&u, 1).center(), field(&u, 2).center(), field(&u, 3).center());
+    assert!(tl.x < tr.x && (tl.y - tr.y).abs() < 1.0, "top row: top left, then top right");
+    assert!(bl.x < br.x && (bl.y - br.y).abs() < 1.0, "bottom row: bottom left, then bottom right");
+    assert!(bl.y > tl.y && (bl.x - tl.x).abs() < 1.0, "bottom left sits under top left");
+    let history = u.app.session.undo_depth().0;
+    click(&mut u, br);
+    u.frame(vec![Event::Text("12".into())]);
+    enter(&mut u);
+    u.frame(vec![]);
+    assert_eq!(radii(&u, r), [30.0, 0.0, 12.0, 30.0]);
+    assert_eq!(u.app.session.undo_depth().0, history + 1);
+}
+
+/// For a rounded polygon or star the same panel shows corner smoothing, which applies to the
+/// whole shape: no field per corner, and typing a percentage sets the smoothing in one undo step.
+#[test]
+fn polygons_and_stars_take_corner_smoothing() {
+    for cmd in ["shape.polygon", "shape.star"] {
+        let mut s = Session::new();
+        let id = NodeId(s.execute(cmd, &json!({"x": 0, "y": 0, "width": 120, "height": 120})).unwrap()["id"].as_u64().unwrap());
+        s.execute("node.set", &json!({"ids": [id], "props": {"cornerRadius": 8}})).unwrap();
+        s.execute("select.set", &json!({"ids": [id]})).unwrap();
+        let mut u = Ui::new(s);
+        // With no corners of their own, the button is named for what it opens.
+        let t = named_button(&mut u, "Corner smoothing");
+        click(&mut u, t);
+        assert!((0..4).all(|k| u.ctx.read_response(Id::unique(("corner", k)).with("field")).is_none()), "{cmd}: one radius, no corner fields");
+        let smoothing = u.ctx.read_response(Id::unique("smoothing").with("field")).expect("the smoothing field shows").rect.center();
+        let history = u.app.session.undo_depth().0;
+        click(&mut u, smoothing);
+        u.frame(vec![Event::Text("60".into())]);
+        enter(&mut u);
+        u.frame(vec![]);
+        let n = u.app.session.doc().unwrap().node(id).unwrap().clone();
+        assert!((n.corners.smoothing - 0.6).abs() < 1e-9, "{cmd}: {}", n.corners.smoothing);
+        assert_eq!(u.app.session.undo_depth().0, history + 1, "{cmd}: one undo step");
+    }
+}
diff --git a/crates/ui-egui/src/design_paste_tests.rs b/crates/ui-egui/src/design_paste_tests.rs
new file mode 100644
index 00000000..82c366c7
--- /dev/null
+++ b/crates/ui-egui/src/design_paste_tests.rs
@@ -0,0 +1,125 @@
+use figcraft_engine::Session;
+use figcraft_engine::cmd::edit::{CLIP_CLOSE, CLIP_OPEN};
+use serde_json::json;
+
+use crate::{FigApp, Services};
+
+struct Clip {
+    html: String,
+    text: Option<String>,
+}
+
+impl Services for Clip {
+    fn clipboard_get_html(&mut self) -> Option<String> {
+        Some(self.html.clone())
+    }
+    fn clipboard_get_text(&mut self) -> Option<String> {
+        self.text.clone()
+    }
+}
+
+/// The HTML another design app puts on the clipboard for copied layers (a `.fig` canvas inside).
+fn copied_html() -> String {
+    let mut s = Session::new();
+    s.execute("node.create", &json!({"type": "rectangle", "x": 0, "y": 0, "width": 40, "height": 20, "name": "Copied layer"})).unwrap();
+    let r = s.execute("file.export", &json!({"format": "fig"})).unwrap();
+    format!(r#"<span data-buffer="<!--{CLIP_OPEN}{}{CLIP_CLOSE}-->"></span>"#, r["data"].as_str().unwrap())
+}
+
+fn selected_names(app: &FigApp) -> Vec<String> {
+    let doc = app.session.doc().unwrap();
+    app.session.selection().iter().map(|i| doc.node(*i).unwrap().name.clone()).collect()
+}
+
+fn pasted_text(app: &FigApp) -> String {
+    let doc = app.session.doc().unwrap();
+    let id = app.session.selection()[0];
+    doc.node(id).unwrap().kind.text().unwrap().characters.clone()
+}
+
+#[test]
+fn paste_takes_layers_copied_in_another_design_app() {
+    let html = copied_html();
+    let mut app = FigApp::new(Session::new(), Box::new(Clip { html, text: Some(String::new()) }));
+    crate::menus::paste(&mut app, None, None);
+    assert_eq!(selected_names(&app), ["Copied layer"]);
+}
+
+struct HtmlAndImage(String);
+
+impl Services for HtmlAndImage {
+    fn clipboard_get_html(&mut self) -> Option<String> {
+        Some(self.0.clone())
+    }
+    fn clipboard_get_image(&mut self) -> Option<(u32, u32, Vec<u8>)> {
+        Some((2, 2, vec![255; 16]))
+    }
+}
+
+#[test]
+fn editable_design_layers_take_priority_over_a_png_representation() {
+    let mut session = Session::new();
+    let selected = session.execute("shape.ellipse", &json!({"x": 100, "y": 100, "width": 80, "height": 80})).unwrap()["id"].as_u64().unwrap();
+    let mut app = FigApp::new(session, Box::new(HtmlAndImage(copied_html())));
+    let before = app.session.doc().unwrap().node_count();
+
+    crate::menus::paste(&mut app, None, None);
+
+    assert_eq!(selected_names(&app), ["Copied layer"]);
+    assert_eq!(app.session.doc().unwrap().node_count(), before + 1);
+    assert!(matches!(
+        app.session.doc().unwrap().node(figcraft_doc::NodeId(selected)).unwrap().fills[0].kind,
+        figcraft_color::PaintKind::Solid { .. }
+    ));
+}
+
+#[test]
+fn paste_here_puts_copied_design_layers_at_the_point() {
+    let html = copied_html();
+    let mut app = FigApp::new(Session::new(), Box::new(Clip { html, text: Some(String::new()) }));
+    crate::menus::paste(&mut app, None, Some((300.0, 200.0)));
+    let id = app.session.selection()[0];
+    let b = app.session.doc().unwrap().world_bounds(id).unwrap();
+    assert_eq!((b.x0, b.y0), (300.0, 200.0));
+}
+
+#[test]
+fn html_from_other_apps_pastes_as_before() {
+    let clip = Clip { html: "<b>Hello</b>".into(), text: Some("Hello".into()) };
+    let mut app = FigApp::new(Session::new(), Box::new(clip));
+    crate::menus::paste(&mut app, None, None);
+    assert_eq!(pasted_text(&app), "Hello");
+}
+
+#[test]
+fn html_that_only_mentions_the_marker_pastes_its_text() {
+    let text = format!("Markers {CLIP_OPEN} and {CLIP_CLOSE} explained");
+    let clip = Clip { html: format!("<p>{text}</p>"), text: Some(text.clone()) };
+    let mut app = FigApp::new(Session::new(), Box::new(clip));
+    crate::menus::paste(&mut app, None, None);
+    assert_eq!(pasted_text(&app), text);
+    assert!(app.ui.last_error.is_none(), "{:?}", app.ui.last_error);
+}
+
+/// A clipboard whose contents the test replaces between pastes.
+struct SharedClip(std::rc::Rc<std::cell::RefCell<Clip>>);
+
+impl Services for SharedClip {
+    fn clipboard_get_html(&mut self) -> Option<String> {
+        Some(self.0.borrow().html.clone())
+    }
+    fn clipboard_get_text(&mut self) -> Option<String> {
+        self.0.borrow().text.clone()
+    }
+}
+
+#[test]
+fn text_copied_after_a_design_paste_pastes_as_text() {
+    let clip = std::rc::Rc::new(std::cell::RefCell::new(Clip { html: copied_html(), text: None }));
+    let mut app = FigApp::new(Session::new(), Box::new(SharedClip(clip.clone())));
+    crate::menus::paste(&mut app, None, None);
+    assert_eq!(selected_names(&app), ["Copied layer"]);
+    *clip.borrow_mut() = Clip { html: String::new(), text: Some("Fresh text".into()) };
+    crate::menus::paste(&mut app, None, None);
+    assert_eq!(pasted_text(&app), "Fresh text");
+}
diff --git a/crates/ui-egui/src/dev_mode_tests.rs b/crates/ui-egui/src/dev_mode_tests.rs
index 941f1b2c..4d497585 100644
--- a/crates/ui-egui/src/dev_mode_tests.rs
+++ b/crates/ui-egui/src/dev_mode_tests.rs
@@ -1,8 +1,10 @@
 //! Dev Mode in the UI, driven headless (the harness is `present_tests`'): the compare view opens
 //! from `dev.compare {show}`, switches to the overlay and closes with Escape before the focus view
-//! does; the focus view's Escape; the annotation filter.
+//! does; the focus view's Escape; the annotation filter; the playground's instance-swap menu.
 
-use egui::{Key, pos2};
+use egui::accesskit::{Node, Role};
+use egui::{Event, Key, MouseWheelUnit, Pos2, TouchPhase, pos2, vec2};
+use figcraft_doc::NodeId;
 use figcraft_engine::Session;
 use serde_json::json;
 
@@ -80,3 +82,117 @@ fn annotation_filter_and_categories_panel() {
     assert_eq!(CategoryFilter::parse(&doc, "none"), Some(CategoryFilter::Uncategorized));
     assert_eq!(CategoryFilter::parse(&doc, "nope"), None);
 }
+
+#[test]
+fn the_assets_list_shows_a_slice_with_a_preview_name_and_export_format() {
+    let mut s = Session::new();
+    let f = id(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 200, "height": 200, "name": "Login"})).unwrap());
+    s.execute("shape.rectangle", &json!({"x": 20, "y": 20, "width": 80, "height": 40, "parent": f, "props": {"fill": "#FF0000"}})).unwrap();
+    // A slice with one export setting: its own format is what the row offers first.
+    let slice = id(&s.execute("node.create", &json!({"type": "slice", "x": 10, "y": 10, "width": 100, "height": 60, "name": "Avatar"})).unwrap());
+    s.execute("export.add", &json!({"ids": [slice], "setting": {"format": "webp", "size": "2x"}})).unwrap();
+    s.execute("select.set", &json!({"ids": [slice]})).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    u.ctx.enable_accesskit();
+    let out = u.frame_output(vec![]);
+    let nodes: Vec<egui::accesskit::Node> =
+        out.platform_output.accesskit_update.expect("an AccessKit update").nodes.into_iter().map(|(_, n)| n).collect();
+    let find = |role: egui::accesskit::Role, label: &str| {
+        nodes.iter().find(|n| n.role() == role && n.label() == Some(label)).unwrap_or_else(|| panic!("no {role:?} named {label:?}"))
+    };
+    // The row exports by a click, and the format under the name is a dropdown.
+    find(egui::accesskit::Role::Button, "Export Avatar");
+    let fmt = find(egui::accesskit::Role::ComboBox, "Format");
+    assert_eq!(fmt.value(), Some("WebP"));
+    assert_eq!(fmt.is_expanded(), Some(false));
+    // A format picked there stays after the document changes.
+    let at = centre(fmt);
+    click(&mut u, at);
+    let svg = tree(&mut u).into_iter().find(|n| n.label() == Some("SVG")).expect("SVG in the format menu");
+    click(&mut u, centre(&svg));
+    let revision = u.app.session.ds().unwrap().revision;
+    u.app.session.execute("node.set", &json!({"ids": [slice], "props": {"name": "Avatar"}})).unwrap();
+    u.app.session.execute("node.set", &json!({"ids": [f], "props": {"name": "Sign in"}})).unwrap();
+    assert_ne!(u.app.session.ds().unwrap().revision, revision);
+    let fmt = tree(&mut u).into_iter().find(|n| n.role() == Role::ComboBox && n.label() == Some("Format")).unwrap();
+    assert_eq!(fmt.value(), Some("SVG"));
+}
+
+/// A "Button" component whose nested "Heart" instance is its instance-swap property "Icon", a
+/// second icon "Star", and an instance of the button selected in the Inspect tab. Returns (ui,
+/// instance, heart, star).
+fn swap_setup() -> (crate::layers_drag_tests::Ui, NodeId, NodeId, NodeId) {
+    let mut s = Session::new();
+    let icon = |s: &mut Session, name: &str, x: i32| {
+        let f = id(&s.execute("frame.create", &json!({"x": x, "y": 0, "width": 24, "height": 24, "name": name})).unwrap());
+        id(&s.execute("component.create", &json!({"ids": [f]})).unwrap())
+    };
+    let (heart, star) = (icon(&mut s, "Heart", 0), icon(&mut s, "Star", 40));
+    let f = id(&s.execute("frame.create", &json!({"x": 0, "y": 100, "width": 120, "height": 40, "name": "Button"})).unwrap());
+    let nested = id(&s.execute("instance.create", &json!({"component": heart, "x": 8, "y": 108, "parent": f})).unwrap());
+    let button = id(&s.execute("component.create", &json!({"ids": [f]})).unwrap());
+    s.execute("component.addProperty", &json!({"id": button, "name": "Icon", "type": "instanceSwap", "default": heart, "layer": nested})).unwrap();
+    let inst = id(&s.execute("instance.create", &json!({"component": button, "x": 0, "y": 300})).unwrap());
+    s.execute("select.set", &json!({"ids": [inst]})).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    u.ctx.enable_accesskit();
+    (u, inst, heart, star)
+}
+
+fn tree(u: &mut crate::layers_drag_tests::Ui) -> Vec<Node> {
+    u.frame_output(vec![]).platform_output.accesskit_update.unwrap().nodes.into_iter().map(|(_, n)| n).collect()
+}
+
+fn centre(n: &Node) -> Pos2 {
+    let b = n.bounds().unwrap();
+    pos2(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32)
+}
+
+fn click(u: &mut crate::layers_drag_tests::Ui, at: Pos2) {
+    u.button(at, true);
+    u.button(at, false);
+}
+
+/// The playground's dropdown for property `name`, scrolled into view.
+fn playground_combo(u: &mut crate::layers_drag_tests::Ui, name: &str) -> Option<Node> {
+    for _ in 0..20 {
+        let combo = tree(u).into_iter().find(|n| n.role() == Role::ComboBox && n.label() == Some(name))?;
+        if centre(&combo).y < 860.0 {
+            return Some(combo);
+        }
+        let wheel = Event::MouseWheel {
+            unit: MouseWheelUnit::Point,
+            source: egui::MouseWheelSource::Unknown,
+            delta: vec2(0.0, -100.0),
+            phase: TouchPhase::Move,
+            modifiers: Default::default(),
+        };
+        u.frame(vec![Event::PointerMoved(pos2(1300.0, 500.0)), wheel]);
+        for _ in 0..30 {
+            u.frame(vec![]);
+        }
+    }
+    None
+}
+
+#[test]
+fn the_playground_swaps_an_instance_in_the_preview_only() {
+    let (mut u, inst, heart, star) = swap_setup();
+    let (doc, undo) = (u.app.session.ds().unwrap().doc.clone(), u.app.session.undo_depth());
+    let combo = playground_combo(&mut u, "Icon").expect("the playground has a dropdown for the instance-swap property");
+    assert_eq!(combo.value(), Some("Heart"));
+    // Open it and pick Star: the item that wasn't there before the menu opened.
+    let before: Vec<Pos2> = tree(&mut u).iter().filter(|n| n.label() == Some("Star")).map(centre).collect();
+    click(&mut u, centre(&combo));
+    let item = tree(&mut u).into_iter().find(|n| n.label() == Some("Star") && !before.contains(&centre(n))).expect("Star in the menu");
+    click(&mut u, centre(&item));
+    let combo = playground_combo(&mut u, "Icon").unwrap();
+    assert_eq!(combo.value(), Some("Star"), "the playground shows the swapped icon");
+    // The file isn't touched: the instance still has the heart, nothing to undo.
+    assert!(std::sync::Arc::ptr_eq(&doc, &u.app.session.ds().unwrap().doc));
+    assert_eq!(u.app.session.undo_depth(), undo);
+    let props = u.app.session.execute("component.properties", &json!({"id": inst})).unwrap();
+    assert_eq!(props["properties"][0]["value"], json!(heart.0), "{star:?}");
+}
diff --git a/crates/ui-egui/src/devmode_tail_tests.rs b/crates/ui-egui/src/devmode_tail_tests.rs
new file mode 100644
index 00000000..b7c7a755
--- /dev/null
+++ b/crates/ui-egui/src/devmode_tail_tests.rs
@@ -0,0 +1,451 @@
+//! Dev Mode in the UI, the tail: the compare view compares with a saved version picked at its
+//! bottom, and falls back when that version goes away.
+
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::dev_compare::CompareView;
+use crate::present_tests::{Ui, id};
+
+#[test]
+fn compare_view_compares_with_a_saved_version() {
+    let mut s = Session::new();
+    let f = id(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 300, "height": 400, "name": "Login"})).unwrap());
+    let r = id(&s.execute("shape.rectangle", &json!({"x": 20, "y": 300, "width": 120, "height": 40, "parent": f})).unwrap());
+    let mut u = Ui::new(s);
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    u.frame(vec![]);
+    // Neither ready for dev nor any version: nothing to compare with, the view doesn't stay.
+    u.app.ui.dev.compare = Some(CompareView::new(f, None));
+    u.frames(2, Vec::new);
+    assert!(u.app.ui.dev.compare.is_none());
+    let v = u.run("file.saveVersion", json!({"name": "Kickoff"}));
+    let v = v["id"].as_str().unwrap().to_string();
+    u.run("node.set", json!({"id": r, "props": {"width": 160}}));
+    u.run("dev.compare", json!({"id": f, "version": v, "show": true}));
+    u.frames(2, Vec::new);
+    assert_eq!(u.app.inspect()["devCompare"]["version"], json!(v));
+    // Opened without one, a layer that isn't ready compares with the newest version.
+    u.app.ui.dev.compare = Some(CompareView::new(f, None));
+    u.frames(2, Vec::new);
+    assert_eq!(u.app.inspect()["devCompare"]["version"], json!(v));
+    // Ready for dev: the snapshot from when it was marked is there too, and a deleted version
+    // falls back to it.
+    u.run("node.set", json!({"id": f, "props": {"devStatus": "readyForDev"}}));
+    u.run("node.set", json!({"id": r, "props": {"height": 48}}));
+    u.run("version.delete", json!({"id": v}));
+    u.frames(2, Vec::new);
+    assert_eq!(u.app.inspect()["devCompare"]["version"], json!(null));
+    assert!(u.app.ui.dev.compare.is_some());
+}
+
+#[test]
+fn dev_mode_keys_refuse_design_edits_and_say_why() {
+    let mut s = Session::new();
+    let f = id(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 300, "height": 400, "name": "Login"})).unwrap());
+    let r = id(&s.execute("shape.rectangle", &json!({"x": 20, "y": 30, "width": 120, "height": 40, "parent": f})).unwrap());
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    let mut u = Ui::new(s);
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    u.frame(vec![]);
+    let at = egui::pos2(700.0, 450.0);
+    let x = |u: &Ui| u.app.session.doc().unwrap().node(r).map(|n| n.transform.as_coeffs()[4]);
+    for key in [egui::Key::Delete, egui::Key::ArrowRight, egui::Key::Num5, egui::Key::R] {
+        u.key(at, key);
+    }
+    assert!(u.app.session.doc().unwrap().contains(r), "not deleted");
+    assert_eq!(x(&u), Some(20.0), "not nudged");
+    assert_eq!(u.app.session.doc().unwrap().node(r).map(|n| n.opacity), Some(1.0), "opacity kept");
+    assert_eq!(u.app.session.tool.tool, figcraft_engine::tools::ToolId::Move, "no drawing tool");
+    assert!(u.app.ui.toast.as_ref().is_some_and(|(m, _)| m.contains("Shift+D")));
+    // In the design the same keys edit.
+    u.app.ui.right_tab = crate::RightTab::Design;
+    u.frame(vec![]);
+    u.key(at, egui::Key::ArrowRight);
+    assert_eq!(x(&u), Some(21.0));
+}
+
+#[test]
+fn read_only_plugins_run_from_the_inspect_tab_show_their_panel() {
+    use base64::Engine as _;
+    let wasm = base64::engine::general_purpose::STANDARD.encode(crate::plugin_panel_tests::panel_module());
+    let manifest = json!({"id": "org.test.inspect", "name": "Inspect panel", "main": "p.wasm", "api": 2, "permissions": {"access": "read"}});
+    let mut s = Session::new();
+    s.execute("plugin.import", &json!({"manifest": manifest, "wasm": wasm})).unwrap();
+    let mut u = Ui::new(s);
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    u.frame(vec![]);
+    // What the Inspect tab's Plugins row runs.
+    crate::plugins_ui::start(&mut u.app, "org.test.inspect", "run");
+    u.frame(vec![]);
+    assert_eq!(u.app.session.plugins.panels.len(), 1, "its panel shows");
+    // Its callbacks only read: the button that would draw is refused and the design stays.
+    let layers = |u: &Ui| u.app.session.doc().unwrap().ids().count();
+    let before = layers(&u);
+    assert!(u.app.session.execute("plugin.event", &json!({"id": "org.test.inspect", "control": "go"})).is_err());
+    assert_eq!(layers(&u), before);
+}
+
+/// A clipboard holding only text.
+struct TextClip(String);
+
+impl crate::Services for TextClip {
+    fn clipboard_get_text(&mut self) -> Option<String> {
+        Some(self.0.clone())
+    }
+}
+
+#[test]
+fn dev_mode_pastes_only_a_comments_link() {
+    let mut s = Session::new();
+    let c = s.execute("comment.add", &json!({"x": 10, "y": 10, "text": "Check the spacing"})).unwrap()["id"].as_u64().unwrap();
+    let layers = |app: &crate::FigApp| app.session.doc().unwrap().node(app.session.page().unwrap()).unwrap().children.len();
+    let mut app = crate::FigApp::new(s, Box::new(TextClip("Pasted words".into())));
+    app.ui.right_tab = crate::RightTab::Inspect;
+    crate::menus::paste(&mut app, None, None);
+    assert_eq!(layers(&app), 0, "text doesn't paste into the design in Dev Mode");
+    app.services = Box::new(TextClip(format!("figcraft://comment/{c}")));
+    crate::menus::paste(&mut app, None, None);
+    assert_eq!(app.ui.comments.open, Some(c), "the link opens its thread");
+}
+
+#[test]
+fn dev_mode_layers_panel_selects_and_expands_but_edits_nothing() {
+    use egui::{Event, Pos2};
+    let mut s = Session::new();
+    let f = id(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 300, "height": 400, "name": "Login"})).unwrap());
+    let a = id(&s.execute("shape.rectangle", &json!({"x": 20, "y": 30, "width": 120, "height": 40, "parent": f})).unwrap());
+    let b = id(&s.execute("shape.rectangle", &json!({"x": 20, "y": 90, "width": 120, "height": 40, "parent": f})).unwrap());
+    s.execute("select.none", &json!({})).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    u.app.ui.expanded.insert(f);
+    u.frame(vec![]);
+    let order = |u: &crate::layers_drag_tests::Ui| u.app.session.doc().unwrap().node(f).unwrap().children.clone();
+    let before = order(&u);
+    let (ra, rb) = (u.row_at(a), u.row_at(b));
+    let click = |u: &mut crate::layers_drag_tests::Ui, p: Pos2| {
+        u.button(p, true);
+        u.button(p, false);
+    };
+    let rest = |u: &mut crate::layers_drag_tests::Ui| {
+        for _ in 0..30 {
+            u.frame(vec![]);
+        }
+    };
+    // A click selects.
+    click(&mut u, ra);
+    assert_eq!(u.app.session.selection(), [a]);
+    // A double click doesn't rename, and says why.
+    click(&mut u, ra);
+    assert!(u.app.ui.rename.is_none(), "no rename");
+    assert!(u.app.ui.toast.as_ref().is_some_and(|(m, _)| m.contains("Shift+D")));
+    rest(&mut u);
+    // The eye and padlock spots don't hide or lock (the row is selected instead).
+    let (eye, padlock) = (272.0, 250.0);
+    for x in [eye, padlock] {
+        u.frame(vec![Event::PointerMoved(Pos2::new(x, rb.y))]);
+        click(&mut u, Pos2::new(x, rb.y));
+        rest(&mut u);
+    }
+    let doc = u.app.session.doc().unwrap();
+    assert!(doc.node(b).unwrap().visible && !doc.node(b).unwrap().locked, "not hidden or locked");
+    assert_eq!(u.app.session.selection(), [b]);
+    // Dragging a row doesn't reorder, and says why.
+    u.app.ui.toast = None;
+    u.drag_to(ra, rb + egui::vec2(0.0, 6.0));
+    u.button(rb + egui::vec2(0.0, 6.0), false);
+    rest(&mut u);
+    assert_eq!(order(&u), before, "not reordered");
+    assert!(u.app.ui.toast.as_ref().is_some_and(|(m, _)| m.contains("Shift+D")), "the drag says why");
+    // Back in the design, the same double click renames.
+    u.app.ui.right_tab = crate::RightTab::Design;
+    u.frame(vec![]);
+    click(&mut u, ra);
+    click(&mut u, ra);
+    assert!(u.app.ui.rename.is_some_and(|r| r.id == a));
+    // A drag started in the design and dropped after switching to Dev Mode doesn't reorder either.
+    u.app.ui.rename = None;
+    rest(&mut u);
+    u.app.ui.toast = None;
+    let rf = u.row_at(f);
+    u.drag_to(ra, rf);
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    u.frame(vec![]);
+    u.button(rf, false);
+    rest(&mut u);
+    assert_eq!(order(&u), before, "not reordered after the switch");
+    assert!(u.app.ui.toast.as_ref().is_some_and(|(m, _)| m.contains("Shift+D")), "the drop says why");
+    // So does a sweep down the eye column.
+    u.app.ui.right_tab = crate::RightTab::Design;
+    rest(&mut u);
+    u.app.ui.toast = None;
+    let (ea, eb) = (Pos2::new(eye, u.row_at(a).y), Pos2::new(eye, u.row_at(b).y));
+    u.drag_to(ea, eb);
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    u.frame(vec![]);
+    u.button(eb, false);
+    rest(&mut u);
+    let doc = u.app.session.doc().unwrap();
+    assert!(doc.node(a).unwrap().visible && doc.node(b).unwrap().visible, "not hidden after the switch");
+    assert!(u.app.ui.toast.as_ref().is_some_and(|(m, _)| m.contains("Shift+D")), "the sweep says why");
+}
+
+#[test]
+fn dev_mode_pages_list_opens_pages_but_edits_none() {
+    use egui::{Event, Pos2};
+    let mut s = Session::new();
+    let home = s.page().unwrap();
+    s.execute("page.rename", &json!({"id": home, "name": "Home"})).unwrap();
+    let specs = id(&s.execute("page.add", &json!({"name": "Specs"})).unwrap());
+    s.execute("page.select", &json!({"id": home})).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    let shapes = |u: &mut crate::layers_drag_tests::Ui| crate::live_tests::flat(&u.frame_output(vec![]).shapes);
+    let s = shapes(&mut u);
+    let (rh, rs) = (crate::live_tests::text_center(&s, "Home"), crate::live_tests::text_center(&s, "Specs"));
+    // The add button, found by its name in the AccessKit tree.
+    u.ctx.enable_accesskit();
+    let nodes = u.frame_output(vec![]).platform_output.accesskit_update.unwrap().nodes;
+    let b = nodes.iter().find(|(_, n)| n.label() == Some("Add new page")).and_then(|(_, n)| n.bounds()).unwrap();
+    let add = Pos2::new(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32);
+    u.ctx.disable_accesskit();
+    // The pointer arrives first: a row that also takes drags counts a press there only then.
+    let click = |u: &mut crate::layers_drag_tests::Ui, p: Pos2| {
+        let button = |pressed| Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+        u.frame(vec![Event::PointerMoved(p)]);
+        u.frame(vec![button(true)]);
+        u.frame(vec![button(false)]);
+    };
+    let rest = |u: &mut crate::layers_drag_tests::Ui| {
+        for _ in 0..30 {
+            u.frame(vec![]);
+        }
+    };
+    let pages = |u: &crate::layers_drag_tests::Ui| u.app.session.doc().unwrap().pages.clone();
+    let said_why = |u: &mut crate::layers_drag_tests::Ui| u.app.ui.toast.take().is_some_and(|(m, _)| m.contains("Shift+D"));
+    // A click opens the page.
+    click(&mut u, rs);
+    assert_eq!(u.app.session.page().unwrap(), specs);
+    // A double click doesn't rename, and says why.
+    click(&mut u, rs);
+    assert!(u.app.ui.rename_page.is_none(), "no rename");
+    assert!(said_why(&mut u));
+    rest(&mut u);
+    // Dragging a page doesn't reorder, and says why.
+    u.drag_to(rs, rh - egui::vec2(0.0, 10.0));
+    u.button(rh - egui::vec2(0.0, 10.0), false);
+    rest(&mut u);
+    assert_eq!(pages(&u), [home, specs], "not reordered");
+    assert!(said_why(&mut u), "the drag says why");
+    // The add button adds no page, and says why.
+    click(&mut u, add);
+    assert_eq!(pages(&u), [home, specs], "no page added");
+    assert!(said_why(&mut u));
+    rest(&mut u);
+    // The row's Duplicate page and Delete page do nothing, and say why.
+    for item in ["Duplicate page", "Delete page"] {
+        u.frame(vec![
+            Event::PointerMoved(rs),
+            Event::PointerButton { pos: rs, button: egui::PointerButton::Secondary, pressed: true, modifiers: Default::default() },
+        ]);
+        u.frame(vec![Event::PointerButton { pos: rs, button: egui::PointerButton::Secondary, pressed: false, modifiers: Default::default() }]);
+        let s = shapes(&mut u);
+        click(&mut u, crate::live_tests::text_center(&s, item));
+        assert_eq!(pages(&u), [home, specs], "{item} changes no page");
+        assert!(said_why(&mut u), "{item} says why");
+        rest(&mut u);
+    }
+    // In the design the double click renames and the add button adds a page.
+    u.app.ui.right_tab = crate::RightTab::Design;
+    u.frame(vec![]);
+    click(&mut u, rs);
+    click(&mut u, rs);
+    assert!(u.app.ui.rename_page.as_ref().is_some_and(|(p, _)| *p == specs));
+    u.app.ui.rename_page = None;
+    rest(&mut u);
+    click(&mut u, add);
+    assert_eq!(pages(&u).len(), 3, "a page is added");
+}
+
+#[test]
+fn measurements_kept_on_the_canvas_draw_in_dev_mode_and_follow_their_layers() {
+    let mut s = Session::new();
+    let f = id(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 300, "height": 400})).unwrap());
+    let a = id(&s.execute("shape.rectangle", &json!({"x": 20, "y": 30, "width": 120, "height": 40, "parent": f})).unwrap());
+    let b = id(&s.execute("shape.rectangle", &json!({"x": 20, "y": 90, "width": 120, "height": 40, "parent": f})).unwrap());
+    let mut u = Ui::new(s);
+    u.run("devMode.addMeasurement", json!({"from": a, "to": b}));
+    let labels = |u: &Ui| crate::dev_mode::saved_lines(&u.app).filter_map(|g| g.label.clone()).collect::<Vec<_>>();
+    u.frame(vec![]);
+    assert!(labels(&u).is_empty(), "the design doesn't show them");
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    u.frame(vec![]);
+    assert_eq!(labels(&u), ["20"]);
+    u.run("node.set", json!({"id": b, "props": {"y": 110}}));
+    u.frame(vec![]);
+    assert_eq!(labels(&u), ["40"], "it follows the layer");
+    // Hidden layers' measurements aren't drawn.
+    u.run("node.set", json!({"id": b, "props": {"visible": false}}));
+    u.frame(vec![]);
+    assert!(labels(&u).is_empty());
+}
+
+/// A file dropped with its contents and no file on disk.
+#[derive(Debug)]
+struct DroppedBytes(std::path::PathBuf, Vec<u8>);
+
+impl egui::DroppedFile for DroppedBytes {
+    fn path(&self) -> &std::path::Path {
+        &self.0
+    }
+
+    fn bytes(&self) -> Result<Vec<u8>, String> {
+        Ok(self.1.clone())
+    }
+}
+
+/// Hover `names` over the canvas (one frame: what it shows), then drop them there with `bytes`.
+fn drop_on_canvas(u: &mut crate::layers_drag_tests::Ui, names: &[&str], bytes: &[u8]) -> Vec<egui::Shape> {
+    let at = u.app.canvas.rect.center();
+    let path = |n: &str| std::path::Path::new("figcraft-dev-mode-drop").join(n);
+    let hovered = names.iter().map(|n| egui::HoveredFile { path: Some(path(n)), mime: String::new() }).collect();
+    let out = u.frame_raw(egui::RawInput { events: vec![egui::Event::PointerMoved(at)], hovered_files: hovered, ..Default::default() });
+    let files = names.iter().map(|n| std::sync::Arc::new(DroppedBytes(path(n), bytes.to_vec())) as egui::DroppedFileHandle).collect();
+    u.frame_raw(egui::RawInput { events: vec![egui::Event::PointerMoved(at)], dropped_files: files, ..Default::default() });
+    crate::live_tests::flat(&out.shapes)
+}
+
+#[test]
+fn dev_mode_imports_no_dropped_file_into_the_design_and_says_why() {
+    let svg = br#"<svg xmlns="http://www.w3.org/2000/svg" width="40" height="20"><rect width="40" height="20" fill="red"/></svg>"#;
+    let refusal = "Dev Mode only inspects: switch to Design (Shift+D) to edit";
+    let mut u = crate::layers_drag_tests::Ui::new(Session::new());
+    let layers = |u: &crate::layers_drag_tests::Ui| u.app.session.doc().unwrap().node(u.app.session.page().unwrap()).unwrap().children.len();
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    u.frame(vec![]);
+    let s = drop_on_canvas(&mut u, &["Logo.svg", "Mark.svg"], svg);
+    assert!(crate::live_tests::has_text(&s, refusal), "dragging images over the canvas says why they won't import");
+    assert!(u.app.ui.pending_opens.is_empty(), "nothing waits to import");
+    assert!(u.app.ui.toast.as_ref().is_some_and(|(m, _)| m == refusal));
+    for _ in 0..3 {
+        u.frame(vec![]);
+    }
+    assert_eq!(layers(&u), 0, "the design is unchanged");
+    // A dropped document still opens as a file of its own.
+    let s = drop_on_canvas(&mut u, &["Other.figcraft"], b"");
+    assert!(crate::live_tests::has_text(&s, "Drop to open"));
+    assert_eq!(u.app.ui.pending_opens.iter().map(|p| p.command).collect::<Vec<_>>(), ["file.open"]);
+    u.app.ui.pending_opens.clear();
+    // In the design the same drop imports.
+    u.app.ui.right_tab = crate::RightTab::Design;
+    u.frame(vec![]);
+    let s = drop_on_canvas(&mut u, &["Logo.svg"], svg);
+    assert!(crate::live_tests::has_text(&s, "Drop to import"));
+    assert_eq!(u.app.ui.pending_opens.iter().map(|p| p.command).collect::<Vec<_>>(), ["file.import"]);
+    for _ in 0..3 {
+        u.frame(vec![]);
+    }
+    assert_eq!(layers(&u), 1, "the image is imported");
+}
+
+#[test]
+fn dev_mode_assets_panel_places_and_applies_nothing() {
+    let mut s = Session::new();
+    let f = id(&s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 80, "height": 40, "name": "Card"})).unwrap());
+    s.execute("component.create", &json!({"ids": [f]})).unwrap();
+    s.execute("style.create", &json!({"type": "paint", "name": "Brand", "value": [{"type": "solid", "color": "#0D99FF"}]})).unwrap();
+    let r = id(&s.execute("shape.rectangle", &json!({"x": 200, "y": 0, "width": 40, "height": 40})).unwrap());
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    u.app.ui.left_tab = crate::LeftTab::Assets;
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    let instances = |u: &crate::layers_drag_tests::Ui| {
+        u.app.session.doc().unwrap().nodes().filter(|n| matches!(n.kind, figcraft_doc::NodeKind::Instance { .. })).count()
+    };
+    let styled = |u: &crate::layers_drag_tests::Ui| u.app.session.doc().unwrap().node(r).is_some_and(|n| n.styles.fill.is_some());
+    let click = |u: &mut crate::layers_drag_tests::Ui, text: &str| {
+        let s = crate::live_tests::flat(&u.frame_output(vec![]).shapes);
+        let at = crate::live_tests::text_center(&s, text);
+        u.button(at, true);
+        u.button(at, false);
+        u.frame(vec![]);
+    };
+    click(&mut u, "Card");
+    click(&mut u, "Brand");
+    let s = crate::live_tests::flat(&u.frame_output(vec![]).shapes);
+    let (tile, canvas) = (crate::live_tests::text_center(&s, "Card"), u.app.canvas.rect.center());
+    u.drag_to(tile, canvas);
+    u.button(canvas, false);
+    u.frame(vec![]);
+    assert_eq!(instances(&u), 0, "a click on a component, or a drag onto the canvas, places no instance");
+    assert!(!styled(&u), "a click on a style doesn't apply it");
+    assert!(u.app.ui.toast.as_ref().is_some_and(|(m, _)| m.contains("Shift+D")));
+    // In the design both edit.
+    u.app.ui.right_tab = crate::RightTab::Design;
+    click(&mut u, "Card");
+    assert_eq!(instances(&u), 1);
+    u.drag_to(tile, canvas);
+    u.button(canvas, false);
+    u.frame(vec![]);
+    assert_eq!(instances(&u), 2, "the same drag places one");
+    u.app.session.execute("select.set", &json!({"ids": [r]})).unwrap();
+    click(&mut u, "Brand");
+    assert!(styled(&u));
+}
+
+#[test]
+fn dev_mode_assets_panel_accepts_no_library_updates() {
+    let dir = std::env::temp_dir().join(format!("figcraft-dev-mode-updates-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("Library.figcraft");
+    let mut lib = Session::new();
+    lib.execute("style.create", &json!({"type": "paint", "name": "Brand", "value": [{"type": "solid", "color": "#0000FF"}]})).unwrap();
+    lib.execute("library.publish", &json!({})).unwrap();
+    lib.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
+    let mut s = Session::new();
+    let added = s.execute("library.add", &json!({"path": path.to_string_lossy()})).unwrap();
+    let r = id(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 40, "height": 40})).unwrap());
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    s.execute("library.applyStyle", &json!({"library": added["id"], "style": "Brand"})).unwrap();
+    lib.execute("style.update", &json!({"style": "Brand", "value": "#00FF00"})).unwrap();
+    lib.execute("library.publish", &json!({})).unwrap();
+    lib.execute("file.save", &json!({})).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    u.app.ui.left_tab = crate::LeftTab::Assets;
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    let updates = |u: &mut crate::layers_drag_tests::Ui| u.app.session.execute("library.updates", &json!({})).unwrap()["count"].as_u64();
+    let update = |u: &mut crate::layers_drag_tests::Ui| {
+        let s = crate::live_tests::flat(&u.frame_output(vec![]).shapes);
+        let at = crate::live_tests::text_center(&s, "Update");
+        u.button(at, true);
+        u.button(at, false);
+        u.frame(vec![]);
+    };
+    assert_eq!(updates(&mut u), Some(1));
+    update(&mut u);
+    assert_eq!(updates(&mut u), Some(1), "Update in Dev Mode pulls nothing in");
+    assert!(u.app.ui.toast.as_ref().is_some_and(|(m, _)| m.contains("Shift+D")));
+    u.app.ui.right_tab = crate::RightTab::Design;
+    update(&mut u);
+    assert_eq!(updates(&mut u), Some(0), "in the design it does");
+    let _ = std::fs::remove_file(&path);
+    let _ = std::fs::remove_dir(&dir);
+}
+
+#[test]
+fn dev_mode_publishes_no_library() {
+    let mut s = Session::new();
+    s.execute("style.create", &json!({"type": "paint", "name": "Brand", "value": [{"type": "solid", "color": "#0D99FF"}]})).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    u.app.ui.left_tab = crate::LeftTab::Assets;
+    u.app.ui.libraries = true;
+    u.app.ui.right_tab = crate::RightTab::Inspect;
+    let s = crate::live_tests::flat(&u.frame_output(vec![]).shapes);
+    let at = crate::live_tests::text_center(&s, "Publish");
+    u.button(at, true);
+    u.button(at, false);
+    u.frame(vec![]);
+    assert!(u.app.session.doc().unwrap().published.is_none(), "Publish in Dev Mode publishes nothing");
+    assert!(u.app.ui.toast.as_ref().is_some_and(|(m, _)| m.contains("Shift+D")));
+}
diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs
index 236f8e0d..b3e1461a 100644
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@ -1,17 +1,41 @@
 //! Dialogs: About, Preferences, keyboard shortcuts, find & replace, rename layers, variables,
 //! export.
 
-use egui::{Align2, Color32, Context, CornerRadius, RichText, Sense, Stroke, vec2};
+use std::path::Path;
+
+use egui::{Align2, Context, CornerRadius, RichText, Sense, Stroke, vec2};
 use figcraft_color::ColorProfile;
 use figcraft_doc::{ExportFormat, ExportSetting, ExportSize, NodeId};
 use figcraft_engine::cmd::file::{export_jobs, exportable_layers};
-use serde_json::json;
+use serde_json::{Value, json};
 
 use crate::FigApp;
 use crate::export_panel::{export_layers, save_one, suggested_name};
 use crate::i18n::{self, tr, tr_noop, trf, trn};
-use crate::icons::{self, Icon};
-use crate::theme::{ACCENT, Tokens, regular, semibold};
+use crate::theme::{Tokens, regular, semibold};
+
+mod batch_rename;
+mod color_profile;
+mod export;
+mod menu_input;
+
+pub use batch_rename::BatchRenameUi;
+use batch_rename::batch_rename_dialog;
+#[cfg(test)]
+pub(crate) use batch_rename::batch_rename_params;
+pub(crate) use batch_rename::open_batch_rename;
+use color_profile::color_profile_dialog;
+use export::export_dialog;
+pub(crate) use export::file_saved;
+pub use menu_input::MenuInput;
+use menu_input::menu_input_dialog;
+pub mod branch_ui;
+pub mod credits;
+pub mod import_report;
+pub mod missing_fonts;
+pub mod plugins_ui;
+pub mod updates_ui;
+pub mod variables_panel;
 
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -84,7 +108,7 @@ impl AboutTab {
 }
 
 /// The About window's width, the same on every tab (the Contributors table needs the room).
-pub const ABOUT_WIDTH: f32 = 640.0;
+pub const ABOUT_WIDTH: f32 = 660.0;
 
 /// The About window's tab row, drawn like the Design / Prototype tabs of the right panel.
 /// A row of tabs (the About window's, the shortcuts panel's): the current one highlighted.
@@ -96,7 +120,7 @@ pub(crate) fn tab_strip<T: Copy + PartialEq>(ui: &mut egui::Ui, t: &Tokens, tabs
             let active = *current == tab;
             let galley = ui.painter().layout_no_wrap(label.into(), semibold(11.0), if active { t.text } else { t.text_secondary });
             let (r, resp) = ui.allocate_exact_size(vec2(galley.size().x + 16.0, 24.0), Sense::click());
-            resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, active, label));
+            resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, active, label));
             if active || resp.hovered() {
                 ui.painter().rect_filled(r, CornerRadius::same(5), t.hover);
             }
@@ -112,10 +136,10 @@ pub(crate) fn tab_strip<T: Copy + PartialEq>(ui: &mut egui::Ui, t: &Tokens, tabs
 fn about_body(ui: &mut egui::Ui, t: &Tokens) {
     ui.horizontal(|ui| {
         let (r, _) = ui.allocate_exact_size(vec2(48.0, 48.0), Sense::hover());
-        ui.painter().rect_filled(r, CornerRadius::same(10), ACCENT);
-        icons::paint(ui.painter(), r.shrink(10.0), Icon::Logo, Color32::WHITE);
+        crate::theme::paint_app_icon(ui, r);
         ui.vertical(|ui| {
-            ui.label(RichText::new("FigCraft").font(semibold(18.0)));
+            let (wordmark, _) = ui.allocate_exact_size(vec2(130.0, 23.0), Sense::hover());
+            crate::theme::paint_wordmark(ui.painter(), egui::pos2(wordmark.min.x, wordmark.center().y), 18.0, t);
             ui.label(RichText::new(trf("Version {version}", &[("version", &VERSION)])).color(t.text_secondary));
         });
     });
@@ -133,12 +157,19 @@ fn about_body(ui: &mut egui::Ui, t: &Tokens) {
 }
 
 /// Escape closes the topmost simple dialog (one without menus of its own), before the canvas's
-/// shortcuts see it (it doesn't deselect), like a system dialog: from one of its fields too.
+/// shortcuts see it (it doesn't deselect), like a system dialog: from one of its fields too. A menu
+/// open over the dialog (Preferences ▸ Interface size) takes the first Escape and closes alone.
 pub fn keys(app: &mut FigApp, ctx: &Context) {
+    if egui::Popup::is_any_open(ctx) {
+        return;
+    }
     let u = &mut app.ui;
     let open = u.color_profile.is_some()
+        || u.menu_input.is_some()
         || u.find.is_some()
         || u.batch_rename.is_some()
+        || u.import_report.is_some()
+        || u.missing_fonts.is_some()
         || u.confirm_close
         || u.export_preview
         || u.shortcuts_panel
@@ -147,7 +178,13 @@ pub fn keys(app: &mut FigApp, ctx: &Context) {
     if !open || !ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape)) {
         return;
     }
-    if u.color_profile.take().is_some() || u.find.take().is_some() || u.batch_rename.take().is_some() {
+    if u.menu_input.take().is_some()
+        || u.color_profile.take().is_some()
+        || u.find.take().is_some()
+        || u.batch_rename.take().is_some()
+        || u.import_report.take().is_some()
+        || u.missing_fonts.take().is_some()
+    {
         return;
     }
     for flag in [&mut u.confirm_close, &mut u.export_preview, &mut u.shortcuts_panel, &mut u.preferences, &mut u.about] {
@@ -157,9 +194,15 @@ pub fn keys(app: &mut FigApp, ctx: &Context) {
     }
 }
 
+/// Draw the app's dialogs and cards: pending opens/imports/missing fonts, About,
+/// Preferences, shortcuts, find/replace, batch rename, menu input, variables, dev compare,
+/// branch, export preview, colour profile, plugin, live join/publish, online dialogs and
+/// close confirmation.
 pub fn show(app: &mut FigApp, ctx: &Context) {
     // Dropped files waiting to open: their card, then (once it has shown) the files.
     crate::pending_open::pending_opens(app, ctx);
+    crate::import_report::show(app, ctx);
+    crate::missing_fonts::show(app, ctx);
     let t = Tokens::get(ctx);
     if app.ui.about {
         let mut open = true;
@@ -202,6 +245,9 @@ pub fn show(app: &mut FigApp, ctx: &Context) {
             if !cfg!(target_arch = "wasm32") && crate::widgets::checkbox(ui, prefs.auto_save, tr("Save files automatically")) {
                 toggles.push("pref.autoSave");
             }
+            if !cfg!(target_arch = "wasm32") && crate::widgets::checkbox(ui, prefs.start_on_home, tr("Start on the Home screen")) {
+                toggles.push("pref.startOnHome");
+            }
             for c in toggles {
                 app.run(c, json!({}));
             }
@@ -219,7 +265,7 @@ pub fn show(app: &mut FigApp, ctx: &Context) {
             ui.add_space(8.0);
             ui.horizontal(|ui| {
                 ui.label(tr("Your name in comments"));
-                if let Some(name) = crate::widgets::text_field(ui, egui::Id::new("pref_user_name"), &prefs.user_name, 160.0, tr("You")) {
+                if let Some(name) = crate::widgets::text_field(ui, egui::Id::unique("pref_user_name"), &prefs.user_name, 160.0, tr("You")) {
                     app.run("pref.userName", json!({"name": name}));
                 }
             });
@@ -229,7 +275,7 @@ pub fn show(app: &mut FigApp, ctx: &Context) {
                 // Where Share ▸ Online keeps files and join codes are asked; no key here
                 // (preferences are saved as text).
                 let name = tr("Server for online sharing");
-                if let Some(url) = crate::widgets::text_field_named(ui, egui::Id::new("pref_publish_server"), &prefs.publish_server, 220.0, name) {
+                if let Some(url) = crate::widgets::text_field_named(ui, egui::Id::unique("pref_publish_server"), &prefs.publish_server, 220.0, name) {
                     app.run("pref.publishServer", json!({"url": url}));
                 }
                 let usual = prefs.publish_server == figcraft_engine::live::DEFAULT_SERVER;
@@ -252,6 +298,8 @@ pub fn show(app: &mut FigApp, ctx: &Context) {
                 }
             });
             ui.add_space(8.0);
+            interface_size(app, ui, prefs.ui_scale);
+            ui.add_space(8.0);
             ui.horizontal(|ui| {
                 ui.label(tr("Theme"));
                 for (l, c) in [(tr_noop("Light"), "view.themeLight"), (tr_noop("Dark"), "view.themeDark"), (tr_noop("System"), "view.themeSystem")] {
@@ -264,12 +312,26 @@ pub fn show(app: &mut FigApp, ctx: &Context) {
             ui.horizontal(|ui| {
                 ui.label(tr("Language"));
                 // Each language by its own name; System follows the OS (the browser on the web).
-                let langs = i18n::languages().iter().filter(|l| crate::cjk::can_show(l.code)).map(|l| (l.code, l.name));
-                for (code, name) in [("system", tr("System"))].into_iter().chain(langs) {
-                    if ui.selectable_label(app.session.prefs.language.eq_ignore_ascii_case(code), name).clicked() {
-                        app.run("pref.language", json!({"language": code}));
-                        ui.ctx().request_repaint();
+                let langs = || {
+                    [("system", tr("System"))]
+                        .into_iter()
+                        .chain(i18n::languages().iter().filter(|l| crate::cjk::can_show(l.code)).map(|l| (l.code, l.name)))
+                };
+                let on = |code: &str| app.session.prefs.language.eq_ignore_ascii_case(code);
+                let selected = langs().find(|(code, _)| on(code)).map_or(tr("System"), |(_, name)| name);
+                let resp = crate::widgets::dropdown(ui, selected, 220.0, None);
+                let mut pick = None;
+                crate::right::menu_popup(&resp).show(|ui| {
+                    for (code, name) in langs() {
+                        if crate::right::menu_check(ui, on(code), name, "") {
+                            pick = Some(code);
+                            ui.close();
+                        }
                     }
+                });
+                if let Some(code) = pick {
+                    app.run("pref.language", json!({"language": code}));
+                    ui.ctx().request_repaint();
                 }
             });
             if let Some(lang) = i18n::current().filter(|l| l.draft) {
@@ -286,7 +348,7 @@ pub fn show(app: &mut FigApp, ctx: &Context) {
         let mut open = true;
         let mut action = None;
         egui::Window::new(tr("Find and replace"))
-            .id(egui::Id::new("Find and replace"))
+            .id(egui::Id::unique("Find and replace"))
             .open(&mut open)
             .anchor(Align2::LEFT_TOP, vec2(260.0, 120.0))
             .resizable(false)
@@ -321,6 +383,7 @@ pub fn show(app: &mut FigApp, ctx: &Context) {
         app.ui.find = if open { Some((find, replace)) } else { None };
     }
     batch_rename_dialog(app, ctx);
+    menu_input_dialog(app, ctx);
     crate::variables_panel::show(app, ctx);
     crate::dev_compare::show(app, ctx);
     crate::branch_ui::show(app, ctx);
@@ -335,295 +398,72 @@ pub fn show(app: &mut FigApp, ctx: &Context) {
     crate::windows::confirm_close(app, ctx);
 }
 
-/// The Rename layers dialog's fields.
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct BatchRenameUi {
-    /// The layers, in stacking order (bottom first), as numbered.
-    pub ids: Vec<NodeId>,
-    /// Match: empty renames the whole name.
-    pub find: String,
-    pub regex: bool,
-    /// Rename to.
-    pub to: String,
-    /// Where up numbers start and down numbers stop.
-    pub start: u32,
-}
-
-/// Layers whose new names the dialog previews.
-const PREVIEW_ROWS: usize = 5;
-
-/// Open the Rename layers dialog for `ids` (several layers: Cmd/Ctrl+R, F2, the context menu).
-pub(crate) fn open_batch_rename(app: &mut FigApp, ids: &[NodeId]) {
-    let Ok(doc) = app.session.doc() else { return };
-    let ids = figcraft_engine::cmd::edit::z_sorted(doc, ids);
-    app.ui.batch_rename = Some(BatchRenameUi { ids, start: 1, ..Default::default() });
-}
-
-/// The rename the fields describe: a match replaced, or (no match) the whole name.
-pub(crate) fn batch_rename_params(b: &BatchRenameUi) -> serde_json::Value {
-    let mut p = json!({"ids": b.ids, "regex": b.regex, "start": b.start});
-    if b.find.is_empty() {
-        p["name"] = json!(b.to);
-    } else {
-        p["find"] = json!(b.find);
-        p["replace"] = json!(b.to);
-    }
-    p
-}
-
-/// Rename layers: Match, Rename to with buttons for the current name and numbers, where numbers
-/// start, a preview of the first new names, then one `object.batchRename`.
-fn batch_rename_dialog(app: &mut FigApp, ctx: &Context) {
-    let Some(mut b) = app.ui.batch_rename.clone() else { return };
-    let t = Tokens::get(ctx);
-    let find = (!b.find.is_empty()).then_some(b.find.as_str());
-    let rename = figcraft_engine::rename::BatchRename::new(find, b.regex, &b.to, find.is_none().then_some(b.to.as_str()), Some(f64::from(b.start)));
-    let n = b.ids.len();
-    let ready = rename.is_ok() && !(b.find.is_empty() && b.to.is_empty());
-    let preview: Vec<(String, String)> = match (&rename, app.session.doc()) {
-        (Ok(r), Ok(doc)) if ready => b
-            .ids
-            .iter()
-            .enumerate()
-            .take(PREVIEW_ROWS)
-            .filter_map(|(k, i)| doc.node(*i).map(|node| (node.name.clone(), r.apply(&node.name, k, n))))
-            .collect(),
-        _ => Vec::new(),
-    };
-    let mut open = true;
-    let mut cancel = false;
-    let mut apply = false;
-    window(tr("Rename layers"), ctx).id(egui::Id::new("Rename layers")).open(&mut open).show(ctx, |ui| {
-        ui.set_width(320.0);
-        ui.label(RichText::new(trn("{n} layers", n, &[])).color(t.text_secondary));
-        ui.add_space(6.0);
-        let r = ui.add(egui::TextEdit::singleline(&mut b.find).hint_text(tr("Match (empty: the whole name)")).desired_width(300.0));
-        crate::widgets::select_all_on_focus(ui, &r, &b.find);
-        if crate::widgets::checkbox(ui, b.regex, tr("Regular expression")) {
-            b.regex = !b.regex;
-        }
-        let to = ui.add(egui::TextEdit::singleline(&mut b.to).hint_text(tr("Rename to")).desired_width(300.0));
-        crate::widgets::select_all_on_focus(ui, &to, &b.to);
-        ui.horizontal(|ui| {
-            for (label, code) in [(tr("Current name"), "$&"), (tr("Number ↑"), "$n"), (tr("Number ↓"), "$N")] {
-                if ui.button(label).clicked() {
-                    b.to.push_str(code);
-                    to.request_focus();
-                }
-            }
-        });
-        ui.horizontal(|ui| {
-            ui.label(tr("Start ascending from / stop descending at"));
-            ui.add(egui::DragValue::new(&mut b.start).range(0..=1_000_000));
-        });
-        ui.add_space(8.0);
-        match &rename {
-            Err(e) => {
-                ui.label(RichText::new(e).color(t.danger));
-            }
-            Ok(_) => {
-                for (old, new) in &preview {
-                    ui.horizontal(|ui| {
-                        ui.label(RichText::new(old).color(t.text_secondary));
-                        ui.label("→");
-                        ui.label(new);
-                    });
-                }
-                if ready && n > PREVIEW_ROWS {
-                    ui.label(RichText::new(trn("and {n} more", n - PREVIEW_ROWS, &[])).color(t.text_secondary));
-                }
-            }
-        }
-        ui.add_space(8.0);
-        ui.horizontal(|ui| {
-            cancel = crate::widgets::button(ui, tr("Cancel"), false, true).clicked();
-            let enter = to.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter));
-            apply = (crate::widgets::button(ui, tr("Rename"), true, ready).clicked() || enter) && ready;
-        });
-    });
-    if apply {
-        app.run("object.batchRename", batch_rename_params(&b));
-    }
-    app.ui.batch_rename = (open && !cancel && !apply).then_some(b);
-}
-
-/// File ▸ Color profile: pick sRGB or Display P3, then keep the colours' appearance (convert the
-/// values) or keep the values (reinterpret them in the new space).
-fn color_profile_dialog(app: &mut FigApp, ctx: &Context) {
-    let Some(mut chosen) = app.ui.color_profile else { return };
-    let Ok(current) = app.session.doc().map(|d| d.color_profile) else {
-        app.ui.color_profile = None;
+/// Preferences ▸ Interface size: a size relative to the system's display scale (100 % is the
+/// system's own), as a drop-down that takes effect at once. The browser has its own zoom, so there
+/// the row only says so.
+fn interface_size(app: &mut FigApp, ui: &mut egui::Ui, chosen: f64) {
+    let t = Tokens::get(ui.ctx());
+    if cfg!(target_arch = "wasm32") {
+        ui.label(tr("Interface size"));
+        crate::widgets::label(ui, tr("Use your browser's zoom to change the interface size."), t.text_secondary);
         return;
-    };
-    let t = Tokens::get(ctx);
-    let mut open = true;
-    let mut apply = None;
-    window(tr("Color profile"), ctx).open(&mut open).show(ctx, |ui| {
-        ui.set_width(340.0);
-        ui.label(RichText::new(tr("Color values in this file are in this color space.")).color(t.text_secondary).font(regular(11.0)));
-        ui.add_space(8.0);
-        for p in ColorProfile::ALL {
-            let label = if p == current { trf("{profile} (current)", &[("profile", &p.label())]) } else { p.label().to_string() };
-            if crate::widgets::radio(ui, chosen == p, &label) {
-                chosen = p;
-            }
-        }
-        ui.add_space(8.0);
-        if chosen == current {
-            ui.label(RichText::new(tr("Choose another profile to change it.")).color(t.text_secondary).font(regular(11.0)));
-            return;
-        }
-        ui.label(
-            RichText::new(trf(
-                "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift.",
-                &[("profile", &chosen.label())],
-            ))
-            .font(regular(11.0)),
-        );
-        if !chosen.is_srgb() {
-            ui.add_space(4.0);
-            ui.label(
-                RichText::new(tr("The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3."))
-                    .color(t.text_secondary)
-                    .font(regular(11.0)),
-            );
-        }
-        ui.add_space(12.0);
-        ui.horizontal(|ui| {
-            if crate::widgets::button(ui, tr("Keep appearance"), true, true).clicked() {
-                apply = Some(true);
-            }
-            if crate::widgets::button(ui, tr("Keep values"), false, true).clicked() {
-                apply = Some(false);
-            }
-        });
-    });
-    app.ui.color_profile = open.then_some(chosen);
-    if let Some(convert) = apply {
-        app.run("file.colorProfile", json!({"profile": chosen.id(), "convert": convert}));
-        app.ui.color_profile = None;
     }
-}
-
-/// Save the whole file as `.fig`; the toast says how much was left out.
-fn save_fig(app: &mut FigApp, name: &str) {
-    let filename = format!("{name}.fig");
-    app.pick_save(tr("Export"), &filename, &["fig"], |app, p| {
-        let file = p.file_name().map(|f| f.to_string_lossy().to_string()).unwrap_or_default();
-        if let Some(r) = app.run("file.export", json!({"format": "fig", "path": p.to_string_lossy()})) {
-            let left_out = r["warnings"].as_array().map_or(0, Vec::len);
-            app.toast(match left_out {
-                0 => trf("Exported {name}", &[("name", &file)]),
-                n => trn("Exported {name}; {n} kinds of content were left out", n, &[("name", &file)]),
+    let percent = |size: f64| trf("{percent}%", &[("percent", &crate::ui_scale::percent(size as f32))]);
+    let shown = percent(chosen);
+    ui.horizontal(|ui| {
+        ui.label(tr("Interface size"));
+        let resp = crate::widgets::dropdown(ui, &shown, 120.0, None);
+        crate::a11y::combo(&resp, tr("Interface size"), &shown, crate::a11y::menu_open(&resp));
+        crate::right::menu_popup(&resp).show(|ui| {
+            let focused = ui.memory(|memory| memory.focused());
+            let step = ui.input(|input| {
+                if input.key_pressed(egui::Key::ArrowDown) || (input.key_pressed(egui::Key::Tab) && !input.modifiers.shift) {
+                    1
+                } else if input.key_pressed(egui::Key::ArrowUp) || (input.key_pressed(egui::Key::Tab) && input.modifiers.shift) {
+                    -1
+                } else {
+                    0
+                }
             });
-        }
+            let mut rows = Vec::with_capacity(crate::ui_scale::SIZES.len());
+            for size in crate::ui_scale::SIZES {
+                let label = percent(size);
+                let selected = (chosen - size).abs() < 1e-6;
+                let row = crate::right::menu_row(ui, &format!("{}{label}", if selected { "✓ " } else { "    " }), "", 0.0, |_, _, _| {});
+                crate::a11y::menu_item(&row, &label, "", Some(selected));
+                if row.has_focus() {
+                    ui.memory_mut(|memory| memory.set_focus_lock_filter(row.id, egui::EventFilter { tab: true, ..Default::default() }));
+                }
+                rows.push(row.id);
+                if row.clicked() {
+                    app.run("pref.uiScale", json!({"scale": size}));
+                    ui.close();
+                }
+            }
+            // Spatial focus can jump to a control behind the popup when the menu overlaps the
+            // Preferences window. Once an item is focused, walk the menu's own rows instead.
+            if step != 0
+                && let Some(index) = rows.iter().position(|id| Some(*id) == focused)
+            {
+                let next = index.saturating_add_signed(step).min(rows.len() - 1);
+                ui.memory_mut(|memory| {
+                    memory.request_focus(rows[next]);
+                    memory.move_focus(egui::FocusDirection::None);
+                });
+            }
+        });
     });
-}
-
-/// What the Export dialog was asked to do.
-enum ExportChoice {
-    /// Every layer with export settings, with those settings.
-    Layers,
-    /// The layers together as one file.
-    Once(ExportSetting),
-    /// The whole file as `.fig` (experimental).
-    Fig,
-}
-
-/// The Export dialog: the layers' own export settings when they have some, and one-off presets for
-/// the selection (or the page) as one file.
-fn export_dialog(app: &mut FigApp, ctx: &Context) {
-    let t = Tokens::get(ctx);
-    let mut open = true;
-    let sel = app.session.selection();
-    let Ok(ds) = app.session.ds() else {
-        app.ui.export_preview = false;
-        return;
-    };
-    let (doc, page) = (ds.doc.clone(), ds.page);
-    let ids = if sel.is_empty() { doc.node(page).map(|p| p.children.clone()).unwrap_or_default() } else { sel.clone() };
-    // With nothing selected, every layer on the page that has export settings.
-    let with_settings = if sel.is_empty() { exportable_layers(&doc, page) } else { sel };
-    let jobs = export_jobs(&doc, &with_settings);
-    let print = app.ui.pdf_print;
-    let preset = |size: f64, format| ExportSetting { size: ExportSize::Scale { value: size }, format, print, ..Default::default() };
-    let presets = [
-        preset(1.0, ExportFormat::Png),
-        preset(2.0, ExportFormat::Png),
-        preset(3.0, ExportFormat::Png),
-        preset(2.0, ExportFormat::Jpg),
-        preset(2.0, ExportFormat::Webp),
-        preset(1.0, ExportFormat::Svg),
-        preset(1.0, ExportFormat::Pdf),
-    ];
-    let mut choice = None;
-    window(tr("Export"), ctx).open(&mut open).show(ctx, |ui| {
-        ui.set_width(320.0);
-        let caption = |ui: &mut egui::Ui, s: &str| {
-            ui.label(RichText::new(s).font(regular(11.0)).color(t.text_secondary));
-        };
-        let divider = |ui: &mut egui::Ui| {
-            ui.add_space(10.0);
-            let (r, _) = ui.allocate_exact_size(vec2(320.0, 1.0), Sense::hover());
-            ui.painter().line_segment([r.left_center(), r.right_center()], Stroke::new(1.0, t.border));
-            ui.add_space(10.0);
-        };
-        let row = |ui: &mut egui::Ui, label: &str| {
-            let (r, resp) = ui.allocate_exact_size(vec2(320.0, 30.0), Sense::click());
-            if resp.hovered() {
-                ui.painter().rect_filled(r, CornerRadius::same(5), t.hover);
-            }
-            ui.painter().text(r.left_center() + vec2(10.0, 0.0), Align2::LEFT_CENTER, label, regular(12.0), t.text);
-            resp.clicked()
-        };
-        if !jobs.is_empty() {
-            caption(ui, tr("With the layers' export settings"));
-            const SHOWN: usize = 6;
-            for j in jobs.iter().take(SHOWN) {
-                ui.label(RichText::new(&j.file).font(regular(12.0)).color(t.text));
-            }
-            if jobs.len() > SHOWN {
-                caption(ui, &trn("and {n} more", jobs.len() - SHOWN, &[]));
-            }
-            ui.add_space(6.0);
-            let layers = jobs.iter().map(|j| j.id).collect::<std::collections::BTreeSet<_>>().len();
-            let label = trn("Export {n} layers", layers, &[]);
-            if crate::widgets::button(ui, &label, true, true).clicked() {
-                choice = Some(ExportChoice::Layers);
-            }
-            divider(ui);
-        }
-        caption(ui, &trn("{n} layers as one file", ids.len(), &[]));
-        ui.add_space(4.0);
-        for p in &presets {
-            let label = if p.format.is_raster() { format!("{} @{}", p.format.label(), p.size.label()) } else { p.format.label().to_string() };
-            if row(ui, &label) {
-                choice = Some(ExportChoice::Once(p.clone()));
-            }
-        }
-        // The PDF preset's print options.
-        ui.add_space(6.0);
-        caption(ui, tr("PDF print options"));
-        if let Some(next) = crate::export_panel::print_options(ui, egui::Id::new("export_dialog_print"), &print) {
-            app.ui.pdf_print = next;
-        }
-        divider(ui);
-        caption(ui, tr("The whole file"));
-        ui.add_space(4.0);
-        if row(ui, tr(".fig (experimental)")) {
-            choice = Some(ExportChoice::Fig);
-        }
-        caption(ui, tr("Other apps may not open every .fig file exported here."));
-    });
-    let close = choice.is_some() || !open;
-    match choice {
-        Some(ExportChoice::Layers) => export_layers(app, &with_settings, false),
-        Some(ExportChoice::Once(s)) if !ids.is_empty() => save_one(app, &ids, &s, &suggested_name(&doc, &ids, &s, "Export")),
-        Some(ExportChoice::Once(_)) => app.toast(tr("Nothing to export")),
-        Some(ExportChoice::Fig) => save_fig(app, &doc.name),
-        None => {}
-    }
-    if close {
-        app.ui.export_preview = false;
+    crate::widgets::label(
+        ui,
+        tr("Relative to your system's display scaling (100% is the system's own size). Document zoom is separate."),
+        t.text_secondary,
+    );
+    // Said in words, not only by the menu's value: the window is too small for the size chosen.
+    if app.ui.ui_scale.limited {
+        let note = trf(
+            "The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%.",
+            &[("size", &crate::ui_scale::percent(chosen as f32)), ("drawn", &crate::ui_scale::percent(app.ui.ui_scale.zoom))],
+        );
+        crate::widgets::label(ui, &note, t.text_secondary);
     }
 }
diff --git a/crates/ui-egui/src/dialogs/batch_rename.rs b/crates/ui-egui/src/dialogs/batch_rename.rs
new file mode 100644
index 00000000..b28055f2
--- /dev/null
+++ b/crates/ui-egui/src/dialogs/batch_rename.rs
@@ -0,0 +1,113 @@
+use super::*;
+
+/// The Rename layers dialog's fields.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct BatchRenameUi {
+    /// The layers, in stacking order (bottom first), as numbered.
+    pub ids: Vec<NodeId>,
+    /// Match: empty renames the whole name.
+    pub find: String,
+    pub regex: bool,
+    /// Rename to.
+    pub to: String,
+    /// Where up numbers start and down numbers stop.
+    pub start: u32,
+}
+
+/// Layers whose new names the dialog previews.
+const PREVIEW_ROWS: usize = 5;
+
+/// Open the Rename layers dialog for `ids` (several layers: Cmd/Ctrl+R, F2, the context menu).
+pub(crate) fn open_batch_rename(app: &mut FigApp, ids: &[NodeId]) {
+    let Ok(doc) = app.session.doc() else { return };
+    let ids = figcraft_engine::cmd::edit::z_sorted(doc, ids);
+    app.ui.batch_rename = Some(BatchRenameUi { ids, start: 1, ..Default::default() });
+}
+
+/// The rename the fields describe: a match replaced, or (no match) the whole name.
+pub(crate) fn batch_rename_params(b: &BatchRenameUi) -> serde_json::Value {
+    let mut p = json!({"ids": b.ids, "regex": b.regex, "start": b.start});
+    if b.find.is_empty() {
+        p["name"] = json!(b.to);
+    } else {
+        p["find"] = json!(b.find);
+        p["replace"] = json!(b.to);
+    }
+    p
+}
+
+/// Rename layers: Match, Rename to with buttons for the current name and numbers, where numbers
+/// start, a preview of the first new names, then one `object.batchRename`.
+pub(super) fn batch_rename_dialog(app: &mut FigApp, ctx: &Context) {
+    let Some(mut b) = app.ui.batch_rename.clone() else { return };
+    let t = Tokens::get(ctx);
+    let find = (!b.find.is_empty()).then_some(b.find.as_str());
+    let rename = figcraft_engine::rename::BatchRename::new(find, b.regex, &b.to, find.is_none().then_some(b.to.as_str()), Some(f64::from(b.start)));
+    let n = b.ids.len();
+    let ready = rename.is_ok() && !(b.find.is_empty() && b.to.is_empty());
+    let preview: Vec<(String, String)> = match (&rename, app.session.doc()) {
+        (Ok(r), Ok(doc)) if ready => b
+            .ids
+            .iter()
+            .enumerate()
+            .take(PREVIEW_ROWS)
+            .filter_map(|(k, i)| doc.node(*i).map(|node| (node.name.clone(), r.apply(&node.name, k, n))))
+            .collect(),
+        _ => Vec::new(),
+    };
+    let mut open = true;
+    let mut cancel = false;
+    let mut apply = false;
+    window(tr("Rename layers"), ctx).id(egui::Id::unique("Rename layers")).open(&mut open).show(ctx, |ui| {
+        ui.set_width(320.0);
+        ui.label(RichText::new(trn("{n} layers", n, &[])).color(t.text_secondary));
+        ui.add_space(6.0);
+        let r = ui.add(egui::TextEdit::singleline(&mut b.find).hint_text(tr("Match (empty: the whole name)")).desired_width(300.0));
+        crate::widgets::select_all_on_focus(ui, &r, &b.find);
+        if crate::widgets::checkbox(ui, b.regex, tr("Regular expression")) {
+            b.regex = !b.regex;
+        }
+        let to = ui.add(egui::TextEdit::singleline(&mut b.to).hint_text(tr("Rename to")).desired_width(300.0));
+        crate::widgets::select_all_on_focus(ui, &to, &b.to);
+        ui.horizontal(|ui| {
+            for (label, code) in [(tr("Current name"), "$&"), (tr("Number ↑"), "$n"), (tr("Number ↓"), "$N")] {
+                if ui.button(label).clicked() {
+                    b.to.push_str(code);
+                    to.request_focus();
+                }
+            }
+        });
+        ui.horizontal(|ui| {
+            ui.label(tr("Start ascending from / stop descending at"));
+            ui.add(egui::DragValue::new(&mut b.start).range(0..=1_000_000));
+        });
+        ui.add_space(8.0);
+        match &rename {
+            Err(e) => {
+                ui.label(RichText::new(e).color(t.danger));
+            }
+            Ok(_) => {
+                for (old, new) in &preview {
+                    ui.horizontal(|ui| {
+                        ui.label(RichText::new(old).color(t.text_secondary));
+                        ui.label("→");
+                        ui.label(new);
+                    });
+                }
+                if ready && n > PREVIEW_ROWS {
+                    ui.label(RichText::new(trn("and {n} more", n - PREVIEW_ROWS, &[])).color(t.text_secondary));
+                }
+            }
+        }
+        ui.add_space(8.0);
+        ui.horizontal(|ui| {
+            cancel = crate::widgets::button(ui, tr("Cancel"), false, true).clicked();
+            let enter = to.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter));
+            apply = (crate::widgets::button(ui, tr("Rename"), true, ready).clicked() || enter) && ready;
+        });
+    });
+    if apply {
+        app.run("object.batchRename", batch_rename_params(&b));
+    }
+    app.ui.batch_rename = (open && !cancel && !apply).then_some(b);
+}
diff --git a/crates/ui-egui/src/branch_ui.rs b/crates/ui-egui/src/dialogs/branch_ui.rs
similarity index 99%
rename from crates/ui-egui/src/branch_ui.rs
rename to crates/ui-egui/src/dialogs/branch_ui.rs
index 1e3c558c..c52fc216 100644
--- a/crates/ui-egui/src/branch_ui.rs
+++ b/crates/ui-egui/src/dialogs/branch_ui.rs
@@ -75,7 +75,7 @@ pub fn banner(app: &mut FigApp, ctx: &egui::Context, canvas: Rect) {
     let Some(b) = m.branches.iter().find(|b| b.id == id) else { return };
     let (file, name, active) = (m.doc.name.clone(), b.name.clone(), b.state == BranchState::Active);
     let t = Tokens::get(ctx);
-    let review = widgets::canvas_banner(ctx, Id::new("branch_banner"), canvas, |ui| {
+    let review = widgets::canvas_banner(ctx, Id::unique("branch_banner"), canvas, |ui| {
         ui.label(egui::RichText::new(format!("“{name}”")).font(semibold(11.0)).color(t.text));
         let state =
             if active { trf("Branch of {file}", &[("file", &file)]) } else { trf("Branch of {file} · merged or archived", &[("file", &file)]) };
@@ -146,7 +146,7 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
     let mut open = true;
     let mut action = None;
     egui::Window::new("Review and merge")
-        .id(Id::new("branch_review_window"))
+        .id(Id::unique("branch_review_window"))
         .title_bar(false)
         .collapsible(false)
         .resizable(false)
diff --git a/crates/ui-egui/src/dialogs/color_profile.rs b/crates/ui-egui/src/dialogs/color_profile.rs
new file mode 100644
index 00000000..f818c50d
--- /dev/null
+++ b/crates/ui-egui/src/dialogs/color_profile.rs
@@ -0,0 +1,59 @@
+use super::*;
+
+/// File ▸ Color profile: pick sRGB or Display P3, then keep the colours' appearance (convert the
+/// values) or keep the values (reinterpret them in the new space).
+pub(super) fn color_profile_dialog(app: &mut FigApp, ctx: &Context) {
+    let Some(mut chosen) = app.ui.color_profile else { return };
+    let Ok(current) = app.session.doc().map(|d| d.color_profile) else {
+        app.ui.color_profile = None;
+        return;
+    };
+    let t = Tokens::get(ctx);
+    let mut open = true;
+    let mut apply = None;
+    window(tr("Color profile"), ctx).open(&mut open).show(ctx, |ui| {
+        ui.set_width(340.0);
+        ui.label(RichText::new(tr("Color values in this file are in this color space.")).color(t.text_secondary).font(regular(11.0)));
+        ui.add_space(8.0);
+        for p in ColorProfile::ALL {
+            let label = if p == current { trf("{profile} (current)", &[("profile", &p.label())]) } else { p.label().to_string() };
+            if crate::widgets::radio(ui, chosen == p, &label) {
+                chosen = p;
+            }
+        }
+        ui.add_space(8.0);
+        if chosen == current {
+            ui.label(RichText::new(tr("Choose another profile to change it.")).color(t.text_secondary).font(regular(11.0)));
+            return;
+        }
+        ui.label(
+            RichText::new(trf(
+                "Keep appearance converts every color value to {profile} so colors look the same. Keep values leaves the numbers as they are, so colors shift.",
+                &[("profile", &chosen.label())],
+            ))
+            .font(regular(11.0)),
+        );
+        if !chosen.is_srgb() {
+            ui.add_space(4.0);
+            ui.label(
+                RichText::new(tr("The canvas previews colors in sRGB; exported PNG, JPG and WebP files are tagged Display P3."))
+                    .color(t.text_secondary)
+                    .font(regular(11.0)),
+            );
+        }
+        ui.add_space(12.0);
+        ui.horizontal(|ui| {
+            if crate::widgets::button(ui, tr("Keep appearance"), true, true).clicked() {
+                apply = Some(true);
+            }
+            if crate::widgets::button(ui, tr("Keep values"), false, true).clicked() {
+                apply = Some(false);
+            }
+        });
+    });
+    app.ui.color_profile = open.then_some(chosen);
+    if let Some(convert) = apply {
+        app.run("file.colorProfile", json!({"profile": chosen.id(), "convert": convert}));
+        app.ui.color_profile = None;
+    }
+}
diff --git a/crates/ui-egui/src/credits.rs b/crates/ui-egui/src/dialogs/credits.rs
similarity index 99%
rename from crates/ui-egui/src/credits.rs
rename to crates/ui-egui/src/dialogs/credits.rs
index 3fc8b7a2..90df5ee3 100644
--- a/crates/ui-egui/src/credits.rs
+++ b/crates/ui-egui/src/dialogs/credits.rs
@@ -256,7 +256,7 @@ pub fn contributors_ui(ui: &mut egui::Ui) {
 /// [`contributors_ui`] over a given list (tests pass their own).
 fn contributors_in(ui: &mut egui::Ui, contributors: &[Contributor], total_commits: u64) {
     let t = Tokens::get(ui.ctx());
-    let id = egui::Id::new("credits_view");
+    let id = egui::Id::unique("credits_view");
     let mut v = ui.data_mut(|d| d.get_temp::<View>(id)).unwrap_or_default();
     ui.horizontal_wrapped(|ui| {
         ui.label(RichText::new(tr("Show")).color(t.text_secondary));
@@ -446,7 +446,7 @@ fn cell(ui: &mut egui::Ui, numeric: bool, text: &str) {
 fn header_cell(ui: &mut egui::Ui, t: &Tokens, label: &str, numeric: bool, sort: Option<Option<bool>>) -> egui::Response {
     let rect = ui.max_rect();
     let resp = ui.allocate_rect(rect, if sort.is_some() { egui::Sense::click() } else { egui::Sense::hover() });
-    let kind = if sort.is_some() { egui::WidgetType::Button } else { egui::WidgetType::Label };
+    let kind = if sort.is_some() { egui::Role::Button } else { egui::Role::Label };
     resp.widget_info(|| egui::WidgetInfo::labeled(kind, true, label));
     let resp = if sort.is_some() { resp.on_hover_cursor(egui::CursorIcon::PointingHand) } else { resp };
     let current = sort.flatten();
@@ -648,5 +648,4 @@ mod tests {
 }
 
 #[cfg(test)]
-#[path = "credits_tests.rs"]
 mod ui_tests;
diff --git a/crates/ui-egui/src/credits_tests.rs b/crates/ui-egui/src/dialogs/credits/ui_tests.rs
similarity index 66%
rename from crates/ui-egui/src/credits_tests.rs
rename to crates/ui-egui/src/dialogs/credits/ui_tests.rs
index 993aa44c..fb3993ad 100644
--- a/crates/ui-egui/src/credits_tests.rs
+++ b/crates/ui-egui/src/dialogs/credits/ui_tests.rs
@@ -1,5 +1,5 @@
 //! The credits tabs as drawn, through egui headless with FigCraft's fonts and theme: every column
-//! fits the About window, switching the Contributors view keeps its size, clicking a header sorts
+//! keeps its measured width and scrolls when needed, switching the Contributors view keeps its size, clicking a header sorts
 //! by it, and empty tables (no contributors.json) draw a note instead.
 
 use egui::{Event, Pos2, RawInput, Rect, vec2};
@@ -51,12 +51,14 @@ impl Ui {
         u
     }
 
+    /// Store the About table's current view in test context data.
     fn set_view(&self, v: View) {
-        self.ctx.data_mut(|d| d.insert_temp(egui::Id::new("credits_view"), v));
+        self.ctx.data_mut(|d| d.insert_temp(egui::Id::unique("credits_view"), v));
     }
 
+    /// Read the stored About table view, defaulting when unset.
     fn view(&self) -> View {
-        self.ctx.data(|d| d.get_temp::<View>(egui::Id::new("credits_view"))).unwrap_or_default()
+        self.ctx.data(|d| d.get_temp::<View>(egui::Id::unique("credits_view"))).unwrap_or_default()
     }
 
     /// One frame; returns the rect `draw` filled.
@@ -100,17 +102,73 @@ impl Ui {
     }
 }
 
+/// Keep measured columns and the name minimum, using horizontal scrolling when the font
+/// needs more than the About window's width. No font is required to have Inter's metrics.
+fn assert_table_columns_fit_or_scroll(u: &mut Ui, widths: &[Option<f32>]) {
+    let mut columns = Vec::new();
+    let mut minimum = 0.0;
+    let mut scroll = 0.0;
+    let mut drawn = Rect::NOTHING;
+    for _ in 0..3 {
+        columns.clear();
+        drawn = u.frame(vec![], |ui| {
+            scroll = ui.spacing().scroll.allocated_width();
+            minimum = widths.iter().flatten().sum::<f32>() + scroll + NAME_MIN_W;
+            credits_table(
+                ui,
+                "credits_width_test",
+                widths,
+                NAME_MIN_W,
+                LIST_HEIGHT,
+                |mut header| {
+                    for i in 0..widths.len() {
+                        header.col(|ui| {
+                            columns.push((ui.max_rect(), ui.clip_rect()));
+                            if i + 1 == widths.len() {
+                                ui.scroll_to_rect_animation(ui.max_rect(), Some(egui::Align::Max), egui::style::ScrollAnimation::none());
+                            }
+                        });
+                    }
+                },
+                |_| {},
+            );
+        });
+    }
+    assert!(drawn.width() <= ABOUT_WIDTH + 0.5, "table viewport grew to {} pt", drawn.width());
+    assert_eq!(columns.len(), widths.len());
+    for ((rect, _), width) in columns.iter().zip(widths) {
+        if let Some(width) = width {
+            assert!((rect.width() - width).abs() < 0.5, "measured column {width} became {} pt", rect.width());
+        } else {
+            assert!(rect.width() >= NAME_MIN_W - 0.5, "name column shrank to {} pt", rect.width());
+        }
+    }
+    let content_width = columns.iter().map(|(rect, _)| rect.width()).sum::<f32>() + scroll;
+    assert!((content_width - ABOUT_WIDTH.max(minimum)).abs() < 0.5, "content needs {minimum} pt, got {content_width}");
+    let (last, clip) = columns.last().unwrap();
+    assert!((last.intersect(*clip).width() - last.width()).abs() < 0.5, "last column cannot be scrolled fully into view: {last:?} in {clip:?}");
+    if minimum <= ABOUT_WIDTH {
+        let (first, clip) = columns.first().unwrap();
+        assert!((first.intersect(*clip).width() - first.width()).abs() < 0.5, "a fitting table scrolled its first column out of view");
+    }
+}
+
 #[test]
-fn every_column_fits_the_about_window() {
-    let mut u = Ui::new();
-    let list = people(8);
-    let refs: Vec<&Contributor> = list.iter().collect();
-    let (fixed, scroll) = u.measure(|ui| (contributor_widths(ui, &refs).iter().flatten().sum::<f32>(), ui.spacing().scroll.allocated_width()));
-    assert!(fixed + scroll + NAME_MIN_W <= ABOUT_WIDTH, "contributor columns need {} pt of {ABOUT_WIDTH}", fixed + scroll + NAME_MIN_W);
-    let models: Vec<Model> = (0..8).map(|i| model(leak(format!("Claude Model {i}")), [228, 45, 6, 2, 2, 1, 1, 1][i])).collect();
-    let rows: Vec<[String; 6]> = models.iter().map(|m| model_cells(m, 482)).collect();
-    let fixed = u.measure(|ui| model_widths(ui, &rows).iter().flatten().sum::<f32>());
-    assert!(fixed + scroll + NAME_MIN_W <= ABOUT_WIDTH, "model columns need {} pt of {ABOUT_WIDTH}", fixed + scroll + NAME_MIN_W);
+fn columns_keep_their_measured_widths_with_different_font_sizes() {
+    for scale in [0.75, 1.0, 1.5] {
+        let mut u = Ui::new();
+        u.ctx.global_style_mut(|style| {
+            style.text_styles.get_mut(&egui::TextStyle::Body).unwrap().size *= scale;
+        });
+        let list = people(8);
+        let refs: Vec<&Contributor> = list.iter().collect();
+        let widths = u.measure(|ui| contributor_widths(ui, &refs));
+        assert_table_columns_fit_or_scroll(&mut u, &widths);
+        let models: Vec<Model> = (0..8).map(|i| model(leak(format!("Claude Model {i}")), [228, 45, 6, 2, 2, 1, 1, 1][i])).collect();
+        let rows: Vec<[String; 6]> = models.iter().map(|m| model_cells(m, 482)).collect();
+        let widths = u.measure(|ui| model_widths(ui, &rows));
+        assert_table_columns_fit_or_scroll(&mut u, &widths);
+    }
 }
 
 #[test]
diff --git a/crates/ui-egui/src/dialogs/export.rs b/crates/ui-egui/src/dialogs/export.rs
new file mode 100644
index 00000000..e3a96e59
--- /dev/null
+++ b/crates/ui-egui/src/dialogs/export.rs
@@ -0,0 +1,160 @@
+use super::*;
+
+/// A `.fig` Save as result is an export; only native saves report that the document was saved.
+pub(crate) fn file_saved(app: &mut FigApp, result: &Value) {
+    if result["format"] == "fig" {
+        fig_exported(app, result);
+    } else {
+        app.toast(trf("Saved {name}", &[("name", &result_file_name(result))]));
+    }
+}
+
+fn result_file_name(result: &Value) -> String {
+    match result["path"].as_str() {
+        Some(p) => Path::new(p).file_name().map(|f| f.to_string_lossy().into_owned()).unwrap_or_default(),
+        // A download (#969).
+        None => result["name"].as_str().unwrap_or_default().to_owned(),
+    }
+}
+
+/// The `.fig` result stays an export: native save state is unchanged, and omissions are reported.
+pub(crate) fn fig_exported(app: &mut FigApp, result: &Value) {
+    let file = result_file_name(result);
+    let left_out = result["warnings"].as_array().map_or(0, Vec::len);
+    app.toast(match left_out {
+        0 => trf("Exported {name}", &[("name", &file)]),
+        n => trn("Exported {name}; {n} kinds of content were left out", n, &[("name", &file)]),
+    });
+}
+
+/// Save the whole file as `.fig`; the toast says how much was left out.
+fn save_fig(app: &mut FigApp, name: &str) {
+    let filename = format!("{name}.fig");
+    if app.services.downloads() {
+        if let Some(mut r) = app.run("file.export", json!({"format": "fig"}))
+            && app.download(&filename, &r)
+        {
+            r["name"] = json!(filename);
+            fig_exported(app, &r);
+        }
+        return;
+    }
+    app.pick_save(tr("Export"), &filename, &["fig"], |app, p| {
+        if let Some(r) = app.run("file.export", json!({"format": "fig", "path": p.to_string_lossy()})) {
+            fig_exported(app, &r);
+        }
+    });
+}
+
+/// What the Export dialog was asked to do.
+enum ExportChoice {
+    /// Every layer with export settings, with those settings.
+    Layers,
+    /// The layers together as one file.
+    Once(ExportSetting),
+    /// The whole file as `.fig` (experimental).
+    Fig,
+}
+
+/// The Export dialog: the layers' own export settings when they have some, and one-off presets for
+/// the selection (or the page) as one file.
+pub(super) fn export_dialog(app: &mut FigApp, ctx: &Context) {
+    let t = Tokens::get(ctx);
+    let mut open = true;
+    let sel = app.session.selection();
+    let Ok(ds) = app.session.ds() else {
+        app.ui.export_preview = false;
+        return;
+    };
+    let (doc, page) = (ds.doc.clone(), ds.page);
+    let ids = if sel.is_empty() { doc.node(page).map(|p| p.children.clone()).unwrap_or_default() } else { sel.clone() };
+    // With nothing selected, every layer on the page that has export settings.
+    let with_settings = if sel.is_empty() { exportable_layers(&doc, page) } else { sel };
+    let jobs = export_jobs(&doc, &with_settings);
+    let print = app.ui.pdf_print;
+    let preset = |size: f64, format| ExportSetting { size: ExportSize::Scale { value: size }, format, print, ..Default::default() };
+    let presets = [
+        preset(1.0, ExportFormat::Png),
+        preset(2.0, ExportFormat::Png),
+        preset(3.0, ExportFormat::Png),
+        preset(2.0, ExportFormat::Jpg),
+        preset(2.0, ExportFormat::Webp),
+        preset(1.0, ExportFormat::Svg),
+        preset(1.0, ExportFormat::Pdf),
+        preset(1.0, ExportFormat::VectorDrawable),
+    ];
+    let mut choice = None;
+    window(tr("Export"), ctx).open(&mut open).show(ctx, |ui| {
+        ui.set_width(320.0);
+        let caption = |ui: &mut egui::Ui, s: &str| {
+            ui.label(RichText::new(s).font(regular(11.0)).color(t.text_secondary));
+        };
+        let divider = |ui: &mut egui::Ui| {
+            ui.add_space(10.0);
+            let (r, _) = ui.allocate_exact_size(vec2(320.0, 1.0), Sense::hover());
+            ui.painter().line_segment([r.left_center(), r.right_center()], Stroke::new(1.0, t.border));
+            ui.add_space(10.0);
+        };
+        let row_tip = |ui: &mut egui::Ui, label: &str, tip: Option<&str>| {
+            let (r, resp) = ui.allocate_exact_size(vec2(320.0, 30.0), Sense::click());
+            if resp.hovered() {
+                ui.painter().rect_filled(r, CornerRadius::same(5), t.hover);
+            }
+            ui.painter().text(r.left_center() + vec2(10.0, 0.0), Align2::LEFT_CENTER, label, regular(12.0), t.text);
+            match tip {
+                Some(tip) => resp.on_hover_text(tip).clicked(),
+                None => resp.clicked(),
+            }
+        };
+        let row = |ui: &mut egui::Ui, label: &str| row_tip(ui, label, None);
+        if !jobs.is_empty() {
+            caption(ui, tr("With the layers' export settings"));
+            const SHOWN: usize = 6;
+            for j in jobs.iter().take(SHOWN) {
+                ui.label(RichText::new(&j.file).font(regular(12.0)).color(t.text));
+            }
+            if jobs.len() > SHOWN {
+                caption(ui, &trn("and {n} more", jobs.len() - SHOWN, &[]));
+            }
+            ui.add_space(6.0);
+            let layers = jobs.iter().map(|j| j.id).collect::<std::collections::BTreeSet<_>>().len();
+            let label = trn("Export {n} layers", layers, &[]);
+            if crate::widgets::button(ui, &label, true, true).clicked() {
+                choice = Some(ExportChoice::Layers);
+            }
+            divider(ui);
+        }
+        caption(ui, &trn("{n} layers as one file", ids.len(), &[]));
+        ui.add_space(4.0);
+        for p in &presets {
+            let label = if p.format.is_raster() { format!("{} @{}", p.format.label(), p.size.label()) } else { p.format.label().to_string() };
+            if row_tip(ui, &label, crate::export_panel::format_tip(p.format)) {
+                choice = Some(ExportChoice::Once(p.clone()));
+            }
+        }
+        // The PDF preset's print options.
+        ui.add_space(6.0);
+        caption(ui, tr("PDF print options"));
+        if let Some(next) = crate::export_panel::print_options(ui, egui::Id::unique("export_dialog_print"), &print) {
+            app.ui.pdf_print = next;
+        }
+        divider(ui);
+        caption(ui, tr("The whole file"));
+        ui.add_space(4.0);
+        if row(ui, tr(".fig (experimental)")) {
+            choice = Some(ExportChoice::Fig);
+        }
+        caption(ui, tr("Other apps may not open every .fig file exported here."));
+    });
+    let close = choice.is_some() || !open;
+    match choice {
+        Some(ExportChoice::Layers) => export_layers(app, &with_settings, false),
+        Some(ExportChoice::Once(s)) if !ids.is_empty() => save_one(app, &ids, &s, &suggested_name(&doc, &ids, &s, "Export")),
+        Some(ExportChoice::Once(_)) => app.toast(tr("Nothing to export")),
+        Some(ExportChoice::Fig) => save_fig(app, &doc.name),
+        None => {}
+    }
+    if close {
+        app.ui.export_preview = false;
+    }
+}
diff --git a/crates/ui-egui/src/dialogs/import_report.rs b/crates/ui-egui/src/dialogs/import_report.rs
new file mode 100644
index 00000000..5b524727
--- /dev/null
+++ b/crates/ui-egui/src/dialogs/import_report.rs
@@ -0,0 +1,179 @@
+//! The import report: what a successful `.fig`, REST JSON or SVG import left out or changed, shown
+//! in a dialog window after the file opens, so the notes don't vanish with a toast.
+
+use egui::RichText;
+use serde_json::{Value, json};
+
+use crate::FigApp;
+use crate::i18n::{tr, trn, try_tr};
+use crate::theme::{Tokens, regular};
+
+/// A report stays small even when a damaged input produces many or very long notes.
+pub const MAX_NOTES: usize = 500;
+pub const MAX_NOTE_CHARS: usize = 2_000;
+
+#[derive(Clone, Debug)]
+pub struct Report {
+    pub name: String,
+    pub pages: Option<u64>,
+    pub layers: Option<u64>,
+    pub images: Option<u64>,
+    /// The pages of an imported file were added to the open document.
+    pub appended: bool,
+    /// An SVG was placed on the current page of the open document.
+    pub placed: bool,
+    /// The document the report belongs to: it goes when that document closes.
+    pub uid: u64,
+    pub notes: Vec<String>,
+    /// `notes` as the window shows them, in the UI language (worked out once, not every frame).
+    pub shown: Vec<String>,
+    pub note_count: usize,
+}
+
+impl Report {
+    /// Only successful `file.open` and `file.import` results with import `warnings` create a report;
+    /// a native file's `repairs` are shown by the engine's own message, and an SVG opened without
+    /// notes has nothing to report. `params` are the command's, for the file's name.
+    pub fn from_result(command: &str, params: &Value, result: &Value) -> Option<Self> {
+        if !matches!(command, "file.open" | "file.openRecent" | "file.import") {
+            return None;
+        }
+        let warnings = result.get("warnings").and_then(Value::as_array)?;
+        let file_name = params.get("path").and_then(Value::as_str).and_then(|p| std::path::Path::new(p).file_name()).and_then(|n| n.to_str());
+        if command != "file.import" && warnings.is_empty() && file_name.is_some_and(|n| n.to_ascii_lowercase().ends_with(".svg")) {
+            return None;
+        }
+        // `file.import` of an SVG places a frame on the current page (no `pages`): its notes
+        // are reported, but no pages were appended.
+        let appended = command == "file.import" && result.get("pages").is_some();
+        if command == "file.import" && !appended && warnings.is_empty() {
+            return None;
+        }
+        let summary = result.get("summary");
+        let count = |key: &str| summary.and_then(|s| s.get(key)).and_then(Value::as_u64);
+        let name = summary
+            .and_then(|s| s.get("name"))
+            .and_then(Value::as_str)
+            .or(file_name)
+            .or_else(|| params.get("name").and_then(Value::as_str))
+            .unwrap_or(tr("Imported document"));
+        let mut report = Self {
+            name: name.chars().take(512).collect(),
+            pages: count("pages"),
+            layers: count("layers"),
+            images: count("images"),
+            appended,
+            placed: command == "file.import" && !appended,
+            uid: 0,
+            notes: Vec::new(),
+            shown: Vec::new(),
+            note_count: 0,
+        };
+        for note in warnings.iter().filter_map(Value::as_str) {
+            report.add_note(note);
+        }
+        Some(report)
+    }
+
+    fn add_note(&mut self, note: &str) {
+        self.note_count = self.note_count.saturating_add(1);
+        if self.notes.len() < MAX_NOTES {
+            let mut text: String = note.chars().take(MAX_NOTE_CHARS).collect();
+            if note.chars().nth(MAX_NOTE_CHARS).is_some() {
+                text.push('…');
+            }
+            self.shown.push(note_text(&text));
+            self.notes.push(text);
+        }
+    }
+
+    pub fn inspect(&self) -> Value {
+        json!({"name": self.name, "pages": self.pages, "layers": self.layers, "images": self.images,
+            "appended": self.appended, "placed": self.placed, "warnings": self.notes, "warningCount": self.note_count})
+    }
+}
+
+/// `note` in the UI language when the catalog has it (the importers' fixed notes: `.fig` imports
+/// name "the file" where REST imports name the JSON they read); a repeat count (` (×N)`) is kept.
+/// The stored notes are lower-case fragments; a known note is shown as a sentence, so its first
+/// letter is capitalised here. Other notes (SVG's, say) are shown as they are.
+pub(crate) fn note_text(note: &str) -> String {
+    let translated = |base: &str| {
+        let Some(text) = try_tr(base) else { return base.to_owned() };
+        let mut chars = text.chars();
+        chars.next().map_or_else(String::new, |first| first.to_uppercase().chain(chars).collect())
+    };
+    match note.rsplit_once(" (×") {
+        Some((base, count)) if count.strip_suffix(')').is_some_and(|n| !n.is_empty() && n.bytes().all(|b| b.is_ascii_digit())) => {
+            format!("{} (×{count}", translated(base))
+        }
+        _ => translated(note),
+    }
+}
+
+/// Show the report for a file the user opened or imported (menus, drops, pastes, recents, the
+/// system's open event); commands from the control channel, MCP or scripts never call this.
+pub fn capture(app: &mut FigApp, command: &str, params: &Value, result: &Value) {
+    if let Some(mut report) = Report::from_result(command, params, result) {
+        report.uid = app.session.ds().map_or(0, |d| d.uid);
+        app.ui.import_report = Some(report);
+    }
+}
+
+pub fn show(app: &mut FigApp, ctx: &egui::Context) {
+    // The report goes with its document.
+    if app.ui.import_report.as_ref().is_some_and(|r| !app.session.docs.iter().any(|d| d.uid == r.uid)) {
+        app.ui.import_report = None;
+    }
+    let Some(report) = &app.ui.import_report else { return };
+    let t = Tokens::get(ctx);
+    let mut open = true;
+    let mut close_clicked = false;
+    crate::dialogs::window(tr("Import report"), ctx).open(&mut open).show(ctx, |ui| {
+        ui.set_width(420.0);
+        ui.label(RichText::new(&report.name).strong());
+        ui.label(if report.appended {
+            tr("Pages added to the document")
+        } else if report.placed {
+            tr("Placed on the current page")
+        } else {
+            tr("Opened as a new document")
+        });
+        let counts: Vec<String> = [(tr("Pages"), report.pages), (tr("Layers"), report.layers), (tr("Images"), report.images)]
+            .into_iter()
+            .filter_map(|(label, count)| count.map(|n| format!("{label}: {n}")))
+            .collect();
+        if !counts.is_empty() {
+            ui.label(counts.join(" · "));
+        }
+        ui.add_space(8.0);
+        if report.notes.is_empty() {
+            ui.label(tr("No compatibility warnings reported"));
+        } else {
+            ui.label(RichText::new(tr("Compatibility notes")).strong());
+            ui.label(
+                RichText::new(tr(
+                    "FigCraft doesn't support every feature of these files yet. The notes list what was left out or changed in the imported copy; the original file is unchanged.",
+                ))
+                .color(t.text_secondary)
+                .font(regular(11.0)),
+            );
+            ui.add_space(4.0);
+            egui::ScrollArea::vertical().id_salt("import_report_notes").max_height(260.0).show(ui, |ui| {
+                for note in &report.shown {
+                    ui.label(note);
+                    ui.add_space(4.0);
+                }
+            });
+        }
+        let omitted = report.note_count.saturating_sub(report.notes.len());
+        if omitted > 0 {
+            ui.label(trn("{n} more notes omitted from this report", omitted, &[]));
+        }
+        ui.add_space(12.0);
+        close_clicked = crate::widgets::button(ui, tr("Close"), true, true).clicked();
+    });
+    if !open || close_clicked {
+        app.ui.import_report = None;
+    }
+}
diff --git a/crates/ui-egui/src/dialogs/menu_input.rs b/crates/ui-egui/src/dialogs/menu_input.rs
new file mode 100644
index 00000000..e815c532
--- /dev/null
+++ b/crates/ui-egui/src/dialogs/menu_input.rs
@@ -0,0 +1,75 @@
+use super::*;
+
+/// Values collected by a menu or Actions command before dispatching it to the engine.
+#[derive(Clone, Debug, PartialEq)]
+pub enum MenuInput {
+    Link(String),
+    Offset(f64),
+    MoveToPage,
+}
+
+/// Menus and Actions cannot pass a value themselves. Gather it here, then run the regular
+/// command so the same validation and undo behaviour apply as for programmatic callers.
+pub(super) fn menu_input_dialog(app: &mut FigApp, ctx: &Context) {
+    let Some(mut input) = app.ui.menu_input.take() else { return };
+    let t = Tokens::get(ctx);
+    let title = match &input {
+        MenuInput::Link(_) => i18n::command("text.link", "Create link"),
+        MenuInput::Offset(_) => i18n::command("vector.offset", "Offset path"),
+        MenuInput::MoveToPage => i18n::command("object.moveToPage", "Move to page"),
+    };
+    let mut open = true;
+    let mut action: Option<(&str, serde_json::Value)> = None;
+    window(&title, ctx).open(&mut open).show(ctx, |ui| {
+        ui.set_width(320.0);
+        match &mut input {
+            MenuInput::Link(url) => {
+                ui.horizontal(|ui| {
+                    let field = crate::widgets::text_input(ui, egui::Id::unique("menu_input_link"), url, 250.0, "https://");
+                    let enter = field.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter));
+                    let ok = !url.trim().is_empty();
+                    if (crate::widgets::button(ui, tr("Done"), true, ok).clicked() || enter) && ok {
+                        action = Some(("text.link", json!({"url": url.trim()})));
+                    }
+                });
+            }
+            MenuInput::Offset(offset) => {
+                ui.horizontal(|ui| {
+                    let id = egui::Id::unique("menu_input_offset");
+                    if let Some(crate::widgets::FieldEdit::Set(v) | crate::widgets::FieldEdit::Scrub(v, _)) =
+                        crate::widgets::number_field(ui, id, crate::widgets::Lead::None, Some(*offset), "", 120.0, 1.0)
+                    {
+                        *offset = v.clamp(-100_000.0, 100_000.0);
+                    }
+                    if crate::widgets::button(ui, tr("Offset"), true, true).clicked() {
+                        action = Some(("vector.offset", json!({"offset": *offset})));
+                    }
+                });
+            }
+            MenuInput::MoveToPage => {
+                let mut choices = 0;
+                if let Ok(ds) = app.session.ds() {
+                    for &page in &ds.doc.pages {
+                        if page == ds.page || ds.doc.is_divider(page) {
+                            continue;
+                        }
+                        if let Some(node) = ds.doc.node(page)
+                            && crate::widgets::button(ui, &node.name, false, true).clicked()
+                        {
+                            action = Some(("object.moveToPage", json!({"page": page})));
+                        }
+                        choices += 1;
+                    }
+                }
+                if choices == 0 {
+                    crate::widgets::label(ui, tr("No other pages"), t.text_secondary);
+                }
+            }
+        }
+    });
+    if let Some((id, params)) = action {
+        app.run(id, params);
+    } else if open {
+        app.ui.menu_input = Some(input);
+    }
+}
diff --git a/crates/ui-egui/src/dialogs/missing_fonts.rs b/crates/ui-egui/src/dialogs/missing_fonts.rs
new file mode 100644
index 00000000..b6c79477
--- /dev/null
+++ b/crates/ui-egui/src/dialogs/missing_fonts.rs
@@ -0,0 +1,115 @@
+//! The Missing fonts window (#752): the fonts a file uses that aren't installed, whose text is
+//! drawn in a fallback font. It opens by itself after the user opens a file that has any (once
+//! the installed fonts are indexed and any import report is closed), and from Text ▸ Missing fonts.
+
+use egui::RichText;
+use figcraft_engine::fonts::{Missing, missing};
+use serde_json::{Value, json};
+
+use crate::FigApp;
+use crate::i18n::{tr, trn};
+use crate::theme::{Tokens, regular};
+
+#[derive(Clone, Debug)]
+pub struct Shown {
+    /// The document it lists: the window goes when that document closes.
+    pub uid: u64,
+    pub families: Vec<Missing>,
+    /// Asked for before the installed fonts were indexed: the list comes once they are.
+    pub indexing: bool,
+}
+
+impl Shown {
+    pub fn inspect(&self) -> Value {
+        json!({
+            "families": self.families.iter().map(|m| json!({"family": m.family, "layers": m.layers})).collect::<Vec<_>>(),
+            "indexing": self.indexing,
+        })
+    }
+}
+
+/// After the user opened a file, or imported pages into one (results with a `summary`; not a
+/// placed image or SVG, a file that was open already, or Clear recent): look for missing fonts in
+/// it once that can be told ([`show`]). Not in the browser, which has only its built-in fonts.
+pub fn check_later(app: &mut FigApp, command: &str, result: Option<&Value>) {
+    if !cfg!(target_arch = "wasm32")
+        && matches!(command, "file.open" | "file.openRecent" | "file.import")
+        && result.is_some_and(|r| r.get("summary").is_some())
+        && let Ok(ds) = app.session.ds()
+    {
+        app.ui.font_checks.push(ds.uid);
+    }
+}
+
+/// The window for document `uid`, listing what it misses (even nothing, when asked for).
+fn list(app: &mut FigApp, uid: u64) -> Option<Vec<Missing>> {
+    let ds = app.session.docs.iter().find(|d| d.uid == uid)?;
+    let families = missing(&ds.doc);
+    app.ui.missing_fonts = Some(Shown { uid, families: families.clone(), indexing: false });
+    Some(families)
+}
+
+/// Text ▸ Missing fonts (`dialog.missingFonts`): the window for the file in front.
+pub fn request(app: &mut FigApp) {
+    let Ok(uid) = app.session.ds().map(|d| d.uid) else { return };
+    if figcraft_text::installed_fonts_known() {
+        list(app, uid);
+    } else {
+        app.ui.missing_fonts = Some(Shown { uid, families: Vec::new(), indexing: true });
+    }
+}
+
+pub fn show(app: &mut FigApp, ctx: &egui::Context) {
+    // Whether the installed fonts are indexed is asked only while a list waits for it.
+    let waiting = app.ui.missing_fonts.as_ref().filter(|m| m.indexing).map(|m| m.uid);
+    if (waiting.is_some() || !app.ui.font_checks.is_empty()) && figcraft_text::installed_fonts_known() {
+        if let Some(uid) = waiting {
+            list(app, uid);
+        }
+        if !app.ui.font_checks.is_empty() && app.ui.import_report.is_none() && app.ui.missing_fonts.is_none() {
+            let uid = app.ui.font_checks.remove(0);
+            if list(app, uid).is_some_and(|f| f.is_empty()) {
+                app.ui.missing_fonts = None;
+            }
+        }
+    }
+    if app.ui.missing_fonts.as_ref().is_some_and(|m| !app.session.docs.iter().any(|d| d.uid == m.uid)) {
+        app.ui.missing_fonts = None;
+    }
+    let Some(shown) = &app.ui.missing_fonts else { return };
+    let t = Tokens::get(ctx);
+    let mut open = true;
+    let mut close_clicked = false;
+    crate::dialogs::window(tr("Missing fonts"), ctx).open(&mut open).show(ctx, |ui| {
+        ui.set_width(380.0);
+        if shown.indexing {
+            ui.label(tr("Checking the fonts installed on this computer…"));
+        } else if shown.families.is_empty() {
+            ui.label(tr("All the fonts this file uses are installed"));
+        } else {
+            ui.label(
+                RichText::new(tr(
+                    "This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them.",
+                ))
+                .color(t.text_secondary)
+                .font(regular(11.0)),
+            );
+            ui.add_space(6.0);
+            egui::ScrollArea::vertical().id_salt("missing_fonts").max_height(260.0).show(ui, |ui| {
+                for m in &shown.families {
+                    ui.horizontal(|ui| {
+                        ui.label(RichText::new(&m.family).strong());
+                        let used =
+                            if m.layers == 0 { tr("only in a text style or variable").to_string() } else { trn("{n} text layers", m.layers, &[]) };
+                        ui.label(RichText::new(used).color(t.text_secondary));
+                    });
+                }
+            });
+        }
+        ui.add_space(12.0);
+        close_clicked = crate::widgets::button(ui, tr("Close"), true, true).clicked();
+    });
+    if !open || close_clicked {
+        app.ui.missing_fonts = None;
+    }
+}
diff --git a/crates/ui-egui/src/plugins_ui.rs b/crates/ui-egui/src/dialogs/plugins_ui.rs
similarity index 88%
rename from crates/ui-egui/src/plugins_ui.rs
rename to crates/ui-egui/src/dialogs/plugins_ui.rs
index 481b446c..339573ff 100644
--- a/crates/ui-egui/src/plugins_ui.rs
+++ b/crates/ui-egui/src/dialogs/plugins_ui.rs
@@ -81,8 +81,8 @@ pub(crate) fn field_value(app: &FigApp, plugin: &str, control: &str) -> Option<S
 /// open, else its panel), as last drawn.
 pub(crate) fn field_window(app: &FigApp, ctx: &Context, plugin: &str) -> Option<egui::Rect> {
     let id = match &app.ui.plugin_form {
-        Some(f) if f.id == plugin => Id::new("plugin_form"),
-        _ => Id::new(("plugin_panel", plugin)),
+        Some(f) if f.id == plugin => Id::unique("plugin_form"),
+        _ => Id::unique(("plugin_panel", plugin)),
     };
     ctx.memory(|m| m.area_rect(id))
 }
@@ -110,6 +110,36 @@ pub fn start(app: &mut FigApp, id: &str, command: &str) {
     }
 }
 
+/// A plugin offered a file to save (`dialog.pluginSave`: `name`, `data` as base64): the user picks
+/// where it goes in FigCraft's own save dialog, or the browser downloads it. The plugin never learns
+/// the path.
+pub(crate) fn save_file(app: &mut FigApp, data: &Value) {
+    use base64::Engine as _;
+    let name = data["name"].as_str().unwrap_or_default().to_string();
+    let Ok(bytes) = base64::engine::general_purpose::STANDARD.decode(data["data"].as_str().unwrap_or_default()) else {
+        app.toast(tr("Couldn't save the file"));
+        return;
+    };
+    if app.services.downloads() {
+        if app.services.download(&name, &bytes) {
+            app.toast(trf("Saved {name}", &[("name", &name)]));
+        } else {
+            app.toast(tr("Couldn't save the file"));
+        }
+        return;
+    }
+    let ext = std::path::Path::new(&name).extension().and_then(|e| e.to_str()).unwrap_or_default().to_string();
+    let exts: Vec<&str> = if ext.is_empty() { Vec::new() } else { vec![ext.as_str()] };
+    let shown = name.clone();
+    app.pick_save(tr("Save file"), &name, &exts, move |app, path| {
+        let file = path.file_name().map(|f| f.to_string_lossy().to_string()).unwrap_or(shown);
+        match std::fs::write(&path, &bytes) {
+            Ok(()) => app.toast(trf("Saved {name}", &[("name", &file)])),
+            Err(_) => app.toast(tr("Couldn't save the file")),
+        }
+    });
+}
+
 /// Run `plugin.run` or `plugin.event`; a text output is shown as a toast unless the plugin showed
 /// a message.
 fn run(app: &mut FigApp, cmd: &str, params: Value) {
@@ -151,7 +181,7 @@ pub fn menu(app: &mut FigApp, ui: &mut Ui, t: &Tokens) -> bool {
                 }
             }
             commands => {
-                let picked = crate::menus::submenu(ui, "Plugins", &format!("Plugins/plugin:{}", m.id), &m.name, t, |ui| {
+                let picked = crate::menus::submenu(ui, &format!("Plugins/plugin:{}", m.id), &m.name, t, |ui| {
                     commands.iter().find(|c| crate::menus::item(ui, &c.label, "", true, false, t)).map(|c| c.id.clone())
                 });
                 if let Some(c) = picked {
@@ -164,7 +194,7 @@ pub fn menu(app: &mut FigApp, ui: &mut Ui, t: &Tokens) -> bool {
         app.session.prefs.plugins.iter().filter(|p| p.manifest.widget).map(|p| (p.manifest.id.as_str(), p.manifest.name.as_str())).collect();
     let widget = (!widgets.is_empty())
         .then(|| {
-            crate::menus::submenu(ui, "Plugins", "Plugins/widgets", tr("Widgets"), t, |ui| {
+            crate::menus::submenu(ui, "Plugins/widgets", tr("Widgets"), t, |ui| {
                 widgets.iter().find(|(_, name)| crate::menus::item(ui, name, "", true, false, t)).map(|(id, _)| id.to_string())
             })
         })
@@ -206,7 +236,7 @@ fn panel_windows(app: &mut FigApp, ctx: &Context) {
         let mut used = None;
         // Side by side leftwards from the properties panel, three to a row.
         let at = egui::pos2(right - PANEL_STEP * (i % 3) as f32, 52.0 + 28.0 * (i / 3) as f32);
-        floating(open.title(), ctx).id(Id::new(("plugin_panel", id))).pivot(Align2::RIGHT_TOP).default_pos(at).open(&mut keep).show(ctx, |ui| {
+        floating(open.title(), ctx).id(Id::unique(("plugin_panel", id))).pivot(Align2::RIGHT_TOP).default_pos(at).open(&mut keep).show(ctx, |ui| {
             ui.set_width(320.0);
             used = controls(ui, id, &open.panel.controls, &open.values, &t);
         });
@@ -245,12 +275,15 @@ const INSTALL: &str = "plugin.directory.install";
 const MANAGE_W: f32 = 400.0;
 const ROW_TEXT_W: f32 = 300.0;
 
+/// Draw the Plugins window with installed and browse tabs, dispatching remove, import,
+/// browse, confirm and stop actions; closing the window cancels its directory requests and
+/// clears confirmation.
 fn manage_window(app: &mut FigApp, ctx: &Context) {
     let t = Tokens::get(ctx);
     let mut open = true;
     let mut asked = None;
     let mut tab = app.ui.plugins_manage.tab;
-    window(tr("Plugins"), ctx).id(Id::new("Plugins")).open(&mut open).show(ctx, |ui| {
+    window(tr("Plugins"), ctx).id(Id::unique("Plugins")).open(&mut open).show(ctx, |ui| {
         ui.set_width(MANAGE_W);
         tab_strip(ui, &t, &PluginsTab::ALL, PluginsTab::label, &mut tab);
         ui.add_space(12.0);
@@ -326,7 +359,7 @@ fn browse_tab(app: &mut FigApp, ui: &mut Ui, t: &Tokens) -> Option<Manage> {
         // The field commits on Enter (which also browses) or when Browse takes the focus.
         let mut enter = false;
         if let Some(s) =
-            widgets::text_field(ui, Id::new("plugin_directory_server"), &server, MANAGE_W - 90.0, tr("Server address (ws://host:47900/)"))
+            widgets::text_field(ui, Id::unique("plugin_directory_server"), &server, MANAGE_W - 90.0, tr("Server address (ws://host:47900/)"))
         {
             enter = ui.input(|i| i.key_pressed(egui::Key::Enter));
             server = s.clone();
@@ -351,7 +384,7 @@ fn browse_tab(app: &mut FigApp, ui: &mut Ui, t: &Tokens) -> Option<Manage> {
         return asked;
     };
     ui.add_space(8.0);
-    if let Some(q) = widgets::text_field(ui, Id::new("plugin_directory_query"), &app.ui.plugins_manage.query, MANAGE_W, tr("Search plugins")) {
+    if let Some(q) = widgets::text_field(ui, Id::unique("plugin_directory_query"), &app.ui.plugins_manage.query, MANAGE_W, tr("Search plugins")) {
         app.ui.plugins_manage.query = q;
     }
     ui.add_space(8.0);
@@ -432,7 +465,7 @@ fn confirm_window(app: &mut FigApp, ctx: &Context, t: &Tokens) {
     let installing = app.session.waiting_for(INSTALL);
     let title = if update { tr("Update plugin") } else { tr("Install plugin") };
     let (mut open, mut install, mut cancel) = (true, false, false);
-    window(title, ctx).id(Id::new("plugin_install_confirm")).open(&mut open).show(ctx, |ui| {
+    window(title, ctx).id(Id::unique("plugin_install_confirm")).open(&mut open).show(ctx, |ui| {
         ui.set_width(340.0);
         ui.label(RichText::new(format!("{} {}", e.name, e.version)).font(semibold(13.0)).color(t.text));
         widgets::label(ui, &trf("From {server}", &[("server", &server)]), t.text_secondary);
@@ -447,6 +480,12 @@ fn confirm_window(app: &mut FigApp, ctx: &Context, t: &Tokens) {
         if e.widget {
             asks.push(tr("put a widget on the canvas").to_string());
         }
+        // shortcut: a directory entry doesn't say whether the manifest asks for `saveFile` (a new
+        // field would break the entries' postcard wire format), so every API 4 plugin says it may;
+        // carry the permission in the entry once the directory protocol negotiates new fields.
+        if e.api >= 4 {
+            asks.push(tr("offer files to save if it asks to (you choose where each one goes)").to_string());
+        }
         for a in asks {
             ui.add(egui::Label::new(RichText::new(format!("•  {a}")).font(regular(11.0)).color(t.text)).wrap());
         }
@@ -501,6 +540,9 @@ fn summary(p: &InstalledPlugin) -> String {
         parts.push(m.version.clone());
     }
     parts.push(access.to_string());
+    if m.permissions.save_file {
+        parts.push(tr("can save files").to_string());
+    }
     parts.push(match (&p.source, &p.path) {
         (Some(server), _) => trf("from {server}", &[("server", server)]),
         (None, Some(path)) => trf("development: {path}", &[("path", path)]),
@@ -509,6 +551,8 @@ fn summary(p: &InstalledPlugin) -> String {
     parts.join(" · ")
 }
 
+/// Draw a plugin command's parameter form: close it when the plugin or command disappeared,
+/// edit values and colour picks, run `plugin.run` on Run, and close on Cancel.
 fn form_window(app: &mut FigApp, ctx: &Context) {
     let Some(mut form) = app.ui.plugin_form.clone() else { return };
     let Some((name, command)) = app
@@ -529,7 +573,7 @@ fn form_window(app: &mut FigApp, ctx: &Context) {
     let mut pick = None;
     let label = command.label.trim_end_matches(['…', '.']).trim();
     let title = if label.contains(name.as_str()) { label.to_string() } else { format!("{name}: {label}") };
-    window(&title, ctx).id(Id::new("plugin_form")).open(&mut open).show(ctx, |ui| {
+    window(&title, ctx).id(Id::unique("plugin_form")).open(&mut open).show(ctx, |ui| {
         ui.set_width(320.0);
         match controls(ui, &format!("{}/{}", form.id, form.command), &command.params, &form.values, &t) {
             Some(Used::Set(name, v)) => {
@@ -586,7 +630,7 @@ fn controls(ui: &mut Ui, salt: &str, params: &[Param], values: &Map<String, Valu
                 }
                 _ => {
                     let current = values.get(&p.name).cloned().unwrap_or_else(|| p.default_value());
-                    field(ui, Id::new(("plugin_control", salt, &p.name)), p, &current)
+                    field(ui, Id::unique(("plugin_control", salt, &p.name)), p, &current)
                 }
             };
             if hit.is_some() {
@@ -643,7 +687,8 @@ fn field(ui: &mut Ui, id: Id, p: &Param, current: &Value) -> Option<Used> {
             let (picked, typed) = ui
                 .horizontal(|ui| {
                     let color = figcraft_color::Color::from_hex(hex).unwrap_or(figcraft_color::Color::BLACK);
-                    let picked = widgets::swatch(ui, &figcraft_color::Paint::solid(color), widgets::FIELD_H).clicked();
+                    let label = format!("{name} {}", tr("Color"));
+                    let picked = widgets::swatch_named(ui, &figcraft_color::Paint::solid(color), widgets::FIELD_H, &label).clicked();
                     (picked, widgets::text_field_named(ui, id, hex, FIELD_W - widgets::FIELD_H - 8.0, name).and_then(|s| p.coerce(&json!(s)).ok()))
                 })
                 .inner;
diff --git a/crates/ui-egui/src/dialogs/updates_ui.rs b/crates/ui-egui/src/dialogs/updates_ui.rs
new file mode 100644
index 00000000..33f3e503
--- /dev/null
+++ b/crates/ui-egui/src/dialogs/updates_ui.rs
@@ -0,0 +1,135 @@
+//! Software updates, background check at startup, and startup prompt modal.
+
+use crate::FigApp;
+use crate::i18n::tr;
+
+#[cfg(not(target_arch = "wasm32"))]
+use craft_update::updater::{Action, Status, Updater};
+
+pub(crate) struct Runtime {
+    #[cfg(not(target_arch = "wasm32"))]
+    updater: Updater,
+    /// The desktop app turns the check at start on; tests and the web build leave it off.
+    #[cfg(not(target_arch = "wasm32"))]
+    startup_check: bool,
+    #[cfg(not(target_arch = "wasm32"))]
+    check_requested: bool,
+    /// The context of the last frame, to wake the UI when a check is queued from a menu callback.
+    #[cfg(not(target_arch = "wasm32"))]
+    repaint: Option<egui::Context>,
+    pub(crate) manual_window_open: bool,
+    pub(crate) status_message: Option<String>,
+}
+
+impl Default for Runtime {
+    fn default() -> Self {
+        Self {
+            #[cfg(not(target_arch = "wasm32"))]
+            updater: Updater::new(&craft_update::suite::FIGCRAFT, env!("CARGO_PKG_VERSION")),
+            #[cfg(not(target_arch = "wasm32"))]
+            startup_check: false,
+            #[cfg(not(target_arch = "wasm32"))]
+            check_requested: false,
+            #[cfg(not(target_arch = "wasm32"))]
+            repaint: None,
+            manual_window_open: false,
+            status_message: None,
+        }
+    }
+}
+
+impl FigApp {
+    /// Whether the app asks for a newer release when it starts (off until the desktop app turns it on).
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn set_startup_update_check(&mut self, on: bool) {
+        self.updates_rt.startup_check = on;
+    }
+}
+
+pub(crate) fn check(app: &mut FigApp) {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        app.updates_rt.check_requested = true;
+        if let Some(ctx) = &app.updates_rt.repaint {
+            ctx.request_repaint();
+        }
+    }
+    #[cfg(target_arch = "wasm32")]
+    {
+        app.updates_rt.manual_window_open = true;
+        app.updates_rt.status_message = Some(tr("Update check is not supported in the web browser.").to_string());
+    }
+}
+
+pub(crate) fn tick(app: &mut FigApp, ctx: &egui::Context) {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let rt = &mut app.updates_rt;
+        rt.repaint = Some(ctx.clone());
+        if std::mem::take(&mut rt.check_requested) {
+            rt.updater.check_now(ctx);
+        } else if rt.startup_check {
+            rt.updater.check_at_start(ctx);
+        }
+        rt.updater.tick(ctx);
+    }
+    #[cfg(target_arch = "wasm32")]
+    let _ = (app, ctx);
+}
+
+pub(crate) fn show(app: &mut FigApp, ctx: &egui::Context) {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        // The restart helper is scheduled before the app closes, so no update starts over unsaved work.
+        let clean = !app.session.docs.iter().any(|d| d.is_dirty());
+        match app.updates_rt.updater.show_if(ctx, clean) {
+            Action::OpenUrl(url) => ctx.open_url(egui::OpenUrl::new_tab(url)),
+            // The whole application, not just the window that drew the prompt: the root window's guarded close.
+            Action::Close => ctx.send_viewport_cmd_to(egui::ViewportId::ROOT, egui::ViewportCommand::Close),
+            Action::None => {}
+        }
+        // The window answers Help ▸ Check for Updates, so it follows the updater's status.
+        let rt = &mut app.updates_rt;
+        (rt.manual_window_open, rt.status_message) = match rt.updater.status() {
+            Status::Idle => (false, None),
+            Status::Checking => (true, None),
+            Status::UpToDate => {
+                (true, Some(tr("FigCraft {version} is currently the newest version available.").replace("{version}", env!("CARGO_PKG_VERSION"))))
+            }
+            Status::Failed(e) => (true, Some(tr("Could not check for updates:\n{error}").replace("{error}", e))),
+        };
+    }
+
+    if app.updates_rt.manual_window_open {
+        let mut open = true;
+        let mut close = false;
+        egui::Window::new(tr("Check for Updates"))
+            .open(&mut open)
+            .resizable(false)
+            .collapsible(false)
+            .anchor(egui::Align2::CENTER_CENTER, egui::vec2(0.0, 0.0))
+            .show(ctx, |ui| {
+                if let Some(msg) = &app.updates_rt.status_message {
+                    ui.label(msg);
+                } else {
+                    ui.label(tr("Checking for updates…"));
+                }
+                ui.add_space(8.0);
+                ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                    if ui.button(tr("Close")).clicked() {
+                        close = true;
+                    }
+                });
+            });
+        if !open || close {
+            app.updates_rt.manual_window_open = false;
+            app.updates_rt.status_message = None;
+        }
+    }
+
+    // Closing the window dismisses the outcome it showed.
+    #[cfg(not(target_arch = "wasm32"))]
+    if !app.updates_rt.manual_window_open {
+        app.updates_rt.updater.dismiss_status();
+    }
+}
diff --git a/crates/ui-egui/src/variables_panel.rs b/crates/ui-egui/src/dialogs/variables_panel.rs
similarity index 97%
rename from crates/ui-egui/src/variables_panel.rs
rename to crates/ui-egui/src/dialogs/variables_panel.rs
index 5476eaf1..9939cfc9 100644
--- a/crates/ui-egui/src/variables_panel.rs
+++ b/crates/ui-egui/src/dialogs/variables_panel.rs
@@ -148,7 +148,7 @@ pub fn show(app: &mut FigApp, ctx: &Context) {
     let size = vec2(880.0_f32.min(screen.width() - 80.0).max(480.0), 480.0_f32.min(screen.height() - 120.0).max(240.0));
     let mut open = true;
     egui::Window::new(tr("Local variables"))
-        .id(Id::new("variables_window"))
+        .id(Id::unique("variables_window"))
         .title_bar(false)
         .collapsible(false)
         .resizable(false)
@@ -173,6 +173,8 @@ pub fn show(app: &mut FigApp, ctx: &Context) {
     app.ui.variables = open.then_some(st);
 }
 
+/// Draw the variables header: the title at the left, and the import/export/Close controls at the
+/// right.
 fn header(app: &mut FigApp, ui: &mut Ui, open: &mut bool) {
     let t = Tokens::get(ui.ctx());
     let (r, _) = ui.allocate_exact_size(vec2(ui.available_width(), 44.0), Sense::hover());
@@ -181,7 +183,8 @@ fn header(app: &mut FigApp, ui: &mut Ui, open: &mut bool) {
     let mut bar = ui.new_child(UiBuilder::new().max_rect(bar).layout(egui::Layout::right_to_left(egui::Align::Center)));
     let export = widgets::button(&mut bar, tr("Export…"), false, true);
     crate::right::menu_popup(&export).show(|ui| {
-        for (label, format) in [(tr("Variables JSON…"), "json"), (tr("CSS custom properties…"), "css")] {
+        for (label, format) in [(tr("Variables JSON…"), "json"), (tr("CSS custom properties…"), "css"), (tr("Dart constants for Flutter…"), "dart")]
+        {
             if menu_item(ui, label, "") {
                 export_dialog(app, format);
                 ui.close();
@@ -194,7 +197,7 @@ fn header(app: &mut FigApp, ui: &mut Ui, open: &mut bool) {
     ui.painter().text(pos2(r.min.x + 16.0, r.center().y), Align2::LEFT_CENTER, tr("Local variables"), semibold(13.0), t.text);
     if widgets::icon_button_at(
         ui,
-        Id::new("vars_close"),
+        Id::unique("vars_close"),
         Rect::from_center_size(pos2(r.max.x - 22.0, r.center().y), vec2(24.0, 24.0)),
         Icon::Close,
         tr("Close"),
@@ -253,8 +256,9 @@ fn extend(app: &mut FigApp, lib: &str, c: &str, st: &mut Editor) {
     }
 }
 
+/// Stable egui id for the rename field of a `Rename` target.
 fn rename_id(target: &Rename) -> Id {
-    Id::new(("var_rename", target))
+    Id::unique(("var_rename", target))
 }
 
 /// Start renaming `target`. The field isn't drawn yet (a new collection, mode or variable shows next
@@ -281,13 +285,15 @@ fn unique(base: &str, taken: impl Fn(&str) -> bool) -> String {
     (1..10_000).map(|k| if k == 1 { base.to_string() } else { format!("{base} {k}") }).find(|n| !taken(n)).unwrap_or_else(|| base.to_string())
 }
 
+/// Draw the collections sidebar with library headings, collection rows and a create-collection
+/// button.
 fn sidebar(app: &mut FigApp, ui: &mut Ui, views: &[View], local: &Variables, st: &mut Editor) {
     let t = Tokens::get(ui.ctx());
     let (hr, _) = ui.allocate_exact_size(vec2(SIDEBAR_W, 40.0), Sense::hover());
     ui.painter().text(pos2(hr.min.x + 16.0, hr.center().y), Align2::LEFT_CENTER, tr("Collections"), semibold(11.0), t.text_secondary);
     if widgets::icon_button_at(
         ui,
-        Id::new("vars_add_coll"),
+        Id::unique("vars_add_coll"),
         Rect::from_center_size(pos2(hr.max.x - 20.0, hr.center().y), vec2(24.0, 24.0)),
         Icon::Plus,
         tr("Create collection"),
@@ -505,6 +511,8 @@ fn group_of(name: &str) -> &str {
     name.rsplit_once('/').map(|(g, _)| g).unwrap_or("")
 }
 
+/// Draw the variables table for the selected collection: search, library/extended notes,
+/// grouped rows, mode columns and the create-variable row when editable.
 fn table(app: &mut FigApp, ui: &mut Ui, view: &View, st: &mut Editor) {
     let t = Tokens::get(ui.ctx());
     // A sidebar click this frame picked another source: shown next frame.
@@ -543,7 +551,7 @@ fn table(app: &mut FigApp, ui: &mut Ui, view: &View, st: &mut Editor) {
             .frame(egui::Frame::NONE)
             .hint_text(tr("Search"))
             .font(regular(11.0))
-            .vertical_align(egui::Align::Center),
+            .align(egui::Align2::LEFT_CENTER),
     );
     crate::widgets::select_all_on_focus(ui, &r, &st.query);
     let note = Rect::from_min_max(pos2(field.max.x + 16.0, sr.min.y + 8.0), pos2(sr.max.x - 16.0, sr.max.y - 8.0));
@@ -594,6 +602,8 @@ fn table(app: &mut FigApp, ui: &mut Ui, view: &View, st: &mut Editor) {
     });
 }
 
+/// Draw a collection's mode header row with rename, duplicate, reorder and delete actions
+/// and an add-mode button when the collection is editable and not extended.
 fn header_row(app: &mut FigApp, ui: &mut Ui, view: &View, coll: &Collection, st: &mut Editor, width: f32) {
     let t = Tokens::get(ui.ctx());
     // An extended collection has the modes of the one it extends.
@@ -615,7 +625,7 @@ fn header_row(app: &mut FigApp, ui: &mut Ui, view: &View, coll: &Collection, st:
             ui.painter().with_clip_rect(cell).text(name_pos, Align2::LEFT_CENTER, &m.name, regular(11.0), t.text_secondary);
             continue;
         }
-        let resp = ui.interact(cell, Id::new(("vars_mode", &m.id)), Sense::click());
+        let resp = ui.interact(cell, Id::unique(("vars_mode", &m.id)), Sense::click());
         if resp.hovered() {
             ui.painter().rect_filled(cell, CornerRadius::same(4), t.hover);
         }
@@ -658,7 +668,7 @@ fn header_row(app: &mut FigApp, ui: &mut Ui, view: &View, coll: &Collection, st:
     if editable
         && widgets::icon_button_at(
             ui,
-            Id::new("vars_add_mode"),
+            Id::unique("vars_add_mode"),
             Rect::from_center_size(pos2(x + 14.0, r.center().y), vec2(24.0, 24.0)),
             Icon::Plus,
             tr("Add mode"),
@@ -773,7 +783,7 @@ fn value_cell(app: &mut FigApp, ui: &mut Ui, view: &View, v: &Variable, coll: &C
     let t = Tokens::get(ui.ctx());
     let Some(val) = v.values.get(mode) else { return };
     let editable = view.editable();
-    let id = Id::new(("var_cell", &v.id, mode));
+    let id = Id::unique(("var_cell", &v.id, mode));
     // The value editor leaves room for the alias button (and in extended collections an
     // override's reset button, so the column stays even).
     let overridden = v.overrides.contains(mode);
@@ -937,7 +947,7 @@ fn details(app: &mut FigApp, ctx: &Context, vars: &Variables, st: &mut Editor) {
     let t = Tokens::get(ctx);
     let mut open = true;
     egui::Window::new(tr("Edit variable"))
-        .id(Id::new("variable_details"))
+        .id(Id::unique("variable_details"))
         .open(&mut open)
         .collapsible(false)
         .resizable(false)
@@ -946,12 +956,12 @@ fn details(app: &mut FigApp, ctx: &Context, vars: &Variables, st: &mut Editor) {
         .show(ctx, |ui| {
             ui.set_width(260.0);
             widgets::label(ui, tr("Name"), t.text_secondary);
-            if let Some(n) = widgets::text_field(ui, Id::new(("var_detail_name", &v.id)), &v.name, 260.0, "") {
+            if let Some(n) = widgets::text_field(ui, Id::unique(("var_detail_name", &v.id)), &v.name, 260.0, "") {
                 app.run("variable.update", json!({"variable": v.id, "name": n}));
             }
             ui.add_space(6.0);
             widgets::label(ui, tr("Description"), t.text_secondary);
-            if let Some(d) = widgets::text_field(ui, Id::new(("var_detail_desc", &v.id)), &v.description, 260.0, tr("What it's for")) {
+            if let Some(d) = widgets::text_field(ui, Id::unique(("var_detail_desc", &v.id)), &v.description, 260.0, tr("What it's for")) {
                 app.run("variable.update", json!({"variable": v.id, "description": d}));
             }
             ui.add_space(6.0);
@@ -966,7 +976,7 @@ fn details(app: &mut FigApp, ctx: &Context, vars: &Variables, st: &mut Editor) {
                     let (lr, _) = ui.allocate_exact_size(vec2(60.0, 24.0), Sense::hover());
                     ui.painter().text(lr.left_center(), Align2::LEFT_CENTER, tr(label), regular(11.0), t.text);
                     let cur = v.code_syntax.get(key).map_or("", String::as_str);
-                    if let Some(n) = widgets::text_field_named(ui, Id::new(("var_detail_code", key, &v.id)), cur, 192.0, tr(label)) {
+                    if let Some(n) = widgets::text_field_named(ui, Id::unique(("var_detail_code", key, &v.id)), cur, 192.0, tr(label)) {
                         app.run("variable.update", json!({"variable": v.id, "codeSyntax": {key: n}}));
                     }
                 });
diff --git a/crates/ui-egui/src/export_preview_tests.rs b/crates/ui-egui/src/export_preview_tests.rs
index 3d536a01..960c6c65 100644
--- a/crates/ui-egui/src/export_preview_tests.rs
+++ b/crates/ui-egui/src/export_preview_tests.rs
@@ -1,6 +1,7 @@
 //! The Export section's Preview row: a slice paints nothing itself, so its preview must show the
 //! page content under it — the same thing exporting the slice writes — and not a blank
-//! transparency checkerboard next to a correct export.
+//! transparency checkerboard next to a correct export. And its setting rows: a size only for
+//! images, and advanced options named as the reference app names them.
 
 use figcraft_doc::{Document, NodeId};
 use figcraft_engine::Session;
@@ -32,6 +33,23 @@ fn a_slice_previews_the_content_under_it() {
     assert!(paints(&pix), "the rectangle under the slice shows");
 }
 
+/// The preview follows the slice's first export setting: with Ignore overlapping layers (contents
+/// only) on, a slice in a frame shows only the frame's content, as its export does.
+#[test]
+fn a_slice_in_a_frame_previews_only_the_frame() {
+    let mut s = Session::new();
+    let new = |s: &mut Session, p: Value| NodeId(s.execute("node.create", &p).unwrap()["id"].as_u64().unwrap());
+    let f = new(&mut s, json!({"type": "frame", "x": 0, "y": 0, "width": 200, "height": 100, "props": {"fills": []}}));
+    let slice = new(&mut s, json!({"type": "slice", "x": 0, "y": 0, "width": 200, "height": 100, "parent": f}));
+    new(&mut s, json!({"type": "rectangle", "x": 0, "y": 0, "width": 200, "height": 100}));
+    let pix = thumbnail_pixmap(s.doc().unwrap(), slice, 200.0).expect("the slice previews");
+    assert_eq!([pix.width(), pix.height()], [200, 100]);
+    assert!(!paints(&pix), "the rectangle on the page above the empty frame is left out");
+    s.execute("export.add", &json!({"ids": [slice], "setting": {"size": "1x", "contentsOnly": false}})).unwrap();
+    let pix = thumbnail_pixmap(s.doc().unwrap(), slice, 200.0).expect("the slice previews");
+    assert!(paints(&pix), "with the option off, the rectangle shows");
+}
+
 #[test]
 fn a_slice_with_nothing_under_it_is_blank() {
     let (doc, ids) = doc_after(&[("node.create", json!({"type": "slice", "x": 0, "y": 0, "width": 200, "height": 100}))]);
@@ -50,3 +68,116 @@ fn other_layers_preview_themselves() {
     assert_eq!([pix.width(), pix.height()], [200, 100], "the layer's own area");
     assert!(paints(&pix));
 }
+
+/// SVG and PDF are vector: their export rows offer no size, which their export ignores (#256).
+#[test]
+fn export_rows_offer_a_size_for_images_only() {
+    let mut s = Session::new();
+    let r = crate::present_tests::id(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 80})).unwrap());
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    s.execute("export.add", &json!({"ids": [r]})).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    let size_menu = |u: &crate::layers_drag_tests::Ui| u.ctx.read_response(egui::Id::unique(("export_size", 0)).with("menu")).is_some();
+    u.frame(vec![]);
+    assert!(size_menu(&u), "PNG has sizes");
+    for format in ["svg", "pdf", "xml"] {
+        u.app.run("export.update", json!({"ids": [r], "index": 0, "format": format}));
+        u.frame(vec![]);
+        u.frame(vec![]);
+        assert!(!size_menu(&u), "{format} is vector: no size");
+    }
+    for format in ["jpg", "webp"] {
+        u.app.run("export.update", json!({"ids": [r], "index": 0, "format": format}));
+        u.frame(vec![]);
+        u.frame(vec![]);
+        assert!(size_menu(&u), "{format} has sizes again");
+    }
+}
+
+/// The text painted this frame, with the centre of each piece.
+fn labelled(u: &mut crate::layers_drag_tests::Ui) -> Vec<(String, egui::Pos2)> {
+    fn walk(shape: &egui::Shape, out: &mut Vec<(String, egui::Pos2)>) {
+        match shape {
+            egui::Shape::Text(t) => out.push((t.galley.text().to_string(), t.pos + t.galley.rect.center().to_vec2())),
+            egui::Shape::Vec(v) => v.iter().for_each(|s| walk(s, out)),
+            _ => {}
+        }
+    }
+    u.frame(vec![]);
+    let frame = u.frame_output(vec![]);
+    let mut out = Vec::new();
+    for c in &frame.shapes {
+        walk(&c.shape, &mut out);
+    }
+    out
+}
+
+fn click(u: &mut crate::layers_drag_tests::Ui, p: egui::Pos2) {
+    u.frame(vec![egui::Event::PointerMoved(p)]);
+    u.button(p, true);
+    u.button(p, false);
+    u.frame(vec![]);
+}
+
+/// Android Vector Drawable is in the format dropdown as "XML", and choosing it sets the format.
+#[test]
+fn the_format_dropdown_offers_android_vector_drawable() {
+    assert!(figcraft_doc::ExportFormat::ALL.contains(&figcraft_doc::ExportFormat::VectorDrawable));
+    let mut s = Session::new();
+    let r = crate::present_tests::id(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 80})).unwrap());
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    s.execute("export.add", &json!({"ids": [r]})).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    u.frame(vec![]);
+    let nodes = labelled(&mut u);
+    let field = nodes.iter().find(|(l, _)| l == "PNG").map(|n| n.1).unwrap_or_else(|| panic!("no PNG dropdown in {nodes:?}"));
+    click(&mut u, field);
+    let nodes = labelled(&mut u);
+    let xml = nodes.iter().find(|(l, _)| l == "XML").map(|n| n.1).unwrap_or_else(|| panic!("no XML row in {nodes:?}"));
+    click(&mut u, xml);
+    let doc = u.app.session.doc().unwrap();
+    assert_eq!(doc.node(r).unwrap().exports[0].format, figcraft_doc::ExportFormat::VectorDrawable);
+}
+
+/// The File > Export dialog has an XML preset.
+#[test]
+fn the_export_dialog_has_an_xml_preset() {
+    let mut s = Session::new();
+    let r = crate::present_tests::id(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 80})).unwrap());
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    u.frame(vec![]);
+    crate::menus::invoke(&mut u.app, "file.export");
+    let nodes = labelled(&mut u);
+    assert!(nodes.iter().any(|(l, _)| l == "XML"), "no XML preset in {nodes:?}");
+}
+
+/// The advanced options: Ignore overlapping layers (the `contentsOnly` setting), and Include
+/// bounding box for text layers only. A setting that already has the bounding box on keeps it, and
+/// the option stays so it can be turned off.
+#[test]
+fn advanced_options_offer_the_bounding_box_for_text_layers() {
+    let mut s = Session::new();
+    let r = crate::present_tests::id(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 80})).unwrap());
+    let t = crate::present_tests::id(&s.execute("text.create", &json!({"text": "Hi", "x": 200, "y": 0})).unwrap());
+    s.execute("export.add", &json!({"ids": [r]})).unwrap();
+    s.execute("export.add", &json!({"ids": [t]})).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    let options = |u: &mut crate::layers_drag_tests::Ui, id: NodeId| {
+        u.app.run("select.set", json!({"ids": [id]}));
+        u.frame(vec![]);
+        egui::Popup::open_id(&u.ctx, egui::Id::unique(("export_more", 0)));
+        u.frame(vec![]);
+        crate::import_report_tests::shown_texts(u.frame_output(vec![]).shapes)
+    };
+    let shown = options(&mut u, r);
+    assert!(shown.iter().any(|s| s == "Ignore overlapping layers"), "the reference app's name: {shown:?}");
+    assert!(!shown.iter().any(|s| s == "Contents only"));
+    assert!(!shown.iter().any(|s| s == "Include bounding box"), "a rectangle has no bounding box option");
+    let shown = options(&mut u, t);
+    assert!(shown.iter().any(|s| s == "Include bounding box"), "a text layer has it: {shown:?}");
+    u.app.run("export.update", json!({"ids": [r], "index": 0, "includeBoundingBox": true}));
+    let shown = options(&mut u, r);
+    assert!(shown.iter().any(|s| s == "Include bounding box"), "a rectangle that has it on shows it: {shown:?}");
+    assert!(u.app.session.doc().unwrap().node(r).unwrap().exports[0].include_bounding_box, "the setting is kept");
+}
diff --git a/crates/ui-egui/src/field_tests.rs b/crates/ui-egui/src/field_tests.rs
index 492fdc01..012dd923 100644
--- a/crates/ui-egui/src/field_tests.rs
+++ b/crates/ui-egui/src/field_tests.rs
@@ -370,6 +370,58 @@ fn arithmetic_commits_tab_moves_on_and_escape_restores() {
     assert_eq!(geom(&u, a).0, 78.0);
 }
 
+/// Answers a Save as dialog with `path`, once, and counts the dialogs asked for.
+struct SaveAsPicker {
+    path: Option<std::path::PathBuf>,
+    asked: std::rc::Rc<std::cell::Cell<usize>>,
+}
+
+impl crate::Services for SaveAsPicker {
+    fn pick_save(&mut self, _title: &str, _name: &str, _exts: &[&str]) -> crate::DialogFuture {
+        self.asked.set(self.asked.get() + 1);
+        Box::pin(std::future::ready(self.path.take()))
+    }
+}
+
+/// The x of layer `a` in the file at `path`, opened again.
+fn saved_x(path: &std::path::Path, a: NodeId) -> f64 {
+    let mut back = Session::new();
+    back.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap();
+    back.doc().unwrap().world_bounds(a).unwrap().x0
+}
+
+#[test]
+fn the_save_shortcut_saves_from_a_field_with_what_was_typed() {
+    // Cmd/Ctrl+S with the keyboard in a panel field saved nothing (#1157). It commits the field
+    // first (as clicking away does), then saves; the field lets go of the keyboard.
+    // Shift+Cmd/Ctrl+S does the same through Save as.
+    let cmd = if cfg!(target_os = "macos") { Modifiers::COMMAND } else { Modifiers::COMMAND.plus(Modifiers::CTRL) };
+    let (mut u, a, _) = setup();
+    let dir = std::env::temp_dir().join(format!("figcraft-save-from-field-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let (path, copy) = (dir.join("doc.figcraft"), dir.join("copy.figcraft"));
+    u.app.session.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
+    let asked = std::rc::Rc::new(std::cell::Cell::new(0));
+    u.app.services = Box::new(SaveAsPicker { path: Some(copy.clone()), asked: asked.clone() });
+    for (shortcut, mods, x, file) in [("Cmd/Ctrl+S", cmd, 77.0, &path), ("Shift+Cmd/Ctrl+S", cmd.plus(Modifiers::SHIFT), 66.0, &copy)] {
+        let (p, _) = field(&mut u, "X");
+        click(&mut u, p);
+        assert!(crate::a11y::field_focused(&u.ctx), "{shortcut}: the field has the keyboard");
+        u.frame(vec![Event::Text(x.to_string())]);
+        key(&mut u, Key::S, mods);
+        for _ in 0..3 {
+            u.frame(vec![]);
+        }
+        assert_eq!(geom(&u, a).0, x, "{shortcut}: what was typed is committed");
+        assert!(!crate::a11y::field_focused(&u.ctx), "{shortcut}: the field let go");
+        assert!(!u.app.session.ds().unwrap().is_dirty(), "{shortcut}: saved");
+        assert_eq!(saved_x(file, a), x, "{shortcut}: the file on disk has the typed value");
+    }
+    assert_eq!(asked.get(), 1, "only Save as asked where");
+    assert_eq!(saved_x(&path, a), 77.0, "Save as left the first file alone");
+    std::fs::remove_dir_all(&dir).ok();
+}
+
 #[test]
 fn mixed_values_take_edits_relative_to_each_layer() {
     let (mut u, a, b) = setup();
@@ -415,29 +467,109 @@ fn lead(u: &Ui, id: Id) -> Pos2 {
     u.ctx.read_response(id.with("lead")).unwrap_or_else(|| panic!("no field {id:?}")).rect.center()
 }
 
+/// Asserts scrubbing the colour picker's R and alpha fields updates the colour live, each
+/// scrub adding one undo step.
 #[test]
 fn scrubbing_colour_picker_fields_is_live_and_one_undo_step() {
     let (mut u, a, _) = setup();
     let rgba = |u: &Ui| u.app.session.doc().unwrap().node(a).unwrap().fills[0].solid_color().unwrap().to_rgba8();
     let [r0, .., a0] = rgba(&u);
-    u.ctx.data_mut(|d| d.insert_temp(Id::new("cp_model"), 1usize));
+    u.ctx.data_mut(|d| d.insert_temp(Id::unique("cp_model"), 1usize));
     u.app.ui.picker = Some(crate::colorpicker::PickerTarget::Paint { fills: true, index: 0, ids: vec![a] });
     // The picker window takes a frame to size itself.
     for _ in 0..3 {
         u.frame(vec![]);
     }
     let steps = undo_steps(&u);
-    let from = lead(&u, Id::new(("cp_f", "r")));
+    let from = lead(&u, Id::unique(("cp_f", "r")));
     drag(&mut u, from, -20.0, Modifiers::NONE);
     assert_eq!((rgba(&u)[0], undo_steps(&u)), (r0 - 20, steps + 1), "R");
     // The alpha field: a scrub moves it too.
-    let from = lead(&u, Id::new("cp_a"));
+    let from = lead(&u, Id::unique("cp_a"));
     drag(&mut u, from, -30.0, Modifiers::NONE);
     let [.., alpha] = rgba(&u);
     assert!(alpha < a0, "alpha {a0} → {alpha}");
     assert_eq!(undo_steps(&u), steps + 2, "alpha");
 }
 
+/// Asserts scrubbing a prototype delay sets the value once when released and adds one undo
+/// step.
+#[test]
+fn lch_and_oklch_picker_fields_edit_lightness_keeping_hue() {
+    for (model, name, l) in [(4usize, "LCH", "lch_l"), (5, "OKLCH", "oklch_l")] {
+        let (mut u, a, _) = setup();
+        let color = |u: &Ui| u.app.session.doc().unwrap().node(a).unwrap().fills[0].solid_color().unwrap();
+        u.app.set_props(&[a], json!({"fills": [{"type": "solid", "color": "#0D99FF"}]}));
+        let before = color(&u);
+        assert_eq!(before.to_hex(), "0D99FF");
+        u.ctx.data_mut(|d| d.insert_temp(Id::unique("cp_model"), model));
+        u.app.ui.picker = Some(crate::colorpicker::PickerTarget::Paint { fills: true, index: 0, ids: vec![a] });
+        for _ in 0..3 {
+            u.frame(vec![]);
+        }
+        let steps = undo_steps(&u);
+        let from = lead(&u, Id::unique(("cp_f", l)));
+        drag(&mut u, from, -20.0, Modifiers::NONE);
+        let after = color(&u);
+        let hue = |c| figcraft_color::Oklch::from_color(c).h;
+        assert!(after.luminance() < before.luminance(), "{name}: darker");
+        assert!((hue(after) - hue(before)).abs() < 3.0, "{name}: hue kept {} → {}", hue(before), hue(after));
+        assert_eq!(undo_steps(&u), steps + 1, "{name}: one undo step");
+    }
+}
+
+/// Type `text` into the picker field `id` (`("cp_f", id)`) and press Enter.
+fn type_into_picker(u: &mut Ui, id: &str, text: &str) {
+    let rect = u.ctx.read_response(Id::unique(("cp_f", id)).with("field")).unwrap_or_else(|| panic!("no picker field {id}")).rect;
+    click(u, rect.center());
+    u.frame(vec![Event::Text(text.into())]);
+    key(u, Key::Enter, Modifiers::NONE);
+    u.frame(vec![]);
+}
+
+/// A picker on layer `a` in model `model` (an index into the model menu), drawn and settled.
+fn open_picker(u: &mut Ui, a: NodeId, model: usize) {
+    u.ctx.data_mut(|d| d.insert_temp(Id::unique("cp_model"), model));
+    u.app.ui.picker = Some(crate::colorpicker::PickerTarget::Paint { fills: true, index: 0, ids: vec![a] });
+    for _ in 0..3 {
+        u.frame(vec![]);
+    }
+}
+
+fn kept_polar(u: &Ui) -> [f64; 3] {
+    u.ctx.data(|d| d.get_temp::<(&'static str, [f64; 3], [u8; 4])>(Id::unique("cp_polar"))).unwrap().1
+}
+
+#[test]
+fn oklch_keeps_a_hue_typed_on_a_grey() {
+    let (mut u, a, _) = setup();
+    let color = |u: &Ui| u.app.session.doc().unwrap().node(a).unwrap().fills[0].solid_color().unwrap();
+    u.app.set_props(&[a], json!({"fills": [{"type": "solid", "color": "#808080"}]}));
+    open_picker(&mut u, a, 5);
+    type_into_picker(&mut u, "oklch_h", "250");
+    u.frame(vec![]);
+    assert_eq!(kept_polar(&u)[2].round(), 250.0, "the hue stays on a grey");
+    type_into_picker(&mut u, "oklch_c", "0.1");
+    let ok = figcraft_color::Oklch::from_color(color(&u));
+    assert!(ok.c > 0.05 && (ok.h - 250.0).abs() < 3.0, "chroma raised along the typed hue: {ok:?}");
+}
+
+#[test]
+fn lch_keeps_the_typed_chroma_while_the_colour_is_out_of_srgb() {
+    let (mut u, a, _) = setup();
+    let color = |u: &Ui| u.app.session.doc().unwrap().node(a).unwrap().fills[0].solid_color().unwrap();
+    u.app.set_props(&[a], json!({"fills": [{"type": "solid", "color": "#0D99FF"}]}));
+    open_picker(&mut u, a, 4);
+    let hue = kept_polar(&u)[2];
+    // Lightness near white: sRGB holds almost no chroma there, so the colour comes out near grey.
+    type_into_picker(&mut u, "lch_l", "98");
+    assert_eq!(kept_polar(&u)[2], hue, "hue kept near white");
+    // Back down: the chroma and hue asked for come back instead of a grey or a red.
+    type_into_picker(&mut u, "lch_l", "60");
+    let lch = figcraft_color::Lch::from_color(color(&u));
+    assert!(lch.c > 50.0 && (lch.h - hue as f32).abs() < 2.0, "blue again: {lch:?} (hue {hue})");
+}
+
 #[test]
 fn scrubbing_a_prototype_delay_sets_it_once_when_let_go() {
     let mut s = Session::new();
@@ -453,7 +585,7 @@ fn scrubbing_a_prototype_delay_sets_it_once_when_let_go() {
         u.frame(vec![]);
     }
     let steps = undo_steps(&u);
-    let from = lead(&u, Id::new(("proto_delay", f1, 0usize)));
+    let from = lead(&u, Id::unique(("proto_delay", f1, 0usize)));
     drag(&mut u, from, 30.0, Modifiers::NONE);
     let ms = match u.app.session.doc().unwrap().node(f1).unwrap().interactions[0].trigger {
         figcraft_doc::proto::Trigger::AfterDelay { ms } => ms,
@@ -462,14 +594,514 @@ fn scrubbing_a_prototype_delay_sets_it_once_when_let_go() {
     assert_eq!((ms, undo_steps(&u)), (800, steps + 1));
 }
 
+/// Asserts scrubbing the scale panel's width scales the layer live in one undo step.
 #[test]
 fn scrubbing_the_scale_panel_width_scales_live_in_one_undo_step() {
     let (mut u, a, _) = setup();
     u.app.run("tool.set", json!({"tool": "scale"}));
     u.frame(vec![]);
     let steps = undo_steps(&u);
-    let from = lead(&u, Id::new("scale_w"));
+    let from = lead(&u, Id::unique("scale_w"));
     drag(&mut u, from, 20.0, Modifiers::NONE);
     let (_, _, w, h) = geom(&u, a);
     assert_eq!((w, h, undo_steps(&u)), (60.0, 45.0, steps + 1), "40×30 scaled to a width of 60");
 }
+
+/// The texts painted in the last frame: what they say, whether they end in an ellipsis, and where
+/// they show (within their clip).
+fn painted_texts(shapes: &[egui::epaint::ClippedShape]) -> Vec<(String, bool, egui::Rect)> {
+    fn walk(shape: &egui::Shape, clip: egui::Rect, out: &mut Vec<(String, bool, egui::Rect)>) {
+        match shape {
+            egui::Shape::Vec(v) => v.iter().for_each(|s| walk(s, clip, out)),
+            egui::Shape::Text(t) => out.push((t.galley.text().to_string(), t.galley.elided, t.visual_bounding_rect().intersect(clip))),
+            _ => {}
+        }
+    }
+    let mut out = Vec::new();
+    shapes.iter().for_each(|c| walk(&c.shape, c.clip_rect, &mut out));
+    out
+}
+
+/// The glass effect's light intensity field is labelled (#256): drawn in the Design panel with the
+/// effect's settings open.
+#[test]
+fn the_glass_light_intensity_field_has_a_label() {
+    let mut s = Session::new();
+    let r = NodeId(s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 80})).unwrap()["id"].as_u64().unwrap());
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    s.execute("effect.add", &json!({"type": "glass"})).unwrap();
+    let mut u = Ui::new(s);
+    u.ctx.data_mut(|d| d.insert_temp(Id::unique(("fx_open", 0usize)), true));
+    u.frame(vec![]);
+    let shapes = u.frame_output(vec![]).shapes;
+    let lead = u.ctx.read_response(Id::unique(("fx_gi", 0usize)).with("lead")).expect("the intensity field is shown").rect;
+    let labels: Vec<(String, bool)> =
+        painted_texts(&shapes).into_iter().filter(|(_, _, at)| lead.contains(at.center())).map(|(text, cut, _)| (text, cut)).collect();
+    assert_eq!(labels, [("Intensity".to_string(), false)], "labelled, and not cut short");
+    let field = u.ctx.read_response(Id::unique(("fx_gi", 0usize)).with("field")).expect("its value").rect;
+    assert_eq!(field.max.x - lead.min.x, GLASS_FIELD_W, "the width the next test measures against");
+}
+
+/// A glass settings field's width in the Design panel at its default width.
+const GLASS_FIELD_W: f32 = 98.5;
+
+/// The light intensity label this fix adds fits whole beside its value in every language (#256).
+/// Other glass labels may end in "…" in some languages (es "Profundidad"); a longer
+/// "Intensity" translation fails here.
+#[test]
+fn the_intensity_label_fits_whole_in_every_language() {
+    use crate::i18n::{self, Text};
+    let ctx = egui::Context::default();
+    let mut out = ctx.run_ui(Default::default(), |ui| {
+        let width = |s: &str| ui.painter().layout_no_wrap(s.to_string(), crate::theme::regular(11.0), egui::Color32::WHITE).size().x;
+        for lang in i18n::languages() {
+            let label = lang.ui.iter().find(|(k, _)| *k == "Intensity").map_or("Intensity", |(_, t)| match t {
+                Text::Plain(s) | Text::Plural { other: s, .. } => s,
+            });
+            // The test's context has only egui's own font: a label it can't draw (Vietnamese
+            // diacritics, CJK) can't be measured here, and the app draws it with a system font.
+            if !ui.ctx().fonts_mut(|f| f.has_glyphs(&crate::theme::regular(11.0), label)) {
+                continue;
+            }
+            let lead = crate::widgets::text_lead_width(ui, label, GLASS_FIELD_W);
+            assert!(lead >= 12.0 + width(label), "{}: {label:?} would end in \"…\"", lang.code);
+        }
+    });
+    out.textures_delta.clear();
+}
+
+/// Asserts a label too long for its number field is elided before the value, while the value
+/// stays whole and both remain inside the field.
+#[test]
+fn a_label_too_long_for_its_field_ends_in_an_ellipsis_before_the_value() {
+    let ctx = egui::Context::default();
+    let mut field = egui::Rect::NOTHING;
+    let mut out = ctx.run_ui(Default::default(), |ui| {
+        let lead = crate::widgets::Lead::Text("A label much wider than its field");
+        let _ = crate::widgets::number_field(ui, Id::unique("long"), lead, Some(80.0), "%", 60.0, 1.0);
+        field = ui.min_rect();
+    });
+    out.textures_delta.clear();
+    let texts = painted_texts(&out.shapes);
+    let [(_, label_cut, l), (value, value_cut, v)] = texts.as_slice() else { panic!("the label and the value: {texts:?}") };
+    assert!(*label_cut, "the label ends in an ellipsis");
+    assert_eq!((value.as_str(), *value_cut), ("80%", false), "the value shows whole");
+    assert!(field.contains_rect(*l) && field.contains_rect(*v), "both inside the field {field:?}: {l:?} {v:?}");
+    assert!(l.max.x < v.min.x, "the label stops before the value: {l:?} {v:?}");
+}
+
+/// The middle of the field with response `id`.
+fn at(u: &Ui, id: Id) -> Pos2 {
+    u.ctx.read_response(id.with("field")).unwrap_or_else(|| panic!("no field {id:?}")).rect.center()
+}
+
+/// Type `text` into the field whose response is `id` and press Enter.
+fn type_at(u: &mut Ui, id: Id, text: &str) {
+    let p = at(u, id);
+    click(u, p);
+    u.frame(vec![Event::Text(text.into())]);
+    key(u, Key::Enter, Modifiers::NONE);
+    u.frame(vec![]);
+}
+
+/// A frame with one layout grid, its settings open in the Design panel.
+fn grid_ui(grid: serde_json::Value) -> (Ui, NodeId) {
+    let mut s = Session::new();
+    let f = id(s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 400, "height": 300})).unwrap());
+    s.execute("node.set", &json!({"ids": [f], "props": {"grids": [grid]}})).unwrap();
+    s.execute("select.set", &json!({"ids": [f]})).unwrap();
+    let mut u = Ui::new(s);
+    u.ctx.data_mut(|d| d.insert_temp(Id::unique(("grid_open", 0usize)), true));
+    u.frame(vec![]);
+    (u, f)
+}
+
+/// Scroll the Design panel (over its own field `id`) until that field is on the test screen: the
+/// grid settings sit below the fold.
+fn scroll_to(u: &mut Ui, id: Id) {
+    let wheel = Event::MouseWheel {
+        unit: egui::MouseWheelUnit::Point,
+        source: egui::MouseWheelSource::Unknown,
+        delta: egui::vec2(0.0, -300.0),
+        phase: egui::TouchPhase::Move,
+        modifiers: Modifiers::NONE,
+    };
+    for _ in 0..10 {
+        let p = at(u, id);
+        if p.y < 860.0 {
+            break;
+        }
+        u.frame(vec![Event::PointerMoved(pos2(p.x, 500.0)), wheel.clone()]);
+        // Let the scroll settle.
+        for _ in 0..30 {
+            u.frame(vec![]);
+        }
+    }
+}
+
+/// The word for Auto types 0 only where 0 *is* the automatic value: a fixed layout grid's count
+/// does, an auto layout's gap (Auto there is "Space between") does not. Keying it on the field's
+/// placeholder said 0 everywhere, which turned the gap's mode off.
+#[test]
+fn typing_auto_is_zero_only_where_zero_is_the_automatic_value() {
+    let count_id = Id::unique(("grid_field", "count", 0usize));
+    let (mut u, f) = grid_ui(json!({"kind": "columns", "align": "min", "count": 3, "size": 8, "gutter": 10}));
+    let count = |u: &Ui| u.app.session.doc().unwrap().node(f).unwrap().grids[0].count;
+    scroll_to(&mut u, count_id);
+    type_at(&mut u, count_id, "Auto");
+    assert_eq!(count(&u), 0, "a fixed grid's count: Auto is 0");
+    type_at(&mut u, count_id, "4");
+    assert_eq!(count(&u), 4, "and a number is that count");
+    // A stretched grid works its width out from the frame: the field shows Auto and takes no edit.
+    let (mut u, f) = grid_ui(json!({"kind": "columns", "align": "stretch", "count": 3, "size": 0}));
+    let size_id = Id::unique(("grid_field", "size", 0usize));
+    scroll_to(&mut u, size_id);
+    type_at(&mut u, size_id, "40");
+    assert_eq!(u.app.session.doc().unwrap().node(f).unwrap().grids[0].size, 0.0, "a stretched grid's width isn't set");
+    // Nor its count: a stretched grid has at least one band, so the word commits nothing.
+    type_at(&mut u, count_id, "Auto");
+    assert_eq!(u.app.session.doc().unwrap().node(f).unwrap().grids[0].count, 3, "a stretched grid keeps its count");
+
+    // The auto layout's gap: its placeholder says Auto, but Auto is a mode, not 0.
+    let mut s = Session::new();
+    let f = id(s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 400, "height": 300})).unwrap());
+    s.execute("layout.add", &json!({"ids": [f], "direction": "vertical"})).unwrap();
+    s.execute("node.set", &json!({"ids": [f], "props": {"mainAlign": "spaceBetween"}})).unwrap();
+    s.execute("select.set", &json!({"ids": [f]})).unwrap();
+    let mut u = Ui::new(s);
+    u.frame(vec![]);
+    let gap = |u: &Ui| u.app.session.doc().unwrap().node(f).unwrap().layout.as_ref().unwrap().gap;
+    let before = gap(&u);
+    type_at(&mut u, Id::unique("al_gap"), "Auto");
+    assert_eq!(gap(&u), before, "the word isn't a value where Auto is a mode");
+}
+
+/// Save starts after the field commits, even if the next raw input releases a tab click first.
+#[test]
+fn a_deferred_field_save_keeps_its_document_when_the_next_input_switches_tabs() {
+    for (save_as, same_batch, discard) in
+        [(false, false, false), (true, false, false), (false, true, false), (true, true, false), (false, true, true), (true, true, true)]
+    {
+        let (mut u, a, _) = setup();
+        let dir = std::env::temp_dir().join(format!("figcraft-deferred-field-tab-{}-{save_as}-{same_batch}-{discard}", std::process::id()));
+        std::fs::create_dir_all(&dir).unwrap();
+        let (path, copy, other) = (dir.join("a.figcraft"), dir.join("copy.figcraft"), dir.join("b.figcraft"));
+        u.app.session.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
+        let owner = u.app.session.ds().unwrap().uid;
+        u.app.session.execute("file.new", &json!({"name": "Deferred B"})).unwrap();
+        u.app.session.execute("shape.rectangle", &json!({"x": 200, "y": 0, "width": 30, "height": 30})).unwrap();
+        u.app.session.execute("file.saveAs", &json!({"path": other.to_string_lossy()})).unwrap();
+        u.app.session.execute("shape.rectangle", &json!({"x": 300, "y": 0, "width": 10, "height": 10})).unwrap();
+        let other_uid = u.app.session.ds().unwrap().uid;
+        let other_name = u.app.session.doc().unwrap().name.clone();
+        let other_bytes = std::fs::read(&other).unwrap();
+        let index = u.app.session.docs.iter().position(|d| d.uid == owner).unwrap();
+        u.app.session.execute("doc.switch", &json!({"index": index})).unwrap();
+        let asked = std::rc::Rc::new(std::cell::Cell::new(0));
+        u.app.services = Box::new(SaveAsPicker { path: Some(copy.clone()), asked: asked.clone() });
+        u.frame(vec![]);
+        let output = u.frame_output(vec![]);
+        let nodes = output.platform_output.accesskit_update.unwrap().nodes;
+        let tab = nodes
+            .iter()
+            .map(|(_, node)| node)
+            .find(|node| node.role() == Role::Tab && node.label() == Some(other_name.as_str()))
+            .expect("the actual B tab");
+        let bounds = tab.bounds().unwrap();
+        let at = pos2(((bounds.x0 + bounds.x1) / 2.0) as f32, ((bounds.y0 + bounds.y1) / 2.0) as f32);
+        let (field_at, _) = field(&mut u, "X");
+        click(&mut u, field_at);
+        assert!(crate::a11y::field_focused(&u.ctx));
+        assert!(u.ctx.text_edit_focused(), "the actual field editor owns raw text");
+        assert_eq!(u.ctx.memory(|m| m.focused()), Some(Id::unique("pos_x").with("te")), "X owns the keyboard");
+        if !same_batch {
+            u.frame(vec![Event::Text("77".into())]);
+            assert_eq!(u.ctx.data(|d| d.get_temp::<String>(Id::unique("pos_x").with("editing"))), Some("77".into()), "raw text reached X's draft");
+        }
+        assert_eq!(geom(&u, a).0, 10.0, "the field has not committed before the shortcut");
+        let mut modifiers = if cfg!(target_os = "macos") { Modifiers::COMMAND } else { Modifiers::COMMAND.plus(Modifiers::CTRL) };
+        if save_as {
+            modifiers = modifiers.plus(Modifiers::SHIFT);
+        }
+        let button = |pressed| Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+        // Pressing the tab relinquishes the real field; its release switches documents in the
+        // next frame, before shortcuts::handle consumes the deferred request.
+        let mut events = vec![
+            Event::Key { key: Key::S, physical_key: Some(Key::S), pressed: true, repeat: false, modifiers },
+            Event::Key { key: Key::S, physical_key: Some(Key::S), pressed: false, repeat: false, modifiers },
+            Event::PointerMoved(at),
+            button(true),
+        ];
+        if same_batch {
+            events.insert(0, Event::Text("77".into()));
+        }
+        if discard {
+            events.insert(0, Event::ModifiersChanged(modifiers));
+            u.frame_raw_with_discard(egui::RawInput { events, ..Default::default() });
+        } else {
+            u.frame_with(events, modifiers);
+        }
+        assert!(u.app.ui.after_field.is_some(), "the real shortcut deferred a save");
+        if !discard {
+            assert!(
+                !u.ctx.input(|i| i.events.iter().any(|e| matches!(e, Event::Key { key: Key::S, pressed: true, .. }))),
+                "the save press was consumed once"
+            );
+        }
+        // A discarded presented pass sees the original RawInput but does not dispatch it again;
+        // pending/picker/write assertions below also prove that pass did not duplicate the save.
+        assert_eq!(u.app.session.ds().unwrap().uid, owner, "press alone did not switch tabs");
+        assert_eq!(geom(&u, a).0, 77.0, "the original field committed before delivery");
+        u.frame(vec![button(false)]);
+        assert_eq!(u.app.session.ds().unwrap().uid, other_uid, "the real tab release switched to B");
+        for _ in 0..3 {
+            u.frame(vec![]);
+        }
+        assert_eq!(u.app.session.ds().unwrap().uid, other_uid, "saving A restores the front tab B");
+        assert!(u.app.session.ds().unwrap().is_dirty(), "B was not saved");
+        assert_eq!(std::fs::read(&other).unwrap(), other_bytes, "B's file was not overwritten");
+        assert_eq!(asked.get(), usize::from(save_as), "only the original Save as asks for a path");
+        assert_eq!(saved_x(if save_as { &copy } else { &path }, a), 77.0, "A's typed field is saved");
+        assert_eq!(saved_x(&path, a), if save_as { 10.0 } else { 77.0 });
+        assert!(u.app.ui.after_field.is_none());
+        std::fs::remove_dir_all(&dir).ok();
+    }
+}
+
+/// Asserts a deferred field save does not retarget a closed, moved or foreign owner: the other
+/// file stays untouched, Save as is not opened, and the stale request is consumed once.
+#[test]
+fn a_deferred_field_save_does_not_retarget_a_closed_moved_or_foreign_owner() {
+    for change in ["closed", "moved", "foreign"] {
+        for save_as in [false, true] {
+            let (mut u, a, _) = setup();
+            u.ctx.set_embed_viewports(false);
+            let dir = std::env::temp_dir().join(format!("figcraft-deferred-field-invalid-{}-{change}-{save_as}", std::process::id()));
+            std::fs::create_dir_all(&dir).unwrap();
+            let (path, other, copy) = (dir.join("a.figcraft"), dir.join("b.figcraft"), dir.join("copy.figcraft"));
+            u.app.session.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
+            let owner = u.app.session.ds().unwrap().uid;
+            u.app.session.execute("file.new", &json!({"name": "Deferred B"})).unwrap();
+            u.app.session.execute("file.saveAs", &json!({"path": other.to_string_lossy()})).unwrap();
+            u.app.session.execute("shape.rectangle", &json!({"x": 200, "y": 0, "width": 10, "height": 10})).unwrap();
+            let other_uid = u.app.session.ds().unwrap().uid;
+            let other_bytes = std::fs::read(&other).unwrap();
+            let index = u.app.session.docs.iter().position(|d| d.uid == owner).unwrap();
+            u.app.session.execute("doc.switch", &json!({"index": index})).unwrap();
+            let asked = std::rc::Rc::new(std::cell::Cell::new(0));
+            u.app.services = Box::new(SaveAsPicker { path: Some(copy.clone()), asked: asked.clone() });
+            let (at, _) = field(&mut u, "X");
+            click(&mut u, at);
+            assert!(crate::a11y::field_focused(&u.ctx));
+            assert!(u.ctx.text_edit_focused(), "the actual field editor owns raw text");
+            assert_eq!(u.ctx.memory(|m| m.focused()), Some(Id::unique("pos_x").with("te")), "X owns the keyboard");
+            u.frame(vec![Event::Text("77".into())]);
+            assert_eq!(u.ctx.data(|d| d.get_temp::<String>(Id::unique("pos_x").with("editing"))), Some("77".into()), "raw text reached X's draft");
+            assert_eq!(geom(&u, a).0, 10.0, "typed field text is not committed before Save");
+            let mut modifiers = if cfg!(target_os = "macos") { Modifiers::COMMAND } else { Modifiers::COMMAND.plus(Modifiers::CTRL) };
+            if save_as {
+                modifiers = modifiers.plus(Modifiers::SHIFT);
+            }
+            u.frame_with(
+                vec![
+                    Event::Key { key: Key::S, physical_key: Some(Key::S), pressed: true, repeat: false, modifiers },
+                    Event::Key { key: Key::S, physical_key: Some(Key::S), pressed: false, repeat: false, modifiers },
+                ],
+                modifiers,
+            );
+            assert!(u.app.ui.after_field.is_some());
+            assert_eq!(geom(&u, a).0, 77.0, "field commit is still before the save");
+            let owner_index = u.app.session.docs.iter().position(|d| d.uid == owner).unwrap();
+            if change == "closed" {
+                u.app.session.execute("file.close", &json!({"index": owner_index, "force": true})).unwrap();
+            } else if change == "moved" {
+                let window = crate::windows::open(&mut u.app, &u.ctx, Some(owner_index), None, None).unwrap();
+                assert_ne!(window, 0);
+                assert_eq!(u.app.windows.of(owner), window);
+            } else {
+                // An impossible/misrouted pane must fail closed too; no real window has this id.
+                u.app.windows.current = u64::MAX;
+            }
+            let other_index = u.app.session.docs.iter().position(|d| d.uid == other_uid).unwrap();
+            u.app.session.execute("doc.switch", &json!({"index": other_index})).unwrap();
+            if change == "foreign" {
+                // Exercise the actual consumer without begin() resetting this deliberate invalid
+                // scope; the valid input/field producer above was the real app path.
+                // Match this direct pass and the harness clock; egui's default predicted_dt is f32.
+                let time = u.ctx.input(|i| i.time) + 1.0 / 60.0;
+                u.advance_clock(time);
+                u.ctx
+                    .run_ui(egui::RawInput { time: Some(time), ..Default::default() }, |ui| {
+                        crate::shortcuts::handle(&mut u.app, ui.ctx(), false, Default::default())
+                    })
+                    .textures_delta
+                    .clear();
+                u.app.windows.current = 0;
+            } else {
+                u.frame(vec![]);
+            }
+            for _ in 0..2 {
+                u.frame(vec![]);
+            }
+            assert_eq!(u.app.session.ds().unwrap().uid, other_uid);
+            assert!(u.app.session.ds().unwrap().is_dirty(), "stale delivery must not save B");
+            assert_eq!(std::fs::read(&other).unwrap(), other_bytes);
+            assert_eq!(saved_x(&path, a), 10.0, "a cancelled owner is not saved");
+            assert_eq!(asked.get(), 0, "a stale Save as must not open for B");
+            assert!(!copy.exists());
+            assert!(u.app.ui.after_field.is_none(), "consume stale requests once");
+            std::fs::remove_dir_all(&dir).ok();
+        }
+    }
+}
+
+/// A save prepared for A must not force its cached X editor into B when routing changes the
+/// presented document before the fields draw, even though both panels use the same widget ID.
+#[test]
+fn a_prepared_field_save_cannot_commit_into_a_same_pass_replacement_document() {
+    for route in ["control", "tab"] {
+        for save_as in [false, true] {
+            for discard in [false, true] {
+                prepared_save_cannot_enter_a_replacement(route, save_as, discard);
+            }
+        }
+    }
+}
+
+/// One route/save-as/discard combination of the same-pass replacement test: a save prepared for A
+/// must not commit A's cached X editor into B when routing presents B before the fields draw,
+/// even though both panels use the same widget ID.
+fn prepared_save_cannot_enter_a_replacement(route: &str, save_as: bool, discard: bool) {
+    let (mut u, a, _) = setup();
+    let dir = std::env::temp_dir().join(format!("figcraft-field-save-owner-{}-{route}-{save_as}-{discard}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let (path, other, copy) = (dir.join("a.figcraft"), dir.join("b.figcraft"), dir.join("copy.figcraft"));
+    u.app.session.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
+    let owner = u.app.session.ds().unwrap().uid;
+    let owner_bytes = std::fs::read(&path).unwrap();
+    u.app.session.execute("file.new", &json!({"name": "Same-pass B"})).unwrap();
+    let b = id(u.app.session.execute("shape.rectangle", &json!({"x": 200, "y": 40, "width": 30, "height": 30})).unwrap());
+    u.app.session.execute("file.saveAs", &json!({"path": other.to_string_lossy()})).unwrap();
+    u.app.session.execute("shape.rectangle", &json!({"x": 300, "y": 0, "width": 10, "height": 10})).unwrap();
+    u.app.session.execute("select.set", &json!({"ids": [b]})).unwrap();
+    let other_index = u.app.session.active;
+    let other_uid = u.app.session.ds().unwrap().uid;
+    let other_name = u.app.session.doc().unwrap().name.clone();
+    let other_model = u.app.session.ds().unwrap().doc.clone();
+    let before_switch_revision = u.app.session.ds().unwrap().revision;
+    let other_history = u.app.session.undo_depth();
+    let other_selection = u.app.session.ds().unwrap().selection.clone();
+    let other_dirty = u.app.session.ds().unwrap().is_dirty();
+    let other_bytes = std::fs::read(&other).unwrap();
+    assert!(other_dirty, "B has independent unsaved content");
+    let owner_index = u.app.session.docs.iter().position(|d| d.uid == owner).unwrap();
+    u.app.session.execute("doc.switch", &json!({"index": owner_index})).unwrap();
+    // Every command bumps the outgoing document's revision, even a nonediting switch.
+    let other_revision = u.app.session.docs.iter().find(|d| d.uid == other_uid).unwrap().revision;
+    assert_eq!(other_revision, before_switch_revision + 1, "the setup switch advances only B's command revision");
+    let asked = std::rc::Rc::new(std::cell::Cell::new(0));
+    u.app.services = Box::new(SaveAsPicker { path: Some(copy.clone()), asked: asked.clone() });
+    let output = u.frame_output(vec![]);
+    let nodes = output.platform_output.accesskit_update.unwrap().nodes;
+    let tab = nodes
+        .iter()
+        .map(|(_, node)| node)
+        .find(|node| node.role() == Role::Tab && node.label() == Some(other_name.as_str()))
+        .expect("the actual B tab");
+    let bounds = tab.bounds().unwrap();
+    let tab_at = pos2(((bounds.x0 + bounds.x1) / 2.0) as f32, ((bounds.y0 + bounds.y1) / 2.0) as f32);
+    let (at, _) = field(&mut u, "X");
+    click(&mut u, at);
+    assert_eq!(u.ctx.memory(|m| m.focused()), Some(Id::unique("pos_x").with("te")));
+    assert!(u.ctx.text_edit_focused());
+    u.frame(vec![Event::Text("77".into())]);
+    assert_eq!(u.ctx.data(|d| d.get_temp::<String>(Id::unique("pos_x").with("editing"))), Some("77".into()));
+    assert_eq!(geom(&u, a).0, 10.0, "A's raw draft is not committed yet");
+    assert_eq!(u.app.session.ds().unwrap().uid, owner, "the save begins with A presented");
+    let reply = if route == "control" {
+        let (reply, rx) = std::sync::mpsc::channel();
+        u.app.control_queue.push(crate::ControlRequest {
+            id: json!("same-pass-switch"),
+            method: "engine.execute".into(),
+            params: json!({"command": "doc.switch", "params": {"index": other_index}, "window": 0}),
+            reply,
+            state: Default::default(),
+        });
+        Some(rx)
+    } else {
+        None
+    };
+    let mut modifiers = if cfg!(target_os = "macos") { Modifiers::COMMAND } else { Modifiers::COMMAND.plus(Modifiers::CTRL) };
+    if save_as {
+        modifiers = modifiers.plus(Modifiers::SHIFT);
+    }
+    let mut events = vec![
+        Event::Key { key: Key::S, physical_key: Some(Key::S), pressed: true, repeat: false, modifiers },
+        Event::Key { key: Key::S, physical_key: Some(Key::S), pressed: false, repeat: false, modifiers },
+    ];
+    if route == "tab" {
+        events.push(Event::PointerMoved(tab_at));
+        for pressed in [true, false] {
+            events.push(Event::PointerButton { pos: tab_at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
+        }
+    }
+    if discard {
+        events.insert(0, Event::ModifiersChanged(modifiers));
+        u.frame_raw_with_discard(egui::RawInput { events, ..Default::default() });
+    } else {
+        u.frame_with(events, modifiers);
+    }
+    if let Some(reply) = reply {
+        let reply = reply.try_recv().expect("real control::drain acknowledged doc.switch in this pass");
+        assert!(reply.result.is_ok(), "{:?}", reply.result);
+    }
+    let unchanged = |u: &Ui| {
+        assert_eq!(u.app.session.ds().unwrap().uid, other_uid, "the real same-pass route presents B");
+        assert_eq!(geom(u, b), (200.0, 40.0, 30.0, 30.0), "A's draft cannot enter B's field: route={route}, save_as={save_as}, discard={discard}");
+        assert!(std::sync::Arc::ptr_eq(&u.app.session.ds().unwrap().doc, &other_model), "B's model is untouched");
+        assert_eq!(u.app.session.ds().unwrap().revision, other_revision);
+        assert_eq!(u.app.session.undo_depth(), other_history, "B's undo/redo history is unchanged");
+        assert_eq!(u.app.session.ds().unwrap().selection, other_selection);
+        assert_eq!(u.app.session.ds().unwrap().is_dirty(), other_dirty);
+        assert_eq!(std::fs::read(&other).unwrap(), other_bytes);
+        assert_eq!(std::fs::read(&path).unwrap(), owner_bytes);
+        assert_eq!(u.app.session.docs.iter().find(|d| d.uid == owner).unwrap().doc.world_bounds(a).unwrap().x0, 10.0);
+        assert_eq!(asked.get(), 0, "the cancelled request never asks for a path");
+        assert!(!copy.exists());
+        assert!(u.app.ui.after_field.is_none(), "cancel before late fallback or queueing");
+    };
+    unchanged(&u);
+    for _ in 0..3 {
+        u.frame(vec![]);
+        unchanged(&u);
+    }
+    // A cancelled draft is not a permanent veto: B accepts a later real field edit
+    // and saves its own value through the same focused-field shortcut path.
+    let (at, _) = field(&mut u, "X");
+    click(&mut u, at);
+    assert_eq!(u.ctx.memory(|m| m.focused()), Some(Id::unique("pos_x").with("te")));
+    u.frame(vec![Event::Text("88".into())]);
+    assert_eq!(geom(&u, b).0, 200.0, "fresh B text still waits for a normal commit");
+    assert_eq!(u.ctx.data(|d| d.get_temp::<String>(Id::unique("pos_x").with("editing"))), Some("88".into()));
+    u.frame_with(
+        vec![
+            Event::Key { key: Key::S, physical_key: Some(Key::S), pressed: true, repeat: false, modifiers },
+            Event::Key { key: Key::S, physical_key: Some(Key::S), pressed: false, repeat: false, modifiers },
+        ],
+        modifiers,
+    );
+    assert_eq!(geom(&u, b).0, 88.0, "a fresh B field commits normally");
+    assert!(u.app.ui.after_field.is_some());
+    for _ in 0..3 {
+        u.frame(vec![]);
+    }
+    assert_eq!(u.app.session.ds().unwrap().uid, other_uid);
+    assert_eq!(saved_x(if save_as { &copy } else { &other }, b), 88.0, "a later valid save belongs to B");
+    if save_as {
+        assert_eq!(std::fs::read(&other).unwrap(), other_bytes);
+    }
+    assert_eq!(std::fs::read(&path).unwrap(), owner_bytes, "A stays unsaved");
+    assert_eq!(asked.get(), usize::from(save_as));
+    assert!(u.app.ui.after_field.is_none());
+    std::fs::remove_dir_all(&dir).ok();
+}
diff --git a/crates/ui-egui/src/frame_label_tests.rs b/crates/ui-egui/src/frame_label_tests.rs
index 38ebef0a..6c15fc00 100644
--- a/crates/ui-egui/src/frame_label_tests.rs
+++ b/crates/ui-egui/src/frame_label_tests.rs
@@ -1,6 +1,6 @@
 //! Frame name labels on the canvas, driven through egui headless: an upright frame's label sits
 //! just above its top-left corner, a rotated frame's runs along its turned top edge, and pressing
-//! either label selects and drags its frame.
+//! either label selects and drags its frame; double-clicking one renames the frame or section there.
 
 use egui::{Event, Pos2, pos2, vec2};
 use figcraft_doc::NodeId;
@@ -79,3 +79,100 @@ fn pressing_a_rotated_label_selects_and_drags_the_frame() {
     assert!(after.x0 > before.x0 + 1.0 && after.y0 > before.y0 + 1.0, "{before:?} → {after:?}");
     assert_eq!(u.app.session.ds().unwrap().history.undo.len(), undo + 1);
 }
+
+fn key(k: egui::Key) -> Vec<Event> {
+    vec![
+        Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() },
+        Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers: Default::default() },
+    ]
+}
+
+/// Double-click `f`'s label and wait for the field to take the keyboard.
+fn double_click_label(u: &mut Ui, f: NodeId) {
+    let at = mid(&label(u, f));
+    for _ in 0..2 {
+        u.button(at, true);
+        u.button(at, false);
+    }
+    u.frame(vec![]);
+    u.frame(vec![]);
+}
+
+fn name(u: &Ui, f: NodeId) -> String {
+    u.app.session.doc().unwrap().node(f).unwrap().name.clone()
+}
+
+#[test]
+fn double_clicking_a_label_renames_the_frame_there() {
+    let (mut u, a, b) = setup();
+    let before = u.app.session.doc().unwrap().world_bounds(a).unwrap();
+    double_click_label(&mut u, a);
+    assert_eq!(u.app.session.selection(), vec![a]);
+    assert_eq!(u.app.ui.rename_label.map(|r| r.id), Some(a), "a field over the label");
+    // The name starts selected: typing replaces it, Enter keeps it.
+    u.frame(vec![Event::Text("Sign in".into())]);
+    u.frame(key(egui::Key::Enter));
+    u.frame(vec![]);
+    assert_eq!(name(&u, a), "Sign in");
+    assert!(u.app.ui.rename_label.is_none());
+    // The double-click didn't move the frame or rename the other one.
+    assert_eq!(u.app.session.doc().unwrap().world_bounds(a).unwrap(), before);
+    assert_eq!(name(&u, b), "Turned");
+    // One undo step puts the old name back.
+    u.app.session.undo().unwrap();
+    assert_eq!(name(&u, a), "Upright");
+}
+
+#[test]
+fn escape_leaves_a_label_rename_with_the_old_name() {
+    let (mut u, _, b) = setup();
+    double_click_label(&mut u, b);
+    assert_eq!(u.app.ui.rename_label.map(|r| r.id), Some(b), "rotated labels rename too");
+    u.frame(vec![Event::Text("Nope".into())]);
+    u.frame(key(egui::Key::Escape));
+    u.frame(vec![]);
+    assert_eq!(name(&u, b), "Turned");
+    assert!(u.app.ui.rename_label.is_none());
+}
+
+#[test]
+fn a_sections_label_renames_it_and_a_click_elsewhere_commits() {
+    let mut s = Session::new();
+    let a = id(s.execute("node.create", &json!({"type": "section", "x": 0, "y": 0, "width": 300, "height": 200, "name": "Area"})).unwrap());
+    s.execute("select.none", &json!({})).unwrap();
+    let mut u = Ui::new(s);
+    u.frame(vec![]);
+    let undo = u.app.session.ds().unwrap().history.undo.len();
+    double_click_label(&mut u, a);
+    assert_eq!(u.app.ui.rename_label.map(|r| r.id), Some(a), "a field over the section's label");
+    assert_eq!(u.app.session.selection(), vec![a]);
+    u.frame(vec![Event::Text("Zone".into())]);
+    let at = mid(&label(&u, a));
+    let away = pos2(at.x + 200.0, at.y + 500.0);
+    u.button(away, true);
+    u.button(away, false);
+    u.frame(vec![]);
+    assert_eq!(name(&u, a), "Zone", "a click on the canvas commits");
+    assert!(u.app.ui.rename_label.is_none());
+    assert_eq!(u.app.session.ds().unwrap().history.undo.len(), undo + 1, "one undo step");
+}
+
+#[test]
+fn a_sections_pill_is_above_the_labels_of_frames_inside_it() {
+    // A frame near the section's top-left puts its label over the section's pill (#1150): the pill
+    // draws last, so pressing where they overlap selects the section.
+    let mut s = Session::new();
+    let sec = id(s.execute("node.create", &json!({"type": "section", "x": 0, "y": 0, "width": 300, "height": 200, "name": "Marketing"})).unwrap());
+    let f = id(s.execute("frame.create", &json!({"x": 10, "y": 22, "width": 100, "height": 80, "name": "Icon card", "parent": sec})).unwrap());
+    s.execute("select.none", &json!({})).unwrap();
+    let mut u = Ui::new(s);
+    u.frame(vec![]);
+    let at = mid(&label(&u, sec));
+    let frame_label = egui::Rect::from_points(&label(&u, f));
+    assert!(frame_label.contains(at), "the frame's label {frame_label:?} overlaps the pill at {at:?}");
+    let order: Vec<NodeId> = u.app.session.tool.labels.iter().map(|(id, _)| *id).collect();
+    assert_eq!(order, vec![f, sec], "the section's label comes after (above) its frames'");
+    u.button(at, true);
+    u.button(at, false);
+    assert_eq!(u.app.session.selection(), vec![sec]);
+}
diff --git a/crates/ui-egui/src/home.rs b/crates/ui-egui/src/home.rs
index abbd0440..05c8fcda 100644
--- a/crates/ui-egui/src/home.rs
+++ b/crates/ui-egui/src/home.rs
@@ -15,6 +15,8 @@ use crate::i18n::{tr, tr_noop};
 use crate::icons::{self, Icon};
 use crate::theme::{ACCENT, Tokens, regular, semibold};
 use crate::widgets;
+pub mod home_recents;
+pub mod online;
 
 /// The section the home screen shows.
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
@@ -27,7 +29,7 @@ pub enum Section {
 
 impl Section {
     /// The sidebar, top to bottom.
-    const ALL: [(Section, Icon, &'static str); 3] = [
+    const ALL: [(Section, Icon, &str); 3] = [
         (Section::Recents, Icon::Home, tr_noop("Recents")),
         (Section::Online, Icon::Online, tr_noop("Online")),
         (Section::Templates, Icon::Assets, tr_noop("Templates")),
@@ -51,6 +53,8 @@ impl Section {
 #[derive(Default)]
 pub struct Home {
     pub section: Section,
+    /// Searches known files and starter templates together from the home sidebar.
+    pub file_query: String,
     /// The Templates search text and kind filter.
     pub query: String,
     pub kind: Option<Kind>,
@@ -143,7 +147,7 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
         let left = Rect::from_min_size(rect.min, vec2(SIDEBAR, rect.height()));
         ui.painter().line_segment([left.right_top(), left.right_bottom()], Stroke::new(1.0, t.border));
         sidebar(app, ui, &t, left);
-        if app.ui.home_view.section == Section::Online {
+        if app.ui.home_view.file_query.trim().is_empty() && app.ui.home_view.section == Section::Online {
             // Your online files lay themselves out in the area (and scroll their own list).
             let area = Rect::from_min_max(pos2(left.max.x + 40.0, rect.min.y + 24.0), rect.max - vec2(40.0, 24.0));
             crate::online::section(app, ui, area, &t);
@@ -155,9 +159,14 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
             egui::ScrollArea::vertical().id_salt("home").auto_shrink([false, false]).show(ui, |ui| {
                 egui::Frame::NONE.inner_margin(egui::Margin::symmetric(40, 24)).show(ui, |ui| {
                     ui.spacing_mut().item_spacing = vec2(GAP, 0.0);
-                    match app.ui.home_view.section {
-                        Section::Templates => templates(app, ui, &t),
-                        _ => recents(app, ui, &t),
+                    if app.ui.home_view.file_query.trim().is_empty() {
+                        match app.ui.home_view.section {
+                            Section::Templates => templates(app, ui, &t),
+                            _ => recents(app, ui, &t),
+                        }
+                    } else {
+                        search_results(app, ui, &t);
+                        opened_join(app);
                     }
                 });
             });
@@ -173,35 +182,40 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
 fn dropped(app: &mut FigApp, ctx: &egui::Context) {
     let files = ctx.input(|i| i.raw.dropped_files.clone());
     for f in files {
-        let path = f.path().to_path_buf();
-        if !crate::opens(&path) {
-            app.toast(tr("Drop a .figcraft, .fig, .json, .svg or image file."));
+        if !crate::opens(f.path()) {
+            app.toast(tr("Drop a .figcraft, .fig, .sketch, .json, .svg or image file."));
             continue;
         }
-        // `opens` saw an extension, so there is a file name to tell the format by.
-        let name = path.file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_default();
-        let params = if path.exists() {
-            json!({"path": path.to_string_lossy()})
-        } else if let Some(bytes) = crate::dropped_bytes(&f) {
-            use base64::Engine as _;
-            let data = base64::engine::general_purpose::STANDARD.encode(&bytes);
-            json!({"data": data, "name": name})
-        } else {
-            continue;
-        };
-        app.ui.pending_opens.push(crate::pending_open::PendingOpen { label: name, params, command: "file.open", target: None });
+        crate::pending_open::open_dropped(app, &f);
     }
 }
 
+/// Draw the Home sidebar: app icon and wordmark, file/template search (Escape clears it)
+/// and section tabs; choosing a section clears the file query.
 fn sidebar(app: &mut FigApp, ui: &mut Ui, t: &Tokens, left: Rect) {
     let mut y = left.min.y + 20.0;
-    icons::paint(ui.painter(), Rect::from_min_size(pos2(left.min.x + 16.0, y), vec2(20.0, 20.0)), Icon::Logo, ACCENT);
-    ui.painter().text(pos2(left.min.x + 44.0, y + 10.0), Align2::LEFT_CENTER, "FigCraft", semibold(14.0), t.text);
-    y += 48.0;
+    crate::theme::paint_app_icon(ui, Rect::from_min_size(pos2(left.min.x + 12.0, y - 4.0), vec2(32.0, 32.0)));
+    crate::theme::paint_wordmark(ui.painter(), pos2(left.min.x + 52.0, y + 12.0), 16.0, t);
+    y += 52.0;
+    let search = Rect::from_min_size(pos2(left.min.x + 8.0, y), vec2(SIDEBAR - 16.0, widgets::FIELD_H));
+    ui.scope_builder(egui::UiBuilder::new().max_rect(search), |ui| {
+        let response = widgets::text_input(
+            ui,
+            Id::unique("home_file_search"),
+            &mut app.ui.home_view.file_query,
+            search.width(),
+            tr("Search files and templates"),
+        );
+        a11y::text(&response, tr("Search files and templates"), &app.ui.home_view.file_query);
+        if (response.has_focus() || response.lost_focus()) && ui.input(|i| i.key_pressed(egui::Key::Escape)) {
+            app.ui.home_view.file_query.clear();
+        }
+    });
+    y += widgets::FIELD_H + 12.0;
     for (section, icon, label) in Section::ALL {
         let r = Rect::from_min_size(pos2(left.min.x + 8.0, y), vec2(SIDEBAR - 16.0, 32.0));
-        let resp = ui.interact(r, ui.id().with(("home_section", label)), Sense::click());
-        let current = app.ui.home_view.section == section;
+        let resp = ui.interact(r, ui.scope_id().with(("home_section", label)), Sense::click());
+        let current = app.ui.home_view.file_query.trim().is_empty() && app.ui.home_view.section == section;
         a11y::tab(&resp, tr(label), current);
         if current || resp.hovered() {
             ui.painter().rect_filled(r, CornerRadius::same(5), if current { t.selected_row } else { t.hover });
@@ -211,11 +225,65 @@ fn sidebar(app: &mut FigApp, ui: &mut Ui, t: &Tokens, left: Rect) {
         ui.painter().text(pos2(r.min.x + 36.0, r.center().y), Align2::LEFT_CENTER, tr(label), regular(12.0), t.text);
         if resp.clicked() {
             app.ui.home_view.section = section;
+            app.ui.home_view.file_query.clear();
         }
         y += 34.0;
     }
 }
 
+fn file_matches(name: &str, location: &str, query: &str) -> bool {
+    name.to_lowercase().contains(query) || location.to_lowercase().contains(query)
+}
+
+/// One search over known files and starter templates. It never sends a query or owner token to a
+/// server; online files are opened through their existing owner-token command only on click.
+fn search_results(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
+    heading(ui, t, tr("Search results"));
+    let query = app.ui.home_view.file_query.trim().to_lowercase();
+    let mut count = open_files(app, ui, t, &query);
+    count += crate::home_recents::section(app, ui, t, &query);
+
+    let online: Vec<_> = app.session.prefs.online_files.iter().filter(|f| file_matches(&f.name, &f.server, &query)).cloned().collect();
+    let mut open_online = None;
+    if !online.is_empty() {
+        subheading(ui, t, tr("Online files"));
+        for f in &online {
+            count += 1;
+            let host = figcraft_engine::online::server_host(&f.server);
+            let icon = crate::online::mark(f.shared.is_some());
+            let row = FileRow {
+                mark: Some((icon, if f.shared.is_some() { t.success } else { t.icon_secondary })),
+                name: &f.name,
+                ink: t.text,
+                detail: host,
+                detail_size: 11.0,
+                detail_ink: t.text_secondary,
+            };
+            if listed(ui, t, ui.scope_id().with(("search_online", &f.server, &f.file)), 36.0, &row) {
+                open_online = Some(f.clone());
+            }
+        }
+    }
+    let templates: Vec<&Template> = TEMPLATES.iter().filter(|template| matches(template, &query, None)).collect();
+    if !templates.is_empty() {
+        subheading(ui, t, tr("Templates"));
+        template_grid(app, ui, t, &templates);
+    }
+    if count == 0 && templates.is_empty() {
+        ui.label(egui::RichText::new(tr("No files or templates match your search")).font(semibold(13.0)).color(t.text));
+        ui.add_space(6.0);
+        widgets::label(ui, tr("Try another search, or browse templates."), t.text_secondary);
+        ui.add_space(16.0);
+        if widgets::button(ui, tr("Show all templates"), false, true).clicked() {
+            app.ui.home_view.file_query.clear();
+            app.ui.home_view.section = Section::Templates;
+        }
+    }
+    if let Some(file) = open_online {
+        crate::online::open(app, &file);
+    }
+}
+
 /// A ring around a card or row that has the keyboard.
 fn focus_ring(ui: &Ui, t: &Tokens, rect: Rect, resp: &Response, radius: u8) {
     if resp.has_focus() {
@@ -253,8 +321,8 @@ fn action_card(ui: &mut Ui, t: &Tokens, icon: Icon, title: &str, sub: &str) -> b
     }
     card_frame(ui, t, r, &resp);
     let ir = Rect::from_min_size(pos2(r.min.x + 16.0, r.center().y - 16.0), vec2(32.0, 32.0));
-    ui.painter().rect_filled(ir, CornerRadius::same(6), ACCENT);
-    icons::paint(ui.painter(), ir.shrink(8.0), icon, Color32::WHITE);
+    ui.painter().rect_filled(ir, CornerRadius::same(6), t.accent);
+    icons::paint(ui.painter(), ir.shrink(8.0), icon, t.accent_on);
     ui.painter().text(pos2(r.min.x + 60.0, r.center().y - 8.0), Align2::LEFT_CENTER, title_shown, semibold(12.0), t.text);
     ui.painter().text(pos2(r.min.x + 60.0, r.center().y + 9.0), Align2::LEFT_CENTER, sub_shown, regular(11.0), t.text_secondary);
     resp.clicked()
@@ -262,13 +330,14 @@ fn action_card(ui: &mut Ui, t: &Tokens, icon: Icon, title: &str, sub: &str) -> b
 
 fn recents(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
     heading(ui, t, tr("Recents"));
-    let (mut new_file, mut open) = (false, false);
-    ui.horizontal(|ui| {
-        new_file = action_card(ui, t, Icon::Plus, tr("New design file"), tr("Start from a blank canvas"));
+    let (mut new_file, mut new_board, mut open) = (false, false, false);
+    ui.horizontal_wrapped(|ui| {
+        new_file = action_card(ui, t, Icon::PenNib, tr("New design file"), tr("Start from a blank canvas"));
+        new_board = action_card(ui, t, Icon::Board, tr("New board"), tr("Sticky notes, shapes and connectors"));
         open = action_card(ui, t, Icon::Page, tr("Open file"), tr("Open .figcraft, .svg or images"));
     });
-    if new_file {
-        app.run("file.new", json!({}));
+    if new_file || new_board {
+        app.run(if new_board { "file.newBoard" } else { "file.new" }, json!({}));
         app.ui.home = false;
     }
     if open {
@@ -290,24 +359,8 @@ fn recents(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
         ui.add_space(28.0);
         getting_started(app, ui, t);
     }
-    if !app.session.docs.is_empty() {
-        subheading(ui, t, tr("Open files"));
-        let mut switch = None;
-        for (i, d) in app.session.docs.iter().enumerate() {
-            let detail = d.path.as_deref().unwrap_or_default();
-            let row =
-                FileRow { mark: Some((Icon::Logo, ACCENT)), name: &d.doc.name, ink: t.text, detail, detail_size: 11.0, detail_ink: t.text_secondary };
-            if listed(ui, t, ui.id().with(("open", d.uid)), 36.0, &row) {
-                switch = Some(i);
-            }
-        }
-        if let Some(i) = switch {
-            app.run("doc.switch", json!({"index": i}));
-            app.ui.home = false;
-        }
-    }
-    let recents = app.session.prefs.recent_files.clone();
-    if recents.is_empty() {
+    open_files(app, ui, t, "");
+    if crate::home_recents::listed(&app.session.prefs.recent_files).next().is_none() {
         // A first run: nothing to reopen yet, so offer something to start from.
         subheading(ui, t, tr("Start from a template"));
         let shown: Vec<&Template> = TEMPLATES.iter().take(FIRST_RUN).collect();
@@ -318,7 +371,38 @@ fn recents(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
         }
         return;
     }
-    crate::home_recents::section(app, ui, t);
+    crate::home_recents::section(app, ui, t, "");
+}
+
+/// The Open files list: the documents whose name or path has `query` (lower case; all for ""), a
+/// row each; choosing one shows its tab. How many are listed.
+fn open_files(app: &mut FigApp, ui: &mut Ui, t: &Tokens, query: &str) -> usize {
+    let hit = |d: &&figcraft_engine::DocState| file_matches(&d.doc.name, d.path.as_deref().unwrap_or_default(), query);
+    let count = app.session.docs.iter().filter(hit).count();
+    if count == 0 {
+        return 0;
+    }
+    subheading(ui, t, tr("Open files"));
+    let mut switch = None;
+    for (i, d) in app.session.docs.iter().enumerate().filter(|(_, d)| hit(d)) {
+        let detail = d.path.as_deref().unwrap_or_default();
+        let row = FileRow {
+            mark: Some((icons::file_mark(d.doc.kind), ACCENT)),
+            name: &d.doc.name,
+            ink: t.text,
+            detail,
+            detail_size: 11.0,
+            detail_ink: t.text_secondary,
+        };
+        if listed(ui, t, ui.scope_id().with(("open", d.uid)), 36.0, &row) {
+            switch = Some(i);
+        }
+    }
+    if let Some(i) = switch {
+        app.run("doc.switch", json!({"index": i}));
+        app.ui.home = false;
+    }
+    count
 }
 
 /// The file joined from the home screen (a code, or one of your online files) opened in a tab of
@@ -348,7 +432,7 @@ fn getting_started(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
     let close = Rect::from_min_size(pos2(rect.max.x - 36.0, rect.min.y + 12.0), vec2(24.0, 24.0));
     if widgets::icon_button_at(
         ui,
-        ui.id().with("tips_close"),
+        ui.scope_id().with("tips_close"),
         close,
         Icon::Close,
         tr("Hide these tips (Getting started in the Help menu shows them again)"),
@@ -395,10 +479,12 @@ fn matches(template: &Template, query: &str, kind: Option<Kind>) -> bool {
             || has(template.size))
 }
 
+/// Draw template search and kind filter, show no-match guidance and a "Show all templates"
+/// button that clears the query and kind, and lay matching templates out in a grid.
 fn templates(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
     heading(ui, t, tr("Templates"));
     ui.horizontal(|ui| {
-        let search = widgets::text_input(ui, Id::new("home_template_search"), &mut app.ui.home_view.query, 260.0, tr("Search templates"));
+        let search = widgets::text_input(ui, Id::unique("home_template_search"), &mut app.ui.home_view.query, 260.0, tr("Search templates"));
         a11y::text(&search, tr("Search templates"), &app.ui.home_view.query);
         let labels: Vec<&str> = std::iter::once(tr("All")).chain(Kind::ALL.iter().map(|k| tr(k.label()))).collect();
         let active = app.ui.home_view.kind.and_then(|k| Kind::ALL.iter().position(|x| *x == k)).map_or(0, |i| i + 1);
@@ -431,7 +517,7 @@ fn templates(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
 fn template_grid(app: &mut FigApp, ui: &mut Ui, t: &Tokens, list: &[&Template]) {
     let columns = (((ui.available_width() + GAP) / (CARD_W + GAP)).floor() as usize).max(1);
     let dark = ui.visuals().dark_mode;
-    let mut thumbs: Thumbs = ui.data(|d| d.get_temp(Id::new("template_thumbs"))).unwrap_or_default();
+    let mut thumbs: Thumbs = ui.data(|d| d.get_temp(Id::unique("template_thumbs"))).unwrap_or_default();
     let mut chosen = None;
     let mut rendered = false;
     for row in list.chunks(columns) {
@@ -454,7 +540,7 @@ fn template_grid(app: &mut FigApp, ui: &mut Ui, t: &Tokens, list: &[&Template])
         });
         ui.add_space(GAP);
     }
-    ui.data_mut(|d| d.insert_temp(Id::new("template_thumbs"), thumbs));
+    ui.data_mut(|d| d.insert_temp(Id::unique("template_thumbs"), thumbs));
     if let Some(template) = chosen
         && app.run("file.newFromTemplate", json!({"template": template.id, "name": tr(template.name)})).is_some()
     {
@@ -526,6 +612,6 @@ fn thumbnail(ctx: &egui::Context, template: &Template, background: figcraft_colo
 /// Tests: the templates whose pictures are cached for the light or dark theme.
 #[cfg(test)]
 pub(crate) fn cached_thumbnails(ctx: &egui::Context, dark: bool) -> Vec<&'static str> {
-    let thumbs: Thumbs = ctx.data(|d| d.get_temp(Id::new("template_thumbs"))).unwrap_or_default();
+    let thumbs: Thumbs = ctx.data(|d| d.get_temp(Id::unique("template_thumbs"))).unwrap_or_default();
     thumbs.0.iter().filter(|((_, d), thumb)| *d == dark && thumb.is_some()).map(|((id, _), _)| *id).collect()
 }
diff --git a/crates/ui-egui/src/home_recents.rs b/crates/ui-egui/src/home/home_recents.rs
similarity index 86%
rename from crates/ui-egui/src/home_recents.rs
rename to crates/ui-egui/src/home/home_recents.rs
index d633f776..3525b31f 100644
--- a/crates/ui-egui/src/home_recents.rs
+++ b/crates/ui-egui/src/home/home_recents.rs
@@ -10,6 +10,7 @@
 use std::collections::HashMap;
 use std::path::Path;
 
+use chrono::Datelike;
 use egui::{Align2, Color32, CornerRadius, Id, Key, Rect, Response, Sense, Stroke, StrokeKind, Ui, pos2, vec2};
 use figcraft_engine::Prefs;
 use figcraft_format::thumbnail::{FileKind, Preview};
@@ -200,18 +201,35 @@ const MONTHS: [&str; 12] = [
     tr_noop("Dec"),
 ];
 
-/// `secs` since 1970 as a date in UTC: "Mar 4, 2026".
+/// (days since 1970-01-01, seconds-of-day, nanos) → (proleptic Gregorian year, the same wall-clock
+/// instant moved into chrono's range by whole 400-year cycles). The calendar repeats every 400
+/// years (146_097 days), so month, day and time of day come from chrono and only the year is
+/// carried, which keeps the result exact for any `i64` day count. This is not hand-rolled calendar
+/// math: chrono still does the date, the cycle count just shifts the year.
+fn utc_parts(days: i64, sod: u32, nanos: u32) -> (i64, chrono::NaiveDateTime) {
+    let (cycles, rest) = (days.div_euclid(146_097), days.rem_euclid(146_097));
+    // `rest + 719_163` (1970-01-01 is CE day 719_163) is always a valid CE day, and `sod` < 86_400.
+    let date = i32::try_from(rest + 719_163).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+    let time = chrono::NaiveTime::from_num_seconds_from_midnight_opt(sod.min(86_399), nanos.min(999_999_999));
+    match (date, time) {
+        (Some(d), Some(t)) => {
+            let y = i128::from(d.year()) + i128::from(cycles) * 400;
+            (i64::try_from(y).unwrap_or(if y < 0 { i64::MIN } else { i64::MAX }), d.and_time(t))
+        }
+        _ => (1970, chrono::NaiveDateTime::default()), // unreachable
+    }
+}
+
+/// `secs` since 1970 as a date in UTC: "Mar 4, 2026". Years past chrono's own range (262143) keep
+/// converting: the instant is moved into range by whole 400-year cycles and the real year restored,
+/// so every `u64` reads as the date the old hand-rolled conversion produced.
 fn date(secs: u64) -> String {
-    // Days to a civil date (Howard Hinnant's days_from_civil, inverted).
-    let z = i64::try_from(secs / 86_400).unwrap_or(0) + 719_468;
-    let era = z.div_euclid(146_097);
-    let doe = z.rem_euclid(146_097);
-    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let day = doy - (153 * mp + 2) / 5 + 1;
-    let month = if mp < 10 { mp + 3 } else { mp - 9 };
-    let year = yoe + era * 400 + i64::from(month <= 2);
+    // The day count of any `u64` seconds fits in `i64` (`u64::MAX / 86_400` ≈ 2.1e14), so the
+    // conversion is always exact (no epoch fallback). Splitting with `u64` arithmetic (as the old
+    // code did) avoids the `i64` seconds overflow near `u64::MAX`.
+    let (days, sod) = (i64::try_from(secs / 86_400).unwrap_or(i64::MAX), (secs % 86_400) as u32);
+    let (year, dt) = utc_parts(days, sod, 0);
+    let (month, day) = (i64::from(dt.month()), i64::from(dt.day()));
     let name = usize::try_from(month - 1).ok().and_then(|m| MONTHS.get(m)).map_or("", |m| tr(m));
     trf("{month} {day}, {year}", &[("month", &name), ("day", &day), ("year", &year)])
 }
@@ -234,6 +252,8 @@ pub struct Shown {
     pub name: String,
     /// `None` until the file has been looked at.
     pub stat: Option<Stat>,
+    /// A design file or a board (design until its picture has been read).
+    pub kind: figcraft_doc::FileKind,
 }
 
 impl Shown {
@@ -241,7 +261,7 @@ impl Shown {
         // Shown without its extension, like a document's name; the full path is the tooltip.
         let p = Path::new(path);
         let name = p.file_stem().or_else(|| p.file_name()).map_or_else(|| path.to_string(), |f| f.to_string_lossy().into_owned());
-        Shown { path: path.to_string(), name, stat }
+        Shown { path: path.to_string(), name, stat, kind: figcraft_doc::FileKind::Design }
     }
 
     fn date(&self, key: SortKey) -> Option<u64> {
@@ -293,6 +313,7 @@ struct Ready {
     modified: Option<u64>,
     page: Option<Color32>,
     texture: Option<egui::TextureHandle>,
+    kind: figcraft_doc::FileKind,
     /// When it came in (for its fade).
     arrived: f64,
 }
@@ -461,7 +482,7 @@ impl Recents {
                         let page = preview.page.map(|[r, g, b, a]| crate::theme::c32(figcraft_color::Color { r, g, b, a }));
                         // A changed file's new picture shows at once; a first one fades in.
                         let arrived = if k.shown.is_some() { f64::NEG_INFINITY } else { time };
-                        k.shown = Some(Ready { modified, page, texture, arrived });
+                        k.shown = Some(Ready { modified, page, texture, kind: preview.kind, arrived });
                         k.wanted = None;
                     }
                 }
@@ -501,12 +522,18 @@ impl Recents {
 
     /// The files as listed, with what is known about them.
     fn shown(&self, paths: &[String]) -> Vec<Shown> {
-        paths.iter().map(|p| Shown::new(p, self.files.get(p).and_then(|k| k.stat))).collect()
+        paths
+            .iter()
+            .map(|p| {
+                let k = self.files.get(p);
+                Shown { kind: k.and_then(|k| k.shown.as_ref()).map_or_else(Default::default, |r| r.kind), ..Shown::new(p, k.and_then(|k| k.stat)) }
+            })
+            .collect()
     }
 
     /// For `ui.inspect`: each file listed, whether it is there and whether its picture is in.
     pub fn inspect(&self, prefs: &Prefs) -> Value {
-        let paths: Vec<String> = prefs.recent_files.iter().take(SHOWN).cloned().collect();
+        let paths: Vec<String> = listed(&prefs.recent_files).take(SHOWN).cloned().collect();
         let files: Vec<Value> = sorted(self.shown(&paths), Sort::of(prefs))
             .iter()
             .map(|f| {
@@ -525,6 +552,12 @@ impl Recents {
     }
 }
 
+/// The recent files that may be listed: all of them, or, when the app runs confined to automation
+/// roots, those inside them (no name or picture of another file is shown).
+pub(crate) fn listed(recents: &[String]) -> impl Iterator<Item = &String> {
+    recents.iter().filter(|p| figcraft_engine::file_access::allowed(p, figcraft_engine::file_access::Access::Read))
+}
+
 /// The recent files for `ui.inspect`: `{view, sort, order, files: [{path, name, exists, picture,
 /// selected}]}` in the order shown (`picture`: `none`, `loading`, `picture`, `page` or
 /// `placeholder`).
@@ -548,16 +581,27 @@ enum Action {
     View(View),
 }
 
-/// The Recent files heading, its toolbar and the files as cards or a table.
-pub fn section(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
-    let paths: Vec<String> = app.session.prefs.recent_files.iter().take(SHOWN).cloned().collect();
+/// The Recent files heading, its toolbar and the files as cards or a table. With a `query` (lower
+/// case, from the Home search) only the files not open whose path has it, from every recent file;
+/// nothing at all when none has it. How many files are shown.
+pub fn section(app: &mut FigApp, ui: &mut Ui, t: &Tokens, query: &str) -> usize {
+    let searching = !query.is_empty();
+    // A search reaches every recent file; the files shown without one stay known through it.
+    let paths: Vec<String> = listed(&app.session.prefs.recent_files).take(if searching { usize::MAX } else { SHOWN }).cloned().collect();
     let time = ui.input(|i| i.time);
     let now = figcraft_engine::cmd::comment::now_secs();
     let reduce_motion = app.reduce_motion();
     let (view, sort) = (View::of(&app.session.prefs), Sort::of(&app.session.prefs));
     let state = &mut app.ui.home_view.recents;
     state.refresh(ui.ctx(), &paths, time);
-    let files = sorted(state.shown(&paths), sort);
+    let mut files = sorted(state.shown(&paths), sort);
+    if searching {
+        let docs = &app.session.docs;
+        files.retain(|f| f.path.to_lowercase().contains(query) && !docs.iter().any(|d| d.path.as_deref() == Some(f.path.as_str())));
+        if files.is_empty() {
+            return 0;
+        }
+    }
     let with_created = files.iter().any(|f| f.stat.is_some_and(|s| s.created.is_some()));
     let mut action = toolbar(ui, t, view, sort, with_created);
     ui.add_space(16.0);
@@ -568,7 +612,7 @@ pub fn section(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
     action = action.or(chosen);
     match action {
         Some(Action::Open(path)) => {
-            if app.run("file.open", json!({"path": path})).is_some() {
+            if app.run_user("file.open", json!({"path": path})).is_some() {
                 app.ui.home = false;
             }
         }
@@ -587,6 +631,7 @@ pub fn section(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
         }
         None => {}
     }
+    files.len()
 }
 
 /// "Recent files", and at the right the sort menu and the grid and list buttons.
@@ -640,7 +685,7 @@ fn heading(ui: &mut Ui, t: &Tokens, text: &str) {
 
 /// The id of `path`'s card or row (stable, so the keyboard stays on it as the order changes).
 fn card_id(path: &str) -> Id {
-    Id::new(("home_recent_file", path))
+    Id::unique(("home_recent_file", path))
 }
 
 /// Clicks, keys and the context menu on a card or row: a click selects, a double-click or Enter
@@ -715,13 +760,13 @@ fn arrows(ui: &Ui, recents: &mut Recents, files: &[Shown], across: usize, down:
     }
 }
 
-/// The square file-type mark before a name.
-fn file_icon(ui: &Ui, t: &Tokens, center: egui::Pos2, path: &str) {
+/// The square file-type mark before a name (a design file's pen nib, a board's note).
+fn file_icon(ui: &Ui, t: &Tokens, center: egui::Pos2, file: &Shown) {
     let r = Rect::from_center_size(center, vec2(16.0, 16.0));
-    match FileKind::of(Path::new(path)) {
-        FileKind::FigCraft | FileKind::Fig => {
-            ui.painter().rect_filled(r, CornerRadius::same(4), ACCENT);
-            icons::paint(ui.painter(), r.shrink(3.0), Icon::Logo, Color32::WHITE);
+    match FileKind::of(Path::new(&file.path)) {
+        FileKind::FigCraft | FileKind::Fig | FileKind::Sketch => {
+            ui.painter().rect_filled(r, CornerRadius::same(4), t.accent);
+            icons::paint(ui.painter(), r.shrink(3.0), icons::file_mark(file.kind), t.accent_on);
         }
         kind => {
             ui.painter().rect_filled(r, CornerRadius::same(4), t.field);
@@ -831,7 +876,7 @@ fn card(
     }
     p.line_segment([pos2(rect.min.x, area.max.y + 0.5), pos2(rect.max.x, area.max.y + 0.5)], Stroke::new(1.0, t.border));
     let y = area.max.y + 1.0 + FOOTER_H / 2.0;
-    file_icon(ui, t, pos2(rect.min.x + 24.0, y), &file.path);
+    file_icon(ui, t, pos2(rect.min.x + 24.0, y), file);
     let (x, w) = (rect.min.x + 44.0, rect.width() - 56.0);
     let name = widgets::elide_font(ui, &file.name, w, semibold(12.5));
     p.text(pos2(x, y - 8.0), Align2::LEFT_CENTER, name, semibold(12.5), t.text);
@@ -864,7 +909,7 @@ fn list(ui: &mut Ui, t: &Tokens, recents: &mut Recents, files: &[Shown], now: u6
         let x0 = if i == 0 { header.min.x } else { header.min.x + date_x(i) };
         let x1 = if i + 1 < columns.len() { header.min.x + date_x(i + 1) } else { header.max.x };
         let cell = Rect::from_min_max(pos2(x0, header.min.y), pos2(x1, header.max.y));
-        let resp = ui.interact(cell, Id::new(("home_recents_header", key.id())), Sense::click());
+        let resp = ui.interact(cell, Id::unique(("home_recents_header", key.id())), Sense::click());
         a11y::button(&resp, &trf("Sort by {column}", &[("column", label)]));
         let on = sort.key == *key;
         if resp.hovered() {
@@ -899,6 +944,8 @@ fn list(ui: &mut Ui, t: &Tokens, recents: &mut Recents, files: &[Shown], now: u6
         if !ui.is_rect_visible(r) {
             continue;
         }
+        // The row's mark says what kind of file it is: read it like a card's picture.
+        recents.picture(&file.path, true, ui.input(|i| i.time));
         let selected = recents.selected.as_deref() == Some(file.path.as_str());
         let p = ui.painter();
         if selected {
@@ -909,7 +956,7 @@ fn list(ui: &mut Ui, t: &Tokens, recents: &mut Recents, files: &[Shown], now: u6
         if resp.has_focus() && !selected {
             p.rect_stroke(r, CornerRadius::same(5), Stroke::new(2.0, t.focus), StrokeKind::Inside);
         }
-        file_icon(ui, t, pos2(r.min.x + 20.0, r.center().y), &file.path);
+        file_icon(ui, t, pos2(r.min.x + 20.0, r.center().y), file);
         let name_w = date_x(1) - 52.0;
         p.text(
             pos2(r.min.x + 40.0, r.center().y),
@@ -947,3 +994,24 @@ fn list(ui: &mut Ui, t: &Tokens, recents: &mut Recents, files: &[Shown], now: u6
     arrows(ui, recents, files, 0, 1);
     action
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// `date` keeps the exact "Mon D, YYYY" (UTC) output the hand-rolled days-from-civil code
+    /// produced. With no catalog loaded the month and format strings pass through in English.
+    #[test]
+    fn date_formats_seconds_since_1970_in_utc() {
+        assert_eq!(date(0), "Jan 1, 1970");
+        assert_eq!(date(951_782_400), "Feb 29, 2000");
+        assert_eq!(date(1_709_164_800), "Feb 29, 2024");
+        assert_eq!(date(1_741_046_400), "Mar 4, 2025");
+        // A year past chrono's own `NaiveDate` range (262143): the instant is moved into range by
+        // whole 400-year cycles and the real year restored.
+        assert_eq!(date(253_402_300_800), "Jan 1, 10000");
+        // Past chrono's year range, `u64::MAX` keeps the old hand-rolled output instead of falling
+        // back to the epoch.
+        assert_eq!(date(u64::MAX), "Nov 9, 584554051223");
+    }
+}
diff --git a/crates/ui-egui/src/online.rs b/crates/ui-egui/src/home/online.rs
similarity index 95%
rename from crates/ui-egui/src/online.rs
rename to crates/ui-egui/src/home/online.rs
index 261424cb..61901fae 100644
--- a/crates/ui-egui/src/online.rs
+++ b/crates/ui-egui/src/home/online.rs
@@ -72,7 +72,7 @@ fn manage(app: &mut FigApp, ctx: &egui::Context, f: (&str, &str), action: &str,
 }
 
 /// Open recorded file `f` as its owner; its tab shows once the file arrives.
-fn open(app: &mut FigApp, f: &OnlineFile) {
+pub(crate) fn open(app: &mut FigApp, f: &OnlineFile) {
     let Some(r) = app.run("collab.openFile", json!({"server": f.server, "file": f.file})) else { return };
     if r["alreadyOpen"] == true && !r["document"].is_null() {
         app.ui.home = false;
@@ -163,8 +163,9 @@ fn row(app: &mut FigApp, ui: &mut Ui, t: &Tokens, f: &OnlineFile, busy: bool) {
     let shown = FileRow { mark: Some((glyph, tint)), name: &f.name, ink, detail: &details, detail_size: 11.0, detail_ink: t.text_secondary };
     file_row(ui, t, r.with_max_x(more.min.x - 4.0), &resp, &shown);
     // The menu button takes its own clicks.
-    let mresp =
-        ui.interact(more, ui.id().with(("online_more", &f.server, &f.file)), Sense::click()).tip(trf("Actions for {name}", &[("name", &f.name)]));
+    let mresp = ui
+        .interact(more, ui.scope_id().with(("online_more", &f.server, &f.file)), Sense::click())
+        .tip(trf("Actions for {name}", &[("name", &f.name)]));
     a11y::menu_button(&mresp, &trf("Actions for {name}", &[("name", &f.name)]), a11y::menu_open(&mresp));
     if mresp.hovered() {
         ui.painter().rect_filled(more, CornerRadius::same(5), t.pressed);
@@ -199,14 +200,14 @@ fn row(app: &mut FigApp, ui: &mut Ui, t: &Tokens, f: &OnlineFile, busy: bool) {
         if let Some(code) = shared.and_then(|s| s.edit.code.as_deref())
             && item(ui, tr("Copy code"), true)
         {
-            app.services.clipboard_set_text(&figcraft_engine::figcraft_collab::code::grouped(code));
+            app.clipboard_set_text(&figcraft_engine::figcraft_collab::code::grouped(code));
             app.toast(tr("Join code copied"));
             ui.close();
         }
         if let Some(s) = shared
             && item(ui, tr("Copy link"), true)
         {
-            app.services.clipboard_set_text(&s.edit.link);
+            app.clipboard_set_text(&s.edit.link);
             app.toast(tr("Invite link copied"));
             ui.close();
         }
@@ -257,7 +258,7 @@ pub fn dialogs(app: &mut FigApp, ctx: &egui::Context) {
     let t = Tokens::get(ctx);
     if let Some((server, file, name)) = app.ui.online.remove.take() {
         let (mut open, mut cancel, mut go) = (true, false, false);
-        crate::dialogs::window(tr("Remove from server"), ctx).id(egui::Id::new("Remove online file")).open(&mut open).show(ctx, |ui| {
+        crate::dialogs::window(tr("Remove from server"), ctx).id(egui::Id::unique("Remove online file")).open(&mut open).show(ctx, |ui| {
             ui.set_width(380.0);
             ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Wrap);
             widgets::label(ui, &trf("Remove {name} from {server}?", &[("name", &name), ("server", &server_host(&server))]), t.text);
@@ -282,11 +283,11 @@ pub fn dialogs(app: &mut FigApp, ctx: &egui::Context) {
     if let Some((server, file, mut name)) = app.ui.online.rename.take() {
         let (mut open, mut cancel, mut go) = (true, false, false);
         let focus = std::mem::take(&mut app.ui.online.focus_rename);
-        crate::dialogs::window(tr("Rename on the server"), ctx).id(egui::Id::new("Rename online file")).open(&mut open).show(ctx, |ui| {
+        crate::dialogs::window(tr("Rename on the server"), ctx).id(egui::Id::unique("Rename online file")).open(&mut open).show(ctx, |ui| {
             ui.set_width(380.0);
             ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Wrap);
             widgets::label(ui, tr("The name in your online files and on the server. The document inside keeps its own name."), t.text_secondary);
-            let resp = widgets::text_input(ui, egui::Id::new("online_rename"), &mut name, 380.0, tr("File name"));
+            let resp = widgets::text_input(ui, egui::Id::unique("online_rename"), &mut name, 380.0, tr("File name"));
             a11y::text(&resp, tr("File name"), &name);
             if focus {
                 resp.request_focus();
diff --git a/crates/ui-egui/src/home_recents_tests.rs b/crates/ui-egui/src/home_recents_tests.rs
index 1c3235dd..d01e5222 100644
--- a/crates/ui-egui/src/home_recents_tests.rs
+++ b/crates/ui-egui/src/home_recents_tests.rs
@@ -74,7 +74,7 @@ fn columns_follow_the_width() {
 
 fn shown(path: &str, modified: Option<u64>, created: Option<u64>) -> Shown {
     let stat = Some(Stat { exists: modified.is_some(), modified, created });
-    Shown { path: path.into(), name: Path::new(path).file_stem().unwrap().to_string_lossy().into(), stat }
+    Shown { path: path.into(), name: Path::new(path).file_stem().unwrap().to_string_lossy().into(), stat, kind: Default::default() }
 }
 
 #[test]
@@ -256,9 +256,11 @@ fn rects_of(s: &[Shape], c: egui::Color32) -> usize {
     s.iter().filter(|s| matches!(s, Shape::Rect(r) if r.fill == c)).count()
 }
 
-/// Images drawn (meshes with a texture of their own).
+/// Preview images in the main content area, excluding the branded sidebar icon.
 fn images(s: &[Shape]) -> usize {
-    s.iter().filter(|s| matches!(s, Shape::Mesh(m) if m.texture_id != egui::TextureId::default())).count()
+    s.iter()
+        .filter(|s| matches!(s, Shape::Mesh(m) if m.texture_id != egui::TextureId::default() && m.vertices.iter().any(|v| v.pos.x > 240.0)))
+        .count()
 }
 
 #[test]
diff --git a/crates/ui-egui/src/home_tests.rs b/crates/ui-egui/src/home_tests.rs
index a975bec2..71225db4 100644
--- a/crates/ui-egui/src/home_tests.rs
+++ b/crates/ui-egui/src/home_tests.rs
@@ -6,6 +6,7 @@
 use egui::accesskit::Role;
 use egui::{Event, Key, Modifiers, PointerButton, Pos2, Rect, Shape};
 use figcraft_engine::Session;
+use figcraft_engine::online::OnlineFile;
 use figcraft_engine::templates::TEMPLATES;
 use serde_json::json;
 
@@ -184,6 +185,161 @@ fn typing_in_the_search_field_filters() {
     assert!(u.app.session.docs.is_empty(), "typing opens nothing");
 }
 
+#[test]
+fn home_search_finds_known_files_and_opens_an_existing_tab() {
+    let mut session = Session::new();
+    session.execute("file.rename", &json!({"name": "North Trail"})).unwrap();
+    session.docs[0].path = Some("C:/designs/North Trail.figcraft".into());
+    session.prefs.recent_files =
+        vec!["C:/designs/North Trail.figcraft".into(), "C:/designs/South Trail.figcraft".into(), "C:/designs/Other.figcraft".into()];
+    session.prefs.online_files.push(OnlineFile {
+        server: "wss://share.example/".into(),
+        file: "trail".into(),
+        name: "Trail Live".into(),
+        owner: "test-only-secret".into(),
+        ..OnlineFile::default()
+    });
+    let mut u = Ui::new(session);
+    u.app.ui.home = true;
+    u.app.ui.home_view.file_query = "  TRAIL  ".into();
+    let s = settle(&mut u);
+    assert!(has_text(&s, "Search results"));
+    assert!(has_text(&s, "North Trail") && has_text(&s, "South Trail") && has_text(&s, "Trail Live"));
+    assert!(!has_text(&s, "Other") && !has_text(&s, "test-only-secret"));
+    assert_eq!(texts(&s).iter().filter(|(name, pos, _)| name == "North Trail" && pos.y > 90.0).count(), 1, "an open file is not repeated in recents");
+    assert_eq!(u.app.inspect()["homeSearch"], "  TRAIL  ");
+
+    u.app.ui.home_view.file_query = "nothing matches".into();
+    let s = shapes(&mut u);
+    assert!(has_text(&s, "No files or templates match your search"));
+    assert!(!has_text(&s, "Trail Live") && !has_text(&s, "South Trail"));
+    assert!(!texts(&s).iter().any(|(name, pos, _)| name == "North Trail" && pos.y > 90.0));
+
+    u.app.ui.home_view.file_query = "north".into();
+    let s = shapes(&mut u);
+    click(&mut u, text_center(&s, "North Trail"));
+    assert!(!u.app.ui.home, "choosing an open result shows its editor tab");
+    assert_eq!(u.app.session.docs.len(), 1);
+}
+
+#[test]
+fn home_search_shows_a_saved_files_preview() {
+    let dir = std::env::temp_dir().join(format!("figcraft-home-search-preview-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("Search preview.figcraft");
+    let image = image::RgbaImage::from_pixel(64, 32, image::Rgba([30, 140, 210, 255]));
+    let mut png = Vec::new();
+    image.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
+    let doc = figcraft_doc::Document::new("Search preview");
+    std::fs::write(&path, figcraft_format::save_bytes(&doc, Some(&png)).unwrap()).unwrap();
+
+    let mut session = Session::empty();
+    session.prefs.recent_files.push(path.to_string_lossy().into_owned());
+    let mut u = Ui::new(session);
+    u.app.ui.home_view.file_query = "Search preview".into();
+    for _ in 0..400 {
+        u.frame(vec![]);
+        if u.app.inspect()["homeRecents"]["files"][0]["picture"] == "picture" {
+            break;
+        }
+        std::thread::sleep(std::time::Duration::from_millis(5));
+    }
+    let s = shapes(&mut u);
+    assert!(has_text(&s, "Search preview"));
+    assert!(s.iter().any(|s| matches!(s, Shape::Mesh(m) if m.texture_id != egui::TextureId::default())), "the saved preview is drawn");
+    let _ = std::fs::remove_file(path);
+    let _ = std::fs::remove_dir(dir);
+}
+
+#[test]
+fn home_search_field_filters_as_typed_and_a_section_click_clears_it() {
+    let mut u = first_run();
+    u.app.session.prefs.recent_files = vec!["C:/designs/Glacier.figcraft".into(), "C:/designs/Forest.figcraft".into()];
+    let s = shapes(&mut u);
+    click(&mut u, text_center(&s, "Search files and templates"));
+    u.frame(vec![Event::Text("glacier".into())]);
+    let s = settle(&mut u);
+    assert_eq!(u.app.ui.home_view.file_query, "glacier");
+    assert!(has_text(&s, "Glacier") && !has_text(&s, "Forest"));
+    click(&mut u, text_center(&s, "Recents"));
+    assert!(u.app.ui.home_view.file_query.is_empty());
+    let s = shapes(&mut u);
+    assert!(has_text(&s, "Forest"));
+    // Escape in the field clears the search too.
+    click(&mut u, text_center(&s, "Search files and templates"));
+    u.frame(vec![Event::Text("forest".into())]);
+    assert_eq!(u.app.ui.home_view.file_query, "forest");
+    u.frame(vec![Event::Key { key: Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE }]);
+    assert!(u.app.ui.home_view.file_query.is_empty(), "Escape clears the search");
+}
+
+/// A search keeps what the recent files it doesn't match know: back from it, their pictures and
+/// the selection are still there (nothing is read again).
+#[test]
+fn a_search_keeps_the_other_recent_files_pictures_and_the_selection() {
+    let dir = std::env::temp_dir().join(format!("figcraft-home-search-cache-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let mut png = Vec::new();
+    image::RgbaImage::from_pixel(8, 8, image::Rgba([30, 140, 210, 255]))
+        .write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png)
+        .unwrap();
+    let paths: Vec<String> = ["Alpine", "Basin"]
+        .into_iter()
+        .map(|name| {
+            let path = dir.join(format!("{name}.figcraft"));
+            std::fs::write(&path, figcraft_format::save_bytes(&figcraft_doc::Document::new(name), Some(&png)).unwrap()).unwrap();
+            path.to_string_lossy().into_owned()
+        })
+        .collect();
+    let mut session = Session::empty();
+    session.prefs.recent_files = paths.clone();
+    let mut u = Ui::new(session);
+    let pictures = |u: &mut Ui| -> Vec<serde_json::Value> {
+        u.app.inspect()["homeRecents"]["files"].as_array().unwrap().iter().map(|f| f["picture"].clone()).collect()
+    };
+    for _ in 0..400 {
+        u.frame(vec![]);
+        if pictures(&mut u).iter().all(|p| p == "picture") {
+            break;
+        }
+        std::thread::sleep(std::time::Duration::from_millis(5));
+    }
+    assert!(pictures(&mut u).iter().all(|p| p == "picture"), "both pictures are in");
+    u.app.ui.home_view.recents.selected = Some(paths[1].clone());
+    u.app.ui.home_view.file_query = "alpine".into();
+    let s = shapes(&mut u);
+    assert!(has_text(&s, "Alpine") && !has_text(&s, "Basin"));
+    u.app.ui.home_view.file_query.clear();
+    u.frame(vec![]);
+    assert!(pictures(&mut u).iter().all(|p| p == "picture"), "no picture is read again");
+    assert_eq!(u.app.ui.home_view.recents.selected.as_deref(), Some(paths[1].as_str()), "the selection stays");
+    let _ = std::fs::remove_dir_all(dir);
+}
+
+#[test]
+fn home_search_includes_templates_and_opens_a_matching_card() {
+    let mut u = first_run();
+    u.app.ui.home_view.file_query = "MOBILE".into();
+    let s = settle(&mut u);
+    assert!(has_text(&s, "Templates") && has_text(&s, "Mobile app"));
+    assert!(!has_text(&s, "Dashboard"));
+    click(&mut u, text_center(&s, "Mobile app"));
+    assert_eq!(u.app.session.doc().unwrap().name, "Mobile app");
+    assert!(!u.app.ui.home);
+}
+
+#[test]
+fn empty_home_search_can_browse_all_templates() {
+    let mut u = first_run();
+    u.app.ui.home_view.file_query = "no such design".into();
+    let s = shapes(&mut u);
+    assert!(has_text(&s, "No files or templates match your search"));
+    click(&mut u, text_center(&s, "Show all templates"));
+    assert!(u.app.ui.home_view.file_query.is_empty());
+    assert_eq!(u.app.ui.home_view.section, Section::Templates);
+    assert!(has_text(&settle(&mut u), "Dashboard"));
+}
+
 #[test]
 fn thumbnails_are_cached_per_theme() {
     let mut u = first_run();
@@ -417,6 +573,71 @@ fn dropping_a_file_without_one_on_disk_opens_it_as_a_new_unsaved_document() {
     assert!(!path.exists(), "nothing is written");
 }
 
+/// What a drop's read gives, once it has arrived.
+type Arrival = std::rc::Rc<std::cell::RefCell<Option<Result<Vec<u8>, String>>>>;
+
+/// A drop whose contents arrive later, as every drop in the browser does: pending until `arrived`
+/// holds them.
+fn later(arrived: &Arrival) -> crate::ReadFuture {
+    let arrived = arrived.clone();
+    Box::pin(std::future::poll_fn(move |_| match arrived.borrow_mut().take() {
+        Some(bytes) => std::task::Poll::Ready(bytes),
+        None => std::task::Poll::Pending,
+    }))
+}
+
+#[test]
+fn a_dropped_file_whose_contents_arrive_later_opens_once_they_do() {
+    let svg = br#"<svg xmlns="http://www.w3.org/2000/svg" width="40" height="20"><rect width="40" height="20" fill="red"/></svg>"#.to_vec();
+    let arrived = std::rc::Rc::new(std::cell::RefCell::new(None));
+    let mut u = first_run();
+    u.app.ui.home = true;
+    u.app.ui.pending_opens.push(crate::pending_open::PendingOpen {
+        label: "Browser drop.svg".into(),
+        params: json!({"name": "Browser drop.svg"}),
+        command: "file.open",
+        target: None,
+        read: Some(later(&arrived)),
+    });
+    // egui lays a new card out invisibly on its first frame.
+    u.frame(vec![]);
+    for _ in 0..5 {
+        let s = flat(&u.frame_output(vec![]).shapes);
+        assert!(has_text(&s, "Browser drop.svg"), "the card shows while the contents are read");
+    }
+    assert!(u.app.session.docs.is_empty(), "nothing opens before the contents arrive");
+    *arrived.borrow_mut() = Some(Ok(svg));
+    for _ in 0..3 {
+        u.frame(vec![]);
+    }
+    assert!(u.app.ui.pending_opens.is_empty());
+    assert_eq!(u.app.ui.last_error, None);
+    assert_eq!(u.app.session.docs.len(), 1, "the contents open");
+    assert_eq!(u.app.session.docs[0].path, None);
+    assert!(u.app.session.docs[0].doc.nodes().any(|n| matches!(n.kind, figcraft_doc::NodeKind::Rectangle)), "the SVG's content");
+    assert!(!u.app.ui.home);
+}
+
+#[test]
+fn a_dropped_file_that_cannot_be_read_says_so_and_opens_nothing() {
+    let arrived = std::rc::Rc::new(std::cell::RefCell::new(Some(Err(crate::unreadable("Unreadable.figcraft")))));
+    let mut u = first_run();
+    u.app.ui.home = true;
+    u.app.ui.pending_opens.push(crate::pending_open::PendingOpen {
+        label: "Unreadable.figcraft".into(),
+        params: json!({"name": "Unreadable.figcraft"}),
+        command: "file.open",
+        target: None,
+        read: Some(later(&arrived)),
+    });
+    for _ in 0..3 {
+        u.frame(vec![]);
+    }
+    assert!(u.app.ui.pending_opens.is_empty());
+    assert!(u.app.session.docs.is_empty());
+    assert_eq!(u.app.ui.last_error.as_deref(), Some("Couldn't read Unreadable.figcraft."));
+}
+
 #[test]
 fn dropping_a_native_file_on_the_home_screen_opens_it() {
     let dir = Temp::new();
@@ -447,9 +668,8 @@ fn dropping_a_native_file_on_the_home_screen_opens_it() {
 #[test]
 fn dropping_a_native_file_on_canvas_keeps_its_receiving_document_after_tab_switch() {
     let dir = Temp::new();
-    let path = dir.path("Canvas import.figcraft");
-    let mut source = Session::new();
-    source.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
+    let path = dir.path("Canvas import.svg");
+    std::fs::write(&path, r#"<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10"><rect width="20" height="10"/></svg>"#).unwrap();
 
     let mut session = Session::new();
     let target_uid = session.ds().unwrap().uid;
@@ -475,7 +695,82 @@ fn dropping_a_native_file_on_canvas_keeps_its_receiving_document_after_tab_switc
     u.frame(vec![]);
 
     assert_eq!(u.app.session.ds().unwrap().uid, other_uid, "the user's active tab stays in front");
-    assert_eq!(u.app.session.docs.iter().map(|doc| doc.doc.pages.len()).collect::<Vec<_>>(), [2, 1]);
+    let layers = |uid: u64| {
+        let doc = &u.app.session.docs.iter().find(|doc| doc.uid == uid).unwrap().doc;
+        doc.node(doc.pages[0]).unwrap().children.len()
+    };
+    assert_eq!((layers(target_uid), layers(other_uid)), (1, 0), "the drop lands in the tab that received it");
+}
+
+#[test]
+fn dropping_a_document_on_canvas_opens_it_as_a_new_file() {
+    let dir = Temp::new();
+    let path = dir.path("Dropped.figcraft");
+    let mut saved = Session::new();
+    saved.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
+    let mut u = Ui::new(Session::new());
+    u.app.ui.home = false;
+    u.frame(vec![]);
+    let before = u.app.session.doc().unwrap().clone();
+    let s = drop_file(&mut u, &path);
+    assert!(has_text(&s, "Drop to open"), "dragging a document over the canvas says it opens");
+    let s = flat(&u.frame_output(vec![]).shapes);
+    assert!(has_text(&s, "Opening as a new file"), "the card says so too");
+    u.frame(vec![]);
+    assert!(u.app.ui.pending_opens.is_empty());
+    assert_eq!(u.app.session.docs.len(), 2, "a tab of its own");
+    assert_eq!(u.app.session.ds().unwrap().path.as_deref(), Some(path.to_string_lossy().as_ref()), "in front");
+    assert_eq!(u.app.session.docs[0].doc.as_ref(), &before, "the file that was open gets no pages added");
+}
+
+#[test]
+fn a_document_dropped_on_canvas_without_a_file_on_disk_opens_as_a_new_file() {
+    // Every drop in the browser (#916).
+    let dir = Temp::new();
+    let saved = dir.path("Saved.figcraft");
+    Session::new().execute("file.saveAs", &json!({"path": saved.to_string_lossy()})).unwrap();
+    let bytes = std::fs::read(&saved).unwrap();
+    let mut u = Ui::new(Session::new());
+    u.app.ui.home = false;
+    u.frame(vec![]);
+    let pos = u.app.canvas.rect.center();
+    let file: egui::DroppedFileHandle = std::sync::Arc::new(DroppedBytes("Shared.figcraft".into(), bytes));
+    u.frame_raw(egui::RawInput { events: vec![Event::PointerMoved(pos)], dropped_files: vec![file], ..Default::default() });
+    for _ in 0..3 {
+        u.frame(vec![]);
+    }
+    assert!(u.app.ui.pending_opens.is_empty());
+    assert_eq!(u.app.ui.last_error, None);
+    assert_eq!(u.app.session.docs.len(), 2, "a tab of its own");
+    assert_eq!(u.app.session.docs[0].doc.pages.len(), 1, "no pages added to the open file");
+    assert_eq!(u.app.session.docs[1].path, None, "with no save path made up for it");
+}
+
+#[test]
+fn dropping_several_files_on_canvas_places_them_side_by_side() {
+    let dir = Temp::new();
+    let svg = r##"<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10"><rect width="20" height="10" fill="#f00"/></svg>"##;
+    let paths: Vec<_> = ["a.svg", "b.svg", "c.svg"].iter().map(|n| dir.path(n)).collect();
+    for path in &paths {
+        std::fs::write(path, svg).unwrap();
+    }
+    let mut u = Ui::new(Session::new());
+    u.app.ui.home = false;
+    u.frame(vec![]);
+    let pos = u.app.canvas.rect.center();
+    let files: Vec<egui::DroppedFileHandle> = paths.iter().map(|p| std::sync::Arc::new(Dropped(p.clone())) as egui::DroppedFileHandle).collect();
+    u.frame_raw(egui::RawInput { events: vec![Event::PointerMoved(pos)], dropped_files: files, ..Default::default() });
+    for _ in 0..4 {
+        u.frame(vec![]);
+    }
+    assert!(u.app.ui.pending_opens.is_empty());
+    let doc = u.app.session.doc().unwrap();
+    let page = u.app.session.page().unwrap();
+    let rects: Vec<_> = doc.node(page).unwrap().children.iter().map(|c| doc.world_bounds(*c).unwrap()).collect();
+    assert_eq!(rects.len(), 3);
+    for pair in rects.windows(2) {
+        assert!(pair[1].x0 > pair[0].x1, "left to right with a gap: {rects:?}");
+    }
 }
 
 #[test]
@@ -603,5 +898,12 @@ fn dropping_an_unsupported_file_on_the_home_screen_opens_nothing() {
     drop_file(&mut u, &path);
     assert!(u.app.session.docs.is_empty());
     assert!(u.app.ui.home);
-    assert_eq!(u.app.ui.toast.as_ref().map(|t| t.0.as_str()), Some("Drop a .figcraft, .fig, .json, .svg or image file."));
+    assert_eq!(u.app.ui.toast.as_ref().map(|t| t.0.as_str()), Some("Drop a .figcraft, .fig, .sketch, .json, .svg or image file."));
+}
+
+#[test]
+fn sketch_files_open_and_drop_as_documents() {
+    let p = std::path::Path::new("/tmp/Design.SKETCH");
+    assert!(crate::opens(p));
+    assert!(crate::is_document(p));
 }
diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rs
index d30130fb..621a5005 100644
--- a/crates/ui-egui/src/i18n.rs
+++ b/crates/ui-egui/src/i18n.rs
@@ -27,7 +27,8 @@ pub struct Lang {
     pub code: &'static str,
     /// The language's own name for itself (the language picker shows it untranslated).
     pub name: &'static str,
-    /// Machine-drafted, waiting for a native speaker's review (`[meta] status`).
+    /// A draft (`[meta] status` set): waiting for a native speaker's review, or reviewed and waiting for
+    /// a maintainer's approval.
     pub draft: bool,
     /// Index into [`LANGS`] of the catalog a regional one overlays ("es" under "es-419": it lists
     /// only what differs), else 0 (English).
@@ -108,9 +109,14 @@ fn lookup(lang: usize, key: &str) -> Option<&'static Text> {
 /// The UI string for `key` (its English text) in the current language. One English text that needs
 /// two translations gets a context after `|` ("Fill|sizing"); the English catalog maps it back.
 pub fn tr(key: &str) -> &str {
-    match lookup(CURRENT.load(Ordering::Relaxed), key) {
-        Some(Text::Plain(s) | Text::Plural { other: s, .. }) => s,
-        None => key,
+    try_tr(key).unwrap_or(key)
+}
+
+/// [`tr`] for text that comes from data and may have no catalog entry (an importer's notes, say):
+/// `None` when the catalog doesn't have it.
+pub fn try_tr(key: &str) -> Option<&str> {
+    match lookup(CURRENT.load(Ordering::Relaxed), key)? {
+        Text::Plain(s) | Text::Plural { other: s, .. } => Some(s),
     }
 }
 
@@ -166,10 +172,11 @@ fn plural(code: &str, n: usize) -> Plural {
         "cs" if n == 1 => Plural::One,
         "cs" if (2..=4).contains(&n) => Plural::Few,
         "cs" => Plural::Other,
+        "pl" if n == 1 => Plural::One,
         "ru" if n % 10 == 1 && n % 100 != 11 => Plural::One,
-        "ru" if (2..=4).contains(&(n % 10)) && !(12..=14).contains(&(n % 100)) => Plural::Few,
-        "ru" => Plural::Many,
-        "ja" | "ko" | "zh-Hans" => Plural::Other,
+        "ru" | "pl" if (2..=4).contains(&(n % 10)) && !(12..=14).contains(&(n % 100)) => Plural::Few,
+        "ru" | "pl" => Plural::Many,
+        "ja" | "ko" | "th" | "zh-Hans" | "vi" => Plural::Other,
         "fr" | "pt-BR" if n <= 1 => Plural::One,
         _ if n == 1 => Plural::One,
         _ => Plural::Other,
@@ -177,10 +184,10 @@ fn plural(code: &str, n: usize) -> Plural {
 }
 
 // CLDR's million-count "many" in French, Spanish and Portuguese still reads their existing
-// "other" wording. Czech supplies separate few forms; Russian supplies few/many forms.
+// "other" wording. Czech supplies separate few forms; Russian and Polish supply few/many forms.
 
 /// Whether count `n` takes the "one" form: 0 and 1 in French and Brazilian Portuguese, never in
-/// Japanese, Korean and Chinese (no plural forms: always "other"), 1 elsewhere (CLDR's integer rules).
+/// Japanese, Korean, Thai, Chinese and Vietnamese (no plural forms: always "other"), 1 elsewhere (CLDR's integer rules).
 #[cfg(test)]
 fn plural_one(lang: usize, n: usize) -> bool {
     plural(LANGS.get(lang).map_or("en", |l| l.code), n) == Plural::One
@@ -234,5 +241,4 @@ fn label<'a>(menu: bool, id: &str, english: &'a str) -> Cow<'a, str> {
 }
 
 #[cfg(test)]
-#[path = "i18n_tests.rs"]
 mod tests;
diff --git a/crates/ui-egui/src/i18n_tests.rs b/crates/ui-egui/src/i18n/tests.rs
similarity index 66%
rename from crates/ui-egui/src/i18n_tests.rs
rename to crates/ui-egui/src/i18n/tests.rs
index 07f32037..d1fedef8 100644
--- a/crates/ui-egui/src/i18n_tests.rs
+++ b/crates/ui-egui/src/i18n/tests.rs
@@ -1,13 +1,11 @@
 //! The catalog checks: every key the code looks up is in the English catalog, no catalog has keys
-//! the code doesn't use, placeholders match English, and complete languages translate everything.
+//! the code doesn't use, and placeholders match English. A missing translation reads English and
+//! fails nothing: [`missing_translations_report`] lists them (`cargo xtask i18n-report`).
 
 use std::collections::BTreeSet;
 
 use super::*;
 
-/// Languages that must translate every UI string and command label.
-const COMPLETE: &[&str] = &["es"];
-
 /// Keys looked up from data rather than written as `tr("…")` in the code: the main menu's
 /// submenu names (the engine's menu catalog) and labels of engine and document enums.
 fn dynamic_keys() -> BTreeSet<String> {
@@ -132,9 +130,14 @@ fn dynamic_labels() -> Vec<&'static str> {
     use figcraft_engine::keymap::{GESTURES, Group};
     let mut v: Vec<&'static str> = figcraft_engine::ToolId::ALL.iter().map(|t| t.label()).collect();
     v.extend(figcraft_engine::vectoredit::VTool::ALL.iter().map(|t| t.label()));
+    // Board shapes and stamps (the board tools' flyouts and the contextual bar).
+    v.extend(figcraft_doc::BoardShape::ALL.iter().map(|b| b.label()));
+    v.extend(figcraft_doc::Stamp::ALL.iter().map(|b| b.label()));
+    v.extend(figcraft_engine::board_templates::TEMPLATES.iter().map(|t| t.name));
     v.extend(Group::ALL.iter().map(|g| g.label()));
     v.extend(GESTURES.iter().flat_map(|(_, label, mac, other)| [*label, *mac, *other]));
     v.extend(DATA_LABELS);
+    v.push(figcraft_engine::live::TOO_LARGE_TO_JOIN);
     // The starter templates' names, descriptions and kinds.
     v.extend(figcraft_engine::templates::TEMPLATES.iter().flat_map(|t| [t.name, t.description, t.kind.label()]));
     v
@@ -154,21 +157,63 @@ fn menu_worded_differently() -> BTreeSet<&'static str> {
 fn used_keys() -> BTreeSet<String> {
     let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("src");
     let mut keys = BTreeSet::new();
-    for entry in std::fs::read_dir(dir).unwrap().flatten() {
-        let path = entry.path();
+    for path in sources(&dir) {
         let name = path.file_name().unwrap().to_string_lossy().into_owned();
-        if !name.ends_with(".rs") || name.ends_with("_tests.rs") || name == "i18n.rs" {
+        if name.ends_with("_tests.rs") || name == "i18n.rs" {
             continue;
         }
-        keys.extend(literals(&std::fs::read_to_string(&path).unwrap()));
+        keys.extend(literals(&std::fs::read_to_string(&path).unwrap(), LOOKUPS));
     }
     keys
 }
 
-/// The first-argument string literals of the lookup functions in `src`.
-fn literals(src: &str) -> Vec<String> {
+/// Every `.rs` file under `dir`, in subdirectories too, leaving out test code: `tests.rs` and
+/// anything under a `tests` directory.
+fn sources(dir: &std::path::Path) -> Vec<std::path::PathBuf> {
     let mut out = Vec::new();
-    for f in ["tr(", "trf(", "trn(", "tr_noop("] {
+    for entry in std::fs::read_dir(dir).unwrap().flatten() {
+        let path = entry.path();
+        let name = path.file_name().unwrap().to_string_lossy().into_owned();
+        if path.is_dir() {
+            if name != "tests" {
+                out.extend(sources(&path));
+            }
+        } else if name.ends_with(".rs") && name != "tests.rs" {
+            out.push(path);
+        }
+    }
+    out
+}
+
+/// The importers' fixed notes: the string literals passed to `warn` in the `.fig` and REST import
+/// sources. The import report shows a note translated when the catalog has it, so each one is a key
+/// `en.toml` (and every complete language) must have, and an entry for a note the importers no
+/// longer give shows up as unused.
+fn importer_notes() -> BTreeSet<String> {
+    let src = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../format/src");
+    let mut keys = BTreeSet::new();
+    for dir in ["fig", "rest"] {
+        // The module root sits beside its directory (`fig.rs` + `fig/`) or inside it (`fig/mod.rs`).
+        let root = src.join(format!("{dir}.rs"));
+        for path in sources(&src.join(dir)).into_iter().chain(root.exists().then_some(root)) {
+            let name = path.file_name().unwrap().to_string_lossy().into_owned();
+            // export.rs and export/ warn about what a `.fig` export leaves out, not about an import.
+            if name.contains("tests") || name == "export.rs" || path.starts_with(src.join("fig/export")) {
+                continue;
+            }
+            keys.extend(literals(&std::fs::read_to_string(&path).unwrap(), &["warn("]));
+        }
+    }
+    keys
+}
+
+/// The lookup functions whose first argument is a catalog key.
+const LOOKUPS: &[&str] = &["tr(", "trf(", "trn(", "tr_noop("];
+
+/// The first-argument string literals of the functions `fns` (each with its `(`) in `src`.
+fn literals(src: &str, fns: &[&str]) -> Vec<String> {
+    let mut out = Vec::new();
+    for f in fns {
         let mut from = 0;
         while let Some(i) = src.get(from..).and_then(|s| s.find(f)) {
             let at = from + i;
@@ -226,7 +271,7 @@ fn english() -> &'static Lang {
 
 #[test]
 fn every_key_in_the_code_is_in_the_english_catalog_and_no_other() {
-    let used: BTreeSet<String> = used_keys().into_iter().chain(dynamic_keys()).collect();
+    let used: BTreeSet<String> = used_keys().into_iter().chain(dynamic_keys()).chain(importer_notes()).collect();
     let en: BTreeSet<String> = english().ui.iter().map(|(k, _)| k.to_string()).collect();
     let missing: Vec<_> = used.difference(&en).collect();
     let unused: Vec<_> = en.difference(&used).collect();
@@ -249,14 +294,19 @@ fn english_text_is_its_key_except_plurals() {
     assert!(english().commands.is_empty() && english().menu.is_empty(), "English command labels come from the engine");
 }
 
-#[test]
-fn catalogs_have_known_keys_and_matching_placeholders() {
-    let en = english();
-    let ids: BTreeSet<&str> = figcraft_engine::all_commands()
+/// The ids `[commands]` entries translate: every command and every main-menu item.
+fn command_ids() -> BTreeSet<&'static str> {
+    figcraft_engine::all_commands()
         .iter()
         .map(|c| c.id)
         .chain(figcraft_engine::catalog::MENU.iter().map(|m| m.id).filter(|id| !id.is_empty()))
-        .collect();
+        .collect()
+}
+
+#[test]
+fn catalogs_have_known_keys_and_matching_placeholders() {
+    let en = english();
+    let ids = command_ids();
     for lang in LANGS {
         assert!(!lang.name.is_empty(), "{}: [meta] name is missing", lang.code);
         for (k, t) in lang.ui {
@@ -277,13 +327,29 @@ fn catalogs_have_known_keys_and_matching_placeholders() {
         for (id, _) in lang.menu {
             assert!(menu_worded_differently().contains(id), "{}: [menu] {id:?} reads like the command; [commands] covers it", lang.code);
         }
-        if COMPLETE.contains(&lang.code) {
-            let missing: Vec<_> = en.ui.iter().filter(|(k, _)| find(lang.ui, k).is_none()).map(|(k, _)| k).collect();
-            assert!(missing.is_empty(), "{}: untranslated: {missing:?}", lang.code);
-            let missing: Vec<_> = ids.iter().filter(|id| find(lang.commands, id).is_none()).collect();
-            assert!(missing.is_empty(), "{}: untranslated commands: {missing:?}", lang.code);
-            let missing: Vec<_> = menu_worded_differently().into_iter().filter(|id| find(lang.menu, id).is_none()).collect();
-            assert!(missing.is_empty(), "{}: menu items worded unlike their command, missing from [menu]: {missing:?}", lang.code);
+    }
+}
+
+/// What each language lacks: UI strings, command labels and menu wordings that read as in English
+/// because neither its catalog nor the one it overlays has them. It prints them and always passes.
+#[test]
+fn missing_translations_report() {
+    let ids = command_ids();
+    let worded = menu_worded_differently();
+    for (i, lang) in LANGS.iter().enumerate().filter(|(_, l)| l.code != "en") {
+        let own = || chain(i).filter(|l| l.code != "en");
+        let ui: Vec<_> = english().ui.iter().map(|(k, _)| *k).filter(|k| own().all(|l| find(l.ui, k).is_none())).collect();
+        let commands: Vec<_> = ids.iter().filter(|id| own().all(|l| find(l.commands, id).is_none())).collect();
+        let menu: Vec<_> = worded.iter().filter(|id| own().all(|l| find(l.menu, id).is_none())).collect();
+        println!("{}: {} UI strings, {} command labels, {} menu wordings missing", lang.code, ui.len(), commands.len(), menu.len());
+        for k in ui {
+            println!("  {k:?}");
+        }
+        for id in commands {
+            println!("  [commands] {id}");
+        }
+        for id in menu {
+            println!("  [menu] {id}");
         }
     }
 }
@@ -303,6 +369,14 @@ fn lookups_fall_back_to_english_and_fill_placeholders() {
     assert!(matches!(lookup(es, k), Some(x) if std::ptr::eq(x, t)));
 }
 
+#[test]
+fn a_live_failure_the_ui_knows_is_read_back_for_translation() {
+    use figcraft_engine::live::TOO_LARGE_TO_JOIN;
+    let reason = TOO_LARGE_TO_JOIN.replace("{mb}", "1024");
+    assert!(matches!(crate::live::failure_text(&reason), std::borrow::Cow::Owned(t) if t == reason));
+    assert!(matches!(crate::live::failure_text("Couldn't reach the server"), std::borrow::Cow::Borrowed(_)));
+}
+
 #[test]
 fn system_languages_pick_the_first_one_with_a_catalog() {
     let code = |pref: &str, system: Option<&str>| LANGS[resolve(pref, system)].code;
@@ -311,22 +385,34 @@ fn system_languages_pick_the_first_one_with_a_catalog() {
     assert_eq!(code("system", Some("cs_CZ.UTF-8")), "cs");
     assert_eq!(code("system", Some("cs-CZ,en-US")), "cs");
     assert_eq!(code("cs", None), "cs");
-    assert_eq!(LANGS[resolve("cs", None)].name, "Čeština");
-    assert!(LANGS[resolve("cs", None)].draft);
     assert_eq!(code("system", Some("pt-BR")), "pt-BR");
     assert_eq!(code("system", Some("tr_TR.UTF-8")), "tr");
     assert_eq!(code("system", Some("id_ID.UTF-8")), "id");
+    assert_eq!(code("system", Some("vi_VN.UTF-8")), "vi");
     // Portugal's Portuguese and a bare "pt" read the Brazilian catalog.
     assert_eq!(code("system", Some("pt-PT")), "pt-BR");
     assert_eq!(code("pt", None), "pt-BR");
-    // An OS list: the first language there is a catalog for (English counts).
-    assert_eq!(code("system", Some("nl-NL,de-DE,en-US")), "de");
-    assert_eq!(code("system", Some("nl-NL, en-US,fr-FR")), "en");
-    assert_eq!(code("system", Some("nl,da")), "en");
-    assert_eq!(code("system", Some("nl,sv")), "sv");
+    // An OS list: the first language there is a catalog for (English counts). Hindi has no
+    // catalog (Dutch gained one; `hi` keeps exercising the no-catalog path).
+    assert_eq!(code("system", Some("hi-IN,de-DE,en-US")), "de");
+    assert_eq!(code("system", Some("hi-IN, en-US,fr-FR")), "en");
+    assert_eq!(code("system", Some("hi,da")), "en");
+    assert_eq!(code("system", Some("hi,sv")), "sv");
     assert_eq!(code("fr", Some("de-DE")), "fr", "a chosen language beats the system's");
 }
 
+#[test]
+fn italian_is_picked_for_italian_locales() {
+    let code = |pref: &str, system: Option<&str>| LANGS[resolve(pref, system)].code;
+    for tag in ["it", "it-IT", "it-CH", "it_IT.UTF-8"] {
+        assert_eq!(code("system", Some(tag)), "it", "{tag}");
+    }
+    let it = LANGS.iter().position(|l| l.code == "it").unwrap();
+    assert_eq!(LANGS[it].name, "Italiano");
+    assert!(LANGS[it].draft);
+    assert!(!plural_one(it, 0) && plural_one(it, 1) && !plural_one(it, 2));
+}
+
 #[test]
 fn swedish_is_picked_for_swedish_locales() {
     let code = |pref: &str, system: Option<&str>| LANGS[resolve(pref, system)].code;
@@ -334,8 +420,6 @@ fn swedish_is_picked_for_swedish_locales() {
         assert_eq!(code("system", Some(tag)), "sv", "{tag}");
     }
     let sv = LANGS.iter().position(|l| l.code == "sv").unwrap();
-    assert_eq!(LANGS[sv].name, "Svenska");
-    assert!(!LANGS[sv].draft);
     assert!(!plural_one(sv, 0) && plural_one(sv, 1) && !plural_one(sv, 2));
 }
 
@@ -353,10 +437,11 @@ fn latin_american_spanish_overlays_spanish() {
     assert_eq!(LANGS[la].parent, es);
     assert!(es < la, "the picker lists Español first");
     // Its own wording, else Spanish's, else English's.
-    assert!(matches!(lookup(la, "Add fill"), Some(Text::Plain("Agregar relleno"))));
-    assert!(matches!(lookup(la, "Fill"), Some(Text::Plain("Relleno"))));
+    for (k, _) in LANGS[es].ui.iter().filter(|(k, _)| find(LANGS[la].ui, k).is_none()) {
+        assert!(lookup(la, k).is_some_and(|t| std::ptr::eq(t, find(LANGS[es].ui, k).unwrap())), "{k:?}");
+    }
     let undo = |i: usize| chain(i).find_map(|l| find(l.commands, "edit.undo")).map(forms);
-    assert!(undo(es).is_some() && undo(la) == undo(es), "command labels fall back too");
+    assert_eq!(undo(la), undo(es), "command labels fall back too");
     // An overlay lists only what differs from the catalog under it.
     for lang in LANGS.iter().filter(|l| l.parent != 0) {
         let under = &LANGS[lang.parent];
@@ -375,7 +460,7 @@ fn french_and_portuguese_count_zero_as_singular() {
     for code in ["fr", "pt-BR"] {
         assert!(one(code, 0) && one(code, 1) && !one(code, 2), "{code}");
     }
-    for code in ["en", "es", "de", "cs"] {
+    for code in ["en", "es", "de", "cs", "pl"] {
         for n in [0, 1, 2, 3, 4, 5, 21] {
             assert_eq!(one(code, n), n == 1, "{code}: {n}");
         }
@@ -383,12 +468,15 @@ fn french_and_portuguese_count_zero_as_singular() {
 }
 
 #[test]
-fn japanese_korean_and_chinese_have_no_plural_forms() {
+fn japanese_korean_chinese_and_vietnamese_have_no_plural_forms() {
     let code = |pref: &str, system: Option<&str>| LANGS[resolve(pref, system)].code;
     assert_eq!(code("system", Some("ja-JP")), "ja");
     assert_eq!(code("system", Some("ko_KR.UTF-8")), "ko");
+    assert_eq!(code("system", Some("vi-VN")), "vi");
     assert_eq!(code("system", Some("ja,en-US")), "ja");
-    for code in ["ja", "ko", "zh-Hans"] {
+    assert_eq!(LANGS[resolve("vi", None)].name, "Tiếng Việt");
+    assert!(LANGS[resolve("vi", None)].draft);
+    for code in ["ja", "ko", "th", "zh-Hans", "vi"] {
         let lang = LANGS.iter().position(|l| l.code == code).unwrap();
         assert!(!plural_one(lang, 0) && !plural_one(lang, 1) && !plural_one(lang, 2), "{code}");
         let ones: Vec<_> = LANGS[lang].ui.iter().filter(|(_, t)| matches!(t, Text::Plural { one: Some(_), .. })).map(|(k, _)| k).collect();
@@ -396,6 +484,33 @@ fn japanese_korean_and_chinese_have_no_plural_forms() {
     }
 }
 
+#[test]
+fn georgian_is_picked_for_georgian_locales() {
+    let code = |pref: &str, system: Option<&str>| LANGS[resolve(pref, system)].code;
+    for tag in ["ka", "ka-GE", "ka_GE.UTF-8"] {
+        assert_eq!(code("system", Some(tag)), "ka", "{tag}");
+    }
+}
+
+/// Release builds embed craft-fonts' Noto Sans Georgian (`theme::install_fonts`' built-in faces),
+/// since Inter and egui's fonts have no Georgian: it draws every Georgian letter the catalog uses.
+#[test]
+fn the_built_in_georgian_face_draws_the_georgian_catalog() {
+    let Some(face) = figcraft_text::find_face("Noto Sans Georgian", "Regular").filter(|f| f.family == "Noto Sans Georgian") else {
+        eprintln!("built without craft-fonts' Noto Sans Georgian; skipping");
+        return;
+    };
+    let ka = &LANGS[LANGS.iter().position(|l| l.code == "ka").unwrap()];
+    let georgian = |c: &char| matches!(u32::from(*c), 0x10A0..=0x10FF | 0x1C90..=0x1CBF | 0x2D00..=0x2D2F);
+    let mut letters: BTreeSet<char> = BTreeSet::new();
+    for (_, t) in ka.ui.iter().chain(ka.commands).chain(ka.menu) {
+        letters.extend(forms(t).into_iter().flat_map(str::chars).filter(georgian));
+    }
+    assert!(letters.len() > 30, "{letters:?}");
+    let missing: String = letters.iter().filter(|c| !face.has_char(**c)).collect();
+    assert!(missing.is_empty(), "no glyph for {missing:?}");
+}
+
 #[test]
 fn chinese_reads_simplified_and_traditional_has_no_catalog() {
     let code = |pref: &str, system: Option<&str>| LANGS[resolve(pref, system)].code;
@@ -408,7 +523,6 @@ fn chinese_reads_simplified_and_traditional_has_no_catalog() {
         assert_eq!(code(tag, None), "en", "{tag}");
     }
     assert_eq!(code("system", Some("zh-TW,ja-JP")), "ja");
-    assert_eq!(LANGS[resolve("zh-Hans", None)].name, "简体中文");
 }
 
 #[test]
@@ -416,62 +530,59 @@ fn the_key_scanner_reads_rust_literals() {
     let src = r#"x(tr("A \"b\"")); trf(
         "C {n}", &[]); attr("no"); tr_noop("D\
           E"); tr(label);"#;
-    assert_eq!(literals(src), vec!["A \"b\"", "C {n}", "DE"]);
+    assert_eq!(literals(src, LOOKUPS), vec!["A \"b\"", "C {n}", "DE"]);
+    assert_eq!(literals(r#"self.warn("a note"); s.warn(format!("{n}")); forewarn("no")"#, &["warn("]), vec!["a note"]);
 }
 
 #[test]
 fn czech_integer_plurals() {
-    let cs = LANGS.iter().position(|l| l.code == "cs").unwrap();
     assert_eq!(plural("cs", 1), Plural::One);
-    assert_eq!(fill(counted(cs, "{n} layers", 1), &[("n", &1)]), "1 vrstva");
     for n in [2, 3, 4] {
         assert_eq!(plural("cs", n), Plural::Few, "{n}");
-        assert_eq!(fill(counted(cs, "{n} layers", n), &[("n", &n)]), format!("{n} vrstvy"));
     }
     for n in [0, 5, 11, 12, 21, 22, 100, 1_000_000] {
         assert_eq!(plural("cs", n), Plural::Other, "{n}");
-        assert_eq!(fill(counted(cs, "{n} layers", n), &[("n", &n)]), format!("{n} vrstev"));
-    }
-    for (key, text) in LANGS[cs].ui {
-        if let Text::Plural { one, few, .. } = text {
-            assert!(one.is_some() && few.is_some(), "{key}: missing Czech plural forms");
-        }
     }
 }
 
 #[test]
 fn russian_language_tags_and_integer_plurals() {
     let ru = LANGS.iter().position(|l| l.code == "ru").unwrap();
-    assert_eq!(LANGS[ru].name, "Русский");
     for tag in ["ru", "ru-RU", "ru_RU.UTF-8", "RU", "ru-BY", "ru-Cyrl-RU"] {
         assert_eq!(resolve(tag, None), ru, "{tag}");
         assert_eq!(resolve("system", Some(tag)), ru, "{tag}");
     }
-    assert_eq!(resolve("system", Some("nl,ru-RU,en-US")), ru);
+    assert_eq!(resolve("system", Some("hi,ru-RU,en-US")), ru);
     for n in [1, 21, 31, 101, 1_001] {
         assert_eq!(plural("ru", n), Plural::One, "{n}");
-        assert_eq!(fill(counted(ru, "{n} layers", n), &[("n", &n)]), format!("{n} слой"));
     }
     for n in [2, 3, 4, 22, 23, 24, 102, 104, 1_002] {
         assert_eq!(plural("ru", n), Plural::Few, "{n}");
-        assert_eq!(fill(counted(ru, "{n} layers", n), &[("n", &n)]), format!("{n} слоя"));
     }
     for n in [0, 5, 10, 11, 12, 13, 14, 19, 20, 25, 100, 111, 112, 114, 1_000_000] {
         assert_eq!(plural("ru", n), Plural::Many, "{n}");
-        assert_eq!(fill(counted(ru, "{n} layers", n), &[("n", &n)]), format!("{n} слоёв"));
     }
-    for (key, text) in LANGS[ru].ui {
-        if let Text::Plural { one, few, many, .. } = text {
-            assert!(one.is_some() && few.is_some() && many.is_some(), "{key}: missing Russian plural forms");
-        }
+}
+
+#[test]
+fn polish_integer_plurals() {
+    assert_eq!(plural("pl", 1), Plural::One);
+    for n in [2, 3, 4, 22, 23, 24, 102, 104, 1_002] {
+        assert_eq!(plural("pl", n), Plural::Few, "{n}");
+    }
+    for n in [0, 5, 10, 11, 12, 13, 14, 19, 20, 21, 25, 31, 100, 101, 111, 112, 114, 1_000_000] {
+        assert_eq!(plural("pl", n), Plural::Many, "{n}");
     }
 }
 
 #[test]
 fn plural_fallback_uses_the_language_of_its_catalog() {
+    // A plural es-419 doesn't overlay reads Spanish's entry under Spanish's rule.
+    let es = LANGS.iter().position(|l| l.code == "es").unwrap();
     let la = LANGS.iter().position(|l| l.code == "es-419").unwrap();
-    assert_eq!(counted(la, "{n} layers", 1), "{n} capa");
-    assert_eq!(counted(la, "{n} layers", 21), "{n} capas");
+    for n in [1, 21] {
+        assert_eq!(counted(la, "{n} layers", n), counted(es, "{n} layers", n), "{n}");
+    }
     // Unsupported optional categories use other; existing one/other languages are unchanged.
     for code in ["en", "es", "de"] {
         for n in [0, 2, 11, 21, 1_000_000] {
diff --git a/crates/ui-egui/src/icons.rs b/crates/ui-egui/src/icons.rs
index 867b0894..219fe85a 100644
--- a/crates/ui-egui/src/icons.rs
+++ b/crates/ui-egui/src/icons.rs
@@ -23,6 +23,10 @@ macro_rules! icons {
     };
 }
 
+mod draw;
+
+pub use draw::{paint, paint_outlines};
+
 icons! {
     Move,
     Scale,
@@ -40,6 +44,7 @@ icons! {
     Pen,
     Pencil,
     Text,
+    TextOnPath,
     Comment,
     Actions,
     Chevron,
@@ -83,7 +88,15 @@ icons! {
     FlipH,
     FlipV,
     CornerRadius,
+    /// Individual corners: the rounded corner each field sets.
+    CornerTopLeft,
+    CornerTopRight,
+    CornerBottomRight,
+    CornerBottomLeft,
+    Angle,
     IndependentCorners,
+    /// Individual padding: a frame with one inward tick per side, each set alone.
+    IndependentPadding,
     LinkOn,
     LinkOff,
     LayoutH,
@@ -138,6 +151,11 @@ icons! {
     Fixed,
     PaddingH,
     PaddingV,
+    /// Individual padding sides: a frame with the controlled side filled.
+    PaddingTop,
+    PaddingRight,
+    PaddingBottom,
+    PaddingLeft,
     Gap,
     Reset,
     Detach,
@@ -185,6 +203,34 @@ icons! {
     LiveShared,
     /// A file of yours on a server that only you get into: a point inside a closed ring.
     LivePrivate,
+    /// A design file: a pen nib leaning to the left, its grip filled.
+    PenNib,
+    /// A board file (and the sticky note tool): a note with its bottom corner folded up.
+    Board,
+    /// Board templates: a board laid out in blocks, a note and lines of text. A table: a grid.
+    /// The table bar's rows and columns: a strip with a plus or a minus beyond its end.
+    Templates,
+    Table,
+    AddRow,
+    RemoveRow,
+    AddColumn,
+    RemoveColumn,
+    /// Board tools: a chisel-tipped marker; a broad highlighter over its band; a connector
+    /// between two boxes; shapes (a square behind a circle); a stamp (a badge with a check).
+    Marker,
+    Highlighter,
+    Connector,
+    /// A curved connector: the connector's two boxes joined by a quarter bend instead of a corner.
+    CurvedConnector,
+    Shapes,
+    Stamp,
+    /// Running a board session: a stopwatch (the timer), two bars (pause) and a ballot going
+    /// into a box (voting).
+    Timer,
+    Pause,
+    Vote,
+    /// A measurement: a dimension line with arrowheads between two end ticks.
+    Measure,
 }
 
 /// Points along a circular arc from angle `a0` to `a1` (radians, y down: increasing is clockwise).
@@ -230,860 +276,6 @@ fn triangulate(v: &[Pos2]) -> Vec<u32> {
     out
 }
 
-struct P<'a> {
-    painter: &'a Painter,
-    o: Pos2,
-    s: f32,
-    /// One physical pixel, in points.
-    px: f32,
-    stroke: Stroke,
-    color: Color32,
-}
-
-impl P<'_> {
-    fn raw(&self, x: f32, y: f32) -> Pos2 {
-        pos2(self.o.x + x * self.s, self.o.y + y * self.s)
-    }
-    /// A stroke coordinate on the pixel grid: centred on a pixel for odd widths, on an edge for even.
-    fn snap_c(&self, v: f32) -> f32 {
-        let odd = (self.stroke.width / self.px).round() as i32 % 2 == 1;
-        let off = if odd { 0.5 } else { 0.0 };
-        ((v / self.px - off).round() + off) * self.px
-    }
-    /// A fill edge on the pixel grid.
-    fn snap_e(&self, v: f32) -> f32 {
-        (v / self.px).round() * self.px
-    }
-    /// A hinted stroke vertex.
-    fn sp(&self, x: f32, y: f32) -> Pos2 {
-        let q = self.raw(x, y);
-        pos2(self.snap_c(q.x), self.snap_c(q.y))
-    }
-    /// A straight stroke; axis-aligned ones are hinted (crossways onto pixel centres, lengthways
-    /// onto pixel edges so they end sharp).
-    fn line(&self, x0: f32, y0: f32, x1: f32, y1: f32) {
-        let (a, b) = (self.raw(x0, y0), self.raw(x1, y1));
-        let (a, b) = if y0 == y1 {
-            let y = self.snap_c(a.y);
-            (pos2(self.snap_e(a.x), y), pos2(self.snap_e(b.x), y))
-        } else if x0 == x1 {
-            let x = self.snap_c(a.x);
-            (pos2(x, self.snap_e(a.y)), pos2(x, self.snap_e(b.y)))
-        } else {
-            (a, b)
-        };
-        self.painter.line_segment([a, b], self.stroke);
-    }
-    /// A polyline of straight segments through hinted vertices.
-    fn poly(&self, pts: &[(f32, f32)], closed: bool) {
-        let v: Vec<Pos2> = pts.iter().map(|&(x, y)| self.sp(x, y)).collect();
-        self.stroke_pts(v, closed);
-    }
-    /// A path with curves (arcs, capsules): drawn as given, unhinted.
-    fn path(&self, pts: &[(f32, f32)], closed: bool) {
-        let v: Vec<Pos2> = pts.iter().map(|&(x, y)| self.raw(x, y)).collect();
-        self.stroke_pts(v, closed);
-    }
-    fn stroke_pts(&self, v: Vec<Pos2>, closed: bool) {
-        if closed {
-            self.painter.add(Shape::closed_line(v, self.stroke));
-        } else {
-            self.painter.add(Shape::line(v, self.stroke));
-        }
-    }
-    /// A filled polygon, convex or not.
-    fn fill(&self, pts: &[(f32, f32)]) {
-        let v: Vec<Pos2> = pts.iter().map(|&(x, y)| self.raw(x, y)).collect();
-        let n = v.len();
-        let turn = |i: usize| {
-            let (a, b, c) = (v[i], v[(i + 1) % n], v[(i + 2) % n]);
-            (b - a).x * (c - b).y - (b - a).y * (c - b).x
-        };
-        let convex = n >= 3 && ((0..n).all(|i| turn(i) >= 0.0) || (0..n).all(|i| turn(i) <= 0.0));
-        if convex {
-            self.painter.add(Shape::convex_polygon(v, self.color, Stroke::NONE));
-            return;
-        }
-        let indices = triangulate(&v);
-        if !indices.is_empty() {
-            let mut mesh = Mesh::default();
-            for p in &v {
-                mesh.colored_vertex(*p, self.color);
-            }
-            mesh.indices = indices;
-            self.painter.add(Shape::mesh(mesh));
-        }
-        // A hairline around the mesh gives it the same soft edge as the convex fills.
-        self.painter.add(Shape::closed_line(v, Stroke::new(self.px, self.color)));
-    }
-    /// Triangles `tris` over `verts` (x, y, alpha): the colour fades between the vertices.
-    fn shade(&self, verts: &[(f32, f32, f32)], tris: &[u32]) {
-        let mut mesh = Mesh::default();
-        for &(x, y, a) in verts {
-            mesh.colored_vertex(self.raw(x, y), self.color.gamma_multiply(a));
-        }
-        mesh.indices = tris.to_vec();
-        self.painter.add(Shape::mesh(mesh));
-    }
-    /// A disc of radius `r` at the centre, as a fan from the top, clockwise: each slice's rim
-    /// alphas from `rim` and its centre's from `centre`, both of how far round it is (0..1).
-    fn shade_fan(&self, r: f32, centre: impl Fn(f32) -> f32, rim: impl Fn(f32) -> f32) {
-        const SLICES: u32 = 32;
-        let at = |t: f32| {
-            let a = -FRAC_PI_2 + t * TAU;
-            (8.0 + r * a.cos(), 8.0 + r * a.sin())
-        };
-        let mut verts = Vec::new();
-        for i in 0..SLICES {
-            let (t0, t1) = (i as f32 / SLICES as f32, (i + 1) as f32 / SLICES as f32);
-            let ((x0, y0), (x1, y1)) = (at(t0), at(t1));
-            verts.extend([(8.0, 8.0, centre((t0 + t1) / 2.0)), (x0, y0, rim(t0)), (x1, y1, rim(t1))]);
-        }
-        let tris: Vec<u32> = (0..SLICES * 3).collect();
-        self.shade(&verts, &tris);
-    }
-    fn rect(&self, x0: f32, y0: f32, x1: f32, y1: f32, r: f32) {
-        let rr = Rect::from_min_max(self.sp(x0, y0), self.sp(x1, y1));
-        self.painter.rect_stroke(rr, egui::CornerRadius::same((r * self.s).round() as u8), self.stroke, egui::StrokeKind::Middle);
-    }
-    fn fill_rect(&self, x0: f32, y0: f32, x1: f32, y1: f32, r: f32) {
-        let (a, b) = (self.raw(x0, y0), self.raw(x1, y1));
-        let rr = Rect::from_min_max(pos2(self.snap_e(a.x), self.snap_e(a.y)), pos2(self.snap_e(b.x), self.snap_e(b.y)));
-        self.painter.rect_filled(rr, egui::CornerRadius::same((r * self.s).round() as u8), self.color);
-    }
-    fn circle(&self, x: f32, y: f32, r: f32) {
-        self.painter.circle_stroke(self.raw(x, y), r * self.s, self.stroke);
-    }
-    fn dot(&self, x: f32, y: f32, r: f32) {
-        self.painter.circle_filled(self.raw(x, y), r * self.s, self.color);
-    }
-    fn arc(&self, cx: f32, cy: f32, r: f32, a0: f32, a1: f32) {
-        self.path(&arc_pts(cx, cy, r, a0, a1).collect::<Vec<_>>(), false);
-    }
-    /// An open arrowhead at `tip` pointing along angle `dir`, arms `len` long.
-    fn head(&self, tip: (f32, f32), dir: f32, len: f32) {
-        let arm = |a: f32| (tip.0 + len * a.cos(), tip.1 + len * a.sin());
-        self.path(&[arm(dir + PI - FRAC_PI_4), tip, arm(dir + PI + FRAC_PI_4)], false);
-    }
-    /// An arc with an arrowhead at its end, pointing the way it runs.
-    fn arc_arrow(&self, cx: f32, cy: f32, r: f32, a0: f32, a1: f32) {
-        self.arc(cx, cy, r, a0, a1);
-        let tip = (cx + r * a1.cos(), cy + r * a1.sin());
-        let dir = a1 + if a1 > a0 { FRAC_PI_2 } else { -FRAC_PI_2 };
-        self.head(tip, dir, 2.6);
-    }
-    /// A rounded corner mark: an L at (`x`, `y`) opening towards (`dx`, `dy`), `len` long.
-    fn corner(&self, x: f32, y: f32, dx: f32, dy: f32, len: f32, r: f32) {
-        let a0 = 0.0f32.atan2(-dx);
-        let mut a1 = (-dy).atan2(0.0);
-        if a1 - a0 > PI {
-            a1 -= TAU;
-        } else if a0 - a1 > PI {
-            a1 += TAU;
-        }
-        let mut c = vec![(x, y + len * dy)];
-        c.extend(arc_pts(x + r * dx, y + r * dy, r, a0, a1));
-        c.push((x + len * dx, y));
-        self.path(&c, false);
-    }
-    /// Short dashes along the outline of a box (`n` per side).
-    fn dashed_box(&self, x0: f32, y0: f32, x1: f32, y1: f32, n: usize) {
-        let seg = |a: f32, b: f32, i: usize| {
-            let step = (b - a) / (2 * n - 1) as f32;
-            (a + 2.0 * i as f32 * step, a + (2 * i + 1) as f32 * step)
-        };
-        for i in 0..n {
-            let (a, b) = seg(x0 - 0.5, x1 + 0.5, i);
-            self.line(a, y0, b, y0);
-            self.line(a, y1, b, y1);
-            let (a, b) = seg(y0 - 0.5, y1 + 0.5, i);
-            self.line(x0, a, x0, b);
-            self.line(x1, a, x1, b);
-        }
-    }
-}
-
-/// Paint `icon` centred in `rect` (a 16-unit glyph scaled to fit) in `color`.
-pub fn paint(painter: &Painter, rect: Rect, icon: Icon, color: Color32) {
-    let ppp = painter.ctx().pixels_per_point();
-    let px = 1.0 / ppp;
-    // Physical pixels per grid unit: whole steps from 16 px up (quarter steps on fractional
-    // display scales), the exact fit below.
-    let k = rect.width().min(rect.height()) * ppp / 16.0;
-    let k = if k >= 1.0 { (k * 4.0).floor() / 4.0 } else { k };
-    let s = k * px;
-    let snap = |v: f32| (v * ppp).round() * px;
-    let o = rect.center() - vec2(8.0 * s, 8.0 * s);
-    let o = pos2(snap(o.x), snap(o.y));
-    let w = (k * 0.9).round().max(1.0) * px;
-    let p = P { painter, o, s, px, stroke: Stroke::new(w, color), color };
-    draw(&p, icon);
-}
-
-fn draw(p: &P, icon: Icon) {
-    use Icon::*;
-    match icon {
-        Move => p.fill(&[(4.0, 2.0), (4.0, 13.6), (6.9, 10.9), (8.8, 14.8), (10.6, 14.0), (8.7, 10.2), (12.6, 10.2)]),
-        Scale => {
-            p.rect(2.5, 7.5, 8.5, 13.5, 0.0);
-            p.line(6.0, 10.0, 13.0, 3.0);
-            p.poly(&[(9.5, 2.5), (13.5, 2.5), (13.5, 6.5)], false);
-        }
-        Hand => {
-            // An open hand: four fingers (the middle one tallest), then the palm and the thumb.
-            for (x, top) in [(4.5, 5.0), (6.5, 3.5), (8.5, 4.0), (10.5, 5.5)] {
-                let mut f = vec![(x, 8.0)];
-                f.extend(arc_pts(x + 1.0, top, 1.0, PI, TAU));
-                f.push((x + 2.0, 8.0));
-                p.path(&f, false);
-            }
-            let mut h = vec![(12.5, 8.0), (12.5, 10.0)];
-            h.extend(arc_pts(9.5, 10.0, 3.0, 0.0, FRAC_PI_2));
-            h.extend([(8.0, 13.0), (3.0, 9.4)]);
-            h.extend(arc_pts(3.6, 8.6, 1.0, 2.2, 5.3));
-            h.push((4.5, 8.5));
-            p.path(&h, false);
-        }
-        Frame => {
-            p.line(5.5, 2.0, 5.5, 14.0);
-            p.line(10.5, 2.0, 10.5, 14.0);
-            p.line(2.0, 5.5, 14.0, 5.5);
-            p.line(2.0, 10.5, 14.0, 10.5);
-        }
-        Section | Section2 => {
-            p.rect(2.5, 5.5, 13.5, 13.5, 1.0);
-            p.fill_rect(2.0, 2.0, 9.0, 6.0, 1.0);
-        }
-        Slice => {
-            p.rect(2.5, 2.5, 13.5, 13.5, 0.0);
-            p.line(2.5, 13.5, 13.5, 2.5);
-        }
-        Bend => {
-            // A curve with a smooth point and its handle line.
-            let pts: Vec<(f32, f32)> = (0..=16)
-                .map(|i| {
-                    let t = i as f32 / 16.0;
-                    let u = 1.0 - t;
-                    (u * u * 2.5 + 2.0 * u * t * 8.0 + t * t * 13.5, u * u * 13.5 + 2.0 * u * t * 1.5 + t * t * 13.5)
-                })
-                .collect();
-            p.path(&pts, false);
-            p.line(3.0, 7.5, 13.0, 7.5);
-            p.dot(3.0, 7.5, 1.3);
-            p.dot(13.0, 7.5, 1.3);
-            p.fill_rect(7.0, 6.0, 9.0, 9.0, 0.0);
-        }
-        PaintBucket => {
-            p.poly(&[(2.5, 8.0), (7.5, 3.0), (12.5, 8.0), (7.5, 13.0)], true);
-            p.fill(&[(2.5, 8.0), (12.5, 8.0), (7.5, 13.0)]);
-            p.line(7.5, 3.0, 5.0, 0.5);
-            p.dot(13.5, 11.5, 1.5);
-        }
-        Lasso => {
-            p.path(&arc_pts(8.5, 6.5, 5.0, 0.0, TAU).map(|(x, y)| (x, 6.5 + (y - 6.5) * 0.7)).collect::<Vec<_>>(), true);
-            p.path(&[(5.0, 9.3), (4.5, 11.5), (6.0, 12.5), (4.5, 14.5)], false);
-        }
-        Cut => {
-            p.circle(4.5, 11.5, 2.0);
-            p.circle(11.5, 11.5, 2.0);
-            p.line(6.0, 10.0, 11.5, 2.5);
-            p.line(10.0, 10.0, 4.5, 2.5);
-        }
-        Rectangle => p.rect(2.5, 2.5, 13.5, 13.5, 1.0),
-        Line => p.line(2.5, 13.5, 13.5, 2.5),
-        Arrow => {
-            p.line(2.5, 13.5, 13.0, 3.0);
-            p.poly(&[(7.5, 2.5), (13.5, 2.5), (13.5, 8.5)], false);
-        }
-        Ellipse => p.circle(8.0, 8.0, 5.5),
-        Polygon => p.poly(&[(8.0, 2.5), (13.5, 12.5), (2.5, 12.5)], true),
-        Star => {
-            let pts: Vec<(f32, f32)> = (0..10)
-                .map(|i| {
-                    let a = -FRAC_PI_2 + PI * i as f32 / 5.0;
-                    let r = if i % 2 == 0 { 6.0 } else { 2.7 };
-                    (8.0 + r * a.cos(), 8.6 + r * a.sin())
-                })
-                .collect();
-            p.path(&pts, true);
-        }
-        Image => {
-            p.rect(2.5, 3.5, 13.5, 12.5, 1.0);
-            p.poly(&[(2.5, 11.5), (6.0, 8.0), (9.0, 11.0), (10.5, 9.5), (13.5, 12.5)], false);
-            p.dot(10.5, 6.5, 1.1);
-        }
-        Pen => {
-            p.poly(&[(8.0, 2.0), (12.5, 8.5), (10.5, 13.5), (5.5, 13.5), (3.5, 8.5)], true);
-            p.line(8.0, 2.0, 8.0, 7.0);
-            p.dot(8.0, 8.8, 1.2);
-        }
-        Pencil => {
-            p.poly(&[(2.5, 13.5), (3.2, 10.3), (10.5, 3.0), (13.0, 5.5), (5.7, 12.8)], true);
-            p.line(9.0, 4.5, 11.5, 7.0);
-        }
-        Text => {
-            p.line(2.0, 3.5, 13.0, 3.5);
-            p.line(7.5, 3.0, 7.5, 13.0);
-            p.line(2.5, 3.0, 2.5, 6.0);
-            p.line(12.5, 3.0, 12.5, 6.0);
-            p.line(5.0, 12.5, 10.0, 12.5);
-        }
-        Comment => {
-            let mut b: Vec<(f32, f32)> = arc_pts(8.5, 7.5, 5.0, 2.75, TAU + 1.95).collect();
-            b.push((2.5, 13.5));
-            p.path(&b, true);
-        }
-        Actions => p.poly(&[(9.0, 2.0), (3.5, 9.0), (7.5, 9.0), (6.5, 14.0), (12.5, 7.0), (8.5, 7.0)], true),
-        Chevron => p.poly(&[(4.5, 6.0), (8.0, 9.5), (11.5, 6.0)], false),
-        ChevronUp => p.poly(&[(4.5, 10.0), (8.0, 6.5), (11.5, 10.0)], false),
-        ChevronRight => p.poly(&[(6.0, 4.5), (9.5, 8.0), (6.0, 11.5)], false),
-        ChevronLeft => p.poly(&[(10.0, 4.5), (6.5, 8.0), (10.0, 11.5)], false),
-        Plus => {
-            p.line(7.5, 2.0, 7.5, 13.0);
-            p.line(2.0, 7.5, 13.0, 7.5);
-        }
-        Minus => p.line(2.0, 7.5, 13.0, 7.5),
-        Eye | EyeOff => {
-            // An almond (two arcs meeting at the corners) with the pupil.
-            let (r, cy, half) = (7.0f32, 7.5f32, 5.5f32);
-            let a = (half / r).asin();
-            let d = r * a.cos();
-            let mut e: Vec<(f32, f32)> = arc_pts(8.0, cy + d, r, -FRAC_PI_2 - a, -FRAC_PI_2 + a).collect();
-            e.extend(arc_pts(8.0, cy - d, r, FRAC_PI_2 - a, FRAC_PI_2 + a));
-            p.path(&e, true);
-            if icon == Eye {
-                p.circle(8.0, cy, 2.0);
-            } else {
-                p.line(3.0, 13.0, 13.0, 2.0);
-            }
-        }
-        Lock | Unlock => {
-            p.rect(3.5, 7.5, 12.5, 13.5, 1.0);
-            p.dot(8.0, 10.5, 1.0);
-            if icon == Lock {
-                p.line(5.5, 7.5, 5.5, 5.5);
-                p.line(10.5, 7.5, 10.5, 5.5);
-                p.arc(8.0, 5.5, 2.5, PI, TAU);
-            } else {
-                p.line(10.5, 7.5, 10.5, 4.5);
-                p.arc(13.0, 4.5, 2.5, PI, TAU);
-            }
-        }
-        Component => {
-            for (cx, cy) in [(8.0, 4.2), (11.8, 8.0), (8.0, 11.8), (4.2, 8.0)] {
-                p.fill(&[(cx, cy - 2.5), (cx + 2.5, cy), (cx, cy + 2.5), (cx - 2.5, cy)]);
-            }
-        }
-        ComponentSet => {
-            for (cx, cy) in [(8.0, 4.3), (11.7, 8.0), (8.0, 11.7), (4.3, 8.0)] {
-                p.path(&[(cx, cy - 2.2), (cx + 2.2, cy), (cx, cy + 2.2), (cx - 2.2, cy)], true);
-            }
-        }
-        Instance => p.path(&[(8.0, 2.0), (14.0, 8.0), (8.0, 14.0), (2.0, 8.0)], true),
-        Group => {
-            for (x, y, dx, dy) in [(2.5, 2.5, 1.0, 1.0), (13.5, 2.5, -1.0, 1.0), (2.5, 13.5, 1.0, -1.0), (13.5, 13.5, -1.0, -1.0)] {
-                p.poly(&[(x + 3.5 * dx, y), (x, y), (x, y + 3.5 * dy)], false);
-            }
-        }
-        Vector => {
-            p.path(&[(3.0, 12.5), (6.0, 4.0), (10.0, 12.0), (13.0, 3.5)], false);
-            p.fill_rect(1.5, 11.0, 4.5, 14.0, 0.0);
-            p.fill_rect(11.5, 2.0, 14.5, 5.0, 0.0);
-        }
-        Boolean | Union => {
-            p.rect(2.5, 2.5, 9.5, 9.5, 0.0);
-            p.rect(6.5, 6.5, 13.5, 13.5, 0.0);
-        }
-        Subtract => {
-            p.fill_rect(2.0, 2.0, 10.0, 10.0, 0.0);
-            p.rect(6.5, 6.5, 13.5, 13.5, 0.0);
-        }
-        Intersect => {
-            p.rect(2.5, 2.5, 9.5, 9.5, 0.0);
-            p.rect(6.5, 6.5, 13.5, 13.5, 0.0);
-            p.fill_rect(6.0, 6.0, 10.0, 10.0, 0.0);
-        }
-        Exclude => {
-            p.fill_rect(2.0, 2.0, 10.0, 6.0, 0.0);
-            p.fill_rect(2.0, 6.0, 6.0, 10.0, 0.0);
-            p.fill_rect(10.0, 6.0, 14.0, 14.0, 0.0);
-            p.fill_rect(6.0, 10.0, 10.0, 14.0, 0.0);
-            p.rect(6.5, 6.5, 9.5, 9.5, 0.0);
-        }
-        Page => {
-            p.poly(&[(3.5, 2.5), (9.5, 2.5), (12.5, 5.5), (12.5, 13.5), (3.5, 13.5)], true);
-            p.poly(&[(9.5, 2.5), (9.5, 5.5), (12.5, 5.5)], false);
-        }
-        Check => p.poly(&[(3.0, 8.5), (6.5, 12.0), (13.0, 4.5)], false),
-        Close => {
-            p.line(4.0, 4.0, 12.0, 12.0);
-            p.line(12.0, 4.0, 4.0, 12.0);
-        }
-        WinMinimize => p.line(3.0, 8.5, 13.0, 8.5),
-        WinMaximize => p.rect(3.5, 3.5, 12.5, 12.5, 0.0),
-        WinRestore => {
-            // A window in front of another.
-            p.rect(3.5, 5.5, 10.5, 12.5, 0.0);
-            p.poly(&[(5.5, 5.5), (5.5, 3.5), (12.5, 3.5), (12.5, 10.5), (10.5, 10.5)], false);
-        }
-        Search => {
-            p.circle(7.0, 7.0, 4.5);
-            p.line(10.5, 10.5, 14.0, 14.0);
-        }
-        Grid | LayoutGrid => {
-            for i in [2.5, 6.5, 10.5] {
-                for j in [2.5, 6.5, 10.5] {
-                    p.rect(i, j, i + 3.0, j + 3.0, 0.0);
-                }
-            }
-        }
-        AlignLeft => {
-            p.line(2.5, 2.0, 2.5, 14.0);
-            p.fill_rect(4.0, 4.0, 13.0, 7.0, 0.0);
-            p.fill_rect(4.0, 9.0, 9.0, 12.0, 0.0);
-        }
-        AlignHCenter => {
-            p.line(7.5, 2.0, 7.5, 14.0);
-            p.fill_rect(2.0, 4.0, 13.0, 7.0, 0.0);
-            p.fill_rect(4.0, 9.0, 11.0, 12.0, 0.0);
-        }
-        AlignRight => {
-            p.line(13.5, 2.0, 13.5, 14.0);
-            p.fill_rect(3.0, 4.0, 12.0, 7.0, 0.0);
-            p.fill_rect(7.0, 9.0, 12.0, 12.0, 0.0);
-        }
-        AlignTop => {
-            p.line(2.0, 2.5, 14.0, 2.5);
-            p.fill_rect(4.0, 4.0, 7.0, 13.0, 0.0);
-            p.fill_rect(9.0, 4.0, 12.0, 9.0, 0.0);
-        }
-        AlignVCenter => {
-            p.line(2.0, 7.5, 14.0, 7.5);
-            p.fill_rect(4.0, 2.0, 7.0, 13.0, 0.0);
-            p.fill_rect(9.0, 4.0, 12.0, 11.0, 0.0);
-        }
-        AlignBottom => {
-            p.line(2.0, 13.5, 14.0, 13.5);
-            p.fill_rect(4.0, 3.0, 7.0, 12.0, 0.0);
-            p.fill_rect(9.0, 7.0, 12.0, 12.0, 0.0);
-        }
-        DistributeH | Gap => {
-            p.line(2.5, 2.0, 2.5, 14.0);
-            p.line(13.5, 2.0, 13.5, 14.0);
-            p.fill_rect(6.0, 4.0, 10.0, 12.0, 0.0);
-        }
-        DistributeV => {
-            p.line(2.0, 2.5, 14.0, 2.5);
-            p.line(2.0, 13.5, 14.0, 13.5);
-            p.fill_rect(4.0, 6.0, 12.0, 10.0, 0.0);
-        }
-        Rotate => p.arc_arrow(8.0, 8.5, 5.0, -PI * 0.55, PI * 1.25),
-        Reset => p.arc_arrow(8.0, 8.5, 5.0, -PI * 0.45, -PI * 2.25),
-        FlipH => {
-            for y in [1.0, 5.0, 9.0, 13.0] {
-                p.line(7.5, y, 7.5, y + 2.0);
-            }
-            p.poly(&[(5.5, 3.5), (5.5, 12.5), (1.5, 12.5)], true);
-            p.fill(&[(9.0, 3.0), (14.0, 13.0), (9.0, 13.0)]);
-        }
-        FlipV => {
-            for x in [1.0, 5.0, 9.0, 13.0] {
-                p.line(x, 7.5, x + 2.0, 7.5);
-            }
-            p.poly(&[(3.5, 5.5), (12.5, 5.5), (12.5, 1.5)], true);
-            p.fill(&[(3.0, 9.0), (13.0, 9.0), (13.0, 14.0)]);
-        }
-        CornerRadius => p.corner(2.5, 2.5, 1.0, 1.0, 11.5, 6.0),
-        IndependentCorners => {
-            for (x, y, dx, dy) in [(2.5, 2.5, 1.0, 1.0), (13.5, 2.5, -1.0, 1.0), (2.5, 13.5, 1.0, -1.0), (13.5, 13.5, -1.0, -1.0)] {
-                p.corner(x, y, dx, dy, 4.0, 2.0);
-            }
-        }
-        LinkOn | Link => {
-            p.path(&capsule((4.0, 12.0), (6.5, 9.5), 2.4), true);
-            p.path(&capsule((9.5, 6.5), (12.0, 4.0), 2.4), true);
-            p.line(6.2, 9.8, 9.8, 6.2);
-        }
-        LinkOff => {
-            p.path(&capsule((3.5, 12.5), (5.5, 10.5), 2.2), true);
-            p.path(&capsule((10.5, 5.5), (12.5, 3.5), 2.2), true);
-            p.line(9.5, 12.0, 9.5, 14.0);
-            p.line(12.0, 9.5, 14.0, 9.5);
-            p.line(2.0, 6.5, 4.0, 6.5);
-            p.line(6.5, 2.0, 6.5, 4.0);
-        }
-        LayoutH => {
-            p.fill_rect(2.0, 3.0, 7.0, 13.0, 1.0);
-            p.fill_rect(9.0, 3.0, 14.0, 13.0, 1.0);
-        }
-        LayoutV => {
-            p.fill_rect(3.0, 2.0, 13.0, 7.0, 1.0);
-            p.fill_rect(3.0, 9.0, 13.0, 14.0, 1.0);
-        }
-        LayoutWrap => {
-            let mut w = vec![(2.0, 4.5), (10.5, 4.5)];
-            w.extend(arc_pts(10.5, 7.5, 3.0, -FRAC_PI_2, FRAC_PI_2));
-            w.push((4.0, 10.5));
-            p.path(&w, false);
-            p.head((3.5, 10.5), PI, 2.8);
-        }
-        AutoLayout => {
-            p.rect(2.5, 2.5, 13.5, 13.5, 2.0);
-            p.fill_rect(5.0, 5.0, 7.0, 11.0, 0.0);
-            p.fill_rect(9.0, 5.0, 11.0, 11.0, 0.0);
-        }
-        ClipContent => {
-            p.rect(4.5, 4.5, 13.5, 13.5, 0.0);
-            p.line(2.5, 1.0, 2.5, 11.0);
-            p.line(1.0, 2.5, 11.0, 2.5);
-        }
-        Effects | Sun => {
-            p.circle(8.0, 8.0, if icon == Sun { 2.5 } else { 3.0 });
-            for i in 0..8 {
-                let a = i as f32 * FRAC_PI_4;
-                let (r0, r1) = if i % 2 == 0 { (4.8, 6.6) } else { (4.6, 5.8) };
-                p.line(8.0 + r0 * a.cos(), 8.0 + r0 * a.sin(), 8.0 + r1 * a.cos(), 8.0 + r1 * a.sin());
-            }
-        }
-        Styles => {
-            for (x, y) in [(5.0, 5.0), (11.0, 5.0), (5.0, 11.0), (11.0, 11.0)] {
-                p.dot(x, y, 2.2);
-            }
-        }
-        Menu => {
-            for y in [3.5, 7.5, 11.5] {
-                p.line(2.0, y, 14.0, y);
-            }
-        }
-        Play => p.fill(&[(4.5, 2.5), (13.5, 8.0), (4.5, 13.5)]),
-        Home => {
-            // Unhinted so the roof's peak stays centred; the floor stops at the door.
-            p.path(&[(6.5, 13.5), (3.5, 13.5), (3.5, 7.0), (8.0, 2.8), (12.5, 7.0), (12.5, 13.5), (9.5, 13.5)], false);
-            p.poly(&[(6.5, 13.5), (6.5, 9.5), (9.5, 9.5), (9.5, 13.5)], false);
-        }
-        Bell => {
-            let mut b = vec![(2.5, 11.5), (4.0, 10.0), (4.0, 7.0)];
-            b.extend(arc_pts(8.0, 7.0, 4.0, PI, TAU));
-            b.extend([(12.0, 10.0), (13.5, 11.5)]);
-            p.path(&b, true);
-            p.arc(8.0, 12.0, 1.8, 0.0, PI);
-        }
-        Panels => {
-            p.rect(2.5, 3.5, 13.5, 12.5, 1.0);
-            p.line(5.5, 4.0, 5.5, 12.0);
-            p.line(10.5, 4.0, 10.5, 12.0);
-        }
-        Help => {
-            p.circle(8.0, 8.0, 6.0);
-            p.arc(8.0, 6.4, 2.0, PI * 1.05, TAU + 0.7);
-            p.path(&[(9.5, 7.7), (8.0, 8.8), (8.0, 9.8)], false);
-            p.dot(8.0, 11.6, 0.9);
-        }
-        Dots => {
-            for x in [3.5, 8.0, 12.5] {
-                p.dot(x, 8.0, 1.25);
-            }
-        }
-        Mask | Opacity => {
-            p.circle(8.0, 8.0, 5.5);
-            let side = if icon == Mask { -FRAC_PI_2 } else { FRAC_PI_2 };
-            p.fill(&arc_pts(8.0, 8.0, 5.5, side, side + PI).collect::<Vec<_>>());
-        }
-        TextAlignLeft => {
-            for (y, x1) in [(3.5, 14.0), (6.5, 10.0), (9.5, 14.0), (12.5, 9.0)] {
-                p.line(2.0, y, x1, y);
-            }
-        }
-        TextAlignCenter => {
-            for (y, h) in [(3.5, 6.0), (6.5, 4.0), (9.5, 6.0), (12.5, 3.0)] {
-                p.line(8.0 - h, y, 8.0 + h, y);
-            }
-        }
-        TextAlignRight => {
-            for (y, x0) in [(3.5, 2.0), (6.5, 6.0), (9.5, 2.0), (12.5, 7.0)] {
-                p.line(x0, y, 14.0, y);
-            }
-        }
-        TextAlignJustify => {
-            for y in [3.5, 6.5, 9.5, 12.5] {
-                p.line(2.0, y, 14.0, y);
-            }
-        }
-        TextTop => {
-            p.line(2.0, 2.5, 14.0, 2.5);
-            p.line(7.5, 5.0, 7.5, 14.0);
-            p.head((7.5, 5.0), -FRAC_PI_2, 3.2);
-        }
-        TextMiddle => {
-            p.line(2.0, 7.5, 14.0, 7.5);
-            p.line(7.5, 1.0, 7.5, 5.0);
-            p.head((7.5, 5.0), FRAC_PI_2, 2.6);
-            p.line(7.5, 10.0, 7.5, 14.0);
-            p.head((7.5, 10.0), -FRAC_PI_2, 2.6);
-        }
-        TextBottom => {
-            p.line(2.0, 13.5, 14.0, 13.5);
-            p.line(7.5, 2.0, 7.5, 11.0);
-            p.head((7.5, 11.0), FRAC_PI_2, 3.2);
-        }
-        Eyedropper => {
-            p.poly(&[(2.5, 13.5), (3.0, 11.0), (8.5, 5.5), (10.5, 7.5), (5.0, 13.0)], true);
-            p.path(&capsule((10.5, 5.5), (12.0, 4.0), 1.6), true);
-            p.line(7.5, 4.5, 11.5, 8.5);
-        }
-        Code => {
-            p.poly(&[(5.5, 4.0), (2.0, 8.0), (5.5, 12.0)], false);
-            p.poly(&[(10.5, 4.0), (14.0, 8.0), (10.5, 12.0)], false);
-            p.line(9.0, 3.0, 7.0, 13.0);
-        }
-        Assets => {
-            p.path(&[(5.0, 2.0), (8.0, 5.0), (5.0, 8.0), (2.0, 5.0)], true);
-            p.circle(11.0, 5.0, 2.5);
-            p.rect(2.5, 9.5, 7.5, 13.5, 0.0);
-            p.poly(&[(11.0, 9.0), (13.5, 13.5), (8.5, 13.5)], true);
-        }
-        Library => {
-            p.poly(&[(7.5, 4.5), (5.5, 3.5), (1.5, 3.5), (1.5, 12.5), (5.5, 12.5), (7.5, 13.5)], false);
-            p.poly(&[(8.5, 4.5), (10.5, 3.5), (14.5, 3.5), (14.5, 12.5), (10.5, 12.5), (8.5, 13.5)], false);
-            p.line(7.5, 4.5, 7.5, 13.5);
-            p.line(8.5, 4.5, 8.5, 13.5);
-        }
-        Layers => {
-            p.poly(&[(8.0, 2.5), (14.0, 5.5), (8.0, 8.5), (2.0, 5.5)], true);
-            p.poly(&[(2.0, 8.0), (8.0, 11.0), (14.0, 8.0)], false);
-            p.poly(&[(2.0, 10.5), (8.0, 13.5), (14.0, 10.5)], false);
-        }
-        Blend => {
-            p.circle(6.0, 8.0, 4.0);
-            p.circle(10.0, 8.0, 4.0);
-        }
-        Export => {
-            p.line(7.5, 2.0, 7.5, 10.0);
-            p.head((7.5, 2.0), -FRAC_PI_2, 3.5);
-            p.poly(&[(2.5, 8.5), (2.5, 13.5), (12.5, 13.5), (12.5, 8.5)], false);
-        }
-        StrokeIcon => p.rect(2.5, 2.5, 13.5, 13.5, 2.0),
-        Fill => p.fill_rect(2.0, 2.0, 14.0, 14.0, 2.0),
-        GradientLinear => {
-            p.rect(2.5, 2.5, 13.5, 13.5, 2.0);
-            p.shade(&[(4.0, 4.0, 1.0), (12.0, 4.0, 0.0), (12.0, 12.0, 0.0), (4.0, 12.0, 1.0)], &[0, 1, 2, 0, 2, 3]);
-        }
-        GradientRadial => {
-            p.rect(2.5, 2.5, 13.5, 13.5, 2.0);
-            p.shade_fan(5.5, |_| 1.0, |_| 0.0);
-        }
-        GradientAngular => {
-            // Once round from the top: the seam shows where the sweep starts.
-            p.rect(2.5, 2.5, 13.5, 13.5, 2.0);
-            p.shade_fan(4.0, |t| 1.0 - t, |t| 1.0 - t);
-        }
-        GradientDiamond => {
-            p.rect(2.5, 2.5, 13.5, 13.5, 2.0);
-            let v = [(8.0, 8.0, 1.0), (8.0, 2.5, 0.0), (13.5, 8.0, 0.0), (8.0, 13.5, 0.0), (2.5, 8.0, 0.0)];
-            p.shade(&v, &[0, 1, 2, 0, 2, 3, 0, 3, 4, 0, 4, 1]);
-        }
-        Moon => {
-            // A crescent: the outer rim, then the shadowing circle's edge back. Both arcs stop short
-            // of where the circles meet, so each tip is two blunt joins (a single cusp join folds).
-            let mut m: Vec<(f32, f32)> = arc_pts(8.0, 8.0, 5.5, 0.166 + 0.12, TAU - 1.737 - 0.12).collect();
-            m.extend(arc_pts(11.0, 5.0, 4.6, -2.586 - 0.18, 1.016 - TAU + 0.18));
-            p.path(&m, true);
-        }
-        Undo | Redo => {
-            // A U-turn arrow: back along the top, round, and out along the bottom.
-            let undo = icon == Undo;
-            let f = |x: f32| if undo { x } else { 16.0 - x };
-            let mut u = vec![(f(3.0), 5.5), (f(9.5), 5.5)];
-            let a1 = if undo { FRAC_PI_2 } else { -3.0 * FRAC_PI_2 };
-            u.extend(arc_pts(f(9.5), 9.0, 3.5, -FRAC_PI_2, a1));
-            u.push((f(6.0), 12.5));
-            p.path(&u, false);
-            p.head((f(3.0), 5.5), if undo { PI } else { 0.0 }, 3.0);
-        }
-        Hug => {
-            p.poly(&[(2.5, 4.5), (5.5, 7.5), (2.5, 10.5)], false);
-            p.poly(&[(13.5, 4.5), (10.5, 7.5), (13.5, 10.5)], false);
-            p.line(6.0, 7.5, 10.0, 7.5);
-        }
-        FillContainer => {
-            p.poly(&[(5.0, 4.5), (2.0, 7.5), (5.0, 10.5)], false);
-            p.poly(&[(11.0, 4.5), (14.0, 7.5), (11.0, 10.5)], false);
-            p.line(2.0, 7.5, 14.0, 7.5);
-        }
-        Fixed => {
-            p.line(2.5, 4.0, 2.5, 11.0);
-            p.line(13.5, 4.0, 13.5, 11.0);
-            p.line(3.0, 7.5, 13.0, 7.5);
-        }
-        PaddingH => {
-            p.rect(2.5, 3.5, 13.5, 12.5, 1.0);
-            p.fill_rect(5.0, 6.0, 11.0, 10.0, 0.0);
-        }
-        PaddingV => {
-            p.rect(3.5, 2.5, 12.5, 13.5, 1.0);
-            p.fill_rect(6.0, 5.0, 10.0, 11.0, 0.0);
-        }
-        Online => {
-            p.circle(8.0, 8.0, 5.5);
-            p.line(2.5, 8.0, 13.5, 8.0);
-            let meridian: Vec<(f32, f32)> = arc_pts(0.0, 0.0, 1.0, 0.0, TAU).map(|(x, y)| (8.0 + 2.4 * x, 8.0 + 5.5 * y)).collect();
-            p.path(&meridian, true);
-        }
-        LiveShared => {
-            p.dot(8.0, 8.0, 1.6);
-            for r in [3.6, 6.0] {
-                p.arc(8.0, 8.0, r, -FRAC_PI_4, FRAC_PI_4);
-                p.arc(8.0, 8.0, r, PI - FRAC_PI_4, PI + FRAC_PI_4);
-            }
-        }
-        LivePrivate => {
-            p.dot(8.0, 8.0, 1.6);
-            p.circle(8.0, 8.0, 5.0);
-        }
-        Clock => {
-            p.circle(7.5, 7.5, 5.5);
-            p.line(7.5, 4.0, 7.5, 8.0);
-            p.line(7.5, 7.5, 10.0, 10.0);
-        }
-        ShapeBuilder | ShapeBuilderRemove => {
-            // Two overlapping rings; their shared lens filled (merge) or crossed out (remove).
-            let (r, d) = (4.5f32, 2.0f32);
-            let a = (d / r).acos();
-            p.circle(8.0 - d, 8.0, r);
-            p.circle(8.0 + d, 8.0, r);
-            if icon == ShapeBuilder {
-                let lens: Vec<(f32, f32)> = arc_pts(8.0 - d, 8.0, r, -a, a).chain(arc_pts(8.0 + d, 8.0, r, PI - a, PI + a)).collect();
-                p.fill(&lens);
-            } else {
-                p.line(6.2, 9.8, 9.8, 6.2);
-            }
-        }
-        Eraser => {
-            // A tilted block with a band near its tip, over a short trace line.
-            p.poly(&[(2.5, 10.0), (9.5, 3.0), (13.5, 7.0), (7.0, 13.5), (6.0, 13.5)], true);
-            p.line(5.5, 7.0, 9.5, 11.0);
-            p.line(7.0, 13.5, 14.0, 13.5);
-        }
-        VariableWidth => {
-            // A lens-shaped stroke, thin at both ends, and a width handle on either side of its
-            // widest point.
-            let edge = |i: i32, side: f32| {
-                let f = i as f32 / 12.0;
-                (2.0 + 11.0 * f, 7.5 + side * 3.0 * (PI * f).sin())
-            };
-            let lens: Vec<(f32, f32)> = (0..=12).map(|i| edge(i, -1.0)).chain((0..=12).rev().map(|i| edge(i, 1.0))).collect();
-            p.fill(&lens);
-            p.line(7.5, 2.0, 7.5, 13.0);
-            p.dot(7.5, 2.0, 1.5);
-            p.dot(7.5, 13.0, 1.5);
-        }
-        Variable => {
-            // A hexagon with a dot: an original mark for "bind a value".
-            let pts: Vec<(f32, f32)> = (0..6)
-                .map(|i| {
-                    let a = std::f32::consts::FRAC_PI_3 * i as f32 + std::f32::consts::FRAC_PI_6;
-                    (8.0 + 6.0 * a.cos(), 8.0 + 6.0 * a.sin())
-                })
-                .collect();
-            p.path(&pts, true);
-            p.dot(8.0, 8.0, 1.7);
-        }
-        Detach => {
-            p.path(&[(8.0, 2.0), (14.0, 8.0), (8.0, 14.0), (2.0, 8.0)], true);
-            p.line(3.0, 13.0, 13.0, 3.0);
-        }
-        Swap => {
-            p.line(2.0, 4.5, 13.0, 4.5);
-            p.head((13.0, 4.5), 0.0, 2.8);
-            p.line(3.0, 11.5, 14.0, 11.5);
-            p.head((3.0, 11.5), PI, 2.8);
-        }
-        Prototype => {
-            p.circle(4.5, 11.5, 2.0);
-            p.line(6.0, 10.0, 13.0, 3.0);
-            p.poly(&[(8.5, 2.5), (13.5, 2.5), (13.5, 7.5)], false);
-        }
-        Preview => {
-            // A window with a title strip and a play triangle in it.
-            p.rect(2.5, 2.5, 13.5, 13.5, 1.0);
-            p.line(3.0, 5.5, 13.0, 5.5);
-            p.fill(&[(6.5, 7.5), (10.5, 10.0), (6.5, 12.5)]);
-        }
-        AbsolutePosition => {
-            // The frame, a small layer near its top-right corner, and the two offsets pinning it.
-            p.rect(2.5, 2.5, 13.5, 13.5, 1.0);
-            p.fill_rect(6.0, 6.0, 10.0, 10.0, 0.0);
-            p.line(10.0, 7.5, 13.0, 7.5);
-            p.line(7.5, 3.0, 7.5, 6.0);
-        }
-        Slot => {
-            p.dashed_box(2.5, 2.5, 12.5, 12.5, 3);
-            p.line(7.5, 5.0, 7.5, 10.0);
-            p.line(5.0, 7.5, 10.0, 7.5);
-        }
-        Adjust => {
-            p.line(2.0, 4.5, 14.0, 4.5);
-            p.line(2.0, 11.5, 14.0, 11.5);
-            p.dot(10.5, 4.5, 2.2);
-            p.dot(5.5, 11.5, 2.2);
-        }
-        ViewList => {
-            for y in [2.0, 6.0, 10.0] {
-                p.fill_rect(2.0, y, 5.0, y + 3.0, 0.0);
-                p.line(7.0, y + 1.5, 14.0, y + 1.5);
-            }
-        }
-        Reaction => {
-            p.circle(8.0, 8.0, 5.5);
-            p.dot(6.0, 6.5, 0.9);
-            p.dot(10.0, 6.5, 0.9);
-            p.arc(8.0, 8.5, 3.0, 0.6, PI - 0.6);
-        }
-        DragHandle => {
-            for y in [4.0, 8.0, 12.0] {
-                p.dot(6.0, y, 1.1);
-                p.dot(10.0, y, 1.1);
-            }
-        }
-        ViewGrid => {
-            for (x, y) in [(2.5, 2.5), (9.5, 2.5), (2.5, 9.5), (9.5, 9.5)] {
-                p.rect(x, y, x + 4.0, y + 4.0, 1.0);
-            }
-        }
-        ArcStart => {
-            p.circle(8.0, 8.0, 5.5);
-            p.line(8.0, 8.0, 13.5, 8.0);
-            p.dot(13.5, 8.0, 1.6);
-        }
-        ArcSweep => {
-            let mut wedge = vec![(8.0, 8.0)];
-            wedge.extend(arc_pts(8.0, 8.0, 5.5, 0.0, 1.5 * PI));
-            p.path(&wedge, true);
-        }
-        ArcRatio => {
-            p.circle(8.0, 8.0, 5.5);
-            p.circle(8.0, 8.0, 2.5);
-        }
-        GamutWarning => {
-            p.poly(&[(8.0, 2.0), (14.5, 13.5), (1.5, 13.5)], true);
-            p.line(8.0, 6.0, 8.0, 9.5);
-            p.dot(8.0, 11.5, 0.9);
-        }
-        Logo => {
-            // FigCraft's own mark: the curled tail of the chameleon on the app icon. One bold
-            // stroke: a shaft along the bottom, then three half turns, each tighter than the last.
-            let mut tail = vec![(13.75, 13.0)];
-            tail.extend(arc_pts(7.25, 8.0, 5.0, FRAC_PI_2, 3.0 * FRAC_PI_2));
-            tail.extend(arc_pts(7.25, 6.5, 3.5, 3.0 * FRAC_PI_2, 5.0 * FRAC_PI_2));
-            tail.extend(arc_pts(7.25, 8.25, 1.75, FRAC_PI_2, 3.0 * FRAC_PI_2));
-            let v: Vec<Pos2> = tail.iter().map(|&(x, y)| p.raw(x, y)).collect();
-            p.painter.add(Shape::line(v, Stroke::new(1.7 * p.s, p.color)));
-            p.dot(13.75, 13.0, 0.85);
-            p.dot(7.25, 6.5, 0.85);
-        }
-    }
-}
-
 /// Allocate a square icon button; returns the response. `active` paints the selected look.
 pub fn button(ui: &mut egui::Ui, icon: Icon, size: f32, active: bool, tooltip: &str) -> egui::Response {
     let t = crate::theme::Tokens::get(ui.ctx());
@@ -1113,10 +305,19 @@ pub fn button(ui: &mut egui::Ui, icon: Icon, size: f32, active: bool, tooltip: &
     resp
 }
 
+/// The mark of a file of `kind` on tabs and file rows: a pen nib for design files, a sticky note
+/// for boards.
+pub fn file_mark(kind: figcraft_doc::FileKind) -> Icon {
+    match kind {
+        figcraft_doc::FileKind::Design => Icon::PenNib,
+        figcraft_doc::FileKind::Board => Icon::Board,
+    }
+}
+
 /// Every icon at the sizes the UI uses, labelled: for reviewing the set (`ui.set {iconGallery}`).
 pub fn gallery(ctx: &egui::Context) {
     let t = crate::theme::Tokens::get(ctx);
-    egui::Area::new(egui::Id::new("icon_gallery")).order(egui::Order::Foreground).fixed_pos(Pos2::ZERO).show(ctx, |ui| {
+    egui::Area::new(egui::Id::unique("icon_gallery")).order(egui::Order::Foreground).fixed_pos(Pos2::ZERO).show(ctx, |ui| {
         let screen = ctx.content_rect();
         let (r, _) = ui.allocate_exact_size(screen.size(), egui::Sense::click());
         ui.painter().rect_filled(r, 0.0, t.panel);
@@ -1181,4 +382,111 @@ mod tests {
         assert_eq!(triangulate(&rev).len(), (arrow.len() - 2) * 3);
         assert!(triangulate(&arrow[..2]).is_empty());
     }
+
+    /// The points painted inside `area`, relative to the top left of what's painted there (in
+    /// quarter points), so the same icon gives the same marks wherever its field puts it.
+    fn marks(shapes: &[egui::epaint::ClippedShape], area: Rect) -> Vec<(i32, i32)> {
+        fn walk(shape: &Shape, out: &mut Vec<Pos2>) {
+            match shape {
+                Shape::Vec(v) => v.iter().for_each(|s| walk(s, out)),
+                Shape::LineSegment { points, .. } => out.extend(points),
+                Shape::Path(p) => out.extend(&p.points),
+                Shape::Circle(c) => out.push(c.center),
+                _ => {}
+            }
+        }
+        let mut pts = Vec::new();
+        shapes.iter().for_each(|c| walk(&c.shape, &mut pts));
+        pts.retain(|p| area.contains(*p));
+        let x0 = pts.iter().map(|p| p.x).fold(f32::INFINITY, f32::min);
+        let y0 = pts.iter().map(|p| p.y).fold(f32::INFINITY, f32::min);
+        let mut out: Vec<(i32, i32)> = pts.into_iter().map(|p| (((p.x - x0) * 4.0).round() as i32, ((p.y - y0) * 4.0).round() as i32)).collect();
+        out.sort_unstable();
+        out.dedup();
+        out
+    }
+
+    /// The Design panel's Rotation field shows an icon of its own, not Corner radius's (#256).
+    #[test]
+    fn rotation_and_corner_radius_fields_show_different_icons() {
+        let mut s = figcraft_engine::Session::new();
+        let r = s.execute("shape.rectangle", &serde_json::json!({"x": 0, "y": 0, "width": 100, "height": 80})).unwrap()["id"].clone();
+        s.execute("select.set", &serde_json::json!({"ids": [r]})).unwrap();
+        let mut u = crate::layers_drag_tests::Ui::new(s);
+        u.frame(vec![]);
+        let shapes = u.frame_output(vec![]).shapes;
+        let lead = |name: &str| u.ctx.read_response(egui::Id::unique(name).with("lead")).map(|r| r.rect).unwrap_or_else(|| panic!("{name} is shown"));
+        let (rotation, radius) = (marks(&shapes, lead("pos_rot")), marks(&shapes, lead("ap_rad")));
+        assert!(!rotation.is_empty() && !radius.is_empty(), "both draw an icon");
+        assert_ne!(rotation, radius);
+    }
+
+    /// The shapes `icon` paints in a 32-point box at the origin: two points per grid unit.
+    fn shapes_at_32(icon: Icon) -> Vec<Shape> {
+        let ctx = egui::Context::default();
+        let mut out =
+            ctx.run_ui(egui::RawInput::default(), |ui| paint(ui.painter(), Rect::from_min_size(Pos2::ZERO, Vec2::splat(32.0)), icon, Color32::WHITE));
+        out.textures_delta.clear();
+        out.shapes.into_iter().map(|c| c.shape).collect()
+    }
+
+    /// Frame and Text stay a grid unit inside the box, so their long hinted strokes don't
+    /// outweigh the outlines beside them in the toolbar (#737).
+    #[test]
+    fn frame_and_text_marks_are_inset() {
+        for icon in [Icon::Frame, Icon::Text] {
+            let pts: Vec<Pos2> = shapes_at_32(icon)
+                .iter()
+                .flat_map(|s| match s {
+                    Shape::LineSegment { points, .. } => points.to_vec(),
+                    other => panic!("{icon:?} draws straight strokes only: {other:?}"),
+                })
+                .collect();
+            assert!(!pts.is_empty());
+            for p in pts {
+                // Grid units 3..13, two points each.
+                assert!((6.0..=26.0).contains(&p.x) && (6.0..=26.0).contains(&p.y), "{icon:?} reaches {p:?}");
+            }
+        }
+    }
+
+    /// Slice is one knife (#739): an outlined blade and a solid handle that covers the middle of
+    /// the blade's base, so the two read as one mark rather than separate pieces.
+    #[test]
+    fn slice_is_one_connected_knife() {
+        let shapes = shapes_at_32(Icon::Slice);
+        let paths: Vec<_> = shapes
+            .iter()
+            .map(|s| match s {
+                Shape::Path(p) => p,
+                other => panic!("Slice draws paths only: {other:?}"),
+            })
+            .collect();
+        let blade = paths.iter().find(|p| p.closed && p.fill == Color32::TRANSPARENT).expect("an outlined blade");
+        let handle = paths.iter().find(|p| p.fill != Color32::TRANSPARENT).expect("a solid handle");
+        assert_eq!((paths.len(), blade.points.len()), (2, 3), "a blade and a handle, nothing else");
+        // The blade's base runs between its second and third points; the handle is convex.
+        let base = blade.points[1] + (blade.points[2] - blade.points[1]) / 2.0;
+        let h = &handle.points;
+        let side = |i: usize| {
+            let (a, b) = (h[i], h[(i + 1) % h.len()]);
+            (b - a).x * (base - a).y - (b - a).y * (base - a).x
+        };
+        let inside = (0..h.len()).all(|i| side(i) >= 0.0) || (0..h.len()).all(|i| side(i) <= 0.0);
+        assert!(inside, "the handle covers the blade's base at {base:?}");
+    }
+
+    /// Each corner's icon shows its own corner: no two of the four draw alike.
+    #[test]
+    fn corner_icons_differ() {
+        let drawn: Vec<String> = [Icon::CornerTopLeft, Icon::CornerTopRight, Icon::CornerBottomRight, Icon::CornerBottomLeft]
+            .iter()
+            .map(|&icon| format!("{:?}", shapes_at_32(icon)))
+            .collect();
+        for (i, a) in drawn.iter().enumerate() {
+            for b in &drawn[i + 1..] {
+                assert_ne!(a, b);
+            }
+        }
+    }
 }
diff --git a/crates/ui-egui/src/icons/draw.rs b/crates/ui-egui/src/icons/draw.rs
new file mode 100644
index 00000000..1d088c91
--- /dev/null
+++ b/crates/ui-egui/src/icons/draw.rs
@@ -0,0 +1,1038 @@
+use super::*;
+
+struct P<'a> {
+    painter: &'a Painter,
+    o: Pos2,
+    s: f32,
+    /// One physical pixel, in points.
+    px: f32,
+    stroke: Stroke,
+    color: Color32,
+}
+
+impl P<'_> {
+    fn raw(&self, x: f32, y: f32) -> Pos2 {
+        pos2(self.o.x + x * self.s, self.o.y + y * self.s)
+    }
+    /// A stroke coordinate on the pixel grid: centred on a pixel for odd widths, on an edge for even.
+    fn snap_c(&self, v: f32) -> f32 {
+        let odd = (self.stroke.width / self.px).round() as i32 % 2 == 1;
+        let off = if odd { 0.5 } else { 0.0 };
+        ((v / self.px - off).round() + off) * self.px
+    }
+    /// A fill edge on the pixel grid.
+    fn snap_e(&self, v: f32) -> f32 {
+        (v / self.px).round() * self.px
+    }
+    /// A hinted stroke vertex.
+    fn sp(&self, x: f32, y: f32) -> Pos2 {
+        let q = self.raw(x, y);
+        pos2(self.snap_c(q.x), self.snap_c(q.y))
+    }
+    /// A straight stroke; axis-aligned ones are hinted (crossways onto pixel centres, lengthways
+    /// onto pixel edges so they end sharp).
+    fn line(&self, x0: f32, y0: f32, x1: f32, y1: f32) {
+        let (a, b) = (self.raw(x0, y0), self.raw(x1, y1));
+        let (a, b) = if y0 == y1 {
+            let y = self.snap_c(a.y);
+            (pos2(self.snap_e(a.x), y), pos2(self.snap_e(b.x), y))
+        } else if x0 == x1 {
+            let x = self.snap_c(a.x);
+            (pos2(x, self.snap_e(a.y)), pos2(x, self.snap_e(b.y)))
+        } else {
+            (a, b)
+        };
+        self.painter.line_segment([a, b], self.stroke);
+    }
+    /// A polyline of straight segments through hinted vertices.
+    fn poly(&self, pts: &[(f32, f32)], closed: bool) {
+        let v: Vec<Pos2> = pts.iter().map(|&(x, y)| self.sp(x, y)).collect();
+        self.stroke_pts(v, closed);
+    }
+    /// A path with curves (arcs, capsules): drawn as given, unhinted.
+    fn path(&self, pts: &[(f32, f32)], closed: bool) {
+        let v: Vec<Pos2> = pts.iter().map(|&(x, y)| self.raw(x, y)).collect();
+        self.stroke_pts(v, closed);
+    }
+    fn stroke_pts(&self, v: Vec<Pos2>, closed: bool) {
+        if closed {
+            self.painter.add(Shape::closed_line(v, self.stroke));
+        } else {
+            self.painter.add(Shape::line(v, self.stroke));
+        }
+    }
+    /// A filled polygon, convex or not.
+    fn fill(&self, pts: &[(f32, f32)]) {
+        let v: Vec<Pos2> = pts.iter().map(|&(x, y)| self.raw(x, y)).collect();
+        let n = v.len();
+        let turn = |i: usize| {
+            let (a, b, c) = (v[i], v[(i + 1) % n], v[(i + 2) % n]);
+            (b - a).x * (c - b).y - (b - a).y * (c - b).x
+        };
+        let convex = n >= 3 && ((0..n).all(|i| turn(i) >= 0.0) || (0..n).all(|i| turn(i) <= 0.0));
+        if convex {
+            self.painter.add(Shape::convex_polygon(v, self.color, Stroke::NONE));
+            return;
+        }
+        let indices = triangulate(&v);
+        if !indices.is_empty() {
+            let mut mesh = Mesh::default();
+            for p in &v {
+                mesh.colored_vertex(*p, self.color);
+            }
+            mesh.indices = indices;
+            self.painter.add(Shape::mesh(mesh));
+        }
+        // A hairline around the mesh gives it the same soft edge as the convex fills.
+        self.painter.add(Shape::closed_line(v, Stroke::new(self.px, self.color)));
+    }
+    /// Triangles `tris` over `verts` (x, y, alpha): the colour fades between the vertices.
+    fn shade(&self, verts: &[(f32, f32, f32)], tris: &[u32]) {
+        let mut mesh = Mesh::default();
+        for &(x, y, a) in verts {
+            mesh.colored_vertex(self.raw(x, y), self.color.gamma_multiply(a));
+        }
+        mesh.indices = tris.to_vec();
+        self.painter.add(Shape::mesh(mesh));
+    }
+    /// A disc of radius `r` at the centre, as a fan from the top, clockwise: each slice's rim
+    /// alphas from `rim` and its centre's from `centre`, both of how far round it is (0..1).
+    fn shade_fan(&self, r: f32, centre: impl Fn(f32) -> f32, rim: impl Fn(f32) -> f32) {
+        const SLICES: u32 = 32;
+        let at = |t: f32| {
+            let a = -FRAC_PI_2 + t * TAU;
+            (8.0 + r * a.cos(), 8.0 + r * a.sin())
+        };
+        let mut verts = Vec::new();
+        for i in 0..SLICES {
+            let (t0, t1) = (i as f32 / SLICES as f32, (i + 1) as f32 / SLICES as f32);
+            let ((x0, y0), (x1, y1)) = (at(t0), at(t1));
+            verts.extend([(8.0, 8.0, centre((t0 + t1) / 2.0)), (x0, y0, rim(t0)), (x1, y1, rim(t1))]);
+        }
+        let tris: Vec<u32> = (0..SLICES * 3).collect();
+        self.shade(&verts, &tris);
+    }
+    fn rect(&self, x0: f32, y0: f32, x1: f32, y1: f32, r: f32) {
+        let rr = Rect::from_min_max(self.sp(x0, y0), self.sp(x1, y1));
+        self.painter.rect_stroke(rr, egui::CornerRadius::same((r * self.s).round() as u8), self.stroke, egui::StrokeKind::Middle);
+    }
+    fn fill_rect(&self, x0: f32, y0: f32, x1: f32, y1: f32, r: f32) {
+        let (a, b) = (self.raw(x0, y0), self.raw(x1, y1));
+        let rr = Rect::from_min_max(pos2(self.snap_e(a.x), self.snap_e(a.y)), pos2(self.snap_e(b.x), self.snap_e(b.y)));
+        self.painter.rect_filled(rr, egui::CornerRadius::same((r * self.s).round() as u8), self.color);
+    }
+    fn circle(&self, x: f32, y: f32, r: f32) {
+        self.painter.circle_stroke(self.raw(x, y), r * self.s, self.stroke);
+    }
+    fn dot(&self, x: f32, y: f32, r: f32) {
+        self.painter.circle_filled(self.raw(x, y), r * self.s, self.color);
+    }
+    fn arc(&self, cx: f32, cy: f32, r: f32, a0: f32, a1: f32) {
+        self.path(&arc_pts(cx, cy, r, a0, a1).collect::<Vec<_>>(), false);
+    }
+    /// An open arrowhead at `tip` pointing along angle `dir`, arms `len` long.
+    fn head(&self, tip: (f32, f32), dir: f32, len: f32) {
+        let arm = |a: f32| (tip.0 + len * a.cos(), tip.1 + len * a.sin());
+        self.path(&[arm(dir + PI - FRAC_PI_4), tip, arm(dir + PI + FRAC_PI_4)], false);
+    }
+    /// An arc with an arrowhead at its end, pointing the way it runs.
+    fn arc_arrow(&self, cx: f32, cy: f32, r: f32, a0: f32, a1: f32) {
+        self.arc(cx, cy, r, a0, a1);
+        let tip = (cx + r * a1.cos(), cy + r * a1.sin());
+        let dir = a1 + if a1 > a0 { FRAC_PI_2 } else { -FRAC_PI_2 };
+        self.head(tip, dir, 2.6);
+    }
+    /// A rounded corner mark: an L at (`x`, `y`) opening towards (`dx`, `dy`), `len` long.
+    fn corner(&self, x: f32, y: f32, dx: f32, dy: f32, len: f32, r: f32) {
+        let a0 = 0.0f32.atan2(-dx);
+        let mut a1 = (-dy).atan2(0.0);
+        if a1 - a0 > PI {
+            a1 -= TAU;
+        } else if a0 - a1 > PI {
+            a1 += TAU;
+        }
+        let mut c = vec![(x, y + len * dy)];
+        c.extend(arc_pts(x + r * dx, y + r * dy, r, a0, a1));
+        c.push((x + len * dx, y));
+        self.path(&c, false);
+    }
+    /// Short dashes along the outline of a box (`n` per side).
+    fn dashed_box(&self, x0: f32, y0: f32, x1: f32, y1: f32, n: usize) {
+        let seg = |a: f32, b: f32, i: usize| {
+            let step = (b - a) / (2 * n - 1) as f32;
+            (a + 2.0 * i as f32 * step, a + (2 * i + 1) as f32 * step)
+        };
+        for i in 0..n {
+            let (a, b) = seg(x0 - 0.5, x1 + 0.5, i);
+            self.line(a, y0, b, y0);
+            self.line(a, y1, b, y1);
+            let (a, b) = seg(y0 - 0.5, y1 + 0.5, i);
+            self.line(x0, a, x0, b);
+            self.line(x1, a, x1, b);
+        }
+    }
+}
+
+/// Paint `icon` centred in `rect` (a 16-unit glyph scaled to fit) in `color`.
+pub fn paint(painter: &Painter, rect: Rect, icon: Icon, color: Color32) {
+    let ppp = painter.ctx().pixels_per_point();
+    let px = 1.0 / ppp;
+    // Physical pixels per grid unit: whole steps from 16 px up (quarter steps on fractional
+    // display scales), the exact fit below.
+    let k = rect.width().min(rect.height()) * ppp / 16.0;
+    let k = if k >= 1.0 { (k * 4.0).floor() / 4.0 } else { k };
+    let s = k * px;
+    let snap = |v: f32| (v * ppp).round() * px;
+    let o = rect.center() - vec2(8.0 * s, 8.0 * s);
+    let o = pos2(snap(o.x), snap(o.y));
+    let w = (k * 0.9).round().max(1.0) * px;
+    let p = P { painter, o, s, px, stroke: Stroke::new(w, color), color };
+    draw(&p, icon);
+}
+
+/// Draw `icon` on the 16-unit grid through `p`, which maps grid units to the target box.
+fn draw(p: &P, icon: Icon) {
+    use Icon::*;
+    match icon {
+        Move => p.fill(&[(4.0, 2.0), (4.0, 13.6), (6.9, 10.9), (8.8, 14.8), (10.6, 14.0), (8.7, 10.2), (12.6, 10.2)]),
+        Scale => {
+            p.rect(2.5, 7.5, 8.5, 13.5, 0.0);
+            p.line(6.0, 10.0, 13.0, 3.0);
+            p.poly(&[(9.5, 2.5), (13.5, 2.5), (13.5, 6.5)], false);
+        }
+        Hand => {
+            // An open hand: four fingers (the middle one tallest), then the palm and the thumb.
+            for (x, top) in [(4.5, 5.0), (6.5, 3.5), (8.5, 4.0), (10.5, 5.5)] {
+                let mut f = vec![(x, 8.0)];
+                f.extend(arc_pts(x + 1.0, top, 1.0, PI, TAU));
+                f.push((x + 2.0, 8.0));
+                p.path(&f, false);
+            }
+            let mut h = vec![(12.5, 8.0), (12.5, 10.0)];
+            h.extend(arc_pts(9.5, 10.0, 3.0, 0.0, FRAC_PI_2));
+            h.extend([(8.0, 13.0), (3.0, 9.4)]);
+            h.extend(arc_pts(3.6, 8.6, 1.0, 2.2, 5.3));
+            h.push((4.5, 8.5));
+            p.path(&h, false);
+        }
+        Frame => {
+            // Inset a unit from the box: four long hinted strokes read heavier than the
+            // anti-aliased outlines beside them at full size (#737).
+            p.line(5.5, 3.0, 5.5, 13.0);
+            p.line(10.5, 3.0, 10.5, 13.0);
+            p.line(3.0, 5.5, 13.0, 5.5);
+            p.line(3.0, 10.5, 13.0, 10.5);
+        }
+        Section | Section2 => {
+            p.rect(2.5, 5.5, 13.5, 13.5, 1.0);
+            p.fill_rect(2.0, 2.0, 9.0, 6.0, 1.0);
+        }
+        Slice => {
+            // A knife, one silhouette (#739): a slim blade to the top right, outlined like the
+            // rest of the row, and a solid handle whose end overlaps the blade's base so the two
+            // join at every size.
+            p.poly(&[(13.5, 2.5), (5.0, 8.0), (8.0, 11.0)], true);
+            p.fill(&capsule((2.8, 13.2), (5.9, 10.1), 1.3));
+        }
+        Bend => {
+            // A curve with a smooth point and its handle line.
+            let pts: Vec<(f32, f32)> = (0..=16)
+                .map(|i| {
+                    let t = i as f32 / 16.0;
+                    let u = 1.0 - t;
+                    (u * u * 2.5 + 2.0 * u * t * 8.0 + t * t * 13.5, u * u * 13.5 + 2.0 * u * t * 1.5 + t * t * 13.5)
+                })
+                .collect();
+            p.path(&pts, false);
+            p.line(3.0, 7.5, 13.0, 7.5);
+            p.dot(3.0, 7.5, 1.3);
+            p.dot(13.0, 7.5, 1.3);
+            p.fill_rect(7.0, 6.0, 9.0, 9.0, 0.0);
+        }
+        PaintBucket => {
+            p.poly(&[(2.5, 8.0), (7.5, 3.0), (12.5, 8.0), (7.5, 13.0)], true);
+            p.fill(&[(2.5, 8.0), (12.5, 8.0), (7.5, 13.0)]);
+            p.line(7.5, 3.0, 5.0, 0.5);
+            p.dot(13.5, 11.5, 1.5);
+        }
+        Lasso => {
+            p.path(&arc_pts(8.5, 6.5, 5.0, 0.0, TAU).map(|(x, y)| (x, 6.5 + (y - 6.5) * 0.7)).collect::<Vec<_>>(), true);
+            p.path(&[(5.0, 9.3), (4.5, 11.5), (6.0, 12.5), (4.5, 14.5)], false);
+        }
+        Cut => {
+            p.circle(4.5, 11.5, 2.0);
+            p.circle(11.5, 11.5, 2.0);
+            p.line(6.0, 10.0, 11.5, 2.5);
+            p.line(10.0, 10.0, 4.5, 2.5);
+        }
+        Rectangle => p.rect(2.5, 2.5, 13.5, 13.5, 1.0),
+        Line => p.line(2.5, 13.5, 13.5, 2.5),
+        Arrow => {
+            p.line(2.5, 13.5, 13.0, 3.0);
+            p.poly(&[(7.5, 2.5), (13.5, 2.5), (13.5, 8.5)], false);
+        }
+        Ellipse => p.circle(8.0, 8.0, 5.5),
+        Polygon => p.poly(&[(8.0, 2.5), (13.5, 12.5), (2.5, 12.5)], true),
+        Star => {
+            let pts: Vec<(f32, f32)> = (0..10)
+                .map(|i| {
+                    let a = -FRAC_PI_2 + PI * i as f32 / 5.0;
+                    let r = if i % 2 == 0 { 6.0 } else { 2.7 };
+                    (8.0 + r * a.cos(), 8.6 + r * a.sin())
+                })
+                .collect();
+            p.path(&pts, true);
+        }
+        Image => {
+            p.rect(2.5, 3.5, 13.5, 12.5, 1.0);
+            p.poly(&[(2.5, 11.5), (6.0, 8.0), (9.0, 11.0), (10.5, 9.5), (13.5, 12.5)], false);
+            p.dot(10.5, 6.5, 1.1);
+        }
+        Pen => {
+            p.poly(&[(8.0, 2.0), (12.5, 8.5), (10.5, 13.5), (5.5, 13.5), (3.5, 8.5)], true);
+            p.line(8.0, 2.0, 8.0, 7.0);
+            p.dot(8.0, 8.8, 1.2);
+        }
+        Pencil => {
+            p.poly(&[(2.5, 13.5), (3.2, 10.3), (10.5, 3.0), (13.0, 5.5), (5.7, 12.8)], true);
+            p.line(9.0, 4.5, 11.5, 7.0);
+        }
+        Text => {
+            // Inset like the Frame mark, so its long strokes don't outweigh the outlines (#737).
+            p.line(3.0, 3.5, 12.0, 3.5);
+            p.line(7.5, 3.0, 7.5, 12.5);
+            p.line(3.5, 3.0, 3.5, 5.5);
+            p.line(11.5, 3.0, 11.5, 5.5);
+            p.line(5.5, 12.5, 9.5, 12.5);
+        }
+        TextOnPath => {
+            // A small T above the curve it follows.
+            p.line(4.5, 3.0, 11.5, 3.0);
+            p.line(8.0, 3.0, 8.0, 8.5);
+            p.poly(&[(2.0, 13.5), (5.0, 11.5), (8.0, 10.8), (11.0, 11.5), (14.0, 13.5)], false);
+        }
+        Comment => {
+            let mut b: Vec<(f32, f32)> = arc_pts(8.5, 7.5, 5.0, 2.75, TAU + 1.95).collect();
+            b.push((2.5, 13.5));
+            p.path(&b, true);
+        }
+        Actions => p.poly(&[(9.0, 2.0), (3.5, 9.0), (7.5, 9.0), (6.5, 14.0), (12.5, 7.0), (8.5, 7.0)], true),
+        Chevron => p.poly(&[(4.5, 6.0), (8.0, 9.5), (11.5, 6.0)], false),
+        ChevronUp => p.poly(&[(4.5, 10.0), (8.0, 6.5), (11.5, 10.0)], false),
+        ChevronRight => p.poly(&[(6.0, 4.5), (9.5, 8.0), (6.0, 11.5)], false),
+        ChevronLeft => p.poly(&[(10.0, 4.5), (6.5, 8.0), (10.0, 11.5)], false),
+        Plus => {
+            p.line(7.5, 2.0, 7.5, 13.0);
+            p.line(2.0, 7.5, 13.0, 7.5);
+        }
+        Minus => p.line(2.0, 7.5, 13.0, 7.5),
+        Eye | EyeOff => {
+            // An almond (two arcs meeting at the corners) with the pupil.
+            let (r, cy, half) = (7.0f32, 7.5f32, 5.5f32);
+            let a = (half / r).asin();
+            let d = r * a.cos();
+            let mut e: Vec<(f32, f32)> = arc_pts(8.0, cy + d, r, -FRAC_PI_2 - a, -FRAC_PI_2 + a).collect();
+            e.extend(arc_pts(8.0, cy - d, r, FRAC_PI_2 - a, FRAC_PI_2 + a));
+            p.path(&e, true);
+            if icon == Eye {
+                p.circle(8.0, cy, 2.0);
+            } else {
+                p.line(3.0, 13.0, 13.0, 2.0);
+            }
+        }
+        Lock | Unlock => {
+            p.rect(3.5, 7.5, 12.5, 13.5, 1.0);
+            p.dot(8.0, 10.5, 1.0);
+            if icon == Lock {
+                p.line(5.5, 7.5, 5.5, 5.5);
+                p.line(10.5, 7.5, 10.5, 5.5);
+                p.arc(8.0, 5.5, 2.5, PI, TAU);
+            } else {
+                p.line(10.5, 7.5, 10.5, 4.5);
+                p.arc(13.0, 4.5, 2.5, PI, TAU);
+            }
+        }
+        Component => {
+            for (cx, cy) in [(8.0, 4.2), (11.8, 8.0), (8.0, 11.8), (4.2, 8.0)] {
+                p.fill(&[(cx, cy - 2.5), (cx + 2.5, cy), (cx, cy + 2.5), (cx - 2.5, cy)]);
+            }
+        }
+        ComponentSet => {
+            for (cx, cy) in [(8.0, 4.3), (11.7, 8.0), (8.0, 11.7), (4.3, 8.0)] {
+                p.path(&[(cx, cy - 2.2), (cx + 2.2, cy), (cx, cy + 2.2), (cx - 2.2, cy)], true);
+            }
+        }
+        Instance => p.path(&[(8.0, 2.0), (14.0, 8.0), (8.0, 14.0), (2.0, 8.0)], true),
+        Group => {
+            for (x, y, dx, dy) in [(2.5, 2.5, 1.0, 1.0), (13.5, 2.5, -1.0, 1.0), (2.5, 13.5, 1.0, -1.0), (13.5, 13.5, -1.0, -1.0)] {
+                p.poly(&[(x + 3.5 * dx, y), (x, y), (x, y + 3.5 * dy)], false);
+            }
+        }
+        Vector => {
+            p.path(&[(3.0, 12.5), (6.0, 4.0), (10.0, 12.0), (13.0, 3.5)], false);
+            p.fill_rect(1.5, 11.0, 4.5, 14.0, 0.0);
+            p.fill_rect(11.5, 2.0, 14.5, 5.0, 0.0);
+        }
+        Boolean | Union => {
+            p.rect(2.5, 2.5, 9.5, 9.5, 0.0);
+            p.rect(6.5, 6.5, 13.5, 13.5, 0.0);
+        }
+        Subtract => {
+            p.fill_rect(2.0, 2.0, 10.0, 10.0, 0.0);
+            p.rect(6.5, 6.5, 13.5, 13.5, 0.0);
+        }
+        Intersect => {
+            p.rect(2.5, 2.5, 9.5, 9.5, 0.0);
+            p.rect(6.5, 6.5, 13.5, 13.5, 0.0);
+            p.fill_rect(6.0, 6.0, 10.0, 10.0, 0.0);
+        }
+        Exclude => {
+            p.fill_rect(2.0, 2.0, 10.0, 6.0, 0.0);
+            p.fill_rect(2.0, 6.0, 6.0, 10.0, 0.0);
+            p.fill_rect(10.0, 6.0, 14.0, 14.0, 0.0);
+            p.fill_rect(6.0, 10.0, 10.0, 14.0, 0.0);
+            p.rect(6.5, 6.5, 9.5, 9.5, 0.0);
+        }
+        Page => {
+            p.poly(&[(3.5, 2.5), (9.5, 2.5), (12.5, 5.5), (12.5, 13.5), (3.5, 13.5)], true);
+            p.poly(&[(9.5, 2.5), (9.5, 5.5), (12.5, 5.5)], false);
+        }
+        Check => p.poly(&[(3.0, 8.5), (6.5, 12.0), (13.0, 4.5)], false),
+        Close => {
+            p.line(4.0, 4.0, 12.0, 12.0);
+            p.line(12.0, 4.0, 4.0, 12.0);
+        }
+        WinMinimize => p.line(3.0, 8.5, 13.0, 8.5),
+        WinMaximize => p.rect(3.5, 3.5, 12.5, 12.5, 0.0),
+        WinRestore => {
+            // A window in front of another.
+            p.rect(3.5, 5.5, 10.5, 12.5, 0.0);
+            p.poly(&[(5.5, 5.5), (5.5, 3.5), (12.5, 3.5), (12.5, 10.5), (10.5, 10.5)], false);
+        }
+        Search => {
+            p.circle(7.0, 7.0, 4.5);
+            p.line(10.5, 10.5, 14.0, 14.0);
+        }
+        Grid | LayoutGrid => {
+            for i in [2.5, 6.5, 10.5] {
+                for j in [2.5, 6.5, 10.5] {
+                    p.rect(i, j, i + 3.0, j + 3.0, 0.0);
+                }
+            }
+        }
+        AlignLeft => {
+            p.line(2.5, 2.0, 2.5, 14.0);
+            p.fill_rect(4.0, 4.0, 13.0, 7.0, 0.0);
+            p.fill_rect(4.0, 9.0, 9.0, 12.0, 0.0);
+        }
+        AlignHCenter => {
+            p.line(7.5, 2.0, 7.5, 14.0);
+            p.fill_rect(2.0, 4.0, 13.0, 7.0, 0.0);
+            p.fill_rect(4.0, 9.0, 11.0, 12.0, 0.0);
+        }
+        AlignRight => {
+            p.line(13.5, 2.0, 13.5, 14.0);
+            p.fill_rect(3.0, 4.0, 12.0, 7.0, 0.0);
+            p.fill_rect(7.0, 9.0, 12.0, 12.0, 0.0);
+        }
+        AlignTop => {
+            p.line(2.0, 2.5, 14.0, 2.5);
+            p.fill_rect(4.0, 4.0, 7.0, 13.0, 0.0);
+            p.fill_rect(9.0, 4.0, 12.0, 9.0, 0.0);
+        }
+        AlignVCenter => {
+            p.line(2.0, 7.5, 14.0, 7.5);
+            p.fill_rect(4.0, 2.0, 7.0, 13.0, 0.0);
+            p.fill_rect(9.0, 4.0, 12.0, 11.0, 0.0);
+        }
+        AlignBottom => {
+            p.line(2.0, 13.5, 14.0, 13.5);
+            p.fill_rect(4.0, 3.0, 7.0, 12.0, 0.0);
+            p.fill_rect(9.0, 7.0, 12.0, 12.0, 0.0);
+        }
+        DistributeH | Gap => {
+            p.line(2.5, 2.0, 2.5, 14.0);
+            p.line(13.5, 2.0, 13.5, 14.0);
+            p.fill_rect(6.0, 4.0, 10.0, 12.0, 0.0);
+        }
+        DistributeV => {
+            p.line(2.0, 2.5, 14.0, 2.5);
+            p.line(2.0, 13.5, 14.0, 13.5);
+            p.fill_rect(4.0, 6.0, 12.0, 10.0, 0.0);
+        }
+        Rotate => p.arc_arrow(8.0, 8.5, 5.0, -PI * 0.55, PI * 1.25),
+        Reset => p.arc_arrow(8.0, 8.5, 5.0, -PI * 0.45, -PI * 2.25),
+        FlipH => {
+            for y in [1.0, 5.0, 9.0, 13.0] {
+                p.line(7.5, y, 7.5, y + 2.0);
+            }
+            p.poly(&[(5.5, 3.5), (5.5, 12.5), (1.5, 12.5)], true);
+            p.fill(&[(9.0, 3.0), (14.0, 13.0), (9.0, 13.0)]);
+        }
+        FlipV => {
+            for x in [1.0, 5.0, 9.0, 13.0] {
+                p.line(x, 7.5, x + 2.0, 7.5);
+            }
+            p.poly(&[(3.5, 5.5), (12.5, 5.5), (12.5, 1.5)], true);
+            p.fill(&[(3.0, 9.0), (13.0, 9.0), (13.0, 14.0)]);
+        }
+        CornerRadius | CornerTopLeft => p.corner(2.5, 2.5, 1.0, 1.0, 11.5, 6.0),
+        CornerTopRight => p.corner(13.5, 2.5, -1.0, 1.0, 11.5, 6.0),
+        CornerBottomRight => p.corner(13.5, 13.5, -1.0, -1.0, 11.5, 6.0),
+        CornerBottomLeft => p.corner(2.5, 13.5, 1.0, -1.0, 11.5, 6.0),
+        Angle => {
+            // Two rays from a vertex, the arc between them marking the angle (all unhinted, so
+            // the arc meets the rays at every size).
+            p.path(&[(13.5, 13.0), (2.5, 13.0), (10.5, 3.0)], false);
+            p.path(&arc_pts(2.5, 13.0, 6.0, (-10.0f32).atan2(8.0), 0.0).collect::<Vec<_>>(), false);
+        }
+        IndependentCorners => {
+            for (x, y, dx, dy) in [(2.5, 2.5, 1.0, 1.0), (13.5, 2.5, -1.0, 1.0), (2.5, 13.5, 1.0, -1.0), (13.5, 13.5, -1.0, -1.0)] {
+                p.corner(x, y, dx, dy, 4.0, 2.0);
+            }
+        }
+        IndependentPadding => {
+            // A frame outline with one inward tick per side: each side's padding, set alone.
+            p.rect(2.5, 2.5, 13.5, 13.5, 2.0);
+            p.line(8.0, 2.5, 8.0, 5.0);
+            p.line(13.5, 8.0, 11.0, 8.0);
+            p.line(8.0, 13.5, 8.0, 11.0);
+            p.line(2.5, 8.0, 5.0, 8.0);
+        }
+        LinkOn | Link => {
+            p.path(&capsule((4.0, 12.0), (6.5, 9.5), 2.4), true);
+            p.path(&capsule((9.5, 6.5), (12.0, 4.0), 2.4), true);
+            p.line(6.2, 9.8, 9.8, 6.2);
+        }
+        LinkOff => {
+            p.path(&capsule((3.5, 12.5), (5.5, 10.5), 2.2), true);
+            p.path(&capsule((10.5, 5.5), (12.5, 3.5), 2.2), true);
+            p.line(9.5, 12.0, 9.5, 14.0);
+            p.line(12.0, 9.5, 14.0, 9.5);
+            p.line(2.0, 6.5, 4.0, 6.5);
+            p.line(6.5, 2.0, 6.5, 4.0);
+        }
+        LayoutH => {
+            p.fill_rect(2.0, 3.0, 7.0, 13.0, 1.0);
+            p.fill_rect(9.0, 3.0, 14.0, 13.0, 1.0);
+        }
+        LayoutV => {
+            p.fill_rect(3.0, 2.0, 13.0, 7.0, 1.0);
+            p.fill_rect(3.0, 9.0, 13.0, 14.0, 1.0);
+        }
+        LayoutWrap => {
+            let mut w = vec![(2.0, 4.5), (10.5, 4.5)];
+            w.extend(arc_pts(10.5, 7.5, 3.0, -FRAC_PI_2, FRAC_PI_2));
+            w.push((4.0, 10.5));
+            p.path(&w, false);
+            p.head((3.5, 10.5), PI, 2.8);
+        }
+        AutoLayout => {
+            p.rect(2.5, 2.5, 13.5, 13.5, 2.0);
+            p.fill_rect(5.0, 5.0, 7.0, 11.0, 0.0);
+            p.fill_rect(9.0, 5.0, 11.0, 11.0, 0.0);
+        }
+        ClipContent => {
+            p.rect(4.5, 4.5, 13.5, 13.5, 0.0);
+            p.line(2.5, 1.0, 2.5, 11.0);
+            p.line(1.0, 2.5, 11.0, 2.5);
+        }
+        Effects | Sun => {
+            p.circle(8.0, 8.0, if icon == Sun { 2.5 } else { 3.0 });
+            for i in 0..8 {
+                let a = i as f32 * FRAC_PI_4;
+                let (r0, r1) = if i % 2 == 0 { (4.8, 6.6) } else { (4.6, 5.8) };
+                p.line(8.0 + r0 * a.cos(), 8.0 + r0 * a.sin(), 8.0 + r1 * a.cos(), 8.0 + r1 * a.sin());
+            }
+        }
+        Styles => {
+            for (x, y) in [(5.0, 5.0), (11.0, 5.0), (5.0, 11.0), (11.0, 11.0)] {
+                p.dot(x, y, 2.2);
+            }
+        }
+        Menu => {
+            for y in [3.5, 7.5, 11.5] {
+                p.line(2.0, y, 14.0, y);
+            }
+        }
+        Play => p.fill(&[(4.5, 2.5), (13.5, 8.0), (4.5, 13.5)]),
+        Home => {
+            // Unhinted so the roof's peak stays centred; the floor stops at the door.
+            p.path(&[(6.5, 13.5), (3.5, 13.5), (3.5, 7.0), (8.0, 2.8), (12.5, 7.0), (12.5, 13.5), (9.5, 13.5)], false);
+            p.poly(&[(6.5, 13.5), (6.5, 9.5), (9.5, 9.5), (9.5, 13.5)], false);
+        }
+        Bell => {
+            let mut b = vec![(2.5, 11.5), (4.0, 10.0), (4.0, 7.0)];
+            b.extend(arc_pts(8.0, 7.0, 4.0, PI, TAU));
+            b.extend([(12.0, 10.0), (13.5, 11.5)]);
+            p.path(&b, true);
+            p.arc(8.0, 12.0, 1.8, 0.0, PI);
+        }
+        Panels => {
+            p.rect(2.5, 3.5, 13.5, 12.5, 1.0);
+            p.line(5.5, 4.0, 5.5, 12.0);
+            p.line(10.5, 4.0, 10.5, 12.0);
+        }
+        Help => {
+            p.circle(8.0, 8.0, 6.0);
+            p.arc(8.0, 6.4, 2.0, PI * 1.05, TAU + 0.7);
+            p.path(&[(9.5, 7.7), (8.0, 8.8), (8.0, 9.8)], false);
+            p.dot(8.0, 11.6, 0.9);
+        }
+        Dots => {
+            for x in [3.5, 8.0, 12.5] {
+                p.dot(x, 8.0, 1.25);
+            }
+        }
+        Mask | Opacity => {
+            p.circle(8.0, 8.0, 5.5);
+            let side = if icon == Mask { -FRAC_PI_2 } else { FRAC_PI_2 };
+            p.fill(&arc_pts(8.0, 8.0, 5.5, side, side + PI).collect::<Vec<_>>());
+        }
+        TextAlignLeft => {
+            for (y, x1) in [(3.5, 14.0), (6.5, 10.0), (9.5, 14.0), (12.5, 9.0)] {
+                p.line(2.0, y, x1, y);
+            }
+        }
+        TextAlignCenter => {
+            for (y, h) in [(3.5, 6.0), (6.5, 4.0), (9.5, 6.0), (12.5, 3.0)] {
+                p.line(8.0 - h, y, 8.0 + h, y);
+            }
+        }
+        TextAlignRight => {
+            for (y, x0) in [(3.5, 2.0), (6.5, 6.0), (9.5, 2.0), (12.5, 7.0)] {
+                p.line(x0, y, 14.0, y);
+            }
+        }
+        TextAlignJustify => {
+            for y in [3.5, 6.5, 9.5, 12.5] {
+                p.line(2.0, y, 14.0, y);
+            }
+        }
+        TextTop => {
+            p.line(2.0, 2.5, 14.0, 2.5);
+            p.line(7.5, 5.0, 7.5, 14.0);
+            p.head((7.5, 5.0), -FRAC_PI_2, 3.2);
+        }
+        TextMiddle => {
+            p.line(2.0, 7.5, 14.0, 7.5);
+            p.line(7.5, 1.0, 7.5, 5.0);
+            p.head((7.5, 5.0), FRAC_PI_2, 2.6);
+            p.line(7.5, 10.0, 7.5, 14.0);
+            p.head((7.5, 10.0), -FRAC_PI_2, 2.6);
+        }
+        TextBottom => {
+            p.line(2.0, 13.5, 14.0, 13.5);
+            p.line(7.5, 2.0, 7.5, 11.0);
+            p.head((7.5, 11.0), FRAC_PI_2, 3.2);
+        }
+        Eyedropper => {
+            p.poly(&[(2.5, 13.5), (3.0, 11.0), (8.5, 5.5), (10.5, 7.5), (5.0, 13.0)], true);
+            p.path(&capsule((10.5, 5.5), (12.0, 4.0), 1.6), true);
+            p.line(7.5, 4.5, 11.5, 8.5);
+        }
+        Code => {
+            p.poly(&[(5.5, 4.0), (2.0, 8.0), (5.5, 12.0)], false);
+            p.poly(&[(10.5, 4.0), (14.0, 8.0), (10.5, 12.0)], false);
+            p.line(9.0, 3.0, 7.0, 13.0);
+        }
+        Assets => {
+            p.path(&[(5.0, 2.0), (8.0, 5.0), (5.0, 8.0), (2.0, 5.0)], true);
+            p.circle(11.0, 5.0, 2.5);
+            p.rect(2.5, 9.5, 7.5, 13.5, 0.0);
+            p.poly(&[(11.0, 9.0), (13.5, 13.5), (8.5, 13.5)], true);
+        }
+        Library => {
+            p.poly(&[(7.5, 4.5), (5.5, 3.5), (1.5, 3.5), (1.5, 12.5), (5.5, 12.5), (7.5, 13.5)], false);
+            p.poly(&[(8.5, 4.5), (10.5, 3.5), (14.5, 3.5), (14.5, 12.5), (10.5, 12.5), (8.5, 13.5)], false);
+            p.line(7.5, 4.5, 7.5, 13.5);
+            p.line(8.5, 4.5, 8.5, 13.5);
+        }
+        Layers => {
+            p.poly(&[(8.0, 2.5), (14.0, 5.5), (8.0, 8.5), (2.0, 5.5)], true);
+            p.poly(&[(2.0, 8.0), (8.0, 11.0), (14.0, 8.0)], false);
+            p.poly(&[(2.0, 10.5), (8.0, 13.5), (14.0, 10.5)], false);
+        }
+        Blend => {
+            p.circle(6.0, 8.0, 4.0);
+            p.circle(10.0, 8.0, 4.0);
+        }
+        Export => {
+            p.line(7.5, 2.0, 7.5, 10.0);
+            p.head((7.5, 2.0), -FRAC_PI_2, 3.5);
+            p.poly(&[(2.5, 8.5), (2.5, 13.5), (12.5, 13.5), (12.5, 8.5)], false);
+        }
+        StrokeIcon => p.rect(2.5, 2.5, 13.5, 13.5, 2.0),
+        Fill => p.fill_rect(2.0, 2.0, 14.0, 14.0, 2.0),
+        GradientLinear => {
+            p.rect(2.5, 2.5, 13.5, 13.5, 2.0);
+            p.shade(&[(4.0, 4.0, 1.0), (12.0, 4.0, 0.0), (12.0, 12.0, 0.0), (4.0, 12.0, 1.0)], &[0, 1, 2, 0, 2, 3]);
+        }
+        GradientRadial => {
+            p.rect(2.5, 2.5, 13.5, 13.5, 2.0);
+            p.shade_fan(5.5, |_| 1.0, |_| 0.0);
+        }
+        GradientAngular => {
+            // Once round from the top: the seam shows where the sweep starts.
+            p.rect(2.5, 2.5, 13.5, 13.5, 2.0);
+            p.shade_fan(4.0, |t| 1.0 - t, |t| 1.0 - t);
+        }
+        GradientDiamond => {
+            p.rect(2.5, 2.5, 13.5, 13.5, 2.0);
+            let v = [(8.0, 8.0, 1.0), (8.0, 2.5, 0.0), (13.5, 8.0, 0.0), (8.0, 13.5, 0.0), (2.5, 8.0, 0.0)];
+            p.shade(&v, &[0, 1, 2, 0, 2, 3, 0, 3, 4, 0, 4, 1]);
+        }
+        Moon => {
+            // A crescent: the outer rim, then the shadowing circle's edge back. Both arcs stop short
+            // of where the circles meet, so each tip is two blunt joins (a single cusp join folds).
+            let mut m: Vec<(f32, f32)> = arc_pts(8.0, 8.0, 5.5, 0.166 + 0.12, TAU - 1.737 - 0.12).collect();
+            m.extend(arc_pts(11.0, 5.0, 4.6, -2.586 - 0.18, 1.016 - TAU + 0.18));
+            p.path(&m, true);
+        }
+        Undo | Redo => {
+            // A U-turn arrow: back along the top, round, and out along the bottom.
+            let undo = icon == Undo;
+            let f = |x: f32| if undo { x } else { 16.0 - x };
+            let mut u = vec![(f(3.0), 5.5), (f(9.5), 5.5)];
+            let a1 = if undo { FRAC_PI_2 } else { -3.0 * FRAC_PI_2 };
+            u.extend(arc_pts(f(9.5), 9.0, 3.5, -FRAC_PI_2, a1));
+            u.push((f(6.0), 12.5));
+            p.path(&u, false);
+            p.head((f(3.0), 5.5), if undo { PI } else { 0.0 }, 3.0);
+        }
+        Hug => {
+            p.poly(&[(2.5, 4.5), (5.5, 7.5), (2.5, 10.5)], false);
+            p.poly(&[(13.5, 4.5), (10.5, 7.5), (13.5, 10.5)], false);
+            p.line(6.0, 7.5, 10.0, 7.5);
+        }
+        FillContainer => {
+            p.poly(&[(5.0, 4.5), (2.0, 7.5), (5.0, 10.5)], false);
+            p.poly(&[(11.0, 4.5), (14.0, 7.5), (11.0, 10.5)], false);
+            p.line(2.0, 7.5, 14.0, 7.5);
+        }
+        Fixed => {
+            p.line(2.5, 4.0, 2.5, 11.0);
+            p.line(13.5, 4.0, 13.5, 11.0);
+            p.line(3.0, 7.5, 13.0, 7.5);
+        }
+        PaddingH => {
+            // Horizontal padding: bars down the padded left and right sides in their frame.
+            p.rect(2.5, 2.5, 13.5, 13.5, 1.0);
+            p.fill_rect(2.5, 2.5, 5.5, 13.5, 1.0);
+            p.fill_rect(10.5, 2.5, 13.5, 13.5, 1.0);
+        }
+        PaddingV => {
+            // Vertical padding: bars across the padded top and bottom in their frame.
+            p.rect(2.5, 2.5, 13.5, 13.5, 1.0);
+            p.fill_rect(2.5, 2.5, 13.5, 5.5, 1.0);
+            p.fill_rect(2.5, 10.5, 13.5, 13.5, 1.0);
+        }
+        PaddingTop => {
+            p.rect(2.5, 2.5, 13.5, 13.5, 1.0);
+            p.fill_rect(2.5, 2.5, 13.5, 5.5, 1.0);
+        }
+        PaddingRight => {
+            p.rect(2.5, 2.5, 13.5, 13.5, 1.0);
+            p.fill_rect(10.5, 2.5, 13.5, 13.5, 1.0);
+        }
+        PaddingBottom => {
+            p.rect(2.5, 2.5, 13.5, 13.5, 1.0);
+            p.fill_rect(2.5, 10.5, 13.5, 13.5, 1.0);
+        }
+        PaddingLeft => {
+            p.rect(2.5, 2.5, 13.5, 13.5, 1.0);
+            p.fill_rect(2.5, 2.5, 5.5, 13.5, 1.0);
+        }
+        Online => {
+            p.circle(8.0, 8.0, 5.5);
+            p.line(2.5, 8.0, 13.5, 8.0);
+            let meridian: Vec<(f32, f32)> = arc_pts(0.0, 0.0, 1.0, 0.0, TAU).map(|(x, y)| (8.0 + 2.4 * x, 8.0 + 5.5 * y)).collect();
+            p.path(&meridian, true);
+        }
+        LiveShared => {
+            p.dot(8.0, 8.0, 1.6);
+            for r in [3.6, 6.0] {
+                p.arc(8.0, 8.0, r, -FRAC_PI_4, FRAC_PI_4);
+                p.arc(8.0, 8.0, r, PI - FRAC_PI_4, PI + FRAC_PI_4);
+            }
+        }
+        LivePrivate => {
+            p.dot(8.0, 8.0, 1.6);
+            p.circle(8.0, 8.0, 5.0);
+        }
+        Clock => {
+            p.circle(7.5, 7.5, 5.5);
+            p.line(7.5, 4.0, 7.5, 8.0);
+            p.line(7.5, 7.5, 10.0, 10.0);
+        }
+        ShapeBuilder | ShapeBuilderRemove => {
+            // Two overlapping rings; their shared lens filled (merge) or crossed out (remove).
+            let (r, d) = (4.5f32, 2.0f32);
+            let a = (d / r).acos();
+            p.circle(8.0 - d, 8.0, r);
+            p.circle(8.0 + d, 8.0, r);
+            if icon == ShapeBuilder {
+                let lens: Vec<(f32, f32)> = arc_pts(8.0 - d, 8.0, r, -a, a).chain(arc_pts(8.0 + d, 8.0, r, PI - a, PI + a)).collect();
+                p.fill(&lens);
+            } else {
+                p.line(6.2, 9.8, 9.8, 6.2);
+            }
+        }
+        Eraser => {
+            // A tilted block with a band near its tip, over a short trace line.
+            p.poly(&[(2.5, 10.0), (9.5, 3.0), (13.5, 7.0), (7.0, 13.5), (6.0, 13.5)], true);
+            p.line(5.5, 7.0, 9.5, 11.0);
+            p.line(7.0, 13.5, 14.0, 13.5);
+        }
+        VariableWidth => {
+            // A lens-shaped stroke, thin at both ends, and a width handle on either side of its
+            // widest point.
+            let edge = |i: i32, side: f32| {
+                let f = i as f32 / 12.0;
+                (2.0 + 11.0 * f, 7.5 + side * 3.0 * (PI * f).sin())
+            };
+            let lens: Vec<(f32, f32)> = (0..=12).map(|i| edge(i, -1.0)).chain((0..=12).rev().map(|i| edge(i, 1.0))).collect();
+            p.fill(&lens);
+            p.line(7.5, 2.0, 7.5, 13.0);
+            p.dot(7.5, 2.0, 1.5);
+            p.dot(7.5, 13.0, 1.5);
+        }
+        Variable => {
+            // A hexagon with a dot: an original mark for "bind a value".
+            let pts: Vec<(f32, f32)> = (0..6)
+                .map(|i| {
+                    let a = std::f32::consts::FRAC_PI_3 * i as f32 + std::f32::consts::FRAC_PI_6;
+                    (8.0 + 6.0 * a.cos(), 8.0 + 6.0 * a.sin())
+                })
+                .collect();
+            p.path(&pts, true);
+            p.dot(8.0, 8.0, 1.7);
+        }
+        Detach => {
+            p.path(&[(8.0, 2.0), (14.0, 8.0), (8.0, 14.0), (2.0, 8.0)], true);
+            p.line(3.0, 13.0, 13.0, 3.0);
+        }
+        Swap => {
+            p.line(2.0, 4.5, 13.0, 4.5);
+            p.head((13.0, 4.5), 0.0, 2.8);
+            p.line(3.0, 11.5, 14.0, 11.5);
+            p.head((3.0, 11.5), PI, 2.8);
+        }
+        Prototype => {
+            p.circle(4.5, 11.5, 2.0);
+            p.line(6.0, 10.0, 13.0, 3.0);
+            p.poly(&[(8.5, 2.5), (13.5, 2.5), (13.5, 7.5)], false);
+        }
+        Preview => {
+            // A window with a title strip and a play triangle in it.
+            p.rect(2.5, 2.5, 13.5, 13.5, 1.0);
+            p.line(3.0, 5.5, 13.0, 5.5);
+            p.fill(&[(6.5, 7.5), (10.5, 10.0), (6.5, 12.5)]);
+        }
+        AbsolutePosition => {
+            // The frame, a small layer near its top-right corner, and the two offsets pinning it.
+            p.rect(2.5, 2.5, 13.5, 13.5, 1.0);
+            p.fill_rect(6.0, 6.0, 10.0, 10.0, 0.0);
+            p.line(10.0, 7.5, 13.0, 7.5);
+            p.line(7.5, 3.0, 7.5, 6.0);
+        }
+        Slot => {
+            p.dashed_box(2.5, 2.5, 12.5, 12.5, 3);
+            p.line(7.5, 5.0, 7.5, 10.0);
+            p.line(5.0, 7.5, 10.0, 7.5);
+        }
+        Adjust => {
+            p.line(2.0, 4.5, 14.0, 4.5);
+            p.line(2.0, 11.5, 14.0, 11.5);
+            p.dot(10.5, 4.5, 2.2);
+            p.dot(5.5, 11.5, 2.2);
+        }
+        ViewList => {
+            for y in [2.0, 6.0, 10.0] {
+                p.fill_rect(2.0, y, 5.0, y + 3.0, 0.0);
+                p.line(7.0, y + 1.5, 14.0, y + 1.5);
+            }
+        }
+        Reaction => {
+            p.circle(8.0, 8.0, 5.5);
+            p.dot(6.0, 6.5, 0.9);
+            p.dot(10.0, 6.5, 0.9);
+            p.arc(8.0, 8.5, 3.0, 0.6, PI - 0.6);
+        }
+        DragHandle => {
+            for y in [4.0, 8.0, 12.0] {
+                p.dot(6.0, y, 1.1);
+                p.dot(10.0, y, 1.1);
+            }
+        }
+        ViewGrid => {
+            for (x, y) in [(2.5, 2.5), (9.5, 2.5), (2.5, 9.5), (9.5, 9.5)] {
+                p.rect(x, y, x + 4.0, y + 4.0, 1.0);
+            }
+        }
+        ArcStart => {
+            p.circle(8.0, 8.0, 5.5);
+            p.line(8.0, 8.0, 13.5, 8.0);
+            p.dot(13.5, 8.0, 1.6);
+        }
+        ArcSweep => {
+            let mut wedge = vec![(8.0, 8.0)];
+            wedge.extend(arc_pts(8.0, 8.0, 5.5, 0.0, 1.5 * PI));
+            p.path(&wedge, true);
+        }
+        ArcRatio => {
+            p.circle(8.0, 8.0, 5.5);
+            p.circle(8.0, 8.0, 2.5);
+        }
+        GamutWarning => {
+            p.poly(&[(8.0, 2.0), (14.5, 13.5), (1.5, 13.5)], true);
+            p.line(8.0, 6.0, 8.0, 9.5);
+            p.dot(8.0, 11.5, 0.9);
+        }
+        PenNib => {
+            // Drawn pointing down, then leant 35° to the left about the middle.
+            let (sin, cos) = (0.61f32, 0.79f32);
+            let at = |x: f32, y: f32| (8.0 + x * cos - y * sin, 8.0 + x * sin + y * cos);
+            let nib: Vec<(f32, f32)> = [(0.0, 6.5), (3.4, 1.0), (2.4, -2.5), (-2.4, -2.5), (-3.4, 1.0)].iter().map(|&(x, y)| at(x, y)).collect();
+            p.path(&nib, true);
+            let (a, b) = (at(0.0, 6.5), at(0.0, 2.0));
+            p.path(&[a, b], false);
+            let (dx, dy) = at(0.0, 0.6);
+            p.dot(dx, dy, 1.0);
+            let grip: Vec<(f32, f32)> = [(-2.4, -3.4), (2.4, -3.4), (2.4, -5.6), (-2.4, -5.6)].iter().map(|&(x, y)| at(x, y)).collect();
+            p.fill(&grip);
+        }
+        Board => {
+            p.poly(&[(2.5, 2.5), (13.5, 2.5), (13.5, 9.5), (9.5, 13.5), (2.5, 13.5)], true);
+            p.fill(&[(9.5, 13.5), (9.5, 9.5), (13.5, 9.5)]);
+            p.line(5.0, 6.5, 11.0, 6.5);
+            p.line(5.0, 9.5, 8.0, 9.5);
+        }
+        Templates => {
+            p.rect(1.5, 2.5, 14.5, 13.5, 1.5);
+            p.fill_rect(3.5, 4.5, 7.5, 8.5, 0.5);
+            p.line(9.5, 5.5, 12.5, 5.5);
+            p.line(9.5, 7.5, 12.5, 7.5);
+            p.line(3.5, 11.0, 12.5, 11.0);
+        }
+        Table => {
+            p.rect(1.5, 2.5, 14.5, 13.5, 1.0);
+            p.line(1.5, 6.5, 14.5, 6.5);
+            p.line(1.5, 10.0, 14.5, 10.0);
+            p.line(6.0, 2.5, 6.0, 13.5);
+            p.line(10.0, 2.5, 10.0, 13.5);
+        }
+        AddRow | RemoveRow => {
+            p.rect(1.5, 2.5, 14.5, 8.5, 1.0);
+            p.line(8.0, 2.5, 8.0, 8.5);
+            p.line(5.5, 12.5, 10.5, 12.5);
+            if icon == AddRow {
+                p.line(8.0, 10.0, 8.0, 15.0);
+            }
+        }
+        AddColumn | RemoveColumn => {
+            p.rect(2.5, 1.5, 8.5, 14.5, 1.0);
+            p.line(2.5, 8.0, 8.5, 8.0);
+            p.line(10.0, 8.0, 15.0, 8.0);
+            if icon == AddColumn {
+                p.line(12.5, 5.5, 12.5, 10.5);
+            }
+        }
+        Marker => {
+            p.poly(&[(3.0, 13.0), (3.0, 10.5), (10.0, 3.5), (12.5, 6.0), (5.5, 13.0)], true);
+            p.line(8.5, 5.0, 11.0, 7.5);
+            p.fill(&[(2.0, 14.0), (2.0, 11.5), (4.5, 14.0)]);
+        }
+        Highlighter => {
+            p.poly(&[(4.0, 10.0), (10.5, 3.5), (13.5, 6.5), (7.0, 13.0)], true);
+            p.poly(&[(4.0, 10.0), (2.5, 12.5), (4.5, 12.5), (7.0, 13.0)], false);
+            p.fill_rect(1.0, 14.0, 15.0, 15.5, 0.0);
+        }
+        Connector => {
+            p.rect(1.5, 1.5, 6.5, 6.5, 1.0);
+            p.rect(9.5, 9.5, 14.5, 14.5, 1.0);
+            p.poly(&[(6.5, 4.0), (12.0, 4.0), (12.0, 9.0)], false);
+            p.head((12.0, 9.0), FRAC_PI_2, 2.4);
+        }
+        CurvedConnector => {
+            p.rect(1.5, 1.5, 6.5, 6.5, 1.0);
+            p.rect(9.5, 9.5, 14.5, 14.5, 1.0);
+            p.arc(6.5, 9.0, 5.5, -FRAC_PI_2, 0.0);
+            p.head((12.0, 9.0), FRAC_PI_2, 2.4);
+        }
+        Shapes => {
+            p.rect(1.5, 5.5, 9.5, 13.5, 1.0);
+            p.circle(10.5, 5.5, 4.0);
+        }
+        Stamp => {
+            p.circle(8.0, 8.0, 6.0);
+            p.poly(&[(5.0, 8.3), (7.2, 10.5), (11.0, 6.0)], false);
+        }
+        Timer => {
+            p.circle(8.0, 9.0, 5.5);
+            p.line(8.0, 9.0, 8.0, 6.0);
+            p.line(6.0, 1.5, 10.0, 1.5);
+            p.line(8.0, 1.5, 8.0, 3.5);
+            p.line(12.0, 4.0, 13.5, 2.5);
+        }
+        Pause => {
+            p.fill_rect(4.0, 3.0, 6.5, 13.0, 0.5);
+            p.fill_rect(9.5, 3.0, 12.0, 13.0, 0.5);
+        }
+        Vote => {
+            p.rect(2.5, 8.5, 13.5, 13.5, 1.0);
+            p.poly(&[(5.5, 8.5), (5.5, 2.5), (10.5, 2.5), (10.5, 8.5)], false);
+            p.poly(&[(6.6, 5.6), (7.7, 6.7), (9.4, 4.6)], false);
+        }
+        Measure => {
+            p.line(2.5, 4.0, 2.5, 12.0);
+            p.line(13.5, 4.0, 13.5, 12.0);
+            p.line(3.0, 8.0, 13.0, 8.0);
+            p.poly(&[(5.5, 5.5), (3.0, 8.0), (5.5, 10.5)], false);
+            p.poly(&[(10.5, 5.5), (13.0, 8.0), (10.5, 10.5)], false);
+        }
+        Logo => {
+            // FigCraft's own mark: the curled tail of the chameleon on the app icon. One bold
+            // stroke: a shaft along the bottom, then three half turns, each tighter than the last.
+            let mut tail = vec![(13.75, 13.0)];
+            tail.extend(arc_pts(7.25, 8.0, 5.0, FRAC_PI_2, 3.0 * FRAC_PI_2));
+            tail.extend(arc_pts(7.25, 6.5, 3.5, 3.0 * FRAC_PI_2, 5.0 * FRAC_PI_2));
+            tail.extend(arc_pts(7.25, 8.25, 1.75, FRAC_PI_2, 3.0 * FRAC_PI_2));
+            let v: Vec<Pos2> = tail.iter().map(|&(x, y)| p.raw(x, y)).collect();
+            p.painter.add(Shape::line(v, Stroke::new(1.7 * p.s, p.color)));
+            p.dot(13.75, 13.0, 0.85);
+            p.dot(7.25, 6.5, 0.85);
+        }
+    }
+}
+
+/// SVG path data outlines on a `size`-unit box, painted into `rect`: each part filled, or
+/// stroked `width` box units wide. Board shapes and stamp marks are drawn this way in the UI from
+/// the same outlines the canvas has.
+pub fn paint_outlines(painter: &Painter, rect: Rect, size: f64, parts: &[(&figcraft_geom::BezPath, bool)], color: Color32, width: f32) {
+    let s = rect.width().min(rect.height()) / size as f32;
+    let px = 1.0 / painter.ctx().pixels_per_point();
+    let o = rect.center() - Vec2::splat(size as f32 * s / 2.0);
+    let p = P { painter, o, s, px, stroke: Stroke::new((width * s).max(px), color), color };
+    for (path, filled) in parts {
+        let mut sub: Vec<(f32, f32)> = Vec::new();
+        let flush = |sub: &mut Vec<(f32, f32)>, closed: bool| {
+            if sub.len() >= 2 {
+                if *filled { p.fill(sub) } else { p.path(sub, closed) }
+            }
+            sub.clear();
+        };
+        let mut closed = false;
+        figcraft_geom::kurbo::flatten(path.iter(), 0.25, |el| match el {
+            figcraft_geom::kurbo::PathEl::MoveTo(q) => {
+                flush(&mut sub, closed);
+                closed = false;
+                sub.push((q.x as f32, q.y as f32));
+            }
+            figcraft_geom::kurbo::PathEl::LineTo(q) => sub.push((q.x as f32, q.y as f32)),
+            figcraft_geom::kurbo::PathEl::ClosePath => closed = true,
+            _ => {}
+        });
+        flush(&mut sub, closed);
+    }
+}
diff --git a/crates/ui-egui/src/idle_tests.rs b/crates/ui-egui/src/idle_tests.rs
index b78c7474..c528ec67 100644
--- a/crates/ui-egui/src/idle_tests.rs
+++ b/crates/ui-egui/src/idle_tests.rs
@@ -26,12 +26,17 @@ pub(crate) struct Harness {
 
 impl Harness {
     pub(crate) fn new(s: Session) -> Self {
+        // The one system font scan bumps the layout generation, which makes the canvas render
+        // again: scanned here, before the first frame, rather than by whichever test happens to
+        // run first while this one waits for idle (#333).
+        figcraft_text::scan_system_fonts();
         Self { ctx: egui::Context::default(), app: FigApp::new(s, Box::new(NoServices)), time: 0.0 }
     }
 
     /// One frame with `events`, 1/60 s after the last; returns the repaint delay it asked for.
     fn frame(&mut self, events: Vec<Event>) -> Duration {
         self.time += 1.0 / 60.0;
+        self.app.clock.set_test_now(Some(self.time));
         let input =
             RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), time: Some(self.time), events, ..Default::default() };
         let app = &mut self.app;
@@ -231,6 +236,7 @@ fn a_finished_background_render_wakes_the_ui() {
         skip: vec![],
         solo: None,
         proof: false,
+        dots: None,
         uid: 0,
         zoom_preview: false,
         at: web_time::Instant::now(),
@@ -243,6 +249,8 @@ fn a_finished_background_render_wakes_the_ui() {
     assert!(worker.poll().is_some(), "the woken frame finds the image");
 }
 
+/// Asserts a control request wakes an idle UI and is answered, and screenshots keep frames
+/// coming until delivered before the UI rests again.
 #[test]
 fn control_requests_and_screenshots_wake_an_idle_ui() {
     let (mut h, _) = document();
@@ -254,7 +262,7 @@ fn control_requests_and_screenshots_wake_an_idle_ui() {
         method: "ui.inspect".into(),
         params: json!({}),
         reply: tx.clone(),
-        cancelled: Default::default(),
+        state: Default::default(),
     });
     assert_eq!(h.frame(vec![]), Duration::ZERO);
     assert!(rx.try_recv().unwrap().result.is_ok());
@@ -262,15 +270,20 @@ fn control_requests_and_screenshots_wake_an_idle_ui() {
     // A screenshot keeps frames coming until the window delivers it, then the UI rests again.
     let path = std::env::temp_dir().join(format!("figcraft-idle-shot-{}.png", std::process::id()));
     let params = json!({"path": path.to_string_lossy()});
-    h.app.control_queue.push(ControlRequest { id: json!(2), method: "ui.screenshot".into(), params, reply: tx, cancelled: Default::default() });
+    h.app.control_queue.push(ControlRequest { id: json!(2), method: "ui.screenshot".into(), params, reply: tx, state: Default::default() });
     for _ in 0..5 {
-        assert_eq!(h.frame(vec![]), Duration::ZERO, "waiting for the screenshot");
+        let delay = h.frame(vec![]);
+        assert!(delay <= Duration::from_secs_f64(crate::control::SHOT_TIMEOUT), "waiting for the screenshot");
     }
     assert!(rx.try_recv().is_err(), "not delivered yet");
-    let image = Arc::new(egui::ColorImage::filled([4, 4], egui::Color32::RED));
-    h.frame(vec![Event::Screenshot { viewport_id: ViewportId::ROOT, user_data: egui::UserData::default(), image }]);
+    // The settled UI issued the viewport capture command; the renderer completes its one-shot
+    // slot, and the next UI pass writes the reply.
+    let spec = h.app.capture.shots.first().and_then(|r| r.spec).expect("admitted against real geometry");
+    let slot = h.app.capture.shots.first().and_then(|r| r.slot.clone()).expect("issued after settling");
+    slot.complete(Arc::new(egui::ColorImage::filled(spec.size_px, egui::Color32::RED)));
+    h.frame(vec![]);
     let reply = rx.try_recv().unwrap();
-    assert_eq!(reply.result.unwrap()["width"], json!(4));
+    assert_eq!(reply.result.unwrap()["width"], json!(spec.size_px[0]));
     let _ = std::fs::remove_file(&path);
     h.assert_idle("after a screenshot");
 }
@@ -331,36 +344,52 @@ fn cjk_names_are_looked_for_in_edits_not_on_every_pan() {
     assert_eq!(h.app.cjk_needed(&ctx, 0), crate::cjk::HANGUL);
 }
 
+/// Asserts a hidden window answers edits and inspection at once, while a screenshot is
+/// parked with a deadline and times out once instead of waiting for a frame.
 #[test]
-fn a_hidden_window_answers_requests_that_need_no_frame() {
-    // #269: minimised or covered, the window draws no frames, but the app's logic still runs: it
-    // answers edits, inspection and saves; what needs a frame waits for the window to show.
+fn a_hidden_window_answers_at_once() {
+    // #269, #720: minimised or covered, the window draws no frames, but the app's logic still runs:
+    // it answers edits, inspection, saves and the interface's state; what needs a frame (a capture
+    // of the window) queues for a forced hidden paint and otherwise expires at its deadline.
     let dir = std::env::temp_dir().join(format!("figcraft-hidden-save-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     let path = dir.join("hidden.figcraft");
     let (mut h, _) = document();
     h.settle();
+    // Exercise admission well after startup, independently of settling speed.
+    h.time += 120.0;
+    h.app.clock.set_test_now(Some(h.time));
     let (tx, rx) = std::sync::mpsc::channel();
     let request = |id: u64, method: &str, params: Value| ControlRequest {
         id: json!(id),
         method: method.into(),
         params,
         reply: tx.clone(),
-        cancelled: Default::default(),
+        state: Default::default(),
     };
     h.app.control_queue.push(request(1, "engine.execute", json!({"command": "file.save", "params": {"path": path.to_string_lossy()}})));
     h.app.control_queue.push(request(2, "ui.inspect", json!({})));
+    h.app.control_queue.push(request(3, "ui.screenshot", json!({"path": dir.join("shot.png").to_string_lossy()})));
     let mut hidden = RawInput::default();
     hidden.viewports.insert(ViewportId::ROOT, egui::ViewportInfo { minimized: Some(true), ..Default::default() });
-    let app = &mut h.app;
-    let _ = h.ctx.run_logic(&hidden, |ctx| crate::control::drain_hidden(app, ctx));
+    let ctx = h.ctx.clone();
+    let _ = ctx.run_logic(&hidden, |ctx| crate::control::background(&mut h.app, ctx));
     let saved = rx.try_recv().unwrap();
     assert_eq!(saved.id, json!(1));
     assert!(saved.result.is_ok() && path.exists(), "saved while hidden: {:?}", saved.result);
-    assert!(rx.try_recv().is_err(), "the interface's state waits for a frame");
-    // Shown again: the next frame answers it.
-    h.frame(vec![]);
-    assert_eq!(rx.try_recv().unwrap().id, json!(2));
+    let inspected = rx.try_recv().unwrap();
+    assert_eq!(inspected.id, json!(2));
+    assert!(inspected.result.is_ok(), "the interface's state: {:?}", inspected.result);
+    assert!(rx.try_recv().is_err(), "a capture queues for a forced hidden paint");
+    assert_eq!(h.app.capture.shots.len(), 1, "one admitted capture");
+    assert!(h.app.control_queue.is_empty(), "nothing waits for the window");
+    // Its deadline expires it once, with the same error the transport used to get.
+    h.app.clock.set_test_now(Some(h.time + crate::control::SHOT_TIMEOUT + 1.0));
+    let _ = ctx.run_logic(&hidden, |ctx| crate::control::background(&mut h.app, ctx));
+    let shot = rx.try_recv().expect("expired");
+    assert_eq!(shot.id, json!(3));
+    assert!(shot.result.unwrap_err().contains("didn't deliver a screenshot"), "a capture needs paint");
+    assert!(h.app.capture.shots.is_empty(), "released after its deadline");
     let _ = std::fs::remove_dir_all(&dir);
 }
 
@@ -399,3 +428,47 @@ fn auto_save_writes_a_changed_file_then_rests() {
     h.assert_idle("an auto-saved file");
     let _ = std::fs::remove_dir_all(&dir);
 }
+
+/// Asserts a hidden logic tick runs background work and advances the autosave deadline
+/// without counting a UI frame, and is idempotent at the same time.
+#[test]
+fn a_hidden_logic_tick_runs_background_work_but_counts_no_ui_frame() {
+    let (mut h, _) = document();
+    h.settle();
+    let frames = h.app.frame_stats.frames;
+    let deadline_before = h.app.ui.next_autosave;
+    h.time += crate::AUTOSAVE_SECS + 1.0;
+    h.app.clock.set_test_now(Some(h.time));
+    let mut input = RawInput::default();
+    input.viewports.insert(ViewportId::ROOT, egui::ViewportInfo { minimized: Some(true), ..Default::default() });
+    let ctx = h.ctx.clone();
+    let _ = ctx.run_logic(&input, |ctx| h.app.background_tick(ctx));
+    assert_eq!(h.app.frame_stats.frames, frames, "a logic-only tick is not a UI frame");
+    let deadline = h.app.ui.next_autosave;
+    assert!(deadline > deadline_before + crate::AUTOSAVE_SECS - 1.0, "the autosave deadline advanced");
+    // Repeating the same due instant does not advance it again (consumed/deadline-driven work).
+    let _ = ctx.run_logic(&input, |ctx| h.app.background_tick(ctx));
+    assert_eq!(h.app.ui.next_autosave, deadline, "idempotent at the same monotonic time");
+}
+
+/// Asserts a discarded sizing pass counts one drawn frame, not one per pass.
+#[test]
+fn a_discarded_sizing_pass_sets_up_and_counts_one_frame_only() {
+    let (mut h, _) = document();
+    h.settle();
+    let frames = h.app.frame_stats.frames;
+    let input =
+        RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), time: Some(h.time + 1.0 / 60.0), ..Default::default() };
+    let mut passes = 0;
+    let app = &mut h.app;
+    let mut out = h.ctx.run_ui(input, |ui| {
+        passes += 1;
+        app.ui(ui);
+        if passes == 1 {
+            ui.ctx().request_discard("test sizing pass");
+        }
+    });
+    out.textures_delta.clear();
+    assert_eq!(passes, 2, "egui reran the frame");
+    assert_eq!(app.frame_stats.frames, frames + 1, "one frame was drawn, not one per pass");
+}
diff --git a/crates/ui-egui/src/ime_tests.rs b/crates/ui-egui/src/ime_tests.rs
new file mode 100644
index 00000000..e6c2f698
--- /dev/null
+++ b/crates/ui-egui/src/ime_tests.rs
@@ -0,0 +1,646 @@
+//! IME composition in a text layer, driven through egui headless with the events macOS sends for
+//! Pinyin ("nihao", then a candidate picked): the platform keeps the IME on every frame of the
+//! edit (an idle frame too) with the candidate window at the caret, the composition shows without
+//! entering the document, keys pressed while composing are the IME's, and the commit lands once.
+
+use egui::output::{IMEOutput, IMESurroundingText, IMESurroundingTextPayload, ImeChangeCause};
+use egui::{Event, ImeEvent, Key, Modifiers, RawInput, Rect};
+use figcraft_doc::{NodeId, NodeKind};
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+
+fn key(key: Key, pressed: bool) -> Event {
+    Event::Key { key, physical_key: None, pressed, repeat: false, modifiers: Modifiers::NONE }
+}
+
+fn preedit(text: &str) -> Event {
+    let n = text.chars().count();
+    Event::Ime(ImeEvent::Preedit { text: text.into(), active_range_chars: (n > 0).then_some(n..n) })
+}
+
+#[expect(deprecated, reason = "egui still delivers these, and the editor must ignore them")]
+fn enabled_disabled() -> (Event, Event) {
+    (Event::Ime(ImeEvent::Enabled), Event::Ime(ImeEvent::Disabled))
+}
+
+fn text(u: &Ui, id: NodeId) -> String {
+    match &u.app.session.doc().unwrap().node(id).unwrap().kind {
+        NodeKind::Text(t) => t.characters.clone(),
+        _ => panic!("not text"),
+    }
+}
+
+/// One frame; the IME output it leaves for the platform (`None` turns the IME off).
+fn ime(u: &mut Ui, events: Vec<Event>) -> Rect {
+    let ime = u.frame_raw(RawInput { events, ..Default::default() }).platform_output.ime.expect("the IME stays on while editing");
+    assert_eq!(ime.rect, ime.cursor_rect, "the desktop places candidates by `rect`: the caret");
+    ime.cursor_rect
+}
+
+fn composing(u: &Ui) -> Option<String> {
+    u.app.session.ds().unwrap().text_edit.as_ref().expect("still editing").preedit.as_ref().map(|p| p.text.clone())
+}
+
+/// The whole IME descriptor one frame leaves for the platform.
+fn ime_descriptor(u: &mut Ui, events: Vec<Event>) -> IMEOutput {
+    u.frame_raw(RawInput { events, ..Default::default() }).platform_output.ime.expect("the IME stays on while editing")
+}
+
+/// Return the available surrounding-text payload of an IME output, panicking when unavailable.
+fn available(ime: &IMEOutput) -> &IMESurroundingTextPayload {
+    match &ime.surrounding_text {
+        IMESurroundingText::Available(payload) => payload,
+        IMESurroundingText::Unavailable => panic!("expected available surrounding text"),
+    }
+}
+
+/// Create a text layer with `text` and return its node id.
+fn text_layer(s: &mut Session, text: &str) -> NodeId {
+    NodeId(s.execute("text.create", &json!({"text": text, "x": 40, "y": 40})).unwrap()["id"].as_u64().unwrap())
+}
+
+#[test]
+fn pinyin_composes_inline_and_commits_once_with_the_ime_on_every_frame() {
+    // The text is measured with a font: without craft-fonts a system one, scanned here rather than
+    // by whichever test happens to run first (#333).
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = NodeId(s.execute("text.create", &json!({"text": "Hi", "x": 40, "y": 40})).unwrap()["id"].as_u64().unwrap());
+    // On a machine without any font nothing lays out and every caret sits at the start.
+    let fonts = figcraft_text::layout_node(s.doc().unwrap().node(t).unwrap()).is_some_and(|(l, _)| !l.glyphs.is_empty());
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(2), false).unwrap();
+    // An idle frame (the caret blinking) keeps the IME on, or macOS drops the composition.
+    let caret = ime(&mut u, vec![]);
+    let ds = u.app.session.ds().unwrap();
+    let b = ds.doc.world_bounds(t).unwrap();
+    let layer = Rect::from_two_pos(u.app.to_screen(b.x0, b.y0), u.app.to_screen(b.x1, b.y1)).expand(1.0);
+    assert!(layer.contains(caret.center()), "candidates open at the caret ({caret:?} in {layer:?})");
+
+    let (enabled, disabled) = enabled_disabled();
+    ime(&mut u, vec![enabled, preedit("n")]);
+    ime(&mut u, vec![]);
+    let mid = ime(&mut u, vec![preedit("ni")]);
+    assert!(!fonts || mid.min.x > caret.min.x, "the IME cursor follows the composition");
+    // A key the platform leaks while composing (Backspace) belongs to the IME, not the text.
+    ime(&mut u, vec![key(Key::Backspace, true), preedit("nih"), key(Key::Backspace, false)]);
+    ime(&mut u, vec![preedit("nihao")]);
+    assert_eq!(composing(&u).as_deref(), Some("nihao"));
+    assert_eq!(text(&u, t), "Hi", "the composition isn't in the document yet");
+
+    // Enter confirms the candidate: no newline, editing goes on.
+    let after = ime(&mut u, vec![key(Key::Enter, true), preedit(""), Event::Ime(ImeEvent::Commit("你好".into())), disabled, key(Key::Enter, false)]);
+    assert_eq!(text(&u, t), "Hi你好");
+    assert_eq!(composing(&u), None);
+    let te = u.app.session.ds().unwrap().text_edit.clone().unwrap();
+    assert_eq!((te.caret, te.anchor), (4, 4));
+    assert!(!fonts || after.min.x > caret.min.x, "the caret moved past the committed text");
+    ime(&mut u, vec![]);
+    assert_eq!(text(&u, t), "Hi你好", "committed once");
+
+    // Keys are the editor's again once the composition is over.
+    ime(&mut u, vec![key(Key::Enter, true), key(Key::Enter, false), Event::Text("!".into())]);
+    assert_eq!(text(&u, t), "Hi你好\n!");
+}
+
+/// Asserts an empty IME commit ends the composition, inserts nothing, keeps the editor
+/// focused, and the next pass observes the committed text.
+#[test]
+fn an_empty_ime_commit_ends_the_composition_without_inserting_text() {
+    // Safari's egui web integration sends `Commit("")` (not `Preedit("")`) when the last
+    // composition character is deleted. It ends the composition; it must not leave the pre-edit
+    // rendering or insert anything.
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "Hello");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(5), false).unwrap();
+    ime(&mut u, vec![preedit("にほ")]);
+    assert_eq!(composing(&u).as_deref(), Some("にほ"));
+    let after = ime_descriptor(&mut u, vec![Event::Ime(ImeEvent::Commit(String::new()))]);
+    assert_eq!(composing(&u), None, "the empty commit ends the composition");
+    assert_eq!(text(&u, t), "Hello", "and inserts nothing");
+    assert!(matches!(after.surrounding_text, IMESurroundingText::Available(_)));
+    // The editor is still focused, and the next pass observes committed text only.
+    let next = ime_descriptor(&mut u, vec![]);
+    assert_eq!(composing(&u), None);
+    assert_eq!(available(&next).text, "Hello");
+    assert_eq!(text(&u, t), "Hello");
+}
+
+/// Asserts byte deletion before the paired commit replaces the exact UTF-8 range, and one undo
+/// restores the pre-IME text.
+#[test]
+fn an_ime_replacing_text_deletes_in_bytes_before_the_paired_commit() {
+    // 0.37 sends `DeleteSurroundingBytes` immediately before the commit that replaces it. The
+    // custom engine editor deletes the exact UTF-8 range (never display-bidi text) and keeps the
+    // whole edit as one undo step.
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = NodeId(s.execute("text.create", &json!({"text": "ab\u{4F60}\u{597D}cd", "x": 40, "y": 40})).unwrap()["id"].as_u64().unwrap());
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(4), false).unwrap();
+    ime(&mut u, vec![]);
+    // Compose, then replace "你好c" with "X".
+    ime(&mut u, vec![preedit("x")]);
+    ime(&mut u, vec![Event::Ime(ImeEvent::DeleteSurroundingBytes { before_bytes: 6, after_bytes: 1 }), Event::Ime(ImeEvent::Commit("X".into()))]);
+    assert_eq!(text(&u, t), "abXd");
+    figcraft_engine::textedit::end(&mut u.app.session).unwrap();
+    u.app.session.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(text(&u, t), "ab\u{4F60}\u{597D}cd", "one undo restores the pre-IME text");
+}
+
+/// Asserts a caret click invalidates the whole stale IME batch (both byte and character
+/// deletions) while a later direct commit still works.
+#[test]
+fn a_caret_click_rejects_the_stale_delete_and_commit_in_the_same_input_batch() {
+    figcraft_text::scan_system_fonts();
+    for delete in
+        [ImeEvent::DeleteSurrounding { before_chars: 1, after_chars: 1 }, ImeEvent::DeleteSurroundingBytes { before_bytes: 1, after_bytes: 1 }]
+    {
+        let mut s = Session::new();
+        let t = text_layer(&mut s, "abcdef");
+        let mut u = Ui::new(s);
+        figcraft_engine::textedit::begin(&mut u.app.session, t, Some(6), false).unwrap();
+        ime(&mut u, vec![preedit("z")]);
+        let p = u.app.to_screen(42.0, 45.0);
+        // Real canvas pointer handling moves the caret and cancels preedit before text_keys.
+        ime(
+            &mut u,
+            vec![
+                Event::PointerMoved(p),
+                Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+                Event::Ime(delete),
+                Event::Ime(ImeEvent::Commit("Q".into())),
+            ],
+        );
+        let edit = u.app.session.ds().unwrap().text_edit.as_ref().unwrap();
+        assert!(edit.caret < 6, "the production canvas click actually moved the caret");
+        assert!(edit.preedit.is_none(), "the click ended the composition");
+        assert_eq!(text(&u, t), "abcdef", "neither stale deletion nor its Commit may mutate the clicked caret");
+        u.frame(vec![Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE }]);
+        // A later direct commit without an active composition is legitimate.
+        let caret = u.app.session.ds().unwrap().text_edit.as_ref().unwrap().caret;
+        ime(&mut u, vec![Event::Ime(ImeEvent::Commit("X".into()))]);
+        let mut expected = "abcdef".to_string();
+        expected.insert(caret, 'X');
+        assert_eq!(text(&u, t), expected, "the interrupted batch does not poison a later direct commit");
+        figcraft_engine::textedit::end(&mut u.app.session).unwrap();
+        u.app.session.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(text(&u, t), "abcdef", "the valid edit retains one-session undo");
+    }
+}
+
+/// Asserts a control-channel document switch rejects the old composition's delete and commit
+/// batch, while a direct commit to the new target remains valid.
+#[test]
+fn a_document_switch_rejects_the_old_compositions_delete_and_commit_batch() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let a = text_layer(&mut s, "Alpha");
+    s.execute("file.new", &json!({"name": "B"})).unwrap();
+    let b = text_layer(&mut s, "Bravo");
+    figcraft_engine::textedit::begin(&mut s, b, Some(5), false).unwrap();
+    s.execute("doc.switch", &json!({"index": 0})).unwrap();
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, a, Some(5), false).unwrap();
+    ime(&mut u, vec![preedit("z")]);
+    let (tx, rx) = std::sync::mpsc::channel();
+    u.app.control_queue.push(crate::control::ControlRequest {
+        id: json!(91),
+        method: "engine.execute".into(),
+        params: json!({"window": 0, "command": "doc.switch", "params": {"index": 1}}),
+        reply: tx,
+        state: Default::default(),
+    });
+    ime(&mut u, vec![Event::Ime(ImeEvent::DeleteSurroundingBytes { before_bytes: 1, after_bytes: 0 }), Event::Ime(ImeEvent::Commit("Q".into()))]);
+    assert!(rx.try_recv().unwrap().result.is_ok(), "production control drain switched the document");
+    assert_eq!(u.app.session.active, 1);
+    assert_eq!(text(&u, b), "Bravo", "the new target cannot inherit the old composition's mutations");
+    assert_eq!(u.app.session.docs[0].doc.node(a).unwrap().kind.text().unwrap().characters, "Alpha");
+    ime(&mut u, vec![Event::Ime(ImeEvent::Commit("X".into()))]);
+    assert_eq!(text(&u, b), "BravoX", "a direct commit to the new noncomposing target remains valid");
+}
+
+/// Asserts the first observation and ordinary typing are `Other`, while an accepted commit is
+/// `InputMethod` with UTF-8 offsets, the same owner and generation.
+#[test]
+fn ime_cause_is_input_method_only_for_an_accepted_commit() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "Hi");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(2), false).unwrap();
+
+    let first = ime_descriptor(&mut u, vec![]);
+    assert_eq!(first.change_cause, ImeChangeCause::Other, "the first focused observation starts a context");
+    assert_eq!(available(&first).text, "Hi");
+    assert_eq!((available(&first).cursor, available(&first).anchor), (2, 2));
+
+    let commit = ime_descriptor(&mut u, vec![Event::Ime(ImeEvent::Commit("你好".into()))]);
+    assert_eq!(commit.change_cause, ImeChangeCause::InputMethod);
+    assert_eq!(available(&commit).text, "Hi你好");
+    assert_eq!(available(&commit).cursor, 8, "UTF-8 bytes, not characters");
+    assert_eq!(commit.context_generation, first.context_generation, "a commit is not a context change");
+    assert_eq!(commit.owner, first.owner);
+
+    let typed = ime_descriptor(&mut u, vec![Event::Text("x".into())]);
+    assert_eq!(typed.change_cause, ImeChangeCause::Other, "ordinary typing is an application edit");
+    assert_eq!(available(&typed).text, "Hi你好x");
+    assert_eq!(text(&u, t), "Hi你好x");
+}
+
+/// Asserts a frame mixing IME and application edits is `Other`, and a later pure commit is
+/// `InputMethod` without lingering state.
+#[test]
+fn ime_cause_reports_mixed_application_and_ime_mutations_as_other() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "Hi");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(2), false).unwrap();
+    ime(&mut u, vec![]);
+
+    let mixed = ime_descriptor(&mut u, vec![Event::Ime(ImeEvent::Commit("あ".into())), Event::Text("b".into())]);
+    assert_eq!(mixed.change_cause, ImeChangeCause::Other, "an application edit in the same frame dominates");
+    assert_eq!(available(&mixed).text, "Hiあb");
+
+    // The next frame is only an accepted commit: the frame-scoped `Other` does not linger.
+    let pure = ime_descriptor(&mut u, vec![Event::Ime(ImeEvent::Commit("う".into()))]);
+    assert_eq!(pure.change_cause, ImeChangeCause::InputMethod);
+    assert_eq!(available(&pure).text, "Hiあbう");
+
+    // An application edit before the IME receipt, and IME → application → IME, are both Other.
+    let before = ime_descriptor(&mut u, vec![Event::Text("c".into()), Event::Ime(ImeEvent::Commit("え".into()))]);
+    assert_eq!(before.change_cause, ImeChangeCause::Other);
+    let sandwiched =
+        ime_descriptor(&mut u, vec![Event::Ime(ImeEvent::Commit("お".into())), Event::Text("d".into()), Event::Ime(ImeEvent::Commit("か".into()))]);
+    assert_eq!(sandwiched.change_cause, ImeChangeCause::Other);
+    assert_eq!(text(&u, t), "Hiあbうcえおdか");
+}
+
+/// Asserts a control-channel text edit is an application change (`Other`).
+#[test]
+fn a_control_channel_text_edit_is_an_application_change() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "Hi");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(2), false).unwrap();
+    ime(&mut u, vec![]);
+
+    // A command from the control channel (not an ImeEvent) changes committed text.
+    u.app.session.execute("text.edit.insert", &json!({"text": "z"})).unwrap();
+    let out = ime_descriptor(&mut u, vec![]);
+    assert_eq!(out.change_cause, ImeChangeCause::Other);
+    assert_eq!(available(&out).text, "Hiz");
+}
+
+/// Asserts a byte delete followed by a commit is `InputMethod` and describes the
+/// post-mutation text and caret.
+#[test]
+fn ime_delete_then_commit_is_input_method_and_describes_the_post_mutation_text() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "ab\u{4F60}\u{597D}cd");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(4), false).unwrap();
+    ime(&mut u, vec![]);
+
+    let out = ime_descriptor(
+        &mut u,
+        vec![Event::Ime(ImeEvent::DeleteSurroundingBytes { before_bytes: 6, after_bytes: 1 }), Event::Ime(ImeEvent::Commit("X".into()))],
+    );
+    assert_eq!(out.change_cause, ImeChangeCause::InputMethod);
+    assert_eq!(available(&out).text, "abXd", "the snapshot is observed after both mutations");
+    assert_eq!(available(&out).cursor, 3);
+    assert_eq!(text(&u, t), "abXd");
+}
+
+/// Asserts preedit text is excluded from surrounding text and earns no receipt, while the
+/// following commit is `InputMethod`.
+#[test]
+fn preedit_is_not_surrounding_text_but_the_commit_that_follows_is_input_method() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "Hi");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(2), false).unwrap();
+    ime(&mut u, vec![]);
+
+    let composing = ime_descriptor(&mut u, vec![preedit("にほ")]);
+    assert_eq!(available(&composing).text, "Hi", "the composition is excluded");
+    assert_eq!((available(&composing).cursor, available(&composing).anchor), (2, 2));
+    assert_eq!(composing.change_cause, ImeChangeCause::Other, "preedit alone earns no receipt");
+
+    let committed = ime_descriptor(&mut u, vec![preedit(""), Event::Ime(ImeEvent::Commit("にほ".into()))]);
+    assert_eq!(committed.change_cause, ImeChangeCause::InputMethod);
+    assert_eq!(available(&committed).text, "Hiにほ");
+    assert_eq!(available(&committed).cursor, 8);
+}
+
+/// Asserts surrounding text is logical UTF-8 with byte offsets and keeps a reversed
+/// selection.
+#[test]
+fn ime_surrounding_text_is_logical_utf8_and_keeps_a_reversed_selection() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "café😀e\u{301}x");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(8), false).unwrap();
+    figcraft_engine::textedit::set_caret(&mut u.app.session, 8, false).unwrap();
+    figcraft_engine::textedit::set_caret(&mut u.app.session, 5, true).unwrap();
+
+    let out = ime_descriptor(&mut u, vec![]);
+    let payload = available(&out);
+    assert_eq!(payload.text, "café😀e\u{301}x");
+    assert_eq!((payload.cursor, payload.anchor), (9, 13));
+    assert!(payload.cursor < payload.anchor, "the reversed selection is not sorted");
+}
+
+/// Asserts empty text is available while a selection wider than the 4000-byte budget is
+/// explicitly unavailable but still has a nonzero IME context generation.
+#[test]
+fn empty_text_is_available_while_a_too_wide_selection_is_explicitly_unavailable() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(0), false).unwrap();
+    let empty = ime_descriptor(&mut u, vec![]);
+    let payload = available(&empty);
+    assert_eq!((payload.text.as_str(), payload.cursor, payload.anchor), ("", 0, 0));
+
+    // The same editor over a selection wider than the 4000-byte budget cannot describe it.
+    let mut s = Session::new();
+    let long = "a".repeat(5000);
+    let t = text_layer(&mut s, &long);
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, None, false).unwrap();
+    let wide = ime_descriptor(&mut u, vec![]);
+    assert_eq!(wide.surrounding_text, IMESurroundingText::Unavailable);
+    assert!(wide.context_generation > 0, "the owner stays known when only the text is unavailable");
+}
+
+/// Asserts replacing a too-wide selection with a commit is still an `InputMethod` receipt.
+#[test]
+fn a_commit_replacing_a_too_wide_selection_is_still_an_input_method_receipt() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let long = "a".repeat(5000);
+    let t = text_layer(&mut s, &long);
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, None, false).unwrap();
+    let wide = ime_descriptor(&mut u, vec![]);
+    assert_eq!(wide.surrounding_text, IMESurroundingText::Unavailable);
+
+    // The unavailable baseline and the pre-mutation stamp carry the engine's document revision,
+    // so replacing the over-wide selection with a normal commit is a provable IME receipt rather
+    // than an unproven `Other` change.
+    let out = ime_descriptor(&mut u, vec![Event::Ime(ImeEvent::Commit("X".into()))]);
+    assert_eq!(out.change_cause, ImeChangeCause::InputMethod);
+    assert_eq!(text(&u, t), "X");
+    assert_eq!(available(&out).text, "X");
+    assert_eq!((available(&out).cursor, available(&out).anchor), (1, 1));
+}
+
+/// Asserts another text node is another owner, and re-entering the same node changes the
+/// context generation while keeping the owner key.
+#[test]
+fn a_new_edit_session_and_another_text_node_are_new_ime_owners() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let a = text_layer(&mut s, "A");
+    let b = text_layer(&mut s, "B");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, a, Some(1), false).unwrap();
+    let first = ime_descriptor(&mut u, vec![]);
+
+    figcraft_engine::textedit::end(&mut u.app.session).unwrap();
+    figcraft_engine::textedit::begin(&mut u.app.session, b, Some(1), false).unwrap();
+    let other = ime_descriptor(&mut u, vec![]);
+    assert_ne!(other.owner, first.owner, "another text node is another owner");
+    assert_ne!(other.context_generation, first.context_generation);
+
+    figcraft_engine::textedit::end(&mut u.app.session).unwrap();
+    figcraft_engine::textedit::begin(&mut u.app.session, a, Some(1), false).unwrap();
+    let again = ime_descriptor(&mut u, vec![]);
+    assert_eq!(again.owner, first.owner, "the owner key is the document and node");
+    assert_ne!(again.context_generation, first.context_generation, "re-entering is a replaced target");
+}
+
+/// Asserts an accepted commit survives a discarded rerun without inserting twice and keeps
+/// its `InputMethod` cause, while a mixed rerun is `Other`.
+#[test]
+fn an_accepted_commit_survives_a_discarded_pass_without_reapplying_or_losing_its_cause() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "Hi");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(2), false).unwrap();
+    let first = ime_descriptor(&mut u, vec![]);
+
+    let out = u.frame_raw_with_discard(RawInput { events: vec![Event::Ime(ImeEvent::Commit("あ".into()))], ..Default::default() });
+    let ime = out.platform_output.ime.expect("the presented pass keeps the IME on");
+    assert_eq!(text(&u, t), "Hiあ", "the discarded rerun must not insert twice");
+    assert_eq!(available(&ime).text, "Hiあ");
+    assert_eq!(ime.change_cause, ImeChangeCause::InputMethod, "the unchanged second pass keeps the first pass's cause");
+    assert_eq!(ime.context_generation, first.context_generation);
+
+    let mixed = u
+        .frame_raw_with_discard(RawInput { events: vec![Event::Ime(ImeEvent::Commit("い".into())), Event::Text("x".into())], ..Default::default() });
+    let mixed = mixed.platform_output.ime.expect("still editing");
+    assert_eq!(text(&u, t), "Hiあいx");
+    assert_eq!(mixed.change_cause, ImeChangeCause::Other);
+}
+
+/// Asserts IME context state is scoped per viewport: each viewport has its own generation,
+/// the root keeps its context across an aux pass, and a closed aux viewport does not inherit
+/// the old generation.
+#[test]
+fn ime_context_state_is_scoped_per_viewport() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "Hi");
+    figcraft_engine::textedit::begin(&mut s, t, Some(2), false).unwrap();
+    let mut app = crate::FigApp::new(s, Box::new(crate::NoServices));
+    // No window drew here, so give the canvas a finite rect for the caret geometry.
+    app.canvas.rect = Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(800.0, 600.0));
+    let ctx = egui::Context::default();
+    ctx.set_embed_viewports(false);
+    let aux = egui::ViewportId::from_hash_of("figcraft-ime-aux");
+
+    let mut raw = RawInput { viewport_id: egui::ViewportId::ROOT, ..Default::default() };
+    raw.viewports.entry(egui::ViewportId::ROOT).or_default();
+    let root_out = ctx.run_ui(raw, |ui| {
+        ui.ctx().show_viewport_deferred(aux, egui::ViewportBuilder::default(), |_, _| {});
+        crate::shortcuts::ime_output(&mut app, ui.ctx());
+    });
+    let root = root_out.platform_output.ime.clone().expect("root descriptor");
+    root_out.drop_without_applying_deltas();
+
+    let mut raw = RawInput { viewport_id: aux, ..Default::default() };
+    raw.viewports.entry(aux).or_default();
+    let aux_out = ctx.run_ui(raw, |ui| crate::shortcuts::ime_output(&mut app, ui.ctx()));
+    let aux_ime = aux_out.platform_output.ime.clone().expect("aux descriptor");
+    aux_out.drop_without_applying_deltas();
+    assert_eq!(aux_ime.owner, root.owner, "the same edit is the same owner");
+    assert_ne!(aux_ime.context_generation, root.context_generation, "each viewport gets its own generation");
+    assert_eq!(available(&aux_ime).text, "Hi");
+
+    // The root's next consecutive pass keeps its context even though the aux pass ran between.
+    let mut raw = RawInput { viewport_id: egui::ViewportId::ROOT, ..Default::default() };
+    raw.viewports.entry(egui::ViewportId::ROOT).or_default();
+    let root_out = ctx.run_ui(raw, |ui| {
+        ui.ctx().show_viewport_deferred(aux, egui::ViewportBuilder::default(), |_, _| {});
+        crate::shortcuts::ime_output(&mut app, ui.ctx());
+    });
+    let root_again = root_out.platform_output.ime.clone().expect("root descriptor");
+    root_out.drop_without_applying_deltas();
+    assert_eq!(root_again.context_generation, root.context_generation);
+
+    // Closing the aux viewport releases its state; it never inherits the old context.
+    app.ime.end_viewport(aux);
+    let mut raw = RawInput { viewport_id: aux, ..Default::default() };
+    raw.viewports.entry(aux).or_default();
+    let aux_out = ctx.run_ui(raw, |ui| crate::shortcuts::ime_output(&mut app, ui.ctx()));
+    let aux_again = aux_out.platform_output.ime.clone().expect("aux descriptor");
+    aux_out.drop_without_applying_deltas();
+    assert_ne!(aux_again.context_generation, aux_ime.context_generation);
+}
+
+/// Asserts the engine's IME surrounding-text byte limit equals egui's wire limit.
+#[test]
+fn the_engine_surrounding_limit_matches_the_wire_limit() {
+    // A divergence would truncate or overrun the bounded payload silently.
+    let engine = figcraft_engine::textedit::MAX_IME_SURROUNDING_BYTES;
+    let wire = egui::output::MAX_IME_SURROUNDING_TEXT_BYTES;
+    assert_eq!(engine, wire);
+}
+
+/// Asserts a frame observes the IME exactly once in both the editor pass and the Home
+/// early-return pass.
+#[test]
+fn a_frame_observes_the_ime_once_even_when_it_ends_early() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "Hi");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(2), false).unwrap();
+    let before = u.app.ime_observations;
+    u.frame(vec![]);
+    assert_eq!(u.app.ime_observations - before, 1, "one final observation for the editor pass");
+
+    // The home/present early returns make the same single idle observation.
+    u.app.ui.home = true;
+    let before = u.app.ime_observations;
+    u.frame(vec![]);
+    assert_eq!(u.app.ime_observations - before, 1, "one idle observation on the home screen");
+}
+
+/// Asserts a double-click inside an existing edit selects the word without changing the IME
+/// owner or generation.
+#[test]
+fn a_double_click_inside_the_edit_keeps_the_ime_generation() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "Hello world");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(2), false).unwrap();
+    let (p, zoom) = {
+        let doc = u.app.session.doc().unwrap();
+        let node = doc.node(t).unwrap();
+        let Some((layout, dy)) = figcraft_text::layout_node(node) else { return };
+        if layout.glyphs.is_empty() || layout.lines.is_empty() {
+            return; // no fonts
+        }
+        let (x0, x1) = (layout.caret(7).0, layout.caret(8).0);
+        let line = &layout.lines[0];
+        let world = doc.world_transform(t);
+        let p = world * figcraft_geom::Point::new((x0 + x1) / 2.0, line.top + line.height / 2.0 + dy);
+        (p, u.app.session.ds().unwrap().view.zoom)
+    };
+    let first = ime_descriptor(&mut u, vec![]);
+    let ev = figcraft_engine::PointerEvent::at(figcraft_engine::PointerKind::DoubleClick, p.x, p.y, zoom);
+    u.app.session.pointer(&ev).unwrap();
+
+    let after = ime_descriptor(&mut u, vec![]);
+    assert_eq!(after.owner, first.owner, "the same text node is the same owner");
+    assert_eq!(after.context_generation, first.context_generation, "a word-select inside the edit is not a replaced target");
+    assert_eq!(available(&after).text, "Hello world");
+}
+
+/// Asserts a `window.new` that moves the edited file leaves the root window emitting no IME
+/// descriptor.
+#[test]
+fn a_window_new_that_moves_the_edited_file_leaves_the_root_ime_idle() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::empty();
+    s.execute("file.new", &json!({"name": "A"})).unwrap();
+    let uid = s.ds().unwrap().uid;
+    let t = text_layer(&mut s, "Hi");
+    figcraft_engine::textedit::begin(&mut s, t, Some(2), false).unwrap();
+    s.execute("file.new", &json!({"name": "B"})).unwrap();
+    let a = s.docs.iter().position(|d| d.uid == uid).unwrap();
+    s.execute("doc.switch", &json!({"index": a})).unwrap();
+    let mut u = Ui::new(s);
+    u.ctx.set_embed_viewports(false);
+    let first = ime_descriptor(&mut u, vec![]);
+    assert_eq!(available(&first).text, "Hi");
+
+    // A `window.new` queued before the pass is applied after `windows::begin` picked the file
+    // for the root: the root no longer shows the edited file when the pass ends.
+    u.app.window_requests.push(figcraft_engine::UiRequest { kind: "window.new".into(), data: json!({"index": a}) });
+    let out = u.frame_raw(RawInput::default());
+    assert_ne!(u.app.windows.of(uid), 0, "the file moved to its own window");
+    assert!(out.platform_output.ime.is_none(), "the root must not emit a descriptor for a file it no longer shows");
+}
+
+/// Asserts a CRLF-normalized commit is application-origin (`Other`), and bare-newline and
+/// control-only commits insert nothing.
+#[test]
+fn a_transformed_commit_is_application_origin_and_a_bare_newline_does_nothing() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "Hi");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(2), false).unwrap();
+    ime(&mut u, vec![]);
+
+    let normalized = ime_descriptor(&mut u, vec![Event::Ime(ImeEvent::Commit("a\r\nb".into()))]);
+    assert_eq!(normalized.change_cause, ImeChangeCause::Other, "CRLF normalisation is an application transformation");
+    assert_eq!(text(&u, t), "Hia\nb");
+    assert_eq!(available(&normalized).text, "Hia\nb");
+
+    let newline = ime_descriptor(&mut u, vec![Event::Ime(ImeEvent::Commit("\n".into()))]);
+    assert_eq!(text(&u, t), "Hia\nb", "stock TextEdit ignores a bare newline commit");
+    assert!(matches!(newline.surrounding_text, IMESurroundingText::Available(_)));
+    let control = ime_descriptor(&mut u, vec![Event::Ime(ImeEvent::Commit("\u{0}\u{7}".into()))]);
+    assert_eq!(text(&u, t), "Hia\nb", "a control-only commit inserts nothing");
+    assert!(matches!(control.surrounding_text, IMESurroundingText::Available(_)));
+}
+
+/// Asserts character deletion keeps the selection for the paired commit, which replaces it
+/// and reports `InputMethod`.
+#[test]
+fn ime_delete_surrounding_chars_keeps_the_selection_for_the_paired_commit() {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let t = text_layer(&mut s, "ab\u{4F60}\u{597D}cd");
+    let mut u = Ui::new(s);
+    figcraft_engine::textedit::begin(&mut u.app.session, t, Some(2), false).unwrap();
+    figcraft_engine::textedit::set_caret(&mut u.app.session, 4, true).unwrap(); // "你好"
+    ime(&mut u, vec![]);
+
+    let out = ime_descriptor(
+        &mut u,
+        vec![Event::Ime(ImeEvent::DeleteSurrounding { before_chars: 1, after_chars: 1 }), Event::Ime(ImeEvent::Commit("X".into()))],
+    );
+    // The delete removes "b" and "c"; the selected "你好" stays for the commit, which replaces it.
+    assert_eq!(text(&u, t), "aXd");
+    assert_eq!(available(&out).text, "aXd");
+    assert_eq!(available(&out).cursor, 2);
+    assert_eq!(out.change_cause, ImeChangeCause::InputMethod);
+}
diff --git a/crates/ui-egui/src/import_report_tests.rs b/crates/ui-egui/src/import_report_tests.rs
new file mode 100644
index 00000000..8c10c7f3
--- /dev/null
+++ b/crates/ui-egui/src/import_report_tests.rs
@@ -0,0 +1,204 @@
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::import_report::{MAX_NOTE_CHARS, MAX_NOTES, Report, note_text};
+use crate::{FigApp, NoServices};
+
+#[test]
+fn import_results_with_warnings_become_reports_with_counts() {
+    let result =
+        json!({"warnings": ["layers without a type were skipped"], "summary": {"name": "Synthetic design", "pages": 2, "layers": 12, "images": 3}});
+    let report = Report::from_result("file.import", &json!({}), &result).unwrap();
+    assert_eq!(report.name, "Synthetic design");
+    assert_eq!((report.pages, report.layers, report.images), (Some(2), Some(12), Some(3)));
+    assert_eq!(report.notes, ["layers without a type were skipped"]);
+    assert_eq!(report.note_count, 1);
+}
+
+#[test]
+fn only_import_commands_with_warnings_create_reports() {
+    // A warning-free `.fig` or REST open still has a summary to show.
+    let report = Report::from_result("file.open", &json!({}), &json!({"warnings": [], "summary": {"name": "Local", "pages": 1}})).unwrap();
+    assert!(!report.appended && report.notes.is_empty());
+    // A native file's repairs have their own message; an SVG without notes has no `warnings`.
+    assert!(Report::from_result("file.open", &json!({}), &json!({"repairs": ["Repaired parent"]})).is_none());
+    assert!(Report::from_result("file.open", &json!({}), &json!({"index": 0})).is_none());
+    assert!(Report::from_result("file.export", &json!({}), &json!({"warnings": ["Export warning"]})).is_none());
+    assert!(Report::from_result("shape.rectangle", &json!({}), &json!({})).is_none());
+    // File ▸ Open recent opens by path and reports like File ▸ Open.
+    let recent = json!({"warnings": ["layers without a type were skipped"], "summary": {"name": "Recent", "pages": 1}});
+    assert!(Report::from_result("file.openRecent", &json!({"path": "Recent.json"}), &recent).is_some());
+    assert!(Report::from_result("file.openRecent", &json!({"path": "Clean.svg"}), &json!({"warnings": []})).is_none());
+}
+
+#[test]
+fn svg_placements_are_not_reported_as_appended_pages() {
+    assert!(Report::from_result("file.import", &json!({}), &json!({"id": 7})).is_none());
+    let report = Report::from_result("file.import", &json!({}), &json!({"id": 7, "warnings": ["Filter skipped"]})).unwrap();
+    assert!(!report.appended);
+    assert!(Report::from_result("file.import", &json!({}), &json!({"pages": [1], "summary": {"pages": 1}, "warnings": []})).unwrap().appended);
+}
+
+#[test]
+fn report_retention_is_bounded_and_truncates_only_at_character_boundaries() {
+    let long_note = "🦎".repeat(MAX_NOTE_CHARS + 20);
+    let notes: Vec<_> = std::iter::repeat_n(long_note, MAX_NOTES + 37).collect();
+    let report = Report::from_result("file.open", &json!({}), &json!({"warnings": notes})).unwrap();
+    assert_eq!(report.note_count, MAX_NOTES + 37);
+    assert_eq!(report.notes.len(), MAX_NOTES);
+    assert!(report.notes.iter().all(|note| note.chars().count() == MAX_NOTE_CHARS + 1 && note.ends_with('…')));
+}
+
+#[test]
+fn note_text_keeps_the_repeat_suffix_and_unknown_notes() {
+    let base = "instances of components that aren't in the file were imported as frames";
+    let repeated = note_text(&format!("{base} (×122)"));
+    assert_eq!(repeated, "Instances of components that aren't in the file were imported as frames (×122)");
+    assert_eq!(note_text("some unknown note"), "some unknown note");
+    assert_eq!(note_text("weird (×x)"), "weird (×x)");
+    assert_eq!(note_text("weird (×12) tail"), "weird (×12) tail");
+}
+
+#[test]
+fn vector_style_notes_are_known_import_notes() {
+    for note in [
+        "some vector points refer to point settings missing from the file; they use the layer's joins and plain corners",
+        "vector points with unknown stroke joins use the layer join",
+        "point stroke joins were preserved; dashed or variable-width strokes render with the layer join",
+    ] {
+        let shown = note_text(note);
+        assert!(shown.chars().next().is_some_and(char::is_uppercase), "{shown}");
+        assert_eq!(shown[shown.chars().next().unwrap().len_utf8()..], note[note.chars().next().unwrap().len_utf8()..]);
+    }
+}
+
+#[test]
+fn opening_a_rest_json_file_reports_what_was_skipped() {
+    let path = std::env::temp_dir().join(format!("figcraft-import-report-{}.json", std::process::id()));
+    let file = json!({"document": {"id": "0:0", "name": "Synthetic", "type": "DOCUMENT", "children": [
+        {"id": "0:1", "name": "Page 1", "type": "CANVAS", "children": [
+            {"id": "1:1", "name": "Card", "type": "FRAME", "size": {"x": 200, "y": 100}, "relativeTransform": [[1, 0, 10], [0, 1, 20]],
+                "children": [{"id": "1:2", "name": "No type"}]}]}]}});
+    std::fs::write(&path, file.to_string()).unwrap();
+    let mut app = FigApp::new(Session::new(), Box::new(NoServices));
+    // A programmatic open (control channel, MCP) never opens the window.
+    assert!(app.run("file.open", json!({"path": path.to_string_lossy()})).is_some());
+    assert!(app.ui.import_report.is_none());
+    let opened = app.run_user("file.open", json!({"path": path.to_string_lossy()}));
+    std::fs::remove_file(&path).unwrap();
+    assert!(opened.is_some());
+    let report = app.ui.import_report.as_ref().expect("a report for the REST import");
+    assert!(!report.appended);
+    assert_eq!(report.pages, Some(1));
+    assert!(report.layers.is_some_and(|n| n >= 1));
+    assert!(report.notes.iter().any(|n| n == "layers without a type were skipped"), "{:?}", report.notes);
+    assert_eq!(app.inspect()["importReport"]["warningCount"], report.note_count);
+}
+
+#[test]
+fn escape_closes_the_import_report_like_other_simple_dialogs() {
+    let mut u = crate::layers_drag_tests::Ui::new(Session::new());
+    let mut report = Report::from_result("file.open", &json!({}), &json!({"warnings": ["Synthetic note"], "summary": {"name": "Synthetic design"}}));
+    report.as_mut().unwrap().uid = u.app.session.ds().unwrap().uid;
+    u.app.ui.import_report = report;
+    u.frame(vec![]);
+    let escape =
+        vec![egui::Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE }];
+    u.frame(escape);
+    assert!(u.app.ui.import_report.is_none(), "Escape closes the report");
+}
+
+pub(crate) fn shown_texts(shapes: Vec<egui::epaint::ClippedShape>) -> Vec<String> {
+    fn walk(shape: &egui::Shape, out: &mut Vec<String>) {
+        match shape {
+            egui::Shape::Text(t) => out.push(t.galley.text().to_string()),
+            egui::Shape::Vec(v) => v.iter().for_each(|s| walk(s, out)),
+            _ => {}
+        }
+    }
+    let mut out = Vec::new();
+    shapes.iter().for_each(|c| walk(&c.shape, &mut out));
+    out
+}
+
+#[test]
+fn a_clean_svg_open_has_no_report_and_a_placed_svg_says_where_it_went() {
+    let svg_open = Report::from_result("file.open", &json!({"path": "icons/Logo.SVG"}), &json!({"warnings": []}));
+    assert!(svg_open.is_none(), "a clean SVG opened with file.open has nothing to report");
+    let noted = Report::from_result("file.open", &json!({"path": "Logo.svg"}), &json!({"warnings": ["Filter skipped"]})).unwrap();
+    assert_eq!(noted.name, "Logo.svg");
+
+    let placed = Report::from_result("file.import", &json!({"path": "dir/Logo.svg"}), &json!({"id": 7, "warnings": ["Filter skipped"]})).unwrap();
+    assert!(placed.placed && !placed.appended);
+    assert_eq!(placed.name, "Logo.svg");
+    let mut u = crate::layers_drag_tests::Ui::new(Session::new());
+    let mut placed = placed;
+    placed.uid = u.app.session.ds().unwrap().uid;
+    u.app.ui.import_report = Some(placed);
+    let texts = shown_texts({
+        u.frame(vec![]);
+        u.frame_output(vec![]).shapes
+    });
+    assert!(texts.iter().any(|t| t == "Placed on the current page"), "{texts:?}");
+    assert!(!texts.iter().any(|t| t == "Opened as a new document"), "{texts:?}");
+    assert!(texts.iter().any(|t| t == "Logo.svg"), "{texts:?}");
+}
+
+#[test]
+fn the_report_goes_when_its_document_closes_and_counts_omitted_notes_in_the_singular() {
+    let mut u = crate::layers_drag_tests::Ui::new(Session::new());
+    let mut report = Report::from_result("file.open", &json!({}), &json!({"warnings": ["One note"], "summary": {"name": "Synthetic"}})).unwrap();
+    report.uid = u.app.session.ds().unwrap().uid;
+    report.note_count = 2;
+    u.app.ui.import_report = Some(report);
+    let texts = shown_texts({
+        u.frame(vec![]);
+        u.frame_output(vec![]).shapes
+    });
+    assert!(texts.iter().any(|t| t == "1 more note omitted from this report"), "{texts:?}");
+
+    u.app.session.execute("file.new", &json!({"name": "Other"})).unwrap();
+    u.frame(vec![]);
+    assert!(u.app.ui.import_report.is_some(), "another tab was added; the report's document is still open");
+    u.app.session.execute("file.close", &json!({"index": 0, "force": true})).unwrap();
+    u.frame(vec![]);
+    assert!(u.app.ui.import_report.is_none(), "the report left with its document");
+}
+
+#[test]
+fn a_dropped_file_shows_its_report_once_it_opens() {
+    let path = std::env::temp_dir().join(format!("figcraft-import-report-drop-{}.json", std::process::id()));
+    let file = json!({"document": {"id": "0:0", "name": "Dropped", "type": "DOCUMENT", "children": [
+        {"id": "0:1", "name": "Page 1", "type": "CANVAS", "children": [{"id": "1:1", "name": "No type"}]}]}});
+    std::fs::write(&path, file.to_string()).unwrap();
+    let mut u = crate::layers_drag_tests::Ui::new(Session::new());
+    u.app.ui.pending_opens.push(crate::pending_open::PendingOpen {
+        label: "Dropped.json".into(),
+        params: json!({"path": path.to_string_lossy()}),
+        command: "file.open",
+        target: None,
+        read: None,
+    });
+    for _ in 0..6 {
+        u.frame(vec![]);
+    }
+    std::fs::remove_file(&path).unwrap();
+    let report = u.app.ui.import_report.as_ref().expect("the dropped file's report");
+    assert_eq!(report.uid, u.app.session.ds().unwrap().uid);
+}
+
+#[test]
+fn a_file_opened_from_base64_data_has_a_summary_too() {
+    use base64::Engine as _;
+    let file = json!({"document": {"id": "0:0", "name": "From data", "type": "DOCUMENT", "children": [
+        {"id": "0:1", "name": "Page 1", "type": "CANVAS", "children": [{"id": "1:1", "name": "No type"}]}]}});
+    let data = base64::engine::general_purpose::STANDARD.encode(file.to_string());
+    let mut app = FigApp::new(Session::new(), Box::new(NoServices));
+    let opened = app.run_user("file.open", json!({"data": data, "name": "Dropped.json"})).unwrap();
+    assert_eq!(opened["summary"]["pages"], 1);
+    let report = app.ui.import_report.as_ref().expect("a report for the REST import");
+    assert_eq!(report.pages, Some(1));
+    assert!(report.notes.iter().any(|n| n == "layers without a type were skipped"), "{:?}", report.notes);
+    // Shown as a sentence, worked out once when the report opens.
+    assert!(report.shown.iter().any(|n| n == "Layers without a type were skipped"), "{:?}", report.shown);
+}
diff --git a/crates/ui-egui/src/layers_behaviour_tests.rs b/crates/ui-egui/src/layers_behaviour_tests.rs
index 43a8b76e..0f312499 100644
--- a/crates/ui-egui/src/layers_behaviour_tests.rs
+++ b/crates/ui-egui/src/layers_behaviour_tests.rs
@@ -199,6 +199,81 @@ fn page_row(u: &mut Ui, page: NodeId, back: NodeId) -> Pos2 {
     panic!("no row for page {page:?}");
 }
 
+#[test]
+fn pages_search_button_opens_the_filter_and_escape_clears_it() {
+    let s = Session::new();
+    let _ = s.page().unwrap();
+    let mut u = Ui::new(s);
+
+    // The search icon in the Pages header opens the page-name field, not Find and Replace.
+    click(&mut u, Pos2::new(246.0, 124.0), Modifiers::NONE);
+    assert!(u.app.ui.page_search, "the Pages search is open");
+    assert!(u.app.ui.find.is_none(), "page search does not open Find and Replace");
+    u.frame(vec![Event::Text("COMPON".into())]);
+    assert_eq!(u.app.ui.page_filter, "COMPON", "typing can start immediately");
+    u.frame(vec![Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE }]);
+    assert!(!u.app.ui.page_search, "Escape closes page search");
+    assert!(u.app.ui.page_filter.is_empty(), "Escape clears the filter");
+}
+
+#[test]
+fn pages_search_leaves_escape_to_the_canvas_when_the_field_is_unfocused() {
+    let mut s = Session::new();
+    let r = rect(&mut s, "r", 0.0, None);
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    let mut u = Ui::new(s);
+    u.app.ui.page_search = true;
+    u.app.ui.page_filter = "COMPON".into();
+    u.frame(vec![]);
+
+    u.frame(vec![Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE }]);
+
+    assert!(u.app.session.selection().is_empty(), "Escape deselects on the canvas");
+    assert!(u.app.ui.page_search, "the page search stays open");
+    assert_eq!(u.app.ui.page_filter, "COMPON", "and keeps its filter");
+}
+
+#[test]
+fn escape_in_the_pages_search_does_not_reach_the_canvas() {
+    let mut s = Session::new();
+    let r = rect(&mut s, "r", 0.0, None);
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    let mut u = Ui::new(s);
+    click(&mut u, Pos2::new(246.0, 124.0), Modifiers::NONE);
+    assert!(u.app.ui.page_search);
+    u.frame(vec![Event::Text("x".into())]);
+    u.frame(vec![Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE }]);
+    assert!(!u.app.ui.page_search, "Escape closes the page search");
+    assert_eq!(u.app.session.selection(), vec![r], "and leaves the selection alone");
+}
+
+#[test]
+fn pages_search_filters_page_names_case_insensitively() {
+    let mut s = Session::new();
+    let _overview = s.page().unwrap();
+    let components = id(s.execute("page.add", &json!({"name": "Components"})).unwrap());
+    let library = id(s.execute("page.add", &json!({"name": "Library"})).unwrap());
+    s.execute("page.select", &json!({"id": library})).unwrap();
+    let mut u = Ui::new(s);
+    u.app.ui.page_search = true;
+    u.app.ui.page_filter = "COMPON".into();
+    let shapes = u.frame_output(vec![]).shapes;
+    let text = crate::live_tests::texts(&crate::live_tests::flat(&shapes));
+    assert!(text.iter().any(|(label, _, _)| label == "Components"), "the matching page remains visible");
+    assert!(!text.iter().any(|(label, _, _)| label == "Library"), "nonmatching pages are filtered out");
+
+    // Search leaves only Components; the active page starts as Library.
+    for y in (150..400).step_by(4) {
+        let p = Pos2::new(150.0, y as f32);
+        u.button(p, true);
+        u.button(p, false);
+        if u.app.session.page().unwrap() == components {
+            break;
+        }
+    }
+    assert_eq!(u.app.session.page().unwrap(), components, "matching is case-insensitive and opens the named page");
+}
+
 #[test]
 fn pages_drag_to_reorder_and_dividers_open_nothing() {
     let mut s = Session::new();
@@ -237,6 +312,7 @@ fn pages_down_to(u: &mut Ui, to: f32) -> Vec<NodeId> {
     opened
 }
 
+/// Asserts a 60-page list scrolls with the wheel to its last page, past its first pages.
 #[test]
 fn a_long_pages_list_scrolls_and_leaves_room_for_the_layers() {
     let mut s = Session::new();
@@ -255,6 +331,7 @@ fn a_long_pages_list_scrolls_and_leaves_room_for_the_layers() {
     // The wheel over the pages list scrolls it to its last page.
     let wheel = Event::MouseWheel {
         unit: egui::MouseWheelUnit::Point,
+        source: egui::MouseWheelSource::Unknown,
         delta: egui::vec2(0.0, -400.0),
         phase: egui::TouchPhase::Move,
         modifiers: Default::default(),
@@ -307,6 +384,8 @@ fn double_click_checking_focus(u: &mut Ui, p: Pos2) {
     }
 }
 
+/// Asserts double-clicking a page selects and renames it, with the keyboard in its name
+/// field for the screen-reader tree.
 #[test]
 fn double_clicking_a_page_renames_it_with_the_focus_in_the_screen_reader_tree() {
     let mut s = Session::new();
@@ -319,10 +398,10 @@ fn double_clicking_a_page_renames_it_with_the_focus_in_the_screen_reader_tree()
     double_click_checking_focus(&mut u, r2);
     assert_eq!(u.app.session.page().unwrap(), p2);
     assert_eq!(u.app.ui.rename_page.as_ref().map(|r| r.0), Some(p2), "a double click renames the page");
-    assert!(u.ctx.memory(|m| m.has_focus(Id::new(("pagename", p2)).with("te"))), "with the keyboard in its name");
+    assert!(u.ctx.memory(|m| m.has_focus(Id::unique(("pagename", p2)).with("te"))), "with the keyboard in its name");
     // The page that's open.
     u.app.ui.rename_page = None;
-    u.ctx.memory_mut(|m| m.surrender_focus(Id::new(("pagename", p2)).with("te")));
+    u.ctx.memory_mut(|m| m.surrender_focus(Id::unique(("pagename", p2)).with("te")));
     u.app.session.execute("page.select", &json!({"id": p1})).unwrap();
     for _ in 0..30 {
         u.frame(vec![]);
@@ -331,3 +410,160 @@ fn double_clicking_a_page_renames_it_with_the_focus_in_the_screen_reader_tree()
     assert_eq!(u.app.ui.rename_page.as_ref().map(|r| r.0), Some(p1));
     assert!(u.app.ui.last_error.is_none(), "{:?}", u.app.ui.last_error);
 }
+
+/// The y of the line between the pages and the layers, above the layers' row at `layer` (found by
+/// the resize cursor it shows when hovered).
+fn pages_edge_at(u: &mut Ui, layer: f32) -> f32 {
+    let hits: Vec<f32> = ((layer - 120.0) as i32..layer as i32)
+        .map(|y| y as f32)
+        .filter(|y| u.frame_output(vec![Event::PointerMoved(Pos2::new(150.0, *y))]).platform_output.cursor_icon == egui::CursorIcon::ResizeVertical)
+        .collect();
+    assert!(!hits.is_empty(), "no edge above {layer}");
+    (hits[0] + hits[hits.len() - 1]) / 2.0
+}
+
+#[test]
+fn the_line_between_pages_and_layers_drags_to_size_the_pages_list() {
+    let mut s = Session::new();
+    let rect = id(s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap());
+    for _ in 0..59 {
+        s.execute("page.add", &json!({})).unwrap();
+    }
+    let first = s.doc().unwrap().pages[0];
+    s.execute("page.select", &json!({"id": first})).unwrap();
+    s.execute("select.none", &json!({})).unwrap();
+    let mut u = Ui::new(s);
+    let before = u.row_at(rect).y;
+    let edge = pages_edge_at(&mut u, before);
+    // A drag down by 150 px makes the pages list taller and moves the layers down with it.
+    let at = |dy: f32| Pos2::new(150.0, edge + dy);
+    let button = |p, pressed| Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Modifiers::NONE };
+    u.frame(vec![Event::PointerMoved(at(0.0))]);
+    u.frame(vec![button(at(0.0), true)]);
+    for k in 1..=15 {
+        u.frame(vec![Event::PointerMoved(at(10.0 * k as f32))]);
+    }
+    u.frame(vec![button(at(150.0), false)]);
+    for _ in 0..30 {
+        u.frame(vec![]);
+    }
+    let after = u.row_at(rect).y;
+    assert!((after - before - 150.0).abs() < 3.0, "the layers moved from {before} to {after}");
+    // The height is kept for the next start.
+    let kept = u.app.session.prefs.pages_height.expect("kept in the preferences");
+    let mut next = Session::new();
+    next.prefs = u.app.session.prefs.clone();
+    assert_eq!(crate::FigApp::new(next, Box::new(crate::NoServices)).ui.pages_height, Some(kept));
+    // A double-click puts back the default.
+    let edge = pages_edge_at(&mut u, after);
+    let p = Pos2::new(150.0, edge);
+    u.frame(vec![Event::PointerMoved(p)]);
+    for _ in 0..2 {
+        u.frame(vec![button(p, true)]);
+        u.frame(vec![button(p, false)]);
+    }
+    for _ in 0..30 {
+        u.frame(vec![]);
+    }
+    assert_eq!(u.app.session.prefs.pages_height, None);
+    assert!((u.row_at(rect).y - before).abs() < 3.0);
+}
+
+#[test]
+fn dragging_up_the_line_under_a_short_pages_list_shrinks_it_at_once() {
+    // Five pages fit in the room the list is given: the drag starts from the rows shown, not
+    // from that room, so the line follows the pointer.
+    let mut s = Session::new();
+    let rect = id(s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap());
+    for _ in 0..4 {
+        s.execute("page.add", &json!({})).unwrap();
+    }
+    let first = s.doc().unwrap().pages[0];
+    s.execute("page.select", &json!({"id": first})).unwrap();
+    s.execute("select.none", &json!({})).unwrap();
+    let mut u = Ui::new(s);
+    let before = u.row_at(rect).y;
+    let edge = pages_edge_at(&mut u, before);
+    let at = |dy: f32| Pos2::new(150.0, edge + dy);
+    let button = |p, pressed| Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Modifiers::NONE };
+    u.frame(vec![Event::PointerMoved(at(0.0))]);
+    u.frame(vec![button(at(0.0), true)]);
+    for k in 1..=4 {
+        u.frame(vec![Event::PointerMoved(at(-10.0 * k as f32))]);
+    }
+    u.frame(vec![button(at(-40.0), false)]);
+    for _ in 0..30 {
+        u.frame(vec![]);
+    }
+    let after = u.row_at(rect).y;
+    assert!((before - after - 40.0).abs() < 3.0, "the layers moved from {before} to {after}");
+}
+
+#[test]
+fn the_pages_list_keeps_three_rows_and_leaves_the_layers_room() {
+    use crate::layers::{ROW, pages_list_height};
+    // The default: 40% of the panel.
+    assert_eq!(pages_list_height(None, 800.0), 320.0);
+    // Dragged short or tall, it stays within three rows and the room the layers need.
+    assert_eq!(pages_list_height(Some(0.0), 800.0), 3.0 * ROW);
+    assert_eq!(pages_list_height(Some(5000.0), 800.0), 800.0 - 40.0 - 3.0 * ROW);
+    assert_eq!(pages_list_height(Some(f32::NAN), 800.0), 320.0);
+    // A panel too short for both keeps the three rows.
+    assert_eq!(pages_list_height(Some(500.0), 100.0), 3.0 * ROW);
+}
+
+/// Selecting a page that is far down the list automatically scrolls it into view.
+#[test]
+fn selecting_a_distant_page_scrolls_it_into_view() {
+    let mut s = Session::new();
+    let rect = id(s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap());
+    for _ in 0..40 {
+        s.execute("page.add", &json!({})).unwrap();
+    }
+    let pages = s.doc().unwrap().pages.clone();
+    let first = pages[0];
+    let last = *pages.last().unwrap();
+    s.execute("page.select", &json!({"id": first})).unwrap();
+    s.execute("select.none", &json!({})).unwrap();
+    let mut u = Ui::new(s);
+    let layer = u.row_at(rect);
+    u.frame(vec![]);
+    // Select the last page.
+    u.app.run("page.select", json!({"id": last}));
+    for _ in 0..15 {
+        u.frame(vec![]);
+    }
+    assert_eq!(u.app.ui.pages_seen_page, Some((u.app.session.ds().unwrap().uid, last)));
+    let opened = pages_down_to(&mut u, layer.y - 60.0);
+    let top = pages.iter().position(|p| Some(p) == opened.first()).unwrap();
+    assert!(top > 20, "the list scrolled past its first pages to reveal the selection (top row: page {top})");
+}
+
+/// If the active page is filtered out by search, it is not marked as seen
+/// until the filter is cleared and its row actually renders.
+#[test]
+fn filtered_out_active_page_is_seen_only_after_rendering() {
+    let mut s = Session::new();
+    let p1 = s.doc().unwrap().pages[0];
+    let p2 = id(s.execute("page.add", &json!({})).unwrap());
+    s.execute("page.rename", &json!({"id": p1, "name": "Alpha"})).unwrap();
+    s.execute("page.rename", &json!({"id": p2, "name": "Beta"})).unwrap();
+    s.execute("page.select", &json!({"id": p1})).unwrap();
+    let uid = s.ds().unwrap().uid;
+    let mut u = Ui::new(s);
+    assert_eq!(u.app.ui.pages_seen_page, Some((uid, p1)));
+
+    // Filter to only "Alpha", then select "Beta" (p2).
+    u.app.ui.page_search = true;
+    u.app.ui.page_filter = "Alpha".into();
+    u.app.run("page.select", json!({"id": p2}));
+    u.frame(vec![]);
+
+    // Beta was filtered out and not rendered, so pages_seen_page has not recorded it.
+    assert_ne!(u.app.ui.pages_seen_page, Some((uid, p2)));
+
+    // Clear filter: Beta renders now and is recorded.
+    u.app.ui.page_filter.clear();
+    u.frame(vec![]);
+    assert_eq!(u.app.ui.pages_seen_page, Some((uid, p2)));
+}
diff --git a/crates/ui-egui/src/layers_drag_tests.rs b/crates/ui-egui/src/layers_drag_tests.rs
index 37002f9f..978a3b23 100644
--- a/crates/ui-egui/src/layers_drag_tests.rs
+++ b/crates/ui-egui/src/layers_drag_tests.rs
@@ -43,6 +43,7 @@ impl Ui {
     /// screen and clock.
     pub(crate) fn frame_raw(&mut self, raw: RawInput) -> egui::FullOutput {
         self.time += 1.0 / 60.0;
+        self.app.clock.set_test_now(Some(self.time));
         let input = RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), time: Some(self.time), ..raw };
         let app = &mut self.app;
         let mut out = self.ctx.run_ui(input, |ui| app.ui(ui));
@@ -50,6 +51,32 @@ impl Ui {
         out
     }
 
+    /// One frame that egui reruns as a discarded pass (the returned output is the presented pass).
+    ///
+    /// The rerun sees the same `RawInput`; the custom text editor must not apply its events twice,
+    /// and the IME descriptor of the presented pass must still describe the first pass's result.
+    pub(crate) fn frame_raw_with_discard(&mut self, raw: RawInput) -> egui::FullOutput {
+        self.time += 1.0 / 60.0;
+        self.app.clock.set_test_now(Some(self.time));
+        let input = RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), time: Some(self.time), ..raw };
+        let Ui { ctx, app, .. } = self;
+        let mut out = ctx.run_ui(input, |ui| {
+            app.ui(ui);
+            if ui.ctx().current_pass_index() == 0 {
+                ui.ctx().request_discard("ime test: exercise a discarded pass");
+            }
+        });
+        out.textures_delta.clear();
+        out
+    }
+
+    /// Move the harness time (and the app's monotonic clock) forward, e.g. past a deadline; the
+    /// next frame continues from here.
+    pub(crate) fn advance_clock(&mut self, secs: f64) {
+        self.time = secs;
+        self.app.clock.set_test_now(Some(secs));
+    }
+
     /// The middle of `id`'s row in the layers panel (found by hovering down the panel).
     pub(crate) fn row_at(&mut self, id: NodeId) -> Pos2 {
         let mut hits = Vec::new();
@@ -165,3 +192,26 @@ fn dropping_layers_on_another_page_moves_them_there() {
     let doc = u.app.session.doc().unwrap();
     assert_eq!(doc.ancestors(rect).last().copied(), Some(p2), "moved to page 2");
 }
+
+#[test]
+fn dropping_a_layer_one_place_over_moves_it_one_place() {
+    // #992: the panel drops on a gap between rows; the layer ends up in that gap.
+    let mut s = Session::new();
+    let rect =
+        |s: &mut Session, x: i32| id(s.execute("node.create", &json!({"type": "rectangle", "x": x, "y": 0, "width": 10, "height": 10})).unwrap());
+    let (a, b, c) = (rect(&mut s, 0), rect(&mut s, 20), rect(&mut s, 40));
+    s.execute("select.none", &json!({})).unwrap();
+    let page = s.page().unwrap();
+    let mut u = Ui::new(s);
+    let kids = |u: &Ui| u.app.session.doc().unwrap().node(page).unwrap().children.clone();
+    // The list shows c, b, a top to bottom: `a` dragged onto the top edge of `b` goes just above it.
+    let (from, to) = (u.row_at(a), u.row_at(b) - vec2(0.0, 12.0));
+    u.drag_to(from, to);
+    u.button(to, false);
+    assert_eq!(kids(&u), [b, a, c], "dropped between b and c");
+    // And `c` dragged onto the bottom edge of `a` goes just below it.
+    let (from, to) = (u.row_at(c), u.row_at(a) + vec2(0.0, 12.0));
+    u.drag_to(from, to);
+    u.button(to, false);
+    assert_eq!(kids(&u), [b, c, a], "dropped between a and b");
+}
diff --git a/crates/ui-egui/src/layers_keys_tests.rs b/crates/ui-egui/src/layers_keys_tests.rs
index b78890a8..63f8ce74 100644
--- a/crates/ui-egui/src/layers_keys_tests.rs
+++ b/crates/ui-egui/src/layers_keys_tests.rs
@@ -1,8 +1,8 @@
 //! Arrow keys in the layers panel once a row has been clicked: up/down through the rows (Shift
 //! extends), left/right to collapse, expand, and go to the parent or first child; a press on the
-//! canvas gives arrows back to nudging.
+//! canvas gives arrows back to nudging. Delete after a click in the Pages list deletes the page.
 
-use egui::{Event, Key, Modifiers, pos2};
+use egui::{Event, Key, Modifiers, Pos2, pos2, vec2};
 use figcraft_doc::NodeId;
 use figcraft_engine::Session;
 use serde_json::json;
@@ -107,3 +107,125 @@ fn a_canvas_press_gives_arrows_back_to_nudging() {
     let doc = u.app.session.doc().unwrap();
     assert_eq!(doc.node(c).unwrap().transform.translation().x, 201.0);
 }
+
+/// The middle of `page`'s row in the Pages list, found by clicking down the list until it opens;
+/// then back to `back`.
+fn page_row(u: &mut Ui, page: NodeId, back: NodeId) -> Pos2 {
+    for y in (90..400).step_by(4) {
+        let p = pos2(150.0, y as f32);
+        u.button(p, true);
+        u.button(p, false);
+        if u.app.session.page().unwrap() == page {
+            u.app.session.execute("page.select", &json!({"id": back})).unwrap();
+            u.frame(vec![]);
+            // Rows are 32 high: aim at the middle, past the hit tolerance at its edge.
+            return p + vec2(0.0, 12.0);
+        }
+    }
+    panic!("no row for page {page:?}");
+}
+
+fn pages(u: &Ui) -> usize {
+    u.app.session.doc().unwrap().pages.len()
+}
+
+#[test]
+fn delete_after_clicking_a_page_deletes_it_without_asking() {
+    // #859: Delete on a page picked in the Pages list said "nothing is selected".
+    let (mut u, ..) = setup();
+    let first = u.app.session.page().unwrap();
+    let second = id(u.app.session.execute("page.add", &json!({})).unwrap());
+    u.app.session.execute("page.select", &json!({"id": first})).unwrap();
+    u.frame(vec![]);
+    let row = page_row(&mut u, second, first);
+    u.button(row, true);
+    u.button(row, false);
+    assert_eq!(u.app.session.page().unwrap(), second);
+    key(&mut u, Key::Delete, false);
+    // Gone at once, no confirmation: a toast says so and Undo brings it back.
+    assert_eq!(pages(&u), 1);
+    assert!(!u.app.session.doc().unwrap().pages.contains(&second));
+    assert_eq!(u.app.ui.toast.as_ref().map(|t| t.0.as_str()), Some("Page deleted"));
+    u.app.run("edit.undo", json!({}));
+    assert_eq!(pages(&u), 2);
+    // Backspace (the Mac's delete key) does the same.
+    let row = page_row(&mut u, second, first);
+    u.button(row, true);
+    u.button(row, false);
+    key(&mut u, Key::Backspace, false);
+    assert_eq!(pages(&u), 1);
+    // The last page stays.
+    key(&mut u, Key::Delete, false);
+    assert_eq!(pages(&u), 1);
+}
+
+#[test]
+fn selected_layers_or_a_canvas_press_take_delete_back_from_the_pages_list() {
+    let (mut u, a, ..) = setup();
+    let first = u.app.session.page().unwrap();
+    let second = id(u.app.session.execute("page.add", &json!({})).unwrap());
+    u.frame(vec![]);
+    let row = page_row(&mut u, first, second);
+    u.button(row, true);
+    u.button(row, false);
+    assert_eq!(u.app.session.page().unwrap(), first);
+    assert!(u.app.ui.pages_focus.is_some());
+    // Layers selected after the click (Select all, say): Delete deletes them, not the page.
+    u.app.run("select.set", json!({"ids": [a]}));
+    key(&mut u, Key::Delete, false);
+    assert_eq!(pages(&u), 2);
+    assert!(u.app.session.doc().unwrap().node(a).is_none());
+    // Nothing is selected now, but the list gave up the keyboard: a second Delete keeps the page.
+    assert!(u.app.ui.pages_focus.is_none());
+    key(&mut u, Key::Delete, false);
+    assert_eq!(pages(&u), 2, "a second Delete keeps the page");
+    // A press on the canvas gives Delete back to it.
+    u.button(row, true);
+    u.button(row, false);
+    assert!(u.app.ui.pages_focus.is_some());
+    let p = pos2(900.0, 700.0);
+    u.button(p, true);
+    u.button(p, false);
+    assert!(u.app.ui.pages_focus.is_none());
+    u.app.run("select.none", json!({}));
+    key(&mut u, Key::Delete, false);
+    assert_eq!(pages(&u), 2, "Delete with nothing selected on the canvas deletes no page");
+}
+
+#[test]
+fn delete_deletes_no_page_once_the_pages_list_is_off_screen_or_another_file_is_open() {
+    let (mut u, ..) = setup();
+    let first = u.app.session.page().unwrap();
+    let second = id(u.app.session.execute("page.add", &json!({})).unwrap());
+    u.app.session.execute("page.select", &json!({"id": first})).unwrap();
+    u.frame(vec![]);
+    let row = page_row(&mut u, second, first);
+    let click = |u: &mut Ui| {
+        u.button(row, true);
+        u.button(row, false);
+        assert!(u.app.ui.pages_focus.is_some());
+    };
+    // The Assets tab, a collapsed Pages list, a collapsed left panel.
+    let hide: [fn(&mut Ui, bool); 3] = [
+        |u, on| u.app.ui.left_tab = if on { crate::LeftTab::Assets } else { crate::LeftTab::File },
+        |u, on| u.app.ui.pages_open = !on,
+        |u, on| u.app.ui.left_collapsed = on,
+    ];
+    for (k, hide) in hide.iter().enumerate() {
+        click(&mut u);
+        hide(&mut u, true);
+        u.frame(vec![]);
+        key(&mut u, Key::Delete, false);
+        assert_eq!(pages(&u), 2, "case {k}: the list is off screen");
+        hide(&mut u, false);
+        u.frame(vec![]);
+    }
+    // Another file open: its pages are safe.
+    click(&mut u);
+    u.app.run("file.new", json!({}));
+    u.app.run("page.add", json!({}));
+    u.frame(vec![]);
+    assert_eq!(pages(&u), 2);
+    key(&mut u, Key::Delete, false);
+    assert_eq!(pages(&u), 2, "the other file keeps its pages");
+}
diff --git a/crates/ui-egui/src/layers_rename_tests.rs b/crates/ui-egui/src/layers_rename_tests.rs
index 4f5c6af8..c1c229eb 100644
--- a/crates/ui-egui/src/layers_rename_tests.rs
+++ b/crates/ui-egui/src/layers_rename_tests.rs
@@ -144,6 +144,8 @@ fn rename_without_a_name_renames_one_row_or_opens_the_dialog() {
     assert!(std::sync::Arc::ptr_eq(&doc, &s.ds().unwrap().doc));
 }
 
+/// Asserts a layer rename continues after its row is scrolled out of view and commits on
+/// Enter.
 #[test]
 fn a_rename_scrolled_out_of_view_goes_on() {
     let mut s = Session::new();
@@ -158,6 +160,7 @@ fn a_rename_scrolled_out_of_view_goes_on() {
     let p = egui::pos2(150.0, 400.0);
     let wheel = Event::MouseWheel {
         unit: egui::MouseWheelUnit::Point,
+        source: egui::MouseWheelSource::Unknown,
         delta: egui::vec2(0.0, -400.0),
         phase: egui::TouchPhase::Move,
         modifiers: Modifiers::NONE,
@@ -170,3 +173,28 @@ fn a_rename_scrolled_out_of_view_goes_on() {
     press(&mut u, Key::Enter, Modifiers::NONE);
     assert_eq!(name(&u, top), "Far");
 }
+
+#[test]
+fn a_key_typed_in_the_frame_a_rename_starts_replaces_the_name() {
+    // The app draws no frame between the double-click's last release (or F2, or File ▸ Rename) and
+    // the first key, so the name field first shows in the frame that types into it.
+    let (mut u, a, _, _, c) = setup();
+    let p = u.row_at(c);
+    for _ in 0..2 {
+        u.button(p, true);
+        u.button(p, false);
+    }
+    type_text(&mut u, "Hero");
+    press(&mut u, Key::Enter, Modifiers::NONE);
+    assert_eq!(name(&u, c), "Hero", "a double-click rename");
+    u.app.session.execute("select.set", &json!({"ids": [a]})).unwrap();
+    u.frame(vec![]);
+    press(&mut u, Key::F2, Modifiers::NONE);
+    type_text(&mut u, "Base");
+    press(&mut u, Key::Enter, Modifiers::NONE);
+    assert_eq!(name(&u, a), "Base", "an F2 rename");
+    crate::menus::invoke(&mut u.app, "file.rename");
+    type_text(&mut u, "Brand kit");
+    press(&mut u, Key::Enter, Modifiers::NONE);
+    assert_eq!(u.app.session.doc().unwrap().name, "Brand kit", "File ▸ Rename");
+}
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 20a8a77c..1eb714e9 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -6,64 +6,30 @@
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
 
 pub mod a11y;
-pub mod assets_panel;
 pub mod bidi;
-pub mod branch_ui;
 pub mod canvas;
 pub mod cjk;
-pub mod colorpicker;
-pub mod comments;
-pub mod component_panel;
 pub mod control;
-pub mod credits;
-pub mod cursors;
-pub mod dev_compare;
-pub mod dev_mode;
 pub mod dialogs;
-pub mod export_panel;
-pub mod field_math;
-pub mod font_preview;
-pub mod frame_labels;
-pub mod frame_presets;
-pub mod frame_stats;
-pub mod guides;
-pub mod handles;
 pub mod home;
-pub mod home_recents;
 pub mod i18n;
 pub mod icons;
-pub mod layers;
-pub mod layout_panel;
-pub mod list_drag;
 pub mod live;
-pub mod live_text;
-pub mod measure_overlay;
 pub mod menus;
-pub mod online;
 pub mod pending_open;
-pub mod plugins_ui;
 pub mod present;
-pub mod proto_canvas;
-pub mod proto_editor;
-pub mod proto_panel;
-pub mod render_worker;
-pub mod right;
-pub mod scale_panel;
-pub mod section_panel;
 pub mod shortcuts;
-pub mod shortcuts_panel;
-pub mod style_picker;
 pub mod tabs;
 pub mod theme;
 pub mod toolbar;
-pub mod typography;
-pub mod variable_ui;
-pub mod variables_panel;
-pub mod vector_panel;
-pub mod versions;
+pub mod ui_scale;
 pub mod widgets;
 pub mod windows;
 
+#[cfg(test)]
+mod board_picker_tests;
+#[cfg(test)]
+mod board_ui_tests;
 #[cfg(test)]
 mod theme_startup_tests;
 
@@ -80,14 +46,32 @@ mod canvas_drag_tests;
 #[cfg(test)]
 mod canvas_fixes_tests;
 #[cfg(test)]
+mod canvas_image_rect_tests;
+#[cfg(test)]
+mod clipboard_fence_tests;
+#[cfg(test)]
+mod colorpicker_eyedropper_tests;
+#[cfg(test)]
 mod colorpicker_selection_tests;
 #[cfg(test)]
 mod comments_tests;
 #[cfg(test)]
+mod component_props_reorder_tests;
+#[cfg(test)]
+mod component_swap_default_tests;
+#[cfg(test)]
+mod context_menu_tests;
+#[cfg(test)]
+mod corner_individual_tests;
+#[cfg(test)]
 mod cursors_tests;
 #[cfg(test)]
+mod design_paste_tests;
+#[cfg(test)]
 mod dev_mode_tests;
 #[cfg(test)]
+mod devmode_tail_tests;
+#[cfg(test)]
 mod duplicate_paint_tests;
 #[cfg(test)]
 mod export_preview_tests;
@@ -108,6 +92,10 @@ mod home_tests;
 #[cfg(test)]
 mod idle_tests;
 #[cfg(test)]
+mod ime_tests;
+#[cfg(test)]
+mod import_report_tests;
+#[cfg(test)]
 mod layers_behaviour_tests;
 #[cfg(test)]
 mod layers_drag_tests;
@@ -132,15 +120,32 @@ mod live_tests;
 #[cfg(test)]
 mod live_text_tests;
 #[cfg(test)]
+mod measure_nudge_tests;
+#[cfg(test)]
+mod menu_aim_tests;
+#[cfg(test)]
+mod menu_contrast_tests;
+#[cfg(test)]
+mod menu_input_tests;
+#[cfg(test)]
+mod missing_fonts_tests;
+#[cfg(test)]
 mod online_tests;
 #[cfg(test)]
 mod open_issues_tests;
 #[cfg(test)]
+mod padding_individual_tests;
+#[cfg(test)]
+mod palette_tests;
+#[cfg(test)]
 mod panel_remove_tests;
 #[cfg(test)]
 mod panel_reorder_tests;
 #[cfg(test)]
 mod panel_width_tests;
+mod panels;
+#[cfg(test)]
+mod paste_image_tests;
 #[cfg(test)]
 mod pen_mode_tests;
 #[cfg(test)]
@@ -148,20 +153,32 @@ mod perf_tests;
 #[cfg(test)]
 mod plugin_panel_tests;
 #[cfg(test)]
+mod plugin_save_ui_tests;
+#[cfg(test)]
 mod plugins_browse_tests;
 #[cfg(test)]
 mod popup_width_tests;
 #[cfg(test)]
+mod present_links_tests;
+#[cfg(test)]
+mod present_tab_tests;
+#[cfg(test)]
 mod present_tests;
 #[cfg(test)]
 mod present_view_tests;
 #[cfg(test)]
+mod property_menu_tests;
+#[cfg(test)]
 mod proto_editor_tests;
 #[cfg(test)]
 mod proto_reorder_tests;
 #[cfg(test)]
 mod proto_responsive_tests;
 #[cfg(test)]
+mod resources_tests;
+#[cfg(test)]
+mod save_as_tests;
+#[cfg(test)]
 mod select_all_tests;
 #[cfg(test)]
 mod shortcut_keys_tests;
@@ -174,21 +191,78 @@ mod text_enter_tests;
 #[cfg(test)]
 mod titlebar_tests;
 #[cfg(test)]
+mod ui_scale_tests;
+#[cfg(test)]
 mod variables_export_ui_tests;
 #[cfg(test)]
 mod variables_rename_tests;
 #[cfg(test)]
+mod variants_discovery_tests;
+#[cfg(test)]
+mod vector_keys_tests;
+#[cfg(test)]
 mod vector_panel_tests;
 #[cfg(test)]
 mod vector_tail_ui_tests;
 #[cfg(test)]
 mod web_clipboard_tests;
 #[cfg(test)]
+mod web_save_tests;
+#[cfg(test)]
 mod windows_qa_tests;
 #[cfg(test)]
 mod windows_tests;
+pub use canvas::board_bar;
+pub use canvas::board_facilitate;
+pub use canvas::comments;
+pub use canvas::cursors;
+pub use canvas::frame_labels;
+pub use canvas::frame_stats;
+pub use canvas::guides;
+pub use canvas::handles;
+pub use canvas::live_text;
+pub use canvas::measure_overlay;
+pub use canvas::proto_canvas;
+pub use canvas::render_worker;
+use canvas::selection_spacing;
+pub use canvas::widget_bar;
+pub use dialogs::branch_ui;
+pub use dialogs::credits;
+pub use dialogs::import_report;
+pub use dialogs::missing_fonts;
+pub use dialogs::plugins_ui;
+pub use dialogs::updates_ui;
+pub use dialogs::variables_panel;
+pub use home::home_recents;
+pub use home::online;
+pub use panels::assets_panel;
+pub use panels::component_panel;
+pub use panels::dev_compare;
+pub use panels::dev_mode;
+pub use panels::export_panel;
+pub use panels::frame_presets;
+pub use panels::layers;
+pub use panels::layout_panel;
+pub use panels::list_drag;
+pub use panels::proto_editor;
+pub use panels::proto_panel;
+pub use panels::right;
+pub use panels::scale_panel;
+pub use panels::section_panel;
+pub use panels::selection_colors;
+pub use panels::shortcuts_panel;
+pub use panels::typography;
+pub use panels::variable_ui;
+pub use panels::vector_panel;
+pub use panels::versions;
+use widgets::board_picker;
+pub use widgets::colorpicker;
+pub use widgets::field_math;
+pub use widgets::font_preview;
+pub use widgets::style_picker;
 
 use std::collections::BTreeSet;
+use std::ffi::OsStr;
 use std::future::Future;
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
@@ -199,72 +273,29 @@ use figcraft_doc::NodeId;
 use figcraft_engine::Session;
 use serde_json::{Value, json};
 
-pub use control::{ControlReply, ControlRequest};
+pub use control::{ControlReply, ControlRequest, RequestGate, RequestState};
 
-/// Platform services the app crate provides (file dialogs, clipboard, URLs).
-pub trait Services {
-    fn pick_open(&mut self, _title: &str, _exts: &[&str]) -> DialogFuture {
-        Box::pin(std::future::ready(None))
-    }
-    fn pick_save(&mut self, _title: &str, _name: &str, _exts: &[&str]) -> DialogFuture {
-        Box::pin(std::future::ready(None))
-    }
-    /// The platform saves files by handing them over as downloads (the browser), not through
-    /// save dialogs.
-    fn downloads(&self) -> bool {
-        false
-    }
-    /// Hand `bytes` over as a download named `name`; false when nothing was delivered.
-    fn download(&mut self, _name: &str, _bytes: &[u8]) -> bool {
-        false
-    }
-    /// A folder to write several files into.
-    fn pick_folder(&mut self, _title: &str) -> DialogFuture {
-        Box::pin(std::future::ready(None))
-    }
-    fn clipboard_set_text(&mut self, _s: &str) {}
-    fn clipboard_get_text(&mut self) -> Option<String> {
-        None
-    }
-    fn clipboard_set_png(&mut self, _w: u32, _h: u32, _rgba: &[u8]) {}
-    /// An image on the system clipboard as (width, height, straight RGBA).
-    fn clipboard_get_image(&mut self) -> Option<(u32, u32, Vec<u8>)> {
-        None
-    }
-    fn open_url(&mut self, _url: &str) {}
-    /// Show the file at `path` in the platform's file manager (Finder, Explorer), selected where the
-    /// platform can.
-    fn reveal_path(&mut self, _path: &std::path::Path) {}
-    /// The system asks for reduced motion (its accessibility setting).
-    fn reduce_motion(&self) -> bool {
-        false
-    }
-    /// After a panic in a frame: keep recovery copies of unsaved files.
-    fn emergency_save(&mut self, _session: &Session) {}
-    /// Keep the preferences now (the installed plugins or their settings changed), as the app
-    /// does when it quits.
-    fn save_prefs(&mut self, _prefs: &figcraft_engine::Prefs) {}
-    /// The OS or browser language as a tag ("es-ES"), for the "system" language preference.
-    fn system_language(&self) -> Option<String> {
-        None
-    }
-    /// The controller buttons held now on any controller: bit i is standard gamepad layout index i
-    /// (0 the bottom face button … 16 home; `figcraft_doc::proto::GAMEPAD_BUTTONS`). The prototype
-    /// player asks every frame while its prototype has gamepad triggers.
-    fn gamepad_held(&mut self) -> u32 {
-        0
-    }
-}
+mod app;
+mod clock;
+mod open;
+mod services;
+mod state;
 
-pub type DialogFuture = Pin<Box<dyn Future<Output = Option<PathBuf>>>>;
-type DialogDone = Box<dyn FnOnce(&mut FigApp, PathBuf)>;
+pub(crate) use clock::repaint_in;
+pub use clock::{AUTO_SAVE_SECS, AUTOSAVE_SECS, FrameClock, ToastClock};
+pub(crate) use open::{drop_overlay, dropped_bytes, is_document, opens};
+pub use services::{ContentsFuture, DialogFuture, NoServices, ReadFuture, Services, browser_can_read, egui_copy_png, egui_copy_text, unreadable};
+use services::{DialogDone, PickFuture, Picked, RepaintWaker};
+pub use state::{
+    AutoSaveEncoding, CANVAS_MIN, LEFT_PANEL, LeftTab, MobilePanel, NARROW_WIDTH, PANEL_DEFAULT, RIGHT_PANEL, RightTab, TitleBar, fit_panels,
+};
 
 /// A native dialog in flight. The app keeps working while it is open, so its result goes to the
 /// file and window it was opened for, not to whichever is in front when it closes.
 struct PendingDialog {
-    future: DialogFuture,
-    /// The path picked, kept until the window that holds `doc` draws.
-    path: Option<PathBuf>,
+    future: PickFuture,
+    /// What was picked, kept until the window that holds `doc` draws.
+    picked: Option<Picked>,
     done: DialogDone,
     /// The file it acts on (`None`: none, such as Open).
     doc: Option<u64>,
@@ -272,121 +303,22 @@ struct PendingDialog {
     window: u64,
 }
 
-/// Wakes the main window, which hands the result on to the window it belongs to.
-struct RepaintWaker(egui::Context);
-impl Wake for RepaintWaker {
-    fn wake(self: Arc<Self>) {
-        self.0.request_repaint_of(egui::ViewportId::ROOT);
+impl UiState {
+    /// Opens the left panel; a narrow window shows it in place of the right one.
+    pub fn open_left_panel(&mut self) {
+        self.left_collapsed = false;
+        self.mobile_panel = Some(MobilePanel::Left);
     }
 
-    fn wake_by_ref(self: &Arc<Self>) {
-        self.0.request_repaint_of(egui::ViewportId::ROOT);
+    /// Closes the left panel.
+    pub fn close_left_panel(&mut self) {
+        self.left_collapsed = true;
+        if self.mobile_panel == Some(MobilePanel::Left) {
+            self.mobile_panel = None;
+        }
     }
 }
 
-/// No-op services (tests, headless screenshots).
-pub struct NoServices;
-impl Services for NoServices {}
-
-/// Put `text` on the system clipboard through egui's output, which the browser shell writes while
-/// it handles the copy event (the only time a page may write it). For shells without a clipboard
-/// of their own.
-pub fn egui_copy_text(ctx: &egui::Context, text: &str) {
-    ctx.copy_text(text.to_string());
-}
-
-/// Put a straight-RGBA image on the system clipboard through egui's output (see
-/// [`egui_copy_text`]); a buffer that doesn't match its size is dropped.
-pub fn egui_copy_png(ctx: &egui::Context, w: u32, h: u32, rgba: &[u8]) {
-    let (w, h) = (w as usize, h as usize);
-    if w.checked_mul(h).and_then(|n| n.checked_mul(4)) != Some(rgba.len()) {
-        return;
-    }
-    ctx.copy_image(egui::ColorImage::from_rgba_unmultiplied([w, h], rgba));
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, serde::Serialize)]
-pub enum RightTab {
-    Design,
-    Prototype,
-    Inspect,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, serde::Serialize)]
-pub enum LeftTab {
-    File,
-    Assets,
-}
-
-/// The window's title bar.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
-pub enum TitleBar {
-    /// The system draws it (and the browser): the tab strip sits below.
-    #[default]
-    Native,
-    /// A frameless window: the tab strip is the title bar, with our own window buttons and edges.
-    Custom,
-    /// macOS: the system's window buttons inset at the left of the tab strip.
-    Inset,
-}
-
-/// How often open documents get an autosave checkpoint (seconds).
-pub const AUTOSAVE_SECS: f64 = 30.0 * 60.0;
-
-/// Most changed layers whose names are checked for CJK scripts one by one (beyond: all of them).
-const CJK_CHANGES: usize = 10_000;
-
-/// With auto-save on: how long after a file last changed it is saved, and how long a failed save
-/// waits before trying again (seconds).
-pub const AUTO_SAVE_SECS: f64 = 3.0;
-const AUTO_SAVE_RETRY_SECS: f64 = 60.0;
-
-/// A file being encoded for auto-save: its snapshot and, once done, its bytes.
-pub type AutoSaveEncoding = std::thread::JoinHandle<(figcraft_engine::cmd::file::FileSnapshot, figcraft_engine::Result<Vec<u8>>)>;
-
-/// How long a toast shows (seconds).
-const TOAST_SECS: f64 = 3.0;
-
-/// How long a toast has been showing ([`UiState::toast`]).
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum ToastClock {
-    /// Raised, not drawn yet.
-    Raised,
-    /// Drawn once; the next frame starts the clock.
-    Drawn,
-    /// Showing since this time (UI clock, seconds).
-    Since(f64),
-}
-
-/// Draw another frame `secs` from now (nothing else needs drawing until then: an idle window draws
-/// no frames).
-#[track_caller]
-pub(crate) fn repaint_in(ctx: &egui::Context, secs: f64) {
-    if secs.is_finite() {
-        ctx.request_repaint_after(std::time::Duration::from_secs_f64(secs.max(0.0)));
-    }
-}
-
-/// The side panels' widths: the least and most a drag of their edge gives, what a double-click on
-/// the edge puts back, and how much of the window they leave the canvas.
-pub const LEFT_PANEL: std::ops::RangeInclusive<f32> = 200.0..=480.0;
-pub const RIGHT_PANEL: std::ops::RangeInclusive<f32> = 240.0..=480.0;
-pub const PANEL_DEFAULT: f32 = 240.0;
-pub const CANVAS_MIN: f32 = 160.0;
-
-/// The widths the side panels are drawn at in `avail` points (the window less the icon rail), from
-/// the widths asked for (`left`: none while it is closed): each within its limits, and narrower
-/// in a small window so the canvas keeps [`CANVAS_MIN`] (the right panel gives way last).
-pub fn fit_panels(avail: f32, left: Option<f32>, right: f32) -> (f32, f32) {
-    let fit = |w: f32, range: &std::ops::RangeInclusive<f32>, room: f32| {
-        let w = if w.is_finite() { w } else { PANEL_DEFAULT };
-        w.clamp(*range.start(), room.clamp(*range.start(), *range.end()))
-    };
-    let left_min = left.map_or(0.0, |_| *LEFT_PANEL.start());
-    let right = fit(right, &RIGHT_PANEL, avail - left_min - CANVAS_MIN);
-    (left.map_or(0.0, |l| fit(l, &LEFT_PANEL, avail - right - CANVAS_MIN)), right)
-}
-
 /// UI-only state (serialisable for `ui.inspect`).
 pub struct UiState {
     /// The widths asked for the side panels (a drag of their edge; [`fit_panels`] gives what a
@@ -398,18 +330,44 @@ pub struct UiState {
     pub last_right_tab: RightTab,
     pub left_tab: LeftTab,
     pub pages_open: bool,
+    /// Pages panel search: open, and the case-insensitive name filter.
+    pub page_search: bool,
+    pub page_filter: String,
+    /// The height asked for the pages list (`None`: a share of the panel).
+    pub pages_height: Option<f32>,
+    /// The document and active page last drawn in the pages list.
+    pub pages_seen_page: Option<(u64, NodeId)>,
     pub expanded: BTreeSet<NodeId>,
     /// The layer being renamed in the layers panel.
     pub rename: Option<layers::Rename>,
     pub rename_page: Option<(NodeId, String)>,
+    /// The frame or section whose name label on the canvas is being renamed (a double-click on it).
+    pub rename_label: Option<layers::Rename>,
     pub main_menu: bool,
     pub palette: Option<String>,
+    /// The Actions palette's tab.
+    pub palette_tab: menus::PaletteTab,
+    /// The palette row Up and Down are on (Enter runs it).
+    pub palette_hi: usize,
+    /// The palette ignores one outside click after opening (the click that opened it).
+    pub palette_armed: bool,
+    /// The context menu has been drawn at least once (its opening frame's press is spared).
+    pub context_menu_shown: bool,
+    /// This frame's Actions toolbar button rect: presses on it toggle, never dismiss.
+    pub actions_rect: Option<egui::Rect>,
     /// The Variables editor, when open.
     pub variables: Option<variables_panel::Editor>,
     pub about: bool,
     /// The tab the About window shows.
     pub about_tab: dialogs::AboutTab,
     pub preferences: bool,
+    /// A menu command that needs a value before the engine can run it.
+    pub menu_input: Option<dialogs::MenuInput>,
+    /// File ▸ Rename: the file name in the left panel starts its inline rename on the next frame.
+    pub rename_file: bool,
+    /// What the interface size drew last frame and whether the window held it back. Set by
+    /// [`FigApp::logic`] for the main window.
+    pub ui_scale: ui_scale::Plan,
     pub shortcuts_panel: bool,
     /// The Keyboard shortcuts panel's tab and search text.
     pub shortcuts_tab: figcraft_engine::keymap::Group,
@@ -426,6 +384,10 @@ pub struct UiState {
     /// A message at the bottom of the window and how long it has been showing.
     pub toast: Option<(String, ToastClock)>,
     pub present: Option<present::Presenter>,
+    pub presents: Vec<present::PresentTab>,
+    /// The tab shown last. It is on screen while `present` has a value.
+    pub present_active: Option<u64>,
+    pub present_next: u64,
     /// The full-window presenter's options (how it sizes the prototype), kept between
     /// presentations.
     pub present_view: present::PresentView,
@@ -447,15 +409,26 @@ pub struct UiState {
     /// The layers panel has the keyboard: arrow keys move through its rows instead of nudging
     /// (set by a click on a row, cleared by a press on the canvas).
     pub layers_focus: bool,
+    /// The file (its `uid`) whose pages list has the keyboard: Delete with no layers selected deletes
+    /// its current page (set by a click on a page row or the add-page button, cleared by a click on a
+    /// layer row or a press on the canvas).
+    pub pages_focus: Option<u64>,
     pub layers_seen_sel: Vec<NodeId>,
     pub dark: bool,
     pub follow_system: bool,
     pub tool_flyout: Option<&'static str>,
+    /// On a board: the Design panel is shown (boards hide it until asked for).
+    pub board_panel: bool,
     pub last_error: Option<String>,
     /// Files dropped on the home screen or the canvas, opened once their card has been on screen
     /// ([`pending_open::pending_opens`]), and the frames it has been drawn.
     pub pending_opens: Vec<pending_open::PendingOpen>,
     pub pending_open_frames: u8,
+    /// The latest successful file import's summary and compatibility notes.
+    pub import_report: Option<import_report::Report>,
+    /// Files the user opened whose fonts are yet to be checked (by document uid).
+    pub font_checks: Vec<u64>,
+    pub missing_fonts: Option<missing_fonts::Shown>,
     pub screenshot_requests: Vec<(u64, String)>,
     pub frame_ms: f64,
     pub render_ms: f64,
@@ -484,6 +457,10 @@ pub struct UiState {
     /// The Rename layers dialog (several layers), while open.
     pub batch_rename: Option<dialogs::BatchRenameUi>,
     pub left_collapsed: bool,
+    /// The side panel open in a narrow window (a phone), where only one shows at a time.
+    pub mobile_panel: Option<MobilePanel>,
+    /// The window was narrow (one side panel at a time) at the last frame.
+    pub narrow: bool,
     pub comments: comments::CommentUi,
     pub versions: versions::VersionUi,
     /// The branch review dialog, while open.
@@ -493,10 +470,28 @@ pub struct UiState {
 
     /// What FigCraft last put on the system clipboard: when the clipboard still holds it, a paste
     /// uses our copied layers; anything else there (an image, SVG, text) came from another app.
+    /// `None` also means a programmatic copy changed the engine clipboard without writing the OS
+    /// clipboard, so the system text is no longer known to be ours.
     pub last_copy: Option<String>,
-    /// When (UI clock, seconds) open documents next get an autosave checkpoint.
+    /// The engine clipboard's layers generation when `last_copy` was mirrored. A programmatic
+    /// copy changes the engine clipboard without writing the OS clipboard; the generation then
+    /// no longer matches, so the stale mirror is not mistaken for the user's own copy.
+    pub last_copy_generation: u64,
+    /// Since the last V key release: whether its press arrived, and whether a paste event did
+    /// (`shortcuts::swallowed_paste`).
+    pub v_pressed: bool,
+    pub paste_event: bool,
+    /// The window got the focus back since the last V release.
+    pub refocused: bool,
+    /// A save shortcut pressed while a panel field had the keyboard: the field lets go (which
+    /// commits what was typed) and the command runs next frame for that document/window.
+    pub after_field: Option<shortcuts::AfterFieldSave>,
+    /// The modifiers held, as of the last modifier change in the raw events: a paste event doesn't
+    /// carry them.
+    pub held: egui::Modifiers,
+    /// When (monotonic [`FrameClock`], seconds) open documents next get an autosave checkpoint.
     pub next_autosave: f64,
-    /// With auto-save on: when (UI clock, seconds) files with unsaved changes are next saved, and
+    /// With auto-save on: when (monotonic [`FrameClock`], seconds) files with unsaved changes are next saved, and
     /// the revisions of those files it waits on (a change restarts the wait).
     pub auto_save_at: Option<(f64, u64)>,
     /// Files being encoded for auto-save on threads of their own (tab `uid`).
@@ -517,9 +512,18 @@ pub struct UiState {
     pub online: online::OnlineUi,
     /// The window was asked to close with unsaved changes: the question shows.
     pub confirm_close: bool,
+    /// The file a Save as started from the unsaved-changes question is saving: the window closes
+    /// once it is saved, and stays open if the dialog is cancelled or the save fails.
+    pub close_after_save_as: Option<u64>,
+    /// Save was answered: the files save next frame, once a panel field the click took the
+    /// keyboard from has committed what was typed (as [`UiState::after_field`]).
+    pub save_on_close: bool,
 }
 
 impl Default for UiState {
+    /// Seed the default UI state (panel widths, tabs, pages, Home, presenters, pickers and
+    /// dialogs off, and the rest of the transient UI fields); `FigApp::new` overrides panel
+    /// widths and the pages height from preferences.
     fn default() -> Self {
         Self {
             left_width: PANEL_DEFAULT,
@@ -528,15 +532,28 @@ impl Default for UiState {
             last_right_tab: RightTab::Design,
             left_tab: LeftTab::File,
             pages_open: true,
+            page_search: false,
+            page_filter: String::new(),
+            pages_height: None,
+            pages_seen_page: None,
             expanded: BTreeSet::new(),
             rename: None,
             rename_page: None,
+            rename_label: None,
             main_menu: false,
             palette: None,
+            palette_tab: menus::PaletteTab::All,
+            palette_hi: 0,
+            palette_armed: false,
+            context_menu_shown: false,
+            actions_rect: None,
             variables: None,
             about: false,
             about_tab: dialogs::AboutTab::About,
             preferences: false,
+            menu_input: None,
+            rename_file: false,
+            ui_scale: ui_scale::plan(1.0, None, None),
             shortcuts_panel: false,
             shortcuts_tab: figcraft_engine::keymap::Group::Essential,
             shortcuts_query: String::new(),
@@ -547,6 +564,9 @@ impl Default for UiState {
             icon_gallery: false,
             toast: None,
             present: None,
+            presents: Vec::new(),
+            present_active: None,
+            present_next: 1,
             present_view: present::PresentView::default(),
             preview: None,
             picker: None,
@@ -557,13 +577,18 @@ impl Default for UiState {
             layer_filter: String::new(),
             layer_anchor: None,
             layers_focus: false,
+            pages_focus: None,
             layers_seen_sel: Vec::new(),
             dark: false,
             follow_system: false,
             tool_flyout: None,
+            board_panel: false,
             last_error: None,
             pending_opens: Vec::new(),
             pending_open_frames: 0,
+            import_report: None,
+            font_checks: Vec::new(),
+            missing_fonts: None,
             screenshot_requests: Vec::new(),
             frame_ms: 0.0,
             render_ms: 0.0,
@@ -581,12 +606,20 @@ impl Default for UiState {
             find: None,
             batch_rename: None,
             left_collapsed: false,
+            mobile_panel: None,
+            narrow: false,
             comments: comments::CommentUi::default(),
             versions: versions::VersionUi::default(),
             branch_review: None,
             dev: dev_mode::DevUi::default(),
 
             last_copy: None,
+            last_copy_generation: 0,
+            v_pressed: false,
+            paste_event: false,
+            refocused: false,
+            after_field: None,
+            held: egui::Modifiers::NONE,
             next_autosave: 0.0,
             auto_save_at: None,
             auto_saving: Vec::new(),
@@ -598,10 +631,20 @@ impl Default for UiState {
             live: live::LiveUi::default(),
             online: online::OnlineUi::default(),
             confirm_close: false,
+            close_after_save_as: None,
+            save_on_close: false,
         }
     }
 }
 
+/// A control reply waiting for the pass that presents an injected input batch. The viewport keeps
+/// one window's batch from acknowledging (or erroring) another window's request.
+pub(crate) struct PendingAck {
+    pub(crate) viewport: egui::ViewportId,
+    pub(crate) tx: std::sync::mpsc::Sender<ControlReply>,
+    pub(crate) reply: ControlReply,
+}
+
 /// The whole FigCraft UI.
 pub struct FigApp {
     pub session: Session,
@@ -637,942 +680,52 @@ pub struct FigApp {
     pending_dialog: Option<PendingDialog>,
     /// The latest UI context schedules the first poll and wakes the app when a dialog completes.
     ui_context: Option<egui::Context>,
+    /// The automation roots the app was started with: every frame and control request runs
+    /// confined to them ([`windows::guard`]).
+    pub automation_roots: Option<Arc<figcraft_engine::file_access::Roots>>,
+    /// The active-document id when synthetic input was queued: a batch is dropped when the file
+    /// changed before a UI pass applied it.
+    pub(crate) control_input_doc: Option<u64>,
+    /// This frame applies events injected through the control channel: no system clipboard
+    /// read or write may happen for them.
+    pub(crate) control_synthetic: bool,
+    /// `ui.input` replies waiting for the pass that actually presents the injected batch (a
+    /// discarded sizing pass must not acknowledge it).
+    pub(crate) input_acks: Vec<PendingAck>,
+    /// Replies whose batch this frame took into its raw input: sent only if the pass is presented.
+    pub(crate) applied_acks: Vec<PendingAck>,
+    /// The batch taken into this frame's raw input, kept so a discarded pass gives it back.
+    pub(crate) applied_input: Option<Vec<egui::Event>>,
+    /// `handle("ui.input")` queued raw events whose acknowledgement waits for the applied pass
+    /// (controller-only input is applied at once and needs no fence).
+    pub(crate) control_input_queued: bool,
+    /// The viewport whose batch this frame took into its raw input (`applied_input`/`applied_acks`).
+    pub(crate) applied_frame: Option<egui::ViewportId>,
+    /// Monotonic time for background work and capture deadlines.
+    pub(crate) clock: FrameClock,
+    /// Screenshot requests admitted, settling and awaiting readback.
+    pub(crate) capture: control::CaptureState,
+    /// [`Self::background_tick`] ran for this pass (so [`Self::ui`] does not repeat it).
+    logic_ticked: bool,
+    /// The last frame whose UI setup ran (multi-pass frames set up once).
+    ui_frame_stamp: Option<(egui::ViewportId, u64)>,
+    /// IME owner/generation/change-cause state for the on-canvas text editor, per viewport.
+    pub(crate) ime: egui::ime_context::ImeContextTracker,
+    /// The check for a newer release and its prompt (desktop; [`updates_ui`]).
+    pub(crate) updates_rt: updates_ui::Runtime,
+    /// Test-only count of the one IME observation each viewport pass makes.
+    #[cfg(test)]
+    pub(crate) ime_observations: u32,
 }
 
 /// What to do with the result of a command run in the background.
 pub type Done = Box<dyn FnOnce(&mut FigApp, &egui::Context, Value)>;
 
-impl FigApp {
-    pub fn new(session: Session, services: Box<dyn Services>) -> Self {
-        // The main window's panels open as wide as they were left.
-        let (left_width, right_width) = session.prefs.panel_widths;
-        Self {
-            ui: UiState { left_width, right_width, ..UiState::default() },
-            session,
-            canvas: canvas::CanvasState::default(),
-            services,
-            worker: None,
-            fonts_installed: false,
-            script_fonts: None,
-            cjk_checked: None,
-            language: None,
-            field_focus: false,
-            panels_unsaved: false,
-            control_queue: Vec::new(),
-            control_input: Vec::new(),
-            frame_stats: frame_stats::FrameStats::default(),
-            windows: windows::Windows::default(),
-            window_requests: Vec::new(),
-            waiting: Vec::new(),
-            pending_dialog: None,
-            ui_context: None,
-        }
-    }
+#[cfg(test)]
+mod selection_spacing_tests;
 
-    /// Run a command, surfacing errors as a toast. Returns the result.
-    pub fn run(&mut self, id: &str, params: Value) -> Option<Value> {
-        let r = self.session.execute(id, &params);
-        self.handle_ui_requests();
-        r.map_err(|e| self.failed(id, &e)).ok()
-    }
-
-    /// Show command `id`'s error.
-    fn failed(&mut self, id: &str, e: &figcraft_engine::EngineError) {
-        let msg = e.to_string();
-        log::warn!("{id}: {msg}");
-        self.toast(msg.clone());
-        self.ui.last_error = Some(msg);
-    }
-
-    /// Run a command that may talk to a server without waiting for it (the engine's
-    /// [`start_background`](Session::start_background)): `done` gets the result, at once or when
-    /// the answer arrives (the network wakes the window then); errors show as with [`run`](Self::run).
-    /// [`Session::waiting_for`] tells the panels to show that it's on its way.
-    pub fn run_background(&mut self, ctx: &egui::Context, id: &str, params: Value, done: Done) {
-        self.waiting.retain(|(c, _)| c != id);
-        let r = self.session.start_background(id, params);
-        self.handle_ui_requests();
-        match r {
-            Ok(Some(v)) => done(self, ctx, v),
-            Ok(None) => self.waiting.push((id.to_string(), done)),
-            Err(e) => self.failed(id, &e),
-        }
-    }
-
-    /// Stop waiting for command `id` (Cancel, or its window closed): its answer is dropped.
-    pub fn cancel_background(&mut self, id: &str) {
-        self.session.cancel_background(id);
-        self.waiting.retain(|(c, _)| c != id);
-    }
-
-    /// Hand the results of background commands that finished to what's waiting for them.
-    fn background_done(&mut self, ctx: &egui::Context) {
-        while let Some((id, r)) = self.session.take_background_done() {
-            self.handle_ui_requests();
-            let done = self.waiting.iter().position(|(c, _)| *c == id).map(|i| self.waiting.remove(i).1);
-            match (r, done) {
-                (Ok(v), Some(done)) => done(self, ctx, v),
-                (Ok(_), None) => {}
-                (Err(e), _) => self.failed(&id, &e),
-            }
-        }
-    }
-
-    /// Show what `command params` would do on the canvas as a live preview (`text.preview`) while
-    /// a text style, a named instance or an axis slider is hovered or dragged. Call it every frame
-    /// the preview should stay: it ends on the first frame nothing asks for it.
-    pub fn preview_text(&mut self, ctx: &egui::Context, command: &str, params: Value) {
-        self.ui.text_preview_wanted = true;
-        let revision = self.session.ds().map_or(0, |d| d.revision);
-        if let Some((c, p, rev)) = &self.ui.text_preview
-            && c == command
-            && *p == params
-            && (*rev == revision || figcraft_engine::textpreview::active(&self.session))
-        {
-            return;
-        }
-        let shown = self.session.execute("text.preview", &json!({"command": command, "params": params})).is_ok();
-        let revision = self.session.ds().map_or(0, |d| d.revision);
-        self.ui.text_preview = shown.then(|| (command.to_string(), params, revision));
-        // The canvas drew before the panels: show the preview next frame.
-        ctx.request_repaint();
-    }
-
-    /// End the live text preview the panels show (Escape, or nothing hovered any more).
-    pub fn end_text_preview(&mut self, ctx: &egui::Context) {
-        if self.ui.text_preview.take().is_some() {
-            let _ = self.session.execute("text.endPreview", &json!({}));
-            ctx.request_repaint();
-        }
-    }
-
-    /// Leaving Design ends a pen path as Escape does and goes back to Move: Prototype and Inspect
-    /// don't draw (#307). Checked as the frame starts (the control channel) and after the panels
-    /// and shortcuts (the mode switcher, the tabs, Shift+E/Shift+D), before the canvas sees more.
-    fn end_pen_outside_design(&mut self) {
-        if self.ui.right_tab == self.ui.last_right_tab {
-            return;
-        }
-        self.ui.last_right_tab = self.ui.right_tab;
-        if self.ui.right_tab != RightTab::Design && self.session.tool.tool == figcraft_engine::tools::ToolId::Pen {
-            self.run("tool.set", json!({"tool": "move"}));
-        }
-    }
-
-    /// Once a frame, after the panels: a preview nothing asked for this frame ends.
-    fn end_unwanted_text_preview(&mut self, ctx: &egui::Context) {
-        if !std::mem::take(&mut self.ui.text_preview_wanted) {
-            self.end_text_preview(ctx);
-        }
-    }
-
-    pub fn toast(&mut self, msg: impl Into<String>) {
-        self.ui.toast = Some((msg.into(), ToastClock::Raised));
-    }
-
-    /// Say that `n` documents left unsaved by a crash were opened again from recovery copies.
-    pub fn note_recovered(&mut self, n: usize) {
-        if n > 0 {
-            self.toast(i18n::trn("Recovered {n} unsaved files after the app quit unexpectedly: save them to keep them", n, &[]));
-        }
-    }
-
-    /// Act on UI requests queued by commands (dialogs, panels).
-    pub fn handle_ui_requests(&mut self) {
-        let reqs = std::mem::take(&mut self.session.ui_requests);
-        for r in reqs {
-            match r.kind.as_str() {
-                "dialog.about" => {
-                    self.ui.about = true;
-                    self.ui.about_tab = dialogs::AboutTab::About;
-                }
-                "dialog.preferences" => self.ui.preferences = true,
-                "panel.shortcuts" => self.ui.shortcuts_panel = !self.ui.shortcuts_panel,
-                "palette.actions" => self.ui.palette = Some(String::new()),
-                "panel.design" => self.ui.right_tab = RightTab::Design,
-                "panel.prototype" => self.ui.right_tab = RightTab::Prototype,
-                "panel.designPrototype" => {
-                    self.ui.right_tab = if self.ui.right_tab == RightTab::Prototype { RightTab::Design } else { RightTab::Prototype };
-                }
-                "panel.devMode" => {
-                    self.ui.right_tab = if self.ui.right_tab == RightTab::Inspect { RightTab::Design } else { RightTab::Inspect };
-                }
-                "panel.leftSidebar" => self.ui.left_collapsed = !self.ui.left_collapsed,
-                "panel.widths" => {
-                    let width = |k: &str| r.data.get(k).and_then(Value::as_f64).map(|w| w as f32);
-                    let (left, right) = (width("left"), width("right"));
-                    let reset = left.is_none() && right.is_none();
-                    self.set_panel_widths(
-                        left.unwrap_or(if reset { PANEL_DEFAULT } else { self.ui.left_width }),
-                        right.unwrap_or(if reset { PANEL_DEFAULT } else { self.ui.right_width }),
-                    );
-                    self.services.save_prefs(&self.session.prefs);
-                }
-                "focus.region" => self.ui.nav.step(r.data.get("step").and_then(Value::as_i64).unwrap_or(1).clamp(-4, 4) as i32),
-                "panel.layers" => self.ui.left_tab = LeftTab::File,
-                "panel.assets" => self.ui.left_tab = LeftTab::Assets,
-                "panel.versionHistory" => versions::open(self),
-                "view.devCompare" => {
-                    self.ui.dev.compare = r.data.get("id").and_then(figcraft_engine::params::id_of).map(dev_compare::CompareView::new);
-                }
-                "panel.libraries" => {
-                    self.ui.left_tab = LeftTab::Assets;
-                    self.ui.left_collapsed = false;
-                    self.ui.libraries = true;
-                }
-                "home" => self.ui.home = true,
-                "home.templates" => {
-                    self.ui.home = true;
-                    self.ui.home_view.section = home::Section::Templates;
-                }
-                "home.gettingStarted" => {
-                    self.ui.home = true;
-                    self.ui.home_view.section = home::Section::Recents;
-                    self.services.save_prefs(&self.session.prefs);
-                }
-                "dialog.saveAs" => self.save_as_dialog(),
-                "dialog.colorProfile" => self.ui.color_profile = self.session.doc().ok().map(|d| d.color_profile),
-                "present" => {
-                    if let Some(start) = r.data.get("start").and_then(figcraft_engine::params::id_of) {
-                        let mut p = present::Presenter::new(start);
-                        p.view = self.ui.present_view;
-                        self.ui.present = Some(p);
-                    }
-                }
-                "present.options" => {
-                    let v = &mut self.ui.present_view;
-                    if let Some(s) = r.data.get("scale").and_then(|s| s.as_str()).and_then(present::PresentScale::parse) {
-                        v.scale = s;
-                    }
-                    if let Some(f) = r.data.get("deviceFrame").and_then(|f| f.as_bool()) {
-                        v.device_frame = f;
-                    }
-                    if let Some(h) = r.data.get("hotspotHints").and_then(|h| h.as_bool()) {
-                        v.hotspot_hints = h;
-                    }
-                    if let Some(i) = r.data.get("inspect").and_then(|i| i.as_bool()) {
-                        v.inspect = i;
-                    }
-                    if let Some(p) = self.ui.present.as_mut() {
-                        p.view.device_frame = v.device_frame;
-                        p.view.hotspot_hints = v.hotspot_hints;
-                        p.view.inspect = v.inspect;
-                        p.set_scale(v.scale);
-                    }
-                }
-                "preview" => {
-                    if let Some(start) = r.data.get("start").and_then(figcraft_engine::params::id_of) {
-                        self.ui.preview = Some(present::Pane::new(start, &self.session));
-                    }
-                }
-                "preview.close" => self.ui.preview = None,
-                "open.help" => self.services.open_url("https://getartcraft.com/apps/figcraft"),
-                "layers.collapseAll" => layers::collapse_all(self),
-                "contextMenu" => self.ui.key_menu = true,
-                "selectArea" => self.start_key_box(),
-                "layers.rename" => {
-                    let ids: Vec<NodeId> =
-                        r.data.get("ids").and_then(Value::as_array).into_iter().flatten().filter_map(figcraft_engine::params::id_of).collect();
-                    if ids.len() > 1 {
-                        dialogs::open_batch_rename(self, &ids);
-                    } else {
-                        layers::start_rename(self, &ids);
-                    }
-                }
-                "comment.open" => {
-                    if let Some(id) = r.data.get("id").and_then(Value::as_u64) {
-                        self.ui.comments.show(id);
-                    }
-                }
-                "comment.new" => {
-                    let x = r.data.get("x").and_then(|v| v.as_f64()).unwrap_or(0.0);
-                    let y = r.data.get("y").and_then(|v| v.as_f64()).unwrap_or(0.0);
-                    comments::start_draft(self, x, y);
-                }
-                "dialog.unsaved" => self.toast(i18n::tr("This file has unsaved changes")),
-                "dialog.plugins" => self.ui.plugins_window = true,
-                "dialog.cursorChat" => live::open_chat(self),
-                "window.new" | "window.focus" | "window.fullscreen" => self.window_requests.push(r),
-                _ => {}
-            }
-        }
-        if let Some(m) = self.session.message.take() {
-            self.toast(m);
-        }
-    }
-
-    /// Set the widths asked for this window's side panels (within their limits); the main
-    /// window's are kept in the preferences.
-    pub fn set_panel_widths(&mut self, left: f32, right: f32) {
-        let within = |w: f32, range: std::ops::RangeInclusive<f32>| if w.is_finite() { w.clamp(*range.start(), *range.end()) } else { PANEL_DEFAULT };
-        (self.ui.left_width, self.ui.right_width) = (within(left, LEFT_PANEL), within(right, RIGHT_PANEL));
-        if self.windows.current == 0 {
-            self.session.prefs.panel_widths = (self.ui.left_width, self.ui.right_width);
-        }
-    }
-
-    /// The edge between a side panel and the canvas, at `x` down `rows`: dragging it sizes the
-    /// panel (`grows`: +1 for the left panel, whose edge is on its right, −1 for the right one), a
-    /// double-click puts back the default width. Returns the width asked for, when it changed.
-    fn panel_edge(ui: &mut egui::Ui, name: &str, x: f32, rows: egui::Rangef, width: f32, grows: f32) -> Option<f32> {
-        let grab = ui.style().interaction.resize_grab_radius_side;
-        let rect = egui::Rect::from_x_y_ranges(x - grab..=x + grab, rows);
-        let id = egui::Id::new(("panel_edge", name));
-        let resp = ui.interact(rect, id, egui::Sense::click_and_drag());
-        if resp.hovered() || resp.dragged() {
-            ui.ctx().set_cursor_icon(egui::CursorIcon::ResizeHorizontal);
-            ui.painter().vline(x, rows, egui::Stroke::new(2.0, theme::Tokens::get(ui.ctx()).accent));
-        }
-        if resp.double_clicked() {
-            return Some(PANEL_DEFAULT);
-        }
-        // The edge stays under the pointer where it was grabbed (also back from past a limit).
-        let at = resp.interact_pointer_pos().filter(|_| resp.dragged())?;
-        if resp.drag_started() {
-            let pressed = ui.input(|i| i.pointer.press_origin()).unwrap_or(at);
-            ui.data_mut(|d| d.insert_temp(id, pressed.x - x));
-        }
-        let grabbed: f32 = ui.data(|d| d.get_temp(id)).unwrap_or(0.0);
-        let w = width + (at.x - grabbed - x) * grows;
-        (w != width).then_some(w)
-    }
-
-    pub fn save_as_dialog(&mut self) {
-        let name = self.session.doc().map(|d| d.name.clone()).unwrap_or_else(|_| "Untitled".into());
-        self.pick_save(i18n::tr("Save as"), &format!("{name}.figcraft"), &["figcraft"], |app, p| {
-            let ps = p.to_string_lossy().to_string();
-            if app.run("file.saveAs", json!({"path": ps})).is_some() {
-                app.toast(i18n::trf("Saved {name}", &[("name", &p.file_name().map(|f| f.to_string_lossy().to_string()).unwrap_or_default())]));
-            }
-        });
-    }
-
-    pub fn save(&mut self) {
-        // A branch tab saves its main file.
-        let tab = figcraft_engine::branches::file_tab(&self.session);
-        if self.session.docs.get(tab).is_some_and(|d| d.path.is_some()) {
-            if self.run("file.save", json!({})).is_some() {
-                self.toast(i18n::tr("Saved"));
-            }
-        } else {
-            self.save_as_dialog();
-        }
-    }
-
-    pub fn open_dialog(&mut self) {
-        // Opening needs no file in front: it goes ahead even if that file closed meanwhile.
-        self.start_dialog(
-            |services| services.pick_open(i18n::tr("Open"), OPEN_EXTENSIONS),
-            false,
-            |app, p| {
-                let ps = p.to_string_lossy().to_string();
-                if app.run("file.open", json!({"path": ps})).is_some() {
-                    app.ui.home = false;
-                }
-            },
-        );
-    }
-
-    pub fn import_dialog(&mut self, place: bool) {
-        let exts: &[&str] = if place {
-            &["png", "jpg", "jpeg", "webp", "gif", "tif", "tiff"]
-        } else {
-            &["svg", "png", "jpg", "jpeg", "webp", "gif", "tif", "tiff", "figcraft", "fig"]
-        };
-        let title = if place { i18n::tr("Place image") } else { i18n::tr("Import") };
-        self.pick_open(title, exts, move |app, p| {
-            let ps = p.to_string_lossy().to_string();
-            app.run("file.import", json!({"path": ps}));
-        });
-    }
-
-    /// Pick a file to open. `done` runs with the file in front now back in front (and not at all
-    /// if that file closed meanwhile).
-    pub fn pick_open(&mut self, title: &str, exts: &[&str], done: impl FnOnce(&mut FigApp, PathBuf) + 'static) {
-        self.start_dialog(|services| services.pick_open(title, exts), true, done);
-    }
-
-    /// Pick where to save; `done` runs as [`FigApp::pick_open`]'s does.
-    pub fn pick_save(&mut self, title: &str, name: &str, exts: &[&str], done: impl FnOnce(&mut FigApp, PathBuf) + 'static) {
-        self.start_dialog(|services| services.pick_save(title, name, exts), true, done);
-    }
-
-    /// Pick a folder; `done` runs as [`FigApp::pick_open`]'s does.
-    pub fn pick_folder(&mut self, title: &str, done: impl FnOnce(&mut FigApp, PathBuf) + 'static) {
-        self.start_dialog(|services| services.pick_folder(title), true, done);
-    }
-
-    /// Open a native dialog from the window drawing now, for the file in front (`pin`).
-    fn start_dialog(&mut self, start: impl FnOnce(&mut dyn Services) -> DialogFuture, pin: bool, done: impl FnOnce(&mut FigApp, PathBuf) + 'static) {
-        if self.pending_dialog.is_some() {
-            return;
-        }
-        let doc = if pin { self.session.ds().ok().filter(|d| self.shows(d.uid)).map(|d| d.uid) } else { None };
-        let future = start(self.services.as_mut());
-        self.pending_dialog = Some(PendingDialog { future, path: None, done: Box::new(done), doc, window: self.windows.current });
-        if let Some(ctx) = &self.ui_context {
-            ctx.request_repaint();
-        }
-    }
-
-    /// Once the dialog has a path, its continuation runs in the window that holds its file, with
-    /// that file in front; then the tab in front before comes back (unless the dialog opened a file).
-    fn poll_dialog(&mut self, ctx: &egui::Context) {
-        let Some(d) = &mut self.pending_dialog else { return };
-        if d.path.is_none() {
-            let waker = Waker::from(Arc::new(RepaintWaker(ctx.clone())));
-            let Poll::Ready(path) = d.future.as_mut().poll(&mut TaskContext::from_waker(&waker)) else { return };
-            d.path = path;
-        }
-        let (doc, origin, picked) = (d.doc, d.window, d.path.is_some());
-        let index = doc.map(|u| self.session.docs.iter().position(|ds| ds.uid == u));
-        // Cancelled, or its file closed meanwhile.
-        if !picked || index == Some(None) {
-            self.pending_dialog = None;
-            return;
-        }
-        let window = match doc {
-            Some(u) => self.windows.of(u),
-            None if self.windows.exists(origin) => origin,
-            None => 0,
-        };
-        if window != self.windows.current {
-            ctx.request_repaint_of(windows::viewport(window));
-            return;
-        }
-        let Some(PendingDialog { path: Some(path), done, .. }) = self.pending_dialog.take() else { return };
-        let before = self.session.ds().ok().map(|d| d.uid);
-        if let Some(Some(i)) = index {
-            self.session.active = i;
-        }
-        done(self, path);
-        if doc.is_some()
-            && self.session.ds().ok().map(|d| d.uid) == doc
-            && let Some(i) = before.and_then(|u| self.session.docs.iter().position(|d| d.uid == u))
-        {
-            self.session.active = i;
-        }
-    }
-
-    /// Reduced motion: the preference or the system's setting.
-    pub fn reduce_motion(&self) -> bool {
-        self.session.prefs.reduce_motion || self.services.reduce_motion()
-    }
-
-    /// The CJK scripts the UI shows: the language's, the language picker's (Preferences open),
-    /// typed text's, and those in the open file's names and comments (read when it changes, not
-    /// mid-drag). Nothing is checked once every script has a face.
-    fn cjk_needed(&mut self, ctx: &egui::Context, installed: u8) -> u8 {
-        if installed == cjk::KANA | cjk::HANGUL | cjk::HAN {
-            return installed;
-        }
-        let mut need = i18n::current().map_or(0, |l| cjk::language(l.code));
-        if self.ui.preferences {
-            need |= i18n::languages().iter().filter(|l| cjk::can_show(l.code)).fold(0, |m, l| m | cjk::language(l.code));
-        }
-        need |= ctx.input(|i| {
-            i.events.iter().fold(0, |m, e| match e {
-                egui::Event::Text(t) | egui::Event::Ime(egui::ImeEvent::Preedit { text: t, .. } | egui::ImeEvent::Commit(t)) => m | cjk::scripts(t),
-                _ => m,
-            })
-        });
-        let dragging = ctx.input(|i| i.pointer.any_down());
-        // Pans and zooms change the revision too: only a new version of the document is looked
-        // at, and only the layers it changed (a large file has hundreds of thousands of names).
-        let current = self.session.docs.get(self.session.active).filter(|_| !dragging).map(|d| (d.uid, d.doc.clone()));
-        if let Some((uid, doc)) = current {
-            let before = self.cjk_checked.take().filter(|(u, _)| *u == uid).map(|(_, b)| b);
-            if !before.as_ref().is_some_and(|b| Arc::ptr_eq(b, &doc)) {
-                let mut scan = |s: &str| need |= cjk::scripts(s);
-                scan(&doc.name);
-                match before.as_ref().and_then(|b| doc.changed_ids(b, CJK_CHANGES)) {
-                    Some(ids) => ids.into_iter().filter_map(|id| doc.node(id)).for_each(|n| scan(&n.name)),
-                    None => doc.nodes().for_each(|n| scan(&n.name)),
-                }
-                doc.comments.iter().flat_map(|c| std::iter::once(&c.first).chain(&c.replies)).for_each(|m| {
-                    scan(&m.author);
-                    scan(&m.text);
-                });
-            }
-            self.cjk_checked = Some((uid, doc));
-        }
-        need
-    }
-
-    /// Per-frame logic that doesn't draw (control requests, theme, language).
-    pub fn logic(&mut self, ctx: &egui::Context) {
-        if self.language.as_ref() != Some(&self.session.prefs.language) {
-            i18n::set(&self.session.prefs.language, self.services.system_language().as_deref());
-            self.language = Some(self.session.prefs.language.clone());
-        }
-        if !self.fonts_installed {
-            // Cmd/Ctrl+= / - / 0 zoom the canvas (view.zoomIn, view.zoomOut, view.zoom100): egui's
-            // own keyboard zoom would scale the whole interface on the same keys.
-            ctx.options_mut(|o| o.zoom_with_keyboard = false);
-            theme::install_fonts(ctx, false, 0);
-            self.fonts_installed = true;
-        } else if figcraft_text::system_fonts_scanned() {
-            // Once the system fonts are indexed: faces for names in scripts the UI fonts lack, and
-            // for each CJK script once something shows it.
-            let installed = self.script_fonts.map_or(0, |(s, _)| s);
-            let cjk = installed | self.cjk_needed(ctx, installed);
-            // The UI language's script leads the CJK faces, so another language lays them out again.
-            let lang = i18n::current().map_or("en", |l| l.code);
-            if self.script_fonts != Some((cjk, lang)) {
-                self.script_fonts = Some((cjk, lang));
-                theme::install_fonts(ctx, true, cjk);
-            }
-        }
-        let dark = match self.session.prefs.theme.as_str() {
-            "dark" => true,
-            // The active visuals were set by us last frame (possibly for a manual theme).
-            // Read the integration's OS theme instead; without one, keep the light fallback.
-            "system" => ctx.system_theme() == Some(egui::Theme::Dark),
-            _ => false,
-        };
-        self.ui.dark = dark;
-        // New files take the theme's page colour (existing pages keep theirs).
-        self.session.set_ui_dark(dark);
-        theme::apply_with(ctx, if dark { theme::Tokens::dark() } else { theme::Tokens::light() }, self.reduce_motion());
-        if self.worker.is_none() {
-            self.worker = Some(render_worker::Worker::new(ctx.clone()));
-        }
-    }
-
-    /// Every [`AUTOSAVE_SECS`], each open document with unsaved changes since its last version
-    /// gets an autosave checkpoint in its version history.
-    fn autosave_tick(&mut self, ctx: &egui::Context) {
-        let now = ctx.input(|i| i.time);
-        if now < self.ui.next_autosave {
-            // Wake up for it even if nothing else draws a frame by then.
-            repaint_in(ctx, self.ui.next_autosave - now);
-            return;
-        }
-        if self.ui.next_autosave > 0.0 {
-            let active = self.session.active;
-            for i in 0..self.session.docs.len() {
-                self.session.active = i;
-                let _ = self.session.execute("version.autosave", &json!({}));
-            }
-            self.session.active = active;
-        }
-        self.ui.next_autosave = now + AUTOSAVE_SECS;
-        repaint_in(ctx, AUTOSAVE_SECS);
-    }
-
-    /// With auto-save on, files that have a path are saved [`AUTO_SAVE_SECS`] after they last
-    /// changed (not during a gesture, a live preview or while a version is shown). The file is
-    /// encoded on a thread of its own, so a big one doesn't hold up the window, and written here.
-    fn auto_save_tick(&mut self, ctx: &egui::Context) {
-        let now = ctx.input(|i| i.time);
-        let mut failed = self.auto_save_done();
-        // The browser has no files to save to.
-        let on = !cfg!(target_arch = "wasm32") && self.session.prefs.auto_save;
-        let saving = &self.ui.auto_saving;
-        let due = |d: &&figcraft_engine::DocState| {
-            d.path.is_some() && d.branch_of.is_none() && d.preview.is_none() && d.is_dirty() && !saving.iter().any(|(uid, _)| *uid == d.uid)
-        };
-        let changes = if on { self.session.docs.iter().filter(due).map(|d| d.revision).reduce(u64::wrapping_add) } else { None };
-        match changes {
-            None => self.ui.auto_save_at = None,
-            Some(changes) => {
-                let at = match self.ui.auto_save_at {
-                    Some((at, c)) if c == changes && failed.is_none() => at,
-                    _ => now + if failed.is_some() { AUTO_SAVE_RETRY_SECS } else { AUTO_SAVE_SECS },
-                };
-                self.ui.auto_save_at = Some((at, changes));
-                if now < at || self.session.docs.iter().any(|d| d.interaction.is_some() || d.text_preview.is_some()) {
-                    // Due but busy: look again in a second.
-                    repaint_in(ctx, if now < at { at - now } else { 1.0 });
-                } else {
-                    self.ui.auto_save_at = None;
-                    let files: Vec<_> =
-                        self.session.docs.iter().filter(due).map(|d| (d.uid, figcraft_engine::cmd::file::FileSnapshot::of(d))).collect();
-                    for (uid, file) in files {
-                        let encode = move || {
-                            let bytes = file.encode();
-                            (file, bytes)
-                        };
-                        match std::thread::Builder::new().name("figcraft-save".into()).spawn(encode) {
-                            Ok(h) => self.ui.auto_saving.push((uid, h)),
-                            Err(e) => {
-                                failed.get_or_insert(e.to_string());
-                                self.ui.auto_save_at = Some((now + AUTO_SAVE_RETRY_SECS, changes));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if !self.ui.auto_saving.is_empty() {
-            // Look again shortly for the files being encoded.
-            repaint_in(ctx, 0.1);
-        }
-        if let Some(e) = failed {
-            self.toast(i18n::trf("Couldn't save automatically: {error}", &[("error", &e)]));
-        }
-    }
-
-    /// Write the files whose auto-save encoding finished; the first error, if one failed.
-    fn auto_save_done(&mut self) -> Option<String> {
-        if self.ui.auto_saving.is_empty() {
-            return None;
-        }
-        let mut failed = None;
-        let done: Vec<_> = self.ui.auto_saving.extract_if(.., |(_, h)| h.is_finished()).collect();
-        for (_, h) in done {
-            let saved = match h.join() {
-                Ok((snapshot, Ok(bytes))) => snapshot.save(&mut self.session, &bytes).map(|_| ()).map_err(|e| e.to_string()),
-                Ok((_, Err(e))) => Err(e.to_string()),
-                Err(_) => Err("the file couldn't be encoded".to_string()),
-            };
-            if let Err(e) = saved {
-                failed.get_or_insert(e);
-            }
-        }
-        failed
-    }
-
-    /// Draw the whole UI: the main window (the other windows draw themselves).
-    pub fn ui(&mut self, ui: &mut egui::Ui) {
-        #[cfg(not(target_arch = "wasm32"))]
-        let t0 = std::time::Instant::now();
-        let ctx = ui.ctx().clone();
-        self.ui_context = Some(ctx.clone());
-        self.frame_stats.record(&ctx);
-        let first = !self.fonts_installed;
-        self.logic(&ctx);
-        self.autosave_tick(&ctx);
-        self.auto_save_tick(&ctx);
-        if first {
-            // New fonts apply from the next frame; draw nothing until then.
-            ctx.request_repaint();
-            return;
-        }
-        // What happened in a live session (the network woke us for it).
-        if self.session.live_poll() {
-            if let Some(m) = self.session.message.take() {
-                self.toast(m);
-            }
-            self.background_done(&ctx);
-        }
-        windows::begin(self, &ctx);
-        let (files, prefs) = (self.session.docs.len(), self.session.prefs.clone());
-        self.frame(ui);
-        windows::settle(self, &ctx, files);
-        if self.session.prefs != prefs {
-            windows::repaint_others(self, &ctx);
-        }
-        windows::show(self, &ctx);
-        // Plugins installed, removed or set up are kept at once: a crash doesn't lose them.
-        // So are the owner tokens of files put online.
-        if std::mem::take(&mut self.session.plugins.unsaved) | std::mem::take(&mut self.session.live.unsaved) {
-            self.services.save_prefs(&self.session.prefs);
-        }
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            self.ui.frame_ms = t0.elapsed().as_secs_f64() * 1000.0;
-        }
-    }
-
-    /// One frame of the window drawing now.
-    pub(crate) fn frame(&mut self, ui: &mut egui::Ui) {
-        let ctx = ui.ctx().clone();
-        let t = theme::Tokens::get(&ctx);
-        // A field that had the keyboard when the frame began keeps its keys from the shortcuts
-        // even if it lets go during the frame (Enter commits it), or as it began (egui drops the
-        // focus on Escape before the frame, which cancels the field's edit and nothing else).
-        let typing = std::mem::take(&mut self.field_focus) || a11y::field_focused(&ctx);
-        // A dialog that closed acts first, in the window it was opened from.
-        self.poll_dialog(&ctx);
-        // Control requests run first so their results reflect this frame.
-        control::drain(self, &ctx);
-        windows::requests(self, &ctx);
-        // Before any widget: the navigation keys (F6, Tab, arrows, Escape) move the keyboard.
-        a11y::begin(self, &ctx);
-        if self.ui.title_bar == TitleBar::Custom {
-            tabs::resize_edges(&ctx);
-        }
-        if self.ui.icon_gallery {
-            icons::gallery(&ctx);
-        }
-        theme::set_doc_profile(&ctx, self.session.doc().map_or(figcraft_color::ColorProfile::Srgb, |d| d.color_profile));
-        widgets::set_nudge(&ctx, self.session.prefs.nudge_small, self.session.prefs.nudge_big);
-        // The Inspect tab measures on hover without Alt.
-        self.session.tool.redlines = self.ui.right_tab == RightTab::Inspect;
-        self.end_pen_outside_design();
-        if self.ui.present.is_some() {
-            present::show(self, ui);
-            // What went wrong while presenting (a widget's plugin failing) shows over it.
-            self.toast_ui(&ctx);
-            return;
-        }
-        if !self.has_files() || self.ui.home {
-            tabs::tab_bar(self, ui);
-            home::show(self, ui);
-            dialogs::keys(self, &ctx);
-            dialogs::show(self, &ctx);
-            self.toast_ui(&ctx);
-            windows::requests(self, &ctx);
-            return;
-        }
-        let hidden = self.session.ds().map(|d| d.view.ui_hidden).unwrap_or(false);
-        tabs::tab_bar(self, ui);
-        if !hidden {
-            egui::Panel::left("left_rail")
-                .exact_size(56.0)
-                .resizable(false)
-                .frame(egui::Frame::NONE.fill(t.panel).stroke(egui::Stroke::new(1.0, t.border)))
-                .show(ui, |ui| {
-                    a11y::region(&mut self.ui.nav, ui, a11y::Region::Layers, egui::accesskit::Role::Navigation, i18n::tr("Sidebar"));
-                    layers::rail(self, ui)
-                });
-        }
-        // The panels are as wide as asked, less in a window too small for them and the canvas.
-        let left_open = !hidden && !self.ui.left_collapsed;
-        let (left_w, right_w) = fit_panels(ui.available_width(), left_open.then_some(self.ui.left_width), self.ui.right_width);
-        let rows = ui.available_rect_before_wrap().y_range();
-        let mut edges: Vec<(&str, f32, f32, f32)> = Vec::new();
-        if left_open {
-            edges.push(("left", ui.available_rect_before_wrap().min.x + left_w, left_w, 1.0));
-            egui::Panel::left("left_panel")
-                .resizable(false)
-                .exact_size(left_w)
-                .frame(egui::Frame::NONE.fill(t.panel).stroke(egui::Stroke::new(1.0, t.border)))
-                .show(ui, |ui| {
-                    let label = match self.ui.left_tab {
-                        _ if self.ui.versions.open => i18n::tr("Version history"),
-                        LeftTab::File => i18n::tr("Layers"),
-                        LeftTab::Assets => i18n::tr("Assets"),
-                    };
-                    a11y::region(&mut self.ui.nav, ui, a11y::Region::Layers, egui::accesskit::Role::Pane, label);
-                    layers::left_panel(self, ui)
-                });
-        }
-        if !hidden {
-            edges.push(("right", ui.available_rect_before_wrap().max.x - right_w, right_w, -1.0));
-            egui::Panel::right("right_panel")
-                .resizable(false)
-                .exact_size(right_w)
-                .frame(egui::Frame::NONE.fill(t.panel).stroke(egui::Stroke::new(1.0, t.border)))
-                .show(ui, |ui| {
-                    let label = match self.ui.right_tab {
-                        RightTab::Design => i18n::tr("Design"),
-                        RightTab::Prototype => i18n::tr("Prototype"),
-                        RightTab::Inspect => i18n::tr("Dev Mode"),
-                    };
-                    a11y::region(&mut self.ui.nav, ui, a11y::Region::Properties, egui::accesskit::Role::Pane, label);
-                    right::right_panel(self, ui)
-                });
-        }
-        egui::CentralPanel::default().frame(egui::Frame::NONE.fill(t.canvas)).show(ui, |ui| {
-            let worker = self.worker.take();
-            let mut worker = worker.unwrap_or_else(|| render_worker::Worker::new(ctx.clone()));
-            canvas::show(self, ui, &mut worker);
-            self.worker = Some(worker);
-            if !hidden {
-                ui.scope_builder(egui::UiBuilder::new().id_salt("toolbar"), |ui| {
-                    a11y::container(ui, egui::accesskit::Role::Toolbar, i18n::tr("Tools"));
-                    toolbar::show(self, ui);
-                });
-            }
-        });
-        // The panels' edges, over the canvas and the panels (drawn after them: they take the press).
-        for (name, x, shown, grows) in edges {
-            if let Some(w) = Self::panel_edge(ui, name, x, rows, shown, grows) {
-                let (l, r) = if name == "left" { (w, self.ui.right_width) } else { (self.ui.left_width, w) };
-                self.set_panel_widths(l, r);
-                self.panels_unsaved = true;
-            }
-        }
-        // Kept once the drag is over (not on every pointer move).
-        if self.panels_unsaved && !ctx.input(|i| i.pointer.any_down()) {
-            self.panels_unsaved = false;
-            self.services.save_prefs(&self.session.prefs);
-        }
-        // Before the shortcuts: keys the hovered pane's prototype uses don't reach the editor, and
-        // the arrows step through comment threads with the Comment tool.
-        present::show_pane(self, &ctx);
-        comments::keys(self, &ctx);
-        dev_compare::keys(self, &ctx);
-        branch_ui::keys(self, &ctx);
-        live::dialog_keys(self, &ctx);
-        dialogs::keys(self, &ctx);
-        shortcuts::handle(self, &ctx, typing);
-        menus::popups(self, &ctx);
-        variable_ui::picker(self, &ctx);
-        style_picker::show(self, &ctx);
-        self.end_unwanted_text_preview(&ctx);
-        self.end_pen_outside_design();
-        dialogs::show(self, &ctx);
-        self.toast_ui(&ctx);
-        // A rename started after the layers panel drew (Cmd/Ctrl+R, a double-click) opens its field
-        // next frame.
-        if self.ui.rename.is_some_and(|r| r.start) && !hidden && !self.ui.left_collapsed && self.ui.left_tab == LeftTab::File {
-            ctx.request_repaint();
-        }
-        a11y::end(self, &ctx);
-        self.field_focus = a11y::field_focused(&ctx);
-        windows::requests(self, &ctx);
-        // Your pointer, selection and view to the others in each live session (when they
-        // changed), from the window with its file.
-        let windows = &self.windows;
-        self.session.live_sync_in(|uid| uid.map_or(0, |u| windows.of(u)) == windows.current);
-    }
-
-    fn toast_ui(&mut self, ctx: &egui::Context) {
-        let Some((msg, clock)) = &mut self.ui.toast else { return };
-        let now = ctx.input(|i| i.time);
-        // The clock starts on the frame after the one that first draws the toast: that frame's
-        // time was taken before whatever raised it ran (a file dialog, a long open), and would
-        // count that wait against it, so a failed open's message expired before it was seen.
-        let left = match *clock {
-            ToastClock::Raised => {
-                *clock = ToastClock::Drawn;
-                ctx.request_repaint();
-                TOAST_SECS
-            }
-            ToastClock::Drawn => {
-                *clock = ToastClock::Since(now);
-                TOAST_SECS
-            }
-            ToastClock::Since(t) => TOAST_SECS - (now - t),
-        };
-        if left <= 0.0 {
-            self.ui.toast = None;
-            return;
-        }
-        let msg = msg.clone();
-        // Nothing moves while it shows: the next frame it needs is the one that hides it.
-        if matches!(clock, ToastClock::Since(_)) {
-            repaint_in(ctx, left);
-        }
-        let screen = ctx.content_rect();
-        egui::Area::new(egui::Id::new("toast"))
-            .fixed_pos(egui::pos2(screen.center().x, screen.max.y - 96.0))
-            .pivot(egui::Align2::CENTER_BOTTOM)
-            .order(egui::Order::Tooltip)
-            .show(ctx, |ui| {
-                egui::Frame::NONE
-                    .fill(egui::Color32::from_rgb(0x1E, 0x1E, 0x1E))
-                    .corner_radius(egui::CornerRadius::same(8))
-                    .inner_margin(egui::Margin::symmetric(14, 10))
-                    .show(ui, |ui| {
-                        // Wrapped at a readable width (the area alone would wrap at a sliver).
-                        let width = (screen.width() - 64.0).clamp(120.0, 480.0);
-                        let galley = ui.painter().layout(msg, theme::regular(12.0), egui::Color32::WHITE, width);
-                        ui.label(galley);
-                    });
-            });
-    }
-
-    /// UI state as JSON (control channel `ui.inspect`).
-    pub fn inspect(&self) -> Value {
-        let mut state = json!({
-            "rightTab": self.ui.right_tab,
-            "leftTab": self.ui.left_tab,
-            "home": self.ui.home,
-            "online": online::inspect(self),
-            "tabs": self.session.docs.iter().map(|d| json!({"name": d.doc.name, "live": tabs::live_mark(self, d.uid).map(|shared| if shared { "shared" } else { "private" })})).collect::<Vec<_>>(),
-            "homeSection": self.ui.home_view.section.id(),
-            "homeRecents": home_recents::inspect(self),
-            "dark": self.ui.dark,
-            "focus": {"region": self.ui.nav.region.id(), "keyboard": self.ui.nav.keyboard},
-            "reduceMotion": self.reduce_motion(),
-            "presenting": self.ui.present.is_some(),
-            "presenter": self.ui.present.as_ref().map(present::Presenter::inspect),
-            "presentOptions": {"scale": self.ui.present_view.scale.id(), "deviceFrame": self.ui.present_view.device_frame, "comments": self.ui.present_view.comments, "hotspotHints": self.ui.present_view.hotspot_hints, "inspect": self.ui.present_view.inspect},
-            "preview": self.ui.preview.as_ref().map(|p| p.player.inspect()),
-            "mainMenu": self.ui.main_menu,
-            "palette": self.ui.palette.is_some(),
-            "variables": self.ui.variables.is_some(),
-            "versionHistory": self.ui.versions.open,
-            "branchReview": self.ui.branch_review.as_ref().map(|r| json!({"id": r.id, "picks": r.picks, "mode": if r.mode == dev_compare::Mode::Overlay { "overlay" } else { "sideBySide" }})),
-            "devCompare": self.ui.dev.compare.as_ref().map(|c| json!({"id": c.id, "mode": if c.mode == dev_compare::Mode::Overlay { "overlay" } else { "sideBySide" }, "split": c.split})),
-            "devFocus": self.session.ds().ok().and_then(figcraft_engine::DocState::focused),
-            "annotationFilter": self.ui.dev.categories.id(),
-            "colorProfileDialog": self.ui.color_profile.map(|p| p.id()),
-            "stylePicker": self.ui.style_picker.as_ref().map(|p| p.slot().key()),
-            "stylePickerView": if self.ui.style_grid { "grid" } else { "list" },
-            "textPreview": figcraft_engine::textpreview::active(&self.session),
-            "comments": {
-                "open": self.ui.comments.open,
-                "draft": self.ui.comments.draft.as_ref().map(|d| [d.0, d.1]),
-                "filter": self.ui.comments.filter.id(),
-                "sort": self.ui.comments.sort.id(),
-                "search": self.ui.comments.search,
-                "editing": self.ui.comments.editing.as_ref().map(|e| [e.0, e.1 as u64]),
-                "mentions": self.ui.comments.mention.names(),
-            },
-            "frameMs": self.ui.frame_ms,
-            "renderMs": self.ui.render_ms,
-            "framesDrawn": self.frame_stats.frames,
-            "repaintCauses": self.frame_stats.causes(),
-            "canvas": {
-                "rect": [self.canvas.rect.min.x, self.canvas.rect.min.y, self.canvas.rect.max.x, self.canvas.rect.max.y],
-                "renderWork": self.canvas.render_work.map(|w| match w {
-                    figcraft_render::Work::Reused => json!({"kind": "reused"}),
-                    figcraft_render::Work::Partial { pixels } => json!({"kind": "partial", "pixels": pixels}),
-                    figcraft_render::Work::Full => json!({"kind": "full"}),
-                }),
-                "quality": if self.canvas.tex_coarse { "preview" } else { "refined" },
-                "previewLatencyMs": self.canvas.preview_latency_ms,
-                "refineLatencyMs": self.canvas.refine_latency_ms,
-            },
-            "live": live::inspect(self),
-            "window": self.windows.current,
-            "windows": windows::list(self),
-            "tool": self.session.tool_info(),
-            "cursor": self.canvas.cursor.map(cursors::Shown::name),
-            "panels": {"left": self.ui.left_width, "right": self.ui.right_width, "leftCollapsed": self.ui.left_collapsed},
-            "status": self.session.status(),
-            "lastError": self.ui.last_error,
-        });
-        state["pendingOpens"] = json!(self.ui.pending_opens.len());
-        state
-    }
-}
-
-/// The file types File ▸ Open and a drop on the home screen open.
-pub(crate) const OPEN_EXTENSIONS: &[&str] = &["figcraft", "fig", "json", "svg", "png", "jpg", "jpeg", "webp", "gif", "tif", "tiff"];
-
-/// Whether `path` names a file type that opens as a document (the extension, in any case).
-pub(crate) fn opens(path: &Path) -> bool {
-    path.extension().and_then(|e| e.to_str()).is_some_and(|e| OPEN_EXTENSIONS.iter().any(|x| x.eq_ignore_ascii_case(e)))
-}
-
-/// The contents of a dropped file that has no file on disk to read by path.
-#[cfg(not(target_arch = "wasm32"))]
-pub(crate) fn dropped_bytes(f: &egui::DroppedFileHandle) -> Option<Vec<u8>> {
-    f.bytes().ok()
-}
-
-/// The contents of a dropped file that has no file on disk to read by path.
-#[cfg(target_arch = "wasm32")]
-pub(crate) fn dropped_bytes(_f: &egui::DroppedFileHandle) -> Option<Vec<u8>> {
-    // Browser drops arrive asynchronously; not supported yet.
-    None
-}
-
-/// While files are dragged over the window: a tinted, outlined `rect` with `label` in its middle,
-/// over everything else, saying what a drop does there.
-pub(crate) fn drop_overlay(ctx: &egui::Context, rect: egui::Rect, label: &str) {
-    if ctx.input(|i| i.raw.hovered_files.is_empty()) {
-        return;
-    }
-    let t = theme::Tokens::get(ctx);
-    let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::new("drop_overlay")));
-    let area = rect.shrink(4.0);
-    painter.rect_filled(area, egui::CornerRadius::same(8), t.accent.gamma_multiply(0.12));
-    painter.rect_stroke(area, egui::CornerRadius::same(8), egui::Stroke::new(2.0, t.accent), egui::StrokeKind::Inside);
-    let galley = painter.layout_no_wrap(label.to_owned(), theme::semibold(14.0), t.text);
-    let pill = egui::Rect::from_center_size(area.center(), galley.size() + egui::vec2(32.0, 16.0));
-    painter.rect_filled(pill, egui::CornerRadius::same(8), t.panel);
-    painter.rect_stroke(pill, egui::CornerRadius::same(8), egui::Stroke::new(1.0, t.accent), egui::StrokeKind::Inside);
-    painter.galley(pill.center() - galley.size() / 2.0, galley, t.text);
-    // Hovering sends no pointer events on every platform: keep the overlay current.
-    ctx.request_repaint();
-}
+#[cfg(test)]
+mod type_settings_tests;
 
 #[cfg(test)]
 mod typography_scrub_tests;
diff --git a/crates/ui-egui/src/live.rs b/crates/ui-egui/src/live.rs
index 35af5d14..e16d2cfa 100644
--- a/crates/ui-egui/src/live.rs
+++ b/crates/ui-egui/src/live.rs
@@ -13,10 +13,11 @@
 //! and it fades a few seconds after the last change (frames are asked for only until then).
 //! Spotlight: your avatar's menu asks everyone to follow you; a banner says so and stops it.
 
+use std::borrow::Cow;
 use std::collections::BTreeMap;
 
 use egui::{Align2, Color32, CornerRadius, Pos2, Rect, Sense, Shape, Stroke, Ui, pos2, vec2};
-use figcraft_engine::live::{Access, PEOPLE, Role, SessionId, Share, Signal, Status, Via, initials, parse_color, presence_page};
+use figcraft_engine::live::{Access, PEOPLE, Role, SessionId, Share, Signal, Status, TOO_LARGE_TO_JOIN, Via, initials, parse_color, presence_page};
 use serde_json::{Value, json};
 
 use crate::FigApp;
@@ -97,6 +98,11 @@ pub struct LiveUi {
     pub advanced: bool,
     pub this_computer: bool,
     pub port: String,
+    /// The server key for online sharing, and the server address it was entered for (a server
+    /// that needs one; `None`: none). Passed to `collab.share` so a keyed server can be used
+    /// from the Share popover without the Publish dialog. The key goes out only to the server it
+    /// belongs to: switching the server in Preferences must not leak the old one to it.
+    pub share_key: Option<(String, String)>,
     /// What is typed in the join field of the Share popover and the home screen.
     pub code: String,
     /// The join started from the home screen: what it is doing shows under the field, and its
@@ -353,7 +359,7 @@ pub fn chat_box(app: &mut FigApp, ctx: &egui::Context) {
             let _ = app.session.live_chat("");
             return;
         }
-        let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::new("live_chat")));
+        let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::unique("live_chat")));
         chat_bubble(&painter, tip, None, &chat.text, fill, alpha);
         app.ui.live.chat = Some(chat);
         return;
@@ -365,7 +371,7 @@ pub fn chat_box(app: &mut FigApp, ctx: &egui::Context) {
     }
     ctx.request_repaint_after(std::time::Duration::from_secs_f64(CHAT_HOLD + CHAT_FADE - idle));
     let fg = text_on(fill);
-    let resp = egui::Area::new(egui::Id::new("live_chat_box"))
+    let resp = egui::Area::new(egui::Id::unique("live_chat_box"))
         .order(egui::Order::Foreground)
         .fixed_pos(tip + vec2(12.0, 16.0))
         .show(ctx, |ui| {
@@ -377,7 +383,7 @@ pub fn chat_box(app: &mut FigApp, ctx: &egui::Context) {
                     let w = ui.painter().layout_no_wrap(chat.text.clone(), regular(12.0), fg).size().x + 8.0;
                     ui.add(
                         egui::TextEdit::singleline(&mut chat.text)
-                            .id(egui::Id::new("live_chat_text"))
+                            .id(egui::Id::unique("live_chat_text"))
                             .frame(egui::Frame::NONE)
                             .font(regular(12.0))
                             .text_color(fg)
@@ -424,7 +430,7 @@ pub fn spotlight_banner(app: &mut FigApp, ctx: &egui::Context, canvas: Rect) {
         return;
     };
     let t = Tokens::get(ctx);
-    let clicked = widgets::canvas_banner(ctx, egui::Id::new("live_spotlight"), canvas, |ui| {
+    let clicked = widgets::canvas_banner(ctx, egui::Id::unique("live_spotlight"), canvas, |ui| {
         ui.label(egui::RichText::new(text).font(regular(11.0)).color(t.text));
         widgets::button(ui, button, true, true).clicked()
     });
@@ -472,7 +478,7 @@ pub fn people_bar(app: &mut FigApp, ui: &mut Ui, area: Rect) {
     let mut spotlight = false;
     if in_session {
         let c = pos2(x, cy);
-        let resp = ui.interact(Rect::from_center_size(c, vec2(2.0 * R, 2.0 * R)), ui.id().with("live_me"), Sense::click());
+        let resp = ui.interact(Rect::from_center_size(c, vec2(2.0 * R, 2.0 * R)), ui.scope_id().with("live_me"), Sense::click());
         a11y::menu_button(&resp, tr("You"), a11y::menu_open(&resp));
         if spotlighting || resp.hovered() {
             ui.painter().circle_stroke(c, R + 2.5, Stroke::new(2.0, me_fill));
@@ -490,7 +496,7 @@ pub fn people_bar(app: &mut FigApp, ui: &mut Ui, area: Rect) {
         let c = pos2(x, cy);
         let following = follow == Some(*id);
         let tip = if following { trf("Stop following {name}", &[("name", name)]) } else { trf("Follow {name}", &[("name", name)]) };
-        let resp = ui.interact(Rect::from_center_size(c, vec2(2.0 * R, 2.0 * R)), ui.id().with(("live_avatar", id)), Sense::click()).tip(tip);
+        let resp = ui.interact(Rect::from_center_size(c, vec2(2.0 * R, 2.0 * R)), ui.scope_id().with(("live_avatar", id)), Sense::click()).tip(tip);
         ring(ui, c);
         avatar(ui.painter(), c, R, name, *fill);
         if following || resp.hovered() {
@@ -516,7 +522,7 @@ pub fn people_bar(app: &mut FigApp, ui: &mut Ui, area: Rect) {
         ui.painter().text(c, Align2::CENTER_CENTER, format!("+{more}"), semibold(10.0), t.text);
     }
     let chev = Rect::from_center_size(pos2(x + R + 10.0, cy), vec2(16.0, 24.0));
-    let cresp = ui.interact(chev, ui.id().with("live_people"), Sense::click());
+    let cresp = ui.interact(chev, ui.scope_id().with("live_people"), Sense::click());
     a11y::menu_button(&cresp, tr("People in this file"), a11y::menu_open(&cresp));
     if cresp.hovered() {
         ui.painter().rect_filled(chev, CornerRadius::same(4), t.hover);
@@ -595,7 +601,7 @@ pub fn share_popover(app: &mut FigApp, anchor: &egui::Response) {
                 (Status::Reconnecting { attempt }, _) => {
                     (trf("Connection lost, reconnecting (attempt {attempt})…", &[("attempt", attempt)]), t.text_secondary)
                 }
-                (Status::Failed { .. }, _) => (status.label(), t.danger),
+                (Status::Failed { reason }, _) => (failure_text(reason).into_owned(), t.danger),
                 _ => (tr(&status.label()).to_string(), t.text_secondary),
             };
             if !line.is_empty() {
@@ -664,7 +670,7 @@ fn online_note(app: &mut FigApp, ui: &mut Ui, t: &Tokens, server: &str) {
 /// home screen is closed. The session of the join that started, if one did.
 pub fn join_row(app: &mut FigApp, ui: &mut Ui, width: f32) -> Option<SessionId> {
     let mut typed = std::mem::take(&mut app.ui.live.code);
-    let joined = ui.horizontal(|ui| join_field(app, ui, &mut typed, egui::Id::new("live_join_code"), width, false)).inner;
+    let joined = ui.horizontal(|ui| join_field(app, ui, &mut typed, egui::Id::unique("live_join_code"), width, false)).inner;
     app.ui.live.code = typed;
     joined
 }
@@ -695,18 +701,25 @@ pub fn join_field(app: &mut FigApp, ui: &mut Ui, typed: &mut String, id: egui::I
 pub fn join_status(app: &FigApp, ui: &mut Ui, t: &Tokens, session: SessionId) {
     match app.session.live.get(session).map(|l| &l.status) {
         Some(Status::Connecting) => widgets::label(ui, tr("Joining…"), t.text_secondary),
-        Some(Status::Failed { reason }) => widgets::label(ui, reason, t.danger),
+        Some(Status::Failed { reason }) => widgets::label(ui, &failure_text(reason), t.danger),
         _ => {}
     }
 }
 
+/// Why a live session failed, in the UI language when it is a reason the UI knows (the transport's
+/// English otherwise).
+pub(crate) fn failure_text(reason: &str) -> Cow<'_, str> {
+    let mb = TOO_LARGE_TO_JOIN.split_once("{mb}").and_then(|(before, after)| reason.strip_prefix(before)?.strip_suffix(after));
+    mb.map_or(Cow::Borrowed(reason), |mb| Cow::Owned(trf(TOO_LARGE_TO_JOIN, &[("mb", &mb)])))
+}
+
 /// Not in a session: your name, how to share (online or on the local network), start; or join
 /// one with a code. Everything else is under Advanced.
 fn start_ui(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
     ui.horizontal(|ui| {
         widgets::label(ui, tr("Your name"), t.text);
         let name = app.session.prefs.user_name.clone();
-        if let Some(n) = widgets::text_field(ui, egui::Id::new("live_name"), &name, 160.0, tr("Your name")) {
+        if let Some(n) = widgets::text_field(ui, egui::Id::unique("live_name"), &name, 160.0, tr("Your name")) {
             app.run("pref.userName", json!({"name": n}));
         }
     });
@@ -738,6 +751,15 @@ fn start_ui(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
         if let (true, Ok(port)) = (local, app.ui.live.port.trim().parse::<u16>()) {
             params["port"] = json!(port);
         }
+        // The key goes out only to the server it belongs to (the server in Preferences): changing
+        // the server must not send the old server's key to a new one.
+        if !local
+            && let Some((at, key)) = app.ui.live.share_key.as_ref()
+            && *at == server
+            && !key.is_empty()
+        {
+            params["key"] = json!(key);
+        }
         app.run("collab.share", params);
     }
     join_and_advanced(app, ui, t, |app, ui, t| {
@@ -747,13 +769,23 @@ fn start_ui(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
             }
             ui.horizontal(|ui| {
                 widgets::label(ui, tr("Port"), t.text);
-                if let Some(port) = widgets::text_field_named(ui, egui::Id::new("live_port"), &app.ui.live.port, 70.0, tr("Port")) {
+                if let Some(port) = widgets::text_field_named(ui, egui::Id::unique("live_port"), &app.ui.live.port, 70.0, tr("Port")) {
                     // Digits only; empty: the usual port, or any free one.
                     app.ui.live.port = port.trim().parse::<u16>().map(|p| p.to_string()).unwrap_or_default();
                 }
             });
         } else {
             widgets::label(ui, tr("Another server, or one that needs its key. The usual server is set in Preferences."), t.text_secondary);
+            // The server key (a server that needs one; the address in Preferences is without it).
+            // It is remembered for the server it was typed for, so it never leaks to another one.
+            ui.horizontal(|ui| {
+                widgets::label(ui, tr("Server key"), t.text);
+                let shown = app.ui.live.share_key.as_ref().and_then(|(at, key)| (*at == server).then_some(key.as_str())).unwrap_or_default();
+                if let Some(key) = widgets::secret_field_named(ui, egui::Id::unique("live_share_key"), shown, 200.0, tr("Server key")) {
+                    let key: String = key.trim().chars().filter(|c| !c.is_whitespace() && !c.is_control()).take(128).collect();
+                    app.ui.live.share_key = if key.is_empty() { None } else { Some((server.trim().to_string(), key)) };
+                }
+            });
             if widgets::button(ui, tr("Publish to another server…"), false, true).clicked() {
                 open_publish(app);
                 ui.close();
@@ -877,11 +909,11 @@ fn share_ui(app: &mut FigApp, ui: &mut Ui, t: &Tokens, share: &Share) {
             });
             ui.horizontal(|ui| {
                 if widgets::button(ui, tr("Copy code"), true, true).clicked() {
-                    app.services.clipboard_set_text(&code);
+                    app.clipboard_set_text(&code);
                     app.toast(tr("Join code copied"));
                 }
                 if widgets::button(ui, tr("Copy link"), false, true).on_hover_text(tr("An invite link that opens FigCraft and joins")).clicked() {
-                    app.services.clipboard_set_text(&link);
+                    app.clipboard_set_text(&link);
                     app.toast(tr("Invite link copied"));
                 }
             });
@@ -999,7 +1031,7 @@ fn report_ui(app: &mut FigApp, ui: &mut Ui, t: &Tokens) {
             .hint_text(tr("Spam, stolen work, abuse…"))
             .char_limit(figcraft_engine::live::MAX_REPORT)
             .desired_width(ui.available_width())
-            .id(egui::Id::new("live_report_reason")),
+            .id(egui::Id::unique("live_report_reason")),
     );
     a11y::text(&resp, tr("Report"), &reason);
     crate::widgets::select_all_on_focus(ui, &resp, &reason);
@@ -1034,7 +1066,7 @@ fn link_rows(app: &mut FigApp, ui: &mut Ui, rows: &[(&str, &String, &str)]) {
                 ui.label(egui::RichText::new(widgets::elide(ui, value, w)).font(regular(10.5)).monospace());
             });
             if widgets::button(ui, tr("Copy"), false, true).on_hover_text(trf("Copy the {label}", &[("label", &label.to_lowercase())])).clicked() {
-                app.services.clipboard_set_text(value);
+                app.clipboard_set_text(value);
                 app.toast(*what);
             }
         });
@@ -1047,12 +1079,14 @@ pub fn open_join(app: &mut FigApp, link: &str) {
     app.ui.live.focus_join = true;
 }
 
-/// An invite link the app was opened with (`figcraft figcraft://join?…`): join at once; a link
-/// that can't be used shows in the Join dialog with the reason.
+/// An invite link the app was opened with (`figcraft figcraft://join?…`): the Join dialog opens
+/// with the link filled in, so joining is the person's own choice.
+///
+/// The system hands the app any `figcraft://` link that is followed, which may be a page, a
+/// message or a document rather than something the person meant to act on, so the link is shown
+/// and confirmed rather than acted on.
 pub fn open_invite(app: &mut FigApp, link: &str) {
-    if app.run("collab.join", json!({"link": link.trim()})).is_none() {
-        open_join(app, link.trim());
-    }
+    open_join(app, link.trim());
 }
 
 /// Escape closes the Join or Publish dialog (before the canvas's shortcuts see it: it doesn't
@@ -1075,11 +1109,11 @@ pub fn join_dialog(app: &mut FigApp, ctx: &egui::Context) {
     let mut cancel = false;
     let mut go = false;
     let focus = std::mem::take(&mut app.ui.live.focus_join);
-    crate::dialogs::window(tr("Join live session"), ctx).id(egui::Id::new("Join live session")).open(&mut open).show(ctx, |ui| {
+    crate::dialogs::window(tr("Join live session"), ctx).id(egui::Id::unique("Join live session")).open(&mut open).show(ctx, |ui| {
         ui.set_width(380.0);
         widgets::label(ui, tr("Type the join code you were given, or paste an invite link."), t.text);
         ui.horizontal(|ui| {
-            go = join_field(app, ui, &mut link, egui::Id::new("live_join_link"), 300.0, focus).is_some();
+            go = join_field(app, ui, &mut link, egui::Id::unique("live_join_link"), 300.0, focus).is_some();
             cancel = widgets::button(ui, tr("Cancel"), false, true).clicked();
         });
         widgets::label(ui, tr("You'll get the shared file as a new tab and edit it together."), t.text_secondary);
@@ -1148,7 +1182,7 @@ pub fn publish_dialog(app: &mut FigApp, ctx: &egui::Context) {
     let open_server = info.as_ref().is_some_and(|v| v["open"] == true);
     // A first look at an address already filled in.
     ask |= focus && !address.is_empty() && !keyed && info.is_none();
-    crate::dialogs::window(tr("Publish to server"), ctx).id(egui::Id::new("Publish to server")).open(&mut open).show(ctx, |ui| {
+    crate::dialogs::window(tr("Publish to server"), ctx).id(egui::Id::unique("Publish to server")).open(&mut open).show(ctx, |ui| {
         ui.set_width(380.0);
         widgets::label(
             ui,
@@ -1160,7 +1194,7 @@ pub fn publish_dialog(app: &mut FigApp, ctx: &egui::Context) {
             egui::TextEdit::singleline(&mut form.server)
                 .hint_text("wss://server/ or ws://server:47900/?key=…")
                 .desired_width(380.0)
-                .id(egui::Id::new("live_publish_server")),
+                .id(egui::Id::unique("live_publish_server")),
         );
         // The address may carry the server key: it isn't read out.
         a11y::text(&resp, tr("Server address"), "");
@@ -1192,7 +1226,7 @@ pub fn publish_dialog(app: &mut FigApp, ctx: &egui::Context) {
             ),
         }
         widgets::label(ui, tr("File name"), t.text_secondary);
-        let nresp = ui.add(egui::TextEdit::singleline(&mut form.name).desired_width(380.0).id(egui::Id::new("live_publish_name")));
+        let nresp = ui.add(egui::TextEdit::singleline(&mut form.name).desired_width(380.0).id(egui::Id::unique("live_publish_name")));
         a11y::text(&nresp, tr("File name"), &form.name);
         crate::widgets::select_all_on_focus(ui, &nresp, &form.name);
         go |= nresp.lost_focus() && enter(ui) && (keyed || open_server);
@@ -1239,7 +1273,7 @@ fn published_dialog(app: &mut FigApp, ctx: &egui::Context) {
     let t = Tokens::get(ctx);
     let mut open = true;
     let mut done = false;
-    crate::dialogs::window(tr("File published"), ctx).id(egui::Id::new("File published")).open(&mut open).show(ctx, |ui| {
+    crate::dialogs::window(tr("File published"), ctx).id(egui::Id::unique("File published")).open(&mut open).show(ctx, |ui| {
         ui.set_width(400.0);
         ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Wrap);
         widgets::label(ui, &trf("{name} is on the server.", &[("name", &p.name)]), t.text);
diff --git a/crates/ui-egui/src/live_join_tests.rs b/crates/ui-egui/src/live_join_tests.rs
index d7452163..bc1db8ad 100644
--- a/crates/ui-egui/src/live_join_tests.rs
+++ b/crates/ui-egui/src/live_join_tests.rs
@@ -14,8 +14,9 @@ fn escape(h: &mut Harness) {
     }
 }
 
+/// Whether the Join link field currently has focus.
 fn link_focused(h: &Harness) -> bool {
-    h.ctx.memory(|m| m.has_focus(egui::Id::new("live_join_link")))
+    h.ctx.memory(|m| m.has_focus(egui::Id::unique("live_join_link")))
 }
 
 #[test]
@@ -47,12 +48,14 @@ fn escape_closes_the_join_dialog_and_keeps_the_selection() {
 }
 
 #[test]
-fn opening_the_app_with_an_invite_link_joins() {
+fn opening_the_app_with_an_invite_link_asks_before_joining() {
     let (mut h, _) = Harness::new();
     let link = "figcraft://join?host=127.0.0.1:47900&file=abc&token=AbCdEfGhIjKlMnOpQrStUv";
     crate::live::open_invite(&mut h.app, &format!(" {link} "));
-    assert_eq!(h.app.session.live().status, Status::Connecting);
-    assert!(h.app.ui.live.join.is_none(), "no dialog: it joins at once");
+    // The system hands the app whatever `figcraft://` link was followed, which may come from a
+    // page or a message, so the link is shown and confirmed rather than acted on.
+    assert_eq!(h.app.ui.live.join.as_deref(), Some(link), "the dialog opens with the link filled in");
+    assert_eq!(h.app.session.live().status, Status::Off, "nothing is joined until the person confirms");
 }
 
 /// The browser's link: joins, can't host; joining fails here to show the dialog path.
@@ -82,7 +85,8 @@ fn a_link_that_cant_be_used_opens_the_dialog_with_it() {
     h.app.session.live.install(Box::new(Browser));
     crate::live::open_invite(&mut h.app, "figcraft://nope");
     assert_eq!(h.app.ui.live.join.as_deref(), Some("figcraft://nope"), "the link stays in the field to fix");
-    assert!(h.app.ui.last_error.as_deref().is_some_and(|e| e.contains("not a live session invite")));
+    // The link is not tried until the person presses Join, so its reason shows then, not now.
+    assert!(h.app.ui.last_error.is_none());
     assert_eq!(h.app.session.live().status, Status::Off);
 }
 
diff --git a/crates/ui-egui/src/live_server_tests.rs b/crates/ui-egui/src/live_server_tests.rs
index 9c2cb22c..014be152 100644
--- a/crates/ui-egui/src/live_server_tests.rs
+++ b/crates/ui-egui/src/live_server_tests.rs
@@ -20,12 +20,13 @@ fn key(h: &mut Harness, key: Key) {
     }
 }
 
+/// Whether the widget with the given id currently has focus.
 fn focused(h: &Harness, id: &str) -> bool {
-    h.ctx.memory(|m| m.has_focus(egui::Id::new(id)))
+    h.ctx.memory(|m| m.has_focus(egui::Id::unique(id)))
 }
 
 /// Joined through a server's link with `access`: the welcome and the document (a new tab).
-fn joined(h: &mut Harness, access: Access) {
+pub(crate) fn joined(h: &mut Harness, access: Access) {
     h.app.session.execute("collab.join", &json!({"link": "figcraft://join?host=127.0.0.1:47900&file=f&token=AbCdEfGhIjKlMnOpQrStUv"})).unwrap();
     let mut server = Server::new(h.app.session.doc().unwrap().clone(), "", Limits::default());
     let ClientMsg::Hello(me) = Client::hello("f", "", "Ada", "") else { panic!("no hello") };
diff --git a/crates/ui-egui/src/live_share_tests.rs b/crates/ui-egui/src/live_share_tests.rs
index 66750cac..a2ac63c2 100644
--- a/crates/ui-egui/src/live_share_tests.rs
+++ b/crates/ui-egui/src/live_share_tests.rs
@@ -232,6 +232,20 @@ fn not_sharing_the_popover_offers_one_way_to_start_and_one_to_join() {
     assert_eq!(h.app.session.live().status, Status::Off);
 }
 
+#[test]
+fn the_server_key_shows_as_dots_while_shown_and_typed() {
+    let (mut h, _) = harness();
+    let shapes = open(&mut h);
+    click(&mut h, &shapes, "Advanced");
+    h.app.ui.live.share_key = Some(("wss://share.example/".to_string(), "s3cret-key".to_string()));
+    let shapes = h.frames(2);
+    let dots = "•".repeat(10);
+    assert!(has_text(&shapes, &dots) && !has_text(&shapes, "s3cret-key"));
+    // Editing it keeps it hidden.
+    let shapes = click(&mut h, &shapes, &dots);
+    assert!(!has_text(&shapes, "s3cret-key"));
+}
+
 #[test]
 fn sharing_online_shows_the_code_copies_it_and_stops() {
     let (mut h, script) = harness();
@@ -385,13 +399,16 @@ fn without_a_code_the_link_is_shared_instead() {
     assert_eq!(script.lock().unwrap().copied.last().map(String::as_str), Some(PLAIN));
 }
 
+/// Asserts the join field accepts a typed code or invite link, joins on Enter, clears after
+/// joining, shows failure/retry, rejects an invalid code with an error, and accepts local
+/// codes and links.
 #[test]
 fn the_join_field_takes_a_code_or_a_link_and_enter_joins() {
     let (mut h, script) = harness();
     let shapes = open(&mut h);
     // Click into the field (its hint), type a code the way people type it, press Enter.
     click(&mut h, &shapes, "Code or invite link");
-    assert!(h.ctx.memory(|m| m.has_focus(egui::Id::new("live_join_code"))));
+    assert!(h.ctx.memory(|m| m.has_focus(egui::Id::unique("live_join_code"))));
     type_text(&mut h, " k7m 2qx-9td ");
     assert_eq!(crate::live::inspect(&h.app)["joinField"], " k7m 2qx-9td ");
     key(&mut h, Key::Enter);
@@ -450,13 +467,15 @@ fn the_home_screen_joins_with_a_code_and_opens_the_file() {
     assert_eq!(h.app.session.docs.len(), 2);
 }
 
+/// Asserts the join dialog uses the same shared join field, focuses it, and closes once the
+/// join starts.
 #[test]
 fn the_join_dialog_is_the_same_field() {
     let (mut h, script) = harness();
     crate::menus::invoke(&mut h.app, "collab.join");
     let shapes = h.frames(2);
     assert!(has_text(&shapes, "Type the join code you were given, or paste an invite link.") && has_text(&shapes, "Code or invite link"));
-    assert!(h.ctx.memory(|m| m.has_focus(egui::Id::new("live_join_link"))), "the field has the keyboard");
+    assert!(h.ctx.memory(|m| m.has_focus(egui::Id::unique("live_join_link"))), "the field has the keyboard");
     type_text(&mut h, "4fh j8r 2wn");
     key(&mut h, Key::Enter);
     h.frames(1);
@@ -486,6 +505,22 @@ fn the_server_preference_resets_and_turns_online_sharing_off() {
     assert!(s.published.is_empty() && s.hosted.len() == 1, "shared on the local network");
 }
 
+#[test]
+fn a_key_typed_for_one_server_is_not_sent_to_another() {
+    // The Server key field remembers the server it was typed for: it goes out only to that
+    // server. Changing the server in Preferences must not send the old server's key to the new
+    // one. (The key is set as the field editor would, bound to the server it was typed for.)
+    let (mut h, script) = harness();
+    h.app.ui.live.share_key = Some(("wss://share.example/".to_string(), "KeyKeyKeyKeyKeyKeyKey0".to_string()));
+    h.frames(2);
+    // Change the server in Preferences to another one, then share: the old key must not go to it.
+    h.app.session.execute("pref.publishServer", &json!({"url": "wss://other.example/"})).unwrap();
+    h.frames(2);
+    let shapes = open(&mut h);
+    click(&mut h, &shapes, "Start sharing");
+    assert_eq!(script.lock().unwrap().published.last().unwrap().key, None, "the old server's key is not sent to the new server");
+}
+
 #[test]
 fn an_open_popover_asks_for_no_frames() {
     let (mut h, script) = harness();
diff --git a/crates/ui-egui/src/live_tests.rs b/crates/ui-egui/src/live_tests.rs
index 331316b8..63c3c42a 100644
--- a/crates/ui-egui/src/live_tests.rs
+++ b/crates/ui-egui/src/live_tests.rs
@@ -290,6 +290,8 @@ fn cursors_follow_pages_in_a_shared_document() {
     assert_eq!(h.app.ui.toast.as_ref().map(|t| t.0.as_str()), Some("Hana left"));
 }
 
+/// Asserts clicking a peer's avatar follows that peer, and Escape or scrolling the canvas
+/// stops following.
 #[test]
 fn clicking_an_avatar_follows_and_escape_stops() {
     let (mut h, _) = Harness::new();
@@ -317,6 +319,7 @@ fn clicking_an_avatar_follows_and_escape_stops() {
     h.frame(vec![Event::PointerMoved(pos2(700.0, 500.0))]);
     h.frame(vec![Event::MouseWheel {
         unit: egui::MouseWheelUnit::Point,
+        source: egui::MouseWheelSource::Unknown,
         delta: vec2(0.0, -40.0),
         phase: egui::TouchPhase::Move,
         modifiers: Default::default(),
diff --git a/crates/ui-egui/src/measure_nudge_tests.rs b/crates/ui-egui/src/measure_nudge_tests.rs
new file mode 100644
index 00000000..b4a5a247
--- /dev/null
+++ b/crates/ui-egui/src/measure_nudge_tests.rs
@@ -0,0 +1,64 @@
+//! Nudging while measuring (#894), driven through egui headless: with Alt held over another layer
+//! the arrows still nudge the selection (Shift: the big step), the distance follows every nudge,
+//! and the selection's handles and size label hide while measuring (its outline stays).
+
+use egui::{Event, Key, Modifiers, Pos2, Shape};
+use figcraft_doc::NodeId;
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+use crate::live_tests::flat;
+use crate::present_tests::id;
+
+fn labels(u: &Ui) -> Vec<String> {
+    u.app.session.tool.overlay.guides.iter().filter_map(|g| g.label.clone()).collect()
+}
+
+fn top(u: &Ui, i: NodeId) -> f64 {
+    u.app.session.doc().unwrap().world_bounds(i).unwrap().y0
+}
+
+/// Press and release `key` with `m` held, then a settled frame (the pointer still over the canvas).
+fn press(u: &mut Ui, key: Key, m: Modifiers, at: Pos2) {
+    let ev = |pressed| Event::Key { key, physical_key: None, pressed, repeat: false, modifiers: m };
+    u.frame_with(vec![ev(true), ev(false)], m);
+    u.frame_with(vec![Event::PointerMoved(at)], m);
+}
+
+/// Whether the frame drew corner handles or a text `label`.
+fn drew(shapes: &[Shape], label: &str) -> (bool, bool) {
+    let handle = shapes.iter().any(|s| matches!(s, Shape::Rect(r) if (r.rect.width() - 8.0).abs() < 0.1 && (r.rect.height() - 8.0).abs() < 0.1));
+    let text = shapes.iter().any(|s| matches!(s, Shape::Text(t) if t.galley.text() == label));
+    (handle, text)
+}
+
+#[test]
+fn arrows_nudge_while_measuring_and_the_distance_follows() {
+    let mut s = Session::new();
+    let upper = id(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 40})).unwrap());
+    let lower = id(&s.execute("shape.rectangle", &json!({"x": 0, "y": 140, "width": 100, "height": 40})).unwrap());
+    s.execute("select.set", &json!({"ids": [lower]})).unwrap();
+    let mut u = Ui::new(s);
+    let over = u.app.to_screen(50.0, 20.0);
+    let (alt, shift_alt) = (Modifiers { alt: true, ..Modifiers::NONE }, Modifiers { alt: true, shift: true, ..Modifiers::NONE });
+
+    // Not measuring: the selection shows its handles and size.
+    let shapes = flat(&u.frame_with(vec![Event::PointerMoved(over)], Modifiers::NONE).shapes);
+    assert_eq!(drew(&shapes, "100 × 40"), (true, true), "handles and size label show");
+
+    u.frame_with(vec![Event::PointerMoved(over)], alt);
+    let shapes = flat(&u.frame_with(vec![Event::PointerMoved(over)], alt).shapes);
+    assert!(u.app.session.tool.overlay.measure_box.is_some(), "Alt over the other layer measures to it");
+    assert!(labels(&u).contains(&"100".to_string()), "the gap: {:?}", labels(&u));
+    assert_eq!(drew(&shapes, "100 × 40"), (false, false), "measuring hides the handles and size label");
+
+    press(&mut u, Key::ArrowUp, alt, over);
+    assert_eq!(top(&u, lower), 139.0, "Alt+Up nudges by the small step");
+    assert!(labels(&u).contains(&"99".to_string()), "the gap follows the nudge: {:?}", labels(&u));
+
+    press(&mut u, Key::ArrowUp, shift_alt, over);
+    assert_eq!(top(&u, lower), 129.0, "Shift+Alt+Up nudges by the big step");
+    assert!(labels(&u).contains(&"89".to_string()), "the gap follows the big nudge: {:?}", labels(&u));
+    assert_eq!(top(&u, upper), 0.0, "the measured layer stays put");
+}
diff --git a/crates/ui-egui/src/menu_aim_tests.rs b/crates/ui-egui/src/menu_aim_tests.rs
new file mode 100644
index 00000000..6f7c4b8a
--- /dev/null
+++ b/crates/ui-egui/src/menu_aim_tests.rs
@@ -0,0 +1,284 @@
+//! Which submenu the main and context menus show, driven through egui headless: a closed menu
+//! reopens with no submenu open (also one level down), hovering another row closes the open
+//! submenu at once while a submenu opens only once the pointer stays on its row a moment
+//! (sweeping across rows doesn't flash each one), and on the way from a
+//! submenu's row to its submenu the rows the pointer crosses don't take over (the safe triangle),
+//! unless it rests on one or turns away.
+
+use egui::{Event, Id, LayerId, Order, Pos2, RawInput, Rect, pos2, vec2};
+use figcraft_engine::Session;
+
+use crate::menus::{AIM_REST, HOVER_DELAY, heading_for, in_triangle, main_menu_id};
+use crate::{FigApp, NoServices};
+
+const SIZE: egui::Vec2 = vec2(1440.0, 900.0);
+const ROW: f32 = 28.0;
+
+struct Ui {
+    ctx: egui::Context,
+    app: FigApp,
+    time: f64,
+}
+
+impl Ui {
+    fn new() -> Self {
+        let app = FigApp::new(Session::new(), Box::new(NoServices));
+        let mut u = Self { ctx: egui::Context::default(), app, time: 0.0 };
+        for _ in 0..3 {
+            u.frame(vec![]);
+        }
+        u
+    }
+
+    fn frame(&mut self, events: Vec<Event>) {
+        self.time += 1.0 / 60.0;
+        let input = RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, SIZE)), time: Some(self.time), events, ..Default::default() };
+        let app = &mut self.app;
+        let mut out = self.ctx.run_ui(input, |ui| app.ui(ui));
+        out.textures_delta.clear();
+    }
+
+    fn hover(&mut self, p: Pos2) {
+        self.frame(vec![Event::PointerMoved(p)]);
+    }
+
+    /// Hover `p` and stay there until a submenu could open.
+    fn settle(&mut self, p: Pos2) {
+        self.hover(p);
+        self.wait(HOVER_DELAY + 0.05);
+    }
+
+    /// Frames without input for `secs`.
+    fn wait(&mut self, secs: f64) {
+        let until = self.time + secs;
+        while self.time < until {
+            self.frame(vec![]);
+        }
+    }
+
+    fn open_main_menu(&mut self) {
+        self.app.ui.main_menu = true;
+        // Somewhere off the menu: nothing hovered.
+        self.hover(pos2(900.0, 700.0));
+        self.frame(vec![]);
+    }
+
+    fn shown(&self, area: Id) -> bool {
+        self.ctx.memory(|m| m.areas().visible_layer_ids().contains(&LayerId::new(Order::Foreground, area)))
+    }
+
+    fn rect(&self, area: Id) -> Rect {
+        self.ctx.memory(|m| m.area_rect(area)).expect("area drawn")
+    }
+
+    /// The main menu's row for top-level menu `i` (File 0, Edit 1, View 2, …).
+    fn top_row(&self, i: usize) -> Rect {
+        let m = self.rect(main_menu_id());
+        // Frame margin, the Actions row and the space under it.
+        let y = m.min.y + 8.0 + 30.0 + 6.0 + ROW * i as f32;
+        Rect::from_min_max(pos2(m.min.x + 8.0, y), pos2(m.max.x - 8.0, y + ROW))
+    }
+
+    /// Which top-level menus' panels show.
+    fn tops_shown(&self) -> Vec<&'static str> {
+        TOPS.iter().copied().filter(|t| self.shown(top(t))).collect()
+    }
+}
+
+const TOPS: [&str; 6] = ["File", "Edit", "View", "Object", "Text", "Arrange"];
+
+/// Stable id for a top-level menu in the menu-aim test harness.
+fn top(name: &str) -> Id {
+    Id::unique(("menu", name))
+}
+
+/// The submenus of top-level menu `menu` (their keys), from the menu catalog.
+fn submenu_keys(menu: &str) -> Vec<String> {
+    let mut keys: Vec<String> = figcraft_engine::catalog::MENU
+        .iter()
+        .filter_map(|m| m.menu.strip_prefix(menu).and_then(|r| r.strip_prefix('/')).map(|r| format!("{menu}/{}", r.split('/').next().unwrap_or(r))))
+        .collect();
+    keys.extend(figcraft_engine::catalog::MENU.iter().filter(|m| m.menu == menu && m.id == "file.openRecent").map(|m| format!("{menu}/{}", m.label)));
+    keys.dedup();
+    keys
+}
+
+#[test]
+fn the_triangle_takes_the_pointer_from_the_row_toward_the_panel() {
+    let panel = Rect::from_min_max(pos2(300.0, 50.0), pos2(500.0, 650.0));
+    let from = pos2(250.0, 100.0);
+    assert!(in_triangle(pos2(1.0, 1.0), pos2(0.0, 0.0), pos2(4.0, 0.0), pos2(0.0, 4.0)));
+    assert!(!in_triangle(pos2(3.0, 3.0), pos2(0.0, 0.0), pos2(4.0, 0.0), pos2(0.0, 4.0)));
+    // Diagonally down toward the panel: heading for it.
+    assert!(heading_for(from, pos2(260.0, 130.0), panel));
+    // Straight down, straight up, back left, or far below the panel's reach: not.
+    assert!(!heading_for(from, pos2(250.0, 130.0), panel));
+    assert!(!heading_for(from, pos2(250.0, 80.0), panel));
+    assert!(!heading_for(from, pos2(240.0, 105.0), panel));
+    assert!(!heading_for(from, pos2(260.0, 400.0), Rect::from_min_max(pos2(300.0, 50.0), pos2(500.0, 120.0))));
+    // A panel on the left works the same way, mirrored.
+    let left = Rect::from_min_max(pos2(0.0, 50.0), pos2(200.0, 650.0));
+    assert!(heading_for(from, pos2(240.0, 130.0), left));
+    assert!(!heading_for(from, pos2(260.0, 130.0), left));
+    // Junk positions never count.
+    assert!(!heading_for(pos2(f32::NAN, 0.0), from, panel));
+}
+
+#[test]
+fn a_reopened_main_menu_shows_no_stale_submenu() {
+    let mut u = Ui::new();
+    u.open_main_menu();
+    assert!(u.tops_shown().is_empty(), "nothing open before hovering");
+    u.settle(u.top_row(0).center());
+    assert_eq!(u.tops_shown(), ["File"]);
+    // Escape closes it; it reopens without File open.
+    u.frame(vec![Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() }]);
+    u.frame(vec![]);
+    assert!(!u.app.ui.main_menu);
+    u.open_main_menu();
+    assert!(u.tops_shown().is_empty(), "reopened with {:?} open", u.tops_shown());
+    // Closed from outside (the menu button toggling it) it forgets too.
+    u.settle(u.top_row(1).center());
+    assert_eq!(u.tops_shown(), ["Edit"]);
+    u.app.ui.main_menu = false;
+    u.frame(vec![]);
+    u.open_main_menu();
+    assert!(u.tops_shown().is_empty(), "reopened with {:?} open", u.tops_shown());
+}
+
+/// Asserts leaving a top menu and returning to it does not restore the submenu that was open
+/// before.
+#[test]
+fn a_submenu_one_level_down_reopens_closed() {
+    let mut u = Ui::new();
+    u.open_main_menu();
+    u.settle(u.top_row(0).center());
+    let keys = submenu_keys("File");
+    assert!(!keys.is_empty(), "File has submenus");
+    let sub_shown = |u: &Ui| keys.iter().find(|k| u.shown(Id::unique(("submenu", k.as_str())))).cloned();
+    // Down the middle of File's panel until one of its submenus opens.
+    let panel = u.rect(top("File"));
+    let mut y = panel.min.y + 10.0;
+    while sub_shown(&u).is_none() && y < panel.max.y {
+        u.settle(pos2(panel.center().x, y));
+        y += 7.0;
+    }
+    let Some(open) = sub_shown(&u) else { panic!("no File submenu opened (looked for {keys:?})") };
+    // Over to Edit and back to File: File shows, without its submenu.
+    u.hover(u.top_row(1).center());
+    u.wait(AIM_REST + 0.1);
+    assert_eq!(u.tops_shown(), ["Edit"]);
+    u.hover(u.top_row(0).center());
+    u.wait(AIM_REST + 0.1);
+    assert_eq!(u.tops_shown(), ["File"]);
+    assert_eq!(sub_shown(&u), None, "{open} came back open");
+}
+
+#[test]
+fn crossing_rows_toward_the_open_submenu_keeps_it_open() {
+    let mut u = Ui::new();
+    u.open_main_menu();
+    let file = u.top_row(0);
+    let start = pos2(file.max.x - 30.0, file.center().y);
+    u.settle(start);
+    assert_eq!(u.tops_shown(), ["File"]);
+    // Diagonally across Edit and View into File's panel, a few rows down.
+    let panel = u.rect(top("File"));
+    let end = pos2(panel.min.x + 20.0, u.top_row(3).center().y);
+    for k in 1..=8 {
+        let p = start + (end - start) * (k as f32 / 8.0);
+        u.hover(p);
+        assert_eq!(u.tops_shown(), ["File"], "at {p:?}");
+    }
+    assert!(panel.contains(end));
+    u.wait(AIM_REST + 0.2);
+    assert_eq!(u.tops_shown(), ["File"]);
+}
+
+#[test]
+fn resting_on_a_crossed_row_hands_over_to_it() {
+    let mut u = Ui::new();
+    u.open_main_menu();
+    let file = u.top_row(0);
+    let start = pos2(file.max.x - 30.0, file.center().y);
+    u.settle(start);
+    // Toward the panel, stopping on View.
+    let view = u.top_row(2);
+    let stop = pos2(view.max.x - 4.0, view.center().y);
+    for k in 1..=4 {
+        u.hover(start + (stop - start) * (k as f32 / 4.0));
+    }
+    assert_eq!(u.tops_shown(), ["File"], "still on the way");
+    u.wait(AIM_REST + 0.1);
+    assert_eq!(u.tops_shown(), ["View"]);
+}
+
+#[test]
+fn moving_straight_down_switches_after_a_short_hover() {
+    let mut u = Ui::new();
+    u.open_main_menu();
+    let file = u.top_row(0);
+    u.settle(file.center());
+    assert_eq!(u.tops_shown(), ["File"]);
+    // Down to Edit in small steps: no progress toward File's panel, so no triangle.
+    let edit = u.top_row(1).center();
+    let mut p = file.center();
+    while p.y < edit.y {
+        p.y = (p.y + 4.0).min(edit.y);
+        u.hover(p);
+    }
+    assert!(u.tops_shown().is_empty(), "File closes at once, Edit waits: {:?}", u.tops_shown());
+    u.wait(HOVER_DELAY + 0.05);
+    assert_eq!(u.tops_shown(), ["Edit"]);
+}
+
+#[test]
+fn the_first_submenu_opens_after_a_short_hover() {
+    let mut u = Ui::new();
+    u.open_main_menu();
+    u.hover(u.top_row(0).center());
+    u.frame(vec![]);
+    assert!(u.tops_shown().is_empty(), "opened at once");
+    u.wait(HOVER_DELAY + 0.05);
+    assert_eq!(u.tops_shown(), ["File"]);
+}
+
+#[test]
+fn sweeping_across_rows_opens_only_where_the_pointer_stops() {
+    let mut u = Ui::new();
+    u.open_main_menu();
+    u.settle(u.top_row(0).center());
+    // Quickly down the left of the rows, a row a frame, to Arrange.
+    for i in 1..=5 {
+        let r = u.top_row(i);
+        u.hover(pos2(r.min.x + 20.0, r.center().y));
+        // (A panel drawn above the row the pointer is on goes the next frame.)
+        u.frame(vec![]);
+        assert!(u.tops_shown().is_empty(), "{:?} open on row {i}", u.tops_shown());
+    }
+    u.wait(HOVER_DELAY + 0.05);
+    assert_eq!(u.tops_shown(), ["Arrange"]);
+}
+
+#[test]
+fn hovering_a_plain_row_closes_the_open_submenu_at_once() {
+    let mut u = Ui::new();
+    u.open_main_menu();
+    u.settle(u.top_row(0).center());
+    assert_eq!(u.tops_shown(), ["File"]);
+    // Up onto the Actions row.
+    let m = u.rect(main_menu_id());
+    u.hover(pos2(u.top_row(0).center().x, m.min.y + 8.0 + 15.0));
+    assert!(u.tops_shown().is_empty(), "{:?} still open", u.tops_shown());
+}
+
+#[test]
+fn leaving_the_menu_keeps_the_last_submenu() {
+    let mut u = Ui::new();
+    u.open_main_menu();
+    u.settle(u.top_row(1).center());
+    // Off the menus onto the canvas.
+    u.hover(pos2(900.0, 700.0));
+    u.wait(AIM_REST + 0.1);
+    assert_eq!(u.tops_shown(), ["Edit"]);
+}
diff --git a/crates/ui-egui/src/menu_contrast_tests.rs b/crates/ui-egui/src/menu_contrast_tests.rs
new file mode 100644
index 00000000..f3a9b1bd
--- /dev/null
+++ b/crates/ui-egui/src/menu_contrast_tests.rs
@@ -0,0 +1,84 @@
+//! Panel dropdowns (the prototype device picker, Preferences, blend modes…) draw on the theme's
+//! popup fill, so their rows' text must read on it in both themes (#972): drawn headless.
+
+use egui::{Color32, Event, Order, PointerButton, Pos2, RawInput, Rect, Shape, pos2, vec2};
+
+use crate::right::{menu_check, menu_item, menu_popup};
+use crate::theme::{self, Tokens};
+
+fn input(t: &mut f64, events: Vec<Event>) -> RawInput {
+    *t += 1.0 / 60.0;
+    RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), time: Some(*t), events, ..Default::default() }
+}
+
+fn press(p: Pos2, pressed: bool) -> Vec<Event> {
+    vec![Event::PointerMoved(p), Event::PointerButton { pos: p, button: PointerButton::Primary, pressed, modifiers: Default::default() }]
+}
+
+fn color(x: Color32) -> figcraft_color::Color {
+    figcraft_color::Color::new(f32::from(x.r()) / 255.0, f32::from(x.g()) / 255.0, f32::from(x.b()) / 255.0, 1.0)
+}
+
+/// The text painted on the foreground (menu) layers: (text, colour).
+fn menu_texts(out: &egui::FullOutput) -> Vec<(String, Color32)> {
+    fn walk(s: &Shape, out: &mut Vec<(String, Color32)>) {
+        match s {
+            Shape::Vec(v) => v.iter().for_each(|s| walk(s, out)),
+            Shape::Text(t) => out.push((t.galley.text().to_string(), t.fallback_color)),
+            _ => {}
+        }
+    }
+    let mut texts = Vec::new();
+    for c in &out.shapes {
+        walk(&c.shape, &mut texts);
+    }
+    texts
+}
+
+/// Open a dropdown with `tokens` and return its rows' text colours, with the pointer away from them.
+fn rows(tokens: Tokens) -> Vec<(String, Color32)> {
+    let ctx = egui::Context::default();
+    theme::apply(&ctx, tokens);
+    let mut t = 0.0;
+    let mut frame = |events: Vec<Event>| {
+        let mut out = ctx.run_ui(input(&mut t, events), |ui| {
+            let (_, resp) = ui.allocate_exact_size(vec2(200.0, 24.0), egui::Sense::click());
+            menu_popup(&resp).show(|ui| {
+                menu_check(ui, true, "iPhone 17 Pro Max", "");
+                menu_check(ui, false, "Pixel 9", "");
+                menu_item(ui, "Copy", "Cmd+C");
+            });
+        });
+        out.textures_delta.clear();
+        out
+    };
+    let at = pos2(12.0, 12.0);
+    frame(vec![]);
+    frame(press(at, true));
+    frame(press(at, false));
+    // Past the popup's fade-in, so the colours are the ones it settles on.
+    for _ in 0..30 {
+        frame(vec![Event::PointerMoved(pos2(790.0, 590.0))]);
+    }
+    let out = frame(vec![]);
+    assert!(ctx.memory(|m| m.areas().visible_layer_ids().iter().any(|l| l.order == Order::Foreground)), "the menu opened");
+    menu_texts(&out)
+}
+
+#[test]
+fn dropdown_rows_read_on_the_popup_in_both_themes() {
+    for tokens in [Tokens::light(), Tokens::dark()] {
+        // The popup's own fill (`window_fill`), what the rows are drawn on.
+        let fill = color(tokens.panel);
+        let texts = rows(tokens);
+        let keys = crate::toolbar::pretty_shortcut("Cmd+C");
+        // Labels at WCAG AA for text; the dimmer shortcut at least 3:1.
+        for (label, min) in [("iPhone 17 Pro Max", 4.5), ("Pixel 9", 4.5), ("Copy", 4.5), (keys.as_str(), 3.0)] {
+            let Some((_, col)) = texts.iter().find(|(s, _)| s.trim() == label || s.ends_with(label)) else {
+                panic!("{label} painted (dark {}): {texts:?}", tokens.dark)
+            };
+            let ratio = color(*col).contrast(fill);
+            assert!(ratio >= min, "{label} at {ratio:.2}:1 on the popup (dark {}): {texts:?}", tokens.dark);
+        }
+    }
+}
diff --git a/crates/ui-egui/src/menu_input_tests.rs b/crates/ui-egui/src/menu_input_tests.rs
new file mode 100644
index 00000000..6fc65533
--- /dev/null
+++ b/crates/ui-egui/src/menu_input_tests.rs
@@ -0,0 +1,89 @@
+//! Menu and Actions entries that need an input must collect it in the UI, not send `{}` to the
+//! engine (which would show a parameter error or silently use a default).
+
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::dialogs::MenuInput;
+use crate::layers_drag_tests::Ui;
+use crate::menus;
+
+#[test]
+fn preference_actions_open_preferences_without_changing_values() {
+    let mut ui = Ui::new(Session::new());
+    ui.app.session.prefs.language = "en".into();
+    ui.app.session.prefs.publish_server = "wss://example.test/".into();
+    let before = ui.app.session.prefs.clone();
+    for id in ["pref.language", "pref.userName", "pref.publishServer", "pref.nudge"] {
+        ui.app.ui.preferences = false;
+        menus::invoke(&mut ui.app, id);
+        assert!(ui.app.ui.preferences, "{id} did not open Preferences");
+        assert!(ui.app.ui.last_error.is_none(), "{id} showed an error");
+        assert_eq!(ui.app.session.prefs.language, before.language);
+        assert_eq!(ui.app.session.prefs.publish_server, before.publish_server);
+        assert_eq!(ui.app.session.prefs.nudge_small, before.nudge_small);
+        assert_eq!(ui.app.session.prefs.nudge_big, before.nudge_big);
+    }
+    // Programmatic callers still need the actual argument.
+    assert!(ui.app.session.execute("pref.language", &json!({})).is_err());
+}
+
+#[test]
+fn menu_entries_collect_required_arguments_before_running() {
+    let mut ui = Ui::new(Session::new());
+    for (id, expected) in
+        [("text.link", MenuInput::Link(String::new())), ("vector.offset", MenuInput::Offset(0.0)), ("object.moveToPage", MenuInput::MoveToPage)]
+    {
+        ui.app.ui.menu_input = None;
+        menus::invoke(&mut ui.app, id);
+        assert_eq!(ui.app.ui.menu_input, Some(expected), "{id}");
+        assert!(ui.app.ui.last_error.is_none(), "{id} showed an error");
+    }
+    ui.frame(vec![]);
+    assert!(ui.app.ui.last_error.is_none());
+}
+
+#[test]
+fn palette_entries_with_existing_pickers_show_them() {
+    let mut ui = Ui::new(Session::new());
+    menus::invoke(&mut ui.app, "tool.set");
+    assert_eq!(ui.app.ui.tool_flyout, Some("move"));
+    ui.app.ui.left_collapsed = true;
+    menus::invoke(&mut ui.app, "page.select");
+    assert!(!ui.app.ui.left_collapsed);
+    assert!(ui.app.ui.pages_open);
+    menus::invoke(&mut ui.app, "file.openRecent");
+    assert!(ui.app.ui.home);
+    assert_eq!(ui.app.ui.home_view.section, crate::home::Section::Recents);
+    assert!(ui.app.ui.last_error.is_none());
+}
+
+#[test]
+fn batch_rename_opens_its_existing_dialog() {
+    let mut session = Session::new();
+    let id = session.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 20, "height": 20})).unwrap()["id"].clone();
+    session.execute("select.set", &json!({"ids": [id]})).unwrap();
+    let mut ui = Ui::new(session);
+    menus::invoke(&mut ui.app, "object.batchRename");
+    assert_eq!(ui.app.ui.batch_rename.as_ref().map(|d| d.ids.len()), Some(1));
+    assert!(ui.app.ui.last_error.is_none());
+}
+
+/// Asserts `file.rename` opens the left panel's inline file-name editor (not a dialog),
+/// focuses it, and commits the typed name on Enter.
+#[test]
+fn rename_file_edits_the_file_name_in_place() {
+    let mut ui = Ui::new(Session::new());
+    ui.app.ui.left_collapsed = true;
+    menus::invoke(&mut ui.app, "file.rename");
+    assert!(!ui.app.ui.left_collapsed, "the left panel shows the file name");
+    assert!(ui.app.ui.menu_input.is_none(), "no dialog");
+    ui.frame(vec![]);
+    ui.frame(vec![]);
+    assert!(!ui.app.ui.rename_file, "the rename started");
+    assert!(ui.ctx.memory(|m| m.has_focus(egui::Id::unique("filename").with("te"))), "the file name's editor has the keyboard");
+    ui.frame(vec![egui::Event::Text("Brand kit".into())]);
+    ui.frame(vec![egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() }]);
+    assert_eq!(ui.app.session.doc().unwrap().name, "Brand kit");
+    assert!(ui.app.ui.last_error.is_none());
+}
diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs
index b9d3299a..549a55c0 100644
--- a/crates/ui-egui/src/menus.rs
+++ b/crates/ui-egui/src/menus.rs
@@ -7,11 +7,29 @@ use serde_json::json;
 
 use crate::FigApp;
 use crate::a11y;
-use crate::i18n::{self, tr, tr_noop, trf};
+use crate::i18n::{self, tr, tr_noop, trf, trn};
 use crate::icons::{self, Icon};
-use crate::theme::{ACCENT, Tokens, regular};
+use crate::theme::{Tokens, regular};
 use crate::toolbar::pretty_shortcut;
 
+mod clipboard;
+mod palette;
+mod select_layer;
+mod tree;
+
+pub use clipboard::paste;
+use clipboard::{figcraft_svg_export, text_layers_text};
+use palette::palette;
+#[cfg(test)]
+pub(crate) use palette::{ActionRow, command_sections, palette_sections, recent_row, run_action};
+pub use palette::{PaletteTab, set_palette, toggle_palette};
+pub use select_layer::open_select_layer;
+use select_layer::{SELECT_LAYER, select_layer_ask_id, select_layer_menu};
+#[cfg(test)]
+pub(crate) use tree::{AIM_REST, HOVER_DELAY, heading_for, in_triangle};
+use tree::{At, menu_frame, plain_row_hover, set_open, submenu_at};
+pub(crate) use tree::{forget_tree, item, separator, submenu};
+
 /// Commands the UI layer implements itself (dialogs and platform actions).
 pub const UI_COMMANDS: &[&str] = &[
     "plugin.import",
@@ -29,58 +47,66 @@ pub const UI_COMMANDS: &[&str] = &[
     "edit.copyLink",
 ];
 
-/// Run a menu item: some open dialogs or use platform services, the rest go to the engine.
-/// Paste: the system clipboard wins when it holds something newer than our own copy (an image, SVG
-/// or text from another app); otherwise our copied layers. `event_text` is the text the platform
-/// handed over with the paste event (the browser has no other way to read it).
-pub fn paste(app: &mut FigApp, event_text: Option<&str>) {
-    let sys_text = app.services.clipboard_get_text().or_else(|| event_text.map(str::to_string)).filter(|t| !t.is_empty());
-    let ours = sys_text.is_some() && sys_text == app.ui.last_copy;
-    let (cx, cy) = app.session.ds().map(|d| (d.view.cx, d.view.cy)).unwrap_or((0.0, 0.0));
-    if !ours {
-        if let Some((png, w, h)) = clipboard_png(app) {
-            use base64::Engine as _;
-            let b64 = base64::engine::general_purpose::STANDARD.encode(png);
-            // Centred in the view.
-            let (x, y) = ((cx - f64::from(w) / 2.0).round(), (cy - f64::from(h) / 2.0).round());
-            app.run("file.import", json!({"data": b64, "name": "Pasted image.png", "x": x, "y": y}));
-            return;
-        }
-        // Text from elsewhere when it's newer than our copy, or when we have nothing to paste.
-        if let Some(text) = sys_text.filter(|_| app.ui.last_copy.is_some() || app.session.clipboard.nodes.is_empty()) {
-            // A comment's link opens its thread.
-            if text.trim().starts_with("figcraft://comment/") {
-                app.run("comment.open", json!({"link": text.trim()}));
-            } else if figcraft_engine::looks_like_svg(&text) {
-                use base64::Engine as _;
-                let b64 = base64::engine::general_purpose::STANDARD.encode(text.as_bytes());
-                app.run("file.import", json!({"data": b64, "name": "Pasted SVG.svg", "x": cx, "y": cy, "center": true}));
-            } else {
-                app.run("text.create", json!({"text": text, "x": cx, "y": cy}));
-            }
-            return;
-        }
+/// Dev Mode (the Inspect tab) refuses command `id` from the menus, shortcuts, clipboard, the
+/// Pages list, the layers panel, files dropped on the canvas and the Assets panel: it edits the
+/// design ([`figcraft_engine::devinspect::dev_mode_allows`]). Says so when it does.
+pub fn dev_mode_refuses(app: &mut FigApp, id: &str) -> bool {
+    let refused = app.ui.right_tab == crate::RightTab::Inspect && !figcraft_engine::devinspect::dev_mode_allows(id);
+    if refused {
+        app.toast(tr("Dev Mode only inspects: switch to Design (Shift+D) to edit"));
     }
-    app.run("edit.paste", json!({}));
+    refused
 }
 
-/// The system clipboard's image as PNG bytes, with its size.
-fn clipboard_png(app: &mut FigApp) -> Option<(Vec<u8>, u32, u32)> {
-    let (w, h, rgba) = app.services.clipboard_get_image()?;
-    let img = image::RgbaImage::from_raw(w, h, rgba)?;
-    let mut out = std::io::Cursor::new(Vec::new());
-    img.write_to(&mut out, image::ImageFormat::Png).ok()?;
-    Some((out.into_inner(), w, h))
+/// Remember an action run from the palette for its Recents (newest first, capped).
+pub fn record_recent(app: &mut FigApp, key: &str) {
+    let r = &mut app.session.prefs.recent_actions;
+    if r.first().is_some_and(|f| f == key) {
+        return;
+    }
+    r.retain(|k| k != key);
+    r.insert(0, key.to_string());
+    r.truncate(figcraft_engine::MAX_RECENT_ACTIONS);
 }
 
+/// Run a menu, shortcut or palette action by id: actions that need the UI (dialogs, panels, the
+/// clipboard) are handled here, the rest go to the engine.
 pub fn invoke(app: &mut FigApp, id: &str) {
+    if dev_mode_refuses(app, id) {
+        return;
+    }
     match id {
+        // Edit ▸ Delete (and the Delete binding) with an interaction open in the Prototype tab
+        // removes that interaction, not the layer (#767).
+        "edit.delete" if app.ui_context.clone().is_some_and(|ctx| crate::proto_panel::delete_selected_interaction(app, &ctx)) => {}
+        // After a click in the Pages list, while the list is on screen and its file open, with no
+        // layers selected, it deletes the current page (#859).
+        "edit.delete" if crate::layers::pages_have_keyboard(app) && app.session.selection().is_empty() => {
+            if let Ok(page) = app.session.page() {
+                crate::layers::delete_page(app, page);
+            }
+        }
+        // Otherwise the list gives up the keyboard: once Delete has taken layers selected since the
+        // click (Select all, say), a second Delete must not take the page.
+        "edit.delete" if app.ui.pages_focus.is_some() => {
+            app.ui.pages_focus = None;
+            app.run(id, json!({}));
+        }
         "file.open" => app.open_dialog(),
+        // From the keyboard or a menu, typing goes on in the new sticky.
+        "board.nextSticky" => {
+            app.run(id, json!({"edit": true}));
+        }
+        "help.checkForUpdates" | "app.checkForUpdates" => crate::updates_ui::check(app),
         "plugin.import" => crate::plugins_ui::import_dialog(app),
         "file.import" => app.import_dialog(false),
         "file.placeImage" => app.import_dialog(true),
         "file.save" => app.save(),
         "file.saveAs" => app.save_as_dialog(),
+        "file.openRecent" => {
+            app.ui.home = true;
+            app.ui.home_view.section = crate::home::Section::Recents;
+        }
         "file.saveVersion" => crate::versions::start_save(app),
         "branch.create" => crate::versions::start_branch(app),
         "file.export" | "file.exportSvg" => app.ui.export_preview = true,
@@ -89,14 +115,14 @@ pub fn invoke(app: &mut FigApp, id: &str) {
             let ids = app.session.selection();
             if let (Some(first), Ok(doc)) = (ids.first(), app.session.doc()) {
                 let css = figcraft_engine::codegen::code_for(doc, *first, figcraft_engine::codegen::CodeLang::Css);
-                app.services.clipboard_set_text(&css);
+                app.clipboard_set_text(&css);
                 app.toast(tr("Copied as CSS"));
             }
         }
         "edit.copyAsSvg" => {
             let ids = app.session.selection();
             if let Some(svg) = app.session.doc().ok().and_then(|d| figcraft_svg_export(d, &ids)) {
-                app.services.clipboard_set_text(&svg);
+                app.clipboard_set_text(&svg);
                 app.toast(tr("Copied as SVG"));
             }
         }
@@ -108,7 +134,7 @@ pub fn invoke(app: &mut FigApp, id: &str) {
                 // Clipboard images are read as sRGB.
                 figcraft_render::to_srgb(&mut pix, profile);
                 let rgba = figcraft_render::to_rgba8(&pix);
-                app.services.clipboard_set_png(pix.width(), pix.height(), &rgba);
+                app.clipboard_set_png(pix.width(), pix.height(), &rgba);
                 app.toast(tr("Copied as PNG"));
             }
         }
@@ -120,30 +146,66 @@ pub fn invoke(app: &mut FigApp, id: &str) {
                 .iter()
                 .filter_map(|i| doc.and_then(|d| d.node(*i)).and_then(|n| n.kind.text().map(|t| t.characters.clone())))
                 .collect();
-            app.services.clipboard_set_text(&text.join("\n"));
+            app.clipboard_set_text(&text.join("\n"));
             app.toast(tr("Copied as text"));
         }
         "edit.copyLink" => {
-            let ids = app.session.selection();
-            app.services.clipboard_set_text(&format!("figcraft://node/{}", ids.first().map(|i| i.0).unwrap_or(0)));
+            // Only a selected layer has a link, and the copy goes through the control-channel fence
+            // (`clipboard_set_text`): a synthetic gesture never replaces the user's clipboard.
+            if let Some(id) = app.session.selection().first() {
+                app.clipboard_set_text(&format!("figcraft://node/{}", id.0));
+                app.toast(tr("Link copied"));
+            }
         }
         "edit.findReplace" => app.ui.find = Some((String::new(), String::new())),
+        // The Actions palette invokes commands without parameters. These values are edited in
+        // Preferences; sending an empty object would either fail or silently reset a preference.
+        "pref.language" | "pref.userName" | "pref.publishServer" | "pref.nudge" => {
+            app.run("app.preferences", json!({}));
+        }
+        // The file name in the left panel's header turns into its editor, the name selected.
+        "file.rename" => {
+            app.ui.left_tab = crate::LeftTab::File;
+            app.ui.open_left_panel();
+            app.ui.rename_file = true;
+        }
+        "text.link" => app.ui.menu_input = Some(crate::dialogs::MenuInput::Link(String::new())),
+        "vector.offset" => app.ui.menu_input = Some(crate::dialogs::MenuInput::Offset(0.0)),
+        "object.moveToPage" => app.ui.menu_input = Some(crate::dialogs::MenuInput::MoveToPage),
+        "object.batchRename" => {
+            let ids = app.session.selection();
+            if !ids.is_empty() {
+                crate::dialogs::open_batch_rename(app, &ids);
+            }
+        }
+        "tool.set" => app.ui.tool_flyout = Some("move"),
+        "page.select" => {
+            app.ui.left_tab = crate::LeftTab::File;
+            app.ui.open_left_panel();
+            app.ui.pages_open = true;
+        }
         // From a menu the link is pasted into the Join dialog (`collab.join {link}` joins directly).
         "collab.join" => crate::live::open_join(app, ""),
         // So is the server address for publishing (it carries the server key).
         "collab.publish" => crate::live::open_publish(app),
         "edit.copy" | "edit.cut" => {
             let ids = app.session.selection();
-            // SVG for other apps, taken before a cut removes the layers.
-            let svg = app.session.doc().ok().and_then(|d| figcraft_svg_export(d, &ids));
+            // For other apps: text layers' text, other layers as SVG; taken before a cut removes them.
+            let doc = app.session.doc().ok();
+            let mirror = doc.and_then(|d| text_layers_text(d, &ids).or_else(|| figcraft_svg_export(d, &ids)));
             app.run(id, json!({}));
-            // Mirror to the system clipboard (SVG text, else a marker) and remember it, so a later
-            // paste knows whether the clipboard still holds our layers.
-            let text = svg.unwrap_or_else(|| format!("figcraft://clipboard/{}", ids.len()));
-            app.services.clipboard_set_text(&text);
-            app.ui.last_copy = Some(text);
+            // Mirror to the system clipboard (text or SVG, else a marker) and remember it, so a
+            // later paste knows whether the clipboard still holds our layers. Control-channel
+            // gestures keep the engine's copy but never replace the user's clipboard; `run` then
+            // invalidates the old mirror because it no longer describes the engine clipboard.
+            if !app.control_synthetic {
+                let text = mirror.unwrap_or_else(|| format!("figcraft://clipboard/{}", ids.len()));
+                app.clipboard_set_text(&text);
+                app.ui.last_copy = Some(text);
+                app.ui.last_copy_generation = app.session.clipboard.layers_generation;
+            }
         }
-        "edit.paste" => paste(app, None),
+        "edit.paste" => paste(app, None, None),
         "file.close" if app.session.ds().is_ok_and(|d| d.is_dirty() && d.branch_of.is_none()) => {
             let save = pretty_shortcut(crate::shortcuts::shortcut("file.save").unwrap_or(""));
             app.toast(trf(
@@ -160,6 +222,15 @@ pub fn invoke(app: &mut FigApp, id: &str) {
 /// Every visible top-level frame of the page as one PDF page each, through a save dialog.
 fn export_frames_pdf(app: &mut FigApp) {
     let name = app.session.doc().map(|d| d.name.clone()).unwrap_or_else(|_| "Untitled".into());
+    if app.services.downloads() {
+        let file = format!("{name}.pdf");
+        if let Some(r) = app.run("file.exportFramesPdf", json!({}))
+            && app.download(&file, &r)
+        {
+            app.toast(trf("Exported {name}", &[("name", &file)]));
+        }
+        return;
+    }
     app.pick_save(tr("Export"), &format!("{name}.pdf"), &["pdf"], |app, p| {
         if app.run("file.exportFramesPdf", json!({"path": p.to_string_lossy()})).is_some() {
             app.toast(trf("Exported {name}", &[("name", &p.file_name().map(|f| f.to_string_lossy().to_string()).unwrap_or_default())]));
@@ -167,11 +238,6 @@ fn export_frames_pdf(app: &mut FigApp) {
     });
 }
 
-fn figcraft_svg_export(doc: &figcraft_doc::Document, ids: &[figcraft_doc::NodeId]) -> Option<String> {
-    let bytes = figcraft_engine::cmd::file::export_bytes(doc, ids, figcraft_doc::ExportFormat::Svg, 1.0).ok()?;
-    String::from_utf8(bytes).ok()
-}
-
 /// Whether a menu id is available (registered in the engine or handled by the UI).
 pub fn available(id: &str) -> bool {
     !id.is_empty() && (figcraft_engine::find_command(id).is_some() || UI_COMMANDS.contains(&id))
@@ -215,7 +281,7 @@ fn menu_level(app: &mut FigApp, ui: &mut Ui, prefix: &str) -> bool {
                 subs.push(sub.clone());
                 last_sep = false;
                 let full = format!("{prefix}/{sub}");
-                if submenu(ui, prefix, &full, tr(&sub), &t, |ui| menu_level(app, ui, &full).then_some(())).is_some() {
+                if submenu(ui, &full, tr(&sub), &t, |ui| menu_level(app, ui, &full).then_some(())).is_some() {
                     return true;
                 }
             }
@@ -231,15 +297,15 @@ fn menu_level(app: &mut FigApp, ui: &mut Ui, prefix: &str) -> bool {
 /// File ▸ Open recent: the recent files (greyed when the file is gone) and Clear recent. `key` is
 /// the menu's English label, `label` the one shown. Returns whether an item ran.
 fn recent_menu(app: &mut FigApp, ui: &mut Ui, prefix: &str, key: &str, label: &str, t: &Tokens) -> bool {
-    let picked = submenu(ui, prefix, &format!("{prefix}/{key}"), label, t, |ui| {
-        let recents = &app.session.prefs.recent_files;
+    let picked = submenu(ui, &format!("{prefix}/{key}"), label, t, |ui| {
+        let recents: Vec<&String> = crate::home_recents::listed(&app.session.prefs.recent_files).collect();
         let mut picked = None;
-        for (i, p) in recents.iter().enumerate() {
+        for p in recents.iter().copied() {
             let path = std::path::Path::new(p);
             let name = path.file_name().map_or_else(|| p.clone(), |f| f.to_string_lossy().into_owned());
             let exists = path.exists();
             if item(ui, &name, "", exists, false, t) && exists {
-                picked = Some(json!({"index": i}));
+                picked = Some(json!({"path": p}));
             }
         }
         if !recents.is_empty() {
@@ -251,126 +317,26 @@ fn recent_menu(app: &mut FigApp, ui: &mut Ui, prefix: &str, key: &str, label: &s
         picked
     });
     let Some(params) = picked else { return false };
-    if app.run("file.openRecent", params).is_some_and(|r| r.get("index").is_some()) {
+    // Through the user path, so an import report shows; `file.openRecent` also drops a file that is gone.
+    if app.run_user("file.openRecent", params).is_some_and(|r| r.get("index").is_some()) {
         app.ui.home = false;
     }
     true
 }
 
-/// A submenu row `label` in the menu at `prefix`; while it's open (hovered last), `add` draws its
-/// items beside it. `key` is unique among the menu's submenus. Returns what `add` returned.
-pub(crate) fn submenu<R>(ui: &mut Ui, prefix: &str, key: &str, label: &str, t: &Tokens, add: impl FnOnce(&mut Ui) -> Option<R>) -> Option<R> {
-    let resp = submenu_item(ui, label, t);
-    let slot = Id::new(("submenu_open", prefix));
-    if resp.hovered() || resp.has_focus() {
-        ui.data_mut(|d| d.insert_temp(slot, key.to_string()));
-    }
-    let open: Option<String> = ui.data(|d| d.get_temp(slot));
-    if open.as_deref() != Some(key) {
-        return None;
-    }
-    let pos = pos2(resp.rect.max.x + 4.0, resp.rect.min.y - 8.0);
-    egui::Area::new(Id::new(("submenu", key))).fixed_pos(pos).order(egui::Order::Foreground).show(ui.ctx(), |ui| menu_frame(ui, t, add)).inner
-}
-
-/// A thin line between groups of menu items.
-pub(crate) fn separator(ui: &mut Ui) {
-    ui.add_space(4.0);
-    let (r, _) = ui.allocate_exact_size(vec2(ui.available_width(), 1.0), Sense::hover());
-    ui.painter().line_segment([r.left_center(), r.right_center()], Stroke::new(1.0, Color32::from_white_alpha(30)));
-    ui.add_space(4.0);
-}
-
-fn menu_frame<R>(ui: &mut Ui, t: &Tokens, add: impl FnOnce(&mut Ui) -> R) -> R {
-    egui::Frame::NONE
-        .fill(t.menu)
-        .corner_radius(CornerRadius::same(13))
-        .inner_margin(egui::Margin::same(8))
-        .shadow(egui::Shadow { offset: [0, 4], blur: 16, spread: 0, color: Color32::from_black_alpha(60) })
-        .show(ui, |ui| {
-            // As wide as its widest row asked for (labels run longer in some languages).
-            let w = ui.data(|d| d.get_temp::<f32>(width_key(ui))).unwrap_or(0.0).max(MENU_W);
-            ui.set_width(w);
-            ui.spacing_mut().item_spacing = vec2(0.0, 0.0);
-            add(ui)
-        })
-        .inner
-}
-
-/// A menu's narrowest width.
-const MENU_W: f32 = 240.0;
-
-/// Where a menu remembers the width its rows need (its frame's ui), per language.
-fn width_key(ui: &Ui) -> Id {
-    ui.id().with(("menu_w", i18n::current().map(|l| l.code)))
-}
-
-/// A row needs `w`: the menu widens to it from the next frame on.
-fn need_width(ui: &Ui, w: f32) {
-    let key = width_key(ui);
-    if ui.data(|d| d.get_temp::<f32>(key)).unwrap_or(0.0) < w {
-        ui.data_mut(|d| d.insert_temp(key, w));
-        ui.ctx().request_repaint();
-    }
-}
-
-pub(crate) fn item(ui: &mut Ui, label: &str, shortcut: &str, enabled: bool, checked: bool, t: &Tokens) -> bool {
-    indented_item(ui, label, shortcut, enabled, checked, 0.0, t)
-}
-
-/// A menu row whose label starts `indent` pixels further in (nested layers).
-fn indented_item(ui: &mut Ui, label: &str, shortcut: &str, enabled: bool, checked: bool, indent: f32, t: &Tokens) -> bool {
-    let w = ui.available_width();
-    let (r, resp) = ui.allocate_exact_size(vec2(w, 28.0), Sense::click());
-    a11y::menu_item(&resp, label, shortcut, checked.then_some(true));
-    if !enabled {
-        a11y::disabled(&resp);
-    }
-    // The keyboard's item is highlighted like the hovered one.
-    a11y::own_focus(&resp);
-    let hov = (resp.hovered() || resp.has_focus()) && enabled;
-    if hov {
-        ui.painter().rect_filled(r, CornerRadius::same(5), t.menu_hover);
-    }
-    let col = if enabled { t.menu_text } else { t.menu_dim };
-    if checked {
-        icons::paint(ui.painter(), Rect::from_center_size(pos2(r.min.x + 12.0, r.center().y), vec2(12.0, 12.0)), Icon::Check, col);
-    }
-    let galley = ui.painter().layout_no_wrap(label.to_string(), regular(12.0), col);
-    let keys = (!shortcut.is_empty())
-        .then(|| ui.painter().layout_no_wrap(pretty_shortcut(shortcut), regular(12.0), if hov { t.menu_text } else { t.menu_dim }));
-    need_width(ui, 28.0 + indent + galley.size().x + keys.as_ref().map_or(8.0, |k| 16.0 + k.size().x + 10.0));
-    let text_rect = Rect::from_min_max(pos2(r.min.x + 28.0 + indent, r.min.y), pos2(r.max.x - 8.0, r.max.y));
-    ui.painter().with_clip_rect(text_rect).galley(pos2(text_rect.min.x, r.center().y - galley.size().y / 2.0), galley, col);
-    if let Some(k) = keys {
-        ui.painter().galley(pos2(r.max.x - 10.0 - k.size().x, r.center().y - k.size().y / 2.0), k, col);
-    }
-    resp.clicked()
-}
-
-fn submenu_item(ui: &mut Ui, label: &str, t: &Tokens) -> egui::Response {
-    let w = ui.available_width();
-    let (r, resp) = ui.allocate_exact_size(vec2(w, 28.0), Sense::click());
-    a11y::submenu(&resp, label);
-    a11y::own_focus(&resp);
-    if resp.hovered() || resp.has_focus() {
-        ui.painter().rect_filled(r, CornerRadius::same(5), t.menu_hover);
-    }
-    let galley = ui.painter().layout_no_wrap(label.to_string(), regular(12.0), t.menu_text);
-    need_width(ui, 28.0 + galley.size().x + 28.0);
-    ui.painter().galley(pos2(r.min.x + 28.0, r.center().y - galley.size().y / 2.0), galley, t.menu_text);
-    icons::paint(ui.painter(), Rect::from_center_size(pos2(r.max.x - 12.0, r.center().y), vec2(12.0, 12.0)), Icon::ChevronRight, t.menu_text);
-    resp
-}
-
 /// Open the main menu at top-level menu `top` (control channel).
 pub fn open_main_menu(ctx: &egui::Context, top: &str) {
-    ctx.data_mut(|d| d.insert_temp(Id::new("main_open"), top.to_string()));
+    set_open(ctx, main_menu_id(), "", Some(top));
+}
+
+/// The context menu's area (and menu tree).
+fn ctx_menu_id() -> Id {
+    Id::unique("ctx_menu")
 }
 
 /// The main menu's area.
 pub fn main_menu_id() -> Id {
-    Id::new("main_menu")
+    Id::unique("main_menu")
 }
 
 /// Whether the pointer is over a menu (any foreground area).
@@ -392,15 +358,34 @@ const TOP_MENUS: &[&str] = &[
     tr_noop("Help"),
 ];
 
+/// Draw the main and context menu trees: forget closed/stale submenu state, apply
+/// control-channel Select-layer open/close, close on outside click or Escape, then draw the
+/// colour picker and palette popups.
 pub fn popups(app: &mut FigApp, ctx: &egui::Context) {
     let t = Tokens::get(ctx);
+    // A closed menu forgets its open submenus (and a context menu opened somewhere else starts
+    // afresh), so neither reopens with a stale submenu showing.
+    if !app.ui.main_menu {
+        forget_tree(ctx, main_menu_id());
+    }
+    let ctx_at = app.ui.context_menu.as_ref().map(|(p, _)| *p);
+    let ctx_seen = Id::unique("ctx_menu_at");
+    if ctx.data(|d| d.get_temp::<Option<egui::Pos2>>(ctx_seen)) != Some(ctx_at) {
+        ctx.data_mut(|d| d.insert_temp(ctx_seen, ctx_at));
+        forget_tree(ctx, ctx_menu_id());
+    }
+    // Select layer opened or closed from the control channel.
+    if let Some(open) = ctx.data_mut(|d| d.remove_temp::<bool>(select_layer_ask_id())) {
+        set_open(ctx, ctx_menu_id(), "", open.then_some(SELECT_LAYER));
+    }
     // Main menu.
     if app.ui.main_menu {
         let mut close = false;
         let area = egui::Area::new(main_menu_id()).fixed_pos(pos2(8.0, crate::tabs::HEIGHT + 48.0)).order(egui::Order::Foreground).show(ctx, |ui| {
-            menu_frame(ui, &t, |ui| {
+            menu_frame(ui, &t, At { root: main_menu_id(), path: String::new() }, |ui| {
                 // Quick actions search row.
                 let (r, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 30.0), Sense::click());
+                plain_row_hover(ui, &resp);
                 a11y::menu_item(&resp, tr("Actions…"), crate::shortcuts::shortcut("app.actions").unwrap_or(""), None);
                 ui.painter().rect_filled(r.shrink(2.0), CornerRadius::same(5), Color32::from_white_alpha(18));
                 icons::paint(ui.painter(), Rect::from_center_size(pos2(r.min.x + 16.0, r.center().y), vec2(14.0, 14.0)), Icon::Search, t.menu_dim);
@@ -413,25 +398,15 @@ pub fn popups(app: &mut FigApp, ctx: &egui::Context) {
                     t.menu_dim,
                 );
                 if resp.clicked() {
-                    app.ui.palette = Some(String::new());
+                    set_palette(&mut app.ui, true);
                     close = true;
                 }
                 ui.add_space(6.0);
                 for top in TOP_MENUS {
-                    let resp = submenu_item(ui, tr(top), &t);
-                    if resp.hovered() || resp.has_focus() {
-                        ui.data_mut(|d| d.insert_temp(Id::new("main_open"), top.to_string()));
-                    }
-                    let open: Option<String> = ui.data(|d| d.get_temp(Id::new("main_open")));
-                    if open.as_deref() == Some(*top) {
-                        let pos = pos2(resp.rect.max.x + 12.0, resp.rect.min.y - 8.0);
-                        egui::Area::new(Id::new(("menu", *top))).fixed_pos(pos).order(egui::Order::Foreground).show(ui.ctx(), |ui| {
-                            menu_frame(ui, &t, |ui| {
-                                if menu_level(app, ui, top) {
-                                    close = true;
-                                }
-                            });
-                        });
+                    if submenu_at(ui, Id::unique(("menu", *top)), top, tr(top), 12.0, false, &t, |ui| menu_level(app, ui, top).then_some(()))
+                        .is_some()
+                    {
+                        close = true;
                     }
                 }
             });
@@ -439,6 +414,7 @@ pub fn popups(app: &mut FigApp, ctx: &egui::Context) {
         let clicked_outside = ctx.input(|i| i.pointer.any_pressed()) && !over_menu(ctx) || ctx.input(|i| i.key_pressed(egui::Key::Escape));
         if close || (clicked_outside && !area.response.hovered()) {
             app.ui.main_menu = false;
+            forget_tree(ctx, main_menu_id());
         }
     }
     // Context menu (from the keyboard: at the focused layer row or the canvas selection, taking the
@@ -448,11 +424,11 @@ pub fn popups(app: &mut FigApp, ctx: &egui::Context) {
     }
     if let Some((pos, ids)) = app.ui.context_menu.clone() {
         if let Some(f) = ctx.memory(|m| m.focused()) {
-            a11y::popup(&mut app.ui.nav, f, Id::new("ctx_menu"));
+            a11y::popup(&mut app.ui.nav, f, Id::unique("ctx_menu"));
         }
         let mut close = false;
-        let area = egui::Area::new(Id::new("ctx_menu")).fixed_pos(pos).order(egui::Order::Foreground).constrain(true).show(ctx, |ui| {
-            menu_frame(ui, &t, |ui| {
+        let area = egui::Area::new(ctx_menu_id()).fixed_pos(pos).order(egui::Order::Foreground).constrain(true).show(ctx, |ui| {
+            menu_frame(ui, &t, At { root: ctx_menu_id(), path: String::new() }, |ui| {
                 if select_layer_menu(app, ui, pos, &t) {
                     close = true;
                 }
@@ -467,11 +443,37 @@ pub fn popups(app: &mut FigApp, ctx: &egui::Context) {
                         .collect();
                     (!secs.is_empty()).then(|| if secs.iter().all(|h| *h) { tr("Show section contents") } else { tr("Hide section contents") })
                 });
+                // Frames on the page (or in a section) convert to sections, and sections to frames.
+                let convert = app.session.doc().ok().and_then(|doc| {
+                    let nodes: Vec<_> = ids.iter().filter_map(|i| doc.node(*i)).collect();
+                    let on_board = |n: &figcraft_doc::Node| {
+                        n.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.is_page() || matches!(p.kind, figcraft_doc::NodeKind::Section { .. }))
+                    };
+                    if nodes.is_empty() {
+                        None
+                    } else if nodes.iter().all(|n| matches!(n.kind, figcraft_doc::NodeKind::Section { .. })) {
+                        Some((tr("Convert to frame"), "object.convertToFrame"))
+                    } else if nodes.iter().all(|n| matches!(n.kind, figcraft_doc::NodeKind::Frame) && on_board(n)) {
+                        Some((tr("Convert to section"), "object.convertToSection"))
+                    } else {
+                        None
+                    }
+                });
+                // Two or more main components combine into a component set. Judged on the selection
+                // the command acts on: a layer row right-clicked in a multi-selection passes only itself.
+                let combine = app
+                    .session
+                    .doc()
+                    .ok()
+                    .filter(|doc| figcraft_engine::cmd::component::can_combine_variants(doc, &app.session.selection()))
+                    .map(|_| i18n::command("component.combineVariants", "Combine as variants"));
+                let copy_link = i18n::command("edit.copyLink", "Copy link to selection");
                 let mut entries: Vec<(&str, &str)> = if has_sel {
                     vec![
                         (tr("Copy"), "edit.copy"),
                         (tr("Paste here"), "edit.paste"),
                         (tr("Paste to replace"), "edit.pasteReplace"),
+                        (tr("Copy as"), COPY_AS),
                         ("-", ""),
                         (tr("Bring to front"), "arrange.front"),
                         (tr("Bring forward"), "arrange.forward"),
@@ -496,10 +498,6 @@ pub fn popups(app: &mut FigApp, ctx: &egui::Context) {
                         (tr("Flip horizontal"), "object.flipH"),
                         (tr("Flip vertical"), "object.flipV"),
                         ("-", ""),
-                        (tr("Copy as CSS"), "edit.copyAsCss"),
-                        (tr("Copy as SVG"), "edit.copyAsSvg"),
-                        (tr("Copy as PNG"), "edit.copyAsPng"),
-                        ("-", ""),
                         (tr("Delete"), "edit.delete"),
                     ]
                 } else {
@@ -519,6 +517,27 @@ pub fn popups(app: &mut FigApp, ctx: &egui::Context) {
                 {
                     entries.insert(at + 1, (label, "section.toggleContents"));
                 }
+                if let Some(entry) = convert
+                    && let Some(at) = entries.iter().position(|e| e.1 == "object.wrapInSection")
+                {
+                    entries.insert(at + 1, entry);
+                }
+                if let Some(label) = &combine
+                    && let Some(at) = entries.iter().position(|e| e.1 == "component.create")
+                {
+                    entries.insert(at + 1, (label, "component.combineVariants"));
+                }
+                // An instance's actions reach its main component: replace "Create component" with
+                // "Go to main component" (as in Figma's context menu).
+                if app
+                    .session
+                    .doc()
+                    .ok()
+                    .is_some_and(|doc| ids.iter().all(|i| doc.node(*i).is_some_and(|n| matches!(n.kind, figcraft_doc::NodeKind::Instance { .. }))))
+                    && let Some(at) = entries.iter().position(|e| e.1 == "component.create")
+                {
+                    entries[at] = (tr("Go to main component"), "component.goToMain");
+                }
                 // A right-clicked ruler guide (selected, with no layers) can be removed.
                 if !has_sel && app.session.ds().is_ok_and(|d| d.selected_guide().is_some()) {
                     entries.splice(0..0, [(tr("Remove guide"), "guide.remove"), ("-", "")]);
@@ -528,15 +547,34 @@ pub fn popups(app: &mut FigApp, ctx: &egui::Context) {
                         separator(ui);
                         continue;
                     }
+                    if *id == COPY_AS {
+                        let copy_items = [
+                            (tr("Copy as CSS"), "edit.copyAsCss"),
+                            (tr("Copy as SVG"), "edit.copyAsSvg"),
+                            (tr("Copy as PNG"), "edit.copyAsPng"),
+                            (&*copy_link, "edit.copyLink"),
+                        ];
+                        let picked = submenu(ui, COPY_AS, label, &t, |ui| {
+                            let mut picked = None;
+                            for (label, id) in copy_items {
+                                let sc = crate::shortcuts::shortcut(id).unwrap_or("");
+                                if item(ui, label, sc, available(id), false, &t) {
+                                    picked = Some(id);
+                                }
+                            }
+                            picked
+                        });
+                        if let Some(id) = picked {
+                            invoke(app, id);
+                            close = true;
+                        }
+                        continue;
+                    }
                     let sc = crate::shortcuts::shortcut(id).unwrap_or("");
                     if item(ui, label, sc, available(id), false, &t) {
                         if *id == "edit.paste" {
                             let p = app.to_page(pos);
-                            if app.session.clipboard.nodes.is_empty() {
-                                invoke(app, id);
-                            } else {
-                                app.run("edit.paste", json!({"x": p.x, "y": p.y}));
-                            }
+                            paste(app, None, Some((p.x, p.y)));
                         } else {
                             invoke(app, id);
                         }
@@ -545,148 +583,19 @@ pub fn popups(app: &mut FigApp, ctx: &egui::Context) {
                 }
             });
         });
-        let clicked_outside = ctx.input(|i| i.pointer.any_pressed()) && !area.response.hovered() && !over_menu(ctx);
+        // The press of a tap that opened the menu (press and release in one frame) is spared.
+        let fresh = !std::mem::replace(&mut app.ui.context_menu_shown, true);
+        let clicked_outside = !fresh && ctx.input(|i| i.pointer.any_pressed()) && !area.response.hovered() && !over_menu(ctx);
         if close || clicked_outside || ctx.input(|i| i.key_pressed(egui::Key::Escape)) {
             app.ui.context_menu = None;
-            ctx.data_mut(|d| d.remove::<bool>(select_layer_id()));
+            forget_tree(ctx, ctx_menu_id());
         }
+    } else {
+        app.ui.context_menu_shown = false;
     }
     crate::colorpicker::show(app, ctx);
     palette(app, ctx);
 }
 
-fn select_layer_id() -> Id {
-    Id::new("ctx_select_layer_open")
-}
-
-/// Open (or close) the context menu's Select layer submenu.
-pub fn open_select_layer(ctx: &egui::Context, open: bool) {
-    ctx.data_mut(|d| d.insert_temp(select_layer_id(), open));
-}
-
-/// The context menu's "Select layer" submenu (right-click on the canvas): every layer under the
-/// click, nested ones indented, the selected ones checked. Returns whether one was picked.
-fn select_layer_menu(app: &mut FigApp, ui: &mut Ui, pos: egui::Pos2, t: &Tokens) -> bool {
-    if !app.canvas.rect.contains(pos) {
-        return false;
-    }
-    let p = app.to_page(pos);
-    let Ok(ds) = app.session.ds() else { return false };
-    let tol = 2.0 / ds.view.zoom.max(1e-6);
-    let layers: Vec<(figcraft_doc::NodeId, usize, String)> =
-        figcraft_doc::geometry::layers_at(&ds.doc, ds.page, p, tol, Some(&figcraft_engine::booleans::result_outline(&ds.doc, &ds.selection)))
-            .into_iter()
-            .take(40)
-            .filter_map(|(id, depth)| {
-                ds.doc.node(id).map(|n| (id, depth, if n.name.is_empty() { n.kind.type_name().to_lowercase() } else { n.name.clone() }))
-            })
-            .collect();
-    if layers.is_empty() {
-        return false;
-    }
-    let sel = ds.selection.clone();
-    let resp = submenu_item(ui, tr("Select layer"), t);
-    if resp.hovered() {
-        ui.data_mut(|d| d.insert_temp(select_layer_id(), true));
-    }
-    let mut picked = None;
-    if ui.data(|d| d.get_temp::<bool>(select_layer_id())).unwrap_or(false) {
-        let at = pos2(resp.rect.max.x + 4.0, resp.rect.min.y - 8.0);
-        egui::Area::new(Id::new("ctx_select_layer")).fixed_pos(at).order(egui::Order::Foreground).constrain(true).show(ui.ctx(), |ui| {
-            menu_frame(ui, t, |ui| {
-                for (id, depth, name) in &layers {
-                    if indented_item(ui, name, "", true, sel.contains(id), 12.0 * (*depth).min(8) as f32, t) {
-                        picked = Some(*id);
-                    }
-                }
-            });
-        });
-    }
-    separator(ui);
-    match picked {
-        Some(id) => {
-            app.run("select.set", json!({"ids": [id]}));
-            true
-        }
-        None => false,
-    }
-}
-
-/// The Actions palette: fuzzy search over every command.
-fn palette(app: &mut FigApp, ctx: &egui::Context) {
-    let Some(mut q) = app.ui.palette.clone() else { return };
-    let t = Tokens::get(ctx);
-    let screen = ctx.content_rect();
-    let mut run: Option<String> = None;
-    let mut close = false;
-    egui::Area::new(Id::new("palette")).fixed_pos(pos2(screen.center().x - 260.0, screen.min.y + 120.0)).order(egui::Order::Foreground).show(
-        ctx,
-        |ui| {
-            egui::Frame::NONE
-                .fill(t.panel)
-                .corner_radius(CornerRadius::same(13))
-                .stroke(Stroke::new(1.0, t.border))
-                .shadow(egui::Shadow { offset: [0, 8], blur: 32, spread: 0, color: t.shadow })
-                .inner_margin(egui::Margin::same(8))
-                .show(ui, |ui| {
-                    ui.set_width(520.0);
-                    let r = ui.add(
-                        egui::TextEdit::singleline(&mut q)
-                            .hint_text(tr("Search actions, layers and tools"))
-                            .desired_width(500.0)
-                            .font(regular(14.0))
-                            .frame(egui::Frame::NONE.inner_margin(egui::Margin::same(8))),
-                    );
-                    r.request_focus();
-                    crate::widgets::select_all_on_focus(ui, &r, &q);
-                    ui.add_space(4.0);
-                    let ql = q.to_lowercase();
-                    // Labels match in the UI language and in English.
-                    let matches =
-                        |label: &str, english: &str, id: &str| ql.is_empty() || [label, english, id].iter().any(|s| s.to_lowercase().contains(&ql));
-                    let mut hits: Vec<(&str, std::borrow::Cow<str>, &str)> = Vec::new();
-                    let menu_items = MENU.iter().filter(|m| UI_COMMANDS.contains(&m.id)).map(|m| (m.id, m.label));
-                    for (id, english) in figcraft_engine::all_commands().iter().map(|c| (c.id, c.label)).chain(menu_items) {
-                        let label = i18n::command(id, english);
-                        if matches(&label, english, id) {
-                            hits.push((id, label, crate::shortcuts::shortcut(id).unwrap_or("")));
-                        }
-                    }
-                    hits.sort_by_key(|h| (!h.1.to_lowercase().starts_with(&ql), h.1.len()));
-                    hits.dedup_by(|a, b| a.0 == b.0);
-                    let enter = ui.input(|i| i.key_pressed(egui::Key::Enter));
-                    egui::ScrollArea::vertical().max_height(360.0).show(ui, |ui| {
-                        for (i, (id, label, sc)) in hits.iter().take(60).enumerate() {
-                            let w = ui.available_width();
-                            let (r, resp) = ui.allocate_exact_size(vec2(w, 30.0), Sense::click());
-                            if resp.hovered() || i == 0 {
-                                ui.painter().rect_filled(r, CornerRadius::same(5), if resp.hovered() { ACCENT } else { t.hover });
-                            }
-                            let col = if resp.hovered() { Color32::WHITE } else { t.text };
-                            ui.painter().text(pos2(r.min.x + 10.0, r.center().y), Align2::LEFT_CENTER, label.as_ref(), regular(12.0), col);
-                            ui.painter().text(
-                                pos2(r.max.x - 10.0, r.center().y),
-                                Align2::RIGHT_CENTER,
-                                pretty_shortcut(sc),
-                                regular(11.0),
-                                if resp.hovered() { Color32::WHITE } else { t.text_secondary },
-                            );
-                            if resp.clicked() || (enter && i == 0) {
-                                run = Some(id.to_string());
-                            }
-                        }
-                    });
-                });
-        },
-    );
-    if ctx.input(|i| i.key_pressed(egui::Key::Escape)) {
-        close = true;
-    }
-    if let Some(id) = run {
-        app.ui.palette = None;
-        invoke(app, &id);
-        return;
-    }
-    app.ui.palette = if close { None } else { Some(q) };
-    let _ = StrokeKind::Inside;
-}
+/// The context menu's Copy as submenu: its key in the tree, and the marker row in the entries.
+const COPY_AS: &str = "Copy as";
diff --git a/crates/ui-egui/src/menus/clipboard.rs b/crates/ui-egui/src/menus/clipboard.rs
new file mode 100644
index 00000000..dd775297
--- /dev/null
+++ b/crates/ui-egui/src/menus/clipboard.rs
@@ -0,0 +1,122 @@
+use super::*;
+
+/// Run a menu item: some open dialogs or use platform services, the rest go to the engine.
+/// Paste: the system clipboard wins when it holds something newer than our own copy (layers copied
+/// from another design app, an image, SVG or text from another app); otherwise our copied layers.
+/// `event_text` is the text the platform handed over with the paste event (the browser has no
+/// other way to read it). `at`: the page point to paste at (Paste here); `None` pastes in the
+/// middle of the view.
+/// In Dev Mode only a comment's link pastes (it opens the thread); everything else would edit.
+pub fn paste(app: &mut FigApp, event_text: Option<&str>, at: Option<(f64, f64)>) {
+    // A gesture injected through the control channel pastes only our own copied layers: it must not
+    // read (and so expose) the user's system clipboard.
+    if app.control_synthetic {
+        // Synthetic input is user-like: Dev Mode refuses the paste here too, and only the engine's
+        // own copied layers are pasted (the system clipboard is never read).
+        if !dev_mode_refuses(app, "edit.paste") {
+            app.run("edit.paste", at.map_or(json!({}), |(x, y)| json!({"x": x, "y": y})));
+        }
+        return;
+    }
+    // Only HTML that holds readable design data takes this path; other HTML pastes as before.
+    if let Some(html) = app.services.clipboard_get_html().filter(|h| figcraft_engine::cmd::edit::design_clipboard_buffer(h).is_some()) {
+        if dev_mode_refuses(app, "edit.paste") {
+            return;
+        }
+        let mut params = json!({"html": html});
+        if let Some((x, y)) = at {
+            params["x"] = json!(x);
+            params["y"] = json!(y);
+        }
+        if let Some(r) = app.run("edit.pasteDesignLayers", params) {
+            // The pasted layers are now our copy: text another app puts on the clipboard later is newer.
+            app.ui.last_copy = Some(app.services.clipboard_get_text().unwrap_or_default());
+            app.ui.last_copy_generation = app.session.clipboard.layers_generation;
+            let left_out = r["warnings"].as_array().map_or(0, Vec::len);
+            if left_out > 0 {
+                app.toast(trn("Pasted design layers; {n} kinds of content were left out", left_out, &[]));
+            }
+        }
+        return;
+    }
+    let sys_text = app.services.clipboard_get_text().or_else(|| event_text.map(str::to_string)).filter(|t| !t.is_empty());
+    // The text matching `last_copy` means the system clipboard still holds what we mirrored only
+    // while the engine clipboard is the one we mirrored. A control-channel copy changes the engine
+    // clipboard without writing the system clipboard, so its generation no longer matches and the
+    // user's own text is pasted instead of the programmatic selection.
+    let ours = sys_text.is_some() && sys_text == app.ui.last_copy && app.ui.last_copy_generation == app.session.clipboard.layers_generation;
+    let (cx, cy) = at.or_else(|| app.session.ds().ok().map(|d| (d.view.cx, d.view.cy))).unwrap_or((0.0, 0.0));
+    if !ours {
+        if let Some((png, w, h)) = clipboard_png(app) {
+            if dev_mode_refuses(app, "edit.paste") {
+                return;
+            }
+            use base64::Engine as _;
+            let b64 = base64::engine::general_purpose::STANDARD.encode(png);
+            // One selected layer that can have fills takes the image as its top fill.
+            if let [target] = app.session.selection()[..]
+                && at.is_none()
+                && app.session.doc().ok().and_then(|d| d.node(target)).is_some_and(|n| figcraft_engine::cmd::create::accepts_image_fill(&n.kind))
+            {
+                app.run("image.place", json!({"data": b64, "target": target}));
+                return;
+            }
+            // Centred in the view; Paste here puts its top-left at the point, as it does layers.
+            let (x, y) = if at.is_some() { (cx, cy) } else { ((cx - f64::from(w) / 2.0).round(), (cy - f64::from(h) / 2.0).round()) };
+            app.run("file.import", json!({"data": b64, "name": "Pasted image.png", "x": x, "y": y}));
+            return;
+        }
+        // Not ours: any other text is newer (another app's text, SVG, a comment link) and wins.
+        // Our own marker for copied layers without a text/SVG mirror is never a text paste; when
+        // the engine copy moved on it falls through to `edit.paste` (the only layers we still have).
+        if let Some(text) = sys_text.filter(|t| !is_clipboard_marker(t)) {
+            return paste_text(app, &text, (cx, cy), at.is_none());
+        }
+    }
+    if !dev_mode_refuses(app, "edit.paste") {
+        app.run("edit.paste", at.map_or(json!({}), |(x, y)| json!({"x": x, "y": y})));
+    }
+}
+
+/// The marker FigCraft puts on the system clipboard for copied layers with no text/SVG mirror.
+fn is_clipboard_marker(text: &str) -> bool {
+    text.starts_with("figcraft://clipboard/")
+}
+
+/// Paste text from another app at `(cx, cy)` (`center`: centred there): a comment's link opens its
+/// thread, SVG imports, anything else becomes a text layer.
+fn paste_text(app: &mut FigApp, text: &str, (cx, cy): (f64, f64), center: bool) {
+    if text.trim().starts_with("figcraft://comment/") {
+        app.run("comment.open", json!({"link": text.trim()}));
+    } else if dev_mode_refuses(app, "edit.paste") {
+        // Dev Mode: the note says why nothing was pasted.
+    } else if figcraft_engine::looks_like_svg(text) {
+        use base64::Engine as _;
+        let b64 = base64::engine::general_purpose::STANDARD.encode(text.as_bytes());
+        app.run_user("file.import", json!({"data": b64, "name": "Pasted SVG.svg", "x": cx, "y": cy, "center": center}));
+    } else {
+        app.run("text.create", json!({"text": text, "x": cx, "y": cy}));
+    }
+}
+
+/// The system clipboard's image as PNG bytes, with its size.
+fn clipboard_png(app: &mut FigApp) -> Option<(Vec<u8>, u32, u32)> {
+    let (w, h, rgba) = app.services.clipboard_get_image()?;
+    let img = image::RgbaImage::from_raw(w, h, rgba)?;
+    let mut out = std::io::Cursor::new(Vec::new());
+    img.write_to(&mut out, image::ImageFormat::Png).ok()?;
+    Some((out.into_inner(), w, h))
+}
+
+/// The text of a selection made only of text layers, one layer per line (None for any other
+/// selection, or when there is no text).
+pub(super) fn text_layers_text(doc: &figcraft_doc::Document, ids: &[figcraft_doc::NodeId]) -> Option<String> {
+    let texts: Option<Vec<&str>> = ids.iter().map(|i| doc.node(*i).and_then(|n| n.kind.text()).map(|t| t.characters.as_str())).collect();
+    texts.map(|t| t.join("\n")).filter(|t| !t.is_empty())
+}
+
+/// The layers as SVG text for other apps (None when the export fails).
+pub(super) fn figcraft_svg_export(doc: &figcraft_doc::Document, ids: &[figcraft_doc::NodeId]) -> Option<String> {
+    let bytes = figcraft_engine::cmd::file::export_bytes(doc, ids, figcraft_doc::ExportFormat::Svg, 1.0).ok()?;
+    String::from_utf8(bytes).ok()
+}
diff --git a/crates/ui-egui/src/menus/palette.rs b/crates/ui-egui/src/menus/palette.rs
new file mode 100644
index 00000000..4890f8ad
--- /dev/null
+++ b/crates/ui-egui/src/menus/palette.rs
@@ -0,0 +1,410 @@
+use super::*;
+
+/// The Actions palette's tab.
+#[derive(Clone, Copy, PartialEq, Eq, Default)]
+pub enum PaletteTab {
+    #[default]
+    All,
+    Assets,
+    Plugins,
+}
+
+/// The Actions palette's content height (the frame adds its own 8 px margins).
+const PALETTE_H: f32 = 450.0;
+
+/// Open the Actions palette afresh (empty search, All tab, first row highlighted), or close it.
+pub fn set_palette(ui: &mut crate::UiState, open: bool) {
+    ui.palette = open.then(String::new);
+    ui.palette_tab = PaletteTab::All;
+    ui.palette_hi = 0;
+    ui.palette_armed = open;
+}
+
+/// Open the Actions palette afresh, or close it when it's open (⌘K, the toolbar's Actions button).
+pub fn toggle_palette(ui: &mut crate::UiState) {
+    let open = ui.palette.is_none();
+    set_palette(ui, open);
+}
+
+/// The Actions palette: search over commands, assets and plugins, with tabs, recents and grouped
+/// sections, floating above the toolbar. Rows run on click; Up and Down move the highlight and
+/// Enter runs the highlighted row.
+pub(super) fn palette(app: &mut FigApp, ctx: &egui::Context) {
+    let Some(mut q) = app.ui.palette.clone() else { return };
+    let t = Tokens::get(ctx);
+    // Same centre and width as the toolbar pill (it centres on the canvas, not the window),
+    // floating 8 px above it. Fixed size: switching tabs never resizes the panel.
+    let bar_w = crate::toolbar::bar_width(app);
+    let bar = crate::toolbar::pill_rect(app.canvas.rect, bar_w);
+    let area = Rect::from_min_max(pos2(bar.min.x, bar.min.y - 8.0 - (PALETTE_H + 16.0)), pos2(bar.max.x, bar.min.y - 8.0));
+    let mut run: Option<String> = None;
+    let mut close = false;
+    // A press anywhere outside closes the panel. The opening press is spared once, and the
+    // spare expires the first frame without a press (so the next outside press always closes).
+    let pressed = ctx.input(|i| i.pointer.any_pressed());
+    if pressed && !std::mem::replace(&mut app.ui.palette_armed, false) {
+        let on_toggle = app.ui.actions_rect.is_some_and(|b| ctx.input(|i| i.pointer.hover_pos().is_some_and(|p| b.contains(p))));
+        let outside = !on_toggle && ctx.input(|i| i.pointer.hover_pos().map(|p| !area.contains(p)).unwrap_or(false));
+        if outside {
+            close = true;
+        }
+    } else if !pressed {
+        app.ui.palette_armed = false;
+    }
+    // Taken before the search field sees them (it would move its cursor).
+    let step = ctx.input_mut(|i| {
+        i.count_and_consume_key(egui::Modifiers::NONE, egui::Key::ArrowDown) as i64
+            - i.count_and_consume_key(egui::Modifiers::NONE, egui::Key::ArrowUp) as i64
+    });
+    egui::Area::new(Id::unique("palette")).fixed_pos(area.min).order(egui::Order::Foreground).show(ctx, |ui| {
+        egui::Frame::NONE
+            .fill(t.panel)
+            .corner_radius(CornerRadius::same(13))
+            .stroke(Stroke::new(1.0, t.border))
+            .shadow(egui::Shadow { offset: [0, 8], blur: 32, spread: 0, color: t.shadow })
+            .inner_margin(egui::Margin::same(8))
+            .show(ui, |ui| {
+                // Same outer width as the toolbar pill, and a fixed height: switching tabs
+                // never resizes the panel.
+                let inner = bar_w - 16.0;
+                ui.set_width(inner);
+                ui.set_height(PALETTE_H);
+                let r = ui.add(
+                    egui::TextEdit::singleline(&mut q)
+                        .hint_text(tr("Search actions, layers and tools"))
+                        .desired_width(inner - 16.0)
+                        .font(regular(14.0))
+                        .frame(egui::Frame::NONE.inner_margin(egui::Margin::same(8))),
+                );
+                r.request_focus();
+                crate::widgets::select_all_on_focus(ui, &r, &q);
+                // A new search starts again at the first row.
+                if r.changed() {
+                    app.ui.palette_hi = 0;
+                }
+                ui.add_space(4.0);
+                // Tabs: All, Assets, Plugins & widgets.
+                let tabs = [(PaletteTab::All, tr("All")), (PaletteTab::Assets, tr("Assets")), (PaletteTab::Plugins, tr("Plugins & widgets"))];
+                ui.horizontal(|ui| {
+                    ui.spacing_mut().item_spacing = vec2(4.0, 0.0);
+                    for (tab, label) in tabs {
+                        let active = app.ui.palette_tab == tab;
+                        // The frame stays on for every tab (transparent when idle) so the
+                        // active pill never moves its neighbours.
+                        let resp = ui.add(
+                            egui::Button::new(egui::RichText::new(label).size(12.0).color(if active { t.text } else { t.text_secondary }))
+                                .frame(true)
+                                .fill(if active { t.hover } else { Color32::TRANSPARENT })
+                                .corner_radius(CornerRadius::same(6)),
+                        );
+                        if resp.clicked() {
+                            app.ui.palette_tab = tab;
+                            app.ui.palette_hi = 0;
+                        }
+                    }
+                });
+                ui.add_space(4.0);
+                let sections = palette_sections(app, &q, app.ui.palette_tab);
+                let count = sections.iter().map(|(_, rows)| rows.len()).sum::<usize>();
+                // At either end it stays where it was.
+                let hi = (app.ui.palette_hi as i64 + step).clamp(0, count.saturating_sub(1) as i64) as usize;
+                app.ui.palette_hi = hi;
+                // The pointer moving over a row moves the highlight there.
+                let pointer_moved = ui.input(|i| i.pointer.delta() != egui::Vec2::ZERO);
+                egui::ScrollArea::vertical().max_height(360.0).show(ui, |ui| {
+                    let mut i = 0;
+                    for (name, rows) in &sections {
+                        section(ui, &t, name, |ui| {
+                            for row in rows {
+                                let resp = draw_row(ui, &t, row, i == hi);
+                                if resp.clicked() {
+                                    run = Some(row.key.clone());
+                                }
+                                if pointer_moved && resp.hovered() && i != hi {
+                                    app.ui.palette_hi = i;
+                                    // Drawn there on the next frame, even if the pointer stops now.
+                                    ui.ctx().request_repaint();
+                                }
+                                if step != 0 && i == hi {
+                                    resp.scroll_to_me(None);
+                                }
+                                i += 1;
+                            }
+                        });
+                    }
+                });
+                if run.is_none() && ui.input(|i| i.key_pressed(egui::Key::Enter)) {
+                    run = sections.iter().flat_map(|(_, rows)| rows).nth(hi).map(|row| row.key.clone());
+                }
+            });
+    });
+    if ctx.input(|i| i.key_pressed(egui::Key::Escape)) {
+        close = true;
+    }
+    if let Some(key) = run {
+        app.ui.palette = None;
+        run_action(app, &key);
+        return;
+    }
+    app.ui.palette = if close { None } else { Some(q) };
+    let _ = StrokeKind::Inside;
+}
+
+/// The rows a palette tab shows for the query, by section: All has Recents, the commands by menu,
+/// then plugins and widgets; Assets this file's components and styles; Plugins & widgets those.
+pub(crate) fn palette_sections(app: &FigApp, q: &str, tab: PaletteTab) -> Vec<(String, Vec<ActionRow>)> {
+    let mut out = match tab {
+        PaletteTab::All => {
+            let recents = app.session.prefs.recent_actions.iter().filter_map(|key| recent_row(app, key, q)).collect();
+            let mut out = vec![(tr("Recents").to_string(), recents)];
+            out.extend(command_sections(q));
+            out
+        }
+        PaletteTab::Assets => asset_sections(app, q),
+        PaletteTab::Plugins => Vec::new(),
+    };
+    if tab != PaletteTab::Assets {
+        out.push((tr("Plugins").to_string(), plugin_rows(app, q)));
+        out.push((tr("Widgets").to_string(), widget_rows(app, q)));
+    }
+    out.retain(|(_, rows)| !rows.is_empty());
+    out
+}
+
+/// Run a palette row: `command:<id>`, `plugin:<plugin>/<command>`, `widget:<plugin>`,
+/// `component:<node>` or `style:<id>`.
+pub(crate) fn run_action(app: &mut FigApp, key: &str) {
+    if let Some(id) = key.strip_prefix("command:") {
+        record_recent(app, key);
+        invoke(app, id);
+    } else if let Some(rest) = key.strip_prefix("plugin:") {
+        if let Some((plugin, command)) = rest.split_once('/') {
+            record_recent(app, key);
+            crate::plugins_ui::start(app, plugin, command);
+        }
+    } else if let Some(plugin) = key.strip_prefix("widget:") {
+        record_recent(app, key);
+        app.run("widget.insert", json!({ "plugin": plugin }));
+    } else if let Some(node) = key.strip_prefix("component:") {
+        if let Ok(n) = node.parse::<u64>() {
+            let (cx, cy) = app.session.ds().map(|d| (d.view.cx, d.view.cy)).unwrap_or((0.0, 0.0));
+            app.run("instance.place", json!({ "component": n, "x": cx, "y": cy }));
+        }
+    } else if let Some(style) = key.strip_prefix("style:") {
+        if app.session.selection().is_empty() {
+            app.toast(tr("Select layers to apply the style to"));
+        } else {
+            app.run("style.apply", json!({ "style": style }));
+        }
+    }
+}
+
+/// One pickable palette row.
+pub(crate) struct ActionRow {
+    pub(crate) key: String,
+    pub(crate) label: String,
+    hint: String,
+    /// A letter tile instead of an icon (plugins carry no artwork).
+    tile: Option<char>,
+}
+
+/// A section header with its rows.
+fn section(ui: &mut Ui, t: &Tokens, name: &str, rows: impl FnOnce(&mut Ui)) {
+    ui.add_space(10.0);
+    ui.painter().text(pos2(ui.min_rect().min.x + 10.0, ui.cursor().min.y + 8.0), Align2::LEFT_TOP, name, regular(12.5), t.text_secondary);
+    ui.add_space(22.0);
+    rows(ui);
+}
+
+/// Draw one row (a letter tile for plugins, else just the label) with its right-side hint,
+/// `highlighted` when Enter runs it.
+fn draw_row(ui: &mut Ui, t: &Tokens, row: &ActionRow, highlighted: bool) -> egui::Response {
+    let w = ui.available_width();
+    let (r, resp) = ui.allocate_exact_size(vec2(w, 34.0), Sense::click());
+    // The highlight pill stays inside the row: it never touches the panel's edges.
+    let pill = r.shrink2(vec2(4.0, 1.0));
+    if highlighted {
+        ui.painter().rect_filled(pill, CornerRadius::same(6), t.hover);
+    }
+    let mut label_x = r.min.x + 10.0;
+    if let Some(letter) = row.tile {
+        let tile = Rect::from_center_size(pos2(r.min.x + 20.0, r.center().y), vec2(18.0, 18.0));
+        ui.painter().rect_filled(tile, CornerRadius::same(5), t.hover);
+        ui.painter().text(tile.center(), Align2::CENTER_CENTER, letter.to_string(), regular(11.0), t.text);
+        label_x = r.min.x + 38.0;
+    }
+    ui.painter().text(pos2(label_x, r.center().y), Align2::LEFT_CENTER, &row.label, regular(13.0), t.text);
+    ui.painter().text(pos2(r.max.x - 10.0, r.center().y), Align2::RIGHT_CENTER, &row.hint, regular(11.0), t.text_secondary);
+    resp
+}
+
+/// Whether `label` (or `extra`) matches the query, in any case.
+fn matches(q: &str, label: &str, extra: &str) -> bool {
+    q.is_empty() || label.to_lowercase().contains(q) || extra.to_lowercase().contains(q)
+}
+
+/// A command's row: its label, and its shortcut as the hint.
+fn command_row(id: &str, label: String) -> ActionRow {
+    ActionRow { key: format!("command:{id}"), label, hint: crate::shortcuts::shortcut(id).map(pretty_shortcut).unwrap_or_default(), tile: None }
+}
+
+/// Most rows a search shows (the best matches).
+const MAX_HITS: usize = 60;
+
+/// Commands grouped by top-level menu, filtered by the query. Without one, the menus' items in
+/// catalog order; a search covers every command (the engine's and the UI's own, "Other" for those
+/// no menu lists), best matches first (labels starting with the query, then the shortest), each
+/// group placed by its best row. Labels match in the UI language and in English. The Plugins
+/// menu's items come with the plugins ([`plugin_rows`]).
+pub(crate) fn command_sections(q: &str) -> Vec<(String, Vec<ActionRow>)> {
+    let ql = q.trim().to_lowercase();
+    let mut menu_of = std::collections::HashMap::new();
+    for m in MENU.iter().filter(|m| m.label != SEP) {
+        menu_of.entry(m.id).or_insert(m);
+    }
+    let menu_items = MENU.iter().filter(|m| m.label != SEP).map(|m| (m.id, m.label));
+    let engine = figcraft_engine::all_commands().iter().map(|c| (c.id, c.label));
+    let candidates: Box<dyn Iterator<Item = (&str, &str)>> = if ql.is_empty() { Box::new(menu_items) } else { Box::new(menu_items.chain(engine)) };
+    let mut seen = std::collections::HashSet::new();
+    // By top-level menu; `None`: no menu lists it.
+    let mut hits: Vec<(Option<&str>, ActionRow)> = Vec::new();
+    for (id, english) in candidates {
+        if !available(id) || !seen.insert(id) {
+            continue;
+        }
+        let menu = menu_of.get(id);
+        let group = menu.map(|m| m.menu.split('/').next().unwrap_or(m.menu));
+        if group == Some("Plugins") {
+            continue;
+        }
+        let label = match menu {
+            Some(m) => i18n::menu_item(id, m.label),
+            None => i18n::command(id, english),
+        };
+        if matches(&ql, &label, &format!("{english} {id}")) {
+            hits.push((group, command_row(id, label.into_owned())));
+        }
+    }
+    if !ql.is_empty() {
+        hits.sort_by_cached_key(|(_, row)| (!row.label.to_lowercase().starts_with(&ql), row.label.chars().count()));
+        hits.truncate(MAX_HITS);
+    }
+    let mut groups: Vec<(String, Vec<ActionRow>)> = Vec::new();
+    for (group, row) in hits {
+        let group = group.map_or_else(|| tr("Other"), tr).to_string();
+        match groups.iter_mut().find(|(g, _)| *g == group) {
+            Some((_, rows)) => rows.push(row),
+            None => groups.push((group, vec![row])),
+        }
+    }
+    groups
+}
+
+/// Installed plugins' commands, filtered by the query.
+fn plugin_rows(app: &FigApp, q: &str) -> Vec<ActionRow> {
+    let ql = q.to_lowercase();
+    let mut rows = Vec::new();
+    for p in &app.session.prefs.plugins {
+        let m = &p.manifest;
+        for c in &m.commands {
+            let label = if m.commands.len() == 1 { m.name.clone() } else { format!("{} — {}", m.name, c.label) };
+            if !matches(&ql, &label, &m.id) {
+                continue;
+            }
+            rows.push(ActionRow {
+                key: format!("plugin:{}/{}", m.id, c.id),
+                label,
+                hint: if c.params.is_empty() { tr("Plugin").to_string() } else { c.label.clone() },
+                tile: m.name.chars().next(),
+            });
+        }
+    }
+    // The Plugins menu's own items (run last, manage, import).
+    for m in MENU.iter().filter(|m| m.label != SEP && m.menu.split('/').next() == Some("Plugins") && available(m.id)) {
+        let label = i18n::menu_item(m.id, m.label);
+        if matches(&ql, &label, &format!("{} {}", m.label, m.id)) {
+            rows.push(command_row(m.id, label.into_owned()));
+        }
+    }
+    rows
+}
+
+/// Installed widgets, filtered by the query.
+fn widget_rows(app: &FigApp, q: &str) -> Vec<ActionRow> {
+    let ql = q.to_lowercase();
+    app.session
+        .prefs
+        .plugins
+        .iter()
+        .filter(|p| p.manifest.widget)
+        .filter(|p| matches(&ql, &p.manifest.name, &p.manifest.id))
+        .map(|p| ActionRow {
+            key: format!("widget:{}", p.manifest.id),
+            label: p.manifest.name.clone(),
+            hint: tr("Widget").to_string(),
+            tile: p.manifest.name.chars().next(),
+        })
+        .collect()
+}
+
+/// This file's components and styles, filtered by the query.
+fn asset_sections(app: &FigApp, q: &str) -> Vec<(String, Vec<ActionRow>)> {
+    let ql = q.to_lowercase();
+    let Ok(doc) = app.session.doc() else { return Vec::new() };
+    let components: Vec<ActionRow> = figcraft_engine::library::local_components(doc)
+        .iter()
+        .filter_map(|id| doc.node(*id))
+        .filter(|n| matches(&ql, &n.name, ""))
+        .map(|n| ActionRow { key: format!("component:{}", n.id.0), label: n.name.clone(), hint: tr("Component").to_string(), tile: None })
+        .collect();
+    let styles: Vec<ActionRow> = figcraft_engine::library::local_styles(doc)
+        .filter(|s| matches(&ql, &s.name, ""))
+        .map(|s| ActionRow { key: format!("style:{}", s.id), label: s.name.clone(), hint: tr("Style").to_string(), tile: None })
+        .collect();
+    let mut out = Vec::new();
+    if !components.is_empty() {
+        out.push((tr("Components").to_string(), components));
+    }
+    if !styles.is_empty() {
+        out.push((tr("Styles").to_string(), styles));
+    }
+    out
+}
+
+/// A recent action back as a row (gone commands, plugins or assets drop out).
+pub(crate) fn recent_row(app: &FigApp, key: &str, q: &str) -> Option<ActionRow> {
+    let ql = q.to_lowercase();
+    if let Some(id) = key.strip_prefix("command:") {
+        let spec = figcraft_engine::find_command(id);
+        let menu_label = figcraft_engine::catalog::MENU.iter().find(|m| m.id == id);
+        let english = menu_label.map(|m| m.label).or_else(|| spec.map(|s| s.label)).unwrap_or(id);
+        let label = i18n::command(id, english);
+        if !available(id) || !matches(&ql, &label, &format!("{english} {id}")) {
+            return None;
+        }
+        return Some(command_row(id, label.into_owned()));
+    }
+    if let Some(rest) = key.strip_prefix("plugin:") {
+        let (pid, cid) = rest.split_once('/')?;
+        let p = app.session.prefs.plugins.iter().find(|p| p.manifest.id == pid)?;
+        let c = p.manifest.commands.iter().find(|c| c.id == cid)?;
+        let label = if p.manifest.commands.len() == 1 { p.manifest.name.clone() } else { format!("{} — {}", p.manifest.name, c.label) };
+        if !matches(&ql, &label, pid) {
+            return None;
+        }
+        return Some(ActionRow { key: key.to_string(), label, hint: tr("Plugin").to_string(), tile: p.manifest.name.chars().next() });
+    }
+    if let Some(pid) = key.strip_prefix("widget:") {
+        let p = app.session.prefs.plugins.iter().find(|p| p.manifest.id == pid && p.manifest.widget)?;
+        if !matches(&ql, &p.manifest.name, pid) {
+            return None;
+        }
+        return Some(ActionRow {
+            key: key.to_string(),
+            label: p.manifest.name.clone(),
+            hint: tr("Widget").to_string(),
+            tile: p.manifest.name.chars().next(),
+        });
+    }
+    None
+}
diff --git a/crates/ui-egui/src/menus/select_layer.rs b/crates/ui-egui/src/menus/select_layer.rs
new file mode 100644
index 00000000..59389c41
--- /dev/null
+++ b/crates/ui-egui/src/menus/select_layer.rs
@@ -0,0 +1,55 @@
+use super::tree::{indented_item, separator, submenu_at};
+use super::*;
+
+/// The context menu's Select layer submenu (its key in the context menu's tree).
+pub(super) const SELECT_LAYER: &str = "Select layer";
+
+/// Stable egui id for the context menu's pending Select-layer open request.
+pub(super) fn select_layer_ask_id() -> Id {
+    Id::unique("ctx_select_layer_ask")
+}
+
+/// Open (or close) the context menu's Select layer submenu (applied when the menu next draws).
+pub fn open_select_layer(ctx: &egui::Context, open: bool) {
+    ctx.data_mut(|d| d.insert_temp(select_layer_ask_id(), open));
+}
+
+/// The context menu's "Select layer" submenu (right-click on the canvas): every layer under the
+/// click, nested ones indented, the selected ones checked. Returns whether one was picked.
+pub(super) fn select_layer_menu(app: &mut FigApp, ui: &mut Ui, pos: egui::Pos2, t: &Tokens) -> bool {
+    if !app.canvas.rect.contains(pos) {
+        return false;
+    }
+    let p = app.to_page(pos);
+    let Ok(ds) = app.session.ds() else { return false };
+    let tol = 2.0 / ds.view.zoom.max(1e-6);
+    let layers: Vec<(figcraft_doc::NodeId, usize, String)> =
+        figcraft_doc::geometry::layers_at(&ds.doc, ds.page, p, tol, Some(&figcraft_engine::booleans::result_outline(&ds.doc, &ds.selection)))
+            .into_iter()
+            .take(40)
+            .filter_map(|(id, depth)| {
+                ds.doc.node(id).map(|n| (id, depth, if n.name.is_empty() { n.kind.type_name().to_lowercase() } else { n.name.clone() }))
+            })
+            .collect();
+    if layers.is_empty() {
+        return false;
+    }
+    let sel = ds.selection.clone();
+    let picked = submenu_at(ui, Id::unique("ctx_select_layer"), SELECT_LAYER, tr("Select layer"), 4.0, true, t, |ui| {
+        let mut picked = None;
+        for (id, depth, name) in &layers {
+            if indented_item(ui, name, "", true, sel.contains(id), 12.0 * (*depth).min(8) as f32, t) {
+                picked = Some(*id);
+            }
+        }
+        picked
+    });
+    separator(ui);
+    match picked {
+        Some(id) => {
+            app.run("select.set", json!({"ids": [id]}));
+            true
+        }
+        None => false,
+    }
+}
diff --git a/crates/ui-egui/src/menus/tree.rs b/crates/ui-egui/src/menus/tree.rs
new file mode 100644
index 00000000..4f181b3f
--- /dev/null
+++ b/crates/ui-egui/src/menus/tree.rs
@@ -0,0 +1,384 @@
+use super::*;
+
+/// A submenu row `label` in the menu being drawn; while it's open, `add` draws its items beside
+/// it. `key` names the submenu (its menu path, unique in its menu tree). Returns what `add`
+/// returned.
+pub(crate) fn submenu<R>(ui: &mut Ui, key: &str, label: &str, t: &Tokens, add: impl FnOnce(&mut Ui) -> Option<R>) -> Option<R> {
+    submenu_at(ui, Id::unique(("submenu", key)), key, label, 4.0, false, t, add)
+}
+
+// ---------------------------------------------------------------------------------------------
+// Which submenu is open: hover intent with a safe triangle.
+//
+// Every menu tree (the main menu, the context menu) keeps, per level, which of its submenus is
+// open. Hovering another row closes the open submenu at once; resting on a submenu row for
+// `HOVER_DELAY` opens it (sweeping across rows doesn't flash every submenu on the way). Except while the
+// pointer is on its way from the open submenu's row to the submenu: while each move lands inside
+// the triangle between where it was and the submenu's near edge (it keeps getting nearer), rows
+// it crosses don't take over and the submenu's row stays highlighted. Resting (`AIM_REST`) or
+// turning away ends that, and the row under the pointer takes over. Leaving the menus keeps the
+// last submenu open.
+// Closing a menu tree forgets all of it, so it reopens with no submenu open.
+
+/// How long the pointer stays on a submenu row before its submenu opens.
+pub(crate) const HOVER_DELAY: f64 = 0.15;
+
+/// How long the pointer may rest inside the safe triangle before the row under it takes over.
+pub(crate) const AIM_REST: f64 = 0.3;
+
+/// A pointer that moved less than this is resting.
+const AIM_STILL: f32 = 1.0;
+
+/// The triangle reaches this far above and below the submenu.
+const AIM_EDGE_SLOP: f32 = 8.0;
+
+/// The hover state of one menu level.
+#[derive(Clone, Default, Debug)]
+struct Level {
+    /// The open submenu's key.
+    open: Option<String>,
+    /// The open submenu's row and where its panel was drawn (last frame).
+    row: Option<Rect>,
+    panel: Option<Rect>,
+    /// The pointer's last position counted as heading for the panel, and when it got there.
+    apex: Option<egui::Pos2>,
+    moved_at: f64,
+    /// This pass's verdict: the pointer is aiming at the panel.
+    pass: Option<u64>,
+    aiming: bool,
+    /// The row the pointer is on, waiting to take over (a submenu's key, or `None`: a plain row),
+    /// and since when; whether a row asked this pass (unasked, it lapses).
+    pending: Option<(Option<String>, f64)>,
+    asked: bool,
+    /// When the pointer came to rest in the triangle, if that's what ended aiming this pass.
+    rested_at: Option<f64>,
+}
+
+/// One menu tree's levels, by menu path ("" for the top).
+#[derive(Clone, Default, Debug)]
+struct Tree {
+    levels: std::collections::HashMap<String, Level>,
+}
+
+/// The menu level a menu frame's ui draws: its tree's root and its path.
+#[derive(Clone, Debug)]
+pub(super) struct At {
+    pub(super) root: Id,
+    pub(super) path: String,
+}
+
+/// Scoped egui id for the current menu level.
+fn at_key(ui: &Ui) -> Id {
+    ui.scope_id().with("menu_level")
+}
+
+/// Return the current menu root/path, defaulting to the main menu root.
+fn level_at(ui: &Ui) -> At {
+    ui.data(|d| d.get_temp::<At>(at_key(ui))).unwrap_or(At { root: Id::unique("menus"), path: String::new() })
+}
+
+fn with_level<R>(ctx: &egui::Context, at: &At, f: impl FnOnce(&mut Level) -> R) -> R {
+    ctx.data_mut(|d| f(d.get_temp_mut_or_default::<Tree>(at.root).levels.entry(at.path.clone()).or_default()))
+}
+
+/// Forget everything a menu tree remembers (it closed or opened anew).
+pub(crate) fn forget_tree(ctx: &egui::Context, root: Id) {
+    ctx.data_mut(|d| d.remove::<Tree>(root));
+}
+
+/// Open (`Some(key)`) or close (`None`) a submenu of `root`'s level `path`; the levels below the
+/// one it replaces are forgotten (they reopen closed).
+pub(super) fn set_open(ctx: &egui::Context, root: Id, path: &str, key: Option<&str>) {
+    ctx.data_mut(|d| {
+        let tree = d.get_temp_mut_or_default::<Tree>(root);
+        let level = tree.levels.entry(path.to_string()).or_default();
+        if level.open.as_deref() == key {
+            return;
+        }
+        let old = std::mem::replace(&mut level.open, key.map(str::to_string));
+        level.row = None;
+        level.panel = None;
+        level.apex = None;
+        level.pending = None;
+        if let Some(old) = old {
+            let below = format!("{old}/");
+            tree.levels.retain(|p, _| *p != old && !p.starts_with(&below));
+        }
+    });
+}
+
+/// Whether `p` is in the triangle `a`, `b`, `c` (either winding, edges included).
+pub(crate) fn in_triangle(p: egui::Pos2, a: egui::Pos2, b: egui::Pos2, c: egui::Pos2) -> bool {
+    let side = |u: egui::Pos2, v: egui::Pos2| (v.x - u.x) * (p.y - u.y) - (v.y - u.y) * (p.x - u.x);
+    let (d1, d2, d3) = (side(a, b), side(b, c), side(c, a));
+    let neg = d1 < 0.0 || d2 < 0.0 || d3 < 0.0;
+    let pos = d1 > 0.0 || d2 > 0.0 || d3 > 0.0;
+    !(neg && pos)
+}
+
+/// Whether a pointer that moved from `from` to `p` is heading for `panel`: `p` is inside the
+/// triangle from `from` to the panel's near edge, so it got nearer the panel without leaving the
+/// rows' way to it. Straight up or down (or away) isn't.
+pub(crate) fn heading_for(from: egui::Pos2, p: egui::Pos2, panel: Rect) -> bool {
+    if ![from.x, from.y, p.x, p.y].iter().all(|v| v.is_finite()) {
+        return false;
+    }
+    let edge = if panel.min.x >= from.x {
+        panel.min.x
+    } else if panel.max.x <= from.x {
+        panel.max.x
+    } else {
+        return false;
+    };
+    in_triangle(p, from, pos2(edge, panel.min.y - AIM_EDGE_SLOP), pos2(edge, panel.max.y + AIM_EDGE_SLOP))
+}
+
+/// Whether the pointer is on its way to this level's open submenu (rows it crosses don't take
+/// over). Worked out once per pass per level.
+fn aiming(ui: &Ui) -> bool {
+    let at = level_at(ui);
+    let ctx = ui.ctx();
+    let pass = ctx.cumulative_pass_nr();
+    let (p, now) = ctx.input(|i| (i.pointer.hover_pos(), i.time));
+    let (aiming, wait) = with_level(ctx, &at, |l| {
+        if l.pass == Some(pass) {
+            return (l.aiming, None);
+        }
+        l.pass = Some(pass);
+        l.aiming = false;
+        l.rested_at = None;
+        if !l.asked {
+            l.pending = None;
+        }
+        l.asked = false;
+        let (Some(p), Some(_), Some(panel)) = (p, l.open.as_ref(), l.panel) else {
+            l.apex = None;
+            return (false, None);
+        };
+        if panel.contains(p) {
+            l.apex = None;
+            return (false, None);
+        }
+        // On the row (its bottom edge is the next row's).
+        if l.row.is_some_and(|r| (r.min.x..r.max.x).contains(&p.x) && (r.min.y..r.max.y).contains(&p.y)) {
+            l.apex = Some(p);
+            l.moved_at = now;
+            return (false, None);
+        }
+        let Some(from) = l.apex else { return (false, None) };
+        if (p - from).length() <= AIM_STILL {
+            // Resting: the submenu holds a moment longer.
+            if !(0.0..AIM_REST).contains(&(now - l.moved_at)) {
+                l.apex = None;
+                // It has rested long enough: the row under it needn't wait again.
+                l.rested_at = Some(l.moved_at);
+                return (false, None);
+            }
+        } else if heading_for(from, p, panel) {
+            l.apex = Some(p);
+            l.moved_at = now;
+        } else {
+            l.apex = None;
+            return (false, None);
+        }
+        l.aiming = true;
+        (true, Some(AIM_REST - (now - l.moved_at)))
+    });
+    // Wake up when the rest runs out, so the row under a still pointer takes over.
+    if let Some(w) = wait.filter(|w| w.is_finite() && *w > 0.0) {
+        ctx.request_repaint_after(std::time::Duration::from_secs_f64(w));
+    }
+    aiming
+}
+
+/// The pointer is on a row of level `at` (`target`: the row's submenu, or `None` for a plain
+/// row): another open submenu closes at once, and `target` opens once the pointer has stayed
+/// there `HOVER_DELAY`.
+fn hover_request(ctx: &egui::Context, at: &At, target: Option<&str>) {
+    let now = ctx.input(|i| i.time);
+    if with_level(ctx, at, |l| l.open.is_some() && l.open.as_deref() != target) {
+        set_open(ctx, at.root, &at.path, None);
+    }
+    let left = with_level(ctx, at, |l| {
+        l.asked = true;
+        if l.open.as_deref() == target {
+            l.pending = None;
+            return None;
+        }
+        let since = match &l.pending {
+            Some((t, since)) if t.as_deref() == target => *since,
+            _ => {
+                let since = l.rested_at.unwrap_or(now);
+                l.pending = Some((target.map(str::to_string), since));
+                since
+            }
+        };
+        Some(HOVER_DELAY - (now - since))
+    });
+    match left {
+        Some(left) if left <= 0.0 => set_open(ctx, at.root, &at.path, target),
+        // Wake up when it's due, so a still pointer gets there.
+        Some(left) => ctx.request_repaint_after(std::time::Duration::from_secs_f64(left.min(HOVER_DELAY))),
+        None => {}
+    }
+}
+
+/// Whether the pointer is on a row of level `at` other than the open submenu's (it shows as
+/// hovered instead).
+fn pending_elsewhere(ctx: &egui::Context, at: &At) -> bool {
+    with_level(ctx, at, |l| l.pending.as_ref().is_some_and(|(t, _)| *t != l.open))
+}
+
+/// A plain row of the level being drawn: hovering it (not while aiming at a submenu) closes the
+/// level's open submenu. Returns whether it shows as hovered.
+pub(super) fn plain_row_hover(ui: &Ui, resp: &egui::Response) -> bool {
+    let hovered = resp.hovered() && !aiming(ui);
+    if hovered {
+        hover_request(ui.ctx(), &level_at(ui), None);
+    }
+    hovered || resp.has_focus()
+}
+
+/// A submenu row whose panel (area `area`, `gap` right of the row) shows while it's open.
+#[allow(clippy::too_many_arguments)]
+pub(super) fn submenu_at<R>(
+    ui: &mut Ui,
+    area: Id,
+    key: &str,
+    label: &str,
+    gap: f32,
+    constrain: bool,
+    t: &Tokens,
+    add: impl FnOnce(&mut Ui) -> Option<R>,
+) -> Option<R> {
+    let at = level_at(ui);
+    let aim = aiming(ui);
+    let w = ui.available_width();
+    let (r, resp) = ui.allocate_exact_size(vec2(w, 28.0), Sense::click());
+    // The keyboard and clicks open it at once; hovering after a moment.
+    if resp.has_focus() || resp.clicked() {
+        set_open(ui.ctx(), at.root, &at.path, Some(key));
+    } else if resp.hovered() && !aim {
+        hover_request(ui.ctx(), &at, Some(key));
+    }
+    let open = with_level(ui.ctx(), &at, |l| {
+        let open = l.open.as_deref() == Some(key);
+        if open {
+            l.row = Some(r);
+        }
+        open
+    });
+    a11y::submenu(&resp, label, open);
+    a11y::own_focus(&resp);
+    // The open submenu's row stays highlighted while the pointer is in the submenu (not while it
+    // rests on another row of this menu).
+    let keep = open && !pending_elsewhere(ui.ctx(), &at);
+    paint_submenu_row(ui, r, label, keep || (resp.hovered() && !aim) || resp.has_focus(), t);
+    if !open {
+        return None;
+    }
+    let mut pos = pos2(r.max.x + gap, r.min.y - 8.0);
+    // No room beside the row (a phone): the submenu covers its parent instead of running off screen.
+    let screen = ui.ctx().content_rect();
+    let cramped = pos.x + MENU_W > screen.max.x;
+    if cramped {
+        pos.x = (screen.max.x - MENU_W - 8.0).max(screen.min.x + 4.0);
+    }
+    let child = At { root: at.root, path: key.to_string() };
+    let shown = egui::Area::new(area)
+        .fixed_pos(pos)
+        .order(egui::Order::Foreground)
+        .constrain(constrain || cramped)
+        .show(ui.ctx(), |ui| menu_frame(ui, t, child, add));
+    let panel = shown.response.rect;
+    with_level(ui.ctx(), &at, |l| l.panel = Some(panel));
+    shown.inner
+}
+
+/// A thin line between groups of menu items.
+pub(crate) fn separator(ui: &mut Ui) {
+    ui.add_space(4.0);
+    let (r, _) = ui.allocate_exact_size(vec2(ui.available_width(), 1.0), Sense::hover());
+    ui.painter().line_segment([r.left_center(), r.right_center()], Stroke::new(1.0, Color32::from_white_alpha(30)));
+    ui.add_space(4.0);
+}
+
+/// A menu panel drawing menu level `at`.
+pub(super) fn menu_frame<R>(ui: &mut Ui, t: &Tokens, at: At, add: impl FnOnce(&mut Ui) -> R) -> R {
+    egui::Frame::NONE
+        .fill(t.menu)
+        .corner_radius(CornerRadius::same(13))
+        .inner_margin(egui::Margin::same(8))
+        .shadow(egui::Shadow { offset: [0, 4], blur: 16, spread: 0, color: Color32::from_black_alpha(60) })
+        .show(ui, |ui| {
+            // As wide as its widest row asked for (labels run longer in some languages).
+            let w = ui.data(|d| d.get_temp::<f32>(width_key(ui))).unwrap_or(0.0).max(MENU_W);
+            ui.set_width(w);
+            ui.spacing_mut().item_spacing = vec2(0.0, 0.0);
+            let key = at_key(ui);
+            ui.data_mut(|d| d.insert_temp(key, at));
+            add(ui)
+        })
+        .inner
+}
+
+/// A menu's narrowest width.
+const MENU_W: f32 = 240.0;
+
+/// Where a menu remembers the width its rows need (its frame's ui), per language.
+fn width_key(ui: &Ui) -> Id {
+    ui.scope_id().with(("menu_w", i18n::current().map(|l| l.code)))
+}
+
+/// A row needs `w`: the menu widens to it from the next frame on.
+fn need_width(ui: &Ui, w: f32) {
+    let key = width_key(ui);
+    if ui.data(|d| d.get_temp::<f32>(key)).unwrap_or(0.0) < w {
+        ui.data_mut(|d| d.insert_temp(key, w));
+        ui.ctx().request_repaint();
+    }
+}
+
+pub(crate) fn item(ui: &mut Ui, label: &str, shortcut: &str, enabled: bool, checked: bool, t: &Tokens) -> bool {
+    indented_item(ui, label, shortcut, enabled, checked, 0.0, t)
+}
+
+/// A menu row whose label starts `indent` pixels further in (nested layers).
+pub(super) fn indented_item(ui: &mut Ui, label: &str, shortcut: &str, enabled: bool, checked: bool, indent: f32, t: &Tokens) -> bool {
+    let w = ui.available_width();
+    let (r, resp) = ui.allocate_exact_size(vec2(w, 28.0), Sense::click());
+    a11y::menu_item(&resp, label, shortcut, checked.then_some(true));
+    if !enabled {
+        a11y::disabled(&resp);
+    }
+    // The keyboard's item is highlighted like the hovered one.
+    a11y::own_focus(&resp);
+    let hov = plain_row_hover(ui, &resp) && enabled;
+    if hov {
+        ui.painter().rect_filled(r, CornerRadius::same(5), t.menu_hover);
+    }
+    let col = if enabled { t.menu_text } else { t.menu_dim };
+    if checked {
+        icons::paint(ui.painter(), Rect::from_center_size(pos2(r.min.x + 12.0, r.center().y), vec2(12.0, 12.0)), Icon::Check, col);
+    }
+    let galley = ui.painter().layout_no_wrap(label.to_string(), regular(12.0), col);
+    let keys = (!shortcut.is_empty())
+        .then(|| ui.painter().layout_no_wrap(pretty_shortcut(shortcut), regular(12.0), if hov { t.menu_text } else { t.menu_dim }));
+    need_width(ui, 28.0 + indent + galley.size().x + keys.as_ref().map_or(8.0, |k| 16.0 + k.size().x + 10.0));
+    let text_rect = Rect::from_min_max(pos2(r.min.x + 28.0 + indent, r.min.y), pos2(r.max.x - 8.0, r.max.y));
+    ui.painter().with_clip_rect(text_rect).galley(pos2(text_rect.min.x, r.center().y - galley.size().y / 2.0), galley, col);
+    if let Some(k) = keys {
+        ui.painter().galley(pos2(r.max.x - 10.0 - k.size().x, r.center().y - k.size().y / 2.0), k, col);
+    }
+    resp.clicked()
+}
+
+fn paint_submenu_row(ui: &mut Ui, r: Rect, label: &str, highlight: bool, t: &Tokens) {
+    if highlight {
+        ui.painter().rect_filled(r, CornerRadius::same(5), t.menu_hover);
+    }
+    let galley = ui.painter().layout_no_wrap(label.to_string(), regular(12.0), t.menu_text);
+    need_width(ui, 28.0 + galley.size().x + 28.0);
+    ui.painter().galley(pos2(r.min.x + 28.0, r.center().y - galley.size().y / 2.0), galley, t.menu_text);
+    icons::paint(ui.painter(), Rect::from_center_size(pos2(r.max.x - 12.0, r.center().y), vec2(12.0, 12.0)), Icon::ChevronRight, t.menu_text);
+}
diff --git a/crates/ui-egui/src/missing_fonts_tests.rs b/crates/ui-egui/src/missing_fonts_tests.rs
new file mode 100644
index 00000000..2b11260a
--- /dev/null
+++ b/crates/ui-egui/src/missing_fonts_tests.rs
@@ -0,0 +1,149 @@
+use figcraft_engine::Session;
+use serde_json::{Value, json};
+
+use crate::import_report::Report;
+use crate::layers_drag_tests::Ui;
+
+/// A saved file with text in `families` (the first two layers share the first family).
+fn saved(name: &str, families: &[&str]) -> String {
+    let mut s = Session::new();
+    for (i, f) in families.iter().chain(families.first()).enumerate() {
+        s.execute("text.create", &json!({"text": "Hamburgefonstiv", "x": 0, "y": 40 * i, "props": {"fontFamily": f}})).unwrap();
+    }
+    let path = std::env::temp_dir().join(format!("figcraft-missing-fonts-{name}-{}.figcraft", std::process::id()));
+    let path = path.to_string_lossy().into_owned();
+    s.execute("file.saveAs", &json!({"path": path})).unwrap();
+    path
+}
+
+/// The installed fonts are indexed, as the desktop app does at startup.
+fn fonts_indexed() -> bool {
+    figcraft_text::scan_system_fonts();
+    figcraft_text::installed_fonts_known()
+}
+
+fn listed(u: &Ui) -> Value {
+    u.app.inspect()["missingFonts"].clone()
+}
+
+#[test]
+fn opening_a_file_lists_its_missing_fonts_and_not_the_installed_ones() {
+    if !fonts_indexed() {
+        eprintln!("skipped: system fonts opted out");
+        return;
+    }
+    let installed = figcraft_text::family_names().into_iter().next();
+    let mut families = vec!["FigCraft Missing UI"];
+    families.extend(installed.as_deref());
+    let path = saved("open", &families);
+    let mut u = Ui::new(Session::new());
+    // Programmatic opens (control channel, MCP, scripts) never open the window.
+    u.app.run("file.open", json!({"path": path}));
+    u.frame(vec![]);
+    assert_eq!(listed(&u), Value::Null);
+    u.app.run("file.close", json!({}));
+
+    u.app.run_user("file.open", json!({"path": path}));
+    std::fs::remove_file(&path).unwrap();
+    u.frame(vec![]);
+    assert_eq!(listed(&u), json!({"families": [{"family": "FigCraft Missing UI", "layers": 2}], "indexing": false}));
+    u.frame(vec![]);
+    let shown = u.frame_output(vec![]).shapes;
+    assert!(crate::import_report_tests::shown_texts(shown).iter().any(|t| t == "2 text layers"));
+
+    // It goes with its file.
+    u.app.run("file.close", json!({}));
+    u.frame(vec![]);
+    assert_eq!(listed(&u), Value::Null);
+}
+
+#[test]
+fn a_file_without_missing_fonts_opens_no_window() {
+    if !fonts_indexed() {
+        eprintln!("skipped: system fonts opted out");
+        return;
+    }
+    let Some(installed) = figcraft_text::family_names().into_iter().next() else {
+        eprintln!("skipped: no fonts on this machine");
+        return;
+    };
+    let path = saved("clean", &[&installed]);
+    let mut u = Ui::new(Session::new());
+    u.app.run_user("file.open", json!({"path": path}));
+    std::fs::remove_file(&path).unwrap();
+    u.frame(vec![]);
+    assert_eq!(listed(&u), Value::Null);
+    assert!(u.app.ui.font_checks.is_empty(), "the check ran");
+}
+
+#[test]
+fn it_waits_for_the_import_report_to_close() {
+    if !fonts_indexed() {
+        eprintln!("skipped: system fonts opted out");
+        return;
+    }
+    let path = saved("report", &["FigCraft Missing Report"]);
+    let mut u = Ui::new(Session::new());
+    u.app.run_user("file.open", json!({"path": path}));
+    std::fs::remove_file(&path).unwrap();
+    let mut report =
+        Report::from_result("file.open", &json!({}), &json!({"warnings": ["Synthetic note"], "summary": {"name": "Synthetic"}})).unwrap();
+    report.uid = u.app.session.ds().unwrap().uid;
+    u.app.ui.import_report = Some(report);
+    u.frame(vec![]);
+    assert_eq!(listed(&u), Value::Null, "the import report comes first");
+    u.app.ui.import_report = None;
+    u.frame(vec![]);
+    assert_eq!(listed(&u)["families"][0]["family"], "FigCraft Missing Report");
+}
+
+#[test]
+fn text_menu_shows_the_window_for_the_file_in_front_even_with_nothing_missing() {
+    assert!(fonts_indexed());
+    let mut u = Ui::new(Session::new());
+    assert!(u.app.run("text.missingFonts", json!({})).is_some());
+    assert_eq!(listed(&u), json!({"families": [], "indexing": false}));
+    u.frame(vec![]);
+    let shown = u.frame_output(vec![]).shapes;
+    assert!(crate::import_report_tests::shown_texts(shown).iter().any(|t| t == "All the fonts this file uses are installed"));
+    let escape =
+        vec![egui::Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE }];
+    u.frame(escape);
+    assert_eq!(listed(&u), Value::Null, "Escape closes it");
+}
+
+#[test]
+fn asked_for_before_the_fonts_are_indexed_it_lists_them_once_they_are() {
+    assert!(fonts_indexed());
+    let path = saved("indexing", &["FigCraft Missing Indexing"]);
+    let mut u = Ui::new(Session::new());
+    u.app.run("file.open", json!({"path": path}));
+    std::fs::remove_file(&path).unwrap();
+    // As Text ▸ Missing fonts leaves it while the startup scan is still running.
+    let uid = u.app.session.ds().unwrap().uid;
+    u.app.ui.missing_fonts = Some(crate::missing_fonts::Shown { uid, families: Vec::new(), indexing: true });
+    u.frame(vec![]);
+    assert_eq!(listed(&u), json!({"families": [{"family": "FigCraft Missing Indexing", "layers": 2}], "indexing": false}));
+}
+
+#[test]
+fn placing_images_or_clearing_recents_does_not_bring_it_back() {
+    assert!(fonts_indexed());
+    let path = saved("place", &["FigCraft Missing Place"]);
+    let svg = std::env::temp_dir().join(format!("figcraft-missing-fonts-place-{}.svg", std::process::id()));
+    std::fs::write(&svg, r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="10" height="10"/></svg>"#).unwrap();
+    let mut u = Ui::new(Session::new());
+    u.app.run_user("file.open", json!({"path": path}));
+    u.frame(vec![]);
+    assert_eq!(listed(&u)["families"][0]["family"], "FigCraft Missing Place");
+    u.app.ui.missing_fonts = None;
+    // A placed SVG, the same file opened again (it only comes to the front), Clear recent.
+    assert!(u.app.run_user("file.import", json!({"path": svg.to_string_lossy()})).is_some());
+    assert!(u.app.run_user("file.open", json!({"path": path})).is_some());
+    u.app.run_user("file.openRecent", json!({"clear": true}));
+    std::fs::remove_file(&path).unwrap();
+    std::fs::remove_file(&svg).unwrap();
+    u.frame(vec![]);
+    assert!(u.app.ui.font_checks.is_empty());
+    assert_eq!(listed(&u), Value::Null);
+}
diff --git a/crates/ui-egui/src/open.rs b/crates/ui-egui/src/open.rs
new file mode 100644
index 00000000..4fe8b9bd
--- /dev/null
+++ b/crates/ui-egui/src/open.rs
@@ -0,0 +1,56 @@
+#[cfg(target_arch = "wasm32")]
+use super::services::browser_can_read;
+use super::services::{ReadFuture, unreadable};
+use super::*;
+
+/// The file types File ▸ Open and a drop on the home screen open.
+pub(crate) const OPEN_EXTENSIONS: &[&str] = &["figcraft", "fig", "sketch", "json", "svg", "png", "jpg", "jpeg", "webp", "gif", "tif", "tiff"];
+
+/// Whether `path` names a file type that opens as a document (the extension, in any case).
+pub(crate) fn opens(path: &Path) -> bool {
+    path.extension().and_then(OsStr::to_str).is_some_and(|e| OPEN_EXTENSIONS.iter().any(|x| x.eq_ignore_ascii_case(e)))
+}
+
+/// Whether `path` is a whole document (`.figcraft`, `.fig`, `.sketch`, file JSON) rather than an image or SVG:
+/// dropped on the canvas it opens as a file of its own instead of adding its pages to the open one.
+pub(crate) fn is_document(path: &Path) -> bool {
+    path.extension().and_then(OsStr::to_str).is_some_and(|e| ["figcraft", "fig", "sketch", "json"].iter().any(|x| x.eq_ignore_ascii_case(e)))
+}
+
+/// Reads the contents of dropped file `name` that has no file on disk to read by path.
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) fn dropped_bytes(f: &egui::DroppedFileHandle, name: &str) -> ReadFuture {
+    Box::pin(std::future::ready(f.bytes().map_err(|_| unreadable(name))))
+}
+
+/// Reads the contents of dropped file `name`; the browser hands them over asynchronously.
+#[cfg(target_arch = "wasm32")]
+pub(crate) fn dropped_bytes(f: &egui::DroppedFileHandle, name: &str) -> ReadFuture {
+    let (f, name) = (f.clone(), name.to_string());
+    Box::pin(async move {
+        if let Some(file) = f.web_file() {
+            browser_can_read(&name, file.size())?;
+        }
+        f.bytes_async().await.map_err(|_| unreadable(&name))
+    })
+}
+
+/// While files are dragged over the window: a tinted, outlined `rect` with `label` in its middle,
+/// over everything else, saying what a drop does there.
+pub(crate) fn drop_overlay(ctx: &egui::Context, rect: egui::Rect, label: &str) {
+    if ctx.input(|i| i.raw.hovered_files.is_empty()) {
+        return;
+    }
+    let t = theme::Tokens::get(ctx);
+    let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::unique("drop_overlay")));
+    let area = rect.shrink(4.0);
+    painter.rect_filled(area, egui::CornerRadius::same(8), t.accent.gamma_multiply(0.12));
+    painter.rect_stroke(area, egui::CornerRadius::same(8), egui::Stroke::new(2.0, theme::ACCENT), egui::StrokeKind::Inside);
+    let galley = painter.layout_no_wrap(label.to_owned(), theme::semibold(14.0), t.text);
+    let pill = egui::Rect::from_center_size(area.center(), galley.size() + egui::vec2(32.0, 16.0));
+    painter.rect_filled(pill, egui::CornerRadius::same(8), t.panel);
+    painter.rect_stroke(pill, egui::CornerRadius::same(8), egui::Stroke::new(1.0, theme::ACCENT), egui::StrokeKind::Inside);
+    painter.galley(pill.center() - galley.size() / 2.0, galley, t.text);
+    // Hovering sends no pointer events on every platform: keep the overlay current.
+    ctx.request_repaint();
+}
diff --git a/crates/ui-egui/src/padding_individual_tests.rs b/crates/ui-egui/src/padding_individual_tests.rs
new file mode 100644
index 00000000..bf076d48
--- /dev/null
+++ b/crates/ui-egui/src/padding_individual_tests.rs
@@ -0,0 +1,114 @@
+//! Individual padding in the Design panel, driven headless: the four side fields only
+//! appear once the toggle opens, and typing in one sets that side alone.
+
+use egui::accesskit::Role;
+use egui::{Event, Id, Key, Modifiers, Pos2, pos2};
+use figcraft_doc::NodeId;
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+
+/// An auto layout frame with uniform padding 10, selected.
+fn scene() -> (Ui, NodeId) {
+    let mut s = Session::new();
+    let f =
+        NodeId(
+            s.execute("frame.create", &json!({"x": 0, "y": 0, "width": 300, "height": 200, "props": {"layout": "horizontal", "padding": 10}}))
+                .unwrap()["id"]
+                .as_u64()
+                .unwrap(),
+        );
+    s.execute("select.set", &json!({"ids": [f]})).unwrap();
+    (Ui::new(s), f)
+}
+
+/// The frame's padding as `[top, right, bottom, left]`.
+fn padding(u: &Ui, f: NodeId) -> [f64; 4] {
+    u.app.session.doc().unwrap().node(f).unwrap().layout.clone().unwrap().padding
+}
+
+/// A full press-and-release at `p`, then settling one frame.
+fn click(u: &mut Ui, p: Pos2) {
+    u.button(p, true);
+    u.button(p, false);
+    u.frame(vec![]);
+}
+
+/// A press-and-release of Enter, committing the focused number field.
+fn enter(u: &mut Ui) {
+    u.frame(vec![
+        Event::Key { key: Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE },
+        Event::Key { key: Key::Enter, physical_key: None, pressed: false, repeat: false, modifiers: Modifiers::NONE },
+    ]);
+}
+
+/// The middle of the toggle button named `label`, found in the AccessKit tree.
+fn named_button(u: &mut Ui, label: &str) -> Pos2 {
+    u.ctx.enable_accesskit();
+    u.frame(vec![]);
+    let out = u.frame_output(vec![]);
+    let nodes = out.platform_output.accesskit_update.expect("an AccessKit update").nodes;
+    let n = nodes.iter().map(|(_, n)| n).find(|n| n.role() == Role::Button && n.label() == Some(label)).expect(label);
+    let b = n.bounds().expect("bounds");
+    pos2(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32)
+}
+
+/// The side fields stay hidden until the toggle opens, then typing in one sets
+/// that side alone in a single undo step.
+#[test]
+fn side_fields_show_only_once_the_toggle_opens_and_set_one_side() {
+    let (mut u, f) = scene();
+    assert_eq!(padding(&u, f), [10.0; 4]);
+    // Shut: no per-side fields.
+    assert!(u.ctx.read_response(Id::unique(("padding", 0)).with("field")).is_none(), "top field hidden until toggled");
+    // Click the toggle: the four sides appear.
+    let t = named_button(&mut u, "Individual padding");
+    click(&mut u, t);
+    let top = u.ctx.read_response(Id::unique(("padding", 0)).with("field")).expect("top field shows").rect.center();
+    assert!(u.ctx.read_response(Id::unique(("padding", 3)).with("field")).is_some(), "left field shows");
+    // Typing in the top field sets only the top, in one undo step.
+    let history = u.app.session.undo_depth().0;
+    click(&mut u, top);
+    u.frame(vec![Event::Text("8".into())]);
+    enter(&mut u);
+    u.frame(vec![]);
+    assert_eq!(padding(&u, f), [8.0, 10.0, 10.0, 10.0]);
+    assert_eq!(u.app.session.undo_depth().0, history + 1);
+    u.app.run("edit.undo", json!({}));
+    assert_eq!(padding(&u, f), [10.0; 4]);
+}
+
+/// The middle of the shut pair field with accessible name `label`.
+fn named_field(u: &mut Ui, label: &str) -> Pos2 {
+    u.ctx.enable_accesskit();
+    u.frame(vec![]);
+    let out = u.frame_output(vec![]);
+    let nodes = out.platform_output.accesskit_update.expect("an AccessKit update").nodes;
+    let n = nodes.iter().map(|(_, n)| n).find(|n| n.role() != Role::Button && n.label() == Some(label)).expect(label);
+    let b = n.bounds().expect("bounds");
+    pos2(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32)
+}
+
+/// The shut pair fields read Mixed when their sides disagree and edit their own axis: horizontal
+/// touches left and right only, vertical touches top and bottom only.
+#[test]
+fn shut_pair_fields_edit_their_own_axis() {
+    let (mut u, f) = scene();
+    u.app.run("node.set", json!({"ids": [f], "props": {"paddingLeft": 16.0, "paddingRight": 54.0}}));
+    assert_eq!(padding(&u, f), [10.0, 54.0, 10.0, 16.0]);
+    let shown = crate::live_tests::texts(&crate::live_tests::flat(&u.frame_output(vec![]).shapes));
+    assert!(shown.iter().any(|(t, _, _)| t == "Mixed"), "sides that disagree read Mixed: {shown:?}");
+    let h = named_field(&mut u, "Horizontal padding");
+    click(&mut u, h);
+    u.frame(vec![Event::Text("20".into())]);
+    enter(&mut u);
+    u.frame(vec![]);
+    assert_eq!(padding(&u, f), [10.0, 20.0, 10.0, 20.0]);
+    let v = named_field(&mut u, "Vertical padding");
+    click(&mut u, v);
+    u.frame(vec![Event::Text("7".into())]);
+    enter(&mut u);
+    u.frame(vec![]);
+    assert_eq!(padding(&u, f), [7.0, 20.0, 7.0, 20.0]);
+}
diff --git a/crates/ui-egui/src/palette_tests.rs b/crates/ui-egui/src/palette_tests.rs
new file mode 100644
index 00000000..b9827867
--- /dev/null
+++ b/crates/ui-egui/src/palette_tests.rs
@@ -0,0 +1,186 @@
+//! The Actions palette, driven headless: runs from it record recents (newest first, capped),
+//! sections group commands by menu, a search covers every command with the best matches first,
+//! Up/Down move the highlight and Enter runs it, gone entries drop out of Recents, a used plugin
+//! resolves back to a row, and a press outside the panel closes it.
+
+use egui::{Event, Key, Modifiers, Pos2};
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+
+#[test]
+fn palette_runs_record_recents_newest_first_and_capped() {
+    let mut u = Ui::new(Session::new());
+    // Menus, shortcuts and context menus don't touch the palette's Recents.
+    crate::menus::invoke(&mut u.app, "view.zoomIn");
+    assert!(u.app.session.prefs.recent_actions.is_empty(), "only the palette records recents");
+    for id in ["view.zoomIn", "view.zoomOut", "edit.copyAsText", "style.list", "edit.findReplace", "edit.copyAsCss", "view.zoomIn"] {
+        crate::menus::run_action(&mut u.app, &format!("command:{id}"));
+    }
+    let r = &u.app.session.prefs.recent_actions;
+    assert_eq!(r.len(), figcraft_engine::MAX_RECENT_ACTIONS, "recents are capped: {r:?}");
+    assert_eq!(r[0], "command:view.zoomIn", "a re-run moves to the front: {r:?}");
+    assert_eq!(r.iter().filter(|k| k.as_str() == "command:view.zoomIn").count(), 1, "no duplicates: {r:?}");
+    assert!(!r.contains(&"command:view.zoomOut".to_string()), "the oldest drops out: {r:?}");
+}
+
+#[test]
+fn sections_group_by_menu_in_catalog_order() {
+    let groups = crate::menus::command_sections("");
+    assert!(!groups.is_empty(), "the catalog has commands");
+    assert_eq!(groups[0].0, "File", "catalog order starts at File");
+    for (group, rows) in &groups {
+        assert!(!rows.is_empty(), "{group} has no rows");
+        for row in rows {
+            assert!(row.key.starts_with("command:"), "unexpected key {}", row.key);
+        }
+    }
+    let names: Vec<&str> = groups.iter().map(|(g, _)| g.as_str()).collect();
+    assert!(names.contains(&"File") && names.contains(&"Edit"), "menus group: {names:?}");
+    assert!(!names.iter().any(|g| g.starts_with("Plugins")), "plugins have their own tab");
+}
+
+#[test]
+fn query_filters_to_matches() {
+    let groups = crate::menus::command_sections("save");
+    let labels: Vec<&str> = groups.iter().flat_map(|(_, rows)| rows.iter().map(|r| r.label.as_str())).collect();
+    assert!(!labels.is_empty(), "something matches 'save'");
+    assert!(labels.iter().all(|l| l.to_lowercase().contains("save")), "only matches: {labels:?}");
+    assert!(crate::menus::command_sections("zzz-no-such-action").iter().all(|(_, r)| r.is_empty()));
+}
+
+#[test]
+fn gone_entries_drop_out_of_recents() {
+    let u = Ui::new(Session::new());
+    assert!(crate::menus::recent_row(&u.app, "command:nope.nope", "").is_none(), "gone commands drop out");
+    assert!(crate::menus::recent_row(&u.app, "plugin:nope.nope/nope", "").is_none(), "gone plugins drop out");
+    assert!(crate::menus::recent_row(&u.app, "widget:nope", "").is_none(), "gone widgets drop out");
+}
+
+/// A used plugin (API 4, several commands) resolves back to a Recents row.
+#[test]
+fn used_plugin_resolves_to_a_recent_row() {
+    let mut u = Ui::new(Session::new());
+    let plugin: figcraft_engine::plugins::InstalledPlugin = serde_json::from_value(json!({
+        "manifest": {
+            "id": "dev.local.solar-icons",
+            "name": "Solar icons",
+            "main": "solar_icons.wasm",
+            "api": 4,
+            "commands": [
+                {"id": "panel", "label": "Panel"},
+                {"id": "grid", "label": "Grid"},
+            ],
+        },
+    }))
+    .unwrap();
+    u.app.session.prefs.plugins.push(plugin);
+    crate::menus::record_recent(&mut u.app, "plugin:dev.local.solar-icons/panel");
+    let row = crate::menus::recent_row(&u.app, "plugin:dev.local.solar-icons/panel", "").expect("a used plugin stays in Recents");
+    assert_eq!(row.label, "Solar icons — Panel");
+    assert!(crate::menus::recent_row(&u.app, "plugin:dev.local.solar-icons/panel", "zzz").is_none(), "the query filters recents");
+}
+
+/// A press outside the panel closes it; the opening press is spared once.
+#[test]
+fn outside_press_closes_the_panel() {
+    let mut u = Ui::new(Session::new());
+    u.app.ui.palette = Some(String::new());
+    u.app.ui.palette_armed = true;
+    // The opening press: spared, and disarmed.
+    u.button(Pos2::new(720.0, 20.0), true);
+    u.button(Pos2::new(720.0, 20.0), false);
+    assert!(u.app.ui.palette.is_some(), "the opening press is spared");
+    // The next press outside: closed.
+    u.button(Pos2::new(720.0, 20.0), true);
+    u.button(Pos2::new(720.0, 20.0), false);
+    assert!(u.app.ui.palette.is_none(), "an outside press closes the panel");
+    // One click is enough: the spare expires on frames without a press.
+    u.app.ui.palette = Some(String::new());
+    u.app.ui.palette_armed = true;
+    u.frame(vec![]);
+    u.button(Pos2::new(720.0, 20.0), true);
+    u.button(Pos2::new(720.0, 20.0), false);
+    assert!(u.app.ui.palette.is_none(), "a single outside press closes the panel");
+}
+
+fn rows(groups: &[(String, Vec<crate::menus::ActionRow>)]) -> Vec<&crate::menus::ActionRow> {
+    groups.iter().flat_map(|(_, rows)| rows).collect()
+}
+
+/// A search reaches commands no menu lists (in an "Other" group), not just menu items.
+#[test]
+fn search_covers_every_command() {
+    let menu = figcraft_engine::catalog::MENU;
+    let spec = figcraft_engine::all_commands().iter().find(|c| !menu.iter().any(|m| m.id == c.id)).expect("a command no menu lists");
+    let groups = crate::menus::command_sections(spec.id);
+    let key = format!("command:{}", spec.id);
+    let group = groups.iter().find(|(_, rows)| rows.iter().any(|r| r.key == key)).map(|(g, _)| g.as_str());
+    assert_eq!(group, Some("Other"), "{} is found: {:?}", spec.id, groups.iter().map(|(g, _)| g).collect::<Vec<_>>());
+    // Without a query the palette lists the menus' items only.
+    assert!(rows(&crate::menus::command_sections("")).iter().all(|r| r.key != key));
+}
+
+/// Labels starting with the query come first, the shortest first; the rest are capped.
+#[test]
+fn search_ranks_prefix_matches_first() {
+    let groups = crate::menus::command_sections("zoom");
+    let hits = rows(&groups);
+    let first = hits.first().expect("something matches 'zoom'");
+    assert!(first.label.to_lowercase().starts_with("zoom"), "a prefix match leads: {}", first.label);
+    let shortest = hits.iter().filter(|r| r.label.to_lowercase().starts_with("zoom")).map(|r| r.label.chars().count()).min();
+    assert_eq!(Some(first.label.chars().count()), shortest, "the shortest prefix match leads");
+    assert!(rows(&crate::menus::command_sections("e")).len() <= 60, "a broad search is capped");
+}
+
+fn key(u: &mut Ui, k: Key) {
+    u.frame(vec![
+        Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE },
+        Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers: Modifiers::NONE },
+    ]);
+}
+
+/// Up and Down move the highlight (it stops at the ends); Enter runs the highlighted row.
+#[test]
+fn arrows_move_the_highlight_and_enter_runs_it() {
+    let mut u = Ui::new(Session::new());
+    crate::menus::set_palette(&mut u.app.ui, true);
+    u.frame(vec![]);
+    u.frame(vec![Event::Text("zoom".into())]);
+    assert_eq!(u.app.ui.palette.as_deref(), Some("zoom"));
+    assert_eq!(u.app.ui.palette_hi, 0, "a search starts at the first row");
+    key(&mut u, Key::ArrowUp);
+    assert_eq!(u.app.ui.palette_hi, 0, "it stops at the top");
+    key(&mut u, Key::ArrowDown);
+    key(&mut u, Key::ArrowDown);
+    key(&mut u, Key::ArrowUp);
+    assert_eq!(u.app.ui.palette_hi, 1);
+    let want = rows(&crate::menus::palette_sections(&u.app, "zoom", crate::menus::PaletteTab::All)).get(1).map(|r| r.key.clone()).expect("two rows");
+    key(&mut u, Key::Enter);
+    assert!(u.app.ui.palette.is_none(), "Enter runs a row and closes the palette");
+    assert_eq!(u.app.session.prefs.recent_actions.first(), Some(&want), "the highlighted row ran");
+}
+
+/// A trackpad tap sends the press and the release in one frame; the press must not close a
+/// context menu the release just opened, but a later outside press still does.
+#[test]
+fn context_menu_survives_a_same_frame_tap() {
+    let mut u = Ui::new(Session::new());
+    let p = Pos2::new(1000.0, 600.0);
+    let b = |pressed| Event::PointerButton { pos: p, button: egui::PointerButton::Secondary, pressed, modifiers: Default::default() };
+    u.frame(vec![Event::PointerMoved(p), b(true), b(false)]);
+    assert!(u.app.ui.context_menu.is_some(), "the opening tap's press is spared");
+    u.frame(vec![]);
+    assert!(u.app.ui.context_menu.is_some(), "the menu stays open");
+    // A second tap elsewhere while the menu is open replaces it and survives too.
+    let q = Pos2::new(600.0, 400.0);
+    let b2 = |pressed| Event::PointerButton { pos: q, button: egui::PointerButton::Secondary, pressed, modifiers: Default::default() };
+    u.frame(vec![Event::PointerMoved(q), b2(true), b2(false)]);
+    u.frame(vec![]);
+    assert!(u.app.ui.context_menu.is_some(), "a repeat tap keeps the replaced menu open");
+    let far = Pos2::new(100.0, 100.0);
+    u.button(far, true);
+    u.button(far, false);
+    assert!(u.app.ui.context_menu.is_none(), "a later outside press closes the menu");
+}
diff --git a/crates/ui-egui/src/panel_remove_tests.rs b/crates/ui-egui/src/panel_remove_tests.rs
index 299a4b6f..bc48207c 100644
--- a/crates/ui-egui/src/panel_remove_tests.rs
+++ b/crates/ui-egui/src/panel_remove_tests.rs
@@ -1,5 +1,6 @@
-//! Removing fill, effect and layout grid rows in the Design panel, driven through egui headless: an
-//! open colour picker and open settings stay with their items, and go when their item goes.
+//! Adding and removing fill, effect and layout grid rows in the Design panel, driven through egui headless:
+//! adding a paint opens its colour picker; an open colour picker and open settings stay with their items,
+//! and go when their item goes.
 
 use egui::{Event, Id, Pos2};
 use figcraft_doc::NodeId;
@@ -9,6 +10,7 @@ use serde_json::json;
 use crate::colorpicker::PickerTarget;
 use crate::layers_drag_tests::Ui;
 use crate::list_drag::grip_id;
+use crate::live_tests::{flat, text_center};
 
 fn id(v: serde_json::Value) -> NodeId {
     NodeId(v["id"].as_u64().unwrap())
@@ -34,6 +36,7 @@ fn remove_button(u: &mut Ui, list: &str, index: usize) -> Pos2 {
         }
         let wheel = Event::MouseWheel {
             unit: egui::MouseWheelUnit::Point,
+            source: egui::MouseWheelSource::Unknown,
             delta: egui::vec2(0.0, -100.0),
             phase: egui::TouchPhase::Move,
             modifiers: Default::default(),
@@ -62,10 +65,13 @@ fn remove_button(u: &mut Ui, list: &str, index: usize) -> Pos2 {
         .unwrap_or_else(|| panic!("no Remove button in {list} row {index} {row:?} {all:?}"))
 }
 
+/// Read a temporary boolean open-settings flag keyed by `salt` and row index.
 fn flag(u: &Ui, salt: &'static str, i: usize) -> bool {
-    u.ctx.data(|d| d.get_temp::<bool>(Id::new((salt, i)))).unwrap_or(false)
+    u.ctx.data(|d| d.get_temp::<bool>(Id::unique((salt, i)))).unwrap_or(false)
 }
 
+/// Asserts removing a fill keeps the open picker on the surviving paint (with its index
+/// shifted), and removing the paint being edited closes the picker.
 #[test]
 fn removing_a_fill_keeps_the_picker_on_its_paint() {
     let mut s = Session::new();
@@ -77,7 +83,7 @@ fn removing_a_fill_keeps_the_picker_on_its_paint() {
     let mut u = Ui::new(s);
     u.ctx.enable_accesskit();
     // Green's swatch, then red's Remove: the picker follows green to index 0.
-    let sw = u.ctx.read_response(Id::new(("swatch", true, 1usize))).unwrap().rect.center();
+    let sw = u.ctx.read_response(Id::unique(("swatch", true, 1usize))).unwrap().rect.center();
     click(&mut u, sw);
     assert_eq!(u.app.ui.picker, Some(PickerTarget::Paint { fills: true, index: 1, ids: vec![r] }));
     let rm = remove_button(&mut u, "fills", 0);
@@ -91,6 +97,8 @@ fn removing_a_fill_keeps_the_picker_on_its_paint() {
     assert_eq!(u.app.ui.picker, None);
 }
 
+/// Asserts removing effects or grids moves open settings and an open colour picker to the
+/// surviving row, or closes them when their own row is removed.
 #[test]
 fn removing_effects_and_grids_keeps_open_settings_with_their_rows() {
     let mut s = Session::new();
@@ -104,7 +112,7 @@ fn removing_effects_and_grids_keeps_open_settings_with_their_rows() {
     let mut u = Ui::new(s);
     u.ctx.enable_accesskit();
     // Effect 2's settings open and its colour in the picker; effect 0 goes.
-    u.ctx.data_mut(|d| d.insert_temp(Id::new(("fx_open", 2usize)), true));
+    u.ctx.data_mut(|d| d.insert_temp(Id::unique(("fx_open", 2usize)), true));
     u.app.ui.picker = Some(PickerTarget::Effect { ids: vec![f], index: 2, secondary: false });
     let rm = remove_button(&mut u, "effects", 0);
     click(&mut u, rm);
@@ -117,9 +125,70 @@ fn removing_effects_and_grids_keeps_open_settings_with_their_rows() {
     assert!(!flag(&u, "fx_open", 0) && !flag(&u, "fx_open", 1));
     assert_eq!(u.app.ui.picker, None);
     // Grid 1's settings open; grid 0 goes.
-    u.ctx.data_mut(|d| d.insert_temp(Id::new(("grid_open", 1usize)), true));
+    u.ctx.data_mut(|d| d.insert_temp(Id::unique(("grid_open", 1usize)), true));
     let rm = remove_button(&mut u, "grids", 0);
     click(&mut u, rm);
     assert_eq!(u.app.session.doc().unwrap().node(f).unwrap().grids.len(), 1);
     assert!(flag(&u, "grid_open", 0) && !flag(&u, "grid_open", 1));
 }
+
+/// The centre of the button labelled `label` (found in the AccessKit tree).
+fn button(u: &mut Ui, label: &str) -> Pos2 {
+    let out = u.frame_output(vec![]);
+    let b = out.platform_output.accesskit_update.unwrap().nodes.into_iter().find(|(_, n)| n.label() == Some(label)).and_then(|(_, n)| n.bounds());
+    let b = b.unwrap_or_else(|| panic!("no {label:?} button"));
+    Pos2::new(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32)
+}
+
+#[test]
+fn adding_a_fill_or_stroke_opens_the_color_picker() {
+    let mut s = Session::new();
+    let r = id(s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 50, "height": 50})).unwrap());
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    let mut u = Ui::new(s);
+    u.ctx.enable_accesskit();
+    assert_eq!(u.app.ui.picker, None);
+
+    let add_fill = button(&mut u, "Add fill");
+    click(&mut u, add_fill);
+    assert_eq!(u.app.ui.picker, Some(PickerTarget::Paint { fills: true, index: 1, ids: vec![r] }));
+
+    let add_stroke = button(&mut u, "Add stroke");
+    click(&mut u, add_stroke);
+    assert_eq!(u.app.ui.picker, Some(PickerTarget::Paint { fills: false, index: 0, ids: vec![r] }));
+}
+
+#[test]
+fn an_empty_sections_header_adds_its_item_but_a_full_one_only_adds_from_the_plus() {
+    let mut s = Session::new();
+    let r = id(s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 50, "height": 50})).unwrap());
+    s.execute("select.set", &json!({"ids": [r]})).unwrap();
+    let mut u = Ui::new(s);
+    // Nothing is stroked yet: clicking anywhere on the Stroke header adds one.
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    click(&mut u, text_center(&shapes, "Stroke"));
+    assert_eq!(u.app.session.doc().unwrap().node(r).unwrap().strokes.len(), 1);
+    // It has a stroke now: the header is no longer a button of its own.
+    u.app.ui.picker = None;
+    u.frame(vec![]);
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    click(&mut u, text_center(&shapes, "Stroke"));
+    assert_eq!(u.app.session.doc().unwrap().node(r).unwrap().strokes.len(), 1);
+}
+
+#[test]
+fn adding_a_fill_to_mixed_fills_opens_no_picker() {
+    let mut s = Session::new();
+    let a = id(s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 50, "height": 50})).unwrap());
+    let b = id(s.execute("shape.rectangle", &json!({"x": 60, "y": 0, "width": 50, "height": 50})).unwrap());
+    s.execute("fill.add", &json!({"ids": [b]})).unwrap();
+    s.execute("select.set", &json!({"ids": [a, b]})).unwrap();
+    let mut u = Ui::new(s);
+    u.ctx.enable_accesskit();
+
+    let add_fill = button(&mut u, "Add fill");
+    click(&mut u, add_fill);
+    let doc = u.app.session.doc().unwrap();
+    assert_eq!((doc.node(a).unwrap().fills.len(), doc.node(b).unwrap().fills.len()), (2, 3));
+    assert_eq!(u.app.ui.picker, None);
+}
diff --git a/crates/ui-egui/src/panel_reorder_tests.rs b/crates/ui-egui/src/panel_reorder_tests.rs
index 00f969b5..ffeb948e 100644
--- a/crates/ui-egui/src/panel_reorder_tests.rs
+++ b/crates/ui-egui/src/panel_reorder_tests.rs
@@ -73,6 +73,8 @@ fn escape_cancels_a_row_drag() {
     assert_eq!(u.app.session.ds().unwrap().selection, [r], "the Escape only cancels the drag");
 }
 
+/// Asserts effect and layout-grid rows reorder by drag, while a mixed fill list exposes no
+/// drag handle.
 #[test]
 fn effects_and_grids_drag_too_and_mixed_lists_dont() {
     let (mut u, r) = setup();
@@ -94,6 +96,7 @@ fn effects_and_grids_drag_too_and_mixed_lists_dont() {
     // The layout grid section is below the fold: scroll the panel.
     let wheel = Event::MouseWheel {
         unit: egui::MouseWheelUnit::Point,
+        source: egui::MouseWheelSource::Unknown,
         delta: egui::vec2(0.0, -400.0),
         phase: egui::TouchPhase::Move,
         modifiers: Default::default(),
diff --git a/crates/ui-egui/src/panel_width_tests.rs b/crates/ui-egui/src/panel_width_tests.rs
index a5a84d04..6f3eacf7 100644
--- a/crates/ui-egui/src/panel_width_tests.rs
+++ b/crates/ui-egui/src/panel_width_tests.rs
@@ -51,8 +51,9 @@ fn drag(u: &mut Ui, from: Pos2, to: Pos2) {
 }
 
 fn double_click(u: &mut Ui, p: Pos2) {
-    // Well after any earlier click (a third quick click isn't a double-click).
-    for _ in 0..40 {
+    // Well after any earlier click (a third quick click, within twice the platform's 0.5 s
+    // double-click window, isn't a double-click).
+    for _ in 0..70 {
         u.frame(vec![]);
     }
     for _ in 0..2 {
@@ -67,16 +68,17 @@ fn panels_fit_the_window() {
     let (l0, l1, r0, r1) = (*LEFT_PANEL.start(), *LEFT_PANEL.end(), *RIGHT_PANEL.start(), *RIGHT_PANEL.end());
     // (room beside the icon rail, left asked (none: closed), right asked) → (left, right) drawn
     let rows = [
-        ((1384.0, Some(240.0), 240.0), (240.0, 240.0), "as asked in a wide window"),
-        ((1384.0, Some(100.0), 100.0), (l0, r0), "never narrower than their least"),
-        ((1384.0, Some(900.0), 900.0), (l1, r1), "never wider than their most"),
-        ((1384.0, None, 300.0), (0.0, 300.0), "the left panel closed"),
-        ((744.0, Some(240.0), 240.0), (240.0, 240.0), "the smallest window with the default widths"),
-        ((744.0, Some(480.0), 480.0), (l0, 744.0 - l0 - CANVAS_MIN), "the smallest window: the left panel gives way first, then the right"),
-        ((744.0, Some(480.0), 240.0), (744.0 - 240.0 - CANVAS_MIN, 240.0), "the left panel gives the canvas its room"),
-        ((744.0, None, 480.0), (0.0, 480.0), "with the left panel closed the right one has room"),
-        ((300.0, Some(240.0), 240.0), (l0, r0), "a window smaller than any layout: the least widths"),
-        ((1384.0, Some(f32::NAN), f32::INFINITY), (PANEL_DEFAULT, PANEL_DEFAULT), "junk widths: the default"),
+        ((1384.0, Some(240.0), Some(240.0)), (240.0, 240.0), "as asked in a wide window"),
+        ((1384.0, Some(100.0), Some(100.0)), (l0, r0), "never narrower than their least"),
+        ((1384.0, Some(900.0), Some(900.0)), (l1, r1), "never wider than their most"),
+        ((1384.0, None, Some(300.0)), (0.0, 300.0), "the left panel closed"),
+        ((744.0, Some(240.0), Some(240.0)), (240.0, 240.0), "the smallest window with the default widths"),
+        ((744.0, Some(480.0), Some(480.0)), (l0, 744.0 - l0 - CANVAS_MIN), "the smallest window: the left panel gives way first, then the right"),
+        ((744.0, Some(480.0), Some(240.0)), (744.0 - 240.0 - CANVAS_MIN, 240.0), "the left panel gives the canvas its room"),
+        ((744.0, None, Some(480.0)), (0.0, 480.0), "with the left panel closed the right one has room"),
+        ((300.0, Some(240.0), Some(240.0)), (l0, r0), "a window smaller than any layout: the least widths"),
+        ((1384.0, Some(f32::NAN), Some(f32::INFINITY)), (PANEL_DEFAULT, PANEL_DEFAULT), "junk widths: the default"),
+        ((744.0, Some(480.0), None), (480.0, 0.0), "the right panel closed (a board's): the left one keeps its width"),
     ];
     for ((avail, left, right), want, why) in rows {
         assert_eq!(fit_panels(avail, left, right), want, "{why}");
@@ -85,7 +87,7 @@ fn panels_fit_the_window() {
     for avail in [744.0, 900.0, 1384.0] {
         for left in [None, Some(l0), Some(300.0), Some(l1)] {
             for right in [r0, 333.0, r1] {
-                let (l, r) = fit_panels(avail, left, right);
+                let (l, r) = fit_panels(avail, left, Some(right));
                 assert!(avail - l - r >= CANVAS_MIN, "{avail} {left:?} {right}: canvas {}", avail - l - r);
             }
         }
@@ -228,3 +230,36 @@ fn the_smallest_window_keeps_its_canvas_whatever_the_widths() {
         assert_eq!((app.ui.left_width, app.ui.right_width), asked, "the widths asked for come back in a wider window");
     }
 }
+
+/// A phone-sized window: the canvas has the whole width, and each side panel opens alone over it,
+/// leaving the strip with the panel buttons. A wide window ignores the choice.
+#[test]
+fn a_narrow_window_shows_one_side_panel_at_a_time() {
+    use crate::MobilePanel;
+    let ctx = egui::Context::default();
+    let mut app = FigApp::new(Session::new(), Box::new(NoServices));
+    let mut k = 0.0;
+    let mut canvas_width = |app: &mut FigApp, size: egui::Vec2| {
+        for _ in 0..4 {
+            k += 1.0 / 60.0;
+            let input = RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, size)), time: Some(k), ..Default::default() };
+            ctx.run_ui(input, |ui| app.ui(ui)).textures_delta.clear();
+        }
+        app.canvas.rect.width()
+    };
+    let phone = vec2(390.0, 844.0);
+    assert!(app.session.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 300, "height": 200})).is_ok());
+    assert!(canvas_width(&mut app, phone) >= 380.0, "closed panels leave the whole width");
+    for side in [MobilePanel::Left, MobilePanel::Right] {
+        app.ui.mobile_panel = Some(side);
+        let w = canvas_width(&mut app, phone);
+        assert!((1.0..=60.0).contains(&w), "{side:?}: the open panel leaves {w}");
+    }
+    // A command that opens the left panel opens it on a phone too, in place of the right one.
+    app.run("view.assets", json!({}));
+    let w = canvas_width(&mut app, phone);
+    assert!((1.0..=60.0).contains(&w) && app.ui.mobile_panel == Some(MobilePanel::Left), "view.assets leaves {w}");
+    app.ui.mobile_panel = Some(MobilePanel::Right);
+    let wide = canvas_width(&mut app, vec2(1440.0, 900.0));
+    assert!(wide > 600.0 && wide < 1100.0, "a wide window shows both panels beside the canvas ({wide})");
+}
diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs
new file mode 100644
index 00000000..8dd0df07
--- /dev/null
+++ b/crates/ui-egui/src/panels.rs
@@ -0,0 +1,20 @@
+pub mod assets_panel;
+pub mod component_panel;
+pub mod dev_compare;
+pub mod dev_mode;
+pub mod export_panel;
+pub mod frame_presets;
+pub mod layers;
+pub mod layout_panel;
+pub mod list_drag;
+pub mod proto_editor;
+pub mod proto_panel;
+pub mod right;
+pub mod scale_panel;
+pub mod section_panel;
+pub mod selection_colors;
+pub mod shortcuts_panel;
+pub mod typography;
+pub mod variable_ui;
+pub mod vector_panel;
+pub mod versions;
diff --git a/crates/ui-egui/src/assets_panel.rs b/crates/ui-egui/src/panels/assets_panel.rs
similarity index 90%
rename from crates/ui-egui/src/assets_panel.rs
rename to crates/ui-egui/src/panels/assets_panel.rs
index f8ea18e0..db0cc0f7 100644
--- a/crates/ui-egui/src/assets_panel.rs
+++ b/crates/ui-egui/src/panels/assets_panel.rs
@@ -164,8 +164,9 @@ enum Act {
     Hide(NodeId, bool),
 }
 
+/// Stable egui id for the assets drag payload.
 fn drag_id() -> Id {
-    Id::new("asset_drag")
+    Id::unique("asset_drag")
 }
 
 /// Whether component `id` has the same layers in two versions of a document (layers an edit
@@ -195,19 +196,20 @@ pub(crate) fn thumbnail(ctx: &egui::Context, doc: &Document, id: NodeId, px: f32
     Some(ctx.load_texture(format!("asset-thumb-{}", id.0), img, egui::TextureOptions::LINEAR))
 }
 
-/// The pixels a thumbnail shows. A slice paints nothing itself, so it shows the page content
-/// under it, exactly as exporting one does (`figcraft_engine::cmd::file::drawn_layers`): without
-/// this a slice's preview is a blank checkerboard next to a correct export.
+/// The pixels a thumbnail shows. A slice paints nothing itself, so it shows the content under it
+/// that exporting it with its first export setting writes (`figcraft_engine::cmd::file::drawn_layers`):
+/// without this a slice's preview is a blank checkerboard next to a correct export.
 pub(crate) fn thumbnail_pixmap(doc: &Document, id: NodeId, px: f32) -> Option<figcraft_render::Pixmap> {
-    let slice = doc.node(id).is_some_and(|n| matches!(n.kind, NodeKind::Slice));
-    let b = if slice { doc.world_bounds(id)? } else { figcraft_render::export_bounds(doc, id)? };
+    let slice = doc.node(id).filter(|n| matches!(n.kind, NodeKind::Slice));
+    let b = if slice.is_some() { doc.world_bounds(id)? } else { figcraft_render::export_bounds(doc, id)? };
     let side = b.width().max(b.height());
     if !(side.is_finite() && side > 0.0) {
         return None;
     }
     let scale = (f64::from(px) / side).min(2.0);
-    if slice {
-        let layers = doc.page_of(id).and_then(|p| doc.node(p)).map(|p| p.children.clone()).unwrap_or_default();
+    if let Some(n) = slice {
+        let setting = n.exports.first().cloned().unwrap_or_default();
+        let layers = figcraft_engine::cmd::file::drawn_layers(doc, &[id], &setting);
         return figcraft_render::render_area(doc, &layers, b, scale);
     }
     figcraft_render::render_node(doc, id, scale)
@@ -275,7 +277,7 @@ fn refresh_libraries(app: &mut FigApp, ui: &Ui) {
         return;
     }
     let paths: Vec<String> = doc.libraries.enabled.iter().map(|l| l.path.clone()).collect();
-    let id = Id::new("asset_libraries_checked");
+    let id = Id::unique("asset_libraries_checked");
     let now = ui.input(|i| i.time);
     let last: Option<f64> = ui.data(|d| d.get_temp(id));
     if last.is_none_or(|l| now - l >= LIBRARY_REFRESH) {
@@ -284,7 +286,7 @@ fn refresh_libraries(app: &mut FigApp, ui: &Ui) {
         }
         ui.data_mut(|d| d.insert_temp(id, now));
         // Team libraries: in the background, at once for one not fetched yet.
-        let sid = Id::new("asset_server_libraries_checked");
+        let sid = Id::unique("asset_server_libraries_checked");
         let fetched: Option<f64> = ui.data(|d| d.get_temp(sid));
         let unread = paths.iter().any(|p| is_server_link(p) && app.session.libraries.cached(p).is_none());
         if paths.iter().any(|p| is_server_link(p)) && (unread || fetched.is_none_or(|l| now - l >= SERVER_REFRESH)) {
@@ -298,7 +300,7 @@ fn refresh_libraries(app: &mut FigApp, ui: &Ui) {
 /// The search field with the libraries button; returns the lowercase query.
 fn search_row(app: &mut FigApp, ui: &mut Ui, w: f32) -> String {
     let t = Tokens::get(ui.ctx());
-    let filter_id = Id::new("asset_filter");
+    let filter_id = Id::unique("asset_filter");
     let mut filter: String = ui.data(|d| d.get_temp(filter_id)).unwrap_or_default();
     let (fr, _) = ui.allocate_exact_size(vec2(w, 40.0), Sense::hover());
     let field = Rect::from_min_max(pos2(fr.min.x + 12.0, fr.min.y + 8.0), pos2(fr.max.x - 44.0, fr.max.y - 4.0));
@@ -308,7 +310,7 @@ fn search_row(app: &mut FigApp, ui: &mut Ui, w: f32) -> String {
     let mut child = ui.new_child(egui::UiBuilder::new().max_rect(te_rect));
     let r = child.add(
         egui::TextEdit::singleline(&mut filter)
-            .id(Id::new("asset_filter_field"))
+            .id(Id::unique("asset_filter_field"))
             .frame(egui::Frame::NONE)
             .font(regular(11.0))
             .hint_text(tr("Search assets"))
@@ -316,14 +318,14 @@ fn search_row(app: &mut FigApp, ui: &mut Ui, w: f32) -> String {
     );
     crate::widgets::select_all_on_focus(ui, &r, &filter);
     if r.has_focus() {
-        ui.painter().rect_stroke(field, CornerRadius::same(5), Stroke::new(1.0, t.accent), egui::StrokeKind::Inside);
+        ui.painter().rect_stroke(field, CornerRadius::same(5), Stroke::new(1.0, crate::theme::ACCENT), egui::StrokeKind::Inside);
         if ui.input(|i| i.key_pressed(egui::Key::Escape)) {
             filter.clear();
         }
     }
     ui.data_mut(|d| d.insert_temp(filter_id, filter.clone()));
     let br = Rect::from_center_size(pos2(fr.max.x - 26.0, field.center().y), vec2(24.0, 24.0));
-    let bresp = ui.interact(br, Id::new("asset_libraries_btn"), Sense::click()).tip(tr("Libraries"));
+    let bresp = ui.interact(br, Id::unique("asset_libraries_btn"), Sense::click()).tip(tr("Libraries"));
     if bresp.hovered() {
         ui.painter().rect_filled(br, CornerRadius::same(5), t.hover);
     }
@@ -341,11 +343,12 @@ fn updates_banner(app: &mut FigApp, ui: &mut Ui, w: f32, count: usize) {
     let r = Rect::from_min_max(pos2(row.min.x + 12.0, row.min.y + 4.0), pos2(row.max.x - 12.0, row.max.y - 4.0));
     ui.painter().rect_filled(r, CornerRadius::same(6), t.selected_row);
     let what = trn("{n} components and styles have newer versions", count, &[]);
-    ui.interact(r, Id::new("asset_updates"), Sense::hover()).on_hover_text(what);
+    ui.interact(r, Id::unique("asset_updates"), Sense::hover()).on_hover_text(what);
     ui.painter().text(pos2(r.min.x + 10.0, r.center().y), Align2::LEFT_CENTER, tr("Library updates available"), semibold(11.0), t.text);
     let mut child =
         ui.new_child(egui::UiBuilder::new().max_rect(Rect::from_min_max(pos2(r.max.x - 70.0, r.min.y + 6.0), pos2(r.max.x - 6.0, r.max.y))));
     if crate::widgets::button(&mut child, tr("Update"), true, true).clicked()
+        && !crate::menus::dev_mode_refuses(app, "library.acceptUpdates")
         && let Some(v) = app.run("library.acceptUpdates", json!({}))
     {
         let (c, s) = (v["components"].as_u64().unwrap_or(0), v["styles"].as_u64().unwrap_or(0));
@@ -436,7 +439,7 @@ fn tiles(ui: &mut Ui, w: f32, src: &Source, list: &[Tile], thumbs: &Thumbs, want
             let r = Rect::from_min_size(pos2(x, y), vec2(tile, tile));
             let resp = ui.interact(
                 r.union(Rect::from_min_size(r.left_bottom(), vec2(tile, TILE_LABEL))),
-                Id::new(("asset", src, item.id.0)),
+                Id::unique(("asset", src, item.id.0)),
                 Sense::click_and_drag(),
             );
             ui.painter().rect_filled(r, CornerRadius::same(6), t.field);
@@ -579,6 +582,10 @@ fn render_thumbs(ui: &Ui, w: f32, thumbs: &mut Thumbs, wanted: &[(Source, NodeId
     }
 }
 
+/// Draw the Assets panel: refresh libraries, switch to the libraries view when asked,
+/// otherwise cache a listing keyed by revision, query and library state, render local and
+/// enabled-library assets with reused thumbnails, and dispatch place, style, hide, toggle
+/// and drag actions.
 pub fn show(app: &mut FigApp, ui: &mut Ui) {
     refresh_libraries(app, ui);
     if app.ui.libraries {
@@ -591,7 +598,7 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
     let revision = ds.revision;
     let q = search_row(app, ui, w);
     let key = (revision, q.clone(), libraries_key(app, &doc));
-    let listing_id = Id::new("asset_listing");
+    let listing_id = Id::unique("asset_listing");
     let listing = match ui.data(|d| d.get_temp::<Arc<Listing>>(listing_id)) {
         Some(l) if l.key == key => l,
         _ => {
@@ -603,12 +610,12 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
     if listing.updates > 0 {
         updates_banner(app, ui, w, listing.updates);
     }
-    let mut thumbs: Thumbs = ui.data(|d| d.get_temp(Id::new("asset_thumbs"))).unwrap_or_default();
+    let mut thumbs: Thumbs = ui.data(|d| d.get_temp(Id::unique("asset_thumbs"))).unwrap_or_default();
     let mut sources: Vec<(Source, Arc<Document>)> = vec![(Source::Local, doc.clone())];
     sources.extend(listing.libraries.iter().filter_map(|l| l.doc.clone().map(|d| (Source::Library(l.id.clone()), d))));
     invalidate_thumbs(ui, &mut thumbs, &sources);
     let mut wanted = Vec::new();
-    let collapsed_id = Id::new("asset_collapsed_libraries");
+    let collapsed_id = Id::unique("asset_collapsed_libraries");
     let collapsed: HashSet<String> = ui.data(|d| d.get_temp(collapsed_id)).unwrap_or_default();
     let mut act = None;
     egui::ScrollArea::vertical().auto_shrink([false, false]).show(ui, |ui| {
@@ -655,7 +662,7 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
     render_thumbs(ui, w, &mut thumbs, &wanted);
     let drag = ui.data(|d| d.get_temp::<AssetDrag>(drag_id()));
     let tex = drag.as_ref().and_then(|d| thumbs.map.get(&(d.src.clone(), d.component)).cloned().flatten());
-    ui.data_mut(|d| d.insert_temp(Id::new("asset_thumbs"), thumbs));
+    ui.data_mut(|d| d.insert_temp(Id::unique("asset_thumbs"), thumbs));
     match act {
         Some(Act::Drag(d)) => ui.data_mut(|m| {
             m.insert_temp(drag_id(), d);
@@ -666,7 +673,9 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
         }
         Some(Act::Style(src, style)) => apply_style(app, &src, &style),
         Some(Act::Hide(id, on)) => {
-            app.run("component.hideWhenPublishing", json!({"ids": [id], "on": on}));
+            if !crate::menus::dev_mode_refuses(app, "component.hideWhenPublishing") {
+                app.run("component.hideWhenPublishing", json!({"ids": [id], "on": on}));
+            }
         }
         Some(Act::Toggle(id)) => {
             let mut c = collapsed;
@@ -683,29 +692,39 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
 
 /// Place component `id` of `src` centred on page point (`x`, `y`).
 fn place(app: &mut FigApp, src: &Source, id: NodeId, x: f64, y: f64) {
-    match src {
-        Source::Local => app.run("instance.place", json!({"component": id, "x": x, "y": y})),
-        Source::Library(lib) => app.run("library.place", json!({"library": lib, "component": id, "x": x, "y": y})),
+    let (cmd, params) = match src {
+        Source::Local => ("instance.place", json!({"component": id, "x": x, "y": y})),
+        Source::Library(lib) => ("library.place", json!({"library": lib, "component": id, "x": x, "y": y})),
     };
+    if !crate::menus::dev_mode_refuses(app, cmd) {
+        app.run(cmd, params);
+    }
 }
 
 fn apply_style(app: &mut FigApp, src: &Source, style: &str) {
+    let (cmd, params) = match src {
+        Source::Local => ("style.apply", json!({"style": style})),
+        Source::Library(lib) => ("library.applyStyle", json!({"library": lib, "style": style})),
+    };
+    if crate::menus::dev_mode_refuses(app, cmd) {
+        return;
+    }
     if app.session.selection().is_empty() {
         app.toast(tr("Select layers to apply the style to"));
         return;
     }
-    match src {
-        Source::Local => app.run("style.apply", json!({"style": style})),
-        Source::Library(lib) => app.run("library.applyStyle", json!({"library": lib, "style": style})),
-    };
+    app.run(cmd, params);
 }
 
 /// Swap the instance at page point (`x`, `y`) to component `id` of `src`.
 fn swap_at(app: &mut FigApp, src: &Source, id: NodeId, x: f64, y: f64) {
-    match src {
-        Source::Local => app.run("instance.swapAt", json!({"component": id, "x": x, "y": y})),
-        Source::Library(lib) => app.run("library.swapAt", json!({"library": lib, "component": id, "x": x, "y": y})),
+    let (cmd, params) = match src {
+        Source::Local => ("instance.swapAt", json!({"component": id, "x": x, "y": y})),
+        Source::Library(lib) => ("library.swapAt", json!({"library": lib, "component": id, "x": x, "y": y})),
     };
+    if !crate::menus::dev_mode_refuses(app, cmd) {
+        app.run(cmd, params);
+    }
 }
 
 /// The component set (by name) a dragged asset belongs to, in the document it comes from: the
@@ -759,9 +778,11 @@ fn drag_feedback(app: &mut FigApp, ui: &mut Ui, doc: &Document, libs: &HashMap<S
     ui.ctx().request_repaint();
 }
 
+/// Draw the 64×64 component ghost on the tooltip layer, using the thumbnail when available
+/// and the component or component-set icon otherwise.
 fn ghost(ui: &Ui, p: Pos2, set: bool, tex: Option<egui::TextureHandle>) {
     let t = Tokens::get(ui.ctx());
-    let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, Id::new("asset_ghost")));
+    let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, Id::unique("asset_ghost")));
     let r = Rect::from_center_size(p, vec2(64.0, 64.0));
     painter.rect_filled(r, CornerRadius::same(6), t.panel.gamma_multiply(0.9));
     painter.rect_stroke(r, CornerRadius::same(6), Stroke::new(1.0, COMPONENT), egui::StrokeKind::Inside);
@@ -798,7 +819,7 @@ fn libraries_view(app: &mut FigApp, ui: &mut Ui) {
     let w = ui.available_width();
     let (hr, _) = ui.allocate_exact_size(vec2(w, 40.0), Sense::hover());
     let back = Rect::from_center_size(pos2(hr.min.x + 24.0, hr.center().y), vec2(24.0, 24.0));
-    let bresp = ui.interact(back, Id::new("asset_libraries_back"), Sense::click()).tip(tr("Back to assets"));
+    let bresp = ui.interact(back, Id::unique("asset_libraries_back"), Sense::click()).tip(tr("Back to assets"));
     if bresp.hovered() {
         ui.painter().rect_filled(back, CornerRadius::same(5), t.hover);
     }
@@ -817,8 +838,12 @@ fn libraries_view(app: &mut FigApp, ui: &mut Ui) {
     });
 }
 
+/// Draw the publish form: status, publishable components/styles/collections, description and
+/// publish buttons. Run `library.publish` locally or publish to the server in the
+/// background, reset the form on success, and report when the file is unsaved so other files
+/// cannot yet use it.
 fn publish_form(app: &mut FigApp, ui: &mut Ui, w: f32, doc: &Document) {
-    let form_id = Id::new("asset_publish_form");
+    let form_id = Id::unique("asset_publish_form");
     let mut form: PublishForm = ui.data(|d| d.get_temp(form_id)).unwrap_or_default();
     title(ui, w, tr("This file"));
     let m = doc.published.as_ref().map(|p| &p.manifest);
@@ -887,7 +912,7 @@ fn publish_form(app: &mut FigApp, ui: &mut Ui, w: f32, doc: &Document) {
     ui.horizontal(|ui| {
         ui.add_space(PAD);
         if let Some(d) =
-            crate::widgets::text_field(ui, Id::new("asset_publish_description"), &description, w - PAD * 2.0, tr("Description (optional)"))
+            crate::widgets::text_field(ui, Id::unique("asset_publish_description"), &description, w - PAD * 2.0, tr("Description (optional)"))
         {
             form.description = Some(d);
         }
@@ -922,7 +947,10 @@ fn publish_form(app: &mut FigApp, ui: &mut Ui, w: f32, doc: &Document) {
         None => {}
     }
     let params = (publish || to_server).then(|| json!({"description": form.description.clone().unwrap_or(description), "include": include}));
-    if publish && let Some(r) = params.clone().and_then(|p| app.run("library.publish", p)) {
+    if publish
+        && !crate::menus::dev_mode_refuses(app, "library.publish")
+        && let Some(r) = params.clone().and_then(|p| app.run("library.publish", p))
+    {
         form = PublishForm::default();
         // Other files read the saved file.
         app.save();
@@ -948,7 +976,7 @@ fn publish_form(app: &mut FigApp, ui: &mut Ui, w: f32, doc: &Document) {
 /// How other files use this file's library on its server (asked for with a button: it is a
 /// request to the server).
 fn usage(app: &mut FigApp, ui: &mut Ui, w: f32, link: &str) {
-    let usage_id = Id::new(("asset_library_usage", link));
+    let usage_id = Id::unique(("asset_library_usage", link));
     let loading = app.session.waiting_for(USAGE);
     let (mut ask, mut stop) = (false, false);
     ui.horizontal(|ui| {
@@ -993,6 +1021,8 @@ fn usage(app: &mut FigApp, ui: &mut Ui, w: f32, link: &str) {
     ui.add_space(8.0);
 }
 
+/// Draw the libraries enabled in this file with version/count/status, remove and swap
+/// actions, add-file and pasted-link controls, and background fetch/cancel handling.
 fn enabled_libraries(app: &mut FigApp, ui: &mut Ui, w: f32, doc: &Document) {
     let t = Tokens::get(ui.ctx());
     title(ui, w, tr("Libraries in this file"));
@@ -1033,9 +1063,9 @@ fn enabled_libraries(app: &mut FigApp, ui: &mut Ui, w: f32, doc: &Document) {
         let clip = Rect::from_min_size(pos2(r.min.x + PAD, r.min.y), vec2(text_w, r.height()));
         ui.painter().with_clip_rect(clip).galley(pos2(r.min.x + PAD, r.min.y + 6.0), name, t.text);
         ui.painter().with_clip_rect(clip).galley(pos2(r.min.x + PAD, r.min.y + 23.0), line, t.text_secondary);
-        ui.interact(clip, Id::new(("asset_lib_row", &l.id)), Sense::hover()).on_hover_text(shown_path(&l.path));
+        ui.interact(clip, Id::unique(("asset_lib_row", &l.id)), Sense::hover()).on_hover_text(shown_path(&l.path));
         let x = Rect::from_center_size(pos2(r.max.x - 24.0, r.center().y), vec2(24.0, 24.0));
-        let xr = ui.interact(x, Id::new(("asset_lib_remove", &l.id)), Sense::click()).tip(tr("Remove library from this file"));
+        let xr = ui.interact(x, Id::unique(("asset_lib_remove", &l.id)), Sense::click()).tip(tr("Remove library from this file"));
         if xr.hovered() {
             ui.painter().rect_filled(x, CornerRadius::same(5), t.hover);
         }
@@ -1046,7 +1076,7 @@ fn enabled_libraries(app: &mut FigApp, ui: &mut Ui, w: f32, doc: &Document) {
         if swappable {
             let sw = Rect::from_center_size(pos2(r.max.x - 52.0, r.center().y), vec2(24.0, 24.0));
             let sr = ui
-                .interact(sw, Id::new(("asset_lib_swap", &l.id)), Sense::click())
+                .interact(sw, Id::unique(("asset_lib_swap", &l.id)), Sense::click())
                 .tip(tr("Swap library: use another library's assets of the same names"));
             if sr.hovered() {
                 ui.painter().rect_filled(sw, CornerRadius::same(5), t.hover);
@@ -1072,10 +1102,12 @@ fn enabled_libraries(app: &mut FigApp, ui: &mut Ui, w: f32, doc: &Document) {
     let pasted = ui
         .horizontal(|ui| {
             ui.add_space(PAD);
-            crate::widgets::text_field(ui, Id::new("asset_add_link"), "", w - PAD * 2.0, tr("Paste a team library link (a view link)"))
+            crate::widgets::text_field(ui, Id::unique("asset_add_link"), "", w - PAD * 2.0, tr("Paste a team library link (a view link)"))
         })
         .inner;
-    if let Some(link) = pasted.map(|l| l.trim().to_string()).filter(|l| !l.is_empty()) {
+    if let Some(link) = pasted.map(|l| l.trim().to_string()).filter(|l| !l.is_empty())
+        && !crate::menus::dev_mode_refuses(app, ADD)
+    {
         app.run_background(&ui.ctx().clone(), ADD, json!({"path": link}), Box::new(|app, _, r| added(app, &r)));
     }
     if app.session.waiting_for(ADD) {
@@ -1087,10 +1119,13 @@ fn enabled_libraries(app: &mut FigApp, ui: &mut Ui, w: f32, doc: &Document) {
             }
         });
     }
-    if let Some(id) = remove {
+    if let Some(id) = remove
+        && !crate::menus::dev_mode_refuses(app, "library.remove")
+    {
         app.run("library.remove", json!({"id": id}));
     }
     if let Some((from, to)) = swap
+        && !crate::menus::dev_mode_refuses(app, "library.swap")
         && let Some(r) = app.run("library.swap", json!({"from": from, "to": to}))
     {
         let moved = ["components", "styles", "variables"].iter().map(|k| r[*k].as_u64().unwrap_or(0)).sum::<u64>();
@@ -1101,7 +1136,7 @@ fn enabled_libraries(app: &mut FigApp, ui: &mut Ui, w: f32, doc: &Document) {
             trn("Swapped {n} assets; {missed} had no match and still use the old library", moved as usize, &[("missed", &missed)])
         });
     }
-    if add {
+    if add && !crate::menus::dev_mode_refuses(app, ADD) {
         app.pick_open(tr("Add library"), &["figcraft"], |app, p| {
             if let Some(r) = app.run(ADD, json!({"path": p.to_string_lossy()})) {
                 added(app, &r);
@@ -1118,7 +1153,7 @@ fn added(app: &mut FigApp, r: &Value) {
 /// Tests: the components whose thumbnails are cached (for this file's assets).
 #[cfg(test)]
 pub(crate) fn cached_thumbnails(ctx: &egui::Context) -> Vec<NodeId> {
-    let thumbs: Thumbs = ctx.data(|d| d.get_temp(Id::new("asset_thumbs"))).unwrap_or_default();
+    let thumbs: Thumbs = ctx.data(|d| d.get_temp(Id::unique("asset_thumbs"))).unwrap_or_default();
     let mut out: Vec<NodeId> = thumbs.map.keys().filter(|(s, _)| *s == Source::Local).map(|(_, id)| *id).collect();
     out.sort();
     out
diff --git a/crates/ui-egui/src/component_panel.rs b/crates/ui-egui/src/panels/component_panel.rs
similarity index 85%
rename from crates/ui-egui/src/component_panel.rs
rename to crates/ui-egui/src/panels/component_panel.rs
index 646d6ecd..54bc0974 100644
--- a/crates/ui-egui/src/component_panel.rs
+++ b/crates/ui-egui/src/panels/component_panel.rs
@@ -2,8 +2,9 @@
 //!
 //! - An instance: its main component (with a swap menu), variant dropdowns, property values,
 //!   the selected layer's overrides, and Reset / Detach / Go to main / Push changes.
-//! - A component or component set: its properties (add, rename, default, delete) and, for a set,
-//!   the variant property matrix.
+//! - A component or component set: its properties (add, rename, default, delete), Add variant
+//!   (a lone main component becomes a set) and, for a set, the variant property matrix.
+//! - Several main components: Combine as variants.
 //! - A layer inside a component: bind its visibility / text / instance to a property, or make a
 //!   frame a slot.
 //! - A slot inside an instance (and an instance's slot properties): fill it with components
@@ -11,6 +12,7 @@
 
 use egui::{Id, Sense, Ui, vec2};
 use figcraft_doc::*;
+use figcraft_engine::cmd::component::{can_add_variant, can_combine_variants};
 use figcraft_engine::components::{
     PROP_BINDING, default_variant, inside_instance, owning_component, owning_instance, slot_def, slot_edited, slots_of, variant_conflicts,
     variant_options, variant_props, variant_set,
@@ -20,13 +22,17 @@ use serde_json::{Value, json};
 use crate::FigApp;
 use crate::i18n::{tr, tr_noop, trn};
 use crate::icons::{self, Icon};
-use crate::right::{menu_item, menu_popup, row};
+use crate::list_drag::ListDrag;
+use crate::right::{menu_item, menu_popup, row, row_rect};
 use crate::theme::{COMPONENT, Tokens, semibold};
 use crate::widgets;
 
 /// Entry point (called from the Design panel header for every selection).
 pub fn instance_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
-    let [id] = sel else { return };
+    let [id] = sel else {
+        combine_ui(app, ui, doc, sel);
+        return;
+    };
     let Some(n) = doc.node(*id) else { return };
     match &n.kind {
         NodeKind::Instance { .. } => instance_ui(app, ui, doc, n),
@@ -56,11 +62,25 @@ pub fn instance_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[No
     }
 }
 
+/// Two or more main components selected: a button combines them into a component set.
+fn combine_ui(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
+    if !can_combine_variants(doc, sel) {
+        return;
+    }
+    row(ui, 32.0, |ui| {
+        let label = crate::i18n::command("component.combineVariants", "Combine as variants");
+        if widgets::dropdown(ui, &label, 160.0, Some(Icon::ComponentSet)).clicked() {
+            app.run("component.combineVariants", json!({"ids": sel}));
+        }
+    });
+}
+
 /// A component's description: a multi-line field, saved when it loses focus.
 fn description_ui(app: &mut FigApp, ui: &mut Ui, id: NodeId, description: &str) {
     widgets::separator(ui);
     widgets::sublabels(ui, tr("Description"), None);
-    if let Some(new) = widgets::multiline_field(ui, Id::new(("comp_desc", id)), description, tr("Describe how and when to use this component"), 3) {
+    if let Some(new) = widgets::multiline_field(ui, Id::unique(("comp_desc", id)), description, tr("Describe how and when to use this component"), 3)
+    {
         app.run("node.set", json!({"id": id, "props": {"description": new.chars().take(10_000).collect::<String>()}}));
     }
     ui.add_space(8.0);
@@ -69,10 +89,10 @@ fn description_ui(app: &mut FigApp, ui: &mut Ui, id: NodeId, description: &str)
 /// Local components (and component sets, not their variants), for swap menus: (id, label), page
 /// by page. Listed once per document revision (a file with thousands of layers isn't walked every
 /// frame).
-fn local_components(app: &FigApp, ui: &Ui, doc: &Document) -> std::sync::Arc<Vec<(NodeId, String)>> {
+pub(crate) fn local_components(app: &FigApp, ui: &Ui, doc: &Document) -> std::sync::Arc<Vec<(NodeId, String)>> {
     type Cached = ((u64, u64), std::sync::Arc<Vec<(NodeId, String)>>);
     let key = app.session.ds().map(|d| (d.uid, d.revision)).unwrap_or_default();
-    let id = Id::new("component_panel_local_components");
+    let id = Id::unique("component_panel_local_components");
     if let Some((k, list)) = ui.data(|d| d.get_temp::<Cached>(id))
         && k == key
     {
@@ -241,12 +261,14 @@ fn properties_ui(app: &mut FigApp, ui: &mut Ui, doc: &Document, owner: NodeId) {
     } else {
         Default::default()
     };
-    // Variant properties: name, values (the matrix), add value, delete.
-    for (k, vals) in &variants {
-        row(ui, 32.0, |ui| {
+    // Variant properties: name, values (the matrix), add value, delete. Dragged by their left
+    // margin to reorder them (only among themselves: the shared ones keep the engine's order).
+    let mut drag = ListDrag::in_order(ui, ("variant_props", owner));
+    for (i, (k, vals)) in variants.iter().enumerate() {
+        let header = row_rect(ui, 32.0, |ui| {
             let (ir, _) = ui.allocate_exact_size(vec2(14.0, 14.0), Sense::hover());
             icons::paint(ui.painter(), ir, Icon::ComponentSet, COMPONENT);
-            if let Some(nn) = widgets::text_field(ui, Id::new(("vprop_name", owner, k.as_str())), k, 110.0, tr("Name")) {
+            if let Some(nn) = widgets::text_field(ui, Id::unique(("vprop_name", owner, k.as_str())), k, 110.0, tr("Name")) {
                 app.run("component.editProperty", json!({"id": owner, "name": k, "newName": nn}));
             }
             let def = defaults.get(k).or(vals.first()).cloned().unwrap_or_default();
@@ -271,7 +293,7 @@ fn properties_ui(app: &mut FigApp, ui: &mut Ui, doc: &Document, owner: NodeId) {
             row(ui, 30.0, |ui| {
                 ui.add_space(22.0);
                 for v in &chunk {
-                    if let Some(nv) = widgets::text_field(ui, Id::new(("vprop_val", owner, k.as_str(), v.as_str())), v, 62.0, "")
+                    if let Some(nv) = widgets::text_field(ui, Id::unique(("vprop_val", owner, k.as_str(), v.as_str())), v, 62.0, "")
                         && nv != *v
                     {
                         app.run("component.editProperty", json!({"id": owner, "name": k, "value": v, "newValue": nv}));
@@ -284,6 +306,12 @@ fn properties_ui(app: &mut FigApp, ui: &mut Ui, doc: &Document, owner: NodeId) {
             });
             vi += 3;
         }
+        drag.row(ui, i, header, header.with_max_y(ui.cursor().min.y.max(header.max.y)), || k.clone());
+    }
+    if let Some((from, to)) = drag.finish(ui)
+        && let Some((k, _)) = variants.get(from)
+    {
+        app.run("component.editProperty", json!({"id": owner, "name": k, "index": to}));
     }
     // Shared properties.
     for (k, d) in &defs {
@@ -293,7 +321,7 @@ fn properties_ui(app: &mut FigApp, ui: &mut Ui, doc: &Document, owner: NodeId) {
         row(ui, 32.0, |ui| {
             let (ir, _) = ui.allocate_exact_size(vec2(14.0, 14.0), Sense::hover());
             icons::paint(ui.painter(), ir, type_icon(d), COMPONENT);
-            if let Some(nn) = widgets::text_field(ui, Id::new(("prop_name", owner, k.as_str())), k, 96.0, tr("Name")) {
+            if let Some(nn) = widgets::text_field(ui, Id::unique(("prop_name", owner, k.as_str())), k, 96.0, tr("Name")) {
                 app.run("component.editProperty", json!({"id": owner, "name": k, "newName": nn}));
             }
             match d {
@@ -303,20 +331,27 @@ fn properties_ui(app: &mut FigApp, ui: &mut Ui, doc: &Document, owner: NodeId) {
                     }
                 }
                 PropDef::Text { default } => {
-                    if let Some(v) = widgets::text_field(ui, Id::new(("prop_def", owner, k.as_str())), default, 84.0, tr("Default")) {
+                    if let Some(v) = widgets::text_field(ui, Id::unique(("prop_def", owner, k.as_str())), default, 84.0, tr("Default")) {
                         app.run("component.editProperty", json!({"id": owner, "name": k, "default": v}));
                     }
                 }
                 PropDef::InstanceSwap { default, .. } => {
                     let label = doc.node(*default).map(|n| n.name.clone()).unwrap_or_else(|| tr("Missing").into());
                     let resp = widgets::dropdown(ui, &label, 84.0, None);
-                    menu_popup(&resp).show(|ui| {
-                        for (c, name) in comps.iter() {
-                            if menu_item(ui, name, "") {
-                                app.run("component.editProperty", json!({"id": owner, "name": k, "default": c.0}));
-                                ui.close();
+                    crate::a11y::combo(&resp, k, &label, crate::a11y::menu_open(&resp));
+                    // A file with many components (an icon library) scrolls instead of running off the screen.
+                    menu_popup(&resp).width(200.0).show(|ui| {
+                        egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| {
+                            for (c, name) in comps.iter() {
+                                let current = c == default;
+                                if menu_item(ui, &format!("{}{name}", if current { "✓ " } else { "" }), "") {
+                                    if !current {
+                                        app.run("component.editProperty", json!({"id": owner, "name": k, "default": c.0}));
+                                    }
+                                    ui.close();
+                                }
                             }
-                        }
+                        });
                     });
                 }
                 PropDef::Variant { .. } | PropDef::Slot { .. } => {}
@@ -356,7 +391,8 @@ fn properties_ui(app: &mut FigApp, ui: &mut Ui, doc: &Document, owner: NodeId) {
             });
         }
     }
-    if is_set {
+    // A lone main component too: Add variant makes it a set of itself and the new variant.
+    if can_add_variant(doc, owner) {
         row(ui, 32.0, |ui| {
             if widgets::dropdown(ui, tr("Add variant"), 120.0, Some(Icon::Plus)).clicked() {
                 app.run("component.addVariant", json!({"id": owner}));
@@ -493,7 +529,9 @@ fn group_label(g: &str) -> String {
         "grids" => tr("Layout grids"),
         "exports" => tr("Export settings"),
         "interactions" => tr("Interactions"),
+        "modes" => tr("Variable modes"),
         "size" => tr("Size"),
+        "resizing" => tr("Resizing"),
         "position" => tr("Position"),
         "component" => tr("Swapped instance"),
         "props" => tr("Instance properties"),
@@ -671,7 +709,7 @@ fn instance_props(app: &mut FigApp, ui: &mut Ui, doc: &Document, n: &Node, comps
                 PropDef::Text { .. } => {
                     crate::variable_ui::bindable(app, ui, &[id], &bind_field, VariableType::String, w, |app, ui| {
                         let cur = v.as_str().unwrap_or_default().to_string();
-                        if let Some(ns) = widgets::text_field(ui, Id::new(("iprop", id, k.as_str())), &cur, w, "")
+                        if let Some(ns) = widgets::text_field(ui, Id::unique(("iprop", id, k.as_str())), &cur, w, "")
                             && ns != cur
                         {
                             app.run("instance.setProperties", json!({"ids": [id], "properties": {k.clone(): ns}}));
@@ -679,35 +717,9 @@ fn instance_props(app: &mut FigApp, ui: &mut Ui, doc: &Document, n: &Node, comps
                     });
                 }
                 PropDef::InstanceSwap { preferred, .. } => {
-                    let cur = figcraft_engine::params::id_of(&v);
-                    let label = cur.and_then(|c| doc.node(c)).map(|c| c.name.clone()).unwrap_or_else(|| tr("None").into());
-                    let resp = widgets::dropdown(ui, &label, w, Some(Icon::Instance));
-                    menu_popup(&resp).width(200.0).show(|ui| {
-                        let t = Tokens::get(ui.ctx());
-                        let heading = |ui: &mut Ui, text: &str| ui.label(egui::RichText::new(text).font(semibold(11.0)).color(t.text_secondary));
-                        let mut pick = |ui: &mut Ui, c: NodeId, name: &str| {
-                            let current = cur == Some(c);
-                            if menu_item(ui, &format!("{}{name}", if current { "✓ " } else { "" }), "") {
-                                if !current {
-                                    app.run("instance.setProperties", json!({"ids": [id], "properties": {k.clone(): c.0}}));
-                                }
-                                ui.close();
-                            }
-                        };
-                        let preferred: Vec<(NodeId, String)> = preferred.iter().filter_map(|c| doc.node(*c).map(|n| (*c, n.name.clone()))).collect();
-                        if !preferred.is_empty() {
-                            heading(ui, tr("Preferred"));
-                            for (c, name) in &preferred {
-                                pick(ui, *c, name);
-                            }
-                            heading(ui, tr("All components"));
-                        }
-                        egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| {
-                            for (c, name) in comps {
-                                pick(ui, *c, name);
-                            }
-                        });
-                    });
+                    if let Some(c) = swap_dropdown(ui, doc, figcraft_engine::params::id_of(&v), &preferred, comps, w, "").1 {
+                        app.run("instance.setProperties", json!({"ids": [id], "properties": {k.clone(): c.0}}));
+                    }
                 }
                 PropDef::Variant { .. } => {}
                 PropDef::Slot { preferred } => {
@@ -720,6 +732,54 @@ fn instance_props(app: &mut FigApp, ui: &mut Ui, doc: &Document, n: &Node, comps
     }
 }
 
+/// The dropdown of an instance-swap property showing component `cur`: its menu lists the
+/// property's preferred components first (when it has any), then every component in the file. The
+/// dropdown, and the component picked (picking the current one picks nothing). `name` labels it for
+/// assistive technology.
+pub(crate) fn swap_dropdown(
+    ui: &mut Ui,
+    doc: &Document,
+    cur: Option<NodeId>,
+    preferred: &[NodeId],
+    comps: &[(NodeId, String)],
+    w: f32,
+    name: &str,
+) -> (egui::Response, Option<NodeId>) {
+    let label = cur.and_then(|c| doc.node(c)).map(|c| c.name.clone()).unwrap_or_else(|| tr("None").into());
+    let resp = widgets::dropdown(ui, &label, w, Some(Icon::Instance));
+    if !name.is_empty() {
+        crate::a11y::combo(&resp, name, &label, crate::a11y::menu_open(&resp));
+    }
+    let mut picked = None;
+    menu_popup(&resp).width(200.0).show(|ui| {
+        let t = Tokens::get(ui.ctx());
+        let heading = |ui: &mut Ui, text: &str| ui.label(egui::RichText::new(text).font(semibold(11.0)).color(t.text_secondary));
+        let mut pick = |ui: &mut Ui, c: NodeId, name: &str| {
+            let current = cur == Some(c);
+            if menu_item(ui, &format!("{}{name}", if current { "✓ " } else { "" }), "") {
+                if !current {
+                    picked = Some(c);
+                }
+                ui.close();
+            }
+        };
+        let preferred: Vec<(NodeId, String)> = preferred.iter().filter_map(|c| doc.node(*c).map(|n| (*c, n.name.clone()))).collect();
+        if !preferred.is_empty() {
+            heading(ui, tr("Preferred"));
+            for (c, name) in &preferred {
+                pick(ui, *c, name);
+            }
+            heading(ui, tr("All components"));
+        }
+        egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| {
+            for (c, name) in comps {
+                pick(ui, *c, name);
+            }
+        });
+    });
+    (resp, picked)
+}
+
 fn prop_label(ui: &mut Ui, name: &str, icon: Icon) {
     let t = Tokens::get(ui.ctx());
     let (r, _) = ui.allocate_exact_size(vec2(84.0, 20.0), Sense::hover());
diff --git a/crates/ui-egui/src/dev_compare.rs b/crates/ui-egui/src/panels/dev_compare.rs
similarity index 70%
rename from crates/ui-egui/src/dev_compare.rs
rename to crates/ui-egui/src/panels/dev_compare.rs
index 2e21eb54..a8c11354 100644
--- a/crates/ui-egui/src/dev_compare.rs
+++ b/crates/ui-egui/src/panels/dev_compare.rs
@@ -1,12 +1,13 @@
-//! Dev Mode's compare view: a ready-for-dev frame or section as it was when it was marked next to
-//! how it is now (side by side, or one over the other with a slider), the changed layers outlined,
-//! and the list of what changed (`dev.compare`). Rendered once per document version. The branch
-//! review ([`crate::branch_ui`]) shows two versions with the same pieces.
+//! Dev Mode's compare view: a frame or section as it was when it was marked ready for dev, or in
+//! a saved version picked at the bottom, next to how it is now (side by side, or one over the
+//! other with a slider), the changed layers outlined, and the list of what changed
+//! (`dev.compare`). Rendered once per document version. The branch review ([`crate::branch_ui`])
+//! shows two versions with the same pieces.
 
 use std::sync::Arc;
 
 use egui::{Align2, Color32, CornerRadius, Id, Rect, Sense, Stroke, StrokeKind, Ui, pos2, vec2};
-use figcraft_doc::{Document, NodeId};
+use figcraft_doc::{DevStatus, Document, NodeId};
 use figcraft_engine::devcompare::{self, ChangeKind, Comparison, LayerChange};
 use serde_json::json;
 
@@ -38,25 +39,41 @@ pub struct CompareView {
     pub mode: Mode,
     /// Where the overlay slider is (0 = all new, 1 = all old).
     pub split: f32,
+    /// The saved version compared with (its id); `None`: the snapshot from when it was marked
+    /// ready for dev.
+    pub version: Option<String>,
     /// The change row under the pointer (its layer is highlighted).
     hovered: Option<NodeId>,
     cache: Option<Cached>,
 }
 
 impl CompareView {
-    pub fn new(id: NodeId) -> Self {
-        Self { id, mode: Mode::default(), split: 0.5, hovered: None, cache: None }
+    pub fn new(id: NodeId, version: Option<String>) -> Self {
+        Self { id, mode: Mode::default(), split: 0.5, version, hovered: None, cache: None }
+    }
+
+    /// The view `dev.compare {show}` (or `ui.set`) asks for: `data` holds the layer's `id` and the
+    /// `version` to compare with.
+    pub fn requested(data: &serde_json::Value) -> Option<Self> {
+        let id = data.get("id").and_then(figcraft_engine::params::id_of)?;
+        Some(Self::new(id, data.get("version").and_then(serde_json::Value::as_str).map(str::to_string)))
     }
 }
 
-/// What the view shows, built for one version of the document.
+/// What the view shows, built for one version of the document and one "before".
 struct Cached {
     doc: Arc<Document>,
+    version: Option<String>,
+    /// The version's document (read once per version picked).
+    version_doc: Option<Arc<Document>>,
     cmp: Comparison,
     before: Option<Shot>,
     after: Option<Shot>,
 }
 
+/// A saved version as the picker lists it: (id, name, when).
+type VersionRow = (String, String, u64);
+
 /// One version rendered: its texture, the page area it shows and where each listed layer is.
 pub(crate) struct Shot {
     tex: egui::TextureHandle,
@@ -129,22 +146,40 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
     let Some(mut view) = app.ui.dev.compare.take() else { return };
     let Ok(ds) = app.session.ds() else { return };
     let doc = ds.doc.clone();
-    if doc.node(view.id).is_none() {
+    let Some(node) = doc.node(view.id) else { return };
+    let ready = node.dev_status == DevStatus::ReadyForDev;
+    // Newest first; a version deleted meanwhile falls back to the ready-for-dev snapshot (or the
+    // newest version, for a layer that isn't ready for dev).
+    let versions: Vec<VersionRow> = ds.versions.iter().rev().map(|v| (v.id.clone(), v.name.clone(), v.time)).collect();
+    if view.version.as_ref().is_some_and(|v| !versions.iter().any(|(id, ..)| id == v)) || (!ready && view.version.is_none()) {
+        view.version = if ready { None } else { versions.first().map(|(id, ..)| id.clone()) };
+    }
+    if view.version.is_none() && !ready {
         return;
     }
-    if view.cache.as_ref().is_none_or(|c| !Arc::ptr_eq(&c.doc, &doc)) {
-        let cmp = devcompare::compare(&doc, view.id);
-        let before = devcompare::before_doc(&doc, view.id).and_then(|b| Shot::of_changes(ctx, &b, view.id, &cmp.changes, true));
+    if view.cache.as_ref().is_none_or(|c| !Arc::ptr_eq(&c.doc, &doc) || c.version != view.version) {
+        let kept = view.cache.take().filter(|c| c.version == view.version).and_then(|c| c.version_doc);
+        let version_doc = match &view.version {
+            Some(v) => kept.or_else(|| ds.versions.iter().find(|x| x.id == *v).and_then(|x| x.document().ok())),
+            None => None,
+        };
+        let (cmp, before) = match &version_doc {
+            Some(b) => (devcompare::compare_with(b, &doc, view.id), Some(b.clone())),
+            None if view.version.is_some() => (devcompare::empty(&doc, view.id), None),
+            None => (devcompare::compare(&doc, view.id), devcompare::before_doc(&doc, view.id).map(Arc::new)),
+        };
+        let before = before.and_then(|b| Shot::of_changes(ctx, &b, view.id, &cmp.changes, true));
         let after = Shot::of_changes(ctx, &doc, view.id, &cmp.changes, false);
-        view.cache = Some(Cached { doc: doc.clone(), cmp, before, after });
+        view.cache = Some(Cached { doc: doc.clone(), version: view.version.clone(), version_doc, cmp, before, after });
     }
+    let version_name = view.version.as_ref().and_then(|v| versions.iter().find(|(id, ..)| id == v)).map(|(_, name, _)| name.clone());
     let t = Tokens::get(ctx);
     let screen = ctx.content_rect();
     let size = vec2(1120.0_f32.min(screen.width() - 64.0).max(560.0), 700.0_f32.min(screen.height() - 96.0).max(320.0));
     let mut open = true;
     let mut action = None;
     egui::Window::new("Compare changes")
-        .id(Id::new("dev_compare_window"))
+        .id(Id::unique("dev_compare_window"))
         .title_bar(false)
         .collapsible(false)
         .resizable(false)
@@ -162,27 +197,16 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
             ui.horizontal_top(|ui| {
                 let images_w = size.x - LIST_W - 1.0;
                 let (r, _) = ui.allocate_exact_size(vec2(images_w, body_h), Sense::hover());
-                if !cache.cmp.snapshot {
-                    let msg = if cache.cmp.changed {
-                        tr(
-                            "What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on.",
-                        )
-                    } else {
-                        tr("Nothing changed since this was marked ready for dev.")
-                    };
-                    message(ui, &t, r, msg);
-                } else if let (Some(before), Some(after)) = (&cache.before, &cache.after) {
-                    images(ui, &t, r, [(before, tr("Before")), (after, tr("Now"))], view.mode, &mut view.split, view.hovered);
-                }
+                compared(ui, r, cache, version_name.as_deref(), view.mode, &mut view.split, view.hovered);
                 let (line, _) = ui.allocate_exact_size(vec2(1.0, body_h), Sense::hover());
                 ui.painter().rect_filled(line, CornerRadius::ZERO, t.border);
                 ui.allocate_ui_with_layout(vec2(LIST_W, body_h), top_down, |ui| {
-                    if let Some(a) = list(ui, &t, &cache.cmp, &mut view.hovered) {
+                    if let Some(a) = list(ui, &t, &cache.cmp, view.version.is_some(), &mut view.hovered) {
                         action = Some(a);
                     }
                 });
             });
-            if let Some(a) = footer(ui, &t, &cache.cmp) {
+            if let Some(a) = footer(ui, &t, &cache.cmp, ready, &versions, view.version.as_deref()) {
                 action = Some(a);
             }
         });
@@ -197,6 +221,7 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
             }
         }
         Some(Action::Close) => open = false,
+        Some(Action::Against(v)) => view.version = v,
         None => {}
     }
     if open {
@@ -204,10 +229,37 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
     }
 }
 
+/// The images area: before and after, or a note saying why there is nothing to show.
+/// `version_name`: the saved version compared with (`None`: the ready-for-dev snapshot).
+fn compared(ui: &mut Ui, r: Rect, cache: &Cached, version_name: Option<&str>, mode: Mode, split: &mut f32, hovered: Option<NodeId>) {
+    let t = &Tokens::get(ui.ctx());
+    let against = version_name.is_some();
+    if !cache.cmp.snapshot {
+        let msg = if against {
+            tr("This version can't be read.")
+        } else if cache.cmp.changed {
+            tr(
+                "What this changed from isn't known: it changed before FigCraft kept a copy of ready-for-dev frames. Resolve the change (or mark it ready again) to compare from now on.",
+            )
+        } else {
+            tr("Nothing changed since this was marked ready for dev.")
+        };
+        message(ui, t, r, msg);
+    } else if !cache.cmp.changed && against {
+        message(ui, t, r, tr("Nothing changed since this version."));
+    } else if let (Some(before), Some(after)) = (&cache.before, &cache.after) {
+        images(ui, t, r, [(before, version_name.unwrap_or(tr("Before"))), (after, tr("Now"))], mode, split, hovered);
+    } else if against {
+        message(ui, t, r, tr("This version doesn't have it: all of it is new."));
+    }
+}
+
 enum Action {
     Select(NodeId),
     Resolve,
     Close,
+    /// Compare with this saved version (`None`: the snapshot from when it was marked ready).
+    Against(Option<String>),
 }
 
 /// The title row: `title` and `name`, the side by side / overlay switch and the close button.
@@ -225,7 +277,7 @@ pub(crate) fn header(ui: &mut Ui, t: &Tokens, title: &str, name: &str, mode: &mu
     for (m, label) in modes.iter().rev() {
         let g = ui.painter().layout_no_wrap((*label).into(), regular(11.0), t.text);
         let cell = Rect::from_min_max(pos2(x - g.size().x - 20.0, r.center().y - 12.0), pos2(x, r.center().y + 12.0));
-        let resp = ui.interact(cell, Id::new(("compare_mode", label)), Sense::click());
+        let resp = ui.interact(cell, Id::unique(("compare_mode", label)), Sense::click());
         let on = *mode == *m;
         crate::a11y::tab(&resp, label, on);
         if on {
@@ -242,7 +294,7 @@ pub(crate) fn header(ui: &mut Ui, t: &Tokens, title: &str, name: &str, mode: &mu
     }
     if widgets::icon_button_at(
         ui,
-        Id::new("compare_close"),
+        Id::unique("compare_close"),
         Rect::from_center_size(pos2(r.max.x - 24.0, r.center().y), vec2(24.0, 24.0)),
         Icon::Close,
         tr("Close"),
@@ -292,7 +344,7 @@ pub(crate) fn images(ui: &mut Ui, t: &Tokens, r: Rect, shots: [(&Shot, &str); 2]
             p.text(pos2(img.min.x, label_y), Align2::LEFT_CENTER, before_label, semibold(11.0), t.text_secondary);
             p.text(pos2(img.max.x, label_y), Align2::RIGHT_CENTER, after_label, semibold(11.0), t.text_secondary);
             // The slider: a line with a knob, dragged (or clicked) anywhere over the images.
-            let resp = ui.interact(img, Id::new("compare_split"), Sense::click_and_drag());
+            let resp = ui.interact(img, Id::unique("compare_split"), Sense::click_and_drag());
             if let Some(pos) = resp.interact_pointer_pos().filter(|_| resp.dragged() || resp.clicked()) {
                 *split = ((pos.x - img.min.x) / img.width().max(1.0)).clamp(0.0, 1.0);
             }
@@ -325,7 +377,7 @@ fn pane(p: &egui::Painter, t: &Tokens, place: Place, shot: &Shot, hovered: Optio
 }
 
 /// The changed layers with their property changes; a click on a layer selects it.
-fn list(ui: &mut Ui, t: &Tokens, cmp: &Comparison, hovered: &mut Option<NodeId>) -> Option<Action> {
+fn list(ui: &mut Ui, t: &Tokens, cmp: &Comparison, from_version: bool, hovered: &mut Option<NodeId>) -> Option<Action> {
     let mut out = None;
     let summary = if !cmp.snapshot {
         tr("Changes unknown").to_string()
@@ -345,7 +397,11 @@ fn list(ui: &mut Ui, t: &Tokens, cmp: &Comparison, hovered: &mut Option<NodeId>)
     egui::ScrollArea::vertical().id_salt("compare_list").auto_shrink([false, false]).show(ui, |ui| {
         ui.spacing_mut().item_spacing = vec2(0.0, 0.0);
         for c in &cmp.changes {
-            let tip = if c.change == ChangeKind::Removed { tr("Removed since it was marked") } else { tr("Select layer") };
+            let tip = match (c.change, from_version) {
+                (ChangeKind::Removed, false) => tr("Removed since it was marked"),
+                (ChangeKind::Removed, true) => tr("Removed since this version"),
+                _ => tr("Select layer"),
+            };
             let resp = change_row(ui, t, c.change, &c.name, c.depth, c.layers, false, tip);
             if resp.hovered() {
                 now_hovered = Some(c.id);
@@ -419,17 +475,42 @@ pub(crate) fn property_lines<'a>(ui: &mut Ui, t: &Tokens, depth: usize, lines: i
     }
 }
 
-fn footer(ui: &mut Ui, t: &Tokens, cmp: &Comparison) -> Option<Action> {
+/// Resolve and Close, and left of them what it compares with: the snapshot from when it was
+/// marked ready for dev (`ready`) or one of the saved `versions` (`version`, the one picked).
+fn footer(ui: &mut Ui, t: &Tokens, cmp: &Comparison, ready: bool, versions: &[VersionRow], version: Option<&str>) -> Option<Action> {
     let (r, _) = ui.allocate_exact_size(vec2(ui.available_width(), BAR_H + 1.0), Sense::hover());
     ui.painter().rect_filled(Rect::from_min_size(r.min, vec2(r.width(), 1.0)), CornerRadius::ZERO, t.border);
     let mut out = None;
     let inner = Rect::from_min_max(pos2(r.min.x + 16.0, r.min.y + 1.0), pos2(r.max.x - 16.0, r.max.y));
+    ui.scope_builder(egui::UiBuilder::new().max_rect(inner).layout(egui::Layout::left_to_right(egui::Align::Center)), |ui| {
+        ui.spacing_mut().item_spacing.x = 8.0;
+        if !versions.is_empty() {
+            widgets::label(ui, tr("Compare with"), t.text_secondary);
+            let picked = version.and_then(|v| versions.iter().find(|(id, ..)| id == v));
+            let label = picked.map_or_else(|| tr("When marked ready").to_string(), |(_, name, _)| name.clone());
+            let resp = widgets::dropdown(ui, &label, 220.0, Some(Icon::Clock));
+            crate::right::menu_popup(&resp).show(|ui| {
+                if ready && crate::right::menu_check(ui, version.is_none(), tr("When marked ready"), "") {
+                    out = Some(Action::Against(None));
+                    ui.close();
+                }
+                for (id, name, time) in versions {
+                    if crate::right::menu_check(ui, version == Some(id.as_str()), name, &crate::comments::ago_long(*time)) {
+                        out = Some(Action::Against(Some(id.clone())));
+                        ui.close();
+                    }
+                }
+            });
+        }
+    });
     ui.scope_builder(egui::UiBuilder::new().max_rect(inner).layout(egui::Layout::right_to_left(egui::Align::Center)), |ui| {
         ui.spacing_mut().item_spacing.x = 8.0;
-        let resolve = widgets::button(ui, tr("Resolve change"), true, cmp.changed)
-            .on_hover_text(tr("Back to Ready for dev: the next change compares with how it is now"));
-        if resolve.clicked() {
-            out = Some(Action::Resolve);
+        if version.is_none() {
+            let resolve = widgets::button(ui, tr("Resolve change"), true, cmp.changed)
+                .on_hover_text(tr("Back to Ready for dev: the next change compares with how it is now"));
+            if resolve.clicked() {
+                out = Some(Action::Resolve);
+            }
         }
         if widgets::button(ui, tr("Close"), false, true).clicked() {
             out = Some(Action::Close);
diff --git a/crates/ui-egui/src/dev_mode.rs b/crates/ui-egui/src/panels/dev_mode.rs
similarity index 78%
rename from crates/ui-egui/src/dev_mode.rs
rename to crates/ui-egui/src/panels/dev_mode.rs
index f3064955..bcb97edb 100644
--- a/crates/ui-egui/src/dev_mode.rs
+++ b/crates/ui-egui/src/panels/dev_mode.rs
@@ -3,22 +3,25 @@
 //! categories and the filter of the callouts, the handoff status of the selected frames (with the
 //! focus view and Compare changes), the list of frames and sections that are ready for dev, the
 //! focus view's bar, Connect to code (a component's link to its code component), dev resources
-//! (links for developers) and the plugins that only read the document.
+//! (links for developers), measurements kept on the canvas and the plugins that only read the
+//! document.
 
 use egui::{Align2, Color32, CornerRadius, Id, Rect, Sense, Stroke, StrokeKind, Ui, pos2, vec2};
 use figcraft_doc::{Annotation, AnnotationCategory, CodeLink, DevStatus, Document, NodeId};
 use figcraft_engine::annotations::{self, PINNABLE, Pinnable};
 use figcraft_engine::code_connect;
 use figcraft_engine::codegen::{CodeLang, code_for};
+use figcraft_engine::dev_measurements::{self, Placed};
 use figcraft_engine::devinspect::{self, DevItem, Prop};
 use figcraft_engine::plugins::Access;
+use figcraft_engine::snap::Guide;
 use figcraft_engine::{components, dev_resources};
 use serde_json::json;
 
 use crate::a11y::Tip;
 use crate::i18n::{tr, tr_noop, trf, trn};
 use crate::icons::{self, Icon};
-use crate::right::{menu_check, menu_item_with, menu_popup, prop_row, row};
+use crate::right::{menu_check, menu_item, menu_item_with, menu_popup, prop_row, row};
 use crate::theme::{ACCENT, Tokens, doc_c32, regular, semibold};
 use crate::widgets::{self, DropLead, PAD};
 use crate::{FigApp, RightTab};
@@ -29,8 +32,12 @@ const CALLOUT_W: f32 = 220.0;
 const CALLOUT_GAP: f32 = 24.0;
 
 /// The status filters of the ready-for-dev list.
-const FILTERS: [(Option<DevStatus>, &str); 3] =
-    [(Some(DevStatus::ReadyForDev), tr_noop("Ready for dev")), (Some(DevStatus::Completed), tr_noop("Completed")), (None, tr_noop("Any status"))];
+const FILTERS: [(Option<DevStatus>, bool, &str); 4] = [
+    (Some(DevStatus::ReadyForDev), false, tr_noop("Ready for dev")),
+    (Some(DevStatus::ReadyForDev), true, tr_noop("Changed")),
+    (Some(DevStatus::Completed), false, tr_noop("Completed")),
+    (None, false, tr_noop("Any status")),
+];
 
 /// Which annotations the canvas shows.
 #[derive(Clone, Debug, Default, PartialEq, Eq)]
@@ -90,6 +97,9 @@ pub struct DevUi {
     pub compare: Option<crate::dev_compare::CompareView>,
     annotated: Vec<NodeId>,
     annotated_key: Option<(u64, u64, NodeId)>,
+    /// The measurements kept on the current page, with their lines.
+    measured: Vec<Placed>,
+    measured_key: Option<(u64, u64, NodeId)>,
     ready: Vec<DevItem>,
     ready_key: Option<(u64, u64, usize)>,
     /// Every ready-for-dev frame (the focus view's previous / next).
@@ -186,6 +196,35 @@ pub fn draw(app: &mut FigApp, painter: &egui::Painter) {
     }
 }
 
+/// Bring the current page's measurements up to date (when the document, its revision or the page
+/// changed).
+pub fn refresh_measurements(app: &mut FigApp) {
+    let Ok(ds) = app.session.ds() else { return };
+    let key = (ds.uid, ds.revision, ds.page);
+    if app.ui.dev.measured_key != Some(key) {
+        app.ui.dev.measured = dev_measurements::on_page(&ds.doc, ds.page);
+        app.ui.dev.measured_key = Some(key);
+    }
+}
+
+/// The lines of the measurements kept on the canvas, drawn with the hover measurements (Inspect
+/// tab only; both layers shown; the focus view's frame only).
+pub fn saved_lines(app: &FigApp) -> impl Iterator<Item = &Guide> {
+    let ds = app.session.ds().ok().filter(|_| active(app));
+    let focus = ds.and_then(figcraft_engine::DocState::focused);
+    app.ui
+        .dev
+        .measured
+        .iter()
+        .filter(move |m| {
+            ds.is_some_and(|ds| {
+                let shown = |id: NodeId| ds.doc.node(id).is_some_and(|n| n.visible);
+                shown(m.from) && m.measurement.to.is_none_or(shown) && focus.is_none_or(|f| ds.doc.is_ancestor(f, m.from))
+            })
+        })
+        .flat_map(|m| &m.lines)
+}
+
 /// One annotation as a card: its category, its note (up to six lines) and its pinned properties
 /// with their values.
 struct Callout {
@@ -252,7 +291,7 @@ impl Callout {
 
 /// Where the template being edited in Connect to code keeps its draft.
 fn template_id(owner: NodeId, lang: CodeLang) -> Id {
-    Id::new(("code_connect_template", owner, lang.id()))
+    Id::unique(("code_connect_template", owner, lang.id()))
 }
 
 /// Layer `id`'s code in `lang`, generated again only when the document or the choice change (a
@@ -281,13 +320,14 @@ pub fn code(app: &mut FigApp, ui: &Ui, id: NodeId, lang: CodeLang) -> String {
 }
 
 /// The component playground, for a selected instance, component or component set: a preview of the
-/// component and a control for each variant, boolean and text property. The values tried here
-/// change the preview and the code only (returned when any is set: the Code section shows it),
-/// never the document.
+/// component and a control for each variant, boolean, text and instance-swap property. The values
+/// tried here change the preview and the code only (returned when any is set: the Code section
+/// shows it), never the document.
 pub fn playground_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id: NodeId, lang: CodeLang) -> Option<String> {
     figcraft_engine::playground::component_of(doc, id)?;
     let t = Tokens::get(ui.ctx());
     let Ok((uid, revision)) = app.session.ds().map(|d| (d.uid, d.revision)) else { return None };
+    let comps = crate::component_panel::local_components(app, ui, doc);
     let play = &mut app.ui.dev.playground;
     if play.target != Some(id) {
         *play = Playground { target: Some(id), ..Playground::default() };
@@ -350,14 +390,23 @@ pub fn playground_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id: Nod
             "text" => row(ui, 32.0, |ui| {
                 widgets::label(ui, name, t.text_secondary);
                 let cur = value.as_str().unwrap_or("");
-                let field = Id::new(("playground_text", id, name));
+                let field = Id::unique(("playground_text", id, name));
                 if let Some(new) = widgets::text_field_named(ui, field, cur, ui.available_width().max(60.0), name)
                     && new != cur
                 {
                     set = Some((name.to_string(), json!(new.chars().take(10_000).collect::<String>())));
                 }
             }),
-            // Instance swaps and slots show as the component has them.
+            "instanceSwap" => row(ui, 32.0, |ui| {
+                widgets::label(ui, name, t.text_secondary);
+                let preferred: Vec<NodeId> = p["preferred"].as_array().into_iter().flatten().filter_map(figcraft_engine::params::id_of).collect();
+                let w = ui.available_width().max(60.0);
+                if let Some(c) = crate::component_panel::swap_dropdown(ui, doc, figcraft_engine::params::id_of(value), &preferred, &comps, w, name).1
+                {
+                    set = Some((name.to_string(), json!(c.0)));
+                }
+            }),
+            // Slots show as the component has them.
             _ => {}
         }
     }
@@ -396,7 +445,7 @@ pub fn connect_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id: NodeId
         let text = if connectable {
             tr("Link this component to its code component: instances then show your real snippet with their values.")
         } else {
-            tr("Choose React, Leptos, SwiftUI, Compose or Flutter above to connect this component to its code.")
+            tr("Choose React, Leptos, Vue, SwiftUI, Compose, ArkUI or Flutter above to connect this component to its code.")
         };
         widgets::note(ui, text, t.text_secondary);
         return;
@@ -422,10 +471,10 @@ pub fn connect_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id: NodeId
     let col = widgets::col_width(ui.available_width());
     row(ui, 32.0, |ui| {
         ui.spacing_mut().item_spacing.x = 8.0;
-        if let Some(v) = widgets::text_field(ui, Id::new(("code_connect_import", owner, lang.id())), &link.import_path, col, tr("Import path")) {
+        if let Some(v) = widgets::text_field(ui, Id::unique(("code_connect_import", owner, lang.id())), &link.import_path, col, tr("Import path")) {
             edit = Some(("importPath", v));
         }
-        if let Some(v) = widgets::text_field(ui, Id::new(("code_connect_name", owner, lang.id())), &link.name, col, tr("Component name")) {
+        if let Some(v) = widgets::text_field(ui, Id::unique(("code_connect_name", owner, lang.id())), &link.name, col, tr("Component name")) {
             edit = Some(("name", v));
         }
     });
@@ -500,18 +549,18 @@ pub fn status(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
     row(ui, 32.0, |ui| crate::section_panel::status_dropdown(app, ui, doc, sel, w));
     if let [id] = sel {
         let changed = doc.node(*id).is_some_and(|n| n.dev_status == DevStatus::ReadyForDev && n.dev_changed);
-        let focused = app.session.ds().ok().and_then(figcraft_engine::DocState::focused) == Some(*id);
+        let ds = app.session.ds().ok();
+        let focused = ds.and_then(figcraft_engine::DocState::focused) == Some(*id);
+        // Unchanged since it was marked (or not ready for dev): compared with the newest saved version.
+        let newest = ds.and_then(|d| d.versions.last()).map(|v| v.id.clone()).filter(|_| !changed);
         row(ui, 32.0, |ui| {
             ui.spacing_mut().item_spacing.x = 8.0;
             if !focused && widgets::button(ui, tr("Focus view"), false, true).on_hover_text(tr("Show only this on the canvas")).clicked() {
                 app.run("dev.focus", json!({"id": id}));
             }
-            if changed
-                && widgets::button(ui, tr("Compare changes"), true, true)
-                    .on_hover_text(tr("What changed since it was marked ready for dev"))
-                    .clicked()
-            {
-                app.run("dev.compare", json!({"id": id, "show": true}));
+            let tip = if changed { tr("What changed since it was marked ready for dev") } else { tr("What changed since a saved version") };
+            if (changed || newest.is_some()) && widgets::button(ui, tr("Compare changes"), changed, true).on_hover_text(tip).clicked() {
+                app.run("dev.compare", json!({"id": id, "version": newest, "show": true}));
             }
         });
     }
@@ -536,13 +585,13 @@ pub fn annotations_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id: No
             t.text_secondary,
         );
         let del = Rect::from_center_size(pos2(r.max.x - PAD - 4.0, r.center().y), vec2(22.0, 22.0));
-        if widgets::icon_button_at(ui, Id::new(("annot_del", id, k)), del, Icon::Minus, tr("Remove annotation")) {
+        if widgets::icon_button_at(ui, Id::unique(("annot_del", id, k)), del, Icon::Minus, tr("Remove annotation")) {
             app.run("annotation.remove", json!({"id": id, "index": k}));
         }
-        if let Some(cat) = category_menu(ui, doc, Id::new(("annot_cat", id, k)), a) {
+        if let Some(cat) = category_menu(ui, doc, Id::unique(("annot_cat", id, k)), a) {
             app.run("annotation.edit", json!({"id": id, "index": k, "category": cat}));
         }
-        if let Some(label) = widgets::multiline_field(ui, Id::new(("annot_note", id, k)), &a.label, tr("Add a note for developers"), 2) {
+        if let Some(label) = widgets::multiline_field(ui, Id::unique(("annot_note", id, k)), &a.label, tr("Add a note for developers"), 2) {
             if label.trim().is_empty() && a.properties.is_empty() {
                 app.run("annotation.remove", json!({"id": id, "index": k}));
             } else {
@@ -553,7 +602,7 @@ pub fn annotations_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id: No
         for (p, v) in annotations::pinned(doc, id, a) {
             prop_row(app, ui, &v.unwrap_or_else(|| Prop { label: p.label.to_string(), value: "—".into(), color: None, token: None }));
         }
-        if let Some(p) = pin_menu(ui, Id::new(("annot_pin", id, k)), &sections, &a.properties) {
+        if let Some(p) = pin_menu(ui, Id::unique(("annot_pin", id, k)), &sections, &a.properties) {
             let mut props = a.properties.clone();
             match props.iter().position(|q| q == p.id) {
                 Some(i) => {
@@ -571,7 +620,7 @@ pub fn annotations_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id: No
     }
     // A new annotation starts as a note; properties are pinned to it afterwards.
     if n.annotations.len() < annotations::MAX_PER_LAYER
-        && let Some(label) = widgets::multiline_field(ui, Id::new(("annot_new", id)), "", tr("Add an annotation for developers"), 1)
+        && let Some(label) = widgets::multiline_field(ui, Id::unique(("annot_new", id)), "", tr("Add an annotation for developers"), 1)
         && !label.trim().is_empty()
     {
         app.run("annotation.add", json!({"id": id, "label": label}));
@@ -587,7 +636,7 @@ pub fn dev_resources_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id:
     let Some(n) = doc.node(id).filter(|n| !n.is_page()) else { return };
     let list = dev_resources::list(doc, id);
     let can_add = !components::inside_instance(doc, id) && n.dev_resources.len() < dev_resources::MAX_PER_LAYER;
-    let (adding_id, editing_id) = (Id::new(("devres_adding", id)), Id::new(("devres_editing", id)));
+    let (adding_id, editing_id) = (Id::unique(("devres_adding", id)), Id::unique(("devres_editing", id)));
     let mut adding = can_add && ui.data(|d| d.get_temp::<bool>(adding_id)).unwrap_or(false);
     let mut editing = ui.data(|d| d.get_temp::<usize>(editing_id)).filter(|i| *i < n.dev_resources.len());
     widgets::separator(ui);
@@ -603,10 +652,10 @@ pub fn dev_resources_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id:
             let mut edit = None;
             row(ui, 32.0, |ui| {
                 ui.spacing_mut().item_spacing.x = 8.0;
-                if let Some(v) = widgets::text_field(ui, Id::new(("devres_name", id, i)), name, col, tr("Name")) {
+                if let Some(v) = widgets::text_field(ui, Id::unique(("devres_name", id, i)), name, col, tr("Name")) {
                     edit = Some(json!({"id": id, "index": i, "name": v}));
                 }
-                if let Some(v) = widgets::text_field(ui, Id::new(("devres_url", id, i)), url, col, "https://…") {
+                if let Some(v) = widgets::text_field(ui, Id::unique(("devres_url", id, i)), url, col, "https://…") {
                     edit = Some(json!({"id": id, "index": i, "url": v}));
                 }
                 if widgets::icon_button(ui, Icon::Check, tr("Done")) {
@@ -628,24 +677,25 @@ pub fn dev_resources_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id:
         }
         icons::paint(ui.painter(), Rect::from_center_size(pos2(r.min.x + PAD + 7.0, r.center().y), vec2(14.0, 14.0)), Icon::Link, t.icon_secondary);
         let x = r.min.x + PAD + 22.0;
-        ui.painter().text(pos2(x, r.center().y - 7.0), Align2::LEFT_CENTER, widgets::elide(ui, name, text_w), semibold(11.0), ACCENT);
+        ui.painter().text(pos2(x, r.center().y - 7.0), Align2::LEFT_CENTER, widgets::elide(ui, name, text_w), semibold(11.0), t.accent_text);
         let below = match item.from.and_then(|f| doc.node(f)) {
             Some(m) => trf("From {name}", &[("name", &m.name)]),
             None => url.clone(),
         };
         ui.painter().text(pos2(x, r.center().y + 7.0), Align2::LEFT_CENTER, widgets::elide(ui, &below, text_w), regular(10.0), t.text_secondary);
         crate::a11y::link(&resp, name);
-        // Opened only on a click, never fetched.
-        if resp.on_hover_text(url.as_str()).clicked() {
+        // Opened only on a click, never fetched, and a dev resource's URL comes from the
+        // document, so only a web link opens.
+        if resp.on_hover_text(url.as_str()).clicked() && figcraft_engine::doc_urls::openable(url) {
             ui.ctx().open_url(egui::OpenUrl::new_tab(url));
         }
         if let Some(i) = item.index {
             let del = Rect::from_center_size(pos2(r.max.x - PAD - 4.0, r.center().y), vec2(22.0, 22.0));
             let pen = del.translate(vec2(-26.0, 0.0));
-            if widgets::icon_button_at(ui, Id::new(("devres_edit", id, i)), pen, Icon::Pencil, tr("Edit dev resource")) {
+            if widgets::icon_button_at(ui, Id::unique(("devres_edit", id, i)), pen, Icon::Pencil, tr("Edit dev resource")) {
                 editing = Some(i);
             }
-            if widgets::icon_button_at(ui, Id::new(("devres_del", id, i)), del, Icon::Minus, tr("Remove dev resource")) {
+            if widgets::icon_button_at(ui, Id::unique(("devres_del", id, i)), del, Icon::Minus, tr("Remove dev resource")) {
                 app.run("devResource.remove", json!({"id": id, "index": i}));
                 editing = None;
             }
@@ -654,7 +704,7 @@ pub fn dev_resources_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id:
     if adding {
         let w = ui.available_width() - PAD * 2.0;
         let mut added = None;
-        row(ui, 32.0, |ui| added = widgets::text_field(ui, Id::new(("devres_new", id)), "", w, tr("Paste a link (https://…)")));
+        row(ui, 32.0, |ui| added = widgets::text_field(ui, Id::unique(("devres_new", id)), "", w, tr("Paste a link (https://…)")));
         if let Some(url) = added.filter(|u| !u.trim().is_empty())
             && app.run("devResource.add", json!({"id": id, "url": url})).is_some()
         {
@@ -675,6 +725,97 @@ pub fn dev_resources_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, id:
     ui.add_space(4.0);
 }
 
+/// The menu label of measuring along `side`.
+fn side_label(side: figcraft_doc::Side) -> &'static str {
+    use figcraft_doc::Side;
+    match side {
+        Side::Top => tr("Along the top"),
+        Side::Right => tr("Along the right"),
+        Side::Bottom => tr("Along the bottom"),
+        Side::Left | Side::Auto => tr("Along the left"),
+    }
+}
+
+/// Measurements kept on the canvas: those from or to the selected layer (with nothing selected,
+/// every one on the page), each with its distances; a click selects the layer it starts from and
+/// − removes it. With a layer selected, a menu places a new one: between two selected layers, to
+/// the layer around it or along one of its sides.
+pub fn measurements_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
+    use figcraft_doc::Side;
+    refresh_measurements(app);
+    let t = Tokens::get(ui.ctx());
+    let first = sel.first().copied().filter(|id| doc.node(*id).is_some_and(|n| !n.is_page()));
+    let rows: Vec<&Placed> = app.ui.dev.measured.iter().filter(|m| first.is_none_or(|id| m.touches(id))).collect();
+    if first.is_none() && rows.is_empty() {
+        return;
+    }
+    let mut action: Option<(&str, serde_json::Value)> = None;
+    widgets::separator(ui);
+    widgets::section_header(ui, tr("Measurements"), &[], rows.is_empty());
+    for m in &rows {
+        if let Some(a) = measurement_row(ui, &t, doc, m) {
+            action = Some(a);
+        }
+    }
+    if let Some(id) = first {
+        let around = doc.node(id).and_then(|n| n.parent).and_then(|p| doc.node(p)).is_some_and(|p| !p.is_page());
+        let w = ui.available_width() - PAD * 2.0;
+        row(ui, 32.0, |ui| {
+            let resp = widgets::dropdown(ui, tr("Add measurement"), w, Some(Icon::Measure))
+                .on_hover_text(tr("Keep a measurement on the canvas for developers"));
+            menu_popup(&resp).show(|ui| {
+                if let [a, b, ..] = sel
+                    && menu_item(ui, tr("Between the selected layers"), "")
+                {
+                    action = Some(("devMode.addMeasurement", json!({"from": a, "to": b})));
+                }
+                if around && menu_item(ui, tr("To the layer around it"), "") {
+                    action = Some(("devMode.addMeasurement", json!({"from": id})));
+                }
+                for side in [Side::Top, Side::Right, Side::Bottom, Side::Left] {
+                    if menu_item(ui, side_label(side), "") {
+                        action = Some(("devMode.addMeasurement", json!({"from": id, "side": side})));
+                    }
+                }
+            });
+        });
+    }
+    if let Some((cmd, params)) = action {
+        app.run(cmd, params);
+    }
+    ui.add_space(4.0);
+}
+
+/// One measurement in the Inspect tab, on two lines: what it measures, and its distances below. A
+/// click selects the layer it starts from, − removes it: the command to run.
+fn measurement_row(ui: &mut Ui, t: &Tokens, doc: &Document, m: &Placed) -> Option<(&'static str, serde_json::Value)> {
+    let name = |id: NodeId| doc.node(id).map_or(String::new(), |n| n.name.clone());
+    let mut action = None;
+    let (r, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 36.0), Sense::click());
+    if resp.hovered() {
+        ui.painter().rect_filled(r.shrink2(vec2(PAD / 2.0, 1.0)), CornerRadius::same(4), t.hover);
+    }
+    icons::paint(ui.painter(), Rect::from_center_size(pos2(r.min.x + PAD + 7.0, r.center().y), vec2(14.0, 14.0)), Icon::Measure, t.icon_secondary);
+    let what = match (m.measurement.to, m.measurement.side) {
+        (Some(to), _) => format!("{} → {}", name(m.from), name(to)),
+        (None, side) => format!("{} · {}", name(m.from), side.map_or("", side_label)),
+    };
+    let value = m.labels().join(" · ");
+    let del = Rect::from_center_size(pos2(r.max.x - PAD - 4.0, r.center().y), vec2(22.0, 22.0));
+    let x = r.min.x + PAD + 22.0;
+    let text_w = del.min.x - 6.0 - x;
+    ui.painter().text(pos2(x, r.center().y - 7.0), Align2::LEFT_CENTER, widgets::elide(ui, &what, text_w), regular(11.0), t.text);
+    ui.painter().text(pos2(x, r.center().y + 7.0), Align2::LEFT_CENTER, widgets::elide(ui, &value, text_w), regular(10.0), t.text_secondary);
+    crate::a11y::button(&resp, &format!("{what}: {value}"));
+    if resp.clicked() {
+        action = Some(("select.set", json!({"ids": [m.from]})));
+    }
+    if widgets::icon_button_at(ui, Id::unique(("measure_del", m.from, m.index)), del, Icon::Minus, tr("Remove measurement")) {
+        action = Some(("devMode.removeMeasurement", json!({"from": m.from, "index": m.index})));
+    }
+    action
+}
+
 /// The category of annotation `a` as a dropdown: the one picked (`Value::Null` for none).
 fn category_menu(ui: &mut Ui, doc: &Document, id: Id, a: &Annotation) -> Option<serde_json::Value> {
     let current = annotations::category_of(doc, a);
@@ -745,7 +886,7 @@ pub fn categories_section(app: &mut FigApp, ui: &mut Ui) {
         let (r, _) = ui.allocate_exact_size(vec2(ui.available_width(), 30.0), Sense::hover());
         // The colour: click for the palette.
         let sw = Rect::from_center_size(pos2(r.min.x + PAD + 8.0, r.center().y), vec2(16.0, 16.0));
-        let sw_resp = ui.interact(sw, Id::new(("cat_color", &c.id)), Sense::click()).tip(tr("Colour"));
+        let sw_resp = ui.interact(sw, Id::unique(("cat_color", &c.id)), Sense::click()).tip(tr("Colour"));
         crate::a11y::color(&sw_resp, &c.name, &c.color.to_css_hex());
         ui.painter().rect_filled(sw, CornerRadius::same(4), doc_c32(ui.ctx(), c.color));
         if sw_resp.hovered() {
@@ -768,14 +909,14 @@ pub fn categories_section(app: &mut FigApp, ui: &mut Ui) {
             });
         });
         let name_r = Rect::from_min_max(pos2(sw.max.x + 8.0, r.min.y + 3.0), pos2(r.max.x - PAD - 28.0, r.max.y - 3.0));
-        if let Some(name) = widgets::text_field_inline(ui, Id::new(("cat_name", &c.id)), &c.name, name_r, regular(11.0))
+        if let Some(name) = widgets::text_field_inline(ui, Id::unique(("cat_name", &c.id)), &c.name, name_r, regular(11.0))
             && name.trim() != c.name
             && !name.trim().is_empty()
         {
             action = Some(("annotation.editCategory", json!({"id": c.id, "name": name.trim()})));
         }
         let del = Rect::from_center_size(pos2(r.max.x - PAD - 8.0, r.center().y), vec2(22.0, 22.0));
-        if widgets::icon_button_at(ui, Id::new(("cat_del", &c.id)), del, Icon::Minus, tr("Delete category (its annotations stay)")) {
+        if widgets::icon_button_at(ui, Id::unique(("cat_del", &c.id)), del, Icon::Minus, tr("Delete category (its annotations stay)")) {
             action = Some(("annotation.removeCategory", json!({"id": c.id})));
         }
     }
@@ -818,7 +959,9 @@ pub fn ready_list(app: &mut FigApp, ui: &mut Ui) {
     let filter = app.ui.dev.filter.min(FILTERS.len() - 1);
     let key = (ds.uid, ds.revision, filter);
     if app.ui.dev.ready_key != Some(key) {
-        app.ui.dev.ready = devinspect::dev_items(&ds.doc, FILTERS.get(filter).and_then(|f| f.0), None);
+        let (status, changed_only) = FILTERS.get(filter).map_or((None, false), |f| (f.0, f.1));
+        app.ui.dev.ready = devinspect::dev_items(&ds.doc, status, None);
+        app.ui.dev.ready.retain(|i| i.changed || !changed_only);
         app.ui.dev.ready_key = Some(key);
     }
     let doc = ds.doc.clone();
@@ -826,9 +969,9 @@ pub fn ready_list(app: &mut FigApp, ui: &mut Ui) {
     widgets::section_header(ui, tr("Ready for dev"), &[], app.ui.dev.ready.is_empty());
     let w = ui.available_width() - PAD * 2.0;
     row(ui, 32.0, |ui| {
-        let resp = widgets::dropdown(ui, FILTERS.get(filter).map_or("", |f| tr(f.1)), w, Some(Icon::Code));
+        let resp = widgets::dropdown(ui, FILTERS.get(filter).map_or("", |f| tr(f.2)), w, Some(Icon::Code));
         menu_popup(&resp).show(|ui| {
-            for (i, (_, label)) in FILTERS.iter().enumerate() {
+            for (i, (_, _, label)) in FILTERS.iter().enumerate() {
                 if menu_check(ui, i == filter, tr(label), "") {
                     app.ui.dev.filter = i;
                     ui.close();
@@ -847,15 +990,21 @@ pub fn ready_list(app: &mut FigApp, ui: &mut Ui) {
         if resp.hovered() {
             ui.painter().rect_filled(r.shrink2(vec2(8.0, 0.0)), CornerRadius::same(5), t.hover);
         }
-        let dot = if item.status == DevStatus::ReadyForDev { t.success } else { t.text_tertiary };
+        // The status colours the canvas badges use; a changed one also says so after its name.
+        let n = doc.node(item.id);
+        let dot = n.and_then(crate::canvas::status_label).map_or(t.text_tertiary, |(_, c)| c);
         ui.painter().circle_filled(pos2(r.min.x + PAD + 4.0, r.center().y), 4.0, dot);
         let page = doc.node(item.page).map(|p| p.name.clone()).unwrap_or_default();
         let page_w = ui.painter().layout_no_wrap(page.clone(), regular(10.0), t.text_secondary).size().x.min(90.0);
         let page_r = Rect::from_min_max(pos2(r.max.x - PAD - page_w, r.min.y), pos2(r.max.x - PAD, r.max.y));
         ui.painter().with_clip_rect(page_r).text(page_r.right_center(), Align2::RIGHT_CENTER, page, regular(10.0), t.text_secondary);
         let name_r = Rect::from_min_max(pos2(r.min.x + PAD + 14.0, r.min.y), pos2(page_r.min.x - 8.0, r.max.y));
-        let name = widgets::elide(ui, &item.name, name_r.width());
-        ui.painter().text(name_r.left_center(), Align2::LEFT_CENTER, name, regular(11.0), t.text);
+        // Room for the "Changed" badge (about 60 points) after the name.
+        let name = widgets::elide(ui, &item.name, name_r.width() - if item.changed { 64.0 } else { 0.0 });
+        let name_end = ui.painter().text(name_r.left_center(), Align2::LEFT_CENTER, name, regular(11.0), t.text).max.x;
+        if let Some(n) = n.filter(|_| item.changed) {
+            crate::canvas::status_badge(&ui.painter().with_clip_rect(name_r), n, pos2(name_end + 6.0, r.center().y));
+        }
         // Hovered: a button to open it in the focus view, over the page name.
         let focus_r = Rect::from_center_size(pos2(r.max.x - PAD - 10.0, r.center().y), vec2(22.0, 22.0));
         let over_focus = ui.rect_contains_pointer(focus_r);
@@ -865,7 +1014,7 @@ pub fn ready_list(app: &mut FigApp, ui: &mut Ui) {
                 CornerRadius::same(5),
                 t.hover,
             );
-            if widgets::icon_button_at(ui, Id::new(("ready_focus", item.id)), focus_r, Icon::Frame, tr("Open in focus view")) {
+            if widgets::icon_button_at(ui, Id::unique(("ready_focus", item.id)), focus_r, Icon::Frame, tr("Open in focus view")) {
                 focus = Some(item.id);
             }
         }
@@ -909,7 +1058,7 @@ pub fn focus_bar(app: &mut FigApp, ctx: &egui::Context, canvas: Rect) {
     // Somewhere to go: another ready frame, or into the list from outside it.
     let can_step = list.len() > usize::from(at.is_some());
     let t = Tokens::get(ctx);
-    let action = widgets::canvas_banner(ctx, Id::new("dev_focus_bar"), canvas, |ui| {
+    let action = widgets::canvas_banner(ctx, Id::unique("dev_focus_bar"), canvas, |ui| {
         let mut out = None;
         let icon = crate::layers::node_icon(&doc, id);
         icons::paint(ui.painter(), Rect::from_center_size(ui.cursor().min + vec2(7.0, 12.0), vec2(14.0, 14.0)), icon, t.icon_secondary);
diff --git a/crates/ui-egui/src/export_panel.rs b/crates/ui-egui/src/panels/export_panel.rs
similarity index 70%
rename from crates/ui-egui/src/export_panel.rs
rename to crates/ui-egui/src/panels/export_panel.rs
index ade5df29..5a9c4ae2 100644
--- a/crates/ui-egui/src/export_panel.rs
+++ b/crates/ui-egui/src/panels/export_panel.rs
@@ -11,9 +11,9 @@ use figcraft_engine::cmd::file::export_jobs;
 use serde_json::{Value, json};
 
 use crate::FigApp;
-use crate::i18n::{tr, trf, trn};
+use crate::i18n::{tr, tr_noop, trf, trn};
 use crate::icons::{self, Icon};
-use crate::right::{common, menu_item, menu_popup, row};
+use crate::right::{common, menu_popup, menu_row, row};
 use crate::theme::{Tokens, regular};
 use crate::widgets::{self, FIELD_H};
 
@@ -40,8 +40,9 @@ pub fn section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
     if mixed {
         widgets::note(ui, tr("Click + to replace mixed content"), t.text_secondary);
     }
+    let text = sel.iter().all(|i| matches!(doc.node(*i).map(|n| &n.kind), Some(NodeKind::Text(_))));
     for (i, e) in list.iter().enumerate() {
-        setting_row(app, ui, &ids, i, e);
+        setting_row(app, ui, &ids, i, e, text);
     }
     let jobs = export_jobs(doc, sel);
     if jobs.is_empty() {
@@ -60,30 +61,42 @@ pub fn section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
     }
 }
 
-/// One export setting: size (typed or picked), suffix, format, advanced options and remove; a
-/// PDF's print settings under it.
-fn setting_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, e: &ExportSetting) {
+/// One export setting: size (typed or picked; images only, SVG and PDF are vector), suffix,
+/// format, advanced options and remove; a PDF's print settings under it. `text`: every layer in
+/// `ids` is a text layer.
+fn setting_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, e: &ExportSetting, text: bool) {
     row(ui, 32.0, |ui| {
         // Tighter spacing so the advanced options and remove buttons fit beside the fields.
         ui.spacing_mut().item_spacing.x = 4.0;
-        let (size_w, format_w, button, gap) = (52.0, 54.0, 22.0, ui.spacing().item_spacing.x);
-        let suffix_w = (ui.available_width() - size_w - format_w - button * 2.0 - gap * 4.0).max(32.0);
-        let presets: Vec<String> =
-            ExportSize::SCALES.iter().map(|value| ExportSize::Scale { value: *value }.label()).chain(["512w".into(), "512h".into()]).collect();
-        if let Some(s) = widgets::combo_field(ui, Id::new(("export_size", i)), &e.size.label(), size_w, &presets)
-            && ExportSize::parse(&s) != Some(e.size)
-        {
-            app.run("export.update", json!({"ids": ids, "index": i, "size": s}));
+        let (format_w, button, gap) = (54.0, 22.0, ui.spacing().item_spacing.x);
+        let size_w = e.format.is_raster().then_some(52.0);
+        let suffix_w = (ui.available_width() - size_w.map_or(0.0, |w| w + gap) - format_w - button * 2.0 - gap * 3.0).max(32.0);
+        if let Some(size_w) = size_w {
+            let presets: Vec<String> =
+                ExportSize::SCALES.iter().map(|value| ExportSize::Scale { value: *value }.label()).chain(["512w".into(), "512h".into()]).collect();
+            if let Some(s) = widgets::combo_field(ui, Id::unique(("export_size", i)), &e.size.label(), size_w, &presets)
+                && ExportSize::parse(&s) != Some(e.size)
+            {
+                app.run("export.update", json!({"ids": ids, "index": i, "size": s}));
+            }
         }
-        if let Some(sfx) = widgets::text_field(ui, Id::new(("export_suffix", i)), &e.suffix, suffix_w, tr("Suffix"))
+        if let Some(sfx) = widgets::text_field(ui, Id::unique(("export_suffix", i)), &e.suffix, suffix_w, tr("Suffix"))
             && sfx != e.suffix
         {
             app.run("export.update", json!({"ids": ids, "index": i, "suffix": sfx}));
         }
-        let resp = widgets::dropdown(ui, e.format.label(), format_w, None);
+        let mut resp = widgets::dropdown(ui, e.format.label(), format_w, None);
+        if let Some(tip) = format_tip(e.format) {
+            resp = resp.on_hover_text(tip);
+        }
         menu_popup(&resp).show(|ui| {
             for f in ExportFormat::ALL {
-                if menu_item(ui, f.label(), "") {
+                let item = menu_row(ui, f.label(), "", 0.0, |_, _, _| {});
+                let item = match format_tip(f) {
+                    Some(tip) => item.on_hover_text(tip),
+                    None => item,
+                };
+                if item.clicked() {
                     app.run("export.update", json!({"ids": ids, "index": i, "format": f.ext()}));
                     ui.close();
                 }
@@ -91,11 +104,11 @@ fn setting_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, e: &Expo
         });
         let more = icons::button(ui, Icon::Dots, button, false, tr("Export settings"));
         egui::Popup::from_toggle_button_response(&more)
-            .id(Id::new(("export_more", i)))
+            .id(Id::unique(("export_more", i)))
             .width(216.0)
             .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
             .show(|ui| {
-                if let Some(mut params) = advanced_options(ui, e) {
+                if let Some(mut params) = advanced_options(ui, e, text) {
                     params["ids"] = json!(ids);
                     params["index"] = json!(i);
                     app.run("export.update", params);
@@ -110,22 +123,51 @@ fn setting_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, e: &Expo
     }
 }
 
-/// A setting's advanced options: contents only and include bounding box, and for SVG outline
-/// text, the id attribute and simplified strokes. Returns the changed option as command params.
-fn advanced_options(ui: &mut Ui, e: &ExportSetting) -> Option<Value> {
+/// What a format's short label doesn't say ("XML" is an Android Vector Drawable), for its tooltip.
+pub(crate) fn format_tip(f: ExportFormat) -> Option<&'static str> {
+    match f {
+        ExportFormat::VectorDrawable => Some(tr("Android Vector Drawable")),
+        _ => None,
+    }
+}
+
+/// The Android Vector Drawable compatibility modes, as the advanced options list them.
+/// Best effort approximates what the format can't draw (with a warning), exact only leaves it out
+/// (with a warning), ignore leaves it out silently.
+const VD_COMPAT: [(VdCompat, &str); 3] =
+    [(VdCompat::BestEffort, tr_noop("Best effort")), (VdCompat::Exact, tr_noop("Exact only")), (VdCompat::Ignore, tr_noop("Ignore unsupported"))];
+
+/// A setting's advanced options: ignore overlapping layers (`contentsOnly`), include bounding box
+/// for text layers (and for any setting that has it on, so it can be turned off); for SVG outline
+/// text, the id attribute and simplified strokes; for XML (Android Vector Drawable) the id attribute
+/// (as `android:name`) and the compatibility mode. Returns the changed option as command params.
+fn advanced_options(ui: &mut Ui, e: &ExportSetting, text: bool) -> Option<Value> {
     let mut out = None;
     let mut option = |ui: &mut Ui, key: &str, on: bool, label: &str| {
         if widgets::checkbox(ui, on, label) {
             out = Some(json!({ key: !on }));
         }
     };
-    option(ui, "contentsOnly", e.contents_only, tr("Contents only"));
-    option(ui, "includeBoundingBox", e.include_bounding_box, tr("Include bounding box"));
+    option(ui, "contentsOnly", e.contents_only, tr("Ignore overlapping layers"));
+    if text || e.include_bounding_box {
+        option(ui, "includeBoundingBox", e.include_bounding_box, tr("Include bounding box"));
+    }
     if e.format == ExportFormat::Svg {
         option(ui, "svgOutlineText", e.svg_outline_text, tr("Outline text"));
         option(ui, "svgIdAttribute", e.svg_id_attribute, tr("Include id attribute"));
         option(ui, "svgSimplifyStroke", e.svg_simplify_stroke, tr("Simplify stroke"));
     }
+    if e.format == ExportFormat::VectorDrawable {
+        option(ui, "svgIdAttribute", e.svg_id_attribute, tr("Include id attribute"));
+        ui.add_space(4.0);
+        widgets::label(ui, tr("Compatibility"), Tokens::get(ui.ctx()).text_secondary);
+        for (mode, label) in VD_COMPAT {
+            let on = e.vd_compat == mode;
+            if widgets::radio(ui, on, tr(label)) && !on {
+                out = Some(json!({"vdCompat": mode.key()}));
+            }
+        }
+    }
     out
 }
 
@@ -133,7 +175,7 @@ fn advanced_options(ui: &mut Ui, e: &ExportSetting) -> Option<Value> {
 fn print_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, p: &PrintSettings) {
     let t = Tokens::get(ui.ctx());
     row(ui, 26.0, |ui| {
-        let open_id = Id::new(("export_print", i));
+        let open_id = Id::unique(("export_print", i));
         let open = egui::Popup::is_id_open(ui.ctx(), open_id);
         let (r, resp) = ui.allocate_exact_size(vec2(ui.available_width(), FIELD_H), Sense::click());
         if resp.hovered() || open {
@@ -147,7 +189,7 @@ fn print_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, p: &PrintS
             .width(216.0)
             .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
             .show(|ui| {
-                if let Some(next) = print_options(ui, Id::new(("export_print_fields", i)), p) {
+                if let Some(next) = print_options(ui, Id::unique(("export_print_fields", i)), p) {
                     let mut params = print_params(&next);
                     params["ids"] = json!(ids);
                     params["index"] = json!(i);
@@ -255,7 +297,7 @@ fn preview(app: &mut FigApp, ui: &mut Ui, doc: &Document, id: NodeId) {
     }
     let revision = app.session.ds().map(|d| d.revision).unwrap_or(0);
     let now = ui.input(|i| i.time);
-    let cache_id = Id::new("export_preview_tex");
+    let cache_id = Id::unique("export_preview_tex");
     let cached: Option<PreviewTex> = ui.data(|d| d.get_temp(cache_id));
     let stale = cached.as_ref().is_none_or(|c| c.id != id || c.revision != revision);
     let due = cached.as_ref().is_none_or(|c| c.id != id || now - c.at >= PREVIEW_REFRESH);
@@ -317,12 +359,28 @@ pub(crate) fn export_layers(app: &mut FigApp, ids: &[NodeId], assets: bool) {
         [] => {}
         // The suggested name keeps only the file's own name (a layer's folders apply to folders).
         [one] => save_one(app, &[one.id], &one.setting, one.file.rsplit('/').next().unwrap_or(&one.file)),
+        // No folders in the browser, and it lets a page start one download at a time: the files
+        // arrive together as one zip (#969).
+        _ if app.services.downloads() => {
+            let name = format!("{}.zip", app.session.doc().map_or("Export", |d| d.name.as_str()));
+            if let Some(r) = app.run("file.exportLayers", json!({"ids": ids, "assets": assets, "zip": true}))
+                && app.download(&name, &r)
+            {
+                app.toast(trn("Exported {n} files", r["files"].as_array().map_or(0, Vec::len), &[]));
+            }
+        }
         _ => {
             let ids = ids.to_vec();
             app.pick_folder(tr("Export"), move |app, dir| {
                 if let Some(r) = app.run("file.exportLayers", json!({"ids": ids, "dir": dir.to_string_lossy(), "assets": assets})) {
-                    let n = r["files"].as_array().map_or(0, Vec::len);
-                    app.toast(trn("Exported {n} files", n, &[]));
+                    let files = r["files"].as_array().cloned().unwrap_or_default();
+                    // Android Vector Drawables say what they changed or left out.
+                    let changed = files.iter().any(|f| f["warnings"].as_array().is_some_and(|w| !w.is_empty()));
+                    app.toast(if changed {
+                        trn("Exported {n} files; some content was changed or left out", files.len(), &[])
+                    } else {
+                        trn("Exported {n} files", files.len(), &[])
+                    });
                 }
             });
         }
@@ -334,10 +392,23 @@ pub(crate) fn save_one(app: &mut FigApp, ids: &[NodeId], setting: &ExportSetting
     let ext = setting.format.ext();
     let mut params = setting_params(setting);
     params["ids"] = json!(ids);
+    if app.services.downloads() {
+        if let Some(r) = app.run("file.export", params)
+            && app.download(file, &r)
+        {
+            app.toast(trf("Exported {name}", &[("name", &file)]));
+        }
+        return;
+    }
     app.pick_save(tr("Export"), file, &[ext], move |app, p| {
         params["path"] = json!(p.to_string_lossy());
-        if app.run("file.export", params).is_some() {
-            app.toast(trf("Exported {name}", &[("name", &p.file_name().map(|f| f.to_string_lossy().to_string()).unwrap_or_default())]));
+        if let Some(r) = app.run("file.export", params) {
+            let name = p.file_name().map(|f| f.to_string_lossy().to_string()).unwrap_or_default();
+            // Android Vector Drawables say what they changed or left out.
+            app.toast(match r["warnings"].as_array().map_or(0, Vec::len) {
+                0 => trf("Exported {name}", &[("name", &name)]),
+                n => trn("Exported {name}; {n} kinds of content were changed or left out", n, &[("name", &name)]),
+            });
         }
     });
 }
diff --git a/crates/ui-egui/src/frame_presets.rs b/crates/ui-egui/src/panels/frame_presets.rs
similarity index 93%
rename from crates/ui-egui/src/frame_presets.rs
rename to crates/ui-egui/src/panels/frame_presets.rs
index 51662d3d..9eb28162 100644
--- a/crates/ui-egui/src/frame_presets.rs
+++ b/crates/ui-egui/src/panels/frame_presets.rs
@@ -10,6 +10,8 @@ use crate::icons::{self, Icon};
 use crate::theme::{Tokens, regular, semibold};
 use crate::widgets::{self, PAD};
 
+/// Draw the expandable frame-preset categories; choosing a preset runs `frame.create`,
+/// switches to the Move tool and zooms to the new selection.
 pub fn panel(app: &mut FigApp, ui: &mut Ui) {
     let t = Tokens::get(ui.ctx());
     widgets::section_header(ui, tr("Frame"), &[], false);
@@ -22,7 +24,7 @@ pub fn panel(app: &mut FigApp, ui: &mut Ui) {
     }
     let mut chosen = None;
     for cat in cats {
-        let open_id = Id::new(("preset_cat", cat));
+        let open_id = Id::unique(("preset_cat", cat));
         // The first category starts open.
         let open: bool = ui.data(|d| d.get_temp(open_id)).unwrap_or(cat == "Phone");
         let (r, resp) = ui.allocate_exact_size(vec2(w, 32.0), Sense::click());
diff --git a/crates/ui-egui/src/layers.rs b/crates/ui-egui/src/panels/layers.rs
similarity index 80%
rename from crates/ui-egui/src/layers.rs
rename to crates/ui-egui/src/panels/layers.rs
index 8b614762..b5217678 100644
--- a/crates/ui-egui/src/layers.rs
+++ b/crates/ui-egui/src/panels/layers.rs
@@ -81,7 +81,7 @@ pub fn rail(app: &mut FigApp, ui: &mut Ui) {
     let mut y = r.min.y + 8.0;
     // Main menu (logo).
     let lr = Rect::from_center_size(pos2(r.center().x, y + 16.0), vec2(36.0, 32.0));
-    let lresp = ui.interact(lr, ui.id().with("rail_menu"), Sense::click()).tip(tr("Main menu"));
+    let lresp = ui.interact(lr, ui.scope_id().with("rail_menu"), Sense::click()).tip(tr("Main menu"));
     if lresp.hovered() || app.ui.main_menu {
         ui.painter().rect_filled(lr, CornerRadius::same(6), t.hover);
     }
@@ -100,7 +100,7 @@ pub fn rail(app: &mut FigApp, ui: &mut Ui) {
     for (icon, label, tab) in items {
         let ir = Rect::from_center_size(pos2(r.center().x, y + 14.0), vec2(36.0, 28.0));
         let hit = Rect::from_min_max(pos2(r.min.x, y), pos2(r.max.x, y + 48.0));
-        let resp = ui.interact(hit, ui.id().with(("rail", label)), Sense::click()).tip(label);
+        let resp = ui.interact(hit, ui.scope_id().with(("rail", label)), Sense::click()).tip(label);
         let active = tab.is_some_and(|tb| tb == app.ui.left_tab && !app.ui.left_collapsed && !app.ui.versions.open);
         if tab.is_some() {
             a11y::tab(&resp, label, active);
@@ -118,10 +118,10 @@ pub fn rail(app: &mut FigApp, ui: &mut Ui) {
                 Some(tb) => {
                     // Leaving the version history shows the tab rather than collapsing it.
                     if active {
-                        app.ui.left_collapsed = true;
+                        app.ui.close_left_panel();
                     } else {
                         app.ui.left_tab = tb;
-                        app.ui.left_collapsed = false;
+                        app.ui.open_left_panel();
                     }
                     app.ui.versions = Default::default();
                 }
@@ -134,6 +134,8 @@ pub fn rail(app: &mut FigApp, ui: &mut Ui) {
     }
 }
 
+/// Draw the left panel: versions when open, otherwise the file/Assets header with in-place
+/// file rename and collapse control, followed by Pages and Layers or the Assets panel.
 pub fn left_panel(app: &mut FigApp, ui: &mut Ui) {
     if app.ui.versions.open {
         crate::versions::panel(app, ui);
@@ -148,19 +150,20 @@ pub fn left_panel(app: &mut FigApp, ui: &mut Ui) {
     } else {
         let name = app.session.doc().map(|d| d.name.clone()).unwrap_or_default();
         let nr = Rect::from_min_max(pos2(head.min.x + 14.0, head.min.y + 14.0), pos2(head.max.x - 48.0, head.min.y + 34.0));
-        if let Some(new) = crate::widgets::text_field_inline(ui, Id::new("filename"), &name, nr, semibold(13.0)) {
+        let start = std::mem::take(&mut app.ui.rename_file);
+        if let (Some(new), _) = crate::widgets::rename_field(ui, Id::unique("filename"), &name, nr, semibold(13.0), start) {
             app.run("file.rename", json!({"name": new}));
         }
         ui.painter().text(pos2(head.min.x + 16.0, head.min.y + 46.0), Align2::LEFT_CENTER, tr("Drafts"), regular(11.0), t.text_secondary);
     }
     let hr = Rect::from_center_size(pos2(head.max.x - 24.0, head.min.y + 24.0), vec2(24.0, 24.0));
-    let hresp = ui.interact(hr, ui.id().with("hideui"), Sense::click()).tip(tr("Collapse panel"));
+    let hresp = ui.interact(hr, ui.scope_id().with("hideui"), Sense::click()).tip(tr("Collapse panel"));
     if hresp.hovered() {
         ui.painter().rect_filled(hr, CornerRadius::same(5), t.hover);
     }
     icons::paint(ui.painter(), hr.shrink(5.0), Icon::Panels, t.icon);
     if hresp.clicked() {
-        app.ui.left_collapsed = true;
+        app.ui.close_left_panel();
     }
     ui.painter().line_segment([head.left_bottom(), head.right_bottom()], Stroke::new(1.0, t.border));
     match app.ui.left_tab {
@@ -172,41 +175,62 @@ pub fn left_panel(app: &mut FigApp, ui: &mut Ui) {
     }
 }
 
+/// Draw the page list with open/search/add controls, filtering, selection, rename,
+/// reorder/drag and layer drop-to-page; Dev Mode allows opening pages but blocks mutations.
 fn pages(app: &mut FigApp, ui: &mut Ui) {
     let t = Tokens::get(ui.ctx());
+    // Dev Mode only inspects: rows open pages, but don't add, rename, reorder, duplicate or delete.
+    let dev = app.ui.right_tab == crate::RightTab::Inspect;
+    if dev {
+        app.ui.rename_page = None;
+    }
     let w = ui.available_width();
     let (hr, _) = ui.allocate_exact_size(vec2(w, 40.0), Sense::hover());
-    let tresp = ui.interact(Rect::from_min_size(hr.min, vec2(w - 40.0, 40.0)), ui.id().with("pages_toggle"), Sense::click());
+    let tresp = ui.interact(Rect::from_min_size(hr.min, vec2(w - 40.0, 40.0)), ui.scope_id().with("pages_toggle"), Sense::click());
     a11y::toggle(&tresp, tr("Pages"), app.ui.pages_open);
     ui.painter().text(pos2(hr.min.x + 16.0, hr.center().y), Align2::LEFT_CENTER, tr("Pages"), semibold(11.0), t.text);
     if tresp.clicked() {
         app.ui.pages_open = !app.ui.pages_open;
     }
     let sr = Rect::from_center_size(pos2(hr.max.x - 50.0, hr.center().y), vec2(24.0, 24.0));
-    let sresp = ui.interact(sr, ui.id().with("lsearch"), Sense::click()).tip(crate::shortcuts::tip(tr("Find"), "edit.findReplace"));
-    if sresp.hovered() {
+    let sresp = ui.interact(sr, ui.scope_id().with("lsearch"), Sense::click()).tip(tr("Search pages"));
+    if sresp.hovered() || app.ui.page_search {
         ui.painter().rect_filled(sr, CornerRadius::same(5), t.hover);
     }
     icons::paint(ui.painter(), sr.shrink(5.0), Icon::Search, t.icon);
+    let search_id = Id::unique("page_search_field");
     if sresp.clicked() {
-        app.ui.find = Some((String::new(), String::new()));
+        app.ui.page_search = !app.ui.page_search;
+        app.ui.page_filter.clear();
+        if app.ui.page_search {
+            app.ui.pages_open = true;
+        }
     }
     let ar = Rect::from_center_size(pos2(hr.max.x - 22.0, hr.center().y), vec2(24.0, 24.0));
-    let aresp = ui.interact(ar, ui.id().with("addpage"), Sense::click()).tip(tr("Add new page"));
+    let aresp = ui.interact(ar, ui.scope_id().with("addpage"), Sense::click()).tip(tr("Add new page"));
     if aresp.hovered() {
         ui.painter().rect_filled(ar, CornerRadius::same(5), t.hover);
     }
     icons::paint(ui.painter(), ar.shrink(5.0), Icon::Plus, t.icon);
     if aresp.clicked() {
-        app.run("page.add", json!({}));
+        app.ui.pages_focus = app.session.ds().ok().map(|d| d.uid);
+        if !crate::menus::dev_mode_refuses(app, "page.add") {
+            app.run("page.add", json!({}));
+        }
     }
     if !app.ui.pages_open {
         return;
     }
+    if app.ui.page_search {
+        search_field(ui, &t, w, search_id, tr("Search pages"), &mut app.ui.page_filter, &mut app.ui.page_search, sresp.clicked());
+    }
     let Ok(ds) = app.session.ds() else { return };
     let pages: Vec<(NodeId, String, bool)> =
         ds.doc.pages.iter().filter_map(|p| ds.doc.node(*p).map(|n| (*p, n.name.clone(), ds.doc.is_divider(*p)))).collect();
+    let filter = app.ui.page_filter.trim().to_lowercase();
+    let filtering = !filter.is_empty();
     let cur = ds.page;
+    let uid = ds.uid;
     let sel = ds.selection.clone();
     let mut select = None;
     let mut rename_done: Option<(NodeId, String)> = None;
@@ -216,12 +240,30 @@ fn pages(app: &mut FigApp, ui: &mut Ui) {
     let mut move_to: Option<(NodeId, String)> = None;
     // Pages are dragged up and down the list to reorder them.
     let mut reorder = crate::list_drag::ListDrag::in_order(ui, "pages");
+    let page_key = (uid, cur);
+    let scroll_to_cur = app.ui.pages_seen_page != Some(page_key);
+    let mut current_row_rendered = false;
     // A long list scrolls in its own area, so the layers keep their room below it.
-    let max_h = (ui.available_height() * 0.4).max(3.0 * ROW);
+    let max_h = pages_list_height(app.ui.pages_height, ui.available_height());
     let mut moved = egui::ScrollArea::vertical().id_salt("pages_list").max_height(max_h).show(ui, |ui| {
         for (k, (id, name, divider)) in pages.iter().cloned().enumerate() {
-            let (r, resp) = ui.allocate_exact_size(vec2(w, 32.0), Sense::click_and_drag());
-            reorder.row_by(&resp, k, r, || if divider { tr("Divider").to_string() } else { name.clone() });
+            if filtering && (divider || !name.to_lowercase().contains(&filter)) {
+                continue;
+            }
+            let sense = if filtering { Sense::click() } else { Sense::click_and_drag() };
+            let (r, resp) = ui.allocate_exact_size(vec2(w, 32.0), sense);
+            if dev && resp.drag_started() {
+                crate::menus::dev_mode_refuses(app, "page.move");
+            }
+            if id == cur {
+                current_row_rendered = true;
+                if scroll_to_cur {
+                    ui.scroll_to_rect(r, None);
+                }
+            }
+            if !filtering && !dev {
+                reorder.row_by(&resp, k, r, || if divider { tr("Divider").to_string() } else { name.clone() });
+            }
             a11y::list_item(&resp, if divider { tr("Divider") } else { &name }, id == cur);
             let r = r.shrink2(vec2(8.0, 0.0));
             a11y::ring_around(ui, r, &resp);
@@ -247,7 +289,7 @@ fn pages(app: &mut FigApp, ui: &mut Ui) {
                 let tr = Rect::from_min_max(pos2(r.min.x + 8.0, r.min.y + 4.0), pos2(r.max.x - 4.0, r.max.y - 4.0));
                 let start = ui.data_mut(|d| d.remove_temp::<bool>(page_rename_start_id())).unwrap_or(false);
                 let font = if id == cur { semibold(11.0) } else { regular(11.0) };
-                if let (Some(new), _) = crate::widgets::rename_field(ui, Id::new(("pagename", id)), &name, tr, font, start) {
+                if let (Some(new), _) = crate::widgets::rename_field(ui, Id::unique(("pagename", id)), &name, tr, font, start) {
                     rename_done = Some((id, new));
                 }
             } else if !divider {
@@ -256,8 +298,10 @@ fn pages(app: &mut FigApp, ui: &mut Ui) {
             }
             if resp.clicked() && !divider {
                 select = Some(id);
+                app.ui.pages_focus = Some(uid);
+                app.ui.layers_focus = false;
             }
-            if resp.double_clicked() {
+            if resp.double_clicked() && !crate::menus::dev_mode_refuses(app, "page.rename") {
                 app.ui.rename_page = Some((id, name.clone()));
                 // The field takes the focus next frame, once it's drawn: focusing it now would put a
                 // node that isn't there yet in the screen reader tree, which AccessKit aborts on.
@@ -265,21 +309,30 @@ fn pages(app: &mut FigApp, ui: &mut Ui) {
             }
             crate::right::context_popup(&resp).show(|ui| {
                 if ui.button(tr("Rename page")).clicked() {
-                    app.ui.rename_page = Some((id, name.clone()));
+                    if !crate::menus::dev_mode_refuses(app, "page.rename") {
+                        app.ui.rename_page = Some((id, name.clone()));
+                    }
                     ui.close();
                 }
                 if ui.button(tr("Duplicate page")).clicked() {
-                    app.run("page.duplicate", json!({"id": id}));
+                    if !crate::menus::dev_mode_refuses(app, "page.duplicate") {
+                        app.run("page.duplicate", json!({"id": id}));
+                    }
                     ui.close();
                 }
                 if ui.button(tr("Delete page")).clicked() {
-                    app.run("page.delete", json!({"id": id}));
+                    if !crate::menus::dev_mode_refuses(app, "page.delete") {
+                        delete_page(app, id);
+                    }
                     ui.close();
                 }
             });
         }
         reorder.finish(ui)
     });
+    if current_row_rendered {
+        app.ui.pages_seen_page = Some(page_key);
+    }
     // A drop outside the list's visible area (and the row gap at its edges) isn't on a page row,
     // even one scrolled out of view.
     if !ui.input(|i| i.pointer.latest_pos()).is_some_and(|p| moved.inner_rect.expand2(vec2(0.0, 3.0)).contains(p)) {
@@ -288,6 +341,7 @@ fn pages(app: &mut FigApp, ui: &mut Ui) {
     }
     if let Some((from, to)) = moved.inner
         && let Some((id, ..)) = pages.get(from)
+        && !crate::menus::dev_mode_refuses(app, "page.move")
     {
         app.run("page.move", json!({"id": id, "index": to}));
     }
@@ -295,7 +349,9 @@ fn pages(app: &mut FigApp, ui: &mut Ui) {
         app.ui.rename_page = None;
         app.run("page.rename", json!({"id": id, "name": new}));
     }
-    if let Some((page, name)) = move_to {
+    if let Some((page, name)) = move_to
+        && !crate::menus::dev_mode_refuses(app, "object.moveToPage")
+    {
         let ids = dragged_layers(dragging, &sel);
         if app.run("object.moveToPage", json!({"ids": ids, "page": page})).is_some() {
             app.toast(trf("Moved to {name}", &[("name", &name)]));
@@ -306,17 +362,80 @@ fn pages(app: &mut FigApp, ui: &mut Ui) {
     {
         app.run("page.select", json!({"id": p}));
     }
-    crate::widgets::separator(ui);
+    // `inner_rect` is the room the list was given; a short list shrinks to its rows.
+    pages_edge(app, ui, moved.inner_rect.height().min(moved.content_size.y));
+}
+
+/// The Pages list has the keyboard: a page row (or the add-page button) of the open file was
+/// clicked last, and the list is still on screen.
+pub(crate) fn pages_have_keyboard(app: &FigApp) -> bool {
+    let Ok(ds) = app.session.ds() else { return false };
+    app.ui.pages_focus == Some(ds.uid) && app.ui.pages_open && !app.ui.left_collapsed && !ds.view.ui_hidden && app.ui.left_tab == LeftTab::File
+}
+
+/// Delete `page` (no confirmation: Undo brings it back) and say so.
+pub(crate) fn delete_page(app: &mut FigApp, page: NodeId) {
+    if app.run("page.delete", json!({"id": page})).is_some() {
+        app.toast(tr("Page deleted"));
+    }
+}
+
+/// The pages list's height in a panel with `avail` below the Pages header: the height asked for
+/// (by default 40% of it), at least three rows, and leaving the layers their header and three rows.
+pub(crate) fn pages_list_height(asked: Option<f32>, avail: f32) -> f32 {
+    let least = 3.0 * ROW;
+    let most = (avail - 40.0 - 3.0 * ROW).max(least);
+    asked.filter(|h| h.is_finite()).unwrap_or(avail * 0.4).clamp(least, most)
+}
+
+/// The line between the pages and the layers: dragging it sizes the pages list (`shown`: its
+/// height now), a double-click puts back the default. The main window keeps it in the preferences.
+fn pages_edge(app: &mut FigApp, ui: &mut Ui, shown: f32) {
+    let t = Tokens::get(ui.ctx());
+    let w = ui.available_width();
+    let (line, _) = ui.allocate_exact_size(vec2(w, 1.0), Sense::hover());
+    let grab = ui.style().interaction.resize_grab_radius_side;
+    let id = Id::unique("pages_edge");
+    // Not focusable, like the side panels' edges: Tab/F6 must not stop on an unnamed drag handle.
+    let resp = ui.interact(line.expand2(vec2(0.0, grab)), id, Sense::CLICK | Sense::DRAG);
+    let active = resp.hovered() || resp.dragged();
+    if active {
+        ui.ctx().set_cursor_icon(egui::CursorIcon::ResizeVertical);
+    }
+    let (width, colour) = if active { (2.0, ACCENT) } else { (1.0, t.border) };
+    ui.painter().line_segment([line.left_center(), line.right_center()], Stroke::new(width, colour));
+    let asked = if resp.double_clicked() {
+        Some(None)
+    } else if resp.dragged() {
+        // The edge stays under the pointer where it was grabbed.
+        if resp.drag_started() {
+            ui.data_mut(|d| d.insert_temp(id, shown));
+        }
+        let from: f32 = ui.data(|d| d.get_temp(id)).unwrap_or(shown);
+        let moved = ui.input(|i| Some(i.pointer.latest_pos()?.y - i.pointer.press_origin()?.y)).unwrap_or(0.0);
+        Some(Some(from + moved))
+    } else {
+        None
+    };
+    if let Some(h) = asked
+        && h != app.ui.pages_height
+    {
+        app.ui.pages_height = h;
+        if app.windows.current == 0 {
+            app.session.prefs.pages_height = h;
+            app.panels_unsaved = true;
+        }
+    }
 }
 
 /// A page rename just asked for by a double click: its field takes the focus when drawn (temp data).
 fn page_rename_start_id() -> Id {
-    Id::new("page_rename_start")
+    Id::unique("page_rename_start")
 }
 
 /// The layer row being dragged in the panel (temp data).
 fn layer_drag_id() -> Id {
-    Id::new("layer_drag")
+    Id::unique("layer_drag")
 }
 
 /// A press on a row's eye or padlock dragged across other rows: every row passed gets the state the
@@ -329,8 +448,9 @@ struct Sweep {
     ids: Vec<NodeId>,
 }
 
+/// Stable egui id for the eye/padlock sweep state.
 fn sweep_id() -> Id {
-    Id::new("layer_toggle_sweep")
+    Id::unique("layer_toggle_sweep")
 }
 
 /// What a drag of row `dragging` moves: the selection when the row is in it, else the row.
@@ -375,7 +495,7 @@ fn hash_expanded(expanded: &BTreeSet<NodeId>) -> u64 {
 pub(crate) fn rows_for(ui: &Ui, doc: &Arc<Document>, page: NodeId, expanded: &BTreeSet<NodeId>, filter: &str) -> Arc<Vec<Row>> {
     let ex = if filter.is_empty() { hash_expanded(expanded) } else { 0 };
     ui.data_mut(|d| {
-        let c = d.get_temp_mut_or_default::<RowCache>(Id::new("layer_rows"));
+        let c = d.get_temp_mut_or_default::<RowCache>(Id::unique("layer_rows"));
         let fresh = c.doc.as_ref().is_some_and(|d| Arc::ptr_eq(d, doc)) && c.page == Some(page) && c.expanded == ex && c.filter == filter;
         if !fresh {
             let rows = listed_rows(doc, page, expanded, filter);
@@ -517,7 +637,7 @@ pub(crate) fn start_rename(app: &mut FigApp, ids: &[NodeId]) {
     let rows = listed_rows(&doc, page, &app.ui.expanded, &app.ui.layer_filter.trim().to_lowercase());
     let Some(id) = rows.iter().map(|r| r.id).find(|r| ids.contains(r)) else { return };
     app.ui.left_tab = LeftTab::File;
-    app.ui.left_collapsed = false;
+    app.ui.open_left_panel();
     rename_layer(app, id);
 }
 
@@ -539,8 +659,9 @@ fn rename_layer(app: &mut FigApp, id: NodeId) {
     app.ui.layers_seen_sel = app.session.selection();
 }
 
+/// Stable egui id for a layer row's rename field.
 fn rename_id(id: NodeId) -> Id {
-    Id::new(("rename", id))
+    Id::unique(("rename", id))
 }
 
 /// Left edge of a row's contents (disclosure triangle) in the row's inner rect `rr`.
@@ -574,8 +695,10 @@ fn set_expanded_deep(doc: &Document, id: NodeId, open: bool, expanded: &mut BTre
     }
 }
 
-/// The search row under the Layers header (live filter; Escape closes it).
-fn search_field(app: &mut FigApp, ui: &mut Ui, t: &Tokens, w: f32, id: Id) {
+/// The search row under the Pages or Layers header: a live filter `text`, taking the keyboard when
+/// `focus` (just opened). Escape in it clears it and closes the row (`open`), and goes no further
+/// (the canvas keeps its selection).
+fn search_field(ui: &mut Ui, t: &Tokens, w: f32, id: Id, hint: &str, text: &mut String, open: &mut bool, focus: bool) {
     let (fr, _) = ui.allocate_exact_size(vec2(w, 32.0), Sense::hover());
     let field = Rect::from_min_max(pos2(fr.min.x + 12.0, fr.min.y + 2.0), pos2(fr.max.x - 12.0, fr.max.y - 6.0));
     ui.painter().rect_filled(field, CornerRadius::same(5), t.field);
@@ -583,45 +706,53 @@ fn search_field(app: &mut FigApp, ui: &mut Ui, t: &Tokens, w: f32, id: Id) {
     let te_rect = Rect::from_min_max(pos2(field.min.x + 24.0, field.center().y - 7.0), pos2(field.max.x - 6.0, field.center().y + 7.0));
     let mut child = ui.new_child(egui::UiBuilder::new().max_rect(te_rect));
     let r = child.add(
-        egui::TextEdit::singleline(&mut app.ui.layer_filter)
+        egui::TextEdit::singleline(text)
             .id(id)
             .frame(egui::Frame::NONE)
             .font(regular(11.0))
-            .hint_text(tr("Find layers"))
-            .vertical_align(egui::Align::Center)
+            .hint_text(hint)
+            .align(egui::Align2::LEFT_CENTER)
             .desired_width(te_rect.width()),
     );
-    crate::widgets::select_all_on_focus(ui, &r, &app.ui.layer_filter);
-    if r.has_focus() {
-        ui.painter().rect_stroke(field, CornerRadius::same(5), Stroke::new(1.0, t.accent), egui::StrokeKind::Inside);
+    // After the field: the click that opened it ends elsewhere, which would take the focus back.
+    if focus {
+        r.request_focus();
     }
-    if (r.has_focus() || r.lost_focus()) && ui.input(|i| i.key_pressed(egui::Key::Escape)) {
-        app.ui.layer_search = false;
-        app.ui.layer_filter.clear();
+    crate::widgets::select_all_on_focus(ui, &r, text);
+    if r.has_focus() {
+        ui.painter().rect_stroke(field, CornerRadius::same(5), Stroke::new(1.0, ACCENT), egui::StrokeKind::Inside);
+    }
+    if (r.has_focus() || r.lost_focus()) && ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape)) {
+        *open = false;
+        text.clear();
     }
 }
 
+/// Draw the layer tree with search, cached rows, reveal-selection expansion and scrolling,
+/// rename/Tab navigation, selection and drag/drop, sweep toggles and Dev Mode restrictions.
 fn layers(app: &mut FigApp, ui: &mut Ui) {
     let t = Tokens::get(ui.ctx());
+    // Dev Mode only inspects: rows select and expand, but don't rename, reorder, hide or lock.
+    let dev = app.ui.right_tab == crate::RightTab::Inspect;
+    if dev {
+        app.ui.rename = None;
+    }
     let w = ui.available_width();
     let (hr, _) = ui.allocate_exact_size(vec2(w, 40.0), Sense::hover());
     ui.painter().text(pos2(hr.min.x + 16.0, hr.center().y), Align2::LEFT_CENTER, tr("Layers"), semibold(11.0), t.text);
     let sr = Rect::from_center_size(pos2(hr.max.x - 22.0, hr.center().y), vec2(24.0, 24.0));
-    let sresp = ui.interact(sr, ui.id().with("layer_search_btn"), Sense::click()).tip(tr("Search layers"));
+    let sresp = ui.interact(sr, ui.scope_id().with("layer_search_btn"), Sense::click()).tip(tr("Search layers"));
     if sresp.hovered() || app.ui.layer_search {
         ui.painter().rect_filled(sr, CornerRadius::same(5), t.hover);
     }
     icons::paint(ui.painter(), sr.shrink(5.0), Icon::Search, t.icon);
-    let search_id = Id::new("layer_search_field");
+    let search_id = Id::unique("layer_search_field");
     if sresp.clicked() {
         app.ui.layer_search = !app.ui.layer_search;
         app.ui.layer_filter.clear();
-        if app.ui.layer_search {
-            ui.memory_mut(|m| m.request_focus(search_id));
-        }
     }
     if app.ui.layer_search {
-        search_field(app, ui, &t, w, search_id);
+        search_field(ui, &t, w, search_id, tr("Find layers"), &mut app.ui.layer_filter, &mut app.ui.layer_search, sresp.clicked());
     }
     let Ok(ds) = app.session.ds() else { return };
     let doc = ds.doc.clone();
@@ -767,7 +898,7 @@ fn layers(app: &mut FigApp, ui: &mut Ui) {
             // Expand triangle.
             if row.has_kids {
                 let tri = Rect::from_center_size(pos2(x0 + 6.0, r.center().y), vec2(14.0, 14.0));
-                let tresp = ui.interact(tri, ui.id().with(("tri", row.id)), Sense::click());
+                let tresp = ui.interact(tri, ui.scope_id().with(("tri", row.id)), Sense::click());
                 let open = app.ui.expanded.contains(&row.id);
                 a11y::button(&tresp, if open { tr("Collapse") } else { tr("Expand") });
                 icons::paint(ui.painter(), tri.shrink(1.0), if open { Icon::Chevron } else { Icon::ChevronRight }, t.icon_secondary);
@@ -825,14 +956,17 @@ fn layers(app: &mut FigApp, ui: &mut Ui) {
             // Lock / eye on hover (or when set); a layer in a locked one shows a faint padlock.
             let hidden = swept(false).unwrap_or(!n.visible);
             let locked = swept(true).unwrap_or(n.locked);
-            let show_lock = over || locked || row.locked_above;
-            let show_eye = over || hidden;
+            // In Dev Mode they only show what is set.
+            let show_lock = (over && !dev) || locked || row.locked_above;
+            let show_eye = (over && !dev) || hidden;
             let er = Rect::from_center_size(pos2(rr.max.x - 14.0, r.center().y), vec2(20.0, 20.0));
             let lr = Rect::from_center_size(pos2(rr.max.x - 36.0, r.center().y), vec2(20.0, 20.0));
             if show_eye {
-                let eresp = ui.interact(er, ui.id().with(("eye", row.id)), Sense::click_and_drag());
-                a11y::toggle(&eresp, tr("Hidden"), hidden);
                 icons::paint(ui.painter(), er.shrink(3.0), if hidden { Icon::EyeOff } else { Icon::Eye }, t.icon_secondary);
+            }
+            if show_eye && !dev {
+                let eresp = ui.interact(er, ui.scope_id().with(("eye", row.id)), Sense::click_and_drag());
+                a11y::toggle(&eresp, tr("Hidden"), hidden);
                 if eresp.clicked() {
                     vis = Some(row.id);
                 }
@@ -841,10 +975,12 @@ fn layers(app: &mut FigApp, ui: &mut Ui) {
                 }
             }
             if show_lock {
-                let lresp = ui.interact(lr, ui.id().with(("lock", row.id)), Sense::click_and_drag());
-                a11y::toggle(&lresp, tr("Locked"), locked || row.locked_above);
                 let col = if locked || !row.locked_above { t.icon_secondary } else { t.text_tertiary };
                 icons::paint(ui.painter(), lr.shrink(3.0), if locked || row.locked_above { Icon::Lock } else { Icon::Unlock }, col);
+            }
+            if show_lock && !dev {
+                let lresp = ui.interact(lr, ui.scope_id().with(("lock", row.id)), Sense::click_and_drag());
+                a11y::toggle(&lresp, tr("Locked"), locked || row.locked_above);
                 if lresp.clicked() {
                     lock = Some(row.id);
                 }
@@ -855,7 +991,7 @@ fn layers(app: &mut FigApp, ui: &mut Ui) {
             if resp.clicked() {
                 clicked = Some((row.id, ui.input(|i| i.modifiers)));
             }
-            if resp.double_clicked() {
+            if resp.double_clicked() && !crate::menus::dev_mode_refuses(app, "object.rename") {
                 app.ui.rename = Some(Rename { id: row.id, start: true });
             }
             if resp.secondary_clicked() {
@@ -864,9 +1000,10 @@ fn layers(app: &mut FigApp, ui: &mut Ui) {
                 }
                 let pos = ui.input(|i| i.pointer.hover_pos()).unwrap_or(r.center());
                 app.ui.context_menu = Some((pos, vec![row.id]));
+                app.ui.context_menu_shown = false;
             }
             // Drag to reorder.
-            if resp.drag_started() {
+            if resp.drag_started() && !crate::menus::dev_mode_refuses(app, "node.reparent") {
                 ui.data_mut(|d| d.insert_temp(drag_id, row.id));
             }
             let over = dragging.is_some() && ui.input(|i| i.pointer.hover_pos()).is_some_and(|p| r.contains(p));
@@ -897,7 +1034,7 @@ fn layers(app: &mut FigApp, ui: &mut Ui) {
                     ui.painter().rect_stroke(rr, CornerRadius::same(5), Stroke::new(2.0, ACCENT), egui::StrokeKind::Inside);
                     // Holding over a collapsed group or frame opens it, to drop deeper inside.
                     if row.has_kids && !app.ui.expanded.contains(&row.id) {
-                        let hold_id = Id::new("layer_drag_hold");
+                        let hold_id = Id::unique("layer_drag_hold");
                         let now = ui.input(|i| i.time);
                         match ui.data(|d| d.get_temp::<(NodeId, f64)>(hold_id)) {
                             Some((id, since)) if id == row.id => {
@@ -932,7 +1069,7 @@ fn layers(app: &mut FigApp, ui: &mut Ui) {
         // Empty space below clears selection.
         let rest = Rect::from_x_y_ranges(band.x_range(), (top + total)..=(top + total.max(viewport.max.y)));
         // A click target for the pointer only (no stop for the keyboard).
-        if rest.height() > 0.0 && ui.interact(rest, Id::new("layers_empty_space"), Sense::CLICK).clicked() {
+        if rest.height() > 0.0 && ui.interact(rest, Id::unique("layers_empty_space"), Sense::CLICK).clicked() {
             app.run("select.none", json!({}));
         }
     });
@@ -953,7 +1090,10 @@ fn layers(app: &mut FigApp, ui: &mut Ui) {
         let (released, down) = ui.input(|i| (i.pointer.any_released(), i.pointer.primary_down()));
         if released {
             let (cmd, key) = if sw.lock { ("object.toggleLock", "locked") } else { ("object.toggleVisible", "visible") };
-            app.run(cmd, json!({"ids": sw.ids, key: if sw.lock { sw.on } else { !sw.on }}));
+            // A sweep started in the design can end after a switch to Dev Mode.
+            if !crate::menus::dev_mode_refuses(app, cmd) {
+                app.run(cmd, json!({"ids": sw.ids, key: if sw.lock { sw.on } else { !sw.on }}));
+            }
         }
         // A sweep whose release the panel never saw (it wasn't shown) is dropped.
         if released || !down {
@@ -965,9 +1105,12 @@ fn layers(app: &mut FigApp, ui: &mut Ui) {
     if ui.input(|i| i.pointer.any_released()) {
         ui.data_mut(|d| {
             d.remove::<NodeId>(drag_id);
-            d.remove::<(NodeId, f64)>(Id::new("layer_drag_hold"));
+            d.remove::<(NodeId, f64)>(Id::unique("layer_drag_hold"));
         });
-        if let (Some(_), Some((target, zone))) = (dragging, drop) {
+        // A drag started in the design can end after a switch to Dev Mode.
+        if let (Some(_), Some((target, zone))) = (dragging, drop)
+            && !crate::menus::dev_mode_refuses(app, "node.reparent")
+        {
             let ids = moving.clone();
             match zone {
                 0 => {
@@ -977,8 +1120,10 @@ fn layers(app: &mut FigApp, ui: &mut Ui) {
                     // Above in the list = higher z = after the target among siblings.
                     if let Some(parent) = doc.node(target).and_then(|n| n.parent) {
                         let idx = doc.index_in_parent(target).unwrap_or(0);
-                        let index = if z < 0 { idx + 1 } else { idx };
-                        app.run("node.reparent", json!({"ids": ids, "parent": parent, "index": index}));
+                        let gap = if z < 0 { idx + 1 } else { idx };
+                        // `index` is the final position: the dragged layers below the gap leave it.
+                        let below = doc.node(parent).map_or(0, |p| p.children.iter().take(gap).filter(|c| ids.contains(c)).count());
+                        app.run("node.reparent", json!({"ids": ids, "parent": parent, "index": gap - below}));
                     }
                 }
             }
@@ -1015,6 +1160,7 @@ fn layers(app: &mut FigApp, ui: &mut Ui) {
     }
     if let Some((id, m)) = clicked {
         app.ui.layers_focus = true;
+        app.ui.pages_focus = None;
         let order: Vec<NodeId> = rows.iter().map(|r| r.id).collect();
         let pos = |x: NodeId| order.iter().position(|o| *o == x);
         let anchor = app.ui.layer_anchor.filter(|a| sel.contains(a)).and_then(pos);
diff --git a/crates/ui-egui/src/layout_panel.rs b/crates/ui-egui/src/panels/layout_panel.rs
similarity index 85%
rename from crates/ui-egui/src/layout_panel.rs
rename to crates/ui-egui/src/panels/layout_panel.rs
index bb60ebeb..0874da2f 100644
--- a/crates/ui-egui/src/layout_panel.rs
+++ b/crates/ui-egui/src/panels/layout_panel.rs
@@ -29,8 +29,8 @@ pub fn layout_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[Node
     let al = common(doc, sel, |n| n.layout.clone());
     let has_al = matches!(al, Some(Some(_)));
     let title = if has_al { tr("Auto layout") } else { tr("Layout") };
-    // An instance's auto layout is its main's (only padding, gap and alignment are its own), and
-    // the layers inside it keep their main's size.
+    // An instance's auto layout is its main's (only padding, gap and alignment are its own); the
+    // layers inside it override their size and resizing, not their place in the layout.
     let in_instance = sel.iter().any(|i| figcraft_engine::components::owning_instance(doc, *i).is_some());
     let nested = sel.iter().any(|i| figcraft_engine::components::inside_instance(doc, *i));
     let btns: Vec<(Icon, &str)> = if in_instance {
@@ -49,7 +49,7 @@ pub fn layout_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[Node
     if let Some(Some(l)) = &al {
         ui.add_enabled_ui(!in_instance, |ui| direction(app, ui, &ids, l)).response.on_disabled_hover_text(from_main);
     }
-    ui.add_enabled_ui(!nested, |ui| dimensions(app, ui, doc, sel, has_al)).response.on_disabled_hover_text(from_main);
+    dimensions(app, ui, doc, sel, has_al, nested, from_main);
     if let Some(Some(l)) = &al {
         alignment(app, ui, &ids, l);
         spacing(app, ui, &ids, l);
@@ -62,6 +62,7 @@ pub fn layout_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[Node
         .response
         .on_disabled_hover_text(from_main);
     }
+    crate::selection_spacing::panel(app, ui, sel);
     let grid_parent = sel.iter().all(|i| parent_of(doc, *i).and_then(|p| p.layout.as_ref()).is_some_and(|l| l.mode == LayoutMode::Grid));
     if grid_parent && common(doc, sel, |n| n.child_layout.absolute) == Some(false) {
         ui.add_enabled_ui(!nested, |ui| grid_cell(app, ui, doc, sel)).response.on_disabled_hover_text(from_main);
@@ -146,7 +147,8 @@ fn limit(n: &Node, horizontal: bool, is_min: bool) -> Option<f64> {
     }
 }
 
-fn dimensions(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId], has_al: bool) {
+/// `nested`: layers inside an instance, whose proportion lock is their main's (`from_main` says so).
+fn dimensions(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId], has_al: bool, nested: bool, from_main: &str) {
     let ids = sel.to_vec();
     let w_of = |n: &Node| (n.width * 100.0).round() / 100.0;
     let h_of = |n: &Node| (n.height * 100.0).round() / 100.0;
@@ -154,12 +156,18 @@ fn dimensions(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId], has
     let col = widgets::col_width(ui.available_width());
     widgets::sublabels(ui, tr("Dimensions"), None);
     row(ui, 32.0, |ui| {
-        let e = crate::variable_ui::number_field_mixed(app, ui, &ids, "width", Id::new("lay_w"), Lead::Text("W"), w, "", col);
+        let e = crate::variable_ui::number_field_mixed(app, ui, &ids, "width", Id::unique("lay_w"), Lead::Text("W"), w, "", col);
         app.field_of(&ids, "width", e, w_of, |v| json!(v.max(0.0)));
-        let e = crate::variable_ui::number_field_mixed(app, ui, &ids, "height", Id::new("lay_h"), Lead::Text("H"), h, "", col);
+        let e = crate::variable_ui::number_field_mixed(app, ui, &ids, "height", Id::unique("lay_h"), Lead::Text("H"), h, "", col);
         app.field_of(&ids, "height", e, h_of, |v| json!(v.max(0.0)));
         let locked = common(doc, sel, |n| n.constrain_proportions).unwrap_or(false);
-        if icons::button(ui, if locked { Icon::LinkOn } else { Icon::LinkOff }, 24.0, locked, tr("Constrain proportions")).clicked() {
+        let link = ui
+            .add_enabled_ui(!nested, |ui| {
+                icons::button(ui, if locked { Icon::LinkOn } else { Icon::LinkOff }, 24.0, locked, tr("Constrain proportions"))
+            })
+            .inner
+            .on_disabled_hover_text(from_main);
+        if link.clicked() {
             app.set_props(&ids, json!({"constrainProportions": !locked}));
         }
     });
@@ -251,7 +259,7 @@ fn limit_row(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId], hori
             let (lead, add) = if is_min { (tr(axis.min_lead), tr(axis.add_min)) } else { (tr(axis.max_lead), tr(axis.add_max)) };
             if has(is_min) {
                 let v = common(doc, sel, |n| limit(n, horizontal, is_min).map(|v| (v * 100.0).round() / 100.0)).flatten();
-                let e = crate::variable_ui::number_field(app, ui, &ids, key, Id::new(("lay_limit", key)), Lead::Text(lead), v, "", col);
+                let e = crate::variable_ui::number_field(app, ui, &ids, key, Id::unique(("lay_limit", key)), Lead::Text(lead), v, "", col);
                 app.field(&ids, key, e, |v| json!(v.max(0.0)));
             } else if add_slot(ui, lead, add, col).clicked() {
                 app.set_props(&ids, json!({key: current}));
@@ -275,6 +283,8 @@ fn add_slot(ui: &mut Ui, label: &str, tip: &str, width: f32) -> egui::Response {
     resp
 }
 
+/// Draw the 3×3 main/cross alignment grid, auto-gap modes, grid column/row gaps and the
+/// horizontal baseline checkbox.
 fn alignment(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], l: &AutoLayout) {
     let t = Tokens::get(ui.ctx());
     let grid_mode = l.mode == LayoutMode::Grid;
@@ -301,7 +311,7 @@ fn alignment(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], l: &AutoLayout) {
             for xi in 0..3 {
                 let c = pos2(grid.min.x + 12.0 + xi as f32 * 24.0, grid.min.y + 10.0 + yi as f32 * 22.0);
                 let r = Rect::from_center_size(c, vec2(22.0, 20.0));
-                let resp = ui.interact(r, Id::new(("al_grid", xi, yi)), Sense::click());
+                let resp = ui.interact(r, Id::unique(("al_grid", xi, yi)), Sense::click());
                 let (main_i, cross_i) = if horizontal { (xi, yi) } else { (yi, xi) };
                 let on = (cur_main == main_i || cur_main == 9) && (cur_cross == cross_i || cur_cross == 9);
                 if on {
@@ -330,7 +340,7 @@ fn alignment(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], l: &AutoLayout) {
                     ui,
                     ids,
                     "columnGap",
-                    Id::new("al_gap"),
+                    Id::unique("al_gap"),
                     Lead::Icon(Icon::Gap, tr("Column gap")),
                     Some(l.gap),
                     "",
@@ -343,7 +353,7 @@ fn alignment(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], l: &AutoLayout) {
                     ui,
                     ids,
                     "rowGap",
-                    Id::new("al_rowgap"),
+                    Id::unique("al_rowgap"),
                     Lead::Icon(Icon::DistributeV, tr("Row gap")),
                     Some(l.cross_gap),
                     "",
@@ -355,7 +365,7 @@ fn alignment(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], l: &AutoLayout) {
             let auto = l.main_align.is_auto_gap();
             let gap_icon = if l.mode == LayoutMode::Vertical { Icon::DistributeV } else { Icon::Gap };
             let (shown, lead) = ((!auto).then_some(l.gap), Lead::Icon(gap_icon, tr("Gap between items")));
-            let e = crate::variable_ui::number_field_or(app, ui, ids, "gap", Id::new("al_gap"), shown, 96.0, tr("Auto"), lead, "");
+            let e = crate::variable_ui::number_field_or(app, ui, ids, "gap", Id::unique("al_gap"), shown, 96.0, tr("Auto"), lead, "");
             app.field(ids, "gap", e, |v| json!(v));
             ui.add_space(8.0);
             let label = match l.main_align {
@@ -393,35 +403,67 @@ fn alignment(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], l: &AutoLayout) {
     }
 }
 
+/// The Spacing row: the H/V padding pair, or, with Individual padding on, two rows of one field
+/// per side (like Individual corners).
 fn spacing(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], l: &AutoLayout) {
     let col = widgets::col_width(ui.available_width());
     let [pt, pr, pb, pl] = l.padding;
-    row(ui, 32.0, |ui| {
-        let e = crate::variable_ui::number_field(
-            app,
-            ui,
-            ids,
-            "paddingHorizontal",
-            Id::new("al_padh"),
-            Lead::Icon(Icon::PaddingH, tr("Horizontal padding")),
-            (pl == pr).then_some(pl),
-            "",
-            col,
-        );
-        app.field(ids, "paddingHorizontal", e, |v| json!(v.max(0.0)));
-        let e = crate::variable_ui::number_field(
-            app,
-            ui,
-            ids,
-            "paddingVertical",
-            Id::new("al_padv"),
-            Lead::Icon(Icon::PaddingV, tr("Vertical padding")),
-            (pt == pb).then_some(pt),
-            "",
-            col,
-        );
-        app.field(ids, "paddingVertical", e, |v| json!(v.max(0.0)));
-    });
+    let open = ui.data(|d| d.get_temp::<bool>(Id::unique("indep_padding"))).unwrap_or(false);
+    let toggle = |ui: &mut Ui| {
+        if icons::button(ui, Icon::IndependentPadding, 24.0, open, tr("Individual padding")).clicked() {
+            ui.data_mut(|d| d.insert_temp(Id::unique("indep_padding"), !open));
+        }
+    };
+    if open {
+        // `l` is the selection's common layout, so its sides are common too. `k` indexes
+        // [top, right, bottom, left].
+        let sides = [
+            ("paddingLeft", tr("Left padding"), Icon::PaddingLeft, pl, 3),
+            ("paddingTop", tr("Top padding"), Icon::PaddingTop, pt, 0),
+            ("paddingRight", tr("Right padding"), Icon::PaddingRight, pr, 1),
+            ("paddingBottom", tr("Bottom padding"), Icon::PaddingBottom, pb, 2),
+        ];
+        for (r, pair) in sides.chunks(2).enumerate() {
+            row(ui, 32.0, |ui| {
+                for (key, name, icon, v, k) in pair {
+                    let e =
+                        crate::variable_ui::number_field(app, ui, ids, key, Id::unique(("padding", *k)), Lead::Icon(*icon, name), Some(*v), "", col);
+                    app.field(ids, key, e, |v| json!(v.max(0.0)));
+                }
+                if r == 0 {
+                    toggle(ui);
+                }
+            });
+        }
+    } else {
+        row(ui, 32.0, |ui| {
+            let e = crate::variable_ui::number_field(
+                app,
+                ui,
+                ids,
+                "paddingHorizontal",
+                Id::unique("al_padh"),
+                Lead::Icon(Icon::PaddingH, tr("Horizontal padding")),
+                (pl == pr).then_some(pl),
+                "",
+                col,
+            );
+            app.field(ids, "paddingHorizontal", e, |v| json!(v.max(0.0)));
+            let e = crate::variable_ui::number_field(
+                app,
+                ui,
+                ids,
+                "paddingVertical",
+                Id::unique("al_padv"),
+                Lead::Icon(Icon::PaddingV, tr("Vertical padding")),
+                (pt == pb).then_some(pt),
+                "",
+                col,
+            );
+            app.field(ids, "paddingVertical", e, |v| json!(v.max(0.0)));
+            toggle(ui);
+        });
+    }
     if l.mode != LayoutMode::Grid && l.wrap {
         // Wrapped rows (horizontal) or columns (vertical): the gap between them.
         let vertical = l.mode == LayoutMode::Vertical;
@@ -436,7 +478,7 @@ fn spacing(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], l: &AutoLayout) {
                 ui,
                 ids,
                 "crossGap",
-                Id::new("al_crossgap"),
+                Id::unique("al_crossgap"),
                 shown,
                 col,
                 tr("Auto"),
@@ -461,9 +503,9 @@ fn spacing(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], l: &AutoLayout) {
     if l.mode == LayoutMode::Grid {
         widgets::sublabels(ui, tr("Columns"), Some(tr("Rows")));
         row(ui, 32.0, |ui| {
-            let e = widgets::number_field(ui, Id::new("al_cols"), Lead::None, Some(f64::from(l.grid_columns)), "", col, 1.0);
+            let e = widgets::number_field(ui, Id::unique("al_cols"), Lead::None, Some(f64::from(l.grid_columns)), "", col, 1.0);
             app.field(ids, "gridColumns", e, |v| json!(v.max(1.0)));
-            let e = widgets::number_field(ui, Id::new("al_rows"), Lead::None, Some(f64::from(l.grid_rows)), "", col, 1.0);
+            let e = widgets::number_field(ui, Id::unique("al_rows"), Lead::None, Some(f64::from(l.grid_rows)), "", col, 1.0);
             app.field(ids, "gridRows", e, |v| json!(v.max(1.0)));
         });
     }
@@ -532,7 +574,7 @@ fn tracks(app: &mut FigApp, ui: &mut Ui, doc: &Document, ids: &[NodeId]) {
                 let (value, suffix) = if track.sizing == Sizing::Fill { (track.value, "fr") } else { (size, "") };
                 let e = widgets::number_field(
                     ui,
-                    Id::new(("al_track", axis, i)),
+                    Id::unique(("al_track", axis, i)),
                     Lead::Text(&label),
                     Some(value),
                     suffix,
@@ -575,9 +617,9 @@ fn grid_cell(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
             // Moving on one axis pins the other where it is, so the child doesn't jump.
             let at = |c: f64, r: f64| json!({"ids": [id], "props": {"gridColumn": (c - 1.0).max(0.0), "gridRow": (r - 1.0).max(0.0)}});
             let (c0, r0) = ((cell.column + 1) as f64, (cell.row + 1) as f64);
-            let e = widgets::number_field(ui, Id::new("al_cell_col"), Lead::None, Some(c0), "", col, 1.0);
+            let e = widgets::number_field(ui, Id::unique("al_cell_col"), Lead::None, Some(c0), "", col, 1.0);
             app.field_run(e, "node.set", |v| at(v, r0));
-            let e = widgets::number_field(ui, Id::new("al_cell_row"), Lead::None, Some(r0), "", col, 1.0);
+            let e = widgets::number_field(ui, Id::unique("al_cell_row"), Lead::None, Some(r0), "", col, 1.0);
             app.field_run(e, "node.set", |v| at(c0, v));
             if anchored && icons::button(ui, Icon::Reset, 24.0, false, tr("Place automatically")).clicked() {
                 app.set_props(&ids, json!({"gridColumn": null, "gridRow": null}));
@@ -588,9 +630,9 @@ fn grid_cell(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
     let rs = common(doc, sel, |n| f64::from(n.child_layout.row_span()));
     widgets::sublabels(ui, tr("Column span"), Some(tr("Row span")));
     row(ui, 32.0, |ui| {
-        let e = widgets::number_field(ui, Id::new("al_span_c"), Lead::None, cs, "", col, 1.0);
+        let e = widgets::number_field(ui, Id::unique("al_span_c"), Lead::None, cs, "", col, 1.0);
         app.field(&ids, "gridColumnSpan", e, |v| json!(v.max(1.0)));
-        let e = widgets::number_field(ui, Id::new("al_span_r"), Lead::None, rs, "", col, 1.0);
+        let e = widgets::number_field(ui, Id::unique("al_span_r"), Lead::None, rs, "", col, 1.0);
         app.field(&ids, "gridRowSpan", e, |v| json!(v.max(1.0)));
     });
     // Alignment in the cell; Auto follows the frame's alignment.
diff --git a/crates/ui-egui/src/list_drag.rs b/crates/ui-egui/src/panels/list_drag.rs
similarity index 92%
rename from crates/ui-egui/src/list_drag.rs
rename to crates/ui-egui/src/panels/list_drag.rs
index b701a15a..08a391ae 100644
--- a/crates/ui-egui/src/list_drag.rs
+++ b/crates/ui-egui/src/panels/list_drag.rs
@@ -6,15 +6,15 @@
 //! lists bottom first; other lists (an interaction's actions, pages) show their items in model
 //! order.
 
-use egui::{AsId, Id, Rect, Sense, Ui, pos2, vec2};
+use egui::{AsIdSalt, Id, Rect, Sense, Ui, pos2, vec2};
 
 use crate::icons::{self, Icon};
 use crate::theme::{Tokens, regular};
 use crate::widgets::{self, PAD};
 
 /// The id of list `list` (any hashable key, e.g. `"fills"`).
-fn list_id(list: impl AsId) -> Id {
-    Id::new(("list_drag", list))
+fn list_id(list: impl AsIdSalt) -> Id {
+    Id::unique(("list_drag", list))
 }
 
 /// The row of list `list` being dragged (its model index; temp data).
@@ -24,7 +24,7 @@ fn drag_id(list: Id) -> Id {
 
 /// The grip of item `index` of list `list` (tests find rows by it).
 #[cfg(test)]
-pub(crate) fn grip_id(list: impl AsId, index: usize) -> Id {
+pub(crate) fn grip_id(list: impl AsIdSalt, index: usize) -> Id {
     grip_of(list_id(list), index)
 }
 
@@ -49,12 +49,12 @@ pub struct ListDrag {
 
 impl ListDrag {
     /// A list shown topmost item (the model's last) first, as the Design panel shows paints.
-    pub fn new(ui: &Ui, list: impl AsId) -> Self {
+    pub fn new(ui: &Ui, list: impl AsIdSalt) -> Self {
         Self::with_order(ui, list_id(list), true)
     }
 
     /// A list shown in model order, first item on top (an interaction's actions).
-    pub fn in_order(ui: &Ui, list: impl AsId) -> Self {
+    pub fn in_order(ui: &Ui, list: impl AsIdSalt) -> Self {
         Self::with_order(ui, list_id(list), false)
     }
 
@@ -164,34 +164,34 @@ fn drop_slot(rows: &[(usize, Rect)], from: usize, p: egui::Pos2, reversed: bool)
     Some((if reversed { n - 1 - at } else { at }, y))
 }
 
-/// Keep per-row flags (`Id::new((salt, index))`, e.g. an open settings section) with their rows
+/// Keep per-row flags (`Id::unique((salt, index))`, e.g. an open settings section) with their rows
 /// when item `from` of a `len`-long list moves to `to`.
 pub fn move_flags(ui: &Ui, salt: &'static str, len: usize, from: usize, to: usize) {
     ui.data_mut(|d| {
-        let flags: Vec<Option<bool>> = (0..len).map(|i| d.get_temp::<bool>(Id::new((salt, i)))).collect();
+        let flags: Vec<Option<bool>> = (0..len).map(|i| d.get_temp::<bool>(Id::unique((salt, i)))).collect();
         for (i, f) in flags.into_iter().enumerate() {
             let j = figcraft_engine::cmd::lists::moved_index(i, from, to);
             match f {
                 Some(v) => {
-                    d.insert_temp(Id::new((salt, j)), v);
+                    d.insert_temp(Id::unique((salt, j)), v);
                 }
-                None => d.remove::<bool>(Id::new((salt, j))),
+                None => d.remove::<bool>(Id::unique((salt, j))),
             }
         }
     });
 }
 
-/// Keep per-row flags (`Id::new((salt, index))`) with their rows when item `removed` of a
+/// Keep per-row flags (`Id::unique((salt, index))`) with their rows when item `removed` of a
 /// `len`-long list goes; its own flag goes with it.
 pub fn remove_flags(ui: &Ui, salt: &'static str, len: usize, removed: usize) {
     ui.data_mut(|d| {
-        let flags: Vec<Option<bool>> = (0..len).map(|i| d.get_temp::<bool>(Id::new((salt, i)))).collect();
+        let flags: Vec<Option<bool>> = (0..len).map(|i| d.get_temp::<bool>(Id::unique((salt, i)))).collect();
         for i in 0..len {
-            d.remove::<bool>(Id::new((salt, i)));
+            d.remove::<bool>(Id::unique((salt, i)));
         }
         for (i, f) in flags.into_iter().enumerate() {
             if let (Some(j), Some(v)) = (figcraft_engine::cmd::lists::removed_index(i, removed), f) {
-                d.insert_temp(Id::new((salt, j)), v);
+                d.insert_temp(Id::unique((salt, j)), v);
             }
         }
     });
diff --git a/crates/ui-egui/src/proto_editor.rs b/crates/ui-egui/src/panels/proto_editor.rs
similarity index 99%
rename from crates/ui-egui/src/proto_editor.rs
rename to crates/ui-egui/src/panels/proto_editor.rs
index 76ee3044..7163807e 100644
--- a/crates/ui-egui/src/proto_editor.rs
+++ b/crates/ui-egui/src/panels/proto_editor.rs
@@ -32,7 +32,7 @@ pub struct Slot {
 impl Slot {
     /// A widget id for `what` of this action.
     pub fn id(&self, what: &'static str) -> Id {
-        Id::new((what, self.node, self.k, &self.path))
+        Id::unique((what, self.node, self.k, &self.path))
     }
 }
 
@@ -129,8 +129,9 @@ fn unavailable(label: &str) -> &'static str {
     }
 }
 
+/// Stable egui id for a node interaction's open action path.
 fn open_id(cx: &Cx) -> Id {
-    Id::new(("proto_open_action", cx.node, cx.k))
+    Id::unique(("proto_open_action", cx.node, cx.k))
 }
 
 /// The open action (the conditionals around it are open too); the first one by default.
diff --git a/crates/ui-egui/src/proto_panel.rs b/crates/ui-egui/src/panels/proto_panel.rs
similarity index 88%
rename from crates/ui-egui/src/proto_panel.rs
rename to crates/ui-egui/src/panels/proto_panel.rs
index 47312e99..86dae3a8 100644
--- a/crates/ui-egui/src/proto_panel.rs
+++ b/crates/ui-egui/src/panels/proto_panel.rs
@@ -5,8 +5,8 @@
 use egui::{Align2, Color32, CornerRadius, Id, Pos2, Rect, Sense, Shape, Stroke, StrokeKind, Ui, pos2, vec2};
 use figcraft_color::Paint;
 use figcraft_doc::proto::{
-    Action, ConditionalBlock, Direction, Easing, GAMEPAD_BUTTONS, Interaction, KeyMods, Overflow, OverlayPosition, ScrollPosition, Transition,
-    Trigger, is_gamepad_button,
+    Action, ConditionalBlock, Direction, Easing, GAMEPAD_BUTTONS, Interaction, KeyMods, Overflow, OverlayAnchor, OverlayPosition, ScrollPosition,
+    Transition, Trigger, is_gamepad_button,
 };
 use figcraft_doc::*;
 use serde_json::{Value, json};
@@ -22,7 +22,7 @@ use crate::widgets::{self, FIELD_H, FieldEdit, Lead, PAD};
 
 /// The interaction whose editor popover is open: (layer, index).
 fn editor_id() -> Id {
-    Id::new("proto_editor")
+    Id::unique("proto_editor")
 }
 
 pub fn open_editor(ctx: &egui::Context, target: Option<(NodeId, usize)>) {
@@ -40,6 +40,39 @@ pub fn editor(ctx: &egui::Context) -> Option<(NodeId, usize)> {
     ctx.data(|d| d.get_temp(editor_id()))
 }
 
+/// Delete the selected interaction (when one is active in the Prototype tab).
+/// Returns true if an interaction was deleted.
+pub fn delete_selected_interaction(app: &mut FigApp, ctx: &egui::Context) -> bool {
+    if app.ui.right_tab != crate::RightTab::Prototype {
+        return false;
+    }
+    let Some((node, index)) = editor(ctx) else { return false };
+    let Ok(ds) = app.session.ds() else { return false };
+    if ds.doc.node(node).and_then(|n| n.interactions.get(index)).is_none() {
+        open_editor(ctx, None);
+        return false;
+    }
+    open_editor(ctx, None);
+    // Delete went to the interaction, so a later one doesn't go to the Pages list.
+    app.ui.pages_focus = None;
+    let ids = targets_for(app, node);
+    app.run("proto.interaction.remove", json!({"ids": ids, "index": index}));
+    true
+}
+
+/// Close the interaction editor if open. Returns true if it was open.
+pub fn close_editor(ctx: &egui::Context) -> bool {
+    if capturing(ctx) || crate::variable_ui::picker_open(ctx) {
+        return false;
+    }
+    if editor(ctx).is_some() {
+        open_editor(ctx, None);
+        true
+    } else {
+        false
+    }
+}
+
 const TRIGGERS: [&str; 10] = [
     tr_noop("On click"),
     tr_noop("On drag"),
@@ -219,9 +252,14 @@ pub(crate) fn action_of(label: &str, doc: &Document, page: NodeId, node: NodeId,
             Action::ScrollTo { dest, offset: [0.0, 0.0] }
         }
         "Open link" => Action::OpenUrl { url: String::new() },
-        "Open overlay" => {
-            Action::OpenOverlay { dest: frame_dest?, position: OverlayPosition::Center, close_on_outside: true, background: None, offset: None }
-        }
+        "Open overlay" => Action::OpenOverlay {
+            dest: frame_dest?,
+            position: OverlayPosition::Center,
+            close_on_outside: true,
+            background: None,
+            offset: None,
+            anchor: OverlayAnchor::Screen,
+        },
         "Swap overlay" => Action::SwapOverlay { dest: frame_dest? },
         "Close overlay" => Action::CloseOverlay,
         "Set variable" => {
@@ -345,17 +383,17 @@ fn flow_row(app: &mut FigApp, ui: &mut Ui, f: &proto::Flow) {
     let (r, _) = ui.allocate_exact_size(vec2(w, 32.0), Sense::hover());
     let button = |dx: f32| Rect::from_center_size(pos2(dx, r.center().y), vec2(24.0, 24.0));
     let play = button(r.min.x + PAD + 8.0);
-    if icon_button(ui, Id::new(("flow_play", f.start)), play, Icon::Play, tr("Present this flow")) {
+    if icon_button(ui, Id::unique(("flow_play", f.start)), play, Icon::Play, tr("Present this flow")) {
         app.run("proto.present", json!({"start": f.start}));
     }
     let name_rect = Rect::from_min_max(pos2(play.max.x + 6.0, r.center().y - 9.0), pos2(r.max.x - 64.0, r.center().y + 9.0));
-    if let Some(n) = widgets::text_field_inline(ui, Id::new(("flow_name", f.start)), &f.name, name_rect, regular(11.0)) {
+    if let Some(n) = widgets::text_field_inline(ui, Id::unique(("flow_name", f.start)), &f.name, name_rect, regular(11.0)) {
         app.run("proto.flow.rename", json!({"start": f.start, "name": n}));
     }
-    if icon_button(ui, Id::new(("flow_preview", f.start)), button(r.max.x - 44.0), Icon::Preview, tr("Preview this flow")) {
+    if icon_button(ui, Id::unique(("flow_preview", f.start)), button(r.max.x - 44.0), Icon::Preview, tr("Preview this flow")) {
         app.run("proto.preview", json!({"start": f.start}));
     }
-    if icon_button(ui, Id::new(("flow_rm", f.start)), button(r.max.x - 20.0), Icon::Minus, tr("Remove starting point")) {
+    if icon_button(ui, Id::unique(("flow_rm", f.start)), button(r.max.x - 20.0), Icon::Minus, tr("Remove starting point")) {
         app.run("proto.flow.remove", json!({"start": f.start}));
     }
 }
@@ -393,6 +431,8 @@ fn flows_overview(app: &mut FigApp, ui: &mut Ui, doc: &Document, page: NodeId) {
     }
 }
 
+/// Draw prototype settings: device and rotation, device colour, custom size, responsive
+/// toggle and page background, running `proto.settings`.
 fn settings(app: &mut FigApp, ui: &mut Ui, doc: &Document, page: NodeId) {
     if widgets::section_header(ui, tr("Prototype settings"), &[(Icon::Preview, tr("Open prototype preview"))], false).is_some() {
         app.run("proto.preview", json!({}));
@@ -446,7 +486,7 @@ fn settings(app: &mut FigApp, ui: &mut Ui, doc: &Document, page: NodeId) {
     }
     row(ui, 32.0, |ui| {
         let clicked = widgets::checkbox(ui, settings.responsive, tr("Responsive"));
-        ui.interact(ui.min_rect(), Id::new("proto_responsive_tip"), Sense::hover()).on_hover_text(tr(RESPONSIVE_TIP));
+        ui.interact(ui.min_rect(), Id::unique("proto_responsive_tip"), Sense::hover()).on_hover_text(tr(RESPONSIVE_TIP));
         if clicked {
             app.run("proto.settings", json!({"responsive": !settings.responsive}));
         }
@@ -454,7 +494,7 @@ fn settings(app: &mut FigApp, ui: &mut Ui, doc: &Document, page: NodeId) {
     widgets::sublabels(ui, tr("Background"), None);
     row(ui, 32.0, |ui| {
         widgets::swatch(ui, &Paint::solid(bg), 16.0);
-        if let Some(h) = widgets::text_field(ui, Id::new("proto_bg"), &bg.to_hex(), 96.0, "")
+        if let Some(h) = widgets::text_field(ui, Id::unique("proto_bg"), &bg.to_hex(), 96.0, "")
             && let Some(c) = figcraft_color::Color::from_hex_or_name(&h)
         {
             app.run("proto.settings", json!({"background": c.to_css_hex()}));
@@ -506,7 +546,7 @@ fn custom_size(app: &mut FigApp, ui: &mut Ui, model: Option<proto::Device>) {
     row(ui, 32.0, |ui| {
         for (key, lead, v) in [("width", "W", d.width), ("height", "H", d.height)] {
             if let Some(FieldEdit::Set(x) | FieldEdit::Scrub(x, true)) =
-                widgets::number_field(ui, Id::new(("proto_custom", key)), Lead::Text(lead), Some(v), "", col, 1.0)
+                widgets::number_field(ui, Id::unique(("proto_custom", key)), Lead::Text(lead), Some(v), "", col, 1.0)
                 && let Some(x) = proto::PrototypeSettings::custom_side(x)
                 && x != v
             {
@@ -519,6 +559,7 @@ fn custom_size(app: &mut FigApp, ui: &mut Ui, model: Option<proto::Device>) {
     });
 }
 
+/// Show, create or preview the flow starting at `frame` and edit its description.
 fn flow_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, page: NodeId, frame: NodeId) {
     let flows = flows_of(doc, page);
     let mine = flows.iter().find(|f| f.start == frame).cloned();
@@ -537,7 +578,7 @@ fn flow_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, page: NodeId, fra
     if let Some(f) = mine {
         flow_row(app, ui, &f);
         row(ui, 32.0, |ui| {
-            if let Some(d) = widgets::text_field(ui, Id::new(("flow_desc", frame)), &f.description, ui.available_width(), tr("Add a description"))
+            if let Some(d) = widgets::text_field(ui, Id::unique(("flow_desc", frame)), &f.description, ui.available_width(), tr("Add a description"))
                 && d != f.description
             {
                 app.run("proto.flow.rename", json!({"start": frame, "description": d}));
@@ -546,6 +587,8 @@ fn flow_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, page: NodeId, fra
     }
 }
 
+/// List a node's interactions, add a default click navigation (or Back), open the editor
+/// popover and remove interactions.
 fn interactions(app: &mut FigApp, ui: &mut Ui, doc: &Document, page: NodeId, node: &Node) {
     let t = Tokens::get(ui.ctx());
     let id = node.id;
@@ -564,7 +607,7 @@ fn interactions(app: &mut FigApp, ui: &mut Ui, doc: &Document, page: NodeId, nod
         let w = ui.available_width();
         let (r, _) = ui.allocate_exact_size(vec2(w, 44.0), Sense::hover());
         let body = Rect::from_min_max(pos2(r.min.x + PAD - 6.0, r.min.y + 2.0), pos2(r.max.x - 40.0, r.max.y - 2.0));
-        let resp = ui.interact(body, ui.id().with(("proto_it", id, i)), Sense::click());
+        let resp = ui.interact(body, ui.scope_id().with(("proto_it", id, i)), Sense::click());
         let active = open == Some((id, i));
         if active {
             ui.painter().rect_filled(body, CornerRadius::same(5), t.selected_row);
@@ -585,7 +628,7 @@ fn interactions(app: &mut FigApp, ui: &mut Ui, doc: &Document, page: NodeId, nod
             open_editor(ui.ctx(), if active { None } else { Some((id, i)) });
         }
         let rm = Rect::from_center_size(pos2(r.max.x - 20.0, r.center().y), vec2(24.0, 24.0));
-        if icon_button(ui, ui.id().with(("proto_rm", id, i)), rm, Icon::Minus, tr("Remove interaction")) {
+        if icon_button(ui, ui.scope_id().with(("proto_rm", id, i)), rm, Icon::Minus, tr("Remove interaction")) {
             open_editor(ui.ctx(), None);
             app.run("proto.interaction.remove", json!({"ids": targets_for(app, id), "index": i}));
             return;
@@ -607,13 +650,11 @@ fn interactions(app: &mut FigApp, ui: &mut Ui, doc: &Document, page: NodeId, nod
 #[allow(clippy::too_many_arguments)]
 fn editor_popover(app: &mut FigApp, ctx: &egui::Context, doc: &Document, page: NodeId, node: NodeId, k: usize, it: &Interaction, at: Pos2) {
     let t = Tokens::get(ctx);
-    // Escape in a field (it cancels the edit) doesn't close the editor.
-    let typing = ctx.egui_wants_keyboard_input();
     let width = 280.0;
     let screen = ctx.content_rect();
     let pos = pos2(at.x - width, at.y.min(screen.max.y - 420.0).max(screen.min.y + 48.0));
     let mut close = false;
-    egui::Area::new(Id::new("proto_editor_area")).fixed_pos(pos).order(egui::Order::Foreground).show(ctx, |ui| {
+    egui::Area::new(Id::unique("proto_editor_area")).fixed_pos(pos).order(egui::Order::Foreground).show(ctx, |ui| {
         egui::Frame::new()
             .fill(t.panel)
             .stroke(Stroke::new(1.0, t.border))
@@ -626,7 +667,7 @@ fn editor_popover(app: &mut FigApp, ctx: &egui::Context, doc: &Document, page: N
                 let (hr, _) = ui.allocate_exact_size(vec2(width, 40.0), Sense::hover());
                 ui.painter().text(pos2(hr.min.x + PAD, hr.center().y), Align2::LEFT_CENTER, tr("Interaction"), semibold(11.0), t.text);
                 let x = Rect::from_center_size(pos2(hr.max.x - 20.0, hr.center().y), vec2(24.0, 24.0));
-                let xr = ui.interact(x, ui.id().with("proto_editor_close"), Sense::click()).tip(tr("Close"));
+                let xr = ui.interact(x, ui.scope_id().with("proto_editor_close"), Sense::click()).tip(tr("Close"));
                 if xr.hovered() {
                     ui.painter().rect_filled(x, CornerRadius::same(5), t.hover);
                 }
@@ -652,8 +693,7 @@ fn editor_popover(app: &mut FigApp, ctx: &egui::Context, doc: &Document, page: N
                 });
             });
     });
-    let escape = ctx.input(|i| i.key_pressed(egui::Key::Escape)) && !typing && !capturing(ctx) && !crate::variable_ui::picker_open(ctx);
-    if close || escape {
+    if close {
         open_editor(ctx, None);
     }
 }
@@ -666,14 +706,17 @@ fn animates(a: &Action) -> bool {
     )
 }
 
+/// Stable egui id for the prototype key-capture flag.
 fn capture_id() -> Id {
-    Id::new("proto_key_capture")
+    Id::unique("proto_key_capture")
 }
 
 fn capturing(ctx: &egui::Context) -> bool {
     ctx.data(|d| d.get_temp::<bool>(capture_id())).unwrap_or(false)
 }
 
+/// Draw an interaction's trigger controls: trigger picker, mouse/delay fields, key capture
+/// and controller-button selection, patching the interaction.
 fn trigger_rows(app: &mut FigApp, ui: &mut Ui, node: NodeId, k: usize, it: &Interaction) {
     let t = Tokens::get(ui.ctx());
     widgets::sublabels(ui, tr("Trigger"), None);
@@ -699,7 +742,7 @@ fn trigger_rows(app: &mut FigApp, ui: &mut Ui, node: NodeId, k: usize, it: &Inte
         Trigger::MouseEnter | Trigger::MouseLeave | Trigger::MouseDown | Trigger::MouseUp => {
             row(ui, 32.0, |ui| {
                 widgets::label(ui, tr("Delay"), t.text_secondary);
-                let id = Id::new(("proto_mouse_delay", node, k));
+                let id = Id::unique(("proto_mouse_delay", node, k));
                 if let Some(FieldEdit::Set(v) | FieldEdit::Scrub(v, true)) =
                     widgets::number_field(ui, id, Lead::None, Some(f64::from(it.delay_ms)), "ms", 96.0, 10.0)
                     && v.is_finite()
@@ -712,7 +755,7 @@ fn trigger_rows(app: &mut FigApp, ui: &mut Ui, node: NodeId, k: usize, it: &Inte
             row(ui, 32.0, |ui| {
                 widgets::label(ui, tr("Delay"), t.text_secondary);
                 if let Some(FieldEdit::Set(v) | FieldEdit::Scrub(v, true)) =
-                    widgets::number_field(ui, Id::new(("proto_delay", node, k)), Lead::None, Some(f64::from(*ms)), "ms", 96.0, 10.0)
+                    widgets::number_field(ui, Id::unique(("proto_delay", node, k)), Lead::None, Some(f64::from(*ms)), "ms", 96.0, 10.0)
                     && v.is_finite()
                 {
                     patch(app, node, k, json!({"trigger": {"type": "afterDelay", "ms": v.clamp(0.0, 600_000.0).round() as u32}}));
@@ -735,7 +778,7 @@ fn trigger_rows(app: &mut FigApp, ui: &mut Ui, node: NodeId, k: usize, it: &Inte
                 let id = capture_id().with("field");
                 ui.painter().rect_filled(r, CornerRadius::same(5), t.field);
                 if cap {
-                    ui.painter().rect_stroke(r, CornerRadius::same(5), Stroke::new(1.0, t.accent), StrokeKind::Inside);
+                    ui.painter().rect_stroke(r, CornerRadius::same(5), Stroke::new(1.0, ACCENT), StrokeKind::Inside);
                     ui.memory_mut(|m| m.request_focus(id));
                     let _ = ui.interact(r, id, Sense::focusable_noninteractive());
                     let pressed = ui.input(|i| {
@@ -874,9 +917,9 @@ pub(crate) fn action_fields(app: &mut FigApp, ui: &mut Ui, doc: &Document, page:
                 }
             });
         }
-        Action::OpenOverlay { dest, position, close_on_outside, background, offset } => {
-            let (dest, position, close_on_outside, background, offset) = (*dest, *position, *close_on_outside, *background, *offset);
-            let mk = move |d: NodeId| Action::OpenOverlay { dest: d, position, close_on_outside, background, offset };
+        Action::OpenOverlay { dest, position, close_on_outside, background, offset, anchor } => {
+            let (dest, position, close_on_outside, background, offset, anchor) = (*dest, *position, *close_on_outside, *background, *offset, *anchor);
+            let mk = move |d: NodeId| Action::OpenOverlay { dest: d, position, close_on_outside, background, offset, anchor };
             dest_dropdown(app, ui, doc, &frames, Some(dest), tr("Overlay"), mk, slot);
             widgets::sublabels(ui, tr("Overlay position"), None);
             row(ui, 32.0, |ui| {
@@ -884,19 +927,53 @@ pub(crate) fn action_fields(app: &mut FigApp, ui: &mut Ui, doc: &Document, page:
                 menu_popup(&resp).show(|ui| {
                     for p in OverlayPosition::ALL {
                         if menu_item(ui, tr(p.label()), "") {
-                            set_action(app, slot, Action::OpenOverlay { dest, position: p, close_on_outside, background, offset });
+                            set_action(app, slot, Action::OpenOverlay { dest, position: p, close_on_outside, background, offset, anchor });
                             ui.close();
                         }
                     }
                 });
             });
+            if position != OverlayPosition::Manual {
+                widgets::sublabels(ui, tr("Relative to"), None);
+                row(ui, 32.0, |ui| {
+                    let on_trigger = !anchor.is_screen();
+                    let opts = [tr("Whole screen"), tr("Trigger layer")];
+                    if let Some(i) = widgets::segmented_text(ui, &opts, usize::from(on_trigger)) {
+                        let anchor = if i == 0 { OverlayAnchor::Screen } else { OverlayAnchor::TriggerOutside };
+                        set_action(app, slot, Action::OpenOverlay { dest, position, close_on_outside, background, offset, anchor });
+                    }
+                });
+                if !anchor.is_screen() {
+                    row(ui, 32.0, |ui| {
+                        let opts = [tr("Inside"), tr("Outside")];
+                        let at = usize::from(anchor == OverlayAnchor::TriggerOutside);
+                        if let Some(i) = widgets::segmented_text(ui, &opts, at) {
+                            let anchor = if i == 0 { OverlayAnchor::TriggerInside } else { OverlayAnchor::TriggerOutside };
+                            set_action(app, slot, Action::OpenOverlay { dest, position, close_on_outside, background, offset, anchor });
+                        }
+                    });
+                }
+            }
             if position == OverlayPosition::Manual {
                 // From the top-left of the layer that opens it; empty: right below that layer.
                 row(ui, 32.0, |ui| {
                     let w = ((ui.available_width() - 6.0) / 2.0).max(36.0);
                     for (i, (name, key)) in [("X", "proto_ov_x"), ("Y", "proto_ov_y")].into_iter().enumerate() {
                         let shown = offset.and_then(|o| o.get(i).copied());
-                        let Some(e) = widgets::number_field_bindable(ui, slot.id(key), Lead::Text(name), shown, "", w, 1.0, None, tr("Auto")).0
+                        // "Auto" is no offset (right below the layer), not 0: the word isn't taken
+                        // as a value here.
+                        let Some(e) = widgets::number_field_bindable(
+                            ui,
+                            slot.id(key),
+                            Lead::Text(name),
+                            shown,
+                            "",
+                            w,
+                            1.0,
+                            None,
+                            widgets::Empty::Text(tr("Auto")),
+                        )
+                        .0
                         else {
                             continue;
                         };
@@ -906,20 +983,20 @@ pub(crate) fn action_fields(app: &mut FigApp, ui: &mut Ui, doc: &Document, page:
                             if let Some(slot_v) = o.get_mut(i) {
                                 *slot_v = v.clamp(-100_000.0, 100_000.0).round();
                             }
-                            set_action(app, slot, Action::OpenOverlay { dest, position, close_on_outside, background, offset: Some(o) });
+                            set_action(app, slot, Action::OpenOverlay { dest, position, close_on_outside, background, offset: Some(o), anchor });
                         }
                     }
                 });
             }
             row(ui, 28.0, |ui| {
                 if widgets::checkbox(ui, close_on_outside, tr("Close when clicking outside")) {
-                    set_action(app, slot, Action::OpenOverlay { dest, position, close_on_outside: !close_on_outside, background, offset });
+                    set_action(app, slot, Action::OpenOverlay { dest, position, close_on_outside: !close_on_outside, background, offset, anchor });
                 }
             });
             row(ui, 28.0, |ui| {
                 if widgets::checkbox(ui, background.is_some(), tr("Add background behind overlay")) {
                     let bg = if background.is_some() { None } else { Some(figcraft_color::Color::new(0.0, 0.0, 0.0, 0.25)) };
-                    set_action(app, slot, Action::OpenOverlay { dest, position, close_on_outside, background: bg, offset });
+                    set_action(app, slot, Action::OpenOverlay { dest, position, close_on_outside, background: bg, offset, anchor });
                 }
             });
             if let Some(bg) = background {
@@ -928,7 +1005,7 @@ pub(crate) fn action_fields(app: &mut FigApp, ui: &mut Ui, doc: &Document, page:
                     if let Some(h) = widgets::text_field(ui, slot.id("proto_ovbg"), &bg.to_hex(), 96.0, "")
                         && let Some(c) = figcraft_color::Color::from_hex_or_name(&h)
                     {
-                        set_action(app, slot, Action::OpenOverlay { dest, position, close_on_outside, background: Some(c), offset });
+                        set_action(app, slot, Action::OpenOverlay { dest, position, close_on_outside, background: Some(c), offset, anchor });
                     }
                     let alpha = (bg.a * 100.0).round();
                     if let Some(FieldEdit::Set(v) | FieldEdit::Scrub(v, true)) =
@@ -936,7 +1013,11 @@ pub(crate) fn action_fields(app: &mut FigApp, ui: &mut Ui, doc: &Document, page:
                         && v.is_finite()
                     {
                         let a = v.clamp(0.0, 100.0) as f32 / 100.0;
-                        set_action(app, slot, Action::OpenOverlay { dest, position, close_on_outside, background: Some(bg.with_alpha(a)), offset });
+                        set_action(
+                            app,
+                            slot,
+                            Action::OpenOverlay { dest, position, close_on_outside, background: Some(bg.with_alpha(a)), offset, anchor },
+                        );
                     }
                 });
             }
@@ -978,6 +1059,8 @@ pub(crate) fn action_fields(app: &mut FigApp, ui: &mut Ui, doc: &Document, page:
     }
 }
 
+/// Draw an interaction's animation controls: transition, direction, easing, duration and
+/// custom easing fields, plus an animated curve preview.
 fn animation_rows(app: &mut FigApp, ui: &mut Ui, node: NodeId, k: usize, it: &Interaction) {
     let t = Tokens::get(ui.ctx());
     widgets::sublabels(ui, tr("Animation"), None);
@@ -1020,7 +1103,7 @@ fn animation_rows(app: &mut FigApp, ui: &mut Ui, node: NodeId, k: usize, it: &In
                     let w = ui.available_width().max(200.0);
                     let (r, rr) = ui.allocate_exact_size(vec2(w, 26.0), Sense::click());
                     if rr.hovered() {
-                        ui.painter().rect_filled(r, CornerRadius::same(5), ACCENT);
+                        ui.painter().rect_filled(r, CornerRadius::same(5), t.menu_hover);
                     }
                     let col = if rr.hovered() { Color32::WHITE } else { t.text };
                     curve(ui.painter(), Rect::from_min_size(pos2(r.min.x + 6.0, r.min.y + 4.0), vec2(28.0, 18.0)), *e, col, None);
@@ -1039,7 +1122,7 @@ fn animation_rows(app: &mut FigApp, ui: &mut Ui, node: NodeId, k: usize, it: &In
                 ui.label(egui::RichText::new(ms).font(regular(11.0)).color(t.text_secondary))
                     .tip(tr("A spring plays until it settles: its mass, stiffness and damping set how long"));
             } else if let Some(e) =
-                widgets::number_field(ui, Id::new(("proto_dur", node, k)), Lead::None, Some(f64::from(it.duration_ms)), "ms", 72.0, 10.0)
+                widgets::number_field(ui, Id::unique(("proto_dur", node, k)), Lead::None, Some(f64::from(it.duration_ms)), "ms", 72.0, 10.0)
             {
                 match e {
                     FieldEdit::Set(v) => {
@@ -1069,7 +1152,7 @@ fn animation_rows(app: &mut FigApp, ui: &mut Ui, node: NodeId, k: usize, it: &In
         let box_r = Rect::from_min_max(pos2(r.min.x + PAD, r.min.y + 4.0), pos2(r.max.x - PAD, r.max.y - 4.0));
         ui.painter().rect_filled(box_r, CornerRadius::same(5), t.field);
         let period = it.easing.seconds(it.duration_ms).max(0.05) + CURVE_HOLD;
-        let elapsed = curve_play(ui, Id::new(("proto_curve", node, k)), Id::new((format!("{:?}", it.easing), it.duration_ms)), resp.hovered());
+        let elapsed = curve_play(ui, Id::unique(("proto_curve", node, k)), Id::unique((format!("{:?}", it.easing), it.duration_ms)), resp.hovered());
         let phase = if resp.hovered() || elapsed < period * CURVE_PLAYS {
             ui.ctx().request_repaint_after(std::time::Duration::from_millis(33));
             ((elapsed % period) / (period - CURVE_HOLD)).min(1.0)
@@ -1104,12 +1187,13 @@ fn custom_easing_fields(app: &mut FigApp, ui: &mut Ui, node: NodeId, k: usize, e
         for i in 0..count {
             let (Some(name), Some(v), Some(step)) = (names.get(i), vals.get(i), steps.get(i)) else { continue };
             let lead = if count == 4 { Lead::Text(name) } else { Lead::None };
-            let edit = widgets::number_field(ui, Id::new(("proto_ease", node, k, i)), lead, Some((v * 100.0).round() / 100.0), "", w, *step).map(
-                |e| match e {
-                    FieldEdit::Set(x) => (x, true, false),
-                    FieldEdit::Scrub(x, done) => (x, done, true),
-                },
-            );
+            let edit =
+                widgets::number_field(ui, Id::unique(("proto_ease", node, k, i)), lead, Some((v * 100.0).round() / 100.0), "", w, *step).map(|e| {
+                    match e {
+                        FieldEdit::Set(x) => (x, true, false),
+                        FieldEdit::Scrub(x, done) => (x, done, true),
+                    }
+                });
             if let Some((x, done, scrub)) = edit
                 && x.is_finite()
             {
diff --git a/crates/ui-egui/src/panels/right.rs b/crates/ui-egui/src/panels/right.rs
new file mode 100644
index 00000000..f00a5821
--- /dev/null
+++ b/crates/ui-egui/src/panels/right.rs
@@ -0,0 +1,710 @@
+//! The right panel: Design, Prototype and Inspect tabs.
+
+use egui::{Align2, Color32, CornerRadius, Id, Pos2, Rect, Sense, Stroke, Ui, pos2, vec2};
+use figcraft_color::{BlendMode, Paint, PaintKind};
+use figcraft_doc::*;
+use figcraft_engine::cmd::lists::{moved_index, removed_index};
+use serde_json::{Value, json};
+
+use crate::a11y::{self, Tip};
+use crate::i18n::{tr, trf, trn};
+use crate::icons::{self, Icon};
+use crate::list_drag::{ListDrag, move_flags, remove_flags};
+use crate::style_picker::{self, StyleSlot};
+use crate::theme::{Tokens, regular, semibold};
+use crate::widgets::{self, Edit, FIELD_H, FieldEdit, Lead, PAD};
+use crate::{FigApp, RightTab};
+
+mod effects;
+mod inspect;
+mod menu;
+mod paints;
+mod stroke;
+
+pub(crate) use effects::effect_open;
+use effects::{effects, grids};
+use inspect::inspect;
+pub(crate) use inspect::{inspect_section, prop_row};
+#[cfg(test)]
+pub(crate) use menu::menu_row_width;
+pub use menu::{blend_menu, context_popup, menu_check, menu_item, menu_item_beside_checks, menu_item_with, menu_popup, menu_row};
+pub(crate) use menu::{block, menu_style, row, row_rect};
+use paints::{appearance, paints, variable_modes};
+pub(crate) use stroke::{CAP_ART_W, cap_art, join_label};
+
+/// Common value of `f` across `ids` (None when mixed or empty).
+pub(crate) fn common<T: PartialEq + Clone>(doc: &Document, ids: &[NodeId], f: impl Fn(&Node) -> T) -> Option<T> {
+    let mut it = ids.iter().filter_map(|i| doc.node(*i));
+    let first = f(it.next()?);
+    if it.all(|n| f(n) == first) { Some(first) } else { None }
+}
+
+impl FigApp {
+    /// Set properties on `ids` (one undo step).
+    pub fn set_props(&mut self, ids: &[NodeId], props: Value) {
+        if ids.is_empty() {
+            return;
+        }
+        self.run("node.set", json!({"ids": ids, "props": props}));
+    }
+
+    /// Apply a field edit: scrubs are live previews committed as one step.
+    pub fn field(&mut self, ids: &[NodeId], key: &str, edit: Option<FieldEdit>, map: impl Fn(f64) -> Value) {
+        if ids.is_empty() {
+            return;
+        }
+        self.field_run(edit, "node.set", |v| json!({"ids": ids, "props": { key: map(v) }}));
+    }
+
+    /// [`Self::field`] for a field showing `shown(layer)`: a relative edit of mixed values (`+10`,
+    /// `*2`, an arrow key's step) goes to each layer from its own value, in one undo step.
+    pub fn field_of(&mut self, ids: &[NodeId], key: &str, edit: Option<Edit>, shown: impl Fn(&Node) -> f64, map: impl Fn(f64) -> Value) {
+        let rel = match edit {
+            Some(Edit::Each(rel)) => rel,
+            Some(Edit::All(e)) => return self.field(ids, key, Some(e), map),
+            None => return,
+        };
+        let Ok(doc) = self.session.doc() else { return };
+        let values: Vec<(NodeId, f64)> = ids.iter().filter_map(|i| Some((*i, rel.apply(shown(doc.node(*i)?))?))).collect();
+        if values.is_empty() || self.session.begin_interaction("Edit").is_err() {
+            return;
+        }
+        for (id, v) in values {
+            if let Err(e) = self.session.execute("node.set", &json!({"ids": [id], "props": { key: map(v) }})) {
+                self.failed("node.set", &e);
+            }
+        }
+        let _ = self.session.commit_interaction();
+    }
+
+    /// Apply a field edit through any command: `params` builds the command's params from the value.
+    pub fn field_run(&mut self, edit: Option<FieldEdit>, cmd: &str, params: impl Fn(f64) -> Value) {
+        match edit {
+            Some(FieldEdit::Set(v)) => {
+                self.run(cmd, params(v));
+            }
+            Some(FieldEdit::Scrub(v, done)) => {
+                let _ = self.session.begin_interaction("Edit");
+                let _ = self.session.execute(cmd, &params(v));
+                if done {
+                    let _ = self.session.commit_interaction();
+                }
+            }
+            None => {}
+        }
+    }
+}
+
+/// Draw the right panel: people, present and share controls, Design/Prototype tabs and zoom
+/// menu, then route the scroll area to comments, frame presets, design, prototype or inspect.
+pub fn right_panel(app: &mut FigApp, ui: &mut Ui) {
+    let t = Tokens::get(ui.ctx());
+    let w = ui.available_width();
+    // Top bar: people (you and the others in a live session), present, share.
+    let (top, _) = ui.allocate_exact_size(vec2(w, 48.0), Sense::hover());
+    // As wide as its label needs (longer in some languages).
+    let label = ui.painter().layout_no_wrap(tr("Share").to_string(), semibold(11.5), t.accent_on);
+    let sw = (label.size().x + 24.0).max(56.0);
+    let share = Rect::from_min_size(pos2(top.max.x - 14.0 - sw, top.center().y - 16.0), vec2(sw, 32.0));
+    let sresp = ui.interact(share, ui.scope_id().with("share"), Sense::click()).tip(tr("Share: live session, export"));
+    ui.painter().rect_filled(share, CornerRadius::same(6), if sresp.hovered() { t.accent_hover } else { t.accent });
+    ui.painter().galley(share.center() - label.size() / 2.0, label, t.accent_on);
+    crate::live::share_popover(app, &sresp);
+    // Play presents; its chevron opens the play menu (present, or preview in a pane).
+    let play = Rect::from_min_size(pos2(share.min.x - 50.0, top.center().y - 14.0), vec2(42.0, 28.0));
+    let (tri_r, chev_r) =
+        (Rect::from_min_max(play.min, pos2(play.max.x - 16.0, play.max.y)), Rect::from_min_max(pos2(play.max.x - 16.0, play.min.y), play.max));
+    let present_keys = crate::toolbar::pretty_shortcut(crate::shortcuts::shortcut("proto.present").unwrap_or(""));
+    let presp = ui.interact(tri_r, ui.scope_id().with("play"), Sense::click()).tip(format!("{}  {present_keys}", tr("Present")));
+    let mresp = ui.interact(chev_r, ui.scope_id().with("play_menu"), Sense::click()).tip(tr("Present or preview"));
+    if presp.hovered() || mresp.hovered() {
+        ui.painter().rect_filled(play, CornerRadius::same(5), t.hover);
+    }
+    let tri = Rect::from_center_size(play.center() - vec2(7.0, 0.0), vec2(16.0, 16.0));
+    let c = tri.center();
+    ui.painter().add(egui::Shape::closed_line(vec![c + vec2(-5.0, -7.0), c + vec2(7.0, 0.0), c + vec2(-5.0, 7.0)], Stroke::new(1.4, t.icon)));
+    icons::paint(ui.painter(), Rect::from_center_size(play.center() + vec2(12.0, 0.0), vec2(10.0, 10.0)), Icon::Chevron, t.icon_secondary);
+    crate::live::people_bar(app, ui, Rect::from_min_max(pos2(top.min.x + 12.0, top.min.y), pos2(play.min.x - 6.0, top.max.y)));
+    if presp.clicked() {
+        app.run("proto.present", json!({}));
+    }
+    menu_popup(&mresp).width(200.0).show(|ui| {
+        if menu_item(ui, tr("Present"), &present_keys) {
+            app.run("proto.present", json!({}));
+            ui.close();
+        }
+        let (label, cmd) = if app.ui.preview.is_some() { (tr("Close preview"), "proto.closePreview") } else { (tr("Preview"), "proto.preview") };
+        if menu_item(ui, label, "") {
+            app.run(cmd, json!({}));
+            ui.close();
+        }
+    });
+    // Tabs row.
+    let (tabs, _) = ui.allocate_exact_size(vec2(w, 40.0), Sense::hover());
+    ui.painter().line_segment([tabs.left_top(), tabs.right_top()], Stroke::new(1.0, t.border));
+    let mut x = tabs.min.x + 8.0;
+    for (tab, label) in [(RightTab::Design, tr("Design")), (RightTab::Prototype, tr("Prototype"))] {
+        let galley = ui.painter().layout_no_wrap(label.into(), semibold(11.0), t.text);
+        let r = Rect::from_min_size(pos2(x, tabs.center().y - 12.0), vec2(galley.size().x + 16.0, 24.0));
+        let resp = ui.interact(r, ui.scope_id().with(("rtab", label)), Sense::click());
+        let active = app.ui.right_tab == tab;
+        a11y::tab(&resp, label, active);
+        if active {
+            ui.painter().rect_filled(r, CornerRadius::same(5), t.hover);
+        }
+        ui.painter().galley(pos2(r.min.x + 8.0, r.center().y - galley.size().y / 2.0), galley, if active { t.text } else { t.text_secondary });
+        if resp.clicked() {
+            if app.ui.right_tab != tab {
+                crate::proto_panel::open_editor(ui.ctx(), None);
+            }
+            app.ui.right_tab = tab;
+        }
+        x = r.max.x + 2.0;
+    }
+    // Zoom menu.
+    let zoom = app.session.ds().map(|d| d.view.zoom).unwrap_or(1.0);
+    let zr = Rect::from_min_size(pos2(tabs.max.x - 64.0, tabs.center().y - 12.0), vec2(56.0, 24.0));
+    let zresp = ui.interact(zr, ui.scope_id().with("zoommenu"), Sense::click());
+    // The value is only spelled out while a screen reader reads the tree.
+    let value = if a11y::active(&zresp.ctx) { format!("{}%", (zoom * 100.0).round()) } else { String::new() };
+    a11y::combo(&zresp, tr("Zoom"), &value, a11y::menu_open(&zresp));
+    if zresp.hovered() {
+        ui.painter().rect_filled(zr, CornerRadius::same(5), t.hover);
+    }
+    ui.painter().text(pos2(zr.min.x + 6.0, zr.center().y), Align2::LEFT_CENTER, format!("{}%", (zoom * 100.0).round()), regular(11.0), t.text);
+    icons::paint(ui.painter(), Rect::from_center_size(pos2(zr.max.x - 9.0, zr.center().y), vec2(10.0, 10.0)), Icon::Chevron, t.icon_secondary);
+    menu_popup(&zresp).width(200.0).show(|ui| {
+        for (label, cmd) in [
+            (tr("Zoom in"), "view.zoomIn"),
+            (tr("Zoom out"), "view.zoomOut"),
+            (tr("Zoom to fit"), "view.zoomFit"),
+            (tr("Zoom to 50%"), "view.zoom50"),
+            (tr("Zoom to 100%"), "view.zoom100"),
+            (tr("Zoom to 200%"), "view.zoom200"),
+            (tr("Zoom to selection"), "view.zoomSelection"),
+        ] {
+            if menu_item(ui, label, crate::shortcuts::shortcut(cmd).unwrap_or("")) {
+                app.run(cmd, json!({}));
+                ui.close();
+            }
+        }
+        ui.separator();
+        let Ok(v) = app.session.ds().map(|d| d.view.clone()) else { return };
+        for (label, scale) in [(tr("Pixel preview 1x"), 1u8), (tr("Pixel preview 2x"), 2)] {
+            let on = v.pixel_preview && v.pixel_scale == scale;
+            if menu_check(ui, on, label, "") {
+                app.run("view.pixelPreview", json!({"on": !on, "scale": scale}));
+                ui.close();
+            }
+        }
+        let toggles: [(&str, &str, bool); 5] = [
+            (tr("Pixel grid"), "view.pixelGrid", v.pixel_grid),
+            (tr("Snap to pixel grid"), "view.snapPixel", v.snap_pixel),
+            (tr("Layout grids"), "view.layoutGrids", v.layout_grids),
+            (tr("Rulers"), "view.rulers", v.rulers),
+            (tr("Outlines"), "view.outlines", v.outlines),
+        ];
+        for (label, cmd, on) in toggles {
+            if menu_check(ui, on, label, crate::shortcuts::shortcut(cmd).unwrap_or("")) {
+                app.run(cmd, json!({}));
+                ui.close();
+            }
+        }
+    });
+    ui.painter().line_segment([tabs.left_bottom(), tabs.right_bottom()], Stroke::new(1.0, t.border));
+    egui::ScrollArea::vertical().auto_shrink([false, false]).show(ui, |ui| {
+        ui.spacing_mut().item_spacing = vec2(8.0, 0.0);
+        if app.session.tool.tool == figcraft_engine::ToolId::Comment {
+            crate::comments::panel(app, ui);
+            ui.add_space(80.0);
+            return;
+        }
+        match app.ui.right_tab {
+            // The Frame tool shows the frame presets.
+            RightTab::Design if app.session.tool.tool == figcraft_engine::ToolId::Frame => crate::frame_presets::panel(app, ui),
+            RightTab::Design => design(app, ui),
+            RightTab::Prototype => crate::proto_panel::prototype(app, ui),
+            RightTab::Inspect => inspect(app, ui),
+        }
+        ui.add_space(80.0);
+        a11y::scroll_focus(&mut app.ui.nav, ui);
+    });
+}
+
+fn design(app: &mut FigApp, ui: &mut Ui) {
+    let Ok(ds) = app.session.ds() else { return };
+    // The panel shows the document itself, not a live text preview over it.
+    let doc = ds.text_preview.clone().unwrap_or_else(|| ds.doc.clone());
+    let sel = ds.selection.clone();
+    let vector_edit = ds.vector_edit.clone();
+    if sel.is_empty() {
+        page_section(app, ui, &doc);
+        return;
+    }
+    header(app, ui, &doc, &sel);
+    widgets::separator(ui);
+    // Editing a vector with points selected, the points' fields stand in for the layer's position
+    // and dimensions.
+    let points_selected = vector_edit.as_ref().is_some_and(|ve| !ve.vertices.is_empty() || !ve.segments.is_empty());
+    let vector_edit_none = vector_edit.is_none();
+    match vector_edit {
+        Some(ve) => crate::vector_panel::points(app, ui, &doc, &ve),
+        None => {
+            crate::section_panel::section(app, ui, &doc, &sel);
+            if app.session.tool.tool == figcraft_engine::ToolId::Scale {
+                crate::scale_panel::section(app, ui, &doc, &sel);
+                widgets::separator(ui);
+            }
+            position(app, ui, &doc, &sel);
+        }
+    }
+    widgets::separator(ui);
+    if !points_selected {
+        crate::layout_panel::layout_section(app, ui, &doc, &sel);
+        widgets::separator(ui);
+    }
+    if vector_edit_none && (arc_section(app, ui, &doc, &sel) || points_section(app, ui, &doc, &sel)) {
+        widgets::separator(ui);
+    }
+    appearance(app, ui, &doc, &sel);
+    widgets::separator(ui);
+    if variable_modes(app, ui, &doc, &sel) {
+        widgets::separator(ui);
+    }
+    if sel.iter().any(|i| matches!(doc.node(*i).map(|n| &n.kind), Some(NodeKind::Text(_)))) {
+        crate::typography::typography(app, ui, &doc, &sel);
+        widgets::separator(ui);
+    }
+    paints(app, ui, &doc, &sel, true);
+    widgets::separator(ui);
+    paints(app, ui, &doc, &sel, false);
+    widgets::separator(ui);
+    effects(app, ui, &doc, &sel);
+    widgets::separator(ui);
+    crate::selection_colors::section(app, ui, &doc, &sel);
+    if sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.is_frame_like())) {
+        grids(app, ui, &doc, &sel);
+        widgets::separator(ui);
+    }
+    crate::export_panel::section(app, ui, &doc, &sel);
+}
+
+/// Draw the page section: background and colour profile, local variables/styles, and the
+/// page export section.
+fn page_section(app: &mut FigApp, ui: &mut Ui, doc: &Document) {
+    let t = Tokens::get(ui.ctx());
+    let Ok(page) = app.session.page() else { return };
+    let bg = match doc.node(page).map(|n| &n.kind) {
+        Some(NodeKind::Page { background, .. }) => *background,
+        _ => figcraft_color::Color::DEFAULT_PAGE,
+    };
+    widgets::section_header(ui, tr("Page"), &[], false);
+    let mut open_picker = false;
+    let mut new_hex = None;
+    row(ui, 32.0, |ui| {
+        let p = Paint::solid(bg);
+        if widgets::swatch(ui, &p, 16.0).clicked() {
+            open_picker = true;
+        }
+        if let Some(h) = widgets::text_field(ui, Id::unique("pagebg"), &bg.to_hex(), 96.0, "") {
+            new_hex = Some(h);
+        }
+        widgets::label(ui, "100 %", t.text);
+    });
+    if open_picker {
+        app.ui.picker = Some(crate::colorpicker::PickerTarget::PageBackground);
+    }
+    if let Some(h) = new_hex
+        && let Some(c) = figcraft_color::Color::from_hex_or_name(&h)
+    {
+        app.run("page.setBackground", json!({"color": c.to_css_hex()}));
+    }
+    widgets::separator(ui);
+    widgets::section_header(ui, tr("Color profile"), &[], false);
+    row(ui, 32.0, |ui| {
+        let resp = widgets::dropdown(ui, doc.color_profile.label(), 140.0, None);
+        menu_popup(&resp).show(|ui| {
+            for p in figcraft_color::ColorProfile::ALL {
+                if menu_item(ui, p.label(), "") {
+                    if p != doc.color_profile {
+                        app.ui.color_profile = Some(p);
+                    }
+                    ui.close();
+                }
+            }
+        });
+    });
+    widgets::separator(ui);
+    // Local variables & styles.
+    let vars = doc.variables.variables.iter().filter(|v| !figcraft_engine::library::is_remote_variable(doc, &v.id)).count();
+    widgets::section_header(ui, tr("Local variables"), &[], vars == 0);
+    row(ui, 32.0, |ui| {
+        let r = widgets::dropdown(ui, &trf("Open variables ({count})", &[("count", &vars)]), 200.0, Some(Icon::Styles));
+        if r.clicked() {
+            app.ui.preferences = false;
+            app.ui.palette = None;
+            app.ui.variables.get_or_insert_with(Default::default);
+        }
+    });
+    widgets::separator(ui);
+    widgets::section_header(ui, tr("Local styles"), &[], figcraft_engine::library::local_styles(doc).next().is_none());
+    crate::style_picker::local_styles(app, ui, doc);
+    widgets::separator(ui);
+    crate::export_panel::page_section(app, ui, doc, page);
+}
+
+/// Draw the selection header: type name (or Mixed), frame/group conversion, orientation
+/// swap and frame presets, component/mask/boolean quick actions, and instance details.
+fn header(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
+    let t = Tokens::get(ui.ctx());
+    let label = match common(doc, sel, |n| n.kind.label()) {
+        Some(l) if sel.len() == 1 => tr(l).to_string(),
+        // The plural ("Frames") is a key of its own.
+        Some(l) => tr(&format!("{l}s")).to_string(),
+        None => tr("Mixed").into(),
+    };
+    let is_frame = sel.len() == 1 && sel.first().and_then(|i| doc.node(*i)).is_some_and(|n| matches!(n.kind, NodeKind::Frame));
+    // Frames and groups convert into each other from the type menu.
+    let is_group = !sel.is_empty() && sel.iter().all(|i| doc.node(*i).is_some_and(|n| matches!(n.kind, NodeKind::Group)));
+    let kind_items = |app: &mut FigApp, ui: &mut Ui, frame: bool| {
+        for (to_frame, label, cmd) in [(true, tr("Frame"), "object.convertToFrame"), (false, tr("Group"), "object.convertToGroup")] {
+            if menu_check(ui, to_frame == frame, label, "") {
+                if to_frame != frame {
+                    app.run(cmd, json!({"ids": sel}));
+                }
+                ui.close();
+            }
+        }
+    };
+    let w = ui.available_width();
+    let (r, _) = ui.allocate_exact_size(vec2(w, 40.0), Sense::hover());
+    let lr = Rect::from_min_size(pos2(r.min.x + 8.0, r.center().y - 12.0), vec2(120.0, 24.0));
+    let resp = ui.interact(lr, ui.scope_id().with("typedd"), Sense::click());
+    if resp.hovered() {
+        ui.painter().rect_filled(lr, CornerRadius::same(5), t.hover);
+    }
+    ui.painter().text(pos2(lr.min.x + 8.0, lr.center().y), Align2::LEFT_CENTER, &label, semibold(13.0), t.text);
+    if is_frame || is_group {
+        icons::paint(
+            ui.painter(),
+            Rect::from_center_size(pos2(lr.min.x + 18.0 + label.len() as f32 * 6.5, lr.center().y), vec2(10.0, 10.0)),
+            Icon::Chevron,
+            t.icon_secondary,
+        );
+    }
+    if is_group {
+        menu_popup(&resp).width(180.0).show(|ui| kind_items(app, ui, false));
+    }
+    if is_frame {
+        let sr = Rect::from_min_size(pos2(lr.max.x + 4.0, r.center().y - 12.0), vec2(24.0, 24.0));
+        let sresp = ui.interact(sr, ui.scope_id().with("swap_orient"), Sense::click()).tip(tr("Swap orientation"));
+        if sresp.hovered() {
+            ui.painter().rect_filled(sr, CornerRadius::same(5), t.hover);
+        }
+        icons::paint(ui.painter(), sr.shrink(5.0), Icon::Rotate, t.icon);
+        if sresp.clicked() {
+            app.run("frame.swapOrientation", json!({"ids": sel}));
+        }
+        let ids: Vec<NodeId> = sel.to_vec();
+        menu_popup(&resp).width(260.0).show(|ui| {
+            egui::ScrollArea::vertical().max_height(420.0).show(ui, |ui| {
+                kind_items(app, ui, true);
+                ui.separator();
+                let mut cat = "";
+                for (c, name, pw, ph) in figcraft_engine::cmd::create::FRAME_PRESETS {
+                    if *c != cat {
+                        cat = c;
+                        ui.label(egui::RichText::new(tr(c)).font(semibold(11.0)).color(t.text_secondary));
+                    }
+                    if menu_item(ui, name, &format!("{}×{}", pw, ph)) {
+                        app.set_props(&ids, json!({"width": pw, "height": ph}));
+                        ui.close();
+                    }
+                }
+            });
+        });
+    }
+    // Quick actions on the right.
+    let mut x = r.max.x - 8.0;
+    let actions = [
+        (Icon::Component, tr("Create component"), "component.create"),
+        (Icon::Mask, tr("Use as mask"), "object.mask"),
+        (Icon::Union, tr("Boolean groups"), "bool.union"),
+    ];
+    // Layers in boolean groups, or one boolean group: the operation they use (checked in the menu).
+    let current = figcraft_engine::booleans::shown_op(doc, sel);
+    for (icon, label, cmd) in actions.into_iter().rev() {
+        let br = Rect::from_min_size(pos2(x - 24.0, r.center().y - 12.0), vec2(24.0, 24.0));
+        let tip = if cmd == "bool.union" { label } else { crate::shortcuts::tip(label, cmd) };
+        let bresp = ui.interact(br, ui.scope_id().with(("qa", cmd)), Sense::click()).tip(tip);
+        if bresp.hovered() {
+            ui.painter().rect_filled(br, CornerRadius::same(5), t.hover);
+        }
+        // The boolean button shows the operation in use.
+        let icon = match (cmd, current) {
+            ("bool.union", Some(op)) => crate::layers::op_icon(op),
+            _ => icon,
+        };
+        icons::paint(ui.painter(), br.shrink(5.0), icon, t.icon);
+        if cmd == "bool.union" {
+            menu_popup(&bresp).width(180.0).show(|ui| {
+                for (op, c) in [
+                    (BoolOp::Union, "bool.union"),
+                    (BoolOp::Subtract, "bool.subtract"),
+                    (BoolOp::Intersect, "bool.intersect"),
+                    (BoolOp::Exclude, "bool.exclude"),
+                ] {
+                    let key = crate::shortcuts::shortcut(c).unwrap_or("");
+                    let picked = match current {
+                        Some(cur) => menu_check(ui, cur == op, tr(op.label()), key),
+                        None => menu_item(ui, tr(op.label()), key),
+                    };
+                    if picked {
+                        app.run(c, json!({}));
+                        ui.close();
+                    }
+                }
+                let key = crate::shortcuts::shortcut("vector.flatten").unwrap_or("");
+                let flatten = if current.is_some() { menu_item_beside_checks(ui, tr("Flatten"), key) } else { menu_item(ui, tr("Flatten"), key) };
+                if flatten {
+                    app.run("vector.flatten", json!({}));
+                    ui.close();
+                }
+            });
+        } else if bresp.clicked() {
+            app.run(cmd, json!({}));
+        }
+        x -= 26.0;
+    }
+    crate::component_panel::instance_section(app, ui, doc, sel);
+}
+
+fn position(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
+    widgets::section_header(ui, tr("Position"), &[], false);
+    // Layers inside an instance take their place and constraints from the main component.
+    let nested = sel.iter().any(|i| figcraft_engine::components::inside_instance(doc, *i));
+    ui.add_enabled_ui(!nested, |ui| position_fields(app, ui, doc, sel))
+        .response
+        .on_disabled_hover_text(tr("Layers in an instance take their position from the main component"));
+    ui.add_space(8.0);
+}
+
+/// Draw alignment and distribution, X/Y and rotation with flip/rotate controls, the
+/// absolute-position toggle and frame constraints.
+fn position_fields(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
+    let ids = sel.to_vec();
+    let col = widgets::col_width(ui.available_width());
+    widgets::sublabels(ui, tr("Alignment"), None);
+    row(ui, 32.0, |ui| {
+        let cmds = ["align.left", "align.hcenter", "align.right", "align.top", "align.vcenter", "align.bottom"];
+        let tip = crate::shortcuts::tip;
+        let items = [
+            (Icon::AlignLeft, tip(tr("Align left"), cmds[0])),
+            (Icon::AlignHCenter, tip(tr("Align horizontal centers"), cmds[1])),
+            (Icon::AlignRight, tip(tr("Align right"), cmds[2])),
+            (Icon::AlignTop, tip(tr("Align top"), cmds[3])),
+            (Icon::AlignVCenter, tip(tr("Align vertical centers"), cmds[4])),
+            (Icon::AlignBottom, tip(tr("Align bottom"), cmds[5])),
+        ];
+        let w = col / 3.0;
+        let picked = ui.add_enabled_ui(figcraft_engine::cmd::arrange::can_align(doc, sel), |ui| {
+            let h = widgets::segmented(ui, &items[..3], None, w);
+            let v = widgets::segmented(ui, &items[3..], None, w).map(|i| i + 3);
+            h.or(v)
+        });
+        picked.response.on_disabled_hover_text(tr("A layer on its own aligns to its frame: select more layers, or one in a frame"));
+        if let Some(i) = picked.inner {
+            app.run(cmds[i], json!({"ids": ids}));
+        }
+        if sel.len() > 2 {
+            let more = icons::button(ui, Icon::DistributeH, 24.0, false, tr("Distribute and tidy"));
+            menu_popup(&more).show(|ui| {
+                for (l, c) in [
+                    (tr("Distribute horizontal spacing"), "distribute.horizontal"),
+                    (tr("Distribute vertical spacing"), "distribute.vertical"),
+                    (tr("Tidy up"), "arrange.tidy"),
+                ] {
+                    if menu_item(ui, l, crate::shortcuts::shortcut(c).unwrap_or("")) {
+                        app.run(c, json!({"ids": ids}));
+                        ui.close();
+                    }
+                }
+            });
+        }
+    });
+    // In the frame's space: groups have none of their own.
+    // What each field shows of a layer (a relative edit of mixed values starts from it).
+    let x_of = |n: &Node| (doc.frame_relative(n.id).as_coeffs()[4] * 100.0).round() / 100.0;
+    let y_of = |n: &Node| (doc.frame_relative(n.id).as_coeffs()[5] * 100.0).round() / 100.0;
+    let rot_of = |n: &Node| (figcraft_geom::rotation_degrees(n.transform) * 100.0).round() / 100.0;
+    let (x, y, rot) = (common(doc, sel, x_of), common(doc, sel, y_of), common(doc, sel, rot_of));
+    let parent_al = sel.iter().all(|i| doc.node(*i).and_then(|n| n.parent).and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some()));
+    let absolute = common(doc, sel, |n| n.child_layout.absolute);
+    widgets::sublabels(ui, tr("Position"), None);
+    row(ui, 32.0, |ui| {
+        let e = widgets::number_field_mixed(ui, Id::unique("pos_x"), Lead::Text("X"), x, "", col, 1.0);
+        app.field_of(&ids, "x", e, x_of, |v| json!(v));
+        let e = widgets::number_field_mixed(ui, Id::unique("pos_y"), Lead::Text("Y"), y, "", col, 1.0);
+        app.field_of(&ids, "y", e, y_of, |v| json!(v));
+        // Children of auto layout frames can ignore the layout (absolute position).
+        if parent_al {
+            let on = absolute.unwrap_or(false);
+            if icons::button(
+                ui,
+                Icon::AbsolutePosition,
+                24.0,
+                on,
+                if on { tr("Use auto layout") } else { tr("Ignore auto layout (absolute position)") },
+            )
+            .clicked()
+            {
+                app.set_props(&ids, json!({"absolute": !on}));
+            }
+        }
+    });
+    widgets::sublabels(ui, tr("Rotation"), None);
+    row(ui, 32.0, |ui| {
+        let e = widgets::number_field_mixed(ui, Id::unique("pos_rot"), Lead::Icon(Icon::Angle, tr("Rotation")), rot, "°", col, 1.0);
+        app.field_of(&ids, "rotation", e, rot_of, |v| json!(v));
+        let items = [
+            (Icon::Rotate, tr("Rotate 90° right")),
+            (Icon::FlipH, crate::shortcuts::tip(tr("Flip horizontal"), "object.flipH")),
+            (Icon::FlipV, crate::shortcuts::tip(tr("Flip vertical"), "object.flipV")),
+        ];
+        if let Some(i) = widgets::segmented(ui, &items, None, col / 3.0) {
+            app.run(["object.rotateRight", "object.flipH", "object.flipV"][i], json!({"ids": ids}));
+        }
+    });
+    // Constraints (children of frames without auto layout, or ignoring it).
+    let in_frame = sel.iter().all(|i| {
+        doc.node(*i).is_some_and(|n| {
+            n.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.kind.is_frame_like() && (p.layout.is_none() || n.child_layout.absolute))
+        })
+    });
+    if in_frame {
+        let c = common(doc, sel, |n| n.constraints);
+        widgets::sublabels(ui, tr("Constraints"), None);
+        row(ui, 32.0, |ui| {
+            let h = c.map(|c| format!("{:?}", c.horizontal)).unwrap_or_else(|| "Mixed".into());
+            let resp = widgets::dropdown(ui, tr(&pretty(&h)), col, None);
+            menu_popup(&resp).show(|ui| {
+                for (l, v) in [
+                    (tr("Left"), "left"),
+                    (tr("Right"), "right"),
+                    (tr("Left & right"), "leftRight"),
+                    (tr("Center"), "center"),
+                    (tr("Scale"), "scale"),
+                ] {
+                    if menu_item(ui, l, "") {
+                        app.set_props(&ids, json!({"constraints": {"horizontal": v}}));
+                        ui.close();
+                    }
+                }
+            });
+            let v = c.map(|c| format!("{:?}", c.vertical)).unwrap_or_else(|| "Mixed".into());
+            let resp = widgets::dropdown(ui, tr(&pretty(&v)), col, None);
+            menu_popup(&resp).show(|ui| {
+                for (l, val) in [
+                    (tr("Top"), "top"),
+                    (tr("Bottom"), "bottom"),
+                    (tr("Top & bottom"), "topBottom"),
+                    (tr("Center"), "center"),
+                    (tr("Scale"), "scale"),
+                ] {
+                    if menu_item(ui, l, "") {
+                        app.set_props(&ids, json!({"constraints": {"vertical": val}}));
+                        ui.close();
+                    }
+                }
+            });
+        });
+    }
+}
+
+/// The selected ellipses' arc: Start (degrees), Sweep (a share of a full turn, negative running
+/// the other way) and Ratio (the inner radius), the same values the canvas arc handles drag
+/// (`node.set`'s `arcStart` / `arcSweep` / `arcInner`; bindable to number variables, sweep and
+/// ratio ones holding percentages). Returns whether it showed.
+fn arc_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) -> bool {
+    let arcs: Vec<(f64, f64, f64)> = sel
+        .iter()
+        .filter_map(|i| match doc.node(*i)?.kind {
+            NodeKind::Ellipse { start, sweep, inner } => Some((start, sweep, inner)),
+            _ => None,
+        })
+        .collect();
+    if arcs.is_empty() || arcs.len() != sel.len() {
+        return false;
+    }
+    let ids = sel.to_vec();
+    let same = |f: &dyn Fn(&(f64, f64, f64)) -> f64| -> Option<f64> {
+        let v = (f(arcs.first()?) * 100.0).round() / 100.0;
+        arcs.iter().all(|a| ((f(a) * 100.0).round() / 100.0 - v).abs() < 1e-9).then_some(v)
+    };
+    let start = same(&|a| a.0.to_degrees().rem_euclid(360.0));
+    let sweep = same(&|a| a.1 / std::f64::consts::TAU * 100.0);
+    let ratio = same(&|a| a.2 * 100.0);
+    widgets::section_header(ui, tr("Arc"), &[], false);
+    let col = widgets::col_width(ui.available_width());
+    let field = |app: &mut FigApp, ui: &mut Ui, key: &str, icon: Icon, name: &str, value: Option<f64>, suffix: &str| {
+        crate::variable_ui::number_field(app, ui, &ids, key, Id::unique(("arc", key)), Lead::Icon(icon, name), value, suffix, col)
+    };
+    widgets::sublabels(ui, tr("Start"), Some(tr("Sweep")));
+    row(ui, 32.0, |ui| {
+        let e = field(app, ui, "arcStart", Icon::ArcStart, tr("Arc start"), start, "°");
+        app.field(&ids, "arcStart", e, |v| json!(v));
+        let e = field(app, ui, "arcSweep", Icon::ArcSweep, tr("Arc sweep"), sweep, "%");
+        app.field(&ids, "arcSweep", e, |v| json!(v.clamp(-100.0, 100.0) * 3.6));
+    });
+    widgets::sublabels(ui, tr("Ratio"), None);
+    row(ui, 32.0, |ui| {
+        let e = field(app, ui, "arcInner", Icon::ArcRatio, tr("Arc ratio"), ratio, "%");
+        app.field(&ids, "arcInner", e, |v| json!((v / 100.0).clamp(0.0, 0.99)));
+    });
+    ui.add_space(8.0);
+    true
+}
+
+/// The selected polygons' and stars' point count (3 to 60 on stars), and the stars' ratio (the
+/// inner radius as a share of the outer one), as `node.set`'s `pointCount` / `innerRadius`.
+/// Returns whether it showed.
+fn points_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) -> bool {
+    let shapes: Vec<(u32, Option<f64>)> = sel
+        .iter()
+        .filter_map(|i| match doc.node(*i)?.kind {
+            NodeKind::Polygon { count } => Some((count, None)),
+            NodeKind::Star { count, inner_ratio } => Some((count, Some(inner_ratio))),
+            _ => None,
+        })
+        .collect();
+    if shapes.is_empty() || shapes.len() != sel.len() {
+        return false;
+    }
+    let ids = sel.to_vec();
+    let count = shapes.first().map(|s| s.0).filter(|c| shapes.iter().all(|s| s.0 == *c)).map(f64::from);
+    let stars: Vec<f64> = shapes.iter().filter_map(|s| s.1).collect();
+    let ratio = stars.first().map(|r| (r * 1000.0).round() / 10.0).filter(|r| stars.iter().all(|x| ((x * 1000.0).round() / 10.0 - r).abs() < 1e-9));
+    let all_stars = stars.len() == shapes.len();
+    widgets::section_header(ui, tr(if all_stars { "Star" } else { "Polygon" }), &[], false);
+    let col = widgets::col_width(ui.available_width());
+    widgets::sublabels(ui, tr("Count"), all_stars.then_some(tr("Ratio")));
+    row(ui, 32.0, |ui| {
+        let e = widgets::number_field(ui, Id::unique("pts_count"), Lead::Icon(Icon::Polygon, tr("Count")), count, "", col, 1.0);
+        app.field(&ids, "pointCount", e, |v| json!(v.round().clamp(3.0, 120.0)));
+        if all_stars {
+            let e = widgets::number_field(ui, Id::unique("pts_ratio"), Lead::Icon(Icon::Star, tr("Ratio")), ratio, "%", col, 1.0);
+            app.field(&ids, "innerRadius", e, |v| json!((v / 100.0).clamp(0.001, 1.0)));
+        }
+    });
+    ui.add_space(8.0);
+    true
+}
+
+/// Constraint names as shown (English keys, translated at display).
+fn pretty(s: &str) -> String {
+    match s {
+        "LeftRight" => "Left & right".into(),
+        "TopBottom" => "Top & bottom".into(),
+        other => other.to_string(),
+    }
+}
diff --git a/crates/ui-egui/src/panels/right/effects.rs b/crates/ui-egui/src/panels/right/effects.rs
new file mode 100644
index 00000000..ef62bbbc
--- /dev/null
+++ b/crates/ui-egui/src/panels/right/effects.rs
@@ -0,0 +1,541 @@
+use super::menu::{context_popup, menu_check, menu_item, menu_popup, row, row_context_menu, row_rect};
+use super::*;
+
+/// Draw the effect list with add/style/type/toggle/remove/reorder, open settings, and keep an
+/// open picker and settings flags aligned when rows move or are removed.
+pub(super) fn effects(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
+    let ids = sel.to_vec();
+    let list = common(doc, sel, |n| n.effects.clone());
+    let empty = list.as_ref().is_none_or(|l| l.is_empty());
+    let (clicked, header) = widgets::section_header_resp(ui, tr("Effects"), &[(Icon::Styles, tr("Styles")), (Icon::Plus, tr("Add effect"))], empty);
+    if let Some(i) = clicked {
+        if i == 1 {
+            app.run("effect.add", json!({"ids": ids, "type": "dropShadow"}));
+        } else {
+            style_picker::open(app, ui, &ids, StyleSlot::Effect);
+        }
+    }
+    context_popup(&header).show(|ui| {
+        if app.session.clipboard.effect.is_some() && menu_item(ui, tr("Paste effect"), "") {
+            app.run("effect.paste", json!({"ids": ids}));
+            ui.close();
+        }
+    });
+    style_picker::chip(app, ui, doc, &ids, StyleSlot::Effect);
+    let Some(list) = list else { return };
+    let mut drag = ListDrag::new(ui, "effects");
+    let mut removed = None;
+    for (i, e) in list.iter().enumerate().rev() {
+        let mut open = effect_open(ui.ctx(), i);
+        let header = row_rect(ui, 32.0, |ui| {
+            if icons::button(ui, Icon::Effects, 24.0, open, tr("Effect settings")).clicked() {
+                open = !open;
+                ui.data_mut(|d| d.insert_temp(Id::unique((FX_OPEN, i)), open));
+            }
+            let w = ui.available_width() - 56.0;
+            let resp = widgets::dropdown(ui, tr(e.label()), w, None);
+            menu_popup(&resp).show(|ui| {
+                for (l, ty) in Effect::TYPES {
+                    if menu_item(ui, tr(l), "")
+                        && let Some(ne) = Effect::of_type(ty)
+                    {
+                        app.run("effect.set", json!({"ids": ids, "index": i, "effect": ne}));
+                        ui.close();
+                    }
+                }
+            });
+            if icons::button(ui, if e.visible { Icon::Eye } else { Icon::EyeOff }, 24.0, false, tr("Toggle")).clicked() {
+                let mut e2 = e.clone();
+                e2.visible = !e2.visible;
+                app.run("effect.set", json!({"ids": ids, "index": i, "effect": e2}));
+            }
+            if icons::button(ui, Icon::Minus, 24.0, false, tr("Remove")).clicked()
+                && app.run("effect.remove", json!({"ids": ids, "index": i})).is_some()
+            {
+                removed = Some(i);
+            }
+        });
+        let can_paste = app.session.clipboard.effect.is_some();
+        row_context_menu(ui, header, Id::unique(("effect_menu", i))).show(|ui| {
+            if menu_item(ui, tr("Copy effect"), "") {
+                app.run("effect.copy", json!({"ids": ids, "index": i}));
+                ui.close();
+            }
+            if can_paste && menu_item(ui, tr("Paste effect"), "") {
+                app.run("effect.paste", json!({"ids": ids, "index": i}));
+                ui.close();
+            }
+        });
+        if open {
+            effect_settings(app, ui, &ids, i, e);
+        }
+        drag.row(ui, i, header, header.with_max_y(ui.cursor().min.y.max(header.max.y)), || tr(e.label()).to_string());
+    }
+    if let Some((from, to)) = drag.finish(ui) {
+        app.run("effect.move", json!({"ids": ids, "from": from, "to": to}));
+        move_flags(ui, FX_OPEN, list.len(), from, to);
+        if let Some(crate::colorpicker::PickerTarget::Effect { index, .. }) = &mut app.ui.picker {
+            *index = moved_index(*index, from, to);
+        }
+    }
+    // Open settings and an open colour picker stay with their effects, or go with theirs.
+    if let Some(i) = removed {
+        remove_flags(ui, FX_OPEN, list.len(), i);
+        if let Some(crate::colorpicker::PickerTarget::Effect { index, .. }) = &mut app.ui.picker {
+            match removed_index(*index, i) {
+                Some(k) => *index = k,
+                None => app.ui.picker = None,
+            }
+        }
+    }
+}
+
+/// Salt of the flags that keep effect rows' settings open.
+const FX_OPEN: &str = "fx_open";
+
+/// Whether effect `i`'s settings are open in the Design panel.
+pub(crate) fn effect_open(ctx: &egui::Context, i: usize) -> bool {
+    ctx.data(|d| d.get_temp::<bool>(Id::unique((FX_OPEN, i)))).unwrap_or(false)
+}
+
+/// A number field of effect `i` that can be bound to a variable (`effects/<i>/<prop>`).
+fn fx_field(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, prop: &str, lead: Lead, value: f64, width: f32) -> Option<FieldEdit> {
+    crate::variable_ui::number_field(app, ui, ids, &format!("effects/{i}/{prop}"), Id::unique(("fx", prop, i)), lead, Some(value), "", width)
+}
+
+/// Draw type-specific effect fields for shadows, blurs, noise, texture and glass, using live
+/// scrub edits that stay one undo step and bindable colour fields.
+fn effect_settings(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, e: &Effect) {
+    let half = (ui.available_width() - PAD * 2.0 - 8.0) / 2.0;
+    let set = |app: &mut FigApp, e2: Effect, scrub: Option<bool>| {
+        let p = json!({"ids": ids, "index": i, "effect": e2});
+        match scrub {
+            None => {
+                app.run("effect.set", p);
+            }
+            Some(done) => {
+                let _ = app.session.begin_interaction("Effect");
+                let _ = app.session.execute("effect.set", &p);
+                if done {
+                    let _ = app.session.commit_interaction();
+                }
+            }
+        }
+    };
+    let edit = |app: &mut FigApp, ed: Option<FieldEdit>, f: &dyn Fn(f64) -> Effect| match ed {
+        Some(FieldEdit::Set(v)) => set(app, f(v), None),
+        Some(FieldEdit::Scrub(v, d)) => set(app, f(v), Some(d)),
+        None => {}
+    };
+    // A new colour for the effect (`secondary`: a duo noise's second colour).
+    let edit_color = |app: &mut FigApp, secondary: bool, c: figcraft_color::Color, scrub: Option<bool>| {
+        let mut e2 = e.clone();
+        if let Some(slot) = e2.color_mut(secondary) {
+            *slot = c;
+        }
+        set(app, e2, scrub);
+    };
+    match &e.kind {
+        EffectKind::DropShadow(s) | EffectKind::InnerShadow(s) => {
+            let inner = matches!(e.kind, EffectKind::InnerShadow(_));
+            let mk = |s2: Shadow| Effect { kind: if inner { EffectKind::InnerShadow(s2) } else { EffectKind::DropShadow(s2) }, visible: e.visible };
+            row(ui, 32.0, |ui| {
+                let ed = fx_field(app, ui, ids, i, "offsetX", Lead::Text("X"), s.offset.0, half);
+                edit(app, ed, &|v| mk(Shadow { offset: (v, s.offset.1), ..s.clone() }));
+                let ed = fx_field(app, ui, ids, i, "offsetY", Lead::Text("Y"), s.offset.1, half);
+                edit(app, ed, &|v| mk(Shadow { offset: (s.offset.0, v), ..s.clone() }));
+            });
+            row(ui, 32.0, |ui| {
+                let ed = fx_field(app, ui, ids, i, "radius", Lead::Text(tr("Blur")), s.radius, half);
+                edit(app, ed, &|v| mk(Shadow { radius: v.max(0.0), ..s.clone() }));
+                let ed = fx_field(app, ui, ids, i, "spread", Lead::Text(tr("Spread")), s.spread, half);
+                edit(app, ed, &|v| mk(Shadow { spread: v, ..s.clone() }));
+            });
+            // The colour: a bound variable's chip, else swatch, hex and alpha with a variable button.
+            let color_field = format!("effects/{i}/color");
+            row(ui, 32.0, |ui| {
+                crate::variable_ui::bindable(app, ui, ids, &color_field, VariableType::Color, half * 2.0 + 8.0, |app, ui| {
+                    fx_color(app, ui, ids, i, e, false, &edit_color)
+                });
+            });
+            if !inner {
+                row(ui, 32.0, |ui| {
+                    if widgets::checkbox(ui, s.show_behind, tr("Show behind transparent areas")) {
+                        set(app, mk(Shadow { show_behind: !s.show_behind, ..s.clone() }), None);
+                    }
+                });
+            }
+        }
+        EffectKind::LayerBlur(b) | EffectKind::BackgroundBlur(b) => {
+            let with = |f: &dyn Fn(&mut Blur)| {
+                let mut e2 = e.clone();
+                if let Some(b2) = e2.blur_mut() {
+                    f(b2);
+                }
+                e2
+            };
+            row(ui, 32.0, |ui| {
+                let resp = widgets::dropdown(ui, tr(b.blur_type.label()), half * 2.0 + 8.0, None);
+                menu_popup(&resp).show(|ui| {
+                    for t in BlurType::ALL {
+                        if menu_item(ui, tr(t.label()), "") {
+                            set(app, with(&|b2| b2.blur_type = t), None);
+                            ui.close();
+                        }
+                    }
+                });
+            });
+            row(ui, 32.0, |ui| {
+                if b.is_progressive() {
+                    // The ramp's start and end points are dragged on the canvas.
+                    let ed = fx_field(app, ui, ids, i, "startRadius", Lead::Text(tr("Start")), b.start_radius, half);
+                    edit(app, ed, &|v| with(&|b2| b2.start_radius = v.clamp(0.0, MAX_BLUR_RADIUS)));
+                    let ed = fx_field(app, ui, ids, i, "radius", Lead::Text(tr("End")), b.radius, half);
+                    edit(app, ed, &|v| with(&|b2| b2.radius = v.clamp(0.0, MAX_BLUR_RADIUS)));
+                } else {
+                    let ed = fx_field(app, ui, ids, i, "radius", Lead::Text(tr("Blur")), b.radius, half * 2.0 + 8.0);
+                    edit(app, ed, &|v| with(&|b2| b2.radius = v.clamp(0.0, MAX_BLUR_RADIUS)));
+                }
+            });
+        }
+        EffectKind::Noise(nz) => {
+            let with = |f: &dyn Fn(&mut Noise)| {
+                tweaked(e, |k| {
+                    if let EffectKind::Noise(n) = k {
+                        f(n);
+                    }
+                })
+            };
+            row(ui, 32.0, |ui| {
+                let resp = widgets::dropdown(ui, tr(nz.mode.label()), half * 2.0 + 8.0, None);
+                menu_popup(&resp).show(|ui| {
+                    for m in NoiseMode::ALL {
+                        if menu_item(ui, tr(m.label()), "") {
+                            set(app, with(&|n| n.mode = m), None);
+                            ui.close();
+                        }
+                    }
+                });
+            });
+            row(ui, 32.0, |ui| {
+                let ed = widgets::number_field(ui, Id::unique(("fx_ns", i)), Lead::Text(tr("Size")), Some(nz.size), "", half, 0.1);
+                edit(app, ed, &|v| {
+                    with(&|n| {
+                        n.size = v.clamp(0.01, 1000.0);
+                        n.size_y = None;
+                    })
+                });
+                let ed = widgets::number_field(
+                    ui,
+                    Id::unique(("fx_nd", i)),
+                    Lead::Text(tr("Density")),
+                    Some((nz.density * 100.0).round()),
+                    "%",
+                    half,
+                    1.0,
+                );
+                edit(app, ed, &|v| with(&|n| n.density = (v / 100.0).clamp(0.0, 1.0)));
+            });
+            match nz.mode {
+                NoiseMode::Mono => row(ui, 32.0, |ui| fx_color(app, ui, ids, i, e, false, &edit_color)),
+                NoiseMode::Duo => {
+                    row(ui, 32.0, |ui| fx_color(app, ui, ids, i, e, false, &edit_color));
+                    row(ui, 32.0, |ui| fx_color(app, ui, ids, i, e, true, &edit_color));
+                }
+                NoiseMode::Multi => row(ui, 32.0, |ui| {
+                    let op = Some((f64::from(nz.opacity) * 100.0).round());
+                    let ed = widgets::number_field(ui, Id::unique(("fx_no", i)), Lead::Text(tr("Opacity")), op, "%", half, 1.0);
+                    edit(app, ed, &|v| with(&|n| n.opacity = (v / 100.0).clamp(0.0, 1.0) as f32));
+                }),
+            }
+        }
+        EffectKind::Texture(tx) => {
+            let with = |f: &dyn Fn(&mut Texture)| {
+                tweaked(e, |k| {
+                    if let EffectKind::Texture(t) = k {
+                        f(t);
+                    }
+                })
+            };
+            row(ui, 32.0, |ui| {
+                let ed = widgets::number_field(ui, Id::unique(("fx_ts", i)), Lead::Text(tr("Size")), Some(tx.size), "", half, 0.1);
+                edit(app, ed, &|v| {
+                    with(&|t| {
+                        t.size = v.clamp(0.01, 1000.0);
+                        t.size_y = None;
+                    })
+                });
+                let ed = widgets::number_field(ui, Id::unique(("fx_tr", i)), Lead::Text(tr("Radius")), Some(tx.radius), "", half, 1.0);
+                edit(app, ed, &|v| with(&|t| t.radius = v.max(0.0)));
+            });
+            row(ui, 32.0, |ui| {
+                if widgets::checkbox(ui, tx.clip_to_shape, tr("Clip to shape")) {
+                    set(app, with(&|t| t.clip_to_shape = !tx.clip_to_shape), None);
+                }
+            });
+        }
+        EffectKind::Glass(g) => {
+            let with = |f: &dyn Fn(&mut Glass)| {
+                tweaked(e, |k| {
+                    if let EffectKind::Glass(gl) = k {
+                        f(gl);
+                    }
+                })
+            };
+            let pct = |v: f64| Some((v * 100.0).round());
+            let unit = |v: f64| (v / 100.0).clamp(0.0, 1.0);
+            row(ui, 32.0, |ui| {
+                let ed =
+                    widgets::number_field(ui, Id::unique(("fx_gl", i)), Lead::Text(tr("Light|glass")), Some(g.light_angle.round()), "°", half, 1.0);
+                edit(app, ed, &|v| with(&|gl| gl.light_angle = v.clamp(-180.0, 180.0)));
+                let ed = widgets::number_field(ui, Id::unique(("fx_gi", i)), Lead::Text(tr("Intensity")), pct(g.light_intensity), "%", half, 1.0);
+                edit(app, ed, &|v| with(&|gl| gl.light_intensity = unit(v)));
+            });
+            row(ui, 32.0, |ui| {
+                let ed = widgets::number_field(ui, Id::unique(("fx_gr", i)), Lead::Text(tr("Refraction")), pct(g.refraction), "%", half, 1.0);
+                edit(app, ed, &|v| with(&|gl| gl.refraction = unit(v)));
+                let ed = widgets::number_field(ui, Id::unique(("fx_gd", i)), Lead::Text(tr("Depth")), Some(g.depth), "", half, 1.0);
+                edit(app, ed, &|v| with(&|gl| gl.depth = v.clamp(1.0, 1000.0)));
+            });
+            row(ui, 32.0, |ui| {
+                let ed = widgets::number_field(ui, Id::unique(("fx_gs", i)), Lead::Text(tr("Dispersion")), pct(g.dispersion), "%", half, 1.0);
+                edit(app, ed, &|v| with(&|gl| gl.dispersion = unit(v)));
+                let ed = widgets::number_field(ui, Id::unique(("fx_gf", i)), Lead::Text(tr("Frost")), Some(g.frost), "", half, 1.0);
+                edit(app, ed, &|v| with(&|gl| gl.frost = v.clamp(0.0, 1000.0)));
+            });
+            row(ui, 32.0, |ui| {
+                let ed = widgets::number_field(ui, Id::unique(("fx_gp", i)), Lead::Text(tr("Splay")), pct(g.splay), "%", half, 1.0);
+                edit(app, ed, &|v| with(&|gl| gl.splay = unit(v)));
+            });
+        }
+    }
+}
+
+/// Applies a new colour to an effect: (app, secondary colour, colour, scrubbing: `Some(done)`).
+type ColorEdit<'a> = dyn Fn(&mut FigApp, bool, figcraft_color::Color, Option<bool>) + 'a;
+
+/// `e` with `f` applied to its kind.
+fn tweaked(e: &Effect, f: impl FnOnce(&mut EffectKind)) -> Effect {
+    let mut e2 = e.clone();
+    f(&mut e2.kind);
+    e2
+}
+
+/// The swatch (opens the colour picker), hex and opacity of effect `i`'s colour (`secondary`: a
+/// duo noise's second colour), in the current row; `edit` applies a new one.
+fn fx_color(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, e: &Effect, secondary: bool, edit: &ColorEdit<'_>) {
+    let Some(c) = e.color(secondary) else { return };
+    if widgets::swatch(ui, &Paint::solid(c), 16.0).clicked() {
+        app.ui.picker = Some(crate::colorpicker::PickerTarget::Effect { ids: ids.to_vec(), index: i, secondary });
+    }
+    if let Some(h) = widgets::text_field(ui, Id::unique(("fx_c", i, secondary)), &c.to_hex(), 80.0, "")
+        && let Some(nc) = figcraft_color::Color::from_hex_or_name(&h)
+    {
+        edit(app, secondary, nc.with_alpha(c.a), None);
+    }
+    let alpha = |v: f64| c.with_alpha((v / 100.0).clamp(0.0, 1.0) as f32);
+    match widgets::number_field(ui, Id::unique(("fx_a", i, secondary)), Lead::None, Some((f64::from(c.a) * 100.0).round()), "%", 56.0, 1.0) {
+        Some(FieldEdit::Set(v)) => edit(app, secondary, alpha(v), None),
+        Some(FieldEdit::Scrub(v, done)) => edit(app, secondary, alpha(v), Some(done)),
+        None => {}
+    }
+}
+
+/// Draw the layout-grid list with add/style/type/toggle/remove/reorder, per-grid settings,
+/// and keep open-settings flags aligned when rows move or are removed.
+pub(super) fn grids(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
+    let ids = sel.to_vec();
+    let list = common(doc, sel, |n| n.grids.clone());
+    let empty = list.as_ref().is_none_or(|l| l.is_empty());
+    if let Some(i) = widgets::section_header(ui, tr("Layout grid"), &[(Icon::Styles, tr("Styles")), (Icon::Plus, tr("Add layout grid"))], empty) {
+        if i == 1 {
+            app.run("grid.add", json!({"ids": ids}));
+        } else {
+            style_picker::open(app, ui, &ids, StyleSlot::Grid);
+        }
+    }
+    style_picker::chip(app, ui, doc, &ids, StyleSlot::Grid);
+    let Some(list) = list else { return };
+    // The last grid first, like paints and effects; rows drag to reorder.
+    let mut drag = ListDrag::new(ui, "grids");
+    let mut removed = None;
+    for (i, g) in list.iter().enumerate().rev() {
+        let open_id = Id::unique(("grid_open", i));
+        let mut open = ui.data(|d| d.get_temp::<bool>(open_id)).unwrap_or(false);
+        let header = row_rect(ui, 32.0, |ui| {
+            if icons::button(ui, Icon::Grid, 24.0, open, tr("Layout grid settings")).clicked() {
+                open = !open;
+                ui.data_mut(|d| d.insert_temp(open_id, open));
+            }
+            let w = ui.available_width() - 56.0;
+            let resp = widgets::dropdown(ui, &grid_label(g), w, None);
+            menu_popup(&resp).width(220.0).show(|ui| {
+                for (l, kind) in [(tr("Grid"), GridKind::Grid), (tr("Columns"), GridKind::Columns), (tr("Rows"), GridKind::Rows)] {
+                    if menu_item(ui, l, "") {
+                        let fresh = match kind {
+                            GridKind::Grid => LayoutGrid::default(),
+                            GridKind::Columns => LayoutGrid::columns(),
+                            GridKind::Rows => LayoutGrid::rows(),
+                        };
+                        app.set_props(&ids, json!({"grids": grids_with(&list, i, |x| *x = fresh)}));
+                        ui.close();
+                    }
+                }
+            });
+            if icons::button(ui, if g.visible { Icon::Eye } else { Icon::EyeOff }, 24.0, false, tr("Toggle")).clicked() {
+                app.set_props(&ids, json!({"grids": grids_with(&list, i, |x| x.visible = !x.visible)}));
+            }
+            if icons::button(ui, Icon::Minus, 24.0, false, tr("Remove")).clicked()
+                && app.run("grid.remove", json!({"ids": ids, "index": i})).is_some()
+            {
+                removed = Some(i);
+            }
+        });
+        if open {
+            grid_settings(app, ui, &ids, &list, i, g);
+        }
+        drag.row(ui, i, header, header.with_max_y(ui.cursor().min.y.max(header.max.y)), || grid_label(g));
+    }
+    if let Some((from, to)) = drag.finish(ui) {
+        app.run("grid.move", json!({"ids": ids, "from": from, "to": to}));
+        move_flags(ui, "grid_open", list.len(), from, to);
+    }
+    // Open settings stay with their grids, or go with theirs.
+    if let Some(i) = removed {
+        remove_flags(ui, "grid_open", list.len(), i);
+    }
+}
+
+/// A layout grid's name in its row ("Grid (10)", "5 columns").
+fn grid_label(g: &LayoutGrid) -> String {
+    match g.kind {
+        GridKind::Grid => trf("Grid ({size})", &[("size", &g.size)]),
+        GridKind::Columns if auto_count(g) => tr("Auto columns").to_string(),
+        GridKind::Rows if auto_count(g) => tr("Auto rows").to_string(),
+        GridKind::Columns => trn("{n} columns", g.count.max(1) as usize, &[]),
+        GridKind::Rows => trn("{n} rows", g.count.max(1) as usize, &[]),
+    }
+}
+
+/// Fixed-size columns or rows counted Auto: as many as fit.
+fn auto_count(g: &LayoutGrid) -> bool {
+    g.count == 0 && g.align != GridAlign::Stretch
+}
+
+/// `list` with grid `i` changed by `f`.
+fn grids_with(list: &[LayoutGrid], i: usize, f: impl FnOnce(&mut LayoutGrid)) -> Vec<LayoutGrid> {
+    let mut gs = list.to_vec();
+    if let Some(g) = gs.get_mut(i) {
+        f(g);
+    }
+    gs
+}
+
+/// Layout grid `i`'s settings: size (grids); count, type, width or height, margin or offset and
+/// gutter (columns and rows); colour. The numbers can be bound to number variables
+/// (`layoutGrids/<i>/<size|count|gutter|offset>`).
+fn grid_settings(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], list: &[LayoutGrid], i: usize, g: &LayoutGrid) {
+    let col = widgets::col_width(ui.available_width());
+    let set = |f: &dyn Fn(&mut LayoutGrid)| json!({"ids": ids, "props": {"grids": grids_with(list, i, f)}});
+    // One bindable number field, applied with `apply` (a scrub is one undo step).
+    let field = |app: &mut FigApp, ui: &mut Ui, name: &str, value: f64, apply: &dyn Fn(&mut LayoutGrid, f64)| {
+        let key = format!("layoutGrids/{i}/{name}");
+        let e = crate::variable_ui::number_field(app, ui, ids, &key, Id::unique(("grid_field", name, i)), Lead::None, Some(value), "", col);
+        app.field_run(e, "node.set", |v| set(&|x| apply(x, v)));
+    };
+    let size = |x: &mut LayoutGrid, v: f64| x.size = v.max(1.0);
+    let offset = |x: &mut LayoutGrid, v: f64| x.offset = v.max(0.0);
+    let gutter = |x: &mut LayoutGrid, v: f64| x.gutter = v.max(0.0);
+    if g.kind == GridKind::Grid {
+        widgets::sublabels(ui, tr("Size"), None);
+        row(ui, 32.0, |ui| field(app, ui, "size", g.size, &size));
+    } else {
+        let cols = g.kind == GridKind::Columns;
+        widgets::sublabels(ui, tr("Count"), Some(tr("Type")));
+        row(ui, 32.0, |ui| {
+            // 0 is Auto for fixed-size columns (rows); a stretched grid has at least one.
+            let count = (!auto_count(g)).then(|| f64::from(g.count.max(1)));
+            let key = format!("layoutGrids/{i}/count");
+            let id = Id::unique(("grid_field", "count", i));
+            // A stretched grid has at least one band, so 0 (Auto) isn't a count it can take.
+            let e = if g.align == GridAlign::Stretch {
+                crate::variable_ui::number_field_or(app, ui, ids, &key, id, count, col, "", Lead::None, "")
+            } else {
+                crate::variable_ui::number_field_auto(app, ui, ids, &key, id, count, col, Lead::None, "")
+            };
+            app.field_run(e, "node.set", |v| {
+                set(&|x| x.count = if x.align == GridAlign::Stretch { v.round().clamp(1.0, 1000.0) } else { v.round().clamp(0.0, 1000.0) } as u32)
+            });
+            let names =
+                if cols { [tr("Stretch"), tr("Left"), tr("Center"), tr("Right")] } else { [tr("Stretch"), tr("Top"), tr("Center"), tr("Bottom")] };
+            let aligns = [GridAlign::Stretch, GridAlign::Min, GridAlign::Center, GridAlign::Max];
+            let cur = aligns.iter().position(|a| *a == g.align).unwrap_or(0);
+            let resp = widgets::dropdown(ui, names.get(cur).copied().unwrap_or_default(), col, None);
+            menu_popup(&resp).show(|ui| {
+                for (k, (name, a)) in names.iter().zip(aligns).enumerate() {
+                    if menu_check(ui, k == cur, name, "") {
+                        // Fixed-size columns need a size of their own.
+                        app.run(
+                            "node.set",
+                            set(&|x| {
+                                x.align = a;
+                                if a != GridAlign::Stretch && !(x.size.is_finite() && x.size > 0.0) {
+                                    x.size = 60.0;
+                                }
+                                if a == GridAlign::Stretch {
+                                    x.count = x.count.max(1);
+                                }
+                            }),
+                        );
+                        ui.close();
+                    }
+                }
+            });
+        });
+        let span = if cols { tr("Width") } else { tr("Height") };
+        match g.align {
+            GridAlign::Stretch => {
+                widgets::sublabels(ui, span, Some(tr("Margin")));
+                row(ui, 32.0, |ui| {
+                    // The frame, divided by the count: shown as Auto and not editable.
+                    ui.add_enabled_ui(false, |ui| {
+                        let auto = widgets::Empty::Text(tr("Auto"));
+                        widgets::number_field_bindable(ui, Id::unique(("grid_field", "size", i)), Lead::Named(span), None, "", col, 1.0, None, auto)
+                    });
+                    field(app, ui, "offset", g.offset, &offset);
+                });
+                widgets::sublabels(ui, tr("Gutter"), None);
+                row(ui, 32.0, |ui| field(app, ui, "gutter", g.gutter, &gutter));
+            }
+            GridAlign::Center => {
+                widgets::sublabels(ui, span, Some(tr("Gutter")));
+                row(ui, 32.0, |ui| {
+                    field(app, ui, "size", g.size, &size);
+                    field(app, ui, "gutter", g.gutter, &gutter);
+                });
+            }
+            GridAlign::Min | GridAlign::Max => {
+                widgets::sublabels(ui, span, Some(tr("Offset")));
+                row(ui, 32.0, |ui| {
+                    field(app, ui, "size", g.size, &size);
+                    field(app, ui, "offset", g.offset, &offset);
+                });
+                widgets::sublabels(ui, tr("Gutter"), None);
+                row(ui, 32.0, |ui| field(app, ui, "gutter", g.gutter, &gutter));
+            }
+        }
+    }
+    // The colour: swatch, hex and alpha.
+    widgets::sublabels(ui, tr("Color"), None);
+    row(ui, 32.0, |ui| {
+        let (sw, _) = ui.allocate_exact_size(vec2(16.0, 16.0), Sense::hover());
+        widgets::paint_swatch(ui.painter(), sw, &Paint::solid(g.color));
+        if let Some(h) = widgets::text_field(ui, Id::unique(("grid_hex", i)), &g.color.to_hex(), 80.0, "")
+            && let Some(c) = figcraft_color::Color::from_hex_or_name(&h)
+        {
+            app.run("node.set", set(&|x| x.color = c.with_alpha(x.color.a)));
+        }
+        let e = widgets::number_field(ui, Id::unique(("grid_alpha", i)), Lead::None, Some((f64::from(g.color.a) * 100.0).round()), "%", 56.0, 1.0);
+        app.field_run(e, "node.set", |v| set(&|x| x.color = x.color.with_alpha((v / 100.0).clamp(0.0, 1.0) as f32)));
+    });
+}
diff --git a/crates/ui-egui/src/panels/right/inspect.rs b/crates/ui-egui/src/panels/right/inspect.rs
new file mode 100644
index 00000000..658028f9
--- /dev/null
+++ b/crates/ui-egui/src/panels/right/inspect.rs
@@ -0,0 +1,269 @@
+use super::menu::{menu_item, menu_popup, row};
+use super::*;
+
+/// One group of inspected properties: label, value (with a swatch for colours) and the style or
+/// variable it comes from. Clicking a row copies its value.
+pub(crate) fn inspect_section(app: &mut FigApp, ui: &mut Ui, s: &figcraft_engine::devinspect::Section) {
+    let t = Tokens::get(ui.ctx());
+    widgets::separator(ui);
+    let (hr, _) = ui.allocate_exact_size(vec2(ui.available_width(), 32.0), Sense::hover());
+    ui.painter().text(pos2(hr.min.x + PAD, hr.center().y), Align2::LEFT_CENTER, tr(s.title), semibold(11.0), t.text);
+    for p in &s.rows {
+        prop_row(app, ui, p);
+    }
+    ui.add_space(4.0);
+}
+
+/// An inspected property row: label, value (with a swatch for colours) and the style or variable
+/// it comes from as a chip. Clicking it copies the value.
+pub(crate) fn prop_row(app: &mut FigApp, ui: &mut Ui, p: &figcraft_engine::devinspect::Prop) {
+    let t = Tokens::get(ui.ctx());
+    let (r, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 26.0), Sense::click());
+    let resp = resp.tip(trf("Copy {value}", &[("value", &p.value)]));
+    if resp.hovered() {
+        ui.painter().rect_filled(r.shrink2(vec2(8.0, 0.0)), CornerRadius::same(5), t.hover);
+    }
+    let painter = ui.painter();
+    // The engine's property labels ("Width") are keys of their own.
+    let label = tr(&p.label);
+    // Elided before the value column (some languages' labels run longer).
+    painter.text(
+        pos2(r.min.x + PAD, r.center().y),
+        Align2::LEFT_CENTER,
+        widgets::elide(ui, label, 96.0 - PAD - 6.0),
+        regular(11.0),
+        t.text_secondary,
+    );
+    // The style or variable, right-aligned as a chip.
+    let mut right = r.max.x - PAD;
+    if let Some(token) = &p.token {
+        let galley = painter.layout_no_wrap(token.clone(), regular(10.0), t.text_secondary);
+        let chip =
+            Rect::from_min_max(pos2((right - galley.size().x - 12.0).max(r.min.x + 196.0), r.center().y - 9.0), pos2(right, r.center().y + 9.0));
+        painter.rect_filled(chip, CornerRadius::same(4), t.field);
+        painter.with_clip_rect(chip.shrink2(vec2(6.0, 0.0))).galley(
+            pos2(chip.min.x + 6.0, chip.center().y - galley.size().y / 2.0),
+            galley,
+            t.text_secondary,
+        );
+        right = chip.min.x - 6.0;
+    }
+    let mut x = r.min.x + 96.0;
+    if let Some(c) = p.color.as_deref().and_then(figcraft_color::Color::from_hex) {
+        let sw = Rect::from_min_size(pos2(x, r.center().y - 6.0), vec2(12.0, 12.0));
+        widgets::paint_swatch(painter, sw, &Paint::solid(c));
+        x += 18.0;
+    }
+    let value_r = Rect::from_min_max(pos2(x, r.min.y), pos2(right.max(x + 10.0), r.max.y));
+    painter.with_clip_rect(value_r).text(pos2(x, r.center().y), Align2::LEFT_CENTER, &p.value, regular(11.0), t.text);
+    if resp.clicked() {
+        app.clipboard_set_text(&p.value);
+        app.toast(trf("Copied {value}", &[("value", &label.to_lowercase())]));
+    }
+}
+
+/// The thumbnails and chosen export formats of the Inspect tab's assets, kept between frames: the
+/// thumbnails until the document changes, the formats for the session.
+#[derive(Clone, Default)]
+struct AssetUi {
+    revision: u64,
+    thumbs: std::collections::HashMap<NodeId, Option<egui::TextureHandle>>,
+    formats: std::collections::HashMap<NodeId, usize>,
+}
+
+/// An asset row's height and its preview's side.
+const ASSET_ROW_H: f32 = 56.0;
+
+const ASSET_THUMB: f32 = 40.0;
+
+/// The selection's assets (layers with export settings, icons, images) as a list of a preview, a
+/// name and a format: click one to export it in that format, or export them all with their own
+/// export settings.
+fn inspect_assets(app: &mut FigApp, ui: &mut Ui, doc: &Document, assets: &[figcraft_engine::devinspect::Asset]) {
+    let t = Tokens::get(ui.ctx());
+    widgets::separator(ui);
+    let export_all = [(Icon::Export, tr("Export all"))];
+    let all = widgets::section_header(ui, tr("Assets"), if assets.is_empty() { &[] } else { &export_all }, false).is_some();
+    if assets.is_empty() {
+        widgets::note(ui, tr("No assets: no export settings, icons or images. Add export settings in the Design tab."), t.text_secondary);
+        return;
+    }
+    let mut export_all_ids: Option<Vec<NodeId>> = all.then(|| assets.iter().map(|a| a.id).collect());
+    let mut export_one: Option<(NodeId, ExportSetting, String)> = None;
+    let revision = app.session.ds().map(|d| d.revision).unwrap_or(0);
+    let cache_id = Id::unique("inspect_asset_ui");
+    let mut state: AssetUi = ui.data(|d| d.get_temp(cache_id)).unwrap_or_default();
+    if state.revision != revision {
+        state.revision = revision;
+        state.thumbs.clear();
+    }
+    let px = ASSET_THUMB * ui.ctx().pixels_per_point();
+    for a in assets {
+        let (r, resp) = ui.allocate_exact_size(vec2(ui.available_width(), ASSET_ROW_H), Sense::click());
+        let resp = resp.tip(trf("Export {name}", &[("name", &a.name)]));
+        if resp.hovered() {
+            ui.painter().rect_filled(r.shrink2(vec2(8.0, 1.0)), CornerRadius::same(6), t.hover);
+            icons::paint(ui.painter(), Rect::from_center_size(pos2(r.max.x - PAD - 6.0, r.center().y), vec2(12.0, 12.0)), Icon::Export, t.icon);
+        }
+        // The preview, as exporting it paints it (a slice shows the page under it). Rows scrolled
+        // out of view draw nothing, so they don't pay for a thumbnail either.
+        let thumb = Rect::from_min_size(pos2(r.min.x + PAD, r.center().y - ASSET_THUMB / 2.0), vec2(ASSET_THUMB, ASSET_THUMB));
+        ui.painter().rect_filled(thumb, CornerRadius::same(4), t.field);
+        let tex = if ui.is_rect_visible(r) {
+            state.thumbs.entry(a.id).or_insert_with(|| crate::assets_panel::thumbnail(ui.ctx(), doc, a.id, px)).clone()
+        } else {
+            None
+        };
+        if let Some(tex) = tex {
+            let size = tex.size_vec2();
+            let inner = thumb.shrink(3.0);
+            // Never past 1:1 physical pixels, so small assets stay crisp.
+            let k = (inner.width() / size.x).min(inner.height() / size.y).min(1.0 / ui.ctx().pixels_per_point()).max(0.0);
+            let img = Rect::from_center_size(thumb.center(), size * k);
+            ui.painter().with_clip_rect(inner).image(tex.id(), img, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
+        }
+        ui.painter().rect_stroke(thumb, CornerRadius::same(4), Stroke::new(1.0, t.border), egui::StrokeKind::Inside);
+        // The name, and the format to export it as (its first export setting's, until chosen).
+        let x = thumb.max.x + 10.0;
+        let name_r = Rect::from_min_max(pos2(x, r.min.y + 5.0), pos2(r.max.x - PAD, r.min.y + 27.0));
+        let name = widgets::elide(ui, &a.name, name_r.width());
+        ui.painter().with_clip_rect(name_r).text(pos2(name_r.min.x, name_r.center().y), Align2::LEFT_CENTER, &name, regular(11.0), t.text);
+        let idx = state
+            .formats
+            .get(&a.id)
+            .copied()
+            .filter(|i| *i < ExportFormat::ALL.len())
+            .unwrap_or_else(|| ExportFormat::ALL.iter().position(|f| Some(*f) == a.settings.first().map(|s| s.format)).unwrap_or(0));
+        let fmt = ExportFormat::ALL[idx];
+        let btn = Rect::from_min_size(pos2(x, r.min.y + 31.0), vec2(74.0, 20.0));
+        let btn_resp = ui.interact(btn, Id::unique(("inspect_asset_format", a.id)), Sense::click());
+        a11y::combo(&btn_resp, tr("Format"), fmt.label(), a11y::menu_open(&btn_resp));
+        if btn_resp.hovered() {
+            ui.painter().rect_filled(btn, CornerRadius::same(5), t.field);
+            ui.painter().rect_stroke(btn, CornerRadius::same(5), Stroke::new(1.0, t.field_hover_border), egui::StrokeKind::Inside);
+        } else {
+            ui.painter().rect_filled(btn, CornerRadius::same(5), t.field);
+        }
+        ui.painter().text(pos2(btn.min.x + 8.0, btn.center().y), Align2::LEFT_CENTER, fmt.label(), regular(11.0), t.text);
+        icons::paint(ui.painter(), Rect::from_center_size(pos2(btn.max.x - 9.0, btn.center().y), vec2(10.0, 10.0)), Icon::Chevron, t.icon_secondary);
+        menu_popup(&btn_resp).show(|ui| {
+            for (i, f) in ExportFormat::ALL.iter().enumerate() {
+                if menu_item(ui, f.label(), "") {
+                    state.formats.insert(a.id, i);
+                    ui.close();
+                }
+            }
+        });
+        if resp.clicked() && !btn_resp.hovered() {
+            let mut setting = a.settings.first().cloned().unwrap_or_default();
+            setting.format = fmt;
+            let file = format!("{}{}.{}", a.name.rsplit('/').next().unwrap_or(&a.name), setting.file_suffix(), fmt.ext());
+            export_one = Some((a.id, setting, file));
+        }
+    }
+    ui.data_mut(|d| d.insert_temp(cache_id, state));
+    if let Some(ids) = export_all_ids.take() {
+        crate::export_panel::export_layers(app, &ids, true);
+    } else if let Some((id, setting, file)) = export_one {
+        crate::export_panel::save_one(app, &[id], &setting, &file);
+    }
+    ui.add_space(4.0);
+}
+
+/// The Inspect tab (Dev Mode): the handoff status, annotations, properties, assets and code of
+/// the selected layer, or the list of what's ready for dev.
+pub(super) fn inspect(app: &mut FigApp, ui: &mut Ui) {
+    let t = Tokens::get(ui.ctx());
+    let Ok(ds) = app.session.ds() else { return };
+    let doc = ds.doc.clone();
+    let sel = ds.selection.clone();
+    let Some(first) = sel.first().copied() else {
+        widgets::section_header(ui, tr("Inspect"), &[], false);
+        widgets::note(ui, tr("Select a layer to see its properties and code"), t.text_secondary);
+        widgets::note(ui, tr("Hover other layers to measure the distance"), t.text_secondary);
+        crate::dev_mode::ready_list(app, ui);
+        crate::dev_mode::categories_section(app, ui);
+        crate::dev_mode::measurements_section(app, ui, &doc, &sel);
+        crate::dev_mode::plugins_section(app, ui);
+        return;
+    };
+    let name = doc.node(first).map(|n| n.name.clone()).unwrap_or_default();
+    widgets::section_header(ui, &name, &[], false);
+    crate::dev_mode::status(app, ui, &doc, &sel);
+    crate::dev_mode::annotations_section(app, ui, &doc, first);
+    crate::dev_mode::dev_resources_section(app, ui, &doc, first);
+    crate::dev_mode::measurements_section(app, ui, &doc, &sel);
+    use figcraft_engine::devinspect::ColorFormat;
+    let fmt_id = Id::unique("inspect_color_format");
+    let fmt = ui.data(|d| d.get_temp::<usize>(fmt_id)).and_then(|i| ColorFormat::ALL.get(i).copied()).unwrap_or_default();
+    row(ui, 32.0, |ui| {
+        widgets::label(ui, tr("Color format"), t.text_secondary);
+        let resp = widgets::dropdown(ui, fmt.label(), 72.0, None);
+        menu_popup(&resp).show(|ui| {
+            for (i, f) in ColorFormat::ALL.iter().enumerate() {
+                if menu_item(ui, f.label(), "") {
+                    ui.data_mut(|d| d.insert_temp(fmt_id, i));
+                    ui.close();
+                }
+            }
+        });
+    });
+    for s in figcraft_engine::devinspect::properties_with(&doc, first, fmt) {
+        inspect_section(app, ui, &s);
+    }
+    inspect_assets(app, ui, &doc, &figcraft_engine::devinspect::assets(&doc, &sel));
+    use figcraft_engine::codegen::CodeLang;
+    let lang_id = Id::unique("inspect_lang");
+    let lang = ui.data(|d| d.get_temp::<usize>(lang_id)).and_then(|i| CodeLang::ALL.get(i).copied()).unwrap_or_default();
+    // A component tried with other property values: its code replaces the layer's below.
+    let played = crate::dev_mode::playground_section(app, ui, &doc, first, lang);
+    widgets::separator(ui);
+    let copy = widgets::section_header(ui, tr("Code"), &[(Icon::Export, tr("Copy"))], false).is_some();
+    // Pixels or rem (of a 16 px root) for the web languages.
+    let rem_id = Id::unique("inspect_rem");
+    let web = lang.is_web();
+    let rem = web && ui.data(|d| d.get_temp::<bool>(rem_id)).unwrap_or(false);
+    row(ui, 32.0, |ui| {
+        let resp = widgets::dropdown(ui, lang.label(), 120.0, Some(Icon::Code));
+        menu_popup(&resp).show(|ui| {
+            for (i, l) in CodeLang::ALL.iter().enumerate() {
+                if menu_item(ui, l.label(), "") {
+                    ui.data_mut(|d| d.insert_temp(lang_id, i));
+                    ui.close();
+                }
+            }
+        });
+        if web {
+            let resp = widgets::dropdown(ui, if rem { "rem" } else { "px" }, 56.0, None);
+            menu_popup(&resp).show(|ui| {
+                for (on, label) in [(false, "px"), (true, "rem")] {
+                    if menu_item(ui, label, "") {
+                        ui.data_mut(|d| d.insert_temp(rem_id, on));
+                        ui.close();
+                    }
+                }
+            });
+        }
+    });
+    let code = played.unwrap_or_else(|| crate::dev_mode::code(app, ui, first, lang));
+    let code = if rem { figcraft_engine::codegen::px_to_rem(&code, 16.0) } else { code };
+    egui::Frame::NONE
+        .fill(t.field)
+        .corner_radius(CornerRadius::same(6))
+        .inner_margin(egui::Margin::same(10))
+        .outer_margin(egui::Margin::symmetric(16, 0))
+        .show(ui, |ui| {
+            ui.label(egui::RichText::new(&code).monospace().color(t.text));
+        });
+    ui.add_space(8.0);
+    let mut copy_clicked = copy;
+    row(ui, 32.0, |ui| {
+        copy_clicked |= ui.button(trf("Copy {value}", &[("value", &lang.label())])).clicked();
+    });
+    if copy_clicked {
+        app.clipboard_set_text(&code);
+        app.toast(trf("Copied {value}", &[("value", &lang.label())]));
+    }
+    crate::dev_mode::connect_section(app, ui, &doc, first, lang);
+    crate::dev_mode::plugins_section(app, ui);
+}
diff --git a/crates/ui-egui/src/panels/right/menu.rs b/crates/ui-egui/src/panels/right/menu.rs
new file mode 100644
index 00000000..fed4a960
--- /dev/null
+++ b/crates/ui-egui/src/panels/right/menu.rs
@@ -0,0 +1,135 @@
+use super::*;
+
+/// The smallest width a popup menu is measured in (see [`menu_popup`]).
+const MENU_MIN_W: f32 = 48.0;
+
+/// A menu row's inset either side, and the gap between its label and its shortcut or art.
+const MENU_PAD: f32 = 8.0;
+
+const MENU_GAP: f32 = 24.0;
+
+/// The style of popup menus: egui's, with text kept on one line (a menu grows to its widest item).
+pub(crate) fn menu_style(s: &mut egui::Style) {
+    egui::containers::menu::menu_style(s);
+    s.wrap_mode = Some(egui::TextWrapMode::Extend);
+}
+
+/// The menu a dropdown or button opens: as wide as its widest row and at least as wide as
+/// `anchor`. egui measures a popup in a first, invisible pass as wide as the width it is given
+/// (else its 600 px default area width) and keeps the size measured; rows ([`menu_row`]) take the
+/// larger of that width and their content, so the menu fits its content. Chain `.width(w)` for a
+/// menu at least `w` wide.
+/// The blend modes as menu items in groups (pass-through only for layers); the one picked.
+pub fn blend_menu(ui: &mut Ui, with_pass_through: bool) -> Option<BlendMode> {
+    let mut picked = None;
+    for b in BlendMode::ALL.into_iter().filter(|b| with_pass_through || *b != BlendMode::PassThrough) {
+        if menu_item(ui, tr(b.label()), "") {
+            picked = Some(b);
+            ui.close();
+        }
+        if matches!(b, BlendMode::Normal | BlendMode::ColorBurn | BlendMode::ColorDodge | BlendMode::HardLight | BlendMode::Exclusion) {
+            ui.separator();
+        }
+    }
+    picked
+}
+
+pub fn menu_popup(anchor: &egui::Response) -> egui::Popup<'static> {
+    egui::Popup::menu(anchor).width(anchor.rect.width().max(MENU_MIN_W)).style(menu_style)
+}
+
+/// A context menu (secondary click on `resp`) sized like [`menu_popup`].
+pub fn context_popup(resp: &egui::Response) -> egui::Popup<'static> {
+    egui::Popup::context_menu(resp).width(MENU_MIN_W).style(menu_style)
+}
+
+/// A context menu for a property row: a secondary click anywhere over `rect` opens it, even over
+/// the row's fields (which would otherwise take the click), like the incumbent's row menus.
+pub(super) fn row_context_menu(ui: &Ui, rect: Rect, id: Id) -> egui::Popup<'static> {
+    let resp = ui.interact(rect, id, Sense::hover());
+    let open = ui.rect_contains_pointer(rect) && ui.input(|i| i.pointer.secondary_clicked());
+    let at_pointer = egui::Popup::menu(&resp).width(MENU_MIN_W).style(menu_style).at_pointer_fixed();
+    at_pointer.open_memory(open.then_some(egui::SetOpenCommand::Bool(true)))
+}
+
+pub fn menu_item(ui: &mut Ui, label: &str, shortcut: &str) -> bool {
+    menu_row(ui, label, shortcut, 0.0, |_, _, _| {}).clicked()
+}
+
+/// A menu row with art drawn into it after the label (`art(painter, row rect, text colour)`),
+/// taking `art_w` from the row's right edge.
+pub fn menu_item_with(ui: &mut Ui, label: &str, shortcut: &str, art_w: f32, art: impl FnOnce(&egui::Painter, Rect, Color32)) -> bool {
+    menu_row(ui, label, shortcut, art_w, art).clicked()
+}
+
+/// The width a menu row needs for a label `label_w` wide and, at its right end, a shortcut or
+/// art `trail` wide (0 for neither).
+pub(crate) fn menu_row_width(label_w: f32, trail: f32) -> f32 {
+    MENU_PAD + label_w + if trail > 0.0 { MENU_GAP + trail } else { MENU_PAD }
+}
+
+/// A menu row (see [`menu_item_with`]); its response tells hovering too. It spans the menu and
+/// is at least as wide as its label, shortcut and art.
+pub fn menu_row(ui: &mut Ui, label: &str, shortcut: &str, art_w: f32, art: impl FnOnce(&egui::Painter, Rect, Color32)) -> egui::Response {
+    let t = Tokens::get(ui.ctx());
+    let text = ui.painter().layout_no_wrap(label.to_owned(), regular(11.5), Color32::PLACEHOLDER);
+    let keys =
+        (!shortcut.is_empty()).then(|| ui.painter().layout_no_wrap(crate::toolbar::pretty_shortcut(shortcut), regular(11.0), Color32::PLACEHOLDER));
+    let trail = keys.as_ref().map_or(0.0, |k| k.size().x + MENU_PAD).max(art_w);
+    let w = ui.available_width().max(menu_row_width(text.size().x, trail).ceil());
+    let (r, resp) = ui.allocate_exact_size(vec2(w, 26.0), Sense::click());
+    a11y::menu_item(&resp, label, shortcut, None);
+    // The keyboard's item is highlighted like the hovered one.
+    a11y::own_focus(&resp);
+    let hovered = resp.hovered() || resp.has_focus();
+    if hovered {
+        ui.painter().rect_filled(r, CornerRadius::same(5), t.menu_hover);
+    }
+    // These menus sit on the theme's popup fill (white in the light theme), not on the dark
+    // `t.menu` of the menu bar: the theme's text, white only on the green highlight (#972).
+    let col = if hovered { t.menu_text } else { t.text };
+    ui.painter().galley(pos2(r.min.x + MENU_PAD, r.center().y - text.size().y / 2.0), text, col);
+    if let Some(k) = keys {
+        let at = pos2(r.max.x - MENU_PAD - k.size().x, r.center().y - k.size().y / 2.0);
+        ui.painter().galley(at, k, if hovered { t.menu_text } else { t.text_secondary });
+    }
+    art(ui.painter(), r, col);
+    resp
+}
+
+/// A menu item with a check mark when `on` (the unchecked ones line up with it).
+pub fn menu_check(ui: &mut Ui, on: bool, label: &str, shortcut: &str) -> bool {
+    marked_row(ui, Some(on), label, shortcut)
+}
+
+/// A plain menu item lined up with the check items above or below it.
+pub fn menu_item_beside_checks(ui: &mut Ui, label: &str, shortcut: &str) -> bool {
+    marked_row(ui, None, label, shortcut)
+}
+
+fn marked_row(ui: &mut Ui, on: Option<bool>, label: &str, shortcut: &str) -> bool {
+    let resp = menu_row(ui, &format!("{}{label}", if on == Some(true) { "✓ " } else { "    " }), shortcut, 0.0, |_, _, _| {});
+    a11y::menu_item(&resp, label, shortcut, on);
+    resp.clicked()
+}
+
+pub(crate) fn row(ui: &mut Ui, h: f32, add: impl FnOnce(&mut Ui)) {
+    row_rect(ui, h, add);
+}
+
+/// [`row`], returning the area the row takes.
+pub(crate) fn row_rect(ui: &mut Ui, h: f32, add: impl FnOnce(&mut Ui)) -> Rect {
+    block(ui, h, (h - FIELD_H) / 2.0, add)
+}
+
+/// A panel row `h` tall whose content is inset `inset_y` from its top and bottom (for content
+/// taller than one field); returns the area the row takes.
+pub(crate) fn block(ui: &mut Ui, h: f32, inset_y: f32, add: impl FnOnce(&mut Ui)) -> Rect {
+    let w = ui.available_width();
+    let (r, _) = ui.allocate_exact_size(vec2(w, h), Sense::hover());
+    let mut child =
+        ui.new_child(egui::UiBuilder::new().max_rect(r.shrink2(vec2(PAD, inset_y))).layout(egui::Layout::left_to_right(egui::Align::Center)));
+    child.spacing_mut().item_spacing = vec2(8.0, 0.0);
+    add(&mut child);
+    r
+}
diff --git a/crates/ui-egui/src/panels/right/paints.rs b/crates/ui-egui/src/panels/right/paints.rs
new file mode 100644
index 00000000..66db55dd
--- /dev/null
+++ b/crates/ui-egui/src/panels/right/paints.rs
@@ -0,0 +1,553 @@
+use super::menu::{blend_menu, context_popup, menu_check, menu_item, menu_popup, row, row_context_menu, row_rect};
+use super::stroke::stroke_settings;
+use super::*;
+
+/// Draw visibility/blend/mask, opacity, uniform or per-corner radius, corner smoothing and
+/// the blend-mode row.
+pub(super) fn appearance(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
+    let ids = sel.to_vec();
+    let visible = common(doc, sel, |n| n.visible).unwrap_or(true);
+    let hdr = widgets::section_header(
+        ui,
+        tr("Appearance"),
+        &[
+            (if visible { Icon::Eye } else { Icon::EyeOff }, crate::shortcuts::tip(tr("Show/Hide"), "object.toggleVisible")),
+            (Icon::Variable, tr("Apply variable to visibility")),
+            (Icon::Blend, tr("Blend mode")),
+        ],
+        false,
+    );
+    if hdr == Some(0) {
+        app.run("object.toggleVisible", json!({"ids": ids}));
+    }
+    if hdr == Some(1) {
+        crate::variable_ui::open_at_pointer(ui, &ids, "visible", VariableType::Boolean);
+    }
+    if hdr == Some(2) {
+        ui.data_mut(|d| d.insert_temp(Id::unique("blend_open"), !d.get_temp::<bool>(Id::unique("blend_open")).unwrap_or(false)));
+    }
+    let col = widgets::col_width(ui.available_width());
+    crate::variable_ui::bound_row(app, ui, &ids, "visible", VariableType::Boolean, Lead::Icon(Icon::Eye, tr("Visible")), col * 2.0 + 8.0);
+    // Masks: how they mask.
+    if sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.is_mask)) {
+        let mt = common(doc, sel, |n| n.mask_type);
+        widgets::sublabels(ui, tr("Mask"), None);
+        row(ui, 32.0, |ui| {
+            let resp = widgets::dropdown(ui, mt.map(|m| tr(m.label())).unwrap_or(tr("Mixed")), col * 2.0 + 8.0, Some(Icon::Mask));
+            menu_popup(&resp).show(|ui| {
+                for m in MaskType::ALL {
+                    if menu_item(ui, tr(m.label()), "") {
+                        app.set_props(&ids, json!({"maskType": m.id()}));
+                        ui.close();
+                    }
+                }
+            });
+        });
+    }
+    let op_of = |n: &Node| (f64::from(n.opacity) * 100.0).round();
+    let op = common(doc, sel, op_of);
+    let radius_ok = sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.has_corner_radius()));
+    // Only rectangles and frames round each corner on its own.
+    let indep_ok = radius_ok && sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.has_independent_corners()));
+    // For polygons and stars the same panel holds only the Corner smoothing row.
+    let smooth_ok = radius_ok && sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.has_corner_smoothing()));
+    let r = common(doc, sel, |n| n.corners.uniform().map(|r| (r * 100.0).round() / 100.0));
+    widgets::sublabels(ui, tr("Opacity"), radius_ok.then_some(tr("Corner radius")));
+    row(ui, 32.0, |ui| {
+        let lead = Lead::Icon(Icon::Opacity, tr("Opacity"));
+        let e = crate::variable_ui::number_field_mixed(app, ui, &ids, "opacity", Id::unique("ap_op"), lead, op, "%", col);
+        app.field_of(&ids, "opacity", e, op_of, |v| json!((v / 100.0).clamp(0.0, 1.0)));
+        if radius_ok {
+            let e = crate::variable_ui::number_field_mixed(
+                app,
+                ui,
+                &ids,
+                "cornerRadius",
+                Id::unique("ap_rad"),
+                Lead::Icon(Icon::CornerRadius, tr("Corner radius")),
+                r.flatten(),
+                "",
+                col,
+            );
+            // A layer with corners of its own starts from its largest.
+            let radius_of = |n: &Node| n.corners.uniform().unwrap_or_else(|| n.corners.radii.iter().copied().fold(0.0, f64::max));
+            app.field_of(&ids, "cornerRadius", e, radius_of, |v| json!(v.max(0.0)));
+            let open = ui.data(|d| d.get_temp::<bool>(Id::unique("indep_corners"))).unwrap_or(false);
+            // Polygons and stars have no corners of their own: the button opens only Corner smoothing.
+            let tip = if indep_ok { tr("Individual corners") } else { tr("Corner smoothing") };
+            if smooth_ok && icons::button(ui, Icon::IndependentCorners, 24.0, open, tip).clicked() {
+                ui.data_mut(|d| d.insert_temp(Id::unique("indep_corners"), !open));
+            }
+        }
+    });
+    if smooth_ok && ui.data(|d| d.get_temp::<bool>(Id::unique("indep_corners"))).unwrap_or(false) {
+        let radii = common(doc, sel, |n| n.corners.radii);
+        // `k` indexes `radii` ([top left, top right, bottom right, bottom left]); the fields sit
+        // where their corners are: top left, top right / bottom left, bottom right.
+        let corners = [
+            ("topLeftRadius", tr("Top left radius"), Icon::CornerTopLeft, 0),
+            ("topRightRadius", tr("Top right radius"), Icon::CornerTopRight, 1),
+            ("bottomLeftRadius", tr("Bottom left radius"), Icon::CornerBottomLeft, 3),
+            ("bottomRightRadius", tr("Bottom right radius"), Icon::CornerBottomRight, 2),
+        ];
+        // Polygons and stars have one radius, so no field per corner.
+        for pair in corners.chunks(2).filter(|_| indep_ok) {
+            row(ui, 32.0, |ui| {
+                for (key, name, icon, k) in pair {
+                    let e = crate::variable_ui::number_field(
+                        app,
+                        ui,
+                        &ids,
+                        key,
+                        Id::unique(("corner", *k)),
+                        Lead::Icon(*icon, name),
+                        radii.map(|r| r[*k]),
+                        "",
+                        col,
+                    );
+                    app.field(&ids, key, e, |v| json!(v.max(0.0)));
+                }
+            });
+        }
+        let sm = common(doc, sel, |n| (n.corners.smoothing * 100.0).round());
+        widgets::sublabels(ui, tr("Corner smoothing"), None);
+        row(ui, 32.0, |ui| {
+            let e = widgets::number_field(ui, Id::unique("smoothing"), Lead::None, sm, "%", col, 1.0);
+            app.field(&ids, "cornerSmoothing", e, |v| json!((v / 100.0).clamp(0.0, 1.0)));
+            if widgets::button(ui, tr("iOS"), false, true).on_hover_text(tr("Set corner smoothing to 60%")).clicked() {
+                app.set_props(&ids, json!({"cornerSmoothing": 0.6}));
+            }
+        });
+    }
+    let blend = common(doc, sel, |n| n.blend);
+    let show_blend = ui.data(|d| d.get_temp::<bool>(Id::unique("blend_open"))).unwrap_or(false)
+        || blend.is_some_and(|b| !matches!(b, BlendMode::Normal | BlendMode::PassThrough));
+    if show_blend {
+        widgets::sublabels(ui, tr("Blend mode"), None);
+        row(ui, 32.0, |ui| {
+            let label = blend.map(|b| tr(b.label())).unwrap_or(tr("Mixed"));
+            let resp = widgets::dropdown(ui, label, col * 2.0 + 8.0, Some(Icon::Blend));
+            menu_popup(&resp).width(200.0).show(|ui| {
+                if let Some(b) = blend_menu(ui, true) {
+                    app.set_props(&ids, json!({"blend": b.label()}));
+                }
+            });
+        });
+    }
+    ui.add_space(8.0);
+}
+
+/// The variable modes of the selected frames (sections, components, instances): a row per
+/// collection with more than one mode, Auto (the mode the layer inherits from its parent) or a mode
+/// of its own (`variable.setMode`). Collections from enabled libraries follow under their
+/// library's name (`library.setVariableMode` copies the collection in). Returns whether it showed.
+pub(super) fn variable_modes(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) -> bool {
+    if !sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.is_frame_like())) {
+        return false;
+    }
+    let libs = crate::variable_ui::libraries(app, doc);
+    let rows = crate::variable_ui::mode_rows(doc, &libs);
+    if rows.is_empty() {
+        return false;
+    }
+    let t = Tokens::get(ui.ctx());
+    widgets::section_header(ui, tr("Variable modes"), &[], false);
+    // The collection's name, then a wider mode picker ("Auto (Light)") across both field columns.
+    let col = widgets::col_width(ui.available_width());
+    let (name_w, pick_w) = ((col * 0.7).round(), (col * 1.3).round());
+    // Auto resolves as for the first selected layer: from its parent, or an instance's main.
+    let parent_modes = sel.first().map(|i| doc.inherited_modes(*i)).unwrap_or_default();
+    let mut group = None;
+    for r in &rows {
+        let c = r.coll;
+        // Library collections under their library's name.
+        if r.library != group {
+            group = r.library;
+            if let Some((_, lib)) = r.library {
+                widgets::sublabels(ui, lib, None);
+            }
+        }
+        let name_of = |m: &str| c.modes.iter().find(|x| x.id == m).map_or("", |x| x.name.as_str());
+        // Each layer's own mode (None: Auto); None overall when they differ.
+        let own = match r.local {
+            Some(l) => common(doc, sel, |n| n.var_modes.get(l).cloned()),
+            None => Some(None),
+        };
+        let inherited = r.local.and_then(|l| parent_modes.get(l)).or(c.default_mode()).map_or("", |m| name_of(m));
+        let auto = trf("Auto ({mode})", &[("mode", &inherited)]);
+        let label = match &own {
+            Some(Some(m)) => name_of(m).to_string(),
+            Some(None) => auto.clone(),
+            None => tr("Mixed").into(),
+        };
+        let hover = match r.library {
+            Some((_, lib)) => trf("{name} (from {library})", &[("name", &c.name), ("library", &lib)]),
+            None => c.name.clone(),
+        };
+        row(ui, 32.0, |ui| {
+            let (rect, _) = ui.allocate_exact_size(vec2(name_w, FIELD_H), Sense::hover());
+            let name = widgets::elide(ui, &c.name, name_w);
+            ui.painter().text(pos2(rect.min.x, rect.center().y), Align2::LEFT_CENTER, &name, regular(11.0), t.text);
+            if name != c.name || r.library.is_some() {
+                ui.interact(rect, Id::unique(("var_mode_name", &c.id)), Sense::hover()).on_hover_text(&hover);
+            }
+            let resp = widgets::dropdown(ui, &label, pick_w, None);
+            menu_popup(&resp).width(180.0).show(|ui| {
+                let mut pick = None;
+                if menu_check(ui, own == Some(None), &auto, "") {
+                    pick = Some(Value::Null);
+                }
+                ui.separator();
+                for m in &c.modes {
+                    if menu_check(ui, own.as_ref().is_some_and(|o| o.as_ref() == Some(&m.id)), &m.name, "") {
+                        pick = Some(json!(m.id));
+                    }
+                }
+                if let Some(mode) = pick {
+                    set_variable_mode(app, sel, r, mode);
+                    ui.close();
+                }
+            });
+        });
+    }
+    ui.add_space(8.0);
+    true
+}
+
+/// Set `sel`'s mode of the collection of `row` (`mode` null: Auto). A library collection goes
+/// through `library.setVariableMode` (copying it in); Auto on one never used here is already so.
+fn set_variable_mode(app: &mut FigApp, sel: &[NodeId], row: &crate::variable_ui::ModeRow, mode: Value) {
+    match (row.library, row.key, row.local) {
+        (Some((lib, _)), Some(key), _) if !mode.is_null() => {
+            app.run("library.setVariableMode", json!({"library": lib, "collection": key, "ids": sel, "mode": mode}));
+        }
+        (_, _, Some(local)) => {
+            app.run("variable.setMode", json!({"ids": sel, "collection": local, "mode": mode}));
+        }
+        _ => {}
+    }
+}
+
+/// While a range of text is selected, the Fill section edits that range's colour.
+fn range_fill(app: &mut FigApp, ui: &mut Ui, doc: &Document, id: NodeId, start: usize, end: usize) {
+    let t = Tokens::get(ui.ctx());
+    widgets::section_header(ui, tr("Fill"), &[], false);
+    // The fills over the range, if every character shares them.
+    let fills: Option<Vec<Paint>> = doc.node(id).and_then(|n| n.kind.text().map(|tx| (n, tx))).and_then(|(n, tx)| {
+        let mut it =
+            tx.spans().into_iter().filter(|(s, e, _)| *s < end && *e > start).map(|(_, _, st)| st.fills.clone().unwrap_or_else(|| n.fills.clone()));
+        let first = it.next()?;
+        it.all(|f| f == first).then_some(first)
+    });
+    row(ui, 32.0, |ui| {
+        let w = ui.available_width() - 28.0;
+        let (r, _) = ui.allocate_exact_size(vec2(w, FIELD_H), Sense::hover());
+        ui.painter().rect_filled(r, CornerRadius::same(5), t.field);
+        let sw = Rect::from_min_size(pos2(r.min.x + 4.0, r.center().y - 8.0), vec2(16.0, 16.0));
+        let text_r = Rect::from_min_max(pos2(sw.max.x + 8.0, r.min.y), pos2(r.max.x - 4.0, r.max.y));
+        match fills.as_ref().and_then(|f| f.first()) {
+            Some(p) => {
+                widgets::paint_swatch(ui.painter(), sw, p);
+                if ui.interact(sw.expand(2.0), Id::unique("range_swatch"), Sense::click()).clicked() {
+                    app.ui.picker = Some(crate::colorpicker::PickerTarget::TextRange { id, start, end });
+                }
+                if let Some(c) = p.solid_color() {
+                    let mut child = ui.new_child(egui::UiBuilder::new().max_rect(text_r));
+                    if let Some(h) =
+                        widgets::text_field_inline(&mut child, Id::unique("range_hex"), &c.to_hex(), text_r.shrink2(vec2(0.0, 4.0)), regular(11.0))
+                        && let Some(nc) = figcraft_color::Color::from_hex_or_name(&h)
+                    {
+                        app.run("text.style", json!({"id": id, "start": start, "end": end, "textFills": [nc.to_css_hex()]}));
+                    }
+                } else {
+                    ui.painter().text(pos2(text_r.min.x, r.center().y), Align2::LEFT_CENTER, tr("Gradient"), regular(11.0), t.text);
+                }
+            }
+            None => {
+                ui.painter().text(pos2(text_r.min.x, r.center().y), Align2::LEFT_CENTER, tr("Mixed"), regular(11.0), t.text_secondary);
+                if ui.interact(r, Id::unique("range_mixed"), Sense::click()).clicked() {
+                    app.ui.picker = Some(crate::colorpicker::PickerTarget::TextRange { id, start, end });
+                }
+            }
+        }
+        // Back to the layer's fill.
+        if icons::button(ui, Icon::Detach, 24.0, false, tr("Use the layer's fill")).clicked() {
+            app.run("text.style", json!({"id": id, "start": start, "end": end, "textFills": null}));
+        }
+    });
+}
+
+/// Draw a selected-text range fill, or the fill/stroke paint rows with add, style, reorder,
+/// stroke align/weight, per-side weights and advanced stroke settings.
+pub(super) fn paints(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId], fills: bool) {
+    if fills
+        && let Some((id, a, b)) = figcraft_engine::textedit::selected_range(&app.session)
+        && a < b
+        && sel.contains(&id)
+    {
+        range_fill(app, ui, doc, id, a, b);
+        return;
+    }
+    let t = Tokens::get(ui.ctx());
+    let ids = sel.to_vec();
+    let list = common(doc, sel, |n| if fills { n.fills.clone() } else { n.strokes.clone() });
+    let title = if fills { tr("Fill") } else { tr("Stroke") };
+    let empty = list.as_ref().is_none_or(|l| l.is_empty());
+    let slot = if fills { StyleSlot::Fill } else { StyleSlot::Stroke };
+    // The section's right-click menu adds the copied paint (`fill.paste` / `stroke.paste`).
+    let paste = if fills { tr("Paste fill") } else { tr("Paste stroke") };
+    let (clicked, header) = widgets::section_header_resp(
+        ui,
+        title,
+        &[(Icon::Styles, tr("Styles")), (Icon::Plus, if fills { tr("Add fill") } else { tr("Add stroke") })],
+        empty,
+    );
+    if let Some(i) = clicked {
+        if i == 1 {
+            // The new paint goes on top; open its picker. A mixed selection has no one index to edit.
+            if app.run(if fills { "fill.add" } else { "stroke.add" }, json!({"ids": ids})).is_some()
+                && let Some(l) = &list
+            {
+                app.ui.picker = Some(crate::colorpicker::PickerTarget::Paint { fills, index: l.len(), ids: ids.clone() });
+            }
+        } else {
+            style_picker::open(app, ui, &ids, slot);
+        }
+    }
+    context_popup(&header).show(|ui| {
+        if app.session.clipboard.paint.as_ref().is_some_and(|(f, _)| *f == fills) && menu_item(ui, paste, "") {
+            app.run(if fills { "fill.paste" } else { "stroke.paste" }, json!({"ids": ids}));
+            ui.close();
+        }
+    });
+    style_picker::chip(app, ui, doc, &ids, slot);
+    match &list {
+        None => widgets::note(ui, tr("Click + to replace mixed content"), t.text_secondary),
+        Some(l) => {
+            // The last paint is on top: shown first. Rows drag to reorder.
+            let mut drag = ListDrag::new(ui, if fills { "fills" } else { "strokes" });
+            for (i, p) in l.iter().enumerate().rev() {
+                let r = paint_row(app, ui, &ids, i, p, fills);
+                drag.row(ui, i, r, r, || paint_label(p));
+            }
+            if let Some((from, to)) = drag.finish(ui) {
+                app.run(if fills { "fill.move" } else { "stroke.move" }, json!({"ids": ids, "from": from, "to": to}));
+                // An open colour picker keeps editing the paint it was on.
+                if let Some(crate::colorpicker::PickerTarget::Paint { fills: f, index, .. }) = &mut app.ui.picker
+                    && *f == fills
+                {
+                    *index = moved_index(*index, from, to);
+                }
+            }
+        }
+    }
+    if !fills && !empty {
+        let weight = common(doc, sel, |n| n.stroke.weight);
+        let align = common(doc, sel, |n| n.stroke.align);
+        let half = (ui.available_width() - PAD * 2.0 - 8.0) / 2.0;
+        row(ui, 32.0, |ui| {
+            let resp = widgets::dropdown(
+                ui,
+                match align {
+                    Some(StrokeAlign::Inside) => tr("Inside"),
+                    Some(StrokeAlign::Center) => tr("Center"),
+                    Some(StrokeAlign::Outside) => tr("Outside"),
+                    None => tr("Mixed"),
+                },
+                half,
+                None,
+            );
+            menu_popup(&resp).show(|ui| {
+                for (l, v) in [(tr("Inside"), "inside"), (tr("Center"), "center"), (tr("Outside"), "outside")] {
+                    if menu_item(ui, l, "") {
+                        app.set_props(&ids, json!({"strokeAlign": v}));
+                        ui.close();
+                    }
+                }
+            });
+            let sided = sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.is_frame_like() || matches!(n.kind, NodeKind::Rectangle)));
+            let weight_w = half - if sided { 60.0 } else { 32.0 };
+            let e = crate::variable_ui::number_field_mixed(
+                app,
+                ui,
+                &ids,
+                "strokeWeight",
+                Id::unique("stroke_w"),
+                Lead::Icon(Icon::Menu, tr("Stroke weight")),
+                weight,
+                "",
+                weight_w,
+            );
+            app.field_of(&ids, "strokeWeight", e, |n| n.stroke.weight, |v| json!(v.max(0.0)));
+            if sided {
+                let sides_btn = icons::button(ui, Icon::IndependentCorners, 24.0, false, tr("Individual strokes"));
+                menu_popup(&sides_btn).show(|ui| {
+                    let w = weight.unwrap_or(1.0);
+                    for (l, v) in [
+                        (tr("All"), Value::Null),
+                        (tr("Top"), json!([w, 0.0, 0.0, 0.0])),
+                        (tr("Right"), json!([0.0, w, 0.0, 0.0])),
+                        (tr("Bottom"), json!([0.0, 0.0, w, 0.0])),
+                        (tr("Left"), json!([0.0, 0.0, 0.0, w])),
+                        (tr("Custom"), json!([w, w, w, w])),
+                    ] {
+                        if menu_item(ui, l, "") {
+                            app.set_props(&ids, json!({"strokeSides": v}));
+                            ui.close();
+                        }
+                    }
+                });
+            }
+            let adv_id = Id::unique("stroke_adv");
+            let open = ui.data(|d| d.get_temp::<bool>(adv_id)).unwrap_or(false);
+            if icons::button(ui, Icon::Dots, 24.0, open, tr("Advanced stroke")).clicked() {
+                ui.data_mut(|d| d.insert_temp(adv_id, !open));
+            }
+        });
+        // Per-side weights, two to a row (like the corner radii) so a bound variable's name fits:
+        // each side binds to a number variable on its own.
+        if let Some(sides) = common(doc, sel, |n| n.stroke.sides).flatten() {
+            let col = widgets::col_width(ui.available_width());
+            let fields = ["T", "R", "B", "L"].into_iter().zip(figcraft_engine::cmd::props::STROKE_SIDES);
+            for first in [0, 2] {
+                row(ui, 32.0, |ui| {
+                    for (k, (label, field)) in fields.clone().enumerate().skip(first).take(2) {
+                        let v = sides.get(k).copied();
+                        let e = crate::variable_ui::number_field(app, ui, &ids, field, Id::unique(("stroke_side", k)), Lead::Text(label), v, "", col);
+                        app.field(&ids, field, e, |x| json!(x.max(0.0)));
+                    }
+                });
+            }
+        }
+        if ui.data(|d| d.get_temp::<bool>(Id::unique("stroke_adv"))).unwrap_or(false) {
+            stroke_settings(app, ui, doc, sel);
+        }
+    }
+}
+
+/// Paint `i`'s row (swatch, colour or kind, opacity, visibility, remove); returns its area.
+fn paint_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, p: &Paint, fills: bool) -> Rect {
+    let t = Tokens::get(ui.ctx());
+    let ids = ids.to_vec();
+    let cmd = if fills { "fill.set" } else { "stroke.set" };
+    let r = row_rect(ui, 32.0, |ui| {
+        let w = ui.available_width() - 56.0;
+        let (r, _) = ui.allocate_exact_size(vec2(w, FIELD_H), Sense::hover());
+        ui.painter().rect_filled(r, CornerRadius::same(5), t.field);
+        let sw = Rect::from_min_size(pos2(r.min.x + 4.0, r.center().y - 8.0), vec2(16.0, 16.0));
+        widgets::paint_swatch(ui.painter(), sw, p);
+        let sresp = ui.interact(sw.expand(2.0), Id::unique(("swatch", fills, i)), Sense::click());
+        if sresp.clicked() {
+            app.ui.picker = Some(crate::colorpicker::PickerTarget::Paint { fills, index: i, ids: ids.clone() });
+        }
+        let text_r = Rect::from_min_max(pos2(sw.max.x + 8.0, r.min.y), pos2(r.max.x - 52.0, r.max.y));
+        let mut child = ui.new_child(egui::UiBuilder::new().max_rect(text_r));
+        // The variable bound to this paint's colour (its key on the layers: `fill` or `fills/<i>/color`).
+        let bound = app.session.doc().ok().and_then(|d| {
+            let key = ids.first().and_then(|id| d.node(*id)).and_then(|n| figcraft_engine::cmd::lists::paint_binding_key(n, fills, i))?;
+            Some((key.to_string(), crate::variable_ui::bound_name(d, &ids, key)?))
+        });
+        match &p.kind {
+            PaintKind::Solid { .. } if bound.is_some() => {
+                let (key, name) = bound.clone().unwrap_or_default();
+                let chip = Rect::from_min_max(pos2(text_r.min.x - 2.0, r.min.y + 3.0), pos2(text_r.max.x - 20.0, r.max.y - 3.0));
+                child.painter().rect_filled(chip, CornerRadius::same(4), t.hover);
+                child.painter().rect_stroke(chip, CornerRadius::same(4), Stroke::new(1.0, t.border), egui::StrokeKind::Inside);
+                let short = name.rsplit('/').next().unwrap_or(&name).to_string();
+                child.painter().with_clip_rect(chip.shrink2(vec2(5.0, 0.0))).text(
+                    pos2(chip.min.x + 5.0, r.center().y),
+                    Align2::LEFT_CENTER,
+                    short,
+                    regular(11.0),
+                    t.text,
+                );
+                let _ = ui.interact(chip, Id::unique(("bound_paint", fills, i)), Sense::hover()).on_hover_text(&name);
+                let dr = Rect::from_center_size(pos2(text_r.max.x - 9.0, r.center().y), vec2(18.0, 18.0));
+                let dresp = ui.interact(dr, Id::unique(("detach_paint", fills, i)), Sense::click()).tip(tr("Detach variable"));
+                icons::paint(ui.painter(), dr.shrink(3.0), Icon::Detach, t.icon_secondary);
+                if dresp.clicked() {
+                    app.run("variable.bind", json!({"ids": ids, "field": key, "variable": null}));
+                }
+            }
+            PaintKind::Solid { color } => {
+                if let Some(h) = widgets::text_field_inline(
+                    &mut child,
+                    Id::unique(("hex", fills, i)),
+                    &color.to_hex(),
+                    text_r.shrink2(vec2(0.0, 4.0)),
+                    regular(11.0),
+                ) && let Some(c) = figcraft_color::Color::from_hex_or_name(&h)
+                {
+                    app.run(cmd, json!({"ids": ids, "index": i, "color": c.to_css_hex()}));
+                }
+            }
+            _ => {
+                child.painter().text(pos2(text_r.min.x, r.center().y), Align2::LEFT_CENTER, paint_label(p), regular(11.0), t.text);
+            }
+        }
+        let op_r = Rect::from_min_max(pos2(r.max.x - 48.0, r.min.y), r.max);
+        ui.painter().line_segment([pos2(op_r.min.x, r.min.y + 4.0), pos2(op_r.min.x, r.max.y - 4.0)], Stroke::new(1.0, t.panel));
+        let mut child = ui.new_child(egui::UiBuilder::new().max_rect(op_r));
+        let e = widgets::number_field(
+            &mut child,
+            Id::unique(("pop", fills, i)),
+            Lead::None,
+            Some((f64::from(p.opacity) * 100.0).round()),
+            "%",
+            48.0,
+            1.0,
+        );
+        match e {
+            Some(FieldEdit::Set(v)) => {
+                app.run(cmd, json!({"ids": ids, "index": i, "opacity": (v / 100.0).clamp(0.0, 1.0)}));
+            }
+            Some(FieldEdit::Scrub(v, done)) => {
+                let _ = app.session.begin_interaction("Opacity");
+                let _ = app.session.execute(cmd, &json!({"ids": ids, "index": i, "opacity": (v / 100.0).clamp(0.0, 1.0)}));
+                if done {
+                    let _ = app.session.commit_interaction();
+                }
+            }
+            None => {}
+        }
+        if icons::button(ui, if p.visible { Icon::Eye } else { Icon::EyeOff }, 24.0, false, tr("Toggle visibility")).clicked() {
+            app.run(cmd, json!({"ids": ids, "index": i, "visible": !p.visible}));
+        }
+        if icons::button(ui, Icon::Minus, 24.0, false, tr("Remove")).clicked()
+            && app.run(if fills { "fill.remove" } else { "stroke.remove" }, json!({"ids": ids, "index": i})).is_some()
+            && let Some(crate::colorpicker::PickerTarget::Paint { fills: f, index, .. }) = &mut app.ui.picker
+            && *f == fills
+        {
+            // An open colour picker keeps editing the paint it was on, or closes with it.
+            match removed_index(*index, i) {
+                Some(k) => *index = k,
+                None => app.ui.picker = None,
+            }
+        }
+    });
+    let copy = if fills { tr("Copy fill") } else { tr("Copy stroke") };
+    let paste = if fills { tr("Paste fill") } else { tr("Paste stroke") };
+    let can_paste = app.session.clipboard.paint.as_ref().is_some_and(|(f, _)| *f == fills);
+    row_context_menu(ui, r, Id::unique(("paint_menu", fills, i))).show(|ui| {
+        if menu_item(ui, copy, "") {
+            app.run(if fills { "fill.copy" } else { "stroke.copy" }, json!({"ids": ids, "index": i}));
+            ui.close();
+        }
+        if can_paste && menu_item(ui, paste, "") {
+            app.run(if fills { "fill.paste" } else { "stroke.paste" }, json!({"ids": ids, "index": i}));
+            ui.close();
+        }
+    });
+    r
+}
+
+/// A paint row's label (also what a drag of it carries): its colour, gradient kind or "Image".
+fn paint_label(p: &Paint) -> String {
+    match &p.kind {
+        PaintKind::Solid { color } => color.to_hex(),
+        // The gradient kind's name ("Linear") is a key of its own.
+        PaintKind::Gradient(g) => tr(&format!("{:?}", g.kind)).to_string(),
+        PaintKind::Image(_) => tr("Image").into(),
+        PaintKind::Pattern(_) => tr("Pattern").into(),
+    }
+}
diff --git a/crates/ui-egui/src/panels/right/stroke.rs b/crates/ui-egui/src/panels/right/stroke.rs
new file mode 100644
index 00000000..c3bc8642
--- /dev/null
+++ b/crates/ui-egui/src/panels/right/stroke.rs
@@ -0,0 +1,313 @@
+use super::menu::{menu_item, menu_item_with, menu_popup, row};
+use super::*;
+
+/// A width profile drawn as a filled band across `rect` (thickest point = full height); `None`
+/// draws a uniform stroke.
+pub(crate) fn profile_art(painter: &egui::Painter, rect: Rect, profile: Option<&WidthProfile>, col: Color32) {
+    const STEPS: u32 = 40;
+    let max = profile.map_or(1.0, WidthProfile::max_scale).max(1e-6);
+    let (cy, half) = (rect.center().y, rect.height() / 2.0);
+    let mut mesh = egui::Mesh::default();
+    let (mut top, mut bottom) = (Vec::new(), Vec::new());
+    for i in 0..=STEPS {
+        let t = f64::from(i) / f64::from(STEPS);
+        // The path runs left to right: its left side is drawn on top.
+        let (l, r) = profile.map_or((0.5, 0.5), |p| {
+            let (l, r) = p.sides_at(t);
+            (l / max, r / max)
+        });
+        let x = rect.min.x + rect.width() * t as f32;
+        let (hl, hr) = (((l as f32) * half).max(0.5), ((r as f32) * half).max(0.5));
+        top.push(pos2(x, cy - hl));
+        bottom.push(pos2(x, cy + hr));
+        mesh.colored_vertex(pos2(x, cy - hl), col);
+        mesh.colored_vertex(pos2(x, cy + hr), col);
+    }
+    for i in 0..STEPS {
+        let k = 2 * i;
+        mesh.add_triangle(k, k + 1, k + 2);
+        mesh.add_triangle(k + 1, k + 3, k + 2);
+    }
+    painter.add(egui::Shape::mesh(mesh));
+    // The mesh isn't anti-aliased: smooth its edges with hairlines.
+    for edge in [top, bottom] {
+        painter.add(egui::Shape::line(edge, Stroke::new(0.75, col)));
+    }
+}
+
+/// Stroke settings ▸ Width profile: the presets (each with its shape) and a flip.
+fn width_profile_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], profile: Option<Option<WidthProfile>>, half: f32) {
+    let t = Tokens::get(ui.ctx());
+    widgets::sublabels(ui, tr("Width profile"), None);
+    row(ui, 32.0, |ui| {
+        let label = match &profile {
+            None => tr("Mixed"),
+            Some(None) => tr(WidthPreset::Uniform.label()),
+            Some(Some(p)) => p.preset().map_or(tr("Custom"), |w| tr(w.label())),
+        };
+        let resp = widgets::dropdown(ui, label, half * 2.0 + 8.0 - 32.0, None);
+        if let Some(p) = &profile {
+            let r = resp.rect;
+            let art = Rect::from_min_max(pos2(r.max.x - 22.0 - 56.0, r.center().y - 5.0), pos2(r.max.x - 22.0, r.center().y + 5.0));
+            profile_art(ui.painter(), art, p.as_ref(), t.icon_secondary);
+        }
+        menu_popup(&resp).show(|ui| {
+            for preset in WidthPreset::ALL {
+                let prof = preset.profile();
+                let art = |pt: &egui::Painter, r: Rect, col: Color32| {
+                    let a = Rect::from_min_max(pos2(r.max.x - 8.0 - 64.0, r.center().y - 5.0), pos2(r.max.x - 8.0, r.center().y + 5.0));
+                    profile_art(pt, a, prof.as_ref(), col);
+                };
+                if menu_item_with(ui, tr(preset.label()), "", 8.0 + 64.0, art) {
+                    app.run("stroke.widthProfile", json!({"ids": ids, "preset": preset.id()}));
+                    ui.close();
+                }
+            }
+        });
+        // Flip: the profile runs from the other end of the path.
+        let custom = profile.clone().flatten();
+        let flip = icons::button(ui, Icon::FlipH, 24.0, false, tr("Flip width profile"));
+        if flip.clicked()
+            && let Some(p) = custom
+        {
+            let pts: Vec<Value> =
+                p.points.iter().rev().map(|q| figcraft_engine::cmd::props::width_point_json(&WidthPoint { t: 1.0 - q.t, ..*q })).collect();
+            app.run("stroke.widthProfile", json!({"ids": ids, "points": pts}));
+        }
+    });
+}
+
+/// A brush drawn along a short line across `rect`, as outlines (egui fills only convex shapes).
+pub(crate) fn brush_art(painter: &egui::Painter, rect: Rect, preset: &str, col: Color32) {
+    use figcraft_geom::kurbo::{self, PathEl};
+    let mut line = figcraft_geom::BezPath::new();
+    line.move_to((0.0, 0.0));
+    line.line_to((f64::from(rect.width()), 0.0));
+    let brush = Brush::new(preset);
+    let props = StrokeProps { weight: f64::from(rect.height()), align: StrokeAlign::Center, brush: Some(brush.clone()), ..Default::default() };
+    let Some(out) = figcraft_pathops::brush::outline(&line, props.weight, &props, &brush) else { return };
+    for sub in figcraft_geom::split_subpaths(&out) {
+        let mut pts = Vec::new();
+        kurbo::flatten(sub.iter(), 0.25, |el| {
+            if let PathEl::MoveTo(p) | PathEl::LineTo(p) = el {
+                pts.push(pos2(rect.min.x + p.x as f32, rect.center().y + p.y as f32));
+            }
+        });
+        painter.add(egui::Shape::closed_line(pts, Stroke::new(1.0, col)));
+    }
+}
+
+/// Stroke settings ▸ Brush: a plain stroke, a stretch brush or a scatter brush, each with its look.
+fn brush_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], brush: Option<Option<Brush>>, width: f32) {
+    use figcraft_pathops::brush::{PRESETS, preset};
+    let t = Tokens::get(ui.ctx());
+    widgets::sublabels(ui, tr("Brush"), None);
+    row(ui, 32.0, |ui| {
+        let label = match &brush {
+            None => tr("Mixed"),
+            Some(b) => b.as_ref().and_then(|b| preset(&b.preset)).map_or(tr("None"), |p| tr(p.label)),
+        };
+        let resp = widgets::dropdown(ui, label, width, None);
+        a11y::combo(&resp, tr("Brush"), label, a11y::menu_open(&resp));
+        if let Some(Some(b)) = &brush {
+            let r = resp.rect;
+            brush_art(
+                ui.painter(),
+                Rect::from_min_max(pos2(r.max.x - 22.0 - 56.0, r.center().y - 5.0), pos2(r.max.x - 22.0, r.center().y + 5.0)),
+                &b.preset,
+                t.icon_secondary,
+            );
+        }
+        menu_popup(&resp).show(|ui| {
+            if menu_item(ui, tr("None"), "") {
+                app.run("stroke.brush", json!({"ids": ids, "preset": null}));
+                ui.close();
+            }
+            for p in PRESETS {
+                let art = |pt: &egui::Painter, r: Rect, col: Color32| {
+                    brush_art(
+                        pt,
+                        Rect::from_min_max(pos2(r.max.x - 8.0 - 64.0, r.center().y - 5.0), pos2(r.max.x - 8.0, r.center().y + 5.0)),
+                        p.id,
+                        col,
+                    );
+                };
+                if menu_item_with(ui, tr(p.label), "", 8.0 + 64.0, art) {
+                    app.run("stroke.brush", json!({"ids": ids, "preset": p.id}));
+                    ui.close();
+                }
+            }
+        });
+    });
+    // A scatter brush's spacing and jitter.
+    let Some(Some(b)) =
+        brush.filter(|b| b.as_ref().and_then(|b| preset(&b.preset)).is_some_and(|p| p.kind == figcraft_pathops::brush::BrushKind::Scatter))
+    else {
+        return;
+    };
+    let half = (width - 8.0) / 2.0;
+    let with = |f: &dyn Fn(&mut Brush)| {
+        let mut nb = b.clone();
+        f(&mut nb);
+        serde_json::to_value(nb.sanitized()).unwrap_or_default()
+    };
+    widgets::sublabels(ui, tr("Spacing"), Some(tr("Scatter")));
+    row(ui, 32.0, |ui| {
+        let e = widgets::number_field(ui, Id::unique("brush_spacing"), Lead::Icon(Icon::Gap, tr("Brush spacing")), Some(b.spacing), "×", half, 0.1);
+        app.field(ids, "brush", e, |v| with(&|nb| nb.spacing = v));
+        let e = widgets::number_field(ui, Id::unique("brush_scatter"), Lead::Icon(Icon::Dots, tr("Brush scatter")), Some(b.scatter), "×", half, 0.1);
+        app.field(ids, "brush", e, |v| with(&|nb| nb.scatter = v));
+    });
+    widgets::sublabels(ui, tr("Size jitter"), Some(tr("Rotation jitter")));
+    row(ui, 32.0, |ui| {
+        let e = widgets::number_field(
+            ui,
+            Id::unique("brush_size_jitter"),
+            Lead::Icon(Icon::Scale, tr("Brush size jitter")),
+            Some(b.size_jitter * 100.0),
+            "%",
+            half,
+            1.0,
+        );
+        app.field(ids, "brush", e, |v| with(&|nb| nb.size_jitter = v / 100.0));
+        let e = widgets::number_field(
+            ui,
+            Id::unique("brush_rotation_jitter"),
+            Lead::Icon(Icon::Rotate, tr("Brush rotation jitter")),
+            Some(b.rotation_jitter * 100.0),
+            "%",
+            half,
+            1.0,
+        );
+        app.field(ids, "brush", e, |v| with(&|nb| nb.rotation_jitter = v / 100.0));
+    });
+}
+
+/// Advanced stroke settings: dash pattern, width profile, join and the end points of open paths.
+pub(super) fn stroke_settings(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
+    let ids = sel.to_vec();
+    let half = (ui.available_width() - PAD * 2.0 - 8.0) / 2.0;
+    let st = common(doc, sel, |n| n.stroke.clone());
+    let dashes = st.as_ref().map(|s| s.dashes.clone());
+    let weight = st.as_ref().map(|s| s.weight).unwrap_or(1.0).max(1.0);
+    widgets::sublabels(ui, tr("Stroke style"), None);
+    row(ui, 32.0, |ui| {
+        let dashed = dashes.as_ref().is_some_and(|d| !d.is_empty());
+        let resp = widgets::dropdown(ui, if dashed { tr("Dash") } else { tr("Solid") }, half, None);
+        menu_popup(&resp).show(|ui| {
+            if menu_item(ui, tr("Solid"), "") {
+                app.set_props(&ids, json!({"dashes": []}));
+                ui.close();
+            }
+            if menu_item(ui, tr("Dash"), "") {
+                app.set_props(&ids, json!({"dashes": [weight * 4.0, weight * 4.0]}));
+                ui.close();
+            }
+        });
+    });
+    if let Some(d) = dashes.filter(|d| !d.is_empty()) {
+        let (dash, gap) = (d.first().copied().unwrap_or(4.0), d.get(1).copied().unwrap_or_else(|| d.first().copied().unwrap_or(4.0)));
+        widgets::sublabels(ui, tr("Dash"), Some(tr("Gap")));
+        row(ui, 32.0, |ui| {
+            let e = widgets::number_field(ui, Id::unique("stroke_dash"), Lead::None, Some(dash), "", half, 1.0);
+            app.field(&ids, "dashes", e, |v| json!([v.max(0.0), gap]));
+            let e = widgets::number_field(ui, Id::unique("stroke_gap"), Lead::None, Some(gap), "", half, 1.0);
+            app.field(&ids, "dashes", e, |v| json!([dash, v.max(0.0)]));
+        });
+    }
+    width_profile_row(app, ui, &ids, st.as_ref().map(|s| s.profile().cloned()), half);
+    brush_row(app, ui, &ids, st.as_ref().map(|s| s.brush.clone()), half * 2.0 + 8.0);
+    let join = st.as_ref().map(|s| s.join);
+    widgets::sublabels(ui, tr("Join|stroke"), (join == Some(StrokeJoin::Miter)).then_some(tr("Miter angle")));
+    row(ui, 32.0, |ui| {
+        let resp = widgets::dropdown(ui, join.map(join_label).unwrap_or(tr("Mixed")), half, None);
+        menu_popup(&resp).show(|ui| {
+            for j in StrokeJoin::ALL {
+                if menu_item(ui, join_label(j), "") {
+                    app.set_props(&ids, json!({"strokeJoin": j}));
+                    ui.close();
+                }
+            }
+        });
+        if join == Some(StrokeJoin::Miter) {
+            let angle = st.as_ref().map(|s| (s.miter_angle() * 100.0).round() / 100.0);
+            let e = widgets::number_field(ui, Id::unique("stroke_miter"), Lead::None, angle, "°", half, 1.0);
+            app.field(&ids, "miterAngle", e, |v| json!(v));
+        }
+    });
+    // End points only mean something on open paths.
+    let open_paths = sel.iter().all(|i| doc.node(*i).is_some_and(|n| matches!(n.kind, NodeKind::Line | NodeKind::Vector { .. })));
+    if open_paths {
+        widgets::sublabels(ui, tr("Start point"), Some(tr("End point")));
+        row(ui, 32.0, |ui| {
+            for (key, cap) in [("startCap", st.as_ref().map(|s| s.cap_start)), ("endCap", st.as_ref().map(|s| s.cap_end))] {
+                let resp = widgets::dropdown(ui, cap.map(|c| tr(c.label())).unwrap_or(tr("Mixed")), half, None);
+                menu_popup(&resp).show(|ui| {
+                    for c in StrokeCap::ALL {
+                        if menu_item_with(ui, tr(c.label()), "", CAP_ART_W, |p, r, col| cap_art(p, r, col, c, key == "startCap")) {
+                            app.set_props(&ids, json!({key: format!("{c:?}")}));
+                            ui.close();
+                        }
+                    }
+                });
+            }
+        });
+    }
+    ui.add_space(4.0);
+}
+
+/// A stroke join's name in the interface.
+pub(crate) fn join_label(j: StrokeJoin) -> &'static str {
+    match j {
+        StrokeJoin::Miter => tr("Miter"),
+        StrokeJoin::Bevel => tr("Bevel"),
+        StrokeJoin::Round => tr("Round"),
+    }
+}
+
+/// The width [`cap_art`] takes at the right of a menu row (its arrows reach past the line's ends).
+pub(crate) const CAP_ART_W: f32 = 64.0;
+
+/// A short stroke ending in `cap` (on its left end for a start point), drawn at the right of a menu
+/// row.
+pub(crate) fn cap_art(p: &egui::Painter, r: Rect, col: Color32, cap: StrokeCap, start: bool) {
+    let y = r.center().y;
+    let (left, right) = (r.max.x - 58.0, r.max.x - 14.0);
+    // The capped end, the plain end, and the direction from the stroke into its cap.
+    let (tip, tail, d) = if start { (left, right, -1.0) } else { (right, left, 1.0) };
+    let at = |back: f32, dy: f32| pos2(tip - d * back, y + dy);
+    let line = |to: Pos2, w: f32| {
+        p.line_segment([pos2(tail, y), to], Stroke::new(w, col));
+    };
+    let fill = |pts: Vec<Pos2>| {
+        p.add(egui::Shape::convex_polygon(pts, col, Stroke::NONE));
+    };
+    match cap {
+        StrokeCap::None => line(at(0.0, 0.0), 4.0),
+        StrokeCap::Round => {
+            line(at(2.0, 0.0), 4.0);
+            p.circle_filled(at(2.0, 0.0), 2.0, col);
+        }
+        StrokeCap::Square => line(at(-2.0, 0.0), 4.0),
+        StrokeCap::LineArrow => {
+            line(at(0.0, 0.0), 1.5);
+            p.add(egui::Shape::line(vec![at(5.5, -5.5), at(0.0, 0.0), at(5.5, 5.5)], Stroke::new(1.5, col)));
+        }
+        StrokeCap::TriangleArrow => {
+            line(at(7.0, 0.0), 1.5);
+            fill(vec![at(0.0, 0.0), at(8.0, -4.5), at(8.0, 4.5)]);
+        }
+        StrokeCap::ReversedTriangle => {
+            line(at(8.0, 0.0), 1.5);
+            fill(vec![at(8.0, 0.0), at(0.0, -4.5), at(0.0, 4.5)]);
+        }
+        StrokeCap::CircleFilled => {
+            line(at(4.0, 0.0), 1.5);
+            p.circle_filled(at(4.0, 0.0), 4.0, col);
+        }
+        StrokeCap::DiamondFilled => {
+            line(at(5.0, 0.0), 1.5);
+            fill(vec![at(0.0, 0.0), at(5.0, -5.0), at(10.0, 0.0), at(5.0, 5.0)]);
+        }
+    }
+}
diff --git a/crates/ui-egui/src/scale_panel.rs b/crates/ui-egui/src/panels/scale_panel.rs
similarity index 94%
rename from crates/ui-egui/src/scale_panel.rs
rename to crates/ui-egui/src/panels/scale_panel.rs
index 6edd3497..fd3a100e 100644
--- a/crates/ui-egui/src/scale_panel.rs
+++ b/crates/ui-egui/src/panels/scale_panel.rs
@@ -27,7 +27,7 @@ pub fn section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
     widgets::sublabels(ui, tr("Dimensions"), None);
     row(ui, 32.0, |ui| {
         for (key, lead, side) in [("scale_w", "W", b.width()), ("scale_h", "H", b.height())] {
-            let (v, s) = match widgets::number_field(ui, Id::new(key), Lead::Text(lead), Some(round(side)), "", col, 1.0) {
+            let (v, s) = match widgets::number_field(ui, Id::unique(key), Lead::Text(lead), Some(round(side)), "", col, 1.0) {
                 Some(FieldEdit::Set(v)) => (v, None),
                 Some(FieldEdit::Scrub(v, done)) => (v, Some(done)),
                 None => continue,
@@ -42,7 +42,7 @@ pub fn section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
     crate::right::block(ui, 52.0, 2.0, |ui| {
         // Relative to the layers as they are: a scrub applies once, when let go.
         if let Some(FieldEdit::Set(k) | FieldEdit::Scrub(k, true)) =
-            widgets::number_field(ui, Id::new("scale_k"), Lead::None, Some(1.0), "x", col, 0.1)
+            widgets::number_field(ui, Id::unique("scale_k"), Lead::None, Some(1.0), "x", col, 0.1)
         {
             factor = Some(k);
         }
@@ -90,7 +90,7 @@ fn anchor_picker(ui: &mut Ui, cur: (u8, u8)) -> Option<(u8, u8)> {
         for col in 0..3u8 {
             let c = pos2(r.min.x + 8.0 + f32::from(col) * 16.0, r.min.y + 8.0 + f32::from(row) * 16.0);
             let hit = Rect::from_center_size(c, vec2(16.0, 16.0));
-            let resp = ui.interact(hit, Id::new(("scale_anchor_dot", col, row)), Sense::click());
+            let resp = ui.interact(hit, Id::unique(("scale_anchor_dot", col, row)), Sense::click());
             let on = (col, row) == cur;
             if on {
                 ui.painter().rect_filled(Rect::from_center_size(c, vec2(7.0, 7.0)), CornerRadius::same(2), t.accent);
diff --git a/crates/ui-egui/src/section_panel.rs b/crates/ui-egui/src/panels/section_panel.rs
similarity index 95%
rename from crates/ui-egui/src/section_panel.rs
rename to crates/ui-egui/src/panels/section_panel.rs
index f6f45a96..f3240d57 100644
--- a/crates/ui-egui/src/section_panel.rs
+++ b/crates/ui-egui/src/panels/section_panel.rs
@@ -48,6 +48,9 @@ pub fn status_dropdown(app: &mut FigApp, ui: &mut Ui, doc: &Document, ids: &[Nod
     });
 }
 
+/// Draw section colour and hide-contents controls, Dev status, changed-reason Resolve, the
+/// last-change note and Resize to fit; returns for an empty selection or one without a Dev
+/// status.
 pub fn section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
     let sections = !sel.is_empty() && sel.iter().all(|i| is_section(doc, *i));
     if sel.is_empty() || !sel.iter().all(|i| has_status(doc, *i)) {
@@ -89,7 +92,7 @@ pub fn section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
         // Changed since marked ready: say why to resolve it (back to Ready for dev).
         row(ui, 32.0, |ui| {
             ui.spacing_mut().item_spacing.x = 8.0;
-            let id = egui::Id::new(("dev_reason", ids.first().copied()));
+            let id = egui::Id::unique(("dev_reason", ids.first().copied()));
             let draft_id = id.with("draft");
             // The typed reason stays a draft until Enter or Resolve: clicking away keeps it.
             let mut draft: String = ui.data(|d| d.get_temp(draft_id)).unwrap_or_default();
diff --git a/crates/ui-egui/src/panels/selection_colors.rs b/crates/ui-egui/src/panels/selection_colors.rs
new file mode 100644
index 00000000..682b37fe
--- /dev/null
+++ b/crates/ui-egui/src/panels/selection_colors.rs
@@ -0,0 +1,355 @@
+//! Selection colors lives below Effects. A picker edits frozen paint slots, so color groups
+//! merging while scrubbing cannot accidentally recolor other objects.
+
+use std::sync::Arc;
+
+use egui::{Id, Ui};
+use figcraft_color::Color;
+use figcraft_doc::{Document, NodeId, StyleKind, VariableType};
+use figcraft_engine::selection_colors::{PaintTarget, SelectionColor, bind_refusal, collect, in_scope};
+use serde_json::json;
+
+use crate::a11y::Tip;
+use crate::colorpicker::PickerTarget;
+use crate::i18n::tr;
+use crate::icons::{self, Icon};
+use crate::theme::Tokens;
+use crate::{FigApp, widgets};
+
+#[derive(Clone)]
+struct Cache {
+    document: u64,
+    doc: Arc<Document>,
+    ids: Vec<NodeId>,
+    colors: Arc<Vec<SelectionColor>>,
+}
+
+/// Return the cached selection colours when the document and selection match. During an
+/// interaction reuse an existing matching cache, or return an empty list without discovering
+/// colours; otherwise discover and cache them.
+fn colors(ui: &Ui, document: u64, doc: &Arc<Document>, ids: &[NodeId], interacting: bool) -> Arc<Vec<SelectionColor>> {
+    let key = Id::unique("selection_colors_cache");
+    if let Some(cache) = ui.data(|d| d.get_temp::<Cache>(key))
+        && cache.document == document
+        && cache.ids == ids
+        && (interacting || Arc::ptr_eq(&cache.doc, doc))
+    {
+        return cache.colors;
+    }
+    // A drag replaces the document snapshot every frame. Keep its existing rows until the
+    // gesture ends; a cold cache or a changed document/selection waits too. Engine commands
+    // still discover and change the complete selection, independently of this panel cache.
+    if interacting {
+        return Arc::new(Vec::new());
+    }
+    let colors = Arc::new(collect(doc, ids));
+    ui.data_mut(|d| d.insert_temp(key, Cache { document, doc: doc.clone(), ids: ids.to_vec(), colors: colors.clone() }));
+    colors
+}
+
+pub(crate) fn open_picker(app: &mut FigApp, targets: Vec<PaintTarget>) {
+    let Ok(ds) = app.session.ds() else { return };
+    app.ui.picker = Some(PickerTarget::SelectionColor { targets, selection: ds.selection.clone(), document: ds.uid });
+}
+
+/// Draw the selection-colour groups (at least two): swatch opens the picker, hex and opacity
+/// edits, style/variable detach/apply/bind, and “select layers with this color”; disabled
+/// during an interaction.
+pub fn section(app: &mut FigApp, ui: &mut Ui, doc: &Arc<Document>, ids: &[NodeId]) {
+    let Ok(ds) = app.session.ds() else { return };
+    let interacting = ds.interaction.is_some();
+    let colors = colors(ui, ds.uid, doc, ids, interacting);
+    if colors.len() < 2 {
+        return;
+    }
+    let t = Tokens::get(ui.ctx());
+    widgets::section_header(ui, tr("Selection colors"), &[], false);
+    // Bound the panel's height; a document with many distinct colors stays scrollable.
+    ui.add_enabled_ui(!interacting, |ui| {
+        egui::ScrollArea::vertical().id_salt("selection_colors_rows").max_height(240.0).show_rows(ui, 32.0, colors.len(), |ui, range| {
+            for group in &colors[range] {
+                ui.push_id((&group.targets, "selection_color"), |ui| {
+                    crate::right::row(ui, 32.0, |ui| {
+                        let swatch = widgets::swatch(ui, &group.paint, 24.0).tip(tr("Edit colour"));
+                        if swatch.clicked() {
+                            open_picker(app, group.targets.clone());
+                        }
+                        let width = (ui.available_width() - 116.0).max(40.0);
+                        let linked_name = group
+                            .style
+                            .as_ref()
+                            .and_then(|id| doc.style(id).map(|s| s.name.as_str()))
+                            .or_else(|| group.variable.as_ref().and_then(|id| doc.variables.get(id).map(|v| v.name.as_str())));
+                        if let Some(name) = linked_name {
+                            if widgets::dropdown(ui, name, width, None).clicked() {
+                                open_picker(app, group.targets.clone());
+                            }
+                        } else if let Some(color) = group.paint.solid_color() {
+                            if let Some(hex) = widgets::text_field_named(ui, ui.scope_id().with("hex"), &color.to_hex(), width, tr("Color")) {
+                                if let Some(color) = Color::from_hex(&hex) {
+                                    let mut paint = group.paint.clone();
+                                    paint.kind = figcraft_color::PaintKind::Solid { color: color.with_alpha(1.0) };
+                                    if color.a < 1.0 {
+                                        paint.opacity = color.a;
+                                    }
+                                    app.run("selection.setPaint", json!({"targets": group.targets, "paint": paint}));
+                                } else {
+                                    app.toast(tr("Invalid color"));
+                                }
+                            }
+                        } else {
+                            let response = widgets::dropdown(ui, &widgets::paint_name(&group.paint), width, None);
+                            if response.clicked() {
+                                open_picker(app, group.targets.clone());
+                            }
+                        }
+                        let alpha = format!("{}%", figcraft_doc::trim_num(f64::from(group.paint.opacity) * 100.0));
+                        if let Some(value) = widgets::text_field_named(ui, ui.scope_id().with("opacity"), &alpha, 44.0, tr("Opacity"))
+                            && let Ok(value) = value.trim().trim_end_matches('%').parse::<f32>()
+                            && value.is_finite()
+                        {
+                            let mut paint = group.paint.clone();
+                            paint.opacity = (value / 100.0).clamp(0.0, 1.0);
+                            app.run("selection.setPaint", json!({"targets": group.targets, "paint": paint}));
+                        }
+                        if linked_name.is_some() {
+                            let detach = if group.style.is_some() { tr("Detach style") } else { tr("Detach variable") };
+                            if icons::button(ui, Icon::Detach, 24.0, false, detach).clicked() {
+                                app.run("selection.detachColor", json!({"targets": group.targets}));
+                            }
+                        } else {
+                            let styles = icons::button(ui, Icon::Styles, 24.0, false, tr("Color styles"));
+                            crate::right::menu_popup(&styles).show(|ui| {
+                                let mut any = false;
+                                for style in &doc.styles {
+                                    if !matches!(style.kind, StyleKind::Paint { .. }) {
+                                        continue;
+                                    }
+                                    any = true;
+                                    if crate::right::menu_item(ui, &style.name, "") {
+                                        app.run("selection.applyColorStyle", json!({"targets": group.targets, "style": style.id}));
+                                        app.ui.picker = None;
+                                        ui.close();
+                                    }
+                                }
+                                if !any {
+                                    widgets::label(ui, tr("No color styles"), t.text_secondary);
+                                }
+                                let variables: Vec<_> = doc
+                                    .variables
+                                    .variables
+                                    .iter()
+                                    .filter(|v| {
+                                        v.kind == VariableType::Color
+                                            && bind_refusal(doc, &group.targets, &v.id).is_none()
+                                            && in_scope(doc, &group.targets, &v.id)
+                                    })
+                                    .collect();
+                                if !variables.is_empty() {
+                                    ui.separator();
+                                    widgets::label(ui, tr("Color variables"), t.text_secondary);
+                                }
+                                for v in variables {
+                                    if crate::right::menu_item(ui, &v.name, "") {
+                                        app.run("selection.bindColorVariable", json!({"targets": group.targets, "variable": v.id}));
+                                        app.ui.picker = None;
+                                        ui.close();
+                                    }
+                                }
+                            });
+                        }
+                        if icons::button(ui, Icon::Move, 24.0, false, tr("Select layers with this color")).clicked() {
+                            app.run("selection.selectColor", json!({"targets": group.targets}));
+                        }
+                    });
+                });
+            }
+        });
+    });
+    ui.add_space(8.0);
+    widgets::separator(ui);
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::NoServices;
+    use egui::{Event, Pos2, RawInput, Rect, Shape, vec2};
+    use figcraft_engine::Session;
+
+    struct Panel {
+        ctx: egui::Context,
+        app: FigApp,
+        time: f64,
+    }
+
+    impl Panel {
+        fn new() -> (Self, NodeId, NodeId) {
+            let mut s = Session::new();
+            let mut ids = Vec::new();
+            for color in ["#ff0000", "#0000ff"] {
+                let value = s.execute("shape.rectangle", &json!({"width":40,"height":40,"props":{"fill":color}})).unwrap();
+                ids.push(NodeId(value["id"].as_u64().unwrap()));
+            }
+            s.execute("select.set", &json!({"ids":ids})).unwrap();
+            let mut p = Self { ctx: egui::Context::default(), app: FigApp::new(s, Box::new(NoServices)), time: 0.0 };
+            crate::theme::install_fonts(&p.ctx, false, 0);
+            crate::theme::apply(&p.ctx, crate::theme::Tokens::light());
+            for _ in 0..3 {
+                p.frame(vec![]);
+            }
+            (p, ids[0], ids[1])
+        }
+        fn frame(&mut self, events: Vec<Event>) -> Vec<(String, Pos2)> {
+            self.time += 1.0 / 60.0;
+            let input = RawInput {
+                screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(280.0, 600.0))),
+                time: Some(self.time),
+                events,
+                ..Default::default()
+            };
+            let mut output = self.ctx.run_ui(input, |ui| {
+                let ds = self.app.session.ds().unwrap();
+                let doc = ds.doc.clone();
+                let ids = ds.selection.clone();
+                section(&mut self.app, ui, &doc, &ids);
+            });
+            output.textures_delta.clear();
+            fn texts(shape: &Shape, out: &mut Vec<(String, Pos2)>) {
+                match shape {
+                    Shape::Text(t) => out.push((t.galley.text().to_string(), t.pos + t.galley.size() / 2.0)),
+                    Shape::Vec(v) => {
+                        for s in v {
+                            texts(s, out)
+                        }
+                    }
+                    _ => {}
+                }
+            }
+            let mut text = Vec::new();
+            for s in &output.shapes {
+                texts(&s.shape, &mut text);
+            }
+            text
+        }
+        fn click(&mut self, pos: Pos2) {
+            for pressed in [true, false] {
+                self.frame(vec![
+                    Event::PointerMoved(pos),
+                    Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() },
+                ]);
+            }
+        }
+    }
+
+    #[test]
+    fn selection_colors_panel_opens_the_existing_picker_and_hides_for_one_color() {
+        let (mut p, a, b) = Panel::new();
+        let texts = p.frame(vec![]);
+        assert!(texts.iter().any(|(s, _)| s == "Selection colors"));
+        let red = texts.iter().find(|(s, _)| s == "FF0000").unwrap().1;
+        p.click(Pos2::new(28.0, red.y));
+        let Some(PickerTarget::SelectionColor { targets, .. }) = &p.app.ui.picker else { panic!("the swatch must open its picker") };
+        assert_eq!(targets.iter().map(|t| t.id).collect::<Vec<_>>(), [a]);
+        p.app.run("fill.set", json!({"id":b,"color":"#ff0000"}));
+        assert!(!p.frame(vec![]).iter().any(|(s, _)| s == "Selection colors"));
+    }
+
+    /// Asserts the panel reuses cached colours through a live interaction and refreshes the cache
+    /// after the commit.
+    #[test]
+    fn panel_keeps_cached_colors_during_interaction_and_refreshes_after_commit() {
+        let (mut p, a, _) = Panel::new();
+        let key = Id::unique("selection_colors_cache");
+        let before = p.ctx.data(|d| d.get_temp::<Cache>(key)).unwrap();
+        p.app.session.begin_interaction("Color").unwrap();
+        for hex in ["#00ff00", "#ffff00", "#00ffff"] {
+            p.app.run("fill.set", json!({"id":a,"color":hex}));
+            p.frame(vec![]);
+            let during = p.ctx.data(|d| d.get_temp::<Cache>(key)).unwrap();
+            assert!(Arc::ptr_eq(&before.colors, &during.colors), "a live edit must not rediscover paints");
+        }
+        p.app.session.commit_interaction().unwrap();
+        let texts = p.frame(vec![]);
+        assert!(texts.iter().any(|(s, _)| s == "00FFFF"));
+        let after = p.ctx.data(|d| d.get_temp::<Cache>(key)).unwrap();
+        assert!(!Arc::ptr_eq(&before.colors, &after.colors));
+    }
+
+    /// Asserts no cached colours are discovered during an interaction, and cancelling restores
+    /// the panel with the original colours.
+    #[test]
+    fn panel_defers_discovery_without_a_matching_cache_during_interaction() {
+        let (mut p, a, _) = Panel::new();
+        let key = Id::unique("selection_colors_cache");
+        p.ctx.data_mut(|d| d.remove::<Cache>(key));
+        p.app.session.begin_interaction("Color").unwrap();
+        p.app.run("fill.set", json!({"id":a,"color":"#00ff00"}));
+        assert!(!p.frame(vec![]).iter().any(|(s, _)| s == "Selection colors"));
+        assert!(p.ctx.data(|d| d.get_temp::<Cache>(key)).is_none());
+        p.app.session.cancel_interaction().unwrap();
+        assert!(p.frame(vec![]).iter().any(|(s, _)| s == "FF0000"));
+    }
+
+    #[test]
+    fn select_color_button_selects_only_the_matching_layers() {
+        let (mut p, a, _) = Panel::new();
+        let red = p.frame(vec![]).into_iter().find(|(s, _)| s == "FF0000").unwrap().1;
+        p.click(Pos2::new(252.0, red.y));
+        assert_eq!(p.app.session.selection(), [a]);
+        assert!(p.app.ui.last_error.is_none());
+    }
+
+    #[test]
+    fn panel_displays_the_linked_style_name_and_the_other_color() {
+        let (mut p, a, b) = Panel::new();
+        p.app.run("style.create", json!({"type":"paint","name":"Brand","value":"#ff0000"}));
+        p.app.run("style.apply", json!({"id":a,"style":"Brand","target":"fill"}));
+        let texts = p.frame(vec![]);
+        assert!(texts.iter().any(|(s, _)| s == "Brand"));
+        assert!(texts.iter().any(|(s, _)| s == "0000FF"));
+        let colors = collect(p.app.session.doc().unwrap(), &[a, b]);
+        assert_eq!(colors.len(), 2);
+    }
+
+    #[test]
+    fn styles_menu_applies_a_color_variable_to_the_row() {
+        let (mut p, a, b) = Panel::new();
+        p.app.run("variable.createCollection", json!({"name":"Theme"}));
+        p.app.run("variable.create", json!({"collection":"Theme","name":"Accent","type":"color","value":"#00ff00"}));
+        p.app.run("variable.create", json!({"collection":"Theme","name":"Gap","type":"number","value":8}));
+        let red = p.frame(vec![]).into_iter().find(|(s, _)| s == "FF0000").unwrap().1;
+        p.click(Pos2::new(228.0, red.y));
+        let texts = p.frame(vec![]);
+        assert!(texts.iter().any(|(s, _)| s == "Color variables"));
+        assert!(!texts.iter().any(|(s, _)| s == "Gap"));
+        let accent = texts.iter().find(|(s, _)| s == "Accent").unwrap().1;
+        p.click(accent);
+        let doc = p.app.session.doc().unwrap();
+        assert_eq!(doc.node(a).unwrap().fills[0].solid_color().unwrap().to_hex(), "00FF00");
+        assert!(!doc.node(a).unwrap().bound.is_empty());
+        assert!(doc.node(b).unwrap().bound.is_empty());
+        assert!(p.app.ui.last_error.is_none());
+        assert!(p.frame(vec![]).iter().any(|(s, _)| s == "Accent"));
+    }
+
+    #[test]
+    fn a_linked_row_detaches_its_style_or_variable() {
+        let (mut p, a, b) = Panel::new();
+        p.app.run("style.create", json!({"type":"paint","name":"Brand","value":"#ff0000"}));
+        p.app.run("style.apply", json!({"id":a,"style":"Brand","target":"fill"}));
+        p.app.run("variable.createCollection", json!({"name":"Theme"}));
+        p.app.run("variable.create", json!({"collection":"Theme","name":"Accent","type":"color","value":"#0000ff"}));
+        p.app.run("variable.bind", json!({"id":b,"field":"fill","variable":"Accent"}));
+        for name in ["Brand", "Accent"] {
+            let row = p.frame(vec![]).into_iter().find(|(s, _)| s == name).unwrap().1;
+            p.click(Pos2::new(228.0, row.y));
+        }
+        let doc = p.app.session.doc().unwrap();
+        assert!(doc.node(a).unwrap().styles.fill.is_none());
+        assert!(doc.node(b).unwrap().bound.is_empty());
+        let texts = p.frame(vec![]);
+        assert!(texts.iter().any(|(s, _)| s == "FF0000") && texts.iter().any(|(s, _)| s == "0000FF"));
+        assert!(p.app.ui.last_error.is_none());
+    }
+}
diff --git a/crates/ui-egui/src/shortcuts_panel.rs b/crates/ui-egui/src/panels/shortcuts_panel.rs
similarity index 100%
rename from crates/ui-egui/src/shortcuts_panel.rs
rename to crates/ui-egui/src/panels/shortcuts_panel.rs
diff --git a/crates/ui-egui/src/panels/typography.rs b/crates/ui-egui/src/panels/typography.rs
new file mode 100644
index 00000000..046428f7
--- /dev/null
+++ b/crates/ui-egui/src/panels/typography.rs
@@ -0,0 +1,350 @@
+//! Typography section of the Design panel: font family (searchable, previewed, recent first),
+//! style, size (with common sizes), line height, letter spacing, paragraph spacing, resizing,
+//! alignment, and the Type settings popover (decoration, case, lists, indent, truncation, OpenType
+//! features and variable font axes). While text is being edited with a range selected, character
+//! edits apply to the range (`text.style`, `text.setVariations`); otherwise they apply to whole
+//! layers. Differing values show "Mixed".
+
+use std::sync::Arc;
+
+use egui::{Align2, Color32, CornerRadius, Id, Rect, Sense, Stroke, StrokeKind, Ui, pos2, vec2};
+use figcraft_doc::*;
+use serde_json::{Value, json};
+
+use crate::FigApp;
+use crate::i18n::{tr, tr_noop, trf};
+use crate::icons::{self, Icon};
+use crate::right::{common, menu_item, menu_popup, row};
+use crate::theme::{Tokens, regular, semibold};
+use crate::widgets::{self, FIELD_H, FieldEdit, Lead, PAD};
+
+mod axes;
+mod fields;
+mod glyphs;
+mod picker;
+mod spacing;
+
+use fields::{font_rows, paragraph_rows};
+pub(crate) use picker::font_picker;
+pub(crate) use spacing::{letter_spacing_of, line_height_of, parse_letter_spacing, parse_line_height};
+
+/// Font sizes offered by the size dropdown.
+const SIZES: [f64; 15] = [10.0, 11.0, 12.0, 13.0, 14.0, 16.0, 20.0, 24.0, 32.0, 36.0, 40.0, 48.0, 64.0, 96.0, 128.0];
+
+/// OpenType features offered in Type settings ▸ Details: (tag, label, on by default in fonts).
+const FEATURES: [(&str, &str, bool); 12] = [
+    ("liga", tr_noop("Standard ligatures"), true),
+    ("calt", tr_noop("Contextual alternates"), true),
+    ("tnum", tr_noop("Tabular numbers"), false),
+    ("frac", tr_noop("Fractions"), false),
+    ("case", tr_noop("Case-sensitive forms"), false),
+    ("zero", tr_noop("Slashed zero"), false),
+    ("ss01", tr_noop("Stylistic set 1"), false),
+    ("ss02", tr_noop("Stylistic set 2"), false),
+    ("ss03", tr_noop("Stylistic set 3"), false),
+    ("ss04", tr_noop("Stylistic set 4"), false),
+    ("ss05", tr_noop("Stylistic set 5"), false),
+    ("smcp", tr_noop("Small capitals"), false),
+];
+
+/// Shown for differing values (translated where shown: `tr(MIXED)`).
+const MIXED: &str = tr_noop("Mixed");
+
+/// The Type settings tabs (Variable only for variable fonts).
+const TABS: [&str; 3] = [tr_noop("Basics"), tr_noop("Details"), tr_noop("Variable")];
+
+/// The value shared by every style, or None when they differ.
+fn uniform<T: PartialEq + Clone>(styles: &[TextStyle], f: impl Fn(&TextStyle) -> T) -> Option<T> {
+    let mut it = styles.iter();
+    let first = f(it.next()?);
+    if it.all(|s| f(s) == first) { Some(first) } else { None }
+}
+
+/// The character styles the panel shows: the edited range's spans, else every span of every
+/// selected text layer.
+pub(crate) fn target_styles(doc: &Document, ids: &[NodeId], range: Option<(NodeId, usize, usize)>) -> Vec<TextStyle> {
+    let mut out: Vec<TextStyle> = Vec::new();
+    let mut push = |s: &TextStyle| {
+        if !out.contains(s) {
+            out.push(s.clone());
+        }
+    };
+    for id in ids {
+        let Some(t) = doc.node(*id).and_then(|n| n.kind.text()) else { continue };
+        match range {
+            Some((rid, a, b)) if rid == *id && a < b => {
+                for (s, e, st) in t.spans() {
+                    if s < b && e > a {
+                        push(st);
+                    }
+                }
+            }
+            _ => {
+                for (_, _, st) in t.spans() {
+                    push(st);
+                }
+            }
+        }
+    }
+    out
+}
+
+pub fn typography(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
+    let ids: Vec<NodeId> = sel.iter().copied().filter(|i| matches!(doc.node(*i).map(|n| &n.kind), Some(NodeKind::Text(_)))).collect();
+    if ids.is_empty() {
+        return;
+    }
+    // While editing a range, character edits apply to it.
+    let range = figcraft_engine::textedit::selected_range(&app.session);
+    let editing = range.is_some();
+    let styles = target_styles(doc, &ids, range);
+    let apply_style = |app: &mut FigApp, key: &str, v: Value| commit_text(app, &ids, range, json!({ key: v }));
+
+    let hdr =
+        widgets::section_header(ui, tr("Typography"), &[(Icon::Variable, tr("Apply variable to text")), (Icon::Styles, tr("Text styles"))], false);
+    if hdr == Some(0) {
+        crate::variable_ui::open_at_pointer(ui, &ids, "characters", VariableType::String);
+    }
+    if hdr == Some(1) {
+        crate::style_picker::open(app, ui, &ids, crate::style_picker::StyleSlot::Text);
+    }
+    crate::variable_ui::bound_row(app, ui, &ids, "characters", VariableType::String, Lead::Icon(Icon::Text, tr("Text")), f32::INFINITY);
+    // A text style: its chip stands for the font rows (they show again when the chars differ).
+    crate::style_picker::chip(app, ui, doc, &ids, crate::style_picker::StyleSlot::Text);
+    if !matches!(crate::style_picker::text_link(app, doc, &ids), Some(Some(_))) {
+        font_rows(app, ui, &ids, &styles, editing, &apply_style);
+    }
+    paragraph_rows(app, ui, doc, &ids, &styles, &apply_style);
+    path_row(app, ui, doc, sel, &ids);
+}
+
+/// Text on a path: where the text starts, which side it runs on, and taking it off the path; or,
+/// with a text and a path selected, putting the text on the path.
+fn path_row(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId], ids: &[NodeId]) {
+    let paths: Option<Vec<(f64, bool)>> =
+        ids.iter().map(|i| doc.node(*i).and_then(|n| n.kind.text()).and_then(|t| t.path.as_ref()).map(|p| (p.start(), p.flip))).collect();
+    let Some(paths) = paths else {
+        let other = sel.iter().find(|i| !ids.contains(i)).and_then(|i| doc.node(*i));
+        if ids.len() == 1 && sel.len() == 2 && other.is_some_and(|n| figcraft_doc::geometry::stroke_geometry(n).is_some()) {
+            row(ui, 32.0, |ui| {
+                if widgets::button(ui, tr("Put text on path"), false, true).clicked() {
+                    app.run("text.onPath", json!({ "ids": sel }));
+                }
+            });
+        }
+        return;
+    };
+    let start = paths.first().map(|p| p.0).filter(|s| paths.iter().all(|p| p.0 == *s));
+    let flip = paths.iter().all(|p| p.1);
+    row(ui, 32.0, |ui| {
+        let lead = Lead::Icon(Icon::Pen, tr("Start on path"));
+        match widgets::number_field(ui, Id::unique("ty_path_start"), lead, start.map(|s| s * 100.0), "%", 96.0, 1.0) {
+            Some(FieldEdit::Set(v)) => {
+                app.run("text.pathOptions", json!({"ids": ids, "start": v / 100.0}));
+            }
+            Some(FieldEdit::Scrub(v, done)) => live(app, "Start on path", "text.pathOptions", json!({"ids": ids, "start": v / 100.0}), done),
+            None => {}
+        }
+        if icons::button(ui, Icon::FlipV, 24.0, flip, tr("Flip text to the other side")).clicked() {
+            app.run("text.pathOptions", json!({"ids": ids, "flip": !flip}));
+        }
+        if icons::button(ui, Icon::Detach, 24.0, false, tr("Remove text from path")).clicked() {
+            app.run("text.removeFromPath", json!({ "ids": ids }));
+        }
+    });
+}
+
+/// Set character `props` on the selected chars of the text being edited, else on whole layers
+/// (through `node.set`, which records overrides inside instances).
+fn commit_text(app: &mut FigApp, ids: &[NodeId], range: Option<(NodeId, usize, usize)>, props: Value) {
+    match range {
+        Some((_, a, b)) if a != b => {
+            app.run("text.style", text_style_params(ids, range, props));
+        }
+        _ => app.set_props(ids, props),
+    }
+}
+
+/// `text.style` params for `props` on the selected chars of the text being edited, else on the
+/// whole of every layer in `ids` (previews; commits go through [`commit_text`]).
+fn text_style_params(ids: &[NodeId], range: Option<(NodeId, usize, usize)>, mut props: Value) -> Value {
+    match range {
+        Some((id, a, b)) if a != b => {
+            props["id"] = json!(id);
+            props["start"] = json!(a);
+            props["end"] = json!(b);
+        }
+        _ => props["ids"] = json!(ids),
+    }
+    props
+}
+
+/// Run `cmd` as a live preview while scrubbing; the gesture becomes one undo step when `done`.
+/// (While text is edited, run commands directly: the editing session already groups undo.)
+pub(crate) fn live(app: &mut FigApp, label: &str, cmd: &str, params: Value, done: bool) {
+    let _ = app.session.begin_interaction(label);
+    if let Err(e) = app.session.execute(cmd, &params) {
+        app.toast(e.to_string());
+    }
+    if done {
+        let _ = app.session.commit_interaction();
+    }
+}
+
+/// A Type settings row: a label, then `add` with the rest of the width. A label wider than its
+/// column (French, say) narrows the field rather than the row outgrowing the popover, which then
+/// widened every frame (#1029).
+pub(crate) fn field_row<R>(ui: &mut Ui, label: &str, add: impl FnOnce(&mut Ui, f32) -> R) -> R {
+    let t = Tokens::get(ui.ctx());
+    ui.horizontal(|ui| {
+        ui.add_sized(vec2(110.0, FIELD_H), egui::Label::new(egui::RichText::new(label).font(regular(11.0)).color(t.text)));
+        add(ui, ui.available_width())
+    })
+    .inner
+}
+
+#[cfg(test)]
+mod variable_tests {
+    use egui::{Event, Modifiers, PointerButton, Pos2, RawInput};
+    use figcraft_engine::Session;
+
+    use super::*;
+    use crate::NoServices;
+
+    /// The Typography section and the variable picker, drawn for a selected text layer (Inter
+    /// Regular) in a file with the string variables "Heading font" and "Heading weight" and the
+    /// number variable "Heading size".
+    struct Panel {
+        app: FigApp,
+        ctx: egui::Context,
+        time: f64,
+        text: NodeId,
+    }
+
+    impl Panel {
+        fn new() -> Self {
+            let mut s = Session::new();
+            let text = NodeId(s.execute("text.create", &json!({"text": "Title"})).unwrap()["id"].as_u64().unwrap());
+            s.execute("variable.createCollection", &json!({"name": "Type", "modes": ["Base"]})).unwrap();
+            for (name, ty, value) in
+                [("Heading font", "string", json!("Inter")), ("Heading weight", "string", json!("Bold")), ("Heading size", "number", json!(32))]
+            {
+                s.execute("variable.create", &json!({"collection": "Type", "name": name, "type": ty, "values": {"Base": value}})).unwrap();
+            }
+            s.execute("select.set", &json!({ "ids": [text] })).unwrap();
+            let mut p = Self { app: FigApp::new(s, Box::new(NoServices)), ctx: egui::Context::default(), time: 0.0, text };
+            crate::theme::install_fonts(&p.ctx, false, 0);
+            crate::theme::apply(&p.ctx, Tokens::light());
+            for _ in 0..3 {
+                p.frame(vec![]);
+            }
+            p
+        }
+
+        /// One frame with `events`; the texts drawn, with their centers.
+        fn frame(&mut self, events: Vec<Event>) -> Vec<(String, Pos2)> {
+            fn walk(shape: &egui::Shape, out: &mut Vec<(String, Pos2)>) {
+                match shape {
+                    egui::Shape::Text(t) => out.push((t.galley.text().to_string(), t.pos + t.galley.size() / 2.0)),
+                    egui::Shape::Vec(v) => v.iter().for_each(|s| walk(s, out)),
+                    _ => {}
+                }
+            }
+            self.time += 1.0 / 60.0;
+            let input = RawInput {
+                screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(280.0, 600.0))),
+                time: Some(self.time),
+                events,
+                ..Default::default()
+            };
+            let mut out = self.ctx.run_ui(input, |ui| {
+                let ds = self.app.session.ds().unwrap();
+                let doc = ds.doc.clone();
+                let sel = ds.selection.clone();
+                typography(&mut self.app, ui, &doc, &sel);
+                crate::variable_ui::picker(&mut self.app, ui.ctx());
+            });
+            out.textures_delta.clear();
+            let mut texts = Vec::new();
+            for c in out.shapes {
+                walk(&c.shape, &mut texts);
+            }
+            texts
+        }
+
+        /// Hover `p`, then press and release there; the texts drawn after.
+        fn click(&mut self, p: Pos2) -> Vec<(String, Pos2)> {
+            self.frame(vec![Event::PointerMoved(p)]);
+            for pressed in [true, false] {
+                self.frame(vec![Event::PointerButton { pos: p, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE }]);
+            }
+            self.frame(vec![])
+        }
+
+        /// The name of the variable `field` of the text layer is bound to.
+        fn bound_to(&self, field: &str) -> Option<String> {
+            let doc = self.app.session.doc().unwrap();
+            doc.node(self.text).unwrap().bound.get(field).and_then(|v| doc.variables.get(v)).map(|v| v.name.clone())
+        }
+    }
+
+    fn at(texts: &[(String, Pos2)], s: &str) -> Pos2 {
+        texts
+            .iter()
+            .find(|(t, _)| t == s)
+            .map(|(_, p)| *p)
+            .unwrap_or_else(|| panic!("no text {s:?} in {:?}", texts.iter().map(|t| &t.0).collect::<Vec<_>>()))
+    }
+
+    fn shows(texts: &[(String, Pos2)], s: &str) -> bool {
+        texts.iter().any(|(t, _)| t == s)
+    }
+
+    #[test]
+    fn font_family_and_style_menus_start_with_apply_variable() {
+        let mut p = Panel::new();
+        for (field, shown, name) in [("fontStyle", "Regular", "Heading weight"), ("fontFamily", "Inter", "Heading font")] {
+            let texts = p.frame(vec![]);
+            let texts = p.click(at(&texts, shown));
+            let texts = p.click(at(&texts, "Apply variable"));
+            assert!(crate::variable_ui::picker_open(&p.ctx), "{field}: the variable picker opens");
+            assert!(shows(&texts, "Heading font") && shows(&texts, "Heading weight"), "{field} offers string variables");
+            assert!(!shows(&texts, "Heading size"), "{field} offers no number variables");
+            p.click(at(&texts, name));
+            assert_eq!(p.bound_to(field).as_deref(), Some(name));
+        }
+        assert!(p.app.ui.last_error.is_none(), "{:?}", p.app.ui.last_error);
+    }
+
+    /// Asserts bound font family and style chips replace the dropdowns, a selected text range
+    /// offers no variable binding, and detaching restores the last values.
+    #[test]
+    fn bound_font_family_and_style_show_their_variables_and_detach() {
+        let mut p = Panel::new();
+        let ids = vec![p.text];
+        for (field, var) in [("fontFamily", "Heading font"), ("fontStyle", "Heading weight")] {
+            p.app.run("variable.bind", json!({"ids": ids, "field": field, "variable": var}));
+        }
+        let texts = p.frame(vec![]);
+        assert!(shows(&texts, "Heading font") && shows(&texts, "Heading weight"), "the chips are drawn in place of the dropdowns");
+        assert!(!shows(&texts, "Inter"), "the family dropdown is not drawn");
+        // While characters are selected in the text, the dropdowns show the values, with no Apply variable.
+        figcraft_engine::textedit::begin(&mut p.app.session, p.text, Some(1), false).unwrap();
+        figcraft_engine::textedit::set_caret(&mut p.app.session, 3, true).unwrap();
+        let texts = p.frame(vec![]);
+        let texts = p.click(at(&texts, "Inter"));
+        assert!(!shows(&texts, "Apply variable"), "a selected range takes a font, not a variable");
+        p.frame(vec![Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE }]);
+        figcraft_engine::textedit::end(&mut p.app.session).unwrap();
+        p.frame(vec![]);
+        for field in ["fontFamily", "fontStyle"] {
+            let rect = p.ctx.read_response(Id::unique(("bound_chip", field, &ids[..])).with("bound")).expect("the chip").rect;
+            // The chip's detach button sits at its right end.
+            p.click(Pos2::new(rect.max.x - 11.0, rect.center().y));
+            assert_eq!(p.bound_to(field), None, "{field} is detached");
+        }
+        let texts = p.frame(vec![]);
+        assert!(shows(&texts, "Inter") && shows(&texts, "Bold"), "the dropdowns show the last values");
+        assert!(p.app.ui.last_error.is_none(), "{:?}", p.app.ui.last_error);
+    }
+}
diff --git a/crates/ui-egui/src/panels/typography/axes.rs b/crates/ui-egui/src/panels/typography/axes.rs
new file mode 100644
index 00000000..6c042dec
--- /dev/null
+++ b/crates/ui-egui/src/panels/typography/axes.rs
@@ -0,0 +1,187 @@
+use super::fields::menu_item_hover;
+use super::*;
+
+/// Type settings ▸ Variable: the font's named instances, then a slider and a field per visible
+/// axis (values the style name implies show until changed; "Mixed" when the shown styles differ).
+/// The canvas previews a hovered instance and a dragged slider or field live; letting go commits
+/// one undo step, Escape cancels.
+pub(super) fn variable_axes(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], styles: &[TextStyle], face: &figcraft_text::Face) {
+    let t = Tokens::get(ui.ctx());
+    let range = figcraft_engine::textedit::selected_range(&app.session);
+    widgets::label(ui, &face.family, t.text_secondary);
+    named_instances(app, ui, ids, range, styles, face);
+    // Each style's axis values; a style drawn by another face (e.g. a separate italic file) is mixed.
+    let per_style: Vec<Option<Vec<f64>>> = styles
+        .iter()
+        .map(|s| figcraft_text::find_face(&s.font_family, &s.font_style).filter(|f| f.id == face.id).map(|_| face.axis_values(s)))
+        .collect();
+    let w = ui.available_width();
+    let field_w = 52.0;
+    let label_w = 84.0;
+    let slider_w = (w - label_w - field_w - 12.0).max(40.0);
+    let cancel_id = Id::unique("ty_axis_cancelled");
+    // A cancelled gesture ends when the pointer is let go.
+    if !ui.input(|i| i.pointer.any_down()) {
+        ui.data_mut(|d| d.remove::<bool>(cancel_id));
+    }
+    for (i, axis) in face.axes.iter().enumerate().filter(|(_, a)| !a.hidden) {
+        let first = per_style.first().cloned().flatten().and_then(|v| v.get(i).copied());
+        let value = first.filter(|v0| per_style.iter().all(|vs| vs.as_ref().and_then(|v| v.get(i)).is_some_and(|v| (v - v0).abs() < 1e-9)));
+        // While a drag previews, the controls show the dragged value (the panel shows the document).
+        let live_id = Id::unique(("ty_axis_live", &axis.tag));
+        if app.ui.text_preview.is_none() {
+            ui.data_mut(|d| d.remove::<f64>(live_id));
+        }
+        let shown = ui.data(|d| d.get_temp::<f64>(live_id)).or(value).map(|v| round_axis(axis, v));
+        // (value, gesture ended)
+        let mut set: Option<(Value, bool)> = None;
+        ui.add_space(2.0);
+        ui.horizontal(|ui| {
+            ui.spacing_mut().item_spacing.x = 6.0;
+            let (lr, _) = ui.allocate_exact_size(vec2(label_w, FIELD_H), Sense::hover());
+            let name = ui.painter().layout(axis.name.clone(), regular(11.0), t.text, label_w);
+            let tip = trf(
+                "{name} ({tag}): {min} – {max}, default {default}. Double-click the slider to go back to the style's value; Escape while dragging cancels.",
+                &[
+                    ("name", &axis.name),
+                    ("tag", &axis.tag),
+                    ("min", &trim_num(axis.min)),
+                    ("max", &trim_num(axis.max)),
+                    ("default", &trim_num(axis.default)),
+                ],
+            );
+            ui.interact(lr, Id::unique(("ty_axis_label", &axis.tag)), Sense::hover()).on_hover_text(tip);
+            ui.painter().galley(pos2(lr.min.x, lr.center().y - name.size().y / 2.0), name, t.text);
+            match axis_slider(ui, Id::unique(("ty_axis_slider", &axis.tag)), axis, shown, slider_w) {
+                Some((Some(v), done)) => set = Some((json!(round_axis(axis, v)), done)),
+                Some((None, _)) => set = Some((Value::Null, true)),
+                None => {}
+            }
+            let step = if axis.max - axis.min > 20.0 { 1.0 } else { 0.1 };
+            match widgets::number_field(ui, Id::unique(("ty_axis_field", &axis.tag)), Lead::None, shown, "", field_w, step) {
+                Some(FieldEdit::Set(v)) => set = Some((json!(axis.clamp(round_axis(axis, v))), true)),
+                Some(FieldEdit::Scrub(v, done)) => set = Some((json!(axis.clamp(round_axis(axis, v))), done)),
+                None => {}
+            }
+        });
+        let Some((v, done)) = set else { continue };
+        // Escape cancels a previewing gesture (egui may end the drag on it too): the preview ends
+        // and the rest of the gesture is ignored until the pointer is let go.
+        let previewing = ui.data(|d| d.get_temp::<f64>(live_id)).is_some();
+        if previewing && ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape)) {
+            ui.data_mut(|d| {
+                d.insert_temp(cancel_id, true);
+                d.remove::<f64>(live_id);
+            });
+            app.end_text_preview(ui.ctx());
+            continue;
+        }
+        if ui.data(|d| d.get_temp::<bool>(cancel_id)).unwrap_or(false) {
+            continue;
+        }
+        let params = json!({"ids": ids, "variations": {axis.tag.clone(): v}});
+        if done {
+            ui.data_mut(|d| d.remove::<f64>(live_id));
+            app.run("text.setVariations", params);
+        } else {
+            if let Some(x) = v.as_f64() {
+                ui.data_mut(|d| d.insert_temp(live_id, x));
+            }
+            app.preview_text(ui.ctx(), "text.setVariations", params);
+        }
+    }
+    if styles.iter().any(|s| !s.variations.is_empty()) {
+        ui.add_space(8.0);
+        let r = ui.add(egui::Label::new(egui::RichText::new(tr("Reset to style")).font(regular(11.0)).color(t.accent_text)).sense(Sense::click()));
+        if r.on_hover_text(tr("Back to the values the font style implies")).clicked() {
+            app.run("text.setVariations", json!({"ids": ids, "variations": {}, "replace": true}));
+        }
+    }
+}
+
+/// The variable font's named instances as a menu: the one the text shows ("Custom" once an axis
+/// moved), hovering one previews it on the canvas, clicking applies it (its custom axis values go).
+fn named_instances(
+    app: &mut FigApp,
+    ui: &mut Ui,
+    ids: &[NodeId],
+    range: Option<(NodeId, usize, usize)>,
+    styles: &[TextStyle],
+    face: &figcraft_text::Face,
+) {
+    if face.instances.is_empty() {
+        return;
+    }
+    let current = uniform(styles, |s| (s.variations.is_empty(), s.font_style.clone()));
+    let label = match &current {
+        Some((true, st)) if face.instance(st).is_some() => st.clone(),
+        Some(_) => tr("Custom").to_string(),
+        None => tr(MIXED).to_string(),
+    };
+    ui.add_space(4.0);
+    // An inline list (a menu would close the Type settings popover it opens from).
+    let open_id = Id::unique("ty_instances_open");
+    let mut open = ui.data(|d| d.get_temp::<bool>(open_id)).unwrap_or(false);
+    if widgets::dropdown(ui, &label, ui.available_width(), None).on_hover_text(tr("Named instance")).clicked() {
+        open = !open;
+    }
+    if open {
+        ui.add_space(2.0);
+        egui::ScrollArea::vertical().id_salt("ty_instances").max_height(220.0).show(ui, |ui| {
+            for inst in &face.instances {
+                let mark = if label == inst.name { "✓ " } else { "   " };
+                let (clicked, hovered) = menu_item_hover(ui, &format!("{mark}{}", inst.name));
+                let props = json!({"fontStyle": inst.name, "fontVariations": null});
+                if clicked {
+                    commit_text(app, ids, range, props);
+                    open = false;
+                } else if hovered {
+                    app.preview_text(ui.ctx(), "text.style", text_style_params(ids, range, props));
+                }
+            }
+        });
+    }
+    ui.data_mut(|d| d.insert_temp(open_id, open));
+    ui.add_space(2.0);
+}
+
+/// Axis values snap to whole numbers on wide axes (weight, width…) and tenths on narrow ones.
+pub(super) fn round_axis(axis: &figcraft_text::Axis, v: f64) -> f64 {
+    if axis.max - axis.min > 20.0 { v.round() } else { (v * 10.0).round() / 10.0 }
+}
+
+/// A horizontal slider over an axis's range with a tick at its default. `value` None = mixed.
+/// Returns the new value (None = double-click: back to the style's value) and whether the
+/// gesture ended.
+fn axis_slider(ui: &mut Ui, id: Id, axis: &figcraft_text::Axis, value: Option<f64>, width: f32) -> Option<(Option<f64>, bool)> {
+    let t = Tokens::get(ui.ctx());
+    let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
+    let resp = ui.interact(rect, id, Sense::click_and_drag());
+    let track = Rect::from_center_size(rect.center(), vec2(width - 12.0, 4.0));
+    let span = (axis.max - axis.min).max(1e-9);
+    let x_of = |v: f64| track.min.x + ((v - axis.min) / span).clamp(0.0, 1.0) as f32 * track.width();
+    let p = ui.painter();
+    p.rect_filled(track, CornerRadius::same(2), t.border);
+    let dx = x_of(axis.default);
+    p.line_segment([pos2(dx, track.min.y - 3.0), pos2(dx, track.max.y + 3.0)], Stroke::new(1.0, t.border_strong));
+    if let Some(v) = value {
+        let x = x_of(v);
+        p.rect_filled(Rect::from_min_max(track.min, pos2(x, track.max.y)), CornerRadius::same(2), t.accent);
+        p.circle_filled(pos2(x, track.center().y), 6.0, Color32::WHITE);
+        let ring = if resp.hovered() || resp.dragged() { crate::theme::ACCENT } else { t.border_strong };
+        p.circle_stroke(pos2(x, track.center().y), 6.0, Stroke::new(1.0, ring));
+    }
+    if resp.double_clicked() {
+        return Some((None, true));
+    }
+    if (resp.dragged() || resp.clicked() || resp.drag_started())
+        && let Some(pos) = resp.interact_pointer_pos()
+    {
+        let f = f64::from(((pos.x - track.min.x) / track.width().max(1.0)).clamp(0.0, 1.0));
+        return Some((Some(axis.min + f * span), resp.drag_stopped() || resp.clicked()));
+    }
+    if resp.drag_stopped() {
+        return value.map(|v| (Some(v), true));
+    }
+    None
+}
diff --git a/crates/ui-egui/src/panels/typography/fields.rs b/crates/ui-egui/src/panels/typography/fields.rs
new file mode 100644
index 00000000..fb5d7ad8
--- /dev/null
+++ b/crates/ui-egui/src/panels/typography/fields.rs
@@ -0,0 +1,481 @@
+use super::axes::variable_axes;
+use super::glyphs::{LeadGlyph, caption, feature_row, text_seg};
+use super::picker::{font_picker, remember_family};
+use super::spacing::{SpacingField, commit_spacing, parse_letter_spacing, parse_line_height, spacing_field, spacing_input};
+use super::*;
+
+/// The font rows: family, style and size, line height and letter spacing.
+pub(super) fn font_rows(
+    app: &mut FigApp,
+    ui: &mut Ui,
+    ids: &[NodeId],
+    styles: &[TextStyle],
+    editing: bool,
+    apply_style: &dyn Fn(&mut FigApp, &str, Value),
+) {
+    let t = Tokens::get(ui.ctx());
+    let range = figcraft_engine::textedit::selected_range(&app.session);
+
+    // Font family.
+    let family = uniform(styles, |s| s.font_family.clone());
+    let fstyle = uniform(styles, |s| s.font_style.clone());
+    row(ui, 32.0, |ui| {
+        let w = ui.available_width();
+        let resp = font_dropdown(app, ui, ids, "fontFamily", family.as_deref(), w, editing);
+        menu_popup(&resp).width(w.max(240.0)).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
+            if !editing && apply_variable_item(ui, ids, "fontFamily", &resp) {
+                return;
+            }
+            let pick = font_picker(ui, family.as_deref(), resp.clicked());
+            if let Some(f) = pick.picked {
+                remember_family(ui.ctx(), &f);
+                apply_style(app, "fontFamily", json!(f));
+                ui.close();
+            } else if let Some(h) = pick.hovered.or(pick.highlighted) {
+                // The canvas shows the hovered family (or the one the arrow keys are on);
+                // closing without picking ends the preview.
+                app.preview_text(ui.ctx(), "text.style", text_style_params(ids, range, json!({"fontFamily": h})));
+            }
+        });
+    });
+
+    // Style + size.
+    let half = (ui.available_width() - PAD * 2.0 - 8.0) / 2.0;
+    row(ui, 32.0, |ui| {
+        let resp = font_dropdown(app, ui, ids, "fontStyle", fstyle.as_deref(), half, editing);
+        let fam = family.clone();
+        menu_popup(&resp).width(200.0).show(|ui| {
+            if !editing && apply_variable_item(ui, ids, "fontStyle", &resp) {
+                return;
+            }
+            match &fam {
+                Some(fam) => {
+                    let list = figcraft_text::family_styles(fam);
+                    if list.is_empty() {
+                        widgets::label(ui, tr("Font not installed"), t.text_tertiary);
+                    }
+                    egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| {
+                        for s in list {
+                            let mark = if fstyle.as_deref() == Some(s.as_str()) { "✓ " } else { "   " };
+                            let (clicked, hovered) = menu_item_hover(ui, &format!("{mark}{s}"));
+                            if clicked {
+                                apply_style(app, "fontStyle", json!(s));
+                                ui.close();
+                            } else if hovered {
+                                // The canvas shows the style (a variable font's named instance too).
+                                app.preview_text(ui.ctx(), "text.style", text_style_params(ids, range, json!({"fontStyle": s})));
+                            }
+                        }
+                    });
+                }
+                None => widgets::label(ui, tr("Pick one font family first"), t.text_tertiary),
+            }
+        });
+        let size = uniform(styles, |s| s.font_size);
+        ui.spacing_mut().item_spacing.x = 0.0;
+        // The whole layer's size can follow a variable; a selected range just takes a value.
+        let e = if editing {
+            widgets::number_field(ui, Id::unique("ty_size"), Lead::None, size, "", half - 20.0, 1.0)
+        } else {
+            crate::variable_ui::number_field(app, ui, ids, "fontSize", Id::unique("ty_size"), Lead::None, size, "", half - 20.0)
+        };
+        match e {
+            Some(FieldEdit::Set(v)) => apply_style(app, "fontSize", json!(v.clamp(1.0, 5000.0))),
+            // The text editing session already groups undo; just apply.
+            Some(FieldEdit::Scrub(v, _)) if editing => apply_style(app, "fontSize", json!(v.clamp(1.0, 5000.0))),
+            Some(FieldEdit::Scrub(v, done)) => {
+                live(app, "Font size", "node.set", json!({"ids": ids, "props": {"fontSize": v.clamp(1.0, 5000.0)}}), done)
+            }
+            None => {}
+        }
+        let more = icons::button(ui, Icon::Chevron, 20.0, false, tr("Font size"));
+        menu_popup(&more).width(90.0).show(|ui| {
+            egui::ScrollArea::vertical().max_height(360.0).show(ui, |ui| {
+                for v in SIZES {
+                    let mark = if size == Some(v) { "✓ " } else { "   " };
+                    if menu_item(ui, &format!("{mark}{}", trim_num(v)), "") {
+                        apply_style(app, "fontSize", json!(v));
+                        ui.close();
+                    }
+                }
+            });
+        });
+    });
+
+    // Line height + letter spacing.
+    row(ui, 32.0, |ui| {
+        let lh = uniform(styles, |s| s.line_height);
+        let lh_label = lh.map(|l| l.label()).unwrap_or_else(|| tr(MIXED).into());
+        let field = SpacingField { field: "lineHeight", id: Id::unique("ty_lh"), glyph: LeadGlyph::LineHeight, tip: tr("Line height") };
+        if let Some(edit) = spacing_field(app, ui, ids, &field, &lh_label, half, editing)
+            && let Some(v) = parse_line_height(&edit.text(), lh)
+        {
+            commit_spacing(app, ids, range, &field, &edit, v);
+        }
+        let ls = uniform(styles, |s| s.letter_spacing);
+        let ls_label = ls.map(|l| l.label()).unwrap_or_else(|| tr(MIXED).into());
+        let field = SpacingField { field: "letterSpacing", id: Id::unique("ty_ls"), glyph: LeadGlyph::LetterSpacing, tip: tr("Letter spacing") };
+        if let Some(edit) = spacing_field(app, ui, ids, &field, &ls_label, half, editing)
+            && let Some(v) = parse_letter_spacing(&edit.text(), ls)
+        {
+            commit_spacing(app, ids, range, &field, &edit, v);
+        }
+    });
+}
+
+/// Paragraph spacing, resizing, alignment and the Type settings popover.
+pub(super) fn paragraph_rows(
+    app: &mut FigApp,
+    ui: &mut Ui,
+    doc: &Document,
+    ids: &[NodeId],
+    styles: &[TextStyle],
+    apply_style: &dyn Fn(&mut FigApp, &str, Value),
+) {
+    let half = (ui.available_width() - PAD * 2.0 - 8.0) / 2.0;
+    // Paragraph spacing + resizing.
+    let ps = common(doc, ids, |n| n.kind.text().map(|t| t.paragraph_spacing.to_bits())).flatten().map(f64::from_bits);
+    let resize = common(doc, ids, |n| n.kind.text().map(|t| t.auto_resize)).flatten();
+    row(ui, 32.0, |ui| {
+        let ps_label = ps.map(trim_num).unwrap_or_else(|| tr(MIXED).into());
+        let field =
+            SpacingField { field: "paragraphSpacing", id: Id::unique("ty_ps"), glyph: LeadGlyph::ParagraphSpacing, tip: tr("Paragraph spacing") };
+        if let Some(edit) = spacing_input(ui, &field, &ps_label, half)
+            && let Some(v) = widgets::eval(&edit.text(), ps)
+        {
+            commit_spacing(app, ids, None, &field, &edit, json!(v.clamp(0.0, 10_000.0)));
+        }
+        let items =
+            [(Icon::Hug, tr("Auto width")), (Icon::LayoutV, tr("Auto height")), (Icon::Fixed, tr("Fixed size")), (Icon::Dots, tr("Truncate text"))];
+        let active = resize.map(|r| match r {
+            TextAutoResize::WidthAndHeight => 0,
+            TextAutoResize::Height => 1,
+            TextAutoResize::None => 2,
+            TextAutoResize::Truncate => 3,
+        });
+        if let Some(i) = widgets::segmented(ui, &items, active, (half / 4.0).floor()) {
+            let v = ["widthAndHeight", "height", "none", "truncate"].get(i).copied().unwrap_or("none");
+            app.set_props(ids, json!({"textAutoResize": v}));
+        }
+    });
+
+    // Alignment + Type settings.
+    let align = common(doc, ids, |n| n.kind.text().map(|t| (t.align_h, t.align_v))).flatten();
+    row(ui, 32.0, |ui| {
+        let items = [
+            (Icon::TextAlignLeft, tr("Align left")),
+            (Icon::TextAlignCenter, tr("Align center")),
+            (Icon::TextAlignRight, tr("Align right")),
+            (Icon::TextAlignJustify, tr("Justify")),
+        ];
+        let active = align.map(|(h, _)| match h {
+            TextAlignH::Left => 0,
+            TextAlignH::Center => 1,
+            TextAlignH::Right => 2,
+            TextAlignH::Justified => 3,
+        });
+        if let Some(i) = widgets::segmented(ui, &items, active, 24.0) {
+            let v = ["left", "center", "right", "justified"].get(i).copied().unwrap_or("left");
+            app.set_props(ids, json!({"textAlign": v}));
+        }
+        let items = [(Icon::TextTop, tr("Align top")), (Icon::TextMiddle, tr("Align middle")), (Icon::TextBottom, tr("Align bottom"))];
+        let active = align.map(|(_, v)| match v {
+            TextAlignV::Top => 0,
+            TextAlignV::Middle => 1,
+            TextAlignV::Bottom => 2,
+        });
+        if let Some(i) = widgets::segmented(ui, &items, active, 24.0) {
+            let v = ["top", "middle", "bottom"].get(i).copied().unwrap_or("top");
+            app.set_props(ids, json!({"textAlignVertical": v}));
+        }
+        let open_id = Id::unique("ty_settings_open");
+        let open = egui::Popup::is_id_open(ui.ctx(), open_id);
+        let more = icons::button(ui, Icon::Dots, 24.0, open, tr("Type settings"));
+        egui::Popup::from_toggle_button_response(&more)
+            .id(open_id)
+            .width(264.0)
+            .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
+            .show(|ui| type_settings(app, ui, doc, ids, styles, apply_style));
+    });
+}
+
+/// A menu item that also reports the pointer being over it: (clicked, hovered).
+pub(super) fn menu_item_hover(ui: &mut Ui, label: &str) -> (bool, bool) {
+    let r = crate::right::menu_row(ui, label, "", 0.0, |_, _, _| {});
+    (r.clicked(), r.hovered())
+}
+
+/// The font family or font style dropdown for `field`, `width` wide, showing `shown` (Mixed when
+/// None). While whole layers are edited and `field` is bound to the same variable on every one of
+/// `ids`, the variable's chip is drawn in place of the dropdown (a click picks another variable,
+/// its detach button unbinds it), and the returned response opens no menu.
+fn font_dropdown(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], field: &str, shown: Option<&str>, width: f32, editing: bool) -> egui::Response {
+    if !editing && app.session.doc().ok().and_then(|d| crate::variable_ui::bound_name(d, ids, field)).is_some() {
+        let (rect, resp) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
+        crate::variable_ui::bound_chip(app, ui, ids, field, VariableType::String, rect);
+        return resp;
+    }
+    widgets::dropdown(ui, shown.unwrap_or(tr(MIXED)), width, None)
+}
+
+/// Apply variable at the top of the font family or font style menu opened from `anchor`: a click
+/// opens the variable picker on string variables for `field` of `ids` and closes the menu (true).
+fn apply_variable_item(ui: &mut Ui, ids: &[NodeId], field: &str, anchor: &egui::Response) -> bool {
+    let picked = menu_item(ui, tr("Apply variable"), "");
+    if picked {
+        crate::variable_ui::open(ui, ids, field, VariableType::String, anchor.rect.left_bottom());
+        ui.close();
+    } else {
+        ui.separator();
+    }
+    picked
+}
+
+/// The variable font the shown styles use (one family, one variable face), if any.
+fn variable_face(styles: &[TextStyle]) -> Option<Arc<figcraft_text::Face>> {
+    let family = uniform(styles, |s| s.font_family.clone())?;
+    let face = figcraft_text::find_face(&family, &styles.first()?.font_style)?;
+    (face.is_variable() && face.family.eq_ignore_ascii_case(&family)).then_some(face)
+}
+
+/// The Type settings popover: Basics (decoration, case, list, indent, truncation), Details
+/// (OpenType features) and, for variable fonts, Variable (axis sliders).
+fn type_settings(
+    app: &mut FigApp,
+    ui: &mut Ui,
+    doc: &Document,
+    ids: &[NodeId],
+    styles: &[TextStyle],
+    apply_style: &dyn Fn(&mut FigApp, &str, Value),
+) {
+    let t = Tokens::get(ui.ctx());
+    let tab_id = Id::unique("ty_settings_tab");
+    let vf = variable_face(styles);
+    let tabs = &TABS[..if vf.is_some() { 3 } else { 2 }];
+    let mut tab: usize = ui.data(|d| d.get_temp(tab_id)).filter(|i| *i < tabs.len()).unwrap_or(0);
+    ui.horizontal(|ui| {
+        for (i, l) in tabs.iter().enumerate() {
+            let col = if tab == i { t.text } else { t.text_secondary };
+            let r = ui.add(egui::Label::new(egui::RichText::new(tr(l)).font(semibold(11.5)).color(col)).sense(Sense::click()));
+            if r.clicked() {
+                tab = i;
+            }
+        }
+    });
+    ui.data_mut(|d| d.insert_temp(tab_id, tab));
+    ui.add_space(4.0);
+    let w = ui.available_width();
+    if tab == 0 {
+        let deco = uniform(styles, |s| s.decoration);
+        caption(ui, tr("Decoration"));
+        let active = deco.map(|d| match d {
+            TextDecoration::None => 0,
+            TextDecoration::Underline => 1,
+            TextDecoration::Strikethrough => 2,
+        });
+        let items = [("—", tr_noop("None")), ("U", tr_noop("Underline")), ("S", tr_noop("Strikethrough"))];
+        if let Some(i) = text_seg(ui, "deco", &items, active, w) {
+            apply_style(app, "textDecoration", json!((["none", "underline", "strikethrough"].get(i).copied().unwrap_or("none"))));
+        }
+        if let Some(d @ (TextDecoration::Underline | TextDecoration::Strikethrough)) = deco {
+            decoration_details(app, ui, styles, apply_style, d == TextDecoration::Underline, w);
+        }
+        caption(ui, tr("Letter case"));
+        let case = uniform(styles, |s| s.case);
+        let active = case.map(|c| match c {
+            TextCase::Original => 0,
+            TextCase::Upper => 1,
+            TextCase::Lower => 2,
+            TextCase::Title => 3,
+            TextCase::SmallCaps => 4,
+        });
+        let items = [
+            ("—", tr_noop("As typed")),
+            ("AG", tr_noop("Uppercase")),
+            ("ag", tr_noop("Lowercase")),
+            ("Ag", tr_noop("Title case")),
+            ("Aɢ", tr_noop("Small caps")),
+        ];
+        if let Some(i) = text_seg(ui, "case", &items, active, w) {
+            apply_style(app, "textCase", json!((["original", "upper", "lower", "title", "smallCaps"].get(i).copied().unwrap_or("original"))));
+        }
+        caption(ui, tr("List style"));
+        // While editing: the selected paragraphs' list.
+        let range = figcraft_engine::textedit::selected_range(&app.session);
+        let list = common(doc, ids, |n| {
+            n.kind.text().and_then(|t| {
+                let (a, b) = range.filter(|r| r.0 == n.id).map_or((0, t.char_count()), |(_, a, b)| (a, b));
+                t.common_para_list(a, b).map(|p| p.list)
+            })
+        })
+        .flatten();
+        let active = list.map(|l| match l {
+            ListStyle::None => 0,
+            ListStyle::Bulleted => 1,
+            ListStyle::Numbered => 2,
+        });
+        let items = [("—", tr_noop("No list")), ("•", tr_noop("Bulleted list")), ("1.", tr_noop("Numbered list"))];
+        if let Some(i) = text_seg(ui, "list", &items, active, w) {
+            app.run("text.listStyle", json!({"ids": ids, "style": (["none", "bulleted", "numbered"].get(i).copied().unwrap_or("none"))}));
+        }
+        ui.add_space(6.0);
+        let spacing = common(doc, ids, |n| n.kind.text().map(|t| t.list_spacing.to_bits())).flatten().map(f64::from_bits);
+        field_row(ui, tr("List spacing"), |ui, fw| {
+            if let Some(FieldEdit::Set(v) | FieldEdit::Scrub(v, true)) =
+                widgets::number_field(ui, Id::unique("ty_list_spacing"), Lead::None, spacing, "", fw, 1.0)
+            {
+                app.set_props(ids, json!({"listSpacing": v.clamp(0.0, 10_000.0)}));
+            }
+        });
+        ui.add_space(4.0);
+        let indent = common(doc, ids, |n| n.kind.text().map(|t| t.paragraph_indent.to_bits())).flatten().map(f64::from_bits);
+        // Indent applies to start-aligned text only; elsewhere the field stays visible but off.
+        let start_aligned =
+            common(doc, ids, |n| n.kind.text().map(|t| t.align_h != TextAlignH::Center && t.align_h != TextAlignH::Justified)).flatten();
+        ui.add_enabled_ui(start_aligned != Some(false), |ui| {
+            let field =
+                field_row(ui, tr("Paragraph indent"), |ui, fw| widgets::number_field(ui, Id::unique("ty_indent"), Lead::None, indent, "", fw, 1.0));
+            if let Some(FieldEdit::Set(v) | FieldEdit::Scrub(v, true)) = field {
+                app.set_props(ids, json!({"paragraphIndent": v.clamp(0.0, 10_000.0)}));
+            }
+        })
+        .response
+        .on_disabled_hover_text(tr("Paragraph indent applies to left-aligned text"));
+        ui.add_space(4.0);
+        for (key, label) in [("hangingPunctuation", tr("Hanging punctuation")), ("hangingList", tr("Hanging list"))] {
+            let all_on = ids.iter().all(|i| {
+                doc.node(*i).and_then(|n| n.kind.text()).is_some_and(|t| if key == "hangingList" { t.hanging_list } else { t.hanging_punctuation })
+            });
+            if widgets::checkbox(ui, all_on, label) {
+                app.set_props(ids, json!({ key: !all_on }));
+            }
+        }
+        caption(ui, tr("Vertical trim"));
+        let trim = common(doc, ids, |n| n.kind.text().map(|t| usize::from(t.leading_trim == LeadingTrim::CapHeight))).flatten();
+        let items = [(tr("Standard"), tr_noop("Standard")), ("Ag", tr_noop("Cap height to baseline"))];
+        if let Some(i) = text_seg(ui, "trim", &items, trim, w) {
+            app.set_props(ids, json!({"leadingTrim": if i == 1 { "capHeight" } else { "none" }}));
+        }
+        let resize = common(doc, ids, |n| n.kind.text().map(|t| t.auto_resize)).flatten();
+        // Auto-height text with a line limit truncates too.
+        let truncating = common(doc, ids, |n| n.kind.text().map(TextData::truncates)).flatten();
+        caption(ui, tr("Truncate text"));
+        match text_seg(
+            ui,
+            "trunc",
+            &[(tr("Off"), tr_noop("Don't truncate")), ("…", tr_noop("Truncate with an ellipsis"))],
+            truncating.map(usize::from),
+            w,
+        ) {
+            Some(1) if truncating != Some(true) => app.set_props(ids, json!({"textAutoResize": "truncate"})),
+            Some(0) if resize == Some(TextAutoResize::Height) => {
+                if truncating == Some(true) {
+                    app.set_props(ids, json!({"maxLines": 0}));
+                }
+            }
+            Some(0) if resize != Some(TextAutoResize::WidthAndHeight) => app.set_props(ids, json!({"textAutoResize": "none"})),
+            _ => {}
+        }
+        // Max lines only matter while truncating; no limit shows "Auto".
+        if truncating == Some(true) {
+            let max = common(doc, ids, |n| n.kind.text().map(|t| t.max_lines)).flatten();
+            ui.add_space(4.0);
+            let shown = max.map(f64::from).filter(|m| *m > 0.0);
+            let empty = if max.is_some() { tr("Auto") } else { tr(MIXED) };
+            if let Some(FieldEdit::Set(v) | FieldEdit::Scrub(v, true)) =
+                field_row(ui, tr("Max lines"), |ui, fw| widgets::number_field_or(ui, Id::unique("ty_maxlines"), shown, empty, fw, 1.0))
+            {
+                app.run("text.maxLines", json!({"ids": ids, "lines": v.round().clamp(0.0, 10_000.0)}));
+            }
+        }
+    } else if let (2, Some(face)) = (tab, &vf) {
+        variable_axes(app, ui, ids, styles, face);
+    } else {
+        // Which features the font has (first style shown).
+        let face = uniform(styles, |s| (s.font_family.clone(), s.font_style.clone())).and_then(|(f, s)| figcraft_text::find_face(&f, &s));
+        let face_name = face.as_ref().map(|f| format!("{} {}", f.family, f.style)).unwrap_or_else(|| tr("Mixed fonts").into());
+        widgets::label(ui, &face_name, t.text_secondary);
+        egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| {
+            for (tag, label, default_on) in FEATURES {
+                let state = common(doc, ids, |n| n.kind.text().map(|t| t.features.get(tag).copied())).flatten();
+                let on = state.map(|s| s.unwrap_or(default_on));
+                let supported = face.as_ref().is_none_or(|f| f.has_feature(tag.as_bytes().try_into().unwrap_or(b"    ")));
+                if feature_row(ui, tag, tr(label), on, supported) {
+                    let want = !on.unwrap_or(false);
+                    // Back to the font's default clears the override.
+                    let v = if want == default_on { Value::Null } else { json!(want) };
+                    app.run("text.setFeatures", json!({"ids": ids, "features": {tag: v}}));
+                }
+            }
+        });
+    }
+}
+
+/// How the decoration looks: style, thickness, (underlines) offset and skip ink, and colour.
+fn decoration_details(app: &mut FigApp, ui: &mut Ui, styles: &[TextStyle], apply_style: &dyn Fn(&mut FigApp, &str, Value), underline: bool, w: f32) {
+    caption(ui, tr("Decoration style"));
+    let active = uniform(styles, |s| s.look().style as usize);
+    let items = [(tr("Solid"), tr_noop("Solid")), (tr("Dotted"), tr_noop("Dotted")), (tr("Wavy"), tr_noop("Wavy"))];
+    if let Some(i) = text_seg(ui, "deco_style", &items, active, w) {
+        apply_style(app, "textDecorationStyle", json!((["solid", "dotted", "wavy"].get(i).copied().unwrap_or("solid"))));
+    }
+    ui.add_space(4.0);
+    let mut lengths = vec![("textDecorationThickness", tr("Thickness"), uniform(styles, |s| s.look().thickness))];
+    if underline {
+        lengths.push(("textDecorationOffset", tr("Offset"), uniform(styles, |s| s.look().offset)));
+    }
+    for (key, label, value) in lengths {
+        field_row(ui, label, |ui, fw| {
+            let (shown, empty) = match value {
+                Some(DecorationLength::Pixels(v)) => (Some(v), String::new()),
+                Some(DecorationLength::Percent(p)) => (None, format!("{}%", trim_num(p))),
+                Some(DecorationLength::Auto) => (None, tr("Auto").to_string()),
+                None => (None, tr(MIXED).to_string()),
+            };
+            let auto = value == Some(DecorationLength::Auto);
+            let field_w = if auto { fw } else { fw - 36.0 };
+            if let Some(FieldEdit::Set(v) | FieldEdit::Scrub(v, true)) =
+                widgets::number_field_or(ui, Id::unique(("ty_deco", key)), shown, &empty, field_w, 0.5)
+            {
+                // A thickness of 0 or less goes back to the font's.
+                let v = if key == "textDecorationThickness" && v <= 0.0 { json!("auto") } else { json!(v.clamp(-1000.0, 1000.0)) };
+                apply_style(app, key, v);
+            }
+            let tip = tr("Back to the font's value");
+            if !auto
+                && ui
+                    .add(
+                        egui::Label::new(egui::RichText::new(tr("Auto")).font(regular(11.0)).color(Tokens::get(ui.ctx()).accent_text))
+                            .sense(Sense::click()),
+                    )
+                    .on_hover_text(tip)
+                    .clicked()
+            {
+                apply_style(app, key, json!("auto"));
+            }
+        });
+    }
+    if underline {
+        let skip = uniform(styles, |s| s.look().skip_ink);
+        if widgets::checkbox(ui, skip == Some(true), tr("Skip ink")) {
+            apply_style(app, "textDecorationSkipInk", json!(skip != Some(true)));
+        }
+    }
+    let color = uniform(styles, |s| s.look().color.map(|c| format!("#{}", c.to_hex())));
+    field_row(ui, tr("Colour"), |ui, fw| {
+        let (value, hint) = match &color {
+            Some(c) => (c.clone().unwrap_or_default(), tr("Auto")),
+            None => (String::new(), tr(MIXED)),
+        };
+        if let Some(s) = widgets::text_field(ui, Id::unique("ty_deco_color"), &value, fw, hint) {
+            let s = s.trim();
+            if s.is_empty() || s.eq_ignore_ascii_case("auto") {
+                apply_style(app, "textDecorationColor", json!("auto"));
+            } else if let Some(c) = figcraft_color::Color::parse_css(s).or_else(|| figcraft_color::Color::from_hex(s)) {
+                apply_style(app, "textDecorationColor", json!(format!("#{}", c.to_hex())));
+            } else {
+                app.toast(trf("{value} isn't a colour", &[("value", &s)]));
+            }
+        }
+    });
+}
diff --git a/crates/ui-egui/src/panels/typography/glyphs.rs b/crates/ui-egui/src/panels/typography/glyphs.rs
new file mode 100644
index 00000000..13e0f6ef
--- /dev/null
+++ b/crates/ui-egui/src/panels/typography/glyphs.rs
@@ -0,0 +1,257 @@
+#[cfg(test)]
+use super::axes::round_axis;
+#[cfg(test)]
+use super::picker::{FontPick, font_picker};
+#[cfg(test)]
+use super::spacing::{parse_letter_spacing, parse_line_height};
+use super::*;
+
+pub(super) fn caption(ui: &mut Ui, s: &str) {
+    let t = Tokens::get(ui.ctx());
+    ui.add_space(6.0);
+    ui.label(egui::RichText::new(s).font(regular(10.5)).color(t.text_secondary));
+}
+
+/// A segmented control with short text labels (decoration, case, list…); `tip`s are English keys
+/// (matched below), translated where shown. Returns the clicked index.
+pub(super) fn text_seg(ui: &mut Ui, salt: &str, items: &[(&str, &str)], active: Option<usize>, width: f32) -> Option<usize> {
+    let t = Tokens::get(ui.ctx());
+    let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
+    ui.painter().rect_filled(rect, CornerRadius::same(5), t.field);
+    let cell = width / items.len().max(1) as f32;
+    let mut out = None;
+    for (i, (label, tip)) in items.iter().enumerate() {
+        let r = Rect::from_min_size(pos2(rect.min.x + i as f32 * cell, rect.min.y), vec2(cell, FIELD_H));
+        let resp = ui.interact(r, Id::unique(("ty_seg", salt, i)), Sense::click()).on_hover_text(tr(tip));
+        crate::a11y::toggle(&resp, tr(tip), active == Some(i));
+        if active == Some(i) {
+            ui.painter().rect_filled(r.shrink(2.0), CornerRadius::same(4), t.panel);
+            ui.painter().rect_stroke(r.shrink(2.0), CornerRadius::same(4), Stroke::new(1.0, t.border), StrokeKind::Inside);
+        } else if resp.hovered() {
+            ui.painter().rect_filled(r.shrink(2.0), CornerRadius::same(4), t.hover);
+        }
+        let col = if active == Some(i) { t.text } else { t.text_secondary };
+        let galley = if *tip == "Small caps" {
+            small_caps_sample(ui, label, col)
+        } else {
+            ui.painter().layout_no_wrap((*label).to_string(), regular(11.5), col)
+        };
+        let gr = Rect::from_center_size(r.center(), galley.size());
+        let size = galley.size();
+        ui.painter().galley(gr.min, galley, col);
+        // Draw the decoration on its own sample letter.
+        match *tip {
+            "Underline" => {
+                let y = gr.max.y - 1.5;
+                ui.painter().line_segment([pos2(gr.min.x, y), pos2(gr.min.x + size.x, y)], Stroke::new(1.0, col));
+            }
+            "Strikethrough" => {
+                let y = gr.center().y + 0.5;
+                ui.painter().line_segment([pos2(gr.min.x - 1.0, y), pos2(gr.min.x + size.x + 1.0, y)], Stroke::new(1.0, col));
+            }
+            _ => {}
+        }
+        if resp.clicked() {
+            out = Some(i);
+        }
+    }
+    out
+}
+
+/// The Small caps sample: a capital, then its other letters as smaller capitals. Drawn from
+/// ordinary capitals because the small-capital letters (`ɢ`, U+0262) are missing from many UI
+/// fonts, egui's defaults among them, where they showed as a box.
+fn small_caps_sample(ui: &Ui, label: &str, col: Color32) -> Arc<egui::Galley> {
+    let mut job = egui::text::LayoutJob::default();
+    let mut chars = label.chars();
+    let first: String = chars.next().into_iter().collect();
+    let rest: String = chars.map(small_capital_to_capital).collect::<String>().to_uppercase();
+    job.append(&first, 0.0, egui::TextFormat { font_id: regular(11.5), color: col, valign: egui::Align::BOTTOM, ..Default::default() });
+    job.append(&rest, 0.0, egui::TextFormat { font_id: regular(8.5), color: col, valign: egui::Align::BOTTOM, ..Default::default() });
+    ui.painter().layout_job(job)
+}
+
+/// The capital a small-capital letter stands for (the ones a sample uses), else the letter.
+fn small_capital_to_capital(c: char) -> char {
+    match c {
+        'ɢ' => 'G',
+        'ʜ' => 'H',
+        'ɪ' => 'I',
+        'ʟ' => 'L',
+        'ɴ' => 'N',
+        'ʀ' => 'R',
+        'ʏ' => 'Y',
+        c => c,
+    }
+}
+
+/// One OpenType feature toggle; `on` None = mixed. Returns true when clicked.
+pub(super) fn feature_row(ui: &mut Ui, tag: &str, label: &str, on: Option<bool>, supported: bool) -> bool {
+    let t = Tokens::get(ui.ctx());
+    let w = ui.available_width();
+    let (rect, resp) = ui.allocate_exact_size(vec2(w, 24.0), Sense::click());
+    let resp = if supported { resp } else { resp.on_hover_text(tr("Not in this font")) };
+    if resp.hovered() {
+        ui.painter().rect_filled(rect, CornerRadius::same(4), t.hover);
+    }
+    let b = Rect::from_min_size(pos2(rect.min.x + 4.0, rect.center().y - 7.0), vec2(14.0, 14.0));
+    match on {
+        Some(true) => {
+            ui.painter().rect_filled(b, CornerRadius::same(3), t.accent);
+            icons::paint(ui.painter(), b.shrink(1.5), Icon::Check, t.accent_on);
+        }
+        Some(false) => {
+            ui.painter().rect_stroke(b, CornerRadius::same(3), Stroke::new(1.0, t.border_strong), StrokeKind::Inside);
+        }
+        None => {
+            ui.painter().rect_filled(b, CornerRadius::same(3), t.accent);
+            ui.painter().line_segment([pos2(b.min.x + 3.5, b.center().y), pos2(b.max.x - 3.5, b.center().y)], Stroke::new(1.5, t.accent_on));
+        }
+    }
+    let col = if supported { t.text } else { t.text_tertiary };
+    ui.painter().text(pos2(b.max.x + 8.0, rect.center().y), Align2::LEFT_CENTER, label, regular(11.0), col);
+    ui.painter().text(pos2(rect.max.x - 6.0, rect.center().y), Align2::RIGHT_CENTER, tag, regular(10.0), t.text_tertiary);
+    resp.clicked()
+}
+
+#[derive(Clone, Copy)]
+pub(super) enum LeadGlyph {
+    LineHeight,
+    LetterSpacing,
+    ParagraphSpacing,
+}
+
+/// Paint a small original glyph for a typography field's lead.
+pub(super) fn paint_lead(p: &egui::Painter, r: Rect, g: LeadGlyph, col: Color32) {
+    let c = r.center();
+    let s = Stroke::new(1.0, col);
+    match g {
+        LeadGlyph::LineHeight => {
+            p.line_segment([pos2(c.x - 5.0, c.y - 6.0), pos2(c.x + 5.0, c.y - 6.0)], s);
+            p.line_segment([pos2(c.x - 5.0, c.y + 6.0), pos2(c.x + 5.0, c.y + 6.0)], s);
+            p.text(c, Align2::CENTER_CENTER, "A", regular(9.5), col);
+        }
+        LeadGlyph::LetterSpacing => {
+            p.line_segment([pos2(c.x - 6.0, c.y - 5.0), pos2(c.x - 6.0, c.y + 5.0)], s);
+            p.line_segment([pos2(c.x + 6.0, c.y - 5.0), pos2(c.x + 6.0, c.y + 5.0)], s);
+            p.text(c, Align2::CENTER_CENTER, "A", regular(9.5), col);
+        }
+        LeadGlyph::ParagraphSpacing => {
+            for dy in [-5.0, -2.5, 2.5, 5.0] {
+                p.line_segment([pos2(c.x - 5.0, c.y + dy), pos2(c.x + 5.0, c.y + dy)], s);
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn small_caps_sample_draws_only_letters_the_ui_font_has() {
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx, false, 0);
+        let mut shown = None;
+        let input = egui::RawInput { screen_rect: Some(Rect::from_min_size(pos2(0.0, 0.0), vec2(400.0, 300.0))), ..Default::default() };
+        let mut out = ctx.run_ui(input, |ui| {
+            shown = Some(small_caps_sample(ui, "Aɢ", Color32::WHITE));
+        });
+        out.textures_delta.clear();
+        let g = shown.expect("drawn");
+        assert_eq!(g.job.text, "AG");
+        let [a, rest] = g.job.sections.as_slice() else { panic!("two sections: {:?}", g.job.sections) };
+        assert!(rest.format.font_id.size < a.format.font_id.size, "the other letters are smaller capitals");
+        ctx.fonts_mut(|f| {
+            for sec in &g.job.sections {
+                assert!(f.has_glyphs(&sec.format.font_id, &g.job.text), "UI font draws {:?}", g.job.text);
+            }
+        });
+        assert_eq!(small_capital_to_capital('ʀ'), 'R');
+        assert_eq!(small_capital_to_capital('x'), 'x');
+    }
+
+    #[test]
+    fn parses_line_height_and_letter_spacing() {
+        assert_eq!(parse_line_height("Auto", None), Some(json!("auto")));
+        assert_eq!(parse_line_height("", Some(LineHeight::Pixels(20.0))), Some(json!("auto")));
+        assert_eq!(parse_line_height("150%", Some(LineHeight::Auto)), Some(json!("150%")));
+        assert_eq!(parse_line_height("24", Some(LineHeight::Auto)), Some(json!(24.0)));
+        assert_eq!(parse_line_height("24px", Some(LineHeight::Percent(120.0))), Some(json!(24.0)));
+        assert_eq!(parse_line_height("130", Some(LineHeight::Percent(120.0))), Some(json!("130%")));
+        assert_eq!(parse_line_height("-5", Some(LineHeight::Pixels(10.0))), Some(json!(0.0)));
+        assert_eq!(parse_line_height("abc", None), None);
+        // Enter on an untouched Mixed field commits nothing; typing Auto still does.
+        assert_eq!(parse_line_height("", None), None);
+        assert_eq!(parse_line_height("  ", None), None);
+        assert_eq!(parse_letter_spacing("2%", None), Some(json!("2%")));
+        assert_eq!(parse_letter_spacing("1.5px", None), Some(json!(1.5)));
+        assert_eq!(parse_letter_spacing("-1", None), Some(json!("-1%")));
+        assert_eq!(parse_letter_spacing("3", Some(LetterSpacing::Pixels(1.0))), Some(json!(3.0)));
+        assert_eq!(parse_letter_spacing("x", Some(LetterSpacing::Percent(0.0))), None);
+    }
+
+    /// One frame of the font picker with `events`.
+    fn pick(ctx: &egui::Context, current: &str, opened: bool, events: Vec<egui::Event>) -> FontPick {
+        let mut out = FontPick::default();
+        let mut shown = ctx.run_ui(egui::RawInput { events, ..Default::default() }, |ui| out = font_picker(ui, Some(current), opened));
+        shown.textures_delta.clear();
+        out
+    }
+
+    fn key(key: egui::Key) -> egui::Event {
+        egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE }
+    }
+
+    #[test]
+    fn arrow_keys_step_through_the_families_and_enter_picks() {
+        // #345
+        figcraft_text::scan_system_fonts();
+        let all = figcraft_text::family_names();
+        if all.len() < 3 {
+            eprintln!("fewer than three font families; skipping");
+            return;
+        }
+        let ctx = egui::Context::default();
+        let current = all[1].as_str();
+        assert!(pick(&ctx, current, true, vec![]).highlighted.is_none());
+        // The first step starts from the current family; each press is one step.
+        let down = pick(&ctx, current, false, vec![key(egui::Key::ArrowDown)]);
+        assert_eq!(down.highlighted.as_deref(), Some(all[2].as_str()));
+        let up = pick(&ctx, current, false, vec![key(egui::Key::ArrowUp), key(egui::Key::ArrowUp)]);
+        assert_eq!(up.highlighted.as_deref(), Some(all[0].as_str()));
+        // At the top it stays; Enter picks the family it is on, not the first.
+        assert_eq!(pick(&ctx, current, false, vec![key(egui::Key::ArrowUp)]).highlighted.as_deref(), Some(all[0].as_str()));
+        pick(&ctx, current, false, vec![key(egui::Key::ArrowDown)]);
+        let enter = pick(&ctx, current, false, vec![key(egui::Key::Enter)]);
+        assert_eq!(enter.picked.as_deref(), Some(all[1].as_str()));
+    }
+
+    #[test]
+    fn axis_values_round_by_axis_width() {
+        let axis = |min: f64, max: f64| figcraft_text::Axis { tag: "test".into(), name: "Test".into(), min, default: min, max, hidden: false };
+        assert_eq!(round_axis(&axis(100.0, 900.0), 456.6), 457.0);
+        assert_eq!(round_axis(&axis(-10.0, 0.0), -4.26), -4.3);
+        assert_eq!(round_axis(&axis(0.0, 1.0), 0.04), 0.0);
+    }
+
+    #[test]
+    fn uniform_reports_mixed() {
+        let a = TextStyle::default();
+        let b = TextStyle { font_size: 30.0, ..Default::default() };
+        assert_eq!(uniform(&[a.clone(), b.clone()], |s| s.font_family.clone()), Some("Inter".to_string()));
+        assert_eq!(uniform(&[a.clone(), b], |s| s.font_size), None);
+        assert_eq!(uniform(&[], |s: &TextStyle| s.font_size), None);
+        // Ranges pick only the spans they touch.
+        let mut doc = Document::new("t");
+        let page = doc.first_page().unwrap();
+        let id = doc.alloc_id();
+        let mut td = TextData::new("Hello world");
+        td.restyle(6, 11, |s| s.font_size = 40.0);
+        doc.insert(Node::new(id, NodeKind::Text(td), "t", 10.0, 10.0), page, None).unwrap();
+        assert_eq!(target_styles(&doc, &[id], Some((id, 0, 5))).len(), 1);
+        assert_eq!(target_styles(&doc, &[id], Some((id, 4, 8))).len(), 2);
+        assert_eq!(target_styles(&doc, &[id], Some((id, 3, 3))).len(), 2);
+        assert_eq!(target_styles(&doc, &[id], None).len(), 2);
+    }
+}
diff --git a/crates/ui-egui/src/panels/typography/picker.rs b/crates/ui-egui/src/panels/typography/picker.rs
new file mode 100644
index 00000000..824fc43e
--- /dev/null
+++ b/crates/ui-egui/src/panels/typography/picker.rs
@@ -0,0 +1,189 @@
+use super::*;
+
+// ---- Font picker ----
+
+const RECENT_KEY: &str = "figcraft_recent_fonts";
+
+const ROW: f32 = 26.0;
+
+/// The font list's tallest (it scrolls past that).
+const LIST_HEIGHT: f32 = 380.0;
+
+/// Return the persisted list of recently used font families.
+fn recent_families(ctx: &egui::Context) -> Vec<String> {
+    ctx.data_mut(|d| d.get_persisted::<Vec<String>>(Id::unique(RECENT_KEY))).unwrap_or_default()
+}
+
+/// Remember a font family at the front of the recent list, removing an earlier
+/// case-insensitive match and keeping at most eight entries.
+pub(super) fn remember_family(ctx: &egui::Context, family: &str) {
+    ctx.data_mut(|d| {
+        let v = d.get_persisted_mut_or_default::<Vec<String>>(Id::unique(RECENT_KEY));
+        v.retain(|f| !f.eq_ignore_ascii_case(family));
+        v.insert(0, family.to_string());
+        v.truncate(8);
+    });
+}
+
+enum PickRow {
+    Header(&'static str),
+    Family(String),
+}
+
+/// What the family list did this frame.
+#[derive(Default)]
+pub(crate) struct FontPick {
+    /// The family clicked, or the one Enter picked.
+    pub picked: Option<String>,
+    /// The family Up and Down are on (Enter picks it).
+    pub highlighted: Option<String>,
+    /// The family the pointer is over (the caller previews it on the canvas).
+    pub hovered: Option<String>,
+}
+
+/// The searchable family list: click a family, or step through it with Up and Down and press Enter.
+/// Hovering a family previews it on the canvas (closing without picking restores the original).
+pub(crate) fn font_picker(ui: &mut Ui, current: Option<&str>, just_opened: bool) -> FontPick {
+    let t = Tokens::get(ui.ctx());
+    let q_id = Id::unique("font_query");
+    // The row Up and Down are on, and the search it is a row of.
+    let hi_id = Id::unique("font_highlight");
+    let mut q: String = ui.data(|d| d.get_temp(q_id)).unwrap_or_default();
+    if just_opened {
+        q.clear();
+        ui.data_mut(|d| d.remove::<(String, usize)>(hi_id));
+    }
+    // Taken before the search field sees them (it would move its cursor).
+    let step = ui.input_mut(|i| {
+        i.count_and_consume_key(egui::Modifiers::NONE, egui::Key::ArrowDown) as i64
+            - i.count_and_consume_key(egui::Modifiers::NONE, egui::Key::ArrowUp) as i64
+    });
+    let search = ui.add(egui::TextEdit::singleline(&mut q).hint_text(tr("Search fonts")).desired_width(ui.available_width()).font(regular(11.5)));
+    crate::widgets::select_all_on_focus(ui, &search, &q);
+    if just_opened {
+        search.request_focus();
+    }
+    ui.data_mut(|d| d.insert_temp(q_id, q.clone()));
+    let ql = q.trim().to_lowercase();
+    let all = figcraft_text::family_names();
+    let matches: Vec<String> = all.iter().filter(|f| ql.is_empty() || f.to_lowercase().contains(&ql)).cloned().collect();
+    let mut rows: Vec<PickRow> = Vec::new();
+    if ql.is_empty() {
+        let recent: Vec<String> = recent_families(ui.ctx()).into_iter().filter(|f| all.iter().any(|a| a.eq_ignore_ascii_case(f))).collect();
+        if !recent.is_empty() {
+            rows.push(PickRow::Header(tr("Recent")));
+            rows.extend(recent.into_iter().map(PickRow::Family));
+            rows.push(PickRow::Header(tr("All fonts")));
+        }
+    }
+    if matches.is_empty() {
+        widgets::label(ui, tr("No fonts match"), t.text_tertiary);
+        return FontPick::default();
+    }
+    rows.extend(matches.into_iter().map(PickRow::Family));
+    let family = |i: usize| match rows.get(i) {
+        Some(PickRow::Family(f)) => Some(f.clone()),
+        _ => None,
+    };
+    // A new search starts again; the first step starts from the current family.
+    let mut hi = ui.data(|d| d.get_temp::<(String, usize)>(hi_id)).filter(|(hq, _)| *hq == q).map(|(_, i)| i);
+    let stride = ROW + ui.spacing().item_spacing.y;
+    let mut offset = None;
+    if step != 0 {
+        let next = |i: usize| if step > 0 { i.checked_add(1) } else { i.checked_sub(1) };
+        let mut from =
+            hi.or_else(|| rows.iter().rposition(|r| matches!(r, PickRow::Family(f) if current.is_some_and(|c| c.eq_ignore_ascii_case(f)))));
+        for _ in 0..step.unsigned_abs() {
+            let mut at = match from {
+                Some(i) => next(i),
+                None if step > 0 => Some(0),
+                None => rows.len().checked_sub(1),
+            };
+            // Past the headers; at either end it stays where it was.
+            while let Some(i) = at.filter(|i| *i < rows.len() && family(*i).is_none()) {
+                at = next(i);
+            }
+            if let Some(i) = at.filter(|i| family(*i).is_some()) {
+                from = Some(i);
+                hi = Some(i);
+            }
+        }
+        if let Some(i) = hi {
+            // Scrolled just enough to show it (the list is shorter than its tallest where the
+            // window has less room).
+            let (seen, height): (f32, f32) = ui.data(|d| d.get_temp(hi_id.with("view"))).unwrap_or((0.0, LIST_HEIGHT));
+            let top = i as f32 * stride;
+            offset = Some(seen.max(top + stride - height).min(top));
+        }
+    }
+    match hi {
+        Some(i) => ui.data_mut(|d| {
+            d.insert_temp(hi_id, (q.clone(), i));
+        }),
+        None => ui.data_mut(|d| d.remove::<(String, usize)>(hi_id)),
+    }
+    if search.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter)) {
+        let first = rows.iter().find_map(|r| match r {
+            PickRow::Family(f) => Some(f.clone()),
+            PickRow::Header(_) => None,
+        });
+        return FontPick { picked: hi.and_then(family).or(first), highlighted: None, hovered: None };
+    }
+    let mut budget = 4;
+    let mut picked = None;
+    let mut hovered_family = None;
+    let mut area = egui::ScrollArea::vertical().max_height(LIST_HEIGHT).auto_shrink([false, true]);
+    if let Some(y) = offset {
+        area = area.vertical_scroll_offset(y);
+    }
+    let shown = area.show_rows(ui, ROW, rows.len(), |ui, range| {
+        for (i, r) in rows.iter().enumerate().skip(range.start).take(range.len()) {
+            let w = ui.available_width();
+            let (rect, resp) = ui.allocate_exact_size(vec2(w, ROW), if matches!(r, PickRow::Family(_)) { Sense::click() } else { Sense::hover() });
+            match r {
+                PickRow::Header(h) => {
+                    ui.painter().text(pos2(rect.min.x + 8.0, rect.center().y), Align2::LEFT_CENTER, *h, semibold(10.5), t.text_secondary);
+                }
+                PickRow::Family(f) => {
+                    let hovered = resp.hovered() || hi == Some(i);
+                    if hovered {
+                        ui.painter().rect_filled(rect, CornerRadius::same(5), t.accent);
+                    }
+                    let col = if hovered { t.accent_on } else { t.text };
+                    if current.is_some_and(|c| c.eq_ignore_ascii_case(f)) {
+                        icons::paint(
+                            ui.painter(),
+                            Rect::from_center_size(pos2(rect.min.x + 10.0, rect.center().y), vec2(12.0, 12.0)),
+                            Icon::Check,
+                            col,
+                        );
+                    }
+                    let text_min = pos2(rect.min.x + 22.0, rect.min.y);
+                    match crate::font_preview::family(ui.ctx(), f, 13.0, &mut budget) {
+                        Some(tex) => {
+                            crate::font_preview::paint(
+                                ui.painter(),
+                                &tex,
+                                pos2(text_min.x, rect.center().y),
+                                rect.max.x - text_min.x - 6.0,
+                                ROW,
+                                col,
+                            );
+                        }
+                        None => {
+                            ui.painter().text(pos2(text_min.x, rect.center().y), Align2::LEFT_CENTER, f, regular(12.0), col);
+                        }
+                    }
+                    if resp.clicked() {
+                        picked = Some(f.clone());
+                    }
+                    if resp.hovered() {
+                        hovered_family = Some(f.clone());
+                    }
+                }
+            }
+        }
+    });
+    ui.data_mut(|d| d.insert_temp(hi_id.with("view"), (shown.state.clamped_offset().y, shown.inner_rect.height())));
+    FontPick { highlighted: hi.and_then(family), picked, hovered: hovered_family }
+}
diff --git a/crates/ui-egui/src/panels/typography/spacing.rs b/crates/ui-egui/src/panels/typography/spacing.rs
new file mode 100644
index 00000000..971a3c0f
--- /dev/null
+++ b/crates/ui-egui/src/panels/typography/spacing.rs
@@ -0,0 +1,202 @@
+use super::glyphs::{LeadGlyph, paint_lead};
+use super::*;
+
+/// Line height, letter spacing or paragraph spacing: property, field id, glyph and tooltip.
+pub(super) struct SpacingField {
+    pub(super) field: &'static str,
+    pub(super) id: Id,
+    pub(super) glyph: LeadGlyph,
+    pub(super) tip: &'static str,
+}
+
+pub(super) enum SpacingEdit {
+    Typed(String),
+    Scrub(f64, bool),
+}
+
+impl SpacingEdit {
+    pub(super) fn text(&self) -> String {
+        match self {
+            Self::Typed(text) => text.clone(),
+            Self::Scrub(value, _) => trim_num(*value),
+        }
+    }
+}
+
+/// Keep typed unit parsing and character-range targeting; only a scrub outside a text-editing
+/// session needs its own interaction. The editing session already owns its undo step.
+pub(super) fn commit_spacing(
+    app: &mut FigApp,
+    ids: &[NodeId],
+    range: Option<(NodeId, usize, usize)>,
+    field: &SpacingField,
+    edit: &SpacingEdit,
+    value: Value,
+) {
+    let props = json!({field.field: value});
+    match edit {
+        SpacingEdit::Scrub(_, done) if figcraft_engine::textedit::selected_range(&app.session).is_none() => {
+            live(app, field.tip, "node.set", json!({"ids": ids, "props": props}), *done);
+        }
+        _ => commit_text(app, ids, range, props),
+    }
+}
+
+/// The original text editor plus the same leading-icon scrub gesture as ordinary number fields.
+/// Auto and Mixed have no numeric starting value and remain unchanged by dragging.
+pub(super) fn spacing_input(ui: &mut Ui, field: &SpacingField, value: &str, width: f32) -> Option<SpacingEdit> {
+    let rect = Rect::from_min_size(ui.cursor().min, vec2(24.0, FIELD_H));
+    let typed = lead_field(ui, field.id, field.glyph, value, width, field.tip);
+    if ui.data(|d| d.get_temp::<String>(field.id.with("editing")).is_some()) {
+        return typed.map(SpacingEdit::Typed);
+    }
+    let response = ui.interact(rect, field.id.with("lead"), Sense::drag());
+    if response.hovered() || response.dragged() {
+        ui.ctx().set_cursor_icon(egui::CursorIcon::ResizeHorizontal);
+    }
+    let numeric = value.trim_end_matches('%').parse::<f64>().ok();
+    match widgets::scrub(ui, field.id, &response, numeric, 1.0) {
+        Some(FieldEdit::Scrub(v, done)) => Some(SpacingEdit::Scrub(v, done)),
+        _ => typed.map(SpacingEdit::Typed),
+    }
+}
+
+/// A spacing field that whole layers can bind to a number variable (in pixels): the variable's
+/// chip when bound, else the editable field with a variable button on hover. While a text range is
+/// selected it only takes values. Returns a typed commit or a live scrub.
+pub(super) fn spacing_field(
+    app: &mut FigApp,
+    ui: &mut Ui,
+    ids: &[NodeId],
+    f: &SpacingField,
+    value: &str,
+    width: f32,
+    range: bool,
+) -> Option<SpacingEdit> {
+    let rect = Rect::from_min_size(ui.cursor().min, vec2(width, FIELD_H));
+    if !range && crate::variable_ui::bound_chip(app, ui, ids, f.field, VariableType::Number, rect) {
+        ui.allocate_rect(rect, Sense::hover());
+        return None;
+    }
+    let out = spacing_input(ui, f, value, width);
+    if !range && ui.data(|d| d.get_temp::<String>(f.id.with("editing")).is_none()) {
+        crate::variable_ui::bind_button(ui, rect, ids, f.field, VariableType::Number);
+    }
+    out
+}
+
+fn lead_field(ui: &mut Ui, id: Id, glyph: LeadGlyph, value: &str, width: f32, tip: &str) -> Option<String> {
+    let t = Tokens::get(ui.ctx());
+    let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
+    let lead = Rect::from_min_size(rect.min, vec2(24.0, FIELD_H));
+    let text_rect = Rect::from_min_max(pos2(lead.max.x, rect.min.y), rect.max);
+    let editing_id = id.with("editing");
+    let mut editing: Option<String> = ui.data(|d| d.get_temp(editing_id));
+    let resp = ui.interact(rect, id.with("click"), Sense::click()).on_hover_text(tip);
+    crate::a11y::text(&resp, tip, value);
+    ui.painter().rect_filled(rect, CornerRadius::same(5), t.field);
+    if editing.is_some() {
+        ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, crate::theme::ACCENT), StrokeKind::Inside);
+    } else if resp.hovered() {
+        ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, t.field_hover_border), StrokeKind::Inside);
+    }
+    paint_lead(ui.painter(), lead, glyph, t.icon_secondary);
+    let started = editing.is_none() && resp.clicked();
+    if started {
+        editing = Some(if value == tr(MIXED) { String::new() } else { value.to_string() });
+        ui.memory_mut(|m| m.request_focus(id.with("te")));
+    }
+    let mut out = None;
+    match editing {
+        Some(mut text) => {
+            let mut child = ui.new_child(egui::UiBuilder::new().max_rect(text_rect.shrink2(vec2(2.0, 4.0))));
+            let r = child.add(
+                egui::TextEdit::singleline(&mut text)
+                    .id(id.with("te"))
+                    .frame(egui::Frame::NONE)
+                    .font(regular(11.0))
+                    .desired_width(text_rect.width() - 6.0),
+            );
+            crate::a11y::own_focus(&r);
+            crate::widgets::select_all_on_focus(ui, &r, &text);
+            // The Enter that started the edit (from the keyboard) doesn't end it.
+            let enter = !started && ui.input(|i| i.key_pressed(egui::Key::Enter));
+            let esc = ui.input(|i| i.key_pressed(egui::Key::Escape));
+            if esc {
+                ui.data_mut(|d| d.remove::<String>(editing_id));
+            } else if r.lost_focus() || enter {
+                out = Some(text);
+                ui.data_mut(|d| d.remove::<String>(editing_id));
+            } else {
+                ui.data_mut(|d| d.insert_temp(editing_id, text));
+            }
+        }
+        None => {
+            let col = if value == tr(MIXED) { t.text_tertiary } else { t.text };
+            ui.painter().text(pos2(text_rect.min.x + 2.0, rect.center().y), Align2::LEFT_CENTER, value, regular(11.0), col);
+        }
+    }
+    out
+}
+
+/// "Auto", "24", "150%" → the `lineHeight` value. A bare number keeps the current unit when it is
+/// a percentage, else means pixels. Empty text means Auto, except on a Mixed field (`cur` is
+/// `None`), where nothing typed is an untouched field and commits nothing.
+pub(crate) fn parse_line_height(s: &str, cur: Option<LineHeight>) -> Option<Value> {
+    let s = s.trim();
+    if s.is_empty() && cur.is_none() {
+        return None;
+    }
+    if s.is_empty() || s.eq_ignore_ascii_case("auto") {
+        return Some(json!("auto"));
+    }
+    if let Some(p) = s.strip_suffix('%') {
+        let cur_pct = match cur {
+            Some(LineHeight::Percent(p)) => Some(p),
+            _ => None,
+        };
+        return widgets::eval(p.trim(), cur_pct).filter(|v| v.is_finite()).map(|v| json!(format!("{}%", trim_num(v.max(0.0)))));
+    }
+    if let Some(px) = s.strip_suffix("px") {
+        return widgets::eval(px.trim(), None).filter(|v| v.is_finite()).map(|v| json!(v.max(0.0)));
+    }
+    match cur {
+        Some(LineHeight::Percent(p)) => widgets::eval(s, Some(p)).filter(|v| v.is_finite()).map(|v| json!(format!("{}%", trim_num(v.max(0.0))))),
+        Some(LineHeight::Pixels(px)) => widgets::eval(s, Some(px)).filter(|v| v.is_finite()).map(|v| json!(v.max(0.0))),
+        _ => widgets::eval(s, None).filter(|v| v.is_finite()).map(|v| json!(v.max(0.0))),
+    }
+}
+
+/// "2%", "1.5px", "-0.5" → the `letterSpacing` value. A bare number keeps the current unit
+/// (percent by default).
+pub(crate) fn parse_letter_spacing(s: &str, cur: Option<LetterSpacing>) -> Option<Value> {
+    let s = s.trim();
+    if let Some(p) = s.strip_suffix('%') {
+        return widgets::eval(p.trim(), None).filter(|v| v.is_finite()).map(|v| json!(format!("{}%", trim_num(v))));
+    }
+    if let Some(p) = s.strip_suffix("px") {
+        return widgets::eval(p.trim(), None).filter(|v| v.is_finite()).map(|v| json!(v));
+    }
+    match cur {
+        Some(LetterSpacing::Pixels(px)) => widgets::eval(s, Some(px)).filter(|v| v.is_finite()).map(|v| json!(v)),
+        Some(LetterSpacing::Percent(p)) => widgets::eval(s, Some(p)).filter(|v| v.is_finite()).map(|v| json!(format!("{}%", trim_num(v)))),
+        None => widgets::eval(s, None).filter(|v| v.is_finite()).map(|v| json!(format!("{}%", trim_num(v)))),
+    }
+}
+
+/// A [`parse_line_height`] value as a [`LineHeight`]: "auto", "150%" or a number of pixels.
+pub(crate) fn line_height_of(v: &Value) -> Option<LineHeight> {
+    match v {
+        Value::String(s) if s.eq_ignore_ascii_case("auto") => Some(LineHeight::Auto),
+        Value::String(s) => s.strip_suffix('%')?.trim().parse().ok().filter(|p: &f64| p.is_finite()).map(LineHeight::Percent),
+        other => other.as_f64().filter(|v| v.is_finite()).map(LineHeight::Pixels),
+    }
+}
+
+/// A [`parse_letter_spacing`] value as a [`LetterSpacing`]: "2%" or a number of pixels.
+pub(crate) fn letter_spacing_of(v: &Value) -> Option<LetterSpacing> {
+    match v {
+        Value::String(s) => s.strip_suffix('%')?.trim().parse().ok().filter(|p: &f64| p.is_finite()).map(LetterSpacing::Percent),
+        other => other.as_f64().filter(|v| v.is_finite()).map(LetterSpacing::Pixels),
+    }
+}
diff --git a/crates/ui-egui/src/variable_ui.rs b/crates/ui-egui/src/panels/variable_ui.rs
similarity index 69%
rename from crates/ui-egui/src/variable_ui.rs
rename to crates/ui-egui/src/panels/variable_ui.rs
index 04507c0c..fe822a1f 100644
--- a/crates/ui-egui/src/variable_ui.rs
+++ b/crates/ui-egui/src/panels/variable_ui.rs
@@ -17,7 +17,7 @@ use crate::a11y::Tip;
 use crate::i18n::tr;
 use crate::icons::{self, Icon};
 use crate::theme::{Tokens, regular, semibold};
-use crate::widgets::{self, BindEvent, Edit, FieldEdit, Lead};
+use crate::widgets::{self, BindEvent, Edit, Empty, FieldEdit, Lead};
 
 /// What picking a variable does.
 #[derive(Clone)]
@@ -40,8 +40,9 @@ struct Picker {
     at: Pos2,
 }
 
+/// Stable egui id for the variable picker.
 fn picker_id() -> Id {
-    Id::new("variable_picker")
+    Id::unique("variable_picker")
 }
 
 /// The variable `field` is bound to on every one of `ids` (its name), if they agree.
@@ -198,7 +199,7 @@ pub fn open_style(ui: &Ui, style: &str, field: &str, kind: VariableType, at: Pos
 
 /// Where the open picker is on screen (clicks in it don't close what opened it).
 pub fn picker_rect(ctx: &egui::Context) -> Option<Rect> {
-    picker_open(ctx).then(|| ctx.memory(|m| m.area_rect(Id::new("variable_picker_area")))).flatten()
+    picker_open(ctx).then(|| ctx.memory(|m| m.area_rect(Id::unique("variable_picker_area")))).flatten()
 }
 
 /// Whether the picker is open (Escape closes it before what opened it).
@@ -258,7 +259,23 @@ pub fn number_field_or(
     lead: Lead,
     suffix: &str,
 ) -> Option<FieldEdit> {
-    number_field_edit(app, ui, ids, field, id, value, width, empty, lead, suffix)?.settled()
+    number_field_edit(app, ui, ids, field, id, value, width, Empty::Text(empty), lead, suffix)?.settled()
+}
+
+/// [`number_field_or`] for a field where 0 is its automatic value (a layout grid's width or
+/// count): typing the word for Auto sets 0 ([`Empty::Auto`]).
+pub fn number_field_auto(
+    app: &mut FigApp,
+    ui: &mut Ui,
+    ids: &[NodeId],
+    field: &str,
+    id: Id,
+    value: Option<f64>,
+    width: f32,
+    lead: Lead,
+    suffix: &str,
+) -> Option<FieldEdit> {
+    number_field_edit(app, ui, ids, field, id, value, width, Empty::Auto, lead, suffix)?.settled()
 }
 
 /// [`number_field`] over several layers: a relative edit of mixed values comes back as one for
@@ -274,7 +291,7 @@ pub fn number_field_mixed(
     suffix: &str,
     width: f32,
 ) -> Option<Edit> {
-    number_field_edit(app, ui, ids, field, id, value, width, tr("Mixed"), lead, suffix)
+    number_field_edit(app, ui, ids, field, id, value, width, Empty::Text(tr("Mixed")), lead, suffix)
 }
 
 fn number_field_edit(
@@ -285,7 +302,7 @@ fn number_field_edit(
     id: Id,
     value: Option<f64>,
     width: f32,
-    empty: &str,
+    empty: Empty<'_>,
     lead: Lead,
     suffix: &str,
 ) -> Option<Edit> {
@@ -299,7 +316,7 @@ fn number_field_edit(
 /// otherwise nothing and false.
 pub fn bound_chip(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], field: &str, kind: VariableType, rect: Rect) -> bool {
     let Some(name) = app.session.doc().ok().and_then(|d| bound_name(d, ids, field)) else { return false };
-    let ev = widgets::bound_field(ui, Id::new(("bound_chip", field, ids)), Lead::None, rect, &name);
+    let ev = widgets::bound_field(ui, Id::unique(("bound_chip", field, ids)), Lead::None, rect, &name);
     handle(app, ui, ids, field, kind, ev);
     true
 }
@@ -329,7 +346,7 @@ pub fn bindable(
 /// A variable button at the right end of `rect` while the pointer is over it: opens the picker
 /// to bind `field` of `ids`.
 pub fn bind_button(ui: &mut Ui, rect: Rect, ids: &[NodeId], field: &str, kind: VariableType) {
-    if variable_button(ui, rect, Id::new(("bind_button", field, ids))) {
+    if variable_button(ui, rect, Id::unique(("bind_button", field, ids))) {
         open(ui, ids, field, kind, rect.left_bottom());
     }
 }
@@ -356,18 +373,24 @@ pub fn bound_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], field: &str, kin
     let Some(name) = app.session.doc().ok().and_then(|d| bound_name(d, ids, field)) else { return };
     crate::right::row(ui, 32.0, |ui| {
         let (rect, _) = ui.allocate_exact_size(vec2(width.min(ui.available_width()), widgets::FIELD_H), Sense::hover());
-        let ev = widgets::bound_field(ui, Id::new(("bound_row", field)), lead, rect, &name);
+        let ev = widgets::bound_field(ui, Id::unique(("bound_row", field)), lead, rect, &name);
         handle(app, ui, ids, field, kind, ev);
     });
 }
 
+/// Whether a variable of type `have` belongs in a picker for `want` on `field`: its own type, and
+/// numbers for text content too (shown as text).
+fn kind_fits(want: Option<VariableType>, field: Option<&str>, have: VariableType) -> bool {
+    want.is_none_or(|k| have == k || (field == Some("characters") && have == VariableType::Number))
+}
+
 /// The picker popover (call once per frame).
 pub fn picker(app: &mut FigApp, ctx: &egui::Context) {
     let Some(p) = ctx.data(|d| d.get_temp::<Picker>(picker_id())) else { return };
     let Ok(doc) = app.session.ds().map(|d| d.doc.clone()) else { return };
     let libs = libraries(app, &doc);
     let t = Tokens::get(ctx);
-    let query_id = Id::new("variable_picker_query");
+    let query_id = Id::unique("variable_picker_query");
     let mut query: String = ctx.data(|d| d.get_temp(query_id)).unwrap_or_default();
     let q = query.trim().to_lowercase();
     // Bindings offer variables scoped to the property; aliases, any that wouldn't loop (library
@@ -377,19 +400,29 @@ pub fn picker(app: &mut FigApp, ctx: &egui::Context) {
         Target::Alias { variable, .. } => (None, doc.variables.get(variable)),
         Target::Proto(_) | Target::Style { .. } => (None, None),
     };
+    // A style's fields offer variables scoped to one of the properties the field sets.
+    let style_scopes = match &p.target {
+        Target::Style { style, field } => doc.style(style).and_then(|st| figcraft_engine::style_vars::field_scopes(&st.kind, field)),
+        _ => None,
+    };
     // Prototypes and styles use this file's variables.
     let local_only = matches!(p.target, Target::Proto(_) | Target::Style { .. });
+    let field = match &p.target {
+        Target::Bind { field, .. } => Some(field.as_str()),
+        _ => None,
+    };
     let keep = |lib: Option<&PublishedLibrary>, v: &Variable| {
-        p.kind.is_none_or(|k| v.kind == k)
+        kind_fits(p.kind, field, v.kind)
             && !(local_only && lib.is_some())
             && (q.is_empty() || v.name.to_lowercase().contains(&q))
             && scope.is_none_or(|s| v.in_scope(s))
+            && style_scopes.is_none_or(|list| list.iter().any(|s| v.in_scope(s)))
             && (lib.is_some() || own.is_none_or(|o| figcraft_engine::cmd::variables::alias_target(&doc.variables, o, &v.id).is_ok()))
     };
     let groups = groups(&doc, &libs, keep);
     let mut chosen: Option<Pick> = None;
     let mut close = false;
-    let area = egui::Area::new(Id::new("variable_picker_area")).order(egui::Order::Foreground).fixed_pos(p.at + vec2(0.0, 4.0)).show(ctx, |ui| {
+    let area = egui::Area::new(Id::unique("variable_picker_area")).order(egui::Order::Foreground).fixed_pos(p.at + vec2(0.0, 4.0)).show(ctx, |ui| {
         egui::Frame::NONE.fill(t.menu).corner_radius(CornerRadius::same(10)).inner_margin(egui::Margin::same(8)).show(ui, |ui| {
             ui.set_width(240.0);
             ui.horizontal(|ui| {
@@ -436,7 +469,7 @@ pub fn picker(app: &mut FigApp, ctx: &egui::Context) {
         });
     });
     let rect = area.response.rect;
-    ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, Id::new("variable_picker_border"))).rect_stroke(
+    ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, Id::unique("variable_picker_border"))).rect_stroke(
         rect,
         CornerRadius::same(10),
         Stroke::new(1.0, Color32::from_black_alpha(40)),
@@ -476,3 +509,144 @@ pub fn picker(app: &mut FigApp, ctx: &egui::Context) {
 fn groups_any_kind(doc: &Document, libs: &[Arc<PublishedLibrary>], kind: Option<VariableType>) -> bool {
     !groups(doc, libs, |_, v| kind.is_none_or(|k| v.kind == k)).is_empty()
 }
+
+#[cfg(test)]
+mod kind_tests {
+    use super::*;
+
+    #[test]
+    fn text_content_offers_numbers_too() {
+        use VariableType::*;
+        assert!(kind_fits(Some(String), Some("characters"), Number), "a number shows as text");
+        assert!(kind_fits(Some(String), Some("characters"), String));
+        assert!(!kind_fits(Some(String), Some("characters"), Color));
+        assert!(!kind_fits(Some(String), Some("fontFamily"), Number), "only text content");
+        assert!(!kind_fits(Some(Number), Some("width"), String));
+        assert!(kind_fits(None, None, Boolean));
+    }
+}
+
+#[cfg(test)]
+mod scope_tests {
+    use figcraft_engine::Session;
+
+    use super::*;
+    use crate::layers_drag_tests::Ui as TestUi;
+    use crate::style_picker::StyleSlot;
+
+    fn run(s: &mut Session, cmd: &str, p: serde_json::Value) -> serde_json::Value {
+        s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd} {p}: {e}"))
+    }
+
+    /// A rectangle (selected, with a drop shadow), a frame with a layout grid, the styles "Brand"
+    /// (paint), "Shadow" (effect, from the rectangle), "Base" (grid, from the frame) and "Body"
+    /// (text), and variables each scoped to one property (`any` to none).
+    fn session() -> Session {
+        let mut s = Session::new();
+        let r = run(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 40, "height": 40}))["id"].clone();
+        run(&mut s, "effect.add", json!({"ids": [r], "type": "dropShadow"}));
+        let f = run(&mut s, "frame.create", json!({"x": 100, "y": 0, "width": 100, "height": 100}))["id"].clone();
+        run(&mut s, "grid.add", json!({"ids": [f]}));
+        run(&mut s, "style.create", json!({"type": "paint", "name": "Brand", "value": [{"type": "solid", "color": "#0D99FF"}]}));
+        run(&mut s, "style.create", json!({"type": "effect", "name": "Shadow", "from": r}));
+        run(&mut s, "style.create", json!({"type": "grid", "name": "Base", "from": f}));
+        run(&mut s, "style.create", json!({"type": "text", "name": "Body", "value": {"fontFamily": "Inter", "fontSize": 14}}));
+        run(&mut s, "variable.createCollection", json!({"name": "Tokens", "modes": ["Base"]}));
+        for (name, ty, value, scope) in [
+            ("frame fill", "color", json!("#FF0000"), Some("FRAME_FILL")),
+            ("shape fill", "color", json!("#00FF00"), Some("SHAPE_FILL")),
+            ("stroke color", "color", json!("#0000FF"), Some("STROKE_COLOR")),
+            ("shadow color", "color", json!("#000000"), Some("EFFECT_COLOR")),
+            ("radius", "number", json!(8), Some("CORNER_RADIUS")),
+            ("font size", "number", json!(18), Some("FONT_SIZE")),
+            ("blur", "number", json!(4), Some("EFFECT_FLOAT")),
+            ("any", "number", json!(2), None),
+            ("family", "string", json!("Inter"), Some("FONT_FAMILY")),
+            ("weight", "string", json!("Bold"), Some("FONT_STYLE")),
+        ] {
+            run(&mut s, "variable.create", json!({"collection": "Tokens", "name": name, "type": ty, "values": {"Base": value}}));
+            if let Some(sc) = scope {
+                run(&mut s, "variable.update", json!({"variable": name, "scopes": [sc]}));
+            }
+        }
+        run(&mut s, "select.set", json!({"ids": [r]}));
+        s
+    }
+
+    /// The texts drawn in one frame.
+    fn drawn(u: &mut TestUi) -> Vec<String> {
+        fn walk(shape: &egui::Shape, out: &mut Vec<String>) {
+            match shape {
+                egui::Shape::Text(t) => out.push(t.galley.text().to_string()),
+                egui::Shape::Vec(v) => v.iter().for_each(|s| walk(s, out)),
+                _ => {}
+            }
+        }
+        let mut out = Vec::new();
+        for c in u.frame_output(vec![]).shapes {
+            walk(&c.shape, &mut out);
+        }
+        out
+    }
+
+    fn check(texts: &[String], shown: &[&str], hidden: &[&str], what: &str) {
+        for name in shown {
+            assert!(texts.iter().any(|t| t == name), "{what}: {name:?} offered, in {texts:?}");
+        }
+        for name in hidden {
+            assert!(!texts.iter().any(|t| t == name), "{what}: {name:?} not offered, in {texts:?}");
+        }
+    }
+
+    #[test]
+    fn a_styles_variable_picker_offers_the_fields_scopes_only() {
+        use VariableType::{Color, Number, String};
+        let mut u = TestUi::new(session());
+        // (style, field, type, offered, not offered)
+        for (style, field, kind, shown, hidden) in [
+            ("Brand", "fill", Color, &["frame fill", "shape fill", "stroke color"][..], &["shadow color"][..]),
+            ("Shadow", "effects/0/color", Color, &["shadow color"], &["frame fill", "shape fill", "stroke color"]),
+            ("Shadow", "effects/0/radius", Number, &["blur", "any"], &["radius", "font size"]),
+            ("Base", "layoutGrids/0/size", Number, &["radius", "font size", "blur", "any"], &[]),
+            ("Body", "fontSize", Number, &["font size", "any"], &["radius", "blur"]),
+            ("Body", "fontFamily", String, &["family"], &["weight"]),
+            ("Body", "fontStyle", String, &["weight"], &["family"]),
+        ] {
+            let id = u.app.session.doc().unwrap().style(style).unwrap().id.clone();
+            let target = Target::Style { style: id, field: field.to_string() };
+            u.ctx.data_mut(|d| d.insert_temp(picker_id(), Picker { target, kind: Some(kind), at: pos2(400.0, 100.0) }));
+            u.frame(vec![]);
+            check(&drawn(&mut u), shown, hidden, &format!("{style} {field}"));
+        }
+    }
+
+    #[test]
+    fn the_fill_and_stroke_style_pickers_offer_scoped_color_variables() {
+        let mut u = TestUi::new(session());
+        for (slot, shown, hidden) in [
+            (StyleSlot::Fill, &["shape fill"][..], &["frame fill", "stroke color", "shadow color"][..]),
+            (StyleSlot::Stroke, &["stroke color"], &["frame fill", "shape fill", "shadow color"]),
+        ] {
+            crate::style_picker::open_for_selection(&mut u.app, slot, None);
+            u.frame(vec![]);
+            let texts = drawn(&mut u);
+            assert!(texts.iter().any(|t| t == "Color variables"), "{slot:?}: {texts:?}");
+            check(&texts, shown, hidden, &format!("{slot:?}"));
+        }
+    }
+
+    #[test]
+    fn a_mixed_selections_fill_picker_offers_variables_scoped_to_every_layer() {
+        let mut s = session();
+        let r = s.selection()[0];
+        let f = s.doc().unwrap().nodes().find(|n| matches!(n.kind, figcraft_doc::NodeKind::Frame)).unwrap().id;
+        run(&mut s, "variable.create", json!({"collection": "Tokens", "name": "both fills", "type": "color", "values": {"Base": "#FFFF00"}}));
+        run(&mut s, "variable.update", json!({"variable": "both fills", "scopes": ["FRAME_FILL", "SHAPE_FILL"]}));
+        // The frame first: its scope alone would offer "frame fill" for the rectangle too.
+        run(&mut s, "select.set", json!({"ids": [f, r]}));
+        let mut u = TestUi::new(s);
+        crate::style_picker::open_for_selection(&mut u.app, StyleSlot::Fill, None);
+        u.frame(vec![]);
+        check(&drawn(&mut u), &["both fills"], &["frame fill", "shape fill"], "frame and rectangle");
+    }
+}
diff --git a/crates/ui-egui/src/vector_panel.rs b/crates/ui-egui/src/panels/vector_panel.rs
similarity index 87%
rename from crates/ui-egui/src/vector_panel.rs
rename to crates/ui-egui/src/panels/vector_panel.rs
index e965da35..07dda3ff 100644
--- a/crates/ui-egui/src/vector_panel.rs
+++ b/crates/ui-egui/src/panels/vector_panel.rs
@@ -46,9 +46,10 @@ fn width_point(app: &mut FigApp, ui: &mut Ui, doc: &Document, ve: &VectorEdit) {
     let round = |v: f64| (v * 100.0).round() / 100.0;
     widgets::sublabels(ui, tr("Position"), Some(tr("Width")));
     row(ui, 32.0, |ui| {
-        let e = widgets::number_field(ui, Id::new("wpt_t"), Lead::None, Some(round(p.t * 100.0)), "%", col, 1.0);
+        let e = widgets::number_field(ui, Id::unique("wpt_t"), Lead::None, Some(round(p.t * 100.0)), "%", col, 1.0);
         point_field(app, "vector.edit.widthPoint", e, |v| json!({"index": i, "t": v / 100.0}));
-        let e = widgets::number_field(ui, Id::new("wpt_w"), Lead::Icon(Icon::StrokeIcon, tr("Width")), Some(round(p.scale * weight)), "", col, 1.0);
+        let e =
+            widgets::number_field(ui, Id::unique("wpt_w"), Lead::Icon(Icon::StrokeIcon, tr("Width")), Some(round(p.scale * weight)), "", col, 1.0);
         point_field(app, "vector.edit.widthPoint", e, |v| json!({"index": i, "width": v.max(0.0)}));
     });
     // Each side's reach from the centre line (Alt-drag a handle on the canvas for one side).
@@ -58,7 +59,7 @@ fn width_point(app: &mut FigApp, ui: &mut Ui, doc: &Document, ve: &VectorEdit) {
         for (side, scale, name) in [("left", l, tr("Left side width")), ("right", r, tr("Right side width"))] {
             let e = widgets::number_field(
                 ui,
-                Id::new(("wpt_side", side)),
+                Id::unique(("wpt_side", side)),
                 Lead::Icon(Icon::StrokeIcon, name),
                 Some(round(scale * weight / 2.0)),
                 "",
@@ -71,6 +72,8 @@ fn width_point(app: &mut FigApp, ui: &mut Ui, doc: &Document, ve: &VectorEdit) {
     ui.add_space(8.0);
 }
 
+/// Draw the selected points' position, dimensions, corner radius, mirroring and per-point
+/// stroke cap/join controls; the width tool delegates to its own panel.
 pub fn points(app: &mut FigApp, ui: &mut Ui, doc: &Document, ve: &VectorEdit) {
     if ve.tool == vectoredit::VTool::Width {
         width_point(app, ui, doc, ve);
@@ -89,17 +92,17 @@ pub fn points(app: &mut FigApp, ui: &mut Ui, doc: &Document, ve: &VectorEdit) {
     let round = |v: f64| (v * 100.0).round() / 100.0;
     widgets::sublabels(ui, tr("Position"), None);
     row(ui, 32.0, |ui| {
-        let e = widgets::number_field(ui, Id::new("vpt_x"), Lead::Text("X"), pos.map(|p| round(p.x)), "", col, 1.0);
+        let e = widgets::number_field(ui, Id::unique("vpt_x"), Lead::Text("X"), pos.map(|p| round(p.x)), "", col, 1.0);
         point_field(app, "vector.edit.position", e, |v| json!({"x": v}));
-        let e = widgets::number_field(ui, Id::new("vpt_y"), Lead::Text("Y"), pos.map(|p| round(p.y)), "", col, 1.0);
+        let e = widgets::number_field(ui, Id::unique("vpt_y"), Lead::Text("Y"), pos.map(|p| round(p.y)), "", col, 1.0);
         point_field(app, "vector.edit.position", e, |v| json!({"y": v}));
     });
     if let Some(b) = vectoredit::transform::point_box(doc, ve).filter(|b| b.points.len() > 1) {
         widgets::sublabels(ui, tr("Dimensions"), None);
         row(ui, 32.0, |ui| {
-            let e = widgets::number_field(ui, Id::new("vpt_w"), Lead::Text("W"), Some(round(b.width)), "", col, 1.0);
+            let e = widgets::number_field(ui, Id::unique("vpt_w"), Lead::Text("W"), Some(round(b.width)), "", col, 1.0);
             point_field(app, "vector.edit.resize", e, |v| json!({"width": v.max(0.0)}));
-            let e = widgets::number_field(ui, Id::new("vpt_h"), Lead::Text("H"), Some(round(b.height)), "", col, 1.0);
+            let e = widgets::number_field(ui, Id::unique("vpt_h"), Lead::Text("H"), Some(round(b.height)), "", col, 1.0);
             point_field(app, "vector.edit.resize", e, |v| json!({"height": v.max(0.0)}));
         });
     }
@@ -112,7 +115,7 @@ pub fn points(app: &mut FigApp, ui: &mut Ui, doc: &Document, ve: &VectorEdit) {
     widgets::sublabels(ui, tr("Corner radius"), None);
     row(ui, 32.0, |ui| {
         let e =
-            widgets::number_field(ui, Id::new("vpt_radius"), Lead::Icon(Icon::CornerRadius, tr("Corner radius")), radius.map(round), "", col, 1.0);
+            widgets::number_field(ui, Id::unique("vpt_radius"), Lead::Icon(Icon::CornerRadius, tr("Corner radius")), radius.map(round), "", col, 1.0);
         point_field(app, "vector.edit.cornerRadius", e, |v| json!({"radius": v.max(0.0)}));
     });
     widgets::sublabels(ui, tr("Mirroring"), None);
diff --git a/crates/ui-egui/src/versions.rs b/crates/ui-egui/src/panels/versions.rs
similarity index 98%
rename from crates/ui-egui/src/versions.rs
rename to crates/ui-egui/src/panels/versions.rs
index 2d0f9ae2..7046b5fa 100644
--- a/crates/ui-egui/src/versions.rs
+++ b/crates/ui-egui/src/panels/versions.rs
@@ -50,7 +50,7 @@ impl Form {
 /// Open the panel (File ▸ Show version history).
 pub fn open(app: &mut FigApp) {
     app.ui.versions.open = true;
-    app.ui.left_collapsed = false;
+    app.ui.open_left_panel();
     app.ui.left_tab = crate::LeftTab::File;
 }
 
@@ -403,6 +403,8 @@ fn current_row(ui: &mut Ui, more: bool, active: bool) -> bool {
     !active && resp.on_hover_text(tr("Back to the current version")).clicked()
 }
 
+/// Draw one version row with timeline, name, time, up to three description lines and a
+/// more/context menu; returns the chosen preview, restore, edit, duplicate or delete action.
 fn version_row(ui: &mut Ui, row: &Row, last: bool, previewing: bool) -> Option<Action> {
     let t = Tokens::get(ui.ctx());
     let w = ui.available_width();
@@ -433,7 +435,7 @@ fn version_row(ui: &mut Ui, row: &Row, last: bool, previewing: bool) -> Option<A
     let mut out = None;
     // More menu (on hover), also on right-click.
     let br = Rect::from_center_size(pos2(r.max.x - 22.0, name_y), vec2(24.0, 24.0));
-    let more = ui.interact(br, Id::new(("version_more", &row.id)), Sense::click());
+    let more = ui.interact(br, Id::unique(("version_more", &row.id)), Sense::click());
     let menu_open = egui::Popup::is_id_open(ui.ctx(), egui::Popup::default_response_id(&more));
     if hovered || menu_open {
         if more.hovered() || menu_open {
@@ -488,7 +490,7 @@ fn branch_row(ui: &mut Ui, b: &BranchRow) -> Option<Action> {
     p.text(pos2(clip.min.x, r.min.y + 31.0), Align2::LEFT_CENTER, sub, regular(11.0), t.text_secondary);
     let mut out = None;
     let br = Rect::from_center_size(pos2(r.max.x - 22.0, r.min.y + 15.0), vec2(24.0, 24.0));
-    let more = ui.interact(br, Id::new(("branch_more", &b.id)), Sense::click());
+    let more = ui.interact(br, Id::unique(("branch_more", &b.id)), Sense::click());
     let menu_open = egui::Popup::is_id_open(ui.ctx(), egui::Popup::default_response_id(&more));
     if hovered || menu_open {
         if more.hovered() || menu_open {
@@ -523,7 +525,7 @@ pub fn preview_banner(app: &mut FigApp, ctx: &egui::Context, canvas: Rect) {
         return;
     };
     let t = Tokens::get(ctx);
-    let action = widgets::canvas_banner(ctx, Id::new("version_preview_banner"), canvas, |ui| {
+    let action = widgets::canvas_banner(ctx, Id::unique("version_preview_banner"), canvas, |ui| {
         let mut action = None;
         icons::paint(ui.painter(), Rect::from_center_size(ui.cursor().min + vec2(7.0, 12.0), vec2(14.0, 14.0)), Icon::Clock, t.icon_secondary);
         ui.add_space(20.0);
diff --git a/crates/ui-egui/src/paste_image_tests.rs b/crates/ui-egui/src/paste_image_tests.rs
new file mode 100644
index 00000000..a76eae79
--- /dev/null
+++ b/crates/ui-egui/src/paste_image_tests.rs
@@ -0,0 +1,481 @@
+//! Pasting an image copied in another app (#663). On the desktop, egui-winit swallows Cmd/Ctrl+V's
+//! press and sends a paste event only when the clipboard holds text: an image leaves just the
+//! key's release. The browser sends the press and a paste event (`web_clipboard_tests`).
+
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use egui::{Event, Key, Modifiers, PointerButton, Pos2, RawInput, Rect, Shape, vec2};
+use figcraft_doc::NodeId;
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::{FigApp, Services};
+
+/// What the system clipboard holds when a paste chord is pressed (#716).
+#[derive(Clone, Copy, Debug)]
+enum Held {
+    /// FigCraft's own copy (its SVG text).
+    Ours,
+    /// Text copied in another app.
+    Text,
+    /// An image copied in another app.
+    Image,
+}
+
+const HELD: [Held; 3] = [Held::Ours, Held::Text, Held::Image];
+
+#[derive(Default)]
+struct Clip {
+    text: Option<String>,
+    image: Option<(u32, u32, Vec<u8>)>,
+}
+
+/// The desktop clipboard.
+struct Desktop(Rc<RefCell<Clip>>);
+
+impl Services for Desktop {
+    fn clipboard_set_text(&mut self, s: &str) {
+        *self.0.borrow_mut() = Clip { text: Some(s.into()), image: None };
+    }
+    fn clipboard_get_text(&mut self) -> Option<String> {
+        self.0.borrow().text.clone()
+    }
+    fn clipboard_get_image(&mut self) -> Option<(u32, u32, Vec<u8>)> {
+        self.0.borrow().image.clone()
+    }
+}
+
+struct Win {
+    ctx: egui::Context,
+    app: FigApp,
+    time: f64,
+    clip: Rc<RefCell<Clip>>,
+    shapes: Vec<Shape>,
+}
+
+impl Win {
+    fn new() -> Self {
+        let mut s = Session::new();
+        s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 100, "height": 50})).unwrap();
+        s.execute("select.none", &json!({})).unwrap();
+        let ctx = egui::Context::default();
+        let clip = Rc::new(RefCell::new(Clip::default()));
+        let app = FigApp::new(s, Box::new(Desktop(clip.clone())));
+        let mut w = Self { ctx, app, time: 0.0, clip, shapes: Vec::new() };
+        for _ in 0..3 {
+            w.frame(vec![]);
+        }
+        w
+    }
+
+    fn frame(&mut self, events: Vec<Event>) {
+        self.frame_with(events, false);
+    }
+
+    /// `take_v`: something ahead of the app (a prototype's key trigger) consumes a V press.
+    fn frame_with(&mut self, events: Vec<Event>, take_v: bool) {
+        self.time += 1.0 / 60.0;
+        let input =
+            RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), time: Some(self.time), events, ..Default::default() };
+        let app = &mut self.app;
+        let mut out = self.ctx.run_ui(input, |ui| {
+            if take_v {
+                ui.ctx().input_mut(|i| i.consume_key(Modifiers::NONE, Key::V));
+            }
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+        self.shapes = out.shapes.into_iter().map(|s| s.shape).collect();
+    }
+
+    fn copy_image_elsewhere(&mut self) {
+        *self.clip.borrow_mut() = Clip { text: None, image: Some((2, 2, vec![255; 16])) };
+    }
+
+    /// Cmd/Ctrl+V as egui-winit delivers it: the press brings a paste event when the clipboard
+    /// holds text and nothing otherwise; the release comes as a key event.
+    fn cmd_v(&mut self, m: Modifiers) {
+        let text = self.clip.borrow().text.clone().filter(|t| !t.is_empty());
+        self.frame(text.map(Event::Paste).into_iter().collect());
+        self.frame(vec![key(Key::V, false, m)]);
+        self.frame(vec![]);
+    }
+
+    /// A Cmd/Ctrl+V chord with its modifiers, as egui-winit delivers it: they go down first, the V
+    /// press brings a paste event only for text, its release comes as a key event, then they're
+    /// let go.
+    fn chord(&mut self, m: Modifiers) {
+        let text = self.clip.borrow().text.clone().filter(|t| !t.is_empty());
+        self.frame(vec![Event::ModifiersChanged(m)]);
+        self.frame(text.map(Event::Paste).into_iter().collect());
+        self.frame(vec![key(Key::V, false, m)]);
+        self.frame(vec![Event::ModifiersChanged(Modifiers::NONE)]);
+    }
+
+    /// A red rectangle A copied in FigCraft, and a grey rectangle B selected; then `held` on the
+    /// system clipboard. Returns (A, B).
+    fn copy_a_select_b(&mut self, held: Held) -> (NodeId, NodeId) {
+        let s = &mut self.app.session;
+        let a = s.doc().unwrap().nodes().find(|n| n.name == "Rectangle").unwrap().id;
+        s.execute("fill.set", &json!({"ids": [a.0], "color": "#e53935"})).unwrap();
+        let b = s.execute("shape.rectangle", &json!({"x": 400, "y": 250, "width": 100, "height": 50})).unwrap();
+        let b = NodeId(b["id"].as_u64().unwrap());
+        s.execute("select.set", &json!({"ids": [a.0]})).unwrap();
+        crate::menus::invoke(&mut self.app, "edit.copy");
+        self.app.session.execute("edit.copyProperties", &json!({})).unwrap();
+        self.app.session.execute("select.set", &json!({"ids": [b.0]})).unwrap();
+        match held {
+            Held::Ours => {}
+            Held::Text => self.clip.borrow_mut().text = Some("hello from another app".into()),
+            Held::Image => self.copy_image_elsewhere(),
+        }
+        (a, b)
+    }
+
+    fn fill(&self, id: NodeId) -> String {
+        let n = figcraft_engine::inspect::node_json(self.app.session.doc().unwrap(), id, 0);
+        n["fills"][0]["color"].as_str().unwrap_or_default().to_string()
+    }
+
+    /// Top-lefts of the rectangles other than `b`.
+    fn rects_besides(&self, b: NodeId) -> Vec<(i64, i64)> {
+        let doc = self.app.session.doc().unwrap();
+        let mut at: Vec<_> = doc
+            .nodes()
+            .filter(|n| n.name == "Rectangle" && n.id != b)
+            .filter_map(|n| doc.world_bounds(n.id))
+            .map(|r| (r.x0.round() as i64, r.y0.round() as i64))
+            .collect();
+        at.sort();
+        at
+    }
+
+    fn named(&self, name: &str) -> usize {
+        self.app.session.doc().unwrap().nodes().filter(|n| n.name == name).count()
+    }
+
+    fn texts(&self) -> usize {
+        self.app.session.doc().unwrap().nodes().filter(|n| matches!(n.kind, figcraft_doc::NodeKind::Text(_))).count()
+    }
+
+    fn rects(&self) -> usize {
+        self.named("Rectangle")
+    }
+}
+
+// egui sets `command` for Cmd on macOS and for Ctrl elsewhere; macOS Ctrl is a separate key.
+const CMD: Modifiers = if cfg!(target_os = "macos") { Modifiers::COMMAND } else { Modifiers::COMMAND.plus(Modifiers::CTRL) };
+
+fn key(key: Key, pressed: bool, modifiers: Modifiers) -> Event {
+    Event::Key { key, physical_key: Some(key), pressed, repeat: false, modifiers }
+}
+
+#[test]
+fn cmd_v_pastes_an_image_copied_elsewhere() {
+    let mut w = Win::new();
+    w.copy_image_elsewhere();
+    w.cmd_v(CMD);
+    assert_eq!(w.named("Pasted image"), 1, "the image was pasted from the key's release");
+    w.app.session.execute("select.none", &json!({})).unwrap();
+    w.cmd_v(CMD);
+    assert_eq!(w.named("Pasted image"), 2, "and again");
+}
+
+#[test]
+fn cmd_v_fills_a_selected_oval_without_adding_a_layer() {
+    let mut w = Win::new();
+    let oval =
+        NodeId(w.app.session.execute("shape.ellipse", &json!({"x": 200, "y": 100, "width": 120, "height": 80})).unwrap()["id"].as_u64().unwrap());
+    let before = w.app.session.doc().unwrap().node_count();
+    let original_fill = w.app.session.doc().unwrap().node(oval).unwrap().fills.clone();
+    w.copy_image_elsewhere();
+    w.cmd_v(CMD);
+
+    let doc = w.app.session.doc().unwrap();
+    let node = doc.node(oval).unwrap();
+    assert_eq!(doc.node_count(), before);
+    assert!(matches!(node.kind, figcraft_doc::NodeKind::Ellipse { .. }));
+    // Added on top: the oval's own fill stays under it.
+    assert_eq!(node.fills.len(), original_fill.len() + 1);
+    assert_eq!(node.fills[..original_fill.len()], original_fill[..]);
+    assert!(matches!(node.fills.last().unwrap().kind, figcraft_color::PaintKind::Image(_)));
+    assert_eq!((node.width, node.height), (120.0, 80.0));
+    assert_eq!(w.app.session.selection(), vec![oval]);
+    let png = figcraft_engine::cmd::file::export_bytes(doc, &[oval], figcraft_doc::ExportFormat::Png, 1.0).unwrap();
+    let pixels = image::load_from_memory(&png).unwrap().to_rgba8();
+    assert_eq!(pixels.get_pixel(0, 0)[3], 0, "the picture stays inside the oval");
+    assert_eq!(pixels.get_pixel(60, 40)[3], 255, "the oval contains the picture");
+
+    w.app.session.undo().unwrap();
+    assert_eq!(w.app.session.doc().unwrap().node(oval).unwrap().fills, original_fill);
+}
+
+#[test]
+fn pasting_an_image_keeps_the_other_fills_variables() {
+    let mut w = Win::new();
+    let oval =
+        NodeId(w.app.session.execute("shape.ellipse", &json!({"x": 200, "y": 100, "width": 120, "height": 80})).unwrap()["id"].as_u64().unwrap());
+    w.app.session.execute("variable.createCollection", &json!({"name": "Theme"})).unwrap();
+    w.app.session.execute("variable.create", &json!({"collection": "Theme", "name": "brand", "type": "color", "value": "#FF0000"})).unwrap();
+    w.app.session.execute("variable.bind", &json!({"ids": [oval.0], "field": "fill", "variable": "brand"})).unwrap();
+    assert!(!w.app.session.doc().unwrap().node(oval).unwrap().bound.is_empty());
+
+    w.copy_image_elsewhere();
+    w.cmd_v(CMD);
+    let node = w.app.session.doc().unwrap().node(oval).unwrap();
+    assert!(matches!(node.fills.last().unwrap().kind, figcraft_color::PaintKind::Image(_)));
+    assert!(matches!(node.fills[0].kind, figcraft_color::PaintKind::Solid { .. }));
+    assert!(!node.bound.is_empty(), "the colour fill under the image keeps its variable");
+}
+
+/// An image layer copied in FigCraft pastes as a layer, a selected shape or not.
+#[test]
+fn an_image_layer_copied_in_figcraft_pastes_as_a_layer() {
+    let mut w = Win::new();
+    w.copy_image_elsewhere();
+    w.cmd_v(CMD);
+    let source = w.app.session.selection()[0];
+    crate::menus::invoke(&mut w.app, "edit.copy");
+
+    let oval =
+        NodeId(w.app.session.execute("shape.ellipse", &json!({"x": 200, "y": 100, "width": 120, "height": 80})).unwrap()["id"].as_u64().unwrap());
+    let fills = w.app.session.doc().unwrap().node(oval).unwrap().fills.clone();
+    let before = w.app.session.doc().unwrap().node_count();
+    w.cmd_v(CMD);
+
+    let doc = w.app.session.doc().unwrap();
+    assert_eq!(doc.node_count(), before + 1);
+    assert!(doc.contains(source));
+    assert_eq!(doc.node(oval).unwrap().fills, fills);
+    assert_ne!(w.app.session.selection(), vec![oval]);
+}
+
+#[test]
+fn cmd_released_before_v_still_pastes_the_image() {
+    let mut w = Win::new();
+    w.copy_image_elsewhere();
+    w.cmd_v(Modifiers::NONE);
+    assert_eq!(w.named("Pasted image"), 1);
+}
+
+#[test]
+fn text_pastes_once_from_its_paste_event() {
+    let mut w = Win::new();
+    *w.clip.borrow_mut() = Clip { text: Some("hello from another app".into()), image: None };
+    w.cmd_v(CMD);
+    assert_eq!(w.texts(), 1, "the paste event pasted the text, the release nothing more");
+    assert_eq!(w.rects(), 1);
+}
+
+#[test]
+fn text_pastes_once_when_another_key_is_let_go_first() {
+    let mut w = Win::new();
+    *w.clip.borrow_mut() = Clip { text: Some("hello".into()), image: None };
+    // Cmd+A then Cmd+V typed fast: A comes up after V went down.
+    w.frame(vec![key(Key::A, true, CMD)]);
+    w.frame(vec![Event::Paste("hello".into())]);
+    w.frame(vec![key(Key::A, false, CMD)]);
+    w.frame(vec![key(Key::V, false, CMD)]);
+    w.frame(vec![]);
+    assert_eq!(w.texts(), 1);
+    assert_eq!(w.rects(), 1);
+}
+
+#[test]
+fn a_v_press_consumed_elsewhere_does_not_paste_on_release() {
+    let mut w = Win::new();
+    w.copy_image_elsewhere();
+    w.frame_with(vec![key(Key::V, true, Modifiers::NONE)], true);
+    w.frame(vec![key(Key::V, false, Modifiers::NONE)]);
+    w.frame(vec![]);
+    assert_eq!(w.named("Pasted image"), 0);
+}
+
+#[test]
+fn the_browser_sequence_pastes_once() {
+    let mut w = Win::new();
+    w.copy_image_elsewhere();
+    w.frame(vec![key(Key::V, true, CMD)]);
+    w.frame(vec![key(Key::V, false, CMD)]);
+    w.frame(vec![]);
+    assert_eq!(w.named("Pasted image"), 1);
+}
+
+#[test]
+fn v_alone_pastes_nothing() {
+    let mut w = Win::new();
+    w.copy_image_elsewhere();
+    w.frame(vec![key(Key::V, true, Modifiers::NONE)]);
+    w.frame(vec![key(Key::V, false, Modifiers::NONE)]);
+    assert_eq!(w.named("Pasted image"), 0);
+}
+
+#[test]
+fn a_paste_event_from_another_key_does_not_block_the_next_cmd_v() {
+    let mut w = Win::new();
+    *w.clip.borrow_mut() = Clip { text: Some("text".into()), image: None };
+    // Shift+Insert on Windows.
+    w.frame(vec![Event::Paste("text".into())]);
+    w.frame(vec![key(Key::Insert, false, Modifiers::SHIFT)]);
+    w.app.session.execute("select.none", &json!({})).unwrap();
+    w.copy_image_elsewhere();
+    w.cmd_v(CMD);
+    assert_eq!(w.named("Pasted image"), 1);
+}
+
+#[test]
+fn a_v_press_lost_to_another_window_does_not_block_the_next_cmd_v() {
+    let mut w = Win::new();
+    w.copy_image_elsewhere();
+    w.frame(vec![key(Key::V, true, Modifiers::NONE), Event::WindowFocused(false)]);
+    w.frame(vec![Event::WindowFocused(true)]);
+    w.cmd_v(CMD);
+    assert_eq!(w.named("Pasted image"), 1);
+}
+
+#[test]
+fn v_held_while_the_window_was_away_pastes_nothing_on_release() {
+    let mut w = Win::new();
+    w.copy_image_elsewhere();
+    // Pressed in another window: only the focus and the release arrive here.
+    w.frame(vec![Event::WindowFocused(true)]);
+    w.frame(vec![key(Key::V, false, Modifiers::NONE)]);
+    w.frame(vec![]);
+    assert_eq!(w.named("Pasted image"), 0);
+    w.cmd_v(CMD);
+    assert_eq!(w.named("Pasted image"), 1, "the next Cmd+V still pastes");
+}
+
+#[test]
+fn cmd_v_in_a_panel_field_does_not_paste_on_the_canvas() {
+    let mut w = Win::new();
+    w.copy_image_elsewhere();
+    w.frame(vec![]);
+    w.app.field_focus = true;
+    w.frame(vec![key(Key::V, false, CMD)]);
+    w.frame(vec![]);
+    assert_eq!(w.named("Pasted image"), 0);
+}
+
+#[test]
+fn paste_here_prefers_a_newer_image_over_copied_layers() {
+    let mut w = Win::new();
+    w.app.session.execute("select.all", &json!({})).unwrap();
+    crate::menus::invoke(&mut w.app, "edit.copy");
+    assert!(!w.app.session.clipboard.nodes.is_empty(), "layers copied");
+    w.app.session.execute("select.none", &json!({})).unwrap();
+    w.copy_image_elsewhere();
+    let at = Pos2::new(900.0, 600.0);
+    for pressed in [true, false] {
+        w.frame(vec![
+            Event::PointerMoved(at),
+            Event::PointerButton { pos: at, button: PointerButton::Secondary, pressed, modifiers: Modifiers::NONE },
+        ]);
+    }
+    w.frame(vec![]);
+    let item = crate::live_tests::text_center(&w.shapes, "Paste here");
+    for pressed in [true, false] {
+        w.frame(vec![
+            Event::PointerMoved(item),
+            Event::PointerButton { pos: item, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE },
+        ]);
+    }
+    w.frame(vec![]);
+    assert_eq!(w.named("Pasted image"), 1, "the newer image was pasted");
+    assert_eq!(w.rects(), 1, "not the copied rectangle");
+    let p = w.app.to_page(at);
+    let doc = w.app.session.doc().unwrap();
+    let img = doc.nodes().find(|n| n.name == "Pasted image").unwrap();
+    let b = doc.world_bounds(img.id).unwrap();
+    assert!((b.x0 - p.x).abs() < 0.01 && (b.y0 - p.y).abs() < 0.01, "top-left where the menu opened: {b:?} vs {p:?}");
+}
+
+#[test]
+fn shift_cmd_v_pastes_over_the_selection_whatever_the_clipboard_holds() {
+    for held in HELD {
+        let mut w = Win::new();
+        let (_, b) = w.copy_a_select_b(held);
+        w.chord(CMD.plus(Modifiers::SHIFT));
+        assert_eq!(w.rects_besides(b), [(10, 10), (400, 250)], "{held:?}: A's copy at B's top-left, nothing else");
+        assert_eq!(w.texts(), 0, "{held:?}: no text pasted");
+        assert_eq!(w.named("Pasted image"), 0, "{held:?}: no image pasted");
+    }
+}
+
+#[test]
+fn alt_cmd_v_pastes_properties_whatever_the_clipboard_holds() {
+    for held in HELD {
+        let mut w = Win::new();
+        let (_, b) = w.copy_a_select_b(held);
+        w.chord(CMD.plus(Modifiers::ALT));
+        assert_eq!(w.fill(b), "#E53935", "{held:?}: B took A's fill");
+        assert_eq!(w.rects_besides(b), [(10, 10)], "{held:?}: no layer pasted");
+        assert_eq!(w.texts(), 0, "{held:?}: no text pasted");
+        assert_eq!(w.named("Pasted image"), 0, "{held:?}: no image pasted");
+    }
+}
+
+#[test]
+fn a_chord_let_go_within_one_frame_still_reads_its_modifiers() {
+    let mut w = Win::new();
+    let (_, b) = w.copy_a_select_b(Held::Text);
+    let m = CMD.plus(Modifiers::SHIFT);
+    w.frame(vec![
+        Event::ModifiersChanged(m),
+        Event::Paste("hello from another app".into()),
+        key(Key::V, false, m),
+        Event::ModifiersChanged(Modifiers::NONE),
+    ]);
+    w.frame(vec![]);
+    assert_eq!(w.rects_besides(b), [(10, 10), (400, 250)]);
+    assert_eq!(w.texts(), 0);
+}
+
+#[test]
+fn cmd_let_go_before_v_still_pastes_over() {
+    let mut w = Win::new();
+    let (_, b) = w.copy_a_select_b(Held::Image);
+    w.frame(vec![Event::ModifiersChanged(CMD.plus(Modifiers::SHIFT))]);
+    w.frame(vec![Event::ModifiersChanged(Modifiers::SHIFT)]);
+    w.frame(vec![key(Key::V, false, Modifiers::SHIFT)]);
+    w.frame(vec![Event::ModifiersChanged(Modifiers::NONE)]);
+    assert_eq!(w.rects_besides(b), [(10, 10), (400, 250)], "pasted over, not flipped or a plain paste");
+    assert_eq!(w.named("Pasted image"), 0);
+}
+
+#[test]
+fn a_held_chord_pastes_over_once() {
+    let mut w = Win::new();
+    let (_, b) = w.copy_a_select_b(Held::Text);
+    let m = CMD.plus(Modifiers::SHIFT);
+    w.frame(vec![Event::ModifiersChanged(m)]);
+    // Auto-repeat: egui-winit sends a paste event for every repeated press.
+    for _ in 0..3 {
+        w.frame(vec![Event::Paste("hello from another app".into())]);
+    }
+    w.frame(vec![key(Key::V, false, m)]);
+    w.frame(vec![Event::ModifiersChanged(Modifiers::NONE)]);
+    assert_eq!(w.rects_besides(b), [(10, 10), (400, 250)]);
+    assert_eq!(w.texts(), 0);
+}
+
+#[test]
+fn shift_insert_still_pastes_text() {
+    let mut w = Win::new();
+    let (_, b) = w.copy_a_select_b(Held::Text);
+    w.frame(vec![Event::ModifiersChanged(Modifiers::SHIFT), Event::Paste("hello from another app".into())]);
+    w.frame(vec![key(Key::Insert, false, Modifiers::SHIFT), Event::ModifiersChanged(Modifiers::NONE)]);
+    assert_eq!(w.texts(), 1);
+    assert_eq!(w.rects_besides(b), [(10, 10)]);
+}
+
+#[test]
+fn cmd_v_after_a_paste_chord_is_a_plain_paste_again() {
+    let mut w = Win::new();
+    let (_, b) = w.copy_a_select_b(Held::Text);
+    w.chord(CMD.plus(Modifiers::SHIFT));
+    w.chord(CMD);
+    assert_eq!(w.texts(), 1, "the text was pasted by the plain Cmd+V");
+    assert_eq!(w.rects_besides(b), [(10, 10), (400, 250)], "Shift+Cmd+V pasted over once");
+}
diff --git a/crates/ui-egui/src/pending_open.rs b/crates/ui-egui/src/pending_open.rs
index 63c213ff..c6ade598 100644
--- a/crates/ui-egui/src/pending_open.rs
+++ b/crates/ui-egui/src/pending_open.rs
@@ -1,13 +1,17 @@
 //! Files dropped on the home screen or the canvas open a frame later, behind a card that says what
 //! is happening: opening a large `.fig` blocks the UI thread for a while, and the card is on screen
-//! before it does (rather than a window that freezes without a word).
+//! before it does (rather than a window that freezes without a word). A file with no path to read
+//! (every drop in the browser) waits behind the card until its contents arrive.
+
+use std::sync::Arc;
+use std::task::{Context as TaskContext, Poll, Waker};
 
 use figcraft_doc::NodeId;
-use serde_json::Value;
+use serde_json::{Value, json};
 
-use crate::FigApp;
 use crate::i18n::{tr, trf, trn};
 use crate::theme::{Tokens, semibold};
+use crate::{FigApp, ReadFuture, RepaintWaker};
 
 /// A dropped file waiting to be opened (`file.open`, a document of its own) or imported
 /// (`file.import`, into the current document).
@@ -18,6 +22,8 @@ pub struct PendingOpen {
     pub command: &'static str,
     /// Canvas imports stay with the document and page that received the drop.
     pub target: Option<ImportTarget>,
+    /// The file's contents still on their way; they go into `params` as `data` once read.
+    pub read: Option<ReadFuture>,
 }
 
 pub struct ImportTarget {
@@ -26,10 +32,20 @@ pub struct ImportTarget {
     pub name: String,
 }
 
+/// Queues dropped file `f` to open as a document of its own: by path, or by its contents when there
+/// is no file on disk to read. Callers checked its extension, so there is a name to tell the format by.
+pub(crate) fn open_dropped(app: &mut FigApp, f: &egui::DroppedFileHandle) {
+    let path = f.path();
+    let name = path.file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_default();
+    let (params, read) =
+        if path.exists() { (json!({"path": path.to_string_lossy()}), None) } else { (json!({"name": name}), Some(crate::dropped_bytes(f, &name))) };
+    app.ui.pending_opens.push(PendingOpen { label: name, params, command: "file.open", target: None, read });
+}
+
 fn run_pending(app: &mut FigApp, pending: PendingOpen) -> Option<Value> {
     let target = match pending.target {
         Some(target) => target,
-        None if pending.command != "file.import" => return app.run(pending.command, pending.params),
+        None if pending.command != "file.import" => return app.run_user(pending.command, pending.params),
         None => {
             cancel(app, tr("The destination document is unavailable. Nothing was imported.").to_string());
             return None;
@@ -49,7 +65,7 @@ fn run_pending(app: &mut FigApp, pending: PendingOpen) -> Option<Value> {
     let previous_selection = app.session.docs[index].selection.clone();
     app.session.active = index;
     app.session.docs[index].page = target.page;
-    let result = app.run(pending.command, pending.params);
+    let result = app.run_user(pending.command, pending.params);
     if previous_page != target.page
         && let Some(doc) = app.session.docs.iter_mut().find(|doc| doc.uid == target.uid)
         && doc.doc.pages.contains(&previous_page)
@@ -66,33 +82,83 @@ fn run_pending(app: &mut FigApp, pending: PendingOpen) -> Option<Value> {
 
 /// An import that has no destination left: nothing is imported, and the user is told why.
 fn cancel(app: &mut FigApp, message: String) {
-    app.ui.last_error = Some(message.clone());
-    app.toast(message);
+    app.show_error(message);
 }
 
+/// Space between files dropped together on the canvas.
+const IMPORT_GAP: f64 = 20.0;
+
 /// Frames the card is drawn before the files open: egui lays a new card out invisibly on its first
 /// frame, so the second one is the first the window shows.
 const FRAMES_BEFORE_OPENING: u8 = 2;
 
-/// The card while files wait, then (once it has been on screen) open them. Called before the import
-/// report, so a report for these files shows after them.
+/// Polls the contents still being read: those that arrived go into their file's parameters, files
+/// that couldn't be read are dropped with a message. Whether any are still on their way.
+fn read_contents(app: &mut FigApp, ctx: &egui::Context) -> bool {
+    let waker = Waker::from(Arc::new(RepaintWaker(ctx.clone())));
+    let mut cx = TaskContext::from_waker(&waker);
+    let mut reading = false;
+    let mut unread = Vec::new();
+    app.ui.pending_opens.retain_mut(|pending| {
+        let Some(read) = pending.read.as_mut() else { return true };
+        match read.as_mut().poll(&mut cx) {
+            Poll::Pending => {
+                reading = true;
+                true
+            }
+            Poll::Ready(Ok(bytes)) => {
+                use base64::Engine as _;
+                pending.params["data"] = json!(base64::engine::general_purpose::STANDARD.encode(&bytes));
+                pending.read = None;
+                true
+            }
+            Poll::Ready(Err(why)) => {
+                unread.push(why);
+                false
+            }
+        }
+    });
+    for why in unread {
+        app.show_error(why);
+    }
+    reading
+}
+
+/// The card while files wait, then (once it has been on screen and their contents are read) open
+/// them. Called before the import report, so a report for these files shows after them.
 pub fn pending_opens(app: &mut FigApp, ctx: &egui::Context) {
+    let reading = read_contents(app, ctx);
     if app.ui.pending_opens.is_empty() {
         app.ui.pending_open_frames = 0;
         return;
     }
     ctx.request_repaint();
-    if app.ui.pending_open_frames >= FRAMES_BEFORE_OPENING {
+    if app.ui.pending_open_frames >= FRAMES_BEFORE_OPENING && !reading {
         app.ui.pending_open_frames = 0;
-        for pending in std::mem::take(&mut app.ui.pending_opens) {
+        // Files dropped together land side by side: each starts where the previous one ends.
+        let mut next_x: Option<f64> = None;
+        for mut pending in std::mem::take(&mut app.ui.pending_opens) {
             let command = pending.command;
-            if run_pending(app, pending).is_some() && command == "file.open" {
+            let canvas = command == "file.import" && pending.params.get("x").is_some();
+            if canvas && let Some(x) = next_x {
+                pending.params["x"] = json!(x);
+            }
+            let page = pending.target.as_ref().map(|t| (t.uid, t.page));
+            let result = run_pending(app, pending);
+            if result.is_some() && command == "file.open" {
                 app.ui.home = false;
             }
+            if canvas {
+                let right = result.as_ref().and_then(|r| r.get("id")?.as_u64()).and_then(|id| {
+                    let doc = &app.session.docs.iter().find(|d| Some(d.uid) == page.map(|p| p.0))?.doc;
+                    doc.world_bounds(NodeId(id)).map(|b| b.x1)
+                });
+                next_x = right.map(|r| r + IMPORT_GAP).or(next_x);
+            }
         }
         return;
     }
-    app.ui.pending_open_frames += 1;
+    app.ui.pending_open_frames = app.ui.pending_open_frames.saturating_add(1);
     let title = match app.ui.pending_opens.first().map(|p| p.command) {
         Some("file.import") => {
             let name = app
@@ -109,7 +175,7 @@ pub fn pending_opens(app: &mut FigApp, ctx: &egui::Context) {
     let t = Tokens::get(ctx);
     let pending = &app.ui.pending_opens;
     // Shown at once: the frame after this one may block the window while the file opens.
-    crate::dialogs::window("", ctx).id(egui::Id::new("pending_open")).title_bar(false).movable(false).interactable(false).fade_in(false).show(
+    crate::dialogs::window("", ctx).id(egui::Id::unique("pending_open")).title_bar(false).movable(false).interactable(false).fade_in(false).show(
         ctx,
         |ui| {
             ui.set_width(480.0);
diff --git a/crates/ui-egui/src/perf_tests.rs b/crates/ui-egui/src/perf_tests.rs
index f8f39e93..eba5e68c 100644
--- a/crates/ui-egui/src/perf_tests.rs
+++ b/crates/ui-egui/src/perf_tests.rs
@@ -68,6 +68,8 @@ impl Bench {
     }
 }
 
+/// Build and print a synthetic UI benchmark report for the given layer count; it makes no
+/// assertions.
 fn report(layers: usize) {
     let mut b = Bench::new(layers);
     let mut rows: Vec<(&str, f64)> = Vec::new();
@@ -77,6 +79,7 @@ fn report(layers: usize) {
     rows.push(("hover over the canvas", b.mean(60, |i| pts[i].clone())));
     let wheel = |d: f32| Event::MouseWheel {
         unit: egui::MouseWheelUnit::Point,
+        source: egui::MouseWheelSource::Unknown,
         delta: vec2(0.0, d),
         phase: egui::TouchPhase::Move,
         modifiers: Default::default(),
@@ -179,8 +182,15 @@ fn design_system(icons: usize, instances: usize) -> (Document, figcraft_engine::
     figcraft_engine::synthetic_ds::design_system_with_instances(&spec, instances).unwrap()
 }
 
+/// Build a test mouse-wheel event for the given vertical delta.
 fn wheel(d: f32) -> Event {
-    Event::MouseWheel { unit: egui::MouseWheelUnit::Point, delta: vec2(0.0, d), phase: egui::TouchPhase::Move, modifiers: Default::default() }
+    Event::MouseWheel {
+        unit: egui::MouseWheelUnit::Point,
+        source: egui::MouseWheelSource::Unknown,
+        delta: vec2(0.0, d),
+        phase: egui::TouchPhase::Move,
+        modifiers: Default::default(),
+    }
 }
 
 /// UI frames with a large design system: the Assets panel listing its components and the Design
diff --git a/crates/ui-egui/src/plugin_panel_tests.rs b/crates/ui-egui/src/plugin_panel_tests.rs
index f154c629..53b1ba56 100644
--- a/crates/ui-egui/src/plugin_panel_tests.rs
+++ b/crates/ui-egui/src/plugin_panel_tests.rs
@@ -13,7 +13,7 @@ use crate::layers_drag_tests::Ui;
 
 /// A plugin whose first call shows a panel with every kind of control and whose later calls (the
 /// panel's events) make a rectangle.
-fn panel_module() -> Vec<u8> {
+pub(crate) fn panel_module() -> Vec<u8> {
     let spec = json!({"title": "Test panel", "controls": [
         {"type": "note", "label": "Hello from the plugin"},
         {"type": "number", "name": "size", "label": "Size", "value": 10},
@@ -89,14 +89,18 @@ fn an_open_plugin_panel_draws_no_frames_while_idle() {
     Harness::new(session()).assert_idle("a plugin panel");
 }
 
+/// Asserts a plugin colour field's swatch opens the picker on that field, a picked colour
+/// reaches the plugin, and a second plugin's panel opens while the first remains (two panels
+/// present).
 #[test]
 fn a_colour_field_opens_the_colour_picker_and_two_panels_show_side_by_side() {
     let mut u = Ui::new(session());
     u.ctx.enable_accesskit();
     u.frame(vec![]);
     let nodes = |u: &mut Ui| u.frame_output(vec![]).platform_output.accesskit_update.unwrap().nodes;
-    // The swatch beside a colour field opens the colour picker on it.
-    let swatch = nodes(&mut u).iter().map(|(_, n)| n).find(|n| n.label() == Some("Color")).and_then(|n| n.bounds()).unwrap();
+    // The swatch beside the accent field (named for that field, not just "Color") opens the
+    // colour picker on the plugin field, not on another colour control in the window.
+    let swatch = nodes(&mut u).iter().map(|(_, n)| n).find(|n| n.label() == Some("Accent Color")).and_then(|n| n.bounds()).unwrap();
     let at = Pos2::new(((swatch.x0 + swatch.x1) / 2.0) as f32, ((swatch.y0 + swatch.y1) / 2.0) as f32);
     u.button(at, true);
     u.button(at, false);
diff --git a/crates/ui-egui/src/plugin_save_ui_tests.rs b/crates/ui-egui/src/plugin_save_ui_tests.rs
new file mode 100644
index 00000000..6302e2d2
--- /dev/null
+++ b/crates/ui-egui/src/plugin_save_ui_tests.rs
@@ -0,0 +1,71 @@
+//! A plugin's `dialog.pluginSave` request: the browser downloads the file, a platform with save
+//! dialogs asks the user (and writes nothing when they cancel).
+
+use std::sync::{Arc, Mutex};
+
+use base64::Engine as _;
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::{FigApp, NoServices, Services};
+
+type Downloads = Arc<Mutex<Vec<(String, Vec<u8>)>>>;
+
+/// Services that save by downloads and keep them (`deliver` false: the browser refused).
+struct Browser {
+    got: Downloads,
+    deliver: bool,
+}
+
+impl Services for Browser {
+    fn downloads(&self) -> bool {
+        true
+    }
+    fn download(&mut self, name: &str, bytes: &[u8]) -> bool {
+        self.got.lock().unwrap().push((name.to_string(), bytes.to_vec()));
+        self.deliver
+    }
+}
+
+fn request(app: &mut FigApp, name: &str, data: &str) {
+    app.session.request_ui("dialog.pluginSave", json!({"plugin": "org.test.save", "name": name, "mime": "text/plain", "data": data}));
+    app.handle_ui_requests();
+}
+
+fn toast(app: &FigApp) -> String {
+    app.ui.toast.as_ref().map(|t| t.0.clone()).unwrap_or_default()
+}
+
+fn b64(bytes: &[u8]) -> String {
+    base64::engine::general_purpose::STANDARD.encode(bytes)
+}
+
+#[test]
+fn the_browser_downloads_the_file_with_its_exact_bytes() {
+    let got = Downloads::default();
+    let mut app = FigApp::new(Session::new(), Box::new(Browser { got: got.clone(), deliver: true }));
+    request(&mut app, "out.jsx", &b64(b"\x00hello\xff"));
+    let got = got.lock().unwrap();
+    assert_eq!(got.as_slice(), [("out.jsx".to_string(), b"\x00hello\xff".to_vec())]);
+    assert!(toast(&app).contains("out.jsx"), "{}", toast(&app));
+}
+
+#[test]
+fn a_refused_download_and_broken_data_say_so() {
+    let got = Downloads::default();
+    let mut app = FigApp::new(Session::new(), Box::new(Browser { got: got.clone(), deliver: false }));
+    request(&mut app, "out.jsx", &b64(b"x"));
+    assert_eq!(toast(&app), "Couldn't save the file");
+    app.ui.toast = None;
+    request(&mut app, "out.jsx", "***not base64***");
+    assert_eq!(toast(&app), "Couldn't save the file");
+    assert_eq!(got.lock().unwrap().len(), 1, "broken data is never handed over");
+}
+
+#[test]
+fn a_cancelled_save_dialog_writes_nothing() {
+    // `NoServices` has no downloads and answers the save dialog with "cancelled".
+    let mut app = FigApp::new(Session::new(), Box::new(NoServices));
+    request(&mut app, "out.jsx", &b64(b"x"));
+    assert!(app.ui.toast.is_none());
+}
diff --git a/crates/ui-egui/src/plugins_browse_tests.rs b/crates/ui-egui/src/plugins_browse_tests.rs
index 50585c48..a4a2d6ce 100644
--- a/crates/ui-egui/src/plugins_browse_tests.rs
+++ b/crates/ui-egui/src/plugins_browse_tests.rs
@@ -170,6 +170,11 @@ fn install_asks_first_and_then_installs() {
     for shown in ["read and edit the document", "call only: shape.rectangle", "From ws://127.0.0.1:9/"] {
         assert!(shows(&mut u, shown), "the confirmation shows {shown:?}");
     }
+    // An API 4 plugin may ask to save files: the confirmation says so.
+    let save = "offer files to save";
+    assert!(!shows(&mut u, save));
+    u.app.session.plugins.directory.as_mut().unwrap().entries[0].api = 4;
+    assert!(shows(&mut u, save), "an API 4 plugin's confirmation mentions saving files");
     let confirm = named(&mut u, "Install").into_iter().map(|n| centre(&n)).find(|p| p.distance(row_at) > 4.0).unwrap();
     click(&mut u, confirm);
     assert_eq!(*fetched.lock().unwrap(), 1);
diff --git a/crates/ui-egui/src/present.rs b/crates/ui-egui/src/present.rs
index b5f177af..64a3b70a 100644
--- a/crates/ui-egui/src/present.rs
+++ b/crates/ui-egui/src/present.rs
@@ -4,8 +4,9 @@
 //! The player works on its own copy of the document (interactive components, variables and scroll
 //! offsets change it without touching the user's file) and copies the editor's document again
 //! whenever it changes, so the preview pane follows edits live. On a device, the presented frame
-//! is sized to the device's screen ([`fit_viewport`]): what doesn't fit is clipped, or scrolls when
-//! the frame's overflow allows it. A responsive prototype's frame is instead resized to the screen
+//! is sized to the device's screen ([`fit_viewport`]): a frame bigger than the screen scrolls
+//! through its whole size (as in Figma, with no overflow setting), while content past the frame's
+//! own edges scrolls only as its overflow allows and is otherwise clipped. A responsive prototype's frame is instead resized to the screen
 //! (the device's, else the player's whole area) and laid out again, its constraints and auto layout
 //! responding (`figcraft_engine::cmd::proto::respond`, on the player's copy, from the design each
 //! time). Device bodies are drawn in code in the device's colour. Every frame is rendered through
@@ -25,7 +26,8 @@ use std::sync::Arc;
 use egui::{Align2, Color32, CornerRadius, Id, Pos2, Rect, Sense, Stroke, StrokeKind, Ui, Vec2, pos2, vec2};
 use figcraft_color::{Color, Paint, PaintKind};
 use figcraft_doc::proto::{
-    Action, Device, DeviceColor, Direction, Easing, KeyMods, Overflow, OverlayPosition, PrototypeSettings, ScrollPosition, Transition, Trigger,
+    Action, Device, DeviceColor, Direction, Easing, KeyMods, Overflow, OverlayAnchor, OverlayPosition, PrototypeSettings, ScrollPosition, Transition,
+    Trigger,
 };
 use figcraft_doc::{Document, HConstraint, Node, NodeId, NodeKind, VConstraint};
 use figcraft_geom::{Affine, Point};
@@ -38,6 +40,28 @@ use crate::icons::{self, Icon};
 use crate::theme::{ACCENT, Tokens, regular, semibold};
 use crate::widgets;
 
+mod actions;
+mod chrome;
+mod device;
+mod draw;
+mod input;
+mod layout;
+mod navigate;
+mod player;
+mod scroll;
+mod transition;
+
+#[cfg(test)]
+use chrome::choose_device;
+pub use chrome::{Pane, PresentTab, pane_id, show, show_pane};
+pub use layout::Place;
+#[cfg(test)]
+use layout::{FULL, layout};
+#[cfg(test)]
+use navigate::next_delay;
+pub use scroll::{apply_scroll, fit_viewport, fling_axis, page_settings, raise_fixed, rubber_band, scroll_range, scroll_range_in, viewport};
+pub use transition::{FramePlacement, direction_vec, lerp_transform, match_layers, name_path, overlay_rect, smart_interpolate, transition_frames};
+
 /// A mouse trigger waiting out its delay: interaction `k` of `node`, hit at `rect` while `root`
 /// (the screen or the top overlay) showed; due at `due` on the player's clock.
 #[derive(Clone, Copy, Debug)]
@@ -65,10 +89,12 @@ pub struct OverlayState {
     pub position: OverlayPosition,
     pub close_on_outside: bool,
     pub background: Option<Color>,
-    /// Screen rect of the layer that opened it (manual position).
-    pub anchor: Option<Rect>,
+    /// The layer that opened it, in page units of the presented frame (so it follows the frame
+    /// when the window resizes or the view pans).
+    pub anchor: Option<figcraft_geom::Rect>,
     /// Manual position: the overlay's top-left from the anchor's (page units).
     pub offset: Option<[f64; 2]>,
+    pub anchor_to: OverlayAnchor,
     opened: f64,
     transition: Transition,
     dur: f64,
@@ -120,19 +146,6 @@ struct Fling {
     at: f64,
 }
 
-/// How quickly a fling slows down after a drag (1/s; it travels its speed / decay).
-const DECAY_DRAG: f64 = 2.5;
-/// How quickly the wheel's coast slows down (1/s).
-const DECAY_WHEEL: f64 = 8.0;
-/// Stiffness of the spring that pulls an overscroll back (1/s, critically damped).
-const SPRING: f64 = 16.0;
-/// A fling inside its range stops below this speed (units/s).
-const FLING_STOP: f64 = 6.0;
-/// The wheel coasts on when it was faster than this as it stopped (screen points/s).
-const COAST_MIN: f64 = 40.0;
-/// How far a drag past the end can stretch the content at most (screen points).
-const RUBBER_PTS: f64 = 240.0;
-
 /// How the full-window presenter sizes the prototype.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
 pub enum PresentScale {
@@ -270,6 +283,8 @@ pub struct Presenter {
     anim_tex: Option<egui::TextureHandle>,
     temp: Option<Temp>,
     textures: HashMap<NodeId, FrameTex>,
+    /// Small current-screen preview in the full-window bar, cached until its content changes.
+    bar_thumb: Option<(NodeId, usize, egui::TextureHandle)>,
     arrived: f64,
     delays_fired: HashSet<(NodeId, usize)>,
     /// Mouse triggers waiting out their delay.
@@ -285,6 +300,9 @@ pub struct Presenter {
     /// The layer the Inspect panel shows (the last one under the pointer).
     inspected: Option<NodeId>,
     urls: Vec<String>,
+    /// A link to a website waiting for the viewer to open it ([`link_notice`]), and whether "Don't
+    /// show this again" is ticked.
+    link_notice: Option<(String, bool)>,
     /// The editor's document as last copied (the player copies it again when it changes).
     source: Option<Arc<Document>>,
     /// Scrolling by dragging: what it scrolls and its offset when the drag began.
@@ -316,16 +334,9 @@ pub struct Presenter {
 }
 
 impl Presenter {
-    /// Close the top overlay; it animates out with its opening transition reversed.
-    fn close_overlay(&mut self, now: f64) -> bool {
-        let Some(o) = self.overlays.pop() else { return false };
-        if !matches!(o.transition, Transition::Instant) && o.dur > 0.0 {
-            // An overlay closed mid-opening reverses from where it got to.
-            let shown = ((now - o.opened) / o.dur).clamp(0.0, 1.0);
-            self.closing.push((now - (1.0 - shown) * o.dur, o));
-        }
-        self.hovered.clear();
-        true
+    /// The frame the presentation started from (Restart goes back there).
+    pub fn start(&self) -> NodeId {
+        self.start
     }
 
     pub fn new(start: NodeId) -> Self {
@@ -348,6 +359,7 @@ impl Presenter {
             anim_tex: None,
             temp: None,
             textures: HashMap::new(),
+            bar_thumb: None,
             arrived: -1.0,
             delays_fired: HashSet::new(),
             waiting: Vec::new(),
@@ -359,6 +371,7 @@ impl Presenter {
             clock: 0.0,
             inspected: None,
             urls: Vec::new(),
+            link_notice: None,
             source: None,
             drag_scroll: None,
             view: PresentView::default(),
@@ -390,2613 +403,57 @@ impl Presenter {
         self.stop_scrolling();
     }
 
-    /// The current offset of `t` (a frame's scroll, else the view's pan).
-    fn offset(&self, t: Scroller) -> (f64, f64) {
-        match t {
-            Scroller::Frame(f) => self.scroll.get(&f).copied().unwrap_or((0.0, 0.0)),
-            Scroller::View => self.pan.unwrap_or((self.pan_range.0 / 2.0, 0.0)),
-        }
-    }
-
-    /// How far `t` scrolls (`base`: the player's document without scroll offsets).
-    fn limits(&self, base: &Document, t: Scroller) -> (f64, f64) {
-        match t {
-            Scroller::Frame(f) => self.range(base, f),
-            Scroller::View => self.pan_range,
-        }
-    }
-
-    fn set_offset(&mut self, t: Scroller, v: (f64, f64)) {
-        if !v.0.is_finite() || !v.1.is_finite() {
-            return;
-        }
-        match t {
-            Scroller::Frame(f) => {
-                if self.scroll.get(&f) != Some(&v) {
-                    self.scroll.insert(f, v);
-                    self.rev += 1;
-                }
-            }
-            Scroller::View => self.pan = Some(v),
-        }
-    }
-
-    /// Move a fling on to `now`; true while it is still moving.
-    fn step_fling(&mut self, now: f64) -> bool {
-        let Some(mut f) = self.fling.take() else { return false };
-        let Some(base) = self.doc.as_ref() else { return false };
-        let r = self.limits(base, f.target);
-        let x = self.offset(f.target);
-        let dt = (now - f.at).clamp(0.0, 0.25);
-        f.at = now;
-        let (nx, vx, done_x) = fling_axis(x.0, f.vel.0, r.0, dt, f.decay, f.bounce);
-        let (ny, vy, done_y) = fling_axis(x.1, f.vel.1, r.1, dt, f.decay, f.bounce);
-        self.set_offset(f.target, (nx, ny));
-        f.vel = (vx, vy);
-        if done_x && done_y {
-            return false;
-        }
-        self.fling = Some(f);
-        true
-    }
-
-    /// Follow the editor's document: copy it the first time and whenever it changed, keeping the
-    /// screen, the overlays and the scroll offsets that still exist (a deleted screen goes back to
-    /// the start). Runtime state (variables set, variants changed) starts over from the edit.
-    pub fn sync(&mut self, doc: &Arc<Document>, now: f64) {
-        if self.source.as_ref().is_some_and(|s| Arc::ptr_eq(s, doc)) {
-            return;
-        }
-        let first = self.source.is_none();
-        self.source = Some(doc.clone());
-        let copy = Document::clone(doc);
-        self.original = Some(copy.clone());
-        self.design = Some(copy);
-        self.relayout();
-        if first {
-            self.arrived = now;
-            return;
-        }
-        if !doc.contains(self.current) {
-            if doc.contains(self.start) {
-                self.restart(self.start, now);
-            }
-            return;
-        }
-        self.history.retain(|v| doc.contains(v.frame));
-        self.overlays.retain(|o| doc.contains(o.id));
-        self.closing.retain(|(_, o)| doc.contains(o.id));
-        // These hold states of the document before the edit.
-        self.temp = None;
-        self.anim = None;
-        self.scroll_anim = None;
-        self.stop_scrolling();
-        self.scroll.retain(|f, _| doc.contains(*f));
-        if let Some(laid) = self.doc.as_ref() {
-            let clamped: Vec<(NodeId, (f64, f64))> = self.scroll.iter().map(|(f, s)| (*f, clamp_scroll(*s, self.range(laid, *f)))).collect();
-            self.scroll.extend(clamped);
-        }
-        self.rev += 1;
-    }
-
-    /// Lay the document out for the screen: `design` with the presented frame resized to `fit`
-    /// when the prototype is responsive (its constraints and auto layout respond), instances
-    /// playing their variants' interactions and fixed layers on top.
-    fn relayout(&mut self) {
-        let mut d = self.design.clone();
-        if let Some(d) = d.as_mut() {
-            if let Some(size) = self.fit {
-                figcraft_engine::cmd::proto::respond(d, self.current, size);
-            }
-            figcraft_engine::proto_run::play_interactions(d);
-            raise_fixed(d);
-        }
-        self.uses_pads = d.as_ref().is_some_and(figcraft_doc::proto::uses_gamepad);
-        self.doc = d;
-        self.rev += 1;
-    }
-
-    /// Responsive prototypes: resize the presented frame to a screen of `size` (None: frames
-    /// keep their size). Lays out again only when it changes.
-    fn respond_to(&mut self, size: Option<(f64, f64)>) {
-        if self.fit != size {
-            self.fit = size;
-            self.relayout();
-        }
-    }
-
-    /// The player's document with scroll offsets applied and the presented frame sized to the
-    /// device's screen (cached per revision).
-    fn display(&mut self) -> Option<Document> {
-        if let Some((r, d)) = &self.display
-            && *r == self.rev
-        {
-            return Some(d.clone());
-        }
-        let doc = self.doc.as_ref()?;
-        let mut d = apply_scroll(doc, &self.scroll);
-        if let Some(vp) = viewport(doc, self.current) {
-            fit_viewport(&mut d, self.current, vp);
-        }
-        self.display = Some((self.rev, d.clone()));
-        Some(d)
-    }
-
-    /// How far `frame` scrolls (in `doc`, without scroll offsets): the presented frame within the
-    /// device's screen, other frames within themselves.
-    fn range(&self, doc: &Document, frame: NodeId) -> (f64, f64) {
-        let vp = if frame == self.current { viewport(doc, frame) } else { None };
-        scroll_range_in(doc, frame, vp)
-    }
-
-    /// What "Scroll to" `dest` moves: every scrolling frame around it, innermost first, brings the
-    /// layer (then the frame holding it) to its top-left as far as it can scroll, the innermost
-    /// `offset` short of it. Each entry is (frame, offset now, offset after).
-    fn scroll_to_layer(&self, doc: &Document, dest: NodeId, offset: [f64; 2]) -> Vec<ScrollMove> {
-        let mut out = Vec::new();
-        let mut target = dest;
-        // The innermost scrolling frame leaves `offset` before the layer.
-        let mut off = offset.map(|v| if v.is_finite() { v } else { 0.0 });
-        for f in doc.ancestors(dest) {
-            let (rx, ry) = self.range(doc, f);
-            let Some(tn) = doc.node(target) else { break };
-            if rx <= 0.0 && ry <= 0.0 {
-                continue;
-            }
-            let rel = doc.world_transform(f).inverse() * doc.world_transform(target);
-            let b = figcraft_geom::transform_rect_bbox(rel, tn.local_rect());
-            let from = self.scroll.get(&f).copied().unwrap_or((0.0, 0.0));
-            let to = clamp_scroll((if rx > 0.0 { b.x0 - off[0] } else { from.0 }, if ry > 0.0 { b.y0 - off[1] } else { from.1 }), (rx, ry));
-            out.push((f, from, to));
-            target = f;
-            off = [0.0, 0.0];
-        }
-        out
-    }
-
-    /// Scroll the presented frame to `(x, y)` (page units, clamped to what it can scroll).
-    pub fn scroll_to(&mut self, x: f64, y: f64) {
-        let Some(doc) = self.doc.as_ref() else { return };
-        if !x.is_finite() || !y.is_finite() {
-            return;
-        }
-        let to = clamp_scroll((x, y), self.range(doc, self.current));
-        self.scroll.insert(self.current, to);
-        self.scroll_anim = None;
-        self.stop_scrolling();
-        self.rev += 1;
-    }
-
-    /// The player's state for `ui.inspect`.
-    pub fn inspect(&self) -> Value {
-        let doc = self.doc.as_ref();
-        let pan = self.offset(Scroller::View);
-        json!({
-            "current": self.current,
-            "name": doc.and_then(|d| d.node(self.current)).map(|n| n.name.as_str()),
-            "start": self.start,
-            "history": self.history.iter().map(|v| v.frame).collect::<Vec<_>>(),
-            "overlays": self.overlays.iter().map(|o| o.id).collect::<Vec<_>>(),
-            "scroll": self.scroll.get(&self.current).map_or([0.0, 0.0], |s| [s.0, s.1]),
-            "scrollRange": doc.map(|d| { let r = self.range(d, self.current); [r.0, r.1] }),
-            "device": doc.and_then(|d| page_settings(d, self.current).device()).map(|d| d.name),
-            "landscape": doc.is_some_and(|d| page_settings(d, self.current).landscape()),
-            "viewport": doc.and_then(|d| viewport(d, self.current)).map(|v| [v.0, v.1]),
-            "scale": self.view.scale.id(),
-            "deviceFrame": self.view.device_frame,
-            "comments": self.view.comments,
-            "hotspotHints": self.view.hotspot_hints,
-            "hotspots": self.hot.iter().map(|(id, r)| json!({"id": id, "rect": [r.min.x, r.min.y, r.max.x, r.max.y]})).collect::<Vec<_>>(),
-            "hotspotFlash": self.flash_until > self.clock,
-            "waiting": self.waiting.len(),
-            "inspect": self.view.inspect,
-            "inspected": self.inspected,
-            "deviceColor": doc.and_then(|d| page_settings(d, self.current).device_color()).map(|c| c.name),
-            "responsive": self.fit.map(|f| [f.0, f.1]),
-            "frameSize": doc.and_then(|d| d.node(self.current)).map(|n| [n.width, n.height]),
-            "pan": [pan.0, pan.1],
-            "panRange": [self.pan_range.0, self.pan_range.1],
-            "zoom": self.zoom,
-            "flinging": self.fling.is_some(),
-            "gamepad": self.uses_pads,
-        })
-    }
-
-    fn snapshot(&self) -> Option<Snapshot> {
-        Some(Snapshot {
-            current: self.current,
-            doc: self.design.clone()?,
-            overlays: self.overlays.clone(),
-            history: self.history.clone(),
-            scroll: self.scroll.clone(),
-        })
-    }
-
-    /// Start a transition from the state as it is now; call before changing the state.
-    fn begin(&mut self, transition: Transition, dur: f64, easing: Easing, now: f64) {
-        let Some(from_doc) = self.display() else { return };
-        let from_tex = self.textures.get(&self.current).cloned();
-        self.anim = if matches!(transition, Transition::Instant) || dur <= 0.0 {
-            None
-        } else {
-            Some(Anim { from_doc, from_frame: self.current, from_tex, transition, start: now, dur, easing, follow: None })
-        };
-    }
-
-    fn arrive(&mut self, now: f64) {
-        if let Some(doc) = self.doc.as_ref() {
-            figcraft_engine::proto_run::remember_sections(doc, self.current, &mut self.sections);
-        }
-        self.arrived = now;
-        self.delays_fired.clear();
-        self.waiting.clear();
-        self.hovered.clear();
-        self.rev += 1;
-    }
-
-    /// Show `frame`. It starts scrolled to the top unless `preserve` keeps the scroll position of
-    /// the frame being left (as far as `frame` can scroll).
-    fn go(&mut self, frame: NodeId, transition: Transition, dur: f64, easing: Easing, now: f64, remember: bool, preserve: bool) {
-        self.begin(transition, dur, easing, now);
-        if remember {
-            self.history.push(Visit { frame: self.current, transition, dur, easing });
-        }
-        let kept = self.scroll.get(&self.current).copied().filter(|_| preserve);
-        self.overlays.clear();
+    /// A new device changes the viewport and may relayout every frame. Start at its top instead
+    /// of carrying scroll offsets or a drag from the old screen into the new one.
+    fn reset_for_device(&mut self) {
+        self.pan = None;
         self.scroll.clear();
         self.scroll_anim = None;
+        self.press = None;
+        self.dragged = false;
         self.stop_scrolling();
-        self.pan = None;
-        self.temp = None;
-        self.current = frame;
-        self.relayout();
-        if let Some(s) = kept
-            && let Some(doc) = self.doc.as_ref()
-        {
-            let to = clamp_scroll(s, self.range(doc, frame));
-            self.scroll.insert(frame, to);
-        }
-        self.arrive(now);
-    }
-
-    /// Start over at `start` with the document as the editor has it.
-    pub fn restart(&mut self, start: NodeId, now: f64) {
-        self.start = start;
-        self.current = start;
-        self.sections.clear();
-        self.history.clear();
-        self.overlays.clear();
-        self.scroll.clear();
-        self.scroll_anim = None;
-        self.stop_scrolling();
-        self.pan = None;
-        self.anim = None;
-        self.temp = None;
-        self.design = self.original.clone();
-        self.relayout();
-        self.arrive(now);
-    }
-
-    fn revert(&mut self, now: f64) {
-        let Some(t) = self.temp.take() else { return };
-        self.begin(t.transition.reversed(), t.dur, t.easing, now);
-        self.current = t.snap.current;
-        self.design = Some(t.snap.doc);
-        self.relayout();
-        self.overlays = t.snap.overlays;
-        self.history = t.snap.history;
-        self.scroll = t.snap.scroll;
-        self.stop_scrolling();
-        self.hovered.clear();
         self.rev += 1;
     }
 
-    /// A mouse enter, leave, down or up on `node` (shown on `root`) met its interaction `k`: its
-    /// actions run now, or after its delay while `root` is still what shows (again once only
-    /// while it waits).
-    fn gesture(&mut self, node: NodeId, k: usize, rect: Option<Rect>, now: f64, root: NodeId) -> bool {
-        let delay = self.doc.as_ref().and_then(|d| d.node(node)).and_then(|n| n.interactions.get(k)).map_or(0.0, |it| it.delay_secs());
-        if delay <= 0.0 {
-            return self.fire(node, k, rect, now);
-        }
-        if !self.waiting.iter().any(|w| (w.node, w.k) == (node, k)) {
-            self.waiting.push(Waiting { node, k, rect, root, due: now + delay });
-        }
-        false
-    }
-
-    /// Run the delayed mouse triggers that are due (those whose screen or overlay went away are
-    /// dropped). True when one changed what shows.
-    fn fire_waiting(&mut self, root: NodeId, now: f64) -> bool {
-        let (due, later): (Vec<Waiting>, Vec<Waiting>) = std::mem::take(&mut self.waiting).into_iter().partition(|w| w.due <= now);
-        self.waiting = later;
-        self.waiting.retain(|w| w.root == root);
-        let mut did = false;
-        for w in due.into_iter().filter(|w| w.root == root) {
-            // An earlier one may have left the screen: the rest are dropped with it.
-            did = did || self.fire(w.node, w.k, w.rect, now);
-        }
-        did
-    }
-
-    /// Run the actions of interaction `k` on `node`. `rect` is the layer's screen rect.
-    fn fire(&mut self, node: NodeId, k: usize, rect: Option<Rect>, now: f64) -> bool {
-        let Some(it) = self.doc.as_ref().and_then(|d| d.node(node)).and_then(|n| n.interactions.get(k)).cloned() else { return false };
-        let dur = it.easing.seconds(it.duration_ms);
-        let temp = match it.trigger {
-            Trigger::OnHover => Some(false),
-            Trigger::OnPress => Some(true),
-            _ => None,
-        };
-        let snap = if temp.is_some() && self.temp.is_none() { self.snapshot() } else { None };
-        let mut did = false;
-        for a in &it.actions {
-            did |= self.perform(a, node, it.transition, dur, it.easing, rect, now);
-        }
-        if did && let (Some(press), Some(snap), Some(rect)) = (temp, snap, rect) {
-            self.temp = Some(Temp { rect, press, snap, transition: it.transition, dur, easing: it.easing });
-        }
-        did
-    }
-
-    /// Run the widget clicks the player took: each calls its plugin back on the player's copy (the
-    /// prototype's own state of the widget), as on the canvas but without touching the file.
-    /// Returns what went wrong, for a toast.
-    pub fn click_widgets(&mut self, s: &figcraft_engine::Session) -> Option<String> {
-        let mut error = None;
-        for (id, target) in std::mem::take(&mut self.widget_clicks) {
-            let Some(doc) = self.design.clone() else { break };
-            match figcraft_engine::widgets::click_on(s, doc, id, &target) {
-                Ok((d, _)) => {
-                    self.design = Some(d);
-                    self.relayout();
-                }
-                Err(e) => error = Some(e.to_string()),
-            }
-        }
-        error
-    }
-
-    fn perform(&mut self, a: &Action, node: NodeId, tr: Transition, dur: f64, easing: Easing, rect: Option<Rect>, now: f64) -> bool {
-        self.perform_at(a, node, tr, dur, easing, rect, now, 0)
-    }
-
-    /// One action; `depth` counts the conditional actions it is inside.
-    #[allow(clippy::too_many_arguments)]
-    fn perform_at(&mut self, a: &Action, node: NodeId, tr: Transition, dur: f64, easing: Easing, rect: Option<Rect>, now: f64, depth: usize) -> bool {
-        let Some(doc) = self.doc.clone() else { return false };
-        match a {
-            Action::Navigate { dest, preserve_scroll } => {
-                let Some(top) = figcraft_engine::proto_run::navigate_target(&doc, *dest, &self.sections) else { return false };
-                if !doc.contains(top) || (top == self.current && self.overlays.is_empty()) {
-                    return false;
-                }
-                self.go(top, tr, dur, easing, now, true, *preserve_scroll);
-                true
-            }
-            Action::Back => {
-                if self.close_overlay(now) {
-                    return true;
-                }
-                match self.history.pop() {
-                    Some(v) => {
-                        self.go(v.frame, v.transition.reversed(), v.dur, v.easing, now, false, false);
-                        true
-                    }
-                    None => false,
-                }
-            }
-            Action::ScrollTo { dest, offset } => {
-                let frames = self.scroll_to_layer(&doc, *dest, *offset);
-                if frames.is_empty() {
-                    return false;
-                }
-                if matches!(tr, Transition::Instant) || dur <= 0.0 {
-                    self.scroll.extend(frames.iter().map(|(f, _, to)| (*f, *to)));
-                    self.rev += 1;
-                } else {
-                    self.scroll_anim = Some(ScrollAnim { frames, start: now, dur, easing });
-                }
-                true
-            }
-            Action::OpenOverlay { dest, position, close_on_outside, background, offset } => {
-                if !doc.contains(*dest) {
-                    return false;
-                }
-                self.delays_fired.retain(|(id, _)| !doc.is_ancestor(*dest, *id));
-                self.overlays.push(OverlayState {
-                    id: *dest,
-                    position: *position,
-                    close_on_outside: *close_on_outside,
-                    background: *background,
-                    anchor: rect,
-                    offset: *offset,
-                    opened: now,
-                    transition: tr,
-                    dur,
-                    easing,
-                });
-                self.hovered.clear();
-                true
-            }
-            Action::SwapOverlay { dest } => {
-                if !doc.contains(*dest) {
-                    return false;
-                }
-                self.delays_fired.retain(|(id, _)| !doc.is_ancestor(*dest, *id));
-                match self.overlays.last_mut() {
-                    Some(o) => {
-                        o.id = *dest;
-                        o.opened = now;
-                        o.transition = tr;
-                        o.dur = dur;
-                        o.easing = easing;
-                    }
-                    None => self.overlays.push(OverlayState {
-                        id: *dest,
-                        position: OverlayPosition::Center,
-                        close_on_outside: true,
-                        background: None,
-                        anchor: rect,
-                        offset: None,
-                        opened: now,
-                        transition: tr,
-                        dur,
-                        easing,
-                    }),
-                }
-                self.hovered.clear();
-                true
-            }
-            Action::CloseOverlay => self.close_overlay(now),
-            Action::OpenUrl { url } => {
-                if !url.trim().is_empty() {
-                    self.urls.push(url.clone());
-                }
-                true
-            }
-            Action::ChangeTo { dest } => {
-                let Some(inst) = figcraft_engine::proto_run::change_to_target(&doc, node, *dest) else { return false };
-                if !doc.contains(*dest) {
-                    return false;
-                }
-                self.begin(tr, dur, easing, now);
-                let Some(d) = self.design.as_mut() else { return false };
-                if let Some(n) = d.node_mut(inst)
-                    && let NodeKind::Instance { component, .. } = &mut n.kind
-                {
-                    *component = *dest;
-                }
-                figcraft_engine::components::sync_instance(d, inst);
-                self.relayout();
-                true
-            }
-            Action::SetVariable { variable, value, expr } => {
-                let Some(d) = self.design.as_mut() else { return false };
-                let set = figcraft_engine::proto_run::set_variable(d, node, variable, value, expr.as_ref());
-                if set {
-                    self.relayout();
-                }
-                set
-            }
-            Action::SetVariableMode { collection, mode } => {
-                let Some(d) = self.design.as_mut() else { return false };
-                let set = figcraft_engine::proto_run::set_mode(d, self.current, collection, mode);
-                if set {
-                    self.relayout();
-                }
-                set
-            }
-            Action::Conditional { blocks } => {
-                if depth >= figcraft_doc::proto::MAX_ACTION_DEPTH {
-                    return false;
-                }
-                // Evaluated now: earlier actions of the interaction may have changed variables.
-                let mut did = false;
-                for inner in figcraft_engine::proto_run::branch(&doc, node, blocks) {
-                    did |= self.perform_at(&inner, node, tr, dur, easing, rect, now, depth + 1);
-                }
-                did
-            }
-        }
-    }
-
-    fn texture(&mut self, ctx: &egui::Context, doc: &Document, id: NodeId, px_scale: f64, now: f64) -> Option<FrameTex> {
-        // Animated GIFs play from when the frame arrived: a new texture when one of them moves on,
-        // and a wake-up for that moment (nothing else draws frames while it shows). egui wakes a
-        // display frame before the time asked for, a little earlier still at times: ask that much
-        // later, and count a frame due within a few milliseconds as due.
-        let t = (now - self.arrived).max(0.0) + 0.005;
-        let clock = figcraft_render::images::animation_clock(doc, id, t);
-        if let Some((_, next)) = clock {
-            crate::repaint_in(ctx, next + f64::from(ctx.input(|i| i.predicted_dt)));
-        }
-        let key = (self.rev, px_scale.to_bits(), clock.map_or(0, |c| c.0));
-        if let Some(t) = self.textures.get(&id)
-            && t.key == key
-        {
-            return Some(t.clone());
-        }
-        let bounds = figcraft_render::export_bounds(doc, id)?;
-        let pix = figcraft_render::render_node_at(doc, id, texture_scale(ctx, bounds, px_scale), t)?;
-        let img = crate::render_worker::screen_image(&pix, doc.color_profile);
-        let tex = ctx.load_texture(format!("present-{}", id.0), img, egui::TextureOptions::LINEAR);
-        let ft = FrameTex { key, tex, bounds };
-        self.textures.insert(id, ft.clone());
-        Some(ft)
+    /// Screen rect `r` in page units of the frame shown last.
+    fn page_rect(&self, r: Option<Rect>) -> Option<figcraft_geom::Rect> {
+        let (r, (_, place, _)) = (r?, self.shown?);
+        let (a, b) = (place.page(r.min), place.page(r.max));
+        Some(figcraft_geom::Rect::new(a.x, a.y, b.x, b.y))
     }
 }
 
-/// The most pixels a presented frame's texture holds (bigger prototypes, at 100% or filling the
-/// window, are drawn from a smaller texture scaled up).
-const MAX_TEXTURE_PIXELS: f64 = 16_777_216.0;
-
-/// The pixel scale, at most `px`, at which `bounds` makes a texture the GPU takes (no side past
-/// its limit) of at most [`MAX_TEXTURE_PIXELS`].
-fn texture_scale(ctx: &egui::Context, bounds: figcraft_geom::Rect, px: f64) -> f64 {
-    let side = ctx.input(|i| i.max_texture_side) as f64 - 2.0;
-    let (w, h) = (bounds.width().max(1.0), bounds.height().max(1.0));
-    let s = px.min(side / w.max(h)).min((MAX_TEXTURE_PIXELS / (w * h)).sqrt());
-    if s.is_finite() && s > 0.0 { s } else { 1e-3 }
-}
-
-/// Page → screen mapping for one presented frame.
-#[derive(Clone, Copy, Debug)]
-pub struct Place {
-    pub page_min: (f64, f64),
-    pub origin: Pos2,
-    pub scale: f64,
-}
-
-impl Place {
-    fn centered(fb: figcraft_geom::Rect, center: Pos2, scale: f64) -> Self {
-        let size = vec2((fb.width() * scale) as f32, (fb.height() * scale) as f32);
-        Place { page_min: (fb.x0, fb.y0), origin: center - size / 2.0, scale }
-    }
-    pub fn pt(&self, x: f64, y: f64) -> Pos2 {
-        pos2(self.origin.x + ((x - self.page_min.0) * self.scale) as f32, self.origin.y + ((y - self.page_min.1) * self.scale) as f32)
-    }
-    pub fn rect(&self, r: figcraft_geom::Rect) -> Rect {
-        Rect::from_min_max(self.pt(r.x0, r.y0), self.pt(r.x1, r.y1))
-    }
-    /// The page point under screen point `q`.
-    pub fn page(&self, q: Pos2) -> Point {
-        Point::new(self.page_min.0 + f64::from(q.x - self.origin.x) / self.scale, self.page_min.1 + f64::from(q.y - self.origin.y) / self.scale)
-    }
-}
-
-// ---------------------------------------------------------------------------------------------
-// Pure prototype logic (tested below).
-
-/// Layer names from below `root` down to `id`, joined (the smart-animate matching key).
-pub fn name_path(doc: &Document, root: NodeId, id: NodeId) -> Option<String> {
-    let mut parts: Vec<&str> = Vec::new();
-    let mut cur = id;
-    for _ in 0..1024 {
-        if cur == root {
-            parts.reverse();
-            return Some(parts.join("\u{1f}"));
-        }
-        let n = doc.node(cur)?;
-        parts.push(n.name.as_str());
-        cur = n.parent?;
-    }
-    None
-}
-
-/// Smart-animate pairs `(from layer, to layer)`: same name path below the two roots; repeated
-/// paths pair up in layer order.
-pub fn match_layers(from: &Document, from_root: NodeId, to: &Document, to_root: NodeId) -> Vec<(NodeId, NodeId)> {
-    let mut pool: HashMap<String, VecDeque<NodeId>> = HashMap::new();
-    for id in from.subtree(from_root).into_iter().skip(1) {
-        if let Some(p) = name_path(from, from_root, id) {
-            pool.entry(p).or_default().push_back(id);
-        }
-    }
-    let mut out = Vec::new();
-    for id in to.subtree(to_root).into_iter().skip(1) {
-        if let Some(p) = name_path(to, to_root, id)
-            && let Some(q) = pool.get_mut(&p)
-            && let Some(f) = q.pop_front()
-        {
-            out.push((f, id));
-        }
-    }
-    out
-}
-
-fn lerp(a: f64, b: f64, t: f64) -> f64 {
-    a + (b - a) * t
-}
-
-/// Centre, rotation and scale of a node box `(w, h)` placed by `m`.
-fn decompose(m: Affine, (w, h): (f64, f64)) -> Option<[f64; 5]> {
-    let [a, b, c, d, _, _] = m.as_coeffs();
-    let sx = a.hypot(b);
-    if !sx.is_finite() || sx < 1e-9 {
-        return None;
-    }
-    let sy = (a * d - b * c) / sx;
-    let ctr = m * Point::new(w / 2.0, h / 2.0);
-    Some([ctr.x, ctr.y, b.atan2(a), sx, sy])
-}
-
-/// Interpolate two placements of a box: centre, rotation (shortest way round) and scale; the box
-/// size is `size` (already interpolated).
-pub fn lerp_transform(a: Affine, sa: (f64, f64), b: Affine, sb: (f64, f64), size: (f64, f64), t: f64) -> Affine {
-    match (decompose(a, sa), decompose(b, sb)) {
-        (Some(x), Some(y)) if (x[4] < 0.0) == (y[4] < 0.0) => {
-            let mut da = y[2] - x[2];
-            while da > std::f64::consts::PI {
-                da -= std::f64::consts::TAU;
-            }
-            while da < -std::f64::consts::PI {
-                da += std::f64::consts::TAU;
-            }
-            let (cx, cy) = (lerp(x[0], y[0], t), lerp(x[1], y[1], t));
-            let ang = x[2] + da * t;
-            let (sx, sy) = (lerp(x[3], y[3], t), lerp(x[4], y[4], t));
-            Affine::translate((cx, cy)) * Affine::rotate(ang) * Affine::scale_non_uniform(sx, sy) * Affine::translate((-size.0 / 2.0, -size.1 / 2.0))
-        }
-        _ => {
-            if t < 0.5 {
-                a
-            } else {
-                b
-            }
-        }
-    }
-}
-
-fn lerp_paints(from: &[Paint], to: &mut [Paint], t: f64) {
-    for (f, p) in from.iter().zip(to.iter_mut()) {
-        if let (PaintKind::Solid { color: fc }, PaintKind::Solid { color: tc }) = (&f.kind, &mut p.kind) {
-            *tc = fc.lerp(*tc, t.clamp(0.0, 1.0) as f32);
-            p.opacity = lerp(f64::from(f.opacity), f64::from(p.opacity), t.clamp(0.0, 1.0)) as f32;
-        }
-    }
-}
-
-/// The document as it looks at eased progress `t` of a smart-animate transition from
-/// `from_root` (in `from`) to `to_root` (in `to`): matched layers tween position, size, rotation,
-/// opacity, corner radius and solid fill colours; layers only in the destination fade in and
-/// layers only in the source are copied in and fade out. Render `to_root` of the result.
-pub fn smart_interpolate(from: &Document, from_root: NodeId, to: &Document, to_root: NodeId, t: f64) -> Document {
-    let mut out = to.clone();
-    // Springs and back easings go past 1 before they settle: matched layers overshoot too.
-    if !t.is_finite() || t == 1.0 {
-        return out;
-    }
-    let t = t.max(-1.0);
-    let fade = t.clamp(0.0, 1.0);
-    let pairs = match_layers(from, from_root, to, to_root);
-    let src_of: HashMap<NodeId, NodeId> = pairs.iter().map(|(f, d)| (*d, *f)).collect();
-    let dst_of: HashMap<NodeId, NodeId> = pairs.iter().copied().collect();
-    let fw_inv = from.world_transform(from_root).inverse();
-    let tw_inv = to.world_transform(to_root).inverse();
-    if let (Some(fr), Some(m)) = (from.node(from_root), out.node_mut(to_root)) {
-        lerp_paints(&fr.fills, &mut m.fills, t);
-    }
-    let mut interp: HashMap<NodeId, Affine> = HashMap::new();
-    interp.insert(to_root, Affine::IDENTITY);
-    let mut faded: HashSet<NodeId> = HashSet::new();
-    for id in to.subtree(to_root).into_iter().skip(1) {
-        let Some(n) = to.node(id) else { continue };
-        let parent = n.parent.unwrap_or(to_root);
-        let p_interp = interp.get(&parent).copied().unwrap_or(Affine::IDENTITY);
-        match src_of.get(&id).and_then(|s| from.node(*s).map(|sn| (*s, sn))) {
-            Some((s, sn)) => {
-                let rel_s = fw_inv * from.world_transform(s);
-                let rel_d = tw_inv * to.world_transform(id);
-                let (w, h) = (lerp(sn.width, n.width, t).max(0.0), lerp(sn.height, n.height, t).max(0.0));
-                let xf = lerp_transform(rel_s, (sn.width, sn.height), rel_d, (n.width, n.height), (w, h), t);
-                interp.insert(id, xf);
-                if let Some(m) = out.node_mut(id) {
-                    m.width = w;
-                    m.height = h;
-                    m.transform = p_interp.inverse() * xf;
-                    m.opacity = lerp(f64::from(sn.opacity), f64::from(n.opacity), fade) as f32;
-                    for (r, (a, b)) in m.corners.radii.iter_mut().zip(sn.corners.radii.iter().zip(n.corners.radii.iter())) {
-                        *r = lerp(*a, *b, t).max(0.0);
-                    }
-                    lerp_paints(&sn.fills, &mut m.fills, t);
-                    lerp_paints(&sn.strokes, &mut m.strokes, t);
-                }
-            }
-            None => {
-                interp.insert(id, p_interp * n.transform);
-                if !faded.contains(&parent)
-                    && let Some(m) = out.node_mut(id)
-                {
-                    m.opacity *= fade as f32;
-                }
-                faded.insert(id);
-            }
-        }
-    }
-    // Layers only in the source: copy the top-most ones in, fading out.
-    let tops: Vec<NodeId> = from
-        .subtree(from_root)
-        .into_iter()
-        .skip(1)
-        .filter(|id| !dst_of.contains_key(id))
-        .filter(|id| from.node(*id).and_then(|n| n.parent).is_some_and(|p| p == from_root || dst_of.contains_key(&p)))
-        .collect();
-    for id in tops {
-        let Some(n) = from.node(id) else { continue };
-        let pf = n.parent.unwrap_or(from_root);
-        let matched_parent = dst_of.get(&pf).copied().filter(|p| out.node(*p).is_some_and(|pn| pn.kind.is_container()));
-        let (parent, local) = match matched_parent {
-            Some(p) if pf != from_root => (p, n.transform),
-            _ => (to_root, fw_inv * from.world_transform(id)),
-        };
-        let nodes: Vec<Node> = from.subtree(id).into_iter().filter_map(|i| from.node(i).cloned()).collect();
-        let mut map = BTreeMap::new();
-        for nn in &nodes {
-            map.insert(nn.id, out.alloc_id());
-        }
-        let index = from.index_in_parent(id);
-        if let Ok(new) = out.paste_nodes(&nodes, &map, id, parent, index)
-            && let Some(m) = out.node_mut(new)
-        {
-            m.transform = local;
-            m.opacity *= (1.0 - fade) as f32;
-        }
-    }
-    out
-}
-
-/// How far `frame`'s content can scroll `(x, y)` (0 when it doesn't overflow or doesn't scroll).
-pub fn scroll_range(doc: &Document, frame: NodeId) -> (f64, f64) {
-    scroll_range_in(doc, frame, None)
-}
-
-/// How far `frame`'s content can scroll when `viewport` (page units, from its top-left) of it
-/// shows, as a device's screen shows a top-level frame: the frame itself is content then, so a
-/// frame taller than the screen scrolls through its whole height. Without a viewport the frame
-/// shows at its own size and what overflows it scrolls. Only the axes its overflow allows scroll.
-pub fn scroll_range_in(doc: &Document, frame: NodeId, viewport: Option<(f64, f64)>) -> (f64, f64) {
-    let Some(n) = doc.node(frame) else { return (0.0, 0.0) };
-    if n.overflow == Overflow::None {
-        return (0.0, 0.0);
-    }
-    let (mut x1, mut y1) = (0.0f64, 0.0f64);
-    for c in &n.children {
-        let Some(cn) = doc.node(*c) else { continue };
-        if !cn.visible || cn.scroll_position == ScrollPosition::Fixed {
-            continue;
-        }
-        let b = figcraft_geom::transform_rect_bbox(cn.transform, cn.local_rect());
-        x1 = x1.max(b.x1);
-        y1 = y1.max(b.y1);
-    }
-    if let Some(l) = &n.layout {
-        x1 += l.padding[1];
-        y1 += l.padding[2];
-    }
-    let (vw, vh) = match viewport {
-        Some(v) => {
-            x1 = x1.max(n.width);
-            y1 = y1.max(n.height);
-            v
-        }
-        None => (n.width, n.height),
-    };
-    let rx = if matches!(n.overflow, Overflow::Horizontal | Overflow::Both) { (x1 - vw).max(0.0) } else { 0.0 };
-    let ry = if matches!(n.overflow, Overflow::Vertical | Overflow::Both) { (y1 - vh).max(0.0) } else { 0.0 };
-    (if rx.is_finite() { rx } else { 0.0 }, if ry.is_finite() { ry } else { 0.0 })
-}
-
-/// `(x, y)` kept within `0..=range` on each axis (0 for non-finite values).
-fn clamp_scroll((x, y): (f64, f64), (rx, ry): (f64, f64)) -> (f64, f64) {
-    let c = |v: f64, r: f64| if v.is_finite() && r.is_finite() { v.clamp(0.0, r.max(0.0)) } else { 0.0 };
-    (c(x, rx), c(y, ry))
-}
-
-/// One axis of a fling after `dt` seconds: from offset `x` moving at `v` (units/s) in a range
-/// `0..=r`. Inside the range it slows down exponentially (`decay`, 1/s: it travels `v / decay`);
-/// past an end it either stops there or, with `bounce`, a critically damped spring pulls it back.
-/// Both are solved exactly over short sub-steps, so the motion doesn't depend on the frame rate.
-/// Returns the new offset and speed, and whether it has come to rest.
-pub fn fling_axis(x: f64, v: f64, r: f64, dt: f64, decay: f64, bounce: bool) -> (f64, f64, bool) {
-    if !(x.is_finite() && v.is_finite() && r.is_finite() && dt.is_finite() && decay > 0.0) || r <= 0.0 {
-        return (if r.is_finite() && x.is_finite() { x.clamp(0.0, r.max(0.0)) } else { 0.0 }, 0.0, true);
-    }
-    // A frame is never longer than a second, nor a fling faster than a million units a second.
-    let dt = dt.clamp(0.0, 1.0);
-    let steps = (dt * 240.0).ceil().clamp(1.0, 64.0);
-    let h = dt / steps;
-    let (mut x, mut v) = (x, v.clamp(-1e6, 1e6));
-    for _ in 0..steps as usize {
-        if (0.0..=r).contains(&x) {
-            let e = (-decay * h).exp();
-            x += v * (1.0 - e) / decay;
-            v *= e;
-            if !bounce && !(0.0..=r).contains(&x) {
-                x = x.clamp(0.0, r);
-                v = 0.0;
-            }
-        } else {
-            let end = x.clamp(0.0, r);
-            let (d, e) = (x - end, (-SPRING * h).exp());
-            let c = v + SPRING * d;
-            x = end + (d + c * h) * e;
-            v = (v - SPRING * c * h) * e;
-        }
-    }
-    if !x.is_finite() || !v.is_finite() {
-        return (0.0, 0.0, true);
-    }
-    let end = x.clamp(0.0, r);
-    if x == end && v.abs() < FLING_STOP {
-        return (x, 0.0, true);
-    }
-    if x != end && (x - end).abs() < 0.5 && v.abs() < FLING_STOP * 4.0 {
-        return (end, 0.0, true);
-    }
-    (x, v, false)
-}
-
-/// Where a drag to offset `x` shows in a range `0..=r`: past an end it stretches less the further
-/// it goes, never more than `limit` past.
-pub fn rubber_band(x: f64, r: f64, limit: f64) -> f64 {
-    if !x.is_finite() || !r.is_finite() || r <= 0.0 || !limit.is_finite() || limit <= 0.0 {
-        return if x.is_finite() && r.is_finite() { x.clamp(0.0, r.max(0.0)) } else { 0.0 };
-    }
-    let band = |over: f64| limit * (1.0 - 1.0 / (over * 0.55 / limit + 1.0));
-    if x < 0.0 {
-        -band(-x)
-    } else if x > r {
-        r + band(x - r)
-    } else {
-        x
-    }
-}
-
-/// The prototype settings of the page holding `id` (defaults when there's none).
-pub fn page_settings(doc: &Document, id: NodeId) -> PrototypeSettings {
-    doc.page_of(id)
-        .and_then(|pg| doc.node(pg))
-        .and_then(|n| match &n.kind {
-            NodeKind::Page { prototype, .. } => Some(prototype.clone()),
-            _ => None,
-        })
-        .unwrap_or_default()
-}
-
-/// The part of top-level `frame` its page's device shows (page units): the frame clipped to the
-/// device's screen. None without a device: the frame then shows whole.
-pub fn viewport(doc: &Document, frame: NodeId) -> Option<(f64, f64)> {
-    let d = page_settings(doc, frame).device()?;
-    let n = doc.node(frame)?;
-    Some((n.width.min(d.width), n.height.min(d.height)))
-}
-
-/// Size `frame` to the `(w, h)` of it a screen shows. The content keeps its place (what doesn't
-/// fit is clipped or scrolls); fixed layers follow their constraints to the screen's edges, so a
-/// tab bar pinned to the frame's bottom sits at the bottom of the screen (stretching constraints
-/// keep the layer's size).
-pub fn fit_viewport(doc: &mut Document, frame: NodeId, (w, h): (f64, f64)) {
-    let Some(n) = doc.node(frame) else { return };
-    let (dw, dh) = (w - n.width, h - n.height);
-    if !dw.is_finite() || !dh.is_finite() || (dw == 0.0 && dh == 0.0) {
-        return;
-    }
-    let fixed: Vec<NodeId> =
-        n.children.iter().copied().filter(|c| doc.node(*c).is_some_and(|c| c.scroll_position == ScrollPosition::Fixed)).collect();
-    for c in fixed {
-        if let Some(m) = doc.node_mut(c) {
-            let dx = match m.constraints.horizontal {
-                HConstraint::Right => dw,
-                HConstraint::Center => dw / 2.0,
-                _ => 0.0,
-            };
-            let dy = match m.constraints.vertical {
-                VConstraint::Bottom => dh,
-                VConstraint::Center => dh / 2.0,
-                _ => 0.0,
-            };
-            m.transform = Affine::translate((dx, dy)) * m.transform;
-        }
-    }
-    if let Some(m) = doc.node_mut(frame) {
-        m.width = w;
-        m.height = h;
-    }
-}
-
-/// Shift scrolling frames' children by their scroll offsets. Fixed children stay put; sticky
-/// children scroll until they reach the frame's top/left edge, then stay there.
-pub fn apply_scroll(doc: &Document, scroll: &HashMap<NodeId, (f64, f64)>) -> Document {
-    let mut out = doc.clone();
-    let sticky = |pos: f64, s: f64| if pos >= 0.0 && pos - s < 0.0 { -pos } else { -s };
-    for (&frame, &(sx, sy)) in scroll {
-        if !sx.is_finite() || !sy.is_finite() || (sx == 0.0 && sy == 0.0) {
-            continue;
-        }
-        let Some(n) = doc.node(frame) else { continue };
-        for &c in &n.children {
-            let Some(cn) = doc.node(c) else { continue };
-            let (dx, dy) = match cn.scroll_position {
-                ScrollPosition::Fixed => continue,
-                ScrollPosition::Scrolls => (-sx, -sy),
-                ScrollPosition::Sticky => {
-                    let b = figcraft_geom::transform_rect_bbox(cn.transform, cn.local_rect());
-                    (sticky(b.x0, sx), sticky(b.y0, sy))
-                }
-            };
-            if let Some(m) = out.node_mut(c) {
-                m.transform = Affine::translate((dx, dy)) * m.transform;
-            }
-        }
-    }
-    out
-}
-
-/// Fixed layers draw (and take clicks) above the content that scrolls under them: each frame's
-/// fixed children move to the top of its children, keeping their order (for the player's copy).
-pub fn raise_fixed(doc: &mut Document) {
-    let fixed = |c: &NodeId| doc.node(*c).is_some_and(|c| c.scroll_position == ScrollPosition::Fixed);
-    let moves: Vec<(NodeId, Vec<NodeId>)> = doc
-        .nodes()
-        .filter(|n| !matches!(n.kind, NodeKind::Page { .. }) && n.children.iter().any(fixed))
-        .filter_map(|n| {
-            let (top, mut order): (Vec<NodeId>, Vec<NodeId>) = n.children.iter().partition(|c| fixed(c));
-            order.extend(top);
-            (order != n.children).then_some((n.id, order))
-        })
-        .collect();
-    for (id, order) in moves {
-        if let Some(n) = doc.node_mut(id) {
-            n.children = order;
-        }
-    }
-}
-
-/// Where the outgoing and incoming frames are drawn at eased progress `t`.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct FramePlacement {
-    /// Offsets as fractions of each frame's size.
-    pub from_off: (f32, f32),
-    pub from_alpha: f32,
-    pub to_off: (f32, f32),
-    pub to_alpha: f32,
-    pub from_on_top: bool,
-}
-
-/// The unit vector a direction moves along (screen space, y down).
-pub fn direction_vec(d: Direction) -> (f32, f32) {
-    match d {
-        Direction::Left => (-1.0, 0.0),
-        Direction::Right => (1.0, 0.0),
-        Direction::Top => (0.0, -1.0),
-        Direction::Bottom => (0.0, 1.0),
-    }
-}
-
-/// Frame offsets/opacities for a transition. Directions name where things move: "Move in, left"
-/// brings the new frame in from the right edge moving left.
-pub fn transition_frames(tr: Transition, t: f32) -> FramePlacement {
-    let mul = |(x, y): (f32, f32), k: f32| (x * k, y * k);
-    let base = FramePlacement { from_off: (0.0, 0.0), from_alpha: 1.0, to_off: (0.0, 0.0), to_alpha: 1.0, from_on_top: false };
-    match tr {
-        Transition::Instant => FramePlacement { from_alpha: 0.0, ..base },
-        Transition::Dissolve | Transition::SmartAnimate => FramePlacement { to_alpha: t.clamp(0.0, 1.0), ..base },
-        Transition::MoveIn { direction } => FramePlacement { to_off: mul(direction_vec(direction), -(1.0 - t)), ..base },
-        Transition::MoveOut { direction } => FramePlacement { from_off: mul(direction_vec(direction), t), from_on_top: true, ..base },
-        Transition::Push { direction } => {
-            let d = direction_vec(direction);
-            FramePlacement { from_off: mul(d, t), to_off: mul(d, -(1.0 - t)), ..base }
-        }
-        Transition::SlideIn { direction } => {
-            let d = direction_vec(direction);
-            FramePlacement { from_off: mul(d, 0.3 * t), to_off: mul(d, -(1.0 - t)), ..base }
-        }
-        Transition::SlideOut { direction } => {
-            let d = direction_vec(direction);
-            FramePlacement { from_off: mul(d, t), to_off: mul(d, -0.3 * (1.0 - t)), from_on_top: true, ..base }
-        }
-    }
-}
-
-/// Screen rect of an overlay of `size` over the frame drawn at `base`. A manual one sits `offset`
-/// (screen points) from the top-left of `anchor`, the layer that opened it; without an offset,
-/// right below it.
-pub fn overlay_rect(pos: OverlayPosition, base: Rect, size: Vec2, anchor: Option<Rect>, offset: Option<Vec2>) -> Rect {
-    let cx = base.center().x - size.x / 2.0;
-    let cy = base.center().y - size.y / 2.0;
-    let (x, y) = match pos {
-        OverlayPosition::Center => (cx, cy),
-        OverlayPosition::TopLeft => (base.min.x, base.min.y),
-        OverlayPosition::TopCenter => (cx, base.min.y),
-        OverlayPosition::TopRight => (base.max.x - size.x, base.min.y),
-        OverlayPosition::BottomLeft => (base.min.x, base.max.y - size.y),
-        OverlayPosition::BottomCenter => (cx, base.max.y - size.y),
-        OverlayPosition::BottomRight => (base.max.x - size.x, base.max.y - size.y),
-        OverlayPosition::Manual => match (anchor, offset) {
-            (Some(a), Some(o)) => (a.min.x + o.x, a.min.y + o.y),
-            (Some(a), None) => (a.min.x, a.max.y),
-            (None, _) => (cx, cy),
-        },
-    };
-    Rect::from_min_size(pos2(x, y), size)
-}
-
-/// The hotspots of the screen `root` (its visible layers with interactions, bottom-most first)
-/// placed on screen and clipped by `screen`.
-fn hotspots(doc: &Document, root: NodeId, place: &Place, screen: Rect) -> Vec<(NodeId, Rect)> {
-    figcraft_engine::proto_run::hotspots(doc, root)
-        .into_iter()
-        .map(|(id, b)| (id, place.rect(b).intersect(screen)))
-        .filter(|(_, r)| r.is_positive())
-        .collect()
-}
-
-/// The first interaction index on `id` whose trigger satisfies `want`.
-fn find_trigger(doc: &Document, id: NodeId, want: impl Fn(&Trigger) -> bool) -> Option<usize> {
-    doc.node(id)?.interactions.iter().position(|it| want(&it.trigger))
-}
-
-// ---------------------------------------------------------------------------------------------
-// The player UI, shared by the full-window presenter and the preview pane.
-
-struct Layout {
-    disp: Document,
-    scale: f64,
-    place: Place,
-    /// What shows the prototype: the device's screen, else the presented frame itself.
-    screen: Rect,
-    /// What the presented frame may draw into: the device's screen, else the whole area (shadows
-    /// and overflowing content show around a frame presented without a device).
-    clip: Rect,
-    device: Option<Device>,
-    /// The device is turned to landscape.
-    landscape: bool,
-    /// The colour of the device's body, when it is drawn around its screen.
-    color: Option<DeviceColor>,
-    overlays: Vec<(NodeId, Place, Rect)>,
-    /// Overlays animating out (same order as `Presenter::closing`).
-    closing: Vec<(NodeId, Place, Rect)>,
-}
-
-impl Layout {
-    /// The active layer (the top overlay, else the presented frame `current`), where it's placed
-    /// and what it may draw into.
-    fn active(&self, current: NodeId) -> (NodeId, Place, Rect) {
-        match self.overlays.last() {
-            Some((id, pl, _)) => (*id, *pl, self.screen),
-            None => (current, self.place, self.clip),
-        }
-    }
-}
-
-/// The soonest "after delay" interaction in `root`'s subtree that hasn't fired yet, and the seconds
-/// until it's due (zero or less: due now). Timers start when the screen arrives, an overlay's when
-/// it opens.
-fn next_delay(p: &Presenter, doc: &Document, root: NodeId, now: f64) -> Option<((NodeId, usize), f64)> {
-    let since = p.overlays.last().filter(|o| o.id == root).map_or(p.arrived, |o| o.opened);
-    let mut next: Option<((NodeId, usize), f64)> = None;
-    for id in doc.subtree(root) {
-        let Some(n) = doc.node(id) else { continue };
-        for (k, it) in n.interactions.iter().enumerate() {
-            if let Trigger::AfterDelay { ms } = it.trigger
-                && !p.delays_fired.contains(&(id, k))
-            {
-                let due = since + f64::from(ms) / 1000.0 - now;
-                if next.is_none_or(|(_, d)| due < d) {
-                    next = Some(((id, k), due));
-                }
-            }
-        }
-    }
-    next
-}
-
-/// The width of a device's screen of `size` held upright (its short side when turned).
-fn upright_w(size: Vec2, landscape: bool) -> f32 {
-    if landscape { size.y } else { size.x }
-}
-
-/// Bezel width around a device's screen of upright width `w`, and the screen's corner radius.
-fn bezel(device: &str, w: f32) -> (f32, f32) {
-    match device {
-        "MacBook Air" => ((w * 0.025).max(6.0), 0.0),
-        "Desktop" => ((w * 0.02).max(6.0), 0.0),
-        d if d.starts_with("iPad") => ((w * 0.05).max(8.0), w * 0.04),
-        _ => ((w * 0.06).max(6.0), w * 0.13),
-    }
-}
-
-/// How far a device's body reaches past its screen of `size`: (each side, top, bottom). A phone
-/// turned to landscape has its side buttons above and below.
-fn body_outset(device: &str, size: Vec2, landscape: bool) -> (f32, f32, f32) {
-    let w = upright_w(size, landscape);
-    let (b, _) = bezel(device, w);
-    match device {
-        "MacBook Air" => (b + w * 0.08, b, b + (w * 0.022).max(6.0)),
-        "Desktop" => (b, b, b + w * 0.08 + 6.0),
-        _ if landscape => (b, b + 3.0, b + 3.0),
-        _ => (b + 3.0, b, b),
-    }
-}
-
-/// Place the presented frame in `area`: on its device's screen (the whole device sized by the
-/// view's scale option), else the frame itself. Fit and 100% keep the chrome's padding from the
-/// edges; Fit never goes above 100%. What doesn't fit the window pans (`Presenter::pan`). The
-/// preview pane always fits. A responsive prototype's frame is first resized to the device's
-/// screen, or without a device to the whole area (shown at 100%).
-fn layout(p: &mut Presenter, area: Rect, chrome: Chrome) -> Option<Layout> {
-    let settings = page_settings(p.doc.as_ref()?, p.current);
-    let (device, landscape) = (settings.device(), settings.landscape());
-    let fills = settings.responsive && device.is_none();
-    let whole_area = (f64::from(area.width().round()), f64::from(area.height().round()));
-    p.respond_to(settings.responsive.then(|| device.map_or(whole_area, |d| (d.width, d.height))));
-    let disp = p.display()?;
-    let fb = disp.world_bounds(p.current)?;
-    let view = if chrome.pane { PresentView::default() } else { p.view };
-    // Custom sizes are just a screen: no body.
-    let body = device.filter(|d| view.device_frame && !d.colors.is_empty());
-    let pad = if !fills && matches!(view.scale, PresentScale::Fit | PresentScale::Actual) { chrome.pad } else { 0.0 };
-    let avail = area.shrink(pad);
-    let (sw, sh) = device.map_or((fb.width(), fb.height()), |d| (d.width, d.height));
-    // The screen at `scale`, the body's outsets around it and the whole size.
-    let outer = |scale: f64| {
-        let size = vec2((sw * scale) as f32, (sh * scale) as f32);
-        let (x, top, bottom) = body.map_or((0.0, 0.0, 0.0), |d| body_outset(d.name, size, landscape));
-        (size, x, top, vec2(size.x + 2.0 * x, size.y + top + bottom))
-    };
-    // The factor that makes something of size `o` fit, fill… the available space.
-    let factor = |o: Vec2| {
-        let (kx, ky) = (avail.width() / o.x.max(1.0), avail.height() / o.y.max(1.0));
-        f64::from(match view.scale {
-            PresentScale::Fit => kx.min(ky),
-            PresentScale::FitWidth => kx,
-            PresentScale::Fill => kx.max(ky),
-            PresentScale::Actual => 1.0,
-        })
-    };
-    let mut scale = if fills { 1.0 } else { factor(vec2(sw as f32, sh as f32)) };
-    // The body doesn't scale exactly with the screen (its edges have a minimum): size it once more.
-    if body.is_some() {
-        scale *= factor(outer(scale).3);
-    }
-    let max = if view.scale == PresentScale::Fit { 1.0 } else { 16.0 };
-    let scale = if scale.is_finite() { scale.clamp(0.01, max) } else { 0.01 };
-    let (size, x, top, whole) = outer(scale);
-    p.zoom = scale;
-    // What's bigger than the window pans: starting centred across and at the top.
-    let over = |d: f32| if d > 0.5 { d } else { 0.0 };
-    let excess = vec2(over(whole.x - avail.width()), over(whole.y - avail.height()));
-    p.pan_range = (f64::from(excess.x), f64::from(excess.y));
-    // While a drag or fling moves the view it may stretch past the ends; otherwise it stays in range.
-    let live = matches!(p.drag_scroll, Some((Scroller::View, _))) || p.fling.is_some_and(|f| f.target == Scroller::View);
-    if !live {
-        p.pan = p.pan.map(|v| clamp_scroll(v, p.pan_range));
-    }
-    let pan = p.offset(Scroller::View);
-    let along = |excess: f32, min: f32, centre: f32, len: f32, pan: f64| if excess > 0.0 { min - pan as f32 } else { centre - len / 2.0 };
-    let min = pos2(along(excess.x, avail.min.x, area.center().x, whole.x, pan.0), along(excess.y, avail.min.y, area.center().y, whole.y, pan.1));
-    let screen = Rect::from_min_size(min + vec2(x, top), size);
-    let place = Place::centered(fb, screen.center(), scale);
-    let place_overlay = |o: &OverlayState| {
-        let ob = disp.world_bounds(o.id)?;
-        let size = vec2((ob.width() * scale) as f32, (ob.height() * scale) as f32);
-        let offset = o.offset.map(|[x, y]| vec2((x * scale) as f32, (y * scale) as f32));
-        let r = overlay_rect(o.position, screen, size, o.anchor, offset);
-        Some((o.id, Place { page_min: (ob.x0, ob.y0), origin: r.min, scale }, r))
-    };
-    let overlays = p.overlays.iter().filter_map(place_overlay).collect();
-    let closing = p.closing.iter().filter_map(|(_, o)| place_overlay(o)).collect();
-    let clip = if device.is_some() { screen } else { area };
-    let color = body.and(settings.device_color());
-    Some(Layout { disp, scale, place, screen, clip, device, landscape, color, overlays, closing })
-}
-
-/// Where the player sits: the whole window or the preview pane.
-#[derive(Clone, Copy, Debug, PartialEq)]
-struct Chrome {
-    pane: bool,
-    bar_h: f32,
-    /// Space kept around the device or frame.
-    pad: f32,
-    /// Corner radius of the window around the player (the pane's).
-    round: u8,
-    /// The player may take keys (the pane only while hovered, and never while the editor is
-    /// typing: text on the canvas or in a field).
-    keys: bool,
-}
-
-const FULL: Chrome = Chrome { pane: false, bar_h: 40.0, pad: 32.0, round: 0, keys: true };
-
-/// What the player's top bar asked for.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-enum BarAction {
-    Close,
-    Restart,
-    /// Present full-window (from the pane).
-    Present,
-    /// The full-window presenter's options menu (handled in the bar).
-    Options,
-    /// Turn responsive presentation on or off (saved in the file: `proto.settings`).
-    Responsive(bool),
-    /// Show or hide the comments on the presented frame.
-    Comments,
-    /// Show or hide the Inspect panel.
-    Inspect,
-}
-
-/// The full-window presenter (while `app.ui.present` is set). Escape or Close ends it.
-pub fn show(app: &mut FigApp, ui: &mut Ui) {
-    let ctx = ui.ctx().clone();
-    let now = ctx.input(|i| i.time);
-    let Some(mut pres) = app.ui.present.take() else { return };
-    if let Ok(ds) = app.session.ds() {
-        pres.sync(&ds.doc, now);
-    }
-    poll_pads(app, &mut pres, &ctx);
-    let mut action = None;
-    // Typing a reply to a comment keeps the keys from the prototype; Shift+C shows the comments.
-    let typing = ctx.egui_wants_keyboard_input();
-    if !typing && ctx.input_mut(|i| i.consume_key(egui::Modifiers::SHIFT, egui::Key::C)) {
-        action = Some(BarAction::Comments);
-    }
-    if pres.view.inspect {
-        let t = Tokens::get(&ctx);
-        egui::Panel::right("present_inspect")
-            .resizable(false)
-            .exact_size(INSPECT_W)
-            .frame(egui::Frame::NONE.fill(t.panel).stroke(Stroke::new(1.0, t.border)))
-            .show(ui, |ui| inspect_panel(app, ui, &pres));
-    }
-    egui::CentralPanel::default().frame(egui::Frame::NONE).show(ui, |ui| {
-        action = player(&mut pres, ui, ui.max_rect(), now, Chrome { keys: !typing, ..FULL }).or(action);
-    });
-    // Keys the prototype left alone: C shows the comments, F fills the screen.
-    if !typing {
-        if ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::C)) {
-            action = Some(BarAction::Comments);
-        }
-        if ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::F)) {
-            let full = ctx.input(|i| i.viewport().fullscreen.unwrap_or(false));
-            ctx.send_viewport_cmd(egui::ViewportCommand::Fullscreen(!full));
-        }
-    }
-    match action {
-        Some(BarAction::Comments) => pres.view.comments = !pres.view.comments,
-        Some(BarAction::Inspect) => pres.view.inspect = !pres.view.inspect,
-        _ => {}
-    }
-    if pres.view.comments
-        && let Some((frame, place, clip)) = pres.shown
-    {
-        crate::comments::presenter(app, &ctx, frame, place, clip);
-    } else if app.ui.comments.open.is_some() {
-        app.ui.comments.close();
-    }
-    finish(app, &mut pres);
-    // The options carry over to the next presentation.
-    app.ui.present_view = pres.view;
-    if let Some(BarAction::Responsive(on)) = action {
-        app.run("proto.settings", json!({"responsive": on}));
-    }
-    if action == Some(BarAction::Close) || ctx.input(|i| i.key_pressed(egui::Key::Escape)) {
-        return;
-    }
-    app.ui.present = Some(pres);
-}
-
-/// How often the player polls the controllers while its prototype has gamepad triggers (seconds).
-const PAD_POLL_SECS: f64 = 1.0 / 30.0;
-
-/// Before a player's frame: the controller buttons pressed since the last one, polled only while
-/// the prototype has gamepad triggers and the window has the focus (systems and browsers report
-/// controllers to the focused window only; focus coming back draws a frame, which polls again).
-fn poll_pads(app: &mut FigApp, p: &mut Presenter, ctx: &egui::Context) {
-    if !p.uses_pads || !ctx.input(|i| i.focused) {
-        return;
-    }
-    let held = app.services.gamepad_held();
-    let down = held & !p.pads_held;
-    p.pads_held = held;
-    // Each press once, in layout order.
-    let pressed = (0..u32::BITS as usize).filter(|i| down & (1 << i) != 0).filter_map(figcraft_doc::proto::gamepad_button);
-    p.pads.extend(pressed.map(str::to_string));
-    crate::repaint_in(ctx, PAD_POLL_SECS);
-}
-
-/// After a player's frame: the links it opens and the widget clicks it took.
-fn finish(app: &mut FigApp, p: &mut Presenter) {
-    for u in p.urls.drain(..) {
-        app.services.open_url(&u);
-    }
-    if let Some(e) = p.click_widgets(&app.session) {
-        app.toast(e);
-    }
-}
-
-/// The width of the presenter's Inspect panel.
-const INSPECT_W: f32 = 280.0;
-
-/// The presenter's Inspect panel: the inspected layer's properties, as in the Inspect tab.
-fn inspect_panel(app: &mut FigApp, ui: &mut Ui, pres: &Presenter) {
-    let t = Tokens::get(ui.ctx());
-    let found = pres.inspected.zip(pres.doc.as_ref()).and_then(|(id, doc)| doc.node(id).map(|n| (id, doc, n.name.clone())));
-    egui::ScrollArea::vertical().auto_shrink([false, false]).show(ui, |ui| {
-        let Some((id, doc, name)) = found else {
-            widgets::section_header(ui, tr("Inspect"), &[], false);
-            widgets::note(ui, tr("Hover a layer to see its properties"), t.text_secondary);
-            return;
-        };
-        widgets::section_header(ui, &name, &[], false);
-        for section in figcraft_engine::devinspect::properties(doc, id) {
-            crate::right::inspect_section(app, ui, &section);
-        }
-    });
-}
-
-/// The top-most visible layer of `root` (it included) under the screen point `q`.
-fn layer_at(doc: &Document, root: NodeId, place: &Place, q: Pos2) -> Option<NodeId> {
-    let mut hidden: HashSet<NodeId> = HashSet::new();
-    let mut hit = None;
-    for id in doc.subtree(root) {
-        let Some(n) = doc.node(id) else { continue };
-        if !n.visible || n.parent.is_some_and(|p| hidden.contains(&p)) {
-            hidden.insert(id);
-            continue;
-        }
-        if doc.world_bounds(id).is_some_and(|b| place.rect(b).contains(q)) {
-            hit = Some(id);
-        }
-    }
-    hit
-}
-
-/// The prototype preview pane: the player in a floating, resizable window over the canvas. It
-/// follows edits live, and selecting another top-level frame in the editor shows that frame.
-pub struct Pane {
-    pub player: Presenter,
-    /// The open file it previews (another tab closes it).
-    doc_uid: u64,
-    /// The top-level frame last selected in the editor.
-    selected: Option<NodeId>,
-}
-
-/// The top-level frame of the editor's first selected layer.
-fn selected_frame(ds: &figcraft_engine::DocState) -> Option<NodeId> {
-    ds.selection.first().and_then(|i| ds.doc.top_level_frame(*i))
-}
-
-impl Pane {
-    pub fn new(start: NodeId, session: &figcraft_engine::Session) -> Self {
-        let (doc_uid, selected) = session.ds().map(|ds| (ds.uid, selected_frame(ds))).unwrap_or((0, None));
-        Pane { player: Presenter::new(start), doc_uid, selected }
-    }
-}
-
-/// The preview pane's window id (its position and size persist under it).
-pub fn pane_id() -> Id {
-    Id::new("proto_preview_pane")
-}
-
-/// Show the preview pane while `app.ui.preview` is set (call once per frame, before shortcuts:
-/// keys a hovered pane's prototype uses don't reach the editor).
-pub fn show_pane(app: &mut FigApp, ctx: &egui::Context) {
-    let Some(mut pane) = app.ui.preview.take() else { return };
-    let Ok(ds) = app.session.ds() else { return };
-    if ds.uid != pane.doc_uid {
-        return;
-    }
-    let now = ctx.input(|i| i.time);
-    let (doc, selected) = (ds.doc.clone(), selected_frame(ds));
-    pane.player.sync(&doc, now);
-    // Deselecting and coming back to the same frame keeps the preview where it got to.
-    if selected.is_some() && selected != pane.selected {
-        pane.selected = selected;
-        if let Some(f) = selected.filter(|f| *f != pane.player.current) {
-            pane.player.restart(f, now);
-        }
-    }
-    let t = Tokens::get(ctx);
-    let canvas = app.canvas.rect;
-    let style = ctx.global_style();
-    let typing = ds.text_edit.is_some() || crate::a11y::field_focused(ctx);
-    let chrome = Chrome { pane: true, bar_h: 36.0, pad: 12.0, round: style.visuals.window_corner_radius.nw, keys: !typing };
-    poll_pads(app, &mut pane.player, ctx);
-    let mut action = None;
-    egui::Window::new(tr("Prototype preview"))
-        .id(pane_id())
-        .title_bar(false)
-        .collapsible(false)
-        .resizable(true)
-        .default_size(vec2(320.0, 600.0))
-        .min_size(vec2(220.0, 260.0))
-        .default_pos(pos2(canvas.max.x - 336.0, canvas.min.y + 16.0))
-        .constrain_to(ctx.content_rect())
-        .frame(egui::Frame::window(&style).fill(t.panel).inner_margin(egui::Margin::same(0)))
-        .show(ctx, |ui| {
-            let (rect, _) = ui.allocate_exact_size(ui.available_size(), Sense::hover());
-            action = player(&mut pane.player, ui, rect, now, chrome);
-        });
-    finish(app, &mut pane.player);
-    match action {
-        Some(BarAction::Close) => {}
-        Some(BarAction::Present) => {
-            let start = pane.player.current;
-            app.ui.preview = Some(pane);
-            app.run("proto.present", json!({"start": start}));
-        }
-        _ => app.ui.preview = Some(pane),
-    }
-}
-
-/// The black glass around a device's screen.
-const GLASS: Color32 = Color32::from_rgb(0x16, 0x16, 0x18);
-
-/// A device colour lighter (`k` > 0, towards white) or darker (`k` < 0, towards black).
-fn shade([r, g, b]: [u8; 3], k: f32) -> Color32 {
-    let k = k.clamp(-1.0, 1.0);
-    let f = |c: u8| {
-        let c = f32::from(c);
-        (if k >= 0.0 { c + (255.0 - c) * k } else { c * (1.0 + k) }).round().clamp(0.0, 255.0) as u8
-    };
-    Color32::from_rgb(f(r), f(g), f(b))
-}
-
-/// The width of the coloured band round a device's glass (upright screen width `w`, bezel `b`).
-fn rim(w: f32, b: f32) -> f32 {
-    (w * 0.016).clamp(1.5, (b * 0.5).max(1.5))
-}
-
-/// Body of the presentation device behind the screen `s` (drawn in code: rounded slabs in the
-/// device's colour with black glass round the screen). Turned to landscape (a quarter turn
-/// counter-clockwise), a phone's left side is at the bottom.
-fn device_body(p: &egui::Painter, device: &str, s: Rect, landscape: bool, color: DeviceColor) {
-    let (body, edge, metal) = (shade(color.rgb, 0.0), shade(color.rgb, -0.3), shade(color.rgb, 0.12));
-    let w = upright_w(s.size(), landscape);
-    let (b, screen_r) = bezel(device, w);
-    let band = rim(w, b);
-    let radius = |r: f32| CornerRadius::same(r.clamp(0.0, 255.0) as u8);
-    match device {
-        "MacBook Air" => {
-            // The lid's coloured edge round black glass, then the base: a thin slab wider than
-            // the lid, with a finger notch.
-            let lid = s.expand(b);
-            p.rect_filled(lid, radius(b * 1.2), body);
-            p.rect_filled(lid.shrink(band), radius(b * 1.2 - band), GLASS);
-            let base = Rect::from_min_max(pos2(lid.min.x - w * 0.08, lid.max.y), pos2(lid.max.x + w * 0.08, lid.max.y + (w * 0.022).max(6.0)));
-            p.rect_filled(base, CornerRadius { nw: 2, ne: 2, sw: 10, se: 10 }, metal);
-            let notch = Rect::from_center_size(pos2(base.center().x, base.min.y + 1.5), vec2(w * 0.12, 3.0));
-            p.rect_filled(notch, CornerRadius::same(2), edge);
-        }
-        "Desktop" => {
-            let screen = s.expand(b);
-            p.rect_filled(screen, CornerRadius::same(8), body);
-            p.rect_filled(screen.shrink(band), radius(8.0 - band), GLASS);
-            let neck =
-                Rect::from_min_max(pos2(screen.center().x - w * 0.06, screen.max.y), pos2(screen.center().x + w * 0.06, screen.max.y + w * 0.08));
-            p.rect_filled(neck, CornerRadius::ZERO, metal);
-            let foot = Rect::from_min_max(pos2(neck.min.x - w * 0.06, neck.max.y), pos2(neck.max.x + w * 0.06, neck.max.y + 6.0));
-            p.rect_filled(foot, CornerRadius::same(3), edge);
-        }
-        _ => {
-            // Phones and tablets: a rounded slab (phones with side buttons).
-            let slab = s.expand(b);
-            if !device.starts_with("iPad") {
-                // (on the left side, from the top, length) as fractions of the upright side.
-                for (left, f0, h) in [(true, 0.18, 0.06), (true, 0.27, 0.1), (false, 0.24, 0.13)] {
-                    let btn = if landscape {
-                        let y = if left { slab.max.y - 0.5 } else { slab.min.y - 2.5 };
-                        Rect::from_min_size(pos2(slab.min.x + slab.width() * f0, y), vec2(slab.width() * h, 2.5))
-                    } else {
-                        let x = if left { slab.min.x - 2.0 } else { slab.max.x };
-                        Rect::from_min_size(pos2(x, slab.min.y + slab.height() * f0), vec2(2.5, slab.height() * h))
-                    };
-                    p.rect_filled(btn, CornerRadius::same(1), edge);
-                }
-            }
-            p.rect_filled(slab, radius(screen_r + b), body);
-            p.rect_stroke(slab, radius(screen_r + b), Stroke::new(1.0, edge), StrokeKind::Inside);
-            // The glass reaches round the screen's square corners (masked by `device_glass`).
-            let glass = b - band;
-            p.rect_filled(slab.shrink(band), radius((screen_r + glass).min(glass * 3.4)), GLASS);
-        }
-    }
-}
-
-/// What sits on top of the screen: rounded screen corners (glass masks the frame's square
-/// corners) and a phone's camera pill (at the left when turned to landscape).
-fn device_glass(p: &egui::Painter, device: &str, s: Rect, landscape: bool) {
-    let w = upright_w(s.size(), landscape);
-    let (_, screen_r) = bezel(device, w);
-    if screen_r <= 0.0 {
-        return;
-    }
-    p.add(corner_masks(s, screen_r.min(s.width() / 2.0).min(s.height() / 2.0), GLASS));
-    if device.starts_with("iPhone") {
-        let pill = if landscape {
-            Rect::from_center_size(pos2(s.min.x + w * 0.045, s.center().y), vec2(w * 0.085, w * 0.3))
-        } else {
-            Rect::from_center_size(pos2(s.center().x, s.min.y + w * 0.045), vec2(w * 0.3, w * 0.085))
-        };
-        p.rect_filled(pill, CornerRadius::same((w * 0.0425).min(255.0) as u8), Color32::BLACK);
-    }
-}
-
-/// Fill what lies between each corner of `s` and its rounding of radius `r` (fans of triangles
-/// from the corner to the arc).
-fn corner_masks(s: Rect, r: f32, color: Color32) -> egui::Shape {
-    const SEGMENTS: usize = 12;
-    if !(r.is_finite() && r > 0.0) {
-        return egui::Shape::Noop;
-    }
-    let mut mesh = egui::Mesh::default();
-    // (corner, centre of its arc, angle the arc starts at).
-    let corners = [
-        (s.left_top(), s.left_top() + vec2(r, r), std::f32::consts::PI),
-        (s.right_top(), s.right_top() + vec2(-r, r), std::f32::consts::FRAC_PI_2 * 3.0),
-        (s.right_bottom(), s.right_bottom() + vec2(-r, -r), 0.0),
-        (s.left_bottom(), s.left_bottom() + vec2(r, -r), std::f32::consts::FRAC_PI_2),
-    ];
-    for (corner, centre, start) in corners {
-        let base = mesh.vertices.len() as u32;
-        mesh.colored_vertex(corner, color);
-        for k in 0..=SEGMENTS {
-            let a = start + std::f32::consts::FRAC_PI_2 * k as f32 / SEGMENTS as f32;
-            mesh.colored_vertex(centre + r * vec2(a.cos(), a.sin()), color);
-        }
-        for k in 0..SEGMENTS as u32 {
-            mesh.add_triangle(base, base + 1 + k, base + 2 + k);
-        }
-    }
-    egui::Shape::mesh(mesh)
-}
-
-/// One frame of the player in `rect`: the top bar, then the prototype (on its device) below.
-/// Returns what the bar asked for (restarting is done here).
-fn player(p: &mut Presenter, ui: &mut Ui, rect: Rect, now: f64, chrome: Chrome) -> Option<BarAction> {
-    let ctx = ui.ctx().clone();
-    p.clock = now;
-    let bar = Rect::from_min_size(rect.min, vec2(rect.width(), chrome.bar_h));
-    let area = Rect::from_min_max(pos2(rect.min.x, bar.max.y), rect.max);
-    let bg = crate::theme::doc_c32(ui.ctx(), p.doc.as_ref().map(|d| page_settings(d, p.current)).unwrap_or_default().background);
-    let r = chrome.round;
-    ui.painter().rect_filled(area, CornerRadius { nw: 0, ne: 0, sw: r, se: r }, bg);
-    let action = top_bar(p, ui, bar, now, chrome);
-    if action == Some(BarAction::Restart) {
-        p.restart(p.start, now);
-    }
-    if p.doc.as_ref().is_none_or(|d| !d.contains(p.current)) {
-        if !chrome.pane {
-            return Some(BarAction::Close);
-        }
-        ui.painter().text(area.center(), Align2::CENTER_CENTER, tr("Select a frame to preview it"), regular(12.0), Color32::from_gray(170));
-        return action;
-    }
-    // Scroll animation (Scroll to).
-    if let Some(sa) = &p.scroll_anim {
-        let raw = ((now - sa.start) / sa.dur.max(1e-3)).clamp(0.0, 1.0);
-        let e = sa.easing.eval(raw);
-        for (f, from, to) in &sa.frames {
-            p.scroll.insert(*f, (lerp(from.0, to.0, e), lerp(from.1, to.1, e)));
-        }
-        p.rev += 1;
-        if raw >= 1.0 {
-            p.scroll_anim = None;
-        }
-        ctx.request_repaint();
-    }
-    // Scrolling that carries on after the input let go (repaints only while it moves).
-    if p.step_fling(now) {
-        ctx.request_repaint();
-    }
-    let resp = ui.interact(area, ui.id().with("present_area"), Sense::click_and_drag());
-    let over = resp.contains_pointer();
-    if let Some(l) = layout(p, area, chrome) {
-        // The pane only takes the keyboard while the pointer is over it.
-        input(p, &ctx, &l, over, chrome.keys && (!chrome.pane || over), chrome.pane, now);
-    }
-    let Some(l) = layout(p, area, chrome) else { return action };
-    p.shown = Some((p.current, l.place, l.clip.intersect(area)));
-    let painter = ui.painter_at(area);
-    let body = l.device.zip(l.color);
-    if l.device.is_some() {
-        if let Some((d, c)) = body {
-            device_body(&painter, d.name, l.screen, l.landscape, c);
-        }
-        painter.rect_filled(l.screen, CornerRadius::ZERO, bg);
-    }
-    draw(p, &painter, &ctx, &l, now);
-    if p.view.inspect && !chrome.pane {
-        inspect_hover(p, &painter, &ctx, &l, area);
-    }
-    if let Some((d, _)) = body {
-        device_glass(&painter, d.name, l.screen, l.landscape);
-    }
-    // Timers: wake up for the soonest pending "after delay" of the layer that can fire it (they
-    // wait while a transition plays, which draws every frame anyway).
-    if p.anim.is_none()
-        && let Some((_, due)) = next_delay(p, &l.disp, l.active(p.current).0, now)
-    {
-        crate::repaint_in(&ctx, due.min(60.0));
-    }
-    // And for the soonest mouse trigger waiting out its delay.
-    if let Some(due) = p.waiting.iter().map(|w| w.due - now).reduce(f64::min) {
-        crate::repaint_in(&ctx, due.clamp(0.0, 60.0));
-    }
-    action
-}
-
-/// Inspecting: the layer under the pointer becomes the inspected one; it is outlined.
-fn inspect_hover(p: &mut Presenter, painter: &egui::Painter, ctx: &egui::Context, l: &Layout, area: Rect) {
-    let (root, place, clip) = l.active(p.current);
-    if let Some(q) = ctx.pointer_hover_pos().filter(|q| area.contains(*q) && clip.contains(*q))
-        && let Some(id) = layer_at(&l.disp, root, &place, q)
-    {
-        p.inspected = Some(id);
-    }
-    if let Some(id) = p.inspected.filter(|id| *id == root || l.disp.is_ancestor(root, *id))
-        && let Some(b) = l.disp.world_bounds(id)
-    {
-        painter.with_clip_rect(clip).rect_stroke(place.rect(b), CornerRadius::ZERO, Stroke::new(1.5, ACCENT), StrokeKind::Outside);
-    }
-}
-
-/// The bar above the prototype: the flow picker and the frame's name on the left, the buttons on
-/// the right (text on the dark full-window bar, icons in the pane, which follows the theme).
-fn top_bar(p: &mut Presenter, ui: &mut Ui, bar: Rect, now: f64, chrome: Chrome) -> Option<BarAction> {
-    let t = Tokens::get(ui.ctx());
-    let (fill, text, dim, hover) = if chrome.pane {
-        (t.panel, t.text, t.text_secondary, t.hover)
-    } else {
-        (Color32::from_rgb(0x2C, 0x2C, 0x2C), Color32::WHITE, Color32::from_gray(140), Color32::from_white_alpha(28))
-    };
-    let r = chrome.round;
-    ui.painter().rect_filled(bar, CornerRadius { nw: r, ne: r, sw: 0, se: 0 }, fill);
-    if chrome.pane {
-        ui.painter().line_segment([bar.left_bottom(), bar.right_bottom()], Stroke::new(1.0, t.border));
-    }
-    let doc = p.doc.as_ref()?;
-    let name = doc.node(p.current).map(|n| n.name.clone()).unwrap_or_default();
-    let flows = match doc.page_of(p.start).and_then(|pg| doc.node(pg)).map(|n| &n.kind) {
-        Some(NodeKind::Page { flows, .. }) => flows.clone(),
-        _ => vec![],
-    };
-    let settings = page_settings(doc, p.current);
-    let device = settings.device();
-    let mut action = None;
-    // Right: the buttons, right to left (English labels key their ids; shown translated).
-    let buttons: &[(BarAction, &str, Icon)] = if chrome.pane {
-        &[
-            (BarAction::Close, tr_noop("Close preview"), Icon::Close),
-            (BarAction::Present, tr_noop("Present"), Icon::Play),
-            (BarAction::Restart, tr_noop("Restart"), Icon::Reset),
-        ]
-    } else {
-        &[
-            (BarAction::Close, tr_noop("Close"), Icon::Close),
-            (BarAction::Restart, tr_noop("Restart"), Icon::Reset),
-            (BarAction::Options, tr_noop("Options"), Icon::Dots),
-            (BarAction::Comments, tr_noop("Comments"), Icon::Comment),
-            (BarAction::Inspect, tr_noop("Inspect"), Icon::Code),
-        ]
-    };
-    let mut x = bar.max.x - if chrome.pane { 6.0 } else { 8.0 };
-    for (act, label, icon) in buttons {
-        let shown = tr(label);
-        let w = if chrome.pane { 24.0 } else { ui.painter().layout_no_wrap(shown.to_string(), regular(11.5), text).size().x + 16.0 };
-        let br = Rect::from_min_size(pos2(x - w, bar.center().y - 12.0), vec2(w, 24.0));
-        x = br.min.x - if chrome.pane { 2.0 } else { 4.0 };
-        let mut resp = ui.interact(br, ui.id().with(("pbar", *label)), Sense::click());
-        if chrome.pane {
-            resp = resp.tip(shown);
-        }
-        let on = (*act == BarAction::Comments && p.view.comments) || (*act == BarAction::Inspect && p.view.inspect);
-        if on {
-            ui.painter().rect_filled(br, CornerRadius::same(5), ACCENT);
-        } else if resp.hovered() {
-            ui.painter().rect_filled(br, CornerRadius::same(5), hover);
-        }
-        if *act == BarAction::Comments {
-            resp = resp.tip(tr("Show comments (Shift+C)"));
-        }
-        if *act == BarAction::Inspect {
-            resp = resp.tip(tr("Inspect the layer under the pointer: size, colours, typography"));
-        }
-        if chrome.pane {
-            icons::paint(ui.painter(), br.shrink(5.0), *icon, t.icon);
-        } else {
-            ui.painter().text(br.center(), Align2::CENTER_CENTER, shown, regular(11.5), text);
-        }
-        if *act == BarAction::Options {
-            let menu = crate::right::menu_popup(&resp).width(220.0).show(|ui| options_menu(p, ui, device, settings.responsive, now));
-            action = action.or(menu.and_then(|m| m.inner));
-        } else if resp.clicked() {
-            action = Some(*act);
-        }
-    }
-    // Left: the flow picker and the frame's name, clipped before the buttons.
-    let left = ui.painter().with_clip_rect(Rect::from_min_max(bar.min, pos2(x, bar.max.y)));
-    let mut lx = bar.min.x + if chrome.pane { 8.0 } else { 12.0 };
-    // The flow playing: its name on the picker, its description on hover; the menu lists each
-    // flow with its description.
-    let playing = flows.iter().find(|f| f.start == p.start);
-    if !flows.is_empty() {
-        let label = format!("{}  ▾", playing.map_or(tr("Flows"), |f| f.name.as_str()));
-        let tip = playing.map(|f| f.description.trim()).filter(|d| !d.is_empty()).unwrap_or(tr("Flows")).to_string();
-        let galley = left.layout_no_wrap(label, semibold(11.5), text);
-        let fr = Rect::from_min_size(pos2(lx, bar.center().y - 12.0), vec2(galley.size().x + 16.0, 24.0));
-        let resp = ui.interact(fr.intersect(left.clip_rect()), ui.id().with("pflows"), Sense::click()).tip(tip);
-        if resp.hovered() {
-            left.rect_filled(fr, CornerRadius::same(5), hover);
-        }
-        left.galley(pos2(fr.min.x + 8.0, fr.center().y - galley.size().y / 2.0), galley, text);
-        crate::right::menu_popup(&resp).width(240.0).show(|ui| {
-            let t = Tokens::get(ui.ctx());
-            for f in &flows {
-                if crate::right::menu_check(ui, f.start == p.start, &f.name, "") {
-                    p.restart(f.start, now);
-                    ui.close();
-                }
-                let d = f.description.trim();
-                if !d.is_empty() {
-                    egui::Frame::NONE.inner_margin(egui::Margin { left: 26, right: 8, top: 0, bottom: 4 }).show(ui, |ui| {
-                        ui.add(egui::Label::new(egui::RichText::new(d).font(regular(10.5)).color(t.text_secondary)).wrap());
-                    });
-                }
-            }
-        });
-        lx = fr.max.x + 8.0;
-        left.text(pos2(lx, bar.center().y), Align2::LEFT_CENTER, "/", regular(11.5), dim);
-        lx += 14.0;
-    }
-    left.text(pos2(lx, bar.center().y), Align2::LEFT_CENTER, name, regular(11.5), if chrome.pane { text } else { Color32::from_gray(220) });
-    action
-}
-
-/// The full-window presenter's options menu: how the prototype is sized (Z cycles them), whether
-/// the frame is responsive (a file setting: the frame takes the window's size, or on a device the
-/// screen's, instead of being scaled or shown at a fixed size), the device's body, hotspot hints,
-/// restart (R).
-fn options_menu(p: &mut Presenter, ui: &mut Ui, device: Option<Device>, responsive: bool, now: f64) -> Option<BarAction> {
-    use crate::right::menu_check;
-    let mut action = None;
-    let on_device = device.is_some();
-    // Without a device, responsive is one of the sizes: the frame fills the window at 100%.
-    if !on_device && menu_check(ui, responsive, tr("Responsive"), "") {
-        action = Some(BarAction::Responsive(true));
-        ui.close();
-    }
-    for s in PresentScale::options(on_device) {
-        if menu_check(ui, p.view.scale == *s && (on_device || !responsive), s.label(on_device), "") {
-            p.set_scale(*s);
-            if !on_device && responsive {
-                action = Some(BarAction::Responsive(false));
-            }
-            ui.close();
-        }
-    }
-    if (on_device || !responsive) && menu_check(ui, false, tr("Next size option"), "Z") {
-        p.set_scale(p.view.scale.next(on_device));
-        ui.close();
-    }
-    ui.separator();
-    // On a device: the frame takes the screen's size, or keeps its own (clipped or scrolling).
-    if on_device {
-        for (on, label) in [(true, tr("Responsive")), (false, tr("Fixed size"))] {
-            if menu_check(ui, responsive == on, label, "") {
-                action = (responsive != on).then_some(BarAction::Responsive(on));
-                ui.close();
-            }
-        }
-        ui.separator();
-    }
-    if device.is_some_and(|d| !d.colors.is_empty()) && menu_check(ui, p.view.device_frame, tr("Show device frame"), "") {
-        p.view.device_frame = !p.view.device_frame;
-        ui.close();
-    }
-    if menu_check(ui, p.view.hotspot_hints, tr("Show hotspot hints"), "") {
-        p.view.hotspot_hints = !p.view.hotspot_hints;
-        ui.close();
-    }
-    if menu_check(ui, false, tr("Restart"), "R") {
-        p.restart(p.start, now);
-        ui.close();
-    }
-    action
-}
-
-/// Scrolling frames under the screen point `q`, innermost first: those of `root` (in the display
-/// document `disp`) that can scroll (`base` is the player's document without scroll offsets).
-fn scrollers_at(p: &Presenter, base: &Document, disp: &Document, root: NodeId, place: &Place, q: Pos2) -> Vec<NodeId> {
-    let mut out: Vec<NodeId> = disp
-        .subtree(root)
-        .into_iter()
-        .filter(|f| disp.node(*f).is_some_and(|n| n.visible && n.overflow != Overflow::None))
-        .filter(|f| disp.world_bounds(*f).is_some_and(|b| place.rect(b).contains(q)))
-        .filter(|f| p.range(base, *f) != (0.0, 0.0))
-        .collect();
-    out.reverse();
-    out
-}
-
-/// Keep a key the prototype used from reaching the editor's shortcuts.
-fn consume_key(ctx: &egui::Context, key: egui::Key) {
-    ctx.input_mut(|i| i.events.retain(|e| !matches!(e, egui::Event::Key { key: k, .. } if *k == key)));
-}
-
-/// Screen points → `t`'s units (page units for frames, points for the view).
-fn units_per_point(t: Scroller, scale: f64) -> f64 {
-    match t {
-        Scroller::Frame(_) => 1.0 / scale.max(1e-6),
-        Scroller::View => 1.0,
-    }
-}
-
-/// Pointer, wheel, keys and timers. `over_area`: the pointer is over the player; `keys_on`: the
-/// player takes the keyboard; `pane`: it plays in the preview pane (which always fits).
-#[allow(clippy::too_many_arguments)]
-fn input(p: &mut Presenter, ctx: &egui::Context, l: &Layout, over_area: bool, keys_on: bool, pane: bool, now: f64) {
-    let (pos, pressed, released, down, wheel, velocity, dt, keys) = ctx.input(|i| {
-        let keys: Vec<(egui::Key, egui::Modifiers)> = i
-            .events
-            .iter()
-            .filter_map(|e| match e {
-                egui::Event::Key { key, pressed: true, repeat: false, modifiers, .. } => Some((*key, *modifiers)),
-                _ => None,
-            })
-            .collect();
-        (
-            i.pointer.hover_pos(),
-            i.pointer.button_pressed(egui::PointerButton::Primary),
-            i.pointer.button_released(egui::PointerButton::Primary),
-            i.pointer.primary_down(),
-            i.smooth_scroll_delta,
-            i.pointer.velocity(),
-            f64::from(i.unstable_dt).clamp(1.0 / 500.0, 0.1),
-            keys,
-        )
-    });
-    let keys = if keys_on { keys } else { Vec::new() };
-    let pads = std::mem::take(&mut p.pads);
-    // A transition a drag started follows the pointer while it stays down, then plays on from there.
-    if let Some(a) = p.anim.as_mut()
-        && let Some((from, dir, len)) = a.follow
-    {
-        match pos.filter(|_| down) {
-            Some(q) => a.start = now - f64::from(((q - from).dot(dir) / len).clamp(0.0, 1.0)) * a.dur,
-            None => a.follow = None,
-        }
-    }
-    let pos = pos.filter(|_| over_area || p.press.is_some());
-    // A drag that scrolled lets go: it carries on at the pointer's speed (and springs back from
-    // past the ends).
-    if !down && let Some((t, _)) = p.drag_scroll.take() {
-        let u = units_per_point(t, l.scale);
-        let r = p.doc.as_ref().map_or((0.0, 0.0), |b| p.limits(b, t));
-        let along = |v: f32, r: f64| if r > 0.0 { -f64::from(v) * u } else { 0.0 };
-        p.fling = Some(Fling { target: t, vel: (along(velocity.x, r.0), along(velocity.y, r.1)), decay: DECAY_DRAG, bounce: true, at: now });
-    }
-    // The active layer: the top overlay, else the frame.
-    let (root, place, clip) = l.active(p.current);
-    let doc = &l.disp;
-    let hot = hotspots(doc, root, &place, clip);
-    p.hot.clone_from(&hot);
-    if p.fire_waiting(root, now) {
-        return;
-    }
-    // "While hovering / pressing" reverts.
-    if let Some(tmp) = &p.temp {
-        let leave = if tmp.press { released || !down } else { pos.is_none_or(|q| !tmp.rect.contains(q)) };
-        if leave {
-            p.revert(now);
-            return;
-        }
-    }
-    // The wheel scrolls the innermost frame under the pointer that can still move that way, else
-    // pans a view bigger than the window. When it stops it coasts on, slowing down.
-    if wheel != Vec2::ZERO
-        && let Some(q) = pos
-        && let Some(base) = p.doc.clone()
-    {
-        let mut targets: Vec<Scroller> = scrollers_at(p, &base, doc, root, &place, q).into_iter().map(Scroller::Frame).collect();
-        if p.pan_range != (0.0, 0.0) {
-            targets.push(Scroller::View);
-        }
-        let mut moved = None;
-        for t in targets {
-            let u = units_per_point(t, l.scale);
-            let cur = p.offset(t);
-            let next = clamp_scroll((cur.0 - f64::from(wheel.x) * u, cur.1 - f64::from(wheel.y) * u), p.limits(&base, t));
-            if (next.0 - cur.0).abs() > 1e-6 || (next.1 - cur.1).abs() > 1e-6 {
-                p.set_offset(t, next);
-                p.scroll_anim = None;
-                p.fling = None;
-                moved = Some((t, ((next.0 - cur.0) / dt, (next.1 - cur.1) / dt)));
-                break;
-            }
-        }
-        // The wheel's speed, smoothed over ~50 ms whatever the frame rate.
-        p.wheel = moved.map(|(t, inst)| {
-            let prev = p.wheel.filter(|w| w.0 == t).map_or(inst, |w| w.1);
-            let a = 1.0 - (-dt / 0.05).exp();
-            (t, (lerp(prev.0, inst.0, a), lerp(prev.1, inst.1, a)))
-        });
-    } else if wheel == Vec2::ZERO
-        && let Some((t, v)) = p.wheel.take()
-        && v.0.hypot(v.1) > COAST_MIN * units_per_point(t, l.scale)
-    {
-        p.fling = Some(Fling { target: t, vel: v, decay: DECAY_WHEEL, bounce: false, at: now });
-    }
-    let hits: Vec<(NodeId, Rect)> = hot.iter().rev().filter(|(_, r)| pos.is_some_and(|q| r.contains(q))).copied().collect();
-    if !hits.is_empty() {
-        ctx.set_cursor_icon(egui::CursorIcon::PointingHand);
-    }
-    // First (top-most) hit that has a matching trigger.
-    let pick = |want: &dyn Fn(&Trigger) -> bool| -> Option<(NodeId, usize, Rect)> {
-        hits.iter().find_map(|(id, r)| find_trigger(doc, *id, want).map(|k| (*id, k, *r)))
-    };
-    // Enter / leave.
-    let ids: Vec<NodeId> = hits.iter().map(|h| h.0).collect();
-    let entered: Vec<(NodeId, Rect)> = hits.iter().filter(|(id, _)| !p.hovered.contains(id)).copied().collect();
-    let left: Vec<NodeId> = p.hovered.iter().filter(|id| !ids.contains(id)).copied().collect();
-    p.hovered = ids;
-    for id in left {
-        if let Some(k) = find_trigger(doc, id, |t| *t == Trigger::MouseLeave)
-            && p.gesture(id, k, None, now, root)
-        {
-            return;
-        }
-    }
-    for (id, r) in &entered {
-        if let Some(k) = find_trigger(doc, *id, |t| *t == Trigger::MouseEnter)
-            && p.gesture(*id, k, Some(*r), now, root)
-        {
-            return;
-        }
-    }
-    if p.temp.is_none()
-        && !entered.is_empty()
-        && let Some((id, k, r)) = pick(&|t| *t == Trigger::OnHover)
-        && entered.iter().any(|e| e.0 == id)
-        && p.fire(id, k, Some(r), now)
-    {
-        return;
-    }
-    // Press / drag / release.
-    if pressed && pos.is_some() && over_area {
-        p.press = pos;
-        p.dragged = false;
-        // Pressing catches a fling (one springing back from past an end carries on).
-        let overscrolled = |f: &Fling| p.doc.as_ref().is_some_and(|b| clamp_scroll(p.offset(f.target), p.limits(b, f.target)) != p.offset(f.target));
-        p.fling = p.fling.filter(overscrolled);
-        p.wheel = None;
-        if let (Some((_, _, orect)), Some(o), Some(q)) = (l.overlays.last(), p.overlays.last(), pos)
-            && !orect.contains(q)
-        {
-            if o.close_on_outside {
-                p.close_overlay(now);
-                p.press = None;
-                p.hovered.clear();
-            }
-            return;
-        }
-        if let Some((id, k, r)) = pick(&|t| *t == Trigger::MouseDown)
-            && p.gesture(id, k, Some(r), now, root)
-        {
-            return;
-        }
-        if let Some((id, k, r)) = pick(&|t| *t == Trigger::OnPress)
-            && p.fire(id, k, Some(r), now)
-        {
-            return;
-        }
-    }
-    if down
-        && !p.dragged
-        && let (Some(start), Some(q)) = (p.press, pos)
-        && start.distance(q) > 6.0
-    {
-        p.dragged = true;
-        let at_start: Vec<(NodeId, Rect)> = hot.iter().rev().filter(|(_, r)| r.contains(start)).copied().collect();
-        // A directional transition starts only on a drag its way (else the drag may scroll).
-        let d = q - start;
-        let drags =
-            |id: NodeId| doc.node(id)?.interactions.iter().position(|it| it.trigger == Trigger::OnDrag && it.transition.accepts_drag(d.x, d.y));
-        if let Some((id, k, r)) = at_start.iter().find_map(|(id, r)| drags(*id).map(|k| (*id, k, *r)))
-            && p.fire(id, k, Some(r), now)
-        {
-            p.press = None;
-            // The transition it started follows the pointer: along its direction, else the drag's
-            // main axis, completing over the screen's size that way.
-            if let Some(a) = p.anim.as_mut().filter(|a| a.start == now) {
-                let (x, y) = a
-                    .transition
-                    .direction()
-                    .map_or_else(|| if d.x.abs() >= d.y.abs() { (d.x.signum(), 0.0) } else { (0.0, d.y.signum()) }, direction_vec);
-                let len = if x != 0.0 { l.screen.width() } else { l.screen.height() };
-                a.follow = Some((start, vec2(x, y), len.max(1.0)));
-            }
-            return;
-        }
-        // Otherwise the drag scrolls the innermost frame under it that scrolls, else pans a view
-        // bigger than the window.
-        if let Some(base) = p.doc.clone() {
-            let target = scrollers_at(p, &base, doc, root, &place, start)
-                .first()
-                .copied()
-                .map(Scroller::Frame)
-                .or((p.pan_range != (0.0, 0.0)).then_some(Scroller::View));
-            if let Some(t) = target {
-                p.fling = None;
-                p.drag_scroll = Some((t, clamp_scroll(p.offset(t), p.limits(&base, t))));
-            }
-        }
-    }
-    // Dragging scrolls with the pointer; past the ends it stretches.
-    if down
-        && let (Some((t, from)), Some(start), Some(q)) = (p.drag_scroll, p.press, pos)
-        && let Some(base) = p.doc.as_ref()
-    {
-        let (d, u) = (q - start, units_per_point(t, l.scale));
-        let r = p.limits(base, t);
-        let limit = RUBBER_PTS * u;
-        let to = (rubber_band(from.0 - f64::from(d.x) * u, r.0, limit), rubber_band(from.1 - f64::from(d.y) * u, r.1, limit));
-        p.set_offset(t, to);
-        p.scroll_anim = None;
-        ctx.set_cursor_icon(egui::CursorIcon::Grabbing);
-    }
-    if released && p.press.is_some() {
-        let dragged = p.dragged;
-        p.press = None;
-        p.dragged = false;
-        p.drag_scroll = None;
-        if let Some((id, k, r)) = pick(&|t| *t == Trigger::MouseUp)
-            && p.gesture(id, k, Some(r), now, root)
-        {
-            return;
-        }
-        if !dragged {
-            if let Some((id, k, r)) = pick(&|t| *t == Trigger::OnClick)
-                && p.fire(id, k, Some(r), now)
-            {
-                return;
-            }
-            // A widget's clickable part calls its plugin back (after the frame, with the session).
-            if let Some(q) = pos
-                && let Some(t) = layer_at(doc, root, &place, q).and_then(|hit| figcraft_engine::widgets::target_at(doc, hit, place.page(q)))
-            {
-                p.widget_clicks.push(t);
-                return;
-            }
-            // Clicking where nothing reacts flashes the hotspots.
-            if p.view.hotspot_hints {
-                p.flash_until = now + FLASH_SECS;
-            }
-        }
-    }
-    // Controller buttons: pressed alone, anywhere on the screen, like keys.
-    for name in &pads {
-        let found = doc.subtree(root).into_iter().find_map(|id| find_trigger(doc, id, |t| t.fires_on_key(name, KeyMods::default())).map(|k| (id, k)));
-        if let Some((id, k)) = found
-            && p.fire(id, k, None, now)
-        {
-            return;
-        }
-    }
-    // Keys.
-    for (key, mods) in &keys {
-        let (name, held) = (key.name(), KeyMods { ctrl: mods.ctrl, alt: mods.alt, shift: mods.shift, cmd: mods.mac_cmd });
-        let found = doc.subtree(root).into_iter().find_map(|id| find_trigger(doc, id, |t| t.fires_on_key(name, held)).map(|k| (id, k)));
-        if let Some((id, k)) = found {
-            if p.fire(id, k, None, now) {
-                consume_key(ctx, *key);
-                return;
-            }
-            continue;
-        }
-        // The player's own keys, when the prototype doesn't use them: R restarts, Z cycles the
-        // full-window presenter's size options.
-        if mods.is_none() {
-            match key {
-                egui::Key::R => {
-                    p.restart(p.start, now);
-                    consume_key(ctx, *key);
-                    return;
-                }
-                // (A responsive frame filling the window has no size options.)
-                egui::Key::Z if !pane && (l.device.is_some() || p.fit.is_none()) => {
-                    p.set_scale(p.view.scale.next(l.device.is_some()));
-                    consume_key(ctx, *key);
-                    return;
-                }
-                _ => {}
-            }
-        }
-        // The arrows (and Space or N forward) step through top-level frames when nothing else
-        // uses them.
-        let forward = match key {
-            egui::Key::ArrowRight => Some(true),
-            egui::Key::Space | egui::Key::N if mods.is_none() => Some(true),
-            egui::Key::ArrowLeft => Some(false),
-            _ => None,
-        };
-        if let Some(forward) = forward
-            && p.overlays.is_empty()
-            && let Some(base) = p.doc.as_ref()
-        {
-            let frames = base.top_frames(base.page_of(p.current).unwrap_or(p.current));
-            if let Some(i) = frames.iter().position(|f| *f == p.current) {
-                let next = if forward { frames.get(i + 1) } else { i.checked_sub(1).and_then(|j| frames.get(j)) };
-                if let Some(n) = next.copied() {
-                    p.go(n, Transition::Instant, 0.0, Easing::Linear, now, true, false);
-                    consume_key(ctx, *key);
-                    return;
-                }
-            }
-        }
-    }
-    // After delay (timers start when the frame appears; not while animating).
-    if p.anim.is_none()
-        && let Some(((id, k), due)) = next_delay(p, doc, root, now)
-        && due <= 0.0
-    {
-        p.delays_fired.insert((id, k));
-        p.fire(id, k, None, now);
-    }
-}
-
-fn draw(p: &mut Presenter, painter: &egui::Painter, ctx: &egui::Context, l: &Layout, now: f64) {
-    let ppp = f64::from(ctx.pixels_per_point());
-    let px = l.scale * ppp;
-    let uv = Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0));
-    let to_tex = p.texture(ctx, &l.disp, p.current, px, now);
-    // Transition progress.
-    let mut drawn = false;
-    if let Some(a) = &p.anim {
-        let raw = ((now - a.start) / a.dur.max(1e-3)).clamp(0.0, 1.0);
-        if raw >= 1.0 {
-            p.anim = None;
-        } else {
-            ctx.request_repaint();
-            let e = a.easing.eval(raw);
-            let from_place = a.from_doc.world_bounds(a.from_frame).map(|fb| Place::centered(fb, l.screen.center(), l.scale));
-            if matches!(a.transition, Transition::SmartAnimate) {
-                #[cfg(not(target_arch = "wasm32"))]
-                let t0 = std::time::Instant::now();
-                let tmp = smart_interpolate(&a.from_doc, a.from_frame, &l.disp, p.current, e);
-                let bounds = figcraft_render::export_bounds(&tmp, p.current);
-                if let Some(b) = bounds
-                    && let Some(pix) = figcraft_render::render_node(&tmp, p.current, texture_scale(ctx, b, px))
-                {
-                    let img = crate::render_worker::screen_image(&pix, tmp.color_profile);
-                    let tex = match &mut p.anim_tex {
-                        Some(t) => {
-                            t.set(img, egui::TextureOptions::LINEAR);
-                            t.clone()
-                        }
-                        None => {
-                            let t = ctx.load_texture("present-anim", img, egui::TextureOptions::LINEAR);
-                            p.anim_tex = Some(t.clone());
-                            t
-                        }
-                    };
-                    painter.with_clip_rect(l.screen).image(tex.id(), l.place.rect(b), uv, Color32::WHITE);
-                    drawn = true;
-                }
-                #[cfg(not(target_arch = "wasm32"))]
-                {
-                    p.render_ms = t0.elapsed().as_secs_f64() * 1000.0;
-                }
-            } else if let (Some(ft), Some(to), Some(fp)) = (&a.from_tex, &to_tex, from_place) {
-                let f = transition_frames(a.transition, e as f32);
-                let from_rect = fp.rect(ft.bounds);
-                let from_frame_rect = a.from_doc.world_bounds(a.from_frame).map(|b| fp.rect(b)).unwrap_or(from_rect);
-                let to_rect = l.place.rect(to.bounds);
-                let off = |r: Rect, o: (f32, f32)| vec2(r.width() * o.0, r.height() * o.1);
-                // Without a device a dissolve shows both frames whole; on one, the screen clips.
-                let dissolve_both = l.device.is_none() && matches!(a.transition, Transition::Dissolve);
-                let clip = painter.with_clip_rect(if dissolve_both { l.screen.union(from_frame_rect) } else { l.screen });
-                let draw_from = |p: &egui::Painter| {
-                    if f.from_alpha > 0.0 {
-                        p.image(ft.tex.id(), from_rect.translate(off(from_frame_rect, f.from_off)), uv, Color32::WHITE.gamma_multiply(f.from_alpha));
-                    }
-                };
-                let draw_to = |p: &egui::Painter| {
-                    p.image(to.tex.id(), to_rect.translate(off(l.screen, f.to_off)), uv, Color32::WHITE.gamma_multiply(f.to_alpha));
-                };
-                if f.from_on_top {
-                    draw_to(&clip);
-                    draw_from(&clip);
-                } else {
-                    draw_from(&clip);
-                    draw_to(&clip);
-                }
-                drawn = true;
-            }
-        }
-    }
-    if !drawn && let Some(to) = &to_tex {
-        painter.with_clip_rect(l.clip).image(to.tex.id(), l.place.rect(to.bounds), uv, Color32::WHITE);
-    }
-    // Overlays (each with its background and opening transition); closing ones run it backwards.
-    let mut ovs: Vec<(f64, OverlayState)> =
-        p.overlays.iter().map(|o| (if o.dur > 0.0 { ((now - o.opened) / o.dur).clamp(0.0, 1.0) } else { 1.0 }, o.clone())).collect();
-    let mut placed: Vec<(NodeId, Place, Rect)> = l.overlays.clone();
-    for ((at, o), pl) in p.closing.iter().zip(l.closing.iter()) {
-        if now - at >= o.dur {
-            continue;
-        }
-        ovs.insert(0, (1.0 - ((now - at) / o.dur.max(1e-3)).clamp(0.0, 1.0), o.clone()));
-        placed.insert(0, *pl);
-    }
-    let on_screen = painter.with_clip_rect(l.screen);
-    for ((raw, o), (id, place, orect)) in ovs.iter().zip(placed.iter()) {
-        let raw = *raw;
-        if raw < 1.0 {
-            ctx.request_repaint();
-        }
-        let e = o.easing.eval(raw) as f32;
-        let f = if matches!(o.transition, Transition::Instant) {
-            transition_frames(Transition::Dissolve, 1.0)
-        } else {
-            transition_frames(o.transition, e)
-        };
-        if let Some(bgc) = o.background {
-            let c = crate::theme::doc_c32(ctx, bgc);
-            on_screen.rect_filled(l.screen, CornerRadius::ZERO, c.gamma_multiply(raw as f32));
-        }
-        if let Some(tex) = p.texture(ctx, &l.disp, *id, px, now) {
-            let r = place.rect(tex.bounds).translate(vec2(orect.width() * f.to_off.0, orect.height() * f.to_off.1));
-            on_screen.image(tex.tex.id(), r, uv, Color32::WHITE.gamma_multiply(f.to_alpha));
-        }
-    }
-    // Finished closing animations go (after drawing, so they stayed paired with the layout).
-    p.closing.retain(|(at, o)| now - at < o.dur);
-    // Hotspot flash after a click on nothing.
-    if now < p.flash_until {
-        let (root, place, clip) = l.active(p.current);
-        let a = ((p.flash_until - now) / FLASH_SECS) as f32;
-        for (_, r) in hotspots(&l.disp, root, &place, clip) {
-            painter.rect_filled(r, CornerRadius::same(4), ACCENT.gamma_multiply(0.25 * a));
-            painter.rect_stroke(r, CornerRadius::same(4), Stroke::new(1.5, ACCENT.gamma_multiply(a)), StrokeKind::Outside);
-        }
-        ctx.request_repaint();
+/// If no layer on the screen opened the overlay, the screen places it.
+pub fn anchored_overlay_rect(
+    pos: OverlayPosition,
+    anchor_to: OverlayAnchor,
+    base: Rect,
+    size: Vec2,
+    anchor: Option<Rect>,
+    offset: Option<Vec2>,
+) -> Rect {
+    let on_trigger =
+        anchor.and_then(|a| anchor_to.offset(pos, [f64::from(a.width()), f64::from(a.height())], [f64::from(size.x), f64::from(size.y)]));
+    match on_trigger {
+        Some([x, y]) => overlay_rect(OverlayPosition::Manual, base, size, anchor, Some(vec2(x as f32, y as f32))),
+        None => overlay_rect(pos, base, size, anchor, offset),
     }
 }
 
 #[cfg(test)]
-#[path = "present_variables_tests.rs"]
 mod variables_tests;
 
 #[cfg(test)]
-#[path = "present_behaviour_tests.rs"]
 mod behaviour_tests;
 
 #[cfg(test)]
-#[path = "present_tail_tests.rs"]
 mod tail_tests;
 
 #[cfg(test)]
-#[path = "present_delay_tests.rs"]
 mod delay_tests;
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use figcraft_doc::NodeKind;
+mod overlay_anchor_tests;
 
-    fn doc_with_two_frames() -> (Document, NodeId, NodeId) {
-        let mut d = Document::new("t");
-        let page = d.add_page("Page 1");
-        let a = d.create(page, NodeKind::Frame, "A", 0.0, 0.0, 200.0, 400.0).unwrap();
-        let b = d.create(page, NodeKind::Frame, "B", 300.0, 0.0, 200.0, 400.0).unwrap();
-        (d, a, b)
-    }
-
-    #[test]
-    fn closed_overlays_animate_out_unless_instant() {
-        let (_, a, b) = doc_with_two_frames();
-        let mut p = Presenter::new(a);
-        let ov = |transition, opened| OverlayState {
-            id: b,
-            position: OverlayPosition::Center,
-            close_on_outside: true,
-            background: None,
-            anchor: None,
-            offset: None,
-            opened,
-            transition,
-            dur: 0.3,
-            easing: Easing::EaseOut,
-        };
-        p.overlays.push(ov(Transition::Dissolve, 0.0));
-        assert!(p.close_overlay(10.0));
-        assert!(p.overlays.is_empty());
-        assert_eq!(p.closing.len(), 1);
-        assert_eq!(p.closing[0].0, 10.0, "fully open: the reverse starts now");
-        // Closed half way through opening: it reverses from there.
-        p.overlays.push(ov(Transition::Dissolve, 20.0));
-        p.close_overlay(20.15);
-        assert!((p.closing[1].0 - 20.0).abs() < 1e-9);
-        // Instant overlays just go.
-        p.overlays.push(ov(Transition::Instant, 30.0));
-        p.close_overlay(31.0);
-        assert_eq!(p.closing.len(), 2);
-        assert!(!p.close_overlay(32.0), "nothing left to close");
-    }
-
-    #[test]
-    fn matching_by_name_path() {
-        let (mut d, a, b) = doc_with_two_frames();
-        let ga = d.create(a, NodeKind::Group, "Card", 0.0, 0.0, 10.0, 10.0).unwrap();
-        let ra = d.create(ga, NodeKind::Rectangle, "Box", 0.0, 0.0, 10.0, 10.0).unwrap();
-        let ra2 = d.create(ga, NodeKind::Rectangle, "Box", 0.0, 0.0, 10.0, 10.0).unwrap();
-        let only_a = d.create(a, NodeKind::Rectangle, "Gone", 0.0, 0.0, 10.0, 10.0).unwrap();
-        let gb = d.create(b, NodeKind::Group, "Card", 0.0, 0.0, 10.0, 10.0).unwrap();
-        let rb = d.create(gb, NodeKind::Rectangle, "Box", 0.0, 0.0, 10.0, 10.0).unwrap();
-        let rb2 = d.create(gb, NodeKind::Rectangle, "Box", 0.0, 0.0, 10.0, 10.0).unwrap();
-        // Same name, different parent: no match.
-        let _other = d.create(b, NodeKind::Rectangle, "Box", 0.0, 0.0, 10.0, 10.0).unwrap();
-        let m = match_layers(&d, a, &d, b);
-        assert_eq!(m, vec![(ga, gb), (ra, rb), (ra2, rb2)]);
-        assert!(!m.iter().any(|(f, _)| *f == only_a));
-        assert_eq!(name_path(&d, a, ra).as_deref(), Some("Card\u{1f}Box"));
-        assert_eq!(name_path(&d, b, ra), None);
-    }
-
-    #[test]
-    fn smart_interpolate_tweens_matched_and_fades_the_rest() {
-        let (mut d, a, b) = doc_with_two_frames();
-        let ra = d.create(a, NodeKind::Rectangle, "Box", 0.0, 0.0, 20.0, 20.0).unwrap();
-        let rb = d.create(b, NodeKind::Rectangle, "Box", 100.0, 200.0, 60.0, 40.0).unwrap();
-        {
-            let n = d.get_mut(ra).unwrap();
-            n.fills = vec![Paint::solid(Color::new(1.0, 0.0, 0.0, 1.0))];
-            n.corners.radii = [0.0; 4];
-            n.opacity = 1.0;
-        }
-        {
-            let n = d.get_mut(rb).unwrap();
-            n.fills = vec![Paint::solid(Color::new(0.0, 0.0, 1.0, 1.0))];
-            n.corners.radii = [20.0; 4];
-            n.opacity = 0.5;
-            // Rotate 90° about its centre.
-            let c = (130.0, 220.0);
-            n.transform = Affine::translate(c) * Affine::rotate(std::f64::consts::FRAC_PI_2) * Affine::translate((-30.0, -20.0));
-        }
-        let only_b = d.create(b, NodeKind::Rectangle, "New", 0.0, 0.0, 5.0, 5.0);
-        let only_a = d.create(a, NodeKind::Rectangle, "Old", 0.0, 0.0, 5.0, 5.0).unwrap();
-        let mid = smart_interpolate(&d, a, &d, b, 0.5);
-        let n = mid.node(rb).unwrap();
-        assert!((n.width - 40.0).abs() < 1e-9 && (n.height - 30.0).abs() < 1e-9);
-        assert!((n.opacity - 0.75).abs() < 1e-6);
-        assert!((n.corners.radii[0] - 10.0).abs() < 1e-9);
-        let c = n.fills[0].solid_color().unwrap();
-        assert!((c.r - 0.5).abs() < 0.02 && (c.b - 0.5).abs() < 0.02, "{c:?}");
-        // Centre halfway between (10, 10) and (130, 220) in frame space; rotated 45°.
-        let ctr = mid.world_transform(b).inverse() * mid.world_transform(rb) * Point::new(n.width / 2.0, n.height / 2.0);
-        assert!((ctr.x - 70.0).abs() < 1e-6 && (ctr.y - 115.0).abs() < 1e-6, "{ctr:?}");
-        let [aa, bb, ..] = n.transform.as_coeffs();
-        assert!((bb.atan2(aa) - std::f64::consts::FRAC_PI_4).abs() < 1e-6);
-        if let Ok(ob) = only_b {
-            assert!((mid.node(ob).unwrap().opacity - 0.5).abs() < 1e-6);
-        }
-        // The source-only layer is copied into the destination frame, half faded.
-        let copies: Vec<_> = mid.node(b).unwrap().children.iter().filter_map(|c| mid.node(*c)).filter(|n| n.name == "Old").collect();
-        assert_eq!(copies.len(), 1);
-        assert!((copies[0].opacity - 0.5).abs() < 1e-6);
-        assert_ne!(copies[0].id, only_a);
-        // At the end it is exactly the destination.
-        let end = smart_interpolate(&d, a, &d, b, 1.0);
-        assert_eq!(end.node(rb), d.node(rb));
-        assert_eq!(end.node(b).unwrap().children, d.node(b).unwrap().children);
-        // At the start the matched layer sits where the source was.
-        let start = smart_interpolate(&d, a, &d, b, 0.0);
-        let s = start.world_bounds(rb).unwrap();
-        let f = start.world_bounds(b).unwrap();
-        assert!((s.x0 - f.x0).abs() < 1e-6 && (s.y0 - f.y0).abs() < 1e-6 && (s.width() - 20.0).abs() < 1e-6);
-    }
-
-    #[test]
-    fn scroll_offsets_fixed_and_sticky() {
-        let (mut d, a, _) = doc_with_two_frames();
-        d.get_mut(a).unwrap().overflow = Overflow::Vertical;
-        let long = d.create(a, NodeKind::Rectangle, "Long", 0.0, 0.0, 200.0, 1000.0).unwrap();
-        let fixed = d.create(a, NodeKind::Rectangle, "Bar", 0.0, 350.0, 200.0, 50.0).unwrap();
-        let sticky = d.create(a, NodeKind::Rectangle, "Header", 0.0, 100.0, 200.0, 40.0).unwrap();
-        d.get_mut(fixed).unwrap().scroll_position = ScrollPosition::Fixed;
-        d.get_mut(sticky).unwrap().scroll_position = ScrollPosition::Sticky;
-        assert_eq!(scroll_range(&d, a), (0.0, 600.0));
-        d.get_mut(a).unwrap().overflow = Overflow::Horizontal;
-        assert_eq!(scroll_range(&d, a), (0.0, 0.0));
-        d.get_mut(a).unwrap().overflow = Overflow::Vertical;
-        let mut s = HashMap::new();
-        s.insert(a, (0.0, 50.0));
-        let out = apply_scroll(&d, &s);
-        let y = |doc: &Document, id| doc.world_bounds(id).unwrap().y0;
-        assert_eq!(y(&out, long), -50.0);
-        assert_eq!(y(&out, fixed), 350.0);
-        assert_eq!(y(&out, sticky), 50.0);
-        s.insert(a, (0.0, 300.0));
-        let out = apply_scroll(&d, &s);
-        assert_eq!(y(&out, long), -300.0);
-        assert_eq!(y(&out, sticky), 0.0);
-    }
-
-    /// A page presented on an iPhone 16 (393×852): a tall screen A that scrolls vertically, with a
-    /// tab bar fixed to its bottom, a nested scrolling list and a layer at its end; screen B.
-    fn device_doc() -> (Document, NodeId, NodeId, NodeId, NodeId, NodeId) {
-        let mut d = Document::new("t");
-        let page = d.add_page("Page 1");
-        if let NodeKind::Page { prototype, .. } = &mut d.get_mut(page).unwrap().kind {
-            prototype.device = "iPhone 16".into();
-        }
-        let a = d.create(page, NodeKind::Frame, "A", 0.0, 0.0, 393.0, 2000.0).unwrap();
-        let b = d.create(page, NodeKind::Frame, "B", 500.0, 0.0, 393.0, 1500.0).unwrap();
-        for f in [a, b] {
-            d.get_mut(f).unwrap().overflow = Overflow::Vertical;
-        }
-        let bar = d.create(a, NodeKind::Rectangle, "Tab bar", 0.0, 1940.0, 393.0, 60.0).unwrap();
-        let n = d.get_mut(bar).unwrap();
-        n.scroll_position = ScrollPosition::Fixed;
-        n.constraints.vertical = VConstraint::Bottom;
-        let list = d.create(a, NodeKind::Frame, "List", 0.0, 1200.0, 393.0, 300.0).unwrap();
-        d.get_mut(list).unwrap().overflow = Overflow::Vertical;
-        let item = d.create(list, NodeKind::Rectangle, "Item", 0.0, 700.0, 393.0, 100.0).unwrap();
-        (d, a, b, bar, list, item)
-    }
-
-    fn player_on(d: Document, start: NodeId) -> Presenter {
-        let mut p = Presenter::new(start);
-        p.sync(&Arc::new(d), 0.0);
-        p
-    }
-
-    #[test]
-    fn device_screen_clips_the_frame_and_it_scrolls_through_its_height() {
-        let (mut d, a, _, bar, list, _) = device_doc();
-        assert_eq!(viewport(&d, a), Some((393.0, 852.0)));
-        // On the device the whole frame scrolls; at its own size nothing overflows it.
-        assert_eq!(scroll_range_in(&d, a, viewport(&d, a)), (0.0, 1148.0));
-        assert_eq!(scroll_range(&d, a), (0.0, 0.0));
-        // Nested frames scroll within themselves.
-        assert_eq!(scroll_range(&d, list), (0.0, 500.0));
-        // The display copy is sized to the screen; the fixed tab bar moves to the screen's bottom.
-        let mut p = player_on(d.clone(), a);
-        let disp = p.display().unwrap();
-        assert_eq!((disp.node(a).unwrap().width, disp.node(a).unwrap().height), (393.0, 852.0));
-        assert_eq!(disp.world_bounds(bar).unwrap().y0, 792.0);
-        // Scrolled, it stays there while the content moves.
-        p.scroll_to(0.0, 400.0);
-        let disp = p.display().unwrap();
-        assert_eq!(disp.world_bounds(bar).unwrap().y0, 792.0);
-        assert_eq!(disp.world_bounds(list).unwrap().y0, 800.0);
-        p.scroll_to(0.0, 99_999.0);
-        assert_eq!(p.scroll[&a], (0.0, 1148.0), "clamped to the range");
-        // Without scrolling the screen only clips; without a device the frame shows whole.
-        d.get_mut(a).unwrap().overflow = Overflow::None;
-        assert_eq!(scroll_range_in(&d, a, viewport(&d, a)), (0.0, 0.0));
-        if let Some(pg) = d.page_of(a)
-            && let NodeKind::Page { prototype, .. } = &mut d.get_mut(pg).unwrap().kind
-        {
-            prototype.device = "None".into();
-        }
-        assert_eq!(viewport(&d, a), None);
-        // A frame wider than the screen scrolls sideways when it scrolls both ways.
-        let (mut d, a, ..) = device_doc();
-        let n = d.get_mut(a).unwrap();
-        n.width = 800.0;
-        n.overflow = Overflow::Both;
-        assert_eq!(scroll_range_in(&d, a, viewport(&d, a)), (407.0, 1148.0));
-    }
-
-    #[test]
-    fn scroll_to_moves_every_scrolling_frame_around_the_layer() {
-        let (d, a, _, _, list, item) = device_doc();
-        let mut p = player_on(d.clone(), a);
-        assert!(p.perform(&Action::ScrollTo { dest: item, offset: [0.0, 0.0] }, item, Transition::Instant, 0.0, Easing::Linear, None, 1.0));
-        // The list brings the item to its top (as far as it scrolls), the screen brings the list.
-        assert_eq!(p.scroll[&list], (0.0, 500.0));
-        assert_eq!(p.scroll[&a], (0.0, 1148.0));
-        // Animated, it gets there over the duration.
-        let mut p = player_on(d, a);
-        assert!(p.perform(&Action::ScrollTo { dest: list, offset: [0.0, 0.0] }, list, Transition::Dissolve, 0.3, Easing::Linear, None, 1.0));
-        let anim = p.scroll_anim.as_ref().unwrap();
-        assert_eq!(anim.frames, vec![(a, (0.0, 0.0), (0.0, 1148.0))]);
-    }
-
-    #[test]
-    fn navigating_resets_scroll_unless_it_preserves_it() {
-        let (d, a, b, ..) = device_doc();
-        let mut p = player_on(d, a);
-        p.scroll_to(0.0, 600.0);
-        assert!(p.perform(&Action::Navigate { dest: b, preserve_scroll: false }, a, Transition::Instant, 0.0, Easing::Linear, None, 1.0));
-        assert_eq!(p.scroll.get(&b), None, "starts at the top");
-        p.restart(a, 2.0);
-        p.scroll_to(0.0, 1000.0);
-        assert!(p.perform(&Action::Navigate { dest: b, preserve_scroll: true }, a, Transition::Instant, 0.0, Easing::Linear, None, 3.0));
-        assert_eq!(p.scroll[&b], (0.0, 648.0), "kept, as far as B scrolls");
-        // Back starts at the top again.
-        assert!(p.perform(&Action::Back, b, Transition::Instant, 0.0, Easing::Linear, None, 4.0));
-        assert_eq!((p.current, p.scroll.get(&a)), (a, None));
-    }
-
-    #[test]
-    fn sync_follows_edits_and_keeps_the_screen() {
-        let (mut d, a, b, _, list, _) = device_doc();
-        let mut p = player_on(d.clone(), a);
-        p.go(b, Transition::Instant, 0.0, Easing::Linear, 1.0, true, false);
-        p.scroll_to(0.0, 600.0);
-        // The same document again changes nothing.
-        let same = Arc::new(d.clone());
-        p.sync(&same, 2.0);
-        let rev = p.rev;
-        p.sync(&same, 2.0);
-        assert_eq!(p.rev, rev);
-        // An edit is copied; the screen and its scroll stay (clamped to the new range).
-        d.get_mut(b).unwrap().height = 1000.0;
-        d.get_mut(b).unwrap().name = "B2".into();
-        p.sync(&Arc::new(d.clone()), 3.0);
-        assert_eq!(p.current, b);
-        assert_eq!(p.inspect()["name"], "B2");
-        assert_eq!(p.scroll[&b], (0.0, 148.0));
-        assert_eq!(p.history.len(), 1);
-        // The screen deleted: back to the start.
-        d.remove(b).unwrap();
-        p.sync(&Arc::new(d.clone()), 4.0);
-        assert_eq!(p.current, a);
-        assert!(p.history.is_empty() && p.scroll.is_empty());
-        // Junk scroll offsets never panic and stay in range.
-        p.scroll.insert(list, (f64::NAN, f64::INFINITY));
-        p.sync(&Arc::new(d), 5.0);
-        assert_eq!(p.scroll[&list], (0.0, 0.0));
-    }
-
-    #[test]
-    fn transitions_move_the_right_way() {
-        let left = transition_frames(Transition::MoveIn { direction: Direction::Left }, 0.0);
-        assert_eq!(left.to_off, (1.0, 0.0));
-        assert_eq!(transition_frames(Transition::MoveIn { direction: Direction::Left }, 1.0).to_off, (0.0, 0.0));
-        let push = transition_frames(Transition::Push { direction: Direction::Top }, 0.5);
-        assert_eq!(push.from_off, (0.0, -0.5));
-        assert_eq!(push.to_off, (0.0, 0.5));
-        let out = transition_frames(Transition::MoveOut { direction: Direction::Right }, 0.25);
-        assert!(out.from_on_top);
-        assert_eq!(out.from_off, (0.25, 0.0));
-        assert_eq!(transition_frames(Transition::Dissolve, 0.3).to_alpha, 0.3);
-        assert_eq!(transition_frames(Transition::Instant, 0.0).from_alpha, 0.0);
-        let r = Transition::SlideIn { direction: Direction::Bottom }.reversed();
-        assert_eq!(r, Transition::SlideOut { direction: Direction::Top });
-    }
-
-    #[test]
-    fn overlay_positions() {
-        let base = Rect::from_min_size(pos2(0.0, 0.0), vec2(400.0, 800.0));
-        let size = vec2(200.0, 100.0);
-        assert_eq!(overlay_rect(OverlayPosition::Center, base, size, None, None).min, pos2(100.0, 350.0));
-        assert_eq!(overlay_rect(OverlayPosition::BottomCenter, base, size, None, None).min, pos2(100.0, 700.0));
-        assert_eq!(overlay_rect(OverlayPosition::TopRight, base, size, None, None).min, pos2(200.0, 0.0));
-        let anchor = Rect::from_min_size(pos2(30.0, 40.0), vec2(50.0, 20.0));
-        assert_eq!(overlay_rect(OverlayPosition::Manual, base, size, Some(anchor), None).min, pos2(30.0, 60.0));
-    }
-
-    /// Smart animate renders a temporary document per animation frame; keep that cheap.
-    #[test]
-    fn smart_animate_frame_cost() {
-        let (mut d, a, b) = doc_with_two_frames();
-        for (f, dx) in [(a, 0.0), (b, 40.0)] {
-            for i in 0..40 {
-                let r = d.create(f, NodeKind::Rectangle, &format!("Row {i}"), dx + 10.0, 10.0 + f64::from(i) * 9.0, 120.0, 8.0).unwrap();
-                d.get_mut(r).unwrap().corners.radii = [4.0; 4];
-            }
-        }
-        let t0 = std::time::Instant::now();
-        let n = 10;
-        for k in 0..n {
-            let tmp = smart_interpolate(&d, a, &d, b, f64::from(k) / f64::from(n));
-            assert!(figcraft_render::render_node(&tmp, b, 2.0).is_some());
-        }
-        let per = t0.elapsed().as_secs_f64() * 1000.0 / f64::from(n);
-        eprintln!("smart animate: {per:.2} ms per frame (80 layers, 400x800 px)");
-    }
-}
+#[cfg(test)]
+mod tests;
diff --git a/crates/ui-egui/src/present/actions.rs b/crates/ui-egui/src/present/actions.rs
new file mode 100644
index 00000000..97f94eeb
--- /dev/null
+++ b/crates/ui-egui/src/present/actions.rs
@@ -0,0 +1,265 @@
+use super::*;
+
+impl Presenter {
+    /// A mouse enter, leave, down or up on `node` (shown on `root`) met its interaction `k`: its
+    /// actions run now, or after its delay while `root` is still what shows (again once only
+    /// while it waits).
+    pub(super) fn gesture(&mut self, node: NodeId, k: usize, rect: Option<Rect>, now: f64, root: NodeId) -> bool {
+        let delay = self.doc.as_ref().and_then(|d| d.node(node)).and_then(|n| n.interactions.get(k)).map_or(0.0, |it| it.delay_secs());
+        if delay <= 0.0 {
+            return self.fire(node, k, rect, now);
+        }
+        if !self.waiting.iter().any(|w| (w.node, w.k) == (node, k)) {
+            self.waiting.push(Waiting { node, k, rect, root, due: now + delay });
+        }
+        false
+    }
+
+    /// Run the delayed mouse triggers that are due (those whose screen or overlay went away are
+    /// dropped). True when one changed what shows.
+    pub(super) fn fire_waiting(&mut self, root: NodeId, now: f64) -> bool {
+        let (due, later): (Vec<Waiting>, Vec<Waiting>) = std::mem::take(&mut self.waiting).into_iter().partition(|w| w.due <= now);
+        self.waiting = later;
+        self.waiting.retain(|w| w.root == root);
+        let mut did = false;
+        for w in due.into_iter().filter(|w| w.root == root) {
+            // An earlier one may have left the screen: the rest are dropped with it.
+            did = did || self.fire(w.node, w.k, w.rect, now);
+        }
+        did
+    }
+
+    /// Run the actions of interaction `k` on `node`. `rect` is the layer's screen rect.
+    pub(crate) fn fire(&mut self, node: NodeId, k: usize, rect: Option<Rect>, now: f64) -> bool {
+        let Some(it) = self.doc.as_ref().and_then(|d| d.node(node)).and_then(|n| n.interactions.get(k)).cloned() else { return false };
+        let dur = it.easing.seconds(it.duration_ms);
+        let temp = match it.trigger {
+            Trigger::OnHover => Some(false),
+            Trigger::OnPress => Some(true),
+            _ => None,
+        };
+        let snap = if temp.is_some() && self.temp.is_none() { self.snapshot() } else { None };
+        let mut did = false;
+        for a in &it.actions {
+            did |= self.perform(a, node, it.transition, dur, it.easing, rect, now);
+        }
+        if did && let (Some(press), Some(snap), Some(rect)) = (temp, snap, rect) {
+            self.temp = Some(Temp { rect, press, snap, transition: it.transition, dur, easing: it.easing });
+        }
+        did
+    }
+
+    /// Run the widget clicks the player took: each calls its plugin back on the player's copy (the
+    /// prototype's own state of the widget), as on the canvas but without touching the file.
+    /// Returns what went wrong, for a toast.
+    pub fn click_widgets(&mut self, s: &figcraft_engine::Session) -> Option<String> {
+        let mut error = None;
+        for (id, target) in std::mem::take(&mut self.widget_clicks) {
+            let Some(doc) = self.design.clone() else { break };
+            match figcraft_engine::widgets::click_on(s, doc, id, &target) {
+                Ok((d, _)) => {
+                    self.design = Some(d);
+                    self.relayout();
+                }
+                Err(e) => error = Some(e.to_string()),
+            }
+        }
+        error
+    }
+
+    pub(crate) fn perform(&mut self, a: &Action, node: NodeId, tr: Transition, dur: f64, easing: Easing, rect: Option<Rect>, now: f64) -> bool {
+        self.perform_at(a, node, tr, dur, easing, rect, now, 0)
+    }
+
+    /// One action; `depth` counts the conditional actions it is inside.
+    #[allow(clippy::too_many_arguments)]
+    fn perform_at(&mut self, a: &Action, node: NodeId, tr: Transition, dur: f64, easing: Easing, rect: Option<Rect>, now: f64, depth: usize) -> bool {
+        let Some(doc) = self.doc.clone() else { return false };
+        match a {
+            Action::Navigate { dest, preserve_scroll } => {
+                let Some(top) = figcraft_engine::proto_run::navigate_target(&doc, *dest, &self.sections) else { return false };
+                if !doc.contains(top) || (top == self.current && self.overlays.is_empty()) {
+                    return false;
+                }
+                self.go(top, tr, dur, easing, now, true, *preserve_scroll);
+                true
+            }
+            Action::Back => {
+                if self.close_overlay(now) {
+                    return true;
+                }
+                match self.history.pop() {
+                    Some(v) => {
+                        self.go(v.frame, v.transition.reversed(), v.dur, v.easing, now, false, false);
+                        true
+                    }
+                    None => false,
+                }
+            }
+            Action::ScrollTo { dest, offset } => {
+                let frames = self.scroll_to_layer(&doc, *dest, *offset);
+                if frames.is_empty() {
+                    return false;
+                }
+                if matches!(tr, Transition::Instant) || dur <= 0.0 {
+                    self.scroll.extend(frames.iter().map(|(f, _, to)| (*f, *to)));
+                    self.rev += 1;
+                } else {
+                    self.scroll_anim = Some(ScrollAnim { frames, start: now, dur, easing });
+                }
+                true
+            }
+            Action::OpenOverlay { dest, position, close_on_outside, background, offset, anchor } => {
+                let at = self.page_rect(rect);
+                if !doc.contains(*dest) {
+                    return false;
+                }
+                self.delays_fired.retain(|(id, _)| !doc.is_ancestor(*dest, *id));
+                self.overlays.push(OverlayState {
+                    id: *dest,
+                    position: *position,
+                    close_on_outside: *close_on_outside,
+                    background: *background,
+                    anchor: at,
+                    offset: *offset,
+                    anchor_to: *anchor,
+                    opened: now,
+                    transition: tr,
+                    dur,
+                    easing,
+                });
+                self.hovered.clear();
+                true
+            }
+            Action::SwapOverlay { dest } => {
+                let at = self.page_rect(rect);
+                if !doc.contains(*dest) {
+                    return false;
+                }
+                self.delays_fired.retain(|(id, _)| !doc.is_ancestor(*dest, *id));
+                match self.overlays.last_mut() {
+                    Some(o) => {
+                        o.id = *dest;
+                        o.opened = now;
+                        o.transition = tr;
+                        o.dur = dur;
+                        o.easing = easing;
+                    }
+                    None => self.overlays.push(OverlayState {
+                        id: *dest,
+                        position: OverlayPosition::Center,
+                        close_on_outside: true,
+                        background: None,
+                        anchor: at,
+                        offset: None,
+                        anchor_to: OverlayAnchor::Screen,
+                        opened: now,
+                        transition: tr,
+                        dur,
+                        easing,
+                    }),
+                }
+                self.hovered.clear();
+                true
+            }
+            Action::CloseOverlay => self.close_overlay(now),
+            Action::OpenUrl { url } => {
+                // The URL comes from the document and this action fires from whatever trigger the
+                // prototype sets, including a delay, so no click is implied: only a web link opens.
+                if figcraft_engine::doc_urls::openable(url) {
+                    self.urls.push(url.clone());
+                }
+                true
+            }
+            Action::ChangeTo { dest } => {
+                let Some(inst) = figcraft_engine::proto_run::change_to_target(&doc, node, *dest) else { return false };
+                if !doc.contains(*dest) {
+                    return false;
+                }
+                self.begin(tr, dur, easing, now);
+                let Some(d) = self.design.as_mut() else { return false };
+                let before = d.clone();
+                if let Some(n) = d.node_mut(inst)
+                    && let NodeKind::Instance { component, .. } = &mut n.kind
+                {
+                    *component = *dest;
+                }
+                figcraft_engine::components::sync_instance(d, inst);
+                self.settle(&before);
+                true
+            }
+            Action::SetVariable { variable, value, expr } => {
+                let Some(d) = self.design.as_mut() else { return false };
+                let before = d.clone();
+                let set = figcraft_engine::proto_run::set_variable(d, node, variable, value, expr.as_ref());
+                if set {
+                    self.settle(&before);
+                }
+                set
+            }
+            Action::SetVariableMode { collection, mode } => {
+                let Some(d) = self.design.as_mut() else { return false };
+                let before = d.clone();
+                let set = figcraft_engine::proto_run::set_mode(d, self.current, collection, mode);
+                if set {
+                    self.settle(&before);
+                }
+                set
+            }
+            Action::Conditional { blocks } => {
+                if depth >= figcraft_doc::proto::MAX_ACTION_DEPTH {
+                    return false;
+                }
+                // Evaluated now: earlier actions of the interaction may have changed variables.
+                let mut did = false;
+                for inner in figcraft_engine::proto_run::branch(&doc, node, blocks) {
+                    did |= self.perform_at(&inner, node, tr, dur, easing, rect, now, depth + 1);
+                }
+                did
+            }
+        }
+    }
+
+    pub(super) fn texture(&mut self, ctx: &egui::Context, doc: &Document, id: NodeId, px_scale: f64, now: f64) -> Option<FrameTex> {
+        // Animated GIFs play from when the frame arrived: a new texture when one of them moves on,
+        // and a wake-up for that moment (nothing else draws frames while it shows). egui wakes a
+        // display frame before the time asked for, a little earlier still at times: ask that much
+        // later, and count a frame due within a few milliseconds as due.
+        let t = (now - self.arrived).max(0.0) + 0.005;
+        let clock = figcraft_render::images::animation_clock(doc, id, t);
+        if let Some((_, next)) = clock {
+            crate::repaint_in(ctx, next + f64::from(ctx.input(|i| i.predicted_dt)));
+        }
+        let key = (self.rev, px_scale.to_bits(), clock.map_or(0, |c| c.0));
+        if let Some(t) = self.textures.get(&id)
+            && t.key == key
+        {
+            return Some(t.clone());
+        }
+        let bounds = figcraft_render::export_bounds(doc, id)?;
+        let pix = figcraft_render::render_node_at(doc, id, texture_scale(ctx, bounds, px_scale), t)?;
+        let img = crate::render_worker::screen_image(&pix, doc.color_profile);
+        let tex = ctx.load_texture(format!("present-{}", id.0), img, egui::TextureOptions::LINEAR);
+        let ft = FrameTex { key, tex, bounds };
+        self.textures.insert(id, ft.clone());
+        Some(ft)
+    }
+}
+
+/// The most pixels a presented frame's texture holds (bigger prototypes, at 100% or filling the
+/// window, are drawn from a smaller texture scaled up).
+const MAX_TEXTURE_PIXELS: f64 = 16_777_216.0;
+
+/// The pixel scale, at most `px`, at which `bounds` makes a texture the GPU takes (no side past
+/// its limit) of at most [`MAX_TEXTURE_PIXELS`].
+pub(super) fn texture_scale(ctx: &egui::Context, bounds: figcraft_geom::Rect, px: f64) -> f64 {
+    let side = ctx.input(|i| i.max_texture_side) as f64 - 2.0;
+    let (w, h) = (bounds.width().max(1.0), bounds.height().max(1.0));
+    let s = px.min(side / w.max(h)).min((MAX_TEXTURE_PIXELS / (w * h)).sqrt());
+    if s.is_finite() && s > 0.0 { s } else { 1e-3 }
+}
+
+/// The first interaction index on `id` whose trigger satisfies `want`.
+pub(super) fn find_trigger(doc: &Document, id: NodeId, want: impl Fn(&Trigger) -> bool) -> Option<usize> {
+    doc.node(id)?.interactions.iter().position(|it| want(&it.trigger))
+}
diff --git a/crates/ui-egui/src/present_behaviour_tests.rs b/crates/ui-egui/src/present/behaviour_tests.rs
similarity index 82%
rename from crates/ui-egui/src/present_behaviour_tests.rs
rename to crates/ui-egui/src/present/behaviour_tests.rs
index 791e0d3f..f5417311 100644
--- a/crates/ui-egui/src/present_behaviour_tests.rs
+++ b/crates/ui-egui/src/present/behaviour_tests.rs
@@ -218,7 +218,7 @@ fn act(p: &mut Presenter, a: Action, now: f64) -> bool {
 }
 
 fn open(dest: NodeId, close_on_outside: bool) -> Action {
-    Action::OpenOverlay { dest, position: OverlayPosition::Center, close_on_outside, background: None, offset: None }
+    Action::OpenOverlay { dest, position: OverlayPosition::Center, close_on_outside, background: None, offset: None, anchor: Default::default() }
 }
 
 /// Screens A and B and three overlay frames M1, M2, M3 (all top-level).
@@ -454,6 +454,99 @@ fn interactive_components_change_in_place() {
     }
 }
 
+/// A hugging auto layout frame (in `parent`, else on the page) holding text `chars`: (frame, text).
+fn hugging_label(s: &mut Session, parent: Option<NodeId>, name: &str, x: f64, chars: &str) -> (NodeId, NodeId) {
+    let f = id(&ex(s, "frame.create", json!({"x": x, "y": 600, "width": 60, "height": 30, "name": name, "parent": parent})));
+    let t = id(&ex(s, "text.create", json!({"text": chars, "x": 0, "y": 0, "parent": f})));
+    ex(s, "node.set", json!({"ids": [f], "props": {"layout": "horizontal", "padding": 8, "sizingH": "hug", "sizingV": "hug"}}));
+    (f, t)
+}
+
+fn size(d: &Document, n: NodeId) -> (f64, f64) {
+    d.node(n).map(|n| (n.width, n.height)).unwrap()
+}
+
+#[test]
+fn change_to_lays_out_the_instance_around_its_own_content() {
+    // Change to shows the other variant in place: the instance keeps its overrides (a longer
+    // label), so it is laid out around them, as switching the variant on the canvas does.
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    let variants: Vec<NodeId> = ["Default", "Hover"]
+        .iter()
+        .enumerate()
+        .map(|(k, state)| {
+            let (f, _) = hugging_label(&mut s, None, &format!("State={state}"), k as f64 * 150.0, "Button");
+            id(&ex(&mut s, "component.create", json!({"ids": [f]})))
+        })
+        .collect();
+    let set = id(&ex(&mut s, "component.combineVariants", json!({"ids": variants.clone()})));
+    on(&mut s, variants[0], json!({"type": "onClick"}), json!({"type": "changeTo", "dest": variants[1]}), json!({"type": "instant"}), 0);
+    let screen = frame(&mut s, "Screen", 0.0, 400.0, 300.0);
+    let button = id(&ex(&mut s, "instance.create", json!({"component": set, "x": 20, "y": 20, "parent": screen})));
+    let label = s.doc().unwrap().node(button).unwrap().children[0];
+    ex(&mut s, "text.set", json!({"id": label, "characters": "A much longer label"}));
+    let (main, canvas, canvas_label) = {
+        let d = s.doc().unwrap();
+        (size(d, variants[1]), size(d, button), size(d, label))
+    };
+    // Without any font nothing is measured and both sizes are the main's.
+    if figcraft_text::layout_node(s.doc().unwrap().node(label).unwrap()).is_some_and(|(l, _)| !l.glyphs.is_empty()) {
+        assert!(canvas.0 > main.0 + 20.0, "on the canvas the instance hugs its longer label");
+    }
+    let mut p = player(s.doc().unwrap().clone(), screen);
+    assert!(p.fire(button, 0, None, 1.0));
+    let d = p.doc.as_ref().unwrap();
+    assert!(matches!(d.node(button).unwrap().kind, NodeKind::Instance { component, .. } if component == variants[1]));
+    assert_eq!((size(d, button), size(d, label)), (canvas, canvas_label), "the Hover variant, laid out around the instance's label");
+}
+
+/// A screen holding a hugging chip whose text is bound to string variable `label` of collection
+/// "Copy" (modes A "Short" and B "A much longer label"), the chip's click running `action`:
+/// (session, screen, chip, text).
+fn bound_chip(action: Value) -> (Session, NodeId, NodeId, NodeId) {
+    figcraft_text::scan_system_fonts();
+    let mut s = Session::new();
+    ex(&mut s, "variable.createCollection", json!({"name": "Copy", "modes": ["A", "B"]}));
+    ex(
+        &mut s,
+        "variable.create",
+        json!({"collection": "Copy", "name": "label", "type": "string", "values": {"A": "Short", "B": "A much longer label"}}),
+    );
+    let screen = frame(&mut s, "Screen", 0.0, 400.0, 300.0);
+    let (chip, text) = hugging_label(&mut s, Some(screen), "Chip", 20.0, "Short");
+    ex(&mut s, "variable.bind", json!({"ids": [text], "field": "characters", "variable": "label"}));
+    on(&mut s, chip, json!({"type": "onClick"}), action, json!({"type": "instant"}), 0);
+    (s, screen, chip, text)
+}
+
+#[test]
+fn set_variable_and_set_mode_lay_out_the_text_they_change() {
+    // A text bound to a string variable shows what an interaction sets, measured: the hugging
+    // chip around it grows with it, to the size the canvas gives the same text.
+    let cases = [
+        (
+            json!({"type": "setVariable", "variable": "label", "value": "A much longer label"}),
+            "variable.set",
+            json!({"variable": "label", "value": "A much longer label"}),
+        ),
+        (json!({"type": "setVariableMode", "collection": "Copy", "mode": "B"}), "variable.setMode", json!({"collection": "Copy", "mode": "B"})),
+    ];
+    for (action, canvas_cmd, canvas_params) in cases {
+        let (mut s, screen, chip, text) = bound_chip(action.clone());
+        let mut p = player(s.doc().unwrap().clone(), screen);
+        assert!(p.fire(chip, 0, None, 1.0), "{action}");
+        let page = s.doc().unwrap().page_of(screen).unwrap();
+        let mut params = canvas_params;
+        if canvas_cmd == "variable.setMode" {
+            params["ids"] = json!([page]);
+        }
+        ex(&mut s, canvas_cmd, params);
+        let (d, canvas) = (p.doc.as_ref().unwrap(), s.doc().unwrap());
+        assert_eq!((size(d, chip), size(d, text)), (size(canvas, chip), size(canvas, text)), "{action}: the chip grows with its text");
+    }
+}
+
 #[test]
 fn a_drag_started_transition_follows_the_pointer() {
     let (mut u, hot) = one_interaction(json!({"type": "onDrag"}), json!({"type": "push", "direction": "left"}), 400);
diff --git a/crates/ui-egui/src/present/chrome.rs b/crates/ui-egui/src/present/chrome.rs
new file mode 100644
index 00000000..80386eb7
--- /dev/null
+++ b/crates/ui-egui/src/present/chrome.rs
@@ -0,0 +1,408 @@
+use super::layout::{Chrome, FULL, Place};
+use super::player::player;
+use super::scroll::page_settings;
+use super::*;
+
+/// What the player's top bar asked for.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(super) enum BarAction {
+    Close,
+    Restart,
+    /// Present full-window (from the pane).
+    Present,
+    /// The full-window presenter's options menu (handled in the bar).
+    Options,
+    /// Turn responsive presentation on or off (saved in the file: `proto.settings`).
+    Responsive(bool),
+    /// Show or hide the comments on the presented frame.
+    Comments,
+    /// Show or hide the Inspect panel.
+    Inspect,
+}
+
+pub struct PresentTab {
+    pub id: u64,
+    /// Empty while the tab is on screen: then the player is in `app.ui.present`.
+    pub pres: Option<Presenter>,
+    pub doc_uid: u64,
+    pub path: Option<String>,
+    pub page: NodeId,
+    pub file: String,
+    pub page_name: String,
+}
+
+/// The full-window presenter (while `app.ui.present` is set). Escape or Close ends it.
+pub fn show(app: &mut FigApp, ui: &mut Ui) {
+    let ctx = ui.ctx().clone();
+    let now = ctx.input(|i| i.time);
+    let Some(mut pres) = app.ui.present.take() else { return };
+    // A tab can play a file that is closed or not in front. Then it must not read or change
+    // the file in front.
+    let live = crate::tabs::present_owner_active(app);
+    if live && let Ok(ds) = app.session.ds() {
+        pres.sync(&ds.doc, now);
+    }
+    poll_pads(app, &mut pres, &ctx);
+    let mut action = None;
+    // Typing a reply to a comment keeps the keys from the prototype, and so does the link notice
+    // while it shows; Shift+C shows the comments.
+    let typing = ctx.egui_wants_keyboard_input() || pres.link_notice.is_some();
+    if !typing && ctx.input_mut(|i| i.consume_key(egui::Modifiers::SHIFT, egui::Key::C)) {
+        action = Some(BarAction::Comments);
+    }
+    if pres.view.inspect {
+        let t = Tokens::get(&ctx);
+        egui::Panel::right("present_inspect")
+            .resizable(false)
+            .exact_size(INSPECT_W)
+            .frame(egui::Frame::NONE.fill(t.panel).stroke(Stroke::new(1.0, t.border)))
+            .show(ui, |ui| inspect_panel(app, ui, &pres));
+    }
+    egui::CentralPanel::default().frame(egui::Frame::NONE).show(ui, |ui| {
+        action = player(&mut pres, ui, ui.max_rect(), now, Chrome { keys: !typing, ..FULL }).or(action);
+    });
+    let picked_device = navigation_bar(&mut pres, &ctx, now);
+    // Keys the prototype left alone: C shows the comments, F fills the screen.
+    if !typing {
+        if ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::C)) {
+            action = Some(BarAction::Comments);
+        }
+        if ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::F)) {
+            let full = ctx.input(|i| i.viewport().fullscreen.unwrap_or(false));
+            ctx.send_viewport_cmd(egui::ViewportCommand::Fullscreen(!full));
+        }
+    }
+    match action {
+        Some(BarAction::Comments) => pres.view.comments = !pres.view.comments,
+        Some(BarAction::Inspect) => pres.view.inspect = !pres.view.inspect,
+        _ => {}
+    }
+    if live
+        && pres.view.comments
+        && let Some((frame, place, clip)) = pres.shown
+    {
+        crate::comments::presenter(app, &ctx, frame, place, clip);
+    } else if app.ui.comments.open.is_some() {
+        app.ui.comments.close();
+    }
+    finish(app, &mut pres);
+    link_notice(app, &mut pres, &ctx, Id::unique("present_link_notice"));
+    // The options carry over to the next presentation.
+    app.ui.present_view = pres.view;
+    if live && let Some(BarAction::Responsive(on)) = action {
+        app.run("proto.settings", json!({"responsive": on}));
+    }
+    if live && let Some(device) = picked_device {
+        choose_device(app, &mut pres, &device);
+    }
+    app.ui.present = Some(pres);
+    if action == Some(BarAction::Close) || ctx.input(|i| i.key_pressed(egui::Key::Escape)) {
+        if let Some(id) = app.ui.present_active {
+            crate::tabs::close_present(app, id);
+        } else {
+            app.ui.present = None;
+        }
+    }
+}
+
+/// Device choices in the presenter use the screen's real dimensions and reflow a copy of the
+/// design through constraints and auto layout. "No device" returns to the original frame size.
+pub(super) fn choose_device(app: &mut FigApp, p: &mut Presenter, device: &str) {
+    let responsive = device != "None";
+    if app.run("proto.settings", json!({"device": device, "responsive": responsive})).is_some() {
+        p.reset_for_device();
+    }
+}
+
+/// Controls that stay in reach while viewing a prototype, including screen stepping, device and
+/// scale. The selected device is returned to the caller so it can go through the normal document
+/// command (and undo/save) rather than changing only the player's copy.
+fn navigation_bar(p: &mut Presenter, ctx: &egui::Context, now: f64) -> Option<String> {
+    let t = Tokens::get(ctx);
+    let doc = p.doc.as_ref()?;
+    let frames = doc.top_frames(doc.page_of(p.current).unwrap_or(p.current));
+    let index = frames.iter().position(|id| *id == p.current);
+    let settings = page_settings(doc, p.current);
+    let mut navigate = None;
+    let mut device_choice = None;
+    egui::Area::new(Id::unique("present_navigation")).anchor(Align2::CENTER_BOTTOM, vec2(0.0, -18.0)).order(egui::Order::Foreground).show(
+        ctx,
+        |ui| {
+            egui::Frame::NONE
+                .fill(t.panel)
+                .stroke(Stroke::new(1.0, t.border))
+                .corner_radius(CornerRadius::same(9))
+                .inner_margin(egui::Margin::symmetric(8, 5))
+                .show(ui, |ui| {
+                    ui.horizontal(|ui| {
+                        let prev = index.and_then(|i| i.checked_sub(1)).and_then(|i| frames.get(i)).copied();
+                        let next = index.and_then(|i| frames.get(i + 1)).copied();
+                        let previous =
+                            ui.add_enabled(prev.is_some(), egui::Button::new("").min_size(vec2(26.0, 24.0))).on_hover_text(tr("Previous frame"));
+                        icons::paint(
+                            ui.painter(),
+                            Rect::from_center_size(previous.rect.center(), vec2(21.0, 21.0)),
+                            Icon::ChevronLeft,
+                            if prev.is_some() { t.icon } else { t.icon_secondary },
+                        );
+                        if previous.clicked() {
+                            navigate = prev;
+                        }
+                        ui.label(egui::RichText::new(format!("{} / {}", index.map_or(0, |i| i + 1), frames.len())).color(t.text));
+                        let following =
+                            ui.add_enabled(next.is_some(), egui::Button::new("").min_size(vec2(26.0, 24.0))).on_hover_text(tr("Next frame"));
+                        icons::paint(
+                            ui.painter(),
+                            Rect::from_center_size(following.rect.center(), vec2(21.0, 21.0)),
+                            Icon::ChevronRight,
+                            if next.is_some() { t.icon } else { t.icon_secondary },
+                        );
+                        if following.clicked() {
+                            navigate = next;
+                        }
+                        ui.separator();
+                        let model = if settings.device.is_empty() || settings.device == "None" { tr("No device") } else { &settings.device };
+                        let device_menu = ui.menu_button(format!("{model}    "), |ui| {
+                            navigation_menu(ui, |ui| {
+                                egui::ScrollArea::vertical().max_height(410.0).show(ui, |ui| {
+                                    if ui.selectable_label(settings.device.is_empty() || settings.device == "None", tr("No device")).clicked() {
+                                        device_choice = Some("None".to_owned());
+                                        ui.close();
+                                    }
+                                    ui.separator();
+                                    for device in PrototypeSettings::DEVICES {
+                                        let label = format!("{}  {}×{}", device.name, device.width as u32, device.height as u32);
+                                        if ui.selectable_label(settings.device == device.name, label).clicked() {
+                                            device_choice = Some(device.name.to_owned());
+                                            ui.close();
+                                        }
+                                    }
+                                    ui.separator();
+                                    if ui.selectable_label(settings.device == PrototypeSettings::CUSTOM_DEVICE, tr("Custom size")).clicked() {
+                                        device_choice = Some(PrototypeSettings::CUSTOM_DEVICE.to_owned());
+                                        ui.close();
+                                    }
+                                });
+                            });
+                        });
+                        paint_menu_chevron(ui.painter(), device_menu.response.rect, t.icon_secondary);
+                        let scale_menu = ui.menu_button(format!("{}    ", tr(p.view.scale.label(settings.device().is_some()))), |ui| {
+                            navigation_menu(ui, |ui| {
+                                for scale in PresentScale::options(settings.device().is_some()) {
+                                    if ui.selectable_label(p.view.scale == *scale, tr(scale.label(settings.device().is_some()))).clicked() {
+                                        p.set_scale(*scale);
+                                        ui.close();
+                                    }
+                                }
+                            });
+                        });
+                        paint_menu_chevron(ui.painter(), scale_menu.response.rect, t.icon_secondary);
+                    });
+                });
+        },
+    );
+    if let Some(id) = navigate {
+        p.go(id, Transition::Instant, 0.0, Easing::Linear, now, true, false);
+    }
+    device_choice
+}
+
+pub(super) fn paint_menu_chevron(painter: &egui::Painter, button: Rect, color: Color32) {
+    let icon = Rect::from_center_size(pos2(button.right() - 11.0, button.center().y), vec2(17.0, 17.0));
+    icons::paint(painter, icon, Icon::Chevron, color);
+}
+
+fn navigation_menu(ui: &mut Ui, add: impl FnOnce(&mut Ui)) {
+    ui.set_min_width(212.0);
+    add(ui);
+}
+
+/// How often the player polls the controllers while its prototype has gamepad triggers (seconds).
+const PAD_POLL_SECS: f64 = 1.0 / 30.0;
+
+/// Before a player's frame: the controller buttons pressed since the last one, polled only while
+/// the prototype has gamepad triggers and the window has the focus (systems and browsers report
+/// controllers to the focused window only; focus coming back draws a frame, which polls again).
+fn poll_pads(app: &mut FigApp, p: &mut Presenter, ctx: &egui::Context) {
+    if !p.uses_pads || !ctx.input(|i| i.focused) {
+        return;
+    }
+    let held = app.services.gamepad_held();
+    let down = held & !p.pads_held;
+    p.pads_held = held;
+    // Each press once, in layout order.
+    let pressed = (0..u32::BITS as usize).filter(|i| down & (1 << i) != 0).filter_map(figcraft_doc::proto::gamepad_button);
+    p.pads.extend(pressed.map(str::to_string));
+    crate::repaint_in(ctx, PAD_POLL_SECS);
+}
+
+/// After a player's frame: the links it opens and the widget clicks it took. A link to a website
+/// waits in [`link_notice`] unless the viewer chose to skip the notice; a second link to a website
+/// that fires while the notice shows is dropped.
+fn finish(app: &mut FigApp, p: &mut Presenter) {
+    for u in p.urls.drain(..) {
+        if app.session.prefs.link_notice_skipped || !goes_to_a_website(&u) {
+            app.services.open_url(&u);
+        } else if p.link_notice.is_none() {
+            p.link_notice = Some((u, false));
+        }
+    }
+    if let Some(e) = p.click_widgets(&app.session) {
+        app.toast(e);
+    }
+}
+
+/// Whether `url` is an `http` or `https` link (a `mailto:` link opens the mail app instead).
+fn goes_to_a_website(url: &str) -> bool {
+    url.trim().split_once(':').is_some_and(|(scheme, _)| scheme.eq_ignore_ascii_case("http") || scheme.eq_ignore_ascii_case("https"))
+}
+
+/// The notice before a link leaves the prototype for a website: the link, "Don't show this
+/// again" (saved with the preferences when Open link is pressed), Open link and Cancel. Escape or
+/// the close button cancels.
+fn link_notice(app: &mut FigApp, p: &mut Presenter, ctx: &egui::Context, id: Id) {
+    let Some((url, skip)) = p.link_notice.as_mut() else { return };
+    let t = Tokens::get(ctx);
+    let (mut open, mut go, mut cancel) = (true, false, false);
+    crate::dialogs::window(tr("Leaving the prototype"), ctx).id(id).open(&mut open).show(ctx, |ui| {
+        ui.set_width(340.0);
+        widgets::label(ui, tr("This link opens a website outside the prototype:"), t.text);
+        ui.add(egui::Label::new(egui::RichText::new(url.as_str()).font(regular(11.0)).color(t.text_secondary)).wrap());
+        ui.add_space(8.0);
+        if widgets::checkbox(ui, *skip, tr("Don't show this again")) {
+            *skip = !*skip;
+        }
+        ui.add_space(12.0);
+        ui.horizontal(|ui| {
+            go = widgets::button(ui, tr("Open link"), true, true).clicked();
+            cancel = widgets::button(ui, tr("Cancel"), false, true).clicked();
+        });
+    });
+    cancel |= !open || ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape));
+    if go {
+        let Some((url, skip)) = p.link_notice.take() else { return };
+        if skip {
+            app.run("proto.linkNotice", json!({"show": false}));
+            app.services.save_prefs(&app.session.prefs);
+        }
+        app.services.open_url(&url);
+    } else if cancel {
+        p.link_notice = None;
+    }
+}
+
+/// The width of the presenter's Inspect panel.
+const INSPECT_W: f32 = 280.0;
+
+/// The presenter's Inspect panel: the inspected layer's properties, as in the Inspect tab.
+fn inspect_panel(app: &mut FigApp, ui: &mut Ui, pres: &Presenter) {
+    let t = Tokens::get(ui.ctx());
+    let found = pres.inspected.zip(pres.doc.as_ref()).and_then(|(id, doc)| doc.node(id).map(|n| (id, doc, n.name.clone())));
+    egui::ScrollArea::vertical().auto_shrink([false, false]).show(ui, |ui| {
+        let Some((id, doc, name)) = found else {
+            widgets::section_header(ui, tr("Inspect"), &[], false);
+            widgets::note(ui, tr("Hover a layer to see its properties"), t.text_secondary);
+            return;
+        };
+        widgets::section_header(ui, &name, &[], false);
+        for section in figcraft_engine::devinspect::properties(doc, id) {
+            crate::right::inspect_section(app, ui, &section);
+        }
+    });
+}
+
+/// The top-most visible layer of `root` (it included) under the screen point `q`.
+pub(super) fn layer_at(doc: &Document, root: NodeId, place: &Place, q: Pos2) -> Option<NodeId> {
+    let mut hidden: HashSet<NodeId> = HashSet::new();
+    let mut hit = None;
+    for id in doc.subtree(root) {
+        let Some(n) = doc.node(id) else { continue };
+        if !n.visible || n.parent.is_some_and(|p| hidden.contains(&p)) {
+            hidden.insert(id);
+            continue;
+        }
+        if doc.world_bounds(id).is_some_and(|b| place.rect(b).contains(q)) {
+            hit = Some(id);
+        }
+    }
+    hit
+}
+
+/// The prototype preview pane: the player in a floating, resizable window over the canvas. It
+/// follows edits live, and selecting another top-level frame in the editor shows that frame.
+pub struct Pane {
+    pub player: Presenter,
+    /// The open file it previews (another tab closes it).
+    doc_uid: u64,
+    /// The top-level frame last selected in the editor.
+    selected: Option<NodeId>,
+}
+
+/// The top-level frame of the editor's first selected layer.
+fn selected_frame(ds: &figcraft_engine::DocState) -> Option<NodeId> {
+    ds.selection.first().and_then(|i| ds.doc.top_level_frame(*i))
+}
+
+impl Pane {
+    pub fn new(start: NodeId, session: &figcraft_engine::Session) -> Self {
+        let (doc_uid, selected) = session.ds().map(|ds| (ds.uid, selected_frame(ds))).unwrap_or((0, None));
+        Pane { player: Presenter::new(start), doc_uid, selected }
+    }
+}
+
+/// The preview pane's window id (its position and size persist under it).
+pub fn pane_id() -> Id {
+    Id::unique("proto_preview_pane")
+}
+
+/// Show the preview pane while `app.ui.preview` is set (call once per frame, before shortcuts:
+/// keys a hovered pane's prototype uses don't reach the editor).
+pub fn show_pane(app: &mut FigApp, ctx: &egui::Context) {
+    let Some(mut pane) = app.ui.preview.take() else { return };
+    let Ok(ds) = app.session.ds() else { return };
+    if ds.uid != pane.doc_uid {
+        return;
+    }
+    let now = ctx.input(|i| i.time);
+    let (doc, selected) = (ds.doc.clone(), selected_frame(ds));
+    pane.player.sync(&doc, now);
+    // Deselecting and coming back to the same frame keeps the preview where it got to.
+    if selected.is_some() && selected != pane.selected {
+        pane.selected = selected;
+        if let Some(f) = selected.filter(|f| *f != pane.player.current) {
+            pane.player.restart(f, now);
+        }
+    }
+    let t = Tokens::get(ctx);
+    let canvas = app.canvas.rect;
+    let style = ctx.global_style();
+    let typing = ds.text_edit.is_some() || crate::a11y::field_focused(ctx);
+    let chrome = Chrome { pane: true, bar_h: 36.0, pad: 12.0, round: style.visuals.window_corner_radius.nw, keys: !typing };
+    poll_pads(app, &mut pane.player, ctx);
+    let mut action = None;
+    egui::Window::new(tr("Prototype preview"))
+        .id(pane_id())
+        .title_bar(false)
+        .collapsible(false)
+        .resizable(true)
+        .default_size(vec2(320.0, 600.0))
+        .min_size(vec2(220.0, 260.0))
+        .default_pos(pos2(canvas.max.x - 336.0, canvas.min.y + 16.0))
+        .constrain_to(ctx.content_rect())
+        .frame(egui::Frame::window(&style).fill(t.panel).inner_margin(egui::Margin::same(0)))
+        .show(ctx, |ui| {
+            let (rect, _) = ui.allocate_exact_size(ui.available_size(), Sense::hover());
+            action = player(&mut pane.player, ui, rect, now, chrome);
+        });
+    finish(app, &mut pane.player);
+    link_notice(app, &mut pane.player, ctx, pane_id().with("link_notice"));
+    match action {
+        Some(BarAction::Close) => {}
+        Some(BarAction::Present) => {
+            let start = pane.player.current;
+            app.ui.preview = Some(pane);
+            app.run("proto.present", json!({"start": start}));
+        }
+        _ => app.ui.preview = Some(pane),
+    }
+}
diff --git a/crates/ui-egui/src/present_delay_tests.rs b/crates/ui-egui/src/present/delay_tests.rs
similarity index 100%
rename from crates/ui-egui/src/present_delay_tests.rs
rename to crates/ui-egui/src/present/delay_tests.rs
diff --git a/crates/ui-egui/src/present/device.rs b/crates/ui-egui/src/present/device.rs
new file mode 100644
index 00000000..327fdd66
--- /dev/null
+++ b/crates/ui-egui/src/present/device.rs
@@ -0,0 +1,124 @@
+use super::layout::{bezel, upright_w};
+use super::*;
+
+/// The black glass around a device's screen.
+const GLASS: Color32 = Color32::from_rgb(0x16, 0x16, 0x18);
+
+/// A device colour lighter (`k` > 0, towards white) or darker (`k` < 0, towards black).
+fn shade([r, g, b]: [u8; 3], k: f32) -> Color32 {
+    let k = k.clamp(-1.0, 1.0);
+    let f = |c: u8| {
+        let c = f32::from(c);
+        (if k >= 0.0 { c + (255.0 - c) * k } else { c * (1.0 + k) }).round().clamp(0.0, 255.0) as u8
+    };
+    Color32::from_rgb(f(r), f(g), f(b))
+}
+
+/// The width of the coloured band round a device's glass (upright screen width `w`, bezel `b`).
+fn rim(w: f32, b: f32) -> f32 {
+    (w * 0.016).clamp(1.5, (b * 0.5).max(1.5))
+}
+
+/// Body of the presentation device behind the screen `s` (drawn in code: rounded slabs in the
+/// device's colour with black glass round the screen). Turned to landscape (a quarter turn
+/// counter-clockwise), a phone's left side is at the bottom.
+pub(super) fn device_body(p: &egui::Painter, device: &str, s: Rect, landscape: bool, color: DeviceColor) {
+    let (body, edge, metal) = (shade(color.rgb, 0.0), shade(color.rgb, -0.3), shade(color.rgb, 0.12));
+    let w = upright_w(s.size(), landscape);
+    let (b, screen_r) = bezel(device, w);
+    let band = rim(w, b);
+    let radius = |r: f32| CornerRadius::same(r.clamp(0.0, 255.0) as u8);
+    match device {
+        "MacBook Air" => {
+            // The lid's coloured edge round black glass, then the base: a thin slab wider than
+            // the lid, with a finger notch.
+            let lid = s.expand(b);
+            p.rect_filled(lid, radius(b * 1.2), body);
+            p.rect_filled(lid.shrink(band), radius(b * 1.2 - band), GLASS);
+            let base = Rect::from_min_max(pos2(lid.min.x - w * 0.08, lid.max.y), pos2(lid.max.x + w * 0.08, lid.max.y + (w * 0.022).max(6.0)));
+            p.rect_filled(base, CornerRadius { nw: 2, ne: 2, sw: 10, se: 10 }, metal);
+            let notch = Rect::from_center_size(pos2(base.center().x, base.min.y + 1.5), vec2(w * 0.12, 3.0));
+            p.rect_filled(notch, CornerRadius::same(2), edge);
+        }
+        "Desktop" => {
+            let screen = s.expand(b);
+            p.rect_filled(screen, CornerRadius::same(8), body);
+            p.rect_filled(screen.shrink(band), radius(8.0 - band), GLASS);
+            let neck =
+                Rect::from_min_max(pos2(screen.center().x - w * 0.06, screen.max.y), pos2(screen.center().x + w * 0.06, screen.max.y + w * 0.08));
+            p.rect_filled(neck, CornerRadius::ZERO, metal);
+            let foot = Rect::from_min_max(pos2(neck.min.x - w * 0.06, neck.max.y), pos2(neck.max.x + w * 0.06, neck.max.y + 6.0));
+            p.rect_filled(foot, CornerRadius::same(3), edge);
+        }
+        _ => {
+            // Phones and tablets: a rounded slab (phones with side buttons).
+            let slab = s.expand(b);
+            if !device.starts_with("iPad") {
+                // (on the left side, from the top, length) as fractions of the upright side.
+                for (left, f0, h) in [(true, 0.18, 0.06), (true, 0.27, 0.1), (false, 0.24, 0.13)] {
+                    let btn = if landscape {
+                        let y = if left { slab.max.y - 0.5 } else { slab.min.y - 2.5 };
+                        Rect::from_min_size(pos2(slab.min.x + slab.width() * f0, y), vec2(slab.width() * h, 2.5))
+                    } else {
+                        let x = if left { slab.min.x - 2.0 } else { slab.max.x };
+                        Rect::from_min_size(pos2(x, slab.min.y + slab.height() * f0), vec2(2.5, slab.height() * h))
+                    };
+                    p.rect_filled(btn, CornerRadius::same(1), edge);
+                }
+            }
+            p.rect_filled(slab, radius(screen_r + b), body);
+            p.rect_stroke(slab, radius(screen_r + b), Stroke::new(1.0, edge), StrokeKind::Inside);
+            // The glass reaches round the screen's square corners (masked by `device_glass`).
+            let glass = b - band;
+            p.rect_filled(slab.shrink(band), radius((screen_r + glass).min(glass * 3.4)), GLASS);
+        }
+    }
+}
+
+/// What sits on top of the screen: rounded screen corners (glass masks the frame's square
+/// corners) and a phone's camera pill (at the left when turned to landscape).
+pub(super) fn device_glass(p: &egui::Painter, device: &str, s: Rect, landscape: bool) {
+    let w = upright_w(s.size(), landscape);
+    let (_, screen_r) = bezel(device, w);
+    if screen_r <= 0.0 {
+        return;
+    }
+    p.add(corner_masks(s, screen_r.min(s.width() / 2.0).min(s.height() / 2.0), GLASS));
+    if device.starts_with("iPhone") {
+        let pill = if landscape {
+            Rect::from_center_size(pos2(s.min.x + w * 0.045, s.center().y), vec2(w * 0.085, w * 0.3))
+        } else {
+            Rect::from_center_size(pos2(s.center().x, s.min.y + w * 0.045), vec2(w * 0.3, w * 0.085))
+        };
+        p.rect_filled(pill, CornerRadius::same((w * 0.0425).min(255.0) as u8), Color32::BLACK);
+    }
+}
+
+/// Fill what lies between each corner of `s` and its rounding of radius `r` (fans of triangles
+/// from the corner to the arc).
+fn corner_masks(s: Rect, r: f32, color: Color32) -> egui::Shape {
+    const SEGMENTS: usize = 12;
+    if !(r.is_finite() && r > 0.0) {
+        return egui::Shape::Noop;
+    }
+    let mut mesh = egui::Mesh::default();
+    // (corner, centre of its arc, angle the arc starts at).
+    let corners = [
+        (s.left_top(), s.left_top() + vec2(r, r), std::f32::consts::PI),
+        (s.right_top(), s.right_top() + vec2(-r, r), std::f32::consts::FRAC_PI_2 * 3.0),
+        (s.right_bottom(), s.right_bottom() + vec2(-r, -r), 0.0),
+        (s.left_bottom(), s.left_bottom() + vec2(r, -r), std::f32::consts::FRAC_PI_2),
+    ];
+    for (corner, centre, start) in corners {
+        let base = mesh.vertices.len() as u32;
+        mesh.colored_vertex(corner, color);
+        for k in 0..=SEGMENTS {
+            let a = start + std::f32::consts::FRAC_PI_2 * k as f32 / SEGMENTS as f32;
+            mesh.colored_vertex(centre + r * vec2(a.cos(), a.sin()), color);
+        }
+        for k in 0..SEGMENTS as u32 {
+            mesh.add_triangle(base, base + 1 + k, base + 2 + k);
+        }
+    }
+    egui::Shape::mesh(mesh)
+}
diff --git a/crates/ui-egui/src/present/draw.rs b/crates/ui-egui/src/present/draw.rs
new file mode 100644
index 00000000..271f8af7
--- /dev/null
+++ b/crates/ui-egui/src/present/draw.rs
@@ -0,0 +1,123 @@
+use super::actions::texture_scale;
+use super::layout::{Layout, Place, hotspots};
+use super::transition::{smart_interpolate, transition_frames};
+use super::*;
+
+pub(super) fn draw(p: &mut Presenter, painter: &egui::Painter, ctx: &egui::Context, l: &Layout, now: f64) {
+    let ppp = f64::from(ctx.pixels_per_point());
+    let px = l.scale * ppp;
+    let uv = Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0));
+    let to_tex = p.texture(ctx, &l.disp, p.current, px, now);
+    // Transition progress.
+    let mut drawn = false;
+    if let Some(a) = &p.anim {
+        let raw = ((now - a.start) / a.dur.max(1e-3)).clamp(0.0, 1.0);
+        if raw >= 1.0 {
+            p.anim = None;
+        } else {
+            ctx.request_repaint();
+            let e = a.easing.eval(raw);
+            let from_place = a.from_doc.world_bounds(a.from_frame).map(|fb| Place::centered(fb, l.screen.center(), l.scale));
+            if matches!(a.transition, Transition::SmartAnimate) {
+                #[cfg(not(target_arch = "wasm32"))]
+                let t0 = std::time::Instant::now();
+                let tmp = smart_interpolate(&a.from_doc, a.from_frame, &l.disp, p.current, e);
+                let bounds = figcraft_render::export_bounds(&tmp, p.current);
+                if let Some(b) = bounds
+                    && let Some(pix) = figcraft_render::render_node(&tmp, p.current, texture_scale(ctx, b, px))
+                {
+                    let img = crate::render_worker::screen_image(&pix, tmp.color_profile);
+                    let tex = match &mut p.anim_tex {
+                        Some(t) => {
+                            t.set(img, egui::TextureOptions::LINEAR);
+                            t.clone()
+                        }
+                        None => {
+                            let t = ctx.load_texture("present-anim", img, egui::TextureOptions::LINEAR);
+                            p.anim_tex = Some(t.clone());
+                            t
+                        }
+                    };
+                    painter.with_clip_rect(l.screen).image(tex.id(), l.place.rect(b), uv, Color32::WHITE);
+                    drawn = true;
+                }
+                #[cfg(not(target_arch = "wasm32"))]
+                {
+                    p.render_ms = t0.elapsed().as_secs_f64() * 1000.0;
+                }
+            } else if let (Some(ft), Some(to), Some(fp)) = (&a.from_tex, &to_tex, from_place) {
+                let f = transition_frames(a.transition, e as f32);
+                let from_rect = fp.rect(ft.bounds);
+                let from_frame_rect = a.from_doc.world_bounds(a.from_frame).map(|b| fp.rect(b)).unwrap_or(from_rect);
+                let to_rect = l.place.rect(to.bounds);
+                let off = |r: Rect, o: (f32, f32)| vec2(r.width() * o.0, r.height() * o.1);
+                // Without a device a dissolve shows both frames whole; on one, the screen clips.
+                let dissolve_both = l.device.is_none() && matches!(a.transition, Transition::Dissolve);
+                let clip = painter.with_clip_rect(if dissolve_both { l.screen.union(from_frame_rect) } else { l.screen });
+                let draw_from = |p: &egui::Painter| {
+                    if f.from_alpha > 0.0 {
+                        p.image(ft.tex.id(), from_rect.translate(off(from_frame_rect, f.from_off)), uv, Color32::WHITE.gamma_multiply(f.from_alpha));
+                    }
+                };
+                let draw_to = |p: &egui::Painter| {
+                    p.image(to.tex.id(), to_rect.translate(off(l.screen, f.to_off)), uv, Color32::WHITE.gamma_multiply(f.to_alpha));
+                };
+                if f.from_on_top {
+                    draw_to(&clip);
+                    draw_from(&clip);
+                } else {
+                    draw_from(&clip);
+                    draw_to(&clip);
+                }
+                drawn = true;
+            }
+        }
+    }
+    if !drawn && let Some(to) = &to_tex {
+        painter.with_clip_rect(l.clip).image(to.tex.id(), l.place.rect(to.bounds), uv, Color32::WHITE);
+    }
+    // Overlays (each with its background and opening transition); closing ones run it backwards.
+    let mut ovs: Vec<(f64, OverlayState)> =
+        p.overlays.iter().map(|o| (if o.dur > 0.0 { ((now - o.opened) / o.dur).clamp(0.0, 1.0) } else { 1.0 }, o.clone())).collect();
+    let mut placed: Vec<(NodeId, Place, Rect)> = l.overlays.clone();
+    for ((at, o), pl) in p.closing.iter().zip(l.closing.iter()) {
+        if now - at >= o.dur {
+            continue;
+        }
+        ovs.insert(0, (1.0 - ((now - at) / o.dur.max(1e-3)).clamp(0.0, 1.0), o.clone()));
+        placed.insert(0, *pl);
+    }
+    let on_screen = painter.with_clip_rect(l.screen);
+    for ((raw, o), (id, place, orect)) in ovs.iter().zip(placed.iter()) {
+        let raw = *raw;
+        if raw < 1.0 {
+            ctx.request_repaint();
+        }
+        let e = o.easing.eval(raw) as f32;
+        let f = if matches!(o.transition, Transition::Instant) {
+            transition_frames(Transition::Dissolve, 1.0)
+        } else {
+            transition_frames(o.transition, e)
+        };
+        if let Some(bgc) = o.background {
+            let c = crate::theme::doc_c32(ctx, bgc);
+            on_screen.rect_filled(l.screen, CornerRadius::ZERO, c.gamma_multiply(raw as f32));
+        }
+        if let Some(tex) = p.texture(ctx, &l.disp, *id, px, now) {
+            let r = place.rect(tex.bounds).translate(vec2(orect.width() * f.to_off.0, orect.height() * f.to_off.1));
+            on_screen.image(tex.tex.id(), r, uv, Color32::WHITE.gamma_multiply(f.to_alpha));
+        }
+    }
+    // Finished closing animations go (after drawing, so they stayed paired with the layout).
+    p.closing.retain(|(at, o)| now - at < o.dur);
+    // Hotspot flash after a click on nothing.
+    if now < p.flash_until {
+        let (root, place, clip) = l.active(p.current);
+        let a = ((p.flash_until - now) / FLASH_SECS) as f32;
+        for (_, r) in hotspots(&l.disp, root, &place, clip) {
+            painter.rect_filled(r, CornerRadius::same(4), ACCENT.gamma_multiply(0.25 * a));
+            painter.rect_stroke(r, CornerRadius::same(4), Stroke::new(1.5, ACCENT.gamma_multiply(a)), StrokeKind::Outside);
+        }
+        ctx.request_repaint();
+    }
+}
diff --git a/crates/ui-egui/src/present/input.rs b/crates/ui-egui/src/present/input.rs
new file mode 100644
index 00000000..42df2286
--- /dev/null
+++ b/crates/ui-egui/src/present/input.rs
@@ -0,0 +1,334 @@
+use super::actions::find_trigger;
+use super::chrome::layer_at;
+use super::layout::{Layout, hotspots};
+use super::navigate::next_delay;
+use super::scroll::{COAST_MIN, DECAY_DRAG, DECAY_WHEEL, RUBBER_PTS, clamp_scroll, page_settings, rubber_band, scrollers_at, units_per_point};
+use super::transition::{direction_vec, lerp};
+use super::*;
+
+/// Keep a key the prototype used from reaching the editor's shortcuts.
+fn consume_key(ctx: &egui::Context, key: egui::Key) {
+    ctx.input_mut(|i| i.events.retain(|e| !matches!(e, egui::Event::Key { key: k, .. } if *k == key)));
+}
+
+/// Pointer, wheel, keys and timers. `over_area`: the pointer is over the player; `keys_on`: the
+/// player takes the keyboard; `pane`: it plays in the preview pane (which always fits).
+#[allow(clippy::too_many_arguments)]
+pub(super) fn input(p: &mut Presenter, ctx: &egui::Context, l: &Layout, over_area: bool, keys_on: bool, pane: bool, now: f64) {
+    let (pos, pressed, released, down, wheel, velocity, dt, keys) = ctx.input(|i| {
+        let keys: Vec<(egui::Key, egui::Modifiers)> = i
+            .events
+            .iter()
+            .filter_map(|e| match e {
+                egui::Event::Key { key, pressed: true, repeat: false, modifiers, .. } => Some((*key, *modifiers)),
+                _ => None,
+            })
+            .collect();
+        (
+            i.pointer.hover_pos(),
+            i.pointer.button_pressed(egui::PointerButton::Primary),
+            i.pointer.button_released(egui::PointerButton::Primary),
+            i.pointer.primary_down(),
+            i.smooth_scroll_delta,
+            i.pointer.velocity(),
+            f64::from(i.unstable_dt).clamp(1.0 / 500.0, 0.1),
+            keys,
+        )
+    });
+    let keys = if keys_on { keys } else { Vec::new() };
+    // Controller buttons pressed while a link notice shows are dropped, as keys are.
+    let pads = std::mem::take(&mut p.pads);
+    let pads = if p.link_notice.is_none() { pads } else { Vec::new() };
+    // A transition a drag started follows the pointer while it stays down, then plays on from there.
+    if let Some(a) = p.anim.as_mut()
+        && let Some((from, dir, len)) = a.follow
+    {
+        match pos.filter(|_| down) {
+            Some(q) => a.start = now - f64::from(((q - from).dot(dir) / len).clamp(0.0, 1.0)) * a.dur,
+            None => a.follow = None,
+        }
+    }
+    let pos = pos.filter(|_| over_area || p.press.is_some());
+    // A drag that scrolled lets go: it carries on at the pointer's speed (and springs back from
+    // past the ends).
+    if !down && let Some((t, _)) = p.drag_scroll.take() {
+        let u = units_per_point(t, l.scale);
+        let r = p.doc.as_ref().map_or((0.0, 0.0), |b| p.limits(b, t));
+        let along = |v: f32, r: f64| if r > 0.0 { -f64::from(v) * u } else { 0.0 };
+        p.fling = Some(Fling { target: t, vel: (along(velocity.x, r.0), along(velocity.y, r.1)), decay: DECAY_DRAG, bounce: true, at: now });
+    }
+    // The active layer: the top overlay, else the frame.
+    let (root, place, clip) = l.active(p.current);
+    let doc = &l.disp;
+    let hot = hotspots(doc, root, &place, clip);
+    p.hot.clone_from(&hot);
+    if p.fire_waiting(root, now) {
+        return;
+    }
+    // "While hovering / pressing" reverts.
+    if let Some(tmp) = &p.temp {
+        let leave = if tmp.press { released || !down } else { pos.is_none_or(|q| !tmp.rect.contains(q)) };
+        if leave {
+            p.revert(now);
+            return;
+        }
+    }
+    // The wheel scrolls the innermost frame under the pointer that can still move that way, else
+    // pans a view bigger than the window. When it stops it coasts on, slowing down.
+    if wheel != Vec2::ZERO
+        && let Some(q) = pos
+        && let Some(base) = p.doc.clone()
+    {
+        let mut targets: Vec<Scroller> = scrollers_at(p, &base, doc, root, &place, q).into_iter().map(Scroller::Frame).collect();
+        if p.pan_range != (0.0, 0.0) {
+            targets.push(Scroller::View);
+        }
+        let mut moved = None;
+        for t in targets {
+            let u = units_per_point(t, l.scale);
+            let cur = p.offset(t);
+            let next = clamp_scroll((cur.0 - f64::from(wheel.x) * u, cur.1 - f64::from(wheel.y) * u), p.limits(&base, t));
+            if (next.0 - cur.0).abs() > 1e-6 || (next.1 - cur.1).abs() > 1e-6 {
+                p.set_offset(t, next);
+                p.scroll_anim = None;
+                p.fling = None;
+                moved = Some((t, ((next.0 - cur.0) / dt, (next.1 - cur.1) / dt)));
+                break;
+            }
+        }
+        // The wheel's speed, smoothed over ~50 ms whatever the frame rate.
+        p.wheel = moved.map(|(t, inst)| {
+            let prev = p.wheel.filter(|w| w.0 == t).map_or(inst, |w| w.1);
+            let a = 1.0 - (-dt / 0.05).exp();
+            (t, (lerp(prev.0, inst.0, a), lerp(prev.1, inst.1, a)))
+        });
+    } else if wheel == Vec2::ZERO
+        && let Some((t, v)) = p.wheel.take()
+        && v.0.hypot(v.1) > COAST_MIN * units_per_point(t, l.scale)
+    {
+        p.fling = Some(Fling { target: t, vel: v, decay: DECAY_WHEEL, bounce: false, at: now });
+    }
+    let hits: Vec<(NodeId, Rect)> = hot.iter().rev().filter(|(_, r)| pos.is_some_and(|q| r.contains(q))).copied().collect();
+    if !hits.is_empty() {
+        ctx.set_cursor_icon(egui::CursorIcon::PointingHand);
+    }
+    // First (top-most) hit that has a matching trigger.
+    let pick = |want: &dyn Fn(&Trigger) -> bool| -> Option<(NodeId, usize, Rect)> {
+        hits.iter().find_map(|(id, r)| find_trigger(doc, *id, want).map(|k| (*id, k, *r)))
+    };
+    // Enter / leave.
+    let ids: Vec<NodeId> = hits.iter().map(|h| h.0).collect();
+    let entered: Vec<(NodeId, Rect)> = hits.iter().filter(|(id, _)| !p.hovered.contains(id)).copied().collect();
+    let left: Vec<NodeId> = p.hovered.iter().filter(|id| !ids.contains(id)).copied().collect();
+    p.hovered = ids;
+    for id in left {
+        if let Some(k) = find_trigger(doc, id, |t| *t == Trigger::MouseLeave)
+            && p.gesture(id, k, None, now, root)
+        {
+            return;
+        }
+    }
+    for (id, r) in &entered {
+        if let Some(k) = find_trigger(doc, *id, |t| *t == Trigger::MouseEnter)
+            && p.gesture(*id, k, Some(*r), now, root)
+        {
+            return;
+        }
+    }
+    if p.temp.is_none()
+        && !entered.is_empty()
+        && let Some((id, k, r)) = pick(&|t| *t == Trigger::OnHover)
+        && entered.iter().any(|e| e.0 == id)
+        && p.fire(id, k, Some(r), now)
+    {
+        return;
+    }
+    // Press / drag / release.
+    if pressed && pos.is_some() && over_area {
+        p.press = pos;
+        p.dragged = false;
+        // Pressing catches a fling (one springing back from past an end carries on).
+        let overscrolled = |f: &Fling| p.doc.as_ref().is_some_and(|b| clamp_scroll(p.offset(f.target), p.limits(b, f.target)) != p.offset(f.target));
+        p.fling = p.fling.filter(overscrolled);
+        p.wheel = None;
+        if let (Some((_, _, orect)), Some(o), Some(q)) = (l.overlays.last(), p.overlays.last(), pos)
+            && !orect.contains(q)
+        {
+            if o.close_on_outside {
+                p.close_overlay(now);
+                p.press = None;
+                p.hovered.clear();
+            }
+            return;
+        }
+        if let Some((id, k, r)) = pick(&|t| *t == Trigger::MouseDown)
+            && p.gesture(id, k, Some(r), now, root)
+        {
+            return;
+        }
+        if let Some((id, k, r)) = pick(&|t| *t == Trigger::OnPress)
+            && p.fire(id, k, Some(r), now)
+        {
+            return;
+        }
+    }
+    if down
+        && !p.dragged
+        && let (Some(start), Some(q)) = (p.press, pos)
+        && start.distance(q) > 6.0
+    {
+        p.dragged = true;
+        let at_start: Vec<(NodeId, Rect)> = hot.iter().rev().filter(|(_, r)| r.contains(start)).copied().collect();
+        // A directional transition starts only on a drag its way (else the drag may scroll).
+        let d = q - start;
+        let drags =
+            |id: NodeId| doc.node(id)?.interactions.iter().position(|it| it.trigger == Trigger::OnDrag && it.transition.accepts_drag(d.x, d.y));
+        if let Some((id, k, r)) = at_start.iter().find_map(|(id, r)| drags(*id).map(|k| (*id, k, *r)))
+            && p.fire(id, k, Some(r), now)
+        {
+            p.press = None;
+            // The transition it started follows the pointer: along its direction, else the drag's
+            // main axis, completing over the screen's size that way.
+            if let Some(a) = p.anim.as_mut().filter(|a| a.start == now) {
+                let (x, y) = a
+                    .transition
+                    .direction()
+                    .map_or_else(|| if d.x.abs() >= d.y.abs() { (d.x.signum(), 0.0) } else { (0.0, d.y.signum()) }, direction_vec);
+                let len = if x != 0.0 { l.screen.width() } else { l.screen.height() };
+                a.follow = Some((start, vec2(x, y), len.max(1.0)));
+            }
+            return;
+        }
+        // A drag begun inside a mobile screen moves its content, even if the pointer leaves the
+        // screen. The device body stays in place even when the drag begins outside its screen.
+        // Panning the whole view remains available only without a mobile device.
+        if let Some(base) = p.doc.clone() {
+            let horizontal = d.x.abs() >= d.y.abs();
+            let scrolls = scrollers_at(p, &base, doc, root, &place, start);
+            let on_axis = |range: (f64, f64)| if horizontal { range.0 > 0.0 } else { range.1 > 0.0 };
+            let mobile = page_settings(&base, root).device().is_some_and(|device| device.rotates);
+            let target = scrolls
+                .iter()
+                .copied()
+                .find(|f| on_axis(p.range(&base, *f)))
+                .or_else(|| scrolls.first().copied())
+                .map(Scroller::Frame)
+                .or((!mobile && p.pan_range != (0.0, 0.0)).then_some(Scroller::View));
+            if let Some(t) = target {
+                p.fling = None;
+                p.drag_scroll = Some((t, clamp_scroll(p.offset(t), p.limits(&base, t))));
+            }
+        }
+    }
+    // Dragging scrolls with the pointer; past the ends it stretches.
+    if down
+        && let (Some((t, from)), Some(start), Some(q)) = (p.drag_scroll, p.press, pos)
+        && let Some(base) = p.doc.as_ref()
+    {
+        let (d, u) = (q - start, units_per_point(t, l.scale));
+        let r = p.limits(base, t);
+        let limit = RUBBER_PTS * u;
+        let to = (rubber_band(from.0 - f64::from(d.x) * u, r.0, limit), rubber_band(from.1 - f64::from(d.y) * u, r.1, limit));
+        p.set_offset(t, to);
+        p.scroll_anim = None;
+        ctx.set_cursor_icon(egui::CursorIcon::Grabbing);
+    }
+    if released && p.press.is_some() {
+        let dragged = p.dragged;
+        p.press = None;
+        p.dragged = false;
+        p.drag_scroll = None;
+        if let Some((id, k, r)) = pick(&|t| *t == Trigger::MouseUp)
+            && p.gesture(id, k, Some(r), now, root)
+        {
+            return;
+        }
+        if !dragged {
+            if let Some((id, k, r)) = pick(&|t| *t == Trigger::OnClick)
+                && p.fire(id, k, Some(r), now)
+            {
+                return;
+            }
+            // A widget's clickable part calls its plugin back (after the frame, with the session).
+            if let Some(q) = pos
+                && let Some(t) = layer_at(doc, root, &place, q).and_then(|hit| figcraft_engine::widgets::target_at(doc, hit, place.page(q)))
+            {
+                p.widget_clicks.push(t);
+                return;
+            }
+            // Clicking where nothing reacts flashes the hotspots.
+            if p.view.hotspot_hints {
+                p.flash_until = now + FLASH_SECS;
+            }
+        }
+    }
+    // Controller buttons: pressed alone, anywhere on the screen, like keys.
+    for name in &pads {
+        let found = doc.subtree(root).into_iter().find_map(|id| find_trigger(doc, id, |t| t.fires_on_key(name, KeyMods::default())).map(|k| (id, k)));
+        if let Some((id, k)) = found
+            && p.fire(id, k, None, now)
+        {
+            return;
+        }
+    }
+    // Keys.
+    for (key, mods) in &keys {
+        let (name, held) = (key.name(), KeyMods { ctrl: mods.ctrl, alt: mods.alt, shift: mods.shift, cmd: mods.mac_cmd });
+        let found = doc.subtree(root).into_iter().find_map(|id| find_trigger(doc, id, |t| t.fires_on_key(name, held)).map(|k| (id, k)));
+        if let Some((id, k)) = found {
+            if p.fire(id, k, None, now) {
+                consume_key(ctx, *key);
+                return;
+            }
+            continue;
+        }
+        // The player's own keys, when the prototype doesn't use them: R restarts, Z cycles the
+        // full-window presenter's size options.
+        if mods.is_none() {
+            match key {
+                egui::Key::R => {
+                    p.restart(p.start, now);
+                    consume_key(ctx, *key);
+                    return;
+                }
+                // (A responsive frame filling the window has no size options.)
+                egui::Key::Z if !pane && (l.device.is_some() || p.fit.is_none()) => {
+                    p.set_scale(p.view.scale.next(l.device.is_some()));
+                    consume_key(ctx, *key);
+                    return;
+                }
+                _ => {}
+            }
+        }
+        // The arrows (and Space or N forward) step through top-level frames when nothing else
+        // uses them.
+        let forward = match key {
+            egui::Key::ArrowRight => Some(true),
+            egui::Key::Space | egui::Key::N if mods.is_none() => Some(true),
+            egui::Key::ArrowLeft => Some(false),
+            _ => None,
+        };
+        if let Some(forward) = forward
+            && p.overlays.is_empty()
+            && let Some(base) = p.doc.as_ref()
+        {
+            let frames = base.top_frames(base.page_of(p.current).unwrap_or(p.current));
+            if let Some(i) = frames.iter().position(|f| *f == p.current) {
+                let next = if forward { frames.get(i + 1) } else { i.checked_sub(1).and_then(|j| frames.get(j)) };
+                if let Some(n) = next.copied() {
+                    p.go(n, Transition::Instant, 0.0, Easing::Linear, now, true, false);
+                    consume_key(ctx, *key);
+                    return;
+                }
+            }
+        }
+    }
+    // After delay (timers start when the frame appears; not while animating).
+    if p.anim.is_none()
+        && let Some(((id, k), due)) = next_delay(p, doc, root, now)
+        && due <= 0.0
+    {
+        p.delays_fired.insert((id, k));
+        p.fire(id, k, None, now);
+    }
+}
diff --git a/crates/ui-egui/src/present/layout.rs b/crates/ui-egui/src/present/layout.rs
new file mode 100644
index 00000000..9584fc81
--- /dev/null
+++ b/crates/ui-egui/src/present/layout.rs
@@ -0,0 +1,186 @@
+use super::scroll::{clamp_scroll, page_settings};
+use super::*;
+
+/// Page → screen mapping for one presented frame.
+#[derive(Clone, Copy, Debug)]
+pub struct Place {
+    pub page_min: (f64, f64),
+    pub origin: Pos2,
+    pub scale: f64,
+}
+
+impl Place {
+    pub(super) fn centered(fb: figcraft_geom::Rect, center: Pos2, scale: f64) -> Self {
+        let size = vec2((fb.width() * scale) as f32, (fb.height() * scale) as f32);
+        Place { page_min: (fb.x0, fb.y0), origin: center - size / 2.0, scale }
+    }
+    pub fn pt(&self, x: f64, y: f64) -> Pos2 {
+        pos2(self.origin.x + ((x - self.page_min.0) * self.scale) as f32, self.origin.y + ((y - self.page_min.1) * self.scale) as f32)
+    }
+    pub fn rect(&self, r: figcraft_geom::Rect) -> Rect {
+        Rect::from_min_max(self.pt(r.x0, r.y0), self.pt(r.x1, r.y1))
+    }
+    /// The page point under screen point `q`.
+    pub fn page(&self, q: Pos2) -> Point {
+        Point::new(self.page_min.0 + f64::from(q.x - self.origin.x) / self.scale, self.page_min.1 + f64::from(q.y - self.origin.y) / self.scale)
+    }
+}
+
+/// The hotspots of the screen `root` (its visible layers with interactions, bottom-most first)
+/// placed on screen and clipped by `screen`.
+pub(super) fn hotspots(doc: &Document, root: NodeId, place: &Place, screen: Rect) -> Vec<(NodeId, Rect)> {
+    figcraft_engine::proto_run::hotspots(doc, root)
+        .into_iter()
+        .map(|(id, b)| (id, place.rect(b).intersect(screen)))
+        .filter(|(_, r)| r.is_positive())
+        .collect()
+}
+
+// ---------------------------------------------------------------------------------------------
+// The player UI, shared by the full-window presenter and the preview pane.
+
+pub(super) struct Layout {
+    pub(super) disp: Document,
+    pub(super) scale: f64,
+    pub(super) place: Place,
+    /// What shows the prototype: the device's screen, else the presented frame itself.
+    pub(super) screen: Rect,
+    /// What the presented frame may draw into: the device's screen, else the whole area (shadows
+    /// and overflowing content show around a frame presented without a device).
+    pub(super) clip: Rect,
+    pub(super) device: Option<Device>,
+    /// The device is turned to landscape.
+    pub(super) landscape: bool,
+    /// The colour of the device's body, when it is drawn around its screen.
+    pub(super) color: Option<DeviceColor>,
+    pub(super) overlays: Vec<(NodeId, Place, Rect)>,
+    /// Overlays animating out (same order as `Presenter::closing`).
+    pub(super) closing: Vec<(NodeId, Place, Rect)>,
+}
+
+impl Layout {
+    /// The active layer (the top overlay, else the presented frame `current`), where it's placed
+    /// and what it may draw into.
+    pub(super) fn active(&self, current: NodeId) -> (NodeId, Place, Rect) {
+        match self.overlays.last() {
+            Some((id, pl, _)) => (*id, *pl, self.screen),
+            None => (current, self.place, self.clip),
+        }
+    }
+}
+
+/// The width of a device's screen of `size` held upright (its short side when turned).
+pub(super) fn upright_w(size: Vec2, landscape: bool) -> f32 {
+    if landscape { size.y } else { size.x }
+}
+
+/// Bezel width around a device's screen of upright width `w`, and the screen's corner radius.
+pub(super) fn bezel(device: &str, w: f32) -> (f32, f32) {
+    match device {
+        "MacBook Air" => ((w * 0.025).max(6.0), 0.0),
+        "Desktop" => ((w * 0.02).max(6.0), 0.0),
+        d if d.starts_with("iPad") => ((w * 0.05).max(8.0), w * 0.04),
+        _ => ((w * 0.06).max(6.0), w * 0.13),
+    }
+}
+
+/// How far a device's body reaches past its screen of `size`: (each side, top, bottom). A phone
+/// turned to landscape has its side buttons above and below.
+fn body_outset(device: &str, size: Vec2, landscape: bool) -> (f32, f32, f32) {
+    let w = upright_w(size, landscape);
+    let (b, _) = bezel(device, w);
+    match device {
+        "MacBook Air" => (b + w * 0.08, b, b + (w * 0.022).max(6.0)),
+        "Desktop" => (b, b, b + w * 0.08 + 6.0),
+        _ if landscape => (b, b + 3.0, b + 3.0),
+        _ => (b + 3.0, b, b),
+    }
+}
+
+/// Place the presented frame in `area`: on its device's screen (the whole device sized by the
+/// view's scale option), else the frame itself. Fit and 100% keep the chrome's padding from the
+/// edges; Fit never goes above 100%. What doesn't fit the window pans (`Presenter::pan`). The
+/// preview pane always fits. A responsive prototype's frame is first resized to the device's
+/// screen, or without a device to the whole area (shown at 100%).
+pub(super) fn layout(p: &mut Presenter, area: Rect, chrome: Chrome) -> Option<Layout> {
+    let settings = page_settings(p.doc.as_ref()?, p.current);
+    let (device, landscape) = (settings.device(), settings.landscape());
+    let fills = settings.responsive && device.is_none();
+    let whole_area = (f64::from(area.width().round()), f64::from(area.height().round()));
+    p.respond_to(settings.responsive.then(|| device.map_or(whole_area, |d| (d.width, d.height))));
+    let disp = p.display()?;
+    let fb = disp.world_bounds(p.current)?;
+    let view = if chrome.pane { PresentView::default() } else { p.view };
+    // Custom sizes are just a screen: no body.
+    let body = device.filter(|d| view.device_frame && !d.colors.is_empty());
+    let pad = if !fills && matches!(view.scale, PresentScale::Fit | PresentScale::Actual) { chrome.pad } else { 0.0 };
+    let avail = area.shrink(pad);
+    let (sw, sh) = device.map_or((fb.width(), fb.height()), |d| (d.width, d.height));
+    // The screen at `scale`, the body's outsets around it and the whole size.
+    let outer = |scale: f64| {
+        let size = vec2((sw * scale) as f32, (sh * scale) as f32);
+        let (x, top, bottom) = body.map_or((0.0, 0.0, 0.0), |d| body_outset(d.name, size, landscape));
+        (size, x, top, vec2(size.x + 2.0 * x, size.y + top + bottom))
+    };
+    // The factor that makes something of size `o` fit, fill… the available space.
+    let factor = |o: Vec2| {
+        let (kx, ky) = (avail.width() / o.x.max(1.0), avail.height() / o.y.max(1.0));
+        f64::from(match view.scale {
+            PresentScale::Fit => kx.min(ky),
+            PresentScale::FitWidth => kx,
+            PresentScale::Fill => kx.max(ky),
+            PresentScale::Actual => 1.0,
+        })
+    };
+    let mut scale = if fills { 1.0 } else { factor(vec2(sw as f32, sh as f32)) };
+    // The body doesn't scale exactly with the screen (its edges have a minimum): size it once more.
+    if body.is_some() {
+        scale *= factor(outer(scale).3);
+    }
+    let max = if view.scale == PresentScale::Fit { 1.0 } else { 16.0 };
+    let scale = if scale.is_finite() { scale.clamp(0.01, max) } else { 0.01 };
+    let (size, x, top, whole) = outer(scale);
+    p.zoom = scale;
+    // What's bigger than the window pans: starting centred across and at the top.
+    let over = |d: f32| if d > 0.5 { d } else { 0.0 };
+    let excess = vec2(over(whole.x - avail.width()), over(whole.y - avail.height()));
+    p.pan_range = (f64::from(excess.x), f64::from(excess.y));
+    // While a drag or fling moves the view it may stretch past the ends; otherwise it stays in range.
+    let live = matches!(p.drag_scroll, Some((Scroller::View, _))) || p.fling.is_some_and(|f| f.target == Scroller::View);
+    if !live {
+        p.pan = p.pan.map(|v| clamp_scroll(v, p.pan_range));
+    }
+    let pan = p.offset(Scroller::View);
+    let along = |excess: f32, min: f32, centre: f32, len: f32, pan: f64| if excess > 0.0 { min - pan as f32 } else { centre - len / 2.0 };
+    let min = pos2(along(excess.x, avail.min.x, area.center().x, whole.x, pan.0), along(excess.y, avail.min.y, area.center().y, whole.y, pan.1));
+    let screen = Rect::from_min_size(min + vec2(x, top), size);
+    let place = Place::centered(fb, screen.center(), scale);
+    let place_overlay = |o: &OverlayState| {
+        let ob = disp.world_bounds(o.id)?;
+        let size = vec2((ob.width() * scale) as f32, (ob.height() * scale) as f32);
+        let offset = o.offset.map(|[x, y]| vec2((x * scale) as f32, (y * scale) as f32));
+        let r = anchored_overlay_rect(o.position, o.anchor_to, screen, size, o.anchor.map(|a| place.rect(a)), offset);
+        Some((o.id, Place { page_min: (ob.x0, ob.y0), origin: r.min, scale }, r))
+    };
+    let overlays = p.overlays.iter().filter_map(place_overlay).collect();
+    let closing = p.closing.iter().filter_map(|(_, o)| place_overlay(o)).collect();
+    let clip = if device.is_some() { screen } else { area };
+    let color = body.and(settings.device_color());
+    Some(Layout { disp, scale, place, screen, clip, device, landscape, color, overlays, closing })
+}
+
+/// Where the player sits: the whole window or the preview pane.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(super) struct Chrome {
+    pub(super) pane: bool,
+    pub(super) bar_h: f32,
+    /// Space kept around the device or frame.
+    pub(super) pad: f32,
+    /// Corner radius of the window around the player (the pane's).
+    pub(super) round: u8,
+    /// The player may take keys (the pane only while hovered, and never while the editor is
+    /// typing: text on the canvas or in a field).
+    pub(super) keys: bool,
+}
+
+pub(super) const FULL: Chrome = Chrome { pane: false, bar_h: 40.0, pad: 32.0, round: 0, keys: true };
diff --git a/crates/ui-egui/src/present/navigate.rs b/crates/ui-egui/src/present/navigate.rs
new file mode 100644
index 00000000..a320e80d
--- /dev/null
+++ b/crates/ui-egui/src/present/navigate.rs
@@ -0,0 +1,255 @@
+use super::scroll::{apply_scroll, clamp_scroll, fit_viewport, page_settings, raise_fixed, viewport};
+use super::*;
+
+impl Presenter {
+    /// Close the top overlay; it animates out with its opening transition reversed.
+    pub(super) fn close_overlay(&mut self, now: f64) -> bool {
+        let Some(o) = self.overlays.pop() else { return false };
+        if !matches!(o.transition, Transition::Instant) && o.dur > 0.0 {
+            // An overlay closed mid-opening reverses from where it got to.
+            let shown = ((now - o.opened) / o.dur).clamp(0.0, 1.0);
+            self.closing.push((now - (1.0 - shown) * o.dur, o));
+        }
+        self.hovered.clear();
+        true
+    }
+
+    /// Follow the editor's document: copy it the first time and whenever it changed, keeping the
+    /// screen, the overlays and the scroll offsets that still exist (a deleted screen goes back to
+    /// the start). Runtime state (variables set, variants changed) starts over from the edit.
+    pub fn sync(&mut self, doc: &Arc<Document>, now: f64) {
+        if self.source.as_ref().is_some_and(|s| Arc::ptr_eq(s, doc)) {
+            return;
+        }
+        let first = self.source.is_none();
+        self.source = Some(doc.clone());
+        let copy = Document::clone(doc);
+        self.original = Some(copy.clone());
+        self.design = Some(copy);
+        self.relayout();
+        if first {
+            self.arrived = now;
+            return;
+        }
+        if !doc.contains(self.current) {
+            if doc.contains(self.start) {
+                self.restart(self.start, now);
+            }
+            return;
+        }
+        self.history.retain(|v| doc.contains(v.frame));
+        self.overlays.retain(|o| doc.contains(o.id));
+        self.closing.retain(|(_, o)| doc.contains(o.id));
+        // These hold states of the document before the edit.
+        self.temp = None;
+        self.anim = None;
+        self.scroll_anim = None;
+        self.stop_scrolling();
+        self.scroll.retain(|f, _| doc.contains(*f));
+        if let Some(laid) = self.doc.as_ref() {
+            let clamped: Vec<(NodeId, (f64, f64))> = self.scroll.iter().map(|(f, s)| (*f, clamp_scroll(*s, self.range(laid, *f)))).collect();
+            self.scroll.extend(clamped);
+        }
+        self.rev += 1;
+    }
+
+    /// Lay the document out for the screen: `design` with the presented frame resized to `fit`
+    /// when the prototype is responsive (its constraints and auto layout respond), instances
+    /// playing their variants' interactions and fixed layers on top.
+    pub(super) fn relayout(&mut self) {
+        let mut d = self.design.clone();
+        if let Some(d) = d.as_mut() {
+            if let Some(size) = self.fit {
+                figcraft_engine::cmd::proto::respond(d, self.current, size);
+            }
+            figcraft_engine::proto_run::play_interactions(d);
+            raise_fixed(d);
+        }
+        self.uses_pads = d.as_ref().is_some_and(figcraft_doc::proto::uses_gamepad);
+        self.doc = d;
+        self.rev += 1;
+    }
+
+    /// After an action changed layers of `design` (since `before`): text resizes to what it shows,
+    /// instances follow and auto layout reflows, as after an edit on the canvas; then
+    /// [`relayout`](Self::relayout).
+    pub(super) fn settle(&mut self, before: &Document) {
+        if let Some(d) = self.design.as_mut() {
+            figcraft_engine::normalize(d, before);
+        }
+        self.relayout();
+    }
+
+    /// Responsive prototypes: resize the presented frame to a screen of `size` (None: frames
+    /// keep their size). Lays out again only when it changes.
+    pub(super) fn respond_to(&mut self, size: Option<(f64, f64)>) {
+        if self.fit != size {
+            self.fit = size;
+            self.relayout();
+        }
+    }
+
+    /// The player's document with scroll offsets applied and the presented frame sized to the
+    /// device's screen (cached per revision).
+    pub(crate) fn display(&mut self) -> Option<Document> {
+        if let Some((r, d)) = &self.display
+            && *r == self.rev
+        {
+            return Some(d.clone());
+        }
+        let doc = self.doc.as_ref()?;
+        let mut d = apply_scroll(doc, &self.scroll);
+        if let Some(vp) = viewport(doc, self.current) {
+            fit_viewport(&mut d, self.current, vp);
+        }
+        self.display = Some((self.rev, d.clone()));
+        Some(d)
+    }
+
+    /// The player's state for `ui.inspect`.
+    pub fn inspect(&self) -> Value {
+        let doc = self.doc.as_ref();
+        let pan = self.offset(Scroller::View);
+        json!({
+            "current": self.current,
+            "name": doc.and_then(|d| d.node(self.current)).map(|n| n.name.as_str()),
+            "start": self.start,
+            "history": self.history.iter().map(|v| v.frame).collect::<Vec<_>>(),
+            "overlays": self.overlays.iter().map(|o| o.id).collect::<Vec<_>>(),
+            "scroll": self.scroll.get(&self.current).map_or([0.0, 0.0], |s| [s.0, s.1]),
+            "scrollRange": doc.map(|d| { let r = self.range(d, self.current); [r.0, r.1] }),
+            "device": doc.and_then(|d| page_settings(d, self.current).device()).map(|d| d.name),
+            "landscape": doc.is_some_and(|d| page_settings(d, self.current).landscape()),
+            "viewport": doc.and_then(|d| viewport(d, self.current)).map(|v| [v.0, v.1]),
+            "scale": self.view.scale.id(),
+            "deviceFrame": self.view.device_frame,
+            "comments": self.view.comments,
+            "hotspotHints": self.view.hotspot_hints,
+            "hotspots": self.hot.iter().map(|(id, r)| json!({"id": id, "rect": [r.min.x, r.min.y, r.max.x, r.max.y]})).collect::<Vec<_>>(),
+            "hotspotFlash": self.flash_until > self.clock,
+            "waiting": self.waiting.len(),
+            "inspect": self.view.inspect,
+            "inspected": self.inspected,
+            "deviceColor": doc.and_then(|d| page_settings(d, self.current).device_color()).map(|c| c.name),
+            "responsive": self.fit.map(|f| [f.0, f.1]),
+            "frameSize": doc.and_then(|d| d.node(self.current)).map(|n| [n.width, n.height]),
+            "pan": [pan.0, pan.1],
+            "panRange": [self.pan_range.0, self.pan_range.1],
+            "zoom": self.zoom,
+            "flinging": self.fling.is_some(),
+            "gamepad": self.uses_pads,
+            "linkNotice": self.link_notice.as_ref().map(|(url, _)| url),
+        })
+    }
+
+    pub(super) fn snapshot(&self) -> Option<Snapshot> {
+        Some(Snapshot {
+            current: self.current,
+            doc: self.design.clone()?,
+            overlays: self.overlays.clone(),
+            history: self.history.clone(),
+            scroll: self.scroll.clone(),
+        })
+    }
+
+    /// Start a transition from the state as it is now; call before changing the state.
+    pub(super) fn begin(&mut self, transition: Transition, dur: f64, easing: Easing, now: f64) {
+        let Some(from_doc) = self.display() else { return };
+        let from_tex = self.textures.get(&self.current).cloned();
+        self.anim = if matches!(transition, Transition::Instant) || dur <= 0.0 {
+            None
+        } else {
+            Some(Anim { from_doc, from_frame: self.current, from_tex, transition, start: now, dur, easing, follow: None })
+        };
+    }
+
+    fn arrive(&mut self, now: f64) {
+        if let Some(doc) = self.doc.as_ref() {
+            figcraft_engine::proto_run::remember_sections(doc, self.current, &mut self.sections);
+        }
+        self.arrived = now;
+        self.delays_fired.clear();
+        self.waiting.clear();
+        self.hovered.clear();
+        self.rev += 1;
+    }
+
+    /// Show `frame`. It starts scrolled to the top unless `preserve` keeps the scroll position of
+    /// the frame being left (as far as `frame` can scroll).
+    pub(super) fn go(&mut self, frame: NodeId, transition: Transition, dur: f64, easing: Easing, now: f64, remember: bool, preserve: bool) {
+        self.begin(transition, dur, easing, now);
+        if remember {
+            self.history.push(Visit { frame: self.current, transition, dur, easing });
+        }
+        let kept = self.scroll.get(&self.current).copied().filter(|_| preserve);
+        self.overlays.clear();
+        self.scroll.clear();
+        self.scroll_anim = None;
+        self.stop_scrolling();
+        self.pan = None;
+        self.temp = None;
+        self.current = frame;
+        self.relayout();
+        if let Some(s) = kept
+            && let Some(doc) = self.doc.as_ref()
+        {
+            let to = clamp_scroll(s, self.range(doc, frame));
+            self.scroll.insert(frame, to);
+        }
+        self.arrive(now);
+    }
+
+    /// Start over at `start` with the document as the editor has it.
+    pub fn restart(&mut self, start: NodeId, now: f64) {
+        self.start = start;
+        self.current = start;
+        self.sections.clear();
+        self.history.clear();
+        self.overlays.clear();
+        self.scroll.clear();
+        self.scroll_anim = None;
+        self.stop_scrolling();
+        self.pan = None;
+        self.anim = None;
+        self.temp = None;
+        self.design = self.original.clone();
+        self.relayout();
+        self.arrive(now);
+    }
+
+    pub(super) fn revert(&mut self, now: f64) {
+        let Some(t) = self.temp.take() else { return };
+        self.begin(t.transition.reversed(), t.dur, t.easing, now);
+        self.current = t.snap.current;
+        self.design = Some(t.snap.doc);
+        self.relayout();
+        self.overlays = t.snap.overlays;
+        self.history = t.snap.history;
+        self.scroll = t.snap.scroll;
+        self.stop_scrolling();
+        self.hovered.clear();
+        self.rev += 1;
+    }
+}
+
+/// The soonest "after delay" interaction in `root`'s subtree that hasn't fired yet, and the seconds
+/// until it's due (zero or less: due now). Timers start when the screen arrives, an overlay's when
+/// it opens.
+pub(crate) fn next_delay(p: &Presenter, doc: &Document, root: NodeId, now: f64) -> Option<((NodeId, usize), f64)> {
+    let since = p.overlays.last().filter(|o| o.id == root).map_or(p.arrived, |o| o.opened);
+    let mut next: Option<((NodeId, usize), f64)> = None;
+    for id in doc.subtree(root) {
+        let Some(n) = doc.node(id) else { continue };
+        for (k, it) in n.interactions.iter().enumerate() {
+            if let Trigger::AfterDelay { ms } = it.trigger
+                && !p.delays_fired.contains(&(id, k))
+            {
+                let due = since + f64::from(ms) / 1000.0 - now;
+                if next.is_none_or(|(_, d)| due < d) {
+                    next = Some(((id, k), due));
+                }
+            }
+        }
+    }
+    next
+}
diff --git a/crates/ui-egui/src/present/overlay_anchor_tests.rs b/crates/ui-egui/src/present/overlay_anchor_tests.rs
new file mode 100644
index 00000000..16d16b2d
--- /dev/null
+++ b/crates/ui-egui/src/present/overlay_anchor_tests.rs
@@ -0,0 +1,87 @@
+use egui::{Event, Modifiers, PointerButton, Pos2, Rect, pos2, vec2};
+use figcraft_doc::NodeId;
+use figcraft_doc::proto::{OverlayAnchor, OverlayPosition};
+use figcraft_engine::Session;
+use serde_json::{Value, json};
+
+use super::anchored_overlay_rect;
+use crate::present_tests::{Ui as Harness, id};
+
+fn ex(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd} {p}: {e}"))
+}
+
+fn frame(s: &mut Session, name: &str, x: f64, w: f64, h: f64) -> NodeId {
+    id(&ex(s, "frame.create", json!({"x": x, "y": 0, "width": w, "height": h, "name": name})))
+}
+
+fn rect(s: &mut Session, parent: NodeId, [x, y, w, h]: [f64; 4]) -> NodeId {
+    id(&ex(s, "shape.rectangle", json!({"x": x, "y": y, "width": w, "height": h, "parent": parent})))
+}
+
+fn hotspot(u: &Harness, layer: NodeId) -> Rect {
+    let hot = u.app.inspect()["presenter"]["hotspots"].as_array().cloned().unwrap_or_default();
+    let h = hot.iter().find(|h| h["id"] == json!(layer)).unwrap_or_else(|| panic!("no hotspot on {layer}: {hot:?}"));
+    let r: Vec<f32> = h["rect"].as_array().unwrap().iter().map(|v| v.as_f64().unwrap() as f32).collect();
+    Rect::from_min_max(pos2(r[0], r[1]), pos2(r[2], r[3]))
+}
+
+fn button(at: Pos2, pressed: bool) -> Event {
+    Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE }
+}
+
+#[test]
+fn presets_sit_on_the_trigger_or_on_the_screen() {
+    let base = Rect::from_min_size(pos2(0.0, 0.0), vec2(400.0, 800.0));
+    let size = vec2(60.0, 200.0);
+    let trigger = Rect::from_min_size(pos2(30.0, 100.0), vec2(100.0, 40.0));
+    let at = |p, a, t| anchored_overlay_rect(p, a, base, size, t, None).min;
+    use OverlayAnchor::*;
+    use OverlayPosition as P;
+    for (p, a, want, why) in [
+        (P::BottomLeft, TriggerOutside, pos2(30.0, 140.0), "below the trigger, left edges lined up"),
+        (P::BottomRight, TriggerOutside, pos2(70.0, 140.0), "below, right edges: 30 + 100 - 60"),
+        (P::TopCenter, TriggerOutside, pos2(50.0, -100.0), "above, centred: 30 + 20, 100 - 200"),
+        (P::TopLeft, TriggerInside, pos2(30.0, 100.0), "on the trigger's top-left"),
+        (P::Center, TriggerInside, pos2(50.0, 20.0), "centred on the trigger"),
+        (P::BottomLeft, Screen, pos2(0.0, 600.0), "the screen's bottom left, as before"),
+    ] {
+        assert_eq!(at(p, a, Some(trigger)), want, "{p:?} {a:?}: {why}");
+    }
+    assert_eq!(at(P::BottomLeft, TriggerOutside, None), pos2(0.0, 600.0), "opened by nothing on screen: the screen's preset");
+}
+
+#[test]
+fn a_dropdown_opens_right_under_its_button() {
+    let mut s = Session::new();
+    let a = frame(&mut s, "A", 0.0, 300.0, 400.0);
+    let menu = frame(&mut s, "Menu", 400.0, 120.0, 80.0);
+    let hot = rect(&mut s, a, [50.0, 50.0, 100.0, 30.0]);
+    let item = rect(&mut s, menu, [0.0, 0.0, 120.0, 20.0]);
+    let open = json!({"type": "openOverlay", "dest": menu, "position": "bottomLeft", "anchor": "triggerOutside"});
+    ex(&mut s, "proto.interaction.add", json!({"id": hot, "action": open, "transition": {"type": "instant"}}));
+    ex(&mut s, "proto.interaction.add", json!({"id": item, "action": {"type": "closeOverlay"}, "transition": {"type": "instant"}}));
+    let mut u = Harness::new(s);
+    u.run("proto.present", json!({"start": a}));
+    u.frames(2, Vec::new);
+    let scale = |u: &mut Harness, scale: &str| {
+        u.run("proto.presentOptions", json!({"scale": scale}));
+        u.frames(2, Vec::new);
+    };
+    scale(&mut u, "fill");
+    let filled = hotspot(&u, hot);
+    scale(&mut u, "fit");
+    let h = hotspot(&u, hot);
+    assert_ne!(filled, h, "fill shows the frame at another size");
+    u.frame(vec![Event::PointerMoved(h.center())]);
+    u.frame(vec![button(h.center(), true)]);
+    u.frame(vec![button(h.center(), false)]);
+    u.frames(2, Vec::new);
+    let under = |u: &Harness, b: Rect| {
+        let (got, want) = (hotspot(u, item).min, pos2(b.min.x, b.max.y));
+        assert!((got - want).length() < 0.01, "{got:?} vs {want:?}");
+    };
+    under(&u, h);
+    scale(&mut u, "fill");
+    under(&u, filled);
+}
diff --git a/crates/ui-egui/src/present/player.rs b/crates/ui-egui/src/present/player.rs
new file mode 100644
index 00000000..dc47baa7
--- /dev/null
+++ b/crates/ui-egui/src/present/player.rs
@@ -0,0 +1,285 @@
+use super::chrome::{BarAction, layer_at, paint_menu_chevron};
+use super::device::{device_body, device_glass};
+use super::draw::draw;
+use super::input::input;
+use super::layout::{Chrome, Layout, layout};
+use super::navigate::next_delay;
+use super::scroll::page_settings;
+use super::transition::lerp;
+use super::*;
+
+/// One frame of the player in `rect`: the top bar, then the prototype (on its device) below.
+/// Returns what the bar asked for (restarting is done here).
+pub(super) fn player(p: &mut Presenter, ui: &mut Ui, rect: Rect, now: f64, chrome: Chrome) -> Option<BarAction> {
+    let ctx = ui.ctx().clone();
+    p.clock = now;
+    let bar = Rect::from_min_size(rect.min, vec2(rect.width(), chrome.bar_h));
+    let area = Rect::from_min_max(pos2(rect.min.x, bar.max.y), rect.max);
+    let bg = crate::theme::doc_c32(ui.ctx(), p.doc.as_ref().map(|d| page_settings(d, p.current)).unwrap_or_default().background);
+    let r = chrome.round;
+    ui.painter().rect_filled(area, CornerRadius { nw: 0, ne: 0, sw: r, se: r }, bg);
+    let action = top_bar(p, ui, bar, now, chrome);
+    if action == Some(BarAction::Restart) {
+        p.restart(p.start, now);
+    }
+    if p.doc.as_ref().is_none_or(|d| !d.contains(p.current)) {
+        // Controller buttons pressed with no frame to show are dropped, as they are while a link
+        // notice shows.
+        p.pads.clear();
+        if !chrome.pane {
+            return Some(BarAction::Close);
+        }
+        ui.painter().text(area.center(), Align2::CENTER_CENTER, tr("Select a frame to preview it"), regular(12.0), Color32::from_gray(170));
+        return action;
+    }
+    // Scroll animation (Scroll to).
+    if let Some(sa) = &p.scroll_anim {
+        let raw = ((now - sa.start) / sa.dur.max(1e-3)).clamp(0.0, 1.0);
+        let e = sa.easing.eval(raw);
+        for (f, from, to) in &sa.frames {
+            p.scroll.insert(*f, (lerp(from.0, to.0, e), lerp(from.1, to.1, e)));
+        }
+        p.rev += 1;
+        if raw >= 1.0 {
+            p.scroll_anim = None;
+        }
+        ctx.request_repaint();
+    }
+    // Scrolling that carries on after the input let go (repaints only while it moves).
+    if p.step_fling(now) {
+        ctx.request_repaint();
+    }
+    let resp = ui.interact(area, ui.scope_id().with("present_area"), Sense::click_and_drag());
+    let over = resp.contains_pointer();
+    if let Some(l) = layout(p, area, chrome) {
+        // The pane only takes the keyboard while the pointer is over it. While a link notice shows
+        // the prototype takes neither keys nor the pointer (Escape there cancels the notice).
+        let keys = chrome.keys && p.link_notice.is_none() && (!chrome.pane || over);
+        input(p, &ctx, &l, over && p.link_notice.is_none(), keys, chrome.pane, now);
+    } else {
+        p.pads.clear();
+    }
+    let Some(l) = layout(p, area, chrome) else { return action };
+    p.shown = Some((p.current, l.place, l.clip.intersect(area)));
+    let painter = ui.painter_at(area);
+    let body = l.device.zip(l.color);
+    if l.device.is_some() {
+        if let Some((d, c)) = body {
+            device_body(&painter, d.name, l.screen, l.landscape, c);
+        }
+        painter.rect_filled(l.screen, CornerRadius::ZERO, bg);
+    }
+    draw(p, &painter, &ctx, &l, now);
+    if p.view.inspect && !chrome.pane {
+        inspect_hover(p, &painter, &ctx, &l, area);
+    }
+    if let Some((d, _)) = body {
+        device_glass(&painter, d.name, l.screen, l.landscape);
+    }
+    // Timers: wake up for the soonest pending "after delay" of the layer that can fire it (they
+    // wait while a transition plays, which draws every frame anyway).
+    if p.anim.is_none()
+        && let Some((_, due)) = next_delay(p, &l.disp, l.active(p.current).0, now)
+    {
+        crate::repaint_in(&ctx, due.min(60.0));
+    }
+    // And for the soonest mouse trigger waiting out its delay.
+    if let Some(due) = p.waiting.iter().map(|w| w.due - now).reduce(f64::min) {
+        crate::repaint_in(&ctx, due.clamp(0.0, 60.0));
+    }
+    action
+}
+
+/// Inspecting: the layer under the pointer becomes the inspected one; it is outlined.
+fn inspect_hover(p: &mut Presenter, painter: &egui::Painter, ctx: &egui::Context, l: &Layout, area: Rect) {
+    let (root, place, clip) = l.active(p.current);
+    if let Some(q) = ctx.pointer_hover_pos().filter(|q| area.contains(*q) && clip.contains(*q))
+        && let Some(id) = layer_at(&l.disp, root, &place, q)
+    {
+        p.inspected = Some(id);
+    }
+    if let Some(id) = p.inspected.filter(|id| *id == root || l.disp.is_ancestor(root, *id))
+        && let Some(b) = l.disp.world_bounds(id)
+    {
+        painter.with_clip_rect(clip).rect_stroke(place.rect(b), CornerRadius::ZERO, Stroke::new(1.5, ACCENT), StrokeKind::Outside);
+    }
+}
+
+/// The bar above the prototype: the flow picker and the frame's name on the left, the buttons on
+/// the right (text on the dark full-window bar, icons in the pane, which follows the theme).
+fn top_bar(p: &mut Presenter, ui: &mut Ui, bar: Rect, now: f64, chrome: Chrome) -> Option<BarAction> {
+    let t = Tokens::get(ui.ctx());
+    let (fill, text, dim, hover) = (t.panel, t.text, t.text_secondary, t.hover);
+    let r = chrome.round;
+    ui.painter().rect_filled(bar, CornerRadius { nw: r, ne: r, sw: 0, se: 0 }, fill);
+    if chrome.pane {
+        ui.painter().line_segment([bar.left_bottom(), bar.right_bottom()], Stroke::new(1.0, t.border));
+    }
+    let source_key = p.source.as_ref().map_or(0, |s| Arc::as_ptr(s) as usize);
+    if !chrome.pane && p.bar_thumb.as_ref().is_none_or(|(id, source, _)| *id != p.current || *source != source_key) {
+        p.bar_thumb =
+            p.source.as_ref().and_then(|d| crate::assets_panel::thumbnail(ui.ctx(), d, p.current, 38.0)).map(|tex| (p.current, source_key, tex));
+    }
+    let doc = p.doc.as_ref()?;
+    let name = doc.node(p.current).map(|n| n.name.clone()).unwrap_or_default();
+    let flows = match doc.page_of(p.start).and_then(|pg| doc.node(pg)).map(|n| &n.kind) {
+        Some(NodeKind::Page { flows, .. }) => flows.clone(),
+        _ => vec![],
+    };
+    let settings = page_settings(doc, p.current);
+    let device = settings.device();
+    let mut action = None;
+    // Right: the buttons, right to left (English labels key their ids; shown translated).
+    let buttons: &[(BarAction, &str, Icon)] = if chrome.pane {
+        &[
+            (BarAction::Close, tr_noop("Close preview"), Icon::Close),
+            (BarAction::Present, tr_noop("Present"), Icon::Play),
+            (BarAction::Restart, tr_noop("Restart"), Icon::Reset),
+        ]
+    } else {
+        &[
+            (BarAction::Close, tr_noop("Close"), Icon::Close),
+            (BarAction::Restart, tr_noop("Restart"), Icon::Reset),
+            (BarAction::Options, tr_noop("Options"), Icon::Dots),
+            (BarAction::Comments, tr_noop("Comments"), Icon::Comment),
+            (BarAction::Inspect, tr_noop("Inspect"), Icon::Code),
+        ]
+    };
+    let mut x = bar.max.x - if chrome.pane { 6.0 } else { 8.0 };
+    for (act, label, icon) in buttons {
+        let shown = tr(label);
+        let w = if chrome.pane { 24.0 } else { ui.painter().layout_no_wrap(shown.to_string(), regular(11.5), text).size().x + 16.0 };
+        let br = Rect::from_min_size(pos2(x - w, bar.center().y - 12.0), vec2(w, 24.0));
+        x = br.min.x - if chrome.pane { 2.0 } else { 4.0 };
+        let mut resp = ui.interact(br, ui.scope_id().with(("pbar", *label)), Sense::click());
+        if chrome.pane {
+            resp = resp.tip(shown);
+        }
+        let on = (*act == BarAction::Comments && p.view.comments) || (*act == BarAction::Inspect && p.view.inspect);
+        if on {
+            ui.painter().rect_filled(br, CornerRadius::same(5), t.accent);
+        } else if resp.hovered() {
+            ui.painter().rect_filled(br, CornerRadius::same(5), hover);
+        }
+        if *act == BarAction::Comments {
+            resp = resp.tip(tr("Show comments (Shift+C)"));
+        }
+        if *act == BarAction::Inspect {
+            resp = resp.tip(tr("Inspect the layer under the pointer: size, colours, typography"));
+        }
+        if chrome.pane {
+            icons::paint(ui.painter(), br.shrink(5.0), *icon, if on { t.accent_on } else { t.icon });
+        } else {
+            ui.painter().text(br.center(), Align2::CENTER_CENTER, shown, regular(11.5), if on { t.accent_on } else { text });
+        }
+        if *act == BarAction::Options {
+            let menu = crate::right::menu_popup(&resp).width(220.0).show(|ui| options_menu(p, ui, device, settings.responsive, now));
+            action = action.or(menu.and_then(|m| m.inner));
+        } else if resp.clicked() {
+            action = Some(*act);
+        }
+    }
+    // Left: the flow picker and the frame's name, clipped before the buttons.
+    let left = ui.painter().with_clip_rect(Rect::from_min_max(bar.min, pos2(x, bar.max.y)));
+    let mut lx = bar.min.x + if chrome.pane { 8.0 } else { 12.0 };
+    if !chrome.pane {
+        let thumb = Rect::from_center_size(pos2(lx + 15.0, bar.center().y), vec2(28.0, 28.0));
+        left.rect_filled(thumb, CornerRadius::same(4), t.field);
+        if let Some((_, _, tex)) = &p.bar_thumb {
+            let size = tex.size_vec2();
+            if size.x > 0.0 && size.y > 0.0 {
+                let scaled = size * (26.0 / size.x.max(size.y));
+                let dst = Rect::from_center_size(thumb.center(), scaled);
+                left.image(tex.id(), dst, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
+            }
+        }
+        lx += 38.0;
+    }
+    // The flow playing: its name on the picker, its description on hover; the menu lists each
+    // flow with its description.
+    let playing = flows.iter().find(|f| f.start == p.start);
+    if !flows.is_empty() {
+        let label = playing.map_or(tr("Flows"), |f| f.name.as_str()).to_owned();
+        let tip = playing.map(|f| f.description.trim()).filter(|d| !d.is_empty()).unwrap_or(tr("Flows")).to_string();
+        let galley = left.layout_no_wrap(label, semibold(11.5), text);
+        let fr = Rect::from_min_size(pos2(lx, bar.center().y - 12.0), vec2(galley.size().x + 30.0, 24.0));
+        let resp = ui.interact(fr.intersect(left.clip_rect()), ui.scope_id().with("pflows"), Sense::click()).tip(tip);
+        if resp.hovered() {
+            left.rect_filled(fr, CornerRadius::same(5), hover);
+        }
+        left.galley(pos2(fr.min.x + 8.0, fr.center().y - galley.size().y / 2.0), galley, text);
+        paint_menu_chevron(&left, fr, t.icon_secondary);
+        crate::right::menu_popup(&resp).width(240.0).show(|ui| {
+            let t = Tokens::get(ui.ctx());
+            for f in &flows {
+                if crate::right::menu_check(ui, f.start == p.start, &f.name, "") {
+                    p.restart(f.start, now);
+                    ui.close();
+                }
+                let d = f.description.trim();
+                if !d.is_empty() {
+                    egui::Frame::NONE.inner_margin(egui::Margin { left: 26, right: 8, top: 0, bottom: 4 }).show(ui, |ui| {
+                        ui.add(egui::Label::new(egui::RichText::new(d).font(regular(10.5)).color(t.text_secondary)).wrap());
+                    });
+                }
+            }
+        });
+        lx = fr.max.x + 8.0;
+        left.text(pos2(lx, bar.center().y), Align2::LEFT_CENTER, "/", regular(11.5), dim);
+        lx += 14.0;
+    }
+    left.text(pos2(lx, bar.center().y), Align2::LEFT_CENTER, name, regular(11.5), text);
+    action
+}
+
+/// The full-window presenter's options menu: how the prototype is sized (Z cycles them), whether
+/// the frame is responsive (a file setting: the frame takes the window's size, or on a device the
+/// screen's, instead of being scaled or shown at a fixed size), the device's body, hotspot hints,
+/// restart (R).
+fn options_menu(p: &mut Presenter, ui: &mut Ui, device: Option<Device>, responsive: bool, now: f64) -> Option<BarAction> {
+    use crate::right::menu_check;
+    let mut action = None;
+    let on_device = device.is_some();
+    // Without a device, responsive is one of the sizes: the frame fills the window at 100%.
+    if !on_device && menu_check(ui, responsive, tr("Responsive"), "") {
+        action = Some(BarAction::Responsive(true));
+        ui.close();
+    }
+    for s in PresentScale::options(on_device) {
+        if menu_check(ui, p.view.scale == *s && (on_device || !responsive), s.label(on_device), "") {
+            p.set_scale(*s);
+            if !on_device && responsive {
+                action = Some(BarAction::Responsive(false));
+            }
+            ui.close();
+        }
+    }
+    if (on_device || !responsive) && menu_check(ui, false, tr("Next size option"), "Z") {
+        p.set_scale(p.view.scale.next(on_device));
+        ui.close();
+    }
+    ui.separator();
+    // On a device: the frame takes the screen's size, or keeps its own (clipped or scrolling).
+    if on_device {
+        for (on, label) in [(true, tr("Responsive")), (false, tr("Fixed size"))] {
+            if menu_check(ui, responsive == on, label, "") {
+                action = (responsive != on).then_some(BarAction::Responsive(on));
+                ui.close();
+            }
+        }
+        ui.separator();
+    }
+    if device.is_some_and(|d| !d.colors.is_empty()) && menu_check(ui, p.view.device_frame, tr("Show device frame"), "") {
+        p.view.device_frame = !p.view.device_frame;
+        ui.close();
+    }
+    if menu_check(ui, p.view.hotspot_hints, tr("Show hotspot hints"), "") {
+        p.view.hotspot_hints = !p.view.hotspot_hints;
+        ui.close();
+    }
+    if menu_check(ui, false, tr("Restart"), "R") {
+        p.restart(p.start, now);
+        ui.close();
+    }
+    action
+}
diff --git a/crates/ui-egui/src/present/scroll.rs b/crates/ui-egui/src/present/scroll.rs
new file mode 100644
index 00000000..12c682cc
--- /dev/null
+++ b/crates/ui-egui/src/present/scroll.rs
@@ -0,0 +1,354 @@
+use super::layout::Place;
+use super::*;
+
+/// How quickly a fling slows down after a drag (1/s; it travels its speed / decay).
+pub(super) const DECAY_DRAG: f64 = 2.5;
+
+/// How quickly the wheel's coast slows down (1/s).
+pub(super) const DECAY_WHEEL: f64 = 8.0;
+
+/// Stiffness of the spring that pulls an overscroll back (1/s, critically damped).
+const SPRING: f64 = 16.0;
+
+/// A fling inside its range stops below this speed (units/s).
+const FLING_STOP: f64 = 6.0;
+
+/// The wheel coasts on when it was faster than this as it stopped (screen points/s).
+pub(super) const COAST_MIN: f64 = 40.0;
+
+/// How far a drag past the end can stretch the content at most (screen points).
+pub(super) const RUBBER_PTS: f64 = 240.0;
+
+impl Presenter {
+    /// The current offset of `t` (a frame's scroll, else the view's pan).
+    pub(super) fn offset(&self, t: Scroller) -> (f64, f64) {
+        match t {
+            Scroller::Frame(f) => self.scroll.get(&f).copied().unwrap_or((0.0, 0.0)),
+            Scroller::View => self.pan.unwrap_or((self.pan_range.0 / 2.0, 0.0)),
+        }
+    }
+
+    /// How far `t` scrolls (`base`: the player's document without scroll offsets).
+    pub(super) fn limits(&self, base: &Document, t: Scroller) -> (f64, f64) {
+        match t {
+            Scroller::Frame(f) => self.range(base, f),
+            Scroller::View => self.pan_range,
+        }
+    }
+
+    pub(super) fn set_offset(&mut self, t: Scroller, v: (f64, f64)) {
+        if !v.0.is_finite() || !v.1.is_finite() {
+            return;
+        }
+        match t {
+            Scroller::Frame(f) => {
+                if self.scroll.get(&f) != Some(&v) {
+                    self.scroll.insert(f, v);
+                    self.rev += 1;
+                }
+            }
+            Scroller::View => self.pan = Some(v),
+        }
+    }
+
+    /// Move a fling on to `now`; true while it is still moving.
+    pub(super) fn step_fling(&mut self, now: f64) -> bool {
+        let Some(mut f) = self.fling.take() else { return false };
+        let Some(base) = self.doc.as_ref() else { return false };
+        let r = self.limits(base, f.target);
+        let x = self.offset(f.target);
+        let dt = (now - f.at).clamp(0.0, 0.25);
+        f.at = now;
+        let (nx, vx, done_x) = fling_axis(x.0, f.vel.0, r.0, dt, f.decay, f.bounce);
+        let (ny, vy, done_y) = fling_axis(x.1, f.vel.1, r.1, dt, f.decay, f.bounce);
+        self.set_offset(f.target, (nx, ny));
+        f.vel = (vx, vy);
+        if done_x && done_y {
+            return false;
+        }
+        self.fling = Some(f);
+        true
+    }
+
+    /// How far `frame` scrolls (in `doc`, without scroll offsets): the presented frame within the
+    /// device's screen, other frames within themselves.
+    pub(super) fn range(&self, doc: &Document, frame: NodeId) -> (f64, f64) {
+        let vp = if frame == self.current { viewport(doc, frame) } else { None };
+        scroll_range_in(doc, frame, vp)
+    }
+
+    /// What "Scroll to" `dest` moves: every scrolling frame around it, innermost first, brings the
+    /// layer (then the frame holding it) to its top-left as far as it can scroll, the innermost
+    /// `offset` short of it. Each entry is (frame, offset now, offset after).
+    pub(super) fn scroll_to_layer(&self, doc: &Document, dest: NodeId, offset: [f64; 2]) -> Vec<ScrollMove> {
+        let mut out = Vec::new();
+        let mut target = dest;
+        // The innermost scrolling frame leaves `offset` before the layer.
+        let mut off = offset.map(|v| if v.is_finite() { v } else { 0.0 });
+        for f in doc.ancestors(dest) {
+            let (rx, ry) = self.range(doc, f);
+            let Some(tn) = doc.node(target) else { break };
+            if rx <= 0.0 && ry <= 0.0 {
+                continue;
+            }
+            let rel = doc.world_transform(f).inverse() * doc.world_transform(target);
+            let b = figcraft_geom::transform_rect_bbox(rel, tn.local_rect());
+            let from = self.scroll.get(&f).copied().unwrap_or((0.0, 0.0));
+            let to = clamp_scroll((if rx > 0.0 { b.x0 - off[0] } else { from.0 }, if ry > 0.0 { b.y0 - off[1] } else { from.1 }), (rx, ry));
+            out.push((f, from, to));
+            target = f;
+            off = [0.0, 0.0];
+        }
+        out
+    }
+
+    /// Scroll the presented frame to `(x, y)` (page units, clamped to what it can scroll).
+    pub fn scroll_to(&mut self, x: f64, y: f64) {
+        let Some(doc) = self.doc.as_ref() else { return };
+        if !x.is_finite() || !y.is_finite() {
+            return;
+        }
+        let to = clamp_scroll((x, y), self.range(doc, self.current));
+        self.scroll.insert(self.current, to);
+        self.scroll_anim = None;
+        self.stop_scrolling();
+        self.rev += 1;
+    }
+}
+
+/// How far `frame`'s content can scroll `(x, y)` (0 when it doesn't overflow or doesn't scroll).
+pub fn scroll_range(doc: &Document, frame: NodeId) -> (f64, f64) {
+    scroll_range_in(doc, frame, None)
+}
+
+/// How far `frame`'s content can scroll when `viewport` (page units, from its top-left) of it
+/// shows, as a device's screen shows a top-level frame: the frame itself is content then, so a
+/// frame bigger than the screen scrolls through its whole size whatever its overflow (as in
+/// Figma, a top-level frame needs no overflow setting for that). Without a viewport the frame
+/// shows at its own size and what overflows it scrolls. Content past the frame's own edges
+/// scrolls only on the axes its overflow allows.
+pub fn scroll_range_in(doc: &Document, frame: NodeId, viewport: Option<(f64, f64)>) -> (f64, f64) {
+    let Some(n) = doc.node(frame) else { return (0.0, 0.0) };
+    if n.overflow == Overflow::None && viewport.is_none() {
+        return (0.0, 0.0);
+    }
+    let (mut x1, mut y1) = (0.0f64, 0.0f64);
+    for c in &n.children {
+        let Some(cn) = doc.node(*c) else { continue };
+        if !cn.visible || cn.scroll_position == ScrollPosition::Fixed {
+            continue;
+        }
+        let b = figcraft_geom::transform_rect_bbox(cn.transform, cn.local_rect());
+        x1 = x1.max(b.x1);
+        y1 = y1.max(b.y1);
+    }
+    if let Some(l) = &n.layout {
+        x1 += l.padding[1];
+        y1 += l.padding[2];
+    }
+    // Axes the overflow doesn't scroll clip what lies past the frame's edges.
+    if !matches!(n.overflow, Overflow::Horizontal | Overflow::Both) {
+        x1 = 0.0;
+    }
+    if !matches!(n.overflow, Overflow::Vertical | Overflow::Both) {
+        y1 = 0.0;
+    }
+    let (vw, vh) = match viewport {
+        Some(v) => {
+            x1 = x1.max(n.width);
+            y1 = y1.max(n.height);
+            v
+        }
+        None => (n.width, n.height),
+    };
+    let (rx, ry) = ((x1 - vw).max(0.0), (y1 - vh).max(0.0));
+    (if rx.is_finite() { rx } else { 0.0 }, if ry.is_finite() { ry } else { 0.0 })
+}
+
+/// `(x, y)` kept within `0..=range` on each axis (0 for non-finite values).
+pub(super) fn clamp_scroll((x, y): (f64, f64), (rx, ry): (f64, f64)) -> (f64, f64) {
+    let c = |v: f64, r: f64| if v.is_finite() && r.is_finite() { v.clamp(0.0, r.max(0.0)) } else { 0.0 };
+    (c(x, rx), c(y, ry))
+}
+
+/// One axis of a fling after `dt` seconds: from offset `x` moving at `v` (units/s) in a range
+/// `0..=r`. Inside the range it slows down exponentially (`decay`, 1/s: it travels `v / decay`);
+/// past an end it either stops there or, with `bounce`, a critically damped spring pulls it back.
+/// Both are solved exactly over short sub-steps, so the motion doesn't depend on the frame rate.
+/// Returns the new offset and speed, and whether it has come to rest.
+pub fn fling_axis(x: f64, v: f64, r: f64, dt: f64, decay: f64, bounce: bool) -> (f64, f64, bool) {
+    if !(x.is_finite() && v.is_finite() && r.is_finite() && dt.is_finite() && decay > 0.0) || r <= 0.0 {
+        return (if r.is_finite() && x.is_finite() { x.clamp(0.0, r.max(0.0)) } else { 0.0 }, 0.0, true);
+    }
+    // A frame is never longer than a second, nor a fling faster than a million units a second.
+    let dt = dt.clamp(0.0, 1.0);
+    let steps = (dt * 240.0).ceil().clamp(1.0, 64.0);
+    let h = dt / steps;
+    let (mut x, mut v) = (x, v.clamp(-1e6, 1e6));
+    for _ in 0..steps as usize {
+        if (0.0..=r).contains(&x) {
+            let e = (-decay * h).exp();
+            x += v * (1.0 - e) / decay;
+            v *= e;
+            if !bounce && !(0.0..=r).contains(&x) {
+                x = x.clamp(0.0, r);
+                v = 0.0;
+            }
+        } else {
+            let end = x.clamp(0.0, r);
+            let (d, e) = (x - end, (-SPRING * h).exp());
+            let c = v + SPRING * d;
+            x = end + (d + c * h) * e;
+            v = (v - SPRING * c * h) * e;
+        }
+    }
+    if !x.is_finite() || !v.is_finite() {
+        return (0.0, 0.0, true);
+    }
+    let end = x.clamp(0.0, r);
+    if x == end && v.abs() < FLING_STOP {
+        return (x, 0.0, true);
+    }
+    if x != end && (x - end).abs() < 0.5 && v.abs() < FLING_STOP * 4.0 {
+        return (end, 0.0, true);
+    }
+    (x, v, false)
+}
+
+/// Where a drag to offset `x` shows in a range `0..=r`: past an end it stretches less the further
+/// it goes, never more than `limit` past.
+pub fn rubber_band(x: f64, r: f64, limit: f64) -> f64 {
+    if !x.is_finite() || !r.is_finite() || r <= 0.0 || !limit.is_finite() || limit <= 0.0 {
+        return if x.is_finite() && r.is_finite() { x.clamp(0.0, r.max(0.0)) } else { 0.0 };
+    }
+    let band = |over: f64| limit * (1.0 - 1.0 / (over * 0.55 / limit + 1.0));
+    if x < 0.0 {
+        -band(-x)
+    } else if x > r {
+        r + band(x - r)
+    } else {
+        x
+    }
+}
+
+/// The prototype settings of the page holding `id` (defaults when there's none).
+pub fn page_settings(doc: &Document, id: NodeId) -> PrototypeSettings {
+    doc.page_of(id)
+        .and_then(|pg| doc.node(pg))
+        .and_then(|n| match &n.kind {
+            NodeKind::Page { prototype, .. } => Some(prototype.clone()),
+            _ => None,
+        })
+        .unwrap_or_default()
+}
+
+/// The part of top-level `frame` its page's device shows (page units): the frame clipped to the
+/// device's screen. None without a device: the frame then shows whole.
+pub fn viewport(doc: &Document, frame: NodeId) -> Option<(f64, f64)> {
+    let d = page_settings(doc, frame).device()?;
+    let n = doc.node(frame)?;
+    Some((n.width.min(d.width), n.height.min(d.height)))
+}
+
+/// Size `frame` to the `(w, h)` of it a screen shows. The content keeps its place (what doesn't
+/// fit is clipped or scrolls); fixed layers follow their constraints to the screen's edges, so a
+/// tab bar pinned to the frame's bottom sits at the bottom of the screen (stretching constraints
+/// keep the layer's size).
+pub fn fit_viewport(doc: &mut Document, frame: NodeId, (w, h): (f64, f64)) {
+    let Some(n) = doc.node(frame) else { return };
+    let (dw, dh) = (w - n.width, h - n.height);
+    if !dw.is_finite() || !dh.is_finite() || (dw == 0.0 && dh == 0.0) {
+        return;
+    }
+    let fixed: Vec<NodeId> =
+        n.children.iter().copied().filter(|c| doc.node(*c).is_some_and(|c| c.scroll_position == ScrollPosition::Fixed)).collect();
+    for c in fixed {
+        if let Some(m) = doc.node_mut(c) {
+            let dx = match m.constraints.horizontal {
+                HConstraint::Right => dw,
+                HConstraint::Center => dw / 2.0,
+                _ => 0.0,
+            };
+            let dy = match m.constraints.vertical {
+                VConstraint::Bottom => dh,
+                VConstraint::Center => dh / 2.0,
+                _ => 0.0,
+            };
+            m.transform = Affine::translate((dx, dy)) * m.transform;
+        }
+    }
+    if let Some(m) = doc.node_mut(frame) {
+        m.width = w;
+        m.height = h;
+    }
+}
+
+/// Shift scrolling frames' children by their scroll offsets. Fixed children stay put; sticky
+/// children scroll until they reach the frame's top/left edge, then stay there.
+pub fn apply_scroll(doc: &Document, scroll: &HashMap<NodeId, (f64, f64)>) -> Document {
+    let mut out = doc.clone();
+    let sticky = |pos: f64, s: f64| if pos >= 0.0 && pos - s < 0.0 { -pos } else { -s };
+    for (&frame, &(sx, sy)) in scroll {
+        if !sx.is_finite() || !sy.is_finite() || (sx == 0.0 && sy == 0.0) {
+            continue;
+        }
+        let Some(n) = doc.node(frame) else { continue };
+        for &c in &n.children {
+            let Some(cn) = doc.node(c) else { continue };
+            let (dx, dy) = match cn.scroll_position {
+                ScrollPosition::Fixed => continue,
+                ScrollPosition::Scrolls => (-sx, -sy),
+                ScrollPosition::Sticky => {
+                    let b = figcraft_geom::transform_rect_bbox(cn.transform, cn.local_rect());
+                    (sticky(b.x0, sx), sticky(b.y0, sy))
+                }
+            };
+            if let Some(m) = out.node_mut(c) {
+                m.transform = Affine::translate((dx, dy)) * m.transform;
+            }
+        }
+    }
+    out
+}
+
+/// Fixed layers draw (and take clicks) above the content that scrolls under them: each frame's
+/// fixed children move to the top of its children, keeping their order (for the player's copy).
+pub fn raise_fixed(doc: &mut Document) {
+    let fixed = |c: &NodeId| doc.node(*c).is_some_and(|c| c.scroll_position == ScrollPosition::Fixed);
+    let moves: Vec<(NodeId, Vec<NodeId>)> = doc
+        .nodes()
+        .filter(|n| !matches!(n.kind, NodeKind::Page { .. }) && n.children.iter().any(fixed))
+        .filter_map(|n| {
+            let (top, mut order): (Vec<NodeId>, Vec<NodeId>) = n.children.iter().partition(|c| fixed(c));
+            order.extend(top);
+            (order != n.children).then_some((n.id, order))
+        })
+        .collect();
+    for (id, order) in moves {
+        if let Some(n) = doc.node_mut(id) {
+            n.children = order;
+        }
+    }
+}
+
+/// Scrolling frames under the screen point `q`, innermost first: those of `root` (in the display
+/// document `disp`) that can scroll (`base` is the player's document without scroll offsets).
+pub(super) fn scrollers_at(p: &Presenter, base: &Document, disp: &Document, root: NodeId, place: &Place, q: Pos2) -> Vec<NodeId> {
+    let mut out: Vec<NodeId> = disp
+        .subtree(root)
+        .into_iter()
+        .filter(|f| disp.node(*f).is_some_and(|n| n.visible && (n.overflow != Overflow::None || *f == root)))
+        .filter(|f| disp.world_bounds(*f).is_some_and(|b| place.rect(b).contains(q)))
+        .filter(|f| p.range(base, *f) != (0.0, 0.0))
+        .collect();
+    out.reverse();
+    out
+}
+
+/// Screen points → `t`'s units (page units for frames, points for the view).
+pub(super) fn units_per_point(t: Scroller, scale: f64) -> f64 {
+    match t {
+        Scroller::Frame(_) => 1.0 / scale.max(1e-6),
+        Scroller::View => 1.0,
+    }
+}
diff --git a/crates/ui-egui/src/present_tail_tests.rs b/crates/ui-egui/src/present/tail_tests.rs
similarity index 100%
rename from crates/ui-egui/src/present_tail_tests.rs
rename to crates/ui-egui/src/present/tail_tests.rs
diff --git a/crates/ui-egui/src/present/tests.rs b/crates/ui-egui/src/present/tests.rs
new file mode 100644
index 00000000..bba99878
--- /dev/null
+++ b/crates/ui-egui/src/present/tests.rs
@@ -0,0 +1,438 @@
+use super::*;
+use figcraft_doc::NodeKind;
+
+use crate::present_tests::{Ui, id};
+
+#[test]
+fn device_picker_reflows_without_resizing_the_saved_frame_and_can_revert() {
+    let mut session = figcraft_engine::Session::new();
+    let frame = id(&session.execute("node.create", &json!({"type": "frame", "width": 894, "height": 844})).unwrap());
+    let right =
+        id(&session.execute("node.create", &json!({"type": "rectangle", "parent": frame, "x": 804, "y": 20, "width": 80, "height": 40})).unwrap());
+    session.execute("node.set", &json!({"id": right, "props": {"constraints": {"horizontal": "right", "vertical": "top"}}})).unwrap();
+    let mut ui = Ui::new(session);
+    ui.run("proto.present", json!({"start": frame}));
+
+    let mut presenter = ui.app.ui.present.take().unwrap();
+    presenter.pan = Some((100.0, 200.0));
+    presenter.scroll.insert(frame, (75.0, 50.0));
+    choose_device(&mut ui.app, &mut presenter, "iPhone 17");
+    assert!(presenter.pan.is_none() && presenter.scroll.is_empty());
+    ui.app.ui.present = Some(presenter);
+    ui.frame(vec![]);
+
+    let shown = &ui.app.ui.present.as_ref().unwrap().doc.as_ref().unwrap();
+    assert_eq!((shown.node(frame).unwrap().width, shown.node(frame).unwrap().height), (402.0, 874.0));
+    assert_eq!(shown.world_bounds(right).unwrap().x0, 312.0, "right constraint follows the phone edge");
+    assert_eq!(ui.app.inspect()["presenter"]["viewport"], json!([402.0, 874.0]));
+    assert_eq!(ui.app.inspect()["presenter"]["scrollRange"], json!([0.0, 0.0]));
+    assert_eq!(ui.app.session.doc().unwrap().node(frame).unwrap().width, 894.0, "the saved design keeps its geometry");
+
+    let area = Rect::from_min_max(pos2(0.0, 40.0), pos2(1440.0, 900.0));
+    let screen_before = layout(ui.app.ui.present.as_mut().unwrap(), area, FULL).unwrap().screen;
+    ui.button(pos2(720.0, 440.0), true);
+    ui.frame(vec![egui::Event::PointerMoved(pos2(300.0, 300.0))]);
+    ui.button(pos2(300.0, 300.0), false);
+    assert_eq!(ui.app.inspect()["presenter"]["scroll"], json!([0.0, 0.0]), "fitted content does not move");
+    assert_eq!(layout(ui.app.ui.present.as_mut().unwrap(), area, FULL).unwrap().screen, screen_before);
+
+    let mut presenter = ui.app.ui.present.take().unwrap();
+    choose_device(&mut ui.app, &mut presenter, "None");
+    ui.app.ui.present = Some(presenter);
+    ui.frame(vec![]);
+    assert_eq!(ui.app.inspect()["presenter"]["frameSize"], json!([894.0, 844.0]));
+    assert_eq!(ui.app.inspect()["presenter"]["responsive"], Value::Null);
+}
+
+#[test]
+fn device_presets_show_their_screen_at_the_real_resolution_in_their_body() {
+    let mut session = figcraft_engine::Session::new();
+    let frame = id(&session.execute("node.create", &json!({"type": "frame", "width": 894, "height": 844})).unwrap());
+    let mut ui = Ui::new(session);
+    ui.run("proto.present", json!({"start": frame}));
+    let area = Rect::from_min_max(pos2(0.0, 40.0), pos2(1440.0, 860.0));
+
+    for (name, width, height) in
+        [("iPad mini", 744.0, 1133.0), ("MacBook Air", 1280.0, 832.0), ("Desktop", 1440.0, 1024.0), ("iPhone 17", 402.0, 874.0)]
+    {
+        let mut presenter = ui.app.ui.present.take().unwrap();
+        choose_device(&mut ui.app, &mut presenter, name);
+        ui.app.ui.present = Some(presenter);
+        ui.frame(vec![]);
+
+        let presenter = ui.app.ui.present.as_mut().unwrap();
+        let laid = layout(presenter, area, FULL).unwrap();
+        assert!(laid.color.is_some(), "{name}: drawn in its body");
+        assert!((f64::from(laid.screen.width()) / laid.scale - width).abs() < 0.1, "{name}: width");
+        assert!((f64::from(laid.screen.height()) / laid.scale - height).abs() < 0.1, "{name}: height");
+        assert_eq!(ui.app.session.doc().unwrap().node(frame).unwrap().width, 894.0);
+    }
+}
+
+/// A phone shows a frame's content past its screen only as far as the frame's overflow lets it
+/// scroll: with "No scrolling" it's clipped, like on every other device.
+#[test]
+fn a_phone_scrolls_only_what_the_frames_overflow_allows() {
+    let on_phone = |overflow: &str| {
+        let mut session = figcraft_engine::Session::new();
+        let frame = id(&session.execute("node.create", &json!({"type": "frame", "width": 894, "height": 844})).unwrap());
+        session.execute("node.create", &json!({"type": "rectangle", "parent": frame, "x": 650, "y": 1050, "width": 80, "height": 80})).unwrap();
+        session.execute("node.set", &json!({"id": frame, "props": {"overflow": overflow}})).unwrap();
+        let mut ui = Ui::new(session);
+        ui.run("proto.present", json!({"start": frame}));
+        let mut presenter = ui.app.ui.present.take().unwrap();
+        choose_device(&mut ui.app, &mut presenter, "iPhone 17");
+        ui.app.ui.present = Some(presenter);
+        ui.frame(vec![]);
+        (ui, frame)
+    };
+    let start = pos2(720.0, 440.0);
+    let drag = |ui: &mut Ui, to: Pos2| {
+        ui.button(start, true);
+        ui.frame(vec![egui::Event::PointerMoved(to)]);
+        ui.button(to, false);
+        ui.app.inspect()["presenter"].clone()
+    };
+
+    let (mut ui, frame) = on_phone("none");
+    assert_eq!(ui.app.inspect()["presenter"]["scrollRange"], json!([0.0, 0.0]));
+    assert_eq!(drag(&mut ui, start - vec2(100.0, 120.0))["scroll"], json!([0.0, 0.0]), "no scrolling stays clipped");
+    assert_eq!(ui.app.session.doc().unwrap().node(frame).unwrap().width, 894.0);
+
+    let (mut ui, frame) = on_phone("both");
+    let range = &ui.app.inspect()["presenter"]["scrollRange"];
+    assert!(range[0].as_f64().unwrap() > 0.0 && range[1].as_f64().unwrap() > 0.0, "{range}");
+    let scroll = drag(&mut ui, start - vec2(100.0, 120.0))["scroll"].clone();
+    assert!(scroll[0].as_f64().unwrap() > 0.0 && scroll[1].as_f64().unwrap() > 0.0, "{scroll}");
+    assert_eq!(ui.app.session.doc().unwrap().node(frame).unwrap().width, 894.0);
+
+    // The content keeps following a drag after the pointer leaves the screen, while the
+    // device itself stays fixed on the stage.
+    ui.frames(60, Vec::new);
+    let area = Rect::from_min_max(pos2(0.0, 40.0), pos2(1440.0, 900.0));
+    let screen_before = layout(ui.app.ui.present.as_mut().unwrap(), area, FULL).unwrap().screen;
+    ui.button(start, true);
+    ui.frame(vec![egui::Event::PointerMoved(pos2(300.0, 300.0))]);
+    let during = ui.app.inspect()["presenter"].clone();
+    assert!(during["scroll"][0].as_f64().unwrap() > 0.0, "{during}");
+    assert_eq!(layout(ui.app.ui.present.as_mut().unwrap(), area, FULL).unwrap().screen, screen_before);
+    ui.button(pos2(300.0, 300.0), false);
+}
+
+fn doc_with_two_frames() -> (Document, NodeId, NodeId) {
+    let mut d = Document::new("t");
+    let page = d.add_page("Page 1");
+    let a = d.create(page, NodeKind::Frame, "A", 0.0, 0.0, 200.0, 400.0).unwrap();
+    let b = d.create(page, NodeKind::Frame, "B", 300.0, 0.0, 200.0, 400.0).unwrap();
+    (d, a, b)
+}
+
+#[test]
+fn closed_overlays_animate_out_unless_instant() {
+    let (_, a, b) = doc_with_two_frames();
+    let mut p = Presenter::new(a);
+    let ov = |transition, opened| OverlayState {
+        id: b,
+        position: OverlayPosition::Center,
+        close_on_outside: true,
+        background: None,
+        anchor: None,
+        offset: None,
+        anchor_to: OverlayAnchor::Screen,
+        opened,
+        transition,
+        dur: 0.3,
+        easing: Easing::EaseOut,
+    };
+    p.overlays.push(ov(Transition::Dissolve, 0.0));
+    assert!(p.close_overlay(10.0));
+    assert!(p.overlays.is_empty());
+    assert_eq!(p.closing.len(), 1);
+    assert_eq!(p.closing[0].0, 10.0, "fully open: the reverse starts now");
+    // Closed half way through opening: it reverses from there.
+    p.overlays.push(ov(Transition::Dissolve, 20.0));
+    p.close_overlay(20.15);
+    assert!((p.closing[1].0 - 20.0).abs() < 1e-9);
+    // Instant overlays just go.
+    p.overlays.push(ov(Transition::Instant, 30.0));
+    p.close_overlay(31.0);
+    assert_eq!(p.closing.len(), 2);
+    assert!(!p.close_overlay(32.0), "nothing left to close");
+}
+
+#[test]
+fn matching_by_name_path() {
+    let (mut d, a, b) = doc_with_two_frames();
+    let ga = d.create(a, NodeKind::Group, "Card", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let ra = d.create(ga, NodeKind::Rectangle, "Box", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let ra2 = d.create(ga, NodeKind::Rectangle, "Box", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let only_a = d.create(a, NodeKind::Rectangle, "Gone", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let gb = d.create(b, NodeKind::Group, "Card", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let rb = d.create(gb, NodeKind::Rectangle, "Box", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let rb2 = d.create(gb, NodeKind::Rectangle, "Box", 0.0, 0.0, 10.0, 10.0).unwrap();
+    // Same name, different parent: no match.
+    let _other = d.create(b, NodeKind::Rectangle, "Box", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let m = match_layers(&d, a, &d, b);
+    assert_eq!(m, vec![(ga, gb), (ra, rb), (ra2, rb2)]);
+    assert!(!m.iter().any(|(f, _)| *f == only_a));
+    assert_eq!(name_path(&d, a, ra).as_deref(), Some("Card\u{1f}Box"));
+    assert_eq!(name_path(&d, b, ra), None);
+}
+
+#[test]
+fn smart_interpolate_tweens_matched_and_fades_the_rest() {
+    let (mut d, a, b) = doc_with_two_frames();
+    let ra = d.create(a, NodeKind::Rectangle, "Box", 0.0, 0.0, 20.0, 20.0).unwrap();
+    let rb = d.create(b, NodeKind::Rectangle, "Box", 100.0, 200.0, 60.0, 40.0).unwrap();
+    {
+        let n = d.get_mut(ra).unwrap();
+        n.fills = vec![Paint::solid(Color::new(1.0, 0.0, 0.0, 1.0))];
+        n.corners.radii = [0.0; 4];
+        n.opacity = 1.0;
+    }
+    {
+        let n = d.get_mut(rb).unwrap();
+        n.fills = vec![Paint::solid(Color::new(0.0, 0.0, 1.0, 1.0))];
+        n.corners.radii = [20.0; 4];
+        n.opacity = 0.5;
+        // Rotate 90° about its centre.
+        let c = (130.0, 220.0);
+        n.transform = Affine::translate(c) * Affine::rotate(std::f64::consts::FRAC_PI_2) * Affine::translate((-30.0, -20.0));
+    }
+    let only_b = d.create(b, NodeKind::Rectangle, "New", 0.0, 0.0, 5.0, 5.0);
+    let only_a = d.create(a, NodeKind::Rectangle, "Old", 0.0, 0.0, 5.0, 5.0).unwrap();
+    let mid = smart_interpolate(&d, a, &d, b, 0.5);
+    let n = mid.node(rb).unwrap();
+    assert!((n.width - 40.0).abs() < 1e-9 && (n.height - 30.0).abs() < 1e-9);
+    assert!((n.opacity - 0.75).abs() < 1e-6);
+    assert!((n.corners.radii[0] - 10.0).abs() < 1e-9);
+    let c = n.fills[0].solid_color().unwrap();
+    assert!((c.r - 0.5).abs() < 0.02 && (c.b - 0.5).abs() < 0.02, "{c:?}");
+    // Centre halfway between (10, 10) and (130, 220) in frame space; rotated 45°.
+    let ctr = mid.world_transform(b).inverse() * mid.world_transform(rb) * Point::new(n.width / 2.0, n.height / 2.0);
+    assert!((ctr.x - 70.0).abs() < 1e-6 && (ctr.y - 115.0).abs() < 1e-6, "{ctr:?}");
+    let [aa, bb, ..] = n.transform.as_coeffs();
+    assert!((bb.atan2(aa) - std::f64::consts::FRAC_PI_4).abs() < 1e-6);
+    if let Ok(ob) = only_b {
+        assert!((mid.node(ob).unwrap().opacity - 0.5).abs() < 1e-6);
+    }
+    // The source-only layer is copied into the destination frame, half faded.
+    let copies: Vec<_> = mid.node(b).unwrap().children.iter().filter_map(|c| mid.node(*c)).filter(|n| n.name == "Old").collect();
+    assert_eq!(copies.len(), 1);
+    assert!((copies[0].opacity - 0.5).abs() < 1e-6);
+    assert_ne!(copies[0].id, only_a);
+    // At the end it is exactly the destination.
+    let end = smart_interpolate(&d, a, &d, b, 1.0);
+    assert_eq!(end.node(rb), d.node(rb));
+    assert_eq!(end.node(b).unwrap().children, d.node(b).unwrap().children);
+    // At the start the matched layer sits where the source was.
+    let start = smart_interpolate(&d, a, &d, b, 0.0);
+    let s = start.world_bounds(rb).unwrap();
+    let f = start.world_bounds(b).unwrap();
+    assert!((s.x0 - f.x0).abs() < 1e-6 && (s.y0 - f.y0).abs() < 1e-6 && (s.width() - 20.0).abs() < 1e-6);
+}
+
+#[test]
+fn scroll_offsets_fixed_and_sticky() {
+    let (mut d, a, _) = doc_with_two_frames();
+    d.get_mut(a).unwrap().overflow = Overflow::Vertical;
+    let long = d.create(a, NodeKind::Rectangle, "Long", 0.0, 0.0, 200.0, 1000.0).unwrap();
+    let fixed = d.create(a, NodeKind::Rectangle, "Bar", 0.0, 350.0, 200.0, 50.0).unwrap();
+    let sticky = d.create(a, NodeKind::Rectangle, "Header", 0.0, 100.0, 200.0, 40.0).unwrap();
+    d.get_mut(fixed).unwrap().scroll_position = ScrollPosition::Fixed;
+    d.get_mut(sticky).unwrap().scroll_position = ScrollPosition::Sticky;
+    assert_eq!(scroll_range(&d, a), (0.0, 600.0));
+    d.get_mut(a).unwrap().overflow = Overflow::Horizontal;
+    assert_eq!(scroll_range(&d, a), (0.0, 0.0));
+    d.get_mut(a).unwrap().overflow = Overflow::Vertical;
+    let mut s = HashMap::new();
+    s.insert(a, (0.0, 50.0));
+    let out = apply_scroll(&d, &s);
+    let y = |doc: &Document, id| doc.world_bounds(id).unwrap().y0;
+    assert_eq!(y(&out, long), -50.0);
+    assert_eq!(y(&out, fixed), 350.0);
+    assert_eq!(y(&out, sticky), 50.0);
+    s.insert(a, (0.0, 300.0));
+    let out = apply_scroll(&d, &s);
+    assert_eq!(y(&out, long), -300.0);
+    assert_eq!(y(&out, sticky), 0.0);
+}
+
+/// A page presented on an iPhone 16 (393×852): a tall screen A that scrolls vertically, with a
+/// tab bar fixed to its bottom, a nested scrolling list and a layer at its end; screen B.
+fn device_doc() -> (Document, NodeId, NodeId, NodeId, NodeId, NodeId) {
+    let mut d = Document::new("t");
+    let page = d.add_page("Page 1");
+    if let NodeKind::Page { prototype, .. } = &mut d.get_mut(page).unwrap().kind {
+        prototype.device = "iPhone 16".into();
+    }
+    let a = d.create(page, NodeKind::Frame, "A", 0.0, 0.0, 393.0, 2000.0).unwrap();
+    let b = d.create(page, NodeKind::Frame, "B", 500.0, 0.0, 393.0, 1500.0).unwrap();
+    for f in [a, b] {
+        d.get_mut(f).unwrap().overflow = Overflow::Vertical;
+    }
+    let bar = d.create(a, NodeKind::Rectangle, "Tab bar", 0.0, 1940.0, 393.0, 60.0).unwrap();
+    let n = d.get_mut(bar).unwrap();
+    n.scroll_position = ScrollPosition::Fixed;
+    n.constraints.vertical = VConstraint::Bottom;
+    let list = d.create(a, NodeKind::Frame, "List", 0.0, 1200.0, 393.0, 300.0).unwrap();
+    d.get_mut(list).unwrap().overflow = Overflow::Vertical;
+    let item = d.create(list, NodeKind::Rectangle, "Item", 0.0, 700.0, 393.0, 100.0).unwrap();
+    (d, a, b, bar, list, item)
+}
+
+fn player_on(d: Document, start: NodeId) -> Presenter {
+    let mut p = Presenter::new(start);
+    p.sync(&Arc::new(d), 0.0);
+    p
+}
+
+#[test]
+fn device_screen_clips_the_frame_and_it_scrolls_through_its_height() {
+    let (mut d, a, _, bar, list, _) = device_doc();
+    assert_eq!(viewport(&d, a), Some((393.0, 852.0)));
+    // On the device the whole frame scrolls; at its own size nothing overflows it.
+    assert_eq!(scroll_range_in(&d, a, viewport(&d, a)), (0.0, 1148.0));
+    assert_eq!(scroll_range(&d, a), (0.0, 0.0));
+    // Nested frames scroll within themselves.
+    assert_eq!(scroll_range(&d, list), (0.0, 500.0));
+    // The display copy is sized to the screen; the fixed tab bar moves to the screen's bottom.
+    let mut p = player_on(d.clone(), a);
+    let disp = p.display().unwrap();
+    assert_eq!((disp.node(a).unwrap().width, disp.node(a).unwrap().height), (393.0, 852.0));
+    assert_eq!(disp.world_bounds(bar).unwrap().y0, 792.0);
+    // Scrolled, it stays there while the content moves.
+    p.scroll_to(0.0, 400.0);
+    let disp = p.display().unwrap();
+    assert_eq!(disp.world_bounds(bar).unwrap().y0, 792.0);
+    assert_eq!(disp.world_bounds(list).unwrap().y0, 800.0);
+    p.scroll_to(0.0, 99_999.0);
+    assert_eq!(p.scroll[&a], (0.0, 1148.0), "clamped to the range");
+    // A top-level frame taller than the screen scrolls without an overflow setting (its own
+    // range still clips nested content); without a device the frame shows whole.
+    d.get_mut(a).unwrap().overflow = Overflow::None;
+    assert_eq!(scroll_range_in(&d, a, viewport(&d, a)), (0.0, 1148.0));
+    assert_eq!(scroll_range(&d, a), (0.0, 0.0));
+    if let Some(pg) = d.page_of(a)
+        && let NodeKind::Page { prototype, .. } = &mut d.get_mut(pg).unwrap().kind
+    {
+        prototype.device = "None".into();
+    }
+    assert_eq!(viewport(&d, a), None);
+    // A frame wider than the screen scrolls sideways when it scrolls both ways.
+    let (mut d, a, ..) = device_doc();
+    let n = d.get_mut(a).unwrap();
+    n.width = 800.0;
+    n.overflow = Overflow::Both;
+    assert_eq!(scroll_range_in(&d, a, viewport(&d, a)), (407.0, 1148.0));
+}
+
+#[test]
+fn scroll_to_moves_every_scrolling_frame_around_the_layer() {
+    let (d, a, _, _, list, item) = device_doc();
+    let mut p = player_on(d.clone(), a);
+    assert!(p.perform(&Action::ScrollTo { dest: item, offset: [0.0, 0.0] }, item, Transition::Instant, 0.0, Easing::Linear, None, 1.0));
+    // The list brings the item to its top (as far as it scrolls), the screen brings the list.
+    assert_eq!(p.scroll[&list], (0.0, 500.0));
+    assert_eq!(p.scroll[&a], (0.0, 1148.0));
+    // Animated, it gets there over the duration.
+    let mut p = player_on(d, a);
+    assert!(p.perform(&Action::ScrollTo { dest: list, offset: [0.0, 0.0] }, list, Transition::Dissolve, 0.3, Easing::Linear, None, 1.0));
+    let anim = p.scroll_anim.as_ref().unwrap();
+    assert_eq!(anim.frames, vec![(a, (0.0, 0.0), (0.0, 1148.0))]);
+}
+
+#[test]
+fn navigating_resets_scroll_unless_it_preserves_it() {
+    let (d, a, b, ..) = device_doc();
+    let mut p = player_on(d, a);
+    p.scroll_to(0.0, 600.0);
+    assert!(p.perform(&Action::Navigate { dest: b, preserve_scroll: false }, a, Transition::Instant, 0.0, Easing::Linear, None, 1.0));
+    assert_eq!(p.scroll.get(&b), None, "starts at the top");
+    p.restart(a, 2.0);
+    p.scroll_to(0.0, 1000.0);
+    assert!(p.perform(&Action::Navigate { dest: b, preserve_scroll: true }, a, Transition::Instant, 0.0, Easing::Linear, None, 3.0));
+    assert_eq!(p.scroll[&b], (0.0, 648.0), "kept, as far as B scrolls");
+    // Back starts at the top again.
+    assert!(p.perform(&Action::Back, b, Transition::Instant, 0.0, Easing::Linear, None, 4.0));
+    assert_eq!((p.current, p.scroll.get(&a)), (a, None));
+}
+
+#[test]
+fn sync_follows_edits_and_keeps_the_screen() {
+    let (mut d, a, b, _, list, _) = device_doc();
+    let mut p = player_on(d.clone(), a);
+    p.go(b, Transition::Instant, 0.0, Easing::Linear, 1.0, true, false);
+    p.scroll_to(0.0, 600.0);
+    // The same document again changes nothing.
+    let same = Arc::new(d.clone());
+    p.sync(&same, 2.0);
+    let rev = p.rev;
+    p.sync(&same, 2.0);
+    assert_eq!(p.rev, rev);
+    // An edit is copied; the screen and its scroll stay (clamped to the new range).
+    d.get_mut(b).unwrap().height = 1000.0;
+    d.get_mut(b).unwrap().name = "B2".into();
+    p.sync(&Arc::new(d.clone()), 3.0);
+    assert_eq!(p.current, b);
+    assert_eq!(p.inspect()["name"], "B2");
+    assert_eq!(p.scroll[&b], (0.0, 148.0));
+    assert_eq!(p.history.len(), 1);
+    // The screen deleted: back to the start.
+    d.remove(b).unwrap();
+    p.sync(&Arc::new(d.clone()), 4.0);
+    assert_eq!(p.current, a);
+    assert!(p.history.is_empty() && p.scroll.is_empty());
+    // Junk scroll offsets never panic and stay in range.
+    p.scroll.insert(list, (f64::NAN, f64::INFINITY));
+    p.sync(&Arc::new(d), 5.0);
+    assert_eq!(p.scroll[&list], (0.0, 0.0));
+}
+
+#[test]
+fn transitions_move_the_right_way() {
+    let left = transition_frames(Transition::MoveIn { direction: Direction::Left }, 0.0);
+    assert_eq!(left.to_off, (1.0, 0.0));
+    assert_eq!(transition_frames(Transition::MoveIn { direction: Direction::Left }, 1.0).to_off, (0.0, 0.0));
+    let push = transition_frames(Transition::Push { direction: Direction::Top }, 0.5);
+    assert_eq!(push.from_off, (0.0, -0.5));
+    assert_eq!(push.to_off, (0.0, 0.5));
+    let out = transition_frames(Transition::MoveOut { direction: Direction::Right }, 0.25);
+    assert!(out.from_on_top);
+    assert_eq!(out.from_off, (0.25, 0.0));
+    assert_eq!(transition_frames(Transition::Dissolve, 0.3).to_alpha, 0.3);
+    assert_eq!(transition_frames(Transition::Instant, 0.0).from_alpha, 0.0);
+    let r = Transition::SlideIn { direction: Direction::Bottom }.reversed();
+    assert_eq!(r, Transition::SlideOut { direction: Direction::Top });
+}
+
+#[test]
+fn overlay_positions() {
+    let base = Rect::from_min_size(pos2(0.0, 0.0), vec2(400.0, 800.0));
+    let size = vec2(200.0, 100.0);
+    assert_eq!(overlay_rect(OverlayPosition::Center, base, size, None, None).min, pos2(100.0, 350.0));
+    assert_eq!(overlay_rect(OverlayPosition::BottomCenter, base, size, None, None).min, pos2(100.0, 700.0));
+    assert_eq!(overlay_rect(OverlayPosition::TopRight, base, size, None, None).min, pos2(200.0, 0.0));
+    let anchor = Rect::from_min_size(pos2(30.0, 40.0), vec2(50.0, 20.0));
+    assert_eq!(overlay_rect(OverlayPosition::Manual, base, size, Some(anchor), None).min, pos2(30.0, 60.0));
+}
+
+/// Smart animate renders a temporary document per animation frame; keep that cheap.
+#[test]
+fn smart_animate_frame_cost() {
+    let (mut d, a, b) = doc_with_two_frames();
+    for (f, dx) in [(a, 0.0), (b, 40.0)] {
+        for i in 0..40 {
+            let r = d.create(f, NodeKind::Rectangle, &format!("Row {i}"), dx + 10.0, 10.0 + f64::from(i) * 9.0, 120.0, 8.0).unwrap();
+            d.get_mut(r).unwrap().corners.radii = [4.0; 4];
+        }
+    }
+    let t0 = std::time::Instant::now();
+    let n = 10;
+    for k in 0..n {
+        let tmp = smart_interpolate(&d, a, &d, b, f64::from(k) / f64::from(n));
+        assert!(figcraft_render::render_node(&tmp, b, 2.0).is_some());
+    }
+    let per = t0.elapsed().as_secs_f64() * 1000.0 / f64::from(n);
+    eprintln!("smart animate: {per:.2} ms per frame (80 layers, 400x800 px)");
+}
diff --git a/crates/ui-egui/src/present/transition.rs b/crates/ui-egui/src/present/transition.rs
new file mode 100644
index 00000000..e31078d2
--- /dev/null
+++ b/crates/ui-egui/src/present/transition.rs
@@ -0,0 +1,251 @@
+use super::*;
+
+// ---------------------------------------------------------------------------------------------
+// Pure prototype logic (tested below).
+
+/// Layer names from below `root` down to `id`, joined (the smart-animate matching key).
+pub fn name_path(doc: &Document, root: NodeId, id: NodeId) -> Option<String> {
+    let mut parts: Vec<&str> = Vec::new();
+    let mut cur = id;
+    for _ in 0..1024 {
+        if cur == root {
+            parts.reverse();
+            return Some(parts.join("\u{1f}"));
+        }
+        let n = doc.node(cur)?;
+        parts.push(n.name.as_str());
+        cur = n.parent?;
+    }
+    None
+}
+
+/// Smart-animate pairs `(from layer, to layer)`: same name path below the two roots; repeated
+/// paths pair up in layer order.
+pub fn match_layers(from: &Document, from_root: NodeId, to: &Document, to_root: NodeId) -> Vec<(NodeId, NodeId)> {
+    let mut pool: HashMap<String, VecDeque<NodeId>> = HashMap::new();
+    for id in from.subtree(from_root).into_iter().skip(1) {
+        if let Some(p) = name_path(from, from_root, id) {
+            pool.entry(p).or_default().push_back(id);
+        }
+    }
+    let mut out = Vec::new();
+    for id in to.subtree(to_root).into_iter().skip(1) {
+        if let Some(p) = name_path(to, to_root, id)
+            && let Some(q) = pool.get_mut(&p)
+            && let Some(f) = q.pop_front()
+        {
+            out.push((f, id));
+        }
+    }
+    out
+}
+
+pub(super) fn lerp(a: f64, b: f64, t: f64) -> f64 {
+    a + (b - a) * t
+}
+
+/// Centre, rotation and scale of a node box `(w, h)` placed by `m`.
+fn decompose(m: Affine, (w, h): (f64, f64)) -> Option<[f64; 5]> {
+    let [a, b, c, d, _, _] = m.as_coeffs();
+    let sx = a.hypot(b);
+    if !sx.is_finite() || sx < 1e-9 {
+        return None;
+    }
+    let sy = (a * d - b * c) / sx;
+    let ctr = m * Point::new(w / 2.0, h / 2.0);
+    Some([ctr.x, ctr.y, b.atan2(a), sx, sy])
+}
+
+/// Interpolate two placements of a box: centre, rotation (shortest way round) and scale; the box
+/// size is `size` (already interpolated).
+pub fn lerp_transform(a: Affine, sa: (f64, f64), b: Affine, sb: (f64, f64), size: (f64, f64), t: f64) -> Affine {
+    match (decompose(a, sa), decompose(b, sb)) {
+        (Some(x), Some(y)) if (x[4] < 0.0) == (y[4] < 0.0) => {
+            let mut da = y[2] - x[2];
+            while da > std::f64::consts::PI {
+                da -= std::f64::consts::TAU;
+            }
+            while da < -std::f64::consts::PI {
+                da += std::f64::consts::TAU;
+            }
+            let (cx, cy) = (lerp(x[0], y[0], t), lerp(x[1], y[1], t));
+            let ang = x[2] + da * t;
+            let (sx, sy) = (lerp(x[3], y[3], t), lerp(x[4], y[4], t));
+            Affine::translate((cx, cy)) * Affine::rotate(ang) * Affine::scale_non_uniform(sx, sy) * Affine::translate((-size.0 / 2.0, -size.1 / 2.0))
+        }
+        _ => {
+            if t < 0.5 {
+                a
+            } else {
+                b
+            }
+        }
+    }
+}
+
+fn lerp_paints(from: &[Paint], to: &mut [Paint], t: f64) {
+    for (f, p) in from.iter().zip(to.iter_mut()) {
+        if let (PaintKind::Solid { color: fc }, PaintKind::Solid { color: tc }) = (&f.kind, &mut p.kind) {
+            *tc = fc.lerp(*tc, t.clamp(0.0, 1.0) as f32);
+            p.opacity = lerp(f64::from(f.opacity), f64::from(p.opacity), t.clamp(0.0, 1.0)) as f32;
+        }
+    }
+}
+
+/// The document as it looks at eased progress `t` of a smart-animate transition from
+/// `from_root` (in `from`) to `to_root` (in `to`): matched layers tween position, size, rotation,
+/// opacity, corner radius and solid fill colours; layers only in the destination fade in and
+/// layers only in the source are copied in and fade out. Render `to_root` of the result.
+pub fn smart_interpolate(from: &Document, from_root: NodeId, to: &Document, to_root: NodeId, t: f64) -> Document {
+    let mut out = to.clone();
+    // Springs and back easings go past 1 before they settle: matched layers overshoot too.
+    if !t.is_finite() || t == 1.0 {
+        return out;
+    }
+    let t = t.max(-1.0);
+    let fade = t.clamp(0.0, 1.0);
+    let pairs = match_layers(from, from_root, to, to_root);
+    let src_of: HashMap<NodeId, NodeId> = pairs.iter().map(|(f, d)| (*d, *f)).collect();
+    let dst_of: HashMap<NodeId, NodeId> = pairs.iter().copied().collect();
+    let fw_inv = from.world_transform(from_root).inverse();
+    let tw_inv = to.world_transform(to_root).inverse();
+    if let (Some(fr), Some(m)) = (from.node(from_root), out.node_mut(to_root)) {
+        lerp_paints(&fr.fills, &mut m.fills, t);
+    }
+    let mut interp: HashMap<NodeId, Affine> = HashMap::new();
+    interp.insert(to_root, Affine::IDENTITY);
+    let mut faded: HashSet<NodeId> = HashSet::new();
+    for id in to.subtree(to_root).into_iter().skip(1) {
+        let Some(n) = to.node(id) else { continue };
+        let parent = n.parent.unwrap_or(to_root);
+        let p_interp = interp.get(&parent).copied().unwrap_or(Affine::IDENTITY);
+        match src_of.get(&id).and_then(|s| from.node(*s).map(|sn| (*s, sn))) {
+            Some((s, sn)) => {
+                let rel_s = fw_inv * from.world_transform(s);
+                let rel_d = tw_inv * to.world_transform(id);
+                let (w, h) = (lerp(sn.width, n.width, t).max(0.0), lerp(sn.height, n.height, t).max(0.0));
+                let xf = lerp_transform(rel_s, (sn.width, sn.height), rel_d, (n.width, n.height), (w, h), t);
+                interp.insert(id, xf);
+                if let Some(m) = out.node_mut(id) {
+                    m.width = w;
+                    m.height = h;
+                    m.transform = p_interp.inverse() * xf;
+                    m.opacity = lerp(f64::from(sn.opacity), f64::from(n.opacity), fade) as f32;
+                    for (r, (a, b)) in m.corners.radii.iter_mut().zip(sn.corners.radii.iter().zip(n.corners.radii.iter())) {
+                        *r = lerp(*a, *b, t).max(0.0);
+                    }
+                    lerp_paints(&sn.fills, &mut m.fills, t);
+                    lerp_paints(&sn.strokes, &mut m.strokes, t);
+                }
+            }
+            None => {
+                interp.insert(id, p_interp * n.transform);
+                if !faded.contains(&parent)
+                    && let Some(m) = out.node_mut(id)
+                {
+                    m.opacity *= fade as f32;
+                }
+                faded.insert(id);
+            }
+        }
+    }
+    // Layers only in the source: copy the top-most ones in, fading out.
+    let tops: Vec<NodeId> = from
+        .subtree(from_root)
+        .into_iter()
+        .skip(1)
+        .filter(|id| !dst_of.contains_key(id))
+        .filter(|id| from.node(*id).and_then(|n| n.parent).is_some_and(|p| p == from_root || dst_of.contains_key(&p)))
+        .collect();
+    for id in tops {
+        let Some(n) = from.node(id) else { continue };
+        let pf = n.parent.unwrap_or(from_root);
+        let matched_parent = dst_of.get(&pf).copied().filter(|p| out.node(*p).is_some_and(|pn| pn.kind.is_container()));
+        let (parent, local) = match matched_parent {
+            Some(p) if pf != from_root => (p, n.transform),
+            _ => (to_root, fw_inv * from.world_transform(id)),
+        };
+        let nodes: Vec<Node> = from.subtree(id).into_iter().filter_map(|i| from.node(i).cloned()).collect();
+        let mut map = BTreeMap::new();
+        for nn in &nodes {
+            map.insert(nn.id, out.alloc_id());
+        }
+        let index = from.index_in_parent(id);
+        if let Ok(new) = out.paste_nodes(&nodes, &map, id, parent, index)
+            && let Some(m) = out.node_mut(new)
+        {
+            m.transform = local;
+            m.opacity *= (1.0 - fade) as f32;
+        }
+    }
+    out
+}
+
+/// Where the outgoing and incoming frames are drawn at eased progress `t`.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct FramePlacement {
+    /// Offsets as fractions of each frame's size.
+    pub from_off: (f32, f32),
+    pub from_alpha: f32,
+    pub to_off: (f32, f32),
+    pub to_alpha: f32,
+    pub from_on_top: bool,
+}
+
+/// The unit vector a direction moves along (screen space, y down).
+pub fn direction_vec(d: Direction) -> (f32, f32) {
+    match d {
+        Direction::Left => (-1.0, 0.0),
+        Direction::Right => (1.0, 0.0),
+        Direction::Top => (0.0, -1.0),
+        Direction::Bottom => (0.0, 1.0),
+    }
+}
+
+/// Frame offsets/opacities for a transition. Directions name where things move: "Move in, left"
+/// brings the new frame in from the right edge moving left.
+pub fn transition_frames(tr: Transition, t: f32) -> FramePlacement {
+    let mul = |(x, y): (f32, f32), k: f32| (x * k, y * k);
+    let base = FramePlacement { from_off: (0.0, 0.0), from_alpha: 1.0, to_off: (0.0, 0.0), to_alpha: 1.0, from_on_top: false };
+    match tr {
+        Transition::Instant => FramePlacement { from_alpha: 0.0, ..base },
+        Transition::Dissolve | Transition::SmartAnimate => FramePlacement { to_alpha: t.clamp(0.0, 1.0), ..base },
+        Transition::MoveIn { direction } => FramePlacement { to_off: mul(direction_vec(direction), -(1.0 - t)), ..base },
+        Transition::MoveOut { direction } => FramePlacement { from_off: mul(direction_vec(direction), t), from_on_top: true, ..base },
+        Transition::Push { direction } => {
+            let d = direction_vec(direction);
+            FramePlacement { from_off: mul(d, t), to_off: mul(d, -(1.0 - t)), ..base }
+        }
+        Transition::SlideIn { direction } => {
+            let d = direction_vec(direction);
+            FramePlacement { from_off: mul(d, 0.3 * t), to_off: mul(d, -(1.0 - t)), ..base }
+        }
+        Transition::SlideOut { direction } => {
+            let d = direction_vec(direction);
+            FramePlacement { from_off: mul(d, t), to_off: mul(d, -0.3 * (1.0 - t)), from_on_top: true, ..base }
+        }
+    }
+}
+
+/// Screen rect of an overlay of `size` over the frame drawn at `base`. A manual one sits `offset`
+/// (screen points) from the top-left of `anchor`, the layer that opened it; without an offset,
+/// right below it.
+pub fn overlay_rect(pos: OverlayPosition, base: Rect, size: Vec2, anchor: Option<Rect>, offset: Option<Vec2>) -> Rect {
+    let cx = base.center().x - size.x / 2.0;
+    let cy = base.center().y - size.y / 2.0;
+    let (x, y) = match pos {
+        OverlayPosition::Center => (cx, cy),
+        OverlayPosition::TopLeft => (base.min.x, base.min.y),
+        OverlayPosition::TopCenter => (cx, base.min.y),
+        OverlayPosition::TopRight => (base.max.x - size.x, base.min.y),
+        OverlayPosition::BottomLeft => (base.min.x, base.max.y - size.y),
+        OverlayPosition::BottomCenter => (cx, base.max.y - size.y),
+        OverlayPosition::BottomRight => (base.max.x - size.x, base.max.y - size.y),
+        OverlayPosition::Manual => match (anchor, offset) {
+            (Some(a), Some(o)) => (a.min.x + o.x, a.min.y + o.y),
+            (Some(a), None) => (a.min.x, a.max.y),
+            (None, _) => (cx, cy),
+        },
+    };
+    Rect::from_min_size(pos2(x, y), size)
+}
diff --git a/crates/ui-egui/src/present_variables_tests.rs b/crates/ui-egui/src/present/variables_tests.rs
similarity index 100%
rename from crates/ui-egui/src/present_variables_tests.rs
rename to crates/ui-egui/src/present/variables_tests.rs
diff --git a/crates/ui-egui/src/present_links_tests.rs b/crates/ui-egui/src/present_links_tests.rs
new file mode 100644
index 00000000..a2b571af
--- /dev/null
+++ b/crates/ui-egui/src/present_links_tests.rs
@@ -0,0 +1,253 @@
+//! A prototype's Open link action carries a URL from the document and fires from whatever trigger
+//! the prototype sets, including a delay, so the player hands the opener only a web link
+//! ([`figcraft_engine::doc_urls`]). Without that, a saved document opens `javascript:` in the web
+//! build's own origin (stored XSS) and `smb:`/`ms-…:` through the desktop's handlers. A link to a
+//! website then waits behind a notice that it leaves the prototype, unless the viewer chose to skip
+//! the notice.
+
+use std::sync::{Arc, Mutex};
+
+use figcraft_engine::Session;
+use serde_json::{Value, json};
+
+use crate::Services;
+use crate::present_tests::{Ui as Harness, id};
+
+/// Records every URL the player asks the platform to open, and every save of the preferences.
+#[derive(Default)]
+struct Opened(Arc<Mutex<Vec<String>>>, Arc<Mutex<Vec<figcraft_engine::Prefs>>>);
+
+impl Services for Opened {
+    fn open_url(&mut self, url: &str) {
+        if let Ok(mut v) = self.0.lock() {
+            v.push(url.to_string());
+        }
+    }
+
+    fn save_prefs(&mut self, prefs: &figcraft_engine::Prefs) {
+        if let Ok(mut v) = self.1.lock() {
+            v.push(prefs.clone());
+        }
+    }
+}
+
+fn ex(s: &mut Session, cmd: &str, p: Value) -> Value {
+    s.execute(cmd, &p).unwrap_or_else(|e| panic!("{cmd} {p}: {e}"))
+}
+
+/// A presented frame whose layer opens `url` 100ms after the screen appears, with no click
+/// anywhere, and with the notice skipped or not. Returns the harness and what the player opened.
+fn presented(url: &str, skip_notice: bool) -> (Harness, Opened) {
+    played("proto.present", url, skip_notice)
+}
+
+/// [`presented`], played by `cmd` (`proto.present` or `proto.preview`).
+fn played(cmd: &str, url: &str, skip_notice: bool) -> (Harness, Opened) {
+    let mut s = Session::new();
+    s.prefs.link_notice_skipped = skip_notice;
+    let f = id(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 400, "name": "A"})));
+    let layer = id(&ex(&mut s, "shape.rectangle", json!({"x": 10, "y": 10, "width": 30, "height": 30, "parent": f})));
+    ex(
+        &mut s,
+        "proto.interaction.add",
+        json!({"id": layer, "trigger": {"type": "afterDelay", "ms": 100}, "action": {"type": "openUrl", "url": url}, "transition": {"type": "instant"}}),
+    );
+    let seen = Opened::default();
+    let mut u = Harness::new(s);
+    u.app.services = Box::new(Opened(seen.0.clone(), seen.1.clone()));
+    u.ctx.enable_accesskit();
+    u.run(cmd, json!({"start": f}));
+    // Well past the delay.
+    u.frames(40, Vec::new);
+    (u, seen)
+}
+
+fn opened(seen: &Opened) -> Vec<String> {
+    seen.0.lock().map(|v| v.clone()).unwrap_or_default()
+}
+
+fn opens_after_a_delay(url: &str) -> Vec<String> {
+    opened(&presented(url, true).1)
+}
+
+/// The URL the presenter's notice waits to open.
+fn notice(u: &Harness) -> Value {
+    u.app.inspect()["presenter"]["linkNotice"].clone()
+}
+
+/// Clicks the control labeled `label`.
+fn click(u: &mut Harness, label: &str) {
+    let tree = u.frame_output(vec![]).platform_output.accesskit_update.unwrap().nodes;
+    let n = tree.into_iter().map(|(_, n)| n).find(|n| n.label() == Some(label)).unwrap_or_else(|| panic!("no {label:?}"));
+    let b = n.bounds().unwrap();
+    let at = egui::pos2(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32);
+    u.button(at, true);
+    u.button(at, false);
+}
+
+#[test]
+fn a_prototype_opens_web_links() {
+    assert_eq!(opens_after_a_delay("https://example.com/a"), ["https://example.com/a"]);
+    assert_eq!(opens_after_a_delay("mailto:a@b.c"), ["mailto:a@b.c"]);
+    // A mail link opens the mail app without the notice.
+    assert_eq!(opened(&presented("mailto:a@b.c", false).1), ["mailto:a@b.c"]);
+}
+
+#[test]
+fn a_link_to_a_website_waits_for_the_notice() {
+    let (mut u, seen) = presented("https://example.com/a", false);
+    assert!(opened(&seen).is_empty(), "the link waits for the viewer");
+    assert_eq!(notice(&u), "https://example.com/a");
+    click(&mut u, "Open link");
+    assert_eq!(opened(&seen), ["https://example.com/a"]);
+    assert!(notice(&u).is_null());
+    assert!(!u.app.session.prefs.link_notice_skipped && seen.1.lock().unwrap().is_empty(), "the notice shows next time");
+}
+
+#[test]
+fn the_preview_pane_shows_the_notice_too() {
+    let (mut u, seen) = played("proto.preview", "https://example.com/a", false);
+    assert!(opened(&seen).is_empty());
+    assert_eq!(u.app.inspect()["preview"]["linkNotice"], "https://example.com/a");
+    click(&mut u, "Open link");
+    assert_eq!(opened(&seen), ["https://example.com/a"]);
+}
+
+#[test]
+fn cancel_or_escape_drops_the_link() {
+    let (mut u, seen) = presented("https://example.com/a", false);
+    click(&mut u, "Cancel");
+    assert!(notice(&u).is_null() && opened(&seen).is_empty());
+    let (mut u, seen) = presented("https://example.com/a", false);
+    u.key(egui::pos2(700.0, 450.0), egui::Key::Escape);
+    assert!(notice(&u).is_null() && opened(&seen).is_empty());
+    assert!(u.app.ui.present.is_some(), "Escape closes the notice, not the presentation");
+}
+
+#[test]
+fn the_prototype_takes_no_keys_while_the_notice_shows() {
+    let mut s = Session::new();
+    let a = id(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 400, "name": "A"})));
+    let b = id(&ex(&mut s, "frame.create", json!({"x": 400, "y": 0, "width": 300, "height": 400, "name": "B"})));
+    let layer = id(&ex(&mut s, "shape.rectangle", json!({"x": 10, "y": 10, "width": 30, "height": 30, "parent": a})));
+    let link = json!({"type": "openUrl", "url": "https://example.com/a"});
+    ex(&mut s, "proto.interaction.add", json!({"id": layer, "trigger": {"type": "afterDelay", "ms": 100}, "action": link}));
+    let to_b = json!({"type": "navigate", "dest": b});
+    ex(&mut s, "proto.interaction.add", json!({"id": a, "trigger": {"type": "keyPress", "key": "Escape"}, "action": to_b}));
+    let mut u = Harness::new(s);
+    u.app.services = Box::new(Opened::default());
+    u.run("proto.present", json!({"start": a}));
+    u.frames(40, Vec::new);
+    assert_eq!(notice(&u), "https://example.com/a");
+    u.key(egui::pos2(700.0, 450.0), egui::Key::Escape);
+    assert!(notice(&u).is_null(), "Escape cancels the notice");
+    assert_eq!(u.app.inspect()["presenter"]["current"], json!(a), "the prototype's Escape trigger did not run");
+}
+
+#[test]
+fn the_presenter_keys_wait_while_the_notice_shows() {
+    let (mut u, _) = presented("https://example.com/a", false);
+    assert_eq!(notice(&u), "https://example.com/a");
+    let press = |key, modifiers| {
+        let k = |pressed| egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers };
+        vec![k(true), k(false)]
+    };
+    let out = u.frame_output(press(egui::Key::F, egui::Modifiers::NONE));
+    let cmds = out.viewport_output.get(&egui::ViewportId::ROOT).map(|v| v.commands.clone()).unwrap_or_default();
+    assert!(!cmds.iter().any(|c| matches!(c, egui::ViewportCommand::Fullscreen(_))), "F: {cmds:?}");
+    u.frame(press(egui::Key::C, egui::Modifiers::NONE));
+    assert_eq!(u.app.inspect()["presenter"]["comments"], false, "C");
+    u.frame(press(egui::Key::C, egui::Modifiers::SHIFT));
+    assert_eq!(u.app.inspect()["presenter"]["comments"], false, "Shift+C");
+    assert_eq!(notice(&u), "https://example.com/a");
+}
+
+#[test]
+fn the_prototype_takes_no_controller_buttons_while_the_notice_shows() {
+    let mut s = Session::new();
+    let a = id(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 400, "name": "A"})));
+    let b = id(&ex(&mut s, "frame.create", json!({"x": 400, "y": 0, "width": 300, "height": 400, "name": "B"})));
+    let layer = id(&ex(&mut s, "shape.rectangle", json!({"x": 10, "y": 10, "width": 30, "height": 30, "parent": a})));
+    let link = json!({"type": "openUrl", "url": "https://example.com/a"});
+    ex(&mut s, "proto.interaction.add", json!({"id": layer, "trigger": {"type": "afterDelay", "ms": 100}, "action": link}));
+    let to_b = json!({"type": "navigate", "dest": b});
+    ex(&mut s, "proto.interaction.add", json!({"id": a, "trigger": {"type": "keyPress", "key": "Gamepad A"}, "action": to_b}));
+    let mut u = Harness::new(s);
+    u.app.services = Box::new(Opened::default());
+    u.ctx.enable_accesskit();
+    u.run("proto.present", json!({"start": a}));
+    u.frames(40, Vec::new);
+    assert_eq!(notice(&u), "https://example.com/a");
+    let ctx = u.ctx.clone();
+    crate::control::handle(&mut u.app, &ctx, "ui.input", &json!({"events": [{"gamepad": "A"}]})).unwrap();
+    u.frames(2, Vec::new);
+    assert_eq!(u.app.inspect()["presenter"]["current"], json!(a), "the Gamepad A trigger did not run");
+    assert_eq!(notice(&u), "https://example.com/a");
+    click(&mut u, "Cancel");
+    assert!(notice(&u).is_null());
+    crate::control::handle(&mut u.app, &ctx, "ui.input", &json!({"events": [{"gamepad": "A"}]})).unwrap();
+    u.frames(2, Vec::new);
+    assert_eq!(u.app.inspect()["presenter"]["current"], json!(b), "the button plays once the notice closes");
+}
+
+#[test]
+fn dont_show_this_again_is_saved_with_the_preferences() {
+    let (mut u, seen) = presented("https://example.com/a", false);
+    click(&mut u, "Don't show this again");
+    click(&mut u, "Open link");
+    assert_eq!(opened(&seen), ["https://example.com/a"]);
+    assert!(u.app.session.prefs.link_notice_skipped);
+    assert!(seen.1.lock().unwrap().last().is_some_and(|p| p.link_notice_skipped), "the choice is saved");
+    assert_eq!(u.run("proto.linkNotice", json!({})), json!({"shown": true}));
+    assert!(!u.app.session.prefs.link_notice_skipped);
+}
+
+#[test]
+fn a_prototype_cannot_open_a_script_or_handler_url() {
+    for url in [
+        // In the web build the opener is `window.open`, which runs this in the app's own origin.
+        "javascript:alert(document.cookie)",
+        "JavaScript:alert(1)",
+        "data:text/html,<script>alert(1)</script>",
+        // Reaches the file system; a UNC host also sends Windows credentials.
+        "file:///etc/passwd",
+        "smb://attacker.example/share/x",
+        // Handed to an application handler by the desktop.
+        "ms-msdt:/id PCWDiagnostic",
+        "figcraft://join?host=127.0.0.1:47900&file=f&token=t",
+    ] {
+        assert!(opens_after_a_delay(url).is_empty(), "{url:?} must never reach the opener");
+    }
+}
+
+#[test]
+fn the_prototype_takes_no_clicks_while_the_notice_shows() {
+    let mut s = Session::new();
+    let a = id(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 300, "height": 400, "name": "A"})));
+    let b = id(&ex(&mut s, "frame.create", json!({"x": 400, "y": 0, "width": 300, "height": 400, "name": "B"})));
+    let layer = id(&ex(&mut s, "shape.rectangle", json!({"x": 10, "y": 10, "width": 30, "height": 30, "parent": a})));
+    let link = json!({"type": "openUrl", "url": "https://example.com/a"});
+    ex(&mut s, "proto.interaction.add", json!({"id": layer, "trigger": {"type": "afterDelay", "ms": 100}, "action": link}));
+    let to_b = json!({"type": "navigate", "dest": b});
+    ex(&mut s, "proto.interaction.add", json!({"id": a, "trigger": {"type": "onClick"}, "action": to_b, "transition": {"type": "instant"}}));
+    let mut u = Harness::new(s);
+    u.app.services = Box::new(Opened::default());
+    u.run("proto.present", json!({"start": a}));
+    u.frames(40, Vec::new);
+    assert_eq!(notice(&u), "https://example.com/a");
+    // On the frame, above the notice.
+    let at = egui::pos2(700.0, 290.0);
+    u.button(at, true);
+    u.button(at, false);
+    u.frames(5, Vec::new);
+    assert_eq!(u.app.inspect()["presenter"]["current"], json!(a), "the click behind the notice did not navigate");
+    assert_eq!(notice(&u), "https://example.com/a", "the notice still waits");
+    let shapes = crate::live_tests::flat(&u.frame_output(vec![]).shapes);
+    crate::live_tests::text_center(&shapes, "Open link");
+    u.key(egui::pos2(700.0, 450.0), egui::Key::Escape);
+    assert!(notice(&u).is_null());
+    u.button(at, true);
+    u.button(at, false);
+    u.frames(5, Vec::new);
+    assert_eq!(u.app.inspect()["presenter"]["current"], json!(b), "with the notice gone the same click navigates");
+}
diff --git a/crates/ui-egui/src/present_tab_tests.rs b/crates/ui-egui/src/present_tab_tests.rs
new file mode 100644
index 00000000..1868babb
--- /dev/null
+++ b/crates/ui-egui/src/present_tab_tests.rs
@@ -0,0 +1,193 @@
+use egui::accesskit::{Node, Role};
+use egui::{Key, Pos2, pos2};
+use figcraft_doc::proto::PrototypeSettings;
+use serde_json::{Value, json};
+
+use crate::present_tests::{Ui, id, setup};
+
+const FILE_TAB: Pos2 = pos2(100.0, 20.0);
+
+fn click(u: &mut Ui, at: Pos2) {
+    u.button(at, true);
+    u.button(at, false);
+    u.frame(vec![]);
+}
+
+fn tabs(u: &Ui) -> Value {
+    u.app.inspect()["presentTabs"].clone()
+}
+
+fn presenting(u: &Ui) -> bool {
+    u.app.inspect()["presenting"] == json!(true)
+}
+
+fn nodes(u: &mut Ui) -> Vec<Node> {
+    u.ctx.enable_accesskit();
+    u.frame(vec![]);
+    u.frame_output(vec![]).platform_output.accesskit_update.expect("an AccessKit update").nodes.into_iter().map(|(_, n)| n).collect()
+}
+
+fn centre(n: &Node) -> Pos2 {
+    let b = n.bounds().unwrap();
+    pos2(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32)
+}
+
+fn click_label(u: &mut Ui, label: &str) {
+    let all = nodes(u);
+    let n = all.iter().find(|n| n.label().is_some_and(|l| l.trim() == label)).unwrap_or_else(|| panic!("no {label:?} on screen"));
+    click(u, centre(n));
+}
+
+/// The presenter bar's Options button: it has no label, and sits right of Show comments.
+fn open_options(u: &mut Ui) {
+    let all = nodes(u);
+    let comments = all.iter().find(|n| n.label() == Some("Show comments (Shift+C)")).unwrap().bounds().unwrap();
+    let options = all
+        .iter()
+        .filter(|n| n.role() == Role::Unknown && n.label().is_none())
+        .filter(|n| n.bounds().is_some_and(|b| b.y0 == comments.y0 && b.x0 > comments.x1))
+        .min_by(|a, b| a.bounds().unwrap().x0.total_cmp(&b.bounds().unwrap().x0))
+        .expect("the Options button");
+    click(u, centre(options));
+}
+
+fn front_settings(u: &Ui) -> PrototypeSettings {
+    let page = u.app.session.page().unwrap();
+    crate::present::page_settings(u.app.session.doc().unwrap(), page)
+}
+
+/// The middle of presentation tab `k` and of its close button, after `files` file tabs named
+/// "Untitled".
+fn present_tab(u: &Ui, files: usize, k: usize) -> (Pos2, Pos2) {
+    let width = |chars: usize, lo: f32, hi: f32| (12.0 * 0.6 * chars as f32 + 64.0).clamp(lo, hi);
+    let mut x = 52.0 + files as f32 * width("Untitled".len(), 120.0, 220.0);
+    let names: Vec<String> = tabs(u).as_array().unwrap().iter().map(|t| t["name"].as_str().unwrap().to_string()).collect();
+    for n in names.iter().take(k) {
+        x += width(n.chars().count(), 140.0, 260.0);
+    }
+    let w = width(names[k].chars().count(), 140.0, 260.0);
+    (pos2(x + w / 2.0, 20.0), pos2(x + w - 16.0, 20.0))
+}
+
+#[test]
+fn the_tab_is_named_after_the_file_and_page_and_its_x_closes_it() {
+    let (mut u, a, ..) = setup();
+    u.run("proto.present", json!({"start": a}));
+    assert!(presenting(&u));
+    assert_eq!(tabs(&u), json!([{"name": "Untitled - Page 1", "active": true}]));
+    click(&mut u, FILE_TAB);
+    assert!(!presenting(&u));
+    assert_eq!(tabs(&u)[0]["active"], false);
+    let (tab, close) = present_tab(&u, 1, 0);
+    click(&mut u, tab);
+    assert!(presenting(&u));
+    click(&mut u, close);
+    assert_eq!((presenting(&u), tabs(&u)), (false, json!([])));
+    assert!(!u.app.ui.home, "back to its file");
+}
+
+#[test]
+fn play_again_shows_the_tab_as_it_was_and_another_page_opens_a_new_one() {
+    let (mut u, a, b, _) = setup();
+    u.run("proto.present", json!({"start": a}));
+    u.key(pos2(720.0, 470.0), Key::ArrowRight);
+    click(&mut u, FILE_TAB);
+    u.run("proto.present", json!({"start": a}));
+    assert_eq!(tabs(&u).as_array().unwrap().len(), 1, "same page: the same tab");
+    assert_eq!(u.app.inspect()["presenter"]["current"], json!(b), "it shows the prototype as it was");
+    u.run("proto.present", json!({"start": b}));
+    assert_eq!(tabs(&u).as_array().unwrap().len(), 1);
+    assert_eq!(u.app.inspect()["presenter"]["history"], json!([]), "another start frame starts again");
+
+    click(&mut u, FILE_TAB);
+    let page = id(&u.run("page.add", json!({"name": "Second"})));
+    u.run("page.select", json!({"id": page}));
+    let c = id(&u.run("node.create", json!({"type": "frame", "name": "C", "x": 0, "y": 0, "width": 200, "height": 200})));
+    u.run("proto.present", json!({"start": c}));
+    assert_eq!(tabs(&u), json!([{"name": "Untitled - Page 1", "active": false}, {"name": "Untitled - Second", "active": true}]));
+    let (first, _) = present_tab(&u, 1, 0);
+    click(&mut u, first);
+    assert_eq!(tabs(&u), json!([{"name": "Untitled - Page 1", "active": true}, {"name": "Untitled - Second", "active": false}]));
+    assert_eq!(u.app.inspect()["presenter"]["current"], json!(b));
+}
+
+#[test]
+fn the_presentation_plays_on_when_its_file_closes() {
+    let (mut u, a, b, _) = setup();
+    let hot = id(&u.run("node.create", json!({"type": "rectangle", "parent": a, "x": 0, "y": 0, "width": 393, "height": 80})));
+    u.run("proto.interaction.add", json!({"id": hot, "dest": b}));
+    u.run("proto.present", json!({"start": a}));
+    click(&mut u, FILE_TAB);
+    u.run("file.close", json!({"index": 0, "force": true}));
+    assert_eq!(tabs(&u), json!([{"name": "Untitled - Page 1", "active": false}]));
+    let (tab, _) = present_tab(&u, 0, 0);
+    click(&mut u, tab);
+    assert!(presenting(&u));
+    let spot = u.app.inspect()["presenter"]["hotspots"][0]["rect"].clone();
+    let r: Vec<f32> = spot.as_array().unwrap().iter().map(|v| v.as_f64().unwrap() as f32).collect();
+    click(&mut u, pos2((r[0] + r[2]) / 2.0, (r[1] + r[3]) / 2.0));
+    u.frames(60, Vec::new);
+    assert_eq!(u.app.inspect()["presenter"]["current"], json!(b), "the prototype still plays");
+    u.key(pos2(700.0, 500.0), Key::Escape);
+    assert_eq!(tabs(&u), json!([]));
+    assert!(u.app.ui.home, "no file to go back to: Home");
+}
+
+#[test]
+fn a_tab_whose_file_closed_leaves_the_file_in_front_alone() {
+    let (mut u, a, ..) = setup();
+    u.run("proto.present", json!({"start": a}));
+    click(&mut u, FILE_TAB);
+    u.run("file.new", json!({}));
+    u.run("file.close", json!({"index": 0, "force": true}));
+    let (tab, _) = present_tab(&u, 1, 0);
+    click(&mut u, tab);
+    u.frames(5, Vec::new);
+    assert!(presenting(&u));
+    assert!(!crate::tabs::present_owner_active(&u.app));
+    assert_eq!(u.app.inspect()["presenter"]["current"], json!(a), "it keeps playing its own copy");
+    let before = front_settings(&u);
+    click_label(&mut u, "iPhone 16");
+    click_label(&mut u, "iPhone 17  402×874");
+    assert!(presenting(&u));
+    for size in ["Fixed size", "Responsive"] {
+        open_options(&mut u);
+        click_label(&mut u, size);
+    }
+    assert_eq!(front_settings(&u), before, "picking a device or Responsive leaves the file in front alone");
+    assert!(!u.app.session.ds().unwrap().is_dirty());
+}
+
+#[test]
+fn a_saved_file_opened_again_gets_its_tab_back() {
+    let (mut u, a, ..) = setup();
+    let dir = std::env::temp_dir().join(format!("figcraft-present-tab-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("Proto.figcraft").to_string_lossy().to_string();
+    u.run("file.saveAs", json!({"path": path}));
+    u.run("proto.present", json!({"start": a}));
+    click(&mut u, FILE_TAB);
+    u.run("file.close", json!({"index": 0}));
+    u.run("file.open", json!({"path": path}));
+    u.run("proto.present", json!({"start": a}));
+    // Saved as Proto.figcraft: the file's title follows its name.
+    assert_eq!(tabs(&u), json!([{"name": "Proto - Page 1", "active": true}]));
+    u.key(pos2(700.0, 500.0), Key::Escape);
+    assert!(!u.app.ui.home, "back to its file");
+    assert_eq!(tabs(&u), json!([]));
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn renaming_the_file_or_the_page_renames_the_tab() {
+    let (mut u, a, ..) = setup();
+    u.run("proto.present", json!({"start": a}));
+    click(&mut u, FILE_TAB);
+    u.run("file.rename", json!({"name": "Playground"}));
+    u.run("page.rename", json!({"name": "Calendar"}));
+    u.frame(vec![]);
+    assert_eq!(tabs(&u), json!([{"name": "Playground - Calendar", "active": false}]));
+    u.run("file.close", json!({"index": 0, "force": true}));
+    u.frame(vec![]);
+    assert_eq!(tabs(&u)[0]["name"], "Playground - Calendar", "the names stay when the file closes");
+}
diff --git a/crates/ui-egui/src/present_tests.rs b/crates/ui-egui/src/present_tests.rs
index a1e4ebe2..4a3819c0 100644
--- a/crates/ui-egui/src/present_tests.rs
+++ b/crates/ui-egui/src/present_tests.rs
@@ -23,11 +23,18 @@ impl Ui {
     }
 
     pub(crate) fn frame(&mut self, events: Vec<Event>) {
+        self.frame_output(events);
+    }
+
+    /// [`Self::frame`], returning what egui output (the AccessKit tree when it's enabled).
+    pub(crate) fn frame_output(&mut self, events: Vec<Event>) -> egui::FullOutput {
         self.time += 1.0 / 60.0;
         let input =
             RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), time: Some(self.time), events, ..Default::default() };
         let app = &mut self.app;
-        self.ctx.run_ui(input, |ui| app.ui(ui)).textures_delta.clear();
+        let mut out = self.ctx.run_ui(input, |ui| app.ui(ui));
+        out.textures_delta.clear();
+        out
     }
 
     pub(crate) fn frames(&mut self, n: usize, events: impl Fn() -> Vec<Event>) {
@@ -130,6 +137,28 @@ fn preview_pane_opens_follows_edits_and_the_selection() {
     assert!(u.app.ui.preview.is_none());
 }
 
+/// A controller button pressed while the pane has no frame to show is dropped, and does not play
+/// once the frame comes back.
+#[test]
+fn controller_buttons_pressed_with_no_frame_shown_are_dropped() {
+    let (mut u, a, b, _) = setup();
+    let to_b = json!({"type": "navigate", "dest": b});
+    u.run("proto.interaction.add", json!({"id": a, "trigger": {"type": "keyPress", "key": "Gamepad A"}, "action": to_b}));
+    u.run("proto.preview", json!({"start": a}));
+    u.run("edit.delete", json!({"ids": [a]}));
+    let ctx = u.ctx.clone();
+    crate::control::handle(&mut u.app, &ctx, "ui.input", &json!({"events": [{"gamepad": "A"}]})).unwrap();
+    u.frames(2, Vec::new);
+    u.run("edit.undo", json!({}));
+    u.frames(2, Vec::new);
+    assert_eq!(u.preview()["current"], json!(a), "the button pressed with no frame shown did not play");
+    crate::control::handle(&mut u.app, &ctx, "ui.input", &json!({"events": [{"gamepad": "A"}]})).unwrap();
+    u.frames(2, Vec::new);
+    assert_eq!(u.preview()["current"], json!(b), "a button pressed with the frame shown plays");
+}
+
+/// Asserts the preview's device viewport and scroll range, wheel and drag scrolling, the
+/// end clamp with spring-back, and that navigation resets scroll to the top.
 #[test]
 fn the_frame_scrolls_on_the_device_screen_by_wheel_and_drag() {
     let (mut u, a, b, _) = setup();
@@ -143,6 +172,7 @@ fn the_frame_scrolls_on_the_device_screen_by_wheel_and_drag() {
             Event::PointerMoved(c),
             Event::MouseWheel {
                 unit: egui::MouseWheelUnit::Point,
+                source: egui::MouseWheelSource::Unknown,
                 delta: vec2(0.0, -60.0),
                 phase: egui::TouchPhase::Move,
                 modifiers: Default::default(),
@@ -175,6 +205,39 @@ fn the_frame_scrolls_on_the_device_screen_by_wheel_and_drag() {
     assert_eq!(u.scroll_y(), 0.0);
 }
 
+/// A long top-level frame scrolls on a phone with no overflow setting, as in Figma: the landing
+/// page template's Phone frame ("No scrolling", hugging its height) scrolls by the wheel.
+#[test]
+fn a_top_level_frame_taller_than_the_phone_scrolls_without_an_overflow_setting() {
+    let mut s = Session::new();
+    s.execute("file.newFromTemplate", &json!({"template": "landing-page"})).unwrap();
+    s.execute("proto.settings", &json!({"device": "iPhone 16", "responsive": true})).unwrap();
+    let doc = s.doc().unwrap();
+    let page = doc.first_page().unwrap();
+    let phone = doc.top_frames(page).into_iter().find(|f| doc.node(*f).unwrap().name == "Phone").unwrap();
+    assert_eq!(doc.node(phone).unwrap().overflow, figcraft_doc::proto::Overflow::None);
+    let mut u = Ui::new(s);
+    u.run("proto.preview", json!({"start": phone}));
+    let range = u.preview()["scrollRange"][1].as_f64().unwrap();
+    assert!(range > 1000.0, "the page is far taller than the screen: {range}");
+    let c = u.pane().center();
+    let wheel = move || {
+        vec![
+            Event::PointerMoved(c),
+            Event::MouseWheel {
+                unit: egui::MouseWheelUnit::Point,
+                source: egui::MouseWheelSource::Unknown,
+                delta: vec2(0.0, -60.0),
+                phase: egui::TouchPhase::Move,
+                modifiers: Default::default(),
+            },
+        ]
+    };
+    u.frames(6, wheel);
+    u.frames(20, Vec::new);
+    assert!(u.scroll_y() > 0.0, "{}", u.scroll_y());
+}
+
 #[test]
 fn full_window_presenter_shares_the_player() {
     let (mut u, a, ..) = setup();
diff --git a/crates/ui-egui/src/present_view_tests.rs b/crates/ui-egui/src/present_view_tests.rs
index 3571b2ad..361a4caf 100644
--- a/crates/ui-egui/src/present_view_tests.rs
+++ b/crates/ui-egui/src/present_view_tests.rs
@@ -95,6 +95,28 @@ fn scale_options_match_the_command_and_cycle() {
     assert!(!PresentScale::options(true).contains(&PresentScale::FitWidth));
 }
 
+#[test]
+fn presentation_tab_keeps_the_current_screen_when_returning_to_the_editor() {
+    let (mut u, a, b, _) = setup();
+    u.run("proto.present", json!({"start": a}));
+    u.key(pos2(720.0, 470.0), Key::ArrowRight);
+    assert_eq!(presenter(&u)["current"], json!(b));
+
+    let design_tab = pos2(100.0, 20.0);
+    u.button(design_tab, true);
+    u.button(design_tab, false);
+    assert!(u.app.ui.present.is_none());
+    assert_eq!(presenter(&u)["current"], json!(b));
+
+    let name_len = u.app.session.doc().unwrap().name.chars().count() as f32;
+    let design_w = (12.0 * 0.6 * name_len + 64.0).clamp(120.0, 220.0);
+    let preview_tab = pos2(8.0 + 44.0 + design_w + 40.0, 20.0);
+    u.button(preview_tab, true);
+    u.button(preview_tab, false);
+    assert!(u.app.ui.present.is_some());
+    assert_eq!(presenter(&u)["current"], json!(b));
+}
+
 /// No device: a big screen (2000×3000) and a small one, presenting the big one.
 fn big() -> (Ui, NodeId) {
     let mut s = Session::new();
@@ -113,14 +135,16 @@ fn num(v: &Value) -> f64 {
     v.as_f64().unwrap()
 }
 
+/// Asserts presenter fit/fit-width/fill/actual scaling, pan ranges, wheel and drag panning,
+/// option carry-over to the next presentation, and R restarting the flow.
 #[test]
 fn presenter_scales_by_its_options_and_pans_what_overflows() {
     let (mut u, big) = big();
     let at = pos2(720.0, 470.0);
-    // Fit: scaled down to the 1376×796 inside the padding; nothing pans.
+    // Fit: the tab strip leaves 1376×756 inside the presenter's padding; nothing pans.
     let p = presenter(&u);
     assert_eq!(p["scale"], "fit");
-    assert!((num(&p["zoom"]) - 796.0 / 3000.0).abs() < 1e-3, "{p}");
+    assert!((num(&p["zoom"]) - 756.0 / 3000.0).abs() < 1e-3, "{p}");
     assert_eq!(p["panRange"], json!([0.0, 0.0]));
     // Z: fit width (the whole 1440 width; the rest of the height pans).
     u.key(at, Key::Z);
@@ -128,14 +152,14 @@ fn presenter_scales_by_its_options_and_pans_what_overflows() {
     assert_eq!(p["scale"], "fitWidth");
     assert!((num(&p["zoom"]) - 0.72).abs() < 1e-3, "{p}");
     assert_eq!(p["panRange"][0], 0.0);
-    assert!((num(&p["panRange"][1]) - (2160.0 - 860.0)).abs() < 1.0, "{p}");
+    assert!((num(&p["panRange"][1]) - (2160.0 - 820.0)).abs() < 1.0, "{p}");
     // Z: fill (here the width decides too), then 100%: both ways overflow, centred across at the top.
     u.key(at, Key::Z);
     assert_eq!(presenter(&u)["scale"], "fill");
     u.key(at, Key::Z);
     let p = presenter(&u);
     assert_eq!((p["scale"].as_str(), num(&p["zoom"])), (Some("actual"), 1.0));
-    assert_eq!(p["panRange"], json!([624.0, 2204.0]));
+    assert_eq!(p["panRange"], json!([624.0, 2244.0]));
     assert_eq!(p["pan"], json!([312.0, 0.0]));
     // The wheel pans down; a drag pans with the pointer.
     let wheel = move || {
@@ -143,6 +167,7 @@ fn presenter_scales_by_its_options_and_pans_what_overflows() {
             Event::PointerMoved(at),
             Event::MouseWheel {
                 unit: egui::MouseWheelUnit::Point,
+                source: egui::MouseWheelSource::Unknown,
                 delta: vec2(0.0, -80.0),
                 phase: egui::TouchPhase::Move,
                 modifiers: Default::default(),
@@ -192,7 +217,7 @@ fn devices_turn_and_their_frame_can_hide() {
     let with_body = num(&presenter(&u)["zoom"]);
     u.run("proto.presentOptions", json!({"deviceFrame": false}));
     let bare = num(&presenter(&u)["zoom"]);
-    assert!(bare > with_body && (bare - 796.0 / 852.0).abs() < 1e-3, "{with_body} {bare}");
+    assert!(bare > with_body && (bare - 756.0 / 852.0).abs() < 1e-3, "{with_body} {bare}");
     // A device offers no fit width: Z goes fit → fill → 100%.
     u.key(pos2(720.0, 470.0), Key::Z);
     assert_eq!(presenter(&u)["scale"], "fill");
@@ -249,6 +274,7 @@ fn scrolling_keeps_its_momentum_and_springs_back_from_the_ends() {
     assert_eq!(u.preview()["flinging"], json!(false));
 }
 
+/// Asserts wheel momentum continues after input stops and then comes to rest.
 #[test]
 fn the_wheel_coasts_after_it_stops() {
     let (mut u, a, ..) = setup();
@@ -259,6 +285,7 @@ fn the_wheel_coasts_after_it_stops() {
             Event::PointerMoved(c),
             Event::MouseWheel {
                 unit: egui::MouseWheelUnit::Point,
+                source: egui::MouseWheelSource::Unknown,
                 delta: vec2(0.0, -40.0),
                 phase: egui::TouchPhase::Move,
                 modifiers: Default::default(),
diff --git a/crates/ui-egui/src/property_menu_tests.rs b/crates/ui-egui/src/property_menu_tests.rs
new file mode 100644
index 00000000..177c7720
--- /dev/null
+++ b/crates/ui-egui/src/property_menu_tests.rs
@@ -0,0 +1,101 @@
+//! The Design panel's property row menus: a secondary click on a fill, stroke or effect row
+//! copies that one paint or effect, and on another layer's row pastes it there.
+
+use egui::{Event, Modifiers, PointerButton, Pos2};
+use figcraft_doc::NodeId;
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+use crate::live_tests::{flat, text_center};
+
+fn id(v: &serde_json::Value) -> NodeId {
+    NodeId(v["id"].as_u64().unwrap())
+}
+
+fn rect(s: &mut Session) -> NodeId {
+    id(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 40, "height": 40})).unwrap())
+}
+
+/// A click with `button` at `p`, and the frames that follow; what the last frame drew.
+fn click(u: &mut Ui, p: Pos2, button: PointerButton) -> Vec<egui::Shape> {
+    for _ in 0..5 {
+        u.frame(vec![Event::PointerMoved(p)]);
+    }
+    let mut shapes = Vec::new();
+    for pressed in [Some(true), Some(false)].into_iter().chain(std::iter::repeat_n(None, 20)) {
+        let events = pressed.map(|pressed| Event::PointerButton { pos: p, button, pressed, modifiers: Modifiers::NONE });
+        shapes = flat(&u.frame_output(events.into_iter().collect()).shapes);
+    }
+    shapes
+}
+
+/// The text a row menu offers, clicked.
+fn pick(u: &mut Ui, menu: &[egui::Shape], label: &str) {
+    click(u, text_center(menu, label), PointerButton::Primary);
+}
+
+#[test]
+fn a_fill_row_copies_and_pastes_a_fill() {
+    let mut s = Session::new();
+    let a = rect(&mut s);
+    let b = rect(&mut s);
+    s.execute("fill.set", &json!({"ids": [a], "color": "#FF0000"})).unwrap();
+    s.execute("fill.set", &json!({"ids": [b], "color": "#0000FF"})).unwrap();
+    s.execute("select.set", &json!({"ids": [a]})).unwrap();
+    let mut u = Ui::new(s);
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    let menu = click(&mut u, text_center(&shapes, "FF0000"), PointerButton::Secondary);
+    pick(&mut u, &menu, crate::i18n::tr("Copy fill"));
+    let copied = u.app.session.clipboard.paint.clone().expect("the fill is on the clipboard");
+    assert_eq!(copied.1, u.app.session.doc().unwrap().node(a).unwrap().fills[0]);
+    // Onto b's fill row: it replaces that fill.
+    u.app.run("select.set", json!({"ids": [b]}));
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    let menu = click(&mut u, text_center(&shapes, "0000FF"), PointerButton::Secondary);
+    pick(&mut u, &menu, crate::i18n::tr("Paste fill"));
+    assert_eq!(u.app.session.doc().unwrap().node(b).unwrap().fills[0].solid_color().unwrap().to_hex(), "FF0000");
+}
+
+#[test]
+fn a_stroke_row_copies_and_pastes_a_stroke() {
+    let mut s = Session::new();
+    let a = rect(&mut s);
+    let b = rect(&mut s);
+    s.execute("stroke.add", &json!({"ids": [a], "paint": {"type": "solid", "color": "#FF0000"}})).unwrap();
+    s.execute("node.set", &json!({"ids": [a], "props": {"strokeWeight": 3.0}})).unwrap();
+    s.execute("stroke.add", &json!({"ids": [b]})).unwrap();
+    s.execute("select.set", &json!({"ids": [a]})).unwrap();
+    let mut u = Ui::new(s);
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    let menu = click(&mut u, text_center(&shapes, "FF0000"), PointerButton::Secondary);
+    pick(&mut u, &menu, crate::i18n::tr("Copy stroke"));
+    u.app.run("select.set", json!({"ids": [b]}));
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    let menu = click(&mut u, text_center(&shapes, "000000"), PointerButton::Secondary);
+    pick(&mut u, &menu, crate::i18n::tr("Paste stroke"));
+    let strokes = u.app.session.doc().unwrap().node(b).unwrap().strokes.clone();
+    assert_eq!(strokes.len(), 1, "it replaced b's stroke");
+    assert_eq!(strokes[0].solid_color().unwrap().to_hex(), "FF0000");
+    assert_eq!(u.app.session.doc().unwrap().node(b).unwrap().stroke.weight, 3.0, "the weight came with it");
+}
+
+#[test]
+fn an_effect_row_copies_and_pastes_an_effect() {
+    let mut s = Session::new();
+    let a = rect(&mut s);
+    let b = rect(&mut s);
+    s.execute("effect.add", &json!({"ids": [a], "type": "layerBlur"})).unwrap();
+    s.execute("effect.add", &json!({"ids": [b], "type": "dropShadow"})).unwrap();
+    s.execute("select.set", &json!({"ids": [a]})).unwrap();
+    let mut u = Ui::new(s);
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    let menu = click(&mut u, text_center(&shapes, "Layer blur"), PointerButton::Secondary);
+    pick(&mut u, &menu, crate::i18n::tr("Copy effect"));
+    u.app.run("select.set", json!({"ids": [b]}));
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    let menu = click(&mut u, text_center(&shapes, "Drop shadow"), PointerButton::Secondary);
+    pick(&mut u, &menu, crate::i18n::tr("Paste effect"));
+    let effects = u.app.session.doc().unwrap().node(b).unwrap().effects.clone();
+    assert_eq!(effects, u.app.session.doc().unwrap().node(a).unwrap().effects);
+}
diff --git a/crates/ui-egui/src/proto_editor_tests.rs b/crates/ui-egui/src/proto_editor_tests.rs
index 2372c20e..63c152e1 100644
--- a/crates/ui-egui/src/proto_editor_tests.rs
+++ b/crates/ui-egui/src/proto_editor_tests.rs
@@ -78,6 +78,9 @@ fn condition(u: &Ui, btn: NodeId, block: usize) -> String {
     blocks[block].condition.as_ref().map(|c| c.display(&doc.variables)).unwrap_or_default()
 }
 
+/// Asserts the interaction editor shows conditional blocks and nested actions, restarts a
+/// condition when a variable of another type is picked, ignores a right-hand-side variable pick
+/// for a complex condition, and one undo restores the previous condition.
 #[test]
 fn the_interaction_editor_shows_conditionals_and_picks_their_variables() {
     let (mut s, _, b, btn) = setup();
@@ -95,7 +98,7 @@ fn the_interaction_editor_shows_conditionals_and_picks_their_variables() {
     u.app.ui.right_tab = crate::RightTab::Prototype;
     crate::proto_panel::open_editor(&u.ctx, Some((btn, 0)));
     // The conditional open, then its nested set variable, then the else-if as an expression.
-    let open = egui::Id::new(("proto_open_action", btn, 0usize));
+    let open = egui::Id::unique(("proto_open_action", btn, 0usize));
     for path in [vec![1usize], vec![1, 0, 1], vec![1, 2, 0]] {
         u.ctx.data_mut(|d| d.insert_temp(open, path));
         u.frames(3, Vec::new);
@@ -154,6 +157,8 @@ fn the_builder_takes_variable_operator_value_conditions() {
     }
 }
 
+/// Asserts invalid typed conditions keep their draft and show errors without saving, a valid
+/// one clears the error and saves, and Enter does not leak to shortcuts.
 #[test]
 fn typed_conditions_are_checked_and_errors_show_until_fixed() {
     let (mut s, _, b, btn) = setup();
@@ -169,7 +174,7 @@ fn typed_conditions_are_checked_and_errors_show_until_fixed() {
     let mut u = Ui::new(s);
     u.app.ui.right_tab = crate::RightTab::Prototype;
     crate::proto_panel::open_editor(&u.ctx, Some((btn, 0)));
-    u.ctx.data_mut(|d| d.insert_temp(egui::Id::new(("proto_open_action", btn, 0usize)), vec![1usize]));
+    u.ctx.data_mut(|d| d.insert_temp(egui::Id::unique(("proto_open_action", btn, 0usize)), vec![1usize]));
     u.frames(3, Vec::new);
     // The else if is complex: it shows as an expression field.
     let field = Slot { node: btn, k: 0, path: vec![1] }.id("proto_cond_expr").with(1usize);
@@ -226,3 +231,104 @@ fn the_presenter_inspects_the_layer_under_the_pointer() {
     assert_eq!(presenter(&u)["inspected"], json!(a));
     assert_eq!(u.app.inspect()["presentOptions"]["inspect"], json!(true));
 }
+
+#[test]
+fn deleting_a_prototype_interaction_removes_the_interaction_not_the_component() {
+    let (s, _a, b, btn) = setup();
+    let mut u = Ui::new(s);
+    u.app.ui.right_tab = crate::RightTab::Prototype;
+    u.run("select.set", json!({"ids": [btn]}));
+    crate::proto_panel::open_editor(&u.ctx, Some((btn, 0)));
+    u.frames(1, Vec::new);
+
+    assert!(u.app.session.doc().unwrap().node(btn).is_some());
+    assert_eq!(u.app.session.doc().unwrap().node(btn).unwrap().interactions.len(), 1);
+    assert_eq!(crate::proto_panel::editor(&u.ctx), Some((btn, 0)));
+
+    // Pressing Delete when an interaction is selected should delete the interaction, NOT the component.
+    u.key(pos2(100.0, 100.0), egui::Key::Delete);
+
+    assert!(u.app.session.doc().unwrap().node(btn).is_some(), "Bug #767 regression: component was deleted when deleting prototype interaction!");
+    assert_eq!(u.app.session.doc().unwrap().node(btn).unwrap().interactions.len(), 0, "the interaction should be removed");
+    assert_eq!(crate::proto_panel::editor(&u.ctx), None);
+
+    // Re-add interaction and test Backspace as well.
+    u.run("proto.interaction.add", json!({"id": btn, "dest": b}));
+    assert_eq!(u.app.session.doc().unwrap().node(btn).unwrap().interactions.len(), 1);
+    crate::proto_panel::open_editor(&u.ctx, Some((btn, 0)));
+    u.frames(1, Vec::new);
+    u.key(pos2(100.0, 100.0), egui::Key::Backspace);
+    assert!(u.app.session.doc().unwrap().node(btn).is_some());
+    assert_eq!(u.app.session.doc().unwrap().node(btn).unwrap().interactions.len(), 0);
+    assert_eq!(crate::proto_panel::editor(&u.ctx), None);
+
+    // When NO interaction is active, Delete deletes the component as normal.
+    u.key(pos2(100.0, 100.0), egui::Key::Delete);
+    assert!(u.app.session.doc().unwrap().node(btn).is_none(), "when no interaction is selected, Delete removes the layer");
+}
+
+/// Edit ▸ Delete from the menu bar does the same as the Delete key (#767).
+#[test]
+fn edit_delete_from_the_menu_removes_the_open_interaction_not_the_layer() {
+    let (s, _a, _b, btn) = setup();
+    let mut u = Ui::new(s);
+    u.app.ui.right_tab = crate::RightTab::Prototype;
+    u.run("select.set", json!({"ids": [btn]}));
+    crate::proto_panel::open_editor(&u.ctx, Some((btn, 0)));
+    u.frames(1, Vec::new);
+    crate::menus::invoke(&mut u.app, "edit.delete");
+    let doc = u.app.session.doc().unwrap();
+    assert!(doc.node(btn).is_some_and(|n| n.interactions.is_empty()), "the interaction goes, the layer stays");
+    assert_eq!(crate::proto_panel::editor(&u.ctx), None);
+    crate::menus::invoke(&mut u.app, "edit.delete");
+    assert!(u.app.session.doc().unwrap().node(btn).is_none(), "with no interaction open, Edit ▸ Delete deletes the layer");
+}
+
+#[test]
+fn escape_closes_prototype_editor_without_deselecting_layer() {
+    let (s, a, _b, btn) = setup();
+    let mut u = Ui::new(s);
+    u.app.ui.right_tab = crate::RightTab::Prototype;
+    u.run("select.set", json!({"ids": [btn]}));
+    crate::proto_panel::open_editor(&u.ctx, Some((btn, 0)));
+    u.frames(1, Vec::new);
+
+    assert_eq!(crate::proto_panel::editor(&u.ctx), Some((btn, 0)));
+    assert_eq!(u.app.session.selection(), vec![btn]);
+
+    // First Escape closes the interaction editor; layer remains selected.
+    u.key(pos2(100.0, 100.0), egui::Key::Escape);
+    assert_eq!(crate::proto_panel::editor(&u.ctx), None);
+    assert_eq!(u.app.session.selection(), vec![btn], "layer remains selected");
+
+    // Second Escape steps out to parent frame.
+    u.key(pos2(100.0, 100.0), egui::Key::Escape);
+    assert_eq!(u.app.session.selection(), vec![a], "steps out to parent frame");
+
+    // Third Escape deselects all.
+    u.key(pos2(100.0, 100.0), egui::Key::Escape);
+    assert!(u.app.session.selection().is_empty(), "selection cleared on third escape");
+}
+
+/// After a click in the Pages list, Delete that removes an interaction ends the list's hold on the
+/// keyboard: with the layer deselected afterwards, Delete doesn't take the page (#859).
+#[test]
+fn deleting_an_interaction_ends_the_pages_list_focus() {
+    let (s, _a, _b, btn) = setup();
+    let mut u = Ui::new(s);
+    let first = u.app.session.page().unwrap();
+    u.run("page.add", json!({}));
+    u.run("page.select", json!({"id": first}));
+    // As after a click on the page's row (layers_keys_tests clicks the real row).
+    u.app.ui.pages_focus = u.app.session.ds().ok().map(|d| d.uid);
+    u.app.ui.right_tab = crate::RightTab::Prototype;
+    u.run("select.set", json!({"ids": [btn]}));
+    crate::proto_panel::open_editor(&u.ctx, Some((btn, 0)));
+    u.frames(1, Vec::new);
+    u.key(pos2(100.0, 100.0), egui::Key::Delete);
+    assert_eq!(u.app.session.doc().unwrap().node(btn).unwrap().interactions.len(), 0);
+    assert!(u.app.ui.pages_focus.is_none());
+    u.run("select.none", json!({}));
+    u.key(pos2(100.0, 100.0), egui::Key::Delete);
+    assert_eq!(u.app.session.doc().unwrap().pages.len(), 2, "the page stays");
+}
diff --git a/crates/ui-egui/src/proto_reorder_tests.rs b/crates/ui-egui/src/proto_reorder_tests.rs
index 1a061399..d69be4f6 100644
--- a/crates/ui-egui/src/proto_reorder_tests.rs
+++ b/crates/ui-egui/src/proto_reorder_tests.rs
@@ -44,8 +44,9 @@ fn setup() -> (Ui, NodeId) {
     (u, btn)
 }
 
+/// Stable id for a prototype node's open action path in the reorder tests.
 fn open_id(btn: NodeId) -> egui::Id {
-    egui::Id::new(("proto_open_action", btn, 0usize))
+    egui::Id::unique(("proto_open_action", btn, 0usize))
 }
 
 /// The kinds of the actions at `prefix` (the interaction's, or a block's).
diff --git a/crates/ui-egui/src/proto_responsive_tests.rs b/crates/ui-egui/src/proto_responsive_tests.rs
index fc9ccda2..f0ead8e9 100644
--- a/crates/ui-egui/src/proto_responsive_tests.rs
+++ b/crates/ui-egui/src/proto_responsive_tests.rs
@@ -69,8 +69,8 @@ fn without_a_device_a_responsive_frame_fills_the_window_at_100_percent() {
     let mut u = Ui::new(s);
     u.run("proto.present", json!({"start": w}));
     let p = presenter(&u);
-    // The window is 1440×900; the bar takes 40.
-    assert_eq!(size(&p["frameSize"]), (1440.0, 860.0), "{p}");
+    // The window is 1440×900; the title and tab bars take 80.
+    assert_eq!(size(&p["frameSize"]), (1440.0, 820.0), "{p}");
     assert_eq!(p["zoom"], json!(1.0));
     assert_eq!(size(&p["panRange"]), (0.0, 0.0));
     // Z has nothing to cycle: the size options don't apply.
diff --git a/crates/ui-egui/src/resources_tests.rs b/crates/ui-egui/src/resources_tests.rs
new file mode 100644
index 00000000..42869098
--- /dev/null
+++ b/crates/ui-egui/src/resources_tests.rs
@@ -0,0 +1,67 @@
+//! The toolbar's Resources button and Shift+I open the Assets panel (#710), from a collapsed
+//! sidebar and from the version history too.
+
+use egui::accesskit::Role;
+use egui::{Event, Key, Modifiers, Pos2, pos2};
+use figcraft_engine::Session;
+
+use crate::LeftTab;
+use crate::layers_drag_tests::Ui;
+
+fn click(u: &mut Ui, p: Pos2) {
+    u.button(p, true);
+    u.button(p, false);
+    u.frame(vec![]);
+}
+
+fn shift_i(u: &mut Ui) {
+    let modifiers = Modifiers::SHIFT;
+    u.frame(vec![
+        Event::Key { key: Key::I, physical_key: None, pressed: true, repeat: false, modifiers },
+        Event::Key { key: Key::I, physical_key: None, pressed: false, repeat: false, modifiers },
+    ]);
+    u.frame(vec![]);
+}
+
+/// The middle of the toolbar's Resources button, found in the AccessKit tree.
+fn resources_button(u: &mut Ui) -> Pos2 {
+    u.ctx.enable_accesskit();
+    u.frame(vec![]);
+    let out = u.frame_output(vec![]);
+    let nodes = out.platform_output.accesskit_update.expect("an AccessKit update").nodes;
+    let n = nodes.iter().map(|(_, n)| n).find(|n| n.role() == Role::Button && n.label() == Some("Resources")).expect("Resources");
+    let b = n.bounds().expect("bounds");
+    pos2(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32)
+}
+
+fn assets_shown(u: &Ui) -> bool {
+    u.app.ui.left_tab == LeftTab::Assets && !u.app.ui.left_collapsed && !u.app.ui.versions.open
+}
+
+/// The three states the sidebar can be in when Resources is asked for.
+fn starts() -> Vec<(&'static str, Ui)> {
+    let shown = Ui::new(Session::new());
+    let mut collapsed = Ui::new(Session::new());
+    collapsed.app.ui.left_collapsed = true;
+    let mut versions = Ui::new(Session::new());
+    crate::versions::open(&mut versions.app);
+    vec![("layers", shown), ("collapsed", collapsed), ("version history", versions)]
+}
+
+#[test]
+fn the_resources_button_opens_the_assets_panel() {
+    for (name, mut u) in starts() {
+        let at = resources_button(&mut u);
+        click(&mut u, at);
+        assert!(assets_shown(&u), "{name}: the Assets panel is open");
+    }
+}
+
+#[test]
+fn shift_i_opens_the_assets_panel() {
+    for (name, mut u) in starts() {
+        u.frame(vec![]);
+        shift_i(&mut u);
+        assert!(assets_shown(&u), "{name}: the Assets panel is open");
+    }
+}
diff --git a/crates/ui-egui/src/right.rs b/crates/ui-egui/src/right.rs
deleted file mode 100644
index 10847896..00000000
--- a/crates/ui-egui/src/right.rs
+++ /dev/null
@@ -1,2317 +0,0 @@
-//! The right panel: Design, Prototype and Inspect tabs.
-
-use egui::{Align2, Color32, CornerRadius, Id, Pos2, Rect, Sense, Stroke, Ui, pos2, vec2};
-use figcraft_color::{BlendMode, Paint, PaintKind};
-use figcraft_doc::*;
-use figcraft_engine::cmd::lists::{moved_index, removed_index};
-use serde_json::{Value, json};
-
-use crate::a11y::{self, Tip};
-use crate::i18n::{tr, trf, trn};
-use crate::icons::{self, Icon};
-use crate::list_drag::{ListDrag, move_flags, remove_flags};
-use crate::style_picker::{self, StyleSlot};
-use crate::theme::{ACCENT, Tokens, regular, semibold};
-use crate::widgets::{self, Edit, FIELD_H, FieldEdit, Lead, PAD};
-use crate::{FigApp, RightTab};
-
-/// Common value of `f` across `ids` (None when mixed or empty).
-pub(crate) fn common<T: PartialEq + Clone>(doc: &Document, ids: &[NodeId], f: impl Fn(&Node) -> T) -> Option<T> {
-    let mut it = ids.iter().filter_map(|i| doc.node(*i));
-    let first = f(it.next()?);
-    if it.all(|n| f(n) == first) { Some(first) } else { None }
-}
-
-impl FigApp {
-    /// Set properties on `ids` (one undo step).
-    pub fn set_props(&mut self, ids: &[NodeId], props: Value) {
-        if ids.is_empty() {
-            return;
-        }
-        self.run("node.set", json!({"ids": ids, "props": props}));
-    }
-
-    /// Apply a field edit: scrubs are live previews committed as one step.
-    pub fn field(&mut self, ids: &[NodeId], key: &str, edit: Option<FieldEdit>, map: impl Fn(f64) -> Value) {
-        if ids.is_empty() {
-            return;
-        }
-        self.field_run(edit, "node.set", |v| json!({"ids": ids, "props": { key: map(v) }}));
-    }
-
-    /// [`Self::field`] for a field showing `shown(layer)`: a relative edit of mixed values (`+10`,
-    /// `*2`, an arrow key's step) goes to each layer from its own value, in one undo step.
-    pub fn field_of(&mut self, ids: &[NodeId], key: &str, edit: Option<Edit>, shown: impl Fn(&Node) -> f64, map: impl Fn(f64) -> Value) {
-        let rel = match edit {
-            Some(Edit::Each(rel)) => rel,
-            Some(Edit::All(e)) => return self.field(ids, key, Some(e), map),
-            None => return,
-        };
-        let Ok(doc) = self.session.doc() else { return };
-        let values: Vec<(NodeId, f64)> = ids.iter().filter_map(|i| Some((*i, rel.apply(shown(doc.node(*i)?))?))).collect();
-        if values.is_empty() || self.session.begin_interaction("Edit").is_err() {
-            return;
-        }
-        for (id, v) in values {
-            if let Err(e) = self.session.execute("node.set", &json!({"ids": [id], "props": { key: map(v) }})) {
-                self.failed("node.set", &e);
-            }
-        }
-        let _ = self.session.commit_interaction();
-    }
-
-    /// Apply a field edit through any command: `params` builds the command's params from the value.
-    pub fn field_run(&mut self, edit: Option<FieldEdit>, cmd: &str, params: impl Fn(f64) -> Value) {
-        match edit {
-            Some(FieldEdit::Set(v)) => {
-                self.run(cmd, params(v));
-            }
-            Some(FieldEdit::Scrub(v, done)) => {
-                let _ = self.session.begin_interaction("Edit");
-                let _ = self.session.execute(cmd, &params(v));
-                if done {
-                    let _ = self.session.commit_interaction();
-                }
-            }
-            None => {}
-        }
-    }
-}
-
-pub fn right_panel(app: &mut FigApp, ui: &mut Ui) {
-    let t = Tokens::get(ui.ctx());
-    let w = ui.available_width();
-    // Top bar: people (you and the others in a live session), present, share.
-    let (top, _) = ui.allocate_exact_size(vec2(w, 48.0), Sense::hover());
-    // As wide as its label needs (longer in some languages).
-    let label = ui.painter().layout_no_wrap(tr("Share").to_string(), semibold(11.5), Color32::WHITE);
-    let sw = (label.size().x + 24.0).max(56.0);
-    let share = Rect::from_min_size(pos2(top.max.x - 14.0 - sw, top.center().y - 16.0), vec2(sw, 32.0));
-    let sresp = ui.interact(share, ui.id().with("share"), Sense::click()).tip(tr("Share: live session, export"));
-    ui.painter().rect_filled(share, CornerRadius::same(6), if sresp.hovered() { t.accent_hover } else { ACCENT });
-    ui.painter().galley(share.center() - label.size() / 2.0, label, Color32::WHITE);
-    crate::live::share_popover(app, &sresp);
-    // Play presents; its chevron opens the play menu (present, or preview in a pane).
-    let play = Rect::from_min_size(pos2(share.min.x - 50.0, top.center().y - 14.0), vec2(42.0, 28.0));
-    let (tri_r, chev_r) =
-        (Rect::from_min_max(play.min, pos2(play.max.x - 16.0, play.max.y)), Rect::from_min_max(pos2(play.max.x - 16.0, play.min.y), play.max));
-    let present_keys = crate::toolbar::pretty_shortcut(crate::shortcuts::shortcut("proto.present").unwrap_or(""));
-    let presp = ui.interact(tri_r, ui.id().with("play"), Sense::click()).tip(format!("{}  {present_keys}", tr("Present")));
-    let mresp = ui.interact(chev_r, ui.id().with("play_menu"), Sense::click()).tip(tr("Present or preview"));
-    if presp.hovered() || mresp.hovered() {
-        ui.painter().rect_filled(play, CornerRadius::same(5), t.hover);
-    }
-    let tri = Rect::from_center_size(play.center() - vec2(7.0, 0.0), vec2(16.0, 16.0));
-    let c = tri.center();
-    ui.painter().add(egui::Shape::closed_line(vec![c + vec2(-5.0, -7.0), c + vec2(7.0, 0.0), c + vec2(-5.0, 7.0)], Stroke::new(1.4, t.icon)));
-    icons::paint(ui.painter(), Rect::from_center_size(play.center() + vec2(12.0, 0.0), vec2(10.0, 10.0)), Icon::Chevron, t.icon_secondary);
-    crate::live::people_bar(app, ui, Rect::from_min_max(pos2(top.min.x + 12.0, top.min.y), pos2(play.min.x - 6.0, top.max.y)));
-    if presp.clicked() {
-        app.run("proto.present", json!({}));
-    }
-    menu_popup(&mresp).width(200.0).show(|ui| {
-        if menu_item(ui, tr("Present"), &present_keys) {
-            app.run("proto.present", json!({}));
-            ui.close();
-        }
-        let (label, cmd) = if app.ui.preview.is_some() { (tr("Close preview"), "proto.closePreview") } else { (tr("Preview"), "proto.preview") };
-        if menu_item(ui, label, "") {
-            app.run(cmd, json!({}));
-            ui.close();
-        }
-    });
-    // Tabs row.
-    let (tabs, _) = ui.allocate_exact_size(vec2(w, 40.0), Sense::hover());
-    ui.painter().line_segment([tabs.left_top(), tabs.right_top()], Stroke::new(1.0, t.border));
-    let mut x = tabs.min.x + 8.0;
-    for (tab, label) in [(RightTab::Design, tr("Design")), (RightTab::Prototype, tr("Prototype"))] {
-        let galley = ui.painter().layout_no_wrap(label.into(), semibold(11.0), t.text);
-        let r = Rect::from_min_size(pos2(x, tabs.center().y - 12.0), vec2(galley.size().x + 16.0, 24.0));
-        let resp = ui.interact(r, ui.id().with(("rtab", label)), Sense::click());
-        let active = app.ui.right_tab == tab;
-        a11y::tab(&resp, label, active);
-        if active {
-            ui.painter().rect_filled(r, CornerRadius::same(5), t.hover);
-        }
-        ui.painter().galley(pos2(r.min.x + 8.0, r.center().y - galley.size().y / 2.0), galley, if active { t.text } else { t.text_secondary });
-        if resp.clicked() {
-            app.ui.right_tab = tab;
-        }
-        x = r.max.x + 2.0;
-    }
-    // Zoom menu.
-    let zoom = app.session.ds().map(|d| d.view.zoom).unwrap_or(1.0);
-    let zr = Rect::from_min_size(pos2(tabs.max.x - 64.0, tabs.center().y - 12.0), vec2(56.0, 24.0));
-    let zresp = ui.interact(zr, ui.id().with("zoommenu"), Sense::click());
-    // The value is only spelled out while a screen reader reads the tree.
-    let value = if a11y::active(&zresp.ctx) { format!("{}%", (zoom * 100.0).round()) } else { String::new() };
-    a11y::combo(&zresp, tr("Zoom"), &value, a11y::menu_open(&zresp));
-    if zresp.hovered() {
-        ui.painter().rect_filled(zr, CornerRadius::same(5), t.hover);
-    }
-    ui.painter().text(pos2(zr.min.x + 6.0, zr.center().y), Align2::LEFT_CENTER, format!("{}%", (zoom * 100.0).round()), regular(11.0), t.text);
-    icons::paint(ui.painter(), Rect::from_center_size(pos2(zr.max.x - 9.0, zr.center().y), vec2(10.0, 10.0)), Icon::Chevron, t.icon_secondary);
-    menu_popup(&zresp).width(200.0).show(|ui| {
-        for (label, cmd) in [
-            (tr("Zoom in"), "view.zoomIn"),
-            (tr("Zoom out"), "view.zoomOut"),
-            (tr("Zoom to fit"), "view.zoomFit"),
-            (tr("Zoom to 50%"), "view.zoom50"),
-            (tr("Zoom to 100%"), "view.zoom100"),
-            (tr("Zoom to 200%"), "view.zoom200"),
-            (tr("Zoom to selection"), "view.zoomSelection"),
-        ] {
-            if menu_item(ui, label, crate::shortcuts::shortcut(cmd).unwrap_or("")) {
-                app.run(cmd, json!({}));
-                ui.close();
-            }
-        }
-        ui.separator();
-        let Ok(v) = app.session.ds().map(|d| d.view.clone()) else { return };
-        for (label, scale) in [(tr("Pixel preview 1x"), 1u8), (tr("Pixel preview 2x"), 2)] {
-            let on = v.pixel_preview && v.pixel_scale == scale;
-            if menu_check(ui, on, label, "") {
-                app.run("view.pixelPreview", json!({"on": !on, "scale": scale}));
-                ui.close();
-            }
-        }
-        let toggles: [(&str, &str, bool); 5] = [
-            (tr("Pixel grid"), "view.pixelGrid", v.pixel_grid),
-            (tr("Snap to pixel grid"), "view.snapPixel", v.snap_pixel),
-            (tr("Layout grids"), "view.layoutGrids", v.layout_grids),
-            (tr("Rulers"), "view.rulers", v.rulers),
-            (tr("Outlines"), "view.outlines", v.outlines),
-        ];
-        for (label, cmd, on) in toggles {
-            if menu_check(ui, on, label, crate::shortcuts::shortcut(cmd).unwrap_or("")) {
-                app.run(cmd, json!({}));
-                ui.close();
-            }
-        }
-    });
-    ui.painter().line_segment([tabs.left_bottom(), tabs.right_bottom()], Stroke::new(1.0, t.border));
-    egui::ScrollArea::vertical().auto_shrink([false, false]).show(ui, |ui| {
-        ui.spacing_mut().item_spacing = vec2(8.0, 0.0);
-        if app.session.tool.tool == figcraft_engine::ToolId::Comment {
-            crate::comments::panel(app, ui);
-            ui.add_space(80.0);
-            return;
-        }
-        match app.ui.right_tab {
-            // The Frame tool shows the frame presets.
-            RightTab::Design if app.session.tool.tool == figcraft_engine::ToolId::Frame => crate::frame_presets::panel(app, ui),
-            RightTab::Design => design(app, ui),
-            RightTab::Prototype => crate::proto_panel::prototype(app, ui),
-            RightTab::Inspect => inspect(app, ui),
-        }
-        ui.add_space(80.0);
-        a11y::scroll_focus(&mut app.ui.nav, ui);
-    });
-}
-
-/// The smallest width a popup menu is measured in (see [`menu_popup`]).
-const MENU_MIN_W: f32 = 48.0;
-/// A menu row's inset either side, and the gap between its label and its shortcut or art.
-const MENU_PAD: f32 = 8.0;
-const MENU_GAP: f32 = 24.0;
-
-/// The style of popup menus: egui's, with text kept on one line (a menu grows to its widest item).
-pub(crate) fn menu_style(s: &mut egui::Style) {
-    egui::containers::menu::menu_style(s);
-    s.wrap_mode = Some(egui::TextWrapMode::Extend);
-}
-
-/// The menu a dropdown or button opens: as wide as its widest row and at least as wide as
-/// `anchor`. egui measures a popup in a first, invisible pass as wide as the width it is given
-/// (else its 600 px default area width) and keeps the size measured; rows ([`menu_row`]) take the
-/// larger of that width and their content, so the menu fits its content. Chain `.width(w)` for a
-/// menu at least `w` wide.
-/// The blend modes as menu items in groups (pass-through only for layers); the one picked.
-pub fn blend_menu(ui: &mut Ui, with_pass_through: bool) -> Option<BlendMode> {
-    let mut picked = None;
-    for b in BlendMode::ALL.into_iter().filter(|b| with_pass_through || *b != BlendMode::PassThrough) {
-        if menu_item(ui, tr(b.label()), "") {
-            picked = Some(b);
-            ui.close();
-        }
-        if matches!(b, BlendMode::Normal | BlendMode::ColorBurn | BlendMode::ColorDodge | BlendMode::HardLight | BlendMode::Exclusion) {
-            ui.separator();
-        }
-    }
-    picked
-}
-
-pub fn menu_popup(anchor: &egui::Response) -> egui::Popup<'static> {
-    egui::Popup::menu(anchor).width(anchor.rect.width().max(MENU_MIN_W)).style(menu_style)
-}
-
-/// A context menu (secondary click on `resp`) sized like [`menu_popup`].
-pub fn context_popup(resp: &egui::Response) -> egui::Popup<'static> {
-    egui::Popup::context_menu(resp).width(MENU_MIN_W).style(menu_style)
-}
-
-pub fn menu_item(ui: &mut Ui, label: &str, shortcut: &str) -> bool {
-    menu_row(ui, label, shortcut, 0.0, |_, _, _| {}).clicked()
-}
-
-/// A menu row with art drawn into it after the label (`art(painter, row rect, text colour)`),
-/// taking `art_w` from the row's right edge.
-pub fn menu_item_with(ui: &mut Ui, label: &str, shortcut: &str, art_w: f32, art: impl FnOnce(&egui::Painter, Rect, Color32)) -> bool {
-    menu_row(ui, label, shortcut, art_w, art).clicked()
-}
-
-/// The width a menu row needs for a label `label_w` wide and, at its right end, a shortcut or
-/// art `trail` wide (0 for neither).
-pub(crate) fn menu_row_width(label_w: f32, trail: f32) -> f32 {
-    MENU_PAD + label_w + if trail > 0.0 { MENU_GAP + trail } else { MENU_PAD }
-}
-
-/// A menu row (see [`menu_item_with`]); its response tells hovering too. It spans the menu and
-/// is at least as wide as its label, shortcut and art.
-pub fn menu_row(ui: &mut Ui, label: &str, shortcut: &str, art_w: f32, art: impl FnOnce(&egui::Painter, Rect, Color32)) -> egui::Response {
-    let t = Tokens::get(ui.ctx());
-    let text = ui.painter().layout_no_wrap(label.to_owned(), regular(11.5), Color32::PLACEHOLDER);
-    let keys =
-        (!shortcut.is_empty()).then(|| ui.painter().layout_no_wrap(crate::toolbar::pretty_shortcut(shortcut), regular(11.0), Color32::PLACEHOLDER));
-    let trail = keys.as_ref().map_or(0.0, |k| k.size().x + MENU_PAD).max(art_w);
-    let w = ui.available_width().max(menu_row_width(text.size().x, trail).ceil());
-    let (r, resp) = ui.allocate_exact_size(vec2(w, 26.0), Sense::click());
-    a11y::menu_item(&resp, label, shortcut, None);
-    // The keyboard's item is highlighted like the hovered one.
-    a11y::own_focus(&resp);
-    let hovered = resp.hovered() || resp.has_focus();
-    if hovered {
-        ui.painter().rect_filled(r, CornerRadius::same(5), ACCENT);
-    }
-    let col = if hovered { Color32::WHITE } else { t.text };
-    ui.painter().galley(pos2(r.min.x + MENU_PAD, r.center().y - text.size().y / 2.0), text, col);
-    if let Some(k) = keys {
-        let at = pos2(r.max.x - MENU_PAD - k.size().x, r.center().y - k.size().y / 2.0);
-        ui.painter().galley(at, k, if hovered { Color32::WHITE } else { t.text_secondary });
-    }
-    art(ui.painter(), r, col);
-    resp
-}
-
-/// A menu item with a check mark when `on` (the unchecked ones line up with it).
-pub fn menu_check(ui: &mut Ui, on: bool, label: &str, shortcut: &str) -> bool {
-    marked_row(ui, Some(on), label, shortcut)
-}
-
-/// A plain menu item lined up with the check items above or below it.
-pub fn menu_item_beside_checks(ui: &mut Ui, label: &str, shortcut: &str) -> bool {
-    marked_row(ui, None, label, shortcut)
-}
-
-fn marked_row(ui: &mut Ui, on: Option<bool>, label: &str, shortcut: &str) -> bool {
-    let resp = menu_row(ui, &format!("{}{label}", if on == Some(true) { "✓ " } else { "    " }), shortcut, 0.0, |_, _, _| {});
-    a11y::menu_item(&resp, label, shortcut, on);
-    resp.clicked()
-}
-
-pub(crate) fn row(ui: &mut Ui, h: f32, add: impl FnOnce(&mut Ui)) {
-    row_rect(ui, h, add);
-}
-
-/// [`row`], returning the area the row takes.
-pub(crate) fn row_rect(ui: &mut Ui, h: f32, add: impl FnOnce(&mut Ui)) -> Rect {
-    block(ui, h, (h - FIELD_H) / 2.0, add)
-}
-
-/// A panel row `h` tall whose content is inset `inset_y` from its top and bottom (for content
-/// taller than one field); returns the area the row takes.
-pub(crate) fn block(ui: &mut Ui, h: f32, inset_y: f32, add: impl FnOnce(&mut Ui)) -> Rect {
-    let w = ui.available_width();
-    let (r, _) = ui.allocate_exact_size(vec2(w, h), Sense::hover());
-    let mut child =
-        ui.new_child(egui::UiBuilder::new().max_rect(r.shrink2(vec2(PAD, inset_y))).layout(egui::Layout::left_to_right(egui::Align::Center)));
-    child.spacing_mut().item_spacing = vec2(8.0, 0.0);
-    add(&mut child);
-    r
-}
-
-fn design(app: &mut FigApp, ui: &mut Ui) {
-    let Ok(ds) = app.session.ds() else { return };
-    // The panel shows the document itself, not a live text preview over it.
-    let doc = ds.text_preview.clone().unwrap_or_else(|| ds.doc.clone());
-    let sel = ds.selection.clone();
-    let vector_edit = ds.vector_edit.clone();
-    if sel.is_empty() {
-        page_section(app, ui, &doc);
-        return;
-    }
-    header(app, ui, &doc, &sel);
-    widgets::separator(ui);
-    // Editing a vector with points selected, the points' fields stand in for the layer's position
-    // and dimensions.
-    let points_selected = vector_edit.as_ref().is_some_and(|ve| !ve.vertices.is_empty() || !ve.segments.is_empty());
-    let vector_edit_none = vector_edit.is_none();
-    match vector_edit {
-        Some(ve) => crate::vector_panel::points(app, ui, &doc, &ve),
-        None => {
-            crate::section_panel::section(app, ui, &doc, &sel);
-            if app.session.tool.tool == figcraft_engine::ToolId::Scale {
-                crate::scale_panel::section(app, ui, &doc, &sel);
-                widgets::separator(ui);
-            }
-            position(app, ui, &doc, &sel);
-        }
-    }
-    widgets::separator(ui);
-    if !points_selected {
-        crate::layout_panel::layout_section(app, ui, &doc, &sel);
-        widgets::separator(ui);
-    }
-    if vector_edit_none && (arc_section(app, ui, &doc, &sel) || points_section(app, ui, &doc, &sel)) {
-        widgets::separator(ui);
-    }
-    appearance(app, ui, &doc, &sel);
-    widgets::separator(ui);
-    if variable_modes(app, ui, &doc, &sel) {
-        widgets::separator(ui);
-    }
-    if sel.iter().any(|i| matches!(doc.node(*i).map(|n| &n.kind), Some(NodeKind::Text(_)))) {
-        crate::typography::typography(app, ui, &doc, &sel);
-        widgets::separator(ui);
-    }
-    paints(app, ui, &doc, &sel, true);
-    widgets::separator(ui);
-    paints(app, ui, &doc, &sel, false);
-    widgets::separator(ui);
-    effects(app, ui, &doc, &sel);
-    widgets::separator(ui);
-    if sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.is_frame_like())) {
-        grids(app, ui, &doc, &sel);
-        widgets::separator(ui);
-    }
-    crate::export_panel::section(app, ui, &doc, &sel);
-}
-
-fn page_section(app: &mut FigApp, ui: &mut Ui, doc: &Document) {
-    let t = Tokens::get(ui.ctx());
-    let Ok(page) = app.session.page() else { return };
-    let bg = match doc.node(page).map(|n| &n.kind) {
-        Some(NodeKind::Page { background, .. }) => *background,
-        _ => figcraft_color::Color::DEFAULT_PAGE,
-    };
-    widgets::section_header(ui, tr("Page"), &[], false);
-    let mut open_picker = false;
-    let mut new_hex = None;
-    row(ui, 32.0, |ui| {
-        let p = Paint::solid(bg);
-        if widgets::swatch(ui, &p, 16.0).clicked() {
-            open_picker = true;
-        }
-        if let Some(h) = widgets::text_field(ui, Id::new("pagebg"), &bg.to_hex(), 96.0, "") {
-            new_hex = Some(h);
-        }
-        widgets::label(ui, "100 %", t.text);
-    });
-    if open_picker {
-        app.ui.picker = Some(crate::colorpicker::PickerTarget::PageBackground);
-    }
-    if let Some(h) = new_hex
-        && let Some(c) = figcraft_color::Color::from_hex_or_name(&h)
-    {
-        app.run("page.setBackground", json!({"color": c.to_css_hex()}));
-    }
-    widgets::separator(ui);
-    widgets::section_header(ui, tr("Color profile"), &[], false);
-    row(ui, 32.0, |ui| {
-        let resp = widgets::dropdown(ui, doc.color_profile.label(), 140.0, None);
-        menu_popup(&resp).show(|ui| {
-            for p in figcraft_color::ColorProfile::ALL {
-                if menu_item(ui, p.label(), "") {
-                    if p != doc.color_profile {
-                        app.ui.color_profile = Some(p);
-                    }
-                    ui.close();
-                }
-            }
-        });
-    });
-    widgets::separator(ui);
-    // Local variables & styles.
-    let vars = doc.variables.variables.iter().filter(|v| !figcraft_engine::library::is_remote_variable(doc, &v.id)).count();
-    widgets::section_header(ui, tr("Local variables"), &[], vars == 0);
-    row(ui, 32.0, |ui| {
-        let r = widgets::dropdown(ui, &trf("Open variables ({count})", &[("count", &vars)]), 200.0, Some(Icon::Styles));
-        if r.clicked() {
-            app.ui.preferences = false;
-            app.ui.palette = None;
-            app.ui.variables.get_or_insert_with(Default::default);
-        }
-    });
-    widgets::separator(ui);
-    widgets::section_header(ui, tr("Local styles"), &[], figcraft_engine::library::local_styles(doc).next().is_none());
-    crate::style_picker::local_styles(app, ui, doc);
-    widgets::separator(ui);
-    crate::export_panel::page_section(app, ui, doc, page);
-}
-
-fn header(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
-    let t = Tokens::get(ui.ctx());
-    let label = match common(doc, sel, |n| n.kind.label()) {
-        Some(l) if sel.len() == 1 => tr(l).to_string(),
-        // The plural ("Frames") is a key of its own.
-        Some(l) => tr(&format!("{l}s")).to_string(),
-        None => tr("Mixed").into(),
-    };
-    let is_frame = sel.len() == 1 && sel.first().and_then(|i| doc.node(*i)).is_some_and(|n| matches!(n.kind, NodeKind::Frame));
-    // Frames and groups convert into each other from the type menu.
-    let is_group = !sel.is_empty() && sel.iter().all(|i| doc.node(*i).is_some_and(|n| matches!(n.kind, NodeKind::Group)));
-    let kind_items = |app: &mut FigApp, ui: &mut Ui, frame: bool| {
-        for (to_frame, label, cmd) in [(true, tr("Frame"), "object.convertToFrame"), (false, tr("Group"), "object.convertToGroup")] {
-            if menu_check(ui, to_frame == frame, label, "") {
-                if to_frame != frame {
-                    app.run(cmd, json!({"ids": sel}));
-                }
-                ui.close();
-            }
-        }
-    };
-    let w = ui.available_width();
-    let (r, _) = ui.allocate_exact_size(vec2(w, 40.0), Sense::hover());
-    let lr = Rect::from_min_size(pos2(r.min.x + 8.0, r.center().y - 12.0), vec2(120.0, 24.0));
-    let resp = ui.interact(lr, ui.id().with("typedd"), Sense::click());
-    if resp.hovered() {
-        ui.painter().rect_filled(lr, CornerRadius::same(5), t.hover);
-    }
-    ui.painter().text(pos2(lr.min.x + 8.0, lr.center().y), Align2::LEFT_CENTER, &label, semibold(13.0), t.text);
-    if is_frame || is_group {
-        icons::paint(
-            ui.painter(),
-            Rect::from_center_size(pos2(lr.min.x + 18.0 + label.len() as f32 * 6.5, lr.center().y), vec2(10.0, 10.0)),
-            Icon::Chevron,
-            t.icon_secondary,
-        );
-    }
-    if is_group {
-        menu_popup(&resp).width(180.0).show(|ui| kind_items(app, ui, false));
-    }
-    if is_frame {
-        let sr = Rect::from_min_size(pos2(lr.max.x + 4.0, r.center().y - 12.0), vec2(24.0, 24.0));
-        let sresp = ui.interact(sr, ui.id().with("swap_orient"), Sense::click()).tip(tr("Swap orientation"));
-        if sresp.hovered() {
-            ui.painter().rect_filled(sr, CornerRadius::same(5), t.hover);
-        }
-        icons::paint(ui.painter(), sr.shrink(5.0), Icon::Rotate, t.icon);
-        if sresp.clicked() {
-            app.run("frame.swapOrientation", json!({"ids": sel}));
-        }
-        let ids: Vec<NodeId> = sel.to_vec();
-        menu_popup(&resp).width(260.0).show(|ui| {
-            egui::ScrollArea::vertical().max_height(420.0).show(ui, |ui| {
-                kind_items(app, ui, true);
-                ui.separator();
-                let mut cat = "";
-                for (c, name, pw, ph) in figcraft_engine::cmd::create::FRAME_PRESETS {
-                    if *c != cat {
-                        cat = c;
-                        ui.label(egui::RichText::new(tr(c)).font(semibold(11.0)).color(t.text_secondary));
-                    }
-                    if menu_item(ui, name, &format!("{}×{}", pw, ph)) {
-                        app.set_props(&ids, json!({"width": pw, "height": ph}));
-                        ui.close();
-                    }
-                }
-            });
-        });
-    }
-    // Quick actions on the right.
-    let mut x = r.max.x - 8.0;
-    let actions = [
-        (Icon::Component, tr("Create component"), "component.create"),
-        (Icon::Mask, tr("Use as mask"), "object.mask"),
-        (Icon::Union, tr("Boolean groups"), "bool.union"),
-    ];
-    // Layers in boolean groups, or one boolean group: the operation they use (checked in the menu).
-    let current = figcraft_engine::booleans::shown_op(doc, sel);
-    for (icon, label, cmd) in actions.into_iter().rev() {
-        let br = Rect::from_min_size(pos2(x - 24.0, r.center().y - 12.0), vec2(24.0, 24.0));
-        let tip = if cmd == "bool.union" { label } else { crate::shortcuts::tip(label, cmd) };
-        let bresp = ui.interact(br, ui.id().with(("qa", cmd)), Sense::click()).tip(tip);
-        if bresp.hovered() {
-            ui.painter().rect_filled(br, CornerRadius::same(5), t.hover);
-        }
-        // The boolean button shows the operation in use.
-        let icon = match (cmd, current) {
-            ("bool.union", Some(op)) => crate::layers::op_icon(op),
-            _ => icon,
-        };
-        icons::paint(ui.painter(), br.shrink(5.0), icon, t.icon);
-        if cmd == "bool.union" {
-            menu_popup(&bresp).width(180.0).show(|ui| {
-                for (op, c) in [
-                    (BoolOp::Union, "bool.union"),
-                    (BoolOp::Subtract, "bool.subtract"),
-                    (BoolOp::Intersect, "bool.intersect"),
-                    (BoolOp::Exclude, "bool.exclude"),
-                ] {
-                    let key = crate::shortcuts::shortcut(c).unwrap_or("");
-                    let picked = match current {
-                        Some(cur) => menu_check(ui, cur == op, tr(op.label()), key),
-                        None => menu_item(ui, tr(op.label()), key),
-                    };
-                    if picked {
-                        app.run(c, json!({}));
-                        ui.close();
-                    }
-                }
-                let key = crate::shortcuts::shortcut("vector.flatten").unwrap_or("");
-                let flatten = if current.is_some() { menu_item_beside_checks(ui, tr("Flatten"), key) } else { menu_item(ui, tr("Flatten"), key) };
-                if flatten {
-                    app.run("vector.flatten", json!({}));
-                    ui.close();
-                }
-            });
-        } else if bresp.clicked() {
-            app.run(cmd, json!({}));
-        }
-        x -= 26.0;
-    }
-    crate::component_panel::instance_section(app, ui, doc, sel);
-}
-
-fn position(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
-    widgets::section_header(ui, tr("Position"), &[], false);
-    // Layers inside an instance take their place and constraints from the main component.
-    let nested = sel.iter().any(|i| figcraft_engine::components::inside_instance(doc, *i));
-    ui.add_enabled_ui(!nested, |ui| position_fields(app, ui, doc, sel))
-        .response
-        .on_disabled_hover_text(tr("Layers in an instance take their position from the main component"));
-    ui.add_space(8.0);
-}
-
-fn position_fields(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
-    let ids = sel.to_vec();
-    let col = widgets::col_width(ui.available_width());
-    widgets::sublabels(ui, tr("Alignment"), None);
-    row(ui, 32.0, |ui| {
-        let cmds = ["align.left", "align.hcenter", "align.right", "align.top", "align.vcenter", "align.bottom"];
-        let tip = crate::shortcuts::tip;
-        let items = [
-            (Icon::AlignLeft, tip(tr("Align left"), cmds[0])),
-            (Icon::AlignHCenter, tip(tr("Align horizontal centers"), cmds[1])),
-            (Icon::AlignRight, tip(tr("Align right"), cmds[2])),
-            (Icon::AlignTop, tip(tr("Align top"), cmds[3])),
-            (Icon::AlignVCenter, tip(tr("Align vertical centers"), cmds[4])),
-            (Icon::AlignBottom, tip(tr("Align bottom"), cmds[5])),
-        ];
-        let w = col / 3.0;
-        let picked = ui.add_enabled_ui(figcraft_engine::cmd::arrange::can_align(doc, sel), |ui| {
-            let h = widgets::segmented(ui, &items[..3], None, w);
-            let v = widgets::segmented(ui, &items[3..], None, w).map(|i| i + 3);
-            h.or(v)
-        });
-        picked.response.on_disabled_hover_text(tr("A layer on its own aligns to its frame: select more layers, or one in a frame"));
-        if let Some(i) = picked.inner {
-            app.run(cmds[i], json!({"ids": ids}));
-        }
-        if sel.len() > 2 {
-            let more = icons::button(ui, Icon::DistributeH, 24.0, false, tr("Distribute and tidy"));
-            menu_popup(&more).show(|ui| {
-                for (l, c) in [
-                    (tr("Distribute horizontal spacing"), "distribute.horizontal"),
-                    (tr("Distribute vertical spacing"), "distribute.vertical"),
-                    (tr("Tidy up"), "arrange.tidy"),
-                ] {
-                    if menu_item(ui, l, crate::shortcuts::shortcut(c).unwrap_or("")) {
-                        app.run(c, json!({"ids": ids}));
-                        ui.close();
-                    }
-                }
-            });
-        }
-    });
-    // In the frame's space: groups have none of their own.
-    // What each field shows of a layer (a relative edit of mixed values starts from it).
-    let x_of = |n: &Node| (doc.frame_relative(n.id).as_coeffs()[4] * 100.0).round() / 100.0;
-    let y_of = |n: &Node| (doc.frame_relative(n.id).as_coeffs()[5] * 100.0).round() / 100.0;
-    let rot_of = |n: &Node| (figcraft_geom::rotation_degrees(n.transform) * 100.0).round() / 100.0;
-    let (x, y, rot) = (common(doc, sel, x_of), common(doc, sel, y_of), common(doc, sel, rot_of));
-    let parent_al = sel.iter().all(|i| doc.node(*i).and_then(|n| n.parent).and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some()));
-    let absolute = common(doc, sel, |n| n.child_layout.absolute);
-    widgets::sublabels(ui, tr("Position"), None);
-    row(ui, 32.0, |ui| {
-        let e = widgets::number_field_mixed(ui, Id::new("pos_x"), Lead::Text("X"), x, "", col, 1.0);
-        app.field_of(&ids, "x", e, x_of, |v| json!(v));
-        let e = widgets::number_field_mixed(ui, Id::new("pos_y"), Lead::Text("Y"), y, "", col, 1.0);
-        app.field_of(&ids, "y", e, y_of, |v| json!(v));
-        // Children of auto layout frames can ignore the layout (absolute position).
-        if parent_al {
-            let on = absolute.unwrap_or(false);
-            if icons::button(
-                ui,
-                Icon::AbsolutePosition,
-                24.0,
-                on,
-                if on { tr("Use auto layout") } else { tr("Ignore auto layout (absolute position)") },
-            )
-            .clicked()
-            {
-                app.set_props(&ids, json!({"absolute": !on}));
-            }
-        }
-    });
-    widgets::sublabels(ui, tr("Rotation"), None);
-    row(ui, 32.0, |ui| {
-        let e = widgets::number_field_mixed(ui, Id::new("pos_rot"), Lead::Icon(Icon::CornerRadius, tr("Rotation")), rot, "°", col, 1.0);
-        app.field_of(&ids, "rotation", e, rot_of, |v| json!(v));
-        let items = [
-            (Icon::Rotate, tr("Rotate 90° right")),
-            (Icon::FlipH, crate::shortcuts::tip(tr("Flip horizontal"), "object.flipH")),
-            (Icon::FlipV, crate::shortcuts::tip(tr("Flip vertical"), "object.flipV")),
-        ];
-        if let Some(i) = widgets::segmented(ui, &items, None, col / 3.0) {
-            app.run(["object.rotateRight", "object.flipH", "object.flipV"][i], json!({"ids": ids}));
-        }
-    });
-    // Constraints (children of frames without auto layout, or ignoring it).
-    let in_frame = sel.iter().all(|i| {
-        doc.node(*i).is_some_and(|n| {
-            n.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.kind.is_frame_like() && (p.layout.is_none() || n.child_layout.absolute))
-        })
-    });
-    if in_frame {
-        let c = common(doc, sel, |n| n.constraints);
-        widgets::sublabels(ui, tr("Constraints"), None);
-        row(ui, 32.0, |ui| {
-            let h = c.map(|c| format!("{:?}", c.horizontal)).unwrap_or_else(|| "Mixed".into());
-            let resp = widgets::dropdown(ui, tr(&pretty(&h)), col, None);
-            menu_popup(&resp).show(|ui| {
-                for (l, v) in [
-                    (tr("Left"), "left"),
-                    (tr("Right"), "right"),
-                    (tr("Left & right"), "leftRight"),
-                    (tr("Center"), "center"),
-                    (tr("Scale"), "scale"),
-                ] {
-                    if menu_item(ui, l, "") {
-                        app.set_props(&ids, json!({"constraints": {"horizontal": v}}));
-                        ui.close();
-                    }
-                }
-            });
-            let v = c.map(|c| format!("{:?}", c.vertical)).unwrap_or_else(|| "Mixed".into());
-            let resp = widgets::dropdown(ui, tr(&pretty(&v)), col, None);
-            menu_popup(&resp).show(|ui| {
-                for (l, val) in [
-                    (tr("Top"), "top"),
-                    (tr("Bottom"), "bottom"),
-                    (tr("Top & bottom"), "topBottom"),
-                    (tr("Center"), "center"),
-                    (tr("Scale"), "scale"),
-                ] {
-                    if menu_item(ui, l, "") {
-                        app.set_props(&ids, json!({"constraints": {"vertical": val}}));
-                        ui.close();
-                    }
-                }
-            });
-        });
-    }
-}
-
-/// The selected ellipses' arc: Start (degrees), Sweep (a share of a full turn, negative running
-/// the other way) and Ratio (the inner radius), the same values the canvas arc handles drag
-/// (`node.set`'s `arcStart` / `arcSweep` / `arcInner`; bindable to number variables, sweep and
-/// ratio ones holding percentages). Returns whether it showed.
-fn arc_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) -> bool {
-    let arcs: Vec<(f64, f64, f64)> = sel
-        .iter()
-        .filter_map(|i| match doc.node(*i)?.kind {
-            NodeKind::Ellipse { start, sweep, inner } => Some((start, sweep, inner)),
-            _ => None,
-        })
-        .collect();
-    if arcs.is_empty() || arcs.len() != sel.len() {
-        return false;
-    }
-    let ids = sel.to_vec();
-    let same = |f: &dyn Fn(&(f64, f64, f64)) -> f64| -> Option<f64> {
-        let v = (f(arcs.first()?) * 100.0).round() / 100.0;
-        arcs.iter().all(|a| ((f(a) * 100.0).round() / 100.0 - v).abs() < 1e-9).then_some(v)
-    };
-    let start = same(&|a| a.0.to_degrees().rem_euclid(360.0));
-    let sweep = same(&|a| a.1 / std::f64::consts::TAU * 100.0);
-    let ratio = same(&|a| a.2 * 100.0);
-    widgets::section_header(ui, tr("Arc"), &[], false);
-    let col = widgets::col_width(ui.available_width());
-    let field = |app: &mut FigApp, ui: &mut Ui, key: &str, icon: Icon, name: &str, value: Option<f64>, suffix: &str| {
-        crate::variable_ui::number_field(app, ui, &ids, key, Id::new(("arc", key)), Lead::Icon(icon, name), value, suffix, col)
-    };
-    widgets::sublabels(ui, tr("Start"), Some(tr("Sweep")));
-    row(ui, 32.0, |ui| {
-        let e = field(app, ui, "arcStart", Icon::ArcStart, tr("Arc start"), start, "°");
-        app.field(&ids, "arcStart", e, |v| json!(v));
-        let e = field(app, ui, "arcSweep", Icon::ArcSweep, tr("Arc sweep"), sweep, "%");
-        app.field(&ids, "arcSweep", e, |v| json!(v.clamp(-100.0, 100.0) * 3.6));
-    });
-    widgets::sublabels(ui, tr("Ratio"), None);
-    row(ui, 32.0, |ui| {
-        let e = field(app, ui, "arcInner", Icon::ArcRatio, tr("Arc ratio"), ratio, "%");
-        app.field(&ids, "arcInner", e, |v| json!((v / 100.0).clamp(0.0, 0.99)));
-    });
-    ui.add_space(8.0);
-    true
-}
-
-/// The selected polygons' and stars' point count (3 to 60 on stars), and the stars' ratio (the
-/// inner radius as a share of the outer one), as `node.set`'s `pointCount` / `innerRadius`.
-/// Returns whether it showed.
-fn points_section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) -> bool {
-    let shapes: Vec<(u32, Option<f64>)> = sel
-        .iter()
-        .filter_map(|i| match doc.node(*i)?.kind {
-            NodeKind::Polygon { count } => Some((count, None)),
-            NodeKind::Star { count, inner_ratio } => Some((count, Some(inner_ratio))),
-            _ => None,
-        })
-        .collect();
-    if shapes.is_empty() || shapes.len() != sel.len() {
-        return false;
-    }
-    let ids = sel.to_vec();
-    let count = shapes.first().map(|s| s.0).filter(|c| shapes.iter().all(|s| s.0 == *c)).map(f64::from);
-    let stars: Vec<f64> = shapes.iter().filter_map(|s| s.1).collect();
-    let ratio = stars.first().map(|r| (r * 1000.0).round() / 10.0).filter(|r| stars.iter().all(|x| ((x * 1000.0).round() / 10.0 - r).abs() < 1e-9));
-    let all_stars = stars.len() == shapes.len();
-    widgets::section_header(ui, tr(if all_stars { "Star" } else { "Polygon" }), &[], false);
-    let col = widgets::col_width(ui.available_width());
-    widgets::sublabels(ui, tr("Count"), all_stars.then_some(tr("Ratio")));
-    row(ui, 32.0, |ui| {
-        let e = widgets::number_field(ui, Id::new("pts_count"), Lead::Icon(Icon::Polygon, tr("Count")), count, "", col, 1.0);
-        app.field(&ids, "pointCount", e, |v| json!(v.round().clamp(3.0, 120.0)));
-        if all_stars {
-            let e = widgets::number_field(ui, Id::new("pts_ratio"), Lead::Icon(Icon::Star, tr("Ratio")), ratio, "%", col, 1.0);
-            app.field(&ids, "innerRadius", e, |v| json!((v / 100.0).clamp(0.001, 1.0)));
-        }
-    });
-    ui.add_space(8.0);
-    true
-}
-
-/// Constraint names as shown (English keys, translated at display).
-fn pretty(s: &str) -> String {
-    match s {
-        "LeftRight" => "Left & right".into(),
-        "TopBottom" => "Top & bottom".into(),
-        other => other.to_string(),
-    }
-}
-
-fn appearance(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
-    let ids = sel.to_vec();
-    let visible = common(doc, sel, |n| n.visible).unwrap_or(true);
-    let hdr = widgets::section_header(
-        ui,
-        tr("Appearance"),
-        &[
-            (if visible { Icon::Eye } else { Icon::EyeOff }, crate::shortcuts::tip(tr("Show/Hide"), "object.toggleVisible")),
-            (Icon::Variable, tr("Apply variable to visibility")),
-            (Icon::Blend, tr("Blend mode")),
-        ],
-        false,
-    );
-    if hdr == Some(0) {
-        app.run("object.toggleVisible", json!({"ids": ids}));
-    }
-    if hdr == Some(1) {
-        crate::variable_ui::open_at_pointer(ui, &ids, "visible", VariableType::Boolean);
-    }
-    if hdr == Some(2) {
-        ui.data_mut(|d| d.insert_temp(Id::new("blend_open"), !d.get_temp::<bool>(Id::new("blend_open")).unwrap_or(false)));
-    }
-    let col = widgets::col_width(ui.available_width());
-    crate::variable_ui::bound_row(app, ui, &ids, "visible", VariableType::Boolean, Lead::Icon(Icon::Eye, tr("Visible")), col * 2.0 + 8.0);
-    // Masks: how they mask.
-    if sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.is_mask)) {
-        let mt = common(doc, sel, |n| n.mask_type);
-        widgets::sublabels(ui, tr("Mask"), None);
-        row(ui, 32.0, |ui| {
-            let resp = widgets::dropdown(ui, mt.map(|m| tr(m.label())).unwrap_or(tr("Mixed")), col * 2.0 + 8.0, Some(Icon::Mask));
-            menu_popup(&resp).show(|ui| {
-                for m in MaskType::ALL {
-                    if menu_item(ui, tr(m.label()), "") {
-                        app.set_props(&ids, json!({"maskType": m.id()}));
-                        ui.close();
-                    }
-                }
-            });
-        });
-    }
-    let op_of = |n: &Node| (f64::from(n.opacity) * 100.0).round();
-    let op = common(doc, sel, op_of);
-    let radius_ok = sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.has_corner_radius()));
-    // Only rectangles and frames round each corner on its own.
-    let indep_ok = radius_ok && sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.has_independent_corners()));
-    let r = common(doc, sel, |n| n.corners.uniform().map(|r| (r * 100.0).round() / 100.0));
-    widgets::sublabels(ui, tr("Opacity"), radius_ok.then_some(tr("Corner radius")));
-    row(ui, 32.0, |ui| {
-        let lead = Lead::Icon(Icon::Opacity, tr("Opacity"));
-        let e = crate::variable_ui::number_field_mixed(app, ui, &ids, "opacity", Id::new("ap_op"), lead, op, "%", col);
-        app.field_of(&ids, "opacity", e, op_of, |v| json!((v / 100.0).clamp(0.0, 1.0)));
-        if radius_ok {
-            let e = crate::variable_ui::number_field_mixed(
-                app,
-                ui,
-                &ids,
-                "cornerRadius",
-                Id::new("ap_rad"),
-                Lead::Icon(Icon::CornerRadius, tr("Corner radius")),
-                r.flatten(),
-                "",
-                col,
-            );
-            // A layer with corners of its own starts from its largest.
-            let radius_of = |n: &Node| n.corners.uniform().unwrap_or_else(|| n.corners.radii.iter().copied().fold(0.0, f64::max));
-            app.field_of(&ids, "cornerRadius", e, radius_of, |v| json!(v.max(0.0)));
-            let open = ui.data(|d| d.get_temp::<bool>(Id::new("indep_corners"))).unwrap_or(false);
-            if indep_ok && icons::button(ui, Icon::IndependentCorners, 24.0, open, tr("Individual corners")).clicked() {
-                ui.data_mut(|d| d.insert_temp(Id::new("indep_corners"), !open));
-            }
-        }
-    });
-    if indep_ok && ui.data(|d| d.get_temp::<bool>(Id::new("indep_corners"))).unwrap_or(false) {
-        let radii = common(doc, sel, |n| n.corners.radii);
-        let keys = [
-            ("topLeftRadius", tr("Top left radius")),
-            ("topRightRadius", tr("Top right radius")),
-            ("bottomRightRadius", tr("Bottom right radius")),
-            ("bottomLeftRadius", tr("Bottom left radius")),
-        ];
-        row(ui, 32.0, |ui| {
-            for (k, (key, name)) in keys.iter().enumerate().take(2) {
-                let e = crate::variable_ui::number_field(
-                    app,
-                    ui,
-                    &ids,
-                    key,
-                    Id::new(("corner", k)),
-                    Lead::Icon(Icon::CornerRadius, name),
-                    radii.map(|r| r[k]),
-                    "",
-                    col,
-                );
-                app.field(&ids, key, e, |v| json!(v.max(0.0)));
-            }
-        });
-        row(ui, 32.0, |ui| {
-            for (k, (key, name)) in keys.iter().enumerate().skip(2) {
-                let e = crate::variable_ui::number_field(
-                    app,
-                    ui,
-                    &ids,
-                    key,
-                    Id::new(("corner", k)),
-                    Lead::Icon(Icon::CornerRadius, name),
-                    radii.map(|r| r[k]),
-                    "",
-                    col,
-                );
-                app.field(&ids, key, e, |v| json!(v.max(0.0)));
-            }
-        });
-        let sm = common(doc, sel, |n| (n.corners.smoothing * 100.0).round());
-        widgets::sublabels(ui, tr("Corner smoothing"), None);
-        row(ui, 32.0, |ui| {
-            let e = widgets::number_field(ui, Id::new("smoothing"), Lead::None, sm, "%", col, 1.0);
-            app.field(&ids, "cornerSmoothing", e, |v| json!((v / 100.0).clamp(0.0, 1.0)));
-            widgets::label(ui, "iOS: 60%", Tokens::get(ui.ctx()).text_tertiary);
-        });
-    }
-    let blend = common(doc, sel, |n| n.blend);
-    let show_blend = ui.data(|d| d.get_temp::<bool>(Id::new("blend_open"))).unwrap_or(false)
-        || blend.is_some_and(|b| !matches!(b, BlendMode::Normal | BlendMode::PassThrough));
-    if show_blend {
-        widgets::sublabels(ui, tr("Blend mode"), None);
-        row(ui, 32.0, |ui| {
-            let label = blend.map(|b| tr(b.label())).unwrap_or(tr("Mixed"));
-            let resp = widgets::dropdown(ui, label, col * 2.0 + 8.0, Some(Icon::Blend));
-            menu_popup(&resp).width(200.0).show(|ui| {
-                if let Some(b) = blend_menu(ui, true) {
-                    app.set_props(&ids, json!({"blend": b.label()}));
-                }
-            });
-        });
-    }
-    ui.add_space(8.0);
-}
-
-/// The variable modes of the selected frames (sections, components, instances): a row per
-/// collection with more than one mode, Auto (the mode the layer inherits from its parent) or a mode
-/// of its own (`variable.setMode`). Collections from enabled libraries follow under their
-/// library's name (`library.setVariableMode` copies the collection in). Returns whether it showed.
-fn variable_modes(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) -> bool {
-    if !sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.is_frame_like())) {
-        return false;
-    }
-    let libs = crate::variable_ui::libraries(app, doc);
-    let rows = crate::variable_ui::mode_rows(doc, &libs);
-    if rows.is_empty() {
-        return false;
-    }
-    let t = Tokens::get(ui.ctx());
-    widgets::section_header(ui, tr("Variable modes"), &[], false);
-    // The collection's name, then a wider mode picker ("Auto (Light)") across both field columns.
-    let col = widgets::col_width(ui.available_width());
-    let (name_w, pick_w) = ((col * 0.7).round(), (col * 1.3).round());
-    // Auto resolves from the parent of the first selected layer.
-    let parent_modes = sel.first().and_then(|i| doc.node(*i)).and_then(|n| n.parent).map(|p| doc.modes_for(p)).unwrap_or_default();
-    let mut group = None;
-    for r in &rows {
-        let c = r.coll;
-        // Library collections under their library's name.
-        if r.library != group {
-            group = r.library;
-            if let Some((_, lib)) = r.library {
-                widgets::sublabels(ui, lib, None);
-            }
-        }
-        let name_of = |m: &str| c.modes.iter().find(|x| x.id == m).map_or("", |x| x.name.as_str());
-        // Each layer's own mode (None: Auto); None overall when they differ.
-        let own = match r.local {
-            Some(l) => common(doc, sel, |n| n.var_modes.get(l).cloned()),
-            None => Some(None),
-        };
-        let inherited = r.local.and_then(|l| parent_modes.get(l)).or(c.default_mode()).map_or("", |m| name_of(m));
-        let auto = trf("Auto ({mode})", &[("mode", &inherited)]);
-        let label = match &own {
-            Some(Some(m)) => name_of(m).to_string(),
-            Some(None) => auto.clone(),
-            None => tr("Mixed").into(),
-        };
-        let hover = match r.library {
-            Some((_, lib)) => trf("{name} (from {library})", &[("name", &c.name), ("library", &lib)]),
-            None => c.name.clone(),
-        };
-        row(ui, 32.0, |ui| {
-            let (rect, _) = ui.allocate_exact_size(vec2(name_w, FIELD_H), Sense::hover());
-            let name = widgets::elide(ui, &c.name, name_w);
-            ui.painter().text(pos2(rect.min.x, rect.center().y), Align2::LEFT_CENTER, &name, regular(11.0), t.text);
-            if name != c.name || r.library.is_some() {
-                ui.interact(rect, Id::new(("var_mode_name", &c.id)), Sense::hover()).on_hover_text(&hover);
-            }
-            let resp = widgets::dropdown(ui, &label, pick_w, None);
-            menu_popup(&resp).width(180.0).show(|ui| {
-                let mut pick = None;
-                if menu_check(ui, own == Some(None), &auto, "") {
-                    pick = Some(Value::Null);
-                }
-                ui.separator();
-                for m in &c.modes {
-                    if menu_check(ui, own.as_ref().is_some_and(|o| o.as_ref() == Some(&m.id)), &m.name, "") {
-                        pick = Some(json!(m.id));
-                    }
-                }
-                if let Some(mode) = pick {
-                    set_variable_mode(app, sel, r, mode);
-                    ui.close();
-                }
-            });
-        });
-    }
-    ui.add_space(8.0);
-    true
-}
-
-/// Set `sel`'s mode of the collection of `row` (`mode` null: Auto). A library collection goes
-/// through `library.setVariableMode` (copying it in); Auto on one never used here is already so.
-fn set_variable_mode(app: &mut FigApp, sel: &[NodeId], row: &crate::variable_ui::ModeRow, mode: Value) {
-    match (row.library, row.key, row.local) {
-        (Some((lib, _)), Some(key), _) if !mode.is_null() => {
-            app.run("library.setVariableMode", json!({"library": lib, "collection": key, "ids": sel, "mode": mode}));
-        }
-        (_, _, Some(local)) => {
-            app.run("variable.setMode", json!({"ids": sel, "collection": local, "mode": mode}));
-        }
-        _ => {}
-    }
-}
-
-/// While a range of text is selected, the Fill section edits that range's colour.
-fn range_fill(app: &mut FigApp, ui: &mut Ui, doc: &Document, id: NodeId, start: usize, end: usize) {
-    let t = Tokens::get(ui.ctx());
-    widgets::section_header(ui, tr("Fill"), &[], false);
-    // The fills over the range, if every character shares them.
-    let fills: Option<Vec<Paint>> = doc.node(id).and_then(|n| n.kind.text().map(|tx| (n, tx))).and_then(|(n, tx)| {
-        let mut it =
-            tx.spans().into_iter().filter(|(s, e, _)| *s < end && *e > start).map(|(_, _, st)| st.fills.clone().unwrap_or_else(|| n.fills.clone()));
-        let first = it.next()?;
-        it.all(|f| f == first).then_some(first)
-    });
-    row(ui, 32.0, |ui| {
-        let w = ui.available_width() - 28.0;
-        let (r, _) = ui.allocate_exact_size(vec2(w, FIELD_H), Sense::hover());
-        ui.painter().rect_filled(r, CornerRadius::same(5), t.field);
-        let sw = Rect::from_min_size(pos2(r.min.x + 4.0, r.center().y - 8.0), vec2(16.0, 16.0));
-        let text_r = Rect::from_min_max(pos2(sw.max.x + 8.0, r.min.y), pos2(r.max.x - 4.0, r.max.y));
-        match fills.as_ref().and_then(|f| f.first()) {
-            Some(p) => {
-                widgets::paint_swatch(ui.painter(), sw, p);
-                if ui.interact(sw.expand(2.0), Id::new("range_swatch"), Sense::click()).clicked() {
-                    app.ui.picker = Some(crate::colorpicker::PickerTarget::TextRange { id, start, end });
-                }
-                if let Some(c) = p.solid_color() {
-                    let mut child = ui.new_child(egui::UiBuilder::new().max_rect(text_r));
-                    if let Some(h) =
-                        widgets::text_field_inline(&mut child, Id::new("range_hex"), &c.to_hex(), text_r.shrink2(vec2(0.0, 4.0)), regular(11.0))
-                        && let Some(nc) = figcraft_color::Color::from_hex_or_name(&h)
-                    {
-                        app.run("text.style", json!({"id": id, "start": start, "end": end, "textFills": [nc.to_css_hex()]}));
-                    }
-                } else {
-                    ui.painter().text(pos2(text_r.min.x, r.center().y), Align2::LEFT_CENTER, tr("Gradient"), regular(11.0), t.text);
-                }
-            }
-            None => {
-                ui.painter().text(pos2(text_r.min.x, r.center().y), Align2::LEFT_CENTER, tr("Mixed"), regular(11.0), t.text_secondary);
-                if ui.interact(r, Id::new("range_mixed"), Sense::click()).clicked() {
-                    app.ui.picker = Some(crate::colorpicker::PickerTarget::TextRange { id, start, end });
-                }
-            }
-        }
-        // Back to the layer's fill.
-        if icons::button(ui, Icon::Detach, 24.0, false, tr("Use the layer's fill")).clicked() {
-            app.run("text.style", json!({"id": id, "start": start, "end": end, "textFills": null}));
-        }
-    });
-}
-
-fn paints(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId], fills: bool) {
-    if fills
-        && let Some((id, a, b)) = figcraft_engine::textedit::selected_range(&app.session)
-        && a < b
-        && sel.contains(&id)
-    {
-        range_fill(app, ui, doc, id, a, b);
-        return;
-    }
-    let t = Tokens::get(ui.ctx());
-    let ids = sel.to_vec();
-    let list = common(doc, sel, |n| if fills { n.fills.clone() } else { n.strokes.clone() });
-    let title = if fills { tr("Fill") } else { tr("Stroke") };
-    let empty = list.as_ref().is_none_or(|l| l.is_empty());
-    let slot = if fills { StyleSlot::Fill } else { StyleSlot::Stroke };
-    if let Some(i) = widgets::section_header(
-        ui,
-        title,
-        &[(Icon::Styles, tr("Styles")), (Icon::Plus, if fills { tr("Add fill") } else { tr("Add stroke") })],
-        empty,
-    ) {
-        if i == 1 {
-            app.run(if fills { "fill.add" } else { "stroke.add" }, json!({"ids": ids}));
-        } else {
-            style_picker::open(app, ui, &ids, slot);
-        }
-    }
-    style_picker::chip(app, ui, doc, &ids, slot);
-    match &list {
-        None => widgets::note(ui, tr("Click + to replace mixed content"), t.text_secondary),
-        Some(l) => {
-            // The last paint is on top: shown first. Rows drag to reorder.
-            let mut drag = ListDrag::new(ui, if fills { "fills" } else { "strokes" });
-            for (i, p) in l.iter().enumerate().rev() {
-                let r = paint_row(app, ui, &ids, i, p, fills);
-                drag.row(ui, i, r, r, || paint_label(p));
-            }
-            if let Some((from, to)) = drag.finish(ui) {
-                app.run(if fills { "fill.move" } else { "stroke.move" }, json!({"ids": ids, "from": from, "to": to}));
-                // An open colour picker keeps editing the paint it was on.
-                if let Some(crate::colorpicker::PickerTarget::Paint { fills: f, index, .. }) = &mut app.ui.picker
-                    && *f == fills
-                {
-                    *index = moved_index(*index, from, to);
-                }
-            }
-        }
-    }
-    if !fills && !empty {
-        let weight = common(doc, sel, |n| n.stroke.weight);
-        let align = common(doc, sel, |n| n.stroke.align);
-        let half = (ui.available_width() - PAD * 2.0 - 8.0) / 2.0;
-        row(ui, 32.0, |ui| {
-            let resp = widgets::dropdown(
-                ui,
-                match align {
-                    Some(StrokeAlign::Inside) => tr("Inside"),
-                    Some(StrokeAlign::Center) => tr("Center"),
-                    Some(StrokeAlign::Outside) => tr("Outside"),
-                    None => tr("Mixed"),
-                },
-                half,
-                None,
-            );
-            menu_popup(&resp).show(|ui| {
-                for (l, v) in [(tr("Inside"), "inside"), (tr("Center"), "center"), (tr("Outside"), "outside")] {
-                    if menu_item(ui, l, "") {
-                        app.set_props(&ids, json!({"strokeAlign": v}));
-                        ui.close();
-                    }
-                }
-            });
-            let sided = sel.iter().all(|i| doc.node(*i).is_some_and(|n| n.kind.is_frame_like() || matches!(n.kind, NodeKind::Rectangle)));
-            let weight_w = half - if sided { 60.0 } else { 32.0 };
-            let e = crate::variable_ui::number_field_mixed(
-                app,
-                ui,
-                &ids,
-                "strokeWeight",
-                Id::new("stroke_w"),
-                Lead::Icon(Icon::Menu, tr("Stroke weight")),
-                weight,
-                "",
-                weight_w,
-            );
-            app.field_of(&ids, "strokeWeight", e, |n| n.stroke.weight, |v| json!(v.max(0.0)));
-            if sided {
-                let sides_btn = icons::button(ui, Icon::IndependentCorners, 24.0, false, tr("Individual strokes"));
-                menu_popup(&sides_btn).show(|ui| {
-                    let w = weight.unwrap_or(1.0);
-                    for (l, v) in [
-                        (tr("All"), Value::Null),
-                        (tr("Top"), json!([w, 0.0, 0.0, 0.0])),
-                        (tr("Right"), json!([0.0, w, 0.0, 0.0])),
-                        (tr("Bottom"), json!([0.0, 0.0, w, 0.0])),
-                        (tr("Left"), json!([0.0, 0.0, 0.0, w])),
-                        (tr("Custom"), json!([w, w, w, w])),
-                    ] {
-                        if menu_item(ui, l, "") {
-                            app.set_props(&ids, json!({"strokeSides": v}));
-                            ui.close();
-                        }
-                    }
-                });
-            }
-            let adv_id = Id::new("stroke_adv");
-            let open = ui.data(|d| d.get_temp::<bool>(adv_id)).unwrap_or(false);
-            if icons::button(ui, Icon::Dots, 24.0, open, tr("Advanced stroke")).clicked() {
-                ui.data_mut(|d| d.insert_temp(adv_id, !open));
-            }
-        });
-        // Per-side weights, two to a row (like the corner radii) so a bound variable's name fits:
-        // each side binds to a number variable on its own.
-        if let Some(sides) = common(doc, sel, |n| n.stroke.sides).flatten() {
-            let col = widgets::col_width(ui.available_width());
-            let fields = ["T", "R", "B", "L"].into_iter().zip(figcraft_engine::cmd::props::STROKE_SIDES);
-            for first in [0, 2] {
-                row(ui, 32.0, |ui| {
-                    for (k, (label, field)) in fields.clone().enumerate().skip(first).take(2) {
-                        let v = sides.get(k).copied();
-                        let e = crate::variable_ui::number_field(app, ui, &ids, field, Id::new(("stroke_side", k)), Lead::Text(label), v, "", col);
-                        app.field(&ids, field, e, |x| json!(x.max(0.0)));
-                    }
-                });
-            }
-        }
-        if ui.data(|d| d.get_temp::<bool>(Id::new("stroke_adv"))).unwrap_or(false) {
-            stroke_settings(app, ui, doc, sel);
-        }
-    }
-}
-
-/// A width profile drawn as a filled band across `rect` (thickest point = full height); `None`
-/// draws a uniform stroke.
-pub(crate) fn profile_art(painter: &egui::Painter, rect: Rect, profile: Option<&WidthProfile>, col: Color32) {
-    const STEPS: u32 = 40;
-    let max = profile.map_or(1.0, WidthProfile::max_scale).max(1e-6);
-    let (cy, half) = (rect.center().y, rect.height() / 2.0);
-    let mut mesh = egui::Mesh::default();
-    let (mut top, mut bottom) = (Vec::new(), Vec::new());
-    for i in 0..=STEPS {
-        let t = f64::from(i) / f64::from(STEPS);
-        // The path runs left to right: its left side is drawn on top.
-        let (l, r) = profile.map_or((0.5, 0.5), |p| {
-            let (l, r) = p.sides_at(t);
-            (l / max, r / max)
-        });
-        let x = rect.min.x + rect.width() * t as f32;
-        let (hl, hr) = (((l as f32) * half).max(0.5), ((r as f32) * half).max(0.5));
-        top.push(pos2(x, cy - hl));
-        bottom.push(pos2(x, cy + hr));
-        mesh.colored_vertex(pos2(x, cy - hl), col);
-        mesh.colored_vertex(pos2(x, cy + hr), col);
-    }
-    for i in 0..STEPS {
-        let k = 2 * i;
-        mesh.add_triangle(k, k + 1, k + 2);
-        mesh.add_triangle(k + 1, k + 3, k + 2);
-    }
-    painter.add(egui::Shape::mesh(mesh));
-    // The mesh isn't anti-aliased: smooth its edges with hairlines.
-    for edge in [top, bottom] {
-        painter.add(egui::Shape::line(edge, Stroke::new(0.75, col)));
-    }
-}
-
-/// Stroke settings ▸ Width profile: the presets (each with its shape) and a flip.
-fn width_profile_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], profile: Option<Option<WidthProfile>>, half: f32) {
-    let t = Tokens::get(ui.ctx());
-    widgets::sublabels(ui, tr("Width profile"), None);
-    row(ui, 32.0, |ui| {
-        let label = match &profile {
-            None => tr("Mixed"),
-            Some(None) => tr(WidthPreset::Uniform.label()),
-            Some(Some(p)) => p.preset().map_or(tr("Custom"), |w| tr(w.label())),
-        };
-        let resp = widgets::dropdown(ui, label, half * 2.0 + 8.0 - 32.0, None);
-        if let Some(p) = &profile {
-            let r = resp.rect;
-            let art = Rect::from_min_max(pos2(r.max.x - 22.0 - 56.0, r.center().y - 5.0), pos2(r.max.x - 22.0, r.center().y + 5.0));
-            profile_art(ui.painter(), art, p.as_ref(), t.icon_secondary);
-        }
-        menu_popup(&resp).show(|ui| {
-            for preset in WidthPreset::ALL {
-                let prof = preset.profile();
-                let art = |pt: &egui::Painter, r: Rect, col: Color32| {
-                    let a = Rect::from_min_max(pos2(r.max.x - 8.0 - 64.0, r.center().y - 5.0), pos2(r.max.x - 8.0, r.center().y + 5.0));
-                    profile_art(pt, a, prof.as_ref(), col);
-                };
-                if menu_item_with(ui, tr(preset.label()), "", 8.0 + 64.0, art) {
-                    app.run("stroke.widthProfile", json!({"ids": ids, "preset": preset.id()}));
-                    ui.close();
-                }
-            }
-        });
-        // Flip: the profile runs from the other end of the path.
-        let custom = profile.clone().flatten();
-        let flip = icons::button(ui, Icon::FlipH, 24.0, false, tr("Flip width profile"));
-        if flip.clicked()
-            && let Some(p) = custom
-        {
-            let pts: Vec<Value> =
-                p.points.iter().rev().map(|q| figcraft_engine::cmd::props::width_point_json(&WidthPoint { t: 1.0 - q.t, ..*q })).collect();
-            app.run("stroke.widthProfile", json!({"ids": ids, "points": pts}));
-        }
-    });
-}
-
-/// A brush drawn along a short line across `rect`, as outlines (egui fills only convex shapes).
-pub(crate) fn brush_art(painter: &egui::Painter, rect: Rect, preset: &str, col: Color32) {
-    use figcraft_geom::kurbo::{self, PathEl};
-    let mut line = figcraft_geom::BezPath::new();
-    line.move_to((0.0, 0.0));
-    line.line_to((f64::from(rect.width()), 0.0));
-    let brush = Brush::new(preset);
-    let props = StrokeProps { weight: f64::from(rect.height()), align: StrokeAlign::Center, brush: Some(brush.clone()), ..Default::default() };
-    let Some(out) = figcraft_pathops::brush::outline(&line, props.weight, &props, &brush) else { return };
-    for sub in figcraft_geom::split_subpaths(&out) {
-        let mut pts = Vec::new();
-        kurbo::flatten(sub.iter(), 0.25, |el| {
-            if let PathEl::MoveTo(p) | PathEl::LineTo(p) = el {
-                pts.push(pos2(rect.min.x + p.x as f32, rect.center().y + p.y as f32));
-            }
-        });
-        painter.add(egui::Shape::closed_line(pts, Stroke::new(1.0, col)));
-    }
-}
-
-/// Stroke settings ▸ Brush: a plain stroke, a stretch brush or a scatter brush, each with its look.
-fn brush_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], brush: Option<Option<Brush>>, width: f32) {
-    use figcraft_pathops::brush::{PRESETS, preset};
-    let t = Tokens::get(ui.ctx());
-    widgets::sublabels(ui, tr("Brush"), None);
-    row(ui, 32.0, |ui| {
-        let label = match &brush {
-            None => tr("Mixed"),
-            Some(b) => b.as_ref().and_then(|b| preset(&b.preset)).map_or(tr("None"), |p| tr(p.label)),
-        };
-        let resp = widgets::dropdown(ui, label, width, None);
-        a11y::combo(&resp, tr("Brush"), label, a11y::menu_open(&resp));
-        if let Some(Some(b)) = &brush {
-            let r = resp.rect;
-            brush_art(
-                ui.painter(),
-                Rect::from_min_max(pos2(r.max.x - 22.0 - 56.0, r.center().y - 5.0), pos2(r.max.x - 22.0, r.center().y + 5.0)),
-                &b.preset,
-                t.icon_secondary,
-            );
-        }
-        menu_popup(&resp).show(|ui| {
-            if menu_item(ui, tr("None"), "") {
-                app.run("stroke.brush", json!({"ids": ids, "preset": null}));
-                ui.close();
-            }
-            for p in PRESETS {
-                let art = |pt: &egui::Painter, r: Rect, col: Color32| {
-                    brush_art(
-                        pt,
-                        Rect::from_min_max(pos2(r.max.x - 8.0 - 64.0, r.center().y - 5.0), pos2(r.max.x - 8.0, r.center().y + 5.0)),
-                        p.id,
-                        col,
-                    );
-                };
-                if menu_item_with(ui, tr(p.label), "", 8.0 + 64.0, art) {
-                    app.run("stroke.brush", json!({"ids": ids, "preset": p.id}));
-                    ui.close();
-                }
-            }
-        });
-    });
-    // A scatter brush's spacing and jitter.
-    let Some(Some(b)) =
-        brush.filter(|b| b.as_ref().and_then(|b| preset(&b.preset)).is_some_and(|p| p.kind == figcraft_pathops::brush::BrushKind::Scatter))
-    else {
-        return;
-    };
-    let half = (width - 8.0) / 2.0;
-    let with = |f: &dyn Fn(&mut Brush)| {
-        let mut nb = b.clone();
-        f(&mut nb);
-        serde_json::to_value(nb.sanitized()).unwrap_or_default()
-    };
-    widgets::sublabels(ui, tr("Spacing"), Some(tr("Scatter")));
-    row(ui, 32.0, |ui| {
-        let e = widgets::number_field(ui, Id::new("brush_spacing"), Lead::Icon(Icon::Gap, tr("Brush spacing")), Some(b.spacing), "×", half, 0.1);
-        app.field(ids, "brush", e, |v| with(&|nb| nb.spacing = v));
-        let e = widgets::number_field(ui, Id::new("brush_scatter"), Lead::Icon(Icon::Dots, tr("Brush scatter")), Some(b.scatter), "×", half, 0.1);
-        app.field(ids, "brush", e, |v| with(&|nb| nb.scatter = v));
-    });
-    widgets::sublabels(ui, tr("Size jitter"), Some(tr("Rotation jitter")));
-    row(ui, 32.0, |ui| {
-        let e = widgets::number_field(
-            ui,
-            Id::new("brush_size_jitter"),
-            Lead::Icon(Icon::Scale, tr("Brush size jitter")),
-            Some(b.size_jitter * 100.0),
-            "%",
-            half,
-            1.0,
-        );
-        app.field(ids, "brush", e, |v| with(&|nb| nb.size_jitter = v / 100.0));
-        let e = widgets::number_field(
-            ui,
-            Id::new("brush_rotation_jitter"),
-            Lead::Icon(Icon::Rotate, tr("Brush rotation jitter")),
-            Some(b.rotation_jitter * 100.0),
-            "%",
-            half,
-            1.0,
-        );
-        app.field(ids, "brush", e, |v| with(&|nb| nb.rotation_jitter = v / 100.0));
-    });
-}
-
-/// Advanced stroke settings: dash pattern, width profile, join and the end points of open paths.
-fn stroke_settings(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
-    let ids = sel.to_vec();
-    let half = (ui.available_width() - PAD * 2.0 - 8.0) / 2.0;
-    let st = common(doc, sel, |n| n.stroke.clone());
-    let dashes = st.as_ref().map(|s| s.dashes.clone());
-    let weight = st.as_ref().map(|s| s.weight).unwrap_or(1.0).max(1.0);
-    widgets::sublabels(ui, tr("Stroke style"), None);
-    row(ui, 32.0, |ui| {
-        let dashed = dashes.as_ref().is_some_and(|d| !d.is_empty());
-        let resp = widgets::dropdown(ui, if dashed { tr("Dash") } else { tr("Solid") }, half, None);
-        menu_popup(&resp).show(|ui| {
-            if menu_item(ui, tr("Solid"), "") {
-                app.set_props(&ids, json!({"dashes": []}));
-                ui.close();
-            }
-            if menu_item(ui, tr("Dash"), "") {
-                app.set_props(&ids, json!({"dashes": [weight * 4.0, weight * 4.0]}));
-                ui.close();
-            }
-        });
-    });
-    if let Some(d) = dashes.filter(|d| !d.is_empty()) {
-        let (dash, gap) = (d.first().copied().unwrap_or(4.0), d.get(1).copied().unwrap_or_else(|| d.first().copied().unwrap_or(4.0)));
-        widgets::sublabels(ui, tr("Dash"), Some(tr("Gap")));
-        row(ui, 32.0, |ui| {
-            let e = widgets::number_field(ui, Id::new("stroke_dash"), Lead::None, Some(dash), "", half, 1.0);
-            app.field(&ids, "dashes", e, |v| json!([v.max(0.0), gap]));
-            let e = widgets::number_field(ui, Id::new("stroke_gap"), Lead::None, Some(gap), "", half, 1.0);
-            app.field(&ids, "dashes", e, |v| json!([dash, v.max(0.0)]));
-        });
-    }
-    width_profile_row(app, ui, &ids, st.as_ref().map(|s| s.profile().cloned()), half);
-    brush_row(app, ui, &ids, st.as_ref().map(|s| s.brush.clone()), half * 2.0 + 8.0);
-    let join = st.as_ref().map(|s| s.join);
-    widgets::sublabels(ui, tr("Join|stroke"), (join == Some(StrokeJoin::Miter)).then_some(tr("Miter angle")));
-    row(ui, 32.0, |ui| {
-        let resp = widgets::dropdown(ui, join.map(join_label).unwrap_or(tr("Mixed")), half, None);
-        menu_popup(&resp).show(|ui| {
-            for j in StrokeJoin::ALL {
-                if menu_item(ui, join_label(j), "") {
-                    app.set_props(&ids, json!({"strokeJoin": j}));
-                    ui.close();
-                }
-            }
-        });
-        if join == Some(StrokeJoin::Miter) {
-            let angle = st.as_ref().map(|s| (s.miter_angle() * 100.0).round() / 100.0);
-            let e = widgets::number_field(ui, Id::new("stroke_miter"), Lead::None, angle, "°", half, 1.0);
-            app.field(&ids, "miterAngle", e, |v| json!(v));
-        }
-    });
-    // End points only mean something on open paths.
-    let open_paths = sel.iter().all(|i| doc.node(*i).is_some_and(|n| matches!(n.kind, NodeKind::Line | NodeKind::Vector { .. })));
-    if open_paths {
-        widgets::sublabels(ui, tr("Start point"), Some(tr("End point")));
-        row(ui, 32.0, |ui| {
-            for (key, cap) in [("startCap", st.as_ref().map(|s| s.cap_start)), ("endCap", st.as_ref().map(|s| s.cap_end))] {
-                let resp = widgets::dropdown(ui, cap.map(|c| tr(c.label())).unwrap_or(tr("Mixed")), half, None);
-                menu_popup(&resp).show(|ui| {
-                    for c in StrokeCap::ALL {
-                        if menu_item_with(ui, tr(c.label()), "", CAP_ART_W, |p, r, col| cap_art(p, r, col, c, key == "startCap")) {
-                            app.set_props(&ids, json!({key: format!("{c:?}")}));
-                            ui.close();
-                        }
-                    }
-                });
-            }
-        });
-    }
-    ui.add_space(4.0);
-}
-
-/// A stroke join's name in the interface.
-pub(crate) fn join_label(j: StrokeJoin) -> &'static str {
-    match j {
-        StrokeJoin::Miter => tr("Miter"),
-        StrokeJoin::Bevel => tr("Bevel"),
-        StrokeJoin::Round => tr("Round"),
-    }
-}
-
-/// The width [`cap_art`] takes at the right of a menu row (its arrows reach past the line's ends).
-pub(crate) const CAP_ART_W: f32 = 64.0;
-
-/// A short stroke ending in `cap` (on its left end for a start point), drawn at the right of a menu
-/// row.
-pub(crate) fn cap_art(p: &egui::Painter, r: Rect, col: Color32, cap: StrokeCap, start: bool) {
-    let y = r.center().y;
-    let (left, right) = (r.max.x - 58.0, r.max.x - 14.0);
-    // The capped end, the plain end, and the direction from the stroke into its cap.
-    let (tip, tail, d) = if start { (left, right, -1.0) } else { (right, left, 1.0) };
-    let at = |back: f32, dy: f32| pos2(tip - d * back, y + dy);
-    let line = |to: Pos2, w: f32| {
-        p.line_segment([pos2(tail, y), to], Stroke::new(w, col));
-    };
-    let fill = |pts: Vec<Pos2>| {
-        p.add(egui::Shape::convex_polygon(pts, col, Stroke::NONE));
-    };
-    match cap {
-        StrokeCap::None => line(at(0.0, 0.0), 4.0),
-        StrokeCap::Round => {
-            line(at(2.0, 0.0), 4.0);
-            p.circle_filled(at(2.0, 0.0), 2.0, col);
-        }
-        StrokeCap::Square => line(at(-2.0, 0.0), 4.0),
-        StrokeCap::LineArrow => {
-            line(at(0.0, 0.0), 1.5);
-            p.add(egui::Shape::line(vec![at(5.5, -5.5), at(0.0, 0.0), at(5.5, 5.5)], Stroke::new(1.5, col)));
-        }
-        StrokeCap::TriangleArrow => {
-            line(at(7.0, 0.0), 1.5);
-            fill(vec![at(0.0, 0.0), at(8.0, -4.5), at(8.0, 4.5)]);
-        }
-        StrokeCap::ReversedTriangle => {
-            line(at(8.0, 0.0), 1.5);
-            fill(vec![at(8.0, 0.0), at(0.0, -4.5), at(0.0, 4.5)]);
-        }
-        StrokeCap::CircleFilled => {
-            line(at(4.0, 0.0), 1.5);
-            p.circle_filled(at(4.0, 0.0), 4.0, col);
-        }
-        StrokeCap::DiamondFilled => {
-            line(at(5.0, 0.0), 1.5);
-            fill(vec![at(0.0, 0.0), at(5.0, -5.0), at(10.0, 0.0), at(5.0, 5.0)]);
-        }
-    }
-}
-
-/// Paint `i`'s row (swatch, colour or kind, opacity, visibility, remove); returns its area.
-fn paint_row(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, p: &Paint, fills: bool) -> Rect {
-    let t = Tokens::get(ui.ctx());
-    let ids = ids.to_vec();
-    let cmd = if fills { "fill.set" } else { "stroke.set" };
-    row_rect(ui, 32.0, |ui| {
-        let w = ui.available_width() - 56.0;
-        let (r, _) = ui.allocate_exact_size(vec2(w, FIELD_H), Sense::hover());
-        ui.painter().rect_filled(r, CornerRadius::same(5), t.field);
-        let sw = Rect::from_min_size(pos2(r.min.x + 4.0, r.center().y - 8.0), vec2(16.0, 16.0));
-        widgets::paint_swatch(ui.painter(), sw, p);
-        let sresp = ui.interact(sw.expand(2.0), Id::new(("swatch", fills, i)), Sense::click());
-        if sresp.clicked() {
-            app.ui.picker = Some(crate::colorpicker::PickerTarget::Paint { fills, index: i, ids: ids.clone() });
-        }
-        let text_r = Rect::from_min_max(pos2(sw.max.x + 8.0, r.min.y), pos2(r.max.x - 52.0, r.max.y));
-        let mut child = ui.new_child(egui::UiBuilder::new().max_rect(text_r));
-        // The variable bound to this paint's colour (its key on the layers: `fill` or `fills/<i>/color`).
-        let bound = app.session.doc().ok().and_then(|d| {
-            let key = ids.first().and_then(|id| d.node(*id)).and_then(|n| figcraft_engine::cmd::lists::paint_binding_key(n, fills, i))?;
-            Some((key.to_string(), crate::variable_ui::bound_name(d, &ids, key)?))
-        });
-        match &p.kind {
-            PaintKind::Solid { .. } if bound.is_some() => {
-                let (key, name) = bound.clone().unwrap_or_default();
-                let chip = Rect::from_min_max(pos2(text_r.min.x - 2.0, r.min.y + 3.0), pos2(text_r.max.x - 20.0, r.max.y - 3.0));
-                child.painter().rect_filled(chip, CornerRadius::same(4), t.hover);
-                child.painter().rect_stroke(chip, CornerRadius::same(4), Stroke::new(1.0, t.border), egui::StrokeKind::Inside);
-                let short = name.rsplit('/').next().unwrap_or(&name).to_string();
-                child.painter().with_clip_rect(chip.shrink2(vec2(5.0, 0.0))).text(
-                    pos2(chip.min.x + 5.0, r.center().y),
-                    Align2::LEFT_CENTER,
-                    short,
-                    regular(11.0),
-                    t.text,
-                );
-                let _ = ui.interact(chip, Id::new(("bound_paint", fills, i)), Sense::hover()).on_hover_text(&name);
-                let dr = Rect::from_center_size(pos2(text_r.max.x - 9.0, r.center().y), vec2(18.0, 18.0));
-                let dresp = ui.interact(dr, Id::new(("detach_paint", fills, i)), Sense::click()).tip(tr("Detach variable"));
-                icons::paint(ui.painter(), dr.shrink(3.0), Icon::Detach, t.icon_secondary);
-                if dresp.clicked() {
-                    app.run("variable.bind", json!({"ids": ids, "field": key, "variable": null}));
-                }
-            }
-            PaintKind::Solid { color } => {
-                if let Some(h) =
-                    widgets::text_field_inline(&mut child, Id::new(("hex", fills, i)), &color.to_hex(), text_r.shrink2(vec2(0.0, 4.0)), regular(11.0))
-                    && let Some(c) = figcraft_color::Color::from_hex_or_name(&h)
-                {
-                    app.run(cmd, json!({"ids": ids, "index": i, "color": c.to_css_hex()}));
-                }
-            }
-            _ => {
-                child.painter().text(pos2(text_r.min.x, r.center().y), Align2::LEFT_CENTER, paint_label(p), regular(11.0), t.text);
-            }
-        }
-        let op_r = Rect::from_min_max(pos2(r.max.x - 48.0, r.min.y), r.max);
-        ui.painter().line_segment([pos2(op_r.min.x, r.min.y + 4.0), pos2(op_r.min.x, r.max.y - 4.0)], Stroke::new(1.0, t.panel));
-        let mut child = ui.new_child(egui::UiBuilder::new().max_rect(op_r));
-        let e =
-            widgets::number_field(&mut child, Id::new(("pop", fills, i)), Lead::None, Some((f64::from(p.opacity) * 100.0).round()), "%", 48.0, 1.0);
-        match e {
-            Some(FieldEdit::Set(v)) => {
-                app.run(cmd, json!({"ids": ids, "index": i, "opacity": (v / 100.0).clamp(0.0, 1.0)}));
-            }
-            Some(FieldEdit::Scrub(v, done)) => {
-                let _ = app.session.begin_interaction("Opacity");
-                let _ = app.session.execute(cmd, &json!({"ids": ids, "index": i, "opacity": (v / 100.0).clamp(0.0, 1.0)}));
-                if done {
-                    let _ = app.session.commit_interaction();
-                }
-            }
-            None => {}
-        }
-        if icons::button(ui, if p.visible { Icon::Eye } else { Icon::EyeOff }, 24.0, false, tr("Toggle visibility")).clicked() {
-            app.run(cmd, json!({"ids": ids, "index": i, "visible": !p.visible}));
-        }
-        if icons::button(ui, Icon::Minus, 24.0, false, tr("Remove")).clicked()
-            && app.run(if fills { "fill.remove" } else { "stroke.remove" }, json!({"ids": ids, "index": i})).is_some()
-            && let Some(crate::colorpicker::PickerTarget::Paint { fills: f, index, .. }) = &mut app.ui.picker
-            && *f == fills
-        {
-            // An open colour picker keeps editing the paint it was on, or closes with it.
-            match removed_index(*index, i) {
-                Some(k) => *index = k,
-                None => app.ui.picker = None,
-            }
-        }
-    })
-}
-
-/// A paint row's label (also what a drag of it carries): its colour, gradient kind or "Image".
-fn paint_label(p: &Paint) -> String {
-    match &p.kind {
-        PaintKind::Solid { color } => color.to_hex(),
-        // The gradient kind's name ("Linear") is a key of its own.
-        PaintKind::Gradient(g) => tr(&format!("{:?}", g.kind)).to_string(),
-        PaintKind::Image(_) => tr("Image").into(),
-        PaintKind::Pattern(_) => tr("Pattern").into(),
-    }
-}
-
-fn effects(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
-    let ids = sel.to_vec();
-    let list = common(doc, sel, |n| n.effects.clone());
-    let empty = list.as_ref().is_none_or(|l| l.is_empty());
-    if let Some(i) = widgets::section_header(ui, tr("Effects"), &[(Icon::Styles, tr("Styles")), (Icon::Plus, tr("Add effect"))], empty) {
-        if i == 1 {
-            app.run("effect.add", json!({"ids": ids, "type": "dropShadow"}));
-        } else {
-            style_picker::open(app, ui, &ids, StyleSlot::Effect);
-        }
-    }
-    style_picker::chip(app, ui, doc, &ids, StyleSlot::Effect);
-    let Some(list) = list else { return };
-    let mut drag = ListDrag::new(ui, "effects");
-    let mut removed = None;
-    for (i, e) in list.iter().enumerate().rev() {
-        let mut open = effect_open(ui.ctx(), i);
-        let header = row_rect(ui, 32.0, |ui| {
-            if icons::button(ui, Icon::Effects, 24.0, open, tr("Effect settings")).clicked() {
-                open = !open;
-                ui.data_mut(|d| d.insert_temp(Id::new((FX_OPEN, i)), open));
-            }
-            let w = ui.available_width() - 56.0;
-            let resp = widgets::dropdown(ui, tr(e.label()), w, None);
-            menu_popup(&resp).show(|ui| {
-                for (l, ty) in Effect::TYPES {
-                    if menu_item(ui, tr(l), "")
-                        && let Some(ne) = Effect::of_type(ty)
-                    {
-                        app.run("effect.set", json!({"ids": ids, "index": i, "effect": ne}));
-                        ui.close();
-                    }
-                }
-            });
-            if icons::button(ui, if e.visible { Icon::Eye } else { Icon::EyeOff }, 24.0, false, tr("Toggle")).clicked() {
-                let mut e2 = e.clone();
-                e2.visible = !e2.visible;
-                app.run("effect.set", json!({"ids": ids, "index": i, "effect": e2}));
-            }
-            if icons::button(ui, Icon::Minus, 24.0, false, tr("Remove")).clicked()
-                && app.run("effect.remove", json!({"ids": ids, "index": i})).is_some()
-            {
-                removed = Some(i);
-            }
-        });
-        if open {
-            effect_settings(app, ui, &ids, i, e);
-        }
-        drag.row(ui, i, header, header.with_max_y(ui.cursor().min.y.max(header.max.y)), || tr(e.label()).to_string());
-    }
-    if let Some((from, to)) = drag.finish(ui) {
-        app.run("effect.move", json!({"ids": ids, "from": from, "to": to}));
-        move_flags(ui, FX_OPEN, list.len(), from, to);
-        if let Some(crate::colorpicker::PickerTarget::Effect { index, .. }) = &mut app.ui.picker {
-            *index = moved_index(*index, from, to);
-        }
-    }
-    // Open settings and an open colour picker stay with their effects, or go with theirs.
-    if let Some(i) = removed {
-        remove_flags(ui, FX_OPEN, list.len(), i);
-        if let Some(crate::colorpicker::PickerTarget::Effect { index, .. }) = &mut app.ui.picker {
-            match removed_index(*index, i) {
-                Some(k) => *index = k,
-                None => app.ui.picker = None,
-            }
-        }
-    }
-}
-
-/// Salt of the flags that keep effect rows' settings open.
-const FX_OPEN: &str = "fx_open";
-
-/// Whether effect `i`'s settings are open in the Design panel.
-pub(crate) fn effect_open(ctx: &egui::Context, i: usize) -> bool {
-    ctx.data(|d| d.get_temp::<bool>(Id::new((FX_OPEN, i)))).unwrap_or(false)
-}
-
-/// A number field of effect `i` that can be bound to a variable (`effects/<i>/<prop>`).
-fn fx_field(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, prop: &str, lead: Lead, value: f64, width: f32) -> Option<FieldEdit> {
-    crate::variable_ui::number_field(app, ui, ids, &format!("effects/{i}/{prop}"), Id::new(("fx", prop, i)), lead, Some(value), "", width)
-}
-
-fn effect_settings(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, e: &Effect) {
-    let half = (ui.available_width() - PAD * 2.0 - 8.0) / 2.0;
-    let set = |app: &mut FigApp, e2: Effect, scrub: Option<bool>| {
-        let p = json!({"ids": ids, "index": i, "effect": e2});
-        match scrub {
-            None => {
-                app.run("effect.set", p);
-            }
-            Some(done) => {
-                let _ = app.session.begin_interaction("Effect");
-                let _ = app.session.execute("effect.set", &p);
-                if done {
-                    let _ = app.session.commit_interaction();
-                }
-            }
-        }
-    };
-    let edit = |app: &mut FigApp, ed: Option<FieldEdit>, f: &dyn Fn(f64) -> Effect| match ed {
-        Some(FieldEdit::Set(v)) => set(app, f(v), None),
-        Some(FieldEdit::Scrub(v, d)) => set(app, f(v), Some(d)),
-        None => {}
-    };
-    // A new colour for the effect (`secondary`: a duo noise's second colour).
-    let edit_color = |app: &mut FigApp, secondary: bool, c: figcraft_color::Color, scrub: Option<bool>| {
-        let mut e2 = e.clone();
-        if let Some(slot) = e2.color_mut(secondary) {
-            *slot = c;
-        }
-        set(app, e2, scrub);
-    };
-    match &e.kind {
-        EffectKind::DropShadow(s) | EffectKind::InnerShadow(s) => {
-            let inner = matches!(e.kind, EffectKind::InnerShadow(_));
-            let mk = |s2: Shadow| Effect { kind: if inner { EffectKind::InnerShadow(s2) } else { EffectKind::DropShadow(s2) }, visible: e.visible };
-            row(ui, 32.0, |ui| {
-                let ed = fx_field(app, ui, ids, i, "offsetX", Lead::Text("X"), s.offset.0, half);
-                edit(app, ed, &|v| mk(Shadow { offset: (v, s.offset.1), ..s.clone() }));
-                let ed = fx_field(app, ui, ids, i, "offsetY", Lead::Text("Y"), s.offset.1, half);
-                edit(app, ed, &|v| mk(Shadow { offset: (s.offset.0, v), ..s.clone() }));
-            });
-            row(ui, 32.0, |ui| {
-                let ed = fx_field(app, ui, ids, i, "radius", Lead::Text(tr("Blur")), s.radius, half);
-                edit(app, ed, &|v| mk(Shadow { radius: v.max(0.0), ..s.clone() }));
-                let ed = fx_field(app, ui, ids, i, "spread", Lead::Text(tr("Spread")), s.spread, half);
-                edit(app, ed, &|v| mk(Shadow { spread: v, ..s.clone() }));
-            });
-            // The colour: a bound variable's chip, else swatch, hex and alpha with a variable button.
-            let color_field = format!("effects/{i}/color");
-            row(ui, 32.0, |ui| {
-                crate::variable_ui::bindable(app, ui, ids, &color_field, VariableType::Color, half * 2.0 + 8.0, |app, ui| {
-                    fx_color(app, ui, ids, i, e, false, &edit_color)
-                });
-            });
-            if !inner {
-                row(ui, 32.0, |ui| {
-                    if widgets::checkbox(ui, s.show_behind, tr("Show behind transparent areas")) {
-                        set(app, mk(Shadow { show_behind: !s.show_behind, ..s.clone() }), None);
-                    }
-                });
-            }
-        }
-        EffectKind::LayerBlur(b) | EffectKind::BackgroundBlur(b) => {
-            let with = |f: &dyn Fn(&mut Blur)| {
-                let mut e2 = e.clone();
-                if let Some(b2) = e2.blur_mut() {
-                    f(b2);
-                }
-                e2
-            };
-            row(ui, 32.0, |ui| {
-                let resp = widgets::dropdown(ui, tr(b.blur_type.label()), half * 2.0 + 8.0, None);
-                menu_popup(&resp).show(|ui| {
-                    for t in BlurType::ALL {
-                        if menu_item(ui, tr(t.label()), "") {
-                            set(app, with(&|b2| b2.blur_type = t), None);
-                            ui.close();
-                        }
-                    }
-                });
-            });
-            row(ui, 32.0, |ui| {
-                if b.is_progressive() {
-                    // The ramp's start and end points are dragged on the canvas.
-                    let ed = fx_field(app, ui, ids, i, "startRadius", Lead::Text(tr("Start")), b.start_radius, half);
-                    edit(app, ed, &|v| with(&|b2| b2.start_radius = v.clamp(0.0, MAX_BLUR_RADIUS)));
-                    let ed = fx_field(app, ui, ids, i, "radius", Lead::Text(tr("End")), b.radius, half);
-                    edit(app, ed, &|v| with(&|b2| b2.radius = v.clamp(0.0, MAX_BLUR_RADIUS)));
-                } else {
-                    let ed = fx_field(app, ui, ids, i, "radius", Lead::Text(tr("Blur")), b.radius, half * 2.0 + 8.0);
-                    edit(app, ed, &|v| with(&|b2| b2.radius = v.clamp(0.0, MAX_BLUR_RADIUS)));
-                }
-            });
-        }
-        EffectKind::Noise(nz) => {
-            let with = |f: &dyn Fn(&mut Noise)| {
-                tweaked(e, |k| {
-                    if let EffectKind::Noise(n) = k {
-                        f(n);
-                    }
-                })
-            };
-            row(ui, 32.0, |ui| {
-                let resp = widgets::dropdown(ui, tr(nz.mode.label()), half * 2.0 + 8.0, None);
-                menu_popup(&resp).show(|ui| {
-                    for m in NoiseMode::ALL {
-                        if menu_item(ui, tr(m.label()), "") {
-                            set(app, with(&|n| n.mode = m), None);
-                            ui.close();
-                        }
-                    }
-                });
-            });
-            row(ui, 32.0, |ui| {
-                let ed = widgets::number_field(ui, Id::new(("fx_ns", i)), Lead::Text(tr("Size")), Some(nz.size), "", half, 0.1);
-                edit(app, ed, &|v| {
-                    with(&|n| {
-                        n.size = v.clamp(0.01, 1000.0);
-                        n.size_y = None;
-                    })
-                });
-                let ed =
-                    widgets::number_field(ui, Id::new(("fx_nd", i)), Lead::Text(tr("Density")), Some((nz.density * 100.0).round()), "%", half, 1.0);
-                edit(app, ed, &|v| with(&|n| n.density = (v / 100.0).clamp(0.0, 1.0)));
-            });
-            match nz.mode {
-                NoiseMode::Mono => row(ui, 32.0, |ui| fx_color(app, ui, ids, i, e, false, &edit_color)),
-                NoiseMode::Duo => {
-                    row(ui, 32.0, |ui| fx_color(app, ui, ids, i, e, false, &edit_color));
-                    row(ui, 32.0, |ui| fx_color(app, ui, ids, i, e, true, &edit_color));
-                }
-                NoiseMode::Multi => row(ui, 32.0, |ui| {
-                    let op = Some((f64::from(nz.opacity) * 100.0).round());
-                    let ed = widgets::number_field(ui, Id::new(("fx_no", i)), Lead::Text(tr("Opacity")), op, "%", half, 1.0);
-                    edit(app, ed, &|v| with(&|n| n.opacity = (v / 100.0).clamp(0.0, 1.0) as f32));
-                }),
-            }
-        }
-        EffectKind::Texture(tx) => {
-            let with = |f: &dyn Fn(&mut Texture)| {
-                tweaked(e, |k| {
-                    if let EffectKind::Texture(t) = k {
-                        f(t);
-                    }
-                })
-            };
-            row(ui, 32.0, |ui| {
-                let ed = widgets::number_field(ui, Id::new(("fx_ts", i)), Lead::Text(tr("Size")), Some(tx.size), "", half, 0.1);
-                edit(app, ed, &|v| {
-                    with(&|t| {
-                        t.size = v.clamp(0.01, 1000.0);
-                        t.size_y = None;
-                    })
-                });
-                let ed = widgets::number_field(ui, Id::new(("fx_tr", i)), Lead::Text(tr("Radius")), Some(tx.radius), "", half, 1.0);
-                edit(app, ed, &|v| with(&|t| t.radius = v.max(0.0)));
-            });
-            row(ui, 32.0, |ui| {
-                if widgets::checkbox(ui, tx.clip_to_shape, tr("Clip to shape")) {
-                    set(app, with(&|t| t.clip_to_shape = !tx.clip_to_shape), None);
-                }
-            });
-        }
-        EffectKind::Glass(g) => {
-            let with = |f: &dyn Fn(&mut Glass)| {
-                tweaked(e, |k| {
-                    if let EffectKind::Glass(gl) = k {
-                        f(gl);
-                    }
-                })
-            };
-            let pct = |v: f64| Some((v * 100.0).round());
-            let unit = |v: f64| (v / 100.0).clamp(0.0, 1.0);
-            row(ui, 32.0, |ui| {
-                let ed = widgets::number_field(ui, Id::new(("fx_gl", i)), Lead::Text(tr("Light|glass")), Some(g.light_angle.round()), "°", half, 1.0);
-                edit(app, ed, &|v| with(&|gl| gl.light_angle = v.clamp(-180.0, 180.0)));
-                let ed = widgets::number_field(ui, Id::new(("fx_gi", i)), Lead::None, pct(g.light_intensity), "%", half, 1.0);
-                edit(app, ed, &|v| with(&|gl| gl.light_intensity = unit(v)));
-            });
-            row(ui, 32.0, |ui| {
-                let ed = widgets::number_field(ui, Id::new(("fx_gr", i)), Lead::Text(tr("Refraction")), pct(g.refraction), "%", half, 1.0);
-                edit(app, ed, &|v| with(&|gl| gl.refraction = unit(v)));
-                let ed = widgets::number_field(ui, Id::new(("fx_gd", i)), Lead::Text(tr("Depth")), Some(g.depth), "", half, 1.0);
-                edit(app, ed, &|v| with(&|gl| gl.depth = v.clamp(1.0, 1000.0)));
-            });
-            row(ui, 32.0, |ui| {
-                let ed = widgets::number_field(ui, Id::new(("fx_gs", i)), Lead::Text(tr("Dispersion")), pct(g.dispersion), "%", half, 1.0);
-                edit(app, ed, &|v| with(&|gl| gl.dispersion = unit(v)));
-                let ed = widgets::number_field(ui, Id::new(("fx_gf", i)), Lead::Text(tr("Frost")), Some(g.frost), "", half, 1.0);
-                edit(app, ed, &|v| with(&|gl| gl.frost = v.clamp(0.0, 1000.0)));
-            });
-            row(ui, 32.0, |ui| {
-                let ed = widgets::number_field(ui, Id::new(("fx_gp", i)), Lead::Text(tr("Splay")), pct(g.splay), "%", half, 1.0);
-                edit(app, ed, &|v| with(&|gl| gl.splay = unit(v)));
-            });
-        }
-    }
-}
-
-/// Applies a new colour to an effect: (app, secondary colour, colour, scrubbing: `Some(done)`).
-type ColorEdit<'a> = dyn Fn(&mut FigApp, bool, figcraft_color::Color, Option<bool>) + 'a;
-
-/// `e` with `f` applied to its kind.
-fn tweaked(e: &Effect, f: impl FnOnce(&mut EffectKind)) -> Effect {
-    let mut e2 = e.clone();
-    f(&mut e2.kind);
-    e2
-}
-
-/// The swatch (opens the colour picker), hex and opacity of effect `i`'s colour (`secondary`: a
-/// duo noise's second colour), in the current row; `edit` applies a new one.
-fn fx_color(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], i: usize, e: &Effect, secondary: bool, edit: &ColorEdit<'_>) {
-    let Some(c) = e.color(secondary) else { return };
-    if widgets::swatch(ui, &Paint::solid(c), 16.0).clicked() {
-        app.ui.picker = Some(crate::colorpicker::PickerTarget::Effect { ids: ids.to_vec(), index: i, secondary });
-    }
-    if let Some(h) = widgets::text_field(ui, Id::new(("fx_c", i, secondary)), &c.to_hex(), 80.0, "")
-        && let Some(nc) = figcraft_color::Color::from_hex_or_name(&h)
-    {
-        edit(app, secondary, nc.with_alpha(c.a), None);
-    }
-    let alpha = |v: f64| c.with_alpha((v / 100.0).clamp(0.0, 1.0) as f32);
-    match widgets::number_field(ui, Id::new(("fx_a", i, secondary)), Lead::None, Some((f64::from(c.a) * 100.0).round()), "%", 56.0, 1.0) {
-        Some(FieldEdit::Set(v)) => edit(app, secondary, alpha(v), None),
-        Some(FieldEdit::Scrub(v, done)) => edit(app, secondary, alpha(v), Some(done)),
-        None => {}
-    }
-}
-
-fn grids(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
-    let ids = sel.to_vec();
-    let list = common(doc, sel, |n| n.grids.clone());
-    let empty = list.as_ref().is_none_or(|l| l.is_empty());
-    if let Some(i) = widgets::section_header(ui, tr("Layout grid"), &[(Icon::Styles, tr("Styles")), (Icon::Plus, tr("Add layout grid"))], empty) {
-        if i == 1 {
-            app.run("grid.add", json!({"ids": ids}));
-        } else {
-            style_picker::open(app, ui, &ids, StyleSlot::Grid);
-        }
-    }
-    style_picker::chip(app, ui, doc, &ids, StyleSlot::Grid);
-    let Some(list) = list else { return };
-    // The last grid first, like paints and effects; rows drag to reorder.
-    let mut drag = ListDrag::new(ui, "grids");
-    let mut removed = None;
-    for (i, g) in list.iter().enumerate().rev() {
-        let open_id = Id::new(("grid_open", i));
-        let mut open = ui.data(|d| d.get_temp::<bool>(open_id)).unwrap_or(false);
-        let header = row_rect(ui, 32.0, |ui| {
-            if icons::button(ui, Icon::Grid, 24.0, open, tr("Layout grid settings")).clicked() {
-                open = !open;
-                ui.data_mut(|d| d.insert_temp(open_id, open));
-            }
-            let w = ui.available_width() - 56.0;
-            let resp = widgets::dropdown(ui, &grid_label(g), w, None);
-            menu_popup(&resp).width(220.0).show(|ui| {
-                for (l, kind) in [(tr("Grid"), GridKind::Grid), (tr("Columns"), GridKind::Columns), (tr("Rows"), GridKind::Rows)] {
-                    if menu_item(ui, l, "") {
-                        let fresh = match kind {
-                            GridKind::Grid => LayoutGrid::default(),
-                            GridKind::Columns => LayoutGrid::columns(),
-                            GridKind::Rows => LayoutGrid::rows(),
-                        };
-                        app.set_props(&ids, json!({"grids": grids_with(&list, i, |x| *x = fresh)}));
-                        ui.close();
-                    }
-                }
-            });
-            if icons::button(ui, if g.visible { Icon::Eye } else { Icon::EyeOff }, 24.0, false, tr("Toggle")).clicked() {
-                app.set_props(&ids, json!({"grids": grids_with(&list, i, |x| x.visible = !x.visible)}));
-            }
-            if icons::button(ui, Icon::Minus, 24.0, false, tr("Remove")).clicked()
-                && app.run("grid.remove", json!({"ids": ids, "index": i})).is_some()
-            {
-                removed = Some(i);
-            }
-        });
-        if open {
-            grid_settings(app, ui, &ids, &list, i, g);
-        }
-        drag.row(ui, i, header, header.with_max_y(ui.cursor().min.y.max(header.max.y)), || grid_label(g));
-    }
-    if let Some((from, to)) = drag.finish(ui) {
-        app.run("grid.move", json!({"ids": ids, "from": from, "to": to}));
-        move_flags(ui, "grid_open", list.len(), from, to);
-    }
-    // Open settings stay with their grids, or go with theirs.
-    if let Some(i) = removed {
-        remove_flags(ui, "grid_open", list.len(), i);
-    }
-}
-
-/// A layout grid's name in its row ("Grid (10)", "5 columns").
-fn grid_label(g: &LayoutGrid) -> String {
-    match g.kind {
-        GridKind::Grid => trf("Grid ({size})", &[("size", &g.size)]),
-        GridKind::Columns if auto_count(g) => tr("Auto columns").to_string(),
-        GridKind::Rows if auto_count(g) => tr("Auto rows").to_string(),
-        GridKind::Columns => trn("{n} columns", g.count.max(1) as usize, &[]),
-        GridKind::Rows => trn("{n} rows", g.count.max(1) as usize, &[]),
-    }
-}
-
-/// Fixed-size columns or rows counted Auto: as many as fit.
-fn auto_count(g: &LayoutGrid) -> bool {
-    g.count == 0 && g.align != GridAlign::Stretch
-}
-
-/// `list` with grid `i` changed by `f`.
-fn grids_with(list: &[LayoutGrid], i: usize, f: impl FnOnce(&mut LayoutGrid)) -> Vec<LayoutGrid> {
-    let mut gs = list.to_vec();
-    if let Some(g) = gs.get_mut(i) {
-        f(g);
-    }
-    gs
-}
-
-/// Layout grid `i`'s settings: size (grids); count, type, width or height, margin or offset and
-/// gutter (columns and rows); colour. The numbers can be bound to number variables
-/// (`layoutGrids/<i>/<size|count|gutter|offset>`).
-fn grid_settings(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], list: &[LayoutGrid], i: usize, g: &LayoutGrid) {
-    let col = widgets::col_width(ui.available_width());
-    let set = |f: &dyn Fn(&mut LayoutGrid)| json!({"ids": ids, "props": {"grids": grids_with(list, i, f)}});
-    // One bindable number field, applied with `apply` (a scrub is one undo step).
-    let field = |app: &mut FigApp, ui: &mut Ui, name: &str, value: f64, apply: &dyn Fn(&mut LayoutGrid, f64)| {
-        let key = format!("layoutGrids/{i}/{name}");
-        let e = crate::variable_ui::number_field(app, ui, ids, &key, Id::new(("grid_field", name, i)), Lead::None, Some(value), "", col);
-        app.field_run(e, "node.set", |v| set(&|x| apply(x, v)));
-    };
-    let size = |x: &mut LayoutGrid, v: f64| x.size = v.max(1.0);
-    let offset = |x: &mut LayoutGrid, v: f64| x.offset = v.max(0.0);
-    let gutter = |x: &mut LayoutGrid, v: f64| x.gutter = v.max(0.0);
-    if g.kind == GridKind::Grid {
-        widgets::sublabels(ui, tr("Size"), None);
-        row(ui, 32.0, |ui| field(app, ui, "size", g.size, &size));
-    } else {
-        let cols = g.kind == GridKind::Columns;
-        widgets::sublabels(ui, tr("Count"), Some(tr("Type")));
-        row(ui, 32.0, |ui| {
-            // 0 is Auto for fixed-size columns (rows); a stretched grid has at least one.
-            let count = (!auto_count(g)).then(|| f64::from(g.count.max(1)));
-            let key = format!("layoutGrids/{i}/count");
-            let e =
-                crate::variable_ui::number_field_or(app, ui, ids, &key, Id::new(("grid_field", "count", i)), count, col, tr("Auto"), Lead::None, "");
-            app.field_run(e, "node.set", |v| {
-                set(&|x| x.count = if x.align == GridAlign::Stretch { v.round().clamp(1.0, 1000.0) } else { v.round().clamp(0.0, 1000.0) } as u32)
-            });
-            let names =
-                if cols { [tr("Stretch"), tr("Left"), tr("Center"), tr("Right")] } else { [tr("Stretch"), tr("Top"), tr("Center"), tr("Bottom")] };
-            let aligns = [GridAlign::Stretch, GridAlign::Min, GridAlign::Center, GridAlign::Max];
-            let cur = aligns.iter().position(|a| *a == g.align).unwrap_or(0);
-            let resp = widgets::dropdown(ui, names.get(cur).copied().unwrap_or_default(), col, None);
-            menu_popup(&resp).show(|ui| {
-                for (k, (name, a)) in names.iter().zip(aligns).enumerate() {
-                    if menu_check(ui, k == cur, name, "") {
-                        // Fixed-size columns need a size of their own.
-                        app.run(
-                            "node.set",
-                            set(&|x| {
-                                x.align = a;
-                                if a != GridAlign::Stretch && !(x.size.is_finite() && x.size > 0.0) {
-                                    x.size = 60.0;
-                                }
-                                if a == GridAlign::Stretch {
-                                    x.count = x.count.max(1);
-                                }
-                            }),
-                        );
-                        ui.close();
-                    }
-                }
-            });
-        });
-        let span = if cols { tr("Width") } else { tr("Height") };
-        match g.align {
-            GridAlign::Stretch => {
-                widgets::sublabels(ui, tr("Margin"), Some(tr("Gutter")));
-                row(ui, 32.0, |ui| {
-                    field(app, ui, "offset", g.offset, &offset);
-                    field(app, ui, "gutter", g.gutter, &gutter);
-                });
-            }
-            GridAlign::Center => {
-                widgets::sublabels(ui, span, Some(tr("Gutter")));
-                row(ui, 32.0, |ui| {
-                    field(app, ui, "size", g.size, &size);
-                    field(app, ui, "gutter", g.gutter, &gutter);
-                });
-            }
-            GridAlign::Min | GridAlign::Max => {
-                widgets::sublabels(ui, span, Some(tr("Offset")));
-                row(ui, 32.0, |ui| {
-                    field(app, ui, "size", g.size, &size);
-                    field(app, ui, "offset", g.offset, &offset);
-                });
-                widgets::sublabels(ui, tr("Gutter"), None);
-                row(ui, 32.0, |ui| field(app, ui, "gutter", g.gutter, &gutter));
-            }
-        }
-    }
-    // The colour: swatch, hex and alpha.
-    widgets::sublabels(ui, tr("Color"), None);
-    row(ui, 32.0, |ui| {
-        let (sw, _) = ui.allocate_exact_size(vec2(16.0, 16.0), Sense::hover());
-        widgets::paint_swatch(ui.painter(), sw, &Paint::solid(g.color));
-        if let Some(h) = widgets::text_field(ui, Id::new(("grid_hex", i)), &g.color.to_hex(), 80.0, "")
-            && let Some(c) = figcraft_color::Color::from_hex_or_name(&h)
-        {
-            app.run("node.set", set(&|x| x.color = c.with_alpha(x.color.a)));
-        }
-        let e = widgets::number_field(ui, Id::new(("grid_alpha", i)), Lead::None, Some((f64::from(g.color.a) * 100.0).round()), "%", 56.0, 1.0);
-        app.field_run(e, "node.set", |v| set(&|x| x.color = x.color.with_alpha((v / 100.0).clamp(0.0, 1.0) as f32)));
-    });
-}
-
-/// One group of inspected properties: label, value (with a swatch for colours) and the style or
-/// variable it comes from. Clicking a row copies its value.
-pub(crate) fn inspect_section(app: &mut FigApp, ui: &mut Ui, s: &figcraft_engine::devinspect::Section) {
-    let t = Tokens::get(ui.ctx());
-    widgets::separator(ui);
-    let (hr, _) = ui.allocate_exact_size(vec2(ui.available_width(), 32.0), Sense::hover());
-    ui.painter().text(pos2(hr.min.x + PAD, hr.center().y), Align2::LEFT_CENTER, tr(s.title), semibold(11.0), t.text);
-    for p in &s.rows {
-        prop_row(app, ui, p);
-    }
-    ui.add_space(4.0);
-}
-
-/// An inspected property row: label, value (with a swatch for colours) and the style or variable
-/// it comes from as a chip. Clicking it copies the value.
-pub(crate) fn prop_row(app: &mut FigApp, ui: &mut Ui, p: &figcraft_engine::devinspect::Prop) {
-    let t = Tokens::get(ui.ctx());
-    let (r, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 26.0), Sense::click());
-    let resp = resp.tip(trf("Copy {value}", &[("value", &p.value)]));
-    if resp.hovered() {
-        ui.painter().rect_filled(r.shrink2(vec2(8.0, 0.0)), CornerRadius::same(5), t.hover);
-    }
-    let painter = ui.painter();
-    // The engine's property labels ("Width") are keys of their own.
-    let label = tr(&p.label);
-    // Elided before the value column (some languages' labels run longer).
-    painter.text(
-        pos2(r.min.x + PAD, r.center().y),
-        Align2::LEFT_CENTER,
-        widgets::elide(ui, label, 96.0 - PAD - 6.0),
-        regular(11.0),
-        t.text_secondary,
-    );
-    // The style or variable, right-aligned as a chip.
-    let mut right = r.max.x - PAD;
-    if let Some(token) = &p.token {
-        let galley = painter.layout_no_wrap(token.clone(), regular(10.0), t.text_secondary);
-        let chip =
-            Rect::from_min_max(pos2((right - galley.size().x - 12.0).max(r.min.x + 196.0), r.center().y - 9.0), pos2(right, r.center().y + 9.0));
-        painter.rect_filled(chip, CornerRadius::same(4), t.field);
-        painter.with_clip_rect(chip.shrink2(vec2(6.0, 0.0))).galley(
-            pos2(chip.min.x + 6.0, chip.center().y - galley.size().y / 2.0),
-            galley,
-            t.text_secondary,
-        );
-        right = chip.min.x - 6.0;
-    }
-    let mut x = r.min.x + 96.0;
-    if let Some(c) = p.color.as_deref().and_then(figcraft_color::Color::from_hex) {
-        let sw = Rect::from_min_size(pos2(x, r.center().y - 6.0), vec2(12.0, 12.0));
-        widgets::paint_swatch(painter, sw, &Paint::solid(c));
-        x += 18.0;
-    }
-    let value_r = Rect::from_min_max(pos2(x, r.min.y), pos2(right.max(x + 10.0), r.max.y));
-    painter.with_clip_rect(value_r).text(pos2(x, r.center().y), Align2::LEFT_CENTER, &p.value, regular(11.0), t.text);
-    if resp.clicked() {
-        app.services.clipboard_set_text(&p.value);
-        app.toast(trf("Copied {value}", &[("value", &label.to_lowercase())]));
-    }
-}
-
-/// The selection's assets (layers with export settings, icons, images): click one to export it,
-/// or export them all.
-fn inspect_assets(app: &mut FigApp, ui: &mut Ui, assets: &[figcraft_engine::devinspect::Asset]) {
-    let t = Tokens::get(ui.ctx());
-    widgets::separator(ui);
-    let export_all = [(Icon::Export, tr("Export all"))];
-    let all = widgets::section_header(ui, tr("Assets"), if assets.is_empty() { &[] } else { &export_all }, false).is_some();
-    if assets.is_empty() {
-        widgets::note(ui, tr("No assets: no export settings, icons or images. Add export settings in the Design tab."), t.text_secondary);
-        return;
-    }
-    let mut export: Option<Vec<NodeId>> = all.then(|| assets.iter().map(|a| a.id).collect());
-    for a in assets {
-        let (r, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 26.0), Sense::click());
-        let resp = resp.tip(trf("Export {name}", &[("name", &a.name)]));
-        if resp.hovered() {
-            ui.painter().rect_filled(r.shrink2(vec2(8.0, 0.0)), CornerRadius::same(5), t.hover);
-            icons::paint(ui.painter(), Rect::from_center_size(pos2(r.max.x - PAD - 6.0, r.center().y), vec2(12.0, 12.0)), Icon::Export, t.icon);
-        }
-        let name_r = Rect::from_min_max(pos2(r.min.x + PAD, r.min.y), pos2(r.min.x + 96.0 - 4.0, r.max.y));
-        ui.painter().with_clip_rect(name_r).text(pos2(name_r.min.x, r.center().y), Align2::LEFT_CENTER, &a.name, regular(11.0), t.text);
-        let fmt_r = Rect::from_min_max(pos2(r.min.x + 96.0, r.min.y), pos2(r.max.x - PAD - 16.0, r.max.y));
-        ui.painter().with_clip_rect(fmt_r).text(
-            pos2(fmt_r.min.x, r.center().y),
-            Align2::LEFT_CENTER,
-            a.exports.join(", "),
-            regular(11.0),
-            t.text_secondary,
-        );
-        if resp.clicked() {
-            export = Some(vec![a.id]);
-        }
-    }
-    if let Some(ids) = export {
-        crate::export_panel::export_layers(app, &ids, true);
-    }
-    ui.add_space(4.0);
-}
-
-/// The Inspect tab (Dev Mode): the handoff status, annotations, properties, assets and code of
-/// the selected layer, or the list of what's ready for dev.
-fn inspect(app: &mut FigApp, ui: &mut Ui) {
-    let t = Tokens::get(ui.ctx());
-    let Ok(ds) = app.session.ds() else { return };
-    let doc = ds.doc.clone();
-    let sel = ds.selection.clone();
-    let Some(first) = sel.first().copied() else {
-        widgets::section_header(ui, tr("Inspect"), &[], false);
-        widgets::note(ui, tr("Select a layer to see its properties and code"), t.text_secondary);
-        widgets::note(ui, tr("Hover other layers to measure the distance"), t.text_secondary);
-        crate::dev_mode::ready_list(app, ui);
-        crate::dev_mode::categories_section(app, ui);
-        crate::dev_mode::plugins_section(app, ui);
-        return;
-    };
-    let name = doc.node(first).map(|n| n.name.clone()).unwrap_or_default();
-    widgets::section_header(ui, &name, &[], false);
-    crate::dev_mode::status(app, ui, &doc, &sel);
-    crate::dev_mode::annotations_section(app, ui, &doc, first);
-    crate::dev_mode::dev_resources_section(app, ui, &doc, first);
-    use figcraft_engine::devinspect::ColorFormat;
-    let fmt_id = Id::new("inspect_color_format");
-    let fmt = ui.data(|d| d.get_temp::<usize>(fmt_id)).and_then(|i| ColorFormat::ALL.get(i).copied()).unwrap_or_default();
-    row(ui, 32.0, |ui| {
-        widgets::label(ui, tr("Color format"), t.text_secondary);
-        let resp = widgets::dropdown(ui, fmt.label(), 72.0, None);
-        menu_popup(&resp).show(|ui| {
-            for (i, f) in ColorFormat::ALL.iter().enumerate() {
-                if menu_item(ui, f.label(), "") {
-                    ui.data_mut(|d| d.insert_temp(fmt_id, i));
-                    ui.close();
-                }
-            }
-        });
-    });
-    for s in figcraft_engine::devinspect::properties_with(&doc, first, fmt) {
-        inspect_section(app, ui, &s);
-    }
-    inspect_assets(app, ui, &figcraft_engine::devinspect::assets(&doc, &sel));
-    use figcraft_engine::codegen::CodeLang;
-    let lang_id = Id::new("inspect_lang");
-    let lang = ui.data(|d| d.get_temp::<usize>(lang_id)).and_then(|i| CodeLang::ALL.get(i).copied()).unwrap_or_default();
-    // A component tried with other property values: its code replaces the layer's below.
-    let played = crate::dev_mode::playground_section(app, ui, &doc, first, lang);
-    widgets::separator(ui);
-    let copy = widgets::section_header(ui, tr("Code"), &[(Icon::Export, tr("Copy"))], false).is_some();
-    // Pixels or rem (of a 16 px root) for the web languages.
-    let rem_id = Id::new("inspect_rem");
-    let web = lang.is_web();
-    let rem = web && ui.data(|d| d.get_temp::<bool>(rem_id)).unwrap_or(false);
-    row(ui, 32.0, |ui| {
-        let resp = widgets::dropdown(ui, lang.label(), 120.0, Some(Icon::Code));
-        menu_popup(&resp).show(|ui| {
-            for (i, l) in CodeLang::ALL.iter().enumerate() {
-                if menu_item(ui, l.label(), "") {
-                    ui.data_mut(|d| d.insert_temp(lang_id, i));
-                    ui.close();
-                }
-            }
-        });
-        if web {
-            let resp = widgets::dropdown(ui, if rem { "rem" } else { "px" }, 56.0, None);
-            menu_popup(&resp).show(|ui| {
-                for (on, label) in [(false, "px"), (true, "rem")] {
-                    if menu_item(ui, label, "") {
-                        ui.data_mut(|d| d.insert_temp(rem_id, on));
-                        ui.close();
-                    }
-                }
-            });
-        }
-    });
-    let code = played.unwrap_or_else(|| crate::dev_mode::code(app, ui, first, lang));
-    let code = if rem { figcraft_engine::codegen::px_to_rem(&code, 16.0) } else { code };
-    egui::Frame::NONE
-        .fill(t.field)
-        .corner_radius(CornerRadius::same(6))
-        .inner_margin(egui::Margin::same(10))
-        .outer_margin(egui::Margin::symmetric(16, 0))
-        .show(ui, |ui| {
-            ui.label(egui::RichText::new(&code).monospace().color(t.text));
-        });
-    ui.add_space(8.0);
-    let mut copy_clicked = copy;
-    row(ui, 32.0, |ui| {
-        copy_clicked |= ui.button(trf("Copy {value}", &[("value", &lang.label())])).clicked();
-    });
-    if copy_clicked {
-        app.services.clipboard_set_text(&code);
-        app.toast(trf("Copied {value}", &[("value", &lang.label())]));
-    }
-    crate::dev_mode::connect_section(app, ui, &doc, first, lang);
-    crate::dev_mode::plugins_section(app, ui);
-}
diff --git a/crates/ui-egui/src/rtl_names_tests.rs b/crates/ui-egui/src/rtl_names_tests.rs
deleted file mode 100644
index 4b117511..00000000
--- a/crates/ui-egui/src/rtl_names_tests.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-//! Right-to-left and mixed-direction names: elided display and the rename field's visual caret,
-//! driven through egui headless.
-
-use egui::{Event, Key, Modifiers, Pos2, RawInput, Rect, vec2};
-
-use super::*;
-use crate::theme::regular;
-
-fn frame(ctx: &egui::Context, events: Vec<Event>, mut f: impl FnMut(&mut Ui)) {
-    let input = RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), events, ..Default::default() };
-    ctx.run_ui(input, |ui| f(ui)).textures_delta.clear();
-}
-
-fn key(k: Key, shift: bool) -> Event {
-    Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers: if shift { Modifiers::SHIFT } else { Modifiers::NONE } }
-}
-
-fn caret(ctx: &egui::Context, id: Id) -> (usize, usize) {
-    let r = egui::TextEdit::load_state(ctx, id).and_then(|s| s.cursor.char_range()).unwrap_or_default();
-    (r.primary.index.0, r.secondary.index.0)
-}
-
-fn set_caret(ctx: &egui::Context, id: Id, i: usize) {
-    let mut s = egui::TextEdit::load_state(ctx, id).unwrap_or_default();
-    s.cursor.set_char_range(Some(CCursorRange::one(CCursor::new(i))));
-    s.store(ctx, id);
-}
-
-#[test]
-fn names_elide_at_their_end() {
-    let ctx = egui::Context::default();
-    frame(&ctx, vec![], |ui| {
-        let p = ui.painter();
-        let g = name_galley(p, "Rectangle with a rather long name", regular(11.0), Color32::WHITE, 60.0);
-        assert!(g.elided);
-        assert!(g.size().x <= 61.0);
-        let g = name_galley(p, "Frame", regular(11.0), Color32::WHITE, 200.0);
-        assert_eq!(g.text(), "Frame");
-        // Right to left: shown in visual order; cut names keep their start, at the right.
-        let g = name_galley(p, "שלום", regular(11.0), Color32::WHITE, 500.0);
-        assert_eq!(g.text(), "םולש");
-        let g = name_galley(p, "שלום עולם ומלואו", regular(11.0), Color32::WHITE, 40.0);
-        assert!(g.text().starts_with('…'), "{}", g.text());
-        assert!(g.size().x <= 41.0);
-        // Arabic letters join.
-        let g = name_galley(p, "سلام", regular(11.0), Color32::WHITE, 500.0);
-        assert_eq!(g.text(), "\u{FEE1}\u{FEFC}\u{FEB3}");
-    });
-}
-
-#[test]
-fn rename_caret_moves_visually() {
-    let ctx = egui::Context::default();
-    let id = Id::new("rename_test");
-    let mut text = "abc אבג".to_string();
-    let run = |events: Vec<Event>, text: &mut String| {
-        frame(&ctx, events, |ui| {
-            ui.memory_mut(|m| m.request_focus(id));
-            single_line(ui, id, text, regular(11.0), 200.0);
-        });
-    };
-    run(vec![], &mut text);
-    run(vec![], &mut text);
-    set_caret(&ctx, id, 3);
-    // Right from the space: into the Hebrew word at its visual left, which is its logical end.
-    run(vec![key(Key::ArrowRight, false)], &mut text);
-    assert_eq!(caret(&ctx, id).0, 7);
-    run(vec![key(Key::ArrowRight, false)], &mut text);
-    assert_eq!(caret(&ctx, id).0, 6);
-    // Shift extends from where the caret was.
-    run(vec![key(Key::ArrowRight, true)], &mut text);
-    assert_eq!(caret(&ctx, id), (5, 6));
-    // Without Shift a selection collapses to its side.
-    run(vec![key(Key::ArrowLeft, false)], &mut text);
-    assert_eq!(caret(&ctx, id), (6, 6));
-    run(vec![key(Key::ArrowLeft, false), key(Key::ArrowLeft, false)], &mut text);
-    assert_eq!(caret(&ctx, id).0, 3);
-    // Typing still goes in at the caret.
-    run(vec![Event::Text("ד".into())], &mut text);
-    assert_eq!(text, "abcד אבג");
-    // Plain left-to-right text keeps egui's own caret.
-    let mut latin = "Frame".to_string();
-    let lid = Id::new("latin");
-    let mut run = |events: Vec<Event>| {
-        frame(&ctx, events, |ui| {
-            ui.memory_mut(|m| m.request_focus(lid));
-            single_line(ui, lid, &mut latin, regular(11.0), 200.0);
-        });
-    };
-    run(vec![]);
-    run(vec![]);
-    set_caret(&ctx, lid, 1);
-    run(vec![key(Key::ArrowRight, false)]);
-    assert_eq!(caret(&ctx, lid).0, 2);
-}
-
-#[test]
-fn clicks_place_the_caret_by_what_is_shown() {
-    let ctx = egui::Context::default();
-    let id = Id::new("click_test");
-    let mut text = "שלום".to_string();
-    let mut rect = Rect::NOTHING;
-    let run = |events: Vec<Event>, text: &mut String, rect: &mut Rect| {
-        frame(&ctx, events, |ui| {
-            ui.memory_mut(|m| m.request_focus(id));
-            *rect = single_line(ui, id, text, regular(11.0), 200.0).rect;
-        });
-    };
-    run(vec![], &mut text, &mut rect);
-    run(vec![], &mut text, &mut rect);
-    // The text's right end is its start.
-    let galley = ctx.fonts_mut(|f| f.layout_no_wrap("םולש".into(), regular(11.0), Color32::WHITE));
-    let right = Pos2::new(rect.min.x + galley.size().x - 1.0, rect.center().y);
-    let press = |p: Pos2, pressed: bool| Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Modifiers::NONE };
-    run(vec![Event::PointerMoved(right), press(right, true)], &mut text, &mut rect);
-    run(vec![press(right, false)], &mut text, &mut rect);
-    assert_eq!(caret(&ctx, id).0, 0);
-    let left = Pos2::new(rect.min.x + 1.0, rect.center().y);
-    run(vec![Event::PointerMoved(left), press(left, true)], &mut text, &mut rect);
-    run(vec![press(left, false)], &mut text, &mut rect);
-    assert_eq!(caret(&ctx, id).0, 4);
-}
-
-#[test]
-fn words_for_double_click() {
-    assert_eq!(word_at("abc אבג", 5), (4, 7));
-    assert_eq!(word_at("abc אבג", 7), (4, 7));
-    assert_eq!(word_at("abc אבג", 1), (0, 3));
-    assert_eq!(word_at("a  b", 2), (2, 3));
-    assert_eq!(word_at("", 3), (0, 0));
-}
-
-/// egui shapes runs of one font itself (reversing right-to-left ones): shown names are laid out a
-/// cluster at a time, in the order computed here, one glyph per shown char.
-#[test]
-fn shown_glyphs_keep_the_visual_order() {
-    let ctx = egui::Context::default();
-    frame(&ctx, vec![], |ui| {
-        for name in
-            ["\u{05D0}\u{05D1}", "abc \u{05D0}\u{05D1}\u{05D2} (1)", "\u{0633}\u{0644}\u{0627}\u{0645} \u{0639}\u{0644}\u{064A}\u{0643}\u{0645}"]
-        {
-            let v = display::visual_line(name);
-            let g = visual_galley(ui.painter(), &v, &regular(11.0), Color32::WHITE);
-            let glyphs: Vec<(char, f32)> = g.rows.iter().flat_map(|r| r.row.glyphs.iter().map(|gl| (gl.chr, gl.pos.x))).collect();
-            assert_eq!(glyphs.iter().map(|g| g.0).collect::<String>(), v.text, "{name}");
-            assert!(glyphs.windows(2).all(|w| w[0].1 <= w[1].1), "{name}: left to right");
-        }
-    });
-}
diff --git a/crates/ui-egui/src/save_as_tests.rs b/crates/ui-egui/src/save_as_tests.rs
new file mode 100644
index 00000000..8817ab1c
--- /dev/null
+++ b/crates/ui-egui/src/save_as_tests.rs
@@ -0,0 +1,320 @@
+//! Native Save as accepts both file formats; .fig copies preserve native save state.
+
+use std::path::PathBuf;
+use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::{Arc, Mutex};
+
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::dialogs::file_saved;
+use crate::{DialogFuture, FigApp, Services};
+
+type Picks = Arc<Mutex<Vec<(String, String, Vec<String>)>>>;
+
+struct Picker {
+    path: Option<PathBuf>,
+    picks: Picks,
+}
+
+impl Services for Picker {
+    fn pick_save(&mut self, title: &str, name: &str, exts: &[&str]) -> DialogFuture {
+        self.picks.lock().unwrap().push((title.into(), name.into(), exts.iter().map(|e| (*e).into()).collect()));
+        Box::pin(std::future::ready(self.path.take()))
+    }
+}
+
+struct Temp(PathBuf);
+
+impl Temp {
+    fn new() -> Self {
+        static NEXT: AtomicU64 = AtomicU64::new(0);
+        let stamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+        let path = std::env::temp_dir().join(format!("figcraft-save-as-{}-{stamp}-{}", std::process::id(), NEXT.fetch_add(1, Ordering::Relaxed)));
+        std::fs::create_dir(&path).unwrap();
+        Self(path)
+    }
+
+    fn path(&self, name: &str) -> PathBuf {
+        self.0.join(name)
+    }
+}
+
+impl Drop for Temp {
+    fn drop(&mut self) {
+        if let Ok(files) = std::fs::read_dir(&self.0) {
+            for file in files.flatten() {
+                let _ = std::fs::remove_file(file.path());
+            }
+        }
+        let _ = std::fs::remove_dir(&self.0);
+    }
+}
+
+fn session() -> Session {
+    let mut s = Session::new();
+    s.doc_mut().unwrap().name = "Prototype".into();
+    s.execute("shape.rectangle", &json!({"width": 100, "height": 80})).unwrap();
+    s
+}
+
+fn picker(path: Option<PathBuf>) -> (Picker, Picks) {
+    let picks = Picks::default();
+    (Picker { path, picks: picks.clone() }, picks)
+}
+
+fn app(path: Option<PathBuf>) -> (FigApp, Picks) {
+    let (picker, picks) = picker(path);
+    (FigApp::new(session(), Box::new(picker)), picks)
+}
+
+fn toast(app: &FigApp) -> &str {
+    &app.ui.toast.as_ref().unwrap().0
+}
+
+fn expected_picker() -> Vec<(String, String, Vec<String>)> {
+    vec![("Save as".into(), "Prototype.figcraft".into(), vec!["figcraft".into(), "fig".into()])]
+}
+
+#[test]
+fn save_as_menu_and_first_save_open_the_platform_picker_directly_with_both_extensions() {
+    for action in ["direct", "menu", "first"] {
+        let (mut app, picks) = app(None);
+        let before = app.session.doc().unwrap().clone();
+        match action {
+            "direct" => app.save_as_dialog(),
+            "menu" => crate::menus::invoke(&mut app, "file.saveAs"),
+            "first" => app.save(),
+            _ => panic!("unknown save action {action}"),
+        }
+        app.poll_dialog(&egui::Context::default());
+        assert_eq!(*picks.lock().unwrap(), expected_picker());
+        assert_eq!(app.session.doc().unwrap(), &before);
+        assert!(app.session.ds().unwrap().path.is_none());
+        assert!(app.session.ds().unwrap().is_dirty());
+        assert!(app.ui.toast.is_none());
+    }
+}
+
+#[test]
+fn a_pathless_engine_request_uses_the_same_platform_picker() {
+    let (mut app, picks) = app(None);
+    let before = app.session.doc().unwrap().clone();
+    assert!(app.run("file.saveAs", json!({})).is_none(), "the engine requests the UI and refuses a pathless programmatic save");
+    app.poll_dialog(&egui::Context::default());
+    assert_eq!(*picks.lock().unwrap(), expected_picker());
+    assert_eq!(app.session.doc().unwrap(), &before);
+    assert!(app.session.ds().unwrap().path.is_none());
+    assert!(app.session.ds().unwrap().is_dirty());
+}
+
+#[test]
+fn native_paths_and_an_extensionless_default_save_native_files_and_show_the_written_name() {
+    let temp = Temp::new();
+    for (chosen, written) in [("native", "native.figcraft"), ("saved.figcraft", "saved.figcraft"), ("upper.FIGCRAFT", "upper.FIGCRAFT")] {
+        let (mut app, picks) = app(Some(temp.path(chosen)));
+        app.save_as_dialog();
+        app.poll_dialog(&egui::Context::default());
+        let path = temp.path(written);
+        assert_eq!(*picks.lock().unwrap(), expected_picker());
+        assert!(path.is_file());
+        assert_eq!(app.session.ds().unwrap().path.as_deref(), path.to_str());
+        assert!(!app.session.ds().unwrap().is_dirty());
+        assert_eq!(toast(&app), format!("Saved {written}"));
+        let mut reopened = Session::empty();
+        reopened.execute("file.open", &json!({"path": path})).unwrap();
+        assert_eq!(reopened.doc().unwrap().nodes().count(), app.session.doc().unwrap().nodes().count());
+        assert_eq!(reopened.doc().unwrap().name, "Prototype");
+    }
+}
+
+#[test]
+fn returned_fig_paths_export_real_copies_without_changing_native_save_state() {
+    let temp = Temp::new();
+    for name in ["copy.fig", "upper.FIG"] {
+        let path = temp.path(name);
+        let (mut app, picks) = app(Some(path.clone()));
+        let native = temp.path("working.figcraft").to_string_lossy().into_owned();
+        app.session.ds_mut().unwrap().path = Some(native.clone());
+        let before = app.session.doc().unwrap().clone();
+        app.save_as_dialog();
+        app.poll_dialog(&egui::Context::default());
+        assert_eq!(*picks.lock().unwrap(), expected_picker());
+        assert!(path.is_file());
+        assert_eq!(app.session.doc().unwrap(), &before);
+        assert_eq!(app.session.ds().unwrap().path.as_deref(), Some(native.as_str()));
+        assert!(app.session.ds().unwrap().is_dirty());
+        assert_eq!(toast(&app), format!("Exported {name}"));
+        let mut reopened = Session::empty();
+        reopened.execute("file.open", &json!({"path": path})).unwrap();
+        assert_eq!(reopened.doc().unwrap().nodes().count(), before.nodes().count());
+    }
+}
+
+#[test]
+fn a_fig_copy_reports_actual_engine_warnings_and_keeps_the_original_content() {
+    let temp = Temp::new();
+    let (mut app, _) = app(Some(temp.path("comments.fig")));
+    app.run("comment.add", json!({"x": 10, "y": 20, "text": "Synthetic comment"})).unwrap();
+    let before = app.session.doc().unwrap().clone();
+    app.save_as_dialog();
+    app.poll_dialog(&egui::Context::default());
+    assert!(temp.path("comments.fig").is_file());
+    assert_eq!(toast(&app), "Exported comments.fig; 1 kind of content was left out");
+    assert_eq!(app.session.doc().unwrap(), &before);
+    assert_eq!(app.session.doc().unwrap().comments.len(), 1);
+    assert!(app.session.ds().unwrap().path.is_none());
+    assert!(app.session.ds().unwrap().is_dirty());
+}
+
+#[test]
+fn cancelling_the_platform_dialog_preserves_document_selection_path_and_dirty_state() {
+    let (mut app, picks) = app(None);
+    app.session.ds_mut().unwrap().path = Some("working.figcraft".into());
+    let before = app.session.doc().unwrap().clone();
+    let selection = app.session.ds().unwrap().selection.clone();
+    app.save_as_dialog();
+    app.poll_dialog(&egui::Context::default());
+    assert_eq!(*picks.lock().unwrap(), expected_picker());
+    assert_eq!(app.session.doc().unwrap(), &before);
+    assert_eq!(app.session.ds().unwrap().selection, selection);
+    assert_eq!(app.session.ds().unwrap().path.as_deref(), Some("working.figcraft"));
+    assert!(app.session.ds().unwrap().is_dirty());
+    assert!(app.ui.toast.is_none());
+}
+
+#[test]
+fn unsupported_extensions_are_rejected_without_overwriting_the_chosen_file() {
+    let temp = Temp::new();
+    for name in ["wrong.svg", "wrong.png"] {
+        let path = temp.path(name);
+        std::fs::write(&path, b"existing document").unwrap();
+        let (mut app, _) = app(Some(path.clone()));
+        let before = app.session.doc().unwrap().clone();
+        app.save_as_dialog();
+        app.poll_dialog(&egui::Context::default());
+        assert_eq!(std::fs::read(&path).unwrap(), b"existing document");
+        assert_eq!(app.session.doc().unwrap(), &before);
+        assert!(app.session.ds().unwrap().path.is_none());
+        assert!(app.session.ds().unwrap().is_dirty());
+        assert_eq!(toast(&app), "Use the .figcraft or .fig extension.");
+    }
+}
+
+#[test]
+fn adding_the_default_extension_never_overwrites_another_existing_path_without_confirmation() {
+    let temp = Temp::new();
+    let path = temp.path("existing.figcraft");
+    std::fs::write(&path, b"existing document").unwrap();
+    let (mut app, _) = app(Some(temp.path("existing")));
+    app.save_as_dialog();
+    app.poll_dialog(&egui::Context::default());
+    assert_eq!(std::fs::read(&path).unwrap(), b"existing document");
+    assert!(!temp.path("existing").exists());
+    assert!(app.session.ds().unwrap().path.is_none());
+    assert!(app.session.ds().unwrap().is_dirty());
+    assert_eq!(toast(&app), "A .figcraft file with this name already exists. Choose its full name to confirm replacement.");
+}
+
+#[test]
+fn fig_save_results_report_the_actual_name_and_plural_warning_count_without_marking_native_state_saved() {
+    let (mut app, _) = app(None);
+    let before = app.session.doc().unwrap().clone();
+    app.session.ds_mut().unwrap().path = Some("working.figcraft".into());
+    file_saved(&mut app, &json!({"format": "fig", "path": "written.fig", "warnings": ["synthetic warning", "another synthetic warning"]}));
+    assert_eq!(toast(&app), "Exported written.fig; 2 kinds of content were left out");
+    assert_eq!(app.session.doc().unwrap(), &before);
+    assert_eq!(app.session.ds().unwrap().path.as_deref(), Some("working.figcraft"));
+    assert!(app.session.ds().unwrap().is_dirty());
+}
+
+#[test]
+fn save_with_a_native_path_keeps_using_it_without_a_dialog() {
+    let temp = Temp::new();
+    let (mut app, picks) = app(None);
+    let path = temp.path("working.figcraft");
+    app.run("file.saveAs", json!({"path": path})).unwrap();
+    app.run("shape.rectangle", json!({"width": 10, "height": 20})).unwrap();
+    assert!(app.session.ds().unwrap().is_dirty());
+    app.save();
+    assert!(picks.lock().unwrap().is_empty());
+    assert_eq!(app.session.ds().unwrap().path.as_deref(), path.to_str());
+    assert!(!app.session.ds().unwrap().is_dirty());
+    assert_eq!(toast(&app), "Saved");
+}
+
+#[test]
+fn saving_legacy_fig_paths_keeps_the_success_toast_and_original_source_bytes() {
+    for legacy_name in ["legacy.fig", "legacy.FIG"] {
+        for destination in ["corrected.figcraft", "copy.fig"] {
+            let temp = Temp::new();
+            let target = temp.path(destination);
+            let legacy = temp.path(legacy_name);
+            let (mut app, picks) = app(Some(target.clone()));
+            let original = temp.path("original.figcraft");
+            app.run("file.saveAs", json!({"path": original})).unwrap();
+            std::fs::rename(&original, &legacy).unwrap();
+            let legacy_path = legacy.to_string_lossy().into_owned();
+            app.session.ds_mut().unwrap().path = Some(legacy_path.clone());
+            app.run("shape.rectangle", json!({"width": 10, "height": 20})).unwrap();
+            let before = app.session.doc().unwrap().clone();
+            let legacy_bytes = std::fs::read(&legacy).unwrap();
+            app.save();
+            app.poll_dialog(&egui::Context::default());
+            assert_eq!(*picks.lock().unwrap(), expected_picker());
+            assert_eq!(std::fs::read(&legacy).unwrap(), legacy_bytes);
+            assert!(target.is_file());
+            assert!(app.ui.last_error.is_none());
+            assert_eq!(app.session.doc().unwrap(), &before);
+            if destination == "corrected.figcraft" {
+                assert_eq!(toast(&app), "Saved corrected.figcraft");
+                assert_eq!(app.session.ds().unwrap().path.as_deref(), target.to_str());
+                assert!(!app.session.ds().unwrap().is_dirty());
+            } else {
+                assert_eq!(toast(&app), "Exported copy.fig");
+                assert_eq!(app.session.ds().unwrap().path.as_deref(), Some(legacy_path.as_str()));
+                assert!(app.session.ds().unwrap().is_dirty());
+            }
+        }
+    }
+}
+
+#[test]
+fn failed_writes_surface_the_engine_error_and_keep_the_document_dirty() {
+    let temp = Temp::new();
+    for extension in ["figcraft", "fig"] {
+        let path = temp.path(&format!("missing/copy.{extension}"));
+        let (mut app, _) = app(Some(path.clone()));
+        let before = app.session.doc().unwrap().clone();
+        app.save_as_dialog();
+        app.poll_dialog(&egui::Context::default());
+        assert!(!path.exists());
+        assert_eq!(app.session.doc().unwrap(), &before);
+        assert!(app.session.ds().unwrap().path.is_none());
+        assert!(app.session.ds().unwrap().is_dirty());
+        assert_eq!(app.ui.last_error.as_deref(), Some(toast(&app)));
+        assert!(!toast(&app).starts_with("Saved") && !toast(&app).starts_with("Exported"));
+    }
+}
+
+#[test]
+fn an_empty_destination_is_rejected_without_writing_or_changing_save_state() {
+    let (mut app, _) = app(Some(PathBuf::new()));
+    let before = app.session.doc().unwrap().clone();
+    app.save_as_dialog();
+    app.poll_dialog(&egui::Context::default());
+    assert_eq!(app.session.doc().unwrap(), &before);
+    assert!(app.session.ds().unwrap().path.is_none());
+    assert!(app.session.ds().unwrap().is_dirty());
+    assert_eq!(toast(&app), "Use the .figcraft or .fig extension.");
+}
+
+#[test]
+fn save_as_with_no_document_never_opens_a_dialog() {
+    let (picker, picks) = picker(None);
+    let mut app = FigApp::new(Session::empty(), Box::new(picker));
+    app.save_as_dialog();
+    app.poll_dialog(&egui::Context::default());
+    assert!(picks.lock().unwrap().is_empty());
+    assert!(app.ui.toast.is_none());
+}
diff --git a/crates/ui-egui/src/select_all_tests.rs b/crates/ui-egui/src/select_all_tests.rs
index f3606c1c..d86de12d 100644
--- a/crates/ui-egui/src/select_all_tests.rs
+++ b/crates/ui-egui/src/select_all_tests.rs
@@ -45,10 +45,11 @@ fn selection(ctx: &egui::Context, te: Id) -> Option<(usize, usize)> {
     Some((a.min(b), a.max(b)))
 }
 
+/// Asserts clicking a hex field focuses it and selects all six characters.
 #[test]
 fn a_click_into_a_hex_field_selects_it_all() {
     let ctx = egui::Context::default();
-    let id = Id::new("hex");
+    let id = Id::unique("hex");
     let mut f = |ui: &mut Ui| {
         widgets::text_field(ui, id, "D9D9D9", 120.0, "");
     };
@@ -57,11 +58,12 @@ fn a_click_into_a_hex_field_selects_it_all() {
     assert_eq!(selection(&ctx, id.with("te")), Some((0, 6)));
 }
 
+/// Asserts clicking an inline field selects it all and typing replaces the selection.
 #[test]
 fn a_click_into_an_inline_field_selects_it_all() {
     // A fill's hex in the Design panel, a variable's value, a rename.
     let ctx = egui::Context::default();
-    let id = Id::new("fill_hex");
+    let id = Id::unique("fill_hex");
     let mut f = |ui: &mut Ui| {
         widgets::text_field_inline(ui, id, "0D99FF", FIELD.shrink2(vec2(8.0, 4.0)), egui::FontId::proportional(11.0));
     };
@@ -75,10 +77,11 @@ fn a_click_into_an_inline_field_selects_it_all() {
     assert_eq!(out.as_deref(), Some("red"));
 }
 
+/// Asserts clicking a search box selects its whole query.
 #[test]
 fn a_click_into_a_search_box_selects_its_query() {
     let ctx = egui::Context::default();
-    let id = Id::new("search");
+    let id = Id::unique("search");
     let mut q = String::from("button");
     let mut f = |ui: &mut Ui| {
         widgets::text_input(ui, id, &mut q, 120.0, "Search");
@@ -87,10 +90,11 @@ fn a_click_into_a_search_box_selects_its_query() {
     assert_eq!(selection(&ctx, id), Some((0, 6)));
 }
 
+/// Asserts Tab focus selects a field's whole value.
 #[test]
 fn tab_into_a_field_selects_it_all() {
     let ctx = egui::Context::default();
-    let id = Id::new("tabbed");
+    let id = Id::unique("tabbed");
     let mut q = String::from("Frame 1");
     let mut f = |ui: &mut Ui| {
         let r = widgets::text_input(ui, id, &mut q, 120.0, "");
@@ -106,10 +110,11 @@ fn tab_into_a_field_selects_it_all() {
     assert_eq!(selection(&ctx, id), Some((0, 7)));
 }
 
+/// Asserts a drag selects a non-empty proper subrange rather than the whole value.
 #[test]
 fn a_drag_selects_only_what_it_covers() {
     let ctx = egui::Context::default();
-    let id = Id::new("dragged");
+    let id = Id::unique("dragged");
     let mut q = String::from("a long search query");
     let mut f = |ui: &mut Ui| {
         widgets::text_input(ui, id, &mut q, 120.0, "");
@@ -120,10 +125,11 @@ fn a_drag_selects_only_what_it_covers() {
     assert!(!(a == 0 && b == q.chars().count()), "not all of it: {a}..{b}");
 }
 
+/// Asserts re-clicking a field after focus was lost mid-edit selects all.
 #[test]
 fn a_field_left_mid_edit_selects_all_on_the_next_click() {
     let ctx = egui::Context::default();
-    let id = Id::new("fill_hex");
+    let id = Id::unique("fill_hex");
     let mut f = |ui: &mut Ui| {
         widgets::text_field_inline(ui, id, "0D99FF", FIELD.shrink2(vec2(8.0, 4.0)), egui::FontId::proportional(11.0));
     };
diff --git a/crates/ui-egui/src/selection_spacing_tests.rs b/crates/ui-egui/src/selection_spacing_tests.rs
new file mode 100644
index 00000000..b4b384d0
--- /dev/null
+++ b/crates/ui-egui/src/selection_spacing_tests.rs
@@ -0,0 +1,364 @@
+//! Real field and canvas gestures for #402; distances are checked in the engine document.
+use crate::layers_drag_tests::Ui;
+use egui::{Event, Id, Key, Modifiers, Pos2, vec2};
+use figcraft_doc::NodeId;
+use figcraft_engine::Session;
+use serde_json::json;
+
+fn scene(grid: bool) -> (Ui, Vec<NodeId>) {
+    let mut s = Session::new();
+    let mut ids = vec![];
+    for row in 0..if grid { 2 } else { 1 } {
+        for col in 0..3 {
+            let id = NodeId(
+                s.execute("shape.rectangle", &json!({"x":100+col*80,"y":100+row*100,"width":50,"height":60})).unwrap()["id"].as_u64().unwrap(),
+            );
+            ids.push(id);
+        }
+    }
+    s.execute("select.set", &json!({"ids":ids})).unwrap();
+    let u = Ui::new(s);
+    (u, ids)
+}
+fn xy(u: &Ui, id: NodeId) -> (f64, f64) {
+    let b = u.app.session.doc().unwrap().world_bounds(id).unwrap();
+    (b.x0, b.y0)
+}
+fn key(u: &mut Ui, k: Key) {
+    u.frame(vec![
+        Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE },
+        Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers: Modifiers::NONE },
+    ]);
+    u.frame(vec![]);
+}
+fn drag(u: &mut Ui, p: Pos2, by: egui::Vec2, release: bool) {
+    u.frame(vec![Event::PointerMoved(p)]);
+    u.button(p, true);
+    for i in 1..=4 {
+        u.frame(vec![Event::PointerMoved(p + by * i as f32 / 4.)]);
+    }
+    if release {
+        u.button(p + by, false);
+        u.frame(vec![]);
+    }
+}
+
+/// Asserts typed and scrubbed spacing changes take effect with exactly one undo step.
+#[test]
+fn spacing_fields_type_scrub_and_keep_one_undo_step() {
+    let (mut u, ids) = scene(true);
+    let field = Id::unique(("selection_spacing", "horizontal"));
+    let p = u.ctx.read_response(field.with("field")).unwrap().rect.center();
+    let history = u.app.session.undo_depth().0;
+    u.button(p, true);
+    u.button(p, false);
+    u.frame(vec![]);
+    u.frame(vec![Event::Text("45.5".into())]);
+    key(&mut u, Key::Enter);
+    assert_eq!(xy(&u, ids[1]), (195.5, 100.));
+    assert_eq!(xy(&u, ids[4]), (195.5, 200.));
+    assert_eq!(u.app.session.undo_depth().0, history + 1);
+    u.app.run("edit.undo", json!({}));
+    u.frame(vec![]);
+    let lead = u.ctx.read_response(field.with("lead")).unwrap().rect.center();
+    drag(&mut u, lead, vec2(16., 0.), true);
+    assert_eq!(xy(&u, ids[1]), (196., 100.));
+    assert_eq!(u.app.session.undo_depth().0, history + 1);
+    u.app.run("edit.undo", json!({}));
+    assert_eq!(xy(&u, ids[1]), (180., 100.));
+}
+
+#[test]
+fn canvas_gap_drag_keeps_selection_and_undo_redo_for_both_grid_axes() {
+    for (vertical, point) in [(false, (165., 130.)), (true, (125., 180.))] {
+        let (mut u, ids) = scene(true);
+        let before = u.app.session.undo_depth().0;
+        let p = u.app.to_screen(point.0, point.1);
+        let output = u.frame_output(vec![Event::PointerMoved(p)]);
+        assert_eq!(output.platform_output.cursor_icon, if vertical { egui::CursorIcon::ResizeVertical } else { egui::CursorIcon::ResizeHorizontal });
+        let z = u.app.session.ds().unwrap().view.zoom as f32;
+        drag(&mut u, p, if vertical { vec2(0., 20. * z) } else { vec2(20. * z, 0.) }, true);
+        assert_eq!(u.app.session.selection(), ids);
+        assert_eq!(xy(&u, ids[1]), if vertical { (180., 100.) } else { (200., 100.) });
+        assert_eq!(xy(&u, ids[3]), if vertical { (100., 220.) } else { (100., 200.) });
+        assert_eq!(u.app.session.undo_depth().0, before + 1);
+        u.app.run("edit.undo", json!({}));
+        assert_eq!(xy(&u, ids[4]), (180., 200.));
+        u.app.run("edit.redo", json!({}));
+        assert_eq!(xy(&u, ids[4]), if vertical { (180., 220.) } else { (200., 200.) });
+    }
+}
+
+/// Asserts Escape rolls a spacing drag back, and releasing outside the window commits once
+/// while keeping the selection.
+#[test]
+fn escape_rolls_back_and_an_outside_release_finishes_the_gesture() {
+    let (mut u, ids) = scene(false);
+    let before = u.app.session.undo_depth().0;
+    // A canvas handle takes the keyboard from a previously focused panel field.
+    let field = u.ctx.read_response(Id::unique(("selection_spacing", "horizontal")).with("field")).unwrap().rect.center();
+    u.button(field, true);
+    u.button(field, false);
+    u.frame(vec![]);
+    let p = u.app.to_screen(165., 130.);
+    let z = u.app.session.ds().unwrap().view.zoom as f32;
+    drag(&mut u, p, vec2(20. * z, 0.), false);
+    assert_eq!(xy(&u, ids[1]), (200., 100.));
+    key(&mut u, Key::Escape);
+    u.button(p + vec2(20. * z, 0.), false);
+    u.frame(vec![]);
+    assert_eq!(xy(&u, ids[1]), (180., 100.));
+    assert_eq!(u.app.session.undo_depth().0, before);
+    assert_eq!(u.app.session.selection(), ids);
+    drag(&mut u, p, vec2(20. * z, 0.), false);
+    // Leave the window while held; releasing with no pointer position still commits once.
+    u.frame(vec![Event::PointerGone]);
+    u.frame(vec![Event::PointerButton {
+        pos: Pos2::new(-1., -1.),
+        button: egui::PointerButton::Primary,
+        pressed: false,
+        modifiers: Modifiers::NONE,
+    }]);
+    u.frame(vec![]);
+    assert_eq!(u.app.session.undo_depth().0, before + 1);
+    assert!(u.app.session.ds().unwrap().interaction.is_none());
+}
+
+#[test]
+fn switching_documents_cancels_only_the_spacing_documents_gesture() {
+    let (mut u, ids) = scene(false);
+    let p = u.app.to_screen(165., 130.);
+    let z = u.app.session.ds().unwrap().view.zoom as f32;
+    drag(&mut u, p, vec2(20. * z, 0.), false);
+    u.app.run("file.new", json!({}));
+    u.app.session.begin_interaction("Unrelated").unwrap();
+    u.frame(vec![]);
+    assert!(u.app.session.ds().unwrap().interaction.is_some());
+    u.app.session.active = 0;
+    assert_eq!(xy(&u, ids[1]), (180., 100.));
+    assert!(u.app.session.ds().unwrap().interaction.is_none());
+}
+
+#[test]
+fn handle_click_is_a_noop_and_modifiers_can_be_held_before_pressing() {
+    let (mut u, ids) = scene(false);
+    let p = u.app.to_screen(165., 130.);
+    let before = u.app.session.undo_depth().0;
+    u.frame(vec![Event::PointerMoved(p)]);
+    u.button(p, true);
+    u.button(p, false);
+    u.frame(vec![]);
+    assert_eq!(u.app.session.undo_depth().0, before);
+    for (modifiers, delta, gap) in [(Modifiers::SHIFT, 17., 50.), (Modifiers::ALT, 17.25, 47.3)] {
+        let (mut u, ids) = scene(false);
+        let p = u.app.to_screen(165., 130.);
+        let z = u.app.session.ds().unwrap().view.zoom as f32;
+        u.frame_with(vec![Event::PointerMoved(p)], modifiers);
+        u.frame_with(vec![Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: true, modifiers }], modifiers);
+        for k in 1..=4 {
+            u.frame_with(vec![Event::PointerMoved(p + vec2(delta * z * k as f32 / 4., 0.))], modifiers);
+        }
+        u.frame_with(
+            vec![Event::PointerButton { pos: p + vec2(delta * z, 0.), button: egui::PointerButton::Primary, pressed: false, modifiers }],
+            modifiers,
+        );
+        u.frame(vec![]);
+        assert!((xy(&u, ids[1]).0 - 150. - gap).abs() < 1e-6);
+    }
+    assert_eq!(xy(&u, ids[1]), (180., 100.));
+}
+
+#[test]
+fn undo_while_dragging_cancels_the_gesture_without_undoing_an_earlier_edit() {
+    let (mut u, ids) = scene(false);
+    let before = u.app.session.undo_depth().0;
+    let p = u.app.to_screen(165., 130.);
+    let z = u.app.session.ds().unwrap().view.zoom as f32;
+    drag(&mut u, p, vec2(20. * z, 0.), false);
+    let m = Modifiers::COMMAND;
+    u.frame_with(
+        vec![
+            Event::Key { key: Key::Z, physical_key: None, pressed: true, repeat: false, modifiers: m },
+            Event::Key { key: Key::Z, physical_key: None, pressed: false, repeat: false, modifiers: m },
+        ],
+        m,
+    );
+    u.button(p + vec2(20. * z, 0.), false);
+    u.frame(vec![]);
+    assert_eq!(u.app.session.undo_depth().0, before);
+    assert_eq!(xy(&u, ids[1]), (180., 100.));
+    assert_eq!(u.app.session.selection(), ids);
+}
+
+#[test]
+fn stationary_gap_drag_does_not_change_the_document_again() {
+    let (mut u, ids) = scene(false);
+    let p = u.app.to_screen(165., 130.);
+    let z = u.app.session.ds().unwrap().view.zoom as f32;
+    drag(&mut u, p, vec2(20. * z, 0.), false);
+    assert_eq!(xy(&u, ids[1]), (200., 100.));
+    let revision = u.app.session.ds().unwrap().revision;
+    let doc = u.app.session.ds().unwrap().doc.clone();
+    for _ in 0..5 {
+        u.frame(vec![]);
+        u.frame(vec![Event::PointerMoved(p + vec2(20.2 * z, 0.))]);
+    }
+    assert_eq!(u.app.session.ds().unwrap().revision, revision);
+    assert!(std::sync::Arc::ptr_eq(&doc, &u.app.session.ds().unwrap().doc));
+    u.button(p + vec2(20.2 * z, 0.), false);
+    assert_eq!(xy(&u, ids[1]), (200., 100.));
+}
+
+#[test]
+fn reorder_ring_drag_inserts_across_grid_rows_as_one_undo_step() {
+    let (mut u, ids) = scene(true);
+    let before = u.app.session.undo_depth().0;
+    let p = u.app.to_screen(125., 130.);
+    let target = u.app.to_screen(205., 230.);
+    let output = u.frame_output(vec![Event::PointerMoved(p)]);
+    assert_eq!(output.platform_output.cursor_icon, egui::CursorIcon::Grab);
+    drag(&mut u, p, target - p, true);
+    assert_eq!(xy(&u, ids[0]), (180., 200.));
+    assert_eq!(xy(&u, ids[3]), (260., 100.));
+    assert_eq!(u.app.session.selection(), ids);
+    assert_eq!(u.app.session.undo_depth().0, before + 1);
+    u.app.run("edit.undo", json!({}));
+    assert_eq!(xy(&u, ids[0]), (100., 100.));
+    u.app.run("edit.redo", json!({}));
+    assert_eq!(xy(&u, ids[0]), (180., 200.));
+}
+
+#[test]
+fn reorder_ring_escape_click_and_returning_home_make_no_undo_step() {
+    for action in [0, 1, 2] {
+        let (mut u, ids) = scene(false);
+        let history = u.app.session.undo_depth().0;
+        let before = u.app.session.doc().unwrap().clone();
+        let p = u.app.to_screen(125., 130.);
+        let target = u.app.to_screen(285., 130.);
+        u.frame(vec![Event::PointerMoved(p)]);
+        if action == 0 {
+            u.button(p, true);
+        } else {
+            drag(&mut u, p, target - p, false);
+            assert_eq!(xy(&u, ids[0]), (260., 100.));
+            if action == 1 {
+                key(&mut u, Key::Escape);
+            } else {
+                u.frame(vec![Event::PointerMoved(p)]);
+            }
+        }
+        u.button(p, false);
+        u.frame(vec![]);
+        assert_eq!(u.app.session.doc().unwrap(), &before);
+        assert_eq!(u.app.session.undo_depth().0, history);
+        assert_eq!(u.app.session.selection(), ids);
+        assert!(u.app.session.ds().unwrap().interaction.is_none());
+    }
+}
+
+#[test]
+fn command_drag_swaps_and_a_stationary_pointer_keeps_the_preview() {
+    let (mut u, ids) = scene(true);
+    let p = u.app.to_screen(125., 130.);
+    let target = u.app.to_screen(205., 230.);
+    // The modifier can already be down when the handle is pressed.
+    let m = Modifiers::COMMAND;
+    u.frame_with(vec![Event::PointerMoved(p)], m);
+    u.frame_with(vec![Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: true, modifiers: m }], m);
+    u.frame_with(vec![Event::PointerMoved(target)], m);
+    assert_eq!(xy(&u, ids[0]), (180., 200.));
+    assert_eq!(xy(&u, ids[4]), (100., 100.));
+    assert_eq!(xy(&u, ids[1]), (180., 100.));
+    let snapshot = u.app.session.ds().unwrap().doc.clone();
+    for _ in 0..5 {
+        u.frame_with(vec![], m);
+    }
+    assert!(std::sync::Arc::ptr_eq(&snapshot, &u.app.session.ds().unwrap().doc));
+    // Changing modifiers without moving the pointer switches to insertion.
+    u.frame(vec![]);
+    assert_eq!(xy(&u, ids[1]), (100., 100.));
+    assert_eq!(xy(&u, ids[4]), (100., 200.));
+    u.button(target, false);
+}
+
+#[test]
+fn switching_documents_during_reordering_rolls_back_its_owner() {
+    let (mut u, ids) = scene(false);
+    let before = u.app.session.doc().unwrap().clone();
+    let p = u.app.to_screen(125., 130.);
+    let target = u.app.to_screen(285., 130.);
+    drag(&mut u, p, target - p, false);
+    u.app.run("file.new", json!({}));
+    u.app.session.begin_interaction("Unrelated").unwrap();
+    u.frame(vec![]);
+    assert!(u.app.session.ds().unwrap().interaction.is_some());
+    u.app.session.active = 0;
+    assert_eq!(u.app.session.doc().unwrap(), &before);
+    assert_eq!(u.app.session.selection(), ids);
+}
+
+#[test]
+fn reorder_release_outside_window_commits_and_undo_while_dragging_cancels() {
+    for undo in [false, true] {
+        let (mut u, ids) = scene(false);
+        let history = u.app.session.undo_depth().0;
+        let p = u.app.to_screen(125., 130.);
+        let target = u.app.to_screen(285., 130.);
+        drag(&mut u, p, target - p, false);
+        if undo {
+            let m = Modifiers::COMMAND;
+            u.frame_with(vec![Event::Key { key: Key::Z, physical_key: None, pressed: true, repeat: false, modifiers: m }], m);
+        }
+        u.frame(vec![Event::PointerGone]);
+        u.button(Pos2::new(-1., -1.), false);
+        u.frame(vec![]);
+        assert_eq!(u.app.session.undo_depth().0, history + usize::from(!undo));
+        assert_eq!(xy(&u, ids[0]), if undo { (100., 100.) } else { (260., 100.) });
+        assert!(u.app.session.ds().unwrap().interaction.is_none());
+    }
+}
+
+#[test]
+fn an_externally_finished_reorder_cannot_resume_on_later_pointer_motion() {
+    let (mut u, ids) = scene(false);
+    let p = u.app.to_screen(125., 130.);
+    let target = u.app.to_screen(285., 130.);
+    drag(&mut u, p, target - p, false);
+    u.app.session.commit_interaction().unwrap();
+    let history = u.app.session.undo_depth().0;
+    let committed = u.app.session.doc().unwrap().clone();
+    let middle = u.app.to_screen(205., 130.);
+    u.frame(vec![Event::PointerMoved(middle)]);
+    u.button(middle, false);
+    u.frame(vec![]);
+    assert_eq!(u.app.session.doc().unwrap(), &committed);
+    assert_eq!(u.app.session.undo_depth().0, history);
+    assert_eq!(xy(&u, ids[0]), (260., 100.));
+}
+
+#[test]
+fn small_layers_on_screen_have_no_reorder_ring_and_drag_the_selection_from_their_middle() {
+    let mut u = Ui::new(Session::new());
+    let z = u.app.session.ds().unwrap().view.zoom;
+    // 12 px squares 36 px apart on screen: a regular row, too small for rings.
+    let ids: Vec<NodeId> = (0..3)
+        .map(|col| {
+            let p = json!({"x": (100. + f64::from(col) * 36.) / z, "y": 100. / z, "width": 12. / z, "height": 12. / z});
+            NodeId(u.app.session.execute("shape.rectangle", &p).unwrap()["id"].as_u64().unwrap())
+        })
+        .collect();
+    u.app.session.execute("select.set", &json!({"ids": ids})).unwrap();
+    let before: Vec<_> = ids.iter().map(|id| xy(&u, *id)).collect();
+    let p = u.app.to_screen(before[0].0 + 6. / z, before[0].1 + 6. / z);
+    let output = u.frame_output(vec![Event::PointerMoved(p)]);
+    assert_ne!(output.platform_output.cursor_icon, egui::CursorIcon::Grab);
+    drag(&mut u, p, vec2(0., 60.), true);
+    let after: Vec<_> = ids.iter().map(|id| xy(&u, *id)).collect();
+    assert!(after[0].1 > before[0].1, "the selection moved: {before:?} -> {after:?}");
+    assert!(
+        before.iter().zip(&after).all(|(b, a)| (a.0 - b.0).abs() < 1e-6 && (a.1 - b.1 - (after[0].1 - before[0].1)).abs() < 1e-6),
+        "all together, in order"
+    );
+    assert_eq!(u.app.session.selection(), ids);
+}
diff --git a/crates/ui-egui/src/services.rs b/crates/ui-egui/src/services.rs
new file mode 100644
index 00000000..d7490de4
--- /dev/null
+++ b/crates/ui-egui/src/services.rs
@@ -0,0 +1,159 @@
+use super::*;
+
+/// Platform services the app crate provides (file dialogs, clipboard, URLs).
+pub trait Services {
+    fn pick_open(&mut self, _title: &str, _exts: &[&str]) -> DialogFuture {
+        Box::pin(std::future::ready(None))
+    }
+    /// Pick a file and read it, where the platform hands over a file's name and contents rather
+    /// than a path to it (the browser). `None`: the platform picks paths ([`Services::pick_open`]).
+    fn pick_open_contents(&mut self, _title: &str, _exts: &[&str]) -> Option<ContentsFuture> {
+        None
+    }
+    fn pick_save(&mut self, _title: &str, _name: &str, _exts: &[&str]) -> DialogFuture {
+        Box::pin(std::future::ready(None))
+    }
+    /// The platform saves files by handing them over as downloads (the browser), not through
+    /// save dialogs.
+    fn downloads(&self) -> bool {
+        false
+    }
+    /// Hand `bytes` over as a download named `name`; false when nothing was delivered.
+    fn download(&mut self, _name: &str, _bytes: &[u8]) -> bool {
+        false
+    }
+    /// A folder to write several files into.
+    fn pick_folder(&mut self, _title: &str) -> DialogFuture {
+        Box::pin(std::future::ready(None))
+    }
+    fn clipboard_set_text(&mut self, _s: &str) {}
+    /// Give native services access to the window context for platform clipboard output.
+    fn set_egui_context(&mut self, _ctx: &egui::Context) {}
+    fn clipboard_get_text(&mut self) -> Option<String> {
+        None
+    }
+    fn clipboard_get_html(&mut self) -> Option<String> {
+        None
+    }
+    fn clipboard_set_png(&mut self, _w: u32, _h: u32, _rgba: &[u8]) {}
+    /// An image on the system clipboard as (width, height, straight RGBA).
+    fn clipboard_get_image(&mut self) -> Option<(u32, u32, Vec<u8>)> {
+        None
+    }
+    fn open_url(&mut self, _url: &str) {}
+    /// Show the file at `path` in the platform's file manager (Finder, Explorer), selected where the
+    /// platform can.
+    fn reveal_path(&mut self, _path: &std::path::Path) {}
+    /// The system asks for reduced motion (its accessibility setting).
+    fn reduce_motion(&self) -> bool {
+        false
+    }
+    /// The system asks for the dark interface (the freedesktop colour scheme): for platforms whose
+    /// windowing stack doesn't report a theme (winit gives none on Linux and the BSDs).
+    fn system_dark(&self) -> Option<bool> {
+        None
+    }
+    /// After a panic in a frame: keep recovery copies of unsaved files.
+    fn emergency_save(&mut self, _session: &Session) {}
+    /// Keep the preferences now (the installed plugins or their settings changed), as the app
+    /// does when it quits.
+    fn save_prefs(&mut self, _prefs: &figcraft_engine::Prefs) {}
+    /// The OS or browser language as a tag ("es-ES"), for the "system" language preference.
+    fn system_language(&self) -> Option<String> {
+        None
+    }
+    /// The controller buttons held now on any controller: bit i is standard gamepad layout index i
+    /// (0 the bottom face button … 16 home; `figcraft_doc::proto::GAMEPAD_BUTTONS`). The prototype
+    /// player asks every frame while its prototype has gamepad triggers.
+    fn gamepad_held(&mut self) -> u32 {
+        0
+    }
+}
+
+pub type DialogFuture = Pin<Box<dyn Future<Output = Option<PathBuf>>>>;
+
+/// A picked file's name and contents ([`Services::pick_open_contents`]); `None` when the picker
+/// was cancelled, `Err` with what to tell the user when the file couldn't be read.
+pub type ContentsFuture = Pin<Box<dyn Future<Output = Option<Result<(String, Vec<u8>), String>>>>>;
+
+/// A dropped file's contents, read once they arrive (`Err`: what to tell the user when they
+/// couldn't be read).
+pub type ReadFuture = Pin<Box<dyn Future<Output = Result<Vec<u8>, String>>>>;
+
+pub(crate) type PickFuture = Pin<Box<dyn Future<Output = Option<Picked>>>>;
+
+pub(crate) type DialogDone = Box<dyn FnOnce(&mut FigApp, Picked)>;
+
+/// What a dialog picked: a path, or a file's name and contents where there are no paths, or why
+/// the picked file couldn't be read.
+pub(crate) enum Picked {
+    Path(PathBuf),
+    Contents(String, Vec<u8>),
+    Unreadable(String),
+}
+
+impl Picked {
+    /// The file as `file.open` and `file.import` take it (`Err`: what to tell the user instead).
+    pub(crate) fn file_params(self) -> Result<Value, String> {
+        match self {
+            Picked::Path(p) => Ok(json!({"path": p.to_string_lossy()})),
+            Picked::Contents(name, bytes) => {
+                use base64::Engine as _;
+                Ok(json!({"data": base64::engine::general_purpose::STANDARD.encode(&bytes), "name": name}))
+            }
+            Picked::Unreadable(why) => Err(why),
+        }
+    }
+}
+
+/// What the user is told about a file whose contents couldn't be read.
+pub fn unreadable(name: &str) -> String {
+    i18n::trf("Couldn't read {name}.", &[("name", &name)])
+}
+
+/// The largest file read in the browser: wasm has at most 4 GiB of memory, and a file's contents
+/// are held about three times on their way to `file.open` (the bytes, base64, decoded again).
+/// As large as one member of a `.figcraft` file may be.
+const MAX_BROWSER_FILE: f64 = (512u64 << 20) as f64;
+
+/// Checks a file of `size` bytes before the browser reads it (`Err`: what to tell the user).
+pub fn browser_can_read(name: &str, size: f64) -> Result<(), String> {
+    if size.is_nan() || size > MAX_BROWSER_FILE {
+        return Err(i18n::trf("{name} is too large to open in the browser (over 512 MB).", &[("name", &name)]));
+    }
+    Ok(())
+}
+
+/// Wakes the main window, which hands the result on to the window it belongs to.
+pub(crate) struct RepaintWaker(pub(crate) egui::Context);
+
+impl Wake for RepaintWaker {
+    fn wake(self: Arc<Self>) {
+        self.0.request_repaint_of(egui::ViewportId::ROOT);
+    }
+
+    fn wake_by_ref(self: &Arc<Self>) {
+        self.0.request_repaint_of(egui::ViewportId::ROOT);
+    }
+}
+
+/// No-op services (tests, headless screenshots).
+pub struct NoServices;
+
+impl Services for NoServices {}
+
+/// Put `text` on the system clipboard through egui's platform output. Native integrations handle
+/// it directly; the browser shell writes it while handling the copy event.
+pub fn egui_copy_text(ctx: &egui::Context, text: &str) {
+    ctx.copy_text(text.to_string());
+}
+
+/// Put a straight-RGBA image on the system clipboard through egui's output (see
+/// [`egui_copy_text`]); a buffer that doesn't match its size is dropped.
+pub fn egui_copy_png(ctx: &egui::Context, w: u32, h: u32, rgba: &[u8]) {
+    let (w, h) = (w as usize, h as usize);
+    if w.checked_mul(h).and_then(|n| n.checked_mul(4)) != Some(rgba.len()) {
+        return;
+    }
+    ctx.copy_image(egui::ColorImage::from_rgba_unmultiplied([w, h], rgba));
+}
diff --git a/crates/ui-egui/src/shortcuts.rs b/crates/ui-egui/src/shortcuts.rs
index d5bfb156..94285cb5 100644
--- a/crates/ui-egui/src/shortcuts.rs
+++ b/crates/ui-egui/src/shortcuts.rs
@@ -4,8 +4,10 @@
 use std::sync::Mutex;
 use std::sync::atomic::{AtomicU8, Ordering};
 
+use egui::ime_context::{CommittedText, ImeMutationStamp, ImeObservation, ImeTarget};
 use egui::{Context, Event, Key, Modifiers};
 use figcraft_engine::keymap::{self, Platform};
+use figcraft_engine::textedit::ImeInsertion;
 use serde_json::json;
 
 use crate::FigApp;
@@ -94,33 +96,92 @@ fn cached_tip(label: &'static str, key: Option<&'static str>) -> &'static str {
 
 /// Run the shortcuts this frame's keys press. `typing`: a field had the keyboard when the frame
 /// began.
-pub fn handle(app: &mut FigApp, ctx: &Context, typing: bool) {
+/// `swallowed`: what this frame's Cmd/Ctrl+V chords the shell swallowed ask for ([`swallowed_paste`]).
+pub fn handle(app: &mut FigApp, ctx: &Context, typing: bool, swallowed: Swallowed) {
+    let ime_input = ImeInputBaseline::capture(app);
+    let field_save = prepare_field_save(app, ctx);
+    handle_input(app, ctx, typing, swallowed, ime_input, field_save);
+}
+
+/// The viewport frame binds its IME batch before pointer/control handling.
+pub(crate) fn handle_input(
+    app: &mut FigApp,
+    ctx: &Context,
+    typing: bool,
+    swallowed: Swallowed,
+    ime_input: Option<ImeInputBaseline>,
+    field_save: Option<AfterFieldSave>,
+) {
     note_platform(ctx);
-    // Text fields in panels own the keyboard (also the key that ends their editing).
-    if typing || crate::a11y::field_focused(ctx) || app.ui.palette.is_some() {
+    // egui reruns a discarded pass with the same `RawInput`. The first pass already applied its
+    // keys and text (to our own editor state, not to a widget that re-reads the event): applying
+    // them again would insert text twice or run a command twice. The rerun is layout only, so it
+    // keeps just the IME's caret/output of the pass that will be presented.
+    if ctx.current_pass_index() > 0 {
+        if app.session.ds().is_ok_and(|d| d.text_edit.is_some()) {
+            // The drawn pass still needs the composition preview; the IME descriptor is observed
+            // once at the end of the pass (see `FigApp::frame`).
+            app.sync_preedit();
+        }
+        return;
+    }
+    // The shared field helpers already processed this batch and committed their buffers. An
+    // editor outside those helpers retains the old late focus-release behavior; never drop its
+    // current Text events by releasing it before it draws. Always clear a disappeared marker.
+    let marker = field_save_marker(ctx);
+    let late_editor = ctx.data_mut(|d| {
+        let pending = d.get_temp::<(egui::Id, u64)>(marker);
+        d.remove::<(egui::Id, u64)>(marker);
+        pending
+    });
+    if let Some((editor, frame)) = late_editor
+        && frame == ctx.cumulative_frame_nr()
+    {
+        ctx.memory_mut(|m| m.surrender_focus(editor));
+    }
+    // A save asked for from a field last frame: the field committed in that same pass, before
+    // this frame's tab/pointer input could switch documents. New requests are queued below.
+    if let Some(save) = app.ui.after_field.take() {
+        save.run(app);
+    }
+    // Text fields in panels own the keyboard (also the key that ends their editing), except for
+    // the save shortcuts.
+    // The IME is observed once at the end of the pass; `FigApp::frame` marks this editor idle there.
+    if typing || crate::a11y::field_focused(ctx) || app.ui.palette.is_some() || field_save.is_some() {
+        if app.ui.palette.is_none()
+            && let Some(save) = field_save
+        {
+            app.ui.after_field = Some(save);
+            ctx.request_repaint();
+        }
         return;
     }
     let events: Vec<Event> = ctx.input(|i| i.events.clone());
+    // Every frame while editing, even one without input: a frame without the IME output turns the
+    // platform's IME off, which drops the composition (macOS then types plain letters).
+    let editing = app.session.ds().map(|d| d.text_edit.is_some()).unwrap_or(false);
+    if editing {
+        text_keys(app, ctx, &events, ime_input);
+        return;
+    }
     if events.is_empty() {
         return;
     }
-    let editing = app.session.ds().map(|d| d.text_edit.is_some()).unwrap_or(false);
-    if editing {
-        text_keys(app, ctx, &events);
-        return;
-    }
-    // An image-only clipboard brings no paste event, just the key: paste from the key then.
+    // An image-only clipboard brings no paste event: paste from the key then. The browser sends
+    // the press; the desktop shell swallows it and sends only the release.
     let paste_event = events.iter().any(|e| matches!(e, Event::Paste(_)));
-    let paste_key = events.iter().any(|e| matches!(e, Event::Key { key: Key::V, pressed: true, repeat: false, modifiers, .. } if modifiers.command && !modifiers.shift && !modifiers.alt));
-    if paste_key && !paste_event {
-        crate::menus::paste(app, None);
+    let paste_key = events.iter().any(|e| matches!(e, Event::Key { key: Key::V, pressed: true, repeat: false, modifiers, .. } if modifiers.command && v_binding(*modifiers) == Some("edit.paste")));
+    match swallowed.run.or((paste_key && !paste_event).then_some("edit.paste")) {
+        Some("edit.paste") => crate::menus::paste(app, None, None),
+        Some(id) => run_binding(app, id),
+        None => {}
     }
     let now = ctx.input(|i| i.time);
     for ev in &events {
         match ev {
             Event::Copy => crate::menus::invoke(app, "edit.copy"),
-            Event::Cut => crate::menus::invoke(app, "edit.cut"),
-            Event::Paste(text) => crate::menus::paste(app, Some(text)),
+            Event::Cut => cut(app),
+            Event::Paste(text) if !swallowed.drop_text => crate::menus::paste(app, Some(text), None),
             Event::Key { key, physical_key, pressed: true, modifiers, repeat }
                 if key_event(app, *key, *physical_key, *modifiers, *repeat, now, ctx) =>
             {
@@ -131,11 +192,244 @@ pub fn handle(app: &mut FigApp, ctx: &Context, typing: bool) {
     }
 }
 
+/// Cut: usually the layers. Windows sends Shift+Delete (remove the points and heal the path)
+/// as a cut command and never as a key, so in vector edit mode the selection is points: they are
+/// removed, a heal joining the path through them.
+fn cut(app: &mut FigApp) {
+    let Some(ve) = app.session.ds().ok().and_then(|d| d.vector_edit.clone()) else {
+        crate::menus::invoke(app, "edit.cut");
+        return;
+    };
+    if ve.parts().iter().any(|p| !p.vertices.is_empty()) {
+        app.run("vector.deleteHeal", json!({}));
+    } else if ve.parts().iter().any(|p| !p.segments.is_empty()) {
+        app.run("vector.edit.delete", json!({}));
+    }
+}
+
+/// Commands whose shortcut works while a panel field has the keyboard: they don't edit text, and
+/// a file that can't be saved from a field looks like a file that can't be saved (#1157).
+const FROM_A_FIELD: [&str; 2] = ["file.save", "file.saveAs"];
+
+/// A save deferred until its panel field commits, bound to the originating file and window.
+#[derive(Clone, Copy)]
+pub struct AfterFieldSave {
+    command: &'static str,
+    document: u64,
+    window: u64,
+}
+
+impl AfterFieldSave {
+    /// Run a deferred field-save binding only if the originating window still exists and owns
+    /// the document; temporarily activate that document, run the binding, then restore the
+    /// previously front tab.
+    fn run(self, app: &mut FigApp) {
+        // A closed file or one moved to another window cannot turn this into a save of the
+        // current tab. The UiState normally stays in its window's pane; validate that too.
+        if app.windows.current != self.window || !app.windows.exists(self.window) || app.windows.of(self.document) != self.window {
+            return;
+        }
+        let Some(index) = app.session.docs.iter().position(|d| d.uid == self.document) else { return };
+        let front = app.session.ds().ok().map(|d| d.uid);
+        app.session.active = index;
+        // Save as captures this owner in PendingDialog before the visible tab is restored.
+        run_binding(app, self.command);
+        if let Some(index) = front.and_then(|uid| app.session.docs.iter().position(|d| d.uid == uid)) {
+            app.session.active = index;
+        }
+    }
+}
+
+/// The request belongs to one editor in one viewport/frame; a discarded pass never releases it
+/// a second time, and a field that disappeared cannot leave a marker for another frame.
+fn field_save_marker(ctx: &Context) -> egui::Id {
+    egui::Id::unique(("field_save_commit", ctx.viewport_id()))
+}
+
+/// An early-returning pane did not draw its field or reach shortcut delivery.
+pub(crate) fn clear_field_save_marker(ctx: &Context) {
+    let marker = field_save_marker(ctx);
+    ctx.data_mut(|d| d.remove::<(egui::Id, u64)>(marker));
+}
+
+/// Capture a field's save before widgets route pointer/control input. Keep its focus until its
+/// TextEdit has processed this batch, including Text delivered together with the save chord.
+pub(crate) fn prepare_field_save(app: &FigApp, ctx: &Context) -> Option<AfterFieldSave> {
+    if ctx.current_pass_index() > 0 {
+        return None;
+    }
+    let marker = field_save_marker(ctx);
+    ctx.data_mut(|d| d.remove::<(egui::Id, u64)>(marker));
+    if !ctx.text_edit_focused()
+        || !crate::a11y::field_focused(ctx)
+        || app.ui.palette.is_some()
+        || app.pending_dialog.is_some()
+        || egui::Popup::is_any_open(ctx)
+        || ctx.memory(|m| m.top_modal_layer().is_some())
+    {
+        return None;
+    }
+    let editor = ctx.memory(|m| m.focused())?;
+    note_platform(ctx);
+    let (command, key, modifiers) = ctx.input(|i| {
+        i.events.iter().find_map(|e| match e {
+            Event::Key { key, physical_key, pressed: true, repeat: false, modifiers } if modifiers.command => {
+                lookup(keymap::Context::Canvas, *key, *physical_key, *modifiers)
+                    .filter(|b| FROM_A_FIELD.contains(&b.id))
+                    .map(|b| (b.id, *key, *modifiers))
+            }
+            _ => None,
+        })
+    })?;
+    if !crate::menus::available(command) || (app.ui.right_tab == crate::RightTab::Inspect && !figcraft_engine::devinspect::dev_mode_allows(command)) {
+        return None;
+    }
+    let document = app.session.ds().ok().filter(|d| app.shows(d.uid)).map(|d| d.uid)?;
+    if !ctx.input_mut(|i| i.consume_key(modifiers, key)) {
+        return None;
+    }
+    let frame = ctx.cumulative_frame_nr();
+    ctx.data_mut(|d| d.insert_temp(marker, (editor, frame)));
+    Some(AfterFieldSave { command, document, window: app.windows.current })
+}
+
+/// Widget IDs are reused between documents. Routing may have replaced the prepared owner since
+/// the frame began; cancel before any field can force that owner's draft into another document.
+pub(crate) fn revalidate_field_save(app: &FigApp, ctx: &Context, save: Option<AfterFieldSave>) -> Option<AfterFieldSave> {
+    let save = save?;
+    if app.windows.current == save.window
+        && app.windows.exists(save.window)
+        && app.windows.of(save.document) == save.window
+        && app.session.ds().is_ok_and(|d| d.uid == save.document && app.shows(d.uid))
+    {
+        Some(save)
+    } else {
+        let marker = field_save_marker(ctx);
+        let rejected = ctx.data(|d| d.get_temp::<(egui::Id, u64)>(marker));
+        if let Some((editor, frame)) = rejected
+            && frame == ctx.cumulative_frame_nr()
+        {
+            let cancelled = field_save_cancellation(ctx, editor);
+            ctx.data_mut(|d| d.insert_temp(cancelled, true));
+        }
+        clear_field_save_marker(ctx);
+        None
+    }
+}
+
+/// Stable id, per viewport and editor, for a rejected field-save cancellation.
+fn field_save_cancellation(ctx: &Context, editor: egui::Id) -> egui::Id {
+    egui::Id::unique(("field_save_cancelled", ctx.viewport_id(), editor))
+}
+
+/// Keep a rejected field's cancellation until that exact editor is drawn again. Its pane may
+/// disappear in this frame; a frame-wide reset would leave its cached draft for another owner.
+pub(crate) fn take_field_save_cancellation(ctx: &Context, editor: egui::Id) -> bool {
+    let cancelled = field_save_cancellation(ctx, editor);
+    ctx.data_mut(|d| {
+        let pending = d.get_temp::<bool>(cancelled).unwrap_or(false);
+        d.remove::<bool>(cancelled);
+        pending
+    })
+}
+
+/// A shared custom field calls this after its TextEdit has consumed the current events, before
+/// its existing lost-focus commit branch. Only the original editor can consume the request.
+pub(crate) fn release_field_for_save(response: &egui::Response) {
+    let ctx = &response.ctx;
+    if ctx.current_pass_index() > 0 {
+        return;
+    }
+    let marker = field_save_marker(ctx);
+    let requested = ctx.data(|d| d.get_temp::<(egui::Id, u64)>(marker));
+    if requested == Some((response.id, ctx.cumulative_frame_nr())) {
+        ctx.data_mut(|d| d.remove::<(egui::Id, u64)>(marker));
+        response.surrender_focus();
+    }
+}
+
+/// The command Cmd/Ctrl+V runs with `m` held too: `edit.paste`, `edit.pasteOver` (Shift),
+/// `edit.pasteProperties` (Alt), or `None` for a chord nothing is bound to. The keymap decides,
+/// whether the key press arrived (browser) or only a paste event and the release (desktop).
+fn v_binding(m: Modifiers) -> Option<&'static str> {
+    lookup(keymap::Context::Canvas, Key::V, Some(Key::V), Modifiers { command: true, ..m }).map(|b| b.id)
+}
+
+/// What this frame's Cmd/Ctrl+V chords ask for when the desktop shell swallowed their press
+/// ([`swallowed_paste`]).
+#[derive(Clone, Copy, Default)]
+pub struct Swallowed {
+    /// The command to run ([`v_binding`]).
+    pub run: Option<&'static str>,
+    /// This frame's paste event belongs to another command or an unbound chord: its text isn't
+    /// pasted.
+    pub drop_text: bool,
+}
+
+/// egui-winit swallows every Cmd/Ctrl+V press, Shift or Alt held or not, and sends a paste event
+/// only when the clipboard holds text. So a chord brings a paste event (text) or just its release
+/// (an image, or nothing). The browser sends the press as well, which runs the command itself.
+/// Call at the start of every frame: it reads the raw events, which keys consumed by panels or the
+/// presenter still carry.
+pub fn swallowed_paste(app: &mut FigApp, ctx: &Context) -> Swallowed {
+    let ui = &mut app.ui;
+    let mut out = Swallowed::default();
+    ctx.input(|i| {
+        for ev in &i.raw.events {
+            match ev {
+                Event::ModifiersChanged(m) => ui.held = *m,
+                // Without Cmd/Ctrl held it's another paste key (Shift+Insert, a Paste key).
+                Event::Paste(_) if ui.held.command => {
+                    let id = v_binding(ui.held);
+                    if id != Some("edit.paste") {
+                        out.drop_text = true;
+                        // Held down, the chord repeats its paste event: run once, as keys do.
+                        if !ui.v_pressed && !ui.paste_event {
+                            out.run = out.run.or(id);
+                        }
+                    }
+                    ui.paste_event = true;
+                }
+                Event::Paste(_) => ui.paste_event = true,
+                Event::Key { key: Key::V, pressed: true, .. } => ui.v_pressed = true,
+                Event::Key { key: Key::V, pressed: false, modifiers, .. } => {
+                    // Cmd was down when V went down, maybe let go first. A V held while the window
+                    // was away comes back as a release alone: without Cmd held, that's no paste.
+                    if !ui.v_pressed && !ui.paste_event && (modifiers.command || !ui.refocused) {
+                        out.run = out.run.or(v_binding(*modifiers));
+                    }
+                    ui.v_pressed = false;
+                    ui.paste_event = false;
+                    ui.refocused = false;
+                }
+                // The other keys that paste (Shift+Insert, a Paste key) end their paste event.
+                Event::Key { key: Key::Insert | Key::Paste, pressed: false, .. } => ui.paste_event = false,
+                // Keys let go in another window never come back as releases.
+                Event::WindowFocused(false) => {
+                    ui.v_pressed = false;
+                    ui.paste_event = false;
+                    ui.held = Modifiers::NONE;
+                }
+                Event::WindowFocused(true) => ui.refocused = true,
+                _ => {}
+            }
+        }
+    });
+    out
+}
+
 /// Run the command a shortcut is bound to, with the keyboard's own twists (Escape steps out
 /// before it deselects, Delete ends a pen path, Enter edits the selected text or vector).
 pub fn run_binding(app: &mut FigApp, id: &str) {
+    // Dev Mode places and edits nothing: Enter selects children.
+    let dev = app.ui.right_tab == crate::RightTab::Inspect;
     match id {
         "select.none" => {
+            if let Some(ctx) = &app.ui_context
+                && crate::proto_panel::close_editor(ctx)
+            {
+                return;
+            }
             if let Err(e) = app.session.escape() {
                 app.toast(e.to_string());
             }
@@ -145,15 +439,21 @@ pub fn run_binding(app: &mut FigApp, id: &str) {
             let _ = app.session.pen_finish();
         }
         // Enter with a shape or frame tool chosen places one in the middle of the view.
-        "select.children" if app.session.tool.tool.draws_shape() => {
+        "select.children" if !dev && app.session.tool.tool.draws_shape() => {
             app.run("tool.place", json!({}));
         }
-        "select.children" if enter_text(app) => {}
+        "select.children" if !dev && enter_text(app) => {}
         _ => crate::menus::invoke(app, id),
     }
 }
 
 fn key_event(app: &mut FigApp, key: Key, physical: Option<Key>, m: Modifiers, repeat: bool, now: f64, ctx: &Context) -> bool {
+    if key == Key::Escape && crate::proto_panel::close_editor(ctx) {
+        return true;
+    }
+    if key == Key::Escape && crate::selection_spacing::cancel(app, ctx) {
+        return true;
+    }
     if key_box(app, key, m) {
         return true;
     }
@@ -161,6 +461,10 @@ fn key_event(app: &mut FigApp, key: Key, physical: Option<Key>, m: Modifiers, re
     if matches!(key, Key::Backspace | Key::Delete) && m.is_none() && app.ui.picker.is_some() && crate::handles::remove_selected_stop(app, ctx) {
         return true;
     }
+    // An interaction selected in the Prototype tab: Delete removes that interaction, not the component.
+    if matches!(key, Key::Backspace | Key::Delete) && m.is_none() && crate::proto_panel::delete_selected_interaction(app, ctx) {
+        return true;
+    }
     // Vector edit mode and the shape builder have their own keys (tools, nudging points, delete,
     // join, Enter to finish); the rest fall through.
     match app.session.tool_key(key.name(), m.shift, m.alt, m.command) {
@@ -177,6 +481,9 @@ fn key_event(app: &mut FigApp, key: Key, physical: Option<Key>, m: Modifiers, re
             return true;
         }
         if !repeat || matches!(b.id, "edit.undo" | "edit.redo" | "view.zoomIn" | "view.zoomOut") {
+            if matches!(b.id, "edit.undo" | "edit.redo") && crate::selection_spacing::cancel(app, ctx) {
+                return true;
+            }
             run_binding(app, b.id);
         }
         return true;
@@ -185,7 +492,8 @@ fn key_event(app: &mut FigApp, key: Key, physical: Option<Key>, m: Modifiers, re
     if app.ui.layers_focus && !m.command && !m.alt && crate::layers::key_nav(app, key, m.shift) {
         return true;
     }
-    // Arrow nudges; with nothing selected the arrows pan the view.
+    // Arrow nudges, Alt held too (measuring stays on while the selection moves); with nothing
+    // selected the arrows pan the view.
     let (dx, dy) = match key {
         Key::ArrowLeft => (-1.0, 0.0),
         Key::ArrowRight => (1.0, 0.0),
@@ -193,9 +501,11 @@ fn key_event(app: &mut FigApp, key: Key, physical: Option<Key>, m: Modifiers, re
         Key::ArrowDown => (0.0, 1.0),
         _ => (0.0, 0.0),
     };
-    if (dx, dy) != (0.0, 0.0) && !m.alt {
+    if (dx, dy) != (0.0, 0.0) {
         if app.session.selection().is_empty() {
             app.run("view.pan", json!({"dx": dx, "dy": dy, "big": m.shift}));
+        } else if crate::menus::dev_mode_refuses(app, "transform.nudge") {
+            // Dev Mode: said so, nothing moves.
         } else if m.command {
             // Cmd/Ctrl+arrows resize: right/down grow, left/up shrink.
             app.run("transform.nudgeSize", json!({"dw": dx, "dh": dy, "big": m.shift}));
@@ -207,9 +517,9 @@ fn key_event(app: &mut FigApp, key: Key, physical: Option<Key>, m: Modifiers, re
     if m.is_none() && !repeat && opacity_digit(app, key, now) {
         return true;
     }
-    // Enter while the pen is drawing finishes it.
+    // Enter while the pen is drawing ends the path as Escape does.
     if key == Key::Enter && app.session.tool.pen.is_some() {
-        let _ = app.session.pen_finish();
+        let _ = app.session.pen_end();
         return true;
     }
     false
@@ -292,6 +602,9 @@ pub fn opacity_digit(app: &mut FigApp, key: Key, now: f64) -> bool {
     if !app.session.prefs.number_keys_opacity || app.session.selection().is_empty() {
         return false;
     }
+    if crate::menus::dev_mode_refuses(app, "object.opacityKeys") {
+        return true;
+    }
     let first = app.ui.opacity_digit.take().filter(|(_, t)| now - t <= OPACITY_CHAIN_SECS).map(|(d, _)| d);
     let digits = match first {
         Some(f) => format!("{f}{d}"),
@@ -318,6 +631,15 @@ fn enter_text(app: &mut FigApp) -> bool {
         return false;
     }
     let Some(id) = sel.first().copied() else { return false };
+    // A board object (a sticky, a shape with text, a label): type in its text.
+    match figcraft_engine::board::edit_text(&mut app.session, id) {
+        Ok(true) => return true,
+        Ok(false) => {}
+        Err(e) => {
+            app.toast(e.to_string());
+            return true;
+        }
+    }
     let kind = app.session.doc().ok().and_then(|d| d.node(id)).map(|n| (matches!(n.kind, figcraft_doc::NodeKind::Text(_)), n.kind.is_shape()));
     match kind {
         Some((true, _)) => {
@@ -332,92 +654,231 @@ fn enter_text(app: &mut FigApp) -> bool {
     }
 }
 
-fn text_keys(app: &mut FigApp, ctx: &Context, events: &[Event]) {
+/// A composition's input owner before this viewport's control/pointer handling. A normal
+/// noncomposing commit needs no prior composition, so only active compositions create a guard.
+pub(crate) struct ImeInputBaseline {
+    target: ImeTarget,
+    caret: usize,
+    anchor: usize,
+}
+
+impl ImeInputBaseline {
+    /// Capture an IME baseline only while a text edit and an active preedit exist, recording
+    /// the IME target and the caret/anchor.
+    pub(crate) fn capture(app: &FigApp) -> Option<Self> {
+        let te = app.session.ds().ok()?.text_edit.as_ref()?;
+        te.preedit.as_ref()?;
+        Some(Self { target: ime_target(app)?, caret: te.caret, anchor: te.anchor })
+    }
+
+    /// Whether the IME target changed, editing or the preedit ended, or the caret/anchor moved
+    /// since the baseline was captured.
+    fn interrupted(&self, app: &FigApp) -> bool {
+        ime_target(app) != Some(self.target)
+            || app
+                .session
+                .ds()
+                .ok()
+                .and_then(|ds| ds.text_edit.as_ref())
+                .is_none_or(|te| te.preedit.is_none() || te.caret != self.caret || te.anchor != self.anchor)
+    }
+}
+
+/// Apply a batch of text, IME, paste, copy, cut and key events: reject all IME events for an
+/// interrupted composition, swallow text produced by a key that ran a shortcut, then finish
+/// with triple-click line selection and preedit sync.
+fn text_keys(app: &mut FigApp, ctx: &Context, events: &[Event], ime_input: Option<ImeInputBaseline>) {
+    // Validate once before the batch: an accepted DeleteSurrounding deliberately clears preedit,
+    // but its following Commit still belongs to the same valid transaction. An interrupted
+    // composition's deletes and Commit must all be rejected, not just the first stale event.
+    let reject_ime = ime_input.is_some_and(|baseline| baseline.interrupted(app));
     // A key that ran a shortcut swallows the text it also produced (Alt+. types "≥" on macOS).
     let mut skip_text = false;
     for ev in events {
+        if reject_ime && matches!(ev, Event::Ime(_)) {
+            continue;
+        }
         match ev {
-            Event::Text(t) | Event::Ime(egui::ImeEvent::Commit(t)) => {
-                if skip_text && matches!(ev, Event::Text(_)) {
-                    skip_text = false;
-                    continue;
-                }
-                if let Err(e) = figcraft_engine::textedit::insert(&mut app.session, t) {
-                    app.toast(e.to_string());
+            Event::Text(t) => {
+                if !std::mem::take(&mut skip_text) {
+                    insert_text(app, ctx, t);
                 }
             }
-            // The composition shows inline at the caret; the document gets it on Commit.
-            Event::Ime(egui::ImeEvent::Preedit { text, active_range_chars }) => {
-                let cursor = active_range_chars.as_ref().map(|r| r.start);
-                if let Err(e) = figcraft_engine::textedit::preedit(&mut app.session, text, cursor) {
-                    app.toast(e.to_string());
-                }
-            }
-            Event::Paste(t) => {
-                // Plain text only: the engine normalises line endings and drops control chars.
-                if let Err(e) = figcraft_engine::textedit::insert(&mut app.session, t) {
-                    app.toast(e.to_string());
-                }
-            }
-            Event::Copy | Event::Cut => {
-                if let Some(text) = figcraft_engine::textedit::selected_text(&app.session).filter(|t| !t.is_empty()) {
-                    app.services.clipboard_set_text(&text);
-                    if matches!(ev, Event::Cut) {
-                        let _ = figcraft_engine::textedit::key(&mut app.session, "Delete", false, false, false);
-                    }
-                }
-            }
-            Event::Key { key, physical_key, pressed: true, modifiers: m, .. } => {
-                if (m.command || m.alt || m.ctrl) && text_shortcut(app, *key, *physical_key, *m) {
-                    skip_text = true;
-                    continue;
-                }
-                let name = match key {
-                    Key::Backspace => "Backspace",
-                    Key::Delete => "Delete",
-                    Key::ArrowLeft => "Left",
-                    Key::ArrowRight => "Right",
-                    Key::ArrowUp => "Up",
-                    Key::ArrowDown => "Down",
-                    Key::Home => "Home",
-                    Key::End => "End",
-                    Key::Enter => "Enter",
-                    Key::Escape => "Escape",
-                    Key::Tab => "Tab",
-                    Key::A if m.command => "SelectAll",
-                    Key::Z if m.command => {
-                        let _ = figcraft_engine::textedit::end(&mut app.session);
-                        app.run(if m.shift { "edit.redo" } else { "edit.undo" }, json!({}));
-                        continue;
-                    }
-                    _ => continue,
-                };
-                if name == "Enter" && m.command {
-                    let _ = figcraft_engine::textedit::end(&mut app.session);
-                    continue;
-                }
-                let (word, line) = keymap::text_motion(platform(), name, mods(*m));
-                if let Err(e) = figcraft_engine::textedit::key(&mut app.session, name, m.shift, word, line) {
-                    app.toast(e.to_string());
-                }
+            Event::Ime(ime) => ime_event(app, ctx, ime),
+            Event::Paste(t) => insert_text(app, ctx, t),
+            Event::Copy => copy_or_cut(app, ctx, false),
+            Event::Cut => copy_or_cut(app, ctx, true),
+            Event::Key { key, physical_key, pressed: true, modifiers: m, .. } if text_key_event(app, ctx, *key, *physical_key, *m) => {
+                skip_text = true;
             }
             _ => {}
         }
     }
     // Triple-click on the edited text selects its line (double-click is handled by the engine).
-    if ctx.input(|i| i.pointer.button_triple_clicked(egui::PointerButton::Primary))
-        && let Some(pos) = ctx.input(|i| i.pointer.interact_pos())
-        && app.canvas.rect.contains(pos)
-        && let Some(te) = app.session.ds().ok().and_then(|d| d.text_edit.clone())
+    triple_click_line(app, ctx);
+    app.sync_preedit();
+}
+
+/// Insert plain text (the engine normalises line endings and drops control chars) into the edit,
+/// noting the application change the mutation caused.
+fn insert_text(app: &mut FigApp, ctx: &Context, t: &str) {
+    let before = ime_stamp(app);
+    if let Err(e) = figcraft_engine::textedit::insert(&mut app.session, t) {
+        app.toast(e.to_string());
+    }
+    if ime_stamp(app) != before {
+        note_ime_application_change(app, ctx);
+    }
+}
+
+/// An IME commit, preedit or surrounding-text deletion for the edit.
+fn ime_event(app: &mut FigApp, ctx: &Context, ev: &egui::ImeEvent) {
+    match ev {
+        // An accepted IME commit earns an explicit receipt only around the exact mutation.
+        // List AutoFormat inside the same command is an application transformation.
+        egui::ImeEvent::Commit(t) => {
+            let before = ime_stamp(app);
+            match figcraft_engine::textedit::insert_ime_commit(&mut app.session, t) {
+                Ok(ImeInsertion::Plain) => ime_receipt(app, ctx, before),
+                Ok(ImeInsertion::Transformed) => note_ime_application_change(app, ctx),
+                Ok(ImeInsertion::Nothing) => {}
+                Err(e) => app.toast(e.to_string()),
+            }
+        }
+        // The composition shows inline at the caret; the document gets it on Commit.
+        egui::ImeEvent::Preedit { text, active_range_chars } => {
+            let cursor = active_range_chars.as_ref().map(|r| r.start);
+            if let Err(e) = figcraft_engine::textedit::preedit(&mut app.session, text, cursor) {
+                app.toast(e.to_string());
+            }
+        }
+        // An IME replacing text around the caret (0.37's incoming byte-counted deletion)
+        // deletes it before the paired Commit inserts the replacement.
+        egui::ImeEvent::DeleteSurroundingBytes { before_bytes, after_bytes } => {
+            let before = ime_stamp(app);
+            match figcraft_engine::textedit::delete_surrounding_bytes(&mut app.session, *before_bytes, *after_bytes) {
+                Ok(true) => ime_receipt(app, ctx, before),
+                Ok(false) => {}
+                Err(e) => app.toast(e.to_string()),
+            }
+        }
+        egui::ImeEvent::DeleteSurrounding { before_chars, after_chars } => {
+            let before = ime_stamp(app);
+            match figcraft_engine::textedit::delete_surrounding_chars(&mut app.session, *before_chars, *after_chars) {
+                Ok(true) => ime_receipt(app, ctx, before),
+                Ok(false) => {}
+                Err(e) => app.toast(e.to_string()),
+            }
+        }
+        // Legacy Enabled/Disabled events were ignored by the original event dispatcher too.
+        _ => {}
+    }
+}
+
+/// Copy or cut the edit's selection. Input injected through the control channel must never read
+/// or replace the user's system clipboard; it may still edit the document: a synthetic Cut
+/// deletes the selection exactly like a user's Cut; only the OS clipboard write is fenced.
+fn copy_or_cut(app: &mut FigApp, ctx: &Context, cut: bool) {
+    let before = ime_stamp(app);
+    let selected = figcraft_engine::textedit::selected_text(&app.session).filter(|t| !t.is_empty());
+    if !app.control_synthetic
+        && let Some(text) = &selected
     {
-        let p = app.to_page(pos);
-        let inside = app.session.doc().ok().and_then(|d| d.world_bounds(te.id)).is_some_and(|b| b.contains(p));
-        if inside && let Ok(idx) = app.session.text_index_at(te.id, p) {
-            app.run("text.edit.selectLine", json!({"index": idx}));
+        app.clipboard_set_text(text);
+    }
+    if cut && selected.is_some() {
+        let _ = figcraft_engine::textedit::key(&mut app.session, "Delete", false, false, false);
+    }
+    if ime_stamp(app) != before {
+        note_ime_application_change(app, ctx);
+    }
+}
+
+/// A text-editing key press. `true` when it ran a shortcut, whose following Text event is
+/// swallowed (a shortcut that changed committed text/selection is also an application edit).
+fn text_key_event(app: &mut FigApp, ctx: &Context, key: Key, physical: Option<Key>, m: Modifiers) -> bool {
+    // Keys during a composition are the IME's (Enter picks a candidate, Escape cancels).
+    if app.session.ds().is_ok_and(|d| d.text_edit.as_ref().is_some_and(|te| te.preedit.is_some())) {
+        return false;
+    }
+    if m.command || m.alt || m.ctrl {
+        let before = ime_stamp(app);
+        if text_shortcut(app, key, physical, m) {
+            // A text shortcut that changed the committed text/selection (a list,
+            // Bold, alignment) is an application edit; Save and friends are not.
+            if ime_stamp(app) != before {
+                note_ime_application_change(app, ctx);
+            }
+            return true;
         }
     }
-    app.sync_preedit();
-    ime_output(app, ctx);
+    if key == Key::Z && m.command {
+        note_ime_application_change(app, ctx);
+        let _ = figcraft_engine::textedit::end(&mut app.session);
+        app.run(if m.shift { "edit.redo" } else { "edit.undo" }, json!({}));
+        return false;
+    }
+    let Some(name) = text_key_name(key, m.command) else { return false };
+    if name == "Enter" && m.command {
+        let _ = figcraft_engine::textedit::end(&mut app.session);
+        return false;
+    }
+    let before = ime_stamp(app);
+    let (word, line) = keymap::text_motion(platform(), name, mods(m));
+    if let Err(e) = figcraft_engine::textedit::key(&mut app.session, name, m.shift, word, line) {
+        app.toast(e.to_string());
+    }
+    if ime_stamp(app) != before {
+        note_ime_application_change(app, ctx);
+    }
+    false
+}
+
+/// The text-edit command a named key runs, if any.
+fn text_key_name(key: Key, command: bool) -> Option<&'static str> {
+    Some(match key {
+        Key::Backspace => "Backspace",
+        Key::Delete => "Delete",
+        Key::ArrowLeft => "Left",
+        Key::ArrowRight => "Right",
+        Key::ArrowUp => "Up",
+        Key::ArrowDown => "Down",
+        Key::Home => "Home",
+        Key::End => "End",
+        Key::Enter => "Enter",
+        Key::Escape => "Escape",
+        Key::Tab => "Tab",
+        Key::A if command => "SelectAll",
+        _ => return None,
+    })
+}
+
+/// Triple-click on the edited text selects its line (double-click is handled by the engine).
+fn triple_click_line(app: &mut FigApp, ctx: &Context) {
+    if !ctx.input(|i| i.pointer.button_triple_clicked(egui::PointerButton::Primary)) {
+        return;
+    }
+    let Some(pos) = ctx.input(|i| i.pointer.interact_pos()).filter(|pos| app.canvas.rect.contains(*pos)) else {
+        return;
+    };
+    let Some(te) = app.session.ds().ok().and_then(|d| d.text_edit.clone()) else { return };
+    let p = app.to_page(pos);
+    if let Some(idx) = text_line_index(app, te.id, p) {
+        let before = ime_stamp(app);
+        app.run("text.edit.selectLine", json!({"index": idx}));
+        if ime_stamp(app) != before {
+            note_ime_application_change(app, ctx);
+        }
+    }
+}
+
+/// The text index of the line under `p`, when the edit's node contains it.
+fn text_line_index(app: &FigApp, id: figcraft_doc::NodeId, p: figcraft_geom::Point) -> Option<usize> {
+    let inside = app.session.doc().ok().and_then(|d| d.world_bounds(id)).is_some_and(|b| b.contains(p));
+    if !inside {
+        return None;
+    }
+    app.session.text_index_at(id, p).ok()
 }
 
 /// Shortcuts live while editing text (Bold, lists, alignment, size/weight/spacing steps, Save…).
@@ -433,28 +894,126 @@ fn text_shortcut(app: &mut FigApp, key: Key, physical: Option<Key>, m: Modifiers
 
 /// Tell the platform where the caret is (inside the composition while composing) so IME
 /// candidate windows open next to it.
-fn ime_output(app: &FigApp, ctx: &Context) {
-    let Some(te) = app.session.ds().ok().and_then(|d| d.text_edit.clone()) else { return };
+///
+/// This is FigCraft's one custom IME producer. Geometry stays the actual caret (the composition
+/// cursor while composing); the descriptor also carries the reviewed E21b payload: a stable
+/// per-edit owner, a viewport-scoped context generation, a bounded committed-text snapshot around
+/// the selection (UTF-8 byte offsets, reversed direction preserved, pre-edit excluded) and an
+/// explicit `Other`/`InputMethod` change cause. The engine query is logical model text, never a
+/// visually reordered string, and copies at most 4000 bytes. One observation is made per viewport pass,
+/// after this pass's IME events and commands were applied. The only production caller is
+/// `FigApp::observe_ime`, the pass's single observation point.
+pub(crate) fn ime_output(app: &mut FigApp, ctx: &Context) {
+    let viewport = ctx.viewport_id();
+    let Some(target) = ime_target(app) else {
+        ime_idle(app, ctx);
+        return;
+    };
+    let Some(cursor_rect) = ime_cursor_rect(app) else {
+        // No visible caret means no focused owner for this pass; a later pass starts a new
+        // generation instead of inheriting a composition.
+        ime_idle(app, ctx);
+        return;
+    };
+    let frame_nr = ctx.cumulative_frame_nr_for(viewport);
+    let pass_nr = ctx.cumulative_pass_nr_for(viewport);
+    let surrounding = figcraft_engine::textedit::ime_surrounding(&app.session);
+    let committed = surrounding.as_ref().ok().map(|s| CommittedText::new(&s.text, s.cursor, s.anchor));
+    // The tracker compares every receipt with the last observation's baseline. An unavailable
+    // baseline therefore needs the same engine revision as `ime_stamp`; otherwise a later
+    // unavailable -> available receipt (a commit replacing a too-wide selection) cannot match it.
+    let unavailable_revision = if surrounding.is_err() { app.session.ds().ok().map(|ds| ds.revision) } else { None };
+    let observation = ImeObservation::new(frame_nr, pass_nr, target).purpose(egui::IMEPurpose::Normal).committed(committed);
+    let observation = match unavailable_revision {
+        Some(revision) => observation.unavailable_revision(revision),
+        None => observation,
+    };
+    let Some(update) = app.ime.observe(viewport, Some(observation)) else { return };
+    ctx.output_mut(|o| {
+        o.ime = Some(egui::output::IMEOutput {
+            owner: update.owner,
+            context_generation: update.context_generation,
+            purpose: update.purpose,
+            // The desktop places the candidate window by `rect` (the web by `cursor_rect`).
+            rect: cursor_rect,
+            cursor_rect,
+            should_interrupt_composition: false,
+            reset_request: None,
+            change_cause: update.change_cause,
+            surrounding_text: update.surrounding_text,
+        })
+    });
+}
+
+/// Mark this viewport's custom editor as unfocused for the pass (no descriptor from it).
+fn ime_idle(app: &mut FigApp, ctx: &Context) {
+    let _ = app.ime.observe(ctx.viewport_id(), None);
+}
+
+/// The immutable identity of the edit being made, if any.
+fn ime_target(app: &FigApp) -> Option<ImeTarget> {
+    let ds = app.session.ds().ok()?;
+    let te = ds.text_edit.as_ref()?;
+    // A late `window.new` can move this file out of the window drawing now before the pass ends.
+    // The stale session still holds the edit, but this viewport no longer shows it: observe idle
+    // and let the receiving window own the platform IME on its own pass.
+    if !app.shows(ds.uid) {
+        return None;
+    }
+    // Document and node only: caret, selection, text, revision and geometry are ordinary updates.
+    let owner = egui::Id::unique(("figcraft.ime.text", ds.uid, te.id.0));
+    Some(ImeTarget::new(owner, te.editing_session))
+}
+
+/// The caret rectangle for the current edit (inside the composition while composing).
+fn ime_cursor_rect(app: &FigApp) -> Option<egui::Rect> {
+    let te = app.session.ds().ok()?.text_edit.clone()?;
     let preedit = app.preedit_view();
-    let Some(doc) = preedit.map(|p| &*p.doc).or_else(|| app.session.doc().ok()) else { return };
-    let Some(node) = doc.node(te.id) else { return };
-    let Some((layout, dy)) = figcraft_text::layout_node(node) else { return };
+    let doc = preedit.map(|p| &*p.doc).or_else(|| app.session.doc().ok())?;
+    let node = doc.node(te.id)?;
+    let (layout, dy) = figcraft_text::layout_node(node)?;
     let w = doc.world_transform(te.id);
     let (cx, li) = layout.caret(preedit.map(|p| p.cursor).unwrap_or(te.caret));
     let (top, h) = layout.lines.get(li).map(|l| (l.top, l.height)).unwrap_or((0.0, 14.0));
     let p0 = w * figcraft_geom::Point::new(cx, top + dy);
     let p1 = w * figcraft_geom::Point::new(cx, top + h + dy);
     let (a, b) = (app.to_screen(p0.x, p0.y), app.to_screen(p1.x, p1.y));
-    if !(a.x.is_finite() && a.y.is_finite() && b.x.is_finite() && b.y.is_finite()) {
-        return;
-    }
-    let cursor_rect = egui::Rect::from_two_pos(a, b + egui::vec2(1.0, 0.0));
-    ctx.output_mut(|o| {
-        o.ime = Some(egui::output::IMEOutput {
-            purpose: egui::IMEPurpose::Normal,
-            rect: app.canvas.rect,
-            cursor_rect,
-            should_interrupt_composition: false,
-        })
-    });
+    (a.x.is_finite() && a.y.is_finite() && b.x.is_finite() && b.y.is_finite()).then(|| egui::Rect::from_two_pos(a, b + egui::vec2(1.0, 0.0)))
+}
+
+/// The bounded committed snapshot of the current edit, for an IME receipt.
+///
+/// Each call walks the text once to the caret/anchor (O(n) worst case) and copies at most 4000
+/// bytes; the pair before/after a text-affecting event is what receipt validation compares.
+fn ime_stamp(app: &FigApp) -> Option<ImeMutationStamp> {
+    let ds = app.session.ds().ok()?;
+    ds.text_edit.as_ref()?;
+    Some(match figcraft_engine::textedit::ime_surrounding(&app.session) {
+        Ok(s) => ImeMutationStamp::from_committed(&s.text, s.cursor, s.anchor, None),
+        // A bounded snapshot is unavailable (for example, a selection wider than the budget).
+        // The document revision is still a trustworthy, engine-owned transition token for this
+        // edit target: every accepted mutation bumps it, and the target (document uid + node +
+        // editing session) scopes it. Without it the tracker cannot accept an unavailable-side
+        // receipt and reports an accepted IME commit/delete as `Other`.
+        Err(_) => ImeMutationStamp::unavailable_at_revision(ds.revision),
+    })
+}
+
+/// Record an accepted IME commit/deletion, immediately after it succeeded.
+///
+/// `before` is captured immediately before the same mutation. No-op, failed, stale and
+/// wrong-target receipts are rejected by the tracker, so they never earn `InputMethod`.
+fn ime_receipt(app: &mut FigApp, ctx: &Context, before: Option<ImeMutationStamp>) {
+    let (Some(before), Some(after), Some(target)) = (before, ime_stamp(app), ime_target(app)) else { return };
+    let viewport = ctx.viewport_id();
+    let frame_nr = ctx.cumulative_frame_nr_for(viewport);
+    let _ = app.ime.note_input_method_apply(viewport, frame_nr, target, before, after);
+}
+
+/// Record an application-origin edit for the frame (`Other` dominates it).
+fn note_ime_application_change(app: &mut FigApp, ctx: &Context) {
+    let Some(target) = ime_target(app) else { return };
+    let viewport = ctx.viewport_id();
+    let frame_nr = ctx.cumulative_frame_nr_for(viewport);
+    let _ = app.ime.note_application_change(viewport, frame_nr, target);
 }
diff --git a/crates/ui-egui/src/shortcuts_tests.rs b/crates/ui-egui/src/shortcuts_tests.rs
index cd0f0ea5..5c1e06fa 100644
--- a/crates/ui-egui/src/shortcuts_tests.rs
+++ b/crates/ui-egui/src/shortcuts_tests.rs
@@ -188,3 +188,12 @@ fn shortcuts_panel_opens_switches_tabs_and_searches() {
     u.app.run("help.shortcuts", json!({}));
     assert!(!u.app.ui.shortcuts_panel, "the command toggles it");
 }
+
+#[test]
+fn shortcuts_panel_does_not_show_on_the_home_screen() {
+    let mut u = Ui::new(Session::empty());
+    u.app.ui.home = true;
+    u.app.ui.shortcuts_panel = true;
+    u.frame(vec![]);
+    assert!(!u.app.ui.shortcuts_panel, "the panel closes on the home screen");
+}
diff --git a/crates/ui-egui/src/state.rs b/crates/ui-egui/src/state.rs
new file mode 100644
index 00000000..6480983f
--- /dev/null
+++ b/crates/ui-egui/src/state.rs
@@ -0,0 +1,65 @@
+#[derive(Clone, Copy, Debug, PartialEq, Eq, serde::Serialize)]
+pub enum RightTab {
+    Design,
+    Prototype,
+    Inspect,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, serde::Serialize)]
+pub enum LeftTab {
+    File,
+    Assets,
+}
+
+/// The window's title bar.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
+pub enum TitleBar {
+    /// The system draws it (and the browser): the tab strip sits below.
+    #[default]
+    Native,
+    /// A frameless window: the tab strip is the title bar, with our own window buttons and edges.
+    Custom,
+    /// macOS: the system's window buttons inset at the left of the tab strip.
+    Inset,
+}
+
+/// A file being encoded for auto-save: its snapshot and, once done, its bytes.
+pub type AutoSaveEncoding = std::thread::JoinHandle<(figcraft_engine::cmd::file::FileSnapshot, figcraft_engine::Result<Vec<u8>>)>;
+
+/// The side panels' widths: the least and most a drag of their edge gives, what a double-click on
+/// the edge puts back, and how much of the window they leave the canvas.
+pub const LEFT_PANEL: std::ops::RangeInclusive<f32> = 200.0..=480.0;
+
+pub const RIGHT_PANEL: std::ops::RangeInclusive<f32> = 240.0..=480.0;
+
+pub const PANEL_DEFAULT: f32 = 240.0;
+
+/// Windows narrower than this (logical points: phones, portrait tablets) show one side panel at a
+/// time over the canvas, opened from two buttons, instead of both beside it.
+pub const NARROW_WIDTH: f32 = 760.0;
+
+/// What an open side panel leaves of a narrow window: the column of panel buttons.
+pub(crate) const MOBILE_STRIP: f32 = 48.0;
+
+/// The side panel a narrow window shows.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum MobilePanel {
+    Left,
+    Right,
+}
+
+pub const CANVAS_MIN: f32 = 160.0;
+
+/// The widths the side panels are drawn at in `avail` points (the window less the icon rail), from
+/// the widths asked for (none while a panel is closed, which takes no room): each within its
+/// limits, and narrower in a small window so the canvas keeps [`CANVAS_MIN`] (the right panel
+/// gives way last).
+pub fn fit_panels(avail: f32, left: Option<f32>, right: Option<f32>) -> (f32, f32) {
+    let fit = |w: f32, range: &std::ops::RangeInclusive<f32>, room: f32| {
+        let w = if w.is_finite() { w } else { PANEL_DEFAULT };
+        w.clamp(*range.start(), room.clamp(*range.start(), *range.end()))
+    };
+    let left_min = left.map_or(0.0, |_| *LEFT_PANEL.start());
+    let right = right.map_or(0.0, |r| fit(r, &RIGHT_PANEL, avail - left_min - CANVAS_MIN));
+    (left.map_or(0.0, |l| fit(l, &LEFT_PANEL, avail - right - CANVAS_MIN)), right)
+}
diff --git a/crates/ui-egui/src/tabs.rs b/crates/ui-egui/src/tabs.rs
index 27ff085c..6f17910a 100644
--- a/crates/ui-egui/src/tabs.rs
+++ b/crates/ui-egui/src/tabs.rs
@@ -3,37 +3,112 @@
 //! window buttons; the window's edges resize it.
 
 use egui::{Align2, Color32, CornerRadius, Rect, Sense, Stroke, Ui, pos2, vec2};
+use figcraft_doc::NodeId;
 use serde_json::json;
 
 use crate::a11y::Tip;
 use crate::i18n::{tr, trf};
 use crate::icons::{self, Icon};
+use crate::present::{PresentTab, Presenter};
 use crate::theme::{Tokens, regular};
 use crate::{FigApp, TitleBar};
 
 pub const HEIGHT: f32 = 40.0;
+const MIN_TAB_WIDTH: f32 = 96.0;
+const OVERFLOW_WIDTH: f32 = 32.0;
+const OPEN_TIME: f64 = 0.18;
 
+/// Which tabs were open last frame and when the newly opened ones appeared. It is updated in place
+/// in egui's memory; it only allocates when the set of tabs changes.
+#[derive(Clone, Default)]
+struct TabMotion {
+    initialized: bool,
+    known: Vec<u64>,
+    opening: Vec<(u64, f64)>,
+}
+
+impl TabMotion {
+    /// Track tabs added since the previous frame and expire their animations.
+    fn begin_frame(&mut self, current: impl Iterator<Item = u64> + Clone, now: f64, reduce_motion: bool) {
+        if !self.known.iter().copied().eq(current.clone()) {
+            if self.initialized && !reduce_motion {
+                for uid in current.clone().filter(|uid| !self.known.contains(uid)) {
+                    self.opening.push((uid, now));
+                }
+            }
+            self.known = current.collect();
+        }
+        self.initialized = true;
+        if reduce_motion {
+            self.opening.clear();
+        } else {
+            let known = &self.known;
+            self.opening.retain(|(uid, started)| known.contains(uid) && now - *started < OPEN_TIME);
+        }
+    }
+}
+
+/// The entering tab's progress among `opening` (from [`TabMotion`]), or 1 when it is not animating.
+fn open_progress(opening: &[(u64, f64)], uid: u64, now: f64) -> f32 {
+    opening.iter().find(|(u, _)| *u == uid).map_or(1.0, |(_, started)| ((now - started) / OPEN_TIME).clamp(0.0, 1.0) as f32)
+}
+
+struct TabLayout {
+    first: usize,
+    widths: Vec<f32>,
+    overflow: bool,
+}
+
+/// Shrink open tabs before moving the excess into the overflow menu.
+fn tab_layout(preferred: &[f32], available: f32, active: Option<usize>) -> TabLayout {
+    let count = preferred.len();
+    let overflow = count as f32 * MIN_TAB_WIDTH > available;
+    let visible = if overflow { ((available - OVERFLOW_WIDTH).max(0.0) / MIN_TAB_WIDTH).floor() as usize } else { count }.min(count);
+    let first = active.unwrap_or(0).saturating_sub(visible / 2).min(count - visible);
+    let mut widths = preferred[first..first + visible].to_vec();
+    let budget = (available - if overflow { OVERFLOW_WIDTH } else { 0.0 }).max(0.0);
+    let mut excess = (widths.iter().sum::<f32>() - budget).max(0.0);
+    while excess > 0.01 {
+        let flexible = widths.iter().filter(|w| **w > MIN_TAB_WIDTH + 0.01).count();
+        if flexible == 0 {
+            break;
+        }
+        let share = excess / flexible as f32;
+        let mut removed = 0.0;
+        for width in &mut widths {
+            let shrink = (*width - MIN_TAB_WIDTH).max(0.0).min(share);
+            *width -= shrink;
+            removed += shrink;
+        }
+        excess -= removed;
+    }
+    TabLayout { first, widths, overflow }
+}
+
+/// Final document index and insertion marker for a tab dropped among the visible tabs.
+fn tab_drop_position(visible: &[(usize, Rect)], from: usize, pointer_x: f32) -> Option<(usize, f32)> {
+    let others: Vec<_> = visible.iter().copied().filter(|(index, _)| *index != from).collect();
+    let slot = others.partition_point(|(_, rect)| rect.center().x < pointer_x);
+    if let Some(&(index, rect)) = others.get(slot) {
+        Some((index - usize::from(from < index), rect.min.x))
+    } else {
+        let &(index, rect) = others.last()?;
+        Some((index + usize::from(from > index), rect.max.x))
+    }
+}
+
+/// Draw the top tab bar: Home, document and presenter tabs, new-tab and window controls,
+/// open/close/reorder animation and tab closing, pausing the presenter when going Home.
 pub fn tab_bar(app: &mut FigApp, ui: &mut Ui) {
     let t = Tokens::get(ui.ctx());
     egui::Panel::top("tab_bar").exact_size(HEIGHT).frame(egui::Frame::NONE.fill(t.tab_bar)).show(ui, |ui| {
         let rect = ui.max_rect();
-        // Empty space moves the window (first, so the tabs and buttons on top take their clicks).
-        if app.ui.title_bar != TitleBar::Native {
-            let drag = ui.interact(rect, ui.id().with("titlebar_drag"), Sense::click_and_drag());
-            if drag.drag_started() {
-                ui.ctx().send_viewport_cmd(egui::ViewportCommand::StartDrag);
-            }
-            if drag.double_clicked() {
-                let max = ui.input(|i| i.viewport().maximized.unwrap_or(false));
-                ui.ctx().send_viewport_cmd(egui::ViewportCommand::Maximized(!max));
-            }
-        }
-        let buttons_w = if app.ui.title_bar == TitleBar::Custom { window_buttons(ui, rect) } else { 0.0 };
+        let buttons_w = if app.ui.title_bar == TitleBar::Custom { window_buttons(app, ui, rect) } else { 0.0 };
         let mut x = rect.min.x + if app.ui.title_bar == TitleBar::Inset { 76.0 } else { 8.0 };
         // Home.
         let hr = Rect::from_min_size(pos2(x, rect.min.y), vec2(44.0, HEIGHT));
-        let hresp = ui.interact(hr, ui.id().with("home"), Sense::click()).tip(tr("Home"));
-        let home_active = app.ui.home || !app.has_files();
+        let hresp = ui.interact(hr, ui.scope_id().with("home"), Sense::click()).tip(tr("Home"));
+        let home_active = (app.ui.home || !app.has_files()) && app.ui.present.is_none();
         crate::a11y::tab(&hresp, tr("Home"), home_active);
         if home_active {
             ui.painter().rect_filled(hr, CornerRadius::ZERO, t.tab_active);
@@ -42,32 +117,80 @@ pub fn tab_bar(app: &mut FigApp, ui: &mut Ui) {
         }
         icons::paint(ui.painter(), Rect::from_center_size(hr.center(), vec2(16.0, 16.0)), Icon::Home, t.icon);
         if hresp.clicked() {
+            pause_present(app);
             app.ui.home = true;
         }
         x += 44.0;
         ui.painter().line_segment([pos2(x, rect.min.y), pos2(x, rect.max.y)], Stroke::new(1.0, t.border));
+        let document_tabs: Vec<usize> = app.session.docs.iter().enumerate().filter_map(|(i, d)| app.shows(d.uid).then_some(i)).collect();
+        let now = ui.input(|input| input.time);
+        let motion_id = ui.scope_id().with("tab_motion");
+        let current_uids = document_tabs.iter().filter_map(|&i| app.session.docs.get(i).map(|d| d.uid));
+        let reduce_motion = app.reduce_motion();
+        // Cloning `opening` is free while nothing animates (an empty Vec).
+        let opening = ui.ctx().data_mut(|data| {
+            let motion = data.get_temp_mut_or_default::<TabMotion>(motion_id);
+            motion.begin_frame(current_uids, now, reduce_motion);
+            motion.opening.clone()
+        });
+        let preferred: Vec<f32> = document_tabs
+            .iter()
+            .map(|&i| {
+                let d = &app.session.docs[i];
+                let mark_w = if live_mark(app, d.uid).is_some() { 18.0 } else { 0.0 };
+                let dot_w = if d.is_dirty() && mark_w > 0.0 { 12.0 } else { 0.0 };
+                (regular(12.0).size * 0.6 * d.doc.name.chars().count() as f32 + 64.0 + mark_w + dot_w).clamp(120.0, 220.0)
+            })
+            .collect();
+        // Leave the new-tab button, theme toggle, window controls and a draggable gap free.
+        let room = (rect.max.x - buttons_w - 70.0 - x - 34.0).max(0.0);
+        let present_pref: Vec<f32> = app.ui.presents.iter().map(present_tab_width).collect();
+        let present_on = app.ui.present.as_ref().and(app.ui.present_active);
+        let active_present = present_on.and_then(|id| app.ui.presents.iter().position(|p| p.id == id));
+        let present_layout = tab_layout(&present_pref, present_room(room, &present_pref, !document_tabs.is_empty()), active_present);
+        let present_used = present_layout.widths.iter().sum::<f32>() + if present_layout.overflow { OVERFLOW_WIDTH } else { 0.0 };
+        let available = (room - present_used).max(0.0);
+        let active_tab = document_tabs.iter().position(|&i| i == app.session.active);
+        let layout = tab_layout(&preferred, available, active_tab);
+        let mut tab_rects = Vec::with_capacity(layout.widths.len());
+        let mut tab_x = x;
+        for &width in &layout.widths {
+            tab_rects.push(Rect::from_min_size(pos2(tab_x, rect.min.y), vec2(width, HEIGHT)));
+            tab_x += width;
+        }
         let mut switch = None;
         let mut close = None;
         // A tab dragged off the strip, or "Open in new window", moves to a window of its own.
         let mut detach = None;
+        let mut dragging = None;
+        let mut dropped = None;
         let several = !ui.ctx().embed_viewports();
-        for (i, d) in app.session.docs.iter().enumerate().filter(|(_, d)| app.shows(d.uid)) {
-            let active = i == app.session.active && !app.ui.home;
-            let name = d.doc.name.clone();
+        for (slot, &w) in layout.widths.iter().enumerate() {
+            let i = document_tabs[layout.first + slot];
+            let d = &app.session.docs[i];
+            let active = i == app.session.active && !app.ui.home && app.ui.present.is_none();
+            let name = &d.doc.name;
             // In a live session: a mark after the name says whether others get in.
             let live = live_mark(app, d.uid);
             let mark_w = if live.is_some() { 18.0 } else { 0.0 };
-            // (A file in a session is rarely saved here: its unsaved dot gets room beside the mark.)
             let dirty = d.is_dirty();
-            let dot_w = if dirty && live.is_some() { 12.0 } else { 0.0 };
-            let w = (regular(12.0).size * 0.6 * name.chars().count() as f32 + 64.0 + mark_w + dot_w).clamp(120.0, 220.0);
-            let r = Rect::from_min_size(pos2(x, rect.min.y), vec2(w, HEIGHT));
-            let resp = ui.interact(r, ui.id().with(("tab", d.uid)), if several { Sense::click_and_drag() } else { Sense::click() });
-            if resp.drag_stopped()
+            let r = tab_rects[slot];
+            let body_r = Rect::from_min_max(r.min, pos2(r.max.x - 32.0, r.max.y));
+            let close_r = Rect::from_min_max(body_r.right_top(), r.max);
+            let resp = ui.interact(body_r, ui.scope_id().with(("tab", d.uid)), Sense::click_and_drag());
+            let cresp = ui.interact(close_r, ui.scope_id().with(("tabclose", d.uid)), Sense::click()).tip(tr("Close tab"));
+            if (resp.dragged() || resp.drag_stopped())
                 && let Some(p) = ui.input(|inp| inp.pointer.latest_pos())
-                && (p.y - rect.center().y).abs() > HEIGHT * 2.0
             {
-                detach = Some((i, Some(p)));
+                if resp.drag_stopped() {
+                    if several && (p.y - rect.center().y).abs() > HEIGHT * 2.0 {
+                        detach = Some((i, Some(p)));
+                    } else if (rect.min.y - 12.0..=rect.max.y + 12.0).contains(&p.y) {
+                        dropped = Some((i, p.x));
+                    }
+                } else {
+                    dragging = Some((i, p));
+                }
             }
             if several {
                 resp.context_menu(|ui| {
@@ -79,49 +202,52 @@ pub fn tab_bar(app: &mut FigApp, ui: &mut Ui) {
                 });
             }
             let label = match live {
-                Some(true) => trf("{name}, in a live session", &[("name", &name)]),
-                Some(false) => trf("{name}, online, open only to you", &[("name", &name)]),
+                Some(true) => trf("{name}, in a live session", &[("name", name)]),
+                Some(false) => trf("{name}, online, open only to you", &[("name", name)]),
                 None => name.clone(),
             };
             let resp = if live.is_some() { resp.on_hover_text(&label) } else { resp };
             crate::a11y::tab(&resp, &label, active);
+            let progress = open_progress(&opening, d.uid, now);
+            let paint_r = r.translate(vec2(-28.0 * (1.0 - progress).powi(2), 0.0));
+            let painter = ui.painter().with_clip_rect(r);
             if active {
-                ui.painter().rect_filled(r, CornerRadius::ZERO, t.tab_active);
-            } else if resp.hovered() {
-                ui.painter().rect_filled(r, CornerRadius::ZERO, t.hover);
+                painter.rect_filled(paint_r, CornerRadius::ZERO, t.tab_active.linear_multiply(progress));
+            } else if resp.hovered() || cresp.hovered() {
+                painter.rect_filled(paint_r, CornerRadius::ZERO, t.hover.linear_multiply(progress));
             }
             icons::paint(
-                ui.painter(),
-                Rect::from_center_size(pos2(r.min.x + 18.0, r.center().y), vec2(14.0, 14.0)),
-                Icon::Logo,
-                crate::theme::ACCENT,
+                &painter,
+                Rect::from_center_size(pos2(paint_r.min.x + 18.0, paint_r.center().y), vec2(14.0, 14.0)),
+                icons::file_mark(d.doc.kind),
+                crate::theme::ACCENT.linear_multiply(progress),
             );
             // The unsaved-changes dot follows the name on screen, whichever way the name reads.
             let shown = crate::bidi::paint_name(
-                ui.painter(),
-                pos2(r.min.x + 32.0, r.center().y),
-                &name,
+                &painter,
+                pos2(paint_r.min.x + 32.0, paint_r.center().y),
+                name,
                 regular(12.0),
-                t.text,
-                w - mark_w - if dirty { 72.0 } else { 60.0 },
+                t.text.linear_multiply(progress),
+                (w - mark_w - if dirty { 72.0 } else { 60.0 }).max(0.0),
             );
             if let Some(shared) = live {
-                let at = Rect::from_center_size(pos2(r.max.x - 38.0, r.center().y), vec2(14.0, 14.0));
-                icons::paint(ui.painter(), at, crate::online::mark(shared), if shared { t.success } else { t.icon_secondary });
+                let at = Rect::from_center_size(pos2(paint_r.max.x - 38.0, paint_r.center().y), vec2(14.0, 14.0));
+                icons::paint(&painter, at, crate::online::mark(shared), if shared { t.success } else { t.icon_secondary }.linear_multiply(progress));
             }
             if dirty {
-                ui.painter().text(pos2(shown.max.x + 4.0, r.center().y), Align2::LEFT_CENTER, "•", regular(12.0), t.text);
+                painter.text(pos2(shown.max.x + 4.0, paint_r.center().y), Align2::LEFT_CENTER, "•", regular(12.0), t.text.linear_multiply(progress));
             }
-            let cr = Rect::from_center_size(pos2(r.max.x - 16.0, r.center().y), vec2(18.0, 18.0));
-            if resp.hovered() || active {
-                let cresp = ui.interact(cr, ui.id().with(("tabclose", d.uid)), Sense::click()).tip(tr("Close tab"));
+            let cr = Rect::from_center_size(close_r.center() + vec2(paint_r.min.x - r.min.x, 0.0), vec2(18.0, 18.0));
+            // The close target never overlaps the draggable body, including on inactive tabs.
+            if resp.hovered() || cresp.hovered() || active {
                 if cresp.hovered() {
-                    ui.painter().rect_filled(cr, CornerRadius::same(4), t.pressed);
-                }
-                icons::paint(ui.painter(), cr.shrink(4.0), Icon::Close, t.icon_secondary);
-                if cresp.clicked() {
-                    close = Some(i);
+                    painter.rect_filled(cr, CornerRadius::same(4), t.pressed.linear_multiply(progress));
                 }
+                icons::paint(&painter, cr.shrink(4.0), Icon::Close, t.icon_secondary.linear_multiply(progress));
+            }
+            if cresp.clicked() {
+                close = Some(i);
             }
             if resp.clicked() && close.is_none() {
                 switch = Some(i);
@@ -132,20 +258,91 @@ pub fn tab_bar(app: &mut FigApp, ui: &mut Ui) {
             x += w;
             ui.painter().line_segment([pos2(x, rect.min.y + 10.0), pos2(x, rect.max.y - 10.0)], Stroke::new(1.0, t.border));
         }
+        let visible: Vec<(usize, Rect)> = tab_rects.iter().copied().enumerate().map(|(slot, r)| (document_tabs[layout.first + slot], r)).collect();
+        if let Some((from, p)) = dragging
+            && (rect.min.y - 12.0..=rect.max.y + 12.0).contains(&p.y)
+            && let Some((_, at)) = tab_drop_position(&visible, from, p.x)
+        {
+            ui.painter().line_segment([pos2(at, rect.min.y + 5.0), pos2(at, rect.max.y - 5.0)], Stroke::new(3.0, crate::theme::ACCENT));
+        }
+        let reorder = dropped.and_then(|(from, at)| tab_drop_position(&visible, from, at).map(|(to, _)| (from, to)));
+        if layout.overflow {
+            let r = Rect::from_min_size(pos2(x, rect.min.y), vec2(OVERFLOW_WIDTH, HEIGHT));
+            let resp = ui.interact(r, ui.scope_id().with("tab_overflow"), Sense::click()).tip(tr("Open files"));
+            crate::a11y::menu_button(&resp, tr("Open files"), crate::a11y::menu_open(&resp));
+            if resp.hovered() {
+                ui.painter().rect_filled(r, CornerRadius::ZERO, t.hover);
+            }
+            icons::paint(ui.painter(), Rect::from_center_size(r.center(), vec2(14.0, 14.0)), Icon::Chevron, t.icon);
+            crate::right::menu_popup(&resp).show(|ui| {
+                egui::ScrollArea::vertical().max_height(400.0).show(ui, |ui| {
+                    for &i in &document_tabs {
+                        let Some(d) = app.session.docs.get(i) else { continue };
+                        let on = i == app.session.active && !app.ui.home && app.ui.present.is_none();
+                        let label = if d.is_dirty() { format!("{} •", d.doc.name) } else { d.doc.name.clone() };
+                        if crate::right::menu_check(ui, on, &label, "") {
+                            switch = Some(i);
+                            ui.close();
+                        }
+                    }
+                });
+            });
+            x += OVERFLOW_WIDTH;
+        }
+        // Presentations live in their own tabs. Switching back to the design keeps the player
+        // state (current screen, navigation history and scroll position) for the return trip.
+        let mut to_present = None;
+        let mut close_present_tab = None;
+        for (tab, &w) in app.ui.presents.iter().skip(present_layout.first).zip(&present_layout.widths) {
+            let active = present_on == Some(tab.id);
+            let (clicked, closed) = present_tab(ui, &t, tab, Rect::from_min_size(pos2(x, rect.min.y), vec2(w, HEIGHT)), active);
+            if clicked && !active {
+                to_present = Some(tab.id);
+            }
+            if closed {
+                close_present_tab = Some(tab.id);
+            }
+            x += w;
+            ui.painter().line_segment([pos2(x, rect.min.y + 10.0), pos2(x, rect.max.y - 10.0)], Stroke::new(1.0, t.border));
+        }
+        if present_layout.overflow {
+            let r = Rect::from_min_size(pos2(x, rect.min.y), vec2(OVERFLOW_WIDTH, HEIGHT));
+            let resp = ui.interact(r, ui.scope_id().with("present_overflow"), Sense::click()).tip(tr("Open presentations"));
+            crate::a11y::menu_button(&resp, tr("Open presentations"), crate::a11y::menu_open(&resp));
+            if resp.hovered() {
+                ui.painter().rect_filled(r, CornerRadius::ZERO, t.hover);
+            }
+            icons::paint(ui.painter(), Rect::from_center_size(r.center(), vec2(14.0, 14.0)), Icon::Chevron, t.icon);
+            crate::right::menu_popup(&resp).show(|ui| {
+                egui::ScrollArea::vertical().max_height(400.0).show(ui, |ui| {
+                    for tab in &app.ui.presents {
+                        let on = present_on == Some(tab.id);
+                        if crate::right::menu_check(ui, on, &present_tab_name(tab), "") {
+                            if !on {
+                                to_present = Some(tab.id);
+                            }
+                            ui.close();
+                        }
+                    }
+                });
+            });
+            x += OVERFLOW_WIDTH;
+        }
         // New tab.
         let nr = Rect::from_center_size(pos2(x + 20.0, rect.center().y), vec2(28.0, 28.0));
-        let nresp = ui.interact(nr, ui.id().with("newtab"), Sense::click()).tip(crate::shortcuts::tip(tr("New design file"), "file.new"));
+        let nresp = ui.interact(nr, ui.scope_id().with("newtab"), Sense::click()).tip(crate::shortcuts::tip(tr("New design file"), "file.new"));
         if nresp.hovered() {
             ui.painter().rect_filled(nr, CornerRadius::same(5), t.hover);
         }
         icons::paint(ui.painter(), nr.shrink(7.0), Icon::Plus, t.icon);
         if nresp.clicked() {
+            pause_present(app);
             app.run("file.new", json!({}));
             app.ui.home = false;
         }
         // Right side: theme toggle (left of the window buttons).
         let theme_r = Rect::from_center_size(pos2(rect.max.x - buttons_w - 24.0, rect.center().y), vec2(28.0, 28.0));
-        let tresp = ui.interact(theme_r, ui.id().with("theme"), Sense::click()).tip(tr("Toggle light/dark theme"));
+        let tresp = ui.interact(theme_r, ui.scope_id().with("theme"), Sense::click()).tip(tr("Toggle light/dark theme"));
         if tresp.hovered() {
             ui.painter().rect_filled(theme_r, CornerRadius::same(5), t.hover);
         }
@@ -154,10 +351,28 @@ pub fn tab_bar(app: &mut FigApp, ui: &mut Ui) {
             let cmd = if app.ui.dark { "view.themeLight" } else { "view.themeDark" };
             app.run(cmd, json!({}));
         }
+        // Only the free space drags the window. A full-bar drag target steals tab drags.
+        if app.ui.title_bar != TitleBar::Native && x + 34.0 < theme_r.min.x {
+            let free = Rect::from_min_max(pos2(x + 34.0, rect.min.y), pos2(theme_r.min.x, rect.max.y));
+            let drag = ui.interact(free, ui.scope_id().with("titlebar_drag"), Sense::click_and_drag());
+            if drag.drag_started() {
+                ui.ctx().send_viewport_cmd(egui::ViewportCommand::StartDrag);
+            }
+            if drag.double_clicked() {
+                let max = ui.input(|i| i.viewport().maximized.unwrap_or(false));
+                ui.ctx().send_viewport_cmd(egui::ViewportCommand::Maximized(!max));
+            }
+        }
         if let Some(i) = switch {
+            pause_present(app);
             app.run("doc.switch", json!({"index": i}));
             app.ui.home = false;
         }
+        if let Some(id) = close_present_tab {
+            close_present(app, id);
+        } else if let Some(id) = to_present {
+            show_present(app, id);
+        }
         if let Some((i, at)) = detach {
             // Where the pointer let go, on the screen.
             let at = at.and_then(|p| ui.input(|inp| inp.viewport().inner_rect).map(|r| r.min + p.to_vec2() - vec2(60.0, HEIGHT / 2.0)));
@@ -165,6 +380,11 @@ pub fn tab_bar(app: &mut FigApp, ui: &mut Ui) {
                 app.toast(e);
             }
         }
+        if let Some((from, to)) = reorder
+            && from != to
+        {
+            app.run("file.moveTab", json!({"from": from, "to": to}));
+        }
         if let Some(i) = close {
             // A branch tab's edits live on in its main file: closing it loses nothing.
             let dirty = app.session.docs.get(i).is_some_and(|d| d.is_dirty() && d.branch_of.is_none());
@@ -181,11 +401,172 @@ pub fn tab_bar(app: &mut FigApp, ui: &mut Ui) {
                 app.run("file.close", json!({"index": i}));
             }
         }
-        let _ = Color32::TRANSPARENT;
-        let _ = Align2::LEFT_TOP;
+        if !opening.is_empty() {
+            ui.ctx().request_repaint();
+        }
     });
 }
 
+/// One presentation tab in `r`: whether it was clicked and whether it was closed (its X or a
+/// middle click).
+fn present_tab(ui: &mut Ui, t: &Tokens, tab: &PresentTab, r: Rect, active: bool) -> (bool, bool) {
+    let label = present_tab_name(tab);
+    let body_r = Rect::from_min_max(r.min, pos2(r.max.x - 32.0, r.max.y));
+    let close_r = Rect::from_min_max(body_r.right_top(), r.max);
+    let resp = ui.interact(body_r, ui.scope_id().with(("presentation_tab", tab.id)), Sense::click()).tip(tr("Present"));
+    let cresp = ui.interact(close_r, ui.scope_id().with(("presentation_close", tab.id)), Sense::click()).tip(tr("Close preview"));
+    crate::a11y::tab(&resp, &label, active);
+    let hovered = resp.hovered() || cresp.hovered();
+    if active {
+        ui.painter().rect_filled(r, CornerRadius::ZERO, t.tab_active);
+    } else if hovered {
+        ui.painter().rect_filled(r, CornerRadius::ZERO, t.hover);
+    }
+    icons::paint(ui.painter(), Rect::from_center_size(pos2(r.min.x + 19.0, r.center().y), vec2(14.0, 14.0)), Icon::Play, t.icon);
+    crate::bidi::paint_name(ui.painter(), pos2(r.min.x + 34.0, r.center().y), &label, regular(12.0), t.text, r.width() - 62.0);
+    if hovered || active {
+        let cr = Rect::from_center_size(close_r.center(), vec2(18.0, 18.0));
+        if cresp.hovered() {
+            ui.painter().rect_filled(cr, CornerRadius::same(4), t.pressed);
+        }
+        icons::paint(ui.painter(), cr.shrink(4.0), Icon::Close, t.icon_secondary);
+    }
+    let closed = cresp.clicked() || resp.middle_clicked() || cresp.middle_clicked();
+    (resp.clicked(), closed)
+}
+
+/// The part of the strip's free `room` the presentation tabs may use: all they want, but at most
+/// half of it while file tabs share the strip, so they shrink or overflow before covering controls.
+fn present_room(room: f32, preferred: &[f32], files: bool) -> f32 {
+    preferred.iter().sum::<f32>().min(if files { room / 2.0 } else { room })
+}
+
+fn present_tab_width(tab: &PresentTab) -> f32 {
+    (regular(12.0).size * 0.6 * present_tab_name(tab).chars().count() as f32 + 64.0).clamp(140.0, 260.0)
+}
+
+/// "file - page", or the file alone when the page has no name.
+fn present_tab_name(tab: &PresentTab) -> String {
+    if tab.page_name.is_empty() { tab.file.clone() } else { format!("{} - {}", tab.file, tab.page_name) }
+}
+
+/// The presentation tabs for `ui.inspect`: each one's name and whether it is on screen.
+pub fn present_tabs_inspect(app: &FigApp) -> serde_json::Value {
+    let on_screen = |id| app.ui.present.is_some() && app.ui.present_active == Some(id);
+    app.ui.presents.iter().map(|t| json!({"name": present_tab_name(t), "active": on_screen(t.id)})).collect()
+}
+
+/// The presenter on screen, else the paused one of the active presentation tab.
+pub fn shown_or_paused(app: &FigApp) -> Option<&Presenter> {
+    app.ui.present.as_ref().or_else(|| {
+        let id = app.ui.present_active?;
+        app.ui.presents.iter().find(|t| t.id == id)?.pres.as_ref()
+    })
+}
+
+/// The index of the open file with `uid`, when a file tab shows it.
+fn owner(app: &FigApp, uid: u64) -> Option<usize> {
+    app.session.docs.iter().position(|d| d.uid == uid && app.shows(uid))
+}
+
+/// The presentation on screen plays the file in front (or no tab holds it). Only then may it read
+/// and change that file.
+pub fn present_owner_active(app: &FigApp) -> bool {
+    let Some(tab) = app.ui.present_active.and_then(|id| app.ui.presents.iter().find(|t| t.id == id)) else { return true };
+    owner(app, tab.doc_uid).is_some_and(|i| i == app.session.active)
+}
+
+/// Puts the presenter on screen back into its tab, where it keeps its state.
+fn pause_present(app: &mut FigApp) {
+    let Some(p) = app.ui.present.take() else { return };
+    let id = app.ui.present_active;
+    if let Some(t) = app.ui.presents.iter_mut().find(|t| Some(t.id) == id) {
+        t.pres = Some(p);
+    }
+}
+
+/// Presents from `start`: the tab of its page in this file shows again (from `start` when that
+/// changed), else a new tab opens.
+pub fn open_present(app: &mut FigApp, start: NodeId) {
+    let Ok(ds) = app.session.ds() else { return };
+    let (uid, path) = (ds.uid, ds.path.clone());
+    let page = ds.doc.page_of(start).unwrap_or(ds.page);
+    let file = ds.doc.name.clone();
+    let page_name = ds.doc.node(page).map(|n| n.name.clone()).unwrap_or_default();
+    let mut pres = Presenter::new(start);
+    pres.view = app.ui.present_view;
+    let same = |t: &&PresentTab| t.page == page && (t.doc_uid == uid || (path.is_some() && t.path == path));
+    if let Some(id) = app.ui.presents.iter().find(same).map(|t| t.id) {
+        show_present(app, id);
+        if app.ui.present.as_ref().is_some_and(|p| p.start() != start) {
+            app.ui.present = Some(pres);
+        }
+        return;
+    }
+    pause_present(app);
+    let id = app.ui.present_next;
+    app.ui.present_next += 1;
+    app.ui.presents.push(PresentTab { id, pres: None, doc_uid: uid, path, page, file, page_name });
+    app.ui.present = Some(pres);
+    app.ui.present_active = Some(id);
+    app.ui.home = false;
+}
+
+/// Brings tab `id` to the front and its file too, when that file is open.
+fn show_present(app: &mut FigApp, id: u64) {
+    app.ui.home = false;
+    if app.ui.present.is_some() && app.ui.present_active == Some(id) {
+        return;
+    }
+    pause_present(app);
+    let Some(tab) = app.ui.presents.iter_mut().find(|t| t.id == id) else { return };
+    let Some(p) = tab.pres.take() else { return };
+    let uid = tab.doc_uid;
+    if let Some(i) = owner(app, uid).filter(|i| *i != app.session.active) {
+        app.run("doc.switch", json!({"index": i}));
+    }
+    app.ui.present = Some(p);
+    app.ui.present_active = Some(id);
+}
+
+/// Closes tab `id`. If it was on screen, its file comes to the front, or Home when it is closed.
+pub fn close_present(app: &mut FigApp, id: u64) {
+    let Some(k) = app.ui.presents.iter().position(|t| t.id == id) else { return };
+    let tab = app.ui.presents.remove(k);
+    if app.ui.present_active != Some(id) {
+        return;
+    }
+    app.ui.present_active = None;
+    if app.ui.present.take().is_none() {
+        return;
+    }
+    match owner(app, tab.doc_uid) {
+        Some(i) => {
+            if i != app.session.active {
+                app.run("doc.switch", json!({"index": i}));
+            }
+            app.ui.home = false;
+        }
+        None => app.ui.home = true,
+    }
+}
+
+/// A file that opens again has a new uid. Find it by its path to give its tabs back.
+pub fn relink_presents(app: &mut FigApp) {
+    let docs = &app.session.docs;
+    for t in &mut app.ui.presents {
+        let found = docs.iter().find(|d| d.uid == t.doc_uid).or_else(|| docs.iter().find(|d| t.path.is_some() && d.path == t.path));
+        if let Some(d) = found {
+            t.doc_uid = d.uid;
+            t.path = d.path.clone();
+            t.file = d.doc.name.clone();
+            if let Some(n) = d.doc.node(t.page) {
+                t.page_name = n.name.clone();
+            }
+        }
+    }
+}
+
 /// What the tab of document `uid` says about its live session: others get in (`true`: a session
 /// this app hosts or joined, a file shared online), only you do (`false`: a file of yours on a
 /// server, not shared now), or it has none.
@@ -195,7 +576,7 @@ pub fn live_mark(app: &FigApp, uid: u64) -> Option<bool> {
 }
 
 /// Minimise, maximise/restore and close at the right end of the title bar; returns their width.
-fn window_buttons(ui: &mut Ui, bar: Rect) -> f32 {
+fn window_buttons(app: &mut FigApp, ui: &mut Ui, bar: Rect) -> f32 {
     const W: f32 = 46.0;
     let t = Tokens::get(ui.ctx());
     let max = ui.input(|i| i.viewport().maximized.unwrap_or(false));
@@ -210,7 +591,7 @@ fn window_buttons(ui: &mut Ui, bar: Rect) -> f32 {
     ];
     for (k, (icon, tip, cmd)) in buttons.into_iter().enumerate() {
         let r = Rect::from_min_size(pos2(bar.max.x - W * (3 - k) as f32, bar.min.y), vec2(W, bar.height()));
-        let resp = ui.interact(r, ui.id().with(("window_button", k)), Sense::click()).tip(tip);
+        let resp = ui.interact(r, ui.scope_id().with(("window_button", k)), Sense::click()).tip(tip);
         let close = k == 2;
         let mut col = t.icon;
         if resp.hovered() {
@@ -223,7 +604,11 @@ fn window_buttons(ui: &mut Ui, bar: Rect) -> f32 {
         }
         icons::paint(ui.painter(), Rect::from_center_size(r.center(), vec2(14.0, 14.0)), icon, col);
         if resp.clicked() {
-            ui.ctx().send_viewport_cmd(cmd);
+            if close {
+                crate::windows::request_close(app, ui.ctx());
+            } else {
+                ui.ctx().send_viewport_cmd(cmd);
+            }
         }
     }
     W * 3.0
@@ -248,9 +633,9 @@ pub fn resize_edges(ctx: &egui::Context) {
         (Rect::from_min_max(pos2(x0, y1 - E), pos2(x0 + E, y1)), D::SouthWest, CursorIcon::ResizeSouthWest),
         (Rect::from_min_max(pos2(x1 - E, y1 - E), pos2(x1, y1)), D::SouthEast, CursorIcon::ResizeSouthEast),
     ];
-    egui::Area::new(egui::Id::new("window_resize_edges")).order(egui::Order::Foreground).fixed_pos(s.min).interactable(true).show(ctx, |ui| {
+    egui::Area::new(egui::Id::unique("window_resize_edges")).order(egui::Order::Foreground).fixed_pos(s.min).interactable(true).show(ctx, |ui| {
         for (k, (r, dir, cursor)) in zones.into_iter().enumerate() {
-            let resp = ui.interact(r, egui::Id::new(("window_edge", k)), Sense::drag());
+            let resp = ui.interact(r, egui::Id::unique(("window_edge", k)), Sense::drag());
             if resp.hovered() || resp.dragged() {
                 ui.ctx().set_cursor_icon(cursor);
             }
@@ -260,3 +645,66 @@ pub fn resize_edges(ctx: &egui::Context) {
         }
     });
 }
+
+#[cfg(test)]
+mod layout_tests {
+    use super::{MIN_TAB_WIDTH, OPEN_TIME, OVERFLOW_WIDTH, TabMotion, open_progress, present_room, tab_drop_position, tab_layout};
+    use egui::{Rect, pos2};
+
+    #[test]
+    fn many_presentation_tabs_stay_inside_their_share_of_the_strip() {
+        let preferred = vec![260.0; 8];
+        let room = 900.0;
+        let layout = tab_layout(&preferred, present_room(room, &preferred, true), Some(7));
+        assert!(layout.overflow);
+        assert!(layout.first <= 7 && 7 < layout.first + layout.widths.len());
+        assert!(layout.widths.iter().all(|&width| width >= MIN_TAB_WIDTH));
+        assert!(layout.widths.iter().sum::<f32>() + OVERFLOW_WIDTH <= room / 2.0 + 0.01);
+        assert_eq!(present_room(room, &preferred, false), room);
+        assert_eq!(present_room(room, &[200.0], true), 200.0);
+    }
+
+    #[test]
+    fn tabs_shrink_to_fit_before_overflowing() {
+        let preferred = vec![120.0; 10];
+        let layout = tab_layout(&preferred, 1100.0, Some(5));
+        assert!(!layout.overflow);
+        assert_eq!(layout.first, 0);
+        assert_eq!(layout.widths.len(), preferred.len());
+        assert!(layout.widths.iter().all(|&width| (width - 110.0).abs() < 0.01));
+    }
+
+    #[test]
+    fn excess_tabs_leave_room_for_overflow_and_keep_the_active_tab_visible() {
+        let preferred = vec![120.0; 24];
+        let available = 1100.0;
+        let layout = tab_layout(&preferred, available, Some(23));
+        assert!(layout.overflow);
+        assert!(layout.first <= 23 && 23 < layout.first + layout.widths.len());
+        assert!(layout.widths.iter().all(|&width| width >= MIN_TAB_WIDTH));
+        assert!(layout.widths.iter().sum::<f32>() + OVERFLOW_WIDTH <= available + 0.01);
+    }
+
+    #[test]
+    fn drop_position_places_a_tab_between_its_neighbors() {
+        let visible = (0..4)
+            .map(|index| (index, Rect::from_min_max(pos2(index as f32 * 120.0, 0.0), pos2((index + 1) as f32 * 120.0, 40.0))))
+            .collect::<Vec<_>>();
+        assert_eq!(tab_drop_position(&visible, 0, 330.0).map(|(to, _)| to), Some(2));
+        assert_eq!(tab_drop_position(&visible, 3, 30.0).map(|(to, _)| to), Some(0));
+    }
+
+    #[test]
+    fn new_tabs_animate_unless_motion_is_reduced() {
+        let mut motion = TabMotion::default();
+        motion.begin_frame([1].into_iter(), 0.0, false);
+        assert!(motion.opening.is_empty(), "the tabs open at start-up don't animate");
+        motion.begin_frame([1, 2].into_iter(), 1.0, false);
+        assert_eq!(open_progress(&motion.opening, 2, 1.0), 0.0);
+        assert_eq!(open_progress(&motion.opening, 1, 1.0), 1.0);
+        motion.begin_frame([1, 2].into_iter(), 1.0 + 2.0 * OPEN_TIME, false);
+        assert!(motion.opening.is_empty(), "the animation ends");
+        motion.begin_frame([1, 2, 3].into_iter(), 2.0, true);
+        assert!(motion.opening.is_empty(), "Reduce motion opens tabs at once");
+    }
+}
diff --git a/crates/ui-egui/src/text_enter_tests.rs b/crates/ui-egui/src/text_enter_tests.rs
index 5de0522d..89129a7e 100644
--- a/crates/ui-egui/src/text_enter_tests.rs
+++ b/crates/ui-egui/src/text_enter_tests.rs
@@ -59,6 +59,30 @@ fn enter_edits_a_selected_text_with_all_of_it_selected_and_escape_keeps_the_laye
     assert!(u.app.session.selection().is_empty());
 }
 
+#[test]
+fn copying_and_cutting_selected_text_use_clipboard_service() {
+    use std::{cell::RefCell, rc::Rc};
+
+    struct Clipboard(Rc<RefCell<Vec<String>>>);
+    impl crate::Services for Clipboard {
+        fn clipboard_set_text(&mut self, text: &str) {
+            self.0.borrow_mut().push(text.to_string());
+        }
+    }
+
+    let mut s = Session::new();
+    let t = NodeId(s.execute("text.create", &json!({"text": "Hello world", "x": 20, "y": 20})).unwrap()["id"].as_u64().unwrap());
+    s.execute("select.set", &json!({"ids": [t]})).unwrap();
+    let mut u = Ui::new(s);
+    let copied = Rc::new(RefCell::new(Vec::new()));
+    u.app.services = Box::new(Clipboard(copied.clone()));
+    press(&mut u, Key::Enter);
+    u.frame_output(vec![Event::Copy]);
+    u.frame_output(vec![Event::Cut]);
+    assert_eq!(&*copied.borrow(), &["Hello world", "Hello world"]);
+    assert_eq!(u.app.session.doc().unwrap().node(t).unwrap().kind.text().unwrap().characters, "");
+}
+
 #[test]
 fn a_new_file_takes_the_page_colour_of_the_theme_and_keeps_it() {
     let mut s = Session::new();
diff --git a/crates/ui-egui/src/theme.rs b/crates/ui-egui/src/theme.rs
index 080bce43..acad6f8f 100644
--- a/crates/ui-egui/src/theme.rs
+++ b/crates/ui-egui/src/theme.rs
@@ -1,6 +1,6 @@
 //! Design tokens (UI3 light and dark) and fonts.
 
-use std::sync::Arc;
+use std::sync::{Arc, OnceLock};
 
 use egui::{Color32, Context, FontData, FontDefinitions, FontFamily, FontId, Stroke, TextStyle, Visuals};
 
@@ -14,6 +14,8 @@ pub struct Tokens {
     pub border_strong: Color32,
     pub text: Color32,
     pub text_secondary: Color32,
+    /// Dim text: disabled controls, placeholders, hints. At least 3:1 against the panels, fields
+    /// and selected rows, yet dimmer than `text_secondary`.
     pub text_tertiary: Color32,
     pub icon: Color32,
     pub icon_secondary: Color32,
@@ -23,6 +25,7 @@ pub struct Tokens {
     pub field_hover_border: Color32,
     pub accent: Color32,
     pub accent_hover: Color32,
+    pub accent_on: Color32,
     pub accent_text: Color32,
     pub selected_row: Color32,
     pub selected_row_child: Color32,
@@ -44,11 +47,42 @@ pub struct Tokens {
     pub focus: Color32,
 }
 
-pub const ACCENT: Color32 = Color32::from_rgb(0x0D, 0x99, 0xFF);
+/// FigCraft's brand green for solid surfaces.
+pub const BRAND: Color32 = Color32::from_rgb(0x02, 0xDA, 0x96);
+/// Contrast-safe green for thin selection outlines and white-on-green labels.
+/// It reaches 4.5:1 on white and 3:1 on the dark canvas.
+pub const ACCENT: Color32 = Color32::from_rgb(0x00, 0x87, 0x5F);
+/// Ink on the bright green brand surface (white would not have enough contrast).
+pub const ACCENT_ON: Color32 = Color32::from_rgb(0x07, 0x35, 0x2A);
+/// Id of the canvas overlays' green for this frame ([`set_canvas_page`]).
+const CANVAS_ACCENT: &str = "figcraft-canvas-accent";
+
+/// Remember the page colour the canvas shows. Its overlays (outlines, handles, arrows) take
+/// whichever green contrasts more with it: the bright one on a dark page, the darker on a light one.
+pub fn set_canvas_page(ctx: &Context, page: Color32) {
+    let pick = if c(BRAND).contrast(c(page)) > c(ACCENT).contrast(c(page)) { BRAND } else { ACCENT };
+    ctx.data_mut(|d| d.insert_temp(egui::Id::unique(CANVAS_ACCENT), pick));
+}
+
+/// `x` (opaque) as a document colour, for its contrast with another.
+fn c(x: Color32) -> figcraft_color::Color {
+    figcraft_color::Color::new(f32::from(x.r()) / 255.0, f32::from(x.g()) / 255.0, f32::from(x.b()) / 255.0, 1.0)
+}
+
+/// The green for overlays drawn on the page ([`set_canvas_page`]); [`ACCENT`] before a page shows.
+pub fn canvas_accent(ctx: &Context) -> Color32 {
+    ctx.data(|d| d.get_temp(egui::Id::unique(CANVAS_ACCENT))).unwrap_or(ACCENT)
+}
+
+/// A fill under white text: the darker green stands in for the bright one.
+pub fn under_white(c: Color32) -> Color32 {
+    if c == BRAND { ACCENT } else { c }
+}
+
 pub const COMPONENT: Color32 = Color32::from_rgb(0x97, 0x47, 0xFF);
 /// Handoff status badges (white text on these, in both themes).
-pub const DEV_READY: Color32 = Color32::from_rgb(0x14, 0xAE, 0x5C);
-pub const DEV_CHANGED: Color32 = Color32::from_rgb(0xD9, 0x7A, 0x06);
+pub const DEV_READY: Color32 = Color32::from_rgb(0x08, 0x7D, 0x4F);
+pub const DEV_CHANGED: Color32 = Color32::from_rgb(0xA7, 0x5B, 0x00);
 pub const DEV_COMPLETED: Color32 = Color32::from_rgb(0x6E, 0x6E, 0x73);
 
 impl Tokens {
@@ -63,23 +97,24 @@ impl Tokens {
             text: Color32::from_rgb(0x1E, 0x1E, 0x1E),
             // 4.7:1 on fields and hovered rows (#F5F5F5), 4.6:1 on selected rows: WCAG AA.
             text_secondary: Color32::from_rgb(0x6E, 0x6E, 0x6E),
-            text_tertiary: Color32::from_rgb(0xB3, 0xB3, 0xB3),
+            text_tertiary: Color32::from_rgb(0x8A, 0x8A, 0x8A),
             icon: Color32::from_rgb(0x1E, 0x1E, 0x1E),
             icon_secondary: Color32::from_rgb(0x75, 0x75, 0x75),
             hover: Color32::from_rgb(0xF5, 0xF5, 0xF5),
             pressed: Color32::from_rgb(0xE6, 0xE6, 0xE6),
             field: Color32::from_rgb(0xF5, 0xF5, 0xF5),
             field_hover_border: Color32::from_rgb(0xE6, 0xE6, 0xE6),
-            accent: ACCENT,
-            accent_hover: Color32::from_rgb(0x00, 0x7B, 0xE5),
-            // 5.2:1 on white, 4.6:1 on selected rows: WCAG AA for text.
-            accent_text: Color32::from_rgb(0x00, 0x6B, 0xD1),
-            selected_row: Color32::from_rgb(0xE5, 0xF4, 0xFF),
-            selected_row_child: Color32::from_rgb(0xF2, 0xF9, 0xFF),
+            accent: BRAND,
+            accent_hover: Color32::from_rgb(0x00, 0xAD, 0x78),
+            accent_on: ACCENT_ON,
+            // Darker green keeps links and labels legible on white and selected rows.
+            accent_text: Color32::from_rgb(0x00, 0x7A, 0x56),
+            selected_row: Color32::from_rgb(0xE0, 0xFB, 0xF1),
+            selected_row_child: Color32::from_rgb(0xF1, 0xFC, 0xF7),
             component: COMPONENT,
             component_row: Color32::from_rgb(0xF1, 0xE9, 0xFF),
             danger: Color32::from_rgb(0xF2, 0x48, 0x22),
-            success: Color32::from_rgb(0x14, 0xAE, 0x5C),
+            success: DEV_READY,
             warning: Color32::from_rgb(0xFF, 0xCD, 0x29),
             guide: Color32::from_rgb(0xF2, 0x48, 0x22),
             tab_bar: Color32::from_rgb(0xE8, 0xE8, 0xE8),
@@ -89,7 +124,7 @@ impl Tokens {
             menu_text: Color32::from_rgb(0xFF, 0xFF, 0xFF),
             menu_hover: ACCENT,
             menu_dim: Color32::from_rgb(0x9A, 0x9A, 0x9A),
-            focus: Color32::from_rgb(0x00, 0x6B, 0xD1),
+            focus: Color32::from_rgb(0x00, 0x7A, 0x56),
         }
     }
 
@@ -103,22 +138,23 @@ impl Tokens {
             border_strong: Color32::from_rgb(0x55, 0x55, 0x55),
             text: Color32::from_rgb(0xFF, 0xFF, 0xFF),
             text_secondary: Color32::from_rgb(0xB3, 0xB3, 0xB3),
-            text_tertiary: Color32::from_rgb(0x75, 0x75, 0x75),
+            text_tertiary: Color32::from_rgb(0x88, 0x88, 0x88),
             icon: Color32::from_rgb(0xF5, 0xF5, 0xF5),
             icon_secondary: Color32::from_rgb(0xB3, 0xB3, 0xB3),
             hover: Color32::from_rgb(0x38, 0x38, 0x38),
             pressed: Color32::from_rgb(0x44, 0x44, 0x44),
             field: Color32::from_rgb(0x38, 0x38, 0x38),
             field_hover_border: Color32::from_rgb(0x4D, 0x4D, 0x4D),
-            accent: ACCENT,
-            accent_hover: Color32::from_rgb(0x3D, 0xAD, 0xFF),
-            accent_text: Color32::from_rgb(0x7C, 0xC4, 0xF8),
-            selected_row: Color32::from_rgb(0x2A, 0x45, 0x5C),
-            selected_row_child: Color32::from_rgb(0x2D, 0x37, 0x41),
+            accent: BRAND,
+            accent_hover: Color32::from_rgb(0x52, 0xE9, 0xB7),
+            accent_on: ACCENT_ON,
+            accent_text: Color32::from_rgb(0x52, 0xE9, 0xB7),
+            selected_row: Color32::from_rgb(0x16, 0x42, 0x36),
+            selected_row_child: Color32::from_rgb(0x12, 0x37, 0x2D),
             component: Color32::from_rgb(0xD2, 0x7C, 0xFF),
             component_row: Color32::from_rgb(0x3E, 0x30, 0x52),
             danger: Color32::from_rgb(0xF2, 0x48, 0x22),
-            success: Color32::from_rgb(0x14, 0xAE, 0x5C),
+            success: DEV_READY,
             warning: Color32::from_rgb(0xFF, 0xCD, 0x29),
             guide: Color32::from_rgb(0xF2, 0x48, 0x22),
             tab_bar: Color32::from_rgb(0x1E, 0x1E, 0x1E),
@@ -128,7 +164,7 @@ impl Tokens {
             menu_text: Color32::from_rgb(0xFF, 0xFF, 0xFF),
             menu_hover: ACCENT,
             menu_dim: Color32::from_rgb(0x9A, 0x9A, 0x9A),
-            focus: ACCENT,
+            focus: BRAND,
         }
     }
 
@@ -137,8 +173,9 @@ impl Tokens {
     }
 }
 
+/// Stable id for temporary theme tokens.
 fn tokens_id() -> egui::Id {
-    egui::Id::new("figcraft_tokens")
+    egui::Id::unique("figcraft_tokens")
 }
 
 /// egui's default for how long hover fades and openings animate.
@@ -186,7 +223,9 @@ fn visuals(t: Tokens) -> Visuals {
     v.window_corner_radius = egui::CornerRadius::same(13);
     v.menu_corner_radius = egui::CornerRadius::same(13);
     v.selection.bg_fill = t.accent.gamma_multiply(0.3);
-    v.selection.stroke = Stroke::new(1.0, t.accent);
+    // Also the colour of selected text on that highlight (and a focused text box's outline): the
+    // theme's readable green, not the darker one that sinks into the dark theme's highlight.
+    v.selection.stroke = Stroke::new(1.0, t.accent_text);
     v.hyperlink_color = t.accent_text;
     for w in [&mut v.widgets.inactive, &mut v.widgets.hovered, &mut v.widgets.active, &mut v.widgets.open, &mut v.widgets.noninteractive] {
         w.corner_radius = egui::CornerRadius::same(5);
@@ -202,10 +241,10 @@ fn visuals(t: Tokens) -> Visuals {
     v.widgets.hovered.bg_stroke = Stroke::new(1.0, t.field_hover_border);
     v.widgets.active.bg_fill = t.pressed;
     v.widgets.active.weak_bg_fill = t.pressed;
-    v.widgets.active.bg_stroke = Stroke::new(1.0, t.accent);
+    v.widgets.active.bg_stroke = Stroke::new(1.0, ACCENT);
     v.popup_shadow = egui::Shadow { offset: [0, 4], blur: 16, spread: 0, color: t.shadow };
     v.window_shadow = egui::Shadow { offset: [0, 8], blur: 24, spread: 0, color: t.shadow };
-    v.text_cursor.stroke = Stroke::new(1.0, t.accent);
+    v.text_cursor.stroke = Stroke::new(1.0, ACCENT);
     v
 }
 
@@ -226,9 +265,13 @@ pub fn on_dark<R>(ui: &mut egui::Ui, f: impl FnOnce(&mut egui::Ui) -> R) -> R {
     r
 }
 
-/// UI fonts: Inter (from the craft-fonts build input) when present, else egui's defaults; with
+/// UI fonts: Inter and the Archivo wordmark (from the craft-fonts build input) when present;
+/// otherwise egui's defaults. With
 /// `system`, also system faces for scripts those lack (Hebrew, joined Arabic) so names in them show,
 /// and faces for the CJK scripts in `cjk` ([`crate::cjk`]).
+///
+/// The craft-fonts set embeds Noto Sans Arabic and Noto Sans Hebrew; with `system` off those
+/// built-in faces are the whole RTL fallback, so tests and releases do not depend on installed fonts.
 pub fn install_fonts(ctx: &Context, system: bool, cjk: u8) {
     let mut fonts = FontDefinitions::default();
     let find = |family: &str, style: &str| figcraft_text::CRAFT_FONTS.iter().find(|f| f.family == family && f.style == style).map(|f| f.bytes);
@@ -252,8 +295,21 @@ pub fn install_fonts(ctx: &Context, system: bool, cjk: u8) {
     }
     semi.extend(fonts.families.get(&FontFamily::Proportional).cloned().unwrap_or_default());
     fonts.families.insert(FontFamily::Name("semibold".into()), semi);
+    // Keep the logo's typeface independent of UI text. System Archivo is used when available;
+    // releases with craft-fonts embed it so the wordmark does not depend on installation.
+    let archivo = find("Archivo", "SemiBold").map(FontData::from_static).or_else(|| {
+        system.then(|| figcraft_text::find_face("Archivo", "SemiBold")).flatten().filter(|face| face.family == "Archivo").map(|face| font_data(&face))
+    });
+    let mut brand = Vec::new();
+    if let Some(data) = archivo {
+        fonts.font_data.insert("archivo".into(), Arc::new(data));
+        brand.push("archivo".into());
+    }
+    brand.extend(fonts.families.get(&FontFamily::Name("semibold".into())).cloned().unwrap_or_default());
+    fonts.families.insert(FontFamily::Name("brand".into()), brand);
     // CJK and other scripts from craft-fonts as fallbacks (Noto Sans CJK only with FIGCRAFT_EMBED_CJK).
-    const BUILT_IN: [&str; 4] = ["Inter", "BIZ UDPGothic", "Noto Sans CJK SC", "Noto Sans Arabic"];
+    const BUILT_IN: [&str; 7] =
+        ["Inter", "BIZ UDPGothic", "Noto Sans CJK SC", "Noto Sans Arabic", "Noto Sans Hebrew", "Noto Sans Georgian", "Noto Sans Thai"];
     let lang = crate::i18n::current().map_or("en", |l| l.code);
     // A Chinese UI draws Han in a Chinese face: the built-in Japanese one goes after the system faces.
     let late = |family: &str| family == "BIZ UDPGothic" && crate::cjk::language(lang) == crate::cjk::HAN;
@@ -273,7 +329,9 @@ pub fn install_fonts(ctx: &Context, system: bool, cjk: u8) {
                 .filter_map(|f| figcraft_text::find_face(f, "Regular"))
                 .any(|x| x.has_char(c))
         };
-        extra.extend(crate::bidi::script_fallbacks(&embedded));
+        let mut taken = Vec::new();
+        extra.extend(crate::bidi::script_fallbacks(&embedded, &mut taken));
+        extra.extend(key_symbol_fallbacks(&embedded, &mut taken));
         extra.extend(crate::cjk::faces(cjk, lang, &embedded).iter().map(|f| (format!("system-{}-{}", f.family, f.style), font_data(f))));
     }
     extra.extend(craft(true));
@@ -288,6 +346,38 @@ pub fn install_fonts(ctx: &Context, system: bool, cjk: u8) {
     ctx.set_fonts(fonts);
 }
 
+/// The glyphs macOS shortcuts are written with ([`figcraft_engine::keymap::display`]).
+const KEY_SYMBOLS: &str = "⌃⌥⇧⌘⌫↵⇥⇞⇟←→↑↓";
+/// System families that have them, in order of preference.
+const KEY_FAMILIES: [&str; 6] = ["Lucida Grande", "Apple Symbols", "Segoe UI Symbol", "DejaVu Sans", "Noto Sans Symbols 2", "FreeSans"];
+
+/// System faces for the shortcut glyphs the UI's own fonts lack (egui's default face has ⌘ but
+/// not ⌥ or ↵); `taken` as for [`system_fallbacks`].
+fn key_symbol_fallbacks(have: &dyn Fn(char) -> bool, taken: &mut Vec<Arc<figcraft_text::Face>>) -> Vec<(String, FontData)> {
+    system_fallbacks(KEY_SYMBOLS.chars(), &KEY_FAMILIES, have, taken)
+}
+
+/// System faces, the first of `families` that has each, for the `samples` neither the UI's own
+/// fonts (`have`) nor the faces already `taken` draw. Each face found joins `taken`, so a face that
+/// several lists name is added once.
+pub(crate) fn system_fallbacks(
+    samples: impl IntoIterator<Item = char>,
+    families: &[&str],
+    have: &dyn Fn(char) -> bool,
+    taken: &mut Vec<Arc<figcraft_text::Face>>,
+) -> Vec<(String, FontData)> {
+    let mut out = Vec::new();
+    for c in samples {
+        if have(c) || taken.iter().any(|f| f.has_char(c)) {
+            continue;
+        }
+        let Some(face) = figcraft_text::face_with_char(c, families) else { continue };
+        out.push((format!("system-{}-{}", face.family, face.style), font_data(&face)));
+        taken.push(face);
+    }
+    out
+}
+
 /// egui font data over a face's bytes, without copying them (CJK faces are 10–20 MB). Font
 /// database faces are never dropped, so a system face's shared bytes are kept for good: leaking
 /// one more reference to them costs a pointer and gives egui the `'static` slice it needs.
@@ -305,6 +395,40 @@ pub fn semibold(size: f32) -> FontId {
     FontId::new(size, FontFamily::Name("semibold".into()))
 }
 
+pub fn brand(size: f32) -> FontId {
+    FontId::new(size, FontFamily::Name("brand".into()))
+}
+
+/// The two-tone Archivo wordmark used in the home sidebar and About window.
+pub fn paint_wordmark(painter: &egui::Painter, left_center: egui::Pos2, size: f32, t: &Tokens) {
+    let font = brand(size);
+    let fig = painter.layout_no_wrap("Fig".into(), font.clone(), t.text);
+    let fig_width = fig.size().x;
+    painter.galley(egui::pos2(left_center.x, left_center.y - fig.size().y / 2.0), fig, t.text);
+    painter.text(egui::pos2(left_center.x + fig_width, left_center.y), egui::Align2::LEFT_CENTER, "Craft", font, t.accent_text);
+}
+
+/// Paint the owner's original chameleon icon from the existing app asset.
+pub fn paint_app_icon(ui: &egui::Ui, rect: egui::Rect) {
+    static ICON: OnceLock<Option<egui::ColorImage>> = OnceLock::new();
+    let image = ICON.get_or_init(|| {
+        let rgba = image::load_from_memory(include_bytes!("../../../assets/app-icon/figcraft-64.png")).ok()?.to_rgba8();
+        Some(egui::ColorImage::from_rgba_unmultiplied([rgba.width() as usize, rgba.height() as usize], rgba.as_raw()))
+    });
+    let Some(image) = image else {
+        ui.painter().rect_filled(rect, egui::CornerRadius::same(5), BRAND);
+        crate::icons::paint(ui.painter(), rect.shrink(rect.width() * 0.22), crate::icons::Icon::Logo, ACCENT_ON);
+        return;
+    };
+    let id = egui::Id::unique("figcraft_original_app_icon");
+    let texture = ui.ctx().data(|data| data.get_temp::<egui::TextureHandle>(id)).unwrap_or_else(|| {
+        let texture = ui.ctx().load_texture("figcraft-original-app-icon", image.clone(), egui::TextureOptions::LINEAR);
+        ui.ctx().data_mut(|data| data.insert_temp(id, texture.clone()));
+        texture
+    });
+    ui.painter().image(texture.id(), rect, egui::Rect::from_min_max(egui::pos2(0.0, 0.0), egui::pos2(1.0, 1.0)), Color32::WHITE);
+}
+
 pub fn regular(size: f32) -> FontId {
     FontId::new(size, FontFamily::Proportional)
 }
@@ -314,8 +438,9 @@ pub fn c32(c: figcraft_color::Color) -> Color32 {
     Color32::from_rgba_unmultiplied(r, g, b, a)
 }
 
+/// Stable id for the current document-to-screen colour conversion.
 fn screen_conversion_id() -> egui::Id {
-    egui::Id::new("figcraft_screen_conversion")
+    egui::Id::unique("figcraft_screen_conversion")
 }
 
 /// Remember the colour profile of the document on screen (once per frame): document colours drawn
@@ -331,3 +456,95 @@ pub fn doc_c32(ctx: &Context, c: figcraft_color::Color) -> Color32 {
     let conv = ctx.data(|d| d.get_temp::<figcraft_color::ProfileConversion>(screen_conversion_id()));
     c32(conv.map_or(c, |k| k.apply(c)))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn canvas_overlays_take_the_green_that_stands_out_on_the_page() {
+        let ctx = Context::default();
+        assert_eq!(canvas_accent(&ctx), ACCENT, "before any page shows");
+        set_canvas_page(&ctx, Color32::from_rgb(0x1E, 0x1E, 0x1E));
+        assert_eq!(canvas_accent(&ctx), BRAND, "the bright green on a dark page");
+        set_canvas_page(&ctx, Color32::WHITE);
+        assert_eq!(canvas_accent(&ctx), ACCENT, "the darker green on a light page");
+        set_canvas_page(&ctx, Color32::from_rgb(0xF5, 0xF5, 0xF5));
+        assert_eq!(canvas_accent(&ctx), ACCENT);
+        // White text never sits on the bright green.
+        assert_eq!(under_white(BRAND), ACCENT);
+        assert_eq!(under_white(COMPONENT), COMPONENT);
+    }
+
+    /// `fill` (premultiplied, maybe translucent) painted over the opaque `bg`.
+    fn over(fill: Color32, bg: Color32) -> Color32 {
+        let k = 1.0 - f32::from(fill.a()) / 255.0;
+        let mix = |f: u8, b: u8| (f32::from(f) + f32::from(b) * k).round().min(255.0) as u8;
+        Color32::from_rgb(mix(fill.r(), bg.r()), mix(fill.g(), bg.g()), mix(fill.b(), bg.b()))
+    }
+
+    #[test]
+    fn disabled_and_selected_text_stay_readable_in_both_themes() {
+        for t in [Tokens::light(), Tokens::dark()] {
+            let theme = if t.dark { "dark" } else { "light" };
+            // Disabled text (a disabled button's label, placeholders) on panels, fields and
+            // selected rows, still dimmer than secondary text.
+            for bg in [t.panel, t.field, t.hover, t.selected_row] {
+                let ratio = c(t.text_tertiary).contrast(c(bg));
+                assert!(ratio >= 3.0, "{theme}: dim text {:?} on {bg:?} is {ratio:.2}:1", t.text_tertiary);
+                assert!(ratio < c(t.text_secondary).contrast(c(bg)), "{theme}: dim text reads dimmer than secondary text");
+            }
+            // Selected text (renaming a page or layer, any text box) on the selection highlight.
+            let v = visuals(t);
+            for bg in [t.panel, t.field] {
+                let highlight = over(v.selection.bg_fill, bg);
+                let ratio = c(v.selection.stroke.color).contrast(c(highlight));
+                assert!(ratio >= 3.0, "{theme}: selected text on {highlight:?} is {ratio:.2}:1");
+            }
+        }
+    }
+
+    #[test]
+    fn ui_font_draws_every_mac_shortcut_glyph() {
+        figcraft_text::scan_system_fonts();
+        let lacking: String = KEY_SYMBOLS.chars().filter(|c| figcraft_text::face_with_char(*c, &KEY_FAMILIES).is_none()).collect();
+        if !lacking.is_empty() {
+            eprintln!("no system face here draws {lacking}; skipping");
+            return;
+        }
+        let ctx = Context::default();
+        install_fonts(&ctx, true, 0);
+        let input =
+            egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::pos2(0.0, 0.0), egui::vec2(100.0, 100.0))), ..Default::default() };
+        ctx.run_ui(input, |_| {}).textures_delta.clear();
+        ctx.fonts_mut(|f| {
+            for c in KEY_SYMBOLS.chars() {
+                for font in [regular(11.0), semibold(11.0)] {
+                    assert!(f.has_glyphs(&font, &c.to_string()), "UI font draws {c:?}");
+                }
+            }
+        });
+    }
+
+    #[test]
+    fn ui_font_draws_thai_with_the_built_in_thai_face() {
+        // The web build has no system fonts: Thai layer names, frame labels and field text are drawn
+        // by craft-fonts' Noto Sans Thai, a built-in fallback, when the build embeds it.
+        if !figcraft_text::CRAFT_FONTS.iter().any(|f| f.family == "Noto Sans Thai") {
+            eprintln!("built without craft-fonts' Noto Sans Thai; skipping");
+            return;
+        }
+        let ctx = Context::default();
+        install_fonts(&ctx, false, 0);
+        let input =
+            egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::pos2(0.0, 0.0), egui::vec2(100.0, 100.0))), ..Default::default() };
+        ctx.run_ui(input, |_| {}).textures_delta.clear();
+        // "ภาษาไทย" (the Thai language) and "น้ำ" (water: a tone mark over SARA AM).
+        let thai = "\u{0E20}\u{0E32}\u{0E29}\u{0E32}\u{0E44}\u{0E17}\u{0E22} \u{0E19}\u{0E49}\u{0E33}";
+        ctx.fonts_mut(|f| {
+            for font in [regular(11.0), semibold(11.0)] {
+                assert!(f.has_glyphs(&font, thai), "UI font draws {thai:?}");
+            }
+        });
+    }
+}
diff --git a/crates/ui-egui/src/theme_startup_tests.rs b/crates/ui-egui/src/theme_startup_tests.rs
index 6f2b13e2..60587acb 100644
--- a/crates/ui-egui/src/theme_startup_tests.rs
+++ b/crates/ui-egui/src/theme_startup_tests.rs
@@ -4,7 +4,7 @@ use egui::{Context, RawInput, Theme};
 use figcraft_engine::{Prefs, Session};
 use serde_json::json;
 
-use crate::{FigApp, NoServices, theme::Tokens};
+use crate::{FigApp, NoServices, Services, theme::Tokens};
 
 fn frame(ctx: &Context, app: &mut FigApp, system: Option<Theme>) {
     let mut output = ctx.run_ui(RawInput { system_theme: system, ..Default::default() }, |ui| app.ui(ui));
@@ -83,3 +83,61 @@ fn unavailable_system_theme_uses_the_existing_light_fallback() {
     frame(&ctx, &mut app, None);
     assert_eq!(Tokens::get(&ctx), Tokens::light());
 }
+
+/// Services whose colour scheme answer stands in for the platform's (winit gives no theme on Linux
+/// and the BSDs, where the freedesktop colour scheme takes over).
+struct Scheme(Option<bool>);
+impl Services for Scheme {
+    fn system_dark(&self) -> Option<bool> {
+        self.0
+    }
+}
+
+#[test]
+fn without_a_system_theme_the_colour_scheme_services_decide() {
+    for (dark, expected) in [(Some(true), Tokens::dark()), (Some(false), Tokens::light())] {
+        let ctx = Context::default();
+        let mut app = FigApp::new(Session::empty(), Box::new(Scheme(dark)));
+        app.session.execute("view.themeSystem", &json!({})).unwrap();
+        frame(&ctx, &mut app, None);
+        assert_eq!(Tokens::get(&ctx), expected);
+        assert_eq!(app.ui.dark, expected.dark);
+    }
+}
+
+#[test]
+fn the_os_theme_wins_over_the_colour_scheme_services() {
+    for (os, scheme) in [(Theme::Light, Some(true)), (Theme::Dark, Some(false))] {
+        let ctx = Context::default();
+        let mut app = FigApp::new(Session::empty(), Box::new(Scheme(scheme)));
+        app.session.execute("view.themeSystem", &json!({})).unwrap();
+        frame(&ctx, &mut app, Some(os));
+        assert_eq!(Tokens::get(&ctx).dark, os == Theme::Dark);
+    }
+}
+
+#[test]
+fn manual_themes_ignore_the_colour_scheme_services() {
+    let ctx = Context::default();
+    let mut app = FigApp::new(Session::empty(), Box::new(Scheme(Some(false))));
+    app.session.execute("view.themeDark", &json!({})).unwrap();
+    frame(&ctx, &mut app, None);
+    assert_eq!(Tokens::get(&ctx), Tokens::dark());
+}
+
+/// Checks that the test graph enables egui's `default_fonts` and `monochrome_emoji_fonts`
+/// features by asserting both a Latin and an emoji glyph are available.
+#[test]
+fn tests_have_the_explicit_default_and_monochrome_emoji_font_features() {
+    // 0.37 egui has no default features, and kittest's own dev-features do not propagate to this
+    // crate. The test graph must therefore enable `default_fonts` and `monochrome_emoji_fonts`
+    // explicitly (Cargo.toml), or strict glyph tests would silently draw tofu.
+    let ctx = Context::default();
+    let mut app = FigApp::new(Session::empty(), Box::new(NoServices));
+    frame(&ctx, &mut app, Some(Theme::Light));
+    frame(&ctx, &mut app, Some(Theme::Light));
+    ctx.fonts_mut(|f| {
+        assert!(f.has_glyphs(&crate::theme::regular(11.0), "A"), "default Latin fallback");
+        assert!(f.has_glyphs(&crate::theme::regular(11.0), "\u{1F600}"), "monochrome emoji fixture glyph");
+    });
+}
diff --git a/crates/ui-egui/src/titlebar_tests.rs b/crates/ui-egui/src/titlebar_tests.rs
index 796cb670..fff303ef 100644
--- a/crates/ui-egui/src/titlebar_tests.rs
+++ b/crates/ui-egui/src/titlebar_tests.rs
@@ -4,6 +4,7 @@
 
 use egui::{Event, PointerButton, Pos2, RawInput, Rect, ResizeDirection, ViewportCommand, ViewportId, pos2, vec2};
 use figcraft_engine::Session;
+use serde_json::json;
 
 use crate::{FigApp, NoServices, TitleBar};
 
@@ -76,7 +77,25 @@ fn window_buttons_minimise_maximise_and_close() {
     let mut u = Ui::new(TitleBar::Custom);
     assert!(u.click(window_button(0)).contains(&ViewportCommand::Minimized(true)));
     assert!(u.click(window_button(1)).contains(&ViewportCommand::Maximized(true)));
-    assert!(u.click(window_button(2)).contains(&ViewportCommand::Close));
+    u.click(window_button(2));
+    assert!(u.frame(vec![]).contains(&ViewportCommand::Close));
+}
+
+/// Asserts closing the custom titlebar over a presenter with unsaved changes asks with the
+/// unsaved-changes dialog instead of emitting `Close`.
+#[test]
+fn titlebar_close_asks_over_the_presenter_when_a_file_is_unsaved() {
+    let mut u = Ui::new(TitleBar::Custom);
+    let frame = u.app.session.execute("node.create", &json!({"type": "frame", "width": 402, "height": 874})).unwrap()["id"].clone();
+    u.app.session.execute("proto.present", &json!({"start": frame})).unwrap();
+    u.app.handle_ui_requests();
+    u.frame(vec![]);
+    assert!(u.app.ui.present.is_some());
+
+    let commands = u.click(window_button(2));
+    assert!(!commands.contains(&ViewportCommand::Close));
+    assert!(u.app.ui.confirm_close);
+    assert!(u.ctx.memory(|memory| memory.area_rect(egui::Id::unique(Some(crate::i18n::tr("Unsaved changes")))).is_some()));
 }
 
 #[test]
@@ -141,6 +160,81 @@ fn tabs_and_new_tab_keep_their_clicks() {
     assert!(opened, "the new-tab button took no click");
 }
 
+#[test]
+fn many_tabs_do_not_cover_the_window_buttons() {
+    let mut u = Ui::new(TitleBar::Custom);
+    for _ in 0..24 {
+        u.app.session.execute("file.new", &json!({})).unwrap();
+    }
+    u.frame(vec![]);
+    let before = u.app.session.docs.len();
+    u.click(pos2(SIZE.x - 222.0, 20.0));
+    assert_eq!(u.app.session.docs.len(), before + 1, "the new-tab button must stay reachable");
+    assert!(u.click(window_button(0)).contains(&ViewportCommand::Minimized(true)));
+    assert!(u.click(window_button(1)).contains(&ViewportCommand::Maximized(true)));
+    u.click(window_button(2));
+    assert!(u.frame(vec![]).contains(&ViewportCommand::Close));
+}
+
+#[test]
+fn close_button_on_inactive_tab_closes_it_without_switching() {
+    let mut u = Ui::new(TitleBar::Custom);
+    u.app.session.execute("file.new", &json!({})).unwrap();
+    u.app.session.execute("file.new", &json!({})).unwrap();
+    let active_uid = u.app.session.docs[u.app.session.active].uid;
+    let inactive_uid = u.app.session.docs[1].uid;
+    let close_button = pos2(270.0, 20.0);
+    u.frame(vec![Event::PointerMoved(close_button)]);
+    u.click(close_button);
+    assert!(
+        !u.app.session.docs.iter().any(|doc| doc.uid == inactive_uid),
+        "docs={}, active={}, last_error={:?}, target_dirty={}",
+        u.app.session.docs.len(),
+        u.app.session.active,
+        u.app.ui.last_error,
+        u.app.session.docs.iter().find(|doc| doc.uid == inactive_uid).is_some_and(|doc| doc.is_dirty())
+    );
+    assert_eq!(u.app.session.docs[u.app.session.active].uid, active_uid);
+}
+
+#[test]
+fn closing_a_tab_before_the_active_one_keeps_the_active_file() {
+    let mut u = Ui::new(TitleBar::Custom);
+    for _ in 0..3 {
+        u.app.session.execute("file.new", &json!({})).unwrap();
+    }
+    u.app.session.execute("doc.switch", &json!({"index": 2})).unwrap();
+    let active_uid = u.app.session.docs[u.app.session.active].uid;
+    let closed_uid = u.app.session.docs[0].uid;
+    let close_button = pos2(156.0, 20.0);
+    u.frame(vec![Event::PointerMoved(close_button)]);
+    u.click(close_button);
+    assert!(!u.app.session.docs.iter().any(|doc| doc.uid == closed_uid));
+    assert_eq!(u.app.session.docs[u.app.session.active].uid, active_uid);
+}
+
+#[test]
+fn dragging_a_tab_along_the_bar_reorders_it_without_detaching() {
+    let mut u = Ui::new(TitleBar::Custom);
+    for name in ["Two", "Three", "Four"] {
+        u.app.session.execute("file.new", &json!({"name": name})).unwrap();
+    }
+    let moved_uid = u.app.session.docs[0].uid;
+    let active_uid = u.app.session.docs[u.app.session.active].uid;
+    u.frame(vec![]);
+    let commands = u.drag(pos2(100.0, 20.0), vec2(310.0, 0.0));
+    assert!(!commands.contains(&ViewportCommand::StartDrag), "{commands:?}");
+    assert_eq!(
+        u.app.session.docs[2].uid,
+        moved_uid,
+        "order={:?}, active={}, error={:?}",
+        u.app.session.docs.iter().map(|d| d.uid).collect::<Vec<_>>(),
+        u.app.session.active,
+        u.app.ui.last_error
+    );
+    assert_eq!(u.app.session.docs[u.app.session.active].uid, active_uid);
+}
+
 #[test]
 fn a_system_title_bar_leaves_the_window_alone() {
     let mut u = Ui::new(TitleBar::Native);
diff --git a/crates/ui-egui/src/toolbar.rs b/crates/ui-egui/src/toolbar.rs
index a921cc29..a5795a8c 100644
--- a/crates/ui-egui/src/toolbar.rs
+++ b/crates/ui-egui/src/toolbar.rs
@@ -9,30 +9,57 @@ use crate::FigApp;
 use crate::a11y::{self, Nav, Region, Tip};
 use crate::i18n::{tr, tr_noop, trf};
 use crate::icons::{self, Icon};
-use crate::theme::{ACCENT, Tokens, regular};
+use crate::theme::{Tokens, regular};
+
+/// Every mark in the toolbar row is painted in a box this size, so they share one optical size
+/// and one stroke width (#737, #738).
+const GLYPH: f32 = 18.0;
+/// The flyout carets: smaller than the marks, but on a box whose stroke rounds to the same width
+/// as theirs at 1×, 1.5× and 2× (a 10-point box drew them one physical pixel thinner).
+const CARET: f32 = 14.0;
+/// A flyout caret's button: wide enough to hit, a little clear of its tool's (#988).
+const FLYOUT_W: f32 = 16.0;
+const FLYOUT_GAP: f32 = 2.0;
+
+/// `GLYPH`'s box centred in `r`.
+fn glyph_rect(r: Rect) -> Rect {
+    Rect::from_center_size(r.center(), vec2(GLYPH, GLYPH))
+}
 
 struct Group {
     key: &'static str,
     /// The flyout button's name for screen readers.
     name: &'static str,
     tools: &'static [(ToolId, Icon)],
+    /// What a one-tool group's flyout offers instead of tools (boards: colours, shapes, stamps).
+    options: Options,
+}
+
+/// The choices a board tool's flyout shows.
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub(crate) enum Options {
+    None,
+    Colors,
+    Shapes,
+    Stamps,
+}
+
+impl Group {
+    const fn tools(key: &'static str, name: &'static str, tools: &'static [(ToolId, Icon)]) -> Group {
+        Group { key, name, tools, options: Options::None }
+    }
+    fn has_flyout(&self) -> bool {
+        self.tools.len() > 1 || self.options != Options::None
+    }
 }
 
 const GROUPS: &[Group] = &[
-    Group {
-        key: "move",
-        name: tr_noop("Move tools"),
-        tools: &[(ToolId::Move, Icon::Move), (ToolId::Hand, Icon::Hand), (ToolId::Scale, Icon::Scale)],
-    },
-    Group {
-        key: "frame",
-        name: tr_noop("Frame tools"),
-        tools: &[(ToolId::Frame, Icon::Frame), (ToolId::Section, Icon::Section), (ToolId::Slice, Icon::Slice)],
-    },
-    Group {
-        key: "shape",
-        name: tr_noop("Shape tools"),
-        tools: &[
+    Group::tools("move", tr_noop("Move tools"), &[(ToolId::Move, Icon::Move), (ToolId::Hand, Icon::Hand), (ToolId::Scale, Icon::Scale)]),
+    Group::tools("frame", tr_noop("Frame tools"), &[(ToolId::Frame, Icon::Frame), (ToolId::Section, Icon::Section), (ToolId::Slice, Icon::Slice)]),
+    Group::tools(
+        "shape",
+        tr_noop("Shape tools"),
+        &[
             (ToolId::Rectangle, Icon::Rectangle),
             (ToolId::Line, Icon::Line),
             (ToolId::Arrow, Icon::Arrow),
@@ -40,23 +67,42 @@ const GROUPS: &[Group] = &[
             (ToolId::Polygon, Icon::Polygon),
             (ToolId::Star, Icon::Star),
         ],
-    },
-    Group {
-        key: "pen",
-        name: tr_noop("Drawing tools"),
-        tools: &[(ToolId::Pen, Icon::Pen), (ToolId::Pencil, Icon::Pencil), (ToolId::ShapeBuilder, Icon::ShapeBuilder)],
-    },
-    Group { key: "text", name: tr_noop("Text"), tools: &[(ToolId::Text, Icon::Text)] },
-    Group { key: "comment", name: tr_noop("Comment"), tools: &[(ToolId::Comment, Icon::Comment)] },
+    ),
+    Group::tools(
+        "pen",
+        tr_noop("Drawing tools"),
+        &[(ToolId::Pen, Icon::Pen), (ToolId::Pencil, Icon::Pencil), (ToolId::ShapeBuilder, Icon::ShapeBuilder)],
+    ),
+    Group::tools("text", tr_noop("Text"), &[(ToolId::Text, Icon::Text), (ToolId::TextOnPath, Icon::TextOnPath)]),
+    Group::tools("comment", tr_noop("Comment"), &[(ToolId::Comment, Icon::Comment)]),
 ];
 
+/// A board's toolbar: moving around, ink, stickies, shapes, connectors, text, sections, stamps.
+const BOARD_GROUPS: &[Group] = &[
+    Group::tools("bmove", tr_noop("Move tools"), &[(ToolId::Move, Icon::Move), (ToolId::Hand, Icon::Hand)]),
+    Group::tools(
+        "ink",
+        tr_noop("Drawing tools"),
+        &[(ToolId::Marker, Icon::Marker), (ToolId::Highlighter, Icon::Highlighter), (ToolId::Eraser, Icon::Eraser)],
+    ),
+    Group { key: "sticky", name: tr_noop("Sticky note colors"), tools: &[(ToolId::Sticky, Icon::Board)], options: Options::Colors },
+    Group { key: "bshape", name: tr_noop("Shapes"), tools: &[(ToolId::BoardShape, Icon::Shapes)], options: Options::Shapes },
+    Group::tools("connector", tr_noop("Connector"), &[(ToolId::Connector, Icon::Connector)]),
+    Group::tools("text", tr_noop("Text"), &[(ToolId::Text, Icon::Text)]),
+    Group::tools("section", tr_noop("Section"), &[(ToolId::Section, Icon::Section)]),
+    Group { key: "stamp", name: tr_noop("Stamps"), tools: &[(ToolId::Stamp, Icon::Stamp)], options: Options::Stamps },
+    Group::tools("comment", tr_noop("Comment"), &[(ToolId::Comment, Icon::Comment)]),
+];
+
+/// Return the last tool index remembered for a toolbar group, falling back to `default`.
 fn remembered(ui: &Ui, key: &str, default: ToolId) -> ToolId {
-    ui.data(|d| d.get_temp::<u8>(egui::Id::new(("tb_last", key)))).and_then(|i| ToolId::ALL.get(i as usize).copied()).unwrap_or(default)
+    ui.data(|d| d.get_temp::<u8>(egui::Id::unique(("tb_last", key)))).and_then(|i| ToolId::ALL.get(i as usize).copied()).unwrap_or(default)
 }
 
 pub fn show(app: &mut FigApp, ui: &mut Ui) {
     let t = Tokens::get(ui.ctx());
     let canvas = app.canvas.rect;
+    app.ui.actions_rect = None;
     // A file you can't edit now (view only, or on its way to a server): moving around only.
     if let Some(why) = app.session.active_read_only() {
         view_only_toolbar(app, ui, why);
@@ -72,80 +118,167 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
         builder_toolbar(app, ui);
         return;
     }
-    let cell = 32.0;
-    let gap = 4.0;
-    let width = GROUPS.len() as f32 * (cell + 4.0) + 4.0 * 10.0 + 2.0 * (cell + 4.0) + 16.0 + 4.0 * 34.0 + 24.0;
-    let rect = pill(ui, &mut app.ui.nav, canvas, width, &t);
-    let current = app.session.tool.tool;
-    let mut x = rect.min.x + 8.0;
+    let board = app.session.doc().is_ok_and(figcraft_engine::board::is_board);
+    main_toolbar(app, ui, canvas, &t, board);
+}
+
+/// The main toolbar pill's width for the active file: the Actions palette matches it so the two
+/// read as one bar.
+pub(crate) fn bar_width(app: &FigApp) -> f32 {
+    let board = app.session.doc().is_ok_and(figcraft_engine::board::is_board);
+    main_width(if board { BOARD_GROUPS } else { GROUPS }, board)
+}
+
+/// The main toolbar pill's width: the tool groups with their flyout carets, Resources and
+/// Actions, and the mode switcher (boards: the Design panel's button instead).
+fn main_width(groups: &[Group], board: bool) -> f32 {
+    let (cell, gap) = (TOOL_CELL, 4.0);
+    let carets = groups.iter().filter(|g| g.has_flyout()).count() as f32 * (FLYOUT_GAP + FLYOUT_W);
+    let end = if board { 2.0 * cell + gap + 16.0 } else { 4.0 * 34.0 + 24.0 };
+    groups.len() as f32 * (cell + gap) + carets + 2.0 * (cell + gap) + 16.0 + end
+}
+
+/// The main toolbar pill: the tool groups with their flyouts, Resources and Actions, then the
+/// Draw · Design · Prototype · Inspect mode switcher (on a board, the Design panel's button).
+fn main_toolbar(app: &mut FigApp, ui: &mut Ui, canvas: Rect, t: &Tokens, board: bool) {
+    let groups = if board { BOARD_GROUPS } else { GROUPS };
+    let width = main_width(groups, board);
+    let rect = pill(ui, &mut app.ui.nav, canvas, width, t);
     let cy = rect.center().y;
-    for g in GROUPS {
-        let in_group = g.tools.iter().any(|(tid, _)| *tid == current);
-        let shown = if in_group { current } else { remembered(ui, g.key, g.tools.first().map(|x| x.0).unwrap_or(ToolId::Move)) };
-        let icon = g.tools.iter().find(|(tid, _)| *tid == shown).map(|(_, i)| *i).unwrap_or(Icon::Move);
-        let r = Rect::from_center_size(pos2(x + cell / 2.0, cy), vec2(cell, cell));
-        let resp = tool_cell(ui, &t, r, ("tool", g.key), icon, in_group, &format!("{}  {}", tr(shown.label()), pretty_shortcut(shown.shortcut())));
-        if in_group {
-            a11y::prefer(&mut app.ui.nav, Region::Toolbar, resp.id);
+    let scroll = pill_scroll(ui, rect, width);
+    let outer_clip = ui.clip_rect();
+    ui.set_clip_rect(rect.intersect(outer_clip));
+    let mut x = rect.min.x + 8.0 - scroll;
+    for g in groups {
+        x = group_cell(app, ui, g, pos2(x, cy), rect.min.y, t);
+    }
+    x = side_buttons(app, ui, x, cy, t);
+    divider(ui, t, x, cy);
+    x += 8.0;
+    if board {
+        // Boards have no prototypes or Dev Mode; the Design panel is hidden until asked for.
+        x = crate::board_picker::button(app, ui, pos2(x, cy), rect.min.y, t);
+        let r = Rect::from_center_size(pos2(x + TOOL_CELL / 2.0, cy), vec2(TOOL_CELL, TOOL_CELL));
+        let tip = crate::shortcuts::tip(tr("Design panel"), "view.design");
+        if tool_cell(ui, t, r, "board_panel", Icon::Panels, app.ui.board_panel, tip).clicked() {
+            app.run("view.design", json!({}));
         }
-        if resp.clicked() {
-            // Enter (a keyboard click) on the shape or frame tool already chosen places one; the
-            // canvas takes the keyboard.
-            if in_group && shown.draws_shape() && ui.input(|i| i.key_pressed(egui::Key::Enter)) {
-                app.run("tool.place", json!({}));
-                app.ui.nav.go(Region::Canvas);
-            } else {
-                app.run("tool.set", json!({"tool": shown.id()}));
-            }
-        }
-        x += cell;
-        // Flyout chevron.
-        if g.tools.len() > 1 {
-            let cr = Rect::from_center_size(pos2(x + 5.0, cy), vec2(10.0, cell));
-            let cresp = ui.interact(cr, ui.id().with(("flyout", g.key)), Sense::click());
-            let open = app.ui.tool_flyout == Some(g.key);
-            a11y::menu_button(&cresp, tr(g.name), open);
-            if open {
-                a11y::popup(&mut app.ui.nav, cresp.id, flyout_id(g.key));
-            }
-            if cresp.hovered() {
-                ui.painter().rect_filled(cr, CornerRadius::same(4), t.hover);
-            }
-            icons::paint(ui.painter(), Rect::from_center_size(cr.center(), vec2(10.0, 10.0)), Icon::Chevron, t.icon_secondary);
-            if cresp.clicked() {
-                app.ui.tool_flyout = if app.ui.tool_flyout == Some(g.key) { None } else { Some(g.key) };
-            }
-            x += 10.0;
-        }
-        x += gap;
-        if app.ui.tool_flyout == Some(g.key) {
-            flyout(app, ui, g, pos2(r.min.x, rect.min.y - 8.0));
+    } else {
+        mode_switcher(app, ui, x, cy, t);
+    }
+    ui.set_clip_rect(outer_clip);
+    help_button(app, ui, canvas, rect, t);
+}
+
+/// How far the buttons of a pill `width` wide drawn at `rect` are scrolled: wider than the pill (a
+/// phone), they slide sideways under a drag or the wheel.
+fn pill_scroll(ui: &Ui, rect: Rect, width: f32) -> f32 {
+    let scroll_id = ui.scope_id().with("tb_scroll");
+    let max_scroll = (width - rect.width()).max(0.0);
+    let mut scroll = 0.0;
+    if max_scroll > 0.0 {
+        let drag = ui.ctx().read_response(ui.scope_id().with("pill")).map_or(0.0, |r| r.drag_delta().x);
+        let wheel = if ui.rect_contains_pointer(rect) { ui.input(|i| i.smooth_scroll_delta.x + i.smooth_scroll_delta.y) } else { 0.0 };
+        scroll = (ui.data(|d| d.get_temp::<f32>(scroll_id)).unwrap_or(0.0) - drag - wheel).clamp(0.0, max_scroll);
+    }
+    ui.data_mut(|d| d.insert_temp(scroll_id, scroll));
+    scroll
+}
+
+/// A toolbar button's size.
+const TOOL_CELL: f32 = 32.0;
+
+/// Tool group `g` at `at` (its left edge, the pill's middle): the shown tool's button, its flyout
+/// caret and, while open, its flyout above the pill (whose top is `top`). Where the next starts.
+fn group_cell(app: &mut FigApp, ui: &mut Ui, g: &Group, at: egui::Pos2, top: f32, t: &Tokens) -> f32 {
+    let current = app.session.tool.tool;
+    let in_group = g.tools.iter().any(|(tid, _)| *tid == current);
+    let shown = if in_group { current } else { remembered(ui, g.key, g.tools.first().map(|x| x.0).unwrap_or(ToolId::Move)) };
+    let icon = g.tools.iter().find(|(tid, _)| *tid == shown).map(|(_, i)| *i).unwrap_or(Icon::Move);
+    let r = Rect::from_center_size(pos2(at.x + TOOL_CELL / 2.0, at.y), vec2(TOOL_CELL, TOOL_CELL));
+    let resp = tool_cell(ui, t, r, ("tool", g.key), icon, in_group, &format!("{}  {}", tr(shown.label()), pretty_shortcut(shown.shortcut())));
+    if in_group {
+        a11y::prefer(&mut app.ui.nav, Region::Toolbar, resp.id);
+    }
+    if resp.clicked() {
+        // Enter (a keyboard click) on the shape or frame tool already chosen places one; the
+        // canvas takes the keyboard.
+        // In Dev Mode the tool goes through `choose`, which returns to the design first.
+        if in_group && shown.draws_shape() && app.ui.right_tab != crate::RightTab::Inspect && ui.input(|i| i.key_pressed(egui::Key::Enter)) {
+            app.run("tool.place", json!({}));
+            app.ui.nav.go(Region::Canvas);
+        } else {
+            choose(app, shown);
         }
     }
-    // Resources (components, plugins) opens the Assets panel; Actions palette.
+    let mut x = at.x + TOOL_CELL;
+    if g.has_flyout() {
+        flyout_caret(app, ui, g, pos2(x, at.y), t);
+        x += FLYOUT_GAP + FLYOUT_W;
+    }
+    if app.ui.tool_flyout == Some(g.key) {
+        if g.options == Options::None {
+            flyout(app, ui, g, pos2(r.min.x, top - 8.0));
+        } else {
+            options_flyout(app, ui, g, pos2(r.min.x, top - 8.0));
+        }
+    }
+    x + 4.0
+}
+
+/// The caret after group `g`'s button (at `at`, its left edge and middle): opens or closes its
+/// flyout.
+fn flyout_caret(app: &mut FigApp, ui: &mut Ui, g: &Group, at: egui::Pos2, t: &Tokens) {
+    let cr = Rect::from_min_size(pos2(at.x + FLYOUT_GAP, at.y - TOOL_CELL / 2.0), vec2(FLYOUT_W, TOOL_CELL));
+    let cresp = ui.interact(cr, ui.scope_id().with(("flyout", g.key)), Sense::click());
+    let open = app.ui.tool_flyout == Some(g.key);
+    a11y::menu_button(&cresp, tr(g.name), open);
+    if open {
+        a11y::popup(&mut app.ui.nav, cresp.id, flyout_id(g.key));
+    }
+    if cresp.hovered() {
+        ui.painter().rect_filled(cr, CornerRadius::same(4), t.hover);
+    }
+    icons::paint(ui.painter(), Rect::from_center_size(cr.center(), vec2(CARET, CARET)), Icon::Chevron, t.icon_secondary);
+    if cresp.clicked() {
+        app.ui.tool_flyout = if open { None } else { Some(g.key) };
+    }
+}
+
+/// Resources (components, plugins: the Assets panel) and the Actions palette's button, from `x`.
+/// Where the next part starts.
+fn side_buttons(app: &mut FigApp, ui: &mut Ui, mut x: f32, cy: f32, t: &Tokens) -> f32 {
     for (icon, tip, id) in [
         (Icon::Assets, crate::shortcuts::key_tip(tr("Resources"), "Shift+I"), "resources"),
         (Icon::Actions, crate::shortcuts::tip(tr("Actions"), "app.actions"), "actions"),
     ] {
-        let r = Rect::from_center_size(pos2(x + cell / 2.0, cy), vec2(cell, cell));
-        let resp = ui.interact(r, ui.id().with(id), Sense::click()).tip(tip);
-        if resp.hovered() {
+        let r = Rect::from_center_size(pos2(x + TOOL_CELL / 2.0, cy), vec2(TOOL_CELL, TOOL_CELL));
+        let resp = ui.interact(r, ui.scope_id().with(id), Sense::click()).tip(tip);
+        if id == "actions" {
+            app.ui.actions_rect = Some(r);
+        }
+        // The Actions button reads on while its panel is open; clicking it again closes it.
+        let actions_open = id == "actions" && app.ui.palette.is_some();
+        if actions_open {
+            ui.painter().rect_filled(r, CornerRadius::same(5), t.accent);
+        } else if resp.hovered() {
             ui.painter().rect_filled(r, CornerRadius::same(5), t.hover);
         }
-        icons::paint(ui.painter(), r.shrink(7.0), icon, t.icon);
+        icons::paint(ui.painter(), glyph_rect(r), icon, if actions_open { t.accent_on } else { t.icon });
         if resp.clicked() {
             if id == "actions" {
-                app.ui.palette = Some(String::new());
+                crate::menus::toggle_palette(&mut app.ui);
             } else {
-                app.ui.left_tab = crate::LeftTab::Assets;
-                app.ui.left_collapsed = false;
+                app.run("view.assets", json!({}));
             }
         }
-        x += cell + 4.0;
+        x += TOOL_CELL + 4.0;
     }
-    divider(ui, &t, x, cy);
-    x += 8.0;
-    // Mode switcher: Draw · Design · Prototype · Inspect (code).
+    x
+}
+
+/// The mode switcher from `x`: Draw · Design · Prototype · Inspect (code).
+fn mode_switcher(app: &mut FigApp, ui: &mut Ui, x: f32, cy: f32, t: &Tokens) {
     let modes = [(Icon::Pencil, tr("Draw")), (Icon::Frame, tr("Design")), (Icon::Prototype, tr("Prototype")), (Icon::Code, tr("Inspect"))];
     let active = match app.ui.right_tab {
         crate::RightTab::Design if app.session.tool.tool == ToolId::Pencil => 0,
@@ -157,7 +290,7 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
     ui.painter().rect_filled(seg, CornerRadius::same(8), t.field);
     for (i, (icon, tip)) in modes.iter().enumerate() {
         let r = Rect::from_min_size(pos2(seg.min.x + 2.0 + i as f32 * 34.0, seg.min.y + 2.0), vec2(34.0, 32.0));
-        let resp = ui.interact(r, ui.id().with(("mode", i)), Sense::click()).on_hover_text(*tip);
+        let resp = ui.interact(r, ui.scope_id().with(("mode", i)), Sense::click()).on_hover_text(*tip);
         a11y::toggle(&resp, tip, i == active);
         if i == active {
             ui.painter().rect_filled(r, CornerRadius::same(6), t.panel);
@@ -165,27 +298,39 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
         } else if resp.hovered() {
             ui.painter().rect_filled(r, CornerRadius::same(6), t.hover);
         }
-        icons::paint(ui.painter(), r.shrink(9.0), *icon, if i == active { t.accent_text } else { t.icon_secondary });
+        icons::paint(ui.painter(), glyph_rect(r), *icon, if i == active { t.accent_text } else { t.icon_secondary });
         if resp.clicked() {
-            match i {
-                0 => {
-                    app.ui.right_tab = crate::RightTab::Design;
-                    app.run("tool.set", json!({"tool": "pencil"}));
-                }
-                1 => {
-                    app.ui.right_tab = crate::RightTab::Design;
-                    if app.session.tool.tool == ToolId::Pencil {
-                        app.run("tool.set", json!({"tool": "move"}));
-                    }
-                }
-                2 => app.ui.right_tab = crate::RightTab::Prototype,
-                _ => app.ui.right_tab = crate::RightTab::Inspect,
-            }
+            pick_mode(app, i);
         }
     }
-    // Floating help button at the bottom right of the canvas.
-    let hr = Rect::from_center_size(pos2(canvas.max.x - 32.0, canvas.max.y - 32.0), vec2(32.0, 32.0));
-    let hresp = ui.interact(hr, ui.id().with("help"), Sense::click()).tip(tr("Help and resources"));
+}
+
+/// Mode `i` of the switcher chosen.
+fn pick_mode(app: &mut FigApp, i: usize) {
+    match i {
+        0 => {
+            app.ui.right_tab = crate::RightTab::Design;
+            app.run("tool.set", json!({"tool": "pencil"}));
+        }
+        1 => {
+            app.ui.right_tab = crate::RightTab::Design;
+            if app.session.tool.tool == ToolId::Pencil {
+                app.run("tool.set", json!({"tool": "move"}));
+            }
+        }
+        2 => app.ui.right_tab = crate::RightTab::Prototype,
+        _ => app.ui.right_tab = crate::RightTab::Inspect,
+    }
+}
+
+/// The floating help button at the bottom right of the canvas.
+fn help_button(app: &mut FigApp, ui: &mut Ui, canvas: Rect, pill: Rect, t: &Tokens) {
+    let mut hr = Rect::from_center_size(pos2(canvas.max.x - 32.0, canvas.max.y - 32.0), vec2(32.0, 32.0));
+    // Above the pill when they'd overlap (a narrow window).
+    if hr.intersects(pill) {
+        hr = hr.translate(vec2(0.0, -(pill.height() + 12.0)));
+    }
+    let hresp = ui.interact(hr, ui.scope_id().with("help"), Sense::click()).tip(tr("Help and resources"));
     ui.painter().circle_filled(hr.center() + vec2(0.0, 1.0), 17.0, Color32::from_black_alpha(20));
     ui.painter().circle_filled(hr.center(), 16.0, t.panel);
     ui.painter().text(hr.center(), Align2::CENTER_CENTER, "?", crate::theme::regular(15.0), t.text);
@@ -194,10 +339,11 @@ pub fn show(app: &mut FigApp, ui: &mut Ui) {
             (tr("Getting started"), "help.gettingStarted"),
             (tr("Keyboard shortcuts"), "help.shortcuts"),
             (tr("Help page"), "help.page"),
+            (tr("Check for updates…"), "help.checkForUpdates"),
             (tr("About FigCraft"), "help.about"),
         ] {
             if crate::right::menu_item(ui, l, crate::shortcuts::shortcut(c).unwrap_or("")) {
-                app.run(c, json!({}));
+                crate::menus::invoke(app, c);
                 ui.close();
             }
         }
@@ -234,7 +380,7 @@ fn view_only_toolbar(app: &mut FigApp, ui: &mut Ui, why: &'static str) {
     }
     divider(ui, &t, x, cy);
     let badge = Rect::from_min_size(pos2(x + 12.0, cy - 13.0), vec2(badge_w, 26.0));
-    let resp = ui.interact(badge, ui.id().with("view_only"), Sense::hover()).on_hover_text(why);
+    let resp = ui.interact(badge, ui.scope_id().with("view_only"), Sense::hover()).on_hover_text(why);
     a11y::status(&resp, label, why);
     ui.painter().rect_filled(badge, CornerRadius::same(13), t.field);
     icons::paint(ui.painter(), Rect::from_center_size(pos2(badge.min.x + 12.0 + 7.0, cy), vec2(14.0, 14.0)), Icon::Eye, t.icon_secondary);
@@ -325,14 +471,21 @@ fn builder_toolbar(app: &mut FigApp, ui: &mut Ui) {
     }
 }
 
+/// Where a toolbar pill `width` wide sits: centred 12 px above the canvas's bottom edge.
+/// (Never wider than the canvas less a margin: on a phone the main toolbar scrolls inside it.)
+pub(crate) fn pill_rect(canvas: Rect, width: f32) -> Rect {
+    let width = width.min((canvas.width() - 16.0).max(0.0));
+    Rect::from_center_size(pos2(canvas.center().x, canvas.max.y - 12.0 - 24.0), vec2(width, 48.0))
+}
+
 /// The floating pill (shadow, panel, border) `width` wide at the bottom centre of the canvas: the
 /// toolbar region keyboard navigation moves through.
 fn pill(ui: &Ui, nav: &mut Nav, canvas: Rect, width: f32, t: &Tokens) -> Rect {
-    let rect = Rect::from_center_size(pos2(canvas.center().x, canvas.max.y - 12.0 - 24.0), vec2(width, 48.0));
+    let rect = pill_rect(canvas, width);
     // The pill takes the press and the drag over it: its buttons sense clicks only, and egui gives
     // a drag the canvas under them would sense to the canvas, so the pen placed an anchor there.
     // Not focusable: the keyboard walks the buttons, not the pill.
-    ui.interact(rect, ui.id().with("pill"), Sense::CLICK | Sense::DRAG);
+    ui.interact(rect, ui.scope_id().with("pill"), Sense::CLICK | Sense::DRAG);
     a11y::area(nav, Region::Toolbar, rect);
     a11y::container_bounds(ui, rect);
     let painter = ui.painter();
@@ -345,20 +498,20 @@ fn pill(ui: &Ui, nav: &mut Nav, canvas: Rect, width: f32, t: &Tokens) -> Rect {
 }
 
 /// A square tool button: accent when active, tinted on hover; `tip` is its tooltip and name.
-fn tool_cell(ui: &mut Ui, t: &Tokens, r: Rect, id: impl egui::AsIdSalt, icon: Icon, active: bool, tip: &str) -> egui::Response {
-    let resp = ui.interact(r, ui.id().with(id), Sense::click()).on_hover_ui(|ui| {
+pub(crate) fn tool_cell(ui: &mut Ui, t: &Tokens, r: Rect, id: impl egui::AsIdSalt, icon: Icon, active: bool, tip: &str) -> egui::Response {
+    let resp = ui.interact(r, ui.scope_id().with(id), Sense::click()).on_hover_ui(|ui| {
         ui.label(tip);
     });
     a11y::toggle(&resp, tip, active);
     let bg = if active {
-        ACCENT
+        t.accent
     } else if resp.hovered() {
         t.hover
     } else {
         Color32::TRANSPARENT
     };
     ui.painter().rect_filled(r, CornerRadius::same(5), bg);
-    icons::paint(ui.painter(), r.shrink(7.0), icon, if active { Color32::WHITE } else { t.icon });
+    icons::paint(ui.painter(), glyph_rect(r), icon, if active { t.accent_on } else { t.icon });
     resp
 }
 
@@ -373,12 +526,49 @@ const DONE_W: f32 = 56.0;
 fn done_button(ui: &mut Ui, t: &Tokens, x: f32, cy: f32, tip: &str) -> bool {
     divider(ui, t, x, cy);
     let done = Rect::from_min_size(pos2(x + 12.0, cy - 14.0), vec2(DONE_W, 28.0));
-    let resp = ui.interact(done, ui.id().with("tool_done"), Sense::click()).tip(tip);
-    ui.painter().rect_filled(done, CornerRadius::same(6), if resp.hovered() { t.accent_hover } else { ACCENT });
-    ui.painter().text(done.center(), Align2::CENTER_CENTER, tr("Done"), crate::theme::semibold(11.5), Color32::WHITE);
+    let resp = ui.interact(done, ui.scope_id().with("tool_done"), Sense::click()).tip(tip);
+    ui.painter().rect_filled(done, CornerRadius::same(6), if resp.hovered() { t.accent_hover } else { t.accent });
+    ui.painter().text(done.center(), Align2::CENTER_CENTER, tr("Done"), crate::theme::semibold(11.5), t.accent_on);
     resp.clicked()
 }
 
+/// A board tool's flyout: the colours, shapes or stamps it places, in a row. A pick chooses the
+/// tool with it.
+fn options_flyout(app: &mut FigApp, ui: &mut Ui, g: &Group, bottom_left: egui::Pos2) {
+    let t = Tokens::get(ui.ctx());
+    let Some(&(tool, _)) = g.tools.first() else { return };
+    let items = crate::board_bar::choices(g.options, &app.session.tool.board);
+    let (cell, pad) = (32.0, 8.0);
+    let size = vec2(items.len() as f32 * (cell + 4.0) - 4.0 + 2.0 * pad, cell + 2.0 * pad);
+    let mut chosen = None;
+    egui::Area::new(flyout_id(g.key)).fixed_pos(pos2(bottom_left.x, bottom_left.y - size.y)).order(egui::Order::Foreground).show(ui.ctx(), |ui| {
+        let (rect, _) = ui.allocate_exact_size(size, Sense::hover());
+        ui.painter().rect_filled(rect, CornerRadius::same(13), t.menu);
+        for (i, c) in items.iter().enumerate() {
+            let r = Rect::from_min_size(pos2(rect.min.x + pad + i as f32 * (cell + 4.0), rect.min.y + pad), vec2(cell, cell));
+            let resp = ui.interact(r, ui.scope_id().with(("opt", g.key, i)), Sense::click()).on_hover_text(tr(c.label));
+            a11y::menu_item(&resp, tr(c.label), "", Some(c.on));
+            a11y::own_focus(&resp);
+            if c.on || resp.hovered() || resp.has_focus() {
+                ui.painter().rect_filled(r, CornerRadius::same(5), t.menu_hover);
+            }
+            crate::board_bar::paint_choice(ui.painter(), r.shrink(5.0), &c.mark, t.menu_text);
+            if resp.clicked() {
+                chosen = Some(c.params.clone());
+            }
+        }
+    });
+    if ui.input(|i| i.key_pressed(egui::Key::Escape)) {
+        app.ui.tool_flyout = None;
+    }
+    if let Some(params) = chosen {
+        app.run(&format!("tool.{}", tool.id()), params);
+        app.ui.tool_flyout = None;
+    }
+}
+
+/// Draw a tool group's flyout above its button, with keyboard/hover highlighting, remembered
+/// selection when a tool is clicked, and Escape to close.
 fn flyout(app: &mut FigApp, ui: &mut Ui, g: &Group, bottom_left: egui::Pos2) {
     let t = Tokens::get(ui.ctx());
     let item_h = 32.0;
@@ -391,7 +581,7 @@ fn flyout(app: &mut FigApp, ui: &mut Ui, g: &Group, bottom_left: egui::Pos2) {
         let mut y = rect.min.y + 8.0;
         for (tid, icon) in g.tools {
             let r = Rect::from_min_size(pos2(rect.min.x + 8.0, y), vec2(w - 16.0, item_h));
-            let resp = ui.interact(r, ui.id().with(("fly", tid.id())), Sense::click());
+            let resp = ui.interact(r, ui.scope_id().with(("fly", tid.id())), Sense::click());
             a11y::menu_item(&resp, tr(tid.label()), tid.shortcut(), Some(*tid == app.session.tool.tool));
             // The keyboard's item is highlighted like the hovered one.
             a11y::own_focus(&resp);
@@ -415,19 +605,89 @@ fn flyout(app: &mut FigApp, ui: &mut Ui, g: &Group, bottom_left: egui::Pos2) {
     }
     if let Some(tid) = chosen {
         if let Some(i) = ToolId::ALL.iter().position(|x| *x == tid) {
-            ui.data_mut(|d| d.insert_temp(egui::Id::new(("tb_last", g.key)), i as u8));
+            ui.data_mut(|d| d.insert_temp(egui::Id::unique(("tb_last", g.key)), i as u8));
         }
-        app.run("tool.set", json!({"tool": tid.id()}));
+        choose(app, tid);
         app.ui.tool_flyout = None;
     }
 }
 
+/// Choose `tool` from the toolbar. Dev Mode only inspects: a tool that edits leaves it for the
+/// design.
+fn choose(app: &mut FigApp, tool: ToolId) {
+    if app.ui.right_tab == crate::RightTab::Inspect && !matches!(tool, ToolId::Move | ToolId::Hand | ToolId::Comment) {
+        app.ui.right_tab = crate::RightTab::Design;
+    }
+    app.run("tool.set", json!({"tool": tool.id()}));
+}
+
 /// A tool group's flyout (an egui area).
 fn flyout_id(key: &str) -> egui::Id {
-    egui::Id::new(("flyout_area", key))
+    egui::Id::unique(("flyout_area", key))
 }
 
 /// "Shift+Cmd+K" → "⇧⌘K" on macOS, "Ctrl+Shift+K" elsewhere.
 pub fn pretty_shortcut(s: &str) -> String {
     figcraft_engine::keymap::display(s, crate::shortcuts::platform())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use egui::Shape;
+
+    #[test]
+    fn pill_never_outgrows_a_phone_canvas() {
+        let full = main_width(GROUPS, false);
+        let phone = Rect::from_min_size(pos2(0.0, 0.0), vec2(375.0, 700.0));
+        let pill = pill_rect(phone, full);
+        assert!(pill.width() <= phone.width() - 16.0 && pill.min.x >= 8.0 && pill.max.x <= phone.max.x - 8.0, "{pill:?}");
+        // A desktop canvas keeps the full width, and a degenerate one doesn't go negative.
+        let wide = Rect::from_min_size(pos2(0.0, 0.0), vec2(1400.0, 800.0));
+        assert_eq!(pill_rect(wide, full).width(), full);
+        assert_eq!(pill_rect(Rect::from_min_size(pos2(0.0, 0.0), vec2(4.0, 4.0)), full).width(), 0.0);
+    }
+
+    /// The stroke widths `icon` paints with in a `size` box at `ppp` pixels per point.
+    fn widths(ppp: f32, icon: Icon, size: f32) -> Vec<f32> {
+        let ctx = egui::Context::default();
+        let input = || {
+            let mut i = egui::RawInput::default();
+            i.viewports.entry(egui::ViewportId::ROOT).or_default().native_pixels_per_point = Some(ppp);
+            i
+        };
+        ctx.run_ui(input(), |_| {}).textures_delta.clear();
+        let mut out =
+            ctx.run_ui(input(), |ui| icons::paint(ui.painter(), Rect::from_center_size(pos2(50.0, 50.0), vec2(size, size)), icon, Color32::WHITE));
+        out.textures_delta.clear();
+        assert_eq!(ctx.pixels_per_point(), ppp);
+        let mut w: Vec<f32> = out
+            .shapes
+            .iter()
+            .filter_map(|c| match &c.shape {
+                Shape::LineSegment { stroke, .. } => Some(stroke.width),
+                Shape::Path(p) => Some(p.stroke.width),
+                Shape::Rect(r) => Some(r.stroke.width),
+                _ => None,
+            })
+            .filter(|w| *w > 0.0)
+            .collect();
+        w.dedup();
+        w
+    }
+
+    /// The flyout carets and the marks beside them draw with one stroke width (#737), and the
+    /// mode switcher's marks are the tool marks' size (#738).
+    #[test]
+    fn toolbar_marks_share_one_stroke_width() {
+        for ppp in [1.0, 1.5, 2.0] {
+            let mark = widths(ppp, Icon::Rectangle, GLYPH);
+            assert_eq!(mark.len(), 1, "one width at {ppp}×: {mark:?}");
+            assert_eq!(widths(ppp, Icon::Chevron, CARET), mark, "caret at {ppp}×");
+            assert_eq!(widths(ppp, Icon::Code, GLYPH), mark, "mode mark at {ppp}×");
+            for icon in [Icon::Frame, Icon::Text] {
+                assert_eq!(widths(ppp, icon, GLYPH), mark, "{icon:?} at {ppp}×");
+            }
+        }
+    }
+}
diff --git a/crates/ui-egui/src/type_settings_tests.rs b/crates/ui-egui/src/type_settings_tests.rs
new file mode 100644
index 00000000..421c1ce2
--- /dev/null
+++ b/crates/ui-egui/src/type_settings_tests.rs
@@ -0,0 +1,31 @@
+//! Regression for #1029: a Type settings row whose label is wider than its column (French "Retrait
+//! de paragraphe") stays inside the popover, which otherwise widened a little every frame.
+use egui::{Area, Id, Pos2, RawInput, Rect, vec2};
+
+/// Asserts a long type-settings row label does not widen the popover beyond 264 pt across
+/// frames.
+#[test]
+fn a_long_label_does_not_widen_the_type_settings_popover() {
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx, false, 0);
+    let id = Id::unique("ty_row_test");
+    let mut widths = Vec::new();
+    for i in 0..30 {
+        let raw =
+            RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1200.0, 900.0))), time: Some(i as f64 / 60.0), ..Default::default() };
+        ctx.run_ui(raw, |ui| {
+            // As `egui::Popup::width` shows it: a default width the area grows past to fit.
+            Area::new(id).fixed_pos(Pos2::ZERO).default_width(264.0).show(ui.ctx(), |ui| {
+                for label in ["List spacing", "Retrait de paragraphe, plus long que la colonne"] {
+                    crate::typography::field_row(ui, label, |ui, fw| ui.allocate_exact_size(vec2(fw, 20.0), egui::Sense::hover()));
+                }
+            });
+        })
+        .textures_delta
+        .clear();
+        widths.push(ctx.memory(|m| m.area_rect(id)).expect("the area is shown").width());
+    }
+    let (first, last) = (widths[1], widths[widths.len() - 1]);
+    assert!((last - first).abs() < 0.01, "the row widens the popover every frame: {first} → {last}");
+    assert!((last - 264.0).abs() < 0.01, "{last}");
+}
diff --git a/crates/ui-egui/src/typography.rs b/crates/ui-egui/src/typography.rs
deleted file mode 100644
index 78552dcb..00000000
--- a/crates/ui-egui/src/typography.rs
+++ /dev/null
@@ -1,1418 +0,0 @@
-//! Typography section of the Design panel: font family (searchable, previewed, recent first),
-//! style, size (with common sizes), line height, letter spacing, paragraph spacing, resizing,
-//! alignment, and the Type settings popover (decoration, case, lists, indent, truncation, OpenType
-//! features and variable font axes). While text is being edited with a range selected, character
-//! edits apply to the range (`text.style`, `text.setVariations`); otherwise they apply to whole
-//! layers. Differing values show "Mixed".
-
-use std::sync::Arc;
-
-use egui::{Align2, Color32, CornerRadius, Id, Rect, Sense, Stroke, StrokeKind, Ui, pos2, vec2};
-use figcraft_doc::*;
-use serde_json::{Value, json};
-
-use crate::FigApp;
-use crate::i18n::{tr, tr_noop, trf};
-use crate::icons::{self, Icon};
-use crate::right::{common, menu_item, menu_popup, row};
-use crate::theme::{Tokens, regular, semibold};
-use crate::widgets::{self, FIELD_H, FieldEdit, Lead, PAD};
-
-/// Font sizes offered by the size dropdown.
-const SIZES: [f64; 15] = [10.0, 11.0, 12.0, 13.0, 14.0, 16.0, 20.0, 24.0, 32.0, 36.0, 40.0, 48.0, 64.0, 96.0, 128.0];
-
-/// OpenType features offered in Type settings ▸ Details: (tag, label, on by default in fonts).
-const FEATURES: [(&str, &str, bool); 12] = [
-    ("liga", tr_noop("Standard ligatures"), true),
-    ("calt", tr_noop("Contextual alternates"), true),
-    ("tnum", tr_noop("Tabular numbers"), false),
-    ("frac", tr_noop("Fractions"), false),
-    ("case", tr_noop("Case-sensitive forms"), false),
-    ("zero", tr_noop("Slashed zero"), false),
-    ("ss01", tr_noop("Stylistic set 1"), false),
-    ("ss02", tr_noop("Stylistic set 2"), false),
-    ("ss03", tr_noop("Stylistic set 3"), false),
-    ("ss04", tr_noop("Stylistic set 4"), false),
-    ("ss05", tr_noop("Stylistic set 5"), false),
-    ("smcp", tr_noop("Small capitals"), false),
-];
-
-/// Shown for differing values (translated where shown: `tr(MIXED)`).
-const MIXED: &str = tr_noop("Mixed");
-
-/// The Type settings tabs (Variable only for variable fonts).
-const TABS: [&str; 3] = [tr_noop("Basics"), tr_noop("Details"), tr_noop("Variable")];
-
-/// The value shared by every style, or None when they differ.
-fn uniform<T: PartialEq + Clone>(styles: &[TextStyle], f: impl Fn(&TextStyle) -> T) -> Option<T> {
-    let mut it = styles.iter();
-    let first = f(it.next()?);
-    if it.all(|s| f(s) == first) { Some(first) } else { None }
-}
-
-/// The character styles the panel shows: the edited range's spans, else every span of every
-/// selected text layer.
-pub(crate) fn target_styles(doc: &Document, ids: &[NodeId], range: Option<(NodeId, usize, usize)>) -> Vec<TextStyle> {
-    let mut out: Vec<TextStyle> = Vec::new();
-    let mut push = |s: &TextStyle| {
-        if !out.contains(s) {
-            out.push(s.clone());
-        }
-    };
-    for id in ids {
-        let Some(t) = doc.node(*id).and_then(|n| n.kind.text()) else { continue };
-        match range {
-            Some((rid, a, b)) if rid == *id && a < b => {
-                for (s, e, st) in t.spans() {
-                    if s < b && e > a {
-                        push(st);
-                    }
-                }
-            }
-            _ => {
-                for (_, _, st) in t.spans() {
-                    push(st);
-                }
-            }
-        }
-    }
-    out
-}
-
-pub fn typography(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) {
-    let ids: Vec<NodeId> = sel.iter().copied().filter(|i| matches!(doc.node(*i).map(|n| &n.kind), Some(NodeKind::Text(_)))).collect();
-    if ids.is_empty() {
-        return;
-    }
-    // While editing a range, character edits apply to it.
-    let range = figcraft_engine::textedit::selected_range(&app.session);
-    let editing = range.is_some();
-    let styles = target_styles(doc, &ids, range);
-    let apply_style = |app: &mut FigApp, key: &str, v: Value| commit_text(app, &ids, range, json!({ key: v }));
-
-    let hdr =
-        widgets::section_header(ui, tr("Typography"), &[(Icon::Variable, tr("Apply variable to text")), (Icon::Styles, tr("Text styles"))], false);
-    if hdr == Some(0) {
-        crate::variable_ui::open_at_pointer(ui, &ids, "characters", VariableType::String);
-    }
-    if hdr == Some(1) {
-        crate::style_picker::open(app, ui, &ids, crate::style_picker::StyleSlot::Text);
-    }
-    crate::variable_ui::bound_row(app, ui, &ids, "characters", VariableType::String, Lead::Icon(Icon::Text, tr("Text")), f32::INFINITY);
-    // A text style: its chip stands for the font rows (they show again when the chars differ).
-    crate::style_picker::chip(app, ui, doc, &ids, crate::style_picker::StyleSlot::Text);
-    if !matches!(crate::style_picker::text_link(app, doc, &ids), Some(Some(_))) {
-        font_rows(app, ui, &ids, &styles, editing, &apply_style);
-    }
-    paragraph_rows(app, ui, doc, &ids, &styles, &apply_style);
-    path_row(app, ui, doc, sel, &ids);
-}
-
-/// Text on a path: where the text starts, which side it runs on, and taking it off the path; or,
-/// with a text and a path selected, putting the text on the path.
-fn path_row(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId], ids: &[NodeId]) {
-    let paths: Option<Vec<(f64, bool)>> =
-        ids.iter().map(|i| doc.node(*i).and_then(|n| n.kind.text()).and_then(|t| t.path.as_ref()).map(|p| (p.start(), p.flip))).collect();
-    let Some(paths) = paths else {
-        let other = sel.iter().find(|i| !ids.contains(i)).and_then(|i| doc.node(*i));
-        if ids.len() == 1 && sel.len() == 2 && other.is_some_and(|n| figcraft_doc::geometry::stroke_geometry(n).is_some()) {
-            row(ui, 32.0, |ui| {
-                if widgets::button(ui, tr("Put text on path"), false, true).clicked() {
-                    app.run("text.onPath", json!({ "ids": sel }));
-                }
-            });
-        }
-        return;
-    };
-    let start = paths.first().map(|p| p.0).filter(|s| paths.iter().all(|p| p.0 == *s));
-    let flip = paths.iter().all(|p| p.1);
-    row(ui, 32.0, |ui| {
-        let lead = Lead::Icon(Icon::Pen, tr("Start on path"));
-        match widgets::number_field(ui, Id::new("ty_path_start"), lead, start.map(|s| s * 100.0), "%", 96.0, 1.0) {
-            Some(FieldEdit::Set(v)) => {
-                app.run("text.pathOptions", json!({"ids": ids, "start": v / 100.0}));
-            }
-            Some(FieldEdit::Scrub(v, done)) => live(app, "Start on path", "text.pathOptions", json!({"ids": ids, "start": v / 100.0}), done),
-            None => {}
-        }
-        if icons::button(ui, Icon::FlipV, 24.0, flip, tr("Flip text to the other side")).clicked() {
-            app.run("text.pathOptions", json!({"ids": ids, "flip": !flip}));
-        }
-        if icons::button(ui, Icon::Detach, 24.0, false, tr("Remove text from path")).clicked() {
-            app.run("text.removeFromPath", json!({ "ids": ids }));
-        }
-    });
-}
-
-/// Set character `props` on the selected chars of the text being edited, else on whole layers
-/// (through `node.set`, which records overrides inside instances).
-fn commit_text(app: &mut FigApp, ids: &[NodeId], range: Option<(NodeId, usize, usize)>, props: Value) {
-    match range {
-        Some((_, a, b)) if a != b => {
-            app.run("text.style", text_style_params(ids, range, props));
-        }
-        _ => app.set_props(ids, props),
-    }
-}
-
-/// `text.style` params for `props` on the selected chars of the text being edited, else on the
-/// whole of every layer in `ids` (previews; commits go through [`commit_text`]).
-fn text_style_params(ids: &[NodeId], range: Option<(NodeId, usize, usize)>, mut props: Value) -> Value {
-    match range {
-        Some((id, a, b)) if a != b => {
-            props["id"] = json!(id);
-            props["start"] = json!(a);
-            props["end"] = json!(b);
-        }
-        _ => props["ids"] = json!(ids),
-    }
-    props
-}
-
-/// The font rows: family, style and size, line height and letter spacing.
-fn font_rows(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], styles: &[TextStyle], editing: bool, apply_style: &dyn Fn(&mut FigApp, &str, Value)) {
-    let t = Tokens::get(ui.ctx());
-    let range = figcraft_engine::textedit::selected_range(&app.session);
-
-    // Font family.
-    let family = uniform(styles, |s| s.font_family.clone());
-    let fstyle = uniform(styles, |s| s.font_style.clone());
-    row(ui, 32.0, |ui| {
-        let w = ui.available_width();
-        let resp = widgets::dropdown(ui, family.as_deref().unwrap_or(tr(MIXED)), w, None);
-        menu_popup(&resp).width(w.max(240.0)).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
-            let pick = font_picker(ui, family.as_deref(), resp.clicked());
-            if let Some(f) = pick.picked {
-                remember_family(ui.ctx(), &f);
-                apply_style(app, "fontFamily", json!(f));
-                ui.close();
-            } else if let Some(f) = pick.highlighted {
-                // The canvas shows the family the arrow keys are on.
-                app.preview_text(ui.ctx(), "text.style", text_style_params(ids, range, json!({"fontFamily": f})));
-            }
-        });
-    });
-
-    // Style + size.
-    let half = (ui.available_width() - PAD * 2.0 - 8.0) / 2.0;
-    row(ui, 32.0, |ui| {
-        let resp = widgets::dropdown(ui, fstyle.as_deref().unwrap_or(tr(MIXED)), half, None);
-        let fam = family.clone();
-        menu_popup(&resp).width(200.0).show(|ui| match &fam {
-            Some(fam) => {
-                let list = figcraft_text::family_styles(fam);
-                if list.is_empty() {
-                    widgets::label(ui, tr("Font not installed"), t.text_tertiary);
-                }
-                egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| {
-                    for s in list {
-                        let mark = if fstyle.as_deref() == Some(s.as_str()) { "✓ " } else { "   " };
-                        let (clicked, hovered) = menu_item_hover(ui, &format!("{mark}{s}"));
-                        if clicked {
-                            apply_style(app, "fontStyle", json!(s));
-                            ui.close();
-                        } else if hovered {
-                            // The canvas shows the style (a variable font's named instance too).
-                            app.preview_text(ui.ctx(), "text.style", text_style_params(ids, range, json!({"fontStyle": s})));
-                        }
-                    }
-                });
-            }
-            None => widgets::label(ui, tr("Pick one font family first"), t.text_tertiary),
-        });
-        let size = uniform(styles, |s| s.font_size);
-        ui.spacing_mut().item_spacing.x = 0.0;
-        // The whole layer's size can follow a variable; a selected range just takes a value.
-        let e = if editing {
-            widgets::number_field(ui, Id::new("ty_size"), Lead::None, size, "", half - 20.0, 1.0)
-        } else {
-            crate::variable_ui::number_field(app, ui, ids, "fontSize", Id::new("ty_size"), Lead::None, size, "", half - 20.0)
-        };
-        match e {
-            Some(FieldEdit::Set(v)) => apply_style(app, "fontSize", json!(v.clamp(1.0, 5000.0))),
-            // The text editing session already groups undo; just apply.
-            Some(FieldEdit::Scrub(v, _)) if editing => apply_style(app, "fontSize", json!(v.clamp(1.0, 5000.0))),
-            Some(FieldEdit::Scrub(v, done)) => {
-                live(app, "Font size", "node.set", json!({"ids": ids, "props": {"fontSize": v.clamp(1.0, 5000.0)}}), done)
-            }
-            None => {}
-        }
-        let more = icons::button(ui, Icon::Chevron, 20.0, false, tr("Font size"));
-        menu_popup(&more).width(90.0).show(|ui| {
-            egui::ScrollArea::vertical().max_height(360.0).show(ui, |ui| {
-                for v in SIZES {
-                    let mark = if size == Some(v) { "✓ " } else { "   " };
-                    if menu_item(ui, &format!("{mark}{}", trim_num(v)), "") {
-                        apply_style(app, "fontSize", json!(v));
-                        ui.close();
-                    }
-                }
-            });
-        });
-    });
-
-    // Line height + letter spacing.
-    row(ui, 32.0, |ui| {
-        let lh = uniform(styles, |s| s.line_height);
-        let lh_label = lh.map(|l| l.label()).unwrap_or_else(|| tr(MIXED).into());
-        let field = SpacingField { field: "lineHeight", id: Id::new("ty_lh"), glyph: LeadGlyph::LineHeight, tip: tr("Line height") };
-        if let Some(edit) = spacing_field(app, ui, ids, &field, &lh_label, half, editing)
-            && let Some(v) = parse_line_height(&edit.text(), lh)
-        {
-            commit_spacing(app, ids, range, &field, &edit, v);
-        }
-        let ls = uniform(styles, |s| s.letter_spacing);
-        let ls_label = ls.map(|l| l.label()).unwrap_or_else(|| tr(MIXED).into());
-        let field = SpacingField { field: "letterSpacing", id: Id::new("ty_ls"), glyph: LeadGlyph::LetterSpacing, tip: tr("Letter spacing") };
-        if let Some(edit) = spacing_field(app, ui, ids, &field, &ls_label, half, editing)
-            && let Some(v) = parse_letter_spacing(&edit.text(), ls)
-        {
-            commit_spacing(app, ids, range, &field, &edit, v);
-        }
-    });
-}
-
-/// Paragraph spacing, resizing, alignment and the Type settings popover.
-fn paragraph_rows(
-    app: &mut FigApp,
-    ui: &mut Ui,
-    doc: &Document,
-    ids: &[NodeId],
-    styles: &[TextStyle],
-    apply_style: &dyn Fn(&mut FigApp, &str, Value),
-) {
-    let half = (ui.available_width() - PAD * 2.0 - 8.0) / 2.0;
-    // Paragraph spacing + resizing.
-    let ps = common(doc, ids, |n| n.kind.text().map(|t| t.paragraph_spacing.to_bits())).flatten().map(f64::from_bits);
-    let resize = common(doc, ids, |n| n.kind.text().map(|t| t.auto_resize)).flatten();
-    row(ui, 32.0, |ui| {
-        let ps_label = ps.map(trim_num).unwrap_or_else(|| tr(MIXED).into());
-        let field =
-            SpacingField { field: "paragraphSpacing", id: Id::new("ty_ps"), glyph: LeadGlyph::ParagraphSpacing, tip: tr("Paragraph spacing") };
-        if let Some(edit) = spacing_input(ui, &field, &ps_label, half)
-            && let Some(v) = widgets::eval(&edit.text(), ps)
-        {
-            commit_spacing(app, ids, None, &field, &edit, json!(v.clamp(0.0, 10_000.0)));
-        }
-        let items =
-            [(Icon::Hug, tr("Auto width")), (Icon::LayoutV, tr("Auto height")), (Icon::Fixed, tr("Fixed size")), (Icon::Dots, tr("Truncate text"))];
-        let active = resize.map(|r| match r {
-            TextAutoResize::WidthAndHeight => 0,
-            TextAutoResize::Height => 1,
-            TextAutoResize::None => 2,
-            TextAutoResize::Truncate => 3,
-        });
-        if let Some(i) = widgets::segmented(ui, &items, active, (half / 4.0).floor()) {
-            let v = ["widthAndHeight", "height", "none", "truncate"].get(i).copied().unwrap_or("none");
-            app.set_props(ids, json!({"textAutoResize": v}));
-        }
-    });
-
-    // Alignment + Type settings.
-    let align = common(doc, ids, |n| n.kind.text().map(|t| (t.align_h, t.align_v))).flatten();
-    row(ui, 32.0, |ui| {
-        let items = [
-            (Icon::TextAlignLeft, tr("Align left")),
-            (Icon::TextAlignCenter, tr("Align center")),
-            (Icon::TextAlignRight, tr("Align right")),
-            (Icon::TextAlignJustify, tr("Justify")),
-        ];
-        let active = align.map(|(h, _)| match h {
-            TextAlignH::Left => 0,
-            TextAlignH::Center => 1,
-            TextAlignH::Right => 2,
-            TextAlignH::Justified => 3,
-        });
-        if let Some(i) = widgets::segmented(ui, &items, active, 24.0) {
-            let v = ["left", "center", "right", "justified"].get(i).copied().unwrap_or("left");
-            app.set_props(ids, json!({"textAlign": v}));
-        }
-        let items = [(Icon::TextTop, tr("Align top")), (Icon::TextMiddle, tr("Align middle")), (Icon::TextBottom, tr("Align bottom"))];
-        let active = align.map(|(_, v)| match v {
-            TextAlignV::Top => 0,
-            TextAlignV::Middle => 1,
-            TextAlignV::Bottom => 2,
-        });
-        if let Some(i) = widgets::segmented(ui, &items, active, 24.0) {
-            let v = ["top", "middle", "bottom"].get(i).copied().unwrap_or("top");
-            app.set_props(ids, json!({"textAlignVertical": v}));
-        }
-        let open_id = Id::new("ty_settings_open");
-        let open = egui::Popup::is_id_open(ui.ctx(), open_id);
-        let more = icons::button(ui, Icon::Dots, 24.0, open, tr("Type settings"));
-        egui::Popup::from_toggle_button_response(&more)
-            .id(open_id)
-            .width(264.0)
-            .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
-            .show(|ui| type_settings(app, ui, doc, ids, styles, apply_style));
-    });
-}
-
-/// A menu item that also reports the pointer being over it: (clicked, hovered).
-fn menu_item_hover(ui: &mut Ui, label: &str) -> (bool, bool) {
-    let r = crate::right::menu_row(ui, label, "", 0.0, |_, _, _| {});
-    (r.clicked(), r.hovered())
-}
-
-/// Run `cmd` as a live preview while scrubbing; the gesture becomes one undo step when `done`.
-/// (While text is edited, run commands directly: the editing session already groups undo.)
-pub(crate) fn live(app: &mut FigApp, label: &str, cmd: &str, params: Value, done: bool) {
-    let _ = app.session.begin_interaction(label);
-    if let Err(e) = app.session.execute(cmd, &params) {
-        app.toast(e.to_string());
-    }
-    if done {
-        let _ = app.session.commit_interaction();
-    }
-}
-
-/// The variable font the shown styles use (one family, one variable face), if any.
-fn variable_face(styles: &[TextStyle]) -> Option<Arc<figcraft_text::Face>> {
-    let family = uniform(styles, |s| s.font_family.clone())?;
-    let face = figcraft_text::find_face(&family, &styles.first()?.font_style)?;
-    (face.is_variable() && face.family.eq_ignore_ascii_case(&family)).then_some(face)
-}
-
-/// The Type settings popover: Basics (decoration, case, list, indent, truncation), Details
-/// (OpenType features) and, for variable fonts, Variable (axis sliders).
-fn type_settings(
-    app: &mut FigApp,
-    ui: &mut Ui,
-    doc: &Document,
-    ids: &[NodeId],
-    styles: &[TextStyle],
-    apply_style: &dyn Fn(&mut FigApp, &str, Value),
-) {
-    let t = Tokens::get(ui.ctx());
-    let tab_id = Id::new("ty_settings_tab");
-    let vf = variable_face(styles);
-    let tabs = &TABS[..if vf.is_some() { 3 } else { 2 }];
-    let mut tab: usize = ui.data(|d| d.get_temp(tab_id)).filter(|i| *i < tabs.len()).unwrap_or(0);
-    ui.horizontal(|ui| {
-        for (i, l) in tabs.iter().enumerate() {
-            let col = if tab == i { t.text } else { t.text_secondary };
-            let r = ui.add(egui::Label::new(egui::RichText::new(tr(l)).font(semibold(11.5)).color(col)).sense(Sense::click()));
-            if r.clicked() {
-                tab = i;
-            }
-        }
-    });
-    ui.data_mut(|d| d.insert_temp(tab_id, tab));
-    ui.add_space(4.0);
-    let w = ui.available_width();
-    if tab == 0 {
-        let deco = uniform(styles, |s| s.decoration);
-        caption(ui, tr("Decoration"));
-        let active = deco.map(|d| match d {
-            TextDecoration::None => 0,
-            TextDecoration::Underline => 1,
-            TextDecoration::Strikethrough => 2,
-        });
-        let items = [("—", tr_noop("None")), ("U", tr_noop("Underline")), ("S", tr_noop("Strikethrough"))];
-        if let Some(i) = text_seg(ui, "deco", &items, active, w) {
-            apply_style(app, "textDecoration", json!((["none", "underline", "strikethrough"].get(i).copied().unwrap_or("none"))));
-        }
-        if let Some(d @ (TextDecoration::Underline | TextDecoration::Strikethrough)) = deco {
-            decoration_details(app, ui, styles, apply_style, d == TextDecoration::Underline, w);
-        }
-        caption(ui, tr("Letter case"));
-        let case = uniform(styles, |s| s.case);
-        let active = case.map(|c| match c {
-            TextCase::Original => 0,
-            TextCase::Upper => 1,
-            TextCase::Lower => 2,
-            TextCase::Title => 3,
-            TextCase::SmallCaps => 4,
-        });
-        let items = [
-            ("—", tr_noop("As typed")),
-            ("AG", tr_noop("Uppercase")),
-            ("ag", tr_noop("Lowercase")),
-            ("Ag", tr_noop("Title case")),
-            ("Aɢ", tr_noop("Small caps")),
-        ];
-        if let Some(i) = text_seg(ui, "case", &items, active, w) {
-            apply_style(app, "textCase", json!((["original", "upper", "lower", "title", "smallCaps"].get(i).copied().unwrap_or("original"))));
-        }
-        caption(ui, tr("List style"));
-        // While editing: the selected paragraphs' list.
-        let range = figcraft_engine::textedit::selected_range(&app.session);
-        let list = common(doc, ids, |n| {
-            n.kind.text().and_then(|t| {
-                let (a, b) = range.filter(|r| r.0 == n.id).map_or((0, t.char_count()), |(_, a, b)| (a, b));
-                t.common_para_list(a, b).map(|p| p.list)
-            })
-        })
-        .flatten();
-        let active = list.map(|l| match l {
-            ListStyle::None => 0,
-            ListStyle::Bulleted => 1,
-            ListStyle::Numbered => 2,
-        });
-        let items = [("—", tr_noop("No list")), ("•", tr_noop("Bulleted list")), ("1.", tr_noop("Numbered list"))];
-        if let Some(i) = text_seg(ui, "list", &items, active, w) {
-            app.run("text.listStyle", json!({"ids": ids, "style": (["none", "bulleted", "numbered"].get(i).copied().unwrap_or("none"))}));
-        }
-        ui.add_space(6.0);
-        let spacing = common(doc, ids, |n| n.kind.text().map(|t| t.list_spacing.to_bits())).flatten().map(f64::from_bits);
-        field_row(ui, tr("List spacing"), |ui, fw| {
-            if let Some(FieldEdit::Set(v) | FieldEdit::Scrub(v, true)) =
-                widgets::number_field(ui, Id::new("ty_list_spacing"), Lead::None, spacing, "", fw, 1.0)
-            {
-                app.set_props(ids, json!({"listSpacing": v.clamp(0.0, 10_000.0)}));
-            }
-        });
-        ui.add_space(4.0);
-        let indent = common(doc, ids, |n| n.kind.text().map(|t| t.paragraph_indent.to_bits())).flatten().map(f64::from_bits);
-        // Indent applies to start-aligned text only; elsewhere the field stays visible but off.
-        let start_aligned =
-            common(doc, ids, |n| n.kind.text().map(|t| t.align_h != TextAlignH::Center && t.align_h != TextAlignH::Justified)).flatten();
-        ui.horizontal(|ui| {
-            ui.add_enabled_ui(start_aligned != Some(false), |ui| {
-                ui.add_sized(vec2(110.0, FIELD_H), egui::Label::new(egui::RichText::new(tr("Paragraph indent")).font(regular(11.0)).color(t.text)));
-                let field = widgets::number_field(ui, Id::new("ty_indent"), Lead::None, indent, "", w - 118.0, 1.0);
-                if let Some(FieldEdit::Set(v) | FieldEdit::Scrub(v, true)) = field {
-                    app.set_props(ids, json!({"paragraphIndent": v.clamp(0.0, 10_000.0)}));
-                }
-            })
-            .response
-            .on_disabled_hover_text(tr("Paragraph indent applies to left-aligned text"));
-        });
-        ui.add_space(4.0);
-        for (key, label) in [("hangingPunctuation", tr("Hanging punctuation")), ("hangingList", tr("Hanging list"))] {
-            let all_on = ids.iter().all(|i| {
-                doc.node(*i).and_then(|n| n.kind.text()).is_some_and(|t| if key == "hangingList" { t.hanging_list } else { t.hanging_punctuation })
-            });
-            if widgets::checkbox(ui, all_on, label) {
-                app.set_props(ids, json!({ key: !all_on }));
-            }
-        }
-        caption(ui, tr("Vertical trim"));
-        let trim = common(doc, ids, |n| n.kind.text().map(|t| usize::from(t.leading_trim == LeadingTrim::CapHeight))).flatten();
-        let items = [(tr("Standard"), tr_noop("Standard")), ("Ag", tr_noop("Cap height to baseline"))];
-        if let Some(i) = text_seg(ui, "trim", &items, trim, w) {
-            app.set_props(ids, json!({"leadingTrim": if i == 1 { "capHeight" } else { "none" }}));
-        }
-        let resize = common(doc, ids, |n| n.kind.text().map(|t| t.auto_resize)).flatten();
-        caption(ui, tr("Truncate text"));
-        let active = resize.map(|r| usize::from(r == TextAutoResize::Truncate));
-        match text_seg(ui, "trunc", &[(tr("Off"), tr_noop("Don't truncate")), ("…", tr_noop("Truncate with an ellipsis"))], active, w) {
-            Some(1) => app.set_props(ids, json!({"textAutoResize": "truncate"})),
-            Some(_) if resize != Some(TextAutoResize::Height) && resize != Some(TextAutoResize::WidthAndHeight) => {
-                app.set_props(ids, json!({"textAutoResize": "none"}))
-            }
-            _ => {}
-        }
-        // Max lines only matter while truncating; no limit shows "Auto".
-        if resize == Some(TextAutoResize::Truncate) {
-            let max = common(doc, ids, |n| n.kind.text().map(|t| t.max_lines)).flatten();
-            ui.add_space(4.0);
-            ui.horizontal(|ui| {
-                ui.add_sized(vec2(110.0, FIELD_H), egui::Label::new(egui::RichText::new(tr("Max lines")).font(regular(11.0)).color(t.text)));
-                let shown = max.map(f64::from).filter(|m| *m > 0.0);
-                let empty = if max.is_some() { tr("Auto") } else { tr(MIXED) };
-                if let Some(FieldEdit::Set(v) | FieldEdit::Scrub(v, true)) =
-                    widgets::number_field_or(ui, Id::new("ty_maxlines"), shown, empty, w - 118.0, 1.0)
-                {
-                    app.run("text.maxLines", json!({"ids": ids, "lines": v.round().clamp(0.0, 10_000.0)}));
-                }
-            });
-        }
-    } else if let (2, Some(face)) = (tab, &vf) {
-        variable_axes(app, ui, ids, styles, face);
-    } else {
-        // Which features the font has (first style shown).
-        let face = uniform(styles, |s| (s.font_family.clone(), s.font_style.clone())).and_then(|(f, s)| figcraft_text::find_face(&f, &s));
-        let face_name = face.as_ref().map(|f| format!("{} {}", f.family, f.style)).unwrap_or_else(|| tr("Mixed fonts").into());
-        widgets::label(ui, &face_name, t.text_secondary);
-        egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| {
-            for (tag, label, default_on) in FEATURES {
-                let state = common(doc, ids, |n| n.kind.text().map(|t| t.features.get(tag).copied())).flatten();
-                let on = state.map(|s| s.unwrap_or(default_on));
-                let supported = face.as_ref().is_none_or(|f| f.has_feature(tag.as_bytes().try_into().unwrap_or(b"    ")));
-                if feature_row(ui, tag, tr(label), on, supported) {
-                    let want = !on.unwrap_or(false);
-                    // Back to the font's default clears the override.
-                    let v = if want == default_on { Value::Null } else { json!(want) };
-                    app.run("text.setFeatures", json!({"ids": ids, "features": {tag: v}}));
-                }
-            }
-        });
-    }
-}
-
-/// A Type settings row: a label, then `add` with the rest of the width.
-fn field_row<R>(ui: &mut Ui, label: &str, add: impl FnOnce(&mut Ui, f32) -> R) -> R {
-    let t = Tokens::get(ui.ctx());
-    let w = ui.available_width();
-    ui.horizontal(|ui| {
-        ui.add_sized(vec2(110.0, FIELD_H), egui::Label::new(egui::RichText::new(label).font(regular(11.0)).color(t.text)));
-        add(ui, w - 118.0)
-    })
-    .inner
-}
-
-/// How the decoration looks: style, thickness, (underlines) offset and skip ink, and colour.
-fn decoration_details(app: &mut FigApp, ui: &mut Ui, styles: &[TextStyle], apply_style: &dyn Fn(&mut FigApp, &str, Value), underline: bool, w: f32) {
-    caption(ui, tr("Decoration style"));
-    let active = uniform(styles, |s| s.look().style as usize);
-    let items = [(tr("Solid"), tr_noop("Solid")), (tr("Dotted"), tr_noop("Dotted")), (tr("Wavy"), tr_noop("Wavy"))];
-    if let Some(i) = text_seg(ui, "deco_style", &items, active, w) {
-        apply_style(app, "textDecorationStyle", json!((["solid", "dotted", "wavy"].get(i).copied().unwrap_or("solid"))));
-    }
-    ui.add_space(4.0);
-    let mut lengths = vec![("textDecorationThickness", tr("Thickness"), uniform(styles, |s| s.look().thickness))];
-    if underline {
-        lengths.push(("textDecorationOffset", tr("Offset"), uniform(styles, |s| s.look().offset)));
-    }
-    for (key, label, value) in lengths {
-        field_row(ui, label, |ui, fw| {
-            let (shown, empty) = match value {
-                Some(DecorationLength::Pixels(v)) => (Some(v), String::new()),
-                Some(DecorationLength::Percent(p)) => (None, format!("{}%", trim_num(p))),
-                Some(DecorationLength::Auto) => (None, tr("Auto").to_string()),
-                None => (None, tr(MIXED).to_string()),
-            };
-            let auto = value == Some(DecorationLength::Auto);
-            let field_w = if auto { fw } else { fw - 36.0 };
-            if let Some(FieldEdit::Set(v) | FieldEdit::Scrub(v, true)) =
-                widgets::number_field_or(ui, Id::new(("ty_deco", key)), shown, &empty, field_w, 0.5)
-            {
-                // A thickness of 0 or less goes back to the font's.
-                let v = if key == "textDecorationThickness" && v <= 0.0 { json!("auto") } else { json!(v.clamp(-1000.0, 1000.0)) };
-                apply_style(app, key, v);
-            }
-            let tip = tr("Back to the font's value");
-            if !auto
-                && ui
-                    .add(
-                        egui::Label::new(egui::RichText::new(tr("Auto")).font(regular(11.0)).color(Tokens::get(ui.ctx()).accent))
-                            .sense(Sense::click()),
-                    )
-                    .on_hover_text(tip)
-                    .clicked()
-            {
-                apply_style(app, key, json!("auto"));
-            }
-        });
-    }
-    if underline {
-        let skip = uniform(styles, |s| s.look().skip_ink);
-        if widgets::checkbox(ui, skip == Some(true), tr("Skip ink")) {
-            apply_style(app, "textDecorationSkipInk", json!(skip != Some(true)));
-        }
-    }
-    let color = uniform(styles, |s| s.look().color.map(|c| format!("#{}", c.to_hex())));
-    field_row(ui, tr("Colour"), |ui, fw| {
-        let (value, hint) = match &color {
-            Some(c) => (c.clone().unwrap_or_default(), tr("Auto")),
-            None => (String::new(), tr(MIXED)),
-        };
-        if let Some(s) = widgets::text_field(ui, Id::new("ty_deco_color"), &value, fw, hint) {
-            let s = s.trim();
-            if s.is_empty() || s.eq_ignore_ascii_case("auto") {
-                apply_style(app, "textDecorationColor", json!("auto"));
-            } else if let Some(c) = figcraft_color::Color::parse_css(s).or_else(|| figcraft_color::Color::from_hex(s)) {
-                apply_style(app, "textDecorationColor", json!(format!("#{}", c.to_hex())));
-            } else {
-                app.toast(trf("{value} isn't a colour", &[("value", &s)]));
-            }
-        }
-    });
-}
-
-/// Type settings ▸ Variable: the font's named instances, then a slider and a field per visible
-/// axis (values the style name implies show until changed; "Mixed" when the shown styles differ).
-/// The canvas previews a hovered instance and a dragged slider or field live; letting go commits
-/// one undo step, Escape cancels.
-fn variable_axes(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], styles: &[TextStyle], face: &figcraft_text::Face) {
-    let t = Tokens::get(ui.ctx());
-    let range = figcraft_engine::textedit::selected_range(&app.session);
-    widgets::label(ui, &face.family, t.text_secondary);
-    named_instances(app, ui, ids, range, styles, face);
-    // Each style's axis values; a style drawn by another face (e.g. a separate italic file) is mixed.
-    let per_style: Vec<Option<Vec<f64>>> = styles
-        .iter()
-        .map(|s| figcraft_text::find_face(&s.font_family, &s.font_style).filter(|f| f.id == face.id).map(|_| face.axis_values(s)))
-        .collect();
-    let w = ui.available_width();
-    let field_w = 52.0;
-    let label_w = 84.0;
-    let slider_w = (w - label_w - field_w - 12.0).max(40.0);
-    let cancel_id = Id::new("ty_axis_cancelled");
-    // A cancelled gesture ends when the pointer is let go.
-    if !ui.input(|i| i.pointer.any_down()) {
-        ui.data_mut(|d| d.remove::<bool>(cancel_id));
-    }
-    for (i, axis) in face.axes.iter().enumerate().filter(|(_, a)| !a.hidden) {
-        let first = per_style.first().cloned().flatten().and_then(|v| v.get(i).copied());
-        let value = first.filter(|v0| per_style.iter().all(|vs| vs.as_ref().and_then(|v| v.get(i)).is_some_and(|v| (v - v0).abs() < 1e-9)));
-        // While a drag previews, the controls show the dragged value (the panel shows the document).
-        let live_id = Id::new(("ty_axis_live", &axis.tag));
-        if app.ui.text_preview.is_none() {
-            ui.data_mut(|d| d.remove::<f64>(live_id));
-        }
-        let shown = ui.data(|d| d.get_temp::<f64>(live_id)).or(value).map(|v| round_axis(axis, v));
-        // (value, gesture ended)
-        let mut set: Option<(Value, bool)> = None;
-        ui.add_space(2.0);
-        ui.horizontal(|ui| {
-            ui.spacing_mut().item_spacing.x = 6.0;
-            let (lr, _) = ui.allocate_exact_size(vec2(label_w, FIELD_H), Sense::hover());
-            let name = ui.painter().layout(axis.name.clone(), regular(11.0), t.text, label_w);
-            let tip = trf(
-                "{name} ({tag}): {min} – {max}, default {default}. Double-click the slider to go back to the style's value; Escape while dragging cancels.",
-                &[
-                    ("name", &axis.name),
-                    ("tag", &axis.tag),
-                    ("min", &trim_num(axis.min)),
-                    ("max", &trim_num(axis.max)),
-                    ("default", &trim_num(axis.default)),
-                ],
-            );
-            ui.interact(lr, Id::new(("ty_axis_label", &axis.tag)), Sense::hover()).on_hover_text(tip);
-            ui.painter().galley(pos2(lr.min.x, lr.center().y - name.size().y / 2.0), name, t.text);
-            match axis_slider(ui, Id::new(("ty_axis_slider", &axis.tag)), axis, shown, slider_w) {
-                Some((Some(v), done)) => set = Some((json!(round_axis(axis, v)), done)),
-                Some((None, _)) => set = Some((Value::Null, true)),
-                None => {}
-            }
-            let step = if axis.max - axis.min > 20.0 { 1.0 } else { 0.1 };
-            match widgets::number_field(ui, Id::new(("ty_axis_field", &axis.tag)), Lead::None, shown, "", field_w, step) {
-                Some(FieldEdit::Set(v)) => set = Some((json!(axis.clamp(round_axis(axis, v))), true)),
-                Some(FieldEdit::Scrub(v, done)) => set = Some((json!(axis.clamp(round_axis(axis, v))), done)),
-                None => {}
-            }
-        });
-        let Some((v, done)) = set else { continue };
-        // Escape cancels a previewing gesture (egui may end the drag on it too): the preview ends
-        // and the rest of the gesture is ignored until the pointer is let go.
-        let previewing = ui.data(|d| d.get_temp::<f64>(live_id)).is_some();
-        if previewing && ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape)) {
-            ui.data_mut(|d| {
-                d.insert_temp(cancel_id, true);
-                d.remove::<f64>(live_id);
-            });
-            app.end_text_preview(ui.ctx());
-            continue;
-        }
-        if ui.data(|d| d.get_temp::<bool>(cancel_id)).unwrap_or(false) {
-            continue;
-        }
-        let params = json!({"ids": ids, "variations": {axis.tag.clone(): v}});
-        if done {
-            ui.data_mut(|d| d.remove::<f64>(live_id));
-            app.run("text.setVariations", params);
-        } else {
-            if let Some(x) = v.as_f64() {
-                ui.data_mut(|d| d.insert_temp(live_id, x));
-            }
-            app.preview_text(ui.ctx(), "text.setVariations", params);
-        }
-    }
-    if styles.iter().any(|s| !s.variations.is_empty()) {
-        ui.add_space(8.0);
-        let r = ui.add(egui::Label::new(egui::RichText::new(tr("Reset to style")).font(regular(11.0)).color(t.accent)).sense(Sense::click()));
-        if r.on_hover_text(tr("Back to the values the font style implies")).clicked() {
-            app.run("text.setVariations", json!({"ids": ids, "variations": {}, "replace": true}));
-        }
-    }
-}
-
-/// The variable font's named instances as a menu: the one the text shows ("Custom" once an axis
-/// moved), hovering one previews it on the canvas, clicking applies it (its custom axis values go).
-fn named_instances(
-    app: &mut FigApp,
-    ui: &mut Ui,
-    ids: &[NodeId],
-    range: Option<(NodeId, usize, usize)>,
-    styles: &[TextStyle],
-    face: &figcraft_text::Face,
-) {
-    if face.instances.is_empty() {
-        return;
-    }
-    let current = uniform(styles, |s| (s.variations.is_empty(), s.font_style.clone()));
-    let label = match &current {
-        Some((true, st)) if face.instance(st).is_some() => st.clone(),
-        Some(_) => tr("Custom").to_string(),
-        None => tr(MIXED).to_string(),
-    };
-    ui.add_space(4.0);
-    // An inline list (a menu would close the Type settings popover it opens from).
-    let open_id = Id::new("ty_instances_open");
-    let mut open = ui.data(|d| d.get_temp::<bool>(open_id)).unwrap_or(false);
-    if widgets::dropdown(ui, &label, ui.available_width(), None).on_hover_text(tr("Named instance")).clicked() {
-        open = !open;
-    }
-    if open {
-        ui.add_space(2.0);
-        egui::ScrollArea::vertical().id_salt("ty_instances").max_height(220.0).show(ui, |ui| {
-            for inst in &face.instances {
-                let mark = if label == inst.name { "✓ " } else { "   " };
-                let (clicked, hovered) = menu_item_hover(ui, &format!("{mark}{}", inst.name));
-                let props = json!({"fontStyle": inst.name, "fontVariations": null});
-                if clicked {
-                    commit_text(app, ids, range, props);
-                    open = false;
-                } else if hovered {
-                    app.preview_text(ui.ctx(), "text.style", text_style_params(ids, range, props));
-                }
-            }
-        });
-    }
-    ui.data_mut(|d| d.insert_temp(open_id, open));
-    ui.add_space(2.0);
-}
-
-/// Axis values snap to whole numbers on wide axes (weight, width…) and tenths on narrow ones.
-fn round_axis(axis: &figcraft_text::Axis, v: f64) -> f64 {
-    if axis.max - axis.min > 20.0 { v.round() } else { (v * 10.0).round() / 10.0 }
-}
-
-/// A horizontal slider over an axis's range with a tick at its default. `value` None = mixed.
-/// Returns the new value (None = double-click: back to the style's value) and whether the
-/// gesture ended.
-fn axis_slider(ui: &mut Ui, id: Id, axis: &figcraft_text::Axis, value: Option<f64>, width: f32) -> Option<(Option<f64>, bool)> {
-    let t = Tokens::get(ui.ctx());
-    let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
-    let resp = ui.interact(rect, id, Sense::click_and_drag());
-    let track = Rect::from_center_size(rect.center(), vec2(width - 12.0, 4.0));
-    let span = (axis.max - axis.min).max(1e-9);
-    let x_of = |v: f64| track.min.x + ((v - axis.min) / span).clamp(0.0, 1.0) as f32 * track.width();
-    let p = ui.painter();
-    p.rect_filled(track, CornerRadius::same(2), t.border);
-    let dx = x_of(axis.default);
-    p.line_segment([pos2(dx, track.min.y - 3.0), pos2(dx, track.max.y + 3.0)], Stroke::new(1.0, t.border_strong));
-    if let Some(v) = value {
-        let x = x_of(v);
-        p.rect_filled(Rect::from_min_max(track.min, pos2(x, track.max.y)), CornerRadius::same(2), t.accent);
-        p.circle_filled(pos2(x, track.center().y), 6.0, Color32::WHITE);
-        let ring = if resp.hovered() || resp.dragged() { t.accent } else { t.border_strong };
-        p.circle_stroke(pos2(x, track.center().y), 6.0, Stroke::new(1.0, ring));
-    }
-    if resp.double_clicked() {
-        return Some((None, true));
-    }
-    if (resp.dragged() || resp.clicked() || resp.drag_started())
-        && let Some(pos) = resp.interact_pointer_pos()
-    {
-        let f = f64::from(((pos.x - track.min.x) / track.width().max(1.0)).clamp(0.0, 1.0));
-        return Some((Some(axis.min + f * span), resp.drag_stopped() || resp.clicked()));
-    }
-    if resp.drag_stopped() {
-        return value.map(|v| (Some(v), true));
-    }
-    None
-}
-
-fn caption(ui: &mut Ui, s: &str) {
-    let t = Tokens::get(ui.ctx());
-    ui.add_space(6.0);
-    ui.label(egui::RichText::new(s).font(regular(10.5)).color(t.text_secondary));
-}
-
-/// A segmented control with short text labels (decoration, case, list…); `tip`s are English keys
-/// (matched below), translated where shown. Returns the clicked index.
-fn text_seg(ui: &mut Ui, salt: &str, items: &[(&str, &str)], active: Option<usize>, width: f32) -> Option<usize> {
-    let t = Tokens::get(ui.ctx());
-    let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
-    ui.painter().rect_filled(rect, CornerRadius::same(5), t.field);
-    let cell = width / items.len().max(1) as f32;
-    let mut out = None;
-    for (i, (label, tip)) in items.iter().enumerate() {
-        let r = Rect::from_min_size(pos2(rect.min.x + i as f32 * cell, rect.min.y), vec2(cell, FIELD_H));
-        let resp = ui.interact(r, Id::new(("ty_seg", salt, i)), Sense::click()).on_hover_text(tr(tip));
-        crate::a11y::toggle(&resp, tr(tip), active == Some(i));
-        if active == Some(i) {
-            ui.painter().rect_filled(r.shrink(2.0), CornerRadius::same(4), t.panel);
-            ui.painter().rect_stroke(r.shrink(2.0), CornerRadius::same(4), Stroke::new(1.0, t.border), StrokeKind::Inside);
-        } else if resp.hovered() {
-            ui.painter().rect_filled(r.shrink(2.0), CornerRadius::same(4), t.hover);
-        }
-        let col = if active == Some(i) { t.text } else { t.text_secondary };
-        let galley = if *tip == "Small caps" {
-            small_caps_sample(ui, label, col)
-        } else {
-            ui.painter().layout_no_wrap((*label).to_string(), regular(11.5), col)
-        };
-        let gr = Rect::from_center_size(r.center(), galley.size());
-        let size = galley.size();
-        ui.painter().galley(gr.min, galley, col);
-        // Draw the decoration on its own sample letter.
-        match *tip {
-            "Underline" => {
-                let y = gr.max.y - 1.5;
-                ui.painter().line_segment([pos2(gr.min.x, y), pos2(gr.min.x + size.x, y)], Stroke::new(1.0, col));
-            }
-            "Strikethrough" => {
-                let y = gr.center().y + 0.5;
-                ui.painter().line_segment([pos2(gr.min.x - 1.0, y), pos2(gr.min.x + size.x + 1.0, y)], Stroke::new(1.0, col));
-            }
-            _ => {}
-        }
-        if resp.clicked() {
-            out = Some(i);
-        }
-    }
-    out
-}
-
-/// The Small caps sample: a capital, then its other letters as smaller capitals. Drawn from
-/// ordinary capitals because the small-capital letters (`ɢ`, U+0262) are missing from many UI
-/// fonts, egui's defaults among them, where they showed as a box.
-fn small_caps_sample(ui: &Ui, label: &str, col: Color32) -> Arc<egui::Galley> {
-    let mut job = egui::text::LayoutJob::default();
-    let mut chars = label.chars();
-    let first: String = chars.next().into_iter().collect();
-    let rest: String = chars.map(small_capital_to_capital).collect::<String>().to_uppercase();
-    job.append(&first, 0.0, egui::TextFormat { font_id: regular(11.5), color: col, valign: egui::Align::BOTTOM, ..Default::default() });
-    job.append(&rest, 0.0, egui::TextFormat { font_id: regular(8.5), color: col, valign: egui::Align::BOTTOM, ..Default::default() });
-    ui.painter().layout_job(job)
-}
-
-/// The capital a small-capital letter stands for (the ones a sample uses), else the letter.
-fn small_capital_to_capital(c: char) -> char {
-    match c {
-        'ɢ' => 'G',
-        'ʜ' => 'H',
-        'ɪ' => 'I',
-        'ʟ' => 'L',
-        'ɴ' => 'N',
-        'ʀ' => 'R',
-        'ʏ' => 'Y',
-        c => c,
-    }
-}
-
-/// One OpenType feature toggle; `on` None = mixed. Returns true when clicked.
-fn feature_row(ui: &mut Ui, tag: &str, label: &str, on: Option<bool>, supported: bool) -> bool {
-    let t = Tokens::get(ui.ctx());
-    let w = ui.available_width();
-    let (rect, resp) = ui.allocate_exact_size(vec2(w, 24.0), Sense::click());
-    let resp = if supported { resp } else { resp.on_hover_text(tr("Not in this font")) };
-    if resp.hovered() {
-        ui.painter().rect_filled(rect, CornerRadius::same(4), t.hover);
-    }
-    let b = Rect::from_min_size(pos2(rect.min.x + 4.0, rect.center().y - 7.0), vec2(14.0, 14.0));
-    match on {
-        Some(true) => {
-            ui.painter().rect_filled(b, CornerRadius::same(3), t.accent);
-            icons::paint(ui.painter(), b.shrink(1.5), Icon::Check, Color32::WHITE);
-        }
-        Some(false) => {
-            ui.painter().rect_stroke(b, CornerRadius::same(3), Stroke::new(1.0, t.border_strong), StrokeKind::Inside);
-        }
-        None => {
-            ui.painter().rect_filled(b, CornerRadius::same(3), t.accent);
-            ui.painter().line_segment([pos2(b.min.x + 3.5, b.center().y), pos2(b.max.x - 3.5, b.center().y)], Stroke::new(1.5, Color32::WHITE));
-        }
-    }
-    let col = if supported { t.text } else { t.text_tertiary };
-    ui.painter().text(pos2(b.max.x + 8.0, rect.center().y), Align2::LEFT_CENTER, label, regular(11.0), col);
-    ui.painter().text(pos2(rect.max.x - 6.0, rect.center().y), Align2::RIGHT_CENTER, tag, regular(10.0), t.text_tertiary);
-    resp.clicked()
-}
-
-#[derive(Clone, Copy)]
-enum LeadGlyph {
-    LineHeight,
-    LetterSpacing,
-    ParagraphSpacing,
-}
-
-/// Paint a small original glyph for a typography field's lead.
-fn paint_lead(p: &egui::Painter, r: Rect, g: LeadGlyph, col: Color32) {
-    let c = r.center();
-    let s = Stroke::new(1.0, col);
-    match g {
-        LeadGlyph::LineHeight => {
-            p.line_segment([pos2(c.x - 5.0, c.y - 6.0), pos2(c.x + 5.0, c.y - 6.0)], s);
-            p.line_segment([pos2(c.x - 5.0, c.y + 6.0), pos2(c.x + 5.0, c.y + 6.0)], s);
-            p.text(c, Align2::CENTER_CENTER, "A", regular(9.5), col);
-        }
-        LeadGlyph::LetterSpacing => {
-            p.line_segment([pos2(c.x - 6.0, c.y - 5.0), pos2(c.x - 6.0, c.y + 5.0)], s);
-            p.line_segment([pos2(c.x + 6.0, c.y - 5.0), pos2(c.x + 6.0, c.y + 5.0)], s);
-            p.text(c, Align2::CENTER_CENTER, "A", regular(9.5), col);
-        }
-        LeadGlyph::ParagraphSpacing => {
-            for dy in [-5.0, -2.5, 2.5, 5.0] {
-                p.line_segment([pos2(c.x - 5.0, c.y + dy), pos2(c.x + 5.0, c.y + dy)], s);
-            }
-        }
-    }
-}
-
-/// Line height, letter spacing or paragraph spacing: property, field id, glyph and tooltip.
-struct SpacingField {
-    field: &'static str,
-    id: Id,
-    glyph: LeadGlyph,
-    tip: &'static str,
-}
-
-enum SpacingEdit {
-    Typed(String),
-    Scrub(f64, bool),
-}
-
-impl SpacingEdit {
-    fn text(&self) -> String {
-        match self {
-            Self::Typed(text) => text.clone(),
-            Self::Scrub(value, _) => trim_num(*value),
-        }
-    }
-}
-
-/// Keep typed unit parsing and character-range targeting; only a scrub outside a text-editing
-/// session needs its own interaction. The editing session already owns its undo step.
-fn commit_spacing(app: &mut FigApp, ids: &[NodeId], range: Option<(NodeId, usize, usize)>, field: &SpacingField, edit: &SpacingEdit, value: Value) {
-    let props = json!({field.field: value});
-    match edit {
-        SpacingEdit::Scrub(_, done) if figcraft_engine::textedit::selected_range(&app.session).is_none() => {
-            live(app, field.tip, "node.set", json!({"ids": ids, "props": props}), *done);
-        }
-        _ => commit_text(app, ids, range, props),
-    }
-}
-
-/// The original text editor plus the same leading-icon scrub gesture as ordinary number fields.
-/// Auto and Mixed have no numeric starting value and remain unchanged by dragging.
-fn spacing_input(ui: &mut Ui, field: &SpacingField, value: &str, width: f32) -> Option<SpacingEdit> {
-    let rect = Rect::from_min_size(ui.cursor().min, vec2(24.0, FIELD_H));
-    let typed = lead_field(ui, field.id, field.glyph, value, width, field.tip);
-    if ui.data(|d| d.get_temp::<String>(field.id.with("editing")).is_some()) {
-        return typed.map(SpacingEdit::Typed);
-    }
-    let response = ui.interact(rect, field.id.with("lead"), Sense::drag());
-    if response.hovered() || response.dragged() {
-        ui.ctx().set_cursor_icon(egui::CursorIcon::ResizeHorizontal);
-    }
-    let numeric = value.trim_end_matches('%').parse::<f64>().ok();
-    match widgets::scrub(ui, field.id, &response, numeric, 1.0) {
-        Some(FieldEdit::Scrub(v, done)) => Some(SpacingEdit::Scrub(v, done)),
-        _ => typed.map(SpacingEdit::Typed),
-    }
-}
-
-/// A spacing field that whole layers can bind to a number variable (in pixels): the variable's
-/// chip when bound, else the editable field with a variable button on hover. While a text range is
-/// selected it only takes values. Returns a typed commit or a live scrub.
-fn spacing_field(app: &mut FigApp, ui: &mut Ui, ids: &[NodeId], f: &SpacingField, value: &str, width: f32, range: bool) -> Option<SpacingEdit> {
-    let rect = Rect::from_min_size(ui.cursor().min, vec2(width, FIELD_H));
-    if !range && crate::variable_ui::bound_chip(app, ui, ids, f.field, VariableType::Number, rect) {
-        ui.allocate_rect(rect, Sense::hover());
-        return None;
-    }
-    let out = spacing_input(ui, f, value, width);
-    if !range && ui.data(|d| d.get_temp::<String>(f.id.with("editing")).is_none()) {
-        crate::variable_ui::bind_button(ui, rect, ids, f.field, VariableType::Number);
-    }
-    out
-}
-
-fn lead_field(ui: &mut Ui, id: Id, glyph: LeadGlyph, value: &str, width: f32, tip: &str) -> Option<String> {
-    let t = Tokens::get(ui.ctx());
-    let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
-    let lead = Rect::from_min_size(rect.min, vec2(24.0, FIELD_H));
-    let text_rect = Rect::from_min_max(pos2(lead.max.x, rect.min.y), rect.max);
-    let editing_id = id.with("editing");
-    let mut editing: Option<String> = ui.data(|d| d.get_temp(editing_id));
-    let resp = ui.interact(rect, id.with("click"), Sense::click()).on_hover_text(tip);
-    crate::a11y::text(&resp, tip, value);
-    ui.painter().rect_filled(rect, CornerRadius::same(5), t.field);
-    if editing.is_some() {
-        ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, t.accent), StrokeKind::Inside);
-    } else if resp.hovered() {
-        ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, t.field_hover_border), StrokeKind::Inside);
-    }
-    paint_lead(ui.painter(), lead, glyph, t.icon_secondary);
-    let started = editing.is_none() && resp.clicked();
-    if started {
-        editing = Some(if value == tr(MIXED) { String::new() } else { value.to_string() });
-        ui.memory_mut(|m| m.request_focus(id.with("te")));
-    }
-    let mut out = None;
-    match editing {
-        Some(mut text) => {
-            let mut child = ui.new_child(egui::UiBuilder::new().max_rect(text_rect.shrink2(vec2(2.0, 4.0))));
-            let r = child.add(
-                egui::TextEdit::singleline(&mut text)
-                    .id(id.with("te"))
-                    .frame(egui::Frame::NONE)
-                    .font(regular(11.0))
-                    .desired_width(text_rect.width() - 6.0),
-            );
-            crate::a11y::own_focus(&r);
-            crate::widgets::select_all_on_focus(ui, &r, &text);
-            // The Enter that started the edit (from the keyboard) doesn't end it.
-            let enter = !started && ui.input(|i| i.key_pressed(egui::Key::Enter));
-            let esc = ui.input(|i| i.key_pressed(egui::Key::Escape));
-            if esc {
-                ui.data_mut(|d| d.remove::<String>(editing_id));
-            } else if r.lost_focus() || enter {
-                out = Some(text);
-                ui.data_mut(|d| d.remove::<String>(editing_id));
-            } else {
-                ui.data_mut(|d| d.insert_temp(editing_id, text));
-            }
-        }
-        None => {
-            let col = if value == tr(MIXED) { t.text_tertiary } else { t.text };
-            ui.painter().text(pos2(text_rect.min.x + 2.0, rect.center().y), Align2::LEFT_CENTER, value, regular(11.0), col);
-        }
-    }
-    out
-}
-
-/// "Auto", "24", "150%" → the `lineHeight` value. A bare number keeps the current unit when it is
-/// a percentage, else means pixels. Empty text means Auto, except on a Mixed field (`cur` is
-/// `None`), where nothing typed is an untouched field and commits nothing.
-pub(crate) fn parse_line_height(s: &str, cur: Option<LineHeight>) -> Option<Value> {
-    let s = s.trim();
-    if s.is_empty() && cur.is_none() {
-        return None;
-    }
-    if s.is_empty() || s.eq_ignore_ascii_case("auto") {
-        return Some(json!("auto"));
-    }
-    if let Some(p) = s.strip_suffix('%') {
-        let cur_pct = match cur {
-            Some(LineHeight::Percent(p)) => Some(p),
-            _ => None,
-        };
-        return widgets::eval(p.trim(), cur_pct).filter(|v| v.is_finite()).map(|v| json!(format!("{}%", trim_num(v.max(0.0)))));
-    }
-    if let Some(px) = s.strip_suffix("px") {
-        return widgets::eval(px.trim(), None).filter(|v| v.is_finite()).map(|v| json!(v.max(0.0)));
-    }
-    match cur {
-        Some(LineHeight::Percent(p)) => widgets::eval(s, Some(p)).filter(|v| v.is_finite()).map(|v| json!(format!("{}%", trim_num(v.max(0.0))))),
-        Some(LineHeight::Pixels(px)) => widgets::eval(s, Some(px)).filter(|v| v.is_finite()).map(|v| json!(v.max(0.0))),
-        _ => widgets::eval(s, None).filter(|v| v.is_finite()).map(|v| json!(v.max(0.0))),
-    }
-}
-
-/// "2%", "1.5px", "-0.5" → the `letterSpacing` value. A bare number keeps the current unit
-/// (percent by default).
-pub(crate) fn parse_letter_spacing(s: &str, cur: Option<LetterSpacing>) -> Option<Value> {
-    let s = s.trim();
-    if let Some(p) = s.strip_suffix('%') {
-        return widgets::eval(p.trim(), None).filter(|v| v.is_finite()).map(|v| json!(format!("{}%", trim_num(v))));
-    }
-    if let Some(p) = s.strip_suffix("px") {
-        return widgets::eval(p.trim(), None).filter(|v| v.is_finite()).map(|v| json!(v));
-    }
-    match cur {
-        Some(LetterSpacing::Pixels(px)) => widgets::eval(s, Some(px)).filter(|v| v.is_finite()).map(|v| json!(v)),
-        Some(LetterSpacing::Percent(p)) => widgets::eval(s, Some(p)).filter(|v| v.is_finite()).map(|v| json!(format!("{}%", trim_num(v)))),
-        None => widgets::eval(s, None).filter(|v| v.is_finite()).map(|v| json!(format!("{}%", trim_num(v)))),
-    }
-}
-
-/// A [`parse_line_height`] value as a [`LineHeight`]: "auto", "150%" or a number of pixels.
-pub(crate) fn line_height_of(v: &Value) -> Option<LineHeight> {
-    match v {
-        Value::String(s) if s.eq_ignore_ascii_case("auto") => Some(LineHeight::Auto),
-        Value::String(s) => s.strip_suffix('%')?.trim().parse().ok().filter(|p: &f64| p.is_finite()).map(LineHeight::Percent),
-        other => other.as_f64().filter(|v| v.is_finite()).map(LineHeight::Pixels),
-    }
-}
-
-/// A [`parse_letter_spacing`] value as a [`LetterSpacing`]: "2%" or a number of pixels.
-pub(crate) fn letter_spacing_of(v: &Value) -> Option<LetterSpacing> {
-    match v {
-        Value::String(s) => s.strip_suffix('%')?.trim().parse().ok().filter(|p: &f64| p.is_finite()).map(LetterSpacing::Percent),
-        other => other.as_f64().filter(|v| v.is_finite()).map(LetterSpacing::Pixels),
-    }
-}
-
-// ---- Font picker ----
-
-const RECENT_KEY: &str = "figcraft_recent_fonts";
-const ROW: f32 = 26.0;
-/// The font list's tallest (it scrolls past that).
-const LIST_HEIGHT: f32 = 380.0;
-
-fn recent_families(ctx: &egui::Context) -> Vec<String> {
-    ctx.data_mut(|d| d.get_persisted::<Vec<String>>(Id::new(RECENT_KEY))).unwrap_or_default()
-}
-
-fn remember_family(ctx: &egui::Context, family: &str) {
-    ctx.data_mut(|d| {
-        let v = d.get_persisted_mut_or_default::<Vec<String>>(Id::new(RECENT_KEY));
-        v.retain(|f| !f.eq_ignore_ascii_case(family));
-        v.insert(0, family.to_string());
-        v.truncate(8);
-    });
-}
-
-enum PickRow {
-    Header(&'static str),
-    Family(String),
-}
-
-/// What the family list did this frame.
-#[derive(Default)]
-pub(crate) struct FontPick {
-    /// The family clicked, or the one Enter picked.
-    pub picked: Option<String>,
-    /// The family Up and Down are on (Enter picks it).
-    pub highlighted: Option<String>,
-}
-
-/// The searchable family list: click a family, or step through it with Up and Down and press Enter.
-pub(crate) fn font_picker(ui: &mut Ui, current: Option<&str>, just_opened: bool) -> FontPick {
-    let t = Tokens::get(ui.ctx());
-    let q_id = Id::new("font_query");
-    // The row Up and Down are on, and the search it is a row of.
-    let hi_id = Id::new("font_highlight");
-    let mut q: String = ui.data(|d| d.get_temp(q_id)).unwrap_or_default();
-    if just_opened {
-        q.clear();
-        ui.data_mut(|d| d.remove::<(String, usize)>(hi_id));
-    }
-    // Taken before the search field sees them (it would move its cursor).
-    let step = ui.input_mut(|i| {
-        i.count_and_consume_key(egui::Modifiers::NONE, egui::Key::ArrowDown) as i64
-            - i.count_and_consume_key(egui::Modifiers::NONE, egui::Key::ArrowUp) as i64
-    });
-    let search = ui.add(egui::TextEdit::singleline(&mut q).hint_text(tr("Search fonts")).desired_width(ui.available_width()).font(regular(11.5)));
-    crate::widgets::select_all_on_focus(ui, &search, &q);
-    if just_opened {
-        search.request_focus();
-    }
-    ui.data_mut(|d| d.insert_temp(q_id, q.clone()));
-    let ql = q.trim().to_lowercase();
-    let all = figcraft_text::family_names();
-    let matches: Vec<String> = all.iter().filter(|f| ql.is_empty() || f.to_lowercase().contains(&ql)).cloned().collect();
-    let mut rows: Vec<PickRow> = Vec::new();
-    if ql.is_empty() {
-        let recent: Vec<String> = recent_families(ui.ctx()).into_iter().filter(|f| all.iter().any(|a| a.eq_ignore_ascii_case(f))).collect();
-        if !recent.is_empty() {
-            rows.push(PickRow::Header(tr("Recent")));
-            rows.extend(recent.into_iter().map(PickRow::Family));
-            rows.push(PickRow::Header(tr("All fonts")));
-        }
-    }
-    if matches.is_empty() {
-        widgets::label(ui, tr("No fonts match"), t.text_tertiary);
-        return FontPick::default();
-    }
-    rows.extend(matches.into_iter().map(PickRow::Family));
-    let family = |i: usize| match rows.get(i) {
-        Some(PickRow::Family(f)) => Some(f.clone()),
-        _ => None,
-    };
-    // A new search starts again; the first step starts from the current family.
-    let mut hi = ui.data(|d| d.get_temp::<(String, usize)>(hi_id)).filter(|(hq, _)| *hq == q).map(|(_, i)| i);
-    let stride = ROW + ui.spacing().item_spacing.y;
-    let mut offset = None;
-    if step != 0 {
-        let next = |i: usize| if step > 0 { i.checked_add(1) } else { i.checked_sub(1) };
-        let mut from =
-            hi.or_else(|| rows.iter().rposition(|r| matches!(r, PickRow::Family(f) if current.is_some_and(|c| c.eq_ignore_ascii_case(f)))));
-        for _ in 0..step.unsigned_abs() {
-            let mut at = match from {
-                Some(i) => next(i),
-                None if step > 0 => Some(0),
-                None => rows.len().checked_sub(1),
-            };
-            // Past the headers; at either end it stays where it was.
-            while let Some(i) = at.filter(|i| *i < rows.len() && family(*i).is_none()) {
-                at = next(i);
-            }
-            if let Some(i) = at.filter(|i| family(*i).is_some()) {
-                from = Some(i);
-                hi = Some(i);
-            }
-        }
-        if let Some(i) = hi {
-            // Scrolled just enough to show it (the list is shorter than its tallest where the
-            // window has less room).
-            let (seen, height): (f32, f32) = ui.data(|d| d.get_temp(hi_id.with("view"))).unwrap_or((0.0, LIST_HEIGHT));
-            let top = i as f32 * stride;
-            offset = Some(seen.max(top + stride - height).min(top));
-        }
-    }
-    match hi {
-        Some(i) => ui.data_mut(|d| {
-            d.insert_temp(hi_id, (q.clone(), i));
-        }),
-        None => ui.data_mut(|d| d.remove::<(String, usize)>(hi_id)),
-    }
-    if search.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter)) {
-        let first = rows.iter().find_map(|r| match r {
-            PickRow::Family(f) => Some(f.clone()),
-            PickRow::Header(_) => None,
-        });
-        return FontPick { picked: hi.and_then(family).or(first), highlighted: None };
-    }
-    let mut budget = 4;
-    let mut picked = None;
-    let mut area = egui::ScrollArea::vertical().max_height(LIST_HEIGHT).auto_shrink([false, true]);
-    if let Some(y) = offset {
-        area = area.vertical_scroll_offset(y);
-    }
-    let shown = area.show_rows(ui, ROW, rows.len(), |ui, range| {
-        for (i, r) in rows.iter().enumerate().skip(range.start).take(range.len()) {
-            let w = ui.available_width();
-            let (rect, resp) = ui.allocate_exact_size(vec2(w, ROW), if matches!(r, PickRow::Family(_)) { Sense::click() } else { Sense::hover() });
-            match r {
-                PickRow::Header(h) => {
-                    ui.painter().text(pos2(rect.min.x + 8.0, rect.center().y), Align2::LEFT_CENTER, *h, semibold(10.5), t.text_secondary);
-                }
-                PickRow::Family(f) => {
-                    let hovered = resp.hovered() || hi == Some(i);
-                    if hovered {
-                        ui.painter().rect_filled(rect, CornerRadius::same(5), t.accent);
-                    }
-                    let col = if hovered { Color32::WHITE } else { t.text };
-                    if current.is_some_and(|c| c.eq_ignore_ascii_case(f)) {
-                        icons::paint(
-                            ui.painter(),
-                            Rect::from_center_size(pos2(rect.min.x + 10.0, rect.center().y), vec2(12.0, 12.0)),
-                            Icon::Check,
-                            col,
-                        );
-                    }
-                    let text_min = pos2(rect.min.x + 22.0, rect.min.y);
-                    match crate::font_preview::family(ui.ctx(), f, 13.0, &mut budget) {
-                        Some(tex) => {
-                            crate::font_preview::paint(
-                                ui.painter(),
-                                &tex,
-                                pos2(text_min.x, rect.center().y),
-                                rect.max.x - text_min.x - 6.0,
-                                ROW,
-                                col,
-                            );
-                        }
-                        None => {
-                            ui.painter().text(pos2(text_min.x, rect.center().y), Align2::LEFT_CENTER, f, regular(12.0), col);
-                        }
-                    }
-                    if resp.clicked() {
-                        picked = Some(f.clone());
-                    }
-                }
-            }
-        }
-    });
-    ui.data_mut(|d| d.insert_temp(hi_id.with("view"), (shown.state.offset.y, shown.inner_rect.height())));
-    FontPick { highlighted: hi.and_then(family), picked }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn small_caps_sample_draws_only_letters_the_ui_font_has() {
-        let ctx = egui::Context::default();
-        crate::theme::install_fonts(&ctx, false, 0);
-        let mut shown = None;
-        let input = egui::RawInput { screen_rect: Some(Rect::from_min_size(pos2(0.0, 0.0), vec2(400.0, 300.0))), ..Default::default() };
-        let mut out = ctx.run_ui(input, |ui| {
-            shown = Some(small_caps_sample(ui, "Aɢ", Color32::WHITE));
-        });
-        out.textures_delta.clear();
-        let g = shown.expect("drawn");
-        assert_eq!(g.job.text, "AG");
-        let [a, rest] = g.job.sections.as_slice() else { panic!("two sections: {:?}", g.job.sections) };
-        assert!(rest.format.font_id.size < a.format.font_id.size, "the other letters are smaller capitals");
-        ctx.fonts_mut(|f| {
-            for sec in &g.job.sections {
-                assert!(f.has_glyphs(&sec.format.font_id, &g.job.text), "UI font draws {:?}", g.job.text);
-            }
-        });
-        assert_eq!(small_capital_to_capital('ʀ'), 'R');
-        assert_eq!(small_capital_to_capital('x'), 'x');
-    }
-
-    #[test]
-    fn parses_line_height_and_letter_spacing() {
-        assert_eq!(parse_line_height("Auto", None), Some(json!("auto")));
-        assert_eq!(parse_line_height("", Some(LineHeight::Pixels(20.0))), Some(json!("auto")));
-        assert_eq!(parse_line_height("150%", Some(LineHeight::Auto)), Some(json!("150%")));
-        assert_eq!(parse_line_height("24", Some(LineHeight::Auto)), Some(json!(24.0)));
-        assert_eq!(parse_line_height("24px", Some(LineHeight::Percent(120.0))), Some(json!(24.0)));
-        assert_eq!(parse_line_height("130", Some(LineHeight::Percent(120.0))), Some(json!("130%")));
-        assert_eq!(parse_line_height("-5", Some(LineHeight::Pixels(10.0))), Some(json!(0.0)));
-        assert_eq!(parse_line_height("abc", None), None);
-        // Enter on an untouched Mixed field commits nothing; typing Auto still does.
-        assert_eq!(parse_line_height("", None), None);
-        assert_eq!(parse_line_height("  ", None), None);
-        assert_eq!(parse_letter_spacing("2%", None), Some(json!("2%")));
-        assert_eq!(parse_letter_spacing("1.5px", None), Some(json!(1.5)));
-        assert_eq!(parse_letter_spacing("-1", None), Some(json!("-1%")));
-        assert_eq!(parse_letter_spacing("3", Some(LetterSpacing::Pixels(1.0))), Some(json!(3.0)));
-        assert_eq!(parse_letter_spacing("x", Some(LetterSpacing::Percent(0.0))), None);
-    }
-
-    /// One frame of the font picker with `events`.
-    fn pick(ctx: &egui::Context, current: &str, opened: bool, events: Vec<egui::Event>) -> FontPick {
-        let mut out = FontPick::default();
-        let mut shown = ctx.run_ui(egui::RawInput { events, ..Default::default() }, |ui| out = font_picker(ui, Some(current), opened));
-        shown.textures_delta.clear();
-        out
-    }
-
-    fn key(key: egui::Key) -> egui::Event {
-        egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE }
-    }
-
-    #[test]
-    fn arrow_keys_step_through_the_families_and_enter_picks() {
-        // #345
-        figcraft_text::scan_system_fonts();
-        let all = figcraft_text::family_names();
-        if all.len() < 3 {
-            eprintln!("fewer than three font families; skipping");
-            return;
-        }
-        let ctx = egui::Context::default();
-        let current = all[1].as_str();
-        assert!(pick(&ctx, current, true, vec![]).highlighted.is_none());
-        // The first step starts from the current family; each press is one step.
-        let down = pick(&ctx, current, false, vec![key(egui::Key::ArrowDown)]);
-        assert_eq!(down.highlighted.as_deref(), Some(all[2].as_str()));
-        let up = pick(&ctx, current, false, vec![key(egui::Key::ArrowUp), key(egui::Key::ArrowUp)]);
-        assert_eq!(up.highlighted.as_deref(), Some(all[0].as_str()));
-        // At the top it stays; Enter picks the family it is on, not the first.
-        assert_eq!(pick(&ctx, current, false, vec![key(egui::Key::ArrowUp)]).highlighted.as_deref(), Some(all[0].as_str()));
-        pick(&ctx, current, false, vec![key(egui::Key::ArrowDown)]);
-        let enter = pick(&ctx, current, false, vec![key(egui::Key::Enter)]);
-        assert_eq!(enter.picked.as_deref(), Some(all[1].as_str()));
-    }
-
-    #[test]
-    fn axis_values_round_by_axis_width() {
-        let axis = |min: f64, max: f64| figcraft_text::Axis { tag: "test".into(), name: "Test".into(), min, default: min, max, hidden: false };
-        assert_eq!(round_axis(&axis(100.0, 900.0), 456.6), 457.0);
-        assert_eq!(round_axis(&axis(-10.0, 0.0), -4.26), -4.3);
-        assert_eq!(round_axis(&axis(0.0, 1.0), 0.04), 0.0);
-    }
-
-    #[test]
-    fn uniform_reports_mixed() {
-        let a = TextStyle::default();
-        let b = TextStyle { font_size: 30.0, ..Default::default() };
-        assert_eq!(uniform(&[a.clone(), b.clone()], |s| s.font_family.clone()), Some("Inter".to_string()));
-        assert_eq!(uniform(&[a.clone(), b], |s| s.font_size), None);
-        assert_eq!(uniform(&[], |s: &TextStyle| s.font_size), None);
-        // Ranges pick only the spans they touch.
-        let mut doc = Document::new("t");
-        let page = doc.first_page().unwrap();
-        let id = doc.alloc_id();
-        let mut td = TextData::new("Hello world");
-        td.restyle(6, 11, |s| s.font_size = 40.0);
-        doc.insert(Node::new(id, NodeKind::Text(td), "t", 10.0, 10.0), page, None).unwrap();
-        assert_eq!(target_styles(&doc, &[id], Some((id, 0, 5))).len(), 1);
-        assert_eq!(target_styles(&doc, &[id], Some((id, 4, 8))).len(), 2);
-        assert_eq!(target_styles(&doc, &[id], Some((id, 3, 3))).len(), 2);
-        assert_eq!(target_styles(&doc, &[id], None).len(), 2);
-    }
-}
diff --git a/crates/ui-egui/src/typography_scrub_tests.rs b/crates/ui-egui/src/typography_scrub_tests.rs
index 2440f25e..9b95b8e5 100644
--- a/crates/ui-egui/src/typography_scrub_tests.rs
+++ b/crates/ui-egui/src/typography_scrub_tests.rs
@@ -44,8 +44,9 @@ impl Fields {
         out.textures_delta.clear();
         out.platform_output.cursor_icon
     }
+    /// Screen position of a typography field's label/lead, used to start a scrub.
     fn lead(&self, key: &str) -> Pos2 {
-        let rect = self.ctx.read_response(Id::new(key).with("click")).unwrap().rect;
+        let rect = self.ctx.read_response(Id::unique(key).with("click")).unwrap().rect;
         Pos2::new(rect.min.x + 12.0, rect.center().y)
     }
     fn drag(&mut self, key: &str, by: f32, modifiers: Modifiers) {
@@ -157,6 +158,8 @@ fn typography_icon_scrub_changes_only_the_selected_characters_without_ending_tex
     assert_eq!(f.value("ty_ls"), 0.0);
 }
 
+/// Asserts typography spacing fields accept typed percent units, commit on Enter, and
+/// Escape restores the previous value without adding an undo step.
 #[test]
 fn typography_spacing_fields_still_accept_typed_units_and_escape_cancels() {
     let mut f = Fields::new();
@@ -168,15 +171,15 @@ fn typography_spacing_fields_still_accept_typed_units_and_escape_cancels() {
         );
     }
     f.frame(vec![], Modifiers::NONE);
-    assert!(f.ctx.data(|d| d.get_temp::<String>(Id::new("ty_lh").with("editing"))).is_some(), "click starts typing");
-    f.ctx.memory_mut(|m| m.request_focus(Id::new("ty_lh").with("te")));
+    assert!(f.ctx.data(|d| d.get_temp::<String>(Id::unique("ty_lh").with("editing"))).is_some(), "click starts typing");
+    f.ctx.memory_mut(|m| m.request_focus(Id::unique("ty_lh").with("te")));
     f.frame(
         vec![Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND }],
         Modifiers::COMMAND,
     );
     f.frame(vec![Event::Text("150%".into())], Modifiers::NONE);
     assert_eq!(
-        f.ctx.data(|d| d.get_temp::<String>(Id::new("ty_lh").with("editing"))).as_deref(),
+        f.ctx.data(|d| d.get_temp::<String>(Id::unique("ty_lh").with("editing"))).as_deref(),
         Some("150%"),
         "keyboard selects and replaces the field text"
     );
@@ -192,7 +195,7 @@ fn typography_spacing_fields_still_accept_typed_units_and_escape_cancels() {
             Modifiers::NONE,
         );
     }
-    f.ctx.memory_mut(|m| m.request_focus(Id::new("ty_lh").with("te")));
+    f.ctx.memory_mut(|m| m.request_focus(Id::unique("ty_lh").with("te")));
     f.frame(vec![Event::Text("999".into())], Modifiers::NONE);
     f.frame(
         vec![Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE }],
diff --git a/crates/ui-egui/src/ui_scale.rs b/crates/ui-egui/src/ui_scale.rs
new file mode 100644
index 00000000..6b275a07
--- /dev/null
+++ b/crates/ui-egui/src/ui_scale.rs
@@ -0,0 +1,116 @@
+//! The interface size (Preferences ▸ Interface size, `pref.uiScale`): how the saved choice becomes
+//! egui's zoom factor.
+//!
+//! egui draws at `pixels_per_point = zoom factor × the system's scale`. The size is relative to the
+//! system's scale, so it is the zoom itself: 100 % is the system's own size on every screen (native
+//! on a Retina Mac too), 125 % a quarter larger. A size above 100 % is held back while the window is
+//! too small to lay the interface out at it; the saved choice never changes.
+
+/// The smallest window, in points, the interface is laid out for: the main window's minimum size.
+pub const FIT_POINTS: (f32, f32) = (800.0, 500.0);
+
+/// The zoom factors egui's own settings window allows.
+const ZOOM_RANGE: (f32, f32) = (0.1, 10.0);
+
+/// What to give egui for a saved choice on this screen and window.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Plan {
+    /// For `Context::set_zoom_factor`: the size drawn, relative to the system's scale.
+    pub zoom: f32,
+    /// Physical pixels per point once drawn (the zoom times the system's scale).
+    pub drawn: f32,
+    /// The window is too small for the size chosen, so a smaller one is drawn.
+    pub limited: bool,
+}
+
+/// The plan for `choice` (relative to the system's scale), the system's scale `native` and the
+/// window's size in physical pixels `window_px`. An unknown, zero or not finite value reads as no
+/// information: a size of 1, a system scale of 1 and a window of any size.
+pub fn plan(choice: f64, native: Option<f32>, window_px: Option<(f32, f32)>) -> Plan {
+    let native = native.filter(|n| n.is_finite() && *n > 0.0).unwrap_or(1.0);
+    let want = Some(choice as f32).filter(|c| c.is_finite() && *c > 0.0).unwrap_or(1.0);
+    // The largest zoom at which the window still holds the smallest layout.
+    let fit = window_px
+        .filter(|(w, h)| w.is_finite() && h.is_finite() && *w > 0.0 && *h > 0.0)
+        .map(|(w, h)| (w / FIT_POINTS.0).min(h / FIT_POINTS.1) / native);
+    // Never below 100 % (or the size asked, when that is smaller): a tiny window doesn't shrink the interface further.
+    let zoom = match fit {
+        Some(fit) if want > fit => fit.max(want.min(1.0)),
+        _ => want,
+    }
+    .clamp(ZOOM_RANGE.0, ZOOM_RANGE.1);
+    Plan { zoom, drawn: zoom * native, limited: zoom < want - 0.005 }
+}
+
+/// A size as the percentage Preferences shows (1.25 → 125).
+pub fn percent(scale: f32) -> u32 {
+    (scale * 100.0).round().clamp(0.0, 100_000.0) as u32
+}
+
+/// The sizes Preferences offers, relative to the system's scale (`pref.uiScale` takes up to 3).
+pub const SIZES: [f64; 8] = [0.75, 0.9, 1.0, 1.1, 1.25, 1.5, 1.75, 2.0];
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const BIG: Option<(f32, f32)> = Some((20000.0, 12000.0));
+
+    #[test]
+    fn a_size_is_relative_to_the_systems_scale_on_every_screen() {
+        // Windows 100/125/150/175 %, Retina 2×, a bare X11 window manager's guessed 2×, a 3× screen.
+        for native in [1.0, 1.25, 1.5, 1.75, 2.0, 3.0] {
+            let p = plan(1.0, Some(native), BIG);
+            assert_eq!((p.zoom, p.drawn, p.limited), (1.0, native, false), "100 % is the system's own size on {native}");
+            for size in SIZES {
+                let p = plan(size, Some(native), BIG);
+                assert!((p.zoom - size as f32).abs() < 1e-5, "{size} on {native}: zoom {}", p.zoom);
+                assert!((p.drawn - size as f32 * native).abs() < 1e-4, "{size} on {native}: drawn {}", p.drawn);
+                assert!(!p.limited, "{size} on {native}");
+            }
+        }
+    }
+
+    #[test]
+    fn a_missing_or_unusable_scale_reads_as_1_and_never_gives_egui_a_bad_zoom() {
+        for native in [None, Some(0.0), Some(-2.0), Some(f32::NAN), Some(f32::INFINITY)] {
+            for choice in [1.0, 1.5, f64::NAN, f64::INFINITY, -1.0, 0.0, 1e300] {
+                let p = plan(choice, native, Some((f32::NAN, 0.0)));
+                assert!(p.zoom.is_finite() && (ZOOM_RANGE.0..=ZOOM_RANGE.1).contains(&p.zoom), "{choice:?} {native:?}: {p:?}");
+                assert!(p.drawn.is_finite() && p.drawn > 0.0, "{choice:?} {native:?}: {p:?}");
+            }
+        }
+        // A choice that isn't a usable number is the system's own size.
+        assert_eq!(plan(f64::NAN, Some(2.0), BIG), plan(1.0, Some(2.0), BIG));
+    }
+
+    #[test]
+    fn a_small_window_holds_a_big_size_back_without_going_below_100() {
+        // The minimum window on a Retina Mac: 800 × 500 points is 1600 × 1000 pixels, which holds 100 % only.
+        let min = Some((1600.0, 1000.0));
+        let p = plan(1.5, Some(2.0), min);
+        assert_eq!((p.zoom, p.drawn, p.limited), (1.0, 2.0, true));
+        assert!(!plan(1.0, Some(2.0), min).limited);
+        // A larger window on a 1× screen: 1200 × 750 pixels hold 150 %.
+        let p = plan(2.0, Some(1.0), Some((1200.0, 750.0)));
+        assert_eq!((p.zoom, p.limited), (1.5, true));
+        // A window smaller than the minimum (a tiling window manager): never below 100 %, and never
+        // below a smaller size the person chose.
+        assert_eq!(plan(2.0, Some(1.0), Some((400.0, 250.0))).zoom, 1.0);
+        let p = plan(0.75, Some(1.0), Some((400.0, 250.0)));
+        assert_eq!((p.zoom, p.limited), (0.75, false));
+    }
+
+    #[test]
+    fn the_limit_does_not_depend_on_the_zoom_so_it_cannot_flicker() {
+        // The window's size in pixels is the same whatever zoom is drawn now, so the plan for it is too.
+        let px = Some((1700.0, 1100.0));
+        assert_eq!(plan(2.5, Some(2.0), px), plan(2.5, Some(2.0), px));
+    }
+
+    #[test]
+    fn percentages_round_like_the_menu_shows_them() {
+        assert_eq!([percent(0.75), percent(0.9), percent(1.1), percent(1.25), percent(2.0), percent(1.7999)], [75, 90, 110, 125, 200, 180]);
+        assert_eq!([percent(f32::NAN), percent(-1.0)], [0, 0]);
+    }
+}
diff --git a/crates/ui-egui/src/ui_scale_tests.rs b/crates/ui-egui/src/ui_scale_tests.rs
new file mode 100644
index 00000000..4f2a478b
--- /dev/null
+++ b/crates/ui-egui/src/ui_scale_tests.rs
@@ -0,0 +1,223 @@
+//! The interface size, driven through egui headless on screens of different system scales: 100 %
+//! leaves the system's scale alone, another size is relative to it on every screen, and the
+//! Preferences drop-down tells a screen reader its name and value.
+//!
+//! The test window's size is fixed in points, so it grows with the zoom here; the limit for a small
+//! window is tested on its own in `ui_scale::tests`, and the sizes below stay inside it.
+
+use egui::accesskit::Role;
+use egui::{RawInput, ViewportId, ViewportInfo};
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+
+/// One frame on a screen whose system scale is `native` (a real window reports it every frame).
+fn frame_at(u: &mut Ui, native: f32) -> egui::FullOutput {
+    let mut raw = RawInput::default();
+    raw.viewports.insert(ViewportId::ROOT, ViewportInfo { native_pixels_per_point: Some(native), ..Default::default() });
+    u.frame_raw(raw)
+}
+
+/// Frames on that screen, enough for a new zoom to take effect.
+fn settle(u: &mut Ui, native: f32) {
+    for _ in 0..4 {
+        frame_at(u, native);
+    }
+}
+
+const SCREENS: [f32; 5] = [1.0, 1.25, 1.5, 2.0, 3.0];
+
+#[test]
+fn by_default_the_interface_is_the_systems_own_size() {
+    for native in SCREENS {
+        let mut u = Ui::new(Session::new());
+        settle(&mut u, native);
+        assert_eq!(u.ctx.zoom_factor(), 1.0, "{native}");
+        assert_eq!(u.ctx.pixels_per_point(), native, "{native}");
+    }
+}
+
+#[test]
+fn a_size_is_relative_to_the_systems_scale_on_every_screen_and_auto_is_100() {
+    for native in SCREENS {
+        let mut u = Ui::new(Session::new());
+        for size in [0.75_f64, 0.9, 1.25, 1.5] {
+            assert!(u.app.run("pref.uiScale", json!({"scale": size})).is_some());
+            settle(&mut u, native);
+            let drawn = u.ctx.pixels_per_point();
+            assert!((drawn - size as f32 * native).abs() < 1e-4, "{size} on a {native}× screen drew at {drawn}");
+            assert!((u.ctx.zoom_factor() - size as f32).abs() < 1e-5, "{size} on {native}");
+            assert!(!u.app.ui.ui_scale.limited, "{size} on {native}");
+        }
+        assert!(u.app.run("pref.uiScale", json!({"scale": "auto"})).is_some());
+        settle(&mut u, native);
+        assert_eq!((u.ctx.zoom_factor(), u.ctx.pixels_per_point()), (1.0, native), "{native}");
+    }
+}
+
+#[test]
+fn the_interface_size_menu_has_a_name_a_value_and_a_state_for_a_screen_reader() {
+    let mut u = Ui::new(Session::new());
+    u.app.ui.preferences = true;
+    u.ctx.enable_accesskit();
+    let combo = |u: &mut Ui| {
+        settle(u, 2.0);
+        let out = frame_at(u, 2.0);
+        let nodes: Vec<_> = out.platform_output.accesskit_update.expect("an AccessKit update").nodes.into_iter().map(|(_, n)| n).collect();
+        let n = nodes.iter().find(|n| n.role() == Role::ComboBox && n.label() == Some("Interface size")).expect("an Interface size menu");
+        (n.value().map(str::to_owned), n.is_expanded())
+    };
+    // 100 % is the system's own size, whatever it is (2× here).
+    assert_eq!(combo(&mut u), (Some("100%".to_owned()), Some(false)));
+    u.app.run("pref.uiScale", json!({"scale": 1.25}));
+    assert_eq!(combo(&mut u), (Some("125%".to_owned()), Some(false)));
+}
+
+/// Every window size, system scale and interface size, drawn the way a real window is: the window is
+/// a fixed number of physical pixels, and its size in points is that divided by the scale drawn now
+/// (egui-winit does the same each frame), so a bigger size shrinks the window in points.
+///
+/// What a fixed size promises: whatever it draws at above 100 %, the window still holds the smallest
+/// layout the interface is made for (`ui_scale::FIT_POINTS`), and the panels leave room for a canvas.
+#[test]
+fn every_window_size_system_scale_and_interface_size_lays_out_inside_the_window() {
+    use crate::ui_scale::{FIT_POINTS, SIZES};
+    use crate::{FigApp, NoServices};
+    use egui::{Pos2, Rect, vec2};
+
+    // Window sizes in points: the main window's minimum, common laptop and desktop screens up to 5K,
+    // and a short wide strip.
+    let windows: [(f32, f32); 10] = [
+        (800.0, 500.0),
+        (1024.0, 640.0),
+        (1280.0, 720.0),
+        (1366.0, 768.0),
+        (1440.0, 900.0),
+        (1920.0, 1080.0),
+        (2560.0, 1440.0),
+        (3840.0, 2160.0),
+        (5120.0, 2880.0),
+        (2560.0, 520.0),
+    ];
+
+    for native in [1.0_f32, 1.25, 1.5, 1.75, 2.0, 3.0] {
+        for (w, h) in windows {
+            let px = vec2(w * native, h * native);
+            for want in SIZES {
+                let case = format!("{w}x{h} pt at {native}x, {want}");
+                let mut app = FigApp::new(Session::new(), Box::new(NoServices));
+                assert!(app.run("pref.uiScale", json!({"scale": want})).is_some(), "{case}");
+                let ctx = egui::Context::default();
+                let mut time = 0.0;
+                let mut seen = Vec::new();
+                for _ in 0..8 {
+                    time += 1.0 / 60.0;
+                    let ppp = ctx.pixels_per_point();
+                    let mut raw = RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, px / ppp)), time: Some(time), ..Default::default() };
+                    raw.viewports.insert(ViewportId::ROOT, ViewportInfo { native_pixels_per_point: Some(native), ..Default::default() });
+                    let mut out = ctx.run_ui(raw, |ui| app.ui(ui));
+                    out.textures_delta.clear();
+                    seen.push((ctx.pixels_per_point(), ctx.content_rect().size()));
+                }
+                // It settles within a few frames and then stays put: no flicker between two sizes.
+                let (ppp, content) = seen[seen.len() - 1];
+                assert_eq!(seen[seen.len() - 2].0, ppp, "{case}: still changing");
+                assert!(ppp.is_finite() && ppp > 0.0 && content.x.is_finite() && content.y.is_finite(), "{case}: {ppp} {content:?}");
+                let plan = app.ui.ui_scale;
+                assert!((ppp - plan.drawn).abs() < 1e-3, "{case}: egui draws at {ppp}, the plan said {}", plan.drawn);
+                // The size drawn, relative to the system's scale.
+                let zoom = ppp / native;
+                let want = want as f32;
+                assert_eq!(plan.limited, zoom < want - 0.005, "{case}: limited flag");
+                // Above 100 % the window holds the smallest layout; at or below it there is nothing more to give up.
+                if zoom > 1.001 {
+                    assert!(content.x >= FIT_POINTS.0 - 0.5 && content.y >= FIT_POINTS.1 - 0.5, "{case}: window is {content:?} points at {ppp}");
+                }
+                // It never draws bigger than asked, and only a window too small for it draws smaller.
+                assert!(zoom <= want + 1e-3, "{case}");
+                if !plan.limited {
+                    assert!((zoom - want).abs() < 1e-3, "{case}");
+                }
+                let panels = &app.inspect()["panels"];
+                let side = panels["left"].as_f64().unwrap_or(0.0) + panels["right"].as_f64().unwrap_or(0.0);
+                assert!(side < f64::from(content.x) - 100.0, "{case}: the panels ({side} pt) leave no canvas in {content:?}");
+            }
+        }
+    }
+}
+
+/// The interface size is reachable and changeable without a pointer: Tab reaches the menu, Enter
+/// opens it, the arrows and Tab move through its entries, Enter picks one and closes the menu, and
+/// Escape closes it alone, without changing anything and without closing Preferences (a second
+/// Escape does).
+#[test]
+fn the_interface_size_menu_works_from_the_keyboard() {
+    use crate::a11y::focused_name;
+    use egui::{Event, Key, Modifiers, Popup};
+
+    // A key press, then two quiet frames for the focus (and the name a screen reader reads) to settle.
+    let press_mod = |u: &mut Ui, key: Key, modifiers: Modifiers| {
+        u.frame_with(
+            vec![
+                Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers },
+                Event::Key { key, physical_key: None, pressed: false, repeat: false, modifiers },
+            ],
+            modifiers,
+        );
+        u.frame(vec![]);
+        u.frame(vec![]);
+    };
+    let press = |u: &mut Ui, key: Key| press_mod(u, key, Modifiers::NONE);
+    let open = |u: &mut Ui| {
+        // The Preferences dialog is not modal for the keyboard: Tab crosses the main window first.
+        let mut tabs = 0;
+        while focused_name(&u.ctx) != "Interface size" {
+            assert!(tabs < 140, "Tab never reaches the Interface size menu (focus: {:?})", focused_name(&u.ctx));
+            press(u, Key::Tab);
+            tabs += 1;
+        }
+        press(u, Key::Enter);
+        assert!(Popup::is_any_open(&u.ctx), "Enter opens the menu");
+    };
+    let chosen = |u: &Ui| u.app.inspect()["uiScale"]["choice"].clone();
+
+    let mut u = Ui::new(Session::new());
+    u.app.ui.preferences = true;
+    u.ctx.enable_accesskit();
+    settle(&mut u, 1.0);
+    assert_eq!(chosen(&u), json!(1.0));
+
+    // Escape closes the menu and nothing else: the size is unchanged and Preferences stays open.
+    open(&mut u);
+    press(&mut u, Key::Escape);
+    u.frame(vec![]);
+    assert!(!Popup::is_any_open(&u.ctx));
+    assert!(u.app.ui.preferences, "the first Escape closes the menu only");
+    assert_eq!(chosen(&u), json!(1.0));
+
+    // The arrows enter the menu on its first size and go down through the sizes (75, 90, 100, 110,
+    // 125); Enter picks the one that has the keyboard and closes the menu.
+    open(&mut u);
+    press(&mut u, Key::ArrowDown);
+    assert_eq!(focused_name(&u.ctx), "75%");
+    for _ in 0..4 {
+        press(&mut u, Key::ArrowDown);
+    }
+    assert_eq!(focused_name(&u.ctx), "125%");
+    for expected in ["150%", "175%", "200%", "200%"] {
+        press(&mut u, Key::Tab);
+        assert_eq!(focused_name(&u.ctx), expected, "Tab stays in the size menu");
+    }
+    for expected in ["175%", "150%", "125%"] {
+        press_mod(&mut u, Key::Tab, Modifiers::SHIFT);
+        assert_eq!(focused_name(&u.ctx), expected, "Shift+Tab stays in the size menu");
+    }
+    press(&mut u, Key::Enter);
+    assert_eq!(chosen(&u), json!(1.25));
+    assert!(!Popup::is_any_open(&u.ctx), "picking a size closes the menu");
+    assert!(u.app.ui.preferences, "picking a size leaves Preferences open");
+    // With no menu open, Escape closes Preferences as before.
+    press(&mut u, Key::Escape);
+    assert!(!u.app.ui.preferences);
+}
diff --git a/crates/ui-egui/src/variables_export_ui_tests.rs b/crates/ui-egui/src/variables_export_ui_tests.rs
index 40a84393..ce51a096 100644
--- a/crates/ui-egui/src/variables_export_ui_tests.rs
+++ b/crates/ui-egui/src/variables_export_ui_tests.rs
@@ -9,12 +9,12 @@ use serde_json::{Value, json};
 use crate::variables_panel::export_dialog;
 use crate::{FigApp, NoServices, Services};
 
-type Downloads = Arc<Mutex<Vec<(String, Vec<u8>)>>>;
+pub(crate) type Downloads = Arc<Mutex<Vec<(String, Vec<u8>)>>>;
 
 /// Services that save by downloads and keep them (`deliver` false: the browser refused).
-struct Browser {
-    got: Downloads,
-    deliver: bool,
+pub(crate) struct Browser {
+    pub(crate) got: Downloads,
+    pub(crate) deliver: bool,
 }
 
 impl Services for Browser {
diff --git a/crates/ui-egui/src/variants_discovery_tests.rs b/crates/ui-egui/src/variants_discovery_tests.rs
new file mode 100644
index 00000000..e153d982
--- /dev/null
+++ b/crates/ui-egui/src/variants_discovery_tests.rs
@@ -0,0 +1,111 @@
+//! Combine as variants and Add variant where people look for them (#903), driven through egui
+//! headless: the Design panel offers Combine for two or more main components and Add variant for
+//! a lone one, and the canvas / layers context menu lists Combine only when it applies.
+
+use egui::Pos2;
+use figcraft_doc::{NodeId, NodeKind};
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+use crate::live_tests::{flat, has_text, text_center};
+use crate::present_tests::id;
+
+const COMBINE: &str = "Combine as variants";
+
+/// A session with lone main components named A, B and C side by side, and a frame. Returns
+/// (session, [a, b, c], frame).
+fn doc() -> (Session, [NodeId; 3], NodeId) {
+    let mut s = Session::new();
+    let mut comps = Vec::new();
+    for (k, name) in ["A", "B", "C"].iter().enumerate() {
+        let f = id(&s.execute("frame.create", &json!({"x": k * 160, "y": 0, "width": 120, "height": 40, "name": name})).unwrap());
+        comps.push(id(&s.execute("component.create", &json!({"ids": [f]})).unwrap()));
+    }
+    let frame = id(&s.execute("frame.create", &json!({"x": 0, "y": 200, "width": 60, "height": 60})).unwrap());
+    (s, [comps[0], comps[1], comps[2]], frame)
+}
+
+fn select(u: &mut Ui, ids: &[NodeId]) {
+    u.app.session.execute("select.set", &json!({"ids": ids})).unwrap();
+    u.frame(vec![]);
+}
+
+/// The text painted this frame.
+fn shows(u: &mut Ui, s: &str) -> Option<Pos2> {
+    let shapes = flat(&u.frame_output(vec![]).shapes);
+    has_text(&shapes, s).then(|| text_center(&shapes, s))
+}
+
+fn click(u: &mut Ui, p: Pos2) {
+    u.button(p, true);
+    u.button(p, false);
+}
+
+fn set_of(u: &Ui, c: NodeId) -> Option<NodeId> {
+    let doc = u.app.session.doc().unwrap();
+    doc.node(c).and_then(|n| n.parent).filter(|p| doc.node(*p).is_some_and(|n| matches!(n.kind, NodeKind::ComponentSet { .. })))
+}
+
+fn undo_len(u: &Ui) -> usize {
+    u.app.session.ds().unwrap().history.undo.len()
+}
+
+#[test]
+fn the_design_panel_combines_two_selected_components() {
+    let (s, [a, b, _], _) = doc();
+    let mut u = Ui::new(s);
+    select(&mut u, &[a, b]);
+    let at = shows(&mut u, COMBINE).expect("the Design panel offers Combine as variants");
+    let undo = undo_len(&u);
+    click(&mut u, at);
+    let set = set_of(&u, a).expect("combined into a set");
+    assert_eq!(set_of(&u, b), Some(set));
+    assert_eq!(u.app.session.selection(), vec![set]);
+    assert_eq!(undo_len(&u), undo + 1);
+    assert!(u.app.ui.last_error.is_none(), "{:?}", u.app.ui.last_error);
+    assert!(shows(&mut u, COMBINE).is_none(), "a set selected: nothing to combine");
+}
+
+#[test]
+fn the_design_panel_offers_combine_only_when_it_applies() {
+    // The cases are the engine's (`can_combine_variants`); this pins the panel to it.
+    let (s, [a, ..], frame) = doc();
+    let mut u = Ui::new(s);
+    select(&mut u, &[a, frame]);
+    assert!(shows(&mut u, COMBINE).is_none(), "a component and a frame");
+}
+
+#[test]
+fn the_design_panel_adds_a_variant_to_a_lone_component() {
+    let (s, [a, ..], _) = doc();
+    let mut u = Ui::new(s);
+    select(&mut u, &[a]);
+    let at = shows(&mut u, "Add variant").expect("a lone main component offers Add variant");
+    click(&mut u, at);
+    let set = set_of(&u, a).expect("the component became a set");
+    assert_eq!(u.app.session.doc().unwrap().node(set).unwrap().children.len(), 2);
+    assert!(u.app.ui.last_error.is_none(), "{:?}", u.app.ui.last_error);
+}
+
+#[test]
+fn the_context_menu_lists_combine_for_two_selected_components() {
+    let (s, [a, b, _], _) = doc();
+    let mut u = Ui::new(s);
+    // One component: no Combine, Create component as before.
+    select(&mut u, &[a]);
+    u.app.ui.context_menu = Some((Pos2::new(700.0, 300.0), vec![a]));
+    assert!(shows(&mut u, COMBINE).is_none());
+    assert!(shows(&mut u, "Create component").is_some());
+    u.app.ui.context_menu = None;
+    // Two components, right-clicked on one layer row (the menu gets only that row): judged on
+    // the selection, which is what the command combines.
+    select(&mut u, &[a, b]);
+    u.app.ui.context_menu = Some((Pos2::new(700.0, 300.0), vec![a]));
+    u.frame(vec![]);
+    let at = shows(&mut u, COMBINE).expect("the context menu offers Combine as variants");
+    click(&mut u, at);
+    let set = set_of(&u, a).expect("combined into a set");
+    assert_eq!(set_of(&u, b), Some(set));
+    assert!(u.app.ui.context_menu.is_none(), "the menu closes");
+}
diff --git a/crates/ui-egui/src/vector_keys_tests.rs b/crates/ui-egui/src/vector_keys_tests.rs
new file mode 100644
index 00000000..dce51717
--- /dev/null
+++ b/crates/ui-egui/src/vector_keys_tests.rs
@@ -0,0 +1,85 @@
+//! Keys in vector edit mode that the window's key handling twists: Windows sends Shift+Delete
+//! (delete the points and heal the path) as a cut command and no key at all, so the canvas must
+//! heal the selected points rather than cut the layer.
+
+use egui::{Event, Modifiers};
+use figcraft_doc::NodeId;
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::layers_drag_tests::Ui;
+
+fn id(v: serde_json::Value) -> NodeId {
+    NodeId(v["id"].as_u64().unwrap())
+}
+
+fn net(u: &Ui, path: NodeId) -> figcraft_doc::VectorNetwork {
+    let doc = u.app.session.doc().unwrap();
+    figcraft_engine::vectoredit::network(doc, path).unwrap().clone()
+}
+
+/// A three-point open path A-B-C in edit mode, B selected.
+fn abc(u: &mut Ui) -> NodeId {
+    let path = id(u.app.session.execute("vector.create", &json!({"points": [[100, 100], [200, 100], [300, 100]], "closed": false})).unwrap());
+    u.app.session.execute("vector.edit.begin", &json!({"id": path})).unwrap();
+    u.app.session.execute("vector.edit.select", &json!({"vertices": [1]})).unwrap();
+    path
+}
+
+#[test]
+fn shift_delete_in_vector_edit_mode_heals_the_point_instead_of_cutting_the_layer() {
+    let mut u = Ui::new(Session::new());
+    let path = abc(&mut u);
+    // Windows: egui-winit turns Shift+Delete into a cut command, with no key event.
+    u.frame_with(vec![Event::Cut], Modifiers::SHIFT);
+    assert!(u.app.session.doc().unwrap().node(path).is_some(), "the layer stays");
+    let n = net(&u, path);
+    assert_eq!(n.vertices.len(), 2, "the point is gone: {n:?}");
+    assert_eq!(n.segments.len(), 1, "A and C are joined");
+    let (a, b) = (n.vertices.first().map(|v| v.x).unwrap_or_default(), n.vertices.get(1).map(|v| v.x).unwrap_or_default());
+    assert!(b - a == 200.0 && n.vertices.iter().all(|v| v.y == 0.0), "it runs straight from A to C: {n:?}");
+}
+
+#[test]
+fn a_cut_command_in_edit_mode_takes_the_selected_points_not_the_layer() {
+    let mut u = Ui::new(Session::new());
+    let path = abc(&mut u);
+    u.frame_with(vec![Event::Cut], Modifiers::COMMAND);
+    assert!(u.app.session.doc().unwrap().node(path).is_some(), "Ctrl+X on points keeps the layer");
+    assert_eq!(net(&u, path).vertices.len(), 2, "it takes the selected point");
+}
+
+#[test]
+fn a_cut_command_in_edit_mode_with_nothing_selected_keeps_the_layer() {
+    let mut u = Ui::new(Session::new());
+    let path = abc(&mut u);
+    u.app.session.execute("vector.edit.select", &json!({"vertices": []})).unwrap();
+    u.frame_with(vec![Event::Cut], Modifiers::SHIFT);
+    assert!(u.app.session.doc().unwrap().node(path).is_some(), "nothing selected: nothing goes");
+    assert_eq!(net(&u, path).vertices.len(), 3);
+}
+
+#[test]
+fn a_cut_command_heals_points_selected_in_another_edited_layer() {
+    let mut u = Ui::new(Session::new());
+    let a = id(u.app.session.execute("vector.create", &json!({"points": [[100, 100], [200, 100], [300, 100]], "closed": false})).unwrap());
+    let b = id(u.app.session.execute("vector.create", &json!({"points": [[100, 200], [200, 200], [300, 200]], "closed": false})).unwrap());
+    figcraft_engine::vectoredit::begin_many(&mut u.app.session, &[a, b]).unwrap();
+    // Points selected in the second layer, then the first made active: only `others` has a selection.
+    u.app.session.execute("vector.edit.select", &json!({"id": b, "vertices": [1]})).unwrap();
+    u.app.session.execute("vector.edit.select", &json!({"id": a, "add": true})).unwrap();
+    u.frame_with(vec![Event::Cut], Modifiers::SHIFT);
+    assert!(u.app.session.doc().unwrap().node(a).is_some() && u.app.session.doc().unwrap().node(b).is_some(), "both layers stay");
+    assert_eq!(net(&u, a).vertices.len(), 3, "the active layer had nothing selected");
+    assert_eq!(net(&u, b).vertices.len(), 2, "the other layer's point is gone");
+}
+
+#[test]
+fn a_cut_command_outside_edit_mode_cuts_the_layer() {
+    let mut s = Session::new();
+    let path = id(s.execute("vector.create", &json!({"points": [[100, 100], [200, 100], [300, 100]], "closed": false})).unwrap());
+    s.execute("select.set", &json!({"ids": [path]})).unwrap();
+    let mut u = Ui::new(s);
+    u.frame_with(vec![Event::Cut], Modifiers::SHIFT);
+    assert!(u.app.session.doc().unwrap().node(path).is_none(), "outside edit mode the selected layer is cut");
+}
diff --git a/crates/ui-egui/src/web_clipboard_tests.rs b/crates/ui-egui/src/web_clipboard_tests.rs
index a7787120..bda57373 100644
--- a/crates/ui-egui/src/web_clipboard_tests.rs
+++ b/crates/ui-egui/src/web_clipboard_tests.rs
@@ -86,6 +86,26 @@ impl Page {
         self.frame(vec![Self::key(Key::V, false)]);
     }
 
+    /// Cmd+V with `m` added, as the browser delivers it: the key press, then the paste event.
+    fn chord(&mut self, m: Modifiers) {
+        let m = m | Modifiers::MAC_CMD | Modifiers::COMMAND;
+        let v = |pressed| Event::Key { key: Key::V, physical_key: Some(Key::V), pressed, repeat: false, modifiers: m };
+        let text = self.clipboard.clone();
+        self.frame(vec![Event::ModifiersChanged(m), v(true), Event::Paste(text)]);
+        self.frame(vec![v(false)]);
+        self.frame(vec![Event::ModifiersChanged(Modifiers::NONE)]);
+    }
+
+    /// Copy the selected rectangle A (made red) and its properties, then select a new rectangle B.
+    fn copy_a_select_b(&mut self) -> figcraft_doc::NodeId {
+        self.app.session.execute("fill.set", &json!({"color": "#e53935"})).unwrap();
+        self.copy();
+        self.app.session.execute("edit.copyProperties", &json!({})).unwrap();
+        let b = self.app.session.execute("shape.rectangle", &json!({"x": 400, "y": 250, "width": 100, "height": 50})).unwrap();
+        self.app.session.execute("select.set", &json!({"ids": [b["id"]]})).unwrap();
+        figcraft_doc::NodeId(b["id"].as_u64().unwrap())
+    }
+
     fn count(&self, kind: fn(&NodeKind) -> bool) -> usize {
         self.app.session.doc().unwrap().nodes().filter(|n| kind(&n.kind)).count()
     }
@@ -121,6 +141,70 @@ fn text_copied_elsewhere_after_our_copy_still_pastes_as_text() {
     assert_eq!(p.count(text), 1, "newer text from elsewhere becomes a text layer");
 }
 
+#[test]
+fn copying_text_layers_puts_their_text_on_the_clipboard() {
+    // #808: other apps get a text layer's text, not its SVG; FigCraft still pastes the layers.
+    let mut p = Page::new();
+    let a = p.app.session.execute("text.create", &json!({"text": "Hello", "x": 0, "y": 200})).unwrap();
+    let b = p.app.session.execute("text.create", &json!({"text": "World", "x": 0, "y": 300})).unwrap();
+    p.app.session.execute("select.set", &json!({"ids": [a["id"], b["id"]]})).unwrap();
+    p.frame(vec![]);
+    p.copy();
+    assert_eq!(p.clipboard, "Hello\nWorld", "one line per text layer");
+    p.paste();
+    assert_eq!(p.count(text), 4, "the copied text layers were pasted, not one layer of their text");
+    let r = p.app.session.doc().unwrap().nodes().find(|n| rect(&n.kind)).map(|n| n.id.0).unwrap();
+    p.app.session.execute("select.set", &json!({"ids": [r, a["id"]]})).unwrap();
+    p.copy();
+    assert!(p.clipboard.contains("<svg"), "a selection with other layers stays SVG");
+}
+
+#[test]
+fn shift_cmd_v_pastes_over_once_and_no_text() {
+    for foreign in [false, true] {
+        let mut p = Page::new();
+        let b = p.copy_a_select_b();
+        if foreign {
+            p.clipboard = "hello from another app".into();
+        }
+        p.chord(Modifiers::SHIFT);
+        assert_eq!(p.count(rect), 3, "foreign text {foreign}: one copy pasted over B");
+        assert_eq!(p.count(text), 0, "foreign text {foreign}: the paste event pasted nothing");
+        let doc = p.app.session.doc().unwrap();
+        let over = doc.nodes().filter(|n| n.id != b).filter_map(|n| doc.world_bounds(n.id)).any(|r| r.x0 == 400.0 && r.y0 == 250.0);
+        assert!(over, "foreign text {foreign}: the copy sits at B's top-left");
+    }
+}
+
+#[test]
+fn alt_cmd_v_pastes_properties_once_and_no_text() {
+    for foreign in [false, true] {
+        let mut p = Page::new();
+        let b = p.copy_a_select_b();
+        if foreign {
+            p.clipboard = "hello from another app".into();
+        }
+        p.chord(Modifiers::ALT);
+        assert_eq!(p.count(rect), 2, "foreign text {foreign}: no layer pasted");
+        assert_eq!(p.count(text), 0, "foreign text {foreign}: the paste event pasted nothing");
+        let fill = figcraft_engine::inspect::node_json(p.app.session.doc().unwrap(), b, 0)["fills"][0]["color"].clone();
+        assert_eq!(fill, "#E53935", "foreign text {foreign}: B took A's fill");
+    }
+}
+
+#[test]
+fn a_chord_tapped_within_one_frame_runs_once() {
+    let mut p = Page::new();
+    p.copy_a_select_b();
+    let m = Modifiers::SHIFT | Modifiers::MAC_CMD | Modifiers::COMMAND;
+    let v = |pressed| Event::Key { key: Key::V, physical_key: Some(Key::V), pressed, repeat: false, modifiers: m };
+    let clip = p.clipboard.clone();
+    p.frame(vec![Event::ModifiersChanged(m), v(true), Event::Paste(clip), v(false), Event::ModifiersChanged(Modifiers::NONE)]);
+    p.frame(vec![]);
+    assert_eq!(p.count(rect), 3, "one copy pasted over B");
+    assert_eq!(p.count(text), 0);
+}
+
 #[test]
 fn copy_as_png_puts_an_image_on_the_clipboard() {
     let mut p = Page::new();
diff --git a/crates/ui-egui/src/web_save_tests.rs b/crates/ui-egui/src/web_save_tests.rs
new file mode 100644
index 00000000..4879add1
--- /dev/null
+++ b/crates/ui-egui/src/web_save_tests.rs
@@ -0,0 +1,72 @@
+//! Save, Save as and Export where the platform saves by downloads (the browser, which has no save
+//! dialogs or paths): the file arrives as a download instead of nothing happening (#969).
+
+use base64::Engine as _;
+use figcraft_doc::{ExportSetting, NodeId};
+use figcraft_engine::Session;
+use serde_json::json;
+
+use crate::FigApp;
+use crate::variables_export_ui_tests::{Browser, Downloads};
+
+fn browser(deliver: bool) -> (FigApp, Downloads, NodeId) {
+    let mut s = Session::new();
+    let r = s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+    let id = serde_json::from_value(r["id"].clone()).unwrap();
+    let got = Downloads::default();
+    (FigApp::new(s, Box::new(Browser { got: got.clone(), deliver })), got, id)
+}
+
+fn toast(app: &FigApp) -> String {
+    app.ui.toast.as_ref().map(|t| t.0.clone()).unwrap_or_default()
+}
+
+#[test]
+fn save_downloads_the_figcraft_file() {
+    let (mut app, got, _) = browser(true);
+    app.save();
+    let got = got.lock().unwrap();
+    let [(name, bytes)] = got.as_slice() else { panic!("one download, got {}", got.len()) };
+    assert_eq!(name, "Untitled.figcraft");
+    let mut reopened = Session::new();
+    let data = base64::engine::general_purpose::STANDARD.encode(bytes);
+    reopened.execute("file.open", &json!({"data": data, "name": name})).unwrap();
+    assert!(!app.session.ds().unwrap().is_dirty());
+    assert_eq!(toast(&app), "Saved Untitled.figcraft");
+}
+
+#[test]
+fn export_downloads_the_exported_file() {
+    let (mut app, got, id) = browser(true);
+    crate::export_panel::save_one(&mut app, &[id], &ExportSetting::default(), "Rectangle.png");
+    let got = got.lock().unwrap();
+    let [(name, bytes)] = got.as_slice() else { panic!("one download, got {}", got.len()) };
+    assert_eq!(name, "Rectangle.png");
+    assert!(bytes.starts_with(b"\x89PNG"));
+    assert_eq!(toast(&app), "Exported Rectangle.png");
+}
+
+#[test]
+fn a_refused_download_says_so() {
+    let (mut app, got, _) = browser(false);
+    app.save_as_dialog();
+    assert_eq!(got.lock().unwrap().len(), 1);
+    assert_eq!(toast(&app), "Couldn't download Untitled.figcraft");
+    assert!(app.session.ds().unwrap().is_dirty(), "no file arrived: closing must still warn about the edits");
+}
+
+#[test]
+fn several_layers_download_as_one_zip() {
+    // The browser lets a page start one download at a time: two downloads lost the second.
+    let (mut app, got, a) = browser(true);
+    let r = app.session.execute("shape.rectangle", &json!({"x": 20, "y": 0, "width": 10, "height": 10})).unwrap();
+    let b: NodeId = serde_json::from_value(r["id"].clone()).unwrap();
+    app.session.execute("export.add", &json!({"ids": [a, b]})).unwrap();
+    crate::export_panel::export_layers(&mut app, &[a, b], false);
+    let got = got.lock().unwrap();
+    let [(name, bytes)] = got.as_slice() else { panic!("one download, got {}", got.len()) };
+    assert_eq!(name, "Untitled.zip");
+    assert!(bytes.starts_with(b"PK\x03\x04"));
+    assert!(bytes.windows(15).any(|w| w == b"Rectangle 2.png"), "both layers are in the zip");
+    assert_eq!(toast(&app), "Exported 2 files");
+}
diff --git a/crates/ui-egui/src/widgets.rs b/crates/ui-egui/src/widgets.rs
index b4413545..0a39604e 100644
--- a/crates/ui-egui/src/widgets.rs
+++ b/crates/ui-egui/src/widgets.rs
@@ -8,6 +8,11 @@ pub use crate::field_math::{Rel, Typed, eval, parse, stepped};
 use crate::i18n::tr;
 use crate::icons::{self, Icon};
 use crate::theme::{Tokens, regular, semibold};
+pub(crate) mod board_picker;
+pub mod colorpicker;
+pub mod field_math;
+pub mod font_preview;
+pub mod style_picker;
 
 pub const ROW_H: f32 = 32.0;
 pub const FIELD_H: f32 = 24.0;
@@ -37,6 +42,25 @@ impl Lead<'_> {
     }
 }
 
+/// What a number field shows when it has no single value, and whether that word types 0.
+#[derive(Clone, Copy)]
+pub enum Empty<'a> {
+    /// Dim text that is only a label ("Mixed", or "Auto" where 0 means something else).
+    Text(&'a str),
+    /// Auto, in the UI's language: 0 is the field's automatic value, so the word types 0.
+    Auto,
+}
+
+impl<'a> Empty<'a> {
+    /// The text shown when the field has no value.
+    fn text(self) -> &'a str {
+        match self {
+            Empty::Text(s) => s,
+            Empty::Auto => tr("Auto"),
+        }
+    }
+}
+
 /// Result of a field edit.
 pub enum FieldEdit {
     /// Committed a new value (Enter, Tab or focus loss; an arrow key's step).
@@ -68,7 +92,7 @@ impl Edit {
 /// The nudge amounts the arrow keys step pixel fields by (plain, with Shift): the preferences'
 /// small and big nudge. Set once a frame.
 pub fn set_nudge(ctx: &egui::Context, small: f64, big: f64) {
-    ctx.data_mut(|d| d.insert_temp(Id::new("field_nudge"), (small, big)));
+    ctx.data_mut(|d| d.insert_temp(Id::unique("field_nudge"), (small, big)));
 }
 
 /// What an arrow key (with Shift: `.1`) and a pixel of scrubbing step a field by: a field in
@@ -76,7 +100,7 @@ pub fn set_nudge(ctx: &egui::Context, small: f64, big: f64) {
 /// its own step and ten of them (1% and 10% of opacity, 1° and 10° of rotation).
 fn key_steps(ctx: &egui::Context, suffix: &str, step: f64) -> (f64, f64) {
     let nudge =
-        ctx.data(|d| d.get_temp::<(f64, f64)>(Id::new("field_nudge"))).filter(|(s, b)| s.is_finite() && b.is_finite() && *s > 0.0 && *b > 0.0);
+        ctx.data(|d| d.get_temp::<(f64, f64)>(Id::unique("field_nudge"))).filter(|(s, b)| s.is_finite() && b.is_finite() && *s > 0.0 && *b > 0.0);
     match nudge {
         Some(n) if suffix.is_empty() && step == 1.0 => n,
         _ => (step, step * 10.0),
@@ -157,18 +181,19 @@ pub fn number_field(ui: &mut Ui, id: Id, lead: Lead, value: Option<f64>, suffix:
 /// [`number_field`] over several layers: without a single value (`value` None, "Mixed") a relative
 /// edit comes back as one for each layer ([`Edit::Each`]).
 pub fn number_field_mixed(ui: &mut Ui, id: Id, lead: Lead, value: Option<f64>, suffix: &str, width: f32, step: f64) -> Option<Edit> {
-    number_field_bindable(ui, id, lead, value, suffix, width, step, None, tr("Mixed")).0
+    number_field_bindable(ui, id, lead, value, suffix, width, step, None, Empty::Text(tr("Mixed"))).0
 }
 
 /// [`number_field`] that shows `empty` (dim) for no value instead of "Mixed" (e.g. "Auto"): there
 /// is no value to edit relative to, so `+4` is 4.
 pub fn number_field_or(ui: &mut Ui, id: Id, value: Option<f64>, empty: &str, width: f32, step: f64) -> Option<FieldEdit> {
-    number_field_impl(ui, id, Lead::None, value, "", width, step, None, empty).0?.settled()
+    number_field_impl(ui, id, Lead::None, value, "", width, step, None, Empty::Text(empty)).0?.settled()
 }
 
 /// [`number_field`] that can bind a variable: `binding` None = not bindable, `Some(None)` = shows
 /// a variable button on hover, `Some(Some(name))` = bound (shows the name; click to change, the
-/// detach button unbinds). No value shows `empty` ("Mixed", "Auto").
+/// detach button unbinds). No value shows `empty` ("Mixed", "Auto"); [`Empty::Auto`] also takes
+/// the word for Auto as 0.
 pub fn number_field_bindable(
     ui: &mut Ui,
     id: Id,
@@ -178,11 +203,34 @@ pub fn number_field_bindable(
     width: f32,
     step: f64,
     binding: Option<Option<&str>>,
-    empty: &str,
+    empty: Empty<'_>,
 ) -> (Option<Edit>, Option<BindEvent>) {
     number_field_impl(ui, id, lead, value, suffix, width, step, binding, empty)
 }
 
+/// A save admitted for another document cannot make this reused field commit its cached draft.
+/// Drop only this editor's transient state, before a natural focus-loss branch can read it.
+fn cancel_retargeted_field_save(ui: &mut Ui, id: Id) {
+    let editor = id.with("te");
+    if !crate::shortcuts::take_field_save_cancellation(ui.ctx(), editor) {
+        return;
+    }
+    let select_all = select_all_id(editor);
+    ui.data_mut(|d| {
+        d.remove::<String>(id);
+        d.remove::<String>(id.with("editing"));
+        d.remove::<String>(id.with("kept"));
+        d.remove::<String>(id.with("buf"));
+        d.remove::<bool>(id.with("selectall"));
+        d.remove::<bool>(select_all);
+        d.remove::<egui::text_edit::TextEditState>(editor);
+    });
+    ui.memory_mut(|m| m.surrender_focus(editor));
+}
+
+/// Implement the shared number field: label/icon lead, scrubbing, keyboard stepping and
+/// typing, select-all when a click starts editing, bindable values and deferred-save
+/// cancellation; returns an edit and/or bind event.
 fn number_field_impl(
     ui: &mut Ui,
     id: Id,
@@ -192,8 +240,9 @@ fn number_field_impl(
     width: f32,
     step: f64,
     binding: Option<Option<&str>>,
-    empty: &str,
+    empty: Empty<'_>,
 ) -> (Option<Edit>, Option<BindEvent>) {
+    cancel_retargeted_field_save(ui, id);
     let t = Tokens::get(ui.ctx());
     let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
     if let Some(Some(name)) = binding {
@@ -202,7 +251,7 @@ fn number_field_impl(
     let mut out: Option<Edit> = None;
     let lead_w = match lead {
         Lead::None | Lead::Named(_) => 6.0,
-        Lead::Text(s) => (12.0 + s.chars().count() as f32 * 7.0).max(24.0),
+        Lead::Text(s) => text_lead_width(ui, s, width),
         Lead::Icon(..) => 24.0,
     };
     let lead_rect = Rect::from_min_size(rect.min, vec2(lead_w, FIELD_H));
@@ -210,20 +259,25 @@ fn number_field_impl(
     let editing_id = id.with("editing");
     let mut editing: Option<String> = ui.data(|d| d.get_temp(editing_id));
     let field_resp = ui.interact(edit_rect, id.with("field"), Sense::click());
-    a11y::number(&field_resp, lead.name(), value, suffix, empty);
+    a11y::number(&field_resp, lead.name(), value, suffix, empty.text());
     a11y::ring_around(ui, rect, &field_resp);
     // The label scrubs with the pointer; the keyboard stops at the value only.
     let lead_resp = ui.interact(lead_rect, id.with("lead"), Sense::CLICK | Sense::DRAG);
     let hovered = field_resp.hovered() || lead_resp.hovered() || editing.is_some();
     ui.painter().rect_filled(rect, CornerRadius::same(5), t.field);
     if editing.is_some() {
-        ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, t.accent), StrokeKind::Inside);
+        ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, crate::theme::ACCENT), StrokeKind::Inside);
     } else if hovered {
         ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, t.field_hover_border), StrokeKind::Inside);
     }
     match lead {
         Lead::Text(s) => {
-            ui.painter().text(pos2(lead_rect.min.x + 8.0, rect.center().y), Align2::LEFT_CENTER, s, regular(11.0), t.text_secondary);
+            let galley = crate::bidi::name_galley(ui.painter(), s, regular(11.0), t.text_secondary, lead_w - 12.0);
+            // A label cut short shows whole on hover.
+            if galley.elided {
+                lead_resp.clone().on_hover_text(s);
+            }
+            ui.painter().galley(pos2(lead_rect.min.x + 8.0, rect.center().y - galley.size().y / 2.0), galley, t.text_secondary);
         }
         Lead::Icon(i, _) => {
             icons::paint(ui.painter(), Rect::from_center_size(lead_rect.center() + vec2(1.0, 0.0), vec2(14.0, 14.0)), i, t.icon_secondary)
@@ -254,10 +308,21 @@ fn number_field_impl(
     };
     // A relative edit of no single value goes to each layer's own.
     let set = |v: f64| Edit::All(FieldEdit::Set(v));
-    let typed = |text: &str| match (parse(text, suffix == "%")?, value) {
-        (Typed::Value(v), _) => Some(set(v)),
-        (Typed::Rel(r), Some(cur)) => r.apply(cur).map(set),
-        (Typed::Rel(r), None) => Some(Edit::Each(r)),
+    let typed = |text: &str| {
+        // A field where 0 is its automatic value takes the word for Auto as input too: the
+        // placeholder's own text (so it is what the field shows, in the UI's language) or the
+        // English word.
+        if let Empty::Auto = empty {
+            let t = text.trim();
+            if t == empty.text() || t.eq_ignore_ascii_case("auto") {
+                return Some(set(0.0));
+            }
+        }
+        match (parse(text, suffix == "%")?, value) {
+            (Typed::Value(v), _) => Some(set(v)),
+            (Typed::Rel(r), Some(cur)) => r.apply(cur).map(set),
+            (Typed::Rel(r), None) => Some(Edit::Each(r)),
+        }
     };
     // With the keyboard on the field (Tab) and nothing typed yet, the arrows step it as it is.
     if editing.is_none()
@@ -288,11 +353,12 @@ fn number_field_impl(
                 .frame(egui::Frame::NONE)
                 .font(regular(11.0))
                 .desired_width(edit_rect.width() - 6.0)
-                .vertical_align(egui::Align::Center);
+                .align(egui::Align2::LEFT_CENTER);
             let mut child = ui.new_child(egui::UiBuilder::new().max_rect(edit_rect.shrink2(vec2(0.0, 4.0))));
             let r = child.add(te);
             a11y::own_focus(&r);
             keep_focus(&r, started);
+            crate::shortcuts::release_field_for_save(&r);
             if ui.data(|d| d.get_temp::<bool>(id.with("selectall"))).unwrap_or(false)
                 && let Some(mut state) = egui::TextEdit::load_state(ui.ctx(), id.with("te"))
             {
@@ -344,10 +410,11 @@ fn number_field_impl(
         None => {
             let s = match value {
                 Some(v) => format!("{}{}", fmt_num(v), suffix),
-                None => empty.to_string(),
+                None => empty.text().to_string(),
             };
             let col = if value.is_some() { t.text } else { t.text_secondary };
-            ui.painter().text(pos2(edit_rect.min.x, rect.center().y), Align2::LEFT_CENTER, s, regular(11.0), col);
+            // A value too long for its room ends in "…", so a cut number never reads as another.
+            crate::bidi::paint_name(ui.painter(), pos2(edit_rect.min.x, rect.center().y), &s, regular(11.0), col, edit_rect.width());
         }
     }
     // The variable button shows while the pointer is over a bindable field.
@@ -369,6 +436,13 @@ fn number_field_impl(
     (out, bind)
 }
 
+/// The width a text label takes at the start of a field `field_w` wide: the label as drawn plus
+/// its padding, leaving the value room for a few characters (a longer label ends in an ellipsis).
+pub(crate) fn text_lead_width(ui: &Ui, label: &str, field_w: f32) -> f32 {
+    let text = ui.painter().layout_no_wrap(label.to_string(), regular(11.0), Color32::PLACEHOLDER).size().x;
+    (12.0 + text).min(field_w - 32.0).max(24.0)
+}
+
 /// A field bound to a variable: the lead, then the variable's name in a chip; the chip opens the
 /// picker and the detach button unbinds.
 /// A field showing the variable `name` bound to it in `rect`: click to change, detach to unbind.
@@ -383,8 +457,9 @@ pub fn bound_field(ui: &mut Ui, id: Id, lead: Lead, rect: Rect, name: &str) -> O
     let lead_w = match lead {
         Lead::None | Lead::Named(_) => 4.0,
         Lead::Text(s) => {
-            ui.painter().text(pos2(rect.min.x + 8.0, rect.center().y), Align2::LEFT_CENTER, s, regular(11.0), t.text_secondary);
-            (12.0 + s.chars().count() as f32 * 7.0).max(24.0)
+            let w = text_lead_width(ui, s, rect.width());
+            crate::bidi::paint_name(ui.painter(), pos2(rect.min.x + 8.0, rect.center().y), s, regular(11.0), t.text_secondary, w - 12.0);
+            w
         }
         Lead::Icon(i, _) => {
             icons::paint(ui.painter(), Rect::from_center_size(pos2(rect.min.x + 13.0, rect.center().y), vec2(14.0, 14.0)), i, t.icon_secondary);
@@ -416,18 +491,26 @@ pub fn bound_field(ui: &mut Ui, id: Id, lead: Lead, rect: Rect, name: &str) -> O
 /// A text field that commits on Enter / focus loss. Returns the new text when committed.
 pub fn text_field(ui: &mut Ui, id: Id, value: &str, width: f32, placeholder: &str) -> Option<String> {
     let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
-    text_field_in(ui, id, value, rect, placeholder, placeholder)
+    text_field_in(ui, id, value, rect, placeholder, placeholder, false)
 }
 
 /// [`text_field`] without a placeholder, named `name` for screen readers (its label is beside it).
 pub fn text_field_named(ui: &mut Ui, id: Id, value: &str, width: f32, name: &str) -> Option<String> {
     let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
-    text_field_in(ui, id, value, rect, "", name)
+    text_field_in(ui, id, value, rect, "", name, false)
+}
+
+/// [`text_field_named`] for a secret (a server key): it shows dots, typing included, and screen
+/// readers hear dots too.
+pub fn secret_field_named(ui: &mut Ui, id: Id, value: &str, width: f32, name: &str) -> Option<String> {
+    let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
+    text_field_in(ui, id, value, rect, "", name, true)
 }
 
 /// A multi-line text field across the panel (descriptions, notes) that commits when it loses
 /// focus: returns the new text then, when it changed. The draft lives only while it has focus.
 pub fn multiline_field(ui: &mut Ui, id: Id, value: &str, hint: &str, rows: usize) -> Option<String> {
+    cancel_retargeted_field_save(ui, id);
     let t = Tokens::get(ui.ctx());
     let te = id.with("te");
     let focused = ui.memory(|m| m.has_focus(te));
@@ -447,6 +530,7 @@ pub fn multiline_field(ui: &mut Ui, id: Id, value: &str, hint: &str, rows: usize
                     .desired_width(w - 12.0),
             )
         });
+        crate::shortcuts::release_field_for_save(&r.inner);
         done = r.inner.lost_focus();
     });
     if done {
@@ -464,7 +548,7 @@ pub fn multiline_field(ui: &mut Ui, id: Id, value: &str, hint: &str, rows: usize
 pub fn combo_field(ui: &mut Ui, id: Id, value: &str, width: f32, options: &[String]) -> Option<String> {
     let t = Tokens::get(ui.ctx());
     let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
-    let mut out = text_field_in(ui, id, value, rect, "", "");
+    let mut out = text_field_in(ui, id, value, rect, "", "", false);
     // The chevron sits on top of the field's right end.
     let chev = Rect::from_min_max(pos2(rect.max.x - 18.0, rect.min.y), rect.max);
     let resp = ui.interact(chev, id.with("menu"), Sense::click());
@@ -485,15 +569,17 @@ pub fn combo_field(ui: &mut Ui, id: Id, value: &str, width: f32, options: &[Stri
 }
 
 /// [`text_field`] drawn into `rect`; `name` names it for screen readers.
-fn text_field_in(ui: &mut Ui, id: Id, value: &str, rect: Rect, placeholder: &str, name: &str) -> Option<String> {
+fn text_field_in(ui: &mut Ui, id: Id, value: &str, rect: Rect, placeholder: &str, name: &str, secret: bool) -> Option<String> {
+    cancel_retargeted_field_save(ui, id);
     let t = Tokens::get(ui.ctx());
     let editing_id = id.with("editing");
     let mut editing: Option<String> = ui.data(|d| d.get_temp(editing_id));
     let resp = ui.interact(rect, id.with("click"), Sense::click());
-    a11y::text(&resp, name, value);
+    let shown = if secret { std::borrow::Cow::Owned("•".repeat(value.chars().count())) } else { std::borrow::Cow::Borrowed(value) };
+    a11y::text(&resp, name, &shown);
     ui.painter().rect_filled(rect, CornerRadius::same(5), t.field);
     if editing.is_some() {
-        ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, t.accent), StrokeKind::Inside);
+        ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, crate::theme::ACCENT), StrokeKind::Inside);
     } else if resp.hovered() {
         ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, t.field_hover_border), StrokeKind::Inside);
     }
@@ -501,14 +587,15 @@ fn text_field_in(ui: &mut Ui, id: Id, value: &str, rect: Rect, placeholder: &str
     if started {
         editing = Some(value.to_string());
         ui.memory_mut(|m| m.request_focus(id.with("te")));
-        select_all_next(ui, id.with("te"));
+        select_all_next(ui, id.with("te"), value);
     }
     let mut out = None;
     match editing {
         Some(mut text) => {
-            let r = field_editor(ui, rect, id.with("te"), &mut text, "");
+            let r = field_editor(ui, rect, id.with("te"), &mut text, "", secret);
             a11y::own_focus(&r);
             keep_focus(&r, started);
+            crate::shortcuts::release_field_for_save(&r);
             let enter = !started && ui.input(|i| i.key_pressed(egui::Key::Enter));
             let esc = ui.input(|i| i.key_pressed(egui::Key::Escape));
             if esc {
@@ -521,7 +608,7 @@ fn text_field_in(ui: &mut Ui, id: Id, value: &str, rect: Rect, placeholder: &str
             }
         }
         None => {
-            let (s, col) = if value.is_empty() { (placeholder, t.text_tertiary) } else { (value, t.text) };
+            let (s, col) = if value.is_empty() { (placeholder, t.text_tertiary) } else { (&*shown, t.text) };
             // Long text stays inside the field.
             let painter = ui.painter().with_clip_rect(rect.shrink2(vec2(8.0, 0.0)));
             painter.text(pos2(rect.min.x + 8.0, rect.center().y), Align2::LEFT_CENTER, s, regular(11.0), col);
@@ -531,14 +618,15 @@ fn text_field_in(ui: &mut Ui, id: Id, value: &str, rect: Rect, placeholder: &str
 }
 
 /// The editor inside a field's `rect`: one line of text in the field's font, without a frame of
-/// its own (the field draws it), showing `hint` while empty.
-fn field_editor(ui: &mut Ui, rect: Rect, id: Id, text: &mut String, hint: &str) -> Response {
+/// its own (the field draws it), showing `hint` while empty; `password` shows dots.
+fn field_editor(ui: &mut Ui, rect: Rect, id: Id, text: &mut String, hint: &str, password: bool) -> Response {
     let t = Tokens::get(ui.ctx());
     let mut child = ui.new_child(egui::UiBuilder::new().max_rect(rect.shrink2(vec2(8.0, 4.0))));
     let r = child.add(
         egui::TextEdit::singleline(text)
             .id(id)
             .frame(egui::Frame::NONE)
+            .password(password)
             .font(regular(11.0))
             .hint_text(egui::RichText::new(hint).font(regular(11.0)).color(t.text_tertiary))
             .desired_width(rect.width() - 16.0),
@@ -554,9 +642,9 @@ pub fn text_input(ui: &mut Ui, id: Id, text: &mut String, width: f32, hint: &str
     let t = Tokens::get(ui.ctx());
     let (rect, _) = ui.allocate_exact_size(vec2(width, FIELD_H), Sense::hover());
     ui.painter().rect_filled(rect, CornerRadius::same(5), t.field);
-    let r = field_editor(ui, rect, id, text, hint);
+    let r = field_editor(ui, rect, id, text, hint, false);
     if r.has_focus() {
-        ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, t.accent), StrokeKind::Inside);
+        ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, crate::theme::ACCENT), StrokeKind::Inside);
     } else if ui.rect_contains_pointer(rect) {
         ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, t.field_hover_border), StrokeKind::Inside);
     }
@@ -593,21 +681,33 @@ pub fn select_all_on_focus(ui: &Ui, r: &Response, text: &str) {
         ui.data_mut(|d| d.remove::<bool>(pending));
         return;
     }
-    if let Some(mut state) = egui::TextEdit::load_state(ui.ctx(), r.id) {
-        let all = egui::text::CCursorRange::two(egui::text::CCursor::new(0), egui::text::CCursor::new(text.chars().count()));
-        state.cursor.set_char_range(Some(all));
-        state.store(ui.ctx(), r.id);
-        ui.ctx().request_repaint();
+    // A key typed in the frame the edit started already replaced the selection laid beforehand.
+    if r.changed() {
+        ui.data_mut(|d| d.remove::<bool>(pending));
+        return;
     }
+    select_all(ui, r.id, text);
+    ui.ctx().request_repaint();
     if !down {
         ui.data_mut(|d| d.remove::<bool>(pending));
     }
 }
 
 /// Has [`select_all_on_focus`] select all of editor `te_id` from now on (an edit that starts
-/// with the editor already focused, which then gains no focus).
-fn select_all_next(ui: &Ui, te_id: Id) {
+/// with the editor already focused, which then gains no focus). Call it before adding the editor:
+/// the text is selected at once, so a key typed in the frame the edit starts (the frame after a
+/// double-click or F2 is often the one with the first key) replaces it.
+fn select_all_next(ui: &Ui, te_id: Id, text: &str) {
     ui.data_mut(|d| d.insert_temp(select_all_id(te_id), true));
+    select_all(ui, te_id, text);
+}
+
+/// Selects all of `text` in editor `te_id`.
+fn select_all(ui: &Ui, te_id: Id, text: &str) {
+    let mut state = egui::TextEdit::load_state(ui.ctx(), te_id).unwrap_or_default();
+    let all = egui::text::CCursorRange::two(egui::text::CCursor::new(0), egui::text::CCursor::new(text.chars().count()));
+    state.cursor.set_char_range(Some(all));
+    state.store(ui.ctx(), te_id);
 }
 
 fn select_all_id(te_id: Id) -> Id {
@@ -731,7 +831,7 @@ fn segments(
     let mut out = None;
     for (i, name) in names.iter().enumerate() {
         let r = Rect::from_min_size(pos2(rect.min.x + i as f32 * cell, rect.min.y), vec2(cell, FIELD_H));
-        let mut resp = ui.interact(r, ui.id().with(("seg", i, *name)), Sense::click());
+        let mut resp = ui.interact(r, ui.scope_id().with(("seg", i, *name)), Sense::click());
         if tips {
             resp = resp.on_hover_text(*name);
         }
@@ -769,9 +869,19 @@ pub fn disclosure(ui: &mut Ui, label: &str, open: bool) -> bool {
 /// A section header ("Fill", "Stroke"…) with optional right-side icon buttons; returns which
 /// button was clicked. `dim` greys the title (empty sections).
 pub fn section_header(ui: &mut Ui, title: &str, buttons: &[(Icon, &str)], dim: bool) -> Option<usize> {
+    section_header_resp(ui, title, buttons, dim).0
+}
+
+/// [`section_header`], with the header's own response for a right-click menu.
+pub fn section_header_resp(ui: &mut Ui, title: &str, buttons: &[(Icon, &str)], dim: bool) -> (Option<usize>, egui::Response) {
     let t = Tokens::get(ui.ctx());
     let w = ui.available_width();
-    let (rect, _) = ui.allocate_exact_size(vec2(w, 40.0), Sense::hover());
+    let (rect, resp) = ui.allocate_exact_size(vec2(w, 40.0), Sense::click());
+    // Only an empty section's header acts as its `+` button; elsewhere it is a right-click target
+    // alone, so it keeps the normal cursor.
+    if resp.hovered() && !dim {
+        ui.ctx().set_cursor_icon(egui::CursorIcon::Default);
+    }
     ui.painter().text(
         pos2(rect.min.x + PAD, rect.center().y),
         Align2::LEFT_CENTER,
@@ -783,7 +893,7 @@ pub fn section_header(ui: &mut Ui, title: &str, buttons: &[(Icon, &str)], dim: b
     let mut x = rect.max.x - 8.0;
     for (i, (icon, tip)) in buttons.iter().enumerate().rev() {
         let r = Rect::from_min_size(pos2(x - 24.0, rect.center().y - 12.0), vec2(24.0, 24.0));
-        let resp = ui.interact(r, ui.id().with(("hdr", title, i)), Sense::click()).tip(*tip);
+        let resp = ui.interact(r, ui.scope_id().with(("hdr", title, i)), Sense::click()).tip(*tip);
         if resp.hovered() {
             ui.painter().rect_filled(r, CornerRadius::same(5), t.hover);
         }
@@ -793,7 +903,11 @@ pub fn section_header(ui: &mut Ui, title: &str, buttons: &[(Icon, &str)], dim: b
         }
         x -= 24.0;
     }
-    out
+    // An empty section's whole header adds its item, not only its `+` button.
+    if out.is_none() && dim && resp.clicked() {
+        out = buttons.iter().position(|(icon, _)| *icon == Icon::Plus);
+    }
+    (out, resp)
 }
 
 /// An icon button at `rect` (hover highlight, tooltip); true when clicked.
@@ -810,7 +924,7 @@ pub fn icon_button_at(ui: &mut Ui, id: Id, rect: Rect, icon: Icon, tip: &str) ->
 /// A 24×24 icon button laid out in place; true when clicked.
 pub fn icon_button(ui: &mut Ui, icon: Icon, tip: &str) -> bool {
     let (rect, _) = ui.allocate_exact_size(vec2(24.0, 24.0), Sense::hover());
-    let id = ui.id().with(("icon_button", tip));
+    let id = ui.scope_id().with(("icon_button", tip));
     icon_button_at(ui, id, rect, icon, tip)
 }
 
@@ -851,7 +965,7 @@ pub fn insertion_line(painter: &egui::Painter, x0: f32, x1: f32, y: f32) {
 pub fn drag_ghost(ctx: &egui::Context, at: egui::Pos2, galley: std::sync::Arc<egui::Galley>) {
     let t = Tokens::get(ctx);
     ctx.set_cursor_icon(egui::CursorIcon::Grabbing);
-    let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, Id::new("drag_ghost")));
+    let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, Id::unique("drag_ghost")));
     let r = Rect::from_min_size(at + vec2(14.0, 10.0), galley.size() + vec2(16.0, 8.0));
     painter.rect_filled(r, CornerRadius::same(5), t.panel);
     painter.rect_stroke(r, CornerRadius::same(5), Stroke::new(1.0, crate::theme::ACCENT), StrokeKind::Inside);
@@ -883,10 +997,16 @@ pub fn checker(painter: &egui::Painter, rect: Rect, cell: f32) {
 
 /// A paint swatch (with checkerboard under transparent colours).
 pub fn swatch(ui: &mut Ui, paint: &figcraft_color::Paint, size: f32) -> Response {
+    swatch_named(ui, paint, size, tr("Color"))
+}
+
+/// [`swatch`] with the screen reader's name for the field it belongs to, so a panel's swatches
+/// are told apart from every other colour control (and from each other).
+pub fn swatch_named(ui: &mut Ui, paint: &figcraft_color::Paint, size: f32, label: &str) -> Response {
     let (rect, resp) = ui.allocate_exact_size(vec2(size, size), Sense::click());
     // The value is only spelled out while a screen reader reads the tree.
     let value = if a11y::active(&resp.ctx) { paint_name(paint) } else { String::new() };
-    a11y::color(&resp, tr("Color"), &value);
+    a11y::color(&resp, label, &value);
     paint_swatch(ui.painter(), rect, paint);
     resp
 }
@@ -948,7 +1068,7 @@ pub fn checkbox(ui: &mut Ui, on: bool, label: &str) -> bool {
     let b = Rect::from_min_size(pos2(rect.min.x, rect.center().y - 7.0), vec2(14.0, 14.0));
     if on {
         ui.painter().rect_filled(b, CornerRadius::same(3), t.accent);
-        icons::paint(ui.painter(), b.shrink(1.5), Icon::Check, Color32::WHITE);
+        icons::paint(ui.painter(), b.shrink(1.5), Icon::Check, t.accent_on);
     } else {
         ui.painter().rect_stroke(b, CornerRadius::same(3), Stroke::new(1.0, t.border_strong), StrokeKind::Inside);
     }
@@ -964,35 +1084,35 @@ pub fn radio(ui: &mut Ui, on: bool, label: &str) -> bool {
     let c = pos2(rect.min.x + 7.0, rect.center().y);
     if on {
         ui.painter().circle_filled(c, 7.0, t.accent);
-        ui.painter().circle_filled(c, 2.5, Color32::WHITE);
+        ui.painter().circle_filled(c, 2.5, t.accent_on);
     } else {
-        ui.painter().circle_stroke(c, 6.5, Stroke::new(1.0, if resp.hovered() { t.accent } else { t.border_strong }));
+        ui.painter().circle_stroke(c, 6.5, Stroke::new(1.0, if resp.hovered() { crate::theme::ACCENT } else { t.border_strong }));
     }
     ui.painter().text(pos2(rect.min.x + 22.0, rect.center().y), Align2::LEFT_CENTER, label, regular(11.0), t.text);
     resp.clicked()
 }
 
 /// A text button: `primary` is filled with the accent colour, otherwise outlined. A disabled
-/// button is dimmed and never reports clicks.
+/// button is grey with dim text (still readable) and never reports clicks.
 pub fn button(ui: &mut Ui, label: &str, primary: bool, enabled: bool) -> Response {
     let t = Tokens::get(ui.ctx());
     let galley = ui.painter().layout_no_wrap(label.to_string(), regular(11.0), t.text);
     let sense = if enabled { Sense::click() } else { Sense::hover() };
     let (rect, resp) = ui.allocate_exact_size(vec2(galley.size().x + 24.0, FIELD_H), sense);
     a11y::button(&resp, label);
-    let hot = enabled && resp.hovered();
-    let (fill, text) = match (primary, hot) {
-        (true, false) => (t.accent, Color32::WHITE),
-        (true, true) => (t.accent_hover, Color32::WHITE),
-        (false, false) => (Color32::TRANSPARENT, t.text),
-        (false, true) => (t.hover, t.text),
+    let (fill, text) = match (enabled, primary, resp.hovered()) {
+        (false, true, _) => (t.field, t.text_tertiary),
+        (false, false, _) => (Color32::TRANSPARENT, t.text_tertiary),
+        (true, true, false) => (t.accent, t.accent_on),
+        (true, true, true) => (t.accent_hover, t.accent_on),
+        (true, false, false) => (Color32::TRANSPARENT, t.text),
+        (true, false, true) => (t.hover, t.text),
     };
-    let dim = |c: Color32| if enabled { c } else { c.gamma_multiply(0.4) };
-    ui.painter().rect_filled(rect, CornerRadius::same(5), dim(fill));
+    ui.painter().rect_filled(rect, CornerRadius::same(5), fill);
     if !primary {
         ui.painter().rect_stroke(rect, CornerRadius::same(5), Stroke::new(1.0, t.border_strong), StrokeKind::Inside);
     }
-    ui.painter().text(rect.center(), Align2::CENTER_CENTER, label, regular(11.0), dim(text));
+    ui.painter().text(rect.center(), Align2::CENTER_CENTER, label, regular(11.0), text);
     resp
 }
 
@@ -1004,6 +1124,7 @@ pub fn label(ui: &mut Ui, text: &str, color: Color32) {
 /// Text shown in `rect` that turns into an editor on click (or when its editor has focus, e.g.
 /// after a double-click rename). Returns the new text on Enter / focus loss.
 pub fn text_field_inline(ui: &mut Ui, id: Id, value: &str, rect: Rect, font: egui::FontId) -> Option<String> {
+    cancel_retargeted_field_save(ui, id);
     let t = Tokens::get(ui.ctx());
     let te_id = id.with("te");
     let buf_id = id.with("buf");
@@ -1015,16 +1136,17 @@ pub fn text_field_inline(ui: &mut Ui, id: Id, value: &str, rect: Rect, font: egu
     if started {
         buf = Some(value.to_string());
         ui.memory_mut(|m| m.request_focus(te_id));
-        select_all_next(ui, te_id);
+        select_all_next(ui, te_id, value);
     }
     match buf {
         Some(mut text) => {
             ui.painter().rect_filled(rect.expand(2.0), CornerRadius::same(4), t.panel);
-            ui.painter().rect_stroke(rect.expand(2.0), CornerRadius::same(4), Stroke::new(1.0, t.accent), StrokeKind::Inside);
+            ui.painter().rect_stroke(rect.expand(2.0), CornerRadius::same(4), Stroke::new(1.0, crate::theme::ACCENT), StrokeKind::Inside);
             let mut child = ui.new_child(egui::UiBuilder::new().max_rect(rect));
             let r = crate::bidi::single_line(&mut child, te_id, &mut text, font, rect.width());
             a11y::own_focus(&r);
             keep_focus(&r, started);
+            crate::shortcuts::release_field_for_save(&r);
             // A rename or a hex edit starts with the whole text selected.
             select_all_on_focus(ui, &r, &text);
             // The Enter that started the edit (from the keyboard) doesn't end it.
@@ -1101,7 +1223,7 @@ pub fn sublabels(ui: &mut Ui, a: &str, b: Option<&str>) {
         let shown = elide_font(ui, text, max_w, regular(10.0));
         let at = ui.painter().text(pos2(r.min.x + x, r.max.y - 2.0), Align2::LEFT_BOTTOM, &shown, regular(10.0), t.text_secondary);
         if shown != text {
-            ui.interact(at, ui.id().with(("sublabel", i)), Sense::hover()).on_hover_text(text);
+            ui.interact(at, ui.scope_id().with(("sublabel", i)), Sense::hover()).on_hover_text(text);
         }
     }
 }
diff --git a/crates/ui-egui/src/widgets/board_picker.rs b/crates/ui-egui/src/widgets/board_picker.rs
new file mode 100644
index 00000000..6f7e509a
--- /dev/null
+++ b/crates/ui-egui/src/widgets/board_picker.rs
@@ -0,0 +1,162 @@
+//! Boards in the UI, continued: the toolbar's templates picker (a popover of the board templates,
+//! each with a picture of itself, and a table) and the table's part of the bar over the selection
+//! (add or remove a row or a column).
+
+use std::collections::HashMap;
+
+use egui::{Align2, CornerRadius, Pos2, Rect, Sense, Stroke, StrokeKind, Ui, pos2, vec2};
+use figcraft_engine::board_templates::TEMPLATES;
+use serde_json::json;
+
+use crate::FigApp;
+use crate::a11y;
+use crate::i18n::tr;
+use crate::icons::{self, Icon};
+use crate::theme::{Tokens, regular};
+use crate::toolbar::tool_cell;
+
+/// The picker's key while it is open (`app.ui.tool_flyout`).
+const KEY: &str = "board_templates";
+const CARD: egui::Vec2 = vec2(136.0, 104.0);
+const PICTURE_H: f32 = 76.0;
+const COLUMNS: usize = 3;
+const PAD: f32 = 10.0;
+const GAP: f32 = 8.0;
+const TITLE_H: f32 = 26.0;
+
+/// The templates button at `at` (its left edge, the toolbar's middle) and, while open, its picker
+/// above the toolbar (whose top is `top`). Where the next button starts.
+pub(crate) fn button(app: &mut FigApp, ui: &mut Ui, at: Pos2, top: f32, t: &Tokens) -> f32 {
+    let r = Rect::from_min_size(pos2(at.x, at.y - 16.0), vec2(32.0, 32.0));
+    let open = app.ui.tool_flyout == Some(KEY);
+    let resp = tool_cell(ui, t, r, "board_templates", Icon::Templates, open, tr("Templates"));
+    if open {
+        a11y::popup(&mut app.ui.nav, resp.id, area_id());
+    }
+    if resp.clicked() {
+        app.ui.tool_flyout = if open { None } else { Some(KEY) };
+    }
+    if app.ui.tool_flyout == Some(KEY) {
+        picker(app, ui, r, top - 8.0, t);
+    }
+    r.max.x + 4.0
+}
+
+fn area_id() -> egui::Id {
+    egui::Id::unique("board_templates_area")
+}
+
+/// A template's picture: the template built on a board of its own and drawn small.
+fn picture(ctx: &egui::Context, id: &str) -> Option<egui::TextureHandle> {
+    let doc = figcraft_engine::board_templates::preview(id).ok()?;
+    let layers = doc.node(doc.first_page()?)?.children.clone();
+    let b = layers.iter().filter_map(|l| figcraft_render::export_bounds(&doc, *l)).reduce(|a, b| a.union(b))?;
+    if !(b.width() > 0.0 && b.height() > 0.0) {
+        return None;
+    }
+    let fit = (f64::from(CARD.x - 16.0) / b.width()).min(f64::from(PICTURE_H - 12.0) / b.height());
+    let pix = figcraft_render::render_area(&doc, &layers, b, (fit * f64::from(ctx.pixels_per_point())).min(1.0))?;
+    let image = crate::render_worker::screen_image(&pix, doc.color_profile);
+    Some(ctx.load_texture(format!("board-template-{id}"), image, egui::TextureOptions::LINEAR))
+}
+
+/// The templates' pictures, drawn the first time the picker opens.
+#[derive(Clone, Default)]
+struct Pictures(HashMap<&'static str, Option<egui::TextureHandle>>);
+
+/// The picker: a card for each template and one for a table, its bottom at `bottom`, from the
+/// button `anchor`'s right edge leftwards (inside the canvas).
+fn picker(app: &mut FigApp, ui: &mut Ui, anchor: Rect, bottom: f32, t: &Tokens) {
+    let ctx = ui.ctx().clone();
+    let mut pictures: Pictures = ctx.data(|d| d.get_temp(area_id())).unwrap_or_default();
+    for tpl in TEMPLATES {
+        pictures.0.entry(tpl.id).or_insert_with(|| picture(&ctx, tpl.id));
+    }
+    let count = TEMPLATES.len() + 1;
+    let rows = count.div_ceil(COLUMNS);
+    let size = vec2(COLUMNS as f32 * (CARD.x + GAP) - GAP + 2.0 * PAD, TITLE_H + rows as f32 * (CARD.y + GAP) - GAP + 2.0 * PAD);
+    let canvas = app.canvas.rect;
+    let x = (anchor.max.x - size.x).min(canvas.max.x - size.x - 8.0).max(canvas.min.x + 8.0);
+    let mut chosen = None;
+    egui::Area::new(area_id()).fixed_pos(pos2(x, bottom - size.y)).order(egui::Order::Foreground).show(&ctx, |ui| {
+        let (rect, _) = ui.allocate_exact_size(size, Sense::hover());
+        a11y::container_bounds(ui, rect);
+        let p = ui.painter();
+        p.rect_filled(rect, CornerRadius::same(13), t.menu);
+        p.text(pos2(rect.min.x + PAD + 2.0, rect.min.y + PAD + 8.0), Align2::LEFT_CENTER, tr("Templates"), crate::theme::semibold(12.0), t.menu_text);
+        for i in 0..count {
+            let (col, row) = (i % COLUMNS, i / COLUMNS);
+            let at = pos2(rect.min.x + PAD + col as f32 * (CARD.x + GAP), rect.min.y + PAD + TITLE_H + row as f32 * (CARD.y + GAP));
+            let r = Rect::from_min_size(at, CARD);
+            let tpl = TEMPLATES.get(i);
+            let label = tpl.map_or(tr("Table"), |tpl| tr(tpl.name));
+            let resp = ui.interact(r, ui.scope_id().with(("board_template", i)), Sense::click());
+            a11y::menu_item(&resp, label, "", None);
+            a11y::own_focus(&resp);
+            let p = ui.painter();
+            if resp.hovered() || resp.has_focus() {
+                p.rect_filled(r, CornerRadius::same(8), t.menu_hover);
+            }
+            let pic = Rect::from_min_size(r.min + vec2(4.0, 4.0), vec2(CARD.x - 8.0, PICTURE_H));
+            p.rect_filled(pic, CornerRadius::same(6), crate::theme::c32(figcraft_doc::BOARD_PAGE));
+            p.rect_stroke(pic, CornerRadius::same(6), Stroke::new(1.0, t.border), StrokeKind::Inside);
+            match tpl.and_then(|tpl| pictures.0.get(tpl.id)).and_then(Option::as_ref) {
+                Some(tex) => {
+                    let s = tex.size_vec2() / ctx.pixels_per_point();
+                    let k = ((pic.width() - 12.0) / s.x).min((pic.height() - 12.0) / s.y).min(1.0);
+                    p.image(
+                        tex.id(),
+                        Rect::from_center_size(pic.center(), s * k),
+                        Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)),
+                        egui::Color32::WHITE,
+                    );
+                }
+                // The table (and a template whose picture couldn't be drawn): its mark.
+                None => icons::paint(
+                    p,
+                    Rect::from_center_size(pic.center(), vec2(32.0, 32.0)),
+                    if tpl.is_some() { Icon::Templates } else { Icon::Table },
+                    egui::Color32::from_gray(90),
+                ),
+            }
+            p.text(pos2(r.min.x + 6.0, pic.max.y + 13.0), Align2::LEFT_CENTER, label, regular(12.0), t.menu_text);
+            if resp.clicked() {
+                chosen = Some(i);
+            }
+        }
+    });
+    ctx.data_mut(|d| d.insert_temp(area_id(), pictures));
+    if ui.input(|i| i.key_pressed(egui::Key::Escape)) {
+        app.ui.tool_flyout = None;
+    }
+    if let Some(i) = chosen {
+        let (cmd, params) = match TEMPLATES.get(i) {
+            Some(tpl) => ("board.template", json!({"name": tpl.id})),
+            None => ("board.table", json!({})),
+        };
+        app.run(cmd, params);
+        app.ui.tool_flyout = None;
+    }
+}
+
+/// The table's part of the bar over the selection from `x`: add a row or a column at the end,
+/// remove the last row or column. Where the next part starts.
+pub(crate) fn table_part(app: &mut FigApp, ui: &mut Ui, mut x: f32, cy: f32, t: &Tokens) -> f32 {
+    let cells = [
+        (Icon::AddRow, tr("Add row"), "addRow"),
+        (Icon::RemoveRow, tr("Remove row"), "removeRow"),
+        (Icon::AddColumn, tr("Add column"), "addColumn"),
+        (Icon::RemoveColumn, tr("Remove column"), "removeColumn"),
+    ];
+    for (icon, tip, action) in cells {
+        let r = Rect::from_center_size(pos2(x + 14.0, cy), vec2(28.0, 28.0));
+        if tool_cell(ui, t, r, ("bb_table", action), icon, false, tip).clicked() {
+            app.run("board.tableEdit", json!({"action": action}));
+        }
+        x += 30.0;
+    }
+    crate::board_bar::divider(ui, t, x, cy)
+}
+
+/// The table part's width (with the gap after it).
+pub(crate) const TABLE_PART_W: f32 = 4.0 * 30.0 + 8.0;
diff --git a/crates/ui-egui/src/colorpicker.rs b/crates/ui-egui/src/widgets/colorpicker.rs
similarity index 80%
rename from crates/ui-egui/src/colorpicker.rs
rename to crates/ui-egui/src/widgets/colorpicker.rs
index bb18a0b2..accb70fd 100644
--- a/crates/ui-egui/src/colorpicker.rs
+++ b/crates/ui-egui/src/widgets/colorpicker.rs
@@ -18,6 +18,11 @@ use crate::widgets;
 #[derive(Clone, Debug, PartialEq)]
 pub enum PickerTarget {
     PageBackground,
+    SelectionColor {
+        targets: Vec<figcraft_engine::selection_colors::PaintTarget>,
+        selection: Vec<NodeId>,
+        document: u64,
+    },
     Paint {
         fills: bool,
         index: usize,
@@ -72,6 +77,13 @@ pub fn range_fills(doc: &figcraft_doc::Document, id: NodeId, start: usize) -> Op
 fn current_paint(app: &FigApp, target: &PickerTarget) -> Option<Paint> {
     let doc = app.session.doc().ok()?;
     match target {
+        PickerTarget::SelectionColor { targets, selection, document } => {
+            let ds = app.session.ds().ok()?;
+            if ds.uid != *document || ds.selection != *selection {
+                return None;
+            }
+            targets.first()?.paint(doc)
+        }
         PickerTarget::PageBackground => match &doc.node(app.session.page().ok()?)?.kind {
             NodeKind::Page { background, .. } => Some(Paint::solid(*background)),
             _ => None,
@@ -108,8 +120,7 @@ fn current_paint(app: &FigApp, target: &PickerTarget) -> Option<Paint> {
 /// Write `paint` to the target. `live` edits are part of an ongoing drag.
 fn write(app: &mut FigApp, target: &PickerTarget, paint: &Paint, live: bool) {
     if let PickerTarget::PluginField { plugin, control, .. } = target {
-        let c = paint.solid_color().unwrap_or(Color::BLACK);
-        let hex = c.with_alpha(c.a * paint.opacity).to_css_hex();
+        let hex = paint.solid_color().unwrap_or(Color::BLACK).to_css_hex();
         let (plugin, control) = (plugin.clone(), control.clone());
         if !live {
             crate::plugins_ui::set_field(app, &plugin, &control, &hex);
@@ -121,6 +132,7 @@ fn write(app: &mut FigApp, target: &PickerTarget, paint: &Paint, live: bool) {
         let _ = app.session.begin_interaction("Color");
     }
     let r = match target {
+        PickerTarget::SelectionColor { targets, .. } => app.session.execute("selection.setPaint", &json!({"targets": targets, "paint": paint})),
         PickerTarget::PageBackground => {
             let c = paint.solid_color().unwrap_or(Color::DEFAULT_PAGE);
             app.session.execute("page.setBackground", &json!({"color": c.to_css_hex()}))
@@ -140,7 +152,7 @@ fn write(app: &mut FigApp, target: &PickerTarget, paint: &Paint, live: bool) {
         }
         PickerTarget::Variable { id, mode } => {
             let c = paint.solid_color().unwrap_or(Color::BLACK);
-            app.session.execute("variable.set", &json!({"variable": id, "mode": mode, "value": c.with_alpha(c.a * paint.opacity).to_css_hex()}))
+            app.session.execute("variable.set", &json!({"variable": id, "mode": mode, "value": c.to_css_hex()}))
         }
         PickerTarget::PluginField { .. } => return,
         PickerTarget::Style { id, index } => {
@@ -187,7 +199,7 @@ fn finish(app: &mut FigApp) {
 
 /// The selected gradient stop in the picker (shared with the on-canvas stops).
 pub fn stop_id() -> Id {
-    Id::new("cp_stop")
+    Id::unique("cp_stop")
 }
 
 /// Apply a swatch colour: a solid paint's colour, or the selected gradient stop's.
@@ -212,7 +224,7 @@ fn set_color(app: &mut FigApp, target: &PickerTarget, paint: &mut Paint, c: Colo
 fn page_colors(app: &FigApp, ui: &Ui) -> Vec<Color> {
     let Ok(ds) = app.session.ds() else { return vec![] };
     let key = (std::sync::Arc::as_ptr(&ds.doc) as usize, ds.page);
-    let cache_id = Id::new("cp_doc_colors");
+    let cache_id = Id::unique("cp_doc_colors");
     if let Some((k, colors)) = ui.data(|d| d.get_temp::<((usize, figcraft_doc::NodeId), Vec<Color>)>(cache_id))
         && k == key
     {
@@ -224,19 +236,21 @@ fn page_colors(app: &FigApp, ui: &Ui) -> Vec<Color> {
 }
 
 /// Colour models the value row can show.
-const MODELS: [&str; 5] = ["Hex", "RGB", "HSL", "HSB", "CSS"];
+const MODELS: [&str; 7] = ["Hex", "RGB", "HSL", "HSB", "LCH", "OKLCH", "CSS"];
 
 /// The model dropdown with its fields and the alpha field. Returns a new colour and whether the
 /// edit is done (false while a field is being scrubbed).
 fn model_fields(ui: &mut Ui, c: Color) -> Option<(Color, bool)> {
-    let model_id = Id::new("cp_model");
+    let model_id = Id::unique("cp_model");
     let model: usize = ui.data(|d| d.get_temp(model_id)).unwrap_or(0).min(MODELS.len() - 1);
     let mut out: Option<Color> = None;
     let mut done = true;
     ui.horizontal(|ui| {
         ui.add_space(16.0);
         ui.spacing_mut().item_spacing.x = 4.0;
-        let resp = widgets::dropdown(ui, MODELS.get(model).copied().unwrap_or("Hex"), 52.0, None);
+        // "LCH" and "OKLCH" need a wider dropdown; their fields and alpha give up the room.
+        let wide = matches!(MODELS.get(model).copied(), Some("LCH" | "OKLCH"));
+        let resp = widgets::dropdown(ui, MODELS.get(model).copied().unwrap_or("Hex"), if wide { 66.0 } else { 52.0 }, None);
         crate::right::menu_popup(&resp).show(|ui| {
             for (i, m) in MODELS.iter().enumerate() {
                 if crate::right::menu_item(ui, m, "") {
@@ -245,25 +259,22 @@ fn model_fields(ui: &mut Ui, c: Color) -> Option<(Color, bool)> {
                 }
             }
         });
-        let num = |ui: &mut Ui, id: &str, v: f64, w: f32| match widgets::number_field(
-            ui,
-            Id::new(("cp_f", id)),
-            widgets::Lead::None,
-            Some(v.round()),
-            "",
-            w,
-            1.0,
-        ) {
-            Some(widgets::FieldEdit::Set(x)) => Some((x, true)),
-            Some(widgets::FieldEdit::Scrub(x, end)) => Some((x, end)),
-            None => None,
+        // `decimals` places shown; `step` is what a scrub or arrow moves by.
+        let num = |ui: &mut Ui, id: &str, v: f64, w: f32, decimals: i32, step: f64| {
+            let p = 10f64.powi(decimals);
+            match widgets::number_field(ui, Id::unique(("cp_f", id)), widgets::Lead::None, Some((v * p).round() / p), "", w, step) {
+                Some(widgets::FieldEdit::Set(x)) => Some((x, true)),
+                Some(widgets::FieldEdit::Scrub(x, end)) => Some((x, end)),
+                None => None,
+            }
         };
-        match MODELS.get(model).copied().unwrap_or("Hex") {
+        let name = MODELS.get(model).copied().unwrap_or("Hex");
+        match name {
             "RGB" => {
                 let [r, g, b, _] = c.to_rgba8();
                 let vals = [f64::from(r), f64::from(g), f64::from(b)];
                 for (k, v) in vals.iter().enumerate() {
-                    if let Some((x, end)) = num(ui, ["r", "g", "b"][k.min(2)], *v, 31.0) {
+                    if let Some((x, end)) = num(ui, ["r", "g", "b"][k.min(2)], *v, 31.0, 0, 1.0) {
                         done = end;
                         let mut rgb = vals;
                         if let Some(slot) = rgb.get_mut(k) {
@@ -273,43 +284,53 @@ fn model_fields(ui: &mut Ui, c: Color) -> Option<(Color, bool)> {
                     }
                 }
             }
-            "HSL" | "HSB" => {
-                let hsl = model == 2;
-                let (h, s2, l2) = if hsl {
-                    let x = figcraft_color::Hsl::from_color(c);
-                    (x.h, x.s, x.l)
-                } else {
-                    let x = Hsb::from_color(c);
-                    (x.h, x.s, x.b)
-                };
-                let vals = [f64::from(h), f64::from(s2) * 100.0, f64::from(l2) * 100.0];
-                for (k, v) in vals.iter().enumerate() {
-                    if let Some((x, end)) = num(ui, ["h", "s", "l"][k.min(2)], *v, 31.0) {
+            "HSL" | "HSB" | "LCH" | "OKLCH" => {
+                let Some(spec) = Polar::of(name) else { return };
+                // The values last shown or typed stay while the colour is theirs: a chroma lowered to
+                // fit sRGB, or a hue on a grey, isn't read back from the colour on the next frame.
+                let kept_id = Id::unique("cp_polar");
+                let rgba = c.to_rgba8();
+                let vals = ui
+                    .data(|d| d.get_temp::<(&'static str, [f64; 3], [u8; 4])>(kept_id))
+                    .filter(|(m, _, k)| *m == name && *k == rgba)
+                    .map_or_else(|| spec.values(c), |(_, v, _)| v);
+                let mut kept = vals;
+                for (k, (v, f)) in vals.iter().zip(spec.fields()).enumerate() {
+                    let w = if !wide {
+                        31.0
+                    } else if f.decimals > 0 {
+                        30.0
+                    } else {
+                        27.0
+                    };
+                    if let Some((x, end)) = num(ui, f.id, *v, w, f.decimals, f.step) {
                         done = end;
                         let mut v3 = vals;
                         if let Some(slot) = v3.get_mut(k) {
-                            *slot = if k == 0 { x.rem_euclid(360.0) } else { x.clamp(0.0, 100.0) };
+                            *slot = if f.wraps { x.rem_euclid(360.0) } else { x.clamp(0.0, f.max) };
                         }
-                        let (h, a, b) = (v3[0] as f32, v3[1] as f32 / 100.0, v3[2] as f32 / 100.0);
-                        let col = if hsl { figcraft_color::Hsl { h, s: a, l: b }.to_color() } else { Hsb { h, s: a, b }.to_color() };
-                        out = Some(col.with_alpha(c.a));
+                        let col = spec.color(v3).with_alpha(c.a);
+                        kept = v3;
+                        out = Some(col);
                     }
                 }
+                let shown = out.unwrap_or(c).to_rgba8();
+                ui.data_mut(|d| d.insert_temp(kept_id, (name, kept, shown)));
             }
             "CSS" => {
-                if let Some(text) = widgets::text_field(ui, Id::new("cp_css"), &c.to_css(), 152.0, "") {
+                if let Some(text) = widgets::text_field(ui, Id::unique("cp_css"), &c.to_css(), 152.0, "") {
                     out = Color::parse_css(&text);
                 }
             }
             _ => {
-                if let Some(h) = widgets::text_field(ui, Id::new("cp_hex"), &c.to_hex(), 101.0, "") {
+                if let Some(h) = widgets::text_field(ui, Id::unique("cp_hex"), &c.to_hex(), 101.0, "") {
                     out = Color::from_hex_or_name(&h).map(|h| h.with_alpha(if h.a < 1.0 { h.a } else { c.a }));
                 }
             }
         }
         if MODELS.get(model) != Some(&"CSS") {
             let alpha = Some((f64::from(out.unwrap_or(c).a) * 100.0).round());
-            let edit = match widgets::number_field(ui, Id::new("cp_a"), widgets::Lead::None, alpha, "%", 44.0, 1.0) {
+            let edit = match widgets::number_field(ui, Id::unique("cp_a"), widgets::Lead::None, alpha, "%", if wide { 40.0 } else { 44.0 }, 1.0) {
                 Some(widgets::FieldEdit::Set(v)) => Some((v, true)),
                 Some(widgets::FieldEdit::Scrub(v, end)) => Some((v, end)),
                 None => None,
@@ -323,10 +344,99 @@ fn model_fields(ui: &mut Ui, c: Color) -> Option<(Color, bool)> {
     out.map(|c| (c, done))
 }
 
+/// One field of a [`Polar`] model: its id, decimals shown, scrub/arrow step and range (0..=max,
+/// or a hue that wraps at 360).
+struct PolarField {
+    id: &'static str,
+    decimals: i32,
+    step: f64,
+    max: f64,
+    wraps: bool,
+}
+
+const fn field(id: &'static str, decimals: i32, step: f64, max: f64) -> PolarField {
+    PolarField { id, decimals, step, max, wraps: false }
+}
+
+const fn hue(id: &'static str) -> PolarField {
+    PolarField { id, decimals: 0, step: 1.0, max: 360.0, wraps: true }
+}
+
+/// The three-field models: HSL, HSB, LCH and OKLCH, shown in their CSS units (percentages for
+/// saturation and lightness, OKLCH lightness in percent).
+#[derive(Clone, Copy)]
+enum Polar {
+    Hsl,
+    Hsb,
+    Lch,
+    Oklch,
+}
+
+impl Polar {
+    fn of(name: &str) -> Option<Self> {
+        Some(match name {
+            "HSL" => Self::Hsl,
+            "HSB" => Self::Hsb,
+            "LCH" => Self::Lch,
+            "OKLCH" => Self::Oklch,
+            _ => return None,
+        })
+    }
+
+    const HSL_FIELDS: [PolarField; 3] = [hue("hsl_h"), field("hsl_s", 0, 1.0, 100.0), field("hsl_l", 0, 1.0, 100.0)];
+    const HSB_FIELDS: [PolarField; 3] = [hue("hsb_h"), field("hsb_s", 0, 1.0, 100.0), field("hsb_b", 0, 1.0, 100.0)];
+    const LCH_FIELDS: [PolarField; 3] = [field("lch_l", 0, 1.0, 100.0), field("lch_c", 0, 1.0, 230.0), hue("lch_h")];
+    const OKLCH_FIELDS: [PolarField; 3] = [field("oklch_l", 0, 1.0, 100.0), field("oklch_c", 2, 0.01, 0.5), hue("oklch_h")];
+
+    const fn fields(self) -> &'static [PolarField; 3] {
+        match self {
+            Self::Hsl => &Self::HSL_FIELDS,
+            Self::Hsb => &Self::HSB_FIELDS,
+            Self::Lch => &Self::LCH_FIELDS,
+            Self::Oklch => &Self::OKLCH_FIELDS,
+        }
+    }
+
+    fn values(self, c: Color) -> [f64; 3] {
+        let v = match self {
+            Self::Hsl => {
+                let x = figcraft_color::Hsl::from_color(c);
+                [x.h, x.s * 100.0, x.l * 100.0]
+            }
+            Self::Hsb => {
+                let x = Hsb::from_color(c);
+                [x.h, x.s * 100.0, x.b * 100.0]
+            }
+            Self::Lch => {
+                let x = figcraft_color::Lch::from_color(c);
+                [x.l, x.c, x.h]
+            }
+            Self::Oklch => {
+                let x = figcraft_color::Oklch::from_color(c);
+                [x.l * 100.0, x.c, x.h]
+            }
+        };
+        v.map(f64::from)
+    }
+
+    /// Opaque.
+    fn color(self, v: [f64; 3]) -> Color {
+        let [a, b, d] = v.map(|v| v as f32);
+        match self {
+            Self::Hsl => figcraft_color::Hsl { h: a, s: b / 100.0, l: d / 100.0 }.to_color(),
+            Self::Hsb => Hsb { h: a, s: b / 100.0, b: d / 100.0 }.to_color(),
+            Self::Lch => figcraft_color::Lch { l: a, c: b, h: d }.to_color(),
+            Self::Oklch => figcraft_color::Oklch { l: a / 100.0, c: b, h: d }.to_color(),
+        }
+    }
+}
+
 fn hue_color(ctx: &egui::Context, h: f32) -> Color32 {
     doc_c32(ctx, Hsb { h, s: 1.0, b: 1.0 }.to_color())
 }
 
+/// Draw the saturation/value square and its knob, updating `hsb.s` and `hsb.b` on click or
+/// drag; returns `(changed, done)`.
 fn sv_square(ui: &mut Ui, rect: Rect, hsb: &mut Hsb) -> (bool, bool) {
     // White → hue horizontally, then transparent → black vertically.
     let mut m = Mesh::default();
@@ -350,7 +460,7 @@ fn sv_square(ui: &mut Ui, rect: Rect, hsb: &mut Hsb) -> (bool, bool) {
     m2.add_triangle(0, 1, 2);
     m2.add_triangle(0, 2, 3);
     ui.painter().add(m2);
-    let resp = ui.interact(rect, Id::new("cp_sv"), Sense::click_and_drag());
+    let resp = ui.interact(rect, Id::unique("cp_sv"), Sense::click_and_drag());
     let mut changed = false;
     if (resp.dragged() || resp.clicked() || resp.drag_started())
         && let Some(p) = resp.interact_pointer_pos()
@@ -365,6 +475,8 @@ fn sv_square(ui: &mut Ui, rect: Rect, hsb: &mut Hsb) -> (bool, bool) {
     (changed, resp.drag_stopped() || resp.clicked())
 }
 
+/// Draw the hue gradient and knob, updating `hsb.h` clamped below 360; returns
+/// `(changed, done)`.
 fn hue_slider(ui: &mut Ui, rect: Rect, hsb: &mut Hsb) -> (bool, bool) {
     let n = 12;
     let mut m = Mesh::default();
@@ -381,7 +493,7 @@ fn hue_slider(ui: &mut Ui, rect: Rect, hsb: &mut Hsb) -> (bool, bool) {
         }
     }
     ui.painter().add(m);
-    slider_knob(ui, rect, hsb.h / 360.0, Id::new("cp_hue"))
+    slider_knob(ui, rect, hsb.h / 360.0, Id::unique("cp_hue"))
         .map(|(t, done)| {
             hsb.h = (t * 360.0).clamp(0.0, 359.9);
             (true, done)
@@ -405,6 +517,8 @@ fn slider_knob(ui: &mut Ui, rect: Rect, t: f32, id: Id) -> Option<(f32, bool)> {
     None
 }
 
+/// Draw the checkerboard and transparent-to-opaque alpha gradient with a knob; returns the
+/// new alpha and done state, or `None` when the slider is not interacting.
 fn alpha_slider(ui: &mut Ui, rect: Rect, color: Color) -> Option<(f32, bool)> {
     widgets::checker(&ui.painter().with_clip_rect(rect), rect, rect.height() / 2.0);
     let mut m = Mesh::default();
@@ -420,11 +534,27 @@ fn alpha_slider(ui: &mut Ui, rect: Rect, color: Color) -> Option<(f32, bool)> {
     m.add_triangle(0, 1, 2);
     m.add_triangle(0, 2, 3);
     ui.painter().add(m);
-    slider_knob(ui, rect, color.a, Id::new("cp_alpha"))
+    slider_knob(ui, rect, color.a, Id::unique("cp_alpha"))
 }
 
+/// The colour picker window's area id. A fixed id (not `Window::new`'s, which egui keys by
+/// `Id::unique(Some(title))`) so the style picker can tell a click inside the picker from one outside.
+pub fn window_id() -> Id {
+    Id::unique("color_picker")
+}
+
+/// Draw the colour picker for the current target: close it when there is no target or the
+/// target's selection no longer matches, otherwise apply eyedropper, paint-kind, colour and
+/// gradient-stop edits live, positioned beside a plugin field when applicable.
 pub fn show(app: &mut FigApp, ctx: &egui::Context) {
-    let Some(target) = app.ui.picker.clone() else { return };
+    let Some(target) = app.ui.picker.clone() else {
+        // A colour sampled for a picker that has closed has no paint to go to.
+        app.session.tool.picked = None;
+        if app.session.tool.pick_only {
+            app.run("tool.move", json!({}));
+        }
+        return;
+    };
     // A layer's picker belongs to the selection it was opened for: once that changes, close it
     // rather than keep editing layers that are no longer selected.
     let stale = match &target {
@@ -434,6 +564,9 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
     };
     let current = if stale { None } else { current_paint(app, &target) };
     let Some(mut paint) = current else {
+        if matches!(target, PickerTarget::SelectionColor { .. }) {
+            finish(app);
+        }
         app.ui.picker = None;
         return;
     };
@@ -448,6 +581,9 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
     let mut open = true;
     let mut close_now = false;
     egui::Window::new("color_picker")
+        // A fixed area id so the style picker can tell a click in here from a click outside
+        // (`Window::new` alone would key the area by `Id::unique(Some(title))`).
+        .id(window_id())
         .title_bar(false)
         .fixed_pos(pos)
         .fixed_size(vec2(240.0, 0.0))
@@ -455,11 +591,15 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
         .open(&mut open)
         .show(ctx, |ui| {
             ui.spacing_mut().item_spacing = vec2(8.0, 8.0);
+            // The eyedropper's colour goes to this picker's paint (a stroke, an effect, a gradient stop...).
+            if let Some(c) = app.session.tool.picked.take() {
+                set_color(app, &target, &mut paint, c, stop_id(), ui);
+            }
             // Header.
             let (hr, _) = ui.allocate_exact_size(vec2(240.0, 40.0), Sense::hover());
             ui.painter().text(pos2(hr.min.x + 16.0, hr.center().y), Align2::LEFT_CENTER, tr("Custom"), semibold(11.0), t.text);
             let cr = Rect::from_center_size(pos2(hr.max.x - 20.0, hr.center().y), vec2(24.0, 24.0));
-            let cresp = ui.interact(cr, Id::new("cp_close"), Sense::click());
+            let cresp = ui.interact(cr, Id::unique("cp_close"), Sense::click());
             icons::paint(ui.painter(), cr.shrink(6.0), Icon::Close, t.icon);
             if cresp.clicked() {
                 close_now = true;
@@ -500,7 +640,7 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
                                 image_pending = true;
                                 let target = target.clone();
                                 app.pick_open(tr("Choose image"), &["png", "jpg", "jpeg", "webp", "gif", "tif", "tiff"], move |app, p| {
-                                    let Ok(bytes) = std::fs::read(&p) else { return };
+                                    let Ok(bytes) = figcraft_engine::file_access::read(&p) else { return };
                                     let Some(hash) = app.session.doc_mut().ok().and_then(|d| figcraft_format_add(d, bytes)) else { return };
                                     if let Some(mut paint) = current_paint(app, &target) {
                                         paint.kind = Paint::image(hash, ImageScaleMode::Fill).kind;
@@ -570,11 +710,11 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
                 let mut changed = false;
                 let mut done = false;
                 // The bar first, so the stops on it take their own clicks.
-                let bresp = ui.interact(bar, Id::new("cp_bar"), Sense::click());
+                let bresp = ui.interact(bar, Id::unique("cp_bar"), Sense::click());
                 for (i, s) in g.stops.clone().iter().enumerate() {
                     let x = bar.min.x + s.position * bar.width();
                     let r = Rect::from_center_size(pos2(x, bar.center().y), vec2(12.0, 18.0));
-                    let resp = ui.interact(r, Id::new(("cp_stopk", i)), Sense::click_and_drag());
+                    let resp = ui.interact(r, Id::unique(("cp_stopk", i)), Sense::click_and_drag());
                     ui.painter().rect_filled(r, CornerRadius::same(3), doc_c32(ui.ctx(), s.color.with_alpha(1.0)));
                     ui.painter().rect_stroke(
                         r,
@@ -738,7 +878,7 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
             }
             if let Some(color) = edit_color {
                 let mut hsb = ui
-                    .data(|d| d.get_temp::<(f32, f32, f32, [u8; 4])>(Id::new("cp_hsb")))
+                    .data(|d| d.get_temp::<(f32, f32, f32, [u8; 4])>(Id::unique("cp_hsb")))
                     .filter(|(_, _, _, rgba)| *rgba == color.to_rgba8())
                     .map(|(h, s, b, _)| Hsb { h, s, b })
                     .unwrap_or_else(|| Hsb::from_color(color));
@@ -757,8 +897,7 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
                 )
                 .clicked()
                 {
-                    app.ui.picker = None;
-                    app.run("edit.pickColor", json!({}));
+                    app.run("edit.pickColor", json!({"apply": false}));
                     return;
                 }
                 let (c2, d2) = hue_slider(ui, hr, &mut hsb);
@@ -776,14 +915,14 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
                     changed = true;
                     done |= d;
                 }
-                // Colour model fields (Hex, RGB, HSL, HSB or CSS) + alpha.
+                // Colour model fields (Hex, RGB, HSL, HSB, LCH, OKLCH or CSS) + alpha.
                 if let Some((c, d)) = model_fields(ui, nc) {
                     nc = c;
                     hsb = Hsb::from_color(nc);
                     changed = true;
                     done |= d;
                 }
-                ui.data_mut(|d| d.insert_temp(Id::new("cp_hsb"), (hsb.h, hsb.s, hsb.b, nc.to_rgba8())));
+                ui.data_mut(|d| d.insert_temp(Id::unique("cp_hsb"), (hsb.h, hsb.s, hsb.b, nc.to_rgba8())));
                 // A Display P3 colour sRGB can't show: the canvas (sRGB) shows the nearest one.
                 if app.session.doc().is_ok_and(|d| d.color_profile.conversion_to(figcraft_color::ColorProfile::Srgb).clips(nc)) {
                     gamut_warning(ui, &t);
@@ -872,6 +1011,7 @@ fn pattern_sources(app: &FigApp, target: &PickerTarget) -> Vec<(NodeId, String)>
     let Ok(doc) = app.session.doc() else { return Vec::new() };
     let painted = match target {
         PickerTarget::Paint { ids, .. } => ids.clone(),
+        PickerTarget::SelectionColor { targets, .. } => targets.iter().map(|t| t.id).collect(),
         PickerTarget::TextRange { id, .. } => vec![*id],
         _ => Vec::new(),
     };
@@ -948,7 +1088,7 @@ fn pattern_controls(app: &mut FigApp, ui: &mut Ui, target: &PickerTarget, paint:
         ui.add_space(16.0);
         let field = |ui: &mut Ui, key: &str, lead: Lead, value: f64, suffix: &str| match widgets::number_field(
             ui,
-            Id::new(key),
+            Id::unique(key),
             lead,
             Some(value),
             suffix,
@@ -994,10 +1134,10 @@ fn saved_preset_row(ui: &mut Ui, name: &str) -> Option<PresetAction> {
     let w = ui.available_width().max(180.0);
     let (r, resp) = ui.allocate_exact_size(vec2(w, 26.0), Sense::click());
     let del = Rect::from_center_size(pos2(r.max.x - 14.0, r.center().y), vec2(20.0, 20.0));
-    let del_resp = ui.interact(del, ui.id().with(("cp_preset_del", name)), Sense::click()).tip(tr("Delete preset"));
+    let del_resp = ui.interact(del, ui.scope_id().with(("cp_preset_del", name)), Sense::click()).tip(tr("Delete preset"));
     let hot = resp.hovered() || del_resp.hovered();
     if hot {
-        ui.painter().rect_filled(r, CornerRadius::same(5), crate::theme::ACCENT);
+        ui.painter().rect_filled(r, CornerRadius::same(5), t.menu_hover);
     }
     let col = if hot { Color32::WHITE } else { t.text };
     ui.painter().text(pos2(r.min.x + 8.0, r.center().y), Align2::LEFT_CENTER, name, regular(11.5), col);
@@ -1026,7 +1166,7 @@ fn image_presets(app: &mut FigApp, ui: &mut Ui, target: &PickerTarget, paint: &m
         .find(|(_, f)| *f == filters)
         .map(|(name, _)| name)
         .unwrap_or_else(|| if filters.is_identity() { tr("No preset").into() } else { tr("Custom").into() });
-    let name_id = Id::new("cp_preset_name");
+    let name_id = Id::unique("cp_preset_name");
     let mut naming: Option<String> = ui.data(|d| d.get_temp(name_id));
     let mut action = None;
     ui.horizontal(|ui| {
@@ -1129,6 +1269,70 @@ impl WithStops for Gradient {
     }
 }
 
+#[cfg(test)]
+mod selection_color_tests {
+    use super::*;
+    use crate::NoServices;
+    use figcraft_engine::{Session, selection_colors::collect};
+
+    fn setup() -> (FigApp, NodeId, NodeId) {
+        let mut s = Session::new();
+        let a = NodeId(s.execute("shape.rectangle", &json!({"width":40,"height":40,"props":{"fill":"#ff0000"}})).unwrap()["id"].as_u64().unwrap());
+        let b = NodeId(s.execute("shape.rectangle", &json!({"width":40,"height":40,"props":{"fill":"#0000ff"}})).unwrap()["id"].as_u64().unwrap());
+        s.execute("select.set", &json!({"ids":[a,b]})).unwrap();
+        let mut app = FigApp::new(s, Box::new(NoServices));
+        let targets = collect(app.session.doc().unwrap(), &[a, b])[0].targets.clone();
+        crate::selection_colors::open_picker(&mut app, targets);
+        (app, a, b)
+    }
+
+    #[test]
+    fn picker_live_changes_keep_frozen_targets_and_commit_once() {
+        let (mut app, a, b) = setup();
+        let target = app.ui.picker.clone().unwrap();
+        let before = app.session.undo_depth();
+        for color in ["#0000ff", "#00ff00"] {
+            write(&mut app, &target, &Paint::solid(Color::from_hex(color).unwrap()), true);
+        }
+        assert!(app.session.recent_colors.is_empty(), "previews must not be recorded");
+        finish(&mut app);
+        assert_eq!(app.session.recent_colors, vec![Color::from_hex("#00ff00").unwrap()]);
+        assert_eq!(app.session.undo_depth().0, before.0 + 1);
+        assert_eq!(current_paint(&app, &target).unwrap().solid_color().unwrap().to_hex(), "00FF00");
+        assert_eq!(app.session.doc().unwrap().node(b).unwrap().fills[0].solid_color().unwrap().to_hex(), "0000FF");
+        app.session.undo().unwrap();
+        assert_eq!(app.session.doc().unwrap().node(a).unwrap().fills[0].solid_color().unwrap().to_hex(), "FF0000");
+    }
+
+    #[test]
+    fn writing_a_variable_keeps_its_alpha() {
+        // The picker holds a colour variable's alpha as the paint opacity; writing it back applies it once.
+        let (mut app, _, _) = setup();
+        app.session.execute("variable.createCollection", &json!({"name":"T"})).unwrap();
+        let v = app.session.execute("variable.create", &json!({"collection":"T","name":"tint","type":"color","value":"#0D6EFD80"})).unwrap();
+        let var = app.session.doc().unwrap().variables.get(v["id"].as_str().unwrap()).unwrap().clone();
+        let target = PickerTarget::Variable { id: var.id.clone(), mode: var.values.keys().next().unwrap().clone() };
+        for _ in 0..2 {
+            let paint = current_paint(&app, &target).unwrap();
+            write(&mut app, &target, &paint, false);
+        }
+        let c = current_paint(&app, &target).unwrap().solid_color().unwrap();
+        assert_eq!(c.to_css_hex().to_uppercase(), "#0D6EFD80");
+    }
+
+    #[test]
+    fn picker_does_not_follow_selection_or_document_switches() {
+        let (mut app, _, _) = setup();
+        let target = app.ui.picker.clone().unwrap();
+        app.session.execute("select.none", &json!({})).unwrap();
+        assert!(current_paint(&app, &target).is_none());
+        let (mut app, _, _) = setup();
+        let target = app.ui.picker.clone().unwrap();
+        app.session.execute("file.new", &json!({})).unwrap();
+        assert!(current_paint(&app, &target).is_none());
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/ui-egui/src/field_math.rs b/crates/ui-egui/src/widgets/field_math.rs
similarity index 86%
rename from crates/ui-egui/src/field_math.rs
rename to crates/ui-egui/src/widgets/field_math.rs
index c8318309..f81500e6 100644
--- a/crates/ui-egui/src/field_math.rs
+++ b/crates/ui-egui/src/widgets/field_math.rs
@@ -102,7 +102,15 @@ impl Parser<'_> {
         }
         let v = digits.parse::<f64>().ok().filter(|v| v.is_finite())?;
         // The unit: letters (px, pt, ms, x), a degree sign, and a percent sign where that is one.
-        while self.chars.next_if(|c| c.is_ascii_alphabetic() || *c == '°' || (*c == '%' && self.percent_unit)).is_some() {}
+        // It may follow spaces ("3 px").
+        let percent_unit = self.percent_unit;
+        let is_unit = |c: &char| c.is_ascii_alphabetic() || *c == '°' || (*c == '%' && percent_unit);
+        let mut ahead = self.chars.clone();
+        while ahead.next_if(|c| c.is_whitespace()).is_some() {}
+        if ahead.peek().is_some_and(is_unit) {
+            self.space();
+        }
+        while self.chars.next_if(is_unit).is_some() {}
         Some(v)
     }
 
@@ -161,3 +169,17 @@ pub fn stepped(from: f64, steps: f64, step: f64) -> f64 {
     let v = from + steps * step;
     if v.is_finite() { (v * 1e6).round() / 1e6 } else { from }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn unit_after_a_space() {
+        assert_eq!(parse("3px", true), Some(Typed::Value(3.0)));
+        assert_eq!(parse("3 px", true), Some(Typed::Value(3.0)));
+        assert_eq!(parse("10 °", true), Some(Typed::Value(10.0)));
+        assert_eq!(parse("50 %", true), Some(Typed::Value(50.0)));
+        assert_eq!(parse("3 px + 2 px", true), Some(Typed::Value(5.0)));
+    }
+}
diff --git a/crates/ui-egui/src/font_preview.rs b/crates/ui-egui/src/widgets/font_preview.rs
similarity index 99%
rename from crates/ui-egui/src/font_preview.rs
rename to crates/ui-egui/src/widgets/font_preview.rs
index a16177dc..ad05645d 100644
--- a/crates/ui-egui/src/font_preview.rs
+++ b/crates/ui-egui/src/widgets/font_preview.rs
@@ -32,7 +32,7 @@ fn key(style: &TextStyle, text: &str, ppp: f32) -> u64 {
 pub fn texture(ctx: &egui::Context, style: &TextStyle, text: &str, budget: &mut usize) -> Option<egui::TextureHandle> {
     let ppp = ctx.pixels_per_point();
     let k = key(style, text, ppp);
-    let cache = ctx.data_mut(|d| d.get_temp_mut_or_default::<Cache>(Id::new("font_previews")).clone());
+    let cache = ctx.data_mut(|d| d.get_temp_mut_or_default::<Cache>(Id::unique("font_previews")).clone());
     if let Some(t) = cache.0.lock().ok()?.get(&k) {
         return t.clone();
     }
diff --git a/crates/ui-egui/src/style_picker.rs b/crates/ui-egui/src/widgets/style_picker.rs
similarity index 83%
rename from crates/ui-egui/src/style_picker.rs
rename to crates/ui-egui/src/widgets/style_picker.rs
index 966ea482..f97dfeb9 100644
--- a/crates/ui-egui/src/style_picker.rs
+++ b/crates/ui-egui/src/widgets/style_picker.rs
@@ -290,7 +290,7 @@ struct Frame {
 /// An icon button on the dark popover.
 fn menu_icon(ui: &mut Ui, rect: Rect, icon: Icon, tip: &str, on: bool) -> Response {
     let t = Tokens::get(ui.ctx());
-    let resp = ui.interact(rect, ui.id().with(("style_picker_btn", tip)), Sense::click()).tip(tip);
+    let resp = ui.interact(rect, ui.scope_id().with(("style_picker_btn", tip)), Sense::click()).tip(tip);
     if on || resp.hovered() {
         ui.painter().rect_filled(rect, CornerRadius::same(5), t.menu_hover);
     }
@@ -482,7 +482,7 @@ fn style_grid(ui: &mut Ui, list: &[(&Style, Key)], applied: Option<&Key>, editab
                     None => preview(ui, r, s, StyleSlot::Fill),
                 }
                 if applied == Some(key) {
-                    ui.painter().rect_stroke(r.expand(2.0), CornerRadius::same(5), Stroke::new(2.0, t.accent), egui::StrokeKind::Inside);
+                    ui.painter().rect_stroke(r.expand(2.0), CornerRadius::same(5), Stroke::new(2.0, crate::theme::ACCENT), egui::StrokeKind::Inside);
                 } else if resp.hovered() && !text {
                     ui.painter().rect_stroke(r.expand(2.0), CornerRadius::same(4), Stroke::new(1.0, t.menu_text), egui::StrokeKind::Inside);
                 }
@@ -555,7 +555,11 @@ fn listing(app: &FigApp, ui: &mut Ui, doc: &Document, p: &mut Picker, out: &mut
         }
     }
     let colors = if slot.paints() {
-        crate::variable_ui::groups(doc, &libs, |_, v| v.kind == VariableType::Color && (q.is_empty() || v.name.to_lowercase().contains(&q)))
+        // Variables scoped to every selected layer's fill (or stroke), as the Design panel's pickers offer.
+        let scopes: Vec<_> = p.ids.iter().filter_map(|id| figcraft_engine::cmd::variables::field_scope(doc, *id, slot.key())).collect();
+        crate::variable_ui::groups(doc, &libs, |_, v| {
+            v.kind == VariableType::Color && (q.is_empty() || v.name.to_lowercase().contains(&q)) && scopes.iter().all(|s| v.in_scope(s))
+        })
     } else {
         Vec::new()
     };
@@ -664,7 +668,7 @@ fn binding_cell(ui: &mut Ui, doc: &Document, style: &Style, field: &str, kind: f
         }
         return ui.rect_contains_pointer(b);
     };
-    let id = Id::new(("style_binding", &style.id, field));
+    let id = Id::unique(("style_binding", &style.id, field));
     let shown = widgets::elide_font(ui, leaf(name), 90.0, regular(10.0));
     let w = ui.painter().layout_no_wrap(shown.clone(), regular(10.0), t.menu_dim).size().x + 22.0;
     let chip = Rect::from_min_max(pos2(row.max.x - w - 4.0, row.min.y + 4.0), pos2(row.max.x - 4.0, row.max.y - 4.0));
@@ -700,9 +704,33 @@ fn grid_label(g: &figcraft_doc::LayoutGrid) -> String {
     }
 }
 
-/// A text style's typography in the editor: a sample, then font, style, size, line height and
-/// letter spacing; a change redefines the style (every linked char follows).
-fn text_properties(ui: &mut Ui, id: &str, def: &TextStyle, out: &mut Frame) {
+/// The chip in `rect` of the variable `name` bound to `field` of text style `style`. A click on it
+/// opens the variable picker to change it, and its detach button unbinds it.
+#[allow(clippy::too_many_arguments)]
+fn text_binding(ui: &mut Ui, style: &str, field: &str, kind: VariableType, rect: Rect, name: &str, lead: widgets::Lead, out: &mut Frame) {
+    match widgets::bound_field(ui, Id::unique(("ts_bound", style, field)), lead, rect, name) {
+        Some(widgets::BindEvent::Open(at)) => crate::variable_ui::open_style(ui, style, field, kind, at),
+        Some(widgets::BindEvent::Detach) => out.act = Some(Act::Unbind(style.to_string(), field.to_string())),
+        None => {}
+    }
+}
+
+/// The text style's variable name for `field`, or None when the field is not bound.
+fn bound_name(doc: &Document, style: &Style, field: &str) -> Option<String> {
+    style.bound.get(field).map(|v| doc.variables.get(v).map_or_else(|| v.clone(), |x| x.name.clone()))
+}
+
+/// Redefines the text style `def` through `f`; the edit is queued only when it changes the style.
+fn set_text(def: &TextStyle, id: &str, out: &mut Frame, f: impl FnOnce(&mut TextStyle)) {
+    let mut d = def.clone();
+    f(&mut d);
+    if d != *def {
+        out.act = Some(Act::SetText(id.to_string(), d));
+    }
+}
+
+/// The sample of the text style, with its font, style and metrics beside it.
+fn text_sample_header(ui: &mut Ui, def: &TextStyle, out: &mut Frame) {
     let t = Tokens::get(ui.ctx());
     let (r, _) = ui.allocate_exact_size(vec2(W, 40.0), Sense::hover());
     ui.painter().rect_filled(r, CornerRadius::same(5), Color32::from_white_alpha(14));
@@ -711,45 +739,134 @@ fn text_properties(ui: &mut Ui, id: &str, def: &TextStyle, out: &mut Frame) {
     let g = ui.painter().layout(summary, regular(10.5), t.menu_dim, W - 80.0);
     ui.painter().galley(pos2(r.min.x + 72.0, r.center().y - g.size().y / 2.0), g, t.menu_dim);
     ui.add_space(6.0);
-    let set = |out: &mut Frame, f: &dyn Fn(&mut TextStyle)| {
-        let mut d = def.clone();
-        f(&mut d);
-        if d != *def {
-            out.act = Some(Act::SetText(id.to_string(), d));
+}
+
+/// The font field: a variable chip when bound, else a dropdown whose menu is returned.
+fn font_family_field(ui: &mut Ui, doc: &Document, style: &Style, def: &TextStyle, out: &mut Frame) -> Option<Response> {
+    let id = style.id.as_str();
+    match bound_name(doc, style, "fontFamily") {
+        Some(name) => {
+            let (r, _) = ui.allocate_exact_size(vec2(W, widgets::FIELD_H), Sense::hover());
+            text_binding(ui, id, "fontFamily", VariableType::String, r, &name, widgets::Lead::Named(tr("Font")), out);
+            None
         }
-    };
-    let half = (W - 8.0) / 2.0;
-    // The dropdowns' menus open outside the dark scope (they're regular popups).
-    let (family_resp, style_resp) = crate::theme::on_dark(ui, |ui| {
-        ui.spacing_mut().item_spacing = vec2(8.0, 6.0);
-        let family_resp = widgets::dropdown(ui, &def.font_family, W, None).on_hover_text(tr("Font"));
-        let mut style_resp = None;
-        ui.horizontal(|ui| {
-            style_resp = Some(widgets::dropdown(ui, &def.font_style, half, None).on_hover_text(tr("Font style")));
-            if let Some(widgets::FieldEdit::Set(v) | widgets::FieldEdit::Scrub(v, true)) =
-                widgets::number_field(ui, Id::new(("ts_size", id)), widgets::Lead::Text(tr("Size")), Some(def.font_size), "", half, 1.0)
-            {
-                set(out, &|d| d.font_size = v.clamp(1.0, 5000.0));
+        None => Some(widgets::dropdown(ui, &def.font_family, W, None).on_hover_text(tr("Font"))),
+    }
+}
+
+/// The font style field (a dropdown, whose menu is returned, or a variable chip) and the size field, in one row.
+fn font_style_size_row(ui: &mut Ui, doc: &Document, style: &Style, def: &TextStyle, half: f32, out: &mut Frame) -> Option<Response> {
+    let id = style.id.as_str();
+    let mut style_resp = None;
+    ui.horizontal(|ui| {
+        match bound_name(doc, style, "fontStyle") {
+            Some(name) => {
+                let (r, _) = ui.allocate_exact_size(vec2(half, widgets::FIELD_H), Sense::hover());
+                text_binding(ui, id, "fontStyle", VariableType::String, r, &name, widgets::Lead::Named(tr("Font style")), out);
             }
-        });
-        ui.horizontal(|ui| {
-            if let Some(v) = widgets::text_field(ui, Id::new(("ts_lh", id)), &def.line_height.label(), half, tr("Line height"))
+            None => style_resp = Some(widgets::dropdown(ui, &def.font_style, half, None).on_hover_text(tr("Font style"))),
+        }
+        font_size_field(ui, doc, style, def, half, out);
+    });
+    style_resp
+}
+
+/// The font size field, which also takes a variable.
+fn font_size_field(ui: &mut Ui, doc: &Document, style: &Style, def: &TextStyle, half: f32, out: &mut Frame) {
+    let id = style.id.as_str();
+    let size = bound_name(doc, style, "fontSize");
+    let (edit, ev) = widgets::number_field_bindable(
+        ui,
+        Id::unique(("ts_size", id)),
+        widgets::Lead::Text(tr("Size")),
+        Some(def.font_size),
+        "",
+        half,
+        1.0,
+        Some(size.as_deref()),
+        widgets::Empty::Text(tr("Mixed")),
+    );
+    if let Some(widgets::FieldEdit::Set(v) | widgets::FieldEdit::Scrub(v, true)) = edit.and_then(|e| e.settled()) {
+        set_text(def, id, out, |d| d.font_size = v.clamp(1.0, 5000.0));
+    }
+    match ev {
+        Some(widgets::BindEvent::Open(at)) => crate::variable_ui::open_style(ui, id, "fontSize", VariableType::Number, at),
+        Some(widgets::BindEvent::Detach) => out.act = Some(Act::Unbind(id.to_string(), "fontSize".to_string())),
+        None => {}
+    }
+}
+
+/// The line height field: a variable chip when bound, else a text field with a variable button beside it.
+fn line_height_field(ui: &mut Ui, doc: &Document, style: &Style, def: &TextStyle, half: f32, area: Rect, out: &mut Frame) {
+    let id = style.id.as_str();
+    match bound_name(doc, style, "lineHeight") {
+        Some(name) => {
+            let (r, _) = ui.allocate_exact_size(area.size(), Sense::hover());
+            text_binding(ui, id, "lineHeight", VariableType::Number, r, &name, widgets::Lead::Named(tr("Line height")), out);
+        }
+        None => {
+            if let Some(v) = widgets::text_field(ui, Id::unique(("ts_lh", id)), &def.line_height.label(), half, tr("Line height"))
                 && let Some(lh) = crate::typography::parse_line_height(&v, Some(def.line_height)).and_then(|v| crate::typography::line_height_of(&v))
             {
-                set(out, &|d| d.line_height = lh);
+                set_text(def, id, out, |d| d.line_height = lh);
             }
-            if let Some(v) = widgets::text_field(ui, Id::new(("ts_ls", id)), &def.letter_spacing.label(), half, tr("Letter spacing"))
+            if crate::variable_ui::variable_button(ui, area, Id::unique(("ts_bind", id, "lineHeight"))) {
+                crate::variable_ui::open_style(ui, id, "lineHeight", VariableType::Number, area.left_bottom());
+            }
+        }
+    }
+}
+
+/// The letter spacing field: a variable chip when bound, else a text field with a variable button beside it.
+fn letter_spacing_field(ui: &mut Ui, doc: &Document, style: &Style, def: &TextStyle, half: f32, area: Rect, out: &mut Frame) {
+    let id = style.id.as_str();
+    match bound_name(doc, style, "letterSpacing") {
+        Some(name) => {
+            let (r, _) = ui.allocate_exact_size(area.size(), Sense::hover());
+            text_binding(ui, id, "letterSpacing", VariableType::Number, r, &name, widgets::Lead::Named(tr("Letter spacing")), out);
+        }
+        None => {
+            if let Some(v) = widgets::text_field(ui, Id::unique(("ts_ls", id)), &def.letter_spacing.label(), half, tr("Letter spacing"))
                 && let Some(ls) =
                     crate::typography::parse_letter_spacing(&v, Some(def.letter_spacing)).and_then(|v| crate::typography::letter_spacing_of(&v))
             {
-                set(out, &|d| d.letter_spacing = ls);
+                set_text(def, id, out, |d| d.letter_spacing = ls);
             }
-        });
-        (family_resp, style_resp)
+            if crate::variable_ui::variable_button(ui, area, Id::unique(("ts_bind", id, "letterSpacing"))) {
+                crate::variable_ui::open_style(ui, id, "letterSpacing", VariableType::Number, area.left_bottom());
+            }
+        }
+    }
+}
+
+/// The fields of a text style, in rows: font, then style and size, then line height and letter
+/// spacing. Returns the font and style dropdowns, whose menus are opened after the fields.
+fn text_property_fields(ui: &mut Ui, doc: &Document, style: &Style, def: &TextStyle, out: &mut Frame) -> (Option<Response>, Option<Response>) {
+    let half = (W - 8.0) / 2.0;
+    ui.spacing_mut().item_spacing = vec2(8.0, 6.0);
+    let family_resp = font_family_field(ui, doc, style, def, out);
+    let style_resp = font_style_size_row(ui, doc, style, def, half, out);
+    ui.horizontal(|ui| {
+        let area = Rect::from_min_size(ui.cursor().min, vec2(half, widgets::FIELD_H));
+        line_height_field(ui, doc, style, def, half, area, out);
+        let area = Rect::from_min_size(ui.cursor().min, vec2(half, widgets::FIELD_H));
+        letter_spacing_field(ui, doc, style, def, half, area, out);
     });
-    crate::right::menu_popup(&family_resp).width(260.0).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
+    (family_resp, style_resp)
+}
+
+/// The font menu: Apply variable, then the installed fonts. Picking a font keeps its style when the
+/// family has one, else falls back to Regular or the first style.
+fn font_family_menu(id: &str, def: &TextStyle, family_resp: &Response, out: &mut Frame) {
+    crate::right::menu_popup(family_resp).width(260.0).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
+        if crate::right::menu_item(ui, tr("Apply variable"), "") {
+            crate::variable_ui::open_style(ui, id, "fontFamily", VariableType::String, family_resp.rect.left_bottom());
+            ui.close();
+            return;
+        }
+        ui.separator();
         if let Some(f) = crate::typography::font_picker(ui, Some(&def.font_family), family_resp.clicked()).picked {
-            set(out, &|d| {
+            set_text(def, id, out, |d| {
                 d.font_family = f.clone();
                 let styles = figcraft_text::family_styles(&f);
                 if !styles.is_empty() && !styles.contains(&d.font_style) {
@@ -759,18 +876,43 @@ fn text_properties(ui: &mut Ui, id: &str, def: &TextStyle, out: &mut Frame) {
             ui.close();
         }
     });
-    if let Some(sr) = style_resp {
-        crate::right::menu_popup(&sr).width(200.0).show(|ui| {
-            egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| {
-                for s in figcraft_text::family_styles(&def.font_family) {
-                    let mark = if def.font_style == s { "✓ " } else { "   " };
-                    if crate::right::menu_item(ui, &format!("{mark}{s}"), "") {
-                        set(out, &|d| d.set_font_style(s.clone()));
-                        ui.close();
-                    }
+}
+
+/// The font style menu: Apply variable, then the styles of the current font, the current one checked.
+fn font_style_menu(id: &str, def: &TextStyle, style_resp: &Response, out: &mut Frame) {
+    crate::right::menu_popup(style_resp).width(200.0).show(|ui| {
+        if crate::right::menu_item(ui, tr("Apply variable"), "") {
+            crate::variable_ui::open_style(ui, id, "fontStyle", VariableType::String, style_resp.rect.left_bottom());
+            ui.close();
+            return;
+        }
+        ui.separator();
+        egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| {
+            for s in figcraft_text::family_styles(&def.font_family) {
+                let mark = if def.font_style == s { "✓ " } else { "   " };
+                if crate::right::menu_item(ui, &format!("{mark}{s}"), "") {
+                    set_text(def, id, out, |d| d.set_font_style(s.clone()));
+                    ui.close();
                 }
-            });
+            }
         });
+    });
+}
+
+/// A text style's typography in the editor: a sample, then font, style, size, line height and
+/// letter spacing; a change redefines the style (every linked char follows). Each field takes a
+/// variable: the font and style menus start with Apply variable, the other fields show a variable
+/// button on hover, and a bound field shows its variable instead of its value.
+fn text_properties(ui: &mut Ui, doc: &Document, style: &Style, def: &TextStyle, out: &mut Frame) {
+    let id = style.id.as_str();
+    text_sample_header(ui, def, out);
+    // The dropdowns' menus open outside the dark scope (they're regular popups).
+    let (family_resp, style_resp) = crate::theme::on_dark(ui, |ui| text_property_fields(ui, doc, style, def, out));
+    if let Some(family_resp) = family_resp {
+        font_family_menu(id, def, &family_resp, out);
+    }
+    if let Some(sr) = style_resp {
+        font_style_menu(id, def, &sr, out);
     }
 }
 
@@ -838,7 +980,7 @@ fn editor(ui: &mut Ui, doc: &Document, p: &mut Picker, out: &mut Frame) {
                     binding_cell(ui, doc, &style, &format!("layoutGrids/{i}/size"), figcraft_doc::VariableType::Number, out);
                 }
             }
-            StyleKind::Text { style: def } => text_properties(ui, &style.id, def, out),
+            StyleKind::Text { style: def } => text_properties(ui, doc, &style, def, out),
         }
     });
     ui.add_space(8.0);
@@ -889,7 +1031,7 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
     }
     let y = p.y.clamp(screen.min.y + 48.0, (screen.max.y - 460.0).max(screen.min.y + 48.0));
     let mut out = Frame { act: None, hover: None, budget: 4 };
-    let area = egui::Area::new(Id::new("style_picker_area")).order(egui::Order::Foreground).fixed_pos(pos2(x, y)).show(ctx, |ui| {
+    let area = egui::Area::new(Id::unique("style_picker_area")).order(egui::Order::Foreground).fixed_pos(pos2(x, y)).show(ctx, |ui| {
         egui::Frame::NONE.fill(t.menu).corner_radius(CornerRadius::same(10)).inner_margin(egui::Margin::same(8)).show(ui, |ui| {
             ui.set_width(W);
             if p.edit.is_some() {
@@ -900,7 +1042,7 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
         });
     });
     let rect = area.response.rect;
-    ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, Id::new("style_picker_border"))).rect_stroke(
+    ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, Id::unique("style_picker_border"))).rect_stroke(
         rect,
         CornerRadius::same(10),
         Stroke::new(1.0, Color32::from_black_alpha(40)),
@@ -909,7 +1051,7 @@ pub fn show(app: &mut FigApp, ctx: &egui::Context) {
     // Clicks in the colour picker editing this picker's style, or in a menu the editor opened,
     // keep it open.
     let picker_rect =
-        app.ui.picker.as_ref().filter(|t| matches!(t, PickerTarget::Style { .. })).and(ctx.memory(|m| m.area_rect(Id::new("color_picker"))));
+        app.ui.picker.as_ref().filter(|t| matches!(t, PickerTarget::Style { .. })).and(ctx.memory(|m| m.area_rect(crate::colorpicker::window_id())));
     // So do clicks in the variable picker binding one of its fields (Escape closes that first).
     let variables = crate::variable_ui::picker_rect(ctx);
     let in_popup = egui::Popup::is_any_open(ctx) || variables.is_some();
@@ -1018,7 +1160,7 @@ fn drop_move(shown: &[&Style], from: usize, to: usize) -> Option<Value> {
 
 /// The id of the folder caption being renamed in the Local styles list (temp data).
 fn folder_rename_id() -> Id {
-    Id::new("local_style_folder_rename")
+    Id::unique("local_style_folder_rename")
 }
 
 /// The Design panel's Local styles (shown with nothing selected): this file's styles by type
@@ -1131,5 +1273,4 @@ pub fn local_styles(app: &mut FigApp, ui: &mut Ui, doc: &Document) {
 }
 
 #[cfg(test)]
-#[path = "style_picker_tests.rs"]
 mod tests;
diff --git a/crates/ui-egui/src/style_picker_tests.rs b/crates/ui-egui/src/widgets/style_picker/tests.rs
similarity index 57%
rename from crates/ui-egui/src/style_picker_tests.rs
rename to crates/ui-egui/src/widgets/style_picker/tests.rs
index becc42ce..b732c11d 100644
--- a/crates/ui-egui/src/style_picker_tests.rs
+++ b/crates/ui-egui/src/widgets/style_picker/tests.rs
@@ -95,6 +95,8 @@ fn text_session() -> (Session, figcraft_doc::NodeId) {
     (s, t)
 }
 
+/// Asserts hovering a text style previews it without an edit, leaving the popover restores
+/// the value, and clicking applies one undo step and closes the picker.
 #[test]
 fn text_styles_preview_on_hover_and_apply_on_click() {
     let (s, t) = text_session();
@@ -105,7 +107,7 @@ fn text_styles_preview_on_hover_and_apply_on_click() {
     for _ in 0..3 {
         frame(&ctx, &mut app, &mut time);
     }
-    let area = ctx.memory(|m| m.area_rect(Id::new("style_picker_area"))).expect("the picker shows");
+    let area = ctx.memory(|m| m.area_rect(Id::unique("style_picker_area"))).expect("the picker shows");
     let size = |app: &FigApp| app.session.doc().unwrap().node(t).unwrap().kind.text().unwrap().style.font_size;
     let undo = app.session.ds().unwrap().history.undo.len();
     // Down the popover until a style row previews on the canvas: the heading (listed first).
@@ -164,6 +166,34 @@ fn chars_linked_to_several_styles_show_mixed() {
     assert_eq!(text_link(&app, &doc, &[t]), None);
 }
 
+#[test]
+fn a_click_in_the_colour_picker_keeps_the_style_editor_open() {
+    use crate::layers_drag_tests::Ui;
+    let mut s = Session::new();
+    s.execute("style.create", &json!({"type": "paint", "name": "Brand", "value": [{"type": "solid", "color": "#0D99FF"}]})).unwrap();
+    let mut u = Ui::new(s);
+    open_for_selection(&mut u.app, StyleSlot::Fill, Some("Brand"));
+    for _ in 0..3 {
+        u.frame(vec![]);
+    }
+    let id = u.app.session.doc().unwrap().style("Brand").unwrap().id.clone();
+    u.app.ui.picker = Some(crate::colorpicker::PickerTarget::Style { id, index: 0 });
+    for _ in 0..3 {
+        u.frame(vec![]);
+    }
+    let cp = u.ctx.memory(|m| m.area_rect(crate::colorpicker::window_id())).expect("colour picker shows");
+    let p = cp.center();
+    u.button(p, true);
+    u.button(p, false);
+    u.frame(vec![]);
+    assert!(u.app.ui.style_picker.is_some(), "the style editor stays open while the colour picker is used");
+    assert!(
+        matches!(u.app.ui.picker, Some(crate::colorpicker::PickerTarget::Style { .. })),
+        "the colour picker stays open too: {:?}",
+        u.app.ui.picker
+    );
+}
+
 #[test]
 fn local_style_drops_move_into_the_folder_above() {
     let st = |id: &str, name: &str| Style {
@@ -216,11 +246,19 @@ fn edit_local_for_test(app: &mut FigApp, ctx: &egui::Context) {
 /// returns the redefined style, if any.
 fn commit_text_field(def: &TextStyle, field: &str, typed: &str) -> Option<TextStyle> {
     let ctx = egui::Context::default();
-    ctx.data_mut(|d| d.insert_temp(Id::new((field, "S")).with("editing"), typed.to_string()));
+    ctx.data_mut(|d| d.insert_temp(Id::unique((field, "S")).with("editing"), typed.to_string()));
     let enter = egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() };
     let input = RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(400.0, 400.0))), events: vec![enter], ..Default::default() };
     let mut f = Frame { act: None, hover: None, budget: 0 };
-    let mut out = ctx.run_ui(input, |ui| text_properties(ui, "S", def, &mut f));
+    let doc = Document::new("d");
+    let style = Style {
+        id: "S".into(),
+        name: "S".into(),
+        description: String::new(),
+        kind: StyleKind::Text { style: def.clone() },
+        bound: Default::default(),
+    };
+    let mut out = ctx.run_ui(input, |ui| text_properties(ui, &doc, &style, def, &mut f));
     out.textures_delta.clear();
     match f.act {
         Some(Act::SetText(id, d)) if id == "S" => Some(d),
@@ -248,3 +286,162 @@ fn text_style_editor_commits_line_height_and_letter_spacing() {
     assert_eq!(TextStyle { line_height: def.line_height, ..d }, def);
     assert_eq!(lh(&def, "abc"), None);
 }
+
+/// A session with the text style "Body" (Inter Regular 14) and number and string variables to
+/// bind to its fields; `bind` binds them all first.
+fn text_variables_session(bind: bool) -> crate::layers_drag_tests::Ui {
+    let mut s = Session::new();
+    s.execute("style.create", &json!({"type": "text", "name": "Body", "value": {"fontFamily": "Inter", "fontStyle": "Regular", "fontSize": 14}}))
+        .unwrap();
+    s.execute("variable.createCollection", &json!({"name": "Type", "modes": ["Base"]})).unwrap();
+    for (name, ty, value) in [
+        ("Body size", "number", json!(18)),
+        ("Body leading", "number", json!(24)),
+        ("Body tracking", "number", json!(1)),
+        ("Body font", "string", json!("Inter")),
+        ("Body weight", "string", json!("Bold")),
+    ] {
+        s.execute("variable.create", &json!({"collection": "Type", "name": name, "type": ty, "values": {"Base": value}})).unwrap();
+    }
+    if bind {
+        for (field, var) in [
+            ("fontSize", "Body size"),
+            ("lineHeight", "Body leading"),
+            ("letterSpacing", "Body tracking"),
+            ("fontFamily", "Body font"),
+            ("fontStyle", "Body weight"),
+        ] {
+            s.execute("style.bind", &json!({"style": "Body", "field": field, "variable": var})).unwrap();
+        }
+    }
+    let mut u = crate::layers_drag_tests::Ui::new(s);
+    open_for_selection(&mut u.app, StyleSlot::Text, Some("Body"));
+    for _ in 0..3 {
+        u.frame(vec![]);
+    }
+    assert!(u.app.ui.style_picker.as_ref().is_some_and(|p| p.edit.is_some()), "the text style editor is open");
+    u
+}
+
+/// The left edge of the style editor's content (its "Edit style" title starts 30 px in).
+fn editor_left(u: &mut crate::layers_drag_tests::Ui) -> f32 {
+    let mut left = None;
+    for c in u.frame_output(vec![]).shapes {
+        if let egui::Shape::Text(t) = &c.shape
+            && t.galley.text() == "Edit style"
+        {
+            left = Some(t.pos.x - 30.0);
+        }
+    }
+    left.expect("the editor's title")
+}
+
+/// The texts drawn in one frame, with their centers.
+fn drawn_texts(u: &mut crate::layers_drag_tests::Ui) -> Vec<(String, Pos2)> {
+    fn walk(shape: &egui::Shape, out: &mut Vec<(String, Pos2)>) {
+        match shape {
+            egui::Shape::Text(t) => out.push((t.galley.text().to_string(), t.pos + t.galley.size() / 2.0)),
+            egui::Shape::Vec(v) => v.iter().for_each(|s| walk(s, out)),
+            _ => {}
+        }
+    }
+    let mut out = Vec::new();
+    for c in u.frame_output(vec![]).shapes {
+        walk(&c.shape, &mut out);
+    }
+    out
+}
+
+fn text_at(texts: &[(String, Pos2)], s: &str) -> Pos2 {
+    texts
+        .iter()
+        .find(|(t, _)| t == s)
+        .map(|(_, p)| *p)
+        .unwrap_or_else(|| panic!("no text {s:?} in {:?}", texts.iter().map(|t| &t.0).collect::<Vec<_>>()))
+}
+
+/// Hover `p` (variable buttons show on hover), then press and release there.
+fn click(u: &mut crate::layers_drag_tests::Ui, p: Pos2) {
+    u.frame(vec![egui::Event::PointerMoved(p)]);
+    u.button(p, true);
+    u.button(p, false);
+    u.frame(vec![]);
+}
+
+/// The name of the variable on `field` of the style "Body".
+fn bound_to(u: &crate::layers_drag_tests::Ui, field: &str) -> Option<String> {
+    let doc = u.app.session.doc().unwrap();
+    doc.style("Body").unwrap().bound.get(field).map(|v| doc.variables.get(v).map_or_else(|| v.clone(), |x| x.name.clone()))
+}
+
+#[test]
+fn text_style_editor_shows_bound_fields_as_variables_and_detaches_them() {
+    let mut u = text_variables_session(true);
+    let left = editor_left(&mut u);
+    let texts = drawn_texts(&mut u);
+    let half = (W - 8.0) / 2.0;
+    // (field, variable shown in its place, right edge of the field: full width or half)
+    let fields = [
+        ("fontFamily", "Body font", W),
+        ("fontStyle", "Body weight", half),
+        ("fontSize", "Body size", W),
+        ("lineHeight", "Body leading", half),
+        ("letterSpacing", "Body tracking", W),
+    ];
+    let at: Vec<f32> = fields.iter().map(|(_, name, _)| text_at(&texts, name).y).collect();
+    for ((field, name, right), y) in fields.iter().zip(at) {
+        assert_eq!(bound_to(&u, field).as_deref(), Some(*name));
+        // The chip's detach button sits at its right end.
+        click(&mut u, Pos2::new(left + right - 11.0, y));
+        assert_eq!(bound_to(&u, field), None, "{field} is detached");
+    }
+    assert!(u.app.ui.style_picker.is_some(), "the editor stays open");
+    assert!(u.app.ui.last_error.is_none(), "{:?}", u.app.ui.last_error);
+}
+
+#[test]
+fn text_style_editor_binds_variables_from_its_fields() {
+    let mut u = text_variables_session(false);
+    let left = editor_left(&mut u);
+    let texts = drawn_texts(&mut u);
+    let half = (W - 8.0) / 2.0;
+    let size_row = text_at(&texts, "Size").y;
+    let spacing = {
+        let doc = u.app.session.doc().unwrap();
+        let Some(StyleKind::Text { style: def }) = doc.style("Body").map(|s| &s.kind) else { panic!("a text style") };
+        def.letter_spacing.label()
+    };
+    let in_editor: Vec<_> = texts.iter().filter(|(_, p)| p.x > left && p.x < left + W).cloned().collect();
+    let spacing_row = text_at(&in_editor, &spacing).y;
+    // Size, line height and letter spacing: the variable button at the field's right end.
+    for (field, name, x, y) in [
+        ("fontSize", "Body size", left + W - 11.0, size_row),
+        ("lineHeight", "Body leading", left + half - 11.0, spacing_row),
+        ("letterSpacing", "Body tracking", left + W - 11.0, spacing_row),
+    ] {
+        click(&mut u, Pos2::new(x, y));
+        assert!(crate::variable_ui::picker_open(&u.ctx), "{field}: the variable picker opens");
+        let texts = drawn_texts(&mut u);
+        assert!(!texts.iter().any(|(t, _)| t == "Body font"), "{field} offers number variables only");
+        click(&mut u, text_at(&texts, name));
+        assert_eq!(bound_to(&u, field).as_deref(), Some(name));
+    }
+    // Font and font style: Apply variable at the top of their menus.
+    for (field, shown, name) in [("fontFamily", "Inter", "Body font"), ("fontStyle", "Regular", "Body weight")] {
+        // The menu's label, not the same name in the Local styles list behind the editor.
+        let texts: Vec<_> = drawn_texts(&mut u).into_iter().filter(|(_, p)| p.x > left && p.x < left + W).collect();
+        click(&mut u, text_at(&texts, shown));
+        let texts = drawn_texts(&mut u);
+        click(&mut u, text_at(&texts, "Apply variable"));
+        assert!(crate::variable_ui::picker_open(&u.ctx), "{field}: the variable picker opens");
+        let texts = drawn_texts(&mut u);
+        // "Body size" shows once, on the size field's chip: the picker doesn't list it.
+        assert_eq!(texts.iter().filter(|(t, _)| t == "Body size").count(), 1, "{field} offers string variables only");
+        click(&mut u, text_at(&texts, name));
+        assert_eq!(bound_to(&u, field).as_deref(), Some(name));
+    }
+    let doc = u.app.session.doc().unwrap();
+    let Some(StyleKind::Text { style: def }) = doc.style("Body").map(|s| &s.kind) else { panic!("a text style") };
+    assert_eq!((def.font_size, def.font_style.as_str()), (18.0, "Bold"), "the style takes the variables' values");
+    assert!(u.app.ui.last_error.is_none(), "{:?}", u.app.ui.last_error);
+}
diff --git a/crates/ui-egui/src/windows.rs b/crates/ui-egui/src/windows.rs
index 510c24f6..95ec721d 100644
--- a/crates/ui-egui/src/windows.rs
+++ b/crates/ui-egui/src/windows.rs
@@ -11,7 +11,7 @@
 use std::cell::RefCell;
 
 use egui::{Context, Pos2, Vec2, ViewportBuilder, ViewportCommand, ViewportId};
-use figcraft_engine::DocState;
+use figcraft_engine::{DocState, Session};
 use serde_json::{Value, json};
 
 use crate::canvas::CanvasState;
@@ -40,6 +40,8 @@ struct Pane {
     worker: Option<Worker>,
     field_focus: bool,
     control_input: Vec<egui::Event>,
+    /// The document the queued synthetic batch was injected for (dropped if it changed).
+    control_input_doc: Option<u64>,
 }
 
 /// The app's other windows.
@@ -55,6 +57,11 @@ pub struct Windows {
     /// Windows to close (their files close with them), at the main window's next frame.
     closing: Vec<u64>,
     last_id: u64,
+    /// The file each window last presented and the monotonic generation it defines. A switch to
+    /// another file (and back) is a new generation, so a screenshot admitted under the old file
+    /// can never accept pixels from the new one.
+    presented: std::collections::HashMap<u64, (u64, u64)>,
+    presentation_generation: u64,
 }
 
 impl Windows {
@@ -66,6 +73,34 @@ impl Windows {
     pub fn exists(&self, id: u64) -> bool {
         id == 0 || self.list.iter().any(|w| w.id == id)
     }
+
+    /// The document window `id` shows now (`None`: no file): the window drawing now has the
+    /// session's active file, the main window between frames its own, every other window its own.
+    pub(crate) fn active_doc(&self, session: &Session, id: u64) -> Option<u64> {
+        if id == self.current {
+            session.docs.get(session.active).map(|d| d.uid)
+        } else if id == 0 {
+            self.main_active
+        } else {
+            self.list.iter().find(|w| w.id == id).and_then(|w| w.active)
+        }
+    }
+
+    /// The file window `id` shows now and a monotonic generation for that presentation.
+    ///
+    /// The generation changes whenever the observed file changes, including a switch back to the
+    /// file shown before (A→B→A): the final UID alone is not enough to identify a capture.
+    pub(crate) fn presentation(&mut self, session: &Session, id: u64) -> (u64, u64) {
+        let document = self.active_doc(session, id).unwrap_or(0);
+        if let Some(&(observed, generation)) = self.presented.get(&id)
+            && observed == document
+        {
+            return (document, generation);
+        }
+        self.presentation_generation = self.presentation_generation.wrapping_add(1);
+        self.presented.insert(id, (document, self.presentation_generation));
+        (document, self.presentation_generation)
+    }
 }
 
 /// Window `id`'s egui viewport.
@@ -91,9 +126,11 @@ pub fn with_app<R>(f: impl FnOnce(&mut FigApp) -> R) -> Option<R> {
 /// Last-resort guard around a frame: a panic becomes a message and recovery copies of unsaved
 /// files, not a lost document.
 pub fn guard(app: &mut FigApp, ctx: &Context, f: impl FnOnce(&mut FigApp)) {
-    let res = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| f(&mut *app)));
+    // Started with automation roots, everything the window and the control channel do is confined.
+    let roots = app.automation_roots.clone();
+    let res = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| figcraft_engine::file_access::confined(roots.as_ref(), || f(&mut *app))));
     if let Err(e) = res {
-        let msg = e.downcast_ref::<&str>().map(|s| s.to_string()).or_else(|| e.downcast_ref::<String>().cloned()).unwrap_or_else(|| "panic".into());
+        let msg = e.downcast_ref::<&str>().map(ToString::to_string).or_else(|| e.downcast_ref::<String>().cloned()).unwrap_or_else(|| "panic".into());
         log::error!("UI panic: {msg}");
         app.toast(format!("Internal error (please report): {msg}"));
         ctx.request_repaint();
@@ -101,13 +138,54 @@ pub fn guard(app: &mut FigApp, ctx: &Context, f: impl FnOnce(&mut FigApp)) {
     }
 }
 
-/// Control-channel input events (`ui.input`) for the window `viewport` draws next.
+/// Control-channel input events (`ui.input`) for the window `viewport` draws next. A batch queued
+/// for another document is dropped rather than replayed into the new one.
 pub fn take_input(app: &mut FigApp, viewport_id: ViewportId) -> Vec<egui::Event> {
-    match app.windows.list.iter_mut().find(|w| viewport(w.id) == viewport_id) {
-        Some(w) => std::mem::take(&mut w.pane.control_input),
-        None if viewport_id == ViewportId::ROOT => std::mem::take(&mut app.control_input),
-        None => Vec::new(),
+    let (events, tagged, current) = match app.windows.list.iter_mut().find(|w| viewport(w.id) == viewport_id) {
+        Some(w) => {
+            let events = std::mem::take(&mut w.pane.control_input);
+            (events, w.pane.control_input_doc.take(), w.active)
+        }
+        None if viewport_id == ViewportId::ROOT => {
+            let events = std::mem::take(&mut app.control_input);
+            let tagged = app.control_input_doc.take();
+            let current = app.session.docs.get(app.session.active).map(|d| d.uid);
+            (events, tagged, current)
+        }
+        None => return Vec::new(),
+    };
+    // A frame with no batch of its own says nothing about the document: never treat "nothing
+    // queued" as a dropped batch (that used to error another window's acknowledgement).
+    if !events.is_empty() && tagged != current {
+        // The file changed before the batch reached a frame: say so once instead of replaying it
+        // into the new document. Only this window's own acknowledgements belong to the batch.
+        fail_input_acks(app, viewport_id);
+        return Vec::new();
     }
+    if !events.is_empty() {
+        // The frame that applies these must not read or replace the user's system clipboard.
+        app.control_synthetic = true;
+        let acks = app.take_input_acks(viewport_id);
+        app.applied_acks.extend(acks);
+        app.applied_input = Some(events.clone());
+        app.applied_frame = Some(viewport_id);
+    }
+    events
+}
+
+/// Error, once, the `ui.input` acknowledgements waiting for `viewport`'s batch: its file changed
+/// before a frame could apply it. Other windows' acknowledgements are left alone.
+pub(crate) fn fail_input_acks(app: &mut FigApp, viewport: ViewportId) {
+    let mut kept = Vec::new();
+    for ack in app.input_acks.drain(..) {
+        if ack.viewport == viewport {
+            let _ =
+                ack.tx.send(crate::ControlReply { id: ack.reply.id, result: Err("the document changed before the input could be applied".into()) });
+        } else {
+            kept.push(ack);
+        }
+    }
+    app.input_acks = kept;
 }
 
 fn title_of(ds: Option<&DocState>) -> String {
@@ -156,19 +234,21 @@ fn show_own(app: &mut FigApp, want: Option<u64>) {
 fn exchange(app: &mut FigApp, p: &mut Pane) {
     std::mem::swap(&mut app.ui, &mut p.ui);
     std::mem::swap(&mut app.ui.last_copy, &mut p.ui.last_copy);
+    std::mem::swap(&mut app.ui.last_copy_generation, &mut p.ui.last_copy_generation);
     std::mem::swap(&mut app.ui.quit, &mut p.ui.quit);
     std::mem::swap(&mut app.ui.dark, &mut p.ui.dark);
     std::mem::swap(&mut app.canvas, &mut p.canvas);
     std::mem::swap(&mut app.worker, &mut p.worker);
     std::mem::swap(&mut app.field_focus, &mut p.field_focus);
     std::mem::swap(&mut app.control_input, &mut p.control_input);
+    std::mem::swap(&mut app.control_input_doc, &mut p.control_input_doc);
 }
 
 /// Open a window (`window.new`) with open file `index` moved into it, the file at `path`, or a new
 /// file, at screen point `at` (else beside this window). Returns its id. With one window (the
 /// browser) or a screen reader running, a file opens as a tab here instead (and the error says so).
 pub fn open(app: &mut FigApp, ctx: &Context, index: Option<usize>, path: Option<&str>, at: Option<Pos2>) -> Result<u64, String> {
-    // shortcut: eframe 0.36 gives only the main window an AccessKit adapter, so other windows have
+    // shortcut: eframe 0.37 gives only the main window an AccessKit adapter, so other windows have
     // no screen-reader tree; while a screen reader runs files stay tabs here. Upgrade when eframe
     // adapts every viewport.
     let one = if ctx.embed_viewports() {
@@ -208,13 +288,15 @@ pub fn open(app: &mut FigApp, ctx: &Context, index: Option<usize>, path: Option<
         docs: vec![uid],
         active: Some(uid),
         pane: Pane {
-            // A new window opens like the one it comes from: the same tabs and panel widths.
+            // A new window opens like the one it comes from: the same tabs, panel widths and pages
+            // list height.
             ui: UiState {
                 title_bar: app.ui.title_bar,
                 right_tab: app.ui.right_tab,
                 left_tab: app.ui.left_tab,
                 left_width: app.ui.left_width,
                 right_width: app.ui.right_width,
+                pages_height: app.ui.pages_height,
                 ..UiState::default()
             },
             ..Pane::default()
@@ -300,7 +382,12 @@ pub fn on_close_request(app: &mut FigApp, ctx: &Context) {
     if app.windows.current == 0 && (unsaved || !app.windows.list.is_empty()) {
         ctx.send_viewport_cmd(ViewportCommand::CancelClose);
     }
-    if unsaved {
+    request_close(app, ctx);
+}
+
+/// The custom title bar's Close button uses the same unsaved-file check as a system close event.
+pub(crate) fn request_close(app: &mut FigApp, ctx: &Context) {
+    if !app.unsaved().is_empty() {
         app.ui.confirm_close = true;
         ctx.request_repaint();
     } else {
@@ -313,8 +400,37 @@ fn close_current(app: &mut FigApp, ctx: &Context) {
     ctx.request_repaint_of(ViewportId::ROOT);
 }
 
-/// The unsaved-changes question when a window closes.
+/// What the unsaved-changes question was answered with.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(crate) enum CloseAnswer {
+    /// Save every file with unsaved changes, then close (Save as for a file without a path).
+    Save,
+    /// Close and lose the changes.
+    DontSave,
+    /// Keep the window open.
+    Cancel,
+}
+
+/// The unsaved-changes question when a window closes: Don't Save / Cancel / Save, as the other
+/// Craft apps ask it.
 pub(crate) fn confirm_close(app: &mut FigApp, ctx: &Context) {
+    if std::mem::take(&mut app.ui.save_on_close) {
+        save_then_close(app, ctx);
+        return;
+    }
+    // A Save as this question started: once its dialog is answered, closing goes on if the file
+    // was saved; cancelled or failed, the window stays open.
+    if let Some(uid) = app.ui.close_after_save_as {
+        if app.pending_dialog.is_some() {
+            return;
+        }
+        app.ui.close_after_save_as = None;
+        // Saved: go on with the other files, then close.
+        if app.session.docs.iter().find(|d| d.uid == uid).is_none_or(|d| !d.is_dirty()) {
+            save_then_close(app, ctx);
+        }
+        return;
+    }
     if !app.ui.confirm_close {
         return;
     }
@@ -324,20 +440,77 @@ pub(crate) fn confirm_close(app: &mut FigApp, ctx: &Context) {
         return;
     }
     let t = crate::theme::Tokens::get(ctx);
-    let (mut open, mut discard, mut cancel) = (true, false, false);
-    crate::dialogs::window(tr("Unsaved changes"), ctx).open(&mut open).show(ctx, |ui| {
+    let mut open = true;
+    let mut answer = None;
+    crate::dialogs::window(tr("Unsaved changes"), ctx).order(egui::Order::Foreground).open(&mut open).show(ctx, |ui| {
         ui.set_width(340.0);
-        crate::widgets::label(ui, &trf("Unsaved changes in {names}. Close the window and lose them?", &[("names", &names.join(", "))]), t.text);
+        crate::widgets::label(ui, &trf("Unsaved changes in {names}. Save them before closing?", &[("names", &names.join(", "))]), t.text);
         ui.add_space(12.0);
         ui.horizontal(|ui| {
-            discard = crate::widgets::button(ui, tr("Close without saving"), true, true).clicked();
-            cancel = crate::widgets::button(ui, tr("Cancel"), false, true).clicked();
+            if crate::widgets::button(ui, tr("Don't Save"), false, true).clicked() {
+                answer = Some(CloseAnswer::DontSave);
+            }
+            if crate::widgets::button(ui, tr("Cancel"), false, true).clicked() {
+                answer = Some(CloseAnswer::Cancel);
+            }
+            if crate::widgets::button(ui, tr("Save"), true, true).clicked() {
+                answer = Some(CloseAnswer::Save);
+            }
         });
+        // Save is the default: Enter answers it when no button has the keyboard.
+        if answer.is_none() && ui.memory(|m| m.focused().is_none()) && ui.input(|i| i.key_pressed(egui::Key::Enter)) {
+            answer = Some(CloseAnswer::Save);
+        }
     });
-    app.ui.confirm_close = open && !discard && !cancel;
-    if discard {
-        close_current(app, ctx);
+    if !open {
+        answer = Some(CloseAnswer::Cancel);
     }
+    if let Some(a) = answer {
+        answer_close(app, ctx, a);
+    }
+}
+
+/// Act on the unsaved-changes question's answer.
+pub(crate) fn answer_close(app: &mut FigApp, ctx: &Context, answer: CloseAnswer) {
+    app.ui.confirm_close = false;
+    match answer {
+        CloseAnswer::Cancel => {}
+        CloseAnswer::DontSave => close_current(app, ctx),
+        CloseAnswer::Save => {
+            app.ui.save_on_close = true;
+            ctx.request_repaint();
+        }
+    }
+}
+
+/// Save each file of this window with unsaved changes, then close it. A file without a path (or
+/// one saved as .fig, which is never overwritten silently) asks where with Save as, and closing goes
+/// on when that dialog saved it ([`confirm_close`]). A save that fails shows why and keeps the
+/// window open.
+fn save_then_close(app: &mut FigApp, ctx: &Context) {
+    let files: Vec<u64> = app.session.docs.iter().filter(|d| app.shows(d.uid) && d.is_dirty() && d.branch_of.is_none()).map(|d| d.uid).collect();
+    for uid in files {
+        let Some(i) = app.session.docs.iter().position(|d| d.uid == uid) else { continue };
+        app.session.active = i;
+        let native =
+            app.session.docs.get(i).and_then(|d| d.path.as_deref()).is_some_and(|p| {
+                !std::path::Path::new(p).extension().and_then(std::ffi::OsStr::to_str).is_some_and(|e| e.eq_ignore_ascii_case("fig"))
+            });
+        if !native {
+            app.ui.close_after_save_as = Some(uid);
+            app.save_as_dialog();
+            if app.pending_dialog.is_none() {
+                // No dialog could start: stay open.
+                app.ui.close_after_save_as = None;
+            }
+            ctx.request_repaint();
+            return;
+        }
+        if app.run("file.save", json!({})).is_none() {
+            return;
+        }
+    }
+    close_current(app, ctx);
 }
 
 /// Before the main window draws: windows asked to close close, closed files leave their windows
@@ -357,6 +530,7 @@ pub(crate) fn begin(app: &mut FigApp, ctx: &Context) {
             }
         }
         if id != 0 {
+            app.ime.end_viewport(viewport(id));
             app.windows.list.retain(|w| w.id != id);
             continue;
         }
@@ -374,7 +548,15 @@ pub(crate) fn begin(app: &mut FigApp, ctx: &Context) {
     for w in &mut app.windows.list {
         w.docs.retain(|u| open.contains(u));
     }
+    let closed: Vec<u64> = app.windows.list.iter().map(|w| w.id).collect();
     app.windows.list.retain(|w| !w.docs.is_empty());
+    for id in closed {
+        if !app.windows.exists(id) {
+            // A window left without files is closed: forget its IME context so a later window
+            // reusing the viewport identity starts a fresh generation.
+            app.ime.end_viewport(viewport(id));
+        }
+    }
     if !app.windows.exists(app.windows.focused) {
         app.windows.focused = 0;
     }
@@ -382,6 +564,8 @@ pub(crate) fn begin(app: &mut FigApp, ctx: &Context) {
         app.windows.focused = 0;
     }
     show_own(app, None);
+    // What the main window actually presents this frame: a capture identity for the control channel.
+    app.observe_presentation();
 }
 
 /// After a window drew: when a command showed another window's file (Ctrl+Tab, opening a file
@@ -453,6 +637,7 @@ fn enter(app: &mut FigApp, id: u64) -> Option<Entered> {
     app.windows.current = id;
     app.windows.main_active = main_active;
     show_own(app, want);
+    app.observe_presentation();
     Some(Entered { id, pane, newest })
 }
 
@@ -478,6 +663,15 @@ fn leave(app: &mut FigApp, mut e: Entered, outer: Option<egui::Rect>, inner: Opt
     app.windows.current = 0;
     let main_active = app.windows.main_active.take();
     show_own(app, main_active);
+    app.observe_presentation();
+}
+
+impl Windows {
+    /// Windows whose pane holds synthetic input not yet taken by a frame (hidden windows still
+    /// need a forced paint for it).
+    pub(crate) fn pending_input_viewports(&self) -> Vec<ViewportId> {
+        self.list.iter().filter(|w| !w.pane.control_input.is_empty()).map(|w| viewport(w.id)).collect()
+    }
 }
 
 /// Run `f` as window `id` (0: the main window) outside its frame, with its state swapped in as
@@ -505,9 +699,16 @@ fn draw(app: &mut FigApp, id: u64, ui: &mut egui::Ui) {
         app.windows.focused = id;
     }
     on_close_request(app, &ctx);
-    app.logic(&ctx);
+    // The root window's `App::logic` owns app-global background work (control queues, autosave,
+    // live, background completions); a child must not repeat that once per visible window. But the
+    // UI setup a frame needs (theme and `ui.dark`, language, fonts, zoom plan, render worker) is
+    // per viewport: `App::ui` only runs for the root, so the child does it here.
     // Within the swap, so a panic leaves every window its own state.
-    guard(app, &ctx, |app| app.frame(ui));
+    guard(app, &ctx, |app| {
+        app.viewport_setup(&ctx);
+        app.frame(ui)
+    });
+    app.end_input_frame(&ctx);
     adopt(app, &e);
     settle(app, &ctx, files_before);
     if app.session.prefs != prefs {
diff --git a/crates/ui-egui/src/windows_tests.rs b/crates/ui-egui/src/windows_tests.rs
index 1a6e91bb..af42d363 100644
--- a/crates/ui-egui/src/windows_tests.rs
+++ b/crates/ui-egui/src/windows_tests.rs
@@ -27,7 +27,7 @@ fn frame(ctx: &egui::Context, app: &mut FigApp, close: bool) {
 /// A control request queued for the UI, and where its reply arrives.
 fn request(app: &mut FigApp, method: &str, params: Value) -> Receiver<ControlReply> {
     let (reply, rx) = channel();
-    app.control_queue.push(ControlRequest { id: json!(1), method: method.into(), params, reply, cancelled: Default::default() });
+    app.control_queue.push(ControlRequest { id: json!(1), method: method.into(), params, reply, state: Default::default() });
     rx
 }
 
@@ -38,13 +38,34 @@ fn logic(ctx: &egui::Context, app: &mut FigApp, hidden: &[ViewportId]) {
     for id in std::iter::once(ViewportId::ROOT).chain(app.windows.list.iter().map(|w| crate::windows::viewport(w.id))) {
         input.viewports.insert(id, ViewportInfo { minimized: Some(false), occluded: Some(hidden.contains(&id)), ..Default::default() });
     }
-    let _ = ctx.run_logic(&input, |ctx| crate::control::drain_hidden(app, ctx));
+    let _ = ctx.run_logic(&input, |ctx| crate::control::background(app, ctx));
 }
 
 fn names(app: &FigApp) -> Vec<String> {
     app.session.docs.iter().map(|d| d.doc.name.clone()).collect()
 }
 
+/// Asserts closing a window in the presenter shows the unsaved-changes dialog and does not
+/// dismiss the preview.
+#[test]
+fn closing_a_window_in_the_presenter_shows_the_unsaved_changes_dialog() {
+    let mut session = Session::new();
+    let frame_id = session.execute("node.create", &json!({"type": "frame", "width": 402, "height": 874})).unwrap()["id"].clone();
+    let ctx = egui::Context::default();
+    let mut app = FigApp::new(session, Box::new(NoServices));
+    frame(&ctx, &mut app, false);
+    app.session.execute("proto.present", &json!({"start": frame_id})).unwrap();
+    app.handle_ui_requests();
+    frame(&ctx, &mut app, false);
+    assert!(app.ui.present.is_some());
+
+    frame(&ctx, &mut app, true);
+    assert!(app.ui.confirm_close);
+    assert!(ctx.memory(|memory| memory.area_rect(egui::Id::unique(Some(crate::i18n::tr("Unsaved changes")))).is_some()), "dialog must be on screen");
+    frame(&ctx, &mut app, false);
+    assert!(app.ui.present.is_some(), "asking to close does not dismiss the preview");
+}
+
 #[test]
 fn windows_hold_tabs_and_close_with_their_files() {
     let mut s = Session::empty();
@@ -85,6 +106,8 @@ fn windows_hold_tabs_and_close_with_their_files() {
     assert_eq!(app.session.ds().unwrap().doc.name, "A");
 }
 
+/// Asserts a hidden other window answers edits and inspection in its own file while the main
+/// window keeps its file, and a capture parks with a deadline and times out once.
 #[test]
 fn another_hidden_window_answers_requests_that_need_no_frame_in_its_own_file() {
     let mut s = Session::empty();
@@ -116,13 +139,23 @@ fn another_hidden_window_answers_requests_that_need_no_frame_in_its_own_file() {
     assert_eq!(inspect.try_recv().expect("answered").result.unwrap()["name"], json!("A"));
     assert_eq!(app.session.ds().unwrap().doc.name, "B");
 
-    // What needs a frame keeps waiting for the other window; an unknown window is an error at once.
-    let ui = request(&mut app, "ui.inspect", json!({"window": w}));
+    // A capture that needs a frame is admitted and asks the hidden window to paint, rather than
+    // failing at once; only its deadline expires it (once).
+    // Model a request admitted long after startup, without waiting in real time.
+    app.clock.set_test_now(Some(120.0));
+    let shot = request(&mut app, "ui.screenshot", json!({"window": w, "path": "unused.png"}));
     let unknown = request(&mut app, "window.list", json!({"window": 99}));
     logic(&ctx, &mut app, &[ViewportId::ROOT, other]);
-    assert!(ui.try_recv().is_err(), "waits for the window to show");
+    assert!(shot.try_recv().is_err(), "waits for a forced hidden paint");
+    assert_eq!(app.capture.shots.len(), 1, "one admitted capture");
     assert!(unknown.try_recv().expect("answered").result.unwrap_err().contains("no window 99"));
-    assert_eq!(app.control_queue.len(), 1);
+    assert!(app.control_queue.is_empty());
+    // The whole request lifetime is over: one timeout reply, and nothing retained.
+    app.clock.set_test_now(Some(app.clock.now() + crate::control::SHOT_TIMEOUT + 1.0));
+    logic(&ctx, &mut app, &[ViewportId::ROOT, other]);
+    assert!(shot.try_recv().expect("answered").result.unwrap_err().contains("didn't deliver a screenshot"));
+    assert!(app.capture.shots.is_empty(), "released after its deadline");
+    app.clock.set_test_now(None);
 }
 
 #[test]
@@ -150,3 +183,321 @@ fn a_request_for_a_window_on_screen_wakes_it_while_the_main_window_is_hidden() {
     assert!(ui.try_recv().is_err(), "answered in the other window's frame");
     assert!(woken.lock().unwrap().contains(&other), "the other window is asked to draw: {:?}", woken.lock().unwrap());
 }
+
+/// Asserts every direct UI frame clears the logic-tick marker so background work runs each
+/// frame.
+#[test]
+fn every_direct_ui_frame_runs_background_work() {
+    // Direct `App::ui` harnesses never call `App::logic`: the tick marker the UI pass consumes
+    // must not leak into the next frame, or autosave/live/control work would run every other frame.
+    let ctx = egui::Context::default();
+    let mut app = FigApp::new(Session::empty(), Box::new(NoServices));
+    for _ in 0..3 {
+        frame(&ctx, &mut app, false);
+        assert!(!app.logic_ticked, "the next direct frame ticks for itself");
+    }
+}
+
+/// Asserts synthetic input for a child window reaches the pane that draws it, leaving the
+/// main window's pane untouched.
+#[test]
+fn synthetic_input_for_a_child_window_reaches_the_pane_that_draws_it() {
+    let mut s = Session::empty();
+    for n in ["A", "B"] {
+        s.execute("file.new", &json!({"name": n})).unwrap();
+    }
+    let ctx = egui::Context::default();
+    ctx.set_embed_viewports(false);
+    let mut app = FigApp::new(s, Box::new(NoServices));
+    frame(&ctx, &mut app, false);
+    let w = crate::control::handle(&mut app, &ctx, "window.new", &json!({"index": 0})).unwrap()["window"].as_u64().unwrap();
+    frame(&ctx, &mut app, false);
+    let other = crate::windows::viewport(w);
+    let events = vec![egui::Event::PointerMoved(egui::pos2(10.0, 10.0))];
+    // A request applied while the child draws must go to the live pane, not the swapped-out
+    // default `Pane` that `enter` took out (which `leave` would overwrite).
+    let pushed = crate::windows::as_window(&mut app, w, |app| app.push_control_input(events.clone()));
+    assert_eq!(pushed, Some(true));
+    assert!(app.control_input.is_empty(), "the main window's pane is untouched");
+    assert_eq!(crate::windows::take_input(&mut app, other), events, "the child's next frame takes its batch");
+}
+
+/// Asserts a child raw-input hook with no batch does not error or drain the root window's
+/// pending acknowledgement.
+#[test]
+fn a_frame_without_a_batch_does_not_error_another_windows_acknowledgement() {
+    let mut s = Session::empty();
+    for n in ["A", "B"] {
+        s.execute("file.new", &json!({"name": n})).unwrap();
+    }
+    let ctx = egui::Context::default();
+    ctx.set_embed_viewports(false);
+    let mut app = FigApp::new(s, Box::new(NoServices));
+    frame(&ctx, &mut app, false);
+    let w = crate::control::handle(&mut app, &ctx, "window.new", &json!({"index": 0})).unwrap()["window"].as_u64().unwrap();
+    frame(&ctx, &mut app, false);
+    // The root's batch awaits the pass that presents it.
+    let (tx, rx) = channel();
+    app.input_acks.push(crate::PendingAck { viewport: ViewportId::ROOT, tx, reply: ControlReply { id: json!(5), result: Ok(json!({})) } });
+    // The child's raw-input hook runs first in the same frame and has no batch of its own: that
+    // is not a document change, so the root's acknowledgement must neither be errored nor drained.
+    let events = crate::windows::take_input(&mut app, crate::windows::viewport(w));
+    assert!(events.is_empty());
+    assert!(rx.try_recv().is_err(), "no bogus document-change reply");
+    assert_eq!(app.input_acks.len(), 1, "the root's ack still waits for its own batch");
+    assert_eq!(app.input_acks[0].reply.id, json!(5));
+}
+
+/// Asserts a child window runs `viewport_setup` and its pane keeps the dark theme after the
+/// swap back.
+#[test]
+fn a_child_window_runs_the_ui_setup_the_main_window_does() {
+    // eframe calls `App::ui` only for the root window, so a child that draws while the root does
+    // not must still install the theme/language/fonts and its own `ui.dark`.
+    let mut s = Session::empty();
+    for n in ["A", "B"] {
+        s.execute("file.new", &json!({"name": n})).unwrap();
+    }
+    let ctx = egui::Context::default();
+    ctx.set_embed_viewports(false);
+    let mut app = FigApp::new(s, Box::new(NoServices));
+    frame(&ctx, &mut app, false);
+    let w = crate::control::handle(&mut app, &ctx, "window.new", &json!({"index": 0})).unwrap()["window"].as_u64().unwrap();
+    frame(&ctx, &mut app, false);
+    app.session.prefs.theme = "dark".into();
+    let dark = crate::windows::as_window(&mut app, w, |app| {
+        app.viewport_setup(&ctx);
+        app.inspect()["dark"].clone()
+    });
+    assert_eq!(dark, Some(json!(true)), "the child's pane knows the dark theme");
+    // It stays with the pane after the swap back, so its tabs and dialogs choose the right theme.
+    let again = crate::windows::as_window(&mut app, w, |app| app.inspect()["dark"].clone());
+    assert_eq!(again, Some(json!(true)));
+}
+
+/// Asserts a closed and later reused viewport does not inherit its old IME context
+/// generation.
+#[test]
+fn an_emptied_window_forgets_its_ime_context() {
+    // `windows::begin` ends the viewport when a window loses its last file; a later window that
+    // reuses the viewport identity must not inherit the old context generation.
+    use egui::ime_context::{CommittedText, ImeContextTracker, ImeObservation, ImeTarget};
+    use egui::{IMEPurpose, Id};
+
+    let mut s = Session::empty();
+    for n in ["A", "B"] {
+        s.execute("file.new", &json!({"name": n})).unwrap();
+    }
+    let ctx = egui::Context::default();
+    ctx.set_embed_viewports(false);
+    let mut app = FigApp::new(s, Box::new(NoServices));
+    frame(&ctx, &mut app, false);
+    let w = crate::control::handle(&mut app, &ctx, "window.new", &json!({"index": 0})).unwrap()["window"].as_u64().unwrap();
+    frame(&ctx, &mut app, false);
+    let vp = crate::windows::viewport(w);
+    let target = ImeTarget::new(Id::unique("figcraft.test.ime"), 3);
+    let observe = |tracker: &mut ImeContextTracker| {
+        let text = "a";
+        let observation = ImeObservation::new(1, 1, target).purpose(IMEPurpose::Normal).committed(Some(CommittedText::new(text, 1, 1)));
+        tracker.observe(vp, Some(observation))
+    };
+    let first = observe(&mut app.ime).expect("first focused observation");
+
+    if let Some(win) = app.windows.list.iter_mut().find(|x| x.id == w) {
+        win.docs.clear();
+    }
+    frame(&ctx, &mut app, false);
+    assert!(!app.windows.exists(w), "the empty window closed");
+    let again = observe(&mut app.ime).expect("a new context");
+    assert_ne!(again.context_generation, first.context_generation, "the closed viewport's context was forgotten");
+}
+
+/// Answers each Save as with the next of `paths` (none left: cancelled) and counts the dialogs
+/// asked for.
+struct SaveAs {
+    paths: Vec<std::path::PathBuf>,
+    asked: std::rc::Rc<std::cell::Cell<usize>>,
+}
+
+impl crate::Services for SaveAs {
+    fn pick_save(&mut self, _title: &str, _name: &str, _exts: &[&str]) -> crate::DialogFuture {
+        self.asked.set(self.asked.get() + 1);
+        let next = if self.paths.is_empty() { None } else { Some(self.paths.remove(0)) };
+        Box::pin(std::future::ready(next))
+    }
+}
+
+fn temp_dir(tag: &str) -> std::path::PathBuf {
+    let d = std::env::temp_dir().join(format!("figcraft-close-save-{tag}-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&d);
+    std::fs::create_dir_all(&d).unwrap();
+    d
+}
+
+/// The main window with one file that has unsaved changes, saved at `path` first when given, and
+/// the window asked to close (the question shows).
+fn asking(path: Option<&std::path::Path>, save_as: Vec<std::path::PathBuf>) -> (egui::Context, FigApp, std::rc::Rc<std::cell::Cell<usize>>) {
+    let mut s = Session::new();
+    if let Some(p) = path {
+        s.execute("file.saveAs", &json!({"path": p.to_string_lossy()})).unwrap();
+    }
+    s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+    let asked = std::rc::Rc::new(std::cell::Cell::new(0));
+    let ctx = egui::Context::default();
+    let mut app = FigApp::new(s, Box::new(SaveAs { paths: save_as, asked: asked.clone() }));
+    frame(&ctx, &mut app, false);
+    frame(&ctx, &mut app, true);
+    assert!(app.ui.confirm_close, "the question shows");
+    (ctx, app, asked)
+}
+
+fn rects_in(path: &std::path::Path) -> usize {
+    let mut s = Session::new();
+    s.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap();
+    s.doc().unwrap().nodes().filter(|n| n.name.starts_with("Rectangle")).count()
+}
+
+/// A few frames, as the window draws them.
+fn settle(ctx: &egui::Context, app: &mut FigApp) {
+    for _ in 0..4 {
+        frame(ctx, app, false);
+    }
+}
+
+#[test]
+fn the_unsaved_changes_question_offers_save_dont_save_and_cancel() {
+    // As the other Craft apps ask it (#1170): Don't Save, Cancel, and Save as the default.
+    let (ctx, mut app, _) = asking(None, vec![]);
+    ctx.enable_accesskit();
+    frame(&ctx, &mut app, false);
+    let mut out = ctx.run_ui(RawInput::default(), |ui| app.ui(ui));
+    // A canvas picture that lands in this frame uploads a texture nobody applies here.
+    out.textures_delta.clear();
+    let nodes = out.platform_output.accesskit_update.expect("an AccessKit update").nodes;
+    let buttons: Vec<String> =
+        nodes.iter().filter(|(_, n)| n.role() == egui::accesskit::Role::Button).filter_map(|(_, n)| n.label().map(str::to_string)).collect();
+    for want in ["Don't Save", "Cancel", "Save"] {
+        assert!(buttons.iter().any(|b| b == want), "{want} in {buttons:?}");
+    }
+    assert!(!buttons.iter().any(|b| b == "Close without saving"));
+}
+
+#[test]
+fn save_saves_a_file_with_a_path_and_then_closes() {
+    let d = temp_dir("path");
+    let path = d.join("a.figcraft");
+    let (ctx, mut app, asked) = asking(Some(&path), vec![]);
+    assert_eq!(rects_in(&path), 0);
+    crate::windows::answer_close(&mut app, &ctx, crate::windows::CloseAnswer::Save);
+    settle(&ctx, &mut app);
+    assert_eq!(rects_in(&path), 1, "saved where it was");
+    assert_eq!(asked.get(), 0, "no Save as for a file with a path");
+    assert!(app.ui.quit, "then the window closes");
+    std::fs::remove_dir_all(&d).ok();
+}
+
+#[test]
+fn save_waits_for_a_panel_field_to_commit() {
+    // The click on Save takes the keyboard from a panel field, which commits what was typed next
+    // frame: the save comes after that commit (stood in for by a command run before the frame).
+    let d = temp_dir("field");
+    let path = d.join("a.figcraft");
+    let (ctx, mut app, _) = asking(Some(&path), vec![]);
+    crate::windows::answer_close(&mut app, &ctx, crate::windows::CloseAnswer::Save);
+    app.session.execute("shape.rectangle", &json!({"x": 20, "y": 0, "width": 10, "height": 10})).unwrap();
+    settle(&ctx, &mut app);
+    assert_eq!(rects_in(&path), 2, "the committed edit is saved too");
+    assert!(app.ui.quit);
+    std::fs::remove_dir_all(&d).ok();
+}
+
+#[test]
+fn save_asks_where_for_an_untitled_file_and_closes_once_saved() {
+    let d = temp_dir("untitled");
+    let path = d.join("new.figcraft");
+    let (ctx, mut app, asked) = asking(None, vec![path.clone()]);
+    crate::windows::answer_close(&mut app, &ctx, crate::windows::CloseAnswer::Save);
+    settle(&ctx, &mut app);
+    assert_eq!(asked.get(), 1, "Save as asks where");
+    assert_eq!(rects_in(&path), 1, "saved there");
+    assert!(app.ui.quit, "then the window closes");
+    std::fs::remove_dir_all(&d).ok();
+}
+
+#[test]
+fn a_cancelled_save_as_or_a_failed_save_keeps_the_window_open() {
+    // Save as cancelled: nothing is written, the file keeps its changes and the window stays.
+    let (ctx, mut app, asked) = asking(None, vec![]);
+    crate::windows::answer_close(&mut app, &ctx, crate::windows::CloseAnswer::Save);
+    settle(&ctx, &mut app);
+    assert_eq!(asked.get(), 1);
+    assert!(!app.ui.quit && !app.ui.confirm_close, "open, and not asking again");
+    assert!(app.session.ds().unwrap().is_dirty());
+    assert_eq!(app.ui.close_after_save_as, None);
+
+    // The save fails (its folder is gone): the error shows and the window stays.
+    let d = temp_dir("gone");
+    let path = d.join("a.figcraft");
+    let (ctx, mut app, _) = asking(Some(&path), vec![]);
+    std::fs::remove_dir_all(&d).unwrap();
+    crate::windows::answer_close(&mut app, &ctx, crate::windows::CloseAnswer::Save);
+    settle(&ctx, &mut app);
+    assert!(!app.ui.quit, "a failed save keeps the window open");
+    assert!(app.session.ds().unwrap().is_dirty());
+}
+
+#[test]
+fn dont_save_closes_and_cancel_keeps_the_window() {
+    let d = temp_dir("answers");
+    let path = d.join("a.figcraft");
+    let (ctx, mut app, _) = asking(Some(&path), vec![]);
+    crate::windows::answer_close(&mut app, &ctx, crate::windows::CloseAnswer::Cancel);
+    settle(&ctx, &mut app);
+    assert!(!app.ui.quit && !app.ui.confirm_close);
+    frame(&ctx, &mut app, true);
+    crate::windows::answer_close(&mut app, &ctx, crate::windows::CloseAnswer::DontSave);
+    settle(&ctx, &mut app);
+    assert!(app.ui.quit, "Don't Save closes");
+    assert_eq!(rects_in(&path), 0, "without saving");
+    std::fs::remove_dir_all(&d).ok();
+}
+
+#[test]
+fn one_save_saves_every_untitled_file_of_the_window_then_closes() {
+    // Two new files with changes: Save asks where for each in turn, then the window closes,
+    // without asking the question again in between (#1173 review).
+    let d = temp_dir("two");
+    let (a, b) = (d.join("a.figcraft"), d.join("b.figcraft"));
+    let (ctx, mut app, asked) = asking(None, vec![a.clone(), b.clone()]);
+    app.session.execute("file.new", &json!({"name": "Second"})).unwrap();
+    app.session.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+    crate::windows::answer_close(&mut app, &ctx, crate::windows::CloseAnswer::Save);
+    for _ in 0..8 {
+        frame(&ctx, &mut app, false);
+        assert!(!app.ui.confirm_close, "not asked again");
+    }
+    assert_eq!(asked.get(), 2);
+    assert_eq!((rects_in(&a), rects_in(&b)), (1, 1), "both saved");
+    assert!(app.ui.quit);
+    std::fs::remove_dir_all(&d).ok();
+}
+
+#[test]
+fn enter_answers_save() {
+    let d = temp_dir("enter");
+    let path = d.join("a.figcraft");
+    let (ctx, mut app, _) = asking(Some(&path), vec![]);
+    frame(&ctx, &mut app, false);
+    let enter = |pressed| egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed, repeat: false, modifiers: egui::Modifiers::NONE };
+    let input = RawInput { events: vec![enter(true), enter(false)], ..Default::default() };
+    ctx.run_ui(input, |ui| {
+        crate::windows::on_close_request(&mut app, ui.ctx());
+        app.ui(ui);
+    })
+    .textures_delta
+    .clear();
+    settle(&ctx, &mut app);
+    assert_eq!(rects_in(&path), 1, "Enter saved");
+    assert!(app.ui.quit);
+    std::fs::remove_dir_all(&d).ok();
+}
diff --git a/crates/ui-egui/tests/canvas_pan_release.rs b/crates/ui-egui/tests/it/canvas_pan_release.rs
similarity index 98%
rename from crates/ui-egui/tests/canvas_pan_release.rs
rename to crates/ui-egui/tests/it/canvas_pan_release.rs
index c54d20dc..cd1a6e1c 100644
--- a/crates/ui-egui/tests/canvas_pan_release.rs
+++ b/crates/ui-egui/tests/it/canvas_pan_release.rs
@@ -1,6 +1,5 @@
 //! A canvas pan (middle button or Space + primary) ends when its button is released, even when the
 //! release happens over a panel: returning to the canvas with no button held must not move the view.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use egui::{Event, Key, PointerButton, Pos2, RawInput, Rect, vec2};
 use figcraft_engine::Session;
diff --git a/crates/ui-egui/tests/comment_open_other_page.rs b/crates/ui-egui/tests/it/comment_open_other_page.rs
similarity index 100%
rename from crates/ui-egui/tests/comment_open_other_page.rs
rename to crates/ui-egui/tests/it/comment_open_other_page.rs
diff --git a/crates/ui-egui/tests/file_menu_pdf.rs b/crates/ui-egui/tests/it/file_menu_pdf.rs
similarity index 97%
rename from crates/ui-egui/tests/file_menu_pdf.rs
rename to crates/ui-egui/tests/it/file_menu_pdf.rs
index 30b847b7..812529e0 100644
--- a/crates/ui-egui/tests/file_menu_pdf.rs
+++ b/crates/ui-egui/tests/it/file_menu_pdf.rs
@@ -1,6 +1,5 @@
 //! File > Export frames to PDF: the menu asks where to save and writes the frames' PDF there,
 //! one visible top-level frame per page.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use std::path::PathBuf;
 
diff --git a/crates/ui-egui/tests/guide_label_narrow.rs b/crates/ui-egui/tests/it/guide_label_narrow.rs
similarity index 97%
rename from crates/ui-egui/tests/guide_label_narrow.rs
rename to crates/ui-egui/tests/it/guide_label_narrow.rs
index 6c4276ad..464fbfed 100644
--- a/crates/ui-egui/tests/guide_label_narrow.rs
+++ b/crates/ui-egui/tests/it/guide_label_narrow.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::unwrap_used)]
-
 use egui::{Pos2, RawInput, Rect, Vec2, vec2};
 use figcraft_engine::Session;
 use figcraft_ui_egui::{FigApp, NoServices};
diff --git a/crates/ui-egui/tests/it/main.rs b/crates/ui-egui/tests/it/main.rs
new file mode 100644
index 00000000..007f450d
--- /dev/null
+++ b/crates/ui-egui/tests/it/main.rs
@@ -0,0 +1,11 @@
+//! The crate's integration tests, built as one test binary.
+
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod canvas_pan_release;
+mod comment_open_other_page;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod file_menu_pdf;
+#[allow(clippy::unwrap_used)]
+mod guide_label_narrow;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod recent_file_names;
diff --git a/crates/ui-egui/tests/recent_file_names.rs b/crates/ui-egui/tests/it/recent_file_names.rs
similarity index 94%
rename from crates/ui-egui/tests/recent_file_names.rs
rename to crates/ui-egui/tests/it/recent_file_names.rs
index 461d0c73..75ade0d1 100644
--- a/crates/ui-egui/tests/recent_file_names.rs
+++ b/crates/ui-egui/tests/it/recent_file_names.rs
@@ -1,5 +1,4 @@
 //! Recent file rows keep their full accessible name.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use egui::{Context, Id, Pos2, RawInput, Rect, accesskit::Role, vec2};
 use figcraft_engine::Session;
@@ -19,7 +18,7 @@ fn row(view: &str, path: &str, prefix: &str, exclude: &str) -> (String, Option<S
     let mut found = None;
     for frame in 0..4 {
         if frame >= 2 {
-            ctx.memory_mut(|m| m.request_focus(Id::new(("home_recent_file", path))));
+            ctx.memory_mut(|m| m.request_focus(Id::unique(("home_recent_file", path))));
         }
         let mut out = ctx.run_ui(
             RawInput {
diff --git a/crates/ui-egui/tests/type_settings_long_labels.rs b/crates/ui-egui/tests/type_settings_long_labels.rs
new file mode 100644
index 00000000..a1e8804d
--- /dev/null
+++ b/crates/ui-egui/tests/type_settings_long_labels.rs
@@ -0,0 +1,47 @@
+//! #1029, through the whole app: in a language whose labels run past Type settings' label column,
+//! the popover keeps its width while it stays open. French does with Inter (release builds, the
+//! report); Georgian does with egui's own fonts too (CI, which builds without craft-fonts). Its own
+//! test binary, since the UI language is one setting for the whole process.
+#![allow(clippy::unwrap_used)]
+
+use egui::{Id, Popup, Pos2, RawInput, Rect, vec2};
+use figcraft_engine::Session;
+use figcraft_ui_egui::{FigApp, NoServices};
+use serde_json::json;
+
+/// The Type settings popover's width over the frames it is open, the UI in `language`.
+fn widths(language: &str) -> Vec<f32> {
+    let mut s = Session::new();
+    s.execute("pref.language", &json!({"language": language})).unwrap();
+    // Truncating text also shows Max lines.
+    let text = s.execute("text.create", &json!({"text": "Type", "props": {"textAutoResize": "truncate"}})).unwrap()["id"].clone();
+    s.execute("select.set", &json!({"ids": [text]})).unwrap();
+    let ctx = egui::Context::default();
+    let mut app = FigApp::new(s, Box::new(NoServices));
+    let open = Id::unique("ty_settings_open");
+    let mut widths = Vec::new();
+    for i in 0..40 {
+        if i == 3 {
+            Popup::open_id(&ctx, open);
+        }
+        let raw =
+            RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), time: Some(i as f64 / 60.0), ..Default::default() };
+        ctx.run_ui(raw, |ui| app.ui(ui)).textures_delta.clear();
+        // From the frame after the one it opened on (egui's sizing pass).
+        if i > 3 {
+            assert!(Popup::is_id_open(&ctx, open), "{language}: Type settings closed on frame {i}");
+            widths.push(ctx.memory(|m| m.area_rect(open)).unwrap().width());
+        }
+    }
+    widths
+}
+
+#[test]
+fn type_settings_keeps_its_width_with_labels_longer_than_their_column() {
+    for language in ["ka", "fr"] {
+        let w = widths(language);
+        assert_ne!(figcraft_ui_egui::i18n::tr("Paragraph indent"), "Paragraph indent", "{language} is shown");
+        // The width it asks for (`Popup::width`), every frame.
+        assert!(w.iter().all(|x| (x - 264.0).abs() < 0.01), "{language}: Type settings widens: {} → {}", w[0], w[w.len() - 1]);
+    }
+}
diff --git a/crates/vectordrawable/Cargo.toml b/crates/vectordrawable/Cargo.toml
new file mode 100644
index 00000000..461e9c07
--- /dev/null
+++ b/crates/vectordrawable/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "figcraft-vectordrawable"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+description = "FigCraft Android Vector Drawable export (shapes, strokes, gradients, clips and vector masks as a <vector> XML drawable)"
+
+[lints]
+workspace = true
+
+[dependencies]
+figcraft-geom = { workspace = true }
+figcraft-color = { workspace = true }
+figcraft-doc = { workspace = true }
+figcraft-text = { workspace = true }
+figcraft-render = { workspace = true }
+figcraft-pathops = { workspace = true }
+thiserror = { workspace = true }
+
+[dev-dependencies]
+roxmltree = "0.21"
diff --git a/crates/vectordrawable/src/lib.rs b/crates/vectordrawable/src/lib.rs
new file mode 100644
index 00000000..f12e9158
--- /dev/null
+++ b/crates/vectordrawable/src/lib.rs
@@ -0,0 +1,111 @@
+//! Android Vector Drawable export: the exported layers as one `<vector>` XML drawable.
+//!
+//! Written from Android's public `VectorDrawable` documentation (elements `<vector>`, `<group>`,
+//! `<path>`, `<clip-path>`, gradients as inline `GradientColor` resources through `aapt:attr`).
+//! The drawable is as large as the exported area in dp (1 px = 1 dp), with a viewport of the same
+//! size, so path coordinates are page units relative to the area's top-left corner.
+//!
+//! What maps exactly:
+//! - shapes, booleans, vector networks, frames and text: their outlines
+//!   (`figcraft_render::node_outline`, glyph outlines per styled run), with every transform baked
+//!   into the path data (a `<group>` can only scale, rotate and translate, a `<path>` not at all);
+//! - solid fills and paint, layer and stop opacity, folded into `#AARRGGBB` colours;
+//! - centred, uniform, solid strokes as stroke attributes (width, cap, join, miter limit); every
+//!   other stroke (inside, outside, dashed, variable width, arrows, per-side weights, gradient
+//!   paints, under a skew or non-uniform scale) as its filled outline
+//!   (`figcraft_render::draw::stroke_area`);
+//! - linear, radial and angular (sweep) gradients, for any handle frame: a linear gradient's end
+//!   point is projected so it bands along the width handle; radial and sweep gradients go in a
+//!   `<group>` that scales and rotates the unit circle onto the handle ellipse (a 2×2 singular
+//!   value decomposition; the remaining rotation turns a sweep's stops), with the path mapped back;
+//! - clipping frames and vector masks, as a `<group>` with a `<clip-path>`.
+//!
+//! What can't map exactly depends on [`Compat`]: layer opacity over overlapping shapes, even-odd
+//! fills and clip outlines, diamond gradients, alpha and luminance masks. Images, patterns,
+//! effects and blend modes have no Vector Drawable equivalent and are left out (blend modes draw
+//! as normal). Every change is listed in [`VdExport::warnings`] unless the mode is
+//! [`Compat::Ignore`].
+#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
+
+mod model;
+mod paint;
+mod stroke;
+mod text;
+mod walk;
+mod warnings;
+mod xml;
+
+use figcraft_doc::{Document, NodeId};
+use figcraft_geom::{Affine, Rect};
+use figcraft_render::{ExportDepthError, check_export_depth};
+
+/// How the export handles what a Vector Drawable can't draw exactly.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub enum Compat {
+    /// The closest drawing (layer opacity on each shape, even-odd fills and clip outlines rewritten as non-zero, diamond
+    /// gradients as radial, alpha masks as vector masks), with a warning for each change.
+    #[default]
+    BestEffort,
+    /// Never approximate: a layer or paint that can't be drawn exactly is left out, with a warning.
+    Exact,
+    /// Write what maps and leave out the rest without warnings (layer opacity over overlapping
+    /// shapes is dropped, even-odd fills stay `fillType="evenOdd"`, even-odd clip outlines clip
+    /// as non-zero, diamond gradients are left out, alpha masks clip to their outline).
+    Ignore,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct VdOptions {
+    /// The page area the drawable covers (default: the exported layers' export bounds).
+    pub bounds: Option<Rect>,
+    /// Layer names as `android:name` attributes (unique in the file: repeats get `_2`, `_3`…).
+    pub include_names: bool,
+    pub compat: Compat,
+}
+
+/// A written drawable and what was changed or left out on the way.
+#[derive(Clone, Debug, PartialEq)]
+pub struct VdExport {
+    pub xml: String,
+    pub warnings: Vec<String>,
+}
+
+#[derive(Debug, thiserror::Error, PartialEq)]
+pub enum VdError {
+    #[error("nothing to export")]
+    Empty,
+    #[error(transparent)]
+    Depth(#[from] ExportDepthError),
+}
+
+/// The layers `ids` (bottom to top) as an Android Vector Drawable. Colours are written as they
+/// are: convert a Display P3 document to sRGB first (`Document::in_srgb`).
+pub fn try_export(doc: &Document, ids: &[NodeId], opts: &VdOptions) -> Result<VdExport, VdError> {
+    check_export_depth(doc, ids)?;
+    let area = match opts.bounds {
+        Some(b) if [b.x0, b.y0, b.x1, b.y1].iter().all(|v| v.is_finite()) => b,
+        _ => ids.iter().filter_map(|i| figcraft_render::export_bounds(doc, *i)).reduce(|a, b| a.union(b)).ok_or(VdError::Empty)?,
+    };
+    let (w, h) = (area.width(), area.height());
+    if !(w.is_finite() && h.is_finite() && w > 0.0 && h > 0.0) {
+        return Err(VdError::Empty);
+    }
+    let origin = Affine::translate((-area.x0, -area.y0));
+    let mut walker = walk::Walker::new(doc, opts);
+    let mut items = Vec::new();
+    for id in ids {
+        let parent_xf = doc.node(*id).and_then(|n| n.parent).map(|p| doc.world_transform(p)).unwrap_or(Affine::IDENTITY);
+        items.extend(walker.node(*id, origin * parent_xf, 0));
+    }
+    // Nothing drawn still writes a drawable Android loads (one empty path), so a batch export
+    // keeps going, but say so.
+    if items.is_empty() {
+        let first = ids.first().and_then(|i| doc.node(*i)).map(|n| n.name.clone()).unwrap_or_default();
+        walker.nothing_drawn(&first);
+    }
+    let xml = xml::document(w, h, &items);
+    Ok(VdExport { xml, warnings: walker.finish() })
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/vectordrawable/src/model.rs b/crates/vectordrawable/src/model.rs
new file mode 100644
index 00000000..7b6bf7f1
--- /dev/null
+++ b/crates/vectordrawable/src/model.rs
@@ -0,0 +1,122 @@
+//! What the walk produces before it's written: paths and groups in viewport coordinates.
+
+use figcraft_color::Color;
+use figcraft_geom::{BezPath, Rect};
+
+/// A gradient in the coordinates of the path it fills.
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) enum GradKind {
+    Linear { start: (f64, f64), end: (f64, f64) },
+    Radial { center: (f64, f64), radius: f64 },
+    Sweep { center: (f64, f64) },
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) struct Grad {
+    pub kind: GradKind,
+    /// Offsets in 0..=1, ascending; colours with their opacity folded in.
+    pub stops: Vec<(f64, Color)>,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) enum Fill {
+    Solid(Color),
+    Gradient(Grad),
+}
+
+/// A stroke Android draws itself (centred, uniform, solid).
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) struct NativeStroke {
+    pub color: Color,
+    pub width: f64,
+    pub cap: &'static str,
+    pub join: &'static str,
+    pub miter: f64,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) struct PathItem {
+    pub name: Option<String>,
+    pub data: BezPath,
+    pub fill: Option<Fill>,
+    pub stroke: Option<NativeStroke>,
+    pub even_odd: bool,
+}
+
+/// A `<group>`'s own transform: scale, then rotate (degrees), then translate.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(crate) struct GroupXf {
+    pub translate: (f64, f64),
+    pub rotation: f64,
+    pub scale: (f64, f64),
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) struct GroupItem {
+    pub name: Option<String>,
+    pub xf: Option<GroupXf>,
+    /// A non-zero clip outline in the group's (untransformed) coordinates.
+    pub clip: Option<BezPath>,
+    pub children: Vec<Item>,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) enum ItemKind {
+    Path(PathItem),
+    Group(GroupItem),
+}
+
+/// One written element with the viewport area it paints (for the opacity overlap test).
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) struct Item {
+    pub kind: ItemKind,
+    pub bbox: Rect,
+}
+
+impl Item {
+    /// The areas of what paints, each a leaf (a path, or a transformed gradient group).
+    pub fn leaf_boxes(items: &[Item], out: &mut Vec<Rect>) {
+        for it in items {
+            match &it.kind {
+                ItemKind::Group(g) if g.xf.is_none() => Self::leaf_boxes(&g.children, out),
+                _ => out.push(it.bbox),
+            }
+        }
+    }
+
+    /// Multiply every colour's alpha by `k` (a layer's opacity folded into what it paints).
+    pub fn scale_alpha(items: &mut [Item], k: f32) {
+        let fade = |c: &mut Color| c.a = (c.a * k).clamp(0.0, 1.0);
+        for it in items {
+            match &mut it.kind {
+                ItemKind::Path(p) => {
+                    match &mut p.fill {
+                        Some(Fill::Solid(c)) => fade(c),
+                        Some(Fill::Gradient(g)) => g.stops.iter_mut().for_each(|(_, c)| fade(c)),
+                        None => {}
+                    }
+                    if let Some(s) = &mut p.stroke {
+                        fade(&mut s.color);
+                    }
+                }
+                ItemKind::Group(g) => Self::scale_alpha(&mut g.children, k),
+            }
+        }
+    }
+
+    /// Whether any two leaves' areas overlap (more than `MAX` leaves count as overlapping).
+    pub fn overlap(items: &[Item]) -> bool {
+        const MAX: usize = 64;
+        let mut boxes = Vec::new();
+        Self::leaf_boxes(items, &mut boxes);
+        if boxes.len() > MAX {
+            return true;
+        }
+        boxes.iter().enumerate().any(|(i, a)| {
+            boxes.iter().skip(i + 1).any(|b| {
+                let r = a.intersect(*b);
+                r.width() > 1e-9 && r.height() > 1e-9
+            })
+        })
+    }
+}
diff --git a/crates/vectordrawable/src/paint.rs b/crates/vectordrawable/src/paint.rs
new file mode 100644
index 00000000..f66d0554
--- /dev/null
+++ b/crates/vectordrawable/src/paint.rs
@@ -0,0 +1,139 @@
+//! Gradients in Vector Drawable terms, and the even-odd → non-zero rewrite.
+//!
+//! A gradient's handles map the unit box onto the layer: (0,0) → from, (1,0) → to, (0,1) →
+//! width, a frame `F` (with the layer's transform, into the viewport). A linear gradient bands
+//! along `F`'s second axis, so its Vector Drawable end point is the first axis with the part
+//! along the second removed: exact for any frame, skewed too. Radial and sweep gradients live on
+//! the unit circle: `F = T · R(φ) · S(sx, sy) · R(θ)` (a 2×2 singular value decomposition; `sy`
+//! is negative for a mirrored frame), and a circle doesn't change under the last rotation, so a
+//! `<group>` with translate `T`, rotation `φ` and scale `S` holds a unit gradient at the origin
+//! and the path mapped back by the group's inverse. A sweep turns with `θ`: its stops are
+//! shifted by `θ / 2π` instead.
+
+use figcraft_color::{Color, Gradient};
+use figcraft_geom::{Affine, BezPath, Vec2};
+
+use crate::model::{Grad, GradKind, GroupXf};
+
+/// A gradient fill, ready to write.
+#[derive(Debug, PartialEq)]
+pub(crate) enum GradOut {
+    /// In viewport coordinates, on the path as it is.
+    Plain(Grad),
+    /// In the coordinates of a `<group>` with this transform; `inverse` maps the path into them.
+    Grouped { xf: GroupXf, inverse: Affine, grad: Grad },
+    /// One stop: a solid colour.
+    Solid(Color),
+    /// A frame that collapses to a line or a point: the renderer paints nothing, nor do we.
+    Nothing,
+}
+
+/// The gradient handle frame in a `w`×`h` layer's local space.
+pub(crate) fn frame(g: &Gradient, w: f64, h: f64) -> Affine {
+    let f = (g.from.0 * w, g.from.1 * h);
+    let t = (g.to.0 * w, g.to.1 * h);
+    let k = (g.width.0 * w, g.width.1 * h);
+    Affine::new([t.0 - f.0, t.1 - f.1, k.0 - f.0, k.1 - f.1, f.0, f.1])
+}
+
+/// `m` (2×2, column vectors `(a, b)` and `(c, d)`) as `R(φ) · diag(sx, sy) · R(θ)`: `(φ, sx,
+/// sy, θ)` in radians. `sx ≥ |sy|`; `sy < 0` when `m` mirrors.
+pub(crate) fn svd(a: f64, b: f64, c: f64, d: f64) -> (f64, f64, f64, f64) {
+    let (e, f, g, h) = ((a + d) / 2.0, (a - d) / 2.0, (b + c) / 2.0, (b - c) / 2.0);
+    let (q, r) = (e.hypot(h), f.hypot(g));
+    let (a1, a2) = (g.atan2(f), h.atan2(e));
+    ((a2 + a1) / 2.0, q + r, q - r, (a2 - a1) / 2.0)
+}
+
+/// The colour of `stops` (sorted, at least one) at `t`, clamped at the ends.
+pub(crate) fn color_at(stops: &[(f64, Color)], t: f64) -> Color {
+    let (Some(first), Some(last)) = (stops.first(), stops.last()) else { return Color::new(0.0, 0.0, 0.0, 0.0) };
+    if t <= first.0 {
+        return first.1;
+    }
+    for w in stops.windows(2) {
+        if let [(o0, c0), (o1, c1)] = w
+            && t <= *o1
+        {
+            let span = o1 - o0;
+            let k = if span > 0.0 { ((t - o0) / span) as f32 } else { 1.0 };
+            let mix = |x: f32, y: f32| x + (y - x) * k;
+            return Color::new(mix(c0.r, c1.r), mix(c0.g, c1.g), mix(c0.b, c1.b), mix(c0.a, c1.a));
+        }
+    }
+    last.1
+}
+
+/// Sweep stops turned by `shift` of a turn: what was at `t` is at `t + shift` (wrapping), with
+/// the seam where the gradient starts over kept as a hard step.
+pub(crate) fn turn_stops(stops: &[(f64, Color)], shift: f64) -> Vec<(f64, Color)> {
+    let d = shift.rem_euclid(1.0);
+    if !d.is_finite() || d < 1e-9 || d > 1.0 - 1e-9 || stops.is_empty() {
+        return stops.to_vec();
+    }
+    let seam = 1.0 - d;
+    let mut out = vec![(0.0, color_at(stops, seam))];
+    out.extend(stops.iter().filter(|(o, _)| *o > seam).map(|(o, c)| (o - seam, *c)));
+    out.push((d, color_at(stops, 1.0)));
+    out.push((d, color_at(stops, 0.0)));
+    out.extend(stops.iter().filter(|(o, _)| *o < seam).map(|(o, c)| (o + d, *c)));
+    out.push((1.0, color_at(stops, seam)));
+    // A stop on the seam itself would repeat at the same offset: keep one of each.
+    out.dedup_by(|b, a| (a.0 - b.0).abs() < 1e-9 && a.1 == b.1);
+    out
+}
+
+/// Gradient `g` on a `w`×`h` layer drawn through `to_view` (local → viewport), its stops faded by
+/// `opacity`. `radial` draws an angular or diamond gradient as radial (callers decide when).
+pub(crate) fn gradient(g: &Gradient, opacity: f32, to_view: Affine, w: f64, h: f64, radial: bool) -> GradOut {
+    use figcraft_color::GradientKind;
+    let stops: Vec<(f64, Color)> =
+        g.sorted_stops().iter().map(|s| (f64::from(s.position), s.color.with_alpha(s.color.a * opacity.clamp(0.0, 1.0)))).collect();
+    match stops.as_slice() {
+        [] => return GradOut::Nothing,
+        [(_, c)] => return GradOut::Solid(*c),
+        _ => {}
+    }
+    let f = to_view * frame(g, w, h);
+    let [a, b, c, d, e, ff] = f.as_coeffs();
+    let det = a * d - b * c;
+    let scale = (a * a + b * b + c * c + d * d).max(f64::MIN_POSITIVE);
+    if !(det.is_finite() && e.is_finite() && ff.is_finite()) || det.abs() <= 1e-12 * scale {
+        return GradOut::Nothing;
+    }
+    let kind = if radial { GradientKind::Radial } else { g.kind };
+    match kind {
+        GradientKind::Linear => {
+            let (a0, a1) = (Vec2::new(a, b), Vec2::new(c, d));
+            let k = a0.dot(a1) / a1.hypot2();
+            let n = a0 - a1 * k;
+            GradOut::Plain(Grad { kind: GradKind::Linear { start: (e, ff), end: (e + n.x, ff + n.y) }, stops })
+        }
+        _ => {
+            let (phi, sx, sy, theta) = svd(a, b, c, d);
+            if !(phi.is_finite() && sx.is_finite() && sy.is_finite() && theta.is_finite()) || sy.abs() <= 1e-9 * sx.abs() {
+                return GradOut::Nothing;
+            }
+            let group = Affine::translate((e, ff)) * Affine::rotate(phi) * Affine::scale_non_uniform(sx, sy);
+            let xf = GroupXf { translate: (e, ff), rotation: phi.to_degrees(), scale: (sx, sy) };
+            let grad = if kind == GradientKind::Angular {
+                Grad { kind: GradKind::Sweep { center: (0.0, 0.0) }, stops: turn_stops(&stops, theta / std::f64::consts::TAU) }
+            } else {
+                Grad { kind: GradKind::Radial { center: (0.0, 0.0), radius: 1.0 }, stops }
+            };
+            GradOut::Grouped { xf, inverse: group.inverse(), grad }
+        }
+    }
+}
+
+/// `path` (filled even-odd) as a path that fills the same area with the non-zero rule: the faces
+/// of its arrangement, each an outer contour with its holes wound the other way. `None` when the
+/// path ops can't take it.
+pub(crate) fn nonzero(path: &BezPath) -> Option<BezPath> {
+    let faces = figcraft_pathops::faces(&[(path.clone(), true)]).ok()?;
+    let mut out = BezPath::new();
+    for f in faces {
+        out.extend(f.path.elements().iter().copied());
+    }
+    Some(out)
+}
diff --git a/crates/vectordrawable/src/stroke.rs b/crates/vectordrawable/src/stroke.rs
new file mode 100644
index 00000000..df8c00e2
--- /dev/null
+++ b/crates/vectordrawable/src/stroke.rs
@@ -0,0 +1,62 @@
+//! Strokes Android can draw itself, and the rule for the filled outline of the rest.
+
+use figcraft_doc::{Node, NodeKind, StrokeAlign, StrokeCap, StrokeJoin};
+use figcraft_geom::{Affine, BezPath};
+
+/// A stroke's Vector Drawable attributes: its path (local), width (viewport), cap, join, miter.
+pub(crate) struct Native {
+    pub path: BezPath,
+    pub width: f64,
+    pub cap: &'static str,
+    pub join: &'static str,
+    pub miter: f64,
+}
+
+/// Whether `xf` keeps angles and scales evenly (a rotation, flip and uniform scale), so a stroke
+/// width stays one width.
+pub(crate) fn similarity(xf: Affine) -> bool {
+    let [a, b, c, d, _, _] = xf.as_coeffs();
+    let s2 = (a * a + b * b + c * c + d * d) / 2.0;
+    s2.is_finite() && s2 > 0.0 && (a * c + b * d).abs() <= 1e-6 * s2 && (a * a + b * b - c * c - d * d).abs() <= 1e-6 * s2
+}
+
+/// `n`'s stroke as stroke attributes when Android draws it the same: centred, uniform, without
+/// dashes, arrows or per-point styles, on a shape (not text or a boolean) drawn through a
+/// similarity `xf`. `None`: write its filled outline.
+pub(crate) fn native(n: &Node, xf: Affine) -> Option<Native> {
+    let k = &n.stroke;
+    if k.align != StrokeAlign::Center
+        || k.sides.is_some()
+        || k.profile().is_some()
+        || k.brush.is_some()
+        || !k.dashes.is_empty()
+        || k.cap_start != k.cap_end
+        || k.cap_start.is_arrow()
+        || !(k.weight.is_finite() && k.weight > 0.0)
+        || matches!(n.kind, NodeKind::Text(_) | NodeKind::BooleanOp { .. } | NodeKind::Group | NodeKind::Page { .. })
+        || matches!(&n.kind, NodeKind::Vector { network } if network.has_point_styles(k.join))
+        || !similarity(xf)
+    {
+        return None;
+    }
+    let path = figcraft_doc::geometry::stroke_geometry(n)?;
+    let width = k.weight * xf.determinant().abs().sqrt();
+    let cap = match k.cap_start {
+        StrokeCap::Round => "round",
+        StrokeCap::Square => "square",
+        _ => "butt",
+    };
+    let join = match k.join {
+        StrokeJoin::Miter => "miter",
+        StrokeJoin::Round => "round",
+        StrokeJoin::Bevel => "bevel",
+    };
+    let miter = if k.miter_limit.is_finite() { k.miter_limit.max(1.0) } else { 4.0 };
+    width.is_finite().then_some(Native { path, width, cap, join, miter })
+}
+
+/// Whether `n`'s filled stroke outline needs the even-odd rule (rings of inside and outside
+/// strokes, per-side strokes), as the renderer fills it.
+pub(crate) fn outline_even_odd(n: &Node, closed: bool) -> bool {
+    n.stroke.sides.is_some() || (n.stroke.dashes.is_empty() && closed && n.stroke.align != StrokeAlign::Center)
+}
diff --git a/crates/vectordrawable/src/tests/compat.rs b/crates/vectordrawable/src/tests/compat.rs
new file mode 100644
index 00000000..b26047d8
--- /dev/null
+++ b/crates/vectordrawable/src/tests/compat.rs
@@ -0,0 +1,261 @@
+use super::*;
+use crate::paint::nonzero;
+use figcraft_color::BlendMode;
+use figcraft_doc::{Effect, MaskType};
+use figcraft_geom::{BezPath, Point, Shape};
+
+fn fills(xml: &str) -> Vec<String> {
+    tagged(&elements(xml), "path").iter().filter_map(|e| e.get("fillColor").map(str::to_string)).collect()
+}
+
+/// A 50% frame over two rectangles, apart or overlapping.
+fn faded(overlap: bool) -> (Document, NodeId) {
+    let (mut d, p) = doc();
+    let f = d.create(p, NodeKind::Frame, "Card", 0.0, 0.0, 100.0, 100.0).unwrap();
+    d.get_mut(f).unwrap().fills.clear();
+    d.get_mut(f).unwrap().opacity = 0.5;
+    rect(&mut d, f, "A", 0.0, 0.0, 40.0, 40.0, "FF0000");
+    let x = if overlap { 20.0 } else { 60.0 };
+    rect(&mut d, f, "B", x, 20.0, 40.0, 40.0, "0000FF");
+    (d, f)
+}
+
+#[test]
+fn opacity_over_shapes_apart_is_exact_in_every_mode() {
+    let (d, f) = faded(false);
+    for compat in [Compat::BestEffort, Compat::Exact, Compat::Ignore] {
+        let out = export(&d, &[f], compat);
+        assert_eq!(fills(&out.xml), ["#80FF0000", "#800000FF"], "{compat:?}");
+        assert!(out.warnings.is_empty(), "{compat:?}: {:?}", out.warnings);
+    }
+}
+
+#[test]
+fn opacity_over_overlapping_shapes_per_mode() {
+    let (d, f) = faded(true);
+    let best = export(&d, &[f], Compat::BestEffort);
+    assert_eq!(fills(&best.xml), ["#80FF0000", "#800000FF"]);
+    assert_eq!(best.warnings, ["layer opacity was applied to each shape: where shapes overlap they look denser (Card)"]);
+    let exact = export(&d, &[f], Compat::Exact);
+    assert!(fills(&exact.xml).is_empty(), "{}", exact.xml);
+    assert_eq!(
+        exact.warnings,
+        [
+            "layers with opacity over overlapping shapes were left out (exact mode) (Card)",
+            "nothing in it could be drawn: the drawable is empty (Card)"
+        ]
+    );
+    let ignore = export(&d, &[f], Compat::Ignore);
+    assert_eq!(fills(&ignore.xml), ["#FF0000", "#0000FF"]);
+    assert!(ignore.warnings.is_empty());
+}
+
+#[test]
+fn a_faded_leaf_with_a_fill_and_a_stroke_overlaps_itself() {
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "R", 0.0, 0.0, 40.0, 40.0, "FF0000");
+    let n = d.get_mut(r).unwrap();
+    n.strokes = vec![Paint::solid(hex("000000"))];
+    n.stroke.weight = 2.0;
+    n.stroke.align = figcraft_doc::StrokeAlign::Center;
+    n.opacity = 0.5;
+    let w = export(&d, &[r], Compat::BestEffort).warnings;
+    assert_eq!(w, ["layer opacity was applied to each shape: where shapes overlap they look denser (R)"]);
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "R", 0.0, 0.0, 40.0, 40.0, "FF0000");
+    d.get_mut(r).unwrap().opacity = 0.5;
+    let out = export(&d, &[r], Compat::Exact);
+    assert_eq!((fills(&out.xml), out.warnings), (vec!["#80FF0000".to_string()], vec![]));
+}
+
+#[test]
+fn even_odd_fills_per_mode() {
+    let (mut d, p) = doc();
+    let a = rect(&mut d, p, "A", 0.0, 0.0, 60.0, 60.0, "000000");
+    let b = rect(&mut d, p, "B", 20.0, 20.0, 20.0, 20.0, "000000");
+    let bo = d.create(p, NodeKind::BooleanOp { op: figcraft_doc::BoolOp::Exclude }, "Ring", 0.0, 0.0, 1.0, 1.0).unwrap();
+    d.reparent(a, bo, None).unwrap();
+    d.reparent(b, bo, None).unwrap();
+    d.fit_to_children(bo).unwrap();
+    d.get_mut(bo).unwrap().fills = vec![Paint::solid(hex("336699"))];
+    let best = export(&d, &[bo], Compat::BestEffort);
+    let path = paths_of(&best.xml)[0].clone();
+    assert!(path.get("fillType").is_none(), "{}", best.xml);
+    let ring = super::strokes::parse_path(path.get("pathData").unwrap());
+    assert_ne!(ring.winding(Point::new(5.0, 5.0)), 0);
+    assert_eq!(ring.winding(Point::new(30.0, 30.0)), 0, "the hole stays a hole under non-zero");
+    // Exact keeps the rule (AndroidX draws it), as does ignore.
+    for compat in [Compat::Exact, Compat::Ignore] {
+        let out = export(&d, &[bo], compat);
+        assert_eq!(paths_of(&out.xml)[0].get("fillType"), Some("evenOdd"), "{compat:?}");
+        assert!(out.warnings.is_empty());
+    }
+    assert_eq!(best.warnings, ["even-odd fills were rewritten as non-zero (Ring)"]);
+}
+
+/// Even-odd inside-ness of `p` against non-zero inside-ness of `nonzero(p)`, on a grid.
+fn same_area(p: &BezPath) {
+    let q = nonzero(p).unwrap();
+    let b = p.bounding_box();
+    let mut inside = 0;
+    for i in 0..60 {
+        for j in 0..60 {
+            let pt = Point::new(b.x0 + b.width() * (i as f64 + 0.37) / 60.0, b.y0 + b.height() * (j as f64 + 0.41) / 60.0);
+            let even = p.winding(pt) % 2 != 0;
+            assert_eq!(even, q.winding(pt) != 0, "at {pt:?}");
+            inside += usize::from(even);
+        }
+    }
+    assert!(inside > 100, "{inside}");
+}
+
+#[test]
+fn the_non_zero_rewrite_fills_the_same_area() {
+    // A pentagram: the middle pentagon is winding 2, outside under even-odd.
+    let mut star = BezPath::new();
+    for k in 0..5 {
+        let a = std::f64::consts::TAU * (k * 2 % 5) as f64 / 5.0 - std::f64::consts::FRAC_PI_2;
+        let pt = Point::new(50.0 + 40.0 * a.cos(), 50.0 + 40.0 * a.sin());
+        if k == 0 { star.move_to(pt) } else { star.line_to(pt) }
+    }
+    star.close_path();
+    same_area(&star);
+    // Nested squares wound the same way (three levels) and an overlapping circle.
+    let mut nest = BezPath::new();
+    for (o, s) in [(0.0, 90.0), (15.0, 60.0), (30.0, 30.0)] {
+        nest.extend(figcraft_geom::Rect::new(o, o, o + s, o + s).to_path(0.1));
+    }
+    nest.extend(figcraft_geom::kurbo::Circle::new((80.0, 80.0), 25.0).to_path(0.1));
+    same_area(&nest);
+}
+
+#[test]
+fn alpha_masks_per_mode() {
+    let (mut d, p) = doc();
+    let g = d.create(p, NodeKind::Group, "G", 0.0, 0.0, 100.0, 100.0).unwrap();
+    let m = d.create(g, ellipse(), "Fade", 10.0, 10.0, 80.0, 80.0).unwrap();
+    d.get_mut(m).unwrap().is_mask = true;
+    d.get_mut(m).unwrap().mask_type = MaskType::Alpha;
+    d.get_mut(m).unwrap().fills = vec![Paint::solid(hex("80808080"))];
+    rect(&mut d, g, "Content", 0.0, 0.0, 100.0, 100.0, "2255FF");
+    let best = export(&d, &[g], Compat::BestEffort);
+    assert!(best.xml.contains("<clip-path") && best.xml.contains("#2255FF"), "{}", best.xml);
+    assert_eq!(best.warnings, ["alpha and luminance masks clip to the mask's outline (Fade)"]);
+    let exact = export(&d, &[g], Compat::Exact);
+    assert!(!exact.xml.contains("#2255FF"), "{}", exact.xml);
+    assert_eq!(
+        exact.warnings,
+        ["layers under alpha or luminance masks were left out (exact mode) (Fade)", "nothing in it could be drawn: the drawable is empty (G)"]
+    );
+    let ignore = export(&d, &[g], Compat::Ignore);
+    assert!(ignore.xml.contains("<clip-path") && ignore.warnings.is_empty());
+}
+
+#[test]
+fn what_has_no_equivalent_is_left_out_and_named_once_per_kind() {
+    let (mut d, p) = doc();
+    let f = d.create(p, NodeKind::Frame, "F", 0.0, 0.0, 200.0, 200.0).unwrap();
+    d.get_mut(f).unwrap().fills.clear();
+    for i in 0..5 {
+        let r = rect(&mut d, f, &format!("Shadow {i}"), 40.0 * i as f64, 0.0, 30.0, 30.0, "FF0000");
+        d.get_mut(r).unwrap().effects = vec![Effect::drop_shadow()];
+    }
+    let b = rect(&mut d, f, "", 0.0, 100.0, 30.0, 30.0, "00FF00");
+    d.get_mut(b).unwrap().blend = BlendMode::Multiply;
+    d.get_mut(b).unwrap().effects = vec![Effect::layer_blur()];
+    let img = rect(&mut d, f, "Photo", 100.0, 100.0, 30.0, 30.0, "000000");
+    d.get_mut(img).unwrap().fills = vec![Paint::image("abc", figcraft_color::ImageScaleMode::Fill)];
+    let out = export(&d, &[f], Compat::BestEffort);
+    assert_eq!(
+        out.warnings,
+        [
+            "drop shadows were left out (Shadow 0, Shadow 1, Shadow 2, 2 more)",
+            "layer blurs were left out (unnamed layer)",
+            "blend modes were drawn as normal (unnamed layer)",
+            "image fills were left out (Photo)",
+        ]
+    );
+    // The shapes themselves are still drawn; the image fill isn't.
+    assert_eq!(fills(&out.xml).len(), 6, "{}", out.xml);
+    assert!(export(&d, &[f], Compat::Ignore).warnings.is_empty());
+    assert_eq!(export(&d, &[f], Compat::Exact).warnings.len(), 4);
+}
+
+#[test]
+fn hidden_and_transparent_layers_paint_nothing() {
+    let (mut d, p) = doc();
+    let f = d.create(p, NodeKind::Frame, "F", 0.0, 0.0, 100.0, 100.0).unwrap();
+    d.get_mut(f).unwrap().fills.clear();
+    let a = rect(&mut d, f, "A", 0.0, 0.0, 10.0, 10.0, "FF0000");
+    let b = rect(&mut d, f, "B", 20.0, 0.0, 10.0, 10.0, "00FF00");
+    rect(&mut d, f, "C", 40.0, 0.0, 10.0, 10.0, "0000FF");
+    d.get_mut(a).unwrap().visible = false;
+    d.get_mut(b).unwrap().opacity = 0.0;
+    assert_eq!(fills(&export(&d, &[f], Compat::Exact).xml), ["#0000FF"]);
+}
+
+#[test]
+fn huge_coordinates_are_left_out_with_a_warning() {
+    let (mut d, p) = doc();
+    let f = d.create(p, NodeKind::Frame, "F", 0.0, 0.0, 100.0, 100.0).unwrap();
+    d.get_mut(f).unwrap().clip = false;
+    d.get_mut(f).unwrap().fills.clear();
+    rect(&mut d, f, "Near", 0.0, 0.0, 10.0, 10.0, "FF0000");
+    rect(&mut d, f, "Far", 3.0e7, 0.0, 10.0, 10.0, "00FF00");
+    let opts = VdOptions { bounds: Some(figcraft_geom::Rect::new(0.0, 0.0, 100.0, 100.0)), ..Default::default() };
+    let out = export_with(&d, &[f], opts);
+    assert_eq!(fills(&out.xml), ["#FF0000"]);
+    assert_eq!(out.warnings, ["shapes with coordinates beyond ±10,000,000 were left out (Far)"]);
+}
+
+/// A group masked by an even-odd outline (an Exclude boolean ring as a vector mask).
+fn ring_masked() -> (Document, NodeId) {
+    let (mut d, p) = doc();
+    let g = d.create(p, NodeKind::Group, "G", 0.0, 0.0, 60.0, 60.0).unwrap();
+    let bo = d.create(g, NodeKind::BooleanOp { op: figcraft_doc::BoolOp::Exclude }, "Ring", 0.0, 0.0, 1.0, 1.0).unwrap();
+    let a = rect(&mut d, bo, "A", 0.0, 0.0, 60.0, 60.0, "000000");
+    let b = rect(&mut d, bo, "B", 20.0, 20.0, 20.0, 20.0, "000000");
+    let _ = (a, b);
+    d.fit_to_children(bo).unwrap();
+    d.get_mut(bo).unwrap().is_mask = true;
+    d.get_mut(bo).unwrap().mask_type = MaskType::Vector;
+    rect(&mut d, g, "Content", 0.0, 0.0, 60.0, 60.0, "2255FF");
+    (d, g)
+}
+
+fn clip_of(xml: &str) -> BezPath {
+    let els = elements(xml);
+    let clips = tagged(&els, "clip-path");
+    assert_eq!(clips.len(), 1, "{xml}");
+    super::strokes::parse_path(clips[0].get("pathData").unwrap())
+}
+
+#[test]
+fn even_odd_clips_per_mode() {
+    let (d, g) = ring_masked();
+    // bestEffort and exact both rewrite the outline: the hole stays out of the clip.
+    for compat in [Compat::BestEffort, Compat::Exact] {
+        let out = export(&d, &[g], compat);
+        let clip = clip_of(&out.xml);
+        assert_ne!(clip.winding(Point::new(5.0, 5.0)), 0, "{compat:?}");
+        assert_eq!(clip.winding(Point::new(30.0, 30.0)), 0, "{compat:?}: the hole stays out of the clip");
+        assert!(out.xml.contains("#2255FF"), "{compat:?}");
+        let want: &[&str] = if compat == Compat::BestEffort { &["even-odd clip outlines were rewritten as non-zero (Ring)"] } else { &[] };
+        assert_eq!(out.warnings, want, "{compat:?}");
+    }
+    // ignore writes the outline as it is (no rewrite), silently.
+    let out = export(&d, &[g], Compat::Ignore);
+    assert!(clip_of(&out.xml).winding(Point::new(5.0, 5.0)) != 0 && out.xml.contains("#2255FF"), "{}", out.xml);
+    assert!(out.warnings.is_empty());
+}
+
+#[test]
+fn an_export_that_draws_nothing_says_so() {
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "Spacer", 0.0, 0.0, 10.0, 10.0, "FF0000");
+    d.get_mut(r).unwrap().fills.clear();
+    let out = export(&d, &[r], Compat::BestEffort);
+    assert!(out.xml.contains("<vector"), "{}", out.xml);
+    assert_eq!(out.warnings, ["nothing in it could be drawn: the drawable is empty (Spacer)"]);
+    assert!(export(&d, &[r], Compat::Ignore).warnings.is_empty());
+}
diff --git a/crates/vectordrawable/src/tests/gradients.rs b/crates/vectordrawable/src/tests/gradients.rs
new file mode 100644
index 00000000..ae58126e
--- /dev/null
+++ b/crates/vectordrawable/src/tests/gradients.rs
@@ -0,0 +1,269 @@
+use super::*;
+use crate::model::{Grad, GradKind};
+use crate::paint::{GradOut, color_at, gradient, svd, turn_stops};
+use figcraft_color::{ColorStop, Gradient, GradientKind};
+use figcraft_geom::{Affine, Point};
+
+fn two_stop(kind: GradientKind) -> Gradient {
+    let mut g = Gradient::default_for(kind, hex("FF0000"));
+    g.stops = vec![
+        ColorStop { position: 0.0, color: hex("FF0000") },
+        ColorStop { position: 0.6, color: hex("00FF00") },
+        ColorStop { position: 1.0, color: hex("0000FF") },
+    ];
+    g
+}
+
+/// Skewed, mirrored handles: nothing a plain gradient element could hold.
+fn skewed(kind: GradientKind) -> Gradient {
+    let mut g = two_stop(kind);
+    g.from = (0.35, 0.4);
+    g.to = (0.8, 0.55);
+    g.width = (0.25, 0.95);
+    g
+}
+
+/// Where Android samples a Vector Drawable gradient at viewport point `p` (sweep: from +x,
+/// turning toward +y, a full turn 0 → 1).
+fn vd_t(out: &GradOut, p: Point) -> Option<(f64, &Grad)> {
+    let (q, grad) = match out {
+        GradOut::Plain(g) => (p, g),
+        GradOut::Grouped { inverse, grad, .. } => (*inverse * p, grad),
+        _ => return None,
+    };
+    let t = match grad.kind {
+        GradKind::Linear { start, end } => {
+            let (dx, dy) = (end.0 - start.0, end.1 - start.1);
+            ((q.x - start.0) * dx + (q.y - start.1) * dy) / (dx * dx + dy * dy)
+        }
+        GradKind::Radial { center, radius } => (q.x - center.0).hypot(q.y - center.1) / radius,
+        GradKind::Sweep { center } => (q.y - center.1).atan2(q.x - center.0).rem_euclid(std::f64::consts::TAU) / std::f64::consts::TAU,
+    };
+    Some((t, grad))
+}
+
+/// FigCraft's own parameter at `p` for a gradient with frame `f` (viewport ← unit).
+fn figcraft_t(kind: GradientKind, f: Affine, p: Point) -> f64 {
+    let u = f.inverse() * p;
+    match kind {
+        GradientKind::Linear => u.x,
+        GradientKind::Radial => u.x.hypot(u.y),
+        _ => u.y.atan2(u.x).rem_euclid(std::f64::consts::TAU) / std::f64::consts::TAU,
+    }
+}
+
+fn layer_xfs() -> Vec<Affine> {
+    vec![
+        Affine::IDENTITY,
+        Affine::translate((40.0, 10.0)) * Affine::rotate(0.7),
+        Affine::translate((90.0, 0.0)) * Affine::scale_non_uniform(-1.0, 1.0),
+        Affine::new([1.2, 0.3, -0.5, 0.8, 30.0, 20.0]),
+    ]
+}
+
+#[test]
+fn every_gradient_samples_where_figcraft_samples_it() {
+    let (w, h) = (100.0, 80.0);
+    for kind in [GradientKind::Linear, GradientKind::Radial, GradientKind::Angular] {
+        for g in [two_stop(kind), skewed(kind)] {
+            for xf in layer_xfs() {
+                let out = gradient(&g, 1.0, xf, w, h, false);
+                let f = xf * crate::paint::frame(&g, w, h);
+                for i in 0..40 {
+                    for j in 0..40 {
+                        let p = xf * Point::new(w * (i as f64 + 0.5) / 40.0, h * (j as f64 + 0.5) / 40.0);
+                        let want = figcraft_t(kind, f, p);
+                        let (got, grad) = vd_t(&out, p).unwrap();
+                        let stops: Vec<_> = g.sorted_stops().iter().map(|s| (f64::from(s.position), s.color)).collect();
+                        let (a, b) = (color_at(&stops, want), color_at(&grad.stops, got));
+                        // Away from the sweep's seam a turn's worth either side is the same colour.
+                        let near_seam = kind == GradientKind::Angular && (want < 1e-3 || want > 1.0 - 1e-3);
+                        if !near_seam {
+                            assert!(
+                                (a.r - b.r).abs() < 1e-3 && (a.g - b.g).abs() < 1e-3 && (a.b - b.b).abs() < 1e-3,
+                                "{kind:?} {xf:?} at {p:?}: {want} vs {got}"
+                            );
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+#[test]
+fn the_written_gradient_matches_the_rendered_pixels() {
+    for kind in [GradientKind::Linear, GradientKind::Radial, GradientKind::Angular] {
+        let (mut d, p) = doc();
+        let r = rect(&mut d, p, "R", 0.0, 0.0, 100.0, 80.0, "000000");
+        d.get_mut(r).unwrap().fills = vec![Paint::gradient(skewed(kind))];
+        let area = figcraft_render::export_bounds(&d, r).unwrap();
+        let pix = figcraft_render::render_area(&d, &[r], area, 1.0).unwrap();
+        let rgba = figcraft_render::to_rgba8(&pix);
+        let out = gradient(&skewed(kind), 1.0, Affine::translate((-area.x0, -area.y0)) * d.world_transform(r), 100.0, 80.0, false);
+        let f = Affine::translate((-area.x0, -area.y0)) * d.world_transform(r) * crate::paint::frame(&skewed(kind), 100.0, 80.0);
+        let mut checked = 0;
+        for y in (2..78).step_by(3) {
+            for x in (2..98).step_by(3) {
+                let pt = Point::new(x as f64 + 0.5, y as f64 + 0.5);
+                let ft = figcraft_t(kind, f, pt);
+                if kind == GradientKind::Angular && (ft < 0.03 || ft > 0.97 || (ft - 0.6).abs() < 0.01) {
+                    continue;
+                }
+                let (t, grad) = vd_t(&out, pt).unwrap();
+                let c = color_at(&grad.stops, t);
+                let i = (y * pix.width() as usize + x) * 4;
+                let px = &rgba[i..i + 3];
+                let want = [c.r, c.g, c.b].map(|v| (v * 255.0).round());
+                for k in 0..3 {
+                    assert!((f32::from(px[k]) - want[k]).abs() <= 6.0, "{kind:?} at ({x},{y}): rendered {px:?}, VD {want:?}");
+                }
+                checked += 1;
+            }
+        }
+        assert!(checked > 500, "{kind:?}: {checked}");
+    }
+}
+
+#[test]
+fn svd_puts_the_matrix_back_together() {
+    let ms = [[1.0, 0.0, 0.0, 1.0], [2.0, 0.5, -0.3, 0.7], [0.0, 3.0, -2.0, 0.0], [-1.0, 0.2, 0.4, 1.5], [0.3, -0.9, -1.1, -0.2]];
+    for [a, b, c, d] in ms {
+        let (phi, sx, sy, theta) = svd(a, b, c, d);
+        assert!(sx >= sy.abs() - 1e-12, "{sx} {sy}");
+        assert_eq!(sy < 0.0, a * d - b * c < 0.0, "a mirror shows in sy");
+        let m = Affine::rotate(phi) * Affine::scale_non_uniform(sx, sy) * Affine::rotate(theta);
+        for (x, y) in m.as_coeffs().iter().zip([a, b, c, d]) {
+            assert!(close(*x, y), "{:?} vs {:?}", m.as_coeffs(), [a, b, c, d]);
+        }
+    }
+}
+
+#[test]
+fn turned_stops_keep_every_colour_where_it_was() {
+    let stops = vec![(0.0, hex("FF0000")), (0.25, hex("00FF00")), (0.7, hex("0000FF")), (1.0, hex("FFFF00"))];
+    for shift in [0.1, 0.5, 0.95, -0.3, 1.25] {
+        let turned = turn_stops(&stops, shift);
+        assert!(turned.windows(2).all(|w| w[0].0 <= w[1].0), "sorted: {turned:?}");
+        assert_eq!((turned[0].0, turned[turned.len() - 1].0), (0.0, 1.0));
+        for i in 1..200 {
+            let t = i as f64 / 200.0;
+            let moved = (t + shift).rem_euclid(1.0);
+            if moved < 1e-6 || moved > 1.0 - 1e-6 {
+                continue;
+            }
+            let (a, b) = (color_at(&stops, t), color_at(&turned, moved));
+            assert!((a.r - b.r).abs() < 1e-4 && (a.g - b.g).abs() < 1e-4 && (a.b - b.b).abs() < 1e-4, "{shift}: {t}");
+        }
+    }
+    assert_eq!(turn_stops(&stops, 0.0), stops);
+    assert_eq!(turn_stops(&stops, 2.0), stops);
+}
+
+#[test]
+fn a_collapsed_frame_paints_nothing_and_one_stop_is_solid() {
+    let mut g = two_stop(GradientKind::Radial);
+    g.width = g.from;
+    assert_eq!(gradient(&g, 1.0, Affine::IDENTITY, 10.0, 10.0, false), GradOut::Nothing);
+    let mut one = two_stop(GradientKind::Linear);
+    one.stops.truncate(1);
+    assert_eq!(gradient(&one, 0.5, Affine::IDENTITY, 10.0, 10.0, false), GradOut::Solid(hex("FF000080").with_alpha(0.5)));
+}
+
+#[test]
+fn a_linear_gradient_is_an_aapt_attr_with_paint_opacity_in_its_stops() {
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "R", 0.0, 0.0, 100.0, 50.0, "000000");
+    let mut paint = Paint::gradient(two_stop(GradientKind::Linear));
+    paint.opacity = 0.5;
+    d.get_mut(r).unwrap().fills = vec![paint];
+    let out = export(&d, &[r], Compat::Exact);
+    assert!(out.xml.contains("xmlns:aapt=\"http://schemas.android.com/aapt\""), "{}", out.xml);
+    let els = elements(&out.xml);
+    let attr = tagged(&els, "attr");
+    assert_eq!(attr[0].get("name"), Some("android:fillColor"));
+    let g = tagged(&els, "gradient")[0];
+    assert_eq!(g.get("type"), Some("linear"));
+    assert!(g.get("tileMode").is_none(), "clamp is the default");
+    // Default handles: top centre to bottom centre.
+    assert_eq!([g.get("startX"), g.get("startY"), g.get("endX"), g.get("endY")], [Some("50"), Some("0"), Some("50"), Some("50")]);
+    let items: Vec<_> = tagged(&els, "item").iter().map(|e| (e.get("offset").unwrap().to_string(), e.get("color").unwrap().to_string())).collect();
+    assert_eq!(items, [("0".into(), "#80FF0000".into()), ("0.6".into(), "#8000FF00".into()), ("1".into(), "#800000FF".into())]);
+    assert!(tagged(&els, "path")[0].get("fillColor").is_none());
+}
+
+#[test]
+fn a_radial_gradient_sits_in_a_group_that_maps_the_unit_circle() {
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "R", 0.0, 0.0, 100.0, 50.0, "000000");
+    d.get_mut(r).unwrap().fills = vec![Paint::gradient(two_stop(GradientKind::Radial))];
+    let out = export(&d, &[r], Compat::Exact);
+    let els = elements(&out.xml);
+    let gr = tagged(&els, "group")[0];
+    // Centre (50, 25), radii 50 × 25 (an axis-aligned frame: no rotation).
+    assert_eq!([gr.get("translateX"), gr.get("translateY")], [Some("50"), Some("25")]);
+    let (sx, sy) = (gr.get("scaleX").unwrap().parse::<f64>().unwrap(), gr.get("scaleY").unwrap().parse::<f64>().unwrap());
+    assert!(close(sx.abs(), 50.0) && close(sy.abs(), 25.0), "{sx} {sy}");
+    let g = tagged(&els, "gradient")[0];
+    assert_eq!([g.get("type"), g.get("centerX"), g.get("centerY"), g.get("gradientRadius")], [Some("radial"), Some("0"), Some("0"), Some("1")]);
+    // The path is in the group's space: mapped back it covers the rectangle.
+    let (x0, y0, x1, y1) = bounds(tagged(&els, "path")[0].get("pathData").unwrap());
+    let rot = gr.get("rotation").map_or(0.0, |v| v.parse::<f64>().unwrap()).to_radians();
+    let m = Affine::translate((50.0, 25.0)) * Affine::rotate(rot) * Affine::scale_non_uniform(sx, sy);
+    let b = m.transform_rect_bbox(figcraft_geom::Rect::new(x0, y0, x1, y1));
+    assert!(close(b.x0, 0.0) && close(b.y0, 0.0) && (b.x1 - 100.0).abs() < 0.05 && (b.y1 - 50.0).abs() < 0.05, "{b:?}");
+}
+
+#[test]
+fn diamond_gradients_per_mode() {
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "Gem", 0.0, 0.0, 40.0, 40.0, "000000");
+    d.get_mut(r).unwrap().fills = vec![Paint::solid(hex("FFFFFF")), Paint::gradient(two_stop(GradientKind::Diamond))];
+    let best = export(&d, &[r], Compat::BestEffort);
+    assert!(best.xml.contains("android:type=\"radial\""), "{}", best.xml);
+    assert_eq!(best.warnings, ["diamond gradients were drawn as radial gradients (Gem)"]);
+    let exact = export(&d, &[r], Compat::Exact);
+    assert!(!exact.xml.contains("gradient") && exact.xml.contains("#FFFFFF"), "only the gradient goes:\n{}", exact.xml);
+    assert!(!exact.xml.contains("xmlns:aapt"));
+    assert_eq!(exact.warnings, ["diamond gradients were left out (exact mode) (Gem)"]);
+    let ignore = export(&d, &[r], Compat::Ignore);
+    assert!(!ignore.xml.contains("gradient") && ignore.warnings.is_empty(), "{:?}", ignore.warnings);
+}
+
+#[test]
+fn a_sweep_is_written_as_a_sweep_gradient_with_its_seam() {
+    // Default angular handles start at 3 o'clock; red, yellow at a quarter, blue at the end.
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "Wheel", 0.0, 0.0, 100.0, 100.0, "000000");
+    let mut g = two_stop(GradientKind::Angular);
+    g.stops = vec![
+        ColorStop { position: 0.0, color: hex("FF0000") },
+        ColorStop { position: 0.25, color: hex("FFFF00") },
+        ColorStop { position: 1.0, color: hex("0000FF") },
+    ];
+    d.get_mut(r).unwrap().fills = vec![figcraft_color::Paint::gradient(g)];
+    let out = export(&d, &[r], Compat::BestEffort);
+    let els = elements(&out.xml);
+    let grads = tagged(&els, "gradient");
+    assert_eq!(grads.len(), 1, "{}", out.xml);
+    assert_eq!(grads[0].get("type"), Some("sweep"));
+    assert_eq!((grads[0].get("centerX"), grads[0].get("centerY")), (Some("0"), Some("0")));
+    // In a group that moves the unit gradient onto the layer.
+    assert!(tagged(&els, "group").iter().any(|e| e.get("translateX").is_some()), "{}", out.xml);
+    let items: Vec<(f64, String)> =
+        tagged(&els, "item").iter().map(|e| (e.get("offset").unwrap().parse().unwrap(), e.get("color").unwrap().to_string())).collect();
+    assert_eq!(items.first().map(|i| i.0), Some(0.0), "{items:?}");
+    assert_eq!(items.last().map(|i| i.0), Some(1.0), "{items:?}");
+    assert!(items.windows(2).all(|w| w[0].0 <= w[1].0), "offsets go up: {items:?}");
+    assert!(items.windows(2).all(|w| w[0] != w[1]), "no repeated stops: {items:?}");
+    // The seam: blue (the end) then red (the start) at the same offset.
+    assert!(items.windows(2).any(|w| w[0].0 == w[1].0 && w[0].1 == "#0000FF" && w[1].1 == "#FF0000"), "{items:?}");
+    assert!(out.warnings.is_empty(), "{:?}", out.warnings);
+}
+
+#[test]
+fn turned_stops_on_the_seam_are_not_repeated() {
+    let (r, b) = (hex("FF0000"), hex("0000FF"));
+    let out = turn_stops(&[(0.0, r), (0.5, b), (1.0, r)], 0.5);
+    assert!(out.windows(2).all(|w| w[0] != w[1]), "{out:?}");
+}
diff --git a/crates/vectordrawable/src/tests/mod.rs b/crates/vectordrawable/src/tests/mod.rs
new file mode 100644
index 00000000..d8988e56
--- /dev/null
+++ b/crates/vectordrawable/src/tests/mod.rs
@@ -0,0 +1,99 @@
+//! Unit tests: documents built in code, the written XML parsed back (every test checks it's
+//! well-formed) and compared by structure and numbers.
+
+mod compat;
+mod gradients;
+mod shapes;
+mod strokes;
+mod xml_out;
+
+use figcraft_color::{Color, Paint};
+use figcraft_doc::{Document, NodeId, NodeKind};
+
+use crate::{Compat, VdExport, VdOptions, try_export};
+
+pub(super) fn hex(s: &str) -> Color {
+    Color::from_hex(s).unwrap()
+}
+
+pub(super) fn doc() -> (Document, NodeId) {
+    let d = Document::new("vd");
+    let p = d.first_page().unwrap();
+    (d, p)
+}
+
+pub(super) fn rect(d: &mut Document, parent: NodeId, name: &str, x: f64, y: f64, w: f64, h: f64, fill: &str) -> NodeId {
+    let r = d.create(parent, NodeKind::Rectangle, name, x, y, w, h).unwrap();
+    d.get_mut(r).unwrap().fills = vec![Paint::solid(hex(fill))];
+    r
+}
+
+pub(super) fn ellipse() -> NodeKind {
+    NodeKind::Ellipse { start: 0.0, sweep: std::f64::consts::TAU, inner: 0.0 }
+}
+
+pub(super) fn export(d: &Document, ids: &[NodeId], compat: Compat) -> VdExport {
+    export_with(d, ids, VdOptions { compat, ..Default::default() })
+}
+
+pub(super) fn export_with(d: &Document, ids: &[NodeId], opts: VdOptions) -> VdExport {
+    let out = try_export(d, ids, &opts).unwrap();
+    // Always well-formed, never a non-finite number.
+    if let Err(e) = roxmltree::Document::parse(&out.xml) {
+        panic!("not well-formed: {e}\n{}", out.xml);
+    }
+    for bad in ["NaN", "inf", "=\"-0\"", "e+", "e-"] {
+        assert!(!out.xml.contains(bad), "{bad} in\n{}", out.xml);
+    }
+    out
+}
+
+/// An element as (tag name, attributes without namespace prefixes).
+#[derive(Debug, Clone)]
+pub(super) struct El {
+    pub tag: String,
+    pub attrs: std::collections::BTreeMap<String, String>,
+}
+
+impl El {
+    pub fn get(&self, k: &str) -> Option<&str> {
+        self.attrs.get(k).map(String::as_str)
+    }
+}
+
+/// Every element of `xml`, document order.
+pub(super) fn elements(xml: &str) -> Vec<El> {
+    let doc = roxmltree::Document::parse(xml).unwrap();
+    doc.descendants()
+        .filter(|n| n.is_element())
+        .map(|n| El { tag: n.tag_name().name().to_string(), attrs: n.attributes().map(|a| (a.name().to_string(), a.value().to_string())).collect() })
+        .collect()
+}
+
+pub(super) fn tagged<'a>(els: &'a [El], tag: &str) -> Vec<&'a El> {
+    els.iter().filter(|e| e.tag == tag).collect()
+}
+
+/// The numbers of a path data string, in order.
+pub(super) fn numbers(data: &str) -> Vec<f64> {
+    data.split(|c: char| !(c.is_ascii_digit() || c == '.' || c == '-')).filter(|s| !s.is_empty()).map(|s| s.parse().unwrap()).collect()
+}
+
+/// The (x, y) bounding box of a path data string's points.
+pub(super) fn bounds(data: &str) -> (f64, f64, f64, f64) {
+    let n = numbers(data);
+    let xs = n.iter().step_by(2);
+    let ys = n.iter().skip(1).step_by(2);
+    let (x0, x1) = xs.fold((f64::MAX, f64::MIN), |(a, b), v| (a.min(*v), b.max(*v)));
+    let (y0, y1) = ys.fold((f64::MAX, f64::MIN), |(a, b), v| (a.min(*v), b.max(*v)));
+    (x0, y0, x1, y1)
+}
+
+pub(super) fn close(a: f64, b: f64) -> bool {
+    (a - b).abs() < 1e-3
+}
+
+/// The `<path>` elements of `xml`.
+pub(super) fn paths_of(xml: &str) -> Vec<El> {
+    elements(xml).into_iter().filter(|e| e.tag == "path").collect()
+}
diff --git a/crates/vectordrawable/src/tests/shapes.rs b/crates/vectordrawable/src/tests/shapes.rs
new file mode 100644
index 00000000..e0f789cc
--- /dev/null
+++ b/crates/vectordrawable/src/tests/shapes.rs
@@ -0,0 +1,210 @@
+use super::*;
+use crate::xml::path_data;
+use figcraft_doc::BoolOp;
+use figcraft_geom::Affine;
+
+#[test]
+fn a_rectangle_is_a_drawable_its_size_in_dp() {
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "R", 10.0, 20.0, 30.0, 40.0, "FF0000");
+    let out = export(&d, &[r], Compat::BestEffort);
+    let els = elements(&out.xml);
+    let v = &els[0];
+    assert_eq!(v.tag, "vector");
+    assert_eq!((v.get("width"), v.get("height")), (Some("30dp"), Some("40dp")));
+    assert_eq!((v.get("viewportWidth"), v.get("viewportHeight")), (Some("30"), Some("40")));
+    assert!(!out.xml.contains("xmlns:aapt"), "no gradient, no aapt namespace");
+    let paths = tagged(&els, "path");
+    assert_eq!(paths.len(), 1);
+    assert_eq!(paths[0].get("fillColor"), Some("#FF0000"));
+    assert_eq!(bounds(paths[0].get("pathData").unwrap()), (0.0, 0.0, 30.0, 40.0));
+    assert!(out.warnings.is_empty(), "{:?}", out.warnings);
+}
+
+#[test]
+fn colour_alpha_and_paint_opacity_go_into_aarrggbb() {
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "R", 0.0, 0.0, 10.0, 10.0, "00FF0080");
+    d.get_mut(r).unwrap().fills[0].opacity *= 0.5;
+    let out = export(&d, &[r], Compat::BestEffort);
+    // 0x80/255 × 0.5 ≈ 0.251 → 0x40.
+    assert_eq!(paths_of(&out.xml)[0].get("fillColor"), Some("#4000FF00"));
+}
+
+#[test]
+fn several_fills_are_paths_bottom_to_top_and_hidden_ones_are_left_out() {
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "R", 0.0, 0.0, 10.0, 10.0, "FF0000");
+    let mut hidden = Paint::solid(hex("0000FF"));
+    hidden.visible = false;
+    d.get_mut(r).unwrap().fills.extend([Paint::solid(hex("00FF00")), hidden]);
+    let out = export(&d, &[r], Compat::BestEffort);
+    let fills: Vec<_> = paths_of(&out.xml).iter().map(|e| e.get("fillColor").unwrap().to_string()).collect();
+    assert_eq!(fills, ["#FF0000", "#00FF00"]);
+}
+
+#[test]
+fn shapes_are_their_render_outlines_with_the_transform_baked_in() {
+    let (mut d, p) = doc();
+    let f = d.create(p, NodeKind::Frame, "F", 0.0, 0.0, 300.0, 300.0).unwrap();
+    d.get_mut(f).unwrap().fills.clear();
+    let kinds = [ellipse(), NodeKind::Star { count: 5, inner_ratio: 0.4 }, NodeKind::Polygon { count: 6 }, NodeKind::Rectangle];
+    let mut ids = Vec::new();
+    for (i, k) in kinds.into_iter().enumerate() {
+        let id = d.create(f, k, "S", 20.0 + 60.0 * i as f64, 30.0, 50.0, 40.0).unwrap();
+        let n = d.get_mut(id).unwrap();
+        n.fills = vec![Paint::solid(hex("336699"))];
+        n.corners.radii = [8.0, 4.0, 0.0, 12.0];
+        // Rotated, flipped and sheared: none of it fits a <group>, all of it is in the path.
+        n.transform *= Affine::new([0.9, 0.3, 0.4, -1.1, 0.0, 40.0]);
+        ids.push(id);
+    }
+    let out = export(&d, &[f], Compat::Ignore);
+    let paths = paths_of(&out.xml);
+    assert_eq!(paths.len(), ids.len());
+    let origin = Affine::translate((0.0, 0.0));
+    for (id, el) in ids.iter().zip(&paths) {
+        let n = d.node(*id).unwrap();
+        let (mut outline, _) = figcraft_render::node_outline(&d, n).unwrap();
+        outline.apply_affine(origin * d.world_transform(*id));
+        assert_eq!(el.get("pathData").unwrap(), path_data(&outline));
+    }
+}
+
+#[test]
+fn nested_groups_rotations_and_flips_are_baked() {
+    let (mut d, p) = doc();
+    let g = d.create(p, NodeKind::Group, "G", 0.0, 0.0, 100.0, 100.0).unwrap();
+    let r = rect(&mut d, g, "R", 10.0, 10.0, 40.0, 20.0, "000000");
+    d.get_mut(g).unwrap().transform = Affine::translate((50.0, 50.0)) * Affine::rotate(0.5) * Affine::scale_non_uniform(-1.0, 2.0);
+    let area = figcraft_render::export_bounds(&d, g).unwrap();
+    let out = export(&d, &[g], Compat::BestEffort);
+    let data = paths_of(&out.xml)[0].get("pathData").unwrap().to_string();
+    let n = d.node(r).unwrap();
+    let (mut outline, _) = figcraft_render::node_outline(&d, n).unwrap();
+    outline.apply_affine(Affine::translate((-area.x0, -area.y0)) * d.world_transform(r));
+    assert_eq!(data, path_data(&outline));
+    assert!(!out.xml.contains("<group"), "no group needed:\n{}", out.xml);
+}
+
+#[test]
+fn a_boolean_is_its_result_path() {
+    let (mut d, p) = doc();
+    let a = rect(&mut d, p, "A", 0.0, 0.0, 60.0, 60.0, "000000");
+    let b = d.create(p, ellipse(), "B", 30.0, 30.0, 50.0, 50.0).unwrap();
+    let bo = d.create(p, NodeKind::BooleanOp { op: BoolOp::Subtract }, "Bool", 0.0, 0.0, 1.0, 1.0).unwrap();
+    d.reparent(a, bo, None).unwrap();
+    d.reparent(b, bo, None).unwrap();
+    d.fit_to_children(bo).unwrap();
+    d.get_mut(bo).unwrap().fills = vec![Paint::solid(hex("CC2244"))];
+    let out = export(&d, &[bo], Compat::Exact);
+    let paths = paths_of(&out.xml);
+    assert_eq!(paths.len(), 1, "operands aren't drawn on their own:\n{}", out.xml);
+    assert_eq!(paths[0].get("fillColor"), Some("#CC2244"));
+    assert_eq!(paths[0].get("fillType"), Some("evenOdd"), "exact keeps the boolean's even-odd rule");
+}
+
+#[test]
+fn a_clipping_frame_is_a_group_with_its_clip_path_first() {
+    let (mut d, p) = doc();
+    let f = rect(&mut d, p, "F", 0.0, 0.0, 100.0, 100.0, "FFFFFF");
+    d.get_mut(f).unwrap().kind = NodeKind::Frame;
+    d.get_mut(f).unwrap().clip = true;
+    d.get_mut(f).unwrap().corners.radii = [10.0; 4];
+    rect(&mut d, f, "Over", 50.0, 50.0, 100.0, 100.0, "FF0000");
+    let out = export(&d, &[f], Compat::BestEffort);
+    let els = elements(&out.xml);
+    let tags: Vec<&str> = els.iter().map(|e| e.tag.as_str()).collect();
+    assert_eq!(tags, ["vector", "path", "group", "clip-path", "path"], "{}", out.xml);
+    let clip = tagged(&els, "clip-path")[0].get("pathData").unwrap();
+    assert_eq!(bounds(clip), (0.0, 0.0, 100.0, 100.0));
+    assert!(clip.contains('C'), "rounded corners clip too: {clip}");
+}
+
+#[test]
+fn an_unclipped_frame_draws_its_children_without_a_group() {
+    let (mut d, p) = doc();
+    let f = d.create(p, NodeKind::Frame, "F", 0.0, 0.0, 100.0, 100.0).unwrap();
+    d.get_mut(f).unwrap().clip = false;
+    d.get_mut(f).unwrap().fills.clear();
+    rect(&mut d, f, "A", 10.0, 10.0, 10.0, 10.0, "FF0000");
+    let out = export(&d, &[f], Compat::BestEffort);
+    assert!(!out.xml.contains("<group"), "{}", out.xml);
+}
+
+#[test]
+fn a_vector_mask_clips_the_layers_above_it_and_isnt_drawn() {
+    let (mut d, p) = doc();
+    let g = d.create(p, NodeKind::Group, "G", 0.0, 0.0, 100.0, 100.0).unwrap();
+    let m = d.create(g, ellipse(), "Mask", 10.0, 10.0, 80.0, 80.0).unwrap();
+    {
+        let n = d.get_mut(m).unwrap();
+        n.is_mask = true;
+        n.mask_type = figcraft_doc::MaskType::Vector;
+        n.fills = vec![Paint::solid(hex("00FF00"))];
+    }
+    rect(&mut d, g, "Content", 0.0, 0.0, 100.0, 100.0, "2255FF");
+    let out = export(&d, &[g], Compat::Exact);
+    let els = elements(&out.xml);
+    let tags: Vec<&str> = els.iter().map(|e| e.tag.as_str()).collect();
+    assert_eq!(tags, ["vector", "group", "clip-path", "path"], "{}", out.xml);
+    assert!(!out.xml.contains("#00FF00"), "the mask itself doesn't paint");
+    assert!(out.warnings.is_empty(), "{:?}", out.warnings);
+}
+
+#[test]
+fn text_is_glyph_outlines_one_path_per_styled_run() {
+    use figcraft_doc::{StyleRun, TextData};
+    figcraft_text::scan_system_fonts();
+    let (mut d, p) = doc();
+    let mut text = TextData::new("ab");
+    text.style.font_size = 24.0;
+    let mut style = text.style.clone();
+    style.fills = Some(vec![Paint::solid(hex("00FF00"))]);
+    text.runs.push(StyleRun { start: 1, end: 2, style });
+    text.normalize();
+    let t = d.create(p, NodeKind::Text(text), "Text", 0.0, 0.0, 100.0, 40.0).unwrap();
+    d.get_mut(t).unwrap().fills = vec![Paint::solid(Color::BLACK)];
+    let out = export(&d, &[t], Compat::BestEffort);
+    let fills: Vec<_> = paths_of(&out.xml).iter().map(|e| e.get("fillColor").unwrap().to_string()).collect();
+    assert_eq!(fills, ["#000000", "#00FF00"], "{}", out.xml);
+}
+
+#[test]
+fn nothing_to_export_is_an_error() {
+    let (mut d, p) = doc();
+    assert_eq!(try_export(&d, &[], &VdOptions::default()), Err(crate::VdError::Empty));
+    let r = rect(&mut d, p, "R", 0.0, 0.0, 10.0, 10.0, "000000");
+    let flat = VdOptions { bounds: Some(figcraft_geom::Rect::new(5.0, 5.0, 5.0, 20.0)), ..Default::default() };
+    assert_eq!(try_export(&d, &[r], &flat), Err(crate::VdError::Empty));
+}
+
+#[test]
+fn an_area_shifts_the_viewport_origin() {
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "R", 10.0, 10.0, 10.0, 10.0, "000000");
+    let opts = VdOptions { bounds: Some(figcraft_geom::Rect::new(0.0, 0.0, 50.0, 25.0)), ..Default::default() };
+    let out = export_with(&d, &[r], opts);
+    let els = elements(&out.xml);
+    assert_eq!(els[0].get("width"), Some("50dp"));
+    assert_eq!(bounds(tagged(&els, "path")[0].get("pathData").unwrap()), (10.0, 10.0, 20.0, 20.0));
+}
+
+#[test]
+fn depth_past_the_limit_is_refused_and_at_the_limit_kept() {
+    use figcraft_render::{ExportDepthError, MAX_EXPORT_DEPTH};
+    let nested = |depth: usize| {
+        let (mut d, p) = doc();
+        let root = d.create(p, NodeKind::Frame, "root", 0.0, 0.0, 32.0, 32.0).unwrap();
+        let mut parent = root;
+        for _ in 1..depth {
+            parent = d.create(parent, NodeKind::Group, "group", 0.0, 0.0, 32.0, 32.0).unwrap();
+        }
+        let leaf = rect(&mut d, parent, "deep-leaf", 3.0, 5.0, 13.0, 17.0, "FF0000");
+        (d, root, leaf)
+    };
+    let (d, root, _) = nested(MAX_EXPORT_DEPTH);
+    assert!(export(&d, &[root], Compat::BestEffort).xml.contains("#FF0000"));
+    let (d, root, leaf) = nested(MAX_EXPORT_DEPTH + 1);
+    assert_eq!(try_export(&d, &[root], &VdOptions::default()), Err(crate::VdError::Depth(ExportDepthError { root, node: leaf })));
+}
diff --git a/crates/vectordrawable/src/tests/strokes.rs b/crates/vectordrawable/src/tests/strokes.rs
new file mode 100644
index 00000000..b29b2715
--- /dev/null
+++ b/crates/vectordrawable/src/tests/strokes.rs
@@ -0,0 +1,152 @@
+use super::*;
+use figcraft_doc::{StrokeAlign, StrokeCap, StrokeJoin};
+use figcraft_geom::Affine;
+
+fn stroked(align: StrokeAlign) -> (Document, NodeId) {
+    let (mut d, p) = doc();
+    let r = d.create(p, NodeKind::Rectangle, "R", 10.0, 10.0, 40.0, 30.0).unwrap();
+    let n = d.get_mut(r).unwrap();
+    n.fills.clear();
+    n.strokes = vec![Paint::solid(hex("112233"))];
+    n.stroke.weight = 4.0;
+    n.stroke.align = align;
+    (d, r)
+}
+
+#[test]
+fn a_centred_stroke_is_drawn_by_android() {
+    let (mut d, r) = stroked(StrokeAlign::Center);
+    {
+        let n = d.get_mut(r).unwrap();
+        n.stroke.join = StrokeJoin::Bevel;
+        n.stroke.cap_start = StrokeCap::Round;
+        n.stroke.cap_end = StrokeCap::Round;
+    }
+    let out = export(&d, &[r], Compat::BestEffort);
+    let paths = paths_of(&out.xml);
+    assert_eq!(paths.len(), 1, "{}", out.xml);
+    let s = &paths[0];
+    assert_eq!((s.get("strokeColor"), s.get("strokeWidth")), (Some("#112233"), Some("4")));
+    assert_eq!((s.get("strokeLineCap"), s.get("strokeLineJoin")), (Some("round"), Some("bevel")));
+    assert!(s.get("fillColor").is_none() && s.get("strokeMiterLimit").is_none());
+    // The viewport grows by half the stroke on each side.
+    assert_eq!(elements(&out.xml)[0].get("width"), Some("44dp"));
+    assert_eq!(bounds(s.get("pathData").unwrap()), (2.0, 2.0, 42.0, 32.0));
+}
+
+#[test]
+fn a_miter_limit_other_than_four_is_written() {
+    let (mut d, r) = stroked(StrokeAlign::Center);
+    d.get_mut(r).unwrap().stroke.miter_limit = 10.0;
+    let out = export(&d, &[r], Compat::BestEffort);
+    assert_eq!(paths_of(&out.xml)[0].get("strokeMiterLimit"), Some("10"));
+}
+
+#[test]
+fn a_uniform_scale_scales_the_stroke_width() {
+    let (mut d, r) = stroked(StrokeAlign::Center);
+    let n = d.get_mut(r).unwrap();
+    n.transform *= Affine::rotate(0.4) * Affine::scale(2.5);
+    let out = export(&d, &[r], Compat::BestEffort);
+    assert_eq!(paths_of(&out.xml)[0].get("strokeWidth"), Some("10"));
+}
+
+#[test]
+fn strokes_android_cant_draw_are_their_filled_outline() {
+    type Edit = fn(&mut figcraft_doc::Node);
+    let cases: [(&str, Edit); 4] = [
+        ("inside", |n| n.stroke.align = StrokeAlign::Inside),
+        ("outside", |n| n.stroke.align = StrokeAlign::Outside),
+        ("dashed", |n| n.stroke.dashes = vec![6.0, 3.0]),
+        ("stretched", |n| n.transform *= Affine::scale_non_uniform(2.0, 1.0)),
+    ];
+    for (what, edit) in cases {
+        let (mut d, r) = stroked(StrokeAlign::Center);
+        edit(d.get_mut(r).unwrap());
+        for compat in [Compat::BestEffort, Compat::Exact, Compat::Ignore] {
+            let out = export(&d, &[r], compat);
+            let paths = paths_of(&out.xml);
+            assert!(!out.xml.contains("strokeColor"), "{what}:\n{}", out.xml);
+            assert!(!paths.is_empty() && paths.iter().all(|p| p.get("fillColor") == Some("#112233")), "{what}:\n{}", out.xml);
+            // Rings fill even-odd in FigCraft: rewritten, or kept as the rule in exact/ignore.
+            let ring = what == "inside" || what == "outside";
+            let kept = paths.iter().any(|p| p.get("fillType") == Some("evenOdd"));
+            match compat {
+                Compat::BestEffort => assert!(!kept, "{what}: rewritten\n{}", out.xml),
+                _ => assert_eq!(kept, ring, "{what} {compat:?}\n{}", out.xml),
+            }
+            if compat == Compat::BestEffort && ring {
+                assert_eq!(out.warnings, ["even-odd fills were rewritten as non-zero (R)"], "{what}");
+            } else {
+                assert!(out.warnings.is_empty(), "{what} {compat:?}: {:?}", out.warnings);
+            }
+        }
+    }
+}
+
+#[test]
+fn an_inside_stroke_outline_covers_only_the_ring() {
+    let (d, r) = stroked(StrokeAlign::Inside);
+    let out = export(&d, &[r], Compat::BestEffort);
+    let data = paths_of(&out.xml)[0].get("pathData").unwrap().to_string();
+    let path = parse_path(&data);
+    use figcraft_geom::Shape;
+    // Viewport = the rectangle itself (inside strokes don't grow it): (0,0)–(40,30).
+    assert_ne!(path.winding((1.0, 1.0).into()), 0, "on the ring");
+    assert_eq!(path.winding((20.0, 15.0).into()), 0, "the hole");
+    assert_eq!(path.winding((-1.0, 15.0).into()), 0, "outside");
+}
+
+#[test]
+fn a_line_stroke_is_native_with_its_caps() {
+    let (mut d, p) = doc();
+    let l = d.create(p, NodeKind::Line, "L", 0.0, 0.0, 50.0, 0.0).unwrap();
+    let n = d.get_mut(l).unwrap();
+    n.strokes = vec![Paint::solid(hex("000000"))];
+    n.stroke.weight = 2.0;
+    n.stroke.cap_start = StrokeCap::Square;
+    n.stroke.cap_end = StrokeCap::Square;
+    let out = export(&d, &[l], Compat::BestEffort);
+    let s = paths_of(&out.xml)[0].clone();
+    assert_eq!((s.get("strokeLineCap"), s.get("strokeWidth")), (Some("square"), Some("2")), "{}", out.xml);
+}
+
+#[test]
+fn a_gradient_stroke_is_an_outline_filled_with_the_gradient() {
+    let (mut d, r) = stroked(StrokeAlign::Center);
+    d.get_mut(r).unwrap().strokes = vec![Paint::gradient(figcraft_color::Gradient::default_for(figcraft_color::GradientKind::Linear, hex("FF0000")))];
+    let out = export(&d, &[r], Compat::BestEffort);
+    assert!(!out.xml.contains("strokeColor") && out.xml.contains("android:type=\"linear\""), "{}", out.xml);
+}
+
+/// Parse path data as written ("M0,0 L1,0 C… Z") back into a path.
+pub(super) fn parse_path(s: &str) -> figcraft_geom::BezPath {
+    let mut p = figcraft_geom::BezPath::new();
+    let mut cmd = ' ';
+    let mut pts: Vec<figcraft_geom::Point> = Vec::new();
+    let flush = |cmd: char, pts: &mut Vec<figcraft_geom::Point>, p: &mut figcraft_geom::BezPath| {
+        match (cmd, pts.as_slice()) {
+            (' ', []) => {}
+            ('M', [a]) => p.move_to(*a),
+            ('L', [a]) => p.line_to(*a),
+            ('Q', [a, b]) => p.quad_to(*a, *b),
+            ('C', [a, b, c]) => p.curve_to(*a, *b, *c),
+            ('Z', []) => p.close_path(),
+            other => panic!("bad segment {other:?} in {s}"),
+        }
+        pts.clear();
+    };
+    for tok in s.split(' ') {
+        let mut rest = tok;
+        if let Some(c) = tok.chars().next().filter(char::is_ascii_alphabetic) {
+            flush(cmd, &mut pts, &mut p);
+            cmd = c;
+            rest = &tok[1..];
+        }
+        if let Some((x, y)) = rest.split_once(',') {
+            pts.push(figcraft_geom::Point::new(x.parse().unwrap(), y.parse().unwrap()));
+        }
+    }
+    flush(cmd, &mut pts, &mut p);
+    p
+}
diff --git a/crates/vectordrawable/src/tests/xml_out.rs b/crates/vectordrawable/src/tests/xml_out.rs
new file mode 100644
index 00000000..8976c8d6
--- /dev/null
+++ b/crates/vectordrawable/src/tests/xml_out.rs
@@ -0,0 +1,88 @@
+use super::*;
+use crate::xml::{color, esc, num};
+
+#[test]
+fn numbers_are_short_finite_and_never_negative_zero() {
+    assert_eq!(num(1.0), "1");
+    assert_eq!(num(0.12345), "0.123");
+    assert_eq!(num(-0.0004), "0");
+    assert_eq!(num(-2.5), "-2.5");
+    assert_eq!(num(1e-9), "0");
+    assert_eq!(num(12345678.9), "12345678.9");
+    assert_eq!(num(f64::NAN), "0");
+    assert_eq!(num(f64::INFINITY), "0");
+}
+
+#[test]
+fn colours_are_rrggbb_or_aarrggbb() {
+    assert_eq!(color(hex("1A2B3C")), "#1A2B3C");
+    assert_eq!(color(hex("1A2B3C80")), "#801A2B3C");
+    assert_eq!(color(Color::new(2.0, -1.0, f32::NAN, 1.0)).len(), 7);
+}
+
+#[test]
+fn text_is_escaped_for_an_attribute() {
+    assert_eq!(esc("a&b<c>\"d'"), "a&amp;b&lt;c&gt;&quot;d&apos;");
+    assert_eq!(esc("tab\tline\nret\r"), "tab&#9;line&#10;ret&#13;");
+    assert_eq!(esc("bell\u{7}\u{FFFE}ok"), "bellok");
+}
+
+#[test]
+fn names_are_written_only_when_asked_unique_and_round_trip() {
+    let (mut d, p) = doc();
+    let g = d.create(p, NodeKind::Group, "Icon & \"co\" <1>", 0.0, 0.0, 50.0, 50.0).unwrap();
+    rect(&mut d, g, "dot", 0.0, 0.0, 10.0, 10.0, "FF0000");
+    rect(&mut d, g, "dot", 20.0, 0.0, 10.0, 10.0, "00FF00");
+    rect(&mut d, g, "  ", 40.0, 0.0, 10.0, 10.0, "0000FF");
+    assert!(!export(&d, &[g], Compat::BestEffort).xml.contains("android:name"));
+    let out = export_with(&d, &[g], VdOptions { include_names: true, ..Default::default() });
+    let els = elements(&out.xml);
+    let names: Vec<_> = els.iter().filter_map(|e| e.get("name")).collect();
+    assert_eq!(names, ["Icon & \"co\" <1>", "dot", "dot_2", "layer"], "{}", out.xml);
+    assert_eq!(tagged(&els, "group")[0].get("name"), Some("Icon & \"co\" <1>"), "a container is a named group");
+}
+
+#[test]
+fn a_long_name_is_cut_at_200_characters() {
+    let (mut d, p) = doc();
+    let long = "é".repeat(300);
+    let r = rect(&mut d, p, &long, 0.0, 0.0, 10.0, 10.0, "FF0000");
+    let out = export_with(&d, &[r], VdOptions { include_names: true, ..Default::default() });
+    assert_eq!(paths_of(&out.xml)[0].get("name").unwrap().chars().count(), 200);
+}
+
+#[test]
+fn the_file_is_pretty_printed() {
+    let (mut d, p) = doc();
+    let f = d.create(p, NodeKind::Frame, "F", 0.0, 0.0, 24.0, 24.0).unwrap();
+    d.get_mut(f).unwrap().fills.clear();
+    rect(&mut d, f, "R", 4.0, 4.0, 16.0, 8.0, "FF0000");
+    let out = export(&d, &[f], Compat::BestEffort);
+    let want = "<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<vector
+    xmlns:android=\"http://schemas.android.com/apk/res/android\"
+    android:width=\"24dp\"
+    android:height=\"24dp\"
+    android:viewportWidth=\"24\"
+    android:viewportHeight=\"24\">
+  <group>
+    <clip-path android:pathData=\"M0,0 L24,0 L24,24 L0,24 Z\" />
+    <path
+        android:pathData=\"M4,4 L20,4 L20,12 L4,12 Z\"
+        android:fillColor=\"#FF0000\" />
+  </group>
+</vector>
+";
+    assert_eq!(out.xml, want);
+}
+
+#[test]
+fn an_empty_area_is_still_a_drawable_android_loads() {
+    let (mut d, p) = doc();
+    let r = rect(&mut d, p, "R", 0.0, 0.0, 10.0, 10.0, "FF0000");
+    d.get_mut(r).unwrap().fills.clear();
+    let opts = VdOptions { bounds: Some(figcraft_geom::Rect::new(0.0, 0.0, 10.0, 10.0)), ..Default::default() };
+    let out = export_with(&d, &[r], opts);
+    // Android throws "no path defined" for a <vector> without a <path>.
+    assert!(out.xml.ends_with("android:viewportHeight=\"10\">\n  <path android:pathData=\"M0,0\" />\n</vector>\n"), "{}", out.xml);
+}
diff --git a/crates/vectordrawable/src/text.rs b/crates/vectordrawable/src/text.rs
new file mode 100644
index 00000000..acc1f483
--- /dev/null
+++ b/crates/vectordrawable/src/text.rs
@@ -0,0 +1,30 @@
+//! Text layers as glyph outlines, one path per styled run.
+
+use figcraft_color::Paint;
+use figcraft_doc::{Node, NodeKind};
+use figcraft_geom::{Affine, BezPath};
+
+/// Text layer `n`'s glyph and decoration outlines grouped by style, in layer space, each with the
+/// fills it paints in (its own, else the layer's). `None` for other layers and text that doesn't
+/// lay out.
+pub(crate) fn runs(n: &Node) -> Option<Vec<(BezPath, Vec<Paint>)>> {
+    let NodeKind::Text(_) = &n.kind else { return None };
+    let (layout, dy) = figcraft_text::layout_node(n)?;
+    let mut by_style: std::collections::BTreeMap<usize, BezPath> = std::collections::BTreeMap::new();
+    for g in &layout.glyphs {
+        by_style.entry(g.style).or_default().extend(g.path().elements().iter().copied());
+    }
+    for d in &layout.decorations {
+        by_style.entry(d.style).or_default().extend(d.path().elements().iter().copied());
+    }
+    Some(
+        by_style
+            .into_iter()
+            .map(|(k, mut path)| {
+                path.apply_affine(Affine::translate((0.0, dy)));
+                let fills = layout.styles.get(k).and_then(|s| s.fills.clone()).unwrap_or_else(|| n.fills.clone());
+                (path, fills)
+            })
+            .collect(),
+    )
+}
diff --git a/crates/vectordrawable/src/walk.rs b/crates/vectordrawable/src/walk.rs
new file mode 100644
index 00000000..f085d340
--- /dev/null
+++ b/crates/vectordrawable/src/walk.rs
@@ -0,0 +1,406 @@
+//! The layer walk: what each layer paints, bottom to top, as paths and groups in viewport space.
+//!
+//! The order follows the renderer: a layer's fills, its children (clipped by a clipping frame,
+//! masked runs clipped by their mask), then its strokes. A layer's opacity is folded into the
+//! colours of what it paints; that is exact unless two of those shapes overlap (a Vector Drawable
+//! group has no opacity of its own), which [`Compat`] decides.
+
+use figcraft_color::{BlendMode, Paint, PaintKind};
+use figcraft_doc::{Document, EffectKind, MaskType, Node, NodeId, NodeKind};
+use figcraft_geom::{Affine, BezPath, Rect, Shape};
+use figcraft_render::{FillRule, MAX_EXPORT_DEPTH};
+
+use crate::model::{Fill, GroupItem, GroupXf, Item, ItemKind, NativeStroke, PathItem};
+use crate::paint::{GradOut, gradient, nonzero};
+use crate::warnings::{Warn, Warnings};
+use crate::{Compat, VdOptions, stroke, text};
+
+/// The largest coordinate written: past it a 32-bit float (what Android parses path data into)
+/// can't place points to a fraction of a dp.
+const MAX_COORD: f64 = 1e7;
+
+pub(crate) struct Walker<'a> {
+    doc: &'a Document,
+    opts: &'a VdOptions,
+    warn: Warnings,
+    names: std::collections::BTreeSet<String>,
+}
+
+/// Every coordinate of `p` finite and within [`MAX_COORD`].
+fn writable(p: &BezPath) -> bool {
+    use figcraft_geom::kurbo::PathEl::*;
+    let ok = |q: figcraft_geom::Point| q.x.is_finite() && q.y.is_finite() && q.x.abs() <= MAX_COORD && q.y.abs() <= MAX_COORD;
+    p.elements().iter().all(|el| match *el {
+        MoveTo(a) | LineTo(a) => ok(a),
+        QuadTo(a, b) => ok(a) && ok(b),
+        CurveTo(a, b, c) => ok(a) && ok(b) && ok(c),
+        ClosePath => true,
+    })
+}
+
+fn baked(p: &BezPath, xf: Affine) -> BezPath {
+    let mut out = p.clone();
+    out.apply_affine(xf);
+    out
+}
+
+fn union(items: &[Item]) -> Option<Rect> {
+    items.iter().map(|i| i.bbox).reduce(|a, b| a.union(b))
+}
+
+fn normal(b: BlendMode) -> bool {
+    matches!(b, BlendMode::Normal | BlendMode::PassThrough)
+}
+
+impl<'a> Walker<'a> {
+    pub fn new(doc: &'a Document, opts: &'a VdOptions) -> Self {
+        Self { doc, opts, warn: Warnings::default(), names: Default::default() }
+    }
+
+    /// Reports that the export drew nothing at all (named after `layer`).
+    pub fn nothing_drawn(&mut self, layer: &str) {
+        if self.opts.compat != Compat::Ignore {
+            self.warn.add(Warn::NothingDrawn, layer);
+        }
+    }
+
+    pub fn finish(self) -> Vec<String> {
+        self.warn.finish()
+    }
+
+    fn note(&mut self, w: Warn, n: &Node) {
+        if self.opts.compat != Compat::Ignore {
+            self.warn.add(w, &n.name);
+        }
+    }
+
+    /// `name` as an `android:name` not used yet in this file (repeats get `_2`, `_3`…).
+    fn unique(&mut self, name: &str) -> String {
+        let base: String = name.chars().take(200).collect();
+        let base = if base.trim().is_empty() { "layer".to_string() } else { base };
+        // Bounded: a set of n names leaves one of the first n + 1 candidates free.
+        let tries = self.names.len().saturating_add(1);
+        let name = (1..=tries)
+            .map(|k| if k == 1 { base.clone() } else { format!("{base}_{k}") })
+            .find(|n| !self.names.contains(n))
+            .unwrap_or_else(|| format!("{base}_{}", tries.saturating_add(1)));
+        self.names.insert(name.clone());
+        name
+    }
+
+    /// What layer `id` paints, drawn through `xf` (its parent's space → viewport).
+    pub fn node(&mut self, id: NodeId, xf: Affine, depth: usize) -> Vec<Item> {
+        let doc = self.doc;
+        let Some(n) = doc.node(id) else { return Vec::new() };
+        if depth > MAX_EXPORT_DEPTH || !n.visible || n.is_mask {
+            return Vec::new();
+        }
+        let op = n.opacity;
+        if !(op.is_finite() && op > 0.0) {
+            return Vec::new();
+        }
+        let xf = xf * n.transform;
+        self.effects(n);
+        if !normal(n.blend) {
+            self.note(Warn::Blend, n);
+        }
+        let mut items = Vec::new();
+        if matches!(n.kind, NodeKind::Text(_)) {
+            self.text(n, xf, &mut items);
+        } else {
+            self.shape(n, xf, depth, &mut items);
+        }
+        if op < 1.0 {
+            if Item::overlap(&items) {
+                match self.opts.compat {
+                    Compat::BestEffort => {
+                        self.note(Warn::OpacityApprox, n);
+                        Item::scale_alpha(&mut items, op);
+                    }
+                    Compat::Exact => {
+                        self.note(Warn::OpacityOmitted, n);
+                        return Vec::new();
+                    }
+                    Compat::Ignore => {}
+                }
+            } else {
+                Item::scale_alpha(&mut items, op);
+            }
+        }
+        if self.opts.include_names && !items.is_empty() {
+            let container = !matches!(n.kind, NodeKind::BooleanOp { .. }) && !n.children.is_empty();
+            if container {
+                let bbox = union(&items).unwrap_or(Rect::ZERO);
+                let name = Some(self.unique(&n.name));
+                items = vec![Item { kind: ItemKind::Group(GroupItem { name, xf: None, clip: None, children: items }), bbox }];
+            } else {
+                for it in &mut items {
+                    let name = Some(self.unique(&n.name));
+                    match &mut it.kind {
+                        ItemKind::Path(p) => p.name = name,
+                        ItemKind::Group(g) => g.name = name,
+                    }
+                }
+            }
+        }
+        items
+    }
+
+    /// Effects have no Vector Drawable equivalent: each kind is noted.
+    fn effects(&mut self, n: &Node) {
+        for e in n.effects.iter().filter(|e| e.visible) {
+            let w = match e.kind {
+                EffectKind::DropShadow(_) => Warn::DropShadow,
+                EffectKind::InnerShadow(_) => Warn::InnerShadow,
+                EffectKind::LayerBlur(_) => Warn::LayerBlur,
+                EffectKind::BackgroundBlur(_) => Warn::BackgroundBlur,
+                EffectKind::Noise(_) => Warn::Noise,
+                EffectKind::Texture(_) => Warn::Texture,
+                EffectKind::Glass(_) => Warn::Glass,
+            };
+            self.note(w, n);
+        }
+    }
+
+    fn text(&mut self, n: &Node, xf: Affine, items: &mut Vec<Item>) {
+        let Some(runs) = text::runs(n) else { return };
+        for (path, fills) in &runs {
+            for p in fills {
+                self.fill(n, p, path, false, xf, items);
+            }
+        }
+        if n.has_visible_stroke() {
+            // Glyph outlines are closed: inside and outside strokes follow them, as on the canvas.
+            let even = stroke::outline_even_odd(n, true);
+            for (path, _) in &runs {
+                let area = figcraft_render::draw::stroke_area(n, path, true);
+                for p in &n.strokes {
+                    self.fill(n, p, &area, even, xf, items);
+                }
+            }
+        }
+    }
+
+    fn shape(&mut self, n: &Node, xf: Affine, depth: usize, items: &mut Vec<Item>) {
+        let doc = self.doc;
+        let outline = match n.kind {
+            NodeKind::Group | NodeKind::Page { .. } => None,
+            _ => figcraft_render::node_outline(doc, n),
+        };
+        let boolean = matches!(n.kind, NodeKind::BooleanOp { .. });
+        let closed = figcraft_doc::geometry::is_closed(n) || boolean;
+        if closed && let Some((path, rule)) = &outline {
+            for p in &n.fills {
+                self.fill(n, p, path, *rule == FillRule::EvenOdd, xf, items);
+            }
+        }
+        if !boolean && !n.children.is_empty() && !n.hides_contents() {
+            let kids = self.children(n, xf, depth);
+            let clips = n.clip && n.kind.is_frame_like();
+            match &outline {
+                Some((path, rule)) if clips => {
+                    if let Some(g) = self.clipped(n, &baked(path, xf), *rule == FillRule::EvenOdd, kids) {
+                        items.push(g);
+                    }
+                }
+                _ => items.extend(kids),
+            }
+        }
+        if n.has_visible_stroke() {
+            self.strokes(n, outline.as_ref().map(|(p, _)| p), closed, xf, items);
+        }
+    }
+
+    /// `n`'s children, bottom to top; a visible mask clips the layers above it (up to the next
+    /// mask) to its outline.
+    fn children(&mut self, n: &Node, xf: Affine, depth: usize) -> Vec<Item> {
+        let doc = self.doc;
+        let mut out = Vec::new();
+        for run in doc.paint_runs(n) {
+            let Some(&first) = n.children.get(run.start) else { continue };
+            let Some(m) = doc.node(first).filter(|m| m.is_mask && m.visible) else {
+                out.extend(self.node(first, xf, depth + 1));
+                continue;
+            };
+            if m.mask_type != MaskType::Vector {
+                match self.opts.compat {
+                    Compat::BestEffort => self.note(Warn::MaskApprox, m),
+                    Compat::Exact => {
+                        self.note(Warn::MaskOmitted, m);
+                        continue;
+                    }
+                    Compat::Ignore => {}
+                }
+            }
+            let mut kids = Vec::new();
+            for k in n.children.get(run.start + 1..run.end).unwrap_or(&[]) {
+                kids.extend(self.node(*k, xf, depth + 1));
+            }
+            // A mask without an outline shows nothing of what it masks.
+            let Some((outline, rule)) = figcraft_render::subtree_outline(doc, m, depth + 1) else { continue };
+            if let Some(g) = self.clipped(m, &baked(&outline, xf * m.transform), rule == FillRule::EvenOdd, kids) {
+                out.push(g);
+            }
+        }
+        out
+    }
+
+    /// `kids` in a group clipped to `clip` (viewport space). A `<clip-path>` has no fill rule:
+    /// an even-odd outline is rewritten as non-zero first.
+    fn clipped(&mut self, n: &Node, clip: &BezPath, even: bool, kids: Vec<Item>) -> Option<Item> {
+        if kids.is_empty() {
+            return None;
+        }
+        if !writable(clip) {
+            self.note(Warn::TooLarge, n);
+            return None;
+        }
+        let clip = if even && self.opts.compat != Compat::Ignore {
+            match nonzero(clip) {
+                Some(p) => {
+                    // Exact either way, but bestEffort reports the rewrite as it does for fills.
+                    if self.opts.compat == Compat::BestEffort {
+                        self.note(Warn::ClipEvenOddRewritten, n);
+                    }
+                    p
+                }
+                None if self.opts.compat == Compat::Exact => {
+                    self.note(Warn::ClipEvenOddOmitted, n);
+                    return None;
+                }
+                None => {
+                    self.note(Warn::ClipEvenOddApprox, n);
+                    clip.clone()
+                }
+            }
+        } else {
+            clip.clone()
+        };
+        if clip.elements().is_empty() {
+            return None;
+        }
+        let bbox = union(&kids)?.intersect(clip.bounding_box());
+        Some(Item { kind: ItemKind::Group(GroupItem { name: None, xf: None, clip: Some(clip), children: kids }), bbox })
+    }
+
+    fn strokes(&mut self, n: &Node, outline: Option<&BezPath>, closed: bool, xf: Affine, items: &mut Vec<Item>) {
+        let native = stroke::native(n, xf);
+        let mut area: Option<(BezPath, bool)> = None;
+        for p in &n.strokes {
+            if !p.visible || p.opacity <= 0.0 {
+                continue;
+            }
+            if let (Some(nat), PaintKind::Solid { color }) = (&native, &p.kind) {
+                if !normal(p.blend) {
+                    self.note(Warn::Blend, n);
+                }
+                let color = color.with_alpha(color.a * p.opacity.clamp(0.0, 1.0));
+                let data = baked(&nat.path, xf);
+                if color.a <= 0.0 || data.elements().is_empty() {
+                    continue;
+                }
+                if !writable(&data) {
+                    self.note(Warn::TooLarge, n);
+                    continue;
+                }
+                // Room for caps and mitred corners around the line.
+                let reach = nat.width / 2.0 * nat.miter.max(std::f64::consts::SQRT_2);
+                let bbox = data.bounding_box().inflate(reach, reach);
+                let stroke = NativeStroke { color, width: nat.width, cap: nat.cap, join: nat.join, miter: nat.miter };
+                let path = PathItem { name: None, data, fill: None, stroke: Some(stroke), even_odd: false };
+                items.push(Item { kind: ItemKind::Path(path), bbox });
+                continue;
+            }
+            if area.is_none() {
+                let geom = match &n.kind {
+                    NodeKind::BooleanOp { .. } => outline.cloned(),
+                    _ => figcraft_doc::geometry::stroke_geometry(n),
+                };
+                let Some(g) = geom else { return };
+                area = Some(((*figcraft_render::draw::stroke_area(n, &g, closed)).clone(), stroke::outline_even_odd(n, closed)));
+            }
+            if let Some((a, even)) = &area {
+                self.fill(n, p, a, *even, xf, items);
+            }
+        }
+    }
+
+    /// Paint `p` filling `path` (layer space, even-odd when `even`) of layer `n`.
+    fn fill(&mut self, n: &Node, p: &Paint, path: &BezPath, even: bool, xf: Affine, items: &mut Vec<Item>) {
+        if !p.visible || p.opacity <= 0.0 || path.elements().is_empty() {
+            return;
+        }
+        let opacity = p.opacity.clamp(0.0, 1.0);
+        let fill = match &p.kind {
+            PaintKind::Solid { color } => {
+                let c = color.with_alpha(color.a * opacity);
+                if c.a <= 0.0 {
+                    return;
+                }
+                Some(Fill::Solid(c))
+            }
+            PaintKind::Gradient(_) => None,
+            PaintKind::Image(_) => {
+                self.note(Warn::ImageFill, n);
+                return;
+            }
+            PaintKind::Pattern(_) => {
+                self.note(Warn::PatternFill, n);
+                return;
+            }
+        };
+        let mut grad = None;
+        if let PaintKind::Gradient(g) = &p.kind {
+            let diamond = g.kind == figcraft_color::GradientKind::Diamond;
+            if diamond {
+                match self.opts.compat {
+                    Compat::BestEffort => self.note(Warn::DiamondApprox, n),
+                    Compat::Exact => {
+                        self.note(Warn::DiamondOmitted, n);
+                        return;
+                    }
+                    Compat::Ignore => return,
+                }
+            }
+            grad = Some(gradient(g, opacity, xf, n.width, n.height, diamond));
+        }
+        if !normal(p.blend) {
+            self.note(Warn::Blend, n);
+        }
+        let data = baked(path, xf);
+        if !writable(&data) {
+            self.note(Warn::TooLarge, n);
+            return;
+        }
+        let (data, even_odd) = if even && self.opts.compat == Compat::BestEffort {
+            match nonzero(&data) {
+                Some(nz) => {
+                    self.note(Warn::EvenOddRewritten, n);
+                    (nz, false)
+                }
+                None => {
+                    self.note(Warn::EvenOddKept, n);
+                    (data, true)
+                }
+            }
+        } else {
+            (data, even)
+        };
+        if data.elements().is_empty() {
+            return;
+        }
+        let bbox = data.bounding_box();
+        let path_item = |data: BezPath, fill: Fill| PathItem { name: None, data, fill: Some(fill), stroke: None, even_odd };
+        match (fill, grad) {
+            (Some(f), _) => items.push(Item { kind: ItemKind::Path(path_item(data, f)), bbox }),
+            (None, Some(GradOut::Solid(c))) => items.push(Item { kind: ItemKind::Path(path_item(data, Fill::Solid(c))), bbox }),
+            (None, Some(GradOut::Plain(g))) => items.push(Item { kind: ItemKind::Path(path_item(data, Fill::Gradient(g))), bbox }),
+            (None, Some(GradOut::Grouped { xf: gxf, inverse, grad: g })) => {
+                let inner = Item { kind: ItemKind::Path(path_item(baked(&data, inverse), Fill::Gradient(g))), bbox };
+                let group: GroupXf = gxf;
+                items.push(Item { kind: ItemKind::Group(GroupItem { name: None, xf: Some(group), clip: None, children: vec![inner] }), bbox });
+            }
+            (None, Some(GradOut::Nothing) | None) => {}
+        }
+    }
+}
diff --git a/crates/vectordrawable/src/warnings.rs b/crates/vectordrawable/src/warnings.rs
new file mode 100644
index 00000000..445198d5
--- /dev/null
+++ b/crates/vectordrawable/src/warnings.rs
@@ -0,0 +1,89 @@
+//! What the export changed or left out: one entry per kind, naming the first few layers.
+
+/// The kinds of change, in the order they're reported.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub(crate) enum Warn {
+    DropShadow,
+    InnerShadow,
+    LayerBlur,
+    BackgroundBlur,
+    Noise,
+    Texture,
+    Glass,
+    Blend,
+    ImageFill,
+    PatternFill,
+    DiamondApprox,
+    DiamondOmitted,
+    OpacityApprox,
+    OpacityOmitted,
+    EvenOddRewritten,
+    EvenOddKept,
+    ClipEvenOddRewritten,
+    ClipEvenOddApprox,
+    ClipEvenOddOmitted,
+    MaskApprox,
+    MaskOmitted,
+    TooLarge,
+    NothingDrawn,
+}
+
+impl Warn {
+    fn message(self) -> &'static str {
+        match self {
+            Warn::DropShadow => "drop shadows were left out",
+            Warn::InnerShadow => "inner shadows were left out",
+            Warn::LayerBlur => "layer blurs were left out",
+            Warn::BackgroundBlur => "background blurs were left out",
+            Warn::Noise => "noise effects were left out",
+            Warn::Texture => "texture effects were left out",
+            Warn::Glass => "glass effects were left out",
+            Warn::Blend => "blend modes were drawn as normal",
+            Warn::ImageFill => "image fills were left out",
+            Warn::PatternFill => "pattern fills were left out",
+            Warn::DiamondApprox => "diamond gradients were drawn as radial gradients",
+            Warn::DiamondOmitted => "diamond gradients were left out (exact mode)",
+            Warn::OpacityApprox => "layer opacity was applied to each shape: where shapes overlap they look denser",
+            Warn::OpacityOmitted => "layers with opacity over overlapping shapes were left out (exact mode)",
+            Warn::EvenOddRewritten => "even-odd fills were rewritten as non-zero",
+            Warn::EvenOddKept => "even-odd fills couldn't be rewritten and use fillType=\"evenOdd\" (API 24+ or AndroidX)",
+            Warn::ClipEvenOddRewritten => "even-odd clip outlines were rewritten as non-zero",
+            Warn::ClipEvenOddApprox => "even-odd clip outlines couldn't be rewritten and clip as non-zero",
+            Warn::ClipEvenOddOmitted => "layers under even-odd clip outlines that couldn't be rewritten were left out (exact mode)",
+            Warn::MaskApprox => "alpha and luminance masks clip to the mask's outline",
+            Warn::MaskOmitted => "layers under alpha or luminance masks were left out (exact mode)",
+            Warn::TooLarge => "shapes with coordinates beyond ±10,000,000 were left out",
+            Warn::NothingDrawn => "nothing in it could be drawn: the drawable is empty",
+        }
+    }
+}
+
+/// Layers named per warning.
+const NAMED: usize = 3;
+
+#[derive(Default)]
+pub(crate) struct Warnings {
+    seen: std::collections::BTreeMap<Warn, Vec<String>>,
+}
+
+impl Warnings {
+    pub fn add(&mut self, w: Warn, layer: &str) {
+        let names = self.seen.entry(w).or_default();
+        if !names.iter().any(|n| n == layer) {
+            names.push(layer.to_string());
+        }
+    }
+
+    pub fn finish(self) -> Vec<String> {
+        self.seen
+            .into_iter()
+            .map(|(w, names)| {
+                let shown: Vec<String> =
+                    names.iter().take(NAMED).map(|n| if n.is_empty() { "unnamed layer".to_string() } else { n.clone() }).collect();
+                let more = names.len().saturating_sub(NAMED);
+                let more = if more > 0 { format!(", {more} more") } else { String::new() };
+                format!("{} ({}{more})", w.message(), shown.join(", "))
+            })
+            .collect()
+    }
+}
diff --git a/crates/vectordrawable/src/xml.rs b/crates/vectordrawable/src/xml.rs
new file mode 100644
index 00000000..48d7dee2
--- /dev/null
+++ b/crates/vectordrawable/src/xml.rs
@@ -0,0 +1,243 @@
+//! The pretty-printed XML: elements two spaces deeper per level, one attribute per line four
+//! spaces past its element (as Android Studio formats drawables). Numbers are compact (at most
+//! three decimals, no `-0`) and always finite; text is escaped for attribute values.
+
+use std::fmt::Write as _;
+
+use figcraft_color::Color;
+use figcraft_geom::BezPath;
+use figcraft_geom::kurbo::PathEl;
+
+use crate::model::{Fill, GradKind, GroupItem, Item, ItemKind, NativeStroke, PathItem};
+
+const ANDROID: &str = "http://schemas.android.com/apk/res/android";
+const AAPT: &str = "http://schemas.android.com/aapt";
+
+/// A number as Android reads it: rounded to 3 decimals, no trailing zeros, `0` for anything
+/// non-finite (the walk leaves out shapes whose numbers aren't finite).
+pub(crate) fn num(v: f64) -> String {
+    if !v.is_finite() {
+        return "0".into();
+    }
+    let r = (v * 1000.0).round() / 1000.0;
+    let s = format!("{r}");
+    if s == "-0" { "0".into() } else { s }
+}
+
+/// `s` for an attribute value: markup escaped, whitespace that parsers would fold kept as
+/// character references, and characters XML 1.0 forbids dropped.
+pub(crate) fn esc(s: &str) -> String {
+    let mut out = String::with_capacity(s.len());
+    for c in s.chars() {
+        match c {
+            '&' => out.push_str("&amp;"),
+            '<' => out.push_str("&lt;"),
+            '>' => out.push_str("&gt;"),
+            '"' => out.push_str("&quot;"),
+            '\'' => out.push_str("&apos;"),
+            '\t' => out.push_str("&#9;"),
+            '\n' => out.push_str("&#10;"),
+            '\r' => out.push_str("&#13;"),
+            c if (c as u32) < 0x20 || c == '\u{FFFE}' || c == '\u{FFFF}' => {}
+            c => out.push(c),
+        }
+    }
+    out
+}
+
+/// `#RRGGBB`, or `#AARRGGBB` when not opaque.
+pub(crate) fn color(c: Color) -> String {
+    let [r, g, b, a] = c.sanitized().to_rgba8();
+    if a == 255 { format!("#{r:02X}{g:02X}{b:02X}") } else { format!("#{a:02X}{r:02X}{g:02X}{b:02X}") }
+}
+
+/// SVG path syntax, absolute commands.
+pub(crate) fn path_data(p: &BezPath) -> String {
+    let mut s = String::new();
+    let pt = |x: f64, y: f64| format!("{},{}", num(x), num(y));
+    for el in p.elements() {
+        if !s.is_empty() {
+            s.push(' ');
+        }
+        match *el {
+            PathEl::MoveTo(a) => {
+                let _ = write!(s, "M{}", pt(a.x, a.y));
+            }
+            PathEl::LineTo(a) => {
+                let _ = write!(s, "L{}", pt(a.x, a.y));
+            }
+            PathEl::QuadTo(a, b) => {
+                let _ = write!(s, "Q{} {}", pt(a.x, a.y), pt(b.x, b.y));
+            }
+            PathEl::CurveTo(a, b, c) => {
+                let _ = write!(s, "C{} {} {}", pt(a.x, a.y), pt(b.x, b.y), pt(c.x, c.y));
+            }
+            PathEl::ClosePath => s.push('Z'),
+        }
+    }
+    s
+}
+
+struct Out {
+    s: String,
+}
+
+impl Out {
+    /// `<tag` and its attributes, one per line; `close` ends it with `/>`, else `>`.
+    fn open(&mut self, depth: usize, tag: &str, attrs: &[(&str, String)], close: bool) {
+        let pad = "  ".repeat(depth);
+        let _ = write!(self.s, "{pad}<{tag}");
+        for (i, (k, v)) in attrs.iter().enumerate() {
+            if i == 0 && attrs.len() == 1 {
+                let _ = write!(self.s, " {k}=\"{v}\"");
+            } else {
+                let _ = write!(self.s, "\n{pad}    {k}=\"{v}\"");
+            }
+        }
+        self.s.push_str(if close { " />\n" } else { ">\n" });
+    }
+
+    fn close(&mut self, depth: usize, tag: &str) {
+        let _ = writeln!(self.s, "{}</{tag}>", "  ".repeat(depth));
+    }
+}
+
+fn uses_gradient(items: &[Item]) -> bool {
+    items.iter().any(|it| match &it.kind {
+        ItemKind::Path(p) => matches!(p.fill, Some(Fill::Gradient(_))),
+        ItemKind::Group(g) => uses_gradient(&g.children),
+    })
+}
+
+/// The whole file: a `width`×`height` dp drawable with a viewport of the same size.
+pub(crate) fn document(width: f64, height: f64, items: &[Item]) -> String {
+    let mut o = Out { s: String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n") };
+    let mut attrs = vec![("xmlns:android", ANDROID.to_string())];
+    if uses_gradient(items) {
+        attrs.push(("xmlns:aapt", AAPT.to_string()));
+    }
+    attrs.extend([
+        ("android:width", format!("{}dp", num(width))),
+        ("android:height", format!("{}dp", num(height))),
+        ("android:viewportWidth", num(width)),
+        ("android:viewportHeight", num(height)),
+    ]);
+    o.open(0, "vector", &attrs, false);
+    if items.is_empty() {
+        // Android refuses a <vector> without a <path> ("no path defined"): one empty, unfilled path.
+        o.open(1, "path", &[("android:pathData", "M0,0".to_string())], true);
+    }
+    for it in items {
+        item(&mut o, 1, it);
+    }
+    o.close(0, "vector");
+    o.s
+}
+
+fn item(o: &mut Out, depth: usize, it: &Item) {
+    match &it.kind {
+        ItemKind::Path(p) => path(o, depth, p),
+        ItemKind::Group(g) => group(o, depth, g),
+    }
+}
+
+fn group(o: &mut Out, depth: usize, g: &GroupItem) {
+    let mut attrs = Vec::new();
+    if let Some(n) = &g.name {
+        attrs.push(("android:name", esc(n)));
+    }
+    if let Some(x) = &g.xf {
+        let (sx, sy) = x.scale;
+        if num(x.rotation) != "0" {
+            attrs.push(("android:rotation", num(x.rotation)));
+        }
+        if num(sx) != "1" {
+            attrs.push(("android:scaleX", num(sx)));
+        }
+        if num(sy) != "1" {
+            attrs.push(("android:scaleY", num(sy)));
+        }
+        if num(x.translate.0) != "0" {
+            attrs.push(("android:translateX", num(x.translate.0)));
+        }
+        if num(x.translate.1) != "0" {
+            attrs.push(("android:translateY", num(x.translate.1)));
+        }
+    }
+    if g.children.is_empty() && g.clip.is_none() {
+        o.open(depth, "group", &attrs, true);
+        return;
+    }
+    o.open(depth, "group", &attrs, false);
+    if let Some(c) = &g.clip {
+        o.open(depth + 1, "clip-path", &[("android:pathData", path_data(c))], true);
+    }
+    for c in &g.children {
+        item(o, depth + 1, c);
+    }
+    o.close(depth, "group");
+}
+
+fn stroke_attrs(attrs: &mut Vec<(&str, String)>, s: &NativeStroke) {
+    attrs.push(("android:strokeColor", color(s.color)));
+    attrs.push(("android:strokeWidth", num(s.width)));
+    if s.cap != "butt" {
+        attrs.push(("android:strokeLineCap", s.cap.to_string()));
+    }
+    if s.join != "miter" {
+        attrs.push(("android:strokeLineJoin", s.join.to_string()));
+    } else if num(s.miter) != "4" {
+        attrs.push(("android:strokeMiterLimit", num(s.miter)));
+    }
+}
+
+fn path(o: &mut Out, depth: usize, p: &PathItem) {
+    let mut attrs = Vec::new();
+    if let Some(n) = &p.name {
+        attrs.push(("android:name", esc(n)));
+    }
+    attrs.push(("android:pathData", path_data(&p.data)));
+    if let Some(Fill::Solid(c)) = &p.fill {
+        attrs.push(("android:fillColor", color(*c)));
+    }
+    if let Some(s) = &p.stroke {
+        stroke_attrs(&mut attrs, s);
+    }
+    if p.even_odd && p.fill.is_some() {
+        attrs.push(("android:fillType", "evenOdd".to_string()));
+    }
+    let Some(Fill::Gradient(g)) = &p.fill else {
+        o.open(depth, "path", &attrs, true);
+        return;
+    };
+    o.open(depth, "path", &attrs, false);
+    o.open(depth + 1, "aapt:attr", &[("name", "android:fillColor".to_string())], false);
+    let mut ga = Vec::new();
+    match g.kind {
+        GradKind::Linear { start, end } => {
+            ga.push(("android:type", "linear".to_string()));
+            ga.push(("android:startX", num(start.0)));
+            ga.push(("android:startY", num(start.1)));
+            ga.push(("android:endX", num(end.0)));
+            ga.push(("android:endY", num(end.1)));
+        }
+        GradKind::Radial { center, radius } => {
+            ga.push(("android:type", "radial".to_string()));
+            ga.push(("android:centerX", num(center.0)));
+            ga.push(("android:centerY", num(center.1)));
+            ga.push(("android:gradientRadius", num(radius)));
+        }
+        GradKind::Sweep { center } => {
+            ga.push(("android:type", "sweep".to_string()));
+            ga.push(("android:centerX", num(center.0)));
+            ga.push(("android:centerY", num(center.1)));
+        }
+    }
+    o.open(depth + 2, "gradient", &ga, false);
+    for (off, c) in &g.stops {
+        o.open(depth + 3, "item", &[("android:offset", num(*off)), ("android:color", color(*c))], true);
+    }
+    o.close(depth + 2, "gradient");
+    o.close(depth + 1, "aapt:attr");
+    o.close(depth, "path");
+}
diff --git a/docs/architecture.md b/docs/architecture.md
index 766d2a6c..065a2132 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -1,6 +1,6 @@
 # FigCraft architecture
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-11 · **Change:** minor (the shared hub in `collab-net` and the `figcraft-server` app) · **Target:** Figma Design
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-18 · **Change:** minor (the `vectordrawable` crate, L4: Android Vector Drawable export; earlier: the shared hub in `collab-net` and the `figcraft-server` app) · **Target:** Figma Design
 
 How FigCraft is built today. Engine first, a thin swappable UI, everything a command; a Figma-shaped
 data model (a scene graph of frames with auto layout, components and variables). ~108,800 lines of
@@ -15,7 +15,7 @@ replaced.
 | Layer | Crate | Lines | Role |
 |---|---|---|---|
 | L0 | `figcraft-geom` | ~0.5k | Affine transforms, shape path builders (rounded and smoothed corners, polygons, stars, arcs) on kurbo |
-| L0 | `figcraft-color` | ~1.3k | Colours (HSB/HSL, hex/CSS, Display P3), paints (solid, gradients, image), blend modes |
+| L0 | `figcraft-color` | ~1.3k | Colours (HSB/HSL, LCH/OKLCH, hex/CSS, Display P3), paints (solid, gradients, image), blend modes |
 | L1 | `figcraft-doc` | ~8.5k | Document model: pages, node tree in a persistent map (`imbl`, stable ids), properties, components, styles, variables, prototype data, comments, versions. Serde everywhere |
 | L2 | `figcraft-layout` | ~1.8k | Auto layout (horizontal, vertical, wrap, grid; hug/fill/fixed; min/max), constraints, layout grid geometry |
 | L2 | `figcraft-text` | ~3.1k | Font database (optional embedded craft-fonts + system scan), shaping (harfrust), bidi, line layout, glyph outlines (skrifa), variable fonts |
@@ -26,6 +26,7 @@ replaced.
 | L3 | `figcraft-format` | ~5.2k | Native `.figcraft` (zip of `document.json` + images; streamed JSON), local library files, versions, REST API file JSON import (`rest/`) |
 | L4 | `figcraft-svg` | ~3.7k | SVG export and import (usvg) |
 | L4 | `figcraft-pdf` | ~2.3k | PDF export (krilla) with print options |
+| L4 | `figcraft-vectordrawable` | ~1.2k | Android Vector Drawable (XML) export: baked path data, gradients through `aapt:attr`, clip groups, compatibility modes and warnings |
 | L5 | `figcraft-engine` | ~39.3k | Sessions, undo history (`Arc` snapshots), the command registry (`cmd/*`, `spec!`), pointer tools and vector edit mode, snapping and measuring, components sync, libraries, prototype runtime, Dev Mode code generation, the menu catalog (`catalog.rs`) and the keymap (`keymap.rs`), a panic guard |
 | L6 | `figcraft-ui-egui` | ~31.9k | The UI3-style frontend: canvas (render worker), toolbar, layers, Design/Prototype/Inspect panels, colour picker, menus, dialogs, presenter, comments, accessibility (AccessKit), the control channel server |
 | L6 | `figcraft-mcp` | ~2.4k | MCP server (JSON-RPC over stdio), headless or bridged to a running app |
@@ -81,6 +82,7 @@ input.
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-18 | minor | Added `vectordrawable` (L4), the Android Vector Drawable (XML) writer |
 | 2026-10-11 | minor | `collab-net` hosts through one hub for the app's sessions and the standalone server; added the `figcraft-server` app |
 | 2026-10-10 | minor | Merged main after #101–#103: WASM plugins (plugins area 0% → 35% breadth, 20% ready; ecosystem 5% → 20%) and the multiplayer core without networking (multiplayer 5% → 15% breadth, 5% ready; collaboration 8% → 12%); menu breadth 97.5% → 98.5% (200/203); ready for real work ~46% → ~47%; full parity 420–790 h → 390–745 h; beta 210–380 h → 200–365 h. Fixed the stated weight sums (areas 1–16 sum to 94, total 113; percentages were already computed with those) |
 | 2026-10-10 | major | Created from the code as of PR #99 |
diff --git a/docs/auto-layout-parity.md b/docs/auto-layout-parity.md
index ae230608..ea2cc54f 100644
--- a/docs/auto-layout-parity.md
+++ b/docs/auto-layout-parity.md
@@ -1,6 +1,6 @@
 # Auto layout and constraints parity
 
-> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-13 · **Change:** minor (core editor leftovers: auto gap handles, wrapped-line alignment; behaviour suite written from the public documentation, every rule's status; fixes and the missing settings it found) · **Target:** Figma Design (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-17 · **Change:** minor (adding auto layout to an empty frame keeps its size (#369); `node.set` applies auto layout keys only to frames, with warnings (#603); core editor leftovers: auto gap handles, wrapped-line alignment; behaviour suite written from the public documentation, every rule's status; fixes and the missing settings it found) · **Target:** Figma Design (desktop app 126.10.7)
 
 Auto layout is the most used layout feature in Figma and the one where small differences (a
 hugging frame one pixel off, text wrapping at another width) break real files. **Breadth ~98%,
@@ -69,7 +69,7 @@ Status: **pass** (a case in the suite holds), **fixed** (the suite found a diver
 | Arrow keys move children one place (flows, rows, columns, grid cells, into neighbours) | done | `al_keys_tests.rs` |
 | Constraints: left, right, left and right, centre, scale; top/bottom likewise | done | |
 | Layout grids: columns, rows, grid; stretch/left/centre/right; variables bound | done | |
-| Suggest auto layout / "Add auto layout" on a selection | done | |
+| Suggest auto layout / "Add auto layout" on a selection | done | adding auto layout to an empty frame keeps its size, Fixed (it collapsed to 20×20); a frame with content still hugs it, as does a new frame wrapped around a selection (#369). `node.set` with auto layout keys on a mix of layers applies them to the frames and warns about the rest instead of failing the whole call (#603) |
 | Real Figma files laid out identically | **not checked** | needs `.fig` or REST import of real files ([gaps](gaps.md) #1, #3) |
 | Performance: re-flow only where sizes or places changed | done | measured in `cargo xtask bench` (components at scale) |
 
@@ -77,6 +77,7 @@ Status: **pass** (a case in the suite holds), **fixed** (the suite found a diver
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-17 | minor | Community batch #753: adding auto layout to an empty frame keeps its size, Fixed, while a frame with content hugs it (#369); `node.set` applies auto layout keys to the frames among its targets and warns about the others, and a font style the family lacks warns with the nearest face (#603). Checked over MCP. Numbers unchanged |
 | 2026-10-13 | minor | Auto layout, on-canvas handles of automatic gaps (M2): the handle between spread rows or columns (and between items with an auto gap) shows the distance the layout gives the gap instead of the stored value, and dragging it makes the gap a fixed one from there, as typing a gap in the panel does; one undo step (`gap_handle_tests`). Before, the drag changed a value that had no effect. The documentation is silent on dragging an automatic gap. Numbers unchanged. |
 | 2026-10-13 | minor | Auto layout, wrapped-line alignment (M2): a wrapping layout's lines (rows of a horizontal one, columns of a vertical one) are packed where the cross alignment says (start, centre, end; before, they always sat at the start), stretch when every child fills across the flow, or take the free space between them (`contentAlign: spaceBetween`, the Design panel's Row/Column gap mode, the alignment pad lighting the whole cross axis). Read from REST JSON and `.fig`, written to `.fig`, `align-content` in CSS, an instance override with the other alignment settings. 13 hand-computed layout cases and command tests. Numbers unchanged. |
 | 2026-10-11 | minor | Behaviour suite from the public documentation (64 layout cases, 8 command tests). Fixed: padding floor, inside-only included strokes (and included by default), auto gaps stop at 0, grid `fr` like CSS `fr`, canvas stacking actually drawn and hit. Added: auto gaps evenly/around, vertical wrap, grid cell alignment, strokes and canvas stacking controls. Breadth 95% → 98%, ready 68% → 74%, remaining 6–12 h → 3–6 h |
diff --git a/docs/boards-parity.md b/docs/boards-parity.md
new file mode 100644
index 00000000..69526a18
--- /dev/null
+++ b/docs/boards-parity.md
@@ -0,0 +1,69 @@
+# Boards parity
+
+> **Last reviewed:** 2026-10-24 · **Last updated:** 2026-10-24 · **Change:** minor (templates and tables; facilitation: a shared timer and voting sessions; the dot grid, dragging a connector's end to re-attach it, curved connectors, elbows that go around what they join) · **Target:** the incumbent's whiteboard product (behaviour from its public help centre)
+
+**Breadth ~47%, ready ~29% (estimated, erring low).** A board is a FigCraft file of its own kind
+(`file.newBoard`) with a dot grid on the page, sticky notes, shapes with text, connectors that
+follow what they join (straight, elbow or curved, their ends dragged onto other objects), marker,
+highlighter and eraser, stamps, text and sections, five built-in templates and tables, edited
+together in the existing live sessions, with a shared countdown and voting sessions to run a
+workshop. Music, board widgets, mind maps and the rest of the tail are missing. Remaining:
+~20–44 h. Tracked as area 22 of
+[`target-app-parity.md`](target-app-parity.md) (not in its weighted sum: the target there is the
+design product). The work item is gap 24 in [`gaps.md`](gaps.md).
+
+## How boards are built
+
+Board objects are ordinary layers with a small `board` field on the node (`figcraft_doc::BoardItem`),
+so rendering, hit testing, undo, saving, SVG/PNG/PDF export, copy and paste and live sessions work
+on them unchanged. The file kind (`Document.kind`) is saved in `.figcraft` and reaches people who
+join a live session in their snapshot. What follows from the metadata (a sticky's text size, a
+shape's text room, connector routes and their labels) is recomputed in the engine's normalize pass,
+deterministically from the document, so local edits, undo and edits from others in a live session
+all end with the same geometry.
+
+## Features
+
+| Feature | Status | Notes |
+|---|---|---|
+| Board files: File ▸ New board, the home screen's New board card, a light page | done | `file.newBoard`; the kind shows in `inspect_document`, tabs and file rows (a note mark; design files a pen nib) |
+| Board toolbar at the bottom | done | Move/Hand, Marker/Highlighter/Eraser, Sticky (colour flyout), Shapes (flyout), Connector, Text, Section, Stamp (flyout), Comment, Resources, Actions, the Design panel's button |
+| Design panel hidden by default; a contextual bar above the selection | done | colour, shape, text size (S/M/L/XL), connector straight/elbow/curved and its arrow; the Design panel opens with its button or View ▸ Design panel |
+| Prototyping and Dev Mode refuse on boards | done | `proto.*`, `dev.*`, `view.prototype`, `view.devMode` say why |
+| Sticky notes | done | a square frame (200 wide, growing taller through auto layout), 8 soft colours, a soft shadow, the note's text size shrinking as it grows (24 → 11, by characters and lines), the author's name at the bottom; a click places one and starts typing; Enter or a double-click edits; Shift+Cmd/Ctrl+Enter adds the next one beside it |
+| Sticky options: hide the author, change size presets, sticky stacks | partial | `board.sticky {author: false}`; no size presets or stacks |
+| Shapes with text | done | rectangle, rounded rectangle, ellipse, diamond, triangle, speech bubble, chevron; text centred and wrapping inside the outline; shape type and text size from the contextual bar |
+| Shape auto-fit to its text, more shapes (cylinder, cross, star…), shape libraries | missing | |
+| Connectors | done | from a layer's side (the facing one, or one named) to another layer or a free point, straight, elbow or curved, arrowheads (the stroke's caps), a label in the middle of the route by length (double-click to add); re-routed when either end moves or resizes; a deleted end stays where it was |
+| Curved connectors, elbows around objects, dragging an end to re-attach | done | `board.setStyle {style: curved}` (and the contextual bar): one curve leaving and arriving along the sides; an elbow whose short way would cross what it joins goes around their boxes, 24 units clear; a selected connector shows its two ends as handles, and dragging one onto an object attaches it there (the object is outlined while dragging), onto empty canvas leaves it free (`board.reattach {id, end, target, side?}`, one undo step) |
+| Connector waypoints placed by hand | missing | routes are computed from the ends; no bend points of your own |
+| Quick-create handles (drag out a connected copy) | missing | |
+| Marker and highlighter | done | the Pencil's stroke fitting with board presets: marker opaque, highlighter wide, see-through and multiplying |
+| Eraser | done | drag over marker and highlighter strokes to remove them, one undo step |
+| Pen colours and widths in the toolbar | partial | `tool.marker {color}`, `tool.highlighter {color}`; colour changes on a selected stroke from the contextual bar |
+| Stamps | done | thumbs up, heart, plus one, star, question, check: round badges drawn as vectors, the placer's name on hover |
+| Stamps sticking to the object they land on, the stamp wheel, emotes, stickers | missing | |
+| Text and sections | done | the existing Text tool and sections |
+| Live sessions: cursors, selections, cursor chat, spotlight | done | the existing sessions; board objects, connectors following moved objects, colours and stamps sync both ways (checked with two app instances) |
+| Timer | done | a pill at the top right of the board: presets (1, 3, 5, 10, 15 min) or any whole minutes, pause, resume, a minute more, stop; red at 0:00 until stopped; no sound. `board.timer {action, minutes?}`, `board.timerState`. Synced as its end time (or the time left while paused), so every client counts down on its own clock: nothing ticks over the network. Not an undo step |
+| Timer music, timer sounds | missing | |
+| Voting sessions | done | one at a time: votes per person (1–99), on every object, on sticky notes or on the selection; a click on an object places a vote (several on one object allowed), a click on your badge or an Alt-click takes it back; your own votes show as badges while it runs, everyone's once it ends, with a ranked list (ties share a rank) that selects an object from its row; Clear results. `board.vote {action: start\|cast\|retract\|end\|clear}`, `board.voteResults`. Ballots sync per voter (keyed by the live-session client id, or your name offline), so people voting at once never overwrite each other. Not undo steps |
+| Voting: only the facilitator ends or clears it, who voted for what | missing | anyone who can edit the board can end or clear a vote; results are counts only |
+| Board widgets | missing | design-file widgets exist (`crates/engine/src/extensions/widgets.rs`), not wired to boards |
+| Templates (retrospective, brainstorm, flow chart…) | partial | five built-in templates drawn up for FigCraft (retrospective, brainstorm, weekly planner, flow chart, kanban board), placed from the toolbar's templates picker (each with a picture of itself) or `board.template {name, x?, y?}` as ordinary sections, stickies, shapes, connectors and text in one undo step; `board.templates` lists them. No community templates, no saving your own |
+| Tables | partial | `board.table {rows, columns, cells?, x?, y?}` (at most 50 × 20): an auto layout frame of rows of cells with text, a tinted header row and lines between rows and columns; a cell's row grows with its text; a double-click types in the cell under the pointer; add or remove a row or column from the bar over the selection or `board.tableEdit {id, action, index?}`; undoable and synced in live sessions. No column resizing by dragging, no cell colours, no Tab between cells, no CSV paste |
+| Mind maps | missing | |
+| Washi tape, code blocks, image cropping on boards | missing | images can be placed as in design files |
+| Audio and huddles | missing | |
+| AI features (summaries, sorting stickies, generating boards) | missing | |
+| Dot grid on the page | done | the canvas render draws it after the page colour and before the layers (`figcraft_render::Dots`), so objects cover it; 24 units apart, doubling when zoomed out until the dots are at least 14 points apart, the dots the next doubling drops fading out first; dark dots on a light page, light ones on a dark page, from the theme's ink; written straight into the image, no allocation per dot; never in exports |
+| `.jam` import and export | missing | see [`file-format-parity.md`](file-format-parity.md) |
+
+## Revision history
+
+| Date | Change | Summary |
+|---|---|---|
+| 2026-10-24 | minor | M12: the dot grid on board pages (a render pass under the layers), dragging a selected connector's end onto another object or empty canvas (`board.reattach`), curved connectors, and elbows that go around the objects they join. Breadth ~35% → ~37%, ready ~20% → ~21%, ~30–60 h → ~28–56 h |
+| 2026-10-24 | minor | Facilitation (M12): a shared timer and voting sessions. Breadth ~35% → ~40%, ready ~20% → ~24%, ~30–60 h → ~26–54 h |
+| 2026-10-24 | minor | Templates (retrospective, brainstorm, weekly planner, flow chart, kanban board) from a toolbar picker or `board.template`, and tables (`board.table`, `board.tableEdit`): breadth ~35% → ~40%, ready ~20% → ~24%, remaining 30–60 h → 26–54 h |
+| 2026-10-24 | major | Created with board files (M12): sticky notes, shapes with text, connectors, ink and eraser, stamps, the board toolbar and contextual bar, live-session sync |
diff --git a/docs/cli.md b/docs/cli.md
index 9f5df40e..39863bea 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -4,7 +4,13 @@ FigCraft without a window: inspect, export, convert and render documents, run co
 commands, serve MCP and measure performance. Build it with
 `cargo build --release -p figcraft-cli` (binary `target/release/figcraft-cli`).
 
-Bad arguments print usage and exit with code 2; failures exit with 1. The CLI never panics on input.
+`figcraft-cli --help` (or `-h`, or `help`) prints usage on stdout and exits with 0, and so does
+`--help` or `-h` after a subcommand (`figcraft-cli mcp --help`). Bad arguments print usage and exit
+with code 2; failures exit with 1. The CLI never panics on input.
+
+Put options before `--` to pass a filename beginning with a dash, for example
+`figcraft-cli info --json -- --drawing.figcraft`. Every argument after `--` is literal,
+including a filename named `--no-system-fonts`.
 
 ## Fonts
 
@@ -19,6 +25,16 @@ On Linux and other Unix systems except macOS, user fonts are read from
 `$XDG_DATA_HOME/fonts`, or `$HOME/.local/share/fonts` when `XDG_DATA_HOME` is unset,
 empty or relative. The legacy `$HOME/.fonts` directory is also scanned.
 
+On macOS the font folders (`/System/Library/Fonts`, `/Library/Fonts`, `~/Library/Fonts` and the
+system's downloadable fonts) are read, and so is every other font file Core Text lists as
+available: fonts a font manager such as RightFont, FontBase or Typeface activates from its own
+library, without copying them into a font folder. Fonts activated while the app runs are found by
+`text.rescanFonts`, like newly installed ones.
+
+On macOS, fonts activated through Adobe Fonts are read where Creative Cloud keeps them
+(`~/Library/Application Support/Adobe/CoreSync/plugins/livetype`), so they're available while
+they're active there. Files without an extension are read when they start like a font file.
+
 The collaboration server is a binary of its own, `figcraft-server` (`cargo build --release -p
 figcraft-server`): it keeps files with share links and serves their live sessions, and its
 `key`, `files`, `links`, `reports`, `block-ip` and `check` subcommands manage them (a server can
@@ -29,12 +45,15 @@ be open to the public: [server.md](server.md#running-a-public-server)). See [ser
 ### `info <file> [--json]`
 
 Pages, node counts, top-level frames (id, type, name, size), style/variable/image counts. Repairs
-of a damaged file and import warnings go to stderr as `note:` lines (`notes` with `--json`).
+of a damaged file and import warnings go to stderr as `note:` lines (`notes` with `--json`). Fonts the
+file names that aren't installed are listed as `missing font` lines (`missingFonts: [{family,
+layers}]` with `--json`); their text renders in a fallback font.
 
 Every subcommand that reads a file also takes the public REST API file JSON (the response of
 `GET /v1/files/:key` or of its nodes endpoint, written to a `.json` file): it is imported on the fly.
 Image fills come from `images/<imageRef>.png` (or `.jpg`, …) next to the JSON when present, else a
-grey placeholder. `.fig` files are read the same way (best effort, images from the file itself);
+grey placeholder. `.fig` files are read the same way (best effort, images from the file itself), and
+so are `.sketch` files saved by Sketch 48 or newer;
 `info` lists what wasn't imported as `note:` lines.
 
 ```text
@@ -45,10 +64,14 @@ page 1 "Screens": 380 nodes, 4 top-level
   …
 ```
 
-### `export <file> -o <out> [--format png|jpg|svg|webp|pdf|fig] [--scale N] [--page NAME] [--node ID|NAME] [--bleed LENGTH] [--crop-marks] [--bleed-marks] [--cmyk]`
+### `export <file> -o <out> [--format png|jpg|svg|webp|pdf|xml|fig] [--scale N] [--page NAME] [--node ID|NAME] [--bleed LENGTH] [--crop-marks] [--bleed-marks] [--cmyk] [--vd-compat bestEffort|exact|ignore]`
 
 - `<out>` is a directory: one file per top-level frame of the page (default the first page), named
   after the frame (`Home.png`, `Settings.png`…); with no frames, one file per top-level layer.
+  The name is kept as it is, except for the characters file systems refuse (`/ \ : * ? " < > |`
+  and control characters), which become `_`, and leading or trailing spaces and dots, which are
+  dropped. A name is cut at 100 characters. The app's export replaces the same characters (there a
+  `/` makes a folder). Two layers with the same name get `Name 2`, `Name 3`…
 - `<out>` has an image extension: one file with the given `--node`, or the whole page composited.
 - `--node` takes a layer id (`12` or `0:12`) or a layer name.
 - `--format fig` (or an `<out>` ending in `.fig`) writes the whole file as `.fig`, experimental:
@@ -57,9 +80,15 @@ page 1 "Screens": 380 nodes, 4 top-level
   documents and small test files, in other software; other apps may not open every file. What was
   left out (comments, Dev Mode data, some bindings and settings…) is printed as `note:` lines;
   `docs/file-format-parity.md` lists what was checked and what is unchecked.
+- `--format xml` (or an `<out>` ending in `.xml`) writes an Android Vector Drawable, e.g.
+  `figcraft-cli export app.figcraft --node Icon -o ic_icon.xml`. What the format can't draw is
+  printed as `note:` lines; `--vd-compat` picks how it's handled: `bestEffort` (default:
+  approximated), `exact` (left out) or `ignore` (no notes: overlapping layer opacity is dropped,
+  even-odd fills keep `fillType="evenOdd"`, diamond gradients are left out). See
+  `docs/file-format-parity.md`.
 - The format comes from `--format`, else `<out>`'s extension, else png. `--scale` (default 1, max 64)
   applies to raster formats.
-- SVG/PDF exports with visible descendants more than 256 levels below an exported root fail with
+- SVG/PDF/XML exports with visible descendants more than 256 levels below an exported root fail with
   an error instead of writing an incomplete file. Select an inner layer with `--node` or reduce
   nesting. An existing destination file is kept on this failure.
 - A `.pdf` `<out>` without `--node` holds the page's top-level frames, one PDF page each in reading
@@ -84,7 +113,7 @@ figcraft-cli export app.figcraft -o handoff.fig
 
 ### `convert <in> <out>`
 
-By extension. Inputs: `.figcraft`, `.json` (FigCraft or REST API file JSON), `.fig` (best effort), `.svg` (an editable frame: groups,
+By extension. Inputs: `.figcraft`, `.json` (FigCraft or REST API file JSON), `.fig` (best effort), `.sketch` (Sketch 48 or newer, best effort), `.svg` (an editable frame: groups,
 shapes, text, gradients, masks and effects; `info` lists what it left out as `note:` lines), `.png/.jpg/.webp/.gif/.tif/.bmp`
 (an image layer). Outputs: `.figcraft`, `.json` (FigCraft JSON, pretty-printed), `.svg`,
 `.png/.jpg/.webp` (the current page rendered at 1x with its background), `.pdf` (the current page's
@@ -103,7 +132,33 @@ Runs commands in a headless session (a new document, or `--in`), printing one JS
 {"command":"frame.create","ok":true,"result":{"id":2},"step":0}
 ```
 
-A failing step prints `"ok": false` with the error and exits with code 1 (nothing is saved).
+The whole script is **one undo step**, and it is **all-or-nothing**, exactly like running the same
+commands through `command.batch` (the MCP tool `batch`, the control channel, plugins). A step named
+with `"as"` can be used by later steps: `{"$ref": "name"}` in a step's params is the `id` in that
+step's result (`{"$step": n}` does the same by zero-based position), and `"field"` takes another key
+or a slash path such as `ids/0`. So a step can target a layer an earlier step of the same script
+created ([Step references](mcp.md#step-references) has the rules):
+
+```json
+[
+  {"command": "node.create", "as": "card", "params": {"type": "frame", "name": "Card", "width": 200, "height": 100}},
+  {"command": "node.create", "params": {"type": "text", "parent": {"$ref": "card"}, "text": "Hi"}},
+  {"command": "edit.duplicate", "as": "copy", "params": {"ids": [{"$ref": "card"}]}},
+  {"command": "node.set", "params": {"ids": [{"$ref": "copy", "field": "ids/0"}], "props": {"name": "Card copy"}}}
+]
+```
+
+The result lines are printed once the script is through, so none of them reports work a later step
+took back.
+
+A failing step prints one line with `"ok": false`, the error and `"rolledBack": true`, writes
+nothing (`--out` is not saved, and the session's documents go back to how the script found them),
+and exits with code 1:
+
+```text
+{"step":1,"command":"node.set","ok":false,"error":"no such node 99999","rolledBack":true}
+```
+
 `--out` saves the result by extension like `convert`.
 
 Script formats: a JSON array of `{"command": id, "params": {...}}`, an object
@@ -129,15 +184,42 @@ figcraft-cli run start.json --out dashboard.figcraft
 figcraft-cli export dashboard.figcraft -o dashboard.png
 ```
 
+### Confining a run: `--automation-read-root DIR` / `--automation-write-root DIR`
+
+`info`, `export`, `convert`, `render` and `run` take these two flags, with the same meaning they
+have on [`mcp`](#mcp---attach-port---automation-read-root-dir---automation-write-root-dir): each is
+repeatable, each folder must exist, and together they confine every file that subcommand touches.
+Reads are allowed inside a read or write root, writes only inside a write root, and everything else
+is refused — so a run given only a read root cannot write at all. Without either flag a subcommand
+reads and writes as the user who started it.
+
+```sh
+# Renders in/doc.figcraft to out/ok.png and can touch nothing else.
+figcraft-cli render in/doc.figcraft -o out/ok.png \
+  --automation-read-root in --automation-write-root out
+
+figcraft-cli render in/doc.figcraft -o ./escaped.png \
+  --automation-read-root in --automation-write-root out
+# error: automation path rejected: . is outside the folders that may be written: …/out
+```
+
+This is for driving the CLI from a script or an agent that should not reach the rest of the disk;
+the flags leave the output identical when nothing strays outside the roots.
+
 ### `commands [--json] [--filter TEXT]`
 
 Every command with its label, shortcut, undoable flag (`*`) and parameter docs; `--json` for
 machines.
 
-### `mcp [--attach PORT]`
+### `mcp [--attach PORT] [--automation-read-root DIR]… [--automation-write-root DIR]…`
 
 Serve MCP on stdio: headless by default, or attached to a running app started with
-`figcraft --control PORT`. See [mcp.md](mcp.md). The headless session can host, join and publish
+`figcraft --control PORT`. See [mcp.md](mcp.md). The automation roots (each repeatable; existing
+folders) confine the files the agent's calls read (inside a read or write root) and write (inside a
+write root); everything else is refused ([mcp.md › Confining file access](mcp.md#confining-file-access)).
+They apply to the headless session only, and that is why `--attach` refuses them: an attached server
+is confined by the app it attaches to, from the flags that app was started with. The headless
+session can host, join and publish
 live sessions (`collab.*`: without a key on a server open to the public, with `collab.serverInfo`,
 `collab.manageFile` for the owner token and `collab.report`) and use plugin directories
 (`plugin.directory.*`); the one-shot `run` can't (no network link).
diff --git a/docs/collab-protocol.md b/docs/collab-protocol.md
index 38ef96ec..2dfbbb6f 100644
--- a/docs/collab-protocol.md
+++ b/docs/collab-protocol.md
@@ -99,6 +99,15 @@ fit FigCraft's architecture:
   collide with what a connected client makes, because a client's numbers continue above every id of
   its space already in the document. Removed entries are part of the saved session state
   (`SessionState::removed`).
+- **Branches** of a file in a session stay with the person who made them; nothing about them goes
+  over the wire until a merge, which is an ordinary batch from that person (no message or format
+  change). So that the server takes the layers a branch made, a branch made in the session makes
+  its ids in its author's own client space, 2^24 above every id made there on the main file and the
+  author's other branches. Layers of the branch's base that main deleted during the session come
+  back with their ids (the server accepts re-creating deleted ids). Merging a branch whose new
+  layers, styles, variables or comments lie in another id space (one made offline or in an earlier
+  session) is refused by the app before anything is sent, since the server would refuse it (see
+  `crates/engine/src/sharing/branches.rs`).
 - Objects inside an entry are not separate objects: modes are part of their collection, a
   variable's values per mode part of the variable and replies part of their comment thread. Two
   people adding a mode to the same collection, editing different modes of one variable, or replying
@@ -142,7 +151,11 @@ As built:
   colour profile, image presets, annotation categories and library data (whole values); styles,
   comment threads, variable collections and variables (one entry per id plus the order of ids;
   the whole list when ids aren't unique); dev-mode snapshots (per layer); images (per content
-  hash, the encoded bytes as base64). The page order is the pages' positions.
+  hash, the encoded bytes as base64); a board's timer and vote (whole values, `DocProp::Timer` and
+  `DocProp::Vote`) and the vote's ballots (`Entry::Ballot(voter)`, one per voter, so people voting
+  at once write different entries). The timer travels as its end time (or, paused, the time left),
+  never as ticks: each client counts down on its own clock. The page order is the pages'
+  positions.
 - **Next**: this file's published library (it embeds a snapshot document; it moves with an asset
   channel, together with images, which then stop travelling inside batches); the version history
   (kept beside the document, not in it) on the standalone server; finer entries for modes,
diff --git a/docs/collaboration-parity.md b/docs/collaboration-parity.md
index 95084d74..c9af478f 100644
--- a/docs/collaboration-parity.md
+++ b/docs/collaboration-parity.md
@@ -1,6 +1,6 @@
 # Collaboration parity
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-14 · **Change:** minor (removing someone from a live session; live-session revert guard; live sessions per document; a public figcraft-server: open hosting, owner tokens, per-address limits, idle expiry, moderation, install.sh; cursor chat and spotlight in live sessions; branch version history and finer list merges; comments and version history behaviour suite and fixes; hosting the server: `wss://` in the desktop app, server releases, deployment guide; team libraries on the server and swap library; branches: create, update from main, review and merge; wording: the standalone server with share links to edit or view; numbers unchanged) · **Target:** Figma Design (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-24 · **Change:** minor (branches in live sessions and branch history entries; server message limits follow `max_file_mb`; a damaged log generation field keeps flushed edits; the web build joins from a `#join=` link; removing someone from a live session; live-session revert guard; live sessions per document; a public figcraft-server: open hosting, owner tokens, per-address limits, idle expiry, moderation, install.sh; cursor chat and spotlight in live sessions; branch version history and finer list merges; comments and version history behaviour suite and fixes; hosting the server: `wss://` in the desktop app, server releases, deployment guide; team libraries on the server and swap library; branches: create, update from main, review and merge; wording: the standalone server with share links to edit or view; numbers unchanged) · **Target:** Figma Design (desktop app 126.10.7)
 
 Figma is multiplayer first; FigCraft is local first. **Ready ~13% (estimated):** comments, version
 history and branches (review and merge) work inside one file; the real-time collaboration core landed in #103 (sync model,
@@ -12,13 +12,13 @@ cursors, selections, text carets, cursor chat and spotlights shown live ([`colla
 
 | Feature | Figma | FigCraft | Hours |
 |---|---|---|---|
-| Real-time co-editing | yes | **core built, no networking** (#103): client-scoped ids, per-property change sets with fractional positions, server ordering and validation, optimistic clients, binary messages; randomized multi-client convergence tests over real commands. Live sessions over the network landed (`crates/collab-net`): the WebSocket transport (keep-alive, size and rate limits, reconnect with backoff), hosting from the app (this machine or the local network) with invite links, live cursors with name tags, selections, avatars and follow, `collab.*` commands. Document sync between apps works over them (the host's server orders every batch; guests open the host's file as a new tab). Sessions are per document: each open file has its own or none, several run at once (host one, join another, publish a third) and keep syncing behind the tab in front, and closing a file ends its session only. Revert to saved is refused until the document leaves its live session; its access checks and sync association stay intact. Undo is per person (only your own steps, others' later writes left alone), refused edits roll back with a toast, and a reconnect resumes as the same client with what it missed (or a snapshot) and sends what was made offline. The browser build joins (same messages through the browser's WebSocket API); `figcraft://` invite links open the desktop app and join. Styles, variables, collections, modes and comments made in a session take ids from their creator's space (the server checks it), so concurrent creations all survive; modes, per-mode values and replies inside one entry still resolve last-writer-wins. A standalone `figcraft-server` keeps many files, persists them (a snapshot plus a log, compacted), loses nothing confirmed across a restart (apps resume as the same participants) and takes files published from the app (File ▸ Publish to server…). The desktop app and the CLI open `wss://` links too (TLS through a reverse proxy), and releases ship the server for Linux with a deployment guide (systemd, Caddy, nginx, Docker) and `install.sh`. A server can be open to the public: anyone publishes without the key, within limits per address, and files nobody opens expire. Left: server archives beyond Linux | 25–55 |
+| Real-time co-editing | yes | **core built, no networking** (#103): client-scoped ids, per-property change sets with fractional positions, server ordering and validation, optimistic clients, binary messages; randomized multi-client convergence tests over real commands. Live sessions over the network landed (`crates/collab-net`): the WebSocket transport (keep-alive, size and rate limits, reconnect with backoff), hosting from the app (this machine or the local network) with invite links, live cursors with name tags, selections, avatars and follow, `collab.*` commands. Document sync between apps works over them (the host's server orders every batch; guests open the host's file as a new tab). Sessions are per document: each open file has its own or none, several run at once (host one, join another, publish a third) and keep syncing behind the tab in front, and closing a file ends its session only. Revert to saved is refused until the document leaves its live session; its access checks and sync association stay intact. Undo is per person (only your own steps, others' later writes left alone), refused edits roll back with a toast, and a reconnect resumes as the same client with what it missed (or a snapshot) and sends what was made offline. The browser build joins (same messages through the browser's WebSocket API); `figcraft://` invite links open the desktop app and join. Styles, variables, collections, modes and comments made in a session take ids from their creator's space (the server checks it), so concurrent creations all survive; modes, per-mode values and replies inside one entry still resolve last-writer-wins. A standalone `figcraft-server` keeps many files, persists them (a snapshot plus a log, compacted), loses nothing confirmed across a restart (apps resume as the same participants) and takes files published from the app (File ▸ Publish to server…). The desktop app and the CLI open `wss://` links too (TLS through a reverse proxy), and releases ship the server for Linux with a deployment guide (systemd, Caddy, nginx, Docker) and `install.sh`. A server can be open to the public: anyone publishes without the key, within limits per address, and files nobody opens expire. Message limits follow the server's `max_file_mb`, so files above 64 MiB publish and open (the client takes at most 1 GiB from a server, and the server warns when large limits meet open publishing, #705); a damaged generation field in a file's log no longer drops the edits flushed to it (#687). Left: server archives beyond Linux | 25–55 |
 | Live cursors, selections, viewports; follow / observation mode; spotlight | yes | **done, in live sessions**: named cursors, selection outlines, avatars, follow (click an avatar), others' text carets and selected characters with their names, a note when two people type in one layer; spotlight (your avatar's menu, `collab.spotlight`): everyone follows your view and page, people who join later too, anyone who moves their view stops following and a banner offers to follow again, a newer spotlight takes over. Left: polish (no accounts, so anyone in the session can spotlight) | 2–4 |
 | Cursor chat, audio, high-fives | yes | **partial, in live sessions**: cursor chat (`/` opens a bubble at your pointer; everyone sees it as you type, it fades a few seconds after the last change, Enter sends and Escape takes it back, 100 characters; `collab.cursorChat` for agents); sent as ephemeral presence the host checks and rate-limits, never stored. No audio, high-fives or emote reactions | 2–5 |
-| Share links, permissions (view / edit), teams and projects | yes | **partial**: sharing with a join code from the Share popover (online: the file goes to the server in Preferences and the server names its edit and view links with short codes; local network: the app hosts and the code carries its address; one field joins with a code or a link, in the popover and on the home screen); `figcraft-server` share links per file with edit or view access (a viewer sees changes and presence, a "View only" badge and only the moving tools; the server refuses its edits), revocable at once, tokens stored as hashes; managed from the app's Share popover (first links), the server's command line or a managing connection. On a server open to the public, whoever published a file manages it with its owner token (links, name, removal: `collab.manageFile`), which the app remembers: Home ▸ Online lists your online files (open again as owner, start and stop sharing, copy the code, rename, remove, forget), with one request per server for what became of them; anyone in a file can report it, and the operator blocks addresses. The person hosting a session, or a file's owner, removes someone from it (right-click their avatar, `collab.removePerson`): they are disconnected and their address can't join that file again while it runs. The list is per computer: no accounts, teams or projects | 8–17 |
+| Share links, permissions (view / edit), teams and projects | yes | **partial**: sharing with a join code from the Share popover (online: the file goes to the server in Preferences and the server names its edit and view links with short codes; local network: the app hosts and the code carries its address; one field joins with a code or a link, in the popover and on the home screen; the browser build also joins from a link in its URL's fragment, `#join=…`, which never reaches the web host's logs, capped at 6 KiB and checked like a `figcraft://` link (#712; unit-tested, not run in a browser)); `figcraft-server` share links per file with edit or view access (a viewer sees changes and presence, a "View only" badge and only the moving tools; the server refuses its edits), revocable at once, tokens stored as hashes; managed from the app's Share popover (first links), the server's command line or a managing connection. On a server open to the public, whoever published a file manages it with its owner token (links, name, removal: `collab.manageFile`), which the app remembers: Home ▸ Online lists your online files (open again as owner, start and stop sharing, copy the code, rename, remove, forget), with one request per server for what became of them; anyone in a file can report it, and the operator blocks addresses. The person hosting a session, or a file's owner, removes someone from it (right-click their avatar, `collab.removePerson`): they are disconnected and their address can't join that file again while it runs. The list is per computer: no accounts, teams or projects | 8–17 |
 | Comments: pins on frames and layers, threads, reactions, @mentions, resolve, unread, search and filters, links, in the presenter | yes (shared) | **done, local**: stored in the file, your name from Preferences; a behaviour suite from the documentation (pinning and following layers, threads, own edits and deletes, mentions, reactions, C and Shift+C, stepping, filters, saving, copy and paste); restoring a version keeps them. In a live session threads sync and anyone in it can reply, react and resolve (no accounts: a name is who you are) | (shared once multiplayer lands) |
 | Version history: named versions, autosave checkpoints, view before restore, restore, duplicate | yes (cloud) | **done**, saved in the `.figcraft` file: restoring keeps the replaced design as an autosave first, a titled autosave becomes a named version, merging a branch records the file before and after. Versions are per person in a live session (a shared history needs accounts); no comparing two versions (Dev Mode compares a ready-for-dev layer with its state when marked) | — |
-| Branching and merging | yes (paid plans) | **done, local**: branches saved in the `.figcraft` file, each opened in its own tab; Review and merge shows both sides' changes since the branch was made and the conflicts (the same property on both sides, or a layer deleted on one side and edited on the other), each resolved for the branch or main; merge as one undo step (the branch is archived, the main file's history gets a version for the merge), update from main, archive. Each branch keeps its own version history (saved, viewed and restored on the branch tab, kept when it is merged or archived); fills, strokes and effects merge item by item. Left: branches in live sessions; other lists (text runs, export settings) conflict as a whole | 1–2 |
+| Branching and merging | yes (paid plans) | **done, also in live sessions**: branches saved in the `.figcraft` file, each opened in its own tab; Review and merge shows both sides' changes since the branch was made and the conflicts (the same property on both sides, or a layer deleted on one side and edited on the other), each resolved for the branch or main; merge as one undo step (the branch is archived, the main file's history gets a version for the merge), update from main, archive. Each branch keeps its own version history (saved, viewed and restored on the branch tab, kept when it is merged or archived; entries for its creation and updates from main); fills, strokes, effects, layout grids, export settings, guides, interactions, annotations and Dev Mode resources merge item by item. In a live session a branch stays with its author (its ids in their own client space, far above the main file's) and merging it is one edit everyone gets; peers' edits merge against the branch's own base and conflicts resolve as offline; a view link refuses merging. Left: others in the session can't see or open your branches (the server would have to keep them); text runs conflict as a whole; a branch made offline that adds layers merges only outside a session | 1–2 |
 | Team / organization libraries | yes | **partial**: a file's library is published to `figcraft-server` under the file and enabled in other files by a share link (per-asset versions, background update checks, overrides kept), usage counts per component and file, swapping a library by names ([components-parity](components-parity.md), [server.md](server.md#team-libraries)). No team-wide library list, accounts or analytics over time | 4–8 |
 | Notifications, activity | yes | no | with sharing |
 
@@ -26,6 +26,8 @@ cursors, selections, text carets, cursor chat and spotlights shown live ([`colla
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-24 | minor | Branches in live sessions (gap 17): creating, editing, reviewing, updating from main and merging a branch work while its file is in a session. The branch stays with its author and makes its ids in their own client space 2^24 above the main file's, so the server takes the layers it adds; merging is one synced edit and one step of the author's undo history; others' edits on main merge against the branch's own base and conflicts resolve as offline; a view link still refuses merging; a branch made outside the session that adds layers, styles, variables or comments is refused with a reason. A branch's history gets entries for its creation and updates from main. No wire format change. Row wording also brought up to date with #798 (export settings and guides merge item by item). Numbers unchanged |
+| 2026-10-17 | minor | From community batch #735: server message limits follow `max_file_mb`, so files above 64 MiB publish and open, the client takes at most 1 GiB and the server warns about large limits with open publishing (#705); a damaged generation field no longer drops a log's flushed edits (#687); the web build joins a session from a `#join=` link in its URL (#712, unit-tested and built for wasm, not run in a browser). Percentages and hours unchanged |
 | 2026-10-14 | minor | Removing someone from a live session (M9, from the owner's use: whoever joined with the invite couldn't be put out short of ending the session for everyone): right-click a person's avatar ▸ "Remove <name> from session", or `collab.removePerson {client}`, when you host the session or own the file on a server (owner token). The hub closes their connection as the session's end for them (they keep their copy and don't reconnect) and bars their address from that file while the session or server runs, so the code or link they hold no longer gets them in; everyone else stays. Protocol addition within version 2 (`Admin removePeer`; older servers say they can't). Addresses are the only identity without accounts: people behind one address are barred together. Percentages and hours unchanged |
 | 2026-10-13 | minor | Live-session revert guard (M9, #198): `file.revert` is refused while its document belongs to a live session, including publishing, reconnecting and hosting before the welcome. The document, previews, branch tabs and session stay intact; leave the session before reverting a local save. Offline revert is unchanged. Scripted access and sync regressions in `live_access_tests`. Numbers unchanged. |
 | 2026-10-12 | minor | Your online files (M9): a file put on a server without its key stays its owner's after its tab closes or the app quits. The app records each one with the preferences (server, id, name, owner token, the owner's links, the codes others join with; at most 200; the token never in a command result, `ui.inspect`, a log or debug output) and Home ▸ **Online** lists them: open one as its owner (a new tab, or its tab comes to the front), Start / Stop sharing, Copy code / Copy link, Rename on the server, Remove from server (confirmed), Forget (the file stays on the server). Nothing is asked of a server until the section opens; then one request per server (`Admin owned`, a compatible addition within protocol version 2) says which files are still there, and a server that is offline or older leaves the list as recorded. Tabs of files in a live session carry a mark (shared, or open only to you), toasts about a file that isn't in front name it, and after a crash a recorded file reopens from its server as its owner, its recovery copy kept until its unsent changes are back on the server (or it is opened beside the file). `collab.files`, `collab.openFile`, `collab.forgetFile`; `collab.manageFile` takes its server and token from the record and gains `share` / `unshare`. Files are known per computer, not per person (no accounts): percentages and hours unchanged |
diff --git a/docs/components-parity.md b/docs/components-parity.md
index 185aef79..df48b9c4 100644
--- a/docs/components-parity.md
+++ b/docs/components-parity.md
@@ -1,10 +1,10 @@
 # Components, variants, styles and variables parity
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-14 · **Change:** minor (variables export in the browser as a download; core editor leftovers: component playground, variables inside styles; layers and assets panels behaviour suite and fixes; extended collections tail; styles and variables behaviour suite and fixes; components behaviour suite and fixes; team libraries on the server, library usage and swapping a library; extended collections, variables import/export, gradient stops and variant properties bound to variables) · **Target:** Figma Design (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-26 · **Change:** minor (an instance-swap property's default menu scrolls (#1338); variables on a text style's fields from the style editor; instance-swap properties in the component playground; duplicating or Alt-dragging a main component makes an instance of it (#892); a bound colour variable's alpha applies once (#802); variables import reads `variables` outside `meta` and warns when it imports none (#790); variant properties reorder by drag; library files saved right after a read are read again; Hide when publishing note corrected; size and resizing overrides of layers inside instances (#731); variables export in the browser as a download; core editor leftovers: component playground, variables inside styles; layers and assets panels behaviour suite and fixes; extended collections tail; styles and variables behaviour suite and fixes; components behaviour suite and fixes; team libraries on the server, library usage and swapping a library; extended collections, variables import/export, gradient stops and variant properties bound to variables) · **Target:** Figma Design (desktop app 126.10.7)
 
 Design systems are why teams adopt Figma. **Components: breadth ~96%, ready ~72%. Styles and
 variables: breadth ~95%, ready ~76% (estimated).** QA'd with a synthetic design system of ~300
-components used 2,000 times (`crates/engine/src/synthetic_ds.rs`, `components_scale_tests.rs`);
+components used 2,000 times (`crates/engine/src/content/synthetic_ds.rs`, `components_scale_tests.rs`);
 not with real libraries. Remaining: 4–10 h here, plus team libraries' tail (4–8 h, partly after
 accounts).
 
@@ -14,21 +14,22 @@ accounts).
 |---|---|---|
 | Create component, instances, detach, reset, go to main, restore main, push changes | done | push from a nested layer goes to the outer main |
 | Per-layer overrides with reset; kept across main edits, nested swaps, copy/paste | done | main edits match a full rebuild exactly at 2,000 instances |
-| What an instance overrides: fills, strokes, effects, visibility, layer names, text content and every text property (resizing included), auto layout padding, gap and alignment, layout grids, export settings, prototype interactions, nested swaps and property values | done | each kept when the main changes that property, reset per group; opacity and corner radius too (documentation silent) |
-| What it doesn't: position, rotation, size, constraints and resizing of layers inside it, its auto layout direction and other settings, its structure | done | refused with a message, the fields greyed out; the instance itself resizes and its layers follow the main's constraints |
-| Component sets / variants, add variant, switch | done | |
+| What an instance overrides: fills, strokes, effects, visibility, layer names, text content and every text property (resizing included), auto layout padding, gap and alignment, layout grids, export settings, prototype interactions, nested swaps and property values; the size and resizing (hug, fill, fixed, min and max) of layers inside it | done | each kept when the main changes that property, reset per group; opacity and corner radius too (documentation silent); size and resizing are kept through relayout, undo, save, `.fig` and REST import and detach, and stay with the instance on push |
+| What it doesn't: position, rotation, constraints and absolute or grid placement of layers inside it, its auto layout direction and other settings, its structure | done | refused with a message, the fields greyed out; the instance itself resizes and its layers follow the main's constraints |
+| Component sets / variants, add variant, switch | done | Combine as variants is in the Object menu, and the canvas and layers context menu and the Design panel offer it when two or more main components are selected; Add variant on a main component not in a set yet makes it a set of itself and the new variant, one undo step (#903); components that are variants already aren't combined again (it used to put a set inside a set) |
+| A main's copy within its file is an instance of it: Duplicate, Alt-drag, Copy then Paste | done | a variant duplicated in its set stays a new variant and a whole set copies as a new set; only the copied roots become instances (a main inside a copied frame is copied as a main); Cut then Paste and pastes into other files keep the component (#892) |
 | Switching variants keeps overrides where names match and both variants had the same value; text layers keep theirs | done | |
 | Default variant: the top-left one (new instances, Assets thumbnail, generated code) | done | |
-| Variant property order (names rewritten), duplicate combinations reported | done | reordering through `component.editProperty {index}`; no drag in the panel yet |
-| Properties: boolean, text, instance swap (preferred values), variant | done | |
+| Variant property order (names rewritten), duplicate combinations reported | done | drag a property in the Properties section to reorder it, one undo step (#679), or `component.editProperty {index}` |
+| Properties: boolean, text, instance swap (preferred values), variant | done | every component menu scrolls past 320 pt, the default of an instance-swap property's too (#1338); no search in them yet |
 | Slots (preferred components, fill menu, kept across updates) | done | Figma 2025 feature |
 | Exposed nested instances | done | hidden ones hide their properties |
 | Descriptions | done | |
 | Instance swap: panel, Alt-drop from Assets | done | the panel keeps overrides on same-named layers, an Alt-drop from Assets only text layers' |
 | Assets panel: folders by page, frame and slash names (fold away), thumbnails, search, drag into frames and auto layout slots | done | virtualized; `component.list` gives each one's `folder` |
-| Hidden from publishing: a leading `.` or `_` in the name | done | the name decides both ways (adding the prefix takes a published component out, removing it brings it back); no Hide when publishing menu item yet |
+| Hidden from publishing: a leading `.` or `_` in the name | done | the name decides both ways (adding the prefix takes a published component out, removing it brings it back); Hide when publishing in the Assets panel's context menu and Libraries ▸ Hide when publishing (see [ui-parity](ui-parity.md)) |
 | Instances pasted into other files follow their mains | done | missing main restorable |
-| Component playground (try properties without placing) | partial | variant, boolean and text properties in the Inspect tab and `component.playground`; instance swaps and slots have no control there yet (0.5–1 h) |
+| Component playground (try properties without placing) | partial | variant, boolean, text and instance-swap properties in the Inspect tab (the swap menu lists the preferred components first, then every component in the file, as in the Design panel) and `component.playground`; slots have no control there yet |
 | Real-world libraries QA | **not checked** | [gaps](gaps.md) #3 |
 
 The behaviour of instances, overrides, variants and swaps is checked against the public
@@ -48,7 +49,7 @@ updates with overrides kept: `library_tests.rs`, `components_scale_tests.rs`.
 |---|---|---|
 | Publish a file's components, sets, styles and variables (per-asset versions) | done | as local library files |
 | Enable a library in a file; read-only linked copies | done | |
-| Library updates available; overrides kept | done | |
+| Library updates available; overrides kept | done | a library file saved again within two seconds of being read, at the same length, is read again (its time stamp can't prove it unchanged; #652) |
 | Team libraries: publish to a `figcraft-server` under the file, enable by a share link (a view link reads it), background update checks | done | [server.md](server.md#team-libraries); no team-wide library list or accounts ([gaps](gaps.md) #10) |
 | Library analytics | partial | instances per component and the files using them, as apps report them; nothing over time, no detach counts |
 | Swap library (instances, styles and variables to another library's of the same names, overrides kept) | done | what has no match stays and is listed; one undo step |
@@ -60,22 +61,30 @@ updates with overrides kept: `library_tests.rs`, `components_scale_tests.rs`.
 | Paint, text, effect, grid styles; style picker; text styles on character ranges | done | behaviour suite: `styles_behaviour_tests.rs` |
 | Editing a style updates its layers; detach and delete keep values; editing a styled property unlinks that style | done | an edited fill/stroke/effect/grid list or text chars unlink; applying a style replaces variables bound to what it sets; text styles on text layers only |
 | Organising styles: folders by `/` names, order, duplicate, rename folder, Local styles list | done | `style.move` (into a folder renames), `style.duplicate` (right below), `style.renameFolder`; the page's Local styles list by type and folder (drag to reorder, right-click) |
-| Variables inside styles (paint, effect, grid and text styles; each user resolves them in its own modes) | done | `style.bind`, `style_vars_tests`; the editor binds paint colours, shadow colours, blur radii and grid sizes, the rest through the command |
+| Variables inside styles (paint, effect, grid and text styles; each user resolves them in its own modes) | done | `style.bind`, `style_vars_tests`; the editor binds paint colours, shadow colours, blur radii, grid sizes and a text style's font, font style, size, line height and letter spacing, the rest through the command |
 | Variables: colour, number, string, boolean; collections, modes, aliases, scopes, groups | done | behaviour suite: `variables_behaviour_tests.rs`; aliases same type, no loops (also on create); scopes filter pickers only |
 | Modes: add, duplicate, rename, delete, set as default / reorder | done | layers on Auto follow a new default; explicit modes stay |
 | Deleting a bound variable or its collection | done | layers keep their last value and are unbound; aliases to it take its values |
-| Code syntax per platform (Web, iOS, Android, Flutter) | done | generated CSS uses the Web name; in the variables JSON; SwiftUI/Compose/Flutter code doesn't name variables yet |
-| Bindings: fills, strokes, effects, opacity, padding, gaps, sizes, radius, font size/weight, line height, letter spacing, paragraph spacing/indent, text, visibility, layout grids, instance properties | done | type-checked per field; number variables fill text content |
+| Code syntax per platform (Web, iOS, Android, Flutter) | done | generated CSS uses the Web name; in the variables JSON; SwiftUI/Compose/ArkUI/Flutter code doesn't name variables yet |
+| Bindings: fills, strokes, effects, opacity, padding, gaps, sizes, radius, font family/style, font size/weight, line height, letter spacing, paragraph spacing/indent, text, visibility, layout grids, instance properties | done | type-checked per field; number variables fill text content; the Design panel's font family and font style menus start with Apply variable (string variables), and a bound one shows its variable in place of the menu; a colour variable bound to a solid paint brings its whole colour, alpha included, once (the paint's opacity restarts at 100% on binding, an opacity set while bound multiplies on top; unbinding moves the alpha back into the opacity) |
 | Explicit modes per frame, library collections' modes | done | |
 | Gradient stops and variant properties bound to variables | done | a stop's binding follows it when earlier stops are removed |
 | Extended collections | done | library collections, including a library's own extended collections (chains through libraries); overrides per mode with reset; follow library updates, variables new to the library collection being an update of their own; modes inherited. Checked with synthetic libraries only ([gaps](gaps.md) #14) |
-| Variables import/export (JSON) | done | the REST local variables shape (round-trips; merges by collection, mode and variable name); CSS custom properties export; in the browser the export arrives as a download (import there still needs a file picker) |
+| Variables import/export (JSON) | done | the REST local variables shape (round-trips; merges by collection, mode and variable name; `variableCollections` and `variables` read under `meta` or at the top level, a warning when no variables are found or fewer than the collections list); CSS custom properties and Dart constants (Flutter) export; in the browser the export arrives as a download (import there still needs a file picker) |
 | Expressions in prototype set-variable actions | done | see [prototyping-parity](prototyping-parity.md) |
 
 ## Revision history
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-26 | minor | An instance-swap property's default menu scrolls (#1338): on the main component's Properties row the menu listed every component in the file at full height, so in a file with many (an icon library) the bottom ones ran off the screen and couldn't be picked. It now scrolls past 320 pt like the instance's swap menu, is at least 200 pt wide, ticks the current default and is named for assistive technology (`component_swap_default_tests`). Left: searching these menus. Numbers unchanged. |
+| 2026-10-24 | minor | Variables on a text style's fields from the style editor: the font and font style menus start with Apply variable (string variables), and the size, line height and letter spacing fields show a variable button on hover (number variables). A bound field shows its variable in place of the value; a click on it picks another variable and its detach button unbinds it (`style_picker_tests`). Left: the other effect and grid fields (commands only), library variables in the picker. Numbers unchanged. |
+| 2026-10-23 | minor | Instance-swap properties in the component playground: the Inspect tab's Playground shows a dropdown for each, with the same menu as the Design panel's (the property's preferred components first, then every component in the file). The component picked changes the preview and the code only, never the file. Left: slots in the playground. Numbers unchanged. |
+| 2026-10-20 | minor | A main component's copy within its file is an instance of it (#892): Duplicate (`edit.duplicate`) and Alt-drag on the canvas made a second main; they now place an instance where the copy went (same offset, the instance's default name, selected), as Copy then Paste already did. A variant duplicated in its set stays a new variant. |
+| 2026-10-18 | minor | A bound colour variable's alpha applies once (#802): a `#RRGGBBAA` paint keeps its alpha in the paint opacity, and binding a variable with alpha left that opacity in place, so a 50% fill bound to a 50% variable drew at 25%. Binding (`variable.bind`, `node.set` `boundVariables`, `style.bind`) now restarts the paint's opacity at 100% and unbinding (also deleting the variable) moves the colour's alpha back into the opacity; `.fig` and REST imports take the variable's alpha back out of a bound paint's opacity, so `.fig` round trips no longer square it. Colour-picker edits of a colour variable or a plugin colour field, generated CSS strokes and the document colours list counted the paint opacity twice and now count it once (`bound_alpha_tests`). Numbers unchanged |
+| 2026-10-18 | minor | Variables import (#790): a `variables` map outside `meta` (or `meta.variables` next to top-level collections) is read, and an import that finds no variables, or fewer than the collections' `variableIds` list, says so in `warnings` instead of succeeding silently |
+| 2026-10-17 | minor | Variant properties reorder by dragging them in the Properties section, one undo step (#679; was "no drag in the panel yet"); a library file saved again right after it was read is read again, so a quick republish isn't missed (#652); the Hidden from publishing row no longer says the Hide when publishing item is missing (it landed 2026-10-12). Numbers unchanged |
+| 2026-10-17 | minor | Size and resizing overrides of layers inside instances (#731): a layer in an instance can hug, fill or keep a size of its own (group `resizing`: hug/fill/fixed with min and max; `size`), from the Layout panel, the canvas handles and `node.set`; they were refused, and imported ones were dropped at the first relayout. Kept through main edits of other properties, rebuilds, undo, save, `.fig` and REST import (sizes a `.fig` instance gives its layers and the REST `overrides` fields), `.fig` export and detach; reset per group and with Reset all changes (`instance_resizing_tests`). The row that listed them as not overridable was wrong. Numbers unchanged. |
 | 2026-10-14 | minor | Variables export in the browser: Export… ▸ Variables JSON / CSS custom properties did nothing in the web build, which has no save dialogs; it now hands the file over as a download (`Services::downloads` / `download`, `variables_export_ui_tests`). Import in the browser still needs a file picker, as do the other exports there. Numbers unchanged. |
 | 2026-10-13 | minor | Component playground (M3): with an instance, a component or a component set selected, the Inspect tab shows a Playground: a preview of the component and a control for each variant, boolean and text property. What is tried there changes the preview and the code in the Code section, never the file (no undo step, the canvas instance stays as it is); Reset goes back to the component's or the instance's own values. `component.playground {id?, properties?, language?, path?}` gives the same to scripts: the properties with their values, the code, and a PNG on request (`playground_tests`). Left: instance-swap and slot properties in the playground (the command takes an instance swap; the panel has no control for it), a code connect template's snippet with the tried values. Numbers unchanged. |
 | 2026-10-13 | minor | Variables inside styles (M3): a shared style can bind variables to fields of its value (`style.bind {style, field, variable?}`: a paint style's colours and gradient stops, an effect style's colour, radius, spread and offsets, a grid style's size, count, gutter and offset, a text style's font size, line height, letter spacing, family and style). Every layer using the style shows those fields resolved in its own modes and stays linked when a variable or a mode changes; the style keeps them resolved in the default modes. A style made from a layer keeps that layer's bindings; a new value drops bindings to what is gone. The style editor binds from its property rows (paint colour, shadow colour, blur radius, grid size) and detaches from the variable's chip; the style picker marks styles that use variables. `.fig` export and import carry the bindings on the style, REST layers hand theirs to the style they use. Left: binding text style fields and the other effect and grid fields from the editor (commands only), library variables in the picker, a style's library copy. Numbers unchanged. |
diff --git a/docs/control-protocol.md b/docs/control-protocol.md
index 397aed5b..448a9979 100644
--- a/docs/control-protocol.md
+++ b/docs/control-protocol.md
@@ -37,11 +37,21 @@ requests still queued after the UI timeout are discarded, including requests def
 window. A command already running is not interrupted.
 
 A minimised or covered window (the main one or another, see Windows below) draws no frames, but
-still answers `engine.execute`, `engine.commands`, `document.inspect`, `node.get`, `window.list`
-and `ui.render`, acting on the file that window shows, so an attached agent can edit, inspect and
-save while the app is out of sight. Screenshots, input (`ui.input`,
-`ui.pointer`, `ui.key`, `ui.type`) and the interface's own state wait for the window to show, and
-time out after 60 s if it doesn't.
+still answers every method that acts on the app's state (`engine.execute`, `document.inspect`,
+`node.get`, `ui.inspect`, `ui.pointer`, `ui.key`, `ui.type`, `ui.set`, `ui.render`, `window.list`,
+…), in the file that window shows, so an attached agent can edit, inspect and save while the app is
+out of sight. The app is not drawn meanwhile and only wakes for requests, at most ten times a
+second while minimised, so a request there takes up to about 0.1 s. A request that needs a drawn
+frame (`ui.screenshot`, `ui.input`) is kept queued while the window is hidden and asks it to paint
+(`RequestPaintWhileHidden`; native eframe honours that). A screenshot whose window reports no
+visibility at all is parked the same way with its deadline, so it cannot wait forever in the
+queue. A screenshot settles on three completed, presented UI frames (a discarded sizing pass does
+not count), then is issued, and expires once at its 60 s deadline if no paint arrives. `window.new`
+remains an error at once (`window 0 is minimised or hidden: …`) instead of waiting for the window
+to show; `ui.render` draws the document without it. Under Wayland the app can't tell that its
+window is minimised: where the compositor then stops drawing it, a request waits for the window
+and gets the 60 s timeout error. The browser's shared eframe runner does not implement
+`RequestPaintWhileHidden` yet, so hidden-tab screenshots and injected input are unqualified there.
 
 Coordinates are page units, y down. `x`/`y` in `node.set`/`node.create` are relative to the parent
 frame (groups have no coordinate space of their own).
@@ -53,6 +63,32 @@ window, with its tabs, panels and canvas: `engine.execute` acts on the file it s
 last in front (the one the user clicked last, or the last `window.new` / `window.focus`). An
 unknown id is an error.
 
+## Confining file access
+
+```sh
+figcraft --control 7979 --automation-read-root /work/project --automation-write-root /work/project/out
+```
+
+`--automation-read-root <dir>` and `--automation-write-root <dir>` (each repeatable, `--flag=<dir>`
+works too; the same flags as `figcraft-cli mcp`) confine the files the app reads and writes for
+whoever asks: every control request (`engine.execute`, `ui.render`, `ui.screenshot`, `window.new`,
+`ui.key`, `ui.menu.invoke`…) and every frame of every window, so input injected with `ui.input`
+and what a person does in the window are held to the same folders. Files are read only inside a
+read or write root and written only inside a write root; anything else is an ordinary error reply
+(`automation path rejected: …`), and recent files outside the roots aren't listed. Paths are
+resolved as `docs/mcp.md` › Confining file access describes. A root that isn't an existing folder
+stops the app before its window opens, and so does any option the app doesn't know (a mistyped
+flag such as `--automation-write-roots` exits with `unknown option`, never starts unconfined).
+Without the flags nothing changes. The flags arrived in FigCraft 0.7.0: 0.6.0 and earlier ignore
+them and confine nothing.
+
+Not confined: opening the files given on the command line when the app starts and the documents
+the system hands over (Finder, Open With; saving them later is confined like any write), and the
+app's own folders (preferences, recovery copies, plugins installed from a plugin directory). Run `figcraft-cli mcp --attach PORT` without the flags against
+such an app (it refuses them: the app does the confining). `ui.screenshot` and `ui.render` without a
+`path` return the PNG as data, which is how the attached MCP server takes them, so it writes no
+temporary files.
+
 ## Methods
 
 ### `engine.execute {command, params?}`
@@ -70,13 +106,17 @@ JSON or the gradient shorthand `{"type":"linearGradient","stops":["#hex","#hex"]
 {"id":3,"method":"engine.execute","params":{"command":"command.batch","params":{"label":"Tidy","commands":[{"command":"align.left","params":{"ids":[2,3]}},{"command":"distribute.vertical","params":{"ids":[2,3]}}]}}}
 ```
 
-Inside `command.batch`, `{"$step": n}` in a step's params stands for the `id` in step `n`'s result
-(zero-based; `{"$step": n, "field": "…"}` for another field; any object with a `$step` key is read
-as one, and a nested `command.batch` step keeps its own references to its own steps), so one batch
-can create a frame and fill it:
+Inside `command.batch`, a step can name itself with `"as"` and later steps use its result:
+`{"$ref": "name"}` in a step's params stands for the `id` in that step's result, and `{"$step": n}`
+for the `id` in step `n`'s result (zero-based). Either takes `"field"` for another key or a slash
+path into the result, such as `ids/0` for the first copy `edit.duplicate` returned. Any object with a
+`$ref` or `$step` key is read as a reference, names are unique within a batch, and a nested
+`command.batch` step keeps its own references to its own steps (see [MCP: Step
+references](mcp.md#step-references) for the rules and errors). So one batch can create a frame, fill
+it and duplicate it:
 
 ```json
-{"id":4,"method":"engine.execute","params":{"command":"command.batch","params":{"commands":[{"command":"node.create","params":{"type":"frame","width":200,"height":100}},{"command":"node.create","params":{"type":"rectangle","parent":{"$step":0},"width":20,"height":20}}]}}}
+{"id":4,"method":"engine.execute","params":{"command":"command.batch","params":{"commands":[{"command":"node.create","as":"card","params":{"type":"frame","width":200,"height":100}},{"command":"node.create","params":{"type":"rectangle","parent":{"$ref":"card"},"width":20,"height":20}},{"command":"edit.duplicate","as":"copy","params":{"ids":[{"$ref":"card"}]}},{"command":"node.set","params":{"ids":[{"$ref":"copy","field":"ids/0"}],"props":{"name":"Card copy"}}}]}}}
 ```
 
 ### `engine.commands {}`
@@ -101,7 +141,10 @@ component/instance links, overrides, `slot` (a slot layer's property name), boun
 `devStatus` (handoff status), `devChanged` (changed since it was marked ready for dev),
 `annotations` (Dev Mode notes: `[{label, properties, category?}]`), `codeLinks` (a component's
 links to code: `[{language, importPath, name, template}]`), `devResources` (links for developers,
-its own and inherited: `[{name, url, index?, from?}]`). The auto layout props
+its own and inherited: `[{name, url, index?, from?}]`), `measurements` (Dev Mode measurements
+starting from the layer: `[{to} | {side}]`), `pluginData` (layer data written with
+`node.set {props: {pluginData: {key: value}}}`, pages included: `{key: value}`, values as strings;
+only when there is some). The auto layout props
 that `node.set` accepts are listed in [mcp.md](mcp.md#conventions-agents-must-know).
 
 ### `ui.inspect {}`
@@ -117,7 +160,13 @@ zoom preview or the refined image (`canvas.quality`: `preview` or `refined`) and
 asking for a render to its preview and its refined image being handed to egui as the canvas
 texture (`canvas.previewLatencyMs`, `canvas.refineLatencyMs`, on a monotonic clock, rendering
 included in the browser too; the GPU upload and presenting the frame come after; `null` until
-there was one). While a prototype plays, `presenter`
+there was one). `importReport` holds the Import report window's content (`{name, pages, layers, images, appended, placed, warnings, warningCount}`,
+`null` while none is open). The window opens only for a file the user opened or imported in the app
+(File ▸ Open or Import, Open recent, a recent file on the home screen, a drop, a paste, the system's open event).
+Emulated user input counts as the user's action: `ui.input` and `ui.key` (for example a Cmd+V paste or a click
+on a menu item) can open it. Commands sent through this channel with `engine.execute`, MCP, `window.new {path}`
+and files named on the command line never open it.
+`file.open` and `file.import` return the counts as `summary`. While a prototype plays, `presenter`
 (full window) and `preview` (the preview pane) hold the player's state: the `current` frame and its
 `name`, `start`, `history`, open `overlays`, how many delayed mouse triggers are `waiting`, the screen's `scroll` offset and `scrollRange`, the
 `device` (and whether it is turned to `landscape`, its `deviceColor`) and the `viewport` of the frame
@@ -128,7 +177,8 @@ far the view is panned (`pan`, `panRange`), whether a scroll is still coasting (
 active screen's `hotspots` (`[{id, rect: [x0, y0, x1, y1]}]` in window points, bottom-most first),
 whether a click where nothing reacts flashes them (`hotspotHints`) and they are flashing now
 (`hotspotFlash`), and whether the Inspect panel shows (`inspect`) with the layer it shows
-(`inspected`) (`null` when nothing plays). `presentOptions` holds the options the next presentation
+(`inspected`), and the link an Open link notice waits to open (`linkNotice`, else `null`) (`null`
+when nothing plays). `presentOptions` holds the options the next presentation
 starts with (`scale`, `deviceFrame`, `comments`, `hotspotHints`, `inspect`).
 `textPreview` is true while a live text preview shows on the canvas (a hovered text style or named
 instance, a dragged axis slider; see `text.preview` in [mcp.md](mcp.md)).
@@ -136,7 +186,10 @@ instance, a dragged axis slider; see `text.preview` in [mcp.md](mcp.md)).
 `canvas` or `properties`), whether `keyboard` mode is on (F6 or Tab moved the focus since the last
 pointer press, so the focus ring shows) and the name of the `control` with the keyboard (what a
 screen reader announces; empty when nothing has it). `reduceMotion` is true when the preference or
-the system's accessibility setting turns the interface's animations off. `live` is the live
+the system's accessibility setting turns the interface's animations off. `uiScale` is the interface
+size: the `choice` (relative to the system's display scale, `pref.uiScale`), the `zoom` drawn
+(relative too), what that is in physical pixels per point (`drawn`) and whether the window is too
+small for the choice (`limited`, so `zoom` is smaller). `live` is the live
 session of the window's active file as the window shows it (sessions are per file: another tab
 shows its own, or `status: "off"`): `session` (its id, null when the file isn't in one),
 `sessions` (how many the app has running), `status`, `role`, the number of `peers`, who you `follow`, the
@@ -165,7 +218,8 @@ A mouse gesture with the current tool. `kind`: `down`, `move`, `up`, `click`, `d
 (`x`, `y`) or screen pixels (`sx`, `sy`). `pressure` (0–1) is pen pressure (the Pencil records
 it); a drag's pressure goes from `pressure` to `pressureTo`. Returns `{selection, tool}`. With the Move and Scale
 tools, a press on a frame's or section's name label (as the canvas last drew it, along a rotated
-frame's top edge) selects and drags that frame.
+frame's top edge) selects and drags that frame; a double-click there renames the frame in place in
+the desktop app (the name field opens over the label).
 
 ```json
 {"id":4,"method":"engine.execute","params":{"command":"tool.set","params":{"tool":"ellipse"}}}
@@ -214,12 +268,13 @@ separate calls. Returns `{queued}`.
 
 Invoke a menu item exactly like clicking it (this may open a dialog). Returns `{ok, lastError}`.
 
-### `ui.set {rightTab?, leftTab?, theme?, home?, homeSection?, homeRecentsView?, homeRecentsSort?, homeRecentsOrder?, palette?, mainMenu?, focusRegion?, colorPicker?, variables?, layerFilter?, collapseLayers?, exportPreview?, preview?, presentScroll?, colorProfileDialog?, stylePicker?, stylePickerEdit?, stylePickerView?, iconGallery?, protoEditor?, contextMenu?, contextSelectLayer?, commentOpen?, commentDraft?, commentFilter?, commentSort?, commentSearch?, commentReply?, commentEdit?, presentComments?, devCompare?, devCompareMode?, devCompareSplit?, annotationFilter?, resetFrameStats?, pluginsWindow?, pluginsTab?, pluginConfirm?, pluginForm?}`
+### `ui.set {rightTab?, leftTab?, theme?, home?, homeSection?, homeSearch?, homeRecentsView?, homeRecentsSort?, homeRecentsOrder?, palette?, mainMenu?, focusRegion?, colorPicker?, variables?, layerFilter?, collapseLayers?, exportPreview?, preview?, presentScroll?, colorProfileDialog?, stylePicker?, stylePickerEdit?, stylePickerView?, iconGallery?, protoEditor?, contextMenu?, contextSelectLayer?, commentOpen?, commentDraft?, commentFilter?, commentSort?, commentSearch?, commentReply?, commentEdit?, presentComments?, devCompare?, devCompareMode?, devCompareSplit?, annotationFilter?, resetFrameStats?, pluginsWindow?, pluginsTab?, pluginConfirm?, pluginForm?, devCompareVersion?}`
 
 Switch panels and modes: `rightTab` `design|prototype|inspect`, `leftTab` `file|assets`, `theme`,
 `home` (bool), `homeSection` (`recents`, `online` or `templates`: which section the home screen shows, as `ui.inspect` reports it; opening
 `online` asks each server once what became of your online files), `homeRecentsView` (`grid|list`), `homeRecentsSort` (`modified|name|created`) and `homeRecentsOrder` (`desc|asc`): how the home screen shows its recent files (kept in the preferences; `ui.inspect` reports them under `homeRecents` with each file and whether its picture is in), `palette` (bool: the Actions palette), `mainMenu` (bool, or a top-level menu such
-as `"Plugins"` to open the main menu with it open), `pluginsWindow` (bool: Plugins ▸ Manage
+as `"Plugins"` to open the main menu with it open), `homeSearch` (text, at most 256 characters: filters locally known open, recent and online files plus starter templates in Home; an empty string returns to the selected section),
+`pluginsWindow` (bool: Plugins ▸ Manage
 plugins…), `pluginsTab` (`installed|browse`: that window's tab), `pluginConfirm` (a plugin id of the
 directory listed last: its install confirmation shows, as its Install button would; `null` closes
 it), `pluginForm` (`{id, command?}`: start that plugin command like its menu item, opening
@@ -250,24 +305,37 @@ closes it), `commentDraft` (`{x, y}`: start a new comment there), `commentFilter
 text, focused with the cursor at its end: an `@` there shows the mention picker), `commentEdit` (a
 message index of the open thread to edit, 0 for the first; `null` stops), `presentComments` (bool:
 the presenter shows the presented frame's comments, also Shift+C there). Dev Mode: `devCompare` (a
-ready-for-dev frame or section id opens the Compare changes view, like `dev.compare {id, show:
-true}`; `null` closes it) with `devCompareMode` (`sideBySide|overlay`) and `devCompareSplit` (the
+frame or section id opens the Compare changes view, like `dev.compare {id, show:
+true}`; `null` closes it) with `devCompareVersion` (a version id to compare with; `null`: when it
+was marked ready for dev), `devCompareMode` (`sideBySide|overlay`) and `devCompareSplit` (the
 overlay slider, 0–1), `annotationFilter` (`all`, `none` for uncategorised, or a category id or name:
 the annotations the canvas shows). `resetFrameStats` (true: start `framesDrawn` and
 `repaintCauses` over). Returns `ui.inspect` (which reports `stylePicker`,
 `stylePickerView`, `comments`: `open`, `draft`, `filter`, `sort`, `search`, `editing` and the
-`mentions` the picker offers, `devCompare` (`{id, mode, split}` or `null`), `devFocus` (the frame the
+`mentions` the picker offers, `devCompare` (`{id, mode, split, version}` or `null`), `devFocus` (the frame the
 focus view shows, or `null`) and `annotationFilter`).
 
-### `ui.screenshot {path}`
+### `ui.screenshot {path?}`
 
-PNG of the whole window (`window` picks one), UI included (needs a visible window; an idle one draws the frame to
-capture). Returns `{path, width, height}`, or an error after 60 s when the window doesn't deliver.
+PNG of the whole window (`window` picks one), UI included (an idle one draws the frame to capture;
+a hidden one, or one whose platform visibility is not reported, is asked to paint and the request
+is parked with its deadline until it does). Returns
+`{path, width, height}`, without `path` `{format: "png", width, height, data}` (base64). Requests
+are bounded to four pending, 128 MiB of pixels per image and 256 MiB in flight or
+completed-but-undrained. The reservation is the larger of the encoder phase (readback +
+straight-RGBA copy + PNG) and the reply phase (readback + PNG + base64); the encoder copy is
+dropped before base64 is built, and an oversized encoded reply is refused before base64 is
+allocated. The reply carries the request's own id, and the capture belongs to the document and
+window it was admitted for; cancellation, a tab switch, a resize/DPI/zoom between issuance and
+arrival (retried twice, then an error), an unrepresentable current surface (fail closed), and the
+60 s deadline never write late files. A hidden window whose pixels arrived is asked to paint the
+pass that drains them, so a completed readback is not left to time out.
 
-### `ui.render {path, scale?, ids?}`
+### `ui.render {path?, scale?, ids?}`
 
 PNG of the document without UI chrome (works without a window). Without `ids` it exports the
-selection, else the page's top-level layers. Returns the export result.
+selection, else the page's top-level layers. Returns the export result: written to `path`, or
+`{format: "png", data}` (base64) without one.
 
 ### `window.new {path?, index?}`
 
@@ -309,3 +377,24 @@ read -r reply <&3; echo "$reply"
 
 For agents, prefer the MCP server (`figcraft-cli mcp --attach 7979`, see `docs/mcp.md`): it wraps
 these methods in documented tools and returns images inline.
+
+## In the browser: `window.figcraft`
+
+The web build has no TCP server (a page can't listen on a socket), so it offers the same methods to the
+page itself, as promises on `window.figcraft` (`apps/figcraft-web/src/api.rs`). An agent driving FigCraft in a
+browser tab, or a host app showing it in an `<iframe>`, uses the commands it would send to the desktop
+app. It is opt-in: the page installs `window.figcraft` only when its URL has a `control` query entry
+(`index.html?control`, which can be combined with other flags: `?webgl&control`).
+
+| Call | |
+|---|---|
+| `figcraft.request(method, params)` | any control method of this document → its `result` |
+| `figcraft.execute(command, params)` | `engine.execute` |
+| `figcraft.commands()` / `figcraft.inspect()` | `engine.commands` / the inspect method |
+| `figcraft.screenshot(params)` | `ui.screenshot` (no `path`: the PNG comes back inline) |
+| `figcraft.openFile(name, bytes)` | runs `file.open` with the bytes as `data` and resolves with its result |
+| `figcraft.captureDownloads(on)` | while on, a save or export is kept in the page instead of downloaded |
+| `figcraft.files()` / `figcraft.readFile(name)` | the kept files (`{path, size}`) / one of them as a `Uint8Array` |
+
+Errors reject with an `Error` carrying the method's message. Requests run on the UI's next frame, so a
+hidden tab (whose frames the browser pauses) answers when it is shown again.
diff --git a/docs/dev-mode-parity.md b/docs/dev-mode-parity.md
index b96f59d8..80d351d2 100644
--- a/docs/dev-mode-parity.md
+++ b/docs/dev-mode-parity.md
@@ -1,23 +1,26 @@
 # Dev Mode parity
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-16 · **Change:** minor (Flutter code generation: a Dart widget tree for a layer and a `StatelessWidget` for a component, in Inspect and code connect; dev resources links; inspect behaviour suite and fixes: colour formats, rem, blend, positions from the frame, CSS for rotation, gradients and text, icons and images as assets; code connect and Dev Mode plugins) · **Target:** Figma Design Dev Mode (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-24 · **Last updated:** 2026-10-26 · **Change:** minor (class names transliterate non-ASCII layer names (#1235); measurements kept on the canvas; a read-only layers panel in Dev Mode; earlier: import lines in generated layer trees; compare with any saved version; Dev Mode behaviour suite: an inspect-only canvas, Changed in the ready list, statuses only on frames and sections; plugin panels from the Inspect tab) · **Target:** Figma Design Dev Mode (desktop app 126.10.7)
 
-**Breadth ~96%, ready ~72% (estimated).** The inspect surface is broad, components connect
-to the code components of a repository and layers carry dev resources links; left: import lines
-inside generated layer trees. Remaining: 0–1 h.
+**Breadth ~98%, ready ~78% (estimated).** The inspect surface is broad, components connect
+to the code components of a repository (with their imports, also inside generated layer trees),
+changes compare with any saved version, the canvas and the layers panel only inspect in Dev Mode,
+and measurements stay on the canvas for everyone. Left: publishing mappings from the code
+repository, third-party integrations. Remaining: 1–2 h.
 
 | Feature | Status | Notes |
 |---|---|---|
-| Dev Mode toggle (Shift+D), Inspect panel | done | |
+| Dev Mode toggle (Shift+D), Inspect panel | done | the canvas only inspects: presses select, pan and comment but never move, resize, draw or edit text and vectors; menus and shortcuts refuse design edits with a note (Dev Mode's annotations, statuses, dev resources, measurements, code connections and comments still work); a drawing tool chosen in the toolbar goes back to the design. The layers panel only selects and expands (no renaming, reordering, hiding or locking; a double click says why), and the Pages list only opens pages (no adding, renaming, reordering, duplicating or deleting). Files dropped on the canvas aren't imported (a dropped document still opens as a file of its own), and the Assets panel places, swaps and applies nothing, doesn't change Hide when publishing, and doesn't accept library updates or add, remove or swap libraries; each says why |
 | Properties with their styles and variables; redlines on hover | done | positions from the frame around the layer (groups aren't frames), rotation, radius (CSS corner order), opacity, blend; colours in hex, RGB, CSS, HSL or HSB (`inspect.properties {colorFormat}`, the Inspect tab's Color format) |
-| Code: CSS, iOS (SwiftUI), Android (Compose), Flutter | done | plus HTML, React and Leptos (ours; Leptos: `#[component]` functions with `#[prop]` defaults, variant enums and `view!` markup; Flutter is ours too: a `StatelessWidget` for a component, a widget tree for a layer); components take properties as parameters, instances are calls; CSS in px or rem (`inspect.code {unit, rootFontSize}`), with rotation, blend modes, gradient directions and kinds (linear, radial, conic), text alignment, case and decoration |
+| Code: CSS, iOS (SwiftUI), Android (Compose), Flutter | done | plus HTML, React, Vue and Leptos (ours; Leptos: `#[component]` functions with `#[prop]` defaults, variant enums and `view!` markup; Flutter is ours too: a `StatelessWidget` for a component, a widget tree for a layer); components take properties as parameters, instances are calls; CSS in px or rem (`inspect.code {unit, rootFontSize}`), with rotation, blend modes, gradient directions and kinds (linear, radial, conic), text alignment, case and decoration; class names from layer names transliterate non-ASCII scripts into readable ASCII (로그인 화면 → `rogeuin-hwamyeon`, кнопка → `knopka`, über → `uber`; symbols-only names take the node's kind, `.text`), and the 40-character cut lands on a word boundary (#1235) |
 | Assets list with export | done | layers with export settings, icons (small, vector shapes only: SVG) and images (PNG); the icon rule is ours |
 | Annotations: pinned properties, categories, coloured callouts, filter | done | |
-| Ready for dev list, statuses, "Changed" after edits | done | |
+| Ready for dev list, statuses, "Changed" after edits | done | the list filters Ready for dev, Changed, Completed or any, and badges changed ones (`inspect.readyForDev {status: changed}`, `changed` per item); only sections and frames at the top of a page or section take a status (others are refused) |
 | Focus view (one frame, previous / next) | done | |
-| Compare changes (before/after side by side or overlaid, property diffs) | done | only against the snapshot taken when a frame was marked ready; not against any named version |
-| Code connect (map components to repository code) | done | per language (React, Leptos, SwiftUI, Compose, Flutter): import path, name and a template with `{property}` and `{property ? "a" : "b"}` placeholders; instances (also inside generated layer trees) show the snippet with their values; edited in the Inspect panel with a live preview; `figcraft.connect.json` export/import. Inside a generated layer tree, connected instances' imports aren't collected |
-| Plugins in Dev Mode (Jira, GitHub, etc.) | partial | FigCraft's own WASM plugins that only read run from the Inspect tab; no plugin UI at run time, no third-party integrations |
+| Compare changes (before/after side by side or overlaid, property diffs) | done | against the snapshot taken when a frame was first changed after it was marked ready, or any saved version (`dev.compare {version}`; the view's Compare with menu); a frame that isn't ready for dev compares with versions |
+| Code connect (map components to repository code) | done | per language (React, Leptos, Vue, SwiftUI, Compose, ArkUI, Flutter): import path, name and a template with `{property}` and `{property ? "a" : "b"}` placeholders; instances (also inside generated layer trees) show the snippet with their values; edited in the Inspect panel with a live preview; `figcraft.connect.json` export/import; generated layer trees bring the import lines of the connected components they call (also in definitions, slots and swapped-in instances) once each at the top, per language. No CLI publishing mappings from the code repository |
+| Plugins in Dev Mode (Jira, GitHub, etc.) | partial | FigCraft's own WASM plugins that only read run from the Inspect tab, with their panels (callbacks can only read); no third-party integrations |
+| Measurements (redlines on hover, Alt in the design) | done | distances between the selection and the hovered layer, its parent or a guide, auto layout padding and gaps (Shift+Alt); measurements kept on the canvas (`devMode.addMeasurement` between two layers, along a side or to the layer around it; stored on the layer, saved, synced, undoable) drawn in Dev Mode as labelled redlines that follow the layers, listed, placed and removed in the Inspect tab; a measurement whose other layer was deleted isn't drawn until an undo brings it back |
 | VS Code extension | out of scope | FigCraft's MCP server and control channel already serve design data, code and connected snippets to agents and editors |
 | Dev resources links on layers | done | a URL and a name per link on any layer (`devResource.*`, saved, synced, undoable); instances list their main component's (and its set's) read-only; URLs checked as http/https and never fetched (no page titles: a link without a name is named after its URL); the Inspect tab lists, adds, edits and removes them; `get_node` returns them |
 
@@ -25,7 +28,11 @@ inside generated layer trees. Remaining: 0–1 h.
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-26 | minor | Class names from layer names transliterate non-ASCII scripts (#1235): `class_name` runs names through `deunicode` (new dependency: pure Rust tables, zero deps, BSD-3-Clause), so Korean, Cyrillic, Latin-diacritic and CJK names become readable ASCII classes in HTML/CSS/React/Leptos output, component roots and `data-*` variant attributes (`rogeuin-hwamyeon`, `knopka`, `uber`, `an-niu`; before, every one of them came out `layer-`); symbols-only names take the node's kind (`.text`, `.frame`) instead of `layer-`, and the 40-character cut lands on a word boundary. ASCII-only names are unchanged. `html_codegen_tests` updated (its diacritics expectation improves from `layer-1-n-code-name` to `layer-1-unicode-name`) and extended. Percentages and hours unchanged |
+| 2026-10-24 | minor | Dev Mode refuses design edits from files dropped on the canvas (a dropped document still opens as a file of its own, and the drop overlay shows the Dev Mode note for other files), from the Pages list's add, rename, reorder, duplicate and delete, and from the Assets panel's place, drag, Alt-drop swap, style, Hide when publishing, Update, and adding, removing and swapping libraries. Percentages and hours unchanged |
+| 2026-10-24 | minor | Measurements kept on the canvas (gap 16): `devMode.addMeasurement {from?, to?, side?}` places one between two layers, along one side of a layer or (neither) to the layer around it, stored on the layer it starts from (saved in `.figcraft`, synced, undoable; old files open without them); Dev Mode draws them as labelled redlines that follow the layers, the Inspect tab lists them (those of the selected layer, or every one on the page), places and removes them; `devMode.removeMeasurement` and `devMode.measurements` remove and list them; a copy keeps those to layers copied with it. The layers panel is read-only in Dev Mode: rows select and expand, but don't rename, reorder, hide or lock. Breadth 97% → 98%, ready 76% → 78%, 2–4 h → 1–2 h |
 | 2026-10-16 | minor | Flutter code generation (ours: the incumbent generates CSS, iOS and Android only): `inspect.code {language: flutter}`, with `dart` as an alias, writes a Dart widget tree for a layer — `Container` for a frame's box (size, padding, `BoxDecoration` with colour, radius, border and shadows), `Row` / `Column` for auto layout (`spacing`, `crossAxisAlignment`, `textBaseline`; `stretch` where a child fills), `Expanded` for a child that fills the main axis, `Stack` + `Positioned` for free children, `Text` with `TextStyle` (family, size, weight, style, height, letter spacing, decoration, alignment), `Image.asset` for images, `Opacity` for layer opacity, `SizedBox` for a capped subtree — and a `StatelessWidget` for a component (properties become constructor parameters with their defaults, instances are calls passing only what they change, variants become a Dart enum, swaps a `Widget` and slots a `List<Widget>?`). Code connect takes `flutter` too, with a Dart `import '…';` line. The Inspect panel's language picker (which iterates `CodeLang::ALL`) and the Connect to code note list it, and the 13 UI catalogues follow. Dev Mode breadth (~96%) and ready for real work (~72%) unchanged at this rounding; hours unchanged |
+| 2026-10-15 | minor | Dev Mode tail (gap 16): generated layer trees (React, Leptos, SwiftUI, Compose) start with the import lines of the connected components they call, once each, also those in a component's definition, in slots an instance fills and placed by a connected template's instance swaps; Compare changes takes any saved version as the before (`dev.compare {version}`, the view's Compare with menu; frames that aren't ready for dev compare with versions). Behaviour suite (5 tests; 4 failed before the fixes): the Dev Mode canvas only inspects (no moving, resizing, drawing, text or vector editing; menus, shortcuts, nudges, opacity keys and paste refuse design edits with a note; toolbar drawing tools go back to the design), the ready list filters and badges Changed items, statuses are refused on layers inside frames. Read-only plugins run from the Inspect tab show their panels (the runtime's panels, reused). Breadth 96% → 97% (measurements kept on the canvas and the read-only layers panel counted as missing), ready 72% → 76%, 0–1 h → 2–4 h |
 | 2026-10-12 | minor | Dev resources (gap 16): links for developers (a URL and a name) on any layer: `devResource.add` / `edit` / `remove` / `list`, undoable, saved and synced; an instance also lists its main component's (and that component's set's) links read-only with where they come from, and layers inside an instance show their main layer's; URLs are checked as web links (http or https, a host, no spaces, at most 2,048 characters) and never fetched (a link added without a name is named after its URL), opened only when clicked; the Inspect tab lists, adds, edits and removes them; `get_node` and `inspect_document` return them as `devResources`. The editor extension stays out of scope (the MCP server serves agents and editors). Dev Mode breadth 93% → 96%, ready 70% → 72%, 1–3 h → 0–1 h; feature breadth (~82%) and ready for real work (~51%) unchanged at this rounding; full parity ~304–593 h → ~303–591 h |
 | 2026-10-11 | minor | Export and inspect behaviour suite written from the public documentation (139 cases in 19 tests; 47 failed before the fixes) and its fixes: an export covers what the layer paints, so a drop shadow adds room only where it falls, strokes on boxes and ellipses reach their real width (they added up to four times as much), hidden layers take no room and a mask group exports the mask's area; a slice exports everything under it; slashes in layer names export into folders; Copy as PNG copies the whole selection. Added: the export settings' contents only and include bounding box, and for SVG outline text (off writes `<text>`), unique id attributes and simplified strokes (stroke attributes where exact); Inspect colour formats (hex, RGB, CSS, HSL, HSB), CSS in rem, a Blend row, positions measured from the frame around a layer (groups aren't frames), CSS for rotation, blend modes, gradient directions and kinds, text alignment, case and decoration; icons and images in the asset list (`file.exportLayers {assets}`). Dev Mode breadth 90% → 93%, ready 64% → 70%, hours unchanged (1–3, dev resources); feature breadth and ready for real work unchanged at this rounding |
 | 2026-10-11 | minor | Code connect and Dev Mode plugins (gap 16): a component or set links to its code component per language (import path, name, a template with `{property}` and `{property ? "a" : "b"}` placeholders); `inspect.code`, `inspect.componentCode` and the Inspect panel show that snippet with the instance's values (also inside generated layer trees), edited in Connect to code with a live preview; links are saved, synced and undoable, and travel as `figcraft.connect.json` (`codeConnect.export` / `codeConnect.import`). Plugins that only read run from the Inspect tab. Dev Mode breadth 80% → 90%, ready 62% → 64%, 4–8 h → 1–3 h; feature breadth (~79%) and ready for real work (~47%) unchanged; full parity ~380–725 h → ~375–720 h |
diff --git a/docs/egui-037-local-followups.md b/docs/egui-037-local-followups.md
new file mode 100644
index 00000000..1356c681
--- /dev/null
+++ b/docs/egui-037-local-followups.md
@@ -0,0 +1,214 @@
+# egui 0.37 local implementation — stage 1 notes and follow-ups
+
+Current candidate font pin: `37827adc41fd165f9a9234ac40f94dbad353aa69` restores the complete prior Latin catalog
+alongside the migration fallbacks. Central font tests and license checks passed;
+publication is pending approval. Managed run `egui037-figcraft-latin-ci-20261025-0711`
+passed with required fonts: five targeted build-input tests plus full CI, including
+WASM and plugin builds (3,257 passing executions, zero failures, nine ignored across
+72 summaries; repeated tests are counted). This supersedes the optional-font-only
+qualification below for the restored catalog.
+
+## Current local qualification — 2026-10-25
+
+Latest combined-source qualification includes main `2a3b7d4fa78e67ecdc7bdfe8b4781e50e5b2612e`, preserving its text-on-path, style-variable, export and Dev Mode changes. Managed full CI `egui037-figcraft-main2a-ci-20261025-0745` passed with required fonts: 3,297 passing executions, zero failures and nine ignored across 71 summaries, including WASM and plugin builds. Fresh independent review accepted the integration. The capture/IME/field-save refactor addresses the prior Sonar complexity findings; remote analysis still needs the approved update. Native/browser, platform IME and paired performance gaps below remain open.
+
+### Earlier review-fix qualification
+
+The published refresh preserves main `9f788753` and passed managed full CI
+`egui037-figcraft-main-refresh-ci-20261025-0618`: 3,247 passing executions, zero
+failures and nine ignored. The 3,242 counts below describe the earlier `10702311`
+qualification, before five additional main-branch tests. These are execution counts,
+not distinct regressions. The release font input is under review separately; a
+passing optional-font host build does not qualify the required web font catalog.
+
+### Earlier qualification at `10702311`
+
+The migration preserves captured main `10702311f345393ee1d8868c3257679befcfa14d`
+(53 commits and 114 paths beyond the first integration). The final review commit records
+both the migration history and that upstream target as parents. The selected egui revision is
+`6d518fc799681571963842f95b55a6b68431b15a`, winit is
+`a517b3846ee8457d84ee4975110bfda6797c44dc`, and craft-window is
+`25da1314d443171b4adeaad2cd9454b273f35c6f`. Cargo.lock SHA-256 is
+`7ba8af4de70ba657a652266ddee2920bfc501c851520a49ac60c8044a5c23cc1`.
+The normal UI enables `default_fonts` and `monochrome_emoji_fonts`.
+
+Managed full CI `egui037-figcraft-final-ci-20261024-2312` passed with bundled fonts.
+Managed full CI `egui037-figcraft-system-font-ci-20261025-0402` also passed without
+bundled craft-fonts, using a licensed DejaVu Sans system-font fixture via XDG_DATA_HOME.
+The final qualification run `egui037-figcraft-final-qualification-ci-20261025-0453`
+repeated that configuration successfully after the documentation reconciliation.
+Both runs completed formatting, strict lint, workspace tests, doctests, translations,
+layering, assets, WASM checks, and plugin fmt/lint/tests/release-WASM builds. Each log
+contains 3,242 passing executions, zero failures and nine ignored across 70 summaries;
+this includes repeated translation checks and is not a count of distinct regressions.
+The main doctest stage selects zero tests. Three plugin bundles were hash-verified and
+preserved for each configuration.
+
+The no-bundled-font run includes two test fixture corrections: text-fit cases explicitly
+scan installed fonts, and a concurrent collaboration test explicitly selects its foreground
+document after both joins complete instead of depending on network completion order.
+Independent review accepted these changes with the original layout, synchronization and
+isolation assertions intact. All 17 field-save regressions remain covered, including
+owner-bound deferred saves, same-pass document replacement and later valid edits/saves.
+Incoming IME interruption, screenshot geometry admission, and document/window ownership
+are implemented. Historical notes below describe the earlier planning stages.
+
+The final review packet binds source, lock, logs, plugin outputs and commit ancestry.
+Native visible GUI/browser workflows, native/custom-editor IME, paired performance,
+current-source platform runtime and actual release installation/signing remain open.
+The system-font result is not a claim that missing document fonts are interchangeable.
+Human review and human merge are required; no publication is authorized by this document.
+
+## What this stage changes
+
+- Dependency family at 0.37 (`egui`, `egui_extras`, `eframe`, the app's `clipboard` feature), with
+  `ui-egui` enabling the production `default_fonts` fallback and tests explicitly enabling
+  `default_fonts` + `monochrome_emoji_fonts` (kittest's own dev-features do not propagate to us).
+- Mechanical API ports: `Id::new` → `Id::unique`, `Ui::id` → `Ui::scope_id`,
+  `WidgetType` → `Role`, `MouseWheel::source`, `Shape::Band`, `ScrollArea::clamped_offset`.
+- Lifecycle split: `FigApp::background_tick` (logic-safe work: control queues, live polling,
+  background completions, autosave/recovery deadlines) and `FigApp::ui_setup` (fonts/language/
+  theme/UI zoom/render worker, once per real frame). Direct `run_ui` harnesses tick the
+  background once in `FigApp::ui` and clear the marker afterwards, so every direct frame ticks
+  instead of every other one; `App::logic` ticks it for native/web. Child viewports do not repeat
+  the root's background work, but each runs `FigApp::viewport_setup` in its own frame: theme and
+  `ui.dark`, language, fonts (including CJK faces for its own document) and the zoom plan.
+- A monotonic `FrameClock` (`web_time::Instant`) drives autosave, auto-save and capture deadlines.
+  Tests inject it (`set_test_now`); UI-time (`ctx.input(i.time)`) is not used for deadlines.
+- Local capture-slot adapter in `crates/ui-egui/src/control.rs` (no `craft-ui` dependency):
+  weak one-shot callback, per-request identity/serial, deadline/cancel, document + viewport
+  generation, capture-time geometry epoch (size/DPI/zoom only, not window position), retry on
+  geometry changes, fail-closed completion when current geometry is unrepresentable, error on
+  document changes, straight-RGBA PNG reply, and the 4-request / 128 MiB-pixels /
+  256 MiB-aggregate budget counted over in-flight and completed-but-undrained images. The budget
+  reserves the larger of the encoder phase (readback + straight-RGBA copy + PNG) and the reply
+  phase (readback + PNG + base64); the encoder copy is dropped before base64 is built, and a
+  post-encode reply cap refuses an oversized PNG before the base64 string is allocated. The
+  request's document and window are fixed at admission and never rewritten at issuance, so a tab
+  switch while settling is an error rather than the new tab's pixels. Admission and issuance happen
+  in the UI phase. A hidden request, or one whose platform visibility is not reported, is parked
+  with its deadline and asks for `RequestPaintWhileHidden`; a completed slot asks again for the
+  real pass that drains it instead of waiting for the deadline. Settlement counts completed UI
+  frames, so a discarded sizing pass never serves as a settled capture frame.
+- Accessibility: the custom panel edges (`Id::unique(("panel_edge", …))`) no longer sense focus;
+  `a11y::begin` records the root `Ui::scope_id` so a real `panel.__resize` ID is derivable if a panel
+  ever becomes resizable. Preferences (`prefs.panel_widths`) and fixed geometry are unchanged.
+- Synthetic input from the control channel: one pending batch per window, tagged with the
+  document it was injected for (dropped if the active file changed), queued in the live pane of the
+  window drawing now (a child window's batch is not written into the swapped-out default pane),
+  applied exactly once per raw-input frame (shortcuts return on a discarded pass's rerun instead of
+  inserting or running again), acknowledged only from the pass that presents it, and fenced from the
+  user's system clipboard in one place: `FigApp::clipboard_set_text`/`clipboard_set_png` drop every
+  copy path's write (copy/cut, copy-as-CSS/SVG/PNG/text/link, property/code/comment/join-code
+  copies) while the frame's input is synthetic. A synthetic `Cut` still deletes the text-edit
+  selection in the document; only its OS clipboard write is fenced. Acknowledgements belong to the
+  window whose batch they acknowledge, so an empty child frame cannot error the root's. Focus-epoch fencing for
+  text/IME batches remains part of the E21b nextstep.
+- Incoming IME byte deletion is implemented for the custom text editor
+  (`figcraft_engine::textedit::delete_surrounding_bytes`, wired from `ImeEvent::DeleteSurroundingBytes`)
+  and tested for multibyte CJK, a supplementary emoji, deletion-only input and one undo step.
+  Partial characters are preserved (a byte count ending inside one deletes only the whole
+  characters it covers, matching the fork and egui's `surrounding_bytes_to_chars`). The selection
+  itself is kept, as in stock `TextEdit`, so the paired `Commit` replaces it; only the complete
+  characters before/after the selection go. A delete that finds nothing is a true no-op: it keeps
+  an in-progress composition (pre-edit), the revision and the document untouched. The older
+  character-counted `DeleteSurrounding` event follows the same rules and has an app-level test.
+
+## Outgoing IME surrounding text (E21b/P7b)
+
+Implemented for FigCraft's one custom IME producer, `shortcuts::ime_output`, against the reviewed
+fork API. The descriptor now carries:
+
+- a stable owner `(document uid, text node)` and the engine's `TextEdit::editing_session` as the
+  replacement epoch (a document switch or another node changes the owner; re-entering the same
+  node starts a new generation without reusing the old one);
+- the tracker's viewport-scoped `context_generation`, observed exactly once per viewport pass
+  after the pass's IME events and engine commands. `FigApp::observe_ime` is the single call site
+  (editor passes, the home/present early returns and the first-font frame all pass through it);
+  an idle `observe(None)` followed by a focused one in the same pass would drop receipts and bump
+  the generation, so the early shortcut/palette idles were removed. A late `window.new` that moves
+  the edited file to another window makes the old viewport observe idle for that pass;
+- a bounded (≤ 4000 UTF-8 bytes) committed-text snapshot from
+  `figcraft_engine::textedit::ime_surrounding`: logical model text, never `bidi::display`, with the
+  UI-only pre-edit excluded, character caret/anchor converted independently to UTF-8 byte offsets
+  (reversed selections stay reversed), and an explicit `Unavailable` reason when no edit/text node
+  exists or the selection alone exceeds the budget. Empty text is `Available("",0,0)`.
+- explicit change cause: `InputMethod` only for an accepted `Commit`/`DeleteSurrounding*` receipt
+  captured immediately around that mutation (delete+commit chains are one receipt chain); plain
+  typing, paste, keys, text shortcuts, undo, control-channel and AutoCorrect/list AutoFormat
+  changes report `Other` and dominate the frame. No-op, failed and stale receipts earn nothing.
+  When the bounded snapshot is unavailable (for example a selection wider than 4000 bytes), both
+  the pass observation baseline and the pre/post receipt stamps carry the engine's document
+  revision, so an accepted commit that replaces that selection still earns `InputMethod`.
+- `geometry` remains the actual caret (the composition cursor while composing).
+
+A hidden/unfocused/no-editor pass observes `None`, and closing a child window calls
+`end_viewport` (now covered by a windows regression). The outgoing text is copied only as the
+bounded window; the query never clones the document. Converting the caret/anchor character
+indices to UTF-8 bytes now takes one character walk (both offsets) instead of two or three full
+scans. Remaining cost: the caret is a character index, so a caret near the end of a huge layer is
+still O(n) per query; `ime_stamp` runs the query before and after each text-affecting event, so
+such a layer pays O(caret/anchor) per event and at most 4000 copied bytes. The generic edit path
+also still counts characters once to clamp the caret and clones the pre-edit document for
+normalisation/undo.
+
+Tests: engine (`ime_surrounding` Unicode/reversed selection, pre-edit exclusion, empty/bounded/
+too-wide selection, stable owner and session replacement, reverse-selection byte deletion with a
+preserved selection, character-counted deletion, no-op composition preservation, list AutoFormat
+and normalisation classification, double-click epoch stability) and UI (`ime_tests.rs`: commit vs
+typing/mixed causes, transformed commit cause, bare-newline/control no-ops, byte and character
+delete+commit, pre-edit, logical UTF-8, empty vs unavailable, owner replacement, double-click
+inside the edit, one observation per frame, late `window.new`, discarded pass, two viewports).
+These are source tests only; the parent runs the managed build/test commands.
+
+## Web hidden paint
+
+`RequestPaintWhileHidden` is honoured by native eframe but not by the shared web runner, which logs
+an unhandled command for hidden tabs. Hidden-browser-tab `ui.screenshot`/`ui.input` therefore remain
+unqualified even though the native path now queues and settles them. This is a forkfix prerequisite,
+not a passing claim.
+
+## Dependency and lock prerequisites
+
+- The committed root `[patch.crates-io]` table pins the egui family and winit to
+  immutable published fork revisions. `craft-window` is pinned to the reviewed
+  craft-libs revision targeting egui 0.37; its optional `egui` feature stays disabled
+  because FigCraft needs only the frame probe.
+- `Cargo.lock` is committed and resolves the canonical Git sources without local
+  path overrides. Use `--locked`; the earlier parent integration config is not
+  required to reproduce this graph.
+- Fonts remain an optional central `CRAFT_FONTS_DIR` input with native system-font
+  fallback; no font binaries are added here. Required release-font qualification
+  is separate from optional-font host CI. Color emoji still needs a separate
+  `epaint/color_fonts` feature check.
+
+## Qualification gaps and baseline backports/perf operations
+
+Synthetic `ui.input` for deferred child viewports still relies on the existing per-pane queue and
+`windows::take_input`; eframe invokes `App::raw_input_hook` for the root update, so injected input
+into a child window is not newly qualified here.
+
+Surface generation is not exposed by the pinned eframe/egui API, so the capture epoch covers
+logical content size, DPI and zoom but cannot distinguish a same-size surface loss/recreation; that
+remains a qualification gap (reported by the sibling capture review).
+
+Remaining lifecycle item from the plan, not changed in this stage: prototype/after-delay/animated-GIF
+clocks still advance from `present::show` and the GIF drawing path (UI only). They should move to a
+non-drawing step called from `background_tick` so hidden playback advances once per deadline and the
+visible pass never repeats it.
+
+Unverified here: compile/tests/clippy/fmt, native X11/Wayland/Windows/macOS, browser WebGPU/WebGL2,
+screen readers, hidden-window forced paint, PRIMARY/W15P, and all performance numbers. Baseline
+operations to measure once the parent can build: `#8731` text tessellation, `#8736` DX12 pipeline
+startup, `#8512` font discovery, `#8763`/PR `#8764` TextEdit click-away, `#8748` hidden deferred
+children. None of these were applied, removed or claimed as fixed.
+
+## Required web font catalog
+
+Native optional-font builds retain the system-font policy. A required web build must
+embed Inter Regular and SemiBold plus Noto Sans Georgian Regular after filtering;
+missing required face/style coverage fails the build, regardless of which manifest supplies it. Required mode
+also rejects an unset `CRAFT_FONTS_DIR`. The migration's original `b076417` catalog
+lacks Inter and is not a qualified required-web input. A combined central font pin restores the prior Latin catalog while preserving the new
+core fallbacks. Source Sans 3 and Source Serif 4 are excluded on every target; no font binary belongs in this repository. Required-web, required-native
+and optional-font configurations remain separate validation gates.
diff --git a/docs/egui-037-migration-plan.md b/docs/egui-037-migration-plan.md
new file mode 100644
index 00000000..5bdfa188
--- /dev/null
+++ b/docs/egui-037-migration-plan.md
@@ -0,0 +1,1230 @@
+# FigCraft egui 0.37 migration plan
+
+Status update (2026-10-25): The migration integrates main `92682728` and pins egui 0.37, winit and craft-window. Required-font CI run `egui037-fig-review-full-ci-20261025-0803` passed 3,306 test executions, zero failures and nine ignored across 71 summaries, including WASM and all three plugin bundles. Screenshot encoding now precedes a shared final-write/reply gate: timeout cancellation cannot overtake a committed file, and a fresh deadline check rejects a late write. A regression through the actual arrival path failed with the previous write behavior and passed with the gate. Native visible GUI/browser workflows, native IME, paired app performance and current-source platform/release installation remain open. Human review and human merge are required.
+
+The original planning record below is historical.
+
+Status: implemented locally, with host CI qualification recorded in the current qualification
+section below and in `docs/egui-037-local-followups.md`. Earlier sections retain the original
+planning baselines. Native/browser workflows and paired app performance remain open.
+No publication approval exists for this document or any derived branch/PR.
+
+Scope: the exact checkout
+`/home/codex/work/CraftApps/egui037-migration-20261022/figcraft-implementation`. This plan covers
+FigCraft only. Suite-wide fork work, shared `craft-libs` work and publication approval remain with
+the parent workflow. This revision resolves the adversarial review of the previous draft in place;
+the review file is
+`/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/plan-reviews/figcraft-v1.md`.
+
+Capture acceptance follows the suite contract: a queued-not-issued hidden request and
+each settling frame must request `RequestPaintWhileHidden` from logic; only an issued
+screenshot command forces paint itself. Callback arrival has no implicit wake, so the
+live request owns the viewport waker. Record known issuance UI bounds and a geometry
+epoch, reject/retry any intervening resize/DPI/zoom/surface change even if it changes
+back, and derive pixel scale from returned dimensions only under an unchanged epoch.
+Default limits are 4 requests, 128 MiB/image and 256 MiB aggregate. Count reserved
+in-flight and completed images together.
+
+
+## 1. Source identity and what was inspected
+
+### 1.1 Checkout and baseline
+
+- FigCraft integration checkout: `8167f13a6a416ca61fcb505a7eaf6be383f6c5c0`. Earlier baselines
+  (`80f916326fb94f3a88cb24e64f396f564a0ebc06`, `8d790607ff1ad40e32343ca2116d8fdcf3244c8d`) are
+  historical review anchors only.
+- The worktree contains the migration implementation; this document is not a claim that those
+  changes are compiled, tested or publishable.
+- Repository instructions: `AGENTS.md` and `CLAUDE.md` are identical; there are no nested
+  `AGENTS.md`/`CLAUDE.md` files under `crates/`, `apps/`, `plugins/` or `xtask/`.
+- Current lock: `egui`, `eframe`, `egui-wgpu`, `egui-winit`, `egui_extras`, `ecolor`, `emath`,
+  `epaint` all `0.36.2`; `winit` `0.30.13`; `wgpu` `30.0.1`; `accesskit` `0.24.1`;
+  `wasm-bindgen` `0.2.129`.
+- Git dependencies: `craft-docpath` rev `82a24b006eefa036b43c09a67fb9a3fbd17ffe63`;
+  `craft-window` rev `1f805378d454dac48b5c214029d254055fdf961b` (that revision's workspace
+  declares egui 0.36 and cannot be used unchanged with 0.37).
+- Build input: tracked `.cargo/config.toml` sets `CRAFT_FONTS_DIR=../craft-fonts` (relative,
+  optional). It is locally skip-worktree, so it did not appear in `git status`; it is not a
+  path patch and does not change dependency resolution. CI intentionally builds without craft-fonts.
+- There are no `vendor/` directories, source patches or `[patch]` sections in this repository.
+  `plugins/` is a separate workspace and does not use egui.
+
+### 1.2 Target revisions and publication boundary
+
+The production pins are **not** the candidate fork SHAs. They are the final reviewed
+`storytold/egui`, `storytold/winit` and `storytold/craft-libs` immutable revisions produced by the
+suite's reviewed patch series, published with fresh human approval. Those SHAs do not exist yet at
+this planning revision. Do not publish or implement a manifest that names a candidate or a branch.
+
+| Item | Exact value / status |
+|---|---|
+| Upstream egui 0.37.0 release commit | `841a328ba2dd8f6996beb7189ebb7fc00e668a2a` (annotated tag object differs) |
+| Upstream egui 0.36.2 control | `49682f8baa058bf49e011035cfbd6e825f88a5ef` |
+| Published storytold egui 0.36.2 | `767b1cad294120689a514bb4bd68c077e46679b9` |
+| Published storytold winit 0.30.13 | `ffae5198770d7730e718043f035a772b7dbc3b1b` |
+| aiongg egui candidate | `aiongg/egui` `craft/0.37` `a4f9a17f64a6bae61350fb85804c9df0d9865916` — comparison input only |
+| aiongg winit candidate | `aiongg/winit` `craft/0.30.13-lang` `8b35388bd719e8cc86a95971ba0bc026c9a8f058` — comparison input only |
+| Final storytold egui | `STORYTOLD_EGUI_FINAL_REV` — unknown until the reviewed E1–E21 + E21b/P7b series is approved and published |
+| Final storytold winit | `STORYTOLD_WINIT_FINAL_REV` — unknown until W1–W27 + W15P are approved and published |
+| craft-libs merged baseline | `3832c47ef68a0e6214f2c1e85f3526b6adcb686e` (PR #199 merged: “craft-ui: update egui to 0.37”) |
+| craft-libs PR #199 head / audit merge | `b68de8c5f4f1c060904d211a7b1320aa0f7bce78` / `ec8840af8c5fda695cf195cdd05e5ae078415c07` — **unsafe stale history**; do not merge or reuse either tree |
+| Local craft-libs integration | `3832c47` plus the reviewed capture-completion and text-alignment helpers in the local `craft-libs-implementation` worktree; no published commit yet |
+| Final craft-libs | `STORYTOLD_CRAFT_LIBS_FINAL_REV` — unknown until the reviewed helper stage is approved and published atop `3832c47` |
+
+Verified source facts for the craft-libs anchor: the historical port source `8614e4a` contains no
+`crates/window/Cargo.toml` and no `crates/platform`; `b68de8c` is a stale tree that omits current
+`craft-platform` and reverts security, settings, docking and printer fixes. The merged
+`3832c47` tree contains `crates/window`, `crates/platform` and the 0.37 workspace. The local
+implementation must stay on that merged base and must not reuse either PR head as its tree.
+
+Language work: `storytold/craft-libs#198` is an issue/proposal, not a PR or a merged dependency.
+FigCraft consumes the final fork revisions; it does not copy language helpers from `craft-ui`.
+
+### 1.3 Evidence consulted (historical, not fresh validation)
+
+- `/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/lifecycle-source-audit.md` is the
+  authoritative lifecycle evidence for this plan.
+- `/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/ime-surrounding-gap.md` is the
+  authoritative E21b/P7b gap inventory.
+- `/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/upstream-discussions.json`:
+  issue/PR snapshots for #8535, #8489, #8555, #8583, #8512, #8657, #8577, #8731, #8736, #8763,
+  #8764 and #8748.
+- `/home/codex/work/ssd2/task-evidence/egui037-audit-20261022/{fork,stock}/figcraft.errors`:
+  historical compiler diagnostics, used only as clues.
+- `/home/codex/work/ssd2/task-evidence/craft-fork-egui037-20261021/RESULTS.md`,
+  `craft-fork-ai-lines-20261022/SURVEY.md`, `craft-fork-plan-20261020/PLAN.md`.
+
+No build, test, benchmark, browser run or GUI check was performed for this plan.
+
+## 2. Decision summary
+
+1. Target the final reviewed storytold egui/winit revisions, not stock 0.37 alone and not the
+   aiongg candidates. FigCraft needs the language/bidi/IME patches, W15P PRIMARY, E21b outgoing
+   surrounding text and the egui-wgpu fixes carried by the reviewed series.
+2. Keep FigCraft's existing `App::logic` + `App::ui(&mut Ui)` architecture. Do not rewrite to
+   `App::update`; it does not exist. Do not call `Context::root_ui` from `App::ui`; the root `Ui`
+   is already borrowed (upstream #8535).
+3. Treat the real eframe lifecycle: native and web both call `App::logic` **inside** the
+   `Context::run_ui` closure, once per layout pass. `run_logic` is not distinguishable through
+   `ViewportInfo::visible()`. Design logic work to be safe and idempotent in both callback paths,
+   and use a narrow first-pass guard only for genuinely once-per-layout-frame UI setup.
+4. Keep command/undo/persistence contracts. UI input is consumed through an explicit one-shot
+   action queue/token; do not gate all commands on `current_pass_index() == 0`, which cannot be
+   implemented in `FigApp::run`/`set_props` (neither receives a `Context`) and would starve fresh
+   work.
+5. Use a small local completion-slot adapter in FigCraft, matching the shared capture contract,
+   with a weak callback reference, per-request cancellation, bounded aggregate image bytes,
+   capture-time viewport/geometry/DPI and viewport-aware wakeup. Keep request IDs, paths, replies and
+   timeouts in FigCraft.
+6. Correct the actual a11y edge handling: FigCraft's panels are `resizable(false)`, so egui does not
+   create `left_panel.__resize`/`right_panel.__resize`. FigCraft's custom edges are
+   `Id::unique(("panel_edge", "left"/"right"))` with a focusable `Sense::click_and_drag()`.
+   Make them non-focusable and test the real IDs. Preserve prefs.panel_widths; fixed
+   panels and disabled eframe persistence require no PanelState migration.
+7. Add E21b/P7b outgoing IME surrounding text as an atomic compatibility prerequisite: bounded
+   transient payload, built-in TextEdit producer, Wayland adapter, and a real model/preedit/UTF-8
+   index adapter for FigCraft's custom editor. Never pass `None` placeholders as the completed port.
+8. Keep logical text at shaping, clipboard, accessibility, save and IME boundaries. Do not feed
+   display-bidi (visually reordered) strings into egui shaping, clipboard or IME. FigCraft does not
+   use `craft-ui`'s `DockArea`; if it later adopts it, use the explicit opt-in direction policy with
+   unchanged saved physical splits and logical tab order.
+9. Use pinned licensed font fixtures from the egui plan's section 10.6. Keep FigCraft's central
+   craft-fonts policy, do not copy font binaries into the repository, and do not claim color-emoji
+   coverage while `epaint/color_fonts` is disabled.
+10. Stage reviewable PRs with a dependency DAG and rollback. Every build/test uses
+    `maintenance/task.py run/status/finish`; no direct cargo test/build is acceptance.
+
+## 3. Baseline audit
+
+### 3.1 Manifests, entry points and feature targets
+
+| Target | Manifest / source | Current features / role | 0.37 action |
+|---|---|---|---|
+| Desktop app | `apps/figcraft/Cargo.toml`, `apps/figcraft/src/main.rs` | eframe `default_fonts`, `wgpu`, `accesskit`, `wayland`, `x11`; wgpu renderer; Windows `windows 0.62`; macOS `fmv-macos-events`; Linux `winit` `wayland-csd-adwaita-notitle` | Keep feature shape; add final eframe/egui revisions; enable `clipboard` explicitly; keep `system_fonts` off initially; repoint `craft-window` to the final craft-libs revision |
+| Browser app | `apps/figcraft-web/Cargo.toml`, `src/main.rs`, `src/web.rs` | wasm32 eframe `default_fonts`, `wgpu`, `accesskit`; `WebRunner`; WebGPU/WebGL2 | Update eframe/egui; keep `web_screen_reader` disabled as at baseline; `web_file` is an egui feature used by eframe for wasm, not a FigCraft feature to “verify” independently |
+| UI crate | `crates/ui-egui/Cargo.toml`, `src/lib.rs` | egui/egui_extras 0.36, no eframe; about 1,478 egui references; no kittest dev-dependency | Update egui/egui_extras; add `default_fonts` and `egui_kittest` 0.37 for strict a11y tests; add the local capture adapter; mechanical API migration |
+| Text/render | `crates/text`, `crates/render` | no egui dependency; own harfrust/skrifa/tiny-skia | No code change expected; verify duplicate harfrust/skrifa versions and UI/document metrics |
+| CLI/server/MCP | `apps/figcraft-cli`, `apps/figcraft-server`, `crates/mcp` | no egui/eframe (MCP headless) | No dependency change; keep commands and outputs |
+| Plugins | `plugins/` separate workspace | no egui | No change |
+
+Entry points:
+
+- Native: `apps/figcraft/src/main.rs` `main()` → `eframe::run_native`; `App::logic`,
+  `App::raw_input_hook`, `App::ui`, `App::on_exit`.
+- Child windows: `crates/ui-egui/src/windows.rs` `Windows`, `viewport`, `show`, `draw`,
+  `enter`/`leave`, `as_window`.
+- Browser: `apps/figcraft-web/src/web.rs` `start`, `WebShell::ui`, `WebServices`.
+- Headless/UI tests: `Context::default().run_ui(...)` in many `crates/ui-egui/src/*_tests.rs`
+  files; `crates/ui-egui/src/idle_tests.rs` has the frame/idle harness; `windows_tests.rs` has the
+  `run_logic` hidden-window harness.
+- Render/control: `crates/ui-egui/src/canvas/render_worker.rs`; `crates/ui-egui/src/control.rs`.
+
+Build/test entry points:
+
+- `.github/workflows/ci.yml`: Linux fmt, clippy `--workspace --all-targets --locked -D warnings`,
+  workspace tests, `xtask layers`, `xtask assets`, `xtask wasm`.
+- `xtask/src/main.rs`: `ci`, `layers`, `assets`, `wasm`, `bench`, `plugins`.
+- `crates/ui-egui/src/perf_tests.rs`: ignored `perf_ui_frames` and `report_components` benchmarks,
+  currently printing arithmetic means only.
+- `apps/figcraft-cli/src/perf.rs`: release engine/render timings, currently a mean of several runs.
+- `apps/figcraft-web`: `trunk build --release`; `packaging/web/package.sh` enforces the 24 MiB
+  wasm cap.
+- Windows ARM workflow only packages/installs; Windows x64 build/test and visible GUI checks must be
+  run separately through the VM workflow. FreeBSD is a nightly VM build/package job; macOS is
+  release-only and has no routine UI test job.
+
+### 3.2 Current lifecycle: what is already true
+
+On 0.36.2 the app already uses `eframe::App::logic` and `eframe::App::ui`:
+
+- `apps/figcraft/src/main.rs` `App::logic` drains the control queue, hidden requests, Apple events,
+  close requests, title updates and recovery.
+- `App::ui` wraps `FigApp::ui` in `windows::guard`.
+- `crates/ui-egui/src/lib.rs` `FigApp::ui` calls `self.logic(&ctx)`, `autosave_tick`,
+  `auto_save_tick`, then `windows::begin`, `frame` (which also calls `control::drain`), `settle`,
+  `show`.
+- `crates/ui-egui/src/windows.rs` `draw` swaps a child window's pane into the app, calls
+  `app.logic(&ctx)`, then frames it under `windows::guard`.
+- `FigApp::logic` installs language/fonts/theme, computes UI zoom from `ctx.content_rect()`,
+  creates the render worker and scans input for CJK fallback.
+- Commands go through `FigApp::run`/`run_user`/`run_background`; the engine owns history snapshots.
+
+The authoritative source sequence is not “logic once per native frame”:
+
+- Native `crates/eframe/src/native/epi_integration.rs::update` calls `app.logic` then `app.ui`
+  inside `Context::run_ui`.
+- Web `crates/eframe/src/web/app_runner.rs` does the same for visible tabs and calls
+  `Context::run_logic` for hidden tabs; native `run.rs` can force a full `PassMode::Full` UI for
+  invisible windows and a `LogicOnly` pass for overdue redraws.
+- `Context::run_logic` refreshes only viewport/window focus information; input events, time, layout
+  and normal pass state remain from the previous UI pass.
+- After a normally completed `Context::run_ui`, `current_pass_index()` is zero, including after
+  multiple passes (`ContextImpl::end_pass` takes the output; `run_dyn` restores the count only
+  before the next UI pass). Do not write tests that expect a stale nonzero index after completion.
+- `ViewportInfo::visible()` derives from minimized/occluded and can be `None`; it does not identify
+  `run_logic` versus a forced hidden UI pass. Visibility is not the tick phase.
+
+The migration must therefore make background work idempotent in both callback paths and move
+input/geometry/theme setup to the UI phase. A narrow first-pass guard is valid for once-per-layout
+UI setup; it must never suppress fresh control commands, widget actions, background completions or
+deadline work merely because a pass index is nonzero.
+
+### 3.3 Historical compiler diagnostics (clues only)
+
+| Location | Diagnostic | Meaning for this plan |
+|---|---|---|
+| `crates/ui-egui/src/control.rs:84`, `idle_tests.rs:275` | `egui::Event::Screenshot` variant not found | 0.37 uses `ScreenshotCallback`; replace event polling |
+| `crates/ui-egui/src/control.rs:119`, `idle_tests.rs:275` | `egui::UserData` not found | Removed with the callback API |
+| `crates/ui-egui/src/control.rs:367` + 11 test files | `Event::MouseWheel` missing field `source` | Add `MouseWheelSource` |
+| `crates/ui-egui/src/dialogs.rs:108` | `Role::SelectableLabel` not found | 0.37 keeps deprecated `pub type WidgetType = Role`; only renamed variants such as `SelectableLabel` are gone. Map to `Role::Button` |
+| `crates/ui-egui/src/canvas/frame_labels.rs:63` | non-exhaustive match missing `Shape::Band` | Add the 0.37 shape variant |
+| `crates/ui-egui/src/panels/typography.rs:1312` | `ScrollArea` state `offset` private | Use `clamped_offset()` |
+| Many files | `Id::new`/`Ui::id()` deprecation warnings | CI clippy `-D warnings` turns these into failures; replace mechanically |
+
+`clip_rect_margin` is not removed in 0.37; it remains as a deprecated unused field. Remove its use
+because it has no effect, not because it fails to compile. The audit stopped at these errors and did
+not compile the app, tests, Windows, wasm or examples. A fresh managed build after the final pin is
+required; this table is not acceptance.
+
+## 4. Dependency and patch plan
+
+### 4.1 What must be pinned
+
+Add a root `[patch.crates-io]` block in `Cargo.toml` (consumer root; dependency patch sections do
+not propagate). The production block uses the final reviewed storytold revisions. The aiongg SHAs
+below are recorded only as candidate/comparison inputs and must never appear in the production
+manifest.
+
+```toml
+[patch.crates-io]
+egui = { git = "https://github.com/storytold/egui", rev = "STORYTOLD_EGUI_FINAL_REV" }
+eframe = { git = "https://github.com/storytold/egui", rev = "STORYTOLD_EGUI_FINAL_REV" }
+egui-wgpu = { git = "https://github.com/storytold/egui", rev = "STORYTOLD_EGUI_FINAL_REV" }
+egui-winit = { git = "https://github.com/storytold/egui", rev = "STORYTOLD_EGUI_FINAL_REV" }
+egui_extras = { git = "https://github.com/storytold/egui", rev = "STORYTOLD_EGUI_FINAL_REV" }
+ecolor = { git = "https://github.com/storytold/egui", rev = "STORYTOLD_EGUI_FINAL_REV" }
+epaint = { git = "https://github.com/storytold/egui", rev = "STORYTOLD_EGUI_FINAL_REV" }
+emath = { git = "https://github.com/storytold/egui", rev = "STORYTOLD_EGUI_FINAL_REV" }
+epaint_default_fonts = { git = "https://github.com/storytold/egui", rev = "STORYTOLD_EGUI_FINAL_REV" }
+winit = { git = "https://github.com/storytold/winit", rev = "STORYTOLD_WINIT_FINAL_REV" }
+```
+
+Only patch crates FigCraft actually resolves. `ecolor`, `emath` and `epaint_default_fonts` are pulled
+by egui/default fonts; leaving any of them on crates.io creates mixed egui-family versions. Add
+`egui_glow` only if a glow build is introduced. If a crate is not resolved in the final graph,
+remove its patch row and record the `cargo tree` evidence.
+
+`egui_extras` must be patched because `crates/ui-egui/src/dialogs/credits.rs` uses
+`TableBuilder`/`TableRow`/`TableBody`; a 0.36 `egui_extras` would pull a second egui 0.36.
+
+`craft-window` is a git dependency, not a path patch. Pin it to the final craft-libs revision whose
+workspace requires egui 0.37. Do not keep `1f805378` (egui 0.36) with a 0.37 egui patch: Cargo
+cannot apply a 0.37 patch to a `^0.36` requirement. `craft-docpath` is independent of egui; prefer
+the same final craft-libs revision for both crates after confirming its source hash, or keep its
+existing rev if the final commit changes unrelated behavior this task has not reviewed.
+
+FigCraft currently has no `craft-ui` dependency. Keep its capture adapter local in
+`crates/ui-egui/src/control.rs`, following the CL-2/CL-2F ownership, cancellation, byte-limit
+and viewport-wakeup contract. Eleven existing creative consumers adopt the shared helper;
+DeckCraft, FigCraft and ArtCraft Native use local adapters. Reuse the reviewed conformance cases
+and compare behavior with the shared prototype; do not add the entire crate solely for capture.
+
+### 4.2 Feature decisions
+
+| Manifest | Decision | Reason / test |
+|---|---|---|
+| Root `[workspace.dependencies]` | `egui = "0.37"`, `egui_extras = "0.37"`, `eframe = "0.37"` | Pin all three and verify in the lock |
+| `crates/ui-egui/Cargo.toml` | `egui = { workspace = true, features = ["default_fonts"] }` (or the workspace dep carries it) | 0.37 egui default features are empty; `theme::install_fonts` calls `FontDefinitions::default()` and tests without eframe need real fallback fonts |
+| `apps/figcraft/Cargo.toml` | Keep `default_fonts`; enable `clipboard` explicitly; keep `wgpu`, `accesskit`, `wayland`, `x11` | eframe 0.37 `default_fonts` forwards to egui; `clipboard` is optional in 0.37 |
+| `apps/figcraft-web/Cargo.toml` | Keep `default_fonts`, `wgpu`, `accesskit`; keep `web_screen_reader` disabled | Browser has no system-font provider; keep the 24 MiB wasm budget |
+| eframe `system_fonts` | Off initially | FigCraft already scans system fonts and installs only needed faces; enabling fontique adds a second scan and nondeterminism. Evaluate later with a separate measured PR |
+| `clipboard` | Explicitly enable native `eframe/clipboard` in F2 to preserve 0.36 OS text clipboard behavior; verify E4/W15P and image alpha | 0.36 forced the integration feature; 0.37 makes it optional. Keep existing arboard image handling and browser clipboard paths separately tested |
+| `epaint/color_fonts` | Off by default | 0.37 color-glyph support is behind this feature. Do not claim color-emoji coverage in the normal build; if browser/native color emoji becomes an acceptance requirement, enable it in a separate feature job with the pinned Noto Color Emoji fixture and a color-glyph test |
+| `egui_extras` | `default-features = false`; no `svg` feature unless used | Current crate only uses tables |
+
+### 4.3 Lockfile and duplicate checks
+
+Every command below is a payload for the managed workflow in section 7.1; do not run it directly:
+
+```sh
+cargo tree --locked -p figcraft -i egui
+cargo tree --locked -p figcraft -i eframe
+cargo tree --locked -p figcraft -i winit
+cargo tree --locked -p figcraft -d
+cargo metadata --locked --format-version 1
+```
+
+Acceptance:
+
+- Exactly one source/version for `egui`, `epaint`, `emath`, `ecolor`, `eframe`, `egui-wgpu`,
+  `egui-winit`, `egui_extras` and `winit` (and `egui_glow` if a glow build is enabled).
+- `Cargo.lock` records the final storytold egui/winit/craft-libs revisions; no aiongg candidate SHA
+  and no moving branch remains.
+- No registry 0.36 egui-family package remains; no duplicate `craft-window`.
+- `wgpu` resolves to one version. Current FigCraft lock is `30.0.1` while the candidate lock says
+  `30.0.0`; both satisfy `30.0`, but the final lock must be inspected for wasm-bindgen and backend
+  compatibility. Do not “fix” this by allowing two wgpu versions.
+- `cargo check --locked` native and wasm; `cargo test --locked --workspace`; clippy with
+  `-D warnings`.
+- All patched git sources are public and reachable without credentials. No machine-local path,
+  branch-only or private-repository patch is publishable.
+
+## 5. Fork patch inventory and integration decisions
+
+The final fork's `PATCHES.md` is the provenance record. Every row below is kept in the reviewed
+series unless its decision says otherwise; none is deleted merely because FigCraft does not call the
+API directly. The candidate revision is a comparison input, not the production source.
+
+| Patch | Crates | Provenance / upstream | FigCraft impact | Decision / removal condition |
+|---|---|---|---|---|
+| E1 `8f3abf06` | eframe | suite ViewportHooks; not upstream | Compiles `NativeOptions`; no direct use | Keep for suite; remove when upstream has equivalent |
+| E2+E3 `9dd799ab` | egui-wgpu | surface fit + error scope; #8361 related | Large/multi-monitor windows, GPU setup errors | Keep; test large surface/error path on Windows/Linux real GPU |
+| E4 `66bacf23` | egui-winit | Wayland clipboard via winit (#8657 draft) | Text copy/paste on Hyprland | Keep the regular clipboard path; PRIMARY is **not** accepted through the candidate's arboard fallback |
+| **W15P + E4 P2b** | winit + egui-winit | winit-owned PRIMARY on the existing connection/event queue, per-seat `PrimarySelectionManagerState`; no second regular `wl_data_device` | Pointer- and keyboard-selected PRIMARY on Wayland | Required prerequisite and integration stage; native acceptance on wlroots/KWin/Mutter. arboard only as a measured fallback if W15P fails a proven requirement |
+| E5 `0e27d87e`, `777977b7`, `f7e89e23`, `5b2b8e19` | epaint/egui | bidi #8577 + fixes | RTL UI/document text, marks, caret | Keep; RTL/caret tests; remove FigCraft double-processing where egui now shapes logical text |
+| E6 `0abfabcf` | egui | IME focus | Avoids composition interruption | Keep; IME test |
+| E7 `0670c58a` | egui-winit | Windows letter keys | Non-Latin layouts | Keep; Windows layout test |
+| E8 `1b03c10f` | egui | TextEdit glyph overshoot | Thai/Vietnamese/Arabic marks | Keep; screenshot/geometry |
+| E9 `b2f5cafc`, `e1341a3d`, `5105330d`, `75a5b3d3` | egui | RTL chrome | Menus/scrollbars/headers/title bars | Keep; RTL screenshots |
+| E10 `dc90c13e`, `c8e573f7`, `34b2c0d4` | eframe web | key/text-agent fixes | Browser shortcuts and IME | Keep; browser test |
+| E11 `92e61afd` | epaint | single-thread vello flush | Avoids panic under `multithreading` | Keep; compile/test; FigCraft does not enable vello multithreading |
+| E12 `e955bb18`, `485c0b89`, `0185887c`, `7015ac23`, `4067b2c4`, `620e070e` | epaint/egui | LayoutJob direction, RTL alignment, L1, linear reorder | RTL layout and text painting | Keep; RTL tests |
+| E13 `5e4da7f4` | epaint/egui | grapheme caret/hit/delete | Emoji/accented text editing | Keep; editor tests |
+| E14 `cbd77549`, `b3722ac0` | epaint/egui | fallback baseline align | CJK/Indic fallback rows | Keep; CJK/Indic screenshot |
+| E15 `f1cae609` | epaint/egui | LineBreaker trait/language | Thai/Japanese breaking if enabled | Keep; default SimpleLineBreaker preserves 0.36 |
+| E16 `b3ef9771`, `bed6dfe3` | epaint/egui | visual cursor/affinity | RTL cursor/Home/End | Keep; RTL caret tests |
+| E17 `520435df` | egui | UI language, AccessKit language | Screen-reader language; bidi runs | Keep; use `Context::set_language`; AccessKit test |
+| E18 `89de8f3c` | eframe | `Frame::set_ui_language` | Optional language sync | Keep; can use Context directly |
+| E19 `d64047bf`, `642b74f7`, `baeb4515` | egui-winit/egui | Latin layout chars | Shortcuts on non-Latin layouts | Keep; Windows/Linux layout test |
+| E20 `23955535` | egui | widget text language | RTL/localized widget text | Keep; RTL widget screenshot |
+| E21 `a70470b0` | egui-winit/egui | IME `DeleteSurroundingBytes` | macOS/Wayland IME | Keep; IME test |
+| **E21b/P7b** | egui, egui-winit, winit W27 | outgoing IME surrounding text; confirmed missing at candidate `a4f9a17f` | Custom FigCraft text editor and Wayland predictive IME | Required new prerequisite; see 6.5. Not existing E21 capability |
+
+Removal rule: a row may be removed only after an upstream release in use contains the same fix and
+the app tests pass against that release. Do not remove an unrelated fork fix because FigCraft does not
+exercise it directly; the fork is shared across the suite.
+
+Optional new provenance patches, only if measurements require them:
+
+- **E22 text tessellation (#8731):** upstream reports ~61% more instructions per plain-text
+  `tessellate` in 0.37. If FigCraft's three-way text-heavy benchmark exceeds the threshold, carry
+  the issue's row-level fast path with author/provenance recorded, plus a pixel/vertex/index
+  equality test for mixed and color rows. Do not change color-glyph semantics.
+- **E23 DX12 shader compile (#8736):** upstream reports ~40 ms extra pipeline creation on FXC. If
+  Windows startup exceeds the threshold, carry a float/`select` implementation (not clamp-only)
+  that preserves clamp/repeat/mirrored-repeat and color-glyph filtering, with startup and image
+  tests. A pipeline-overridable constant is acceptable only if it compiles on all backends.
+- **E24 TextEdit click-away (#8763 / PR #8764):** #8763 is the issue; #8764 is an unmerged proposed
+  fix, not released behavior. If FigCraft's fields or text-selection actions reproduce the 0.37
+  selection collapse, carry the reviewed fix or add the app-level regression test. A necessary app
+  workaround must preserve the range and undo semantics and have its own removal condition.
+- **E25 hidden deferred windows (#8748):** #8748 is closed and unmerged. Prefer the 0.37
+  `RequestPaintWhileHidden` path in FigCraft's window reconciliation before adding a fork patch.
+  If a child cannot be created, updated or closed while the root is hidden, record the failing test
+  and then adopt a reviewed fork fix with provenance; do not treat #8748 as available behavior.
+
+## 6. Concrete API and behavior migration
+
+### 6.1 Mechanical compile/deprecation changes
+
+| File / symbol | Current | 0.37 change | Reason / test |
+|---|---|---|---|
+| throughout `crates/ui-egui`, `apps` | `egui::Id::new(x)` (443 uses) | `egui::Id::unique(x)` | 0.37 deprecates `Id::new`; same fixed-seed hash. `cargo clippy -D warnings` fails otherwise |
+| 63 uses, e.g. `tabs.rs`, `layers.rs`, `right.rs`, `widgets.rs` | `ui.id()` | `ui.scope_id()` | Renamed; same scope ID |
+| any `UiBuilder::new().id(...)` (none found now) | `.id(id)` | `.scope_id(id)` | Deprecated; verify by grep after codemod |
+| `crates/ui-egui/src/dialogs.rs` `tab_strip` | `WidgetType::SelectableLabel` | `egui::Role::Button` | `WidgetType` survives as deprecated `pub type WidgetType = Role`; only `SelectableLabel` is gone |
+| `crates/ui-egui/src/dialogs/credits.rs` `sort_header` | `WidgetType::Button`/`Label` | `egui::Role::Button`/`Role::Label` | Same mapping; aliases may compile but should not produce warnings |
+| `crates/ui-egui/src/control.rs` `ui.input` scroll branch; 11 test files | `Event::MouseWheel { unit, delta, phase, modifiers }` | add `source: egui::MouseWheelSource` | Use `Wheel` for synthetic wheel input, `Unknown` where unspecified |
+| `crates/ui-egui/src/canvas/frame_labels.rs` `turn` | exhaustive `Shape` match | add `Shape::Band(_)` | 0.37 `BandShape`; label drawing never adds one, leave it unchanged with a comment or rotate via its `angle` if a Band ever appears |
+| `crates/ui-egui/src/panels/typography.rs` `font_picker` | `shown.state.offset.y` | `shown.state.clamped_offset().y` | `State::offset` private/deprecated; `clamped_offset` is the drawn position |
+| `crates/ui-egui/src/control.rs` `PendingShot`/`drain` | polls `Event::Screenshot` | capture-slot callback | API removed; see 6.3 |
+| tests in `idle_tests.rs` | synthetic `Event::Screenshot` | complete a test capture slot | API removed |
+
+Codemod safety:
+
+- `Id::unique` and `Id::new` use the same hash; no persisted state changes. `Ui::scope_id` and
+  `Ui::id` are the same value.
+- Do not replace tuple salts with formatted strings.
+- After the codemod, grep for `Id::new`, `Ui::id(`, `UiBuilder::id(`, `SelectableLabel`,
+  `Event::Screenshot`, `UserData`, `State.offset` and ensure only intentional comments remain.
+- Run `cargo fmt` and `cargo clippy --workspace --all-targets --locked -- -D warnings`; a clean
+  `cargo check` is not enough because deprecations are warnings.
+- F2 adds `egui_kittest` 0.37 as a dev-dependency for the accessibility/focus smoke tests, using
+  strict missing-name behavior and the default missing-glyph policy from its first commit. Only a
+  deliberate arbitrary-script fixture may opt into `MissingGlyphPolicy::Tofu`; it must not mask a
+  production glyph gap and is not a substitute for the pinned fixtures in 6.6. If kittest adoption
+  is deferred, equivalent custom assertions must still fail on unnamed controls and missing glyphs;
+  a green suite that silently draws tofu is not accepted.
+
+### 6.2 Panel IDs, saved state and accessibility focus order
+
+0.36 `Panel::left("left_panel")` used `Id::unique("left_panel")`. 0.37 `Panel::left` takes
+`impl AsIdSalt` and computes `parent_ui.scope_id().with_salt(IdSalt::new("left_panel"))`
+(`crates/egui/src/containers/panel.rs` at the final source). FigCraft's
+`crates/ui-egui/src/a11y.rs::focusables` currently excludes the old panel resize IDs, but its
+panels are `.resizable(false)` (`crates/ui-egui/src/lib.rs`) so egui creates no
+`left_panel.__resize`/`right_panel.__resize` widgets at all. The real custom edges are:
+
+```rust
+// crates/ui-egui/src/lib.rs::panel_edge
+let id = egui::Id::new(("panel_edge", name)); // "left" / "right"
+let resp = ui.interact(rect, id, egui::Sense::click_and_drag());
+```
+
+`Sense::click_and_drag()` includes `FOCUSABLE`, so these edges can enter the F6/Tab order today.
+The fix is:
+
+- Make the custom edge non-focusable with `egui::Sense::CLICK | egui::Sense::DRAG` (keeping hover,
+  click and drag behavior), and also exclude the exact IDs
+  `Id::unique(("panel_edge", "left"))` / `Id::unique(("panel_edge", "right"))` from
+  `focusables` as a defense-in-depth assertion.
+- Do not derive or test `Id::new("left_panel").with("__resize")` as the live edge; that is dead
+  code while FigCraft's panels are non-resizable. If a future PR enables `Panel::resizable(true)`,
+  derive the real resize ID from the recorded root `Ui::scope_id()`:
+  `root_scope.with("left_panel").with("__resize")`, and test it.
+- Record the root scope in `a11y::begin` from the passed root `Ui` (change the call from `&ctx` to
+  the root `&Ui`/`ui.scope_id()`) so a future enablement is testable without guessing a global ID.
+
+Panel widths come from `prefs.panel_widths` and `fit_panels`. Both panels are
+`resizable(false).exact_size(...)`; eframe persistence is off. There is no durable egui
+PanelState to migrate, and copying it cannot affect fixed geometry. Preserve actual preference
+save/reopen and test root-scoped IDs plus geometry/edge hit tests; remove the invented migration.
+AccessKit assertions use roles/names rather than raw IDs.
+
+### 6.3 Screenshot callbacks, correlation and automation confinement
+
+Current `crates/ui-egui/src/control.rs`:
+
+- `PendingShot` stores `id`, `path`, `reply`, `since`, `viewport`.
+- `drain` scans `ctx.input` for `Event::Screenshot` and completes every pending shot for that
+  viewport in arrival order.
+- `shot_reply` encodes PNG and writes via `figcraft_engine::file_access::write`.
+- `idle_tests` manufactures `Event::Screenshot`; `windows_tests` only tests the hidden-window error.
+- `apps/figcraft/src/control_server.rs` marks the request cancelled after the transport timeout, but
+  `PendingShot` does not retain that flag and `drain` only checks `now - since < SHOT_TIMEOUT`.
+
+0.37 replaces the event with a one-shot `ScreenshotCallback`; `UserData` and `Event::Screenshot`
+are gone. The callback receives `Arc<ColorImage>` and does not request a repaint. Design:
+
+1. Implement the suite capture contract locally in `crates/ui-egui/src/control.rs`, using the
+   reviewed CL-2/CL-2F semantics and conformance cases. FigCraft, DeckCraft and ArtCraft Native
+   have local adapters; eleven existing craft-ui consumers share its helper. The local slot owns one result per admitted request and
+   exposes a weak handle to the callback; the callback holds only a `Weak` reference, never a strong
+   `Context`/app/queue, so a late capture cannot retain the app through shutdown.
+2. On request, FigCraft records its own `ShotRequest { id, path: Option<String>, reply, deadline, serial, viewport,
+   document_generation, capture_spec }` and admits it only if:
+   - the capture is for a live viewport and document generation;
+   - the request count and aggregate pending bytes are within the app budget;
+   - the `CaptureSpec` records capture-time logical viewport rectangle, pixels-per-point, zoom and
+     expected surface size. Revalidate before issuance after resize/DPI changes.
+3. `ui.screenshot` sends `ViewportCommand::Screenshot(ScreenshotCallback::new(...))` to the target
+   viewport (`send_viewport_cmd_to` for a child; `request_screenshot` for the current one). The
+   callback performs only `slot.try_complete(image)`; no PNG encoding, file I/O, command, lock held
+   across wakeup, or mutable app access.
+4. The completion slot stores the image and a `CancelToken` copied from
+   `ControlRequest.cancelled`. It must release its lock before waking the owning viewport. Wake with
+   `Context::request_repaint_of(capture_spec.viewport)`, never a bare `request_repaint()` from a
+   detached callback; a stored `Context` clone is held only by the live slot and is dropped with the
+   request. A live request requires an owning-viewport waker; fail admission if none exists, rather
+   than waiting indefinitely for an unrelated frame.
+5. On the UI thread, `control::drain_ui` takes completed slots, rejects cancelled/timed-out/stale
+   generations, validates image dimensions against the capture spec (or returns a documented scale
+   mismatch error), matches by serial and calls `shot_reply` **inside the existing
+   `windows::guard` / `file_access::confinement`**. A late callback after timeout or close drops its
+   image without writing or replying; a reused viewport ID cannot bind an old capture to a new
+   document.
+6. Admission bounds aggregate image bytes, not only the number of requests: reserve
+   `surface_pixels × 4` (plus a declared margin) before issuing, cap request count independently,
+   and release both on completion/cancel/timeout. After drain/shutdown the retained pending image
+   bytes must be zero. A post-callback size check alone does not bound peak memory.
+7. Time out unfinished serials as today (transport timeout and `SHOT_TIMEOUT`), cancel the slot and
+   send the same error once. Handle channel-disconnect as cancellation.
+
+Required tests:
+
+- Two requests in one frame complete in reverse order; each reply carries its own request ID/path,
+  correct dimensions and capture-time DPI/geometry metadata.
+- Cancel before callback, callback after timeout, window close, document replacement, viewport
+  reuse, and a child-viewport capture: no stale file write/reply, wakeup reaches the captured
+  viewport, and retained bytes return to zero.
+- Aggregate admission rejects an oversized/concurrent batch before issuing, then accepts a smaller
+  request and releases memory after drain.
+- A path outside the automation write root is rejected when completed from the slot; a callback
+  outside the roots cannot write.
+- Admitted hidden/minimized screenshot or injected-input requests remain queued; logic
+  sends `RequestPaintWhileHidden` through settling until UI consumes them. The prior
+  screenshot error is returned only on deadline expiry if no paint arrives, exactly once.
+  This intentionally replaces immediate hidden rejection for these two control methods.
+- A translucent pixel round-trips straight RGBA; premultiplied alpha is not darkened.
+- The callback never holds a strong `Context` cycle; dropping the app/pending list releases slots
+  and a late callback is a no-op.
+
+Do not use `Event::Screenshot` polling anywhere. Do not put PNG encoding or path resolution in the
+callback.
+
+Preserve both `shot_reply` branches: Some(path) writes through the automation-root guard;
+None returns `{format:"png", width, height, data}` with base64 PNG. Test path-less capture
+under restricted roots and compare decoded pixels, without inventing a filesystem requirement.
+Use the suite's 4-request, 128 MiB/image, 256 MiB in-flight/completed image budget, checked
+arithmetic and reject-before-issue behavior. Encode one result at a time with a bounded PNG
+writer (128 MiB output cap); reserve checked `4 * ceil(png_bytes / 3)` base64 bytes before
+encoding, and cap queued encoded replies at 256 MiB. Return a structured size/busy error instead
+of an unbounded encoding allocation. Account scratch/readback RSS separately. Test boundary,
+one-over, overflow, late/cancel and zero retained/queued bytes. Geometry follows the suite's
+issuance epoch validation: pixels-only callback, target UI logical content rect, reject any
+intervening resize/DPI/zoom/surface change and derive scale from returned dimensions.
+
+### 6.4 Frame driver: background work, UI setup, first pass and hidden logic
+
+#### Target structure
+
+Keep the existing `FigApp::ui(&mut Ui)` root entry and split it into a phase-safe background tick and
+a visible UI setup. Names are proposals, not existing APIs:
+
+```rust
+pub(crate) struct FrameClock { /* monotonic origin + injected test time */ }
+
+impl FigApp {
+    /// Consumes queued work/deadlines; safe from App::logic (run_ui or run_logic) and direct tests.
+    pub(crate) fn background_tick(&mut self, ctx: &egui::Context, clock: &mut FrameClock);
+
+    /// Fonts/theme/zoom/render worker and per-frame stats; first pass of a visible frame only.
+    fn ui_setup(&mut self, ui: &mut egui::Ui);
+
+    /// Direct-harness entry: runs the background tick if App::logic did not, then setup + draw.
+    pub fn ui(&mut self, ui: &mut egui::Ui) {
+        if !std::mem::take(&mut self.logic_ticked) {
+            self.background_tick(ui.ctx(), &mut self.clock);
+        }
+        let stamp = (ui.ctx().viewport_id(), ui.ctx().cumulative_frame_nr());
+        if ui.ctx().current_pass_index() == 0 && self.ui_frame_stamp != Some(stamp) {
+            self.ui_frame_stamp = Some(stamp);
+            self.ui_setup(ui);
+        }
+        self.frame(ui);
+    }
+}
+```
+
+`background_tick` owns only phase-safe app-global work:
+
+- drain state-only control requests; admitted screenshot/injected-input `NEEDS_FRAME`
+  requests stay queued for the next forced UI pass, never errored just for logic-only
+  execution. `window.new` retains its explicit hidden error as a separate app policy;
+- live `session.live_poll()` and `background_done` (consumed queue/revision identity);
+- recovery tick and autosave checkpoint/scheduling/save-thread joins, driven by monotonic deadlines;
+- plugin/live preference persistence triggered by consumed dirty flags;
+- title/close/recovery requests that must happen while hidden;
+- prototype/after-delay/GIF state advance using monotonic deadlines (once per due deadline, not
+  once per callback), with drawing left to `present::show`.
+
+`ui_setup` owns only UI-phase work that needs a real current `Ui`:
+
+- `ctx.options_mut(|o| o.zoom_with_keyboard = false)` once at startup;
+- fonts/theme/language and `cjk_needed` (event scan) on the first visible pass;
+- `ctx.content_rect()`/`ctx.set_zoom_factor` and `ui.ui_scale` using the actual current geometry;
+- `render_worker::Worker::new` and `FrameStats::record` once per visible root frame, not per pass;
+- the first-font-frame `skip_draw` flag: draw nothing, request repaint, and let the next frame draw.
+
+`FrameStats::record` and `ui.inspect {framesDrawn, repaintCauses}` count frames, not passes. A
+first-pass guard is used only for `ui_setup`; it is not a command or queue guard.
+
+#### Callback wiring
+
+- `apps/figcraft/src/main.rs::App::logic` calls
+  `with_app(|fig| windows::guard(fig, ctx, |fig| fig.background_tick(ctx, &mut clock)))` on every
+  callback. Wrapping in `windows::guard` preserves `file_access::confined` automation roots and
+  panic recovery for autosave/recovery/preference writes. Set `fig.logic_ticked = true` when the tick
+  ran.
+- `App::ui` calls `fig.ui(ui)` through the existing `windows::guard` wrapper.
+- `FigApp::ui` runs the background tick only when `logic_ticked` is false (direct harnesses), then
+  `ui_setup` on pass 0, then `frame`.
+- `windows::draw` calls a new `child_logic(ctx, id)` for per-viewport state (focus, close request)
+  and **not** the app-global `background_tick`. The root frame is the single owner of global
+  autosave/live/recovery/background work; a visible child in the same native frame must not repeat
+  it. Child `frame` keeps its existing `windows::guard` boundary.
+- `FigApp::frame` calls `control::drain_ui` (UI-capable requests queued by the background tick and
+  any screenshot completions) instead of the old all-methods `control::drain`. A state-only request
+  arriving between passes is consumed by the next `App::logic` call; fresh work is never starved by
+  a nonzero pass index.
+- `Context::run_logic` does not advance `cumulative_frame_nr`; do not use it as a per-frame identity.
+  Repeated hidden ticks are expected and must be safe because their queues/deadlines are
+  consumption- or deadline-driven.
+
+#### Hidden/logic-only rules
+
+- `Context::run_logic` leaves input events, time and layout stale. `background_tick` must not call
+  `cjk_needed` (event scan), `shortcuts::handle`, `a11y::begin`, `swallowed_paste`, or any code that
+  consumes pointer/key events. It may drain state-only control requests and use commands that do
+  not read UI input.
+- Do not infer phase from `ViewportInfo::visible()`, minimized/occluded state, or a remembered pass
+  index. A forced hidden `run_ui` has current input and real geometry; a `run_logic` callback does
+  not.
+- Use `FrameClock` based on `web_time::Instant` for autosave, recovery and playback deadlines in
+  both paths. In UI phase, `ctx.input(|i| i.time)` may be recorded for diagnostics, but deadlines
+  never come from stale input time. Tests inject a fake clock.
+- Prototype timers, after-delay actions, animated transitions and GIF frame clocks advance from
+  `background_tick`, not only `present::show` or canvas drawing. Split the existing timer/action code
+  in `crates/ui-egui/src/present.rs::show` (and the canvas GIF clock) into a non-drawing step called
+  by the tick; `show` only draws the state the tick produced. Hidden logic must not advance the same
+  deadline twice; the visible pass must not re-run delayed actions.
+- Timers must schedule a wake-up even while hidden (`request_repaint_after`/eframe's logic-only
+  path), otherwise autosave, recovery and live polling stop when no frame paints. Test that a
+  hidden `run_logic` at the deadline runs the tick once, not zero and not twice.
+- If a background completion would open a dialog or touch UI-only state while hidden, queue a
+  visible-only action instead of mutating a pane not swapped in. Commands that need a drawn frame
+  (`ui.screenshot`, `ui.input`) remain queued with deadline and request hidden paint.
+  Only `window.new` retains its existing explicit error in logic-only mode. Keep one
+  injected gesture step in flight across repeated logic ticks until UI applies it once;
+  do not combine press/move/release before that pass or replay events after discard.
+- Hidden child windows: root logic may need to reconcile deferred viewports. If a child must be
+  created/updated/closed while the root is hidden, send `ViewportCommand::RequestPaintWhileHidden`
+  from root logic and let the root UI run without presenting. Add a hidden-root/visible-child test.
+  #8748 is closed/unmerged; do not assume the child behavior exists without this probe or a reviewed
+  fork fix.
+
+#### Multi-pass and side effects
+
+- `Context::run_ui` may call the closure more than once if `request_discard` is used. `App::logic`
+  runs once per pass too. Therefore every `background_tick` operation must be idempotent by consumed
+  queue, revision/generation or monotonic deadline. A global first-pass guard must not suppress a
+  fresh control request or a background completion that arrives between passes.
+- User actions are dispatched through an explicit one-shot action queue/token, not by gating all
+  commands on a pass index. Each interactive widget queues an `ActionToken` carrying the viewport,
+  frame number, source widget ID and command; `FigApp::frame` drains the queue once per token and
+  calls `run`/`run_user`/`set_props`. Reads and drawing remain per-pass. `FigApp::run` and
+  `set_props` do not receive a `Context`, so they cannot and must not read
+  `current_pass_index()`.
+- Test a sizing pass (`ctx.request_discard()` once) while clicking a command button: one action, one
+  undo entry and one command result. Deliberately replay the same token in the second pass: the
+  dedupe must prevent a second undo. Also test that a command/background completion produced during
+  pass 1 is still applied (the guard is not a global starve).
+- Undo/redo remains engine-owned; no UI-side transaction may span passes.
+
+### 6.5 MouseWheel, input, IME/E21b, RTL, clipboard and PRIMARY
+
+- Add `source: MouseWheelSource` to every construction. `control.rs` synthetic scroll uses
+  `Wheel`; unit tests use `Unknown` unless testing source-sensitive scroll behavior.
+- `Event::PasteImage` and `Event::MiddleClickPaste` are new but optional for FigCraft; do not replace
+  the existing arboard/WebServices paths without a regression test. The canvas paste path must still
+  accept image bytes and the browser's `paste` event.
+- **PRIMARY:** E4's regular Wayland clipboard is not enough. The selected design is winit-owned
+  PRIMARY on the existing connection/event queue and per-seat lifecycle, using SCTK 0.19.2
+  `PrimarySelectionManagerState`/device/source/offer; do not bind a second regular
+  `wl_data_device`. W15P lands and is reviewed before the E4 P2b integration stage. FigCraft must
+  keep password exclusion, not reclaim an unchanged selection, and test pointer/keyboard triggering serials (including keyboard-only focus), per-seat origin/freshness, serial
+  freshness, owner/seat changes, empty/absent offers, self-paste and canceled/slow transfers on
+  wlroots/KWin/Mutter. arboard is only a measured fallback if W15P cannot meet a proven requirement;
+  a documented unsupported limitation needs explicit acceptance, not a compile-only sign-off.
+- IME incoming: 0.37 changes composition visuals and deletion. Keep E6/E21; run `ime_tests` and add
+  a delete-surrounding-bytes test asserting one undo step. The engine text edit state and egui
+  `TextEdit` state must not double-apply commits.
+- **E21b/P7b outgoing surrounding text:** the candidate `egui-winit` never calls
+  `WindowExtWayland::set_ime_surrounding_text`, and `egui::IMEOutput` has no logical text. Add the
+  bounded transient payload (at most 4000 UTF-8 bytes) to `IMEOutput`, preserving Clone/Debug/Eq,
+  excluding it from serialized/debug persistence, with committed logical text, cursor/anchor byte
+  indices and owning widget/viewport identity. Built-in `TextEdit` produces it after applying
+  delete/commit/cursor updates, excluding preedit and remapping indices; a selection that cannot
+  fit returns explicit unavailable/empty context, never a truncated “complete” context. Password
+  fields emit no text; focus/reset/normal-to-password/no-IME transitions clear backend state.
+  `egui-winit` sends it on text/selection/owner changes through W27 on Wayland only; per-window
+  caching must not bleed across widgets/windows. PlatformOutput append keeps the final IME output
+  and payload together across passes.
+- **FigCraft's custom editor adapter:** `crates/ui-egui/src/shortcuts.rs::ime_output` currently
+  emits only purpose/rect/cursor_rect/interruption (around line 552). It must supply the real model
+  adapter: committed document text for the edited node, preedit removed, caret/anchor converted from
+  the engine's character/scalar coordinates to UTF-8 byte indices, bounded to 4000 bytes, with
+  explicit unavailable when the selection is too large. Use logical text, never the display-bidi
+  string from `bidi.rs`. This adapter is part of the atomic F2 compatibility stage, not a `None`
+  placeholder.
+- IME tests: outgoing text changes immediately after delete+commit and deletion-only batches;
+  scalar/grapheme vs byte indices; supplementary emoji/combining/RTL logical order; preedit
+  exclusion and caret movement; long selection/window limits; same-window field switch; two
+  windows; focus loss/reset/late serial; password/no-context clears; multi-pass final-output
+  selection. Native Wayland Vietnamese/predictive IME verifies the protocol trace and editor
+  content/undo; macOS NSRange remains W26's separate path.
+- RTL/bidi: E5/E12/E13/E16 change caret/hit/row order. The fork now shapes logical text. FigCraft's
+  `bidi.rs` currently pre-reorders names with `figcraft_text::display` and draws cluster sections so
+  egui's old shaper does not reverse them again. After E5/E12, remove double processing where egui
+  manages the widget; keep only deliberately custom painting that needs visual-order metadata.
+  Never pass a display-reordered string to egui shaping, `TextEdit`, clipboard, AccessKit names,
+  save, or E21b surrounding text; those boundaries use the logical document string. `rtl_names_tests`
+  and a mixed-logical/clipboard/IME test must pass. Any cache keyed by `FontId` must account for
+  `FontFamily::Name` and `LayoutJob::direction`. Do not delete `bidi.rs` until E5/E12 tests prove the
+  fork covers FigCraft's custom name painting.
+- Accessibility language: call `ctx.set_language(i18n::current().map(|l| l.code.to_string()))` in
+  `ui_setup` (fork E17). Assert the AccessKit root node's language changes with the UI language.
+  This is optional only if the final pinned fork lacks E17; do not use a nonexistent upstream API.
+- `Ui::label_inputs_by` / `Response::accessible_name` are available in 0.37; use them only where
+  FigCraft currently has unnamed native widgets. Custom `a11y` node builders remain.
+- Shared `DockArea` direction: FigCraft keeps its own panels and does not adopt `craft-ui`'s
+  `DockArea`. If a future PR does, it must pass an explicit opt-in `DockDirection`, preserve the
+  serialized physical splits/rectangles and logical tab order, and use the same rectangles for
+  painting/hit/drag/keyboard with bottom-trailing resize grips. FigCraft must not reverse saved
+  panel order or feed display-bidi text to the shared dock.
+
+### 6.6 Fonts and glyph coverage
+
+- `crates/ui-egui/src/theme.rs::install_fonts` starts from `FontDefinitions::default()`. With egui
+  default features empty, that is `FontDefinitions::empty()` unless the app/UI crate enables
+  `default_fonts`. Declare production fallback policy explicitly. The proposed 0.37 kittest
+  dev dependency does not transitively enable fonts: only kittest's own dev-dependencies do.
+  Explicitly enable `default_fonts` and `monochrome_emoji_fonts` on FigCraft's egui test
+  dependency for these fixtures. Audit UI-library/test/native/web graphs independently.
+- Keep the optional `CRAFT_FONTS_DIR` build input. Record whether each baseline/candidate run had
+  craft-fonts and its exact ref; a no-craft-fonts run is valid for CI but not for a font-metrics
+  comparison.
+- Keep `script_fonts`, `cjk_needed`, `bidi::script_fallbacks`, `key_symbol_fallbacks` and the
+  “English users load none” behavior. Tests: an English first frame installs no extra script face;
+  a CJK name adds the expected face; shortcut symbols (⌘⌥⇧↵) have glyphs; a font-picker preview
+  renders with the selected family.
+- If `system_fonts` is evaluated later, test color emoji and arbitrary scripts, and record startup
+  cost. Do not replace FigCraft's deterministic fallback with a blanket font provider in this
+  migration.
+- Preserve the first-font-frame behavior: when `ui_setup` installs fonts for the first time, set a
+  `skip_draw` flag; `FigApp::ui` requests a repaint and returns without drawing. Do not draw one
+  frame with missing fonts.
+- 0.37 changed text layout/font versions. Pixel/width tests may shift by subpixel amounts. Inspect
+  each difference; do not auto-update expected widths. The document renderer still uses FigCraft's
+  own harfrust/skrifa stack, so UI and canvas text may legitimately differ.
+- **Pinned licensed fixtures (egui plan section 10.6):** fetch
+  `craft-fonts` at `2481a8a324b986a45954e90045ed1f8f2efaaf3c` as a test resource and keep the
+  repository's central-font policy (no font binaries committed here). Required fixture files,
+  hashes and licences:
+  - Arabic `fonts/noto-sans-arabic/NotoSansArabic.ttf`, SHA256
+    `63111b5b2e074dd48cc67692e0a2726d86ee94c1c37fe8598257b7b4e87e869e`, OFL-1.1.
+  - Thai `fonts/noto-sans-thai/NotoSansThai.ttf`, SHA256
+    `5a1c559bb539583c8a1fd99d1c5b9491e5e14478c9cd2bd0970d5c3096cc9ef8`, OFL-1.1.
+  - CJK SC/Latin `fonts/noto-sans-cjk-sc/NotoSansCJKsc-Regular.otf`, SHA256
+    `2c76254f6fc379fddfce0a7e84fb5385bb135d3e399294f6eeb6680d0365b74b`, OFL-1.1.
+  - Japanese `fonts/biz-ud-pgothic/BIZUDPGothic-Regular.ttf`, SHA256
+    `258d7156c165f2ff774b6efee637c22c3b950de0d8a10e501137061bc8085d01`, OFL-1.1.
+  - Hebrew Noto Sans Hebrew variable font, SHA256
+    `7ef36a2c3593758cdb622e1bdef4f84523e92fbc3ccc667438dd80ff54c2de88`, OFL-1.1, fixed to
+    weight 400/width 100.
+  - Color glyphs: Noto Color Emoji v2.047, SHA256
+    `39ee3c587e10e89669b9ff32703261d10d5f9c4dd5ad147b6b5a1c5200591817`, OFL-1.1. This
+    fixture is used only in the `epaint/color_fonts` feature job; the normal build makes no
+    color-emoji claim.
+  Preserve the adjacent licence files in the evidence/fixture bundle. If a fixture cannot be
+  fetched, record the font-dependent test as unresolved; do not silently rely on host fonts.
+- If a controlled Latin/emoji comparison is needed, use the exact `epaint_default_fonts` files and
+  hashes from the pinned baseline/candidate, not whatever the host provides. The normal CI
+  no-craft-fonts job still runs and must not become a font-metrics gate.
+
+### 6.7 Panels, windows, viewports and GPU
+
+- Panels: keep the root order in `crates/ui-egui/src/lib.rs::frame` (left rail, left panel, right
+  panel, central, then custom `panel_edge` overlays). 0.37 panel constructors accept `AsIdSalt` and
+  include separator width; test `fit_panels`, `panel_width_tests`, canvas minimum and hit testing.
+  Do not replace the custom edge drag with `Panel::resizable` without a UI3 geometry comparison.
+- Clip/nesting: keep the root `Ui` and `scope_builder("toolbar")` nesting; custom overlays keep
+  their own `with_clip_rect` calls. 0.37 keeps `clip_rect_margin` as a deprecated unused field;
+  remove the use rather than expecting a compile error, and test that panel content does not paint
+  over the canvas, popups/menus and drag ghosts stay in their intended layers, and hit rects match
+  what is visible.
+- Docking: FigCraft does not use `craft-ui` docking; do not add it as part of this migration. The
+  capture completion slot stays local. If a future PR adopts `DockArea`,
+  follow the explicit direction policy in 6.5.
+- Child windows: keep `windows.rs` deferred viewports and pane swapping. 0.37 adds
+  `RequestPaintWhileHidden`; use only for reconciliation when a child must appear/update/disappear
+  while the root is hidden. Keep `embed_viewports` and the screen-reader tab fallback until
+  per-viewport AccessKit is proven.
+- Title bars: `craft-window` decides `TitleBar::Native/Inset/Custom`; `window_chrome` maps to
+  `ViewportBuilder`. 0.37 keeps these builder methods. macOS traffic-light positioning is not
+  changed without a Mac; `Frame::set_traffic_lights_position` is available if later measured.
+- GPU: `apps/figcraft/src/graphics.rs::backends/configure` still mutates
+  `WgpuConfiguration`/`WgpuSetup::CreateNew(create).instance_descriptor.backends`; verify compile
+  and preserve DX12-then-GL on Windows. E2/E3 stay. Measure `Renderer::new`/first frame on Windows
+  DX12; do not report compile time as UI performance.
+- Texture deltas: eframe owns upload/free of `textures_delta`; app code must not drop them. The
+  0.37 glyph atlas and color-glyph path change atlas contents and filtering. Keep
+  `TextureOptions::LINEAR` and clamp/repeat/mirror behavior where used; test a translucent image and,
+  only in the `epaint/color_fonts` job, a color-glyph fixture. Do not use clamp-only as a
+  performance “fix” (#8736).
+
+## 7. Test and regression plan
+
+### 7.1 Repository gates through `task.py`
+
+Read `/home/codex/work/maintenance/TASK-JOBS.md` before the first submission. Every future
+fmt/clippy/test/benchmark is a new job on one FigCraft task; a fresh target is allocated once, and
+`finish` is applied only after all checks, GUI workflows and evidence preservation are complete.
+Example template (do not run during planning):
+
+```sh
+TASK=figcraft-egui037-migration
+SRC=/home/codex/work/CraftApps/egui037-migration-20261022/figcraft
+EV=/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/figcraft-validation
+
+python3 /home/codex/work/maintenance/task.py run \
+  --job-id "$TASK-ci-01" --kind build --task "$TASK" \
+  --source "$SRC" --evidence "$EV" \
+  -- cargo xtask ci
+python3 /home/codex/work/maintenance/task.py status "$TASK-ci-01" --tail-bytes 8192
+
+# One new job ID per intentional command, same task/source/evidence:
+python3 /home/codex/work/maintenance/task.py run \
+  --job-id "$TASK-ui-tests-01" --kind build --task "$TASK" \
+  --source "$SRC" --evidence "$EV" \
+  -- cargo test --locked -p figcraft-ui-egui
+python3 /home/codex/work/maintenance/task.py status "$TASK-ui-tests-01" --tail-bytes 8192
+```
+
+After review and evidence preservation, inspect `task.py finish JOB_ID`, then apply with
+`--apply --owner-confirmed --checks-complete --evidence-preserved` and poll status. The payload after
+`--` may be `cargo fmt --all -- --check`, clippy, workspace tests, `xtask layers/assets/wasm`, or a
+targeted suite, but never a direct host command or a nested build driver. `cargo xtask ci` is
+equivalent for the repository; run individual payloads when evidence must identify a failing gate.
+`cargo test --workspace` builds without craft-fonts in CI; a with-craft-fonts configuration is a
+separate job and records the exact font ref/hash.
+
+Targeted suites, each its own job: `figcraft-ui-egui`, `figcraft-engine`, `figcraft --bin figcraft`,
+`figcraft-web`, `figcraft-cli`. Then native Windows x64 and wasm workflows. macOS/FreeBSD remain
+unresolved unless real evidence is available; a compile-only result is not a platform pass.
+
+### 7.2 New/updated regression tests
+
+| Test area | Assertion | Mutation / broken probe that must make it fail |
+|---|---|---|
+| Native/web lifecycle | Visible single and multipass: `App::logic` runs per pass, background work is idempotent; `ui_setup` runs once on pass 0; completed `run_ui` leaves pass index 0 | Remove the idempotence/consume guard: duplicate autosave/live work must be detected. Add a test that expects a stale nonzero pass index: it must fail |
+| Hidden logic | Repeated `run_logic` after a completed multipass calls `background_tick` each time (pass index 0), advances deadlines once per due instant, never consumes UI events, never runs `ui_setup` | Suppress background work on pass index alone: hidden/fresh-queue test fails. Call `cjk_needed`/`shortcuts` in logic-only: stale-event test fails |
+| Forced hidden UI paint | `RequestPaintWhileHidden`/full hidden pass runs `App::logic` + `App::ui`; `ui_setup`/input handling work because it is a real `run_ui`; visibility flag is not used to choose phase | Infer `LogicOnly` from `visible()==false`: hidden-paint setup test fails |
+| Restore/buffered input | Restore with buffered events dispatches one gesture once; a background completion between passes is not starved | Gate all commands on pass 0: completion/action test fails |
+| Multi-pass commands | A `request_discard` sizing pass executes one queued action, creates one undo entry, returns one result; replaying the same action token does nothing | Remove token dedupe: duplicate history entry must fail |
+| Two windows/two viewports | Root plus visible child in one native frame: one app-global live poll/autosave/recovery/background completion, not one per child | Remove child/global split: two-window duplicate test fails |
+| Panel IDs/a11y | Actual `Id::unique(("panel_edge","left"/"right"))` is absent from `focusables`; F6/Tab never focuses it; the next control gets focus; panel geometry unchanged | Revert to `Sense::click_and_drag()` or the old `left_panel.__resize` filter: focus test fails on the real ID |
+| Fixed panel geometry | Left/right fixed sizes and preferences remain identical with fresh or legacy egui memory; no persisted PanelState migration | Make a fixed panel resizable or alter its width: geometry assertion fails |
+| Screenshot correlation | Two requests, reverse completion, each reply has its own ID/path/image/spec; callback outside automation roots rejected; hidden screenshot queues then paints or expires once | Match by viewport only or encode on render thread: cross-reply/root test fails |
+| Screenshot cancellation/lifetime | Cancel-before-completion, timeout then late callback, window close, viewport reuse, document replacement: no file/reply; child wakeup reaches captured viewport; aggregate bytes return to zero | Strong callback context or unbounded queue: leak/retained-bytes test fails |
+| Screenshot alpha | Translucent pixel round-trips straight RGBA; premultiplied alpha not darkened | Use premultiplied bytes directly: pixel assertion fails |
+| Accessibility | Roles/names for toolbar, panes, tabs, tree items, spin buttons, combo boxes; root language; every input has a name; strict kittest missing-name/glyph failure on a new unnamed/tofu fixture | Remove a node label/role or opt into tofu silently: named-control/glyph assertion fails |
+| Fonts/glyphs | English loads no extra face; CJK name adds one; shortcut symbols and font-picker preview have glyphs; no tofu in pinned fixture; no-craft-fonts CI still runs | Disable `default_fonts` or rely on host fonts: glyph/panic test fails |
+| Input/IME/E21b | Mouse wheel source; IME commit/delete one undo; outgoing surrounding text after delete+commit and deletion-only; preedit excluded; UTF-8 byte indices; long selection unavailable; focus/password clear; two windows | Set payload `None`, omit preedit remap, or pass display-bidi text: protocol/editor test fails |
+| RTL/logical boundaries | Bidi caret/hit/row order; clipboard, AccessKit name, save and IME use logical text; no double reversal with E5/E12 | Feed display text to shaping/clipboard/IME: logical-boundary test fails |
+| Commands/undo/save | Rectangle/text edit → undo restores exactly; save/reopen compares `document.inspect`; no changed command ids/parity | Skip history snapshot/change save order: hash/inspect mismatch |
+| Geometry/screenshots | 1440×900 and 800×500: panel widths, canvas min, toolbar/tab hit rects, scale factors 100/125/150/200%; PNG dimensions and stable non-empty regions | Move a panel edge or change separator width: exact geometry assertion fails |
+| Viewports/hidden child | Main + deferred child; close asks on unsaved; title follows document; screenshot targets right viewport; hidden root + visible child opens/updates/closes via `RequestPaintWhileHidden` (#8748 probe) | Remove request-paint: child state remains stale; treat closed #8748 as merged: test cannot pass |
+| #8763/#8764 selection | Select text, click a toolbar/context action; intended range is used, pointer and keyboard agree; one undo | Remove selection preservation: selected range becomes stale/collapsed |
+| Idle/performance hooks | `ui.inspect` reports no idle repaint and stable frame counts; autosave/recovery run while hidden; prototype playback does not duplicate actions after a sizing pass | Tick from `present::show` only: hidden/duplicate-action test fails |
+
+Pixel comparisons:
+
+- Prefer geometry, shape counts and semantic AccessKit assertions for control logic.
+- Use screenshot/pixel comparisons for synthetic scenes: empty document, frame with text, selected
+  frame with handles, RTL name, CJK name, font picker, dark/light, 100% and 150%.
+- Fixtures are generated in code (`figcraft_engine::synthetic`,
+  `figcraft_engine::synthetic_ds`) or original assets already in the repository; no product
+  screenshots or third-party assets.
+- Tolerance: exact geometry; for antialiasing/font raster changes allow at most 0.1% of pixels
+  differing by more than 2/255 per channel and no pixel differing by more than 4/255; text layout
+  bounding boxes may differ by ≤0.5 point after review. Any larger diff needs a written
+  before/after reason and reviewer approval. Never auto-update a golden.
+- Screenshot evidence is stored outside the repository in the durable task evidence directory;
+  reference screenshots of other products stay under the gitignored `plan/` tree and are never
+  committed.
+
+Deliberate negative controls: wrong capture/viewport association, missing accessible name,
+missing glyph, dropped callback, forced duplicate action, stale hidden input and an unbounded
+capture queue must each fail the targeted test; remove the deliberate defect after confirming.
+
+### 7.3 Native, browser and platform workflows
+
+- Linux: headless tests plus a real X11 and Wayland session for window, clipboard, PRIMARY, IME and
+  panel geometry. The planning host has no inherited `DISPLAY`/`WAYLAND_DISPLAY` and no compositor;
+  the parent can access an i915 render node but this worker sandbox may hide `/dev/dri`. That is
+  availability evidence only, not a qualified GPU/compositor result. Provision a display/window
+  manager and record versions; if unavailable, record the gate as unresolved.
+- Windows x64: build/test in a uniquely owned clone, then launch the actual app on the interactive
+  desktop, drive the control channel, capture window screenshots at 100/150/200%, test DX12 startup,
+  IME/non-Latin shortcuts, save/reopen and multi-window. The sealed baseline uses the Microsoft
+  Basic Render Driver; do not present it as a physical-GPU result. Do not count session-0 launches.
+- wasm: `trunk build --release`; load the page with WebGPU and `?webgl`; test open/import, edit, undo,
+  export/download, live join, browser clipboard copy/paste, responsive panel geometry and, only if
+  `epaint/color_fonts` is enabled in that build, color emoji; record browser/OS/GPU. The browser has
+  no native file paths and no control server; state whether automation or manual evidence was used.
+- macOS/FreeBSD: no routine UI test job. A release-workflow build is not a UI pass. Mark macOS
+  window/traffic-light/IME/PRIMARY and FreeBSD runtime rows explicitly unresolved unless a real
+  machine is available.
+
+## 8. Performance and measurement plan
+
+### 8.1 Baseline and three-way controls
+
+Before modifying production code, from clean baseline `80f9163` with the old manifest/lock, record:
+
+- exact `Cargo.lock` hash, `rustc -Vv`, `cargo -V`, target triple, features, `CRAFT_FONTS_DIR`
+  presence/ref, `FIGCRAFT_EMBED_CJK`;
+- OS version, CPU, RAM, GPU/adapter/backend/driver, DPI/scale, window size, renderer (software vs
+  real GPU), release profile, `WGPU_BACKEND`;
+- raw samples, command lines and timings in the durable evidence directory.
+
+Measure three sources on the same machine, checkout fixtures, fonts, features, DPI and viewport:
+unchanged 0.36.2 baseline (`49682f8b`/FigCraft `80f9163` lock), stock 0.37.0
+(`841a328b`) via a pinned minimal adapter/harness where the app cannot compile unchanged, and the
+final selected storytold fork. Record all three source/lock identities. An unavailable stock
+equivalence is an attribution limitation, not evidence that an upstream regression is unavoidable.
+Candidate runs use paired A/B/A/B ordering; do not compare compile duration with UI frame time.
+
+### 8.2 Operations and issue-specific workloads
+
+1. `figcraft-cli perf --layers 1000,10000,50000`: build/open, save/load, full render, retained pan,
+   one-layer edit, hit test, hover, node edit, undo/redo, boolean drag, normalize, inspect,
+   select-all+move. Existing rows in `apps/figcraft-cli/src/perf.rs::measure`.
+2. `perf_ui_frames` / `report_components`: idle, hover, wheel pan, one layer selected, Prototype
+   tab, all screens expanded, scroll layers, filter, keyboard navigation, bottom-layer reveal,
+   collapse all, Assets panel first/idle/scroll, edit a component, instance with many properties,
+   72-variant set. Existing rows in `crates/ui-egui/src/perf_tests.rs`.
+3. **#8731 text tessellation:** fixed synthetic document with 120–240 text labels; layout once, then
+   `ctx.tessellate` the same shapes for 30 steady repetitions (10 warmups); report per-call time,
+   vertex/index counts and raw samples. Run 0.36, stock 0.37 and final fork. A row-level fast path is
+   only accepted with mixed/color-row equality.
+4. **#8736 DX12:** measure renderer/pipeline construction separately from first frame on Windows
+   x64, 20 fresh processes, with `WGPU_BACKEND=dx12`; compare 0.36, stock 0.37 and final fork.
+   Keep a software/renderer control row and identify the actual adapter/driver.
+5. **#8512 font startup:** measure system-font discovery and first missing-glyph lookup separately,
+   20 fresh processes, with and without `CRAFT_FONTS_DIR`/`system_fonts`; record coverage and
+   provider settings. Do not enable fontique by default as a performance shortcut.
+6. Native startup: process spawn to first successful `ui.inspect`/first painted frame; 20 fresh
+   processes; separate shader/renderer creation logs.
+7. Idle repaint/CPU: 60 s hidden and visible idle; `framesDrawn`, `repaintCauses`, OS CPU. Must be
+   zero frames and ~0% CPU when idle.
+8. Memory: Linux `/usr/bin/time -v` or `/proc` peak RSS; Windows private bytes; record peak for
+   10k/50k documents, startup and capture admission.
+9. Screenshot/control latency: `ui.screenshot` request to reply (including completion-slot drain,
+   cancellation and pending-bytes counters), `engine.execute`, save/reopen, window open/focus/close.
+10. Browser: wasm size, first interactive, open/edit/undo/export, frame time in Chromium; WebGPU and
+    WebGL2 separately, with software fallback vs real GPU identified.
+
+### 8.3 Statistics and thresholds
+
+- At least 10 warmups and 30 steady timed iterations for operations; at least 20 fresh processes
+  for startup; at least 1,000 frames for any frame distribution and p99. Slow full renders also use
+  30 samples, not 5. Report raw samples, median, p95, min/max, MAD and sample count; report p99 only
+  where the sample count supports it. A coefficient of variation >5% triggers a rerun on an idle
+  machine and a recorded explanation. Modify `crates/ui-egui/src/perf_tests.rs` and
+  `apps/figcraft-cli/src/perf.rs` to emit raw samples and these aggregates; the current means-only
+  output is not acceptance evidence.
+- Three-way acceptance on paired baseline/candidate (shared suite floors are no looser than 5%
+  median / 10% p95; FigCraft keeps its stricter engine/render/UI gates):
+  - engine/render/UI median ≤ +3% and p95 ≤ +5% relative; absolute floor 0.05 ms for sub-ms
+    operations. If evidence shows the stricter gate is noisy, record an explicit, pre-approved
+    exception; never silently relax after seeing a failure.
+  - text tessellation ≤ +5% median (if upstream #8731 remains unpatched, the expected +61% is a
+    blocking regression, not an accepted number); report stock 0.37 and fork separately.
+  - Windows DX12 startup ≤ +5% median / +10% p95 over 20 fresh processes; if #8736 remains unpatched,
+    measure and require an owner-approved waiver or a provenance-recorded patch.
+  - font discovery/first missing glyph: report absolute timings and coverage separately; a
+    repeatable >5% median or >10% p95 regression is investigated, not accepted as default cost.
+  - idle visible/hidden: zero unscheduled app repaint requests after settling; scheduled
+    work keeps its documented deadline, and there is no new busy-loop.
+  - peak memory ≤ +3% or +64 MiB, whichever is reached first, for the same scenario; capture pending bytes
+    return to zero after drain.
+  - screenshot/control latency ≤ +10% p95; save/reopen ≤ +5%.
+- A regression triggers profiling and a written cause/fix; it is never accepted by changing a golden
+  or deleting a test. Software-renderer and real-GPU results are separate rows. A stock-0.37-only
+  failure is still an attribution result, not a FigCraft fork pass.
+
+The required X0 dependency is the complete P8 handoff. E24/E25's selection-action and
+hidden-child regressions map to fork P7c (conditional fixes after reproduction), not optional
+app fallbacks. E21b requires owner/context generation even for Unavailable, Available-empty
+separate from unsupported, W27 committed clear transitions, latest-pass None authoritative,
+old-focus-epoch invalidation and current-epoch mismatched serials applying incoming edits once
+while deferring outgoing until a match. F2's adapter and native protocol tests use that exact
+contract, including empty→non-empty and password→normal transitions. P2b's bounded async
+transfer/cancel/routing and P7's emitted-key release pairing are also X0 prerequisites.
+
+Clipboard routing in F2 is by action/focused editor: built-in TextEdit text Copy/Cut/Paste
+uses egui-winit; custom document/rich HTML/image operations retain Desktop Services' arboard
+handle and its wayland-data-control support. A single input action has one consuming path;
+never write both owners for the same action or mirror unchanged selection on a timer. PRIMARY
+belongs exclusively to W15P; Services never claims PRIMARY. Independent data-control and regular
+data-device handles are not themselves a duplicate regular wl_data_device on one connection.
+Test alternating TextEdit/document copy, HTML/plain/image fallback with alpha, focus/window
+changes and one paste/undo per action on supported compositors. Preserve the existing Services
+read-timeout behavior as a separately measured baseline; P2b's nonblocking guarantee is for the
+egui integration path, not an unimplemented rewrite of all Services clipboard calls.
+
+The existing craft-window pin 1f805378 is branch-derived; verify and retain exact fetchability
+and source/executable evidence for baseline/rollback. Unmerged provenance alone does not prove
+the commit is unreachable. F2 still switches to the final reviewed craft-libs revision.
+
+## 9. Reviewable PR stages and dependency DAG
+
+```
+External prerequisites (not FigCraft PRs)
+  X0: reviewed + approved storytold/egui final revision (complete P8: E1-E21 + P2b/P7/P7b/P7c)
+  X1: reviewed + approved storytold/winit final revision (W1-W27 + W15P)
+  X2: reviewed + approved storytold/craft-libs final revision
+      (merged PR #199 base 3832c47; reviewed capture/text helpers; craft-window/platform/quit;
+       reviewed CL-2/CL-2F capture contract for the local adapter; no b68de8c/ec8840a tree)
+  X3: optional E22-E25 only after measurements, with provenance and fresh review
+
+FigCraft
+  F0 baseline evidence (no production change)
+      |
+  F1 lifecycle/action refactor on 0.36:
+     background_tick/ui_setup split, child/global split, action tokens, hidden/multipass tests
+      |
+  F2 atomic 0.37 compatibility PR (depends F1, X0-X2):
+     manifests, final patches, lock, Id/Ui/WidgetType/MouseWheel/Band/scroll,
+     local capture slot, panel IDs + preference preservation, a11y edge,
+     E21b adapter, RTL logical boundaries, kittest strictness
+      |
+  F3 optional performance/provenance patches (depends F2, F0/F2 measurements)
+      |
+  F4 workaround removal + docs/ROADMAP/parity notes (depends F2, F3; only with evidence)
+```
+
+Each stage is a separate reviewable PR/branch and must be green on its own:
+
+- **F1** includes the queued hidden screenshot/input behavior above and its basic
+  paint/timeout regression in the atomic callback migration. It touches `crates/ui-egui/src/lib.rs`, `windows.rs`, `control.rs`, `present.rs` and
+  `apps/figcraft/src/main.rs` plus tests; no manifest/dependency change. It proves the new
+  background/UI split and action tokens on 0.36 first, including the native/web call sequence,
+  hidden logic, forced hidden paint, restore-with-buffered-input and two-window global work.
+- **F2** is atomic: root/app/UI manifests, `Cargo.lock`, final patches, `ui-egui`
+  source and tests, the E21b model adapter and the panel preference/geometry checks. It must not leave a
+  half-updated dependency set. The mechanical ID/WidgetType codemod and capture callback may be
+  separate commits inside the PR, but the PR is mergeable and green as a whole.
+- **F3** changes only the final patch revision(s) and carries the measurement/provenance table;
+  rollback is a revision change plus relock.
+- **F4** removes a workaround only after the corresponding test/manual evidence; otherwise retain
+  the workaround and record why.
+
+Publication rule: every push/tag/new PR needs fresh explicit human approval after the parent shows
+the exact contents and validation. No approval is granted by this plan. Public prose contains no
+agent/model/tool signature; contributor credit remains username-only (`@skylartaylor`).
+
+### Rollback
+
+- Preserve baseline `Cargo.toml`, `Cargo.lock` and manifest hashes in evidence.
+- Roll back by reverting F2 (and F1 if the lifecycle change is implicated) in reverse order; do not
+  keep a 0.36/0.37 feature flag for these APIs.
+- Optional F3 patches roll back by restoring the previous final fork revision and re-locking; do not
+  rewrite history or force-push.
+- If only `craft-window`/`craft-libs` is at fault, repoint to the last merged public revision and
+  relock; do not copy the crate into the repository or use a machine-local path.
+- Keep the old coherent dependency set available in git history; do not delete retained evidence or
+  unreviewed source work. Rehearse restoring the previous executable/lock and reopening a saved
+  fixture before accepting the stage.
+
+## 10. Blocking unknowns and acceptance gates
+
+1. **Final storytold revisions:** `STORYTOLD_EGUI_FINAL_REV`, `STORYTOLD_WINIT_FINAL_REV` and
+   `STORYTOLD_CRAFT_LIBS_FINAL_REV` do not exist until the reviewed series is approved and published.
+   F2 is implemented locally against the review worktrees, but it cannot be published or presented as
+   an immutable-pin change before those revisions exist. Candidate aiongg SHAs are comparison inputs.
+2. **craft-libs #199:** PR #199 merged as `3832c47ef68a0e6214f2c1e85f3526b6adcb686e`. That merged
+   base is the anchor; the earlier `b68de8c` head and `ec8840a` audit merge are stale history and
+   neither tree is usable. The local worktree adds only the reviewed capture/text helpers on top of
+   `3832c47`; no published revision exists yet.
+3. **W15P PRIMARY:** the candidate's arboard fallback is not accepted for GNOME/Mutter. W15P must be
+   reviewed/published and E4 P2b integrated with native wlroots/KWin/Mutter evidence; otherwise the
+   PRIMARY gate is unresolved/blocked.
+4. **E21b/P7b:** outgoing surrounding text is not present in the comparison candidate. The local
+   reviewed fork plus FigCraft's custom-editor producer implement the bounded payload and
+   receipt/change-cause contract described in `docs/egui-037-local-followups.md`; the Wayland
+   adapter and final immutable fork pin still require review, validation and publication. `None`
+   placeholders are not a port.
+5. **Fork publication reachability:** final storytold repositories must be public/readable; a
+   private/branch dependency breaks contributors. Fresh human approval is required before any push.
+6. **Language #198 / E5-E21:** the fork is the integration point. If the reviewed series changes or
+   is reverted, bump the pin in a separate PR and rerun RTL/IME tests. Do not copy patches into
+   FigCraft.
+7. **Known 0.37 performance regressions (#8731, #8736, #8512):** decide only after three-way paired
+   measurements. If thresholds fail and no provenance-recorded fix is accepted, the migration is
+   blocked.
+8. **TextEdit click-away (#8763/#8764):** #8764 is a proposed, unmerged fix. Verify FigCraft's
+   custom selection actions; if affected, fix/test before merge.
+9. **Hidden deferred children (#8748):** closed and unmerged. Verify with
+   `RequestPaintWhileHidden`; otherwise adopt a reviewed fork fix or record the unresolved behavior.
+10. **Font input:** baseline and candidate must use the same `CRAFT_FONTS_DIR` ref. A
+    no-craft-fonts run is valid for CI but not for a font-metrics comparison. Color-emoji claims
+    require the `epaint/color_fonts` feature job.
+11. **macOS/FreeBSD/real GPU:** no routine UI test evidence. The parent-visible i915 render node is
+    unqualified, and this worker sandbox may hide `/dev/dri`; there is no inherited compositor or
+    ambient display. Compile/packaging results are not runtime passes. Mark them unresolved until
+    real evidence exists.
+12. **Lockfile resolution:** one egui family, one winit, one wgpu, one craft-window. If
+    Cargo chooses two versions, stop and fix the pins rather than accepting a duplicate.
+13. **AccessKit per-viewport:** the pinned 0.37 fork initializes the native AccessKit adapter only
+    for the root viewport; creating a secondary viewport does not initialize an adapter. The
+    “main window only” limitation remains, and no real screen-reader qualification is claimed.
+    Keep the tab fallback until secondary-window accessibility is implemented and tested.
+14. **Automation screenshot thread:** the callback must not write files outside `file_access`
+    confinement. The shared completion-slot design in 6.3 is required, not optional.
+
+## 11. App-specific acceptance assertions
+
+- Opening a synthetic document, editing a rectangle and text, undoing, saving and reopening gives
+  the same `document.inspect` tree; command ids, undo steps and file bytes are unchanged except for
+  documented UI metadata.
+- The UI at 1440×900 and 800×500 keeps the panel/canvas geometry contract (`fit_panels`,
+  `panel_width_tests`), the central canvas hit area, and the toolbar/tab hit rects.
+- F6/Tab focus order covers panels and controls but never the actual custom panel edge; AccessKit
+  roles and names match `a11y_tests`; the root language follows the UI language.
+- A screenshot of the main window and of a deferred child returns the correct viewport, request id,
+  capture-time geometry/DPI and one reply, including two requests completed out of order; hidden
+  screenshots queue then paint, or return the existing error once on deadline;
+  cancellation/timeout/close never writes late.
+- English, RTL, CJK and shortcut-symbol fixtures have glyphs using the pinned licensed fixtures; the
+  font picker previews without changing the document; no extra script face is loaded for an
+  English-only screen.
+- RTL names and custom text edit logically: the displayed order is correct, while clipboard,
+  AccessKit name, save and IME surrounding text carry the logical string.
+- `ui.inspect` reports no idle repaint requests and stable frame counts; autosave/recovery run while
+  the window is hidden; prototype playback does not duplicate actions after a sizing pass.
+- Windows DX12 starts, draws, opens/saves/reopens, handles IME/non-Latin keys, and shows no Vulkan
+  selection unless requested. Linux X11/Wayland copy/paste and PRIMARY are reported only from a real
+  session. Browser WebGPU and WebGL2 builds load, edit, undo, export and handle clipboard events.
+
+## 12. Verification limits of this plan
+
+- No source change, dependency resolution, build, test, benchmark, screenshot, browser run or GUI
+  interaction was performed. Historical compiler errors are not current acceptance.
+- Line numbers and symbol locations come from baseline `80f9163` and can move during implementation;
+  anchors are given by file and symbol.
+- The final fork/craft-libs merge state is unknown until approved publication. Re-check the exact
+  immutable revisions and public reachability immediately before implementation and before every
+  publication.
+- Upstream issue measurements (#8731, #8736, #8512) are reported by others, not reproduced here;
+  this plan requires FigCraft's own three-way paired measurements.
+- macOS, FreeBSD, real-GPU, screen-reader and Wayland/PRIMARY behavior remain unproven until
+  evidence is recorded from real environments.
+- This revision was prepared by static inspection only. Reviewer claims were checked against the
+  pinned source where possible; the review's suggestion to use `visible()` as a phase signal was
+  rejected because the authoritative lifecycle audit and `run_logic` source show visibility does
+  not distinguish logic-only from forced hidden UI.
+
+## 13. References
+
+Primary sources consulted:
+
+- `storytold/egui` final reviewed revision and upstream `0.37.0` `841a328b`:
+  `crates/egui/src/context.rs`, `crates/egui/src/ui.rs`, `crates/egui/src/id.rs`,
+  `crates/egui/src/id_salt.rs`, `crates/egui/src/sense.rs`,
+  `crates/egui/src/containers/panel.rs`, `crates/egui/src/data/input/event.rs`,
+  `crates/egui/src/data/screenshot_callback.rs`, `crates/egui/src/viewport.rs`,
+  `crates/egui/src/containers/scroll_area.rs`, `crates/eframe/src/epi.rs`,
+  `crates/eframe/src/native/*`, `crates/eframe/src/web/app_runner.rs`,
+  `crates/egui-wgpu/src/winit.rs`, `crates/egui-winit/src/*`,
+  `crates/egui_system_font_provider/src/lib.rs`, `crates/egui_extras/*`.
+- aiongg candidate `a4f9a17f`: `PATCHES.md`, the same source files, used only for comparison and
+  gap identification.
+- `storytold/winit` final reviewed revision; candidate `8b35388b` W17-W27; published
+  `ffae5198` W1-W15; W15P PRIMARY design.
+- `craft-libs` merged base `3832c47` (PR #199), historical API-port source `8614e4a`/`1764bca`,
+  and the reviewed `craft-ui` capture/CL-2F contract as the local adapter reference.
+- `craft-libs/docs/egui-037-suite-rollout.md`, `craft-libs/docs/egui-037-migration-plan.md`,
+  `egui/docs/egui-037-migration-plan.md` (including section 10.6 font fixtures).
+- `/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/lifecycle-source-audit.md`,
+  `ime-surrounding-gap.md`, `upstream-discussions.json`.
+
+
+## Local implementation update — 2026-10-23
+
+The user clarified that reviewed plans remain local and implementation proceeds before publication. The earlier requirement to publish/land this plan first is superseded; pushes and PR publication still require explicit approval.
+
+Canonical `storytold/figcraft` `main` now resolves to `8d790607ff1ad40e32343ca2116d8fdcf3244c8d`. The owned checkout was fast-forwarded to this revision. Earlier baseline SHAs and line anchors above are retained as historical review evidence; use this new revision and its exact lockfile for current-main integration and paired measurements. The original refs remain reachable.
+
+No migration API redesign required by this delta; preserve the merged packaging, test and chrono changes where present.
+
+The complete static delta review and exact old/new object identities are retained in the task evidence: `canonical-diffs-refresh-20261023.json` and `overnight-consumer-review-20261023.md`. This amendment claims no new build, native GUI or performance acceptance.
+
+
+## Local implementation — stage 1 (2026-10-23)
+
+The owned worktree now contains the first coherent 0.37 compatibility/lifecycle stage described in
+`docs/egui-037-local-followups.md`: the 0.37 dependency family and mechanical API ports, the
+`background_tick`/`ui_setup` split with a monotonic frame clock and child/global separation, the
+local capture-slot adapter (weak callback, identity/deadline/generation/geometry epoch, budget,
+straight RGBA, hidden queue + `RequestPaintWhileHidden`), the real non-focusable panel-edge fix,
+the root-scope a11y record, and incoming IME `DeleteSurroundingBytes` for the custom editor.
+Outgoing E21b surrounding text is implemented as described in `docs/egui-037-local-followups.md`;
+web hidden paint remains a recorded prerequisite, not a fake.
+No build/test/GUI/browser/performance run was performed for this stage; the parent runs managed
+validation and generates the lockfile from its local dependency config.
+
+## Historical local qualification — 2026-10-25
+
+The following counts apply to the earlier `10702311` integration, not the later
+`2a3b7d4f` qualification documented in `docs/egui-037-local-followups.md`. The
+status update above covers the subsequent `92682728` integration. The intervening
+`9f788753` refresh passed 3,247 executions; the runs listed below passed 3,242.
+
+The migration preserves captured main `10702311f345393ee1d8868c3257679befcfa14d`
+(53 commits and 114 paths beyond the first integration). The final review commit records
+both the migration history and that upstream target as parents. The selected egui revision is
+`6d518fc799681571963842f95b55a6b68431b15a`, winit is
+`a517b3846ee8457d84ee4975110bfda6797c44dc`, and craft-window is
+`25da1314d443171b4adeaad2cd9454b273f35c6f`. Cargo.lock SHA-256 is
+`7ba8af4de70ba657a652266ddee2920bfc501c851520a49ac60c8044a5c23cc1`.
+The normal UI enables `default_fonts` and `monochrome_emoji_fonts`.
+
+Managed full CI `egui037-figcraft-final-ci-20261024-2312` passed with bundled fonts.
+Managed full CI `egui037-figcraft-system-font-ci-20261025-0402` also passed without
+bundled craft-fonts, using a licensed DejaVu Sans system-font fixture via XDG_DATA_HOME.
+The final qualification run `egui037-figcraft-final-qualification-ci-20261025-0453`
+repeated that configuration successfully after the documentation reconciliation.
+Both runs completed formatting, strict lint, workspace tests, doctests, translations,
+layering, assets, WASM checks, and plugin fmt/lint/tests/release-WASM builds. Each log
+contains 3,242 passing executions, zero failures and nine ignored across 70 summaries;
+this includes repeated translation checks and is not a count of distinct regressions.
+The main doctest stage selects zero tests. Three plugin bundles were hash-verified and
+preserved for each configuration.
+
+The no-bundled-font run includes two test fixture corrections: text-fit cases explicitly
+scan installed fonts, and a concurrent collaboration test explicitly selects its foreground
+document after both joins complete instead of depending on network completion order.
+Independent review accepted these changes with the original layout, synchronization and
+isolation assertions intact. All 17 field-save regressions remain covered, including
+owner-bound deferred saves, same-pass document replacement and later valid edits/saves.
+Incoming IME interruption, screenshot geometry admission, and document/window ownership
+are implemented. Historical notes below describe the earlier planning stages.
+
+The final review packet binds source, lock, logs, plugin outputs and commit ancestry.
+Native visible GUI/browser workflows, native/custom-editor IME, paired performance,
+current-source platform runtime and actual release installation/signing remain open.
+The system-font result is not a claim that missing document fonts are interchangeable.
+Human review and human merge are required; no publication is authorized by this document.
diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md
index 237ca1b9..318607a5 100644
--- a/docs/file-format-parity.md
+++ b/docs/file-format-parity.md
@@ -1,6 +1,6 @@
 # File format parity
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-14 · **Change:** minor (SVG/PDF export depth refusal (#208); `.fig` export: instance sizes, variables with modes, shared styles, variable-width strokes; `.fig` export: written files checked by opening them in other software; experimental `.fig` export; export and inspect behaviour suite and fixes; .fig import: editable vector networks and more layer kinds; embedded image colour profiles; `.fig` import, best effort; animated GIF fills and TIFF images; last major: created, formats from the installed Figma's Info.plist and help center, ours from source) · **Target:** Figma Design (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-26 · **Change:** minor (Android Vector Drawable (XML) export; `.fig` export: files the incumbent imports, with component set properties, and grid track sizes at its field ids; Save and auto-save don't replace changes another app made to the open file (#1330); `.sketch` import, best effort, Sketch 48 and newer; the PNG row names ignore overlapping layers and where include bounding box is offered; the Fonts table's missing-font row describes the Missing fonts window; `.figcraft` carries the file kind (boards); `.fig` import: resized instances and variable modes by asset key; atomic saves; auto-save; SVG export clip of nested frames; SVG/PDF export depth refusal (#208); `.fig` export: instance sizes, variables with modes, shared styles, variable-width strokes; `.fig` export: written files checked by opening them in other software; experimental `.fig` export; export and inspect behaviour suite and fixes; .fig import: editable vector networks and more layer kinds; embedded image colour profiles; `.fig` import, best effort; animated GIF fills and TIFF images; last major: created, formats from the installed Figma's Info.plist and help center, ours from source; REST import keeps slot layers and instances' slot content (#792); REST import reads grid track sizes (#465); `.fig` import fidelity from the community batches, budgets for large files, the import report, a `.fig` copy from Save as, paste from another design app; instance layers' size and resizing and Hug on import (#731, #732)) · **Target:** Figma Design (desktop app 126.10.7)
 
 Every format Figma reads or writes, with FigCraft's support. Sources: `Info.plist` of
 `/Applications/Figma.app` (document types only; nothing inside the bundle's code was read), Figma's
@@ -17,10 +17,11 @@ and prototype interactions are still unchecked there.
 
 | Format | Figma | FigCraft read | FigCraft write | Fidelity / testing | Hours |
 |---|---|---|---|---|---|
-| `.fig` (Figma Design, `com.figma.document`, `application/x-figma`) | native (cloud; "Save local copy") | **yes, best effort** (`file.open`, `file.import`, drop, CLI, MCP) | **experimental** ([below](#export-to-fig-experimental)) | `.fig` files open (best effort): the zip, its deflate/zstd chunks and the kiwi schema are decoded generically and mapped by field name onto the REST importer, so pages, the layer tree, geometry, paints (styles resolved), strokes, effects, text with styled runs, vectors as editable vector networks (points, curved segments, filled areas with their winding, per-point corner radius and handle mirroring, end caps; outlines when the network is missing or damaged), auto layout (grid included), constraints, ellipse arcs, boolean operations, components, sets (with their descriptions), instances (expanded from their main with overrides, derived layout and property values), styles, variables with modes and bindings, prototyping (set-variable, set-variable-mode and conditional actions included) and image fills from the archive come across; sticky notes, shapes with text, connectors, tables, code blocks, slides and similar layers come in as the closest frames, text layers and vectors, with a warning; anything else is a warning. Not read: connector labels, table cells beyond their own layers, filled areas with their own fills, per-point stroke joins, variables bound to fields the editor can't bind, fixed or content-sized grid tracks, video fills. Tested on fixtures generated in code (`crates/format/src/fig/tests.rs`, `tail_tests.rs`, fuzzed) and by reading back what the export writes; no real-world files yet | read tail 5–10, write: checks against real files 5–15 |
-| `.jam` (FigJam), `.deck` (Slides) | native to other Figma products | no | no | out of scope | — |
-| REST API file JSON (`GET /v1/files/:key`) + local variables JSON + `images/` folder | the API's output | **yes** (`file.open`, `file.import`, CLI) | no | pages, layer tree, geometry, paints, strokes, effects, text runs, vectors, auto layout, constraints, grids, components, sets, instances with overrides, component properties, styles, prototyping (incl. conditionals and variable modes), variables with modes, aliases, scopes and bindings; warnings for what's skipped (video triggers and actions, modifier keys). Unit tests in `crates/format/src/rest/*_tests.rs` | — |
-| `.figcraft` (ours: zip of `document.json` + images, versions inside) | — | yes | yes | streamed JSON, 50k layers save ~0.09 s / load ~0.16 s (`cargo xtask bench`); old files keep opening (`large_tests.rs`) | — |
+| `.fig` (Figma Design, `com.figma.document`, `application/x-figma`) | native (cloud; "Save local copy") | **yes, best effort** (`file.open`, `file.import`, drop, CLI, MCP) | **experimental** ([below](#export-to-fig-experimental)) | `.fig` files open (best effort): the zip, its deflate/zstd chunks and the kiwi schema are decoded generically and mapped by field name onto the REST importer, so pages, the layer tree, geometry, paints (styles resolved), strokes, effects, text with styled runs, vectors as editable vector networks (points, curved segments, filled areas with their winding, per-point corner radius and handle mirroring, end caps; outlines when the network is missing or damaged), auto layout (grid included; a flow that records no primary-axis sizing hugs on that axis, an instance that records no auto layout has its main's), constraints, ellipse arcs, boolean operations, components, sets (with their descriptions), instances (expanded from their main with overrides, derived layout and property values; the size and resizing their layers override stay overrides), styles, variables with modes and bindings, prototyping (set-variable, set-variable-mode and conditional actions included) and image fills from the archive come across; sticky notes, shapes with text, connectors, tables, code blocks, slides and similar layers come in as the closest frames, text layers and vectors, with a warning; anything else is a warning. Since 2026-10-17 (community batches #727, #728): an instance's own identity and the cached library components a file carries, overrides applied by key and order, local text values and instance overrides over a shared text style, grid track sizes (fixed, content-sized, fill), slot content, labels of connectors saved with their drawn path (a static snapshot; the ends aren't live), skip ink, paragraph options and hanging lists, list start numbers, vertical trim, per-point stroke joins, editable text on a path, image adjustments and images carried in the message. Budgets come from the file's own size (one value per compressed byte, 20M–128M, lower ceilings on 32-bit targets; the layer cap follows), so a 15.4 MB synthetic file with 300,000 layers opens whole; the file's bytes stay out of the command journal; an import report lists what was left out or changed once the file opens. Not read: elbowed or curved connectors without a saved path (drawn straight) and labels of connectors without a saved snapshot, table cells beyond their own layers, filled areas with their own fills, variables bound to fields the editor can't bind, video fills. Tested on fixtures generated in code (`crates/format/src/fig/tests.rs`, `tail_tests.rs` and the per-feature `*_tests.rs` beside them, fuzzed) and by reading back what the export writes; no real-world files yet | read tail 5–10, write: checks against real files 5–15 |
+| `.sketch` (Sketch 48 and newer) | import (file browser ▸ Import or drop, desktop app too; converted to a Figma file, symbols as components; per the help center) | **yes, best effort** (`file.open`, `file.import`, drop, CLI, MCP; Open With from Finder, Explorer and Linux file managers once installed; recent files show its `previews/preview.png`) | no (out of scope) | zip + JSON read from the public format description; Sketch 43–47 (text as binary property lists) and older (SQLite) files are refused with a message to resave them in a newer Sketch. Pages, artboards as frames with their background, groups; Sketch 2025 and newer: frames (clipping or not) with their style, graphics, stacks as auto layout (direction, gap, alignment, padding, wrap, hug/fill sizing, items ignoring the stack), corners in the style (rounded, smooth with its smoothing; angled, inside square and inside arc as paths), pins and sizing, per-side borders, lists of blurs (progressive background blurs, glass), inner shadows in the shadow list, tints (a graphic's, group's or instance's fill colouring its layers, and colour overrides), text colour and visibility overrides, text sized by its sizing; rectangles with corner radii, ovals, stars and polygons while their points are the generated ones, paths as editable vector networks, shape groups as their shape, as one compound path (children without an operation, by the group's winding rule) or as boolean operations (mixed operations nested from the left); open paths filled as if closed, edited ovals and rectangles as paths, bitmaps (with their colour adjustments as image filters), slices, hotspots; transforms (rotation, flips after it), resizing constraints; fills (solid, gradients with Sketch's geometry, image patterns), borders (the first enabled border's width and position), shadows, inner shadows, layer and background blurs, opacity and blend modes; clipping masks (an outline mask that shows its own style draws a copy under itself, as Sketch does; alpha masks only mask; broken mask chains wrapped), progressive opacity (Fade) as an alpha mask of its gradient; text with styled runs (UTF-16 ranges), paragraph and vertical alignment, lines placed by Sketch's line spacing behaviour, box sizing, fonts found by their PostScript names among the installed ones (else the family read from the name), variable font axes, Sketch's natural line (ascent and descent rounded, no line gap, a fifth more for classic Mac fonts) for text without a fixed line height; symbols as components (library copies on a page of their own) and instances carrying their masters' layers with overrides (text, nested swaps and hiding, images, layer and text styles, nested paths), laid out for their size the way Sketch does it (proportional sharing per pins from format 110, scaling before) and still live; master backgrounds in instances only where Sketch shows them; Apple's system fonts found under the names designs use, with the platform's tracking kept as letter spacing; shared layer styles as paint (fills, border colours) and effect styles, shared text styles as text styles; Color Variables (also library ones) as colour variables with bindings; prototype links, flow starts, export options, layout and square grids (hidden, as Sketch shows them only in its layout view). Instances of a stack laid out at their size and texts an override changed measured again on open. Warnings: noise fills, motion and zoom blurs (drawn as plain blurs), fonts embedded with their data (not used), Smart Layout (kept as laid out), locked overrides, scaled instances. Tested on fixtures built in code (`crates/format/src/sketch/*_tests.rs`, fuzzed) and locally (`FIGCRAFT_SKETCH_SAMPLES`) on one real Sketch 50 file and the public Apache-2.0 IBM Carbon Design Kit saved by Sketch 68 and 83 (70,000 layers open in ~3 s, debug build; its edition saved by Sketch 47 is refused, as it should be); compared artboard by artboard with Sketch 2026's own renders (`FIGCRAFT_SKETCHTOOL`, black-box): the Sketch 50 file's 73 artboards differ in at most 2.3% of their pixels (0.8% on average) (text metrics, fonts FigCraft doesn't find, antialiasing), Carbon 11's 69 1.1% on average and at most 4.4% (text in IBM Plex, which the file embeds and FigCraft doesn't use yet), a Sketch 64 file's 65 artboards 2.1% on average, a Sketch 2026 showcase file's 16 frames 0.9% on average (at most 1.9%) | 5–10 (Smart Layout as auto layout, motion and zoom blurs, several borders of different widths; fonts embedded in the file once `.figcraft` documents can carry fonts: until then they would only last the session) |
+| `.jam` (whiteboards), `.deck` (Slides) | native to other Figma products | no | no | `.jam`: not read or written (boards are FigCraft files, see [boards-parity](boards-parity.md)); `.deck` out of scope | — |
+| REST API file JSON (`GET /v1/files/:key`) + local variables JSON + `images/` folder | the API's output | **yes** (`file.open`, `file.import`, CLI) | no | pages, layer tree, geometry, paints, strokes, effects, text runs, vectors, auto layout (sizing modes left out read as hug, as documented; grid track sizes from `gridColumnsSizing` / `gridRowsSizing`: px, fr, auto, `minmax(0, 1fr)`, `repeat()`), constraints, grids, components, sets, instances with overrides (sizes and resizing included), component properties, slots (`SLOT` layers bound to their slot property; an instance's slot keeps its content as the instance's own unless its property value is the main's default content; slot limits and preferred components are warnings), styles, prototyping (incl. conditionals and variable modes), variables with modes, aliases, scopes and bindings, image adjustments (the same tint sign as `.fig`); the import report after opening; warnings for what's skipped (video triggers and actions, modifier keys). Unit tests in `crates/format/src/rest/*_tests.rs` | — |
+| `.figcraft` (ours: zip of `document.json` + images, versions inside) | — | yes | yes | streamed JSON, 50k layers save ~0.09 s / load ~0.16 s (`cargo xtask bench`); old files keep opening (`large_tests.rs`); saves write a unique staging file and rename it into place (#284); optional auto-save of files with a path (`pref.autoSave`, #305); Save and auto-save refuse to write over a file another app (figcraft-cli, say) changed since it was opened or saved here, judged by its size and modification time: Revert to saved loads those changes, Save as keeps both, `file.save {overwrite: true}` replaces them (#1330); `kind: "board"` marks a board (left out for design files, so files from before boards are design files; the home screen reads it for the file's mark); board objects keep their `board` metadata on the layer; Dev Mode measurements are kept on the layer they start from (`measurements: [{to} | {side}]`, left out when there are none, so older files open with none) | — |
 | Local library files | team libraries in the cloud | yes (enable a `.figcraft` as a library) | yes (publish) | per-asset versions, updates with overrides kept | see [collaboration-parity](collaboration-parity.md) |
 
 ## Import (place / paste / drop)
@@ -36,7 +37,7 @@ and prototype interactions are still unchecked there.
 | BMP | — | yes | | — |
 | MP4, MOV, WebM (video fills, paid plans) | yes | **no** | shortcut: decoding H.264/HEVC/VP9 needs non-Rust libraries (FFmpeg or each platform's media framework); presenter playback would reuse the animated GIF clock | 4–8 |
 | Images over 4096 px | downscaled to 4096 | kept | | — |
-| Pasted content from other apps | images, SVG, text, Figma clipboard | images, SVG, text (newest clipboard content wins) | no Figma clipboard (it carries Figma's own binary) | with `.fig` |
+| Pasted content from other apps | images, SVG, text, Figma clipboard | images, SVG, text (newest clipboard content wins), **layers copied from another design app, best effort** | Cmd/Ctrl+V reads an image copied in another app (under Wayland through the data-control protocol, not run on Linux here; Linux and BSD clipboard reads give up after 2 s). Copied design layers: the `.fig` canvas in the clipboard's HTML is read like a `.fig` file (with its warnings) and pasted as Paste pastes, in place or into the selected frame (`edit.pasteDesignLayers {html \| data}`, refused over 256 MB before decoding); text copied later pastes as text again. Tested with clipboard HTML made from our own `.fig` export (`design_paste_tests`), never with a real clipboard from other software | with `.fig` |
 
 ## Export
 
@@ -49,20 +50,24 @@ export limit, not a native document nesting limit.
 
 | Format | Figma | FigCraft | Notes | Hours |
 |---|---|---|---|---|
-| PNG | yes, scales/suffixes | yes | export settings per layer, presets (`2x`, `512w`, `512h`), preview, "Export N layers"; contents only (off: every layer showing in the area) and include bounding box (the layer's own box); slashes in layer names export into folders. The exported area is what the layer paints: shadows towards their offset, outside and centre strokes, unclipped children, a mask group's mask, nothing for hidden layers; slices export everything under them; sides round up to whole pixels | — |
+| PNG | yes, scales/suffixes | yes | export settings per layer, presets (`2x`, `512w`, `512h`), preview, "Export N layers"; ignore overlapping layers (on by default; off: every layer showing in the area) and include bounding box (the layer's own box; the Export section offers it for text layers, and `file.export` and `export.update` take it for any layer); slashes in layer names export into folders. The exported area is what the layer paints: shadows towards their offset, outside and centre strokes, unclipped children, a mask group's mask, nothing for hidden layers; slices export everything under them, except that with ignore overlapping layers on a slice inside a frame or group exports only that frame or group; sides round up to whole pixels | — |
 | JPG | yes | yes | white where transparent; fixed quality (90) | — |
-| SVG | yes (outline text option, ids) | yes | alpha/luminance masks kept; noise, texture, progressive and background blur, glass embedded as images; outline text (off: `<text>` with one `<tspan>` per line, one style per layer), unique id attributes from layer names, explicit depth-limit refusal, simplified strokes (stroke attributes for centred strokes and for inside and outside strokes on boxes and ellipses) | — |
+| SVG | yes (outline text option, ids) | yes | alpha/luminance masks kept; noise, texture, progressive and background blur, glass embedded as images; outline text (off: `<text>` with one `<tspan>` per line, one style per layer), unique id attributes from layer names, explicit depth-limit refusal, nested frames clipped by their parent's clip (#327), simplified strokes (stroke attributes for centred strokes and for inside and outside strokes on boxes and ellipses) | — |
 | PDF | yes | yes | one page per frame, real selectable text in subset fonts, links, vectors and gradients as vectors, effects as images; bleed, crop/bleed marks, page boxes, naive CMYK; checked by rendering the PDF back against PNG exports; explicit depth-limit refusal | CMYK output intent 2–4 |
 | WebP | — | yes (ours) | | — |
+| Android Vector Drawable (XML) | — | yes (ours) | an `.xml` drawable resource (`file.export {format: "xml"}`, export settings, File ▸ Export…, the CLI and MCP), pretty-printed, sized in dp with the viewport in layer units, for AndroidX (VectorDrawableCompat: gradients and even-odd need API 24 without it). Shapes, booleans and text as path data with transforms baked in; solid fills and linear, radial and sweep gradients (`aapt:attr`, exact for any handles: radial and sweep in a `<group>` that maps the unit circle); centred strokes as stroke attributes where Android draws them the same (uniform scale, one cap, no dashes or variable width), other strokes as filled outlines; clipping frames and masks as `<group>` with `<clip-path>`; `android:name` from layer names with the id attribute option. What the format can't hold goes by the compatibility mode (`vdCompat`): best effort (default) applies layer opacity to each shape, rewrites even-odd fills and clip outlines as non-zero, draws diamond gradients as radial and alpha masks as outline clips, each with a warning; exact leaves out what it can't draw exactly, with a warning; ignore writes what maps without warnings: layer opacity over overlapping shapes is dropped (drawn opaque), even-odd fills keep `fillType="evenOdd"`, even-odd clip outlines clip as non-zero, diamond gradients are left out and alpha masks clip to their outline. Effects, image and pattern fills and blend modes are always left out (warned except in ignore); an export that draws nothing writes one empty path (Android refuses a drawable without a path), with a warning. Checked by parsing the XML, against FigCraft's renderer (gradients pixel by pixel), with `aapt2 compile` and `link`, and by rendering samples (linear, skewed radial and sweep gradients, a sweep with mirrored handles, even-odd booleans, centred and inside strokes, rotated text, a clipping frame, an alpha mask, a translucent group, each compatibility mode) with Android 13's (API 33) VectorDrawable on an emulator, next to FigCraft's PNG export: they match, including where the sweep starts and which way it turns, except what the compatibility mode and its warnings say (best effort: overlapping shapes in a translucent group look denser; exact and ignore leave out or draw opaque what they list). Not checked on API 21–23 (VectorDrawableCompat) | — |
 | Copy as CSS / SVG / PNG / text / link | yes | yes | Copy as PNG: the whole selection at 2x | — |
-| Dev Mode code (CSS, iOS SwiftUI, Android Compose) | yes | yes, plus HTML, React, Leptos and Flutter | see [dev-mode-parity](dev-mode-parity.md) | — |
-| `.fig` ("Save local copy") | yes | **experimental** | the whole file; see [Export to `.fig`](#export-to-fig-experimental). Round trips through our own importer; written files checked by opening them in other software: layers, fills, gradients, strokes, shadows, vectors, components and text draw as in FigCraft; resized and scaled instances keep their size and lay their layers out for it, variables with their modes and colour bindings resolve there (a frame set to another mode shows that mode's colours, also inside instances), colour, text, effect and grid styles are listed, and variable-width strokes that are the same on both sides of the path draw with their width | 5–15 (non-colour bindings as bindings, checks of effects, images and prototypes, and against real files) |
+| Dev Mode code (CSS, iOS SwiftUI, Android Compose) | yes | yes, plus HTML, React, Vue, Leptos, ArkUI and Flutter | see [dev-mode-parity](dev-mode-parity.md) | — |
+| `.fig` ("Save local copy") | yes | **experimental** | the whole file, also as a copy from File ▸ Save as… (the document keeps its `.figcraft` path and unsaved state); see [Export to `.fig`](#export-to-fig-experimental). Round trips through our own importer; written files checked by opening them in other software: layers, fills, gradients, strokes, shadows, vectors, components and text draw as in FigCraft; resized and scaled instances keep their size and lay their layers out for it, variables with their modes and colour bindings resolve there (a frame set to another mode shows that mode's colours, also inside instances), colour, text, effect and grid styles are listed, and variable-width strokes that are the same on both sides of the path draw with their width | 5–15 (non-colour bindings as bindings, checks of effects, images and prototypes, and against real files) |
 
 ### Export to `.fig` (experimental)
 
 `file.export {format: "fig"}` (or a `path` ending in `.fig`), File ▸ Export… ▸ .fig (experimental),
 `figcraft-cli export <file> -o <out>.fig` (and `convert`) and MCP's `export {format: "fig"}` write
-the whole document. The writer (`crates/format/src/fig/export.rs`) works from the same public format
+the whole document; so do File ▸ Save as… and `file.save` / `file.saveAs` with a `.fig` path, as a
+copy: the document keeps its `.figcraft` path, unsaved changes and version preview, and a file an
+earlier build saved under a `.fig` name is never overwritten by Save (`save_format_tests`,
+`save_as_tests`). The writer (`crates/format/src/fig/export.rs`) works from the same public format
 notes as the import and inverts its mapping: the zip holds `canvas.fig` (the fig-kiwi header, then a
 raw-deflate binary schema and a raw-deflate message), `meta.json`, `thumbnail.png` and
 `images/<hash>`; `meta.json` names the file and gives the page colour and the thumbnail size. The
@@ -80,17 +85,21 @@ each.
   their filled areas), text, boolean groups, slices; the fill outline of frames and shapes and the
   stroke outline of plain strokes (a ring around boxes and whole ellipses, the widened path of other
   centred strokes);
-  solid, gradient (handles as the paint transform) and image paints (the image bytes, scale mode,
+  solid, gradient (handles as the paint transform) and image paints (the image bytes, named by their SHA-1, scale mode,
   rotation, tile scale, crop); strokes (weight, align, join, caps, dashes, miter limit, per-side
   weights); shadows, layer and background blurs (progressive too), noise and texture; corners and
   smoothing, constraints, clip content, masks with their type; auto layout (direction, wrap, gaps, padding,
-  alignment, hug, strokes in layout, stacking order, grids with their tracks and cells) and how
-  layers sit in it (fill, absolute, min/max sizes); layout grids; export settings; text style
-  (font, with styles under their standard names such as "Semi Bold"; size; line height, a share of
+  alignment, hug, strokes in layout, stacking order, grids with their tracks, their sizes (fixed, hug, fill) and cells) and how
+  layers sit in it (fill, absolute, min/max sizes, an axis without a maximum as infinite); layout grids; export settings; text style
+  (font, with styles under the names font families give their faces: "SemiBold", "ExtraBold"…, and
+  "Semi Bold" in Inter; size; line height, a share of
   the font size as a raw multiplier; letter spacing, case, decoration, links), alignment, auto resize,
   truncation, paragraph spacing and indent, list types and styled runs with their fills (indexed
   by UTF-16 unit); components (description, boolean, text and instance swap properties and the
-  layers bound to them), component sets, instances (their main, property values, what the instance
+  layers bound to them, with their values also as variable data), component sets (the set holds
+  the definitions, variant properties included with their values in order; each variant has its
+  own copy of each definition and its variant values, and its layers and instances name that
+  copy), instances (their main, property values, what the instance
   itself changes from its main, such as its size, name and paints, as an override addressed by the
   main's id, the fields its layers change, by id path, through nested instances and swaps, and what
   follows from those as derived data: each layer's size, place and outline and the colours its
@@ -112,17 +121,17 @@ each.
   properties, arc fields, font weight: written as the values they give), text styles on part of a
   text (written as values), variables' publishing, code syntax and inheritance settings, extended
   collections (written as collections of their own), comments, Dev Mode annotations, statuses,
-  resources and code links, plugin data, ruler
+  resources, measurements and code links, plugin data, ruler
   guides, prototype device settings, slot properties and slot content, brush
   strokes (written plain), strokes wider on one side of their path (written as filled outlines, or
   with the width on both sides when the shape has a fill too), pattern fills, WebP export settings (written as PNG),
   image adjustments, glass settings other than frost, springs other than Gentle (written as ease
   out), set-variable, set-variable-mode and conditional actions, scroll-to offsets, text decoration
   looks, variable font axes, text on a path, nested list levels, list spacing, hanging punctuation,
-  leading trim, OpenType features, per-layer operations inside boolean groups, grid tracks of fixed
-  or content size, different stroke ends on lines. Not written at all: stroke outlines of dashed and
-  per-side strokes and of inside or outside strokes on polygons, stars and vectors, glyph outlines
-  of text (a reader lays text out with its own fonts), version history and branches.
+  leading trim, OpenType features, per-layer operations inside boolean groups, different stroke ends
+  on lines. Not written at all: stroke outlines of dashed and per-side strokes and of inside or
+  outside strokes on polygons, stars and vectors, glyph outlines of text (a reader lays text out
+  with its own fonts), version history and branches.
 - **Checked by opening written files in other software:** the example documents and a small test
   file open there, and layers, fills, gradients, strokes, shadows, vectors, components and text draw
   as in FigCraft. A file saved again there and read back keeps the layer tree and properties; two
@@ -134,6 +143,16 @@ each.
   Not working or unchecked there: number, string and boolean bindings and bindings on effects, layout guides and gradient stops come across as the values they give but did not show as bound there (their entries now also name the layer field they set, not yet checked there), and strokes wider on one side of the path are written as filled outlines, no longer editable strokes there (the stroke itself is kept as plugin data and our own import puts it back; not yet checked there); effects such as
   glass and noise, images and prototype interactions are unchecked. Text boxes sized to their content can come out
   a pixel wider or narrower there.
+  Then (2026-10-22), importing synthetic files into the incumbent (Drafts ▸ Import): any file with an
+  image failed ("Internal error during import") while images were named by their SHA-256; named by
+  their SHA-1 they import with their images. Component sets came in without their variant
+  properties and with boolean, text and instance swap properties unbound; with the set holding the
+  definitions and each variant its own copies (the layout of a file the incumbent saves itself),
+  the set lists every property, the variants' layers are bound to them and instances keep their
+  values. Frames with only a maximum width collapsed (the missing maximum height was written as 0),
+  and text in a family that spells compound weights without a space (Libre Franklin Semi Bold) was
+  a missing font and not drawn; both fixed. Variables with their modes, shared styles and their
+  links, colour bindings and the modes frames set came across.
 - **Round trips through our own importer:** 60 generated documents (every layer
   kind above, components, nested instances with overrides, a grid inside a component,
   interactions) are exported, read back and compared layer by layer: structure, geometry within
@@ -156,12 +175,28 @@ each.
 | Local fonts | yes (font helper / desktop app) | yes (system scan) |
 | Bundled/shared fonts | Google Fonts in the cloud | optional `CRAFT_FONTS_DIR` build input (storytold/craft-fonts) |
 | Variable fonts | yes | yes (axes, named instances, per-range axis values) |
-| Missing-font replacement on open | yes | warnings only (REST import) | 
+| Missing-font replacement on open | yes | listed, not replaced: in the desktop app the Missing fonts window opens after a file that uses them opens and from Text ▸ Missing fonts (`text.missingFonts`; `figcraft-cli info` prints `missing font` lines), and their text draws in a fallback font |
 
 ## Revision history
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-26 | minor | Changes made to the open file by another app are no longer lost on save (#1330): the app now remembers the file's size and modification time when it opens, reverts or saves it, and Save and auto-save refuse while the file on disk differs, with a message pointing to Revert to saved or Save as (the tab stays unsaved; closing it stays open). Scripts pass `file.save {overwrite: true}` to replace the file anyway; Save as and a save to an explicit `path` write as before. Not detected: a change of the same size inside one modification-time tick of a coarse file system. No prompt with choices yet, and a change isn't noticed until a save (`save_disk_changes_tests`). Numbers unchanged |
+| 2026-10-25 | patch | PNG: the export settings were listed as "contents only" and "include bounding box (the layer's own box)"; the row now names ignore overlapping layers, on by default, and says that the Export section offers include bounding box for text layers (#1307), while `file.export` and `export.update` take it for any layer. Numbers unchanged |
+| 2026-10-24 | patch | Fonts: the missing-font row said "warnings only (REST import)"; it now names the Missing fonts window (#752), `text.missingFonts` and the `missing font` lines of `figcraft-cli info`. Replacing a missing font is still missing. Numbers unchanged |
+| 2026-10-24 | minor | Slices and contents only (Figma's Ignore overlapping layers): with it on, a slice inside a frame or group exports only that frame or group and the layers in it, and its Export preview shows the same; with it off, or for a slice on the page or in a section, the slice exports everything in its area as before |
+| 2026-10-24 | minor | Boards (M12): `.figcraft` saves the file kind (`kind: "board"`, absent for design files) and each board object's `board` metadata; the `.jam` row points at boards |
+| 2026-10-22 | minor | `.fig` export writes grid track sizes (`gridColumnsSizing` / `gridRowsSizing`) at the field ids the incumbent reads (474 / 475). Checked on a synthetic grid there (fixed 320/140/112/34/34 px columns): its columns keep their sizes. Numbers unchanged |
+| 2026-10-22 | minor | `.fig` export imports into the incumbent (checked with synthetic files, black-box): images are named and referenced by their SHA-1 (with SHA-256 names any file with an image failed to import); component sets hold their property definitions, variant properties included, with a copy per variant that its layers and instances name, and values also as variable data, so properties, bindings and instance values come across; an axis without a maximum size is written as infinite (0 collapsed frames with only a maximum width); compound weights are spelt the way font families name their faces ("SemiBold"; "Semi Bold" in Inter), so their text isn't a missing font; the kiwi encoder writes infinite floats. Numbers unchanged |
+| 2026-10-21 | minor | `.sketch` import (best effort): files saved by Sketch 48 and newer open and import like `.fig` files (open, import, drop, CLI, MCP), mapped onto the REST importer: layers, paths, shape groups and booleans, styles and effects, masks, text, symbols with overrides (live instances), shared styles, Color Variables, prototype links, export settings and grids; older files are refused with a message. Sketch 2025 and newer: frames, graphics, stacks as auto layout, corners, pins and sizing, tints, per-side borders, blur lists. Checked on fixtures and locally on real Sketch 50, 64 and 2026 files and the IBM Carbon Design Kit (Sketch 68 and 83 open; the Sketch 47 edition is refused). Numbers unchanged |
+| 2026-10-15 | minor | `.fig` import (#279, #281; #266, #267): resized instances lay out their layers by their constraints, and explicit variable modes whose collection is named by its asset key come across (before, they were dropped and bound layers resolved in the default mode); fixture-tested, real files still owed. `.figcraft`: atomic saves and exports through unique staging files (#284), optional auto-save (#305). SVG export keeps a nested frame's fill and stroke inside its parent's clip (#327). Numbers unchanged |
+| 2026-10-20 | minor | `.fig` export writes grid track sizes (`gridColumnsSizing` / `gridRowsSizing`): fixed px, fractional fill and content-sized tracks keep their sizes and come back through our own importer (#465). Tracks whose size the format can't hold (a negative or out-of-range value) keep their id and read back equal, with a warning. Numbers unchanged |
+| 2026-10-18 | minor | Android Vector Drawable (XML) export, ours: the format, its compatibility modes (`vdCompat`: best effort, exact, ignore) and warnings; a `.fig` export writes XML export settings as SVG, with a note. Numbers unchanged |
+| 2026-10-18 | minor | REST file JSON import keeps `SLOT` layers (#792): they were dropped with everything placed in them, which emptied every instance's slot. A slot in a main component becomes a slot frame bound to its `SLOT` property (the one it references, else the one named like it, else the only one left), and an instance's slot holds the instance's own content, kept across syncs, moves of the mains and saving, unless the instance's property value is the main's default content (without values, a slot that holds layers keeps them). Instances in slot content link to their own mains. Slot content limits, preferred-only and preferred components are warnings. Synthetic files only. Numbers unchanged |
+| 2026-10-17 | minor | REST file JSON import reads grid track sizes from the CSS track strings `gridColumnsSizing` / `gridRowsSizing` (fixed px, fill fr, hug `auto`, `minmax(0, 1fr)`, `repeat()`; other tracks stay equal) (#465). Numbers unchanged |
+| 2026-10-17 | minor | The community batches #727 and #728 in the `.fig` row: instance identity and cached library components, overrides by key, text style precedence, grid track sizes, slot content, labels of connectors saved with their path, skip ink, paragraph options, list start numbers, vertical trim, per-point stroke joins, text on a path, image adjustments (also REST), images in the message; budgets from the file's size; the journal keeps no file bytes; the import report. Not read cut to what's left. A `.fig` copy from Save as. Pasted content: layers copied from another design app, best effort (tested only with clipboard HTML made from our own export), and images under Wayland (not run there). All on synthetic files: summary and hours unchanged |
+| 2026-10-17 | minor | Hug on import (#732): auto layout frames a `.fig` records no primary-axis sizing for hug on that axis (auto layout sized that axis by its content before it could be fixed) instead of turning fixed, instances that record no auto layout take their main's (they came in without auto layout and fixed, so longer text overflowed them), REST frames whose sizing modes are left out hug (the documented default), and text hugs by its resize mode (auto width both axes, auto height its height; it came in fixed). Numbers unchanged |
+| 2026-10-17 | minor | Instance layers' own size and resizing (#731): a `.fig` import keeps the sizes an instance gives its layers and their hug/fill/fixed and min/max as overrides, a REST import reads the resizing fields of `overrides`, and a `.fig` export writes a layer's own size as an override (it went with the derived layout, which a relayout replaces). Numbers unchanged |
 | 2026-10-14 | minor | SVG/PDF depth overflow (#208) is checked before bounds and drawing; public checked APIs return the offending root/layer, commands and CLI report it, and no incomplete export replaces an existing file. Tested at depths 255/256/257, with inner roots, hidden branches, masks, raster fallbacks and multiple roots/pages. Numbers unchanged. |
 | 2026-10-13 | minor | `.fig` export (gap 1): instances write what they change from their main as an override addressed by the main's id (their size, name and paints were lost elsewhere without it), what follows for their layers as derived data, and a scale factor when scaled as a whole; layers of a nested instance swapped for another component keep their overrides; variable collections, modes, variables and their bindings, the modes frames and pages set, shared styles with their links and variable-width strokes are written, and the import reads all of it back (style definitions and unused styles, variable order and scopes, bindings on paint lists, gradient stops, effects and layout grids, page modes, text field bindings, which a `.fig` import used to drop, and width profiles). Opened `.fig` and file JSON documents link nested instances of variants (and any nested instance under a name of its own) to their main's layers; they stayed unlinked, so a second export lost what they changed. Checked by opening written files in other software: resized and scaled instances keep their size and lay their layers out for it, variables with their modes and colour bindings resolve there (a frame set to another mode shows that mode's colours, also inside instances), colour, text, effect and grid styles are listed, and variable-width strokes that are the same on both sides of the path draw with their width; number, string and boolean bindings and bindings on effects, layout guides and gradient stops come across as the values they give but did not show as bound there (their entries now also name the layer field they set, not yet checked there), and strokes wider on one side of the path are written as filled outlines, no longer editable strokes there (the stroke itself is kept as plugin data and our own import puts it back; not yet checked there). Numbers unchanged |
 | 2026-10-12 | minor | `.fig` export made to open elsewhere (gap 1): the document and its pages say they are visible and opaque (left out, nothing was drawn), the schema in the file uses the format's own names, kinds, field ids and enum values, rectangles are rounded rectangles with four radii, frames and shapes carry their fill outline and plain strokes their stroke outline, text carries its layout settings, font styles use their standard names, line heights that are a share of the font size are raw multipliers, masks keep their type (read back too); the import reads per-side stroke weights whose zero sides are left out. Written files were checked by opening them in other software: layers, fills, gradients, strokes, shadows, vectors, components and text draw as in FigCraft; effects such as glass and noise, images and prototype interactions are still unchecked there, and variables are not written. Numbers unchanged |
diff --git a/docs/gaps.md b/docs/gaps.md
index 5c32219b..f18593c4 100644
--- a/docs/gaps.md
+++ b/docs/gaps.md
@@ -1,6 +1,6 @@
 # Where FigCraft falls short of Figma
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-16 · **Change:** minor (Flutter code generation; bounded canvas pan overscan; reviewed Russian catalog and integer plurals; `.fig` export: instance sizes, variables with modes, shared styles, variable-width strokes; sharing with a join code; text box sizes measured against documents re-saved by other software; live sessions per document; .fig export checked by opening written files in other software; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; `.fig` import: editable vector networks, more layer kinds, variable prototype actions; `.fig` import, best effort: gap 1 down to its tail; Windows QA pass: everyday workflows on Windows 11, eight fixes incl. unsaved work kept after a crash or a forced quit; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings: gap 14 down to its tail) · **Target:** Figma Design (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-25 · **Change:** minor (gap 17: branches in live sessions, branch history entries, the list-merge rows brought up to date; gap 6: plugin widgets take text input and a property menu (plugin API 4); gap 24: board templates and tables; gap 24: a shared timer and voting sessions; gap 24: the board dot grid, connector ends dragged to re-attach, curved connectors; egui/eframe 0.37 verified for gap 18; known gaps from the #1311 review in gaps 4, 14, 15 and 16; gap 16: measurements kept on the canvas, a read-only layers panel in Dev Mode; gap 24: boards and their tail; Dev Mode tail: import lines in layer trees, compare with versions, an inspect-only canvas; gap 5: reviewed Turkish, Czech and Indonesian drafts, the Japanese draft completed; reviewed Russian catalog and integer plurals; `.fig` export: instance sizes, variables with modes, shared styles, variable-width strokes; sharing with a join code; text box sizes measured against documents re-saved by other software; live sessions per document; .fig export checked by opening written files in other software; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; `.fig` import: editable vector networks, more layer kinds, variable prototype actions; `.fig` import, best effort: gap 1 down to its tail; Windows QA pass: everyday workflows on Windows 11, eight fixes incl. unsaved work kept after a crash or a forced quit; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings: gap 14 down to its tail; the 2026-10-17 landings: `.fig` import fidelity, budgets for large files, the import report, a `.fig` copy from Save as and paste from another design app (gap 1); menus, the Actions palette, editor fixes, Selection colors and smart-selection spacing (gap 4); catalog counts re-measured (gap 5); bounded canvas pan overscan; reviewed Russian catalog and integer plurals; `.fig` export: instance sizes, variables with modes, shared styles, variable-width strokes; sharing with a join code; text box sizes measured against documents re-saved by other software; live sessions per document; .fig export checked by opening written files in other software; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; `.fig` import: editable vector networks, more layer kinds, variable prototype actions; `.fig` import, best effort: gap 1 down to its tail; Windows QA pass: everyday workflows on Windows 11, eight fixes incl. unsaved work kept after a crash or a forced quit; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings: gap 14 down to its tail) · **Target:** Figma Design (desktop app 126.10.7)
 
 Every known shortfall against Figma, one entry each, ranked by how much it stops a Figma user from
 doing real work in FigCraft. Agents: pick work from the top unless the owner says otherwise. The
@@ -14,12 +14,12 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
 
 | # | Gap | Kind | Hours | Doc |
 |---|---|---|---|---|
-| 1 | `.fig` files: best-effort import with editable vector networks and stand-ins for non-design layers landed, and an experimental export (round trips through our own importer; written files opened in other software, where layers, fills, gradients, strokes, shadows, vectors, components and text draw as in FigCraft, instances keep their size and variables with modes and colour styles come across); real-file checks and the small tail left (**beta blocker** until checked on real files, gap 3) | File format | 5–10 | [file-format-parity](file-format-parity.md) |
+| 1 | `.fig` files: best-effort import with editable vector networks and stand-ins for non-design layers landed, then (2026-10-17) more fidelity on synthetic files, budgets for large files, an import report and paste from another design app; an experimental export, also as a copy from Save as (round trips through our own importer; written files opened in other software, where layers, fills, gradients, strokes, shadows, vectors, components and text draw as in FigCraft, instances keep their size and variables with modes and colour styles come across); real-file checks and the small tail left (**beta blocker** until checked on real files, gap 3) | File format | 5–10 | [file-format-parity](file-format-parity.md) |
 | 2 | Multiplayer and sharing are a preview, without accounts (**beta blocker**) | Feature | 42–84 | [collaboration-parity](collaboration-parity.md) |
 | 3 | Nothing checked against real Figma files | Fidelity | 15–30 | [target-app-parity](target-app-parity.md) |
 | 4 | Interaction fidelity not compared tool by tool | UI/UX | 40–60 | [ui-parity](ui-parity.md) |
-| 5 | Localization: English, reviewed Russian, plus unreviewed Spanish (and Latin American Spanish), French, German, Brazilian Portuguese, Japanese, Korean and Simplified Chinese drafts | Localization | 29–51 | [localization-parity](localization-parity.md) |
-| 6 | Plugins: widgets take clicks only, a self-hosted directory but no public catalogue; Figma's plugins don't run | Ecosystem | 8–26 | [target-app-parity](target-app-parity.md) |
+| 5 | Localization: English, reviewed Russian and Turkish, plus unreviewed Spanish (and Latin American Spanish), French, German, Brazilian Portuguese, Japanese, Korean, Simplified Chinese, Indonesian and Czech drafts; Turkish and Swedish catalogs | Localization | 29–51 | [localization-parity](localization-parity.md) |
+| 6 | Plugins: widgets without hover or timers, a self-hosted directory but no public catalogue; Figma's plugins don't run | Ecosystem | 6–22 | [target-app-parity](target-app-parity.md) |
 | 7 | CPU canvas where Figma uses the GPU | Hardware/performance | 30–60 | [hardware-parity](hardware-parity.md) |
 | 8 | Platform QA: Linux and the browser left (Windows pass done 2026-10-11) | Stability/platforms | 10–20 | [hardware-parity](hardware-parity.md) |
 | 9 | Figma Draw: pen pressure on macOS/Linux tablets (multi-edit, brushes, pressure, text on a path and pattern fills landed) | Feature | 1–3 | [target-app-parity](target-app-parity.md) |
@@ -29,14 +29,15 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
 | 13 | Vector tail: none left (boolean hit testing on the result landed 2026-10-11) | Feature | — | [target-app-parity](target-app-parity.md) |
 | 14 | Variables: extended collections checked on real libraries (the tail landed 2026-10-12) | Feature | 0–1 | [components-parity](components-parity.md) |
 | 15 | Prototyping: media triggers and actions; controllers on macOS, Linux and FreeBSD (controller buttons on key/gamepad triggers, widgets in prototypes landed) | Feature | 2–5 | [prototyping-parity](prototyping-parity.md) |
-| 16 | Dev Mode: import lines inside generated layer trees; the editor extension is left to the MCP server (code connect, Dev Mode plugins and dev resources landed) | Feature | 0–1 | [dev-mode-parity](dev-mode-parity.md) |
-| 17 | Branching: branches in live sessions, lists other than fills, strokes and effects merged whole (a branch's own version history and per-item list merges landed 2026-10-12) | Feature | 1–2 | [collaboration-parity](collaboration-parity.md) |
+| 16 | Dev Mode: publishing mappings from the code repository; the editor extension is left to the MCP server (measurements kept on the canvas and a read-only layers panel landed 2026-10-24) | Feature | 1–2 | [dev-mode-parity](dev-mode-parity.md) |
+| 17 | Branching: text runs merged whole, branches only their author sees in a live session (branches in live sessions, export settings and guides item by item, and history entries for creation and updates landed 2026-10-24) | Feature | 1–2 | [collaboration-parity](collaboration-parity.md) |
 | 18 | Display P3 on screen: blocked upstream (egui-wgpu picks an 8-bit sRGB surface); gamut warning and soft-proof sRGB landed, as did several windows | Hardware | 4–8 | [hardware-parity](hardware-parity.md) |
 | 19 | AI features | AI | 30–60 | [target-app-parity](target-app-parity.md) |
 | 20 | Mobile apps (view, mirror, comment) | Platforms | 20–40 | [hardware-parity](hardware-parity.md) |
 | 21 | Menu items without a command: none left (landed 2026-10-11) | Feature | — | [parity-checklist](parity-checklist.md) |
 | 22 | Screen readers never run; browser has no accessibility tree | UI/UX | 4–8 | [ui-parity](ui-parity.md) |
 | 23 | CMYK output intent for print PDFs | File format | 2–4 | [file-format-parity](file-format-parity.md) |
+| 24 | Boards: the whiteboard tail (widgets, mind maps, waypoints…) | Feature | 20–44 | [boards-parity](boards-parity.md) |
 
 ## Entries
 
@@ -60,20 +61,43 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
   derived data for their layers, a scale factor), variables with modes and bindings, shared styles
   and variable-width strokes are written and read back; checked there: resized and scaled instances keep their size and lay their layers out for it, variables with their modes and colour bindings resolve there (a frame set to another mode shows that mode's colours, also inside instances), colour, text, effect and grid styles are listed, and variable-width strokes that are the same on both sides of the path draw with their width; number, string and boolean bindings and bindings on effects, layout guides and gradient stops come across as the values they give but did not show as bound there (their entries now also name the layer field they set, not yet checked there), and strokes wider on one side of the path are written as filled outlines, no longer editable strokes there (the stroke itself is kept as plugin data and our own import puts it back; not yet checked there),
   like effects such as glass and noise, images and prototype interactions.
-- **Missing:** connector labels, elbowed or curved connectors without a saved path (drawn straight),
-  table cells beyond their own layers, filled areas of a vector with their own fills, per-point stroke
-  joins, variables bound to fields the editor can't bind, fixed or content-sized grid tracks and video
-  fills aren't read; text lays out again with
-  local fonts. Nothing has been checked against real-world files yet (gap 3). The export is checked
-  only against our own importer: whether other apps open its files is unknown.
+- **Landed (2026-10-17, community batches #727 and #728, then #745):** the import keeps an
+  instance's own identity and the cached copies of library components a file carries, applies
+  instance overrides by key and order, lets local text values and instance overrides win over a
+  shared text style, and reads grid track sizes (fixed, content-sized and fill), slot content,
+  labels of connectors saved with their drawn path (text and background, as a static snapshot:
+  the ends aren't live), skip ink, paragraph options and hanging lists, list start numbers,
+  vertical trim, per-point stroke joins, editable text on a path, image adjustments (the tint
+  sign shared with the REST import) and images carried in the file's message; layers inside
+  instances keep their own size and resizing as overrides (#731), and auto layout and text that
+  record no sizing hug (#732). Large files open within budgets set from the file's own size (one
+  value per compressed byte, 20M–128M values, lower ceilings on 32-bit targets; a 15.4 MB
+  synthetic file with 300,000 layers opens whole). After a `.fig`, REST JSON or SVG import an
+  import report lists what was left out or changed (translated where the catalog has the note;
+  `file.open {data}` returns a `summary`), and imported file bytes stay out of the command
+  journal. File ▸ Save as… to a `.fig` name writes an export copy and the document keeps its
+  `.figcraft` path. Layers copied from another design app paste (`edit.pasteDesignLayers`, and
+  Cmd/Ctrl+V when the clipboard's HTML holds a `.fig` canvas): read like a `.fig` file, with its
+  warnings, size-checked (256 MB) before decoding.
+- **Missing:** elbowed or curved connectors without a saved path (drawn straight), labels of
+  connectors without a saved snapshot, table cells beyond their own layers, filled areas of a
+  vector with their own fills (#634, held for an owner decision on the document model), variables
+  bound to fields the editor can't bind and video fills aren't read; text lays out again with
+  local fonts. Nothing has been checked against real-world files yet (gap 3): the 2026-10-17
+  changes were tested on files built in code, and paste from another design app on clipboard HTML
+  made from our own export, never on a real clipboard. The export was checked in other software
+  on our example documents and small test files only.
 - **Evidence:** fixtures generated in code (`crates/format/src/fig/tests.rs` and `tail_tests.rs`: kiwi
   round trips, every mapped feature, vector network blobs, truncation, bit flips and junk never panic); `crates/engine/src/fig_import_tests.rs`.
+  2026-10-17: `crates/format/src/fig/{connector_label,slot,source_identity,text_style,text_list,text_paragraph,text_path,text_skip_ink,image_filter,auto_layout_sizing}_tests.rs`,
+  `map_connector_snapshot_budget_tests.rs`, `crates/engine/src/{save_format,design_paste,instance_resizing}_tests.rs`,
+  `crates/ui-egui/src/{import_report,save_as}_tests.rs`.
   Export: 60 generated documents round trip through the importer layer by layer, written files
   decode with the generic decoder and list parents first, the encoder agrees with the decoder,
   junk documents never panic (`crates/format/src/fig/export_tests.rs`,
   `crates/engine/src/fig_export_tests.rs`).
 - **Impact:** existing work can be brought across, but only real files will show how much of it.
-- **Estimate:** 5–10 h for the read tail (real-file fixes, connector labels, table cells); checking the export against real files a further 5–15 h (with gap 3).
+- **Estimate:** 5–10 h for the read tail (real-file fixes, table cells, connectors without a saved path); checking the export against real files a further 5–15 h (with gap 3). Unchanged on 2026-10-17: most of the read tail is real-file fixes, which nothing has measured yet.
 
 ### 2. Multiplayer and sharing are a preview, without accounts
 - **Missing:** accounts, teams and projects, per-person permissions, audio,
@@ -93,8 +117,11 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
   `figcraft-server` keeps many files (snapshot plus log, compacted; restarts lose nothing
   confirmed), takes files published from the app and hands out share links that let people edit
   or only view; the desktop app and the browser reach it over `wss://` through a TLS reverse
-  proxy, and releases ship it with a deployment guide (`docs/server.md`). But there are no
-  accounts (a link is the access) (`docs/collab-protocol.md`).
+  proxy, and releases ship it with a deployment guide (`docs/server.md`); server message limits
+  follow `max_file_mb`, so files above 64 MiB publish and open (#705), a damaged generation field
+  no longer drops a log's flushed edits (#687), and the browser build joins from a `#join=` link
+  (#712: unit-tested, not run in a browser). But there are no accounts (a link is the access)
+  (`docs/collab-protocol.md`).
 - **Impact:** Figma's defining feature; most teams use it every day. Solo designers can work
   without it.
 - **Estimate:** 42–84 h: accounts, teams and per-person permissions, shared comments and versions
@@ -104,7 +131,7 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
 - **Missing:** a corpus of real documents (design systems, app screens, prototypes) imported and
   compared with Figma's own PNG/SVG/PDF exports.
 - **Evidence:** every corpus in the repo is synthetic (`crates/svg/tests/corpus`, the synthetic
-  design system in `crates/engine/src/synthetic_ds.rs`). Scores were self-graded by the agents that
+  design system in `crates/engine/src/content/synthetic_ds.rs`). Scores were self-graded by the agents that
   built the features.
 - **Impact:** unknown fidelity in auto layout sizing, text metrics, effects and component
   resolution on real files; the numbers in this repo can't be trusted beyond "estimated" until it
@@ -125,7 +152,9 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
 
 ### 4. Interaction fidelity not compared tool by tool
 - **Missing:** a side-by-side pass of every tool and panel: cursors, modifier keys while dragging,
-  hover states, popovers, menus, snapping thresholds.
+  hover states, popovers, menus, snapping thresholds. Known: the Assets panel's export preview
+  follows a slice's first export setting, so a second setting with the other Ignore overlapping
+  layers value previews differently from what it exports.
 - **Landed (2026-10-11):** behaviour suites written from the public documentation for auto layout,
   selection and transform, text, and canvas navigation with rulers, guides, layout grids, outline
   mode and measuring, then (2026-10-12) comments and version history, and the layers and Assets
@@ -138,33 +167,47 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
   cursor for every tool and modifier, panel widths, dark pages (`field_tests`, `cursor_tests`,
   `cursors_tests`, `outline_options_tests`, `hide_publishing_tests`, `panel_width_tests`,
   `theme_pages_tests`).
+- **Landed (2026-10-17, community batches #733, #735, #736 and #729):** submenus open after a
+  short hover, keep their place while the pointer heads for them (a safe triangle) and reopen
+  closed (`menu_aim_tests`; timings tuned by feel, not measured); the Actions palette has tabs,
+  ranked search over every command, a keyboard highlight and recents (`palette_tests`); menu items
+  that need a value ask for it; live font preview on hover; the colour picker opens on a new fill
+  or stroke; Shift-drag on a selected layer moves the selection; a double-click near a thin stroke
+  enters vector edit; points dropped on a point merge; a draggable divider between Pages and
+  Layers; Paste over and Paste properties from the keyboard; then (#753) Selection colors for mixed
+  selections and smart-selection spacing fields and canvas handles (no reorder rings). Each was checked in the app (on
+  Windows; the submenus by their author), none side by side with Figma, none on macOS.
 - **Evidence:** ROADMAP item 7 ("Left: tool by tool, panel by panel against the incumbent").
 - **Impact:** Figma users notice the feel within minutes; it decides whether they stay.
 - **Estimate:** 40–60 h. Detail in [`ui-parity.md`](ui-parity.md).
 
-### 5. Localization: English, reviewed Russian, plus unreviewed drafts
+### 5. Localization: English, reviewed Russian and Turkish, plus unreviewed drafts
 - **Missing:** native reviews of the Spanish, French, German, Brazilian Portuguese, Japanese,
-  Korean and Simplified Chinese drafts and the Latin American Spanish overlay, the 25 newest strings
-  in five drafts, Hindi, Arabic, Indonesian and Vietnamese, localized engine messages and number
-  formatting; CJK UI text on the web without the craft-fonts CJK build.
+  Korean, Simplified Chinese, Indonesian and Czech drafts and the Latin American Spanish
+  overlay, the strings added since each catalog was drafted (1–5% of each), Hindi, Arabic and
+  Vietnamese, localized engine messages and number formatting; CJK UI text on the web without the
+  craft-fonts CJK build.
 - **Evidence (measured from source):** the layer landed 2026-10-11: catalogs in
-  `crates/ui-egui/locales/` (1,371 UI keys plus 524 command labels and 29 menu wordings),
-  Preferences ▸ Language, `pref.language`; `en.toml` is complete, and `es.toml`, `fr.toml`,
-  `de.toml`, `pt-BR.toml`, `ja.toml`, `ko.toml` and `zh-Hans.toml` (2026-10-12) are machine drafts
-  (all but `zh-Hans.toml` lack the 25 newest strings), with `es-419.toml` a Latin American overlay
-  listing only what differs from Spanish (Spanish and Russian are held to completeness by the check; the
-  others show English for strings added later). Russian adds all 2,165 current entries,
-  reviewed and approved by VanTan, with one/few/many integer plurals.
+  `crates/ui-egui/locales/` (measured 2026-10-17: 1,680 UI keys plus 561 command labels and 31
+  menu wordings, 2,272 entries), Preferences ▸ Language, `pref.language`; `en.toml` is complete,
+  Spanish is held to completeness by the check, and the French, German, Brazilian Portuguese,
+  Japanese, Korean and Simplified Chinese machine drafts cover 95–99% (strings added since they
+  were drafted show English), with `es-419.toml` a Latin American overlay listing only what
+  differs from Spanish. Russian (reviewed and approved by VanTan, one/few/many integer plurals)
+  covers 98.8%; Indonesian and Czech drafts, a Turkish catalog whose header says a native speaker
+  reviewed it, and a Swedish catalog (with its command labels since 2026-10-17) cover 98.7–99.6% ([localization-parity](localization-parity.md#languages)).
   CJK UI text uses an installed CJK face the desktop app loads when something on screen needs it
   (`crates/ui-egui/src/cjk.rs`). Engine error messages and Dev Mode values stay English.
 - **Impact:** non-English designers get machine drafts nobody has reviewed yet, and English
   errors.
 - **Estimate:** 3–7 h per language plus native review, 4–6 h for engine messages and numbers;
-  29–51 h for the key languages left and the drafts' follow-ups. Detail in
+  29–51 h for the key languages left and the drafts' follow-ups (kept on 2026-10-17: the
+  Indonesian draft takes 2–3 h off, about what bringing the drafts that slipped to 95% back to
+  every string adds). Detail in
   [`localization-parity.md`](localization-parity.md); how to add one in
   [`translating.md`](translating.md).
 
-### 6. Plugins: widgets take clicks only, a self-hosted directory but no public catalogue; Figma's plugins don't run
+### 6. Plugins: widgets without hover or timers, a self-hosted directory but no public catalogue; Figma's plugins don't run
 - **Landed (#101):** sandboxed WebAssembly plugins (wasmi, metered, memory cap, no WASI, also in
   the browser) acting through the command registry, one undo step per run, manifest permissions,
   Plugins menu, Run last plugin, Manage plugins, `plugin.*` commands, a Rust SDK and two examples
@@ -181,22 +224,29 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
   key and checked in full (`figcraft-cli plugin publish`), browsed, installed after a permissions
   confirmation and updated from Plugins ▸ Manage plugins ▸ Browse, downloads checked against their
   SHA-256, `plugin.directory.*` for scripts and MCP, moderation with `figcraft-server plugins`.
+  Widget fields and property menus (plugin API 4, 2026-10-24): a widget's text layer can be an
+  editable field, edited on the canvas with a double-click like any text or with `widget.setText`
+  (the value, cleaned and capped, goes into the widget's state and the plugin redraws; one undo
+  step), and a widget can carry a property menu of actions, toggles and colour choices, shown in a
+  small bar while it's selected and driven with `widget.menu`; the Counter example uses both.
 - **Missing:** a public catalogue and Community files, publisher accounts and signatures, ratings
-  and install counts, background update checks, the directory in the browser build; widgets take only clicks (no
-  text input, property menus, hover or timers) and draw only frames, text, shapes and images;
+  and install counts, background update checks, the directory in the browser build; widgets have no hover or
+  timers, can't open a panel and draw only frames, text, shapes and images;
   no images or sliders in panels. Figma's own plugins are JavaScript against Figma's plugin API and
   don't run.
 - **Impact:** teams that depend on specific Figma plugins (icons, content, accessibility checks)
   can't bring them. FigCraft's CLI, control channel and MCP server cover agent automation better
   than Figma does.
-- **Estimate:** 8–26 h for the missing pieces of FigCraft's own API. Running Figma's plugins
+- **Estimate:** 6–22 h for the missing pieces of FigCraft's own API. Running Figma's plugins
   needs a JS engine and an API shim: **owner decision needed**.
 
 ### 7. CPU canvas where Figma uses the GPU
 - **Missing:** GPU rendering of the canvas. FigCraft renders with tiny-skia on the CPU (banded,
   parallel, retained) and shows the image through wgpu. A new zoom can't reuse the retained
   image; when renders from scratch take a frame or more, the whole view is previewed with a
-  sixteenth of the pixels first, then refined.
+  sixteenth of the pixels first, then refined. With no measure to go by (the first render, another
+  page, a zoom after quick renders), a watchdog thread previews any such render still running
+  after 12 ms (desktop only; the browser renders inline).
 - **Landed (2026-10-15):** a bounded render margin is reused during panning and refilled before
   the visible view reaches its edge. The extra rendered area is capped at 1.6× visible pixels;
   this reduces blank strips without changing the CPU renderer.
@@ -215,7 +265,11 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
   PR (Windows 11, the desktop app driven over the control channel, the same workflow through MCP):
   eight bugs fixed, among them unsaved changes lost when the app was killed or crashed,
   Ctrl+arrows and Ctrl+Backspace acting on the whole line in text, scrubbed fields snapping back
-  and skewed linear gradients.
+  and skewed linear gradients. Linux and the BSDs (2026-10-17, #693): clipboard reads run on a
+  helper thread that gives up after 2 s, and images copied in other apps paste under Wayland
+  through the data-control protocol; compiled in CI, not run on a Linux desktop here. Wayland
+  compositors without server-side decorations (GNOME) give the window winit's Adwaita controls
+  (#592: checked by its author on GNOME; KDE not run).
 - **Impact:** unknown bugs on the platforms where FigCraft is most attractive (Linux has no Figma
   desktop app).
 - **Estimate:** 10–20 h, partly human (hardware).
@@ -264,11 +318,15 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
 - **Estimate:** 5–10 h (video playback in the presenter is most of it; it can reuse the GIF clock).
 
 ### 13. Vector tail: none left
+- **Landed (2026-10-22):** the transform box around points selected in several layers at once, in
+  the page's axes: its corners and edges scale them, outside a corner rotates them and inside drags
+  them, each in its own layer and one undo step for all (`transform_tests`).
 - **Landed (2026-10-12):** several Bezier handles selected with Shift-click and dragged together,
   sharp points beside curved segments rounded, a stroke cap and join per point (canvas, PNG, SVG,
   PDF, outline stroke), the Pen outside edit mode connecting to its own points and continuing a
-  selected open path. Left: corner smoothing beyond rectangles and frames, the transform box around
-  points of several layers, per-point caps and joins on dashed, variable-width and brush strokes.
+  selected open path. Left: corner smoothing on vectors, corner radius and smoothing on boolean
+  groups that contain rectangles, per-point caps and joins on dashed, variable-width and brush
+  strokes.
 - **Landed (2026-10-11):** boolean groups are clicked where their result is (a click in a
   subtracted hole reaches what's behind; with the group or an operand selected its operands are
   hit, so each can still be picked; "Select layer" lists the group only where its result is), live
@@ -293,7 +351,8 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
   collection (a brand theme extending a core one) can be extended again, its values flowing down
   the chain as each file accepts updates, every level's overrides kept.
 - **Missing:** checked with synthetic files only; extending a collection of the same file isn't
-  offered (extending takes library collections).
+  offered (extending takes library collections). A paint style's color offers variables scoped to
+  any fill or stroke: FigCraft's own rule, since the help center doesn't say which scopes it takes.
 - **Estimate:** 0–1 h.
 
 ### 15. Prototyping: media triggers and actions, controllers off Windows
@@ -303,16 +362,19 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
   API) and takes `ui.input {gamepad}` on the control channel; widgets react to clicks in a
   presented prototype, on the prototype's own copy; `proto.evaluate` computes expressions (mode
   lookups included) where a layer's interaction would run (`crates/engine/src/proto_tail_tests.rs`,
-  `crates/ui-egui/src/present_tail_tests.rs`, `crates/format/src/rest/gamepad_tests.rs`).
+  `crates/ui-egui/src/present/tail_tests.rs`, `crates/format/src/rest/gamepad_tests.rs`).
 - **Missing:** video triggers (on media hit/end) and play/pause/mute/seek actions (the REST
   importer warns and skips them, `crates/format/src/rest/proto.rs`); controllers on macOS, Linux
   and FreeBSD (the usual Rust controller library links libudev on Linux; a pure-Rust reader per
   platform, or an owner decision on that dependency); PlayStation and Switch button labels.
+  `proto.linkNotice` from the Actions palette or the control channel changes the preference in
+  memory only; it reaches the preferences file with the next preferences save (the notice's own
+  "Don't show this again" saves at once).
 - **Estimate:** 2–5 h, the media part after video fills (gap 12).
 
 ### 16. Dev Mode: the tail after dev resources
 - **Landed (2026-10-11):** code connect: a component or set links to its code component per
-  language (React, Leptos, SwiftUI, Compose, Flutter): an import path, the name and a template whose `{property}`
+  language (React, Leptos, Vue, SwiftUI, Compose, ArkUI, Flutter): an import path, the name and a template whose `{property}`
   and `{property ? "a" : "b"}` placeholders take the instance's values, escaped per language and
   never executed. `inspect.code`, `inspect.componentCode` and the Inspect panel show that snippet
   instead of generated code (inside generated layer trees too); the panel's Connect to code edits
@@ -327,11 +389,31 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
   host, no spaces, capped) and never fetched: a link added without a name is named after its URL,
   and a link opens only when clicked. The Inspect tab lists, adds, edits and removes them;
   `get_node` / `inspect_document` return them as `devResources`.
-- **Missing:** import lines for connected instances inside a
-  generated layer tree (only the selected layer's own import is shown); publishing mappings from
-  the code repository with a CLI. An editor extension is out of scope: the MCP server already
-  serves design data, code and the connected snippets to agents and editors.
-- **Estimate:** 0–1 h.
+- **Landed (2026-10-15):** generated layer trees (React, Leptos, SwiftUI, Compose) start with the
+  import lines of the connected components they call, once each, also those in a component's
+  definition, in the slots an instance fills and placed by a connected template's instance swaps.
+  Compare changes takes any saved version as the before (`dev.compare {version}`; the view's
+  Compare with menu), for any top-level frame or section. A Dev Mode behaviour suite: the canvas
+  only inspects (presses select, pan and comment; no moving, resizing, drawing, text or vector
+  editing), the menus, shortcuts, nudges, opacity keys and paste refuse design edits with a note
+  while Dev Mode's own edits still run, drawing tools from the toolbar return to the design; the
+  ready list filters and badges Changed items (`inspect.readyForDev {status: changed}`); statuses
+  are refused on layers inside frames. Read-only plugins run from the Inspect tab show their
+  panels.
+- **Landed (2026-10-24):** measurements kept on the canvas: between two layers, along one side of
+  a layer or to the layer around it (`devMode.addMeasurement` / `removeMeasurement` /
+  `measurements`), stored on the layer they start from (saved, synced, undoable; old files open
+  without them), drawn in Dev Mode as labelled redlines that follow the layers, and listed, placed
+  and removed in the Inspect tab. The layers panel is read-only in Dev Mode (rows select and
+  expand; no renaming, reordering, hiding or locking).
+- **Landed (2026-10-24):** files dropped on the canvas, the Pages list and the Assets panel no
+  longer edit the design in Dev Mode (a dropped document still opens as a file of its own, and
+  the Pages list only opens pages).
+- **Missing:** publishing mappings from the code repository with a CLI. An editor extension is out
+  of scope: the MCP server already serves design data, code and the connected snippets to agents
+  and editors. The file name field in the left panel still renames the file in Dev Mode
+  (`file.rename`); whether Figma allows that in Dev Mode needs checking before it changes.
+- **Estimate:** 1–2 h.
 
 ### 17. Branching and merging
 - **Landed (2026-10-11):** branches of a file (`branch.*`): File ▸ Create branch… (or the Branches
@@ -353,9 +435,26 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
   different items changed on each side, or items added at the end on one side, merge without a
   conflict; only the same item changed both ways, an item removed on one side, or different items
   added on both sides conflict (as the whole list).
-- **Missing:** branches of a file in a live session are refused; other lists (text runs, export
-  settings, guides…) still conflict as a whole; the branch history has no entries of its own for
-  its creation or updates from main (only saved versions, autosaves and the merge on main).
+- **Landed (2026-10-18, #798):** layout grids, export settings, guides, prototype interactions,
+  accessibility annotations and Dev Mode resources merge item by item like fills (code links merge
+  whole: one per language).
+- **Landed (2026-10-24):** branches of a file in a live session: creating, editing, reviewing,
+  updating from main and merging work while the file is in a session. A branch stays with the
+  person who made it; merging it is one edit of the session document that everyone gets, and one
+  step of its author's own undo history. A branch made in the session makes its ids in its author's
+  own client space, 2^24 above every id made there on the main file, so the session server takes
+  the layers it adds; others' edits on main while it is open are main's changes against the
+  branch's own base, and conflicts with them resolve as offline (a layer a peer deleted comes back
+  with its id when the branch's edits win). A view link still refuses merging, and merging a branch
+  made outside the session that adds layers, styles, variables or comments (ids in another space)
+  is refused with a reason instead of being sent for the server to refuse. A branch's history gets
+  entries for its creation and each update from main. Engine tests through a session server with
+  several people, a fuzz test with random real commands (export settings and guides included,
+  offline and live) and a junk-parameter sweep of the branch commands in a session.
+- **Missing:** text runs still conflict as a whole (runs are character ranges into the text, so
+  lining them up item by item would need a text diff, not positions); branches in a live session
+  are their author's only (others can't see or open them: that needs the server to keep them);
+  a branch made offline that adds layers merges only outside a session.
 - **Estimate:** 1–2 h.
 
 ### 18. Display P3 on screen (several windows landed)
@@ -364,8 +463,9 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
   needs to; closing one asks about unsaved changes; `window.new`, `window.list`, `window.focus` and
   `window` on any control request.
 - **Missing:** wide-gamut colour on the canvas (egui draws sRGB, so P3 colours outside sRGB clip on
-  screen; exports keep them); a screen-reader tree in windows other than the main one (eframe 0.36
-  gives only the main window one); window positions restored at the next start.
+  screen; exports keep them); a screen-reader tree in windows other than the main one (eframe 0.37
+  gives only the main window one; verified in the fork's viewport setup); window positions restored at
+  the next start.
 - **Estimate:** 4–8 h.
 
 ### 19. AI features
@@ -396,11 +496,42 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe
   repository (licensing).
 - **Estimate:** 2–4 h once an openly licensed profile is found.
 
+### 24. Boards: the whiteboard tail
+- **Landed (2026-10-24, M12):** board files (`file.newBoard`) with sticky notes, shapes with text,
+  connectors that re-route when what they join moves, marker, highlighter and eraser, stamps, text
+  and sections; a board toolbar and a contextual bar; live sessions sync it all. Then (also M12) a
+  timer everyone on the board sees and voting sessions with per-person caps, hidden votes and
+  ranked results (`board.timer`, `board.vote`), and five built-in templates (retrospective,
+  brainstorm, weekly planner, flow chart, kanban board) from a toolbar picker or `board.template`,
+  and tables (`board.table`, `board.tableEdit`, up to 50 × 20) made of auto layout frames.
+- **Landed (2026-10-24, M12):** a dot grid on board pages, under the layers; a selected
+  connector's ends drag onto another object or empty canvas (`board.reattach`); curved connectors;
+  elbows that go around the objects they join.
+- **Missing:** timer music, board widgets, saving your own templates, table column resizing and
+  cell colours, mind maps, washi tape, code blocks, audio and huddles, quick-create handles,
+  connector waypoints placed by hand, stamps sticking to the objects they land on, `.jam` files
+  ([`boards-parity.md`](boards-parity.md)).
+- **User impact:** boards cover a brainstorm, a retrospective, a flow sketch and a timed, voted
+  workshop round.
+- **Estimate:** 20–44 h.
+
 ## Revision history
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-25 | minor | egui/eframe 0.37 verified for gap 18: the remaining limitations are unchanged. egui-wgpu 0.37 still picks an 8-bit sRGB surface with no colour-space option, so P3 colours outside sRGB still clip on screen; eframe 0.37 still gives only the main window an AccessKit adapter, so other windows have no screen-reader tree. Numbers unchanged |
+| 2026-10-25 | minor | Known gaps from the #1311 review: gap 4, the export preview follows a slice's first export setting; gap 14, the scopes a paint style's color takes are FigCraft's own rule; gap 15, `proto.linkNotice` from the palette or control channel isn't saved until the next preferences save; gap 16, the file name field still renames in Dev Mode (to check against Figma first). Ranking and hours unchanged |
+| 2026-10-24 | minor | Gap 24: the dot grid on board pages, dragging a connector's end to re-attach it, curved connectors and elbows around the objects they join landed; connector waypoints placed by hand stay missing. 30–60 h → 28–56 h; the ranking is unchanged |
+| 2026-10-24 | minor | Gap 16: Measurements kept on the canvas (gap 16): `devMode.addMeasurement {from?, to?, side?}` places one between two layers, along one side of a layer or (neither) to the layer around it, stored on the layer it starts from (saved in `.figcraft`, synced, undoable; old files open without them); Dev Mode draws them as labelled redlines that follow the layers, the Inspect tab lists them (those of the selected layer, or every one on the page), places and removes them; `devMode.removeMeasurement` and `devMode.measurements` remove and list them; a copy keeps those to layers copied with it. The layers panel is read-only in Dev Mode: rows select and expand, but don't rename, reorder, hide or lock. Left: publishing mappings with a CLI; 2–4 h → 1–2 h |
+| 2026-10-24 | minor | Gap 24: a shared board timer and voting sessions landed (M12); 30–60 h → 26–54 h, ranking unchanged |
+| 2026-10-24 | minor | Gap 24: board templates (retrospective, brainstorm, weekly planner, flow chart, kanban board; `board.template`, a toolbar picker) and tables (`board.table`, `board.tableEdit`); 30–60 h → 26–54 h, rank unchanged |
+| 2026-10-24 | minor | Gap 6: plugin widgets take text input (editable fields, `widget.setText`) and a property menu (`widget.menu`, a bar over the selected widget), plugin API 4; 8–26 h → 6–22 h; ranking unchanged |
+| 2026-10-24 | minor | Gap 17: branches of a file in a live session (create, edit, review, update from main and merge while the file is in a session; the branch stays with its author and makes ids in their own client space far above the main file's; merging is one synced edit and one step of the author's undo history; peers' edits merge against the branch's own base and conflicts resolve as offline; a view link still refuses merging; a branch made outside the session that adds layers is refused with a reason); a branch's history gets entries for its creation and updates from main; the list-merge wording brought up to date with #798 (export settings and guides already merged item by item); text runs still merge whole. Ranking and hours unchanged |
+| 2026-10-24 | minor | Boards (M12): a file kind of its own (`file.newBoard`, saved in `.figcraft`, carried to live-session joiners) with sticky notes, shapes with text, connectors that re-route when what they join moves (an engine recompute, the same for local edits, undo and others' edits), marker, highlighter and eraser, stamps with the placer's name, a board toolbar and a contextual bar; prototyping and Dev Mode refuse on boards; design files and boards have their own marks on tabs and file rows. New gap 24 (the board tail, 30–60 h); the ranking above it is unchanged |
+| 2026-10-15 | minor | Gap 5: Turkish reviewed by a native speaker (#263), Czech (#469) and Indonesian (#477) drafts, the Japanese draft caught up (#288); Indonesian is no longer missing; counts re-measured (2,177 entries) and corrected: only Spanish is held to completeness, Russian included. Estimate unchanged at this rounding |
+| 2026-10-17 | minor | The 2026-10-17 landings. Gap 1: a new Landed entry (community batches #727 and #728, then #745: instance identity and cached library components, overrides by key, text style precedence, grid track sizes, slot content, labels of connectors saved with their path, skip ink, paragraph options, list start numbers, vertical trim, per-point stroke joins, text on a path, image adjustments, images in the message, instance layers' size and resizing overrides, Hug where nothing is recorded; budgets from the file's size; the import report; a `.fig` copy from Save as; paste from another design app), its Missing list cut to what is still left, and the wrong "whether other apps open its files is unknown" replaced by what was checked; all on synthetic files, so the beta blocker and hours stand. Gap 2: server limits, log recovery and web join links in the evidence. Gap 4: menus, the Actions palette and the editor fixes (#733, #735, #736, #729), then Selection colors and smart-selection spacing (#753) landed, none compared side by side. Gap 5: catalog counts re-measured (2,272 entries; drafts at 95–99%; Indonesian, Czech, Turkish and Swedish listed). Gap 8: the Linux and BSD clipboard changes and Wayland window controls, not run there by the maintainers. Ranking and hours unchanged |
 | 2026-10-15 | minor | Gap 7: bounded canvas overscan for smoother panning. Estimates and ranking unchanged. |
+| 2026-10-15 | minor | Gap 16: import lines inside generated layer trees, compare with any saved version, an inspect-only Dev Mode canvas (menus and shortcuts refuse design edits), Changed in the ready list, statuses only on sections and top-level frames, read-only plugins' panels from the Inspect tab. Left: measurements kept on the canvas, a read-only layers panel, publishing mappings with a CLI; 0–1 h → 2–4 h |
 | 2026-10-14 | minor | Russian catalog (M9), reviewed and approved by VanTan: all 2,165 current entries, Русский in Preferences and regional ru tags. Russian integer plurals use one/few/many; contributor display name VanTan added. Existing estimates unchanged. |
 | 2026-10-13 | minor | Gap 1: the experimental `.fig` export writes instance sizes (resized, filling an auto layout, scaled), variables with modes and bindings, shared styles and variable-width strokes, and the import reads them back. Checked by opening written files in other software: resized and scaled instances keep their size and lay their layers out for it, variables with their modes and colour bindings resolve there (a frame set to another mode shows that mode's colours, also inside instances), colour, text, effect and grid styles are listed, and variable-width strokes that are the same on both sides of the path draw with their width; number, string and boolean bindings and bindings on effects, layout guides and gradient stops come across as the values they give but did not show as bound there (their entries now also name the layer field they set, not yet checked there), and strokes wider on one side of the path are written as filled outlines, no longer editable strokes there (the stroke itself is kept as plugin data and our own import puts it back; not yet checked there). Hours and the ranking unchanged |
 | 2026-10-12 | minor | Gap 2: your online files landed (the app records the files it put on a server with their owner tokens, Home ▸ Online lists them and opens them again as their owner, with sharing, rename, removal and forget from the list; one request per server tells which are still there; tabs mark files in a live session). What is left is unchanged: accounts, teams and per-person permissions, shared comments and versions. Hours unchanged |
diff --git a/docs/hardware-parity.md b/docs/hardware-parity.md
index a990d75b..61282d53 100644
--- a/docs/hardware-parity.md
+++ b/docs/hardware-parity.md
@@ -1,6 +1,6 @@
 # Hardware and platform parity
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-14 · **Change:** minor (copy and paste in the browser; Windows QA pass; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; pen pressure for the Pencil and brushes on Windows and from browser styluses) · **Target:** Figma Design (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-25 · **Change:** minor (egui/eframe 0.37 dependency migration; hidden-window screenshot deadlines; zoom previews; hidden windows answer control requests; macOS file opening, the Windows start-up message, Linux packaging; copy and paste in the browser; Windows QA pass; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; pen pressure for the Pencil and brushes on Windows and from browser styluses; macOS: quitting ends the process once everything is kept, avoiding the Touch Bar teardown crash (#781); Linux and BSD clipboard: images under Wayland, reads time out; minimised windows under Wayland; window controls on Wayland without server decorations; canvas textures on device pixels; copy and paste in the browser; Windows QA pass; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; pen pressure for the Pencil and brushes on Windows and from browser styluses) · **Target:** Figma Design (desktop app 126.10.7)
 
 How FigCraft uses hardware and which platforms it runs on, against Figma. Figma's desktop app is
 Electron with a GPU helper process; its canvas renders on the GPU (WebGL, with WebGPU rolling out
@@ -12,13 +12,13 @@ since 2025). FigCraft renders the canvas on the CPU and presents it through wgpu
 
 | Feature | Figma | FigCraft (macOS / Windows / Linux / web) | Hours |
 |---|---|---|---|
-| Canvas rendering | GPU | CPU (tiny-skia), banded across cores, retained (re-renders only what an edit or pan touches), levels of detail below 50% zoom; shown through wgpu (WebGPU or WebGL2 in the browser) | 30–60 for a GPU path |
+| Canvas rendering | GPU | CPU (tiny-skia), banded across cores, retained (re-renders only what an edit or pan touches), levels of detail below 50% zoom; when renders from scratch are slow, a new zoom shows the whole view coarsely first, then refines it (#312); shown through wgpu (WebGPU or WebGL2 in the browser) | 30–60 for a GPU path |
 | Effects (blurs, glass, noise) | GPU | CPU | in the above |
-| HiDPI / Retina | yes | yes (all) | — |
-| Wide-gamut display (Display P3) | yes, on capable displays | colours stored and exported in P3; the screen shows sRGB: eframe/egui-wgpu 0.36 configure an 8-bit sRGB surface with no colour space option, although wgpu 30 can present Display P3 or extended sRGB on Metal, DX12, Vulkan and WebGPU (see gaps #18). The colour picker warns about colours outside sRGB and View ▸ Soft-proof sRGB stripes them on the canvas | 2–5 |
+| HiDPI / Retina | yes | yes (all); a canvas image rendered at the screen's density is placed on whole device pixels, so fractional pans, zooms and display scales don't blur it (#359; geometry tests, the snapping not judged by eye) | — |
+| Wide-gamut display (Display P3) | yes, on capable displays | colours stored and exported in P3; the screen shows sRGB: eframe/egui-wgpu 0.37 configure an 8-bit sRGB surface with no colour space option, although wgpu 30 can present Display P3 or extended sRGB on Metal, DX12, Vulkan and WebGPU (see gaps #18). The colour picker warns about colours outside sRGB and View ▸ Soft-proof sRGB stripes them on the canvas | 2–5 |
 | Trackpad pinch zoom and two-finger pan | yes | yes (egui zoom delta, smooth scroll) | — |
 | Pen tablet pressure (pencil, Figma Draw brushes) | yes (forum reports of regressions in 2025) | Windows pens (winit pointer input) and browser styluses that send touch events with a force (an Apple Pencil in Safari); the Pencil records it as the stroke's width profile. A mouse, macOS and Linux tablets and pens sending only pointer events in a browser report none: constant width | 1–3 |
-| Several windows / multi-monitor | yes (a window per file; presenter in its own window) | desktop: File ▸ New window, a tab's Open in new window or a tab dragged off the strip; each window has its own tabs, panels and canvas, draws only when it needs to and asks about unsaved changes when it closes. Only the main window has a screen-reader tree (eframe 0.36), so files stay tabs while a screen reader runs; positions aren't restored at the next start; the presenter stays inside its window; one window in the browser | 1–2 |
+| Several windows / multi-monitor | yes (a window per file; presenter in its own window) | desktop: File ▸ New window, a tab's Open in new window or a tab dragged off the strip; each window has its own tabs, panels and canvas, draws only when it needs to and asks about unsaved changes when it closes; a minimised or covered window still answers control and MCP requests, while screenshots with hidden or unknown visibility request a hidden paint and expire at their 60-second admission deadline if unfinished; injected pointer/key/text input waits for a real UI frame (#313, #332, #720). Browser and Wayland hidden-paint behavior remain unqualified. Only the main window has a screen-reader tree (eframe 0.37), so files stay tabs while a screen reader runs; positions aren't restored at the next start; the presenter stays inside its window; one window in the browser | 1–2 |
 | Screen readers | partial | AccessKit tree on desktop (names, roles, states), never tested with a real screen reader; none in the browser | 4–8 + human QA |
 | Keyboard layouts (non-US) | yes | keymap uses logical keys; not checked on AZERTY/QWERTZ/JIS | 1–2 |
 
@@ -39,9 +39,9 @@ Nothing has been timed against Figma on the same document (needs `.fig` import).
 
 | Platform | Figma | FigCraft | Notes |
 |---|---|---|---|
-| macOS | desktop app (Intel and Apple silicon) | universal `.dmg`, signed and notarized (v0.2.0) | where nearly all QA happens |
+| macOS | desktop app (Intel and Apple silicon) | universal `.dmg`, signed and notarized (v0.2.0) | where nearly all QA happens. Quitting ends the process once the preferences, recovery copies and live sessions are taken care of: the window's teardown crashed on Macs with a Touch Bar (#781); Quit from the menu bar, which asks nothing, keeps unsaved files' recovery copies for the next start |
 | Windows x64 / arm64 | desktop app | `.msi` and portable zip for x64, x86 and arm64 | built in CI; Windows: QA pass done 2026-10-11, findings in PR |
-| Linux | none (browser only) | AppImage, `.deb`, `.rpm`, Flatpak, tarball, x86_64 and aarch64; riscv64 tarball | CI tests run here |
+| Linux | none (browser only) | AppImage, `.deb`, `.rpm`, Flatpak, tarball, x86_64 and aarch64; riscv64 tarball | CI tests run here. Clipboard (also the BSDs): reads run on a helper thread that gives up after 2 s, and images copied in other apps paste under Wayland through the data-control protocol (#693). Under Wayland the app can't tell its window is minimised, so control requests that need a drawn frame may still wait there (#720). None of this run on a Linux desktop here. On a Wayland compositor without server-side decorations (GNOME) the window gets winit's Adwaita controls (#592: checked by its author in a GNOME Wayland session; KDE not run) |
 | FreeBSD | none | tarball | |
 | Web | primary (figma.com) | `figcraft-web` (WASM, WebGPU/WebGL2), web zip | no accessibility tree; file access through the browser; copy and paste through the system clipboard (copies written from the copy event, pastes read from the paste event; no pasting images from other apps) |
 | iOS / Android | apps: view, comment, mirror prototypes | none (the web build is not touch-first) | 20–40 h for a viewer |
@@ -50,6 +50,11 @@ Nothing has been timed against Figma on the same document (needs `.fig` import).
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-25 | minor | egui/eframe 0.37 dependency migration: the workspace pins the egui family at 0.37, and the wide-gamut and several-windows rows now cite 0.37. The limitations are unchanged: egui-wgpu 0.37 offers no surface colour-space option, so the screen still shows sRGB; eframe 0.37 still gives only the main window an AccessKit adapter, so files stay tabs while a screen reader runs. Numbers unchanged |
+| 2026-10-25 | minor | Hidden or unknown-visibility screenshots request a hidden paint and expire at their 60-second admission deadline if unfinished; injected pointer/key/text input waits for a real UI frame. Browser and Wayland hidden-paint behavior remain unqualified. Numbers unchanged. |
+| 2026-10-15 | minor | Community fixes (#290, #306, #312, #313, #328, #332, #346, #474): coarse zoom previews when renders from scratch are slow; a minimised or covered window answers control and MCP requests (screenshots and input fail at once while it is hidden); `.figcraft` files open from Finder on macOS; a message box when the window can't open on Windows; on Linux the window id matches the desktop entry, the RPM requires glibc 2.35 and user fonts under `XDG_DATA_HOME` are found. Numbers unchanged |
+| 2026-10-18 | minor | macOS quit crash (#781): on Macs with a Touch Bar the app could crash as it quit (an exception in AppKit's Touch Bar support while the window's content view, which the accessibility adapter subclasses, was torn down). Quitting now keeps everything (preferences, this run's recovery copies, live sessions ended) and then ends the process before that teardown. Quit from the menu bar ends the app without the unsaved-changes question, so unsaved files' recovery copies now stay and reopen at the next start instead of being removed. Numbers unchanged |
+| 2026-10-17 | minor | Linux row: clipboard reads on Linux and the BSDs time out after 2 s on a helper thread, images copied in other apps paste under Wayland (arboard's data-control feature, #693), a minimised window can't be detected under Wayland, so frame-only control requests may still wait there (#720), and Wayland compositors without server-side decorations give the window Adwaita controls (#592, checked by its author on GNOME, not by the maintainers; KDE not run); compiled in CI, not run on a Linux desktop. HiDPI row: native-density canvas images placed on whole device pixels (#359, geometry tests; not judged by eye). Numbers unchanged |
 | 2026-10-14 | minor | Copy and paste in the browser: the web build never wrote to the system clipboard, so Cmd+V after Cmd+C pasted whatever text the clipboard held before (as a text layer) instead of the copied layers. Copies (layers, Copy as SVG/CSS/text/PNG, links) now go out through egui's output, which eframe writes during the copy event (`web_clipboard_tests`). Numbers unchanged. |
 | 2026-10-11 | minor | Windows QA pass (gap 8): everyday workflows on Windows 11 through the desktop app and MCP; fixed: unsaved changes lost when the app was killed or crashed (recovery copies every few seconds, reopened at the next start), Ctrl+arrows/Backspace/Delete acting on the whole line in text (now by word; Ctrl+Home/End to the text's ends), scrubbed fields snapping back on release, typing on a field Tab reached, Escape not closing dialogs, skewed or vanishing linear gradients, hints cut off at the panel edge, the window-close question in English in the Spanish interface. Percentages and hours unchanged |
 | 2026-10-11 | minor | Display P3 honest minimum (gap 18): the colour picker of a Display P3 file warns when a colour is outside sRGB (Outside sRGB, with what the canvas and exports do), and View ▸ Soft-proof sRGB (`view.proofSrgb`) stripes the canvas pixels sRGB can't show. Why the canvas still shows sRGB: wgpu 30 can present Display P3 or extended-range sRGB surfaces (Metal, DX12, Vulkan, WebGPU canvases), but eframe/egui-wgpu 0.36 configure an 8-bit sRGB surface with no option for the format or colour space, and egui's renderer writes sRGB-encoded UI colours; showing P3 needs those two upstream (or a patched egui-wgpu). Hardware 13–27 h → 12–26 h; gap 18 6–12 h → 5–11 h; percentages, feature breadth (~79%) and ready for real work (~47%) unchanged at this rounding; full parity ~363–697 h → ~362–696 h |
diff --git a/docs/images/shot-8-board.png b/docs/images/shot-8-board.png
new file mode 100644
index 00000000..ef0b9d49
Binary files /dev/null and b/docs/images/shot-8-board.png differ
diff --git a/docs/images/shot-9-devmode-measure.png b/docs/images/shot-9-devmode-measure.png
new file mode 100644
index 00000000..8dde99d7
Binary files /dev/null and b/docs/images/shot-9-devmode-measure.png differ
diff --git a/docs/localization-parity.md b/docs/localization-parity.md
index 45a7a925..f7fb2dde 100644
--- a/docs/localization-parity.md
+++ b/docs/localization-parity.md
@@ -1,10 +1,11 @@
 # Localization parity
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-12 · **Change:** minor (draft catalogs catch up: every draft translates every string again; Simplified Chinese draft catalog) · **Target:** Figma Design (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-24 · **Change:** minor (Thai draft catalog and Thai UI fonts; a missing translation fails no check: `cargo xtask i18n-report` lists them; Vietnamese draft catalog; string counts re-measured: 2,352 entries; Russian and Turkish catalogs reviewed by native speakers, Russian one/few/many plurals; Czech and Indonesian drafts; the Japanese draft completed; counts re-measured; Windows UI language from the first preferred language; draft catalogs catch up: every draft translates every string again; Simplified Chinese draft catalog; macOS finds its downloadable CJK system fonts (#406); string counts re-measured: 2,272 entries, the drafts at 95–99%; Swedish command labels and menu wordings; Russian, Swedish, Turkish, Czech and Indonesian listed; a duplicated paragraph removed; draft catalogs catch up: every draft translates every string again; Simplified Chinese draft catalog) · **Target:** Figma Design (desktop app 126.10.7)
 
-FigCraft's interface has a localization layer with an English catalog and Spanish (with a Latin
-American overlay), French, German, Brazilian Portuguese, Japanese, Korean and Simplified Chinese
-drafts (machine-drafted, waiting for native speakers' review). This page lists the twelve key
+FigCraft's interface has a localization layer with an English catalog, a Russian catalog reviewed
+by a native speaker, and Spanish (with a Latin American overlay), French, German, Brazilian
+Portuguese, Japanese, Korean, Simplified Chinese, Indonesian, Vietnamese and Czech drafts (machine-drafted,
+waiting for native speakers' review), plus Swedish and Turkish catalogs. This page lists the twelve key
 languages of the craftrules standard, then the other languages Figma ships. How to add a
 language: [`translating.md`](translating.md).
 
@@ -17,47 +18,43 @@ browser's page translation. The `.lproj` folders in `/Applications/Figma.app` (6
 Electron/Chromium locale packs, not Figma's own UI languages. Text *content* in any script is
 supported by both apps (CJK, Arabic and Devanagari shaping, IME); Figma has no vertical text.
 
-## What FigCraft has (measured 2026-10-12, from source)
+## What FigCraft has (measured 2026-10-22, from source)
 
 - **Layer:** one TOML catalog per language in `crates/ui-egui/locales/`, baked into the binary by
   the UI crate's build script (desktop and web; nothing read at run time). Keys are the English text
   (`tr("Fill")`, `trf` for `{named}` placeholders, `trn` for counts with one/few/many/other plural forms), so
   a missing translation shows English, never a raw key. One English text that needs two
   translations takes a context (`"Fill|sizing"`).
-- **Strings:** 1,417 UI keys in `en.toml` (36 with plural forms; ~110 are labels from engine and
-  document data, such as tool names, blend modes and Dev Mode properties) plus 536 command labels
-  and 29 menu wordings by command id: 1,982 entries. Command ids, the CLI, MCP and the control
+- **Strings:** 1,747 UI keys in `en.toml` (42 with plural forms; ~110 are labels from engine and
+  document data, such as tool names, blend modes and Dev Mode properties) plus 574 command labels
+  and 31 menu wordings by command id: 2,352 entries (counted against `en.toml` and the complete
+  Spanish catalog's command and menu tables). Command ids, the CLI, MCP and the control
   channel stay English. Accessibility names come from the same strings.
-- **Language preference:** Preferences ▸ Language (System, English, Deutsch, Español, Español
-  (Latinoamérica), Français, 日本語, 한국어, Português (Brasil), 简体中文), applied at once without a
+- **Language preference:** Preferences ▸ Language (System, then each catalog by its own name:
+  English, Čeština, Deutsch, Español, Español (Latinoamérica), Français, Bahasa Indonesia, 日本語,
+  한국어, Português (Brasil), Русский, Svenska, Türkçe, Tiếng Việt, 简体中文), applied at once without a
   restart; System takes the first of the OS's preferred languages that has a catalog (on Windows
   only the first preferred language counts, since that list also holds the languages added for a
   keyboard; macOS AppleLanguages, `LANGUAGE` then the locale variables on Linux and BSD; a regional
   tag falls back to its language, pt-PT or pt to pt-BR, and es-419, es-MX, es-AR, es-CO and the
-  other Latin American and US Spanish tags to es-419; zh, zh-CN, zh-SG and zh-Hans read zh-Hans,
+  other Latin American and US Spanish tags to es-419; regional ru, tr, cs and id tags (ru-RU,
+  tr-TR, cs-CZ, id-ID) to their catalogs; zh, zh-CN, zh-SG and zh-Hans read zh-Hans,
   while Traditional Chinese (zh-Hant, zh-TW, zh-HK, zh-MO) has no catalog and reads English or the
   next OS language, never Simplified) or the browser's language on the web.
-  (Latinoamérica), Français, 日本語, 한국어, Português (Brasil), Svenska, 简体中文), applied at once without a
-  restart; System takes the first of the OS's preferred languages that has a catalog (Windows'
-  language list, macOS AppleLanguages, `LANGUAGE` then the locale variables on Linux and BSD; a regional tag
-  falls back to its language, pt-PT or pt to pt-BR, and es-419, es-MX, es-AR, es-CO and the other
-  Latin American and US Spanish tags to es-419; zh, zh-CN, zh-SG and zh-Hans read zh-Hans, while
-  Traditional Chinese (zh-Hant, zh-TW, zh-HK, zh-MO) has no catalog and reads English or the next OS
-  language, never Simplified) or the browser's language on the web.
   `pref.language {language}` sets it from the CLI, MCP and the control channel.
 - **Regional overlays:** a regional catalog whose language has a catalog lists only what differs
   (`es-419.toml` over `es.toml`); its UI strings, command labels and menu wordings read the
   overlay, then the base language, then English.
 - **Check:** `cargo test -p figcraft-ui-egui i18n` fails on keys the code uses that `en.toml`
-  lacks, keys no code uses, unknown command ids, placeholders that differ from English, overlay
-  entries that read as in their base language and, for complete languages (Spanish), anything
-  untranslated. The other drafts are not held to it: a string added later shows English there
-  until someone translates it. Every draft translates every string as of 2026-10-12 (checked by
-  adding each to `COMPLETE` locally and running the check).
+  lacks, keys no code uses, unknown command ids, placeholders that differ from English and overlay
+  entries that read as in their base language. No language is held to full coverage: a string
+  added later shows English until someone translates it, and `cargo xtask i18n-report` (part of
+  `cargo xtask ci`) lists what each language lacks. Every draft translated every string on
+  2026-10-12; by 2026-10-17 the strings added since left them at 95–99% (table below).
 - **Not yet localized:** messages the engine writes (errors, a few toasts, Dev Mode property values
   such as "inside"), number formatting (decimal points stay `.`), and decimal plural rules
   (`trn` takes integers: Czech uses one/few/other and Russian one/few/many; French and Brazilian
-  Portuguese take the singular for 0 as well; Japanese, Korean and Chinese have one form;
+  Portuguese take the singular for 0 as well; Japanese, Korean, Chinese and Vietnamese have one form;
   CLDR's "many" for millions in French, Spanish and Portuguese reads as the plural).
 - **Script support in documents:** Unicode bidi with Arabic shaping and mirrored brackets in text
   layers; right-to-left list markers and indents; right-to-left names in the layers panel, tabs
@@ -67,12 +64,15 @@ supported by both apps (CJK, Arabic and Devanagari shaping, IME); Figma has no v
 - **Script support in the UI:** menus widen to their longest label; dropdowns, the two-column
   labels of the right panel and the home screen's cards keep a long translation on one line with an
   ellipsis and show it in full on hover (checked in German, the longest); no mirrored
-  (right-to-left) layout of panels. CJK translations are shorter than English; the same ellipsis
+  (right-to-left) layout of panels. Cyrillic, Turkish and Czech letters draw from the UI fonts
+  (no font added; Russian checked in screenshots). CJK translations are shorter than English; the same ellipsis
   and tooltip cover the few that don't fit (the sizing dropdowns).
 - **CJK UI fonts:** egui's fonts and Inter have no CJK glyphs. Once the UI language, the open
   file's names or comments, typed text or the language picker needs Japanese kana, Hangul or Han,
   the desktop app adds one installed face per script to the UI's fallbacks (Windows: Yu Gothic UI,
-  Meiryo, Malgun Gothic, Microsoft YaHei; macOS: Hiragino Sans, Apple SD Gothic Neo, PingFang SC;
+  Meiryo, Malgun Gothic, Microsoft YaHei; macOS: Hiragino Sans, Apple SD Gothic Neo, PingFang SC,
+  Hiragino Sans GB, Heiti SC, also from the system's downloaded font assets
+  (`/System/Library/AssetsV2/com_apple_MobileAsset_Font*`, where current versions keep PingFang);
   Linux and BSD: Noto Sans CJK, Source Han Sans, Nanum, WenQuanYi; the craft-fonts build's BIZ
   UDPGothic first), the UI language's script first; Han without kana outside a Japanese or Korean UI
   reads as Chinese, and a Chinese UI puts its Chinese face (Microsoft YaHei, PingFang SC, Noto Sans
@@ -87,37 +87,48 @@ supported by both apps (CJK, Arabic and Devanagari shaping, IME); Figma has no v
 
 | Language | Code | UI strings translated | Dialogs / tooltips / help | Script support | Native review | Status | Hours to full |
 |---|---|---|---|---|---|---|---|
-| English | en | 2,076 / 2,076 (100%, source) | yes | Latin | yes (source) | full | 0 |
-| Simplified Chinese (Mandarin) | zh-Hans | 2,076 / 2,076 (100%, draft) | yes | CJK text and IME in documents; UI text in an installed Chinese face, ahead of Japanese ones (web: the `FIGCRAFT_EMBED_CJK` build); no Traditional Chinese catalog (zh-TW, zh-HK read English) | no | draft | 1–2 (after native review) |
-| Spanish | es, es-419 | 2,076 / 2,076 (100%, draft); es-419 overlays 98 Latin American wordings (draft) | yes | Latin | no | draft | 0–1 (after native review) |
+| English | en | 2,352 / 2,352 (100%, source) | yes | Latin | yes (source) | full | 0 |
+| Simplified Chinese (Mandarin) | zh-Hans | 2,216 / 2,352 (94.2%, draft) | yes | CJK text and IME in documents; UI text in an installed Chinese face, ahead of Japanese ones (web: the `FIGCRAFT_EMBED_CJK` build); no Traditional Chinese catalog (zh-TW, zh-HK read English) | no | draft | 1–2 (after native review) |
+| Spanish | es, es-419 | 2,352 / 2,352 (100%, draft); es-419 overlays 104 Latin American wordings (draft) | yes | Latin | no | draft | 0–1 (after native review) |
 | Hindi | hi | 0 (0%) | no | Devanagari shaping works in documents; UI font fallback to check | no | none | 4–7 |
 | Arabic | ar | 0 (0%) | no | Bidi, shaping and RTL names work; the UI does not mirror | no | none | 9–15 |
-| French | fr | 2,076 / 2,076 (100%, draft) | yes | Latin | no | draft | 1–2 (after native review) |
-| Portuguese | pt-BR | 2,076 / 2,076 (100%, draft) | yes | Latin | no | draft | 1–2 (after native review) |
-| Indonesian | id | 0 (0%) | no | Latin | no | none | 3–5 |
-| Japanese | ja | 2,076 / 2,076 (100%, draft) | yes | CJK text and IME in documents; UI text in an installed Japanese face (web: the `FIGCRAFT_EMBED_CJK` build) | no | draft | 1–2 (after native review) |
-| German | de | 2,076 / 2,076 (100%, draft) | yes | Latin; long words elide in narrow fields | no | draft | 1–2 (after native review) |
-| Korean | ko | 2,076 / 2,076 (100%, draft) | yes | Hangul text and IME in documents; UI text in an installed Korean face (web: the `FIGCRAFT_EMBED_CJK` build) | no | draft | 1–2 (after native review) |
-| Vietnamese | vi | 0 (0%) | no | Latin with stacked diacritics | no | none | 3–5 |
+| French | fr | 2,328 / 2,352 (99.0%, draft) | yes | Latin | no | draft | 1–2 (after native review) |
+| Portuguese | pt-BR | 2,331 / 2,352 (99.1%, draft) | yes | Latin | no | draft | 1–2 (after native review) |
+| Indonesian | id | 2,292 / 2,352 (97.4%, draft) | yes | Latin | no | draft | 1–2 (after native review) |
+| Japanese | ja | 2,304 / 2,352 (98.0%, draft) | yes | CJK text and IME in documents; UI text in an installed Japanese face (web: the `FIGCRAFT_EMBED_CJK` build) | no | draft | 1–2 (after native review) |
+| German | de | 2,226 / 2,352 (94.6%, draft) | yes | Latin; long words elide in narrow fields | no | draft | 1–2 (after native review) |
+| Korean | ko | 2,216 / 2,352 (94.2%, draft) | yes | Hangul text and IME in documents; UI text in an installed Korean face (web: the `FIGCRAFT_EMBED_CJK` build) | no | draft | 1–2 (after native review) |
+| Vietnamese | vi | 2,352 / 2,352 (100%, draft) | yes | Latin with stacked diacritics | no | draft | 1–2 (after native review) |
+| Thai | th | 1,791 / 1,791 UI strings, 589 of 598 command labels, 31 menu wordings (draft) | yes | Thai text in documents; UI text (and layer and page names in Thai, whatever the UI language) in an installed Thai face, desktop only; the web build leaves Thai out | no | draft | 1–2 (after native review) |
 
-Other languages: Swedish (`sv`): every UI string translated, and 120 of the 588 command labels and
-menu wordings (the rest show in English); native review welcome. Figma ships none beyond the eight
-above.
+Other languages (measured 2026-10-22): Russian (`ru`) 2,352 / 2,352 (100%), reviewed and approved
+by VanTan, one/few/many integer plurals; Swedish (`sv`) 2,314 / 2,352 (98.4%), its command labels and menu
+wordings added 2026-10-17 (#599), native review welcome; Turkish (`tr`) 2,291 / 2,352 (97.4%), whose header
+says it was machine-drafted and reviewed by a native speaker; Czech (`cs`) 2,292 / 2,352 (97.4%), a draft
+with one/few/other plurals. Figma ships none beyond the eight above.
 
 The layer is done. Per-language hours above are agent hours for a catalog of ~1,800 entries
 (a machine draft, then a pass over the panels for overflow), plus each language's plural rule where
 it isn't one/other; every language also needs a native speaker's review (human). Left before full
 parity besides the languages: localizing engine messages and number formatting (4–6 h);
-right-to-left mirroring of the panels is in Arabic's hours. Total: **29–51 h**.
+right-to-left mirroring of the panels is in Arabic's hours. Total: **29–51 h** (kept on
+2026-10-17: Indonesian's draft takes 2–3 h off, about what bringing the drafts back from 95% to
+every string adds).
 
-Priority: native reviews of the seven drafts and the es-419 overlay (every one of Figma's languages
-and variants has one, plus Simplified Chinese, which Figma doesn't ship), then Hindi, Indonesian,
-Vietnamese and Arabic. Traditional Chinese is not planned (no catalog; its users see English).
+Priority: native reviews of the drafts and the es-419 overlay (every one of Figma's languages
+and variants has one, plus Simplified Chinese, Indonesian, Vietnamese and Czech, which Figma doesn't ship), then
+Hindi and Arabic. Traditional Chinese is not planned (no catalog; its users see English).
 
 ## Revision history
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-24 | minor | Thai (`th`) draft catalog: `th.toml` translates every UI string (1,791), 589 command labels and the 31 menu wordings, machine-drafted and marked as a draft awaiting native review (9 newer command labels read English, as in the other drafts). The desktop UI now adds an installed Thai face (Noto Sans Thai, Leelawadee UI, Tahoma, Sukhumvit Set, Thonburi, Ayuthaya, Sarabun, Loma, Garuda or Waree) when a layer or page name or the UI language needs it, so Thai names no longer show as tofu squares. No plural forms for Thai. Grade and hours unchanged |
+| 2026-10-24 | minor | Vietnamese (`vi`) draft catalog (#1026), assessed as a machine draft awaiting review like the others; string counts re-measured: 2,352 entries. |
+| 2026-10-23 | minor | A missing translation fails no check: Spanish is no longer held to full coverage, and the tests of one language's wording, names and plural forms are gone (the plural rules and language-tag tests stay). `cargo xtask i18n-report`, run by `cargo xtask ci`, lists each language's missing UI strings, command labels and menu wordings. Grade unchanged |
+| 2026-10-15 | minor | Community catalogs (#257, #263, #469, #477, #288): Russian (`ru`, Русский, reviewed and approved by VanTan) and Turkish (`tr`, Türkçe, reviewed by a native speaker), Czech (`cs`, Čeština) and Indonesian (`id`, Bahasa Indonesia) drafts, and the Japanese draft caught up; Preferences ▸ Language lists them and System maps their regional tags. Catalogs may give few and many plural forms; Russian picks one, few or many by its integer rule (11–14 take many), the catalog supplying the text choosing the rule. Only Spanish is held to completeness. Counts re-measured: 1,587 UI keys (38 plural), 559 command labels and 31 menu wordings, 2,177 entries; Spanish 100%, Japanese 2,176, Czech and Indonesian 2,166, Russian and Turkish 2,165, the five older drafts 2,088–2,089 (95%). Localization 39% and 29–51 h unchanged at this rounding |
+| 2026-10-17 | minor | Chinese showed as boxes on macOS (#406): the font scan also walks the system's downloaded font assets (`/System/Library/AssetsV2` and the older `/System/Library/Assets`, only their `com_apple_MobileAsset_Font*` folders), where current versions keep PingFang SC, and Hiragino Sans GB and Heiti SC join the Chinese UI faces and the text fallbacks. Tested with a folder laid out the same way; not yet run on a Mac |
+| 2026-10-17 | minor | String counts re-measured from the catalogs: 1,680 UI keys, 561 command labels and 31 menu wordings (2,272 entries); Spanish complete, the other drafts at 95.3–99.2% (strings added since 2026-10-12 show English), es-419 101 entries. Indonesian has a draft (98.8%; it was listed as none); Russian (98.8%, reviewed), Swedish (99.6%, command labels and menu wordings from #599), Turkish (98.7%) and Czech (98.8%) listed with counts; the language picker's list updated; a paragraph repeated by a merge removed. Grade and hours unchanged (Indonesian's draft is offset by the drafts' new gaps) |
 | 2026-10-14 | minor | Windows UI language (#291): the interface language comes from Windows' first preferred language alone; that list is also the input-language list (a German keyboard on a Polish system adds Deutsch), and taking the first entry with a catalog turned the interface German there. A first preferred language without a catalog reads English; macOS AppleLanguages and gettext's `LANGUAGE` still take the first language with a catalog |
 | 2026-10-12 | minor | Drafts catch up again, and the counts with them: French, German, Brazilian Portuguese, Japanese, Korean and Simplified Chinese translate the 71 UI strings and 5 command labels they lacked since sharing with a join code and open hosting (the Share popover, join codes, owner tokens, reports, the .fig export notes), and with Spanish the 26 strings and 3 command labels of your online files (Home ▸ Online, its menu and dialogs, the marks on tabs); machine-drafted in each file's conventions, still drafts. The Latin American overlay adds computadora and agrega where the new Spanish says ordenador and añade (98 entries). 2,076 entries per catalog (1,503 UI strings, 544 command labels, 29 menu wordings) |
 | 2026-10-12 | minor | Draft catalogs catch up: French, German, Brazilian Portuguese, Japanese and Korean translate the 66 UI strings and 17 command labels added since they were drafted (cursor chat and spotlight, the plugin directory, Rename layers, presentation and snapping keys, list levels, the rotation origin, placing with Enter…), Simplified Chinese the 46 and 12 it lacked; machine-drafted from the English in each file's conventions, still drafts (not in `COMPLETE`). The Latin American overlay adds Control for a gamepad controller and presiona in the plugin directory hint (90 entries, with Enter for the keycap). String counts re-measured: 1,417 UI keys, 536 command labels and 29 menu wordings (1,982 entries), every draft at 100%. Localization grade unchanged |
diff --git a/docs/mcp.md b/docs/mcp.md
index 45ae9ef8..b824b8ba 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -26,6 +26,72 @@ If that connection cannot be established, the error says the request was not sen
 A connection the app closed while it sat idle is noticed before the next request is written and
 replaced then, so a pause between calls is not an error.
 
+The app keeps answering while its window is minimised or covered by other windows (see
+`docs/control-protocol.md`): edits, inspection (`inspect_ui` too), pointer, key and text input and
+renders work as usual (minimised, each request to the app takes up to about 0.1 s). Only a capture
+of the window itself (`screenshot` with `window`) needs it on screen: it is then an error at once;
+`screenshot` without `window` renders the document instead.
+
+### Confining file access
+
+The roots below belong to the **headless** side: the session `figcraft-cli mcp` runs itself, with
+no window. A server attached with `--attach` runs the commands inside the app instead, so the app
+confines them — from the flags it was started with, not from anything passed to the CLI.
+
+```sh
+figcraft-cli mcp --automation-read-root /work/project --automation-write-root /work/project/out
+```
+
+```json
+{"mcpServers": {"figcraft": {"command": "/path/to/figcraft-cli",
+  "args": ["mcp", "--automation-read-root", "/work/project", "--automation-write-root", "/work/project/out"]}}}
+```
+
+The two flags (the other Craft apps take the same ones) keep an agent to the folders you give it.
+Each may be given more than once, as `--flag DIR` or `--flag=DIR`:
+
+- Every file a tool call reads must lie inside a **read root or a write root**; every file it writes
+  inside a **write root**. Anything else is refused with an ordinary tool error the agent can read
+  and correct, for example `automation path rejected: /etc/x.png is outside the folders that may be
+  written: /work/project/out`. Nothing is written and the server keeps serving.
+- Read and write authority are separate. With only `--automation-read-root` nothing can be written
+  to disk (`export` and the export commands without a `path` still return the bytes). Without either
+  flag nothing changes.
+- The roots must be existing folders: a missing one, or a file, stops the server at startup.
+  `initialize`'s `instructions` name the folders, so the agent knows where it may work.
+- **What is covered:** everything a call does, because the engine reaches the file system through
+  one module (`crates/engine/src/automation/file_access.rs`), and `crates/engine/clippy.toml` refuses `std::fs`
+  anywhere else in the engine, so a command added later is covered too. That is `open_file` (and the
+  `variables` file it may name), `save_file`, `export {path}`, and through `run_command` / `batch`
+  every command that names a file: `file.open`, `file.openRecent` (recent files outside the roots
+  are never listed, opened, removed or named: `index` counts the files listed), `file.import`,
+  `file.placeImage`, `image.place`, `file.save`, `file.saveAs`, `file.revert`, `file.recover`,
+  `file.export`, `file.exportSvg`, `file.exportLayers` (and the folders it makes), `file.exportFramesPdf`, the images and variables JSON read next to an imported REST API
+  file, `library.add` and the library files open documents link to, `variable.import` /
+  `variable.export`, `codeConnect.import` / `codeConnect.export`, `component.playground {path}`,
+  `plugin.import {path}`, a development plugin's module read again from disk,
+  `plugin.directory.publish {path}` and its assets, `collab.recoverFile {path}`, and the headless
+  `ui.render` / `ui.screenshot` with a `path`.
+- **How paths are resolved:** a relative path is made absolute against the server's working
+  directory, then its links are followed: the real path is what is compared and what is opened. For
+  a file that doesn't exist yet, its nearest existing folder is resolved and the rest must be plain
+  names, so `..` below a folder that doesn't exist is refused, and so is a link that leads nowhere
+  (writing through it would create its target, wherever that is). A path outside the roots gets
+  the same refusal whatever exists there, so a refusal doesn't tell what is outside. Folders are
+  compared by whole names: `/work2/x` is not inside `/work`. On Windows the case comes from the disk (`C:\WORK\x` is
+  inside `C:\work`), `\\?\` and UNC (`\\server\share\…`) paths are resolved like drive-letter ones,
+  and new names that are devices (`CON`, `NUL`, `COM1`…) or streams (`a.png:x`) are refused.
+- Not confined: the app's own folders, which no tool names (preferences, Data Recovery copies,
+  plugins installed from a plugin directory, the system fonts).
+- `--attach` with either flag is a usage error: the app runs the commands, so only the app can
+  confine them. Start it with the same flags, `figcraft --control 7979 --automation-read-root DIR
+  --automation-write-root DIR` (see [Control protocol](control-protocol.md#confining-file-access)),
+  then attach as usual. The attached `screenshot` gets its PNGs from the app as data, so no
+  temporary file is written anywhere.
+- A path is checked, then opened: another program that swaps a folder for a link in between can
+  still win that race. The roots keep an agent to the files it was given, not other software on the
+  computer; if that matters, run the server as a user that can't change the roots' folders.
+
 ### Fonts
 
 The headless server lays text out with the same fonts as the app: the fonts built into FigCraft
@@ -82,6 +148,8 @@ Or in a project's `.mcp.json`:
   there is none, so they are page coordinates then). Groups and boolean groups have no coordinate
   space of their own: a layer in a group is placed in the frame (or on the page) the group is in.
   `inspect_document` reports `x`/`y` the same way, plus `absoluteBounds` in page coordinates.
+  In `props`, `fill` and `stroke` also accept `"none"` (either case) or `null` as no paint, the
+  same as an empty `fills`/`strokes` list, so an outline-only shape can be made in one call.
 - Frames, groups, sections and masks: drawing a frame or section with the `pointer` tool around
   layers puts those fully inside it in it; sections go only on the page or in sections (moves,
   drags, pastes and new sections elsewhere are refused or land on the page); resizing a section
@@ -114,6 +182,8 @@ Or in a project's `.mcp.json`:
     columns (vertical layouts wrap top to bottom into new columns).
   - `object.convertToGroup` / `object.convertToFrame` turn a frame into a group or back in place
     (layers stay put; a group has no auto layout, fill, stroke, corner radius, clipping or grids).
+  - `object.convertToSection` turns a frame on the page or in a section into a section in place, and
+    `object.convertToFrame` turns a section back into a frame (keeping its fill, not clipping).
   - `contentAlign` (wrapping layouts): `auto` (default) packs the lines `crossGap` apart at the
     start, centre or end `crossAlign` names (lines of nothing but fill children stretch instead);
     `spaceBetween` puts the free space between the lines (one line, or no free space: like `auto`).
@@ -126,6 +196,12 @@ Or in a project's `.mcp.json`:
     the CSS `fr` unit: a track never gets less than its content (a fixed-size child bigger than
     its share keeps it; the other `fr` tracks share the rest). `inspect` reports a grid child's
     resolved `gridCell`.
+- Layer order: `node.reparent {ids?, parent, index?}` moves layers into `parent` (keeping their place
+  on the canvas, or taking their place in its auto layout flow) and `node.reorder {id, index}` moves
+  one within its parent. `index` counts the parent's children bottom first (in auto layout, the
+  first in the flow) and is where the (first) moved layer ends up after the move, in the same parent
+  or a new one; several layers land together in their stacking order. No `index`, or one past the
+  end, puts them on top (last in the flow).
 - **Every menu action is a command** (`list_commands`), and most commands act on `ids` when given,
   else on the selection. New layers become the selection.
 - Colours are `"#RRGGBB"` or `"#RRGGBBAA"`. Inside fills and strokes, `color` may also be a hex
@@ -169,6 +245,13 @@ Or in a project's `.mcp.json`:
   user units, e.g. `{"wght": 550, "wdth": 85}` (`null` = back to what the style name implies);
   `text.setVariations {variations, replace?}` merges instead. `text.fonts {family, style?, axes: true}`
   lists a font's axes and named instances (named instances are also valid `fontStyle` values).
+  `text.missingFonts` lists the families the document names that aren't installed
+  (`{families: [{family, layers}]}`); their text draws in a fallback font. Fonts are indexed once
+  per process: after installing one, `text.rescanFonts` picks it up (`{added: [families]}`), and
+  `text.loadFont {path | data (base64)}` adds a font file without installing it (`{families}`).
+  Text boxes keep the size they were measured at: both refit the open document's auto-sizing text
+  in the new families (`refitted: [ids]`), and `text.refit {ids?}` does it for any text, e.g. a
+  file saved while its fonts were missing.
   OpenType features: `features {"liga": false, "tnum": true}`.
   Decorations: `textDecorationStyle` (`solid`, `dotted`, `wavy`), `textDecorationThickness` and
   `textDecorationOffset` (`auto`, px, or `"10%"` of the font size; the offset runs from the baseline
@@ -177,7 +260,8 @@ Or in a project's `.mcp.json`:
 - **Lists** are per paragraph: `listStyle` (`none`, `bulleted`, `numbered`) and `indentation` (the
   nesting level, 0–8) apply to the paragraphs chars `start`..`end` touch (all of them without a
   range); `get_node` reports one `listStyle` for the layer, or `lineTypes` and `lineIndentations`
-  per paragraph. `text.bulletList`, `text.numberList` and `text.listStyle` act on the selected
+  per paragraph, plus `listStartOffsets` when a numbered list starts past 1 (from a `.fig` file;
+  1 shows "2."). `text.bulletList`, `text.numberList` and `text.listStyle` act on the selected
   paragraphs while text is edited. Layer props: `listSpacing` (px between list items, in place of
   `paragraphSpacing`), `hangingList` (markers outside the box) and `hangingPunctuation`. While
   editing, `key` Tab / Shift+Tab nest an item or move it out, Enter on an empty item and Backspace
@@ -195,12 +279,18 @@ Or in a project's `.mcp.json`:
 - **Styles stay true to their layers**: editing a styled fill, stroke, effect or layout grid list
   (`node.set`, `fill.set`, `fill.add`, a bound variable…) unlinks that style (`styles.fill` etc. go
   `null`), so a later `style.update` doesn't overwrite the edit; `style.apply` replaces variables
-  bound to what the style sets; a text style goes on text layers only. Names are trimmed per `/`
-  folder part. `style.move {styles, before?, folder?}` reorders (and with `folder`, renames into it),
-  `style.duplicate {style}` adds "<name> copy" right below, `style.renameFolder {folder, name}`.
+  bound to what the style sets; a text style goes on text layers only. In one call, a style link
+  (`fillStyle`, `textStyle`…) wins over values it sets; set a deviation in a later call, which
+  unlinks it. Names are trimmed per `/` folder part. `style.move {styles, before?, folder?}`
+  reorders (and with `folder`, renames into it), `style.duplicate {style}` adds "<name> copy" right
+  below, `style.renameFolder {folder, name}`.
 - **Variables**: `variable.bind` refuses a variable of a type the field doesn't take (a colour on
   `width`); scopes only filter pickers. `variable.delete` / `variable.deleteCollection` unbind the
-  layers using them (they keep their last value) and give aliases to them their values.
+  layers using them (they keep their last value) and give aliases to them their values. An
+  explicit edit that changes a bound field's value (`node.set`, `transform.resize`,
+  `object.opacityKeys`, `text.style`, `text.set`, the text size, weight and
+  tracking shortcuts, a canvas drag) detaches that field's variable; fields the edit
+  left as they were stay bound.
   `variable.addMode {from}` duplicates a mode, `variable.moveMode {collection, mode, to}` reorders
   (index 0 is the default mode, which layers on Auto follow). `variable.update {codeSyntax: {WEB?,
   iOS?, ANDROID?}}` sets code names (`""` clears); generated CSS uses the Web one.
@@ -218,16 +308,16 @@ Or in a project's `.mcp.json`:
 | Tool | What it does |
 |---|---|
 | `list_commands {filter?}` | Every command: id, label, menu, shortcut, undoable, params doc. |
-| `run_command {command, params}` | Run any command (e.g. `align.left`, `layout.add`, `component.create`, `instance.place` (drop an instance at a page point into the frame or auto layout slot under it), `component.exposeInstance` / `instance.exposed` (nested instance properties on instances), `component.makeSlot` / `instance.slotInsert` / `instance.resetSlot` (slots, below), `inspect.code` (CSS, HTML + CSS for a whole frame, React, Leptos, SwiftUI, Jetpack Compose or Flutter for a layer; components take their properties as parameters and instances are calls, see Dev Mode below), `inspect.properties` (layout, auto layout, typography, fills, strokes and effects with their style and variable names; `colorFormat`: hex, rgb, css, hsl or hsb), `inspect.assets` (layers under the selection with export settings, icons and images, each with its `kind`), `inspect.code` takes `unit: rem` and `rootFontSize` for CSS, HTML, React and Leptos, `style.create`, `variable.bind`, `variable.update` (rename, describe, scope), `variable.set` with `{alias}`, `variable.renameMode` / `variable.removeMode`, `variable.deleteCollection`, `proto.interaction.add`, `codeConnect.set` (components linked to real code, see Dev Mode below)). |
-| `batch {commands: [{command, params}], label?}` | Several commands as one undo step (`command.batch`); all-or-nothing for open documents and their document state. Failed inner commands are removed from the journal; preferences, clipboard, tool state and UI requests are not rolled back. A step can use what an earlier step returned: `{"$step": n}` anywhere in its params becomes the `id` in step n's result (zero-based), and `{"$step": n, "field": "…"}` another field of it (see Step references below). |
+| `run_command {command, params}` | Run any command (e.g. `align.left`, `layout.add`, `component.create`, `instance.place` (drop an instance at a page point into the frame or auto layout slot under it), `component.exposeInstance` / `instance.exposed` (nested instance properties on instances), `component.makeSlot` / `instance.slotInsert` / `instance.resetSlot` (slots, below), `inspect.code` (CSS, HTML + CSS for a whole frame, React, Leptos, Vue, SwiftUI, Jetpack Compose, ArkUI or Flutter for a layer; components take their properties as parameters and instances are calls, see Dev Mode below), `inspect.properties` (layout, auto layout, typography, fills, strokes and effects with their style and variable names; `colorFormat`: hex, rgb, css, hsl or hsb), `inspect.assets` (layers under the selection with export settings, icons and images, each with its `kind`), `inspect.code` takes `unit: rem` and `rootFontSize` for CSS, HTML, React, Leptos and Vue, `style.create`, `variable.bind`, `variable.update` (rename, describe, scope), `variable.set` with `{alias}`, `variable.renameMode` / `variable.removeMode`, `variable.deleteCollection`, `proto.interaction.add`, `codeConnect.set` (components linked to real code, see Dev Mode below)). |
+| `batch {commands: [{command, params}], label?}` | Several commands as one undo step (`command.batch`); all-or-nothing for open documents and their document state. Failed inner commands are removed from the journal; preferences, clipboard, tool state and UI requests are not rolled back. A step can use what an earlier step returned: name it with `"as": "card"` and `{"$ref": "card"}` anywhere in a later step's params becomes the `id` in its result (`{"$step": n}` does the same by zero-based position); `"field"` takes another key or a slash path such as `ids/0` (see Step references below). |
 | `create_node {type, x, y, width, height, parent, index, name, text, path, props}` | Create a frame, rectangle, ellipse, polygon, star, line, arrow, text, vector, section, component or slice; returns `{id, node}`. |
 | `set_properties {ids, props}` | `node.set` on layers (geometry, fills, strokes, effects, corner radius, auto layout, sizing, constraints, masks (`isMask`, `maskType: alpha\|vector\|luminance`), handoff status (`devStatus: none\|readyForDev\|completed`; marking again clears "Changed"), a section's `sectionContentsHidden`, text…); returns the updated layers. |
 | `inspect_document {depth, allPages}` | The document as JSON (layer tree, styles, selection, history). |
-| `get_node {id, depth}` | One layer as JSON. |
+| `get_node {id, depth}` | One layer as JSON; `pluginData` (`{key: value}`, values as strings) when the layer or page has layer data written with `set_properties {props: {pluginData}}`. |
 | `select {ids}` | Replace the selection (`[]` deselects). |
-| `export {ids, format, scale \| size, path?, bleed?, cropMarks?, bleedMarks?, cmyk?, contentsOnly?, includeBoundingBox?, svgOutlineText?, svgIdAttribute?, svgSimplifyStroke?}` | png, jpg, svg, webp, pdf, or `fig`: the whole file as `.fig`, experimental (see Exporting `.fig` files below); `size` is `2x`, `512w` or `512h`. The image covers what the layers paint (shadows towards their offset, strokes, unclipped children, a mask group's mask; hidden layers take no room; a slice is its area with everything under it); `contentsOnly: false` also draws every other layer showing in that area, `includeBoundingBox` exports the layers' own boxes; SVG: `svgOutlineText: false` keeps `<text>`, `svgIdAttribute` writes unique ids from layer names, `svgSimplifyStroke: false` writes every stroke as an outline. The same options go in export settings (`export.add` / `export.update`). PDF: frames one page each (sized in points), anything else together on one page; print options: `bleed` (points or a length like `"3mm"`, `"0.125in"`), crop and bleed marks, CMYK colour (see Exports below), also taken by `file.export`, `file.exportLayers`, `file.exportFramesPdf` and stored per export setting by `export.add` / `export.update`; `run_command` `file.exportFramesPdf {page?, path?}` writes every top-level frame of a page. Without `path`, images come back as MCP image content, SVG as text. Layers' own export settings: `run_command` with `export.add` / `export.update {index, size?, suffix?, format?}` / `export.remove` and `file.exportLayers {ids?, dir?, assets?}` (every layer once per setting, named `<layer><suffix>.<format>`, a slash in a layer name making a folder; `assets: true` exports the Inspect tab's assets instead: icons as SVG, images as PNG). |
+| `export {ids, format, scale \| size, path?, bleed?, cropMarks?, bleedMarks?, cmyk?, contentsOnly?, includeBoundingBox?, svgOutlineText?, svgIdAttribute?, svgSimplifyStroke?, vdCompat?}` | png, jpg, svg, webp, pdf, xml (an Android Vector Drawable: `svgIdAttribute` writes `android:name`, `vdCompat` is `bestEffort` (default: approximated with a warning), `exact` (left out with a warning) or `ignore` (no warnings: overlapping layer opacity dropped, even-odd fills kept as `fillType="evenOdd"`, diamond gradients left out), and the result lists `warnings` for what was changed or left out), or `fig`: the whole file as `.fig`, experimental (see Exporting `.fig` files below); `size` is `2x`, `512w` or `512h`. The image covers what the layers paint (shadows towards their offset, strokes, unclipped children, a mask group's mask; hidden layers take no room; a slice is its area with everything under it, or only the frame or group it sits in while `contentsOnly` is on); `contentsOnly: false` also draws every other layer showing in that area, `includeBoundingBox` exports the layers' own boxes; SVG: `svgOutlineText: false` keeps `<text>`, `svgIdAttribute` writes unique ids from layer names, `svgSimplifyStroke: false` writes every stroke as an outline. The same options go in export settings (`export.add` / `export.update`). PDF: frames one page each (sized in points), anything else together on one page; print options: `bleed` (points or a length like `"3mm"`, `"0.125in"`), crop and bleed marks, CMYK colour (see Exports below), also taken by `file.export`, `file.exportLayers`, `file.exportFramesPdf` and stored per export setting by `export.add` / `export.update`; `run_command` `file.exportFramesPdf {page?, path?}` writes every top-level frame of a page. Without `path`, images come back as MCP image content, SVG as text, XML as text followed by `{format, bytes, warnings}`. Layers' own export settings: `run_command` with `export.add` / `export.update {index, size?, suffix?, format?}` / `export.remove` and `file.exportLayers {ids?, dir?, assets?}` (every layer once per setting, named `<layer><suffix>.<format>`, a slash in a layer name making a folder; `assets: true` exports the Inspect tab's assets instead: icons as SVG, images as PNG). |
 | `screenshot {ids?, scale?, maxSize?, window?}` | PNG of the page (with background) or of layers, scaled to fit `maxSize` (default 1600). `window: true` captures the app window in front when attached, a window id (see Windows below) that window. |
-| `open_file {path, variables?}` / `save_file {path?}` | Open `.figcraft`, `.json` (FigCraft JSON or REST API file JSON with its variables, see below), `.fig` (best effort, see below), `.svg` (see Importing SVG below) or an image; save as `.figcraft`. |
+| `open_file {path, variables?}` / `save_file {path?}` | Open `.figcraft`, `.json` (FigCraft JSON or REST API file JSON with its variables, see below), `.fig` (best effort, see below), `.sketch` (Sketch 48 and newer, best effort), `.svg` (see Importing SVG below) or an image; save as `.figcraft`. `open_file` returns `opened` (for a file opened anew, a `summary` of `name`, `pages`, `layers` and `images`, and `warnings` or `repairs`; a file that was already open just gives its `index`) and the document's `document` outline. |
 | `undo` / `redo` | Step through history. |
 | `pointer {kind, x, y, to?, steps?, tool?, shift, alt, cmd, pressure?, pressureTo?}` | Mouse gestures in page coordinates with the current tool: `click`, `double`, `drag`, `down`, `move`, `up`, `hover`. A dragged layer drops into the frame or auto layout slot under the pointer, except one inside a group, a boolean group or an instance (outside its slots), which only moves. `pressure` (0–1) is pen pressure; a drag goes from `pressure` to `pressureTo` (see Brushes and pen pressure). |
 | `key {key, shift, alt, cmd}` | A shortcut or key as if typed on the canvas (every default shortcut, tool keys, Escape, Delete, arrows, number keys for opacity, arrows that pan the view when nothing is selected; while editing text, the text shortcuts and then text editing keys). Keys are names like `A`, `0`, `Enter`, `ArrowLeft`, `=`, `/`, or egui's (`Plus`, `Questionmark`); `cmd` is Cmd on macOS and Ctrl elsewhere. |
@@ -254,6 +344,137 @@ tips; headless, it only sets the preference.
 {"jsonrpc":"2.0","id":2,"method":"tools/call","params":{"name":"export","arguments":{"format":"png","path":"dashboard.png"}}}
 ```
 
+### Filling copies with data
+
+`data.fill {id, rows, gap?, formats?, dir?, format?, scale?}` repeats a frame once per row (a carousel, a set
+of posts, a card per item) in one undo step: each key of a row names layers in the copy, and a
+string (or number) sets their text, `{text?, fill?, visible?}` sets more; `name` names the copy
+(default "<frame> <n>"). Copies go in a row to the right, `gap` apart (default 100). With `dir`, each
+copy is exported there as `<name>.<format>` (png by default) after the edits land. Returns `{ids,
+missing (keys no layer is named), files?, errors?}`. `errors` lists the exports that failed as
+`[{id, path, error}]`; the copies stay, and the files that were written are in `files`.
+
+Copy that changes length per row can size itself: `{"Headline": {"text": "…", "fit": {"maxLines": 2}}}` runs
+`text.fit` on those layers after the text is set.
+
+`formats: [{name?, width, height}]` makes every row once per size: the copy is resized so its auto layout
+reflows, named `<name>-<format name>` (default `<width>x<height>`), and placed under the row's previous
+format. Text `fit` runs after the resize. Use case: one call turns a 1080×1350 post into feed, story
+(1080×1920) and square (1080×1080) files for each slide of a carousel; the frame must be auto layout (fixed-
+position children keep their place).
+
+`text.fit {ids?, maxLines?, minSize?, orphans?}` gives a text layer with a fixed width (auto height or fixed size)
+the largest font size, down to `minSize` (default 60% of the current), at which it stays within `maxLines` lines
+and its box's height. Every style run scales by the same factor. A one-word last line (an orphan) is avoided by
+shrinking up to 8% more, else by keeping the last two words together with a no-break space. A one-word paragraph after a hard line break is not an orphan. Text never
+grows, text that already fits keeps its exact size, and sizes round to a tenth without going below `minSize`.
+Returns `{fitted: [{id, fontSize, lines, fits, orphan}]}`. Use case: a carousel slide "Lighthouse 100. Loads in under
+1s." at 96px broke into three lines with "1s." alone; with `fit: {maxLines: 3}` it is two balanced lines.
+
+```json
+{"command": "data.fill", "params": {"id": 80, "dir": "out/carousel", "scale": 1, "rows": [
+  {"name": "01-cover", "Headline": "Your website and AI chat assistant in 7 days", "Badge": {"visible": true}},
+  {"name": "02-proof", "Headline": "Lighthouse 100, loads in under a second", "Badge": {"visible": false}}
+]}}
+```
+
+### Boards
+
+A board is a file of its own kind for thinking together: `file.newBoard {name?}` opens one (its
+page is light; `inspect_document` says `kind: "board"`). Board objects are ordinary layers with a
+`board` entry `get_node` shows (`{type: sticky|shape|connector|label|stamp|ink, …}`), so the usual
+commands move, resize, recolour, copy, delete and undo them. On a design file the board commands
+refuse; on a board `proto.*`, `dev.*`, `view.prototype` and `view.devMode` refuse. Each of these is
+one undo step and returns the ids it made:
+
+- `board.sticky {x, y, text?, color?, author?, parent?}` → `{id, text}`: a sticky note (a square
+  frame whose height grows with its note; its text size shrinks as the note gets longer). `color`
+  is a board colour (`yellow orange red pink violet blue green gray`) or a hex colour; `author`
+  defaults to your name (`pref.userName`, or the one a live session gave you; `false` for none).
+- `board.nextSticky {id?, side?: right|below|left|above, edit?}` → `{id, text}`: a sticky of the
+  same colour beside the selected (or edited) one; with `edit: true` the app goes on typing in it
+  (`Shift+Cmd/Ctrl+Enter` in the app does both).
+- `board.shape {shape, x, y, width?, height?, text?, color?, parent?}` → `{id, text}`: a shape with centred,
+  wrapping text: `rectangle roundedRectangle ellipse diamond triangle speechBubble chevron`.
+- `board.connector {from, to, fromSide?, toSide?, style?: straight|elbow|curved, startCap?, endCap?, label?}`
+  → `{id, label?}`: `from`/`to` are layer ids or `{x, y}` page points; sides are `auto` (the side
+  facing the other end) or `top right bottom left`; caps are stroke caps (default an arrow at the
+  end). An elbow goes around the objects it joins when the short way would cross them; a curved
+  one leaves and arrives along the sides. The connector re-routes itself whenever what it joins
+  moves or resizes, also when someone else in a live session moves it; a deleted end stays where it
+  was as a point. `board.label {id, text}` sets its label (empty removes it).
+- `board.reattach {id?, end: from|to, target, side?}` → `{id}`: moves one end of a connector
+  (default the selected one; its label stands for it) onto `target`, a layer id or an `{x, y}`
+  page point where the end stays free. Refused when both ends would be on one layer or the target
+  is a connector. Dragging a selected connector's end handle in the app does the same.
+- `board.stamp {x, y, stamp: thumbsUp|heart|plusOne|star|question|check}` → `{id}`: a round badge
+  centred there, with your name on it for hover.
+- `board.ink {path | points, highlighter?, color?, select? (default true)}` → `{id}`: a marker (or
+  wide, see-through highlighter) stroke.
+- `board.setColor {ids?, color}`: stickies and shapes take it as their fill, connectors and ink as
+  their line. `board.setStyle {ids?, shape?, fontSize?, style?: straight|elbow|curved, startCap?,
+  endCap?}`: a shape's outline and text size, a connector's routing and arrowheads.
+- `board.templates` → `[{id, name, description, width, height}]` lists the built-in templates:
+  `retrospective brainstorm weeklyPlanner flowChart kanban`. `board.template {name, x?, y?}` →
+  `{name, ids}` places one (its top-left at `x`, `y`; centred in the view without them) as ordinary
+  sections, stickies, shapes, connectors and text, selected, in one undo step.
+- `board.table {rows?, columns?, cells?, x?, y?}` → `{id, rows, columns, cells}`: a table (default
+  3 × 3, at most 50 × 20; `cells` is `[["Name", "Role"], …]` row by row and sets the size when
+  `rows`/`columns` are left out). It is an auto layout frame of row frames holding cell frames, each
+  with one text layer; `cells` in the answer holds those text layers' ids row by row, so
+  `node.set {id, props: {characters}}` changes a cell. A cell's row grows with its text. `board.tableEdit {id?, action: addRow|addColumn|removeRow|removeColumn,
+  index?}` → the same answer: `index` is where the new row or column goes, or which one goes
+  (default the last); `id` may be the table or any layer in it.
+- Tools for `pointer`: `tool.sticky {color?}`, `tool.shape {shape?}`, `tool.connector {style?: straight|elbow|curved}`
+  (drag from one object to another), `tool.marker {color?}`, `tool.highlighter {color?}`,
+  `tool.eraser` (drag over strokes), `tool.stamp {stamp?}`; Text and Section are the usual tools.
+
+```json
+{"command": "file.newBoard", "params": {"name": "Retro"}}
+{"command": "board.sticky", "params": {"x": 0, "y": 0, "text": "Went well", "color": "green"}}
+{"command": "board.sticky", "params": {"x": 240, "y": 0, "text": "To improve", "color": "pink"}}
+{"command": "board.connector", "params": {"from": 2, "to": 4, "style": "elbow", "label": "leads to"}}
+{"command": "board.stamp", "params": {"x": 200, "y": 0, "stamp": "plusOne"}}
+```
+
+`from` and `to` are the `id`s the two `board.sticky` calls returned (here `{"id": 2, "text": 3}` and
+`{"id": 4, "text": 5}` in a new board without an author name; a sticky with its author's name takes
+one more id). In a `batch`, step references (`{"from": {"$step": 1}, "to": {"$step": 2}}`, the `id`s steps 1 and 2 returned) avoid counting.
+
+Running a session on a board: a countdown and votes. Both are part of the board, so everyone in a
+live session sees the same, and neither is an undo step (undo leaves them as they are). On a
+design file they refuse.
+
+- `board.timer {action: start|pause|resume|add|stop, minutes?}` → `{state, left, text, ends}`: one
+  countdown per board. `start` takes `minutes` (default 5) and `add` adds them (default 1), from
+  one second up to 1440 minutes in all; `pause` keeps the time left, `resume` counts it down again.
+  The timer keeps its end time (milliseconds since 1970) or, paused, the time left, and each
+  client counts down on its own clock. `board.timerState {}` reads it: `state` is `off`,
+  `running`, `paused` or `done` (it ran out: 0:00 until someone stops it), `left` milliseconds,
+  `text` as `m:ss` (or `h:mm:ss`).
+- `board.vote {action: start|cast|retract|end|clear, …}` → the vote as `board.voteResults` gives
+  it. One vote at a time: `start {votes? (per person, 1–99, default 3), on?: all|stickies|selection
+  (default all), ids? (with selection; default the selected layers)}` (a vote that ended may be
+  replaced; one still running is refused), `cast {id}` puts one of your votes on an object (several
+  on the same object are fine; once yours are used up it refuses), `retract {id}` takes one back,
+  `end` shows everyone's votes, `clear` removes the vote and its results. `voter` (any action)
+  votes as someone else, for scripts and tests; by default you are your live-session client, or
+  your name (`pref.userName`) when the file isn't shared. In the app a click on an object votes
+  while a vote runs, and a click on your badge (or an Alt-click) takes the vote back.
+- `board.voteResults {voter?}` → `{state: off|running|ended, votesPerPerson, on, by, left, mine:
+  [{id, votes}], voters, results?}`: while it runs you see your own votes only (`mine`, `left`) and
+  how many have voted; once it ends `results` lists `[{id, name, votes, rank}]`, most votes first
+  (ties share a rank), with `name` the sticky's text or the layer's name. Votes on deleted objects
+  don't count.
+
+```json
+{"command": "board.timer", "params": {"action": "start", "minutes": 10}}
+{"command": "board.vote", "params": {"action": "start", "votes": 2, "on": "stickies"}}
+{"command": "board.vote", "params": {"action": "cast", "id": 2}}
+{"command": "board.vote", "params": {"action": "end"}}
+{"command": "board.voteResults", "params": {}}
+```
+
 ### Sections, handoff and arrow keys
 
 `run_command` with `object.wrapInSection {ids?, name?}` (Wrap in new section: layers on the page or
@@ -288,6 +509,10 @@ on; `key` resolves keys the way the canvas does. Commands behind keys:
 - `view.designPrototype` (`Shift+E`), `view.devMode` (`Shift+D`) and `view.leftSidebar`
   (`Shift+Cmd+\`) switch the right panel's tab or hide the left sidebar in the app (no-ops headless).
 - `doc.nextTab` / `doc.previousTab` (`Ctrl+Tab` / `Ctrl+Shift+Tab`): the next or previous open file.
+- Board tools (boards only): `tool.sticky` (`Q`), `tool.shape` (`B`), `tool.connector` (`X`),
+  `tool.marker` (`M`), `tool.highlighter` (`U`), `tool.eraser` (`E`), `tool.stamp` (`W`), and
+  `board.nextSticky` (`Shift+Cmd/Ctrl+Enter`, also while typing in a sticky). Keys no design-file
+  shortcut uses; on a design file they refuse.
 - `view.pan {dx, dy, big?}`: the arrow keys with nothing selected (`key ArrowRight` does the same)
   pan the view by 20 screen pixels a step, 200 with `big` (Shift).
 - `view.multiplayerCursors {on?}` (`Alt+Cmd+\`): show or hide others' cursors in a live session.
@@ -350,15 +575,39 @@ on; `key` resolves keys the way the canvas does. Commands behind keys:
   nested layers), Escape or a click drops it.
 - `pref.reduceMotion {on?}`: reduced motion (the interface's own animations off; the system's
   accessibility setting turns it on too). Prototype transitions still play.
+- `pref.uiScale {scale?}`: how large the whole interface is drawn, relative to the system's display
+  scale: 1 (the default) is the system's own size on every screen, 1.25 means 125 %, not 125; from
+  0.75 to 3 (outside the range it stops at the nearest end; `"auto"` is 1). Omit `scale` to read it.
+  The canvas zoom is separate. A window too small for a size above 100 % draws a smaller one until
+  it is larger; the choice is kept. In the browser the interface always follows the browser's zoom.
 - `pref.autoSave {on?}`: files that have a path save themselves a few seconds after they change
   (off by default; the desktop app's timer does it, so scripts still call `file.save`).
-- `pref.language {language: system|en|cs|ru|es|es-419|fr|de|pt-BR|ja|ko|zh-Hans|…}`: the app's interface language, applied live ("system":
-- `pref.language {language: system|en|es|es-419|fr|de|pt-BR|ja|ko|sv|zh-Hans|…}`: the app's interface language, applied live ("system":
+- `pref.startOnHome {on?}`: the desktop app starts on the Home screen instead of in a new file
+  (off by default; files named on the command line still open, and `--control` starts in a new
+  file anyway, so control callers have a document).
+- `pref.language {language: system|en|cs|ru|es|es-419|fr|de|pt-BR|ja|ka|ko|sv|vi|zh-Hans|…}`: the app's interface language, applied live ("system":
   the OS or browser language; a language without a catalog shows English). Command ids, labels and
   every result stay English.
 
 ### Editing vectors
 
+`vector.create {path | points}` makes the layer's box from the geometry; `width`/`height` scale
+the geometry to the size asked for (with both, each side independently; with one, the other keeps
+its proportion). A path or point set that draws nothing is refused instead of making an invisible
+0×0 layer, as is a size on an axis the geometry has none of (except 0, such as a horizontal line's
+height) and a size of 0 or less on an axis it has, which would flatten it.
+
+`node.set {path}` (or `set_properties`) replaces a vector's geometry with new SVG path data and
+keeps the layer: its id, name, place in the layer list, paints, effects, styles, variable bindings
+and constraints. The path is read as `vector.create` reads it, and `width`/`height` in the same call
+scale it the same way. The path's own box goes at the layer's current x/y (rotation and flips
+stay); with `x`/`y` in the same call it goes at `x` + its left edge and `y` + its top, as
+`vector.create` places it. Points' own settings (per-point corner radius, caps, joins) go with the
+old geometry. On several layers, layers that aren't vectors are skipped with a warning; on a
+single one, or when none is a vector, the call is refused (convert shapes with
+`vector.edit.begin` or Flatten first). A layer inside an instance is refused too: its geometry
+comes from its main component, so edit that or detach the instance. Undo brings the old path back.
+
 Vector edit mode is driven with `run_command` (or `pointer`/`key` for gestures):
 `vector.edit.begin {id? | ids?}` (default the selection; converts shapes to vectors; several layers
 are edited at once, the first active; `key` Enter with shapes selected does the same),
@@ -441,7 +690,11 @@ the scroll position with `preserveScroll: true`; `{type: "scrollTo", dest, offse
 the layer that far from the top-left of the innermost frame scrolling it, e.g. below a fixed
 header; `delayMs` makes a mouse enter, leave, down or up trigger wait before it acts;
 `{type: "openOverlay", dest, position: "manual", offset?: [x, y]}` puts the overlay that far from
-the top-left of the layer that opens it, and right below that layer without an offset). A key trigger takes a key or a combination (`{type: "keyPress", key: "Shift+K"}`; Ctrl,
+the top-left of the layer that opens it, and right below that layer without an offset;
+`anchor: "triggerInside" | "triggerOutside"` measures any other position on the layer that opens
+the overlay instead of the screen, so `{position: "bottomLeft", anchor: "triggerOutside"}` opens a
+dropdown right under its button, left edges lined up; Figma has no such setting, and `.fig` export
+writes it as a manual offset). A key trigger takes a key or a combination (`{type: "keyPress", key: "Shift+K"}`; Ctrl,
 Alt, Shift and Cmd, all held and no others) or a controller button (`key: "Gamepad A"`; `Gamepad`
 followed by `A`, `B`, `X`, `Y`, `LB`, `RB`, `LT`, `RT`, `View`, `Menu`, `LS`, `RS`, `Up`, `Down`,
 `Left`, `Right` or `Home`: the standard layout, face buttons by position), which the player reads
@@ -495,7 +748,8 @@ rotation?, color?, width?, height?, responsive?}` (`None`, `iPhone 16`, `iPhone
 `Black`, `White`, `Pink`, `Teal`, `Blue` for the iPhone 16 (an error lists them), `""` for the
 default; `width` / `height` set the custom size's screen, 1–10000 points, and pick `Custom size`,
 which is a bare screen without a body). On a device the presented frame is sized to the device's
-screen: what doesn't fit is clipped, or scrolls when the frame's `overflow` allows it, while `fixed`
+screen: a frame bigger than the screen scrolls through its whole size whatever its `overflow`, content
+past the frame's own edges scrolls only as its `overflow` allows (else it's clipped), and `fixed`
 layers stay on screen (pinned to the edges their constraints name). With `responsive: true` (saved
 in the file) the presented frame is instead resized to the device's screen, or without a device to
 the presenter's window at 100%, and its constraints and auto layout respond as when it is resized
@@ -508,7 +762,10 @@ device, whether a click where nothing reacts briefly flashes the screen's hotspo
 interactions, on by default; also in the presenter's Options menu) and whether its Inspect panel
 shows the size, colours and typography of the layer under the pointer (also the Inspect button in
 its bar); the options are kept for later presentations (in the presenter Z cycles them and R
-restarts). The player's state is
+restarts). An Open link to an `http` or `https` address first shows a notice that the link leaves
+the prototype, with Open link, Cancel and "Don't show this again"; `proto.linkNotice {show?}`
+turns the notice on (the default) or off, kept with the desktop app's preferences (the web build
+keeps it until the page reloads). The player's state is
 in `inspect_ui` (`presenter`, `preview`: screen, scroll, `scale`, `zoom`, `pan`, the screen's
 `hotspots` and whether they are flashing, the `inspected` layer) when attached, and
 `ui.set {presentScroll: [x, y]}` scrolls its screen (see [control-protocol.md](control-protocol.md)).
@@ -624,6 +881,14 @@ most when it can't be reached).
   moves the chosen variant there, `{name, index}` reorders variant properties (the variants'
   names follow). `component.properties` on a set reports `conflicts`: variants sharing one
   combination of values.
+- **Boolean properties**: on the main component, a boolean property's value is the visibility of
+  the layers bound to it. `component.addProperty {type: "boolean", default, layer}`,
+  `component.bindProperty {field: "visible"}` and `component.editProperty {name, default}` show or
+  hide the main's bound layers to match the default (without `default`, `addProperty` takes the
+  bound layer's visibility). Showing or hiding a bound layer on the main sets the default, and the
+  property's other bound layers (in every variant of a set) follow. New instances start from the
+  default; existing instances keep the values they have. Files open as saved: a main whose bound
+  layer disagrees with the default stays that way until one of them is edited.
 - `component.pushChanges {id?}` copies the instance's overrides into its main (from a layer of a
   nested instance too: always into the outer instance's main).
 
@@ -631,7 +896,9 @@ most when it can't be reached).
 
 - `instance.swap {ids?, component}` shows another component in the instances (overrides on layers
   with matching names stay; property values with the same names too). Nested instances can be
-  swapped on their own (an override of the instance they're in).
+  swapped on their own (an override of the instance they're in); a swapped nested instance keeps
+  what its outer main overrode on matching layers as its own, so later edits of those in the main
+  don't reach it.
 - `instance.swapAt {component, x, y}` swaps the instance at a page point: of the instances under
   it (innermost first), the first showing a variant of the same component set, else the innermost
   (never one inside the dropped component); only text layers keep their overrides. The Assets
@@ -709,6 +976,8 @@ click or drag across regions with `pointer` to merge, add `alt` to remove; `shap
 - **Text on a path**: `text.onPath {text?, path?, start?, flip?}` (default: the selected text layer
   and the other selected layer) puts a text layer on a vector's or shape's path: the text takes the
   path layer's place, transform and box, and the path layer is removed (`edit.undo` brings it back).
+  The text also takes the path layer's effects when it has any, and its fills when one of them
+  shows, each with its style and variable bindings; otherwise the text keeps its own.
   The baseline follows the path from `start` (0..1 of its length); the text's horizontal alignment
   places it there (left starts, centre centres, right ends at it); `flip` runs it on the other side
   the other way. Glyphs past an open path's end are hidden; a closed path (ellipse, rectangle) wraps
@@ -716,7 +985,12 @@ click or drag across regions with `pointer` to merge, add `alt` to remove; `shap
   them, `text.removeFromPath {ids?}` makes it plain auto-width text again. Resizing the layer
   scales the path. The text stays editable (`text.edit.*`, `type_text`); `get_node` shows
   `textPath {d (SVG path data in the layer's space), start, flip}`. Exports draw it as outlines
-  (PDF too: not selectable); underline and strikethrough aren't drawn on a path.
+  (PDF too: not selectable); underline and strikethrough aren't drawn on a path. With the tool
+  `tool.textOnPath`, a `pointer` press within 6 screen pixels of a shape's or vector's first
+  subpath puts a new, empty text layer on it, starting at the press, and starts typing: the text
+  also takes the path layer's constraints and effects, and its fills when one of them shows. Ending
+  the edit with nothing typed puts the path layer back with no undo step. Locked layers and layers
+  inside instances are skipped.
 - **Pattern fills**: `fill.pattern {source (layer id), ids?, index?, tile? (grid|horizontalHex|
   verticalHex), scale?, spacing? [x, y], align? (start|center|end), opacity?}` makes the fill at
   `index` (default the top one) the source layer repeated, at `scale` × its own size with `spacing`
@@ -814,12 +1088,21 @@ frame back to Auto, inheriting its parent's mode).
 The same JSON carries variables between FigCraft files: `variable.export {collections?, format?,
 path?}` writes this file's collections (default: all but library copies) as a local variables
 response (`format: "json"`, the default) or as CSS custom properties (`format: "css"`: the default
-mode on `:root`, each other mode on `[data-<collection>="<mode>"]`, aliases as `var(--name)`), and
+mode on `:root`, each other mode on `[data-<collection>="<mode>"]`, aliases as `var(--name)`, numbers
+in px unless the layers bound to them, their scopes or the variables aliasing them make them an
+opacity or a font weight, so `border-radius: var(--radius)` reads `12px`) or as
+Dart constants for Flutter (`format: "dart"`: an `abstract final class` per collection and mode, the
+default mode's named after the collection and the others after the collection and the mode, with a
+`static const` `Color`, `double`, `String` or `bool` per variable; names become camelCase Dart
+identifiers kept apart, aliases are resolved to their value in that mode), and
 returns `{text}` (or writes `path` and returns `{path}`). `variable.import {variables}` (an object,
-JSON text or a path) reads one back: a collection joins this file's collection of the same name
+JSON text or a path; `variableCollections` and `variables` under `meta` or at the top level) reads
+one back: a collection joins this file's collection of the same name
 (values matched by mode name, new modes and variables added, a same-named variable of another type
 skipped with a warning; library copies and extended collections are never targets), others are
-added; aliases are checked for loops; it returns `{collections, variables, updated, warnings}`. The
+added; aliases are checked for loops; it returns `{collections, variables, updated, warnings}`,
+with a warning when the JSON holds no variables (`no variables found: expected meta.variables …`)
+or fewer than its collections list in `variableIds`. The
 Variables editor's Import… and Export… buttons do the same through file dialogs.
 
 Strokes take colour styles and variables like fills: `style.apply {style, target: "stroke"}` links
@@ -893,7 +1176,8 @@ branches). Driven with `run_command`:
 
 - `branch.create {name?}` copies the file into a new branch tab and returns `{id, name, index}`.
   The branch remembers the file as it is now (its base) and makes new ids in its own id space, so
-  layers, styles and comments made on both sides never clash.
+  layers, styles and comments made on both sides never clash. Its history starts with a `Branch
+  created` version.
 - `branch.list` lists the branches of the file shown (or of the file a branch tab belongs to):
   `[{id, name, time, state: active|merged|archived, index?}]` (`index`: its open tab).
 - `branch.open {id}` opens a branch in a tab (or switches to it). Edit it like any document.
@@ -902,10 +1186,11 @@ branches). Driven with `run_command`:
   name, property, branch, main, deletedBy?}]}`. `layers` are the changed layers with their property
   changes formatted like Inspect (`fill #2563EB → #DC2626`); `document` lists styles, variables,
   comments and file settings. A conflict is the same property changed on both sides to different
-  values (key `<layer id>/<property>`, e.g. `4/fills`; fills, strokes and effects compare item by
-  item, so changing different items of one list on each side, or adding items at its end on one
-  side, merges without a conflict; a layer's parent and position are one
-  property, `parent`), a layer deleted on one side while the other edited it or what's inside it
+  values (key `<layer id>/<property>`, e.g. `4/fills`; fills, strokes, effects, layout grids,
+  export settings, guides, prototype interactions, annotations and Dev Mode resources compare item
+  by item, so changing different items of one list on each side, or adding items at its end on one
+  side, merges without a conflict; other lists, such as code links, compare whole; a layer's parent
+  and position are one property, `parent`), a layer deleted on one side while the other edited it or what's inside it
   (`<layer id>/layer`, with `deletedBy`), or a document-level entry or setting changed on both sides
   (`style/<id>`, `variable/<id>`, `comment/<id>`, `doc/<property>`…).
 - `branch.merge {id?, resolutions?}` merges the branch into the main file as one undo step,
@@ -914,15 +1199,26 @@ branches). Driven with `run_command`:
   conflict key to `"branch"` or `"main"`; the merge is refused while a conflict has none, so
   neither side's work is dropped without a choice.
 - `branch.updateFromMain {id?, resolutions?}` brings the main file's changes since the base into the
-  branch the same way (the new base is the main file as it is now). It is not undoable: the branch
-  tab's undo history starts over.
+  branch the same way (the new base is the main file as it is now) and adds an `Updated from main`
+  version to the branch's history. It is not undoable: the branch tab's undo history starts over.
 - `branch.archive {id?}` sets a branch aside without merging (it stays in the file and can still be
   opened, but not merged).
 
 Each branch keeps its own version history: on a branch tab, `file.saveVersion`, `version.autosave`
 and the `version.*` commands (list, preview, restore, rename, delete, duplicate) act on the
 branch's versions, which are saved in the file with the branch and stay with it when it is merged
-or archived. Branches aren't available in a live session.
+or archived.
+
+In a live session branches work the same way and stay with the person who made them (others
+don't see them). A branch made in the session makes its ids in your own client space, far above
+the ids the main file makes, so the session server takes them. Everyone's edits on main while the
+branch is open are main's changes in the review (against the branch's own base), and conflicts
+with them are resolved as offline. `branch.merge` is one edit of the session document: everyone
+gets it, and it is one step of your own undo history. It is refused on a view link, and for a
+branch made outside the session (or in an earlier one) whose new layers, styles, variables or
+comments lie in another id space, which the server would refuse; merge those once the file has
+left the session. While a session is still starting, branch commands that need your client id
+wait for it.
 
 ### Collaboration changes
 
@@ -1153,17 +1449,24 @@ Plugin settings are kept per plugin with the preferences (in a headless session,
 {"jsonrpc":"2.0","id":3,"method":"tools/call","params":{"name":"run_command","arguments":{"command":"plugin.event","params":{"id":"org.figcraft.examples.swatch-grid","control":"generate"}}}}
 ```
 
-Widgets (API 3, layers on the canvas a plugin draws) are driven the same way: `widget.insert
+Widgets (API 3 and 4, layers on the canvas a plugin draws) are driven the same way: `widget.insert
 {plugin, x?, y?}` puts one on the page (centred in the view without a position) and returns `{id,
 plugin, state, targets, output, logs, calls, fuel}`; `widget.click {id, target}` clicks one of its
 `targets` as a click on the canvas would (the plugin redraws it; one undo step; returns the same);
-`widget.list` lists every widget in the file with its plugin, page, state and targets. A widget's
-state is layer data, so it is saved, undone and synced with the file.
+`widget.list` lists every widget in the file with its plugin, page, state and targets. With plugin
+API 4 a widget can have editable text fields and a property menu (both listed with it, as `fields`
+and `menu`): `widget.setText {id, field, value}` sets a field as typing in it would (the value,
+at most 1,000 characters, goes into the state under the field's name and the plugin redraws; one
+undo step), and `widget.menu {id, item, value?}` uses a menu item (a toggle's `value` is `true` or
+`false`, by default the opposite of now; a colour's is one of its options). A widget's state is
+layer data, so it is saved, undone and synced with the file.
 
 ```json
 {"jsonrpc":"2.0","id":4,"method":"tools/call","params":{"name":"run_command","arguments":{"command":"widget.insert","params":{"plugin":"org.figcraft.examples.counter"}}}}
 {"jsonrpc":"2.0","id":5,"method":"tools/call","params":{"name":"run_command","arguments":{"command":"widget.click","params":{"id":12,"target":"increment"}}}}
 {"jsonrpc":"2.0","id":6,"method":"tools/call","params":{"name":"run_command","arguments":{"command":"widget.list","params":{}}}}
+{"jsonrpc":"2.0","id":7,"method":"tools/call","params":{"name":"run_command","arguments":{"command":"widget.setText","params":{"id":12,"field":"label","value":"Votes"}}}}
+{"jsonrpc":"2.0","id":8,"method":"tools/call","params":{"name":"run_command","arguments":{"command":"widget.menu","params":{"id":12,"item":"big"}}}}
 ```
 
 Plugins from a `figcraft-server`'s plugin directory ([`plugins.md`](plugins.md#plugin-directories)):
@@ -1182,36 +1485,67 @@ permissions: without it nothing is downloaded); `plugin.directory.publish {path
 
 ### Dev Mode
 
-- **Component code:** `inspect.code {id, language: react|leptos|swiftui|compose|flutter}` on a component,
+- **Pages as React + Tailwind:** `inspect.code {id, language: "tailwind"}` writes a layer tree as a
+  React function component styled with Tailwind CSS v4 utilities and no stylesheet. Auto layout
+  becomes `flex`/`flex-col`/`gap-*`/`p-*` on the 4px spacing scale, fixed-width auto layout frames
+  and text become fluid (`w-full max-w-[960px]`; as wide as the frame: `w-full`) and a frame's
+  fixed height a minimum, per-side strokes become `border-b` and the like, and instances are
+  inlined with their overrides (component code is `language: react`), except instances whose component
+  is connected to code (`codeConnect.set`/`codeConnect.import`, React): those are their snippet, e.g.
+  `<Button variant="outline">{"See examples"}</Button>`, with each import once at the top. A design
+  system mapped to shadcn/ui this way exports pages that use the project's own components. Bound variables become theme
+  utilities (`bg-accent`, `rounded-card`, `text-muted`) that `variable.export {format: "tailwind"}`
+  declares: `@import "tailwindcss";` and an `@theme static` block (every token is emitted, also those only read through `var()`) named by namespace (`--color-*`,
+  `--radius-*`, `--text-*`, `--spacing-*`, `--font-*`; a number's namespace and unit come from what
+  layers bind it to), other modes on `[data-<collection>="<mode>"]`. With `mobile: <frame id>` (the
+  same layer names, mobile layout) the code is mobile first: the mobile frame's classes, the
+  desktop frame's that differ behind `lg:`, and layers only on desktop `hidden` plus `lg:flex`
+  (auto layout frames) or `lg:block` (other layers).
+- **Component code:** `inspect.code {id, language: react|leptos|vue|swiftui|compose|arkui|flutter}` on a component,
   a component set or a variant writes the component as a reusable unit: React (TSX) with a props
-  interface, Leptos with a `#[component]` function (`#[prop]` defaults, `view!` markup), SwiftUI
-  with a `View` struct, Compose with a `@Composable` function, Flutter with a `StatelessWidget`. Its
-  component properties are the parameters, with their defaults: variant properties become string
-  unions (React) or enums, booleans become flags around the layers they show, text properties
-  strings, instance swaps views (`React.ReactNode`, Leptos `ViewFn`, `AnyView`, a composable lambda,
-  `Widget`) and slots optional content. Every variant of a set shares one definition; in React and
-  Leptos the other variants' differences become CSS rules on `data-*` attributes. On an instance (or
-  a layer tree containing instances) each instance is a call passing only the values it changes, e.g.
-  `<Button state="Hover" label="Buy" />`, `<Button state=ButtonState::Hover label="Buy" />`,
-  `Button(state: .hover, label: "Buy")`, `Button(state = ButtonState.Hover, label = "Buy")`,
-  `Button(state: ButtonState.hover, label: "Buy")`. Names are escaped and
+  interface, Leptos with a `#[component]` function (`#[prop]` defaults, `view!` markup), Vue as a
+  single-file component (`<template>`, a `<script setup>` with `defineProps` and its defaults, a
+  `<style scoped>`; a slot layer is Vue's own `<slot>`, so it takes no prop), SwiftUI
+  with a `View` struct, Compose with a `@Composable` function, ArkUI with a `@Component` ArkTS
+  struct (`@Prop` parameters, `@BuilderParam` for swaps and slots), Flutter with a `StatelessWidget`. Its component properties are the
+  parameters, with their defaults: variant properties become string unions (React, Vue) or enums,
+  booleans become flags around the layers they show, text properties strings, instance swaps views
+  (`React.ReactNode`, Leptos `ViewFn`, `AnyView`, a composable lambda, an ArkUI builder, a `Widget`) and slots
+  optional content.
+  Every variant of a set shares one definition; in React, Vue and Leptos the other variants'
+  differences become CSS rules on `data-*` attributes. A Vue template holds no arbitrary
+  expressions, so what React writes as a braced expression has its own spelling there: text is
+  `{{ prop }}`, a boolean property's layer carries `v-if="prop"`, and a binding is
+  `:prop="value"`. On an instance (or a layer tree containing
+  instances) each instance is a call passing only the values it changes, e.g. `<Button
+  state="Hover" label="Buy" />`, `<Button state=ButtonState::Hover label="Buy" />`,
+  `<Button state="Hover" />`, `Button(state:
+  .hover, label: "Buy")`, `Button(state = ButtonState.Hover, label = "Buy")`, `Button({ state:
+  ButtonState.Hover, label: "Buy" })`, `Button(state: ButtonState.hover, label: "Buy")`. Names are escaped and
   unique (keywords get a suffix, `default` → `defaultValue`, Rust's `type` → `type_`; Leptos names
-  are snake_case, Dart enum members lowerCamel; names that would shadow framework types get one
-  too, `Text` → `TextComponent`). `inspect.componentCode
+  are snake_case, Dart enum members lowerCamel; names that would shadow framework types get one too, `Text` → `TextComponent`). `inspect.componentCode
   {id?, language?}` returns the parts: `{component, name, set, properties: [{name, param, type,
   default, value? (instances)}], definition, usage? (instances)}`.
 - **Code connect:** link a component (a variant links its set) to the code component it is built
-  as, per language (`react`, `leptos`, `swiftui`, `compose`, `flutter`): `codeConnect.set {id?, language?, importPath?,
+  as, per language (`react`, `leptos`, `vue`, `swiftui`, `compose`, `arkui`, `flutter`): `codeConnect.set {id?, language?, importPath?,
   name?, template?}` (undoable; fields left out keep their value; the defaults are the generated
   name and a call passing every property) → `{component, language, code, unknown}`. Templates are
   text, never executed: `{property}` (its name or parameter name) is the instance's value escaped
   for the language (React and Leptos keep the markup's braces, so `size={size}` gives
-  `size="Large"` and `disabled={disabled}` gives `disabled={true}`; Leptos imports with `use
+  `size="Large"` and `disabled={disabled}` gives `disabled={true}`; a Vue binding takes an
+  expression, so `:size={size}` gives `:size="&quot;Large&quot;"` and `:disabled={disabled}` gives
+  `:disabled="true"` — the string keeps its JS quotes as entities, and a static attribute
+  (`size={size}`) takes plain text; a
+  component swap is the component itself, `:icon={icon}` giving `:icon="Icon"`; a string that needs
+  escapes keeps them inside the value, where the attribute's own quotes become `&quot;`; Leptos
+  imports with `use
   <importPath>::<name>;`), `{property ? "a" : "b"}` inserts one of two
   strings, any other `{…}` stays as written (`unknown` lists placeholder names that aren't
   properties). Then `inspect.code` on an instance or the component returns the import line and the
   snippet instead of generated code (`connected: true`), connected instances inside a generated
-  layer tree are their snippet, and `inspect.componentCode` returns `connected: {importPath, name,
+  layer tree (also in a component's definition, in the content an instance puts in its slots, and
+  the components a connected template's instance swaps place) are their snippet with their import
+  lines once each at the top of the code, per language, and `inspect.componentCode` returns `connected: {importPath, name,
   template, import, code}` with the snippet as `usage`. Example: template `<Button
   variant="primary" icon="{Has icon ? "cart" : "none"}">{label}</Button>` with import path
   `@acme/ui` gives `import { Button } from "@acme/ui";` then `<Button variant="primary" icon="none">{"Buy
@@ -1224,7 +1558,8 @@ permissions: without it nothing is downloaded); `plugin.directory.publish {path
   warning). `get_node` lists a component's links as `codeLinks`. In the app, the Inspect tab's
   Connect to code section edits them in the Code section's language, with a live preview and a
   Connected badge. An editor extension isn't needed: agents and editors read the same snippets
-  through this server. Plugins whose manifest asks only for `read` also run from the Inspect tab.
+  through this server. Plugins whose manifest asks only for `read` also run from the Inspect tab,
+  with their panels (`plugin.ui`); their callbacks can only read.
 - **Dev resources:** links for developers (docs, code, tickets) on any layer, each a URL and a
   name. `devResource.add {id?, url, name?}` → `{id, index}` (no name: the URL without its scheme,
   `www.` and a trailing slash; no page title is looked up), `devResource.edit {id?, index, url?,
@@ -1236,6 +1571,22 @@ permissions: without it nothing is downloaded); `plugin.directory.publish {path
   are clipped to 200 characters; a layer holds at most 32 links. Links are data: never fetched or
   opened by the engine (the app opens one when it is clicked). `get_node` and `inspect_document`
   list them as `devResources`; the Inspect tab lists, adds, edits and removes them.
+- **Measurements kept on the canvas:** distances a developer leaves on the canvas for everyone.
+  `devMode.addMeasurement {from? (default the first selected layer), to?, side?}` → `{from, index,
+  lines}` places one between `from` and `to` (a layer on the same page), along one side of `from`
+  (`side`: `top`, `right`, `bottom` or `left`: that side's length) or, with neither, to the layer
+  around `from`; `devMode.removeMeasurement {from?, index?}` → `{removed}` (no index: every one
+  starting from the layer); both undoable. `devMode.measurements {page?, id?}` → `[{from, fromName,
+  index, to?, toName?, side?, labels, lines: [{x0, y0, x1, y1, label, dashed}]}]` lists those on a
+  page (default the current one; `id`: only those from or to that layer), with their lines in page
+  space measured from the layers' current bounds, so they follow the layers. A measurement is
+  stored on the layer it starts from (`get_node` lists them as `measurements: [{to} | {side}]`),
+  saved with the file and synced; the same two layers are measured once (either way round), a
+  layer starts at most 64. One whose other layer was deleted or moved to another page isn't listed
+  or drawn (an undo brings it back); a copy keeps the side measurements and those to layers copied
+  with it. In the app, Dev Mode draws them with the hover redlines, and the Inspect tab lists them
+  (with nothing selected, every one on the page), selects a measurement's layer on a click, removes
+  one with −, and places new ones from its Add measurement menu.
 - **Annotations:** notes for developers on any layer, each with optional pinned properties that
   Dev Mode shows with their current values (and the style or variable behind them).
   `annotation.add {id?, label?, properties?}` (a note, pinned properties or both; returns `{id,
@@ -1263,17 +1614,23 @@ permissions: without it nothing is downloaded); `plugin.directory.publish {path
   tab filters the callouts by category and edits the categories (colour, name, delete, add); each
   note has a category menu.
 - **Ready for dev:** frames at the top of a page or section, and sections, carry a handoff status
-  (`node.set {devStatus: none|readyForDev|completed}`). `inspect.readyForDev {status?:
-  readyForDev|completed|any, page?}` lists them across pages (or on one page) in page and layer
-  order: `{items: [{id, name, page, status}]}`. The Inspect tab sets the status of the selected
-  frames and, with nothing selected, lists them with a status filter (click one to go to it, or its
-  focus button to open it in the focus view).
+  (`node.set {devStatus: none|readyForDev|completed}`; other layers are refused a status).
+  `inspect.readyForDev {status?: readyForDev|changed|completed|any, page?}` lists them across pages
+  (or on one page) in page and layer order: `{items: [{id, name, page, status, changed}]}`
+  (`changed`: ready for dev and edited since). The Inspect tab sets the status of the selected
+  frames and, with nothing selected, lists them with a status filter (Ready for dev, Changed,
+  Completed, Any status; changed ones carry a Changed badge; click one to go to it, or its focus
+  button to open it in the focus view). In the app's Dev Mode the canvas only inspects: presses
+  select (and pan, and comment), never move, resize, draw or edit text and vectors, and the menus
+  and shortcuts refuse commands that edit the design (Dev Mode's own annotations, statuses, dev
+  resources, measurements, code connections and comments still work); choosing a drawing tool in
+  the toolbar goes back to the design, and the layers panel only selects and expands. Commands sent over MCP or the control channel aren't affected.
 - **Compare changes:** when a layer marked Ready for dev first changes (it turns "Changed"), the
   file keeps a copy of it and everything in it as it was just before that edit (saved in the
   `.figcraft` file only while there is a change; resolving the change, marking it again, another
   status or deleting it drops the copy, so the next change compares with that state).
-  `dev.compare {id?, show?}` → `{id, name, changed, snapshot, added, removed, modified, truncated,
-  changes: [{id, name, type, change: added|removed|changed, depth, layers, properties?: [{section,
+  `dev.compare {id?, version?, show?}` → `{id, name, changed, snapshot, added, removed, modified,
+  truncated, version: {id, name, time} | null, changes: [{id, name, type, change: added|removed|changed, depth, layers, properties?: [{section,
   property, before, after, text}]}]}`: layers matched by id, added and removed ones listed as a
   whole (`layers` counts what's inside), changed ones with their properties formatted like Inspect
   (`width 120 → 136`, `fill #FF0000 → #E03030`, `text “Welcome” → “Hello”`, `parent Badge → Screen`,
@@ -1281,7 +1638,11 @@ permissions: without it nothing is downloaded); `plugin.directory.publish {path
   opacity, visibility, name), nested layers and instance contents included. `snapshot: false` means
   the frame changed before copies were kept (an older file). `show: true` opens the compare view in
   the app: before and now side by side (or overlaid with a slider), changed layers outlined (added
-  green, changed orange, removed red), the list of changes and Resolve change.
+  green, changed orange, removed red), the list of changes and Resolve change. With `version` (an id
+  from `version.list`) any top-level frame or section, ready for dev or not, is compared with that
+  saved version instead (a layer the version doesn't have was added as a whole); the compare view
+  picks it at the bottom (Compare with: When marked ready, or a version; a frame that isn't ready
+  for dev compares with the newest version), and `ui.set {devCompareVersion}` sets it.
 - **Focus view:** `dev.focus {id? | direction: next|previous}` → `{id, name, page, index, count}`
   shows one top-level frame or section alone on the canvas (fitted, selected, other layers neither
   drawn nor hit), switching page when needed; `direction` steps through the ready-for-dev frames
@@ -1355,6 +1716,35 @@ through the outlines of its layers.
   clears it; no `preset` reads it). The desktop app reads pressure from pen input on Windows; in the
   browser from stylus touch events that report a force; macOS and Linux tablets report none.
 
+### Selection colors
+
+`selection.colors {ids?}` returns `{colors: [{paint, style, variable, targets}]}` across the
+selection and its descendants, deduplicating overlapping roots. Only visible solid and gradient
+paints are listed; masks and boolean operands are omitted. Styles and variables distinguish
+otherwise equal paints. Each target is `{id, fills, index, range}`; `range` is null for a node
+paint or `[start, end]` in character offsets for an effective text-range fill.
+
+Pass the returned target list to:
+
+- `selection.setPaint {targets, paint}` to replace only those slots (same paint syntax as `fill.set`).
+- `selection.selectColor {targets}` to select their distinct owning layers, without a document undo step.
+- `selection.applyColorStyle {targets, style}` to apply a document paint style. As with `style.apply`,
+  this replaces the matching node's entire fill/stroke list and links the style. Text ranges copy
+  resolved paints and keep their typography, without a paint-style link.
+- `selection.bindColorVariable {targets, variable}` to bind a document color variable (id or name)
+  to those solid fill and stroke slots, as `variable.bind` does with `fills/<i>/color` or
+  `strokes/<i>/color`. A color style on the list and an earlier binding of the slot are removed.
+  Text ranges with fills of their own take the variable's value in the layer's modes, without a
+  binding. Gradients and other variable types are refused; scopes only filter what the Selection
+  colors menu offers, as for `variable.bind`.
+- `selection.detachColor {targets}` to unlink the color style and the color variable of those
+  slots, keeping their values.
+
+Keep the targets fixed throughout a live interaction. A color becoming equal to another color
+must not add slots to the gesture. Invalid or missing targets fail atomically. Direct paint edits
+detach bindings on changed paint values (opacity alone keeps the color binding); a text-range edit preserves the node bindings other
+characters still inherit. Each mutating command is one undo step (an interaction can group them).
+
 ### Paint, effect and layout grid lists
 
 A layer's fills, strokes, effects and layout grids are lists kept **bottom first**: index 0 paints
@@ -1521,6 +1911,18 @@ the instance's text layer id with `get_node`):
 {"jsonrpc":"2.0","id":7,"method":"tools/call","params":{"name":"type_text","arguments":{"id":7,"text":"Grace Hopper"}}}
 ```
 
+Smart-selection spacing (movable siblings in rows, columns or aligned grids):
+
+```json
+{"jsonrpc":"2.0","id":"spacing","method":"tools/call","params":{"name":"run_command","arguments":{"command":"arrange.spacing","params":{"ids":[3,4,5],"horizontal":24}}}}
+```
+
+`horizontal` and `vertical` are optional page-unit gaps (at least one is required, magnitude at
+most 1,000,000). The first column/row stays fixed; subsequent tracks move without changing sizes,
+parents or offsets inside each track. Nonuniform gaps become uniform. Normal auto-layout flow
+children, locked/hidden layers and instance internals are excluded. Interactive callers may pass
+`fromGesture: true` inside an interaction to keep using its original tracks during a scrub.
+
 Align and distribute as one undo step:
 
 ```json
@@ -1531,27 +1933,49 @@ Align and distribute as one undo step:
 
 ### Step references
 
-A step in a `batch` can use what an earlier step returned. `{"$step": n}` anywhere in a step's
-params (a value, an item in `ids`, a nested field) is replaced by the `id` in the result of step `n`
-(zero-based) before the step runs; `{"$step": n, "field": "name"}` takes another field of that
-result. This builds a nested tree in one call and one undo step, without guessing ids:
+A step in a `batch` can use what an earlier step returned. Give the step a name with `"as"` (next to
+`command` and `params`), and `{"$ref": "name"}` anywhere in a later step's params (a value, an item
+in `ids`, a nested field) is replaced by the `id` in that step's result before the later step runs.
+This builds a nested tree in one call and one undo step, without guessing ids or counting steps:
 
 ```json
 {"jsonrpc":"2.0","id":9,"method":"tools/call","params":{"name":"batch","arguments":{"label":"Card","commands":[
-  {"command":"node.create","params":{"type":"frame","name":"Card","props":{"layout":"vertical","gap":12}}},
-  {"command":"node.create","params":{"type":"text","parent":{"$step":0},"text":"Ada Lovelace"}},
-  {"command":"node.create","params":{"type":"frame","parent":{"$step":0},"name":"Button"}},
-  {"command":"node.create","params":{"type":"text","parent":{"$step":2},"text":"Follow"}}]}}}
+  {"command":"node.create","as":"card","params":{"type":"frame","name":"Card","props":{"layout":"vertical","gap":12}}},
+  {"command":"node.create","params":{"type":"text","parent":{"$ref":"card"},"text":"Ada Lovelace"}},
+  {"command":"node.create","as":"button","params":{"type":"frame","parent":{"$ref":"card"},"name":"Button"}},
+  {"command":"node.create","params":{"type":"text","parent":{"$ref":"button"},"text":"Follow"}}]}}}
 ```
 
-A reference to the same or a later step, a negative or non-integer index, a missing `field` or any
-other key next to `$step` fails the whole batch, which is rolled back. Only an object whose keys are
-`$step` (and optionally `field`) is a reference: text such as `"$step 0"` is left as written. The
-`$step` key is reserved in step params: an object holding it anywhere (in plugin data or a variable
-value too) is read as a reference. A step that is itself a `command.batch` is passed on as written,
-so the references in its steps are to its own steps, not the outer batch's.
+`{"$step": n}` refers to a step by its zero-based position instead, and works in the same places;
+the two can be mixed. Names are any non-empty string and must be unique within the batch.
 
-The end-to-end tests in `crates/mcp/tests/agent_tasks.rs` are worked examples of realistic tasks
+`"field"` takes something other than the `id`: a key of the result (`{"$ref": "card", "field":
+"name"}`) or a path into it, with `/` between the parts and list items by zero-based index, the way
+`variable.bind` names `fills/0/color`. `edit.duplicate` returns `{"ids": [...]}`, so its first copy is
+`ids/0`:
+
+```json
+{"jsonrpc":"2.0","id":10,"method":"tools/call","params":{"name":"batch","arguments":{"label":"Copy","commands":[
+  {"command":"edit.duplicate","as":"copy","params":{"ids":[5]}},
+  {"command":"node.set","params":{"ids":[{"$ref":"copy","field":"ids/0"}],"props":{"name":"Card copy"}}}]}}}
+```
+
+A path may start with `/`, as in JSON Pointer (`/ids/0`). A key that itself holds `/` is matched as
+written before it is read as a path. A path ends at whatever value it reaches, so `"field": "ids"` is
+the whole list.
+
+These fail the whole batch, which is rolled back, with an error naming the step: two steps with the
+same `as` (before any step runs); a `$ref` to a name no step has (the error lists the names there
+are) or to the same or a later step; a `$step` to the same or a later step, or that is negative or
+not an integer; a `field` the result doesn't have (the error names the full path and, for a list,
+how many items it has); any key next to `$ref` or `$step` other than `field`. Only an object holding
+a `$ref` or `$step` key is a reference: text such as `"$ref card"` is left as written. Both keys are
+reserved in step params: an object holding either anywhere (in plugin data or a variable value too)
+is read as a reference. A step that is itself a `command.batch` is passed on as written, so the
+references in its steps are to its own steps and names, not the outer batch's; the outer batch can
+reach into its result list with a path (`{"$ref": "inner", "field": "1/id"}`).
+
+The end-to-end tests in `crates/mcp/tests/it/agent_tasks.rs` are worked examples of realistic tasks
 (auto layout, a card built in one batch with step references, components and overrides, gradients
 and shadows, paint styles, Light/Dark variables, align/distribute/group, boolean subtract + flatten,
 export, undo/redo, drawing with tools).
diff --git a/docs/parity-checklist.md b/docs/parity-checklist.md
index bdb30e88..13fda27c 100644
--- a/docs/parity-checklist.md
+++ b/docs/parity-checklist.md
@@ -1,10 +1,10 @@
 # Parity checklist
 
-> **Generated:** 2026-10-13 by `cargo xtask parity`. Do not edit by hand.
+> **Generated:** 2026-10-21 by `cargo xtask parity`. Do not edit by hand.
 
-FigCraft commands registered for the incumbent's main menu and toolbar (547 commands in the engine).
+FigCraft commands registered for the incumbent's main menu and toolbar (575 commands in the engine).
 
-**211 / 211 menu items (100.0%)**
+**212 / 212 menu items (100.0%)**
 
 Every catalog item has a command.
 
diff --git a/docs/plugins.md b/docs/plugins.md
index 6f23e6ec..2d4001bc 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -18,7 +18,8 @@ permissions its manifest asks for, and nothing more.
   plugin can also keep settings from one run to the next.
 - **Widgets (API 3).** A plugin can put a layer of its own on the canvas: it describes the layer
   (frames with auto layout, text, shapes, images), FigCraft builds it, and a click on one of its
-  parts calls the plugin back to redraw it from its state, which is kept in the document.
+  parts calls the plugin back to redraw it from its state, which is kept in the document. Since
+  API 4 a widget can also have editable text fields and a small property menu.
 - **Permissions.** The manifest says whether the plugin only reads the document or may edit it, and
   can narrow the commands it may call. FigCraft enforces both.
 - **Distribution.** A team's own `figcraft-server` can keep a plugin directory: plugins are
@@ -91,6 +92,17 @@ and its state (a small JSON object) in its own layer data, so a saved file, a co
 a live session carries the widget as it is, and a copy is a widget of its own. A widget whose
 plugin isn't installed stays as it was drawn; clicking it says the plugin is missing.
 
+**Fields and menus (API 4).** A text layer of a widget can be an editable field: double-click it
+with the Move tool and it is edited like any text (all of it selected first). When editing ends
+(Escape, or a click elsewhere), the typing is put back and the new value goes to the widget
+instead: it is cleaned (line breaks kept, tabs become spaces, other control characters dropped),
+refused when longer than 1,000 characters, written into the widget's state under the field's
+name and into the field's text, and the plugin is called back to redraw, all as one undo step
+(none when the text didn't change). The value lives in the state, so it syncs and saves like the
+rest of it. A widget can also carry a property menu: while it is the only layer selected, a
+small bar over it shows its actions and toggles as buttons and its colour choices as swatches;
+using one calls the plugin back, one undo step. The labels are the plugin's own text.
+
 In a presented prototype (the presenter or the preview pane) clicks on a widget's clickable parts
 call its plugin back the same way, with the same limits, but on the prototype's own copy of the
 file: the widget changes in the prototype only, the file and its undo history stay as they are,
@@ -115,6 +127,8 @@ From scripts, the CLI and MCP the same commands apply, panels included:
 {"command": "widget.insert", "params": {"plugin": "org.figcraft.examples.counter", "x": 0, "y": 0}}
 {"command": "widget.list", "params": {}}
 {"command": "widget.click", "params": {"id": 12, "target": "increment"}}
+{"command": "widget.setText", "params": {"id": 12, "field": "label", "value": "Votes"}}
+{"command": "widget.menu", "params": {"id": 12, "item": "color", "value": "#14AE5C"}}
 ```
 
 `figcraft-cli run script.jsonl --in design.figcraft --out tidy.figcraft` runs that headless; over
@@ -132,9 +146,11 @@ plugins: import them in the script.
 | `plugin.close` | `{id}` | Closes plugin `id`'s panel and ends its session. `{closed}` says whether one was open. |
 | `plugins.runLast` | `{}` | Runs the last plugin command again. |
 | `plugins.manage` | `{}` | Opens the Plugins window; returns the list like `plugin.list`. |
-| `widget.insert` | `{plugin, x?, y?, fuel?}` | Puts widget plugin `plugin`'s widget on the current page, its top-left at `x`, `y` (default: centred in the view), and selects it; the plugin draws it. One undo step. Returns `{id, plugin, state, targets, output, logs, calls, fuel}`: `targets` are the names of its clickable parts. |
+| `widget.insert` | `{plugin, x?, y?, fuel?}` | Puts widget plugin `plugin`'s widget on the current page, its top-left at `x`, `y` (default: centred in the view), and selects it; the plugin draws it. One undo step. Returns `{id, plugin, state, targets, fields, menu, output, logs, calls, fuel}`: `targets` are the names of its clickable parts, `fields` of its editable fields, `menu` its property menu items. |
 | `widget.click` | `{id, target, fuel?}` | Clicks part `target` of widget `id` (or of the widget a layer `id` is in), as a click on the canvas would: the plugin is called back and redraws it. One undo step; returns like `widget.insert`. |
-| `widget.list` | `{}` | `{widgets: [{id, plugin, name, page, state, targets}]}`: every widget in the file. |
+| `widget.setText` | `{id, field, value, fuel?}` | Sets editable field `field` of widget `id` (or of the widget a layer `id` is in) to the text `value`, as editing it on the canvas would: the value (at most 1,000 characters, cleaned) goes into the state under the field's name and into the field's text, and the plugin is called back. One undo step; returns like `widget.insert`. |
+| `widget.menu` | `{id, item, value?, fuel?}` | Uses item `item` of widget `id`'s property menu, as its bar would: an action takes no `value`; a toggle takes `true` or `false` (default: the opposite of now); a colour takes one of its options (hex, any case). The plugin is called back. One undo step; returns like `widget.insert`. |
+| `widget.list` | `{}` | `{widgets: [{id, plugin, name, page, state, targets, fields, menu}]}`: every widget in the file. |
 | `plugin.directory.list` | `{server?, query?}` | The plugin directory at `server` (`ws://host:port/`; default: the one browsed last): `{server, plugins: [{id, name, version, description, author, api, access, commands, widget, bytes, sha256, published, versions, installed, update}]}`, the latest version of each plugin whose id, name, description or author contains `query`. `installed` is the installed version (or null), `update` whether the listed one is newer. |
 | `plugin.directory.install` | `{id, version?, confirm, server?, sha256?}` | Downloads version `version` (default: the latest) and installs it, or updates the installed one. `confirm` must be `true` (installing runs the plugin's code: show its permissions first); without it nothing is downloaded. The download must match the SHA-256 the directory lists (and `sha256`, the one shown, when given). Returns `{installed, name, version, permissions, sha256, path, source, replaced}`. |
 | `plugin.directory.publish` | `{path \| plugin, server}` | Publishes a plugin folder (or its `figcraft-plugin.json`), or an installed plugin, as a new version. `server` carries the server's key: `ws://host:port/?key=…`. Returns `{published, server}`. |
@@ -224,7 +240,8 @@ plugin directory requests (`plugin.directory.*` says so). Import plugins with `p
 | `version`, `description` | Optional text. A plugin published to a [directory](#plugin-directories) needs a `version` of one to four numbers (`1.2.0`), each version newer than the last. |
 | `author` | Optional: who made it, as you type it (64 characters at most); plugin directories show it. |
 | `main` | Required. The module, a `.wasm` path relative to the manifest, inside its folder. |
-| `api` | The plugin API version the plugin was written for: `1` (the default), `2` (panels and settings) or `3` (widgets). A manifest asking for a newer one than FigCraft runs is refused, so a plugin that needs panels or widgets fails clearly on an older FigCraft. |
+| `api` | The plugin API version the plugin was written for: `1` (the default), `2` (panels and settings), `3` (widgets) or `4` (saving files, widget fields and property menus). A manifest asking for a newer one than FigCraft runs is refused, so a plugin that needs panels, widgets or `saveFile` fails clearly on an older FigCraft. |
+| `permissions.saveFile` | API 4: `true` lets the plugin offer a file to save (an exporter's output). FigCraft asks the user where it goes with its own Save dialog (a download in the browser); the plugin never gets a path. Manage plugins lists it ("can save files"). A plugin directory's entries don't carry it (their wire format stays as it is), so installing any API 4 plugin from one says it may offer files to save. |
 | `widget` | API 3: `true` when the plugin draws a widget (it's listed in Plugins ▸ Widgets). |
 | `permissions.access` | `read` (the default): commands that leave the document as it is; such plugins also run from Dev Mode's Inspect tab. `write`: edits too. |
 | `permissions.commands` | Optional allowlist: exact command ids or prefixes ending in `*` (`node.*`). Empty: any command the access allows. |
@@ -236,8 +253,15 @@ plugin directory requests (`plugin.directory.*` says so). Import plugins with `p
 Whatever its manifest says, FigCraft refuses these calls (the plugin gets the refusal as an error
 it can handle):
 
+- read or write files: a plugin never gets a path or the disk. With `permissions.saveFile` it can
+  only hand FigCraft a file (one per run, 16 MB at most, a plain file name) for the user to save
+  through FigCraft's own dialog; the user can cancel it;
 - files and the app: `file.*`, `app.*`, `pref.*`, `help.*`, `library.add`, `libraries.*`,
-  `image.place` with a `path` (pass the image as base64 `data` instead), `view.theme*`;
+  `image.place` with a `path` (pass the image as base64 `data` instead), `variable.export`,
+  `codeConnect.export` and `component.playground` with a `path` (leave it out to get the result
+  back), `codeConnect.import` with a `path` and `variable.import` with a file path instead of JSON,
+  `window.*` (new windows open files), `view.theme*`;
+- live sessions and online files: `collab.*`;
 - other documents and the version history: `doc.*` and `version.*` (except `doc.list` and
   `version.list`);
 - the undo history and nesting: `edit.undo`, `edit.redo`, `edit.repeat`, `command.batch` (a run is
@@ -255,17 +279,22 @@ WebAssembly in a debug build, far less in a release build), 64 MB of memory, 100
 16 MB. A panel spec is at most 64 KB with 64 controls; settings are at most 64 KB per plugin (keys
 and JSON values), keys 1–128 characters. A widget callback gets the same limits; its description is
 at most 4 MB with 256 layers nested 16 deep, its state at most 16 KB (keys 1–128 characters), and
-its images 1 MB each, 2 MB together and 4096 pixels on a side.
+its images 1 MB each, 2 MB together and 4096 pixels on a side. A property menu has at most 8
+items (labels up to 32 characters), a colour item 1–8 colours; a field's value is at most 1,000
+characters.
 
 Copying a byte across the guest-memory boundary costs one additional fuel, reserved before the
 allocation or copy. This also applies when the configured per-call overhead is zero. A reply
 read is charged for the bytes actually returned, not the requested buffer size. `calls` counts
 every ABI import, including calls which only query the reply length.
 
-## ABI (version 3)
+## ABI (version 4)
 
-Version 2 adds panels and settings to version 1, and version 3 adds widgets; a version 1 or 2
-module runs unchanged and gets the input it always got. Strings are UTF-8 `(ptr, len)` pairs in the plugin's linear memory; all values
+Version 2 adds panels and settings to version 1, version 3 adds widgets, and version 4 adds
+`save_file` and widget fields and property menus (new keys in the widget description and new
+widget events); a module written for an older version runs unchanged and gets the input it always
+got. A widget description with a field or a menu from a plugin whose manifest says `3` is refused,
+and a FigCraft that runs an older API refuses a manifest that asks for `4` when it's imported. Strings are UTF-8 `(ptr, len)` pairs in the plugin's linear memory; all values
 are `i32`.
 
 The module **exports** `memory` and `figcraft_run(input_len) -> status`. When `figcraft_run` starts,
@@ -291,6 +320,15 @@ for a new widget) and what was clicked (`event` is null when it's inserted):
 {"api": 3, "command": "widget", "params": {}, "selection": [], "widget": {"id": 12, "state": {"count": 2}, "event": {"target": "increment"}}}
 ```
 
+With API 4 the event can also be an edited field (its value is already in `state` under the
+field's name) or a property menu item (`value`: null for an action, the new `true`/`false` for a
+toggle, the colour picked for a colour item):
+
+```json
+{"api": 4, "command": "widget", "params": {}, "selection": [], "widget": {"id": 12, "state": {"count": 2, "label": "Votes"}, "event": {"field": "label", "value": "Votes"}}}
+{"api": 4, "command": "widget", "params": {}, "selection": [], "widget": {"id": 12, "state": {"count": 2}, "event": {"menu": "color", "value": "#14AE5C"}}}
+```
+
 It returns `0` for success; anything else fails the run (and rolls it back), with the text passed
 to `set_output` as the error message.
 
@@ -311,6 +349,7 @@ included, is refused when the plugin is imported):
 | `setting_get` | `(key_ptr, key_len) -> status` | API 2. `0`: the reply holds the setting's JSON. `1`: there is none. |
 | `setting_set` | `(key_ptr, key_len, value_ptr, value_len) -> status` | API 2. Stores JSON under the key, for this plugin only, kept with the preferences. `1`: refused (not JSON, a bad key, over 64 KB), the reply says why. |
 | `setting_delete` | `(key_ptr, key_len)` | API 2. Forgets a setting. |
+| `save_file` | `(name_ptr, name_len, mime_ptr, mime_len, data_ptr, data_len) -> status` | API 4, needs `permissions.saveFile`. Offers a file to save; FigCraft asks the user where it goes once the run succeeds. `1`: refused (no permission, a bad file name, over 16 MB, a second file in one run), the reply says why. |
 | `widget_render` | `(ptr, len) -> status` | API 3. Draws the widget being inserted or clicked (the widget description below, as JSON). `1`: the description is invalid, the reply says why. A widget call that doesn't draw keeps the widget as it was (inserting one must draw it). |
 
 A pointer or length outside the plugin's memory traps, which fails the run. Host functions can only
@@ -360,16 +399,29 @@ ignored in auto layout), `width` and `height`, `fill` and `stroke` (hex colours)
 `vertical`), `gap`, `padding`, `justify` and `align` (`min`, `center`, `max`: along and across the
 layout) and `children`;
 with auto layout it hugs its contents on an axis without a size. A text has `text`, `size`,
-`color` and `bold` (with a `width` it wraps). An image has `data`, the image's bytes (PNG, JPEG…)
+`color` and `bold` (with a `width` it wraps), and with API 4 may have a `field` (a name like a
+target's): the text is then an editable field showing its current value. An image has `data`, the image's bytes (PNG, JPEG…)
 as base64, usually carried in the module itself; without a size it takes the image's.
 FigCraft checks the whole description (kinds, sizes, numbers, colours, lengths, counts, depth,
 image sizes) and refuses it if anything is off.
 
+With API 4, `menu` beside `root` is the widget's property menu (left out: none), for example:
+
+```json
+"menu": [{"item": "reset", "label": "Reset"},
+         {"item": "big", "label": "Steps of 10", "type": "toggle", "checked": true},
+         {"item": "color", "label": "Colour", "type": "color", "options": ["#1E1E1E", "#0D99FF"], "value": "#0D99FF"}]
+```
+
+Each item has an `item` name (like a target's, each once), a `label` (default: the name) and a
+`type`: `action` (the default), `toggle` (with `checked`) or `color` (with `options`, 1–8 hex
+colours, and optionally `value`, one of them: the current one). Every redraw replaces the menu.
+
 ## Writing a plugin in Rust
 
 `plugins/` in the repository is a workspace of its own: `plugins/sdk` (the crate
 `figcraft-plugin-sdk`, `no_std` with `alloc`) wraps the ABI with serde_json, and
-`plugins/examples` has three plugins:
+`plugins/examples` has four plugins:
 
 - **Tidy names** (`tidy-names`): cleans up the selected layers' names (extra spaces, the "copy" left
   by duplicating) and optionally their letter case, inside the selection too. Two commands: one
@@ -380,13 +432,20 @@ image sizes) and refuses it if anything is off.
   button; the palette
   picked last is remembered as a setting for next time. **From hex colours…** takes a palette of
   hex colours in the parameters form.
-- **Counter** (`counter`, API 3): a widget, a count between − and + buttons; each click changes the
-  count kept in the widget's state. It only reads the document.
+- **Counter** (`counter`, API 4): a widget, a count between − and + buttons under a label; each
+  click changes the count kept in the widget's state, a double-click on the label edits it, and its
+  menu resets the count, counts in tens or colours it. It only reads the document.
+- **Export names** (`export-names`, API 4): saves the names of the selected layers (optionally the
+  layers inside them too) as `layer-names.txt`. It reads the document and offers the file with
+  `save_file`; FigCraft asks where it goes.
 
 `cargo xtask plugins` (part of `cargo xtask wasm` and `cargo xtask ci`; it needs the
 `wasm32-unknown-unknown` target: `rustup target add wasm32-unknown-unknown`) checks, tests and
 builds them, and leaves each example's manifest and module side by side in
-`target/plugins/dist/<example>/`, ready to import.
+`target/plugins/dist/<example>/`, ready to import. With `CARGO_TARGET_DIR` set, that location is
+`$CARGO_TARGET_DIR/plugins/dist/<example>/`. Plugin compilation and host tests use the caller's
+same Cargo target directory; wasm modules are built under its `wasm32-unknown-unknown/release/`
+directory. The plugin workspace keeps its own lockfile and release profile.
 
 A plugin of your own:
 
@@ -438,7 +497,11 @@ panel calls back: `control`, `value` and every field's `values`); returning `Err
 rolls it back. With `"api": 2` in the manifest: `show_ui(&json!({...}))` and `close_ui()` for the
 panel, `setting(key)`, `set_setting(key, &value)` and `delete_setting(key)` for settings. With
 `"api": 3` and `"widget": true`: `input.widget` (`id`, `state`, `target`) when the widget is
-inserted or clicked, and `render_widget(&json!({"state": ..., "root": ...}))` to draw it. Outside
+inserted or clicked, and `render_widget(&json!({"state": ..., "root": ...}))` to draw it. With
+`"api": 4`, `input.widget` also has `field` or `menu` and the `value` that came with it, and the
+description may have fields and a `menu`; with `"permissions": {"saveFile": true}` too,
+`save_file(name, mime, &bytes)` offers a file; FigCraft asks the user where it goes and the plugin
+never learns a path. Outside
 WebAssembly every host call fails, so the plugin's own logic can be unit-tested with `cargo test`.
 
 Any language that compiles to WebAssembly works the same way: export `memory` and `figcraft_run`,
@@ -451,9 +514,11 @@ import what you need from `figcraft`.
   install counts, and updates are found when you browse, not in the background. The browser build
   can't use a directory yet.
 - Plugins written for other apps (JavaScript plugins) don't run.
-- Widgets: clicks are their only events (no text input, hover, property menu or timers), they
-  can't open a panel, and their layers are frames, text, rectangles, ellipses and images only (no
+- Widgets: clicks, field edits and menu items are their only events (no hover or timers), a field
+  is plain text (no placeholder, length or single-line setting), they can't open a panel, and their layers are frames, text, rectangles, ellipses and images only (no
   vectors, components or variables).
 - Panels: no images, sliders or free layout inside a panel.
 - Data in the document: plugins keep data on layers (pages included) with `node.set {props:
-  {pluginData: {key: value}}}`; there is no separate per-document store.
+  {pluginData: {key: value}}}` (a `null` value removes a key) and read it back with `node.get`, which
+  reports `pluginData: {key: value}` (values as strings) when a layer has any; there is no separate
+  per-document store.
diff --git a/docs/prototyping-parity.md b/docs/prototyping-parity.md
index b9220489..6c7b2437 100644
--- a/docs/prototyping-parity.md
+++ b/docs/prototyping-parity.md
@@ -1,20 +1,21 @@
 # Prototyping parity
 
-> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-13 · **Change:** minor (core editor leftovers: delays on mouse triggers and manual overlay offsets; controller buttons on key/gamepad triggers, widgets that react in prototypes, `proto.evaluate` and the mode lookup rules pinned) · **Target:** Figma Design (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-24 · **Change:** patch (overlay positions relative to the layer that opens them; the Triggers row no longer lists delays on mouse triggers as missing; top-level frames bigger than the device's screen scroll in the player; Change to, set variable and set variable mode lay out what they change in the player, as the canvas does; presentation tabs, one per page of a file; a Present tab with device and scale controls (#537); core editor leftovers: delays on mouse triggers and manual overlay offsets; controller buttons on key/gamepad triggers, widgets that react in prototypes, `proto.evaluate` and the mode lookup rules pinned) · **Target:** Figma Design (desktop app 126.10.7)
 
 **Breadth ~92%, ready ~74% (estimated).** Every Figma trigger except media, every action except
 media control, every transition and easing exist; key/gamepad triggers take controller buttons,
 read from controllers on Windows and in the browser. Every rule of the public
 documentation on triggers, actions, overlays, animations, easing, scrolling and interactive
 components is a test case with what it implies (`crates/engine/src/proto_behaviour_tests.rs`, 7
-tests on the model, and `crates/ui-egui/src/present_behaviour_tests.rs`, 12 tests driving the
-player, 21 gestures among them; the tail: `crates/engine/src/proto_tail_tests.rs`, 4 tests, and
-`crates/ui-egui/src/present_tail_tests.rs`, 5 tests), and all pass. Not yet checked against
+tests on the model, and `crates/ui-egui/src/present/behaviour_tests.rs`, 14 tests driving the
+player, 21 gestures among them; presentation tabs: `crates/ui-egui/src/present_tab_tests.rs`, 6
+tests; the tail: `crates/engine/src/proto_tail_tests.rs`, 4 tests, and
+`crates/ui-egui/src/present/tail_tests.rs`, 5 tests), and all pass. Not yet checked against
 larger real prototypes. Remaining: 2–5 h.
 
 | Group | Figma | FigCraft | Missing |
 |---|---|---|---|
-| Triggers | On click, on drag, while hovering, while pressing, key/gamepad, mouse enter, mouse leave, mouse down, mouse up, after delay, on media hit, on media end | 10: OnClick, OnHover, OnPress, OnDrag, MouseEnter, MouseLeave, MouseDown, MouseUp, AfterDelay, KeyPress (keys, combinations and controller buttons) | media triggers, delays on mouse enter/leave/down/up; controllers on macOS, Linux and FreeBSD |
+| Triggers | On click, on drag, while hovering, while pressing, key/gamepad, mouse enter, mouse leave, mouse down, mouse up, after delay, on media hit, on media end | 10: OnClick, OnHover, OnPress, OnDrag, MouseEnter, MouseLeave, MouseDown, MouseUp, AfterDelay, KeyPress (keys, combinations and controller buttons) | media triggers; controllers on macOS, Linux and FreeBSD |
 | Actions | Navigate to, change to, back, scroll to, open link, open / swap / close overlay, set variable, set variable mode, conditional, play/pause/mute/seek media | 11: Navigate, Back, ScrollTo (with an offset), OpenOverlay, SwapOverlay, CloseOverlay, OpenUrl, ChangeTo, SetVariable, SetVariableMode, Conditional | media actions |
 | Transitions | Instant, dissolve, smart animate, move in/out, push, slide in/out | all 8 | — |
 | Easing | Linear, ease in/out/in-and-out, back variants, gentle, quick, bouncy, slow, custom bezier, custom spring | all 13 (springs physical) | — |
@@ -22,8 +23,8 @@ larger real prototypes. Remaining: 2–5 h.
 ## Rules from the documentation
 
 Status: **pass** (a case in the suite holds), **fixed** (the suite found a divergence, now fixed),
-**added** (the setting was missing and now exists), **silent** (the documentation doesn't say; the
-case pins the current behaviour).
+**added** (the setting was missing and now exists), **extra** (FigCraft's own, beyond the reference
+tool; opt-in), **silent** (the documentation doesn't say; the case pins the current behaviour).
 
 | Rule | Status | Evidence / notes |
 |---|---|---|
@@ -50,12 +51,15 @@ case pins the current behaviour).
 | Open overlay: positions, background dimming, close on a click outside (on by default, can be turned off) | pass | `a_click_outside_an_overlay_closes_it_unless_turned_off`, `overlay_positions` |
 | Overlays stack; swap overlay replaces the top one; close overlay closes it | pass | `overlays_stack_swap_close_and_go_with_navigation` |
 | Manual overlay position relative to the hotspot | **added** | `offset: [x, y]` on the action, from the top-left of the layer that opens it (X / Y fields in the interaction editor; without one, below that layer); `present_delay_tests` |
+| Overlay position presets relative to the layer that opens it, inside or outside (not in Figma: [forum request](https://forum.figma.com/suggest-a-feature-11/set-overlay-position-relative-to-element-not-to-page-35366)) | **extra** | `anchor: triggerInside \| triggerOutside` on the open overlay action; Relative to (Whole screen / Trigger layer) and Inside / Outside in the interaction editor. Outside: top presets above the layer, bottom presets below it, edges lined up (a dropdown is Bottom left + Outside); Center centres it on the layer. No flipping at the screen edge. `.fig` export writes a manual offset; `proto_overlay_anchor_tests`, `present_overlay_anchor_tests`, MCP `overlay_anchor` |
 | Delay on mouse enter / leave / down / up | **added** | `delayMs` on the interaction, a Delay field in the editor; fires once after the delay while its screen or overlay still shows (a pointer that leaves early: silent, it still fires); `mouse_triggers_wait_out_their_delay` |
 | Open link | pass | always a new tab or browser window (opening in place would leave the prototype) |
 | Change to: another variant of the instance, in place, with the interaction's animation | pass | `interactive_components_change_in_place` |
 | Interactive components: every instance plays the interactions of the variant it shows; an interaction on the instance with the same trigger wins | **fixed** | instances played only interactions copied onto them when they were placed: an instance placed before its main got interactions did nothing, and one placed after kept the first variant's interactions after changing (a toggle went on but never off). New instances no longer copy them, and copies in older files give way to the variant shown; `instances_play_their_variants_interactions` |
+| Presentation tabs: one per page of a file, named "file - page" (renames follow). Play on a page that has a tab shows it as it was (from another start frame it starts again). Tabs keep their own copy of the prototype and play on after their file closes; a saved file opened again gets its tabs back. A tab never changes a file that isn't in front. Its X or Escape ends it and goes back to its file, or Home | **fixed** | one "Present" tab: a second presentation replaced the first, Play restarted it, and closing the file ended it; `present_tab_tests` |
 | Change to on a layer inside a nested instance changes the instance whose variant set holds the destination | **fixed** | the innermost instance (an icon inside a button) was changed instead |
 | Set variable, set variable mode, conditional | pass | `proto_run_tests`, `proto_conditional_tests`, `present_variables_tests` |
+| Change to, set variable and set variable mode lay out what they change as the canvas does: text sizes to what it shows, hugging frames around it | **fixed** | the player didn't lay out after them: an instance with a longer label changed to the main's width, and a bound text kept its old size; `change_to_lays_out_the_instance_around_its_own_content`, `set_variable_and_set_mode_lay_out_the_text_they_change` |
 | Expressions: a variable reads the mode where the interaction runs (a frame that chose a mode, else the page's); `name[Mode]` reads a given mode whatever is chosen; operators on numbers, text (`+` joins), booleans and comparisons | pass | `mode_lookups_read_a_given_mode_or_the_layers_current_one`, `proto_expr_mode_tests` |
 | Set variable mode, then a conditional or set variable later in the same interaction: they see the new mode | pass | `set_variable_mode_changes_what_later_expressions_read` |
 | A set variable writes every mode of the variable, so a lookup of any mode reads the new value; a frame inside the screen that chose a mode keeps it after set variable mode | silent | pinned as stated |
@@ -86,10 +90,11 @@ case pins the current behaviour).
 | Widgets react to clicks in a presented prototype | done | clicks only, like on the canvas |
 | Interactive components: instances play their variant's interactions, overridden per trigger | done | |
 | Drag-driven animations that follow the pointer, in their direction | done | |
-| Presenter: device frames and colours, rotation, custom sizes, fit/fill/100%, responsive frames | done | device bodies drawn in code |
+| Presenter: device frames and colours, rotation, custom sizes, fit/fill/100%, responsive frames | done | device bodies drawn in code. Presenting opens a tab for the page, named "file - page", which keeps its screen and history while you go back to the design, with a thumbnail of the current frame, previous / next, device presets and scale choices; the frame is laid out again for the device's screen on the prototype's copy (constraints and auto layout; the file is untouched); on phones and tablets overflowing content drags while the device stays put: a top-level frame bigger than the screen always scrolls (as in Figma, with no overflow setting), content past the frame's own edges as its overflow setting allows ("No scrolling" clips it); closing the window asks about unsaved changes above the presentation (#537). Devices not compared with Figma's |
 | Hotspot hints, inspect panel in the presenter, comments in the presenter | done | |
 | Preview pane following edits live | done | |
 | Edit interactions on several layers at once | done | |
+| Open link: a notice before a website opens, with a checkbox to skip it on this device | done | `http` and `https` links (a mail link opens at once); Open link opens it, Cancel or Escape drops it; the desktop app saves the checkbox with its preferences, and the web build keeps it until the page reloads; `proto.linkNotice {show}` turns it on or off (`present_links_tests`) |
 | Opening a link in place | missing | |
 | Controllers on macOS, Linux and FreeBSD | missing | the usual Rust controller library links the system's libudev on Linux; the pure-Rust desktop builds read none there yet |
 | Prototype in a separate window; mirror to a phone | missing | see [hardware-parity](hardware-parity.md) |
@@ -100,6 +105,13 @@ case pins the current behaviour).
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-24 | patch | The Triggers row's Missing column no longer lists delays on mouse enter, leave, down and up, which landed on 2026-10-13 (`crates/engine/src/proto_delay_tests.rs`, `crates/ui-egui/src/present/delay_tests.rs`). Numbers unchanged |
+| 2026-10-24 | patch | Open link to a website first shows a notice that it leaves the prototype, with the link, Open link, Cancel and "Don't show this again", which the desktop app saves with its preferences and the web build keeps until the page reloads (`proto.linkNotice` turns the notice back on); a second link to a website that fires while the notice shows is dropped, and a mail link still opens. Before, the player opened the link at once, also from an After delay trigger. Numbers unchanged |
+| 2026-10-23 | patch | A top-level frame taller (or wider) than the device's screen scrolls with no overflow setting, as Figma's documentation says; before, "No scrolling" frames such as the landing page template's Phone frame only clipped. Content past a frame's own edges still scrolls only as its overflow allows. Checked in the app on macOS. Numbers unchanged |
+| 2026-10-22 | minor | Change to, set variable and set variable mode lay out what they change in the player as the canvas does: text sizes to what it shows and hugging frames follow (an instance with a longer label changed to the main's width; a bound text kept its old size). Two player tests. Breadth and ready unchanged. |
+| 2026-10-17 | minor | Presentation tabs: one per page of a file instead of a single "Present" tab, named "file - page" (renames follow); Play shows a page's tab as it was; tabs outlive their file and come back when a saved file opens again. Numbers unchanged. |
+| 2026-10-17 | minor | Overlay positions relative to the layer that opens them (M5, beyond Figma, from a long-standing forum request): `anchor: triggerInside \| triggerOutside` on the open overlay action measures the position preset on the trigger instead of the screen (outside: top presets above it, bottom presets below it, edges lined up; Center centres it on the trigger). Relative to and Inside / Outside controls in the interaction editor, the player, MCP and `.fig` export (as a manual offset). Numbers unchanged. |
+| 2026-10-17 | minor | Community batch #753: a Present tab (#537): playback in its own tab that keeps its screen and history, a current-frame thumbnail, previous / next, device presets and scale; the frame reflows to the device's screen on the prototype's copy; phone and tablet content drags inside a fixed device as its overflow allows ("No scrolling" frames clip; iPad mini, MacBook Air and Desktop keep their bodies); the unsaved-changes question shows above the presentation. Checked in the app on Windows. Percentages and hours unchanged |
 | 2026-10-13 | minor | Prototyping, delays on mouse triggers and manual overlay offsets (M5): mouse enter, leave, down and up wait `delayMs` before their actions run (once while waiting; dropped when the screen or overlay they were on goes away; a pointer that leaves early doesn't cancel, the documentation is silent), and a manual overlay sits at `offset: [x, y]` from the top-left of the layer that opens it (without one, right below it, as before). Delay and X/Y fields in the interaction editor, the player on its own clock, REST import (`delay`, `overlayRelativePosition`), `.fig` import and export (the export's field for mouse delays is unchecked against other software). Numbers unchanged. |
 | 2026-10-12 | minor | Controller buttons on key/gamepad triggers (Controller menu, player polling on Windows and in the browser, REST import instead of skipping, control channel injection), widgets reacting to clicks in presented prototypes on the prototype's own copy, `proto.evaluate`; the mode lookup and set-variable-mode rules written as cases (they already held). Breadth 90% → 92%, ready unchanged at 74% (controllers on Windows and the browser only; no real prototype QA yet), 3–6 h → 2–5 h |
 | 2026-10-11 | minor | Behaviour suite from the public documentation (7 model tests, 12 player tests with 21 gestures) and its fixes: on drag follows its animation's direction and the pointer, key combinations, overlay timers from when they open, interactive components play their variant's interactions and change the right instance, physical springs that play until they settle, smart animate overshoots with the easing, fixed layers above scrolling content; added scroll to offsets. Breadth 88% → 90%, ready 70% → 74%, 5–9 h → 3–6 h |
diff --git a/docs/releasing.md b/docs/releasing.md
index 7e9220ff..8ad7e614 100644
--- a/docs/releasing.md
+++ b/docs/releasing.md
@@ -68,6 +68,22 @@ FIGCRAFT_DEFAULT_SERVER=wss://design.example.org/ cargo build --release -p figcr
 The release workflow leaves it unset. The public server's terms are in
 [`online-sharing-terms.md`](online-sharing-terms.md).
 
+## The default font
+
+New text starts in Inter (`figcraft_doc::DEFAULT_FONT`). A distribution whose users mostly write a
+script Inter lacks (Thai, say) can name another family with `FIGCRAFT_DEFAULT_FONT` when building;
+unset or empty means Inter. Pick a family the build embeds from craft-fonts (the web build has no
+other fonts) or one its users have installed:
+
+```sh
+FIGCRAFT_DEFAULT_FONT="Noto Sans Thai" cargo build --release -p figcraft
+```
+
+Files record each text's family, so the variable only changes what new text starts in: a file
+saved by one build keeps its fonts in a build with another default. Like any other family, it
+renders only where it is available (embedded or installed); elsewhere the text falls back to the
+faces that are. The release workflow leaves it unset.
+
 ## What gets built
 
 | Platform | Artifacts | Built on |
@@ -95,13 +111,20 @@ examples from `packaging/server/` (systemd unit, Caddyfile, nginx; the Dockerfil
 the sources). Linux only for now; elsewhere operators build it with
 `cargo build --release -p figcraft-server`.
 
-**Fonts.** Every build job checks out [craft-fonts](https://github.com/storytold/craft-fonts) at
-`CRAFT_FONTS_REF` (top of `release.yml`) and builds with `CRAFT_FONTS_DIR` and
-`CRAFT_FONTS_REQUIRED=1`, so releases embed its fonts and fail rather than ship without them.
+**Fonts.** Every build job, the web one included (`web-craft-fonts`), checks out
+[craft-fonts](https://github.com/storytold/craft-fonts) at `craft-fonts-ref` (in `release.yml`) and
+builds with `CRAFT_FONTS_DIR` and `CRAFT_FONTS_REQUIRED=1`, so releases embed its fonts and fail
+rather than ship without them. The browser has no system fonts, so a web build without craft-fonts
+can't draw text.
 `crates/text/build.rs` reads both `fonts/manifest.txt` and `fonts/latin-manifest.txt`, so the pin
-must be a commit that has the Latin manifest (today `4391305`, on craft-fonts'
-`pr/latin-presentation-fonts` branch; re-pin to `main` once that lands). The web build embeds
-only Inter. Packages carry each embedded font's licence as `OFL-<family>.txt`
+must combine the Latin presentation catalog and the current core UI faces. Required web builds
+validate the emitted Inter Regular/SemiBold and Noto Sans Georgian Regular faces after filtering;
+a missing required face, style or asset fails the required web build. Excluded Adobe rows
+are skipped before resolving their asset paths.
+Native builds retain the permitted Latin presentation faces. Source Sans 3 and Source Serif 4
+are filtered on every target under FigCraft's asset policy. The web build keeps its smaller
+allowlist: Inter, Noto Sans Georgian and Archivo SemiBold when supplied. Packages carry each
+embedded font's licence as `OFL-<family>.txt`
 (`copy_font_licences` in `packaging/env.sh`; `Contents/Resources/Licenses` in the macOS app).
 
 ### macOS
diff --git a/docs/roadmap.md b/docs/roadmap.md
index 9e9eaec9..14d734ba 100644
--- a/docs/roadmap.md
+++ b/docs/roadmap.md
@@ -1,6 +1,6 @@
 # FigCraft roadmap: milestones and what's next
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-16 · **Change:** minor (community fixes from #478 up and a control-channel fix (#589); recent files as cards with thumbnails on the home screen; community fixes: lost images reported on loading, SVG import budgets, Leptos code, full screen, server snapshots, owner-only preferences, ruzstd 0.9.1, layer cycle repair, batch rollback, Direct3D 12 on Windows, plugin metering; vector edit mode regions: hover hatch, selection and drag; repeat command recursion fix; the Layout panel's constrain-proportions link scales the other side, #220; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; `.fig` import, best effort; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings; feature breadth ~79%) · **Target:** Figma Design (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-26 · **Change:** minor (Android Vector Drawable export; a selected unfilled shape drags over a filled layer below it (#1370); text truncation fills the last line, survives resizing, and auto height takes Max lines (#1375, #1376, #1377); M11 widget fields and property menus; M12 Boards: timer and voting; Installed weights of an embedded font family (#1246); `.sketch` import, best effort; Adobe Fonts found on macOS (#298); M12 Boards; community fixes in #507, #510, #529 and #530: auto-save, a text box by dragging, batch step references, removing someone from a live session, Russian and Turkish catalogs reviewed, Czech and Indonesian drafts, the Japanese draft completed, zoom previews, the web clipboard, Alt-drag snapping and Cmd+D repeat, recovery copies, crash and rollback fixes, colour emoji, `.fig` import fixes; earlier changes are in the revision history below) · **Target:** Figma Design (desktop app 126.10.7)
 
 Forward-looking plan. Where FigCraft stands today: [`ROADMAP.md`](../ROADMAP.md) and
 [`target-app-parity.md`](target-app-parity.md); the full ranked list: [`gaps.md`](gaps.md). Hours
@@ -16,8 +16,9 @@ are one Opus 5.5 agent; most milestones split across 4–6 agents on disjoint cr
 3. **Tool-by-tool interaction pass** against the running Figma ([`ui-parity.md`](ui-parity.md)):
    40–60 h, parallel by tool.
 4. **Languages** on the landed localization layer: native reviews of the es, fr, de, pt-BR, ja,
-   ko and zh-Hans drafts and the es-419 overlay (people), then the other key languages: 3–7 h per language
-   plus native review.
+   ko, zh-Hans, id and cs drafts and the es-419 overlay (people; Russian and Turkish are reviewed),
+   the entries added since each catalog was written, then the other key languages (Hindi,
+   Vietnamese, Arabic): 3–7 h per language plus native review.
 5. **Multiplayer M9**: accounts and teams on top of the live sessions and the standalone server (the WebSocket transport, hosting from the app, invite links that open the app, document sync, live cursors, selections, text carets, avatars and follow, per-user undo, reconnect with offline edits, collision-free ids for styles, variables, collections and comments, joining from the browser, and `figcraft-server` with persistence, publishing from the app and share links to edit or view landed), per [`collab-protocol.md`](collab-protocol.md) and [`server.md`](server.md): 45–90 h.
 
 ## Alpha gate
@@ -53,13 +54,14 @@ blockers.
 | M3 Components & styles depth | ~78% (extended collections, variables import/export, gradient stop and variant bindings landed 2026-10-11) | real libraries, component playground | 7–14 |
 | M4 Vector & text depth | ~80% (live booleans, arc fields, shape builder on strokes, boolean hit testing on the result, one-sided widths, text on a path, pattern fills, brushes and pen pressure landed 2026-10-11; vector edit mode regions 2026-10-13) | spell check, Figma Draw multi-edit | 7–18 |
 | M5 Prototype & present | ~85% | media, controllers on macOS/Linux/FreeBSD, separate window | 2–5 |
-| M6 Interop & Dev Mode | ~65% (code connect, Dev Mode plugins and best-effort `.fig` import landed 2026-10-11) | `.fig` import's tail, video/HEIC (animated GIFs and TIFF landed 2026-10-11), CMYK intent | 15–30 |
+| M6 Interop & Dev Mode | ~65% (code connect, Dev Mode plugins and best-effort `.fig` import landed 2026-10-11; best-effort `.sketch` import 2026-10-21) | `.fig` import's tail, video/HEIC (animated GIFs and TIFF landed 2026-10-11), CMYK intent | 15–30 |
 | M7 Release & fidelity (signed builds, look & feel, shortcuts) | builds done; fidelity pass started | tool-by-tool pass | 40–60 |
 | M8 Hardening & performance (bench, retained canvas, accessibility, idle) | ~60% | real-file corpus, platform QA, GPU canvas, screen readers | 60–110 |
 | M9 Real-time collaboration | core done (#103: ids, change sets, server ordering, convergence); live sessions (WebSocket transport with limits and reconnect, hosting from the app, invite links, document sync between apps, cursors, selections, avatars, follow, `collab.*` commands); per-user undo, rejection handling, offline queue and resuming after a reconnect; styles, variables, collections, modes and comments created in a session get ids from their creator's space; others' text carets and selections on the canvas; the browser client (joins desktop-hosted sessions); `figcraft://` links open the app and join (Windows registers per user; macOS and Linux packages declare the scheme); the standalone `figcraft-server` (persistence with compaction, restarts that lose nothing confirmed, publishing from the app, share links to edit or view, revocable); team libraries kept on the server and enabled by a share link, with usage counts, and swapping a library; `wss://` from the desktop app, server releases and a deployment guide | accounts, teams | 45–90 |
-| M10 Localization (new) | not started | layer + 11 languages | 60–100 |
-| M11 Plugins | runtime, API, menu, manager and SDK done (#101); plugin panels and settings (ABI v2); widgets (API 3), panels side by side, colour picker on plugin fields; a plugin directory on `figcraft-server` (publish, browse, install, update) | a public catalogue, publisher accounts and signatures, the directory in the browser, richer widget events; Figma plugin compatibility is an owner decision | 8–26 |
-| M12 AI features (new, owner decision) | not started | local models | 30–60 |
+| M10 Localization | ~39%: the layer, English, Russian and Turkish reviewed by native speakers; Spanish (with a Latin American overlay), French, German, Brazilian Portuguese, Japanese, Korean, Simplified Chinese, Indonesian and Czech drafts | native reviews, Hindi, Vietnamese, Arabic (with mirrored panels), engine messages and number formatting ([localization-parity](localization-parity.md)) | 29–51 |
+| M11 Plugins | runtime, API, menu, manager and SDK done (#101); plugin panels and settings (ABI v2); widgets (API 3), panels side by side, colour picker on plugin fields; a plugin directory on `figcraft-server` (publish, browse, install, update); widget fields and property menus (API 4) | a public catalogue, publisher accounts and signatures, the directory in the browser, widget hover and timers; Figma plugin compatibility is an owner decision | 6–22 |
+| M12 Boards (new) | first slice landed (2026-10-24): board files, sticky notes, shapes with text, connectors that follow, marker, highlighter, eraser, stamps, board toolbar and contextual bar, live sessions; then a shared timer and voting sessions | widgets, templates, tables, mind maps ([boards-parity](boards-parity.md)) | 20–44 |
+| M13 AI features (new, owner decision) | not started | local models | 30–60 |
 
 ## Next, after the current focus
 
@@ -73,6 +75,66 @@ blockers.
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-26 | minor | Dragging a selected unfilled shape (M1, #1370): a press inside a selected stroke-only shape over a filled layer stacked below it moved that layer; the drag-from-inside fallback of #910 now treats any layer painted below the selection like the frame or canvas behind it, so the selection drags, while a layer painted above it still takes the press. Regression test in the selection behaviour suite. Numbers unchanged |
+| 2026-10-26 | minor | Text truncation (M4, #1375, #1376, #1377): the last line shown takes as much of the next word as fits before the ellipsis ("Lorem consec…", not "Lorem…"); an explicit height, `transform.resize`, a resize handle or fixed sizing on a truncated text keeps it truncating instead of turning it fixed size; Max lines on auto-height text hugs up to that many lines and ends in an ellipsis (`text.maxLines`, `node.set {maxLines}`, Type settings, `.fig` export and import), and `node.get` / `get_node` report `maxLines`. Regression tests in the text and engine behaviour suites. Numbers unchanged |
+| 2026-10-24 | minor | Installed weights of an embedded font family (M7, #1246): release builds embed some families with only a few styles (Poppins Regular, Italic and Bold), and the first font scan dropped every installed face of such a family, so an installed Poppins SemiBold or Medium was never offered (a rescan did offer them). The first scan now keeps the embedded faces, which still win for the styles they cover, and offers the installed styles they lack beside them. Regression test in the font database tests. Numbers unchanged |
+| 2026-10-24 | minor | M12: a shared board timer and voting sessions; 30–60 h → 26–54 h |
+| 2026-10-24 | minor | M11: plugin widgets take text input (editable fields, `widget.setText`) and a property menu (`widget.menu`), plugin API 4; 8–26 h → 6–22 h |
+| 2026-10-24 | minor | Boards (M12): a file kind of its own (`file.newBoard`, saved in `.figcraft`, carried to live-session joiners) with sticky notes, shapes with text, connectors that re-route when what they join moves (an engine recompute, the same for local edits, undo and others' edits), marker, highlighter and eraser, stamps with the placer's name, a board toolbar and a contextual bar; prototyping and Dev Mode refuse on boards; design files and boards have their own marks on tabs and file rows. Milestone M12 Boards added; AI features move to M13 |
+| 2026-10-21 | minor | M6: best-effort `.sketch` import (Sketch 48 and newer), see [file-format-parity](file-format-parity.md). Percentages unchanged |
+| 2026-10-15 | minor | Auto-save (#305, #296): Preferences ▸ Save files automatically (`pref.autoSave`, off by default; desktop only, the browser has no files to save to) saves each open file that has a path 3 s after its last change, so steady editing doesn't save every few seconds, and never during a gesture, a live text preview or while a version is shown. The file is encoded on a thread of its own and written as of that moment (edits made meanwhile stay unsaved); a failed save says why in a toast and is tried again a minute later, and version history checkpoints keep coming with it on. Numbers unchanged |
+| 2026-10-15 | minor | A text box by dragging (#363, #360): a drag with the Text tool makes a fixed-size text box the size of the drag (at least one line tall); a click, or a drag shorter than the drag threshold, still makes auto-width text. Numbers unchanged |
+| 2026-10-15 | minor | Batch step references (#400): inside `command.batch` (MCP `batch`), `{"$step": n}` anywhere in a step's params stands for the `id` step n returned (`{"$step": n, "field": …}` for another field; `$step` is a reserved key), so a frame with its children takes one batch and one undo step; a malformed reference fails the batch, which rolls back, and a nested batch keeps references to its own steps. Numbers unchanged |
+| 2026-10-15 | minor | Removing someone from a live session (#338): right-click a person's avatar ▸ Remove *name* from session, or `collab.removePerson {client}`, when you host the session or own the file on a server; the session ends for them (they keep their copy), the code or link they hold no longer gets them back in while it runs, and everyone else stays. Numbers unchanged |
+| 2026-10-15 | minor | Pages list (#272, #258): a long pages list scrolls in its own area, so the layers below stay in view; page and layer drops count only inside the list's visible rows. Numbers unchanged |
+| 2026-10-15 | minor | Variables export in the browser (#368): Export… ▸ Variables JSON / CSS custom properties did nothing in the web build and now arrives as a download; importing there still needs a file picker. Numbers unchanged |
+| 2026-10-15 | minor | Font picker keys (#352, #345): Up and Down step through the font families from the current one, keeping the highlight in view and previewing it on the canvas; Enter applies it, Escape leaves the text as it was. Numbers unchanged |
+| 2026-10-15 | minor | Leaving Design ends the pen path (#308, #307): switching to Prototype or Inspect while the Pen draws ends the path and goes back to Move (pressing Design again keeps drawing), and a click on the toolbar no longer reaches the canvas under it. Numbers unchanged |
+| 2026-10-15 | minor | Vector edit mode keeps the canvas still (#322): the edit mode hints in the Design panel wrap, so entering edit mode and picking a region no longer shift the canvas by about 25 points in the middle of the click (which dragged the region picked). Numbers unchanged |
+| 2026-10-15 | minor | Drop shadows under a background blur (#317, #255): a layer with both casts its shadows from what it paints (a translucent fill casts a lighter shadow than an opaque one) and reads the backdrop only after drawing them, so a shadow shown behind transparent areas is seen through the blur. Numbers unchanged |
+| 2026-10-15 | minor | When the window can't open (#306, #261): Windows release builds have no console, so a graphics failure at start quit without a word; the error is now logged and shown in a message box in the interface language, with what to try (unset `WGPU_BACKEND`, update the driver, OpenGL) and where to report it, skipped with `--control`. Numbers unchanged |
+| 2026-10-15 | minor | Crashes on Windows (#271, #314, #337; #224 and two more): a text field focused before it was drawn aborted the screen-reader layer; double-clicking a page, creating a variable collection and renaming a style folder no longer close the app. Numbers unchanged |
+| 2026-10-15 | minor | Deeply nested layers (#330, #210): one depth guard (256) on the three recursive layout paths, so a deep file can't run the layout out of stack. Numbers unchanged |
+| 2026-10-15 | minor | Image memory budgets (#326; #203, #189): decoded images and a file's images have budgets; the decode cache evicts its least recently used entries. Numbers unchanged |
+| 2026-10-15 | minor | macOS file dialogs (#253, #250) no longer re-enter the event loop; a dialog's result goes to the file and window it was opened for, and dialogs are parented to the main window. Numbers unchanged |
+| 2026-10-15 | minor | Recovery copies (#297, #303, #331, #336; #202, #185, #187): a copy counts only after its write succeeds and a failed one is retried; saves and closes wait for the write in flight; copies keep version history and branches; a recovered copy stays until this run has its own. Numbers unchanged |
+| 2026-10-15 | minor | Text edits (#280, #278) no longer roll back earlier changes; a drag released off the canvas ends at the pointer's last canvas position. Numbers unchanged |
+| 2026-10-15 | minor | Rollback (#282, #301; #196): a failed command rolls back during a drag or other gesture too; a failed batch keeps the redo steps. Numbers unchanged |
+| 2026-10-15 | minor | Atomic save and export (#284): staging files are uniquely named and created exclusively, so a file or link already at the old fixed staging name is never written through, and two writers of one file no longer share one. Numbers unchanged |
+| 2026-10-15 | minor | Alt-drag copies (#283) snap to their original, and Duplicate (Cmd+D) then repeats the last copy's offset. Numbers unchanged |
+| 2026-10-15 | minor | The pen (#277) shows its Bezier handles while a point is dragged out. Numbers unchanged |
+| 2026-10-15 | minor | Corner handles (#293, #292): a press on a corner handle resizes instead of picking the corner-radius handle. Numbers unchanged |
+| 2026-10-15 | minor | New text (#372, #362) takes a readable colour from the frame it is drawn in, not only the page (text drawn in a white frame on a dark page was white). Numbers unchanged |
+| 2026-10-15 | minor | Outline stroke (#386) works on every selected layer. Numbers unchanged |
+| 2026-10-15 | minor | Send to back (#444) counts per parent when the selection spans frames. Numbers unchanged |
+| 2026-10-15 | minor | Align buttons (#276) are off when the selection has nothing to align to. Numbers unchanged |
+| 2026-10-15 | minor | Gradient type icons (#275) show their gradient. Numbers unchanged |
+| 2026-10-15 | minor | Corner resize cursors (#388) stay diagonal at any proportions; the text selection highlight (#390) stays inside the box on the last line. Numbers unchanged |
+| 2026-10-15 | minor | New pages (#311, #295) take the current page's background; the theme still decides a new file's page. Numbers unchanged |
+| 2026-10-15 | minor | A slice's export preview (#265) shows the content under it. Numbers unchanged |
+| 2026-10-15 | minor | SVG export (#327, #325) keeps a nested frame's fill and stroke inside its parent's clip. Numbers unchanged |
+| 2026-10-15 | minor | Home screen (#318, #324): recent files notice files deleted while it is open; a long path no longer draws over the file name. Numbers unchanged |
+| 2026-10-15 | minor | System theme on first run (#262): the first frame follows the system theme, and going back to System from a manual theme works. Numbers unchanged |
+| 2026-10-15 | minor | Web clipboard (#375): copy and paste in the browser go through the system clipboard, so a paste after a copy brings the copied layers instead of whatever text the clipboard held. Numbers unchanged |
+| 2026-10-15 | minor | Zoom previews (#312): when renders from scratch are slow, a new zoom first shows the whole view coarsely instead of the page colour, then the refined image; images of another file or page never show. Numbers unchanged |
+| 2026-10-15 | minor | Hidden windows (#313, #332; #269): a minimised or covered window answers control and MCP requests (commands, inspection, `ui.render`) at once, each window on its own; screenshots and input still wait for it to be on screen. Numbers unchanged |
+| 2026-10-15 | minor | Server (#340, #302): a compaction cut short closes the file instead of confirming lost edits (#183); each team library version is kept in its own file (#206). Numbers unchanged |
+| 2026-10-15 | minor | Counters (#343, #344, #353; #309): collab sequence numbers, layer name counters and opacity digits can't overflow. Numbers unchanged |
+| 2026-10-15 | minor | Commands refuse bad indexes and ids (#475, #384, #310): `page.select` and `doc.switch`, `effect.set` and `export.update` / `export.remove`, `page.move` with a non-page id. Numbers unchanged |
+| 2026-10-15 | minor | Find and replace (#358, #361) changes every occurrence, case-insensitively, also when the replacement contains the search text. Numbers unchanged |
+| 2026-10-15 | minor | The gradient shorthand (#254, #252) is read by the engine, so the CLI, control channel and MCP share it. Numbers unchanged |
+| 2026-10-15 | minor | .fig import (#279, #281): resized instances lay out their layers by their constraints (#266); explicit variable modes whose collection is named by its asset key, as library collections are, come across (#267). Numbers unchanged |
+| 2026-10-15 | minor | Colour emoji (#300, #268) draw from their own colour tables (sbix and CBDT/EBDT bitmap strikes, COLR v0 layers), a colour face tried first; COLR v1 still draws outlines. Numbers unchanged |
+| 2026-10-15 | minor | macOS (#290, #289): `.figcraft` files open from Finder, Open With and the Dock. Numbers unchanged |
+| 2026-10-15 | minor | Windows (#294, #291): the first preferred language alone picks the UI language. Numbers unchanged |
+| 2026-10-15 | minor | Unix font discovery (#474) follows `XDG_DATA_HOME`. Numbers unchanged |
+| 2026-10-15 | minor | Linux packaging (#346, #328): the window id matches the desktop entry (FreeBSD keeps its class); the RPM requires glibc 2.35. Numbers unchanged |
+| 2026-10-15 | minor | Tests (#472, #471, #339): the rename shortcut test, the hanging punctuation test and the font-scanning tests no longer depend on the platform, font or test order. Numbers unchanged |
+| 2026-10-15 | minor | Languages (#257, #263, #469, #477, #288): Russian (with one/few/many plural forms) and Turkish catalogs, reviewed by native speakers; Czech and Indonesian drafts; the Japanese draft completed. 2,177 entries now (1,587 UI strings, 559 command labels, 31 menu wordings); strings added since a catalog was written read English there. Localization 39% and 29–51 h unchanged at this rounding (Indonesian is now a draft, while the five older drafts lack 88 newer entries) |
+| 2026-10-18 | minor | M6 interop: Android Vector Drawable (XML) export (new L4 crate `figcraft-vectordrawable`), not on the incumbent's list. Numbers unchanged |
+| 2026-10-17 | minor | Community batch #753 (10 PRs): Selection colors for mixed selections (#403); smart-selection spacing fields and canvas handles (#402); a Present tab with device and scale controls (#537); adding auto layout to an empty frame keeps its size (#369); `node.set` applies auto layout keys to frames only and warns about font styles a family lacks (#603); canvas images on whole device pixels (#359); Adwaita window controls on Wayland without server decorations (#592, not run on GNOME or KDE by the maintainers); the keyboard shortcuts panel closes on the home screen (#548); macOS paste modifiers in tests (#750); credits column tests (#347). Numbers unchanged. |
+| 2026-10-17 | minor | Community fixes from #524 up (batches #727, #728, #733, #735, #736 and #729; 55 PRs) and a crash guard. `.fig` import: explicit instance identity, overrides by key, text style precedence, grid track sizes, slot content, connector labels, skip ink, paragraph options and hanging lists, list start numbers, vertical trim, per-point stroke joins, text on a path, image adjustments and embedded images; large files open within budgets from the file's own size; an import report after opening; imported bytes stay out of the command journal. Files and paste: save a copy as `.fig`; Cmd/Ctrl+V pastes images copied in other apps and layers copied from another design app (`edit.pasteDesignLayers`); paste over and paste properties; clipboard reads on Linux and the BSDs time out after 2 s. Editor: live font preview on hover; Shift+I and Resources open Assets; Shift-drag moves the selection; thin strokes take a nearby double-click; dropped points merge; Flatten keeps open paths; the Actions palette gets tabs, ranked search, a keyboard highlight and recents; the colour picker opens on a new fill or stroke; text strokes follow their alignment; selection highlights after line breaks; a draggable pages/layers divider; variant properties reorder by drag; submenus keep their hover with a safe triangle; menu actions that need a value ask for it; File ▸ Rename edits the name in place. Engine: bad paint indexes, non-finite geometry and pages in copy/cut are refused; a param naming a layer says so when it isn't one; a CLI script is one undo step and resolves `$step`. Server and collaboration: message limits follow `max_file_mb` (client capped at 1 GiB); a damaged generation field no longer drops flushed edits; the web build joins a session from a `#join=` link. Also Swedish command labels, Nix CI through the shared workflow, paint bounds once per render, and a guard that turns a panic inside the boolean-op library into bad input (the stroke draws unclipped). Numbers unchanged. |
+| 2026-10-16 | minor | Adobe Fonts found on macOS (M7, #298): fonts activated through Adobe Fonts rendered in the fallback font without a warning, because Creative Cloud keeps them in its own folder as hidden files named by number, which the font scan never read. The macOS scan now includes `~/Library/Application Support/Adobe/CoreSync/plugins/livetype`, and files without an extension are indexed when they start with a font signature. Fonts are read in place. Regression test in the font database tests; docs/cli.md lists the folder. Numbers unchanged |
 | 2026-10-16 | minor | Community fixes from #478 up (batches #591, #598, #602; 69 PRs) and a control-channel fix: a line that isn't JSON now ends a `--control` connection, so a web page can't drive the app through a browser request (#589). Highlights: page copies keep navigation, flows, prototype settings and guides; Find and Replace keeps line endings and case-insensitive matches; text hyperlinks survive import and export; recent colours record only what was picked; MCP screenshots respect `maxSize`; Swedish catalog (UI strings), Czech plurals; bounded canvas overscan while panning; Korean fallback at the run's weight; many vector-edit, guide, page and .fig round-trip fixes. Numbers unchanged |
 | 2026-10-14 | minor | M7: the Small caps button in Type settings showed a box where the UI font has no small-capital `ɢ` (builds without Inter use egui's fonts); its sample is now a capital and a smaller capital, drawn from ordinary letters every UI font has. Numbers unchanged |
 | 2026-10-14 | minor | M7: Home screen recent files as cards: each card shows the picture its file carries on its first page's colour, the file's icon, name and "Edited ... ago"; sort by name, creation or last change either way; a table view; a click selects, a double-click or Enter opens, arrow keys move; Open, Show in folder and Remove from recents on right-click. Numbers unchanged. |
diff --git a/docs/server.md b/docs/server.md
index f2e4820c..a4c79ee3 100644
--- a/docs/server.md
+++ b/docs/server.md
@@ -282,7 +282,7 @@ are errors):
 | `data` | `figcraft-data` | The data directory |
 | `public_url` | (the listen address) | How links name the server, when people reach it another way (a reverse proxy: `wss://figcraft.example.com/`) |
 | `max_files` | 1000 | Most files kept |
-| `max_file_mb` | 64 (16 when open) | Largest file (its snapshot), in MiB; a welcome carries the whole file, and messages are at most 64 MiB |
+| `max_file_mb` | 64 (16 when open) | Largest file (its snapshot), in MiB; a welcome carries the whole file, so messages may be as large as a file and 1 MiB (at least 64 MiB on a private server). The app opens files of up to 1023 MiB; above 64 with `open_publish` the server warns |
 | `max_links` | 100 | Most share links per file |
 | `max_connections` | 512 | Most open connections |
 | `max_people` | 256 | Most people in one file at once |
@@ -336,9 +336,10 @@ the address it came from and when it was last opened (for expiry).
   beside it, flushed, then renamed over the old one. The log is only ever appended to, and synced
   before the server tells anyone about the change.
 - **Compaction** writes the file's state as the next snapshot and starts an empty log, after
-  `compact_after` entries or `compact_mb` of log, when the last person leaves, and when the server
-  stops. A log left over from a compaction cut short is recognised and ignored (the snapshot holds
-  it all).
+  `compact_after` entries or `compact_mb` of log, when the last person leaves a file that was
+  edited (the ids of people who only joined stay in the log), and when the server stops. A log left over from a compaction cut short is replayed over the snapshot, which already
+  holds it all, so nothing changes. If a damaged generation field made a current log look like such
+  a leftover, its edits the snapshot lacks are recovered the same way and the damage is reported.
 - **Damage is skipped and reported, never deleted.** At startup a folder whose description, links
   or snapshot can't be read is left out and logged; a log that ends in a cut-short or damaged
   record loses only that end (logged when the file opens). Leftover temporary files are removed.
@@ -489,7 +490,7 @@ are larger.
 
 | Resource | Limit |
 |---|---|
-| Message size | A file's size and 1 MiB (`max_file_mb`, 16 by default when open, or `max_plugin_mb` if larger): checked as the message is read, before anything is decoded; 64 KiB on a connection that only browses plugins (a client sending more is disconnected with the limit as the reason; the app keeps its own copy). The core's 64 MiB otherwise |
+| Message size | A file's size and 1 MiB (`max_file_mb`, 16 by default when open, or `max_plugin_mb` if larger): checked as the message is read, before anything is decoded; 64 KiB on a connection that only browses plugins (a client sending more is disconnected with the limit as the reason; the app keeps its own copy). On a private server, the larger of that and the core's 64 MiB |
 | A file as it grows | Every batch is checked first (*always*): past `max_file_mb`, past its publisher's `max_mb_per_ip` or past `max_total_mb`, it is refused with the reason and the app rolls it back. A long log is compacted to make room at most once a minute per file (a compaction rewrites the whole file). A file's snapshot also holds the recent batches kept for reconnecting clients, at most a quarter of `max_file_mb` |
 | Recent batches in memory | A quarter of `max_file_mb` (256 KiB at least) per open file; older ones are dropped (a client that missed them catches up with the whole file) |
 | Bytes queued for slow clients | The largest message and 1 MiB per connection, 32 MiB per block of addresses, 256 MiB for everyone. A message sent to many people counts once for everyone and once per block (twenty colleagues behind one office address cost their block one copy of a broadcast), and welcomes (bounded by the file's size) don't count against blocks, so a whole office can join a file at once. A client that doesn't read its answers is dropped; when everyone's budget runs out, the connection holding the most is dropped |
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 0587be43..498d26e8 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1,6 +1,6 @@
 # FigCraft parity with Figma
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-14 · **Change:** minor (reviewed Russian catalog and integer plurals; vector edit mode regions: hover hatch, selection and drag; plugin log byte/count limits (#191); core editor leftovers: component playground, auto gap handles, variables inside styles, inner shadows and background blur on groups, command-made text readable on dark pages, a one-step frame/group convert, delays on mouse triggers and manual overlay offsets, wrapped-line alignment; starter templates, a Templates tab and Getting started tips on the home screen: essentials ~57% → ~59%; everyday editing partials: number fields, outline options, Hide when publishing, cursors, panel widths, dark pages, numbers unchanged but menu breadth 211/211; text box sizes measured against documents re-saved by other software: whole-pixel line heights, advances on a 1024-per-em grid, letter spacing between glyphs only, numbers unchanged; .fig export checked by opening written files in other software, numbers unchanged; a public figcraft-server: open hosting, owner tokens, per-address limits, idle expiry, moderation, install.sh; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; headline percentages recomputed from the area table: feature breadth ~84%, core ~94%, mainstream ~50%; text lists, hanging punctuation and decoration styles; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; export and inspect behaviour suite and fixes; .fig import: editable vector networks and more layer kinds; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; styles and variables behaviour suite and fixes; prototyping behaviour suite and fixes; components behaviour suite and fixes; embedded image colour profiles; layers panel keyboard: F2 rename, Shift+F10 context menu, keyboard box selection, 10k-layer QA; per-side stroke weight variables; text behaviour suite: CJK line breaking, metrics, vertical trim; selection and transform behaviour suite and fixes; `.fig` import, best effort; auto layout behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings; feature breadth ~80%; ready ~49%; last major: full re-measure against Figma desktop 126.10.7) · **Target:** Figma Design (desktop app 126.10.7, macOS)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-26 · **Change:** minor (truncated text fills its last line before the ellipsis and keeps truncating when resized; auto-height text with max lines (#1375, #1376, #1377), numbers unchanged; plugin widgets take text input and a property menu (plugin API 4); boards: templates and tables; boards: a shared timer and voting sessions; boards: the dot grid, connector ends dragged to re-attach, curved connectors; `.sketch` import, best effort: import/export breadth 86% → 87%, file formats 60% → 61%, headline numbers unchanged; Canvas & navigation's remaining work no longer lists outline mode's Include hidden layers and Include object bounds; boards: area 22 (weight 0, outside the weighted sum; CJK line breaking: JIS X 4051's line-start and line-end sets completed with the halfwidth small kana, the halfwidth and spacing (semi-)voiced sound marks, iteration marks 〱–〵 and the halfwidth parentheses; Turkish reviewed, Czech and Indonesian drafts, the Japanese draft completed; reviewed Russian catalog and integer plurals; vector edit mode regions: hover hatch, selection and drag; plugin log byte/count limits (#191); core editor leftovers: component playground, auto gap handles, variables inside styles, inner shadows and background blur on groups, command-made text readable on dark pages, a one-step frame/group convert, delays on mouse triggers and manual overlay offsets, wrapped-line alignment; starter templates, a Templates tab and Getting started tips on the home screen: essentials ~57% → ~59%; everyday editing partials: number fields, outline options, Hide when publishing, cursors, panel widths, dark pages, numbers unchanged but menu breadth 211/211; text box sizes measured against documents re-saved by other software: whole-pixel line heights, advances on a 1024-per-em grid, letter spacing between glyphs only, numbers unchanged; .fig export checked by opening written files in other software, numbers unchanged; a public figcraft-server: open hosting, owner tokens, per-address limits, idle expiry, moderation, install.sh; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; headline percentages recomputed from the area table: feature breadth ~84%, core ~94%, mainstream ~50%; text lists, hanging punctuation and decoration styles; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; export and inspect behaviour suite and fixes; .fig import: editable vector networks and more layer kinds; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; styles and variables behaviour suite and fixes; prototyping behaviour suite and fixes; components behaviour suite and fixes; embedded image colour profiles; layers panel keyboard: F2 rename, Shift+F10 context menu, keyboard box selection, 10k-layer QA; per-side stroke weight variables; text behaviour suite: CJK line breaking, metrics, vertical trim; selection and transform behaviour suite and fixes; `.fig` import, best effort; auto layout behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings; feature breadth ~80%; ready ~49%; last major: full re-measure against Figma desktop 126.10.7; rows for the community batches: Selection colors, smart-selection spacing and a Present tab (#753), `.fig` import fidelity, paste from another design app, a `.fig` copy from Save as; control requests while the window is minimised (#720); catalog counts re-measured; automation roots (#715); number variables in the text content picker (#629); frames and sections convert into each other (#719); reviewed Russian catalog and integer plurals; vector edit mode regions: hover hatch, selection and drag; plugin log byte/count limits (#191); core editor leftovers: component playground, auto gap handles, variables inside styles, inner shadows and background blur on groups, command-made text readable on dark pages, a one-step frame/group convert, delays on mouse triggers and manual overlay offsets, wrapped-line alignment; starter templates, a Templates tab and Getting started tips on the home screen: essentials ~57% → ~59%; everyday editing partials: number fields, outline options, Hide when publishing, cursors, panel widths, dark pages, numbers unchanged but menu breadth 211/211; text box sizes measured against documents re-saved by other software: whole-pixel line heights, advances on a 1024-per-em grid, letter spacing between glyphs only, numbers unchanged; .fig export checked by opening written files in other software, numbers unchanged; a public figcraft-server: open hosting, owner tokens, per-address limits, idle expiry, moderation, install.sh; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; headline percentages recomputed from the area table: feature breadth ~84%, core ~94%, mainstream ~50%; text lists, hanging punctuation and decoration styles; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; export and inspect behaviour suite and fixes; .fig import: editable vector networks and more layer kinds; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; styles and variables behaviour suite and fixes; prototyping behaviour suite and fixes; components behaviour suite and fixes; embedded image colour profiles; layers panel keyboard: F2 rename, Shift+F10 context menu, keyboard box selection, 10k-layer QA; per-side stroke weight variables; text behaviour suite: CJK line breaking, metrics, vertical trim; selection and transform behaviour suite and fixes; `.fig` import, best effort; auto layout behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings; feature breadth ~80%; ready ~49%; last major: full re-measure against Figma desktop 126.10.7; Canvas & navigation's remaining work no longer lists outline mode's Include hidden layers and Include object bounds; boards: area 22 (weight 0, outside the weighted sum; Turkish reviewed, Czech and Indonesian drafts, the Japanese draft completed; reviewed Russian catalog and integer plurals; vector edit mode regions: hover hatch, selection and drag; plugin log byte/count limits (#191); core editor leftovers: component playground, auto gap handles, variables inside styles, inner shadows and background blur on groups, command-made text readable on dark pages, a one-step frame/group convert, delays on mouse triggers and manual overlay offsets, wrapped-line alignment; starter templates, a Templates tab and Getting started tips on the home screen: essentials ~57% → ~59%; everyday editing partials: number fields, outline options, Hide when publishing, cursors, panel widths, dark pages, numbers unchanged but menu breadth 211/211; text box sizes measured against documents re-saved by other software: whole-pixel line heights, advances on a 1024-per-em grid, letter spacing between glyphs only, numbers unchanged; .fig export checked by opening written files in other software, numbers unchanged; a public figcraft-server: open hosting, owner tokens, per-address limits, idle expiry, moderation, install.sh; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; headline percentages recomputed from the area table: feature breadth ~84%, core ~94%, mainstream ~50%; text lists, hanging punctuation and decoration styles; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; export and inspect behaviour suite and fixes; .fig import: editable vector networks and more layer kinds; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; styles and variables behaviour suite and fixes; prototyping behaviour suite and fixes; components behaviour suite and fixes; embedded image colour profiles; layers panel keyboard: F2 rename, Shift+F10 context menu, keyboard box selection, 10k-layer QA; per-side stroke weight variables; text behaviour suite: CJK line breaking, metrics, vertical trim; selection and transform behaviour suite and fixes; `.fig` import, best effort; auto layout behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings; feature breadth ~80%; ready ~49%; last major: full re-measure against Figma desktop 126.10.7; rows for the community batches: Selection colors, smart-selection spacing and a Present tab (#753), `.fig` import fidelity, paste from another design app, a `.fig` copy from Save as; control requests while the window is minimised (#720); catalog counts re-measured; automation roots (#715); number variables in the text content picker (#629); frames and sections convert into each other (#719); reviewed Russian catalog and integer plurals; vector edit mode regions: hover hatch, selection and drag; plugin log byte/count limits (#191); core editor leftovers: component playground, auto gap handles, variables inside styles, inner shadows and background blur on groups, command-made text readable on dark pages, a one-step frame/group convert, delays on mouse triggers and manual overlay offsets, wrapped-line alignment; starter templates, a Templates tab and Getting started tips on the home screen: essentials ~57% → ~59%; everyday editing partials: number fields, outline options, Hide when publishing, cursors, panel widths, dark pages, numbers unchanged but menu breadth 211/211; text box sizes measured against documents re-saved by other software: whole-pixel line heights, advances on a 1024-per-em grid, letter spacing between glyphs only, numbers unchanged; .fig export checked by opening written files in other software, numbers unchanged; a public figcraft-server: open hosting, owner tokens, per-address limits, idle expiry, moderation, install.sh; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; headline percentages recomputed from the area table: feature breadth ~84%, core ~94%, mainstream ~50%; text lists, hanging punctuation and decoration styles; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; export and inspect behaviour suite and fixes; .fig import: editable vector networks and more layer kinds; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; styles and variables behaviour suite and fixes; prototyping behaviour suite and fixes; components behaviour suite and fixes; embedded image colour profiles; layers panel keyboard: F2 rename, Shift+F10 context menu, keyboard box selection, 10k-layer QA; per-side stroke weight variables; text behaviour suite: CJK line breaking, metrics, vertical trim; selection and transform behaviour suite and fixes; `.fig` import, best effort; auto layout behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings; feature breadth ~80%; ready ~49%; last major: full re-measure against Figma desktop 126.10.7) · **Target:** Figma Design (desktop app 126.10.7, macOS)
 
 The authoritative assessment of how close FigCraft is to Figma Design. [`ROADMAP.md`](../ROADMAP.md)
 summarizes it; [`gaps.md`](gaps.md) is the ranked work list; the measured menu checklist is
@@ -9,19 +9,19 @@ summarizes it; [`gaps.md`](gaps.md) is the ranked work list; the measured menu c
 [`hardware-parity.md`](hardware-parity.md), [`localization-parity.md`](localization-parity.md),
 [`auto-layout-parity.md`](auto-layout-parity.md), [`components-parity.md`](components-parity.md),
 [`prototyping-parity.md`](prototyping-parity.md), [`dev-mode-parity.md`](dev-mode-parity.md),
-[`collaboration-parity.md`](collaboration-parity.md).
+[`collaboration-parity.md`](collaboration-parity.md), [`boards-parity.md`](boards-parity.md).
 
 ## Headline
 
 | Number | Value | Kind |
 |---|---|---|
-| Menu/command breadth | **100%** (211 / 211 catalogued menu items have a live command) | **measured** (`cargo xtask parity`, 2026-10-12) |
+| Menu/command breadth | **100%** (212 / 212 catalogued menu items have a live command) | **measured** (`cargo xtask parity`, 2026-10-17) |
 | Feature breadth (does each Figma Design feature exist, weighted) | **~85%** (core editor areas 1–16: ~94%) | estimated from the area table below |
 | Ready for real work | **~53%** | estimated (dimension table below: written weights × written per-dimension scores) |
 | Essentials user | **~59%** | estimated ([below](#essentials-user): core features 77.8% × discounts 0.92 × 0.94 × 0.88) |
 | Mainstream practitioner | **~50%** | estimated ([below](#mainstream-practitioner): weekly areas 72.7% × discounts 0.9 × 0.9 × 0.85) |
 | Remaining to beta | **~155–280 h** one Opus 5.5 agent (~32–64 h wall-clock with 5 parallel agents) | estimated |
-| Remaining to full parity | **~262–519 h** one agent (~83–145 h wall-clock with 5 parallel agents) | estimated |
+| Remaining to full parity | **~260–515 h** one agent (~83–145 h wall-clock with 5 parallel agents) | estimated |
 | Stage | **alpha**: the alpha gate passes ([roadmap](roadmap.md#alpha-gate)); multiplayer and checking the best-effort `.fig` import on real files are beta gaps (see [ROADMAP](../ROADMAP.md#stage)) | |
 
 The previous figures (ROADMAP of 2026-10-10, "feature depth ~79%", "full parity 115–195 h") were
@@ -35,7 +35,7 @@ tool; presence was being graded as behaviour in places.
 
 | Audience | Ready % | Opus 5.5 agent wall-clock hours to ~95% | Work that dominates |
 |---|---|---|---|
-| Full target (ready for real work) | ~53% | ~268–522 h | multiplayer (42–84), localization (29–51), plugins (8–26), the interaction pass (40–60), GPU canvas (30–60), AI (30–60), the `.fig` import's tail (5–10) |
+| Full target (ready for real work) | ~53% | ~266–518 h | multiplayer (42–84), localization (29–51), plugins (6–22), the interaction pass (40–60), GPU canvas (30–60), AI (30–60), the `.fig` import's tail (5–10) |
 | Mainstream practitioner | ~50% | ~120–229 h | core editor depth incl. the `.fig` import's tail (49–98), the interaction pass (40–60), real-file corpus and platform QA (25–50), checking the experimental `.fig` export opens elsewhere (5–15) |
 | Essentials user | ~59% | ~55–100 h | the `.fig` import's tail so the files people send open well (5–10), core tool polish (25–45), interaction pass on the core tools (15–25), stability QA (10–20) |
 
@@ -84,8 +84,10 @@ Weights are the share of a typical product designer's working time in Figma Desi
 so they can be argued with. Areas 1–16 keep the original rubric's weights (they sum to 94, not the 100 the rubric claimed);
 areas 17–21 are added (sum 19) because Figma users depend on them. Percentages below divide by the
 total, 113.
-Out of scope as separate products: FigJam, Figma Slides, Sites, Make, Buzz, Weave (the `.jam` and
-`.deck` document kinds belong to them).
+Out of scope as separate products: Figma Slides, Sites, Make, Buzz, Weave (the `.deck` document
+kind belongs to them). Whiteboarding is covered by FigCraft's boards (area 22, weight 0: a separate
+workflow, tracked here but not in the weighted sum; [`boards-parity.md`](boards-parity.md)); the
+`.jam` document kind is not read or written.
 
 ## By feature area
 
@@ -94,27 +96,28 @@ Breadth: does it exist. Ready: depth, correctness and fidelity for real projects
 
 | # | Area | Weight | Breadth | Ready | Remaining | Hours |
 |---|---|---|---|---|---|---|
-| 1 | Canvas & navigation | 6 | 98% | 74% | Outline mode's Include hidden layers and Include object bounds, Display P3 on screen, QA at extreme zooms (behaviour suite for navigation, rulers, guides, layout grids and outline mode landed: guide selection, Auto grid counts, outline-mode clicks) | 1–4 |
+| 1 | Canvas & navigation | 6 | 98% | 74% | Display P3 on screen, QA at extreme zooms (behaviour suite for navigation, rulers, guides, layout grids and outline mode landed: guide selection, Auto grid counts, outline-mode clicks; outline mode's Include hidden layers and Include object bounds landed) | 1–4 |
 | 2 | Selection & transform | 8 | 97% | 72% | Handles, measuring and snapping checked tool by tool against Figma and real files (snap distance, handle reach, cursors); children turned off a right angle scale without skew, approximately (behaviour suite from the documentation, rotated groups and mixed selections, equal spacing snapping, Cmd/Ctrl to ignore constraints and marquees inside frames landed) | 3–5 |
 | 3 | Layers panel | 5 | 99% | 85% | QA with long real files (behaviour suite from the documentation, Rename layers dialog, sweeping eyes and padlocks, page dragging and dividers, several layers dropped together, keyboard box selection, F2 rename, Shift+F10 context menu and 10k-layer timings landed) | 1–2 |
-| 4 | Shapes & vector | 8 | 99% | 73% | Corner smoothing on polygons, stars and vectors; the transform box around points of several layers; per-point caps and joins on dashed, variable-width and brush strokes; vector QA with real files (behaviour suites from the documentation, corner radius and star ratio handles, rounded vector points drawn, also beside curved segments, a cap and join per point, several handles dragged together, cut and paint bucket drags, delete and heal along the curve, a boolean group's look by operation and the miter angle landed) | 1–3 |
+| 4 | Shapes & vector | 8 | 99% | 73% | Corner smoothing on vectors, corner radius and smoothing on boolean groups that contain rectangles; per-point caps and joins on dashed, variable-width and brush strokes; vector QA with real files (behaviour suites from the documentation, corner radius and star ratio handles, corner smoothing on polygons and stars, rounded vector points drawn, also beside curved segments, a cap and join per point, several handles dragged together, cut and paint bucket drags, delete and heal along the curve, a boolean group's look by operation and the miter angle landed) | 1–3 |
 | 5 | Paint | 7 | 90% | 71% | Video fills, wide-gamut canvas, HEIC images; plus darker in PDF (behaviour suite from the documentation, pass-through and isolating groups, clipping frames that don't isolate, plus darker, animated GIF fills, TIFF images and embedded image colour profiles landed) | 2–5 |
 | 6 | Strokes | 3 | 95% | 75% | Stroke QA with real files (colour styles on strokes, stroke weight and per-side weight variables, brush strokes landed, see 20) | 1–2 |
 | 7 | Effects | 4 | 100% | 75% | Glass and progressive blur tuned side by side (behaviour suite from the documentation, inner shadows and background blur on groups, shadows hidden behind translucent layers on the canvas and in every export landed) | 2–5 |
 | 8 | Frames, groups, sections, masks | 5 | 97% | 80% | Visual QA with real files (a one-step frame/group convert, and a behaviour suite from the documentation landed: masked-out areas don't take clicks, mask group bounds and exports follow the mask, sections kept out of frames and groups, frames and sections drawn around layers take them, section resizing leaves contents in place, X/Y measured in the frame) | 1–3 |
 | 9 | Auto layout & constraints | 9 | 98% | 74% | Behaviour against real Figma files (behaviour suite from the documentation, `fr` tracks like CSS, vertical wrap, auto gaps evenly/around, cell alignment and wrapped-line alignment landed) ([auto-layout-parity](auto-layout-parity.md)) | 3–6 |
 | 10 | Text | 8 | 90% | 70% | Spell check, text metrics on real files and in other fonts (text box sizes measured against documents re-saved by other software: all 230 self-sizing boxes in 7 documents come out to the pixel, one font family; behaviour suite with CJK line breaking, vertical trim and carets by grapheme cluster landed; lists per paragraph with nesting and list spacing, hanging punctuation and lists, decoration style, thickness, offset, skip ink and colour landed) | 3–7 |
-| 11 | Components & variants | 9 | 96% | 72% | Real (not synthetic) libraries, `.fig` libraries (a component playground for variant, boolean and text properties, a behaviour suite from the documentation, overrides of padding, gap, grids, exports and interactions, refused geometry overrides, variant-switch and Assets-swap override rules, top-left default variant landed) ([components-parity](components-parity.md)) | 4–9 |
+| 11 | Components & variants | 9 | 96% | 72% | Real (not synthetic) libraries, `.fig` libraries (a component playground for variant, boolean, text and instance-swap properties, a behaviour suite from the documentation, overrides of padding, gap, grids, exports and interactions, refused geometry overrides, variant-switch and Assets-swap override rules, top-left default variant landed) ([components-parity](components-parity.md)) | 4–9 |
 | 12 | Styles & variables | 5 | 95% | 76% | Real-library QA (variables inside styles, behaviour suite from the documentation, style folders and order, mode order, code syntax, extended collections with their tail (new library variables as updates, chains through libraries) and variables import/export landed) ([components-parity](components-parity.md)) | 2–4 |
 | 13 | Prototyping | 6 | 92% | 74% | Video triggers and media actions, controllers on macOS, Linux and FreeBSD, real prototype QA (behaviour suite from the documentation, delays on mouse triggers, manual overlay offsets, key combinations, controller buttons on key/gamepad triggers (Windows and the browser), widgets reacting in prototypes, interactive components playing their variants, drag-driven animations, physical springs landed) ([prototyping-parity](prototyping-parity.md)) | 2–5 |
-| 14 | Import/export | 6 | 86% | 58% | `.fig` import's tail (best-effort import, editable vector networks, stand-ins for non-design layers and variable prototype actions landed; no real-file checks yet), checking the rest of the experimental `.fig` export (landed; written files open and draw in other software) on effects, images, prototypes and real files, HEIC/video import, CMYK output intent ([file-format-parity](file-format-parity.md)) | 5–10 |
-| 15 | Dev Mode / inspect | 2 | 96% | 72% | Import lines for connected instances inside generated layer trees; an editor extension is left to the MCP server (inspect behaviour suite with colour formats, rem and icon and image assets, code connect, plugins in Dev Mode and dev resources links landed) ([dev-mode-parity](dev-mode-parity.md)) | 0–1 |
+| 14 | Import/export | 6 | 87% | 58% | `.fig` import's tail (best-effort import, editable vector networks, stand-ins for non-design layers and variable prototype actions landed, then (2026-10-17) grid tracks, slots, labels of connectors saved with their path, per-point joins, text on a path, image adjustments, budgets for large files, an import report and paste from another design app; all on synthetic files, no real-file checks yet), checking the rest of the experimental `.fig` export (landed; written files open and draw in other software) on effects, images, prototypes and real files, HEIC/video import, CMYK output intent ([file-format-parity](file-format-parity.md)) | 5–10 |
+| 15 | Dev Mode / inspect | 2 | 98% | 78% | Publishing mappings from the code repository; an editor extension is left to the MCP server (inspect behaviour suite with colour formats, rem and icon and image assets, code connect, plugins in Dev Mode, dev resources links, import lines, compare with versions, an inspect-only canvas and layers panel and measurements kept on the canvas landed) ([dev-mode-parity](dev-mode-parity.md)) | 1–2 |
 | 16 | Comments, versions, find, misc | 3 | 87% | 63% | Comments are local only; comparing two versions; branches in live sessions; text runs and other lists besides fills, strokes and effects merge whole (branches with review and merge, their own version history and per-item list merges, and a comments and version history behaviour suite from the documentation landed) | 1–3 |
 | 17 | Multiplayer & sharing | 8 | 17% | 5% | Core landed (`crates/collab`: ids, change sets, server ordering, convergence tested); live sessions (preview): WebSocket transport, hosting from the desktop app, joining from the app or the browser, invite links that open the app, cursors, selections and follow, cursor chat and spotlight, per-person undo, offline resume; a self-hosted `figcraft-server` with persistence and share links to edit or view, which can be open to the public (owner tokens, limits per address, expiry, moderation). Left: accounts and teams, audio ([collaboration-parity](collaboration-parity.md)) | 42–84 |
-| 18 | Plugins & widgets | 4 | 60% | 35% | Own sandboxed WASM plugins landed (#101: manifest, permissions, menu, Run last, Manage, SDK), with log byte/count limits checked before allocation and host forwarding ([logging limits](plugins.md#logging-limits)), plugin panels called back per button or changed value and per-plugin settings (ABI v2), then widgets (API 3: plugin-drawn layers on the canvas with state kept in the document, redrawn on clicks; a Counter example), panels side by side and a colour picker for plugin colour fields, then a plugin directory on `figcraft-server` (publish with the server key, browse, install after a permissions confirmation, hash-checked downloads, updates by version). Left: a public catalogue, publisher accounts and signatures, ratings, background update checks, the directory in the browser; widgets take clicks only (no text input, property menus, hover or timers) and draw frames, text, shapes and images only; Figma's plugins are JavaScript and don't run (a JS engine would be an owner decision) ([plugins.md](plugins.md)) | 8–26 |
+| 18 | Plugins & widgets | 4 | 65% | 38% | Own sandboxed WASM plugins landed (#101: manifest, permissions, menu, Run last, Manage, SDK), with log byte/count limits checked before allocation and host forwarding ([logging limits](plugins.md#logging-limits)), plugin panels called back per button or changed value and per-plugin settings (ABI v2), then widgets (API 3: plugin-drawn layers on the canvas with state kept in the document, redrawn on clicks; a Counter example), panels side by side and a colour picker for plugin colour fields, then a plugin directory on `figcraft-server` (publish with the server key, browse, install after a permissions confirmation, hash-checked downloads, updates by version); layer data written with `node.set {props: {pluginData}}` reads back through `node.get` (#879), then widget fields and property menus (API 4: a text layer edited on the canvas like any text or with `widget.setText`, its value kept in the widget's state; actions, toggles and colour choices in a bar over the selected widget, `widget.menu`). Left: a public catalogue, publisher accounts and signatures, ratings, background update checks, the directory in the browser; widgets have no hover or timers and draw frames, text, shapes and images only; Figma's plugins are JavaScript and don't run (a JS engine would be an owner decision) ([plugins.md](plugins.md)) | 8–26 |
 | 19 | Team libraries & organization | 2 | 70% | 40% | Libraries kept on `figcraft-server` under their file and enabled by a share link (per-asset versions, background update checks, overrides kept), usage counts per component and file, swapping a library by names. Left: team-wide library lists, accounts and permissions, analytics over time, pushed update notices | 4–8 |
 | 20 | Figma Draw extras | 2 | 88% | 60% | Have: variable width, lasso, shape builder, noise/texture, text on a path, pattern fills, stretch and scatter brushes, pen pressure (Windows pens, browser styluses), multi-edit (several vector layers in edit mode at once). Missing: pressure from macOS/Linux tablets | 1–3 |
 | 21 | AI features | 3 | 0% | 0% | First draft, rename layers, image edit/remove background, visual search, Make: needs local models (owner decision) | 30–60 |
+| 22 | Boards (whiteboarding) | 0 | ~47% | ~29% | Board files with a dot grid, sticky notes, shapes with text, connectors that follow what they join (straight, elbow around the objects, or curved; ends dragged to re-attach), marker, highlighter and eraser, stamps, text and sections, five built-in templates and tables, a shared timer and voting sessions, in live sessions (M12); missing: timer music, board widgets, mind maps, washi tape, audio, quick-create handles, connector waypoints, stamps sticking to objects, `.jam` files ([boards-parity](boards-parity.md)). Not in the weighted sum | 20–44 |
 | | **Weighted (÷113)** | 113 | **~85%** | **~63%** | | **117–255** |
 | | Core editor only (1–16, ÷94) | 94 | ~94% | ~72% | | 32–74 |
 
@@ -124,16 +127,16 @@ Breadth: does it exist. Ready: depth, correctness and fidelity for real projects
 |---|---|---|---|---|---|
 | Features (depth) | 35 | 63% | 28–67 (areas 1–13, 15, 16, 20) | The table above; core editor ~72% | this file |
 | UI/UX fidelity | 15 | 58% | 40–60 | Look & feel compared side by side with UI3 (~65% by the builders); tool-by-tool interaction (modifiers while dragging, hover states, popovers) not yet compared (a cursor for every tool and modifier, number fields and panel widths built from the documentation, not compared); accessibility names and keyboard navigation landed | [ui-parity](ui-parity.md) |
-| File formats | 12 | 60% | 5–10 | `.fig` read, best effort, with editable vector networks (tested on generated fixtures, not real files), `.fig` write experimental (round trips through our own importer; written files open and draw in other software); REST JSON import, SVG in/out, PNG/JPG/WebP/PDF export solid, with a behaviour suite from the documentation | [file-format-parity](file-format-parity.md) |
+| File formats | 12 | 61% | 5–10 | `.sketch` read (Sketch 48 and newer, best effort; 2026-10-21): live symbols, shared styles, Sketch 2025 frames and stacks, checked on three real files against Sketch's own renders (0.8–2% of pixels differ on average); `.fig` read, best effort, with editable vector networks and (2026-10-17) more fidelity, budgets for large files and an import report (tested on generated fixtures, not real files); layers copied from another design app paste the same way (tested only with clipboard HTML made from our own export), `.fig` write experimental (round trips through our own importer; written files open and draw in other software); REST JSON import, SVG in/out, PNG/JPG/WebP/PDF export solid, with a behaviour suite from the documentation | [file-format-parity](file-format-parity.md) |
 | Collaboration | 10 | 13% | 52–104 | Local comments, version history and branches with review and merge; the multiplayer core (sync model, server ordering, client reconciliation, convergence tests) landed in #103, and live sessions (preview) co-edit a file hosted by a desktop app or kept on a self-hosted `figcraft-server` with edit and view links, joined from the app or the browser, with cursor chat and spotlight (`docs/collab-protocol.md`) | [collaboration-parity](collaboration-parity.md) |
 | Stability | 8 | 55% | 20–40 | Never-crash lints, command guard with rollback, recovery copies, 963 tests incl. junk-parameter sweeps and a seeded retained-render walk; but two days old, one release (v0.2.0), no field reports, QA mostly on macOS | [gaps](gaps.md) |
 | Performance | 6 | 60% | 30–60 | `cargo xtask bench`: 50k-layer page ~8 ms zoomed out, 10k-layer edits ~0.2 ms, 2,000-instance design system edits 4–64 ms; CPU (tiny-skia) canvas where Figma renders on the GPU; nothing timed against Figma on the same file | [hardware-parity](hardware-parity.md) |
 | Hardware | 3 | 60% | 10–21 | Trackpad pinch and HiDPI yes; pen pressure on Windows and from browser styluses (none from macOS/Linux tablets); several windows (screen-reader tree in the main one only); no GPU canvas, no P3 on screen | [hardware-parity](hardware-parity.md) |
-| Localization | 3 | 39% | 29–51 | The layer, English, Russian reviewed by VanTan, and machine drafts of Spanish (with a Latin American overlay), French, German, Brazilian Portuguese, Japanese, Korean and Simplified Chinese (none reviewed by a native speaker; every draft covers all current strings), CJK UI text in installed faces loaded on demand (web: only the craft-fonts CJK build); engine messages stay English | [localization-parity](localization-parity.md) |
+| Localization | 3 | 39% | 29–51 | The layer, English, Russian reviewed by VanTan, and machine drafts of Spanish (with a Latin American overlay), French, German, Brazilian Portuguese, Japanese, Korean, Simplified Chinese, Indonesian and Czech (none reviewed by a native speaker; measured 2026-10-17, the drafts cover 95–99% of the 2,272 current strings), Swedish and Turkish catalogs, CJK UI text in installed faces loaded on demand (web: only the craft-fonts CJK build); engine messages stay English | [localization-parity](localization-parity.md) |
 | Platforms | 3 | 75% | 10–20 | macOS, Windows (x64/x86/arm64), Linux, FreeBSD, web all packaged (v0.2.0); Figma also has iOS/Android apps; non-macOS QA thin | [hardware-parity](hardware-parity.md) |
-| Ecosystem/plugins | 3 | 38% | 8–26 | Own WASM plugins with a Rust SDK and three examples (#101), plugin panels and settings (ABI v2), widgets that take clicks (API 3), a self-hosted plugin directory on `figcraft-server`; no Figma plugin compatibility, no public catalogue or community files; the CLI, control channel and MCP server are ahead of Figma for agents | [gaps](gaps.md) |
+| Ecosystem/plugins | 3 | 40% | 6–22 | Own WASM plugins with a Rust SDK and three examples (#101), plugin panels and settings (ABI v2), widgets that take clicks (API 3), text input and a property menu (API 4), a self-hosted plugin directory on `figcraft-server`; no Figma plugin compatibility, no public catalogue or community files; the CLI, control channel and MCP server are ahead of Figma for agents | [gaps](gaps.md) |
 | AI features | 2 | 0% | 30–60 | None | [gaps](gaps.md) |
-| **Ready for real work** | 100 | **~53%** | **~262–519** | | |
+| **Ready for real work** | 100 | **~53%** | **~260–515** | | |
 
 Dimension hours add up to the full-parity total without double counting: the feature-area rows
 for import/export (14), multiplayer and team libraries (17, 19), plugins (18) and AI (21) are
@@ -282,15 +285,18 @@ Hours in this narrative are the builders' estimates; the tables above supersede
    unlinks the chars edited). Live previews of a hovered named instance or font style and of a
    dragged axis slider (one undo step on release, Escape cancels). Visual QA: list markers keep the
    paragraph's font, renames start with the name selected and centred, Max lines shows while
-   truncating. Right-to-left paragraphs mirror lists and indents: bullets and numbers (".1") on
+   truncating. Truncation fills the last line shown before the ellipsis ("Lorem consec…", not
+   "Lorem…"), a truncated text resized keeps truncating, and auto-height text with Max lines hugs
+   up to that many lines. Right-to-left paragraphs mirror lists and indents: bullets and numbers (".1") on
    the right, wrapped lines hanging from the right, the paragraph indent on the right, trailing
    spaces hanging outside the line (canvas, PNG, PDF and SVG). A behaviour suite from the public
    documentation (`crates/text/src/behaviour_tests.rs`, `crates/engine/src/text_behaviour_tests.rs`):
    Auto / % / px line heights with the leading split above and below every line, letter spacing in
    % and px, paragraph spacing and indent (start-aligned text only), resizing and truncation,
    decorations from the font's metrics; CJK line breaking (between ideographs, kana and Hangul, no
-   break inside Latin words, kinsoku for closing and opening punctuation, small kana and the
-   prolonged sound mark); a style's metrics from its own font, not a fallback; carets, Delete and
+   break inside Latin words, kinsoku to JIS X 4051 for closing and opening punctuation, small kana
+   (halfwidth too), the prolonged sound mark, the iteration marks, the (semi-)voiced sound marks
+   and the halfwidth parentheses); a style's metrics from its own font, not a fallback; carets, Delete and
    Backspace by grapheme cluster; double-click and word moves by script run; IME composition with
    CJK; vertical trim (cap height to baseline). The tail suite (`crates/text/src/tail_tests.rs`,
    `crates/engine/src/text_tail_tests.rs`): lists per paragraph, nested up to 8 levels with Tab and
@@ -420,10 +426,14 @@ Hours in this narrative are the builders' estimates; the tables above supersede
    presenter) and variables (the local variables JSON passed along, next to the file or embedded:
    collections, modes, aliases, scopes, layer bindings and explicit modes).
    Export panel: a row per export setting (typed or preset sizes like `2x` / `512w` / `512h`, PNG,
-   JPG, WebP, SVG and PDF, suffix, advanced options: contents only, include bounding box, and for
+   JPG, WebP, SVG and PDF, suffix, advanced options: ignore overlapping layers, include bounding box for text layers, and for
    SVG outline text, id attributes and simplified strokes), a preview, and "Export N layers" (`file.exportLayers`) in the
    panel and the Export dialog. Paste from other apps: images, SVG and text (the newest clipboard
-   content wins over our own copy; pasted SVG lands centred in the view). SVG import is editable and
+   content wins over our own copy; pasted SVG lands centred in the view), and layers copied from
+   another design app (`edit.pasteDesignLayers`: the `.fig` canvas in the clipboard's HTML read
+   like a `.fig` file, best effort; tested with clipboard HTML made from our own export only).
+   File ▸ Save as… to a `.fig` name writes an experimental export copy and the document keeps its
+   `.figcraft` path. SVG import is editable and
    checked against a corpus of synthetic files (expected pixels worked out by hand, layer structure,
    export and re-import): groups named from their ids with transforms baked into the layers;
    rectangles (corner radius), ellipses and lines kept as those shapes; gradients with exact
@@ -509,11 +519,12 @@ Hours in this narrative are the builders' estimates; the tables above supersede
    a plugin describes a layer of its own, validated and built as a frame with locked layers; clicks
    on its named parts call the plugin back in a fresh sandbox with the state kept in the layer, one
    undo step each; `widget.insert` / `widget.click` / `widget.list`; a Counter example), panels of
-   several plugins side by side and the colour picker on plugin colour fields. Then a plugin
+   several plugins side by side and the colour picker on plugin colour fields; then widget fields
+   and property menus (API 4: `widget.setText`, `widget.menu`). Then a plugin
    directory on `figcraft-server`: bundles published with the server key and checked in full,
    browsed and installed from Plugins ▸ Manage plugins after a permissions confirmation, downloads
    checked against their SHA-256, updates by version. *Left:* a public catalogue, publisher
-   accounts and signatures; richer widget events; the directory in the browser. 8–26 h.
+   accounts and signatures; widget hover and timers; the directory in the browser. 6–22 h.
 9. **Hardening and performance**: *landed:* `cargo xtask bench` (synthetic 1k/10k/50k-layer
    pages: engine, render and headless UI-frame timings). The canvas keeps its last image and
    re-renders only what a pan uncovers or an edit touches: moving one layer at 10k layers re-renders
@@ -612,7 +623,7 @@ Carried over from the ROADMAP's "Shipped so far" (2026-10-10). The test count th
   toolbar with flyouts and mode switcher, Design / Prototype / Inspect panels (Dev Mode: properties with their styles and variables, annotations
   with pinned properties and categories drawn as coloured callouts on the canvas (filtered by category),
   a ready-for-dev list, a focus view on one frame with previous / next, Compare changes since a frame
-  was marked ready (before / after side by side or overlaid, property-level diffs), CSS/HTML/React/Leptos/SwiftUI/Compose/Flutter
+  was marked ready (before / after side by side or overlaid, property-level diffs), CSS/HTML/React/Vue/Leptos/SwiftUI/Compose/ArkUI/Flutter
   code where components take their properties as parameters and instances are calls, components
   connected to their code components showing the real snippet, read-only plugins), colour picker
   (HSB square, hue/alpha, hex, gradient stops, image fills), main menu generated from the catalog,
@@ -621,13 +632,32 @@ Carried over from the ROADMAP's "Shipped so far" (2026-10-10). The test count th
   focus ring) and screen-reader names for the custom controls (AccessKit), presentation player with
   transitions, light and dark themes, home screen, About/Preferences/shortcuts/variables dialogs.
 - **Automation:** desktop control channel (`--control <port>`: execute commands, inspect document/UI,
-  synthetic pointer/keys/typing, menu invocation, screenshots, renders).
+  synthetic pointer/keys/typing, menu invocation, screenshots, renders). What agents read and write
+  on disk can be confined to chosen folders (`--automation-read-root` / `--automation-write-root` on
+  `figcraft-cli mcp` and the desktop app, #715). A minimised or covered window answers every
+  request that acts on the app's state without drawing (about 100 ms each on Windows), and the
+  ones that need a drawn frame (`ui.screenshot`, `ui.input`, `window.new`) fail at once instead of
+  waiting 60 s (#720; not tested on macOS, and under Wayland a minimised window can't be told
+  apart).
 - **Tests:** 963 `#[test]` functions (2026-10-10) including junk-parameter sweeps over every command (and every vector-edit command while editing), importer fuzzing and render regressions.
 
 ## Revision history
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-24 | patch | Canvas & navigation's remaining work no longer lists outline mode's Include hidden layers and Include object bounds, which landed (`view.outlinesHiddenLayers`, `view.outlinesObjectBounds`, `crates/engine/src/outline_options_tests.rs`). Numbers unchanged |
+| 2026-10-24 | minor | Boards (area 22, weight 0): a shared timer and voting sessions (M12); ~35%/~20% → ~40%/~24%, 30–60 h → 26–54 h; weighted numbers unchanged |
+| 2026-10-24 | minor | Boards (M12): templates (five built in, `board.template`) and tables (`board.table`, `board.tableEdit`); area 22 ~35%/~20% → ~40%/~24%, 30–60 h → 26–54 h (outside the weighted sum) |
+| 2026-10-24 | minor | Plugin widgets take text input and a property menu (gap 6, plugin API 4; API 1–3 plugins and existing widgets unchanged): a widget's text layer can be an editable field, edited on the canvas with a double-click like any text (or `widget.setText`), its value cleaned and capped at 1,000 characters, written into the widget's state under the field's name and the field's text, and the plugin called back to redraw, all as one undo step that syncs in live sessions; a widget can carry a property menu of up to 8 actions, toggles and colour choices (up to 8 colours each), shown in a small bar over the widget while it is selected and driven with `widget.menu`; descriptions, values and menus read back from files are checked, an API 3 plugin that draws a field or a menu is refused, and older FigCraft builds refuse API 4 manifests. The Counter example gained a label field and a menu (reset, steps of ten, a colour); the SDK reads the new events. Hover and timers are still missing. Plugins & widgets 60%/35% → 65%/38%, 8–26 h → 6–22 h; Ecosystem dimension 38% → 40%; weighted totals unchanged at this rounding; full parity ~262–519 h → ~260–515 h |
+| 2026-10-24 | minor | Boards (M12): a file kind of its own (`file.newBoard`, saved in `.figcraft`, carried to live-session joiners) with sticky notes, shapes with text, connectors that re-route when what they join moves (an engine recompute, the same for local edits, undo and others' edits), marker, highlighter and eraser, stamps with the placer's name, a board toolbar and a contextual bar; prototyping and Dev Mode refuse on boards; design files and boards have their own marks on tabs and file rows. Area 22 added at weight 0 (breadth ~35%, ready ~20%); headline numbers unchanged (the weighted sum leaves area 22 out) |
+| 2026-10-15 | minor | Localization (#263, #469, #477, #288): Turkish reviewed by a native speaker, Czech and Indonesian drafts, the Japanese draft caught up; coverage re-measured (2,177 entries; the five older drafts at 95%). Localization 39% and 29–51 h unchanged at this rounding (see [localization-parity](localization-parity.md)) |
+| 2026-10-22 | minor | Vector edit mode: the transform box around points selected in several layers (in the page's axes; scale, rotate and drag in one undo step). Shapes & vector's remaining work loses that item; numbers unchanged |
+| 2026-10-20 | minor | Layer data reads back (#879): `node.get` (the command, the control method and MCP `get_node`) and `document.inspect` report a layer's or page's `pluginData` as `{key: value}` when it has any, so a tool that keeps state in a file with `node.set {props: {pluginData}}` can read it on its next run (`plugin_data_tests`). Numbers unchanged |
+| 2026-10-21 | minor | `.sketch` import (best effort, Sketch 48 and newer), a feature Figma has (its file browser imports Sketch files, desktop app included, per the help center) that the area table hadn't listed: pages, layers, styles, live symbols with overrides, shared styles and Color Variables, prototype links, Sketch 2025 frames, stacks as auto layout and tints, text placed as Sketch places it; checked on three real files (Sketch 50, 64 and 2026) against Sketch's own renders. Import/export breadth 86% → 87% (ready stays 58%: best effort, three files), file formats 60% → 61%; feature breadth (~85%), ready for real work (~53%) and the audience numbers unchanged after rounding |
+| 2026-10-17 | minor | Menu breadth re-run with `cargo xtask parity`: 212 / 212 (100%; the catalog gained View ▸ Full screen with #227 on 2026-10-14), 561 commands. Rows for the 2026-10-17 landings: import/export (area 14) and the file formats dimension name the `.fig` import's new fidelity (instance identity, overrides by key, text style precedence, grid tracks, slots, connector labels, per-point joins, text on a path, image adjustments, list start numbers, vertical trim), budgets from the file's size, the import report, a `.fig` copy from Save as and paste from another design app; the localization evidence takes the re-measured catalog counts (2,272 entries, drafts at 95–99%, Indonesian and Czech drafts, Swedish and Turkish catalogs); the Automation line adds control requests answered while the window is minimised (#720); batch #753's Selection colors, smart-selection spacing, Present tab and auto layout on empty frames are in ui-parity, prototyping-parity and auto-layout-parity. Numbers unchanged: every `.fig` and paste change is checked on synthetic files or clipboard HTML made from our own export, and real files are what gap 1's blocker and the file-exchange discounts wait for; the UI changes (menus, the Actions palette, editor fixes) are not compared side by side, so UI/UX stays at 58%; the localization grade and hours stay (Indonesian's draft is offset by the drafts' new gaps) |
+| 2026-10-17 | minor | Automation roots (M8, #715, #481): `figcraft-cli mcp --automation-read-root DIR --automation-write-root DIR` (each repeatable, existing folders) and the desktop app with the same flags confine every file a command reads to the read and write roots and every file it writes to the write roots; paths are resolved (links followed, `..`, Windows `\\?\` and UNC paths, case) and compared by whole folder names, anything else is an ordinary error. The engine reaches the file system through one module (enforced by `crates/engine/clippy.toml`), and a sweep runs every command with paths outside the roots. `--attach` refuses the flags (the app confines itself); `ui.screenshot` and `ui.render` return PNG data without a `path`, so the attached MCP server writes no temporary files. Numbers unchanged. |
+| 2026-10-17 | minor | Number variables on text content (M3, #629): the Typography section's variable picker also lists number variables for a text layer's content, as the engine already accepted (the text shows the number, e.g. 42.5, and follows the variable). Other text fields keep their own types. Numbers unchanged. |
+| 2026-10-17 | minor | Frames and sections convert into each other (M1, #719): `object.convertToSection` turns a frame on the page or in a section into a section in place (same box, name, fill and layers, which stay where they are; what only a frame has goes: auto layout, clipping, layout grids, guides, scrolling), and `object.convertToFrame` now also turns a section into a frame that keeps its fill and doesn't clip, so the look stays. Nested frames, instances, main components and sections holding sections are refused with the reason; one undo step each. Both are in the canvas context menu (Convert to section / Convert to frame) and in Spanish. Numbers unchanged. |
 | 2026-10-14 | minor | Russian catalog (M9), reviewed and approved by VanTan: all 2,165 current entries, Русский in Preferences and regional ru tags. Russian integer plurals use one/few/many; contributor display name VanTan added. Existing estimates unchanged. |
 | 2026-10-13 | minor | Vector edit mode regions: the filled area under the pointer is hatched (clear of points and segments, holes left out, spacing by octave folding fitted to measurements at several zoom levels, fixed to the shape); click, Shift-click and drag select and move areas with their points (drawn unselected); a click on an empty spot clears them and stays in edit mode (see [ui-parity](ui-parity.md)) |
 | 2026-10-13 | minor | Plugin log limits (#191): cap each UTF-8 line at 8 KiB, total log bytes at 1 MiB and lines at 1,000 per run/callback before copying guest memory or forwarding to the host. Over-budget runs fail and roll back document edits; callbacks get fresh budgets. Added sandbox boundary/forwarding tests and an engine rollback regression. Percentages and hours unchanged. |
diff --git a/docs/translating.md b/docs/translating.md
index d93c0255..996f7854 100644
--- a/docs/translating.md
+++ b/docs/translating.md
@@ -15,14 +15,14 @@ Simplified.
 `pref.language {language}` does the same from the CLI, MCP and the control channel.
 
 The catalogs: English (`en`, the source), and Spanish (`es`, with the Latin American overlay
-`es-419`), French (`fr`), German (`de`), Brazilian Portuguese (`pt-BR`), Japanese (`ja`), Korean (`ko`),
-Simplified Chinese (`zh-Hans`), Czech (`cs`) and Indonesian (`id`), machine-drafted and waiting for
-native speakers' review. Russian (`ru`, Русский) was reviewed and approved by VanTan; its catalog
-keeps Frame, Dev Mode and Smart animate as familiar tool names and uses « » quotes. Turkish (`tr`)
-was machine-drafted and reviewed by a native speaker.
-`es-419`), French (`fr`), German (`de`), Brazilian Portuguese (`pt-BR`), Japanese (`ja`), Korean (`ko`)
-and Simplified Chinese (`zh-Hans`), machine-drafted and waiting for native speakers' review, and
-Swedish (`sv`), which translates every UI string and some command labels.
+`es-419`), French (`fr`), German (`de`), Dutch (`nl`), Brazilian Portuguese (`pt-BR`), Japanese
+(`ja`), Korean (`ko`), Simplified Chinese (`zh-Hans`), Czech (`cs`), Indonesian (`id`), Finnish
+(`fi`), Bengali (`bn`), Italian (`it`), Vietnamese (`vi`) and Thai (`th`), machine-drafted and waiting for native speakers' review. Polish (`pl`,
+Polski) was reviewed and approved by Lucas (@lukasz-sklad). Georgian (`ka`) was written with AI
+assistance and reviewed by a native speaker, and stays a draft until a maintainer changes its status.
+Russian (`ru`, Русский) was reviewed and approved by VanTan; its catalog keeps Frame, Dev Mode and
+Smart animate as familiar tool names and uses « » quotes. Turkish (`tr`) was machine-drafted and
+reviewed by a native speaker, and Swedish (`sv`) translates every UI string, command label and menu wording.
 
 ## The catalogs
 
@@ -59,14 +59,27 @@ komponenta, instance, varianta, automatické rozvržení, omezení, výplň, tah
 proměnná, styl). Indonesian uses bare imperatives for buttons and menu items (Simpan, Hapus), the
 formal Anda (never kamu), keeps established design terms in English (frame, layer, component,
 instance, auto layout, plugin, file) and keeps a noun unchanged after a count, so its plural entries
-give only `other`.
+give only `other`. Georgian has no letter case (never write Mtavruli for capitals), uses verbal nouns
+for commands (გვერდის დამატება) and keeps a noun singular after a numeral, so counts read
+"შრე: {n}" and its plural entries give the same text for `one` and `other`. Vietnamese uses concise
+imperatives for buttons and menu items (Lưu, Xóa) and keeps a noun unchanged after a count, so its
+plural entries give only `other`. Thai is concise, with bare imperatives for buttons and
+menu items (บันทึก, ลบ), no ครับ/ค่ะ endings, no spaces between Thai words (a space only separates
+clauses, and Thai from Latin words or numbers), and design terms transliterated as Thai designers say
+them (เฟรม, เลเยอร์, คอมโพเนนต์, อินสแตนซ์, ออโต้เลย์เอาต์). It has no plural forms: plural entries give
+only `other`, and dates read `{day} {month} {year}` with Thai month abbreviations.
 
-CJK text needs a CJK font, which egui and Inter lack: the desktop app adds an installed one when
-something on screen needs it (see `crates/ui-egui/src/cjk.rs`). The web build has no system fonts,
+CJK and Thai text need their own fonts, which egui and Inter lack: the desktop app adds an installed
+one when something on screen needs it, so layer and page names in those scripts show whatever the
+UI language (see `crates/ui-egui/src/cjk.rs`). The web build has no system fonts,
 so Japanese, Korean and Chinese appear there only in a build with craft-fonts and
 `FIGCRAFT_EMBED_CJK=1` (Noto Sans CJK SC, +16 MB); otherwise they are left out of the picker. A
-Chinese UI puts its Chinese face first so Han takes Simplified Chinese shapes. A new CJK or other non-Latin
-language also needs its script in `cjk::language`.
+Chinese UI puts its Chinese face first so Han takes Simplified Chinese shapes. Georgian is drawn in
+craft-fonts' Noto Sans Georgian, one of the built-in faces in `theme::install_fonts`, or else in an
+installed font on the desktop. Web builds keep it only when the craft-fonts they're built with has
+it (`crates/text/build.rs`); the commit releases pin doesn't yet (`docs/releasing.md`), so the web
+picker leaves Georgian out. A new CJK or other non-Latin language also needs its script in
+`cjk::language`, or a built-in craft-fonts face.
 
 ## Adding a language
 
@@ -74,8 +87,8 @@ language also needs its script in `cjk::language`.
    set `[meta] name` and `status = "draft — needs native review"`.
 2. Translate every value; keep the keys. Keep `{placeholders}` exactly, "…" where English has it,
    brand names and keyboard glyphs. English labels of commands: `figcraft-cli commands`.
-3. Plurals: give `one` only if the language has a singular form (Japanese, Korean and Chinese give
-   only `other`). `other` is required; `one`, `few` and `many` are optional. `trn` picks `one` for
+3. Plurals: give `one` only if the language has a singular form (Japanese, Korean, Chinese and
+   Vietnamese give only `other`). `other` is required; `one`, `few` and `many` are optional. `trn` picks `one` for
    1 (also 0 in French and Brazilian Portuguese). Russian uses `one` for 1, 21, 31… except 11;
    `few` for 2–4, 22–24… except 12–14; and `many` for the other integers, including 0. Keep `{n}`
    in all Russian forms. Add new rules to `plural` in
@@ -83,13 +96,11 @@ language also needs its script in `cjk::language`.
    a missing key uses the fallback catalog's own plural rule. Czech uses `one` for 1, `few` for
    2–4 and `other` for 0 and 5+ (e.g. `{n} vrstva`, `{n} vrstvy`, `{n} vrstev`). Keep `{n}` in all
    three forms. Czech's CLDR `many` applies only to decimals; `trn` takes integer counts.
-4. To require full coverage, add the code to `COMPLETE` in
-   [`crates/ui-egui/src/i18n_tests.rs`](../crates/ui-egui/src/i18n_tests.rs). Every later PR that
-   adds a string then has to translate it into each complete language, so only Spanish is there:
-   French, German, Brazilian Portuguese, Japanese, Korean, Simplified Chinese, Czech and Indonesian
-   are registered as drafts, Russian and Turkish are reviewed but not required, and a string added
-   later shows English in them until it is translated. To list what a draft lacks,
-   add its code to `COMPLETE` locally and run the check.
+   Polish uses `one` for 1 only, `few` like Russian (2–4, 22–24… except 12–14) and `many` for
+   the other integers, including 0 and 21 (e.g. `{n} warstwa`, `{n} warstwy`, `{n} warstw`).
+4. A string added later shows English in every language until someone translates it; a missing
+   translation never fails a check or a build. `cargo xtask i18n-report` lists what each language
+   lacks (UI strings, command labels, menu wordings), and `cargo xtask ci` prints the same list.
 5. Run the check and look at the panels in the app (longer words must fit the right panel):
 
        cargo test -p figcraft-ui-egui i18n
@@ -98,9 +109,9 @@ language also needs its script in `cjk::language`.
    with "…" and show it in full on hover; elsewhere, look for clipped or wrapped text.
 
 The check fails on keys the code uses that `en.toml` lacks (it prints the lines to paste), keys no
-code uses, unknown command ids, placeholders that don't match English, and, for complete languages,
-anything untranslated. Machine-drafted catalogs stay marked as drafts until a native speaker has
-reviewed them.
+code uses, unknown command ids and placeholders that don't match English. Machine-drafted catalogs
+stay marked as drafts until a native speaker has reviewed them; a reviewed catalog stays a draft
+until a maintainer approves it (its `status` says which).
 
 ## Adding strings in code
 
@@ -108,7 +119,11 @@ Wrap every string a user sees or a screen reader hears: `tr` for plain text, `tr
 placeholders, `trn` for counts, `tr_noop` for literals in `const` tables that are looked up later
 with `tr(label)`. The key must be a string literal as the first argument (the check reads the
 source). Don't wrap ids, command ids, JSON, log messages, file extensions or document content. Then
-add the key to `en.toml` and to each complete language (Spanish and Russian); the drafts may follow later.
+add the key to `en.toml`; translations may follow later.
 
 Labels from the engine and document crates (tool names, blend modes, easing curves…) are looked up
 at display with `tr(x.label())`; they are listed in `dynamic_labels` in `i18n_tests.rs`.
+
+The importers' fixed notes (the string literals passed to `warn` in `crates/format/src/fig` and
+`crates/format/src/rest`) are keys too: the import report shows them in the UI language, so a new
+note goes into `en.toml`. Notes built with `format!` show in English.
diff --git a/docs/ui-parity.md b/docs/ui-parity.md
index 62001715..2604cfc9 100644
--- a/docs/ui-parity.md
+++ b/docs/ui-parity.md
@@ -1,6 +1,6 @@
 # UI and interaction parity
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-15 · **Change:** minor (fields select their text on focus; Typography spacing icons support scrubbing (#373); CSS colour names in hex fields; the Small caps sample in Type settings drawn from capitals; recent files as cards; vector edit mode: hovering, hatching, selecting and dragging filled regions; home screen: Templates tab, first-run templates and Getting started tips; number fields: scrub rates, arrow steps, arithmetic with brackets, relative edits of mixed values; outline mode's hidden layers and object bounds; Hide when publishing; cursors per tool and modifier; panel widths; dark pages for files made in the dark theme; drag threshold and double-clicks into text in groups; rotation origin on Alt+R and placing with Enter: no documented shortcut missing; keyboard shortcut parity suite and bindings; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and the vector edit tail; canvas navigation, guides and grids behaviour suite and fixes; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; layers panel keyboard: F2 rename, Shift+F10 context menu, F8 box selection; selection and transform behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; boolean hit testing on the result, group drags, frame outlines and slices; outlines for the selection, mask outlines; arc fields, live boolean editing, shape builder on strokes, one-sided widths) · **Target:** Figma Design UI3 (desktop app 126.10.7)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-25 · **Change:** minor (colour picker LCH and OKLCH models; an XML (Android Vector Drawable) export format; Context menus: the Menu key reaches egui 0.37 but is unbound (row done → partial); the Text on a path tool; board tool keys pinned; community fixes: the text box by dragging, the font picker keys, the pen path on leaving Design, a still canvas in vector edit mode, a scrolling pages list, colour emoji, readable new text in frames, system theme on first run; the Small caps sample in Type settings drawn from capitals; recent files as cards; vector edit mode: hovering, hatching, selecting and dragging filled regions; home screen: Templates tab, first-run templates and Getting started tips; number fields: scrub rates, arrow steps, arithmetic with brackets, relative edits of mixed values; outline mode's hidden layers and object bounds; Hide when publishing; cursors per tool and modifier; panel widths; dark pages for files made in the dark theme; drag threshold and double-clicks into text in groups; rotation origin on Alt+R and placing with Enter: no documented shortcut missing; keyboard shortcut parity suite and bindings; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and the vector edit tail; canvas navigation, guides and grids behaviour suite and fixes; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; layers panel keyboard: F2 rename, Shift+F10 context menu, F8 box selection; selection and transform behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; boolean hit testing on the result, group drags, frame outlines and slices; outlines for the selection, mask outlines; arc fields, live boolean editing, shape builder on strokes, one-sided widths; fields select their text on focus; Typography spacing icons support scrubbing (#373); CSS colour names in hex fields; the Small caps sample in Type settings drawn from capitals; recent files as cards; vector edit mode: hovering, hatching, selecting and dragging filled regions; home screen: Templates tab, first-run templates and Getting started tips; number fields: scrub rates, arrow steps, arithmetic with brackets, relative edits of mixed values; outline mode's hidden layers and object bounds; Hide when publishing; cursors per tool and modifier; panel widths; dark pages for files made in the dark theme; drag threshold and double-clicks into text in groups; rotation origin on Alt+R and placing with Enter: no documented shortcut missing; keyboard shortcut parity suite and bindings; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and the vector edit tail; canvas navigation, guides and grids behaviour suite and fixes; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; layers panel keyboard: F2 rename, Shift+F10 context menu, F8 box selection; selection and transform behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; boolean hit testing on the result, group drags, frame outlines and slices; outlines for the selection, mask outlines; arc fields, live boolean editing, shape builder on strokes, one-sided widths; a rename selects the whole name, so typing replaces it; Escape or Enter after a pen path stays on the same vector (#760); IME composition kept on through idle frames of a text edit, candidates at the caret (#747); Selection colors for mixed selections and smart-selection spacing (#753); submenus with a hover delay and a safe triangle; the Actions palette's tabs, ranked search, highlight and recents; menu items that ask for a value; editor fixes from the community batches; fields select their text on focus; Typography spacing icons support scrubbing (#373); CSS colour names in hex fields; the Small caps sample in Type settings drawn from capitals; recent files as cards; vector edit mode: hovering, hatching, selecting and dragging filled regions; home screen: Templates tab, first-run templates and Getting started tips; number fields: scrub rates, arrow steps, arithmetic with brackets, relative edits of mixed values; outline mode's hidden layers and object bounds; Hide when publishing; cursors per tool and modifier; panel widths; dark pages for files made in the dark theme; drag threshold and double-clicks into text in groups; rotation origin on Alt+R and placing with Enter: no documented shortcut missing; keyboard shortcut parity suite and bindings; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and the vector edit tail; canvas navigation, guides and grids behaviour suite and fixes; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; layers panel keyboard: F2 rename, Shift+F10 context menu, F8 box selection; selection and transform behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; boolean hit testing on the result, group drags, frame outlines and slices; outlines for the selection, mask outlines; arc fields, live boolean editing, shape builder on strokes, one-sided widths) · **Target:** Figma Design UI3 (desktop app 126.10.7)
 
 Fine canvas control is what Figma users feel first: handles, snapping, nudging, modifier keys,
 drag behaviour, numeric precision. This checklist covers the tools, gestures and panels. Status:
@@ -15,19 +15,21 @@ interaction feel not yet compared.
 
 | Item | Status | Notes |
 |---|---|---|
-| UI3 layout: tab strip as title bar, icon rail, file header, pages + layers, floating bottom toolbar with flyouts, Design / Prototype / Inspect panels | done | frameless window on Windows/Linux with drawn buttons |
+| UI3 layout: tab strip as title bar, icon rail, file header, pages + layers, floating bottom toolbar with flyouts, Design / Prototype / Inspect panels | done | frameless window on Windows/Linux with drawn buttons; on a Wayland compositor that offers no server-side decorations (GNOME) the window gets winit's Adwaita controls instead (#592; checked by its author on GNOME, KDE not run) |
 | Light and dark themes | done | colours from `theme::Tokens`; a file or a page made while the dark theme shows gets a `#1E1E1E` page (`#F5F5F5` in the light theme), its own from then on: changing the theme repaints no page and opened files keep theirs; the file the app opens with takes the theme once it is known; the CLI, MCP and exports have no theme and keep `#F5F5F5`; text drawn with the Text tool is white on a dark page and black on a light one (so is text a command makes in the app without naming a fill; headless sessions keep black) (`theme_pages_tests`, `dark_page_text_tests`) |
 | Minimize UI (Cmd+\\) | done | |
 | Resizable panels | done | each panel's edge drags its width (left 200–480, right 240–480, 240 by default; a double-click on the edge or View ▸ Panels ▸ Reset panel widths puts the default back); the widths are each window's own, the main window's are kept in the preferences when a drag ends and come back at the next start, a new window opens with those of the window it comes from; Minimize UI hides the panels and brings them back as they were; the view keeps its centre and zoom while a panel is resized; in a window too small for them the panels give way so the canvas keeps 160 px (the left one first), down to the smallest window (800×500) (`panel_width_tests`). Not compared with Figma's widths; no snap points |
-| Actions palette (Cmd+K, Cmd+/) | done | commands; no assets search parity |
-| Context menus | done | canvas and layers; Shift+F10 opens them from the keyboard (at the focused layer row or below the canvas selection) and the menu takes the keyboard; the Menu key isn't delivered by the windowing layer (egui 0.36 has no key for it) |
+| Actions palette (Cmd+K, Cmd+/) | done | tabs: All (every command, grouped by menu, or Other), Assets (components and styles) and Plugins & widgets; results ranked prefix first, then shortest, at most 60 rows; Up/Down move a highlight and Enter runs it; Recents list what was run from the palette (matching translated labels); one open/toggle path from every entry point (`palette_tests`). Ranking and the Assets results not compared with Figma's |
+| Context menus | partial | canvas and layers; submenus as in the main menu below, and a right-click in a new spot starts a fresh menu (Select layer closed); Shift+F10 opens them from the keyboard (at the focused layer row or below the canvas selection) and the menu takes the keyboard; the Menu key reaches egui as `Key::Menu` (egui-winit 0.37 maps the native key), but FigCraft's keymap has no binding for `Menu`, so it does nothing yet |
 | Home screen: Recents, Online and Templates | done (ours) | The sidebar switches between the three (`ui.set {homeSection}`). Online: your online files (see the collaboration checklist). Recents: new file, open, join with a code, open files, recent files (cards with the picture each file carries on its page colour, the file's icon, name and "Edited ... ago" or "File not found", full path on hover; or a Name, Last modified and Created table with sortable headers; sorted by name, creation or last change either way; grid or list and the sort kept in the preferences, `ui.set {homeRecentsView, homeRecentsSort, homeRecentsOrder}`; a click selects, a double-click or Enter opens, arrow keys move the selection; Open, Show in folder and Remove from recents on right-click), a Getting started card (six tips with their shortcuts from the keymap; its close button is remembered in the preferences and Help ▸ Getting started brings it back) and, while there are no recent files, four templates to start from. Templates: the eight starter templates as cards (thumbnail rendered from the document, cached per theme; name, description, kind and size), a search field and a kind filter, an empty state; Tab reaches every card and Enter opens it; cards and tabs are named for screen readers. A first run opens here. No Community files or drafts folder |
-| Main menu from the logo | done | generated from `catalog.rs`; popups sized to content |
-| Keyboard shortcuts panel | done | docked, tabbed by group like the documentation, searchable, per-platform keycaps; held keys, gestures and presentation keys listed beside the bindings; a label too long for its column ends with "…" and shows in full on hover |
+| Main menu from the logo | done | generated from `catalog.rs`; popups sized to content. Submenus open after 0.15 s on their row (a click or the keyboard opens one at once) and close at once when another row is hovered; while the pointer heads for an open submenu inside the triangle to its near edge, the rows it crosses don't take over, and resting 0.3 s on one hands over; closing the menu, however it closes, clears which submenus were open, so it reopens with none (`menu_aim_tests`, 10 tests; timings tuned by feel, not measured against Figma). Menu and palette items that need a value ask for it first: Create link, Offset path and Move to page in a dialog of the shared controls, the language, user name, server and nudge items in Preferences, Open recent on the home screen's Recents; File ▸ Rename edits the file name in place |
+| Keyboard shortcuts panel | done | closes when the home screen shows (#548); docked, tabbed by group like the documentation, searchable, per-platform keycaps; held keys, gestures and presentation keys listed beside the bindings; a label too long for its column ends with "…" and shows in full on hover |
 | Several windows | partial | File ▸ New window, Open in new window on a tab, a tab dragged off the strip; screen-reader tree in the main window only; positions not restored |
 | Multiplayer avatars, Share button | missing | waits for multiplayer |
 | Colour names in hex fields | done | every hex field (fills, strokes, text ranges, effects, layout grids, colour variables, page and prototype backgrounds, the colour picker's Hex) takes a CSS colour name as well: `red` becomes `FF0000`; case, spaces and hyphens are ignored (`Light Blue`); names are opaque and keep the colour's opacity; hex wins where both could match. The picker's CSS field takes every CSS name too (`Color::from_hex_or_name`, `color::named`) |
-| Fields select their text on focus | done | a click or Tab into a one-line field selects all of its text, so typing replaces the value: hex and colour fields, number fields, inline fields (a fill's hex, variable values, renames), names, search boxes and dialog fields; a drag from the press selects only what it covers; multi-line fields (descriptions, comments) keep the caret where clicked. The first click into an inline field (a fill's hex) now takes the keyboard; it took a second click (`widgets::select_all_on_focus`, `select_all_tests`) |
+| Fields select their text on focus | done | a click or Tab into a one-line field selects all of its text, so typing replaces the value: hex and colour fields, number fields, inline fields (a fill's hex, variable values, renames), names, search boxes and dialog fields; a drag from the press selects only what it covers; multi-line fields (descriptions, comments) keep the caret where clicked. The first click into an inline field (a fill's hex) now takes the keyboard; it took a second click. A rename (double-click, F2, File ▸ Rename, a page) selects the whole name before its field first draws, so a key typed in that same frame replaces the name; it was appended (`widgets::select_all_on_focus`, `select_all_tests`, `layers_rename_tests`) |
+| Colour picker models | done | Hex, RGB, HSL, HSB, LCH, OKLCH and CSS; LCH and OKLCH keep lightness and hue when a colour leaves sRGB (chroma comes down); the values typed stay while the colour is theirs (a hue typed on a grey, a chroma sRGB can't hold); CSS reads `lch()` and `oklch()` with any hue unit and `none` (`figcraft_color::{Lch, Oklch}`). Values are the stored channels read as sRGB |
+| Colour picker on a new fill or stroke | done | + opens the picker on the new paint when the selection shares one paint list; on a mixed selection + adds a paint to each layer and no picker opens (#404) |
 | Blend mode menus: the layer's (Design panel) and each paint's (colour picker) | done | Pass through and Normal are distinct (Normal isolates a group's or frame's children); paints have no pass-through; plus darker drawn exactly on the canvas |
 
 ## Layers and Assets panels
@@ -40,15 +42,15 @@ interaction feel not yet compared.
 | Eye and padlock: click, or drag across rows to set several in one step; layers in a locked frame show a faint padlock | done | the toggles no longer vanish under the pointer (clicks on them could miss) |
 | Rename: double click, F2 / Cmd+R, Tab to the next row; several layers open Rename layers (match, regular expressions, current name and number codes, start value, preview) | done | numbered in stacking order, pinned |
 | Find layers (filter by name) | done | not covered by the documentation |
-| Pages: add, rename, drag to reorder, duplicate ("Copy of"), delete, dividers (a blank page named with a hyphen) | done | |
-| Assets panel: folders from page, frames and slash names (fold away), search, thumbnails, drag onto the canvas or into frames and auto layout, Alt-drop swap, enabled libraries | done | |
+| Pages: add, rename, drag to reorder, duplicate ("Copy of"), delete, dividers (a blank page named with a hyphen) | done | the line between Pages and Layers drags to size the pages list, kept in the preferences; a long list scrolls in its own area and a page dropped outside the visible list stays put (#272) (`layers_behaviour_tests`) |
+| Assets panel: folders from page, frames and slash names (fold away), search, thumbnails, drag onto the canvas or into frames and auto layout, Alt-drop swap, enabled libraries | done | Shift+I (Quick insert) and the toolbar's Resources open it (they didn't, #710) |
 | Hide when publishing from the Assets panel's context menu | done | a right-click on one of this file's components (also Libraries ▸ Hide when publishing for the selection, `component.hideWhenPublishing {ids?, on?}`): the model's sign of it is the name, so hiding puts a `.` before the name and showing takes the leading `.` and `_` away (one undo step, saved and synced like a rename; a variant or a layer inside hides its whole component or set); a hidden component shows a crossed eye on its tile and a dimmer name, the menu item its check mark; the next publish leaves it out and brings it back when shown again (`hide_publishing_tests`). Library components (read-only here) have no such menu |
 
 ## Selection and transform
 
 | Item | Status | Notes |
 |---|---|---|
-| Click, Shift-click, marquee, Shift-marquee toggle | done | a marquee selects what it touches; from a top-level frame's background, the layers inside it; locked and hidden layers are skipped (`selection_behaviour_tests`) |
+| Click, Shift-click, marquee, Shift-marquee toggle | done | Shift-drag on a selected layer moves the selection, kept to one axis (#498); a marquee selects what it touches; from a top-level frame's background, the layers inside it; locked and hidden layers are skipped (`selection_behaviour_tests`) |
 | Deep select (Cmd/Ctrl-click, Cmd/Ctrl-marquee) | done | |
 | Select layer menu (every layer under the click) | done | |
 | Enter / Shift+Enter (children / parent), Tab / Shift+Tab (siblings) | done | Tab renames the next layer while renaming |
@@ -63,11 +65,13 @@ interaction feel not yet compared.
 | Nudge 1 / Shift 10 (preference), Cmd+arrows resize | done | arrows reorder auto layout children |
 | Smart guides: edges, centres, equal spacing (between two layers or continuing a row's gap, labelled), spacing labels, parent, layout grid, ruler guides | done | red, `snap.rs`; thresholds not yet compared with Figma's |
 | Ctrl to suspend snapping while dragging (macOS) | done | Control on macOS (Cmd keeps working), Ctrl elsewhere; moving, resizing and drawing |
-| Measure (Alt hover, Cmd+Alt nested, Shift+Alt padding/gaps) | done | labels never overlap |
+| Measure (Alt hover, Cmd+Alt nested, Shift+Alt padding/gaps) | done | labels never overlap; the arrows still nudge while measuring (Shift: the big step) and the distances follow; the selection's handles and size label hide while measuring (`measure_nudge_tests`, #894) |
 | Pixel grid snapping, pixel preview, 2x preview | done | moves, resizes and new shapes land on whole pixels; the pixel grid shows from 400% (`view_behaviour_tests`) |
 | Numeric fields: arithmetic, scrubbing by dragging the label, mixed values | done | Numeric panels use `widgets::number_field`; Typography line height, letter spacing and paragraph spacing share its leading-icon scrub logic (#373), retaining their existing unit parsing, Auto/Mixed values, variable chips and selected-character targeting (`typography_scrub_tests`). Scrubbing the label: a step a point (1 px; 1% of opacity, 1° of rotation), ten with Shift, a tenth with Alt, each stretch at the rate held while it was dragged, one undo step when let go; past the edge of the screen it goes on where the platform reports the mouse's own motion (desktop), otherwise it stops there. Arrow keys: Up/Down step a pixel field by the small nudge and Shift by the big nudge (the preferences), other fields by their own step and ten of it; they work while typing (from what is typed) and with the keyboard on the field. Typing: `+ - * /`, brackets, units (`px`, `°`, `%`, `x`, `ms`), a decimal comma; `+10`, `*2`, `/4` are relative to the value, and `50%`, `+10%`, `-10%` too in a field that isn't a percentage. Enter, Tab or a click elsewhere commits (Tab and Shift+Tab move to the next and previous control), Escape restores; a field left as it was commits nothing (no undo step, and a rounded display isn't written back). Mixed values show "Mixed": a number sets them all, a relative edit or an arrow key goes to each layer from its own value in one undo step, for X, Y, W, H, rotation, opacity, corner radius and stroke weight (elsewhere `+10` on Mixed sets 10 and `*2` does nothing) (`field_tests`). Left: scrubbing a Mixed field (nothing happens), `x2`-style suffix edits, the pointer isn't wrapped to the other side of the screen; rates not compared with Figma's |
 | Transform box at small sizes | done | a press inside a layer smaller than its handles moves it, the nearest handle wins, handles answer just outside and are hidden under 16 px on screen; cursors follow each handle and the box's rotation |
 | Locked layers | done | selectable from the layers panel; no handles, not dragged with the rest of a selection |
+| Smart selection spacing | partial | with layers in a row, a column or an aligned grid selected, the Layout section shows horizontal and vertical spacing ("Mixed" until set; typed, scrubbed, fractional and negative) and pink handles in the gaps on the canvas drag them, one undo step, Escape cancels (`arrange.spacing`; sizes, parents and offsets within each track kept; at most 2,000 layers; flow children, locked layers and layers inside instances left out). No reorder rings for swapping layers; checked by its author on macOS and in the app on Windows (#402) |
+| Selection colors | partial | for a mixed selection the Design panel lists their solid and gradient paints (children and text ranges included; hidden paints, masks, images, patterns and boolean operands left out; styles and variables listed apart): editing a colour changes every matching fill and stroke in one undo step, a row selects the layers that use it or applies a color style or color variable of the document, and a row linked to a style or variable detaches it, keeping the color (`selection.colors`, `selection.setPaint`, `selection.applyColorStyle`, `selection.bindColorVariable`, `selection.detachColor`, `selection.selectColor`). No library styles or variables from there, and no new style or variable from a row (#403) |
 | Keyboard box selection | done | Alt+Space on macOS, Ctrl+Space on Windows and Linux, or F8 (`select.area`): a box around the selection or in the middle of the view; arrows move it, Cmd/Ctrl+arrows or Shift+arrows size it (Shift with Cmd/Ctrl: farther), Enter selects like a marquee (Shift+Enter toggles, Cmd/Ctrl+Enter nested), Escape closes |
 
 ## Tools
@@ -78,14 +82,14 @@ interaction feel not yet compared.
 | Frame (presets panel, swap orientation), section, slice | done | |
 | Rectangle, ellipse (arc handles and Design panel arc fields), polygon, star, line, arrow; Shift/Alt | done | Alt draws lines from the centre too (`shapes_behaviour_tests`) |
 | Corner radius handles (inside each corner of a rectangle or frame, a polygon's or star's top point; Alt: one corner), star ratio handle; Count and Ratio fields | done | handles hide under 48 px on screen; no count handle on the canvas (the Count field instead); corner smoothing rounds rectangles and frames only |
-| Pen: vector networks, branch, close, bend; pencil | done | pen pressure on Windows and from browser styluses only; outside edit mode the Pen closes on its first point, connects to its other points and continues a selected open path from an end point (`vector_multi_behaviour_tests`) |
-| Vector edit mode: bend, paint bucket, lasso, cut, eraser, transform box, point snapping, mirroring | done | paint bucket drags across areas; cut drags divide a shape into layers; delete and heal follows the curve; rounded points are drawn; Shift-click deselects a point at a corner of the box (`vector_behaviour_tests`); several vectors edited at once, Shift-click handles to drag them together, a cap and join per point, rounded points beside curves (`vector_multi_behaviour_tests`); filled regions with the Move tool: the area under the pointer is hatched ("/" lines in the selection colour, clipped by the area's own fill rule, holes left out, gone 3.5 px from a point or 2 px from a segment at any zoom), the line spacing follows octave folding (fitted to measurements at several zoom levels: 8 px at every power-of-two zoom, growing with the zoom and stepping back at √2 · 2ⁿ) and stays fixed to the shape when panning; a click selects the area and its points (moved with it but drawn unselected), Shift adds or removes an area, a press on a selected area drags the whole selection, no hover hatch during drags, a click on an empty spot (a hole) clears it and stays in edit mode; `vector.edit.select {regions}` (`regions_tests`, `vector_regions_tests`). Not yet: the transform box around points of several layers; areas of other layers edited at once |
+| Pen: vector networks, branch, close, bend; pencil | done | pen pressure on Windows and from browser styluses only; outside edit mode the Pen closes on its first point, connects to its other points and continues a selected open path from an end point (`vector_multi_behaviour_tests`); Escape or Enter ends the path and keeps its layer in edit mode with the pen, so the next path joins the same vector and another Escape leaves edit mode (#760, `pen_end_tests`); switching from Design to Prototype or Inspect ends the path and returns to Move (#308) |
+| Vector edit mode: bend, paint bucket, lasso, cut, eraser, transform box, point snapping, mirroring | done | a double-click a few pixels off a thin stroke enters edit mode (#646); entering edit mode and picking a region keep the canvas still (#322); a point dropped on another point merges with it, and dropping one end of an open path on the other closes it (a 2-point line's end just moves, #401); Flatten keeps open paths open (#377); paint bucket drags across areas; cut drags divide a shape into layers; delete and heal follows the curve; rounded points are drawn; Shift-click deselects a point at a corner of the box (`vector_behaviour_tests`); several vectors edited at once, Shift-click handles to drag them together, a cap and join per point, rounded points beside curves (`vector_multi_behaviour_tests`); filled regions with the Move tool: the area under the pointer is hatched ("/" lines in the selection colour, clipped by the area's own fill rule, holes left out, gone 3.5 px from a point or 2 px from a segment at any zoom), the line spacing follows octave folding (fitted to measurements at several zoom levels: 8 px at every power-of-two zoom, growing with the zoom and stepping back at √2 · 2ⁿ) and stays fixed to the shape when panning; a click selects the area and its points (moved with it but drawn unselected), Shift adds or removes an area, a press on a selected area drags the whole selection, no hover hatch during drags, a click on an empty spot (a hole) clears it and stays in edit mode; `vector.edit.select {regions}` (`regions_tests`, `vector_regions_tests`). Not yet: areas of other layers edited at once |
 | Shape builder (Shift+M) on fills, strokes and open paths; variable width (Shift+W), one side with Alt | done | |
 | Boolean groups: clicked where the result is, double-click or Cmd/Ctrl-click into operands, live results while dragging or editing points, per-operand operations | done | |
-| Text: point, auto height, fixed; caret, words, lines, IME | done | carets step over whole emoji and accented letters; CJK words by script run (no dictionary); vertical trim in Type settings; no spell check |
+| Text: point, auto height, fixed; caret, words, lines, IME | done | the font picker previews a family on the canvas while hovered (no undo step; Escape restores, #653) and Up/Down step through it (#352); a selection highlight after a line break starts at that line's start and an empty last line shows its mark (#665); carets step over whole emoji and accented letters; colour emoji draw from their colour tables (#300); IME composition replayed in tests as macOS sends it, not yet checked on a Mac (#747); CJK words by script run (no dictionary); vertical trim in Type settings; no spell check |
 | Eyedropper (I) | done | picks the colour seen under the pointer (opaque) into the selection's fill and the recent colours, one undo step (`fx_behaviour_tests`) |
 | Comment (C), Shift+C to show/hide | done | local only |
-| Text on a path (Figma Draw) | done | put on from the Design panel or `text.onPath`, not by clicking a path with the Text tool; the path is edited by resizing only |
+| Text on a path (Figma Draw) | done | the Text on a path tool in the Text flyout (`tool.textOnPath`) shows the I-beam over a shape's or vector's path, and a click there puts new text on the path, starting at the click, with the path's effects and its fill when one shows; the path layer is removed, and the path comes back if nothing is typed. Also from the Design panel or `text.onPath`; the path is edited by resizing only |
 | Stretch and scatter brushes (Figma Draw) | done | eight presets drawn in code; the Pencil's brush is set by `tool.pencilBrush`, not from the toolbar |
 | Image crop handles | done | |
 
@@ -126,7 +130,7 @@ in the table. `crates/ui-egui/src/shortcut_keys_tests.rs` drives the keys a look
 | Bound on other keys (documented conflict) | 1 | Run last plugin: the documentation also gives Ctrl+Alt+P to pixel preview on Windows; the plugin takes Ctrl+Alt+Shift+P there |
 | Missing | 0 | moving the rotation origin (Alt+R, `transform.rotationOrigin`) and placing an object with Enter after choosing its tool (`tool.place`) were the last two |
 | Documented keys a platform keeps | 2 | Ctrl+Space (Windows/Linux keyboard box selection) switches some CJK input methods; F6 goes to a browser's address bar in the web build |
-| Undocumented bindings pinned | 49 | of which Cmd/Ctrl+W, Cmd/Ctrl+N and Ctrl+Tab are taken by browsers (web build) and Ctrl+Alt+T / Ctrl+Alt+L by some Linux desktops |
+| Undocumented bindings pinned | 57 | of which Cmd/Ctrl+W, Cmd/Ctrl+N and Ctrl+Tab are taken by browsers (web build) and Ctrl+Alt+T / Ctrl+Alt+L by some Linux desktops |
 
 - **Newly bound:** A for the Frame tool, Shift+' for the pixel grid (Cmd+' kept: the articles
   disagree), Alt+Cmd+\ / Ctrl+Alt+\ for others' cursors (`view.multiplayerCursors`, new), Ctrl+F6
@@ -137,6 +141,9 @@ in the table. `crates/ui-egui/src/shortcut_keys_tests.rs` drives the keys a look
   Ctrl+Alt+Shift+K to go to the main component, the arrows panning the view when nothing is
   selected (`view.pan`, new), Control suspending snapping on macOS, and Space, N, C and F while
   presenting. The paint bucket's tooltip shows Shift+B (B still works).
+- **Fixed (2026-10-17):** Shift+Cmd/Ctrl+V (Paste over selection) and Alt+Cmd/Ctrl+V (Paste
+  properties) work on the desktop (they were bound but didn't act there, #716); Cmd/Ctrl+V pastes an
+  image copied in another app (#663). Counts above unchanged (the suite checks bindings).
 - **Where the documentation disagrees with itself** (noted per row): pixel grid (Shift+' or
   Cmd+'), letter spacing (Alt or Cmd with < >; Cmd would be the font size keys, Alt bound),
   Windows remove fill (Alt+/ or Alt+,; Alt+, is letter spacing), the Layers panel on Windows (Alt+1
@@ -159,13 +166,27 @@ in the table. `crates/ui-egui/src/shortcut_keys_tests.rs` drives the keys a look
 | Keyboard navigation: F6 regions, Tab within, focus ring | done | |
 | Layers panel from the keyboard: arrows, F2 / Cmd+R rename (the row gets the keyboard back), Shift+F10 context menu; 10k-layer lists | done | revealing a layer, expanding, collapsing and arrow keys timed in `cargo xtask bench` |
 | Reduced motion | done | system setting or preference |
-| WCAG AA contrast of secondary and accent text | done | |
+| WCAG AA contrast of secondary and accent text | done | disabled and dim text at least 3:1 against panels, fields and selected rows, selected text at least 3:1 on its highlight, in both themes (`theme::tests`, #890) |
 | Tested with VoiceOver, NVDA, Narrator, Orca | missing | human QA |
 
 ## Revision history
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-25 | minor | Context menus: the Menu key is no longer an egui limitation at 0.37 (egui-winit maps the native Menu/ContextMenu key to egui's `Key::Menu`), but FigCraft normalizes no binding for `Menu`, so it does not open a context menu yet; Shift+F10 still does, with the same behaviour. The row moves from done to partial. Numbers unchanged |
+| 2026-10-24 | minor | Selection colors: a row's Styles menu also lists the document's color variables, and picking one binds it to every fill and stroke the row stands for, replacing a color style there (`selection.bindColorVariable`; a text range with fills of its own takes the variable's value); a row linked to a style or variable has a Detach button that unlinks it and keeps the color (`selection.detachColor`). Still partial: no library styles or variables, no new style or variable from a row |
+| 2026-10-24 | minor | The Text on a path tool (`tool.textOnPath`, in the Text flyout): a click on a shape's or vector's path puts new text on it, starting at the click, with the path's fill (when one shows) and effects, as the help center's Guide to text describes; the path layer is removed, and an edit left empty puts it back with no undo step (`draw_tools_tests`, `cursor_tests`) |
+| 2026-10-24 | minor | Boards (M12): eight board bindings pinned (tool keys Q sticky, B shapes, X connector, M marker, U highlighter, E eraser, W stamp, and Shift+Cmd/Ctrl+Enter for the next sticky; boards only, on keys no design-file shortcut uses): 49 → 57 pinned |
+| 2026-10-18 | minor | Colour picker models LCH and OKLCH beside Hex, RGB, HSL, HSB and CSS (desktop and web): lightness, chroma and hue fields (OKLCH lightness in percent, chroma to two places), an edit keeps lightness and hue and lowers chroma until the colour fits sRGB, as CSS gamut mapping does; the CSS field reads `lch()` and `oklch()` too. Values read the stored channels as sRGB, like the other models (a Display P3 file's colours aren't converted first). Conversions checked against the CSS Color 4 and OKLab reference values; checked in the desktop app over the control channel. Numbers unchanged |
+| 2026-10-15 | minor | Community fixes (#262, #272, #277, #300, #308, #311, #322, #352, #363, #372, #390): first runs follow the system theme; new text is readable on the frame it is drawn in; a long pages list scrolls on its own and new pages take the current page's colour; the pen shows its handles while dragging a point out and ends its path when you leave Design; vector edit mode keeps the canvas still; a drag with the Text tool makes a fixed-size box; colour emoji; the selection highlight on the last line; Up and Down in the font picker with a live preview. Numbers unchanged |
+| 2026-10-22 | minor | Vector edit mode: points selected in several layers get the transform box, in the page's axes since the layers can be turned differently; its corners and edges scale them, outside a corner rotates them and inside drags them, each layer's points in its own coordinates and one undo step for all, and a click inside clears every layer's points (`transform_tests`). Numbers unchanged |
+| 2026-10-20 | minor | Readable disabled and selected text (#890): the dim text colour (disabled buttons, placeholders, hints) is at least 3:1 against panels, fields and selected rows in both themes (it was 2.1:1 in the light theme), a disabled button is grey with that text instead of fading to 40%, and selected text (renaming a page or layer, any text box) takes the theme's readable green on the highlight (1.4:1 in the dark theme before, now 4.2:1 or more); checked with the colour contrast helper (`theme::tests`). Numbers unchanged |
+| 2026-10-20 | minor | Measuring while nudging (#894): with Alt held over another layer, the arrows nudge the selection (Shift: the big step) and the distances follow every nudge (Alt+arrows used to do nothing); while measuring, the selection's handles and size label hide and both layers keep their outlines (`measure_nudge_tests`). Numbers unchanged |
+| 2026-10-18 | minor | Export: an "XML" format (Android Vector Drawable, said on hover) in the Export section's format menu, with "Include id attribute" and a compatibility choice (best effort, exact only, ignore unsupported) in its settings, and an XML preset in File ▸ Export…; the export toast says when content was changed or left out. Numbers unchanged |
+| 2026-10-18 | minor | A rename (layers double-click, F2, File ▸ Rename, a page) selects the whole name in the frame its field first draws, so the first key replaces the name instead of being appended. Checked in the app on Windows over the control channel |
+| 2026-10-17 | minor | Escape or Enter while the pen draws ends the path and keeps its vector in edit mode with the pen, so the next path is drawn into the same layer (unconnected); another Escape leaves edit mode (#760). Entering edit mode on a layer that already is a vector no longer records an empty undo step. Numbers unchanged |
+| 2026-10-17 | minor | Text layers keep the platform IME on for every frame of an edit, not only frames with input (an idle frame turned it off and macOS dropped each composition, #747); the candidate window opens at the caret instead of the canvas corner; keys pressed while composing go to the IME |
+| 2026-10-17 | minor | The community batches #733, #735, #736, #729 and #753: submenus open after a short hover, keep their place along a safe triangle and reopen closed (main and context menus); the Actions palette's tabs, ranked search, keyboard highlight and recents; menu items that need a value ask for it, File ▸ Rename edits in place; Shift+I and Resources open Assets; a draggable Pages/Layers divider; Shift-drag moves the selection; a double-click near a thin stroke, merging dropped points and Flatten keeping open paths in vector editing; live font preview and the selection highlight after line breaks; the colour picker on a new fill or stroke; Paste over and Paste properties from the keyboard; Selection colors (partial: no library styles or variables there) and smart-selection spacing fields and canvas handles (partial: no reorder rings), both also checked by their author on macOS; the keyboard shortcuts panel closes on the home screen; Adwaita window controls on Wayland compositors without server decorations (checked by its author on GNOME; KDE not run). Checked in the app on Windows (submenus by their author), not side by side with Figma. Summary and hours unchanged |
 | 2026-10-15 | minor | Hex fields take CSS colour names (`red` → `FF0000`): fills, strokes, effects, grids, variables, backgrounds and the colour picker |
 | 2026-10-15 | minor | Typography: drag the line-height, letter-spacing and paragraph-spacing icons to scrub their values; shared numeric-field rates, resize cursor and one Undo step per gesture (#373). |
 | 2026-10-15 | minor | A click or Tab into a one-line field selects all of its text (hex, inline, name, search and dialog fields); the first click into a fill's hex takes the keyboard |
diff --git a/packaging/check-app-specific.sh b/packaging/check-app-specific.sh
index ebf23c0b..e9b03946 100644
--- a/packaging/check-app-specific.sh
+++ b/packaging/check-app-specific.sh
@@ -6,7 +6,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")/.."
 bash packaging/server/install-test.sh
 if grep -rniE 'photoshop|psd|photocraft|vectorcraft|illustrator|adobe|figma' packaging/ .github/ \
     --exclude=packaging-lint.yml --exclude=check-app-specific.sh; then
-  echo "::error::package metadata mentions another product (see above)"
+  echo "::error::package metadata mentions another product (see above)" >&2
   exit 1
 fi
 
diff --git a/packaging/env.sh b/packaging/env.sh
index b68406a0..eb6547c9 100644
--- a/packaging/env.sh
+++ b/packaging/env.sh
@@ -24,10 +24,11 @@ workspace_version() {
     /^\[/ { in_pkg = ($0 == "[workspace.package]") ; next }
     in_pkg && $1 == "version" { gsub(/[" ]/, "", $3); print $3; exit }
   ' "$ROOT/Cargo.toml"
+  return $?
 }
 
 VERSION="${FIGCRAFT_VERSION:-$(workspace_version)}"
-if [ -z "$VERSION" ]; then
+if [[ -z "$VERSION" ]]; then
   echo "error: could not read [workspace.package] version from $ROOT/Cargo.toml" >&2
   exit 1
 fi
@@ -37,7 +38,7 @@ DIST="${DIST:-$ROOT/dist/release}"
 mkdir -p "$DIST"
 export DIST
 
-if [ -z "${FIGCRAFT_BUILD_SHA:-}" ]; then
+if [[ -z "${FIGCRAFT_BUILD_SHA:-}" ]]; then
   FIGCRAFT_BUILD_SHA="$(git -C "$ROOT" rev-parse HEAD 2>/dev/null || true)"
 fi
 export FIGCRAFT_BUILD_SHA
@@ -47,7 +48,7 @@ export CARGO_TARGET_DIR="${CARGO_TARGET_DIR:-$ROOT/target}"
 # The headless CLI ships next to the app once apps/figcraft-cli exists.
 BINS=(figcraft)
 HAS_CLI=0
-if [ -f "$ROOT/apps/figcraft-cli/Cargo.toml" ]; then
+if [[ -f "$ROOT/apps/figcraft-cli/Cargo.toml" ]]; then
   BINS+=(figcraft-cli)
   HAS_CLI=1
 fi
@@ -58,7 +59,8 @@ unset _bin
 # The binary used for a `--version` smoke test: the CLI when shipped, else the app (which answers
 # --version before opening a window).
 smoke_bin() {
-  if [ "$HAS_CLI" = 1 ]; then echo figcraft-cli; else echo figcraft; fi
+  if [[ "$HAS_CLI" = 1 ]]; then echo figcraft-cli; else echo figcraft; fi
+  return 0
 }
 
 # Emit a GitHub Actions warning (plain stderr outside Actions).
@@ -68,31 +70,33 @@ retry() {
   local attempt
   for attempt in 1 2 3 4 5; do
     "$@" && return 0
-    [ "$attempt" = 5 ] || { echo "retrying ($attempt/5): $*" >&2; sleep 15; }
+    [[ "$attempt" = 5 ]] || { echo "retrying ($attempt/5): $*" >&2; sleep 15; }
   done
   return 1
 }
 
 warn() {
-  if [ -n "${GITHUB_ACTIONS:-}" ]; then echo "::warning::$*"; else echo "warning: $*" >&2; fi
+  if [[ -n "${GITHUB_ACTIONS:-}" ]]; then echo "::warning::$*"; else echo "warning: $*" >&2; fi
+  return 0
 }
 
 # Copy licence and readme files that exist into a package directory.
 copy_docs() {
   local dest="$1" f
   for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE NOTICE COPYRIGHT; do
-    if [ -f "$ROOT/$f" ]; then cp "$ROOT/$f" "$dest/"; fi
+    if [[ -f "$ROOT/$f" ]]; then cp "$ROOT/$f" "$dest/"; fi
   done
   copy_font_licences "$dest"
+  return $?
 }
 
 # Builds made with craft-fonts (CRAFT_FONTS_DIR, all official releases) embed its fonts, which
 # are OFL-1.1: ship each font's licence as OFL-<family-dir>.txt. No-op without CRAFT_FONTS_DIR.
 copy_font_licences() {
   local dest="$1" lic fam
-  [ -n "${CRAFT_FONTS_DIR:-}" ] || return 0
+  [[ -n "${CRAFT_FONTS_DIR:-}" ]] || return 0
   for lic in "$CRAFT_FONTS_DIR"/fonts/*/OFL.txt; do
-    [ -f "$lic" ] || continue
+    [[ -f "$lic" ]] || continue
     fam="$(basename "$(dirname "$lic")")"
     cp "$lic" "$dest/OFL-$fam.txt"
   done
@@ -100,5 +104,7 @@ copy_font_licences() {
 
 # Portable SHA-256 of a file (prints just the hash).
 sha256() {
-  if command -v sha256sum >/dev/null; then sha256sum "$1" | cut -d' ' -f1; else shasum -a 256 "$1" | cut -d' ' -f1; fi
+  local file="$1"
+  if command -v sha256sum >/dev/null; then sha256sum "$file" | cut -d' ' -f1; else shasum -a 256 "$file" | cut -d' ' -f1; fi
+  return $?
 }
diff --git a/packaging/freebsd/package.sh b/packaging/freebsd/package.sh
index bb9a7799..9ee0394b 100755
--- a/packaging/freebsd/package.sh
+++ b/packaging/freebsd/package.sh
@@ -21,7 +21,7 @@ APP_ID=ai.storyteller.figcraft
 
 SKIP_BUILD=0
 DRY_RUN=0
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --skip-build) SKIP_BUILD=1; shift ;;
     --dry-run) DRY_RUN=1; SKIP_BUILD=1; shift ;;
@@ -31,13 +31,29 @@ while [ $# -gt 0 ]; do
 done
 
 # FreeBSD's uname says amd64; release file names use x86_64 like the Linux and Windows ones.
-MACHINE="$(uname -m)"
-case "$MACHINE" in
-  amd64 | x86_64) ARCH=x86_64 ;;
-  arm64 | aarch64) ARCH=aarch64 ;;
-  *) echo "unsupported architecture $MACHINE" >&2; exit 2 ;;
+release_arch() {
+  local arch="$1"
+  case "$arch" in
+    amd64 | x86_64) echo x86_64 ;;
+    arm64 | aarch64) echo aarch64 ;;
+    *) echo "unsupported architecture $arch" >&2; return 2 ;;
+  esac
+  return
+}
+# The release workflow cross-compiles aarch64 in an x86_64 VM with CARGO_BUILD_TARGET set to
+# aarch64-unknown-freebsd (craft-common-actions#39): name the archive after the target.
+case "${CARGO_BUILD_TARGET:-}" in
+  "") ARCH="$(release_arch "$(uname -m)")" ;;
+  aarch64-unknown-freebsd | x86_64-unknown-freebsd) ARCH="$(release_arch "${CARGO_BUILD_TARGET%%-*}")" ;;
+  *) echo "CARGO_BUILD_TARGET=$CARGO_BUILD_TARGET is not a supported FreeBSD target" >&2; exit 2 ;;
 esac
-if [ "$DRY_RUN" = 0 ] && [ "$(uname -s)" != FreeBSD ]; then
+# Only binaries for this machine run here (the --version check at the end); a FreeBSD target built
+# on another OS never does.
+HOST_ARCH="$(release_arch "$(uname -m)" 2>/dev/null)" || HOST_ARCH="$(uname -m)"
+if [[ -n "${CARGO_BUILD_TARGET:-}" ]] && [[ "$(uname -s)" != FreeBSD ]]; then
+  HOST_ARCH="$(uname -s) $HOST_ARCH"
+fi
+if [[ "$DRY_RUN" = 0 ]] && [[ "$(uname -s)" != FreeBSD ]]; then
   echo "error: build on FreeBSD (or pass --dry-run to check the tree layout)" >&2
   exit 2
 fi
@@ -47,7 +63,7 @@ echo "==> FigCraft $VERSION for FreeBSD $ARCH"
 
 # The release VM has 12 GB; full parallelism on the biggest crates runs it out of memory.
 export CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-4}"
-if [ "$SKIP_BUILD" = 0 ]; then
+if [[ "$SKIP_BUILD" = 0 ]]; then
   (cd "$ROOT" && cargo build --release --locked "${CARGO_PKGS[@]}")
 fi
 WORK="$CARGO_TARGET_DIR/freebsd-package"
@@ -55,9 +71,10 @@ STAGE="$WORK/$BASENAME"
 rm -rf "$WORK"
 mkdir -p "$WORK"
 
-BIN="$CARGO_TARGET_DIR/release"
+# Cargo puts a cross build under target/<triple>/release.
+BIN="$CARGO_TARGET_DIR/${CARGO_BUILD_TARGET:+$CARGO_BUILD_TARGET/}release"
 OUT_DIR="$DIST"
-if [ "$DRY_RUN" = 1 ]; then
+if [[ "$DRY_RUN" = 1 ]]; then
   # Stub binaries, and the tarball stays in the work dir so dist/ only ever holds real builds.
   BIN="$WORK/stub-bin"
   OUT_DIR="$WORK"
@@ -86,12 +103,12 @@ sed -e "s/@VERSION@/$VERSION/g" -e "s/@DATE@/$FIGCRAFT_BUILD_DATE/g" \
   "$LINUX/$APP_ID.metainfo.xml.in" >"$STAGE/share/metainfo/$APP_ID.metainfo.xml"
 cp -R "$ROOT/assets/app-icon/hicolor" "$STAGE/share/icons/"
 copy_docs "$STAGE/share/doc/figcraft"
-if [ -f "$ROOT/ATTRIBUTION.md" ]; then install -m 644 "$ROOT/ATTRIBUTION.md" "$STAGE/share/doc/figcraft/"; fi
+if [[ -f "$ROOT/ATTRIBUTION.md" ]]; then install -m 644 "$ROOT/ATTRIBUTION.md" "$STAGE/share/doc/figcraft/"; fi
 
 for f in "${BINS[@]/#/bin/}" "share/applications/$APP_ID.desktop" \
   "share/icons/hicolor/256x256/apps/$APP_ID.png" \
   share/doc/figcraft/LICENSE-MIT share/doc/figcraft/LICENSE-APACHE; do
-  if [ ! -e "$STAGE/$f" ]; then echo "error: $f is missing from the package" >&2; exit 1; fi
+  if [[ ! -e "$STAGE/$f" ]]; then echo "error: $f is missing from the package" >&2; exit 1; fi
 done
 
 # ---- .tar.gz ------------------------------------------------------------------------------------
@@ -99,8 +116,21 @@ mkdir -p "$OUT_DIR"
 tar -C "$WORK" -czf "$OUT_DIR/$BASENAME.tar.gz" "$BASENAME"
 echo "wrote $OUT_DIR/$BASENAME.tar.gz"
 
-"$STAGE/bin/$(smoke_bin)" --version
-if [ "$DRY_RUN" = 1 ]; then
+if [[ "$DRY_RUN" = 1 ]] || [[ "$ARCH" = "$HOST_ARCH" ]]; then
+  "$STAGE/bin/$(smoke_bin)" --version
+else
+  # They cannot run here, so check what they are instead: executables, not libraries or objects.
+  # An older file(1) calls a PIE a shared object; its interpreter still marks it as a program.
+  want="$ARCH"; [[ "$ARCH" != x86_64 ]] || want=x86-64
+  for b in "$STAGE"/bin/*; do
+    case "$(file -b "$b")" in
+      ELF*" executable, "*"$want"*FreeBSD* | ELF*"$want"*FreeBSD*interpreter*) ;;
+      *) echo "error: $b is not a FreeBSD $ARCH executable: $(file -b "$b")" >&2; exit 1 ;;
+    esac
+  done
+  echo "skipping --version: an $ARCH binary does not run on this $HOST_ARCH machine"
+fi
+if [[ "$DRY_RUN" = 1 ]]; then
   echo "==> dry run: tarball contents"
   tar -tzvf "$OUT_DIR/$BASENAME.tar.gz"
 fi
diff --git a/packaging/linux/ai.storyteller.figcraft.desktop b/packaging/linux/ai.storyteller.figcraft.desktop
index 9c0adcf9..c739d6a4 100644
--- a/packaging/linux/ai.storyteller.figcraft.desktop
+++ b/packaging/linux/ai.storyteller.figcraft.desktop
@@ -11,4 +11,4 @@ StartupNotify=true
 StartupWMClass=ai.storyteller.figcraft
 Categories=Graphics;2DGraphics;VectorGraphics;X-Design;
 Keywords=design;interface;ui;ux;prototype;wireframe;mockup;vector;layout;components;
-MimeType=application/x-figcraft;image/svg+xml;image/png;image/jpeg;x-scheme-handler/figcraft;
+MimeType=application/x-figcraft;image/svg+xml;image/png;image/jpeg;application/x-sketch;x-scheme-handler/figcraft;
diff --git a/packaging/linux/ai.storyteller.figcraft.metainfo.xml.in b/packaging/linux/ai.storyteller.figcraft.metainfo.xml.in
index 2dc341a7..43618eb1 100644
--- a/packaging/linux/ai.storyteller.figcraft.metainfo.xml.in
+++ b/packaging/linux/ai.storyteller.figcraft.metainfo.xml.in
@@ -58,6 +58,7 @@
   <provides>
     <binary>figcraft</binary>
     <mediatype>application/x-figcraft</mediatype>
+    <mediatype>application/x-sketch</mediatype>
   </provides>
   <content_rating type="oars-1.1"/>
   <releases>
diff --git a/packaging/linux/ai.storyteller.figcraft.mime.xml b/packaging/linux/ai.storyteller.figcraft.mime.xml
index 7c18c9a8..b2190b21 100644
--- a/packaging/linux/ai.storyteller.figcraft.mime.xml
+++ b/packaging/linux/ai.storyteller.figcraft.mime.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- shared-mime-info definition for FigCraft's own document type (SVG, PNG and JPEG are already in
-     the system database). Installed to /usr/share/mime/packages/ (update-mime-database runs on
+<!-- shared-mime-info definitions for FigCraft's own document type and for Sketch files, which
+     FigCraft opens (SVG, PNG and JPEG are already in the system database). Installed to /usr/share/mime/packages/ (update-mime-database runs on
      install). -->
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
   <mime-type type="application/x-figcraft">
@@ -8,4 +8,10 @@
     <icon name="ai.storyteller.figcraft"/>
     <glob pattern="*.figcraft"/>
   </mime-type>
+  <!-- Sketch 48 and newer save a zip of JSON. -->
+  <mime-type type="application/x-sketch">
+    <comment>Sketch document</comment>
+    <sub-class-of type="application/zip"/>
+    <glob pattern="*.sketch"/>
+  </mime-type>
 </mime-info>
diff --git a/packaging/linux/apprun-test.sh b/packaging/linux/apprun-test.sh
index c6d98da0..75625480 100755
--- a/packaging/linux/apprun-test.sh
+++ b/packaging/linux/apprun-test.sh
@@ -37,10 +37,10 @@ fail() {
 
 # 1. Launch works and passes arguments through.
 out="$("$APPDIR/AppRun" open file.png)" || fail "AppRun exited non-zero"
-[ "$out" = "stub: open file.png" ] || fail "arguments not forwarded: $out"
+[[ "$out" = "stub: open file.png" ]] || fail "arguments not forwarded: $out"
 
 DESKTOP="$XDG_DATA_HOME/applications/$APP_ID.desktop"
-[ -f "$DESKTOP" ] || fail "desktop entry not installed"
+[[ -f "$DESKTOP" ]] || fail "desktop entry not installed"
 
 # 2. Exec rewritten to the AppImage (quoted, spaces intact), TryExec dropped,
 #    everything else preserved from the packaged entry.
@@ -55,15 +55,15 @@ fi
 
 # 3. Icons landed under the name the .desktop entry references.
 for f in "16x16/apps/$APP_ID.png" "256x256/apps/$APP_ID.png" "scalable/apps/$APP_ID.svg"; do
-  [ -f "$XDG_DATA_HOME/icons/hicolor/$f" ] || fail "icon missing: $f"
+  [[ -f "$XDG_DATA_HOME/icons/hicolor/$f" ]] || fail "icon missing: $f"
 done
 
 # 4. Idempotent: a second launch must not rewrite anything (inode unchanged).
 before="$(stat -c %i "$DESKTOP")"
 out="$("$APPDIR/AppRun")" || fail "second launch exited non-zero"
-[ "$out" = "stub: " ] || fail "second launch output: $out"
+[[ "$out" = "stub: " ]] || fail "second launch output: $out"
 after="$(stat -c %i "$DESKTOP")"
-[ "$before" = "$after" ] || fail "desktop entry rewritten although unchanged"
+[[ "$before" = "$after" ]] || fail "desktop entry rewritten although unchanged"
 
 # 5. Moving the AppImage refreshes Exec.
 mv "$APPIMAGE" "$TMP/moved.AppImage"
@@ -74,40 +74,40 @@ grep -Fxq "Exec=\"$(readlink -f "$APPIMAGE")\" %U" "$DESKTOP" || fail "Exec not
 # 6. Opt-out installs nothing.
 rm -rf "$XDG_DATA_HOME"
 FIGCRAFT_NO_DESKTOP_INTEGRATION=1 "$APPDIR/AppRun" >/dev/null || fail "opt-out launch exited non-zero"
-[ ! -e "$XDG_DATA_HOME" ] || fail "opt-out still integrated"
+[[ ! -e "$XDG_DATA_HOME" ]] || fail "opt-out still integrated"
 
 # 7. An unwritable data dir never blocks the launch.
 mkdir -p "$TMP/ro" && chmod a-w "$TMP/ro"
 out="$(XDG_DATA_HOME="$TMP/ro/data" "$APPDIR/AppRun" out.txt)" || fail "launch blocked by unwritable data dir"
-[ "$out" = "stub: out.txt" ] || fail "stub not run against unwritable data dir: $out"
+[[ "$out" = "stub: out.txt" ]] || fail "stub not run against unwritable data dir: $out"
 chmod u+w "$TMP/ro"
 
 # 8. No $APPIMAGE (extracted AppDir): launch only, nothing installed.
 rm -rf "$XDG_DATA_HOME"
 env -u APPIMAGE "$APPDIR/AppRun" >/dev/null || fail "extracted-AppDir launch exited non-zero"
-[ ! -e "$XDG_DATA_HOME" ] || fail "integrated without $APPIMAGE"
+[[ ! -e "$XDG_DATA_HOME" ]] || fail "integrated without $APPIMAGE"
 
 # 9. A path that would need Exec escaping (here a `$`): launch only, nothing installed.
 rm -rf "$XDG_DATA_HOME"
 odd="$TMP/odd\$(id).AppImage"
 : >"$odd"
 out="$(APPIMAGE="$odd" "$APPDIR/AppRun" x)" || fail "launch with an odd path exited non-zero"
-[ "$out" = "stub: x" ] || fail "odd path: $out"
-[ ! -e "$XDG_DATA_HOME" ] || fail "integrated an AppImage path that needs escaping"
+[[ "$out" = "stub: x" ]] || fail "odd path: $out"
+[[ ! -e "$XDG_DATA_HOME" ]] || fail "integrated an AppImage path that needs escaping"
 
 # 10. `cli <args>` runs figcraft-cli with the remaining arguments and integrates nothing.
 rm -rf "$XDG_DATA_HOME"
 out="$("$APPDIR/AppRun" cli mcp --attach 7979 2>&1)" && fail "cli ran without figcraft-cli in the AppDir"
-[ "$out" = "figcraft: this AppImage was built without figcraft-cli" ] || fail "missing cli: $out"
+[[ "$out" = "figcraft: this AppImage was built without figcraft-cli" ]] || fail "missing cli: $out"
 printf '#!/bin/sh\necho "cli stub: $*"\n' >"$APPDIR/usr/bin/figcraft-cli"
 chmod +x "$APPDIR/usr/bin/figcraft-cli"
 out="$("$APPDIR/AppRun" cli mcp --attach 7979)" || fail "cli launch exited non-zero"
-[ "$out" = "cli stub: mcp --attach 7979" ] || fail "cli arguments not forwarded: $out"
+[[ "$out" = "cli stub: mcp --attach 7979" ]] || fail "cli arguments not forwarded: $out"
 out="$("$APPDIR/AppRun" cli)" || fail "bare cli launch exited non-zero"
-[ "$out" = "cli stub: " ] || fail "bare cli output: $out"
-[ ! -e "$XDG_DATA_HOME" ] || fail "cli launch integrated the desktop"
+[[ "$out" = "cli stub: " ]] || fail "bare cli output: $out"
+[[ ! -e "$XDG_DATA_HOME" ]] || fail "cli launch integrated the desktop"
 # Only the first argument selects the CLI.
 out="$("$APPDIR/AppRun" file.figcraft cli)" || fail "app launch with a later cli argument exited non-zero"
-[ "$out" = "stub: file.figcraft cli" ] || fail "later cli argument hijacked the launch: $out"
+[[ "$out" = "stub: file.figcraft cli" ]] || fail "later cli argument hijacked the launch: $out"
 
 echo "AppRun desktop integration ok"
diff --git a/packaging/linux/flatpak-bundle.sh b/packaging/linux/flatpak-bundle.sh
index 127c3af9..b3353b38 100755
--- a/packaging/linux/flatpak-bundle.sh
+++ b/packaging/linux/flatpak-bundle.sh
@@ -22,7 +22,7 @@ FLATHUB=https://dl.flathub.org/repo/flathub.flatpakrepo
 
 TEST=1
 TARBALL=""
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --no-test) TEST=0; shift ;;
     -h | --help) sed -n '2,14p' "$0"; exit 0 ;;
@@ -39,7 +39,7 @@ case "$ARCH" in
 esac
 BASENAME="figcraft-$VERSION-linux-$ARCH"
 TARBALL="${TARBALL:-$DIST/$BASENAME.tar.gz}"
-[ -f "$TARBALL" ] || { echo "error: $TARBALL not found (run packaging/linux/package.sh --formats tar first)" >&2; exit 1; }
+[[ -f "$TARBALL" ]] || { echo "error: $TARBALL not found (run packaging/linux/package.sh --formats tar first)" >&2; exit 1; }
 for tool in flatpak flatpak-builder; do
   command -v "$tool" >/dev/null || { echo "error: $tool not found (apt install flatpak flatpak-builder librsvg2-common)" >&2; exit 1; }
 done
@@ -50,7 +50,7 @@ WORK="$CARGO_TARGET_DIR/flatpak-bundle"
 rm -rf "$WORK"
 mkdir -p "$WORK/stage"
 tar -xzf "$TARBALL" -C "$WORK/stage" --strip-components=1
-[ -x "$WORK/stage/bin/figcraft" ] || { echo "error: $TARBALL has no bin/figcraft" >&2; exit 1; }
+[[ -x "$WORK/stage/bin/figcraft" ]] || { echo "error: $TARBALL has no bin/figcraft" >&2; exit 1; }
 cp "$HERE/flatpak/$APP_ID.bundle.yml" "$WORK/$APP_ID.yml"
 
 flatpak remote-add --user --if-not-exists flathub "$FLATHUB"
@@ -63,10 +63,10 @@ OUT="$DIST/$BASENAME.flatpak"
 flatpak build-bundle --runtime-repo="$FLATHUB" "$WORK/repo" "$OUT" "$APP_ID" stable
 echo "wrote $OUT"
 
-if [ "$TEST" = 1 ]; then
+if [[ "$TEST" = 1 ]]; then
   flatpak install --user -y --noninteractive --reinstall "$OUT"
   flatpak info --user "$APP_ID"
-  if [ -x "$WORK/stage/bin/figcraft-cli" ]; then smoke=figcraft-cli; else smoke=figcraft; fi
+  if [[ -x "$WORK/stage/bin/figcraft-cli" ]]; then smoke=figcraft-cli; else smoke=figcraft; fi
   flatpak run --command="$smoke" "$APP_ID" --version
   flatpak run --command=sh "$APP_ID" -c 'ls /app/share/applications /app/share/metainfo /app/share/mime/packages /app/share/icons/hicolor/256x256/apps'
 fi
diff --git a/packaging/linux/flatpak/ai.storyteller.figcraft.yml b/packaging/linux/flatpak/ai.storyteller.figcraft.yml
index 03cb5fba..542f1ab7 100644
--- a/packaging/linux/flatpak/ai.storyteller.figcraft.yml
+++ b/packaging/linux/flatpak/ai.storyteller.figcraft.yml
@@ -53,6 +53,7 @@ modules:
     build-commands:
       - cargo --offline build --release --locked -p figcraft
       - install -Dm755 target/release/figcraft /app/bin/figcraft
+      - install -Dm644 NOTICE /app/share/doc/figcraft/NOTICE
       - install -Dm644 packaging/linux/ai.storyteller.figcraft.desktop /app/share/applications/ai.storyteller.figcraft.desktop
       - install -Dm644 packaging/linux/ai.storyteller.figcraft.mime.xml /app/share/mime/packages/ai.storyteller.figcraft.xml
       - mkdir -p /app/share/icons && cp -R assets/app-icon/hicolor /app/share/icons/
diff --git a/packaging/linux/package.sh b/packaging/linux/package.sh
index 20da2f76..21b2cb97 100755
--- a/packaging/linux/package.sh
+++ b/packaging/linux/package.sh
@@ -25,9 +25,15 @@ set -euo pipefail
 HERE="$ROOT/packaging/linux"
 APP_ID=ai.storyteller.figcraft
 
+verify_sha256() {
+  local expected="$1"
+  local file="$2"
+  printf '%s  %s\n' "$expected" "$file" | sha256sum -c -
+}
+
 SKIP_BUILD=0
 FORMATS="appimage deb rpm tar"
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --skip-build) SKIP_BUILD=1; shift ;;
     --formats) FORMATS="$2"; shift 2 ;;
@@ -48,7 +54,7 @@ BASENAME="figcraft-$VERSION-linux-$ARCH"
 
 echo "==> FigCraft $VERSION for Linux $ARCH ($FORMATS; ${BINS[*]})"
 
-if [ "$SKIP_BUILD" = 0 ]; then
+if [[ "$SKIP_BUILD" = 0 ]]; then
   (cd "$ROOT" && cargo build --release --locked "${CARGO_PKGS[@]}" ${CROSS_TARGET:+--target "$CROSS_TARGET"})
 fi
 BIN="$CARGO_TARGET_DIR/${CROSS_TARGET:+$CROSS_TARGET/}release"
@@ -78,7 +84,7 @@ if command -v appstreamcli >/dev/null; then
   appstreamcli validate --no-net --explain "$STAGE/usr/share/metainfo/$APP_ID.metainfo.xml"
 fi
 
-has() { case " $FORMATS " in *" $1 "*) return 0 ;; *) return 1 ;; esac; }
+has() { local format="$1"; case " $FORMATS " in *" $format "*) return 0 ;; *) return 1 ;; esac; }
 
 # ---- .tar.gz ------------------------------------------------------------------------------------
 if has tar; then
@@ -96,7 +102,7 @@ if has deb || has rpm; then
   # nfpm expands env vars in fields like `version` and `arch`, but not in `contents[].src`.
   # Without the CLI, drop its `#cli` lines.
   cli_filter='/#cli$/d'
-  [ "$HAS_CLI" = 1 ] && cli_filter='s/ #cli$//'
+  [[ "$HAS_CLI" = 1 ]] && cli_filter='s/ #cli$//'
   sed -e "s|\${STAGE}|$STAGE|g" -e "$cli_filter" "$HERE/nfpm.yaml" >"$WORK/nfpm.yaml"
   for fmt in deb rpm; do
     if has "$fmt"; then (cd "$ROOT" && nfpm package -f "$WORK/nfpm.yaml" -p "$fmt" -t "$DIST/$BASENAME.$fmt"); fi
@@ -105,9 +111,25 @@ fi
 
 # ---- AppImage -----------------------------------------------------------------------------------
 if has appimage; then
+  APPIMAGETOOL_VERSION=1.9.1
+  case "$ARCH" in
+    x86_64) APPIMAGETOOL_SHA256=ed4ce84f0d9caff66f50bcca6ff6f35aae54ce8135408b3fa33abfc3cb384eb0 ;;
+    aarch64) APPIMAGETOOL_SHA256=f0837e7448a0c1e4e650a93bb3e85802546e60654ef287576f46c71c126a9158 ;;
+    *) APPIMAGETOOL_SHA256='' ;;
+  esac
+  # appimagetool otherwise fetches the unpinned type2-runtime `continuous` build and embeds it.
+  APPIMAGE_RUNTIME_VERSION=20251108
+  case "$ARCH" in
+    x86_64) APPIMAGE_RUNTIME_SHA256=2fca8b443c92510f1483a883f60061ad09b46b978b2631c807cd873a47ec260d ;;
+    aarch64) APPIMAGE_RUNTIME_SHA256=00cbdfcf917cc6c0ff6d3347d59e0ca1f7f45a6df1a428a0d6d8a78664d87444 ;;
+    *) APPIMAGE_RUNTIME_SHA256='' ;;
+  esac
+  if [[ -z "$APPIMAGE_RUNTIME_SHA256" ]]; then
+    echo "no pinned AppImage runtime for $ARCH; build the AppImage on x86_64 or aarch64" >&2
+    exit 2
+  fi
   APPDIR="$WORK/FigCraft.AppDir"
   cp -R "$STAGE" "$APPDIR"
-  mv "$APPDIR/usr/share/doc" "$WORK/doc-unused"
   # AppRun is a script, not a symlink: it installs the .desktop entry and icons into
   # $XDG_DATA_HOME before launching, so Wayland compositors can resolve the window's
   # app_id to our icon instead of the generic Wayland logo (opt-out env in the
@@ -118,18 +140,37 @@ if has appimage; then
   ln -s "$APP_ID.png" "$APPDIR/.DirIcon"
 
   TOOL="${APPIMAGETOOL:-$(command -v appimagetool || true)}"
-  if [ -z "$TOOL" ]; then
-    TOOL="$CARGO_TARGET_DIR/appimagetool-$ARCH.AppImage"
-    if [ ! -x "$TOOL" ]; then
-      curl -fsSL -o "$TOOL" "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$ARCH.AppImage"
-      chmod +x "$TOOL"
+  if [[ -z "$TOOL" ]]; then
+    if [[ -z "$APPIMAGETOOL_SHA256" ]]; then
+      echo "no pinned appimagetool for $ARCH; set APPIMAGETOOL or put appimagetool on PATH" >&2
+      exit 2
     fi
+    TOOL="$CARGO_TARGET_DIR/appimagetool-$APPIMAGETOOL_VERSION-$ARCH.AppImage"
+    if [[ ! -x "$TOOL" ]]; then
+      download="$TOOL.download"
+      curl --proto '=https' -fsSL -o "$download" \
+        "https://github.com/AppImage/appimagetool/releases/download/$APPIMAGETOOL_VERSION/appimagetool-$ARCH.AppImage"
+      verify_sha256 "$APPIMAGETOOL_SHA256" "$download"
+      chmod 755 "$download"
+      mv "$download" "$TOOL"
+    fi
+    verify_sha256 "$APPIMAGETOOL_SHA256" "$TOOL"
   fi
+  RUNTIME="$CARGO_TARGET_DIR/appimage-runtime-$APPIMAGE_RUNTIME_VERSION-$ARCH"
+  if [[ ! -f "$RUNTIME" ]]; then
+    download="$RUNTIME.download"
+    curl --proto '=https' -fsSL -o "$download" \
+      "https://github.com/AppImage/type2-runtime/releases/download/$APPIMAGE_RUNTIME_VERSION/runtime-$ARCH"
+    verify_sha256 "$APPIMAGE_RUNTIME_SHA256" "$download"
+    mv "$download" "$RUNTIME"
+  fi
+  verify_sha256 "$APPIMAGE_RUNTIME_SHA256" "$RUNTIME"
   # Absolute, because appimagetool runs in $DIST below (CARGO_TARGET_DIR or APPIMAGETOOL may be
   # relative, e.g. target/agent-<name>).
   OUT="$(cd "$DIST" && pwd)/$BASENAME.AppImage"
   APPDIR="$(cd "$APPDIR" && pwd)"
   TOOL="$(cd "$(dirname "$TOOL")" && pwd)/$(basename "$TOOL")"
+  RUNTIME="$(cd "$(dirname "$RUNTIME")" && pwd)/$(basename "$RUNTIME")"
   # A .zsync left by an earlier run would hide a missing zsyncmake and describe another file.
   rm -f "$OUT.zsync"
   # Update information: AppImageUpdate, AppImageLauncher and the like read it from the
@@ -141,18 +182,18 @@ if has appimage; then
   # Extract-and-run: works without FUSE (containers, CI). The output embeds the static runtime,
   # so users don't need libfuse2 either. With zsyncmake on the host (CI installs the zsync
   # package) appimagetool also writes the .zsync, into its working directory, hence the cd.
-  (cd "$DIST" && ARCH="$ARCH" APPIMAGE_EXTRACT_AND_RUN=1 "$TOOL" --no-appstream -u "$UPDATE_INFO" "$APPDIR" "$OUT")
+  (cd "$DIST" && ARCH="$ARCH" APPIMAGE_EXTRACT_AND_RUN=1 "$TOOL" --no-appstream --runtime-file "$RUNTIME" -u "$UPDATE_INFO" "$APPDIR" "$OUT")
   echo "wrote $OUT"
-  if [ -s "$OUT.zsync" ]; then
+  if [[ -s "$OUT.zsync" ]]; then
     echo "wrote $OUT.zsync"
   else
     warn "zsyncmake not found, so $OUT.zsync was not written; AppImage delta updates need it"
   fi
 fi
 
-if [ -z "${CROSS_TARGET:-}" ]; then
+if [[ -z "${CROSS_TARGET:-}" ]]; then
   "$STAGE/usr/bin/$(smoke_bin)" --version
-elif [ -n "${EMULATOR:-}" ]; then
+elif [[ -n "${EMULATOR:-}" ]]; then
   "$EMULATOR" "$STAGE/usr/bin/$(smoke_bin)" --version
 fi
 echo "==> done"
diff --git a/packaging/macos/Info.plist.in b/packaging/macos/Info.plist.in
index bbcec20f..fc068173 100644
--- a/packaging/macos/Info.plist.in
+++ b/packaging/macos/Info.plist.in
@@ -70,6 +70,28 @@
     </dict>
   </array>
 
+  <!-- Other apps' formats FigCraft opens, declared by their public type identifiers so Open With
+       knows them on a Mac without that app installed. -->
+  <key>UTImportedTypeDeclarations</key>
+  <array>
+    <dict>
+      <key>UTTypeIdentifier</key>
+      <string>com.bohemiancoding.sketch.drawing.single</string>
+      <key>UTTypeDescription</key>
+      <string>Sketch Document</string>
+      <key>UTTypeConformsTo</key>
+      <array>
+        <string>public.data</string>
+        <string>public.content</string>
+      </array>
+      <key>UTTypeTagSpecification</key>
+      <dict>
+        <key>public.filename-extension</key>
+        <array><string>sketch</string></array>
+      </dict>
+    </dict>
+  </array>
+
   <!-- figcraft://join?... live session invite links open FigCraft. -->
   <key>CFBundleURLTypes</key>
   <array>
@@ -108,6 +130,16 @@
       <key>LSItemContentTypes</key>
       <array><string>public.svg-image</string></array>
     </dict>
+    <dict>
+      <key>CFBundleTypeName</key>
+      <string>Sketch Document</string>
+      <key>CFBundleTypeRole</key>
+      <string>Viewer</string>
+      <key>LSHandlerRank</key>
+      <string>Alternate</string>
+      <key>LSItemContentTypes</key>
+      <array><string>com.bohemiancoding.sketch.drawing.single</string></array>
+    </dict>
     <dict>
       <key>CFBundleTypeName</key>
       <string>Image</string>
diff --git a/packaging/macos/import-cert.sh b/packaging/macos/import-cert.sh
index 1150163e..978874d3 100755
--- a/packaging/macos/import-cert.sh
+++ b/packaging/macos/import-cert.sh
@@ -12,17 +12,20 @@ umask 077
 # shellcheck source=../env.sh
 . "$(dirname "${BASH_SOURCE[0]}")/../env.sh"
 
-if [ -z "${APPLE_CERTIFICATE:-}" ]; then
+if [[ -z "${APPLE_CERTIFICATE:-}" ]]; then
   warn "APPLE_CERTIFICATE is not set: macOS builds will be ad-hoc signed and not notarized"
   exit 0
 fi
 
-TMP="${RUNNER_TEMP:-${TMPDIR:-/tmp}}"
+TMP_BASE="${RUNNER_TEMP:-${TMPDIR:-/tmp}}"
+TMP="$(mktemp -d "${TMP_BASE}/figcraft-signing.XXXXXX")"
+# Remove only the decoded certificate: the keychain lives in the same directory and codesign
+# needs it until the workflow's "Remove temporary keychain" step deletes it.
+trap 'rm -f "${CERT:-}"' EXIT
 KEYCHAIN="$TMP/figcraft-signing.keychain-db"
 CERT="$TMP/figcraft-signing.p12"
 KC_PASS="${KEYCHAIN_PASSWORD:-$(openssl rand -hex 24)}"
 
-trap 'rm -f "$CERT"' EXIT
 printf '%s' "$APPLE_CERTIFICATE" | base64 --decode >"$CERT"
 security create-keychain -p "$KC_PASS" "$KEYCHAIN"
 security set-keychain-settings -lut 21600 "$KEYCHAIN"
@@ -36,13 +39,13 @@ security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KC_PASS"
 security list-keychains -d user -s "$KEYCHAIN" $(security list-keychains -d user | tr -d '"')
 
 IDENTITY="$(security find-identity -v -p codesigning "$KEYCHAIN" | awk '/Developer ID Application/ { print $2; exit }')"
-if [ -z "$IDENTITY" ]; then
+if [[ -z "$IDENTITY" ]]; then
   security find-identity -v -p codesigning "$KEYCHAIN" >&2
   echo "error: no 'Developer ID Application' identity in APPLE_CERTIFICATE" >&2
   exit 1
 fi
 echo "Imported signing identity $IDENTITY"
-if [ -n "${GITHUB_ENV:-}" ]; then
+if [[ -n "${GITHUB_ENV:-}" ]]; then
   { echo "MACOS_SIGN_IDENTITY=$IDENTITY"; echo "MACOS_KEYCHAIN=$KEYCHAIN"; } >>"$GITHUB_ENV"
 else
   echo "MACOS_SIGN_IDENTITY=$IDENTITY"
diff --git a/packaging/macos/package.sh b/packaging/macos/package.sh
index 87abe94c..5da527d1 100755
--- a/packaging/macos/package.sh
+++ b/packaging/macos/package.sh
@@ -19,7 +19,7 @@ HERE="$ROOT/packaging/macos"
 
 ARCH=universal
 SKIP_BUILD=0
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --arch) ARCH="$2"; shift 2 ;;
     --skip-build) SKIP_BUILD=1; shift ;;
@@ -44,9 +44,9 @@ DMG="$DIST/figcraft-$VERSION-macos-$ARCH.dmg"
 CLI_ZIP="$DIST/figcraft-cli-$VERSION-macos-$ARCH.zip"
 
 NOTARIZE=0
-if [ "$IDENTITY" = "-" ]; then
+if [[ "$IDENTITY" = "-" ]]; then
   warn "macOS: ad-hoc signing (no MACOS_SIGN_IDENTITY); artifacts are not notarized"
-elif [ -n "${APPLE_ID:-}" ] && [ -n "${APPLE_PASSWORD:-}" ] && [ -n "${APPLE_TEAM_ID:-}" ]; then
+elif [[ -n "${APPLE_ID:-}" ]] && [[ -n "${APPLE_PASSWORD:-}" ]] && [[ -n "${APPLE_TEAM_ID:-}" ]]; then
   NOTARIZE=1
 else
   warn "macOS: APPLE_ID / APPLE_PASSWORD / APPLE_TEAM_ID incomplete; signed but not notarized"
@@ -55,7 +55,7 @@ fi
 echo "==> FigCraft $VERSION for macOS ($ARCH; ${BINS[*]}), identity: $IDENTITY, notarize: $NOTARIZE"
 
 # ---- build -------------------------------------------------------------------------------------
-if [ "$SKIP_BUILD" = 0 ]; then
+if [[ "$SKIP_BUILD" = 0 ]]; then
   args=()
   for t in "${TARGETS[@]}"; do args+=(--target "$t"); done
   (cd "$ROOT" && cargo build --release --locked "${CARGO_PKGS[@]}" "${args[@]}")
@@ -74,9 +74,9 @@ done
 sign() {
   # Hardened runtime + secure timestamp for a real identity; ad-hoc can't be timestamped.
   local ts=(--timestamp)
-  [ "$IDENTITY" = "-" ] && ts=(--timestamp=none)
+  [[ "$IDENTITY" = "-" ]] && ts=(--timestamp=none)
   local kc=()
-  [ -n "${MACOS_KEYCHAIN:-}" ] && kc=(--keychain "$MACOS_KEYCHAIN")
+  [[ -n "${MACOS_KEYCHAIN:-}" ]] && kc=(--keychain "$MACOS_KEYCHAIN")
   codesign --force --sign "$IDENTITY" ${kc[@]+"${kc[@]}"} "${ts[@]}" "$@"
 }
 
@@ -88,8 +88,8 @@ notarize() {
   echo "$out"
   id="$(printf '%s' "$out" | plutil -extract id raw -o - - 2>/dev/null || true)"
   status="$(printf '%s' "$out" | plutil -extract status raw -o - - 2>/dev/null || true)"
-  if [ "$status" != "Accepted" ]; then
-    if [ -n "$id" ]; then
+  if [[ "$status" != "Accepted" ]]; then
+    if [[ -n "$id" ]]; then
       xcrun notarytool log "$id" --apple-id "$APPLE_ID" --password "$APPLE_PASSWORD" --team-id "$APPLE_TEAM_ID" || true
     fi
     echo "error: notarization of $(basename "$file") failed (status: ${status:-unknown})" >&2
@@ -115,8 +115,9 @@ mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources"
 # Executable and icon carry the display name (CFBundleExecutable / CFBundleIconFile).
 cp "$WORK/bin/figcraft" "$APP/Contents/MacOS/FigCraft"
 cp "$WORK/FigCraft.icns" "$APP/Contents/Resources/FigCraft.icns"
+cp "$ROOT/NOTICE" "$APP/Contents/Resources/"
 # Licences of the embedded craft-fonts fonts (only when built with CRAFT_FONTS_DIR).
-if [ -n "${CRAFT_FONTS_DIR:-}" ]; then
+if [[ -n "${CRAFT_FONTS_DIR:-}" ]]; then
   mkdir -p "$APP/Contents/Resources/Licenses"
   copy_font_licences "$APP/Contents/Resources/Licenses"
 fi
@@ -132,7 +133,7 @@ sign --options runtime --entitlements "$HERE/entitlements.plist" "$APP/Contents/
 sign --options runtime --entitlements "$HERE/entitlements.plist" "$APP"
 codesign --verify --strict --deep --verbose=2 "$APP"
 
-if [ "$NOTARIZE" = 1 ]; then
+if [[ "$NOTARIZE" = 1 ]]; then
   ditto -c -k --keepParent "$APP" "$WORK/FigCraft-notarize.zip"
   notarize "$WORK/FigCraft-notarize.zip"
   retry xcrun stapler staple "$APP"
@@ -154,7 +155,7 @@ hdiutil convert "$WORK/raw.dmg" -format UDZO -imagekey zlib-level=9 -o "$DMG"
 rm -f "$WORK/raw.dmg"
 sign "$DMG"
 codesign --verify --strict --verbose=2 "$DMG"
-if [ "$NOTARIZE" = 1 ]; then
+if [[ "$NOTARIZE" = 1 ]]; then
   notarize "$DMG"
   retry xcrun stapler staple "$DMG"
   retry xcrun stapler validate "$DMG"
@@ -162,7 +163,7 @@ if [ "$NOTARIZE" = 1 ]; then
 fi
 
 # ---- CLI ---------------------------------------------------------------------------------------
-if [ "$HAS_CLI" = 1 ]; then
+if [[ "$HAS_CLI" = 1 ]]; then
   echo "==> building $CLI_ZIP"
   CLI_DIR="$WORK/figcraft-cli-$VERSION-macos-$ARCH"
   mkdir -p "$CLI_DIR"
@@ -176,7 +177,7 @@ if [ "$HAS_CLI" = 1 ]; then
   ditto -c -k --keepParent "$CLI_DIR" "$CLI_ZIP"
   # notarytool accepts a zip of the bare binary. A bare Mach-O can't carry a stapled ticket, so
   # Gatekeeper looks the notarization up online when a quarantined copy first runs.
-  if [ "$NOTARIZE" = 1 ]; then notarize "$CLI_ZIP"; fi
+  if [[ "$NOTARIZE" = 1 ]]; then notarize "$CLI_ZIP"; fi
   "$WORK/bin/figcraft-cli" --version
 else
   warn "apps/figcraft-cli is not in this workspace: no CLI zip"
diff --git a/packaging/macos/verify.sh b/packaging/macos/verify.sh
index 6080cf87..071629cb 100755
--- a/packaging/macos/verify.sh
+++ b/packaging/macos/verify.sh
@@ -23,7 +23,7 @@ set -euo pipefail
 . "$(dirname "${BASH_SOURCE[0]}")/../env.sh"
 
 ARCH=universal
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --arch) ARCH="$2"; shift 2 ;;
     -h | --help) sed -n '2,20p' "$0"; exit 0 ;;
@@ -41,13 +41,13 @@ DMG="$DIST/figcraft-$VERSION-macos-$ARCH.dmg"
 CLI_ZIP="$DIST/figcraft-cli-$VERSION-macos-$ARCH.zip"
 IDENTITY="${MACOS_SIGN_IDENTITY:--}"
 STRICT=0
-if [ "$IDENTITY" != "-" ] && [ -n "${APPLE_ID:-}" ] && [ -n "${APPLE_PASSWORD:-}" ] && [ -n "${APPLE_TEAM_ID:-}" ]; then
+if [[ "$IDENTITY" != "-" ]] && [[ -n "${APPLE_ID:-}" ]] && [[ -n "${APPLE_PASSWORD:-}" ]] && [[ -n "${APPLE_TEAM_ID:-}" ]]; then
   STRICT=1
 fi
 
 FAILED=0
 fail() {
-  if [ "$STRICT" = 1 ]; then
+  if [[ "$STRICT" = 1 ]]; then
     echo "error: $*" >&2
     FAILED=1
   else
@@ -58,22 +58,22 @@ fail() {
 # spctl's online ticket lookup can lag a few seconds behind notarytool's "Accepted".
 assess() {
   local out attempt tries=1
-  [ "$STRICT" = 1 ] && tries=5
+  [[ "$STRICT" = 1 ]] && tries=5
   for attempt in $(seq "$tries"); do
     if out="$(spctl "$@" 2>&1)"; then
       printf '%s\n' "$out"
       return 0
     fi
-    [ "$attempt" = "$tries" ] || sleep 10
+    [[ "$attempt" = "$tries" ]] || sleep 10
   done
   printf '%s\n' "$out"
   return 1
 }
 
 FILES=("$DMG")
-if [ "$HAS_CLI" = 1 ]; then FILES+=("$CLI_ZIP"); fi
+if [[ "$HAS_CLI" = 1 ]]; then FILES+=("$CLI_ZIP"); fi
 for f in "${FILES[@]}"; do
-  if [ ! -f "$f" ]; then
+  if [[ ! -f "$f" ]]; then
     echo "error: missing $f" >&2
     exit 1
   fi
@@ -83,11 +83,11 @@ WORK="$(mktemp -d "${RUNNER_TEMP:-${TMPDIR:-/tmp}}/figcraft-verify.XXXXXX")"
 trap 'rm -rf "$WORK"' EXIT
 
 # ---- CLI zip (when apps/figcraft-cli exists) ----------------------------------------------------
-if [ "$HAS_CLI" = 1 ]; then
+if [[ "$HAS_CLI" = 1 ]]; then
   echo "==> $(basename "$CLI_ZIP")"
   ditto -x -k "$CLI_ZIP" "$WORK/cli"
   CLI="$WORK/cli/figcraft-cli-$VERSION-macos-$ARCH/figcraft-cli"
-  if [ ! -x "$CLI" ]; then
+  if [[ ! -x "$CLI" ]]; then
     echo "error: $(basename "$CLI_ZIP") has no executable figcraft-cli-$VERSION-macos-$ARCH/figcraft-cli" >&2
     exit 1
   fi
@@ -111,7 +111,7 @@ if [ "$HAS_CLI" = 1 ]; then
     || fail "figcraft-cli is not signed with a Developer ID Application identity"
   printf '%s\n' "$details" | grep -q '^Timestamp=' \
     || fail "figcraft-cli signature has no secure timestamp"
-  if [ -n "${APPLE_TEAM_ID:-}" ]; then
+  if [[ -n "${APPLE_TEAM_ID:-}" ]]; then
     printf '%s\n' "$details" | grep -qx "TeamIdentifier=$APPLE_TEAM_ID" \
       || fail "figcraft-cli is signed by a different team"
   fi
@@ -129,25 +129,25 @@ fi
 # ---- DMG ---------------------------------------------------------------------------------------
 echo "==> $(basename "$DMG")"
 codesign --verify --strict --verbose=2 "$DMG"
-if [ "$STRICT" = 1 ]; then
+if [[ "$STRICT" = 1 ]]; then
   retry xcrun stapler validate "$DMG" || fail "no notarization ticket stapled to the DMG"
   assess --assess --type open --context context:primary-signature -vv "$DMG" \
     || fail "Gatekeeper rejects the DMG"
 fi
 
-if [ "$FAILED" != 0 ]; then
+if [[ "$FAILED" != 0 ]]; then
   echo "error: macOS artifacts failed verification" >&2
   exit 1
 fi
 
-if [ "$STRICT" = 1 ]; then
+if [[ "$STRICT" = 1 ]]; then
   result="signed (Developer ID, hardened runtime), notarized; DMG stapled"
 else
   result="signature intact; Developer ID and notarization not required (no signing secrets)"
 fi
 echo "==> verified: $result"
-if [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
+if [[ -n "${GITHUB_STEP_SUMMARY:-}" ]]; then
   names="\`$(basename "$DMG")\`"
-  if [ "$HAS_CLI" = 1 ]; then names="$names, \`$(basename "$CLI_ZIP")\`"; fi
+  if [[ "$HAS_CLI" = 1 ]]; then names="$names, \`$(basename "$CLI_ZIP")\`"; fi
   echo "- macOS $names: $result" >>"$GITHUB_STEP_SUMMARY"
 fi
diff --git a/packaging/server/install-test.sh b/packaging/server/install-test.sh
index 303d08de..2ebe5176 100755
--- a/packaging/server/install-test.sh
+++ b/packaging/server/install-test.sh
@@ -10,7 +10,7 @@ WORK="$(mktemp -d)"
 trap 'rm -rf "$WORK"' EXIT
 FAILED=0
 
-main() { bash "$HERE/install.sh" --caddy-main "$1" ops@example.com; }
+main() { local caddyfile="$1"; bash "$HERE/install.sh" --caddy-main "$caddyfile" ops@example.com; }
 fail() { printf 'FAIL: %s\n' "$*" >&2; FAILED=1; }
 
 # Missing: ours.
@@ -28,7 +28,7 @@ printf 'shop.example.com {\n\treverse_proxy 127.0.0.1:8080\n}\n' >"$WORK/theirs"
 cp "$WORK/theirs" "$WORK/run1"
 main "$WORK/run1" >"$WORK/run2"
 grep -q 'shop.example.com' "$WORK/run2" || fail "the operator's site is kept"
-[ "$(grep -c 'import figcraft-server.caddy' "$WORK/run2")" = 1 ] || fail "one import line is added"
+[[ "$(grep -c 'import figcraft-server.caddy' "$WORK/run2")" = 1 ]] || fail "one import line is added"
 main "$WORK/run2" >"$WORK/run3"
 cmp -s "$WORK/run2" "$WORK/run3" || fail "running again leaves a Caddyfile with other sites as it is"
 main "$WORK/run3" >"$WORK/run4"
@@ -39,5 +39,5 @@ main "$WORK/none" >"$WORK/ours1"
 main "$WORK/ours1" >"$WORK/ours2"
 cmp -s "$WORK/ours1" "$WORK/ours2" || fail "our own Caddyfile stays the same"
 
-if [ "$FAILED" = 0 ]; then echo "install.sh Caddyfile handling: ok"; fi
+if [[ "$FAILED" = 0 ]]; then echo "install.sh Caddyfile handling: ok"; fi
 exit "$FAILED"
diff --git a/packaging/server/install.sh b/packaging/server/install.sh
index 11c489a3..94acd578 100755
--- a/packaging/server/install.sh
+++ b/packaging/server/install.sh
@@ -41,7 +41,7 @@ SERVICE=figcraft-server
 HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # The source tree this script sits in (packaging/server/ of a copy or checkout), if any.
 LOCAL_SRC=""
-if [ -f "$HERE/../../Cargo.toml" ] && [ -d "$HERE/../../apps/figcraft-server" ]; then
+if [[ -f "$HERE/../../Cargo.toml" ]] && [[ -d "$HERE/../../apps/figcraft-server" ]]; then
   LOCAL_SRC="$(cd "$HERE/../.." && pwd)"
 fi
 
@@ -64,9 +64,9 @@ MARK="# figcraft-server (install.sh)"
 
 caddy_main() { # caddy_main FILE EMAIL: the main Caddyfile to install, on stdout
   local file="$1" email="$2"
-  if [ -f "$file" ] && grep -qE '^[[:space:]]*import[[:space:]]+figcraft-server\.caddy[[:space:]]*$' "$file"; then
+  if [[ -f "$file" ]] && grep -qE '^[[:space:]]*import[[:space:]]+figcraft-server\.caddy[[:space:]]*$' "$file"; then
     cat "$file" # it imports our site already: kept exactly as it is
-  elif [ ! -f "$file" ] || ! grep -qvE '^[[:space:]]*(#|$|:80|\{|\}|root|file_server)' "$file"; then
+  elif [[ ! -f "$file" ]] || ! grep -qvE '^[[:space:]]*(#|$|:80|\{|\}|root|file_server)' "$file"; then
     # Missing, or only the example site the package ships: ours, with the certificate email.
     printf '%s\n{\n\temail %s\n}\n\nimport figcraft-server.caddy\n' "$MARK" "$email"
   else
@@ -76,7 +76,7 @@ caddy_main() { # caddy_main FILE EMAIL: the main Caddyfile to install, on stdout
   fi
 }
 
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     # For tests (packaging/server/install-test.sh): print the Caddyfile this script would write.
     --caddy-main) caddy_main "${2:-}" "${3:-}"; exit 0 ;;
@@ -95,7 +95,7 @@ while [ $# -gt 0 ]; do
   esac
 done
 
-[ "$(id -u)" -eq 0 ] || die "run it as root (sudo ./install.sh ...)"
+[[ "$(id -u)" -eq 0 ]] || die "run it as root (sudo ./install.sh ...)"
 # shellcheck source=/dev/null
 . /etc/os-release
 case " ${ID:-} ${ID_LIKE:-} " in
@@ -104,9 +104,9 @@ case " ${ID:-} ${ID_LIKE:-} " in
 esac
 
 ask() { # ask VAR "question" FLAG: read an answer from the terminal when the value wasn't given
-  local var="$1" question="$2" answer
-  if [ -z "${!var}" ]; then
-    [ -t 0 ] || die "give $3 (no terminal to ask on)"
+  local var="$1" question="$2" flag="$3" answer
+  if [[ -z "${!var}" ]]; then
+    [[ -t 0 ]] || die "give $flag (no terminal to ask on)"
     read -r -p "$question " answer
     printf -v "$var" '%s' "$answer"
   fi
@@ -115,6 +115,7 @@ ask HOST "DNS name people will use (e.g. figcraft.example.com):" "--host"
 ask EMAIL "Email for Let's Encrypt and the abuse contact shown to users:" "--email"
 case "$HOST" in
   "" | *[!A-Za-z0-9.-]* | .* | *. ) die "--host must be a DNS name like figcraft.example.com" ;;
+  *) ;;
 esac
 case "$EMAIL" in
   *@*.*) ;;
@@ -126,6 +127,7 @@ case "$TERMS" in
 esac
 case "$EMAIL$TERMS" in
   *[[:space:]\"\\]*) die "--email and --terms can't contain spaces, quotes or backslashes" ;;
+  *) ;;
 esac
 
 export DEBIAN_FRONTEND=noninteractive
@@ -138,6 +140,7 @@ ARCH="$(uname -m)"
 case "$ARCH" in
   amd64) ARCH=x86_64 ;;
   arm64) ARCH=aarch64 ;;
+  *) ;; # already a release name (x86_64, aarch64)
 esac
 
 # --- The binary -----------------------------------------------------------------------------
@@ -146,17 +149,17 @@ FILES="$HERE" # where the units and the Caddyfile come from
 
 from_release() { # download and check the release archive; sets NEW_BIN and FILES
   local version="$VERSION" name dir
-  if [ -z "$version" ]; then
-    version="$(curl -fsSL "https://api.github.com/repos/$REPO/releases/latest" | sed -n 's/.*"tag_name": *"v\([^"]*\)".*/\1/p' | head -n 1)" || return 1
-    [ -n "$version" ] || return 1
+  if [[ -z "$version" ]]; then
+    version="$(curl --proto '=https' -fsSL "https://api.github.com/repos/$REPO/releases/latest" | sed -n 's/.*"tag_name": *"v\([^"]*\)".*/\1/p' | head -n 1)" || return 1
+    [[ -n "$version" ]] || return 1
   fi
   name="figcraft-server-$version-linux-$ARCH"
   dir="$WORK/release"
   rm -rf "$dir"
   mkdir -p "$dir"
   say "Downloading $name"
-  curl -fsSL -o "$dir/$name.tar.gz" "https://github.com/$REPO/releases/download/v$version/$name.tar.gz" || return 1
-  curl -fsSL -o "$dir/SHA256SUMS.txt" "https://github.com/$REPO/releases/download/v$version/SHA256SUMS.txt" || return 1
+  curl --proto '=https' -fsSL -o "$dir/$name.tar.gz" "https://github.com/$REPO/releases/download/v$version/$name.tar.gz" || return 1
+  curl --proto '=https' -fsSL -o "$dir/SHA256SUMS.txt" "https://github.com/$REPO/releases/download/v$version/SHA256SUMS.txt" || return 1
   (cd "$dir" && grep " $name.tar.gz\$" SHA256SUMS.txt | sha256sum -c --quiet -) || die "the download doesn't match SHA256SUMS.txt"
   tar -C "$dir" -xzf "$dir/$name.tar.gz"
   NEW_BIN="$dir/$name/figcraft-server"
@@ -165,7 +168,7 @@ from_release() { # download and check the release archive; sets NEW_BIN and FILE
 
 SWAP=""
 cleanup() {
-  if [ -n "$SWAP" ]; then
+  if [[ -n "$SWAP" ]]; then
     swapoff "$SWAP" 2>/dev/null || true
     rm -f "$SWAP"
   fi
@@ -174,7 +177,7 @@ trap cleanup EXIT
 
 as_builder() { # run a command as the unprivileged build user, with its own toolchain
   local jobs=()
-  if [ -n "${CARGO_BUILD_JOBS:-}" ]; then jobs=("CARGO_BUILD_JOBS=$CARGO_BUILD_JOBS"); fi
+  if [[ -n "${CARGO_BUILD_JOBS:-}" ]]; then jobs=("CARGO_BUILD_JOBS=$CARGO_BUILD_JOBS"); fi
   runuser -u "$BUILDER" -- env HOME="$BUILD" RUSTUP_HOME="$BUILD/rustup" CARGO_HOME="$BUILD/cargo" \
     CARGO_TARGET_DIR="$BUILD/target" "${jobs[@]}" "$@"
 }
@@ -184,27 +187,27 @@ from_source() { # build the source tree around this script, else a fresh clone;
   apt-get install -y -qq build-essential git pkg-config >/dev/null
   id -u "$BUILDER" >/dev/null 2>&1 || useradd --system --home-dir "$BUILD" --shell /usr/sbin/nologin "$BUILDER"
   install -d -o "$BUILDER" -g "$BUILDER" -m 755 "$BUILD"
-  if [ ! -x "$BUILD/cargo/bin/cargo" ]; then
+  if [[ ! -x "$BUILD/cargo/bin/cargo" ]]; then
     as_builder sh -c "curl --proto '=https' --tlsv1.2 -fsSL https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable --no-modify-path" >/dev/null
   else
     as_builder "$BUILD/cargo/bin/rustup" update stable >/dev/null
   fi
   # The source root installs files from is root's own (the copy beside this script, or root's
   # clone); the build user only ever builds a copy of it.
-  if [ -n "$LOCAL_SRC" ]; then
+  if [[ -n "$LOCAL_SRC" ]]; then
     src="$LOCAL_SRC"
     say "Building the source in $LOCAL_SRC: this takes a while"
   else
     src="$WORK/src"
-    if [ -d "$src/.git" ]; then
+    if [[ -d "$src/.git" ]]; then
       git -C "$src" fetch --quiet --tags origin
     else
       git clone --quiet "https://github.com/$REPO" "$src" ||
         die "can't clone $REPO (a private repository: copy the source to this machine and run its packaging/server/install.sh)"
     fi
-    if [ -z "$ref" ]; then
-      if [ -n "$VERSION" ]; then ref="v$VERSION"; else ref="$(git -C "$src" tag --list 'v*' --sort=-v:refname | head -n 1)"; fi
-      [ -n "$ref" ] || ref=main
+    if [[ -z "$ref" ]]; then
+      if [[ -n "$VERSION" ]]; then ref="v$VERSION"; else ref="$(git -C "$src" tag --list 'v*' --sort=-v:refname | head -n 1)"; fi
+      [[ -n "$ref" ]] || ref=main
     fi
     say "Building $ref from a clone: this takes a while"
     # A branch as it is upstream now, or a tag.
@@ -216,7 +219,7 @@ from_source() { # build the source tree around this script, else a fresh clone;
   tar -C "$src" --exclude=./target --exclude=./plugins/target --exclude=./.git -cf - . | as_builder tar -C "$copy" -xf -
   # The compiler needs about 2 GB: add a temporary swap file on smaller machines.
   mem_kb="$(awk '/^MemTotal:/ {print $2}' /proc/meminfo)"
-  if [ "$mem_kb" -lt 2000000 ] && [ -z "$(swapon --show --noheadings)" ]; then
+  if [[ "$mem_kb" -lt 2000000 ]] && [[ -z "$(swapon --show --noheadings)" ]]; then
     SWAP="$WORK/swapfile"
     say "Adding a temporary 2 GB swap file for the build"
     fallocate -l 2G "$SWAP" 2>/dev/null || dd if=/dev/zero of="$SWAP" bs=1M count=2048 status=none
@@ -237,19 +240,19 @@ from_source() { # build the source tree around this script, else a fresh clone;
   FILES="$src/packaging/server"
 }
 
-if [ -x "$HERE/figcraft-server" ] && [ "$FROM_SOURCE" = false ]; then
+if [[ -x "$HERE/figcraft-server" ]] && [[ "$FROM_SOURCE" = false ]]; then
   NEW_BIN="$HERE/figcraft-server" # run from an unpacked release archive
-elif [ -n "$LOCAL_SRC" ] && [ -z "$VERSION" ]; then
+elif [[ -n "$LOCAL_SRC" ]] && [[ -z "$VERSION" ]]; then
   from_source # the source copied to (or checked out on) this machine, as it is
-elif [ "$FROM_SOURCE" = true ] || ! from_release; then
-  [ "$FROM_SOURCE" = true ] || say "No release archive for linux-$ARCH: building from source instead"
+elif [[ "$FROM_SOURCE" = true ]] || ! from_release; then
+  [[ "$FROM_SOURCE" = true ]] || say "No release archive for linux-$ARCH: building from source instead"
   from_source
 fi
-[ -x "$NEW_BIN" ] || die "no figcraft-server binary to install"
+[[ -x "$NEW_BIN" ]] || die "no figcraft-server binary to install"
 # The units and the Caddyfile beside this script when it has them (a checkout or an archive).
-[ -f "$HERE/figcraft-backup.timer" ] && FILES="$HERE"
+[[ -f "$HERE/figcraft-backup.timer" ]] && FILES="$HERE"
 for f in figcraft-server.service Caddyfile figcraft-backup.service figcraft-backup.timer; do
-  [ -f "$FILES/$f" ] || die "$FILES/$f is missing"
+  [[ -f "$FILES/$f" ]] || die "$FILES/$f is missing"
 done
 
 # The server's own account runs the binary, from here on too (root never runs what was built).
@@ -267,7 +270,7 @@ fi
 # --- Data and settings ----------------------------------------------------------------------
 install -d -o figcraft -g figcraft -m 700 "$DATA"
 install -d -m 755 "$CONFIG_DIR"
-if [ ! -f "$CONFIG" ]; then
+if [[ ! -f "$CONFIG" ]]; then
   say "Writing $CONFIG"
   {
     printf '# figcraft-server settings (docs/server.md, "Configuration"). install.sh never overwrites this file.\n'
@@ -303,8 +306,9 @@ as_server "$BIN" --config "$CONFIG" check >/dev/null ||
   die "$CONFIG isn't right for this figcraft-server (see above; a release older than open hosting needs --from-source)"
 
 install_file() { # install_file SOURCE TARGET MODE: true when it changed
-  if cmp -s "$1" "$2"; then return 1; fi
-  install -m "$3" "$1" "$2"
+  local source="$1" target="$2" mode="$3"
+  if cmp -s "$source" "$target"; then return 1; fi
+  install -m "$mode" "$source" "$target"
 }
 
 # --- systemd --------------------------------------------------------------------------------
@@ -312,16 +316,16 @@ UNITS=false
 install_file "$FILES/figcraft-server.service" /etc/systemd/system/figcraft-server.service 644 && UNITS=true
 install_file "$FILES/figcraft-backup.service" /etc/systemd/system/figcraft-backup.service 644 && UNITS=true
 install_file "$FILES/figcraft-backup.timer" /etc/systemd/system/figcraft-backup.timer 644 && UNITS=true
-if [ "$UNITS" = true ]; then
+if [[ "$UNITS" = true ]]; then
   systemctl daemon-reload
   CHANGED=true
 fi
 systemctl enable --quiet "$SERVICE"
-if [ "$CHANGED" = true ] || ! systemctl is-active --quiet "$SERVICE"; then
+if [[ "$CHANGED" = true ]] || ! systemctl is-active --quiet "$SERVICE"; then
   say "Starting figcraft-server"
   systemctl restart "$SERVICE"
 fi
-if [ "$BACKUPS" = true ]; then
+if [[ "$BACKUPS" = true ]]; then
   systemctl enable --now --quiet figcraft-backup.timer
 fi
 
@@ -339,15 +343,15 @@ MAIN="$(mktemp)"
 caddy_main "$CADDYFILE" "$EMAIL" >"$MAIN"
 CADDY_CHANGED=false
 for f in "$CADDYFILE" "$SITE_FILE"; do
-  if [ -f "$f" ]; then cp -p "$f" "$f.before-figcraft"; else rm -f "$f.before-figcraft"; fi
+  if [[ -f "$f" ]]; then cp -p "$f" "$f.before-figcraft"; else rm -f "$f.before-figcraft"; fi
 done
 install_file "$SITE" "$SITE_FILE" 644 && CADDY_CHANGED=true
 install_file "$MAIN" "$CADDYFILE" 644 && CADDY_CHANGED=true
 rm -f "$SITE" "$MAIN"
-if [ "$CADDY_CHANGED" = true ]; then
+if [[ "$CADDY_CHANGED" = true ]]; then
   if ! caddy validate --config "$CADDYFILE" --adapter caddyfile >/dev/null 2>&1; then
     for f in "$CADDYFILE" "$SITE_FILE"; do
-      if [ -f "$f.before-figcraft" ]; then cp -p "$f.before-figcraft" "$f"; else rm -f "$f"; fi
+      if [[ -f "$f.before-figcraft" ]]; then cp -p "$f.before-figcraft" "$f"; else rm -f "$f"; fi
     done
     die "Caddy doesn't accept the new configuration (the old one is back; see: caddy validate --config $CADDYFILE)"
   fi
@@ -356,10 +360,10 @@ fi
 systemctl enable --now --quiet caddy
 
 # --- Firewall -------------------------------------------------------------------------------
-if [ "$FIREWALL" = true ]; then
+if [[ "$FIREWALL" = true ]]; then
   # The ports sshd really listens on (sudo doesn't pass SSH_CONNECTION on).
   SSH_PORTS="$(sshd -T 2>/dev/null | awk '/^port / {print $2}' | sort -u)"
-  [ -n "$SSH_PORTS" ] || SSH_PORTS=22
+  [[ -n "$SSH_PORTS" ]] || SSH_PORTS=22
   say "Firewall: SSH ($(echo "$SSH_PORTS" | tr '\n' ' ' | sed 's/ $//')), 80 and 443"
   for p in $SSH_PORTS; do ufw allow "$p/tcp" >/dev/null; done
   ufw allow 80/tcp >/dev/null
@@ -370,12 +374,12 @@ if [ "$FIREWALL" = true ]; then
     # Other services reachable from outside would be cut off by enabling ufw.
     OTHERS=""
     for a in $(ss -Hltn | awk '{print $4}'); do
-      case "$a" in 127.* | "[::1]:"* | ::1:*) continue ;; esac
+      case "$a" in 127.* | "[::1]:"* | ::1:*) continue ;; *) ;; esac
       port="${a##*:}"
       case " $(echo "$SSH_PORTS" | tr '\n' ' ') 80 443 " in *" $port "*) continue ;; esac
       OTHERS="$OTHERS $port"
     done
-    if [ -n "$OTHERS" ] && [ "$FIREWALL_ANYWAY" = false ]; then
+    if [[ -n "$OTHERS" ]] && [[ "$FIREWALL_ANYWAY" = false ]]; then
       warn "other services listen on port(s)$OTHERS: ufw was not enabled (rules added; allow those ports, then 'ufw enable', or run again with --firewall-anyway)"
     else
       ufw --force enable >/dev/null
@@ -395,7 +399,7 @@ cat <<EOF
 figcraft-server is running behind Caddy.
 
   Publish:   in FigCraft, Share > Publish to server..., address wss://$HOST/
-             $(if [ "$OPEN" = true ]; then echo "(open to the public: no key needed; each file gets an owner token)"; else echo "(with the key: $ADMIN key)"; fi)
+             $(if [[ "$OPEN" = true ]]; then echo "(open to the public: no key needed; each file gets an owner token)"; else echo "(with the key: $ADMIN key)"; fi)
   Check:     curl https://$HOST/healthz      (once DNS points here and Caddy has its certificate)
   Logs:      journalctl -u $SERVICE -f
 
diff --git a/packaging/server/package.sh b/packaging/server/package.sh
index 7d2f9c54..5f306327 100755
--- a/packaging/server/package.sh
+++ b/packaging/server/package.sh
@@ -25,11 +25,12 @@ ARCH="$(uname -m)"
 case "$ARCH" in
   arm64) ARCH=aarch64 ;;
   amd64) ARCH=x86_64 ;;
+  *) ;; # already a release name (x86_64, aarch64)
 esac
 NAME="figcraft-server-$VERSION-$OS-$ARCH"
 echo "==> figcraft-server $VERSION for $OS $ARCH"
 
-if [ "$SKIP_BUILD" = 0 ]; then
+if [[ "$SKIP_BUILD" = 0 ]]; then
   (cd "$ROOT" && cargo build --release --locked -p figcraft-server)
 fi
 WORK="$CARGO_TARGET_DIR/server-package"
diff --git a/packaging/web/package.sh b/packaging/web/package.sh
index 0e45c515..f9ee34a7 100755
--- a/packaging/web/package.sh
+++ b/packaging/web/package.sh
@@ -11,13 +11,13 @@ set -euo pipefail
 . "$(dirname "${BASH_SOURCE[0]}")/../env.sh"
 HERE="$ROOT/packaging/web"
 
-if [ "${1:-}" != "--skip-build" ]; then
+if [[ "${1:-}" != "--skip-build" ]]; then
   command -v trunk >/dev/null || { echo "error: trunk not found (cargo install trunk --locked)" >&2; exit 1; }
   (cd "$ROOT/apps/figcraft-web" && trunk build --release)
 fi
 
 SITE="$ROOT/dist/web"
-[ -f "$SITE/index.html" ] || { echo "error: $SITE/index.html missing; run without --skip-build" >&2; exit 1; }
+[[ -f "$SITE/index.html" ]] || { echo "error: $SITE/index.html missing; run without --skip-build" >&2; exit 1; }
 # Paths must be relative so the site works under any prefix (public_url = "./" in Trunk.toml).
 if grep -Eq '(src|href)="/[^/]' "$SITE/index.html"; then
   echo "error: $SITE/index.html has root-absolute URLs; it would break when served from a sub-path" >&2
@@ -30,16 +30,16 @@ fi
 MAX_WASM_BYTES="${FIGCRAFT_WASM_MAX_BYTES:-25165824}" # 24 MiB
 WASM_COUNT=0
 for wasm in "$SITE"/*.wasm; do
-  [ -f "$wasm" ] || continue
+  [[ -f "$wasm" ]] || continue
   WASM_COUNT=$((WASM_COUNT + 1))
   size=$(wc -c <"$wasm" | tr -d ' ')
   echo "$(basename "$wasm"): $size bytes ($((size / 1048576)) MiB; limit $MAX_WASM_BYTES)"
-  if [ "$size" -gt "$MAX_WASM_BYTES" ]; then
+  if [[ "$size" -gt "$MAX_WASM_BYTES" ]]; then
     echo "error: $(basename "$wasm") is $size bytes, over the $MAX_WASM_BYTES-byte limit (Cloudflare's per-file cap is 25 MiB)" >&2
     exit 1
   fi
 done
-[ "$WASM_COUNT" -gt 0 ] || { echo "error: no .wasm in $SITE" >&2; exit 1; }
+[[ "$WASM_COUNT" -gt 0 ]] || { echo "error: no .wasm in $SITE" >&2; exit 1; }
 
 NAME="figcraft-web-$VERSION"
 WORK="$CARGO_TARGET_DIR/web-package"
diff --git a/packaging/windows/figcraft.wxs b/packaging/windows/figcraft.wxs
index a0e40b24..4cc564f2 100644
--- a/packaging/windows/figcraft.wxs
+++ b/packaging/windows/figcraft.wxs
@@ -18,6 +18,9 @@
 -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+  <?ifndef HasCraftFontLicences ?>
+  <?define HasCraftFontLicences=0 ?>
+  <?endif ?>
   <Package
       Name="FigCraft"
       Manufacturer="Learning Machines LLC"
@@ -52,6 +55,9 @@
     </Property>
 
     <Feature Id="Main" Title="FigCraft" Level="1">
+      <?if $(var.HasCraftFontLicences) = 1 ?>
+      <ComponentGroupRef Id="CraftFontLicences" />
+      <?endif ?>
       <ComponentGroupRef Id="FigcraftFiles" />
     </Feature>
 
@@ -82,8 +88,14 @@
   </Package>
 
   <Fragment>
+    <?if $(var.HasCraftFontLicences) = 1 ?>
+    <ComponentGroup Id="CraftFontLicences" Directory="INSTALLFOLDER">
+      <Files Include="$(var.DocsDir)\**" />
+    </ComponentGroup>
+    <?endif ?>
     <ComponentGroup Id="FigcraftFiles" Directory="INSTALLFOLDER">
       <Component Id="FigcraftApp" Guid="238228C3-4C1D-4B33-8C5D-C31B65BC2DA4">
+        <File Id="FigcraftNotice" Source="$(var.BinDir)\NOTICE" KeyPath="no" />
         <File Id="FigcraftExe" Source="$(var.BinDir)\figcraft.exe" KeyPath="yes">
           <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuFolder" Name="FigCraft"
               Description="FigCraft interface design and prototyping" WorkingDirectory="INSTALLFOLDER" Advertise="yes"
@@ -103,6 +115,10 @@
         <RegistryValue Root="HKLM" Key="Software\Classes\.png\OpenWithProgids" Name="Figcraft.Image" Value="" Type="string" />
         <RegistryValue Root="HKLM" Key="Software\Classes\.jpg\OpenWithProgids" Name="Figcraft.Image" Value="" Type="string" />
         <RegistryValue Root="HKLM" Key="Software\Classes\.jpeg\OpenWithProgids" Name="Figcraft.Image" Value="" Type="string" />
+        <!-- Sketch files (opened as a copy; FigCraft doesn't save .sketch): "Open with" only too. -->
+        <ProgId Id="Figcraft.Sketch" Description="Sketch Document" Icon="FigcraftExe" IconIndex="0" />
+        <RegistryValue Root="HKLM" Key="Software\Classes\Figcraft.Sketch\shell\open\command" Value="&quot;[#FigcraftExe]&quot; &quot;%1&quot;" Type="string" />
+        <RegistryValue Root="HKLM" Key="Software\Classes\.sketch\OpenWithProgids" Name="Figcraft.Sketch" Value="" Type="string" />
 
         <!-- "Open with" app list and the Run dialog (Win+R "figcraft"). -->
         <RegistryValue Root="HKLM" Key="Software\Classes\Applications\figcraft.exe" Name="FriendlyAppName" Value="FigCraft" Type="string" />
@@ -112,6 +128,7 @@
         <RegistryValue Root="HKLM" Key="Software\Classes\Applications\figcraft.exe\SupportedTypes" Name=".png" Value="" Type="string" />
         <RegistryValue Root="HKLM" Key="Software\Classes\Applications\figcraft.exe\SupportedTypes" Name=".jpg" Value="" Type="string" />
         <RegistryValue Root="HKLM" Key="Software\Classes\Applications\figcraft.exe\SupportedTypes" Name=".jpeg" Value="" Type="string" />
+        <RegistryValue Root="HKLM" Key="Software\Classes\Applications\figcraft.exe\SupportedTypes" Name=".sketch" Value="" Type="string" />
         <RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\figcraft.exe" Value="[#FigcraftExe]" Type="string" />
         <RegistryValue Root="HKLM" Key="Software\FigCraft" Name="InstallDir" Value="[INSTALLFOLDER]" Type="string" />
       </Component>
diff --git a/packaging/windows/package.ps1 b/packaging/windows/package.ps1
index eaa46ba0..dd3a17b8 100644
--- a/packaging/windows/package.ps1
+++ b/packaging/windows/package.ps1
@@ -93,11 +93,26 @@ foreach ($check in $checks) {
 $Stage = Join-Path $TargetDir "windows-package\$Arch"
 Remove-Item -Recurse -Force $Stage -ErrorAction SilentlyContinue
 New-Item -ItemType Directory -Force -Path $Stage | Out-Null
+# Dependency font notices are required even without optional craft-fonts.
+Copy-Item -LiteralPath (Join-Path $Root 'NOTICE') -Destination $Stage
 $Exes = $Bins | ForEach-Object { "$_.exe" }
 foreach ($exe in $Exes) { Copy-Item (Join-Path $Bin $exe) $Stage }
 
 & (Join-Path $PSScriptRoot 'sign.ps1') @($Exes | ForEach-Object { Join-Path $Stage $_ })
 
+# ---- font notices for the MSI ------------------------------------------------------------------
+# The portable ZIP already carries these notices; stage the complete files before MSI creation too.
+$Docs = Join-Path $Stage 'font-licences'
+New-Item -ItemType Directory -Force -Path $Docs | Out-Null
+$HasCraftFontLicences = 0
+if ($env:CRAFT_FONTS_DIR) {
+  foreach ($ofl in Get-ChildItem -Path (Join-Path $env:CRAFT_FONTS_DIR 'fonts\*\OFL.txt') -File -ErrorAction SilentlyContinue) {
+    Copy-Item -LiteralPath $ofl.FullName -Destination (Join-Path $Docs "OFL-$($ofl.Directory.Name).txt")
+    $HasCraftFontLicences = 1
+  }
+}
+# ---- end font notices for the MSI --------------------------------------------------------------
+
 # ---- MSI ---------------------------------------------------------------------------------------
 # The setup wizard's art, drawn here from the app icon so the MSI shows FigCraft rather than
 # WiX's stock bitmaps: a 493x58 banner across the top of the inner pages (the page title is drawn
@@ -144,6 +159,7 @@ Invoke-Native 'wix build' {
     -culture en-US -loc (Join-Path $PSScriptRoot 'figcraft.en-us.wxl') `
     -d "Version=$MsiVersion" -d "DisplayVersion=$Version" -d "BinDir=$Stage" -d "IconPath=$(Join-Path $Root 'assets\app-icon\figcraft.ico')" `
     -d "BannerBmp=$Banner" -d "DialogBmp=$Dialog" -d "HasCli=$([int]$HasCli)" `
+    -d "DocsDir=$Docs" -d "HasCraftFontLicences=$HasCraftFontLicences" `
     -o $Msi
 }
 Invoke-Native 'MSI shortcut icon validation (ICE50)' {
diff --git a/packaging/windows/sign.ps1 b/packaging/windows/sign.ps1
index 3d94747a..795ef067 100644
--- a/packaging/windows/sign.ps1
+++ b/packaging/windows/sign.ps1
@@ -56,8 +56,8 @@ if (-not $haveCert -and -not $haveAzure) {
 
 $script:SignTool = Find-SignTool
 $common = @('sign', '/v', '/fd', 'SHA256', '/td', 'SHA256', '/d', 'FigCraft', '/du', 'https://github.com/storytold/figcraft')
-$tmp = Join-Path ([IO.Path]::GetTempPath()) "figcraft-sign-$PID"
-New-Item -ItemType Directory -Force -Path $tmp | Out-Null
+$tmp = Join-Path ([IO.Path]::GetTempPath()) "figcraft-sign-$([IO.Path]::GetRandomFileName())"
+New-Item -ItemType Directory -Path $tmp | Out-Null
 
 try {
   if ($haveCert) {
@@ -73,8 +73,15 @@ try {
     Write-Output "Signing with Azure Trusted Signing ($env:AZURE_SIGNING_ACCOUNT / $env:AZURE_CERT_PROFILE): $($Files -join ', ')"
     # The dlib authenticates with DefaultAzureCredential, which reads AZURE_TENANT_ID,
     # AZURE_CLIENT_ID and AZURE_CLIENT_SECRET from the environment.
+    $trustedSigningVersion = '1.0.95'
+    $trustedSigningSha256 = '3bfcf1e0a3cb42af1692f0a8ed45c15de070c2de86f28a59b2795d904d8a920f'
     $pkg = Join-Path $tmp 'trusted-signing.zip'
-    Invoke-WebRequest -Uri 'https://www.nuget.org/api/v2/package/Microsoft.Trusted.Signing.Client' -OutFile $pkg
+    $uri = "https://api.nuget.org/v3-flatcontainer/microsoft.trusted.signing.client/$trustedSigningVersion/microsoft.trusted.signing.client.$trustedSigningVersion.nupkg"
+    Invoke-WebRequest -Uri $uri -OutFile $pkg
+    $actualHash = (Get-FileHash -Path $pkg -Algorithm SHA256).Hash.ToLowerInvariant()
+    if ($actualHash -ne $trustedSigningSha256) {
+      throw "Microsoft.Trusted.Signing.Client $trustedSigningVersion checksum mismatch"
+    }
     Expand-Archive -Path $pkg -DestinationPath (Join-Path $tmp 'client') -Force
     $dlib = Get-ChildItem -Path (Join-Path $tmp 'client') -Recurse -Filter Azure.CodeSigning.Dlib.dll |
       Where-Object { $_.FullName -match '\\x64\\' } | Select-Object -First 1
diff --git a/plugins/Cargo.lock b/plugins/Cargo.lock
index 7738ceb5..87244377 100644
--- a/plugins/Cargo.lock
+++ b/plugins/Cargo.lock
@@ -9,6 +9,13 @@ dependencies = [
  "figcraft-plugin-sdk",
 ]
 
+[[package]]
+name = "export-names"
+version = "0.1.0"
+dependencies = [
+ "figcraft-plugin-sdk",
+]
+
 [[package]]
 name = "figcraft-plugin-sdk"
 version = "0.1.0"
diff --git a/plugins/Cargo.toml b/plugins/Cargo.toml
index 6fe7c7e9..eb1183d3 100644
--- a/plugins/Cargo.toml
+++ b/plugins/Cargo.toml
@@ -1,6 +1,7 @@
 # FigCraft plugins written in Rust: the SDK and example plugins. A workspace of its own (not part of
 # the app's): it builds for wasm32-unknown-unknown with `cargo xtask plugins` (from the repository
-# root), which puts each example's .wasm next to its figcraft-plugin.json under target/plugins/.
+# root), which puts each example's .wasm next to its figcraft-plugin.json under target/plugins/dist/.
+# CARGO_TARGET_DIR selects the shared Cargo target root, including this plugin dist directory.
 [workspace]
 resolver = "3"
 members = ["sdk", "examples/*"]
diff --git a/plugins/examples/counter/figcraft-plugin.json b/plugins/examples/counter/figcraft-plugin.json
index a046ebc5..fa83c414 100644
--- a/plugins/examples/counter/figcraft-plugin.json
+++ b/plugins/examples/counter/figcraft-plugin.json
@@ -1,10 +1,10 @@
 {
   "id": "org.figcraft.examples.counter",
   "name": "Counter",
-  "version": "1.0.0",
-  "description": "A widget that counts on the canvas: click its + and − buttons. The count is kept in the document.",
+  "version": "1.1.0",
+  "description": "A widget that counts on the canvas: click its + and − buttons, double-click its label to edit it, and use its menu to reset it, count in tens or colour it. Everything is kept in the document.",
   "main": "counter.wasm",
-  "api": 3,
+  "api": 4,
   "widget": true,
   "permissions": { "access": "read" }
 }
diff --git a/plugins/examples/counter/src/lib.rs b/plugins/examples/counter/src/lib.rs
index d149a53d..92815c4f 100644
--- a/plugins/examples/counter/src/lib.rs
+++ b/plugins/examples/counter/src/lib.rs
@@ -1,19 +1,53 @@
-//! Counter: a widget on the canvas with − and + buttons around a count. Each click calls the
-//! plugin back with the widget's state; it hands back the new count and the redrawn widget.
+//! Counter: a widget on the canvas with − and + buttons around a count, a label you can edit on the
+//! canvas, and a property menu (reset, steps of ten, a colour). Each click, edit or menu choice
+//! calls the plugin back with the widget's state; it hands back the new state and the redrawn
+//! widget.
 
-use figcraft_plugin_sdk::{Input, Result, Value, entry, json, render_widget};
+use figcraft_plugin_sdk::{Input, Result, Value, Widget, entry, json, render_widget};
 
 /// The count stays within ± this.
 const LIMIT: i64 = 999_999;
+/// The colours the menu offers for the count (the first is the default).
+const COLORS: [&str; 4] = ["#1E1E1E", "#0D99FF", "#14AE5C", "#F24822"];
+/// Shown in the label field while it's empty.
+const PLACEHOLDER: &str = "Add a label";
 
-/// The count after clicking `target` (none: the widget was just inserted).
-fn next(count: i64, target: Option<&str>) -> i64 {
-    let n = match target {
-        Some("increment") => count.saturating_add(1),
-        Some("decrement") => count.saturating_sub(1),
-        _ => count,
-    };
-    n.clamp(-LIMIT, LIMIT)
+/// What the widget shows.
+#[derive(Debug, PartialEq)]
+struct Counter {
+    count: i64,
+    big: bool,
+    color: String,
+}
+
+impl Counter {
+    fn from_state(state: &Value) -> Counter {
+        let color = state.get("color").and_then(Value::as_str).filter(|c| COLORS.contains(c)).unwrap_or(COLORS[0]);
+        Counter {
+            count: state.get("count").and_then(Value::as_i64).unwrap_or(0),
+            big: state.get("big").and_then(Value::as_bool).unwrap_or(false),
+            color: color.into(),
+        }
+    }
+
+    /// After the click, edit or menu choice `w` brings (nothing: the widget was just inserted).
+    fn next(mut self, w: &Widget) -> Counter {
+        let step = if self.big { 10 } else { 1 };
+        match (w.target.as_deref(), w.menu.as_deref()) {
+            (Some("increment"), _) => self.count = self.count.saturating_add(step),
+            (Some("decrement"), _) => self.count = self.count.saturating_sub(step),
+            (_, Some("reset")) => self.count = 0,
+            (_, Some("big")) => self.big = w.value.as_bool().unwrap_or(!self.big),
+            (_, Some("color")) => {
+                if let Some(c) = w.value.as_str().filter(|c| COLORS.contains(c)) {
+                    self.color = c.into();
+                }
+            }
+            _ => {}
+        }
+        self.count = self.count.clamp(-LIMIT, LIMIT);
+        self
+    }
 }
 
 /// A square button that calls back with `target`.
@@ -22,21 +56,38 @@ fn button(target: &str, name: &str, label: &str) -> Value {
            "children": [{"type": "text", "text": label, "size": 16, "bold": true, "color": "#1E1E1E"}]})
 }
 
-/// The widget showing `count`.
-fn view(count: i64) -> Value {
-    json!({"type": "frame", "name": "Counter", "layout": "horizontal", "gap": 12, "padding": 12, "radius": 12,
+/// The widget showing `c` under `label`.
+fn view(c: &Counter, label: &str) -> Value {
+    let (text, ink) = if label.trim().is_empty() { (PLACEHOLDER, "#B3B3B3") } else { (label, "#757575") };
+    let (minus, plus) = if c.big { ("−10", "+10") } else { ("−", "+") };
+    json!({"type": "frame", "name": "Counter", "layout": "vertical", "gap": 6, "padding": 12, "radius": 12, "align": "min",
            "fill": "#FFFFFF", "stroke": "#D9D9D9", "children": [
-        button("decrement", "Decrease", "−"),
-        {"type": "text", "name": "Count", "text": count.to_string(), "size": 24, "bold": true, "color": "#1E1E1E"},
-        button("increment", "Increase", "+"),
+        {"type": "text", "name": "Label", "field": "label", "text": text, "size": 12, "color": ink},
+        {"type": "frame", "name": "Row", "layout": "horizontal", "gap": 12, "children": [
+            button("decrement", "Decrease", minus),
+            {"type": "text", "name": "Count", "text": c.count.to_string(), "size": 24, "bold": true, "color": c.color},
+            button("increment", "Increase", plus),
+        ]},
     ]})
 }
 
+/// The property menu for `c`.
+fn menu(c: &Counter) -> Value {
+    json!([
+        {"item": "reset", "label": "Reset", "type": "action"},
+        {"item": "big", "label": "Steps of 10", "type": "toggle", "checked": c.big},
+        {"item": "color", "label": "Colour", "type": "color", "options": COLORS, "value": c.color},
+    ])
+}
+
 fn run(input: Input) -> Result<Value> {
     let w = input.widget.ok_or("Insert the counter from Plugins ▸ Widgets")?;
-    let count = next(w.state.get("count").and_then(Value::as_i64).unwrap_or(0), w.target.as_deref());
-    render_widget(&json!({"state": {"count": count}, "root": view(count)}))?;
-    Ok(json!({"count": count}))
+    let c = Counter::from_state(&w.state).next(&w);
+    // An edited label is in the state already, under its field's name.
+    let label = w.state.get("label").and_then(Value::as_str).unwrap_or("Counter").to_string();
+    let state = json!({"count": c.count, "big": c.big, "color": c.color, "label": label});
+    render_widget(&json!({"state": state, "root": view(&c, &label), "menu": menu(&c)}))?;
+    Ok(json!({"count": c.count}))
 }
 
 entry!(run);
@@ -45,15 +96,28 @@ entry!(run);
 mod tests {
     use super::*;
 
+    fn widget(target: Option<&str>, menu: Option<&str>, value: Value) -> Widget {
+        Widget { target: target.map(Into::into), menu: menu.map(Into::into), value, ..Widget::default() }
+    }
+
     #[test]
-    fn counts_within_its_limit() {
-        assert_eq!(next(0, None), 0);
-        assert_eq!(next(4, Some("increment")), 5);
-        assert_eq!(next(4, Some("decrement")), 3);
-        assert_eq!(next(LIMIT, Some("increment")), LIMIT);
-        assert_eq!(next(i64::MIN, Some("decrement")), -LIMIT);
-        assert_eq!(next(2, Some("other")), 2);
-        assert_eq!(view(3)["children"][1]["text"], "3");
+    fn counts_within_its_limit_and_follows_its_menu() {
+        let c = |count: i64| Counter { count, big: false, color: COLORS[0].into() };
+        let at = |n: i64, t: &str| c(n).next(&widget(Some(t), None, Value::Null)).count;
+        assert_eq!(c(0).next(&Widget::default()).count, 0);
+        assert_eq!((at(4, "increment"), at(4, "decrement")), (5, 3));
+        assert_eq!((at(LIMIT, "increment"), at(i64::MIN, "decrement"), at(2, "other")), (LIMIT, -LIMIT, 2));
+        assert_eq!(c(7).next(&widget(None, Some("reset"), Value::Null)).count, 0);
+        let big = c(1).next(&widget(None, Some("big"), json!(true)));
+        assert!(big.big);
+        assert_eq!(big.next(&widget(Some("increment"), None, Value::Null)).count, 11, "steps of ten");
+        assert_eq!(c(1).next(&widget(None, Some("color"), json!("#14AE5C"))).color, "#14AE5C");
+        assert_eq!(c(1).next(&widget(None, Some("color"), json!("#123456"))).color, COLORS[0], "only the colours offered");
+        assert_eq!(Counter::from_state(&json!({"count": 3, "color": "junk"})), c(3));
+        let v = view(&c(3), "Score");
+        assert_eq!((v["children"][0]["text"].clone(), v["children"][1]["children"][1]["text"].clone()), (json!("Score"), json!("3")));
+        assert_eq!(view(&c(3), " ")["children"][0]["text"], PLACEHOLDER);
+        assert_eq!(menu(&c(0))[1]["checked"], false);
         assert!(run(Input::default()).is_err(), "it only runs as a widget");
     }
 }
diff --git a/plugins/examples/export-names/Cargo.toml b/plugins/examples/export-names/Cargo.toml
new file mode 100644
index 00000000..35b7eb81
--- /dev/null
+++ b/plugins/examples/export-names/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "export-names"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+publish = false
+
+[lib]
+crate-type = ["cdylib"]
+
+[lints]
+workspace = true
+
+[dependencies]
+figcraft-plugin-sdk = { workspace = true }
diff --git a/plugins/examples/export-names/figcraft-plugin.json b/plugins/examples/export-names/figcraft-plugin.json
new file mode 100644
index 00000000..ab8f943f
--- /dev/null
+++ b/plugins/examples/export-names/figcraft-plugin.json
@@ -0,0 +1,22 @@
+{
+  "id": "org.figcraft.examples.export-names",
+  "name": "Export names",
+  "version": "1.0.0",
+  "description": "Saves the names of the selected layers as a text file, one per line.",
+  "main": "export_names.wasm",
+  "api": 4,
+  "permissions": {
+    "access": "read",
+    "commands": ["node.get"],
+    "saveFile": true
+  },
+  "commands": [
+    {
+      "id": "export",
+      "label": "Export names…",
+      "params": [
+        { "name": "children", "label": "Include layers inside", "type": "boolean", "default": true }
+      ]
+    }
+  ]
+}
diff --git a/plugins/examples/export-names/src/lib.rs b/plugins/examples/export-names/src/lib.rs
new file mode 100644
index 00000000..4525a39c
--- /dev/null
+++ b/plugins/examples/export-names/src/lib.rs
@@ -0,0 +1,55 @@
+//! Export names: saves the names of the selected layers (optionally the layers inside them too) as
+//! the text file `layer-names.txt`, through the host's own Save dialog (`save_file`).
+
+use figcraft_plugin_sdk::{Input, Result, Value, call, entry, json, notify, save_file};
+
+/// Layers looked at in one run, at most.
+const MAX_LAYERS: usize = 10_000;
+
+/// The names as the file's text: one per line, a line break at the end, line breaks inside a name
+/// turned into spaces.
+fn names_text(names: &[String]) -> String {
+    let mut text = String::new();
+    for name in names {
+        text.extend(name.chars().map(|c| if c == '\n' || c == '\r' { ' ' } else { c }));
+        text.push('\n');
+    }
+    text
+}
+
+fn run(input: Input) -> Result<Value> {
+    if input.selection.is_empty() {
+        return Err("Select the layers to export first".into());
+    }
+    let inside = input.bool("children").unwrap_or(true);
+    // Depth first, in layer order: the stack takes the children reversed.
+    let mut stack: Vec<u64> = input.selection.iter().rev().copied().collect();
+    let mut names = Vec::new();
+    while let Some(id) = stack.pop() {
+        if names.len() >= MAX_LAYERS {
+            break;
+        }
+        let node = call("node.get", &json!({"id": id}))?;
+        names.push(node["name"].as_str().unwrap_or_default().to_string());
+        if inside && let Some(children) = node["children"].as_array() {
+            stack.extend(children.iter().rev().filter_map(|c| c["id"].as_u64()));
+        }
+    }
+    save_file("layer-names.txt", "text/plain", names_text(&names).as_bytes())?;
+    notify(&format!("Exporting {} names", names.len()));
+    Ok(json!({"names": names.len()}))
+}
+
+entry!(run);
+
+#[cfg(test)]
+mod tests {
+    use super::names_text;
+
+    #[test]
+    fn names_become_lines() {
+        let names = ["Card".to_string(), "Title\nline".to_string(), String::new()];
+        assert_eq!(names_text(&names), "Card\nTitle line\n\n");
+        assert_eq!(names_text(&[]), "");
+    }
+}
diff --git a/plugins/sdk/src/lib.rs b/plugins/sdk/src/lib.rs
index 967af788..be2a3208 100644
--- a/plugins/sdk/src/lib.rs
+++ b/plugins/sdk/src/lib.rs
@@ -27,6 +27,10 @@
 //! each time a part of it named as a `target` is clicked, the plugin is called with
 //! [`Input::widget`] set (its state and what was clicked) and hands back the new state and the
 //! layers with [`render_widget`]. Each call starts afresh: the state is all a widget remembers.
+//! With API 4 a widget can also have editable text fields (a text layer with a `field` name; an
+//! edit calls back with [`Widget::field`] and [`Widget::value`], and the value is already in the
+//! state under the field's name) and a property menu (`menu` beside `root`; choosing an item calls
+//! back with [`Widget::menu`] and, for a toggle or a colour, [`Widget::value`]).
 //!
 //! The SDK is `no_std` (it needs `alloc`); outside WebAssembly every host call fails, so a plugin's
 //! own logic can still be unit-tested on the host. See `docs/plugins.md` for the ABI underneath.
@@ -59,7 +63,7 @@ pub struct Input {
     pub widget: Option<Widget>,
 }
 
-/// A widget being inserted (no `target`) or clicked.
+/// A widget being inserted (no `target`, `field` or `menu`), clicked, edited or given a menu item.
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct Widget {
     /// The widget's layer id.
@@ -68,6 +72,13 @@ pub struct Widget {
     pub state: Value,
     /// The target clicked.
     pub target: Option<String>,
+    /// API 4: the editable field edited.
+    pub field: Option<String>,
+    /// API 4: the property menu item chosen.
+    pub menu: Option<String>,
+    /// API 4: the field's new text, a toggle's new state (`true`/`false`) or the colour chosen
+    /// (null for a click or an action).
+    pub value: Value,
 }
 
 /// A button pressed or a value changed in the plugin's panel.
@@ -94,10 +105,17 @@ impl Input {
                 value: e.get("value").cloned().unwrap_or(Value::Null),
                 values: v.get("values").cloned().unwrap_or(Value::Null),
             }),
-            widget: v.get("widget").map(|w| Widget {
-                id: w.get("id").and_then(Value::as_u64).unwrap_or_default(),
-                state: w.get("state").cloned().unwrap_or_else(|| json!({})),
-                target: w.get("event").and_then(|e| e.get("target")).and_then(Value::as_str).map(ToString::to_string),
+            widget: v.get("widget").map(|w| {
+                let event = |key: &str| w.get("event").and_then(|e| e.get(key));
+                let name = |key: &str| event(key).and_then(Value::as_str).map(ToString::to_string);
+                Widget {
+                    id: w.get("id").and_then(Value::as_u64).unwrap_or_default(),
+                    state: w.get("state").cloned().unwrap_or_else(|| json!({})),
+                    target: name("target"),
+                    field: name("field"),
+                    menu: name("menu"),
+                    value: event("value").cloned().unwrap_or(Value::Null),
+                }
             }),
         })
     }
@@ -187,6 +205,14 @@ pub fn delete_setting(key: &str) {
     host::setting_delete(key.as_bytes());
 }
 
+/// Offer a file to save: a suggested file `name`, its MIME type and the bytes. FigCraft asks the
+/// user where it goes (a download in the browser) once the run succeeds; the plugin never learns
+/// a path. Needs `"api": 4` and `permissions.saveFile` in the manifest. A refusal (no permission,
+/// a bad name, too much data, a second file in one run) is an error.
+pub fn save_file(name: &str, mime: &str, data: &[u8]) -> Result<()> {
+    if host::save_file(name.as_bytes(), mime.as_bytes(), data) == 0 { Ok(()) } else { Err(String::from_utf8_lossy(&host::reply()).into_owned()) }
+}
+
 /// The body of `figcraft_run` (use [`entry!`]): read the input, run `f`, hand back its output.
 pub fn run_plugin(input_len: i32, f: fn(Input) -> Result<Value>) -> i32 {
     let input = host::reply();
@@ -238,6 +264,7 @@ mod host {
             pub fn setting_set(key: *const u8, key_len: usize, value: *const u8, value_len: usize) -> i32;
             pub fn setting_delete(key: *const u8, key_len: usize);
             pub fn widget_render(ptr: *const u8, len: usize) -> i32;
+            pub fn save_file(name: *const u8, name_len: usize, mime: *const u8, mime_len: usize, data: *const u8, data_len: usize) -> i32;
         }
     }
 
@@ -283,6 +310,9 @@ mod host {
     pub fn widget_render(s: &[u8]) -> i32 {
         unsafe { sys::widget_render(s.as_ptr(), s.len()) }
     }
+    pub fn save_file(name: &[u8], mime: &[u8], data: &[u8]) -> i32 {
+        unsafe { sys::save_file(name.as_ptr(), name.len(), mime.as_ptr(), mime.len(), data.as_ptr(), data.len()) }
+    }
 }
 
 /// Outside WebAssembly (a plugin's own unit tests) every host call fails.
@@ -316,6 +346,9 @@ mod host {
     pub fn widget_render(_s: &[u8]) -> i32 {
         1
     }
+    pub fn save_file(_name: &[u8], _mime: &[u8], _data: &[u8]) -> i32 {
+        1
+    }
 }
 
 #[cfg(test)]
@@ -339,10 +372,19 @@ mod tests {
         assert_eq!((e.control.as_str(), &e.value, &e.values), ("go", &Value::Null, &json!({"n": 2})));
         assert!(show_ui(&json!({})).is_err() && setting("k").is_none() && set_setting("k", &json!(1)).is_err());
         assert!(render_widget(&json!({})).is_err() && i.widget.is_none());
+        assert!(save_file("a.txt", "text/plain", b"x").is_err());
         let w = Input::parse(r#"{"command":"widget","widget":{"id":9,"state":{"n":1},"event":{"target":"inc"}}}"#)
             .unwrap_or_default()
             .widget
             .unwrap_or_default();
         assert_eq!((w.id, &w.state, w.target.as_deref()), (9, &json!({"n": 1}), Some("inc")));
+        let e =
+            Input::parse(r#"{"widget":{"id":9,"state":{},"event":{"field":"label","value":"Hi"}}}"#).unwrap_or_default().widget.unwrap_or_default();
+        assert_eq!((e.field.as_deref(), &e.value, e.target.is_none()), (Some("label"), &json!("Hi"), true));
+        let m = Input::parse(r##"{"widget":{"id":9,"state":{},"event":{"menu":"color","value":"#FF0000"}}}"##)
+            .unwrap_or_default()
+            .widget
+            .unwrap_or_default();
+        assert_eq!((m.menu.as_deref(), &m.value), (Some("color"), &json!("#FF0000")));
     }
 }
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 00000000..92562d54
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,2 @@
+sonar.projectKey=storytold_figcraft
+sonar.organization=storytold
diff --git a/xtask/src/icon.rs b/xtask/src/icon.rs
index b91fccee..91b51aef 100644
--- a/xtask/src/icon.rs
+++ b/xtask/src/icon.rs
@@ -67,11 +67,15 @@ pub fn generate(root: &Path) -> bool {
     for png in &pngs {
         ico.extend_from_slice(png);
     }
-    ok &= std::fs::write(dir.join("figcraft.ico"), ico).is_ok();
+    let ico_path = dir.join("figcraft.ico");
+    let _ = std::fs::remove_file(&ico_path);
+    ok &= std::fs::write(&ico_path, ico).is_ok();
     // The lighter trace keeps the scalable theme icon cheap to render.
     let sd = dir.join("hicolor/scalable/apps");
     let _ = std::fs::create_dir_all(&sd);
-    ok &= std::fs::copy(dir.join("figcraft-small.svg"), sd.join("ai.storyteller.figcraft.svg")).is_ok();
+    let target = sd.join("ai.storyteller.figcraft.svg");
+    let _ = std::fs::remove_file(&target);
+    ok &= std::fs::copy(dir.join("figcraft-small.svg"), &target).is_ok();
     eprintln!("icon: wrote {}", dir.display());
     ok
 }
diff --git a/xtask/src/layers.rs b/xtask/src/layers.rs
index 612c31ed..61d60edd 100644
--- a/xtask/src/layers.rs
+++ b/xtask/src/layers.rs
@@ -18,6 +18,7 @@ const TABLE: &[(&str, u8)] = &[
     ("format", 3),
     ("svg", 4),
     ("pdf", 4),
+    ("vectordrawable", 4),
     ("engine", 5),
     ("ui-egui", 6),
     ("mcp", 6),
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index e3f00e8b..2b389f9f 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -1,6 +1,9 @@
 //! Project tasks: `cargo xtask <task>`.
 //!
-//! - `ci`      fmt check, clippy -D warnings, tests, layers, assets, wasm check
+//! - `ci`      fmt check, clippy -D warnings, tests, the translation report, layers, assets, wasm check
+//! - `test`    the workspace tests (nextest when installed) and doctests
+//! - `i18n-report` the UI strings, command labels and menu wordings each language lacks (never fails
+//!   on them: a missing translation reads English)
 //! - `layers`  crate dependency layering check
 //! - `assets`  every file under assets/ and docs/ has a row in ATTRIBUTION.md
 //! - `parity`  menu-catalog coverage → docs/parity-checklist.md
@@ -16,7 +19,7 @@
 mod icon;
 mod layers;
 
-use std::process::{Command, ExitCode};
+use std::process::{Command, ExitCode, Stdio};
 
 fn run(cmd: &mut Command) -> bool {
     eprintln!("$ {cmd:?}");
@@ -28,7 +31,7 @@ fn cargo() -> Command {
 }
 
 fn root() -> std::path::PathBuf {
-    std::path::Path::new(env!("CARGO_MANIFEST_DIR")).parent().map(|p| p.to_path_buf()).unwrap_or_default()
+    std::path::Path::new(env!("CARGO_MANIFEST_DIR")).parent().map(std::path::Path::to_path_buf).unwrap_or_default()
 }
 
 fn main() -> ExitCode {
@@ -36,6 +39,8 @@ fn main() -> ExitCode {
     let task = args.first().map(String::as_str).unwrap_or("help");
     let ok = match task {
         "ci" => ci(),
+        "test" => test(),
+        "i18n-report" => i18n_report(),
         "layers" => layers::check(&root()),
         "assets" => assets(),
         "parity" => parity(),
@@ -45,7 +50,7 @@ fn main() -> ExitCode {
         "plugins" => plugins(),
         "bench" => bench(args.get(1).map_or("1000,10000,50000", String::as_str)),
         _ => {
-            eprintln!("tasks: ci, layers, assets, parity, version [set X.Y.Z], icon, wasm, plugins, bench [SIZES]");
+            eprintln!("tasks: ci, test, i18n-report, layers, assets, parity, version [set X.Y.Z], icon, wasm, plugins, bench [SIZES]");
             task == "help"
         }
     };
@@ -54,16 +59,38 @@ fn main() -> ExitCode {
 
 fn ci() -> bool {
     run(cargo().args(["fmt", "--all", "--check"]))
-        && run(cargo().args(["clippy", "--workspace", "--all-targets", "--", "-D", "warnings"]))
-        && run(cargo().args(["test", "--workspace"]))
+        && run(cargo().args(["clippy", "--workspace", "--all-targets", "--keep-going", "--", "-D", "warnings"]))
+        && test()
+        && i18n_report()
         && layers::check(&root())
         && assets()
         && wasm()
 }
 
+/// Unit and integration tests with nextest when it is installed (`cargo install cargo-nextest`),
+/// else with `cargo test`; then the doctests, which nextest does not run. Examples are not built:
+/// clippy's `--all-targets` already checks them.
+fn test() -> bool {
+    let nextest = cargo().args(["nextest", "--version"]).stdout(Stdio::null()).stderr(Stdio::null()).status().is_ok_and(|s| s.success());
+    let units = if nextest {
+        run(cargo().args(["nextest", "run", "--workspace", "--lib", "--bins", "--tests"]))
+    } else {
+        eprintln!("xtask: cargo-nextest not installed; running unit and integration tests with `cargo test`");
+        run(cargo().args(["test", "--workspace", "--lib", "--bins", "--tests"]))
+    };
+    units && run(cargo().args(["test", "--workspace", "--doc"]))
+}
+
+/// Prints what each language's catalog lacks, from the test that lists it. `--workspace --lib`
+/// reuses the binaries `test` built.
+fn i18n_report() -> bool {
+    run(cargo().args(["test", "-q", "--workspace", "--lib", "--", "--exact", "i18n::tests::missing_translations_report", "--nocapture"]))
+}
+
 fn wasm() -> bool {
     run(cargo().args([
         "check",
+        "--keep-going",
         "--target",
         "wasm32-unknown-unknown",
         "-p",
@@ -81,30 +108,31 @@ fn wasm() -> bool {
 
 /// The example plugins in `plugins/examples` (each folder's name is its package; its module is
 /// `<name with _>.wasm`).
-const EXAMPLE_PLUGINS: &[&str] = &["tidy-names", "swatch-grid", "counter"];
+const EXAMPLE_PLUGINS: &[&str] = &["tidy-names", "swatch-grid", "counter", "export-names"];
 
 /// The plugin workspace: fmt, clippy and build for wasm32, host tests, then each example's manifest
 /// and module side by side in `<target>/plugins/dist/<example>/`.
 fn plugins() -> bool {
     let root = root();
     let manifest = root.join("plugins").join("Cargo.toml");
-    let target = std::env::var_os("CARGO_TARGET_DIR").map(std::path::PathBuf::from).unwrap_or_else(|| root.join("target")).join("plugins");
+    let target = std::env::var_os("CARGO_TARGET_DIR").map(std::path::PathBuf::from).unwrap_or_else(|| root.join("target"));
     let ws = |args: &[&str]| {
         let mut c = cargo();
-        c.args(args).arg("--manifest-path").arg(&manifest);
+        // Keep the caller's target; Cargo separates host and wasm artifacts itself.
+        c.args(args).arg("--manifest-path").arg(&manifest).env("CARGO_TARGET_DIR", &target);
         c
     };
     let wasm = ["--target", "wasm32-unknown-unknown", "--locked"];
     let ok = run(&mut ws(&["fmt", "--all", "--check"]))
-        && run(ws(&["clippy", "--workspace", "--release"]).args(wasm).arg("--target-dir").arg(&target).args(["--", "-D", "warnings"]))
-        && run(ws(&["test", "--workspace", "--locked"]).arg("--target-dir").arg(&target))
-        && run(ws(&["build", "--workspace", "--release"]).args(wasm).arg("--target-dir").arg(&target));
+        && run(ws(&["clippy", "--workspace", "--release"]).args(wasm).args(["--", "-D", "warnings"]))
+        && run(&mut ws(&["test", "--workspace", "--locked"]))
+        && run(ws(&["build", "--workspace", "--release"]).args(wasm));
     if !ok {
         return false;
     }
     for name in EXAMPLE_PLUGINS {
         let module = format!("{}.wasm", name.replace('-', "_"));
-        let dist = target.join("dist").join(name);
+        let dist = target.join("plugins/dist").join(name);
         let copied = std::fs::create_dir_all(&dist)
             .and_then(|()| std::fs::copy(root.join("plugins/examples").join(name).join("figcraft-plugin.json"), dist.join("figcraft-plugin.json")))
             .and_then(|_| std::fs::copy(target.join("wasm32-unknown-unknown/release").join(&module), dist.join(&module)));
@@ -174,10 +202,11 @@ fn assets() -> bool {
 fn walk(dir: &std::path::Path, f: &mut dyn FnMut(&std::path::Path)) {
     let Ok(rd) = std::fs::read_dir(dir) else { return };
     for e in rd.flatten() {
+        let Ok(ft) = e.file_type() else { continue };
         let p = e.path();
-        if p.is_dir() {
+        if ft.is_dir() && !ft.is_symlink() {
             walk(&p, f);
-        } else {
+        } else if !ft.is_dir() {
             f(&p);
         }
     }